The open-source agent harness - the runtime layer that turns an LLM into a working agent.
chore: Dedupe per-turn LLM resolve by model name (#629)
Srajan Asthanaa5f220f34d95
diff --git a/.changeset/turn-llm-dedupe.md b/.changeset/turn-llm-dedupe.mdnew file mode 100644index 000000000..35bbf9d1b--- /dev/null+++ b/.changeset/turn-llm-dedupe.md@@ -0,0 +1,5 @@+---+"@truefoundry/trueforge-core": patch+---++Dedupe LLM resolve within a turn so parent and sub-agents sharing a model name call deps.llm once.diff --git a/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts b/packages/trueforge-core/src/agent-session/TurnResourceResolver.tsindex 175fc3f33..0e097ed8f 100644--- a/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts+++ b/packages/trueforge-core/src/agent-session/TurnResourceResolver.ts@@ -49,20 +49,23 @@ function toSelectors(entry: {* behavior; subclass and override to customize (tool sources, sandbox,* tracing).*/+interface ResolvedModel {+ modelClient: ILLM;+ defaultModelParams: ModelParams;+ modelProperties?: AgentDefinition['modelProperties'];+}+export class TurnResourceResolver<TTurnCustom extends object = Record<string, never>,> implements ITurnResourceResolver<TTurnCustom> {readonly #sources = new Map<string, Promise<ToolSource>>();+ readonly #models = new Map<string, Promise<ResolvedModel>>();#sandbox?: Sandbox | undefined;constructor(protected readonly deps: {/** Model name → client and defaults. Called once per resolved definition; may load provider config. */- llm: (model: string) => Promise<{- modelClient: ILLM;- defaultModelParams: ModelParams;- modelProperties?: AgentDefinition['modelProperties'];- }>;+ llm: (model: string) => Promise<ResolvedModel>;/*** MCP server name → connection details. Required to use spec.mcp_servers:* the AgentSpec carries names only (no url/headers on the wire) — the@@ -197,7 +200,7 @@ export class TurnResourceResolver<// Sub-agents may request a different catalog model via agent_info.model;// resolve that name so modelClient matches the override (not just a label).const modelName = agentInfo?.model ?? spec.model.name;- const resolvedModel = await this.deps.llm(modelName);+ const resolvedModel = await this.getModel(modelName);return {definition: {modelClient: resolvedModel.modelClient,@@ -237,4 +240,18 @@ export class TurnResourceResolver<this.#sources.set(input.id, made);return made;}++ /**+ * Resolves `deps.llm` once per distinct model name for this turn — parent and+ * sub-agents with the same catalog model share one promise.+ */+ protected getModel(modelName: string): Promise<ResolvedModel> {+ const cached = this.#models.get(modelName);+ if (cached) {+ return cached;+ }+ const made = this.deps.llm(modelName);+ this.#models.set(modelName, made);+ return made;+ }}diff --git a/packages/trueforge-core/tests/agent-session/turnStream.test.ts b/packages/trueforge-core/tests/agent-session/turnStream.test.tsindex ae9be5e03..f5a103a67 100644--- a/packages/trueforge-core/tests/agent-session/turnStream.test.ts+++ b/packages/trueforge-core/tests/agent-session/turnStream.test.ts@@ -460,6 +460,30 @@ describe('TurnResourceResolver caches', () => {expect(creates).toBe(1);});+ it('getModel single-flights by model name', async () => {+ const logger = makeSilentLogger();+ let llmCalls = 0;+ const modelClient = makeMockILLM();+ const resolver = new (class extends TurnResourceResolver {+ async resolveTwice() {+ const [a, b] = await Promise.all([this.getModel('acct/model-a'), this.getModel('acct/model-a')]);+ expect(a).toBe(b);+ }+ })({+ llm: async () => {+ llmCalls += 1;+ await new Promise(r => setTimeout(r, 10));+ return { modelClient, defaultModelParams: {} };+ },+ mcp: () => Promise.reject(new Error('unused')),+ mcpRequestTimeoutMs: 1_000,+ mcpConnectTimeoutMs: 1_000,+ logger,+ });+ await resolver.resolveTwice();+ expect(llmCalls).toBe(1);+ });+it('resolveSandbox called once per run via SessionHandle.createTurn', async () => {const sandbox = makeStubPublicSandbox();jest.spyOn(sandbox, 'close').mockResolvedValue(undefined);