arrayview 0.37.1__tar.gz → 0.39.0__tar.gz

{arrayview-0.37.1 → arrayview-0.39.0}/PKG-INFO

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

{arrayview-0.37.1 → arrayview-0.39.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arrayview"
-version = "0.37.1"
+version = "0.39.0"
 description = "Fast multi-dimensional array viewer"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.12"
@@ -43,7 +43,6 @@ dependencies = [
 
 [project.scripts]
 arrayview = "arrayview._launcher:arrayview"
-arrayview-codex = "arrayview._codex_open:main"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/arrayview"]

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_io.py

@@ -1304,6 +1304,8 @@ def _load_file_series(path, *, load="lazy", stack="auto"):
     Returns ``(series, spatial_meta)``.
     """
     # ── collect files by parent directory ──────────────────────────
+    from ._dicom import is_dicom_source
+
     patients: dict[str, list[str]] = {}
     all_nifti = True
 
@@ -1312,6 +1314,14 @@ def _load_file_series(path, *, load="lazy", stack="auto"):
             os.path.join(root, f)
             for f in files
             if _get_ext(f) in _SUPPORTED_EXTS
+            # ".dcm" is necessary but not sufficient — every other .dcm
+            # consumer (load_data, load_data_with_meta, _peek_file_shape's
+            # directory branch) validates via is_dicom_source before
+            # treating a file as real DICOM. Do the same here, otherwise a
+            # stray file that merely has a .dcm extension gets counted as a
+            # patient's series member and blows up load_data() downstream
+            # instead of being silently ignored like any other unsupported file.
+            if _get_ext(f) != ".dcm" or is_dicom_source(os.path.join(root, f))
         )
         if supported:
             patients[root] = supported
@@ -1476,9 +1486,16 @@ def load_data_with_meta(filepath, key=None, *, load="lazy", stack="auto", select
     """
     from ._dicom import is_dicom_source, load_dicom_series
 
-    if (os.path.isdir(filepath) or filepath.lower().endswith(".dcm")) and is_dicom_source(filepath):
+    # A ".zarr" store is itself a directory on disk. It must be excluded from
+    # the generic "directory of files to stack" path below, or the walk finds
+    # nothing matching a supported single-file extension inside it (zarr's own
+    # chunk/metadata files don't) and raises instead of opening the store.
+    is_zarr_dir = os.path.isdir(filepath) and _get_ext(filepath) == ".zarr"
+    if (
+        (os.path.isdir(filepath) and not is_zarr_dir) or filepath.lower().endswith(".dcm")
+    ) and is_dicom_source(filepath):
         return load_dicom_series(filepath, select=select)
-    if os.path.isdir(filepath):
+    if os.path.isdir(filepath) and not is_zarr_dir:
         return _load_file_series(filepath, load=load, stack=stack)
     if filepath.endswith(".nii") or filepath.endswith(".nii.gz"):
         return _load_nifti_with_meta(filepath)
@@ -1491,7 +1508,7 @@ def load_data(filepath, key=None):
 
         data, _meta = load_dicom_series(filepath)
         return data
-    if os.path.isdir(filepath):
+    if os.path.isdir(filepath) and _get_ext(filepath) != ".zarr":
         from ._dicom import is_dicom_source, load_dicom_series
 
         if is_dicom_source(filepath):
@@ -1646,6 +1663,13 @@ FULL_LOAD_EXTS = frozenset([".pt", ".pth", ".tif", ".tiff", ".mat"])
 def _peek_file_shape(fpath: str, ext: str):
     """Try to return shape quickly without loading the full array. Returns None on failure."""
     try:
+        # ".zarr" stores are directories, but they're a single array, not a
+        # collection to walk and stack — read metadata via zarr, not the
+        # directory-of-files branch below.
+        if ext in (".zarr", ".zarr.zip"):
+            import zarr
+
+            return list(zarr.open(fpath, mode="r").shape)
         if os.path.isdir(fpath):
             from ._dicom import is_dicom_source, load_dicom_series
 

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_launch_plan.py

@@ -41,7 +41,6 @@ class Invocation(_StrEnum):
     JULIA = "julia"
     MATLAB = "matlab"
     VSCODE_EXPLORER = "vscode_explorer"
-    CODEX = "codex"
 
 
 class Environment(_StrEnum):

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_launcher.py

@@ -44,6 +44,21 @@ import arrayview._platform as _platform_mod  # for mutable globals
 _vscode_mod_cache = None
 
 
+def _detached_child_kwargs() -> dict[str, object]:
+    """Popen options placing a spawned child outside our own signal reach.
+
+    ``start_new_session`` is POSIX-only, so passing ``sys.platform != "win32"``
+    left every Windows spawn in the parent's console process group.  A console
+    control event raised for that group reaches *every* process attached to it,
+    so a child being shut down can deliver a KeyboardInterrupt to the process
+    that spawned it — under pytest, to the test runner itself.  Both branches
+    state the same intent: the child gets its own group.
+    """
+    if sys.platform == "win32":
+        return {"creationflags": subprocess.CREATE_NEW_PROCESS_GROUP}
+    return {"start_new_session": True}
+
+
 def _trace_launch_event(event: str, **attrs: object) -> None:
     """Emit an opt-in launch event without loading tracing on normal paths."""
     if not os.environ.get("ARRAYVIEW_LAUNCH_TRACE"):
@@ -495,7 +510,7 @@ def _open_webview(
             stdout=subprocess.DEVNULL,
             stderr=subprocess.PIPE if capture_stderr else subprocess.DEVNULL,
             close_fds=True,
-            start_new_session=sys.platform != "win32",
+            **_detached_child_kwargs(),
         )
 
     # URL mode — direct load (used when shell_port not provided)
@@ -545,7 +560,7 @@ def _open_webview(
         stdout=subprocess.DEVNULL,
         stderr=subprocess.PIPE if capture_stderr else subprocess.DEVNULL,
         close_fds=True,
-        start_new_session=sys.platform != "win32",
+        **_detached_child_kwargs(),
     )
 
 
@@ -2062,7 +2077,7 @@ def _handle_cli_spawned_daemon(
             "stdout": subprocess.DEVNULL,
             "stderr": subprocess.DEVNULL,
             "close_fds": True,
-            "start_new_session": sys.platform != "win32",
+            **_detached_child_kwargs(),
         }
         if os.environ.get("ARRAYVIEW_LAUNCH_TRACE"):
             from arrayview._launch_trace import trace_child_environment
@@ -3998,7 +4013,7 @@ def _view_subprocess(
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
                     close_fds=True,
-                    start_new_session=sys.platform != "win32",
+                    **_detached_child_kwargs(),
                 )
                 if not _wait_for_spawned_server(daemon_proc, port, timeout=15.0):
                     raise RuntimeError(
@@ -5439,7 +5454,7 @@ def arrayview():
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
                 close_fds=True,
-                start_new_session=sys.platform != "win32",
+                **_detached_child_kwargs(),
             )
             if not _wait_for_spawned_server(proc, args.port, timeout=15.0):
                 _terminate_owned_process(proc)

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_platform.py

@@ -6,6 +6,7 @@ import importlib.util
 import hashlib
 import json
 import os
+from collections.abc import Callable
 import subprocess
 import sys
 
@@ -450,6 +451,42 @@ def _process_is_alive(pid: object) -> bool:
         return False
 
 
+def _superseding_window_registration(
+    claimed_ids: list[str],
+    signal_dir: str,
+    read: Callable[[str], tuple[str, dict] | None],
+) -> tuple[str, dict] | None:
+    """Return the live window that replaced one of ``claimed_ids``, if unique.
+
+    Each registration lists the window ids it took over from, so a terminal left
+    holding a pre-reload id resolves to its own window rather than to a sibling
+    that merely shares a server root.  Two live windows claiming one id would be a
+    contradiction, so an ambiguous answer is refused instead of guessed.
+    """
+    if not claimed_ids:
+        return None
+    wanted = set(claimed_ids)
+    try:
+        filenames = os.listdir(signal_dir)
+    except OSError:
+        return None
+
+    matches: list[tuple[str, dict]] = []
+    for filename in filenames:
+        if not filename.startswith("window-") or not filename.endswith(".json"):
+            continue
+        candidate = read(filename[len("window-") : -len(".json")])
+        if candidate is None:
+            continue
+        superseded = candidate[1].get("supersedes")
+        if not isinstance(superseded, list):
+            continue
+        if wanted.intersection(item for item in superseded if isinstance(item, str)):
+            matches.append(candidate)
+
+    return matches[0] if len(matches) == 1 else None
+
+
 def _exact_vscode_window_registration(
     ipc: str | None = None,
 ) -> tuple[str, dict] | None:
@@ -461,6 +498,11 @@ def _exact_vscode_window_registration(
     remote registration is unsafe.  When direct window evidence is unavailable,
     match the live extension-host executable to the exact server root named by
     the terminal's NLS configuration, and only accept a unique match.
+
+    Reloading a window rotates its IPC socket and re-injects ``ARRAYVIEW_WINDOW_ID``
+    into new terminals only, so a terminal that predates the reload keeps naming a
+    window id that no longer registers.  The extension records the ids it replaced,
+    which turns that stale name back into an exact match on the window that owns it.
     """
     signal_dir = os.path.expanduser("~/.arrayview")
 
@@ -479,16 +521,23 @@ def _exact_vscode_window_registration(
             return None
         return window_id, registration
 
+    claimed_ids: list[str] = []
     registration = None
     if ipc:
         window_id = hashlib.sha256(ipc.encode()).hexdigest()[:16]
         if reg := _read(window_id):
             return reg
+        claimed_ids.append(window_id)
         registration = reg
     if registration is None:
         window_id = os.environ.get("ARRAYVIEW_WINDOW_ID")
-        if window_id and (reg := _read(window_id)):
-            return reg
+        if window_id:
+            if reg := _read(window_id):
+                return reg
+            claimed_ids.append(window_id)
+
+    if reg := _superseding_window_registration(claimed_ids, signal_dir, _read):
+        return reg
 
     exact_cli = _current_vscode_remote_cli()
     if exact_cli is None:
@@ -532,9 +581,25 @@ def _exact_vscode_registration_remote(ipc: str) -> bool | None:
     both can exist in a local desktop window.
     """
     exact = _exact_vscode_window_registration(ipc)
-    if exact is not None and "remoteName" in exact[1]:
-        return exact[1].get("remoteName") is not None
-    return None
+    if exact is None or "remoteName" not in exact[1]:
+        return None
+    # _exact_vscode_window_registration's ARRAYVIEW_WINDOW_ID fallback trusts
+    # that id's own file directly and unconditionally — other callers (signal
+    # targeting, extension-version checks) need it to still resolve a window
+    # when ipc is unavailable or has legitimately drifted (e.g. a tunnel
+    # re-sockets without the window itself changing). Answering "is this
+    # remote" is riskier: a wrong placement picks the wrong display path
+    # outright. So here specifically, a raw env-var match with nothing to
+    # corroborate it against a live, unmatched ipc is refused rather than
+    # trusted — fall through to the caller's other signals instead.
+    env_window_id = os.environ.get("ARRAYVIEW_WINDOW_ID")
+    if (
+        ipc
+        and exact[0] == env_window_id
+        and exact[0] != hashlib.sha256(ipc.encode()).hexdigest()[:16]
+    ):
+        return None
+    return exact[1].get("remoteName") is not None
 
 
 def _has_live_vscode_remote_registration() -> bool:

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_routes_preferences.py

@@ -42,7 +42,10 @@ def _response_payload() -> dict:
                 value for value in schema["window"][key] if value != "native"
             ]
     if vscode_remote:
-        schema["window"]["vscode"] = ["vscode", "none"]
+        # Native and browser don't make sense from a headless remote host;
+        # "none" is an internal fallback only, hidden from every row above —
+        # this hardcoded replacement must keep hiding it too.
+        schema["window"]["vscode"] = ["vscode"]
 
     overrides = {}
     if os.environ.get("ARRAYVIEW_WINDOW", "").strip():

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_routes_query.py

@@ -1,3 +1,4 @@
+import asyncio
 import io
 
 import numpy as np

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_viewer.html

@@ -6159,6 +6159,8 @@
         let rangeLocked = true; // when true, d-set limits never auto-recompute on navigation
         let vminLocked = false;  // lock lower bound independently
         let vmaxLocked = false;  // lock upper bound independently
+        let symmetricLocked = false;  // tie vmin = -vmax so zero stays centred
+        let _dmenuSymmetricMirroring = false;  // re-entrancy guard for the mirror write
         let excludeZeros = false; // exclude zero-valued voxels from histogram computation
         let spatialMeta = null; // {voxel_sizes, axis_labels, is_oblique} or null
         let rasResampleActive = false;
@@ -20118,6 +20120,8 @@
 
         // ── Brightness/Contrast drag (Cmd+Shift+drag) and scroll ─────────
         let _bcDrag = null; // { startX, startY, initCenter, initWidth }
+        let _bcPendingDrag = null; // { startX, startY } — armed plain-left press, not yet a drag
+        const _BC_DRAG_DEADZONE = 5; // CSS px a press must travel before it counts as windowing
         let _bcScrollTimer = null; // debounce timer for scroll-based BC
         let _bcScrollAnchor = null; // { center, width, accumX, accumY } for scroll accumulation
         let _bcUpdateTimer = null; // throttle timer for server updates during drag
@@ -20183,6 +20187,12 @@
                 startX: e.clientX, startY: e.clientY,
                 initCenter: (vmin + vmax) / 2,
                 initWidth: vmax - vmin,
+                // A locked vmin or a symmetric lock removes a degree of
+                // freedom, so the drag has to collapse to one axis — see
+                // _bcUpdateDrag.
+                vminLocked: _dmenuEffectiveVminLocked(),
+                symmetric: _dmenuEffectiveSymmetricLocked(),
+                lockedLo: vmin,
             };
             canvas.style.cursor = 'crosshair';
             _bcExpandHist();
@@ -20193,12 +20203,46 @@
             const dy = e.clientY - _bcDrag.startY;
             // Sensitivity: scale by initial width so drag feels proportional
             const sens = _bcDrag.initWidth / 300;
-            const newCenter = _bcDrag.initCenter - dx * sens;
-            const newWidth = _bcDrag.initWidth - dy * sens * 2;
+            let newWidth = _bcDrag.initWidth - dy * sens * 2;
+            let newCenter;
+            if (_bcDrag.symmetric) {
+                // Bounds are tied to ±half-width, so the centre is fixed at
+                // zero and only the width is free — vertical-only, same shape
+                // as the pinned-vmin case below but anchored differently.
+                newWidth = Math.max(newWidth, Math.abs(_bcDrag.initWidth) * 1e-3 || 1e-9);
+                newCenter = 0;
+            } else if (_bcDrag.vminLocked) {
+                // vmin is pinned (manual lock, qMRI role, or zero floor), so
+                // vmax is the only free bound and centre/width are no longer
+                // independent. The horizontal axis has nothing to move: the
+                // drag collapses to vertical-only, growing the window upward
+                // from the pinned vmin. Clamped so vmax can never cross it.
+                newWidth = Math.max(newWidth, Math.abs(_bcDrag.initWidth) * 1e-3 || 1e-9);
+                newCenter = _bcDrag.lockedLo + newWidth / 2;
+            } else {
+                newCenter = _bcDrag.initCenter - dx * sens;
+            }
             _bcApplyWindow(newCenter, newWidth);
             _bcThrottledUpdate();
         }
+        // A plain left press arms a pending drag rather than starting one, so a
+        // press that never travels stays a click-to-copy / pixel-info hold.
+        // Past the deadzone it becomes window/level — the PACS convention for a
+        // single 2D view. Ortho and the other multi-view panes have their own
+        // canvases and keep left-drag for crosshair navigation.
+        function _bcMaybePromotePending(e) {
+            if (!_bcPendingDrag || _bcDrag) return;
+            if (!(e.buttons & 1)) { _bcPendingDrag = null; return; }
+            const origin = _bcPendingDrag;
+            if (Math.hypot(e.clientX - origin.startX, e.clientY - origin.startY) < _BC_DRAG_DEADZONE) return;
+            _bcPendingDrag = null;
+            if (_pixelInfoHeld) { _pixelInfoHeld = false; hideAllPixelInfo(); }
+            // Anchor to the press origin, not to here, so the window doesn't
+            // jump by the deadzone distance on the first frame.
+            _bcStartDrag({ clientX: origin.startX, clientY: origin.startY });
+        }
         function _bcEndDrag() {
+            _bcPendingDrag = null;
             if (!_bcDrag) return;
             _bcDrag = null;
             canvas.style.cursor = '';
@@ -20321,6 +20365,7 @@
             if (!rectRoiMode && e.button === 0 && !e.shiftKey && !e.metaKey && !e.altKey
                 && !_cropActive && !_segMode && !_rulerMode) {
                 _pixelInfoHeld = true;
+                if (_bcCanDrag()) _bcPendingDrag = { startX: e.clientX, startY: e.clientY };
                 canvas.dispatchEvent(new MouseEvent('mousemove', { clientX: e.clientX, clientY: e.clientY, buttons: 1, ctrlKey: e.ctrlKey, bubbles: true }));
                 setTimeout(() => {
                     if (!_pixelInfoHeld) return;
@@ -21437,7 +21482,7 @@
         }
         // Old export-btn and roi-content listeners removed — now handled by island actions
         // Brightness/contrast: mousemove updates vmin/vmax
-        canvas.addEventListener('mousemove', e => { _bcUpdateDrag(e); });
+        canvas.addEventListener('mousemove', e => { _bcMaybePromotePending(e); _bcUpdateDrag(e); });
         // Crop drag-handle: while dragging, update the matching edge; otherwise
         // provide hover-cursor feedback when near an edge. Runs even when
         // Alt is held so we still update during an accidental Alt hover,
@@ -34766,6 +34811,17 @@
             return vminLocked || _dmenuPolicyLocksVmin();
         }
 
+        // Signed data whose zero is a reference point — difference images,
+        // phase, field maps, statistical maps — only reads correctly when zero
+        // sits at the centre of the colormap; window it asymmetrically and the
+        // neutral colour drifts off zero, so sign can no longer be judged by
+        // eye. This lock ties the bounds together to prevent that. It stays
+        // opt-in rather than auto-engaging on any signed data, because plenty
+        // of signed data (CT in Hounsfield units) has no symmetry about zero.
+        function _dmenuEffectiveSymmetricLocked() {
+            return symmetricLocked;
+        }
+
         function _dmenuRows() {
             const qmriPolicyLocksVmin = _dmenuQmriPolicyLocksVmin();
             const zeroFloorLocksVmin = _dmenuZeroFloorLocksVmin();
@@ -34773,6 +34829,8 @@
             return [
                 { kind: 'lock', action: 'vmin', label: 'vmin', policyLocked: policyLocksVmin, zeroFloorLocked: zeroFloorLocksVmin, qmriPolicyLocked: qmriPolicyLocksVmin, note: _dmenuEffectiveVminLocked() ? 'locked' : '' },
                 { kind: 'lock', action: 'vmax', label: 'vmax', note: vmaxLocked ? 'locked' : '' },
+                { kind: 'lock', action: 'symmetric', label: '±', note: _dmenuEffectiveSymmetricLocked() ? 'locked' : '',
+                  lockTitle: _dmenuEffectiveSymmetricLocked() ? 'symmetric: zero centred' : 'symmetric: unlocked' },
             ];
         }
 
@@ -34799,11 +34857,13 @@
                 btn.setAttribute('aria-checked', locked ? 'true' : 'false');
                 if (idx === _dmenuSelectedIdx) btn.classList.add('is-selected');
                 if (locked) btn.classList.add('is-locked');
-                const lockLabel = row.qmriPolicyLocked
-                    ? `${row.label}: locked at 0 by qMRI role`
-                    : row.zeroFloorLocked
-                        ? `${row.label}: locked at 0`
-                        : (locked ? `${row.label}: locked` : `${row.label}: unlocked`);
+                const lockLabel = row.lockTitle
+                    ? row.lockTitle
+                    : row.qmriPolicyLocked
+                        ? `${row.label}: locked at 0 by qMRI role`
+                        : row.zeroFloorLocked
+                            ? `${row.label}: locked at 0`
+                            : (locked ? `${row.label}: locked` : `${row.label}: unlocked`);
                 btn.title = lockLabel;
                 btn.setAttribute('aria-label', lockLabel);
                 btn.innerHTML = locked
@@ -34825,7 +34885,11 @@
                 });
                 return btn;
             };
-            return [makeLock(rows[0], 0, _dmenuEffectiveVminLocked()), makeLock(rows[1], 1, vmaxLocked)];
+            return [
+                makeLock(rows[0], 0, _dmenuEffectiveVminLocked()),
+                makeLock(rows[1], 1, vmaxLocked),
+                makeLock(rows[2], 2, _dmenuEffectiveSymmetricLocked()),
+            ];
         }
 
         function _dmenuSetBoundManual(action, value) {
@@ -34865,6 +34929,14 @@
                 if (compareMvActive) compareMvViews.forEach(v => { v.lockedVmax = manualVmax; });
                 if (compareQmriActive) compareQmriViews.forEach(v => { v.lockedVmax = manualVmax; });
             }
+            // Under a symmetric lock the bounds move together, so mirror the
+            // write through the same per-mode fan-out above rather than
+            // duplicating it. The guard stops the mirror from recursing.
+            if (!_dmenuSymmetricMirroring && _dmenuEffectiveSymmetricLocked()) {
+                _dmenuSymmetricMirroring = true;
+                try { _dmenuSetBoundManual(action === 'vmin' ? 'vmax' : 'vmin', -value); }
+                finally { _dmenuSymmetricMirroring = false; }
+            }
         }
 
         function _dmenuClearPresetForManualRange(target) {
@@ -35351,6 +35423,26 @@
                 if (_dmenuApplyBoundPreset(row.action, row.index)) _dmenuCloseAfterSelection();
                 return;
             }
+            if (row.action === 'symmetric') {
+                symmetricLocked = !symmetricLocked;
+                if (symmetricLocked) {
+                    // Snap the current window symmetric straight away so the
+                    // toggle has a visible effect rather than only shaping
+                    // later adjustments. The widest bound sets the half-width
+                    // so nothing currently visible gets clipped away.
+                    const half = Math.max(
+                        Math.abs(Number(manualVmin ?? currentVmin)),
+                        Math.abs(Number(manualVmax ?? currentVmax)),
+                    );
+                    if (Number.isFinite(half) && half > 0) _dmenuSetBoundManual('vmax', half);
+                }
+                _dmenuRefreshAfterRangeChange();
+                _dmenuPickerRender();
+                _restartHistAutoDismiss();
+                saveState();
+                if (closeAfterSelection) _dmenuCloseAfterSelection();
+                return;
+            }
             if (row.action === 'vmin') {
                 if (row.zeroFloorLocked) {
                     _dmenuZeroFloorVminUnlocked = true;

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_vscode_browser.py

@@ -275,6 +275,12 @@ def _open_browser(
                         "ArrayView could not safely install its VS Code opener in "
                         "this exact remote window; no viewer request was sent."
                     )
+                elif _extension_state._VSCODE_EXT_NO_LIVE_WINDOW:
+                    detail = (
+                        "This terminal was opened before its VS Code window reloaded, "
+                        "so it still points at a window that no longer exists. Open a "
+                        "new terminal in the target window and retry."
+                    )
                 elif _extension_state._VSCODE_EXT_RELOAD_REQUIRED:
                     detail = (
                         "ArrayView's VS Code opener was installed; reload this exact "

{arrayview-0.37.1 → arrayview-0.39.0}/src/arrayview/_vscode_extension.py

@@ -54,7 +54,8 @@ _VSCODE_EXT_INSTALLED = False  # cached so we only check once per process
 _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_VERSION = "0.14.88"  # current bundled extension version
+_VSCODE_EXT_NO_LIVE_WINDOW = False  # no live host claims this terminal's window id
+_VSCODE_EXT_VERSION = "0.14.90"  # current bundled extension version
 _VSCODE_CONFIGURED_PORTS: set[int] = set()
 
 def _bundled_vscode_vsix_version(vsix_path: str) -> str | None:
@@ -357,7 +358,12 @@ def _run_extension_installer(command: list[str], env: dict[str, str]) -> subproc
         stderr=subprocess.PIPE,
         text=True,
         env=env,
+        # Same intent on both platforms: the installer gets its own group, so
+        # neither its shutdown nor a console Ctrl-C crosses between us and it.
         start_new_session=os.name != "nt",
+        creationflags=(
+            subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0
+        ),
     )
     try:
         stdout, stderr = process.communicate(timeout=30)
@@ -471,9 +477,11 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
     """
     global _VSCODE_EXT_INSTALLED, _VSCODE_EXT_FRESH_INSTALL
     global _VSCODE_EXT_RELOAD_REQUIRED, _VSCODE_EXT_INSTALL_FAILED
+    global _VSCODE_EXT_NO_LIVE_WINDOW
     _VSCODE_EXT_FRESH_INSTALL = False
     _VSCODE_EXT_RELOAD_REQUIRED = False
     _VSCODE_EXT_INSTALL_FAILED = False
+    _VSCODE_EXT_NO_LIVE_WINDOW = False
 
     vsix_path = str(_pkg_files("arrayview").joinpath("arrayview-opener.vsix"))
     if not os.path.isfile(vsix_path):
@@ -496,6 +504,31 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
         and active_registration.get("extensionVersion") == active_version
         else None
     )
+    def _reject_unmatched_host(installed_version: str) -> bool:
+        """Record why the live host was rejected, so callers can advise correctly.
+
+        A version disagreement is fixed by reloading; an unidentifiable window is
+        not.  Conflating them tells the user to reload when the reload is what
+        stranded their terminal in the first place.
+        """
+        global _VSCODE_EXT_RELOAD_REQUIRED, _VSCODE_EXT_NO_LIVE_WINDOW
+        if active_version is None:
+            _VSCODE_EXT_NO_LIVE_WINDOW = True
+            _vprint(
+                f"[ArrayView] opener v{installed_version} is installed, but no live "
+                "VS Code window claims this terminal; open a new terminal in the "
+                "target window",
+                flush=True,
+            )
+            return False
+        _VSCODE_EXT_RELOAD_REQUIRED = True
+        _vprint(
+            f"[ArrayView] opener v{installed_version} is installed, but this VS Code "
+            "window is still running an older extension host; reload this window",
+            flush=True,
+        )
+        return False
+
     if _extension_on_disk(ext_version, vsix_path, remote=is_remote):
         active_matches = (
             active_version == ext_version
@@ -503,13 +536,7 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
             else active_version in (None, ext_version)
         )
         if not active_matches:
-            _VSCODE_EXT_RELOAD_REQUIRED = True
-            _vprint(
-                f"[ArrayView] opener v{ext_version} is installed, but this VS Code "
-                "window is still running an older extension host; reload this window",
-                flush=True,
-            )
-            return False
+            return _reject_unmatched_host(ext_version)
         if not is_remote:
             _remove_old_extension_versions(ext_version, remote=False)
         _VSCODE_EXT_INSTALLED = True
@@ -527,13 +554,7 @@ def _ensure_vscode_extension(*, is_remote: bool | None = None) -> bool:
             else active_version in (None, newer_version)
         )
         if not active_matches:
-            _VSCODE_EXT_RELOAD_REQUIRED = True
-            _vprint(
-                f"[ArrayView] newer opener v{newer_version} is installed, but this "
-                "VS Code window is still running an older extension host; reload this window",
-                flush=True,
-            )
-            return False
+            return _reject_unmatched_host(newer_version)
         _VSCODE_EXT_INSTALLED = True
         _vprint(
             f"[ArrayView] newer extension v{newer_version} is installed — keeping it",

{arrayview-0.37.1 → arrayview-0.39.0}/tests/conftest.py

@@ -11,6 +11,29 @@ import uvicorn
 from arrayview._app import app
 
 
+# ---------------------------------------------------------------------------
+# Isolation
+# ---------------------------------------------------------------------------
+
+@pytest.fixture(autouse=True)
+def isolated_runtime_directory(tmp_path_factory, monkeypatch):
+    """Give every test its own instance registry.
+
+    An in-process ``view()`` registers the *running interpreter* as an ArrayView
+    instance.  Sharing one registry therefore lets a later test that shells out
+    to ``arrayview stop`` discover the test runner, verify it as a legitimately
+    owned instance, and SIGTERM it — pytest dies mid-file with exit 143 and no
+    failing test to point at.  Subprocesses inherit the variable, so the whole
+    tree stays inside the sandbox.
+
+    It also keeps a local test run from reaching the developer's real registry
+    and stopping viewers they have open.
+    """
+    monkeypatch.setenv(
+        "ARRAYVIEW_RUNTIME_DIR", str(tmp_path_factory.mktemp("runtime"))
+    )
+
+
 # ---------------------------------------------------------------------------
 # Server
 # ---------------------------------------------------------------------------