Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
fix: Revert tools to servers renaming for MCP tools
Antonio Ojeaa891fc31d6c4
diff --git a/.github/workflows/kind-mesh-e2e.yml b/.github/workflows/kind-mesh-e2e.ymlindex 80135398..0e787c65 100644--- a/.github/workflows/kind-mesh-e2e.yml+++ b/.github/workflows/kind-mesh-e2e.yml@@ -83,8 +83,8 @@ jobs:echo "== discover services / find calculator (poll) =="peer=""for _ in $(seq 1 30); do- tools=$(mcp -tool find_remote_servers -args '{}' || true)- peer=$(printf '%s' "$tools" | jq -r '.[]? | select(.server_name=="calculator.add") | .peer_id' 2>/dev/null | head -n1)+ tools=$(mcp -tool find_remote_tools -args '{}' || true)+ peer=$(printf '%s' "$tools" | jq -r '.[]? | select(.tool_name=="calculator.add") | .peer_id' 2>/dev/null | head -n1)[ -n "$peer" ] && breaksleep 1done@@ -92,8 +92,8 @@ jobs:echo "calculator host: $peer"echo "== call calculator.add(2,3) =="- result=$(mcp -tool call_remote_server \- -args "{\"peer_id\":\"$peer\",\"server_name\":\"calculator.add\",\"arguments\":{\"a\":2,\"b\":3}}")+ result=$(mcp -tool call_remote_tool \+ -args "{\"peer_id\":\"$peer\",\"tool_name\":\"calculator.add\",\"arguments\":{\"a\":2,\"b\":3}}")echo "result: $result"printf '%s' "$result" | grep -q 5 || { echo "calculator.add did not return 5"; exit 1; }echo "OK: calculator.add(2,3) == 5"diff --git a/cmd/sam-node/mcp.go b/cmd/sam-node/mcp.goindex 6c96727a..36edc45a 100644--- a/cmd/sam-node/mcp.go+++ b/cmd/sam-node/mcp.go@@ -38,9 +38,9 @@ import (const meshInstructions = `This MCP server connects this node to a SAM mesh: a network of remote agents that host their own MCP tools. The tools listed here are infrastructure for reaching tools on other peers when no local tool or capability covers the task.Reach into the mesh only when the needed tool isn't available locally. To do so:- 1. find_remote_servers — discover what tools exist across the mesh (returns peer_id + namespaced tool_name + description). Optionally narrow by service_name or peer_id.- 2. describe_remote_server — fetch a specific tool's input_schema before calling it. Always do this so you know the argument shape.- 3. call_remote_server — invoke it. Pass peer_id, the namespaced tool_name, and arguments as a JSON object whose keys match the input_schema from step 2 (not a stringified blob).+ 1. find_remote_tools — discover what tools exist across the mesh (returns peer_id + namespaced tool_name + description). Optionally narrow by service_name or peer_id.+ 2. describe_remote_tool — fetch a specific tool's input_schema before calling it. Always do this so you know the argument shape.+ 3. call_remote_tool — invoke it. Pass peer_id, the namespaced tool_name, and arguments as a JSON object whose keys match the input_schema from step 2 (not a stringified blob).Other useful tools: discover_remote_services browses services by type, get_mesh_info reports connected peers and mesh state, list_local_services shows what this node hosts.@@ -96,11 +96,11 @@ func NewMCPHandler(node *SamNode) http.Handler {Description: "Get information about the mesh network",}, node.handleGetMeshInfo)- // Add the call_remote_server tool.+ // Add the call_remote_tool tool.mcp.AddTool(mcpServer, &mcp.Tool{- Name: "call_remote_server",+ Name: "call_remote_tool",Description: "Call an MCP tool on a remote agent",- }, node.handleCallRemoteServer)+ }, node.handleCallRemoteTool)// Add the connect_peer tool.mcp.AddTool(mcpServer, &mcp.Tool{@@ -108,17 +108,17 @@ func NewMCPHandler(node *SamNode) http.Handler {Description: "Connect to a peer in the mesh",}, node.handleConnectPeer)- // Add the find_remote_servers tool.+ // Add the find_remote_tools tool.mcp.AddTool(mcpServer, &mcp.Tool{- Name: "find_remote_servers",+ Name: "find_remote_tools",Description: "Discover MCP tools available on hosted services across the mesh. Returns name + description per tool. Optionally narrow by peer_id, service_name, or intent (intent is reserved for future ranking and is accepted-but-ignored).",- }, node.handleFindRemoteServers)+ }, node.handleFindRemoteTools)- // Add the describe_remote_server tool.+ // Add the describe_remote_tool tool.mcp.AddTool(mcpServer, &mcp.Tool{- Name: "describe_remote_server",- Description: "Return the description, input schema, and output schema for a specific aggregated tool on a specific peer. peer_id and tool_name are both required; tool_name must be a namespaced '<service>.<tool>' name as returned by find_remote_servers.",- }, node.handleDescribeRemoteServer)+ Name: "describe_remote_tool",+ Description: "Return the description, input schema, and output schema for a specific aggregated tool on a specific peer. peer_id and tool_name are both required; tool_name must be a namespaced '<service>.<tool>' name as returned by find_remote_tools.",+ }, node.handleDescribeRemoteTool)// Create the SSE handler using the SDKsseHandler := mcp.NewSSEHandler(func(request *http.Request) *mcp.Server {diff --git a/cmd/sam-node/mcp_handlers.go b/cmd/sam-node/mcp_handlers.goindex a9704fdc..632d9a4a 100644--- a/cmd/sam-node/mcp_handlers.go+++ b/cmd/sam-node/mcp_handlers.go@@ -188,25 +188,25 @@ func (n *SamNode) handleGetMeshInfo(ctx context.Context, req *mcp.CallToolReques}, nil, nil}-// CallRemoteServerParams defines the parameters for the call_remote_server tool.+// CallRemoteToolParams defines the parameters for the call_remote_tool tool.//// Arguments is a JSON object whose shape matches the target server's-// input_schema (use describe_remote_server to fetch it). Earlier revisions+// input_schema (use describe_remote_tool to fetch it). Earlier revisions// took a stringified JSON blob here; that footgun is gone.-type CallRemoteServerParams struct {+type CallRemoteToolParams struct {PeerID string `json:"peer_id" jsonschema:"The Peer ID of the target agent"`- ServerName string `json:"server_name" jsonschema:"The name of the server to call"`- Arguments map[string]any `json:"arguments,omitempty" jsonschema:"Server arguments as a JSON object whose keys match the target server's input_schema. Call describe_remote_server first to learn the schema."`+ ToolName string `json:"tool_name" jsonschema:"The name of the server to call"`+ Arguments map[string]any `json:"arguments,omitempty" jsonschema:"Server arguments as a JSON object whose keys match the target server's input_schema. Call describe_remote_tool first to learn the schema."`}-// handleCallRemoteServer implements the call_remote_server tool.-func (n *SamNode) handleCallRemoteServer(ctx context.Context, req *mcp.CallToolRequest, params CallRemoteServerParams) (*mcp.CallToolResult, any, error) {- logger.Infof("[MCP] call_remote_server called for peer %s, tool %s", params.PeerID, params.ServerName)+// handleCallRemoteTool implements the call_remote_tool tool.+func (n *SamNode) handleCallRemoteTool(ctx context.Context, req *mcp.CallToolRequest, params CallRemoteToolParams) (*mcp.CallToolResult, any, error) {+ logger.Infof("[MCP] call_remote_tool called for peer %s, tool %s", params.PeerID, params.ToolName)targetPeer, err := peer.Decode(params.PeerID)if err != nil {return nil, nil, err}- res, err := n.CallMCPTool(ctx, targetPeer, params.ServerName, params.Arguments)+ res, err := n.CallMCPTool(ctx, targetPeer, params.ToolName, params.Arguments)if err != nil {return nil, nil, err}@@ -238,22 +238,22 @@ func (n *SamNode) handleConnectPeer(ctx context.Context, req *mcp.CallToolReques}, nil, nil}-// FindRemoteServersParams defines the parameters for the-// find_remote_servers tool.-type FindRemoteServersParams struct {+// FindRemoteToolsParams defines the parameters for the+// find_remote_tools tool.+type FindRemoteToolsParams struct {Intent string `json:"intent,omitempty" jsonschema:"Natural-language description of what the caller is looking for. Reserved for future semantic ranking; currently accepted but ignored."`PeerID string `json:"peer_id,omitempty" jsonschema:"Restrict the search to a single peer. Empty means search the whole mesh."`ServiceName string `json:"service_name,omitempty" jsonschema:"Restrict results to tools whose name starts with this service prefix (e.g. 'code-reviewer'). Empty means no service filter."`}-// remoteServerRow is one entry in the find_remote_servers response.-type remoteServerRow struct {+// remoteToolRow is one entry in the find_remote_tools response.+type remoteToolRow struct {PeerID string `json:"peer_id"`- ServerName string `json:"server_name"`+ ToolName string `json:"tool_name"`Description string `json:"description"`}-// handleFindRemoteServers implements the find_remote_servers tool.+// handleFindRemoteTools implements the find_remote_tools tool.//// Scope:// - If params.PeerID is set, only that peer is queried.@@ -266,9 +266,9 @@ type remoteServerRow struct {// - params.Intent is accepted and logged at debug level, but does not// filter or rank results in this implementation (placeholder for// future semantic search).-func (n *SamNode) handleFindRemoteServers(ctx context.Context, req *mcp.CallToolRequest, params FindRemoteServersParams) (*mcp.CallToolResult, any, error) {+func (n *SamNode) handleFindRemoteTools(ctx context.Context, req *mcp.CallToolRequest, params FindRemoteToolsParams) (*mcp.CallToolResult, any, error) {if params.Intent != "" {- logger.Debugf("[find_remote_servers] intent (ignored): %q", params.Intent)+ logger.Debugf("[find_remote_tools] intent (ignored): %q", params.Intent)}selfID := n.Host.ID().String()@@ -276,7 +276,7 @@ func (n *SamNode) handleFindRemoteServers(ctx context.Context, req *mcp.CallToolreturn nil, nil, fmt.Errorf("peer_id %q is this node; cross-mesh discovery cannot target self", params.PeerID)}- var rows []remoteServerRow+ var rows []remoteToolRowif params.PeerID != "" {pid, err := peer.Decode(params.PeerID)@@ -311,7 +311,7 @@ func (n *SamNode) handleFindRemoteServers(ctx context.Context, req *mcp.CallTool}if rows == nil {- rows = []remoteServerRow{}+ rows = []remoteToolRow{}}respData, err := json.Marshal(rows)if err != nil {@@ -396,7 +396,7 @@ func (n *SamNode) fetchRemoteToolCatalogue(ctx context.Context, targetPeer peer.// 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 []remoteServerRow, peerID string, tools []*mcp.Tool, serviceName string) []remoteServerRow {+func appendFilteredRows(rows []remoteToolRow, peerID string, tools []*mcp.Tool, serviceName string) []remoteToolRow {for _, tool := range tools {if !strings.Contains(tool.Name, ".") {continue@@ -404,9 +404,9 @@ func appendFilteredRows(rows []remoteServerRow, peerID string, tools []*mcp.Toolif serviceName != "" && !strings.HasPrefix(tool.Name, serviceName+".") {continue}- rows = append(rows, remoteServerRow{+ rows = append(rows, remoteToolRow{PeerID: peerID,- ServerName: tool.Name,+ ToolName: tool.Name,Description: tool.Description,})}@@ -416,13 +416,13 @@ func appendFilteredRows(rows []remoteServerRow, peerID string, tools []*mcp.Tool// fanOutFetch queries each peer's tool catalogue concurrently with a// small cap and returns the filtered rows. Per-peer failures are// logged at debug level and skipped — best-effort mesh-wide fetch.-func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceName string) []remoteServerRow {+func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceName string) []remoteToolRow {const maxConcurrent = 8sem := make(chan struct{}, maxConcurrent)var (mu sync.Mutex- rows []remoteServerRow+ rows []remoteToolRow)var wg sync.WaitGroup@@ -439,7 +439,7 @@ func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceNametools, err := n.fetchRemoteToolCatalogue(peerCtx, pid)if err != nil {- logger.Debugf("[find_remote_servers] peer %s skipped: %v", pid, err)+ logger.Debugf("[find_remote_tools] peer %s skipped: %v", pid, err)return}@@ -454,7 +454,7 @@ func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceName}// remoteToolDescription is the JSON payload describe_local_tool emits on the-// peer side and describe_remote_server re-emits on the caller side. The+// peer side and describe_remote_tool re-emits on the caller side. The// caller-side handler fills PeerID; the peer-side handler leaves it empty.//// InputSchema and OutputSchema mirror mcp.Tool's typing (`any`): the SDK@@ -462,26 +462,26 @@ func (n *SamNode) fanOutFetch(ctx context.Context, peers []peer.ID, serviceName// them verbatim without imposing a typed-schema constraint.type remoteToolDescription struct {PeerID string `json:"peer_id,omitempty"`- ServerName string `json:"server_name"`+ ToolName string `json:"tool_name"`Description string `json:"description"`InputSchema any `json:"input_schema,omitempty"`OutputSchema any `json:"output_schema,omitempty"`}-// DescribeRemoteToolParams defines parameters for the describe_remote_server+// DescribeRemoteToolParams defines parameters for the describe_remote_tool// sidecar tool.type DescribeRemoteToolParams struct {PeerID string `json:"peer_id" jsonschema:"Peer ID of the node hosting the server. Required."`- ServerName string `json:"server_name" jsonschema:"Namespaced server name as returned by find_remote_servers (e.g. 'code-reviewer.review_pr'). Required."`+ ToolName string `json:"tool_name" jsonschema:"Namespaced server name as returned by find_remote_tools (e.g. 'code-reviewer.review_pr'). Required."`}-// handleDescribeRemoteServer implements the describe_remote_server client-facing tool.-func (n *SamNode) handleDescribeRemoteServer(ctx context.Context, req *mcp.CallToolRequest, params DescribeRemoteToolParams) (*mcp.CallToolResult, any, error) {+// handleDescribeRemoteTool implements the describe_remote_tool client-facing tool.+func (n *SamNode) handleDescribeRemoteTool(ctx context.Context, req *mcp.CallToolRequest, params DescribeRemoteToolParams) (*mcp.CallToolResult, any, error) {if params.PeerID == "" {return nil, nil, fmt.Errorf("peer_id is required")}- if params.ServerName == "" {- return nil, nil, fmt.Errorf("server_name is required")+ if params.ToolName == "" {+ return nil, nil, fmt.Errorf("tool_name is required")}pid, err := peer.Decode(params.PeerID)@@ -489,12 +489,12 @@ func (n *SamNode) handleDescribeRemoteServer(ctx context.Context, req *mcp.CallTreturn nil, nil, fmt.Errorf("invalid peer_id: %w", err)}- parts := strings.SplitN(params.ServerName, ".", 2)+ parts := strings.SplitN(params.ToolName, ".", 2)if len(parts) != 2 {- return nil, nil, fmt.Errorf("invalid server_name format, expected 'service.tool'")+ return nil, nil, fmt.Errorf("invalid tool_name format, expected 'service.tool'")}serviceName := parts[0]- actualServerName := parts[1]+ actualToolName := parts[1]biscuitBytes, err := n.Store.LoadIdentity()if err != nil {@@ -541,10 +541,10 @@ func (n *SamNode) handleDescribeRemoteServer(ctx context.Context, req *mcp.CallT}for _, t := range listRes.Tools {- if t.Name == actualServerName {+ if t.Name == actualToolName {payload := remoteToolDescription{PeerID: pid.String(),- ServerName: params.ServerName,+ ToolName: params.ToolName,Description: t.Description,InputSchema: t.InputSchema,OutputSchema: t.OutputSchema,diff --git a/cmd/sam-node/mcp_handlers_additional_test.go b/cmd/sam-node/mcp_handlers_additional_test.goindex 278ef986..cf4d980a 100644--- a/cmd/sam-node/mcp_handlers_additional_test.go+++ b/cmd/sam-node/mcp_handlers_additional_test.go@@ -146,9 +146,9 @@ func TestHandleCallRemoteServer(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleCallRemoteServer(context.Background(), &mcp.CallToolRequest{}, CallRemoteServerParams{+ _, _, err := node.handleCallRemoteTool(context.Background(), &mcp.CallToolRequest{}, CallRemoteToolParams{PeerID: "invalid_peer_id",- ServerName: "test",+ ToolName: "test",})if err == nil {t.Errorf("expected error for invalid peer id")diff --git a/cmd/sam-node/mcp_handlers_test.go b/cmd/sam-node/mcp_handlers_test.goindex 653fb385..998e0ad1 100644--- a/cmd/sam-node/mcp_handlers_test.go+++ b/cmd/sam-node/mcp_handlers_test.go@@ -61,9 +61,9 @@ func TestHandleFindRemoteTools_EmptyMesh_ReturnsEmptyArray(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- res, _, err := node.handleFindRemoteServers(ctx, &mcp.CallToolRequest{}, FindRemoteServersParams{})+ res, _, err := node.handleFindRemoteTools(ctx, &mcp.CallToolRequest{}, FindRemoteToolsParams{})if err != nil {- t.Fatalf("handleFindRemoteServers: %v", err)+ t.Fatalf("handleFindRemoteTools: %v", err)}if len(res.Content) == 0 {t.Fatal("expected non-empty result content")@@ -88,7 +88,7 @@ func TestHandleFindRemoteTools_SelfPeerRejected(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleFindRemoteServers(ctx, &mcp.CallToolRequest{}, FindRemoteServersParams{+ _, _, err := node.handleFindRemoteTools(ctx, &mcp.CallToolRequest{}, FindRemoteToolsParams{PeerID: node.Host.ID().String(),})if err == nil {@@ -144,17 +144,17 @@ func TestHandleFindRemoteTools_SinglePeer(t *testing.T) {t.Fatalf("RegisterService: %v", err)}- res, _, err := nodeA.handleFindRemoteServers(ctx, &mcp.CallToolRequest{}, FindRemoteServersParams{+ res, _, err := nodeA.handleFindRemoteTools(ctx, &mcp.CallToolRequest{}, FindRemoteToolsParams{PeerID: nodeB.Host.ID().String(),})if err != nil {- t.Fatalf("handleFindRemoteServers: %v", err)+ t.Fatalf("handleFindRemoteTools: %v", err)}tc, ok := res.Content[0].(*mcp.TextContent)if !ok {t.Fatalf("expected TextContent, got %T", res.Content[0])}- var rows []remoteServerRow+ var rows []remoteToolRowif err := json.Unmarshal([]byte(tc.Text), &rows); err != nil {t.Fatalf("unmarshal: %v (text: %q)", err, tc.Text)}@@ -167,8 +167,8 @@ func TestHandleFindRemoteTools_SinglePeer(t *testing.T) {if row.PeerID != nodeB.Host.ID().String() {t.Errorf("row has peer_id %q, want %q", row.PeerID, nodeB.Host.ID().String())}- if _, ok := wantNames[row.ServerName]; ok {- wantNames[row.ServerName] = true+ if _, ok := wantNames[row.ToolName]; ok {+ wantNames[row.ToolName] = true}}for name, found := range wantNames {@@ -295,19 +295,19 @@ func TestHandleFindRemoteTools_MeshWideViaHandler(t *testing.T) {// Give the DHT a moment to record the provider.time.Sleep(5 * time.Second)- res, _, err := nodeA.handleFindRemoteServers(ctx, &mcp.CallToolRequest{}, FindRemoteServersParams{})+ res, _, err := nodeA.handleFindRemoteTools(ctx, &mcp.CallToolRequest{}, FindRemoteToolsParams{})if err != nil {t.Fatalf("handler: %v", err)}tc := res.Content[0].(*mcp.TextContent)- var rows []remoteServerRow+ var rows []remoteToolRowif err := json.Unmarshal([]byte(tc.Text), &rows); err != nil {t.Fatal(err)}found := falsefor _, r := range rows {- if r.ServerName == "code-reviewer.review_pr" && r.PeerID == nodeB.Host.ID().String() {+ if r.ToolName == "code-reviewer.review_pr" && r.PeerID == nodeB.Host.ID().String() {found = true}}@@ -329,7 +329,7 @@ func TestAppendFilteredRows_ServiceNameFilter(t *testing.T) {t.Errorf("service filter: got %d rows, want 2; rows=%+v", len(rows), rows)}for _, r := range rows {- if !strings.HasPrefix(r.ServerName, "code-reviewer.") {+ if !strings.HasPrefix(r.ToolName, "code-reviewer.") {t.Errorf("row %+v doesn't match service prefix", r)}}@@ -347,8 +347,8 @@ func TestAppendFilteredRows_AggregatedOnly(t *testing.T) {if len(rows) != 1 {t.Errorf("aggregated-only filter: got %d rows, want 1; rows=%+v", len(rows), rows)}- if rows[0].ServerName != "code-reviewer.review_pr" {- t.Errorf("unexpected name %q", rows[0].ServerName)+ if rows[0].ToolName != "code-reviewer.review_pr" {+ t.Errorf("unexpected name %q", rows[0].ToolName)}}@@ -360,7 +360,7 @@ func TestAppendFilteredRows_PartialPrefixMatch(t *testing.T) {{Name: "code.something"},}rows := appendFilteredRows(nil, "peerB", tools, "code")- if len(rows) != 1 || rows[0].ServerName != "code.something" {+ if len(rows) != 1 || rows[0].ToolName != "code.something" {t.Errorf("expected exactly one row 'code.something'; got %+v", rows)}}@@ -419,7 +419,7 @@ func TestHandleFindRemoteTools_PartialFailure(t *testing.T) {gotSummarizer := falsefor _, r := range rows {- if r.ServerName == "summarizer.summarize" {+ if r.ToolName == "summarizer.summarize" {gotSummarizer = true}}@@ -452,7 +452,7 @@ func TestNewMCPHandler_RegistersFindRemoteTools(t *testing.T) {}found := falsefor _, tl := range res.Tools {- if tl.Name == "find_remote_servers" {+ if tl.Name == "find_remote_tools" {found = true}}@@ -461,7 +461,7 @@ func TestNewMCPHandler_RegistersFindRemoteTools(t *testing.T) {for _, tl := range res.Tools {names = append(names, tl.Name)}- t.Errorf("find_remote_servers missing from sidecar tools/list; got %v", names)+ t.Errorf("find_remote_tools missing from sidecar tools/list; got %v", names)}}@@ -472,26 +472,26 @@ func TestHandleDescribeRemoteTool_EmptyPeerID(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{- ServerName: "code-reviewer.review_pr",+ _, _, err := node.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ ToolName: "code-reviewer.review_pr",})if err == nil {t.Fatal("expected error for empty peer_id")}}-func TestHandleDescribeRemoteTool_EmptyServerName(t *testing.T) {+func TestHandleDescribeRemoteTool_EmptyToolName(t *testing.T) {ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)defer cancel()node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ _, _, err := node.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: "12D3KooWFakePeerID",})if err == nil {- t.Fatal("expected error for empty server_name")+ t.Fatal("expected error for empty tool_name")}}@@ -502,12 +502,12 @@ func TestHandleDescribeRemoteTool_NonNamespacedRejected(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ _, _, err := node.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: node.Host.ID().String(),- ServerName: "send_message", // no dot+ ToolName: "send_message", // no dot})if err == nil {- t.Fatal("expected error for server_name without '.'")+ t.Fatal("expected error for tool_name without '.'")}if !strings.Contains(err.Error(), "service.tool") {t.Errorf("error %q does not explain the namespacing requirement", err.Error())@@ -521,9 +521,9 @@ func TestHandleDescribeRemoteTool_SelfPeerRejected(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ _, _, err := node.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: node.Host.ID().String(),- ServerName: "code-reviewer.review_pr",+ ToolName: "code-reviewer.review_pr",})if err == nil {t.Fatal("expected error when peer_id equals self peer ID")@@ -537,9 +537,9 @@ func TestHandleDescribeRemoteTool_InvalidPeerID(t *testing.T) {node, cleanup := startBareNode(t, ctx)defer cleanup()- _, _, err := node.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ _, _, err := node.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: "not-a-valid-peer-id",- ServerName: "code-reviewer.review_pr",+ ToolName: "code-reviewer.review_pr",})if err == nil {t.Fatal("expected error for malformed peer_id")@@ -601,12 +601,12 @@ func TestHandleDescribeRemoteTool_RoundTrip(t *testing.T) {}defer func() { _ = nodeB.UnregisterService(ctx, "code-reviewer") }()- res, _, err := nodeA.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ res, _, err := nodeA.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: nodeB.Host.ID().String(),- ServerName: "code-reviewer.review_pr",+ ToolName: "code-reviewer.review_pr",})if err != nil {- t.Fatalf("handleDescribeRemoteServer: %v", err)+ t.Fatalf("handleDescribeRemoteTool: %v", err)}tc, ok := res.Content[0].(*mcp.TextContent)if !ok {@@ -620,8 +620,8 @@ func TestHandleDescribeRemoteTool_RoundTrip(t *testing.T) {if desc.PeerID != nodeB.Host.ID().String() {t.Errorf("PeerID = %q, want %q", desc.PeerID, nodeB.Host.ID().String())}- if desc.ServerName != "code-reviewer.review_pr" {- t.Errorf("ServerName = %q, want %q", desc.ServerName, "code-reviewer.review_pr")+ if desc.ToolName != "code-reviewer.review_pr" {+ t.Errorf("ToolName = %q, want %q", desc.ToolName, "code-reviewer.review_pr")}if desc.Description != "Run a code review" {t.Errorf("Description = %q, want %q", desc.Description, "Run a code review")@@ -679,9 +679,9 @@ func TestHandleDescribeRemoteTool_RoundTrip_UnknownTool(t *testing.T) {}defer func() { _ = nodeB.UnregisterService(ctx, "code-reviewer") }()- _, _, err = nodeA.handleDescribeRemoteServer(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{+ _, _, err = nodeA.handleDescribeRemoteTool(ctx, &mcp.CallToolRequest{}, DescribeRemoteToolParams{PeerID: nodeB.Host.ID().String(),- ServerName: "code-reviewer.does-not-exist",+ ToolName: "code-reviewer.does-not-exist",})if err == nil {t.Fatal("expected error from peer when tool is not registered")@@ -716,7 +716,7 @@ func TestNewMCPHandler_RegistersDescribeRemoteTool(t *testing.T) {}found := falsefor _, tl := range res.Tools {- if tl.Name == "describe_remote_server" {+ if tl.Name == "describe_remote_tool" {found = true}}@@ -725,7 +725,7 @@ func TestNewMCPHandler_RegistersDescribeRemoteTool(t *testing.T) {for _, tl := range res.Tools {names = append(names, tl.Name)}- t.Errorf("describe_remote_server missing from sidecar tools/list; got %v", names)+ t.Errorf("describe_remote_tool missing from sidecar tools/list; got %v", names)}}diff --git a/tests/e2e/find_remote_servers.bats b/tests/e2e/find_remote_tools.batssimilarity index 84%rename from tests/e2e/find_remote_servers.batsrename to tests/e2e/find_remote_tools.batsindex ac6bdb50..01387d51 100644--- a/tests/e2e/find_remote_servers.bats+++ b/tests/e2e/find_remote_tools.bats@@ -32,7 +32,7 @@ teardown() {mesh_cleanup_env}-@test "find_remote_servers surfaces aggregated tools from a remote peer" {+@test "find_remote_tools surfaces aggregated tools from a remote peer" {run mesh_start_mock_oidc[[ "$status" -eq 0 ]]@@ -64,13 +64,13 @@ teardown() {[[ "$status" -eq 0 ]]mesh_wait_for_peer_connection 1 "${node2_peer_id}" 20- echo "[$(date +%T)] Calling find_remote_servers from Node 1, targeting Node 2"+ echo "[$(date +%T)] Calling find_remote_tools from Node 1, targeting Node 2"run docker run --rm --network "${MESH_NETWORK}" \"${MESH_RUNTIME_IMAGE}" mcp-client \-url "http://sam-node-1:8080/mcp/events" \- -tool "find_remote_servers" \+ -tool "find_remote_tools" \-args "{\"peer_id\":\"${node2_peer_id}\"}"- echo "find_remote_servers output: $output"+ echo "find_remote_tools output: $output"[[ "$status" -eq 0 ]]# mcp-client prints each text-content line; the catalog JSON is the last non-empty line.@@ -80,13 +80,13 @@ teardown() {local match_countmatch_count=$(echo "$catalog" | jq --arg pid "${node2_peer_id}" '[.[] | select(.peer_id == $pid- and (.server_name | startswith("calculator.")))] | length+ and (.tool_name | startswith("calculator.")))] | length')echo "Matching calculator tool entries: ${match_count}"[[ "${match_count}" -ge 1 ]]}-@test "call_remote_server invokes an aggregated hosted-service tool end to end" {+@test "call_remote_tool invokes an aggregated hosted-service tool end to end" {run mesh_start_mock_oidc[[ "$status" -eq 0 ]]@@ -122,22 +122,22 @@ teardown() {[[ "$status" -eq 0 ]]mesh_wait_for_peer_connection 1 "${node2_peer_id}" 20- echo "[$(date +%T)] Calling call_remote_server for calculator.add"+ echo "[$(date +%T)] Calling call_remote_tool for calculator.add"local call_args- call_args="{\"peer_id\":\"${node2_peer_id}\",\"server_name\":\"calculator.add\",\"arguments\":{\"a\":2,\"b\":3}}"+ call_args="{\"peer_id\":\"${node2_peer_id}\",\"tool_name\":\"calculator.add\",\"arguments\":{\"a\":2,\"b\":3}}"run docker run --rm --network "${MESH_NETWORK}" \"${MESH_RUNTIME_IMAGE}" mcp-client \-url "http://sam-node-1:8080/mcp/events" \- -tool "call_remote_server" \+ -tool "call_remote_tool" \-args "${call_args}"- echo "call_remote_server output: $output"+ echo "call_remote_tool output: $output"[[ "$status" -eq 0 ]]# calc-mcp returns add(2,3)=5 as a TextContent string; "5" must appear in the response.[[ "$output" == *"5"* ]]}-@test "describe_remote_server returns input schema for an aggregated tool" {+@test "describe_remote_tool returns input schema for an aggregated tool" {run mesh_start_mock_oidc[[ "$status" -eq 0 ]]@@ -173,28 +173,28 @@ teardown() {[[ "$status" -eq 0 ]]mesh_wait_for_peer_connection 1 "${node2_peer_id}" 20- echo "[$(date +%T)] Calling describe_remote_server for calculator.add"+ echo "[$(date +%T)] Calling describe_remote_tool for calculator.add"local describe_args- describe_args="{\"peer_id\":\"${node2_peer_id}\",\"server_name\":\"calculator.add\"}"+ describe_args="{\"peer_id\":\"${node2_peer_id}\",\"tool_name\":\"calculator.add\"}"run docker run --rm --network "${MESH_NETWORK}" \"${MESH_RUNTIME_IMAGE}" mcp-client \-url "http://sam-node-1:8080/mcp/events" \- -tool "describe_remote_server" \+ -tool "describe_remote_tool" \-args "${describe_args}"- echo "describe_remote_server output: $output"+ echo "describe_remote_tool output: $output"[[ "$status" -eq 0 ]]# mcp-client prints each TextContent line; the JSON payload is the last non-empty line.local payloadpayload=$(echo "$output" | tail -n 1)- # Assert peer_id, namespaced server_name, and an input_schema with an object type.+ # Assert peer_id, namespaced tool_name, and an input_schema with an object type.local got_peergot_peer=$(echo "$payload" | jq -r '.peer_id')[[ "${got_peer}" == "${node2_peer_id}" ]]local got_name- got_name=$(echo "$payload" | jq -r '.server_name')+ got_name=$(echo "$payload" | jq -r '.tool_name')[[ "${got_name}" == "calculator.add" ]]local got_input_type@@ -202,7 +202,7 @@ teardown() {[[ "${got_input_type}" == "object" ]]}-@test "describe_remote_server surfaces an error for an unknown tool" {+@test "describe_remote_tool surfaces an error for an unknown tool" {run mesh_start_mock_oidc[[ "$status" -eq 0 ]]@@ -238,15 +238,15 @@ teardown() {[[ "$status" -eq 0 ]]mesh_wait_for_peer_connection 1 "${node2_peer_id}" 20- echo "[$(date +%T)] Calling describe_remote_server for an unknown tool"+ echo "[$(date +%T)] Calling describe_remote_tool for an unknown tool"local describe_args- describe_args="{\"peer_id\":\"${node2_peer_id}\",\"server_name\":\"calculator.does-not-exist\"}"+ describe_args="{\"peer_id\":\"${node2_peer_id}\",\"tool_name\":\"calculator.does-not-exist\"}"run docker run --rm --network "${MESH_NETWORK}" \"${MESH_RUNTIME_IMAGE}" mcp-client \-url "http://sam-node-1:8080/mcp/events" \- -tool "describe_remote_server" \+ -tool "describe_remote_tool" \-args "${describe_args}"- echo "describe_remote_server output: $output"+ echo "describe_remote_tool output: $output"# The peer's describe_local_tool handler returns "tool not found: <name>";# handleDescribeRemoteTool wraps it as "describe_local_tool on <peer>: tooldiff --git a/tests/e2e/policy.bats b/tests/e2e/policy.batsindex 24ed1d06..a29c2523 100644--- a/tests/e2e/policy.bats+++ b/tests/e2e/policy.bats@@ -124,14 +124,14 @@ EOFmesh_wait_for_log "${name}" "Mock OIDC server ready" 30}-mesh_call_remote_server() {+mesh_call_remote_tool() {local caller_idx="$1"local target_peer_id="$2"- local server_name="$3"+ local tool_name="$3"- local args="{\"peer_id\":\"${target_peer_id}\",\"server_name\":\"${server_name}\",\"arguments\":{}}"+ local args="{\"peer_id\":\"${target_peer_id}\",\"tool_name\":\"${tool_name}\",\"arguments\":{}}"- docker run --rm --network "${MESH_NETWORK}" "${MESH_RUNTIME_IMAGE}" mcp-client -url "http://sam-node-${caller_idx}:8080/mcp/events" -tool "call_remote_server" -args "${args}"+ docker run --rm --network "${MESH_NETWORK}" "${MESH_RUNTIME_IMAGE}" mcp-client -url "http://sam-node-${caller_idx}:8080/mcp/events" -tool "call_remote_tool" -args "${args}"}setup() {@@ -272,19 +272,19 @@ teardown() {}@test "Policy E2E: Positive Path (Allowed by Hub, Not blocked by Node)" {- run mesh_call_remote_server 2 "${TARGET_PEER_ID}" "query_database"+ run mesh_call_remote_tool 2 "${TARGET_PEER_ID}" "query_database"echo "Output: $output"[ "$status" -eq 0 ]}@test "Policy E2E: Negative Path (Denied by Hub)" {- run mesh_call_remote_server 2 "${TARGET_PEER_ID}" "reboot_server"+ run mesh_call_remote_tool 2 "${TARGET_PEER_ID}" "reboot_server"echo "Output: $output"[[ "$output" == *"denied"* ]]}@test "Policy E2E: Attenuation Path (Allowed by Hub, Blocked by Node)" {- run mesh_call_remote_server 2 "${TARGET_PEER_ID}" "delete_tables"+ run mesh_call_remote_tool 2 "${TARGET_PEER_ID}" "delete_tables"echo "Output: $output"[[ "$output" == *"denied"* ]]}