Merge branch 'master' into docs/fields-projection-docstring-completeness

Author: kingpanther13

homeassistant-addon-dev/config.yaml

@@ -1,6 +1,6 @@
 name: "Home Assistant MCP Server (Dev)"
 description: "Development channel - AI assistant integration via MCP (unstable)"
-version: "7.5.0.dev346"
+version: "7.5.0.dev347"
 slug: "ha_mcp_dev"
 url: "https://github.com/homeassistant-ai/ha-mcp"
 stage: experimental

site/src/data/tools.json

@@ -529,7 +529,7 @@
   {
     "name": "ha_config_remove_calendar_event",
     "title": "Remove Calendar Event",
-    "description": "Delete an event from a calendar.\n\nDeletes a calendar event using the calendar.delete_event service.\n\n**Parameters:**\n- entity_id: Calendar entity ID (e.g., 'calendar.family')\n- uid: Unique identifier of the event to delete\n- recurrence_id: Optional recurrence ID for recurring events\n- recurrence_range: Optional recurrence range ('THIS_AND_FUTURE' to delete this and future occurrences)\n\n**Example Usage:**\n```python\n# Delete a single event\nresult = ha_config_remove_calendar_event(\n    \"calendar.family\",\n    uid=\"event-12345\"\n)\n\n# Delete a recurring event instance and future occurrences\nresult = ha_config_remove_calendar_event(\n    \"calendar.work\",\n    uid=\"recurring-event-67890\",\n    recurrence_id=\"20240115T100000\",\n    recurrence_range=\"THIS_AND_FUTURE\"\n)\n```\n\n**Note:**\nTo get the event UID, first use ha_config_get_calendar_events() to list events.\nThe UID is returned in each event's data.\n\n**Returns:**\n- Success status and deletion confirmation",
+    "description": "Delete an event from a calendar.\n\nDeletes a calendar event via the WebSocket ``calendar/event/delete``\ncommand. HA's calendar component only registers ``create_event`` and\n``get_events`` as REST services — delete and update live on the\nWebSocket API only.\n\n**Parameters:**\n- entity_id: Calendar entity ID (e.g., 'calendar.family')\n- uid: Unique identifier of the event to delete\n- recurrence_id: Optional recurrence ID for recurring events\n- recurrence_range: Optional recurrence range ('THIS_AND_FUTURE' to delete this and future occurrences)\n\n**Example Usage:**\n```python\n# Delete a single event\nresult = ha_config_remove_calendar_event(\n    \"calendar.family\",\n    uid=\"event-12345\"\n)\n\n# Delete a recurring event instance and future occurrences\nresult = ha_config_remove_calendar_event(\n    \"calendar.work\",\n    uid=\"recurring-event-67890\",\n    recurrence_id=\"20240115T100000\",\n    recurrence_range=\"THIS_AND_FUTURE\"\n)\n```\n\n**Note:**\nTo get the event UID, first use ha_config_get_calendar_events() to list events.\nThe UID is returned in each event's data.\n\n**Returns:**\n- Success status and deletion confirmation",
     "inputSchema": {
       "properties": {
         "entity_id": {

src/ha_mcp/tools/tools_calendar.py

@@ -19,6 +19,7 @@
 from .auto_backup import with_auto_backup
 from .helpers import (
     exception_to_structured_error,
+    get_connected_ws_client,
     log_tool_usage,
     raise_tool_error,
     register_tool_methods,
@@ -354,7 +355,10 @@ async def ha_config_remove_calendar_event(
         """
         Delete an event from a calendar.
 
-        Deletes a calendar event using the calendar.delete_event service.
+        Deletes a calendar event via the WebSocket ``calendar/event/delete``
+        command. HA's calendar component only registers ``create_event`` and
+        ``get_events`` as REST services — delete and update live on the
+        WebSocket API only.
 
         **Parameters:**
         - entity_id: Calendar entity ID (e.g., 'calendar.family')
@@ -402,8 +406,8 @@ async def ha_config_remove_calendar_event(
                 )
 
             # entity_id format-check above does not cover the ``uid`` parameter.
-            # Empty/whitespace uid would flow through to ``calendar.delete_event``
-            # and HA returns a misleading "event not found".
+            # Empty/whitespace uid would flow through to the WS command and HA
+            # returns a misleading "event not found".
             validate_identifier_not_empty(
                 uid,
                 "uid",
@@ -413,21 +417,46 @@ async def ha_config_remove_calendar_event(
                 context={"entity_id": entity_id},
             )
 
-            # Build service data
-            service_data: dict[str, Any] = {
-                "entity_id": entity_id,
-                "uid": uid,
-            }
-
+            # ``calendar.delete_event`` is NOT a REST service — HA only
+            # registers ``calendar.create_event`` and ``calendar.get_events``.
+            # Delete is exposed exclusively via the WebSocket command
+            # ``calendar/event/delete`` (see HA Core
+            # ``homeassistant/components/calendar/__init__.py``).
+            ws_kwargs: dict[str, Any] = {"entity_id": entity_id, "uid": uid}
             if recurrence_id:
-                service_data["recurrence_id"] = recurrence_id
+                ws_kwargs["recurrence_id"] = recurrence_id
             if recurrence_range:
-                service_data["recurrence_range"] = recurrence_range
+                ws_kwargs["recurrence_range"] = recurrence_range
 
-            # Call the calendar.delete_event service
-            result = await self._client.call_service(
-                "calendar", "delete_event", service_data
+            ws_client, conn_error = await get_connected_ws_client(
+                self._client.base_url,
+                self._client.token,
+                verify_ssl=self._client.verify_ssl,
             )
+            if conn_error or ws_client is None:
+                raise_tool_error(
+                    conn_error
+                    or create_error_response(
+                        ErrorCode.CONNECTION_FAILED,
+                        "Failed to connect to Home Assistant WebSocket",
+                        context={"entity_id": entity_id, "uid": uid},
+                    )
+                )
+
+            try:
+                result = await ws_client.send_command(
+                    "calendar/event/delete", **ws_kwargs
+                )
+            finally:
+                # Guard disconnect: a transport-teardown error here would
+                # otherwise replace the original send_command exception.
+                try:
+                    await ws_client.disconnect()
+                except Exception as disconnect_error:
+                    logger.debug(
+                        f"WebSocket disconnect after delete_event for "
+                        f"{entity_id} uid={uid}: {disconnect_error}"
+                    )
 
             return {
                 "success": True,