Merge remote-tracking branch 'origin/main' into fix/orientationcontroller2

Author: wayfarer3130

.circleci/config.yml

@@ -52,6 +52,7 @@ jobs:
                                      # CVE-2026-26996 - minimatch via other packages are strictly for building and CI/CD purposes; no user supplied expressions are passed to minimatch
               "GHSA-7r86-cg39-jmmj"  # CVE-2026-27903 - minimatch same as above
               "GHSA-23c5-xmqv-rm74"  # CVE-2026-27904 - minimatch same as above
+              "GHSA-c2c7-rcm5-vvqj"  # CVE-2026-33671 - picomatch is generally used for development and CI/CD purposes
             )
 
             # Build ignore flags

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/workflows/ohif-downstream.yml

@@ -1,8 +1,22 @@
 name: OHIF Downstream Validation
 
+# Pull requests: add a line to the PR body, same style as OHIF uses for CS3D_REF:
+#   OHIF_REF: <branch-or-tag>
+# If omitted, Viewers ref defaults to master. workflow_dispatch can set ohif_ref instead.
 on:
   pull_request:
   workflow_dispatch:
+    inputs:
+      ohif_ref:
+        description: >-
+          OHIF Viewers branch or tag (e.g. master, beta). On pull_request you can instead add
+          a line "OHIF_REF: <ref>" to the PR body.
+        required: false
+        default: 'master'
+
+permissions:
+  contents: read
+  pull-requests: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,16 +25,29 @@ concurrency:
 jobs:
   ohif-downstream:
     name: OHIF downstream tests against this PR
-    runs-on: ubuntu-latest
-    timeout-minutes: 180
+    runs-on: self-hosted
+    timeout-minutes: 120
     env:
-      BUN_VERSION: 1.2.23
-      NODE_VERSION: 20
-      OHIF_REF: master
+      BUN_VERSION: 1.3.11
+      NODE_VERSION: 24
       OHIF_DIR: ohif
+      # Update to force a rebuild of the OHIF integration
+      BUILD_INDEX: 0
     steps:
       - name: Checkout Cornerstone
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+
+      - name: Resolve OHIF ref (PR body OHIF_REF line or workflow_dispatch input)
+        run: bash scripts/ci/ohif-ref-resolve.sh
+        env:
+          GH_TOKEN: ${{ github.token }}
+          EVENT_NAME: ${{ github.event_name }}
+          REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          OHIF_REF_INPUT: ${{ github.event.inputs.ohif_ref }}
+          DEFAULT_REF: master
 
       - name: Log build context (OHIF/CS3D branch and version for build diagnosis)
         run: |
@@ -58,9 +85,21 @@ jobs:
           fetch-depth: 1
           submodules: recursive
 
+      - name: Log build context (OHIF/CS3D branch and version for build diagnosis)
+        run: |
+          CS3D_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          CS3D_SHA=$(git rev-parse HEAD)
+          OHIF_BRANCH=$(git -C "${OHIF_DIR}" rev-parse --abbrev-ref HEAD)
+          OHIF_SHA=$(git -C "${OHIF_DIR}" rev-parse HEAD)
+          echo "::notice::Build type: ohif-downstream | OHIF: OHIF/Viewers@${OHIF_BRANCH} (${OHIF_SHA}) | CS3D: ${{ github.repository }}@${CS3D_BRANCH} (${CS3D_SHA})"
+          echo "[build-context] ═══════════════════════════════════════════════════════════════"
+          echo "[build-context] Build type: ohif-downstream (CS3D repo validating against OHIF)"
+          echo "[build-context] OHIF checkout: ${OHIF_BRANCH} (${OHIF_SHA}) | CS3D checkout: ${CS3D_BRANCH} (${CS3D_SHA})"
+          echo "[build-context] ═══════════════════════════════════════════════════════════════"
+
       - name: Install OHIF dependencies
         working-directory: ${{ env.OHIF_DIR }}
-        run: bun install
+        run: bun install --frozen-lockfile
 
       - name: Link local Cornerstone packages into OHIF node_modules
         run: node scripts/link-ohif-cornerstone-node-modules.mjs ${{ env.OHIF_DIR }}
@@ -71,7 +110,7 @@ jobs:
 
       - name: Install Playwright browsers
         working-directory: ${{ env.OHIF_DIR }}
-        run: npx playwright install --with-deps chromium
+        run: npx playwright install
 
       - name: Run OHIF e2e tests
         working-directory: ${{ env.OHIF_DIR }}

.gitignore

@@ -68,3 +68,4 @@ CLAUDE.md
 # External repositories
 vtk-js/
 .ohif-downstream/
+auth.json

CHANGELOG.md

@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.21.7](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.6...v4.21.7) (2026-04-16)
+
+**Note:** Version bump only for package root
+
+## [4.21.6](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.5...v4.21.6) (2026-04-16)
+
+### Bug Fixes
+
+- **viewport:** restore default visual properties on reset in VolumeViewport3D and VolumeViewport ([#2693](https://github.com/cornerstonejs/cornerstone3D/issues/2693)) ([d1a7097](https://github.com/cornerstonejs/cornerstone3D/commit/d1a709707c58c7780d7838ac95a8ef8783e45cfd))
+
+## [4.21.5](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.4...v4.21.5) (2026-04-14)
+
+### Bug Fixes
+
+- sam model exception ([#2637](https://github.com/cornerstonejs/cornerstone3D/issues/2637)) ([0fccf54](https://github.com/cornerstonejs/cornerstone3D/commit/0fccf54df585199e64a1e7c5fa9f5bf4d0a48e93))
+
+## [4.21.4](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.3...v4.21.4) (2026-04-14)
+
+**Note:** Version bump only for package root
+
+## [4.21.3](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.2...v4.21.3) (2026-04-13)
+
+**Note:** Version bump only for package root
+
+## [4.21.2](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.1...v4.21.2) (2026-04-10)
+
+### Bug Fixes
+
+- add auth json to gitignore ([#2694](https://github.com/cornerstonejs/cornerstone3D/issues/2694)) ([7a5cc93](https://github.com/cornerstonejs/cornerstone3D/commit/7a5cc93765b7ebfdfd02790d4eb9e7c29cd7b38b))
+
+## [4.21.1](https://github.com/cornerstonejs/cornerstone3D/compare/v4.21.0...v4.21.1) (2026-04-10)
+
+### Bug Fixes
+
+- Minimal changes to get linking to work for ohif-downstream ([#2689](https://github.com/cornerstonejs/cornerstone3D/issues/2689)) ([b2d771b](https://github.com/cornerstonejs/cornerstone3D/commit/b2d771b13010a9018acbdf5427fbc635d0ddd8a7))
+
+# [4.21.0](https://github.com/cornerstonejs/cornerstone3D/compare/v4.20.4...v4.21.0) (2026-04-06)
+
+### Features
+
+- Crosshairs minimal mode and add jump on click with modifier key ([#2673](https://github.com/cornerstonejs/cornerstone3D/issues/2673)) ([df672f1](https://github.com/cornerstonejs/cornerstone3D/commit/df672f11cba9284035bc32dd80f697db6df3518f))
+
+## [4.20.4](https://github.com/cornerstonejs/cornerstone3D/compare/v4.20.3...v4.20.4) (2026-04-02)
+
+### Bug Fixes
+
+- **security:** update dependencies to fix security vulnerabilities ([#2687](https://github.com/cornerstonejs/cornerstone3D/issues/2687)) ([77c553b](https://github.com/cornerstonejs/cornerstone3D/commit/77c553b0851be285b02c218bc2ae9ae21a44b5ee))
+
+## [4.20.3](https://github.com/cornerstonejs/cornerstone3D/compare/v4.20.2...v4.20.3) (2026-04-02)
+
+### Bug Fixes
+
+- **annotation:** Enhance getTextBoxCoordsCanvas to use all annotation points for default textbox position and improve corner determination logic ([#2686](https://github.com/cornerstonejs/cornerstone3D/issues/2686)) ([11bfc2b](https://github.com/cornerstonejs/cornerstone3D/commit/11bfc2bb90571bd672c8627f812cc0118658be97))
+
+## [4.20.2](https://github.com/cornerstonejs/cornerstone3D/compare/v4.20.1...v4.20.2) (2026-04-02)
+
+### Bug Fixes
+
+- **tools:** no active segmentation error toast when hovering over viewport without segmentation ([#2683](https://github.com/cornerstonejs/cornerstone3D/issues/2683)) ([a7e4ea1](https://github.com/cornerstonejs/cornerstone3D/commit/a7e4ea13c58f6ac6dd26677c0d9ece697b5d57e9))
+
+## [4.20.1](https://github.com/cornerstonejs/cornerstone3D/compare/v4.20.0...v4.20.1) (2026-03-31)
+
+### Bug Fixes
+
+- **htmlSetup:** Uncomment form creation and append to content in setup function ([#2681](https://github.com/cornerstonejs/cornerstone3D/issues/2681)) ([90acd90](https://github.com/cornerstonejs/cornerstone3D/commit/90acd90cdc36844ef20a8f65509bc8c467219101))
+
 # [4.20.0](https://github.com/cornerstonejs/cornerstone3D/compare/v4.19.4...v4.20.0) (2026-03-16)
 
 ### Features

README.md

@@ -43,35 +43,44 @@ The downstream validation is defined in
 It runs on every CS3D pull request and `workflow_dispatch`:
 
 1. Checks out the CS3D PR branch and builds it (`bun run build:esm`).
-2. Checks out the OHIF Viewer at the ref specified by the `OHIF_REF` env
-   variable (defaults to `master`).
+2. Checks out the OHIF Viewer at a ref resolved for that run: by default
+   `master`; on pull requests you can override with a line in the PR description
+   (see below); on `workflow_dispatch` you can set the `ohif_ref` input.
 3. Installs OHIF dependencies, then symlinks the locally built CS3D packages
    into OHIF's `node_modules` via
    `scripts/link-ohif-cornerstone-node-modules.mjs`.
 4. Runs OHIF unit tests and Playwright e2e tests against the linked build.
 
-### Testing against an OHIF branch other than master
-
-By default the workflow checks out `master` of the OHIF Viewer. To test against
-a different OHIF branch (e.g. when a feature requires coordinated changes in
-both repos):
-
-1. Open `.github/workflows/ohif-downstream.yml`.
-2. Change the `OHIF_REF` environment variable (line 19) from `master` to the
-   target branch:
-   ```yaml
-   env:
-     OHIF_REF: feat/my-ohif-feature   # was: master
-   ```
-3. Commit and push. The downstream job will now clone and test against that
-   OHIF branch instead.
-4. **Remember to set `OHIF_REF` back to `master` before merging your CS3D PR.**
-
-> **Tip:** This pairs with the OHIF side of the integration. While `OHIF_REF`
-> lets a CS3D PR test against an OHIF branch, the OHIF repo has a symmetric
-> mechanism — the `ohif-integration` label and `CS3D_REF` in the PR body —
-> that lets an OHIF PR test against a CS3D branch. Together these allow both
-> sides to run the full test suite against unpublished code. See the
+### Choosing the OHIF Viewer ref (`OHIF_REF` / `ohif_ref`)
+
+By default the workflow checks out `master` of [OHIF/Viewers](https://github.com/OHIF/Viewers).
+You can point downstream validation at another branch or tag **without editing
+the workflow file**:
+
+**On a CS3D pull request** — add a line to the PR description (same style as
+OHIF uses for `CS3D_REF:` on the OHIF side):
+
+```text
+OHIF_REF: your-branch-or-tag
+```
+
+The first line matching that pattern wins; the value is the first token after
+the colon (no spaces in the ref). If you omit this line, the job uses `master`.
+
+**When running the workflow manually** — use the **ohif_ref** input on
+`workflow_dispatch` (defaults to `master`).
+
+**Coordinated CS3D + OHIF changes** — when a feature needs changes in both
+repositories, create an OHIF branch whose **name matches your CS3D branch**
+(e.g. both `feat/shared-thing`). Then put `OHIF_REF: feat/shared-thing` in the
+CS3D PR body (or set **ohif_ref** to that name for a manual run). Matching
+names make it obvious which Viewer branch pairs with which Cornerstone branch
+and avoid juggling unrelated branch names across the two repos.
+
+> **Tip:** This pairs with the OHIF side of the integration. The OHIF repo uses
+> the `ohif-integration` label and `CS3D_REF:` in the PR body to test an OHIF
+> PR against a CS3D branch. Together, `OHIF_REF:` here and `CS3D_REF:` there
+> let both sides run the full test suite against unpublished code. See the
 > [OHIF Viewer README — Cornerstone3D Integration Testing](https://github.com/OHIF/Viewers#cornerstone3d-integration-testing)
 > for details on the OHIF side.