fix: tighten intent matching and reject invalid query actions

Author: Desmond-Dong

custom_components/ai_hub/conversation.py

@@ -29,6 +29,21 @@
 MATCH_ALL: Literal["*"] = "*"
 
 
+def _extract_expansion_rule_tokens(rule_value: str) -> set[str]:
+    """Extract plain tokens from a simple expansion rule string."""
+    cleaned = (
+        rule_value.replace("(", "|")
+        .replace(")", "|")
+        .replace("[", "|")
+        .replace("]", "|")
+        .replace("<", "|")
+        .replace(">", "|")
+        .replace("{", "|")
+        .replace("}", "|")
+    )
+    return {token.strip() for token in cleaned.split("|") if token.strip()}
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -227,6 +242,11 @@ async def _async_handle_local_and_builtin_intents(
                         and has_explicit_outcome
                     )
                 )
+                if self._is_query_like_utterance(user_input.text):
+                    is_acceptable_type = (
+                        response_type == intent.IntentResponseType.QUERY_ANSWER
+                        and not is_follow_up_prompt
+                    )
 
                 if (
                     not has_error
@@ -300,6 +320,33 @@ async def _async_handle_local_and_builtin_intents(
 
         return None
 
+    def _is_query_like_utterance(self, text: str) -> bool:
+        """Return whether the utterance matches configured query markers."""
+        config = self._config_cache.get_config() or {}
+        expansion_rules = config.get("expansion_rules", {})
+        if not isinstance(expansion_rules, dict):
+            return False
+
+        query_rule_names = (
+            "how_many_is",
+            "what_is",
+            "which",
+            "how_is",
+            "state",
+            "currently",
+        )
+        text_lower = text.lower().strip()
+
+        for rule_name in query_rule_names:
+            rule_value = expansion_rules.get(rule_name)
+            if not isinstance(rule_value, str) or not rule_value.strip():
+                continue
+            tokens = _extract_expansion_rule_tokens(rule_value)
+            if any(token in text_lower for token in tokens):
+                return True
+
+        return False
+
     async def _async_handle_llm_message(
         self,
         user_input: conversation.ConversationInput,

custom_components/ai_hub/intents/handlers.py

@@ -99,26 +99,28 @@ def should_handle(self, text: str) -> bool:
         text_clean = text.strip()
         text_lower = text.lower().strip()
 
+        area_names, device_types = self._parse_device_and_area(text_lower, global_config)
+        target_entities = self._match_named_entities(text_lower, device_types or None, area_names)
+
         # 规则1: 检查明确的全局关键词 - HA不支持的功能
         global_keywords = global_config.get('global_keywords', [])
         has_global_keyword = any(keyword in text_lower for keyword in global_keywords)
 
         # 规则2: 检查显式动作/参数指令
         has_action_word = self._has_explicit_action_word(text_lower, global_config)
         has_parameter_command = self._has_parameter_command(text, text_lower, global_config)
-        has_target_hint = self._has_target_hint(text_lower, global_config)
+        has_resolved_target = bool(device_types or target_entities)
         is_short_text = len(text_clean) <= 4
 
-        # 关键判断:
-        # 1. 全局控制直接本地处理
-        # 2. 显式参数控制 + 明确目标，本地处理以补足中文能力
-        # 3. 显式开关控制 + 明确目标，本地处理以补足中文泛化开关
-        should_handle = has_global_keyword or (
-            has_target_hint and (has_action_word or has_parameter_command)
-        )
+        # 本地增强意图必须完整命中可执行控制目标，不能靠模糊猜测。
+        should_handle = has_resolved_target and (has_action_word or has_parameter_command)
 
-        # 对于有动作词的短文本，如果缺少全局关键词，则不处理
-        if has_action_word and is_short_text and not has_global_keyword and not has_target_hint:
+        # 全局控制也必须解析出具体设备类型，避免“打开所有”之类半句被错误接管。
+        if has_global_keyword and not device_types and not target_entities:
+            should_handle = False
+
+        # 对于短文本，如果没有完整命中目标，则不处理。
+        if (has_action_word or has_parameter_command) and is_short_text and not has_resolved_target:
             should_handle = False
 
         _LOGGER.debug("Local intent check: '%s' -> %s", text, should_handle)
@@ -203,14 +205,6 @@ def _has_explicit_action(
 
         return any(action in text_without_state for action in action_words)
 
-    def _has_target_hint(self, text_lower: str, global_config: dict) -> bool:
-        """Check whether the text contains a concrete area/device hint."""
-        area_names, device_types = self._parse_device_and_area(text_lower, global_config)
-        if area_names or device_types:
-            return True
-
-        return bool(self._match_named_entities(text_lower))
-
     def _parse_device_and_area(self, text_lower: str, global_config: dict) -> tuple:
         """解析设备类型和区域."""
         area_names = []
@@ -399,7 +393,17 @@ async def _execute_control(
                 fail_msg=fail_msg,
             )
 
-            return self._create_response(language, message)
+            success_results = [
+                {
+                    "type": "entity",
+                    "name": self._get_device_friendly_name(device_id),
+                    "id": device_id,
+                }
+                for device_id in all_devices
+                if self.hass.states.get(device_id) is not None
+            ]
+
+            return self._create_response(language, message, success_results=success_results)
 
         except Exception as e:
             message = self._format_response_message('error', error=str(e))
@@ -506,9 +510,20 @@ def _format_failure_message(self, error_count: int, failed_devices: list) -> str
         template = failure_config.get('many_devices', '')
         return template.format(error_count=len(unique_failed), failed_list=failed_list)
 
-    def _create_response(self, language: str, message: str, is_error: bool = False):
+    def _create_response(
+        self,
+        language: str,
+        message: str,
+        is_error: bool = False,
+        success_results: list[dict[str, Any]] | None = None,
+    ):
         """创建响应结果."""
-        return create_intent_result(language, message, is_error=is_error)
+        return create_intent_result(
+            language,
+            message,
+            is_error=is_error,
+            success_results=success_results,
+        )
 
     # ========== 参数控制方法 ==========
 

custom_components/ai_hub/intents/response_utils.py

@@ -28,14 +28,29 @@ def format_response_message(template: str, **kwargs: Any) -> str:
     return template.format(**values)
 
 
-def create_intent_result(language: str, message: str, *, is_error: bool = False) -> dict[str, Any]:
+def create_intent_result(
+    language: str,
+    message: str,
+    *,
+    is_error: bool = False,
+    success_results: list[dict[str, Any]] | None = None,
+    failed_results: list[dict[str, Any]] | None = None,
+) -> dict[str, Any]:
     """Create the standard local intent service result payload."""
     response = intent.IntentResponse(language=language)
     if is_error:
         response.async_set_error(intent.IntentResponseErrorCode.UNKNOWN, message)
     else:
         response.async_set_speech(message)
 
+    if success_results or failed_results:
+        response.response_type = intent.IntentResponseType.ACTION_DONE
+        response.data = {
+            "success": success_results or [],
+            "failed": failed_results or [],
+            "targets": success_results or [],
+        }
+
     return {
         "response": response,
         "success": not is_error,

custom_components/ai_hub/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/ha-china/ai_hub/issues",
   "requirements": ["edge-tts==7.2.7", "aiofiles", "aiohttp"],
-  "version": "v2026.04.5"
+  "version": "v2026.04.6"
 }

tests/test_api_client.py

@@ -237,6 +237,8 @@ def test_local_intent_handler_matches_area_scoped_all_lights_commands():
 
     assert handler.should_handle("打开客厅所有的灯") is True
     assert handler.should_handle("关闭客厅所有的灯") is True
+    assert handler.should_handle("打开") is False
+    assert handler.should_handle("关闭") is False
 
 
 def test_error_message_extraction():

tests/test_conversation.py

@@ -29,6 +29,7 @@
 from custom_components.ai_hub.providers.openai_compatible import OpenAICompatibleProvider
 from custom_components.ai_hub.providers.ollama_compatible import OllamaCompatibleProvider
 from custom_components.ai_hub.http import resolve_provider_name
+from custom_components.ai_hub.intents.response_utils import create_intent_result
 
 
 @pytest.fixture
@@ -330,6 +331,25 @@ def test_keeps_backward_compatibility_with_legacy_nested_structure(self):
         assert cache.get_error_message("llm_config_error") == "配置错误"
 
 
+class TestLocalIntentResponse:
+    """Tests for local intent structured responses."""
+
+    def test_create_intent_result_can_include_success_results(self):
+        """Local intent responses should preserve structured success targets."""
+        result = create_intent_result(
+            "zh-CN",
+            "已打开书房灯",
+            success_results=[
+                {"type": "entity", "name": "书房灯", "id": "light.study"}
+            ],
+        )
+
+        response = result["response"]
+        assert response.data["success"] == [
+            {"type": "entity", "name": "书房灯", "id": "light.study"}
+        ]
+
+
 class TestEntityStreamingSelection:
     """Tests for provider streaming selection."""