Release 0.30.1

Bumps the version to 0.30.1 and folds the pending format changes into format 48.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 ## Change
 
-Describe the problem and resulting behavior. Link the issue when applicable.
+Start with what this is, in plain words someone new to the project would understand: what it does and who it's for. Don't assume anyone knows the name of your tool, project or feature. Then describe the problem and resulting behavior. Link the issue when applicable.
 
 Changes a default: no
 
@@ -14,6 +14,8 @@ What did you run, and what were the results? Include expected and measured value
 
 ## Screenshots of the behavior (when observable)
 
+Put the picture or video here in the description. A file in the diff doesn't count: a maintainer has to be able to see what this is without opening the changed files.
+
 For observable CAD, UI or model behavior, include actual descriptive screenshots or a short recording from a small reproduction. This includes kernel, geometry, assembly and backend effects that can be shown in the app. Coding agents should run the app and capture the evidence themselves, rather than asking a human for evidence they can produce. Show the actual failure/result, preferably before and after, with brief steps, expected/actual behavior and annotations where helpful.
 
 Flowcharts and Mermaid diagrams cannot substitute for evidence of visible behavior. Use diagrams for architectural reasoning when actual screenshots cannot illustrate the point. Changes with no useful observable behavior may omit screenshot/video evidence. Exclude private designs and sensitive details; attach media or link to an accessible recording rather than committing generated review artifacts.

.github/workflows/ci.yml

@@ -15,7 +15,9 @@
 # nightly. The reference tests and the doc tests run in the merge queue, on main and nightly, not
 # on pull requests (the fast lane, in Select checks); a break there is fixed forward on main. The
 # Windows jobs (D3D12 shaders and app startup) run nightly, and in the merge queue only for a group
-# that changes what they exercise. Only main saves the build caches; pull requests restore them.
+# that changes what they exercise. The wasm compile check runs in the merge queue for a group that
+# touches the crates below the apps, the web app or the manifests. Dependency advisories run nightly
+# and on any pull request or merge group that changes Cargo.lock or a Cargo.toml. Only main saves the build caches; pull requests restore them.
 # sccache is on a Blacksmith sticky disk that only main commits.
 # A push to main runs only the repository checks when a passing merge-queue run tested that very
 # commit, or when nothing a build reads changed since the last push to main whose run passed.
@@ -78,8 +80,13 @@ env:
 
 jobs:
   dependency-advisories:
+    # Nightly and by hand: advisories, bans and sources for everything. A pull request or merge
+    # group that changes Cargo.lock or a Cargo.toml (Select checks' `deps`) checks the advisories
+    # only, so a dependency with a known vulnerability is caught before it lands, not the next
+    # morning; other pull requests skip it. `ci` requires it whenever `deps` is true.
     name: Dependency advisories
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    needs: changes
+    if: ${{ !cancelled() && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || needs.changes.outputs.deps == 'true') }}
     runs-on: blacksmith-4vcpu-ubuntu-2404
     timeout-minutes: 20
     steps:
@@ -88,7 +95,12 @@ jobs:
       - name: Install advisory scanner
         run: cargo install cargo-deny --version 0.20.2 --locked
       - name: Check locked dependencies
+        if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
         run: cargo deny --locked check --warn unmaintained advisories bans sources
+      # deny.toml denies unmaintained crates; like the nightly, they are reported, not fatal.
+      - name: Check advisories for the changed dependencies
+        if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch'
+        run: cargo deny --locked check --warn unmaintained advisories
 
   changes:
     name: Select checks
@@ -115,6 +127,10 @@ jobs:
       packages: ${{ steps.paths.outputs.packages }}
       oracle: ${{ steps.paths.outputs.oracle }}
       doctests: ${{ steps.paths.outputs.doctests }}
+      # Cargo.lock or a Cargo.toml changed (pull requests and merge groups): Dependency advisories.
+      deps: ${{ steps.paths.outputs.deps }}
+      # A merge group reaches the wasm build: Compile WebAssembly.
+      wasm: ${{ steps.paths.outputs.wasm }}
       # The passing run a merge of main carries forward (its URL), when this push is only that.
       carried: ${{ steps.paths.outputs.carried }}
     steps:
@@ -143,6 +159,8 @@ jobs:
           goldens=false
           windows=false
           gpu_paths=false
+          deps=false
+          wasm=false
           full=true
           packages=
           # Whether the NUL-separated paths in $1 reach any code: scripts/ci/affected.py selects
@@ -183,6 +201,21 @@ jobs:
               esac
             done < "$1"
           }
+          # Whether the NUL-separated paths in $1 change the dependencies (Cargo.lock or any
+          # Cargo.toml: deps), and whether they reach what `cargo xtask wasm` compiles (wasm): the
+          # crates below the apps, the web app, the vendored crates, the manifests and lockfile, the
+          # toolchain and cargo config, and this workflow. #8227 put a native-only call in
+          # crates/ui-egui and the merge queue passed it, because nothing built for wasm there.
+          deps_wasm_paths() {
+            while IFS= read -r -d '' path; do
+              case "$path" in
+                Cargo.lock|Cargo.toml|*/Cargo.toml) deps=true ;;
+              esac
+              case "$path" in
+                crates/*|apps/solidcraft-web/*|vendor/*|Cargo.lock|Cargo.toml|rust-toolchain*|.cargo/*|.github/workflows/ci.yml) wasm=true ;;
+              esac
+            done < "$1"
+          }
           # Opt-in for a big render change: a pull request labelled render-tests, or a merge group
           # holding one (its pull requests are the (#N) of its squash commits), runs them whatever
           # the paths say.
@@ -228,14 +261,17 @@ jobs:
             if git diff --no-renames --name-only -z "$GROUP_BASE_SHA...$GROUP_HEAD_SHA" > "$RUNNER_TEMP/ci-paths"; then
               windows_paths "$RUNNER_TEMP/ci-paths" "$GROUP_BASE_SHA...$GROUP_HEAD_SHA"
               gpu_paths "$RUNNER_TEMP/ci-paths"
+              deps_wasm_paths "$RUNNER_TEMP/ci-paths"
               if [ "$gpu_paths" = false ] && group_has_render_label "$GROUP_BASE_SHA..$GROUP_HEAD_SHA"; then
                 gpu_paths=true
               fi
             else
               windows=true
               gpu_paths=true
+              deps=true
+              wasm=true
             fi
-            echo "windows=$windows gpu_paths=$gpu_paths for $GROUP_BASE_SHA...$GROUP_HEAD_SHA"
+            echo "windows=$windows gpu_paths=$gpu_paths deps=$deps wasm=$wasm for $GROUP_BASE_SHA...$GROUP_HEAD_SHA"
           elif [ "$EVENT_NAME" != pull_request ]; then
             # The nightly run and Run workflow: everything, Windows included.
             native=true
@@ -256,6 +292,10 @@ jobs:
             done < "$RUNNER_TEMP/ci-paths"
             # Computed as for a merge group, then turned off below (the fast lane).
             windows_paths "$RUNNER_TEMP/ci-paths" "$BASE_SHA...$HEAD_SHA"
+            # The advisories run on the pull request itself (it builds nothing of ours: about two minutes, most of it installing cargo-deny);
+            # the wasm compile waits for the merge queue.
+            deps_wasm_paths "$RUNNER_TEMP/ci-paths"
+            wasm=false
             # Pull requests build and test the touched packages and their dependents; nothing
             # selected means no code changed.
             select_packages "$RUNNER_TEMP/ci-paths"
@@ -327,6 +367,8 @@ jobs:
             echo "windows=$windows"
             echo "oracle=$oracle"
             echo "doctests=$doctests"
+            echo "deps=$deps"
+            echo "wasm=$wasm"
             echo "carried=$carried"
             echo "full=$full"
             echo "quick=$quick"
@@ -364,6 +406,9 @@ jobs:
           cargo test -p xtask ui_containers --locked
       - name: Sorted lists
         run: cargo xtask lists
+      # New UI text must reach every complete catalog; report it here, before review (#8542).
+      - name: Translations in the complete catalogs
+        run: cargo xtask i18n --check
       - name: Agent router and skills cite real files
         run: |
           cargo xtask skills
@@ -943,7 +988,7 @@ jobs:
     # commit's real run instead: the merge queue reads `ci` from the newest run of a commit, so a
     # run without a passing `ci` would block a pull request that passed (#1850, #3182, #3252).
     name: ci
-    needs: [changes, checks, quick-compile, clippy, build-tests, tests, gpu-path-tests, doc-tests, oracle, windows-fxc, windows-startup]
+    needs: [changes, checks, quick-compile, clippy, build-tests, tests, gpu-path-tests, doc-tests, oracle, windows-fxc, windows-startup, dependency-advisories, wasm]
     if: always() && (github.event_name != 'pull_request' || !github.event.pull_request.draft)
     runs-on: blacksmith-2vcpu-ubuntu-2404
     permissions:
@@ -997,6 +1042,10 @@ jobs:
           ORACLE: ${{ needs.oracle.result }}
           WINDOWS_FXC: ${{ needs.windows-fxc.result }}
           WINDOWS_STARTUP: ${{ needs.windows-startup.result }}
+          DEPS_RUN: ${{ needs.changes.outputs.deps }}
+          ADVISORIES: ${{ needs.dependency-advisories.result }}
+          WASM_RUN: ${{ needs.changes.outputs.wasm }}
+          WASM: ${{ needs.wasm.result }}
         run: |
           test "$CHANGES" = success
           test "$CHECKS" = success
@@ -1026,6 +1075,14 @@ jobs:
             test "$WINDOWS_FXC" = success
             test "$WINDOWS_STARTUP" = success
           fi
+          # Cargo.lock or a Cargo.toml changed on a pull request or in a merge group.
+          if [ "$DEPS_RUN" = true ]; then
+            test "$ADVISORIES" = success
+          fi
+          # A merge group that reaches the wasm build.
+          if [ "$WASM_RUN" = true ]; then
+            test "$WASM" = success
+          fi
       - name: Note a carried result
         if: needs.changes.outputs.carried != ''
         env:
@@ -1033,9 +1090,13 @@ jobs:
         run: |
           echo "This push only merges main into a change that already passed; the heavy checks were not repeated. Passing run: $CARRIED" >> "$GITHUB_STEP_SUMMARY"
 
+  # Every crate below the apps and the web app must build for the browser (`cargo xtask wasm`, a
+  # cargo check, no tests). In the merge queue for a group that reaches the wasm build (Select
+  # checks' `wasm`), where `ci` requires it; by hand with cross_compile.
   wasm:
-    name: Compile WebAssembly (manual)
-    if: github.event_name == 'workflow_dispatch' && inputs.cross_compile
+    name: Compile WebAssembly
+    needs: changes
+    if: ${{ !cancelled() && ((github.event_name == 'workflow_dispatch' && inputs.cross_compile) || needs.changes.outputs.wasm == 'true') }}
     runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 30
     steps:
@@ -1096,3 +1157,49 @@ jobs:
           . "$HOME/.cargo/env"
           export CRAFT_FONTS_DIR="$PWD/craft-fonts"
           cargo check --all-targets --locked --target riscv64gc-unknown-linux-gnu
+
+  # Nobody watches the nightly run, and it failed every day from 2026-10-16 to 2026-10-28 before
+  # anyone noticed. When a nightly fails, open one issue, "Nightly CI is failing" (label `ci`), or
+  # comment on it if it is already open; when a nightly passes, close it. A nightly that neither
+  # failed nor fully passed (cancelled) leaves the issue as it is. The only job that may write issues.
+  nightly-alert:
+    name: Nightly alert
+    needs: [dependency-advisories, changes, checks, ci, build-tests, action-matrix, action-matrix-determinism, property-tests]
+    if: always() && github.event_name == 'schedule'
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    timeout-minutes: 5
+    permissions:
+      issues: write
+    steps:
+      - name: Open, update or close the nightly issue
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          RESULTS: ${{ toJSON(needs) }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          SHA: ${{ github.sha }}
+        run: |
+          title="Nightly CI is failing"
+          failed=$(jq -r 'to_entries[] | select(.value.result == "failure") | .key' <<<"$RESULTS")
+          unfinished=$(jq -r 'to_entries[] | select(.value.result != "success" and .value.result != "failure") | "\(.key) (\(.value.result))"' <<<"$RESULTS")
+          issue=$(gh issue list --state open --label ci --limit 100 --json number,title \
+            --jq "[.[] | select(.title == \"$title\")] | first | .number // empty")
+          if [ -n "$failed" ]; then
+            body="The nightly run on ${SHA:0:9} failed: $RUN_URL
+
+          Failed jobs: $(paste -sd , - <<<"$failed" | sed 's/,/, /g')."
+            if [ -n "$issue" ]; then
+              gh issue comment "$issue" --body "$body"
+            else
+              gh issue create --title "$title" --label ci --body "$body
+
+          This issue is opened and updated by the nightly run (the nightly-alert job in .github/workflows/ci.yml) and closed by the first nightly that passes."
+            fi
+          elif [ -z "$unfinished" ]; then
+            if [ -n "$issue" ]; then
+              gh issue close "$issue" --comment "The nightly run on ${SHA:0:9} passed: $RUN_URL"
+            fi
+            echo "The nightly passed."
+          else
+            echo "Nothing failed, but not every job finished: $unfinished. The issue is left as it is."
+          fi

.github/workflows/kernel-paused.yml

@@ -1,6 +1,7 @@
-# While a new geometry kernel is evaluated, new issues, pull requests and discussions about kernel
-# work are labelled `kernel-paused` for a maintainer to answer (CONTRIBUTING.md, "Kernel work is
-# paused"). The logic is in scripts/kernel-paused/ (tested in ci.yml).
+# While a new geometry kernel is evaluated, new issues and discussions about kernel work, and new
+# pull requests that change the kernel directories, are labelled `kernel-paused` for a maintainer to
+# answer (CONTRIBUTING.md, "Kernel work is paused"). The logic is in scripts/kernel-paused/ (tested
+# in ci.yml).
 name: Kernel paused
 
 on:

.github/workflows/pr-checks.yml

@@ -1,6 +1,6 @@
-# Two quick checks on every pull request (CONTRIBUTING.md, "Sending a change"): no second open PR
-# for an issue a lower-numbered one already closes, and the "Changes a default:" line is filled in.
-# Neither is a required status check. The logic is in scripts/pr-checks/pr-checks.js (tested in ci.yml).
+# Three quick checks on every pull request (CONTRIBUTING.md, "Sending a change"): no second open PR
+# for an issue a lower-numbered one already closes, the "Changes a default:" line is filled in, and
+# a PR adding to the showcase shows a picture. None is a required status check. The logic is in scripts/pr-checks/pr-checks.js (tested in ci.yml).
 name: PR checks
 
 on:
@@ -48,10 +48,26 @@ jobs:
             const r = await checks.checkDefaults({ github, context, core });
             core.info(JSON.stringify(r));
 
+  picture:
+    name: Picture check
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          sparse-checkout: scripts/pr-checks
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const checks = require('./scripts/pr-checks/pr-checks.js');
+            const r = await checks.checkPicture({ github, context, core });
+            core.info(JSON.stringify(r));
+
   # Labelling needs write access, which a fork PR's token never has, so it is its own job and best
   # effort: a fork PR just doesn't get the `changes-default` label from here.
   label:
     name: Label changes-default
+    if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     continue-on-error: true

.github/workflows/release.yml

@@ -10,6 +10,7 @@
 # (see the windows job). Nothing else is signed yet.
 #
 #   Linux x86_64, aarch64   AppImage (+ .zsync), .deb, .rpm, .flatpak, .snap, .tar.gz packaging/linux
+#   Arch Linux x86_64, aarch64  .pkg.tar.zst, repackaged from the .tar.gz         the arch job
 #   FreeBSD x86_64          .tar.gz (built in a FreeBSD VM)                        packaging/freebsd
 #   macOS universal         .dmg, and the CLI as a .zip (both archs built in parallel)  packaging/macos
 #   Windows x64, x86, arm64 .msi and a portable .zip; x64 also the plain .exe      packaging/windows
@@ -206,6 +207,45 @@ jobs:
           path: dist/release/*.flatpak
           if-no-files-found: error
 
+  arch:
+    name: Arch Linux ${{ matrix.arch }}
+    needs: [version, linux]
+    if: needs.version.outputs.build == 'true'
+    # makepkg only repackages the tarball's prebuilt binaries, so both architectures build here.
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+    env:
+      VERSION: ${{ needs.version.outputs.version }}
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        with:
+          name: release-linux-${{ matrix.arch }}
+          path: dist/linux
+      # The Craft apps' shared Arch packaging (storytold/craft-common-actions, MIT OR Apache-2.0):
+      # makepkg in an archlinux:base-devel container. The package is named after the tarball's
+      # .desktop file (io.tangencylabs.solidcraft) and written as
+      # dist/release/solidcraft-<version>-linux-<arch>.pkg.tar.zst.
+      - uses: storytold/craft-common-actions/actions/arch-package@fa5ef18780cf5e7d5d3b8de068de56cffc83cac5 # main
+        with:
+          tarball: dist/linux/solidcraft-${{ env.VERSION }}-linux-${{ matrix.arch }}.tar.gz
+          arch: ${{ matrix.arch }}
+      - name: Check the package
+        env:
+          PKG: dist/release/solidcraft-${{ env.VERSION }}-linux-${{ matrix.arch }}.pkg.tar.zst
+        run: |
+          tar --zstd -tf "$PKG" | grep -E '^usr/bin/solidcraft$|^usr/bin/solidcraft-cli$|^usr/share/applications/io\.tangencylabs\.solidcraft\.desktop$'
+          tar --zstd -xOf "$PKG" .PKGINFO | grep -E '^(pkgname|pkgver|arch) = '
+          tar --zstd -xOf "$PKG" .PKGINFO | grep -qx 'pkgname = io.tangencylabs.solidcraft'
+      - uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          name: release-arch-${{ matrix.arch }}
+          path: dist/release/*.pkg.tar.zst
+          if-no-files-found: error
+
 
 
   snap:
@@ -310,7 +350,7 @@ jobs:
     name: macOS build ${{ matrix.arch }}
     needs: version
     if: needs.version.outputs.build == 'true'
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
@@ -344,7 +384,7 @@ jobs:
     name: macOS universal
     needs: [version, macos-build]
     if: needs.version.outputs.build == 'true'
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       SOLIDCRAFT_VERSION: ${{ needs.version.outputs.version }}
       SOLIDCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
@@ -571,7 +611,7 @@ jobs:
 
   release:
     name: GitHub Release or dry-run artifacts
-    needs: [version, linux, flatpak, snap, freebsd, macos, windows, web]
+    needs: [version, linux, flatpak, arch, snap, freebsd, macos, windows, web]
     if: needs.version.outputs.build == 'true'
     runs-on: ubuntu-latest
     permissions:
@@ -597,7 +637,7 @@ jobs:
           shopt -s nullglob
           for f in "solidcraft-$VERSION-"*; do
             case "$f" in
-              *.msi | *-portable.zip | *.dmg | *.AppImage | *.deb | *.rpm | *.flatpak | *.snap)
+              *.msi | *-portable.zip | *.dmg | *.AppImage | *.deb | *.rpm | *.flatpak | *.snap | *.pkg.tar.zst)
                 cp -- "$f" "solidcraft-${f#"solidcraft-$VERSION-"}" ;;
             esac
           done

ATTRIBUTION.md

@@ -84,6 +84,8 @@ Editable drawing code, native projects and shipped exports are collected under `
 | docs/book/src/generated/tool-preview.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/tool-preview.json`; gitignored) | MIT OR Apache-2.0 |
 | assets/fonts/liberation-sans/LiberationSans-Regular.ttf | Red Hat, Inc. (Liberation Fonts 2.x; digitized data Google) | https://github.com/liberationfonts (Debian fonts-liberation), unmodified; licence text in assets/fonts/liberation-sans/OFL.txt; used for sketch Text outlines | SIL OFL 1.1 |
 | assets/fonts/biz-udp-gothic/BIZUDPGothic-Regular.ttf | The BIZ UDGothic Project Authors | https://github.com/googlefonts/morisawa-biz-ud-gothic (Google Fonts), unmodified; licence text in assets/fonts/biz-udp-gothic/OFL.txt; used for web UI Japanese font | SIL OFL 1.1 |
+| assets/fonts/craft-ui-sc/CraftUI-SC.otf | Adobe / Google Inc. (Noto Sans SC); SolidCraft subset | https://github.com/notofonts/noto-cjk Sans/SubsetOTF/SC Regular, glyph-subset for assets/locales/zh.json and renamed Craft UI SC (OFL reserved-name); licence text in assets/fonts/craft-ui-sc/OFL.txt; web UI Simplified Chinese | SIL OFL 1.1 |
+| assets/fonts/craft-ui-tc/CraftUI-TC.otf | Adobe / Google Inc. (Noto Sans TC); SolidCraft subset | https://github.com/notofonts/noto-cjk Sans/SubsetOTF/TC Regular, glyph-subset for assets/locales/zh-TW.json and renamed Craft UI TC (OFL reserved-name); licence text in assets/fonts/craft-ui-tc/OFL.txt; web UI Traditional Chinese | SIL OFL 1.1 |
 | tests/step-conformance/cone_point.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
 | tests/step-conformance/cone_point_vertex.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
 | tests/step-conformance/cylinder.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
@@ -125,6 +127,8 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/appearances/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/appearances/opaque_finishes.rs | SolidCraft contributors | original illustrative opaque finish values; no external dataset, textures or measured engineering data | MIT OR Apache-2.0 |
 | assets/fonts/biz-udp-gothic/OFL.txt | The BIZ UDGothic Project Authors | Unmodified accompanying font licence | SIL OFL 1.1 |
+| assets/fonts/craft-ui-sc/OFL.txt | Adobe / Google Inc. (Noto CJK); SolidCraft header | Accompanying OFL for CraftUI-SC.otf | SIL OFL 1.1 |
+| assets/fonts/craft-ui-tc/OFL.txt | Adobe / Google Inc. (Noto CJK); SolidCraft header | Accompanying OFL for CraftUI-TC.otf | SIL OFL 1.1 |
 | assets/fonts/ibm-plex-mono/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
 | assets/fonts/ibm-plex-sans/OFL.txt | IBM Corp. | Unmodified accompanying font licence | SIL OFL 1.1 |
 | assets/fonts/liberation-sans/OFL.txt | Red Hat, Inc.; Liberation Fonts contributors | Unmodified accompanying font licence | SIL OFL 1.1 |
@@ -185,11 +189,7 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/shaders/viewport.wgsl | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/styles/ui/palettes.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/styles/ui/themes/gruvbox-dark.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
-| assets/styles/ui/themes/gruvbox-dark-hard.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
-| assets/styles/ui/themes/gruvbox-dark-soft.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
 | assets/styles/ui/themes/gruvbox-light.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
-| assets/styles/ui/themes/gruvbox-light-hard.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
-| assets/styles/ui/themes/gruvbox-light-soft.json | SolidCraft contributors | original SolidCraft theme file mapping SolidCraft's UI colours to the Gruvbox palette's colour values (Gruvbox by Pavel Pertsev, https://github.com/morhetz/gruvbox, MIT) | MIT OR Apache-2.0 |
 | assets/styles/ui/themes/solidcraft-95.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
 | assets/styles/ui/themes/platinum-9.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
 | assets/styles/ui/themes/cupertino.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
@@ -603,6 +603,158 @@ Original SolidCraft drawings, Open for owner review; no runtime assignments.
 | assets/icons/ui/design/svg/model/finish_edit.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
 | `assets/locales/pending/sketch-tracking-guides.json` | SolidCraft contributors | Original alignment-guide preference labels and help text | MIT OR Apache-2.0 |
 | assets/locales/pending/point-clouds.json | SolidCraft contributors | Original point-cloud UI strings and translations | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/feature_group.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/mesh_body.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/timeline_play.svg | SolidCraft contributors | Original history playback icon; canonical grey_cube base and original action cue | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/timeline_stop.svg | SolidCraft contributors | Original history playback icon; canonical grey_cube base and original action cue | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/status_pin.svg | SolidCraft contributors | Original analytic pin icon for persistent viewport results | MIT OR Apache-2.0 |
+| assets/locales/pending/render-wear.json | SolidCraft contributors | Original UI labels and translations | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/equation_curve.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/locales/pending/sketch-recent-snap.json | SolidCraft contributors | Original preference messages for the recent centre and midpoint snap | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_horizontal.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_vertical.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_angle.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_parallel.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_perpendicular.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_tangent_external.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_tangent_at.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_tangent_two.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/construction_line_bisector.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-circle.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-circle.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-flower.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-flower.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-involute.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-involute.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-line.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-line.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-parabola.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-parabola.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-spiral.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-spiral.json`; gitignored) | MIT OR Apache-2.0 |
+| docs/book/src/generated/equation-wave.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/equation-wave.json`; gitignored) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/print_face.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/locales/fi.json | SolidCraft contributors | Original Finnish translation of SolidCraft's English catalog, AI-assisted (Claude Code) clean-room from the English and not yet reviewed line by line by a native speaker; no commercial CAD text used | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/plane_axis_point.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-2x.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-2x.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-4x.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-4x.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-8x.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-8x.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-off.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/aa-off.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/agent-pointer-speed.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/agent-pointer-speed.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/ao-on.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/ao-on.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/assembly-move.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/assembly-move.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/browser-card.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/browser-card.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/browser-column.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/browser-column.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-axes.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-axes.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-bends.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-bends.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-draft.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-draft.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-failed.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-failed.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-fixed.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-fixed.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-projected.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/colour-vision-projected.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/direct-interaction.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/direct-interaction.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/frame-rate.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/frame-rate.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-bottom.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-bottom.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-in-browser.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-in-browser.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-left.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-left.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-under-browser.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/history-under-browser.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/layout-schematic.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/layout-schematic.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/measure-axis-distances.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/measure-axis-distances.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/mouse-mapping.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/mouse-mapping.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/navigator-axes.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/navigator-axes.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/navigator-cube.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/navigator-cube.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-centre.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-centre.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-cursor.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-cursor.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-origin.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orbit-origin.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orientation-y-up.dark.svg | SolidCraft contributors | original SolidCraft artwork: the Orientation figure copied from the app and extracted from the Preferences redesign board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orientation-y-up.light.svg | SolidCraft contributors | original SolidCraft artwork: the Orientation figure copied from the app and extracted from the Preferences redesign board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orientation-z-up.dark.svg | SolidCraft contributors | original SolidCraft artwork: the Orientation figure copied from the app and extracted from the Preferences redesign board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/orientation-z-up.light.svg | SolidCraft contributors | original SolidCraft artwork: the Orientation figure copied from the app and extracted from the Preferences redesign board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/quick-measure.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/quick-measure.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/select-bodies.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/select-bodies.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/select-faces-edges.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/select-faces-edges.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-conflict.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-conflict.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-keep.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-keep.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-previous.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-previous.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-unless-turned.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-exit-unless-turned.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-guides.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-guides.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-hide-glyphs.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-hide-glyphs.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-state-icons.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/sketch-state-icons.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/style-shaded-edges.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/style-shaded-edges.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-coarse.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-coarse.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-fine.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-fine.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-normal.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-normal.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-ultra.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tess-ultra.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-dark.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-dark.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-gruvbox.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-gruvbox.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-imported.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-imported.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-light.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-light.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-system-dark-half.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-system-dark-half.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-system-light-half.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/theme-system-light-half.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-cursor.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-cursor.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-extrude.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-extrude.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-hole.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-hole.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-placement.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/tool-placement.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/vertex-markers.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/vertex-markers.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-angles.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-angles.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-grid.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-grid.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-perspective.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-perspective.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-shadow.dark.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| docs/design/preferences/figures/view-shadow.light.svg | SolidCraft contributors | original SolidCraft artwork drawn for the Preferences redesign (tracker #9863), extracted from the design board as a standalone SVG | MIT OR Apache-2.0 |
+| `assets/locales/pending/sketch-offset-instances.json` | SolidCraft contributors | Original offset instance-count label and translations | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_profile.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original analytic head and shoulder geometry for settings profiles | MIT OR Apache-2.0 |
 
 ## Code adapted from sibling projects
 
@@ -662,6 +814,7 @@ copied into SolidCraft.
 
 | Directory | Source | Licence | Changes |
 |---|---|---|---|
+| vendor/accesskit_macos | accesskit_macos 0.26.3, https://github.com/AccessKit/accesskit (The AccessKit contributors) | MIT OR Apache-2.0 | the subclassing adapter and its tests from 0.27.2: dropping the adapter keeps AppKit's key-value observers (vendor/README.md) |
 | vendor/truck-meshalgo | truck-meshalgo 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | meshing: bounded parameter searches, collapsed-boundary projection, subdivision and provisional fixed-grid previews (vendor/README.md) |
 | vendor/truck-stepio | truck-stepio 0.3.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | STEP writer: intersection-curve surfaces written at unique ids (vendor/README.md) |
 | vendor/truck-shapeops | truck-shapeops 0.4.0, https://github.com/ricosjp/truck (RICOS Co. Ltd.) | Apache-2.0 | robust meshing and nearest-parameter fallback in booleans; degenerate intersection-curve rejection; face and edge history of booleans; trace macro; corner choice at vertices several intersection curves end on; reuse of an operand's meshes (vendor/README.md) |

CONTRIBUTING.md

@@ -19,12 +19,13 @@ Questions, ideas or want to say what you're working on? Join the [Discord](https
 
 ## Kernel work is paused
 
-We're evaluating a new geometry kernel. Until that's decided, please don't open issues, pull
-requests or discussions about kernel work: booleans, fillets, chamfers, shell, offsets, sweeps and
-lofts, threads and holes, STEP/IGES import and export, tessellation, or anything else that changes
-`crates/kernel/`. The pinned issue on the tracker explains it. New ones get the `kernel-paused`
-label (`.github/workflows/kernel-paused.yml`) and a maintainer answers them. Crashes and data loss
-are still taken as issues, and everything outside the kernel carries on as normal.
+We're moving to a new geometry kernel. Until that's done, please don't open pull requests that
+change `crates/kernel/`, `crates/geom/` or `vendor/truck*`, or issues and discussions about kernel
+work: booleans, fillets, chamfers, shell, offsets, sweeps and lofts, threads and holes, STEP/IGES
+import and export, or tessellation. The pinned issue on the tracker explains it. New ones get the
+`kernel-paused` label (`.github/workflows/kernel-paused.yml`) and a maintainer answers them. Crashes
+and data loss are still taken as issues. Pull requests outside those directories carry on as normal,
+including the dialogs and tools for these features.
 
 ## Get it running (about 10 minutes on a fast machine)
 
@@ -117,7 +118,8 @@ The [architecture page](docs/architecture.md) has the layer table. The short ver
    not.) Permissive
    dependencies are fine. Note which one you're adding and why in the PR. THIRD-PARTY-LICENSES.txt
    lists it once the change lands: the Generated files workflow rewrites it on `main`.
-   Nightly/manual CI also scans advisories, bans and sources with cargo-deny; see
+   Nightly/manual CI also scans advisories, bans and sources with cargo-deny, and a PR that
+   changes Cargo.lock or a Cargo.toml checks the advisories; see
    [the local command and coverage limits](docs/book/src/dev/testing.md#dependency-advisories).
 3. **Every asset is original or openly licensed and has a row in
    [ATTRIBUTION.md](ATTRIBUTION.md).** Icons are drawn in code (`crates/ui-egui/src/icons.rs`).
@@ -278,6 +280,11 @@ Some files gain an item in many pull requests at once. They are kept so that two
 each add an item only meet when their items are neighbours, which spares everyone a conflict
 and a fresh CI run:
 
+- **Growing Rust lists**: use slices (`const ITEMS: &[Item] = &[...];`) without a written
+  length. `cargo xtask lists` rejects non-test const/static arrays with more than ten lines
+  of entries, except fixed standard or algorithm tables listed with reasons in `xtask/src/lists.rs`.
+  Built-in themes need only a JSON file in `assets/styles/ui/themes/`, with a unique nonnegative
+  integer `order` (the picker order) and its own `provenance` line; keep existing order values.
 - **Message catalogs** (`assets/locales/*.json`): one message per line, sorted by id. Add your
   message anywhere and run `cargo xtask lists --fix`; `cargo xtask lists` (in `cargo xtask ci`
   and the Lists workflow) fails on an unsorted catalog or an id that appears twice.
@@ -300,7 +307,9 @@ and a fresh CI run:
 - **Design format**: one file per change, never an edit to a shared number (above).
 - **New UI strings and attribution rows**: one new file per change, `assets/locales/pending/<slug>.json`
   and `attribution/pending/<slug>.md`, instead of editing the catalogs or the ATTRIBUTION.md table;
-  `cargo xtask fold-pending` folds them on `main` (see the README in each folder).
+  `cargo xtask fold-pending` folds them on `main` (see the README in each folder). A new English
+  message also needs every catalog delivered complete (`COMPLETE` in `crates/ui-egui/src/i18n.rs`:
+  today ar, he, ja, vi, and zh) in the same pending file; `cargo xtask i18n --check` reports any gap.
 
 ## Sending a change
 
@@ -338,6 +347,13 @@ without pushes. These automatic cleanup deadlines are separate from the daily pr
 `/unclaim` releases the bot claim early (only you or a maintainer can). Issues a maintainer has
 taken are never freed automatically.
 
+**A PR has to explain itself.** Start the description with what it is, in plain words someone new
+to the project would understand: what it does and who it's for. Don't assume anyone knows the name
+of your tool, project or feature. If there's anything to look at, show it in the description: a
+picture or video has to be visible there without opening the changed files. "The GIF is the change"
+doesn't count. A PR that doesn't do this waits until it does. For a PR that adds to
+`docs/showcase.md` or `docs/screenshots/`, the Picture check fails until the description shows one.
+
 Help reviewers see what the words mean. For observable CAD, UI or model behavior, please
 include actual descriptive screenshots or a short recording in the issue or PR. This evidence
 is required for changes or bugs that can be demonstrated in the app, including kernel,

Cargo.lock

@@ -60,8 +60,6 @@ dependencies = [
 [[package]]
 name = "accesskit_macos"
 version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
 dependencies = [
  "accesskit",
  "accesskit_consumer 0.38.0",
@@ -3773,9 +3771,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.15"
+version = "0.103.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4210,7 +4208,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "block2 0.6.2",
  "eframe",
@@ -4235,21 +4233,23 @@ dependencies = [
  "serde_json",
  "solidcraft-3dx-client",
  "solidcraft-engine",
+ "solidcraft-gpu",
  "solidcraft-space-mouse",
  "solidcraft-ui-egui",
  "ureq",
  "windows-sys 0.61.2",
  "winit",
  "x11rb",
+ "zbus 5.19.0",
 ]
 
 [[package]]
 name = "solidcraft-3dx-client"
-version = "0.26.0"
+version = "0.30.1"
 
 [[package]]
 name = "solidcraft-cli"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "image",
  "log",
@@ -4261,7 +4261,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-derive"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4270,7 +4270,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-doc"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "log",
  "serde",
@@ -4287,7 +4287,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-engine"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "image",
  "log",
@@ -4308,7 +4308,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-geom"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "serde",
  "serde_json",
@@ -4317,7 +4317,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-gpu"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "image",
  "log",
@@ -4337,7 +4337,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-io"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "cadmpeg-core",
  "cadmpeg-ir",
@@ -4355,13 +4355,14 @@ dependencies = [
  "solidcraft-doc",
  "solidcraft-geom",
  "solidcraft-kernel",
+ "solidcraft-testkit",
  "thiserror 2.0.21",
  "zip",
 ]
 
 [[package]]
 name = "solidcraft-kernel"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "log",
  "proptest",
@@ -4381,8 +4382,9 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-mcp"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
+ "image",
  "serde_json",
  "solidcraft-engine",
  "solidcraft-gpu",
@@ -4390,7 +4392,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-render"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "image",
  "moxcms",
@@ -4399,12 +4401,13 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "solidcraft-geom",
+ "web-time",
  "weezl",
 ]
 
 [[package]]
 name = "solidcraft-sketch"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "harfrust",
  "serde",
@@ -4417,14 +4420,18 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-space-mouse"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "solidcraft-testkit"
+version = "0.30.1"
+
 [[package]]
 name = "solidcraft-ui-egui"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "arboard",
  "egui",
@@ -4443,6 +4450,7 @@ dependencies = [
  "solidcraft-gpu",
  "solidcraft-space-mouse",
  "syn 2.0.119",
+ "sys-locale",
  "tiny-skia",
  "toml",
  "ttf-parser",
@@ -4454,7 +4462,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-web"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "eframe",
  "egui",
@@ -4558,6 +4566,18 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -5362,9 +5382,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96554aa2acc8ccdb7e1c9a58a7a68dd5d13bccc69cd124cb09406db612a1c9b"
+checksum = "58ec80e73fd8baf57bf0d9615554c75348bda990d6d5bbeab964dd068319fecb"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5845,8 +5865,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 [[package]]
 name = "winit"
 version = "0.30.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
 dependencies = [
  "ahash",
  "android-activity",
@@ -5999,7 +6017,7 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
 
 [[package]]
 name = "xtask"
-version = "0.26.0"
+version = "0.30.1"
 dependencies = [
  "proc-macro2",
  "serde",

Cargo.toml

@@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"]
 exclude = ["vendor"]
 
 [workspace.package]
-version = "0.26.0"
+version = "0.30.1"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -28,6 +28,8 @@ solidcraft-space-mouse = { path = "crates/space-mouse" }
 solidcraft-mcp = { path = "crates/mcp" }
 solidcraft-derive = { path = "crates/derive" }
 solidcraft-3dx-client = { path = "crates/threedx-client" }
+# test tooling: a dev-dependency only (xtask/src/layers.rs)
+solidcraft-testkit = { path = "crates/testkit" }
 
 # foundation
 thiserror = "2"
@@ -161,6 +163,13 @@ matext4cgmath = { path = "vendor/matext4cgmath" }
 # Keep OpenGL pipelines, resolve textures and CAD callbacks at the same safe sample count.
 egui-wgpu = { path = "vendor/egui-wgpu" }
 
+# Deliver trackpad pinch and rotation gestures on Wayland (zwp_pointer_gestures_v1), which
+# winit 0.30 never binds and eframe 0.36 still requires winit 0.30.
+winit = { path = "vendor/winit" }
+
+# macOS: dropping the accessibility adapter leaves AppKit's key-value observers intact (#7535).
+accesskit_macos = { path = "vendor/accesskit_macos" }
+
 # Mutation testing (cargo-mutants, docs/mutation-testing.md): the ci profile with incremental
 # builds, since every mutant rebuilds the crates above the one it changes.
 [profile.mutants]

README.md

@@ -42,8 +42,8 @@
 </p>
 
 <p align="center">
-  <a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&amp;utm_medium=badge&amp;utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily" alt="tangency-labs%2Fsolidcraft | Trendshift" width="250" height="55"/></a>
-  <a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&amp;utm_medium=badge&amp;utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily?language=Rust" alt="tangency-labs%2Fsolidcraft | Trendshift (Rust)" width="250" height="55"/></a>
+  <a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily" alt="tangency-labs%2Fsolidcraft | Trendshift" width="250" height="55"/></a>
+  <a href="https://trendshift.io/repositories/296178?utm_source=trendshift-badge&utm_medium=badge&utm_campaign=badge-trendshift-296178" target="_blank" rel="noopener noreferrer"><img src="https://trendshift.io/api/badge/trendshift/repositories/296178/daily?language=Rust" alt="tangency-labs%2Fsolidcraft | Trendshift (Rust)" width="250" height="55"/></a>
 </p>
 
 ![SolidCraft: model a Raspberry Pi 4 case from an empty design: a sketch dimensioned with parameters, extrude, fillets and shell, a rim rounded in one pick, standoffs patterned on the board's mounting holes, port cut-outs, vent slots, "Pi 4" engraved in a font, a PETG material with its mass in Properties, and a height change in Parameters](docs/screenshots/demo.gif)
@@ -98,7 +98,7 @@ More commands, the Windows cross-build and the browser build are in [docs/buildi
 runs its own design session, or with `--connect` it drives the running app so you can watch.
 Claude Code: `claude mcp add solidcraft -- solidcraft-cli mcp`. If a terminal doesn't find
 `solidcraft-cli` (older Windows installers don't put it on `PATH`), give its full path (by default
-`"C:\Program Files\SolidCraft\solidcraft-cli.exe"`). Tools, access rules and an example session:
+`"C:\\Program Files\\SolidCraft\\solidcraft-cli.exe"`). Tools, access rules and an example session:
 [docs/mcp.md](docs/mcp.md).
 
 ## Scripts
@@ -150,3 +150,4 @@ Tinkercad are trademarks of their respective owners, named only to describe comp
 [linux-appimage]: https://github.com/tangency-labs/solidcraft/releases/latest/download/solidcraft-linux-x86_64.AppImage
 [snap-store]: https://snapcraft.io/solidcraft
 [web-app]: https://solidcraft.io/app
+

ROADMAP.md

@@ -662,7 +662,9 @@ completed drawings publish atomically. The browser still exports synchronously.
   pieces survive unfold/refold as one logical sheet group, including split flanged sheets.
   Cut-outs made in the flat pattern cross bends at any angle or curved: their edges fold to
   helices and curves on the bend, their walls square to the sheet. Free-form bases use bounded
-  sampling.
+  sampling. A fold crosses the sheet's own outer edges the same way, slanted or on any curve,
+  with the outline exact in the flat pattern and its DXF, and flanges and other folds still go
+  on the panels.
   Parallel prismatic partial-depth cuts retain pocket side and depth through transfer and
   unfold/refold, with separate pocket contours in preview and DXF. Planar Intersect preserves
   exact holes and retained islands, including the union of multiple selected profiles, and

SECURITY.md

@@ -3,7 +3,7 @@
 ## Supported versions
 
 SolidCraft is young and moves quickly, so only the latest release gets security fixes. Please
-update to the [latest release](https://github.com/bherbruck/solidcraft/releases/latest) before
+update to the [latest release](https://github.com/tangency-labs/solidcraft/releases/latest) before
 reporting, and check whether the problem is still on `main`.
 
 | Version | Supported |
@@ -15,18 +15,46 @@ reporting, and check whether the problem is still on `main`.
 ## Reporting a vulnerability
 
 Please **don't open a public issue** for a security problem. Report it privately through GitHub:
-open the repository's [Security tab](https://github.com/bherbruck/solidcraft/security) and choose
+open the repository's [Security tab](https://github.com/tangency-labs/solidcraft/security) and choose
 **Report a vulnerability**
-([direct link](https://github.com/bherbruck/solidcraft/security/advisories/new)).
+([direct link](https://github.com/tangency-labs/solidcraft/security/advisories/new)).
 
-Please include what you found, how to reproduce it (a design file, command or MCP request), the
-version and platform, and the impact you expect. I'll acknowledge the report as soon as I can,
-keep you updated in the advisory, and credit you when the fix is published unless you'd rather
-stay anonymous.
+Please include what you found, the steps you ran to reproduce it (a design file, command or MCP
+request), the version and platform, and what an attacker gains. I'll acknowledge the report as soon
+as I can, keep you updated in the advisory, and credit you when the fix is published unless you'd
+rather stay anonymous.
 
-Areas where reports are especially useful:
+## What counts as a security issue
 
-- opening untrusted design, STEP, STL or 3MF files (crashes, excessive memory or CPU, path tricks)
-- the MCP server and the control API (file access outside the allowed folders, command injection)
-- the web app (anything reaching beyond the page's own storage)
-- release packages and the update paths (AppImage, Flatpak, MSI, deb, rpm, snap)
+Advisories are for problems where someone gets something they shouldn't, without already having
+access to your computer or your account. For example:
+
+- opening a design, STEP, STL or 3MF file from someone else runs code, or reads or overwrites files
+  it shouldn't
+- a website or another computer can reach or control SolidCraft
+- an agent gets past a prompt that promised to ask you first
+- the web app reaches beyond the page's own storage
+- a release package or an update can be tampered with
+- an API key or token gets sent somewhere it shouldn't go
+
+## What to report as a normal bug
+
+Please [open an issue](https://github.com/tangency-labs/solidcraft/issues/new) for these. They're
+still worth fixing, but they aren't security issues:
+
+- anything that needs a program already running on your computer, or the control token. A program
+  running as you can already do what you can.
+- MCP's allowed folders. They guard against accidents, they aren't a security boundary, and an agent
+  with a shell of its own can already reach those files. Getting around them isn't a vulnerability.
+- crashes, hangs, or heavy memory or CPU use, unless they also lead to something in the list above
+- anything that only happens in an unusual setup you'd have to choose on purpose
+
+## Before you send it
+
+- **Run it.** Reproduce the problem on the latest release. If you only read the code, say so, and
+  expect it to wait.
+- **Check it yourself.** If a scanner or an AI agent found it, read the code and confirm it first.
+  These tools tend to overrate what they find.
+- **Say what's gained.** Name what the attacker needs and what they get. I set the final severity.
+
+Reports that don't fit will be closed with a short note, or moved to the issue tracker.

THIRD-PARTY-LICENSES.txt

@@ -1,6 +1,6 @@
 Third-party software in SolidCraft
 
-SolidCraft (the desktop app, solidcraft-cli and the web app) is built from the 560 crates below.
+SolidCraft (the desktop app, solidcraft-cli and the web app) is built from the 561 crates below.
 Generated by `cargo xtask licences` from Cargo.lock and the crates' own licence files.
 SolidCraft's own licence is in LICENSE-MIT and LICENSE-APACHE, and NOTICE.
 
@@ -353,7 +353,7 @@ rustls-native-certs 0.8.5  (Apache-2.0 OR ISC OR MIT)
 rustls-pki-types 1.15.1  (MIT OR Apache-2.0)
 rustls-platform-verifier 0.7.1  (MIT OR Apache-2.0)
 rustls-platform-verifier-android 0.2.0  (MIT OR Apache-2.0)
-rustls-webpki 0.103.15  (ISC)
+rustls-webpki 0.103.16  (ISC)
 rustversion 1.0.23  (MIT OR Apache-2.0)
 ruzstd 0.9.1  (MIT)
 schannel 0.1.29  (MIT)
@@ -403,6 +403,7 @@ syn 1.0.109  (MIT OR Apache-2.0)
 syn 2.0.119  (MIT OR Apache-2.0)
 syn 3.0.6  (MIT OR Apache-2.0)
 synstructure 0.13.2  (MIT)
+sys-locale 0.3.2  (MIT OR Apache-2.0)
 tempfile 3.27.0  (MIT OR Apache-2.0)
 termcolor 1.4.1  (Unlicense OR MIT)
 thiserror 1.0.69  (MIT OR Apache-2.0)
@@ -435,7 +436,7 @@ truck-topology 0.6.0  (Apache-2.0)
 ttf-parser 0.25.1  (MIT OR Apache-2.0)
 twox-hash 2.1.5  (MIT)
 type-map 0.5.1  (MIT/Apache-2.0)
-typed-path 0.12.3  (MIT OR Apache-2.0)
+typed-path 0.13.0  (MIT OR Apache-2.0)
 typeid 1.0.3  (MIT OR Apache-2.0)
 typenum 1.20.1  (MIT OR Apache-2.0)
 uds_windows 1.2.1  (MIT)
@@ -474,7 +475,7 @@ wayland-sys 0.31.11  (MIT)
 web-sys 0.3.106  (MIT OR Apache-2.0)
 web-time 1.1.0  (MIT OR Apache-2.0)
 webbrowser 1.2.4  (MIT OR Apache-2.0)
-webpki-root-certs 1.0.9  (CDLA-Permissive-2.0)
+webpki-root-certs 1.0.10  (CDLA-Permissive-2.0)
 weezl 0.1.12  (MIT OR Apache-2.0)
 wgpu 30.0.1  (MIT OR Apache-2.0)
 wgpu-core 30.0.1  (MIT OR Apache-2.0)
@@ -552,7 +553,7 @@ zeroize_derive 1.5.0  (Apache-2.0 OR MIT)
 zerotrie 0.2.5  (Unicode-3.0)
 zerovec 0.11.8  (Unicode-3.0)
 zerovec-derive 0.11.6  (Unicode-3.0)
-zip 9.0.4  (MIT)
+zip 9.1.3  (MIT)
 zlib-rs 0.6.8  (Zlib)
 zmij 1.0.23  (MIT)
 zopfli 0.8.3  (Apache-2.0)
@@ -596,7 +597,7 @@ pin-project 1.1.13, pin-project-internal 1.1.13, pin-project-lite 0.2.17, piper
 rustix 0.38.44, rustix 1.1.5, rustversion 1.0.23, semver 1.0.28, serde 1.0.229, serde_core 1.0.229,
 serde_derive 1.0.229, serde_derive_internals 0.30.0, serde_json 1.0.151, serde_path_to_error 0.1.20,
 serde_repr 0.1.21, simd_cesu8 1.2.0, smol_str 0.2.2, syn 1.0.109, syn 2.0.119, syn 3.0.6, thiserror
-1.0.69, thiserror 2.0.21, thiserror-impl 1.0.69, thiserror-impl 2.0.21, typed-path 0.12.3, typeid
+1.0.69, thiserror 2.0.21, thiserror-impl 1.0.69, thiserror-impl 2.0.21, typed-path 0.13.0, typeid
 1.0.3, unicode-ident 1.0.26, utf8-zero 0.8.1, wasi 0.11.1+wasi-snapshot-preview1, wasip2
 1.0.4+wasi-0.2.12, wit-bindgen 0.57.1, x11-dl 2.21.0, xdg-home 1.3.0, zbus-lockstep 0.5.2,
 zbus-lockstep-macros 0.5.2, zbus_names 3.0.0, zmij 1.0.23, zvariant_utils 2.1.0, zvariant_utils
@@ -1339,7 +1340,7 @@ libc 0.2.190, litrs 1.0.0, num_enum 0.7.6, num_enum_derive 0.7.6, proc-macro2 1.
 ref-cast 1.0.27, ref-cast-impl 1.0.27, rustc-hash 2.1.3, rustversion 1.0.23, semver 1.0.28, serde
 1.0.229, serde_core 1.0.229, serde_derive 1.0.229, serde_derive_internals 0.30.0, serde_json
 1.0.151, serde_path_to_error 0.1.20, serde_repr 0.1.21, syn 2.0.119, syn 3.0.6, thiserror 1.0.69,
-thiserror 2.0.21, thiserror-impl 1.0.69, thiserror-impl 2.0.21, typed-path 0.12.3, typeid 1.0.3,
+thiserror 2.0.21, thiserror-impl 1.0.69, thiserror-impl 2.0.21, typed-path 0.13.0, typeid 1.0.3,
 unicode-ident 1.0.26, utf8-zero 0.8.1
 ================================================================================
 
@@ -1836,8 +1837,8 @@ approx 0.4.0, as-raw-xcb-connection 1.0.1, atspi 0.29.0, atspi-common 0.13.0, at
 cgmath 0.18.0, chardetng 0.1.17, codespan-reporting 0.13.1, encoding_rs 0.8.42, kurbo 0.13.1,
 multiversion_no_op 1.0.0, nohash-hasher 0.2.0, peniko 0.6.1, polycool 0.4.0, raw-window-metal 1.1.0,
 rustls-platform-verifier 0.7.1, self_cell 1.3.0, siphasher 1.0.4, spade 2.15.1, static_assertions
-1.1.0, ureq 3.4.2, ureq-proto 0.6.4, utf8_iter 1.0.4, x11rb 0.13.2, x11rb-protocol 0.13.2, zeroize
-1.9.1, zeroize_derive 1.5.0, zune-core 0.5.3, zune-jpeg 0.5.15
+1.1.0, sys-locale 0.3.2, ureq 3.4.2, ureq-proto 0.6.4, utf8_iter 1.0.4, x11rb 0.13.2, x11rb-protocol
+0.13.2, zeroize 1.9.1, zeroize_derive 1.5.0, zune-core 0.5.3, zune-jpeg 0.5.15
 ================================================================================
 
 Apache License
@@ -12431,7 +12432,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 ================================================================================
-rustls-webpki 0.103.15
+rustls-webpki 0.103.16
 ================================================================================
 
 Except as otherwise noted, this project is licensed under the following
@@ -13570,6 +13571,32 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+================================================================================
+sys-locale 0.3.2
+================================================================================
+
+MIT License
+
+Copyright (c) 2021 1Password
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ================================================================================
 tempfile 3.27.0
 ================================================================================
@@ -15274,7 +15301,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 ================================================================================
-webpki-root-certs 1.0.9
+webpki-root-certs 1.0.10
 ================================================================================
 
 # Community Data License Agreement - Permissive - Version 2.0
@@ -16401,7 +16428,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 ================================================================================
-zip 9.0.4
+zip 9.1.3
 ================================================================================
 
 The MIT License (MIT)
@@ -16799,6 +16826,14 @@ Bundled fonts (SIL Open Font License, Version 1.1)
   Copyright 2022 The BIZ UDGothic Project Authors (https://github.com/googlefonts/morisawa-biz-ud-mincho)
   Source: https://github.com/googlefonts/morisawa-biz-ud-gothic
 
+- CraftUI-SC.otf (assets/fonts/craft-ui-sc/CraftUI-SC.otf)
+  Copyright 2014-2021 Adobe / Google Inc. (Noto Sans SC subset for SolidCraft web zh)
+  Source: https://github.com/notofonts/noto-cjk (Sans SubsetOTF/SC)
+
+- CraftUI-TC.otf (assets/fonts/craft-ui-tc/CraftUI-TC.otf)
+  Copyright 2014-2021 Adobe / Google Inc. (Noto Sans TC subset for SolidCraft web zh-TW)
+  Source: https://github.com/notofonts/noto-cjk (Sans SubsetOTF/TC)
+
 - IBMPlexSans-Variable.ttf (assets/fonts/ibm-plex-sans/IBMPlexSans-Variable.ttf)
   Copyright 2017 IBM Corp. with Reserved Font Name "Plex"
   Source: https://github.com/IBM/plex

apps/solidcraft-cli/examples/studio_evidence.rs

@@ -66,7 +66,7 @@ fn run() -> Result<(), String> {
     let mut session = Session::default();
     eprintln!("Generating original CAD scene from {recipe_path}");
     let generation_start = Instant::now();
-    let (commands, command_timings) = session.run_script_timed(&recipe, false).map_err(|e| e.to_string())?;
+    let (commands, command_timings) = session.run_script_timed(&recipe, false, &mut |_, _| {}).map_err(|e| e.to_string())?;
     let generation_seconds = generation_start.elapsed().as_secs_f64();
     let design_path = output.with_extension(solidcraft_engine::io::DESIGN_EXT);
     session.execute("file.save_as", &json!({"path":design_path})).map_err(|e| e.to_string())?;
@@ -87,7 +87,7 @@ fn run() -> Result<(), String> {
         let gpu_host_start = Instant::now();
         let policy = solidcraft_gpu::select::Policy::from_env().map_err(|e| e.to_string())?;
         let (adapter, report) =
-            solidcraft_gpu::select::pick_vulkan(policy, |_| true).ok_or("no Vulkan adapter satisfies the requested GPU policy")?;
+            solidcraft_gpu::select::pick_path(policy, |_| true).ok_or("no Vulkan or Metal adapter satisfies the requested GPU policy")?;
         session.register_render_job_host(solidcraft_gpu::path::host_on_adapter(&adapter).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
         (Some(report), Some(gpu_host_start.elapsed().as_secs_f64()))
     } else {

apps/solidcraft-cli/src/main.rs

@@ -2,6 +2,7 @@
 //!
 //! ```text
 //! solidcraft-cli run <script.json|design.sc|part.step|mesh.3mf> [--in design|part.step|mesh.3mf] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]
+//!                    [--param-check off|warn|strict]
 //! solidcraft-cli eval <script.json|design.sc|part.step> [--in design.sc|part.step] [--json-out FILE] (alias: inspect) measurements as JSON
 //! solidcraft-cli script <design.sc> [--out script.json]     the design's history as a command script
 //! solidcraft-cli bench-open <design.sc | part.step> [--parse-only] [--save OUT.sc] [--display LEVEL [--edit NAME EXPR]] [--ops script.json] loading timings as JSON lines
@@ -57,7 +58,7 @@ struct Command {
 }
 
 /// `run`'s lines in the usage.
-const USAGE_RUN: &str = "  solidcraft-cli run <script.json|design.sc|part.step> [--in design.sc|part.step] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]\n  solidcraft-cli run --in <design.sc|part.step> [--out FILE]...\n      (a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)\n      (--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;\n       --profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)\n";
+const USAGE_RUN: &str = "  solidcraft-cli run <script.json|design.sc|part.step> [--in design.sc|part.step] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]\n                     [--param-check off|warn|strict]\n  solidcraft-cli run --in <design.sc|part.step> [--out FILE]...\n      (a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)\n      (--param-check checks each step against its command's contract: warn reports on stderr, strict stops the run)\n      (--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;\n       --profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)\n";
 /// `eval`'s lines in the usage.
 const USAGE_EVAL: &str = "  solidcraft-cli eval <script.json|design.sc|part.step> [--in design.sc|part.step] [--json-out FILE]     (alias: inspect)\n  solidcraft-cli eval --in <script.json|design.sc|part.step> [--json-out FILE]\n      (with both inputs, runs the positional script on --in before measuring; does not automatically save the modified design)\n      (--json-out FILE writes the JSON that run (with --results, else the measurement) and eval print to FILE instead of stdout,\n       as plain UTF-8: a shell's > can re-encode it, e.g. Windows PowerShell adds a byte-order mark)\n";
 /// `script`'s lines in the usage.
@@ -171,7 +172,11 @@ fn main() -> ExitCode {
         Some("oracle") => oracle::run(&args[1..]),
         Some("fuzz") => fuzz::run(&args[1..]),
         Some("fuzz-one") => fuzz::one(&args[1..]),
-        Some("mcp") => cmd_mcp(&args[1..]),
+        Some("mcp") => {
+            let result = cmd_mcp(&args[1..]);
+            solidcraft_mcp::cleanup_scratch_dir();
+            result
+        }
         Some("crashes") => crashes::run(&args[1..]),
         Some("icon") => cmd_icon(&args[1..]),
         Some("licences" | "licenses") => {
@@ -299,18 +304,36 @@ fn load_checked(path: &str, check: solidcraft_engine::schema::ParamCheck) -> Res
         s.execute("doc.open", &json!({"path": path})).map_err(|e| e.to_string())?;
     } else {
         let script = if v.get("features").is_some() && v.get("commands").is_none() { recipe::to_script(&v)? } else { v };
-        // Warn level: each step's `param_warnings` as it completes, even when a later step fails
-        // (stderr, so stdout stays the caller's).
-        let mut warn = |step: usize, r: &Value| {
-            for w in r.get("param_warnings").and_then(Value::as_array).into_iter().flatten() {
-                eprintln!("{path}: step {}: {}", step + 1, w.as_str().unwrap_or_default());
-            }
-        };
-        s.run_script_each(&script, &mut warn).map_err(|e| e.to_string())?;
+        run_script_warning(&mut s, path, &script)?;
     }
     Ok(s)
 }
 
+/// Run `script`, read from `path`, on `s`. At the warn level each step's `param_warnings` go to
+/// stderr as the step completes, even when a later step fails (stdout stays the caller's).
+fn run_script_warning(s: &mut Session, path: &str, script: &Value) -> Result<Vec<Value>, String> {
+    s.run_script_each(script, &mut |step, r| print_param_warnings(path, step, r)).map_err(|e| e.to_string())
+}
+
+/// Step `step`'s `param_warnings` on stderr, one per line, named after the script at `path`.
+fn print_param_warnings(path: &str, step: usize, r: &Value) {
+    for w in r.get("param_warnings").and_then(Value::as_array).into_iter().flatten() {
+        eprintln!("{path}: step {}: {}", step + 1, w.as_str().unwrap_or_default());
+    }
+}
+
+/// `--param-check off|warn|strict`: how calls that break a command's parameter contract are
+/// treated (docs/mcp.md); off when the option isn't given.
+fn parse_param_check(cmd: &str, args: &[String]) -> Result<solidcraft_engine::schema::ParamCheck, String> {
+    match flag(args, "--param-check") {
+        None if args.iter().any(|a| a == "--param-check") => Err(format!("{cmd}: --param-check wants off, warn or strict")),
+        None => Ok(solidcraft_engine::schema::ParamCheck::Off),
+        Some(v) => {
+            solidcraft_engine::schema::ParamCheck::parse(v).ok_or_else(|| format!("{cmd}: --param-check wants off, warn or strict, not `{v}`"))
+        }
+    }
+}
+
 fn flag<'a>(args: &'a [String], name: &str) -> Option<&'a str> {
     args.iter().position(|a| a == name).and_then(|i| args.get(i + 1)).map(String::as_str)
 }
@@ -367,7 +390,15 @@ fn print_json(v: &Value, file: Option<&str>) -> Result<(), String> {
 fn cmd_run(args: &[String]) -> Result<(), String> {
     install_renderer();
     let json_out = json_out(args)?;
-    known_args("run", args, &["--in", "--out", "--save", "--json-out"], &["--quiet", "--results", "--timings", "--profile", "--allow-errors"], true)?;
+    // Before the option check, so a bare `--param-check` gets the words `mcp` uses.
+    let check = parse_param_check("run", args)?;
+    known_args(
+        "run",
+        args,
+        &["--in", "--out", "--save", "--json-out", "--param-check"],
+        &["--quiet", "--results", "--timings", "--profile", "--allow-errors"],
+        true,
+    )?;
     let base = flag(args, "--in");
     let path = positional(args);
     if path.is_none() && base.is_none() {
@@ -380,23 +411,25 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
     let (mut s, results) = if want_results || timings {
         // Collect every command's result or time (scripts only), then process requested files too.
         let mut s = match base {
-            Some(b) => load(b)?,
+            Some(b) => load_checked(b, check)?,
             None => Session::default(),
         };
+        s.param_check = check;
         let needs = if want_results { "--results needs a script" } else { "--timings needs a script" };
-        let v = read_json(path.ok_or(needs)?)?;
+        let script = path.ok_or(needs)?;
+        let v = read_json(script)?;
         let out = if timings {
-            let (r, mut t) = s.run_script_timed(&v, profile).map_err(|e| e.to_string())?;
+            let (r, mut t) = s.run_script_timed(&v, profile, &mut |step, r| print_param_warnings(script, step, r)).map_err(|e| e.to_string())?;
             if want_results && let Some(o) = t.as_object_mut() {
                 o.insert("results".into(), Value::Array(r));
             }
             t
         } else {
-            Value::Array(s.run_script(&v).map_err(|e| e.to_string())?)
+            Value::Array(run_script_warning(&mut s, script, &v)?)
         };
         (s, Some(out))
     } else {
-        (open(base, path)?, None)
+        (open(base, path, check)?, None)
     };
     // A feature that fails leaves the bodies as they were before it (a parameter change can
     // break a feature without failing the command that made it): writing them would hand out
@@ -421,16 +454,16 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
 }
 
 /// The session `run`, `eval` and `snapshot` start from: `--in` (a design or STEP file) with the
-/// positional script run on top of it, or either one alone.
-fn open(base: Option<&str>, path: Option<&String>) -> Result<Session, String> {
+/// positional script run on top of it, or either one alone, with scripts run at `check`.
+fn open(base: Option<&str>, path: Option<&String>, check: solidcraft_engine::schema::ParamCheck) -> Result<Session, String> {
     match (base, path) {
         (Some(b), Some(p)) => {
-            let mut s = load(b)?;
-            s.run_script(&read_json(p)?).map_err(|e| e.to_string())?;
+            let mut s = load_checked(b, check)?;
+            run_script_warning(&mut s, p, &read_json(p)?)?;
             Ok(s)
         }
-        (Some(b), None) => load(b),
-        (None, Some(p)) => load(p),
+        (Some(b), None) => load_checked(b, check),
+        (None, Some(p)) => load_checked(p, check),
         (None, None) => Err(usage()),
     }
 }
@@ -473,7 +506,7 @@ fn timeline_ok(s: &Session) -> Result<(), String> {
 fn cmd_eval(args: &[String]) -> Result<(), String> {
     let json_out = json_out(args)?;
     known_args("eval", args, &["--in", "--json-out"], &[], true)?;
-    let mut s = open(flag(args, "--in"), positional(args))?;
+    let mut s = open(flag(args, "--in"), positional(args), solidcraft_engine::schema::ParamCheck::Off)?;
     let m = s.execute("inspect.measure", &json!({})).map_err(|e| e.to_string())?;
     let d = s.execute("document.inspect", &json!({})).map_err(|e| e.to_string())?;
     let out = json!({
@@ -567,7 +600,7 @@ fn cmd_snapshot(args: &[String]) -> Result<(), String> {
         Some(x) => x.parse().ok().filter(|n| (16..=8192).contains(n)).ok_or_else(|| format!("{name} must be 16 to 8192 pixels, not `{x}`")),
     };
     let (w, h) = (size("--width", 1280)?, size("--height", 800)?);
-    let mut s = open(flag(args, "--in"), positional(args))?;
+    let mut s = open(flag(args, "--in"), positional(args), solidcraft_engine::schema::ParamCheck::Off)?;
     // How the bodies are drawn and where the model is cut, through the commands the app's
     // Appearance dialog and Section Analysis run (`preview`).
     preview::apply(&mut s, &flags(args, "--body"), &flags(args, "--tool"), flag(args, "--section"))?;
@@ -691,17 +724,8 @@ fn cmd_mcp(args: &[String]) -> Result<(), String> {
             eprintln!("solidcraft mcp: the design's folder is left out because {why}; add it with --allow-path if you mean it");
         }
     }
-    // How a headless session treats calls that break a command's parameter contract (docs/mcp.md).
-    let param_check = match flag(args, "--param-check") {
-        None if args.iter().any(|a| a == "--param-check") => return Err("mcp: --param-check wants off, warn or strict".into()),
-        None => solidcraft_engine::schema::ParamCheck::Off,
-        Some(v) => {
-            solidcraft_engine::schema::ParamCheck::parse(v).ok_or_else(|| format!("mcp: --param-check wants off, warn or strict, not `{v}`"))?
-        }
-    };
-    if param_check != solidcraft_engine::schema::ParamCheck::Off && flag(args, "--connect").is_some() {
-        eprintln!("solidcraft mcp: --param-check applies to headless sessions; calls to the app are not checked yet");
-    }
+    // How calls that break a command's parameter contract are treated, headless or bridged.
+    let param_check = parse_param_check("mcp", args)?;
     let backend: Box<dyn solidcraft_mcp::Backend> = match (flag(args, "--connect"), flag(args, "--in")) {
         (Some(_), Some(_)) => return Err("mcp: use either --connect or --in, not both".into()),
         (Some(addr), None) => {
@@ -709,7 +733,7 @@ fn cmd_mcp(args: &[String]) -> Result<(), String> {
                 return Err(format!("mcp: --connect wants HOST:PORT, such as 127.0.0.1:7878, not `{addr}`"));
             };
             // Serve without the app too: the tools connect once it runs, and say it isn't until then.
-            let mut remote = solidcraft_mcp::Remote::new(addr, flag(args, "--token"));
+            let mut remote = solidcraft_mcp::Remote::new(addr, flag(args, "--token")).with_param_check(param_check);
             if let Err(e) = remote.try_connect() {
                 eprintln!(
                     "solidcraft mcp: no SolidCraft app at {addr} yet ({e}); start it with `solidcraft --control {port}` \
@@ -729,7 +753,8 @@ fn cmd_mcp(args: &[String]) -> Result<(), String> {
             let auto = !args.iter().any(|a| a == "--headless");
             if auto && let Some(port) = discover_app() {
                 eprintln!("solidcraft mcp: bridged to the running app at 127.0.0.1:{port} (--headless starts a session of its own)");
-                return serve_mcp(Box::new(solidcraft_mcp::Remote::new(&format!("127.0.0.1:{port}"), flag(args, "--token"))), scope);
+                let remote = solidcraft_mcp::Remote::new(&format!("127.0.0.1:{port}"), flag(args, "--token")).with_param_check(param_check);
+                return serve_mcp(Box::new(remote), scope);
             }
             let mut headless = solidcraft_mcp::Headless::default();
             headless.session.param_check = param_check;

apps/solidcraft-cli/tests/mcp_connect.rs

@@ -263,3 +263,110 @@ mod setup {
         assert!(json_of(&pkg.join("claude_desktop_config.json"))["mcpServers"]["solidcraft"].is_object());
     }
 }
+
+/// Scratch files belong to the CLI process; exercise real startup, requests and shutdown.
+mod scratch_cleanup {
+    use super::*;
+    use std::path::{Path, PathBuf};
+
+    fn command(case: &str) -> (PathBuf, Command) {
+        let dir = std::env::temp_dir().join(format!("solidcraft-mcp-lifecycle-{case}-{}", std::process::id()));
+        std::fs::create_dir(&dir).unwrap();
+        let mut command = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"));
+        command
+            .args(["mcp", "--headless"])
+            .env("TMPDIR", &dir)
+            .env("TMP", &dir)
+            .env("TEMP", &dir)
+            .env("SOLIDCRAFT_RECOVERY_DIR", dir.join("recovery"))
+            .stdin(Stdio::piped())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::piped());
+        (dir, command)
+    }
+
+    fn scratch_folders(dir: &Path) -> Vec<PathBuf> {
+        std::fs::read_dir(dir)
+            .unwrap()
+            .map(|entry| entry.unwrap().path())
+            .filter(|path| path.file_name().unwrap().to_string_lossy().starts_with("solidcraft-mcp-"))
+            .collect()
+    }
+
+    fn initialize() -> Value {
+        json!({"jsonrpc": "2.0", "id": 1, "method": "initialize", "params": {"protocolVersion": "2025-06-18"}})
+    }
+
+    fn run(mut command: Command, request: Value) -> std::process::Output {
+        let mut child = command.spawn().unwrap();
+        writeln!(child.stdin.take().unwrap(), "{request}").unwrap();
+        child.wait_with_output().unwrap()
+    }
+
+    #[test]
+    fn eof_removes_only_the_process_scratch_folder() {
+        let (dir, command) = command("eof");
+        let unrelated = dir.join("solidcraft-mcp-unrelated");
+        std::fs::create_dir(&unrelated).unwrap();
+        let out = run(command, initialize());
+        assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+        let reply: Value = serde_json::from_slice(&out.stdout).unwrap();
+        assert!(reply.get("result").is_some(), "{reply}");
+        assert_eq!(scratch_folders(&dir), vec![unrelated]);
+        assert!(dir.join("recovery").is_dir(), "cleanup must leave the recovery folder alone");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    #[test]
+    fn startup_error_removes_the_process_scratch_folder() {
+        let (dir, mut command) = command("startup-error");
+        let out = command.args(["--param-check", "invalid"]).stdin(Stdio::null()).output().unwrap();
+        let stderr = String::from_utf8_lossy(&out.stderr);
+        assert!(!out.status.success());
+        assert!(stderr.contains("--param-check wants off, warn or strict"), "{stderr}");
+        assert!(scratch_folders(&dir).is_empty(), "startup error left a scratch folder in {dir:?}");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    #[test]
+    fn shutdown_preserves_nonempty_scratch_folder() {
+        let (dir, mut command) = command("nonempty");
+        let mut child = command.spawn().unwrap();
+        let mut input = child.stdin.take().unwrap();
+        writeln!(input, "{}", initialize()).unwrap();
+        let mut reply = String::new();
+        BufReader::new(child.stdout.take().unwrap()).read_line(&mut reply).unwrap();
+        let reply: Value = serde_json::from_str(&reply).unwrap();
+        assert!(reply.get("result").is_some(), "{reply}");
+        let scratch = scratch_folders(&dir);
+        assert_eq!(scratch.len(), 1);
+        let saved = scratch[0].join("keep.txt");
+        std::fs::write(&saved, "saved output").unwrap();
+        drop(input);
+        let out = child.wait_with_output().unwrap();
+        assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+        assert_eq!(std::fs::read_to_string(saved).unwrap(), "saved output");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+
+    #[test]
+    fn failed_screenshot_scratch_folder_is_removed_without_a_path_scope() {
+        let (dir, mut command) = command("screenshot");
+        command.arg("--allow-any-path");
+        // A headless server cannot capture a window. The request still allocates a scratch
+        // path before the backend refuses it, without relying on a GPU or installed renderer.
+        let out = run(
+            command,
+            json!({
+                "jsonrpc": "2.0", "id": 1, "method": "tools/call",
+                "params": {"name": "screenshot", "arguments": {"source": "window"}},
+            }),
+        );
+        assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
+        let reply: Value = serde_json::from_slice(&out.stdout).unwrap();
+        assert_eq!(reply["result"]["isError"], true, "{reply}");
+        assert!(reply["result"]["content"][0]["text"].as_str().unwrap().contains("the window gave no picture"), "{reply}");
+        assert!(scratch_folders(&dir).is_empty(), "failed screenshot left a scratch folder in {dir:?}");
+        std::fs::remove_dir_all(dir).unwrap();
+    }
+}

apps/solidcraft-cli/tests/model_cache.rs

@@ -288,3 +288,47 @@ fn undoing_an_edit_after_opening_reuses_the_saved_results() {
     let _ = std::fs::remove_file(&path);
     let _ = std::fs::remove_file(format!("{}.bak", path.display()));
 }
+
+/// A design saved before body names were pinned (#6403) pins them as it opens, as its first
+/// command would, and opening it is no change. That command pinned them as part of itself, so
+/// undoing it went back to the unpinned design, which no evaluated result matched: the first
+/// undo after opening from the command line evaluated every feature again (82-93 s in a
+/// 5,484-feature design); `doc.open` pinned them after opening, which marked the design changed.
+#[test]
+fn a_design_saved_before_names_were_pinned_opens_pinned_and_unchanged() {
+    let plate = solidcraft_engine::sample::samples().into_iter().find(|s| s.name == "Sample Plate").unwrap();
+    let mut built = Session::default();
+    for c in (plate.script)()["commands"].as_array().unwrap() {
+        built.execute(c["command"].as_str().unwrap(), &c["params"]).unwrap();
+    }
+    let mut doc = built.design().into_owned();
+    for f in &mut doc.features {
+        f.body_names.clear();
+    }
+    doc.reserved_body_names.clear();
+    let unpinned = Session::new(doc);
+    let design = unpinned.design();
+    let saved = unpinned.model.saved(&design).unwrap();
+    let bytes = solidcraft_engine::io::write_design_container_with_cache(&design, solidcraft_engine::io::DesignCompression::Fast, None, Some(&saved))
+        .unwrap();
+    let path = temp("unpinned");
+    std::fs::write(&path, &bytes).unwrap();
+    let file = path.to_string_lossy().to_string();
+    // As the command line opens a design (`load`), and as the app does (`doc.open`).
+    let (doc, saved) = solidcraft_engine::io::read_design_file(&file, None::<fn(solidcraft_engine::io::DesignPreview)>).unwrap();
+    for (how, mut s) in [("opened_at", Session::opened_at(doc, saved.as_ref(), Some(&file))), ("doc.open", open(&path))] {
+        assert_eq!(s.model.last_recomputed, 0, "{how}: taken from the file");
+        assert!(s.doc.features.iter().any(|f| !f.body_names.is_empty()), "{how}: the names are pinned");
+        assert!(!s.is_dirty(), "{how}: opening is no change");
+        let read: Vec<Arc<ModelState>> = s.model.results.iter().map(|r| r.state.clone()).collect();
+        s.execute("solid.box", &json!({"length": 3, "width": 3, "height": 3, "operation": "new"})).unwrap();
+        // As in a large design, whose evaluation cache keeps only a few results: undo finds the
+        // results in the model itself or evaluates them again.
+        *s.model.cache.lock().unwrap() = Default::default();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(s.model.last_recomputed, 0, "{how}: the first undo evaluates nothing");
+        assert!(s.model.results.iter().zip(&read).all(|(r, st)| Arc::ptr_eq(&r.state, st)), "{how}: the states read from the file");
+        assert!(!s.is_dirty(), "{how}: undone to the design as opened");
+    }
+    let _ = std::fs::remove_file(&path);
+}

apps/solidcraft-cli/tests/run_results.rs

@@ -229,7 +229,9 @@ fn known_pending_concepts_and_released_files_round_trip_with_inert_metadata() {
             assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
             let reopened = io::read_design(&std::fs::read(&destination).unwrap()).unwrap();
             assert_eq!(reopened.metadata, document.metadata);
-            assert_eq!(reopened.name, document.name);
+            // #4907: `run --save` maps to Save As, and a borrowed design name
+            // follows the destination file's stem instead of keeping the old name.
+            assert_eq!(reopened.name, format!("resaved-{index}"));
             assert_eq!(reopened.features, document.features);
             assert_eq!(std::fs::read(&source).unwrap(), bytes);
         }
@@ -496,6 +498,78 @@ fn timings_and_profile_report_each_command() {
     assert!(String::from_utf8_lossy(&output.stderr).contains("--timings needs a script"));
 }
 
+/// #6921: `--param-check` checks a script's steps against their contracts on every path `run`
+/// takes (a script alone, on an `--in` design or script, with `--results`, `--timings` or
+/// `--profile`), and a warning reaches stderr even when a later step fails.
+#[test]
+fn param_check_reaches_every_script_run_takes() {
+    let dir = Scratch::new();
+    let typo = dir.0.join("typo.json");
+    let step = json!({"command": "solid.box", "params": {"length": 2, "width": 3, "height": 4, "operaton": "new"}});
+    std::fs::write(&typo, json!({"commands": [step.clone()]}).to_string()).unwrap();
+    let base = dir.0.join("base.solidcraft");
+    json_output(cli().arg("run").arg(dir.script()).arg("--save").arg(&base).output().unwrap());
+    let saved = dir.0.join("saved.solidcraft");
+    let start = dir.script();
+    let (typo, base, saved_arg, start) = (typo.to_str().unwrap(), base.to_str().unwrap(), saved.to_str().unwrap(), start.to_str().unwrap());
+    let paths = [&[][..], &["--in", base], &["--in", start], &["--results"], &["--timings"], &["--timings", "--profile"]];
+    let run = |level: Option<&str>, extra: &[&str]| {
+        std::fs::remove_file(&saved).ok();
+        let check = level.map(|l| ["--param-check", l]).into_iter().flatten();
+        cli().args(["run", typo, "--save", saved_arg]).args(check).args(extra).output().unwrap()
+    };
+
+    // Off, the default: the step runs as it always has, without a word.
+    let off = run(None, &[]);
+    assert!(off.status.success() && !String::from_utf8_lossy(&off.stderr).contains("operaton"), "{off:?}");
+    assert_eq!(body_count(&saved), 1);
+
+    // Warn: each path runs the step, saves, and reports it on stderr; `--results` keeps it too.
+    for extra in paths {
+        let output = run(Some("warn"), extra);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        assert!(output.status.success(), "{extra:?}: {stderr}");
+        assert!(stderr.contains("step 1: unknown key `operaton`; did you mean `operation`?"), "{extra:?}: {stderr}");
+        assert!(saved.exists(), "{extra:?}");
+        if extra == ["--results"] {
+            let results: Value = serde_json::from_slice(&output.stdout).unwrap();
+            assert!(results[0]["param_warnings"][0].as_str().is_some_and(|w| w.contains("operaton")), "{results}");
+        }
+    }
+
+    // Strict: on each path the run stops at the step, and nothing is written.
+    for extra in paths {
+        let output = run(Some("strict"), extra);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        assert_eq!(output.status.code(), Some(1), "{extra:?}: {stderr}");
+        assert!(stderr.contains("unknown key `operaton`"), "{extra:?}: {stderr}");
+        assert!(!saved.exists(), "{extra:?}");
+    }
+
+    // Warn, with a later step that fails: the run fails, and the first step's warning is still
+    // reported, timed or not.
+    let failing = dir.0.join("failing.json");
+    let fail = json!({"command": "solid.extrude", "params": {"sketch": "Nope"}});
+    std::fs::write(&failing, json!({"commands": [step, fail]}).to_string()).unwrap();
+    for extra in [&[][..], &["--timings"]] {
+        let output = cli().arg("run").arg(&failing).args(["--param-check", "warn"]).args(extra).output().unwrap();
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        assert_eq!(output.status.code(), Some(1), "{extra:?}: {stderr}");
+        assert!(stderr.contains("step 1: unknown key `operaton`") && stderr.contains("no sketch `Nope`"), "{extra:?}: {stderr}");
+    }
+
+    // A level it doesn't know and a missing value fail.
+    for (bad, says) in [
+        (&["--param-check", "loud"][..], "--param-check wants off, warn or strict, not `loud`"),
+        (&["--param-check"], "run: --param-check wants off, warn or strict"),
+    ] {
+        let output = cli().args(["run", typo]).args(bad).output().unwrap();
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        assert_eq!(output.status.code(), Some(1), "{bad:?}: {stderr}");
+        assert!(stderr.contains(says), "{bad:?}: {stderr}");
+    }
+}
+
 fn render_setup_script(dir: &Scratch, job: Value) -> PathBuf {
     let path = dir.0.join("render.json");
     std::fs::write(

apps/solidcraft-cli/tests/script_roundtrip.rs

@@ -123,3 +123,42 @@ fn a_design_naming_a_sketch_and_its_extrude_alike_replays_from_its_script() {
     assert_eq!(names, ["Block", "Block"], "{first:#}");
     assert_eq!(second["commands"], first["commands"], "the replayed design's script has the same steps");
 }
+
+/// #10230: script export must disclose the print-face state that replay leaves out.
+#[test]
+fn script_export_warns_about_omitted_print_faces_on_stderr() {
+    let dir = std::env::temp_dir().join(format!("solidcraft-print-face-script-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let saved = dir.join("block.sc");
+    let exported = dir.join("block.json");
+    let mut s = Session::default();
+    s.execute("solid.box", &json!({"length": 20, "width": 10, "height": 5, "body_name": "Block"})).unwrap();
+    s.execute("body.print_face", &json!({"body": "Block", "point": [10, 5, 0]})).unwrap();
+    s.execute("file.save", &json!({"path": saved})).unwrap();
+    let native = std::fs::read(&saved).unwrap();
+
+    for to_file in [false, true] {
+        let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"));
+        cmd.arg("script").arg(&saved);
+        if to_file {
+            cmd.arg("--out").arg(&exported);
+        }
+        let out = cmd.output().unwrap();
+        let stderr = String::from_utf8_lossy(&out.stderr);
+        assert!(out.status.success(), "{stderr}");
+        assert!(stderr.contains("note: the script leaves out print-face assignments (body.print_face)"), "{stderr}");
+        let script = if to_file {
+            assert!(out.stdout.is_empty(), "--out must keep stdout empty");
+            std::fs::read(&exported).unwrap()
+        } else {
+            out.stdout
+        };
+        let script: Value = serde_json::from_slice(&script).unwrap();
+        let mut replayed = Session::default();
+        replayed.run_script(&script).unwrap();
+        assert!(replayed.doc.print_faces.is_empty());
+        assert_eq!(replayed.doc.features, s.doc.features);
+        assert_eq!(std::fs::read(&saved).unwrap(), native, "export must not change the source design");
+    }
+    std::fs::remove_dir_all(dir).unwrap();
+}

apps/solidcraft-web/Cargo.toml

@@ -34,7 +34,7 @@ serde_json = { workspace = true }
 web-sys = { version = "0.3", features = [
     "Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "Location", "Navigator", "StorageManager",
     "FileSystemHandle", "FileSystemDirectoryHandle", "FileSystemFileHandle", "FileSystemGetFileOptions", "FileSystemWritableFileStream",
-    "WritableStream", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlAnchorElement", "HtmlInputElement", "Storage",
+    "WritableStream", "File", "FileList", "Blob", "BlobPropertyBag", "Url", "HtmlAnchorElement", "HtmlInputElement", "Storage", "StorageEvent",
     "IdbFactory", "IdbDatabase", "IdbObjectStore", "IdbOpenDbRequest", "IdbRequest", "IdbTransaction", "IdbTransactionMode",
     "Headers", "ReadableStream", "ReadableStreamDefaultReader",
     "BeforeUnloadEvent", "Event", "EventTarget", "KeyboardEvent", "Response", "FormData", "RequestInit", "MediaQueryList", "Gamepad", "Performance",

apps/solidcraft-web/index.html

@@ -22,6 +22,10 @@
   <link data-trunk rel="rust" data-bin="solidcraft-web" data-wasm-opt="z" data-weak-refs />
   <link data-trunk rel="copy-file" href="../../assets/fonts/biz-udp-gothic/BIZUDPGothic-Regular.ttf" data-target-path="fonts" />
   <link data-trunk rel="copy-file" href="../../assets/fonts/biz-udp-gothic/OFL.txt" data-target-path="fonts" />
+  <link data-trunk rel="copy-file" href="../../assets/fonts/craft-ui-sc/CraftUI-SC.otf" data-target-path="fonts" />
+  <link data-trunk rel="copy-file" href="../../assets/fonts/craft-ui-sc/OFL.txt" data-target-path="fonts/craft-ui-sc" />
+  <link data-trunk rel="copy-file" href="../../assets/fonts/craft-ui-tc/CraftUI-TC.otf" data-target-path="fonts" />
+  <link data-trunk rel="copy-file" href="../../assets/fonts/craft-ui-tc/OFL.txt" data-target-path="fonts/craft-ui-tc" />
   <link data-trunk rel="css" href="../../assets/styles/web/loading.css" />
   <link data-trunk rel="copy-file" href="../../assets/styles/web/loading-logo.svg" />
   <!-- Installable as an app (manifest.webmanifest); the icons are the Linux exports of the app mark. -->

apps/solidcraft-web/src/linked.rs

@@ -15,6 +15,9 @@ type Reply = Result<(String, Vec<u8>), String>;
 pub struct Download {
     reply: Rc<RefCell<Option<Reply>>>,
     pending: Option<(String, Vec<u8>)>,
+    /// The downloaded design being opened (a few features a frame, #10198): the answer to come,
+    /// the name it takes and the file it was read from.
+    opening: Option<(std::sync::mpsc::Receiver<serde_json::Value>, String, String)>,
 }
 
 impl Download {
@@ -33,13 +36,14 @@ impl Download {
     }
 
     pub fn tick(&mut self, app: &mut SolveApp, ctx: &egui::Context) {
+        self.opened(app);
         if let Some(reply) = self.reply.borrow_mut().take() {
             match reply {
                 Ok(file) => self.pending = Some(file),
                 Err(error) => app.set_status(format!("Could not open design link: {error}"), true),
             }
         }
-        if self.pending.is_none() || app.file_picker_busy() {
+        if self.pending.is_none() || self.opening.is_some() || app.file_picker_busy() {
             return;
         }
         if solidcraft_ui_egui::documents::any_dirty(app) {
@@ -71,18 +75,33 @@ impl Download {
             }
         }
         let Some((name, bytes)) = self.pending.take() else { return };
-        // The extension selects the design loader even when the URL has no extension.
-        let path = &format!("/linked/design.{}", solidcraft_engine::io::DESIGN_EXT);
-        vfs::insert(path, bytes);
-        app.open_path(path);
-        if app.session.path.as_deref() == Some(path.as_str()) {
+        // The extension selects the design loader even when the URL has no extension. Named
+        // after the link, as the progress card shows the file's name.
+        let file: String = name.chars().map(|c| if matches!(c, '/' | '\\') { '_' } else { c }).collect();
+        let path = format!("/linked/{}.{}", if file.is_empty() { "design" } else { &file }, solidcraft_engine::io::DESIGN_EXT);
+        vfs::insert(&path, bytes);
+        // Opened as any design is, with its progress and Cancel; finished in `opened`.
+        self.opening = Some((app.open_path_answered(&path), name, path));
+        self.opened(app);
+    }
+
+    /// The downloaded design is in: it is an unsaved copy under the link's name.
+    fn opened(&mut self, app: &mut SolveApp) {
+        let Some((rx, _, _)) = &self.opening else { return };
+        let (ok, cancelled) = match rx.try_recv() {
+            Ok(reply) => (reply["ok"].as_bool() == Some(true), reply["error"].as_str().is_some_and(|e| e.contains("cancelled"))),
+            Err(std::sync::mpsc::TryRecvError::Empty) => return,
+            Err(std::sync::mpsc::TryRecvError::Disconnected) => (false, false),
+        };
+        let Some((_, name, path)) = self.opening.take() else { return };
+        if ok && app.session.path.as_deref() == Some(path.as_str()) {
             app.session.path = None;
             app.session.doc_mut().name = name;
             app.session.mark_unsaved();
-        } else {
+        } else if !ok && !cancelled {
             app.set_status("Could not open design link: the downloaded file is not a valid SolidCraft design", true);
         }
-        let _ = vfs::remove(path);
+        let _ = vfs::remove(&path);
     }
 }
 

apps/solidcraft-web/src/main.rs

@@ -119,6 +119,43 @@ fn closes_design(key: &str, command: bool, shift: bool, alt: bool, design_shown:
     design_shown && command && !shift && !alt && key.eq_ignore_ascii_case("w")
 }
 
+/// The settings a tab last wrote to the browser's storage, or loaded from another tab (#8644).
+/// Every open tab of the app shares that storage, and eframe saves each tab's whole copy every
+/// 30 s and when the page loses focus, so a tab still holding old settings put them back over a
+/// change made in another. A change is now written in the frame it is made, and the other tabs
+/// load it ([`settings_written`]).
+#[cfg(any(target_arch = "wasm32", test))]
+#[derive(Default, Debug)]
+struct PrefsWriter {
+    written: Option<String>,
+}
+
+#[cfg(any(target_arch = "wasm32", test))]
+impl PrefsWriter {
+    /// `prefs` if they are not the settings written or loaded last (they count as written from
+    /// now on).
+    fn take(&mut self, prefs: String) -> Option<String> {
+        if self.written.as_deref() == Some(prefs.as_str()) {
+            return None;
+        }
+        self.written = Some(prefs.clone());
+        Some(prefs)
+    }
+
+    /// The settings the tab holds after loading another tab's: the tab doesn't write them back.
+    fn loaded(&mut self, prefs: String) {
+        self.written = Some(prefs);
+    }
+}
+
+/// The settings another tab wrote, from a `storage` event (the browser sends one to every other
+/// tab of the page when one tab writes). Other keys, and settings taken away (clearing the site's
+/// data), leave this tab's settings as they are.
+#[cfg(any(target_arch = "wasm32", test))]
+fn settings_written(key: Option<&str>, value: Option<String>) -> Option<String> {
+    value.filter(|_| key == Some(solidcraft_ui_egui::prefs::STORAGE_KEY))
+}
+
 #[cfg(target_arch = "wasm32")]
 mod web {
     use std::rc::Rc;
@@ -217,9 +254,29 @@ mod web {
         on_key.forget();
     }
 
-    const JAPANESE_FONT_PATH: &str = "./fonts/BIZUDPGothic-Regular.ttf";
+    /// Settings another tab wrote, waiting for this tab's next frame (#8644).
+    type PrefsInbox = Rc<std::cell::Cell<Option<String>>>;
 
-    type FontLoadResult = Rc<std::cell::RefCell<Option<Result<Vec<u8>, String>>>>;
+    /// Settings another tab of the app writes go to `inbox`, and this tab draws a frame, which
+    /// loads them.
+    fn hear_settings_from_other_tabs(window: &web_sys::Window, ctx: &egui::Context, inbox: PrefsInbox) {
+        let ctx = ctx.clone();
+        let on_storage = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::StorageEvent)>::new(move |e: web_sys::StorageEvent| {
+            if let Some(prefs) = crate::settings_written(e.key().as_deref(), e.new_value()) {
+                inbox.set(Some(prefs));
+                ctx.request_repaint();
+            }
+        });
+        let _ = window.add_event_listener_with_callback("storage", on_storage.as_ref().unchecked_ref());
+        // The listener lives as long as the page.
+        on_storage.forget();
+    }
+
+    const JAPANESE_FONT_PATH: &str = "./fonts/BIZUDPGothic-Regular.ttf";
+    const CHINESE_SC_FONT_PATH: &str = "./fonts/CraftUI-SC.otf";
+    const CHINESE_TC_FONT_PATH: &str = "./fonts/CraftUI-TC.otf";
+
+    type FontLoadResult = Rc<std::cell::RefCell<Option<Result<(String, Vec<u8>), String>>>>;
 
     struct Shell {
         app: SolveApp,
@@ -237,18 +294,63 @@ mod web {
         rename_focus: bool,
         /// The start page's recent designs were filled from the stored ones.
         recents_synced: bool,
-        /// On-demand CJK font: fetched only when a CJK language is selected.
+        /// On-demand script fonts: fetched only when a CJK language is selected.
         font: solidcraft_ui_egui::fonts::CjkFontLoader,
         font_result: FontLoadResult,
-        /// The fetched CJK font's bytes: kept so a language change can re-order the fallbacks.
+        /// The fetched Japanese font's bytes: kept so a language change can re-order the fallbacks.
         cjk_bytes: Option<Vec<u8>>,
+        /// The fetched Chinese font's bytes (Simplified or Traditional for this session).
+        chinese_bytes: Option<Vec<u8>>,
+        /// Which Chinese face `chinese_bytes` is: `"zh"` or `"zh-TW"`.
+        chinese_kind: Option<&'static str>,
+        /// Kind requested by the in-flight fetch (`"ja"`, `"zh"`, or `"zh-TW"`).
+        font_fetch_kind: Option<&'static str>,
         /// The language the fonts were last set up for (a CJK UI leads with the CJK face).
         font_language: String,
         space_mouse: SpaceMouse,
         wheel_gestures: solidcraft_ui_egui::WebWheelGestures,
+        /// The settings this tab wrote or loaded last, and those another tab wrote since (#8644).
+        prefs_writer: crate::PrefsWriter,
+        other_tab_prefs: PrefsInbox,
     }
 
     impl Shell {
+        /// The settings as they are kept between visits: with the user's own language, not a
+        /// session-only English fallback.
+        fn persisted_prefs(&mut self) -> String {
+            let saved = self.font.persisted_language(&self.app.preferences.language).to_owned();
+            let live = std::mem::replace(&mut self.app.preferences.language, saved);
+            let prefs = self.app.prefs();
+            self.app.preferences.language = live;
+            prefs
+        }
+
+        /// A settings change goes to the browser's storage in the frame it is made, and from
+        /// there to the other open tabs (#8644). Input is what changes settings, so a frame
+        /// without any is skipped; eframe's own save still catches anything else.
+        fn store_prefs(&mut self, ctx: &egui::Context) {
+            if !self.launch.persists() || ctx.input(|i| i.events.is_empty()) {
+                return;
+            }
+            let prefs = self.persisted_prefs();
+            let Some(prefs) = self.prefs_writer.take(prefs) else { return };
+            let stored =
+                web_sys::window().and_then(|w| w.local_storage().ok().flatten()).map(|s| s.set_item(solidcraft_ui_egui::prefs::STORAGE_KEY, &prefs));
+            if !matches!(stored, Some(Ok(()))) {
+                log::warn!("settings: the browser's storage did not take them; they are saved again later");
+                self.prefs_writer = crate::PrefsWriter::default();
+            }
+        }
+
+        /// Settings another tab wrote replace this tab's, so this tab's own saves keep them
+        /// instead of putting its older copy back (#8644).
+        fn load_other_tabs_prefs(&mut self) {
+            let Some(prefs) = self.other_tab_prefs.take() else { return };
+            self.app.load_prefs(&prefs);
+            let held = self.persisted_prefs();
+            self.prefs_writer.loaded(held);
+        }
+
         /// Files from the computer, writes to store, messages and the autosave.
         fn files_tick(&mut self, ctx: &egui::Context) {
             if !self.launch.persists() {
@@ -273,7 +375,8 @@ mod web {
             // Designs opened from the computer's disk (the files window): open them.
             let opened: Vec<_> = self.files.opened.borrow_mut().drain(..).collect();
             for path in opened {
-                self.app.open_path(&path);
+                // A few features a frame, with progress and Cancel (#10198).
+                self.app.open_path_async(&path);
                 self.files.panel.set(false);
             }
             // Recent designs whose file is gone are dropped from the list.
@@ -314,7 +417,7 @@ mod web {
                     path
                 };
                 match intent {
-                    Intent::Open => self.app.open_path(&path),
+                    Intent::Open => self.app.open_path_async(&path),
                     Intent::Insert | Intent::Theme => self.app.drop_path(&path),
                 }
                 self.files.panel.set(false);
@@ -478,7 +581,7 @@ mod web {
             let path = format!("{}{name}", files::OPFS);
             match what {
                 "open" => {
-                    self.app.open_path(&path);
+                    self.app.open_path_async(&path);
                     self.files.panel.set(false);
                 }
                 "insert" => {
@@ -580,65 +683,102 @@ mod web {
             files::autosave(&self.files, None);
         }
 
-        /// Fetch and install the CJK font when a CJK language is selected. If that fails, this
+        /// Whether the shell already has the on-demand face the live language needs.
+        fn script_font_ready(&self) -> bool {
+            match solidcraft_ui_egui::fonts::web_script_font_kind(solidcraft_ui_egui::i18n::effective_language(&self.app.preferences.language)) {
+                Some("zh") => self.chinese_bytes.is_some() && self.chinese_kind == Some("zh"),
+                Some("zh-TW") => self.chinese_bytes.is_some() && self.chinese_kind == Some("zh-TW"),
+                Some("ja") => self.cjk_bytes.is_some(),
+                _ => true,
+            }
+        }
+
+        /// Fetch and install a script font when a CJK language is selected. If that fails, this
         /// session falls back to English (no tofu); the saved language preference is kept.
         fn tick_font(&mut self, ctx: &egui::Context) {
             let done = self.font_result.borrow_mut().take();
             if let Some(res) = done {
+                let kind = self.font_fetch_kind.take();
                 let installed = match res {
-                    Ok(bytes) => {
-                        self.cjk_bytes = Some(bytes);
+                    Ok((path, bytes)) => {
+                        match kind {
+                            Some("zh") => {
+                                self.chinese_bytes = Some(bytes);
+                                self.chinese_kind = Some("zh");
+                            }
+                            Some("zh-TW") => {
+                                self.chinese_bytes = Some(bytes);
+                                self.chinese_kind = Some("zh-TW");
+                            }
+                            _ => {
+                                self.cjk_bytes = Some(bytes);
+                            }
+                        }
+                        log::info!("loaded web script font from {path}");
                         true
                     }
                     Err(err) => {
-                        log::warn!("failed to fetch CJK font from {JAPANESE_FONT_PATH}: {err}");
+                        let path = match kind {
+                            Some("zh") => CHINESE_SC_FONT_PATH,
+                            Some("zh-TW") => CHINESE_TC_FONT_PATH,
+                            _ => JAPANESE_FONT_PATH,
+                        };
+                        log::warn!("failed to fetch script font from {path}: {err}");
                         false
                     }
                 };
-                if installed {
-                    log::info!("loaded web CJK font from {JAPANESE_FONT_PATH}");
-                } else if solidcraft_ui_egui::fonts::needs_cjk_font(&self.app.preferences.language) {
-                    log::warn!("CJK font unavailable; showing English for this session");
+                let effective = solidcraft_ui_egui::i18n::effective_language(&self.app.preferences.language);
+                if !installed && solidcraft_ui_egui::fonts::needs_cjk_font(effective) {
+                    log::warn!("script font unavailable; showing English for this session");
                 }
                 self.font.finished(installed, &mut self.app.preferences.language);
                 self.apply_fonts(ctx);
                 ctx.request_repaint();
             }
-            if self.font.tick(&mut self.app.preferences.language) {
-                self.fetch_font(ctx);
+            let ready = self.script_font_ready();
+            let effective = solidcraft_ui_egui::i18n::effective_language(&self.app.preferences.language);
+            if self.font.tick(&mut self.app.preferences.language, ready) {
+                self.fetch_font(ctx, solidcraft_ui_egui::fonts::web_script_font_kind(effective).unwrap_or("ja"));
             }
             // The CJK face leads only a CJK UI: its Cyrillic glyphs are full-width, so switching
             // to Ukrainian (or English) must put the Latin face back in front.
-            if self.app.preferences.language != self.font_language {
+            if solidcraft_ui_egui::i18n::effective_language(&self.app.preferences.language) != self.font_language {
                 self.apply_fonts(ctx);
             }
         }
 
-        /// Set up the UI fonts for the live language, keeping the fetched CJK font as a fallback
-        /// (it leads only for a CJK UI, see [`solidcraft_ui_egui::fonts::install_cjk_font_for`]).
+        /// Set up the UI fonts for the live language, keeping fetched script fonts as fallbacks
+        /// (Chinese leads a Chinese UI; see [`solidcraft_ui_egui::fonts::install_web_script_fonts`]).
         fn apply_fonts(&mut self, ctx: &egui::Context) {
-            match self.cjk_bytes.clone() {
-                Some(bytes) => {
-                    solidcraft_ui_egui::fonts::install_cjk_font_for(ctx, bytes, &self.app.preferences.language);
-                }
-                None => solidcraft_ui_egui::fonts::setup_fonts(ctx),
+            let effective = solidcraft_ui_egui::i18n::effective_language(&self.app.preferences.language);
+            if self.cjk_bytes.is_none() && self.chinese_bytes.is_none() {
+                solidcraft_ui_egui::fonts::setup_fonts(ctx);
+            } else {
+                solidcraft_ui_egui::fonts::install_web_script_fonts(ctx, self.cjk_bytes.clone(), self.chinese_bytes.clone(), effective);
             }
-            self.font_language.clone_from(&self.app.preferences.language);
+            self.font_language = effective.to_owned();
         }
 
-        /// CJK text on screen with no CJK font yet (an English UI showing a Japanese name):
-        /// fetch the font, so the text does not stay tofu (#720).
+        /// CJK text on screen with no Japanese font yet (an English UI showing a Japanese name):
+        /// fetch the Japanese font, so the text does not stay tofu (#720).
         fn watch_text_for_font(&mut self, ctx: &egui::Context) {
             if self.font.watching_text() && solidcraft_ui_egui::fonts::painted_cjk(ctx) && self.font.text_needs_font() {
-                self.fetch_font(ctx);
+                self.fetch_font(ctx, "ja");
             }
         }
 
-        fn fetch_font(&self, ctx: &egui::Context) {
+        fn fetch_font(&mut self, ctx: &egui::Context, kind: &'static str) {
+            let path = match kind {
+                "zh" => CHINESE_SC_FONT_PATH,
+                "zh-TW" => CHINESE_TC_FONT_PATH,
+                _ => JAPANESE_FONT_PATH,
+            };
+            self.font_fetch_kind = Some(kind);
             let slot = self.font_result.clone();
             let ctx = ctx.clone();
+            let path = path.to_owned();
             wasm_bindgen_futures::spawn_local(async move {
-                let res = fetch_font_bytes(JAPANESE_FONT_PATH).await;
+                let res = fetch_font_bytes(&path).await.map(|bytes| (path, bytes));
                 *slot.borrow_mut() = Some(res);
                 ctx.request_repaint();
             });
@@ -647,6 +787,8 @@ mod web {
 
     impl eframe::App for Shell {
         fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+            // First: a language another tab chose fetches its font this frame.
+            self.load_other_tabs_prefs();
             self.tick_font(ctx);
             self.app.logic(ctx);
             self.api.poll();
@@ -689,6 +831,7 @@ mod web {
                 self.recovery_prompt(&ctx);
             }
             self.watch_text_for_font(&ctx);
+            self.store_prefs(&ctx);
         }
         fn persist_egui_memory(&self) -> bool {
             self.launch.persists()
@@ -697,11 +840,8 @@ mod web {
             if !self.launch.persists() {
                 return;
             }
-            // Persist the user's own language, not a session-only English fallback.
-            let saved = self.font.persisted_language(&self.app.preferences.language).to_owned();
-            let live = std::mem::replace(&mut self.app.preferences.language, saved);
-            storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, self.app.prefs());
-            self.app.preferences.language = live;
+            let prefs = self.persisted_prefs();
+            storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, prefs);
         }
     }
 
@@ -822,6 +962,12 @@ mod web {
                         let (sender, receiver) = std::sync::mpsc::channel();
                         let mut app = SolveApp::new(Session::default(), services).with_control(receiver);
                         app.embedded = launch.embed;
+                        // Listening before reading: settings another tab writes from now on are
+                        // newer than those read here.
+                        let other_tab_prefs = PrefsInbox::default();
+                        if launch.persists() {
+                            hear_settings_from_other_tabs(&window, &cc.egui_ctx, other_tab_prefs.clone());
+                        }
                         if launch.persists() && let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))) {
                             app.load_prefs(&p);
                         }
@@ -862,9 +1008,14 @@ mod web {
                             font: Default::default(),
                             font_result: Rc::new(std::cell::RefCell::new(None)),
                             cjk_bytes: None,
+                            chinese_bytes: None,
+                            chinese_kind: None,
+                            font_fetch_kind: None,
                             font_language,
                             space_mouse: SpaceMouse::default(),
                             wheel_gestures: solidcraft_ui_egui::WebWheelGestures::default(),
+                            prefs_writer: crate::PrefsWriter::default(),
+                            other_tab_prefs,
                         }))
                     }),
                 )
@@ -1001,4 +1152,28 @@ mod tests {
         assert!(!closes_design("w", false, false, false, true));
         assert!(!closes_design("s", true, false, false, true));
     }
+
+    /// A tab writes its settings when they change, and not again while they stay the same; the
+    /// settings it loaded from another tab aren't written back (#8644).
+    #[test]
+    fn changed_settings_are_written_once_and_loaded_ones_not_at_all() {
+        let mut writer = PrefsWriter::default();
+        assert_eq!(writer.take(r#"{"a":1}"#.into()).as_deref(), Some(r#"{"a":1}"#), "the first settings are written");
+        assert_eq!(writer.take(r#"{"a":1}"#.into()), None, "the same settings are not written again");
+        assert_eq!(writer.take(r#"{"a":2}"#.into()).as_deref(), Some(r#"{"a":2}"#), "a change is written at once");
+        writer.loaded(r#"{"a":3}"#.into());
+        assert_eq!(writer.take(r#"{"a":3}"#.into()), None, "settings from another tab are not written back");
+        assert_eq!(writer.take(r#"{"a":4}"#.into()).as_deref(), Some(r#"{"a":4}"#), "this tab's next change is written");
+    }
+
+    /// Only the settings another tab wrote are loaded: not other keys, and not settings taken
+    /// away by clearing the site's data (#8644).
+    #[test]
+    fn only_settings_another_tab_wrote_are_loaded() {
+        let key = solidcraft_ui_egui::prefs::STORAGE_KEY;
+        assert_eq!(settings_written(Some(key), Some("{}".into())).as_deref(), Some("{}"));
+        assert_eq!(settings_written(Some("solidcraft.webgl"), Some("1".into())), None);
+        assert_eq!(settings_written(Some(key), None), None, "removed settings leave this tab's");
+        assert_eq!(settings_written(None, None), None, "clearing all storage leaves this tab's settings");
+    }
 }

apps/solidcraft/Cargo.toml

@@ -28,6 +28,8 @@ neg_cmp_op_on_partial_ord = "allow"
 
 [dependencies]
 solidcraft-engine = { workspace = true }
+# The D3D12 shader compiler the window starts with (#6756).
+solidcraft-gpu = { workspace = true }
 solidcraft-ui-egui = { workspace = true }
 solidcraft-space-mouse = { workspace = true }
 eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11", "links"] }
@@ -102,5 +104,10 @@ winit = { version = "0.30", default-features = false, features = ["x11"] }
 raw-window-handle = "0.6"
 x11rb = { version = "0.13", default-features = false }
 
+[target.'cfg(target_os = "linux")'.dependencies]
+# The desktop's dark or light preference through the XDG Desktop Portal (src/desktop_theme.rs,
+# #7944); already in the tree through eframe's accessibility support (accesskit_unix).
+zbus = { version = "5", default-features = false, features = ["async-io", "blocking-api"] }
+
 [build-dependencies]
 embed-resource = "3.0.11"

apps/solidcraft/build.rs

@@ -4,6 +4,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let icon = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../assets/icons/app/windows/exports/solidcraft-executable.ico");
     println!("cargo:rerun-if-changed={}", icon.display());
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
     if std::env::var("CARGO_CFG_TARGET_OS")? != "windows" {
         return Ok(());
     }
@@ -11,7 +12,21 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let copy = out.join("solidcraft.ico");
     std::fs::copy(icon, &copy)?;
     let rc = out.join("solidcraft.rc");
-    std::fs::write(&rc, format!("1 ICON \"{}\"\n", copy.display().to_string().replace('\\', "/")))?;
+    let icon_line = format!("1 ICON \"{}\"\n", copy.display().to_string().replace('\\', "/"));
+    std::fs::write(&rc, format!("{icon_line}{}", version_resource(&std::env::var("CARGO_PKG_VERSION")?)))?;
     embed_resource::compile_for(&rc, ["solidcraft"], embed_resource::NONE).manifest_required()?;
     Ok(())
 }
+
+/// The Windows version resource (what Explorer's Details tab shows and what a launcher reads).
+/// `FileVersion` and `ProductVersion` are the package version verbatim (`0.25.1`, `0.26.0-rc.1`):
+/// ArtCraft's launcher parses the `ProductVersion` string as semver, so a fourth `.0` would not
+/// read. The binary `FILEVERSION` fields need four numbers and take the leading `major.minor.patch`.
+fn version_resource(version: &str) -> String {
+    let mut numbers = version.split(['-', '+']).next().unwrap_or("").split('.').map(|p| p.parse::<u16>().unwrap_or(0));
+    let mut next = || numbers.next().unwrap_or(0);
+    let (major, minor, patch) = (next(), next(), next());
+    format!(
+        "1 VERSIONINFO\nFILEVERSION {major},{minor},{patch},0\nPRODUCTVERSION {major},{minor},{patch},0\nFILEOS 0x40004\nFILETYPE 0x1\n{{\nBLOCK \"StringFileInfo\"\n{{\nBLOCK \"040904B0\"\n{{\nVALUE \"CompanyName\", \"SolidCraft contributors\"\nVALUE \"FileDescription\", \"SolidCraft, parametric 3D CAD\"\nVALUE \"FileVersion\", \"{version}\"\nVALUE \"InternalName\", \"solidcraft\"\nVALUE \"OriginalFilename\", \"solidcraft.exe\"\nVALUE \"ProductName\", \"SolidCraft\"\nVALUE \"ProductVersion\", \"{version}\"\n}}\n}}\nBLOCK \"VarFileInfo\"\n{{\nVALUE \"Translation\", 0x0409, 1200\n}}\n}}\n"
+    )
+}

apps/solidcraft/src/control_server.rs

@@ -22,11 +22,15 @@ const MAX_BAD_LINES: usize = 8;
 /// How long a subscribed connection waits after a `design.changed` line before the next: what
 /// changes meanwhile (a parameter dragged) goes out as one line, the latest (#6985).
 const EVENT_GAP: Duration = Duration::from_millis(100);
+/// How long a new connection has to show the token. A client connects when it has a request to
+/// send, so this is plenty; one that doesn't send it loses the connection, and its seat among
+/// [`MAX_CONNECTIONS`] goes to someone else.
+const TOKEN_WAIT: Duration = Duration::from_secs(5);
 
 static OPEN: AtomicUsize = AtomicUsize::new(0);
-/// The token files this launch wrote (its control port, the agent chat's endpoint), removed
-/// when the app ends.
-static TOKEN_FILES: std::sync::Mutex<Vec<std::path::PathBuf>> = std::sync::Mutex::new(Vec::new());
+/// The token files this launch wrote (its control port, the agent chat's endpoint) and the
+/// token in each, removed when the app ends unless another launch has written the file since.
+static TOKEN_FILES: std::sync::Mutex<Vec<(std::path::PathBuf, String)>> = std::sync::Mutex::new(Vec::new());
 
 /// A new random token: 32 bytes from the operating system, as hex.
 fn new_token() -> Option<String> {
@@ -35,20 +39,21 @@ fn new_token() -> Option<String> {
     Some(bytes.iter().map(|b| format!("{b:02x}")).collect())
 }
 
-/// Remove this launch's token file (at exit).
+/// Remove this launch's token files and discovery file (at exit), leaving any that another
+/// launch has written since (#8794).
 pub fn remove_token_file() {
     if let Ok(files) = TOKEN_FILES.lock() {
-        for p in files.iter() {
-            control_auth::remove_token_file(p);
+        for (path, token) in files.iter() {
+            control_auth::remove_token_file(path, token);
         }
     }
-    if let Some(port) = APP_PORT.lock().ok().and_then(|p| *p) {
-        control_auth::remove_current_port(port);
+    if let Some((port, token)) = APP_PORT.lock().ok().and_then(|p| p.clone()) {
+        control_auth::remove_current_port(port, &token);
     }
 }
 
-/// The port the app's own channel listens on, for removing the discovery file at exit.
-static APP_PORT: std::sync::Mutex<Option<u16>> = std::sync::Mutex::new(None);
+/// The port the app's own channel listens on and its token, for removing the discovery file at exit.
+static APP_PORT: std::sync::Mutex<Option<(u16, String)>> = std::sync::Mutex::new(None);
 
 pub fn start(listen_on: control_auth::Listen, ctx: egui::Context) -> Receiver<ControlRequest> {
     let (tx, rx) = channel::<ControlRequest>();
@@ -61,7 +66,7 @@ pub fn start(listen_on: control_auth::Listen, ctx: egui::Context) -> Receiver<Co
             };
             match listener {
                 Ok(l) => {
-                    if let Some(port) = listen_on_listener(l, token, tx, ctx, false) {
+                    if let Some(port) = listen_on_listener(l, token.clone(), tx, ctx, false) {
                         if matches!(listen_on, control_auth::Listen::Default) {
                             eprintln!("solidcraft: control channel on the default port 127.0.0.1:{port} (Preferences > Assistant turns it off)");
                         }
@@ -69,7 +74,7 @@ pub fn start(listen_on: control_auth::Listen, ctx: egui::Context) -> Receiver<Co
                         match control_auth::write_current_port(port) {
                             Ok(_) => {
                                 if let Ok(mut p) = APP_PORT.lock() {
-                                    *p = Some(port);
+                                    *p = Some((port, token));
                                 }
                             }
                             Err(e) => eprintln!("solidcraft: could not write the control discovery file ({e})"),
@@ -112,7 +117,7 @@ fn listen_on_listener(listener: TcpListener, token: String, tx: Sender<ControlRe
             Ok(()) => {
                 eprintln!("solidcraft: control server listening on 127.0.0.1:{port} (token in {})", path.display());
                 if let Ok(mut files) = TOKEN_FILES.lock() {
-                    files.push(path);
+                    files.push((path, token.clone()));
                 }
             }
             Err(e) => eprintln!(
@@ -224,23 +229,53 @@ fn unauthorized() -> Value {
 /// Refuse the connection: the reply, then the end of what we send, then what the client had
 /// already sent read and dropped (a little, briefly). Closing a socket with unread input resets
 /// the connection, and a reset can reach the client before it has read the refusal.
-fn refuse(out: &mut TcpStream, reader: &mut BufReader<TcpStream>) {
+fn refuse(out: &mut TcpStream, reader: &mut BufReader<ClientInput>) {
     use std::io::Read;
     let _ = send(out, &unauthorized());
     let _ = out.shutdown(std::net::Shutdown::Write);
-    let _ = reader.get_ref().set_read_timeout(Some(Duration::from_millis(500)));
+    reader.get_mut().deadline = Some(Instant::now() + Duration::from_millis(500));
     let _ = std::io::copy(&mut reader.by_ref().take(64 * 1024), &mut std::io::sink());
 }
 
+/// What a client sends. Until it shows the token, all of its reads share one deadline, so neither
+/// blank lines nor a line sent a byte at a time buy it more time. After that it may stay idle as
+/// long as it likes.
+struct ClientInput {
+    socket: TcpStream,
+    deadline: Option<Instant>,
+}
+
+impl ClientInput {
+    /// No deadline any more: the client showed the token.
+    fn admit(&mut self) -> std::io::Result<()> {
+        self.deadline = None;
+        self.socket.set_read_timeout(None)
+    }
+}
+
+impl std::io::Read for ClientInput {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        if let Some(deadline) = self.deadline {
+            let left = deadline.saturating_duration_since(Instant::now());
+            if left.is_zero() {
+                return Err(std::io::ErrorKind::TimedOut.into());
+            }
+            self.socket.set_read_timeout(Some(left))?;
+        }
+        self.socket.read(buf)
+    }
+}
+
 /// How long a request waits for the app's reply: most requests, and a batch (or every request,
-/// on a patient connection).
+/// on a patient connection); and how long a new connection has to show the token.
 #[derive(Clone, Copy)]
 struct Waits {
     short: Duration,
     long: Duration,
+    token: Duration,
 }
 
-const WAITS: Waits = Waits { short: Duration::from_secs(60), long: Duration::from_secs(3600) };
+const WAITS: Waits = Waits { short: Duration::from_secs(60), long: Duration::from_secs(3600), token: TOKEN_WAIT };
 
 /// A request that timed out but is still running in the app (#1618): its id and method, and where
 /// its reply will land.
@@ -412,11 +447,37 @@ impl Lines {
     }
 }
 
+/// A subscribed connection's seat on the watch: it leaves exactly once, whichever thread sees
+/// the connection's end first — the connection's own thread at the end of the stream, or the
+/// events thread at the first write a closed client refuses. The seat used to wait for the
+/// events thread alone, and that thread only leaves its wait when the design moves, so the
+/// count could outlive the connection by a second or more (#8315).
+struct Seat(Mutex<Option<Subscriber>>);
+
+impl Seat {
+    fn new(counted: Subscriber) -> Self {
+        Seat(Mutex::new(Some(counted)))
+    }
+
+    /// Leave the watch now: the seat goes once, whoever gets here first.
+    fn release(&self) {
+        let counted = self.0.lock().unwrap_or_else(PoisonError::into_inner).take();
+        drop(counted);
+    }
+}
+
+impl Drop for Seat {
+    fn drop(&mut self) {
+        self.release();
+    }
+}
+
 /// A connection's `control.subscribe` (#6985): its `design.changed` lines, sent from a thread of
 /// their own until the connection ends.
 struct Subscription {
     lines: Arc<Lines>,
     stop: Arc<AtomicBool>,
+    seat: Arc<Seat>,
 }
 
 impl Subscription {
@@ -432,15 +493,17 @@ impl Subscription {
     ) -> Option<(Self, std::io::Result<()>)> {
         let lines = Arc::new(Lines { socket: out.try_clone().ok()?, turn: Mutex::new(()) });
         let stop = Arc::new(AtomicBool::new(false));
+        let seat = Arc::new(Seat::new(counted));
         let first = lines.turn.lock().unwrap_or_else(PoisonError::into_inner);
-        let (l, s) = (lines.clone(), stop.clone());
+        let (l, s, watch_seat) = (lines.clone(), stop.clone(), Arc::clone(&seat));
         // The connection's seat on the watch rides the events thread: it leaves when the thread
         // does, so the next failed write to a closed client retires it even while the connection's
-        // own thread is slow to see the end of the stream (#7226).
-        std::thread::Builder::new().stack_size(64 * 1024).spawn(move || send_events(design, &l, &s, seen, counted)).ok()?;
+        // own thread is slow to see the end of the stream (#7226). The connection's own thread
+        // leaves it too, so a closed connection stops counting at once (#8315).
+        std::thread::Builder::new().stack_size(64 * 1024).spawn(move || send_events(design, &l, &s, seen, watch_seat)).ok()?;
         let sent = send(&mut &lines.socket, reply);
         drop(first);
-        Some((Subscription { lines, stop }, sent))
+        Some((Subscription { lines, stop, seat }, sent))
     }
 }
 
@@ -453,6 +516,9 @@ fn design_of(reply: &Value) -> Option<(String, u64)> {
 impl Drop for Subscription {
     fn drop(&mut self) {
         self.stop.store(true, Ordering::Relaxed);
+        // The seat on the watch goes now: the connection is over, and nothing counts it any more
+        // (#8315).
+        self.seat.release();
         // The socket closes now, not when the thread next looks; a line blocked on a client that
         // stopped reading ends too.
         let _ = self.lines.socket.shutdown(std::net::Shutdown::Both);
@@ -460,10 +526,10 @@ impl Drop for Subscription {
 }
 
 /// The `design.changed` lines of a subscribed connection, each time the design differs from the
-/// last one it was told of (`seen`), until `stop`. Owns the connection's seat on the watch
-/// (`counted`), so the seat leaves exactly when this thread does: on `stop`, or on the first
-/// write a closed client refuses (#7226).
-fn send_events(design: &DesignWatch, lines: &Lines, stop: &AtomicBool, mut seen: (String, u64), _counted: Subscriber) {
+/// last one it was told of (`seen`), until `stop`. Holds the connection's seat on the watch
+/// (`seat`), which it leaves when the thread ends: on `stop`, or on the first write a closed
+/// client refuses (#7226).
+fn send_events(design: &DesignWatch, lines: &Lines, stop: &AtomicBool, mut seen: (String, u64), seat: Arc<Seat>) {
     while !stop.load(Ordering::Relaxed) {
         let Some(now) = design.wait(&seen, stop, Duration::from_secs(1)).filter(|now| *now != seen) else { continue };
         if lines.send(&json!({"event": "design.changed", "params": {"document_id": now.0, "revision": now.1}})).is_err() {
@@ -472,6 +538,17 @@ fn send_events(design: &DesignWatch, lines: &Lines, stop: &AtomicBool, mut seen:
         seen = now;
         std::thread::sleep(EVENT_GAP);
     }
+    // The client is gone: it is not counted on the watch any more, whatever the connection's own
+    // thread still has to notice (#8315).
+    seat.release();
+}
+
+/// What this app's control channel does beyond the methods every version has, for a client to
+/// find out before it relies on it (an older app answers `control.capabilities` with "unknown
+/// method"). `param_check`: the levels `engine.execute`, `engine.batch` and `engine.script` take
+/// as a request's own parameter check (#9184).
+fn capabilities() -> Value {
+    json!({"param_check": solidcraft_engine::schema::ParamCheck::ALL.map(|l| l.name())})
 }
 
 /// Write `reply` on the connection: through its subscription once it has one.
@@ -500,7 +577,7 @@ fn serve_with(
     let connection = running.connections.fetch_add(1, Ordering::Relaxed) + 1;
     let Ok(read) = stream.try_clone() else { return };
     let mut out = stream;
-    let mut reader = BufReader::new(read);
+    let mut reader = BufReader::new(ClientInput { socket: read, deadline: Some(Instant::now() + waits.token) });
     let mut bad = 0usize;
     let mut authenticated = false;
     let mut pending: Option<Pending> = None;
@@ -511,6 +588,10 @@ fn serve_with(
         let line = match read_line(&mut reader, MAX_LINE) {
             Ok(Some(l)) => String::from_utf8_lossy(&l).into_owned(),
             Ok(None) => break,
+            // Closed without a word: a client that connected early and only now sends its first
+            // request would read a line here as the reply to it. It finds the connection closed
+            // and opens another.
+            Err(e) if !authenticated && matches!(e.kind(), std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock) => break,
             Err(e) => {
                 let _ = answer(&mut out, events.as_ref(), &json!({"ok": false, "error": e.to_string()}));
                 break;
@@ -522,7 +603,12 @@ fn serve_with(
         // The first request must carry the token; later ones on the same connection may.
         if !authenticated {
             match token_of(&line) {
-                Some(t) if control_auth::tokens_match(&t, token) => authenticated = true,
+                Some(t) if control_auth::tokens_match(&t, token) => {
+                    if reader.get_mut().admit().is_err() {
+                        break;
+                    }
+                    authenticated = true;
+                }
                 _ => {
                     refuse(&mut out, &mut reader);
                     break;
@@ -534,15 +620,20 @@ fn serve_with(
                 let id = msg.get("id").cloned().unwrap_or(Value::Null);
                 let method = msg.get("method").and_then(Value::as_str).unwrap_or("").to_string();
                 let params = msg.get("params").cloned().unwrap_or(json!({}));
-                // A request that timed out may have finished since (#1618). `control.running` only
-                // looks, so it leaves that reply where it is.
-                let late = pending.as_ref().filter(|_| method != "control.running").and_then(|p| match p.reply.try_recv() {
+                // A request that timed out may have finished since (#1618). `control.running` and
+                // `control.capabilities` only look, so they leave that reply where it is.
+                let late = pending.as_ref().filter(|_| !matches!(method.as_str(), "control.running" | "control.capabilities")).and_then(|p| match p
+                    .reply
+                    .try_recv()
+                {
                     Ok(reply) => Some(reply),
                     Err(TryRecvError::Disconnected) => Some(json!({"ok": false, "error": "the app ended the request without a reply"})),
                     Err(TryRecvError::Empty) => None,
                 });
                 let mut r = if method == "control.running" {
                     json!({"ok": true, "result": running.result(connection)})
+                } else if method == "control.capabilities" {
+                    json!({"ok": true, "result": capabilities()})
                 } else if method == "control.pending" {
                     match (pending.take(), late) {
                         (None, _) => json!({"ok": true, "result": {"pending": null}}),
@@ -627,6 +718,80 @@ fn serve_with(
 mod tests {
     use super::*;
 
+    /// A connection that doesn't show the token in time is closed without a word, however it fills
+    /// the time. One that does keeps working when it idles for longer than that.
+    #[test]
+    fn the_token_has_a_time_limit_and_an_authenticated_client_may_idle() {
+        use std::io::Read;
+        let token = "0123456789abcdef0123456789abcdef";
+        let limit = Duration::from_millis(500);
+        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+        let addr = listener.local_addr().unwrap();
+        let (tx, rx) = channel::<ControlRequest>();
+        std::thread::spawn(move || {
+            for req in rx {
+                let _ = req.reply.send(json!({"ok": true, "result": req.method}));
+            }
+        });
+        static RUNNING: Running = Running::new();
+        let waits = Waits { short: Duration::from_secs(10), long: Duration::from_secs(10), token: limit };
+        std::thread::spawn(move || {
+            for stream in listener.incoming().flatten() {
+                let tx = tx.clone();
+                std::thread::spawn(move || serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING, &DESIGN_WATCH));
+            }
+        });
+        let open = || {
+            let s = TcpStream::connect(addr).unwrap();
+            s.set_read_timeout(Some(Duration::from_secs(20))).unwrap();
+            s
+        };
+        // Sends `drip` every 50 ms until the server closes; what it read, and when it closed.
+        let closed_after = |drip: &[u8]| {
+            let mut s = open();
+            let start = Instant::now();
+            s.set_read_timeout(Some(Duration::from_millis(50))).unwrap();
+            let mut got = Vec::new();
+            loop {
+                let mut buf = [0u8; 256];
+                match s.read(&mut buf) {
+                    Ok(0) => break,
+                    Ok(n) => got.extend_from_slice(buf.get(..n).unwrap()),
+                    Err(e) if matches!(e.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) => {
+                        assert!(start.elapsed() < Duration::from_secs(20), "still open");
+                        let _ = s.write_all(drip);
+                    }
+                    Err(_) => break,
+                }
+            }
+            (got, start.elapsed())
+        };
+        for drip in [&b""[..], b"\n", b"\r\n \n", b" ", b"{"] {
+            let (got, took) = closed_after(drip);
+            assert!(got.is_empty(), "{drip:?} was answered: {}", String::from_utf8_lossy(&got));
+            assert!(took >= limit.saturating_sub(Duration::from_millis(50)), "{drip:?} closed after {took:?}");
+        }
+
+        let mut s = open();
+        let mut lines = BufReader::new(s.try_clone().unwrap());
+        let mut ask = |line: Value| -> Value {
+            writeln!(s, "{line}").unwrap();
+            let mut l = String::new();
+            lines.read_line(&mut l).unwrap();
+            serde_json::from_str(&l).unwrap()
+        };
+        assert_eq!(ask(json!({"id": 1, "method": "ui.view", "token": token}))["ok"], true);
+        std::thread::sleep(limit * 3);
+        assert_eq!(ask(json!({"id": 2, "method": "ui.view"}))["ok"], true, "idle for longer than the limit");
+
+        // A wrong token is still answered, at once.
+        let mut wrong = open();
+        writeln!(wrong, "{}", json!({"id": 1, "method": "ui.view", "token": "nope"})).unwrap();
+        let mut l = String::new();
+        BufReader::new(wrong).read_line(&mut l).unwrap();
+        assert!(l.contains("unauthorized"), "{l}");
+    }
+
     /// #1618: a request that outlasts its wait says it is still running; the connection keeps its
     /// reply for `control.pending`, and refuses other requests as `busy` until it lands, so none
     /// is queued to run unseen behind it.
@@ -650,7 +815,7 @@ mod tests {
                 let _ = req.reply.send(json!({"ok": true, "result": req.method}));
             }
         });
-        let waits = Waits { short: Duration::from_millis(100), long: Duration::from_millis(100) };
+        let waits = Waits { short: Duration::from_millis(100), long: Duration::from_millis(100), token: TOKEN_WAIT };
         static RUNNING: Running = Running::new();
         std::thread::spawn(move || {
             if let Some(stream) = listener.incoming().flatten().next() {
@@ -716,7 +881,7 @@ mod tests {
                 let _ = req.reply.send(json!({"ok": true, "result": req.method}));
             }
         });
-        let waits = Waits { short: Duration::from_millis(100), long: Duration::from_secs(60) };
+        let waits = Waits { short: Duration::from_millis(100), long: Duration::from_secs(60), token: TOKEN_WAIT };
         std::thread::spawn(move || {
             for stream in listener.incoming().flatten() {
                 let tx = tx.clone();
@@ -749,6 +914,9 @@ mod tests {
         let mut watcher = open();
         let (r, rows) = running(&mut watcher, &|_| true);
         assert!(r["ok"] == true && rows.is_empty(), "idle: {r}");
+        // What the app's control channel does beyond the methods every version has (#9184).
+        let r = watcher(json!({"id": 0, "method": "control.capabilities", "token": token}));
+        assert_eq!((&r["ok"], &r["result"]["param_check"]), (&json!(true), &json!(["off", "warn", "strict"])), "{r}");
 
         let mut export = open();
         let path = "/private/part.step";
@@ -780,6 +948,9 @@ mod tests {
         let own: Vec<&Value> = r["result"]["running"].as_array().unwrap().iter().filter(|row| row["self"] == true).collect();
         assert_eq!(own.len(), 1, "{r}");
         assert_eq!(own[0]["command"], "file.export", "{r}");
+        // So may it ask what the app can do: answered at once, not refused as busy.
+        let r = export(json!({"id": 8, "method": "control.capabilities"}));
+        assert_eq!(r["result"]["param_check"], json!(["off", "warn", "strict"]), "{r}");
 
         gate_tx.send(()).unwrap();
         assert_eq!(queued.join().unwrap()["result"], "engine.batch");
@@ -885,6 +1056,58 @@ mod tests {
         assert!(!WATCH.subscribed());
     }
 
+    /// #8315: a closed connection leaves the watch at once. The seat of a subscribed connection
+    /// goes when the connection's own thread sees the end of the stream, not only when the
+    /// events thread notices: that thread waits for the design to move, so a connection that
+    /// closed while the design stood still kept the watch counting it for a second or more.
+    #[test]
+    fn a_closed_connection_leaves_the_watch_at_once() {
+        static RUNNING: Running = Running::new();
+        static WATCH: DesignWatch = DesignWatch::new();
+        let token = "0123456789abcdef0123456789abcdef";
+        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+        let addr = listener.local_addr().unwrap();
+        let (tx, rx) = channel::<ControlRequest>();
+        // The window names the design once and then leaves it alone: nothing moves it, so the
+        // events thread has nothing to write and only the end of the connection can retire it.
+        std::thread::spawn(move || {
+            for req in rx {
+                if req.method == "control.subscribe" {
+                    WATCH.publish("d-1", 3);
+                    let _ = req.reply.send(json!({"ok": true, "result": {"document_id": "d-1", "revision": 3}}));
+                } else {
+                    let _ = req.reply.send(json!({"ok": true, "result": req.method}));
+                }
+            }
+        });
+        std::thread::spawn(move || {
+            for stream in listener.incoming().flatten() {
+                let tx = tx.clone();
+                std::thread::spawn(move || serve_with(stream, token, tx, egui::Context::default(), false, WAITS, &RUNNING, &WATCH));
+            }
+        });
+        let s = TcpStream::connect(addr).unwrap();
+        s.set_read_timeout(Some(Duration::from_secs(10))).unwrap();
+        let mut out = s.try_clone().unwrap();
+        let mut lines = BufReader::new(s);
+        writeln!(out, "{}", json!({"id": 1, "method": "control.subscribe", "token": token})).unwrap();
+        let mut l = String::new();
+        lines.read_line(&mut l).unwrap();
+        let reply: Value = serde_json::from_str(&l).unwrap();
+        assert!(reply["ok"] == true, "{reply}");
+        assert!(WATCH.subscribed(), "the connection is subscribed");
+        // Let the events thread settle into its wait: the design stands still, so it has nothing
+        // to write, and only the end of the connection can retire it.
+        std::thread::sleep(Duration::from_millis(200));
+        // The client goes away without asking anything else.
+        drop((out, lines));
+        let deadline = Instant::now() + Duration::from_millis(400);
+        while WATCH.subscribed() && Instant::now() < deadline {
+            std::thread::sleep(Duration::from_millis(10));
+        }
+        assert!(!WATCH.subscribed(), "a closed connection is not counted on the watch");
+    }
+
     /// A timed-out request that only reads is not said to "still apply", nor is one that only
     /// writes a file (an export, #1989); a change is, by name.
     #[test]

apps/solidcraft/src/desktop_theme.rs

@@ -0,0 +1,195 @@
+//! Linux: the desktop's dark or light preference, for Theme: System (#7944).
+//!
+//! The window toolkit does not pass it on everywhere: on GNOME (Wayland, or X11 through XWayland)
+//! the window never learns it, nor when it changes, so the app kept its colours. This reads the
+//! freedesktop setting through the XDG Desktop Portal's Settings interface on the session bus
+//! (`org.freedesktop.appearance color-scheme`, then GNOME's `color-scheme` and `gtk-theme`), the
+//! same setting other applications follow, and inside a Flatpak too. It runs on a thread of its
+//! own: the first reading, then the portal's `SettingChanged` signal; where the signal can't be
+//! had, a reading every few seconds. Without a portal it asks `gsettings` instead, on the same
+//! thread. The window reads the last answer with an atomic load
+//! (`solidcraft_ui_egui::Services::desktop_dark`), and the decision from the raw values is
+//! `solidcraft_ui_egui::prefs::desktop_prefers_dark`.
+
+use std::io::Read;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU8, Ordering};
+use std::time::Duration;
+
+use zbus::zvariant::{OwnedValue, Value};
+
+const UNKNOWN: u8 = 0;
+const DARK: u8 = 1;
+const LIGHT: u8 = 2;
+
+/// How often to read again where the portal's change signal is not available.
+const POLL: Duration = Duration::from_secs(5);
+/// How long one `gsettings` reading may take before it is given up.
+const GSETTINGS_TIMEOUT: Duration = Duration::from_secs(2);
+
+const PORTAL: &str = "org.freedesktop.portal.Desktop";
+const PORTAL_PATH: &str = "/org/freedesktop/portal/desktop";
+const SETTINGS: &str = "org.freedesktop.portal.Settings";
+const APPEARANCE: &str = "org.freedesktop.appearance";
+const GNOME: &str = "org.gnome.desktop.interface";
+
+/// Start following the desktop's preference; the closure answers the latest reading (`None`
+/// until there is one, or when the desktop says nothing).
+pub fn start(ctx: &egui::Context) -> Box<dyn Fn() -> Option<bool>> {
+    let state = Arc::new(AtomicU8::new(UNKNOWN));
+    let (thread_state, ctx) = (state.clone(), ctx.clone());
+    if let Err(e) = std::thread::Builder::new().name("desktop-theme".into()).spawn(move || follow(&thread_state, &ctx)) {
+        log::warn!("desktop theme: no thread to follow it: {e}");
+    }
+    Box::new(move || match state.load(Ordering::Relaxed) {
+        DARK => Some(true),
+        LIGHT => Some(false),
+        _ => None,
+    })
+}
+
+/// Keep `state` on the desktop's preference, asking for a frame whenever it changes.
+fn follow(state: &AtomicU8, ctx: &egui::Context) {
+    let publish = |dark: Option<bool>| {
+        let code = match dark {
+            Some(true) => DARK,
+            Some(false) => LIGHT,
+            None => UNKNOWN,
+        };
+        if state.swap(code, Ordering::Relaxed) != code {
+            ctx.request_repaint();
+        }
+    };
+    let portal = match portal() {
+        Ok(p) => Some(p),
+        Err(e) => {
+            log::info!("desktop theme: no settings portal ({e}); asking gsettings");
+            None
+        }
+    };
+    // The portal first; gsettings where there is none or it says nothing (its backend missing).
+    let read = |portal: Option<&zbus::blocking::Proxy<'static>>| portal.and_then(read_portal).or_else(read_gsettings);
+    let from_portal = portal.as_ref().and_then(read_portal);
+    let first = from_portal.or_else(read_gsettings);
+    publish(first);
+    // Wait for the portal's signal only when the portal answers: else the reading is gsettings',
+    // which only a new reading notices.
+    if let Some(p) = portal.as_ref().filter(|_| from_portal.is_some()) {
+        match p.receive_signal("SettingChanged") {
+            Ok(changes) => {
+                for message in changes {
+                    if relevant(&message) {
+                        publish(read(Some(p)));
+                    }
+                }
+                log::info!("desktop theme: the portal's change signal ended; reading every few seconds");
+            }
+            Err(e) => log::info!("desktop theme: no change signal ({e}); reading every few seconds"),
+        }
+    } else if portal.is_none() && first.is_none() && !gsettings_available() {
+        // Neither the portal nor gsettings: nothing to follow; the window toolkit's theme stays.
+        return;
+    }
+    loop {
+        std::thread::sleep(POLL);
+        publish(read(portal.as_ref()));
+    }
+}
+
+/// The portal's Settings interface on the session bus.
+fn portal() -> zbus::Result<zbus::blocking::Proxy<'static>> {
+    let connection = zbus::blocking::Connection::session()?;
+    zbus::blocking::Proxy::new(&connection, PORTAL, PORTAL_PATH, SETTINGS)
+}
+
+/// One reading through the portal.
+fn read_portal(portal: &zbus::blocking::Proxy<'static>) -> Option<bool> {
+    let appearance = read_setting(portal, APPEARANCE, "color-scheme").and_then(|v| as_u32(&v));
+    // The GNOME settings only matter when the freedesktop one has no preference.
+    if matches!(appearance, Some(1 | 2)) {
+        return solidcraft_ui_egui::prefs::desktop_prefers_dark(appearance, None, None);
+    }
+    let gnome = read_setting(portal, GNOME, "color-scheme").and_then(|v| as_string(&v));
+    let gtk_theme = read_setting(portal, GNOME, "gtk-theme").and_then(|v| as_string(&v));
+    solidcraft_ui_egui::prefs::desktop_prefers_dark(appearance, gnome.as_deref(), gtk_theme.as_deref())
+}
+
+/// A setting through `ReadOne` (portal version 2), else the older `Read`.
+fn read_setting(portal: &zbus::blocking::Proxy<'static>, namespace: &str, key: &str) -> Option<OwnedValue> {
+    let one: zbus::Result<OwnedValue> = portal.call("ReadOne", &(namespace, key));
+    one.or_else(|_| -> zbus::Result<OwnedValue> { portal.call("Read", &(namespace, key)) }).ok()
+}
+
+/// Whether a `SettingChanged` signal is about a setting the preference is read from.
+fn relevant(message: &zbus::Message) -> bool {
+    let body = message.body();
+    let Ok((namespace, key, _)) = body.deserialize::<(String, String, OwnedValue)>() else { return false };
+    matches!((namespace.as_str(), key.as_str()), (APPEARANCE, "color-scheme") | (GNOME, "color-scheme" | "gtk-theme"))
+}
+
+/// The value inside the variants `Read` wraps it in (a portal answers one or two deep).
+fn unwrap_variants<'v, 'a>(value: &'v Value<'a>) -> &'v Value<'a> {
+    let mut value = value;
+    for _ in 0..4 {
+        match value {
+            Value::Value(inner) => value = &**inner,
+            _ => break,
+        }
+    }
+    value
+}
+
+fn as_u32(value: &Value<'_>) -> Option<u32> {
+    match unwrap_variants(value) {
+        Value::U32(n) => Some(*n),
+        Value::I32(n) => u32::try_from(*n).ok(),
+        Value::U8(n) => Some(u32::from(*n)),
+        _ => None,
+    }
+}
+
+fn as_string(value: &Value<'_>) -> Option<String> {
+    match unwrap_variants(value) {
+        Value::Str(s) => Some(s.as_str().to_string()),
+        _ => None,
+    }
+}
+
+/// Without a portal: GNOME's settings through `gsettings` (`None` when it is not there).
+fn read_gsettings() -> Option<bool> {
+    let gnome = gsettings("color-scheme");
+    let gtk_theme = gsettings("gtk-theme");
+    solidcraft_ui_egui::prefs::desktop_prefers_dark(None, gnome.as_deref(), gtk_theme.as_deref())
+}
+
+fn gsettings_available() -> bool {
+    gsettings("gtk-theme").is_some()
+}
+
+/// `gsettings get org.gnome.desktop.interface <key>`, its quoted answer, or `None` when the
+/// program is missing, fails or does not answer in time.
+fn gsettings(key: &str) -> Option<String> {
+    let mut child = std::process::Command::new("gsettings")
+        .args(["get", GNOME, key])
+        .stdin(std::process::Stdio::null())
+        .stdout(std::process::Stdio::piped())
+        .stderr(std::process::Stdio::null())
+        .spawn()
+        .ok()?;
+    let started = std::time::Instant::now();
+    loop {
+        match child.try_wait() {
+            Ok(Some(status)) if status.success() => break,
+            Ok(None) if started.elapsed() < GSETTINGS_TIMEOUT => std::thread::sleep(Duration::from_millis(20)),
+            _ => {
+                let _ = child.kill();
+                let _ = child.wait();
+                return None;
+            }
+        }
+    }
+    let mut out = String::new();
+    child.stdout.take()?.take(4096).read_to_string(&mut out).ok()?;
+    let value = out.trim().trim_matches('\'').to_string();
+    (!value.is_empty()).then_some(value)
+}

apps/solidcraft/src/device_lost.rs

@@ -5,12 +5,25 @@
 //! for recovery as a forced quit does, and starts again ([`restart`]), and the new start says what
 //! happened ([`note`]). A device lost again soon after such a restart starts the next one on the
 //! software renderer, which doesn't depend on the graphics driver.
+//!
+//! The old process ends without tearing down its GPU objects ([`end`]): on a lost NVIDIA device
+//! destroying the window's swap chain busy-waits in the driver and never returns (#9044).
 
 use crate::startup;
 
 /// Set on the start after a lost device: when the device was lost (seconds since 1970).
 pub const LOST_ENV: &str = "SOLIDCRAFT_DEVICE_LOST";
 
+/// Set on the start after a lost device: why it was lost, as wgpu said it. The old process's
+/// session journal, which recorded it, is gone by then.
+pub const REASON_ENV: &str = "SOLIDCRAFT_DEVICE_LOST_REASON";
+
+/// The longest reason passed on ([`REASON_ENV`]) and shown, in characters.
+const REASON_CHARS: usize = 300;
+
+/// How long the process may take to end ([`end`]) before it is aborted.
+const END_GRACE: std::time::Duration = std::time::Duration::from_secs(3);
+
 /// A loss this recent (seconds) counts for the start after it: its note, and a second loss
 /// within it starts on the software renderer. Inherited by later starts, an older stamp is
 /// ignored.
@@ -32,27 +45,54 @@ pub fn restart_on_software(after_recent_loss: bool, cpu_renderer: bool) -> bool
     after_recent_loss || cpu_renderer
 }
 
+/// `reason` on one line, at most [`REASON_CHARS`] long; None when there is nothing to say.
+pub fn reason(reason: Option<&str>) -> Option<String> {
+    let line = reason?.split_whitespace().collect::<Vec<_>>().join(" ");
+    (!line.is_empty()).then(|| line.chars().take(REASON_CHARS).collect())
+}
+
 /// What the start after a lost device tells the user, `software` when it runs on the software
-/// renderer.
-pub fn note(software: bool) -> String {
+/// renderer, with what the driver reported ([`REASON_ENV`]).
+pub fn note(software: bool, reason: Option<&str>) -> String {
     let mut note = String::from(
         "The graphics device was reset (the graphics driver stopped responding), so SolidCraft closed and started again. Unsaved changes were kept for recovery.",
     );
     if software {
         note.push_str(" This start uses software rendering, which doesn't depend on the graphics driver.");
     }
+    if let Some(reason) = self::reason(reason) {
+        note.push_str(&format!(" The graphics driver reported: {reason}"));
+    }
     note
 }
 
-/// Start SolidCraft again with the same arguments, the loss stamped at `lost_at`, on the software
-/// renderer when `software`.
-pub fn restart(software: bool, lost_at: u64) {
-    let Ok(exe) = std::env::current_exe() else { return };
+/// The command that starts `exe` again with `args`, the loss stamped at `lost_at` and its
+/// `reason`, on the software renderer when `software`.
+fn command(
+    exe: std::path::PathBuf,
+    args: impl IntoIterator<Item = std::ffi::OsString>,
+    software: bool,
+    lost_at: u64,
+    reason: &str,
+) -> std::process::Command {
     let mut command = std::process::Command::new(exe);
-    command.args(std::env::args_os().skip(1)).env(LOST_ENV, lost_at.to_string());
+    command.args(args).env(LOST_ENV, lost_at.to_string());
+    match self::reason(Some(reason)) {
+        Some(reason) => command.env(REASON_ENV, reason),
+        // Not one inherited from an earlier loss.
+        None => command.env_remove(REASON_ENV),
+    };
     if software {
         command.env(startup::RENDERER_ENV, "cpu");
     }
+    command
+}
+
+/// Start SolidCraft again with the same arguments, the loss stamped at `lost_at` and its `reason`,
+/// on the software renderer when `software`.
+pub fn restart(software: bool, lost_at: u64, reason: &str) {
+    let Ok(exe) = std::env::current_exe() else { return };
+    let mut command = command(exe, std::env::args_os().skip(1), software, lost_at, reason);
     #[cfg(windows)]
     {
         use std::os::windows::process::CommandExt;
@@ -64,6 +104,23 @@ pub fn restart(software: bool, lost_at: u64) {
     }
 }
 
+/// End the process now, without tearing down what is left on the lost device: the window's swap
+/// chain, the viewport's buffers and pipelines. On NVIDIA's Vulkan driver destroying the swap
+/// chain of a lost device busy-waits forever, which left the old window frozen at 100% of a core
+/// beside the new one (#9044). Should the exit itself get stuck in a library's exit handler, the
+/// process is aborted after [`END_GRACE`].
+pub fn end() -> ! {
+    let watchdog = std::thread::Builder::new().name("solidcraft-exit".into()).spawn(|| {
+        std::thread::sleep(END_GRACE);
+        eprintln!("SolidCraft graphics: still closing after the device was lost; aborting");
+        std::process::abort();
+    });
+    if let Err(e) = watchdog {
+        log::warn!("graphics: no exit watchdog: {e}");
+    }
+    std::process::exit(0)
+}
+
 #[cfg(test)]
 mod tests {
     /// Only a recent, well-formed stamp counts: a later start that inherited it says nothing.
@@ -84,8 +141,34 @@ mod tests {
         assert!(!super::restart_on_software(false, false));
         assert!(super::restart_on_software(true, false));
         assert!(super::restart_on_software(false, true));
-        assert!(super::note(true).contains("software rendering"));
-        assert!(!super::note(false).contains("software rendering"));
-        assert!(super::note(false).contains("kept for recovery"));
+        assert!(super::note(true, None).contains("software rendering"));
+        assert!(!super::note(false, None).contains("software rendering"));
+        assert!(super::note(false, None).contains("kept for recovery"));
+    }
+
+    /// The start after a loss is told why (#9044): the old process's journal held the reason, and
+    /// it is deleted as that process closes.
+    #[test]
+    fn the_next_start_is_told_why_the_device_was_lost() {
+        let exe = std::path::PathBuf::from("solidcraft");
+        let args = ["--control".into(), "7979".into()];
+        let command = super::command(exe.clone(), args, true, 1_000, "Lost: Device lost\n  (vkQueueSubmit)");
+        let env = |command: &std::process::Command, name: &str| {
+            command.get_envs().find(|(k, _)| *k == name).map(|(_, v)| v.map(|v| v.to_string_lossy().into_owned()))
+        };
+        assert_eq!(env(&command, super::LOST_ENV), Some(Some("1000".into())));
+        assert_eq!(env(&command, super::REASON_ENV), Some(Some("Lost: Device lost (vkQueueSubmit)".into())), "on one line");
+        assert_eq!(env(&command, crate::startup::RENDERER_ENV), Some(Some("cpu".into())));
+        assert_eq!(command.get_args().collect::<Vec<_>>(), ["--control", "7979"]);
+        // No reason: none inherited from an earlier loss either.
+        let command = super::command(exe, Vec::new(), false, 1_000, "  ");
+        assert_eq!(env(&command, super::REASON_ENV), Some(None));
+        assert_eq!(env(&command, crate::startup::RENDERER_ENV), None);
+
+        let note = super::note(false, Some("Lost: Device lost"));
+        assert!(note.ends_with("The graphics driver reported: Lost: Device lost"), "{note}");
+        assert!(!super::note(false, Some(" \n ")).contains("reported"));
+        let long = "x".repeat(1_000);
+        assert_eq!(super::reason(Some(&long)).map(|r| r.chars().count()), Some(300));
     }
 }

apps/solidcraft/src/main.rs

@@ -22,6 +22,8 @@
 mod app_icon;
 mod come_forward;
 mod control_server;
+#[cfg(target_os = "linux")]
+mod desktop_theme;
 mod device_lost;
 #[cfg(target_os = "windows")]
 mod native_crash;
@@ -97,6 +99,86 @@ struct App {
     nav_bridge: nav_bridge::NavBridge,
     /// Where the next file dialog opens: it follows the open design (#7756).
     dialog_folder: DialogFolder,
+    /// Settings go to `app.ron` in the frame they change (#8275).
+    prefs_writer: PrefsWriter,
+}
+
+/// Settings written to the settings file soon after they change (#8275). eframe saves them
+/// only every 30 s and when the window closes normally, so a change was lost whenever the app
+/// did not get that far: ended from the Task Manager, stopped by a sign-out or shutdown, or
+/// crashed or hung in the graphics driver on the way out.
+///
+/// Some settings change continuously (a panel's width while its edge is dragged), so the file
+/// is written at most once per [`PrefsWriter::INTERVAL`], and a change made in between is written
+/// when that interval ends.
+#[derive(Default)]
+struct PrefsWriter {
+    /// The settings written (or read at start) last.
+    written: Option<String>,
+    /// The previous frame had input that can change settings: what it changed shows in this
+    /// frame's settings.
+    input_before: bool,
+    /// When the settings were last written by this writer.
+    last_write: Option<std::time::Instant>,
+    /// A change waits until then to be written.
+    pending_until: Option<std::time::Instant>,
+}
+
+impl PrefsWriter {
+    /// The least time between two writes of the settings file.
+    const INTERVAL: std::time::Duration = std::time::Duration::from_secs(1);
+
+    /// The settings as they were read at start: they are on disk already.
+    fn read(prefs: String) -> Self {
+        Self { written: Some(prefs), ..Self::default() }
+    }
+
+    /// Whether this frame's settings are worth comparing: input that can change them came in this
+    /// frame or the one before, or a waiting change's time has come. Pointer motion alone isn't
+    /// such input; eframe's own save still catches anything else.
+    fn due(&mut self, input: bool, now: std::time::Instant) -> bool {
+        let due = input || self.input_before || self.pending_until.is_some_and(|at| now >= at);
+        self.input_before = input;
+        due
+    }
+
+    /// Write `prefs` and flush them to disk if they differ from the settings written last and the
+    /// last write is at least [`Self::INTERVAL`] old. Returns how long a change waits otherwise:
+    /// the caller asks for a frame then, so an idle app still writes it.
+    fn store(&mut self, storage: &mut dyn eframe::Storage, prefs: String, now: std::time::Instant) -> Option<std::time::Duration> {
+        if self.written.as_deref() == Some(prefs.as_str()) {
+            self.pending_until = None;
+            return None;
+        }
+        if let Some(wait) = self.last_write.map(|at| Self::INTERVAL.saturating_sub(now.saturating_duration_since(at))).filter(|w| !w.is_zero()) {
+            self.pending_until = Some(now + wait);
+            return Some(wait);
+        }
+        storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, prefs.clone());
+        storage.flush();
+        self.written = Some(prefs);
+        self.last_write = Some(now);
+        self.pending_until = None;
+        None
+    }
+}
+
+/// Input that can change a setting: a click, a key, typed or pasted text, a wheel or a pinch.
+/// Pointer motion, which comes every frame while the mouse moves, cannot by itself.
+fn changes_settings(event: &egui::Event) -> bool {
+    matches!(
+        event,
+        egui::Event::PointerButton { .. }
+            | egui::Event::Key { .. }
+            | egui::Event::Text(_)
+            | egui::Event::Paste(_)
+            | egui::Event::Cut
+            | egui::Event::Ime(_)
+            | egui::Event::MouseWheel { .. }
+            | egui::Event::Zoom(_)
+            | egui::Event::Rotate(_)
+            | egui::Event::AccessKitActionRequest(_)
+    )
 }
 
 impl eframe::App for App {
@@ -184,11 +266,21 @@ impl eframe::App for App {
         solidcraft_ui_egui::space_mouse::buttons_hook(&mut self.solve, ctx, self.space_mouse.buttons(), raw);
         self.solve.raw_input_hook(raw);
     }
-    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         content_ui(&mut self.solve, ui);
+        // After the frame's UI, so a setting changed in it (Preferences' OK) is written now.
+        let now = std::time::Instant::now();
+        if self.prefs_writer.due(ui.input(|i| i.events.iter().any(changes_settings)), now)
+            && let Some(storage) = frame.storage_mut()
+            && let Some(wait) = self.prefs_writer.store(storage, self.solve.prefs(), now)
+        {
+            ui.ctx().request_repaint_after(wait);
+        }
     }
     fn save(&mut self, storage: &mut dyn eframe::Storage) {
-        storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, self.solve.prefs());
+        let prefs = self.solve.prefs();
+        storage.set_string(solidcraft_ui_egui::prefs::STORAGE_KEY, prefs.clone());
+        self.prefs_writer.written = Some(prefs);
     }
     fn on_exit(&mut self) {
         // The agent chat's agent and everything it started end with the app.
@@ -202,13 +294,29 @@ impl eframe::App for App {
         }
         solidcraft_ui_egui::recovery_ui::close(&mut self.solve);
         solidcraft_ui_egui::open_elsewhere::close(&mut self.solve);
-        // Before a restart below starts the next instance, which would otherwise get nothing from
-        // the 3D mouse driver (`solidcraft_3dx_client::stop`).
+        // Before a restart (`Drop for App`) starts the next instance, which would otherwise get
+        // nothing from the 3D mouse driver (`solidcraft_3dx_client::stop`).
         #[cfg(target_os = "macos")]
         solidcraft_3dx_client::stop();
         solidcraft_engine::crash::end_session();
-        if let Some(lost_at) = self.gpu.as_ref().and_then(|g| g.lost_at) {
-            device_lost::restart(self.gpu.as_ref().is_some_and(|g| g.restart_on_software), lost_at);
+        // The next start (after a lost device, or into an update) begins once the app is dropped
+        // (`Drop for App`), when the settings are on disk.
+    }
+}
+
+impl Drop for App {
+    /// eframe drops its settings storage first, which waits for `app.ron` to be written, then the
+    /// app, then the window and its GPU surface. So the next start begins here: started from
+    /// `on_exit`, it read `app.ron` while the old process was still writing it, found it
+    /// unreadable and moved it aside, resetting every setting (#9044).
+    fn drop(&mut self) {
+        if let Some(gpu) = &self.gpu
+            && let Some(lost_at) = gpu.lost_at
+        {
+            device_lost::restart(gpu.restart_on_software, lost_at, &gpu.reason);
+            // The window's GPU surface is still to be dropped, and on a lost device that may
+            // never return (#9044).
+            device_lost::end();
         }
         // An update asked to restart into the new version or to run its installer.
         if let Some((program, args)) = solidcraft_ui_egui::update::take_launch(&mut self.solve) {
@@ -236,6 +344,8 @@ struct LostWatch {
     restart_on_software: bool,
     /// When the loss was seen: the app is closing to start again.
     lost_at: Option<u64>,
+    /// Why, as wgpu said it: passed to the next start ([`device_lost::REASON_ENV`]).
+    reason: String,
 }
 
 impl App {
@@ -249,6 +359,7 @@ impl App {
         eprintln!("SolidCraft graphics: the device was lost ({reason}); starting again");
         solidcraft_engine::crash::phase(&format!("graphics device lost: {reason}"));
         gpu.lost_at = Some(device_lost::now_secs());
+        gpu.reason = reason;
         self.solve.quit_requested = true;
     }
 }
@@ -422,6 +533,12 @@ fn services(cc: &eframe::CreationContext<'_>, folder: &DialogFolder) -> Services
         graphics_adapters: Vec::new(),
         graphics_path: graphics_path().map(|p| p.to_string_lossy().to_string()),
         window_system: window_system_now(),
+        // Linux: the desktop's dark or light setting, which the window is not told on every
+        // desktop (#7944). Windows and macOS: the window's own theme.
+        #[cfg(target_os = "linux")]
+        desktop_dark: Some(desktop_theme::start(&cc.egui_ctx)),
+        #[cfg(not(target_os = "linux"))]
+        desktop_dark: None,
         http_get: Some(std::sync::Arc::new(http_get)),
         http_download: Some(std::sync::Arc::new(http_download)),
         // Already an installed app: only the browser build offers to install.
@@ -701,6 +818,24 @@ fn msaa() -> Option<u16> {
 /// (`solidcraft_ui_egui::titlebar`). macOS keeps its traffic lights over the integrated bar.
 const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos");
 
+/// Linux: the window manager's own decorations (server-side, or the compositor's frame) can be
+/// asked for instead of the application bar ([`titlebar_choice`]). Elsewhere always `true`.
+fn app_titlebar_wanted() -> bool {
+    if !cfg!(all(unix, not(target_os = "macos"))) {
+        return true;
+    }
+    let setting = graphics().and_then(|v| v.get("titlebar").and_then(serde_json::Value::as_str).map(str::to_string));
+    titlebar_choice(solidcraft_engine::geom::env::var("TITLEBAR").as_deref(), setting.as_deref())
+}
+
+/// Linux: whether the application bar is the title bar. `SOLIDCRAFT_TITLEBAR` (else
+/// `graphics.json`'s `titlebar`) set to `system` gives the window the desktop's own title bar and
+/// buttons; `app` (or anything else, or nothing) keeps the application bar as the title bar.
+fn titlebar_choice(env: Option<&str>, setting: Option<&str>) -> bool {
+    let choice = env.map(str::trim).filter(|v| !v.is_empty()).or(setting.map(str::trim));
+    !choice.is_some_and(|v| v.eq_ignore_ascii_case("system"))
+}
+
 const DEPTH_BITS: u8 = 24;
 /// A 32-bit float depth buffer, drawn with reversed depth (1 near, 0 far) so its precision follows
 /// the distance from the eye (#1434). Only where every adapter offers it with a stencil
@@ -750,6 +885,16 @@ fn main() -> eframe::Result {
     #[cfg(target_os = "macos")]
     objc2_foundation::NSProcessInfo::processInfo().setProcessName(objc2_foundation::ns_string!("SolidCraft"));
     mark("main");
+    // On OCLP-patched Macs, wgpu picks a Metal Shading Language standard that the system's
+    // compiler refuses (`invalid value 'metal3.2'`), because the patched OS reports a newer
+    // macOS version than the GPU's Metal compiler supports. Re-launching with
+    // SYSTEM_VERSION_COMPAT=1 makes the OS report the real (older) version so wgpu selects
+    // a standard the compiler accepts. The variable must be set before the process starts, so
+    // we detect OCLP here and re-exec immediately, before any macOS framework call (#3080, #4605).
+    #[cfg(target_os = "macos")]
+    if let Err(e) = startup::relaunch_with_version_compat() {
+        log::warn!("startup: OCLP check failed (continuing normally): {e}");
+    }
     // Validate before legacy adoption, crash markers or any user preference read.
     let settings = settings_dir().map_err(|error| eframe::Error::AppCreation(error.into()))?;
     if std::env::var_os("SOLIDCRAFT_SETTINGS_DIR").is_none() {
@@ -821,7 +966,11 @@ fn main() -> eframe::Result {
     // The launch before this one closed because its graphics device was lost (`App::watch_device`).
     let after_loss = device_lost::recent(std::env::var(device_lost::LOST_ENV).ok().as_deref(), device_lost::now_secs());
     if after_loss {
-        notes.push(device_lost::note(cpu_renderer));
+        let reason = std::env::var(device_lost::REASON_ENV).ok();
+        if let Some(reason) = device_lost::reason(reason.as_deref()) {
+            log::warn!("graphics: the last launch lost its device ({reason})");
+        }
+        notes.push(device_lost::note(cpu_renderer, reason.as_deref()));
     }
     if safe_mode {
         notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
@@ -857,7 +1006,7 @@ fn main() -> eframe::Result {
         eframe::egui_wgpu::WgpuSetup::CreateNew(setup) => setup.instance_descriptor.backends,
         _ => eframe::wgpu::Backends::all(),
     };
-    let custom_titlebar = CUSTOM_TITLEBAR && !startup::system_title_bar(cfg!(target_os = "windows"), started);
+    let custom_titlebar = CUSTOM_TITLEBAR && app_titlebar_wanted() && !startup::system_title_bar(cfg!(target_os = "windows"), started);
     eframe::egui_wgpu::set_startup_hook(startup_step);
     solidcraft_engine::crash::phase("window");
     let options = eframe::NativeOptions {
@@ -961,6 +1110,7 @@ fn main() -> eframe::Result {
                 lost: rs.device_lost.clone(),
                 restart_on_software: device_lost::restart_on_software(after_loss, cpu_renderer),
                 lost_at: None,
+                reason: String::new(),
             });
             if !safe_mode {
                 app.preferences.graphics_adapter =
@@ -976,6 +1126,12 @@ fn main() -> eframe::Result {
                     })
                     .collect();
                 let info = rs.adapter.get_info();
+                if !app.preferences.graphics_adapter.is_empty() && !info.name.eq_ignore_ascii_case(app.preferences.graphics_adapter.as_str()) {
+                    eprintln!(
+                        "SolidCraft graphics: preferred adapter {:?} was not used; using {:?} instead",
+                        app.preferences.graphics_adapter, info.name
+                    );
+                }
                 let samples = scene_msaa_request(saved_samples);
                 let supported = scene_sample_choices(depth_bits, STENCIL_BITS, |depth| {
                     eframe::egui_wgpu::supported_msaa_samples(&rs.adapter, &rs.device, rs.target_format, depth)
@@ -1016,6 +1172,10 @@ fn main() -> eframe::Result {
                 app.session.doc_mut().name = "Sample Plate".into();
                 app.session.mark_saved();
                 app.session.undo.clear();
+                // Built straight into the session, so nothing asked for a fit: frame it at the
+                // home view as any opened design is (#9195). The fit waits for the first layout.
+                app.cam.set_view(solidcraft_engine::render::StandardView::Iso);
+                app.fit_view();
             }
             // Lock files next to open designs: a design open on another computer says so (#5467),
             // the files given at launch included.
@@ -1076,6 +1236,8 @@ fn main() -> eframe::Result {
             mark("app created");
             solidcraft_engine::crash::phase("first frame");
             Ok(Box::new(App {
+                // Before `app` moves: the settings as read, already on disk.
+                prefs_writer: PrefsWriter::read(app.prefs()),
                 solve: app,
                 starting,
                 frames: 0,
@@ -1099,12 +1261,13 @@ fn main() -> eframe::Result {
 }
 
 /// egui-wgpu is about to start a step of getting the graphics device and the window's surface up:
-/// the crash journal keeps it, and the adapter once it is picked.
+/// the crash journal keeps it until the app runs (a window opened later goes through the same
+/// steps), and the adapter once it is picked.
 fn startup_step(step: &'static str, detail: &str) {
     if step == eframe::egui_wgpu::STEP_ADAPTER_CHOSEN {
         solidcraft_engine::crash::set_environment(&format!("Renderer: {detail}"));
     }
-    solidcraft_engine::crash::phase(step);
+    solidcraft_engine::crash::startup_step(step);
 }
 
 /// The renderer settings: with `cpu`, the software adapter (WARP, lavapipe, llvmpipe). The
@@ -1124,6 +1287,8 @@ fn wgpu_options(cpu: bool, preference: Option<&str>) -> eframe::egui_wgpu::WgpuC
         let intel_mac = cfg!(all(target_os = "macos", target_arch = "x86_64"));
         let indirect = std::env::var(startup::INDIRECT_VALIDATION_ENV).ok();
         setup.instance_descriptor.flags = startup::window_instance_flags(setup.instance_descriptor.flags, intel_mac, indirect.as_deref());
+        // Never a `dxcompiler.dll` another program put on PATH (#6756).
+        setup.instance_descriptor.backend_options.dx12.shader_compiler = solidcraft_gpu::dx12_compiler();
         let environment = std::env::var("WGPU_ADAPTER_NAME").ok();
         let adapter = graphics().and_then(|v| v.get("adapter").and_then(serde_json::Value::as_str).map(str::to_string));
         startup::configure_adapter(setup, cpu, environment, adapter);
@@ -1264,6 +1429,148 @@ mod backend_tests {
         assert!(!prefer_x11(true, true, Some("GNOME"), over(Some("wayland"))));
         assert!(prefer_x11(true, true, Some("niri"), over(Some("x11"))));
     }
+
+    #[test]
+    fn the_desktops_title_bar_only_when_asked_for() {
+        use super::titlebar_choice;
+        // Nothing set: the application bar is the title bar, as before.
+        assert!(titlebar_choice(None, None));
+        // graphics.json's `titlebar`.
+        assert!(!titlebar_choice(None, Some("system")));
+        assert!(titlebar_choice(None, Some("app")));
+        // SOLIDCRAFT_TITLEBAR wins over the file; empty counts as unset; case and spaces don't matter.
+        assert!(!titlebar_choice(Some(" System "), Some("app")));
+        assert!(titlebar_choice(Some("app"), Some("system")));
+        assert!(!titlebar_choice(Some(""), Some("system")));
+        // Anything unknown keeps the application bar.
+        assert!(titlebar_choice(Some("ssd"), None));
+    }
+}
+
+#[cfg(test)]
+mod prefs_writer_tests {
+    use super::PrefsWriter;
+    use solidcraft_ui_egui::prefs::{NavigatorStyle, STORAGE_KEY};
+    use std::collections::HashMap;
+    use std::time::{Duration, Instant};
+
+    /// eframe's settings file: what was flushed to disk is what the next start reads.
+    #[derive(Default)]
+    struct Disk {
+        pending: HashMap<String, String>,
+        flushed: HashMap<String, String>,
+        flushes: usize,
+    }
+
+    impl eframe::Storage for Disk {
+        fn get_string(&self, key: &str) -> Option<String> {
+            self.pending.get(key).cloned()
+        }
+        fn set_string(&mut self, key: &str, value: String) {
+            self.pending.insert(key.into(), value);
+        }
+        fn remove_string(&mut self, key: &str) {
+            self.pending.remove(key);
+        }
+        fn flush(&mut self) {
+            self.flushed = self.pending.clone();
+            self.flushes += 1;
+        }
+    }
+
+    fn new_app() -> solidcraft_ui_egui::SolveApp {
+        solidcraft_ui_egui::SolveApp::new(solidcraft_engine::Session::default(), solidcraft_ui_egui::Services::default())
+    }
+
+    /// #8275: Preferences' View navigator and Display quality, changed and confirmed, are on disk
+    /// in that frame, so the next start has them even when this one never closes normally (ended
+    /// from the Task Manager, a sign-out, a hang or crash in the graphics driver on the way out).
+    #[test]
+    fn changed_settings_reach_the_disk_in_the_frame_they_change() {
+        let mut app = new_app();
+        let mut disk = Disk::default();
+        let mut writer = PrefsWriter::read(app.prefs());
+        let now = Instant::now();
+        assert_eq!(writer.store(&mut disk, app.prefs(), now), None);
+        assert_eq!(disk.flushes, 0, "the settings read at start are not written again");
+        app.preferences.navigator_style = NavigatorStyle::Cube;
+        app.preferences.display_quality = "fine".into();
+        assert!(writer.due(true, now), "a frame with input is checked");
+        assert_eq!(writer.store(&mut disk, app.prefs(), now), None);
+        assert_eq!(disk.flushes, 1, "flushed at once, not left for eframe's next save");
+        assert_eq!(writer.store(&mut disk, app.prefs(), now + Duration::from_secs(5)), None);
+        assert_eq!(disk.flushes, 1, "unchanged settings are not written again");
+
+        // The next start reads them.
+        let mut next = new_app();
+        let stored = solidcraft_ui_egui::prefs::stored(|k| disk.flushed.get(k).cloned()).expect("settings on disk");
+        next.load_prefs(&stored);
+        assert_eq!(next.preferences.navigator_style, NavigatorStyle::Cube);
+        assert_eq!(next.preferences.display_quality, "fine");
+        assert!(disk.flushed.contains_key(STORAGE_KEY));
+    }
+
+    /// A frame without input is checked only right after one with input (whose clicks the UI
+    /// handled in that frame); after that, idle frames cost nothing. Pointer motion, which comes
+    /// every frame while the mouse moves, doesn't count as input.
+    #[test]
+    fn frames_are_checked_with_input_and_once_after_it() {
+        let now = Instant::now();
+        let mut writer = PrefsWriter::default();
+        assert!(!writer.due(false, now));
+        assert!(writer.due(true, now));
+        assert!(writer.due(false, now), "the frame after input");
+        assert!(!writer.due(false, now));
+
+        let click = egui::Event::PointerButton {
+            pos: egui::Pos2::ZERO,
+            button: egui::PointerButton::Primary,
+            pressed: false,
+            modifiers: egui::Modifiers::NONE,
+        };
+        assert!(super::changes_settings(&click));
+        assert!(super::changes_settings(&egui::Event::Text("5".into())));
+        assert!(!super::changes_settings(&egui::Event::PointerMoved(egui::Pos2::ZERO)));
+        assert!(!super::changes_settings(&egui::Event::MouseMoved(egui::Vec2::X)));
+    }
+
+    /// A setting that changes in every frame (a panel's width while its edge is dragged) doesn't
+    /// write the file in every frame: at most once a second, and the last change is on disk at
+    /// most a second after it was made, with a frame asked for then so an idle app writes it.
+    #[test]
+    fn a_continuous_change_is_written_once_a_second_and_its_end_soon_after() {
+        let mut app = new_app();
+        let mut disk = Disk::default();
+        let mut writer = PrefsWriter::read(app.prefs());
+        let start = Instant::now();
+        let frame = Duration::from_millis(16);
+        let mut asked = None;
+        // 1.5 s of dragging at 60 frames a second, with input in every frame.
+        for n in 0..94u32 {
+            let now = start + frame * n;
+            app.preferences.browser_width = 200.0 + n as f32;
+            assert!(writer.due(true, now));
+            asked = writer.store(&mut disk, app.prefs(), now);
+        }
+        assert_eq!(disk.flushes, 2, "the first change at once, then one a second later");
+        let wait = asked.expect("the last width waits, and a frame is asked for when it can be written");
+        assert!(wait <= PrefsWriter::INTERVAL);
+
+        // The drag ends: no more input. Frames before the wait is over don't even look.
+        let end = start + frame * 93;
+        assert!(writer.due(false, end + frame), "the frame right after input");
+        assert!(!writer.due(false, end + frame * 2), "an idle frame before the wait is over");
+        // The frame asked for writes the last width.
+        let then = end + wait;
+        assert!(writer.due(false, then));
+        assert_eq!(writer.store(&mut disk, app.prefs(), then), None);
+        assert_eq!(disk.flushes, 3);
+        let mut next = new_app();
+        let stored = solidcraft_ui_egui::prefs::stored(|k| disk.flushed.get(k).cloned()).expect("settings on disk");
+        next.load_prefs(&stored);
+        assert_eq!(next.preferences.browser_width, 293.0, "the width the drag ended at");
+        assert!(!writer.due(false, then + frame), "nothing waits any more");
+    }
 }
 
 #[cfg(test)]

apps/solidcraft/src/native_menu.rs

@@ -101,6 +101,7 @@ impl NativeMenu {
         ])?;
         for (action, label) in [
             ("docs", "Documentation"),
+            ("updates", app.tr("update.check_for_updates")),
             ("shortcuts", "Keyboard Shortcuts"),
             ("messages", "Messages\u{2026}"),
             ("report", "Report an Issue\u{2026}"),

apps/solidcraft/src/startup.rs

@@ -137,8 +137,11 @@ pub struct AdapterChoice {
     pub compatible: bool,
 }
 
-/// Choose only surface-compatible adapters. Names saved in preferences are exact; the
-/// environment override follows wgpu's case-insensitive substring convention.
+/// Choose an adapter by name. The environment override follows wgpu's case-insensitive
+/// substring convention among surface-compatible adapters. A saved preference prefers an
+/// exact (then case-insensitive) name among compatible adapters, and if the named card is
+/// only listed as incompatible with the surface still picks it (#8341: otherwise the
+/// preference is kept in the dialog while wgpu silently uses another GPU).
 /// No match leaves selection to the normal wgpu request.
 pub fn choose_adapter(adapters: &[AdapterChoice], environment: Option<&str>, preference: Option<&str>) -> Option<usize> {
     // wgpu's environment helper panics on a missing name; an override must remain recoverable.
@@ -149,12 +152,14 @@ pub fn choose_adapter(adapters: &[AdapterChoice], environment: Option<&str>, pre
             return Some(index);
         }
     }
-    if let Some(name) = preference.filter(|s| !s.is_empty())
-        && let Some((index, _)) = compatible().find(|(_, a)| a.name == name)
-    {
-        return Some(index);
-    }
-    None
+    let name = preference.filter(|s| !s.is_empty())?;
+    let find = |pred: &dyn Fn(&AdapterChoice) -> bool, only_compatible: bool| {
+        adapters.iter().enumerate().find(|(_, a)| (!only_compatible || a.compatible) && pred(a)).map(|(i, _)| i)
+    };
+    find(&|a| a.name == name, true)
+        .or_else(|| find(&|a| a.name.eq_ignore_ascii_case(name), true))
+        .or_else(|| find(&|a| a.name == name, false))
+        .or_else(|| find(&|a| a.name.eq_ignore_ascii_case(name), false))
 }
 
 /// Leave Automatic on wgpu's normal request path; named choices may defer to it too.
@@ -255,7 +260,7 @@ pub const FLOAT_DEPTH_STENCIL: eframe::wgpu::Features = eframe::wgpu::Features::
 /// asks for a float one only when whichever it picks has it.
 pub fn float_depth_everywhere(options: &eframe::egui_wgpu::WgpuConfiguration) -> bool {
     let eframe::egui_wgpu::WgpuSetup::CreateNew(setup) = &options.wgpu_setup else { return false };
-    let mut desc = eframe::wgpu::InstanceDescriptor::new_without_display_handle_from_env();
+    let mut desc = solidcraft_gpu::instance_descriptor_from_env();
     desc.backends = setup.instance_descriptor.backends;
     let instance = eframe::wgpu::Instance::new(desc);
     let adapters = pollster::block_on(instance.enumerate_adapters(setup.instance_descriptor.backends));
@@ -272,6 +277,7 @@ pub fn has_hardware_adapter(backends: eframe::wgpu::Backends) -> bool {
     let mut desc = eframe::wgpu::InstanceDescriptor::new_without_display_handle();
     desc.backends = backends;
     desc.flags = eframe::wgpu::InstanceFlags::from_build_config().with_env();
+    desc.backend_options.dx12.shader_compiler = solidcraft_gpu::dx12_compiler();
     let instance = eframe::wgpu::Instance::new(desc);
     let adapters = pollster::block_on(instance.enumerate_adapters(backends));
     let found: Vec<String> = adapters.iter().map(|a| format!("{} ({:?})", a.get_info().name, a.get_info().device_type)).collect();
@@ -291,6 +297,71 @@ pub fn window_instance_flags(flags: eframe::wgpu::InstanceFlags, intel_mac: bool
     if intel_mac && env.map(str::trim).is_none_or(str::is_empty) { flags - eframe::wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL } else { flags }
 }
 
+/// The environment variable that makes the macOS compatibility shim report an older OS
+/// version to wgpu's Metal backend. On OCLP-patched machines the Metal compiler accepts
+/// only up to the MSL standard of the original GPU, not the one the patched OS reports,
+/// so wgpu picks a standard that the compiler refuses (`invalid value 'metal3.2'`).
+/// Setting this variable before the process starts causes the OS to report the older
+/// version and wgpu selects a supported MSL standard (#3080, #4605).
+#[cfg(target_os = "macos")]
+pub const SYSTEM_VERSION_COMPAT_ENV: &str = "SYSTEM_VERSION_COMPAT";
+
+/// The NVRAM variable that OpenCore Legacy Patcher writes on every OCLP-booted system.
+/// Its presence is the primary signal that `SYSTEM_VERSION_COMPAT=1` is needed.
+#[cfg(target_os = "macos")]
+pub const OCLP_NVRAM_KEY: &str = "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:OCLP-Version";
+
+/// `true` if the OCLP NVRAM key is present on this system.
+///
+/// Runs `nvram <key>` and treats exit 0 as present. Any error (missing binary,
+/// permission denied, key absent) returns `false` — this is a best-effort probe.
+#[cfg(target_os = "macos")]
+pub fn oclp_nvram_present() -> bool {
+    std::process::Command::new("nvram").arg(OCLP_NVRAM_KEY).output().map(|o| o.status.success()).unwrap_or(false)
+}
+
+/// Whether to re-launch with `SYSTEM_VERSION_COMPAT=1`: it is not set yet and OCLP shows through
+/// the NVRAM key. The probe runs only when it is needed, so a re-launched process (variable
+/// set) never starts `nvram`.
+#[cfg(target_os = "macos")]
+fn compat_wanted(compat_set: bool, nvram: impl FnOnce() -> bool) -> bool {
+    !compat_set && nvram()
+}
+
+/// If this process is running under OCLP and `SYSTEM_VERSION_COMPAT` has not been set,
+/// re-launch the current binary with `SYSTEM_VERSION_COMPAT=1` added to the environment,
+/// then exit with the child's status code.
+///
+/// `SYSTEM_VERSION_COMPAT=1` must be present **before** the process starts: setting it
+/// with `std::env::set_var` inside `main` is too late because the macOS frameworks have
+/// already queried the OS version by then. Re-launching is the only safe approach that
+/// works without `unsafe` (a true `execve` replacement would require it).
+///
+/// Returns `Ok(false)` immediately when:
+/// - `SYSTEM_VERSION_COMPAT` is already set (re-launched process, no loop), or
+/// - the OCLP NVRAM key is absent.
+///
+/// Returns `Err` only when `std::env::current_exe()` fails or the child process cannot
+/// be spawned; the caller should log the error and continue normally.
+///
+/// Never returns `Ok(true)`: a successful re-launch exits the current process.
+#[cfg(target_os = "macos")]
+pub fn relaunch_with_version_compat() -> Result<bool, String> {
+    // A set variable means this is the re-launched process: no loop.
+    if !compat_wanted(std::env::var_os(SYSTEM_VERSION_COMPAT_ENV).is_some(), oclp_nvram_present) {
+        return Ok(false);
+    }
+    log::info!("startup: OCLP detected; re-launching with {}=1", SYSTEM_VERSION_COMPAT_ENV);
+    eprintln!("SolidCraft: OCLP detected; re-launching with {}=1", SYSTEM_VERSION_COMPAT_ENV);
+    let exe = std::env::current_exe().map_err(|e| format!("could not find own executable: {e}"))?;
+    let status = std::process::Command::new(&exe)
+        .args(std::env::args_os().skip(1))
+        .env(SYSTEM_VERSION_COMPAT_ENV, "1")
+        .status()
+        .map_err(|e| format!("could not re-launch with {}: {e}", SYSTEM_VERSION_COMPAT_ENV))?;
+    std::process::exit(status.code().unwrap_or(1));
+}
+
 /// Windows with OpenGL: the window keeps the system title bar (#2063). The window without OS
 /// decorations keeps its caption style while having no frame, and some OpenGL drivers (older
 /// Intel HD/UHD) then show the picture a caption's height lower than the window, so it no longer
@@ -350,7 +421,8 @@ mod tests {
         assert_eq!(choose_adapter(&cards, None, Some("removed")), None);
         assert_eq!(choose_adapter(&cards, Some("missing"), Some("Discrete small")), Some(1));
         assert_eq!(choose_adapter(&cards, Some(""), Some("Discrete small")), Some(1));
-        assert_eq!(choose_adapter(&cards, None, Some("Discrete")), None, "saved names are exact");
+        assert_eq!(choose_adapter(&cards, None, Some("discrete small")), Some(1), "preference matches without regard to case");
+        assert_eq!(choose_adapter(&cards, None, Some("Discrete")), None, "a preference is the full name, not a substring");
     }
 
     #[test]
@@ -359,11 +431,20 @@ mod tests {
         assert_eq!(choose_adapter(&cards, None, None), None);
         assert_eq!(choose_adapter(&cards, Some(""), Some("")), None);
         cards[2].compatible = false;
-        assert_eq!(choose_adapter(&cards, Some("large"), Some("Discrete large")), None);
+        // Environment still needs a compatible adapter; a preference keeps the named card (#8341).
+        assert_eq!(choose_adapter(&cards, Some("large"), Some("Discrete large")), Some(2));
         assert_eq!(choose_adapter(&cards, Some("small"), None), Some(1));
         assert_eq!(choose_adapter(&[], None, None), None);
     }
 
+    #[test]
+    fn preference_keeps_a_named_card_even_when_surface_says_incompatible() {
+        let mut cards = cards();
+        cards[1].compatible = false;
+        assert_eq!(choose_adapter(&cards, None, Some("Discrete small")), Some(1));
+        assert_eq!(choose_adapter(&cards, None, Some("discrete SMALL")), Some(1));
+    }
+
     #[test]
     fn automatic_adapter_preserves_the_previous_request_configuration() {
         use eframe::egui_wgpu::WgpuSetupCreateNew;
@@ -413,6 +494,27 @@ mod tests {
         assert_eq!(window_instance_flags(on, false, None), on);
     }
 
+    #[cfg(target_os = "macos")]
+    #[test]
+    fn oclp_relaunch_needs_the_signal_and_no_compat_variable() {
+        use super::compat_wanted;
+        let probed = std::cell::Cell::new(false);
+        let probe = |found: bool| {
+            let probed = &probed;
+            move || {
+                probed.set(true);
+                found
+            }
+        };
+        // The re-launched process has the variable: no probe, no second re-launch.
+        assert!(!compat_wanted(true, probe(true)));
+        assert!(!probed.get());
+        // The OCLP NVRAM key is the signal.
+        assert!(compat_wanted(false, probe(true)));
+        // No signal: an ordinary Mac starts as it is.
+        assert!(!compat_wanted(false, probe(false)));
+    }
+
     #[test]
     fn switches_read_from_the_environment() {
         assert!(env_on(Some("1")) && env_on(Some("yes")) && !env_on(Some("0")) && !env_on(Some(" ")) && !env_on(None) && !env_on(Some("false")));
@@ -591,7 +693,7 @@ mod tests {
         if cfg!(target_os = "windows") && std::env::var_os(WGPU_BACKEND_ENV).is_none() {
             assert_eq!(backends, eframe::wgpu::Backends::DX12);
         }
-        let mut desc = eframe::wgpu::InstanceDescriptor::new_without_display_handle_from_env();
+        let mut desc = solidcraft_gpu::instance_descriptor_from_env();
         desc.backends = backends;
         let instance = eframe::wgpu::Instance::new(desc);
         let adapters = pollster::block_on(instance.enumerate_adapters(backends));

assets/appearances/library.rs

@@ -1,5 +1,5 @@
 //! Built-in model appearances: names, sRGB colours and metalness.
-pub const LIBRARY: [(&str, [u8; 3], f64); 20] = [
+pub const LIBRARY: &[(&str, [u8; 3], f64)] = &[
     ("Aluminum - Satin", [204, 208, 214], 1.0),
     ("Aluminum - Anodized Black", [44, 46, 50], 1.0),
     ("Aluminum - Anodized Blue", [52, 92, 160], 1.0),

assets/appearances/opaque_finishes.rs

@@ -1,7 +1,7 @@
 //! Original illustrative opaque finishes; not measured optical or engineering data.
 //! (name, sRGB color, metal fraction, perceptual roughness). IOR is an illustrative 1.5.
 //! Separate names preserve the scalar library's appearance and saved assignments.
-pub const OPAQUE_FINISHES: [(&str, [u8; 3], f64, f64); 6] = [
+pub const OPAQUE_FINISHES: &[(&str, [u8; 3], f64, f64)] = &[
     ("Steel - Satin PBR", [158, 164, 172], 1.0, 0.4),
     ("Aluminum - Satin PBR", [204, 208, 214], 1.0, 0.3),
     ("Copper - Clean PBR", [204, 122, 80], 1.0, 0.25),

assets/appearances/starter_pack.rs

@@ -16,7 +16,7 @@ const fn glass(transmission_linear_rgb: [f64; 3], ior: f64, reference_path_mm: f
     GlassRecipe { transmission_linear_rgb, dielectric_ior: ior, reference_path_mm, boundary }
 }
 
-pub const STARTER_PACK: [VisualPreset; 40] = [
+pub const STARTER_PACK: &[VisualPreset] = &[
     VisualPreset::opaque(
         "starter.wood.oak-honey",
         "Wood - Honey Oak Uniform Preview",

assets/fonts/craft-ui-sc/OFL.txt

@@ -0,0 +1,96 @@
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.
+Copyright 2014-2021 Google Inc. with Reserved Font Name 'Noto'.
+Subset for SolidCraft web UI (glyphs used by the zh locale); renamed Craft UI SC (no Reserved Font Name).
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

assets/fonts/craft-ui-tc/OFL.txt

@@ -0,0 +1,96 @@
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'.
+Copyright 2014-2021 Google Inc. with Reserved Font Name 'Noto'.
+Subset for SolidCraft web UI (glyphs used by the zh-TW locale); renamed Craft UI TC (no Reserved Font Name).
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

assets/icons/ui/design/palette.toml

@@ -188,7 +188,7 @@ surface = [
 sketch = [
   "arc3", "arc_center", "arc_slot", "arc_slot_center", "arc_tangent",
   "blend", "circle", "circle2", "circle3", "circle_tt",
-  "circle_ttt", "conic", "constrainer", "dimension", "ellipse",
+  "circle_ttt", "conic", "constrainer", "dimension", "ellipse", "equation_curve",
   "extend", "finish", "fit_section", "include",
   "intersect", "intersection_curve", "iso_curve", "line", "line_mid",
   "offset", "offset_two_sides", "offset_symmetric", "point", "polygon", "polygon_circumscribed", "polygon_edge",
@@ -204,5 +204,11 @@ constraint = [
   "c_polygon", "c_smooth", "c_symmetry", "c_tangent",
 ]
 construction = [
-  "centerline", "construction", "infinite",
+  "centerline", "construction", "construction_line", "construction_line_angle",
+  "construction_line_bisector", "construction_line_horizontal", "construction_line_parallel",
+  "construction_line_perpendicular", "construction_line_tangent_at", "construction_line_tangent_external",
+  "construction_line_tangent_two", "construction_line_vertical", "infinite",
+]
+mesh = [
+  "mesh_body",
 ]

assets/icons/ui/design/requested_icons.txt

@@ -70,6 +70,16 @@ configuration_table	false
 conic	false
 constrainer	false
 construction	false
+construction_line	false
+construction_line_angle	false
+construction_line_bisector	false
+construction_line_horizontal	false
+construction_line_parallel	false
+construction_line_perpendicular	false
+construction_line_tangent_at	false
+construction_line_tangent_external	false
+construction_line_tangent_two	false
+construction_line_vertical	false
 contact_all	false
 contact_new	false
 contact_off	false
@@ -95,6 +105,7 @@ edit	false
 ellipse	false
 emboss	false
 environment_map	false
+equation_curve	false
 error	false
 explode	false
 export	false
@@ -103,6 +114,7 @@ extend	false
 extrude	false
 eye	false
 fastener	false
+feature_group	false
 fillet	false
 finish	false
 finish_edit	false
@@ -143,6 +155,7 @@ loft	false
 lookat	false
 material	false
 measure	false
+mesh_body	false
 mesh_export	false
 min_radius	false
 mirror	false
@@ -168,6 +181,7 @@ pipe	false
 plane	false
 plane_along_path	false
 plane_angle	false
+plane_axis_point	false
 plane_midplane	false
 plane_perpendicular	false
 plane_tangent	false
@@ -188,6 +202,7 @@ polygon	false
 polygon_circumscribed	false
 polygon_edge	false
 presspull	false
+print_face	false
 project	false
 project_surface	false
 rack_pinion	false
@@ -222,6 +237,8 @@ settings_monitor	false
 settings_mouse	false
 settings_palette	false
 settings_plug	false
+settings_profile	false
+sheet	false
 sheet_rules	false
 shell	false
 shield	false
@@ -257,6 +274,7 @@ split_face	false
 spun	false
 star	false
 status_error	false
+status_pin	false
 status_recovery	false
 style	false
 style_hidden_edges	false
@@ -288,6 +306,8 @@ svg	false
 sweep	false
 text	false
 thread	false
+timeline_play	false
+timeline_stop	false
 torus	false
 trace	false
 trim	false

assets/icons/ui/design/svg/flat/settings_profile.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Settings profile</title>
+  <circle cx="32" cy="19" r="8" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M12 53C12 44.7157 20.9543 38 32 38C43.0457 38 52 44.7157 52 53" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

assets/icons/ui/design/svg/flat/status_pin.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Pinned result</title>
+  <path d="M32 57C25 48 14 35 14 24A18 18 0 0 1 50 24C50 35 39 48 32 57Z" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M25 24A7 7 0 1 0 39 24A7 7 0 1 0 25 24Z" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Construction line through two points</title>
+  <path d="M8 52L56 12" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round" stroke-dasharray="10 5"/>
+  <circle cx="20" cy="42" r="5.8" fill="#ffffff"/>
+  <circle cx="20" cy="42" r="3.4" fill="#236ead"/>
+  <circle cx="44" cy="22" r="5.8" fill="#ffffff"/>
+  <circle cx="44" cy="22" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_angle.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Construction line at an angle</title>
+  <path d="M10.26 48.66L58.26 48.66" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M28.65 33.23A24 24 0 0 1 34.26 48.66" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M10.26 48.66L54.26 11.66" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="10.26" cy="48.66" r="5.8" fill="#ffffff"/>
+  <circle cx="10.26" cy="48.66" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_bisector.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Angle bisector</title>
+  <path d="M13.92 12.18L9.92 52.17L54.92 44.17" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M12.11 30.29A22 22 0 0 1 31.58 48.33" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M9.92 52.17L47.3 11.83" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_horizontal.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Horizontal construction line</title>
+  <path d="M8 32L56 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round" stroke-dasharray="10 5"/>
+  <circle cx="32" cy="32" r="5.8" fill="#ffffff"/>
+  <circle cx="32" cy="32" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_parallel.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Parallel construction line</title>
+  <path d="M9 37L41 9" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M23 55L55 27" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round" stroke-dasharray="10 5"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_perpendicular.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Perpendicular construction line</title>
+  <path d="M8 44L56 44" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 8L32 56" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 34L42 34L42 44" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_tangent_at.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Tangent at a curve point</title>
+  <circle cx="32" cy="34.26" r="17" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M8 17.26L56 17.26" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="32" cy="17.26" r="5.8" fill="#ffffff"/>
+  <circle cx="32" cy="17.26" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_tangent_external.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Tangent through an external point</title>
+  <circle cx="21.74" cy="38.77" r="14" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M53.6 8.23L28.55 55.9" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="51.74" cy="11.77" r="5.8" fill="#ffffff"/>
+  <circle cx="51.74" cy="11.77" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_tangent_two.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Common tangent to two curves</title>
+  <circle cx="20" cy="33.59" r="12" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="46" cy="33.59" r="8" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M6 19.27L58 27.36" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/construction_line_vertical.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Vertical construction line</title>
+  <path d="M32 8L32 56" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round" stroke-dasharray="10 5"/>
+  <circle cx="32" cy="32" r="5.8" fill="#ffffff"/>
+  <circle cx="32" cy="32" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/equation_curve.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Equation curve</title>
+  <path d="M12 8L12 56M6 32L58 32" fill="none" stroke="#6f879c" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M12 32C15.42 24.83 18.72 18 22.5 18C26.28 18 29.58 24.83 33 32C36.42 39.17 39.72 46 43.5 46C47.28 46 50.58 39.17 54 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="12" cy="32" r="5.8" fill="#ffffff"/>
+  <circle cx="12" cy="32" r="3.4" fill="#236ead"/>
+  <circle cx="54" cy="32" r="5.8" fill="#ffffff"/>
+  <circle cx="54" cy="32" r="3.4" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/feature_group.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Feature group</title>
+  <path d="M28.5 11L50.5 11A4.5 4.5 0 0 1 55 15.5L55 28.5A4.5 4.5 0 0 1 50.5 33L28.5 33A4.5 4.5 0 0 1 24 28.5L24 15.5A4.5 4.5 0 0 1 28.5 11Z" fill="#8e9faf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M21 20L43 20A4.5 4.5 0 0 1 47.5 24.5L47.5 37.5A4.5 4.5 0 0 1 43 42L21 42A4.5 4.5 0 0 1 16.5 37.5L16.5 24.5A4.5 4.5 0 0 1 21 20Z" fill="#b8c3cf" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M13.5 29L35.5 29A4.5 4.5 0 0 1 40 33.5L40 46.5A4.5 4.5 0 0 1 35.5 51L13.5 51A4.5 4.5 0 0 1 9 46.5L9 33.5A4.5 4.5 0 0 1 13.5 29Z" fill="#b9ddf8" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M16 40L33 40" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/mesh_body.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Mesh body</title>
+  <path d="M8.62 18.5L32 32L32 59L8.62 45.5Z" fill="#328bd3"/>
+  <path d="M55.38 18.5L32 32L32 59L55.38 45.5Z" fill="#236ead"/>
+  <path d="M32 5L55.38 18.5L32 32L8.62 18.5Z" fill="#b9ddf8"/>
+  <path d="M8.62 18.5L55.38 18.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M8.62 18.5L32 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M55.38 18.5L32 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 5L55.38 18.5L55.38 45.5L32 59L8.62 45.5L8.62 18.5Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M8.62 18.5L32 32L55.38 18.5" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 32L32 59" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

assets/icons/ui/design/svg/model/plane_axis_point.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Plane through axis and point</title>
+  <path d="M26 15L56 32.32L38 42.71L8 25.39Z" fill="#b9ddf8" stroke="#236ead" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round" stroke-dasharray="0.1 5"/>
+  <path d="M15 18.4L53 40.34" fill="none" stroke="currentColor" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="22" cy="29" r="3.1" fill="currentColor"/>
+</svg>

assets/icons/ui/design/svg/model/print_face.svg

@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Print Face</title>
+  <path d="M9.72 26.17L4.5 20.95L4.5 40.85L9.72 46.07Z" fill="#b8c3cf"/>
+  <path d="M9.72 26.17L4.5 20.95L4.5 40.85L9.72 46.07Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M18.77 23.15L9.72 26.17L9.72 46.07L18.77 43.05Z" fill="#328bd3"/>
+  <path d="M18.77 23.15L9.72 26.17L9.72 46.07L18.77 43.05Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M13.55 17.93L18.77 23.15L9.72 26.17L4.5 20.95Z" fill="#e2e8ef"/>
+  <path d="M13.55 17.93L18.77 23.15L9.72 26.17L4.5 20.95Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M50.45 37.54L38.27 25.35L38.27 33.88L50.45 46.07Z" fill="#b8c3cf"/>
+  <path d="M50.45 37.54L38.27 25.35L38.27 33.88L50.45 46.07Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M59.5 34.53L50.45 37.54L50.45 46.07L59.5 43.05Z" fill="#8e9faf"/>
+  <path d="M59.5 34.53L50.45 37.54L50.45 46.07L59.5 43.05Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M47.31 22.34L59.5 34.53L50.45 37.54L38.27 25.35Z" fill="#e2e8ef"/>
+  <path d="M47.31 22.34L59.5 34.53L50.45 37.54L38.27 25.35Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M50.45 46.07L38.27 33.88" fill="none" stroke="#236ead" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M59.5 43.05L50.45 46.07" fill="none" stroke="#236ead" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M24.17 34.2L28.31 34.2" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M35.31 34.2L27.31 38.7L27.31 29.7Z" fill="#236ead"/>
+</svg>

assets/icons/ui/design/svg/model/timeline_play.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><title>Play History</title><path d="M11.22 20L32 32L32 56L11.22 44Z" fill="#b8c3cf"/><path d="M52.78 20L32 32L32 56L52.78 44Z" fill="#8e9faf"/><path d="M32 8L52.78 20L32 32L11.22 20Z" fill="#e2e8ef"/><path d="M32 8L52.78 20L52.78 44L32 56L11.22 44L11.22 20Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M11.22 20L32 32L52.78 20" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M32 32L32 56" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M35 34L56 46L35 58Z" fill="#ffffff" stroke="#ffffff" stroke-width="4.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M35 34L56 46L35 58Z" fill="#236ead" stroke="#236ead" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/></svg>

assets/icons/ui/design/svg/model/timeline_stop.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><title>Stop History</title><path d="M11.22 20L32 32L32 56L11.22 44Z" fill="#b8c3cf"/><path d="M52.78 20L32 32L32 56L52.78 44Z" fill="#8e9faf"/><path d="M32 8L52.78 20L32 32L11.22 20Z" fill="#e2e8ef"/><path d="M32 8L52.78 20L52.78 44L32 56L11.22 44L11.22 20Z" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M11.22 20L32 32L52.78 20" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M32 32L32 56" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M36 35L53 35A2 2 0 0 1 55 37L55 54A2 2 0 0 1 53 56L36 56A2 2 0 0 1 34 54L34 37A2 2 0 0 1 36 35Z" fill="#ffffff" stroke="#ffffff" stroke-width="4.55" stroke-linejoin="round" stroke-linecap="round"/><path d="M36 35L53 35A2 2 0 0 1 55 37L55 54A2 2 0 0 1 53 56L36 56A2 2 0 0 1 34 54L34 37A2 2 0 0 1 36 35Z" fill="#236ead" stroke="#236ead" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/></svg>

assets/icons/ui/source/glyphs.rs

@@ -15,6 +15,17 @@ pub(crate) fn transport_glyph(p: &egui::Painter, c: egui::Pos2, what: &str, col:
         }
         "back" => tri(-1.0, 0.0),
         "forward" => tri(1.0, 0.0),
+        // Play History: larger than the step arrows so it doesn't read as Forward, and two bars
+        // while it plays.
+        "play" => {
+            let pts = vec![pos2(c.x - 4.5, c.y - 7.0), pos2(c.x + 6.5, c.y), pos2(c.x - 4.5, c.y + 7.0)];
+            p.add(egui::Shape::convex_polygon(pts, col, Stroke::NONE));
+        }
+        "pause" => {
+            for dx in [-3.0, 3.0] {
+                p.rect_filled(Rect::from_center_size(pos2(c.x + dx, c.y), vec2(3.0, 12.0)), 0.5, col);
+            }
+        }
         _ => {
             tri(1.0, -1.0);
             bar(5.0);

assets/locales/en-GB.json

@@ -1,40 +1,111 @@
 {
+  "A Single hole snaps to the middle of its face and to the centres of its round edges": "A Single hole snaps to the middle of its face and to the centres of its round edges",
   "Base Center": "Base Centre",
   "Center X": "Centre X",
   "Center Y": "Centre Y",
   "Center of mass": "Centre of mass",
+  "Centre to centre": "Centre to centre",
+  "Circle center": "Circle centre",
+  "Colour": "Colour",
+  "Copy all licences": "Copy all licences",
   "Customize Toolbar": "Customise Toolbar",
+  "Customize…": "Customise…",
+  "Face center": "Face centre",
+  "Favorites": "Favourites",
+  "Favourite": "Favourite",
   "Mass Center": "Mass Centre",
   "Modeled": "Modelled",
+  "Select the centre the pattern turns around first": "Select the centre the pattern turns around first",
+  "Snap to face and edge centres": "Snap to face and edge centres",
+  "Specialise": "Specialise",
+  "cmd.appearance_favorite": "Favourite Look",
+  "cmd.component_cycle_color": "Cycle Component Colour",
   "cmd.construct_point_center": "Point At Centre Of Circle/Sphere/Torus",
   "cmd.inspect_center_of_mass": "Centre of Mass",
+  "cmd.inspect_colored_components": "Enable Component Colours",
+  "cmd.inspect_colored_components_disable": "Disable Component Colours",
+  "cmd.parameters_favorite": "Favourite Parameter",
   "cmd.render_aging_describe": "Layered Surface Aging",
   "cmd.render_effects_describe": "Lens and Creative Effects",
+  "cmd.sketch.construction_line": "Construction Line",
+  "cmd.sketch.construction_line.angle": "Construction Line at Angle",
+  "cmd.sketch.construction_line.bisector": "Angle Bisector",
+  "cmd.sketch.construction_line.horizontal": "Horizontal Construction Line",
+  "cmd.sketch.construction_line.parallel": "Parallel Construction Line",
+  "cmd.sketch.construction_line.perpendicular": "Perpendicular Construction Line",
+  "cmd.sketch.construction_line.tangent_at": "Tangent at Curve Point",
+  "cmd.sketch.construction_line.tangent_external": "Tangent through External Point",
+  "cmd.sketch.construction_line.tangent_two": "Common Tangent",
+  "cmd.sketch.construction_line.vertical": "Vertical Construction Line",
   "cmd.sketch_arc_center_point": "Centre Point Arc",
   "cmd.sketch_circle_center": "Centre Diameter Circle",
   "cmd.sketch_rectangle_center": "Centre Rectangle",
   "cmd.sketch_slot_arc_center": "Centre Point Arc Slot",
   "cmd.sketch_slot_center_point": "Centre Point Slot",
   "cmd.sketch_slot_center_to_center": "Centre to Centre Slot",
+  "color.copy": "Click to copy colour values",
+  "color.edit": "Click to edit colour",
+  "color.gamma": "Showing colour values in 0-255 gamma space",
+  "color.linear": "Showing colour values in 0-1 linear space",
+  "color.recent": "Recent colours",
+  "color.recent_help": "Colours you pick in any colour field appear here",
+  "color.saturation": "Saturation (per cent)",
+  "color.selected": "Selected colour",
+  "color.step_down": "Step down",
+  "color.step_up": "Step up",
+  "color.value": "Value, the brightness (per cent)",
+  "dxf.cancelled": "DXF export cancelled",
+  "dxf.cancelling": "Cancelling DXF export",
+  "help.apache": "Apache licence 2.0",
+  "help.appearance.assign": "Gives the selected bodies, faces or components a colour or a material look, without changing their weight. Use it to tell parts apart or to preview a finish.",
+  "help.face.delete": "Removes the selected faces and lets the neighbouring faces close the gap, or leaves the gap open as a surface. Use it to take off a rounded edge, a hole or a boss that is in the way.",
+  "help.font_details": "The interface uses egui's built-in fonts (Ubuntu Light and Hack, under the Ubuntu Font Licence and the MIT/Bitstream Vera licence; Noto Emoji and the emoji icon font, under the OFL and MIT). Sketch text uses Liberation Sans (SIL OFL 1.1). The Crafting Apps' optional font pack, craft-fonts (BIZ UDPGothic, Shippori Mincho, BIZ UDMincho, Noto Sans CJK SC, Noto Sans Arabic; SIL OFL 1.1), is not bundled in SolidCraft builds.",
+  "help.licences": "Licences",
+  "help.material.assign": "Sets what the selected bodies are made of, such as steel, aluminium or ABS. Use it so that the mass and weight match the real part.",
+  "help.mit": "MIT licence",
+  "help.solid.draft": "Tilts the selected faces by the angle you set, measured from a neutral plane. Use it on moulded or cast parts so that they slide out of the mould.",
+  "help.solid.revolve": "Spins a sketch profile around an axis to make a round solid. Use it for shafts, knobs, bowls and any part that is round about a centre line.",
+  "help.solid.split_body": "Cuts a body into separate bodies with a plane, the face of another body or a sketch line. Use it to make parts that are printed, machined or coloured on their own.",
+  "help.solid.split_face": "Divides the selected faces along a plane, the face of another body or sketch curves, without cutting the body. Use it to give part of a face its own draft, colour or offset.",
+  "help.third_party": "Third-party licences",
+  "home.new_mm_hint": "Millimetres · opens in Design",
+  "navbar.custom.customise": "Customise navigation bar…",
+  "navbar.custom.position_centre": "Centre",
+  "navbar.description.separator": "A thin line that groups neighbouring slots.",
   "pattern.alignment_hint": "Counts include the original. Centre balances copies; Flip chooses the extra side for even totals.",
+  "prefs.bottom_centre": "Bottom centre",
+  "prefs.logo_theme": "Theme's colours",
   "prefs.max_file_size": "Largest file to open",
-  "prefs.max_file_size_design": "Design files",
   "prefs.max_file_size_flag": "This run started with --max-file-size {size}, which applies until SolidCraft closes. These settings apply when it starts without it.",
   "prefs.max_file_size_note": "Defaults: 512 MB and 256 MB; at most 16 GB. Opening a file takes several times its size in memory. A design that keeps a large import may need a higher design file limit to save and reopen.",
-  "prefs.max_file_size_step": "STEP and import files",
   "prefs.max_file_size_web": "The web app opens STEP and import files up to 512 MB and designs up to 256 MB: a browser tab can't hold larger files. The desktop app can raise these limits.",
   "prefs.megabytes": "MB",
+  "prefs.network_locations_note": "For organisations that keep designs on file servers. Off: only servers you allow.",
+  "prefs.sketch_conflict_colour": "Conflicting geometry in the conflict colour",
+  "prefs.sketch_conflict_colour_note": "While a sketch's constraints conflict, the curves and points a failing constraint holds are drawn in the conflict colour too, not only its glyph or dimension. Off: they keep their usual colours.",
+  "prefs.sketch_construction_lines": "Extended construction line tools",
+  "prefs.sketch_recent_snap": "Auto snap to recent centres and midpoints",
+  "prefs.sketch_recent_snap_note": "While drawing, snap the cursor where the guides of the two most recent circle centres or straight-edge midpoints cross. Off: those guides stay visual and the cursor does not move.",
   "prefs.sketch_state_icons": "Sketch icons in the colour of their state",
   "prefs.sketch_state_icons_note": "In History and the browser, a sketch's icon takes the colour of its state (under constrained, fully constrained or conflicting) and its tooltip names the state. Off: every sketch has the same icon.",
   "prefs.sketch_tracking_guides": "Centre and midpoint alignment guides",
   "prefs.sketch_tracking_guides_note": "Hover over a circle centre or straight-edge midpoint, then move horizontally or vertically to show a temporary dotted guide.",
   "prefs.status_bar_note": "A thin bar along the window's bottom edge shows what is being edited, the open sketch's state in its colour and the design's units; a click on the units changes them. The sketch's state then no longer shows in the view's corner.",
+  "prefs.structure.appearance_note": "Colours, text and accessibility.",
+  "prefs.structure.tools_note": "How modelling tools behave.",
   "prefs.theme_follow": "Follow a theme file",
   "prefs.theme_follow_error": "Not applied: {error}. The last good theme stays on.",
   "prefs.theme_follow_launch": "Followed for this run only (--theme-file); reloaded whenever another tool rewrites it.",
   "prefs.theme_follow_note": "Reloaded whenever another tool rewrites it. Choosing a theme stops following it.",
   "prefs.theme_follow_off": "Off",
   "prefs.theme_follow_stop": "Stop following",
+  "prefs.theme_option_opacity_help": "Adjust floating panel opacity. A readability floor protects text over viewport colours.",
+  "prefs.theme_option_tab_colours": "Tab colours",
+  "prefs.theme_option_tab_colours_help": "Use this theme’s panel and viewport colours for each ribbon tab.",
+  "prefs.theme_option_tab_fade_ms_help": "Fade panel and viewport colours when switching tabs. Zero switches instantly.",
+  "prefs.trackpad_zoom_modifier.help": "Hold only this key to zoom at the pointer with vertical scroll. Off keeps the existing scroll behaviour.",
+  "prefs.view": "View behaviour",
+  "prefs.viewport_background_colour": "Colour",
   "render.aging_add": "Add aging layer",
   "render.aging_airborne": "Airborne dust / participating medium",
   "render.aging_airborne_help": "Airborne dust is a separate finite homogeneous scattering volume. It changes transport and raw EXR, not the surface-aging stack. Existing volume/glass/denoising restrictions remain explicit; no atmosphere is added automatically.",
@@ -62,6 +133,9 @@
   "render.aging_target_help": "A named target must still match its captured index and name. Global masks are world-anchored; they do not follow moving parts. This is neither cavity detection nor true edge wear. Filter the list to reach additional bodies.",
   "render.aging_target_search": "Filter body names",
   "render.aging_upward": "Upward-facing deposition",
+  "render.appearance_editor.base_colour": "Base colour",
+  "render.backdrop_first": "Start / centre colour",
+  "render.backdrop_second": "End / edge colour",
   "render.backdrop_x": "Centre X",
   "render.backdrop_y": "Centre Y",
   "render.background_camera_section": "Camera background · PNG presentation",
@@ -69,20 +143,38 @@
   "render.background_hdr_separate": "The current HDR resources illuminate and reflect on surfaces; they are not automatically displayed as a panorama behind the subject. Changing a gradient does not rotate or recolour the lighting.",
   "render.background_lighting_section": "HDR illumination · separate from camera background",
   "render.background_no_alpha_override": "A camera background is not added to transparent output silently. Raw-master regrading uses captured coverage and does not reapply denoising; the source EXR remains unchanged.",
+  "render.background_not_light": "Background colour is presentation, not an additional lighting source.",
   "render.background_regrade": "Apply to retained raw master",
   "render.background_stage_occlusion": "This shot includes physical stage geometry. A large floor or wall can fill the frame and hide a camera-only background. Clear or resize the stage deliberately, or change its physical reflectance. Regrading cannot remove captured geometry.",
   "render.background_workflow": "Choose the background you intend: a camera-only colour/gradient, a physical stage that receives light, or HDR illumination. They are independent. Live Preview is a modelling view; render a new image or regrade a retained master to see camera finishing.",
+  "render.base_color": "Base colour · sRGB",
+  "render.bloom_help": "Creative output-only glow from positive linear highlights, spread with three normalised box passes. Radius is in output pixels. Added in linear display light before sRGB; not a lens, volumetric effect or convergence improvement. The raw EXR is unchanged.",
   "render.chromatic_offset": "Chromatic edge offset",
+  "render.cpu_area_editor_help": "Full side vectors in millimeters; U cross V points towards the emitting side. This differs from GPU half-edge vectors.",
+  "render.cpu_light_help": "Up to eight directional lights. An empty custom list turns them off; selecting a preset restores its lights. Colours are linear RGB and intensity is relative, not watts.",
+  "render.cpu_linear_color": "Linear colour (R, G, B)",
   "render.effects_gpu_only": "These effects require GPU path tracing. Changing the page never switches the renderer automatically.",
   "render.effects_help": "Combine ordered colour looks and image-space lens effects. Rendering and raw-master regrading use the same saved settings. Raw EXR stays unchanged. These are original artistic controls, not calibrated lens or branded-film emulations.",
   "render.effects_reset_lens": "Reset lens effects",
   "render.effects_seed": "Pattern seed",
+  "render.env_colour": "Colour",
+  "render.environment.radial_only": "Centre and radius apply to Radial mode.",
+  "render.error_finish_gesture": "finish the modelling gesture before previewing",
+  "render.error_finish_operation": "finish the current modelling operation before entering Render",
   "render.film_grain": "Photographic grain",
   "render.flare_ghosts": "Ghost rings per source",
   "render.flare_halo": "Flare halo",
   "render.flare_streak": "Anamorphic-style streak",
   "render.flare_strength": "Highlight flare strength",
   "render.flare_threshold": "Scene-linear flare threshold",
+  "render.frame_centre_mark": "Centre mark",
+  "render.hdr_primaries_declared": "The source declares its colour primaries.",
+  "render.hdr_primaries_srgb": "Colour primaries: sRGB/D65",
+  "render.hdr_primaries_undeclared": "The source does not declare primaries; review the renderer colour requirements.",
+  "render.image_cancelled": "Render cancelled",
+  "render.image_cancelling": "Cancelling",
+  "render.image_scene_stale": "Finish the modelling gesture or refresh the scene before checking or starting an image.",
+  "render.inspector_colour": "Colour",
   "render.layer_down": "Move down",
   "render.layer_enabled": "Layer enabled",
   "render.layer_remove": "Remove layer",
@@ -90,6 +182,18 @@
   "render.layer_up": "Move up",
   "render.lens_effects_help": "Flare uses up to four separated bright sources in the actual linear image. Ghosts, halo, streaks, chromatic offsets and radial distortion are artistic image-space approximations. Spatial effects need opaque output; outside samples extend the image edge. Grain is deterministic. No physics, EXR or geometry is altered.",
   "render.lens_effects_title": "Lens-inspired & photographic",
+  "render.library_center": "Rig centre",
+  "render.library_favorite": "Add favourite",
+  "render.library_favorites": "Favourites",
+  "render.library_inspect_only": "Select to inspect; nothing is applied automatically. Favourites and recent history belong to this open document session.",
+  "render.library_rig_help": "Fit once at an explicit centre and physical extent. Complete rigs include passive cards; calibration blockers still refuse. Conservative emitter/card clearance is checked before saving.",
+  "render.library_source_preview_help": "Authored base-colour source map. This is not a rendered or measured material preview.",
+  "render.library_unfavorite": "Remove favourite",
+  "render.light_behaviour": "BEHAVIOUR",
+  "render.light_preview_help": "Live view is unshadowed; Area lights use a centre-sample approximation. Render uses the complete light model.",
+  "render.light_product_centre": "Product centre",
+  "render.light_temperature": "Colour temperature",
+  "render.lighting_colour": "Colour",
   "render.look_add": "Add colour look",
   "render.look_bleach": "Bleach-bypass-inspired",
   "render.look_cool": "Cool",
@@ -101,6 +205,11 @@
   "render.look_teal_orange": "Teal / orange",
   "render.look_title": "Creative look stack",
   "render.look_warm": "Warm",
+  "render.material_color_map": "Base colour image (sRGB)",
+  "render.material_color_replace": "Base map replaces body colour",
+  "render.material_map_required": "Choose a colour image or a normal image before using maps.",
+  "render.material_maps": "Planar colour and normal maps",
+  "render.material_maps_help": "PNG/JPEG up to 1024×1024; 16 MiB encoded total. U and V are orthogonal world-mm repeat vectors (maximum 128 repeats). Colour is sRGB; normal data uses OpenGL +Y. Files are captured at Check/Start.",
   "render.opaque_preview_help": "Opaque PBR and simple colours; blended transparency. Refraction, HDRI and final rendering are not available yet.",
   "render.page_aging": "Aging & contamination",
   "render.page_background": "Backgrounds",
@@ -108,22 +217,48 @@
   "render.radial_distortion": "Radial distortion",
   "render.ribbon_aging": "Aging",
   "render.ribbon_effects": "Effects",
+  "render.ribbon_studios_help": "Browse implemented studio compositions and review their replacements before applying. Concept-only scenes remain labelled.",
   "render.sharpening": "Detail sharpening",
   "render.soft_focus": "Soft focus",
+  "render.stage_panels.centre": "Centre",
+  "render.stage_panels.source_note": "Authored base-colour source map. Not a measured material.",
+  "render.studio_area_help": "Up to four one-sided rectangles. Orthogonal half-edges U and V define size; U × V faces the lit side. Coordinates are world-space millimetres.",
+  "render.studio_center": "Centre X, Y, Z (mm)",
+  "render.studio_hdr_help": "Radiance .hdr, 2:1 panorama, up to 2048 × 1024. EXR is unavailable. The colour assumption applies only when primaries are unspecified.",
   "sketch_text.align_center": "Centre",
+  "ui.3d_mouse_kind_cap": "Return to Centre",
+  "ui.3d_mouse_looks_like_cap": "The reading stays put while you hold it, the way a Return to Centre device does.",
+  "ui.3d_mouse_orbit_tip": "Traced: the 3D mouse turns the view around the part of the model in the middle of the view when the turn begins, marked by a faint ball. Classic: around the view's centre",
   "ui.3d_mouse_step_pull": "Pull the cap towards you, hold it, then let go.",
+  "ui.3d_mouse_switch_cap": "Calibrate as Return to Centre",
+  "ui.agent_chat_minimize": "Minimise to a strip",
+  "ui.ai_mode_edits_note": "Modelling commands run without asking; saving, opening, exporting and other file or destructive actions still ask.",
   "ui.center": "Centre",
+  "ui.center_arc_follows_cursor": "Centre point arc follows the cursor's direction",
+  "ui.center_arc_follows_cursor_tip": "A centre point arc runs clockwise or counter-clockwise the way the cursor goes round its centre. Off: always counter-clockwise from the start.",
   "ui.centerline": "Centreline",
+  "ui.colour_vision": "Colour vision",
+  "ui.colour_vision_note": "Changes the colours that carry a meaning: sketch states, axes, bends, analyses and icons. If you use Windows colour filters, keep this Off.",
+  "ui.colour_vision_off_tip": "The theme's own colours",
+  "ui.construction.ribbon_label": "X-Lines",
   "ui.customizeToolbar": "Customise Toolbar…",
+  "ui.default_modelling_orientation": "Default modelling orientation",
   "ui.design_properties.license": "Licence",
   "ui.design_properties.organization": "Organisation",
+  "ui.details_curvature_caption": "Faces are coloured by their local radius of curvature.",
+  "ui.details_draft_caption": "Faces are coloured by their angle to the pull direction.",
+  "ui.export_keymap_tip": "Keys, S box favourites and the toolbar, as a file",
+  "ui.instances": "Instances",
   "ui.layout_compact": "Compact",
   "ui.layout_floating": "Floating",
+  "ui.material_review.claims": "Sources and licences are unverified claims. Missing values remain unknown.",
   "ui.point_cloud_color_by": "Colour By",
   "ui.point_cloud_file_colors": "File Colours",
   "ui.point_cloud_no_file_colors": "The file has no colours",
   "ui.point_cloud_single_color": "Single Colour",
+  "ui.properties.inertia_note": "About the centre of mass, in world axes (g·{unit}²)",
   "ui.ribbon_labels": "Show text under ribbon icons",
+  "ui.view_centre": "View centre",
   "ui.workspace_layout": "Workspace layout",
   "ui.zoom_to_cursor_tip": "The wheel zooms towards the point under the cursor (off: towards the view's centre)",
   "update.prefs_flatpak": "Flatpak updates this copy ({version}): run {command} or use your software centre. SolidCraft doesn't check."

assets/locales/pt-BR.json

@@ -606,6 +606,8 @@
   "cmd.appearance_library": "Biblioteca de aparências",
   "cmd.appearance_list": "Listar aparências",
   "cmd.assembly_bom": "Lista de materiais",
+  "cmd.assembly_mass_properties": "Propriedades de massa",
+  "cmd.body.print_face": "Face de impressão",
   "cmd.body_rename": "Renomear corpo",
   "cmd.browser_group": "Novo grupo",
   "cmd.browser_move": "Mover itens do navegador",
@@ -815,6 +817,16 @@
   "cmd.sheet_refold": "Redobrar",
   "cmd.sheet_rules": "Listar regras de chapa metálica",
   "cmd.sheet_unfold": "Desdobrar",
+  "cmd.sketch.construction_line": "Reta de construção",
+  "cmd.sketch.construction_line.angle": "Reta de construção em ângulo",
+  "cmd.sketch.construction_line.bisector": "Bissetriz",
+  "cmd.sketch.construction_line.horizontal": "Reta de construção horizontal",
+  "cmd.sketch.construction_line.parallel": "Reta de construção paralela",
+  "cmd.sketch.construction_line.perpendicular": "Reta de construção perpendicular",
+  "cmd.sketch.construction_line.tangent_at": "Tangente em um ponto da curva",
+  "cmd.sketch.construction_line.tangent_external": "Tangente por um ponto externo",
+  "cmd.sketch.construction_line.tangent_two": "Tangente comum",
+  "cmd.sketch.construction_line.vertical": "Reta de construção vertical",
   "cmd.sketch_arc_center_point": "Arco por ponto central",
   "cmd.sketch_arc_tangent": "Arco tangente",
   "cmd.sketch_arc_three_point": "Arco por 3 pontos",
@@ -1282,6 +1294,8 @@
   "prefs.orientation": "Orientação",
   "prefs.overall_speed": "Velocidade geral",
   "prefs.preview_choices": "Prévia das suas escolhas",
+  "prefs.print_face_highlight": "Destaque da face de impressão",
+  "prefs.print_face_highlight_tip": "Intensidade da cor e do contorno da face de impressão de um corpo na vista. 0 % não mostra destaque.",
   "prefs.quality_default": "padrão",
   "prefs.quality_fastest": "mais rápido",
   "prefs.quality_slowest": "mais lento",
@@ -1561,6 +1575,8 @@
   "ui.3d_mouse_step_twist_counterclockwise": "Gire a tampa no sentido anti-horário, segure e solte.",
   "ui.3d_mouse_switch_cap": "Calibrar como retorno ao centro",
   "ui.3d_mouse_switch_trackball": "Calibrar como trackball",
+  "ui.3d_mouse_use_direct": "Usar driver direto",
+  "ui.3d_mouse_use_direct_tip": "Ler o mouse 3D diretamente (hidraw) em vez de pelo spacenavd.",
   "ui.3d_mouse_view_axis": "Eixo da vista",
   "ui.3d_mouse_view_off": "Desligado",
   "ui.3d_mouse_view_off_tip": "O perfil do driver do mouse 3D desliga este eixo, então o movimento dele não move a vista. Escolher aqui o movimento de outro eixo troca os dois, e esse movimento deixa de mover a vista.",
@@ -1830,6 +1846,7 @@
   "ui.circle": "Círculo",
   "ui.circular_pattern": "Padrão circular",
   "ui.clear": "Limpar",
+  "ui.clear_print_face": "Limpar face de impressão",
   "ui.clear_recent": "Limpar recentes",
   "ui.clear_the_selection": "Limpar a seleção",
   "ui.click_selects_whole_bodies": "O clique seleciona corpos inteiros",
@@ -1864,6 +1881,7 @@
   "ui.constant": "Constante",
   "ui.constraints_conflict": "Restrições em conflito",
   "ui.construction": "Construção",
+  "ui.construction.ribbon_label": "Linhas aux.",
   "ui.context_menu": "Menu de contexto",
   "ui.continuity_g0": "G0 vinco",
   "ui.continuity_g1": "G1 tangente",
@@ -2074,6 +2092,7 @@
   "ui.infinite": "Infinita",
   "ui.insert": "Inserir",
   "ui.inspect": "Inspecionar",
+  "ui.instances": "Instâncias",
   "ui.intersect": "Interseção",
   "ui.isolate": "Isolar",
   "ui.join": "Unir",
@@ -2161,6 +2180,7 @@
   "ui.pan_zoom_orbit": "Deslocar, zoom, orbitar",
   "ui.parallel": "Paralelo",
   "ui.parameters": "Parâmetros",
+  "ui.part_size_needs_a_part": "Selecione uma peça padrão inserida (um parafuso, uma porca, uma arruela ou um pino) para alterar o tamanho. Para aumentar ou diminuir um corpo, use Escala.",
   "ui.part_size_shared": "Reconstrói a peça, substituindo quaisquer recursos adicionados. Todas as ocorrências deste componente são atualizadas.",
   "ui.paste": "Colar",
   "ui.path": "Caminho",
@@ -2186,6 +2206,11 @@
   "ui.polygon": "Polígono",
   "ui.preferences": "Preferências",
   "ui.press_a_key": "pressione uma tecla…",
+  "ui.print_face_body_not_sent": "O corpo dessa face não está sendo enviado: adicione-o primeiro a Corpos",
+  "ui.print_face_cleared": "{body}: face de impressão removida",
+  "ui.print_face_input": "Face de impressão",
+  "ui.print_face_pick": "Selecione uma face plana de um corpo sólido para torná-la a face de impressão",
+  "ui.print_face_set": "{body}: face de impressão definida; Enviar ao fatiador apoia o corpo sobre ela",
   "ui.profile": "Perfil",
   "ui.profile_plane": "Plano do perfil",
   "ui.profiles": "Perfis",
@@ -2243,6 +2268,7 @@
   "ui.select": "Selecionar",
   "ui.selectOther": "Selecionar outro…",
   "ui.selectTangentChain": "Selecionar cadeia tangente",
+  "ui.select_all": "Selecionar tudo",
   "ui.selection": "Seleção",
   "ui.selection_modifiers": "Modificadores de seleção",
   "ui.selection_shift_add_only": "Shift+clique adiciona sem remover",
@@ -2304,6 +2330,10 @@
   "ui.symmetric": "Simétrico",
   "ui.symmetry": "Simetria",
   "ui.system": "Sistema",
+  "ui.tab_assemble": "Montar",
+  "ui.tab_manage": "Gerenciar",
+  "ui.tab_sheet_metal": "Chapa Metálica",
+  "ui.tab_view": "Vista",
   "ui.tangent": "Tangente",
   "ui.taper_angle": "Ângulo de inclinação",
   "ui.tapped": "Roscado",
@@ -2371,7 +2401,9 @@
   "update.button": "Atualizar",
   "update.button_version": "Atualizar para {version}",
   "update.check_automatically": "Verificar atualizações automaticamente",
+  "update.check_for_updates": "Verificar atualizações",
   "update.check_now": "Verificar agora",
+  "update.check_unavailable": "A verificação de atualizações não está disponível para esta instalação.",
   "update.checking": "Verificando…",
   "update.copy": "Copiar",
   "update.dmg_opened": "A imagem de disco está aberta e verificada: arraste o SolidCraft para Aplicativos, substituindo a cópia antiga, e reinicie o SolidCraft.",

assets/materials/library.rs

@@ -7,7 +7,7 @@ pub const DEFAULT_MATERIAL: &str = "Default";
 pub const DEFAULT_DENSITY: f64 = 1.29;
 
 /// Physical materials: name and density (g/cm³).
-pub const MATERIALS: [(&str, f64); 14] = [
+pub const MATERIALS: &[(&str, f64)] = &[
     (DEFAULT_MATERIAL, DEFAULT_DENSITY),
     ("Steel", 7.85),
     ("Stainless Steel", 8.0),

assets/shaders/viewport.wgsl

@@ -18,6 +18,9 @@ struct U {
     depth: vec4<f32>,  // x = 1: reversed depth (1 near, 0 far); y, z: the faces' push (`FACE_BIAS`)
     tint: vec4<f32>,   // xyz added to a whole hovered body's colour before lighting
     sel: vec4<f32>,    // xyz a whole selected body's colour before lighting
+    product_lights_meta: vec4<f32>, // explicit preview flag and bounded count
+    product_lights: array<vec4<f32>,84>, // position/kind, radiance, axis/cone, attenuation
+    sky: vec4<f32>,    // xyz = world up; w = 1: shade in linear light with a sky fill (#7974)
 };
 
 fn reversed() -> bool {
@@ -32,6 +35,7 @@ fn near_z(c: vec4<f32>) -> f32 {
 
 @group(1) @binding(2) var acc_t: texture_2d<f32>;
 @group(2) @binding(0) var ao_depth: texture_2d<u32>;
+@group(2) @binding(1) var ao_map: texture_2d<f32>;
 
 fn clipped(p: vec3<f32>) -> bool {
     return length(u.clip.xyz) > 0.5 && dot(u.clip.xyz, p) > u.clip.w;
@@ -59,7 +63,7 @@ fn out_color(c: vec4<f32>) -> vec4<f32> {
 }
 
 struct TOut {
-    @builtin(position) pos: vec4<f32>,
+    @invariant @builtin(position) pos: vec4<f32>,
     @location(0) n: vec3<f32>,
     @location(1) c: vec4<f32>,
     @location(2) wp: vec3<f32>,
@@ -104,7 +108,7 @@ fn vs_tri_inst(
 /// stores every vertex's outputs: more of them cost more than the triangles' shared vertices
 /// save).
 struct FOut {
-    @builtin(position) pos: vec4<f32>,
+    @invariant @builtin(position) pos: vec4<f32>,
     @location(0) rp: vec3<f32>,
     @location(1) c: vec4<f32>,
 };
@@ -206,6 +210,12 @@ fn fs_ao_depth_flat(i: FOut, @builtin(front_facing) front: bool) -> AoDepth {
     return opaque_depth(t, front);
 }
 
+@fragment
+fn fs_ao_term_flat(i: FOut, @builtin(front_facing) front: bool) -> @location(0) vec4<f32> {
+    let t = flat_fragment(i, front);
+    return ao_term(t, front);
+}
+
 /// Opaque model surfaces: cut by the section plane/// Opaque model surfaces: cut by the section plane, the inside shows as a flat cap colour.
 @fragment
 fn fs_solid(i: TOut, @builtin(front_facing) front: bool) -> @location(0) vec4<f32> {
@@ -241,6 +251,44 @@ fn pushed(z: f32) -> f32 {
     return clamp(z - select(-push, push, reversed()), 0.0, 1.0);
 }
 
+/// A far wall seen through the cut where another body's face lying on it was drawn in front of
+/// it (a shaft in its bore, #9407): its cap colour again, at its depth pulled toward the eye by
+/// `touch_depth`, so it wins over that face, which is faceted another way.
+@fragment
+fn fs_solid_touch(i: TOut, @builtin(front_facing) front: bool) -> CutOut {
+    var o: CutOut;
+    // Derivatives (in `touch_depth`) first, before `solid` may discard.
+    o.depth = touch_depth(i.wp, i.pos.z);
+    o.c = solid(i, front);
+    return o;
+}
+
+@fragment
+fn fs_solid_touch_flat(i: FOut, @builtin(front_facing) front: bool) -> CutOut {
+    let t = flat_fragment(i, front);
+    var o: CutOut;
+    o.depth = touch_depth(t.wp, t.pos.z);
+    o.c = solid(t, front);
+    return o;
+}
+
+/// The depth of `wp` (depth `z`) pulled toward the eye by what may part two faceted copies of
+/// one surface: 3 pixels' width along the view ray (display refinement keeps a facet's sag about
+/// a pixel) and 2 pixels of the face's own depth slope (more where it turns from the eye).
+fn touch_depth(wp: vec3<f32>, z: f32) -> f32 {
+    let px = min(length(dpdx(wp)), length(dpdy(wp)));
+    let slope = max(abs(dpdx(z)), abs(dpdy(z)));
+    var dir = -u.back.xyz;
+    if (u.eye.w > 0.5) { dir = wp - u.eye.xyz; }
+    let len = length(dir);
+    if (len < 1e-12) { return z; }
+    let c = u.vp * vec4<f32>(wp - dir * (3.0 * px / len), 1.0);
+    if (c.w <= 0.0) { return z; }
+    let pulled = c.z / c.w;
+    if (reversed()) { return clamp(max(pulled, z) + 2.0 * slope, 0.0, 1.0); }
+    return clamp(min(pulled, z) - 2.0 * slope, 0.0, 1.0);
+}
+
 /// Depth of the section plane on the view ray through `wp` (a far wall seen through the cut),
 /// never behind the wall itself (`z`).
 fn cap_depth(wp: vec3<f32>, z: f32) -> f32 {
@@ -305,11 +353,89 @@ fn opaque_depth(i: TOut, front: bool) -> AoDepth {
     return AoDepth(depth, bitcast<u32>(depth));
 }
 
+/// The term for an opaque surface's fragment, on the prepass's depth. A section's cut face has none.
+fn ao_term(i: TOut, front: bool) -> vec4<f32> {
+    if (clipped(i.wp) || length(i.n) < 0.5) { discard; }
+    if (!front && length(u.clip.xyz) > 0.5) { return vec4<f32>(1.0); }
+    return vec4<f32>(occlusion_term(i));
+}
+
+@fragment
+fn fs_ao_term(i: TOut, @builtin(front_facing) front: bool) -> @location(0) vec4<f32> {
+    return ao_term(i, front);
+}
+
+@vertex
+fn vs_ao_blur(@builtin(vertex_index) v: u32) -> @builtin(position) vec4<f32> {
+    let p = vec2<f32>(f32((v << 1u) & 2u), f32(v & 2u));
+    return vec4<f32>(p * 2.0 - 1.0, 0.0, 1.0);
+}
+
+/// The depth map at `p`, reading 0 near and 1 far whichever way the buffer runs.
+fn map_depth(p: vec2<i32>) -> f32 {
+    let at = clamp(p, vec2<i32>(0), vec2<i32>(textureDimensions(ao_depth)) - vec2<i32>(1));
+    let d = bitcast<f32>(textureLoad(ao_depth, at, 0).x);
+    return select(d, 1.0 - d, reversed());
+}
+
+/// The raw term (`ao_map` in this pass) averaged over a 4 x 4 window, which holds every turn of
+/// [`ao_turn`]'s pattern once. A neighbour counts when it lies on this pixel's plane, the slope
+/// taken from the nearer side across each axis, so no surface's shade crosses an edge.
+@fragment
+fn fs_ao_blur(@builtin(position) pos: vec4<f32>) -> @location(0) vec4<f32> {
+    let c = vec2<i32>(pos.xy);
+    let d = map_depth(c);
+    if (d >= 1.0) { return vec4<f32>(1.0); }
+    let left = d - map_depth(c + vec2<i32>(-1, 0));
+    let right = map_depth(c + vec2<i32>(1, 0)) - d;
+    let above = d - map_depth(c + vec2<i32>(0, -1));
+    let below = map_depth(c + vec2<i32>(0, 1)) - d;
+    let dx = select(right, left, abs(left) < abs(right));
+    let dy = select(below, above, abs(above) < abs(below));
+    let tolerance = 1.5 * (abs(dx) + abs(dy)) + 1e-6;
+    let last = vec2<i32>(textureDimensions(ao_map)) - vec2<i32>(1);
+    var sum = 0.0;
+    var weight = 0.0;
+    for (var y = -2; y < 2; y = y + 1) {
+        for (var x = -2; x < 2; x = x + 1) {
+            let p = c + vec2<i32>(x, y);
+            let s = map_depth(p);
+            if (s < 1.0 && abs(s - (d + dx * f32(x) + dy * f32(y))) <= tolerance) {
+                sum = sum + textureLoad(ao_map, clamp(p, vec2<i32>(0), last), 0).x;
+                weight = weight + 1.0;
+            }
+        }
+    }
+    return vec4<f32>(sum / max(weight, 1.0));
+}
+
+/// A pixel's turn of the sample pattern: every 4 x 4 window holds each of 16 turns once.
+fn ao_turn(pos: vec2<f32>) -> f32 {
+    let x = u32(pos.x) & 3u;
+    let y = u32(pos.y) & 3u;
+    // WGSL won't mix shifts and `|` without parentheses; naga takes it, browsers refuse it (#11080).
+    let v = (((x ^ y) & 1u) << 3u) | ((y & 1u) << 2u) | (((x ^ y) >> 1u) << 1u) | (y >> 1u);
+    return (f32(v) + 0.5) / 16.0;
+}
+
+/// The lit pass's occlusion: the blurred term where this point falls in the map, whatever the
+/// window's viewport offset and supersampling.
+fn occlusion(i: TOut) -> f32 {
+    let size = vec2<i32>(textureDimensions(ao_map));
+    // The maps are 1 × 1 stand-ins until a frame draws into them (the product preview draws no
+    // prepass, and AO off releases them): they tell nothing, so leave the surface unoccluded.
+    if (u.ao.x <= 0.0 || length(i.n) < 0.5 || size.x < 2 || size.y < 2) { return 1.0; }
+    let q = u.vp * vec4<f32>(i.wp, 1.0);
+    if (q.w <= 0.0) { return 1.0; }
+    let uv = vec2<f32>(q.x / q.w * 0.5 + 0.5, 0.5 - q.y / q.w * 0.5);
+    return textureLoad(ao_map, clamp(vec2<i32>(uv * vec2<f32>(size)), vec2<i32>(0), size - vec2<i32>(1)), 0).x;
+}
+
 // Cosine-weighted hemisphere samples, the pattern turned by a different angle at each pixel.
 // Projecting the sample and a point one radius toward the eye supplies a depth range in both
 // orthographic and perspective views; distant foreground geometry cannot cast a dark halo onto
 // a background surface.
-fn occlusion(i: TOut) -> f32 {
+fn occlusion_term(i: TOut) -> f32 {
     let radius = u.ao.x;
     if (radius <= 0.0 || length(i.n) < 0.5) { return 1.0; }
     var n = normalize(i.n);
@@ -323,10 +449,9 @@ fn occlusion(i: TOut) -> f32 {
     if (size.x < 2 || size.y < 2) { return 1.0; }
     // The same offsets at every pixel made each sample darken its own shifted copy of a nearby
     // part's outline: faint ghosts of the part where the radius is large on screen (#4167),
-    // stepped bands along contacts where it is small (#3407). Turned by interleaved gradient
-    // noise (Jimenez 2014), neighbouring pixels sample different points and the copies break up
-    // into an even grain.
-    let turn = fract(52.9829189 * fract(dot(i.pos.xy, vec2<f32>(0.06711056, 0.00583715))));
+    // stepped bands along contacts where it is small (#3407). Turned, neighbouring pixels sample
+    // different points, the copies break up into grain, and the blur takes the grain out (#9327).
+    let turn = ao_turn(i.pos.xy);
     let t = tangent * cos(turn * 6.28318531) + bitangent * sin(turn * 6.28318531);
     let b = cross(n, t);
     // One comparison for both depth directions: depths read as 0 near / 1 far (mirrored when
@@ -383,8 +508,13 @@ fn analysis(i: TOut, k: f32) -> vec4<f32> {
         let r = reflect(-v, n);
         var side = cross(v, vec3<f32>(0.0, 0.0, 1.0));
         if (length(side) < 1e-3) { side = vec3<f32>(1.0, 0.0, 0.0); }
-        let s = sin(dot(r, normalize(side)) * u.ana.y * 3.14159265);
-        let c = select(0.08, 0.95, s > 0.0);
+        let x = dot(r, normalize(side));
+        let s = sin(x * u.ana.y * 3.14159265);
+        // A face whose normal lies in the upright plane through the view (every horizontal
+        // face) reflects straight ahead: its sideways part is zero, on the edge between a black
+        // and a white stripe, and rounding picked one or the other from frame to frame while
+        // the view turned (#2153). Straight ahead is white.
+        let c = select(0.08, 0.95, s > 0.0 || abs(x) < 1e-4);
         return out_color(vec4<f32>(vec3<f32>(c), 1.0));
     }
     if (u.ana.x > 4.5) {
@@ -471,10 +601,65 @@ fn shade(i: TOut) -> vec4<f32> {
     return lit(i, 1.0);
 }
 
+fn product_light_unit(v: vec3<f32>) -> vec3<f32> {
+    let scale=max(max(abs(v.x),abs(v.y)),abs(v.z));
+    if scale == 0.0 { return vec3<f32>(0.0,0.0,1.0); }
+    return normalize(v/scale);
+}
+
+// Direction and incident radiance for an unshadowed analytic preview sample.
+fn product_light_sample(k: u32, p: vec3<f32>) -> mat2x3<f32> {
+    let source=u.product_lights[k*4u];
+    let colour=u.product_lights[k*4u+1u];
+    let axis=u.product_lights[k*4u+2u];
+    let falloff=u.product_lights[k*4u+3u];
+    var direction=product_light_unit(source.xyz);
+    var weight=1.0;
+    if source.w > 0.5 {
+        let delta=source.xyz-p;
+        let distance=max(length(delta),falloff.y);
+        direction=product_light_unit(delta);
+        weight=falloff.x/max(distance*distance,0.000001);
+        if source.w == 2.0 {
+            let cosine=dot(product_light_unit(axis.xyz),-direction);
+            var cone=select(0.0,1.0,cosine>=colour.w);
+            if axis.w-colour.w>0.000001 {cone=smoothstep(colour.w,axis.w,cosine);}
+            weight *= cone;
+        }
+        if source.w == 3.0 {weight *= max(dot(product_light_unit(axis.xyz),-direction),0.0);}
+    }
+    return mat2x3<f32>(direction,colour.xyz*weight);
+}
+
 fn lit(i: TOut, visibility: f32) -> vec4<f32> {
     return lit_color(i, visibility, i.c);
 }
 
+/// sRGB to linear light, exact (the straight segment too, which `to_linear` leaves out).
+fn srgb_decode(c: vec3<f32>) -> vec3<f32> {
+    return select(c / 12.92, pow((c + vec3<f32>(0.055)) / vec3<f32>(1.055), vec3<f32>(2.4)), c > vec3<f32>(0.04045));
+}
+
+fn srgb_encode(c: vec3<f32>) -> vec3<f32> {
+    let l = clamp(c, vec3<f32>(0.0), vec3<f32>(1.0));
+    return select(l * 12.92, 1.055 * pow(l, vec3<f32>(1.0 / 2.4)) - vec3<f32>(0.055), l > vec3<f32>(0.0031308));
+}
+
+/// The studio light summed in linear light, encoded once (#7974): the key and the eye fill as in
+/// [`lit_color`], over a sky fill that grows as the face turns up, and the 4% every dielectric
+/// reflects of that sky (a little more toward grazing), so a near-black face keeps a gradient. The sky
+/// and the fill are what ambient occlusion (`visibility`) takes away. sRGB out.
+fn sky_lit(base: vec3<f32>, n: vec3<f32>, diff: f32, fill: f32, visibility: f32) -> vec3<f32> {
+    let up = dot(n, normalize(u.sky.xyz)) * 0.5 + 0.5;
+    let sky = mix(0.18, 0.42, up);
+    // Schlick's rise toward grazing, tempered so mid-tones only gain a soft rim.
+    let fresnel = 0.04 + 0.2 * pow(1.0 - fill, 5.0);
+    let albedo = srgb_decode(base);
+    // Scaled so light and mid-grey faces land near where the sRGB shading puts them.
+    let light = albedo * (0.41 * diff + (0.66 * sky + 0.2 * fill) * visibility) + vec3<f32>(fresnel * sky * visibility);
+    return srgb_encode(light);
+}
+
 /// [`lit`] in a colour of its own: a whole highlighted body is lit in its colour lifted by the
 /// hover amount, or in the selection colour, from the model's own plan triangles.
 fn lit_color(i: TOut, visibility: f32, base: vec4<f32>) -> vec4<f32> {
@@ -485,11 +670,25 @@ fn lit_color(i: TOut, visibility: f32, base: vec4<f32>) -> vec4<f32> {
     let v = normalize(u.back.xyz);
     var n = normalize(i.n);
     if (dot(n, v) < 0.0) { n = -n; }
+    if u.product_lights_meta.x>0.0 {
+        var radiance=vec3<f32>(0.0);
+        for (var k=0u;k<min(u32(u.product_lights_meta.y),21u);k+=1u) {
+            if u.product_lights[k*4u].w == 4.0 {radiance+=to_linear(base.rgb)*u.product_lights[k*4u+1u].xyz/3.141592653589793;continue;}
+            let sample=product_light_sample(k,i.wp);
+            radiance+=to_linear(base.rgb)*sample[1]*(max(dot(n,sample[0]),0.0)/3.141592653589793);
+        }
+        let mapped=radiance/(vec3<f32>(1.0)+radiance);
+        let encoded=select(mapped*12.92,1.055*pow(mapped,vec3<f32>(1.0/2.4))-vec3<f32>(0.055),mapped>vec3<f32>(0.0031308));
+        return out_color(vec4<f32>(encoded,base.a));
+    }
     let key = normalize(v * 0.8 + vec3<f32>(-0.3, 0.2, 0.6));
     let diff = max(dot(n, key), 0.0);
     let fill = max(dot(n, v), 0.0);
     let h = normalize(key + v);
     let spec = pow(max(dot(n, h), 0.0), 40.0) * 0.25;
+    if u.sky.w > 0.5 {
+        return out_color(vec4<f32>(min(sky_lit(base.rgb, n, diff, fill, visibility) + vec3<f32>(spec), vec3<f32>(1.0)), base.a));
+    }
     let k = 0.42 + 0.38 * diff + 0.25 * fill - (0.42 + 0.25 * fill) * (1.0 - visibility);
     return out_color(vec4<f32>(min(base.rgb * k + vec3<f32>(spec), vec3<f32>(1.0)), base.a));
 }
@@ -654,38 +853,96 @@ fn fs_line_all(i: LOut) -> @location(0) vec4<f32> {
     return out_color(i.c);
 }
 
-// Point clouds: each point is a round dot a few pixels across, facing the screen, depth-tested
-// and written like the model's faces, so the model hides the points behind it and they hide it.
-// The colour's alpha carries the dot's size (eighths of a pixel).
+// Point clouds (`view/clouds.rs`): each point is a round dot a few pixels across, facing the
+// screen, depth-tested and written like the model's faces, so the model hides the points behind
+// it and they hide it. The cloud's style colours them by their own colour, a ramp or a palette,
+// and shows only those whose filtered values lie in its ranges or sets.
 
-struct POut {
+struct Cloud {
+    style: vec4<f32>,               // x: colour (0 own, 1 ramp, 2 palette), y: dot size (px), z, w: ramp range
+    filters: array<vec4<f32>, 4>,   // x: kind (0 off, 1 range y…z, 2 whole values y + i for the bits i of w)
+};
+@group(1) @binding(3) var<uniform> cloud: Cloud;
+
+struct CIn {
+    @location(0) p: vec3<f32>,
+    @location(1) v: f32,
+    @location(2) f: vec4<f32>,
+    @location(3) rgb: vec4<f32>,
+};
+
+struct COut {
     @builtin(position) pos: vec4<f32>,
-    @location(0) c: vec4<f32>,
-    @location(1) wp: vec3<f32>,
-    @location(2) at: vec2<f32>,
+    @location(0) wp: vec3<f32>,
+    @location(1) v: f32,
+    @location(2) f: vec4<f32>,
+    @location(3) rgb: vec3<f32>,
+    @location(4) at: vec2<f32>,    // the place on its disc
+    @location(5) @interpolate(flat) has: u32,
 };
 
 @vertex
-fn vs_point(@builtin(vertex_index) vi: u32, @location(0) p: vec3<f32>, @location(1) c: vec4<f32>) -> POut {
+fn vs_cloud_dot(@builtin(vertex_index) vi: u32, i: CIn) -> COut {
     var xs = array<f32, 6>(-1.0, 1.0, 1.0, -1.0, 1.0, -1.0);
     var ys = array<f32, 6>(-1.0, -1.0, 1.0, -1.0, 1.0, 1.0);
     let at = vec2<f32>(xs[vi], ys[vi]);
-    let size = max(c.a * 255.0 / 8.0, 1.0);
-    let centre = u.vp * vec4<f32>(p, 1.0);
-    let half = u.screen.xy * 0.5;
-    var o: POut;
-    o.pos = vec4<f32>(centre.xy + at * size * 0.5 / half * centre.w, centre.z, centre.w);
+    let size = max(cloud.style.y, 1.0);
+    let centre = u.vp * vec4<f32>(i.p, 1.0);
+    var o: COut;
+    o.pos = vec4<f32>(centre.xy + at * size / u.screen.xy * centre.w, centre.z, centre.w);
     // Behind the eye: nothing.
     if (near_z(centre) < 0.0) { o.pos = vec4<f32>(0.0, 0.0, 0.0, -1.0); }
-    o.c = vec4<f32>(c.rgb, 1.0);
-    o.wp = p;
+    o.wp = i.p;
+    o.v = i.v;
+    o.f = i.f;
+    o.rgb = i.rgb.rgb;
+    o.has = u32(round(i.rgb.a * 255.0));
     // Dots under two pixels are squares: a disc that small loses its centre pixel.
     o.at = at * select(1.0, 0.0, size < 2.0);
     return o;
 }
 
-@fragment
-fn fs_point(i: POut) -> @location(0) vec4<f32> {
-    if (clipped(i.wp) || dot(i.at, i.at) > 1.0) { discard; }
-    return out_color(i.c);
+/// Whether filter `f` keeps the value `v`.
+fn cloud_keeps(f: vec4<f32>, v: f32) -> bool {
+    if (f.x < 0.5) { return true; }
+    if (f.x < 1.5) { return v >= f.y && v <= f.z; }
+    let k = i32(round(v)) - i32(round(f.y));
+    return k >= 0 && k < 32 && ((bitcast<u32>(f.w) >> u32(k)) & 1u) != 0u;
+}
+
+fn cloud_ramp(t: f32) -> vec3<f32> {
+    var stops = array<vec3<f32>, 5>(
+        vec3<f32>(40.0, 70.0, 200.0), vec3<f32>(30.0, 170.0, 230.0), vec3<f32>(60.0, 200.0, 90.0),
+        vec3<f32>(240.0, 220.0, 60.0), vec3<f32>(230.0, 70.0, 50.0));
+    let k = clamp(t, 0.0, 1.0) * 4.0;
+    let j = min(u32(k), 3u);
+    return mix(stops[j], stops[j + 1u], k - f32(j)) / 255.0;
+}
+
+fn cloud_palette(v: f32) -> vec3<f32> {
+    var colours = array<vec3<f32>, 10>(
+        vec3<f32>(240.0, 140.0, 40.0), vec3<f32>(245.0, 205.0, 65.0), vec3<f32>(230.0, 65.0, 65.0),
+        vec3<f32>(165.0, 75.0, 190.0), vec3<f32>(65.0, 190.0, 115.0), vec3<f32>(75.0, 150.0, 220.0),
+        vec3<f32>(240.0, 120.0, 180.0), vec3<f32>(140.0, 105.0, 75.0), vec3<f32>(120.0, 215.0, 215.0),
+        vec3<f32>(190.0, 190.0, 80.0));
+    if (v < -0.5) { return vec3<f32>(150.0, 160.0, 176.0) / 255.0; }
+    return colours[u32(round(v)) % 10u] / 255.0;
+}
+
+
+@fragment
+fn fs_cloud(o: COut) -> @location(0) vec4<f32> {
+    var out = clipped(o.wp) || dot(o.at, o.at) > 1.0;
+    for (var k = 0u; k < 4u; k++) {
+        out = out || (((o.has >> k) & 1u) != 0u && !cloud_keeps(cloud.filters[k], o.f[k]));
+    }
+    if (out) { discard; }
+    var c = o.rgb;
+    let mode = cloud.style.x;
+    if ((o.has & 16u) != 0u && mode > 1.5) {
+        c = cloud_palette(o.v);
+    } else if ((o.has & 16u) != 0u && mode > 0.5) {
+        c = cloud_ramp((o.v - cloud.style.z) / max(cloud.style.w - cloud.style.z, 1e-12));
+    }
+    return out_color(vec4<f32>(c, 1.0));
 }

assets/styles/ui/palettes.rs

@@ -75,6 +75,7 @@ impl Tokens {
             font_compass: 13.5,
             font_subtitle: 15.0,
             font_intro: 16.0,
+            font_page_heading: 20.0,
             font_article_heading: 17.0,
             font_title: 22.0,
             font_display: 26.0,
@@ -175,6 +176,8 @@ impl Tokens {
             body: Color32::from_rgb(176, 186, 198),
             body_edge: Color32::from_rgb(40, 44, 52),
             manipulator: Color32::from_rgb(40, 110, 220),
+            joint_manipulator: Color32::from_rgb(235, 157, 0),
+            joint_axis: Color32::from_rgb(0, 95, 110),
             preview_add: Color32::from_rgb(112, 160, 226),
             preview_new: Color32::from_rgb(240, 225, 105),
             preview_sketch: Color32::from_rgb(32, 190, 96),
@@ -193,6 +196,8 @@ impl Tokens {
             sketch_halo: Color32::from_rgb(240, 243, 247),
             sketch_point: Color32::BLACK,
             sketch_locked: Color32::from_rgb(0, 140, 60),
+            // The error red (`error`).
+            sketch_conflict: Color32::from_rgb(214, 54, 54),
             // Sketch dimensions in a plum of their own, apart from the blue and black curves for
             // every colour vision mode (#7861).
             dimension: Color32::from_rgb(130, 42, 110),
@@ -222,6 +227,31 @@ impl Tokens {
             dialog_label: Color32::from_rgb(58, 70, 86),
             selected_ink: Color32::from_rgb(26, 80, 127),
             selected_bg: Color32::from_rgb(232, 241, 250),
+            figure_ground: Color32::from_rgb(247, 248, 250),
+            figure_line: Color32::from_rgb(111, 124, 143),
+            figure_highlight: Color32::WHITE,
+            figure_shadow: Color32::BLACK,
+            figure_face_top: Color32::from_rgb(255, 255, 255),
+            figure_face_left: Color32::from_rgb(228, 233, 240),
+            figure_face_right: Color32::from_rgb(201, 210, 222),
+            figure_card: Color32::from_rgb(255, 255, 255),
+            figure_white: Color32::WHITE,
+            figure_black: Color32::BLACK,
+            figure_accent: Color32::from_rgb(35, 110, 173),
+            figure_reference: Color32::from_rgb(138, 83, 0),
+            figure_axis_x: Color32::from_rgb(214, 69, 69),
+            figure_axis_y: Color32::from_rgb(46, 158, 91),
+            figure_axis_z: Color32::from_rgb(47, 111, 208),
+            figure_ok: Color32::from_rgb(47, 125, 91),
+            figure_warn: Color32::from_rgb(201, 138, 0),
+            figure_conflict: Color32::from_rgb(184, 74, 0),
+            pref_well: Color32::from_rgb(238, 241, 245),
+            pref_note: Color32::from_rgb(183, 74, 0),
+            pref_note_fill: Color32::from_rgb(251, 235, 221),
+            pref_on_accent: Color32::from_rgb(255, 255, 255),
+            pref_ok: Color32::from_rgb(39, 107, 44),
+            pref_ok_fill: Color32::from_rgb(229, 242, 230),
+            pref_disabled: Color32::from_rgb(138, 148, 163),
             timeline_item: Color32::WHITE,
             timeline_item_error: Color32::from_rgb(250, 220, 220),
             timeline_marker: Color32::from_rgb(70, 76, 88),
@@ -341,14 +371,37 @@ impl Tokens {
         t.dialog_label = t.text;
         t.selected_ink = Color32::from_rgb(156, 199, 245);
         t.selected_bg = Color32::from_rgb(42, 70, 110);
+        t.figure_ground = Color32::from_rgb(28, 31, 38);
+        t.figure_line = Color32::from_rgb(163, 174, 194);
+        t.figure_face_top = Color32::from_rgb(107, 119, 144);
+        t.figure_face_left = Color32::from_rgb(81, 91, 114);
+        t.figure_face_right = Color32::from_rgb(57, 66, 86);
+        t.figure_card = Color32::from_rgb(47, 52, 62);
+        t.figure_accent = Color32::from_rgb(140, 190, 245);
+        t.figure_reference = Color32::from_rgb(232, 194, 74);
+        t.figure_axis_x = Color32::from_rgb(242, 122, 122);
+        t.figure_axis_y = Color32::from_rgb(98, 212, 142);
+        t.figure_axis_z = Color32::from_rgb(108, 168, 247);
+        t.figure_ok = Color32::from_rgb(127, 209, 174);
+        t.figure_warn = Color32::from_rgb(232, 194, 74);
+        t.figure_conflict = Color32::from_rgb(240, 162, 122);
+        t.pref_well = Color32::from_rgb(47, 52, 62);
+        t.pref_note = Color32::from_rgb(240, 162, 122);
+        t.pref_note_fill = Color32::from_rgb(74, 51, 38);
+        t.pref_on_accent = Color32::from_rgb(15, 22, 32);
+        t.pref_ok = Color32::from_rgb(127, 209, 174);
+        t.pref_ok_fill = Color32::from_rgb(31, 58, 49);
+        t.pref_disabled = Color32::from_rgb(138, 148, 163);
         t.construction_geom = icon_primary(crate::icon_svg::CONSTRUCTION_PRIMARY[1]);
         t.error = Color32::from_rgb(240, 100, 96);
+        t.sketch_conflict = t.error;
         t.warning = Color32::from_rgb(236, 170, 70);
         t.icon = Color32::from_rgb(208, 214, 226);
         t.timeline = Color32::from_rgb(33, 37, 45);
         t.hover = Color32::from_rgb(54, 61, 74);
         t.hover_edge_halo = Color32::from_rgb(203, 203, 203);
         t.origin_point = Color32::from_rgb(214, 215, 218);
+        t.joint_axis = Color32::from_rgb(110, 240, 250);
         t.viewport_top = Color32::from_rgb(46, 52, 64);
         t.viewport_bottom = Color32::from_rgb(46, 52, 64);
         t.grid = Color32::from_rgb(59, 65, 76);
@@ -413,6 +466,9 @@ impl Tokens {
         }
         t.construction_geom = icon_primary(crate::icon_svg::CONSTRUCTION_RED_GREEN[dark as usize]);
         t.glyph_text = icon_primary(crate::icon_svg::CONSTRAINT_RED_GREEN[dark as usize]);
+        // A deeper red keeps conflicting sketch geometry (#7244) apart from the orange
+        // construction and centerline lines and the crimson lost links for a red-green loss.
+        t.sketch_conflict = Color32::from_rgb(195, 35, 30);
         t.surface_accent = if dark { Color32::from_rgb(200, 135, 55) } else { Color32::from_rgb(164, 80, 0) };
         t.mesh_accent = if dark { Color32::from_rgb(190, 175, 70) } else { Color32::from_rgb(130, 103, 0) };
         t.form_accent = if dark { Color32::from_rgb(165, 135, 220) } else { Color32::from_rgb(115, 73, 205) };
@@ -443,6 +499,9 @@ impl Tokens {
         t.preview_sketch = Color32::from_rgb(125, 180, 105);
         t.glyph_text = icon_primary(crate::icon_svg::CONSTRAINT_BLUE_YELLOW[dark as usize]);
         t.construction_geom = icon_primary(crate::icon_svg::CONSTRUCTION_BLUE_YELLOW[dark as usize]);
+        // Conflicting sketch geometry (#7244) apart from the lost links and the construction and
+        // centerline lines for a blue-yellow loss: darker on the light view, lighter on the dark.
+        t.sketch_conflict = if dark { Color32::from_rgb(255, 170, 160) } else { Color32::from_rgb(165, 15, 30) };
         if dark {
             t.sketch_locked = Color32::from_rgb(140, 225, 110);
             t.box_crossing = Color32::from_rgb(240, 110, 170);

assets/styles/ui/themes/1-bit-dark.json

@@ -1,4 +1,6 @@
 {
+  "order": 76,
+  "provenance": "Original black-and-white palette",
   "base": "dark",
   "colors": {
     "accent": "#ffffff",
@@ -91,6 +93,8 @@
     "icons.highlight": "#000000",
     "icons.marker_halo": "#000000",
     "interference": "#ffffff",
+    "joint_axis": "#ffffff",
+    "joint_manipulator": "#ffffff",
     "logo": [
       "#ffffff",
       "#ffffff",
@@ -142,6 +146,7 @@
     "sketch": "#ffffff",
     "sketch_accent": "#ffffff",
     "sketch_centerline": "#ffffff",
+    "sketch_conflict": "#ffffff",
     "sketch_construction": "#ffffff",
     "sketch_fixed": "#ffffff",
     "sketch_halo": "#000000",

assets/styles/ui/themes/1-bit.json

@@ -1,4 +1,6 @@
 {
+  "order": 75,
+  "provenance": "Original black-and-white palette",
   "base": "light",
   "colors": {
     "accent": "#000000",
@@ -91,6 +93,8 @@
     "icons.highlight": "#ffffff",
     "icons.marker_halo": "#ffffff",
     "interference": "#000000",
+    "joint_axis": "#000000",
+    "joint_manipulator": "#000000",
     "logo": [
       "#000000",
       "#000000",
@@ -142,6 +146,7 @@
     "sketch": "#000000",
     "sketch_accent": "#000000",
     "sketch_centerline": "#000000",
+    "sketch_conflict": "#000000",
     "sketch_construction": "#000000",
     "sketch_fixed": "#000000",
     "sketch_halo": "#ffffff",

assets/styles/ui/themes/akari.json

@@ -1,4 +1,6 @@
 {
+  "order": 220,
+  "provenance": "Maps the Okibi design system",
   "base": "light",
   "colors": {
     "accent": "#c63a00",

assets/styles/ui/themes/amber-phosphor.json

@@ -1,4 +1,6 @@
 {
+  "order": 110,
+  "provenance": "Original SolidCraft theme",
   "base": "dark",
   "colors": {
     "accent": "#ffbc48",

assets/styles/ui/themes/blueprint.json

@@ -1,4 +1,6 @@
 {
+  "order": 120,
+  "provenance": "Original SolidCraft theme",
   "base": "dark",
   "colors": {
     "accent": "#66ddff",