feat(ai_client): Support external MCP tools and HITL approval

This commit is contained in:
2026-03-12 15:58:36 -04:00
parent 3b2588ad61
commit f4c5a0be83
3 changed files with 140 additions and 6 deletions

View File

@@ -535,7 +535,7 @@ def get_bias_profile() -> Optional[str]:
def _build_anthropic_tools() -> list[dict[str, Any]]:
raw_tools: list[dict[str, Any]] = []
for spec in mcp_client.MCP_TOOL_SPECS:
for spec in mcp_client.get_tool_schemas():
if _agent_tools.get(spec["name"], True):
raw_tools.append({
"name": spec["name"],
@@ -579,7 +579,7 @@ def _get_anthropic_tools() -> list[dict[str, Any]]:
def _gemini_tool_declaration() -> Optional[types.Tool]:
raw_tools: list[dict[str, Any]] = []
for spec in mcp_client.MCP_TOOL_SPECS:
for spec in mcp_client.get_tool_schemas():
if _agent_tools.get(spec["name"], True):
raw_tools.append({
"name": spec["name"],
@@ -715,10 +715,15 @@ async def _execute_single_tool_call_async(
tool_executed = True
if not tool_executed:
if name and name in mcp_client.TOOL_NAMES:
is_native = name in mcp_client.TOOL_NAMES
ext_tools = mcp_client.get_external_mcp_manager().get_all_tools()
is_external = name in ext_tools
if name and (is_native or is_external):
_append_comms("OUT", "tool_call", {"name": name, "id": call_id, "args": args})
if name in mcp_client.MUTATING_TOOLS and approval_mode != "auto" and pre_tool_callback:
desc = f"# MCP MUTATING TOOL: {name}\n" + "\n".join(f"# {k}: {repr(v)}" for k, v in args.items())
should_approve = (name in mcp_client.MUTATING_TOOLS or is_external) and approval_mode != "auto" and pre_tool_callback
if should_approve:
label = "MCP MUTATING" if is_native else "EXTERNAL MCP"
desc = f"# {label} TOOL: {name}\n" + "\n".join(f"# {k}: {repr(v)}" for k, v in args.items())
_res = await asyncio.to_thread(pre_tool_callback, desc, base_dir, qa_callback)
out = "USER REJECTED: tool execution cancelled" if _res is None else await mcp_client.async_dispatch(name, args)
else:
@@ -816,7 +821,7 @@ def _build_file_diff_text(changed_items: list[dict[str, Any]]) -> str:
def _build_deepseek_tools() -> list[dict[str, Any]]:
raw_tools: list[dict[str, Any]] = []
for spec in mcp_client.MCP_TOOL_SPECS:
for spec in mcp_client.get_tool_schemas():
if _agent_tools.get(spec["name"], True):
raw_tools.append({
"name": spec["name"],