Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
feat(mcp): Expose auth and connection errors in find_remote_tools
Antonio Ojeae63a93763375
diff --git a/cmd/sam-node/mcp_handlers.go b/cmd/sam-node/mcp_handlers.goindex e6dd5a78..a5e5c0f1 100644--- a/cmd/sam-node/mcp_handlers.go+++ b/cmd/sam-node/mcp_handlers.go@@ -247,8 +247,9 @@ type FindRemoteToolsParams struct {// remoteToolRow is one entry in the find_remote_tools response.type remoteToolRow struct {PeerID string `json:"peer_id"`- ToolName string `json:"tool_name"`- Description string `json:"description"`+ ToolName string `json:"tool_name,omitempty"`+ Description string `json:"description,omitempty"`+ Error string `json:"error,omitempty"`}// handleFindRemoteTools implements the find_remote_tools tool.@@ -281,11 +282,11 @@ func (n *SamNode) handleFindRemoteTools(ctx context.Context, req *mcp.CallToolReif err != nil {return nil, nil, fmt.Errorf("invalid peer_id %q: %w", params.PeerID, err)}- tools, err := n.fetchRemoteToolCatalogue(ctx, pid)+ peerRows, err := n.fetchRemoteToolCatalogue(ctx, pid, params.ServiceName)if err != nil {return nil, nil, err}- rows = appendFilteredRows(rows, params.PeerID, tools, params.ServiceName)+ rows = peerRows} else {providers, err := n.DiscoverRemoteServices(ctx, api.ServiceType_SERVICE_TYPE_MCP, "")if err != nil {@@ -322,13 +323,13 @@ func (n *SamNode) handleFindRemoteTools(ctx context.Context, req *mcp.CallToolRe// fetchRemoteToolCatalogue gets the remote node's service catalogue,// then opens a separate libp2p stream to each MCP service to fetch its tools.-func (n *SamNode) fetchRemoteToolCatalogue(ctx context.Context, targetPeer peer.ID) ([]*mcp.Tool, error) {+func (n *SamNode) fetchRemoteToolCatalogue(ctx context.Context, targetPeer peer.ID, serviceNameFilter string) ([]remoteToolRow, error) {services, err := n.fetchRemoteServiceCatalog(ctx, targetPeer, "MCP")if err != nil {return nil, fmt.Errorf("fetch remote service catalog: %w", err)}- var allTools []*mcp.Tool+ var rows []remoteToolRowfor _, svc := range services {if svc.Type != api.ServiceType_SERVICE_TYPE_MCP {@@ -339,6 +340,13 @@ func (n *SamNode) fetchRemoteToolCatalogue(ctx context.Context, targetPeer peer.session, cleanup, err := n.ConnectMCPSession(ctx, targetPeer, svc.Name)if err != nil {logger.Debugf("Failed to connect MCP session for service %s: %v", svc.Name, err)+ if serviceNameFilter == "" || svc.Name == serviceNameFilter || strings.HasPrefix(svc.Name, serviceNameFilter+".") {+ rows = append(rows, remoteToolRow{+ PeerID: targetPeer.String(),+ ToolName: svc.Name,+ Error: fmt.Sprintf("auth rejected: %v", err),+ })+ }continue}@@ -346,34 +354,32 @@ func (n *SamNode) fetchRemoteToolCatalogue(ctx context.Context, targetPeer peer.if err == nil {for _, t := range listRes.Tools {t.Name = svc.Name + "." + t.Name- allTools = append(allTools, t)+ if !strings.Contains(t.Name, ".") {+ continue+ }+ if serviceNameFilter != "" && !strings.HasPrefix(t.Name, serviceNameFilter+".") {+ continue+ }+ rows = append(rows, remoteToolRow{+ PeerID: targetPeer.String(),+ ToolName: t.Name,+ Description: t.Description,+ })+ }+ } else {+ if serviceNameFilter == "" || svc.Name == serviceNameFilter || strings.HasPrefix(svc.Name, serviceNameFilter+".") {+ rows = append(rows, remoteToolRow{+ PeerID: targetPeer.String(),+ ToolName: svc.Name,+ Error: fmt.Sprintf("failed to list tools: %v", err),+ })}}cleanup()}- return allTools, nil-}--// appendFilteredRows appends rows for tools that have a namespaced name-// (containing ".") and, if serviceName is non-empty, whose name starts-// with "<serviceName>.".-func appendFilteredRows(rows []remoteToolRow, peerID string, tools []*mcp.Tool, serviceName string) []remoteToolRow {- for _, tool := range tools {- if !strings.Contains(tool.Name, ".") {- continue- }- if serviceName != "" && !strings.HasPrefix(tool.Name, serviceName+".") {- continue- }- rows = append(rows, remoteToolRow{- PeerID: peerID,- ToolName: tool.Name,- Description: tool.Description,- })- }- return rows+ return rows, nil}// fanOutFetch queries each peer's tool catalogue concurrently with a@@ -400,14 +406,20 @@ func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceNamepeerCtx, cancel := context.WithTimeout(ctx, 5*time.Second)defer cancel()- tools, err := n.fetchRemoteToolCatalogue(peerCtx, pid)+ peerRows, err := n.fetchRemoteToolCatalogue(peerCtx, pid, serviceName)if err != nil {logger.Debugf("[find_remote_tools] peer %s skipped: %v", pid, err)+ mu.Lock()+ rows = append(rows, remoteToolRow{+ PeerID: pid.String(),+ Error: fmt.Sprintf("failed to fetch tool catalogue: %v", err),+ })+ mu.Unlock()return}mu.Lock()- rows = appendFilteredRows(rows, pid.String(), tools, serviceName)+ rows = append(rows, peerRows...)mu.Unlock()}()}diff --git a/cmd/sam-node/mcp_handlers_test.go b/cmd/sam-node/mcp_handlers_test.goindex 05db489f..835ba9da 100644--- a/cmd/sam-node/mcp_handlers_test.go+++ b/cmd/sam-node/mcp_handlers_test.go@@ -235,18 +235,18 @@ func TestHandleFindRemoteTools_MeshWide(t *testing.T) {// Direct fan-out test: invoke fetchRemoteToolCatalogue for both peers,// confirm both return their tools. This isolates the lower-level path// from DHT convergence concerns.- rowsB, errB := nodeA.fetchRemoteToolCatalogue(ctx, nodeB.Host.ID())+ rowsB, errB := nodeA.fetchRemoteToolCatalogue(ctx, nodeB.Host.ID(), "")if errB != nil {t.Fatalf("fetch from B: %v", errB)}- rowsC, errC := nodeA.fetchRemoteToolCatalogue(ctx, nodeC.Host.ID())+ rowsC, errC := nodeA.fetchRemoteToolCatalogue(ctx, nodeC.Host.ID(), "")if errC != nil {t.Fatalf("fetch from C: %v", errC)}gotNames := map[string]bool{}for _, tool := range append(rowsB, rowsC...) {- gotNames[tool.Name] = true+ gotNames[tool.ToolName] = true}if !gotNames["code-reviewer.review_pr"] {t.Errorf("missing code-reviewer.review_pr; got %v", gotNames)@@ -316,55 +316,6 @@ func TestHandleFindRemoteTools_MeshWideViaHandler(t *testing.T) {}}-func TestAppendFilteredRows_ServiceNameFilter(t *testing.T) {- tools := []*mcp.Tool{- {Name: "code-reviewer.review_pr"},- {Name: "code-reviewer.add_comment"},- {Name: "summarizer.summarize"},- {Name: "send_message"}, // infra tool — no dot- }-- rows := appendFilteredRows(nil, "peerB", tools, "code-reviewer")- if len(rows) != 2 {- t.Errorf("service filter: got %d rows, want 2; rows=%+v", len(rows), rows)- }- for _, r := range rows {- if !strings.HasPrefix(r.ToolName, "code-reviewer.") {- t.Errorf("row %+v doesn't match service prefix", r)- }- }-}--func TestAppendFilteredRows_AggregatedOnly(t *testing.T) {- tools := []*mcp.Tool{- {Name: "code-reviewer.review_pr"},- {Name: "send_message"},- {Name: "list_local_services"},- {Name: "get_mesh_info"},- }-- rows := appendFilteredRows(nil, "peerB", tools, "")- if len(rows) != 1 {- t.Errorf("aggregated-only filter: got %d rows, want 1; rows=%+v", len(rows), rows)- }- if rows[0].ToolName != "code-reviewer.review_pr" {- t.Errorf("unexpected name %q", rows[0].ToolName)- }-}--func TestAppendFilteredRows_PartialPrefixMatch(t *testing.T) {- // "code" should NOT match "code-reviewer.review_pr" because the filter- // requires exact service-name + "." prefix.- tools := []*mcp.Tool{- {Name: "code-reviewer.review_pr"},- {Name: "code.something"},- }- rows := appendFilteredRows(nil, "peerB", tools, "code")- if len(rows) != 1 || rows[0].ToolName != "code.something" {- t.Errorf("expected exactly one row 'code.something'; got %+v", rows)- }-}-func TestHandleFindRemoteTools_PartialFailure(t *testing.T) {if testing.Short() {t.Skip("network/dial: skipped in -short")@@ -439,7 +390,7 @@ func TestNewMCPHandler_RegistersFindRemoteTools(t *testing.T) {defer srv.Close()client := mcp.NewClient(&mcp.Implementation{Name: "tc", Version: "0.0.1"}, nil)- transport := &mcp.SSEClientTransport{Endpoint: srv.URL + "/mcp"}+ transport := &mcp.StreamableClientTransport{Endpoint: srv.URL + "/mcp"}session, err := client.Connect(ctx, transport, nil)if err != nil {t.Fatalf("connect: %v", err)@@ -703,7 +654,7 @@ func TestNewMCPHandler_RegistersDescribeRemoteTool(t *testing.T) {defer srv.Close()client := mcp.NewClient(&mcp.Implementation{Name: "tc", Version: "0.0.1"}, nil)- transport := &mcp.SSEClientTransport{Endpoint: srv.URL + "/mcp"}+ transport := &mcp.StreamableClientTransport{Endpoint: srv.URL + "/mcp"}session, err := client.Connect(ctx, transport, nil)if err != nil {t.Fatalf("connect: %v", err)