ha-mcp-dev 7.5.0.dev544__tar.gz → 7.5.0.dev546__tar.gz

{ha_mcp_dev-7.5.0.dev544/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.5.0.dev546}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev544
+Version: 7.5.0.dev546
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -18,7 +18,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.14,>=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastmcp==3.2.4
+Requires-Dist: fastmcp==3.3.1
 Requires-Dist: httpx[socks]==0.28.1
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: python-dotenv==1.2.2

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.5.0.dev544"
+version = "7.5.0.dev546"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "fastmcp==3.2.4",
+    "fastmcp==3.3.1",
     "httpx[socks]==0.28.1",
     "pydantic==2.13.4",
     "python-dotenv==1.2.2",

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/tools_config_automations.py

@@ -12,6 +12,10 @@ from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
 
+from ..client.rest_client import (
+    HomeAssistantAuthError,
+    HomeAssistantConnectionError,
+)
 from ..errors import (
     ErrorCode,
     create_config_error,
@@ -717,7 +721,7 @@ class AutomationConfigTools:
 
             # If the client could not verify the entity was registered, warn but don't hard-fail.
             if result.get("entity_not_verified"):
-                result["warning"] = (
+                result.setdefault("warnings", []).append(
                     "Automation was submitted to Home Assistant but the entity was not found "
                     "after polling. The automation may still have been created -- check Home "
                     "Assistant logs and try reloading automations. Common causes: "
@@ -733,12 +737,18 @@ class AutomationConfigTools:
             if not entity_id and identifier and identifier.startswith("automation."):
                 entity_id = identifier
             if wait_bool and entity_id:
+                action_word = "created" if identifier is None else "updated"
                 try:
                     registered = await wait_for_entity_registered(self._client, entity_id)
                     if not registered:
-                        result["warning"] = f"Automation created but {entity_id} not yet queryable. It may take a moment to become available."
-                except Exception as e:
-                    result["warning"] = f"Automation created but verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Automation {action_word} but {entity_id} not yet queryable. "
+                            "It may take a moment to become available."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Automation {action_word} but verification failed: {e}"
+                    )
 
             # Apply category to entity registry if provided
             if effective_category and entity_id:
@@ -1022,9 +1032,13 @@ class AutomationConfigTools:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id_for_wait)
                     if not removed:
-                        result["warning"] = f"Deletion confirmed by API but {entity_id_for_wait} may still appear briefly."
-                except Exception as e:
-                    result["warning"] = f"Deletion confirmed but removal verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Deletion confirmed by API but {entity_id_for_wait} may still appear briefly."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Deletion confirmed but removal verification failed: {e}"
+                    )
 
             return {"success": True, "action": "delete", **result}
         except ToolError:

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/tools_config_helpers.py

@@ -1473,8 +1473,8 @@ async def _apply_registry_updates_to_entity(
     elif cat_result is not None:
         if "category" in cat_result:
             applied["category"] = cat_result["category"]
-        elif "category_warning" in cat_result:
-            warnings.append(f"{entity_id}: {cat_result['category_warning']}")
+        elif cat_result.get("warnings"):
+            warnings.extend(f"{entity_id}: {w}" for w in cat_result["warnings"])
 
     return applied
 
@@ -2864,7 +2864,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
                     # Apply category via shared helper (consistent with automations/scripts).
                     # Issue #1293: route the success/failure through ``cat_result`` so any
-                    # ``category_warning`` lands in the top-level ``warnings`` list instead
+                    # category-apply failure lands in the top-level ``warnings`` list instead
                     # of leaking nested into ``helper_data``. Mirrors the precedent in
                     # ``_handle_flow_helper`` (the ``cat_result`` block near the end of
                     # ``_apply_registry_updates_to_entity``).
@@ -2880,8 +2880,8 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         )
                         if "category" in cat_result:
                             helper_data["category"] = cat_result["category"]
-                        elif "category_warning" in cat_result:
-                            warnings.append(cat_result["category_warning"])
+                        elif cat_result.get("warnings"):
+                            warnings.extend(cat_result["warnings"])
 
                     return _helper_response(
                         "create",
@@ -3495,7 +3495,7 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                             )
 
                     # Apply category via shared helper. Issue #1293: route through
-                    # ``cat_result`` so any ``category_warning`` lands in the top-level
+                    # ``cat_result`` so any category-apply failure lands in the top-level
                     # ``warnings`` list instead of nested in ``updated_data``.
                     if category:
                         cat_result = {}
@@ -3509,8 +3509,8 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         )
                         if "category" in cat_result:
                             updated_data["category"] = cat_result["category"]
-                        elif "category_warning" in cat_result:
-                            warnings.append(cat_result["category_warning"])
+                        elif cat_result.get("warnings"):
+                            warnings.extend(cat_result["warnings"])
 
                 else:
                     # Fallback for unknown/future helper types: entity registry update only
@@ -3558,8 +3558,8 @@ def register_config_helper_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         )
                         if "category" in cat_result:
                             updated_data["category"] = cat_result["category"]
-                        elif "category_warning" in cat_result:
-                            warnings.append(cat_result["category_warning"])
+                        elif cat_result.get("warnings"):
+                            warnings.extend(cat_result["warnings"])
 
                 # Wait for entity to reflect the update
                 wait_bool = coerce_bool_param(wait, "wait", default=True)

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/tools_config_scenes.py

@@ -17,6 +17,7 @@ from pydantic import Field
 
 from ..client.rest_client import (
     HomeAssistantAPIError,
+    HomeAssistantAuthError,
     HomeAssistantConnectionError,
 )
 from ..errors import ErrorCode, create_error_response
@@ -728,16 +729,12 @@ class ConfigSceneTools:
                             self._client, entity_id
                         )
                         if not registered:
-                            result["warning"] = (
+                            result.setdefault("warnings", []).append(
                                 f"Scene updated but {entity_id} not yet queryable. "
                                 "It may take a moment to become available."
                             )
-                    except (
-                        TimeoutError,
-                        HomeAssistantAPIError,
-                        HomeAssistantConnectionError,
-                    ) as e:
-                        result["warning"] = (
+                    except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                        result.setdefault("warnings", []).append(
                             f"Scene updated but verification failed: {e}"
                         )
                 if category and entity_id:
@@ -849,16 +846,14 @@ class ConfigSceneTools:
                         self._client, entity_id
                     )
                     if not registered:
-                        result["warning"] = (
-                            f"Scene created but {entity_id} not yet queryable. "
+                        result.setdefault("warnings", []).append(
+                            f"Scene saved but {entity_id} not yet queryable. "
                             "It may take a moment to become available."
                         )
-                except (
-                    TimeoutError,
-                    HomeAssistantAPIError,
-                    HomeAssistantConnectionError,
-                ) as e:
-                    result["warning"] = f"Scene created but verification failed: {e}"
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Scene saved but verification failed: {e}"
+                    )
 
             # Apply category to entity registry if provided.
             if effective_category and entity_id:
@@ -977,15 +972,11 @@ class ConfigSceneTools:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:
-                        result["warning"] = (
+                        result.setdefault("warnings", []).append(
                             f"Deletion confirmed by API but {entity_id} may still appear briefly."
                         )
-                except (
-                    TimeoutError,
-                    HomeAssistantAPIError,
-                    HomeAssistantConnectionError,
-                ) as e:
-                    result["warning"] = (
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
                         f"Deletion confirmed but removal verification failed: {e}"
                     )
 

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/tools_config_scripts.py

@@ -12,6 +12,10 @@ from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
 
+from ..client.rest_client import (
+    HomeAssistantAuthError,
+    HomeAssistantConnectionError,
+)
 from ..errors import ErrorCode, create_error_response
 from ..utils.config_hash import compute_config_hash
 from ..utils.python_sandbox import (
@@ -584,9 +588,14 @@ class ConfigScriptTools:
                 try:
                     registered = await wait_for_entity_registered(self._client, entity_id)
                     if not registered:
-                        result["warning"] = f"Script created but {entity_id} not yet queryable. It may take a moment to become available."
-                except Exception as e:
-                    result["warning"] = f"Script created but verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Script saved but {entity_id} not yet queryable. "
+                            "It may take a moment to become available."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Script saved but verification failed: {e}"
+                    )
 
             # Apply category to entity registry if provided
             if effective_category and entity_id:
@@ -684,9 +693,13 @@ class ConfigScriptTools:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:
-                        result["warning"] = f"Deletion confirmed by API but {entity_id} may still appear briefly."
-                except Exception as e:
-                    result["warning"] = f"Deletion confirmed but removal verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Deletion confirmed by API but {entity_id} may still appear briefly."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Deletion confirmed but removal verification failed: {e}"
+                    )
 
             return {"success": True, "action": "delete", **result}
         except ToolError:

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/tools_groups.py

@@ -12,6 +12,10 @@ from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
 
+from ..client.rest_client import (
+    HomeAssistantAuthError,
+    HomeAssistantConnectionError,
+)
 from ..errors import ErrorCode, create_error_response
 from .helpers import (
     exception_to_structured_error,
@@ -305,12 +309,18 @@ class GroupTools:
             wait_bool = coerce_bool_param(wait, "wait", default=True)
             result: dict[str, Any] = {}
             if wait_bool:
+                action_word = "created" if is_create else "updated"
                 try:
                     registered = await wait_for_entity_registered(self._client, entity_id)
                     if not registered:
-                        result["warning"] = f"Group created but {entity_id} not yet queryable. It may take a moment to become available."
-                except Exception as e:
-                    result["warning"] = f"Group created but verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Group {action_word} but {entity_id} not yet queryable. "
+                            "It may take a moment to become available."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Group {action_word} but verification failed: {e}"
+                    )
 
             return {
                 "success": True,
@@ -409,9 +419,13 @@ class GroupTools:
                 try:
                     removed = await wait_for_entity_removed(self._client, entity_id)
                     if not removed:
-                        result["warning"] = f"Deletion confirmed by API but {entity_id} may still appear briefly."
-                except Exception as e:
-                    result["warning"] = f"Deletion confirmed but removal verification failed: {e}"
+                        result.setdefault("warnings", []).append(
+                            f"Deletion confirmed by API but {entity_id} may still appear briefly."
+                        )
+                except (HomeAssistantConnectionError, HomeAssistantAuthError) as e:
+                    result.setdefault("warnings", []).append(
+                        f"Deletion confirmed but removal verification failed: {e}"
+                    )
 
             return {
                 "success": True,

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp/tools/util_helpers.py

@@ -666,8 +666,10 @@ async def apply_entity_category(
 ) -> None:
     """Apply a category to an entity via the entity registry.
 
-    Updates result_dict in-place with 'category' on success or
-    'category_warning' on failure.
+    Updates result_dict in-place: sets ``'category'`` on success, or appends
+    to the top-level ``'warnings'`` list on failure. The list shape mirrors
+    the canonical response contract documented in ``AGENTS.md`` →
+    *Writing MCP Tools → Return Values*.
 
     Args:
         client: HomeAssistantClient instance
@@ -695,12 +697,12 @@ async def apply_entity_category(
                 else str(error_detail)
             )
             logger.warning(f"Failed to set category for {entity_id}: {error_msg}")
-            result_dict["category_warning"] = (
+            result_dict.setdefault("warnings", []).append(
                 f"{entity_type.capitalize()} saved but failed to set category: {error_msg}"
             )
     except Exception as e:
         logger.warning(f"Failed to set category for {entity_id}: {e}")
-        result_dict["category_warning"] = (
+        result_dict.setdefault("warnings", []).append(
             f"{entity_type.capitalize()} saved but failed to set category: {e}"
         )
 

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev544
+Version: 7.5.0.dev546
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -18,7 +18,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.14,>=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastmcp==3.2.4
+Requires-Dist: fastmcp==3.3.1
 Requires-Dist: httpx[socks]==0.28.1
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: python-dotenv==1.2.2

{ha_mcp_dev-7.5.0.dev544 → ha_mcp_dev-7.5.0.dev546}/src/ha_mcp_dev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastmcp==3.2.4
+fastmcp==3.3.1
 httpx[socks]==0.28.1
 pydantic==2.13.4
 python-dotenv==1.2.2