ha-mcp-dev 7.4.1.dev452__tar.gz → 7.4.1.dev454__tar.gz

{ha_mcp_dev-7.4.1.dev452/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev454}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev452
+Version: 7.4.1.dev454
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev452"
+version = "7.4.1.dev454"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/device_control.py

@@ -10,6 +10,7 @@ import json
 import logging
 from typing import Any, ClassVar
 
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 
 from ..client.rest_client import HomeAssistantClient
@@ -534,7 +535,10 @@ class DeviceControlTools:
         return valid
 
     async def bulk_device_control(
-        self, operations: list[dict[str, Any]], parallel: bool = True
+        self,
+        operations: list[dict[str, Any]],
+        parallel: bool = True,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """
         Control multiple devices with bulk operation support.
@@ -542,6 +546,7 @@ class DeviceControlTools:
         Args:
             operations: List of device control operations
             parallel: Whether to execute operations in parallel
+            ctx: Optional FastMCP Context for progress reporting
 
         Returns:
             Bulk operation results
@@ -563,11 +568,35 @@ class DeviceControlTools:
                 operations, skipped_operations
             )
 
+            if ctx is not None:
+                await ctx.info(
+                    f"bulk_device_control: {len(valid_operations)} valid op(s), "
+                    f"{len(skipped_operations)} skipped, "
+                    f"mode={'parallel' if parallel else 'sequential'}"
+                )
+                await ctx.report_progress(
+                    progress=0,
+                    total=len(valid_operations),
+                    message="dispatching operations",
+                )
+
             # Execute only valid operations
             if parallel:
                 await self._execute_parallel(valid_operations, results, operation_ids)
             else:
-                await self._execute_sequential(valid_operations, results, operation_ids)
+                await self._execute_sequential(
+                    valid_operations, results, operation_ids, ctx=ctx
+                )
+
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=len(valid_operations),
+                    total=len(valid_operations),
+                    message=(
+                        f"dispatched {len(operation_ids)} op(s); "
+                        "use get_bulk_operation_status to verify completion"
+                    ),
+                )
 
             return self._build_bulk_response(
                 operations, results, operation_ids, skipped_operations, parallel
@@ -631,8 +660,10 @@ class DeviceControlTools:
         valid_operations: list[tuple[int, dict[str, Any], str, str]],
         results: list[dict[str, Any]],
         operation_ids: list[str],
+        ctx: Context | None = None,
     ) -> None:
-        for _i, op, entity_id, action in valid_operations:
+        total = len(valid_operations)
+        for i, (_orig_index, op, entity_id, action) in enumerate(valid_operations):
             try:
                 result = await self.control_device_smart(
                     entity_id=entity_id,
@@ -651,6 +682,12 @@ class DeviceControlTools:
                     ErrorCode.SERVICE_CALL_FAILED,
                     f"Exception during execution: {e!s}",
                 ))
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=i + 1,
+                    total=total,
+                    message=f"{entity_id} {action} dispatched",
+                )
 
     def _build_bulk_response(
         self,

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/smart_search.py

@@ -9,6 +9,8 @@ import random
 import time
 from typing import Any
 
+from fastmcp import Context
+
 from ..client.rest_client import HomeAssistantClient
 from ..config import get_global_settings
 from ..utils.fuzzy_search import (
@@ -802,6 +804,7 @@ class SmartSearchTools:
         include_config: bool = False,
         concurrency_limit: int = DEFAULT_CONCURRENCY_LIMIT,
         exact_match: bool = True,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """
         Deep search across automation, script, helper, and dashboard definitions.
@@ -834,8 +837,26 @@ class SmartSearchTools:
 
             query_lower = query.lower().strip()
 
+            total_phases = len(search_types) + 1  # +1 for initial state fetch
+            if ctx is not None:
+                await ctx.info(
+                    f"deep_search starting: query={query!r} types={search_types}"
+                )
+                await ctx.report_progress(
+                    progress=0,
+                    total=total_phases,
+                    message="fetching entity states",
+                )
+
             # Fetch all entities once at the beginning to avoid repeated calls
             all_entities = await self.client.get_states()
+            phase_done = 1
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=phase_done,
+                    total=total_phases,
+                    message=f"fetched {len(all_entities)} entity states",
+                )
 
             # Pre-resolve unique_ids from cached entity states to avoid redundant API calls
             automation_unique_id_map = {}
@@ -1009,6 +1030,14 @@ class SmartSearchTools:
                             }
                         )
 
+                phase_done += 1
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=phase_done,
+                        total=total_phases,
+                        message=f"automations searched ({len(results['automations'])} matches)",
+                    )
+
             # ================================================================
             # SCRIPT SEARCH (same 3-tier strategy: REST bulk -> WS bulk -> individual)
             # ================================================================
@@ -1165,6 +1194,14 @@ class SmartSearchTools:
                             }
                         )
 
+                phase_done += 1
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=phase_done,
+                        total=total_phases,
+                        message=f"scripts searched ({len(results['scripts'])} matches)",
+                    )
+
             # Search helpers with parallel WebSocket calls
             if "helper" in search_types:
                 helper_types = [
@@ -1248,6 +1285,14 @@ class SmartSearchTools:
                     elif isinstance(result, Exception):
                         logger.debug(f"Helper list fetch failed: {result}")
 
+                phase_done += 1
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=phase_done,
+                        total=total_phases,
+                        message=f"helpers searched ({len(results['helpers'])} matches)",
+                    )
+
             # ================================================================
             # DASHBOARD SEARCH
             # Fetches all storage-mode dashboards and the default dashboard,
@@ -1340,6 +1385,14 @@ class SmartSearchTools:
                     logger.error(f"Dashboard search error: {e}")
                     raise
 
+                phase_done += 1
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=phase_done,
+                        total=total_phases,
+                        message=f"dashboards searched ({len(results['dashboards'])} matches)",
+                    )
+
             # Merge all results with their category, sort by score, and paginate
             tagged_results: list[tuple[str, dict[str, Any]]] = []
             for category, items in results.items():

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/tools_hacs.py

@@ -8,6 +8,7 @@ to discover custom integrations, Lovelace cards, themes, and more.
 import logging
 from typing import Annotated, Any, Literal
 
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
@@ -137,6 +138,7 @@ class HacsTools:
                 description="Number of results to skip for pagination (default: 0)",
             ),
         ] = 0,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Search HACS store for repositories, or list installed repositories.
 
@@ -181,6 +183,17 @@ class HacsTools:
                 min_value=0,
             )
 
+            if ctx is not None:
+                await ctx.info(
+                    f"ha_hacs_search starting: query={query!r} "
+                    f"category={category} installed_only={installed_only_bool}"
+                )
+                await ctx.report_progress(
+                    progress=0,
+                    total=3,
+                    message="checking HACS availability",
+                )
+
             # Check if HACS is available
             await _assert_hacs_available()
 
@@ -195,6 +208,13 @@ class HacsTools:
                 hacs_category = CATEGORY_MAP.get(category, category)
                 kwargs_cmd["categories"] = [hacs_category]
 
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=1,
+                    total=3,
+                    message="fetching HACS repository list",
+                )
+
             response = await ws_client.send_command(
                 "hacs/repositories/list", **kwargs_cmd
             )
@@ -211,9 +231,21 @@ class HacsTools:
                 )
 
             all_repositories = response.get("result", [])
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=2,
+                    total=3,
+                    message=f"filtering {len(all_repositories)} repositories",
+                )
             matches = _filter_and_score_repos(
                 all_repositories, query, installed_only_bool
             )
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=3,
+                    total=3,
+                    message=f"matched {len(matches)} repositories",
+                )
 
             limited_matches = matches[offset_int : offset_int + max_results_int]
             has_more = (offset_int + len(limited_matches)) < len(matches)

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/tools_history.py

@@ -14,6 +14,7 @@ import re
 from datetime import UTC, datetime, timedelta
 from typing import Annotated, Any, Literal
 
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
@@ -205,6 +206,7 @@ class HistoryTools:
                 default=None,
             ),
         ] = None,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """
         Retrieve historical data from Home Assistant's recorder.
@@ -288,6 +290,18 @@ class HistoryTools:
             # Parse time parameters
             start_dt, end_dt = _parse_time_range(start_time, end_time, default_hours)
 
+            if ctx is not None:
+                await ctx.info(
+                    f"ha_get_history starting: source={source} "
+                    f"entities={len(entity_id_list)} "
+                    f"window={start_dt.isoformat()}..{end_dt.isoformat()}"
+                )
+                await ctx.report_progress(
+                    progress=0,
+                    total=3,
+                    message="connecting to Home Assistant WebSocket",
+                )
+
             # Connect to WebSocket (shared by both sources)
             ws_client, error = await get_connected_ws_client(
                 self._client.base_url,
@@ -300,20 +314,34 @@ class HistoryTools:
                     "Failed to connect to Home Assistant WebSocket",
                 ))
 
+            if ctx is not None:
+                await ctx.report_progress(
+                    progress=1,
+                    total=3,
+                    message=f"querying recorder ({source})",
+                )
+
             try:
                 if source == "statistics":
-                    return await _fetch_statistics(
+                    result = await _fetch_statistics(
                         ws_client, self._client, entity_id_list,
                         start_dt, end_dt, period, statistic_types,
                         limit, offset,
                     )
                 else:
-                    return await _fetch_history(
+                    result = await _fetch_history(
                         ws_client, self._client, entity_id_list,
                         start_dt, end_dt, minimal_response,
                         significant_changes_only, limit, offset,
                         _DEFAULT_HISTORY_LIMIT, _MAX_HISTORY_LIMIT,
                     )
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=3,
+                        total=3,
+                        message="recorder query complete",
+                    )
+                return result
             finally:
                 if ws_client:
                     await ws_client.disconnect()

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/tools_search.py

@@ -8,6 +8,7 @@ import asyncio
 import logging
 from typing import Annotated, Any, Literal, cast
 
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 from pydantic import Field
 
@@ -823,6 +824,7 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 ),
             ),
         ] = True,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Search inside automation, script, helper, and dashboard *configurations* — not for finding entity IDs.
 
@@ -865,6 +867,7 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 offset,
                 include_config_bool,
                 exact_match=exact_match_bool,
+                ctx=ctx,
             )
             return cast(dict[str, Any], result)
         except ToolError:

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/tools_service.py

@@ -8,6 +8,7 @@ import logging
 from typing import Annotated, Any, cast
 
 import httpx
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
@@ -393,7 +394,9 @@ class ServiceTools:
     @log_tool_usage
     async def ha_bulk_control(
         self,
-        operations: str | list[dict[str, Any]], parallel: bool | str = True
+        operations: str | list[dict[str, Any]],
+        parallel: bool | str = True,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Control multiple devices with bulk operation support and WebSocket tracking."""
         # Coerce boolean parameter that may come as string from XML-style calls
@@ -424,7 +427,7 @@ class ServiceTools:
 
         operations_list = cast(list[dict[str, Any]], parsed_operations)
         result = await self._device_tools.bulk_device_control(
-            operations=operations_list, parallel=parallel_bool
+            operations=operations_list, parallel=parallel_bool, ctx=ctx
         )
         return cast(dict[str, Any], result)
 

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454}/src/ha_mcp/tools/tools_traces.py

@@ -9,6 +9,7 @@ import json
 import logging
 from typing import Annotated, Any
 
+from fastmcp import Context
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
@@ -91,6 +92,7 @@ class TraceTools:
                 default=None,
             ),
         ] = None,
+        ctx: Context | None = None,
     ) -> dict[str, Any]:
         """
         Retrieve execution traces for automations and scripts to debug issues.
@@ -165,6 +167,17 @@ class TraceTools:
             # Extract the object_id (part after the domain) as fallback
             object_id = automation_id.split(".", 1)[1]
 
+            if ctx is not None:
+                await ctx.info(
+                    f"ha_get_automation_traces starting: id={automation_id} "
+                    f"run_id={run_id or '<list>'}"
+                )
+                await ctx.report_progress(
+                    progress=0,
+                    total=3,
+                    message="connecting to Home Assistant WebSocket",
+                )
+
             # Connect to WebSocket
             ws_client, error = await get_connected_ws_client(
                 self._client.base_url,
@@ -185,6 +198,13 @@ class TraceTools:
                     ws_client, automation_id, object_id
                 )
 
+                if ctx is not None:
+                    await ctx.report_progress(
+                        progress=1,
+                        total=3,
+                        message=f"fetching trace {'detail' if run_id else 'list'}",
+                    )
+
                 if run_id:
                     # Get specific trace details
                     result = await ws_client.send_command(
@@ -195,16 +215,20 @@ class TraceTools:
                     )
 
                     if not result.get("success"):
-                        ctx = {"automation_id": automation_id}
+                        err_ctx: dict[str, str] = {"automation_id": automation_id}
                         if run_id:
-                            ctx["run_id"] = run_id
+                            err_ctx["run_id"] = run_id
                         raise_tool_error(create_error_response(
                             ErrorCode.SERVICE_CALL_FAILED,
                             result.get("error", "Failed to retrieve trace"),
-                            context=ctx,
+                            context=err_ctx,
                         ))
 
                     trace_data = result.get("result", {})
+                    if ctx is not None:
+                        await ctx.report_progress(
+                            progress=3, total=3, message="formatting trace"
+                        )
                     return _format_detailed_trace(
                         automation_id, run_id, trace_data,
                         deduplicate=deduplicate, detailed=detailed,
@@ -229,13 +253,29 @@ class TraceTools:
 
                     # If traces are empty, gather diagnostic information
                     if not traces_data:
+                        if ctx is not None:
+                            await ctx.report_progress(
+                                progress=2,
+                                total=3,
+                                message="no traces; gathering diagnostics",
+                            )
                         diagnostics = await _gather_diagnostics(
                             ws_client, self._client, automation_id, domain
                         )
+                        if ctx is not None:
+                            await ctx.report_progress(
+                                progress=3, total=3, message="diagnostics complete"
+                            )
                         return _format_trace_list(
                             automation_id, traces_data, limit, diagnostics
                         )
 
+                    if ctx is not None:
+                        await ctx.report_progress(
+                            progress=3,
+                            total=3,
+                            message=f"listed {len(traces_data)} traces",
+                        )
                     return _format_trace_list(automation_id, traces_data, limit)
 
             finally:

{ha_mcp_dev-7.4.1.dev452 → ha_mcp_dev-7.4.1.dev454/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev452
+Version: 7.4.1.dev454
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT