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

将工具注入重构为分层编排，并显式化同名冲突决策规则。

Browse source 
按来源收集后统一做冲突解析，优先低风险并在同风险下按来源优先级决策，避免隐式覆盖导致的工具暴露不确定性。

Made-with: Cursor
This commit is contained in:
oliver 2026-04-27 15:49:36 +08:00
parent e9227bf7a0
commit 785d4619a4
2 changed files with 117 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/test_catalog_expert_role_loading.py
View file

@ -16,6 +16,17 @@ def _mk_spec(name: str) -> ToolSpec:
)
def _mk_spec_with_risk(name: str, *, risk: str, tags: set[str] | None = None) -> ToolSpec:
return ToolSpec(
name=name,
description="d",
parameters={"type": "object", "properties": {}},
handler=lambda _args: {"ok": True},
tags=frozenset(tags or {"internal"}),
risk_level=risk,
)
def test_catalog_loads_role_scoped_expert_tools() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
@ -40,3 +51,34 @@ def test_catalog_deduplicates_same_tool_name() -> None:
assert names.count("system_time") == 1
assert "custom_tool_a" in set(names)
def test_catalog_prefers_lower_risk_on_name_conflict() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec_with_risk("dup_tool", risk="high")],
):
with patch(
"oclaw.runtime.tools.catalog.materialize_public_tools",
return_value=[_mk_spec_with_risk("dup_tool", risk="low")],
):
specs = materialize_tool_specs(expert="generalist")
matched = [x for x in specs if x.name == "dup_tool"]
assert len(matched) == 1
assert str(matched[0].risk_level) == "low"
def test_catalog_prefers_expert_when_risk_equal() -> None:
with patch(
"oclaw.runtime.tools.catalog.materialize_tools_for_expert",
return_value=[_mk_spec_with_risk("dup_tool", risk="low", tags={"expert"})],
):
with patch(
"oclaw.runtime.tools.catalog.materialize_public_tools",
return_value=[_mk_spec_with_risk("dup_tool", risk="low", tags={"public"})],
):
specs = materialize_tool_specs(expert="generalist")
matched = [x for x in specs if x.name == "dup_tool"]
assert len(matched) == 1
# expert source should win tie-break.
assert "expert" in set(matched[0].tags or frozenset())