arrayview 0.26.0__tar.gz → 0.26.2__tar.gz

{arrayview-0.26.0 → arrayview-0.26.2}/.agents/skills/invocation-consistency/SKILL.md

@@ -20,6 +20,15 @@ Every behavior that depends on *how* arrayview is started (server lifecycle, bro
 | **VS Code terminal** | `arrayview()` or `view()` | VS Code Simple Browser | in-process or subprocess |
 | **Plain SSH (no VS Code)** | `arrayview()` or `view()` | prints port-forward hint | in-process or subprocess |
 
+## Transport Split
+
+ArrayView has two backend transports. Invocation-sensitive fixes must account for both:
+
+- **Network mode**: FastAPI routes and WebSocket server. File registration goes through `/load` in `_routes_loading.py`; spawned CLI sessions load in `_launcher._serve_daemon()`.
+- **VS Code direct mode**: stdio subprocess. VS Code tunnel launches write a signal file; the extension runs `python -m arrayview --mode stdio <file>`, and file registration goes through `_stdio_server._handle_register()`.
+
+Do not assume a `/load` or daemon fix covers VS Code tunnel. Shared behavior such as file-format key selection belongs in `_io.py` helpers and must be used by both transports.
+
 ## Key Detection Functions (all in `_platform.py`)
 
 ```python
@@ -86,17 +95,24 @@ for pid_str in client_pids:
    - Jupyter: repeated calls don't fail on port-already-in-use
    - Julia: `_view_julia()` passes new params via CLI flag or file
 
-2. **Browser/display opening?**
+2. **File/session registration consistent?**
+   - FastAPI `/load` path handles the feature
+   - CLI spawned daemon path handles the feature
+   - VS Code direct stdio `_handle_register()` path handles the feature
+   - Direct `--mode stdio <file>` CLI path handles the feature
+   - Multi-array/default-key behavior is centralized in `_io.py`
+
+3. **Browser/display opening?**
    - Local native window (macOS): `pywebview` opens correctly
    - VS Code terminal: Simple Browser opens via extension signal file
    - VS Code tunnel: reaches client-side Simple Browser, not remote host
    - Verify `_ensure_vscode_extension()` installs/updates if VSIX changed
 
-3. **Environment detection?**
+4. **Environment detection?**
    - Check detection order: Julia → Jupyter → VS Code remote → VS Code terminal → local
    - `_find_vscode_ipc_hook()` walks up to 12 parent processes; new subprocess wrappers may need the same
 
-4. **VS Code extension changed?**
+5. **VS Code extension changed?**
    - Rebuild VSIX: `cd vscode-extension && vsce package -o ../src/arrayview/arrayview-opener.vsix`
    - Bump `_VSCODE_EXT_VERSION` in `_vscode.py` and `vscode-extension/package.json` together
 
@@ -111,6 +127,8 @@ uv run python -c "from arrayview import view; import numpy as np; view(np.zeros(
 ## Red Flags — STOP
 
 - "I changed server startup but only tested CLI" → test all paths
+- "I fixed `/load` but not `_stdio_server.py`" → VS Code tunnel can still be broken
+- "I fixed `_serve_daemon()` but `--diagnose` says `is_vscode_remote: true`" → tunnel uses stdio direct mode, not the daemon
 - "Works locally but not in tunnel" → check `_is_vscode_remote()` path and port exposure
 - "I used `127.0.0.1` in the URL" → use `localhost`
 - "I fixed tmux with `#{client_pid}`" → only works with one client; use `list-clients`

{arrayview-0.26.0 → arrayview-0.26.2}/.mex/context/architecture.md

@@ -20,7 +20,7 @@ edges:
     condition: when the task involves _viewer.html, modes, reconcilers, or the View Component System
   - target: context/render-pipeline.md
     condition: when the task involves slice extraction, colormaps, caching, or the render thread
-last_updated: 2026-06-05
+last_updated: 2026-06-11
 ---
 
 # Architecture
@@ -90,6 +90,17 @@ Tool launch, tool activation, and drawer visibility are separate states.
 
 Detection logic: `_platform.py`. Display opening: `_launcher.py` + `_vscode.py`.
 
+## File Registration Paths
+
+File parsing belongs in `_io.py`, but session registration happens through different transports:
+
+- **Network `/load`**: existing FastAPI server path in `_routes_loading.py`.
+- **Spawned CLI daemon**: `_launcher._serve_daemon()` loads before publishing the pending session.
+- **VS Code tunnel direct webview**: `_stdio_server._handle_register()` handles `python -m arrayview --mode stdio <file>` spawned by the extension.
+- **Direct stdio CLI mode**: `_launcher.arrayview()` preloads positional files before starting `run_stdio_server()`.
+
+For multi-array formats or formats with non-displayable members, keep key filtering/default selection in `_io.py` helpers and call those helpers from every registration path. A fix in `/load` alone does not cover VS Code tunnel.
+
 ## External Dependencies
 
 - **FastAPI + uvicorn** — async HTTP/WebSocket server, lazy-imported in `_launcher.py`. Never call uvicorn directly — use the `_uvicorn()` accessor.

{arrayview-0.26.0 → arrayview-0.26.2}/.mex/patterns/add-file-format.md

@@ -15,20 +15,26 @@ edges:
     condition: for the lazy import pattern and Verify Checklist
   - target: context/render-pipeline.md
     condition: when the new format returns an unusual dtype that may affect the render pipeline
-last_updated: 2026-05-16
+last_updated: 2026-06-11
 ---
 
 # Add File Format
 
 ## Context
 
-All file loading goes through `_io.load_data(filepath)` in `src/arrayview/_io.py`. The function dispatches on file extension. New formats must:
+All file parsing goes through `_io.load_data(filepath)` or `_io.load_data_with_meta(filepath)` in `src/arrayview/_io.py`. The function dispatches on file extension. New formats must:
 1. Register the extension in `_SUPPORTED_EXTS`
 2. Add a lazy import (if the library is not already imported at module level)
 3. Add a dispatch branch in `load_data()`
 4. Return a numpy array (or array-like with `.shape` and `.dtype`)
 
-The server (`_server.py`) and CLI (`_launcher.py`) never import format libraries directly — all loading goes through `_io.load_data()`.
+Transport/session creation is separate from parsing:
+
+- FastAPI `/load`: `src/arrayview/_routes_loading.py`
+- CLI spawned daemon and direct stdio CLI mode: `src/arrayview/_launcher.py`
+- VS Code tunnel direct webview: `src/arrayview/_stdio_server.py`
+
+The server and CLI must not import format libraries directly. They may call generic `_io` helpers such as `list_array_keys()` or `default_array_key()` when they need to choose a key before creating a session.
 
 ## Steps
 
@@ -74,18 +80,28 @@ The server (`_server.py`) and CLI (`_launcher.py`) never import format libraries
        return list(_mylib().peek_shape(fpath))
    ```
 
+7. **Keep key/default selection consistent across transports** for multi-array formats (`.npz`, `.mat`, HDF5-like containers):
+   - Put filtering and default-key logic in `_io.py`, not in a route or launcher branch.
+   - Use the same helper from FastAPI `/load`, CLI daemon/direct paths, and `_stdio_server.py`.
+   - If `/load` returns picker keys for multiple arrays, define what non-picker transports do (usually first displayable key).
+
 ## Gotchas
 
 - **Do not import the format library at the top of `_io.py`** without checking import cost first. Nibabel is the reference: it is lazy because it costs ~200 ms on first import.
 - **`.nii.gz` is two extensions** — the dispatch checks the full suffix, not just the last dot. New formats with compound extensions (`.foo.bar`) need special suffix handling in `load_data()`.
 - **Zarr is not loaded via `load_data()`** in all paths — zarr arrays can also be passed directly to `view()` as array objects. Ensure zarr-specific logic lives in `_session.py` / `_render.py`, not only in the file-load path.
-- **No format-specific code in `_server.py` or `_launcher.py`** — if you find yourself adding a format check in either of those modules, move it to `_io.py`.
+- **No format-specific parsing code in `_server.py`, `_launcher.py`, or `_stdio_server.py`** — if you find yourself adding a format import or dtype/shape filter in those modules, move it to `_io.py`.
+- **VS Code tunnel is stdio, not HTTP** — `arrayview file.ext` in a VS Code tunnel writes a signal file; the extension then runs `python -m arrayview --mode stdio file.ext`. A `/load` fix alone does not cover this path.
 
 ## Verify
 
 - [ ] Extension added to `_SUPPORTED_EXTS`
 - [ ] New library import is lazy (accessor function pattern) unless it imports in <10 ms
 - [ ] `load_data("myfile.myext")` returns a numpy array with correct shape and dtype
+- [ ] If the format can contain multiple arrays or non-displayable members, add tests for `list_array_keys()` / `default_array_key()` and direct `load_data(..., key=...)`
+- [ ] FastAPI `/load` works for the file, including picker/default-key behavior
+- [ ] `_stdio_server._handle_register()` works for the file, because VS Code tunnel direct webview uses stdio instead of `/load`
+- [ ] CLI daemon/direct paths use generic `_io` helpers for key selection instead of duplicating format rules
 - [ ] `view(load_data("myfile.myext"))` opens the viewer without errors
 - [ ] If full-load format, added to `FULL_LOAD_EXTS`
 - [ ] `uv run pytest` on `tests/test_mode_consistency.py` still passes (no dtype regressions)

{arrayview-0.26.0 → arrayview-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arrayview
-Version: 0.26.0
+Version: 0.26.2
 Summary: Fast multi-dimensional array viewer
 Project-URL: Home, https://github.com/oscarvanderheide/arrayview
 Project-URL: Source, https://github.com/oscarvanderheide/arrayview

{arrayview-0.26.0 → arrayview-0.26.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arrayview"
-version = "0.26.0"
+version = "0.26.2"
 description = "Fast multi-dimensional array viewer"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.12"

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/__init__.py

@@ -1,4 +1,5 @@
-__version__ = "0.25.1"
+import importlib.metadata as _metadata
+__version__ = _metadata.version("arrayview")
 
 __all__ = [
     "TrainingMonitor",

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_io.py

@@ -38,6 +38,15 @@ def _fix_mat_complex(arr):
     return arr
 
 
+def _is_viewable_mat_array(value):
+    """True for MATLAB arrays ArrayView can display directly."""
+    return (
+        isinstance(value, np.ndarray)
+        and value.ndim >= 1
+        and value.dtype.kind in ("b", "i", "u", "f", "c")
+    )
+
+
 def list_npz_keys(filepath):
     """Return [{key, shape, dtype}] for each ndarray in an .npz file.
 
@@ -67,7 +76,7 @@ def list_mat_keys(filepath):
         for k, v in mat.items():
             if k.startswith("_"):
                 continue
-            if isinstance(v, np.ndarray) and v.ndim >= 1 and v.dtype.kind in ("b", "i", "u", "f", "c"):
+            if _is_viewable_mat_array(v):
                 keys.append({"key": k, "shape": list(v.shape), "dtype": str(v.dtype)})
         return keys
     except NotImplementedError:
@@ -95,6 +104,12 @@ def list_array_keys(filepath):
     return []
 
 
+def default_array_key(filepath):
+    """Return the first selectable array key for multi-array formats, if any."""
+    keys = list_array_keys(filepath)
+    return keys[0]["key"] if keys else None
+
+
 def _select_npz_array(npz, filepath):
     """Load the first array from a multi-array .npz file.
 
@@ -233,7 +248,7 @@ def load_data(filepath, key=None):
             arrays = {
                 k: v
                 for k, v in mat.items()
-                if not k.startswith("_") and isinstance(v, np.ndarray)
+                if not k.startswith("_") and _is_viewable_mat_array(v)
             }
             if key is not None:
                 return _fix_mat_complex(arrays[key])

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_launcher.py

@@ -2717,7 +2717,7 @@ def _serve_daemon(
                     _array_keys = list_array_keys(filepath)
                 except Exception:
                     pass
-            _load_key = _array_keys[0]["key"] if _array_keys and len(_array_keys) > 1 else None
+            _load_key = _array_keys[0]["key"] if _array_keys else None
             data, spatial_meta = load_data_with_meta(filepath, key=_load_key)
             if cleanup:
                 try:
@@ -3187,12 +3187,12 @@ def arrayview():
             )
             print(f"SESSION:{info}", file=sys.stderr)
         elif args.files:
-            from arrayview._io import load_data
+            from arrayview._io import default_array_key, load_data
             from arrayview._session import SESSIONS, Session
 
             # First file is the main array
             base_path = args.files[0]
-            data = load_data(base_path)
+            data = load_data(base_path, key=default_array_key(base_path))
             session = Session(
                 data=data,
                 filepath=base_path,
@@ -3205,7 +3205,10 @@ def arrayview():
             if getattr(args, "vectorfield", None):
                 from arrayview._vectorfield import _configure_vectorfield
 
-                vf_data = load_data(args.vectorfield)
+                vf_data = load_data(
+                    args.vectorfield,
+                    key=default_array_key(args.vectorfield),
+                )
                 _configure_vectorfield(
                     session, vf_data,
                     getattr(args, "vectorfield_components_dim", None),
@@ -3216,7 +3219,7 @@ def arrayview():
             # Load overlay(s) as separate sessions
             overlay_sids = []
             for ov_path in (getattr(args, "overlay", None) or []):
-                ov_data = load_data(ov_path)
+                ov_data = load_data(ov_path, key=default_array_key(ov_path))
                 ov_session = Session(
                     data=ov_data,
                     filepath=ov_path,
@@ -3232,7 +3235,7 @@ def arrayview():
             if getattr(args, "compare", None):
                 compare_paths.append(args.compare)
             for cp in compare_paths:
-                cmp_data = load_data(cp)
+                cmp_data = load_data(cp, key=default_array_key(cp))
                 cmp_session = Session(
                     data=cmp_data,
                     filepath=cp,
@@ -3572,18 +3575,21 @@ def arrayview():
 
     if args.vectorfield:
         try:
-            from arrayview._io import load_data
+            from arrayview._io import default_array_key, load_data
             from arrayview._render import _detect_rgb_axis
             from arrayview._vectorfield import _resolve_vfield_layout
 
-            base_data = load_data(base_file)
+            base_data = load_data(base_file, key=default_array_key(base_file))
             image_shape = tuple(int(s) for s in base_data.shape)
             if args.rgb:
                 rgb_axis = _detect_rgb_axis(image_shape)
                 image_shape = tuple(
                     s for i, s in enumerate(image_shape) if i != rgb_axis
                 )
-            vf_data = load_data(args.vectorfield)
+            vf_data = load_data(
+                args.vectorfield,
+                key=default_array_key(args.vectorfield),
+            )
             layout = _resolve_vfield_layout(
                 tuple(int(s) for s in vf_data.shape),
                 image_shape,

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_platform.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import importlib.util
 import os
 import subprocess
 import sys
@@ -414,12 +415,13 @@ def _can_native_window() -> bool:
     # Plain SSH (no VS Code): the display is on the client machine, not here.
     if os.environ.get("SSH_CLIENT") or os.environ.get("SSH_CONNECTION"):
         return False
+    if importlib.util.find_spec("webview") is None:
+        return False
     if sys.platform in ("darwin", "win32"):
         return True
     # Linux/BSD: need a display server AND pywebview's GUI bindings
     if not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
         return False
-    import importlib.util
 
     return (
         importlib.util.find_spec("qtpy") is not None

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_routes_loading.py

@@ -123,8 +123,14 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
                 _array_keys = await asyncio.to_thread(list_array_keys, filepath)
                 if len(_array_keys) > 1 and not _key:
                     return {"array_keys": _array_keys, "filepath": filepath}
+                if len(_array_keys) == 1 and not _key:
+                    _key = _array_keys[0]["key"]
 
-            data, spatial_meta = await asyncio.to_thread(load_data_with_meta, filepath, key=_key)
+            data, spatial_meta = await asyncio.to_thread(
+                load_data_with_meta,
+                filepath,
+                key=_key,
+            )
         except Exception as e:
             return {"error": str(e)}
         session = await asyncio.to_thread(Session, data, filepath=filepath, name=name)

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_stdio_server.py

@@ -115,9 +115,19 @@ def _handle_register(msg: dict) -> None:
     name = msg.get("name") or __import__("os").path.basename(file_path)
     options = msg.get("options", {})
 
-    data, spatial_meta = load_data_with_meta(file_path)
+    from ._io import list_array_keys
+
+    array_keys = list_array_keys(file_path)
+    key = array_keys[0]["key"] if array_keys else None
+    data, spatial_meta = load_data_with_meta(
+        file_path,
+        key=key,
+    )
     session = Session(data=data, filepath=file_path, name=name)
     session.spatial_meta = spatial_meta
+    if len(array_keys) > 1:
+        session.array_keys = array_keys
+        session.array_filepath = file_path
     if spatial_meta is not None:
         session.original_volume = data
 
@@ -149,6 +159,48 @@ def _handle_metadata(msg: dict) -> None:
     _write_json(_build_metadata(session))
 
 
+def _handle_reload_key(sid: str, msg: dict) -> None:
+    """Reload a session's data from a multi-array file with a different key."""
+    session = SESSIONS.get(sid)
+    if not session:
+        _write_error("session not found")
+        return
+    array_filepath = getattr(session, "array_filepath", None)
+    if not array_filepath:
+        _write_error("session has no array keys")
+        return
+
+    try:
+        body = json.loads(msg.get("body") or "{}")
+    except Exception:
+        _write_error("invalid JSON body")
+        return
+    key = body.get("key")
+    if not key:
+        _write_error("key is required")
+        return
+
+    try:
+        from ._io import load_data
+
+        data = load_data(array_filepath, key=key)
+    except Exception as e:
+        _write_error(str(e))
+        return
+
+    session.data = data
+    session.shape = data.shape
+    session.data_version += 1
+    session.raw_cache.clear()
+    session.rgba_cache.clear()
+    session.mosaic_cache.clear()
+    session._raw_bytes = 0
+    session._rgba_bytes = 0
+    session._mosaic_bytes = 0
+    session._estimated_mem = session._estimate_memory()
+    _write_json({"ok": True})
+
+
 def _handle_sessions() -> None:
     """Return list of active sessions."""
     _write_json([_session_summary(s) for s in SESSIONS.values()])
@@ -404,6 +456,8 @@ def _handle_fetch_proxy(msg: dict) -> None:
         _handle_metadata({"sid": sid})
     elif route == "clearcache" and sid:
         _handle_clearcache({"sid": sid})
+    elif route == "session" and len(parts) >= 3 and parts[2] == "reload-key":
+        _handle_reload_key(parts[1], msg)
     elif route == "sessions":
         _handle_sessions()
     elif route == "histogram" and sid:

{arrayview-0.26.0 → arrayview-0.26.2}/src/arrayview/_viewer.html

@@ -285,7 +285,7 @@
         .dim-size { opacity: 0.28; font-size: 0.68em; font-weight: normal; }
         .dim-hover-idx { font-size: 0.68em; font-weight: normal; color: var(--dim-hover, #777); opacity: 1; }
         .active-dim { font-weight: bold; }
-        .playing-dim { color: var(--playing-dim); font-weight: bold; }
+        .playing-dim { font-weight: bold; }
         .vfield-t-dim { color: var(--vfield-t-dim); }
         .active-vfield-t { font-weight: bold; }
         .dim-sep { color: var(--muted); opacity: 0.4; font-weight: normal; }
@@ -466,8 +466,7 @@
             color: var(--text);
             -webkit-text-fill-color: var(--text);
         }
-        .active-dim .dim-slash:not([style*="background"]),
-        .playing-dim .dim-slash:not([style*="background"]) {
+        .active-dim .dim-slash:not([style*="background"]) {
             color: var(--active-dim) !important;
             -webkit-text-fill-color: var(--active-dim) !important;
         }
@@ -13784,10 +13783,9 @@
             const subtle = style.getPropertyValue('--subtle').trim();
             let fill;
             if (isVfieldT) fill = style.getPropertyValue('--vfield-t-dim').trim();
-            else if (playing) fill = style.getPropertyValue('--playing-dim').trim();
             else if (active) fill = style.getPropertyValue('--active-dim').trim();
             else fill = muted;
-            const unfilled = (active || playing || isVfieldT) ? `color-mix(in srgb, ${fill} 32%, ${muted})` : subtle;
+            const unfilled = (active || isVfieldT) ? `color-mix(in srgb, ${fill} 32%, ${muted})` : subtle;
             return slashFill(pct, fill, unfilled);
         }
         /* ── JS: Info Bar and Pixel Display ───────────────────────── */
@@ -17577,24 +17575,20 @@
                     // Transpose x and y: swap the dimension indices and flips
                     if (shape.length < 2) return;
                     if (multiViewActive) {
-                        crossfade(() => {
-                            mvViews.forEach(v => { [v.dimX, v.dimY] = [v.dimY, v.dimX]; v.seq++; });
-                            [dim_x, dim_y] = [dim_y, dim_x];
-                            [flip_x, flip_y] = [flip_y, flip_x];
-                            flipDims[dim_x] = flip_x; flipDims[dim_y] = flip_y;
-                            mvViews.forEach(v => { mvDrawFrame(v); mvRender(v); });
-                        });
+                        mvViews.forEach(v => { [v.dimX, v.dimY] = [v.dimY, v.dimX]; v.seq++; });
+                        [dim_x, dim_y] = [dim_y, dim_x];
+                        [flip_x, flip_y] = [flip_y, flip_x];
+                        flipDims[dim_x] = flip_x; flipDims[dim_y] = flip_y;
+                        mvViews.forEach(v => { mvDrawFrame(v); mvRender(v); });
                         showStatus('transposed x/y (all panes)');
                         if (typeof _cropReconcileBindings === 'function') _cropReconcileBindings();
                         return;
                     }
                     const wasMosaic = dim_z >= 0;
-                    crossfade(() => {
-                        [dim_x, dim_y] = [dim_y, dim_x];
-                        [flip_x, flip_y] = [flip_y, flip_x];
-                        if (!wasMosaic) dim_z = -1;
-                        updateView(); triggerPreload();
-                    });
+                    [dim_x, dim_y] = [dim_y, dim_x];
+                    [flip_x, flip_y] = [flip_y, flip_x];
+                    if (!wasMosaic) dim_z = -1;
+                    updateView(); triggerPreload();
                     showStatus(wasMosaic ? 'transposed x/y (mosaic)' : 'transposed x/y');
                     if (typeof _cropReconcileBindings === 'function') _cropReconcileBindings();
                 },
@@ -17605,34 +17599,32 @@
                 run: (ctx, e) => {
                     if (_segMode) { _segReset(); return; }
                     if (multiViewActive) {
-                        crossfade(() => {
-                            const oldDimX = dim_x, oldDimY = dim_y;
-                            dim_x = oldDimY; dim_y = oldDimX;
-                            const ofx = flipDims[oldDimX] || false, ofy = flipDims[oldDimY] || false;
-                            flipDims[dim_x] = ofy; flipDims[dim_y] = !ofx;
-                            const third = mvDims.find(d => d !== oldDimX && d !== oldDimY);
-                            mvDims = [dim_y, dim_x, third];
-                            const newDefs = [
-                                { dimX: mvDims[1], dimY: mvDims[0], sliceDir: mvDims[2] },
-                                { dimX: mvDims[2], dimY: mvDims[0], sliceDir: mvDims[1] },
-                                { dimX: mvDims[2], dimY: mvDims[1], sliceDir: mvDims[0] },
-                            ];
-                            mvViews.forEach((v, i) => {
-                                v.dimX = newDefs[i].dimX; v.dimY = newDefs[i].dimY;
-                                v.sliceDir = newDefs[i].sliceDir;
-                                v.seq++;
-                            });
-                            mvViews.forEach(v => { mvDrawFrame(v); mvRender(v); });
-                            const _axLetters = ['x', 'y', 'z'];
-                            mvViews.forEach((v, i) => {
-                                const newX = _axLetters[mvDims.indexOf(v.dimX)] || '?';
-                                const newY = _axLetters[mvDims.indexOf(v.dimY)] || '?';
-                                v.axLblX = newX; v.axLblY = newY;
-                                if (v.axesSvg) {
-                                    v.axesSvg.querySelector('.axes-lbl-x').textContent = newX;
-                                    v.axesSvg.querySelector('.axes-lbl-y').textContent = newY;
-                                }
-                            });
+                        const oldDimX = dim_x, oldDimY = dim_y;
+                        dim_x = oldDimY; dim_y = oldDimX;
+                        const ofx = flipDims[oldDimX] || false, ofy = flipDims[oldDimY] || false;
+                        flipDims[dim_x] = ofy; flipDims[dim_y] = !ofx;
+                        const third = mvDims.find(d => d !== oldDimX && d !== oldDimY);
+                        mvDims = [dim_y, dim_x, third];
+                        const newDefs = [
+                            { dimX: mvDims[1], dimY: mvDims[0], sliceDir: mvDims[2] },
+                            { dimX: mvDims[2], dimY: mvDims[0], sliceDir: mvDims[1] },
+                            { dimX: mvDims[2], dimY: mvDims[1], sliceDir: mvDims[0] },
+                        ];
+                        mvViews.forEach((v, i) => {
+                            v.dimX = newDefs[i].dimX; v.dimY = newDefs[i].dimY;
+                            v.sliceDir = newDefs[i].sliceDir;
+                            v.seq++;
+                        });
+                        mvViews.forEach(v => { mvDrawFrame(v); mvRender(v); });
+                        const _axLetters = ['x', 'y', 'z'];
+                        mvViews.forEach((v, i) => {
+                            const newX = _axLetters[mvDims.indexOf(v.dimX)] || '?';
+                            const newY = _axLetters[mvDims.indexOf(v.dimY)] || '?';
+                            v.axLblX = newX; v.axLblY = newY;
+                            if (v.axesSvg) {
+                                v.axesSvg.querySelector('.axes-lbl-x').textContent = newX;
+                                v.axesSvg.querySelector('.axes-lbl-y').textContent = newY;
+                            }
                         });
                         showStatus('rotated 90°');
                         renderInfo(); saveState();
@@ -17645,11 +17637,9 @@
                         if (lastImageData) ctx.putImageData(applyFlips(lastImageData, lastImgW, lastImgH), 0, 0);
                         renderInfo(); saveState();
                     } else {
-                        crossfade(() => {
-                            const [odx, ody, ofx, ofy] = [dim_x, dim_y, flip_x, flip_y];
-                            dim_x = ody; dim_y = odx; flip_x = ofy; flip_y = !ofx;
-                            updateView(); triggerPreload();
-                        });
+                        const [odx, ody, ofx, ofy] = [dim_x, dim_y, flip_x, flip_y];
+                        dim_x = ody; dim_y = odx; flip_x = ofy; flip_y = !ofx;
+                        updateView(); triggerPreload();
                         showStatus('rotated 90°'); saveState();
                     }
                     if (typeof _cropReconcileBindings === 'function') _cropReconcileBindings();
@@ -21058,7 +21048,7 @@
 
         /* ── JS: Keyboard Shortcuts ───────────────────────────────── */
 
-        sink.addEventListener('keydown', async (e) => {
+        function _handleViewerShortcutKeydown(e) {
             e.preventDefault();
             e.stopImmediatePropagation();
             if (_cmapPickerOpen) {
@@ -21146,7 +21136,14 @@
                 document.getElementById('info-overlay').classList.remove('visible');
                 return;
             }
-        });
+        }
+
+        sink.addEventListener('keydown', _handleViewerShortcutKeydown);
+        document.addEventListener('keydown', (e) => {
+            if (e.target === sink) return;
+            if (_isEditableActive()) return;
+            _handleViewerShortcutKeydown(e);
+        }, true);
 
         // Hold-`g` finalizer. The picker handles its own commit/cancel
         // through armUp(); this listener just routes the keyup to it. Listen