feat：进一步修改，支持黑白名单（黑名单优先级更高）

pytests/test_tool_availability.py

@@ -1,4 +1,6 @@
 from types import SimpleNamespace
+import importlib.util
+import sys
 
 import pytest
 
@@ -94,3 +96,127 @@ def test_plugin_tool_session_disable_still_filters_specific_chat(monkeypatch: py
 
     assert "mute" not in disabled_specs
     assert "mute" in enabled_specs
+
+
+def test_plugin_tool_allowed_session_filters_tool_exposure(monkeypatch: pytest.MonkeyPatch) -> None:
+    service = ComponentQueryService()
+    registry = ComponentRegistry()
+    supervisor = SimpleNamespace(component_registry=registry)
+    monkeypatch.setattr(service, "_iter_supervisors", lambda: [supervisor])
+
+    registry.register_plugin_components(
+        "mute_plugin",
+        [
+            {
+                "name": "mute",
+                "component_type": "TOOL",
+                "chat_scope": "group",
+                "allowed_session": ["qq:10001", "raw-group-id", "exact-session-id"],
+                "metadata": {"description": "mute group member"},
+            }
+        ],
+    )
+
+    platform_group_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(
+            session_id="hashed-session-1",
+            is_group_chat=True,
+            group_id="10001",
+            platform="qq",
+        )
+    )
+    raw_group_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(
+            session_id="hashed-session-2",
+            is_group_chat=True,
+            group_id="raw-group-id",
+            platform="qq",
+        )
+    )
+    exact_session_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(session_id="exact-session-id", is_group_chat=True)
+    )
+    blocked_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(
+            session_id="blocked-session",
+            is_group_chat=True,
+            group_id="20002",
+            platform="qq",
+        )
+    )
+
+    entry = registry.get_component("mute_plugin.mute")
+    assert entry is not None
+    assert entry.allowed_session == {"qq:10001", "raw-group-id", "exact-session-id"}
+    assert "allowed_session" not in entry.metadata
+    assert "mute" in platform_group_specs
+    assert "mute" in raw_group_specs
+    assert "mute" in exact_session_specs
+    assert "mute" not in blocked_specs
+
+
+def test_plugin_tool_disabled_session_take_precedence_over_allowed_session(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    service = ComponentQueryService()
+    registry = ComponentRegistry()
+    supervisor = SimpleNamespace(component_registry=registry)
+    monkeypatch.setattr(service, "_iter_supervisors", lambda: [supervisor])
+
+    registry.register_plugin_components(
+        "mute_plugin",
+        [
+            {
+                "name": "mute",
+                "component_type": "TOOL",
+                "chat_scope": "group",
+                "allowed_session": ["qq:10001"],
+                "metadata": {"description": "mute group member"},
+            }
+        ],
+    )
+    registry.set_component_enabled("mute_plugin.mute", False, session_id="allowed-session")
+
+    visible_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(
+            session_id="visible-session",
+            is_group_chat=True,
+            group_id="10001",
+            platform="qq",
+        )
+    )
+    disabled_specs = service.get_llm_available_tool_specs(
+        context=ToolAvailabilityContext(
+            session_id="allowed-session",
+            is_group_chat=True,
+            group_id="10001",
+            platform="qq",
+        )
+    )
+
+    entry = registry.get_component("mute_plugin.mute")
+    assert entry is not None
+    assert entry.disabled_session == {"allowed-session"}
+    assert "mute" in visible_specs
+    assert "mute" not in disabled_specs
+
+
+def test_mute_plugin_exports_allowed_groups_as_component_allowed_session() -> None:
+    module_path = "plugins/MutePlugin/plugin.py"
+    spec = importlib.util.spec_from_file_location("mute_plugin_under_test", module_path)
+    assert spec is not None
+    assert spec.loader is not None
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[spec.name] = module
+    spec.loader.exec_module(module)
+    module.MutePluginConfig.model_rebuild()
+
+    plugin = module.MutePlugin()
+    plugin.set_plugin_config({"permissions": {"allowed_groups": ["qq:10001", "raw-group-id"]}})
+
+    mute_components = [component for component in plugin.get_components() if component.get("name") == "mute"]
+
+    assert len(mute_components) == 1
+    assert mute_components[0]["chat_scope"] == "group"
+    assert mute_components[0]["allowed_session"] == ["qq:10001", "raw-group-id"]
+    assert "allowed_session" not in mute_components[0]["metadata"]