From f3fe824ca92e62da249928598868c663a06a4edd Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Wed, 18 Nov 2026 17:30:55 +0530 Subject: [PATCH 1/7] refactor: split the model out of AgentDefinition into AgentModel Co-authored-by: Cursor --- .changeset/agent-model-split.md | 6 ++ .../agent-session/ITurnResourceResolver.ts | 2 + .../src/agent-session/SessionHandle.ts | 13 ++-- .../src/agent-session/TurnResourceResolver.ts | 24 ++++---- .../src/agent-session/builtinsFromSpec.ts | 10 ++-- .../builtins/ContextCompaction.ts | 12 ++-- packages/trueforge-core/src/core/index.ts | 1 + .../src/core/runtime/AgentDefinition.ts | 16 +---- .../src/core/runtime/AgentModel.ts | 19 ++++++ .../src/core/runtime/AgentThread.ts | 27 +++++---- .../src/core/runtime/AgentThread.types.ts | 2 + .../agent-session/builtinsFromSpec.test.ts | 11 ++-- .../agent-session/capabilityState.test.ts | 7 ++- .../agent-session/resolveAgentSpec.test.ts | 12 ++-- .../core/llm/toOpenAIChatMessage.test.ts | 6 +- .../core/runtime/deferredLoading.test.ts | 6 +- .../core/runtime/finishReasonError.test.ts | 8 ++- .../modelMessageReasoningContent.test.ts | 6 +- .../core/runtime/unknownToolLogging.test.ts | 6 +- .../tests/orchestration/orchestration.test.ts | 16 ++--- .../orchestrationApproval.test.ts | 60 +++++++++---------- .../orchestrationMcpAuth.test.ts | 17 +++--- .../orchestrationUserMessageReset.test.ts | 33 +++++----- .../orchestrationWithTools.test.ts | 27 ++++----- .../trueforge/src/runtime/sessionResources.ts | 4 +- 25 files changed, 188 insertions(+), 163 deletions(-) create mode 100644 .changeset/agent-model-split.md create mode 100644 packages/trueforge-core/src/core/runtime/AgentModel.ts diff --git a/.changeset/agent-model-split.md b/.changeset/agent-model-split.md new file mode 100644 index 0000000000..d20ce0acbd --- /dev/null +++ b/.changeset/agent-model-split.md @@ -0,0 +1,6 @@ +--- +'@truefoundry/trueforge-core': patch +'@truefoundry/trueforge': patch +--- + +Split the model out of `AgentDefinition`: a thread now takes its `definition` (instructions, messages, tools, response format, iteration limit) and a separate `model` (`AgentModel`: client, name, provider type, properties and params). `resolveAgentDefinition` returns both. No behaviour change. diff --git a/packages/trueforge-core/src/agent-session/ITurnResourceResolver.ts b/packages/trueforge-core/src/agent-session/ITurnResourceResolver.ts index 63d5d56c27..e9897fc2e6 100644 --- a/packages/trueforge-core/src/agent-session/ITurnResourceResolver.ts +++ b/packages/trueforge-core/src/agent-session/ITurnResourceResolver.ts @@ -1,6 +1,7 @@ import type { Logger } from 'winston'; import type { AgentCapability } from '../core/capabilities/AgentCapability'; import type { AgentDefinition } from '../core/runtime/AgentDefinition'; +import type { AgentModel } from '../core/runtime/AgentModel'; import type { AgentInfo } from '../core/runtime/AgentThread.types'; import type { HarnessSandbox, SandboxInfo } from '../core/sandbox/Sandbox'; import type { AgentTracing } from '../core/tracing/AgentTracing'; @@ -11,6 +12,7 @@ import type { AgentSpec } from './schemas/agentSpec'; /** Result of {@link ITurnResourceResolver.resolveAgentDefinition}. */ export interface ResolvedAgentDefinition { definition: AgentDefinition; + model: AgentModel; extraCapabilities?: AgentCapability[] | undefined; } diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index e709a58460..caf0bd408f 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -560,12 +560,12 @@ export class SessionHandle< tracing: AgentTracing; resolvedDefinition: ResolvedAgentDefinition; }): AgentThread { - const { definition, extraCapabilities } = input.resolvedDefinition; + const { definition, model, extraCapabilities } = input.resolvedDefinition; const isChild = Boolean(input.previousThreadSnapshot?.parent); const capabilities = [ ...builtinsFromSpec({ spec: input.spec, - definition, + model, isChild, sandboxAvailable: Boolean(input.sandbox), tracing: input.tracing, @@ -576,6 +576,7 @@ export class SessionHandle< ]; return new AgentThread({ definition, + model, threadId: input.threadId, title: input.previousThreadSnapshot?.agent_info?.name ?? (isChild ? input.threadId : 'main'), sandbox: input.sandbox, @@ -600,15 +601,14 @@ export class SessionHandle< tracing: AgentTracing; }): CreateDynamicSubAgentThread { return async params => { - const { definition, extraCapabilities } = await input.resolver.resolveAgentDefinition({ + const { definition, model, extraCapabilities } = await input.resolver.resolveAgentDefinition({ spec: input.spec, agent_info: params.request, previousTurn: input.previous, signal: params.signal, tracing: input.tracing, }); - // Model override (request.model) is resolved inside resolveAgentDefinition - // into modelClient — do not re-label a stale client here. + // Model override (request.model) is resolved inside resolveAgentDefinition into `model`. const childDefinition: AgentDefinition = { ...definition, toolSets: params.parentDefinition.toolSets ?? definition.toolSets, @@ -622,7 +622,7 @@ export class SessionHandle< const capabilities = [ ...builtinsFromSpec({ spec: input.spec, - definition: childDefinition, + model, isChild: true, sandboxAvailable: Boolean(input.sandbox), tracing: input.tracing, @@ -633,6 +633,7 @@ export class SessionHandle< ]; return new AgentThread({ definition: childDefinition, + model, threadId: params.threadId, title: params.request.name, sandbox: input.sandbox, diff --git a/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts b/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts index 5f4c8aad6a..77d6557e19 100644 --- a/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts +++ b/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts @@ -14,7 +14,7 @@ import { DEFAULT_REQUIRE_APPROVAL_FOR_TOOLS, } from '../core/mcp/toolSelectors'; import { ToolSet } from '../core/mcp/ToolSet'; -import type { AgentDefinition } from '../core/runtime/AgentDefinition'; +import type { AgentModel } from '../core/runtime/AgentModel'; import type { AgentInfo } from '../core/runtime/AgentThread.types'; import type { HarnessSandbox, SandboxInfo } from '../core/sandbox/Sandbox'; import type { AgentTracing } from '../core/tracing/AgentTracing'; @@ -73,7 +73,7 @@ function toSelectors(entry: { interface ResolvedModel { modelClient: ILLM; defaultModelParams: ModelParams; - modelProperties?: AgentDefinition['modelProperties']; + modelProperties?: AgentModel['properties']; /** Explicit `undefined` when the host has no provider label for the model call series. */ providerType: VercelAIProviderName | undefined; } @@ -253,25 +253,27 @@ export class TurnResourceResolver< ...(agentInfo === undefined ? (this.deps.rootCapabilities?.() ?? []) : []), ]; // Sub-agents may request a different catalog model via agent_info.model; - // resolve that name so modelClient matches the override (not just a label). + // resolve that name so the model's client matches the override (not just a label). const modelName = agentInfo?.model ?? spec.model.name; const resolvedModel = await this.getModel(modelName); return { - definition: { - modelClient: resolvedModel.modelClient, - modelName, + model: { + client: resolvedModel.modelClient, + name: modelName, ...(resolvedModel.providerType !== undefined ? { providerType: resolvedModel.providerType } : {}), - modelProperties: resolvedModel.modelProperties, + properties: resolvedModel.modelProperties, + params: { + ...resolvedModel.defaultModelParams, + ...spec.model.params, + }, + }, + definition: { // Sub-agents receive the delegated task as a user message; their system // prompt is SUB_AGENT_IDENTITY (added by AgentThread), not user instructions. instruction: agentInfo ? undefined : spec.instructions, messages: agentInfo ? [{ role: 'user' as const, content: agentInfo.input }] : spec.messages?.map(m => ({ role: 'user' as const, content: m.content })), - modelParams: { - ...resolvedModel.defaultModelParams, - ...spec.model.params, - }, // Sub-agents should return free-form summaries to the parent, not the user-facing structured response. responseFormat: agentInfo ? undefined : spec.response_format, iterationLimit: spec.config.iteration_limit, diff --git a/packages/trueforge-core/src/agent-session/builtinsFromSpec.ts b/packages/trueforge-core/src/agent-session/builtinsFromSpec.ts index 06f2780103..1f55a98acd 100644 --- a/packages/trueforge-core/src/agent-session/builtinsFromSpec.ts +++ b/packages/trueforge-core/src/agent-session/builtinsFromSpec.ts @@ -11,14 +11,14 @@ import { dynamicSubAgents } from '../core/capabilities/builtins/DynamicSubAgents import { largeToolResponse } from '../core/capabilities/builtins/LargeToolResponse'; import { openUI } from '../core/capabilities/builtins/OpenUI'; import { webSearch } from '../core/capabilities/builtins/WebSearch'; -import type { AgentDefinition } from '../core/runtime/AgentDefinition'; +import type { AgentModel } from '../core/runtime/AgentModel'; import type { AgentTracing } from '../core/tracing/AgentTracing'; import type { IWebSearchProvider } from '../core/web-search/WebSearchProvider'; import type { AgentSpec } from './schemas/agentSpec'; export function builtinsFromSpec(input: { spec: AgentSpec; - definition: AgentDefinition; + model: AgentModel; /** Root thread only — child threads omit interactive builtins. */ isChild: boolean; sandboxAvailable: boolean; @@ -26,14 +26,14 @@ export function builtinsFromSpec(input: { webSearchProvider: IWebSearchProvider | undefined; logger: Logger; }): AgentCapability[] { - const { spec, definition, isChild, sandboxAvailable, tracing, webSearchProvider, logger } = input; + const { spec, model, isChild, sandboxAvailable, tracing, webSearchProvider, logger } = input; const config = spec.config; const capabilities: AgentCapability[] = [currentDateTime({ tracing })]; if (config.context_management.compaction.enabled) { capabilities.push( contextCompaction({ - definition, + model, compactionThresholdTokens: config.context_management.compaction.trigger?.value, }), ); @@ -57,7 +57,7 @@ export function builtinsFromSpec(input: { capabilities.push( largeToolResponse({ dynamicSubAgentsPresent: !isChild && dynamicSubAgentsEnabled, - modelContextLength: definition.modelProperties?.contextLength, + modelContextLength: model.properties?.contextLength, logger, }), ); diff --git a/packages/trueforge-core/src/core/capabilities/builtins/ContextCompaction.ts b/packages/trueforge-core/src/core/capabilities/builtins/ContextCompaction.ts index 2eac5b3682..483b9f6829 100644 --- a/packages/trueforge-core/src/core/capabilities/builtins/ContextCompaction.ts +++ b/packages/trueforge-core/src/core/capabilities/builtins/ContextCompaction.ts @@ -1,7 +1,7 @@ import { EventType, newEventId, type CompactionTrigger } from '../../events/schema'; import type { ILLM, LLMCreateParams } from '../../llm/ILLM'; import { getOperationMetrics } from '../../observability/operationMetrics'; -import type { AgentDefinition } from '../../runtime/AgentDefinition'; +import type { AgentModel } from '../../runtime/AgentModel'; import type { ContextMessage } from '../../runtime/AgentThread.types'; import { internalSystemMessage, isInternalSystemMessage, isLLMContextMessage } from '../../runtime/contextUtils'; import type { AgentCapability } from '../AgentCapability'; @@ -17,7 +17,7 @@ export const DEFAULT_CONTEXT_COMPACTION_RATIO = 0.8; export function resolveCompactionThresholdTokens(input: { configuredThresholdTokens: number | undefined; modelContextLength: number | undefined; - modelParams: AgentDefinition['modelParams']; + modelParams: AgentModel['params']; }): number { if (input.configuredThresholdTokens !== undefined) { return input.configuredThresholdTokens; @@ -264,19 +264,19 @@ export interface ContextCompactionSettings { } export function contextCompaction(options: { - definition: AgentDefinition; + model: AgentModel; settings?: ContextCompactionSettings | undefined; compactionThresholdTokens?: number | undefined; }): AgentCapability { const threshold = resolveCompactionThresholdTokens({ configuredThresholdTokens: options.compactionThresholdTokens ?? options.settings?.compactionThresholdTokens, - modelContextLength: options.definition.modelProperties?.contextLength, - modelParams: options.definition.modelParams, + modelContextLength: options.model.properties?.contextLength, + modelParams: options.model.params, }); return { preLLMProcessors: [ new ContextCompaction({ - modelClient: options.definition.modelClient, + modelClient: options.model.client, compactionThresholdTokens: threshold, }), ], diff --git a/packages/trueforge-core/src/core/index.ts b/packages/trueforge-core/src/core/index.ts index e26365612d..bef30e7734 100644 --- a/packages/trueforge-core/src/core/index.ts +++ b/packages/trueforge-core/src/core/index.ts @@ -7,6 +7,7 @@ export { ModelParamsSchema, ModelSchema } from './llm/model'; export type { Model, ModelParams } from './llm/model'; export type { AgentDefinition } from './runtime/AgentDefinition'; +export type { AgentModel } from './runtime/AgentModel'; export { AgentThread } from './runtime/AgentThread'; export type { AgentInfo, diff --git a/packages/trueforge-core/src/core/runtime/AgentDefinition.ts b/packages/trueforge-core/src/core/runtime/AgentDefinition.ts index 0c12abc7f4..7df32db214 100644 --- a/packages/trueforge-core/src/core/runtime/AgentDefinition.ts +++ b/packages/trueforge-core/src/core/runtime/AgentDefinition.ts @@ -1,28 +1,14 @@ -import type { ILLM } from '../llm/ILLM'; import type { LLMUserMessage } from '../llm/LLMTypes'; -import type { ModelParams } from '../llm/model'; import type { ResponseFormat } from '../llm/responseFormat'; -import type { VercelAIProviderName } from '../llm/VercelAILLM'; import type { IToolSet } from '../mcp/IMCPServer'; /** * Static definition of an agent. Represents the authored configuration, - * not the execution state. Inherited by sub-agent definitions. + * not the execution state or the model it runs on. Inherited by sub-agent definitions. */ export interface AgentDefinition { - modelClient: ILLM; - modelName: string; - /** Configured provider. Omitted when the host did not resolve one. */ - providerType?: VercelAIProviderName | undefined; - modelProperties?: - | { - /** Maximum combined input/output context for the resolved model, when known. */ - contextLength: number | undefined; - } - | undefined; instruction?: string | undefined; messages?: readonly LLMUserMessage[] | undefined; - modelParams?: ModelParams | undefined; /** Same wire shape as AgentSpec.response_format (Zod ResponseFormat). */ responseFormat?: ResponseFormat | undefined; iterationLimit?: number | undefined; diff --git a/packages/trueforge-core/src/core/runtime/AgentModel.ts b/packages/trueforge-core/src/core/runtime/AgentModel.ts new file mode 100644 index 0000000000..836f3895c2 --- /dev/null +++ b/packages/trueforge-core/src/core/runtime/AgentModel.ts @@ -0,0 +1,19 @@ +import type { ILLM } from '../llm/ILLM'; +import type { ModelParams } from '../llm/model'; +import type { VercelAIProviderName } from '../llm/VercelAILLM'; + +/** The model a thread runs on, resolved for that thread. */ +export interface AgentModel { + client: ILLM; + /** `provider/model`. */ + name: string; + /** Configured provider. Omitted when the host did not resolve one. */ + providerType?: VercelAIProviderName | undefined; + properties?: + | { + /** Maximum combined input/output context for the resolved model, when known. */ + contextLength: number | undefined; + } + | undefined; + params?: ModelParams | undefined; +} diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.ts b/packages/trueforge-core/src/core/runtime/AgentThread.ts index b15eecd106..8728a4da91 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.ts @@ -63,6 +63,7 @@ import type { HarnessSandbox, SandboxInfo } from '../sandbox/Sandbox'; import type { AgentTracing } from '../tracing/AgentTracing'; import { describeUnknownError, extractErrorLogFields, isReportableError } from '../util/errorLogFields'; import type { AgentDefinition } from './AgentDefinition'; +import type { AgentModel } from './AgentModel'; import type { AgentThreadConstructorInput, AgentThreadRuntimeSendBatch, @@ -243,10 +244,10 @@ function toContextAssistantMessage( return forContext; } -function modelFromDefinition(definition: AgentDefinition): Model { - const params = definition.modelParams; +function toEventModel(model: AgentModel): Model { + const params = model.params; return ModelSchema.parse({ - name: definition.modelName, + name: model.name, ...(params && Object.keys(params).length > 0 ? { params } : {}), }); } @@ -471,6 +472,7 @@ export class AgentThread { readonly threadId: string; readonly parent?: AgentParent | undefined; readonly definition: AgentDefinition; + readonly model: AgentModel; readonly agentInfo?: AgentInfo | undefined; private readonly title: string; @@ -510,6 +512,7 @@ export class AgentThread { this.logger = input.logger.child({ module: 'AgentThread' }); this.threadId = input.threadId; this.definition = input.definition; + this.model = input.model; this.context = input.context ? [...input.context] : []; this.title = input.title; this.parent = input.parent; @@ -975,9 +978,9 @@ export class AgentThread { messages = processor.processPreLLMEphemeral(messages) ?? messages; } - // modelParams may include provider extensions (e.g. reasoning_effort) beyond the SDK's + // Model params may include provider extensions (e.g. reasoning_effort) beyond the SDK's // ChatCompletionCreateParamsStreaming field set; assign after constructing the typed body. - // Model identity is owned by modelClient — do not set `model` on the request. + // Model identity is owned by the model's client — do not set `model` on the request. const requestBody: LLMCreateParamsStreaming = { messages, stream: true, @@ -985,8 +988,8 @@ export class AgentThread { ? { response_format: toOpenAIResponseFormat(this.definition.responseFormat) } : {}), }; - if (this.definition.modelParams) { - Object.assign(requestBody, this.definition.modelParams); + if (this.model.params) { + Object.assign(requestBody, this.model.params); } if (tools.length > 0) { @@ -1192,7 +1195,7 @@ export class AgentThread { finishReason: FinishReason | null; }): void { const metrics = getOperationMetrics(); - const providerType = this.definition.providerType; + const providerType = this.model.providerType; if (metrics === undefined || providerType === undefined) { return; } @@ -1206,7 +1209,7 @@ export class AgentThread { private recordLlmTimeToFirstToken(startedMs: number): void { const metrics = getOperationMetrics(); - const providerType = this.definition.providerType; + const providerType = this.model.providerType; if (metrics === undefined || providerType === undefined) { return; } @@ -1233,7 +1236,7 @@ export class AgentThread { const requestBody = this.transformToLLMRequest(tools); // Duration includes the provider stream and each delta's drain. appendToContext stays outside. const requestStartedMs = performance.now(); - const llmStream = this.definition.modelClient.create(requestBody, { metadata: { 'tfg.thread_id': this.threadId } }); + const llmStream = this.model.client.create(requestBody, { metadata: { 'tfg.thread_id': this.threadId } }); // We start the delta stream with a model message event. // `model` FQN is known from the bound client before any chunk arrives. @@ -1242,7 +1245,7 @@ export class AgentThread { thread_id: this.threadId, created_at: new Date().toISOString(), id: modelMessageEventId, - model: modelFromDefinition(this.definition), + model: toEventModel(this.model), } satisfies ModelMessageEvent; let firstDeltaTimestamped = false; @@ -1331,7 +1334,7 @@ export class AgentThread { finishReason, usage: modelMessageUsage, id: modelMessageEventId, - model: modelFromDefinition(this.definition), + model: toEventModel(this.model), }); const finishError = finishReasonErrorMessage({ diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts index 7f27a328c7..f08d761491 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts @@ -32,6 +32,7 @@ import type { InternalEnrichedAssistantMessage, LLMToolMessage, LLMUserMessage } import type { HarnessSandbox } from '../sandbox/Sandbox'; import type { AgentTracing } from '../tracing/AgentTracing'; import type { AgentDefinition } from './AgentDefinition'; +import type { AgentModel } from './AgentModel'; import type { CurrentContextUsage } from './contextUsage'; export type { AgentInfo, AgentParent }; @@ -215,6 +216,7 @@ export interface AgentThreadSnapshot { export interface AgentThreadConstructorInput { definition: AgentDefinition; + model: AgentModel; threadId: string; title: string; parent?: AgentParent | undefined; diff --git a/packages/trueforge-core/tests/agent-session/builtinsFromSpec.test.ts b/packages/trueforge-core/tests/agent-session/builtinsFromSpec.test.ts index a3ab984bf4..c7589cb113 100644 --- a/packages/trueforge-core/tests/agent-session/builtinsFromSpec.test.ts +++ b/packages/trueforge-core/tests/agent-session/builtinsFromSpec.test.ts @@ -11,16 +11,13 @@ import { WEB_SEARCH_TOOL_NAME, buildWebSearchInstruction, } from '../../src/core/capabilities/builtins/WebSearch'; -import type { AgentDefinition } from '../../src/core/runtime/AgentDefinition'; +import type { AgentModel } from '../../src/core/runtime/AgentModel'; import { NOOP_AGENT_TRACING } from '../../src/core/tracing/NoopAgentTracing'; import { WebSearchProviders, type IWebSearchProvider } from '../../src/core/web-search/WebSearchProvider'; import { TEST_MODEL_NAME, makeMockILLM, makeSilentLogger } from '../core/harnessMocks'; -function makeDefinition(): AgentDefinition { - return { - modelClient: makeMockILLM(), - modelName: TEST_MODEL_NAME, - }; +function makeModel(): AgentModel { + return { client: makeMockILLM(), name: TEST_MODEL_NAME }; } function runBuiltins(input: { @@ -30,7 +27,7 @@ function runBuiltins(input: { }): ReturnType { return builtinsFromSpec({ spec: input.spec, - definition: makeDefinition(), + model: makeModel(), isChild: input.isChild ?? false, sandboxAvailable: false, tracing: NOOP_AGENT_TRACING, diff --git a/packages/trueforge-core/tests/agent-session/capabilityState.test.ts b/packages/trueforge-core/tests/agent-session/capabilityState.test.ts index ac9af222d1..709b11fccc 100644 --- a/packages/trueforge-core/tests/agent-session/capabilityState.test.ts +++ b/packages/trueforge-core/tests/agent-session/capabilityState.test.ts @@ -285,9 +285,10 @@ describe('capability_state (tfy.plan fixture)', () => { ], }; const thread = new AgentThread({ - definition: { - modelClient: makeMockILLM({ create: jest.fn().mockImplementation(() => emptyLlmStream()) }), - modelName: TEST_MODEL_NAME, + definition: {}, + model: { + client: makeMockILLM({ create: jest.fn().mockImplementation(() => emptyLlmStream()) }), + name: TEST_MODEL_NAME, }, threadId: MAIN_THREAD_ID, title: 'main', diff --git a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts index bae5ff5ec2..2ce199bd5b 100644 --- a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts +++ b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts @@ -46,13 +46,13 @@ describe('TurnResourceResolver.resolveAgentDefinition', () => { logger: makeSilentLogger(), }); - const { definition } = await resolver.resolveAgentDefinition({ + const { model } = await resolver.resolveAgentDefinition({ spec: makeAgentSpec(), signal: new AbortController().signal, tracing: resolver.createTracing(), }); - expect(definition.modelProperties).toBeUndefined(); + expect(model.properties).toBeUndefined(); }); it.each([ @@ -89,15 +89,15 @@ describe('TurnResourceResolver.resolveAgentDefinition', () => { }, }); - const { definition } = await resolver.resolveAgentDefinition({ + const { model } = await resolver.resolveAgentDefinition({ spec, signal: new AbortController().signal, tracing: resolver.createTracing(), }); - expect(definition.modelParams?.['max_tokens']).toBe(expected); - expect(definition.modelName).toBe('provider/model'); - expect(definition.modelProperties?.contextLength).toBe(128_000); + expect(model.params?.['max_tokens']).toBe(expected); + expect(model.name).toBe('provider/model'); + expect(model.properties?.contextLength).toBe(128_000); }); }); diff --git a/packages/trueforge-core/tests/core/llm/toOpenAIChatMessage.test.ts b/packages/trueforge-core/tests/core/llm/toOpenAIChatMessage.test.ts index 9c5f02b21c..28d48b37e3 100644 --- a/packages/trueforge-core/tests/core/llm/toOpenAIChatMessage.test.ts +++ b/packages/trueforge-core/tests/core/llm/toOpenAIChatMessage.test.ts @@ -170,8 +170,6 @@ describe('AgentThread LLM request mapping (end-to-end)', () => { tracing: NOOP_AGENT_TRACING, logger: makeSilentLogger(), definition: { - modelClient, - modelName: TEST_MODEL_NAME, instruction: 'test', toolSets: [], responseFormat: ResponseFormatSchema.parse({ @@ -180,6 +178,10 @@ describe('AgentThread LLM request mapping (end-to-end)', () => { json_schema: { name: 'out', nested_ext: 'keep' }, }), }, + model: { + client: modelClient, + name: TEST_MODEL_NAME, + }, // Prior-turn assistant in context — must be replayed with gateway semantics. context: [{ role: 'user', content: 'prev' }, assistant], }); diff --git a/packages/trueforge-core/tests/core/runtime/deferredLoading.test.ts b/packages/trueforge-core/tests/core/runtime/deferredLoading.test.ts index d600c83760..95185f615d 100644 --- a/packages/trueforge-core/tests/core/runtime/deferredLoading.test.ts +++ b/packages/trueforge-core/tests/core/runtime/deferredLoading.test.ts @@ -110,10 +110,12 @@ async function registeredToolNames(input: { logger: silentLogger, capabilities: input.capabilities, definition: { - modelClient: { create, createNonStream: jest.fn() }, - modelName: TEST_MODEL_NAME, toolSets: input.toolSets ?? [], }, + model: { + client: { create, createNonStream: jest.fn() }, + name: TEST_MODEL_NAME, + }, context: [{ role: 'user', content: 'hi' }], }); for await (const event of thread.execute({ signal: new AbortController().signal })) { diff --git a/packages/trueforge-core/tests/core/runtime/finishReasonError.test.ts b/packages/trueforge-core/tests/core/runtime/finishReasonError.test.ts index eca2303c48..ce10081808 100644 --- a/packages/trueforge-core/tests/core/runtime/finishReasonError.test.ts +++ b/packages/trueforge-core/tests/core/runtime/finishReasonError.test.ts @@ -50,11 +50,13 @@ async function runUntilDone({ tracing: NOOP_AGENT_TRACING, logger: silentLogger, definition: { - modelClient, - modelName: TEST_MODEL_NAME, instruction: 'test', toolSets: [], - ...(modelParams !== undefined ? { modelParams } : {}), + }, + model: { + client: modelClient, + name: TEST_MODEL_NAME, + ...(modelParams !== undefined ? { params: modelParams } : {}), }, context: [{ role: 'user', content: 'hi' }], }); diff --git a/packages/trueforge-core/tests/core/runtime/modelMessageReasoningContent.test.ts b/packages/trueforge-core/tests/core/runtime/modelMessageReasoningContent.test.ts index 8510070b38..1e946dd96f 100644 --- a/packages/trueforge-core/tests/core/runtime/modelMessageReasoningContent.test.ts +++ b/packages/trueforge-core/tests/core/runtime/modelMessageReasoningContent.test.ts @@ -69,11 +69,13 @@ describe('AgentThread model.message reasoning_content', () => { tracing: NOOP_AGENT_TRACING, logger: silentLogger, definition: { - modelClient, - modelName: TEST_MODEL_NAME, instruction: 'test', toolSets: [], }, + model: { + client: modelClient, + name: TEST_MODEL_NAME, + }, context: [{ role: 'user', content: 'hi' }], }); diff --git a/packages/trueforge-core/tests/core/runtime/unknownToolLogging.test.ts b/packages/trueforge-core/tests/core/runtime/unknownToolLogging.test.ts index 93aeafb010..a06860d045 100644 --- a/packages/trueforge-core/tests/core/runtime/unknownToolLogging.test.ts +++ b/packages/trueforge-core/tests/core/runtime/unknownToolLogging.test.ts @@ -94,11 +94,13 @@ describe('AgentThread unknown tool logging', () => { tracing: NOOP_AGENT_TRACING, logger: silentLogger, definition: { - modelClient, - modelName: TEST_MODEL_NAME, instruction: 'test', toolSets: [], }, + model: { + client: modelClient, + name: TEST_MODEL_NAME, + }, context: [{ role: 'user', content: 'hi' }], }); diff --git a/packages/trueforge-core/tests/orchestration/orchestration.test.ts b/packages/trueforge-core/tests/orchestration/orchestration.test.ts index 41643e66c1..75dc59f87f 100644 --- a/packages/trueforge-core/tests/orchestration/orchestration.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestration.test.ts @@ -40,19 +40,19 @@ describe('orchestration: mocked LLM and no tools', () => { it('sends a user message and finishes the thread with a text reply', async () => { const thread = new AgentThread({ definition: { - modelClient: { - create: jest.fn().mockImplementation(() => textReplyStream(REPLY)), - createNonStream: jest.fn().mockImplementation(() => textReplyStream(REPLY)), - }, - modelName: TEST_MODEL_NAME, - instruction: INSTRUCTION, messages: undefined, - modelParams: undefined, responseFormat: undefined, iterationLimit: undefined, toolSets: undefined, }, + model: { + client: { + create: jest.fn().mockImplementation(() => textReplyStream(REPLY)), + createNonStream: jest.fn().mockImplementation(() => textReplyStream(REPLY)), + }, + name: TEST_MODEL_NAME, + }, threadId: THREAD_ID, title: 'orchestration', parent: undefined, @@ -90,6 +90,6 @@ describe('orchestration: mocked LLM and no tools', () => { expect(outcome.events).toMatchObject(EXPECTED_EVENTS); expect(outcome.result).toMatchObject(OUTPUT); expect(outcome.result.root_agent_error).toBeUndefined(); - expect(llmCreateInputs(thread.definition.modelClient)).toMatchObject(EXPECTED_LLM_INPUT); + expect(llmCreateInputs(thread.model.client)).toMatchObject(EXPECTED_LLM_INPUT); }); }); diff --git a/packages/trueforge-core/tests/orchestration/orchestrationApproval.test.ts b/packages/trueforge-core/tests/orchestration/orchestrationApproval.test.ts index b86a9a3e8f..a7c3104a41 100644 --- a/packages/trueforge-core/tests/orchestration/orchestrationApproval.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestrationApproval.test.ts @@ -197,7 +197,7 @@ describe('orchestration: pause then resume on tool approval', () => { const paused = await driveUntilPauseOrDone(iterator); expect(paused.kind).toBe('paused'); expect(paused.events).toMatchObject(EXPECTED_TURN_1_EVENTS); - expect(llmCreateInputs(thread.definition.modelClient)).toMatchObject(EXPECTED_TURN_1_LLM_INPUT); + expect(llmCreateInputs(thread.model.client)).toMatchObject(EXPECTED_TURN_1_LLM_INPUT); expect(callTool).not.toHaveBeenCalled(); // Resume the SAME execute(): enqueue the approval via send() (drain the generator so the @@ -225,10 +225,7 @@ describe('orchestration: pause then resume on tool approval', () => { expect(resumed.result).toMatchObject(TURN_2_OUTPUT); expect(resumed.result.root_agent_error).toBeUndefined(); expect(callTool).toHaveBeenCalledTimes(1); - expect(llmCreateInputs(thread.definition.modelClient)).toMatchObject([ - ...EXPECTED_TURN_1_LLM_INPUT, - EXPECTED_TURN_2_INPUT, - ]); + expect(llmCreateInputs(thread.model.client)).toMatchObject([...EXPECTED_TURN_1_LLM_INPUT, EXPECTED_TURN_2_INPUT]); }); }); @@ -333,10 +330,7 @@ describe('orchestration: pause then resume on tool approval', () => { expect(resumed.result).toMatchObject(TURN_2_OUTPUT); expect(resumed.result.root_agent_error).toBeUndefined(); expect(callTool).not.toHaveBeenCalled(); - expect(llmCreateInputs(thread.definition.modelClient)).toMatchObject([ - ...EXPECTED_TURN_1_LLM_INPUT, - EXPECTED_TURN_2_INPUT, - ]); + expect(llmCreateInputs(thread.model.client)).toMatchObject([...EXPECTED_TURN_1_LLM_INPUT, EXPECTED_TURN_2_INPUT]); }); }); }); @@ -665,18 +659,19 @@ describe('AgentThreadOrchestrator.send: approval policy validation', () => { toolSet = makeApprovalGatedWriteNoteToolSet().toolSet; const thread = new AgentThread({ definition: { - modelClient: { - create: jest.fn(), - createNonStream: jest.fn(), - }, - modelName: TEST_MODEL_NAME, instruction: INSTRUCTION, messages: undefined, - modelParams: undefined, responseFormat: undefined, iterationLimit: undefined, toolSets: [toolSet], }, + model: { + client: { + create: jest.fn(), + createNonStream: jest.fn(), + }, + name: TEST_MODEL_NAME, + }, threadId: ROOT_ID, title: 'orchestration-approval-policy', parent: undefined, @@ -825,21 +820,21 @@ function makeApprovalHarness( const { toolSet, callTool } = makeApprovalGatedWriteNoteToolSet(); const agentThreadInput: AgentThreadConstructorInput = { definition: { - modelClient: { + instruction: INSTRUCTION, + messages: undefined, + responseFormat: undefined, + iterationLimit: undefined, + toolSets: undefined, + }, + model: { + client: { create: jest .fn() .mockImplementationOnce(() => writeNoteToolCallStream()) .mockImplementation(() => textReplyStream(finalReply)), createNonStream: jest.fn(), }, - modelName: TEST_MODEL_NAME, - - instruction: INSTRUCTION, - messages: undefined, - modelParams: undefined, - responseFormat: undefined, - iterationLimit: undefined, - toolSets: undefined, + name: TEST_MODEL_NAME, }, threadId: ROOT_ID, title: 'orchestration-approval', @@ -890,20 +885,21 @@ function makeApprovalHarnessWithUserToolSet( const { toolSet, callTool } = makeApprovalGatedWriteNoteToolSet(); const agentThreadInput: AgentThreadConstructorInput = { definition: { - modelClient: { + instruction: INSTRUCTION, + messages: undefined, + responseFormat: undefined, + iterationLimit: undefined, + toolSets: [toolSet], + }, + model: { + client: { create: jest .fn() .mockImplementationOnce(() => writeNoteToolCallStream()) .mockImplementation(() => textReplyStream(finalReply)), createNonStream: jest.fn(), }, - modelName: TEST_MODEL_NAME, - instruction: INSTRUCTION, - messages: undefined, - modelParams: undefined, - responseFormat: undefined, - iterationLimit: undefined, - toolSets: [toolSet], + name: TEST_MODEL_NAME, }, threadId: ROOT_ID, title: 'orchestration-approval-policy-flow', diff --git a/packages/trueforge-core/tests/orchestration/orchestrationMcpAuth.test.ts b/packages/trueforge-core/tests/orchestration/orchestrationMcpAuth.test.ts index 8b082faa00..54a14d6e45 100644 --- a/packages/trueforge-core/tests/orchestration/orchestrationMcpAuth.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestrationMcpAuth.test.ts @@ -32,18 +32,19 @@ function makeAuthBlockedThread(threadId: string): AgentThread { }; const input: AgentThreadConstructorInput = { definition: { - modelClient: { - create: jest.fn(() => textReplyStream(`${threadId} done`)), - createNonStream: jest.fn(), - }, - modelName: TEST_MODEL_NAME, instruction: undefined, messages: [{ role: 'user', content: 'continue' }], - modelParams: undefined, responseFormat: undefined, iterationLimit: undefined, toolSets: undefined, }, + model: { + client: { + create: jest.fn(() => textReplyStream(`${threadId} done`)), + createNonStream: jest.fn(), + }, + name: TEST_MODEL_NAME, + }, threadId, title: threadId, parent: undefined, @@ -121,7 +122,7 @@ describe('orchestration: MCP auth continuation', () => { while (!step.done) { step = await withTimeout(iterator.next(), 1_000, 'MCP-auth resumed completion'); } - expect(first.definition.modelClient.create).toHaveBeenCalledTimes(1); - expect(second.definition.modelClient.create).toHaveBeenCalledTimes(1); + expect(first.model.client.create).toHaveBeenCalledTimes(1); + expect(second.model.client.create).toHaveBeenCalledTimes(1); }); }); diff --git a/packages/trueforge-core/tests/orchestration/orchestrationUserMessageReset.test.ts b/packages/trueforge-core/tests/orchestration/orchestrationUserMessageReset.test.ts index 8e4be50d5d..bd498b6ec0 100644 --- a/packages/trueforge-core/tests/orchestration/orchestrationUserMessageReset.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestrationUserMessageReset.test.ts @@ -60,19 +60,19 @@ function baseThreadInput( ): AgentThreadConstructorInput { return { definition: { - modelClient: { - create: jest.fn().mockImplementation(() => textReplyStream(ROOT_REPLY)), - createNonStream: jest.fn().mockImplementation(() => textReplyStream(ROOT_REPLY)), - }, - modelName: TEST_MODEL_NAME, - instruction: INSTRUCTION, messages: undefined, - modelParams: undefined, responseFormat: undefined, iterationLimit: undefined, toolSets: undefined, }, + model: { + client: { + create: jest.fn().mockImplementation(() => textReplyStream(ROOT_REPLY)), + createNonStream: jest.fn().mockImplementation(() => textReplyStream(ROOT_REPLY)), + }, + name: TEST_MODEL_NAME, + }, parent: undefined, agentInfo: undefined, context: undefined, @@ -108,20 +108,21 @@ describe('orchestration: user-message reset', () => { pendingMCPAuth: true, context: [assistantWithCalls([approvalToolCall('call-child-hitl')])], definition: { - modelClient: { - create: jest.fn().mockImplementation(() => { - throw new Error('cancelled child must not call the model'); - }), - createNonStream: jest.fn(), - }, - modelName: TEST_MODEL_NAME, instruction: undefined, messages: undefined, - modelParams: undefined, responseFormat: undefined, iterationLimit: undefined, toolSets: undefined, }, + model: { + client: { + create: jest.fn().mockImplementation(() => { + throw new Error('cancelled child must not call the model'); + }), + createNonStream: jest.fn(), + }, + name: TEST_MODEL_NAME, + }, }), ); @@ -180,7 +181,7 @@ describe('orchestration: user-message reset', () => { ]), ); expect(result.output?.content).toBe(ROOT_REPLY); - expect(llmCreateInputs(main.definition.modelClient)).toHaveLength(1); + expect(llmCreateInputs(main.model.client)).toHaveLength(1); }); it('delivers a finished child send_to_parent instead of the cancel string', async () => { diff --git a/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts b/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts index 3901012c1f..295eed045e 100644 --- a/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts @@ -110,23 +110,23 @@ describe('orchestration: dynamic sub-agent', () => { let agentThreadInput: AgentThreadConstructorInput = { // AgentDefinition definition: { + instruction: INSTRUCTION, + // Undefined + messages: undefined, + responseFormat: undefined, + iterationLimit: undefined, + toolSets: undefined, + }, + model: { // This is an instance if ILLM - modelClient: { + client: { create: jest .fn() .mockImplementationOnce(() => createSubAgentStream()) .mockImplementation(() => textReplyStream(ROOT_FINAL)), createNonStream: jest.fn(), }, - modelName: TEST_MODEL_NAME, - - instruction: INSTRUCTION, - // Undefined - messages: undefined, - modelParams: undefined, - responseFormat: undefined, - iterationLimit: undefined, - toolSets: undefined, + name: TEST_MODEL_NAME, }, threadId: ROOT_ID, title: 'orchestration-with-tools', @@ -159,18 +159,15 @@ describe('orchestration: dynamic sub-agent', () => { }; const agentDefinition: AgentDefinition = { - modelClient: childLLM, - modelName: TEST_MODEL_NAME, - instruction: undefined, messages: [{ role: 'user', content: request.input }], - modelParams: parentDefinition.modelParams, responseFormat: undefined, iterationLimit: parentDefinition.iterationLimit, toolSets: undefined, }; return new AgentThread({ definition: agentDefinition, + model: { client: childLLM, name: TEST_MODEL_NAME }, threadId, title: request.name, parent, @@ -209,7 +206,7 @@ describe('orchestration: dynamic sub-agent', () => { expect(outcome.events).toMatchObject(EXPECTED_EVENTS); expect(outcome.result).toMatchObject(OUTPUT); expect(outcome.result.root_agent_error).toBeUndefined(); - expect(llmCreateInputs(thread_1.definition.modelClient)).toMatchObject(EXPECTED_ROOT_LLM_INPUT); + expect(llmCreateInputs(thread_1.model.client)).toMatchObject(EXPECTED_ROOT_LLM_INPUT); if (childLLM === undefined) { throw new Error('expected child LLM to be created'); } diff --git a/packages/trueforge/src/runtime/sessionResources.ts b/packages/trueforge/src/runtime/sessionResources.ts index a99448fd90..708e4072b2 100644 --- a/packages/trueforge/src/runtime/sessionResources.ts +++ b/packages/trueforge/src/runtime/sessionResources.ts @@ -2,7 +2,7 @@ import type { AgentSpec } from '@truefoundry/trueforge-core/agent-session'; import { Sandbox, SkillMounter, - type AgentDefinition, + type AgentModel, type AgentTracing, type DaytonaSandboxEnvironment, type McpConnection, @@ -70,7 +70,7 @@ export async function getModelDetails({ }): Promise<{ providerConfig: VercelAIProviderConfig; defaultModelParams: ModelParams; - modelProperties: AgentDefinition['modelProperties']; + modelProperties: AgentModel['properties']; reasoningEfforts: ReasoningEffort[] | undefined; }> { const parsed = parseModelFqn(name); From fd7906f350a4494ddd426f483289d38710851345 Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Wed, 18 Nov 2026 18:11:30 +0530 Subject: [PATCH 2/7] Fix subagent model overrides: own default params, record and restore the actual model Co-authored-by: Cursor --- .changeset/thread-run-model.md | 6 ++ .../src/agent-session/SessionHandle.ts | 12 ++- .../src/agent-session/TurnHandle.ts | 1 + .../src/agent-session/TurnResourceResolver.ts | 9 +- .../src/agent-session/store/ISessionStore.ts | 7 +- .../store/InMemorySessionStore.ts | 10 ++ .../src/core/runtime/AgentThread.ts | 1 + .../src/core/runtime/AgentThread.types.ts | 2 + .../core/runtime/AgentThreadOrchestrator.ts | 2 +- .../agent-session/resolveAgentSpec.test.ts | 98 +++++++++++++++++++ .../agent-session/store/storeContractSuite.ts | 63 ++++++++++++ .../tests/agent-session/testHelpers.ts | 3 + .../orchestrationWithTools.test.ts | 5 +- .../20261118_000001_turn_thread_model.ts | 20 ++++ .../session-store/PostgresSessionStore.ts | 1 + .../postgres/session-store/queries/threads.ts | 1 + .../postgres/session-store/queries/turns.ts | 5 + packages/trueforge/src/db/postgres/types.ts | 1 + .../20261118_000001_turn_thread_model.ts | 22 +++++ .../session-store/SqliteSessionStore.ts | 1 + .../sqlite/session-store/queries/threads.ts | 1 + .../db/sqlite/session-store/queries/turns.ts | 5 + packages/trueforge/src/db/sqlite/types.ts | 1 + 23 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 .changeset/thread-run-model.md create mode 100644 packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts create mode 100644 packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts diff --git a/.changeset/thread-run-model.md b/.changeset/thread-run-model.md new file mode 100644 index 0000000000..4311d1b97e --- /dev/null +++ b/.changeset/thread-run-model.md @@ -0,0 +1,6 @@ +--- +'@truefoundry/trueforge-core': patch +'@truefoundry/trueforge': patch +--- + +A subagent on a different model from its parent no longer inherits the parent's model params: it runs on that model's own defaults (its known `max_tokens`, or none) with parallel tool calls on. `thread.created` records the model the subagent actually runs on, every thread's checkpoint records the model it ran on in each turn, and a rebuilt subagent comes back on that model; the root still follows its spec. diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index caf0bd408f..a5dc6fe34a 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -42,11 +42,12 @@ export function resolvePreviousTurnId( } function toNewThreadInit(snapshot: AgentThreadSnapshot): NewThreadInit { - const { context, current_context_usage, completion, capability_state, ...rest } = snapshot; + const { context, current_context_usage, completion, capability_state, model, ...rest } = snapshot; void context; void current_context_usage; void completion; void capability_state; + void model; return rest; } @@ -255,6 +256,10 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), + thread_models: [...agentThreads].map(([thread_id, thread]) => ({ + thread_id, + model: thread.model.name, + })), update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); @@ -507,9 +512,12 @@ export class SessionHandle< await Promise.all( threadIds.map(async threadId => { const previousThreadSnapshot = snapshots?.[threadId]; + const agentInfo = previousThreadSnapshot?.agent_info ?? undefined; + const savedModel = previousThreadSnapshot?.model ?? undefined; const resolved = await input.resolver.resolveAgentDefinition({ spec: input.spec, - agent_info: previousThreadSnapshot?.agent_info ?? undefined, + // A subagent comes back on the model it ran on; the root follows its spec. + agent_info: agentInfo && savedModel ? { ...agentInfo, model: savedModel } : agentInfo, previousTurn: input.previous, signal: input.signal, tracing: input.tracing, diff --git a/packages/trueforge-core/src/agent-session/TurnHandle.ts b/packages/trueforge-core/src/agent-session/TurnHandle.ts index 7c89b6a1f1..c20ccc46db 100644 --- a/packages/trueforge-core/src/agent-session/TurnHandle.ts +++ b/packages/trueforge-core/src/agent-session/TurnHandle.ts @@ -768,6 +768,7 @@ export class TurnHandle; /** Full post-send capability map for one thread. */ export type ThreadCapabilityStateInit = Pick; +/** Model one thread runs on in this turn. */ +export type ThreadModelInit = Pick; + /** One drained send() append batch for one thread; writer = the new turn. */ export interface TurnContextAppend { thread_id: string; @@ -139,6 +142,8 @@ export interface CreateTurnInput = input.previousSnapshot @@ -169,6 +171,13 @@ function buildSnapshotFromDelta(input: { } thread.capability_state = deepCopy(capability.capability_state); } + for (const { thread_id, model } of input.thread_models) { + const thread = threads[thread_id]; + if (thread === undefined) { + throw new SessionStoreInvariantError(`thread_models references unknown thread ${thread_id}`); + } + thread.model = model; + } return { threads, @@ -442,6 +451,7 @@ export class InMemorySessionStore< new_threads: input.new_threads, new_context_appends: input.new_context_appends, capability_states: input.capability_states, + thread_models: input.thread_models, created_at: input.turn.created_at, }); diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.ts b/packages/trueforge-core/src/core/runtime/AgentThread.ts index 8728a4da91..e2f54d5f20 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.ts @@ -934,6 +934,7 @@ export class AgentThread { current_context_usage: this.currentContextUsage, parent: this.parent ?? null, agent_info: this.agentInfo ?? null, + model: this.model.name, completion: this.preComputedCompletion ?? null, pending_mcp_auth: this.pendingMCPAuth, capability_state, diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts index f08d761491..1171e64130 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts @@ -208,6 +208,8 @@ export interface AgentThreadSnapshot { current_context_usage: CurrentContextUsage; parent: AgentParent | null; agent_info: AgentInfo | null; + /** Model the thread ran on in this turn; null when not recorded. A rebuilt subagent runs on it; the root follows its spec. */ + model: string | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; /** Cross-turn capability KV. Keys: capability.state.key; `tfy.` reserved for builtins. */ diff --git a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts index 07b7c8a696..e1c132d174 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts @@ -583,7 +583,7 @@ export class AgentThreadOrchestrator { type: 'dynamic', name: chunk.agent_info.name, input: chunk.agent_info.input, - model: chunk.agent_info.model, + model: subAgentThread.model.name, }, created_at: new Date().toISOString(), parent, diff --git a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts index 2ce199bd5b..78421e835b 100644 --- a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts +++ b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts @@ -1,8 +1,10 @@ +import { MAIN_THREAD_ID } from '../../src/agent-session/models/TurnRecord'; import { AgentSpecSchema } from '../../src/agent-session/schemas/agentSpec'; import { EventType } from '../../src/agent-session/schemas/events'; import { Sessions } from '../../src/agent-session/Sessions'; import { InMemorySessionStore } from '../../src/agent-session/store/InMemorySessionStore'; import { TurnResourceResolver } from '../../src/agent-session/TurnResourceResolver'; +import { getEmptyCurrentContextUsage } from '../../src/core/runtime/contextUsage'; import { makeAgentSpec, makeMockILLM, @@ -99,6 +101,44 @@ describe('TurnResourceResolver.resolveAgentDefinition', () => { expect(model.name).toBe('provider/model'); expect(model.properties?.contextLength).toBe(128_000); }); + + it.each([ + { + name: "runs another model on its own defaults, not the agent's params", + resolvedModelParams: { max_tokens: 4096 }, + expected: { max_tokens: 4096, parallel_tool_calls: true }, + }, + { + name: "sends no max_tokens on another model whose limit isn't known", + resolvedModelParams: {}, + expected: { parallel_tool_calls: true }, + }, + ])('$name', async ({ resolvedModelParams, expected }) => { + const resolver = new TurnResourceResolver({ + llm: () => + Promise.resolve({ + modelClient: makeMockILLM(), + defaultModelParams: resolvedModelParams, + providerType: undefined, + }), + mcp: () => Promise.resolve(undefined), + mcpRequestTimeoutMs: 1_000, + mcpConnectTimeoutMs: 1_000, + logger: makeSilentLogger(), + }); + const spec = AgentSpecSchema.parse({ + model: { name: 'provider/model', params: { max_tokens: 8192, temperature: 0.2, reasoning_effort: 'high' } }, + }); + + const { model } = await resolver.resolveAgentDefinition({ + spec, + agent_info: { type: 'dynamic', name: 'worker', input: 'task', model: 'provider/other' }, + signal: new AbortController().signal, + tracing: resolver.createTracing(), + }); + + expect(model.params).toEqual(expected); + }); }); describe('SessionHandle.createTurn named resolve', () => { @@ -128,3 +168,61 @@ describe('SessionHandle.createTurn named resolve', () => { expect(agent).toHaveBeenCalledWith('agent-abc'); }); }); + +describe('SessionHandle rebuild', () => { + it('brings a subagent back on the model it ran on, and the root on its spec model', async () => { + const store = new InMemorySessionStore(); + const sessions = new Sessions({ sessionStore: store }); + const session = await sessions.create({ + tenant_id: 'tenant-1', + session_id: 's-rebuild', + created_by_subject: { subject_id: 'user-1', subject_type: 'user', subject_display_name: 'user-1' }, + agent: { type: 'inline', spec: makeAgentSpec() }, + external_id: null, + }); + const turn1 = await session.createTurn({ + turn_id: mintTestTurnId(), + active_executor_id: TEST_ACTIVE_EXECUTOR_ID, + input: [{ type: EventType.USER_MESSAGE, content: 'hi' }], + previous_turn_id: 'none', + abortController: new AbortController(), + resolver: makeTestResolver(), + }); + await store.addThreads({ + active_executor_id: TEST_ACTIVE_EXECUTOR_ID, + session_id: 's-rebuild', + turn_id: turn1.id, + threads: [ + { + thread_id: 'child', + context: [], + current_context_usage: getEmptyCurrentContextUsage(), + parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, + agent_info: { type: 'dynamic', name: 'child', input: 'task', model: 'acct/requested' }, + model: 'acct/routed', + completion: null, + pending_mcp_auth: false, + capability_state: null, + }, + ], + }); + for await (const event of turn1.stream()) { + void event; + } + + const resolver = makeTestResolver(); + const resolveAgentDefinition = jest.spyOn(resolver, 'resolveAgentDefinition'); + await session.createTurn({ + turn_id: mintTestTurnId(), + active_executor_id: TEST_ACTIVE_EXECUTOR_ID, + input: [{ type: EventType.USER_MESSAGE, content: 'again' }], + previous_turn_id: 'auto', + abortController: new AbortController(), + resolver, + }); + + const agentInfos = resolveAgentDefinition.mock.calls.map(([input]) => input.agent_info); + expect(agentInfos).toContainEqual(expect.objectContaining({ name: 'child', model: 'acct/routed' })); + expect(agentInfos).toContainEqual(undefined); + }); +}); diff --git a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts index 9bb64d03db..949ec3b07a 100644 --- a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts +++ b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts @@ -163,6 +163,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'task' }, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, @@ -1669,6 +1670,64 @@ export function runStoreContractSuite( expect(mustGet(afterSecond).metrics.total_turns).toBe(2); }); + it("records each thread's model per turn, keeping the previous one when a turn has no entry", async () => { + const store = createStore(); + await seedSession(store); + const modelOf = async (turnId: string) => + mustGet(await store.getTurn({ session_id: sessionId, turn_id: turnId })).snapshot.threads[MAIN_THREAD_ID] + ?.model; + await store.createTurn( + makeCreateTurnInput({ + sessionId, + turnId: 'turn-1', + thread_models: [{ thread_id: MAIN_THREAD_ID, model: 'acct/model-a' }], + }), + ); + await finishTurn(store, 'turn-1'); + await store.createTurn( + makeCreateTurnInput({ + sessionId, + turnId: 'turn-2', + previousTurnId: 'turn-1', + firstTurnId: 'turn-1', + thread_models: [{ thread_id: MAIN_THREAD_ID, model: 'acct/model-b' }], + }), + ); + await finishTurn(store, 'turn-2'); + await store.createTurn( + makeCreateTurnInput({ sessionId, turnId: 'turn-3', previousTurnId: 'turn-2', firstTurnId: 'turn-1' }), + ); + expect(await modelOf('turn-1')).toBe('acct/model-a'); + expect(await modelOf('turn-2')).toBe('acct/model-b'); + expect(await modelOf('turn-3')).toBe('acct/model-b'); + }); + + it('keeps the model of a thread added mid-turn', async () => { + const store = createStore(); + await seedSession(store); + await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' })); + await store.addThreads({ + active_executor_id: TEST_ACTIVE_EXECUTOR_ID, + session_id: sessionId, + turn_id: 'turn-1', + threads: [ + { + thread_id: 'child', + context: [], + current_context_usage: getEmptyCurrentContextUsage(), + parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, + agent_info: { type: 'dynamic', name: 'child', input: 'task', model: 'acct/model-c' }, + model: 'acct/model-c', + completion: null, + pending_mcp_auth: false, + capability_state: null, + }, + ], + }); + const turn = mustGet(await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' })); + expect(turn.snapshot.threads['child']?.model).toBe('acct/model-c'); + }); + it('update_session_title_if_not_exist sets once and never overwrites', async () => { const store = createStore(); await seedSession(store); @@ -2332,6 +2391,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'do work' }, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, @@ -2499,6 +2559,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'do work' }, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, @@ -3616,6 +3677,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'do work' }, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, @@ -4404,6 +4466,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'task' }, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, diff --git a/packages/trueforge-core/tests/agent-session/testHelpers.ts b/packages/trueforge-core/tests/agent-session/testHelpers.ts index 62d6c15cd7..b59075b7ed 100644 --- a/packages/trueforge-core/tests/agent-session/testHelpers.ts +++ b/packages/trueforge-core/tests/agent-session/testHelpers.ts @@ -210,6 +210,7 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; + thread_models?: CreateTurnInput['thread_models']; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ @@ -230,6 +231,7 @@ export function makeCreateTurnInput(input: { completion: append.completion ?? null, })), capability_states: input.capability_states ?? [{ thread_id: MAIN_THREAD_ID, capability_state: null }], + thread_models: input.thread_models ?? [], update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }; } @@ -279,6 +281,7 @@ export function makeRunningTurnRecord(input: { current_context_usage: getEmptyCurrentContextUsage(), parent: null, agent_info: null, + model: null, completion: null, pending_mcp_auth: false, capability_state: null, diff --git a/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts b/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts index 295eed045e..d9d9ed4eee 100644 --- a/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts +++ b/packages/trueforge-core/tests/orchestration/orchestrationWithTools.test.ts @@ -18,6 +18,8 @@ const CHILD_REPLY = 'hello from the child'; const ROOT_FINAL = 'How are you?'; const INSTRUCTION = 'You are running in a test setup.'; const CHILD_TASK = 'do the delegated task'; +/** Chosen by the thread factory, not the parent's request, as when the subagent's model is routed. */ +const CHILD_MODEL = 'provider/child-model'; const CREATE_SUB_AGENT_ARGS = JSON.stringify({ name: 'worker', input: CHILD_TASK }); @@ -45,6 +47,7 @@ const EXPECTED_EVENTS = [ { type: EventType.THREAD_CREATED, title: 'worker', + agent_info: { name: 'worker', model: CHILD_MODEL }, parent: { thread_id: ROOT_ID, tool_call_id: TOOL_CALL_ID }, }, { type: EventType.MODEL_MESSAGE, thread_id: expect.any(String) }, @@ -167,7 +170,7 @@ describe('orchestration: dynamic sub-agent', () => { }; return new AgentThread({ definition: agentDefinition, - model: { client: childLLM, name: TEST_MODEL_NAME }, + model: { client: childLLM, name: CHILD_MODEL }, threadId, title: request.name, parent, diff --git a/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts b/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts new file mode 100644 index 0000000000..519a04c16c --- /dev/null +++ b/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts @@ -0,0 +1,20 @@ +import { sql, type Kysely } from 'kysely'; + +/** Make the per-thread model explicit on every persisted checkpoint; rows written before it was recorded get null. */ +export async function up(db: Kysely): Promise { + await sql`SET LOCAL lock_timeout = '5s'`.execute(db); + await sql` + UPDATE turn_thread + SET checkpoint = jsonb_set(checkpoint, '{model}', 'null'::jsonb, true) + WHERE NOT checkpoint ? 'model' + `.execute(db); +} + +export async function down(db: Kysely): Promise { + await sql`SET LOCAL lock_timeout = '5s'`.execute(db); + await sql` + UPDATE turn_thread + SET checkpoint = checkpoint - 'model' + WHERE checkpoint ? 'model' + `.execute(db); +} diff --git a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts index 68e82866ba..31d15adc22 100644 --- a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts +++ b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts @@ -174,6 +174,7 @@ export class PostgresSessionStore implements ISessionStore })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, + thread_models: input.thread_models, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/postgres/session-store/queries/threads.ts b/packages/trueforge/src/db/postgres/session-store/queries/threads.ts index 9ceb1e1a15..0bf98aacd5 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/threads.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/threads.ts @@ -75,6 +75,7 @@ async function addThreadsInTransaction(db: Transaction, input: AddThre parent: thread.parent ?? null, completion: thread.completion ?? null, pending_mcp_auth: thread.pending_mcp_auth, + model: thread.model, }; turnThreadPlans.push({ thread_id: thread.thread_id, diff --git a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts index 13466b3dc1..4b6202e363 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts @@ -116,6 +116,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + thread_models: { thread_id: string; model: string | null }[]; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -439,6 +440,7 @@ async function assembleTurnRecord( current_context_usage: meta.current_context_usage, parent: meta.checkpoint.parent, agent_info: meta.agent_info, + model: meta.checkpoint.model, completion: meta.checkpoint.completion, pending_mcp_auth: meta.checkpoint.pending_mcp_auth, capability_state, @@ -688,6 +690,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): appendCompletionByThread.set(append.thread_id, append.completion); } } + const modelByThread = new Map(input.thread_models.map(entry => [entry.thread_id, entry.model])); // step5: child turn_thread rows — carried = parent || new ids; new = fresh row. const turnThreadRows: TurnThreadInsertRow[] = []; @@ -702,6 +705,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): // Do not carry an MCP-auth pause into a new successor turn. Start it unblocked so // initialization can emit a new mcp.auth_required event if auth is still missing. pending_mcp_auth: false, + model: modelByThread.get(pt.thread_id) ?? pt.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, @@ -722,6 +726,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, + model: modelByThread.get(nt.thread_id) ?? null, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/postgres/types.ts b/packages/trueforge/src/db/postgres/types.ts index 26f3968c67..10749d6d47 100644 --- a/packages/trueforge/src/db/postgres/types.ts +++ b/packages/trueforge/src/db/postgres/types.ts @@ -51,6 +51,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; + model: string | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ diff --git a/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts b/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts new file mode 100644 index 0000000000..7d32425695 --- /dev/null +++ b/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts @@ -0,0 +1,22 @@ +import { sql, type Kysely } from 'kysely'; + +/** Make the per-thread model explicit on every persisted checkpoint; rows written before it was recorded get null. */ +export async function up(db: Kysely): Promise { + await db.transaction().execute(async trx => { + await sql` + UPDATE turn_thread + SET checkpoint = jsonb_set(checkpoint, '$.model', jsonb('null')) + WHERE json_type(checkpoint, '$.model') IS NULL + `.execute(trx); + }); +} + +export async function down(db: Kysely): Promise { + await db.transaction().execute(async trx => { + await sql` + UPDATE turn_thread + SET checkpoint = jsonb_remove(checkpoint, '$.model') + WHERE json_type(checkpoint, '$.model') IS NOT NULL + `.execute(trx); + }); +} diff --git a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts index 932d1854c7..b08017b8a3 100644 --- a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts +++ b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts @@ -172,6 +172,7 @@ export class SqliteSessionStore implements ISessionStore, })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, + thread_models: input.thread_models, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/threads.ts b/packages/trueforge/src/db/sqlite/session-store/queries/threads.ts index 0661be5e3e..c078a2557f 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/threads.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/threads.ts @@ -70,6 +70,7 @@ async function addThreadsInTransaction(db: Transaction, input: AddThre parent: thread.parent ?? null, completion: thread.completion ?? null, pending_mcp_auth: thread.pending_mcp_auth, + model: thread.model, }; turnThreadPlans.push({ thread_id: thread.thread_id, diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts index cffba13b3a..6efcb7e77d 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts @@ -120,6 +120,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + thread_models: { thread_id: string; model: string | null }[]; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -435,6 +436,7 @@ async function assembleTurnRecord( current_context_usage: meta.current_context_usage, parent: meta.checkpoint.parent, agent_info: meta.agent_info, + model: meta.checkpoint.model, completion: meta.checkpoint.completion, pending_mcp_auth: meta.checkpoint.pending_mcp_auth, capability_state, @@ -658,6 +660,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): appendCompletionByThread.set(append.thread_id, append.completion); } } + const modelByThread = new Map(input.thread_models.map(entry => [entry.thread_id, entry.model])); // Step 5: insert turn_thread rows for carried-forward and new threads. const turnThreadRows: { @@ -685,6 +688,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): ...parent.checkpoint, ...(completion !== undefined ? { completion } : {}), pending_mcp_auth: false, + model: modelByThread.get(parent.thread_id) ?? parent.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, @@ -749,6 +753,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, + model: modelByThread.get(nt.thread_id) ?? null, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/sqlite/types.ts b/packages/trueforge/src/db/sqlite/types.ts index daf8d3d0a6..2e69fc1bdd 100644 --- a/packages/trueforge/src/db/sqlite/types.ts +++ b/packages/trueforge/src/db/sqlite/types.ts @@ -54,6 +54,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; + model: string | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ From a858bd3ea930950cb191c405d8b1ff1c08e228ce Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Wed, 18 Nov 2026 18:14:31 +0530 Subject: [PATCH 3/7] chore: combine the AGE-2841 changesets Co-authored-by: Cursor --- .changeset/agent-model-split.md | 6 ------ .changeset/thread-run-model.md | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 .changeset/agent-model-split.md diff --git a/.changeset/agent-model-split.md b/.changeset/agent-model-split.md deleted file mode 100644 index d20ce0acbd..0000000000 --- a/.changeset/agent-model-split.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@truefoundry/trueforge-core': patch -'@truefoundry/trueforge': patch ---- - -Split the model out of `AgentDefinition`: a thread now takes its `definition` (instructions, messages, tools, response format, iteration limit) and a separate `model` (`AgentModel`: client, name, provider type, properties and params). `resolveAgentDefinition` returns both. No behaviour change. diff --git a/.changeset/thread-run-model.md b/.changeset/thread-run-model.md index 4311d1b97e..558e49061a 100644 --- a/.changeset/thread-run-model.md +++ b/.changeset/thread-run-model.md @@ -3,4 +3,4 @@ '@truefoundry/trueforge': patch --- -A subagent on a different model from its parent no longer inherits the parent's model params: it runs on that model's own defaults (its known `max_tokens`, or none) with parallel tool calls on. `thread.created` records the model the subagent actually runs on, every thread's checkpoint records the model it ran on in each turn, and a rebuilt subagent comes back on that model; the root still follows its spec. +Persist the model each thread runs on, so a rebuilt subagent resumes on it. A subagent on a different model from its parent runs on that model's own defaults instead of the parent's params. `AgentDefinition` no longer carries the model; it's a separate `AgentModel`. From c2b44037ff9c81aabe0fca126105027119c70840 Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Thu, 19 Nov 2026 10:48:02 +0530 Subject: [PATCH 4/7] Address review: record each thread's model when it's created createTurn no longer takes per-thread models: a thread's model is recorded when the thread is created (the root via createTurn's new threads, a subagent via thread.created) and carried with its row. Co-authored-by: Cursor --- .changeset/thread-run-model.md | 2 +- .../src/agent-session/SessionHandle.ts | 7 +--- .../src/agent-session/store/ISessionStore.ts | 7 +--- .../store/InMemorySessionStore.ts | 11 +---- .../src/core/runtime/AgentThread.types.ts | 2 +- .../agent-session/store/storeContractSuite.ts | 40 ++++--------------- .../tests/agent-session/testHelpers.ts | 3 +- .../session-store/PostgresSessionStore.ts | 2 +- .../postgres/session-store/queries/turns.ts | 6 +-- .../session-store/SqliteSessionStore.ts | 2 +- .../db/sqlite/session-store/queries/turns.ts | 6 +-- 11 files changed, 19 insertions(+), 69 deletions(-) diff --git a/.changeset/thread-run-model.md b/.changeset/thread-run-model.md index 558e49061a..64ba9b0a8d 100644 --- a/.changeset/thread-run-model.md +++ b/.changeset/thread-run-model.md @@ -3,4 +3,4 @@ '@truefoundry/trueforge': patch --- -Persist the model each thread runs on, so a rebuilt subagent resumes on it. A subagent on a different model from its parent runs on that model's own defaults instead of the parent's params. `AgentDefinition` no longer carries the model; it's a separate `AgentModel`. +Persist the model each subagent runs on, so a rebuilt subagent resumes on it. A subagent on a different model from its parent runs on that model's own defaults instead of the parent's params. `AgentDefinition` no longer carries the model; it's a separate `AgentModel`. diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index a5dc6fe34a..de2483669b 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -42,12 +42,11 @@ export function resolvePreviousTurnId( } function toNewThreadInit(snapshot: AgentThreadSnapshot): NewThreadInit { - const { context, current_context_usage, completion, capability_state, model, ...rest } = snapshot; + const { context, current_context_usage, completion, capability_state, ...rest } = snapshot; void context; void current_context_usage; void completion; void capability_state; - void model; return rest; } @@ -256,10 +255,6 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), - thread_models: [...agentThreads].map(([thread_id, thread]) => ({ - thread_id, - model: thread.model.name, - })), update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); diff --git a/packages/trueforge-core/src/agent-session/store/ISessionStore.ts b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts index 8119b0d1d3..a319727c35 100644 --- a/packages/trueforge-core/src/agent-session/store/ISessionStore.ts +++ b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts @@ -108,15 +108,12 @@ export type TurnRecordWithoutSnapshot; /** Full post-send capability map for one thread. */ export type ThreadCapabilityStateInit = Pick; -/** Model one thread runs on in this turn. */ -export type ThreadModelInit = Pick; - /** One drained send() append batch for one thread; writer = the new turn. */ export interface TurnContextAppend { thread_id: string; @@ -142,8 +139,6 @@ export interface CreateTurnInput = input.previousSnapshot @@ -171,13 +170,6 @@ function buildSnapshotFromDelta(input: { } thread.capability_state = deepCopy(capability.capability_state); } - for (const { thread_id, model } of input.thread_models) { - const thread = threads[thread_id]; - if (thread === undefined) { - throw new SessionStoreInvariantError(`thread_models references unknown thread ${thread_id}`); - } - thread.model = model; - } return { threads, @@ -451,7 +443,6 @@ export class InMemorySessionStore< new_threads: input.new_threads, new_context_appends: input.new_context_appends, capability_states: input.capability_states, - thread_models: input.thread_models, created_at: input.turn.created_at, }); diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts index 1171e64130..7865ad249b 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts @@ -208,7 +208,7 @@ export interface AgentThreadSnapshot { current_context_usage: CurrentContextUsage; parent: AgentParent | null; agent_info: AgentInfo | null; - /** Model the thread ran on in this turn; null when not recorded. A rebuilt subagent runs on it; the root follows its spec. */ + /** Model the thread runs on, recorded when the thread is created. A rebuilt subagent runs on it; the root follows its spec for now. */ model: string | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; diff --git a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts index 949ec3b07a..91aa1d4b50 100644 --- a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts +++ b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts @@ -1670,38 +1670,6 @@ export function runStoreContractSuite( expect(mustGet(afterSecond).metrics.total_turns).toBe(2); }); - it("records each thread's model per turn, keeping the previous one when a turn has no entry", async () => { - const store = createStore(); - await seedSession(store); - const modelOf = async (turnId: string) => - mustGet(await store.getTurn({ session_id: sessionId, turn_id: turnId })).snapshot.threads[MAIN_THREAD_ID] - ?.model; - await store.createTurn( - makeCreateTurnInput({ - sessionId, - turnId: 'turn-1', - thread_models: [{ thread_id: MAIN_THREAD_ID, model: 'acct/model-a' }], - }), - ); - await finishTurn(store, 'turn-1'); - await store.createTurn( - makeCreateTurnInput({ - sessionId, - turnId: 'turn-2', - previousTurnId: 'turn-1', - firstTurnId: 'turn-1', - thread_models: [{ thread_id: MAIN_THREAD_ID, model: 'acct/model-b' }], - }), - ); - await finishTurn(store, 'turn-2'); - await store.createTurn( - makeCreateTurnInput({ sessionId, turnId: 'turn-3', previousTurnId: 'turn-2', firstTurnId: 'turn-1' }), - ); - expect(await modelOf('turn-1')).toBe('acct/model-a'); - expect(await modelOf('turn-2')).toBe('acct/model-b'); - expect(await modelOf('turn-3')).toBe('acct/model-b'); - }); - it('keeps the model of a thread added mid-turn', async () => { const store = createStore(); await seedSession(store); @@ -1962,6 +1930,7 @@ export function runStoreContractSuite( turnId: 't1', new_threads: [ { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, @@ -2019,8 +1988,9 @@ export function runStoreContractSuite( sessionId, turnId: 't1', new_threads: [ - { thread_id: MAIN_THREAD_ID, parent: null, agent_info: null }, + { thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, model: null }, { + model: null, thread_id: 'child', parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc-child' }, agent_info: { type: 'dynamic', name: 'worker', input: 'task' }, @@ -2201,16 +2171,19 @@ export function runStoreContractSuite( turnId: 't1', new_threads: [ { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, }, { + model: null, thread_id: 'child-a', parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc-a' }, agent_info: { type: 'dynamic', name: 'child-a', input: 'task-a' }, }, { + model: null, thread_id: 'child-b', parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc-b' }, agent_info: { type: 'dynamic', name: 'child-b', input: 'task-b' }, @@ -3821,6 +3794,7 @@ export function runStoreContractSuite( turnId: 't1', new_threads: [ { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, diff --git a/packages/trueforge-core/tests/agent-session/testHelpers.ts b/packages/trueforge-core/tests/agent-session/testHelpers.ts index b59075b7ed..cae3bb52be 100644 --- a/packages/trueforge-core/tests/agent-session/testHelpers.ts +++ b/packages/trueforge-core/tests/agent-session/testHelpers.ts @@ -193,6 +193,7 @@ export function makeTurnUpdateEvent(state: NonTerminalTurnState): TurnUpdateEven } const defaultRootThread: NewThreadInit = { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, @@ -210,7 +211,6 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; - thread_models?: CreateTurnInput['thread_models']; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ @@ -231,7 +231,6 @@ export function makeCreateTurnInput(input: { completion: append.completion ?? null, })), capability_states: input.capability_states ?? [{ thread_id: MAIN_THREAD_ID, capability_state: null }], - thread_models: input.thread_models ?? [], update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }; } diff --git a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts index 31d15adc22..e6c20a0575 100644 --- a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts +++ b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts @@ -171,10 +171,10 @@ export class PostgresSessionStore implements ISessionStore thread_id: thread.thread_id, parent: thread.parent, agent_info: thread.agent_info, + model: thread.model, })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, - thread_models: input.thread_models, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts index 4b6202e363..e34b838df8 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts @@ -72,6 +72,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; + model: string | null; } export interface TurnKeys { @@ -116,7 +117,6 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - thread_models: { thread_id: string; model: string | null }[]; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -690,7 +690,6 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): appendCompletionByThread.set(append.thread_id, append.completion); } } - const modelByThread = new Map(input.thread_models.map(entry => [entry.thread_id, entry.model])); // step5: child turn_thread rows — carried = parent || new ids; new = fresh row. const turnThreadRows: TurnThreadInsertRow[] = []; @@ -705,7 +704,6 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): // Do not carry an MCP-auth pause into a new successor turn. Start it unblocked so // initialization can emit a new mcp.auth_required event if auth is still missing. pending_mcp_auth: false, - model: modelByThread.get(pt.thread_id) ?? pt.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, @@ -726,7 +724,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, - model: modelByThread.get(nt.thread_id) ?? null, + model: nt.model, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts index b08017b8a3..abff00e799 100644 --- a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts +++ b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts @@ -169,10 +169,10 @@ export class SqliteSessionStore implements ISessionStore, thread_id: thread.thread_id, parent: thread.parent, agent_info: thread.agent_info, + model: thread.model, })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, - thread_models: input.thread_models, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts index 6efcb7e77d..eb7baf3680 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts @@ -71,6 +71,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; + model: string | null; } export interface TurnKeys { @@ -120,7 +121,6 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - thread_models: { thread_id: string; model: string | null }[]; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -660,7 +660,6 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): appendCompletionByThread.set(append.thread_id, append.completion); } } - const modelByThread = new Map(input.thread_models.map(entry => [entry.thread_id, entry.model])); // Step 5: insert turn_thread rows for carried-forward and new threads. const turnThreadRows: { @@ -688,7 +687,6 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): ...parent.checkpoint, ...(completion !== undefined ? { completion } : {}), pending_mcp_auth: false, - model: modelByThread.get(parent.thread_id) ?? parent.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, @@ -753,7 +751,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, - model: modelByThread.get(nt.thread_id) ?? null, + model: nt.model, }; turnThreadRows.push({ session_id: input.session_id, From 3bc5b663fb6aea9ec0c9d1a5fcb0d0ba346f2640 Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Fri, 20 Nov 2026 12:14:19 +0530 Subject: [PATCH 5/7] Record the main thread's model on every turn Co-authored-by: Cursor --- .../src/agent-session/SessionHandle.ts | 1 + .../src/agent-session/store/ISessionStore.ts | 2 ++ .../store/InMemorySessionStore.ts | 7 +++++-- .../src/core/runtime/AgentThread.types.ts | 2 +- .../agent-session/store/storeContractSuite.ts | 21 +++++++++++++++++++ .../tests/agent-session/testHelpers.ts | 2 ++ .../session-store/PostgresSessionStore.ts | 1 + .../postgres/session-store/queries/turns.ts | 8 ++++++- .../session-store/SqliteSessionStore.ts | 1 + .../db/sqlite/session-store/queries/turns.ts | 8 ++++++- 10 files changed, 48 insertions(+), 5 deletions(-) diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index de2483669b..a3b62b730d 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -255,6 +255,7 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), + main_thread_model: agentThreads.get(MAIN_THREAD_ID)?.model.name ?? null, update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); diff --git a/packages/trueforge-core/src/agent-session/store/ISessionStore.ts b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts index a319727c35..68b42ca535 100644 --- a/packages/trueforge-core/src/agent-session/store/ISessionStore.ts +++ b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts @@ -139,6 +139,8 @@ export interface CreateTurnInput = input.previousSnapshot ? deepCopy(input.previousSnapshot.threads) : {}; - for (const thread of Object.values(threads)) { + for (const [threadId, thread] of Object.entries(threads)) { thread.pending_mcp_auth = false; + thread.model = threadId === MAIN_THREAD_ID ? input.main_thread_model : thread.model; } assertCreateTurnThreadDelta({ @@ -443,6 +445,7 @@ export class InMemorySessionStore< new_threads: input.new_threads, new_context_appends: input.new_context_appends, capability_states: input.capability_states, + main_thread_model: input.main_thread_model, created_at: input.turn.created_at, }); diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts index 7865ad249b..cb18a15bb9 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts @@ -208,7 +208,7 @@ export interface AgentThreadSnapshot { current_context_usage: CurrentContextUsage; parent: AgentParent | null; agent_info: AgentInfo | null; - /** Model the thread runs on, recorded when the thread is created. A rebuilt subagent runs on it; the root follows its spec for now. */ + /** Model the thread runs on: the main thread's is recorded every turn, a subagent's when it's created. A rebuilt subagent runs on it; the root follows its spec for now. */ model: string | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; diff --git a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts index 91aa1d4b50..0a492b92c4 100644 --- a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts +++ b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts @@ -1670,6 +1670,27 @@ export function runStoreContractSuite( expect(mustGet(afterSecond).metrics.total_turns).toBe(2); }); + it("records the main thread's model for each turn, without carrying the previous one", async () => { + const store = createStore(); + await seedSession(store); + const modelOf = async (turnId: string) => + mustGet(await store.getTurn({ session_id: sessionId, turn_id: turnId })).snapshot.threads[MAIN_THREAD_ID] + ?.model; + await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1', main_thread_model: 'acct/model-a' })); + await finishTurn(store, 'turn-1'); + await store.createTurn( + makeCreateTurnInput({ + sessionId, + turnId: 'turn-2', + previousTurnId: 'turn-1', + firstTurnId: 'turn-1', + main_thread_model: 'acct/model-b', + }), + ); + expect(await modelOf('turn-1')).toBe('acct/model-a'); + expect(await modelOf('turn-2')).toBe('acct/model-b'); + }); + it('keeps the model of a thread added mid-turn', async () => { const store = createStore(); await seedSession(store); diff --git a/packages/trueforge-core/tests/agent-session/testHelpers.ts b/packages/trueforge-core/tests/agent-session/testHelpers.ts index cae3bb52be..5b28e4bcd3 100644 --- a/packages/trueforge-core/tests/agent-session/testHelpers.ts +++ b/packages/trueforge-core/tests/agent-session/testHelpers.ts @@ -211,6 +211,7 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; + main_thread_model?: string; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ @@ -231,6 +232,7 @@ export function makeCreateTurnInput(input: { completion: append.completion ?? null, })), capability_states: input.capability_states ?? [{ thread_id: MAIN_THREAD_ID, capability_state: null }], + main_thread_model: input.main_thread_model ?? null, update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }; } diff --git a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts index e6c20a0575..3022a11b74 100644 --- a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts +++ b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts @@ -175,6 +175,7 @@ export class PostgresSessionStore implements ISessionStore })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, + main_thread_model: input.main_thread_model, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts index e34b838df8..1d460cfb88 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts @@ -4,7 +4,11 @@ import { type SessionLastTurnDetails, type SessionMetrics, } from '@truefoundry/trueforge-core/agent-session'; -import type { TurnRecord, TurnSnapshot } from '@truefoundry/trueforge-core/agent-session/models/TurnRecord'; +import { + MAIN_THREAD_ID, + type TurnRecord, + type TurnSnapshot, +} from '@truefoundry/trueforge-core/agent-session/models/TurnRecord'; import { isNonTerminalTurnState, type TerminalTurnState, @@ -117,6 +121,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + main_thread_model: string | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -704,6 +709,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): // Do not carry an MCP-auth pause into a new successor turn. Start it unblocked so // initialization can emit a new mcp.auth_required event if auth is still missing. pending_mcp_auth: false, + model: pt.thread_id === MAIN_THREAD_ID ? input.main_thread_model : pt.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts index abff00e799..e05031b518 100644 --- a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts +++ b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts @@ -173,6 +173,7 @@ export class SqliteSessionStore implements ISessionStore, })), new_context_appends: input.new_context_appends, capability_states: input.capability_states, + main_thread_model: input.main_thread_model, last_activity_timestamp_ms: Date.now(), update_session_title_if_not_exist: input.update_session_title_if_not_exist, mcp_servers: null, diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts index eb7baf3680..eaefb8a952 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts @@ -3,7 +3,11 @@ import { type LegacyTurnInputItem, type SessionMetrics, } from '@truefoundry/trueforge-core/agent-session'; -import type { TurnRecord, TurnSnapshot } from '@truefoundry/trueforge-core/agent-session/models/TurnRecord'; +import { + MAIN_THREAD_ID, + type TurnRecord, + type TurnSnapshot, +} from '@truefoundry/trueforge-core/agent-session/models/TurnRecord'; import { isNonTerminalTurnState, type TerminalTurnState, @@ -121,6 +125,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + main_thread_model: string | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -687,6 +692,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): ...parent.checkpoint, ...(completion !== undefined ? { completion } : {}), pending_mcp_auth: false, + model: parent.thread_id === MAIN_THREAD_ID ? input.main_thread_model : parent.checkpoint.model, }; turnThreadRows.push({ session_id: input.session_id, From 009704c5afe9c5a4f1d7eb84f44d8d43872d1568 Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Fri, 20 Nov 2026 14:35:52 +0530 Subject: [PATCH 6/7] Persist each thread's model and restore subagents on it Subagent agent_info now carries reasoning_effort, set from the resolved model params on thread.created. A rebuilt subagent resumes on that name and effort, and the root keeps following its spec. The thread checkpoint model is now { name, effort }. The main thread's model is written on every turn, including the first, so the root's resolved model and effort are recorded even though nothing reads them on rebuild yet. Co-authored-by: Cursor --- .changeset/thread-run-model.md | 2 +- .../src/agent-session/SessionHandle.ts | 10 +++++----- .../src/agent-session/TurnHandle.ts | 6 +++++- .../src/agent-session/TurnResourceResolver.ts | 15 ++++++++++----- .../src/agent-session/store/ISessionStore.ts | 11 ++++++++--- .../store/InMemorySessionStore.ts | 5 ++++- .../trueforge-core/src/core/events/schema.ts | 4 ++++ packages/trueforge-core/src/core/index.ts | 3 +++ .../src/core/runtime/AgentModel.ts | 9 +++++++++ .../src/core/runtime/AgentThread.ts | 4 ++-- .../src/core/runtime/AgentThread.types.ts | 11 +++++++++-- .../core/runtime/AgentThreadOrchestrator.ts | 1 + .../agent-session/resolveAgentSpec.test.ts | 18 +++++++++++++----- .../agent-session/store/storeContractSuite.ts | 18 ++++++++++++------ .../tests/agent-session/testHelpers.ts | 3 ++- .../20261118_000001_turn_thread_model.ts | 14 +++++++++++++- .../db/postgres/session-store/queries/turns.ts | 7 ++++--- packages/trueforge/src/db/postgres/types.ts | 3 ++- .../20261118_000001_turn_thread_model.ts | 14 +++++++++++++- .../db/sqlite/session-store/queries/turns.ts | 7 ++++--- packages/trueforge/src/db/sqlite/types.ts | 3 ++- 21 files changed, 126 insertions(+), 42 deletions(-) diff --git a/.changeset/thread-run-model.md b/.changeset/thread-run-model.md index 64ba9b0a8d..b531a033a1 100644 --- a/.changeset/thread-run-model.md +++ b/.changeset/thread-run-model.md @@ -3,4 +3,4 @@ '@truefoundry/trueforge': patch --- -Persist the model each subagent runs on, so a rebuilt subagent resumes on it. A subagent on a different model from its parent runs on that model's own defaults instead of the parent's params. `AgentDefinition` no longer carries the model; it's a separate `AgentModel`. +Persist the model each subagent runs on, including the effort returned with it, so a rebuilt subagent resumes on both. A subagent on a different model from its parent runs on that model's own defaults instead of the parent's params. `AgentDefinition` no longer carries the model; it's a separate `AgentModel`. diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index a3b62b730d..749e52bde2 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -3,6 +3,7 @@ */ import { newEventId, type TurnUserEvent, type UserMessage } from '../core/events/schema'; import type { AgentDefinition } from '../core/runtime/AgentDefinition'; +import { threadModelFromAgent } from '../core/runtime/AgentModel'; import { AgentThread } from '../core/runtime/AgentThread'; import type { AgentThreadAppendContext, AgentThreadSnapshot } from '../core/runtime/AgentThread.types'; import { AgentThreadOrchestrator } from '../core/runtime/AgentThreadOrchestrator'; @@ -247,6 +248,7 @@ export class SessionHandle< }, }; + const mainThread = agentThreads.get(MAIN_THREAD_ID); await this.store.createTurn({ turn: turnInit, new_threads, @@ -255,7 +257,7 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), - main_thread_model: agentThreads.get(MAIN_THREAD_ID)?.model.name ?? null, + main_thread_model: mainThread === undefined ? null : threadModelFromAgent(mainThread.model), update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); @@ -508,12 +510,10 @@ export class SessionHandle< await Promise.all( threadIds.map(async threadId => { const previousThreadSnapshot = snapshots?.[threadId]; - const agentInfo = previousThreadSnapshot?.agent_info ?? undefined; - const savedModel = previousThreadSnapshot?.model ?? undefined; const resolved = await input.resolver.resolveAgentDefinition({ spec: input.spec, - // A subagent comes back on the model it ran on; the root follows its spec. - agent_info: agentInfo && savedModel ? { ...agentInfo, model: savedModel } : agentInfo, + // A subagent's agent_info carries the model and effort it ran on; the root has none and follows its spec. + agent_info: previousThreadSnapshot?.agent_info ?? undefined, previousTurn: input.previous, signal: input.signal, tracing: input.tracing, diff --git a/packages/trueforge-core/src/agent-session/TurnHandle.ts b/packages/trueforge-core/src/agent-session/TurnHandle.ts index c20ccc46db..ce24ae3ee8 100644 --- a/packages/trueforge-core/src/agent-session/TurnHandle.ts +++ b/packages/trueforge-core/src/agent-session/TurnHandle.ts @@ -23,6 +23,7 @@ import { type InternalMCPAuthRequiredEvent, type InternalThreadDoneEvent, type InternalTurnStateEvent, + type ThreadModel, } from '../core/runtime/AgentThread.types'; import type { AgentThreadOrchestrator } from '../core/runtime/AgentThreadOrchestrator'; import { getEmptyCurrentContextUsage } from '../core/runtime/contextUsage'; @@ -758,6 +759,9 @@ export class TurnHandle this.store.withTransaction(async transaction => { await this.store.addThreads( @@ -768,7 +772,7 @@ export class TurnHandle; + /** Canonical string constants for internal (non-wire) orchestration event `type` fields. */ export const InternalEventType = { AGENT_CREATE_SUBAGENT: 'internal.agent.create_subagent', @@ -208,8 +215,8 @@ export interface AgentThreadSnapshot { current_context_usage: CurrentContextUsage; parent: AgentParent | null; agent_info: AgentInfo | null; - /** Model the thread runs on: the main thread's is recorded every turn, a subagent's when it's created. A rebuilt subagent runs on it; the root follows its spec for now. */ - model: string | null; + /** Model and effort this thread resolved to. Updated every turn for the main thread, and set when a subagent is created. */ + model: ThreadModel | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; /** Cross-turn capability KV. Keys: capability.state.key; `tfy.` reserved for builtins. */ diff --git a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts index e1c132d174..fa574f9906 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts @@ -584,6 +584,7 @@ export class AgentThreadOrchestrator { name: chunk.agent_info.name, input: chunk.agent_info.input, model: subAgentThread.model.name, + reasoning_effort: subAgentThread.model.params?.reasoning_effort, }, created_at: new Date().toISOString(), parent, diff --git a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts index 78421e835b..4ab8f470d5 100644 --- a/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts +++ b/packages/trueforge-core/tests/agent-session/resolveAgentSpec.test.ts @@ -198,8 +198,8 @@ describe('SessionHandle rebuild', () => { context: [], current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, - agent_info: { type: 'dynamic', name: 'child', input: 'task', model: 'acct/requested' }, - model: 'acct/routed', + agent_info: { type: 'dynamic', name: 'child', input: 'task', model: 'acct/routed', reasoning_effort: 'high' }, + model: { name: 'acct/routed', effort: 'high' }, completion: null, pending_mcp_auth: false, capability_state: null, @@ -221,8 +221,16 @@ describe('SessionHandle rebuild', () => { resolver, }); - const agentInfos = resolveAgentDefinition.mock.calls.map(([input]) => input.agent_info); - expect(agentInfos).toContainEqual(expect.objectContaining({ name: 'child', model: 'acct/routed' })); - expect(agentInfos).toContainEqual(undefined); + const calls = resolveAgentDefinition.mock.calls.map(([input]) => input); + expect(calls).toContainEqual( + expect.objectContaining({ + agent_info: expect.objectContaining({ + name: 'child', + model: 'acct/routed', + reasoning_effort: 'high', + }), + }), + ); + expect(calls.map(call => call.agent_info)).toContainEqual(undefined); }); }); diff --git a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts index 0a492b92c4..96b34df7a8 100644 --- a/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts +++ b/packages/trueforge-core/tests/agent-session/store/storeContractSuite.ts @@ -1676,7 +1676,13 @@ export function runStoreContractSuite( const modelOf = async (turnId: string) => mustGet(await store.getTurn({ session_id: sessionId, turn_id: turnId })).snapshot.threads[MAIN_THREAD_ID] ?.model; - await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1', main_thread_model: 'acct/model-a' })); + await store.createTurn( + makeCreateTurnInput({ + sessionId, + turnId: 'turn-1', + main_thread_model: { name: 'acct/model-a', effort: null }, + }), + ); await finishTurn(store, 'turn-1'); await store.createTurn( makeCreateTurnInput({ @@ -1684,11 +1690,11 @@ export function runStoreContractSuite( turnId: 'turn-2', previousTurnId: 'turn-1', firstTurnId: 'turn-1', - main_thread_model: 'acct/model-b', + main_thread_model: { name: 'acct/model-b', effort: 'high' }, }), ); - expect(await modelOf('turn-1')).toBe('acct/model-a'); - expect(await modelOf('turn-2')).toBe('acct/model-b'); + expect(await modelOf('turn-1')).toEqual({ name: 'acct/model-a', effort: null }); + expect(await modelOf('turn-2')).toEqual({ name: 'acct/model-b', effort: 'high' }); }); it('keeps the model of a thread added mid-turn', async () => { @@ -1706,7 +1712,7 @@ export function runStoreContractSuite( current_context_usage: getEmptyCurrentContextUsage(), parent: { thread_id: MAIN_THREAD_ID, tool_call_id: 'tc1' }, agent_info: { type: 'dynamic', name: 'child', input: 'task', model: 'acct/model-c' }, - model: 'acct/model-c', + model: { name: 'acct/model-c', effort: null }, completion: null, pending_mcp_auth: false, capability_state: null, @@ -1714,7 +1720,7 @@ export function runStoreContractSuite( ], }); const turn = mustGet(await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' })); - expect(turn.snapshot.threads['child']?.model).toBe('acct/model-c'); + expect(turn.snapshot.threads['child']?.model).toEqual({ name: 'acct/model-c', effort: null }); }); it('update_session_title_if_not_exist sets once and never overwrites', async () => { diff --git a/packages/trueforge-core/tests/agent-session/testHelpers.ts b/packages/trueforge-core/tests/agent-session/testHelpers.ts index 5b28e4bcd3..01caeaa916 100644 --- a/packages/trueforge-core/tests/agent-session/testHelpers.ts +++ b/packages/trueforge-core/tests/agent-session/testHelpers.ts @@ -21,6 +21,7 @@ import type { RawAssistantMessageWithUsage, } from '../../src/core/llm/LLMTypes'; import { getEmptyUsage } from '../../src/core/llm/LLMTypes'; +import type { ThreadModel } from '../../src/core/runtime/AgentThread.types'; import { getEmptyCurrentContextUsage } from '../../src/core/runtime/contextUsage'; import type { Sandbox } from '../../src/core/sandbox/Sandbox'; import { makeMockILLM, makeSilentLogger, TEST_MODEL, TEST_MODEL_NAME } from '../core/harnessMocks'; @@ -211,7 +212,7 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; - main_thread_model?: string; + main_thread_model?: ThreadModel; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ diff --git a/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts b/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts index 519a04c16c..288a6e068c 100644 --- a/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts +++ b/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts @@ -1,6 +1,9 @@ import { sql, type Kysely } from 'kysely'; -/** Make the per-thread model explicit on every persisted checkpoint; rows written before it was recorded get null. */ +/** + * Record each thread's model on its checkpoint. Missing values become null. + * A name string becomes `{ name, effort: null }`. + */ export async function up(db: Kysely): Promise { await sql`SET LOCAL lock_timeout = '5s'`.execute(db); await sql` @@ -8,6 +11,15 @@ export async function up(db: Kysely): Promise { SET checkpoint = jsonb_set(checkpoint, '{model}', 'null'::jsonb, true) WHERE NOT checkpoint ? 'model' `.execute(db); + await sql` + UPDATE turn_thread + SET checkpoint = jsonb_set( + checkpoint, + '{model}', + jsonb_build_object('name', checkpoint->>'model', 'effort', null) + ) + WHERE jsonb_typeof(checkpoint->'model') = 'string' + `.execute(db); } export async function down(db: Kysely): Promise { diff --git a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts index 1d460cfb88..fb28e58459 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts @@ -39,6 +39,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; +import type { ThreadModel } from '@truefoundry/trueforge-core/core'; import type { CapabilityState, JsonValue } from '@truefoundry/trueforge-core/core/capabilities/AgentCapability'; import type { AgentInfo, AgentParent, MCPServerInitInfo } from '@truefoundry/trueforge-core/core/events/schema'; import type { @@ -76,7 +77,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; - model: string | null; + model: ThreadModel | null; } export interface TurnKeys { @@ -121,7 +122,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - main_thread_model: string | null; + main_thread_model: ThreadModel | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -730,7 +731,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, - model: nt.model, + model: nt.thread_id === MAIN_THREAD_ID ? input.main_thread_model : nt.model, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/postgres/types.ts b/packages/trueforge/src/db/postgres/types.ts index 10749d6d47..d817f3043a 100644 --- a/packages/trueforge/src/db/postgres/types.ts +++ b/packages/trueforge/src/db/postgres/types.ts @@ -23,6 +23,7 @@ import type { MCPServerInitInfo, SandboxInfo, SubAgentCompletion, + ThreadModel, } from '@truefoundry/trueforge-core/core'; import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage'; import type { ColumnType, Generated, JSONColumnType } from 'kysely'; @@ -51,7 +52,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; - model: string | null; + model: ThreadModel | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ diff --git a/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts b/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts index 7d32425695..c81f656644 100644 --- a/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts +++ b/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts @@ -1,6 +1,9 @@ import { sql, type Kysely } from 'kysely'; -/** Make the per-thread model explicit on every persisted checkpoint; rows written before it was recorded get null. */ +/** + * Record each thread's model on its checkpoint. Missing values become null. + * A name string becomes `{ name, effort: null }`. + */ export async function up(db: Kysely): Promise { await db.transaction().execute(async trx => { await sql` @@ -8,6 +11,15 @@ export async function up(db: Kysely): Promise { SET checkpoint = jsonb_set(checkpoint, '$.model', jsonb('null')) WHERE json_type(checkpoint, '$.model') IS NULL `.execute(trx); + await sql` + UPDATE turn_thread + SET checkpoint = jsonb_set( + checkpoint, + '$.model', + json_object('name', json_extract(checkpoint, '$.model'), 'effort', NULL) + ) + WHERE json_type(checkpoint, '$.model') = 'text' + `.execute(trx); }); } diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts index eaefb8a952..f416909bf3 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts @@ -38,6 +38,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; +import type { ThreadModel } from '@truefoundry/trueforge-core/core'; import type { CapabilityState, JsonValue } from '@truefoundry/trueforge-core/core/capabilities/AgentCapability'; import type { AgentInfo, AgentParent, MCPServerInitInfo } from '@truefoundry/trueforge-core/core/events/schema'; import type { @@ -75,7 +76,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; - model: string | null; + model: ThreadModel | null; } export interface TurnKeys { @@ -125,7 +126,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - main_thread_model: string | null; + main_thread_model: ThreadModel | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -757,7 +758,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, - model: nt.model, + model: nt.thread_id === MAIN_THREAD_ID ? input.main_thread_model : nt.model, }; turnThreadRows.push({ session_id: input.session_id, diff --git a/packages/trueforge/src/db/sqlite/types.ts b/packages/trueforge/src/db/sqlite/types.ts index 2e69fc1bdd..555354e7f7 100644 --- a/packages/trueforge/src/db/sqlite/types.ts +++ b/packages/trueforge/src/db/sqlite/types.ts @@ -26,6 +26,7 @@ import type { MCPServerInitInfo, SandboxInfo, SubAgentCompletion, + ThreadModel, } from '@truefoundry/trueforge-core/core'; import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage'; import type { ColumnType, Generated, JSONColumnType } from 'kysely'; @@ -54,7 +55,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; - model: string | null; + model: ThreadModel | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ From dc6043fe287e7f92378f1646e4e04daabd6f9346 Mon Sep 17 00:00:00 2001 From: Hary Ahuja Date: Fri, 20 Nov 2026 19:36:43 +0530 Subject: [PATCH 7/7] Rename ThreadModel to ModelSnapshot ModelSnapshot and ModelSnapshotSchema name the stored { name, effort } on a thread snapshot, separate from the runtime AgentModel. modelSnapshotFromAgent replaces threadModelFromAgent to match. Co-authored-by: Cursor --- packages/trueforge-core/src/agent-session/SessionHandle.ts | 4 ++-- packages/trueforge-core/src/agent-session/TurnHandle.ts | 6 +++--- .../trueforge-core/src/agent-session/store/ISessionStore.ts | 4 ++-- packages/trueforge-core/src/core/index.ts | 6 +++--- packages/trueforge-core/src/core/runtime/AgentModel.ts | 4 ++-- packages/trueforge-core/src/core/runtime/AgentThread.ts | 4 ++-- .../trueforge-core/src/core/runtime/AgentThread.types.ts | 6 +++--- packages/trueforge-core/tests/agent-session/testHelpers.ts | 4 ++-- .../src/db/postgres/session-store/queries/turns.ts | 6 +++--- packages/trueforge/src/db/postgres/types.ts | 4 ++-- .../trueforge/src/db/sqlite/session-store/queries/turns.ts | 6 +++--- packages/trueforge/src/db/sqlite/types.ts | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/trueforge-core/src/agent-session/SessionHandle.ts b/packages/trueforge-core/src/agent-session/SessionHandle.ts index 749e52bde2..d34633c425 100644 --- a/packages/trueforge-core/src/agent-session/SessionHandle.ts +++ b/packages/trueforge-core/src/agent-session/SessionHandle.ts @@ -3,7 +3,7 @@ */ import { newEventId, type TurnUserEvent, type UserMessage } from '../core/events/schema'; import type { AgentDefinition } from '../core/runtime/AgentDefinition'; -import { threadModelFromAgent } from '../core/runtime/AgentModel'; +import { modelSnapshotFromAgent } from '../core/runtime/AgentModel'; import { AgentThread } from '../core/runtime/AgentThread'; import type { AgentThreadAppendContext, AgentThreadSnapshot } from '../core/runtime/AgentThread.types'; import { AgentThreadOrchestrator } from '../core/runtime/AgentThreadOrchestrator'; @@ -257,7 +257,7 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), - main_thread_model: mainThread === undefined ? null : threadModelFromAgent(mainThread.model), + main_thread_model: mainThread === undefined ? null : modelSnapshotFromAgent(mainThread.model), update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); diff --git a/packages/trueforge-core/src/agent-session/TurnHandle.ts b/packages/trueforge-core/src/agent-session/TurnHandle.ts index ce24ae3ee8..81ee6fab00 100644 --- a/packages/trueforge-core/src/agent-session/TurnHandle.ts +++ b/packages/trueforge-core/src/agent-session/TurnHandle.ts @@ -23,7 +23,7 @@ import { type InternalMCPAuthRequiredEvent, type InternalThreadDoneEvent, type InternalTurnStateEvent, - type ThreadModel, + type ModelSnapshot, } from '../core/runtime/AgentThread.types'; import type { AgentThreadOrchestrator } from '../core/runtime/AgentThreadOrchestrator'; import { getEmptyCurrentContextUsage } from '../core/runtime/contextUsage'; @@ -760,7 +760,7 @@ export class TurnHandle this.store.withTransaction(async transaction => { @@ -772,7 +772,7 @@ export class TurnHandle; +export type ModelSnapshot = z.infer; /** Canonical string constants for internal (non-wire) orchestration event `type` fields. */ export const InternalEventType = { @@ -216,7 +216,7 @@ export interface AgentThreadSnapshot { parent: AgentParent | null; agent_info: AgentInfo | null; /** Model and effort this thread resolved to. Updated every turn for the main thread, and set when a subagent is created. */ - model: ThreadModel | null; + model: ModelSnapshot | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; /** Cross-turn capability KV. Keys: capability.state.key; `tfy.` reserved for builtins. */ diff --git a/packages/trueforge-core/tests/agent-session/testHelpers.ts b/packages/trueforge-core/tests/agent-session/testHelpers.ts index 01caeaa916..32eb7bf57f 100644 --- a/packages/trueforge-core/tests/agent-session/testHelpers.ts +++ b/packages/trueforge-core/tests/agent-session/testHelpers.ts @@ -21,7 +21,7 @@ import type { RawAssistantMessageWithUsage, } from '../../src/core/llm/LLMTypes'; import { getEmptyUsage } from '../../src/core/llm/LLMTypes'; -import type { ThreadModel } from '../../src/core/runtime/AgentThread.types'; +import type { ModelSnapshot } from '../../src/core/runtime/AgentThread.types'; import { getEmptyCurrentContextUsage } from '../../src/core/runtime/contextUsage'; import type { Sandbox } from '../../src/core/sandbox/Sandbox'; import { makeMockILLM, makeSilentLogger, TEST_MODEL, TEST_MODEL_NAME } from '../core/harnessMocks'; @@ -212,7 +212,7 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; - main_thread_model?: ThreadModel; + main_thread_model?: ModelSnapshot; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ diff --git a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts index fb28e58459..eb1b29088c 100644 --- a/packages/trueforge/src/db/postgres/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/postgres/session-store/queries/turns.ts @@ -39,7 +39,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; -import type { ThreadModel } from '@truefoundry/trueforge-core/core'; +import type { ModelSnapshot } from '@truefoundry/trueforge-core/core'; import type { CapabilityState, JsonValue } from '@truefoundry/trueforge-core/core/capabilities/AgentCapability'; import type { AgentInfo, AgentParent, MCPServerInitInfo } from '@truefoundry/trueforge-core/core/events/schema'; import type { @@ -77,7 +77,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; - model: ThreadModel | null; + model: ModelSnapshot | null; } export interface TurnKeys { @@ -122,7 +122,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - main_thread_model: ThreadModel | null; + main_thread_model: ModelSnapshot | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; diff --git a/packages/trueforge/src/db/postgres/types.ts b/packages/trueforge/src/db/postgres/types.ts index d817f3043a..e8cfe28497 100644 --- a/packages/trueforge/src/db/postgres/types.ts +++ b/packages/trueforge/src/db/postgres/types.ts @@ -21,9 +21,9 @@ import type { ContextMessage, JsonValue, MCPServerInitInfo, + ModelSnapshot, SandboxInfo, SubAgentCompletion, - ThreadModel, } from '@truefoundry/trueforge-core/core'; import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage'; import type { ColumnType, Generated, JSONColumnType } from 'kysely'; @@ -52,7 +52,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; - model: ThreadModel | null; + model: ModelSnapshot | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ diff --git a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts index f416909bf3..7375a7b178 100644 --- a/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts +++ b/packages/trueforge/src/db/sqlite/session-store/queries/turns.ts @@ -38,7 +38,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; -import type { ThreadModel } from '@truefoundry/trueforge-core/core'; +import type { ModelSnapshot } from '@truefoundry/trueforge-core/core'; import type { CapabilityState, JsonValue } from '@truefoundry/trueforge-core/core/capabilities/AgentCapability'; import type { AgentInfo, AgentParent, MCPServerInitInfo } from '@truefoundry/trueforge-core/core/events/schema'; import type { @@ -76,7 +76,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; - model: ThreadModel | null; + model: ModelSnapshot | null; } export interface TurnKeys { @@ -126,7 +126,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; - main_thread_model: ThreadModel | null; + main_thread_model: ModelSnapshot | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; diff --git a/packages/trueforge/src/db/sqlite/types.ts b/packages/trueforge/src/db/sqlite/types.ts index 555354e7f7..751e385a0d 100644 --- a/packages/trueforge/src/db/sqlite/types.ts +++ b/packages/trueforge/src/db/sqlite/types.ts @@ -24,9 +24,9 @@ import type { ContextMessage, JsonValue, MCPServerInitInfo, + ModelSnapshot, SandboxInfo, SubAgentCompletion, - ThreadModel, } from '@truefoundry/trueforge-core/core'; import type { CurrentContextUsage } from '@truefoundry/trueforge-core/core/runtime/contextUsage'; import type { ColumnType, Generated, JSONColumnType } from 'kysely'; @@ -55,7 +55,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; - model: ThreadModel | null; + model: ModelSnapshot | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */