M5：百工与司命——能力注册表、授契行契请命、禁域裁决与观察标证
- 百工域 domains/baigong：capabilities（统一能力契约：执行类型 builtin/qiankun/mcp/http + 四维风险标注 + 来源版本）、mandates（授契 grant / 行契 charter 预算时间窗，撤销立即生效）、tool_calls（净化摘要 + 观察标证）；请命复用 pending_confirmations 加 expires_at/brief_json（超时=拒绝执行 HJ-1302，六要素说明） - 司命裁决器 siming.py：四维取最高档（能力/数据/后果/情境）；禁域为代码常量不可配置（递归删根/格式化/写裸设备/fork 炸弹、file:// 协议、密钥材料外发）——专项测试断言恶意标注与篡改对象仍拒 HJ-1301 - 执行链：禁域→裁决（HJ-1303 未授契拒且双留痕）→请命→执行（乾坤经 SandboxClient HMAC；MCP 经 call_tool；内置无副作用）→净化标证（观察非事实，敏感遮蔽+体量截断）→行动账 - MCP 登记/启停/刷新自动派生与撤下 capabilities（博闻登记接入点）；内置能力种子（echo/datetime/qiankun.shell/web.fetch） - 端点：/capabilities /mandates /petitions /tool-calls + /tools 兼容投影；前端百工页四区（能力目录四维标注/授契行契/请命批准拒绝/行动账观察标证） - 退役：modules/safety|skills|tool_runtime|agent、application/tool_runtime、services/skills|safety、tool_policies/skills/model_endpoint_overrides 表（迁移 006）、前端 SkillManager/ToolsConsole/旧 tools 页 - 验收（test_baigong_siming 四用例）：未授契被拒留痕、请命超时不执行、禁域不可关闭、结果为观察不入忆；后端 454、前端 220、BFF 4、神识 5 包全绿（2 个预存环境失败不变）
This commit is contained in:
chenxin committed
1 parent
144415247e
commit
684261f4b4
97 files changed
+3075
-5554
No files matched your search
+87
-105
@@ -13,8 +13,9 @@ from __future__ import annotations
|
||||
|
||||
import json
|
||||
|
||||
from app.application.tool_runtime.mcp import make_mcp_tool_specs
|
||||
from app.application.tool_runtime.runtime import ToolRuntime
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.domains.baigong.models import Capability
|
||||
from app.core.errors import AppError
|
||||
from app.core.ids import new_mcp_server_id
|
||||
from app.db.session import AsyncSessionLocal
|
||||
@@ -38,7 +39,6 @@ async def register_mcp_server(
|
||||
env_json: str | None = None,
|
||||
cwd: str | None = None,
|
||||
status: str = "enabled",
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerResponse:
|
||||
async with AsyncSessionLocal() as session:
|
||||
@@ -65,9 +65,7 @@ async def register_mcp_server(
|
||||
transport_instance = get_transport(server)
|
||||
tools = await transport_instance.list_tools()
|
||||
server.tools_json = dumps(tools)
|
||||
if runtime and runtime.http_client is not None:
|
||||
for spec in make_mcp_tool_specs(server, tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
await _sync_capabilities(session, server, tools)
|
||||
if process_manager is not None:
|
||||
process_manager.register_transport(server.id, transport_instance)
|
||||
|
||||
@@ -79,11 +77,7 @@ async def register_mcp_server(
|
||||
await transport_instance.start()
|
||||
tools = await transport_instance.list_tools()
|
||||
server.tools_json = dumps(tools)
|
||||
if runtime is not None and runtime.http_client is not None:
|
||||
for spec in make_mcp_tool_specs(
|
||||
server, tools, runtime.http_client, transport=transport_instance
|
||||
):
|
||||
runtime.register(spec)
|
||||
await _sync_capabilities(session, server, tools)
|
||||
|
||||
await mcp_repo.add_server(session, server)
|
||||
await record_audit_event(
|
||||
@@ -109,7 +103,6 @@ async def list_mcp_servers(*, status: str | None = None) -> list[McpServerRespon
|
||||
async def delete_mcp_server(
|
||||
server_id: str,
|
||||
*,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> None:
|
||||
async with AsyncSessionLocal() as session:
|
||||
@@ -124,13 +117,7 @@ async def delete_mcp_server(
|
||||
await transport.stop()
|
||||
process_manager.unregister(server_id)
|
||||
|
||||
# unregister ToolSpec
|
||||
if runtime is not None and server.tools_json:
|
||||
tools = json.loads(server.tools_json) if server.tools_json else []
|
||||
for tool in tools:
|
||||
tool_name = tool.get("name") if isinstance(tool, dict) else None
|
||||
if tool_name:
|
||||
runtime.unregister(f"mcp_{server.name}_{tool_name}")
|
||||
await _drop_capabilities(session, server.name)
|
||||
|
||||
name = server.name
|
||||
await session.delete(server)
|
||||
@@ -148,7 +135,6 @@ async def delete_mcp_server(
|
||||
async def start_mcp_server(
|
||||
server_id: str,
|
||||
*,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerStatusResponse:
|
||||
"""启动 stdio MCP server 子进程，拉取工具清单并注册。"""
|
||||
@@ -174,15 +160,11 @@ async def start_mcp_server(
|
||||
server.tools_json = dumps(tools)
|
||||
await session.commit()
|
||||
|
||||
# 注册 ToolSpec
|
||||
if runtime is not None and runtime.http_client is not None:
|
||||
from app.application.tool_runtime.mcp import make_mcp_tool_specs
|
||||
|
||||
async with AsyncSessionLocal() as session:
|
||||
server = await mcp_repo.get_server(session, server_id)
|
||||
if server:
|
||||
for spec in make_mcp_tool_specs(server, tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
# MCP 工具派生为百工能力（博闻登记接入点）
|
||||
async with AsyncSessionLocal() as session:
|
||||
server = await mcp_repo.get_server(session, server_id)
|
||||
if server is not None:
|
||||
await _sync_capabilities(session, server, tools)
|
||||
|
||||
status = await process_manager.status(server_id)
|
||||
return McpServerStatusResponse(**status)
|
||||
@@ -191,7 +173,6 @@ async def start_mcp_server(
|
||||
async def stop_mcp_server(
|
||||
server_id: str,
|
||||
*,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerStatusResponse:
|
||||
"""停止 stdio MCP server 子进程并注销 ToolSpec。"""
|
||||
@@ -207,16 +188,10 @@ async def stop_mcp_server(
|
||||
|
||||
await transport.stop()
|
||||
|
||||
# unregister ToolSpec
|
||||
if runtime is not None:
|
||||
async with AsyncSessionLocal() as session:
|
||||
server = await mcp_repo.get_server(session, server_id)
|
||||
if server and server.tools_json:
|
||||
tools = json.loads(server.tools_json)
|
||||
for tool in tools:
|
||||
name = tool.get("name") if isinstance(tool, dict) else None
|
||||
if name:
|
||||
runtime.unregister(f"mcp_{server.name}_{name}")
|
||||
async with AsyncSessionLocal() as session:
|
||||
server = await mcp_repo.get_server(session, server_id)
|
||||
if server is not None:
|
||||
await _sync_capabilities(session, server, [])
|
||||
|
||||
status = await process_manager.status(server_id)
|
||||
return McpServerStatusResponse(**status)
|
||||
@@ -225,18 +200,16 @@ async def stop_mcp_server(
|
||||
async def restart_mcp_server(
|
||||
server_id: str,
|
||||
*,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerStatusResponse:
|
||||
"""重启 stdio MCP server。"""
|
||||
await stop_mcp_server(server_id, runtime=runtime, process_manager=process_manager)
|
||||
return await start_mcp_server(server_id, runtime=runtime, process_manager=process_manager)
|
||||
await stop_mcp_server(server_id, process_manager=process_manager)
|
||||
return await start_mcp_server(server_id, process_manager=process_manager)
|
||||
|
||||
|
||||
async def refresh_mcp_server_tools(
|
||||
server_id: str,
|
||||
*,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerResponse:
|
||||
"""重新拉取 MCP server 工具清单，更新缓存并注册到运行时。"""
|
||||
@@ -245,13 +218,6 @@ async def refresh_mcp_server_tools(
|
||||
if server is None:
|
||||
raise AppError("not_found", "MCP server 不存在。")
|
||||
|
||||
# 注销旧工具
|
||||
old_tools = json.loads(server.tools_json) if server.tools_json else []
|
||||
if runtime is not None:
|
||||
for tool in old_tools:
|
||||
tool_name = tool.get("name") if isinstance(tool, dict) else None
|
||||
if tool_name:
|
||||
runtime.unregister(f"mcp_{server.name}_{tool_name}")
|
||||
|
||||
# 重新拉取工具清单（优先用 process_manager 中的传输实例，确保 stdio 进程已启动）
|
||||
transport_instance = None
|
||||
@@ -262,10 +228,7 @@ async def refresh_mcp_server_tools(
|
||||
tools = await transport_instance.list_tools()
|
||||
server.tools_json = dumps(tools)
|
||||
|
||||
# 注册新工具
|
||||
if runtime is not None and runtime.http_client is not None:
|
||||
for spec in make_mcp_tool_specs(server, tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
await _sync_capabilities(session, server, tools)
|
||||
|
||||
await record_audit_event(
|
||||
session,
|
||||
@@ -302,7 +265,6 @@ async def update_mcp_server(
|
||||
args_json: str | None = None,
|
||||
env_json: str | None = None,
|
||||
cwd: str | None = None,
|
||||
runtime: ToolRuntime | None = None,
|
||||
process_manager: ProcessManager | None = None,
|
||||
) -> McpServerResponse:
|
||||
"""更新 MCP server 字段（部分更新，不传的字段保持不变）。
|
||||
@@ -320,31 +282,22 @@ async def update_mcp_server(
|
||||
if status is not None:
|
||||
old_status = server.status
|
||||
server.status = status
|
||||
# 启用→禁用：注销运行时中的工具
|
||||
if (
|
||||
status == "disabled"
|
||||
and old_status == "enabled"
|
||||
and runtime is not None
|
||||
and old_tools_json
|
||||
):
|
||||
for tool_name in _tool_names_from_json(old_tools_json):
|
||||
runtime.unregister(f"mcp_{server.name}_{tool_name}")
|
||||
# 禁用→启用（HTTP）：重新拉取工具并注册
|
||||
# 启用→禁用：撤下派生能力
|
||||
if status == "disabled" and old_status == "enabled" and old_tools_json:
|
||||
await _drop_capabilities(session, server.name)
|
||||
# 禁用→启用（HTTP）：重新拉取工具清单并派生
|
||||
if (
|
||||
status == "enabled"
|
||||
and old_status == "disabled"
|
||||
and server.transport == "streamable-http"
|
||||
and server.endpoint_url
|
||||
):
|
||||
from app.application.tool_runtime.mcp import make_mcp_tool_specs
|
||||
from app.integrations.mcp.transports import get_transport
|
||||
|
||||
transport_instance = get_transport(server)
|
||||
new_tools = await transport_instance.list_tools()
|
||||
server.tools_json = dumps(new_tools)
|
||||
if runtime is not None and runtime.http_client is not None:
|
||||
for spec in make_mcp_tool_specs(server, new_tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
await _sync_capabilities(session, server, new_tools)
|
||||
|
||||
endpoint_changed = endpoint_url is not None and endpoint_url != server.endpoint_url
|
||||
if endpoint_url is not None:
|
||||
@@ -360,20 +313,11 @@ async def update_mcp_server(
|
||||
if cwd is not None:
|
||||
server.cwd = cwd
|
||||
|
||||
# streamable-http 且 endpoint 变化时：重新拉取工具清单并注册
|
||||
# streamable-http 且 endpoint 变化时：重新拉取工具清单并派生能力
|
||||
if endpoint_changed and server.transport == "streamable-http" and server.endpoint_url:
|
||||
from app.application.tool_runtime.mcp import make_mcp_tool_specs
|
||||
from app.integrations.mcp.transports import get_transport
|
||||
|
||||
# 注销旧工具
|
||||
if runtime is not None and old_tools_json:
|
||||
old_tools = json.loads(old_tools_json) if old_tools_json else []
|
||||
for tool in old_tools:
|
||||
tool_name = tool.get("name") if isinstance(tool, dict) else None
|
||||
if tool_name:
|
||||
runtime.unregister(f"mcp_{server.name}_{tool_name}")
|
||||
|
||||
# 拉取新工具（优先用 process_manager 中的传输实例）
|
||||
await _drop_capabilities(session, server.name)
|
||||
transport_instance = None
|
||||
if process_manager is not None:
|
||||
transport_instance = process_manager.get(server_id)
|
||||
@@ -381,11 +325,7 @@ async def update_mcp_server(
|
||||
transport_instance = get_transport(server)
|
||||
new_tools = await transport_instance.list_tools()
|
||||
server.tools_json = dumps(new_tools)
|
||||
|
||||
# 注册新工具
|
||||
if runtime is not None and runtime.http_client is not None:
|
||||
for spec in make_mcp_tool_specs(server, new_tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
await _sync_capabilities(session, server, new_tools)
|
||||
|
||||
await record_audit_event(
|
||||
session,
|
||||
@@ -419,29 +359,18 @@ async def get_mcp_server_status(
|
||||
return McpServerStatusResponse(**status)
|
||||
|
||||
|
||||
async def load_registered_mcp_servers(
|
||||
runtime: ToolRuntime, process_manager: ProcessManager | None = None
|
||||
) -> None:
|
||||
"""启动加载：按 transport 类型注册 MCP server。"""
|
||||
if runtime.http_client is None:
|
||||
return
|
||||
async def load_registered_mcp_servers(process_manager: ProcessManager | None = None) -> None:
|
||||
"""启动加载：登记传输层实例（stdio 不自动启动）；派生能力已在登记/刷新时落库。"""
|
||||
async with AsyncSessionLocal() as session:
|
||||
servers = await mcp_repo.list_servers(session, status="enabled")
|
||||
for server in servers:
|
||||
try:
|
||||
if server.transport == "streamable-http":
|
||||
tools = json.loads(server.tools_json) if server.tools_json else []
|
||||
for spec in make_mcp_tool_specs(server, tools, runtime.http_client):
|
||||
runtime.register(spec)
|
||||
# 创建传输层实例但 no-op start
|
||||
if process_manager is not None:
|
||||
transport_instance = get_transport(server, runtime.http_client)
|
||||
process_manager.register_transport(server.id, transport_instance)
|
||||
elif server.transport == "stdio":
|
||||
# stdio 不自动启动，只注册传输层实例到管理器
|
||||
if process_manager is not None:
|
||||
transport_instance = get_transport(server)
|
||||
process_manager.register_transport(server.id, transport_instance)
|
||||
if server.transport == "streamable-http" and process_manager is not None:
|
||||
transport_instance = get_transport(server)
|
||||
process_manager.register_transport(server.id, transport_instance)
|
||||
elif server.transport == "stdio" and process_manager is not None:
|
||||
transport_instance = get_transport(server)
|
||||
process_manager.register_transport(server.id, transport_instance)
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
|
||||
@@ -470,3 +399,56 @@ def _to_response(server: McpServer) -> McpServerResponse:
|
||||
created_at=server.created_at,
|
||||
updated_at=server.updated_at,
|
||||
)
|
||||
|
||||
|
||||
async def _sync_capabilities(session, server, tools: list) -> None:
|
||||
"""MCP 工具清单同步为百工能力（executor_type=mcp，博闻等外部能力统一入目录）。"""
|
||||
import json as _json
|
||||
|
||||
names = set()
|
||||
for tool in tools or []:
|
||||
name = tool.get("name") if isinstance(tool, dict) else None
|
||||
if not name:
|
||||
continue
|
||||
names.add(name)
|
||||
cap_name = f"mcp_{server.name}_{name}"
|
||||
existing = await session.execute(
|
||||
select(Capability).where(
|
||||
Capability.owner_scope == "local-user", Capability.name == cap_name
|
||||
)
|
||||
)
|
||||
cap = existing.scalars().first()
|
||||
if cap is None:
|
||||
session.add(
|
||||
Capability(
|
||||
name=cap_name,
|
||||
owner_scope="local-user",
|
||||
description=(tool.get("description") or "")[:500],
|
||||
executor_type="mcp",
|
||||
executor_ref=server.name,
|
||||
risk_dims_json=_json.dumps(
|
||||
{"capability": "L1", "data": "L2", "consequence": "L1", "context": "L1"}
|
||||
),
|
||||
data_scope="MCP 工具参数与返回",
|
||||
destinations=f"mcp:{server.name}",
|
||||
source="user_custom",
|
||||
)
|
||||
)
|
||||
await _drop_capabilities(session, server.name, keep=names)
|
||||
|
||||
|
||||
async def _drop_capabilities(session, server_name: str, *, keep: set | None = None) -> None:
|
||||
"""撤下该 MCP server 不再提供的派生能力。"""
|
||||
prefix = f"mcp_{server_name}_"
|
||||
result = await session.execute(
|
||||
select(Capability).where(
|
||||
Capability.owner_scope == "local-user",
|
||||
Capability.executor_type == "mcp",
|
||||
Capability.name.startswith(prefix), # type: ignore[union-attr]
|
||||
)
|
||||
)
|
||||
for cap in result.scalars().all():
|
||||
tool_name = cap.name[len(prefix) :]
|
||||
if keep is not None and tool_name in keep:
|
||||
continue
|
||||
await session.delete(cap)
|
||||
Reference in new issue
Block a user