ha-mcp-dev 7.4.1.dev484__py3-none-any.whl → 7.4.1.dev485__py3-none-any.whl

ha_mcp/tools/backup.py

@@ -52,6 +52,67 @@ def _get_backup_hint_text() -> str:
     return hints.get(hint, hints["normal"])
 
 
+async def _get_local_backup_agent_id(
+    ws_client: HomeAssistantWebSocketClient,
+) -> str:
+    """Discover the local backup agent_id at call time.
+
+    HA Supervised registers ``hassio.local`` and HA Core registers
+    ``backup.local`` — both have ``name: "local"``. Hardcoding either breaks
+    the other deployment. We probe ``backup/agents/info`` and pick the agent
+    whose name is exactly ``"local"``, preferring ``hassio.local`` if both
+    happen to be registered.
+
+    Raises ToolError if no local agent is available.
+    """
+    response = await ws_client.send_command("backup/agents/info")
+    if not response.get("success"):
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.SERVICE_CALL_FAILED,
+                "Failed to enumerate backup agents",
+                context={"details": response},
+            )
+        )
+
+    agents = response.get("result", {}).get("agents", [])
+    if not agents:
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.SERVICE_CALL_FAILED,
+                "No backup agents registered with Home Assistant",
+                suggestions=[
+                    "The HA backup integration may not be fully set up; "
+                    "check the backup panel in Home Assistant",
+                ],
+            )
+        )
+
+    local_agents: list[str] = [
+        a["agent_id"]
+        for a in agents
+        if a.get("name") == "local" and a.get("agent_id")
+    ]
+    # Prefer hassio.local (Supervisor) over backup.local (Core) when both exist
+    for preferred in ("hassio.local", "backup.local"):
+        if preferred in local_agents:
+            return preferred
+    if local_agents:
+        return local_agents[0]
+
+    raise_tool_error(
+        create_error_response(
+            ErrorCode.SERVICE_CALL_FAILED,
+            "No local backup agent found",
+            context={"available_agents": [a.get("agent_id") for a in agents if a.get("agent_id")]},
+            suggestions=[
+                "Backup creation requires a local agent (hassio.local on "
+                "Supervised, backup.local on Core); none is registered",
+            ],
+        )
+    )
+
+
 async def _get_backup_password(
     ws_client: HomeAssistantWebSocketClient,
 ) -> str:
@@ -94,9 +155,14 @@ async def _poll_backup_completion(
     backup_job_id: str,
     max_wait_seconds: int,
     poll_interval: int,
+    agent_id: str,
 ) -> dict[str, Any]:
     """Poll backup/info until the named backup completes, fails, or times out.
 
+    ``agent_id`` is the local agent that owns this backup (e.g.
+    ``hassio.local`` on Supervised, ``backup.local`` on Core); used to look
+    up the per-agent size in the backup-info payload.
+
     Raises ToolError on backup failure or timeout.
     """
     waited = 0
@@ -134,7 +200,7 @@ async def _poll_backup_completion(
                         "name": name,
                         "date": created_backup.get("date"),
                         "size_bytes": created_backup.get("agents", {})
-                        .get("hassio.local", {})
+                        .get(agent_id, {})
                         .get("size"),
                         "status": "Backup completed successfully",
                         "duration_seconds": waited,
@@ -192,19 +258,31 @@ async def create_backup(
         # Get backup password (raises ToolError on failure)
         password = await _get_backup_password(ws_client)
 
+        # Discover the local backup agent at call time. HA Core registers
+        # `backup.local`; HA Supervised registers `hassio.local`. Hardcoding
+        # either breaks the other deployment.
+        local_agent = await _get_local_backup_agent_id(ws_client)
+
         # Generate backup name if not provided
         if not name:
             now = datetime.now()
             name = f"MCP_Backup_{now.strftime('%Y-%m-%d_%H:%M:%S')}"
 
-        # Create backup request
+        # Addons + addon folders are Supervisor concepts — HA Core errors
+        # with "Addons and folders are not supported by core backup" if we
+        # ask for them. Toggle off when we detect the Core local agent.
+        is_supervised = local_agent == "hassio.local"
+        logger.info(
+            f"Detected {'Supervised' if is_supervised else 'Core'} install "
+            f"via backup agent '{local_agent}'"
+        )
         backup_params = {
             "name": name,
             "password": password,
-            "agent_ids": ["hassio.local"],  # Local only
+            "agent_ids": [local_agent],
             "include_homeassistant": True,
             "include_database": False,  # Fast backup
-            "include_all_addons": True,
+            "include_all_addons": is_supervised,
         }
 
         # Send backup request
@@ -225,6 +303,7 @@ async def create_backup(
             backup_job_id,
             max_wait_seconds=_BACKUP_MAX_WAIT_S,
             poll_interval=_BACKUP_POLL_INTERVAL_S,
+            agent_id=local_agent,
         )
 
     except ToolError:
@@ -248,9 +327,13 @@ async def create_backup(
 async def _create_safety_backup(
     ws_client: HomeAssistantWebSocketClient,
     password: str | None,
+    agent_id: str,
 ) -> str | None:
     """Create a pre-restore safety backup.
 
+    ``agent_id`` is the local backup agent (Supervisor's ``hassio.local`` or
+    Core's ``backup.local``) discovered by the caller.
+
     Returns the safety backup ID, or None when password is None (backup intentionally
     skipped). Raises ToolError if backup creation fails.
     """
@@ -260,14 +343,16 @@ async def _create_safety_backup(
     now = datetime.now()
     safety_backup_name = f"PreRestore_Safety_{now.strftime('%Y-%m-%d_%H:%M:%S')}"
 
+    # include_all_addons is a Supervisor concept; HA Core rejects it.
+    is_supervised = agent_id == "hassio.local"
     safety_backup = await ws_client.send_command(
         "backup/generate",
         name=safety_backup_name,
         password=password,
-        agent_ids=["hassio.local"],
+        agent_ids=[agent_id],
         include_homeassistant=True,
         include_database=True,
-        include_all_addons=True,
+        include_all_addons=is_supervised,
     )
 
     if not safety_backup.get("success"):
@@ -330,6 +415,11 @@ async def restore_backup(
                 suggestions=["Use ha_backup_list() to see available backups"],
             ))
 
+        # Discover the local backup agent (Supervisor's hassio.local on
+        # Supervised, backup.local on Core). Used for both the safety backup
+        # and the restore call below.
+        local_agent = await _get_local_backup_agent_id(ws_client)
+
         # Create safety backup BEFORE restoring
         logger.info("Creating safety backup before restore...")
         try:
@@ -339,12 +429,12 @@ async def restore_backup(
             logger.warning("No default password - proceeding without safety backup")
             password = None
 
-        safety_backup_id = await _create_safety_backup(ws_client, password)
+        safety_backup_id = await _create_safety_backup(ws_client, password, local_agent)
 
         # Perform restore
         restore_params = {
             "backup_id": backup_id,
-            "agent_id": "hassio.local",
+            "agent_id": local_agent,
             "restore_database": restore_database,
             "restore_homeassistant": True,
             "restore_addons": [],  # Restore all addons from backup
@@ -409,7 +499,7 @@ def register_backup_tools(mcp: "FastMCP", client: HomeAssistantClient, **kwargs:
 
 **Password:** Uses Home Assistant's default backup password (if configured)
 
-**Storage:** Local only (hassio.local agent)
+**Storage:** Local only (the local backup agent — `hassio.local` on HA Supervised, `backup.local` on HA Core)
 
 **Duration:** Typically takes several seconds to complete (without database)
 

{ha_mcp_dev-7.4.1.dev484.dist-info → ha_mcp_dev-7.4.1.dev485.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev484
+Version: 7.4.1.dev485
 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.dev484.dist-info → ha_mcp_dev-7.4.1.dev485.dist-info}/RECORD

@@ -37,7 +37,7 @@ ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/h
 ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/safe-refactoring.md,sha256=RVkY-J-ZrBDDD3INHwbbkkPocukDgNg8eOuApswRlqk,8014
 ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/template-guidelines.md,sha256=rrcM8KrJ0hZw1jd4PPsVnE4rTFnsA1uA7SgltVjewkw,17856
 ha_mcp/tools/__init__.py,sha256=79ML0aicKZ5WJQn47eTPaeQntJZe1Mzt30E31_v6tXU,334
-ha_mcp/tools/backup.py,sha256=Avjsural4Y3Nvi73yOT-1dyAarXELEuti4xK0j4bZhI,18628
+ha_mcp/tools/backup.py,sha256=vLOhHeyGztcWTanlpQJHJ64kRO9mqO_fbHSUWQbCkaM,22311
 ha_mcp/tools/best_practice_checker.py,sha256=S0Hfe0aInzxE7-TfccLFOhzFK52uoBDMjVAj4y_lVBQ,25752
 ha_mcp/tools/device_control.py,sha256=zBH5fowdvGLwa6FiaiSOfuNIWGPyZAOT7pmmnyEqaaY,32493
 ha_mcp/tools/enhanced.py,sha256=plvrTJmuAJ-55M0yznEq1Vv5TFDl_2FgegTYK7RaLC8,6668
@@ -93,12 +93,12 @@ ha_mcp/utils/kill_signal_diagnostics.py,sha256=PyoRIm9xJ36iiRtTaVKxfXAKlylytSx0z
 ha_mcp/utils/operation_manager.py,sha256=1ETI_L2TFNhnJUUJwtuH4R0s6ZP3_rscIOfdehYSmkU,14266
 ha_mcp/utils/python_sandbox.py,sha256=lPWqbrqTrJJb4RIQmWKaoADeUeyIRCQ4SF0tw4pXvNs,18566
 ha_mcp/utils/usage_logger.py,sha256=YDUJqaz9oLQVOH8Lkhwki2sn8WzD63I2s6jqeLdix6c,10021
-ha_mcp_dev-7.4.1.dev484.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
+ha_mcp_dev-7.4.1.dev485.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
 tests/__init__.py,sha256=YRpec-ZFYCJ48oD_7ZcNY7dB8avoTWOrZICjaM-BYJ0,39
 tests/test_constants.py,sha256=bnqo5-cmXcJvJPsA8RezDljGwlRSoXW4Ecwj0h1_INM,876
 tests/test_env_manager.py,sha256=fcaFelaWA5c52vvwJ1IBvoBb6PMhDNrwv4H38x3j9Do,11948
-ha_mcp_dev-7.4.1.dev484.dist-info/METADATA,sha256=l26QAmwLivep1jc8uQkxrSpyQ-Nv0gnbGrDn4mgyc-k,21269
-ha_mcp_dev-7.4.1.dev484.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-ha_mcp_dev-7.4.1.dev484.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
-ha_mcp_dev-7.4.1.dev484.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
-ha_mcp_dev-7.4.1.dev484.dist-info/RECORD,,
+ha_mcp_dev-7.4.1.dev485.dist-info/METADATA,sha256=1V65aKWMGzt90vNEs2gOvxLBwrZ-SVLOVrEUVjOM_7g,21269
+ha_mcp_dev-7.4.1.dev485.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+ha_mcp_dev-7.4.1.dev485.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
+ha_mcp_dev-7.4.1.dev485.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
+ha_mcp_dev-7.4.1.dev485.dist-info/RECORD,,