Force dock layout cache reset version and keep Sphere3D default panel

demo.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 import json
 import os
+import re
 from pathlib import Path
 from typing import Any
 
@@ -35,15 +36,20 @@ ASSET_MANIFEST_PATH = Path(
 
 
 def _patch_hyperview_default_panel() -> None:
-    """Patch HyperView 0.3.1 frontend so Sphere 3D opens as the active scatter panel.
+    """Patch HyperView 0.3.1 frontend for default panel and dock cache-key migration.
 
-    HyperView currently has no public API for this behavior. This runtime patch is
+    HyperView currently has no public API for these behaviors. This runtime patch is
     intentionally narrow and idempotent, targeting the known bundled chunk for v0.3.1.
     """
     default_panel = os.environ.get("HYPERVIEW_DEFAULT_PANEL", "spherical3d").strip().lower()
-    if default_panel not in {"spherical3d", "sphere3d"}:
+    apply_default_panel_patch = default_panel in {"spherical3d", "sphere3d"}
+    if not apply_default_panel_patch:
         print(f"Skipping frontend default-panel patch (HYPERVIEW_DEFAULT_PANEL={default_panel!r}).")
-        return
+
+    cache_version = os.environ.get("HYPERVIEW_LAYOUT_CACHE_VERSION", "v6").strip() or "v6"
+    target_layout_key = f"hyperview:dockview-layout:{cache_version}"
+    legacy_layout_key = "hyperview:dockview-layout:v5"
+    layout_key_pattern = r"hyperview:dockview-layout:v\d+"
 
     chunk_path = (
         Path(hv.__file__).resolve().parent
@@ -67,22 +73,51 @@ def _patch_hyperview_default_panel() -> None:
         print(f"Default-panel patch skipped: failed reading chunk ({exc})")
         return
 
-    if marker_after in payload:
-        print("HyperView frontend already patched for Sphere 3D default panel.")
-        return
+    patched = payload
+    changed = False
+
+    if apply_default_panel_patch:
+        if marker_after in patched:
+            print("HyperView frontend already patched for Sphere 3D default panel.")
+        elif marker_before in patched:
+            patched = patched.replace(marker_before, marker_after, 1)
+            changed = True
+            print("Patched HyperView frontend: Sphere 3D will open as default scatter panel.")
+        else:
+            print("Default-panel patch skipped: expected marker not found in HyperView chunk.")
+
+    if target_layout_key in patched:
+        print(f"HyperView frontend already uses dock cache key '{target_layout_key}'.")
+    elif legacy_layout_key in patched:
+        patched = patched.replace(legacy_layout_key, target_layout_key, 1)
+        changed = True
+        print(f"Patched HyperView frontend: dock cache key {legacy_layout_key} -> {target_layout_key}.")
+    else:
+        discovered = re.search(layout_key_pattern, patched)
+        if discovered:
+            source_key = discovered.group(0)
+            if source_key == target_layout_key:
+                print(f"HyperView frontend already uses dock cache key '{target_layout_key}'.")
+            else:
+                print(
+                    f"Dock cache patch notice: expected legacy key '{legacy_layout_key}' not found; "
+                    f"migrating detected key '{source_key}' -> '{target_layout_key}'."
+                )
+                patched = patched.replace(source_key, target_layout_key, 1)
+                changed = True
+        else:
+            print(
+                "Dock cache patch warning: expected layout cache key marker "
+                f"'{legacy_layout_key}' not found in HyperView chunk."
+            )
 
-    if marker_before not in payload:
-        print("Default-panel patch skipped: expected marker not found in HyperView chunk.")
+    if not changed:
         return
 
-    patched = payload.replace(marker_before, marker_after, 1)
     try:
         chunk_path.write_text(patched, encoding="utf-8")
     except OSError as exc:
-        print(f"Default-panel patch skipped: failed writing chunk ({exc})")
-        return
-
-    print("Patched HyperView frontend: Sphere 3D will open as default scatter panel.")
+        print(f"Frontend patch skipped: failed writing chunk ({exc})")
 
 
 def _resolve_bind_host() -> tuple[str, str | None]: