hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-08 23:33:16 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Treat missing MCP binding keys as empty and stress batch-only multi-NE CLI in ops skills.

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-12 22:28:24 +08:00
parent 4827278a9c
commit 4660cc7507
6 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
runtime/tools/mcp/adapter.py
View file

@ -240,21 +240,21 @@ def materialize_mcp_tools_for_specialist(
if sp in {"manager", "manager_self", "main"}:
sp = "generalist"
# Preferred mapping: specialist -> server_ids
# - missing/null key while a binding map exists → treat as [] (no MCP)
# - empty binding setting or {} → fall back to coarse allowlist (all enabled MCP)
binding_server_ids: set[str] | None = None
try:
if store is not None and sp:
raw_binding = str(store.get_setting("mcp_specialist_server_binding") or "").strip()
if raw_binding:
obj = json.loads(raw_binding)
if isinstance(obj, dict):
if isinstance(obj, dict) and obj:
rows = obj.get(sp)
# Legacy: if this specialist has no key, try manager bindings for generalist.
if rows is None and sp == "generalist" and "manager" in obj:
rows = obj.get("manager")
# 缺键或 null：视为未配置该专家的绑定 → 走下方「仅 coarse allowlist」逻辑（可见全部已启用 MCP）。
# 仅当键存在且为 JSON 数组时，才按白名单过滤（含空数组 = 刻意不给该专家任何 MCP）。
if rows is None:
binding_server_ids = None
binding_server_ids = set()
elif isinstance(rows, list):
binding_server_ids = {str(x).strip() for x in rows if str(x).strip()}
else: