IBM
diff --git a/‎.secrets.baseline‎
Lines changed: 96 additions & 162 deletions b/‎.secrets.baseline‎
Lines changed: 96 additions & 162 deletions
diff --git a/‎Cargo.lock‎
Lines changed: 411 additions & 164 deletions b/‎Cargo.lock‎
Lines changed: 411 additions & 164 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 7 additions & 4 deletions b/‎Cargo.toml‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎Containerfile.lite‎
Lines changed: 13 additions & 0 deletions b/‎Containerfile.lite‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 12 additions & 0 deletions b/‎Makefile‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎a2a-agents/go/a2a-echo-agent/Dockerfile‎
Lines changed: 0 additions & 1 deletion b/‎a2a-agents/go/a2a-echo-agent/Dockerfile‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎a2a-agents/go/a2a-echo-agent/README.md‎
Lines changed: 14 additions & 7 deletions b/‎a2a-agents/go/a2a-echo-agent/README.md‎
Lines changed: 14 additions & 7 deletions
@@ -20,7 +20,9 @@ repository = "https://github.com/IBM/mcp-context-forge"
 
 [workspace.dependencies]
 anyhow = "1.0"
+axum = "0.8.9"
 base64 = "0.22.1"
+bytes = "1.11.1"
 clap = { version = "4.5.60", features = ["derive", "env"] }
 futures = "0.3.31"
 futures-util = "0.3.31"
@@ -29,13 +31,13 @@ pyo3 = { version = "0.28.2", features = ["abi3-py311"] }
 pyo3-log = "0.13.3"
 pyo3-stub-gen = "0.19"
 rand = "0.8"
+redis = { version = "0.32.7", features = ["aio", "tokio-comp", "connection-manager"] }
 regex = "1.12.2"
 rmcp = { version = "=1.2.0", default-features = false }
-sha2 = "0.11.0"
+sha2 = "0.10.9"
 
 # HTTP client (native-tls to avoid CDLA-Permissive-2.0 from rustls-platform-verifier)
 reqwest = { version = "0.12.28", default-features = false, features = [
-    "native-tls",
     "json",
     "stream",
     "http2",
@@ -51,10 +53,11 @@ serde_json = "1.0"
 thiserror = "2.0.16"
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
-uuid = { version = "1.19.0", features = ["v4"] }
+url = "2.5.7"
+uuid = { version = "=1.23.0", features = ["v4"] }
 
 [workspace.lints.clippy]
-multiple_crate_versions = "warn"
+multiple_crate_versions = "allow"
 
 [profile.release]
 opt-level = 3
 
@@ -51,6 +51,10 @@ RUN if [ "$ENABLE_RUST" != "true" ]; then \
         printf 'echo "Rust MCP runtime not built into this image. Rebuild with --build-arg ENABLE_RUST=true." >&2\n' >> /build/target/release/contextforge-mcp-runtime; \
         printf 'exit 1\n' >> /build/target/release/contextforge-mcp-runtime; \
         chmod +x /build/target/release/contextforge-mcp-runtime; \
+        printf '#!/usr/bin/env sh\n' > /build/target/release/contextforge-a2a-runtime; \
+        printf 'echo "Rust A2A runtime not built into this image. Rebuild with --build-arg ENABLE_RUST=true." >&2\n' >> /build/target/release/contextforge-a2a-runtime; \
+        printf 'exit 1\n' >> /build/target/release/contextforge-a2a-runtime; \
+        chmod +x /build/target/release/contextforge-a2a-runtime; \
         exit 0; \
     fi
 
@@ -128,6 +132,14 @@ RUN if [ "$ENABLE_RUST" = "true" ]; then \
         echo "⏭️  Skipping Rust MCP runtime build"; \
     fi
 
+# Build the experimental Rust A2A runtime binary (only if ENABLE_RUST=true)
+RUN if [ "$ENABLE_RUST" = "true" ]; then \
+        cargo build --release -p contextforge_a2a_runtime && \
+        echo "✅ Rust A2A runtime built successfully"; \
+    else \
+        echo "⏭️  Skipping Rust A2A runtime build"; \
+    fi
+
 FROM rust-builder-base AS rust-builder
 
 ###########################
@@ -203,6 +215,7 @@ COPY plugins/requirements.txt /app/plugins/requirements.txt
 # ----------------------------------------------------------------------------
 COPY --from=rust-builder /build/native-extension-wheels/ /tmp/local-native-extension-wheels/
 COPY --from=rust-builder /build/target/release/contextforge-mcp-runtime /app/bin/contextforge-mcp-runtime
+COPY --from=rust-builder /build/target/release/contextforge-a2a-runtime /app/bin/contextforge-a2a-runtime
 
 # ----------------------------------------------------------------------------
 # Copy frontend build artifacts from frontend-builder stage
 
@@ -8732,6 +8732,18 @@ rust-mcp-runtime-run:                   ## Run the experimental Rust MCP runtime
 	@echo "🚀 Starting Rust MCP runtime on http://127.0.0.1:8787 with backend http://127.0.0.1:4444/rpc"
 	@cd crates/mcp_runtime && cargo run --release -- --backend-rpc-url http://127.0.0.1:4444/rpc --listen-http 127.0.0.1:8787
 
+rust-a2a-runtime-build:                    ## Build the experimental Rust A2A runtime
+	@echo "🦀 Building experimental Rust A2A runtime..."
+	@cd crates/a2a_runtime && cargo build --release
+
+rust-a2a-runtime-test:                     ## Run tests for the experimental Rust A2A runtime
+	@echo "🧪 Running Rust A2A runtime tests..."
+	@cd crates/a2a_runtime && cargo test --release
+
+rust-a2a-runtime-run:                      ## Run the experimental Rust A2A runtime on http://127.0.0.1:8788
+	@echo "🚀 Starting Rust A2A runtime on http://127.0.0.1:8788"
+	@cd crates/a2a_runtime && cargo run --release -- --listen-http 127.0.0.1:8788
+
 .PHONY: conc-02-gateways
 conc-02-gateways:                    ## Run CONC-02 gateways read-during-write check (manual env/token setup required)
 	@/bin/bash tests/manual/concurrency/run_conc_02_gateways.sh
 
@@ -4,7 +4,6 @@ FROM golang:1.26.2 AS builder
 ENV PATH=/usr/local/go/bin:$PATH
 WORKDIR /src
 COPY go.mod ./
-COPY go.sum ./
 RUN go mod download
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w" -o /usr/local/bin/a2a-echo-agent .
 
@@ -6,27 +6,35 @@ This agent is intended to be run via the repo's `docker-compose.yml` `testing` p
 
 ## Protocol Support
 
-- A2A **v0.3.x** Agent Card: `GET /.well-known/agent-card.json`
+- A2A **v1.0.0** Agent Card by default: `GET /.well-known/agent-card.json`
 - A2A **JSON-RPC** methods (HTTP `POST /`):
+  - `SendMessage`
+  - `GetTask`
+  - `ListTasks`
+  - `CancelTask`
+  - `GetExtendedAgentCard`
+- Legacy compatibility aliases remain available:
   - `message/send`
   - `tasks/get`
+  - `tasks/list`
   - `tasks/cancel`
 
-The agent completes tasks immediately (echo response returned as a completed task).
+The agent completes tasks immediately and stores them in-memory for follow-up `GetTask` and `ListTasks` calls.
 
 ## Endpoints
 
 - `GET /health`
 - `GET /.well-known/agent-card.json`
 - `GET /.well-known/agent.json` (compat alias)
+- `GET /extendedAgentCard`
 - `POST /` (JSON-RPC)
 - `POST /run` (compat helper; not part of the A2A spec)
 
 ## Environment Variables
 
 - `A2A_ECHO_ADDR` (default: `0.0.0.0:9100`)
 - `A2A_ECHO_NAME` (default: `a2a-echo-agent`)
-- `A2A_ECHO_PROTOCOL_VERSION` (default: `0.3.0`)
+- `A2A_ECHO_PROTOCOL_VERSION` (default: `1.0.0`)
 - `A2A_ECHO_FIXED_RESPONSE` (optional: always return this text instead of echoing)
 - `A2A_ECHO_PUBLIC_URL` (optional: override the URL advertised in the agent card)
 
@@ -53,13 +61,12 @@ curl -s http://localhost:9100/ \
   -d '{
     "jsonrpc":"2.0",
     "id":1,
-    "method":"message/send",
+    "method":"SendMessage",
     "params":{
       "message":{
-        "kind":"message",
-        "role":"user",
+        "role":"ROLE_USER",
         "messageId":"00000000-0000-0000-0000-000000000000",
-        "parts":[{"kind":"text","text":"hello"}]
+        "parts":[{"text":"hello"}]
       }
     }
   }' | jq .