refactor(c901): fix 9 src tool files below C901 threshold, remove from grandfather list (#1938)

Claude-Session: https://claude.ai/code/session_01DxGQhYBQg7681uCdr9w9qB

Co-authored-by: kingpanther13 <kingpanther13@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Author: kingpanther13

pyproject.toml

@@ -177,21 +177,12 @@ ignore = [
 "src/ha_mcp/backup_manager.py" = ["C901"]
 "src/ha_mcp/tools/auto_backup.py" = ["C901"]
 "src/ha_mcp/tools/backup.py" = ["C901"]
-"src/ha_mcp/tools/radio/matter.py" = ["C901"]
-"src/ha_mcp/tools/radio/zigbee.py" = ["C901"]
-"src/ha_mcp/tools/radio/zwave.py" = ["C901"]
-"src/ha_mcp/tools/reference_validator.py" = ["C901"]
-"src/ha_mcp/tools/tools_areas.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_automations.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_scenes.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_scripts.py" = ["C901"]
 "src/ha_mcp/tools/tools_dev.py" = ["C901"]
-"src/ha_mcp/tools/tools_history.py" = ["C901"]
 "src/ha_mcp/tools/tools_integrations.py" = ["C901"]
 "src/ha_mcp/tools/tools_system.py" = ["C901"]
-"src/ha_mcp/tools/tools_zones.py" = ["C901"]
-"src/ha_mcp/transforms/categorized_search.py" = ["C901"]
-"src/ha_mcp/visibility/resolver.py" = ["C901"]
 "tests/src/e2e/conftest.py" = ["C901"]
 "tests/src/e2e/error_handling/test_network_errors.py" = ["C901"]
 "tests/src/e2e/policy/test_readonly_mode.py" = ["C901"]

src/ha_mcp/tools/radio/matter.py

@@ -145,6 +145,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         # Returns setup_pin_code, setup_manual_code, setup_qr_code.
         return ok("matter", "share_out", commissioning=commissioning)
 
+    return await _handle_matter_more(client, action, args, device_id)
+
+
+async def _handle_matter_more(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for the remaining Matter actions."""
     if action == "interview":
         result = await ws_call(
             client,

src/ha_mcp/tools/radio/zigbee.py

@@ -272,6 +272,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
             long_running=True,
         )
 
+    return await _handle_zigbee_groups(client, action, args, device_id)
+
+
+async def _handle_zigbee_groups(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Zigbee group and binding actions."""
     # --- groups ------------------------------------------------------------ #
     if action == "group_add":
         group = await ws_call(
@@ -340,6 +347,14 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         )
         return ok("zigbee", "unbind", result=result)
 
+    return await _handle_zigbee_clusters(client, action, args, device_id)
+
+
+async def _handle_zigbee_clusters(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Zigbee cluster-write and network actions."""
+    cluster_type = args.get("cluster_type", "in")
     # --- cluster writes (service-only) ------------------------------------- #
     if action == "cluster_write":
         ieee = await _resolve_ieee(client, device_id)

src/ha_mcp/tools/radio/zwave.py

@@ -174,6 +174,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
         result = await client.call_service("zwave_js", "ping", {"device_id": device_id})
         return ok("zwave", "ping", result=result)
 
+    return await _handle_zwave_inclusion(client, action, args, device_id)
+
+
+async def _handle_zwave_inclusion(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Z-Wave inclusion/exclusion actions."""
     if action == "add":
         entry_id = await _zwave_entry_id(client)
         if not entry_id:
@@ -289,6 +296,13 @@ async def handle(client: Any, action: str, args: dict[str, Any]) -> dict[str, An
             long_running=True,
         )
 
+    return await _handle_zwave_maintenance(client, action, args, device_id)
+
+
+async def _handle_zwave_maintenance(
+    client: Any, action: str, args: dict[str, Any], device_id: Any
+) -> dict[str, Any]:
+    """Continuation of :func:`handle` for Z-Wave node maintenance actions."""
     if action == "reinterview":
         result = await ws_call(
             client,

src/ha_mcp/tools/reference_validator.py

@@ -69,6 +69,55 @@ class ValidationWarning(TypedDict):
     reason: str
 
 
+def _extract_service_ref(
+    sub_path: str,
+    value: str,
+    refs: list[ExtractedRef],
+    unvalidated_templates: list[int],
+) -> None:
+    """Record a service ref at *sub_path*, counting templates instead."""
+    if _is_template(value):
+        unvalidated_templates[0] += 1
+    else:
+        refs.append({"path": sub_path, "value": value, "kind": "service"})
+
+
+def _extract_entity_refs(
+    sub_path: str,
+    value: Any,
+    refs: list[ExtractedRef],
+    unvalidated_templates: list[int],
+) -> bool:
+    """Record entity ref(s) from a str or list *value*; return True if handled.
+
+    Returns False when *value* is neither a str nor a list so the caller can
+    keep recursing into it (an ``entity_id`` mapped to a nested structure).
+    """
+    if isinstance(value, str):
+        if _is_template(value):
+            unvalidated_templates[0] += 1
+        else:
+            refs.append({"path": sub_path, "value": value, "kind": "entity"})
+        return True
+    if isinstance(value, list):
+        for i, item in enumerate(value):
+            if not isinstance(item, str):
+                continue
+            item_path = f"{sub_path}[{i}]"
+            if _is_template(item):
+                unvalidated_templates[0] += 1
+            else:
+                refs.append(
+                    {
+                        "path": item_path,
+                        "value": item,
+                        "kind": "entity",
+                    }
+                )
+        return True
+    return False
+
+
 def extract_refs(config: Any) -> WalkerResult:
     """Pull every literal service/entity reference out of *config*.
 
@@ -97,43 +146,17 @@ def _walk(node: Any, path: str) -> None:
                 sub_path = f"{path}.{key}" if path else key
 
                 if key in _SERVICE_KEYS and isinstance(value, str):
-                    if _is_template(value):
-                        unvalidated_templates[0] += 1
-                    else:
-                        refs.append(
-                            {"path": sub_path, "value": value, "kind": "service"}
-                        )
+                    _extract_service_ref(sub_path, value, refs, unvalidated_templates)
+                    continue
+
+                if key in _ENTITY_KEYS and _extract_entity_refs(
+                    sub_path, value, refs, unvalidated_templates
+                ):
                     continue
 
-                if key in _ENTITY_KEYS:
-                    if isinstance(value, str):
-                        if _is_template(value):
-                            unvalidated_templates[0] += 1
-                        else:
-                            refs.append(
-                                {"path": sub_path, "value": value, "kind": "entity"}
-                            )
-                        continue
-                    if isinstance(value, list):
-                        for i, item in enumerate(value):
-                            if not isinstance(item, str):
-                                continue
-                            item_path = f"{sub_path}[{i}]"
-                            if _is_template(item):
-                                unvalidated_templates[0] += 1
-                            else:
-                                refs.append(
-                                    {
-                                        "path": item_path,
-                                        "value": item,
-                                        "kind": "entity",
-                                    }
-                                )
-                        continue
-
-                # Neither a service nor an entity key: recurse so deeply
-                # nested action blocks (choose/if/parallel/repeat) still
-                # get walked.
+                # Neither a service nor an entity key (or an entity key whose
+                # value is neither str nor list): recurse so deeply nested
+                # action blocks (choose/if/parallel/repeat) still get walked.
                 _walk(value, sub_path)
 
         elif isinstance(node, list):