@@ -45,6 +45,7 @@ type SubAgentHandler struct {
4545 deltaTracker *delta.Tracker
4646 sh *shell.Shell
4747 allTools []mcp.Tool
48+ upstream mcp.UpstreamClient
4849 }
4950
5051 // NewSubAgentHandler creates a handler for the SubAgent tool.
@@ -54,6 +55,7 @@ func NewSubAgentHandler(
5455 deltaTracker *delta.Tracker,
5556 sh *shell.Shell,
5657 allTools []mcp.Tool,
58+ upstream mcp.UpstreamClient,
5759 ) *SubAgentHandler {
5860 // Validate required dependencies
5961 if prov == nil {
@@ -69,6 +71,7 @@ func NewSubAgentHandler(
6971 deltaTracker: deltaTracker,
7072 sh: sh,
7173 allTools: allTools,
74+ upstream: upstream,
7275 }
7376 }
7477
@@ -94,8 +97,9 @@ func (h *SubAgentHandler) Handle(ctx context.Context, arguments json.RawMessage)
9497 subEditHandler := NewEditHandler(subTracker, h.lspManager, h.deltaTracker)
9598 subShellHandler := NewShellHandler(h.sh)
9699
97- // Create proxy with sub-agent tools (filtered - no nested SubAgent)
98- subProxy := mcp.NewProxy(nil)
100+ // Create proxy with sub-agent tools (filtered - no nested SubAgent).
101+ // Pass upstream so tools like web_search_exa can be dispatched.
102+ subProxy := mcp.NewProxy(h.upstream)
99103 filteredTools := subagent.FilterToolsForType(h.allTools, args.Type)
100104
101105 // Register tools with sub-agent proxy