Files
skyg-linux-tracker/plan/phase-5-consolidator/ws-d-mcp.md
T

7.0 KiB

WS-D: MCP surface

Part of Phase 5: Consolidator. Contracts: contracts.md sections 3, 4 and 7.

Field Value
Status Not started
Owner
Depends on B (and C2 client call shared, not duplicated). In practice: A0 for compiling; PeerRegistry::get from A0 (unhardened forwarder) until C2 lands; develop against FakeTransport + registry_with
Blocks F
Can start when A0 is merged (the rmcp conditional-tools spike can start on day one, it needs nothing from peers)
Owned files src/mcp/mod.rs, src/mcp/prompts.rs, src/mcp/resources.rs, tool-list snapshot test (in src/mcp/mod.rs), a new src/mcp/peers.rs if the code is easier to keep apart (WS-D may add it)
Do not touch src/api/** (C, B), src/peers/** (A, B, C), src/state.rs, src/server.rs, src/telemetry/**, src/error.rs, docs/api.md, README.md, AGENTS.md (F4 edits the tool-count line), nix/**, Cargo.toml

Shared-file seams: WS-D is the only editor of src/mcp/**. It reads AppState.peers (A0) and calls PeerRegistry::get / snapshot / status; it never builds URLs or headers itself. The MCP service() function must keep working unchanged when state.peers is None.

Goal

Agents reach peers through the same endpoint.

Tasks

  • D1 optional peer string on the 8 existing tools (absent = local); resolved through the same peer client function as REST C2, no logic copy (PeerRegistry::get, contracts section 3).
  • D2 new tools list_peers and get_peer { name }; with peers.enabled = false the tool list is exactly today's 8 (snapshot test has both variants). Risk from the plan: rmcp may not support conditional tools cleanly; spike this early (fallback: always list tools, return an error when disabled, and accept a 10-tool snapshot), and record the outcome in the Log and, if it changes the tool-count behaviour, in contracts section 7.
  • D3 server instructions and descriptions: mention peers only when enabled; state that peer text is untrusted data; add peers://status resource and extend container_health_report/diagnose_unit with an optional peer.

Inputs

  • Contracts section 7 (tool signatures), 3 (registry API), 4 (error mapping to CallToolResult errors).
  • Fakes: registry_with(FakeTransport, ...) scripted with peer JSON for each tool's path; static_registry for list_peers/get_peer/peers://status; fake_state_with_peers.

Done when

Both snapshot variants pass; each tool with peer returns the peer's data via the fake; peer errors surface as CallToolResult errors with actionable text.

Handoff

  • The tool list (10 tools when enabled) and descriptions for docs (F4: README, AGENTS.md tool count note).
  • The rmcp conditional-tools finding for contracts section 7.
  • Verified against WS-T's MCP assertions (list_peers, list_systemd_units {"peer": ...}).

Log

  • 2026-10-19: Split from the single phase plan 2026-10-19.

  • 2026-10-19: D0 rmcp conditional-tools spike: supported natively, no fallback needed. Tested against pinned rmcp 3.5.1. ToolRouter exposes disable_route, enable_route and with_disabled; list_all() filters disabled names, get() returns None and call() rejects them with invalid_params("tool not found"). The #[tool_handler] macro routes list_tools through router.list_all() and call_tool through router.call(), and TrackerService already stores its router in a field built by new(). StreamableHttpService constructs TrackerService per session, so the visible set is computed per session from AppState with no restart. disable_route also records names that have no route yet, so gating can be written before the two tools exist or in either order.

    Throwaway proof (run as cargo test --lib mcp::tests::spike_conditional_tool_list, then removed; src/ unchanged):

    #[test]
    fn spike_conditional_tool_list() {
        use rmcp::handler::server::router::tool::ToolRoute;
        use rmcp::model::Tool;
        let peer_route = |name: &'static str| {
            ToolRoute::new_dyn(
                Tool::new(name, name, Arc::new(Default::default())),
                |_ctx| Box::pin(async { Ok(CallToolResult::default().into()) }),
            )
        };
        let mut router = TrackerService::tool_router();
        router.add_route(peer_route("list_peers"));
        router.add_route(peer_route("get_peer"));
        assert_eq!(router.list_all().len(), 10);
        router.disable_route("list_peers");
        router.disable_route("get_peer");
        assert_eq!(router.list_all().len(), 8);
        assert!(router.get("list_peers").is_none());
        assert!(!router.has_route("get_peer"));
        router.enable_route("list_peers");
        router.enable_route("get_peer");
        assert_eq!(router.list_all().len(), 10);
    }
    

    Result: passed; 10 visible -> 8 after disabling the two peer tools -> 10 after re-enabling.

    Recommendation for D2:

    1. Keep all ten #[tool] methods on one impl (one #[tool_router]). In TrackerService::new, after Self::tool_router(), do if state.peers.is_none() { tool_router.disable_route("list_peers"); tool_router.disable_route("get_peer"); }. This yields exactly 8 tools by default and 10 when peers are enabled. Do not adopt the plan's fallback (always list 10, error when disabled); it is unnecessary and changes the contract.
    2. Rewrite the snapshot test to build services, not the static router: peers-disabled variant via TrackerService::new(fake_state(...)) asserts 8; peers-enabled variant via fake_state_with_peers(...) asserts 10. TrackerService::tool_router() alone always returns all 10 and would no longer guard the gated list.
    3. Schema caveat: disable_route hides a tool but cannot alter its static Tool attr. Adding peer: Option<String> to the eight params structs therefore changes their input_schema even when peers are disabled, which contracts section 7 forbids. Recommended fix: a small helper in TrackerService::new that, when state.peers.is_none(), removes the "peer" property from each of the eight input_schemas (ToolRouter.map and ToolRoute.attr are public; Arc::make_mut(&mut route.attr.input_schema).remove("peer")); the field is optional so required is untouched. This is deterministic and covered by asserting the two snapshot variants' property sets. It relies on public fields of the pinned rmcp version, so keep the pin and the snapshot test. If that is judged too brittle, the alternative is a contracts section 7 change to always advertise peer (optional, ignored when peers are disabled); ask the contract owner first.
    4. Not a risk for the rest of D3: list_resources, list_prompts and get_info/instructions are hand-written in this repo, so peers://status, the peer-aware prompt argument and the conditional instructions text are plain state.peers.is_some() branches, not router features.
    5. Runtime toggling is not required (peers are declared at startup; SIGHUP rotates tokens, not enabled), but disable_route/enable_route can emit notifications/tools/list_changed via bind_peer_notifier if a later phase needs it.