Settle appearance panel scrolling before targeting Search (#6079)

* claim: #6076

* test(render): settle appearance scroll before resolving Search (#6076)

Expanded starter swatches moved under the scenario click while the existing scroll animation was active. Advance 20 deterministic harness frames before resolving the Search handle. No wall-clock sleep, timeout change, assertion deletion or production change. Original native reproduction fails at the empty-state assertion; all 124 scenarios now pass with one pre-existing ignored adhoc entry.

.config/nextest.toml

@@ -1,6 +1,5 @@
 # cargo-nextest settings for CI (`cargo xtask test` does not use nextest).
-# CI builds the tests once and runs them in shards: 2 for a pull request, 4 for main and the nightly
-# (.github/workflows/ci.yml).
+# CI builds the tests once and runs them in one job on a 32 vCPU runner (.github/workflows/ci.yml).
 
 [profile.ci]
 # Heavy tests (one to twelve minutes each on a CI runner) that pull requests skip. They run on
@@ -34,12 +33,14 @@ slow-timeout = { period = "60s" }
 [profile.ci.junit]
 path = "junit.xml"
 
-# The action matrix sample runs its designs in parallel worker processes, one per CPU. Run with
-# other tests beside it (the heavy ones on main), a pi-case hole that takes 8 s alone (#952 makes
-# it a real hole) went past the matrix's 90 s action limit. It runs on its own.
+# The action matrix sample runs its designs in parallel workers (ACTION_MATRIX_JOBS, set to match in
+# ci.yml). Its workers reserve that many of nextest's threads, so the cores are not oversubscribed
+# (a pi-case hole that takes 8 s alone went past the matrix's 90 s action limit when they were),
+# and it starts first, beside the other slow tests.
 [[profile.ci.overrides]]
 filter = "binary(action_matrix) & test(=action_matrix_sample)"
-threads-required = "num-cpus"
+threads-required = 12
+priority = 100
 
 
 # The slowest tests start first, so a shard does not end with one of them running alone on a
@@ -68,3 +69,60 @@ filter = """
 ))
 """
 priority = 100
+
+# Each nextest test has its own process/device. Concurrent cold lavapipe path
+# compiles contend for CPU and can exhaust the 600 s pipeline setup budget.
+# Serialize this module per CI shard; other tests retain their normal parallelism.
+[test-groups.gpu-path]
+max-threads = 1
+
+[[profile.ci.overrides]]
+filter = "package(=solidcraft-gpu) & test(/^path::/)"
+test-group = "gpu-path"
+
+# Full local validation opts into its own scheduling policy. Keep GitHub CI's
+# worker reservation and slow-test priorities above independent of this runner.
+[profile.local-ci]
+inherits = "ci"
+
+[[profile.local-ci.overrides]]
+filter = "binary(action_matrix) & test(=action_matrix_sample)"
+threads-required = "num-cpus"
+priority = 100
+
+[[profile.local-ci.overrides]]
+filter = "(package(solidcraft-engine) & test(=tests::robustness_goldens::seed_81)) | (package(solidcraft-kernel) & test(=tspline::tests::hostile_tsplines_never_panic))"
+priority = 99
+
+[[profile.local-ci.overrides]]
+filter = """
+(package(solidcraft-engine) & (
+    test(/^tests::robustness_goldens::seed_(81|45|20|24|95|02|57|40|18|48|32|46|85|61)$/)
+    | test(/^tests::robustness::/)
+    | test(=tests::hostile_params_never_panic)
+    | test(=cmd::clearance::tests::distances_are_exact_on_edges_and_curved_faces)
+    | test(=cmd::clipboard::tests::a_pasted_coil_joins_the_pasted_body)
+    | test(=tests::pleat_join::the_pleats_join_at_every_wall_from_2_4_to_2_6_mm)
+    | test(=tests::flush_join_loft::a_flange_flush_with_the_end_of_a_bent_tapered_tube_joins)
+    | test(=cmd::sheet::tests::perforated_sheet_takes_a_thousand_round_holes)
+    | test(=boolean_regression_tests::joined_loft_frames_plan_their_display_at_every_quality)
+))
+| (package(solidcraft-engine) & (binary(atomic_commands) | binary(step_export_regressions)))
+| (package(solidcraft-kernel) & (
+    test(=curveblend::tests::rolling_ball_turns_about_a_rounded_corner_of_its_radius)
+    | test(=tests::fillet_tabbed_plate_outer_loop_and_partial_selection_after_hole)
+    | test(=tspline::tests::hostile_tsplines_never_panic)
+    | test(=fill::tests::regular_rims_of_three_to_eight_sides_fill_with_one_face_and_close_the_cup)
+    | test(/^issue_788_tests::equal_bores_crossing_/)
+))
+"""
+priority = 98
+
+# Native Windows shader/device creation must not overlap within the local run.
+[test-groups.windows-gpu]
+max-threads = 1
+
+[[profile.local-ci.overrides]]
+platform = "cfg(windows)"
+filter = "package(solidcraft-gpu) | package(solidcraft) | (package(solidcraft-ui-egui) & test(/(offscreen|gpu)/))"
+test-group = "windows-gpu"

.github/actionlint.yaml

@@ -7,4 +7,5 @@ self-hosted-runner:
     - blacksmith-4vcpu-ubuntu-2404
     - blacksmith-8vcpu-ubuntu-2404
     - blacksmith-16vcpu-ubuntu-2404
+    - blacksmith-32vcpu-ubuntu-2404
     - blacksmith-8vcpu-windows-2025

.github/workflows/ci.yml

@@ -8,12 +8,13 @@
 # whole workspace, as do pushes to main that change code, the nightly run and Run workflow.
 # Documentation, packaging, the other workflows and the GitHub bots' scripts select nothing:
 # no native job runs for them, on pull requests or on main.
-# Tests are built once and run in shards. A few heavy tests (see .config/nextest.toml) are
+# Tests are built and run in one job on a big runner, slowest first, starting beside the repository
+# checks (no archive to upload and download). A few heavy tests (see .config/nextest.toml) are
 # skipped on pull requests and run on pushes to main and nightly. The Windows jobs (D3D12 shaders
 # and app startup), the reference tests and the doc tests run on main and nightly only, not on
 # pull requests (the fast lane, in Select checks); a break there is fixed forward on main. Only
-# main saves the build caches; pull requests restore them. On pull requests the test build and the
-# shards start only after the format and repository checks pass.
+# 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.
 # Otherwise it runs everything.
@@ -29,14 +30,13 @@
 # reads `ci` from the newest run of a commit, so a run without it would block a PR that passed.
 # Cross-compilation is opt-in through Run workflow; release builds remain in release.yml.
 # Every Linux job runs on Blacksmith's Ubuntu 24.04 runners (blacksmith-<N>vcpu-ubuntu-2404), sized
-# per job: 16 vCPU for Build tests, Clippy and the merge queue's test shards, 8 for compiles, the
-# other test shards, doc and reference tests, 4 for the light checks, 2 for Select checks and ci.
+# per job: 32 vCPU for the tests, 16 for Clippy, the archive build (nightly) and the merge queue's, 8 for compiles, doc and reference tests, 4 for the light checks, 2 for Select checks and ci.
 # The Windows shader job runs on Blacksmith's Windows Server 2025 runners (blacksmith-8vcpu-windows-2025);
 # the Windows app startup smoke stays on windows-latest, which has a desktop session that presents frames.
 # Pull requests, forks included, the merge queue, pushes to main and the nightly run all use them:
 # the runners are ephemeral, fork runs get no secrets, and main saves the build caches that every
-# other run restores read-only. The tests are built once (Build tests) into an archive the shards
-# run; Blacksmith's image matches ubuntu-24.04, so the archive and the recorded goldens behave the
+# other run restores read-only. Nightly and by hand, Build tests also makes an archive the matrix
+# jobs run; Blacksmith's image matches ubuntu-24.04, so the archive and the recorded goldens behave the
 # same.
 name: CI
 
@@ -178,9 +178,12 @@ jobs:
             git diff --no-renames --name-only -z "$BASE_SHA...$HEAD_SHA" > "$RUNNER_TEMP/ci-paths"
             while IFS= read -r -d '' path; do
               case "$path" in crates/kernel/*|vendor/truck-*) kernel=true ;; esac
-              # What can change a robustness golden: the kernel and the crates a design is built with.
+              # What a pull request re-checks the goldens for: the kernel, truck and the goldens
+              # themselves (a re-record is checked before it is queued). The goldens are frozen, so
+              # on any other change they would only re-check unchanged results; the merge queue,
+              # main and the nightly run every seed before anything lands.
               case "$path" in
-                crates/kernel/*|crates/engine/*|crates/doc/*|crates/sketch/*|crates/geom/*|vendor/truck-*|tests/robustness/*) goldens=true ;;
+                crates/kernel/*|vendor/truck-*|tests/robustness/*) goldens=true ;;
               esac
               # What the Windows D3D12 jobs exercise: the GPU crate and its shaders, the app and
               # its startup, the viewport's wgpu glue, the vendored egui-wgpu, their scripts.
@@ -277,6 +280,10 @@ jobs:
         run: cargo xtask licences --check
       - name: Dependency layers
         run: cargo xtask layers
+      - name: Universal UI containers
+        run: |
+          cargo xtask ui-containers
+          cargo test -p xtask ui_containers --locked
       - name: Sorted lists
         run: cargo xtask lists
       - name: Design format pending changes
@@ -287,8 +294,8 @@ jobs:
         run: python3 -I scripts/ci/test_affected.py
       - name: Merge-of-main detection self-test
         run: python3 -I scripts/ci/test_main_merge.py
-      - name: Claim and triage bot tests
-        run: node --test scripts/claim/*.test.js scripts/triage/*.test.js
+      - name: Claim, triage and kernel-paused bot tests
+        run: node --test scripts/claim/*.test.js scripts/triage/*.test.js scripts/kernel-paused/*.test.js
 
   # Fast feedback for a pull request that has not been approved for the full CI yet.
   quick-compile:
@@ -337,25 +344,33 @@ jobs:
 
   build-tests:
     name: Build tests
-    # Fail fast on pull requests: the test archive (and so the shards) waits for the repository
-    # checks, the most common cheap failure; heavy jobs used to run on to the end beside a failed
-    # format check. Main, nightly and Run workflow build regardless, so the action matrix and the
-    # property tests that hang off this job keep their signal.
-    needs: [changes, checks]
-    if: ${{ !cancelled() && needs.changes.result == 'success' && needs.changes.outputs.native == 'true' && (github.event_name != 'pull_request' || needs.checks.result == 'success') }}
+    # The archive is for the action matrix and the property tests, which run only nightly and by
+    # hand. Pull requests, the merge queue and main build and run their tests in the `tests` job.
+    needs: changes
+    if: ${{ !cancelled() && needs.changes.result == 'success' && needs.changes.outputs.native == 'true' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
     runs-on: blacksmith-16vcpu-ubuntu-2404
     # Fork builds start from main's cache, read-only; give them room to finish and upload.
     timeout-minutes: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 60 || 45 }}
     env:
       CARGO_INCREMENTAL: "0"
       RUSTC_WRAPPER: sccache
-      SCCACHE_GHA_ENABLED: "true"
-      SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+      SCCACHE_DIR: /home/runner/.cache/sccache
+      SCCACHE_CACHE_SIZE: 20G
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Size parallel compiles to the job's memory
         run: scripts/ci/build-jobs.sh
       - uses: dtolnay/rust-toolchain@stable
+      # sccache lives on a Blacksmith sticky disk (an ext4 volume cloned from the last snapshot,
+      # no 10 GB limit and no download). Only main commits it; pull requests, the merge queue and
+      # forks mount a clone and never write back, so nothing they build can reach main's cache.
+      - name: Mount the compiler cache
+        uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
+        continue-on-error: true
+        with:
+          key: ${{ github.repository }}-sccache-archive
+          path: /home/runner/.cache/sccache
+          commit: ${{ github.ref == 'refs/heads/main' && 'on-change' || 'false' }}
       - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         with:
           key: native-tests
@@ -387,63 +402,94 @@ jobs:
         run: sccache --show-stats
 
   tests:
-    name: Native Linux tests (${{ matrix.shard }}/4)
-    needs: [changes, checks, build-tests]
-    if: ${{ !cancelled() && needs.changes.outputs.native == 'true' && (github.event_name != 'pull_request' || needs.checks.result == 'success') && needs.build-tests.result == 'success' }}
-    runs-on: ${{ github.event_name == 'merge_group' && 'blacksmith-16vcpu-ubuntu-2404' || 'blacksmith-8vcpu-ubuntu-2404' }}
+    name: Native Linux tests
+    needs: changes
+    if: ${{ !cancelled() && needs.changes.result == 'success' && needs.changes.outputs.native == 'true' }}
+    # Builds the tests and runs them in one job on a big runner: there is no archive to upload
+    # and download (3 GB on a full run), and the job starts beside the repository checks, not
+    # after them. nextest hands tests to its threads as they free up, the slowest first (priority
+    # in .config/nextest.toml), so they start at once and no core idles at the end.
+    runs-on: blacksmith-32vcpu-ubuntu-2404
     timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        # Pull requests test their affected crates in 2 shards; main and the nightly use 4.
-        shard: ${{ fromJSON(github.event_name == 'pull_request' && '[1, 2]' || '[1, 2, 3, 4]') }}
     env:
       # Pictures (snapshots, screenshots, ui.render, the viewport's offscreen tests) are drawn on
       # the GPU. The runner has none: Mesa's lavapipe (software Vulkan) draws them, and a test that
       # would skip for want of an adapter fails instead.
       SOLIDCRAFT_GPU: software
       SOLIDCRAFT_REQUIRE_GPU: "1"
+      ACTION_MATRIX_JOBS: "12"
+      CARGO_INCREMENTAL: "0"
+      RUSTC_WRAPPER: sccache
+      SCCACHE_DIR: /home/runner/.cache/sccache
+      SCCACHE_CACHE_SIZE: 20G
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install a software Vulkan driver (lavapipe)
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends mesa-vulkan-drivers libvulkan1
+      - name: Size parallel compiles to the job's memory
+        run: scripts/ci/build-jobs.sh
+      - uses: dtolnay/rust-toolchain@stable
+      # sccache lives on a Blacksmith sticky disk (an ext4 volume cloned from the last snapshot,
+      # no 10 GB limit and no download). Only main commits it; pull requests, the merge queue and
+      # forks mount a clone and never write back, so nothing they build can reach main's cache.
+      - name: Mount the compiler cache
+        uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
+        continue-on-error: true
+        with:
+          key: ${{ github.repository }}-sccache-tests
+          path: /home/runner/.cache/sccache
+          commit: ${{ github.ref == 'refs/heads/main' && 'on-change' || 'false' }}
+      # Main saves the cache; every other run restores it, read-only.
+      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+        with:
+          key: native-tests
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - name: Set up compiler cache
+        uses: mozilla-actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11
+        with:
+          version: v0.16.0
       - uses: taiki-e/install-action@1168f6810a3cb30a3514bf5756a3b7f0422c6df8 # v2.87.28
         with:
           tool: cargo-nextest
-      # Each shard runs the archive the Build tests job made.
-      - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
-        with:
-          name: nextest-archive
       - name: Run tests
         env:
           EVENT_NAME: ${{ github.event_name }}
           GOLDENS: ${{ needs.changes.outputs.goldens }}
-          SHARD: ${{ matrix.shard }}
-          SHARDS: ${{ github.event_name == 'pull_request' && 2 || 4 }}
+          FULL: ${{ needs.changes.outputs.full }}
+          PACKAGES: ${{ needs.changes.outputs.packages }}
           # The robustness golden seeds a pull request skips: each takes one to twenty minutes under
           # CI load, together about four fifths of the goldens' time. Pushes to main, the merge
           # queue and the nightly run every seed.
           SLOW_SEEDS: 81|45|20|24|95|02|57|40|18|48|32|46|85|61|77|34|14
         run: |
-          # Pull requests skip the heavy tests (default-filter in .config/nextest.toml).
-          filter=()
+          # Pull requests skip the heavy tests (default-filter in .config/nextest.toml); `default()`
+          # below is that filter, so a pull request still runs only what it ran before.
+          base='default()'
+          if [ "$EVENT_NAME" = pull_request ]; then
+            # The action matrix sample (about 6 minutes on all cores) runs in the merge queue, on
+            # main and nightly, not on every pull request push.
+            base='default() & not (binary(action_matrix) & test(=action_matrix_sample))'
+          fi
           if [ "$EVENT_NAME" != pull_request ]; then
             # The boolean property tests draw new random inputs every run; they run only in the
             # nightly property-tests job, so a known kernel bug cannot turn main red at random.
-            filter=(--ignore-default-filter -E 'not (package(solidcraft-kernel) & binary(boolean_props))')
+            base='not (package(solidcraft-kernel) & binary(boolean_props))'
           elif [ "$GOLDENS" = true ]; then
             # A pull request that can change a robustness golden (tests/robustness/goldens.json)
             # also checks every seed but the slow ones, in the same run so they share its cores.
-            filter=(--ignore-default-filter -E "default() | (package(solidcraft-engine) & test(/^tests::robustness_goldens::/) & not test(/^tests::robustness_goldens::seed_($SLOW_SEEDS)\$/))")
+            base="(default() & not (binary(action_matrix) & test(=action_matrix_sample))) | (package(solidcraft-engine) & test(/^tests::robustness_goldens::/) & not test(/^tests::robustness_goldens::seed_($SLOW_SEEDS)\$/))"
           fi
           junit=${CARGO_TARGET_DIR:-target}/nextest/ci/junit.xml
           rm -f "$junit"
-          # Extract into ./target: tests that run a built binary (env!("CARGO_BIN_EXE_*")) have
-          # the build job's path, which is the same checkout path here.
-          run=(cargo nextest run --archive-file tests.tar.zst --workspace-remap . --extract-to . --extract-overwrite)
-          if ! "${run[@]}" --profile ci --partition "slice:$SHARD/$SHARDS" --no-tests=pass "${filter[@]}"; then
+          # Pull requests test the affected packages (scripts/ci/affected.py).
+          scope=(--workspace)
+          if [ "$FULL" != true ]; then scope=(); for p in $PACKAGES; do scope+=(-p "$p"); done; fi
+          status=0
+          cargo nextest run "${scope[@]}" --cargo-profile ci --locked --profile ci --no-tests=pass \
+            --ignore-default-filter -E "$base" || status=1
+          if [ "$status" != 0 ]; then
             # A failed golden gets the hint to re-record it (junit.xml lists the failures).
             if [ -f "$junit" ] && tr '\n' ' ' < "$junit" | grep -q '<testcase name="tests::robustness_goldens::[^"]*"[^>]*>[[:space:]]*<failure'; then
               echo "::error::A robustness golden changed. If the new result is intended, re-record it in this pull request and say why:"
@@ -451,11 +497,14 @@ jobs:
             fi
             exit 1
           fi
+      - name: Compiler cache statistics
+        if: always()
+        run: sccache --show-stats
       - name: Upload test timings
         if: always()
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
-          name: junit-${{ matrix.shard }}
+          name: junit
           path: ${{ env.CARGO_TARGET_DIR || 'target' }}/nextest/ci/junit.xml
           retention-days: 7
 
@@ -560,13 +609,23 @@ jobs:
     env:
       CARGO_INCREMENTAL: "0"
       RUSTC_WRAPPER: sccache
-      SCCACHE_GHA_ENABLED: "true"
-      SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+      SCCACHE_DIR: /home/runner/.cache/sccache
+      SCCACHE_CACHE_SIZE: 20G
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Size parallel compiles to the job's memory
         run: scripts/ci/build-jobs.sh
       - uses: dtolnay/rust-toolchain@stable
+      # sccache lives on a Blacksmith sticky disk (an ext4 volume cloned from the last snapshot,
+      # no 10 GB limit and no download). Only main commits it; pull requests, the merge queue and
+      # forks mount a clone and never write back, so nothing they build can reach main's cache.
+      - name: Mount the compiler cache
+        uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
+        continue-on-error: true
+        with:
+          key: ${{ github.repository }}-sccache-doc
+          path: /home/runner/.cache/sccache
+          commit: ${{ github.ref == 'refs/heads/main' && 'on-change' || 'false' }}
       # Main saves the cache; every other run restores it, read-only.
       - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         with:
@@ -608,13 +667,23 @@ jobs:
     env:
       CARGO_INCREMENTAL: "0"
       RUSTC_WRAPPER: sccache
-      SCCACHE_GHA_ENABLED: "true"
-      SCCACHE_IGNORE_SERVER_IO_ERROR: "1"
+      SCCACHE_DIR: /home/runner/.cache/sccache
+      SCCACHE_CACHE_SIZE: 20G
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Size parallel compiles to the job's memory
         run: scripts/ci/build-jobs.sh
       - uses: dtolnay/rust-toolchain@stable
+      # sccache lives on a Blacksmith sticky disk (an ext4 volume cloned from the last snapshot,
+      # no 10 GB limit and no download). Only main commits it; pull requests, the merge queue and
+      # forks mount a clone and never write back, so nothing they build can reach main's cache.
+      - name: Mount the compiler cache
+        uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
+        continue-on-error: true
+        with:
+          key: ${{ github.repository }}-sccache-oracle
+          path: /home/runner/.cache/sccache
+          commit: ${{ github.ref == 'refs/heads/main' && 'on-change' || 'false' }}
       # Main saves the cache; every other run restores it, read-only.
       - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         with:
@@ -746,6 +815,7 @@ jobs:
           DOCTESTS: ${{ needs.changes.outputs.doctests }}
           CLIPPY: ${{ needs.clippy.result }}
           BUILD: ${{ needs.build-tests.result }}
+          EVENT_NAME: ${{ github.event_name }}
           TESTS: ${{ needs.tests.result }}
           DOCS: ${{ needs.doc-tests.result }}
           ORACLE: ${{ needs.oracle.result }}
@@ -760,7 +830,10 @@ jobs:
           fi
           if [ "$NATIVE" = true ]; then
             test "$CLIPPY" = success
-            test "$BUILD" = success
+            # The archive for the action matrix and property tests exists nightly and by hand only.
+            if [ "$EVENT_NAME" = schedule ] || [ "$EVENT_NAME" = workflow_dispatch ]; then
+              test "$BUILD" = success
+            fi
             test "$TESTS" = success
           fi
           if [ "$DOCTESTS" = true ]; then

.github/workflows/kernel-paused.yml

@@ -0,0 +1,42 @@
+# 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).
+name: Kernel paused
+
+on:
+  issues:
+    types: [opened]
+  # pull_request_target so PRs from forks can be labelled. It runs the base branch's
+  # scripts/kernel-paused and only lists the PR's changed paths; the PR's code is never checked out.
+  pull_request_target:
+    types: [opened]
+  discussion:
+    types: [created]
+
+permissions:
+  contents: read # to check out scripts/kernel-paused
+  issues: write
+  pull-requests: read # to list a PR's changed paths
+  discussions: write
+
+concurrency:
+  group: kernel-paused-${{ github.event.issue.number || github.event.pull_request.number || github.event.discussion.number }}
+  cancel-in-progress: false
+
+jobs:
+  paused:
+    name: Kernel paused bot
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          sparse-checkout: scripts/kernel-paused
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const paused = require('./scripts/kernel-paused/kernel-paused.js');
+            const done = context.eventName === 'discussion'
+              ? await paused.handleDiscussion({ github, context })
+              : await paused.handleOpened({ github, context });
+            core.info(done);

.github/workflows/release.yml

@@ -203,6 +203,8 @@ jobs:
     name: Snap ${{ matrix.arch }}
     needs: [version, linux]
     if: needs.version.outputs.build == 'true'
+    # The Snap Store hasn't accepted SolidCraft yet, so a snap failure never holds up a release.
+    continue-on-error: true
     # Repackages the Linux job's tarball, like the Flatpak. On 24.04 because the core24 base is
     # Ubuntu 24.04, which lets snapcraft build on the runner itself (--destructive-mode).
     runs-on: ${{ matrix.runner }}

.gitignore

@@ -7,6 +7,7 @@
 /.claude/worktrees/
 /target-snapshot
 __pycache__/
+.vscode/
 
 # cargo-mutants output (docs/mutation-testing.md)
 mutants.out*/

AGENTS.md

@@ -33,9 +33,11 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
   and calls through its function pointers), two functions in
   `apps/solidcraft/src/open_documents.rs` (macOS hands Finder files only to an Objective-C
   method), the Windows-only `apps/solidcraft/src/native_crash.rs` (the exception filter that
-  records crashes inside native code such as graphics drivers) and the Windows-only
+  records crashes inside native code such as graphics drivers), the Windows-only
   `apps/solidcraft/src/native_frame.rs` (the window procedure that answers the resize-border hit
-  test of the window without OS decorations).
+  test of the window without OS decorations) and the Windows-only
+  `apps/solidcraft/src/space_mouse/windows_hid.rs` (asks Plug and Play which HID interfaces are 3D
+  mice, so no other device is sent anything).
 - **Errors are `Result<T, E>`** through the crate's error type and `?`. An unfinished feature
   returns an error ("not supported yet: …"); it never panics.
 - **Input-derived numbers are hostile** (command parameters, design files, control-channel
@@ -88,6 +90,14 @@ People trust SolidCraft with their designs; a crash loses their work. **This out
   egui/eframe/winit/wgpu/rfd. **The UI crate is swappable.** Only `crates/kernel` may use `truck`.
 - **The UI is thin**: panels read engine state and act through `app.run(id, params)` /
   `app.start(id)`. Colours come from `theme::Tokens`.
+- **One outer UI container**: all panels, floating sheets, menus, overlays and platform UI
+  windows use `ui_kit::Container` (directly or through `Panel`, `Window`, `Confirm`, `Menu`).
+  Declare the semantic `Surface`; workspace panels use its shared layout policy and chrome.
+  System/report windows use `ui_kit::Window`; its low-level host builder is kit-private.
+  Do not construct raw egui hosts, outer popup/window frames or shadows in feature modules.
+  `cargo xtask ui-containers` recursively checks source/examples in all current and future crates
+  and apps. It runs in the fast repository CI job and `cargo xtask ci`, with no caller allowances.
+  See `docs/ui-container-audit.md` for the inventory and legitimate content/native exceptions.
 - **One set of camera controls**: every page or canvas with a camera (viewport, Render
   preview, future flat pattern or drawing pages) calls `navigation::handle` with its `NavCaps`
   (orbit off for flat 2D pages). New canvases must use `navigation::handle`; never hand-roll

ATTRIBUTION.md

@@ -14,8 +14,21 @@ Editable drawing code, native projects and shipped exports are collected under `
 
 | File | Author | Source | Licence |
 |---|---|---|---|
+| examples/chebyshev-motion-trace.json | SolidCraft contributors | Original parametric Chebyshev lambda mechanism and associative-trace demo, constructed from analytic circle intersections; classical link proportions documented at https://doi.org/10.1002/rcs.70095; no external CAD geometry or artwork | MIT OR Apache-2.0 |
+| examples/material-card.json | SolidCraft contributors | original analytic box and explicitly synthetic engineering card; invented illustrative constants, no external material dataset | MIT OR Apache-2.0 |
+| examples/studio/author_sweep.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/author_scene.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/materials.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded-sweep.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded-render.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/stage1-sweep.json | SolidCraft contributors | original tangent circular-arc CAD cyclorama; no external assets | MIT OR Apache-2.0 |
+| examples/studio/stage1.json | SolidCraft contributors | original editable CAD studio scene; no imported geometry or external image assets | MIT OR Apache-2.0 |
+| examples/studio/stage1-render.json | SolidCraft contributors | original studio camera and lighting parameters | MIT OR Apache-2.0 |
 | examples/render-studio.json | SolidCraft contributors | original procedural box/cylinder enclosure script for the integrated Render workspace | MIT OR Apache-2.0 |
 | examples/render-opaque-studio.json | SolidCraft contributors | original procedural sphere study varying opaque metal fraction and roughness independently; no external assets or engineering data | MIT OR Apache-2.0 |
+| examples/render-path-studio.json | SolidCraft contributors | original procedural opaque enclosure, teal insert and metal fasteners for progressive rendering; no imported models | MIT OR Apache-2.0 |
+| crates/gpu/src/path/path.wgsl | SolidCraft contributors | original software BVH traversal and path integration using the existing SolidCraft surface/studio equations; no external shader source | MIT OR Apache-2.0 |
 | crates/gpu/src/pbr.rs | SolidCraft contributors | original WGSL translation of SolidCraft's opaque surface and fixed studio reference, embedded as Rust source; no external shader code | MIT OR Apache-2.0 |
 | assets/icons/app/macos/source/SolidCraft.icon/icon.json | SolidCraft contributors | approved Icon Composer composition and appearance settings for the original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/app/macos/source/SolidCraft.icon/Assets/02-grid.svg | SolidCraft contributors | original perspective grid with elliptical radial alpha, exported from VectorCraft | MIT OR Apache-2.0 |
@@ -24,6 +37,8 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/app/macos/exports/Assets.car | SolidCraft contributors | Apple actool compilation of assets/icons/app/macos/source/SolidCraft.icon for macOS; contains original artwork only | MIT OR Apache-2.0 |
 | assets/archive/icons/macos-v1/source/icon.vectorcraft | SolidCraft contributors | retained editable historical VectorCraft source, with named face and background layers; redundant exports retired | MIT OR Apache-2.0 |
 | assets/icons/app/macos/exports/icon.icns | SolidCraft contributors | macOS fallback compiled by Apple's actool from the approved assets/icons/app/macos/source/SolidCraft.icon composition | MIT OR Apache-2.0 |
+| assets/models/test_boat.bin | 3DBenchy.com | 3DBenchy.com | Public Domain |
+| assets/models/make_test_boat.py | SolidCraft contributors | original script that packs a model into the compact file above | MIT OR Apache-2.0 |
 | docs/screenshots/class-a-blend.png | SolidCraft contributors | screenshot of SolidCraft itself: two boxes bridged by `surface.blend` (a 40x10 sheet, `solidcraft-cli snapshot` of plan/evidence script ev_blend) | MIT OR Apache-2.0 |
 | docs/screenshots/class-a-crown.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch crowned with `surface.patch crown=0.3` over a saddle rim (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
 | docs/screenshots/class-a-boundary.png | SolidCraft contributors | screenshot of SolidCraft itself: a patch through two sketch lines built by `surface.boundary` with `crown: 0.4` (`solidcraft-cli snapshot`) | MIT OR Apache-2.0 |
@@ -52,9 +67,28 @@ Editable drawing code, native projects and shipped exports are collected under `
 | docs/book/src/generated/enclosure.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/enclosure.json`; gitignored) | MIT OR Apache-2.0 |
 | docs/book/src/generated/revolve.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/revolve.json`; gitignored) | MIT OR Apache-2.0 |
 | docs/book/src/generated/sheet-metal.png | SolidCraft contributors | rendered by `cargo xtask book` (`solidcraft-cli snapshot docs/book/scripts/sheet-metal.json`; gitignored) | MIT OR Apache-2.0 |
+| assets/fonts/ibm-plex-mono/IBMPlexMono-Regular.ttf | IBM Corp. (IBM Plex Mono) | https://github.com/IBM/plex (via google/fonts), unmodified; licence text in assets/fonts/ibm-plex-mono/OFL.txt; the interface monospace font | SIL OFL 1.1 |
+| assets/fonts/ibm-plex-sans/IBMPlexSans-Variable.ttf | IBM Corp. (IBM Plex Sans, variable wdth and wght) | https://github.com/IBM/plex (via google/fonts), unmodified; licence text in assets/fonts/ibm-plex-sans/OFL.txt; the default interface font | SIL OFL 1.1 |
 | 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 |
+| 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 |
+| tests/step-conformance/cylinder_inch.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_nurbs.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_placed.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_seam.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_twice.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/dome.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/dome_nurbs.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/far_cylinder.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/grooved_shaft.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/plate_100_holes.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/sheet_disc.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/tiny_pin.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/torus_ring_nurbs.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/washer.step | step-conformance contributors | generated from formulas by https://github.com/dan335/step-conformance (corpus/generated, 96f30bb); import regression fixture | CC0-1.0 |
 | tests/oracle/17-loft/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/17-loft/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
 | tests/oracle/23-bracket-multifeature/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/23-bracket-multifeature/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
 | tests/oracle/28-blind-pocket-fillets/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/28-blind-pocket-fillets/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
@@ -75,9 +109,11 @@ Editable drawing code, native projects and shipped exports are collected under `
 | tests/oracle/61-shaft-keyway/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/61-shaft-keyway/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
 | tests/oracle/63-hinge-knuckle/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/63-hinge-knuckle/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
 | tests/oracle/65-sketch-gear-tooth/reference.stl | SolidCraft contributors | triangulation of our own recipe (tests/oracle/65-sketch-gear-tooth/recipe.json) built with FreeCAD as an external tool by tools/freecad-oracle | MIT OR Apache-2.0 |
-
 | assets/appearances/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
+| assets/appearances/starter_pack.rs | SolidCraft contributors | original illustrative optical recipes, authored scalar values and future procedural resource descriptors; no measured or external material dataset | 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/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 |
 | assets/icons/app/linux/exports/hicolor/128x128/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
 | assets/icons/app/linux/exports/hicolor/16x16/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
@@ -87,7 +123,7 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/app/linux/exports/hicolor/48x48/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
 | assets/icons/app/linux/exports/hicolor/512x512/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
 | assets/icons/app/linux/exports/hicolor/64x64/apps/ai.storyteller.solidcraft.png | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
-| assets/icons/app/shared/source/app_icon.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
+| assets/icons/app/shared/source/app_icon.rs | SolidCraft contributors | Original SolidCraft drawing code: the borderless mark, drawn from the faces and gradients of assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg | MIT OR Apache-2.0 |
 | assets/icons/app/shared/source/windows_ico.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/icons/app/windows/exports/solidcraft-executable.ico | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
 | assets/icons/app/windows/exports/solidcraft.ico | SolidCraft contributors | Generated from assets/icons/app/shared/source/app_icon.rs with the original CLI/ICO encoders | MIT OR Apache-2.0 |
@@ -98,21 +134,28 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/locales/cs.json | potuzai | Czech translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/da.json | SolidCraft contributors | Original Danish translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/de.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
+| assets/locales/en-GB.json | SolidCraft contributors | English (UK): the English catalog's messages whose spelling differs, in UK spelling | MIT OR Apache-2.0 |
 | assets/locales/en.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/locales/es.json | jawler | Spanish (Spain) translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/fr.json | rlartot | French translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/gl.json | Pablo López (pablopeza) | Galician translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
+| assets/locales/hu.json | SolidCraft contributors | Original Hungarian translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
+| assets/locales/id.json | SolidCraft contributors | Original Indonesian translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/it.json | SolidCraft contributors | Original Italian translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/ja.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/locales/ko.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/locales/ms.json | A.Hakim (a-hakim) | Malay translation of the English message catalog | MIT OR Apache-2.0 |
+| assets/locales/nl.json | SolidCraft contributors | Original Dutch translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/pl.json | cyryllo | Polish translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/ru.json | Alex Pro (del000) | Russian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
+| assets/locales/sv.json | SolidCraft contributors | Original Swedish translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/pt-BR.json | DuBearte | Brazilian Portuguese translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
+| assets/locales/ro.json | SolidCraft contributors | Original Romanian translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/locales/tr.json | macrulz54 | Turkish translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/uk.json | Igor Bronovskyi (BrunIF) | Ukrainian translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/vi.json | vandang890615 | Vietnamese translation of the English catalog, contributed upstream | MIT OR Apache-2.0 |
 | assets/locales/zh.json | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
+| assets/locales/zh-TW.json | SolidCraft contributors | Original Traditional Chinese (Taiwan) translation of SolidCraft's English catalog; no commercial CAD text used | MIT OR Apache-2.0 |
 | assets/materials/library.rs | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | assets/platforms/linux/ai.storyteller.solidcraft.desktop | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
 | assets/platforms/linux/ai.storyteller.solidcraft.metainfo.xml.in | PhotoCraft / SolidCraft contributors | PhotoCraft packaging templates (https://github.com/storytold/photocraft), adapted for SolidCraft | Apache-2.0 |
@@ -129,6 +172,20 @@ Editable drawing code, native projects and shipped exports are collected under `
 | 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 |
+| assets/styles/ui/themes/green-phosphor.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/amber-phosphor.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/blueprint.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/one-dark.json | SolidCraft contributors | original SolidCraft theme file with colours adapted from the One Dark palette (Atom One Dark by GitHub Atom, https://github.com/atom/atom, MIT) | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/tokyo-night.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Tokyo Night by enkia, https://github.com/enkia/tokyo-night-vscode-theme, MIT) | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/solarized-light.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Solarized by Ethan Schoonover, https://github.com/altercation/solarized, MIT) | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/nord.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Nord by Sven Greb and the Nord contributors, https://github.com/nordtheme/nord, MIT) | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/high-contrast.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/graphite.json | SolidCraft contributors | original SolidCraft theme file | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/nosferatu.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Dracula by Zeno Rocha and the Dracula Theme contributors, https://github.com/dracula/dracula-theme, MIT) | MIT OR Apache-2.0 |
+| assets/styles/ui/themes/catppuccin-mocha.json | SolidCraft contributors | original SolidCraft theme file adapting the colours of a published palette (Catppuccin by the Catppuccin organisation, https://github.com/catppuccin/catppuccin, MIT) | MIT OR Apache-2.0 |
 | assets/styles/web/loading-logo.svg | SolidCraft contributors | Animation of the SolidCraft mark, built from the paths and gradients of assets/icons/app/macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg; original animation | MIT OR Apache-2.0 |
 | assets/styles/web/loading.css | SolidCraft contributors | Original SolidCraft resource data or drawing code, collected without redesign | MIT OR Apache-2.0 |
 | crates/io/src/native_cad/fixtures/block.FCStd | SolidCraft contributors | original 10 × 20 × 30 mm test box saved by FreeCAD 1.1.4 run as an external program (`make_block_fcstd.py` beside it); no third-party geometry | MIT OR Apache-2.0 |
@@ -137,6 +194,10 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/palette.toml | SolidCraft contributors | icon colour roles (light and dark) and accents, original SolidCraft data | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/bug_report.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/chevron.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/chevron_right.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/close.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/disclosure_closed.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/disclosure_open.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/fit.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/folder.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/help.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
@@ -145,11 +206,17 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/svg/flat/moon.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/nav_settings.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/orbit.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/plus.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/pan.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/perspective.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/redo.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/save.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/settings.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_keyboard.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_monitor.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_mouse.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_palette.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/settings_plug.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/spin.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/style.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/flat/undo.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
@@ -230,7 +297,7 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/svg/model/export.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/extend.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/extrude.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
-| assets/icons/ui/design/svg/model/eye.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/eye.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/fastener.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/fillet.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/filter.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
@@ -281,6 +348,17 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/svg/model/perforate.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/pipe.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/silhouette.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/assistant.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/agent_link.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/offset_two_sides.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/offset_symmetric.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/import_tray.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/export_tray.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/send.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/stop.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/shield.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/status_recovery.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/model/frame_member.svg | SolidCraft contributors | original icon master (64 grid) | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/placeholder.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/plane.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/plane_angle.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
@@ -332,7 +410,7 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/svg/model/status_error.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/status_warning.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/stitch.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
-| assets/icons/ui/design/svg/model/suppress.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
+| assets/icons/ui/design/svg/flat/suppress.svg | SolidCraft contributors | single-colour application/navigation icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/surface.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/svg.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
 | assets/icons/ui/design/svg/model/sweep.svg | SolidCraft contributors | two-tone modelling icon master (64 grid), original SolidCraft artwork | MIT OR Apache-2.0 |
@@ -416,6 +494,7 @@ Editable drawing code, native projects and shipped exports are collected under `
 | assets/icons/ui/design/tools/lint_icons.py | SolidCraft contributors | icon lint, status page or preview tool (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
 | assets/icons/ui/design/tools/preview.py | SolidCraft contributors | icon lint, status page or preview tool (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
 | assets/icons/ui/design/tools/review_state.py | SolidCraft contributors | icon review state helper (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
+| assets/icons/ui/design/requested_icons.txt | SolidCraft contributors | Runtime icon requests collected by the headless menu audit, original SolidCraft data | MIT OR Apache-2.0 |
 | assets/icons/ui/design/review.json | SolidCraft contributors | icon review state (accepted icons and notes), original SolidCraft data | MIT OR Apache-2.0 |
 | assets/icons/ui/design/tools/author/lib.py | SolidCraft contributors | icon authoring script (standard-library Python), original SolidCraft code | MIT OR Apache-2.0 |
 
@@ -463,9 +542,9 @@ crates/engine/src/tests/gltf_import.rs); no third-party models are committed.
 ## FreeCAD and Rhino import library
 
 FreeCAD `.FCStd` and Rhino `.3dm` files are read with [cadmpeg](https://github.com/cadmpeg/cadmpeg)
-0.6.1 (Apache-2.0), linked as the crates `cadmpeg-core`, `cadmpeg-ir`, `cadmpeg-registry`,
+0.6.3 (Apache-2.0), linked as the crates `cadmpeg-core`, `cadmpeg-ir`, `cadmpeg-registry`,
 `cadmpeg-container`, `cadmpeg-codec-freecad`, `cadmpeg-codec-rhino` and `cadmpeg-codec-step`
-in native builds (`crates/io/src/native_cad.rs`). Only those open-format codecs are built: no
+in native and browser builds (`crates/io/src/native_cad.rs`). Only those open-format codecs are built: no
 default features, so cadmpeg's codecs for commercial CAD formats and its ShapeManager/ACIS
 codec are not compiled in. Its licence text is in THIRD-PARTY-LICENSES.txt; no code from it is
 copied into SolidCraft.
@@ -480,6 +559,12 @@ copied into SolidCraft.
 
 | Directory | Source | Licence | Changes |
 |---|---|---|---|
+| examples/studio/author_sweep.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/author_scene.py | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/materials.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded-sweep.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded-render.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-exploded.json | SolidCraft contributors | original editable CAD scene and authoring metadata; no external assets | MIT OR Apache-2.0 |
 | 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) |
@@ -498,3 +583,75 @@ A frame whose meshes the GPU refuses to stage (device lost or out of memory) is
 skipped with a warning instead of panicking (#1469).
 Paint callbacks are prepared only after a drawable is acquired, so a skipped
 surface frame cannot strand cached meshes without their GPU initialization.
+
+## Runtime studio lighting mathematics
+
+`crates/gpu/src/path/path.wgsl` implements the power-heuristic estimator from the
+mathematical description in [PBRT fourth edition, section 13.4](https://pbr-book.org/4ed/Light_Transport_I_Surface_Reflection/A_Better_Path_Tracer).
+No PBRT code or assets were copied. `crates/render/src/job/lighting.rs` evaluates
+[Krzysztof Narkowicz's published 2016 ACES rational fit](https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/)
+using its published coefficients (author licenses the fit under CC0/MIT).
+These original implementations are under SolidCraft's MIT OR Apache-2.0 licence.
+
+## Original coffee framing variant
+
+| File | Author | Provenance | Licence |
+|---|---|---|---|
+| examples/studio/author_coffee_framing.py | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-framing.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-framing-sweep.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-framing-render.json | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-framing.md | SolidCraft contributors | original editable composition, camera and documentation; no external assets | MIT OR Apache-2.0 |
+
+## Original cylindrical coffee housing variant
+
+| File | Author | Provenance | Licence |
+|---|---|---|---|
+| examples/studio/author_coffee_cylinder.py | SolidCraft contributors | original parametric cylindrical CAD construction and editable command recipes; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-cylinder.json | SolidCraft contributors | original cylindrical housing on the original exploded coffee composition; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-cylinder-sweep.json | SolidCraft contributors | original cylindrical housing and continuous CAD cyclorama; no external assets | MIT OR Apache-2.0 |
+| examples/studio/coffee-cylinder-render.json | SolidCraft contributors | original camera, studio lighting and optical settings retained from the framing variant | MIT OR Apache-2.0 |
+| examples/studio/coffee-cylinder.md | SolidCraft contributors | original dimensional recipe, provenance and validation limitations | MIT OR Apache-2.0 |
+
+## Runtime environment sampling
+
+`crates/render/src/lighting/environment.rs` and the environment/sun portions of
+`crates/gpu/src/path/path.wgsl` are original SolidCraft implementations of
+solid-angle importance sampling and MIS, informed by the mathematical description
+in [PBRT fourth edition, sections 12.5](https://pbr-book.org/4ed/Light_Sources/Infinite_Area_Lights)
+and [13.4](https://pbr-book.org/4ed/Light_Transport_I_Surface_Reflection/A_Better_Path_Tracer).
+The procedural gradient and inline RGBE test fixtures are original mathematical
+colours, not downloaded imagery. No third-party environment images or shader code
+are included. Licence: MIT OR Apache-2.0.
+
+## Original tumbler showcase assets
+
+The CAD room, tumblers, window opening, wood/weave patterns and RGBE sky below
+are original SolidCraft contributor work. No third-party scene, photograph, HDRI,
+texture, or AI-generated artwork was used. Python authoring sources are included.
+All listed files use the repository MIT OR Apache-2.0 licence.
+
+| File | Source / author | Use | License |
+| --- | --- | --- | --- |
+| examples/studio/author_showcase.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/author_tumblers.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/textures/ATTRIBUTION.md | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/textures/author_textures.py | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/textures/environment-manifest.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/textures/manifest.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-hdr-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-hdr-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-materials.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-sun-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-sun-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-sun-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-sun.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-textures-blocked-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers-textures-render.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+| examples/studio/tumblers.json | Original SolidCraft contributors | Editable scene / runtime resource / reproducible authoring metadata | MIT OR Apache-2.0 |
+
+The original studio generators produce local ignored PNG maps and an RGBE gradient.
+Generated image bytes are not source assets; their authorship, licences and expected
+hashes are documented under `examples/studio/textures`. Rendered evidence belongs
+on the results branch. No photographs, scans or external image assets are included.

CONTRIBUTING.md

@@ -15,6 +15,15 @@ Before choosing a task, check the [command inventory](docs/features.md) and
 
 Questions, ideas or want to say what you're working on? Join the [Discord](https://discord.gg/FtU4NQNVDH).
 
+## 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.
+
 ## Get it running (about 10 minutes on a fast machine)
 
 You need stable Rust 1.95 or newer (required by egui/eframe 0.36). For the web
@@ -199,7 +208,7 @@ Check that validation after merging. They are listed in
 `.config/nextest.toml` and the [testing page](docs/book/src/dev/testing.md):
 
 - `solidcraft-engine`: `tests::hostile_params_never_panic`, everything in `tests::robustness` and
-  the seeds of `tests::robustness_goldens` (`seed_00` … `seed_95`; pull requests matching the workflow's geometry paths run all but the slowest, `SLOW_SEEDS` in `ci.yml`),
+  the seeds of `tests::robustness_goldens` (`seed_00` … `seed_95`; pull requests that change the kernel, truck or the goldens run all but the slowest, `SLOW_SEEDS` in `ci.yml`),
   `pattern_suppress_tests::enclosure_arc_extinction_keeps_a_real_sharp_inner_lip_after_resize_and_reopen`,
   `pattern_suppress_tests::enclosure_datums_follow_wall_height_and_board_depth_with_material_proofs`,
   `cmd::plastic::tests::enclosure_snap_fit_follows_resized_front_wall`, the `atomic_commands` contract tests

Cargo.lock

@@ -590,9 +590,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
 [[package]]
 name = "cadmpeg-codec-freecad"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5257265c2549cf59a8457b3c7aadcc96c95abe20205232553766993a808812"
+checksum = "3c4a8fa61748cbb3ce80838b00a8cebfe553460583941f5aba6e2b97c16b4d37"
 dependencies = [
  "cadmpeg-container",
  "cadmpeg-core",
@@ -601,14 +601,14 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "zip 8.6.0",
+ "zip",
 ]
 
 [[package]]
 name = "cadmpeg-codec-rhino"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d88b42fb91c7e5af4c75c0433029771f7e3233a0b72ec3d0b2e5ff2c72bed07"
+checksum = "d7af41440d4c1d69e88e612de02cc3c9bad79d03429531e640ac924fef53c6bf"
 dependencies = [
  "cadmpeg-container",
  "cadmpeg-core",
@@ -625,53 +625,53 @@ dependencies = [
 
 [[package]]
 name = "cadmpeg-codec-step"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e83a52258c129a683f77fb360ca30af54ae34339625ad890be12621128a5811c"
+checksum = "35e1b6d17cf26b31f59f2edab8ef5c29d2a33216c581fd913f012ad4869bd559"
 dependencies = [
  "base64",
  "cadmpeg-container",
  "cadmpeg-core",
  "cadmpeg-ir",
  "encoding_rs",
+ "serde",
  "serde_json",
  "thiserror 2.0.21",
- "zip 8.6.0",
+ "zip",
 ]
 
 [[package]]
 name = "cadmpeg-container"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c110508cd9155e905f52906de505dfd42dc70a0321f5e90b5f68c28ba207686e"
+checksum = "5ab7bcef48ac7480b4917820272d85cd2c9533e17904e15b0e4d22f19a6045bd"
 dependencies = [
  "cadmpeg-core",
  "crc32fast",
  "flate2",
- "zip 8.6.0",
- "zstd 0.14.2",
+ "zip",
 ]
 
 [[package]]
 name = "cadmpeg-core"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b1147e51a74e7c52da5b393a0344597238cdc622fac6443eb2fd526759f6fa"
+checksum = "e86bb7a40521832504bb1f5953a1c706b2c52aad73bf6d84e1b35e5cb0beae3f"
 dependencies = [
  "flate2",
  "memchr",
  "roxmltree",
+ "ruzstd",
  "serde",
  "serde_json",
  "thiserror 2.0.21",
- "zstd 0.14.2",
 ]
 
 [[package]]
 name = "cadmpeg-ir"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71ff19f019f013d97e353bb802c5d2e253c2859aaa5422009aa933dc2f2e7dbc"
+checksum = "b570a1a8c579e407a9fd7bb10fa1900f8827f1d578b8fcb4ea2a056b5f323c72"
 dependencies = [
  "base64",
  "cadmpeg-core",
@@ -684,9 +684,9 @@ dependencies = [
 
 [[package]]
 name = "cadmpeg-registry"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66046f1a694926707bea8944f861e699964b04c68972708588f97e14ccee3c5d"
+checksum = "b2be23469a9bca0b684f1811118fffb581ebd32ded08e6cc8b0716a41f8c1377"
 dependencies = [
  "cadmpeg-codec-freecad",
  "cadmpeg-codec-rhino",
@@ -996,6 +996,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.8"
@@ -2271,6 +2280,16 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "keyboard-types"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d"
+dependencies = [
+ "bitflags 2.13.2",
+ "serde",
+]
+
 [[package]]
 name = "keyring"
 version = "3.6.3"
@@ -2480,6 +2499,24 @@ dependencies = [
  "pxfm",
 ]
 
+[[package]]
+name = "muda"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4340e89c178916e62879c5c36b7f699019369be413e496178a6983ce91b8bc03"
+dependencies = [
+ "crossbeam-channel",
+ "dpi",
+ "keyboard-types",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "png",
+ "thiserror 2.0.21",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "multiversion_no_op"
 version = "1.0.0"
@@ -3749,6 +3786,15 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
+[[package]]
+name = "ruzstd"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e4ce4a039f42bf25920b95667e4d789e98749ab11bbb8d2c2936f788421bb5"
+dependencies = [
+ "twox-hash",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -4162,7 +4208,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "block2 0.6.2",
  "eframe",
@@ -4172,6 +4218,7 @@ dependencies = [
  "hidapi",
  "keyring",
  "log",
+ "muda",
  "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
@@ -4193,13 +4240,14 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-3dx-client"
-version = "0.17.0"
+version = "0.21.0"
 
 [[package]]
 name = "solidcraft-cli"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "image",
+ "log",
  "serde_json",
  "solidcraft-engine",
  "solidcraft-gpu",
@@ -4208,7 +4256,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-derive"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4217,7 +4265,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-doc"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "log",
  "serde",
@@ -4234,7 +4282,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-engine"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "log",
  "schemars",
@@ -4253,7 +4301,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-geom"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -4262,11 +4310,13 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-gpu"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
+ "image",
  "log",
  "naga",
  "pollster 0.4.0",
+ "robust",
  "serde",
  "serde_json",
  "solidcraft-engine",
@@ -4279,7 +4329,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-io"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "cadmpeg-core",
  "cadmpeg-ir",
@@ -4297,12 +4347,12 @@ dependencies = [
  "solidcraft-geom",
  "solidcraft-kernel",
  "thiserror 2.0.21",
- "zip 9.0.4",
+ "zip",
 ]
 
 [[package]]
 name = "solidcraft-kernel"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "log",
  "proptest",
@@ -4322,7 +4372,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-mcp"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "serde_json",
  "solidcraft-engine",
@@ -4331,7 +4381,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-render"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "image",
  "moxcms",
@@ -4345,7 +4395,7 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-sketch"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -4356,14 +4406,14 @@ dependencies = [
 
 [[package]]
 name = "solidcraft-space-mouse"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "solidcraft-ui-egui"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "arboard",
  "egui",
@@ -4371,7 +4421,9 @@ dependencies = [
  "image",
  "log",
  "minisign-verify",
+ "nix 0.31.3",
  "pollster 0.4.0",
+ "proc-macro2",
  "semver",
  "serde",
  "serde_json",
@@ -4379,17 +4431,18 @@ dependencies = [
  "solidcraft-engine",
  "solidcraft-gpu",
  "solidcraft-space-mouse",
+ "syn 2.0.119",
  "tiny-skia",
  "toml",
  "ttf-parser",
  "web-time",
  "winreg",
- "zip 9.0.4",
+ "zip",
 ]
 
 [[package]]
 name = "solidcraft-web"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
  "eframe",
  "egui",
@@ -4838,6 +4891,12 @@ version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 
+[[package]]
+name = "twox-hash"
+version = "2.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86a801b3cea342a06d468c8710662aa29e5e05e4f5c0d62f00bbb7f2ad7941c2"
+
 [[package]]
 name = "type-map"
 version = "0.5.1"
@@ -5919,10 +5978,12 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
 
 [[package]]
 name = "xtask"
-version = "0.17.0"
+version = "0.21.0"
 dependencies = [
+ "proc-macro2",
  "serde_json",
  "sha2 0.10.9",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -6210,20 +6271,6 @@ dependencies = [
  "syn 3.0.6",
 ]
 
-[[package]]
-name = "zip"
-version = "8.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b"
-dependencies = [
- "crc32fast",
- "flate2",
- "indexmap",
- "memchr",
- "typed-path",
- "zstd 0.13.3",
-]
-
 [[package]]
 name = "zip"
 version = "9.0.4"
@@ -6263,52 +6310,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "zstd"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-dependencies = [
- "zstd-safe 7.3.0",
-]
-
-[[package]]
-name = "zstd"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057cfd910cfac363a0ada849592624b4c9ff2e10bef504c3433810d78ed96f93"
-dependencies = [
- "zstd-safe 8.1.0",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d80649ab6db9d9f6f9c80a40becd948eda4714a0a5ac8c4d157a32231c7882"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "8.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd44c6a7284e91f3717755b24315a302edd9153a01f753c3cba3d765e8eafac"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.1.1+zstd.1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeec9eaf2dffbbd09201e23bd0ffcbaa33bb8e9266a10734fd7ed90a85eca078"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
 [[package]]
 name = "zune-core"
 version = "0.5.3"

Cargo.toml

@@ -5,7 +5,7 @@ members = ["crates/*", "apps/*", "xtask"]
 exclude = ["vendor"]
 
 [workspace.package]
-version = "0.17.0"
+version = "0.21.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -67,17 +67,20 @@ encoding_rs = "0.8"
 # read by crates/io itself, so no image decoding or file access comes with it.
 gltf = { version = "1.4", default-features = false, features = ["names"] }
 
-# FreeCAD and Rhino import (Apache-2.0, pure Rust apart from zstd; native builds only).
+# FreeCAD and Rhino import (Apache-2.0, pure Rust; native and browser builds).
 # Pinned: its IR and codec APIs change between minor versions. Open formats only: no default
 # features, so cadmpeg's codecs for commercial formats (f3d, sldprt, inventor, catia, creo, nx)
 # and its ShapeManager/ACIS `sat` codec are not compiled in. `step` is the writer we restate through.
-cadmpeg-core = "=0.6.1"
-cadmpeg-ir = "=0.6.1"
-cadmpeg-registry = { version = "=0.6.1", default-features = false, features = ["fcstd", "rhino", "step"] }
+cadmpeg-core = "=0.6.3"
+cadmpeg-ir = "=0.6.3"
+cadmpeg-registry = { version = "=0.6.3", default-features = false, features = ["fcstd", "rhino", "step"] }
 
 # fonts (sketch text outlines; MIT OR Apache-2.0, pure Rust)
 ttf-parser = { version = "0.25", default-features = false, features = ["std"] }
 
+# Ends a process group with the system call (MIT; already in the tree through zip).
+nix = { version = "0.31", default-features = false, features = ["signal"] }
+
 # images
 image = { version = "0.25", default-features = false, features = ["png", "hdr"] }
 png = "0.18.1"

README.md

@@ -41,6 +41,11 @@
   <a href="https://github.com/tangency-labs/solidcraft/stargazers"><img src="https://img.shields.io/github/stars/tangency-labs/solidcraft?style=flat" alt="Stars" /></a>
 </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>
+</p>
+
 ![SolidCraft 0.8: 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-0.8.gif)
 
 *A Raspberry Pi 4 case from an empty design: a sketch dimensioned with the board's parameters, extrude, fillet, shell, the rim rounded in one pick, an M2.5 standoff patterned on the 58 × 49 mm hole rectangle, port cut-outs, vent slots, "Pi 4" engraved in DejaVu Sans Bold and a PETG material defined in the design, with its mass in Properties, then height 24 → 32 mm in Parameters and it all rebuilds. 9× playback. [Full video](https://github.com/tangency-labs/solidcraft/raw/refs/heads/main/docs/screenshots/demo-0.8.mp4), recorded with the [demo script](examples/demo/record_ui.sh).*

ROADMAP.md

@@ -50,12 +50,12 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
 | # | Milestone | Status | Hours left |
 |---|---|---|---|
 | M0 | Vertical slice | done | — |
-| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Constructive sketch solving (Owen 1991, Fudos & Hoffmann 1997) ahead of the numerical solver: points and rigid clusters are placed on the branch the sketch had, so dimension edits and drags keep their solution; edits that would turn a sketch over are refused; drags re-solve only the sketch per frame. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
-| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
+| M1 | Sketch depth: command coverage implemented — projection/intersect/include as linked geometry (auto-project on faces, lost-reference warnings, break link), full SKETCH create/modify set (slots, polygons, tangent arcs/circles, ellipse, fit/control splines, conic, text, trim/extend/break, fillet/chamfer, offset, mirror, patterns, move/scale, blend curve, centerline), constraints incl. curvature and polygon with over-constraint refusal, Shift-picked line midpoints in Horizontal/Vertical using persisted points and ordinary constraints (#2087), driven/arc-length/linear-diameter dimensions, AutoConstrain, DXF/SVG insert, 3D sketch curves (Project To Surface, Intersection Curve, Isoparametric Curve, Spun Profile), exact free-form profiles (B-spline/NURBS edges, any spline degree, curves cut by crossings), sweeps and pipes along 3D sketch curves, canvases and decals, curvature combs. Exact free-form Extend and certified associative offsets now preserve geometry and IDs through edits, deletion and reopen. Occurrence-frame 3D wires now store explicit coordinate spaces and retain points and analytic fits through moves, refresh, undo and reopen. Constructive sketch solving (Owen 1991, Fudos & Hoffmann 1997) ahead of the numerical solver: points and rigid clusters are placed on the branch the sketch had, so dimension edits and drags keep their solution; edits that would turn a sketch over are refused; drags re-solve only the sketch per frame. Remaining workflow repairs: mixed offset junctions, legacy natural-spline seams, and damaged legacy wire links lacking frame provenance | in progress | 4 |
+| M2 | Robust modelling: coplanar booleans in the kernel, holes (placed on faces, at distances from reference edges, and on sketch points), threads (cosmetic, then modelled), patterns, mirror, shell, draft, split, construction geometry | in progress | 16 |
 | M3 | General fillets and chamfers (curved edges, chains, vertex blends); saddle rolling-ball surfaces now use continuous seam sections and arc-length fitting with shared contact boundaries and bounded accuracy checks; tiny rim edges remain selected instead of nearby wall seams when filleting (#2498) | in progress | 30 |
-| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), FreeCAD/Rhino solids through cadmpeg (done, desktop and CLI), 3MF export and 3MF/STL import as mesh bodies (done), 3MF with B-rep face tags ([docs/formats/3mf-face-tags.md](docs/formats/3mf-face-tags.md), done), constant-section parametric mesh reconstruction, DXF sketches, OBJ import | in progress | 6 |
+| M4 | Files: STEP import (done — [docs/step-import.md](docs/step-import.md)), FreeCAD/Rhino solids through cadmpeg (done, desktop, browser and CLI), 3MF export and 3MF/STL import as mesh bodies (done), 3MF with B-rep face tags ([docs/formats/3mf-face-tags.md](docs/formats/3mf-face-tags.md), done), constant-section parametric mesh reconstruction, DXF sketches, OBJ import | in progress | 6 |
 | M5 | Persistent naming of faces and edges (docs/book/src/dev/naming.md): faces named from their exact kernel-reported history (sketch curve sides, caps, revolve sections, primitive sides, blends, shell inner walls, pattern/mirror copies; split pieces told apart by the faces around them, lumps of a cut body named after their faces), edges by their faces; fillets/chamfers, sketches on faces, shell/draft/offset/replace faces, hole placements, joint origins and face appearances resolve by name first and warn when the entity split or vanished: done. sheet metal edges by base sketch line and flange side, shell inner faces, sweep and loft roles: done. kernel-reported face history: done (merged faces answer to every name; operations without history yet fall back to geometric names, flagged unverified; format 14 keeps older designs' geometric names). Left: history through sheet metal, plastic, surface and emboss features; FaceSource certificates through history | in progress | 20 |
-| M6 | UI depth: selection feedback and origin (done), timeline editing (done: hover and selection highlight modifier faces, including fillets and chamfers; edit feature, history marker drag, dependency-checked single and multi-item reorder, suppress, rename, delete with dependents, re-resolved references; redefining selections refreshes persistent edge/face references while retaining feature identity and dimension names; optional compact named left feature history with rollback bar, multi-selection and persistent folders above the parts browser), right-docked dialogs (done), live previews for every feature dialog (done), keyboard-first commands with on-canvas value boxes and sketch inline dimensions (done), drag manipulators with automatic join/cut (done: extrude incl. two sides, fillet, shell, hole depth, move, pattern spacing, revolve rotator, extrude taper), dark theme (done), right-click menu with Repeat (done), measure tool (done), section analysis (done), selection filter (done), drag-solve of sketch points (done); appearance controls now preserve body/face/component targeting, named transparent looks, reuse/search and override removal; preferences | in progress | 6 |
+| M6 | UI depth: selection feedback and origin (done), timeline editing (done: hover and selection highlight modifier faces, including fillets and chamfers; edit feature, history marker drag, dependency-checked single and multi-item reorder, suppress, rename, delete with dependents, re-resolved references; redefining selections refreshes persistent edge/face references while retaining feature identity and dimension names; responsive feature history with width-driven icons/names/title, snapping width resize, bottom/left/browser-stack docking, shared-column collapse, rollback bar, multi-selection and persistent folders), right-docked dialogs (done), live previews for every feature dialog (done), keyboard-first commands with on-canvas value boxes and sketch inline dimensions (done), drag manipulators with automatic join/cut (done: extrude incl. two sides, fillet, shell, hole depth, move, pattern spacing, revolve rotator, extrude taper), dark theme (done), right-click menu with Repeat (done), measure tool (done), section analysis (done), selection filter (done), drag-solve of sketch points (done); appearance controls now preserve body/face/component targeting, named transparent looks, reuse/search and override removal; preferences | in progress | 6 |
 | M7 | Thin extrude (walls along open or closed curves: centre, inside, outside or two sides; mitred corners, crossing walls joined; #721), sweep, loft (incl. to a point), rib and web (to next / depth), emboss (planar faces and exact radial emboss/deboss of bounded orthogonal profiles on complete exterior cylinders/sleeves), thread (cosmetic, and modelled M3–M20 outside and inside: the ISO profile screwed in as a faceted cut), coil (smooth B-spline helical walls), pipe, pattern on path, patterns of bodies and components, replace face (parallel), align, remove, feature copy/paste: done. Unique eligible cylindrical targets are inferred for new Emboss features. Left: general curved-face emboss and exact (unfaceted) modelled threads | in progress | 12 |
 | M8 | Surface workspace (#772). Done: Patch (sketch regions; edge loops filled G0, plus `crown`), Stitch, Thicken (planes and cylinders), Extend (straight edges of planar surfaces), Trim (by a plane, a face or sketch curves swept onto the surface, keeping a side or the picked regions; mutual trim of two surfaces, extended to meet and stitched, #767), Delete Face (healing), Boundary Fill, zebra/draft/curvature-map analysis, Surface Extrude/Revolve/Sweep/Loft from open and closed curves, Offset, Unstitch and Reverse Normal; the continuity-driven core (`kernel/src/bridge.rs`, G0–G3 Hermite rows) with **Blend** (`surface.blend`, #764: edge chains along one or several faces, closed rims paired seam to seam or from picked seams, a dialog), **Match** (`surface.match`), **Boundary** (`surface.boundary`, #763 — two sketch curves exact with G0–G3, three or four as the flat patch of their loop, and curve networks: Coons and Gordon surfaces through sketch, 3D-sketch or edge curves, a point for a three-sided side, G1/G2 against the faces along one direction's edges, joined into their body on request; G1/G2 on two sides that meet at a corner waits for the Gregory-type corner), **Fair** (`surface.fair`, CV fairing), **continuity analysis** (`inspect.continuity`, #770; a toolbar tool with edge markers and a legend, and curvature combs along face isocurves) and a multi-section **loft** with per-end continuity and crown, and guide rails on solid and surface lofts (one or two, scaling or stretching the sections between; #201). Also in the Class-A pass: G1…G4 blend curves in the sketch, chord and variable-radius fillets on curved edges (with honest refusals where the fit cannot hold), and a G2 corner patch where filleted edges meet (kernel; the command refuses until the patch's sections can be sewn to the blends' contacts). Left: bias/form-factor fillet sections (design recorded), a Gregory-type corner, surface Fillet between separate surface bodies (#769), Ruled (#762), Untrim (#761), curved-face Extend (#760), and every remaining #757–#772 item | deferred | — |
 | M9 | Components and assemblies: New Component / Create Components from Bodies, active component, per-component origin/bodies/sketches/timeline entries, occurrences with transforms, Copy/Paste vs Paste New, nested Browser tree with visibility and isolate; Ground, Move/Copy of occurrences, joints (rigid, revolute, slider, cylindrical, pin-slot, planar, ball) by joint origins with limits and Drive Joints, closed kinematic loops (four-bar, slider-crank: the loop's other joints follow the driven one on its branch, and driving stops where a loop can no longer close), cams (`joint.cam`: a revolute cam drives a slider or revolute follower along a closed sketch profile or the cam's edges, knife, roller or flat followers, worked out again when the profile changes; drives, studies, closed loops, contact sets), As-built Joint, Rigid Group, Contact Sets (driving and motion studies stop where bodies in a set would pass through each other), Motion Study (joint values keyed along a timeline, playback, export of occurrence positions as JSON/CSV), motion analysis (joint values and a point's path charted over a study as value, velocity and acceleration; the parts that collide along a study, with the steps where they do), Exploded views (automatic or by hand, shown without changing placements); interference, per-component physical properties; STEP with assembly structure; URDF export for robot simulators (links with meshes, mass and inertia; joint chains whose values match Drive Joints; docs/urdf.md). Physical properties now measure material-aware component/occurrence placements, descendants and repeated instances, including pending moves and body reassignment offsets; contact geometry and automatic exploded centres respect those offsets. Groundwork done: component tree, occurrences with transforms (instances, Paste New), world placement, active component as authoring frame, ground, Capture/Revert Position, moving bodies and sketches. UI: ASSEMBLE panel dialogs for New Component, Joint (snaps on faces, edges, circles and vertices; animated motion preview; offsets, flip, limits), As-built Joint, Joint Origin, Rigid Group, Drive Joints (live slider), Motion Link, Cam and Interference (overlaps shown red); joints in the timeline and the Browser | in progress | 32 |
@@ -64,13 +64,22 @@ PCB / Package, Render, Animation, Simulation, Manufacture/CAM, Drawings.
 | M12 | Release: cross-platform packages, verification and deliberate publication implemented; original current-UI demo refreshed. Trusted distribution signing and broader performance work remain | in progress | 16 |
 | M14 | Configurations: a table of rows (parameter expressions and feature suppressions per row) switched with config.activate (undoable, all or nothing), kept through parameter renames and feature deletes (config.configure, config.table, config.column/row/activate). Per-row body materials and appearances (library looks, custom colour/opacity and clearing overrides), undoable activation and save/reopen: done. Ordered typed configuration rules, atomic validation and structured rule editing: done. Component appearance and certified semantic face style columns, atomic preview/apply and independent-copy remapping: done. Exact constructed sketch-side and immutable imported-face lineage now preserve legacy names and reject retargeting. Left: ambiguous shifted/two-sided caps | in progress | 4 |
 | M13 | Never lose work: atomic saves (temporary file, flush, rename; a crash at any moment leaves the old file or the new one) with the replaced version kept as `<file>.bak`; autosave of unsaved changes to the recovery folder every 5 minutes (preference) and after big operations, only when something changed; "Recover unsaved design?" on the next launch (`doc.recovery_list`, `doc.recover`, `doc.recovery_discard`); a kill-mid-save test (process killed while saving a 0.5 MB design 25 times). File format: `"format": "solidcraft/12"`, older formats upgraded step by step (`doc::format`), newer ones refused with a message, out-of-range numbers and broken placements refused; a corpus of designs saved by M0, components-era, joints-era and current builds (apps/solidcraft-cli/tests/corpus) that must open and evaluate as saved; damaged and hostile variants (truncation, bit flips, hostile values, removed keys, repeated features, deep nesting) never panic | done | 6 |
+| M15 | Frames and weldments (#4003): structural members along 2D and 3D sketch lines, butt and mitre corners, trim to faces and bodies, end caps, gussets, cosmetic welds and a cut list. Done: the profile library (`frame.profile.list`, `frame.profile.properties`, `frame.profile.insert`): bar, round bar, rectangular and round tube, angle, channel and I-beam, each SolidCraft's own parametric definition with exact fillet arcs and exact section properties (area, centroid, second moments), tested against hand-computed values; members (`frame.member`): one body per straight line of a 2D or 3D frame sketch, following parameter edits, with a built-in profile (its dimensions parameter expressions) or a profile sketch (its drawn material by alternating nested loops), anchor, angle and mirror; each member's name kept with its line. Left: corners, trims, end caps, gussets, welds, cut list, FRAME tab and dialogs | in progress | 60 |
 
 M6 navigation preferences include **Touchpad**: Shift + pointer movement pans, Alt/Option +
 pointer movement orbits without a mouse button, and vertical scrolling zooms. Other presets
 retain their saved two-finger scroll preference; camera motion is available through
 `view.navigate` and modifier-aware `ui.move` automation.
+With the **Fusion** preset and two-finger pan enabled, two fingers pan and Shift + two fingers
+orbit freely, with pinch zoom and mouse bindings unchanged. The shared navigation handler
+applies the same gestures to model and Render views and blocks orbit on flat pages.
 
-M11 precursor: File → Export Current View as DXF exports shown placed bodies from the current
+UI redesign (#2016): the File/start view (#2027) uses shared light/dark navigation,
+action tiles, recent rows and sample cards, with recovery review and Save As/Export
+entry points. Document loading, sample caches and recovery safety retain their
+existing command paths.
+
+M11 precursor: File → Export Current View as DXF exports shown placed bodies and sketches from the current
 camera as a 2D millimetre drawing, with hidden edges omitted or dashed. Vector occlusion splits
 partly hidden edges and includes curved silhouettes. Repeated part meshes and triangle
 hierarchies are shared; bounded desktop preparation and occlusion use up to eight workers.
@@ -134,6 +143,12 @@ completed drawings publish atomically. The browser still exports synchronously.
 
 ## Render foundation
 
+- Original starter appearances (#1722): 34 opaque recipes through existing commands, with six explicitly unavailable glass recipes and preserved legacy looks; see [the contract](docs/render-starter-appearances.md).
+
+- Bounded linear film accumulation (#1696) supplies caller-admitted mean/variance storage and complete-pass views; actual progressive consumers remain separate. See [the film contract](docs/render-film.md).
+
+- Definition-local visual mapping (#1214) supplies a bounded numerical frame, physical repeat coordinates and a deterministic one-time grain-axis suggestion. It adds no saved record or texture consumer; see [the mapping contract](docs/render-visual-mapping.md).
+
 - Explicit texture normalization (#1218) produces completed float RGBA with
   role-aware linear color/data semantics, bounded matrix/TRC ICC conversion and
   opt-in EXIF orientation. It retains high-precision raw samples and records lossy
@@ -329,8 +344,25 @@ completed drawings publish atomically. The browser still exports synchronously.
 - Saved projections from a removed strip retain their geometry and report the lost
   reference. Explicitly reselect the wall to repair that projection.
 
+## Workspace layouts (#2029)
+
+- General preferences save Floating or Compact using the universal UI containers.
+  Compact joins the workspace selector and ribbon, docks the content-hugging Browser
+  flush beneath them with a square join, and opens tool sheets below the compass.
+  Sheets remain draggable, rounding all corners away from their right dock; footer
+  backgrounds follow the same corners. A separate preference hides ribbon icon labels
+  for a shorter ribbon in either layout.
+  Assistant keeps the outermost edge and History keeps its chosen dock. Switching
+  retains the active tool, camera, selection and design; system windows and menus
+  keep their existing behavior.
+
 ## View navigation
 
+- Navigation has an opt-in Free orbit preference for mouse and 3D-mouse rotation through
+  both poles with roll. It defaults off, preserving existing preset snapping and pole limits.
+  The SolidWorks face menu offers Normal to Selection (`view.normal_to`), shared with Look At
+  and Ctrl+8, including repeat-to-flip, preserving scale and projection.
+
 - Desktop Ctrl/Cmd +/- and 0 change or reset the saved UI scale. The scale slider keeps
   its layout stable during a drag and applies the selected scale on release.
 
@@ -561,6 +593,10 @@ completed drawings publish atomically. The browser still exports synchronously.
   continuous collision detection; local thin walls and small details remain limitations.
   See [contact-set limits and recovery](docs/contact-sets.md).
 
+## Assembly dragging
+
+The design's first part is grounded when it is made, and a left-button drag repositions a free part (`occurrence.drag`: one undo step, exact occurrence paths including repeated jointed definitions, any floating-chain member carries the chain, grounded parts and joints hold where present, Escape cancels).
+
 ## 3D sketch bridges
 
 3D sketch drawing snaps to points on other visible sketch planes without flattening them onto

apps/solidcraft-cli/Cargo.toml

@@ -23,6 +23,7 @@ path = "src/alias.rs"
 solidcraft-engine = { workspace = true }
 solidcraft-gpu = { workspace = true }
 solidcraft-mcp = { workspace = true }
+log = { workspace = true }
 serde_json = { workspace = true }
 
 [dev-dependencies]

apps/solidcraft-cli/examples/studio_evidence.rs

@@ -0,0 +1,102 @@
+//! Reproducible evidence through the production command/job interfaces.
+//! Usage: studio_evidence RECIPE.json RENDER-PARAMS.json OUTPUT.png
+//! Writes the editable design, command timings and actual adapter/job metadata beside PNG.
+use serde_json::{Value, json};
+use solidcraft_engine::{
+    Session,
+    render::job::{CpuHost, ErrorCode, JobId, Phase},
+};
+use std::{
+    io::Read,
+    path::Path,
+    time::{Duration, Instant},
+};
+
+fn read_json(path: &str) -> Result<Value, String> {
+    let mut bytes = Vec::new();
+    std::fs::File::open(path).map_err(|e| format!("{path}: {e}"))?.take(16_777_217).read_to_end(&mut bytes).map_err(|e| e.to_string())?;
+    if bytes.len() > 16_777_216 {
+        return Err("evidence input exceeds 16 MiB".into());
+    }
+    serde_json::from_slice(&bytes).map_err(|e| format!("{path}: {e}"))
+}
+
+fn run() -> Result<(), String> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let [recipe_path, params_path, output_path] = args.as_slice() else {
+        return Err("usage: studio_evidence RECIPE.json RENDER-PARAMS.json OUTPUT.png".into());
+    };
+    let output = Path::new(output_path);
+    if !output.extension().is_some_and(|e| e.eq_ignore_ascii_case("png")) {
+        return Err("output must have a .png extension".into());
+    }
+    let recipe = read_json(recipe_path)?;
+    let params = read_json(params_path)?;
+    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 generation_seconds = generation_start.elapsed().as_secs_f64();
+    let design_path = output.with_extension("solidcraft");
+    session.execute("file.save_as", &json!({"path":design_path})).map_err(|e| e.to_string())?;
+    let scene = solidcraft_engine::product_scene::extract(&session).map_err(|e| e.to_string())?;
+    let bodies: Vec<Value> = scene
+        .meshes
+        .iter()
+        .map(|mesh| json!({"name":mesh.name,"vertices":mesh.mesh.positions.len(),"triangles":mesh.mesh.triangles.len()}))
+        .collect();
+    drop(scene);
+
+    let policy = solidcraft_gpu::select::Policy::from_env().map_err(|e| e.to_string())?;
+    let (adapter, adapter_report) = solidcraft_gpu::select::pick(policy).ok_or("no adapter satisfies the requested GPU policy")?;
+    let host_start = Instant::now();
+    session.set_render_job_host(Some(CpuHost::for_platform().map_err(|e| e.to_string())?)).map_err(|e| e.to_string())?;
+    session.register_render_job_host(solidcraft_gpu::path::host_on_adapter(&adapter).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
+    let host_seconds = host_start.elapsed().as_secs_f64();
+    let preflight = session.execute("render.preflight", &params).map_err(|e| e.to_string())?;
+    let start = Instant::now();
+    let started = session.execute("render.start", &params).map_err(|e| e.to_string())?;
+    let id: JobId = serde_json::from_value(started.get("job").cloned().ok_or("missing job id")?).map_err(|e| e.to_string())?;
+    let handle = session.render_job_handle(id).map_err(|e| e.to_string())?;
+    eprintln!("Rendering through production gpu-path host: {adapter_report:?}");
+    let status = loop {
+        match handle.wait_timeout(Duration::from_secs(10)) {
+            Ok(status) => break status,
+            Err(error) if error.code == ErrorCode::TimedOut && start.elapsed() < Duration::from_secs(3600) => {
+                let status = handle.status().map_err(|e| e.to_string())?;
+                eprintln!(
+                    "Render progress: {:?} {}/{} after {:.1}s",
+                    status.progress.phase,
+                    status.progress.done,
+                    status.progress.total,
+                    start.elapsed().as_secs_f64()
+                );
+            }
+            Err(error) => {
+                let _ = handle.cancel();
+                return Err(error.to_string());
+            }
+        }
+    };
+    let render_and_encode_seconds = start.elapsed().as_secs_f64();
+    if status.progress.phase != Phase::Completed {
+        return Err(status.error.map_or_else(|| "render did not complete".into(), |e| e.to_string()));
+    }
+    let exported = session.execute("render.export", &json!({"job":id,"path":output_path,"overwrite":true})).map_err(|e| e.to_string())?;
+    let report = json!({
+        "recipe":recipe_path,"render_params":params,"adapter":adapter_report,
+        "environment":{"SOLIDCRAFT_GPU":std::env::var("SOLIDCRAFT_GPU").ok(),"WGPU_BACKEND":std::env::var("WGPU_BACKEND").ok()},
+        "cad_generation_seconds":generation_seconds,"gpu_host_setup_seconds":host_seconds,
+        "render_and_encode_seconds":render_and_encode_seconds,
+        "timing_scope":"wall time from render.start through completed PNG encoding; includes job preparation and readback, excludes CAD generation and initial GPU pipeline setup",
+        "bodies":bodies,"commands":commands,"command_timings":command_timings,
+        "preflight":preflight,"export":exported,"editable_design":design_path
+    });
+    std::fs::write(output.with_extension("json"), serde_json::to_vec_pretty(&report).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
+    println!("{}", serde_json::to_string_pretty(&report).map_err(|e| e.to_string())?);
+    Ok(())
+}
+
+fn main() -> Result<(), String> {
+    run()
+}

apps/solidcraft-cli/src/bench_agent.rs

@@ -36,8 +36,9 @@ impl Script {
         );
     }
 
+    /// A part placed after it is built: free, even as the design's first part (#2804).
     fn component(&mut self, name: &str) {
-        self.c("component.create", json!({"name": name}));
+        self.c("component.create", json!({"name": name, "grounded": false}));
     }
 
     fn root(&mut self) {

apps/solidcraft-cli/src/bench_assistant.rs

@@ -0,0 +1,700 @@
+//! `bench-assistant`: the standard Assistant model test (v1, #4851), run against a desktop app.
+//!
+//! The app is already running with `--control PORT`; everything goes through its control channel
+//! (`docs/control-protocol.md`), so the command needs no window code of its own. For each task it
+//! starts a new design, runs the task's prescribed setup (a box, for some), adds the endpoint as an
+//! API agent with All permissions, starts a new chat, sends the prompt once and waits for the turn
+//! to end. The result is checked on the design (`document.inspect` with measurements), never on
+//! what the model says, except for the one question whose answer is the reply. A failed task is
+//! put in one of the issue's failure categories from the conversation's items.
+//!
+//! ```text
+//! solidcraft-cli bench-assistant --connect 127.0.0.1:PORT --base-url URL --model NAME
+//!     [--token T] [--tasks 1,2,5] [--repeat N] [--timeout-s 300]
+//!     [--json out.json] [--markdown out.md]
+//! ```
+//! prints a table of the results; `--markdown` writes the issue's comment template filled in,
+//! `--json` every task's rules, conversation and design before and after.
+
+use std::io::{BufRead, BufReader, Write};
+use std::net::{SocketAddr, TcpStream};
+use std::time::{Duration, Instant};
+
+use serde_json::{Value, json};
+
+/// Standard test v1, as #4851 states it. Changing a prompt or a rule makes it another test.
+const TASKS: &str = r#"[
+  {"id": "01-cube", "prompt": "Make a 20 mm cube.", "check": {"bodies": 1, "volume": 8000, "bbox_size": [20, 20, 20]}},
+  {"id": "02-cylinder", "prompt": "Make a cylinder 30 mm in diameter and 50 mm tall.", "check": {"bodies": 1, "volume": 35342.92, "bbox_size": [30, 30, 50]}},
+  {"id": "03-block", "prompt": "Create a block 60 mm long, 40 mm wide and 10 mm thick.", "check": {"bodies": 1, "volume": 24000, "bbox_size": [10, 40, 60]}},
+  {"id": "04-sketch-extrude", "prompt": "Sketch a 50 by 30 mm rectangle on the XY plane and extrude it 15 mm.", "check": {"bodies": 1, "volume": 22500, "bbox_size": [15, 30, 50], "feature_kinds": ["Extrude"]}},
+  {"id": "05-plate-hole", "prompt": "Make a plate 80 x 60 x 10 mm with a 20 mm diameter hole straight through the middle.", "check": {"bodies": 1, "volume": 44858.41, "bbox_size": [10, 60, 80], "note": "80*60*10 - pi*10^2*10"}},
+  {"id": "06-fillet-box", "prompt": "Round all the edges of the box with a 3 mm radius.", "setup": [{"command": "solid.box", "params": {"length": 40, "width": 40, "height": 40}}], "check": {"bodies": 1, "volume": 63108.53, "tol": 0.003, "feature_kinds": ["Fillet"], "note": "all 12 edges of a 40 mm cube rounded r=3"}},
+  {"id": "07-move-body", "prompt": "Move the box 50 mm along the X axis.", "setup": [{"command": "solid.box", "params": {"length": 20, "width": 20, "height": 20}}], "check": {"bodies": 1, "volume": 8000, "bbox_min": [50, 0, 0]}},
+  {"id": "08-rename-body", "prompt": "Rename the body to Bracket.", "setup": [{"command": "solid.box", "params": {"length": 30, "width": 20, "height": 10}}], "check": {"bodies": 1, "volume": 6000, "body_name": "Bracket"}},
+  {"id": "09-volume-question", "prompt": "What is the volume of the part?", "setup": [{"command": "solid.box", "params": {"length": 30, "width": 20, "height": 10}}], "check": {"bodies": 1, "volume": 6000, "unchanged": true, "reply_number": "6[ ,. ]?000(?![0-9])|6(\\.0+)? ?cm"}},
+  {"id": "10-two-holes", "prompt": "Make a 100 x 50 x 5 mm plate and drill two 10 mm holes through it, each 15 mm in from the short ends and centred across the width.", "check": {"bodies": 1, "volume": 24214.6, "bbox_size": [5, 50, 100], "note": "100*50*5 - 2*pi*5^2*5"}},
+  {"id": "11-any-change", "prompt": "can you use the software to make a change to the current shape, any change at all", "setup": [{"command": "solid.box", "params": {"length": 30, "width": 20, "height": 10}}], "check": {"changed": true, "note": "verbatim user prompt from #4846; pass = the design changed"}}
+]"#;
+
+/// The agent the test adds. A fixed id replaces it on every run instead of adding another.
+const AGENT_ID: &str = "api-bench-assistant";
+const AGENT_NAME: &str = "bench";
+/// Longest control reply read (the channel's own request limit).
+const MAX_REPLY: usize = 16 << 20;
+/// Most result data kept for `--json`.
+const MAX_RESULTS: usize = 64 << 20;
+/// Deadline of the requests that only set up or read (each is answered at once by the app).
+const REQUEST_TIMEOUT: Duration = Duration::from_secs(120);
+/// How often a running turn is polled.
+const POLL: Duration = Duration::from_millis(250);
+/// After this long, an idle chat with no reply yet counts as a turn that ended without one.
+const START_GRACE: Duration = Duration::from_secs(30);
+/// Absolute tolerance of the lowest corner, in millimetres.
+const MIN_CORNER_TOL: f64 = 0.05;
+
+/// A JSON-lines connection to the app. Requests are sent once; a lost reply is never retried,
+/// so nothing runs twice.
+struct Control {
+    addr: SocketAddr,
+    token: String,
+    reader: BufReader<TcpStream>,
+    id: u64,
+}
+
+impl Control {
+    fn connect(addr: &str, token: Option<&str>) -> Result<Self, String> {
+        let addr: SocketAddr = addr.parse().map_err(|_| format!("--connect: `{addr}` is not an IP address and port"))?;
+        if !addr.ip().is_loopback() || addr.port() == 0 {
+            return Err("--connect requires a loopback address and a nonzero port (the app listens on 127.0.0.1)".into());
+        }
+        let token = solidcraft_engine::control_auth::client_token(addr.port(), token)
+            .ok_or("no control token: pass --token, set SOLIDCRAFT_CONTROL_TOKEN, or run on the app's computer (its token file)")?;
+        if token.len() > 4096 {
+            return Err("the control token is longer than 4096 bytes".into());
+        }
+        Self::open(addr, token)
+    }
+
+    fn open(addr: SocketAddr, token: String) -> Result<Self, String> {
+        let stream = TcpStream::connect_timeout(&addr, Duration::from_secs(5)).map_err(|e| format!("connecting to {addr}: {e}"))?;
+        Ok(Self { addr, token, reader: BufReader::new(stream), id: 0 })
+    }
+
+    /// A new connection to the same app: a request that outlived its deadline keeps the old one
+    /// busy until it is answered.
+    fn reopen(&self) -> Result<Self, String> {
+        Self::open(self.addr, self.token.clone())
+    }
+
+    fn call(&mut self, method: &str, params: Value, deadline: Instant) -> Result<Value, String> {
+        let left = || deadline.checked_duration_since(Instant::now()).filter(|d| !d.is_zero()).ok_or_else(|| "timeout".to_string());
+        let io = |e: std::io::Error| match e.kind() {
+            std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timeout".to_string(),
+            _ => format!("control channel: {e}"),
+        };
+        self.reader.get_ref().set_write_timeout(Some(left()?)).map_err(io)?;
+        self.id += 1;
+        // The first request on a connection carries the token; sending it on every one is allowed.
+        let request = json!({"id": self.id, "method": method, "params": params, "token": self.token});
+        writeln!(self.reader.get_mut(), "{request}").map_err(io)?;
+        let mut line = Vec::new();
+        loop {
+            self.reader.get_ref().set_read_timeout(Some(left()?)).map_err(io)?;
+            let bytes = self.reader.fill_buf().map_err(io)?;
+            if bytes.is_empty() {
+                return Err("the app closed the control connection".into());
+            }
+            let newline = bytes.iter().position(|b| *b == b'\n');
+            let used = newline.map_or(bytes.len(), |n| n + 1);
+            if line.len() + used > MAX_REPLY {
+                return Err("a control reply is larger than 16 MiB".into());
+            }
+            line.extend_from_slice(bytes.get(..used).unwrap_or_default());
+            self.reader.consume(used);
+            if newline.is_some() {
+                break;
+            }
+        }
+        let reply: Value = serde_json::from_slice(&line).map_err(|e| format!("control reply: {e}"))?;
+        if reply["id"].as_u64() != Some(self.id) {
+            return Err("control reply for another request".into());
+        }
+        if reply["ok"] != true {
+            return Err(format!("{method}: {}", reply["error"].as_str().unwrap_or("failed")));
+        }
+        reply.get("result").cloned().ok_or_else(|| format!("{method}: reply without a result"))
+    }
+
+    fn execute(&mut self, command: &str, params: Value) -> Result<Value, String> {
+        self.call("engine.execute", json!({"command": command, "params": params, "animate": false}), Instant::now() + REQUEST_TIMEOUT)
+    }
+
+    fn chat(&mut self, params: Value) -> Result<Value, String> {
+        self.call("ui.agent_chat", params, Instant::now() + REQUEST_TIMEOUT)
+    }
+
+    fn inspect(&mut self) -> Result<Value, String> {
+        let design = self.call("document.inspect", json!({"measure": true}), Instant::now() + REQUEST_TIMEOUT)?;
+        if design.is_object() { Ok(design) } else { Err("document.inspect returned no design".into()) }
+    }
+}
+
+fn tasks() -> Result<Vec<Value>, String> {
+    serde_json::from_str(TASKS).map_err(|e| format!("embedded tasks: {e}"))
+}
+
+fn triple(value: &Value) -> Option<[f64; 3]> {
+    match value.as_array()?.as_slice() {
+        [x, y, z] => {
+            let n = |v: &Value| v.as_f64().filter(|n| n.is_finite());
+            Some([n(x)?, n(y)?, n(z)?])
+        }
+        _ => None,
+    }
+}
+
+/// What the model said (thoughts left out).
+fn reply(items: &[Value]) -> String {
+    items.iter().filter(|i| i["thought"] != true).filter_map(|i| i["agent"].as_str()).collect::<Vec<_>>().join("\n")
+}
+
+/// v1's reply pattern `6[ ,. ]?000(?![0-9])|6(\.0+)? ?cm`: "6000", "6 000", "6,000", "6.000" not
+/// followed by a digit, or "6 cm", "6.0cm", … (a narrow no-break space also separates thousands).
+fn volume_reply(text: &str) -> bool {
+    text.match_indices('6').any(|(at, _)| {
+        let tail = text.get(at + 1..).unwrap_or_default();
+        let thousands = |t: &str| t.strip_prefix("000").is_some_and(|rest| !rest.starts_with(|c: char| c.is_ascii_digit()));
+        let separated = tail.strip_prefix([' ', ',', '.', '\u{202f}']).is_some_and(thousands);
+        let cm = {
+            let t = tail.strip_prefix(".0").map_or(tail, |t| t.trim_start_matches('0'));
+            t.strip_prefix(' ').unwrap_or(t).starts_with("cm")
+        };
+        thousands(tail) || separated || cm
+    })
+}
+
+/// The design as the user sees it, without what reading or saving changes (path, saved state,
+/// revision, selection, undo depth, evaluation timings).
+fn content(design: &Value) -> Value {
+    let mut v = design.clone();
+    if let Some(o) = v.as_object_mut() {
+        for key in ["path", "dirty", "revision", "selection", "undo", "redo"] {
+            o.remove(key);
+        }
+    }
+    for feature in v.get_mut("timeline").and_then(Value::as_array_mut).into_iter().flatten() {
+        if let Some(o) = feature.as_object_mut() {
+            o.remove("ms");
+            o.remove("boolean_diagnostics");
+        }
+    }
+    v
+}
+
+/// Whether the design changed: its content, or a step on the undo stack (a colour, say, that the
+/// inspection does not list).
+fn changed(before: &Value, after: &Value) -> bool {
+    content(before) != content(after) || after["undo"].as_u64() > before["undo"].as_u64()
+}
+
+/// The rules a task's result breaks (none: it passed). `before` and `after` are
+/// `document.inspect {measure: true}` before the prompt and after the turn.
+pub(super) fn check(rule: &Value, before: &Value, after: &Value, items: &[Value]) -> Vec<String> {
+    let Some(all) = after["bodies"].as_array() else { return vec!["the design could not be read".into()] };
+    // Bodies the user sees; a hidden one (a tool body, a hidden original) is not the result.
+    let bodies: Vec<&Value> = all.iter().filter(|b| b["visible"] != false).collect();
+    let mut errors = Vec::new();
+    if let Some(n) = rule["bodies"].as_u64()
+        && bodies.len() as u64 != n
+    {
+        errors.push(format!("{} bodies, expected {n}", bodies.len()));
+    }
+    if let Some(expected) = rule["volume"].as_f64() {
+        let tol = rule["tol"].as_f64().unwrap_or(0.01);
+        let volumes: Vec<f64> = bodies.iter().filter_map(|b| b["volume_mm3"].as_f64()).filter(|v| v.is_finite()).collect();
+        let total: f64 = volumes.iter().sum();
+        if volumes.len() != bodies.len() || (total - expected).abs() > expected * tol {
+            errors.push(format!("volume {total:.1} mm³, expected {expected} mm³ ±{}%", tol * 100.0));
+        }
+    }
+    let first = bodies.first().copied().unwrap_or(&Value::Null);
+    let min = triple(&first["bbox"]["min"]);
+    if let Some(mut expected) = triple(&rule["bbox_size"]) {
+        expected.sort_by(f64::total_cmp);
+        let size = min.zip(triple(&first["bbox"]["max"])).map(|(lo, hi)| {
+            let mut size = [hi[0] - lo[0], hi[1] - lo[1], hi[2] - lo[2]];
+            size.sort_by(f64::total_cmp);
+            size
+        });
+        if !size.is_some_and(|s| s.iter().zip(expected).all(|(a, e)| (a - e).abs() <= 0.01 * e.max(1.0))) {
+            errors.push(format!("size {size:?}, expected {expected:?} in any orientation"));
+        }
+    }
+    if let Some(expected) = triple(&rule["bbox_min"])
+        && !min.is_some_and(|m| m.iter().zip(expected).all(|(a, e)| (a - e).abs() <= MIN_CORNER_TOL))
+    {
+        errors.push(format!("lowest corner {min:?}, expected {expected:?}"));
+    }
+    if let Some(name) = rule["body_name"].as_str()
+        && !bodies.iter().any(|b| b["name"] == name)
+    {
+        errors.push(format!("no body named {name}"));
+    }
+    for kind in rule["feature_kinds"].as_array().into_iter().flatten().filter_map(Value::as_str) {
+        let live = |f: &&Value| f["suppressed"] != true && f["rolled_back"] != true && f["error"].is_null();
+        if !after["timeline"].as_array().into_iter().flatten().filter(live).any(|f| f["type"].as_str().is_some_and(|t| t.contains(kind))) {
+            errors.push(format!("no {kind} in the timeline"));
+        }
+    }
+    if rule["changed"] == true || rule["unchanged"] == true {
+        let changed = before.is_object() && changed(before, after);
+        if rule["changed"] == true && !changed {
+            errors.push("the design did not change".into());
+        }
+        if rule["unchanged"] == true && (changed || !before.is_object()) {
+            errors.push("the design changed".into());
+        }
+    }
+    if rule["reply_number"].is_string() && !volume_reply(&reply(items)) {
+        errors.push("the reply does not give the volume".into());
+    }
+    errors
+}
+
+/// A tool call written into the reply as JSON: `{"name": …`, `{"command": …`, `{"function": …`,
+/// `{"tool": …`.
+fn call_as_text(text: &str) -> bool {
+    text.match_indices('{').any(|(at, _)| {
+        let rest = text.get(at + 1..).unwrap_or_default().trim_start();
+        ["\"name\"", "\"command\"", "\"function\"", "\"tool\""]
+            .iter()
+            .any(|key| rest.strip_prefix(key).is_some_and(|r| r.trim_start().starts_with(':')))
+    })
+}
+
+/// How a failed task failed, in the issue's words, from the conversation's items.
+pub(super) fn classify(items: &[Value], timed_out: bool) -> &'static str {
+    if timed_out {
+        return "timeout";
+    }
+    let tools: Vec<&Value> = items.iter().filter(|i| i.get("tool").is_some()).collect();
+    // A failed call, or a batch whose answer reports a failed step (`"ok": false`).
+    let failed: Vec<String> = tools
+        .iter()
+        .map(|t| t["output"].as_str().unwrap_or_default())
+        .zip(&tools)
+        .filter(|(output, t)| t["status"] == "Failed" || serde_json::from_str::<Value>(output).is_ok_and(|v| v["ok"] == false))
+        .map(|(output, _)| output.to_lowercase())
+        .collect();
+    let notices: Vec<String> = items.iter().filter_map(|i| i["notice"].as_str()).map(str::to_lowercase).collect();
+    let answer = reply(items);
+    if notices.iter().any(|n| n.contains("http 400")) {
+        return "the endpoint refused tools (HTTP 400)";
+    }
+    if notices.iter().any(|n| n.contains("max_turn_requests")) || answer.contains("requests for one message") {
+        return "hit the request limit";
+    }
+    if call_as_text(&answer) {
+        return "wrote the call as text";
+    }
+    if failed.iter().any(|o| o.contains("unknown command") || o.starts_with("unknown tool")) {
+        return "wrong or unknown command";
+    }
+    if failed.iter().any(|o| o.contains("invalid parameters") || o.starts_with("not run:") || o.contains("not valid json")) {
+        return "wrong arguments";
+    }
+    if !failed.is_empty() || notices.iter().any(|n| n.starts_with("http ")) || items.iter().any(|i| i["error"] == true) {
+        return "gave up after errors";
+    }
+    if tools.is_empty() {
+        return if answer.trim().is_empty() { "an empty reply" } else { "only talked" };
+    }
+    "wrong result"
+}
+
+/// One run's results in the issue's comment template (`run`: which repetition).
+pub(super) fn markdown(model: &str, version: &str, results: &[Value], run: u64) -> String {
+    let clean = |s: &str| s.replace(['\n', '\r', '|'], " ");
+    let rows: Vec<&Value> = results.iter().filter(|r| r["repeat"] == run).collect();
+    let passed = rows.iter().filter(|r| r["passed"] == true).count();
+    let mut out = format!(
+        "### {} (<quant>, <download size>)\nRuntime: <Ollama/LM Studio/... version>, context <num_ctx if changed>\nSolidCraft: {}\nResult: {passed}/11\n| # | pass/fail | how it failed |\n|---|---|---|\n",
+        clean(model),
+        clean(version)
+    );
+    for n in 1..=11 {
+        match rows.iter().find(|r| r["task"] == n) {
+            Some(r) if r["passed"] == true => out.push_str(&format!("| {n} | pass | |\n")),
+            Some(r) => out.push_str(&format!("| {n} | fail | {} |\n", clean(r["failure"].as_str().unwrap_or_default()))),
+            None => out.push_str(&format!("| {n} | | not run |\n")),
+        }
+    }
+    out.push_str(if rows.len() == 11 {
+        "Notes: <anything odd, e.g. very slow, needed a retry>\n"
+    } else {
+        "Notes: partial run; the tasks marked \"not run\" were left out.\n"
+    });
+    out
+}
+
+fn write(path: &str, text: &str) -> Result<(), String> {
+    solidcraft_engine::io::vfs::write(path, text.as_bytes()).map_err(|e| format!("{path}: {e}"))
+}
+
+struct Options<'a> {
+    connect: &'a str,
+    token: Option<&'a str>,
+    base_url: &'a str,
+    model: &'a str,
+    tasks: Vec<usize>,
+    repeat: u64,
+    timeout: Duration,
+    json: Option<&'a str>,
+    markdown: Option<&'a str>,
+}
+
+fn options(args: &[String]) -> Result<Options<'_>, String> {
+    const FLAGS: [&str; 9] = ["--connect", "--token", "--base-url", "--model", "--tasks", "--repeat", "--timeout-s", "--json", "--markdown"];
+    let mut given = std::collections::BTreeMap::new();
+    let mut args = args.iter();
+    while let Some(flag) = args.next() {
+        let Some(flag) = FLAGS.iter().find(|f| **f == flag.as_str()) else { return Err(format!("unknown bench-assistant option: {flag}")) };
+        let value = args
+            .next()
+            .filter(|v| !v.starts_with("--") && !v.is_empty() && v.len() <= 4096)
+            .ok_or_else(|| format!("{flag} needs a value (at most 4096 bytes)"))?;
+        if given.insert(*flag, value.as_str()).is_some() {
+            return Err(format!("{flag} given twice"));
+        }
+    }
+    let required = |key: &str| given.get(key).copied().ok_or_else(|| format!("bench-assistant needs {key}"));
+    let number = |key: &str, default: u64, max: u64| -> Result<u64, String> {
+        given
+            .get(key)
+            .map_or(Ok(default), |s| s.parse::<u64>().ok().filter(|n| (1..=max).contains(n)).ok_or_else(|| format!("{key} must be 1 to {max}")))
+    };
+    let tasks = match given.get("--tasks") {
+        None => (1..=11).collect(),
+        Some(list) => {
+            let mut tasks = Vec::new();
+            for n in list.split(',') {
+                let n = n
+                    .trim()
+                    .parse::<usize>()
+                    .ok()
+                    .filter(|n| (1..=11).contains(n))
+                    .ok_or("--tasks takes task numbers 1 to 11, separated by commas")?;
+                if tasks.contains(&n) {
+                    return Err(format!("--tasks lists task {n} twice"));
+                }
+                tasks.push(n);
+            }
+            tasks
+        }
+    };
+    Ok(Options {
+        connect: required("--connect")?,
+        token: given.get("--token").copied(),
+        base_url: required("--base-url")?,
+        model: required("--model")?,
+        tasks,
+        repeat: number("--repeat", 1, 100)?,
+        timeout: Duration::from_secs(number("--timeout-s", 300, 3600)?),
+        json: given.get("--json").copied(),
+        markdown: given.get("--markdown").copied(),
+    })
+}
+
+/// Waits for the turn the prompt started to end. Returns the chat's last state and whether the
+/// deadline passed first.
+fn wait_for_turn(control: &mut Control, mut chat: Value, began: Instant, end: Instant) -> Result<(Value, bool), String> {
+    let mut seen_busy = false;
+    loop {
+        let state = chat["state"].as_str().unwrap_or_default();
+        let turn = !chat["turn"].is_null();
+        let queued = chat["pending"].as_array().is_some_and(|p| !p.is_empty());
+        seen_busy |= state == "busy" || turn;
+        let idle = !matches!(state, "busy" | "starting") && !turn && !queued;
+        // A turn can start and end between two polls: then the conversation has its answer.
+        let answered = chat["items"].as_array().into_iter().flatten().any(|i| i.get("user").is_none());
+        if idle && (seen_busy || answered || matches!(state, "exited" | "auth" | "off") || began.elapsed() >= START_GRACE) {
+            return Ok((chat, false));
+        }
+        let Some(left) = end.checked_duration_since(Instant::now()).filter(|d| !d.is_zero()) else { return Ok((chat, true)) };
+        std::thread::sleep(POLL.min(left));
+        match control.call("ui.agent_chat", json!({}), end) {
+            Ok(next) => chat = next,
+            Err(e) if e == "timeout" => return Ok((chat, true)),
+            Err(e) => return Err(e),
+        }
+    }
+}
+
+pub fn run(args: &[String]) -> Result<(), String> {
+    let o = options(args)?;
+    let tasks = tasks()?;
+    let mut control = Control::connect(o.connect, o.token)?;
+    let help = control.call("ui.help", json!({}), Instant::now() + REQUEST_TIMEOUT)?;
+    let version = help["version"].as_str().filter(|s| !s.is_empty() && s.len() <= 256).ok_or("the app reported no version")?.to_string();
+    let config = control.chat(json!({
+        "features": true,
+        "add_agent": {"id": AGENT_ID, "name": AGENT_NAME, "kind": "api", "base_url": o.base_url, "model": o.model},
+    }))?;
+    if !config["agents"].as_array().into_iter().flatten().any(|a| a["id"] == AGENT_ID) {
+        return Err("the app did not add the benchmark's agent".into());
+    }
+    // Put the user's permission setting back afterwards.
+    let permissions = config["permissions"].as_str().map(str::to_string);
+    let result = run_tasks(&mut control, &o, &tasks, &version);
+    let _ = control.chat(json!({"stop": true}));
+    if let Some(p) = permissions {
+        let _ = control.chat(json!({"permissions": p}));
+    }
+    result
+}
+
+fn run_tasks(control: &mut Control, o: &Options, tasks: &[Value], version: &str) -> Result<(), String> {
+    let mut results: Vec<Value> = Vec::new();
+    let mut kept = 0;
+    let mut stdout = std::io::stdout().lock();
+    let mut say = |line: String| writeln!(stdout, "{line}").map_err(|e| format!("stdout: {e}"));
+    say(format!("bench-assistant v1: {} on SolidCraft {version}", o.model))?;
+    say("| run | # | task | pass/fail | how it failed | seconds |\n|---|---|---|---|---|---|".into())?;
+    for run in 1..=o.repeat {
+        for &n in &o.tasks {
+            let task = tasks.get(n - 1).ok_or("missing embedded task")?;
+            // A fresh design and a fresh chat, with nothing of the last task still running.
+            control.chat(json!({"stop": true}))?;
+            control.execute("file.new", json!({"name": "Benchmark"}))?;
+            for step in task["setup"].as_array().into_iter().flatten() {
+                control.execute(step["command"].as_str().ok_or("embedded setup without a command")?, step["params"].clone())?;
+            }
+            control.chat(json!({"agent": AGENT_ID, "permissions": "all", "new_chat": true, "attach_view": false}))?;
+            let before = control.inspect()?;
+            let began = Instant::now();
+            let end = began + o.timeout;
+            let (chat, timed_out) = match control.call("ui.agent_chat", json!({"send": task["prompt"]}), end) {
+                Ok(chat) => wait_for_turn(control, chat, began, end)?,
+                Err(e) if e == "timeout" => (json!({}), true),
+                Err(e) => return Err(e),
+            };
+            if timed_out {
+                // The late reply would arrive on the old connection; stop the model on a new one
+                // before reading the design.
+                *control = control.reopen()?;
+            }
+            // Stop the agent before reading the result, so nothing changes the design meanwhile.
+            let stopped = control.chat(json!({"stop": true}))?;
+            let items = stopped["items"].as_array().or(chat["items"].as_array()).cloned().unwrap_or_default();
+            let after = control.inspect()?;
+            let failed_rules = check(&task["check"], &before, &after, &items);
+            let passed = failed_rules.is_empty();
+            let failure = if passed { "" } else { classify(&items, timed_out) };
+            let seconds = began.elapsed().as_secs_f64();
+            say(format!(
+                "| {run} | {n} | {} | {} | {failure} | {seconds:.0} |",
+                task["id"].as_str().unwrap_or_default(),
+                if passed { "pass" } else { "fail" }
+            ))?;
+            let result = json!({
+                "task": n, "id": task["id"], "prompt": task["prompt"], "repeat": run, "passed": passed, "failure": failure,
+                "failed_rules": failed_rules, "timed_out": timed_out, "seconds": seconds, "check": task["check"],
+                "items": items, "before": before, "after": after,
+            });
+            kept += result.to_string().len();
+            if kept > MAX_RESULTS {
+                return Err("the results passed 64 MiB; run fewer tasks or repetitions".into());
+            }
+            results.push(result);
+            // Written after every task, so an interrupted run keeps what it measured.
+            if let Some(path) = o.json {
+                let all = json!({"test": "v1", "model": o.model, "base_url": o.base_url, "solidcraft": version, "results": results});
+                write(path, &serde_json::to_string_pretty(&all).map_err(|e| e.to_string())?)?;
+            }
+            if let Some(path) = o.markdown {
+                write(path, &(1..=run).map(|r| markdown(o.model, version, &results, r)).collect::<Vec<_>>().join("\n"))?;
+            }
+        }
+    }
+    for run in 1..=o.repeat {
+        let rows: Vec<&Value> = results.iter().filter(|r| r["repeat"] == run).collect();
+        say(format!("run {run}: {}/{} passed", rows.iter().filter(|r| r["passed"] == true).count(), rows.len()))?;
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn design(bodies: Value, timeline: Value) -> Value {
+        json!({"name": "Benchmark", "params": [], "timeline": timeline, "bodies": bodies, "sketches": [], "undo": 1, "revision": 3, "dirty": true})
+    }
+
+    fn body(name: &str, volume: f64, min: [f64; 3], max: [f64; 3]) -> Value {
+        json!({"name": name, "volume_mm3": volume, "bbox": {"min": min, "max": max}, "visible": true})
+    }
+
+    #[test]
+    fn the_embedded_tasks_are_v1() {
+        let tasks = tasks().unwrap();
+        assert_eq!(tasks.len(), 11);
+        assert_eq!(tasks[0]["prompt"], "Make a 20 mm cube.");
+        assert_eq!(tasks[10]["prompt"], "can you use the software to make a change to the current shape, any change at all");
+        assert_eq!(tasks[5]["check"]["tol"], 0.003);
+        assert_eq!(tasks[6]["check"]["bbox_min"], json!([50, 0, 0]));
+        let boxes: Vec<_> = tasks.iter().filter(|t| t["setup"].is_array()).map(|t| t["id"].as_str().unwrap()).collect();
+        assert_eq!(boxes, ["06-fillet-box", "07-move-body", "08-rename-body", "09-volume-question", "11-any-change"]);
+    }
+
+    #[test]
+    fn pass_rules() {
+        let tasks = tasks().unwrap();
+        let rule = |n: usize| tasks[n - 1]["check"].clone();
+        let empty = design(json!([]), json!([]));
+        let pass = |n: usize, before: &Value, after: &Value, items: &[Value]| check(&rule(n), before, after, items);
+        // 3: any orientation, within 1%.
+        let block = design(json!([body("Body1", 24_100.0, [0.0; 3], [40.0, 10.0, 60.2])]), json!([{"type": "Box"}]));
+        assert!(pass(3, &empty, &block, &[]).is_empty());
+        let thick = design(json!([body("Body1", 24_000.0, [0.0; 3], [40.0, 12.0, 60.0])]), json!([]));
+        assert_eq!(pass(3, &empty, &thick, &[]).len(), 1);
+        let two = design(json!([body("A", 12_000.0, [0.0; 3], [60.0, 40.0, 5.0]), body("B", 12_000.0, [0.0; 3], [60.0, 40.0, 5.0])]), json!([]));
+        assert!(!pass(3, &empty, &two, &[]).is_empty());
+        // A hidden body is not part of the result.
+        let mut hidden = two.clone();
+        hidden["bodies"][1]["visible"] = json!(false);
+        hidden["bodies"][0]["volume_mm3"] = json!(24_000.0);
+        hidden["bodies"][0]["bbox"]["max"] = json!([60.0, 40.0, 10.0]);
+        assert!(pass(3, &empty, &hidden, &[]).is_empty());
+        // 4: the timeline needs a working Extrude.
+        let plate = |kind: Value| design(json!([body("Body1", 22_500.0, [0.0; 3], [50.0, 30.0, 15.0])]), kind);
+        assert!(pass(4, &empty, &plate(json!([{"type": "Sketch"}, {"type": "Extrude"}])), &[]).is_empty());
+        assert!(!pass(4, &empty, &plate(json!([{"type": "Box"}])), &[]).is_empty());
+        for flag in [json!({"suppressed": true}), json!({"rolled_back": true}), json!({"error": "failed"})] {
+            let mut feature = json!({"type": "Extrude"});
+            feature.as_object_mut().unwrap().extend(flag.as_object().unwrap().clone());
+            assert!(!pass(4, &empty, &plate(json!([feature])), &[]).is_empty(), "{flag}");
+        }
+        // 6: the fillet's tolerance is 0.3%.
+        let start = design(json!([body("Body1", 64_000.0, [0.0; 3], [40.0; 3])]), json!([{"type": "Box"}]));
+        let filleted = |v: f64| design(json!([body("Body1", v, [0.0; 3], [40.0; 3])]), json!([{"type": "Box"}, {"type": "Fillet"}]));
+        assert!(pass(6, &start, &filleted(63_108.53 * 1.002), &[]).is_empty());
+        assert!(!pass(6, &start, &filleted(63_108.53 * 1.004), &[]).is_empty());
+        // 7: the lowest corner.
+        let moved = |x: f64| design(json!([body("Body1", 8000.0, [x, 0.0, 0.0], [x + 20.0, 20.0, 20.0])]), json!([]));
+        assert!(pass(7, &empty, &moved(50.0), &[]).is_empty());
+        assert!(!pass(7, &empty, &moved(0.0), &[]).is_empty());
+        // 8: the name.
+        let named = |name: &str| design(json!([body(name, 6000.0, [0.0; 3], [30.0, 20.0, 10.0])]), json!([]));
+        assert!(pass(8, &empty, &named("Bracket"), &[]).is_empty());
+        assert!(!pass(8, &empty, &named("Body1"), &[]).is_empty());
+        // 9: unchanged, and the reply gives the volume.
+        let start = named("Body1");
+        let said = |text: &str| [json!({"user": "What is the volume of the part?"}), json!({"agent": text, "thought": false})];
+        let mut read = start.clone();
+        read["revision"] = json!(7);
+        read["dirty"] = json!(false);
+        read["selection"] = json!([{"body": "Body1"}]);
+        assert!(pass(9, &start, &read, &said("The volume is 6000 mm³.")).is_empty());
+        assert!(!pass(9, &start, &read, &said("About 60 cm³.")).is_empty());
+        assert!(!pass(9, &start, &named("Bracket"), &said("6 000 mm³")).is_empty());
+        let mut undone = start.clone();
+        undone["undo"] = json!(2);
+        assert!(!pass(9, &start, &undone, &said("6000 mm³")).is_empty());
+        // 11: any change counts; reading does not.
+        assert!(pass(11, &start, &named("Bracket"), &[]).is_empty());
+        assert!(pass(11, &start, &undone, &[]).is_empty());
+        assert!(!pass(11, &start, &read, &[]).is_empty());
+        // An unreadable design passes nothing.
+        assert!(!pass(11, &start, &json!({}), &[]).is_empty());
+    }
+
+    #[test]
+    fn the_volume_reply() {
+        for yes in ["6000", "6 000 mm³", "6,000", "6.000", "6\u{202f}000", "6 cm³", "6.00cm3", "is 6000."] {
+            assert!(volume_reply(yes), "{yes}");
+        }
+        for no in ["60000", "6,0001", "60 cm³", "600", "6.01 cm³", ""] {
+            assert!(!volume_reply(no), "{no}");
+        }
+    }
+
+    #[test]
+    fn failure_categories() {
+        for (items, expected) in [
+            (
+                json!([{"user": "Make a 20 mm cube."}, {"agent": "{\"name\": \"execute\", \"arguments\": {}}", "thought": false}]),
+                "wrote the call as text",
+            ),
+            (
+                json!([{"notice": "HTTP 400: registry.ollama.ai/library/gemma3:4b does not support tools", "error": true}]),
+                "the endpoint refused tools (HTTP 400)",
+            ),
+            (json!([{"user": "Make a 20 mm cube."}, {"agent": "", "thought": false}]), "an empty reply"),
+            (json!([{"agent": "Let me think", "thought": true}]), "an empty reply"),
+            (json!([{"agent": "Sure, here is how to make a cube.", "thought": false}]), "only talked"),
+            (
+                json!([{"tool": "1", "status": "Failed", "output": "unknown command `solid.cube` (did you mean `solid.box`?)"}]),
+                "wrong or unknown command",
+            ),
+            (json!([{"tool": "1", "status": "Failed", "output": "unknown tool `make_cube`"}]), "wrong or unknown command"),
+            (json!([{"tool": "1", "status": "Failed", "output": "invalid parameters for `solid.box`: `length` is required"}]), "wrong arguments"),
+            (json!([{"tool": "1", "status": "Failed", "output": "Not run: the tool arguments were not valid JSON"}]), "wrong arguments"),
+            (json!([{"tool": "1", "status": "Failed", "output": "no body `Box`"}]), "gave up after errors"),
+            (
+                json!([{"tool": "1", "status": "Completed", "output": "{\"ok\": false, \"failed\": {\"error\": \"unknown command `solid.delete`\"}}"}]),
+                "wrong or unknown command",
+            ),
+            (
+                json!([{"tool": "1", "status": "Completed"}, {"agent": "\n(stopped after 24 requests for one message; send another message to go on)"}]),
+                "hit the request limit",
+            ),
+            (json!([{"tool": "1", "status": "Completed", "output": "{}"}]), "wrong result"),
+        ] {
+            let items = items.as_array().unwrap();
+            assert_eq!(classify(items, false), expected, "{items:?}");
+            assert_eq!(classify(items, true), "timeout");
+        }
+    }
+
+    #[test]
+    fn markdown_is_the_comment_template() {
+        let rows: Vec<Value> =
+            (1..=11).map(|n| json!({"task": n, "repeat": 1, "passed": n != 2, "failure": if n == 2 { "an empty reply" } else { "" }})).collect();
+        let report = markdown("qwen2.5:7b", "0.19.0", &rows, 1);
+        assert!(report.starts_with(
+            "### qwen2.5:7b (<quant>, <download size>)\nRuntime: <Ollama/LM Studio/... version>, context <num_ctx if changed>\nSolidCraft: 0.19.0\nResult: 10/11\n| # | pass/fail | how it failed |\n|---|---|---|\n| 1 | pass | |\n| 2 | fail | an empty reply |\n"
+        ));
+        assert!(report.ends_with("| 11 | pass | |\nNotes: <anything odd, e.g. very slow, needed a retry>\n"));
+        let partial = markdown("m|x", "v", &rows[..1], 1);
+        assert!(partial.starts_with("### m x ("));
+        assert!(partial.contains("Result: 1/11") && partial.contains("| 2 | | not run |") && partial.contains("partial run"));
+    }
+
+    #[test]
+    fn options_are_checked_before_connecting() {
+        for extra in [
+            &["--repeat", "0"][..],
+            &["--repeat", "101"],
+            &["--timeout-s", "3601"],
+            &["--tasks", "0"],
+            &["--tasks", "12"],
+            &["--tasks", "1,1"],
+            &["--model", "again"],
+            &["--unexpected", "1"],
+            &["--token"],
+        ] {
+            let mut args: Vec<String> =
+                ["--connect", "127.0.0.1:9", "--model", "m", "--base-url", "http://127.0.0.1:11434/v1"].iter().map(|s| s.to_string()).collect();
+            args.extend(extra.iter().map(|s| s.to_string()));
+            assert!(options(&args).is_err(), "{extra:?}");
+        }
+        let args: Vec<String> =
+            ["--connect", "127.0.0.1:9", "--model", "m", "--base-url", "u", "--tasks", "2, 5"].iter().map(|s| s.to_string()).collect();
+        let o = options(&args).unwrap();
+        assert_eq!((o.tasks, o.repeat, o.timeout), (vec![2, 5], 1, Duration::from_secs(300)));
+        assert!(Control::connect("10.0.0.1:9271", Some("t")).is_err());
+        assert!(Control::connect("localhost", Some("t")).is_err());
+    }
+}

apps/solidcraft-cli/src/crashes.rs

@@ -6,11 +6,14 @@ use std::sync::Mutex;
 use serde_json::{Value, json};
 use solidcraft_engine::crash;
 
-const USAGE: &str = "usage: solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]";
+/// The command's usage, from the same lines the top-level usage lists.
+fn usage() -> String {
+    crate::command_usage("crashes")
+}
 
 pub fn run(args: &[String]) -> Result<(), String> {
     let dir = crash::default_dir().ok_or("no crash folder on this system")?;
-    let id = || args.get(1).map(String::as_str).ok_or_else(|| USAGE.to_string());
+    let id = || args.get(1).map(String::as_str).ok_or_else(usage);
     match args.first().map(String::as_str) {
         None | Some("list") => {
             let reports = crash::list(&dir);
@@ -43,7 +46,7 @@ pub fn run(args: &[String]) -> Result<(), String> {
             println!("deleted {} report(s)", crash::clear(&dir, args.get(1).map(String::as_str)));
             Ok(())
         }
-        _ => Err(USAGE.to_string()),
+        _ => Err(usage()),
     }
 }
 

apps/solidcraft-cli/src/fuzz.rs

@@ -16,9 +16,16 @@ fn flag<T: std::str::FromStr>(args: &[String], name: &str, default: T) -> T {
     args.iter().position(|a| a == name).and_then(|i| args.get(i + 1)).and_then(|v| v.parse().ok()).unwrap_or(default)
 }
 
+/// The options `fuzz` takes, and the ones that stand alone.
+const OPTIONS: &[&str] = &["--from", "--count", "--jobs", "--timeout", "--steps", "--out", "--report"];
+const SWITCHES: &[&str] = &["--minimise"];
+
 /// One seed: a design and a boolean case, as JSON on stdout (progress on stderr).
 pub fn one(args: &[String]) -> Result<(), String> {
     let seed: u64 = args.first().and_then(|s| s.parse().ok()).ok_or("fuzz-one <seed> [--steps N] [--minimise]")?;
+    // The seed is the first argument; the rest are options, and an option `fuzz-one` doesn't
+    // take is refused rather than ignored.
+    crate::known_args("fuzz-one", &args[1..], &["--steps"], SWITCHES, false)?;
     let steps = flag(args, "--steps", 8usize);
     let minimise = args.iter().any(|a| a == "--minimise");
     // Panics caught inside the kernel: harmless natively, fatal in the web build.
@@ -64,6 +71,9 @@ struct Job {
 /// Run seeds `--from`…`--from + --count` in `--jobs` processes, `--timeout` seconds each;
 /// write failing scripts to `--out` and a summary to `--report`.
 pub fn run(args: &[String]) -> Result<(), String> {
+    // An option `fuzz` doesn't take is refused before a seed runs: it would otherwise be
+    // ignored, and the run would go on for minutes with the wrong settings.
+    crate::known_args("fuzz", args, OPTIONS, SWITCHES, false)?;
     let from = flag(args, "--from", 0u64);
     let count = flag(args, "--count", 100u64);
     let last = from.checked_add(count.saturating_sub(1)).ok_or("seed range exceeds u64::MAX: reduce --from or --count")?;

apps/solidcraft-cli/src/logger.rs

@@ -0,0 +1,49 @@
+//! What the engine logs (`log::info!`, `log::debug!`: why a body has no display plan, why a save
+//! left its model cache out), written to stderr. Off unless asked for, so the CLI's output and
+//! the scripts reading it stay as they are: `--debug` shows SolidCraft's own debug messages (and
+//! other crates' warnings, whose debug output is large), `RUST_LOG=error|warn|info|debug|trace`
+//! sets one level for every crate.
+
+use log::{LevelFilter, Log, Metadata, Record};
+
+struct Stderr {
+    /// The level for SolidCraft's crates.
+    ours: LevelFilter,
+    /// The level for every other crate.
+    others: LevelFilter,
+}
+
+impl Log for Stderr {
+    fn enabled(&self, m: &Metadata) -> bool {
+        m.level() <= if m.target().starts_with("solidcraft") { self.ours } else { self.others }
+    }
+
+    fn log(&self, r: &Record) {
+        if self.enabled(r.metadata()) {
+            use std::io::Write as _;
+            // A closed stderr is no reason to stop.
+            let _ = writeln!(std::io::stderr().lock(), "[{} {}] {}", r.level().as_str().to_ascii_lowercase(), r.target(), r.args());
+        }
+    }
+
+    fn flush(&self) {}
+}
+
+/// Removes `--debug` from `args`, wherever it is (every subcommand takes it), and installs the
+/// logger when it or `RUST_LOG` asks for one.
+pub fn init(args: &mut Vec<String>) {
+    let before = args.len();
+    args.retain(|a| a != "--debug");
+    let debug = args.len() != before;
+    let env = std::env::var("RUST_LOG").ok().and_then(|v| v.trim().parse::<LevelFilter>().ok());
+    let (ours, others) = match (debug, env) {
+        (false, Some(all)) => (all, all),
+        (true, Some(all)) => (all.max(LevelFilter::Debug), all),
+        (true, None) => (LevelFilter::Debug, LevelFilter::Warn),
+        (false, None) => return,
+    };
+    // Installed once, for the life of the process.
+    if log::set_logger(Box::leak(Box::new(Stderr { ours, others }))).is_ok() {
+        log::set_max_level(ours.max(others));
+    }
+}

apps/solidcraft-cli/src/main.rs

@@ -4,26 +4,33 @@
 //! solidcraft-cli run <script.json|design.solidcraft|part.step|mesh.3mf> [--in design|part.step|mesh.3mf] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]
 //! solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE] (alias: inspect) measurements as JSON
 //! solidcraft-cli script <design.solidcraft> [--out script.json]     the design's history as a command script
-//! solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]] loading timings as JSON lines
+//! solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]] [--ops script.json] loading timings as JSON lines
 //! solidcraft-cli bench-agent [--scale F] [--save F] [--script-out F] a ~1,300-body design built command by command, timed
+//! solidcraft-cli bench-assistant --connect 127.0.0.1:PORT [--token T] --base-url URL --model NAME [--tasks 1,2,5] [--repeat N]
+//!                                 [--timeout-s 300] [--json out.json] [--markdown out.md]
+//!                                                             the standard Assistant model test (#4851) on a running app
 //! solidcraft-cli snapshot <script|design> [--in design|part.step] --out shot.png [--width W] [--height H] [--view iso|front|top|…|NAME | --camera JSON] [--no-grid] [--no-axes]
 //!                                                             [--body NAME:opacity=0.3,color=#rrggbb]... [--tool NAME]... [--section z=27]
 //! solidcraft-cli exec <command> [json-params]                 run one command on an empty design
 //! solidcraft-cli commands                                     the command registry as JSON
 //! solidcraft-cli recipe <recipe.json>                         translate an oracle recipe to a script
 //! solidcraft-cli oracle <case-dir>...                         replay recipes and compare with expected.json
-//! solidcraft-cli mcp [--in design|script] [--connect HOST:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
+//! solidcraft-cli mcp [--headless] [--in design|script] [--connect HOST:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
 //!                    [--param-check off|warn|strict]
 //!                                                             MCP server on stdio (docs/mcp.md)
 //! solidcraft-cli licences                                     SolidCraft's licence and the third-party licences
 //! solidcraft-cli icon --out F.png|F.ico [--size N]             the app icon (packaging; drawn, not a file)
+//!
+//! --debug (with any command)                                  SolidCraft's debug log on stderr (or RUST_LOG=LEVEL)
 //! ```
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 #![forbid(unsafe_code)]
 
 mod bench_agent;
+mod bench_assistant;
 mod crashes;
 mod fuzz;
+mod logger;
 mod oracle;
 mod preview;
 mod recipe;
@@ -39,52 +46,98 @@ mod app_icon;
 use solidcraft_engine::Session;
 use solidcraft_engine::view::Guides;
 
-const USAGE: &str = "usage:
-  solidcraft-cli run <script.json|design.solidcraft|part.step> [--in design.solidcraft|part.step] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]
-  solidcraft-cli run --in <design.solidcraft|part.step> [--out FILE]...
-      (a timeline feature that fails fails the run and nothing is written; --allow-errors writes anyway)
-      (--timings prints {timings: [{index, command, ms}], total_ms} for a script, with --results its results too;
-       --profile adds each command's profile: {boolean_ms, tessellate_ms, other_ms}, the kernel's share)
-  solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE]     (alias: inspect; or --in FILE)
-      (--json-out FILE writes the JSON that run (with --results, else the measurement) and eval print to FILE instead of stdout,
-       as plain UTF-8: a shell's > can re-encode it, e.g. Windows PowerShell adds a byte-order mark)
-  solidcraft-cli script <design.solidcraft|script.json> [--out script.json]
-      (the design's history as a command script that eval and run replay)
-  solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]]
-  solidcraft-cli bench-agent [--scale F] [--save design.solidcraft] [--script-out script.json]
-  solidcraft-cli snapshot <script|design> [--in design.solidcraft|part.step] --out shot.png [--width W] [--height H] [--view NAME | --camera JSON] [--no-grid] [--no-axes]
-      [--body NAME:opacity=0.3,color=#rrggbb]... [--tool NAME]... [--section z=27]
-  solidcraft-cli snapshot --in <design.solidcraft|part.step> --out shot.png ...
-      (as with run, --in starts from a design and the script runs on top of it; an option snapshot doesn't take is an error;
-       --view: iso, front, back, top, bottom, left, right, or the name of a view saved in the design with view.save;
-       --camera: {target: [x,y,z], yaw, pitch, distance, fov?} in mm and radians, as the MCP screenshot takes it (docs/mcp.md);
-       --no-grid and --no-axes leave the ground grid (on Z 0) and the origin's axes out of the picture;
-       --body: how one body is drawn, as appearance.assign takes it: opacity 0-1 (below 1 is see-through, so what is inside
-         it shows) and color #rrggbb, either or both, once per body;
-       --tool: draw this body solid in the tool colour and every other body see-through, so a cut's or a join's tool body
-         is visible inside the material it meets; a later --body overrides it;
-       --section: cut the model as inspect.section does, so the inside shows: z=27 (the plane through that world
-         coordinate, keeping the smaller side), add ,flip to keep the other side, or XY, XZ, YZ, or its own JSON)
-  solidcraft-cli render <script|design> --out image.png [--setup NAME] [--width W] [--height H] [--transparent] [--overwrite] [--timeout SECONDS]
-  solidcraft-cli exec <command> [json-params]
-  solidcraft-cli commands
-  solidcraft-cli recipe <recipe.json>
-  solidcraft-cli oracle <case-dir>... [--json]
-  solidcraft-cli fuzz [--from N] [--count N] [--jobs J] [--timeout S] [--steps N] [--minimise] [--out DIR] [--report FILE]
-  solidcraft-cli mcp [--in design.solidcraft|script.json] [--connect 127.0.0.1:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]
-                     [--param-check off|warn|strict]
-  solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]
-  solidcraft-cli licences
-  solidcraft-cli gpu [--policy auto|hardware|software|cpu]
-      (the GPU adapters a headless render can open, best first, the one the policy picks and the tier it
-       lands on: gpu, gpu-software, or the CPU rasterizer (auto with no adapter, or cpu); the policy defaults
-       to SOLIDCRAFT_GPU, else auto; exits with an error when hardware or software finds no such adapter)
-  solidcraft-cli icon --out icon.png [--size 256] | --out icon.ico
-";
+/// One command the CLI takes: the name to type, the usage it prints for `--help`,
+/// and whether the top-level usage lists it (an alias answers to another command's name).
+struct Command {
+    name: &'static str,
+    usage: &'static str,
+    listed: bool,
+}
+
+/// `run`'s lines in the usage.
+const USAGE_RUN: &str = "  solidcraft-cli run <script.json|design.solidcraft|part.step> [--in design.solidcraft|part.step] [--out FILE]... [--save FILE] [--quiet] [--results] [--timings] [--profile] [--json-out FILE] [--allow-errors]\n  solidcraft-cli run --in <design.solidcraft|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";
+/// `eval`'s lines in the usage.
+const USAGE_EVAL: &str = "  solidcraft-cli eval <script.json|design.solidcraft|part.step> [--json-out FILE]     (alias: inspect; or --in FILE)\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.
+const USAGE_SCRIPT: &str = "  solidcraft-cli script <design.solidcraft|script.json> [--out script.json]\n      (the design's history as a command script that eval and run replay)\n";
+/// `bench-open`'s lines in the usage.
+const USAGE_BENCH_OPEN: &str = "  solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only] [--save OUT.solidcraft] [--display LEVEL [--edit NAME EXPR]] [--ops script.json]\n      (--ops: after opening, run each command of the script and undo it, timing the command, the\n       evaluations it caused and the view it leaves: placing and meshing what changed)\n";
+/// `bench-agent`'s lines in the usage.
+const USAGE_BENCH_AGENT: &str = "  solidcraft-cli bench-agent [--scale F] [--save design.solidcraft] [--script-out script.json]\n";
+/// `bench-assistant`'s lines in the usage.
+const USAGE_BENCH_ASSISTANT: &str = "  solidcraft-cli bench-assistant --connect 127.0.0.1:PORT [--token T] --base-url URL --model NAME [--tasks 1,2,5] [--repeat N] [--timeout-s 300] [--json out.json] [--markdown out.md]\n";
+/// `snapshot`'s lines in the usage.
+const USAGE_SNAPSHOT: &str = "  solidcraft-cli snapshot <script|design> [--in design.solidcraft|part.step] --out shot.png [--width W] [--height H] [--view NAME | --camera JSON] [--no-grid] [--no-axes]\n      [--body NAME:opacity=0.3,color=#rrggbb]... [--tool NAME]... [--section z=27]\n  solidcraft-cli snapshot --in <design.solidcraft|part.step> --out shot.png ...\n      (as with run, --in starts from a design and the script runs on top of it; an option snapshot doesn't take is an error;\n       --view: iso, front, back, top, bottom, left, right, or the name of a view saved in the design with view.save;\n       --camera: {target: [x,y,z], yaw, pitch, distance, fov?} in mm and radians, as the MCP screenshot takes it (docs/mcp.md);\n       --no-grid and --no-axes leave the ground grid (on Z 0) and the origin's axes out of the picture;\n       --body: how one body is drawn, as appearance.assign takes it: opacity 0-1 (below 1 is see-through, so what is inside\n         it shows) and color #rrggbb, either or both, once per body;\n       --tool: draw this body solid in the tool colour and every other body see-through, so a cut's or a join's tool body\n         is visible inside the material it meets; a later --body overrides it;\n       --section: cut the model as inspect.section does, so the inside shows: z=27 (the plane through that world\n         coordinate, keeping the smaller side), add ,flip to keep the other side, or XY, XZ, YZ, or its own JSON)\n";
+/// `render`'s lines in the usage.
+const USAGE_RENDER: &str = "  solidcraft-cli render <script|design> --out image.png [--setup NAME] [--width W] [--height H] [--transparent] [--overwrite] [--timeout SECONDS]\n      [--progressive] [--samples N] [--max-depth N] [--seed N] [--exposure EV] [--lighting FILE.json] [--environment FILE.json] [--tone-map reinhard|aces_fitted]\n";
+/// `exec`'s lines in the usage.
+const USAGE_EXEC: &str = "  solidcraft-cli exec <command> [json-params]\n";
+/// `commands`'s lines in the usage.
+const USAGE_COMMANDS: &str = "  solidcraft-cli commands\n";
+/// `recipe`'s lines in the usage.
+const USAGE_RECIPE: &str = "  solidcraft-cli recipe <recipe.json>\n";
+/// `oracle`'s lines in the usage.
+const USAGE_ORACLE: &str = "  solidcraft-cli oracle <case-dir>... [--json]\n";
+/// `fuzz`'s lines in the usage.
+const USAGE_FUZZ: &str =
+    "  solidcraft-cli fuzz [--from N] [--count N] [--jobs J] [--timeout S] [--steps N] [--minimise] [--out DIR] [--report FILE]\n";
+/// `mcp`'s lines in the usage.
+const USAGE_MCP: &str = "  solidcraft-cli mcp [--headless] [--in design.solidcraft|script.json] [--connect 127.0.0.1:PORT [--token T]] [--allow-path DIR]... [--allow-any-path]\n                     [--param-check off|warn|strict]\n";
+/// `crashes`'s lines in the usage.
+const USAGE_CRASHES: &str = "  solidcraft-cli crashes [list [--json] | show <id> | replay <id> | dir | clear [<id>]]\n";
+/// `licences`'s lines in the usage.
+const USAGE_LICENCES: &str = "  solidcraft-cli licences\n";
+/// `gpu`'s lines in the usage.
+const USAGE_GPU: &str = "  solidcraft-cli gpu [--policy auto|hardware|software|cpu]\n      (the GPU adapters a headless render can open, best first, the one the policy picks and the tier it\n       lands on: gpu, gpu-software, or the CPU rasterizer (auto with no adapter, or cpu); the policy defaults\n       to SOLIDCRAFT_GPU, else auto; exits with an error when hardware or software finds no such adapter)\n";
+/// `icon`'s lines in the usage.
+const USAGE_ICON: &str = "  solidcraft-cli icon --out icon.png [--size 256] | --out icon.ico\n";
+/// `fuzz-one`'s lines in the usage: a seed and the flags of one fuzz run.
+const USAGE_FUZZ_ONE: &str = "  solidcraft-cli fuzz-one <seed> [--steps N] [--minimise]\n";
+/// `bench-edit`'s lines in the usage: the parameter a script changes.
+const USAGE_BENCH_EDIT: &str = "  solidcraft-cli bench-edit <script.json|recipe.json> <param> <expr>\n";
+/// `save-stress`'s lines in the usage: the file saved over and over.
+const USAGE_SAVE_STRESS: &str = "  solidcraft-cli save-stress <path> <rounds>\n";
+/// The flags every command takes, at the end of the top-level usage.
+const USAGE_DEBUG: &str = "  --debug, with any command: what SolidCraft logs (why a body has no display plan, why a save left its\n      model cache out), on stderr; RUST_LOG=error|warn|info|debug|trace sets one level for every crate\n";
+
+/// The commands the CLI takes, in the order the top-level usage lists them.
+const COMMANDS: &[Command] = &[
+    Command { name: "run", usage: USAGE_RUN, listed: true },
+    Command { name: "eval", usage: USAGE_EVAL, listed: true },
+    Command { name: "inspect", usage: USAGE_EVAL, listed: false },
+    Command { name: "script", usage: USAGE_SCRIPT, listed: true },
+    Command { name: "bench-open", usage: USAGE_BENCH_OPEN, listed: true },
+    Command { name: "bench-agent", usage: USAGE_BENCH_AGENT, listed: true },
+    Command { name: "bench-assistant", usage: USAGE_BENCH_ASSISTANT, listed: true },
+    Command { name: "snapshot", usage: USAGE_SNAPSHOT, listed: true },
+    Command { name: "render", usage: USAGE_RENDER, listed: true },
+    Command { name: "exec", usage: USAGE_EXEC, listed: true },
+    Command { name: "commands", usage: USAGE_COMMANDS, listed: true },
+    Command { name: "recipe", usage: USAGE_RECIPE, listed: true },
+    Command { name: "oracle", usage: USAGE_ORACLE, listed: true },
+    Command { name: "fuzz", usage: USAGE_FUZZ, listed: true },
+    Command { name: "fuzz-one", usage: USAGE_FUZZ_ONE, listed: false },
+    Command { name: "mcp", usage: USAGE_MCP, listed: true },
+    Command { name: "crashes", usage: USAGE_CRASHES, listed: true },
+    Command { name: "licences", usage: USAGE_LICENCES, listed: true },
+    Command { name: "licenses", usage: USAGE_LICENCES, listed: false },
+    Command { name: "gpu", usage: USAGE_GPU, listed: true },
+    Command { name: "icon", usage: USAGE_ICON, listed: true },
+    Command { name: "bench-edit", usage: USAGE_BENCH_EDIT, listed: false },
+    Command { name: "save-stress", usage: USAGE_SAVE_STRESS, listed: false },
+];
 
 fn main() -> ExitCode {
-    let args: Vec<String> = std::env::args().skip(1).collect();
+    let mut args: Vec<String> = std::env::args().skip(1).collect();
+    logger::init(&mut args);
     let r = match args.first().map(String::as_str) {
+        // Asked-for help is not an error: the command's usage on stdout, exit 0. It is read
+        // before the command runs, so `--help` never starts a run (a fuzz run, a server).
+        Some(cmd) if wants_help(&args[1..]) && is_command(cmd) => {
+            use std::io::Write as _;
+            let _ = std::io::stdout().lock().write_all(command_usage(cmd).as_bytes());
+            Ok(())
+        }
         Some("run") => cmd_run(&args[1..]),
         Some("eval" | "inspect") => cmd_eval(&args[1..]),
         Some("script") => cmd_script(&args[1..]),
@@ -105,7 +158,7 @@ fn main() -> ExitCode {
                 }
             })
         }
-        Some("recipe") => args.get(1).ok_or_else(|| USAGE.to_string()).and_then(|p| {
+        Some("recipe") => args.get(1).ok_or_else(usage).and_then(|p| {
             let v = read_json(p)?;
             recipe::to_script(&v).map(|s| println!("{}", pretty(&s)))
         }),
@@ -128,11 +181,19 @@ fn main() -> ExitCode {
         Some("bench-open") => cmd_bench_open(&args[1..]),
         // A ~1,300-body design built command by command, as an agent builds one over MCP.
         Some("bench-agent") => bench_agent::run(&args[1..]),
+        // The standard Assistant model test (#4851), run against a desktop app over its control channel.
+        Some("bench-assistant") => bench_assistant::run(&args[1..]),
         Some("--version" | "-V") => {
             println!("solidcraft-cli {}", env!("CARGO_PKG_VERSION"));
             Ok(())
         }
-        _ => Err(USAGE.to_string()),
+        // Asked-for help is not an error: usage on stdout, exit 0.
+        Some("--help" | "-h" | "help") => {
+            use std::io::Write as _;
+            let _ = std::io::stdout().lock().write_all(usage().as_bytes());
+            Ok(())
+        }
+        _ => Err(usage()),
     };
     match r {
         Ok(()) => ExitCode::SUCCESS,
@@ -147,6 +208,35 @@ fn pretty(v: &Value) -> String {
     serde_json::to_string_pretty(v).unwrap_or_default()
 }
 
+/// The whole usage: every command's lines under one `usage:` line. The lines come from the
+/// same place a command's own `--help` prints, so the two cannot drift apart.
+fn usage() -> String {
+    let mut s = String::from("usage:\n");
+    for c in COMMANDS.iter().filter(|c| c.listed) {
+        s.push_str(c.usage);
+    }
+    s.push_str(USAGE_DEBUG);
+    s
+}
+
+/// A command's own usage: its lines under a `usage:` line.
+fn command_usage(cmd: &str) -> String {
+    match COMMANDS.iter().find(|c| c.name == cmd) {
+        Some(c) => format!("usage:\n{}", c.usage),
+        None => usage(),
+    }
+}
+
+/// Whether the name is a command the CLI takes.
+fn is_command(cmd: &str) -> bool {
+    COMMANDS.iter().any(|c| c.name == cmd)
+}
+
+/// Whether the arguments ask for help.
+fn wants_help(args: &[String]) -> bool {
+    args.iter().any(|a| a == "--help" || a == "-h")
+}
+
 pub fn read_json(path: &str) -> Result<Value, String> {
     // Through the engine's file access, which refuses anything that is not a regular file and
     // reads no more than the cap: a character device or a FIFO would otherwise never end.
@@ -252,7 +342,7 @@ fn cmd_run(args: &[String]) -> Result<(), String> {
     let base = flag(args, "--in");
     let path = positional(args);
     if path.is_none() && base.is_none() {
-        return Err(USAGE.to_string());
+        return Err(usage());
     }
     let want_results = args.iter().any(|a| a == "--results");
     // `--profile` times each command and splits out its kernel time; it implies `--timings`.
@@ -312,13 +402,14 @@ fn open(base: Option<&str>, path: Option<&String>) -> Result<Session, String> {
         }
         (Some(b), None) => load(b),
         (None, Some(p)) => load(p),
-        (None, None) => Err(USAGE.to_string()),
+        (None, None) => Err(usage()),
     }
 }
 
 /// Refuses an option `cmd` doesn't take, and one missing its value: a typo, or another
-/// command's option, would otherwise be ignored without a word.
-fn known_flags(cmd: &str, args: &[String], valued: &[&str], switches: &[&str]) -> Result<(), String> {
+/// command's option, would otherwise be ignored without a word. `positionals` says whether the
+/// command takes a word of its own (a file, a seed): `fuzz` takes none, and would start a run.
+fn known_args(cmd: &str, args: &[String], valued: &[&str], switches: &[&str], positionals: bool) -> Result<(), String> {
     let mut i = 0;
     while let Some(a) = args.get(i) {
         if valued.contains(&a.as_str()) {
@@ -326,7 +417,9 @@ fn known_flags(cmd: &str, args: &[String], valued: &[&str], switches: &[&str]) -
                 Some(v) if !v.starts_with("--") => i += 2,
                 _ => return Err(format!("{cmd}: {a} needs a value")),
             }
-        } else if a.starts_with("--") && !switches.contains(&a.as_str()) {
+        } else if switches.contains(&a.as_str()) {
+            i += 1;
+        } else if a.starts_with("--") || !positionals {
             return Err(format!("{cmd} doesn't take {a} (it takes {})", [valued, switches].concat().join(", ")));
         } else {
             i += 1;
@@ -350,7 +443,7 @@ fn timeline_ok(s: &Session) -> Result<(), String> {
 
 fn cmd_eval(args: &[String]) -> Result<(), String> {
     let json_out = json_out(args)?;
-    let path = flag(args, "--in").or_else(|| positional(args).map(String::as_str)).ok_or_else(|| USAGE.to_string())?;
+    let path = flag(args, "--in").or_else(|| positional(args).map(String::as_str)).ok_or_else(usage)?;
     let mut s = load(path)?;
     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())?;
@@ -368,7 +461,7 @@ fn cmd_eval(args: &[String]) -> Result<(), String> {
 /// A design's history as a command script (`timeline.export_script`): printed, or written to
 /// `--out`; what the script leaves out goes to stderr.
 fn cmd_script(args: &[String]) -> Result<(), String> {
-    let path = positional(args).ok_or_else(|| USAGE.to_string())?;
+    let path = positional(args).ok_or_else(usage)?;
     let s = &mut load(path)?;
     let out = flag(args, "--out");
     let r = s.execute("timeline.export_script", &json!({"path": out})).map_err(|e| e.to_string())?;
@@ -429,14 +522,15 @@ fn install_renderer() {
 
 fn cmd_snapshot(args: &[String]) -> Result<(), String> {
     install_renderer();
-    known_flags(
+    known_args(
         "snapshot",
         args,
         &["--in", "--out", "--width", "--height", "--view", "--camera", "--body", "--tool", "--section"],
         &["--no-grid", "--no-axes"],
+        true,
     )?;
     if positional(args).is_none() && flag(args, "--in").is_none() {
-        return Err(USAGE.to_string());
+        return Err(usage());
     }
     let out = flag(args, "--out").ok_or("snapshot needs --out FILE.png")?;
     let size = |name: &str, default: u32| match flag(args, name) {
@@ -520,7 +614,7 @@ fn ico(images: &[(usize, Vec<u8>)]) -> Result<Vec<u8>, String> {
 
 fn cmd_exec(args: &[String]) -> Result<(), String> {
     install_renderer();
-    let id = args.first().ok_or_else(|| USAGE.to_string())?;
+    let id = args.first().ok_or_else(usage)?;
     let p: Value = match args.get(1) {
         Some(t) => serde_json::from_str(t).map_err(|e| format!("params: {e}"))?,
         None => json!({}),
@@ -579,17 +673,37 @@ fn cmd_mcp(args: &[String]) -> Result<(), String> {
             Box::new(remote)
         }
         (None, Some(path)) => Box::new(solidcraft_mcp::Headless::new(load_checked(path, param_check)?)),
+        // No arguments: the running desktop app, found through the discovery file it wrote
+        // (docs/control-protocol.md); none running (or `--headless`): a session of its own.
         (None, None) => {
+            if !args.iter().any(|a| a == "--headless")
+                && 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 mut headless = solidcraft_mcp::Headless::default();
             headless.session.param_check = param_check;
             Box::new(headless)
         }
     };
+    serve_mcp(backend, scope)
+}
+
+fn serve_mcp(backend: Box<dyn solidcraft_mcp::Backend>, scope: Option<solidcraft_engine::io::vfs::PathScope>) -> Result<(), String> {
     let stdin = std::io::stdin();
     let stdout = std::io::stdout();
     solidcraft_mcp::Server::new(backend).with_path_scope(scope).serve(stdin.lock(), stdout.lock()).map_err(|e| e.to_string())
 }
 
+/// The port of the running desktop app: the one its discovery file names, if something listens
+/// there (a file left by an app that crashed names a closed port).
+fn discover_app() -> Option<u16> {
+    let port = solidcraft_engine::control_auth::read_current_port()?;
+    let addr = std::net::SocketAddr::from(([127, 0, 0, 1], port));
+    std::net::TcpStream::connect_timeout(&addr, std::time::Duration::from_millis(500)).ok().map(|_| port)
+}
+
 /// `save-stress <path> <rounds>`: save a design of a few hundred kilobytes `rounds` times, its
 /// parameter `save_round` set to the round number each time.
 fn cmd_save_stress(args: &[String]) -> Result<(), String> {
@@ -642,6 +756,36 @@ fn cmd_bench_edit(args: &[String]) -> Result<(), String> {
     Ok(())
 }
 
+/// `bench-open --ops`: each command of `script` (a JSON array of `{command, params}`), then its
+/// undo, each timed as the command and the view it leaves (the placed model, its meshes warmed
+/// as the desktop does after a change).
+fn bench_ops(mut s: Session, script: &str) -> Result<Session, String> {
+    let text = std::fs::read_to_string(script).map_err(|e| format!("{script}: {e}"))?;
+    let ops: Value = serde_json::from_str(&text).map_err(|e| format!("{script}: {e}"))?;
+    let ops = ops.as_array().ok_or("--ops: a JSON array of {command, params}")?;
+    let time = |s: &mut Session, id: &str, p: &Value| -> Result<Value, String> {
+        let t = std::time::Instant::now();
+        let r = s.execute(id, p).map_err(|e| format!("{id}: {e}"))?;
+        let ms = t.elapsed().as_secs_f64() * 1000.0;
+        let t = std::time::Instant::now();
+        s.world_state().warm_meshes(|| true);
+        let view_ms = t.elapsed().as_secs_f64() * 1000.0;
+        println!("{}", json!({"step": "op", "command": id, "ms": ms, "view_ms": view_ms}));
+        Ok(r)
+    };
+    for op in ops {
+        let id = op.get("command").and_then(Value::as_str).ok_or("--ops: each step needs a `command`")?;
+        let p = op.get("params").cloned().unwrap_or(Value::Null);
+        let steps = s.undo.len();
+        time(&mut s, id, &p)?;
+        // Commands that are no undo step (showing and hiding) have nothing to undo.
+        if op.get("undo").and_then(Value::as_bool) != Some(false) && s.undo.len() > steps {
+            time(&mut s, "edit.undo", &json!({}))?;
+        }
+    }
+    Ok(s)
+}
+
 /// Separate file reading, JSON decoding/repair, timeline evaluation and display meshing.
 pub(crate) fn cmd_bench_open(args: &[String]) -> Result<(), String> {
     let path = args.first().ok_or("usage: solidcraft-cli bench-open <design.solidcraft | part.step> [--parse-only]")?;
@@ -672,9 +816,10 @@ pub(crate) fn cmd_bench_open(args: &[String]) -> Result<(), String> {
     let t = std::time::Instant::now();
     let s = Session::opened(doc, saved.as_ref());
     drop(read);
-    // Taken from the file: nothing evaluated (SOLIDCRAFT_NO_MODEL_CACHE evaluates anyway).
+    // Taken from the file: nothing evaluated (SOLIDCRAFT_NO_MODEL_CACHE evaluates anyway), or
+    // only the features whose state a thinned file left out.
     let adopted = saved.is_some() && s.model.last_recomputed == 0;
-    println!("{}", json!({"step": "evaluate", "ms": t.elapsed().as_secs_f64() * 1000.0, "adopted": adopted}));
+    println!("{}", json!({"step": "evaluate", "ms": t.elapsed().as_secs_f64() * 1000.0, "adopted": adopted, "recomputed": s.model.last_recomputed}));
     for r in &s.model.results {
         println!("{}", json!({"step": "feature", "id": r.id, "name": r.name, "ms": r.ms, "error": r.error}));
     }
@@ -727,6 +872,10 @@ pub(crate) fn cmd_bench_open(args: &[String]) -> Result<(), String> {
     // `--display LEVEL`: the display plans the viewport draws at that display quality, made as
     // the GPU viewport makes them; `--edit NAME EXPR` then changes a parameter and times the
     // evaluation and the plans of the bodies it changed.
+    let s = match flag("--ops").and_then(|i| args.get(i + 1)) {
+        Some(ops) => bench_ops(s, ops)?,
+        None => s,
+    };
     let Some(level) = flag("--display").and_then(|i| args.get(i + 1)) else { return Ok(()) };
     let q = solidcraft_engine::doc::display_quality::DisplayQuality::parse(level).ok_or("--display: coarse, normal, fine or ultra")?;
     let plans = |st: &solidcraft_engine::doc::ModelState| {

apps/solidcraft-cli/src/render.rs

@@ -11,15 +11,25 @@ pub fn run(args: &[String]) -> Result<(), String> {
     let mut setup = None;
     let mut width = None;
     let mut height = None;
+    let mut progressive = false;
+    let mut samples = None;
+    let mut max_depth = None;
+    let mut seed = None;
+    let mut exposure = None;
+    let mut lighting = None;
+    let mut tone_map = None;
+    let mut environment = None;
     let mut transparent = false;
     let mut overwrite = false;
     let mut timeout = 120u64;
     let mut i = 1;
     while let Some(arg) = args.get(i) {
         match arg.as_str() {
+            "--progressive" => progressive = true,
             "--transparent" => transparent = true,
             "--overwrite" => overwrite = true,
-            "--out" | "--setup" | "--width" | "--height" | "--timeout" => {
+            "--out" | "--setup" | "--width" | "--height" | "--timeout" | "--samples" | "--max-depth" | "--seed" | "--exposure" | "--lighting"
+            | "--tone-map" | "--environment" => {
                 i += 1;
                 let value = args.get(i).ok_or_else(|| format!("missing value for {arg}"))?;
                 match arg.as_str() {
@@ -27,6 +37,26 @@ pub fn run(args: &[String]) -> Result<(), String> {
                     "--setup" => setup = Some(value.clone()),
                     "--width" => width = Some(value.parse::<u32>().map_err(|_| "invalid width")?),
                     "--height" => height = Some(value.parse::<u32>().map_err(|_| "invalid height")?),
+                    "--samples" => samples = Some(value.parse::<u32>().map_err(|_| "invalid samples")?),
+                    "--max-depth" => max_depth = Some(value.parse::<u32>().map_err(|_| "invalid depth")?),
+                    "--seed" => seed = Some(value.parse::<u32>().map_err(|_| "invalid seed")?),
+                    "--exposure" => exposure = Some(value.parse::<f64>().map_err(|_| "invalid exposure")?),
+                    "--environment" => {
+                        let text =
+                            solidcraft_engine::io::vfs::read_to_string(value, 65536).map_err(|e| format!("could not read environment: {e}"))?;
+                        environment = Some(serde_json::from_str::<serde_json::Value>(&text).map_err(|e| e.to_string())?);
+                    }
+                    "--lighting" => {
+                        let text = solidcraft_engine::io::vfs::read_to_string(value, 65536).map_err(|e| format!("could not read lighting: {e}"))?;
+                        lighting = Some(serde_json::from_str::<solidcraft_engine::render::job::StudioLighting>(&text).map_err(|e| e.to_string())?);
+                    }
+                    "--tone-map" => {
+                        tone_map = Some(match value.as_str() {
+                            "reinhard" => solidcraft_engine::render::job::ToneMap::Reinhard,
+                            "aces_fitted" => solidcraft_engine::render::job::ToneMap::AcesFitted,
+                            _ => return Err("tone-map must be reinhard or aces_fitted".into()),
+                        })
+                    }
                     _ => timeout = value.parse::<u64>().map_err(|_| "invalid timeout")?,
                 }
             }
@@ -40,6 +70,9 @@ pub fn run(args: &[String]) -> Result<(), String> {
     let out = out.ok_or("render requires --out FILE.png")?;
     let mut session = crate::load(input)?;
     session.set_render_job_host(Some(CpuHost::for_platform().map_err(|e| e.to_string())?)).map_err(|e| e.to_string())?;
+    if progressive {
+        session.register_render_job_host(solidcraft_gpu::path::host().map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
+    }
     session.execute("render.scene", &json!({})).map_err(|e| e.to_string())?;
     let mut settings = if let Some(name) = setup {
         session.doc.render.setups.get(&name).cloned().ok_or("no saved render setup with that name")?
@@ -58,7 +91,10 @@ pub fn run(args: &[String]) -> Result<(), String> {
     if let Some(height) = height {
         settings.height = height;
     }
-    let params = json!({"settings":settings,"transparent_background":transparent});
+    if let Some(exposure) = exposure {
+        settings.exposure_ev = exposure;
+    }
+    let params = json!({"settings":settings,"transparent_background":transparent,"progressive":progressive,"samples":samples,"max_depth":max_depth,"seed":seed,"lighting":lighting,"tone_map":tone_map,"environment":environment});
     let preflight = session.execute("render.preflight", &params).map_err(|e| e.to_string())?;
     let started = session.execute("render.start", &params).map_err(|e| e.to_string())?;
     let id: JobId = serde_json::from_value(started["job"].clone()).map_err(|e| e.to_string())?;

apps/solidcraft-cli/tests/action_matrix.rs

@@ -1412,7 +1412,7 @@ fn a_sketch_on_a_patterned_boss_top() {
 fn construction_geometry_and_holes_on_a_moved_component() {
     let moved = || {
         vec![
-            json!({"command": "component.create", "params": {"name": "Arm"}}),
+            json!({"command": "component.create", "params": {"name": "Arm", "grounded": false}}),
             json!({"command": "solid.box", "params": {"corner": [20, 0, 0], "length": 10, "width": 4, "height": 4, "body_name": "ArmBody"}}),
             json!({"command": "component.activate", "params": {"component": 0}}),
             json!({"command": "occurrence.move", "params": {"occurrence": "Arm:1", "translate": [0, 50, 0]}}),

apps/solidcraft-cli/tests/corpus/scripts/components-arm.json

@@ -1,6 +1,6 @@
 {"commands": [
  {"command": "solid.box", "params": {"length": 10, "width": 10, "height": 10, "body_name": "Base"}},
- {"command": "component.create", "params": {"name": "Arm"}},
+ {"command": "component.create", "params": {"name": "Arm", "grounded": false}},
  {"command": "solid.box", "params": {"corner": [20, 0, 0], "length": 10, "width": 4, "height": 4, "body_name": "ArmBody"}},
  {"command": "solid.fillet", "params": {"edges": [[25, 4, 4]], "radius": 1}},
  {"command": "component.activate", "params": {"component": 0}},

apps/solidcraft-cli/tests/help_output.rs

@@ -0,0 +1,159 @@
+//! An explicit help request prints usage to stdout and succeeds; an unknown command still fails.
+
+use std::process::{Command, Stdio};
+use std::time::{Duration, Instant};
+
+/// Every command the CLI takes, with the name its own usage names: `inspect` is `eval`, and
+/// `licenses` is `licences`.
+const COMMANDS: &[(&str, &str)] = &[
+    ("run", "run"),
+    ("eval", "eval"),
+    ("inspect", "eval"),
+    ("script", "script"),
+    ("bench-open", "bench-open"),
+    ("bench-agent", "bench-agent"),
+    ("snapshot", "snapshot"),
+    ("render", "render"),
+    ("exec", "exec"),
+    ("commands", "commands"),
+    ("recipe", "recipe"),
+    ("oracle", "oracle"),
+    ("fuzz", "fuzz"),
+    ("fuzz-one", "fuzz-one"),
+    ("mcp", "mcp"),
+    ("crashes", "crashes"),
+    ("licences", "licences"),
+    ("licenses", "licences"),
+    ("gpu", "gpu"),
+    ("icon", "icon"),
+    ("bench-edit", "bench-edit"),
+    ("save-stress", "save-stress"),
+];
+
+/// The commands the usage lists: the aliases answer to another command's name.
+const LISTED: &[&str] = &[
+    "run",
+    "eval",
+    "script",
+    "bench-open",
+    "bench-agent",
+    "snapshot",
+    "render",
+    "exec",
+    "commands",
+    "recipe",
+    "oracle",
+    "fuzz",
+    "mcp",
+    "crashes",
+    "licences",
+    "gpu",
+    "icon",
+];
+
+/// The command names a text mentions after `solidcraft-cli `, each one only once.
+fn mentioned(text: &str) -> Vec<&str> {
+    let mut names: Vec<&str> = text.split("solidcraft-cli ").skip(1).filter_map(|rest| rest.split_whitespace().next()).collect();
+    names.sort_unstable();
+    names.dedup();
+    names
+}
+
+/// Runs the binary and waits at most `limit` for it to finish. `None` means it was still
+/// running and was killed: the fuzz run `fuzz --help` used to start goes on for minutes.
+fn run_within(limit: Duration, args: &[&str]) -> Option<(Option<i32>, String, String)> {
+    let mut child = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(args).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
+    let started = Instant::now();
+    loop {
+        match child.try_wait().unwrap() {
+            Some(status) => {
+                let out = child.wait_with_output().unwrap();
+                return Some((status.code(), String::from_utf8_lossy(&out.stdout).into_owned(), String::from_utf8_lossy(&out.stderr).into_owned()));
+            }
+            None if started.elapsed() >= limit => {
+                let _ = child.kill();
+                let _ = child.wait();
+                return None;
+            }
+            None => std::thread::sleep(Duration::from_millis(25)),
+        }
+    }
+}
+
+#[test]
+fn help_prints_usage_and_succeeds() {
+    for arg in ["--help", "-h", "help"] {
+        let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg(arg).output().unwrap();
+        assert!(output.status.success(), "{arg}: {}", String::from_utf8_lossy(&output.stderr));
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        assert!(stdout.starts_with("usage:"), "{arg}: {stdout}");
+        assert!(stdout.contains("solidcraft-cli run"), "{arg}: {stdout}");
+        assert!(output.stderr.is_empty(), "{arg}: {}", String::from_utf8_lossy(&output.stderr));
+    }
+}
+
+#[test]
+fn unknown_command_still_fails_with_usage() {
+    let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("--not-a-command").output().unwrap();
+    assert!(!output.status.success());
+    assert!(output.stdout.is_empty());
+    assert!(String::from_utf8_lossy(&output.stderr).starts_with("error: usage:"));
+}
+
+#[test]
+fn every_command_prints_its_own_usage() {
+    for (cmd, named) in COMMANDS {
+        for flag in ["--help", "-h"] {
+            let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args([*cmd, flag]).output().unwrap();
+            assert!(output.status.success(), "{cmd} {flag}: {}", String::from_utf8_lossy(&output.stderr));
+            let stdout = String::from_utf8_lossy(&output.stdout);
+            assert!(stdout.starts_with("usage:"), "{cmd} {flag}: {stdout}");
+            assert_eq!(mentioned(&stdout), vec![*named], "{cmd} {flag} printed another command's usage: {stdout}");
+            assert!(output.stderr.is_empty(), "{cmd} {flag}: {}", String::from_utf8_lossy(&output.stderr));
+        }
+    }
+}
+
+#[test]
+fn the_top_level_usage_still_lists_every_command() {
+    let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).arg("--help").output().unwrap();
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    for cmd in LISTED {
+        assert!(stdout.contains(&format!("solidcraft-cli {cmd}")), "{cmd}: {stdout}");
+    }
+}
+
+#[test]
+fn fuzz_help_does_not_start_a_fuzz_run() {
+    let Some((code, stdout, stderr)) = run_within(Duration::from_secs(20), &["fuzz", "--help"]) else {
+        panic!("`fuzz --help` kept running: it started a fuzz run instead of printing the usage");
+    };
+    assert_eq!(code, Some(0), "{stderr}");
+    assert!(stdout.starts_with("usage:"), "{stdout}");
+    assert_eq!(mentioned(&stdout), vec!["fuzz"], "{stdout}");
+    assert!(stderr.is_empty(), "{stderr}");
+}
+
+#[test]
+fn fuzz_refuses_an_argument_it_does_not_take() {
+    for arg in ["--not-a-flag", "stray"] {
+        let Some((code, _stdout, stderr)) = run_within(Duration::from_secs(20), &["fuzz", arg]) else {
+            panic!("`fuzz {arg}` kept running: it started a fuzz run instead of refusing the argument");
+        };
+        assert_ne!(code, Some(0), "`fuzz {arg}` succeeded");
+        assert!(stderr.contains(arg), "`fuzz {arg}`: {stderr}");
+    }
+}
+
+#[test]
+fn render_help_keeps_the_registered_gpu_request_controls() {
+    for args in [vec!["--help"], vec!["render", "--help"]] {
+        let output = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(&args).output().unwrap();
+        assert!(output.status.success(), "{args:?}: {}", String::from_utf8_lossy(&output.stderr));
+        assert!(output.stderr.is_empty());
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        for flag in ["--progressive", "--samples", "--max-depth", "--seed", "--exposure", "--lighting", "--environment", "--tone-map"] {
+            assert!(stdout.contains(flag), "{args:?} lost {flag}: {stdout}");
+        }
+    }
+}

apps/solidcraft-cli/tests/mcp_connect.rs

@@ -89,3 +89,65 @@ fn mcp_connect_without_a_port_is_refused_at_start() {
         assert!(stderr.contains("HOST:PORT"), "{addr}: {stderr}");
     }
 }
+
+/// `mcp` with no arguments finds the running app through the discovery file and uses that
+/// launch's token; with no app behind the file it stays a headless session.
+#[test]
+fn mcp_without_arguments_finds_the_running_app() {
+    let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+    let port = listener.local_addr().unwrap().port();
+    let control_dir = std::env::temp_dir().join(format!("solidcraft-mcp-discover-{}-{port}", std::process::id()));
+    std::fs::create_dir_all(&control_dir).unwrap();
+    let token = "fedcba9876543210".repeat(4);
+    std::fs::write(control_dir.join(format!("{port}.token")), &token).unwrap();
+    std::fs::write(control_dir.join("current.port"), format!("{port}\n")).unwrap();
+    let app = std::thread::spawn(move || {
+        // The discovery probe connects and leaves without a request; the tool call follows.
+        let (stream, line) = loop {
+            let (stream, _) = listener.accept().unwrap();
+            let mut line = String::new();
+            BufReader::new(stream.try_clone().unwrap()).read_line(&mut line).unwrap();
+            if !line.is_empty() {
+                break (stream, line);
+            }
+        };
+        let req: Value = serde_json::from_str(&line).unwrap();
+        let ok = req["token"] == json!(token);
+        let reply = json!({"id": req["id"], "ok": ok, "result": {"bodies": [], "method": req["method"]}, "error": "unauthorized"});
+        writeln!(&stream, "{reply}").unwrap();
+    });
+    let mut child = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
+        .args(["mcp", "--allow-any-path"])
+        .env("SOLIDCRAFT_CONTROL_DIR", &control_dir)
+        .env_remove("SOLIDCRAFT_CONTROL_TOKEN")
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+    let mut stdin = child.stdin.take().unwrap();
+    let mut stdout = BufReader::new(child.stdout.take().unwrap());
+    writeln!(stdin, "{}", json!({"jsonrpc": "2.0", "id": 1, "method": "tools/call", "params": {"name": "measure", "arguments": {}}})).unwrap();
+    let mut line = String::new();
+    stdout.read_line(&mut line).unwrap();
+    let r: Value = serde_json::from_str(&line).unwrap_or_else(|e| panic!("{e}: {line:?}"));
+    assert_ne!(r["result"]["isError"], true, "{r}");
+    assert!(r["result"]["content"][0]["text"].as_str().unwrap_or_default().contains("engine.execute"), "{r}");
+    app.join().unwrap();
+    drop(stdin);
+    assert!(child.wait().unwrap().success());
+
+    // The file names a port nothing listens on (the app crashed): a headless session instead.
+    let closed = TcpListener::bind("127.0.0.1:0").unwrap();
+    let dead = closed.local_addr().unwrap().port();
+    drop(closed);
+    std::fs::write(control_dir.join("current.port"), format!("{dead}\n")).unwrap();
+    let out = Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"))
+        .args(["mcp", "--allow-any-path"])
+        .env("SOLIDCRAFT_CONTROL_DIR", &control_dir)
+        .stdin(Stdio::null())
+        .output()
+        .unwrap();
+    assert!(!String::from_utf8_lossy(&out.stderr).contains("bridged to the running app"), "{}", String::from_utf8_lossy(&out.stderr));
+    std::fs::remove_dir_all(&control_dir).ok();
+}

apps/solidcraft-cli/tests/model_cache.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 
 use serde_json::{Value, json};
 use solidcraft_engine::Session;
-use solidcraft_engine::doc::{ModelBody, ModelState};
+use solidcraft_engine::doc::{ModelBody, ModelState, SavedModel};
 
 fn corpus() -> Vec<PathBuf> {
     let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus");
@@ -149,6 +149,87 @@ fn imported_assemblies_open_from_their_model_as_evaluated() {
     check("imported hinge", s);
 }
 
+/// `built` saved with `saved`, a model of it that keeps only some states (as a file without room
+/// for all of them does, #3220), opens as the design evaluated again: evaluating just the
+/// features whose state the file left out, then after suppressing a feature at, before or after
+/// each state it kept, after undoing that, and with the marker moved there and back.
+fn check_thinned(name: &str, built: &Session, saved: &SavedModel) {
+    let design = built.design();
+    let bytes =
+        solidcraft_engine::io::write_design_container_with_cache(&design, solidcraft_engine::io::DesignCompression::Fast, None, Some(saved)).unwrap();
+    assert!(solidcraft_engine::io::read_design_geometry(&bytes).is_some(), "{name}: the file keeps the final state");
+    let path = temp(&name.replace(' ', "-"));
+    std::fs::write(&path, &bytes).unwrap();
+    let mut cached = open(&path);
+    let mut rebuilt = Session::new(solidcraft_engine::io::read_design(&bytes).unwrap());
+    let features = saved.records["features"].as_array().unwrap();
+    let unkept = features.iter().filter(|f| f["skipped"] == false && f.get("state").is_none()).count();
+    assert!(unkept > 0, "{name}: some states left out");
+    assert_eq!(cached.model.recomputed, unkept, "{name}: evaluated just the features whose state the file left out");
+    assert_eq!(model(name, &cached), model(name, &rebuilt), "{name}: opened from the file's model");
+    let n = cached.doc.features.len();
+    let mut at: Vec<usize> = features
+        .iter()
+        .enumerate()
+        .filter(|(_, f)| f["skipped"] == false && f.get("state").is_some())
+        .flat_map(|(k, _)| [k.saturating_sub(1), k, k + 1])
+        .filter(|i| *i < n)
+        .collect();
+    at.dedup();
+    for i in at {
+        let edit = json!({"feature": cached.doc.features[i].id, "suppressed": true});
+        let (a, b) = (cached.execute("timeline.suppress", &edit), rebuilt.execute("timeline.suppress", &edit));
+        assert_eq!(a.is_ok(), b.is_ok(), "{name}: suppressing feature {i}");
+        assert_eq!(model(name, &cached), model(name, &rebuilt), "{name}: feature {i} suppressed");
+        if a.is_ok() {
+            cached.execute("edit.undo", &json!({})).unwrap();
+            rebuilt.execute("edit.undo", &json!({})).unwrap();
+            assert_eq!(model(name, &cached), model(name, &rebuilt), "{name}: suppressing feature {i} undone");
+        }
+        for marker in [json!({"position": i}), json!({})] {
+            cached.execute("timeline.rollback", &marker).unwrap();
+            rebuilt.execute("timeline.rollback", &marker).unwrap();
+            assert_eq!(model(name, &cached), model(name, &rebuilt), "{name}: the marker at {marker}, from feature {i}");
+        }
+    }
+    let _ = std::fs::remove_file(&path);
+}
+
+/// A model too big for its file keeps the final state, then the slowest features' states as fit
+/// (#3220). Both the smallest such model (the final state, and states that add no body to it)
+/// and one that keeps more open as the design evaluated again. The placed components' design has
+/// a cut whose fingerprint reads where the bodies before it lie, which a state left out does not
+/// say until it is evaluated.
+#[test]
+fn thinned_models_open_as_evaluated() {
+    let corpus = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus/components-arm.solidcraft");
+    for sample in ["Sample Plate", "Plastic Enclosure", "components-arm"] {
+        let built = match solidcraft_engine::sample::samples().into_iter().find(|s| s.name == sample) {
+            Some(s) => {
+                let mut built = Session::default();
+                for c in (s.script)()["commands"].as_array().unwrap() {
+                    built.execute(c["command"].as_str().unwrap(), &c["params"]).unwrap();
+                }
+                built
+            }
+            None => open(&corpus),
+        };
+        let saved = built.model.saved(&built.design()).unwrap();
+        // Every body a megabyte (the records fit in the room left over): each budget keeps one more
+        // body's worth of states.
+        let body = 1 << 20;
+        let pieces: Vec<Vec<(usize, usize)>> = (0..saved.bodies.len()).map(|i| vec![(i, body)]).collect();
+        let thinned: Vec<SavedModel> =
+            (0..=saved.bodies.len()).filter_map(|n| saved.thinned(&pieces, n * body + body - 1).map(|(m, _, _)| m)).collect();
+        let kept = |m: &SavedModel| m.records["features"].as_array().unwrap().iter().filter(|f| f.get("state").is_some()).count();
+        let smallest = thinned.first().unwrap();
+        assert!(smallest.records["states"].as_array().unwrap().len() < saved.records["states"].as_array().unwrap().len(), "{sample}");
+        let more = thinned.iter().find(|m| kept(m) > kept(smallest) && kept(m) < built.doc.features.len()).unwrap();
+        check_thinned(&format!("{sample} smallest"), &built, smallest);
+        check_thinned(&format!("{sample} thinned"), &built, more);
+    }
+}
+
 /// Opened from its model, a design evaluates only from the first feature an edit changes: the
 /// saved states before it are kept as they were read (the same states, not evaluated again).
 #[test]

apps/solidcraft-web/Cargo.toml

@@ -29,5 +29,6 @@ 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",
-    "BeforeUnloadEvent", "Event", "EventTarget", "Response", "MediaQueryList", "Gamepad", "Performance",
+    "IdbFactory", "IdbDatabase", "IdbObjectStore", "IdbOpenDbRequest", "IdbRequest", "IdbTransaction", "IdbTransactionMode",
+    "BeforeUnloadEvent", "Event", "EventTarget", "KeyboardEvent", "Response", "MediaQueryList", "Gamepad", "Performance",
 ] }

apps/solidcraft-web/src/disk.rs

@@ -0,0 +1,637 @@
+//! Designs on the computer's own disk, through the File System Access API (Chrome, Edge, Opera):
+//! Save As and Open show the browser's file dialogs, and the chosen file's handle is kept (in
+//! memory, and in IndexedDB so Save still reaches the file after a reload) so Save writes back to
+//! it. To the engine such a design is the file `/disk/<id>/<name>`: it saves there like anywhere,
+//! and [`flush`](crate::files::flush) forwards what it wrote to the handle. Browsers without the
+//! API (Firefox, Safari) keep designs in the origin private file system (`files.rs`).
+//!
+//! The path logic is plain Rust and tested natively; the browser calls are wasm-only.
+#![cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+
+/// Where a design on the computer's disk appears to the engine.
+pub const PREFIX: &str = "/disk/";
+
+/// Where designs kept in the browser's private storage (OPFS) appear to the engine.
+pub const OPFS_PREFIX: &str = "/opfs/";
+/// Paths written here are handed to the user as downloads.
+pub const DOWNLOADS_PREFIX: &str = "/downloads/";
+
+/// Where what a command wrote to an engine path goes.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum WriteTo {
+    /// The browser's private storage: the design (or recovery file) keeps its name there.
+    Opfs,
+    /// A file on the computer, through its handle.
+    Disk,
+    /// A download.
+    Download,
+    /// Kept only in memory (uploads).
+    Memory,
+}
+
+/// Route a write by its path. OPFS paths always go to OPFS, whatever the browser can do: a design
+/// opened from the browser's storage keeps saving there until the user picks Save As.
+pub fn route(path: &str) -> WriteTo {
+    if path.starts_with(OPFS_PREFIX) {
+        WriteTo::Opfs
+    } else if parse(path).is_some() {
+        WriteTo::Disk
+    } else if path.starts_with(DOWNLOADS_PREFIX) {
+        WriteTo::Download
+    } else {
+        WriteTo::Memory
+    }
+}
+
+/// The engine path of the design `name` kept under handle `id`.
+pub fn path(id: &str, name: &str) -> String {
+    format!("{PREFIX}{id}/{name}")
+}
+
+/// The handle id and file name of an engine path made by [`path`].
+pub fn parse(path: &str) -> Option<(&str, &str)> {
+    let (id, name) = path.strip_prefix(PREFIX)?.split_once('/')?;
+    (!id.is_empty() && !name.is_empty() && !name.contains('/')).then_some((id, name))
+}
+
+/// A handle id from the time and a random number.
+pub fn make_id(ms: u64, random: u64) -> String {
+    format!("{ms:x}-{random:x}")
+}
+
+/// How long a remembered file may go unused, and unreferenced by the recent designs and the
+/// autosave, before the browser's copy of its handle is dropped.
+pub const HANDLE_MAX_AGE_MS: f64 = 90.0 * 24.0 * 3600.0 * 1000.0;
+
+/// What to do with the remembered handles.
+#[derive(Debug, Default, PartialEq)]
+pub struct PrunePlan {
+    /// Handles to forget.
+    pub delete: Vec<String>,
+    /// Handles seen unused for the first time: start their clock.
+    pub stamp: Vec<String>,
+}
+
+/// Decide which of the remembered handles `ids` (id, when it was last stamped) to forget: those
+/// that no recent design or autosave (`keep`) names and that have gone unused for `max_age`. One
+/// never stamped starts its clock now, so a file another tab has just saved is never dropped.
+pub fn plan_prune(ids: &[(String, Option<f64>)], keep: &std::collections::HashSet<String>, now: f64, max_age: f64) -> PrunePlan {
+    let mut plan = PrunePlan::default();
+    for (id, stamped) in ids.iter().filter(|(id, _)| !keep.contains(id)) {
+        match stamped {
+            None => plan.stamp.push(id.clone()),
+            Some(at) if now - at > max_age => plan.delete.push(id.clone()),
+            Some(_) => {}
+        }
+    }
+    plan
+}
+
+/// Where a design saved with Save As goes.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum SaveTarget {
+    /// A file the user picks on their computer.
+    Disk,
+    /// The browser's private storage (OPFS): what browsers without the API have always done.
+    Browser,
+    /// Not a design (an export): handed over as a download.
+    Download,
+}
+
+/// Choose where a Save As goes: designs to the disk when the browser can pick a file, else into
+/// the browser's storage; anything else is a download.
+pub fn save_target(api: bool, design: bool) -> SaveTarget {
+    match (design, api) {
+        (false, _) => SaveTarget::Download,
+        (true, true) => SaveTarget::Disk,
+        (true, false) => SaveTarget::Browser,
+    }
+}
+
+/// Does a picker for `extensions` (what the command reads; `&[]`: anything) belong to a design?
+/// Only those go through the disk dialog; inserting a STEP or mesh keeps using the file window.
+pub fn opens_design(extensions: &[&str]) -> bool {
+    extensions.is_empty() || extensions.iter().any(|e| solidcraft_engine::io::DESIGN_EXTS.contains(e))
+}
+
+/// The file type a Save As dialog offers for `name`: (description, MIME type, extension).
+pub fn save_type(name: &str) -> (&'static str, &'static str, &'static str) {
+    let json = std::path::Path::new(name).extension().is_some_and(|e| e.eq_ignore_ascii_case("json"));
+    if json { ("Plain JSON design", "application/json", ".json") } else { ("SolidCraft design", "application/octet-stream", ".solidcraft") }
+}
+
+/// Is this a cancelled dialog (the browser's `AbortError`)? Not an error to show.
+pub fn is_abort(error_name: &str) -> bool {
+    error_name == "AbortError"
+}
+
+#[cfg(target_arch = "wasm32")]
+pub use web::*;
+
+#[cfg(target_arch = "wasm32")]
+mod web {
+    use std::cell::{Cell, RefCell};
+    use std::collections::{HashMap, VecDeque};
+    use std::rc::Rc;
+
+    use js_sys::{Array, Function, Object, Promise, Reflect};
+    use solidcraft_engine::io::vfs;
+    use wasm_bindgen::{JsCast as _, JsValue, closure::Closure};
+    use wasm_bindgen_futures::{JsFuture, spawn_local};
+    use web_sys::{FileSystemFileHandle, IdbDatabase, IdbObjectStore, IdbOpenDbRequest, IdbRequest, IdbTransactionMode};
+
+    use super::{HANDLE_MAX_AGE_MS, is_abort, make_id, opens_design, parse, path, plan_prune, save_type};
+    use crate::files::{Files, err, read_handle};
+
+    const DB: &str = "solidcraft-disk-handles";
+    const STORE: &str = "handles";
+
+    thread_local! {
+        /// Handles picked or looked up in this session, by id.
+        static HANDLES: RefCell<HashMap<String, FileSystemFileHandle>> = RefCell::new(HashMap::new());
+        /// Writes waiting for their turn (a file takes one writer at a time), latest per id.
+        static QUEUE: RefCell<VecDeque<(String, Vec<u8>)>> = const { RefCell::new(VecDeque::new()) };
+        static BUSY: Cell<bool> = const { Cell::new(false) };
+    }
+
+    /// Why a dialog gave no file.
+    enum Pick {
+        Cancelled,
+        Failed(String),
+    }
+
+    fn failed(e: JsValue) -> Pick {
+        let name = Reflect::get(&e, &"name".into()).ok().and_then(|n| n.as_string()).unwrap_or_default();
+        if is_abort(&name) { Pick::Cancelled } else { Pick::Failed(err(e)) }
+    }
+
+    /// Can this page show the browser's file dialogs and write to the files they pick?
+    pub fn supported() -> bool {
+        let Some(window) = web_sys::window() else { return false };
+        let has = |name: &str| Reflect::get(&window, &name.into()).is_ok_and(|f| f.is_function());
+        window.is_secure_context() && has("showSaveFilePicker") && has("showOpenFilePicker")
+    }
+
+    fn types(description: &str, mime: &str, extension: &str) -> Array {
+        let accept = Object::new();
+        let _ = Reflect::set(&accept, &mime.into(), &Array::of1(&extension.into()));
+        let entry = Object::new();
+        let _ = Reflect::set(&entry, &"description".into(), &description.into());
+        let _ = Reflect::set(&entry, &"accept".into(), &accept);
+        Array::of1(&entry)
+    }
+
+    /// Start a dialog. This must run in the click that asked for it (the browser wants a user
+    /// gesture), so it is called before anything is awaited.
+    fn start_picker(function: &str, options: &Object) -> Result<Promise, Pick> {
+        let window = web_sys::window().ok_or_else(|| Pick::Failed("no window".into()))?;
+        let f: Function = Reflect::get(&window, &function.into())
+            .map_err(failed)?
+            .dyn_into()
+            .map_err(|_| Pick::Failed("this browser can't open file dialogs".into()))?;
+        f.call1(&window, options).map_err(failed)?.dyn_into().map_err(|_| Pick::Failed("no answer from the file dialog".into()))
+    }
+
+    /// Remember a picked file: in memory now, in IndexedDB for the next session.
+    fn register(handle: &FileSystemFileHandle) -> String {
+        let id = make_id(js_sys::Date::now() as u64, (js_sys::Math::random() * 1e15) as u64);
+        HANDLES.with(|h| h.borrow_mut().insert(id.clone(), handle.clone()));
+        let (key, kept, name) = (id.clone(), handle.clone(), handle.name());
+        spawn_local(async move {
+            if let Err(e) = remember(&key, &kept).await {
+                log::warn!("the file's handle isn't kept for the next session: {e}");
+            }
+        });
+        path(&id, &name)
+    }
+
+    fn save_options(name: &str) -> Object {
+        let options = Object::new();
+        let _ = Reflect::set(&options, &"suggestedName".into(), &name.into());
+        let (description, mime, extension) = save_type(name);
+        let _ = Reflect::set(&options, &"types".into(), &types(description, mime, extension));
+        options
+    }
+
+    /// "Save to computer…" for a design kept in the browser: write a copy of `bytes` to a file the
+    /// user picks (call in the click), or download it where the browser can't pick one. The design
+    /// itself stays where it is.
+    pub fn save_copy(files: &Rc<Files>, name: &str, bytes: Vec<u8>) {
+        if !supported() {
+            if let Err(e) = crate::files::download(name, &bytes) {
+                files.say(format!("{name}: {e}"), true);
+            }
+            return;
+        }
+        let promise = start_picker("showSaveFilePicker", &save_options(name));
+        let files = files.clone();
+        spawn_local(async move {
+            let r = async {
+                let h: FileSystemFileHandle =
+                    JsFuture::from(promise?).await.map_err(failed)?.dyn_into().map_err(|_| Pick::Failed("not a file".into()))?;
+                write_handle(&h, &bytes).await.map_err(Pick::Failed)?;
+                Ok::<String, Pick>(h.name())
+            };
+            match r.await {
+                Ok(saved) => files.say(format!("Saved a copy to {saved}"), false),
+                Err(Pick::Cancelled) => {}
+                Err(Pick::Failed(e)) => files.say(format!("save to computer: {e}"), true),
+            }
+        });
+    }
+
+    /// Save As, step one: show the browser's save dialog (call in the click). The answer is the
+    /// engine path the design is saved to, `None` when the dialog was closed.
+    pub fn pick_save(files: &Rc<Files>, name: &str) -> impl std::future::Future<Output = Option<String>> + use<> {
+        let promise = start_picker("showSaveFilePicker", &save_options(name));
+        let files = files.clone();
+        async move {
+            let handle = match promise {
+                Ok(p) => JsFuture::from(p)
+                    .await
+                    .map_err(failed)
+                    .and_then(|h| h.dyn_into::<FileSystemFileHandle>().map_err(|_| Pick::Failed("not a file".into()))),
+                Err(e) => Err(e),
+            };
+            match handle {
+                Ok(h) => Some(register(&h)),
+                Err(Pick::Cancelled) => None,
+                Err(Pick::Failed(e)) => {
+                    files.say(format!("save: {e}"), true);
+                    None
+                }
+            }
+        }
+    }
+
+    /// Open, step one: show the browser's open dialog for a design (call in the click). The
+    /// answer is the engine path of the file, read into the engine's files; a design keeps its
+    /// handle, so Save writes back to the file. `None`: closed, or it could not be read.
+    pub fn pick_open(files: &Rc<Files>) -> impl std::future::Future<Output = Option<String>> + use<> {
+        let promise = start_picker("showOpenFilePicker", &open_options());
+        let files = files.clone();
+        async move {
+            let r = async {
+                let p = promise?;
+                let handles: Array = JsFuture::from(p).await.map_err(failed)?.dyn_into().map_err(|_| Pick::Failed("no file".into()))?;
+                let h: FileSystemFileHandle = handles.get(0).dyn_into().map_err(|_| Pick::Cancelled)?;
+                let bytes = read_handle(&h).await.map_err(Pick::Failed)?;
+                Ok((h, bytes))
+            };
+            match r.await {
+                Ok((h, bytes)) => Some(arrive(&h, bytes)),
+                Err(Pick::Cancelled) => None,
+                Err(Pick::Failed(e)) => {
+                    files.say(format!("open: {e}"), true);
+                    None
+                }
+            }
+        }
+    }
+
+    /// The options of the open dialog: a single file, designs and CAD files listed first.
+    pub fn open_options() -> Object {
+        let options = Object::new();
+        let _ = Reflect::set(&options, &"multiple".into(), &JsValue::FALSE);
+        let extensions = Array::new();
+        for e in [".solidcraft", ".solvecraft", ".json", ".step", ".stp", ".3mf", ".stl", ".obj", ".glb", ".gltf", ".fcstd", ".3dm"] {
+            extensions.push(&e.into());
+        }
+        let accept = Object::new();
+        let _ = Reflect::set(&accept, &"application/octet-stream".into(), &extensions);
+        let entry = Object::new();
+        let _ = Reflect::set(&entry, &"description".into(), &"Designs and CAD files".into());
+        let _ = Reflect::set(&entry, &"accept".into(), &accept);
+        let _ = Reflect::set(&options, &"types".into(), &Array::of1(&entry));
+        options
+    }
+
+    /// A file read from a dialog's handle: a design lives at its disk path from now on (and
+    /// keeps the handle); anything else is an upload to open or insert.
+    pub fn arrive(handle: &FileSystemFileHandle, bytes: Vec<u8>) -> String {
+        let name = handle.name();
+        let p = if solidcraft_engine::io::is_design_path(&name) { register(handle) } else { format!("{}{name}", crate::files::UPLOAD) };
+        vfs::insert(&p, bytes);
+        p
+    }
+
+    /// Does an Open for `extensions` use the browser's open dialog?
+    pub fn handles_open(extensions: &[&str]) -> bool {
+        supported() && opens_design(extensions)
+    }
+
+    // ---- writing ------------------------------------------------------------------------
+
+    /// Queue what a command wrote to a disk path. Writes go one at a time; a newer write of the
+    /// same file replaces one still waiting.
+    pub fn enqueue(files: &Rc<Files>, path: &str, bytes: Vec<u8>) {
+        QUEUE.with(|q| {
+            let mut q = q.borrow_mut();
+            q.retain(|(p, _)| p != path);
+            q.push_back((path.to_string(), bytes));
+        });
+        if BUSY.with(|b| b.replace(true)) {
+            return;
+        }
+        let files = files.clone();
+        spawn_local(async move {
+            while let Some((path, bytes)) = QUEUE.with(|q| q.borrow_mut().pop_front()) {
+                if let Err(e) = write(&path, &bytes).await {
+                    files.failed_disk(&path, &e);
+                }
+            }
+            BUSY.with(|b| b.set(false));
+        });
+    }
+
+    async fn write(path: &str, bytes: &[u8]) -> Result<(), String> {
+        let (id, name) = parse(path).ok_or("not a file on the computer")?;
+        let handle = handle_for(id).await.map_err(|e| format!("{name}: {e}"))?;
+        write_handle(&handle, bytes).await.map_err(|e| format!("{name}: {e}"))
+    }
+
+    async fn write_handle(handle: &FileSystemFileHandle, bytes: &[u8]) -> Result<(), String> {
+        ensure_readwrite(handle).await?;
+        let w: web_sys::FileSystemWritableFileStream =
+            JsFuture::from(handle.create_writable()).await.map_err(err)?.dyn_into().map_err(|_| "no writable stream".to_string())?;
+        JsFuture::from(w.write_with_u8_array(bytes).map_err(err)?).await.map_err(err)?;
+        JsFuture::from(w.close()).await.map_err(err)?;
+        Ok(())
+    }
+
+    async fn handle_for(id: &str) -> Result<FileSystemFileHandle, String> {
+        if let Some(h) = HANDLES.with(|h| h.borrow().get(id).cloned()) {
+            return Ok(h);
+        }
+        let h: FileSystemFileHandle = recall(id)
+            .await?
+            .and_then(|v| v.dyn_into().ok())
+            .ok_or("the browser no longer remembers where this design was saved: use Save As to choose the file again")?;
+        HANDLES.with(|m| m.borrow_mut().insert(id.to_string(), h.clone()));
+        Ok(h)
+    }
+
+    /// Ask for write access if the browser doesn't hold it any more (after a reload): one prompt,
+    /// from the click that asked for the save.
+    async fn ensure_readwrite(handle: &FileSystemFileHandle) -> Result<(), String> {
+        let options = Object::new();
+        let _ = Reflect::set(&options, &"mode".into(), &"readwrite".into());
+        for method in ["queryPermission", "requestPermission"] {
+            let Some(f) = Reflect::get(handle, &method.into()).ok().and_then(|f| f.dyn_into::<Function>().ok()) else {
+                // A browser without the permission calls hands out writable handles as they are.
+                return Ok(());
+            };
+            let answer = f.call1(handle, &options).map_err(err)?;
+            let state = JsFuture::from(Promise::resolve(&answer)).await.map_err(err)?;
+            if state.as_string().as_deref() == Some("granted") {
+                return Ok(());
+            }
+        }
+        Err("the browser wasn't given permission to write the file: use Save As to choose it again".into())
+    }
+
+    // ---- IndexedDB: the handles, by id --------------------------------------------------
+
+    /// The result of an IndexedDB request.
+    async fn result(req: &IdbRequest) -> Result<JsValue, String> {
+        let promise = Promise::new(&mut |resolve, reject| {
+            let r = req.clone();
+            let ok = Closure::once_into_js(move || {
+                let _ = resolve.call1(&JsValue::NULL, &r.result().unwrap_or(JsValue::UNDEFINED));
+            });
+            let bad = Closure::once_into_js(move || {
+                let _ = reject.call1(&JsValue::NULL, &"IndexedDB failed".into());
+            });
+            req.set_onsuccess(Some(ok.unchecked_ref()));
+            req.set_onerror(Some(bad.unchecked_ref()));
+        });
+        JsFuture::from(promise).await.map_err(err)
+    }
+
+    async fn open_db() -> Result<IdbDatabase, String> {
+        let factory = web_sys::window().ok_or("no window")?.indexed_db().map_err(err)?.ok_or("this browser has no IndexedDB")?;
+        let request: IdbOpenDbRequest = factory.open_with_u32(DB, 1).map_err(err)?;
+        let target = request.clone();
+        let upgrade = Closure::once_into_js(move || {
+            if let Ok(db) = target.result().and_then(|r| r.dyn_into::<IdbDatabase>()) {
+                let _ = db.create_object_store(STORE);
+            }
+        });
+        request.set_onupgradeneeded(Some(upgrade.unchecked_ref()));
+        result(&request).await?.dyn_into().map_err(|_| "no database".to_string())
+    }
+
+    fn store(db: &IdbDatabase, mode: IdbTransactionMode) -> Result<IdbObjectStore, String> {
+        db.transaction_with_str_and_mode(STORE, mode).map_err(err)?.object_store(STORE).map_err(err)
+    }
+
+    /// Key of the time a handle was last used (the handle's own key is its id).
+    fn stamp_key(id: &str) -> String {
+        format!("at:{id}")
+    }
+
+    async fn remember(id: &str, handle: &FileSystemFileHandle) -> Result<(), String> {
+        let db = open_db().await?;
+        let store = store(&db, IdbTransactionMode::Readwrite)?;
+        result(&store.put_with_key(handle, &id.into()).map_err(err)?).await?;
+        result(&store.put_with_key(&js_sys::Date::now().into(), &stamp_key(id).into()).map_err(err)?).await.map(|_| ())
+    }
+
+    /// Note that the file was used now.
+    async fn touch(id: &str) {
+        let Ok(db) = open_db().await else { return };
+        if let Ok(store) = store(&db, IdbTransactionMode::Readwrite)
+            && let Ok(req) = store.put_with_key(&js_sys::Date::now().into(), &stamp_key(id).into())
+        {
+            let _ = result(&req).await;
+        }
+    }
+
+    /// The ids of every remembered file.
+    pub async fn known_ids() -> Result<Vec<String>, String> {
+        let db = open_db().await?;
+        let req = store(&db, IdbTransactionMode::Readonly)?.get_all_keys().map_err(err)?;
+        let keys: Array = result(&req).await?.dyn_into().map_err(|_| "no keys".to_string())?;
+        Ok(keys.iter().filter_map(|k| k.as_string()).filter(|k| !k.starts_with("at:")).collect())
+    }
+
+    async fn forget(ids: &[String]) -> Result<(), String> {
+        let db = open_db().await?;
+        let store = store(&db, IdbTransactionMode::Readwrite)?;
+        for id in ids {
+            result(&store.delete(&id.as_str().into()).map_err(err)?).await?;
+            result(&store.delete(&stamp_key(id).into()).map_err(err)?).await?;
+            HANDLES.with(|h| h.borrow_mut().remove(id));
+        }
+        Ok(())
+    }
+
+    /// Forget the remembered files nothing refers to any more (`keep`: the ids the recent designs
+    /// and the autosave name), once they have gone unused for a long while.
+    pub fn prune(keep: std::collections::HashSet<String>) {
+        spawn_local(async move {
+            let r = async {
+                // A transaction ends when the page awaits anything but its own requests, so each
+                // step opens its own.
+                let known = known_ids().await?;
+                let db = open_db().await?;
+                let reading = store(&db, IdbTransactionMode::Readonly)?;
+                let mut ids = Vec::new();
+                for id in known {
+                    let at = result(&reading.get(&stamp_key(&id).into()).map_err(err)?).await?.as_f64();
+                    ids.push((id, at));
+                }
+                let plan = plan_prune(&ids, &keep, js_sys::Date::now(), HANDLE_MAX_AGE_MS);
+                for id in &plan.stamp {
+                    touch(id).await;
+                }
+                forget(&plan.delete).await
+            };
+            if let Err(e) = r.await {
+                log::warn!("remembered files weren't tidied: {e}");
+            }
+        });
+    }
+
+    /// Open a design remembered from an earlier session (a recent one, after a reload): ask once
+    /// for access to the file (call in the click), read it into the engine's files and queue it
+    /// to open. A file that is gone is forgotten and dropped from the recent designs.
+    pub fn restore(files: &Rc<Files>, path: &str) {
+        let Some((id, name)) = parse(path) else { return };
+        let (files, path, id, name) = (files.clone(), path.to_string(), id.to_string(), name.to_string());
+        spawn_local(async move {
+            let r = async {
+                let handle = handle_for(&id).await?;
+                ensure_readwrite(&handle).await?;
+                read_handle(&handle).await
+            };
+            match r.await {
+                Ok(bytes) => {
+                    vfs::insert(&path, bytes);
+                    files.opened.borrow_mut().push(path);
+                    files.wake();
+                    touch(&id).await;
+                }
+                Err(e) => {
+                    let gone = e.contains("NotFoundError") || e.contains("could not be found") || e.contains("no longer remembers");
+                    if gone {
+                        let _ = forget(std::slice::from_ref(&id)).await;
+                        files.disk_known.borrow_mut().remove(&id);
+                        files.gone.borrow_mut().push(path);
+                        files.say(format!("{name} isn't where it was saved any more"), true);
+                    } else {
+                        files.say(format!("{name}: {e}"), true);
+                    }
+                }
+            }
+        });
+    }
+
+    async fn recall(id: &str) -> Result<Option<JsValue>, String> {
+        let db = open_db().await?;
+        let req = store(&db, IdbTransactionMode::Readonly)?.get(&id.into()).map_err(err)?;
+        Ok(Some(result(&req).await?).filter(|v| !v.is_undefined()))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_disk_path_round_trips_its_handle_id_and_name() {
+        let p = path("18f-2a", "Bracket v2.solidcraft");
+        assert_eq!(p, "/disk/18f-2a/Bracket v2.solidcraft");
+        assert_eq!(parse(&p), Some(("18f-2a", "Bracket v2.solidcraft")));
+    }
+
+    #[test]
+    fn only_disk_paths_parse() {
+        for not in [
+            "/opfs/a.solidcraft",
+            "/downloads/a.step",
+            "/upload/a.step",
+            "/disk/",
+            "/disk/id",
+            "/disk/id/",
+            "/disk//a",
+            "/disk/id/x/y",
+            "a.solidcraft",
+        ] {
+            assert_eq!(parse(not), None, "{not}");
+        }
+    }
+
+    /// Designs already stored in OPFS (and the recovery files) keep saving to OPFS under their own
+    /// names, whether or not the browser can write to the disk.
+    #[test]
+    fn writes_to_opfs_paths_still_go_to_opfs() {
+        for p in
+            ["/opfs/Bracket.solidcraft", "/opfs/Bracket (2).solidcraft", "/opfs/recovery.solidcraft", "/opfs/recovery.json", "/opfs/old.solvecraft"]
+        {
+            assert_eq!(route(p), WriteTo::Opfs, "{p}");
+        }
+        // A design opened from OPFS saves to its own path; only a Save As can pick the disk.
+        assert_eq!(save_target(false, true), SaveTarget::Browser);
+        assert_eq!(route(&format!("{OPFS_PREFIX}Bracket.solidcraft")), WriteTo::Opfs);
+        assert_eq!(route("/disk/18f-2a/Bracket.solidcraft"), WriteTo::Disk);
+        assert_eq!(route("/downloads/part.step"), WriteTo::Download);
+        assert_eq!(route("/upload/part.step"), WriteTo::Memory);
+    }
+
+    #[test]
+    fn only_unreferenced_handles_unused_for_long_are_forgotten() {
+        let keep: std::collections::HashSet<String> = ["recent".to_string()].into();
+        let day = 24.0 * 3600.0 * 1000.0;
+        let now = 1000.0 * day;
+        let ids = vec![
+            ("recent".to_string(), Some(now - 200.0 * day)),
+            ("old".to_string(), Some(now - 100.0 * day)),
+            ("fresh".to_string(), Some(now - 5.0 * day)),
+            ("unstamped".to_string(), None),
+        ];
+        let plan = plan_prune(&ids, &keep, now, HANDLE_MAX_AGE_MS);
+        assert_eq!(plan, PrunePlan { delete: vec!["old".to_string()], stamp: vec!["unstamped".to_string()] });
+        assert_eq!(plan_prune(&[], &keep, now, HANDLE_MAX_AGE_MS), PrunePlan::default());
+    }
+
+    #[test]
+    fn handle_ids_differ_by_time_and_by_chance() {
+        assert_ne!(make_id(1, 5), make_id(2, 5));
+        assert_ne!(make_id(1, 5), make_id(1, 6));
+        assert!(!make_id(0, 0).contains('/'));
+    }
+
+    /// Save As: a design goes to the disk where the browser can pick files and to the browser's
+    /// storage where it cannot (today's behaviour); an export is a download either way.
+    #[test]
+    fn save_as_chooses_between_the_disk_the_browsers_storage_and_a_download() {
+        assert_eq!(save_target(true, true), SaveTarget::Disk);
+        assert_eq!(save_target(false, true), SaveTarget::Browser);
+        assert_eq!(save_target(true, false), SaveTarget::Download);
+        assert_eq!(save_target(false, false), SaveTarget::Download);
+    }
+
+    #[test]
+    fn only_design_opens_use_the_disk_dialog() {
+        assert!(opens_design(&[]));
+        assert!(opens_design(&["solidcraft"]));
+        assert!(opens_design(&["solvecraft"]));
+        assert!(!opens_design(&["step", "stp"]));
+        assert!(!opens_design(&["json"]));
+    }
+
+    #[test]
+    fn the_save_dialog_offers_the_type_of_the_name() {
+        assert_eq!(save_type("Plate.solidcraft").2, ".solidcraft");
+        assert_eq!(save_type("Plate.JSON").2, ".json");
+        assert_eq!(save_type("Plate").2, ".solidcraft");
+    }
+
+    #[test]
+    fn closing_a_dialog_is_not_an_error() {
+        assert!(is_abort("AbortError"));
+        assert!(!is_abort("NotAllowedError"));
+        assert!(!is_abort("SecurityError"));
+    }
+}

apps/solidcraft-web/src/files.rs

@@ -2,22 +2,26 @@
 //! the engine's in-memory files (`solidcraft_engine::io::vfs`) at start, written back whenever a
 //! command writes one. Files come in from the computer through a file picker (the File System
 //! Access API where the browser has it, an `<input type=file>` otherwise) or a drop on the page,
-//! and go out as downloads (exports, and "Download design"). An autosave of unsaved work is kept
-//! in OPFS too and offered again after a reload or a crash.
+//! and go out as downloads (exports, and "Download design"). Where the File System Access API
+//! exists a design also lives on the computer's disk, saved and opened through the browser's file
+//! dialogs (`disk.rs`). An autosave of unsaved work is kept in OPFS and offered again after a
+//! reload or a crash.
 
 use std::cell::{Cell, RefCell};
 use std::rc::Rc;
 
 use js_sys::{Array, Function, Object, Reflect, Uint8Array};
 use solidcraft_engine::io::vfs;
+
+use crate::disk;
 use wasm_bindgen::{JsCast as _, JsValue, closure::Closure};
 use wasm_bindgen_futures::{JsFuture, spawn_local};
 use web_sys::{FileSystemDirectoryHandle, FileSystemFileHandle, FileSystemGetFileOptions, FileSystemWritableFileStream};
 
 /// Where OPFS files appear to the engine.
-pub const OPFS: &str = "/opfs/";
+pub const OPFS: &str = disk::OPFS_PREFIX;
 /// Paths written here are handed to the user as downloads.
-pub const DOWNLOADS: &str = "/downloads/";
+pub const DOWNLOADS: &str = disk::DOWNLOADS_PREFIX;
 /// Files brought in from the computer.
 pub const UPLOAD: &str = "/upload/";
 /// The autosave of unsaved work (in OPFS: `recovery.solidcraft` and `recovery.json`).
@@ -51,6 +55,14 @@ pub struct Files {
     pub entries: RefCell<Vec<Entry>>,
     /// Files read from the computer: (name, bytes, what to do).
     pub incoming: RefCell<Vec<(String, Vec<u8>, Intent)>>,
+    /// Designs opened from the computer's disk: their paths in the engine's files.
+    pub opened: RefCell<Vec<String>>,
+    /// The ids of the files remembered from earlier sessions (see `disk::restore`).
+    pub disk_known: RefCell<std::collections::HashSet<String>>,
+    /// Recent designs whose file is gone: to drop from the recent list.
+    pub gone: RefCell<Vec<String>>,
+    /// Disk designs whose last write failed: they are not saved.
+    pub unsaved: RefCell<Vec<String>>,
     /// Messages for the status line (errors and confirmations).
     pub messages: RefCell<Vec<(String, bool)>>,
     /// The stored designs are loaded (the app may open them).
@@ -64,11 +76,17 @@ pub struct Files {
 }
 
 impl Files {
-    fn say(&self, text: impl Into<String>, error: bool) {
+    pub fn say(&self, text: impl Into<String>, error: bool) {
         self.messages.borrow_mut().push((text.into(), error));
         self.wake();
     }
 
+    /// Writing the design at disk `path` failed: say so, and take its "saved" back.
+    pub fn failed_disk(&self, path: &str, error: &str) {
+        self.unsaved.borrow_mut().push(path.to_string());
+        self.say(format!("Not saved to your computer: {error}"), true);
+    }
+
     /// A file arrived from the computer.
     fn arrive(&self, name: String, bytes: Vec<u8>, intent: Intent) {
         self.incoming.borrow_mut().push((name, bytes, intent));
@@ -76,7 +94,7 @@ impl Files {
     }
 
     /// Run a frame (the app sleeps until something happens).
-    fn wake(&self) {
+    pub fn wake(&self) {
         if let Some(c) = self.ctx.borrow().as_ref() {
             c.request_repaint();
         }
@@ -127,7 +145,7 @@ pub fn local_only() -> bool {
     LOCAL.with(Cell::get)
 }
 
-fn err(e: JsValue) -> String {
+pub(crate) fn err(e: JsValue) -> String {
     e.as_string().or_else(|| Reflect::get(&e, &"message".into()).ok().and_then(|m| m.as_string())).unwrap_or_else(|| format!("{e:?}"))
 }
 
@@ -150,7 +168,7 @@ async fn root() -> Result<FileSystemDirectoryHandle, String> {
     dir.dyn_into::<FileSystemDirectoryHandle>().map_err(|_| "this browser has no private file storage (OPFS)".to_string())
 }
 
-async fn read_handle(h: &FileSystemFileHandle) -> Result<Vec<u8>, String> {
+pub(crate) async fn read_handle(h: &FileSystemFileHandle) -> Result<Vec<u8>, String> {
     let file: web_sys::File = JsFuture::from(h.get_file()).await.map_err(err)?.dyn_into().map_err(|_| "not a file".to_string())?;
     blob_bytes(&file).await
 }
@@ -253,6 +271,10 @@ pub fn start(files: &Rc<Files>) {
     }
     let files = files.clone();
     spawn_local(async move {
+        match disk::known_ids().await {
+            Ok(ids) => files.disk_known.borrow_mut().extend(ids),
+            Err(e) => log::info!("no remembered files: {e}"),
+        }
         match read_all().await {
             Ok(all) => {
                 if local_only() {
@@ -295,26 +317,32 @@ pub fn start(files: &Rc<Files>) {
 /// Store what commands wrote: OPFS paths into OPFS, download paths as downloads.
 pub fn flush(files: &Rc<Files>) {
     for (path, bytes) in vfs::take_writes() {
-        if let Some(name) = path.strip_prefix(OPFS) {
-            let name = name.to_string();
-            {
-                let mut e = files.entries.borrow_mut();
-                e.retain(|x| x.name != name);
-                if name != RECOVERY && name != RECOVERY_META {
-                    e.push(Entry { name: name.clone(), size: bytes.len() as u64, modified: js_sys::Date::now() });
-                    e.sort_by_key(|a| a.name.to_lowercase());
+        match disk::route(&path) {
+            disk::WriteTo::Opfs => {
+                let name = path.strip_prefix(OPFS).unwrap_or(&path).to_string();
+                {
+                    let mut e = files.entries.borrow_mut();
+                    e.retain(|x| x.name != name);
+                    if name != RECOVERY && name != RECOVERY_META {
+                        e.push(Entry { name: name.clone(), size: bytes.len() as u64, modified: js_sys::Date::now() });
+                        e.sort_by_key(|a| a.name.to_lowercase());
+                    }
                 }
+                let files = files.clone();
+                spawn_local(async move {
+                    if let Err(e) = write_file(&name, &bytes).await {
+                        files.say(format!("{name}: {e}"), true);
+                    }
+                });
             }
-            let files = files.clone();
-            spawn_local(async move {
-                if let Err(e) = write_file(&name, &bytes).await {
+            disk::WriteTo::Disk => disk::enqueue(files, &path, bytes),
+            disk::WriteTo::Download => {
+                let name = path.strip_prefix(DOWNLOADS).unwrap_or(&path);
+                if let Err(e) = download(name, &bytes) {
                     files.say(format!("{name}: {e}"), true);
                 }
-            });
-        } else if let Some(name) = path.strip_prefix(DOWNLOADS)
-            && let Err(e) = download(name, &bytes)
-        {
-            files.say(format!("{name}: {e}"), true);
+            }
+            disk::WriteTo::Memory => {}
         }
     }
 }
@@ -427,8 +455,15 @@ pub fn pick_from_disk(files: &Rc<Files>, intent: Intent) {
     let picker = Reflect::get(&window, &"showOpenFilePicker".into()).ok().and_then(|f| f.dyn_into::<Function>().ok());
     match picker {
         Some(f) => {
-            let opts = Object::new();
-            let _ = Reflect::set(&opts, &"multiple".into(), &JsValue::FALSE);
+            // A design from the computer's disk keeps its file, so Save writes back to it.
+            let on_disk = intent == Intent::Open && disk::supported();
+            let opts = if on_disk {
+                disk::open_options()
+            } else {
+                let opts = Object::new();
+                let _ = Reflect::set(&opts, &"multiple".into(), &JsValue::FALSE);
+                opts
+            };
             let promise = f.call1(&window, &opts);
             let files = files.clone();
             spawn_local(async move {
@@ -438,7 +473,13 @@ pub fn pick_from_disk(files: &Rc<Files>, intent: Intent) {
                     for h in handles.iter() {
                         let h: FileSystemFileHandle = h.dyn_into().map_err(|_| "not a file".to_string())?;
                         let bytes = read_handle(&h).await?;
-                        files.arrive(h.name(), bytes, intent);
+                        if on_disk && solidcraft_engine::io::is_design_path(&h.name()) {
+                            let path = disk::arrive(&h, bytes);
+                            files.opened.borrow_mut().push(path);
+                            files.wake();
+                        } else {
+                            files.arrive(h.name(), bytes, intent);
+                        }
                     }
                     Ok::<(), String>(())
                 };
@@ -458,7 +499,10 @@ fn input_picker(files: &Rc<Files>, intent: Intent) {
     let Some(doc) = web_sys::window().and_then(|w| w.document()) else { return };
     let Ok(input) = doc.create_element("input").map(|e| e.unchecked_into::<web_sys::HtmlInputElement>()) else { return };
     input.set_type("file");
-    input.set_accept(".solidcraft,.solvecraft,.json,.step,.stp,.3mf,.stl,.obj,.glb,.gltf");
+    // Everything the browser build imports, from the format registry: cadmpeg is pure Rust, so
+    // FreeCAD and Rhino files are part of it.
+    let accept = solidcraft_engine::io::formats::open_extensions(true).iter().map(|e| format!(".{e}")).collect::<Vec<_>>().join(",");
+    input.set_accept(&accept);
     // Attached (hidden) while it is open: some browsers ignore a click on a detached input.
     let _ = input.set_attribute("style", "display:none");
     if let Some(body) = doc.body() {

apps/solidcraft-web/src/main.rs

@@ -8,6 +8,8 @@
 
 #[cfg(target_arch = "wasm32")]
 mod api;
+#[cfg(any(target_arch = "wasm32", test))]
+mod disk;
 #[cfg(target_arch = "wasm32")]
 mod files;
 #[cfg(target_arch = "wasm32")]
@@ -15,16 +17,25 @@ mod install;
 #[cfg(any(target_arch = "wasm32", test))]
 mod space_mouse;
 
+/// The browser switches tabs with Ctrl+Tab and Ctrl+Shift+Tab, so the page leaves those keys to
+/// it (#5227); plain Tab and Shift+Tab still move between the app's fields. (Ctrl+PageUp and
+/// Ctrl+PageDown already reach the browser.)
+#[cfg(any(target_arch = "wasm32", test))]
+fn browser_switches_tabs(key: &str, ctrl: bool) -> bool {
+    ctrl && key == "Tab"
+}
+
 #[cfg(target_arch = "wasm32")]
 mod web {
     use std::rc::Rc;
 
     use solidcraft_engine::Session;
     use solidcraft_engine::io::vfs;
-    use solidcraft_ui_egui::{Services, SolveApp};
+    use solidcraft_ui_egui::{Services, SolveApp, ui_kit};
     use wasm_bindgen::JsCast as _;
 
     use crate::api::Api;
+    use crate::disk::{self, SaveTarget};
     use crate::files::{self, Files, Intent};
     use crate::space_mouse::SpaceMouse;
 
@@ -81,6 +92,20 @@ mod web {
         on_unload.forget();
     }
 
+    /// eframe cancels the browser's action for every Tab it gets, so the browser couldn't switch
+    /// tabs while the app has the keyboard. Its tab-switching keys stop here, on the way down to
+    /// the canvas, before eframe sees them; the browser then acts on them as usual.
+    fn leave_tab_switching_to_browser(window: &web_sys::Window) {
+        let on_key = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::KeyboardEvent)>::new(|e: web_sys::KeyboardEvent| {
+            if crate::browser_switches_tabs(&e.key(), e.ctrl_key()) {
+                e.stop_propagation();
+            }
+        });
+        let _ = window.add_event_listener_with_callback_and_bool("keydown", on_key.as_ref().unchecked_ref(), true);
+        // The listener lives as long as the page.
+        on_key.forget();
+    }
+
     const JAPANESE_FONT_PATH: &str = "./fonts/BIZUDPGothic-Regular.ttf";
 
     type FontLoadResult = Rc<std::cell::RefCell<Option<Result<Vec<u8>, String>>>>;
@@ -106,6 +131,7 @@ mod web {
         /// 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,
     }
 
     impl Shell {
@@ -121,6 +147,23 @@ mod web {
                 return;
             }
             files::flush(&self.files);
+            // A write to the computer's disk that failed: the design is not saved after all.
+            for path in self.files.unsaved.borrow_mut().drain(..) {
+                if self.app.session.path.as_deref() == Some(path.as_str()) {
+                    self.app.session.mark_unsaved();
+                }
+            }
+            // 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);
+                self.files.panel.set(false);
+            }
+            // Recent designs whose file is gone are dropped from the list.
+            for path in self.files.gone.borrow_mut().drain(..) {
+                self.app.home.recent.retain(|r| *r != path);
+                self.app.home.opened_at.remove(&path);
+            }
             for (text, error) in self.files.messages.borrow_mut().drain(..) {
                 self.app.set_status(text, error);
             }
@@ -188,7 +231,9 @@ mod web {
             let mut entries = self.files.entries.borrow().clone();
             entries.sort_by(|a, b| b.modified.total_cmp(&a.modified));
             let recent = &mut self.app.home.recent;
-            recent.retain(|p| vfs::exists(p));
+            let known = self.files.disk_known.borrow().clone();
+            // A design on the computer's disk stays listed while its file is remembered.
+            recent.retain(|p| vfs::exists(p) || disk::parse(p).is_some_and(|(id, _)| known.contains(id)));
             for e in entries.iter().filter(|e| solidcraft_engine::io::is_design_path(&e.name)) {
                 let p = format!("{}{}", files::OPFS, e.name);
                 if !recent.contains(&p) {
@@ -196,6 +241,10 @@ mod web {
                 }
             }
             recent.truncate(solidcraft_ui_egui::home::MAX_RECENT);
+            // Remembered files that no recent design or autosave names are forgotten in time.
+            let recovered = self.files.recovery.borrow().as_ref().and_then(|(_, p)| p.clone());
+            let keep = recent.iter().chain(recovered.as_ref()).filter_map(|p| disk::parse(p)).map(|(id, _)| id.to_string()).collect();
+            disk::prune(keep);
         }
 
         /// The stored designs: open, insert, rename, delete, download; open from the computer.
@@ -203,27 +252,27 @@ mod web {
             if !self.files.panel.get() {
                 return;
             }
-            let mut open = true;
             let mut act: Option<(&'static str, String)> = None;
-            egui::Window::new("Files in this browser")
-                .open(&mut open)
-                .collapsible(false)
-                .resizable(true)
-                .default_width(520.0)
-                .pivot(egui::Align2::CENTER_CENTER)
-                .default_pos(ctx.content_rect().center())
-                .show(ctx, |ui| {
+            let closed = solidcraft_ui_egui::ui_kit::Window::new(egui::Id::new("sc_browser_files"), "folder", "Files in this browser")
+                .cards(3.0)
+                .show_body(ctx, |ui| {
                     ui.horizontal(|ui| {
-                        if ui.button("Open from computer…").clicked() {
+                        if ui_kit::button(ui, "Open from computer…", ui_kit::Button::Normal).clicked() {
                             files::pick_from_disk(&self.files, Intent::Open);
                         }
-                        if ui.button("Insert from computer…").on_hover_text("STEP, 3MF or STL into the open design").clicked() {
+                        if ui_kit::button(ui, "Insert from computer…", ui_kit::Button::Normal)
+                            .on_hover_text("STEP, 3MF or STL into the open design")
+                            .clicked()
+                        {
                             files::pick_from_disk(&self.files, Intent::Insert);
                         }
-                        if ui.button("Download open design").clicked() {
+                        if ui_kit::button(ui, "Download open design", ui_kit::Button::Normal).clicked() {
                             act = Some(("download_open", String::new()));
                         }
                     });
+                    if !disk::supported() {
+                        ui.weak("This browser can't save to a folder: designs stay in this browser. Download design saves a file.");
+                    }
                     ui.separator();
                     if !self.files.ready.get() {
                         ui.horizontal(|ui| {
@@ -241,7 +290,7 @@ mod web {
                             for e in &entries {
                                 match &mut self.renaming {
                                     Some((from, to)) if *from == e.name => {
-                                        let r = ui.add(egui::TextEdit::singleline(to).desired_width(200.0));
+                                        let r = ui_kit::cell_editor(ui, ui.make_persistent_id(("stored_file_name", from.as_str())), to, "", false);
                                         if std::mem::take(&mut self.rename_focus) {
                                             r.request_focus();
                                         }
@@ -259,21 +308,31 @@ mod web {
                                 }
                                 ui.label(format!("{:.1} KB", e.size as f64 / 1024.0));
                                 ui.horizontal(|ui| {
-                                    if ui.small_button("Open").clicked() {
+                                    if ui_kit::button(ui, "Open", ui_kit::Button::Small).clicked() {
                                         act = Some(("open", e.name.clone()));
                                     }
                                     let design = solidcraft_engine::io::is_design_path(&e.name);
-                                    if !design && ui.small_button("Insert").on_hover_text("Into the open design (STEP, 3MF, STL)").clicked() {
+                                    if !design
+                                        && ui_kit::button(ui, "Insert", ui_kit::Button::Small)
+                                            .on_hover_text("Into the open design (STEP, 3MF, STL)")
+                                            .clicked()
+                                    {
                                         act = Some(("insert", e.name.clone()));
                                     }
-                                    if ui.small_button("Rename").clicked() {
+                                    if ui_kit::button(ui, "Rename", ui_kit::Button::Small).clicked() {
                                         self.renaming = Some((e.name.clone(), e.name.clone()));
                                         self.rename_focus = true;
                                     }
-                                    if ui.small_button("Download").clicked() {
+                                    if ui_kit::button(ui, "Save to computer…", ui_kit::Button::Small)
+                                        .on_hover_text("A copy in a file you choose; the stored design stays here")
+                                        .clicked()
+                                    {
+                                        act = Some(("save_copy", e.name.clone()));
+                                    }
+                                    if ui_kit::button(ui, "Download", ui_kit::Button::Small).clicked() {
                                         act = Some(("download", e.name.clone()));
                                     }
-                                    if ui.small_button("Delete").clicked() {
+                                    if ui_kit::button(ui, "Delete", ui_kit::Button::Small).clicked() {
                                         act = Some(("delete", e.name.clone()));
                                     }
                                 });
@@ -282,7 +341,7 @@ mod web {
                         });
                     });
                 });
-            if !open {
+            if closed {
                 self.files.panel.set(false);
                 self.renaming = None;
             }
@@ -305,6 +364,10 @@ mod web {
                     }
                     Err(e) => self.app.set_status(e.to_string(), true),
                 },
+                "save_copy" => match vfs::read(&path, solidcraft_engine::io::MAX_DESIGN_BYTES) {
+                    Ok(b) => disk::save_copy(&self.files, &name, b),
+                    Err(e) => self.app.set_status(e.to_string(), true),
+                },
                 "download_open" => {
                     let d = &self.app.session.doc;
                     let result = self
@@ -346,20 +409,19 @@ mod web {
         fn recovery_prompt(&mut self, ctx: &egui::Context) {
             let Some((name, path)) = self.files.recovery.borrow().clone() else { return };
             let mut answer = None;
-            egui::Window::new("Recover unsaved work?").collapsible(false).resizable(false).anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]).show(
-                ctx,
-                |ui| {
+            let _ = solidcraft_ui_egui::ui_kit::Window::new(egui::Id::new("sc_browser_recovery"), "restore", "Recover unsaved work?")
+                .required()
+                .show_body(ctx, |ui| {
                     ui.label(format!("“{name}” had unsaved changes when this page last closed."));
                     ui.horizontal(|ui| {
-                        if ui.button("Recover").clicked() {
+                        if ui_kit::button(ui, "Recover", ui_kit::Button::Normal).clicked() {
                             answer = Some(true);
                         }
-                        if ui.button("Discard").clicked() {
+                        if ui_kit::button(ui, "Discard", ui_kit::Button::Normal).clicked() {
                             answer = Some(false);
                         }
                     });
-                },
-            );
+                });
             let Some(recover) = answer else { return };
             *self.files.recovery.borrow_mut() = None;
             if recover {
@@ -448,6 +510,10 @@ mod web {
             UNSAVED.with(|u| u.set(solidcraft_ui_egui::documents::any_dirty(&self.app)));
         }
         fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
+            let now = raw.time.unwrap_or_else(|| ctx.input(|i| i.time));
+            if let Some(delay) = self.wheel_gestures.update(raw, now) {
+                ctx.request_repaint_after(delay);
+            }
             files::take_drops(&self.files, raw);
             // Before the app's own hook, which adds the control channel's events.
             self.space_mouse.raw_input_hook(ctx, self.app.preferences.space_mouse_enabled, raw);
@@ -514,6 +580,7 @@ mod web {
         wasm_bindgen_futures::spawn_local(async {
             let Some(window) = web_sys::window() else { return };
             ask_before_unload(&window);
+            leave_tab_switching_to_browser(&window);
             let Some(document) = window.document() else { return };
             let Some(canvas) = document.get_element_by_id(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
                 log::error!("missing <canvas id=\"{CANVAS_ID}\">");
@@ -533,18 +600,40 @@ mod web {
                         solidcraft_ui_egui::fonts::setup_fonts(&cc.egui_ctx);
                         let files = Rc::new(Files::default());
                         files::start(&files);
-                        let panel = files.clone();
+                        let (panel, opener, saver, shown) = (files.clone(), files.clone(), files.clone(), files.clone());
+                        let (restorable, restorer) = (files.clone(), files.clone());
                         let services = Services {
-                            // Open shows the browser's files (and the computer's, from there).
-                            pick_open: Some(Box::new(move |_: &[&str]| {
+                            // Open shows the browser's open dialog for a design where it has one
+                            // (the file keeps its handle, so Save writes back to it); otherwise,
+                            // and for inserting STEP or meshes, the browser's files window.
+                            pick_open: Some(Box::new(move |exts: &[&str]| {
+                                if disk::handles_open(exts) {
+                                    return Box::pin(disk::pick_open(&opener));
+                                }
                                 panel.panel.set(true);
                                 Box::pin(std::future::ready(None))
                             })),
-                            // Designs are kept in the browser; everything else is downloaded.
-                            pick_save: Some(Box::new(|name: &str, exts: &[&str]| {
+                            // A design is saved to a file the user picks, or kept in the browser
+                            // where the browser can't pick one; everything else is downloaded.
+                            pick_save: Some(Box::new(move |name: &str, exts: &[&str]| {
                                 let design = exts.contains(&solidcraft_engine::io::DESIGN_EXT);
-                                Box::pin(std::future::ready(Some(format!("{}{name}", if design { files::OPFS } else { files::DOWNLOADS }))))
+                                match disk::save_target(disk::supported(), design) {
+                                    SaveTarget::Disk => Box::pin(disk::pick_save(&saver, name)),
+                                    SaveTarget::Browser => {
+                                        saver.say("This browser can't save to a folder: the design is kept in this browser. File > Download design saves a file.", false);
+                                        Box::pin(std::future::ready(Some(format!("{}{name}", files::OPFS))))
+                                    }
+                                    SaveTarget::Download => Box::pin(std::future::ready(Some(format!("{}{name}", files::DOWNLOADS)))),
+                                }
                             })),
+                            // A recent design on the disk, from an earlier session, opens by asking
+                            // the browser for its remembered file.
+                            can_restore: Some(Box::new(move |path: &str| {
+                                disk::parse(path).is_some_and(|(id, _)| restorable.disk_known.borrow().contains(id))
+                            })),
+                            restore_file: Some(Box::new(move |path: &str| disk::restore(&restorer, path))),
+                            download_design: Some(Box::new(files::download)),
+                            browser_files: Some(Box::new(move || shown.panel.set(true))),
                             install_app: Some(crate::install::service(&cc.egui_ctx)),
                             ..Default::default()
                         };
@@ -589,6 +678,7 @@ mod web {
                             cjk_bytes: None,
                             font_language,
                             space_mouse: SpaceMouse::default(),
+                            wheel_gestures: solidcraft_ui_egui::WebWheelGestures::default(),
                         }))
                     }),
                 )
@@ -614,3 +704,17 @@ fn main() {
 fn main() {
     eprintln!("solidcraft-web only runs in the browser: build it with `trunk build --release` in apps/solidcraft-web");
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn only_ctrl_tab_is_left_to_the_browser() {
+        // Ctrl+Tab and Ctrl+Shift+Tab (the event's key is "Tab" either way) switch browser tabs.
+        assert!(browser_switches_tabs("Tab", true));
+        // Tab and Shift+Tab move between the app's fields; Ctrl with other keys stays the app's.
+        assert!(!browser_switches_tabs("Tab", false));
+        assert!(!browser_switches_tabs("s", true));
+    }
+}

apps/solidcraft-web/src/space_mouse.rs

@@ -246,11 +246,11 @@ mod tests {
         let axis =
             |source, rest, full| solidcraft_ui_egui::space_mouse::AxisCalibration { source, reversed: false, rest, dead_zone: 0, full: [full; 2] };
         // A short-range device: 15 of its 50 is under the raw dead zone, but 105 of 350 calibrated.
-        let short = Calibration { dead_zone_share: 0.0, axes: std::array::from_fn(|r| axis(r, 0, 50)) };
+        let short = Calibration { dead_zone_share: 0.0, kind: Default::default(), axes: std::array::from_fn(|r| axis(r, 0, 50)) };
         let push = Axes { translation: [15, 0, 0], rotation: [0; 3] };
         assert!(!push.moving() && moving(push, Some(short)));
         // A device resting at 100 on every axis: past the raw dead zone, but at rest calibrated.
-        let offset = Calibration { dead_zone_share: 0.0, axes: std::array::from_fn(|r| axis(r, 100, 350)) };
+        let offset = Calibration { dead_zone_share: 0.0, kind: Default::default(), axes: std::array::from_fn(|r| axis(r, 100, 350)) };
         let resting = Axes { translation: [100; 3], rotation: [100; 3] };
         assert!(resting.moving() && !moving(resting, Some(offset)));
         // Without a calibration, as read.

apps/solidcraft/Cargo.toml

@@ -50,8 +50,13 @@ hidapi = { version = "2.6.7", default-features = false, features = ["windows-nat
 raw-window-handle = "0.6"
 # Native crash capture (src/native_crash.rs): the exception filter, the faulting module, a minidump.
 # The window's resize border and DPI size (src/native_frame.rs): the window procedure, hit test, DPI.
+# Finding 3D mice through Plug and Play without asking other devices anything (src/space_mouse/windows_hid.rs).
 windows-sys = { version = "0.61", features = [
+    "Win32_Devices_DeviceAndDriverInstallation",
+    "Win32_Devices_HumanInterfaceDevice",
+    "Win32_Devices_Properties",
     "Win32_Foundation",
+    "Win32_Graphics_Gdi",
     "Win32_Security",
     "Win32_Storage_FileSystem",
     "Win32_System_Diagnostics_Debug",
@@ -65,6 +70,7 @@ windows-sys = { version = "0.61", features = [
 ] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
+muda = { version = "0.21.2", default-features = false }
 # The 3D mouse through the 3Dconnexion driver, which keeps the device to itself (src/space_mouse.rs).
 solidcraft-3dx-client = { workspace = true }
 # The 3D mouse (src/space_mouse.rs), in the shared-device open mode so that a running 3DxWare
@@ -73,7 +79,7 @@ hidapi = { version = "2.6.7", default-features = false, features = ["macos-share
 # Files opened from Finder and the Dock (src/open_documents.rs); all already come with eframe and rfd.
 objc2 = "0.6"
 objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder"] }
-objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSString", "NSURL"] }
+objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSProcessInfo", "NSString", "NSURL"] }
 block2 = "0.6"
 
 [target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]

apps/solidcraft/src/control_server.rs

@@ -3,13 +3,15 @@
 
 use std::io::{BufRead, BufReader, Write};
 use std::net::{TcpListener, TcpStream};
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
 use std::sync::mpsc::{Receiver, Sender, TryRecvError, channel};
-use std::time::Duration;
+use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
+use std::time::{Duration, Instant};
 
 use serde_json::{Value, json};
 use solidcraft_engine::MAX_LINE;
 use solidcraft_engine::control_auth;
+use solidcraft_engine::control_pending;
 use solidcraft_ui_egui::ControlRequest;
 
 /// Connections served at once, so a flood must not be able to spawn threads without end.
@@ -18,7 +20,7 @@ const MAX_CONNECTIONS: usize = 16;
 const MAX_BAD_LINES: usize = 8;
 
 static OPEN: AtomicUsize = AtomicUsize::new(0);
-/// The token files this launch wrote (its `--control` port, the agent chat's endpoint), removed
+/// 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());
 
@@ -36,14 +38,42 @@ pub fn remove_token_file() {
             let _ = std::fs::remove_file(p);
         }
     }
+    if let Some(port) = APP_PORT.lock().ok().and_then(|p| *p) {
+        control_auth::remove_current_port(port);
+    }
 }
 
-pub fn start(port: u16, ctx: egui::Context) -> Receiver<ControlRequest> {
+/// 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);
+
+pub fn start(listen_on: control_auth::Listen, ctx: egui::Context) -> Receiver<ControlRequest> {
     let (tx, rx) = channel::<ControlRequest>();
     // Every connection must show the token before anything runs (docs/control-protocol.md).
     match control_auth::env_token().or_else(new_token) {
         Some(token) => {
-            listen(port, token, tx, ctx, false);
+            let listener = match listen_on {
+                control_auth::Listen::Exact(port) => TcpListener::bind(("127.0.0.1", port)),
+                control_auth::Listen::Default => control_auth::bind_with_fallback(control_auth::DEFAULT_PORT, control_auth::PORT_TRIES),
+            };
+            match listener {
+                Ok(l) => {
+                    if let Some(port) = listen_on_listener(l, token, 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)");
+                        }
+                        // The discovery file: where `solidcraft-cli mcp` finds this app with no arguments.
+                        match control_auth::write_current_port(port) {
+                            Ok(_) => {
+                                if let Ok(mut p) = APP_PORT.lock() {
+                                    *p = Some(port);
+                                }
+                            }
+                            Err(e) => eprintln!("solidcraft: could not write the control discovery file ({e})"),
+                        }
+                    }
+                }
+                Err(e) => eprintln!("solidcraft: control server failed to bind 127.0.0.1: {e}"),
+            }
         }
         None => eprintln!("solidcraft: control server not started: no random token available"),
     }
@@ -59,20 +89,20 @@ pub fn listen_agent(tx: Sender<ControlRequest>, ctx: egui::Context) -> Option<u1
         eprintln!("solidcraft: agent chat endpoint not started: no random token available");
         return None;
     };
-    listen(0, token, tx, ctx, true)
-}
-
-/// Listen on `port` (0: a free port the system picks) with `token`; the port it listens on.
-/// `patient`: every request may wait as long as a batch (a person decides on it).
-fn listen(port: u16, token: String, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) -> Option<u16> {
-    let listener = match TcpListener::bind(("127.0.0.1", port)) {
+    let listener = match TcpListener::bind(("127.0.0.1", 0)) {
         Ok(l) => l,
         Err(e) => {
-            eprintln!("solidcraft: control server failed to bind 127.0.0.1:{port}: {e}");
+            eprintln!("solidcraft: control server failed to bind 127.0.0.1: {e}");
             return None;
         }
     };
-    let port = listener.local_addr().map(|a| a.port()).unwrap_or(port);
+    listen_on_listener(listener, token, tx, ctx, true)
+}
+
+/// Serve `listener` (loopback) with `token`; the port it listens on.
+/// `patient`: every request may wait as long as a batch (a person decides on it).
+fn listen_on_listener(listener: TcpListener, token: String, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) -> Option<u16> {
+    let port = listener.local_addr().ok()?.port();
     match control_auth::token_path(port) {
         Some(path) => match control_auth::write_token_file(&path, &token) {
             Ok(()) => {
@@ -175,14 +205,171 @@ const WAITS: Waits = Waits { short: Duration::from_secs(60), long: Duration::fro
 struct Pending {
     id: Value,
     method: String,
+    /// The request in messages ("`engine.execute` (solid.fillet)").
+    what: String,
     reply: Receiver<Value>,
 }
 
-fn serve(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) {
-    serve_with(stream, token, tx, ctx, patient, WAITS);
+/// Every request the app has been sent and not answered yet, from every connection, for
+/// `control.running` (#3654). Each connection's own thread answers that, so it never waits behind
+/// a running request.
+struct Running {
+    list: Mutex<Vec<InFlight>>,
+    connections: AtomicU64,
+    keys: AtomicU64,
 }
 
-fn serve_with(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool, waits: Waits) {
+/// What `control.running` says about a request: never its parameters beyond the command id.
+struct InFlight {
+    key: u64,
+    connection: u64,
+    id: Value,
+    method: String,
+    command: Option<&'static str>,
+    steps: Option<usize>,
+    since: Instant,
+    started: Arc<AtomicBool>,
+}
+
+/// The app's requests, from both of its listeners.
+static RUNNING: Running = Running::new();
+
+impl Running {
+    const fn new() -> Self {
+        Running { list: Mutex::new(Vec::new()), connections: AtomicU64::new(0), keys: AtomicU64::new(0) }
+    }
+
+    fn lock(&self) -> MutexGuard<'_, Vec<InFlight>> {
+        self.list.lock().unwrap_or_else(PoisonError::into_inner)
+    }
+
+    /// List `req`, sent on `connection`, until the returned ticket is dropped.
+    fn add(&'static self, connection: u64, id: &Value, req: &ControlRequest) -> Ticket {
+        let key = self.keys.fetch_add(1, Ordering::Relaxed);
+        // Ids and methods come from the client: only short ones are repeated to the others.
+        let id = match id {
+            Value::Number(_) => id.clone(),
+            Value::String(s) if s.len() <= 64 => id.clone(),
+            _ => Value::Null,
+        };
+        let p = &req.params;
+        let command = match req.method.as_str() {
+            "engine.execute" | "command" => p.get("command").and_then(Value::as_str).and_then(solidcraft_engine::find_command).map(|c| c.id),
+            _ => None,
+        };
+        let steps = match req.method.as_str() {
+            "engine.batch" | "engine.script" => p.get("commands").and_then(Value::as_array).map(Vec::len),
+            _ => None,
+        };
+        let method = req.method.chars().take(64).collect();
+        let started = req.started.clone();
+        self.lock().push(InFlight { key, connection, id, method, command, steps, since: Instant::now(), started });
+        Ticket { running: self, key }
+    }
+
+    /// The `control.running` result, as `asker`'s connection sees it.
+    fn result(&self, asker: u64) -> Value {
+        let rows: Vec<Value> = self
+            .lock()
+            .iter()
+            .map(|e| {
+                let mut r = json!({
+                    "connection": e.connection,
+                    "id": e.id,
+                    "method": e.method,
+                    "running_s": (e.since.elapsed().as_secs_f64() * 10.0).round() / 10.0,
+                    "queued": !e.started.load(Ordering::Relaxed),
+                });
+                if let Some(c) = e.command {
+                    r["command"] = json!(c);
+                }
+                if let Some(n) = e.steps {
+                    r["steps"] = json!(n);
+                }
+                if e.connection == asker {
+                    r["self"] = json!(true);
+                }
+                r
+            })
+            .collect();
+        json!({"running": rows})
+    }
+}
+
+/// A listed request; dropped when its reply arrives.
+struct Ticket {
+    running: &'static Running,
+    key: u64,
+}
+
+impl Drop for Ticket {
+    fn drop(&mut self) {
+        let key = self.key;
+        self.running.lock().retain(|e| e.key != key);
+    }
+}
+
+/// The reply to a timed-out request, received on a thread of its own so the request stays listed
+/// until the app answers, also once its connection has closed (#3654).
+fn watch(reply: Receiver<Value>, ticket: Ticket) -> Receiver<Value> {
+    let (late_tx, late_rx) = channel();
+    // A small thread per timed-out request (each connection has at most one). If none can be
+    // made, the reply is lost and `control.pending` says the app ended the request without one.
+    // The reply is passed on before the request leaves the list: once `control.running` no longer
+    // shows it, its connection's `control.pending` has it.
+    let _ = std::thread::Builder::new().stack_size(64 * 1024).spawn(move || {
+        if let Ok(v) = reply.recv() {
+            let _ = late_tx.send(v);
+        }
+        drop(late_tx);
+        drop(ticket);
+    });
+    late_rx
+}
+
+/// The reply text for a request that outlasts its wait. A request that only reads changes
+/// nothing when it finishes; an export or a save still writes its file, and any other request
+/// still applies, as it was not cancelled.
+fn timeout_message(what: &str, effect: control_pending::Effect) -> String {
+    match effect {
+        control_pending::Effect::ReadsOnly => {
+            format!("timeout: {what} is still running in the app ({}); ask `control.pending` for its answer", effect.when_done())
+        }
+        control_pending::Effect::WritesFile => format!(
+            "timeout: {what} is still running in the app and will still write the file when it finishes (it was not cancelled: \
+             don't send it again; the design does not change); ask `control.pending` for its result"
+        ),
+        control_pending::Effect::Changes => format!(
+            "timeout: {what} is still running in the app and will still apply when it finishes (it was not cancelled: don't send it \
+             again); ask `control.pending` for its result"
+        ),
+    }
+}
+
+/// The reply text for a request refused because an earlier one on the connection still runs.
+fn busy_message(p: &Pending, method: &str) -> String {
+    let method: String = method.chars().take(128).collect();
+    format!(
+        "busy: request {} ({}) is still running, so `{method}` was not run; ask `control.pending` for that request's result, then \
+         send this one again",
+        p.id, p.what
+    )
+}
+
+fn serve(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: egui::Context, patient: bool) {
+    serve_with(stream, token, tx, ctx, patient, WAITS, &RUNNING);
+}
+
+fn serve_with(
+    stream: TcpStream,
+    token: &str,
+    tx: Sender<ControlRequest>,
+    ctx: egui::Context,
+    patient: bool,
+    waits: Waits,
+    running: &'static Running,
+) {
+    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);
@@ -216,13 +403,16 @@ fn serve_with(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: e
                 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).
-                let late = pending.as_ref().and_then(|p| match p.reply.try_recv() {
+                // 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() {
                     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.pending" {
+                let mut r = if method == "control.running" {
+                    json!({"ok": true, "result": running.result(connection)})
+                } else if method == "control.pending" {
                     match (pending.take(), late) {
                         (None, _) => json!({"ok": true, "result": {"pending": null}}),
                         (Some(p), Some(reply)) => json!({"ok": true, "result": {"pending": p.id, "method": p.method, "done": true, "reply": reply}}),
@@ -234,7 +424,7 @@ fn serve_with(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: e
                     }
                 } else if let Some(p) = pending.as_ref().filter(|_| late.is_none()) {
                     // Nothing more is queued behind it, to run unseen when it ends.
-                    json!({"ok": false, "busy": true, "error": format!("busy: request {} (`{}`) is still running; ask `control.pending` for its result", p.id, p.method)})
+                    json!({"ok": false, "busy": true, "error": busy_message(p, &method)})
                 } else {
                     if late.is_some() {
                         // Finished, and the client moved on without asking: it is dropped.
@@ -242,7 +432,10 @@ fn serve_with(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: e
                     }
                     // A batch replaces many short requests: the whole of it may take long (#743).
                     let wait = if patient || method == "engine.batch" { waits.long } else { waits.short };
+                    let what = control_pending::describe(&method, &params);
+                    let effect = control_pending::effect(&method, &params);
                     let (req, rrx) = ControlRequest::new(method.clone(), params);
+                    let ticket = running.add(connection, &id, &req);
                     if tx.send(req).is_err() {
                         break;
                     }
@@ -250,8 +443,8 @@ fn serve_with(stream: TcpStream, token: &str, tx: Sender<ControlRequest>, ctx: e
                     match rrx.recv_timeout(wait) {
                         Ok(r) => r,
                         Err(_) => {
-                            let r = json!({"ok": false, "running": true, "error": format!("timeout: `{method}` is still running in the app and will still apply; ask `control.pending` for its result")});
-                            pending = Some(Pending { id: id.clone(), method, reply: rrx });
+                            let r = json!({"ok": false, "running": true, "error": timeout_message(&what, effect)});
+                            pending = Some(Pending { id: id.clone(), method, what, reply: watch(rrx, ticket) });
                             r
                         }
                     }
@@ -307,9 +500,10 @@ mod tests {
             }
         });
         let waits = Waits { short: Duration::from_millis(100), long: Duration::from_millis(100) };
+        static RUNNING: Running = Running::new();
         std::thread::spawn(move || {
             if let Some(stream) = listener.incoming().flatten().next() {
-                serve_with(stream, token, tx, egui::Context::default(), false, waits);
+                serve_with(stream, token, tx, egui::Context::default(), false, waits, &RUNNING);
             }
         });
         let s = TcpStream::connect(addr).unwrap();
@@ -349,6 +543,121 @@ mod tests {
         assert_eq!(*ran.lock().unwrap(), ["slow", "ui.view"], "the busy request never reached the app");
     }
 
+    /// #3654: `control.running` answers on every connection, at once, with what any connection
+    /// has the app running or queued (command ids, never parameters); a timed-out request stays
+    /// listed until the app answers it, and an idle app lists nothing.
+    #[test]
+    fn every_connection_sees_what_the_app_is_running() {
+        static RUNNING: Running = Running::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: one request at a time, as `drain_control` takes them; the export is held
+        // until the test lets it go.
+        let (gate_tx, gate_rx) = channel::<()>();
+        std::thread::spawn(move || {
+            for req in rx {
+                req.started.store(true, Ordering::Relaxed);
+                if req.method == "engine.execute" {
+                    let _ = gate_rx.recv();
+                }
+                let _ = req.reply.send(json!({"ok": true, "result": req.method}));
+            }
+        });
+        let waits = Waits { short: Duration::from_millis(100), long: Duration::from_secs(60) };
+        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));
+            }
+        });
+        let open = || {
+            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);
+            move |v: Value| -> Value {
+                writeln!(out, "{v}").unwrap();
+                let mut l = String::new();
+                lines.read_line(&mut l).unwrap();
+                serde_json::from_str(&l).unwrap()
+            }
+        };
+        let running = |ask: &mut dyn FnMut(Value) -> Value, until: &dyn Fn(&[Value]) -> bool| {
+            let deadline = Instant::now() + Duration::from_secs(10);
+            loop {
+                let r = ask(json!({"id": 0, "method": "control.running", "token": token}));
+                let rows = r["result"]["running"].as_array().cloned().unwrap_or_default();
+                if until(&rows) || Instant::now() > deadline {
+                    return (r, rows);
+                }
+                std::thread::sleep(Duration::from_millis(10));
+            }
+        };
+        let mut watcher = open();
+        let (r, rows) = running(&mut watcher, &|_| true);
+        assert!(r["ok"] == true && rows.is_empty(), "idle: {r}");
+
+        let mut export = open();
+        let path = "/private/part.step";
+        let params = json!({"command": "file.export", "params": {"path": path}});
+        let r = export(json!({"id": 7, "method": "engine.execute", "params": params, "token": token}));
+        assert_eq!(r["running"], true, "{r}");
+        // A batch from another connection waits behind the export.
+        let mut batch = open();
+        let queued = std::thread::spawn(move || {
+            let steps = json!([{"command": "solid.box"}, {"command": "solid.box"}]);
+            batch(json!({"id": "b", "method": "engine.batch", "params": {"commands": steps}, "token": token}))
+        });
+        // The window may not have taken the export yet, even though it timed out.
+        let (r, rows) = running(&mut watcher, &|rows| rows.len() == 2 && rows[0]["queued"] == false);
+        assert_eq!(rows.len(), 2, "{r}");
+        let (e, b) = (&rows[0], &rows[1]);
+        assert_eq!(
+            (&e["id"], &e["method"], &e["command"], &e["queued"]),
+            (&json!(7), &json!("engine.execute"), &json!("file.export"), &json!(false)),
+            "{r}"
+        );
+        assert!(e["running_s"].as_f64().is_some_and(|s| s >= 0.1), "{r}");
+        assert_eq!((&b["id"], &b["method"], &b["steps"], &b["queued"]), (&json!("b"), &json!("engine.batch"), &json!(2), &json!(true)), "{r}");
+        assert_ne!(e["connection"], b["connection"], "{r}");
+        assert!(rows.iter().all(|row| row.get("self").is_none()), "{r}");
+        assert!(!r.to_string().contains(path), "parameters stay with their connection: {r}");
+        // The connection whose request timed out may ask too, and sees its own marked.
+        let r = export(json!({"id": 8, "method": "control.running"}));
+        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}");
+
+        gate_tx.send(()).unwrap();
+        assert_eq!(queued.join().unwrap()["result"], "engine.batch");
+        let (r, rows) = running(&mut watcher, &|rows| rows.is_empty());
+        assert!(rows.is_empty(), "done: {r}");
+        // Asking `control.running` did not take the export's reply from its connection.
+        let r = export(json!({"id": 9, "method": "control.pending"}));
+        assert_eq!((&r["result"]["pending"], &r["result"]["done"]), (&json!(7), &json!(true)), "{r}");
+    }
+
+    /// 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]
+    fn timeout_text_tells_reads_from_changes() {
+        let says = |method: &str, p: Value| timeout_message(&control_pending::describe(method, &p), control_pending::effect(method, &p));
+        let read = says("ui.inspect", json!({}));
+        assert!(read.starts_with("timeout") && read.contains("only reads") && !read.contains("will still apply"), "{read}");
+        let read = says("engine.execute", json!({"command": "sketch.inspect"}));
+        assert!(read.contains("only reads") && read.contains("sketch.inspect"), "{read}");
+        let change = says("engine.execute", json!({"command": "solid.fillet"}));
+        assert!(change.starts_with("timeout") && change.contains("will still apply") && change.contains("solid.fillet"), "{change}");
+        let export = says("engine.execute", json!({"command": "file.export", "params": {"path": "/tmp/wall.step"}}));
+        assert!(export.contains("will still write the file") && !export.contains("apply") && export.contains("file.export"), "{export}");
+        let save = says("engine.execute", json!({"command": "file.save"}));
+        assert!(save.contains("will still write the file") && !save.contains("apply"), "{save}");
+        let render = says("ui.render", json!({"path": "/tmp/a.png"}));
+        assert!(render.contains("will still write the file"), "{render}");
+    }
+
     /// #205: a connection runs nothing until a request carries the launch's token; a wrong or
     /// missing token, or garbage, is refused and the connection closed. Once shown, the token
     /// need not be repeated on that connection.

apps/solidcraft/src/device_lost.rs

@@ -0,0 +1,91 @@
+//! The graphics device was lost after the window opened: the driver was reset (on Windows a TDR,
+//! "Display driver stopped responding and has recovered") or the GPU went away (#4172). A lost
+//! device can't draw again, so the window can't show anything more, not even a message. The
+//! painter stops drawing (`egui_wgpu::DeviceLost`); the app then closes, keeping unsaved changes
+//! 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.
+
+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";
+
+/// 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.
+const RECENT_SECS: u64 = 600;
+
+/// Seconds since 1970.
+pub fn now_secs() -> u64 {
+    std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map_or(0, |d| d.as_secs())
+}
+
+/// Whether `stamp` ([`LOST_ENV`]) names a loss at most [`RECENT_SECS`] before `now`.
+pub fn recent(stamp: Option<&str>, now: u64) -> bool {
+    stamp.and_then(|s| s.trim().parse::<u64>().ok()).is_some_and(|at| at <= now && now - at <= RECENT_SECS)
+}
+
+/// Whether the start after a lost device uses the software renderer: when this launch already
+/// followed a recent loss (the driver keeps losing it), or ran on it anyway.
+pub fn restart_on_software(after_recent_loss: bool, cpu_renderer: bool) -> bool {
+    after_recent_loss || cpu_renderer
+}
+
+/// What the start after a lost device tells the user, `software` when it runs on the software
+/// renderer.
+pub fn note(software: bool) -> 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.");
+    }
+    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 };
+    let mut command = std::process::Command::new(exe);
+    command.args(std::env::args_os().skip(1)).env(LOST_ENV, lost_at.to_string());
+    if software {
+        command.env(startup::RENDERER_ENV, "cpu");
+    }
+    #[cfg(windows)]
+    {
+        use std::os::windows::process::CommandExt;
+        // Not tied to this process: its own process group, no console.
+        command.creation_flags(0x0000_0200 | 0x0000_0008);
+    }
+    if let Err(e) = command.spawn() {
+        log::error!("graphics: starting again after the device was lost: {e}");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    /// Only a recent, well-formed stamp counts: a later start that inherited it says nothing.
+    #[test]
+    fn only_a_recent_loss_counts() {
+        let now = 1_000_000;
+        assert!(super::recent(Some("999990"), now));
+        assert!(super::recent(Some(" 999400 "), now));
+        assert!(!super::recent(Some("999399"), now), "older than ten minutes");
+        assert!(!super::recent(Some("1000001"), now), "from the future");
+        assert!(!super::recent(Some("soon"), now));
+        assert!(!super::recent(None, now));
+    }
+
+    /// The first loss starts again on the GPU; a second one soon after, on the software renderer.
+    #[test]
+    fn a_second_loss_in_a_row_starts_on_the_software_renderer() {
+        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"));
+    }
+}

apps/solidcraft/src/main.rs

@@ -10,6 +10,7 @@
 //!
 //! `--control <port>` (or `SOLIDCRAFT_CONTROL_PORT`) starts a localhost JSON-lines control
 //! server: `{"id":1,"method":"engine.execute","params":{"command":"solid.box","params":{…}}}`.
+//! Without them the channel still opens, on the default port, unless Preferences turns it off.
 //! See `solidcraft_ui_egui::control` and docs/control-protocol.md.
 #![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
@@ -19,42 +20,102 @@
 #[path = "../../../assets/icons/app/shared/source/app_icon.rs"]
 mod app_icon;
 mod control_server;
+mod device_lost;
 #[cfg(target_os = "windows")]
 mod native_crash;
 #[cfg(target_os = "windows")]
 mod native_frame;
 #[cfg(target_os = "macos")]
+mod native_menu;
+#[cfg(target_os = "macos")]
 mod open_documents;
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 mod space_mouse;
 mod startup;
+#[cfg(any(target_os = "windows", test))]
+mod window_fit;
 
 use solidcraft_engine::{Session, io};
 use solidcraft_ui_egui::{Services, SolveApp};
 
+/// Windows: put the restored window back inside the monitor's work area if it is out of reach
+/// (a gone monitor, another scale, a taskbar edge). Sizes are in points, the work area in pixels.
+#[cfg(target_os = "windows")]
+fn fit_window_to_work_area(ctx: &egui::Context, frame: &eframe::Frame) {
+    use window_fit::Area;
+    let Some((x, y, w, h)) = native_frame::work_area(frame) else { return };
+    let (outer, inner, scale, maximized) = ctx.input(|i| {
+        let v = i.viewport();
+        (v.outer_rect, v.inner_rect, v.native_pixels_per_point, v.maximized.unwrap_or(false) || v.fullscreen.unwrap_or(false))
+    });
+    let (Some(outer), Some(inner), Some(scale)) = (outer, inner, scale.filter(|s| s.is_finite() && *s > 0.0)) else { return };
+    if maximized {
+        return;
+    }
+    let work = Area::new(x as f32 / scale, y as f32 / scale, w as f32 / scale, h as f32 / scale);
+    let now = Area::new(outer.min.x, outer.min.y, outer.width(), outer.height());
+    let fitted = window_fit::fit(now, work, (960.0, 600.0));
+    if fitted != now {
+        // The frame (title bar, borders) keeps its size; only the inner size follows.
+        let inner_size = egui::vec2((inner.width() - (now.w - fitted.w)).max(1.0), (inner.height() - (now.h - fitted.h)).max(1.0));
+        ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(inner_size));
+        ctx.send_viewport_cmd(egui::ViewportCommand::OuterPosition(egui::pos2(fitted.x, fitted.y)));
+    }
+}
+
+/// `SOLIDCRAFT_PROFILE_STARTUP=1` prints the time since launch at each startup step.
+fn mark(step: &str) {
+    static START: std::sync::OnceLock<(std::time::Instant, bool)> = std::sync::OnceLock::new();
+    let (start, on) = START.get_or_init(|| (std::time::Instant::now(), solidcraft_engine::geom::env::var_os("PROFILE_STARTUP").is_some()));
+    if *on {
+        eprintln!("startup {:>6.0} ms  {step}", start.elapsed().as_secs_f64() * 1000.0);
+    }
+}
+
 struct App {
     solve: SolveApp,
     /// The settings folder whose start marker the first frame clears (`startup::started`).
     starting: Option<std::path::PathBuf>,
     /// Frames begun; the second one means the first was drawn (startup is over).
     frames: u32,
+    /// Started over the control channel: the window doesn't ask for the foreground.
+    take_focus_unwanted: bool,
+    /// The graphics device: lost, it can't draw again (`App::watch_device`, #4172).
+    gpu: Option<LostWatch>,
     #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
     space_mouse: space_mouse::SpaceMouse,
+    #[cfg(target_os = "macos")]
+    native_menu: Option<native_menu::NativeMenu>,
 }
 
 impl eframe::App for App {
     fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
         if self.frames < 2 {
             self.frames += 1;
+            // Before the window is shown: its title bar must be within reach (window_fit.rs).
+            #[cfg(target_os = "windows")]
+            if self.frames == 1 {
+                fit_window_to_work_area(ctx, _frame);
+            }
+            mark(if self.frames == 1 { "first frame begins" } else { "second frame begins (first presented)" });
             // A second frame right away, which means the first was presented: the app is up.
             ctx.request_repaint();
             if self.frames == 2 {
+                // The window is shown only once its first frame is presented, and Windows then
+                // keeps a window of a process started from a shortcut or an installer behind the
+                // others. Ask for the foreground once, now that it is on screen; never again, so
+                // later frames don't take the focus from whatever the user moved to. Automation
+                // over the control channel keeps the focus where it is.
+                if !self.take_focus_unwanted {
+                    ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
+                }
                 solidcraft_engine::crash::phase(solidcraft_engine::crash::RUNNING);
                 if let Some(dir) = self.starting.take() {
                     startup::started(&dir);
                 }
             }
         }
+        self.watch_device();
         // The design on screen is the one whose commands a crash report replays.
         self.solve.session.crash_journal = solidcraft_engine::crash::enabled();
         // The OS closing the window (Alt+F4, Cmd+Q, the window manager): ask about unsaved
@@ -67,6 +128,10 @@ impl eframe::App for App {
         for f in if self.solve.file_picker_busy() { Vec::new() } else { open_documents::take() } {
             self.solve.open_path_async(&f);
         }
+        #[cfg(target_os = "macos")]
+        if let Some(menu) = &mut self.native_menu {
+            menu.tick(&mut self.solve, ctx);
+        }
         self.solve.logic(ctx);
         #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
         if !self.solve.file_picker_busy() {
@@ -76,10 +141,17 @@ impl eframe::App for App {
             ctx.send_viewport_cmd(egui::ViewportCommand::Close);
         }
     }
-    fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
+    fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) {
+        #[cfg(target_os = "macos")]
+        if let Some(menu) = &mut self.native_menu {
+            menu.raw_input_hook(&mut self.solve, ctx, raw);
+        }
         // Before the app's own hook, which adds the control channel's events.
         #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
         self.space_mouse.raw_input_hook(self.solve.preferences.space_mouse_enabled, raw);
+        // The 3D mouse's buttons, before the app reads the frame: Esc and held modifiers join its input.
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+        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) {
@@ -95,6 +167,9 @@ impl eframe::App for App {
         solidcraft_ui_egui::save_job::tick(&mut self.solve, true);
         solidcraft_ui_egui::recovery_ui::close(&mut self.solve);
         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);
+        }
         // 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) {
             let mut command = std::process::Command::new(&program);
@@ -114,6 +189,48 @@ impl eframe::App for App {
     }
 }
 
+/// The window's graphics device, watched for its loss.
+struct LostWatch {
+    lost: eframe::egui_wgpu::DeviceLost,
+    /// Where the next start runs once this device is lost ([`device_lost::restart_on_software`]).
+    restart_on_software: bool,
+    /// When the loss was seen: the app is closing to start again.
+    lost_at: Option<u64>,
+}
+
+impl App {
+    /// The graphics device was lost (#4172): the window can't draw again, so close, keeping
+    /// unsaved changes for recovery as a forced quit does (the window can't ask about them), and
+    /// start again once closed ([`device_lost::restart`]).
+    fn watch_device(&mut self) {
+        let Some(gpu) = self.gpu.as_mut().filter(|g| g.lost_at.is_none() && g.lost.is_lost()) else { return };
+        let reason = gpu.lost.reason().unwrap_or_default();
+        log::error!("graphics: the device was lost ({reason}); closing to start again");
+        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());
+        self.solve.quit_requested = true;
+    }
+}
+
+/// Linux file dialogs match patterns by case, so each extension goes in as lower and upper
+/// case, plus FreeCAD's own mixed casing.
+fn case_variants(exts: &[&str]) -> Vec<String> {
+    let mut all: Vec<String> = Vec::new();
+    for e in exts {
+        let mut forms = vec![e.to_ascii_lowercase(), e.to_ascii_uppercase()];
+        if e.eq_ignore_ascii_case("fcstd") {
+            forms.push("FCStd".into());
+        }
+        for v in forms {
+            if !all.contains(&v) {
+                all.push(v);
+            }
+        }
+    }
+    all
+}
+
 fn services(cc: &eframe::CreationContext<'_>) -> Services {
     let parent = rfd::AsyncFileDialog::new().set_parent(cc);
     let open_parent = parent.clone();
@@ -125,48 +242,14 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
             let mut dialog = open_parent.clone();
             if !first.is_empty() {
                 let label = first.iter().map(|e| e.to_uppercase()).collect::<Vec<_>>().join(", ");
-                let both: Vec<String> = first.iter().flat_map(|e| [e.to_lowercase(), e.to_uppercase()]).collect();
-                dialog = dialog.add_filter(label, &both);
+                dialog = dialog.add_filter(label, &case_variants(first));
             }
-            let future = dialog
-                .add_filter(
-                    "Designs, CAD files and meshes",
-                    &[
-                        io::DESIGN_EXT,
-                        io::LEGACY_DESIGN_EXT,
-                        "json",
-                        "step",
-                        "stp",
-                        "STEP",
-                        "STP",
-                        "igs",
-                        "iges",
-                        "IGS",
-                        "IGES",
-                        "FCStd",
-                        "fcstd",
-                        "3dm",
-                        "3DM",
-                        "3mf",
-                        "3MF",
-                        "stl",
-                        "STL",
-                        "obj",
-                        "OBJ",
-                        "glb",
-                        "GLB",
-                        "gltf",
-                        "GLTF",
-                    ],
-                )
-                .add_filter("SolidCraft design (container or JSON)", &[io::DESIGN_EXT, io::LEGACY_DESIGN_EXT, "json"])
-                .add_filter("STEP", &["step", "stp", "STEP", "STP"])
-                .add_filter("IGES", &["igs", "iges", "IGS", "IGES"])
-                .add_filter("FreeCAD and Rhino", &["FCStd", "fcstd", "3dm", "3DM"])
-                .add_filter("Mesh (3MF, STL, OBJ, glTF)", &["3mf", "3MF", "stl", "STL", "obj", "OBJ", "glb", "GLB", "gltf", "GLTF"])
-                .add_filter("Sketch drawings (DXF, SVG)", &["dxf", "DXF", "svg", "SVG"])
-                .add_filter("All files", &["*"])
-                .pick_file();
+            // The groups come from the format registry, so a new format joins this dialog by itself.
+            dialog = dialog.add_filter("Designs, CAD files and meshes", &case_variants(&io::formats::open_extensions(true)));
+            for (label, exts) in io::formats::import_filters(true) {
+                dialog = dialog.add_filter(label, &case_variants(&exts));
+            }
+            let future = dialog.add_filter("All files", &["*"]).pick_file();
             Box::pin(async move { future.await.map(|p| p.path().to_string_lossy().into_owned()) })
         })),
         // One kind of file (the agent chat's attachments): only the types it names, as given and in
@@ -206,10 +289,15 @@ fn services(cc: &eframe::CreationContext<'_>) -> Services {
             Box::pin(async move { future.await.map(|p| p.path().to_string_lossy().into_owned()) })
         })),
         graphics_path: graphics_path().map(|p| p.to_string_lossy().to_string()),
+        window_system: window_system_now(),
         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.
         install_app: None,
+        can_restore: None,
+        restore_file: None,
+        download_design: None,
+        browser_files: None,
         agent_http: Some(std::sync::Arc::new(agent_http)),
         secrets: Some(std::sync::Arc::new(Keychain)),
         show_in_folder: Some(Box::new(|path| {
@@ -427,6 +515,18 @@ fn backend_preference() -> Option<String> {
     graphics().and_then(|v| v.get("backend").and_then(serde_json::Value::as_str).map(str::to_string))
 }
 
+/// The viewport scene's sample count: the app's anti-aliasing (the window's pass is 1x), clamped
+/// by the backend's policy (OpenGL renders 1x, see `effective_msaa_samples`). A count the device
+/// cannot render with falls back to the supported default.
+fn scene_samples(backend: eframe::wgpu::Backend, samples: u32, supported: &[u32]) -> u32 {
+    let requested = eframe::egui_wgpu::effective_msaa_samples(backend, samples.max(1));
+    if requested <= 1 || supported.is_empty() || supported.contains(&requested) {
+        requested
+    } else {
+        supported.iter().copied().filter(|&n| n <= solidcraft_ui_egui::prefs::Prefs::default().msaa).max().unwrap_or(1)
+    }
+}
+
 /// Anti-aliasing samples from Preferences (4 when unset).
 fn msaa() -> u16 {
     graphics()
@@ -473,6 +573,9 @@ fn app_viewport() -> Result<egui::ViewportBuilder, eframe::Error> {
 const APP_ID: &str = solidcraft_engine::io::APP_ID;
 
 fn main() -> eframe::Result {
+    #[cfg(target_os = "macos")]
+    objc2_foundation::NSProcessInfo::processInfo().setProcessName(objc2_foundation::ns_string!("SolidCraft"));
+    mark("main");
     adopt_legacy_settings();
     let mut safe_mode = startup::env_on(std::env::var(startup::SAFE_MODE_ENV).ok().as_deref());
     let mut control_port: Option<u16> = solidcraft_engine::geom::env::var("CONTROL_PORT").and_then(|p| p.parse().ok());
@@ -522,6 +625,11 @@ fn main() -> eframe::Result {
         notes.push(format!("The last {failed_starts} launches stopped before the window opened, so this one is in safe mode."));
     }
     let cpu_renderer = safe_mode || startup::cpu_renderer_env(std::env::var(startup::RENDERER_ENV).ok().as_deref());
+    // 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));
+    }
     if safe_mode {
         notes.push("Safe mode: default settings (yours are kept for the next normal start), no recovery offer, software rendering.".into());
     }
@@ -547,9 +655,11 @@ fn main() -> eframe::Result {
     solidcraft_engine::crash::phase("window");
     let options = eframe::NativeOptions {
         viewport: app_viewport()?,
-        depth_buffer: depth_bits,
-        stencil_buffer: STENCIL_BITS,
-        multisampling: samples,
+        // The window's pass (egui's) has no depth and one sample: the viewport draws its scene
+        // offscreen with its own depth and MSAA, then blits it, so the UI pass pays for neither.
+        depth_buffer: 0,
+        stencil_buffer: 0,
+        multisampling: 1,
         // Kept with the other settings, not in a folder named after the app id. Safe mode reads
         // and writes a scratch copy, leaving the user's settings as they were.
         persistence_path: if safe_mode {
@@ -566,12 +676,24 @@ fn main() -> eframe::Result {
     #[cfg(all(unix, not(target_os = "macos")))]
     let mut options = options;
     #[cfg(all(unix, not(target_os = "macos")))]
-    if prefer_x11(
-        std::env::var_os("DISPLAY").is_some(),
-        std::env::var_os("WAYLAND_DISPLAY").is_some(),
-        std::env::var("XDG_CURRENT_DESKTOP").ok().as_deref(),
-        solidcraft_engine::geom::env::var("WAYLAND").as_deref(),
-    ) {
+    let x11 = {
+        // SOLIDCRAFT_WAYLAND wins over Preferences › Graphics › Window system (#3083).
+        let environment = solidcraft_engine::geom::env::var("WAYLAND");
+        let preference = window_system_preference();
+        let wayland_override = environment.as_deref().or(window_system_override(preference.as_deref()));
+        let wayland_display = std::env::var_os("WAYLAND_DISPLAY").is_some();
+        let x11 = prefer_x11(
+            std::env::var_os("DISPLAY").is_some(),
+            wayland_display,
+            std::env::var("XDG_CURRENT_DESKTOP").ok().as_deref(),
+            wayland_override,
+        );
+        // Without a Wayland socket winit opens on X11 anyway.
+        let _ = WINDOW_SYSTEM.set(if x11 || !wayland_display { "x11" } else { "wayland" });
+        x11
+    };
+    #[cfg(all(unix, not(target_os = "macos")))]
+    if x11 {
         options.event_loop_builder = Some(Box::new(|b| {
             use winit::platform::x11::EventLoopBuilderExtX11;
             b.with_x11();
@@ -583,13 +705,17 @@ fn main() -> eframe::Result {
     let created = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
     let created_in_app = created.clone();
     let starting = settings.clone();
+    mark("run_native");
     let result = eframe::run_native(
         "SolidCraft",
         options,
         Box::new(move |cc| {
             created_in_app.store(true, std::sync::atomic::Ordering::SeqCst);
             solidcraft_engine::crash::phase("app setup");
-            solidcraft_ui_egui::fonts::setup_fonts(&cc.egui_ctx);
+            mark("window and device ready");
+            solidcraft_ui_egui::fonts::setup_bundled_fonts(&cc.egui_ctx);
+            solidcraft_ui_egui::fonts::load_system_fonts_in_background(&cc.egui_ctx);
+            mark("fonts");
             let mut app = SolveApp::new(Session::default(), services(cc));
             app.apply_off_thread = Some(solidcraft_ui_egui::dialogs::APPLY_AT_ONCE);
             app.custom_titlebar = CUSTOM_TITLEBAR;
@@ -607,10 +733,17 @@ fn main() -> eframe::Result {
             if let Some(p) = cc.storage.and_then(|s| solidcraft_ui_egui::prefs::stored(|k| s.get_string(k))).filter(|_| !safe_mode) {
                 app.load_prefs(&p);
             }
+            mark("app state and prefs");
+            let gpu = cc.wgpu_render_state.as_ref().map(|rs| LostWatch {
+                lost: rs.device_lost.clone(),
+                restart_on_software: device_lost::restart_on_software(after_loss, cpu_renderer),
+                lost_at: None,
+            });
             if let Some(rs) = &cc.wgpu_render_state {
-                eprintln!("SolidCraft graphics: {:?}, MSAA {}x (requested {}x)", rs.adapter.get_info().backend, rs.msaa_samples, samples);
+                let scene_samples = scene_samples(rs.adapter.get_info().backend, u32::from(samples), &rs.msaa_supported);
+                eprintln!("SolidCraft graphics: {:?}, MSAA {scene_samples}x (requested {}x)", rs.adapter.get_info().backend, samples);
                 solidcraft_engine::crash::phase("viewport pipelines (shader compile)");
-                app.set_wgpu(rs, depth_bits, STENCIL_BITS, rs.msaa_samples);
+                app.set_wgpu_split(rs, depth_bits, STENCIL_BITS, scene_samples);
                 solidcraft_ui_egui::gpu::install_picture_renderer(rs);
                 // The graphics driver is loaded now; it may have put its own exception filter
                 // in front of ours.
@@ -620,12 +753,15 @@ fn main() -> eframe::Result {
                 solidcraft_ui_egui::prefs::check_msaa(&mut app, u32::from(samples));
                 let info = rs.adapter.get_info();
                 solidcraft_engine::crash::set_environment(&format!(
-                    "Renderer: {:?} {} ({}), MSAA {}x",
-                    info.backend, info.name, info.driver, rs.msaa_samples
+                    "Renderer: {:?} {} ({}), MSAA {scene_samples}x",
+                    info.backend, info.name, info.driver
                 ));
             }
-            if let Some(port) = control_port {
-                let rx = control_server::start(port, cc.egui_ctx.clone());
+            mark("viewport pipelines");
+            // `--control`/the environment name a port; otherwise the preference (on by default)
+            // opens the default one (docs/control-protocol.md).
+            if let Some(listen_on) = solidcraft_engine::control_auth::plan(control_port, app.preferences.agent_control) {
+                let rx = control_server::start(listen_on, cc.egui_ctx.clone());
                 app = app.with_control(rx);
             }
             // The agent chat's MCP bridge reaches the app through an endpoint of its own, started
@@ -676,13 +812,30 @@ fn main() -> eframe::Result {
             }
             #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
             let space_mouse = space_mouse::SpaceMouse::start(&cc.egui_ctx);
+            #[cfg(target_os = "macos")]
+            let native_menu = match native_menu::NativeMenu::new(&app, &cc.egui_ctx) {
+                Ok(menu) => Some(menu),
+                Err(error) => {
+                    app.set_status(format!("System menu: {error}"), true);
+                    None
+                }
+            };
+            #[cfg(target_os = "macos")]
+            {
+                app.native_file_menu = native_menu.is_some();
+            }
+            mark("app created");
             solidcraft_engine::crash::phase("first frame");
             Ok(Box::new(App {
                 solve: app,
                 starting,
                 frames: 0,
+                take_focus_unwanted: control_port.is_some(),
+                gpu,
                 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
                 space_mouse,
+                #[cfg(target_os = "macos")]
+                native_menu,
             }))
         }),
     );
@@ -750,6 +903,36 @@ fn no_window(error: eframe::Error, tried_cpu: bool, settings: Option<&std::path:
     Err(error)
 }
 
+/// Linux: the window system this run opened with (`wayland` or `x11`), for Preferences (#3083).
+#[cfg(all(unix, not(target_os = "macos")))]
+static WINDOW_SYSTEM: std::sync::OnceLock<&'static str> = std::sync::OnceLock::new();
+
+/// The window system this run uses, where there is a choice (Linux).
+fn window_system_now() -> Option<&'static str> {
+    #[cfg(all(unix, not(target_os = "macos")))]
+    return WINDOW_SYSTEM.get().copied();
+    #[cfg(not(all(unix, not(target_os = "macos"))))]
+    None
+}
+
+/// Preferences › Graphics › Window system (`graphics.json`'s `window_system`), read before the
+/// window opens.
+#[cfg(all(unix, not(target_os = "macos")))]
+fn window_system_preference() -> Option<String> {
+    graphics().and_then(|v| v.get("window_system").and_then(serde_json::Value::as_str).map(str::to_string))
+}
+
+/// The window system preference as the `SOLIDCRAFT_WAYLAND` value it stands for: `wayland` is
+/// `1`, `x11` is `0`, and `auto` (or anything else) leaves the choice to [`prefer_x11`].
+#[cfg(all(unix, not(target_os = "macos")))]
+fn window_system_override(preference: Option<&str>) -> Option<&'static str> {
+    match preference.map(str::trim) {
+        Some("wayland") => Some("1"),
+        Some("x11") => Some("0"),
+        _ => None,
+    }
+}
+
 /// Whether to run through XWayland rather than native Wayland. winit has no file drag-and-drop
 /// on Wayland (only on X11), so dropping files from the file manager showed a "no" cursor: use
 /// XWayland when it's there. Except on niri, whose XWayland (xwayland-satellite) breaks window
@@ -787,6 +970,19 @@ mod backend_tests {
         assert!(prefer_x11(true, true, Some("niri"), Some("0")));
         assert!(!prefer_x11(false, true, Some("niri"), Some("0")));
     }
+
+    /// Preferences › Graphics › Window system stands for the same values (#3083).
+    #[test]
+    fn the_window_system_preference_maps_to_the_override() {
+        use super::window_system_override as over;
+        assert_eq!(
+            (over(Some("wayland")), over(Some("x11")), over(Some("auto")), over(None), over(Some("junk"))),
+            (Some("1"), Some("0"), None, None, None)
+        );
+        // Wayland chosen on GNOME keeps native Wayland; X11 chosen on niri goes through XWayland.
+        assert!(!prefer_x11(true, true, Some("GNOME"), over(Some("wayland"))));
+        assert!(prefer_x11(true, true, Some("niri"), over(Some("x11"))));
+    }
 }
 
 #[cfg(test)]
@@ -844,4 +1040,13 @@ mod msaa_tests {
             }
         }
     }
+
+    #[test]
+    fn the_scene_follows_the_backend_policy_too() {
+        use eframe::wgpu::Backend;
+        assert_eq!(super::scene_samples(Backend::Gl, 4, &[1, 4]), 1);
+        assert_eq!(super::scene_samples(Backend::Gl, 4, &[]), 1);
+        assert_eq!(super::scene_samples(Backend::Vulkan, 4, &[1, 4]), 4);
+        assert_eq!(super::scene_samples(Backend::Dx12, 8, &[1, 2, 4]), 4);
+    }
 }

apps/solidcraft/src/native_frame.rs

@@ -26,6 +26,7 @@ use std::sync::atomic::{AtomicIsize, Ordering};
 use raw_window_handle::{HasWindowHandle, RawWindowHandle};
 use solidcraft_ui_egui::titlebar;
 use windows_sys::Win32::Foundation::{HWND, LPARAM, LRESULT, RECT, SIZE, WPARAM};
+use windows_sys::Win32::Graphics::Gdi::{GetMonitorInfoW, MONITOR_DEFAULTTONEAREST, MONITORINFO, MonitorFromWindow};
 use windows_sys::Win32::UI::HiDpi::{GetDpiForWindow, GetSystemMetricsForDpi};
 use windows_sys::Win32::UI::WindowsAndMessaging::{
     CallWindowProcW, GWL_STYLE, GWLP_WNDPROC, GetClientRect, GetWindowLongPtrW, GetWindowRect, HTBOTTOM, HTBOTTOMLEFT, HTBOTTOMRIGHT, HTLEFT,
@@ -33,6 +34,26 @@ use windows_sys::Win32::UI::WindowsAndMessaging::{
     WM_NCDESTROY, WM_NCHITTEST, WNDPROC, WS_THICKFRAME,
 };
 
+/// The work area (the monitor without the taskbar) of the monitor nearest the window, in physical
+/// pixels: left, top, width, height.
+pub fn work_area(window: &impl HasWindowHandle) -> Option<(i32, i32, i32, i32)> {
+    let handle = window.window_handle().ok()?;
+    let RawWindowHandle::Win32(w) = handle.as_raw() else { return None };
+    let hwnd = w.hwnd.get() as HWND;
+    // SAFETY: `hwnd` is the live main window; `info` is a MONITORINFO with its size set, as
+    // GetMonitorInfoW requires, and the monitor handle comes from the call before it.
+    let rc = unsafe {
+        let monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+        let mut info: MONITORINFO = std::mem::zeroed();
+        info.cbSize = std::mem::size_of::<MONITORINFO>() as u32;
+        if monitor.is_null() || GetMonitorInfoW(monitor, &mut info) == 0 {
+            return None;
+        }
+        info.rcWork
+    };
+    Some((rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top))
+}
+
 /// The window procedure ours replaced (winit's), as an address; 0 before [`install`].
 static PREVIOUS: AtomicIsize = AtomicIsize::new(0);
 

apps/solidcraft/src/native_menu.rs

@@ -0,0 +1,189 @@
+//! macOS system menus, owned and updated on eframe's main thread.
+
+use std::sync::mpsc::{Receiver, sync_channel};
+
+use muda::{
+    AboutMetadata, Menu, MenuEvent, MenuItem, PredefinedMenuItem, Submenu,
+    accelerator::{Accelerator, Code, Modifiers},
+};
+use solidcraft_ui_egui::{SolveApp, toolbar::FileAction};
+
+pub struct NativeMenu {
+    menu: Menu,
+    actions: Vec<(MenuItem, FileAction)>,
+    help_actions: Vec<(MenuItem, &'static str)>,
+    events: Receiver<MenuEvent>,
+    recent: Submenu,
+    recent_paths: Vec<String>,
+}
+
+impl NativeMenu {
+    pub fn new(app: &SolveApp, ctx: &egui::Context) -> muda::Result<Self> {
+        let menu = Menu::new();
+        let application = Submenu::new("SolidCraft", true);
+        let file = Submenu::new(app.tr("ui.file"), true);
+        let edit = Submenu::new(app.tr_label("Edit"), true);
+        let recent = Submenu::new(app.tr("ui.open_recent"), true);
+        let window = Submenu::new("Window", true);
+        let help = Submenu::new(app.tr("ui.help"), true);
+        let mut help_actions = Vec::new();
+        let mut actions = Vec::new();
+        let mut add = |parent: &Submenu, label: &str, action: FileAction, shortcut: Option<Accelerator>| -> muda::Result<()> {
+            let item = MenuItem::new(label, Self::action_enabled(&action, app, ctx), shortcut);
+            parent.append(&item)?;
+            actions.push((item, action));
+            Ok(())
+        };
+        application.append(&PredefinedMenuItem::about(
+            Some("About SolidCraft"),
+            Some(AboutMetadata { name: Some("SolidCraft".into()), version: Some(env!("CARGO_PKG_VERSION").into()), ..Default::default() }),
+        ))?;
+        application.append(&PredefinedMenuItem::separator())?;
+        add(
+            &application,
+            &format!("{}\u{2026}", app.tr("ui.preferences")),
+            FileAction::Settings,
+            Some(Accelerator::new(Modifiers::META, Code::Comma)),
+        )?;
+        add(&application, &format!("{}\u{2026}", app.tr("ui.keyboard_shortcuts")), FileAction::Shortcuts, None)?;
+        application.append(&PredefinedMenuItem::separator())?;
+        application.append(&PredefinedMenuItem::services(None))?;
+        application.append(&PredefinedMenuItem::separator())?;
+        application.append_items(&[
+            &PredefinedMenuItem::hide(Some("Hide SolidCraft")),
+            &PredefinedMenuItem::hide_others(None),
+            &PredefinedMenuItem::show_all(None),
+            &PredefinedMenuItem::separator(),
+        ])?;
+        add(&application, &format!("{} SolidCraft", app.tr("ui.quit")), FileAction::Quit, Some(Accelerator::new(Modifiers::META, Code::KeyQ)))?;
+        add(&file, app.tr("ui.new_design"), FileAction::New, Some(Accelerator::new(Modifiers::META, Code::KeyN)))?;
+        add(&file, &format!("{}\u{2026}", app.tr("ui.open")), FileAction::Open, Some(Accelerator::new(Modifiers::META, Code::KeyO)))?;
+        file.append(&recent)?;
+        file.append(&PredefinedMenuItem::separator())?;
+        for (label, command) in
+            [("Insert STEP\u{2026}", "file.insert_step"), ("Insert Mesh\u{2026}", "file.insert_mesh"), ("Insert Design", "component.insert_design")]
+        {
+            add(&file, app.tr_label(label), FileAction::Command(command), None)?;
+        }
+        file.append(&PredefinedMenuItem::separator())?;
+        add(&file, app.tr("ui.save"), FileAction::Save, Some(Accelerator::new(Modifiers::META, Code::KeyS)))?;
+        add(
+            &file,
+            &format!("{}\u{2026}", app.tr("ui.save_as")),
+            FileAction::SaveAs,
+            Some(Accelerator::new(Modifiers::META | Modifiers::SHIFT, Code::KeyS)),
+        )?;
+        add(&file, app.tr_label("Save As JSON\u{2026}"), FileAction::SaveJson, None)?;
+        file.append(&PredefinedMenuItem::separator())?;
+        for (label, action) in [
+            ("Export STL\u{2026}", FileAction::ExportMesh("stl")),
+            ("Export 3MF\u{2026}", FileAction::ExportMesh("3mf")),
+            ("Export STEP\u{2026}", FileAction::Export("step")),
+            ("Export Current View as DXF\u{2026}", FileAction::Command("file.export_view_dxf")),
+            ("Export OBJ\u{2026}", FileAction::Export("obj")),
+            ("Export URDF\u{2026}", FileAction::Export("urdf")),
+            ("Export Design as JSON\u{2026}", FileAction::Export("json")),
+        ] {
+            add(&file, app.tr_label(label), action, None)?;
+        }
+        file.append(&PredefinedMenuItem::separator())?;
+        add(&file, app.tr_label("Design Properties"), FileAction::Command("document.metadata"), None)?;
+        add(&edit, app.tr("ui.undo"), FileAction::Undo, Some(Accelerator::new(Modifiers::META, Code::KeyZ)))?;
+        add(&edit, app.tr("ui.redo"), FileAction::Redo, Some(Accelerator::new(Modifiers::META | Modifiers::SHIFT, Code::KeyZ)))?;
+        add(&window, app.tr_label("Agent Chat"), FileAction::AgentChat, None)?;
+        window.append(&PredefinedMenuItem::separator())?;
+        window.append_items(&[
+            &PredefinedMenuItem::minimize(None),
+            &PredefinedMenuItem::maximize(None),
+            &PredefinedMenuItem::fullscreen(None),
+            &PredefinedMenuItem::separator(),
+            &PredefinedMenuItem::bring_all_to_front(None),
+        ])?;
+        for (action, label) in [
+            ("docs", "Documentation"),
+            ("shortcuts", "Keyboard Shortcuts"),
+            ("messages", "Messages\u{2026}"),
+            ("report", "Report an Issue\u{2026}"),
+            ("crashes", "Crash Reports\u{2026}"),
+        ] {
+            let item = MenuItem::new(app.tr_label(label), true, None);
+            help.append(&item)?;
+            help_actions.push((item, action));
+        }
+        menu.append_items(&[&application, &file, &edit, &window, &help])?;
+        let (sender, events) = sync_channel(64);
+        let ctx = ctx.clone();
+        MenuEvent::set_event_handler(Some(move |event| {
+            let _ = sender.try_send(event);
+            ctx.request_repaint();
+        }));
+        menu.init_for_nsapp();
+        let mut native = Self { menu, actions, help_actions, events, recent, recent_paths: Vec::new() };
+        native.update_recent(app)?;
+        Ok(native)
+    }
+
+    pub fn raw_input_hook(&mut self, app: &mut SolveApp, ctx: &egui::Context, raw: &mut egui::RawInput) {
+        for event in self.events.try_iter().take(64) {
+            if let Some((_, action)) = self.help_actions.iter().find(|(item, _)| item.id() == &event.id) {
+                solidcraft_ui_egui::help::run(app, ctx, action);
+            }
+            if let Some((_, action)) = self.actions.iter().find(|(item, _)| item.id() == &event.id) {
+                if matches!(action, FileAction::Undo | FileAction::Redo) && ctx.egui_wants_keyboard_input() {
+                    raw.events.push(egui::Event::Key {
+                        key: egui::Key::Z,
+                        physical_key: None,
+                        pressed: true,
+                        repeat: false,
+                        modifiers: egui::Modifiers { command: true, mac_cmd: true, shift: matches!(action, FileAction::Redo), ..Default::default() },
+                    });
+                } else {
+                    action.run(app);
+                }
+            }
+        }
+    }
+
+    fn action_enabled(action: &FileAction, app: &SolveApp, ctx: &egui::Context) -> bool {
+        action.enabled(app)
+            || (matches!(action, FileAction::Undo | FileAction::Redo) && ctx.egui_wants_keyboard_input() && FileAction::Settings.enabled(app))
+    }
+
+    pub fn tick(&mut self, app: &mut SolveApp, ctx: &egui::Context) {
+        for (item, action) in &self.actions {
+            let enabled = Self::action_enabled(action, app, ctx);
+            if item.is_enabled() != enabled {
+                item.set_enabled(enabled);
+            }
+        }
+        if !self.recent_paths.iter().eq(app.home.recent.iter().take(32))
+            && let Err(error) = self.update_recent(app)
+        {
+            app.set_status(format!("Recent designs menu: {error}"), true);
+        }
+    }
+
+    fn update_recent(&mut self, app: &SolveApp) -> muda::Result<()> {
+        while self.recent.remove_at(0).is_some() {}
+        self.actions.retain(|(_, action)| !matches!(action, FileAction::OpenRecent(_) | FileAction::ClearRecent));
+        self.recent_paths = app.home.recent.iter().take(32).cloned().collect();
+        for path in &self.recent_paths {
+            let action = FileAction::OpenRecent(path.clone());
+            let item = MenuItem::new(path, action.enabled(app), None);
+            self.recent.append(&item)?;
+            self.actions.push((item, action));
+        }
+        self.recent.append(&PredefinedMenuItem::separator())?;
+        let clear = MenuItem::new(app.tr("ui.clear_recent"), !self.recent_paths.is_empty(), None);
+        self.recent.append(&clear)?;
+        self.actions.push((clear, FileAction::ClearRecent));
+        Ok(())
+    }
+}
+
+impl Drop for NativeMenu {
+    fn drop(&mut self) {
+        MenuEvent::set_event_handler(None::<fn(MenuEvent)>);
+        self.menu.remove_for_nsapp();
+    }
+}

apps/solidcraft/src/space_mouse/hidraw.rs

@@ -2,13 +2,29 @@
 //! its report descriptor and ids under `/sys/class/hidraw/hidrawN/device/`. Reading them is plain
 //! file I/O, so no udev or hidapi library is needed.
 
+use std::io::Read;
 use std::path::{Path, PathBuf};
+use std::time::Duration;
 
 use solidcraft_space_mouse::{Descriptor, Layout};
 
 const SYSFS: &str = "/sys/class/hidraw";
 const DEV: &str = "/dev";
 
+/// `O_NONBLOCK` on Linux's common architectures (x86, ARM, RISC-V). The device is opened with it so
+/// a read with nothing to read returns at once and the reader can see whether it should stop.
+pub const O_NONBLOCK: i32 = 0o4000;
+
+/// Opens a hidraw node the way the Direct reader reads it: read-only and non-blocking.
+pub fn open(path: &Path) -> std::io::Result<std::fs::File> {
+    use std::os::unix::fs::OpenOptionsExt;
+    std::fs::OpenOptions::new().read(true).custom_flags(O_NONBLOCK).open(path)
+}
+
+/// How long the reader waits when the device has nothing to say, which is also the most a report
+/// can be delayed.
+const IDLE_POLL: Duration = Duration::from_millis(5);
+
 pub struct Device {
     pub path: PathBuf,
     pub layout: Layout,
@@ -23,6 +39,30 @@ pub fn find() -> Option<Device> {
     names.into_iter().find_map(|name| probe(&Path::new(SYSFS).join(&name), Path::new(DEV).join(&name)))
 }
 
+/// Hands every report to `publish` until the device is gone (end of file or an error) or `stop`
+/// says so. `source` is non-blocking: when it has nothing, `stop` is asked and the reader waits
+/// [`IDLE_POLL`]. Reports are read and handed over exactly as they were with blocking reads.
+pub fn read_reports(mut source: impl Read, mut publish: impl FnMut(&[u8]), mut stop: impl FnMut() -> bool) {
+    let mut report = [0_u8; super::REPORT_BUFFER_BYTES];
+    loop {
+        match source.read(&mut report) {
+            Ok(0) => return,
+            Ok(size) => publish(report.get(..size).unwrap_or_default()),
+            Err(error) if error.kind() == std::io::ErrorKind::Interrupted => {}
+            Err(error) if error.kind() == std::io::ErrorKind::WouldBlock => {
+                if stop() {
+                    return;
+                }
+                std::thread::sleep(IDLE_POLL);
+            }
+            Err(error) => {
+                log::info!("3D mouse disconnected: {error}");
+                return;
+            }
+        }
+    }
+}
+
 fn probe(sysfs: &Path, path: PathBuf) -> Option<Device> {
     let descriptor = Descriptor::parse(&std::fs::read(sysfs.join("device/report_descriptor")).ok()?);
     // A controller that declares no motion axis (buttons only, say) isn't read.
@@ -42,6 +82,73 @@ fn ids(uevent: &str) -> Option<(u16, u16)> {
 mod tests {
     use super::*;
 
+    /// A real EACCES, as a user without the udev rule gets: a file of the user's own with no permission
+    /// bits. Skipped for root, which can open anything.
+    #[test]
+    fn a_device_without_permission_is_denied_and_the_daemon_takes_over_within_the_backoff() {
+        use std::os::unix::fs::{MetadataExt, PermissionsExt};
+        if std::fs::metadata("/proc/self").is_ok_and(|meta| meta.uid() == 0) {
+            return;
+        }
+        let dir = std::env::temp_dir().join(format!("sc-hidraw-denied-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let node = dir.join("hidraw0");
+        std::fs::write(&node, [0_u8; 4]).unwrap();
+        std::fs::set_permissions(&node, std::fs::Permissions::from_mode(0o000)).unwrap();
+        let denied = open(&node);
+        std::fs::set_permissions(&node, std::fs::Permissions::from_mode(0o600)).unwrap();
+        assert!(open(&node).is_ok(), "the same node opens once it is readable");
+        std::fs::remove_dir_all(&dir).ok();
+        assert_eq!(denied.err().map(|error| error.kind()), Some(std::io::ErrorKind::PermissionDenied));
+        // The failure is the choice's `since_failed`, with an injected clock: inside the backoff the
+        // daemon is read, whichever driver was asked for; after it the device is tried again.
+        use super::super::{Pick, SpaceMouseDriver, UNREADABLE_RETRY, choose, direct_usable};
+        for wanted in [SpaceMouseDriver::Automatic, SpaceMouseDriver::Spacenavd, SpaceMouseDriver::Direct] {
+            for ago in [Duration::ZERO, Duration::from_secs(29)] {
+                assert_eq!(choose(wanted, true, direct_usable(true, Some(ago), UNREADABLE_RETRY)), Some(Pick::Spacenavd), "{wanted:?} {ago:?}");
+            }
+        }
+        assert_eq!(choose(SpaceMouseDriver::Direct, true, direct_usable(true, Some(UNREADABLE_RETRY), UNREADABLE_RETRY)), Some(Pick::Direct));
+        // And the daemon's own reader delivers over a fake connection.
+        let (mut daemon, client) = std::os::unix::net::UnixStream::pair().unwrap();
+        let mut record = [0_u8; 32];
+        record[4..8].copy_from_slice(&100_i32.to_ne_bytes());
+        std::io::Write::write_all(&mut daemon, &record).unwrap();
+        drop(daemon);
+        let mut seen = 0;
+        super::super::spacenavd::read(client, |_| seen += 1, |_, _| {}, || false, Duration::from_secs(3600));
+        assert_eq!(seen, 1);
+    }
+
+    #[test]
+    fn reports_come_through_idle_gaps_until_the_device_ends_or_a_stop() {
+        use crate::space_mouse::fake::Script;
+        let mut script = Script::new();
+        script.timeout(std::io::ErrorKind::WouldBlock).data(&[1, 2, 3]).timeout(std::io::ErrorKind::WouldBlock).data(&[4]).end();
+        let (mut seen, mut asked) = (Vec::new(), 0);
+        read_reports(
+            script,
+            |report| seen.push(report.to_vec()),
+            || {
+                asked += 1;
+                false
+            },
+        );
+        assert_eq!(seen, [vec![1, 2, 3], vec![4]]);
+        assert_eq!(asked, 2);
+        let mut script = Script::new();
+        script.data(&[1]).timeout(std::io::ErrorKind::WouldBlock).data(&[2]);
+        let mut seen = Vec::new();
+        read_reports(script, |report| seen.push(report.to_vec()), || true);
+        assert_eq!(seen, [vec![1]], "a stop at an idle moment ends the read");
+        // An unplugged device is an error, which ends the read as before.
+        let mut script = Script::new();
+        script.data(&[1]).fail(std::io::ErrorKind::BrokenPipe).data(&[2]);
+        let mut seen = Vec::new();
+        read_reports(script, |report| seen.push(report.to_vec()), || false);
+        assert_eq!(seen, [vec![1]]);
+    }
+
     #[test]
     fn ids_come_from_the_uevent() {
         let wireless = "DRIVER=hid-generic\nHID_ID=0005:0000256F:0000C63A\nHID_NAME=SpaceMouse Wireless BT\n";

apps/solidcraft/src/space_mouse/spacenavd.rs

@@ -3,7 +3,8 @@
 //! to its clients, so a program that reads the HID device itself bypasses that setup. Over its
 //! socket the daemon sends fixed 32-byte records: eight native-endian `i32`, the first the kind of
 //! record (0 for motion, then x y z rx ry rz and the milliseconds since the last record).
-//! Other records (button presses, from newer daemons also configuration changes) are ignored.
+//! Button records (1 pressed, 2 released, then the button's number from 0) are read too; other
+//! records (from newer daemons also configuration changes) are ignored.
 //!
 //! The socket is plain file I/O, so no library is needed, and it needs no udev rule: the daemon
 //! is what has access to the device.
@@ -11,6 +12,7 @@
 use std::io::Read;
 use std::os::unix::net::UnixStream;
 use std::path::Path;
+use std::time::{Duration, Instant};
 
 use solidcraft_ui_egui::space_mouse::{Axes, FULL_SCALE};
 
@@ -23,6 +25,11 @@ const RECORD_BYTES: usize = 32;
 /// sensitivity). Our axes are in the raw HID units of [`FULL_SCALE`].
 const DAEMON_FULL_SCALE: i64 = 500;
 
+/// Whether the daemon's socket is there, without connecting to it.
+pub fn exists() -> bool {
+    SOCKETS.iter().any(|path| Path::new(path).exists())
+}
+
 pub fn connect() -> Option<UnixStream> {
     SOCKETS.iter().find_map(|path| connect_to(Path::new(path)))
 }
@@ -49,6 +56,22 @@ fn decode(record: &[u8; RECORD_BYTES]) -> Option<Axes> {
     })
 }
 
+/// The button a button record is about, from 0, and whether it went down; `None` for any other
+/// record, or a button past the 32 a bitmask holds.
+fn button(record: &[u8; RECORD_BYTES]) -> Option<(u32, bool)> {
+    let mut data = [0_i32; 2];
+    for (slot, bytes) in data.iter_mut().zip(record.as_chunks::<4>().0) {
+        *slot = i32::from_ne_bytes(*bytes);
+    }
+    let [kind, number] = data;
+    let number = u32::try_from(number).ok().filter(|&n| n < 32)?;
+    match kind {
+        1 => Some((number, true)),
+        2 => Some((number, false)),
+        _ => None,
+    }
+}
+
 /// A daemon value in our raw units. Out-of-range values stay in `i16`: they are input from another
 /// process.
 fn unit(value: impl Into<i64>) -> i16 {
@@ -56,18 +79,53 @@ fn unit(value: impl Into<i64>) -> i16 {
     i16::try_from(scaled.clamp(i64::from(i16::MIN), i64::from(i16::MAX))).unwrap_or_default()
 }
 
-/// Hands every motion record to `publish` until the daemon closes the connection or fails. A
-/// partial record at the end is dropped.
-pub fn read(mut stream: impl Read, mut publish: impl FnMut(Axes)) {
+/// Hands every motion record to `publish` and every button record to `pressed` until the daemon
+/// closes the connection or fails, or `stop` says so. A stream with a read timeout
+/// (`set_read_timeout`) times out when the daemon is quiet, which is no record and no disconnect:
+/// `stop` is asked, and the read goes on, with what of a record had arrived kept. `stop` is also asked
+/// at least every `check_every` while records keep arriving, so a daemon that never pauses for that
+/// long (a moving cap sends every few milliseconds) does not keep the reader from noticing that the
+/// device it prefers is back. A partial record at the end is dropped.
+pub fn read(
+    mut stream: impl Read,
+    mut publish: impl FnMut(Axes),
+    mut pressed: impl FnMut(u32, bool),
+    mut stop: impl FnMut() -> bool,
+    check_every: Duration,
+) {
     let mut record = [0_u8; RECORD_BYTES];
+    let mut filled = 0;
+    let mut asked = Instant::now();
     loop {
-        match stream.read_exact(&mut record) {
-            Ok(()) => {
-                if let Some(axes) = decode(&record) {
-                    publish(axes);
+        if asked.elapsed() >= check_every {
+            asked = Instant::now();
+            if stop() {
+                return;
+            }
+        }
+        match stream.read(record.get_mut(filled..).unwrap_or_default()) {
+            Ok(0) => {
+                log::info!("3D mouse: spacenavd connection ended");
+                return;
+            }
+            Ok(size) => {
+                filled += size;
+                if filled == RECORD_BYTES {
+                    filled = 0;
+                    if let Some(axes) = decode(&record) {
+                        publish(axes);
+                    } else if let Some((number, down)) = button(&record) {
+                        pressed(number, down);
+                    }
                 }
             }
             Err(error) if error.kind() == std::io::ErrorKind::Interrupted => {}
+            Err(error) if matches!(error.kind(), std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut) => {
+                asked = Instant::now();
+                if stop() {
+                    return;
+                }
+            }
             Err(error) => {
                 log::info!("3D mouse: spacenavd connection ended: {error}");
                 return;
@@ -113,6 +171,10 @@ mod tests {
     fn other_records_and_hostile_values_are_harmless() {
         // A button record (kind 1, press) and one of an unknown kind are not motion.
         assert_eq!(decode(&record([1, 0, 1, 0, 0, 0, 0, 0])), None);
+        // Nor are hostile button numbers a button.
+        assert_eq!(button(&record([1, -1, 0, 0, 0, 0, 0, 0])), None);
+        assert_eq!(button(&record([1, i32::MAX, 0, 0, 0, 0, 0, 0])), None);
+        assert_eq!(button(&record([7, 3, 0, 0, 0, 0, 0, 0])), None);
         assert_eq!(decode(&record([7, 500, 500, 500, 500, 500, 500, 0])), None);
         // Nothing overflows on the extremes of `i32`.
         let extreme = decode(&record([0, i32::MIN, i32::MIN, i32::MAX, i32::MAX, i32::MIN, i32::MIN, -1]));
@@ -126,14 +188,84 @@ mod tests {
         let (mut daemon, client) = UnixStream::pair().expect("a socket pair");
         let mut bytes = Vec::new();
         bytes.extend(record([0, 100, 0, 0, 0, 0, 0, 8]));
-        bytes.extend(record([2, 1, 0, 0, 0, 0, 0, 0])); // a button release: skipped
+        bytes.extend(record([1, 4, 0, 0, 0, 0, 0, 0])); // button 4 down
+        bytes.extend(record([2, 4, 0, 0, 0, 0, 0, 0])); // and up
+        bytes.extend(record([1, 40, 0, 0, 0, 0, 0, 0])); // past the 32 a bitmask holds: skipped
         bytes.extend(record([0, 0, 0, 0, 0, 0, 0, 900]));
         bytes.extend([1, 2, 3]); // the daemon went away mid-record
         daemon.write_all(&bytes).expect("written");
         drop(daemon);
-        let mut seen = Vec::new();
-        read(client, |axes| seen.push(axes.translation));
+        let (mut seen, mut buttons) = (Vec::new(), Vec::new());
+        read(client, |axes| seen.push(axes.translation), |number, down| buttons.push((number, down)), || false, Duration::from_secs(3600));
         assert_eq!(seen, [[70, 0, 0], [0, 0, 0]]);
+        assert_eq!(buttons, [(4, true), (4, false)]);
+    }
+
+    #[test]
+    fn a_quiet_daemon_times_out_without_losing_the_record_it_was_sending() {
+        use crate::space_mouse::fake::Script;
+        use std::io::ErrorKind::{TimedOut, WouldBlock};
+        let bytes = record([0, 100, 0, 0, 0, 0, 0, 8]);
+        let mut script = Script::new();
+        script.timeout(WouldBlock).data(&bytes[..10]).timeout(TimedOut).timeout(WouldBlock).data(&bytes[10..]).timeout(WouldBlock).end();
+        let (mut seen, mut asked) = (Vec::new(), 0);
+        read(
+            script,
+            |axes| seen.push(axes.translation),
+            |_, _| {},
+            || {
+                asked += 1;
+                false
+            },
+            Duration::from_secs(3600),
+        );
+        assert_eq!(seen, [[70, 0, 0]]);
+        assert_eq!(asked, 4, "each timeout asks whether to stop");
+    }
+
+    #[test]
+    fn a_stop_ends_the_read_at_the_next_timeout_only() {
+        use crate::space_mouse::fake::Script;
+        let bytes = record([0, 100, 0, 0, 0, 0, 0, 8]);
+        let mut script = Script::new();
+        script.data(&bytes).timeout(std::io::ErrorKind::WouldBlock).data(&bytes);
+        let mut seen = 0;
+        read(script, |_| seen += 1, |_, _| {}, || true, Duration::from_secs(3600));
+        assert_eq!(seen, 1, "the record before the timeout arrived; the one after never was read");
+    }
+
+    /// A daemon that never goes quiet (a moving cap sends every few milliseconds) is still asked whether to
+    /// stop, at the interval given, so the reader can go back to a device that returned.
+    #[test]
+    fn a_busy_daemon_is_asked_whether_to_stop_on_a_timer() {
+        // Ends by itself after half a second, so a read that never asks fails the assertion below
+        // instead of hanging the test.
+        struct Busy(Instant);
+        impl Read for Busy {
+            fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+                if self.0.elapsed() > Duration::from_millis(500) {
+                    return Ok(0);
+                }
+                std::thread::sleep(Duration::from_millis(2));
+                let bytes = record([0, 100, 0, 0, 0, 0, 0, 8]);
+                let size = bytes.len().min(buf.len());
+                buf[..size].copy_from_slice(&bytes[..size]);
+                Ok(size)
+            }
+        }
+        let (mut seen, mut asked) = (0, 0);
+        read(
+            Busy(Instant::now()),
+            |_| seen += 1,
+            |_, _| {},
+            || {
+                asked += 1;
+                asked == 3
+            },
+            Duration::from_millis(10),
+        );
+        assert_eq!(asked, 3, "asked on the timer although no read ever timed out");
+        assert!(seen > 3, "records kept coming meanwhile: {seen}");
     }
 
     #[test]

apps/solidcraft/src/space_mouse/windows_hid.rs

@@ -0,0 +1,172 @@
+//! Windows: finding 3D mice without asking any other device anything (#2614).
+//!
+//! hidapi's enumeration opens every HID interface and reads its serial number, manufacturer and
+//! product strings: on USB, three control requests to every keyboard, mouse and touchscreen. The
+//! reader repeated it every two seconds while no 3D mouse was plugged in, and on some machines the
+//! keyboard then kept dropping off the bus and the cursor jumped. Plug and Play already names each
+//! interface's top-level usage in its hardware IDs (`HID_DEVICE_UP:0001_U:0008`: Generic Desktop,
+//! Multi-Axis Controller), so the reader asks it, which sends nothing to any device, and opens only
+//! the interfaces that are 3D mice.
+//!
+//! The configuration manager has no safe API, hence the `unsafe_code` allowance on this module
+//! (the app crate denies it; see `native_crash.rs`).
+#![allow(unsafe_code)]
+
+use std::ffi::CString;
+use std::ptr::{null, null_mut};
+
+use windows_sys::Win32::Devices::DeviceAndDriverInstallation::{
+    CM_GET_DEVICE_INTERFACE_LIST_PRESENT, CM_Get_DevNode_PropertyW, CM_Get_Device_Interface_List_SizeW, CM_Get_Device_Interface_ListW,
+    CM_Get_Device_Interface_PropertyW, CM_LOCATE_DEVNODE_NORMAL, CM_Locate_DevNodeW, CONFIGRET, CR_BUFFER_SMALL, CR_SUCCESS,
+};
+use windows_sys::Win32::Devices::HumanInterfaceDevice::GUID_DEVINTERFACE_HID;
+use windows_sys::Win32::Devices::Properties::{
+    DEVPKEY_Device_HardwareIds, DEVPKEY_Device_InstanceId, DEVPROP_TYPE_STRING, DEVPROP_TYPE_STRING_LIST, DEVPROPTYPE,
+};
+use windows_sys::Win32::Foundation::DEVPROPKEY;
+
+/// The hardware ID Windows gives a top-level collection with the Generic Desktop page's
+/// Multi-Axis Controller usage.
+const MULTI_AXIS_CONTROLLER: &str = "HID_DEVICE_UP:0001_U:0008";
+/// Largest property read, in bytes: hardware IDs are a few hundred.
+const MAX_PROPERTY_BYTES: u32 = 64 * 1024;
+/// Tries at reading the interface list, which can grow between asking its size and reading it.
+const LIST_TRIES: usize = 4;
+
+/// The paths of the present HID interfaces whose top-level collection is a multi-axis controller.
+pub fn multi_axis_controllers() -> Vec<CString> {
+    interfaces()
+        .into_iter()
+        .filter(|path| {
+            let Some(instance) = interface_strings(path, &DEVPKEY_Device_InstanceId).and_then(|ids| ids.into_iter().next()) else {
+                return false;
+            };
+            devnode_strings(&instance, &DEVPKEY_Device_HardwareIds).is_some_and(|ids| is_multi_axis(&ids))
+        })
+        .filter_map(|path| CString::new(path).ok())
+        .collect()
+}
+
+/// Whether a device with these hardware IDs is a multi-axis controller.
+fn is_multi_axis(hardware_ids: &[String]) -> bool {
+    hardware_ids.iter().any(|id| id.eq_ignore_ascii_case(MULTI_AXIS_CONTROLLER))
+}
+
+/// The strings of a nul-separated list (`REG_MULTI_SZ`, or one string), without empty ones.
+fn split_multi_sz(buffer: &[u16]) -> Vec<String> {
+    buffer.split(|c| *c == 0).filter(|s| !s.is_empty()).map(String::from_utf16_lossy).collect()
+}
+
+/// `s` as a nul-terminated wide string.
+fn wide(s: &str) -> Vec<u16> {
+    s.encode_utf16().chain(std::iter::once(0)).collect()
+}
+
+/// The paths of the present HID interfaces.
+fn interfaces() -> Vec<String> {
+    for _ in 0..LIST_TRIES {
+        let mut len = 0u32;
+        // SAFETY: `len` is a valid place for the size; the class GUID is a static; no device filter.
+        let sized = unsafe { CM_Get_Device_Interface_List_SizeW(&mut len, &GUID_DEVINTERFACE_HID, null(), CM_GET_DEVICE_INTERFACE_LIST_PRESENT) };
+        if sized != CR_SUCCESS || len == 0 {
+            return Vec::new();
+        }
+        let mut buffer = vec![0u16; len as usize];
+        // SAFETY: `buffer` holds `len` wide characters, the length the call is given.
+        let listed =
+            unsafe { CM_Get_Device_Interface_ListW(&GUID_DEVINTERFACE_HID, null(), buffer.as_mut_ptr(), len, CM_GET_DEVICE_INTERFACE_LIST_PRESENT) };
+        match listed {
+            CR_SUCCESS => return split_multi_sz(&buffer),
+            CR_BUFFER_SMALL => continue,
+            _ => return Vec::new(),
+        }
+    }
+    Vec::new()
+}
+
+/// A string or string-list property, read by `get` (property type, buffer, its size in bytes) in
+/// two calls: the size, then the value.
+fn property_strings(get: impl Fn(*mut DEVPROPTYPE, *mut u8, *mut u32) -> CONFIGRET) -> Option<Vec<String>> {
+    let mut kind: DEVPROPTYPE = 0;
+    let mut size = 0u32;
+    if get(&mut kind, null_mut(), &mut size) != CR_BUFFER_SMALL || size == 0 || size > MAX_PROPERTY_BYTES {
+        return None;
+    }
+    let mut buffer = vec![0u16; (size as usize).div_ceil(2)];
+    let mut size = (buffer.len() * 2) as u32;
+    if get(&mut kind, buffer.as_mut_ptr().cast(), &mut size) != CR_SUCCESS || (kind != DEVPROP_TYPE_STRING && kind != DEVPROP_TYPE_STRING_LIST) {
+        return None;
+    }
+    Some(split_multi_sz(&buffer))
+}
+
+/// A string property of the device interface at `path`.
+fn interface_strings(path: &str, key: &DEVPROPKEY) -> Option<Vec<String>> {
+    let path = wide(path);
+    property_strings(|kind, buffer, size| {
+        // SAFETY: `path` is nul-terminated and outlives the call; `buffer` is null (asking the size)
+        // or holds `*size` bytes, as `property_strings` sets up.
+        unsafe { CM_Get_Device_Interface_PropertyW(path.as_ptr(), key, kind, buffer, size, 0) }
+    })
+}
+
+/// A string property of the device with instance ID `instance`.
+fn devnode_strings(instance: &str, key: &DEVPROPKEY) -> Option<Vec<String>> {
+    let instance = wide(instance);
+    let mut devnode = 0u32;
+    // SAFETY: `instance` is nul-terminated and outlives the call; `devnode` is a valid place for the result.
+    if unsafe { CM_Locate_DevNodeW(&mut devnode, instance.as_ptr(), CM_LOCATE_DEVNODE_NORMAL) } != CR_SUCCESS {
+        return None;
+    }
+    property_strings(|kind, buffer, size| {
+        // SAFETY: `buffer` is null (asking the size) or holds `*size` bytes, as `property_strings` sets up.
+        unsafe { CM_Get_DevNode_PropertyW(devnode, key, kind, buffer, size, 0) }
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// The hardware IDs Windows gives a wired 3Dconnexion device's motion interface, and a
+    /// keyboard's: only the first is a multi-axis controller.
+    #[test]
+    fn only_the_multi_axis_usage_is_a_3d_mouse() {
+        let ids = |list: &[&str]| list.iter().map(|s| s.to_string()).collect::<Vec<_>>();
+        let space_mouse = ids(&["HID\\VID_256F&PID_C635&REV_0437&MI_00", "HID\\VID_256F&UP:0001_U:0008", "HID_DEVICE_UP:0001_U:0008", "HID_DEVICE"]);
+        let keyboard = ids(&[
+            "HID\\VID_046D&PID_C31C&REV_6400&MI_00",
+            "HID\\VID_046D&UP:0001_U:0006",
+            "HID_DEVICE_SYSTEM_KEYBOARD",
+            "HID_DEVICE_UP:0001_U:0006",
+            "HID_DEVICE",
+        ]);
+        let vendor = ids(&["HID\\VID_256F&UP:FF00_U:0001", "HID_DEVICE_UP:FF00_U:0001", "HID_DEVICE_UPR:FF00-FFFF", "HID_DEVICE"]);
+        assert!(is_multi_axis(&space_mouse));
+        assert!(is_multi_axis(&ids(&["hid_device_up:0001_u:0008"])), "IDs compare without regard to case");
+        assert!(!is_multi_axis(&keyboard) && !is_multi_axis(&vendor) && !is_multi_axis(&[]));
+    }
+
+    #[test]
+    fn nul_separated_lists_split_into_their_strings() {
+        let buffer: Vec<u16> = "a\\b\0HID_DEVICE\0\0".encode_utf16().collect();
+        assert_eq!(split_multi_sz(&buffer), ["a\\b", "HID_DEVICE"]);
+        assert_eq!(split_multi_sz(&wide("one")), ["one"]);
+        assert!(split_multi_sz(&[0, 0]).is_empty() && split_multi_sz(&[]).is_empty());
+    }
+
+    /// The scan asks Plug and Play only: on any machine it returns, and every path it returns is a
+    /// present HID interface whose hardware IDs name the multi-axis usage.
+    #[test]
+    fn the_scan_returns_only_multi_axis_interfaces() {
+        let found = multi_axis_controllers();
+        let all = interfaces();
+        for path in &found {
+            let path = path.to_str().unwrap_or_default();
+            assert!(all.iter().any(|p| p == path), "{path}");
+            let instance = interface_strings(path, &DEVPKEY_Device_InstanceId).and_then(|ids| ids.into_iter().next()).unwrap_or_default();
+            assert!(devnode_strings(&instance, &DEVPKEY_Device_HardwareIds).is_some_and(|ids| is_multi_axis(&ids)), "{path}");
+        }
+        eprintln!("{} HID interfaces present, {} multi-axis controllers", all.len(), found.len());
+    }
+}

apps/solidcraft/src/window_fit.rs

@@ -0,0 +1,117 @@
+//! Keeping the restored window reachable.
+//!
+//! The window comes back where it was left. After a monitor was unplugged, the scale changed or
+//! the settings came from a larger screen, that can put its title bar above the top edge or
+//! under the taskbar, out of reach of the mouse. [`fit`] pulls a window back into the monitor's
+//! work area (the screen without the taskbar), in whatever unit the caller measures both, as
+//! long as it is the same one.
+
+/// A rectangle: left, top, width, height.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Area {
+    pub x: f32,
+    pub y: f32,
+    pub w: f32,
+    pub h: f32,
+}
+
+impl Area {
+    pub const fn new(x: f32, y: f32, w: f32, h: f32) -> Self {
+        Area { x, y, w, h }
+    }
+    fn right(self) -> f32 {
+        self.x + self.w
+    }
+    fn bottom(self) -> f32 {
+        self.y + self.h
+    }
+    fn sane(self) -> bool {
+        [self.x, self.y, self.w, self.h].iter().all(|v| v.is_finite()) && self.w > 0.0 && self.h > 0.0
+    }
+}
+
+/// How much of the title bar must stay over the work area at least, to grab it.
+pub const REACHABLE: f32 = 100.0;
+/// The size a window gets when its saved geometry is unusable, before it is fitted to the screen.
+pub const DEFAULT_SIZE: (f32, f32) = (1600.0, 1000.0);
+
+/// `window` moved and shrunk so that it can be reached on `work`: no larger than the work area
+/// (but not below `min`), the title bar not above the work area's top, the window not below its
+/// bottom, and at least [`REACHABLE`] of it over the work area horizontally. A window that is
+/// fine is returned unchanged. Geometry that makes no sense (not finite, empty), or a work
+/// area that does not, gives the default size centred on the work area.
+pub fn fit(window: Area, work: Area, min: (f32, f32)) -> Area {
+    if !work.sane() {
+        return window;
+    }
+    let min = (min.0.min(work.w), min.1.min(work.h));
+    if !window.sane() {
+        let w = DEFAULT_SIZE.0.min(work.w * 0.9).max(min.0);
+        let h = DEFAULT_SIZE.1.min(work.h * 0.9).max(min.1);
+        return Area::new(work.x + (work.w - w) / 2.0, work.y + (work.h - h) / 2.0, w, h);
+    }
+    let w = window.w.clamp(min.0, work.w);
+    let h = window.h.clamp(min.1, work.h);
+    let reach = REACHABLE.min(w);
+    // A window that had to shrink goes fully onto the screen; one that fits may keep straddling two.
+    let x = if w < window.w { window.x.max(work.x).min(work.right() - w) } else { window.x.max(work.x + reach - w).min(work.right() - reach) };
+    let y = window.y.min(work.bottom() - h).max(work.y);
+    Area::new(x, y, w, h)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const WORK: Area = Area::new(0.0, 0.0, 2560.0, 1400.0);
+    const MIN: (f32, f32) = (960.0, 600.0);
+
+    #[test]
+    fn a_window_on_screen_is_left_alone() {
+        let w = Area::new(300.0, 120.0, 1600.0, 1000.0);
+        assert_eq!(fit(w, WORK, MIN), w);
+    }
+
+    #[test]
+    fn a_title_bar_above_the_top_or_under_the_taskbar_comes_back() {
+        let fitted = fit(Area::new(300.0, -400.0, 1600.0, 1000.0), WORK, MIN);
+        assert_eq!((fitted.y, fitted.h), (0.0, 1000.0));
+        let fitted = fit(Area::new(300.0, 1300.0, 1600.0, 1000.0), WORK, MIN);
+        assert_eq!(fitted.y + fitted.h, 1400.0);
+        // A taskbar at the top moves the work area down.
+        let below_bar = Area::new(0.0, 48.0, 2560.0, 1352.0);
+        assert_eq!(fit(Area::new(300.0, 0.0, 1600.0, 1000.0), below_bar, MIN).y, 48.0);
+    }
+
+    #[test]
+    fn a_window_from_a_monitor_that_is_gone_keeps_a_grabbable_part_on_screen() {
+        let right = fit(Area::new(5000.0, 100.0, 1600.0, 1000.0), WORK, MIN);
+        assert_eq!(right.x, 2560.0 - REACHABLE);
+        let left = fit(Area::new(-4000.0, 100.0, 1600.0, 1000.0), WORK, MIN);
+        assert_eq!(left.x + left.w, REACHABLE);
+    }
+
+    #[test]
+    fn a_window_larger_than_the_screen_shrinks_to_it() {
+        let small = Area::new(0.0, 0.0, 1280.0, 720.0);
+        let fitted = fit(Area::new(-20.0, -30.0, 3200.0, 2000.0), small, MIN);
+        assert_eq!(fitted, small);
+        // Never below the minimum, unless the screen itself is smaller.
+        assert_eq!(fit(Area::new(0.0, 0.0, 100.0, 100.0), WORK, MIN).w, 960.0);
+        assert_eq!(fit(Area::new(0.0, 0.0, 100.0, 100.0), Area::new(0.0, 0.0, 800.0, 500.0), MIN).h, 500.0);
+    }
+
+    #[test]
+    fn unusable_geometry_is_centred_at_a_sensible_size() {
+        for bad in [Area::new(f32::NAN, 0.0, 1600.0, 1000.0), Area::new(0.0, 0.0, 0.0, 0.0), Area::new(0.0, 0.0, f32::INFINITY, 10.0)] {
+            let fitted = fit(bad, WORK, MIN);
+            assert_eq!(fitted, Area::new(480.0, 200.0, 1600.0, 1000.0));
+        }
+        let small = Area::new(100.0, 50.0, 1366.0, 728.0);
+        let fitted = fit(Area::new(f32::NAN, 0.0, 1.0, 1.0), small, MIN);
+        assert!(fitted.w <= small.w && fitted.h <= small.h && fitted.x >= small.x && fitted.y >= small.y);
+        // No work area to go by: nothing to change.
+        let w = Area::new(1.0, 2.0, 3.0, 4.0);
+        assert_eq!(fit(w, Area::new(0.0, 0.0, 0.0, 0.0), MIN), w);
+    }
+}

assets/README.md

@@ -84,7 +84,7 @@ The CLI still supports arbitrary PNG/ICO exports with `solidcraft-cli icon`.
 ## Code and provenance
 
 Resources remain compiled by their owning layer through existing APIs:
-`ui-egui::icons::paint` and `Tokens` at L5, model presets in L2 `doc`, and sketch
+`ui-egui::icons::paint_icon` and `Tokens` at L5, model presets in L2 `doc`, and sketch
 fonts at L1. State, projection, interaction, commands and GPU bindings stay in
 their current modules. Embedded data uses `CARGO_MANIFEST_DIR`; application code
 needs no runtime resource registry or repository lookup.

assets/appearances/starter_pack.rs

@@ -0,0 +1,292 @@
+//! Original starter visual data, MIT OR Apache-2.0. No external material library.
+use crate::appearance_pack::{Category, GlassBoundary, GlassRecipe, OpaqueRecipe, TextureAxis, TextureRecipe, VisualPreset};
+
+const WOOD: &str = "Uniform opaque preview only; grain resources/mapping are not applied";
+const SOLAR: &str = "Uniform opaque preview only; no cell grid, busbars, electricity or efficiency claim";
+const REGOLITH: &str = "Uniform opaque preview only; no granular displacement or measured lunar optical data";
+const OPAQUE: &str = "Illustrative opaque isotropic PBR; no measured alloy, polymer or engineering properties";
+
+const fn look(color: [u8; 3], metallic: f64, roughness: f64, dielectric_ior: f64) -> OpaqueRecipe {
+    OpaqueRecipe { color, metallic, roughness, dielectric_ior }
+}
+const fn maps(id: &'static str, repeat_mm: [f64; 2], grain: bool) -> Option<TextureRecipe> {
+    Some(TextureRecipe { id, repeat_mm, grain_axis: if grain { Some(TextureAxis::V) } else { None } })
+}
+const fn glass(transmission_linear_rgb: [f64; 3], ior: f64, reference_path_mm: f64, boundary: GlassBoundary) -> GlassRecipe {
+    GlassRecipe { transmission_linear_rgb, dielectric_ior: ior, reference_path_mm, boundary }
+}
+
+pub const STARTER_PACK: [VisualPreset; 40] = [
+    VisualPreset::opaque(
+        "starter.wood.oak-honey",
+        "Wood - Honey Oak Uniform Preview",
+        Category::Wood,
+        look([190, 145, 88], 0.0, 0.64, 1.5),
+        WOOD,
+        maps("starter.wood.oak-honey.maps-v1", [120.0, 240.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.oak-smoked",
+        "Wood - Smoked Oak Uniform Preview",
+        Category::Wood,
+        look([91, 72, 55], 0.0, 0.68, 1.5),
+        WOOD,
+        maps("starter.wood.oak-smoked.maps-v1", [120.0, 240.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.walnut-dark",
+        "Wood - Dark Walnut Uniform Preview",
+        Category::Wood,
+        look([99, 66, 43], 0.0, 0.60, 1.5),
+        WOOD,
+        maps("starter.wood.walnut-dark.maps-v1", [100.0, 220.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.maple-light",
+        "Wood - Light Maple Uniform Preview",
+        Category::Wood,
+        look([221, 192, 141], 0.0, 0.57, 1.5),
+        WOOD,
+        maps("starter.wood.maple-light.maps-v1", [100.0, 200.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.cherry-warm",
+        "Wood - Warm Cherry Uniform Preview",
+        Category::Wood,
+        look([164, 99, 65], 0.0, 0.58, 1.5),
+        WOOD,
+        maps("starter.wood.cherry-warm.maps-v1", [110.0, 220.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.ash-pale",
+        "Wood - Pale Ash Uniform Preview",
+        Category::Wood,
+        look([209, 186, 146], 0.0, 0.70, 1.5),
+        WOOD,
+        maps("starter.wood.ash-pale.maps-v1", [120.0, 260.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.birch-cream",
+        "Wood - Cream Birch Uniform Preview",
+        Category::Wood,
+        look([228, 206, 163], 0.0, 0.63, 1.5),
+        WOOD,
+        maps("starter.wood.birch-cream.maps-v1", [100.0, 200.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.wood.teak-golden",
+        "Wood - Golden Teak Uniform Preview",
+        Category::Wood,
+        look([167, 122, 66], 0.0, 0.61, 1.5),
+        WOOD,
+        maps("starter.wood.teak-golden.maps-v1", [110.0, 250.0], true),
+    ),
+    VisualPreset::opaque(
+        "starter.metal.carbon-steel-polished",
+        "Metal - Polished Carbon Steel",
+        Category::Metal,
+        look([161, 166, 173], 1.0, 0.16, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.stainless-soft-satin",
+        "Metal - Soft Satin Stainless",
+        Category::Metal,
+        look([187, 193, 201], 1.0, 0.36, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.aluminum-bead-blast",
+        "Metal - Bead Blast Aluminum",
+        Category::Metal,
+        look([195, 201, 210], 1.0, 0.58, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.aluminum-silver-polish",
+        "Metal - Silver Polish Aluminum",
+        Category::Metal,
+        look([218, 224, 232], 1.0, 0.13, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.copper-aged-warm",
+        "Metal - Warm Aged Copper",
+        Category::Metal,
+        look([171, 95, 57], 1.0, 0.48, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.brass-champagne",
+        "Metal - Champagne Satin Brass",
+        Category::Metal,
+        look([205, 173, 102], 1.0, 0.32, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.bronze-dark-cast",
+        "Metal - Dark Cast Bronze",
+        Category::Metal,
+        look([133, 95, 58], 1.0, 0.66, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.titanium-matte",
+        "Metal - Matte Gray Titanium",
+        Category::Metal,
+        look([147, 149, 157], 1.0, 0.53, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.gold-warm",
+        "Metal - Warm Reflective Gold",
+        Category::Metal,
+        look([235, 190, 82], 1.0, 0.18, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.metal.silver-cool",
+        "Metal - Cool Reflective Silver",
+        Category::Metal,
+        look([225, 230, 237], 1.0, 0.12, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.abs-charcoal",
+        "Plastic - Charcoal ABS",
+        Category::Plastic,
+        look([43, 45, 48], 0.0, 0.44, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.abs-warm-white",
+        "Plastic - Warm White ABS",
+        Category::Plastic,
+        look([232, 229, 220], 0.0, 0.40, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque("starter.plastic.pla-coral", "Plastic - Coral PLA", Category::Plastic, look([218, 99, 83], 0.0, 0.43, 1.5), OPAQUE, None),
+    VisualPreset::opaque(
+        "starter.plastic.petg-cyan-opaque",
+        "Plastic - Opaque Cyan PETG",
+        Category::Plastic,
+        look([36, 148, 167], 0.0, 0.29, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.nylon-ivory",
+        "Plastic - Ivory Nylon",
+        Category::Plastic,
+        look([220, 213, 190], 0.0, 0.62, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.pc-graphite-opaque",
+        "Plastic - Opaque Graphite PC",
+        Category::Plastic,
+        look([70, 76, 84], 0.0, 0.27, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.hdpe-natural-opaque",
+        "Plastic - Opaque Natural HDPE",
+        Category::Plastic,
+        look([221, 222, 207], 0.0, 0.48, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque("starter.plastic.pom-black", "Plastic - Black POM", Category::Plastic, look([29, 31, 35], 0.0, 0.32, 1.5), OPAQUE, None),
+    VisualPreset::opaque(
+        "starter.plastic.tpu-matte-black",
+        "Plastic - Matte Black TPU",
+        Category::Plastic,
+        look([31, 30, 32], 0.0, 0.83, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::opaque(
+        "starter.plastic.peek-amber-opaque",
+        "Plastic - Opaque Amber PEEK",
+        Category::Plastic,
+        look([157, 119, 62], 0.0, 0.51, 1.5),
+        OPAQUE,
+        None,
+    ),
+    VisualPreset::glass(
+        "starter.glass.clear-soda-lime",
+        "Glass Recipe - Clear Soda Lime",
+        glass([0.92, 0.98, 0.96], 1.52, 3.0, GlassBoundary::Closed),
+    ),
+    VisualPreset::glass("starter.glass.low-iron-clear", "Glass Recipe - Low Iron Clear", glass([0.98, 0.99, 1.0], 1.50, 4.0, GlassBoundary::Closed)),
+    VisualPreset::glass("starter.glass.smoky-neutral", "Glass Recipe - Smoky Neutral", glass([0.35, 0.38, 0.42], 1.52, 3.0, GlassBoundary::Closed)),
+    VisualPreset::glass("starter.glass.amber-tint", "Glass Recipe - Amber Tint", glass([0.84, 0.38, 0.08], 1.51, 3.0, GlassBoundary::Closed)),
+    VisualPreset::glass("starter.glass.cobalt-blue", "Glass Recipe - Cobalt Blue", glass([0.06, 0.14, 0.76], 1.53, 3.0, GlassBoundary::Closed)),
+    VisualPreset::glass(
+        "starter.glass.thin-clear",
+        "Glass Recipe - Thin Clear Sheet",
+        glass([0.95, 0.98, 0.99], 1.50, 2.0, GlassBoundary::Thin { thickness_mm: 2.0 }),
+    ),
+    VisualPreset::opaque(
+        "starter.solar.mono-blue",
+        "Solar Panel - Mono Blue Uniform Preview",
+        Category::Solar,
+        look([20, 41, 85], 0.0, 0.20, 1.5),
+        SOLAR,
+        maps("starter.solar.mono-blue.maps-v1", [160.0, 160.0], false),
+    ),
+    VisualPreset::opaque(
+        "starter.solar.thin-film-dark",
+        "Solar Panel - Dark Thin Film Uniform Preview",
+        Category::Solar,
+        look([28, 33, 42], 0.0, 0.28, 1.5),
+        SOLAR,
+        maps("starter.solar.thin-film-dark.maps-v1", [100.0, 200.0], false),
+    ),
+    VisualPreset::opaque(
+        "starter.regolith.mare-charcoal",
+        "Regolith - Mare Charcoal Uniform Preview",
+        Category::Regolith,
+        look([56, 56, 55], 0.0, 0.97, 1.5),
+        REGOLITH,
+        maps("starter.regolith.mare-charcoal.maps-v1", [200.0, 200.0], false),
+    ),
+    VisualPreset::opaque(
+        "starter.regolith.highland-pale",
+        "Regolith - Highland Pale Uniform Preview",
+        Category::Regolith,
+        look([116, 113, 106], 0.0, 0.93, 1.5),
+        REGOLITH,
+        maps("starter.regolith.highland-pale.maps-v1", [200.0, 200.0], false),
+    ),
+    VisualPreset::opaque(
+        "starter.regolith.dust-neutral",
+        "Regolith - Neutral Dust Uniform Preview",
+        Category::Regolith,
+        look([86, 85, 81], 0.0, 1.0, 1.5),
+        REGOLITH,
+        maps("starter.regolith.dust-neutral.maps-v1", [150.0, 150.0], false),
+    ),
+    VisualPreset::opaque(
+        "starter.regolith.agglutinate-dark",
+        "Regolith - Dark Agglutinate Uniform Preview",
+        Category::Regolith,
+        look([66, 63, 60], 0.0, 0.89, 1.5),
+        REGOLITH,
+        maps("starter.regolith.agglutinate-dark.maps-v1", [200.0, 200.0], false),
+    ),
+];

assets/fonts/ibm-plex-mono/OFL.txt

@@ -0,0 +1,93 @@
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+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/ibm-plex-sans/OFL.txt

@@ -0,0 +1,93 @@
+Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
+
+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/app/shared/source/app_icon.rs

@@ -1,88 +1,93 @@
-//! Original SolidCraft mark, shared by desktop, packaging and CLI.
+//! Original SolidCraft mark, shared by desktop, packaging and CLI: the borderless mark, five
+//! faces with transparent gaps between them, drawn from the macOS icon's
+//! `macos/source/SolidCraft.icon/Assets/03-solid-blue-cutout.svg`.
+type P = (f32, f32);
+
+/// One face in that SVG's units: its outline, and its linear gradient from one point and
+/// colour to another.
+struct Face {
+    outline: &'static [P],
+    from: (P, [u8; 3]),
+    to: (P, [u8; 3]),
+}
+
+const FACES: [Face; 5] = [
+    // Inner side of the upper step.
+    Face {
+        outline: &[(547.883, 282.66), (709.797, 188.211), (709.797, 375.985)],
+        from: ((619.14, 179.734), [29, 99, 198]),
+        to: ((694.687, 396.761), [21, 73, 158]),
+    },
+    // Top of the lower step.
+    Face {
+        outline: &[(727.797, 593.626), (727.797, 407.136), (889.571, 500.381)],
+        from: ((619.14, 413.244), [69, 159, 255]),
+        to: ((790.839, 605.547), [35, 121, 231]),
+    },
+    // Right face, with the recess.
+    Face {
+        outline: &[(530.0, 521.17), (691.797, 427.912), (691.797, 655.928), (907.594, 531.545), (907.594, 740.159), (530.0, 957.8)],
+        from: ((632.876, 399.508), [27, 102, 207]),
+        to: ((783.971, 968.175), [18, 69, 150]),
+    },
+    // Left face, stepped.
+    Face {
+        outline: &[(116.406, 510.769), (116.406, 303.529), (494.0, 521.17), (494.0, 957.8), (314.203, 854.167), (314.203, 624.777)],
+        from: ((207.063, 303.357), [37, 141, 245]),
+        to: ((426.837, 968.175), [20, 97, 218]),
+    },
+    // Top of the extruded profile.
+    Face {
+        outline: &[(134.374, 272.334), (512.0, 53.364), (691.828, 157.015), (476.117, 282.846), (673.752, 396.761), (512.0, 489.993)],
+        from: ((385.63, 53.364), [81, 173, 255]),
+        to: ((522.989, 510.769), [43, 131, 241]),
+    },
+];
+
+/// The mark's extent in SVG units: left, top, width, height.
+const BOUNDS: (f32, f32, f32, f32) = (116.406, 53.364, 791.188, 904.436);
+
 /// This block is the icon image data
 pub fn rgba(size: usize) -> Result<Vec<u8>, String> {
     if !(1..=2048).contains(&size) {
         return Err("icon size must be 1..=2048".into());
     }
-    type P = (f32, f32);
     // Coverage buffer at 4x4 samples per pixel (2x2 for big sizes), averaged down at the end.
     let ss = if size > 512 { 2 } else { 4 };
     let n = size * ss;
     let mut buf = vec![[0u8; 4]; n * n];
-    let s = n as f32 / 412.217; // SVG units -> samples: the logo fills the height
-    let ox = (n as f32 - 357.0 * s) / 2.0; // and is centred sideways
-    // Fill a convex polygon given in SVG units.
-    let mut fill = |pts: &[P], col: [u8; 3]| {
-        let v: Vec<P> = pts.iter().map(|p| (ox + p.0 * s, p.1 * s)).collect();
+    let (bx, by, bw, bh) = BOUNDS;
+    let s = n as f32 / bh; // SVG units -> samples: the mark fills the height
+    let (ox, oy) = ((n as f32 - bw * s) / 2.0 - bx * s, -by * s); // and is centred sideways
+    // Fill each face's outline (even-odd spans per row, so concave outlines work) with its gradient.
+    for face in &FACES {
+        let v: Vec<P> = face.outline.iter().map(|p| (ox + p.0 * s, oy + p.1 * s)).collect();
+        let (((fx, fy), c0), ((tx, ty), c1)) = (face.from, face.to);
+        let (gx, gy) = (tx - fx, ty - fy);
+        let g2 = gx * gx + gy * gy;
         let (top, bottom) = v.iter().fold((f32::MAX, f32::MIN), |(a, b), p| (a.min(p.1), b.max(p.1)));
+        let mut xs = Vec::with_capacity(v.len());
         for y in ((top - 0.5).ceil() as i32).max(0)..=((bottom - 0.5).floor() as i32).min(n as i32 - 1) {
             let cy = y as f32 + 0.5;
-            let (mut lo, mut hi) = (f32::MAX, f32::MIN);
+            xs.clear();
             for i in 0..v.len() {
                 let (a, b) = (v[i], v[(i + 1) % v.len()]);
                 if (a.1 <= cy) != (b.1 <= cy) {
-                    let x = a.0 + (cy - a.1) / (b.1 - a.1) * (b.0 - a.0);
-                    lo = lo.min(x);
-                    hi = hi.max(x);
+                    xs.push(a.0 + (cy - a.1) / (b.1 - a.1) * (b.0 - a.0));
                 }
             }
-            if lo > hi {
-                continue;
-            }
-            for x in ((lo - 0.5).ceil() as i32).max(0)..=((hi - 0.5).floor() as i32).min(n as i32 - 1) {
-                buf[y as usize * n + x as usize] = [col[0], col[1], col[2], 255];
+            xs.sort_by(f32::total_cmp);
+            for &[from, to] in xs.as_chunks::<2>().0 {
+                for x in ((from - 0.5).ceil() as i32).max(0)..=((to - 0.5).floor() as i32).min(n as i32 - 1) {
+                    // The sample's place along the gradient, in SVG units.
+                    let (px, py) = ((x as f32 + 0.5 - ox) / s, (cy - oy) / s);
+                    let t = (((px - fx) * gx + (py - fy) * gy) / g2).clamp(0.0, 1.0);
+                    let mix = |k: usize| (f32::from(c0[k]) + (f32::from(c1[k]) - f32::from(c0[k])) * t).round() as u8;
+                    buf[y as usize * n + x as usize] = [mix(0), mix(1), mix(2), 255];
+                }
             }
         }
-    };
-    // Faces: each is a few overlapping convex pieces (the filler only does convex shapes).
-    let (light, mid, dark) = ([96, 158, 236], [58, 136, 238], [55, 108, 197]);
-    fill(&[(3.5, 105.9), (177.0, 5.8), (263.4, 55.6), (263.8, 156.0), (177.0, 406.4)], light);
-    fill(&[(177.0, 206.1), (263.8, 156.0), (350.5, 206.2), (350.5, 306.3), (177.0, 406.4)], light);
-    fill(&[(3.5, 105.9), (177.0, 206.1), (177.0, 406.4)], mid);
-    fill(&[(3.5, 105.9), (3.5, 205.7), (90.3, 256.2), (177.0, 206.1)], mid);
-    fill(&[(177.0, 206.1), (90.3, 256.2), (90.0, 356.2), (177.0, 406.4)], mid);
-    fill(&[(264.1, 155.8), (177.0, 206.1), (177.0, 406.4), (263.8, 256.2)], dark);
-    fill(&[(263.8, 256.2), (350.5, 206.2), (350.5, 306.3), (177.0, 406.4)], dark);
-    fill(&[(177.0, 206.1), (177.0, 406.4), (350.5, 306.3)], dark);
-    fill(&[(263.8, 55.9), (263.8, 156.0), (177.1, 105.9)], dark);
-    // White edge lines, 10 units wide: a rectangle per segment and a disc at each inner corner.
-    let white = [255, 255, 255];
-    let mut stroke = |pts: &[P], closed: bool| {
-        let m = pts.len();
-        for i in 0..(if closed { m } else { m - 1 }) {
-            let (a, b) = (pts[i], pts[(i + 1) % m]);
-            let l = ((b.0 - a.0).powi(2) + (b.1 - a.1).powi(2)).sqrt();
-            let (nx, ny) = (-(b.1 - a.1) / l * 5.0, (b.0 - a.0) / l * 5.0);
-            fill(&[(a.0 + nx, a.1 + ny), (b.0 + nx, b.1 + ny), (b.0 - nx, b.1 - ny), (a.0 - nx, a.1 - ny)], white);
-        }
-        for c in &pts[if closed { 0 } else { 1 }..if closed { m } else { m - 1 }] {
-            let disc: Vec<P> = (0..16)
-                .map(|k| {
-                    let t = k as f32 * std::f32::consts::TAU / 16.0;
-                    (c.0 + 5.0 * t.cos(), c.1 + 5.0 * t.sin())
-                })
-                .collect();
-            fill(&disc, white);
-        }
-    };
-    stroke(&[(263.8, 55.9), (177.1, 105.9), (263.8, 156.0), (263.8, 256.2), (350.6, 206.1)], false);
-    stroke(&[(5.0, 105.9), (178.5, 206.1), (178.5, 406.4)], false);
-    stroke(&[(177.0, 206.1), (263.8, 156.0)], false);
-    stroke(
-        &[
-            (178.5, 5.8),
-            (5.0, 105.9),
-            (5.0, 206.1),
-            (91.7, 256.2),
-            (91.7, 356.4),
-            (178.5, 406.4),
-            (352.0, 306.3),
-            (352.0, 206.1),
-            (265.2, 156.0),
-            (265.2, 55.9),
-        ],
-        true,
-    );
+    }
     // Average each ss x ss block down to one pixel (straight alpha = covered share).
     let mut rgba = Vec::with_capacity(size * size * 4);
     for y in 0..size {
@@ -123,4 +128,20 @@ mod tests {
         assert!(super::rgba(0).is_err());
         assert!(super::rgba(2049).is_err());
     }
+
+    /// Borderless: no white edge lines, and the gaps between faces are see-through. At 256 px
+    /// the gap between the left and right faces (SVG x 494..530) is transparent on the row
+    /// through the middle of the mark, and no opaque pixel is white.
+    #[test]
+    fn shared_mark_is_borderless() {
+        let size = 256;
+        let pixels = super::rgba(size).expect("valid size");
+        let px = |x: usize, y: usize| pixels.as_chunks::<4>().0[y * size + x];
+        let s = size as f32 / 904.436;
+        let gap_x = ((size as f32 - 791.188 * s) / 2.0 + (512.0 - 116.406) * s) as usize;
+        let row = ((750.0 - 53.364) * s) as usize;
+        assert_eq!(px(gap_x, row)[3], 0, "the seam between the left and right faces is a gap");
+        assert!(px(gap_x - 8, row)[3] == 255 && px(gap_x + 8, row)[3] == 255, "faces on both sides of the gap");
+        assert!(pixels.as_chunks::<4>().0.iter().all(|p| p[3] == 0 || p[0] < 200), "no white edges");
+    }
 }

assets/icons/ui/AGENTS.md

@@ -29,3 +29,9 @@ request files under target, and do not retry them. The server never invokes a mo
 
 Canonical paths, launch command and export schema: [README.md](README.md).
 There are no numbered bulk authoring scripts or generated inventory files to maintain.
+
+Runtime discovery is also checked by `crates/ui-egui/tests/icon_audit.rs`. New menu
+surfaces must extend that Harness traversal. Regenerate the committed
+`design/requested_icons.txt` with `UPDATE_ICON_MANIFEST=1 cargo test -p
+solidcraft-ui-egui --test icon_audit`; review the sorted id/placeholder diff. The
+review tool reads this fixture in addition to source scans, masters and aliases.

assets/icons/ui/README.md

@@ -18,8 +18,8 @@ artwork changes trigger the live revision check. The server binds only to loopba
 
 Every opening scans SVG masters, aliases and source references. New, unused,
 missing and changed icons are discoverable. **All discovered icons without a valid
-acceptance are Open, including those with notes.** No inventory file or allowlist
-is needed. Rescan sees additions immediately; a running page also polls revisions.
+acceptance are Open, including those with notes.** Discovery also reads `design/requested_icons.txt`, the sorted runtime audit
+manifest; it supplements source scans and never restricts discovery. Rescan sees additions immediately; a running page also polls revisions.
 The internal placeholder glyph is the only excluded card. Shared masters are shown
 separately even when an accepted alias already uses them; reopen that alias before
 requesting a redraw of its protected artwork. Unassigned commands
@@ -82,6 +82,7 @@ Palette changes preserve accepted artwork and never update review hashes.
 | `design/palette.toml`, `aliases.toml` | Shared theme roles, weights and semantic aliases |
 | `design/review.json` | Owner acceptance hashes and current notes |
 | `design/references.toml` | Curated style references; does not control discovery |
+| `design/requested_icons.txt` | Sorted runtime requests and placeholder flags, checked by the Harness audit |
 | `design/tools/author/{lib,bases}.py` | Reusable geometry and canonical cube/slab/arrow bases |
 | `design/tools/author/new_icon.py` | Safe new-master scaffold, never overwrites an id |
 | `design/tools/icon_status.py`, `review_state.py` | Discovery, review backend and state |
@@ -90,7 +91,7 @@ Palette changes preserve accepted artwork and never update review hashes.
 | `source/` | Rust viewport glyphs, markers, navigation and pointer; not command icons |
 
 `crates/ui-egui/build.rs` embeds SVGs, palette and aliases. `icon_svg.rs` parses and
-rasterises them for `icons::paint`; adding an icon still requires its registry or
+rasterises them for `icons::paint_icon`; adding an icon still requires its registry or
 UI assignment and an application rebuild. Review status never controls rendering.
 
 ## Checks and reports
@@ -104,5 +105,25 @@ python3 -B assets/icons/ui/design/tools/icon_status.py --csv
 ```
 
 Reports, screenshots, requests, generated contact sheets and previews stay under
-ignored `target/`. Do not commit generated inventories or historical authoring
-batches. Every non-Markdown resource has an exact row in `ATTRIBUTION.md`.
+ignored `target/`. The runtime request manifest is a committed regression fixture; other generated
+inventories and historical authoring batches do not belong in the repository. Every non-Markdown resource has an exact row in `ATTRIBUTION.md`.
+
+## Runtime menu audit
+
+`cargo test -p solidcraft-ui-egui --test icon_audit` drives the real UI through the
+headless scenario Harness and rejects placeholder requests and unexpected blank
+context-menu icons. It compares sorted requested ids with
+`design/requested_icons.txt` (`id<TAB>placeholder`, one per line). After deliberately
+changing menu coverage or assignments, regenerate and review its diff:
+
+```sh
+UPDATE_ICON_MANIFEST=1 cargo test -p solidcraft-ui-egui --test icon_audit
+```
+
+The review page includes every manifest id, even ids used only in tables or helper
+arguments. A true placeholder flag, missing master or broken alias is reported as
+missing; runtime collection never changes acceptance hashes. The live control
+method `ui.icon_audit` can diagnose requests in a running UI (see
+[control protocol](../../../docs/control-protocol.md)). Keep the Harness traversal
+current when adding menus. A successful traversal covers only the contexts it
+actually opens; document unreachable or untested contexts in the audit report.

assets/icons/ui/STYLE_GUIDE.md

@@ -78,7 +78,7 @@ Its projected circle uses the same axes; do not arbitrarily flatten the ellipse.
 
 Only use the stable `source` identifiers below in model SVGs. The renderer maps roles to
 light/dark theme values. `currentColor` is the background line-art role, not a way
-to add arbitrary colours. All values and accents come from `design/palette.toml`.
+to add arbitrary colours. Default display values and semantic accents come from `design/palette.toml`. Theme files may override those display roles and ramps through `icon_palette`; source identifiers and accent assignments stay unchanged.
 
 | Role | Author helper | Light value | Use |
 | --- | --- | --- | --- |
@@ -96,9 +96,9 @@ The source hexes identify paint roles, not the displayed colour. **Never recolou
 SVG to apply a workspace accent.** Keep these identifiers and every finished shape
 unchanged; the runtime and review page resolve them through `design/palette.toml`.
 
-That file is the single colour authority: edit `light`/`dark` in the relevant
+That file is the default colour authority: edit `light`/`dark` in the relevant
 `accents` ramp; `active-3` is its primary stroke and `active-1/2` are shaded faces.
-Do not edit a role's `source` identifier. `variants` holds colour-vision adjustments.
+Do not edit a role's `source` identifier. Theme `icon_palette` overrides affect display colours only; colour-vision variants still take precedence. `variants` holds colour-vision adjustments.
 A role with `use = "active-3"` follows that stroke automatically.
 
 | Meaning | Accent | Assignment |
@@ -207,3 +207,9 @@ All artwork must be original SolidCraft work or an explicitly licensed resource
 with provenance. Commercial CAD artwork, screenshots and extracted assets are
 forbidden even as hidden references. This guide and the local finished set provide
 all required visual context for future agents.
+
+Runtime discovery is also checked by `crates/ui-egui/tests/icon_audit.rs`. New menu
+surfaces must extend that Harness traversal. Regenerate the committed
+`design/requested_icons.txt` with `UPDATE_ICON_MANIFEST=1 cargo test -p
+solidcraft-ui-egui --test icon_audit`; review the sorted id/placeholder diff. The
+review tool reads this fixture in addition to source scans, masters and aliases.

assets/icons/ui/design/aliases.toml

@@ -29,10 +29,19 @@ ground = "c_fix"
 
 # Same finished drawing, different semantic operation. Colours live only in palette.toml.
 sketch_break = { master = "break", accent = "sketch" }
+sketch_cancel = { master = "close", accent = "sketch" }
 sketch_dxf = { master = "dxf", accent = "sketch" }
 sketch_move = { master = "move", accent = "sketch" }
 sketch_scale = { master = "scale", accent = "sketch" }
 sketch_text = { master = "text", accent = "sketch" }
 surface_fair = { master = "spline_cv", accent = "surface" }
 mesh_export = { master = "export", accent = "mesh" }
+
+# Legacy feature-history id for the same Split Body operation.
+split = "split_body"
+
+# Sketch dialog choices share the corresponding finished tool artwork.
+sketch_chamfer_equal = { master = "sketch_chamfer", accent = "sketch" }
+sketch_chamfer_two = { master = "sketch_chamfer_two_distances", accent = "sketch" }
+offset_one_side = { master = "offset", accent = "sketch" }
 bom = "list"

assets/icons/ui/design/palette.toml

@@ -10,7 +10,7 @@
 [roles.ink]        # outlines and details drawn over a face
 source = "#34465b"
 light = "#34465b"
-dark  = "#d8dfeb"
+dark  = "#1f2021"
 [roles.line]       # line art that sits directly on the UI background (SVG: currentColor)
 source = "#34465b"
 light = "#34465b"
@@ -66,13 +66,13 @@ parameters = 4.2
 
 [accents.surface.active-1]
 light = "#f1d2af"
-dark  = "#ba8f6a"
+dark  = "#cc9362"
 [accents.surface.active-2]
 light = "#c06f00"
-dark  = "#b86f04"
+dark  = "#bd750d"
 [accents.surface.active-3]
 light = "#a45000"
-dark  = "#95682d"
+dark  = "#955a0e"
 
 [accents.form.active-1]
 light = "#decff8"
@@ -85,41 +85,41 @@ light = "#7349cd"
 dark  = "#7b63a6"
 
 [accents.mesh.active-1]
-light = "#e5d99b"
-dark  = "#a9985f"
+light = "#ffec8e"
+dark  = "#ffe282"
 [accents.mesh.active-2]
-light = "#a28200"
-dark  = "#9a8100"
+light = "#bb9600"
+dark  = "#ab8f00"
 [accents.mesh.active-3]
-light = "#826700"
-dark  = "#857100"
+light = "#e0b200"
+dark  = "#c6a800"
 
 [accents.sketch.active-1]
 light = "#bfe2cc"
-dark  = "#81a28e"
+dark  = "#7ab792"
 [accents.sketch.active-2]
 light = "#439a65"
-dark  = "#459665"
+dark  = "#3a965e"
 [accents.sketch.active-3]
 light = "#057f45"
-dark  = "#27864e"
+dark  = "#128d45"
 
 [accents.constraint.active-1]
 light = "#f0cfca"
 dark  = "#b98c88"
 [accents.constraint.active-2]
 light = "#c1685f"
-dark  = "#b66b61"
+dark  = "#c27267"
 [accents.constraint.active-3]
-light = "#af4038"
-dark  = "#a05c54"
+light = "#ca473d"
+dark  = "#c16358"
 
 [accents.construction.active-1]
 light = "#ecd3b6"
-dark  = "#b19373"
+dark  = "#b99a78"
 [accents.construction.active-2]
 light = "#b8741f"
-dark  = "#b4711c"
+dark  = "#ad7023"
 [accents.construction.active-3]
 light = "#9c5600"
 dark  = "#a75d00"
@@ -134,12 +134,16 @@ dark  = "#1d7f89"
 [variants.red-green.construction.active-3]
 light = "#b97300"
 dark  = "#a75d00"
+# The constraint red stays darker than the sketch green for a weak red sense.
+[variants.red-green.constraint.active-3]
+light = "#af4038"
+dark  = "#c16358"
 [variants.blue-yellow.construction.active-3]
 light = "#b97300"
 dark  = "#c37d00"
 [variants.blue-yellow.constraint.active-3]
 light = "#af4038"
-dark  = "#986255"
+dark  = "#85554a"
 
 # Default accent by requested icon id. Explicit alias accents in aliases.toml win.
 # Deliberately not inherited from a master: ground reuses c_fix but is not a constraint.
@@ -153,9 +157,9 @@ sketch = [
   "arc3", "arc_center", "arc_slot", "arc_slot_center", "arc_tangent",
   "blend", "circle", "circle2", "circle3", "circle_tt",
   "circle_ttt", "conic", "constrainer", "dimension", "ellipse",
-  "extend", "finish", "fit_section", "include", "infinite",
+  "extend", "finish", "fit_section", "include",
   "intersect", "intersection_curve", "iso_curve", "line", "line_mid",
-  "offset", "point", "polygon", "polygon_circumscribed", "polygon_edge",
+  "offset", "offset_two_sides", "offset_symmetric", "point", "polygon", "polygon_circumscribed", "polygon_edge",
   "project", "project_surface", "rect", "rect3", "rect_center",
   "rect_rounded", "sketch", "sketch_chamfer", "sketch_chamfer_angle", "sketch_chamfer_two_distances",
   "sketch_fillet", "sketch_mirror", "slot", "slot_center", "slot_overall",
@@ -168,5 +172,5 @@ constraint = [
   "c_polygon", "c_smooth", "c_symmetry", "c_tangent",
 ]
 construction = [
-  "centerline", "construction",
+  "centerline", "construction", "infinite",
 ]

assets/icons/ui/design/requested_icons.txt

@@ -0,0 +1,282 @@
+accessibility	false
+activate	false
+align	false
+appearance	false
+arc3	false
+arc_center	false
+arc_slot	false
+arc_slot_center	false
+arc_tangent	false
+as_built	false
+assistant	false
+auto_constrain	false
+axis	false
+axis_edge	false
+axis_normal_to_face	false
+axis_through_cylinder	false
+axis_two_planes	false
+axis_two_points	false
+bendtable	false
+blend	false
+body	false
+bom	false
+boss	false
+boundary_fill	false
+bounding_solid	false
+box	false
+break	false
+bug_report	false
+c_coincident	false
+c_collinear	false
+c_concentric	false
+c_equal	false
+c_fix	false
+c_hv	false
+c_midpoint	false
+c_parallel	false
+c_perpendicular	false
+c_polygon	false
+c_smooth	false
+c_symmetry	false
+c_tangent	false
+cam	false
+camera	false
+canvas	false
+capture	false
+center_of_mass	false
+centerline	false
+chain	false
+chamfer	false
+checkpoint	false
+chevron	false
+chevron_right	false
+circle	false
+circle2	false
+circle3	false
+circle_tt	false
+circle_ttt	false
+close	false
+coil	false
+combine	false
+compare	false
+component	false
+compute	false
+configuration_table	false
+conic	false
+constrainer	false
+construction	false
+contact_all	false
+contact_new	false
+contact_off	false
+contact_sets	false
+continuity	false
+convert_sheet	false
+copy	false
+curvature_comb	false
+curvature_map	false
+cut	false
+cylinder	false
+decal	false
+delete	false
+delete_face	false
+dimension	false
+draft	false
+draft_analysis	false
+drive	false
+dxf	false
+edit	false
+ellipse	false
+emboss	false
+environment_map	false
+error	false
+explode	false
+export	false
+export_tray	false
+extend	false
+extrude	false
+eye	false
+fastener	false
+fillet	false
+finish	false
+fit	false
+fit_section	false
+flange	false
+flat	false
+fold	false
+folder	false
+frame_member	false
+gear	false
+graph	false
+ground	false
+help	false
+hem	false
+hole	false
+home	false
+import	false
+import_tray	false
+include	false
+infinite	false
+inspect	false
+interference	false
+intersect	false
+intersection_curve	false
+iso_analysis	false
+iso_curve	false
+joint	false
+joint_origin	false
+library	false
+line	false
+line_mid	false
+lip	false
+list	false
+loft	false
+lookat	false
+material	false
+measure	false
+mesh_export	false
+min_radius	false
+mirror	false
+motion_link	false
+move	false
+new	false
+normal	false
+offset	false
+offset_face	false
+open	false
+orbit	false
+origin	false
+pan	false
+params	false
+paste	false
+pattern_circ	false
+pattern_path	false
+pattern_rect	false
+perforate	false
+perspective	false
+pipe	false
+plane	false
+plane_along_path	false
+plane_angle	false
+plane_midplane	false
+plane_perpendicular	false
+plane_tangent	false
+plane_three_points	false
+plane_two_edges	false
+plastic_assign	false
+plastic_rule	false
+play	false
+plus	false
+point	false
+point_along_path	false
+point_center	false
+point_edge_plane	false
+point_three_planes	false
+point_two_edges	false
+point_vertex	false
+polygon	false
+polygon_circumscribed	false
+polygon_edge	false
+presspull	false
+project	false
+project_surface	false
+rack_pinion	false
+reach	false
+rect	false
+rect3	false
+rect_center	false
+rect_rounded	false
+redo	false
+refold	false
+rename	false
+render_image	false
+render_scene	false
+reorder	false
+replace_face	false
+rest	false
+restore	false
+revert	false
+revolve	false
+rib	false
+rigid_group	false
+rollback	false
+save	false
+scale	false
+screw	false
+section	false
+select	false
+send	false
+settings	false
+sheet_rules	false
+shell	false
+shield	false
+silhouette	false
+sketch	false
+sketch_break	false
+sketch_cancel	false
+sketch_chamfer	false
+sketch_chamfer_angle	false
+sketch_chamfer_equal	false
+sketch_chamfer_two	false
+sketch_chamfer_two_distances	false
+sketch_circ_pattern	false
+sketch_dxf	false
+sketch_fillet	false
+sketch_mirror	false
+sketch_move	false
+sketch_rect_pattern	false
+sketch_scale	false
+sketch_text	false
+slot	false
+slot_center	false
+slot_overall	false
+snap	false
+snap_fit	false
+sphere	false
+spin	false
+spline	false
+spline_cv	false
+split	false
+split_body	false
+split_face	false
+spun	false
+star	false
+status_error	false
+status_recovery	false
+style	false
+suppress	false
+surface_blend	false
+surface_boundary	false
+surface_extend	false
+surface_extrude	false
+surface_fair	false
+surface_fillet	false
+surface_loft	false
+surface_offset	false
+surface_patch	false
+surface_reverse_normal	false
+surface_revolve	false
+surface_ruled	false
+surface_stitch	false
+surface_sweep	false
+surface_thicken	false
+surface_trim	false
+surface_unstitch	false
+surface_untrim	false
+svg	false
+sweep	false
+text	false
+thread	false
+torus	false
+trace	false
+trim	false
+undo	false
+unfold	false
+update	false
+warning	false
+web	false
+ws_animate	false
+ws_design	false
+ws_drawing	false
+ws_render	false
+zebra	false
+zoom	false

assets/icons/ui/design/review.json

@@ -4,6 +4,7 @@
   "accessibility": "012aa26ece9ffa8bd6a850b7a19279c3675164b12438f5fbfe560e575c8fe2eb",
   "activate": "9d28c47dcb0b733095eadc840a30fa898a19f9cf9eee203496386546666cb1f8",
   "agent_chat": "4a9ae0e7e2c360b4858b3175674c93d096705c92318fecd481e849f3ae650bf4",
+  "agent_link": "2f20d89a0e3e9b28744910dddf7f282a1099ccd91aa160c9841c5b1d9ea9ed0f",
   "align": "05615db7dd9e4be56ae898e59a68c548b8a8447794442a9a394940651204bc4f",
   "appearance": "b3162edd92291a5ef402e8499cd52be05beb2fa7eda641163c3f6e98325de2bf",
   "arc3": "fdca3d501fd557ac989376a12e9c4fa8231fde2b455c20724d1079a466153e9c",
@@ -12,10 +13,11 @@
   "arc_slot_center": "ba93e773e06e948fcf3c6dab28df341c07d35c6a3afa33a840b261bb82bcf32b",
   "arc_tangent": "d6910c8d42878cc34617b96e26c3018f4a6e4e793443ac81f2c294f88d70fa28",
   "as_built": "0f481932deca5586a8a8ea3d707efca0747f5c59559d53830b694d3458531013",
+  "assistant": "8fac392b16b4f13c6a399c59962b97c1912282e0ec909976496959472f1d642d",
   "auto_constrain": "012e5da4ff83449f6a3a92ee2d9924998cbeea545281bdf97873710b7436183d",
-  "axis": "66ebabe43a7b1b73b59a3a03b7bd92ab54d899947d0cc2d93ad6e6aac4d76501",
+  "axis": "acdab0eb7b99b1579d64ae190082df48b65174e7b8ad3104967bcc59f6154206",
   "axis_edge": "5a65898bc38bdaaaf5b04f2c2f7556915b5b7b1fdc4de9708fcc30f64aa1ab18",
-  "axis_normal_to_face": "0824bb37e80928e9ac880af5ca5fdb3b52084af9e73db73a5a5a7bc8f1f899f7",
+  "axis_normal_to_face": "597b5b96ce787b70791133267108c5196aca09d5e3f94e7dc92199a63fe49ca6",
   "axis_through_cylinder": "804eb75631f4ee71ac8db51209237bb19d82bafd326abdc81b124b875c0874b4",
   "axis_two_planes": "80162aa79ca7baf6d60490414a4fb53d87e6f2b85e901c452875a5f3ed86d35a",
   "axis_two_points": "5064f7544ce41ae7c1f05a90c958222bbcee03723df67d34cd3e209d25a1f71f",
@@ -28,36 +30,38 @@
   "boundary_fill": "17ccb419a46c04a44ec864af968a32984dc81f6b3196a821bfff7f54141dfdd1",
   "bounding_solid": "e2deb6fff292f0f295022583ba7ddb86896eb79d9dd7268e653713b9c62f0580",
   "box": "72cd44c3c4fc5ae71242fca8c60af47371930201276df5b7db9d2f16a2739c31",
-  "break": "430582243311f304dbab397ce58c8c9aef9c78ed88d3e921a57e584ddb95d94c",
+  "break": "67a5fab332616e6d6a9aeae3bedc04ee0768179143ba34b795bdd98cea04bb24",
   "bug_report": "8cf7afbe0d3c34988fd2748de148f56a7e939fd8273ba01a79a976f879c74831",
-  "c_coincident": "32fb535b3dd7631dc2e9ea284f445ad54ea0e5c8b0e1bb27a9984c849746917d",
+  "c_coincident": "a93cc58acc5090c24c973cb558920bff4e35c8f99071135f16a115256d41bf98",
   "c_collinear": "3bcf1dc6b221a1fa9a4445ee8afc7d858dc28a5270d22d10fef86fa4997f1bdf",
   "c_concentric": "90e9b35b6186ea4fcb3debc24808f302c0bf7354b7afae86e339574ef8e5103a",
   "c_equal": "c0f50c02db7d15a6392d2178e28df5c100e67fab7732f8e8474b888d218d0673",
-  "c_fix": "b91c6af7ea9740efb8cf196409b11d16fad52c51b732a356e5f844bd4e2f08e0",
+  "c_fix": "23e2471a9d6872e83028e0e219e330cef1930a4d89456a0fefa1bda8a7e3eb81",
   "c_hv": "b5c44d60a4b03b9942fbcf3c706f797ce4dbddf9a67eb1c98d6aaf3234e9bc18",
-  "c_midpoint": "fd4efc26da1336f811a9016b02d7675af2a7c95cd1ffa2f091507b22434f5435",
+  "c_midpoint": "aaea530b8a04aa80efc99ed2cf42347a91c65b160286bae3e2882f5a0bd09a51",
   "c_parallel": "aaa80258502af091b596511662aca392546dd0d7bf69cec4db98b6e0ae7591f0",
-  "c_perpendicular": "692ba7a77cd77108c33c101386b60b7c957ce7d2202937d9696d18dcf3d4cf8e",
-  "c_polygon": "defac40b4c6ef323494f49acbb94b896502f78f6a99e750975693c602164a44b",
-  "c_smooth": "dccf5effdb8977ac04e6c437c280c83ed0f117d81b64c57fae03f5f7f7f2b9c0",
+  "c_perpendicular": "0ccf0383176ace2d4ab30c2efe853815ca1df20f2537020f369f496d8bf124b5",
+  "c_polygon": "02c76b288b42d6be8eb77f502af95bb840557f43fed3def2b1a381f6ac920375",
+  "c_smooth": "87aeb504aa330a191a8680d9eab3e86844f6d7be0a9caa10fdf0a657e76f45ee",
   "c_symmetry": "8646a7deb7447514bcc455562d8639f8b4c482df8c971fd2870c05965ce71f78",
-  "c_tangent": "a011f5d43d5e09f68de332c60c5acee737a3ebc94d107f521871225c3841a064",
+  "c_tangent": "ef8b1e502c2a939958b5e8de9ef2716442e32b2a394555eb7b51101c415b966e",
   "cam": "a35342e36ca4deae55e98c54df630b5c2da591c06d979eb2b8ce6a13f6db66d0",
   "camera": "fcd867877ea4984318dbff36a166b48682f26bb9d44e70383dde63d9a7ab87c8",
   "canvas": "512d7721f0b8b14a46f22b9588b437b0cd8c2c425330d31b3b156c0d1334bcef",
   "capture": "23ef84e50b45c06532b3e842b72f6da5498d0e6b8391e1bff55e84afa8359f37",
   "center_of_mass": "24401b1a19cb45ddb028de0acf3c9815b47abecbde9e133f473adac3d27ae346",
-  "centerline": "a1889b9092ef5a7aa9592df994b6541b53ea9afb03b2c56c7678a61df335f4d7",
+  "centerline": "850283497bad77e233f934e8effc0d0d7b01ccde83fa66f6abb539a33a8a2c80",
   "chain": "9cdc78486b5c4b5b2a378e09bbd41733eb167513f9f2bc4b1aad629dd6c4c753",
   "chamfer": "487c90ae65e87b74d7ddee7d9ce9f088b63e9b5b85c2a390364855a2649f17e8",
   "checkpoint": "a3bc0700a40b791b5f3bf176d820bdabd2cf94a526908609d50136c8d0918d6a",
   "chevron": "61887736af4b1e6bef857c4d2e3846657824e84f1c8026a56525ddba2d2a8083",
+  "chevron_right": "d28a52dcc51fd9eb988f8f83e89d74370a31100049c910a886732a48ec1342ca",
   "circle": "145544ff1cd133971f537dd247092126ef8d91a88fe31b795222e76840d0c4d0",
   "circle2": "f1b6e8e2157279cfe1e608f913b377e44a70f7555f5010298138de8a887bf586",
   "circle3": "aaf6b914e630688675abf4dcbf7d43096317881ced0e22520a4ef229013e0de2",
   "circle_tt": "94996320b671c8c48f239b8c48f1b2f1cd5cc33a7d8ea1daaa61aa9203803cae",
   "circle_ttt": "ac3c211a6fe17c3625060f695ecd93937730e2bc2dd57921bcbbcaa984b9badf",
+  "close": "5833954dfba3d70a9a3a7519f2796a7213899548b0345bd8fe8ea9a321d82be2",
   "coil": "4c549fd63506457165f53a7940cc0f3dcacdbe075e935ea299edbf4985104411",
   "combine": "f9d4211f0153779369c9da68b266c2c9a857d11bc033ff4a96ede794e470e38e",
   "compare": "c24b6c18f18413ae6f3344aaa6e04b42fae8b63e7cd1552a81398462eb68eb96",
@@ -66,7 +70,7 @@
   "configuration_table": "1a142e76b9e4cd47412a307cc0ad9b8c589bb97c8930fc445dd5bb8d74ecf707",
   "conic": "808445fd697ff76f9074e7bbf877146e634995c295dce045604991fa4cec26a0",
   "constrainer": "774cb158897eb91767541b5b1a25a46f3a731cbea0661006ce5472634ab6b0e3",
-  "construction": "ad962cbcd0aaef9167744abfd0bfe1d7ef55e48b4ff42f2b4b05f66204b58acb",
+  "construction": "f13e3851cdf7b30a7118802a1c17e8852fcb9893fd1d65c7098a5c3fc35c8396",
   "contact_all": "6ad4d245592815a3e38e70ae324ad3971ab614daba7ca3cf8fcb64cb8e2be077",
   "contact_new": "603410785fff408cc12dc72bef2f09885b694c5ddb2571c7819ae1301fb89dc6",
   "contact_off": "54dc3bd2267ebb084d8dc7efee85e9f21d8c59a57ad37b96d78095bc75e73fa0",
@@ -81,8 +85,10 @@
   "decal": "acc258e40b29ffb6b6007057f0b70f487995f573704c7ef4e4f08f209d52bddd",
   "delete": "d14203f06b8b1b87328e7f198c7aa41595e9a66b5d8a7fbd2a3ec2e35cd99afd",
   "delete_face": "dcbf8ab59bd37bd5a0cdd7a528b29c2d19daa5f3fc130ef5cff0c20034f061a4",
-  "dimension": "8246dde8b0a140d1f533c1e45f2e8b5af35c05d3504dccf50bd7e7726a93389e",
-  "dots": "aa38423c547594462f49cc355f3c9f5b41e28a7515f466a6a8cffda487ba1715",
+  "dimension": "a926b7c64bc8ca99d8d6dcbb81b95235bd3fc34fbed049aca8b01b4d1147c15d",
+  "disclosure_closed": "49a350c6f2efae78de0be96c524ebee1fd1291ea449a84224b88d37164a4e807",
+  "disclosure_open": "d13ce3f97e3e362a9904fa2bf3412f3f00e4136bc23538b92d41483961d280de",
+  "dots": "600f7ff209d93145fc938bc4f6a1e34473e6b9ee22a5b4718f133bc7da5ee58d",
   "draft": "9c0fc361cacd0ad95ccd54794f4825dfc9901a83a3de752a588faec365d0ee09",
   "draft_analysis": "eb39c0f90e9cf226da6307365a76015e900dd692dc3f0fdc8f02fe717226261f",
   "drive": "cf9e924acb2531efd5a1b90915d59f0cb532c844b754fd3a0e376ef6f706c47d",
@@ -97,7 +103,7 @@
   "export": "c8c2abf007e43e896479d78798e3976ba9eda809507c820bb38538f77db696ac",
   "extend": "28c63df352c77d02feffe44cf09fb0fc1d48f7905aaabbfa6dba601dbb70f8e8",
   "extrude": "9cc1538971c5d25467aaed23f739899d9d102fd07f86472ac3197c54ca2e1144",
-  "eye": "5d90a25f5d07e6e36a2a8faf5e2ed1425b2a787834ab2291b1b1c521057ec1c2",
+  "eye": "2449167c8410826dc1106b687c12a309d5bea8f7817b897943e80f182a163c2d",
   "fastener": "fcff4e4be50907f712e527b373771afafd92e50096fc7a4b8aba5d86448e1e42",
   "fillet": "11ec232dc111597211e3a4fe61b69616b5d28b4b1b2732052ddcd486cdfc6129",
   "filter": "4d456a56416089574bd3732fa44c0c1b27fd2478b369448808a27f0144d15d8a",
@@ -109,15 +115,15 @@
   "fold": "90344fb5e5799378117fbd79ef28a84f27fba5723af5414c4ea30a2ac3a4f21e",
   "folder": "c19f5230df45a1bda1e92e89de38bba21c91e6eca0517eb15847a7712012d1e5",
   "gear": "25a1ca48a587850da1104a46005a330873ed196246e3d04e12cf61f26ad2b0d5",
-  "graph": "25646bdf4d1a534c51e1897a8ae641a21f871ed70b24ff25652e1fe957c9fa00",
-  "ground": "b91c6af7ea9740efb8cf196409b11d16fad52c51b732a356e5f844bd4e2f08e0",
+  "graph": "7156caedd2dbfa2ae53da18b7a2204b8db66c45126859d36caf049a3fd4335a4",
+  "ground": "23e2471a9d6872e83028e0e219e330cef1930a4d89456a0fefa1bda8a7e3eb81",
   "help": "8ce4060577483dbdb510be147d2827de50ac20029354008fca55abc0c7edf05d",
   "hem": "f9b1aafbedcf3dc90c26be308814638e0095fbe31b0647092507343fa60af011",
   "hole": "f82d47751f826e08682db847a270897474661bfe9f35b6d3678f49a203172563",
   "home": "ab5f1c41d377687e4c5a808dfdccf2757b33dd43f934d44df43d6e9118176853",
   "import": "e343540eb49fdb1e53c4d54b9e60ae513b3103df6c9133048bed878e58067455",
   "include": "f5b80ad3e06e3b863fcfbe415ec912e4e09653dd519f9ac207819339fe34730f",
-  "infinite": "bff57a1c56d9b47131d7c8ff85f008a53c612c63706052e7e19d7aaea93cf5b1",
+  "infinite": "53fb781131078d2f8e71be23aa610d9f9d9c8bb79ba5f97fa397475e9ff8c3bd",
   "inspect": "d2b4644b2d5f1aa50cb576b9265e275fa91201e296c2bc79865f810067d538e9",
   "interference": "b3d729d0e822e8d95485c8ef50649847572def10d4c713fff0e073b8031c5f5d",
   "intersect": "9ab4f6551848a2be546f55502a77075bed2d3994f89d91b721eab92bcee61d61",
@@ -125,7 +131,7 @@
   "iso_analysis": "dacd34ac254ec4fbb6932350f62d4d92626d922a2bfc62d2caecdeb17303e896",
   "iso_curve": "015ff2e26346ccaf149f75cf6a0652d9201c1b23a14e6bb62625acfa599dc002",
   "joint": "72b71a608e713f6cf51a1cb84edb011d4ccbd8bfe41d917fa2a1d13345dc0b2b",
-  "joint_origin": "5b0761122eb4295ea220314e8db1efd1251e3482653d6cdcc47252d0268864a8",
+  "joint_origin": "e12529af1fce8c5ffdf746e71ce2f5db5eb170e53778469cea8fd30344291574",
   "library": "ac0b1798e4c94340f9c854daa3829371c1a9f3ffea7679d955e6cfa139cafdc8",
   "line": "cd1177ea659548f03d43c7fa7dcc209a0542b1ba4bd0153c5113576cb7a96a81",
   "line_mid": "edb8ebc463479ae9878e54b930c124153ca880270b7cf6c0e4edba6336ba2854",
@@ -139,17 +145,20 @@
   "min_radius": "92bd79b7d557aba6ddfccc76a4c6d0cfb579061b3c57172f9171d28af675711c",
   "mirror": "56637068a319dc2972c5552b25e4f43151aa9bd5055c2fef08204dd7cc0829cf",
   "moon": "3ba5adb92bf0f49e92d46682dbf6905e555aa6eebc8e2b3c5288f949cda29322",
-  "motion_link": "19698bbe15b7c2d2601208bbcdc26627d1aa7724aee017b7da8874ad87fb9d1f",
+  "motion_link": "27832f827146446557609336a9b9e48e649ed84e58c45bd9032a93abbd454104",
   "move": "4132e270ada8d0c79b477095c84d656d6d354e200c1748ce7fc425f36d0b7031",
   "nav_settings": "b93dd46d3a3d074e0d8834167f977dab417fbc1a721bc4db5e840732304e4193",
   "new": "c64c78fd8445bc7b2aa8765d0507b9adf23e35cbf52828d3f1987edccce0389f",
-  "normal": "1148cef2d60a858b69406a2e2527d4ea126f45846de7cc2fb3a96640e9ee226f",
+  "normal": "3c000d707837d4e9c865aefa43c1e610bfce5a06a38510f82e4db11fc13ab31f",
   "offset": "094607afcfdcb9c1410114d9f8d22ca367f8e32ab4c61f71affe44ad5d09adbe",
   "offset_face": "83d39308ec9f3ead78329c62841c8899bbc76ce08e17d539016d18c91d9d4ea7",
+  "offset_one_side": "094607afcfdcb9c1410114d9f8d22ca367f8e32ab4c61f71affe44ad5d09adbe",
   "offset_surface": "b501cfb56b8404cdb2275935d780ce7dbb67e87e29ade3782f0859c59070a2b1",
+  "offset_symmetric": "67f3489402af3afa055181bbdb2a32b9fe2e0d96dccbe0f28df087577978ac9c",
+  "offset_two_sides": "ef69f955c5bef15471e9d77a4498e9337bf938ad75dcbc1e95af2515b6fd13da",
   "open": "f1880d25489753f7e40390902037bbd3195fbd099a5e9dd175797d832abff727",
   "orbit": "4adcd400cdde909139386e78579433354f65f5a77a0594447bf6dda663b3b1b4",
-  "origin": "9b9360edc16ef9f059bff7d863f1bc0e3abac6acf559d76c4ea39dc374ab2844",
+  "origin": "636f9f41654a6da7a5a708bcddef85672f2d77bfec2267b0134e8c5a59768b40",
   "pan": "2465eda7a39d4458d7818f2eb2b033992a68f80d9505bff538b41eb4511bb632",
   "params": "d0d9d0b3e786880e59b985dc2e3a7d593cf3771484a8fd2924d69155195c230f",
   "paste": "e1b3c089adafacb6f7b78b86ec7aba0876b189c81d01031045dfee2c47ae8edc",
@@ -164,22 +173,23 @@
   "perspective": "5fa45ba9b75dbe9fdad9eae331ca7ff35c6ad018b8a1fc4c8ae7bcfc13ed0c3f",
   "pipe": "b9ecf1ae9f6790e2ae6c677f290446f70eba1773a10247fe33d5283b360b0403",
   "plane": "3e7fa0a9d57891f3c1ec03d7422bdb29353d3487deed12e8ec5737aeb33c2f3a",
-  "plane_along_path": "020e25969a7f4e7e3358003addee7df8b1991cde8401df0b4df8295b19497994",
+  "plane_along_path": "db4686ea02c3c3b8ad0d9eac203cc050c395cff6358358922a79c00e955e6852",
   "plane_angle": "2f0914955663b393a377fda080bc03dc5a2133d42c506c1908c53b2fd609b156",
   "plane_midplane": "66bd880821e7b122f130824313b7070d72d79168a52df6a126106b6eb5816474",
-  "plane_perpendicular": "90e1d9b8e75743821aa1082596d9c3f288ab3baddf087fbae3f2025481e58a6e",
+  "plane_perpendicular": "0055fb18ee39044bfc9f2ac53ba55fe73d8fe59e8f4cf225ee2c723a883d3085",
   "plane_tangent": "c3872b9f1d0f0b2493a5488dfdad50049c3422c29023250088eeda9bbcc6e795",
   "plane_three_points": "08e2dbaf606d165ef4f788869fc794a4fbbbb2ee86a60017b76e467af6da338a",
-  "plane_two_edges": "1588b8d4741382d9e8fec38212419ac1c05b1bc6036f276d3b5c62db66f8ebdb",
+  "plane_two_edges": "21de401ec5bab8ae37510da6fa0a6910325f858c17460da0041fd26897338d30",
   "plastic_assign": "bbfdb2d2c07629c047e8e671c7c032654668a67b4b8a934f74cbb3d7a00cc5fe",
   "plastic_rule": "51b8591d92907a3ffb76a47a0503d7ba86706d129dd990515a364dbf1ab8cb48",
   "play": "d1c17ebc16e9a4ee5ae2a8cc37b515ffcc8c53a2ab17117959e9b21278df8def",
+  "plus": "4f324157bb2348ac9f09346b669b08d66ed96cb1c694f33db6f21134f18904b5",
   "point": "fd19dbcd26e2a898267bab54b9d89779d97894209c1771317d7debef5a6f8f5d",
-  "point_along_path": "1fd58d45285fb5cabeddbd35bc8485af1b6d7f1414e302202b4e73de593d1b7a",
+  "point_along_path": "17abd16dec5f70e9f8449c927aa995cfed10fca552ec7cd8f51b209c52012595",
   "point_center": "0ad755896f7d0154a854bda16d3059da78d1fae57962e13a3bb1b31e284b7e79",
-  "point_edge_plane": "548a6c1c944caabe44ab0318e85ae82f39c11f74fbedda35f57bc6615755f249",
+  "point_edge_plane": "a277bc0b87f2dd39eb613835d0f961b3372483e22053e6a522a06c535ad530c4",
   "point_three_planes": "b33c7508ffa67b66a57b72c6ea7900e93ff16362a29d0b2688e0b1db9bfad041",
-  "point_two_edges": "35dcb67b36c8e41041cc836b01056731ab6f14c5e3b4bdd836fbee2a1dd897e3",
+  "point_two_edges": "da329241706e405b877cec20639dc0a78505ca7212c7c47ad1f1f34aa26f4666",
   "point_vertex": "649bb63caf65a3fbc00a1222cc642294832b5e5d8c4d33f812e09a70684c4abe",
   "polygon": "4919268cca7d21ce98dbf4ca01ee832350e793afe4213e257d3c46e94ea88ad1",
   "polygon_circumscribed": "7e4ad16cc1f42c599287b186f26f4ff3c108736877a571a5513bfc72d0cbb23f",
@@ -213,17 +223,19 @@
   "scale": "a66f69d9a1d46c8be30da0a15827bc7e38cba72d6271537763b888c2c7e2b3fa",
   "screw": "5e30570785360d6a591ea22862a82f1cf62228385c1e96382536db8a453ac791",
   "section": "cdd13f99f15f6d59bfa21c747810608d6afd00cb8207faf0337928c8521e7eae",
-  "select": "a0c716234ef1d599be9a7654d6b2911ebe4b2de479383ba33aeab14992443a2f",
+  "select": "fdf6431270006ca7409c60c37cfed59572de04229f104ec723e6010ffa2b7163",
   "settings": "9193dd3a1007c43660d0d47b6499cb2571338b67949e1a99df112057b9bf2b8a",
   "sheet": "774e30923ef6f37dd9c0b2bc3e45705e83b3a76700bf071cd41155a365d0daa4",
-  "sheet_rules": "b8c3a67c82be20fc00c109decc566e8755d70167e04e0a9fb92941f7b27aa993",
+  "sheet_rules": "5d3a2f37d3b4a4262b3ddbdae53d61f29e0f8e284dd54006da25a7acebfa1114",
   "shell": "a1959ea0d0441a479bf654b6e549e2e44a0bfdc9cda4eb46fe1fbfd884de7e38",
   "silhouette": "2a848aed2f247b1c0439f830a34a513c93bc5493c40044c821d493d863ad996e",
   "sketch": "b52e5862b1709a9a7e3ca00d7436d126fbfc01b38080006fa4e17dc581dfa103",
-  "sketch_break": "430582243311f304dbab397ce58c8c9aef9c78ed88d3e921a57e584ddb95d94c",
+  "sketch_break": "67a5fab332616e6d6a9aeae3bedc04ee0768179143ba34b795bdd98cea04bb24",
   "sketch_chamfer": "80ab27a9929f9cf0ab2f827757e007173d74ddca6c19af238931c40d4cd874b4",
-  "sketch_chamfer_angle": "b853f5e7c3b008c0d56ac445a9a28f713987c919ea284945113ad35e7665e2a7",
-  "sketch_chamfer_two_distances": "2b70d658e341f4388838f3c8c579ec5f4f3a7fddcfa2ce7a3f89fc3db6422d6e",
+  "sketch_chamfer_angle": "6750268d05e0b0fd74c2d0368bf4703b09da825def668dc3dfd05deef3ba9adb",
+  "sketch_chamfer_equal": "80ab27a9929f9cf0ab2f827757e007173d74ddca6c19af238931c40d4cd874b4",
+  "sketch_chamfer_two": "1f5ecf1283e2b021e067ed2e4e2e97aa4e1ad3c7c98d8609bb81c5f811988f78",
+  "sketch_chamfer_two_distances": "1f5ecf1283e2b021e067ed2e4e2e97aa4e1ad3c7c98d8609bb81c5f811988f78",
   "sketch_circ_pattern": "c5ff904237a3072f858f66c2777febc4facd2fee630bbf979047c5685d9a05ce",
   "sketch_dxf": "dddce44d4dd10f75a221208fcf431b36b3f0cafce6611fc695ac73afb4bf5789",
   "sketch_fillet": "e8fa170e5f6899abf75788b9384d49f2b9d77ba9b644f79309284a9e65629fe1",
@@ -241,6 +253,7 @@
   "spin": "a5bebeff8276dd12ab7e42ddf0051370b9063fb602607298acf22e77044434d1",
   "spline": "a0dcb25614e5fe1a8f17bc3bddbb11b61cf82b461dd46443ab28cddd6e4e32e3",
   "spline_cv": "353f6e411c0ce611f660cef2e4fc4f8f55edc2c82288de91948dc638cd2b5f15",
+  "split": "eb9619e74c6ee1b1989d35a2e31d2d33a7adac210c4cd424e5382902945ac68b",
   "split_body": "eb9619e74c6ee1b1989d35a2e31d2d33a7adac210c4cd424e5382902945ac68b",
   "split_face": "c8b89072118bb7a28b243d38e26b81a796781a631f30b3b1fc296ba23e4d908d",
   "spun": "b4cfa093ffb43611ee124f4a39fb44c609deb9cde5e05e4dfbaf893fe197c27b",
@@ -249,7 +262,7 @@
   "status_warning": "1ac4f0ccfac2c01f6f66cb42188f9ae053c4aef9c5bbd249f1fb09611eb4d825",
   "stitch": "6c3205d64007b771ed78d6f8055867578439fb25d591563b32dbd3343c98732d",
   "style": "6c2b04234b82ea4858c80190cc7208c60f549358253005afc35ab4e29506b578",
-  "suppress": "6c033a6672a3b6ca926e3d7a75a758c9db7e1144210cd360be043a9fdf999ede",
+  "suppress": "c54fbc01c12c0175d78cd63f692e8aaf73fc2cac79752b2a3ad821ac32734343",
   "surface": "ba0e839ce0ee03e7ff95a2389a5ecb20bd80c713064d9b1bd5f461f4a80d1921",
   "surface_blend": "0642f3b4af7d22f379a3c74f54c7b1c9eef0bdda19372ce4df73c0e56bdd7bbc",
   "surface_boundary": "fb8501bae192e2416118cc2e88f544e0e29197f6720bccc541c967ca0848d8d3",
@@ -265,14 +278,14 @@
   "surface_ruled": "c3f0202d3beaacef0368765ce771eb9e3b0e3e157f86564c72d81f0fad9a3cab",
   "surface_stitch": "6c3205d64007b771ed78d6f8055867578439fb25d591563b32dbd3343c98732d",
   "surface_sweep": "6d7f18c12b2e4c1dbe3632fe08239687f6f027b29b6dddbf8c8e2d9151c7baf3",
-  "surface_thicken": "676eb73a99d708214e8951ebe2c4d88d60de2d752c725d8106d12fbd812e461a",
+  "surface_thicken": "35aaa8e4fdbcd220a3a05165d5230a7ce576fbf5a6a5772d27162ab61bb71538",
   "surface_trim": "ae269721b386bd1264184b9838df3240b5b6ba02b99c9993384ef21200fb7398",
   "surface_unstitch": "bd8302fe95a89eb6f9bbf35ef0ee98c8a2186e160cff3d091f8cf2a0a75d4473",
   "surface_untrim": "24de5d558519e0629280d11919ba5661c92ccdccdce03f8f3d83f2d7867c2173",
   "svg": "7da77d53c84db18ce95737ad633c105d1009444b3192a5e0aae76873cfc9cc12",
   "sweep": "6d7f18c12b2e4c1dbe3632fe08239687f6f027b29b6dddbf8c8e2d9151c7baf3",
   "text": "9d31b72b16644681c8a86ac257511847ad69ce4351cf6960442222e94b168c4a",
-  "thicken": "676eb73a99d708214e8951ebe2c4d88d60de2d752c725d8106d12fbd812e461a",
+  "thicken": "35aaa8e4fdbcd220a3a05165d5230a7ce576fbf5a6a5772d27162ab61bb71538",
   "thread": "158728c3dcf6623bb1584d162398bb12c28d18770e0d47f5e6328355ce31b37c",
   "torus": "5ae13fc213582e0844118b910a3a26efd9e4b177d21500363fbae230803cb4fd",
   "trace": "5f2ecc61d4591d3c3b0ecccd35296b8613fce7beb2ae214fb906160c31d89187",
@@ -284,7 +297,7 @@
   "update": "c675e16df4c78589a00be4a34f98627500681672ee8a668e929aec50982da3cc",
   "warning": "1ac4f0ccfac2c01f6f66cb42188f9ae053c4aef9c5bbd249f1fb09611eb4d825",
   "web": "be5cd95bebcd0ebe257f9eb862112124429b381ef4a2f0849938fac7c9ccc619",
-  "ws_animate": "d36a0834ad989a6e16e2b0db493ad8867c590caedf0442c51eff19e934c887f8",
+  "ws_animate": "f34f187850789cc4f141b1ace114082be04edec8e7771d6730fec1cef19c7f64",
   "ws_design": "7b1dd678a2d018892b965a78932c047bbfff6b4439d7bd9fe85c09a995f97581",
   "ws_drawing": "61e99c7179f3448a31b8c76392334352ec3d5e39b0b92fe5244940146d0986cb",
   "ws_render": "1bfe474d1742623ad2142129e4d6a40015e674813eb1db401d2e88e55b1f2a03",
@@ -292,6 +305,9 @@
   "zoom": "89c121fa85df034d70bd9f06e20cbd54d163691d4df03b13a9ac5372e951aeda"
  },
  "notes": {
-  "pattern_flip": "This feels sparse. Improve the composition"
+  "construction": "Fix the bottom dot's position",
+  "infinite": "Make the infinity symbol use the 'Line art' colour",
+  "pattern_flip": "This feels sparse. Improve the composition",
+  "sheet_rules": "Make the top line also blue"
  }
 }

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

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Connected agent</title>
+  <path d="M25 7L25 24M39 7L39 24" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M16 25L48 25L48 31Q48 41 38 41L36 41L36 47L28 47L28 41L26 41Q16 41 16 31Z" fill="currentColor" stroke="currentColor" stroke-width="3" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 47L32 57" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Assistant</title>
+  <defs>
+    <mask id="assistant-sparkle" maskUnits="userSpaceOnUse" x="-32" y="-32" width="128" height="128">
+      <path d="M-32 -32L96 -32L96 96L-32 96Z" fill="white"/>
+      <path d="M28 18.5Q30.3 27.7 39.5 30Q30.3 32.3 28 41.5Q25.7 32.3 16.5 30Q25.7 27.7 28 18.5Z" fill="black"/>
+      <path d="M43.5 15.5Q44.6 19.9 49 21Q44.6 22.1 43.5 26.5Q42.4 22.1 38 21Q42.4 19.9 43.5 15.5Z" fill="black"/>
+    </mask>
+  </defs>
+  <path d="M15 11.5L49 11.5Q55 11.5 55 17.5L55 40.5Q55 46.5 49 46.5L30 46.5L18 55L18 46.5L15 46.5Q9 46.5 9 40.5L9 17.5Q9 11.5 15 11.5Z" fill="currentColor" stroke="currentColor" stroke-width="3" stroke-linejoin="round" stroke-linecap="round" mask="url(#assistant-sparkle)"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Chevron right</title>
+  <path d="M24 16L40 32L24 48" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Close</title>
+  <path d="M19 19L45 45M45 19L19 45" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Disclosure closed</title>
+  <path d="M24 17L46 32L24 47Z" fill="currentColor" stroke="currentColor" stroke-width="6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Disclosure open</title>
+  <path d="M17 24L47 24L32 46Z" fill="currentColor" stroke="currentColor" stroke-width="6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Export Tray</title>
+  <path d="M32 38L32 10M20 22L32 10L44 22M10 43L10 54L54 54L54 43" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Eye</title>
+  <path d="M6 32C16 18 48 18 58 32C48 46 16 46 6 32Z" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M24 32A8 8 0 1 0 40 32A8 8 0 1 0 24 32Z" fill="currentColor"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Import Tray</title>
+  <path d="M32 10L32 38M20 26L32 38L44 26M10 43L10 54L54 54L54 43" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Plus</title>
+  <path d="M32 14L32 50M14 32L50 32" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Send message</title>
+  <path d="M32 51L32 13M17 28L32 13L47 28" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Keyboard shortcuts</title>
+  <path d="M13 16L51 16A5 5 0 0 1 56 21L56 43A5 5 0 0 1 51 48L13 48A5 5 0 0 1 8 43L8 21A5 5 0 0 1 13 16Z" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="20" cy="27" r="2.8" fill="currentColor"/>
+  <circle cx="32" cy="27" r="2.8" fill="currentColor"/>
+  <circle cx="44" cy="27" r="2.8" fill="currentColor"/>
+  <path d="M20 39L44 39" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Graphics display</title>
+  <path d="M13 10L51 10A5 5 0 0 1 56 15L56 37A5 5 0 0 1 51 42L13 42A5 5 0 0 1 8 37L8 15A5 5 0 0 1 13 10ZM32 42L32 54M24 54L40 54" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Mouse navigation</title>
+  <path d="M32 8A13 13 0 0 1 45 21L45 43A13 13 0 0 1 19 43L19 21A13 13 0 0 1 32 8ZM32 8L32 24" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Interface palette</title>
+  <path d="M32 8C18.75 8 8 18.75 8 32C8 45.25 18.75 56 32 56C37 56 39 52.5 36.5 49C34 45.5 36 42 40 42L45 42C51.1 42 56 37.1 56 31C56 19 45 8 32 8Z" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="21" cy="29" r="2.8" fill="currentColor"/>
+  <circle cx="29" cy="20" r="2.8" fill="currentColor"/>
+  <circle cx="41" cy="23" r="2.8" fill="currentColor"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Plugins</title>
+  <path d="M24 8L24 21M40 8L40 21M16 21L48 21L48 29A16 16 0 0 1 16 29L16 21ZM32 45L32 56" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Approval required</title>
+  <path d="M32 9L51 16L51 31C51 43 43 51 32 56C21 51 13 43 13 31L13 16Z" fill="none" stroke="currentColor" stroke-width="5.6" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Stop response</title>
+  <path d="M20 17L44 17A3 3 0 0 1 47 20L47 44A3 3 0 0 1 44 47L20 47A3 3 0 0 1 17 44L17 20A3 3 0 0 1 20 17Z" fill="currentColor"/>
+</svg>

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

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <title>Suppress</title>
+  <defs>
+    <mask id="suppress-slash" maskUnits="userSpaceOnUse" x="-32" y="-32" width="128" height="128">
+      <path d="M-32 -32L96 -32L96 96L-32 96Z" fill="white"/>
+      <path d="M13 51L51 13" fill="none" stroke="black" stroke-width="13" stroke-linejoin="round" stroke-linecap="round"/>
+    </mask>
+  </defs>
+  <path d="M6 32C16 18 48 18 58 32C48 46 16 46 6 32Z" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round" mask="url(#suppress-slash)"/>
+  <path d="M24 32A8 8 0 1 0 40 32A8 8 0 1 0 24 32Z" fill="currentColor" mask="url(#suppress-slash)"/>
+  <path d="M13 51L51 13" fill="none" stroke="currentColor" stroke-width="5" stroke-linejoin="round" stroke-linecap="round"/>
+</svg>

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

@@ -4,5 +4,5 @@
   <path d="M12 52L52 52" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M12 8L16.5 17L7.5 17Z" fill="#236ead"/>
   <path d="M56 52L47 56.5L47 47.5Z" fill="#236ead"/>
-  <circle cx="12" cy="52" r="4" fill="#34465b"/>
+  <circle cx="12" cy="52" r="4" fill="currentColor"/>
 </svg>

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

@@ -6,5 +6,5 @@
   <path d="M32 6L32 33" fill="none" stroke="#ffffff" stroke-width="6.45" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M32 6L32 33" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M32 27.6L36.68 30.3L36.68 35.7" fill="none" stroke="#ffffff" stroke-width="4.05" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M32 27.6L36.68 30.3L36.68 35.7" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 27.6L36.68 30.3L36.68 35.7" fill="none" stroke="currentColor" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -3,5 +3,5 @@
   <path d="M7 32L23 32M41 32L57 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <circle cx="23" cy="32" r="3.07" fill="#236ead"/>
   <circle cx="41" cy="32" r="3.07" fill="#236ead"/>
-  <path d="M32 22L32 42" fill="none" stroke="#34465b" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 22L32 42" fill="none" stroke="currentColor" stroke-width="2.55" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Coincident</title>
-  <path d="M10.4 42.32L32 27.92" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M32 27.92L53.6 37.52" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M10.4 42.32L32 27.92" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 27.92L53.6 37.52" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M25.76 27.92A6.24 6.24 0 1 0 38.24 27.92A6.24 6.24 0 1 0 25.76 27.92Z" fill="#b9ddf8" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -2,5 +2,5 @@
   <title>Fixed</title>
   <path d="M22.4 22.4A9.6 9.6 0 1 0 41.6 22.4A9.6 9.6 0 1 0 22.4 22.4Z" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M32 32L32 51.2" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M24.8 51.2L39.2 51.2" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M24.8 51.2L39.2 51.2" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Midpoint</title>
-  <path d="M10.4 39.2L53.6 24.8" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M10.4 39.2L53.6 24.8" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <circle cx="32" cy="32" r="7.3" fill="#ffffff"/>
   <circle cx="32" cy="32" r="5.6" fill="#236ead"/>
 </svg>

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

@@ -2,5 +2,5 @@
   <title>Perpendicular</title>
   <path d="M12.8 48.8L51.2 48.8" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M32 48.8L32 15.2" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M32 39.2L41.6 39.2L41.6 48.8" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M32 39.2L41.6 39.2L41.6 48.8" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Regular polygon</title>
   <path d="M52.4 32L42.2 49.67L21.8 49.67L11.6 32L21.8 14.33L42.2 14.33Z" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M32 32L52.4 32" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <circle cx="32" cy="32" r="3.4" fill="#34465b"/>
+  <path d="M32 32L52.4 32" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="32" cy="32" r="3.4" fill="currentColor"/>
 </svg>

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

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Curvature</title>
-  <path d="M10.4 32L12.2 27.65L14 23.6L15.8 20.12L17.6 17.45L19.4 15.77L21.2 15.2L23 15.77L24.8 17.45L26.6 20.12L28.4 23.6L30.2 27.65L32 32" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M10.4 32L12.2 27.65L14 23.6L15.8 20.12L17.6 17.45L19.4 15.77L21.2 15.2L23 15.77L24.8 17.45L26.6 20.12L28.4 23.6L30.2 27.65L32 32" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M32 32L33.8 36.35L35.6 40.4L37.4 43.88L39.2 46.55L41 48.23L42.8 48.8L44.6 48.23L46.4 46.55L48.2 43.88L50 40.4L51.8 36.35L53.6 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <circle cx="32" cy="32" r="3.4" fill="#34465b"/>
+  <circle cx="32" cy="32" r="3.4" fill="currentColor"/>
 </svg>

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

@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Tangent</title>
-  <path d="M17.6 32A14.4 14.4 0 1 0 46.4 32A14.4 14.4 0 1 0 17.6 32Z" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M17.6 32A14.4 14.4 0 1 0 46.4 32A14.4 14.4 0 1 0 17.6 32Z" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M10.4 17.6L53.6 17.6" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
 </svg>

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

@@ -1,9 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Centerline</title>
-  <path d="M10 32L23 32M41 32L54 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M11 53L23.41 40.59M40.59 23.41L53 11" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <circle cx="32" cy="32" r="3.6" fill="#236ead"/>
-  <circle cx="10" cy="32" r="5.8" fill="#ffffff"/>
-  <circle cx="10" 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"/>
+  <circle cx="11" cy="53" r="5.8" fill="#ffffff"/>
+  <circle cx="11" cy="53" r="3.4" fill="#236ead"/>
+  <circle cx="53" cy="11" r="5.8" fill="#ffffff"/>
+  <circle cx="53" cy="11" r="3.4" fill="#236ead"/>
 </svg>

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

@@ -1,7 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Construction</title>
-  <path d="M13 51L19 45M25 39L31 33M37 27L43 21M49 15L51 13" fill="none" stroke="#6f879c" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <path d="M10 54L12 52" fill="none" stroke="#6f879c" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
-  <circle cx="12" cy="52" r="3.07" fill="#6f879c"/>
-  <circle cx="52" cy="12" r="3.07" fill="#6f879c"/>
+  <path d="M17 47L23 41M29 35L35 29M41 23L47 17" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <circle cx="11" cy="53" r="3.07" fill="#236ead"/>
+  <circle cx="53" cy="11" r="3.07" fill="#236ead"/>
 </svg>

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

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
   <title>Dimension</title>
-  <path d="M10 12L10 52M54 12L54 52" fill="none" stroke="#34465b" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
+  <path d="M10 12L10 52M54 12L54 52" fill="none" stroke="currentColor" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M19 32L45 32" fill="none" stroke="#236ead" stroke-width="4.25" stroke-linejoin="round" stroke-linecap="round"/>
   <path d="M13 32L24 26L24 38Z" fill="#236ead"/>
   <path d="M51 32L40 38L40 26Z" fill="#236ead"/>