remove rmcp-actix-web dep, expand mcp test suite

.github/workflows/test.yml

@@ -21,6 +21,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
       # .cargo/config.toml pins the mold linker for x86_64-linux, so it must
       # be available on the runner or every link step fails with "cannot find 'ld'".
       - name: Install mold linker
@@ -44,6 +49,8 @@ jobs:
       # need webkit/gtk — those are only required by src-tauri, which we skip
       # here via explicit `-p` flags. This keeps the Linux test job lightweight.
       - name: Run unit + integration tests
+        env:
+          ATOMIC_RUN_MCP_INSPECTOR: "1"
         run: |
           cargo test \
             -p atomic-core \

crates/atomic-server/Cargo.toml

@@ -29,8 +29,10 @@ actix-ws = "0.3"
 actix-files = "0.6"
 
 # Async
-tokio = { version = "1", features = ["rt-multi-thread", "sync", "time", "macros", "signal"] }
+tokio = { version = "1", features = ["rt-multi-thread", "sync", "time", "macros", "signal", "process"] }
 futures = "0.3"
+async-stream = "0.3"
+tokio-stream = "0.1"
 
 # Serialization
 serde = { version = "1", features = ["derive"] }
@@ -52,7 +54,6 @@ reqwest = { version = "0.12", features = ["json"] }
 
 # MCP server
 rmcp = { version = "0.15", features = ["server", "macros", "transport-streamable-http-server"] }
-rmcp-actix-web = "0.11"
 schemars = "1.0"
 
 # OpenAPI

crates/atomic-server/src/main.rs

@@ -17,8 +17,6 @@ use atomic_server::{
 };
 use clap::Parser;
 use config::{Cli, Command, TokenAction};
-use rmcp::transport::streamable_http_server::session::local::LocalSessionManager;
-use rmcp_actix_web::transport::StreamableHttpService;
 use std::sync::Arc;
 use std::time::Duration;
 use utoipa::OpenApi;
@@ -271,31 +269,13 @@ async fn run_server(
         setup_claim_limiter: SetupClaimLimiter::new(),
     });
 
-    // Create MCP service with multi-database support via ?db= query param
-    let mcp_manager = Arc::clone(&manager);
-    let mcp_tx = event_tx.clone();
-    let mcp_service = StreamableHttpService::builder()
-        .service_factory(Arc::new(move || {
-            Ok(mcp::AtomicMcpServer::new(
-                Arc::clone(&mcp_manager),
-                mcp_tx.clone(),
-            ))
-        }))
-        .on_request_fn(|http_req, ext| {
-            let db_id = http_req.query_string().split('&').find_map(|pair| {
-                let mut parts = pair.splitn(2, '=');
-                if parts.next()? == "db" {
-                    parts.next().map(String::from)
-                } else {
-                    None
-                }
-            });
-            ext.insert(mcp::DbSelection(db_id));
-        })
-        .session_manager(Arc::new(LocalSessionManager::default()))
-        .stateful_mode(true)
-        .sse_keep_alive(Duration::from_secs(30))
-        .build();
+    // Create MCP transport outside HttpServer::new() so all Actix workers share
+    // one session manager.
+    let mcp_transport = mcp::AtomicMcpTransport::new(
+        Arc::clone(&manager),
+        event_tx.clone(),
+        Duration::from_secs(30),
+    );
 
     tracing::info!("Atomic Server starting...");
     tracing::info!(data_dir = data_dir, "data directory");
@@ -590,7 +570,7 @@ async fn run_server(
                     .wrap(mcp_auth::McpAuth {
                         state: app_state.clone(),
                     })
-                    .service(mcp_service.clone().scope()),
+                    .service(mcp_transport.clone().scope()),
             )
             // Authenticated API routes
             .service(

crates/atomic-server/src/mcp/mod.rs

@@ -1,5 +1,7 @@
 mod server;
+mod transport;
 mod types;
 
 pub use server::AtomicMcpServer;
 pub use server::DbSelection;
+pub use transport::AtomicMcpTransport;