diff --git a/.changeset/thread-run-model.md b/.changeset/thread-run-model.md new file mode 100644 index 0000000000..b531a033a1 --- /dev/null +++ b/.changeset/thread-run-model.md @@ -0,0 +1,6 @@ +--- +'@truefoundry/trueforge-core': patch +'@truefoundry/trueforge': patch +--- + +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/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..d34633c425 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 { 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'; @@ -247,6 +248,7 @@ export class SessionHandle< }, }; + const mainThread = agentThreads.get(MAIN_THREAD_ID); await this.store.createTurn({ turn: turnInit, new_threads, @@ -255,6 +257,7 @@ export class SessionHandle< thread_id, capability_state: thread.toSnapshot().capability_state, })), + main_thread_model: mainThread === undefined ? null : modelSnapshotFromAgent(mainThread.model), update_session_title_if_not_exist: input.update_session_title_if_not_exist ?? null, }); @@ -509,6 +512,7 @@ export class SessionHandle< const previousThreadSnapshot = snapshots?.[threadId]; const resolved = await input.resolver.resolveAgentDefinition({ spec: input.spec, + // 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, @@ -560,12 +564,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 +580,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 +605,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 +626,7 @@ export class SessionHandle< const capabilities = [ ...builtinsFromSpec({ spec: input.spec, - definition: childDefinition, + model, isChild: true, sandboxAvailable: Boolean(input.sandbox), tracing: input.tracing, @@ -633,6 +637,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/TurnHandle.ts b/packages/trueforge-core/src/agent-session/TurnHandle.ts index 7c89b6a1f1..81ee6fab00 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 ModelSnapshot, } 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,6 +772,7 @@ export class TurnHandle ({ 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/agent-session/store/ISessionStore.ts b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts index a319727c35..fe6ea68184 100644 --- a/packages/trueforge-core/src/agent-session/store/ISessionStore.ts +++ b/packages/trueforge-core/src/agent-session/store/ISessionStore.ts @@ -1,6 +1,11 @@ import type { JsonValue } from '../../core/capabilities/AgentCapability'; import type { MCPServerInitInfo, ThreadOverwriteContextEvent, TurnUserEvent } from '../../core/events/schema'; -import type { AgentThreadSnapshot, ContextMessage, SubAgentCompletion } from '../../core/runtime/AgentThread.types'; +import type { + AgentThreadSnapshot, + ContextMessage, + ModelSnapshot, + SubAgentCompletion, +} from '../../core/runtime/AgentThread.types'; import type { CurrentContextUsage } from '../../core/runtime/contextUsage'; import type { AgentThreadMetrics } from '../../core/runtime/metrics'; import type { SandboxInfo } from '../../core/sandbox/Sandbox'; @@ -139,6 +144,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({ @@ -158,7 +161,10 @@ function buildSnapshotFromDelta(input: { }); for (const nt of input.new_threads) { - threads[nt.thread_id] = newThreadSnapshot(nt); + threads[nt.thread_id] = newThreadSnapshot({ + ...nt, + model: nt.thread_id === MAIN_THREAD_ID ? input.main_thread_model : nt.model, + }); } applyContextAppends(threads, input.new_context_appends); @@ -442,6 +448,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/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/events/schema.ts b/packages/trueforge-core/src/core/events/schema.ts index 0f37cd24c5..2ec0a7673c 100644 --- a/packages/trueforge-core/src/core/events/schema.ts +++ b/packages/trueforge-core/src/core/events/schema.ts @@ -65,6 +65,10 @@ export const AgentInfoSchema = z name: z.string().describe('Display name of the dynamic subagent.'), input: z.string().describe('Input prompt passed to the subagent.'), model: z.string().min(1).optional().describe('Optional model override for the subagent.'), + reasoning_effort: z + .string() + .optional() + .describe('Reasoning effort the resolved model runs at. Omitted when none was resolved.'), }) .openapi('AgentInfo'); diff --git a/packages/trueforge-core/src/core/index.ts b/packages/trueforge-core/src/core/index.ts index e26365612d..5d598d4349 100644 --- a/packages/trueforge-core/src/core/index.ts +++ b/packages/trueforge-core/src/core/index.ts @@ -7,7 +7,10 @@ export { ModelParamsSchema, ModelSchema } from './llm/model'; export type { Model, ModelParams } from './llm/model'; export type { AgentDefinition } from './runtime/AgentDefinition'; +export { modelSnapshotFromAgent } from './runtime/AgentModel'; +export type { AgentModel } from './runtime/AgentModel'; export { AgentThread } from './runtime/AgentThread'; +export { ModelSnapshotSchema } from './runtime/AgentThread.types'; export type { AgentInfo, AgentParent, @@ -17,6 +20,7 @@ export type { AgentThreadEvent, AgentThreadExecutionEvent, AgentThreadExecutionResult, + ModelSnapshot, SubAgentCompletion, } from './runtime/AgentThread.types'; export { AgentThreadOrchestrator, DEFAULT_MAX_PARALLEL_SUB_AGENTS } from './runtime/AgentThreadOrchestrator'; 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..36cf393194 --- /dev/null +++ b/packages/trueforge-core/src/core/runtime/AgentModel.ts @@ -0,0 +1,28 @@ +import type { ILLM } from '../llm/ILLM'; +import type { ModelParams } from '../llm/model'; +import type { VercelAIProviderName } from '../llm/VercelAILLM'; +import type { ModelSnapshot } from './AgentThread.types'; + +/** 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; +} + +/** Checkpoint form of a resolved model. Effort is the call's `reasoning_effort`. */ +export function modelSnapshotFromAgent(model: AgentModel): ModelSnapshot { + return { + name: model.name, + effort: model.params?.reasoning_effort ?? null, + }; +} diff --git a/packages/trueforge-core/src/core/runtime/AgentThread.ts b/packages/trueforge-core/src/core/runtime/AgentThread.ts index b15eecd106..9b3a99e85c 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 { modelSnapshotFromAgent, 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; @@ -931,6 +934,7 @@ export class AgentThread { current_context_usage: this.currentContextUsage, parent: this.parent ?? null, agent_info: this.agentInfo ?? null, + model: modelSnapshotFromAgent(this.model), completion: this.preComputedCompletion ?? null, pending_mcp_auth: this.pendingMCPAuth, capability_state, @@ -975,9 +979,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 +989,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 +1196,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 +1210,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 +1237,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 +1246,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 +1335,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..6545f3f828 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThread.types.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThread.types.ts @@ -32,10 +32,18 @@ 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 }; +/** Model a thread ran on, including the effort the router returned with that name. */ +export const ModelSnapshotSchema = z.object({ + name: z.string(), + effort: z.string().nullable(), +}); +export type ModelSnapshot = z.infer; + /** Canonical string constants for internal (non-wire) orchestration event `type` fields. */ export const InternalEventType = { AGENT_CREATE_SUBAGENT: 'internal.agent.create_subagent', @@ -207,6 +215,8 @@ export interface AgentThreadSnapshot { current_context_usage: CurrentContextUsage; 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: ModelSnapshot | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; /** Cross-turn capability KV. Keys: capability.state.key; `tfy.` reserved for builtins. */ @@ -215,6 +225,7 @@ export interface AgentThreadSnapshot { export interface AgentThreadConstructorInput { definition: AgentDefinition; + model: AgentModel; threadId: string; title: string; parent?: AgentParent | undefined; diff --git a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts index 07b7c8a696..fa574f9906 100644 --- a/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts +++ b/packages/trueforge-core/src/core/runtime/AgentThreadOrchestrator.ts @@ -583,7 +583,8 @@ export class AgentThreadOrchestrator { type: 'dynamic', name: chunk.agent_info.name, input: chunk.agent_info.input, - model: chunk.agent_info.model, + 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/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..4ab8f470d5 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, @@ -46,13 +48,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 +91,53 @@ 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); + }); + + 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); }); }); @@ -128,3 +168,69 @@ 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/routed', reasoning_effort: 'high' }, + model: { name: 'acct/routed', effort: 'high' }, + 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 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 9bb64d03db..96b34df7a8 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,59 @@ 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: { name: 'acct/model-a', effort: null }, + }), + ); + await finishTurn(store, 'turn-1'); + await store.createTurn( + makeCreateTurnInput({ + sessionId, + turnId: 'turn-2', + previousTurnId: 'turn-1', + firstTurnId: 'turn-1', + main_thread_model: { name: 'acct/model-b', effort: 'high' }, + }), + ); + 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 () => { + 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: { name: 'acct/model-c', effort: null }, + 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).toEqual({ name: 'acct/model-c', effort: null }); + }); + it('update_session_title_if_not_exist sets once and never overwrites', async () => { const store = createStore(); await seedSession(store); @@ -1903,6 +1957,7 @@ export function runStoreContractSuite( turnId: 't1', new_threads: [ { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, @@ -1960,8 +2015,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' }, @@ -2142,16 +2198,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' }, @@ -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, @@ -3759,6 +3821,7 @@ export function runStoreContractSuite( turnId: 't1', new_threads: [ { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, @@ -4404,6 +4467,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..32eb7bf57f 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 { 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'; @@ -193,6 +194,7 @@ export function makeTurnUpdateEvent(state: NonTerminalTurnState): TurnUpdateEven } const defaultRootThread: NewThreadInit = { + model: null, thread_id: MAIN_THREAD_ID, parent: null, agent_info: null, @@ -210,6 +212,7 @@ export function makeCreateTurnInput(input: { completion?: TurnContextAppend['completion']; })[]; capability_states?: CreateTurnInput['capability_states']; + main_thread_model?: ModelSnapshot; update_session_title_if_not_exist?: string; }): CreateTurnInput { const turn = makeRunningTurnRecord({ @@ -230,6 +233,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, }; } @@ -279,6 +283,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/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..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) }, @@ -110,23 +113,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 +162,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: CHILD_MODEL }, threadId, title: request.name, parent, @@ -209,7 +209,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/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..288a6e068c --- /dev/null +++ b/packages/trueforge/src/db/postgres/migrations/20261118_000001_turn_thread_model.ts @@ -0,0 +1,32 @@ +import { sql, type Kysely } from 'kysely'; + +/** + * 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` + UPDATE turn_thread + 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 { + 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..3022a11b74 100644 --- a/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts +++ b/packages/trueforge/src/db/postgres/session-store/PostgresSessionStore.ts @@ -171,9 +171,11 @@ 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, + 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/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..eb1b29088c 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, @@ -35,6 +39,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; +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 { @@ -72,6 +77,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; + model: ModelSnapshot | null; } export interface TurnKeys { @@ -116,6 +122,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + main_thread_model: ModelSnapshot | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -439,6 +446,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, @@ -702,6 +710,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, @@ -722,6 +731,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, + 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 26f3968c67..e8cfe28497 100644 --- a/packages/trueforge/src/db/postgres/types.ts +++ b/packages/trueforge/src/db/postgres/types.ts @@ -21,6 +21,7 @@ import type { ContextMessage, JsonValue, MCPServerInitInfo, + ModelSnapshot, SandboxInfo, SubAgentCompletion, } from '@truefoundry/trueforge-core/core'; @@ -51,6 +52,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; + 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/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..c81f656644 --- /dev/null +++ b/packages/trueforge/src/db/sqlite/migrations/20261118_000001_turn_thread_model.ts @@ -0,0 +1,34 @@ +import { sql, type Kysely } from 'kysely'; + +/** + * 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` + UPDATE turn_thread + 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); + }); +} + +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..e05031b518 100644 --- a/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts +++ b/packages/trueforge/src/db/sqlite/session-store/SqliteSessionStore.ts @@ -169,9 +169,11 @@ 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, + 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/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..7375a7b178 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, @@ -34,6 +38,7 @@ import { foldTurnMetricsCheckpoint, resolveStoredTurnMetricsCheckpoint, } from '@truefoundry/trueforge-core/agent-session/turnMetrics'; +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 { @@ -71,6 +76,7 @@ export interface NewThreadRegistration { thread_id: string; parent: AgentParent | null; agent_info: AgentInfo | null; + model: ModelSnapshot | null; } export interface TurnKeys { @@ -120,6 +126,7 @@ export interface CreateTurnInput { thread_id: string; capability_state: CapabilityState | null; }[]; + main_thread_model: ModelSnapshot | null; last_activity_timestamp_ms: number; update_session_title_if_not_exist: string | null; mcp_servers: Record | null; @@ -435,6 +442,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, @@ -685,6 +693,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, @@ -749,6 +758,7 @@ export async function createTurn(db: Kysely, input: CreateTurnInput): parent: nt.parent, completion: null, pending_mcp_auth: false, + 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 daf8d3d0a6..751e385a0d 100644 --- a/packages/trueforge/src/db/sqlite/types.ts +++ b/packages/trueforge/src/db/sqlite/types.ts @@ -24,6 +24,7 @@ import type { ContextMessage, JsonValue, MCPServerInitInfo, + ModelSnapshot, SandboxInfo, SubAgentCompletion, } from '@truefoundry/trueforge-core/core'; @@ -54,6 +55,7 @@ export interface TurnThreadCheckpoint { parent: AgentParent | null; completion: SubAgentCompletion | null; pending_mcp_auth: boolean; + model: ModelSnapshot | null; } /** Turn-level checkpoint — threads live in `turn_thread`; only owned top-level keys remain. */ 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);