Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
mcp standard
Antonio Ojea7ee3cd430455
diff --git a/cmd/mcp-client/main.go b/cmd/mcp-client/main.goindex ae9b3b79..77660d5f 100644--- a/cmd/mcp-client/main.go+++ b/cmd/mcp-client/main.go@@ -63,7 +63,7 @@ func main() {}, nil)// Connect to server using the URL- session, err := client.Connect(ctx, &mcp.StreamableClientTransport{Endpoint: *serverURL}, nil)+ session, err := client.Connect(ctx, &mcp.SSEClientTransport{Endpoint: *serverURL}, nil)if err != nil {log.Fatalf("Failed to connect: %v", err)}diff --git a/cmd/sam-node/mcp.go b/cmd/sam-node/mcp.goindex 8472ffc4..bde99d5f 100644--- a/cmd/sam-node/mcp.go+++ b/cmd/sam-node/mcp.go@@ -49,19 +49,19 @@ func handleSendMessage(ctx context.Context, req *mcp.CallToolRequest, params Sen// NewMCPHandler creates a new HTTP handler for the MCP server using the official SDK.func NewMCPHandler(node *SamNode) http.Handler {// Create an MCP server.- server := mcp.NewServer(&mcp.Implementation{+ mcpServer := mcp.NewServer(&mcp.Implementation{Name: "sam-node-mcp",Version: "0.1.0",}, nil)// Add the send_message tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "send_message",Description: "Send a message to another agent in the mesh",}, handleSendMessage)// Add the mesh_pubsub_broadcast tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "mesh_pubsub_broadcast",Description: "Publish an event payload to a custom GossipSub topic",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct {@@ -92,7 +92,7 @@ func NewMCPHandler(node *SamNode) http.Handler {})// Add the poll_messages tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "poll_messages",Description: "Poll for incoming messages on custom GossipSub topics",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct {@@ -112,7 +112,7 @@ func NewMCPHandler(node *SamNode) http.Handler {})// Add the subscribe_topic tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "subscribe_topic",Description: "Subscribe to a custom GossipSub topic",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct {@@ -129,7 +129,7 @@ func NewMCPHandler(node *SamNode) http.Handler {})// Add the get_mesh_info tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "get_mesh_info",Description: "Get information about the mesh network",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct{}) (*mcp.CallToolResult, any, error) {@@ -170,7 +170,7 @@ func NewMCPHandler(node *SamNode) http.Handler {})// Add the call_remote_tool tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "call_remote_tool",Description: "Call an MCP tool on a remote agent",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct {@@ -198,7 +198,7 @@ func NewMCPHandler(node *SamNode) http.Handler {})// Add the connect_peer tool.- mcp.AddTool(server, &mcp.Tool{+ mcp.AddTool(mcpServer, &mcp.Tool{Name: "connect_peer",Description: "Connect to a peer in the mesh",}, func(ctx context.Context, req *mcp.CallToolRequest, params struct {@@ -222,12 +222,22 @@ func NewMCPHandler(node *SamNode) http.Handler {}, nil, nil})- // Create the streamable HTTP handler.- handler := mcp.NewStreamableHTTPHandler(func(req *http.Request) *mcp.Server {- return server+ // Create the SSE handler using the SDK+ sseHandler := mcp.NewSSEHandler(func(request *http.Request) *mcp.Server {+ return mcpServer}, nil)- return handler+ mux := http.NewServeMux()+ mux.Handle("/mcp/events", sseHandler)+ mux.Handle("/mcp/message", sseHandler)++ // Wrap in logging middleware to debug incoming requests+ wrappedHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ logger.Debugf("MCP Request: %s %s from %s", r.Method, r.URL.Path, r.RemoteAddr)+ mux.ServeHTTP(w, r)+ })++ return wrappedHandler}// CallMCPTool opens a stream to a remote peer, performs the handshake, and calls a tool.diff --git a/cmd/sam-node/mcp_test.go b/cmd/sam-node/mcp_test.goindex 5a8ee6e0..829530d6 100644--- a/cmd/sam-node/mcp_test.go+++ b/cmd/sam-node/mcp_test.go@@ -30,7 +30,7 @@ func TestMCPHandler_HTTP(t *testing.T) {client := &http.Client{}- // Test GET on root+ // Test GET on root (should be 404 now)req, err := http.NewRequest("GET", ts.URL, nil)if err != nil {t.Fatal(err)@@ -42,14 +42,12 @@ func TestMCPHandler_HTTP(t *testing.T) {}defer func() { _ = resp.Body.Close() }()- // We expect OK or MethodNotAllowed depending on exact handler implementation,- // but it should not be 404 or 500.- if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusMethodNotAllowed && resp.StatusCode != http.StatusBadRequest {- t.Errorf("Expected status OK, MethodNotAllowed, or BadRequest on root, got %d", resp.StatusCode)+ if resp.StatusCode != http.StatusNotFound {+ t.Errorf("Expected status NotFound on root, got %d", resp.StatusCode)}- // Test GET on /mcp- req2, err := http.NewRequest("GET", ts.URL+"/mcp", nil)+ // Test GET on /mcp/events+ req2, err := http.NewRequest("GET", ts.URL+"/mcp/events", nil)if err != nil {t.Fatal(err)}@@ -60,7 +58,7 @@ func TestMCPHandler_HTTP(t *testing.T) {}defer func() { _ = resp2.Body.Close() }()- if resp2.StatusCode != http.StatusOK && resp2.StatusCode != http.StatusMethodNotAllowed && resp2.StatusCode != http.StatusBadRequest {- t.Errorf("Expected status OK, MethodNotAllowed, or BadRequest on /mcp, got %d", resp2.StatusCode)+ if resp2.StatusCode != http.StatusOK && resp2.StatusCode != http.StatusBadRequest {+ t.Errorf("Expected status OK or BadRequest on /mcp/events, got %d", resp2.StatusCode)}}diff --git a/sam-mcp-python/test_client.py b/sam-mcp-python/test_client.pynew file mode 100644index 00000000..09444579--- /dev/null+++ b/sam-mcp-python/test_client.py@@ -0,0 +1,27 @@+import asyncio+import os+import sys+from sam_mcp.client import SamClient++async def main():+ url = os.environ.get("SAM_MCP_URL", "http://sam-node-1:8080/mcp/events")+ print(f"Connecting to {url}")+ try:+ async with SamClient(server_url=url) as client:+ # Test get_tools+ tools = await client.get_tools()+ print(f"TOOLS_COUNT:{len(tools)}")++ # Test call_tool (get_mesh_info is a standard tool in sam-node)+ result = await client.call_tool("get_mesh_info", {})+ print(f"CALL_RESULT:{result}")++ sys.exit(0)+ except Exception as e:+ import traceback+ print(f"ERROR:{e}")+ traceback.print_exc()+ sys.exit(1)++if __name__ == "__main__":+ asyncio.run(main())diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bashindex 373f65f6..9e39ae97 100644--- a/tests/e2e/lib/container_mesh.bash+++ b/tests/e2e/lib/container_mesh.bash@@ -105,31 +105,8 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; thenlocal idx="$1"local timeout_s="${2:-20}"local i- local data='{"jsonrpc":"2.0","method":"initialize","params":{"protocolVersion":"2024-11-05","capabilities":{},"clientInfo":{"name":"test","version":"1.0"}},"id":1}'-for ((i=0; i<timeout_s; i++)); do- if docker run --rm --network "${MESH_NETWORK}" -e NODE_HOST="sam-node-${idx}" -e DATA="${data}" python:3.12 python3 -c "-import socket-import os-import sys--try:- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)- s.connect((os.environ['NODE_HOST'], 8080))-- data = os.environ['DATA'].encode('utf-8')- request = f\"POST /mcp HTTP/1.1\\r\\nHost: localhost\\r\\nContent-Type: application/json\\r\\nAccept: application/json, text/event-stream\\r\\nContent-Length: {len(data)}\\r\\n\\r\\n\".encode('utf-8') + data-- s.sendall(request)- response = s.recv(4096).decode('utf-8')- s.close()-- if 'protocolVersion' in response:- sys.exit(0)-except Exception as e:- pass-sys.exit(1)-" >/dev/null 2>&1; then+ if docker run --rm --network "${MESH_NETWORK}" python:3.12 curl -s --max-time 5 -D - http://sam-node-${idx}:8080/mcp/events | grep -q "200 OK"; thenreturn 0fisleep 1@@ -140,7 +117,7 @@ sys.exit(1)mesh_get_node_count_via_mcp() {local idx="$1"local output- output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/" 2>/dev/null)"+ output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/mcp/events" 2>/dev/null)"echo "${output}" | jq '.known_peers | length'}@@ -151,7 +128,7 @@ sys.exit(1)local ifor ((i=0; i<timeout_s; i++)); dolocal output- output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/" 2>/dev/null)"+ output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/mcp/events" 2>/dev/null)"echo "Node ${idx} get_mesh_info raw output: ${output}"local countcount="$(echo "${output}" | jq '.known_peers | length')"@@ -171,7 +148,7 @@ sys.exit(1)local ifor ((i=0; i<timeout_s; i++)); dolocal output- output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/" 2>/dev/null)"+ output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/mcp/events" 2>/dev/null)"echo "[$(date +%T)] Node ${idx} get_mesh_info raw output: ${output}"local connectedconnected="$(echo "${output}" | jq -r --arg peer "$target_peer" '.connected_peers | index($peer) != null')"@@ -191,7 +168,7 @@ sys.exit(1)local ifor ((i=0; i<timeout_s; i++)); dolocal output- output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/" 2>/dev/null)"+ output="$(timeout 15s docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${idx}:8080/mcp/events" 2>/dev/null)"echo "[$(date +%T)] Node ${idx} get_mesh_info raw output: ${output}"local connectedconnected="$(echo "${output}" | jq -r --arg peer "$target_peer" '.connected_peers | index($peer) != null')"diff --git a/tests/e2e/policy.bats b/tests/e2e/policy.batsindex 057a038f..79b2ceb8 100644--- a/tests/e2e/policy.bats+++ b/tests/e2e/policy.bats@@ -131,7 +131,7 @@ mesh_call_remote_tool() {local args="{\"peer_id\":\"${target_peer_id}\",\"tool_name\":\"${tool_name}\",\"arguments\":\"{}\"}"- docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${caller_idx}:8080/" -tool "call_remote_tool" -args "${args}"+ docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${caller_idx}:8080/mcp/events" -tool "call_remote_tool" -args "${args}"}setup() {@@ -238,13 +238,16 @@ EOF"for ((i=0; i<30; i++)); dolocal output- output="$(docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/" 2>/dev/null)"+ output="$(docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/mcp/events" 2>/dev/null)"TARGET_PEER_ID=$(echo "${output}" | grep -oE '12D3Koo[a-zA-Z0-9]+' | grep -v "${hub_id}" | grep -v "${node2_id}" | head -n 1)if [[ -n "${TARGET_PEER_ID}" ]]; thenbreakfisleep 1done++ echo "Node 2 logs after discovery loop:" >&3+ docker logs "${MESH_PREFIX}-node-2" >&3if [[ -z "${TARGET_PEER_ID}" ]]; thenecho "Timeout waiting for discovery of Node 1"@@ -253,7 +256,7 @@ EOF"# Explicitly connect Node 2 to Node 1 to avoid "no addresses" errorlocal node1_addr="/dns4/sam-node-1/tcp/5002/p2p/${TARGET_PEER_ID}"- docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node1_addr}\"}" >/dev/null+ docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/mcp/events" -tool "connect_peer" -args "{\"peer_addr\":\"${node1_addr}\"}" >/dev/null}teardown() {diff --git a/tests/e2e/python_sdk_test.bats b/tests/e2e/python_sdk_test.batsindex 42c288ee..1f3d4bf6 100644--- a/tests/e2e/python_sdk_test.bats+++ b/tests/e2e/python_sdk_test.bats@@ -15,6 +15,10 @@ setup() {}teardown() {+ if [[ "${BATS_TEST_COMPLETED:-0}" -ne 1 ]]; then+ echo "Node 1 logs on failure (filtered):"+ docker logs "${MESH_PREFIX}-node-1" 2>&1 | grep -i -E 'mcp|request|error|fatal|panic' || true+ fimesh_cleanup_env}@@ -38,34 +42,12 @@ teardown() {-v "$(pwd)/sam-mcp-python:/sam-mcp-python" \-e PYTHONPATH=/sam-mcp-python/src \python:3.12 \- bash -c 'pip install mcp && python3 -c "-import asyncio-from sam_mcp.client import SamClient-import os-import sys--async def main():- os.environ[\"SAM_MCP_URL\"] = \"http://sam-node-1:8080/mcp\"- try:- async with SamClient() as client:- # Test get_tools- tools = await client.get_tools()- print(f\"TOOLS_COUNT:{len(tools)}\")-- # Test call_tool (get_mesh_info is a standard tool in sam-node)- result = await client.call_tool(\"get_mesh_info\", {})- print(f\"CALL_RESULT:{result}\")-- sys.exit(0)- except BaseException as e:- import traceback- print(f\"ERROR:{e}\")- traceback.print_exc()- sys.exit(1)--asyncio.run(main())-"'+ bash -c 'pip install mcp httpx && python3 /sam-mcp-python/test_client.py'echo "Python SDK output: $output"+ if [[ "$status" -ne 0 ]]; then+ echo "Node 1 logs:"+ docker logs "${node1_name}"+ fi[[ "$status" -eq 0 ]][[ "$output" == *"TOOLS_COUNT:"* ]][[ "$output" == *"CALL_RESULT:"* ]]diff --git a/tests/e2e/revocation_test.bats b/tests/e2e/revocation_test.batsindex dc32ebb8..8134fe6a 100644--- a/tests/e2e/revocation_test.bats+++ b/tests/e2e/revocation_test.bats@@ -75,7 +75,7 @@ teardown() {# Explicitly connect Node 1 to Node 2echo "[$(date +%T)] Explicitly connecting Node 1 to Node 2"local node2_addr="/dns4/sam-node-2/tcp/5002/p2p/${node2_peer_id}"- run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"+ run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/mcp/events" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"[[ "$status" -eq 0 ]]# Verify Node 1 connects to Node 2@@ -117,7 +117,7 @@ teardown() {# Verify Node 1 cannot reconnect to Node 2echo "[$(date +%T)] Attempting to reconnect (should fail)"local node2_addr="/dns4/sam-node-2/tcp/5002/p2p/${node2_peer_id}"- run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"+ run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/mcp/events" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"echo "Reconnect output: $output"[[ "$output" == *"gater disallows connection"* ]]}diff --git a/tests/integration/catalog_test.go b/tests/integration/catalog_test.goindex 94dd82ff..9dfb97ed 100644--- a/tests/integration/catalog_test.go+++ b/tests/integration/catalog_test.go@@ -75,7 +75,7 @@ func callMCP(t *testing.T, mcpAddr string, toolName string, params map[string]anVersion: "0.1.0",}, nil)- session, err := client.Connect(ctx, &mcp.StreamableClientTransport{Endpoint: "http://" + mcpAddr + "/"}, nil)+ session, err := client.Connect(ctx, &mcp.SSEClientTransport{Endpoint: "http://" + mcpAddr + "/mcp/events"}, nil)if err != nil {t.Fatalf("Failed to connect: %v", err)}@@ -172,7 +172,7 @@ func TestCatalogRoutingAndFailover(t *testing.T) {for time.Now().Before(deadline) {client := mcp.NewClient(&mcp.Implementation{Name: "test-client", Version: "0.1.0"}, nil)- session, err := client.Connect(context.Background(), &mcp.StreamableClientTransport{Endpoint: "http://" + mcpAddrA + "/"}, nil)+ session, err := client.Connect(context.Background(), &mcp.SSEClientTransport{Endpoint: "http://" + mcpAddrA + "/mcp/events"}, nil)if err != nil {t.Logf("Poll: failed to connect: %v", err)time.Sleep(500 * time.Millisecond)diff --git a/tests/integration/pubsub_test.go b/tests/integration/pubsub_test.goindex 921673c0..9c0f222f 100644--- a/tests/integration/pubsub_test.go+++ b/tests/integration/pubsub_test.go@@ -105,7 +105,7 @@ func TestPubSubTools(t *testing.T) {Version: "0.1.0",}, nil)- session, err := client.Connect(context.Background(), &mcp.StreamableClientTransport{Endpoint: "http://" + mcpAddr + "/"}, nil)+ session, err := client.Connect(context.Background(), &mcp.SSEClientTransport{Endpoint: "http://" + mcpAddr + "/mcp/events"}, nil)if err != nil {t.Fatalf("Failed to connect: %v", err)}