fix(validation): avoid false positives for valid item-use phrases

state_manager.py

@@ -1465,9 +1465,22 @@ class GameState:
         details = intent.get("details", "") or ""
         raw_input = intent.get("raw_input", "") or ""
 
-        inventory = list(self.player.inventory)
-        equipped_items = [v for v in self.player.equipment.values() if v]
-        all_owned = set(inventory) | set(equipped_items)
+        inventory = list(self.player.inventory)
+        equipped_items = [v for v in self.player.equipment.values() if v]
+        all_owned = set(inventory) | set(equipped_items)
+
+        def normalize_item_phrase(text: str) -> str:
+            cleaned = str(text or "").strip()
+            cleaned = re.sub(
+                r"^(?:喝掉|吃掉|使用|服用|装备|穿上|戴上|拿出|掏出|拔出|举起|喝|吃|用|掉)",
+                "",
+                cleaned,
+            )
+            cleaned = re.sub(r"^(?:一瓶|一杯|一口|一个|一份|一块|一把)", "", cleaned)
+            cleaned = re.sub(r"(?:照明|攻击|挥舞|挥动|一下|试试)$", "", cleaned)
+            return cleaned.strip()
+
+        normalized_target = normalize_item_phrase(target)
 
         # --- 检测 1: USE_ITEM / EQUIP: target 必须在背包或装备中 ---
         if action in ("USE_ITEM", "EQUIP") and target:
@@ -1530,15 +1543,21 @@ class GameState:
         for pattern, verb_desc in extraction_patterns:
             match = re.search(pattern, full_text)
             if match:
-                mentioned = match.group(1).strip()
-                if not mentioned or mentioned in non_item_words:
-                    continue
-                if mentioned not in all_owned:
-                    # 模糊匹配："剑" 可能是 "铁剑" 的简称
-                    fuzzy_match = any(
-                        mentioned in owned or owned in mentioned
-                        for owned in all_owned
-                    )
+                mentioned = normalize_item_phrase(match.group(1).strip())
+                if not mentioned or mentioned in non_item_words:
+                    continue
+                if mentioned not in all_owned:
+                    if normalized_target and (
+                        mentioned in normalized_target
+                        or normalized_target in mentioned
+                    ):
+                        continue
+                    # 模糊匹配："剑" 可能是 "铁剑" 的简称
+                    fuzzy_match = any(
+                        mentioned in normalize_item_phrase(owned)
+                        or normalize_item_phrase(owned) in mentioned
+                        for owned in all_owned
+                    )
                     if not fuzzy_match:
                         return False, f"你并没有「{mentioned}」，请检查你的背包。"