fix(agents-core): preserve nested agent-tool approval attribution on restore (#996)

Author: seratch

.changeset/fix-nested-agent-tool-approval-attribution.md

@@ -0,0 +1,5 @@
+---
+'@openai/agents-core': patch
+---
+
+fix: preserve nested agent tool approval agent after run state restore

packages/agents-core/src/agent.ts

@@ -48,6 +48,7 @@ import {
 } from './agentToolInput';
 import type { ZodObjectLike } from './utils/zodCompat';
 import { saveAgentToolRunResult } from './agentToolRunResults';
+import { registerAgentToolSourceAgent } from './agentToolSourceRegistry';
 
 type CompletedRunResult<TContext, TAgent extends Agent<TContext, any>> = (
   | RunResult<TContext, TAgent>
@@ -848,6 +849,7 @@ export class Agent<
         return agentTool;
       },
     };
+    registerAgentToolSourceAgent(agentTool, this);
 
     return agentTool;
   }

packages/agents-core/src/agentToolSourceRegistry.ts

@@ -0,0 +1,26 @@
+import type { Agent } from './agent';
+import type { FunctionTool, Tool } from './tool';
+
+// Internal registry that links Agent.asTool() function tools back to their source
+// Agent instances so RunState reconstruction can traverse nested agent-tools
+// without storing hidden metadata on the tool object itself.
+const agentToolSourceRegistry = new WeakMap<
+  FunctionTool<any, any, any>,
+  Agent<any, any>
+>();
+
+export function registerAgentToolSourceAgent(
+  tool: FunctionTool<any, any, any>,
+  agent: Agent<any, any>,
+): void {
+  agentToolSourceRegistry.set(tool, agent);
+}
+
+export function getAgentToolSourceAgent(
+  tool: Tool<any>,
+): Agent<any, any> | undefined {
+  if (tool.type !== 'function') {
+    return undefined;
+  }
+  return agentToolSourceRegistry.get(tool);
+}

packages/agents-core/src/runState.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { Agent } from './agent';
+import { getAgentToolSourceAgent } from './agentToolSourceRegistry';
 import {
   RunMessageOutputItem,
   RunItem,
@@ -997,6 +998,13 @@ export function buildAgentMap(
         }
       }
     }
+
+    for (const tool of currentAgent.tools) {
+      const sourceAgent = getAgentToolSourceAgent(tool);
+      if (sourceAgent && !map.has(sourceAgent.name)) {
+        queue.push(sourceAgent);
+      }
+    }
   }
 
   return map;

packages/agents-core/test/agentScenarios.test.ts

@@ -540,6 +540,7 @@ describe('Agent scenarios (examples and docs patterns)', () => {
     const first = await runner.run(outerAgent, 'start');
 
     expect(first.interruptions).toHaveLength(1);
+    expect(first.interruptions?.[0]?.agent.name).toBe('NestedAgent');
 
     const outerOutputsBefore = first.newItems.filter(
       (item) =>
@@ -557,6 +558,7 @@ describe('Agent scenarios (examples and docs patterns)', () => {
     if (!approval) {
       throw new Error('Expected nested tool approval interruption');
     }
+    expect(approval.agent.name).toBe('NestedAgent');
     restored.approve(approval);
 
     const resumed = await runner.run(outerAgent, restored);