EPIC R05 (Team Hoa) - one security/approval path for every tool call.
R05-T01 domain/tools/{tool_descriptor,tool_registry}.py
ToolCapability (READ/WRITE/EXECUTE/NETWORK, composable) + ToolDescriptor +
ToolRegistry, replacing three independently-maintained gating lists
(core/tools.py::WRITE_TOOLS, code_agent.py's WRITE_TOOLS|MS365_WRITE_TOOLS,
chat_agent.py's literal ("run_command","install_package") tuple) with one
capability lookup.
R05-T02 infrastructure/filesystem/{file_tools,command_tools,fetch_tools,tool_context}.py
core/tools.py's execute_tool if/elif chain split into per-concern modules.
core/tools.py is now a strangler-fig shim: re-exports ToolContext/ToolError,
dispatches through a {name: handler} dict built from the split modules.
core/tools.py: 566 -> 291 lines.
R05-T03 application/conversations/tool_policy_gateway.py
ToolPolicyGateway.allow(name, gate, payload) - capability-driven ALLOW vs
ask-the-gate decision. Wired into both chat_agent.py::run_cowork and
code_agent.py::run_code, replacing their separate hand-rolled checks.
Verified equivalent to the old hardcoded sets by test.
R05-T04 (behavior change, not just refactor)
MCP/connector tools (core/mcp_client.py, core/ext_connectors.py) reached
chat_agent.py via extra_executor(name, args) with NO permission check at
all. They are now tagged with a conservative default capability
(WRITE|EXECUTE|NETWORK - no MCP tool self-declares risk) and routed through
the SAME ToolPolicyGateway as built-ins. When "confirm before running
commands" is on, MCP/connector calls now prompt like run_command already
did - a real gap closed, and a user-visible change worth calling out.
R05-T05 infrastructure/mcp/mcp_source_manager.py
McpToolSourceManager extracts the connection cache/lock/start-or-skip
lifecycle out of state.py::AppContext (_mcp_connections/_conn_lock) into a
standalone, directly-testable class. AppContext.build_mcp_tools and
_ms365_builtin_connection now call ensure()/stop(); _ext_connections
(unified Connectors) is out of scope for this task and keeps its own lock.
New tests: tests/unit/test_tool_registry_and_policy.py,
test_code_agent_tool_policy.py, test_cowork_extra_tool_policy.py,
test_mcp_source_manager.py (26 new tests).
Suite: 254 passed, 4 pre-existing failures unrelated to R05 (2 EPIC R02
config-security, 2 environment-dependent routing tests - see checklist).
check_imports: PASS. All new files < 400 LOC.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
114 lines
4.9 KiB
Python
114 lines
4.9 KiB
Python
"""McpToolSourceManager - the MCP server connection lifecycle, extracted out
|
|
of ``state.py::AppContext`` (R05-T05).
|
|
|
|
Today ``AppContext.build_mcp_tools`` inlines all of this: a ``_mcp_connections``
|
|
dict, a ``_conn_lock`` guarding check-then-create against concurrent turns (a
|
|
Cowork tab, a Co4E flow and a Scheduled Task can all call it at once), and a
|
|
"start it, cache it, skip it on failure" loop repeated for both the
|
|
admin-configured servers AND the built-in MS365 server
|
|
(``_ms365_builtin_connection``). None of that logic touches Qt; it was only
|
|
ever inline because ``AppContext`` is where the config lived.
|
|
|
|
This class owns the SAME cache/lock/start-or-skip behavior as a standalone,
|
|
directly testable object — ``AppContext`` becomes a thin caller (one instance
|
|
per app, same as it holds one ``RoutingApplicationService``).
|
|
|
|
Pure Python: no Qt. It DOES touch the network/filesystem via
|
|
``core.mcp_client.McpServerConnection`` (a subprocess + asyncio loop), which is
|
|
exactly what makes it infrastructure rather than domain.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
from typing import Dict, List, Optional
|
|
|
|
from cowork_local.core.mcp_client import McpServerConnection
|
|
|
|
|
|
class McpToolSourceManager:
|
|
"""Caches and supervises one :class:`McpServerConnection` per server name.
|
|
|
|
``connection_factory`` defaults to ``McpServerConnection`` itself; tests
|
|
substitute a fake so no real subprocess is spawned (see
|
|
``tests/unit/test_mcp_source_manager.py``).
|
|
"""
|
|
|
|
def __init__(self, connection_factory=McpServerConnection) -> None:
|
|
self._connections: Dict[str, McpServerConnection] = {}
|
|
self._lock = threading.Lock()
|
|
self._connection_factory = connection_factory
|
|
|
|
def ensure(self, name: str, command: str, args: Optional[List[str]] = None,
|
|
env: Optional[Dict[str, str]] = None) -> Optional[McpServerConnection]:
|
|
"""Return a live connection for ``name``, starting one if there is
|
|
none cached or the cached one's subprocess has died.
|
|
|
|
Serialized under one lock so two turns racing to build their tool
|
|
list at the same moment share one subprocess per server instead of
|
|
each spawning their own (the bug this replaces:
|
|
``AppContext._conn_lock``'s original docstring). Returns ``None`` -
|
|
never raises - when the server fails to start, matching the existing
|
|
"one broken server must not block the turn" behavior.
|
|
"""
|
|
with self._lock:
|
|
existing = self._connections.get(name)
|
|
if existing is not None and existing.is_alive():
|
|
return existing
|
|
if existing is not None:
|
|
self._connections.pop(name, None)
|
|
connection = self._connection_factory(name, command, args or [], env)
|
|
try:
|
|
connection.start()
|
|
except Exception: # noqa: BLE001 - one broken server must not block the turn
|
|
return None
|
|
self._connections[name] = connection
|
|
return connection
|
|
|
|
def get(self, name: str) -> Optional[McpServerConnection]:
|
|
"""The cached connection for ``name``, without starting one."""
|
|
return self._connections.get(name)
|
|
|
|
def is_alive(self, name: str) -> bool:
|
|
connection = self._connections.get(name)
|
|
return connection is not None and connection.is_alive()
|
|
|
|
def restart(self, name: str, command: str, args: Optional[List[str]] = None,
|
|
env: Optional[Dict[str, str]] = None) -> Optional[McpServerConnection]:
|
|
"""Force a fresh connection for ``name`` even if the cached one still
|
|
looks alive - for a server the caller knows is misbehaving."""
|
|
with self._lock:
|
|
self._connections.pop(name, None)
|
|
return self.ensure(name, command, args, env)
|
|
|
|
def stop(self, name: str) -> None:
|
|
"""Stop and forget one connection - used when a server becomes
|
|
unavailable by configuration (e.g. MS365 signed out) rather than by
|
|
crashing."""
|
|
with self._lock:
|
|
connection = self._connections.pop(name, None)
|
|
if connection is not None:
|
|
try:
|
|
connection.stop()
|
|
except Exception: # noqa: BLE001 - shutdown must never raise into the caller
|
|
pass
|
|
|
|
def active(self) -> List[McpServerConnection]:
|
|
"""Every currently cached connection - what
|
|
``core/mcp_client.py::build_mcp_tools`` merges tool specs from."""
|
|
return list(self._connections.values())
|
|
|
|
def stop_all(self) -> None:
|
|
"""Terminate every connection's subprocess - called on app shutdown
|
|
so none of them linger as orphan processes."""
|
|
with self._lock:
|
|
connections = list(self._connections.values())
|
|
self._connections.clear()
|
|
for connection in connections:
|
|
try:
|
|
connection.stop()
|
|
except Exception: # noqa: BLE001
|
|
pass
|
|
|
|
|
|
__all__ = ["McpToolSourceManager"]
|