ha-mcp-dev 8.6.0.dev2830__tar.gz → 8.6.0.dev2834__tar.gz

{ha_mcp_dev-8.6.0.dev2830 → ha_mcp_dev-8.6.0.dev2834}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.6.0.dev2830
+Version: 8.6.0.dev2834
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-8.6.0.dev2830 → ha_mcp_dev-8.6.0.dev2834}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2830"
+version = "8.6.0.dev2834"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{ha_mcp_dev-8.6.0.dev2830 → ha_mcp_dev-8.6.0.dev2834}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2830"
+version = "8.6.0.dev2834"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's

{ha_mcp_dev-8.6.0.dev2830 → ha_mcp_dev-8.6.0.dev2834}/src/ha_mcp/tools/log_sources.py

@@ -44,6 +44,64 @@ from .util_helpers import add_timezone_metadata, normalize_log_level
 logger = logging.getLogger(__name__)
 
 
+# system_log keeps a message verbatim, so one warning that reprs a binary
+# payload (a blocking-call report on write_bytes, say) can run to hundreds of
+# kilobytes. The cap is per string, and an entry keeps up to five messages, so
+# one entry can still return about five times the cap.
+_SYSTEM_LOG_MESSAGE_CAP = 2000
+
+
+def _truncation_marker(cut: int) -> str:
+    return (
+        f"…[{cut:,} chars cut; compact=False with a narrow search and "
+        f"limit=1 returns it whole]…"
+    )
+
+
+def _cap_message(message: str) -> tuple[str, bool]:
+    """Keep both ends of an oversized message, the marker in between.
+
+    The lead names what happened and the end carries the innermost stack
+    frames that identify the offender; the middle is usually the payload.
+    """
+    if len(message) <= _SYSTEM_LOG_MESSAGE_CAP:
+        return message, False
+    cut = len(message)
+    # The marker's width depends on the digits of the cut size, so settle it.
+    while True:
+        budget = _SYSTEM_LOG_MESSAGE_CAP - len(_truncation_marker(cut))
+        settled = len(message) - budget
+        if settled == cut:
+            break
+        cut = settled
+    head = budget // 2
+    tail = budget - head
+    return message[:head] + _truncation_marker(cut) + message[-tail:], True
+
+
+def _cap_system_log_messages(entries: list[Any]) -> int:
+    """Cap oversized system_log message strings in place; return how many."""
+    capped = 0
+    for entry in entries:
+        if not isinstance(entry, dict):
+            continue
+        message = entry.get("message")
+        if isinstance(message, str):
+            entry["message"], cut = _cap_message(message)
+            capped += cut
+        elif isinstance(message, list):
+            parts = []
+            for part in message:
+                if isinstance(part, str):
+                    kept, cut = _cap_message(part)
+                    capped += cut
+                    parts.append(kept)
+                else:
+                    parts.append(part)
+            entry["message"] = parts
+    return capped
+
+
 class CoreLogSourcesMixin:
     """The log sources HA Core serves directly.
 
@@ -302,6 +360,7 @@ class CoreLogSourcesMixin:
         search: str | None = None,
         level: str | None = None,
         order: Literal["newest", "oldest"] = "newest",
+        compact: bool = True,
     ) -> dict[str, Any]:
         """Fetch structured system log entries via system_log/list."""
         effective_limit = _coerce_limit(limit)
@@ -366,6 +425,7 @@ class CoreLogSourcesMixin:
 
             total_entries = len(entries)
             entries = entries[:effective_limit]
+            truncated_messages = _cap_system_log_messages(entries) if compact else 0
 
             data: dict[str, Any] = {
                 "success": True,
@@ -378,6 +438,8 @@ class CoreLogSourcesMixin:
             }
             if filters_applied:
                 data["filters_applied"] = filters_applied
+            if truncated_messages:
+                data["truncated_messages"] = truncated_messages
 
             return data
 

{ha_mcp_dev-8.6.0.dev2830 → ha_mcp_dev-8.6.0.dev2834}/src/ha_mcp/tools/tools_logs.py

@@ -21,7 +21,7 @@ from .log_common import (
     _validate_log_level,
     _validate_log_slug,
 )
-from .log_sources import CoreLogSourcesMixin
+from .log_sources import _SYSTEM_LOG_MESSAGE_CAP, CoreLogSourcesMixin
 from .log_sources_fault import FaultLogSourceMixin
 from .log_sources_supervisor import SupervisorLogSourcesMixin
 
@@ -61,7 +61,7 @@ class LogTools(CoreLogSourcesMixin, SupervisorLogSourcesMixin, FaultLogSourceMix
             )
         if source == "system":
             return await self._get_system_log(
-                limit=limit, search=search, level=level, order=order
+                limit=limit, search=search, level=level, order=order, compact=compact
             )
         if source == "error_log":
             return await self._get_error_log(
@@ -233,7 +233,7 @@ def register_logs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 )
             ),
         ] = "newest",
-        # Logbook-specific (ignored for other sources)
+        # Source-scoped options: each description names the sources it applies to
         hours_back: Annotated[
             int, Field(ge=1, description="Logbook only: how many hours back to read.")
         ] = 1,
@@ -260,7 +260,16 @@ def register_logs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         ] = 0,
         compact: Annotated[
             bool,
-            Field(description="Logbook only: strip attribute dicts to save context."),
+            Field(
+                description=(
+                    f"logbook / system only: save context. Logbook strips "
+                    f"attribute dicts; system keeps the start and end of each "
+                    f"message string within {_SYSTEM_LOG_MESSAGE_CAP} characters "
+                    f"(counted in 'truncated_messages'). search still matches the "
+                    f"full message; text inside the cut is not shown. To read one "
+                    f"message whole, pass False with a narrow search and limit=1."
+                )
+            ),
         ] = True,
         # System/error_log-specific
         level: Annotated[
@@ -311,8 +320,8 @@ def register_logs_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         """Get Home Assistant logs from various sources.
 
         Prefer source='system' for triage: it returns HA's own deduplicated
-        system_log entries with counts, first_occurred and full tracebacks, and
-        its counts run since each error first occurred. error_log with
+        system_log entries with counts, first_occurred and the full exception
+        traceback, and its counts run since each error first occurred. error_log with
         structured=True counts only what is inside the fetched window (reported
         as window_start/window_end; every install reads a capped window) and
         drops tracebacks, which structured=False gets back; use it for entries