add 0.6.6

CHANGELOG.md

@@ -11,6 +11,58 @@ Sections:
 
 ---
 
+## [0.6.6] - 2026-01-18
+
+### Added
+- Source filter to limit repositories by origin: BCS Official, HACS, or Custom.
+- Visual source badges for repositories (BCS Official, HACS, Custom).
+- Restored HACS enable/disable toggle in the Store UI.
+
+### Changed
+- HACS repositories now display human-readable names and descriptions based on official HACS metadata.
+- Improved Store usability on mobile devices by fixing back navigation from repository detail view.
+
+### Fixed
+- Fixed missing HACS toggle after UI updates.
+- Fixed mobile browser back button exiting the Store instead of returning to the repository list.
+
+## [0.6.5] - 2026-01-18
+
+### Added
+- Separate handling of HACS official repositories with an enable/disable toggle in the Store UI.
+- HACS repositories are now loaded independently from the main store index.
+
+### Changed
+- Store index can remain minimal and curated; HACS repositories are no longer required in store.yaml.
+- Improved Store performance and clarity by clearly separating repository sources.
+
+### Fixed
+- Browser cache issues resolved by proper panel cache-busting for UI updates.
+
+### Internal
+- No changes to install, update, backup, or restore logic.
+- Fully backward compatible with existing installations and configurations.
+
+## [0.6.4] - 2026-01-18
+
+### Fixed
+- Fixed long Home Assistant startup times caused by background repository enrichment running too early.
+
+### Changed
+- Background repository enrichment is now started only after Home Assistant has fully started.
+- Repository cache updates now run fully asynchronous without blocking Home Assistant startup.
+
+### Internal
+- Improved alignment with Home Assistant startup lifecycle.
+- No functional changes to store behavior or UI.
+
+## [0.6.3] - 2026-01-18
+
+### Changed
+- Improved Store performance for large indexes by avoiding full metadata enrichment during list refresh.
+- Repository details are loaded on demand, reducing initial load time and network requests.
+- Index refresh is skipped when the index content has not changed.
+
 ## [0.6.2] - 2026-01-18
 
 ### Added

bcs.yaml

@@ -4,7 +4,7 @@ description: >
   Supports GitHub, GitLab, Gitea and Bahmcloud repositories with
   a central index, UI panel and API, similar to HACS but independent.
 
-category: integration
+category: Integrations
 
 author: Bahmcloud
 maintainer: Bahmcloud

custom_components/bahmcloud_store/__init__.py

@@ -5,7 +5,8 @@ from datetime import timedelta
 
 from homeassistant.core import HomeAssistant
 from homeassistant.components.panel_custom import async_register_panel
-from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.event import async_track_time_interval, async_call_later
+from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
 from homeassistant.helpers.discovery import async_load_platform
 
 from .core import BCSCore, BCSConfig, BCSError
@@ -34,8 +35,10 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
     from .views import (
         StaticAssetsView,
         BCSApiView,
+        BCSSettingsView,
         BCSReadmeView,
         BCSVersionsView,
+        BCSRepoDetailView,
         BCSCustomRepoView,
         BCSInstallView,
         BCSUpdateView,
@@ -47,8 +50,10 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
 
     hass.http.register_view(StaticAssetsView())
     hass.http.register_view(BCSApiView(core))
+    hass.http.register_view(BCSSettingsView(core))
     hass.http.register_view(BCSReadmeView(core))
     hass.http.register_view(BCSVersionsView(core))
+    hass.http.register_view(BCSRepoDetailView(core))
     hass.http.register_view(BCSCustomRepoView(core))
     hass.http.register_view(BCSInstallView(core))
     hass.http.register_view(BCSUpdateView(core))
@@ -62,17 +67,24 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
         frontend_url_path="bahmcloud-store",
         webcomponent_name="bahmcloud-store-panel",
         # IMPORTANT: bump v to avoid caching old JS
-        module_url="/api/bahmcloud_store_static/panel.js?v=105",
+        module_url="/api/bahmcloud_store_static/panel.js?v=108",
         sidebar_title="Bahmcloud Store",
         sidebar_icon="mdi:store",
         require_admin=True,
         config={},
     )
 
-    try:
+    async def _do_startup_refresh(_now=None) -> None:
-        await core.full_refresh(source="startup")
+        try:
-    except BCSError as e:
+            await core.full_refresh(source="startup")
-        _LOGGER.error("Initial refresh failed: %s", e)
+        except BCSError as e:
+            _LOGGER.error("Initial refresh failed: %s", e)
+
+    # Do not block Home Assistant startup. Schedule the initial refresh after HA started.
+    def _on_ha_started(_event) -> None:
+        async_call_later(hass, 30, _do_startup_refresh)
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, _on_ha_started)
 
     async def periodic(_now) -> None:
         try:

custom_components/bahmcloud_store/core.py

@@ -32,6 +32,12 @@ RESTART_REQUIRED_ISSUE_ID = "restart_required"
 
 BACKUP_META_FILENAME = ".bcs_backup_meta.json"
 
+# Optional HACS integrations index (GitHub repositories only).
+HACS_INTEGRATIONS_URL = "https://data-v2.hacs.xyz/integration/repositories.json"
+HACS_INTEGRATIONS_DATA_URL = "https://data-v2.hacs.xyz/integration/data.json"
+HACS_DEFAULT_CATEGORY = "Integrations"
+HACS_CACHE_TTL_SECONDS = 60 * 60 * 24  # 24h
+
 
 class BCSError(Exception):
     """BCS core error."""
@@ -89,9 +95,20 @@ class BCSCore:
         self.last_index_hash: str | None = None
         self.last_index_loaded_at: float | None = None
 
+        # Fast refresh: skip expensive processing when index/custom repos unchanged
+        self._last_refresh_signature: str | None = None
+
         self._install_lock = asyncio.Lock()
         self._installed_cache: dict[str, Any] = {}
 
+        # Persistent settings (UI toggles etc.)
+        self.settings: dict[str, Any] = {"hacs_enabled": False}
+
+        # Cached HACS metadata (display names/descriptions). Loaded from storage.
+        self._hacs_meta_fetched_at: int = 0
+        self._hacs_meta: dict[str, dict[str, Any]] = {}
+        self._hacs_meta_lock = asyncio.Lock()
+
         # Phase F2: backups before install/update
         self._backup_root = Path(self.hass.config.path(".bcs_backups"))
         self._backup_keep_per_domain: int = 5
@@ -101,9 +118,30 @@ class BCSCore:
         self.version = await self._read_manifest_version_async()
         await self._refresh_installed_cache()
 
+        # Load persistent settings (do not fail startup)
+        try:
+            s = await self.storage.get_settings()
+            if isinstance(s, dict):
+                self.settings.update(s)
+        except Exception:
+            pass
+
         # After a successful HA restart, restart-required is no longer relevant.
         self._clear_restart_required_issue()
 
+        # Load cached HACS metadata (optional; improves UX when HACS toggle is enabled).
+        try:
+            hc = await self.storage.get_hacs_cache()
+            if isinstance(hc, dict):
+                self._hacs_meta_fetched_at = int(hc.get("fetched_at") or 0)
+                repos = hc.get("repos")
+                if isinstance(repos, dict):
+                    # Normalize to string keys
+                    self._hacs_meta = {str(k): (v if isinstance(v, dict) else {}) for k, v in repos.items()}
+        except Exception:
+            self._hacs_meta_fetched_at = 0
+            self._hacs_meta = {}
+
     async def _read_manifest_version_async(self) -> str:
         def _read() -> str:
             try:
@@ -172,17 +210,62 @@ class BCSCore:
         data = (self._installed_cache or {}).get(repo_id)
         return data if isinstance(data, dict) else None
 
+    def get_settings_public(self) -> dict[str, Any]:
+        """Return UI-relevant settings (no I/O)."""
+        return {
+            "hacs_enabled": bool(self.settings.get("hacs_enabled", False)),
+        }
+
+    async def set_settings(self, updates: dict[str, Any]) -> dict[str, Any]:
+        """Persist settings and apply them."""
+        safe_updates: dict[str, Any] = {}
+        if "hacs_enabled" in (updates or {}):
+            safe_updates["hacs_enabled"] = bool(updates.get("hacs_enabled"))
+
+        merged = await self.storage.set_settings(safe_updates)
+        if isinstance(merged, dict):
+            self.settings.update(merged)
+
+        # Reload repo list after changing settings.
+        await self.full_refresh(source="settings")
+        return self.get_settings_public()
+
     async def refresh(self) -> None:
         index_repos, refresh_seconds = await self._load_index_repos()
         self.refresh_seconds = refresh_seconds
 
+        hacs_enabled = bool(self.settings.get("hacs_enabled", False))
+        hacs_repos: list[RepoItem] = []
+        if hacs_enabled:
+            try:
+                hacs_repos = await self._load_hacs_repos()
+            except Exception as e:
+                _LOGGER.warning("BCS HACS index load failed: %s", e)
+
         custom_repos = await self.storage.list_custom_repos()
 
+        # Fast path: if index + custom repos did not change, skip expensive work.
+        try:
+            custom_sig = [(c.id, (c.url or '').strip(), (c.name or '').strip()) for c in (custom_repos or [])]
+            custom_sig.sort()
+            hacs_sig = len(hacs_repos) if hacs_enabled else 0
+            refresh_signature = json.dumps({"index_hash": self.last_index_hash, "custom": custom_sig, "hacs": hacs_sig, "hacs_enabled": hacs_enabled}, sort_keys=True)
+        except Exception:
+            refresh_signature = f"{self.last_index_hash}:{len(custom_repos or [])}:{'h' if hacs_enabled else 'n'}:{len(hacs_repos)}"
+
+        if self._last_refresh_signature and refresh_signature == self._last_refresh_signature and self.repos:
+            _LOGGER.debug("BCS refresh skipped (no changes detected)")
+            return
+
+
         merged: dict[str, RepoItem] = {}
 
         for item in index_repos:
             merged[item.id] = item
 
+        for item in hacs_repos:
+            merged[item.id] = item
+
         for c in custom_repos:
             merged[c.id] = RepoItem(
                 id=c.id,
@@ -194,16 +277,207 @@ class BCSCore:
         for r in merged.values():
             r.provider = detect_provider(r.url)
 
-        await self._enrich_and_resolve(merged)
+        # Apply cached HACS display metadata immediately (fast UX).
+        if hacs_enabled and hacs_repos:
+            self._apply_hacs_meta(merged)
+
+            # Refresh HACS metadata in the background if cache is missing/stale.
+            if self._hacs_meta_needs_refresh():
+                self.hass.async_create_task(self._refresh_hacs_meta_background())
+
+        await self._enrich_installed_only(merged)
         self.repos = merged
 
+        self._last_refresh_signature = refresh_signature
+
         _LOGGER.info(
-            "BCS refresh complete: repos=%s (index=%s, custom=%s)",
+            "BCS refresh complete: repos=%s (index=%s, hacs=%s, custom=%s)",
             len(self.repos),
             len([r for r in self.repos.values() if r.source == "index"]),
+            len([r for r in self.repos.values() if r.source == "hacs"]),
             len([r for r in self.repos.values() if r.source == "custom"]),
         )
 
+    async def _load_hacs_repos(self) -> list[RepoItem]:
+        """Load the official HACS integrations repository list.
+
+        This is used as an optional additional source to keep the local store index small.
+        We only parse owner/repo strings and map them to GitHub URLs.
+        """
+        session = async_get_clientsession(self.hass)
+        headers = {
+            "User-Agent": "BahmcloudStore (Home Assistant)",
+            "Cache-Control": "no-cache, no-store, max-age=0",
+            "Pragma": "no-cache",
+        }
+        async with session.get(HACS_INTEGRATIONS_URL, timeout=60, headers=headers) as resp:
+            if resp.status != 200:
+                raise BCSError(f"HACS index returned {resp.status}")
+            data = await resp.json()
+
+        if not isinstance(data, list):
+            raise BCSError("HACS repositories.json must be a list")
+
+        items: list[RepoItem] = []
+        for entry in data:
+            if not isinstance(entry, str):
+                continue
+            full_name = entry.strip().strip("/")
+            if not full_name or "/" not in full_name:
+                continue
+            repo_id = f"hacs:{full_name.lower()}"
+            owner = full_name.split("/", 1)[0].strip()
+            items.append(
+                RepoItem(
+                    id=repo_id,
+                    # Name is improved later via cached HACS meta (manifest.name).
+                    name=full_name,
+                    url=f"https://github.com/{full_name}",
+                    source="hacs",
+                    owner=owner,
+                    provider_repo_name=full_name,  # keep stable owner/repo reference
+                    meta_category=HACS_DEFAULT_CATEGORY,
+                )
+            )
+        return items
+
+    def _hacs_meta_needs_refresh(self) -> bool:
+        if not self._hacs_meta_fetched_at or not self._hacs_meta:
+            return True
+        age = int(time.time()) - int(self._hacs_meta_fetched_at)
+        return age > HACS_CACHE_TTL_SECONDS
+
+    def _apply_hacs_meta(self, merged: dict[str, RepoItem]) -> None:
+        """Apply cached HACS metadata to matching repos (no I/O)."""
+        if not self._hacs_meta:
+            return
+
+        def _full_name_from_repo(r: RepoItem) -> str | None:
+            # Prefer the original owner/repo (stable) if we kept it.
+            if r.provider_repo_name and "/" in str(r.provider_repo_name):
+                return str(r.provider_repo_name).strip()
+            # Fall back to URL path: https://github.com/owner/repo
+            try:
+                u = urlparse((r.url or "").strip())
+                parts = [p for p in (u.path or "").strip("/").split("/") if p]
+                if len(parts) >= 2:
+                    repo = parts[1]
+                    if repo.endswith(".git"):
+                        repo = repo[:-4]
+                    return f"{parts[0]}/{repo}"
+            except Exception:
+                pass
+            return None
+
+        for r in merged.values():
+            if r.source != "hacs":
+                continue
+
+            key = _full_name_from_repo(r)
+            if not key or "/" not in key:
+                continue
+
+            meta = self._hacs_meta.get(key)
+            if not isinstance(meta, dict) or not meta:
+                continue
+
+            # Prefer HACS manifest name as display name.
+            display_name = meta.get("name")
+            if isinstance(display_name, str) and display_name.strip():
+                r.name = display_name.strip()
+                r.meta_name = display_name.strip()
+
+            desc = meta.get("description")
+            if isinstance(desc, str) and desc.strip():
+                r.meta_description = desc.strip()
+
+            domain = meta.get("domain")
+            # We don't store domain in RepoItem fields, but keep it in meta_source for debugging.
+            # (Optional: extend RepoItem later if needed.)
+            if isinstance(domain, str) and domain.strip():
+                # Keep under meta_source marker to help identify source.
+                pass
+
+            r.meta_source = r.meta_source or "hacs"
+            r.meta_category = r.meta_category or HACS_DEFAULT_CATEGORY
+
+    async def _refresh_hacs_meta_background(self) -> None:
+        """Fetch and cache HACS integration metadata in the background.
+
+        Uses the official HACS data endpoint which includes manifest data.
+        This avoids per-repo GitHub calls and improves the UX (names/descriptions).
+        """
+        async with self._hacs_meta_lock:
+            # Another task might have refreshed already.
+            if not self._hacs_meta_needs_refresh():
+                return
+
+            session = async_get_clientsession(self.hass)
+            headers = {
+                "User-Agent": "BahmcloudStore (Home Assistant)",
+                "Cache-Control": "no-cache, no-store, max-age=0",
+                "Pragma": "no-cache",
+            }
+
+            try:
+                async with session.get(HACS_INTEGRATIONS_DATA_URL, timeout=120, headers=headers) as resp:
+                    if resp.status != 200:
+                        raise BCSError(f"HACS data.json returned {resp.status}")
+                    data = await resp.json()
+            except Exception as e:
+                _LOGGER.warning("BCS HACS meta refresh failed: %s", e)
+                return
+
+            # Build mapping owner/repo -> {name, description, domain}
+            meta_map: dict[str, dict[str, Any]] = {}
+            if isinstance(data, dict):
+                for _, obj in data.items():
+                    if not isinstance(obj, dict):
+                        continue
+                    full_name = obj.get("full_name")
+                    if not isinstance(full_name, str) or "/" not in full_name:
+                        continue
+
+                    manifest = obj.get("manifest")
+                    mname = None
+                    mdesc = None
+                    mdomain = None
+                    if isinstance(manifest, dict):
+                        mname = manifest.get("name")
+                        mdesc = manifest.get("description")
+                        mdomain = manifest.get("domain")
+
+                    entry: dict[str, Any] = {}
+                    if isinstance(mname, str) and mname.strip():
+                        entry["name"] = mname.strip()
+                    if isinstance(mdesc, str) and mdesc.strip():
+                        entry["description"] = mdesc.strip()
+                    if isinstance(mdomain, str) and mdomain.strip():
+                        entry["domain"] = mdomain.strip()
+
+                    if entry:
+                        meta_map[full_name.strip()] = entry
+
+            self._hacs_meta = meta_map
+            self._hacs_meta_fetched_at = int(time.time())
+
+            try:
+                await self.storage.set_hacs_cache({
+                    "fetched_at": self._hacs_meta_fetched_at,
+                    "repos": self._hacs_meta,
+                })
+            except Exception:
+                _LOGGER.debug("Failed to persist HACS cache", exc_info=True)
+
+            # Apply meta to current repos and notify UI.
+            try:
+                self._apply_hacs_meta(self.repos)
+            except Exception:
+                pass
+
+            _LOGGER.info("BCS HACS metadata cached: repos=%s", len(self._hacs_meta))
+            self.signal_updated()
+
     async def _enrich_and_resolve(self, merged: dict[str, RepoItem]) -> None:
         sem = asyncio.Semaphore(6)
 
@@ -238,6 +512,87 @@ class BCSCore:
 
         await asyncio.gather(*(process_one(r) for r in merged.values()), return_exceptions=True)
 
+
+    async def _enrich_installed_only(self, merged: dict[str, RepoItem]) -> None:
+        """Enrich only installed repos (fast refresh for large indexes).
+
+        This keeps the backend responsive even with thousands of repositories.
+        Details for non-installed repos are fetched on-demand.
+        """
+        installed_map: dict[str, Any] = getattr(self, "_installed_cache", {}) or {}
+        if not isinstance(installed_map, dict) or not installed_map:
+            return
+
+        to_process: list[RepoItem] = []
+        for rid in installed_map.keys():
+            r = merged.get(str(rid))
+            if r:
+                to_process.append(r)
+
+        if not to_process:
+            return
+
+        sem = asyncio.Semaphore(6)
+
+        async def process_one(r: RepoItem) -> None:
+            async with sem:
+                await self._enrich_one_repo(r)
+
+        await asyncio.gather(*(process_one(r) for r in to_process), return_exceptions=True)
+
+    async def _enrich_one_repo(self, r: RepoItem) -> None:
+        """Fetch provider info + metadata for a single repo item."""
+        info: RepoInfo = await fetch_repo_info(self.hass, r.url)
+
+        r.provider = info.provider or r.provider
+        r.owner = info.owner or r.owner
+        r.provider_repo_name = info.repo_name
+        r.provider_description = info.description
+        r.default_branch = info.default_branch or r.default_branch
+
+        r.latest_version = info.latest_version
+        r.latest_version_source = info.latest_version_source
+
+        md: RepoMetadata = await fetch_repo_metadata(self.hass, r.url, r.default_branch)
+        r.meta_source = md.source
+        if md.name:
+            r.meta_name = md.name
+            r.name = md.name
+        r.meta_description = md.description
+        if md.category:
+            r.meta_category = md.category
+        r.meta_author = md.author
+        r.meta_maintainer = md.maintainer
+
+        # Keep a stable name fallback
+        if not r.name:
+            r.name = r.provider_repo_name or r.url
+
+    async def ensure_repo_details(self, repo_id: str) -> RepoItem | None:
+        """Ensure provider/meta/latest fields are loaded for a repo.
+
+        Used by the UI when a repo detail view is opened.
+        """
+        r = self.get_repo(repo_id)
+        if not r:
+            return None
+
+        # If we already have a latest_version (or provider_description), consider it enriched.
+        if r.latest_version or r.provider_description or r.meta_source:
+            return r
+
+        try:
+            await self._enrich_one_repo(r)
+        except Exception:
+            _LOGGER.debug("BCS ensure_repo_details failed for %s", repo_id, exc_info=True)
+        return r
+
+    async def list_repo_versions(self, repo_id: str) -> list[dict[str, Any]]:
+        repo = self.get_repo(repo_id)
+        if not repo:
+            return []
+        return await fetch_repo_versions(self.hass, repo.url)
+
     def _add_cache_buster(self, url: str) -> str:
         parts = urlsplit(url)
         q = dict(parse_qsl(parts.query, keep_blank_values=True))
@@ -329,6 +684,7 @@ class BCSCore:
                         name=name,
                         url=repo_url,
                         source="index",
+                        meta_category=str(r.get("category")) if r.get("category") else None,
                     )
                 )
 

custom_components/bahmcloud_store/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "bahmcloud_store",
   "name": "Bahmcloud Store",
-  "version": "0.6.2",
+  "version": "0.6.6",
   "documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
   "platforms": ["update"],
   "requirements": [],

custom_components/bahmcloud_store/panel/panel.js

@@ -18,6 +18,12 @@ class BahmcloudStorePanel extends HTMLElement {
     this._filter = "all"; // all|installed|not_installed|updates|custom
     this._sort = "az"; // az|updates_first|installed_first
 
+    // Source filter (all|bcs|hacs|custom)
+    this._sourceFilter = "all";
+
+    // HACS toggle (settings)
+    this._hacsEnabled = false;
+
     this._detailRepoId = null;
     this._detailRepo = null;
     this._readmeLoading = false;
@@ -50,6 +56,10 @@ class BahmcloudStorePanel extends HTMLElement {
     this._versionsCache = {}; // repo_id -> [{ref,label,source}, ...]
     this._versionsLoadingRepoId = null;
     this._selectedVersionByRepoId = {}; // repo_id -> ref ("" means latest)
+
+    // History handling (mobile back button should go back to list, not exit panel)
+    this._historyBound = false;
+    this._handlingPopstate = false;
   }
 
   set hass(hass) {
@@ -57,10 +67,43 @@ class BahmcloudStorePanel extends HTMLElement {
     if (!this._rendered) {
       this._rendered = true;
       this._render();
+      this._ensureHistory();
       this._load();
     }
   }
 
+  _ensureHistory() {
+    if (this._historyBound) return;
+    this._historyBound = true;
+
+    try {
+      // Keep an internal history state for this panel.
+      const current = window.history.state || {};
+      if (!current || current.__bcs !== true) {
+        window.history.replaceState({ __bcs: true, view: "store" }, "");
+      }
+    } catch (e) {
+      // ignore
+    }
+
+    window.addEventListener("popstate", (ev) => {
+      const st = ev?.state;
+      if (!st || st.__bcs !== true) return;
+
+      this._handlingPopstate = true;
+      try {
+        const view = st.view || "store";
+        if (view === "detail" && st.repo_id) {
+          this._openRepoDetail(st.repo_id, false);
+        } else {
+          this._closeDetail(false);
+        }
+      } finally {
+        this._handlingPopstate = false;
+      }
+    });
+  }
+
   async _load() {
     if (!this._hass) return;
 
@@ -72,6 +115,12 @@ class BahmcloudStorePanel extends HTMLElement {
       const data = await this._hass.callApi("get", "bcs");
       this._data = data;
 
+      // Persistent settings (e.g. HACS toggle)
+      this._hacsEnabled = !!data?.settings?.hacs_enabled;
+
+      // Sync settings from backend (e.g. HACS toggle)
+      this._hacsEnabled = !!data?.settings?.hacs_enabled;
+
       if (this._view === "detail" && this._detailRepoId && Array.isArray(data?.repos)) {
         const fresh = data.repos.find((r) => this._safeId(r?.id) === this._detailRepoId);
         if (fresh) this._detailRepo = fresh;
@@ -84,6 +133,19 @@ class BahmcloudStorePanel extends HTMLElement {
     }
   }
 
+  async _setSettings(updates) {
+    if (!this._hass) return;
+    try {
+      const resp = await this._hass.callApi("post", "bcs/settings", updates || {});
+      if (resp?.ok) {
+        this._hacsEnabled = !!resp?.settings?.hacs_enabled;
+      }
+    } catch (e) {
+      // Do not fail UI for settings.
+      this._error = e?.message ? String(e.message) : String(e);
+    }
+  }
+
   async _refreshAll() {
     if (!this._hass) return;
     if (this._refreshing) return;
@@ -308,21 +370,15 @@ class BahmcloudStorePanel extends HTMLElement {
   }
 
   _goBack() {
-    if (this._view === "detail") {
-      this._view = "store";
-      this._detailRepoId = null;
-      this._detailRepo = null;
-      this._readmeText = null;
-      this._readmeHtml = null;
-      this._readmeError = null;
-      this._readmeExpanded = false;
-      this._update();
-      return;
-    }
     try {
+      // Prefer browser history so mobile back behaves as expected.
       history.back();
     } catch (_) {
-      window.location.href = "/";
+      if (this._view === "detail") {
+        this._closeDetail(true);
+      } else {
+        window.location.href = "/";
+      }
     }
   }
 
@@ -368,11 +424,15 @@ class BahmcloudStorePanel extends HTMLElement {
     }
   }
 
-  _openRepoDetail(repoId) {
+  _openRepoDetail(repoId, pushHistory = true) {
     const repos = Array.isArray(this._data?.repos) ? this._data.repos : [];
     const repo = repos.find((r) => this._safeId(r?.id) === repoId);
     if (!repo) return;
 
+    if (pushHistory) {
+      this._pushHistory({ view: "detail", repo_id: repoId });
+    }
+
     this._view = "detail";
     this._detailRepoId = repoId;
     this._detailRepo = repo;
@@ -389,10 +449,29 @@ class BahmcloudStorePanel extends HTMLElement {
     }
 
     this._update();
+    this._loadRepoDetails(repoId);
     this._loadReadme(repoId);
     this._loadVersions(repoId);
   }
 
+
+  async _loadRepoDetails(repoId) {
+    if (!this._hass || !repoId) return;
+    try {
+      const resp = await this._hass.callApi("get", `bcs/repo?repo_id=${encodeURIComponent(repoId)}`);
+      if (resp?.ok && resp.repo) {
+        this._detailRepo = resp.repo;
+        // Also update the cached list item if present
+        const repos = Array.isArray(this._data?.repos) ? this._data.repos : [];
+        const idx = repos.findIndex((r) => this._safeId(r?.id) === repoId);
+        if (idx >= 0) repos[idx] = resp.repo;
+        this._update();
+      }
+    } catch (e) {
+      // ignore: details are optional
+    }
+  }
+
   async _loadVersions(repoId) {
     if (!this._hass) return;
     if (!repoId) return;
@@ -542,6 +621,24 @@ class BahmcloudStorePanel extends HTMLElement {
           box-shadow: 0 0 0 2px rgba(30,136,229,.15);
         }
 
+        .toggle{
+          display:inline-flex;
+          align-items:center;
+          gap:8px;
+          padding:10px 12px;
+          border-radius:14px;
+          border:1px solid var(--divider-color);
+          background: var(--card-background-color);
+          color: var(--primary-text-color);
+          user-select:none;
+          cursor:pointer;
+        }
+        .toggle input{
+          margin:0;
+          width:18px;
+          height:18px;
+        }
+
         button{
           padding:10px 12px;
           border-radius:14px;
@@ -840,6 +937,11 @@ class BahmcloudStorePanel extends HTMLElement {
         const cat = this._safeText(r?.category) || "";
         if (this._category !== "all" && this._category !== cat) return false;
 
+        // Source filter
+        if (this._sourceFilter === "bcs" && r?.source !== "index") return false;
+        if (this._sourceFilter === "hacs" && r?.source !== "hacs") return false;
+        if (this._sourceFilter === "custom" && r?.source !== "custom") return false;
+
         const latest = this._safeText(r?.latest_version);
         const installed = this._asBoolStrict(r?.installed);
         const installedVersion = this._safeText(r?.installed_version);
@@ -894,7 +996,11 @@ class BahmcloudStorePanel extends HTMLElement {
         const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
 
         const badges = [];
-        if (r?.source === "custom") badges.push("Custom");
+        // Source badges
+        if (r?.source === "index") badges.push("BCS Official");
+        else if (r?.source === "hacs") badges.push("HACS");
+        else if (r?.source === "custom") badges.push("Custom");
+
         if (installed) badges.push("Installed");
         if (updateAvailable) badges.push("Update");
 
@@ -920,6 +1026,18 @@ class BahmcloudStorePanel extends HTMLElement {
     return `
       <div class="filters">
         <input id="q" placeholder="Search…" value="${this._esc(this._search)}" />
+
+        <label class="toggle" title="Show official HACS repositories">
+          <input id="hacs_toggle" type="checkbox" ${this._hacsEnabled ? "checked" : ""} />
+          <span>HACS</span>
+        </label>
+
+        <select id="src">
+          <option value="all" ${this._sourceFilter === "all" ? "selected" : ""}>All sources</option>
+          <option value="bcs" ${this._sourceFilter === "bcs" ? "selected" : ""}>BCS Official</option>
+          <option value="hacs" ${this._sourceFilter === "hacs" ? "selected" : ""}>HACS</option>
+          <option value="custom" ${this._sourceFilter === "custom" ? "selected" : ""}>Custom</option>
+        </select>
         <select id="cat">
           <option value="all">All categories</option>
           ${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
@@ -953,6 +1071,8 @@ class BahmcloudStorePanel extends HTMLElement {
     const cat = root.getElementById("cat");
     const filter = root.getElementById("filter");
     const sort = root.getElementById("sort");
+    const src = root.getElementById("src");
+    const hacsToggle = root.getElementById("hacs_toggle");
 
     if (q) {
       q.addEventListener("input", (e) => {
@@ -979,12 +1099,51 @@ class BahmcloudStorePanel extends HTMLElement {
       });
     }
 
+    if (src) {
+      src.addEventListener("change", (e) => {
+        this._sourceFilter = e?.target?.value || "all";
+        this._update();
+      });
+    }
+
+    if (hacsToggle) {
+      hacsToggle.addEventListener("change", async (e) => {
+        const enabled = !!e?.target?.checked;
+        this._hacsEnabled = enabled;
+        this._update();
+        await this._setSettings({ hacs_enabled: enabled });
+        await this._load();
+      });
+    }
+
     root.querySelectorAll("[data-open]").forEach((el) => {
       const id = el.getAttribute("data-open");
-      el.addEventListener("click", () => this._openRepoDetail(id));
+      el.addEventListener("click", () => this._openRepoDetail(id, true));
     });
   }
 
+  _pushHistory(state) {
+    if (this._handlingPopstate) return;
+    try {
+      window.history.pushState({ __bcs: true, ...(state || {}) }, "");
+    } catch (e) {
+      // ignore
+    }
+  }
+
+  _closeDetail(pushHistory = true) {
+    this._view = "store";
+    this._detailRepoId = null;
+    this._detailRepo = null;
+    this._readmeText = null;
+    this._readmeHtml = null;
+    this._readmeError = null;
+    this._readmeExpanded = false;
+    this._readmeCanToggle = false;
+    if (pushHistory) this._pushHistory({ view: "store" });
+    this._update();
+  }
+
   _renderAbout() {
     return `
       <div class="card">

custom_components/bahmcloud_store/storage.py

@@ -36,6 +36,8 @@ class BCSStorage:
     Keys:
     - custom_repos: list of manually added repositories
     - installed_repos: mapping repo_id -> installed metadata
+    - settings: persistent user settings (e.g. toggles in the UI)
+    - hacs_cache: cached HACS metadata to improve UX (display names/descriptions)
     """
 
     def __init__(self, hass: HomeAssistant) -> None:
@@ -53,8 +55,54 @@ class BCSStorage:
         if "installed_repos" not in data or not isinstance(data.get("installed_repos"), dict):
             data["installed_repos"] = {}
 
+        if "settings" not in data or not isinstance(data.get("settings"), dict):
+            data["settings"] = {}
+
+        if "hacs_cache" not in data or not isinstance(data.get("hacs_cache"), dict):
+            data["hacs_cache"] = {}
+
         return data
 
+    async def get_hacs_cache(self) -> dict[str, Any]:
+        """Return cached HACS metadata.
+
+        Shape:
+        {
+          "fetched_at": <unix_ts>,
+          "repos": {"owner/repo": {"name": "...", "description": "...", "domain": "..."}}
+        }
+        """
+        data = await self._load()
+        cache = data.get("hacs_cache", {})
+        return cache if isinstance(cache, dict) else {}
+
+    async def set_hacs_cache(self, cache: dict[str, Any]) -> None:
+        """Persist cached HACS metadata."""
+        data = await self._load()
+        data["hacs_cache"] = cache if isinstance(cache, dict) else {}
+        await self._save(data)
+
+    async def get_settings(self) -> dict[str, Any]:
+        """Return persistent settings.
+
+        Currently used for UI/behavior toggles.
+        """
+        data = await self._load()
+        settings = data.get("settings", {})
+        return settings if isinstance(settings, dict) else {}
+
+    async def set_settings(self, updates: dict[str, Any]) -> dict[str, Any]:
+        """Update persistent settings and return the merged settings."""
+        data = await self._load()
+        settings = data.get("settings", {})
+        if not isinstance(settings, dict):
+            settings = {}
+        for k, v in (updates or {}).items():
+            settings[str(k)] = v
+        data["settings"] = settings
+        await self._save(data)
+        return settings
+
     async def _save(self, data: dict[str, Any]) -> None:
         await self._store.async_save(data)
 

custom_components/bahmcloud_store/views.py

@@ -215,7 +215,12 @@ class BCSApiView(HomeAssistantView):
 
     async def get(self, request: web.Request) -> web.Response:
         return web.json_response(
-            {"ok": True, "version": self.core.version, "repos": self.core.list_repos_public()}
+            {
+                "ok": True,
+                "version": self.core.version,
+                "settings": self.core.get_settings_public(),
+                "repos": self.core.list_repos_public(),
+            }
         )
 
     async def post(self, request: web.Request) -> web.Response:
@@ -248,6 +253,37 @@ class BCSApiView(HomeAssistantView):
         return web.json_response({"ok": False, "message": "Unknown operation"}, status=400)
 
 
+class BCSSettingsView(HomeAssistantView):
+    """Persistent UI settings (e.g. toggles)."""
+
+    url = "/api/bcs/settings"
+    name = "api:bcs_settings"
+    requires_auth = True
+
+    def __init__(self, core: Any) -> None:
+        self.core: BCSCore = core
+
+    async def get(self, request: web.Request) -> web.Response:
+        return web.json_response({"ok": True, "settings": self.core.get_settings_public()})
+
+    async def post(self, request: web.Request) -> web.Response:
+        try:
+            data = await request.json()
+        except Exception:
+            data = {}
+
+        updates: dict[str, Any] = {}
+        if "hacs_enabled" in data:
+            updates["hacs_enabled"] = bool(data.get("hacs_enabled"))
+
+        try:
+            settings = await self.core.set_settings(updates)
+            return web.json_response({"ok": True, "settings": settings})
+        except Exception as e:
+            _LOGGER.exception("BCS set settings failed: %s", e)
+            return web.json_response({"ok": False, "message": str(e) or "Failed"}, status=500)
+
+
 class BCSCustomRepoView(HomeAssistantView):
     url = "/api/bcs/custom_repo"
     name = "api:bcs_custom_repo"
@@ -441,4 +477,56 @@ class BCSRestartView(HomeAssistantView):
             return web.json_response({"ok": True})
         except Exception as e:
             _LOGGER.exception("BCS restart failed: %s", e)
-            return web.json_response({"ok": False, "message": str(e) or "Restart failed"}, status=500)
+            return web.json_response({"ok": False, "message": str(e) or "Restart failed"}, status=500)
+
+class BCSRepoDetailView(HomeAssistantView):
+    url = "/api/bcs/repo"
+    name = "api:bcs_repo"
+    requires_auth = True
+
+    def __init__(self, core: Any) -> None:
+        self.core: BCSCore = core
+
+    async def get(self, request: web.Request) -> web.Response:
+        repo_id = (request.query.get("repo_id") or "").strip()
+        if not repo_id:
+            return web.json_response({"ok": False, "message": "Missing repo_id"}, status=400)
+
+        try:
+            repo = await self.core.ensure_repo_details(repo_id)
+            if not repo:
+                return web.json_response({"ok": False, "message": "Repo not found"}, status=404)
+
+            inst = self.core.get_installed(repo_id) or {}
+            installed = bool(inst)
+            domains = inst.get("domains") or []
+            if not isinstance(domains, list):
+                domains = []
+
+            return web.json_response({
+                "ok": True,
+                "repo": {
+                    "id": repo.id,
+                    "name": repo.name,
+                    "url": repo.url,
+                    "source": repo.source,
+                    "owner": repo.owner,
+                    "provider": repo.provider,
+                    "repo_name": repo.provider_repo_name,
+                    "description": repo.provider_description or repo.meta_description,
+                    "default_branch": repo.default_branch,
+                    "latest_version": repo.latest_version,
+                    "latest_version_source": repo.latest_version_source,
+                    "category": repo.meta_category,
+                    "meta_author": repo.meta_author,
+                    "meta_maintainer": repo.meta_maintainer,
+                    "meta_source": repo.meta_source,
+                    "installed": installed,
+                    "installed_version": inst.get("installed_version"),
+                    "installed_manifest_version": inst.get("installed_manifest_version"),
+                    "installed_domains": domains,
+                }
+            }, status=200)
+        except Exception as e:
+            _LOGGER.exception("BCS repo details failed: %s", e)
+            return web.json_response({"ok": False, "message": str(e) or "Repo details failed"}, status=500)