ha-mcp-dev 7.10.0.dev779__tar.gz → 7.11.0.dev1825__tar.gz

{ha_mcp_dev-7.10.0.dev779/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.11.0.dev1825}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.10.0.dev779
+Version: 7.11.0.dev1825
 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.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.10.0.dev779"
+version = "7.11.0.dev1825"
 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-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/_version.py

@@ -30,6 +30,18 @@ def get_version() -> str:
     """
     if override := os.environ.get("HA_MCP_BUILD_VERSION"):
         return override
+    # Prefer the distribution that actually OWNS the installed ha_mcp package.
+    # Both channel dists (ha-mcp / ha-mcp-dev) can leave metadata behind — an
+    # interrupted channel switch, a best-effort uninstall that failed — and a
+    # fixed name order then reports the leftover dist's version instead of the
+    # one whose files are really installed.
+    try:
+        owners = importlib.metadata.packages_distributions().get("ha_mcp", [])
+        unique = sorted(set(owners))
+        if len(unique) == 1:
+            return importlib.metadata.version(unique[0])
+    except Exception as exc:
+        logger.debug("packages_distributions probe failed: %s", exc)
     for pkg_name in ("ha-mcp", "ha-mcp-dev"):
         try:
             return importlib.metadata.version(pkg_name)

{ha_mcp_dev-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/config.py

@@ -256,6 +256,15 @@ class Settings(BaseSettings):
         "", alias="HAMCP_DASHBOARD_SCREENSHOT_ENGINE_URL"
     )
 
+    # Developer mode (issue #1775) — registers the hidden ha_dev_* tools
+    # (server update/restart, direct settings editing). Deliberately NOT a
+    # beta flag: it is a development aid, not a feature preview, and must
+    # not ride the beta master gate. The toggle renders in its own
+    # "Developer" section at the very bottom of the web UI's Server
+    # Settings tab; it is intentionally absent from the add-on config
+    # schemas so it stays out of the add-on Configuration page.
+    enable_dev_mode: bool = Field(False, alias="HAMCP_ENABLE_DEV_MODE")
+
     # Code Mode — sandboxed Python execution via pydantic-monty.
     # Provides an "escape hatch" tool (ha_manage_custom_tool) that lets LLMs write
     # custom one-off Python code when no existing tool covers the request.
@@ -556,6 +565,7 @@ AdvancedSection = Literal[
     "tools_surface",
     "sidecar",
     "beta_codemode",
+    "developer",
 ]
 
 
@@ -814,6 +824,12 @@ ADVANCED_SETTINGS_FIELDS: tuple[AdvancedField, ...] = (
         "beta_codemode",
         True,
     ),
+    # Developer mode (issue #1775). Lives in ADVANCED_SETTINGS_FIELDS —
+    # not FEATURE_FLAG_FIELDS — so it renders in its own "Developer"
+    # section at the very bottom of the Server Settings tab instead of
+    # among the feature toggles, and stays independent of the beta
+    # master gate.
+    AdvancedField("enable_dev_mode", "HAMCP_ENABLE_DEV_MODE", bool, "developer", True),
 )
 
 

{ha_mcp_dev-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/settings_ui/__init__.py

@@ -27,7 +27,7 @@ import httpx
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse, Response
 
-from .._version import get_version, is_running_in_addon
+from .._version import get_version, is_embedded, is_running_in_addon
 from ..backup_manager import get_backup_manager
 from ..client.supervisor_client import make_supervisor_httpx_client
 from ..config import (
@@ -1502,6 +1502,62 @@ def build_settings_handlers(
         )
 
     async def _restart_addon(request: Request) -> JSONResponse:
+        # Embedded (in-process custom-component server): "restart" means
+        # reloading the ha_mcp_tools server config entry. Checked before the
+        # Supervisor path — the HA core container carries SUPERVISOR_TOKEN,
+        # but the Supervisor add-on API is not ours to call from here, and
+        # post-reload the new worker imports the freshly installed code
+        # (the manager purges the module cache per start).
+        if server is not None and is_embedded():
+            from ..tools.tools_dev import (
+                abort_options_flow_quietly,
+                find_server_config_entry,
+                schedule_deferred_entry_reload,
+            )
+
+            try:
+                found = await find_server_config_entry(server.client)
+            except Exception as exc:
+                # A discovery FAILURE is not "entry not found" — masking a
+                # WS/connection hiccup as not-found steers users toward
+                # reinstalling a running component. Also: the restart JS
+                # treats any 5xx as "restart in flight" and starts its
+                # poll-reload cycle, so a restart that was never initiated
+                # must answer BELOW 500.
+                logger.warning("Embedded restart: entry discovery failed: %s", exc)
+                return JSONResponse(
+                    create_error_response(
+                        ErrorCode.CONNECTION_FAILED,
+                        "Could not reach Home Assistant to locate the "
+                        f"in-process server's config entry: {exc}",
+                        suggestions=[
+                            "Retry once Home Assistant is responsive",
+                        ],
+                    ),
+                    status_code=409,
+                )
+            if found is None:
+                return JSONResponse(
+                    create_error_response(
+                        ErrorCode.INTERNAL_ERROR,
+                        "Could not locate the in-process server's config "
+                        "entry to reload",
+                        suggestions=[
+                            "Reload the HA-MCP integration from Settings > "
+                            "Devices & Services instead",
+                        ],
+                    ),
+                    # Below 500 on purpose: no restart was initiated, and the
+                    # restart JS interprets 5xx as restart-in-flight.
+                    status_code=409,
+                )
+            entry_id, flow, _options = found
+            await abort_options_flow_quietly(server.client, flow)
+            schedule_deferred_entry_reload(server.client, entry_id)
+            return JSONResponse(
+                {"success": True, "message": "In-process server reload scheduled"}
+            )
+
         # The sidecar process (server is None) has no Supervisor context
         # and no live server settings — refuse cleanly. The HTTP modes
         # that do pass a server still go through the SUPERVISOR_TOKEN
@@ -1628,14 +1684,27 @@ def build_settings_handlers(
         # either channel; standalone Docker / uvx falls back to the
         # installed package's metadata.
         try:
-            version = get_version()
+            # Executor: get_version's distribution-ownership scan reads
+            # metadata for every installed package — too heavy for the
+            # event loop on an endpoint the restart cycle polls.
+            version = await asyncio.to_thread(get_version)
         except Exception:  # pragma: no cover — defensive only
             logger.warning("get_version() raised; omitting version from info")
             version = None
+        # ``deployment_mode`` reuses the bug-report detector so the UI and
+        # ha_report_issue can never disagree about where the server runs —
+        # the embedded (in-process custom component) server would otherwise
+        # read as plain "docker" here (/.dockerenv exists in the HA core
+        # container).
+        from ..tools.tools_bug_report import _detect_installation_method
+
         return JSONResponse(
             {
                 "is_addon": addon,
                 "is_sidecar": is_sidecar,
+                "deployment_mode": (
+                    "sidecar" if is_sidecar else _detect_installation_method()
+                ),
                 "instance_id": _PROCESS_INSTANCE_ID,
                 "started_at": _PROCESS_STARTED_AT,
                 "version": version,

{ha_mcp_dev-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/settings_ui/settings.html

@@ -161,7 +161,7 @@
   <button class="tab" data-panel="entity-visibility" role="tab" id="tab-entity-visibility" aria-controls="panel-entity-visibility" aria-selected="false" tabindex="-1">Entity Visibility</button>
   <button class="tab" data-panel="accessibility" role="tab" id="tab-accessibility" aria-controls="panel-accessibility" aria-selected="false" tabindex="-1">Accessibility</button>
 </div>
-<div class="restart-notice" id="restartNotice">
+<div class="restart-notice" id="restartNotice" role="status" aria-live="polite">
   <span class="restart-notice-text" id="restartNoticeText">
     ⚠ Changes saved. Restart HA-MCP for them to take effect. On next
     startup, HA-MCP fully removes disabled tools from the MCP tool list.
@@ -265,6 +265,12 @@
             title="Permanently disables the settings UI: stops this server AND writes ~/.ha-mcp/settings_ui_disabled so it does not respawn on future ha-mcp launches. Delete that file to re-enable."
     >Permanently disable settings server</button>
   </div>
+
+  <!-- Developer section sits at the ABSOLUTE bottom of the panel by
+       design (issue #1775): the dev-mode toggle registers hidden
+       ha_dev_* tools and should not be obvious to casual users. -->
+  <h2 class="adv-section-title beta-section-title">Developer</h2>
+  <div id="advDeveloper" class="adv-section"></div>
 </div>
 <div class="panel" id="panel-backups" role="tabpanel" aria-labelledby="tab-backups" tabindex="0">
   <div class="backup-state" id="backupState">Loading backup state…</div>

{ha_mcp_dev-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/settings_ui/settings.js

@@ -217,6 +217,22 @@ async function applyInfoChrome() {
           'Desktop. Restarting the App (add-on) alone does not refresh your ' +
           'client\'s cached tool list.';
       }
+    } else if (info.deployment_mode === 'embedded') {
+      // In-process (custom component) server: the restart endpoint reloads
+      // the server config entry, which reinstalls-if-newer and swaps the
+      // worker onto the freshly installed code.
+      const rbtn = document.getElementById('restartBtn');
+      rbtn.style.display = '';
+      rbtn.textContent = 'Restart HA-MCP Server';
+      if (noticeEl) {
+        noticeEl.textContent =
+          '⚠ Changes saved. Click "Restart HA-MCP Server" (reloads the ' +
+          'in-process server integration) for them to take effect. ' +
+          'Disabled tools will be fully removed from the MCP tool list on ' +
+          'next startup. Then refresh the tool list in your AI client — ' +
+          'e.g. refresh tool list on claude.ai, re-add or refresh the ' +
+          'connector in ChatGPT, or close and reopen Claude Desktop.';
+      }
     } else if (info.is_sidecar) {
       if (noticeEl) {
         noticeEl.textContent =
@@ -414,7 +430,7 @@ async function _runRestartReloadCycle(previousInstanceId) {
 async function restartAddon() {
   if (restartInProgress) return;
   const btn = document.getElementById('restartBtn');
-  if (!confirm('Restart the App (add-on) now? The page will reload automatically once the App (add-on) is back online.')) return;
+  if (!confirm('Restart HA-MCP now? The page will reload automatically once it is back online.')) return;
   restartInProgress = true;
   btn.disabled = true;
   btn.textContent = 'Restarting…';
@@ -2946,6 +2962,7 @@ const ADVANCED_FIELD_META = {
   code_mode_max_invocations: { label: "Code-mode max invocations",    help: "API/tool-call cap per sandbox run. Restart required." },
   code_mode_saved_tools_path:{ label: "Saved-tools path",              help: "JSON file where ha_manage_custom_tool persists saved tools across restarts. Restart required." },
   sidecar_pin_port:    { label: "Settings UI sidecar port",    help: "0 = a new free port each restart (default); set 1024–65535 to pin a fixed port so the settings URL stays stable across restarts. Falls back to a free port if the pinned one is busy. Restart required." },
+  enable_dev_mode:     { label: "Developer mode",               help: "⚠ DANGER: registers hidden developer tools (ha_dev_manage_server, ha_dev_manage_settings) that let AI agents change server settings and replace the running server version (e.g. install a PR build). For development and testing only. Restart required." },
 };
 
 // Fields that require an MCP-host restart to take effect when changed
@@ -2974,6 +2991,9 @@ const ADVANCED_RESTART_REQUIRED = new Set([
   // The sidecar binds its port once at spawn (run_main), so changing the
   // pin needs a restart to respawn the sidecar on the new port.
   "sidecar_pin_port",
+  // Dev-mode tools register at startup; toggling needs a restart to
+  // (un)register them.
+  "enable_dev_mode",
 ]);
 
 let _advancedFields = [];
@@ -3039,6 +3059,7 @@ async function loadAdvancedSettings() {
   renderAdvancedSection('advToolsSurface', bySection.tools_surface || []);
   renderAdvancedSection('advDiagnostics', bySection.diagnostics || []);
   renderAdvancedSection('advSidecar', bySection.sidecar || []);
+  renderAdvancedSection('advDeveloper', bySection.developer || []);
   applySidecarAvailability(data.is_stdio !== false);
   // Re-render feature flags so the code_mode sub-numerics show up
   // beneath enable_code_mode (race: loadFeatureFlags may have run
@@ -3138,6 +3159,19 @@ function renderAdvancedSection(containerId, fields) {
       const fname = input.dataset.advField;
       const f = _advancedFields.find(x => x.field === fname);
       if (!f) return;
+      // Dev mode arms tools that can rewrite server settings and swap
+      // the running server version — confirm before enabling, matching
+      // the stopSidecar / restart danger-action convention.
+      if (fname === 'enable_dev_mode' && input.checked && !confirm(
+        '⚠ Enable developer mode?\n\n'
+        + 'After the next restart, hidden developer tools are exposed to '
+        + 'connected AI agents. They can change server settings and '
+        + 'replace the running server version. Only enable this for '
+        + 'development and testing.'
+      )) {
+        input.checked = false;
+        return;
+      }
       let v;
       if (input.type === 'checkbox') v = input.checked;
       else if (input.type === 'number') v = (f.type === 'float') ? parseFloat(input.value) : parseInt(input.value, 10);

{ha_mcp_dev-7.10.0.dev779 → ha_mcp_dev-7.11.0.dev1825}/src/ha_mcp/tools/tools_bug_report.py

@@ -5,11 +5,14 @@ This module provides a tool to collect diagnostic information and guide users
 on how to create effective bug reports.
 """
 
+import asyncio
+import importlib
 import logging
 import os
 import platform
 import re
 import sys
+import time
 from pathlib import Path
 from typing import Annotated, Any
 from urllib.parse import quote_plus
@@ -21,7 +24,7 @@ from pydantic import Field
 
 from ha_mcp import __version__
 
-from .._version import is_running_in_addon
+from .._version import get_version, is_embedded, is_running_in_addon
 from ..client.supervisor_client import make_supervisor_httpx_client
 from ..config import Settings, get_global_settings
 from ..utils.usage_logger import (
@@ -72,21 +75,28 @@ def _detect_installation_method() -> str:
     """
     Detect how ha-mcp was installed.
 
-    Returns one of: pyinstaller, addon, docker, git, pypi, unknown
+    Returns one of: pyinstaller, embedded, addon, docker, git, pypi, unknown
     """
     # 1. PyInstaller binary
     if getattr(sys, "frozen", False):
         return "pyinstaller"
 
-    # 2. Home Assistant Add-on (has supervisor token)
+    # 2. In-process server inside HA core (the ha_mcp_tools custom
+    #    component's "server" entry). Checked BEFORE the docker probe: the
+    #    HA core container carries /.dockerenv, so without this branch
+    #    embedded installs misreport as plain docker.
+    if is_embedded():
+        return "embedded"
+
+    # 3. Home Assistant Add-on (has supervisor token)
     if is_running_in_addon():
         return "addon"
 
-    # 3. Docker container (non-addon)
+    # 4. Docker container (non-addon)
     if Path("/.dockerenv").exists():
         return "docker"
 
-    # 4. Git clone - check for .git directory relative to package
+    # 5. Git clone - check for .git directory relative to package
     try:
         # Go up from tools_bug_report.py -> tools -> ha_mcp -> src -> project_root
         project_root = Path(__file__).parent.parent.parent.parent
@@ -97,7 +107,7 @@ def _detect_installation_method() -> str:
         # fall through to the next detection heuristic.
         pass
 
-    # 5. PyPI install - marker file exists in package
+    # 6. PyPI install - marker file exists in package
     try:
         marker_path = Path(__file__).parent.parent / "_pypi_marker"
         if marker_path.exists():
@@ -107,10 +117,62 @@ def _detect_installation_method() -> str:
         # fall through to the default "unknown" result.
         pass
 
-    # 6. Default - unknown
+    # 7. Default - unknown
     return "unknown"
 
 
+def _detect_installed_version() -> str | None:
+    """Return the ha-mcp version installed ON DISK right now.
+
+    ``__version__`` is frozen when the process first imports ha_mcp, so after
+    an in-place update the running process keeps reporting the old version
+    while the disk already carries the new one. Reporting both (plus
+    ``version_mismatch``) turns a "which server am I talking to" hunt into a
+    single tool call.
+    """
+    try:
+        importlib.invalidate_caches()
+        return get_version()
+    except Exception as e:
+        logger.info("Installed-version probe failed: %s", e)
+        return None
+
+
+def _instance_identity() -> dict[str, Any]:
+    """Return process identity (id, start time, uptime).
+
+    Mirrors the ``/api/settings/info`` fields so a report and the web UI can
+    be matched to the same (or different) server process.
+    """
+    from ..settings_ui import _PROCESS_INSTANCE_ID, _PROCESS_STARTED_AT
+
+    return {
+        "instance_id": _PROCESS_INSTANCE_ID,
+        "started_at": _PROCESS_STARTED_AT,
+        "uptime_seconds": round(time.time() - _PROCESS_STARTED_AT, 1),
+    }
+
+
+def _format_version_value(diagnostic_info: dict[str, Any]) -> str:
+    """Render the version for report surfaces, flagging a stale worker.
+
+    A failed installed-version probe must stay distinguishable from
+    "checked, versions match" — otherwise the exact stale-worker
+    condition this field exists to expose disappears whenever the probe
+    itself hiccups.
+    """
+    running = diagnostic_info.get("ha_mcp_version", "Unknown")
+    installed = diagnostic_info.get("installed_version")
+    if diagnostic_info.get("version_mismatch"):
+        return (
+            f"{running} (running) — {installed} is installed; "
+            "restart to finish applying the update"
+        )
+    if installed is None:
+        return f"{running} (installed-on-disk version could not be verified)"
+    return str(running)
+
+
 def _detect_platform() -> dict[str, str]:
     """Detect platform information."""
     return {
@@ -473,7 +535,8 @@ def _build_formatted_report(
     report_lines = [
         "=== ha-mcp Bug Report Info ===",
         "",
-        f"ha-mcp Version: {diagnostic_info['ha_mcp_version']}",
+        f"ha-mcp Version: {_format_version_value(diagnostic_info)}",
+        f"Custom Component: {diagnostic_info.get('component_version') or 'not detected (not installed, or probe failed)'}",
         f"Installation Method: {diagnostic_info['installation_method']}",
         f"MCP Transport: {mcp_transport}",
         f"MCP Client: {_format_client_info_for_template(client_info)}",
@@ -518,6 +581,27 @@ class BugReportTools:
     def __init__(self, client: Any) -> None:
         self._client = client
 
+    async def _detect_component_version(self) -> str | None:
+        """Read the ha_mcp_tools custom component's version, best-effort.
+
+        Uses the component's ``get_caller_token`` bootstrap service, whose
+        response carries the manifest version (the same field the filesystem
+        tools' version gate reads). Returns None when the component is not
+        installed or the call fails — the report path must never break on it.
+        """
+        try:
+            resp = await self._client.call_service(
+                "ha_mcp_tools", "get_caller_token", {}, return_response=True
+            )
+            payload = (
+                resp.get("service_response", resp) if isinstance(resp, dict) else {}
+            )
+            version = payload.get("version") if isinstance(payload, dict) else None
+            return str(version) if version else None
+        except Exception as e:
+            logger.info("Component version probe failed: %s", e)
+            return None
+
     @tool(
         name="ha_report_issue",
         tags={"Utilities"},
@@ -592,9 +676,17 @@ class BugReportTools:
         config_toggles = _get_config_toggles()
         mcp_transport = _detect_mcp_transport()
         client_info = _extract_client_info(ctx)
+        installed_version = await asyncio.to_thread(_detect_installed_version)
+        component_version = await self._detect_component_version()
 
         diagnostic_info: dict[str, Any] = {
             "ha_mcp_version": __version__,
+            "installed_version": installed_version,
+            "version_mismatch": bool(
+                installed_version and installed_version != __version__
+            ),
+            "component_version": component_version,
+            "instance": _instance_identity(),
             "installation_method": install_method,
             "platform": platform_info,
             "mcp_transport": mcp_transport,
@@ -1093,7 +1185,8 @@ ha_call_service(domain="light", service="turn_on", entity_id="light.example")
 
 ## 🔧 Environment
 
-- **ha-mcp Version:** {diagnostic_info.get("ha_mcp_version", "Unknown")}
+- **ha-mcp Version:** {_format_version_value(diagnostic_info)}
+- **Custom Component:** {diagnostic_info.get("component_version") or "not detected (not installed, or probe failed)"}
 - **Installation Method:** {diagnostic_info.get("installation_method", "Unknown")}
 - **MCP Transport:** {mcp_transport} _(auto-detected — correct if wrong)_
 - **MCP Client:** {_format_client_info_for_template(client_info)} _(auto-detected from the MCP `initialize` handshake)_
@@ -1257,7 +1350,8 @@ def _generate_agent_behavior_template(
 
 ## 📊 Environment
 
-- **ha-mcp Version:** {diagnostic_info.get("ha_mcp_version", "Unknown")}
+- **ha-mcp Version:** {_format_version_value(diagnostic_info)}
+- **Custom Component:** {diagnostic_info.get("component_version") or "not detected (not installed, or probe failed)"}
 - **Installation Method:** {diagnostic_info.get("installation_method", "Unknown")}
 - **MCP Transport:** {mcp_transport} _(auto-detected — correct if wrong)_
 - **MCP Client:** {_format_client_info_for_template(client_info)} _(auto-detected from the MCP `initialize` handshake)_