ha-mcp-dev 8.4.3.dev2542__tar.gz → 8.4.3.dev2544__tar.gz

{ha_mcp_dev-8.4.3.dev2542/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.4.3.dev2544}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.4.3.dev2542
+Version: 8.4.3.dev2544
 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.dev2542 → ha_mcp_dev-8.4.3.dev2544}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.4.3.dev2542"
+version = "8.4.3.dev2544"
 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.4.3.dev2542 → ha_mcp_dev-8.4.3.dev2544}/src/ha_mcp/backup_manager.py

@@ -7,7 +7,11 @@ Storage path resolution
 -----------------------
 ``Settings.auto_backup_dir`` overrides; otherwise defaults to
 ``/data/ha_mcp_backups`` in the add-on (SUPERVISOR_TOKEN set + ``/data``
-exists), else ``${XDG_DATA_HOME:-~/.local/share}/ha_mcp/backups``.
+exists), else ``<data dir>/backups`` where the data dir is what
+``utils.data_paths.get_data_dir`` resolves (``HA_MCP_CONFIG_DIR``,
+``~/.ha-mcp``, or the tmpdir fallback). Installs that still hold snapshots
+under the pre-#2372 default ``${XDG_DATA_HOME:-~/.local/share}/ha_mcp/backups``
+keep using that directory; see ``_resolve_default_dir``.
 
 File format
 -----------
@@ -55,6 +59,7 @@ import yaml  # type: ignore[import-untyped]
 from fastmcp.exceptions import ToolError
 
 from .client.rest_client import HomeAssistantConnectionError, HomeAssistantError
+from .utils.data_paths import get_data_dir
 
 logger = logging.getLogger(__name__)
 
@@ -263,17 +268,60 @@ def _now_iso() -> str:
     return datetime.now(UTC).isoformat()
 
 
-def _resolve_default_dir() -> Path:
-    """Pick a sane default backup directory for the current deployment mode."""
-    # Addon detection: Supervisor sets SUPERVISOR_TOKEN AND /data exists.
-    if os.environ.get("SUPERVISOR_TOKEN") and Path("/data").is_dir():
-        return Path("/data/ha_mcp_backups")
+# Add-on default. Named in the add-on option descriptions, so it stays put.
+_ADDON_BACKUP_DIR = Path("/data/ha_mcp_backups")
+
+
+def _legacy_default_dir() -> Path:
+    """The non-add-on default before #2372: XDG user-data, outside the data dir."""
     xdg = os.environ.get("XDG_DATA_HOME")
     if xdg:
         return Path(xdg) / "ha_mcp" / "backups"
     return (Path.home() / ".local" / "share" / "ha_mcp" / "backups").resolve()
 
 
+def _holds_files(path: Path) -> bool:
+    """Whether ``path`` is a directory with at least one entry.
+
+    An unreadable or missing directory counts as empty: nothing in it can be
+    listed or restored from, so there is nothing to keep using.
+    """
+    try:
+        return any(path.iterdir())
+    except OSError:
+        return False
+
+
+def _resolve_default_dir() -> Path:
+    """Pick a sane default backup directory for the current deployment mode.
+
+    Add-on (Supervisor sets ``SUPERVISOR_TOKEN`` and ``/data`` exists):
+    ``/data/ha_mcp_backups``. Otherwise ``backups/`` inside the data dir, the
+    directory that already holds the settings and that every documented
+    Docker recipe persists as the ``ha-mcp-data`` volume. The previous default,
+    ``${XDG_DATA_HOME:-~/.local/share}/ha_mcp/backups``, sat outside that
+    volume: under a ``read_only`` root it was EROFS, which fails the mandatory
+    pre-write snapshots closed, and on a writable root the snapshots were
+    discarded with the container (#2372).
+
+    An install that already holds snapshots under the previous default keeps
+    using it so its restore points stay listed and rotation keeps counting
+    them; only installs with nothing there move to the data dir.
+    """
+    if os.environ.get("SUPERVISOR_TOKEN") and _ADDON_BACKUP_DIR.parent.is_dir():
+        return _ADDON_BACKUP_DIR
+    legacy = _legacy_default_dir()
+    if _holds_files(legacy):
+        logger.info(
+            "Auto-backup: keeping existing backup dir %s (new installs default "
+            "to %s; set HAMCP_BACKUP_DIR to choose explicitly)",
+            legacy,
+            get_data_dir() / "backups",
+        )
+        return legacy
+    return get_data_dir() / "backups"
+
+
 # Sentinel returned by ``BackupManager._fetch_config_for_snapshot`` when there
 # is nothing to snapshot — a handled transient fetch failure (already logged),
 # or a None config for an entity that did not exist. Distinct from any real

{ha_mcp_dev-8.4.3.dev2542 → ha_mcp_dev-8.4.3.dev2544}/src/ha_mcp/config.py

@@ -400,7 +400,7 @@ class Settings(BaseSettings):
 
     # Backup directory override. Empty ("") resolves at runtime to a
     # deployment-mode default: ``/data/ha_mcp_backups`` in the add-on,
-    # otherwise ``${XDG_DATA_HOME:-~/.local/share}/ha_mcp/backups``.
+    # otherwise ``<data dir>/backups`` (see ``backup_manager._resolve_default_dir``).
     auto_backup_dir: str = Field("", alias="HAMCP_BACKUP_DIR")
 
     # Calendar event backups query an ahead-of-now window to locate the
@@ -776,8 +776,8 @@ FEATURE_FLAG_FIELDS: tuple[FeatureFlagField, ...] = (
 )
 
 # Override-file location is the same data dir that holds tool_config.json
-# (resolved via ``utils.data_paths.get_data_dir`` — addon ``/data``,
-# ``HA_MCP_CONFIG_DIR``, ``XDG_DATA_HOME``, or a tmpdir fallback).
+# (resolved via ``utils.data_paths.get_data_dir`` — ``HA_MCP_CONFIG_DIR``,
+# addon ``/data``, ``~/.ha-mcp``, or a tmpdir fallback).
 # Imported lazily inside helpers to avoid a circular import at module
 # load.
 _FEATURE_FLAG_OVERRIDE_FILENAME = "feature_flags.json"
@@ -1656,8 +1656,8 @@ BACKUP_OVERRIDE_FIELDS: tuple[BackupOverrideField, ...] = (
 )
 
 # Override-file location is the same data dir that holds tool_config.json
-# (resolved via ``utils.data_paths.get_data_dir`` — addon ``/data``,
-# ``HA_MCP_CONFIG_DIR``, ``XDG_DATA_HOME``, or a tmpdir fallback).
+# (resolved via ``utils.data_paths.get_data_dir`` — ``HA_MCP_CONFIG_DIR``,
+# addon ``/data``, ``~/.ha-mcp``, or a tmpdir fallback).
 # Imported lazily inside helpers to avoid a circular import at module
 # load (``utils.data_paths`` imports from ``_version`` which imports
 # from ``config`` transitively in some test layouts).

{ha_mcp_dev-8.4.3.dev2542 → ha_mcp_dev-8.4.3.dev2544}/src/ha_mcp/settings_ui/locales/en.json

@@ -251,7 +251,7 @@
     "backup.fields.auto_backup_retain_per_entity.label": "Retain per entity",
     "backup.fields.auto_backup_retain_per_entity.help": "Maximum snapshots kept per entity (1–10000). Older ones rotate out.",
     "backup.fields.auto_backup_dir.label": "Backup directory override",
-    "backup.fields.auto_backup_dir.help": "Leave empty to use the default directory; otherwise enter an absolute path.",
+    "backup.fields.auto_backup_dir.help": "Leave empty for the default: /data/ha_mcp_backups in the App (add-on), otherwise the backups/ subdirectory of the ha-mcp data directory; an install that already holds snapshots under the earlier default keeps using it. The directory in use is shown in the backup status. Or enter an absolute path.",
     "backup.fields.auto_backup_calendar_lookahead_days.label": "Calendar lookahead (days)",
     "backup.fields.auto_backup_calendar_lookahead_days.help": "How far ahead to query calendar events for pre-edit snapshots. Range 1–365.",
     "backup.fields.enable_snapshot_delete.label": "Allow snapshot deletion",

{ha_mcp_dev-8.4.3.dev2542 → ha_mcp_dev-8.4.3.dev2544}/src/ha_mcp/settings_ui/settings.js

@@ -1438,7 +1438,7 @@ const BACKUP_FIELD_LABELS = {
   },
   auto_backup_dir: {
     label: 'Backup directory override',
-    help: 'Empty = default (/data/ha_mcp_backups in the App (add-on), $XDG_DATA_HOME/ha_mcp/backups otherwise). Override with an absolute path.',
+    help: 'Leave empty for the default: /data/ha_mcp_backups in the App (add-on), otherwise the backups/ subdirectory of the ha-mcp data directory; an install that already holds snapshots under the earlier default keeps using it. The directory in use is shown in the backup status. Or enter an absolute path.',
   },
   auto_backup_calendar_lookahead_days: {
     label: 'Calendar lookahead (days)',

{ha_mcp_dev-8.4.3.dev2542 → ha_mcp_dev-8.4.3.dev2544/src/ha_mcp_dev.egg-info}/PKG-INFO

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