arrayview 0.43.2__py3-none-any.whl → 0.43.3__py3-none-any.whl

arrayview/_routes_query.py

@@ -51,6 +51,7 @@ def register_query_routes(app, *, get_session_or_404, pil_image, pil_imageops) -
         if not token or len(token) > 256 or not window_id:
             raise HTTPException(status_code=400, detail="Incomplete viewer phase identity")
         allowed = {
+            "navigation-arrived",
             "script-loaded",
             "ws-open",
             "metadata-loaded",
@@ -58,13 +59,16 @@ def register_query_routes(app, *, get_session_or_404, pil_image, pil_imageops) -
         }
         if phase != "launch-prepared" and phase not in allowed:
             raise HTTPException(status_code=400, detail="Invalid viewer phase")
-        if phase != "launch-prepared" and not viewer_instance_id:
+        if (
+            phase not in {"launch-prepared", "navigation-arrived"}
+            and not viewer_instance_id
+        ):
             raise HTTPException(status_code=400, detail="Incomplete viewer phase identity")
         # Preparation and script startup are control-plane events. The viewer
         # is meant to open while a large array is still loading, so hiding
         # either event behind Session readiness creates a false pre-script
         # timeout. Data-dependent phases still wait for the real Session.
-        if phase in {"launch-prepared", "script-loaded"}:
+        if phase in {"launch-prepared", "navigation-arrived", "script-loaded"}:
             if sid not in SESSIONS and sid not in _session_mod.PENDING_SESSIONS:
                 raise HTTPException(status_code=404, detail="Session not found")
         else:
@@ -207,13 +211,24 @@ def register_query_routes(app, *, get_session_or_404, pil_image, pil_imageops) -
             raise HTTPException(status_code=409, detail="Viewer phase owner changed")
         if body.get("sid") != sid:
             raise HTTPException(status_code=409, detail="Viewer primary session changed")
-        related_sids = _viewer_related_sids(body, sid)
-        if journal["related_sids"] is None:
-            journal["related_sids"] = related_sids
-        elif journal["related_sids"] != related_sids:
-            raise HTTPException(status_code=409, detail="Viewer related sessions changed")
-        if viewer_instance_id not in journal["viewer_instance_ids"]:
-            journal["viewer_instance_ids"].append(viewer_instance_id)
+        if phase == "navigation-arrived":
+            navigation_attempt = body.get("navigation_attempt")
+            if (
+                type(navigation_attempt) is not int
+                or navigation_attempt != journal.get("navigation_attempt")
+            ):
+                raise HTTPException(
+                    status_code=409,
+                    detail="Viewer navigation attempt changed",
+                )
+        else:
+            related_sids = _viewer_related_sids(body, sid)
+            if journal["related_sids"] is None:
+                journal["related_sids"] = related_sids
+            elif journal["related_sids"] != related_sids:
+                raise HTTPException(status_code=409, detail="Viewer related sessions changed")
+            if viewer_instance_id not in journal["viewer_instance_ids"]:
+                journal["viewer_instance_ids"].append(viewer_instance_id)
         phases = journal["phases"]
         if phase not in phases:
             phases.append(phase)
@@ -245,7 +260,7 @@ def register_query_routes(app, *, get_session_or_404, pil_image, pil_imageops) -
             "token": token,
             "phases": list(phases),
             "viewer_instance_ids": list(journal["viewer_instance_ids"]),
-            "related_sids": list(journal["related_sids"]),
+            "related_sids": list(journal["related_sids"] or []),
         }
 
     @app.get("/viewer-phase/{sid}/{request_id}")

arrayview/_viewer.html

@@ -3,6 +3,55 @@
 <head>
     <title>ArrayView</title>
     <script>
+        // Tell the opener as soon as this document starts parsing. The full
+        // viewer script is large and sits near the end of this file, so using
+        // its startup as proof that navigation arrived can make a slow but
+        // valid page look dropped and cause its tab to be closed prematurely.
+        (function () {
+            try {
+                var launchSearch = __ARRAYVIEW_QUERY__ || location.search;
+                var params = new URLSearchParams(launchSearch);
+                if (params.get('_av_integrated_browser') !== '1') return;
+                var sid = params.get('sid');
+                var requestId = params.get('_av_launch_request_id');
+                var serverId = params.get('_av_launch_server_id');
+                var windowId = params.get('_av_launch_window_id');
+                var token = params.get('_av_launch_token');
+                var attemptValue = params.get('_av_navigation_attempt');
+                var attempt = Number(attemptValue);
+                if (
+                    !sid || !requestId || !serverId || !windowId || !token
+                    || attemptValue === null
+                    || !Number.isInteger(attempt) || attempt < 0
+                ) return;
+                var phaseUrl = `/viewer-phase/${encodeURIComponent(sid)}/${encodeURIComponent(requestId)}`;
+                var phaseBody = JSON.stringify({
+                    phase: 'navigation-arrived',
+                    sid,
+                    server_id: serverId,
+                    window_id: windowId,
+                    token,
+                    navigation_attempt: attempt,
+                });
+                var reportArrival = function (retriesLeft) {
+                    fetch(phaseUrl, {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: phaseBody,
+                    }).then(function (response) {
+                        if (!response.ok) throw new Error('arrival rejected');
+                    }).catch(function () {
+                        if (retriesLeft > 0) {
+                            setTimeout(function () {
+                                reportArrival(retriesLeft - 1);
+                            }, 100);
+                        }
+                    });
+                };
+                reportArrival(3);
+            } catch (_) {}
+        })();
+
         // Name the tab at parse time. Without this the tab shows the host
         // ("localhost:8000") until metadata arrives over the WebSocket, and
         // that wait is the array load — seconds for a large file. The name
@@ -2332,7 +2381,7 @@
         #info-box { padding: 18px 22px; font-size: 12px; line-height: 1.8; font-family: 'SF Mono', ui-monospace, monospace; }
         #info-box table { border-collapse: collapse; width: 100%; }
         #info-box td:first-child { color: var(--muted); padding-right: 24px; }
-        #help-hint, #tool-hint, #qmri-hint {
+        #help-hint, #tool-hint, #qmri-hint, #ras-hint {
             position: fixed; bottom: 14px; cursor: pointer;
             width: 22px; height: 22px; border-radius: 50%;
             border: 1px solid var(--border); color: var(--muted);
@@ -2348,7 +2397,25 @@
         #qmri-hint.visible { display: flex; }
         #qmri-hint .q-dim-icon { width: 17px; height: 17px; }
         #tool-hint.active { color: var(--active-dim); border-color: var(--active-dim); }
-        #help-hint:hover, #tool-hint:hover, #qmri-hint:hover { color: var(--text); border-color: var(--muted); }
+        #help-hint:hover, #tool-hint:hover, #qmri-hint:hover, #ras-hint:hover { color: var(--text); border-color: var(--muted); }
+        #ras-hint {
+            right: 106px; display: none; position: fixed;
+            font-family: 'SF Mono', ui-monospace, 'Cascadia Code', 'JetBrains Mono', monospace;
+            font-size: 8px; font-weight: 600; letter-spacing: -0.3px;
+        }
+        #ras-hint.visible { display: flex; }
+        #ras-hint.active { color: var(--active-dim); border-color: var(--active-dim); }
+        #ras-hint.loading { border-color: transparent; }
+        #ras-hint.loading::before {
+            content: ''; position: absolute; inset: -1px; border-radius: 50%;
+            padding: 1px;
+            background: conic-gradient(var(--active-dim) 0deg, var(--active-dim) 100deg, transparent 100deg, transparent 360deg);
+            -webkit-mask: linear-gradient(#000 0 0) content-box, linear-gradient(#000 0 0);
+            -webkit-mask-composite: xor;
+            mask-composite: exclude;
+            animation: ras-hint-spin 0.85s linear infinite;
+        }
+        @keyframes ras-hint-spin { to { transform: rotate(360deg); } }
         #dynamic-island {
             position: fixed; left: 8px; top: 8px;
             background: rgba(24,24,24,0.78); border: 1px solid rgba(255,255,255,0.07);
@@ -4502,7 +4569,7 @@
         /* ── Zen / focus mode ────────────────────────────────────── */
         body.zen-mode #array-name, body.zen-mode #info,
         body.zen-mode #slim-cb-wrap, body.zen-mode #mode-eggs,
-        body.zen-mode #help-hint, body.zen-mode #tool-hint, body.zen-mode #status,
+        body.zen-mode #help-hint, body.zen-mode #tool-hint, body.zen-mode #ras-hint, body.zen-mode #status,
         body.zen-mode #toast, body.zen-mode #dim-active-underline,
         body.zen-mode #overlay-palette { opacity:0 !important; transition:opacity 0.6s ease; pointer-events:none !important; }
         body.zen-mode .qv-cb-island,
@@ -5503,6 +5570,7 @@
     <div id="tool-hint" title="Tool launcher (/)">/</div>
     <div id="preferences-hint" title="Preferences" aria-label="Preferences"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="3"></circle><path d="M19.4 15a1.7 1.7 0 0 0 .34 1.88l.06.06-2.83 2.83-.06-.06a1.7 1.7 0 0 0-1.88-.34 1.7 1.7 0 0 0-1.03 1.56V21h-4v-.08A1.7 1.7 0 0 0 9 19.37a1.7 1.7 0 0 0-1.88.34l-.06.06-2.83-2.83.06-.06A1.7 1.7 0 0 0 4.63 15 1.7 1.7 0 0 0 3.08 14H3v-4h.08A1.7 1.7 0 0 0 4.63 9a1.7 1.7 0 0 0-.34-1.88l-.06-.06 2.83-2.83.06.06A1.7 1.7 0 0 0 9 4.63 1.7 1.7 0 0 0 10 3.08V3h4v.08A1.7 1.7 0 0 0 15 4.63a1.7 1.7 0 0 0 1.88-.34l.06-.06 2.83 2.83-.06.06A1.7 1.7 0 0 0 19.37 9 1.7 1.7 0 0 0 20.92 10H21v4h-.08A1.7 1.7 0 0 0 19.4 15z"></path></svg></div>
     <div id="qmri-hint" title="qMRI options"></div>
+    <div id="ras-hint" title="Convert to RAS orientation — aligns axes so every view scrolls fast, not just the native one (Shift+A)">RAS</div>
     <canvas id="mv-orientation"></canvas>
     <div id="dynamic-island"></div>
     <div id="tool-launcher" aria-hidden="true"></div>
@@ -6458,7 +6526,12 @@
         let isRendering = false;
         let pendingRequest = false;
         let wsSlowTimer = null;   // show the busy panel for slow renders
-        const WS_SLOW_THRESHOLD_MS = 80;
+        // Deliberately much higher than PATIENT_LOADING_THRESHOLD_MS: this one
+        // fires for every render, including plain in-array scrolling, so on a
+        // slow network drive a short threshold flickers on/off as each frame
+        // just barely crosses it. This should only catch renders that are
+        // actually stalled, not ordinary slow-drive catch-up.
+        const WS_SLOW_THRESHOLD_MS = 500;
         const PATIENT_LOADING_THRESHOLD_MS = 80;
         let _displayedPatientIndex = null;
         let _patientLoadingIndex = null;
@@ -6731,6 +6804,7 @@
         let excludeZeros = false; // exclude zero-valued voxels from histogram computation
         let spatialMeta = null; // {voxel_sizes, axis_labels, is_oblique, is_canonical} or null
         let rasResampleActive = false;
+        let _rasResampleLoading = false;
         let multiViewActive = false;
         let _mvOrientationHidden = false; // ~ toggle — hides orientation cube
         let mipActive = false;
@@ -24421,6 +24495,7 @@
                 title: 'Toggle explicit RAS conversion (NIfTI)',
                 when: [],
                 run: (ctx, e) => {
+                    if (_rasResampleLoading) return;
                     if (compareActive || qmriActive) {
                         showToast('RAS resample not supported in compare/qMRI mode');
                         return;
@@ -24436,13 +24511,15 @@
                     }
                     const wantOn = !rasResampleActive;
                     showToast(wantOn ? 'converting to RAS...' : 'reverting to native orientation...');
+                    _rasResampleLoading = true;
+                    document.getElementById('ras-hint')?.classList.add('loading');
                     proxyFetch(`/resample_ras/${sid}`, {
                         method: 'POST',
                         headers: {'Content-Type': 'application/json'},
                         body: JSON.stringify({ enabled: wantOn }),
                     }).then(r => r.json()).then(d => {
-                        if (d.error) { showToast('RAS resample error: ' + d.error); return; }
-                        if (d.skipped) { showToast('RAS resample skipped: ' + d.reason); return; }
+                        if (d.error) { _clearRasHintLoading(); showToast('RAS resample error: ' + d.error); return; }
+                        if (d.skipped) { _clearRasHintLoading(); showToast('RAS resample skipped: ' + d.reason); return; }
                         rasResampleActive = wantOn;
                         // Refresh shape from /info, then re-center indices and refresh
                         // canvases. Because shape changes (e.g. (240,240,155) ->
@@ -24475,9 +24552,12 @@
                                 updateView(); triggerPreload();
                             }
                             renderInfo();
+                            _reconcileUI();
+                            _clearRasHintLoading();
                         });
                         showToast('RAS resample: ' + (wantOn ? 'on' : 'off') + (d.elapsed_ms ? ` (${d.elapsed_ms}ms)` : ''));
                     }).catch(err => {
+                        _clearRasHintLoading();
                         showToast('RAS resample failed: ' + err);
                     });
                 },
@@ -27298,6 +27378,11 @@
             if (cmd && typeof cmd.run === 'function') cmd.run(makeContext(null), null);
         }
 
+        function _clearRasHintLoading() {
+            _rasResampleLoading = false;
+            document.getElementById('ras-hint')?.classList.remove('loading');
+        }
+
         function _saveFullArrayNpy() {
             if (_inPyWebView) {
                 proxyFetch(`/export_array/${sid}?save_to_downloads=1`)
@@ -35596,6 +35681,9 @@
         document.getElementById('tool-hint').addEventListener('click', () => {
             openToolMenu();
         });
+        document.getElementById('ras-hint').addEventListener('click', () => {
+            _runCommand('nifti.toggleRasResample');
+        });
         document.getElementById('tool-launcher').addEventListener('click', (e) => {
             if (e.target === e.currentTarget) closeToolLauncher();
         });
@@ -37357,6 +37445,15 @@
                 if (!qmriHintActive) _qmriOptionsPinned = false;
                 _reconcileQmriAltOptions();
             }
+
+            // 8. RAS conversion hint — visible whenever the loaded array carries
+            // NIfTI spatial metadata (single .nii/.nii.gz sessions).
+            const rasHint = document.getElementById('ras-hint');
+            if (rasHint) {
+                rasHint.classList.toggle('visible', !!spatialMeta);
+                rasHint.classList.toggle('active', rasResampleActive);
+                rasHint.setAttribute('aria-hidden', spatialMeta ? 'false' : 'true');
+            }
             _updateMvPaneFill();
         }
 
@@ -38503,7 +38600,7 @@
                 },
                 chromeToFade: () => {
                     const sel = ['#mv-cb-wrap', '#array-name', '#mv-orientation',
-                        '#help-hint', '#tool-hint',
+                        '#help-hint', '#tool-hint', '#ras-hint',
                         '.cb-island', '.cv-pixel-info', '.axes-indicator', '.mv-label'];
                     const set = new Set();
                     sel.forEach(s => document.querySelectorAll(s).forEach(el => set.add(el)));
@@ -39306,7 +39403,13 @@
             return true;
         }
 
-        function _dmenuCyclePresetFromKey() {
+        async function _dmenuCyclePresetFromKey() {
+            // In qMRI mode each pane owns its own window, so once the picker
+            // is already open, repeat `d` must keep following the mouse
+            // instead of falling back to the single shared primary path.
+            if ((qmriActive || compareQmriActive) && _hoveredQmriView) {
+                return await _cycleQmriPaneRangePreset();
+            }
             const preset = _cycleQuantilePreset();
             if (preset) {
                 _dmenuSelectCurrentPreset();

arrayview/_vscode_extension.py

@@ -10,6 +10,7 @@ import signal
 import subprocess
 import time
 import zipfile
+from contextlib import contextmanager
 from importlib.resources import files as _pkg_files
 
 from arrayview._session import _vprint
@@ -57,13 +58,85 @@ _VSCODE_EXT_FRESH_INSTALL = False  # True if we just installed it this session
 _VSCODE_EXT_RELOAD_REQUIRED = False  # installed files are newer than the live host
 _VSCODE_EXT_INSTALL_FAILED = False  # automatic install could not complete safely
 _VSCODE_EXT_NO_LIVE_WINDOW = False  # no live host claims this terminal's window id
-_VSCODE_EXT_VERSION = "0.15.48"  # current bundled extension version
+_VSCODE_EXT_VERSION = "0.15.53"  # current bundled extension version
 _VSCODE_CONFIGURED_PORTS: set[int] = set()
 # Version-skew notices already printed, so a long-lived process (Jupyter, a
 # script opening several arrays) states the mismatch once instead of per call.
 _VSCODE_EXT_SKEW_REPORTED: set[tuple] = set()
 _VSCODE_EXT_INSTALL_GUARD_PREFIX = "vscode-extension-install-failure-"
 _VSCODE_EXT_INSTALL_NO_HOST_COOLDOWN_SECONDS = 300.0
+_VSCODE_EXT_INSTALL_LOCK_TIMEOUT_SECONDS = 60.0
+_VSCODE_EXT_INSTALL_LOCK_STALE_SECONDS = 90.0
+
+
+def _vscode_extension_install_lock_path() -> str:
+    return os.path.join(
+        os.path.expanduser("~/.arrayview"), "vscode-extension-install.lock"
+    )
+
+
+@contextmanager
+def _vscode_extension_install_lock(
+    *, timeout: float = _VSCODE_EXT_INSTALL_LOCK_TIMEOUT_SECONDS
+):
+    """Serialize the rare shared-profile install transaction across processes."""
+    path = _vscode_extension_install_lock_path()
+    token = f"{os.getpid()}-{time.time_ns()}"
+    deadline = time.monotonic() + timeout
+    acquired = False
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    while True:
+        try:
+            fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o600)
+            with os.fdopen(fd, "w") as handle:
+                json.dump(
+                    {"pid": os.getpid(), "token": token, "createdAt": time.time()},
+                    handle,
+                )
+            acquired = True
+            break
+        except FileExistsError:
+            try:
+                with open(path) as handle:
+                    owner = json.load(handle)
+                owner_pid = owner.get("pid")
+                created_at = owner.get("createdAt")
+                # A live installer keeps ownership however long VS Code takes.
+                # Age alone must not permit a second process to install into the
+                # same shared registry concurrently.
+                stale = not _process_is_alive(owner_pid)
+            except (OSError, ValueError, TypeError, AttributeError):
+                # Recover a lock whose owner died between the exclusive create
+                # and writing valid JSON, but do not race an in-progress write.
+                try:
+                    stale = (
+                        time.time() - os.stat(path).st_mtime
+                        > _VSCODE_EXT_INSTALL_LOCK_STALE_SECONDS
+                    )
+                except OSError:
+                    stale = False
+            if stale:
+                try:
+                    os.unlink(path)
+                except OSError:
+                    pass
+                continue
+            if time.monotonic() >= deadline:
+                break
+            time.sleep(0.1)
+        except OSError:
+            break
+    try:
+        yield acquired
+    finally:
+        if acquired:
+            try:
+                with open(path) as handle:
+                    owner = json.load(handle)
+                if owner.get("token") == token:
+                    os.unlink(path)
+            except (OSError, ValueError, TypeError, AttributeError):
+                pass
 
 
 def _extension_install_guard_key(
@@ -256,6 +329,62 @@ def _extension_bases(*, remote: bool | None = None) -> tuple[str, ...]:
     return (local, remote_base)
 
 
+def _extension_registered(base: str, version: str) -> bool:
+    """Return whether one extension profile registers this exact installation."""
+    registry = os.path.join(base, "extensions.json")
+    expected = os.path.realpath(
+        os.path.join(base, f"arrayview.arrayview-opener-{version}")
+    )
+    try:
+        with open(registry) as handle:
+            entries = json.load(handle)
+    except (OSError, ValueError, TypeError):
+        return False
+    if not isinstance(entries, list):
+        return False
+    for entry in entries:
+        if not isinstance(entry, dict) or entry.get("version") != version:
+            continue
+        identifier = entry.get("identifier")
+        if not isinstance(identifier, dict) or (
+            str(identifier.get("id", "")).lower()
+            != "arrayview.arrayview-opener"
+        ):
+            continue
+        locations: list[str] = []
+        relative = entry.get("relativeLocation")
+        if isinstance(relative, str):
+            locations.append(os.path.join(base, relative))
+        location = entry.get("location")
+        if isinstance(location, dict):
+            for field in ("fsPath", "path"):
+                value = location.get(field)
+                if isinstance(value, str):
+                    locations.append(value)
+        if any(os.path.realpath(path) == expected for path in locations):
+            return True
+    return False
+
+
+def _wait_for_extension_registration(
+    base: str, version: str, *, timeout: float = 5.0
+) -> bool:
+    """Wait for VS Code to commit an install to the selected profile registry."""
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        if _extension_registered(base, version):
+            return True
+        time.sleep(0.1)
+    return _extension_registered(base, version)
+
+
+def _extension_directory_present(version: str, *, remote: bool) -> bool:
+    return any(
+        os.path.isdir(os.path.join(base, f"arrayview.arrayview-opener-{version}"))
+        for base in _extension_bases(remote=remote)
+    )
+
+
 def _remove_old_extension_versions(
     current_version: str, *, remote: bool | None = None
 ) -> None:
@@ -310,7 +439,7 @@ def _extension_on_disk(
     """
     for base in _extension_bases(remote=remote):
         ext_dir = os.path.join(base, f"arrayview.arrayview-opener-{version}")
-        if not os.path.isdir(ext_dir):
+        if not os.path.isdir(ext_dir) or not _extension_registered(base, version):
             continue
         if vsix_path is None:
             return True
@@ -414,7 +543,11 @@ def _newer_extension_on_disk(version: str, *, remote: bool) -> str | None:
                 continue
             candidate = entry[len(prefix) :]
             key = _version_tuple(candidate)
-            if key is not None and key > wanted:
+            if (
+                key is not None
+                and key > wanted
+                and _extension_registered(base, candidate)
+            ):
                 newer.append((key, candidate))
     return max(newer)[1] if newer else None
 
@@ -742,6 +875,14 @@ def _write_vscode_extension_hash(
                 f.write(vsix_hash)
 
 
+def _installed_extension_candidate(
+    version: str, vsix_path: str, *, remote: bool
+) -> str | None:
+    if _extension_on_disk(version, vsix_path, remote=remote):
+        return version
+    return _newer_extension_on_disk(version, remote=remote)
+
+
 def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
     """Verify or install the bundled opener for the current VS Code window.
 
@@ -813,7 +954,10 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         )
         return False
 
-    if _extension_on_disk(ext_version, vsix_path, remote=is_remote):
+    installed_version = _installed_extension_candidate(
+        ext_version, vsix_path, remote=is_remote
+    )
+    if installed_version == ext_version:
         active_matches = (
             active_version == ext_version
             if is_remote
@@ -830,7 +974,7 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         )
         return True
 
-    newer_version = _newer_extension_on_disk(ext_version, remote=is_remote)
+    newer_version = installed_version if installed_version != ext_version else None
     if newer_version is not None:
         active_matches = (
             active_version == newer_version
@@ -851,6 +995,72 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         if is_remote:
             _VSCODE_EXT_INSTALL_FAILED = True
         return False
+
+    with _vscode_extension_install_lock() as acquired:
+        if not acquired:
+            _VSCODE_EXT_INSTALL_FAILED = True
+            print(
+                "[ArrayView] timed out waiting for another VS Code opener install; "
+                "no viewer request was sent",
+                flush=True,
+            )
+            return False
+
+        # Another ArrayView process may have completed the shared-profile install
+        # while this process waited. Re-read both disk/registry and live-host state
+        # before consulting failure guards or starting a duplicate installer.
+        installed_version = _installed_extension_candidate(
+            ext_version, vsix_path, remote=is_remote
+        )
+        if installed_version is not None:
+            active_registration = _active_extension_registration()
+            active_version = (
+                active_registration.get("extensionVersion")
+                if active_registration is not None
+                else None
+            )
+            active_marker = _extension_registration_marker(active_registration)
+            active_matches = (
+                active_version == installed_version
+                if is_remote
+                else active_version in (None, installed_version)
+            )
+            if not active_matches:
+                return _reject_unmatched_host(installed_version)
+            if not is_remote and installed_version == ext_version:
+                _remove_old_extension_versions(ext_version, remote=False)
+            _VSCODE_EXT_INSTALLED = True
+            _vprint(
+                f"[ArrayView] extension v{installed_version} already installed — "
+                "skipping reinstall",
+                flush=True,
+            )
+            return True
+
+        return _install_vscode_extension_locked(
+            code=code,
+            env_ipc=_find_vscode_ipc_hook(),
+            ext_version=ext_version,
+            vsix_path=vsix_path,
+            is_remote=is_remote,
+            active_version=active_version,
+            active_marker=active_marker,
+        )
+
+
+def _install_vscode_extension_locked(
+    *,
+    code: str,
+    env_ipc: str | None,
+    ext_version: str,
+    vsix_path: str,
+    is_remote: bool,
+    active_version: str | None,
+    active_marker: tuple | None,
+) -> bool:
+    """Run and verify one install while the shared-profile lock is held."""
+    global _VSCODE_EXT_INSTALLED, _VSCODE_EXT_FRESH_INSTALL
+    global _VSCODE_EXT_RELOAD_REQUIRED, _VSCODE_EXT_INSTALL_FAILED
     install_guard = _extension_install_failure_guard(
         ext_version, code, active_marker
     )
@@ -870,11 +1080,13 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         return False
 
     env = dict(os.environ)
-    ipc = _find_vscode_ipc_hook()
-    if ipc:
-        env["VSCODE_IPC_HOOK_CLI"] = ipc
+    if env_ipc:
+        env["VSCODE_IPC_HOOK_CLI"] = env_ipc
 
     install_snapshot = _extension_base_snapshot() if is_remote else {}
+    orphaned_install = _extension_directory_present(
+        ext_version, remote=is_remote
+    )
     # Say so before the slow part, not after it. Installing the opener takes
     # several seconds and may end in "reload this window once"; announcing that
     # only in the final error message left the terminal looking hung, with the
@@ -885,8 +1097,11 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         flush=True,
     )
     try:
+        command = [code, "--install-extension", vsix_path]
+        if orphaned_install:
+            command.append("--force")
         r = _run_extension_installer(
-            [code, "--install-extension", vsix_path], env
+            command, env
         )
         combined = (r.stdout or "") + (r.stderr or "")
         install_failed = (
@@ -921,6 +1136,23 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
                 install_bases = (active_base,)
             else:
                 install_bases = _extension_bases(remote=False)
+            registered_bases = tuple(
+                base
+                for base in install_bases
+                if _wait_for_extension_registration(base, ext_version)
+            )
+            if not registered_bases:
+                _VSCODE_EXT_INSTALL_FAILED = True
+                message = (
+                    "the installer extracted the opener but did not register it "
+                    "in the selected VS Code profile"
+                )
+                _write_extension_install_failure_guard(
+                    ext_version, code, active_marker, message
+                )
+                print(f"[ArrayView] extension install incomplete: {message}", flush=True)
+                return False
+            install_bases = registered_bases
             _patch_vscode_extension_metadata(ext_version, bases=install_bases)
             try:
                 _write_vscode_extension_hash(

{arrayview-0.43.2.dist-info → arrayview-0.43.3.dist-info}/METADATA

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

{arrayview-0.43.2.dist-info → arrayview-0.43.3.dist-info}/RECORD

@@ -26,7 +26,7 @@ arrayview/_routes_loading.py,sha256=s7Vc33Og9Cr2YrsFX7VP5lwjLY5Aa6fv9WoqQfJAsR8,
 arrayview/_routes_persistence.py,sha256=T03csHb7ppGT-8yMDf227XkqhnhjgSLYj0RW2wmg59g,17176
 arrayview/_routes_preferences.py,sha256=SKnhTf2X2vRyYi06Wb2si4dXMB1y0XiSBr28RZ5oKUw,4691
 arrayview/_routes_preload.py,sha256=KOsankNguxdIWmFW9iZcY9p2SvUN1mOKY7KkW1qMGcc,1729
-arrayview/_routes_query.py,sha256=BbTl_1-OC_T4cZLdYkPwgEXQJJ8CzMFaMF3QhhM3uqc,21375
+arrayview/_routes_query.py,sha256=6ECRn15sPa0h0bxlu61u2l7pjRiettds1d_82SqalyM,21964
 arrayview/_routes_rendering.py,sha256=EQq2QzdtUS_pv35k7prLdlRdO5nByIlQ_Eu0nhVsn1Y,22970
 arrayview/_routes_segmentation.py,sha256=x2bBjQffZryeTMmOH38YdBWethw1o3KpA8V0chJcZHI,23599
 arrayview/_routes_state.py,sha256=T_xoYcRlv7L47ydTxxiXb0Fp5M5x9KR2U-wkxaVeuMY,12462
@@ -42,17 +42,17 @@ arrayview/_synthetic_mri.py,sha256=CNL-2WC835i6WCqkvmWBCO6WQ5w7HE5trNb8OyEfe64,7
 arrayview/_torch.py,sha256=13sqIMCUu_-b9SQ9KfDCExDz2UMStL87EDVjnbJxAEo,7536
 arrayview/_tutorial.py,sha256=U09j6hcps_dp3_azivvAoTChwqjNYGNLFqu9Cz1bOzE,6839
 arrayview/_vectorfield.py,sha256=eDqMCMEGjO8Jdt-6Auh01cz3WD9dbF7xYUWD9xHAf1E,8115
-arrayview/_viewer.html,sha256=JYkMXAkmPrP0WTvS53eaFCEeJ-ZXbBGaS1dYk2TkT7k,2098084
+arrayview/_viewer.html,sha256=k5LoQgwjo4GcRBTJNkQoaRJqpjwRIRr1tUrvMwEQO-g,2103699
 arrayview/_vscode.py,sha256=EKnGN2zrjlybc4FQOmYA8BvYdtkcJbLHDEdgtvO7ul4,837
 arrayview/_vscode_browser.py,sha256=xypCgIwphII1Jgb6xC92gJu4Zo-oHtwjceymOqq4D_Y,20132
-arrayview/_vscode_extension.py,sha256=dBQiP92h-2QH-sRbTtm3InAkxiIg_1YGswTmaLmXyvY,44477
+arrayview/_vscode_extension.py,sha256=RFXB1rMHnW2BUdbFtrSGvrok8iii3zNWM2dN3U6XV-c,53156
 arrayview/_vscode_signal.py,sha256=8kf6rHrowQ0P6HzHavqb1IWweKh-JyB_rq39v80Bkks,51366
 arrayview/_watch.py,sha256=PxxS_5hcj_S6xQf9Ep4p1HLRkrI5iDMh1aRa4olV7ew,1873
-arrayview/arrayview-opener.vsix,sha256=jQSEXjPTB2dMzKLVCvsdjUGvlOZV8cYVPPPA_YEndhM,54164
+arrayview/arrayview-opener.vsix,sha256=BBE4qdw5k1CRrbkkO7ok15FeCRsbPxRNjsZlv56UK_A,55048
 arrayview/gsap.min.js,sha256=VGihm4idI0E1uqrWezWsiScB9F_jMosn7qs6pPSkeac,72304
 arrayview/todo.md,sha256=4rzoaIY4nJJACDHPJKeqP8guasCMxeRQ1cyNLxUYink,999
-arrayview-0.43.2.dist-info/METADATA,sha256=PmteArvJCUMkj5kkTtaeUntyGx2sqcg-T3tq0e5im1Q,2515
-arrayview-0.43.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-arrayview-0.43.2.dist-info/entry_points.txt,sha256=-0s08axutXkTbINiKs0Q7iv-33aWuTaamUg2q2-NyQ4,60
-arrayview-0.43.2.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
-arrayview-0.43.2.dist-info/RECORD,,
+arrayview-0.43.3.dist-info/METADATA,sha256=az_70CEhvCdtbjXQq8UhTvHPpJfTk6UaDJCFxeLGM6E,2515
+arrayview-0.43.3.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+arrayview-0.43.3.dist-info/entry_points.txt,sha256=-0s08axutXkTbINiKs0Q7iv-33aWuTaamUg2q2-NyQ4,60
+arrayview-0.43.3.dist-info/licenses/LICENSE,sha256=34OivjM9faB2QaPjZpMRTIiSx31V3U9cEyQ6F2k-bH0,1062
+arrayview-0.43.3.dist-info/RECORD,,