drop ManagerServer type alias and serve_manager_stdio — no manager agent

This commit is contained in:
damocles 2026-06-04 00:15:30 +02:00 committed by mara
commit 7cf7f043ad
2 changed files with 3 additions and 12 deletions

View file

@ -104,7 +104,7 @@ async fn main() -> Result<()> {
serve_main::<ManagerSurface>(&cli.socket, poll_ms).await serve_main::<ManagerSurface>(&cli.socket, poll_ms).await
} }
(Role::Agent, Cmd::Mcp) => mcp::serve_agent_stdio(cli.socket).await, (Role::Agent, Cmd::Mcp) => mcp::serve_agent_stdio(cli.socket).await,
(Role::Manager, Cmd::Mcp) => mcp::serve_manager_stdio(cli.socket).await, (Role::Manager, Cmd::Mcp) => mcp::serve_agent_stdio(cli.socket).await,
(Role::Agent, Cmd::Wake { from, body }) => { (Role::Agent, Cmd::Wake { from, body }) => {
wake::<AgentSurface>(&cli.socket, from, body).await wake::<AgentSurface>(&cli.socket, from, body).await
} }

View file

@ -8,8 +8,7 @@
//! broker-routed protocol. Unaffected by this module. //! broker-routed protocol. Unaffected by this module.
//! - **MCP stdio** owned by this module — what claude actually speaks. //! - **MCP stdio** owned by this module — what claude actually speaks.
//! //!
//! One `AgentServer { socket }` struct shared by agent and manager roles. //! One `AgentServer { socket }` struct for all roles.
//! `ManagerServer` is a backward-compat type alias for `AgentServer`.
//! Tool access is gated upstream by `--allowedTools` (derived from the //! Tool access is gated upstream by `--allowedTools` (derived from the
//! agent's `ToolGroup` config); the server itself is a dumb dispatcher. //! agent's `ToolGroup` config); the server itself is a dumb dispatcher.
//! All tools go through the same `run_tool_envelope` helper. //! All tools go through the same `run_tool_envelope` helper.
@ -581,9 +580,6 @@ pub struct AgentServer {
socket: PathBuf, socket: PathBuf,
} }
/// Backward-compat alias — callers that reference `ManagerServer` by name still compile.
pub type ManagerServer = AgentServer;
impl AgentServer { impl AgentServer {
#[must_use] #[must_use]
pub fn new(socket: PathBuf) -> Self { pub fn new(socket: PathBuf) -> Self {
@ -1446,16 +1442,11 @@ pub async fn serve_stdio(socket: PathBuf) -> Result<()> {
Ok(()) Ok(())
} }
/// Convenience wrapper: run the agent MCP server over stdio. /// Run the MCP server over stdio. Used by all roles.
pub async fn serve_agent_stdio(socket: PathBuf) -> Result<()> { pub async fn serve_agent_stdio(socket: PathBuf) -> Result<()> {
serve_stdio(socket).await serve_stdio(socket).await
} }
/// Convenience wrapper: run the manager MCP server over stdio.
pub async fn serve_manager_stdio(socket: PathBuf) -> Result<()> {
serve_stdio(socket).await
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Manager tool surface // Manager tool surface
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------