Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/agentpool_server/acp_server/acp_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,19 @@ async def initialize(self, params: InitializeRequest) -> InitializeResponse:
# Gate turn_complete advertisement on client's declared support
client_caps = params.client_capabilities
turn_complete = bool(client_caps.turn_complete) if client_caps is not None else False
return InitializeResponse.create(
# Collect MCP server statuses for client visibility
mcp_servers_meta: list[dict[str, Any]] = []
if pool is not None:
for provider in pool.mcp.get_mcp_providers():
status = provider.get_status()
mcp_servers_meta.append({
"name": status.name,
"status": status.status,
"display_name": status.display_name,
"server_type": status.server_type,
"error": status.error,
})
Comment thread
Million-mo marked this conversation as resolved.
Outdated
response = InitializeResponse.create(
protocol_version=version,
name="agentpool",
title="AgentPool",
Expand All @@ -431,6 +443,9 @@ async def initialize(self, params: InitializeRequest) -> InitializeResponse:
providers=True,
turn_complete=turn_complete,
)
if mcp_servers_meta:
response.field_meta = {"mcp_servers": mcp_servers_meta}
return response

async def new_session(self, params: NewSessionRequest) -> NewSessionResponse:
"""Create a new session."""
Expand Down
30 changes: 30 additions & 0 deletions src/agentpool_server/mcp_server/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,35 @@ async def handler(**kwargs: Any) -> str:
self._prompts_registered = True
logger.info("Registered MCP prompts", count=len(prompts))

def _register_mcp_status_resource(self) -> None:
"""Register a resource exposing MCP server connection statuses.

Clients can read ``agentpool://mcp-servers/status`` to get a JSON
summary of all configured MCP servers and their connection state.
"""
import json

@self.fastmcp.resource(
uri="agentpool://mcp-servers/status",
name="MCPServersStatus",
description="Connection status of all MCP servers managed by AgentPool.",
mime_type="application/json",
)
async def get_mcp_servers_status() -> str:
"""Return JSON with each MCP server's connection status."""
mcp_manager = self.pool.mcp
statuses: list[dict[str, Any]] = []
for provider in mcp_manager.get_mcp_providers():
status = provider.get_status()
statuses.append({
"name": status.name,
"status": status.status,
"display_name": status.display_name,
"server_type": status.server_type,
"error": status.error,
})
return json.dumps({"servers": statuses})

def _register_resource_handlers(self) -> None:
"""Register resource subscription handlers."""

Expand Down Expand Up @@ -226,6 +255,7 @@ async def _start_async(self) -> None:
# Register pool tools and prompts before starting
await self._register_pool_tools()
await self._register_pool_prompts()
self._register_mcp_status_resource()

# Start FastMCP server
if self.config.transport == "stdio":
Expand Down
1 change: 1 addition & 0 deletions src/agentpool_server/opencode_server/converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def to_mcp_status(status: MCPServerStatus) -> MCPStatus:
display_name=status.display_name or status.name,
status=to_opencode_mcp_status(status.status),
error=status.error,
server_type=status.server_type,
)


Expand Down
3 changes: 3 additions & 0 deletions src/agentpool_server/opencode_server/models/mcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ class MCPStatus(OpenCodeBaseModel):
tools: list[str] = Field(default_factory=list)
error: str | None = None

server_type: str = "unknown"
"""Transport type (stdio, sse, http, acp)."""


class McpAuthorizationResponse(OpenCodeBaseModel):
"""Response from starting MCP OAuth flow."""
Expand Down
16 changes: 16 additions & 0 deletions src/agentpool_server/opencode_server/routes/config_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from agentpool_server.opencode_server.dependencies import StateDep
from agentpool_server.opencode_server.models import (
Config,
MCPStatus,
Mode,
Model,
ModelCost,
Expand Down Expand Up @@ -516,3 +517,18 @@ async def list_modes(state: StateDep) -> list[Mode]:
)
for mode in category.available_modes
]


@router.get("/config/mcp-servers")
async def get_mcp_servers(state: StateDep) -> dict[str, MCPStatus]:
"""Get MCP server connection statuses.

Returns a dict mapping server names to their connection status,
display name, transport type, and any error messages. This endpoint
complements ``GET /mcp`` by following the ``/config/*`` route
convention for configuration-adjacent queries.
"""
from agentpool_server.opencode_server.converters import to_mcp_status

server_info = await state.agent.get_mcp_server_info()
return {name: to_mcp_status(status) for name, status in server_info.items()}
Comment thread
Million-mo marked this conversation as resolved.
Loading