ha-mcp-dev 8.4.3.dev2624__tar.gz → 8.4.3.dev2627__tar.gz

{ha_mcp_dev-8.4.3.dev2624/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.4.3.dev2627}/PKG-INFO

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

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.4.3.dev2624"
+version = "8.4.3.dev2627"
 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
@@ -94,6 +94,14 @@ mypy_path = "src"
 # /tmp keeps the cache on Linux tmpfs — avoids the slow Windows FS in WSL2.
 # Windows-native contributors can remove this line or override with MYPY_CACHE_DIR.
 cache_dir = "/tmp/.mypy_cache"
+# Vendored skills submodule: upstream's code, not ours to type-check. This is
+# the exclusion that was actually failing a local run, because `mypy src/`
+# recurses into the submodule when it is initialized while CI's lint job checks
+# out without `submodules: true` and never sees it.
+# A regex, NOT a [[tool.mypy.overrides]] module entry like the ha_mcp._vendor.*
+# one below: `skills-vendor` contains a hyphen, so it has no importable module
+# path for a module pattern to match. Do not "simplify" it into that block.
+exclude = ['^src/ha_mcp/resources/skills-vendor/']
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true
@@ -150,6 +158,14 @@ extend-exclude = [
     # Vendored websockets — upstream's code style, not ours. Kept in sync
     # with PATHS_IGNORE in scripts/codeql_quality_gate.py.
     "src/ha_mcp/_vendor/websockets",
+    # Vendored skills submodule (src/ha_mcp/resources/skills-vendor) — upstream's
+    # code, shipped as package data. This covers the directory-scoped commands,
+    # `ruff check src/ ...` in CI and the ones in CONTRIBUTING.md. It does NOT
+    # affect lefthook, which passes {staged_files} as explicit paths that ruff
+    # lints regardless of extend-exclude (force-exclude is not set), and a
+    # submodule's contents are never staged in the superproject anyway. Kept in
+    # sync with PATHS_IGNORE in scripts/codeql_quality_gate.py.
+    "src/ha_mcp/resources/skills-vendor",
     # HA integration manifests must be strict JSON (no trailing commas);
     # ruff 0.15+ formats .json files as JSONC and inserts trailing commas
     # which makes Python's json.load() reject the file at HA startup.

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/__main__.py

@@ -616,7 +616,7 @@ async def _run_with_shutdown(server_coro: Coroutine[Any, Any, Any]) -> None:
     shutdown_task = asyncio.create_task(_shutdown_event.wait())
 
     try:
-        done, pending = await asyncio.wait(
+        done, _ = await asyncio.wait(
             [server_task, shutdown_task],
             return_when=asyncio.FIRST_COMPLETED,
         )

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/config.py

@@ -124,6 +124,12 @@ class Settings(BaseSettings):
     debug: bool = Field(False, alias="DEBUG")
     log_level: str = Field("INFO", alias="LOG_LEVEL")
 
+    # Opt-in HTTP experiments, applied at app construction (restart required).
+    http_transport_diagnostics: bool = Field(
+        False, alias="HAMCP_HTTP_TRANSPORT_DIAGNOSTICS"
+    )
+    http_json_response: bool = Field(False, alias="HAMCP_HTTP_JSON_RESPONSE")
+
     # MCP Server configuration
     mcp_server_name: str = Field("ha-mcp", alias="MCP_SERVER_NAME")
     mcp_server_version: str = Field(
@@ -940,6 +946,16 @@ ADVANCED_SETTINGS_FIELDS: tuple[AdvancedField, ...] = (
     AdvancedField("environment", "ENVIRONMENT", str, "diagnostics", True),
     AdvancedField("log_level", "LOG_LEVEL", str, "diagnostics", True),
     AdvancedField("debug", "DEBUG", bool, "diagnostics", True),
+    AdvancedField(
+        "http_transport_diagnostics",
+        "HAMCP_HTTP_TRANSPORT_DIAGNOSTICS",
+        bool,
+        "diagnostics",
+        True,
+    ),
+    AdvancedField(
+        "http_json_response", "HAMCP_HTTP_JSON_RESPONSE", bool, "diagnostics", True
+    ),
     # Settings UI sidecar (stdio-only). 0 (default) = first spawn picks a
     # free port and later spawns reuse it via ui.state (#2131); a value
     # pins a preferred fixed port instead (best-effort, #1587).

ha_mcp_dev-8.4.3.dev2627/src/ha_mcp/http_transport.py

@@ -0,0 +1,160 @@
+"""Default-off HTTP diagnostics and JSON responses for HA-MCP launchers."""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from time import monotonic
+from typing import Any
+from uuid import uuid4
+
+import fastmcp
+from fastmcp import FastMCP
+from fastmcp.server.http import StarletteWithLifespan
+from starlette.middleware import Middleware
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
+
+from .config import get_global_settings
+
+logger = logging.getLogger(__name__)
+
+
+class HttpTransportFastMCP(FastMCP):
+    """Apply instance HTTP experiments at the shared app-construction boundary.
+
+    Both CLI HTTP launchers and existing embedded components call ``http_app``.
+    Keep FastMCP's arguments untouched when the options are off, including any
+    existing FASTMCP_JSON_RESPONSE setting. Stdio does not use this method.
+    """
+
+    def http_app(self, *args: Any, **kwargs: Any) -> StarletteWithLifespan:
+        """Build the normal app, adding only explicitly enabled experiments."""
+        settings = get_global_settings()
+        if settings.http_json_response:
+            # FastMCP accepts json_response as its third positional argument.
+            if len(args) > 2:
+                args = (*args[:2], True, *args[3:])
+            else:
+                kwargs["json_response"] = True
+        if settings.http_transport_diagnostics:
+            path = args[0] if args else kwargs.get("path")
+            existing = args[1] if len(args) > 1 else kwargs.get("middleware")
+            middleware = [
+                *(existing or []),
+                Middleware(
+                    TransportDiagnostics,
+                    path=path or fastmcp.settings.streamable_http_path,
+                ),
+            ]
+            if len(args) > 1:
+                args = (args[0], middleware, *args[2:])
+            else:
+                kwargs["middleware"] = middleware
+        return super().http_app(*args, **kwargs)
+
+
+@dataclass
+class _Transfer:
+    """Counters local to one HTTP request; never retain body data."""
+
+    request_bytes: int = 0
+    response_bytes: int = 0
+    request_complete: bool = False
+    response_complete: bool = False
+    disconnect: bool = False
+    status: int | None = None
+    error: str | None = None
+
+    def received(self, message: Message, trace: str) -> None:
+        """Count only events delivered by the underlying receive callable."""
+        if message["type"] == "http.request":
+            self.request_bytes += len(message.get("body", b""))
+            if not message.get("more_body", False):
+                self.request_complete = True
+                logger.info("MCP HTTP trace=%s request body complete", trace)
+        elif message["type"] == "http.disconnect":
+            self.disconnect = True
+
+    def sent(self, message: Message, trace: str, started: float) -> None:
+        """Record accepted events, including final-body handoff before app cleanup."""
+        if message["type"] == "http.response.start":
+            self.status = message["status"]
+            logger.info(
+                "MCP HTTP trace=%s response headers status=%s", trace, self.status
+            )
+        elif message["type"] == "http.response.body":
+            self.response_bytes += len(message.get("body", b""))
+            self.response_complete = not message.get("more_body", False)
+            if self.response_complete:
+                logger.info(
+                    "MCP HTTP trace=%s response body complete response_bytes=%d elapsed_ms=%.1f",
+                    trace,
+                    self.response_bytes,
+                    (monotonic() - started) * 1000,
+                )
+
+
+def _declared_length(scope: Scope) -> int | None:
+    """Read only a bounded numeric length, never log arbitrary header text."""
+    for name, value in scope.get("headers", []):
+        if name.lower() == b"content-length":
+            if len(value) <= 20 and value.isdigit():
+                return int(value)
+            return None
+    return None
+
+
+class TransportDiagnostics:
+    """Observe the MCP HTTP boundary without buffering or altering messages.
+
+    Completion means ASGI accepted the final body event, not that the client
+    received or processed it. No paths, headers, request IDs supplied by clients,
+    bodies or exception messages are logged. Other HTTP routes are untouched.
+    """
+
+    def __init__(self, app: ASGIApp, path: str) -> None:
+        self.app = app
+        self.path = path.rstrip("/")
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        if scope["type"] != "http" or scope["path"].rstrip("/") != self.path:
+            await self.app(scope, receive, send)
+            return
+
+        transfer = _Transfer()
+        trace = uuid4().hex[:16]
+        started = monotonic()
+        declared = _declared_length(scope)
+        logger.info("MCP HTTP trace=%s started declared_bytes=%s", trace, declared)
+
+        async def receive_observed() -> Message:
+            message = await receive()
+            transfer.received(message, trace)
+            return message
+
+        async def send_observed(message: Message) -> None:
+            await send(message)
+            transfer.sent(message, trace, started)
+
+        try:
+            await self.app(scope, receive_observed, send_observed)
+        except BaseException as exc:
+            # Cancellation is diagnostic too; always preserve the original exit.
+            transfer.error = type(exc).__name__
+            raise
+        finally:
+            logger.info(
+                "MCP HTTP trace=%s finished elapsed_ms=%.1f declared_bytes=%s "
+                "request_bytes=%d request_complete=%s status=%s "
+                "response_bytes=%d response_complete=%s disconnect=%s error=%s",
+                trace,
+                (monotonic() - started) * 1000,
+                declared,
+                transfer.request_bytes,
+                transfer.request_complete,
+                transfer.status,
+                transfer.response_bytes,
+                transfer.response_complete,
+                transfer.disconnect,
+                transfer.error,
+            )

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/server.py

@@ -14,13 +14,13 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Annotated, Any, ClassVar
 
 import yaml  # type: ignore[import-untyped]
-from fastmcp import FastMCP
 from mcp.types import Icon
 from pydantic import Field
 
 from .config import _PACKAGE_VERSION, get_global_settings
 from .errors import ErrorCode, create_error_response
 from .hacs_auto_refresh import hacs_refresh_lifespan
+from .http_transport import HttpTransportFastMCP as FastMCP
 from .tools.helpers import raise_tool_error
 from .transforms import DEFAULT_PINNED_TOOLS
 

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/settings_ui/__init__.py

@@ -55,7 +55,6 @@ from ._persistence import (
 )
 from ._supervisor import (
     _BACKGROUND_RESTART_TASKS,
-    _SUPERVISOR_SELF_RESTART_FLUSH_DELAY_S,
     _schedule_supervisor_self_restart,
     _supervisor_fetch_current_options,
     _supervisor_merge_and_post_options,

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/settings_ui/locales/en.json

@@ -448,6 +448,10 @@
     "advanced.mcp_server_version.help": "Defaults to the package version. Overriding may confuse clients. Restart required.",
     "advanced.environment.label": "Environment",
     "advanced.environment.help": "development or production. Affects logging verbosity. Restart required.",
+    "advanced.http_transport_diagnostics.label": "HTTP transport diagnostics",
+    "advanced.http_transport_diagnostics.help": "Experimental. Log MCP HTTP byte counts, timing and completion at INFO level, without payloads or credentials. Does not confirm client receipt. HTTP only; restart required.",
+    "advanced.http_json_response.label": "JSON responses instead of streaming",
+    "advanced.http_json_response.help": "Experimental. Return a single JSON response instead of an SSE stream. Affects all HTTP clients on this server and disables streamed progress for these responses. HTTP only; restart required.",
     "advanced.log_level.label": "Log level",
     "advanced.log_level.help": "DEBUG/INFO/WARNING/ERROR/CRITICAL. Restart required.",
     "advanced.debug.label": "Debug mode",

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp/settings_ui/settings.js

@@ -3981,6 +3981,8 @@ const ADVANCED_FIELD_META = {
   environment:         { label: "Environment",                 help: "'development' or 'production'. Affects logging verbosity. Restart required." },
   log_level:           { label: "Log level",                   help: "DEBUG/INFO/WARNING/ERROR/CRITICAL. Set once at startup; restart required." },
   debug:               { label: "Debug mode",                  help: "Verbose request logging. Logs sensitive data; do not enable in production. Restart required." },
+  http_transport_diagnostics: { label: "HTTP transport diagnostics", help: "Experimental. Log MCP HTTP byte counts, timing and completion at INFO level, without payloads or credentials. Does not confirm client receipt. HTTP only; restart required." },
+  http_json_response: { label: "JSON responses instead of streaming", help: "Experimental. Return a single JSON response instead of an SSE stream. Affects all HTTP clients on this server and disables streamed progress for these responses. HTTP only; restart required." },
   code_mode_max_duration:    { label: "Code-mode max duration (s)",   help: "Wall-clock budget per sandbox run. Range 1–300. Restart required." },
   code_mode_max_memory:      { label: "Code-mode max memory (bytes)", help: "RSS cap per sandbox run. Range 1 MB–256 MB. Restart required." },
   code_mode_max_recursion:   { label: "Code-mode max recursion",      help: "Recursion-depth cap per sandbox run. Restart required." },
@@ -4002,6 +4004,7 @@ const ADVANCED_RESTART_REQUIRED = new Set([
   "ha_tool_concurrency",
   "enabled_tool_modules", "enable_websocket",
   "log_level", "debug",
+  "http_transport_diagnostics", "http_json_response",
   "mcp_server_name", "mcp_server_version", "environment",
   // fuzzy_threshold is read once by SmartSearchTools at the
   // lazy-init singleton (tools/smart_search/) — changes

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627/src/ha_mcp_dev.egg-info}/PKG-INFO

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

{ha_mcp_dev-8.4.3.dev2624 → ha_mcp_dev-8.4.3.dev2627}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ src/ha_mcp/config.py
 src/ha_mcp/errors.py
 src/ha_mcp/ha_request_queue.py
 src/ha_mcp/hacs_auto_refresh.py
+src/ha_mcp/http_transport.py
 src/ha_mcp/llm_exposure.py
 src/ha_mcp/log_filters.py
 src/ha_mcp/py.typed