diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 000000000..2408084cf
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,6 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+reviews:
+  auto_review:
+    # Dependabot bumps are checked by CI; skip CodeRabbit reviews on them.
+    ignore_usernames:
+      - "dependabot[bot]"
diff --git a/.config/nextest.toml b/.config/nextest.toml
new file mode 100644
index 000000000..2a4cd2cb9
--- /dev/null
+++ b/.config/nextest.toml
@@ -0,0 +1,3 @@
+# Minimum cargo-nextest for this repository: GHSA-vc25-qg58-w57c is fixed in 0.9.150 and CI
+# installs exactly that version, so an older nextest refuses to run (exit 92 REQUIRED_VERSION_NOT_MET).
+nextest-version = "0.9.150"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..2c4b8cb1a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,30 @@
+version: 2
+updates:
+  # Maintain Rust / Cargo dependencies
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "06:00"
+      timezone: "America/New_York"
+    # Consolidate updates into a single PR rather than one PR per crate
+    groups:
+      cargo-dependencies:
+        patterns:
+          - "*"
+    commit-message:
+      prefix: "chore(deps)"
+
+  # Maintain GitHub Actions workflows
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "06:00"
+      timezone: "America/New_York"
+    groups:
+      actions:
+        patterns:
+          - "*"
+    commit-message:
+      prefix: "ci(deps)"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..2095acad7
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,27 @@
+name: CI
+
+# Quality gates for every push to main and every pull request (`cargo xtask ci`), through the
+# suite's shared gate workflow in craft-common-actions.
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+# A newer push to a PR branch cancels its older run; every push to main runs to the end.
+concurrency:
+  group: ci-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  gate:
+    # Tracks @main so suite-wide CI fixes reach every app without a PR in each repository.
+    uses: storytold/craft-common-actions/.github/workflows/gate.yml@main
+    with:
+      packages: >-
+        pkg-config libxkbcommon-dev libwayland-dev libx11-dev libxcb1-dev libxcursor-dev
+        libxrandr-dev libxi-dev libfontconfig1-dev libfreetype-dev mesa-vulkan-drivers
+        libgl1-mesa-dev libasound2-dev
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index f8ac8a300..8967f9431 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -2,12 +2,10 @@
 # (GitHub has no FreeBSD runners). GPU tests skip themselves when the VM has no adapter.
 name: FreeBSD
 
-# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every push
-# or dependency change: a drifted dependency still shows up within a day, and always before a
-# release ships. PRs that change the FreeBSD packaging itself still run it.
+# The VM build is slow, so it runs nightly on main and on pushes to `release`, not on every pull
+# request: a drifted dependency still shows up within a day, and always before a release ships.
+# PRs that change the FreeBSD workflow or packaging itself still run it.
 on:
-  schedule:
-    - cron: "47 2 * * *"
   push:
     branches: [release]
   pull_request:
@@ -15,6 +13,8 @@ on:
       - .github/workflows/freebsd.yml
       - packaging/freebsd/**
       - packaging/env.sh
+  schedule:
+    - cron: "47 2 * * *"
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/packaging-lint.yml b/.github/workflows/packaging-lint.yml
index 1353830f8..b903f82ea 100644
--- a/.github/workflows/packaging-lint.yml
+++ b/.github/workflows/packaging-lint.yml
@@ -22,3 +22,27 @@ jobs:
   lint:
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/packaging-lint.yml@main
+
+  windows-install-policy:
+    timeout-minutes: 10
+    name: Windows installation policy (no app build)
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Install the pinned packaging toolchain
+        shell: pwsh
+        run: |
+          $tools = Join-Path $env:RUNNER_TEMP 'craft-install-policy-wix'
+          dotnet tool install --tool-path $tools wix --version 5.0.2
+          if ($LASTEXITCODE -ne 0) { throw 'WiX installation failed.' }
+          $tools >> $env:GITHUB_PATH
+          $policy = Get-Content -Raw -LiteralPath packaging/windows/install-policy.json | ConvertFrom-Json
+          foreach ($extension in @($policy.extensions)) {
+            & (Join-Path $tools 'wix.exe') extension add -g "WixToolset.$extension.wixext/5.0.2"
+            if ($LASTEXITCODE -ne 0) { throw "WiX extension $extension installation failed." }
+          }
+      - name: Build and check non-executable installer fixtures
+        shell: pwsh
+        run: ./packaging/windows/test-install-policy.ps1 -OutputDirectory (Join-Path $env:RUNNER_TEMP 'craft-install-policy-tests')
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 808e1628d..3cfbdc8b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,15 +10,14 @@ on:
         type: string
         default: ""
 
-permissions:
-  contents: write
-
 concurrency:
   group: release-${{ github.ref }}
   cancel-in-progress: false
 
 jobs:
   release:
+    permissions:
+      contents: write
     # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
     uses: storytold/craft-common-actions/.github/workflows/release.yml@main
     with:
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 000000000..8f1aa5ad5
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,24 @@
+name: SonarCloud
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: sonarcloud-${{ github.ref }}
+  # A push to main is the run that publishes coverage; superseded runs there would never finish.
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  sonarcloud:
+    # Track shared CI improvements on main.
+    uses: storytold/craft-common-actions/.github/workflows/sonarcloud.yml@main
+    with:
+      timeout-minutes: 120
+      fonts-ref: b076417b5880bd4154bd22f00695b1d28c6bea83
+    secrets: inherit
diff --git a/.github/workflows/windows-arm64.yml b/.github/workflows/windows-arm64.yml
index a074e6dbe..4499e3fdc 100644
--- a/.github/workflows/windows-arm64.yml
+++ b/.github/workflows/windows-arm64.yml
@@ -28,8 +28,10 @@ permissions:
 
 jobs:
   windows-arm64:
-    # Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.
-    uses: storytold/craft-common-actions/.github/workflows/windows-arm64.yml@main
+    # Immutable supporting workflow revision until the new install contract lands upstream.
+    uses: storytold/craft-common-actions/.github/workflows/windows-arm64.yml@8bb4e5ab95443171104ad88113fe1ef9b0e5ce3f
     with:
       app-name: effectcraft
       app-dir: EffectCraft
+      install-relative-path: Programs/ArtCraft/EffectCraft
+      install-scope: perUser
diff --git a/AGENTS.md b/AGENTS.md
index aad29c94a..24abee6a1 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -105,6 +105,8 @@ reproduce an image (for example, point lists traced from someone else's icon).
 See `CLAUDE.md`: pure Rust, dependency layering (`cargo xtask layers`), exact `Tick` time, everything is
 a command, everything is agent-drivable, and the quality gates (`cargo xtask ci`) before every commit.
 
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
+
 Shared real-file test corpora (Photoshop-authored PSDs, etc.) live in
 [`storytold/photocraft-corpus`](https://github.com/storytold/photocraft-corpus), explained in
 [craftrules `standards/test-corpora.md`](https://github.com/storytold/craftrules/blob/main/standards/test-corpora.md).
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md
index be99cdce1..77a9cc432 100644
--- a/ATTRIBUTION.md
+++ b/ATTRIBUTION.md
@@ -1,9 +1,28 @@
 # Attribution
 
-Every non-code asset in EffectCraft, with its author, source and licence. Each file listed here also has
+Every non-code asset in EffectCraft, with its author, source and licence. Each repository file listed here also has
 a `<file>.attribution` sidecar with full details. The rules are in [AGENTS.md](AGENTS.md) §1: no Adobe
 iconography, images or other Adobe assets; open licences only; every asset attributed.
 `cargo xtask assets` checks that this index and the sidecars cover every asset in the repository.
+The complete licence texts and copyright notices for the bundled fonts, including the fonts embedded
+by the pinned egui dependency, are reproduced in [`NOTICE`](NOTICE), which every package ships; the
+`assets/fonts/OFL-*.txt` files are the upstream copies kept beside the fonts.
+
+## Bundled dependency fonts
+
+These fonts are embedded by the pinned egui dependency (epaint_default_fonts 0.37 at
+`6d518fc799681571963842f95b55a6b68431b15a`); no font file is added to this repository.
+egui-icons is always embedded, `default_fonts` adds Ubuntu Light and Hack, and
+`monochrome_emoji_fonts` adds Noto Emoji and emoji-icon-font. The complete copyright notices
+and licence texts are in [`NOTICE`](NOTICE).
+
+| Asset | Author | Source | Licence |
+|---|---|---|---|
+| `epaint_default_fonts/fonts/egui-icons.ttf` | John Slegers (emoji-icon-font) | https://github.com/storytold/egui/blob/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts/egui-icons.txt; original https://github.com/jslegers/emoji-icon-font | MIT (complete copyright and permission text in `NOTICE`) |
+| `epaint_default_fonts/fonts/emoji-icon-font.ttf` | John Slegers | https://github.com/storytold/egui/blob/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts/emoji-icon-font-mit-license.txt; original https://github.com/jslegers/emoji-icon-font | MIT (complete copyright and permission text in `NOTICE`) |
+| `epaint_default_fonts/fonts/NotoEmoji-Regular.ttf` | Google Inc. (The Noto Project Authors) | https://github.com/storytold/egui/blob/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts/OFL.txt | OFL-1.1 (complete text in `NOTICE`) |
+| `epaint_default_fonts/fonts/Ubuntu-Light.ttf` | Canonical Ltd. and Dalton Maag | https://github.com/storytold/egui/blob/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts/UFL.txt | Ubuntu Font Licence 1.0 (complete text in `NOTICE`) |
+| `epaint_default_fonts/fonts/Hack-Regular.ttf` | Source Foundry Authors; Bitstream Inc. | https://github.com/storytold/egui/blob/6d518fc799681571963842f95b55a6b68431b15a/crates/epaint_default_fonts/fonts/Hack-Regular.txt; original https://github.com/source-foundry/Hack | MIT AND Bitstream-Vera (complete texts in `NOTICE`) |
 
 ## Asset files
 
@@ -15,6 +34,7 @@ iconography, images or other Adobe assets; open licences only; every asset attri
 | `assets/fonts/Inter-Bold.ttf` | The Inter Project Authors | https://github.com/rsms/inter | OFL-1.1 (`assets/fonts/OFL-Inter.txt`) |
 | `assets/fonts/Inter-Italic.ttf` | The Inter Project Authors | https://github.com/rsms/inter | OFL-1.1 (`assets/fonts/OFL-Inter.txt`) |
 | `assets/fonts/NotoSerif-Regular.ttf` | The Noto Project Authors | https://github.com/notofonts/latin-greek-cyrillic | OFL-1.1 (`assets/fonts/OFL-NotoSerif.txt`) |
+| `assets/fonts/NotoSansSymbols2-Regular.ttf` | The Noto Project Authors | https://github.com/notofonts/symbols | OFL-1.1 (`assets/fonts/OFL-NotoSansSymbols2.txt`) |
 | `assets/fonts/JetBrainsMono-Regular.ttf` | The JetBrains Mono Project Authors | https://github.com/JetBrains/JetBrainsMono | OFL-1.1 (`assets/fonts/OFL-JetBrainsMono.txt`) |
 | `apps/effectcraft-web/web/favicon.svg` | EffectCraft contributors | Original work: web app icon, a copy of `assets/app-icon/effectcraft-small.svg` (the unicorn app icon) | MIT OR Apache-2.0 (`assets/app-icon/LICENSE.txt`) |
 | `packaging/macos/dmg/background.svg` | @XusBadia | Original work: macOS DMG Finder window background, derived from the EffectCraft app icon (`assets/app-icon/effectcraft.svg`); rendered to a TIFF by `packaging/macos/package.sh` at package time | MIT OR Apache-2.0 (`LICENSE-MIT`, `LICENSE-APACHE`) |
diff --git a/CLAUDE.md b/CLAUDE.md
index a7c47fe3f..21f2df36b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -16,11 +16,13 @@ EffectCraft is a clean-room, open-source, pure-Rust motion graphics and visual e
 - **Pure Rust.** Media codecs come from FilmCraft crates (git deps behind `crates/media`, see `plan/adr/0001`).
 - **Layering** (`cargo xtask layers`): nothing below L5 depends on egui/eframe/winit/rfd/cpal; L0–L4 build for wasm32.
 - **Exact time:** `effectcraft_time::Tick` (254 016 000 000/s). Keyframe times are **layer time**.
+- **Time goes through `chrono`** (workspace dependency). Never hand-roll UTC/calendar conversion (days-to-date algorithms, leap-year math); a crate owns only its output format string. The one exception is range extension: past the years chrono can represent, shift the date by whole 400-year Gregorian cycles (146,097 days, after which the calendar repeats), let chrono compute the month and day, and add the cycles back to the year (splitting seconds into hours, minutes and seconds is plain arithmetic).
 - **Property tree:** everything animatable is a `Property` in the layer's `PropGroup` tree, addressed by paths (`transform/position`, `effects/#1/blurriness`, `@uid`).
 - **Everything is a command** (`crates/engine`): id, label, menu path, shortcut, params, enabled(), run(). UI, CLI, control channel and MCP dispatch by id.
 - **Everything is agent-drivable:** every interactive widget registers an automation id; UI state is serde.
 - **Community links** (Help menu, About, header Discord button): https://discord.gg/artcraft, https://getartcraft.com, https://getartcraft.com/apps/effectcraft, https://github.com/storytold/effectcraft.
 - **Quality gates** before every commit: `cargo xtask ci` (fmt, clippy -D warnings, tests, layers, assets, wasm).
+- **New workspace crates** must include `[lints] workspace = true` in `Cargo.toml` to inherit `[workspace.lints]`. Production crate roots must declare the required crate-level lint attributes before modules or other crate items; crate-level `//!` documentation may precede them.
 - **Commits:** one task id per commit (`M6.3: trim paths`). Only green states.
 
 ## Running and looking at the app
diff --git a/Cargo.lock b/Cargo.lock
index 9db588720..52812471c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,66 +4,60 @@ version = 4
 
 [[package]]
 name = "accesskit"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
+checksum = "ad442f58ee04714aaa0ba0a2768c1ea1935b29507bb22ddece8cbbc76db02932"
 dependencies = [
  "uuid",
 ]
 
 [[package]]
 name = "accesskit_atspi_common"
-version = "0.18.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
+checksum = "52c182f9c282ac9c5638d876d551d15e5f7d397ec263349a0c6a2b61595dd5e4"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.36.0",
+ "accesskit_consumer",
  "atspi-common",
- "phf 0.13.1",
+ "phf",
  "serde",
  "zvariant",
 ]
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.35.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53cf47daed85312e763fbf85ceca136e0d7abc68e0a7e12abe11f48172bc3b10"
+checksum = "8a45e2bb300bea6d5f33a82c3e051c3ddc6f41c209750f68a0acbe991a284344"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
-name = "accesskit_consumer"
-version = "0.36.0"
+name = "accesskit_ios"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
+checksum = "28e539d64b27fd4c14de8f78ada8f7c944c092f52f7e49fb63316507a57f6937"
 dependencies = [
  "accesskit",
- "hashbrown 0.16.1",
-]
-
-[[package]]
-name = "accesskit_consumer"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
-dependencies = [
- "accesskit",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-ui-kit 0.2.2",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.26.3"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
+checksum = "5701624bf6a11efb6d4c8e922bf44126ed96250e5faa9a7a0468c979635839a4"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.38.0",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
@@ -71,9 +65,9 @@ dependencies = [
 
 [[package]]
 name = "accesskit_unix"
-version = "0.21.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
+checksum = "202f24df034a7476d07b7f74284de84f6d62aabd858dbe7ee9cad3b7ad6f8f9d"
 dependencies = [
  "accesskit",
  "accesskit_atspi_common",
@@ -89,13 +83,13 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.32.1"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff7009f1a532e917d66970a1e80c965140c6cfbbabbdde3d64e5431e6c78e21"
+checksum = "ce63f35d6bdcf59f26b76b3379063f738e6412cef46999cc772d46aa3de35adb"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
- "hashbrown 0.16.1",
+ "accesskit_consumer",
+ "hashbrown 0.17.1",
  "static_assertions",
  "windows 0.62.2",
  "windows-core 0.62.2",
@@ -103,11 +97,12 @@ dependencies = [
 
 [[package]]
 name = "accesskit_winit"
-version = "0.32.2"
+version = "0.34.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe9a94394896352cc4660ca2288bd4ef883d83238853c038b44070c8f134313"
+checksum = "ee96dd150375c05912d8a473f98c2fb155fb3234fac88292d396548a2460fa77"
 dependencies = [
  "accesskit",
+ "accesskit_ios",
  "accesskit_macos",
  "accesskit_unix",
  "accesskit_windows",
@@ -214,14 +209,15 @@ dependencies = [
  "clipboard-win",
  "image",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
+ "wl-clipboard-rs",
  "x11rb",
 ]
 
@@ -436,13 +432,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
-name = "bit-set"
-version = "0.8.0"
+name = "base64"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec 0.8.0",
-]
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "bit-set"
@@ -454,10 +447,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "bit-vec"
-version = "0.8.0"
+name = "bit-set"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c"
+dependencies = [
+ "bit-vec 0.10.1",
+]
 
 [[package]]
 name = "bit-vec"
@@ -465,6 +461,16 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
 
+[[package]]
+name = "bit-vec"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269"
+dependencies = [
+ "borsh",
+ "serde",
+]
+
 [[package]]
 name = "bit_field"
 version = "0.10.3"
@@ -483,6 +489,15 @@ version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -498,7 +513,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -567,7 +582,7 @@ dependencies = [
  "oneshot",
  "pastey",
  "portable-atomic",
- "rand 0.10.3",
+ "rand",
  "regress",
  "rustc-hash 2.1.3",
  "ryu-js",
@@ -607,7 +622,7 @@ dependencies = [
  "hashbrown 0.17.1",
  "indexmap",
  "once_cell",
- "phf 0.14.0",
+ "phf",
  "rustc-hash 2.1.3",
  "static_assertions",
 ]
@@ -658,6 +673,30 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "borsh-derive",
+ "bytes",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -799,8 +838,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
 dependencies = [
  "cfg-if",
- "cpufeatures",
- "rand_core 0.10.1",
+ "cpufeatures 0.3.1",
+ "rand_core",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "num-traits",
 ]
 
 [[package]]
@@ -812,6 +860,15 @@ dependencies = [
  "error-code",
 ]
 
+[[package]]
+name = "cobs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.21",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.13.1"
@@ -867,6 +924,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -880,7 +947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -893,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -959,6 +1026,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.3.1"
@@ -971,24 +1047,100 @@ dependencies = [
 [[package]]
 name = "craft-docpath"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09a67fb9a3fbd17ffe63#82a24b006eefa036b43c09a67fb9a3fbd17ffe63"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+
+[[package]]
+name = "craft-fonts-build"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+
+[[package]]
+name = "craft-i18n"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "fixed_decimal",
+ "icu_decimal",
+ "icu_locale_core",
+ "icu_locale_fallback",
+ "icu_normalizer",
+ "icu_plurals",
+ "icu_properties",
+ "icu_provider",
+ "icu_provider_adapters",
+ "icu_provider_blob",
+ "log",
+ "objc2-foundation 0.3.2",
+ "sys-locale",
+ "unicode-bidi",
+ "windows-registry",
+ "writeable",
+]
 
 [[package]]
 name = "craft-pdf"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d#ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "hayro-syntax",
  "thiserror 2.0.21",
 ]
 
+[[package]]
+name = "craft-quit"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "dispatch2",
+ "egui",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+]
+
 [[package]]
 name = "craft-ui"
 version = "0.1.0"
-source = "git+https://github.com/storytold/craft-libs?rev=5c874d51eeb3de70e735c8ce87a59a7dedd47675#5c874d51eeb3de70e735c8ce87a59a7dedd47675"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
+ "craft-fonts-build",
+ "craft-i18n",
  "egui",
+ "epaint",
+ "js-sys",
+ "log",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
  "serde",
+ "skrifa",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "craft-update"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
+dependencies = [
+ "chrono",
+ "dunce",
+ "egui",
+ "flate2",
+ "getrandom 0.3.4",
+ "log",
+ "plist",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tar",
+ "tempfile",
+ "ureq",
+ "verifysign",
+ "winreg",
+ "winsafe",
+ "zip",
 ]
 
 [[package]]
@@ -1040,6 +1192,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "cursor-icon"
 version = "1.2.0"
@@ -1072,6 +1234,16 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1087,7 +1259,7 @@ dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -1131,6 +1303,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "dynify"
 version = "0.1.2"
@@ -1153,9 +1331,8 @@ dependencies = [
 
 [[package]]
 name = "ecolor"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0656a7530b9e2841ee7a5f983965bdd9840c32f4012f759cfd44b912cced6b34"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "emath",
@@ -1163,9 +1340,10 @@ dependencies = [
 
 [[package]]
 name = "effectcraft"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "cpal",
+ "craft-update",
  "effectcraft-engine",
  "effectcraft-host",
  "effectcraft-ui-egui",
@@ -1174,10 +1352,10 @@ dependencies = [
  "fmv-macos-events",
  "log",
  "muda",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
- "pollster 0.4.0",
+ "pollster 1.0.1",
  "rfd",
  "serde",
  "serde_json",
@@ -1188,7 +1366,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-automation"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-engine",
  "effectcraft-host",
@@ -1200,14 +1378,14 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-av1enc"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "filmcraft-av1",
 ]
 
 [[package]]
 name = "effectcraft-cli"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "cpu-time",
  "effectcraft-automation",
@@ -1223,7 +1401,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-color"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "proptest",
  "serde",
@@ -1231,8 +1409,9 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-effects"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
+ "chrono",
  "effectcraft-color",
  "effectcraft-geom",
  "effectcraft-keyframe",
@@ -1248,8 +1427,9 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-engine"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
+ "chrono",
  "craft-docpath",
  "effectcraft-color",
  "effectcraft-effects",
@@ -1282,7 +1462,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-export"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-av1enc",
  "effectcraft-color",
@@ -1312,7 +1492,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-expr"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "boa_engine",
  "effectcraft-color",
@@ -1329,7 +1509,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-geom"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "proptest",
  "serde",
@@ -1337,7 +1517,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-gpu"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "bytemuck",
  "effectcraft-color",
@@ -1351,7 +1531,7 @@ dependencies = [
  "effectcraft-time",
  "js-sys",
  "log",
- "pollster 0.4.0",
+ "pollster 1.0.1",
  "wasm-bindgen",
  "web-time",
  "wgpu",
@@ -1359,14 +1539,14 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-hevcenc"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "filmcraft-hevc",
 ]
 
 [[package]]
 name = "effectcraft-host"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-engine",
  "effectcraft-export",
@@ -1391,7 +1571,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-interchange"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-color",
  "effectcraft-keyframe",
@@ -1410,7 +1590,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-keyframe"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-color",
  "effectcraft-geom",
@@ -1422,7 +1602,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-lottie"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "craft-docpath",
  "effectcraft-color",
@@ -1440,7 +1620,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-media"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "craft-docpath",
  "effectcraft-model",
@@ -1469,11 +1649,11 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-model"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-geom",
  "image",
- "miniz_oxide 0.8.9",
+ "miniz_oxide 0.9.1",
  "serde",
  "serde_json",
  "thiserror 2.0.21",
@@ -1481,14 +1661,14 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-opusenc"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "filmcraft-opus",
 ]
 
 [[package]]
 name = "effectcraft-path"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-geom",
  "effectcraft-keyframe",
@@ -1500,7 +1680,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-pdf"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "craft-pdf",
  "effectcraft-raster",
@@ -1508,7 +1688,7 @@ dependencies = [
  "effectcraft-text",
  "image",
  "kurbo",
- "miniz_oxide 0.8.9",
+ "miniz_oxide 0.9.1",
  "skrifa",
  "wasm-bindgen-test",
  "zune-jpeg",
@@ -1516,7 +1696,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-plugin"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-effects",
  "effectcraft-keyframe",
@@ -1528,7 +1708,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-project"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-color",
  "effectcraft-geom",
@@ -1541,14 +1721,14 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-psd"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
- "miniz_oxide 0.8.9",
+ "miniz_oxide 0.9.1",
 ]
 
 [[package]]
 name = "effectcraft-raster"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-color",
  "effectcraft-geom",
@@ -1557,7 +1737,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-render"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-color",
  "effectcraft-effects",
@@ -1579,7 +1759,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-script"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "boa_engine",
  "effectcraft-engine",
@@ -1591,21 +1771,22 @@ dependencies = [
  "effectcraft-render",
  "effectcraft-time",
  "serde_json",
+ "socket2",
  "web-time",
 ]
 
 [[package]]
 name = "effectcraft-segment"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
- "miniz_oxide 0.8.9",
+ "miniz_oxide 0.9.1",
  "ndarray",
  "rayon",
 ]
 
 [[package]]
 name = "effectcraft-svg"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-geom",
  "effectcraft-path",
@@ -1617,7 +1798,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-text"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-keyframe",
  "harfrust",
@@ -1629,7 +1810,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-time"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "proptest",
  "serde",
@@ -1637,7 +1818,7 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-track"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-raster",
  "effectcraft-segment",
@@ -1649,9 +1830,12 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-ui-egui"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
+ "chrono",
+ "craft-quit",
  "craft-ui",
+ "craft-update",
  "effectcraft-color",
  "effectcraft-engine",
  "effectcraft-geom",
@@ -1670,7 +1854,7 @@ dependencies = [
  "image",
  "kurbo",
  "log",
- "pollster 0.4.0",
+ "pollster 1.0.1",
  "rayon",
  "serde",
  "serde_json",
@@ -1681,11 +1865,11 @@ dependencies = [
 
 [[package]]
 name = "effectcraft-vp9enc"
-version = "0.10.0"
+version = "0.18.0"
 
 [[package]]
 name = "effectcraft-web"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
  "effectcraft-engine",
  "effectcraft-export",
@@ -1708,9 +1892,8 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ad41fac6e3149abb4866e93df37dbd33baa95db525c3368c944584e95a5dc2"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1724,7 +1907,7 @@ dependencies = [
  "image",
  "js-sys",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "parking_lot",
@@ -1732,6 +1915,7 @@ dependencies = [
  "pollster 1.0.1",
  "profiling",
  "raw-window-handle",
+ "send_wrapper",
  "static_assertions",
  "wasm-bindgen",
  "web-sys",
@@ -1743,9 +1927,8 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc938cc27cd911415e1e4d151bc56ff9df063d8db081374e87aeb805ea74b2ba"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1763,9 +1946,8 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cef1f6d1bba40b09a4d0d62cb822b81030922cfbf65c5373398c3a3caafc5bd"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1783,31 +1965,34 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98466000559d66ba4db786a30448b01483946add4188e7f10f522a27b4fb89cc"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "accesskit_winit",
  "arboard",
+ "block2 0.6.2",
  "bytemuck",
  "egui",
+ "image",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
+ "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "objc2-ui-kit 0.3.2",
+ "parking_lot",
  "profiling",
  "raw-window-handle",
  "smithay-clipboard",
  "web-time",
  "webbrowser",
+ "windows-sys 0.61.2",
  "winit",
 ]
 
 [[package]]
 name = "egui_glow"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606ed4167daf341e5753d703285c4c1d562324b2c07aa8f405cd7d066fe58f3b"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1819,9 +2004,8 @@ dependencies = [
 
 [[package]]
 name = "egui_kittest"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb3f3effb2726fee23449293e67acbf6cc6ce35525b1722bd5743bb348114d5"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "eframe",
  "egui",
@@ -1843,9 +2027,8 @@ checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
 
 [[package]]
 name = "emath"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c8d4141cf0f60fb2f7aefaf352d3ffa5171ef0ab09731c64391801e95e48f1"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "bytemuck",
 ]
@@ -1893,9 +2076,8 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ec0308dc23130fc1a7d4623a8534c2ed069c6dc84e258ee4f3de99615aa1a3"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1911,16 +2093,17 @@ dependencies = [
  "self_cell",
  "skrifa",
  "smallvec",
+ "unicode-bidi",
  "unicode-general-category",
+ "unicode-properties",
  "unicode-segmentation",
  "vello_cpu",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.36.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773fa9c96dd0dbef887e39d0ed6177f141cce4d68e6041df77570aa3702dfa13"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
 
 [[package]]
 name = "equator"
@@ -2049,6 +2232,16 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
 
+[[package]]
+name = "filetime"
+version = "0.2.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
+dependencies = [
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "filmcraft-aac"
 version = "0.1.1"
@@ -2310,6 +2503,17 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
 
+[[package]]
+name = "fixed_decimal"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2214fb00f669ee96bee5bb29dfb1ddabe058b2bc426817efc79afa03c9bc55ae"
+dependencies = [
+ "displaydoc",
+ "smallvec",
+ "writeable",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
@@ -2333,7 +2537,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90642cf66dde7f205dc8b42dfe57b47d0f3a29f571b832742883ef512e23fe55"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
 ]
@@ -2469,6 +2673,16 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "gethostname"
 version = "1.1.0"
@@ -2479,6 +2693,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.4"
@@ -2501,7 +2726,7 @@ dependencies = [
  "js-sys",
  "libc",
  "r-efi 6.0.0",
- "rand_core 0.10.1",
+ "rand_core",
  "wasm-bindgen",
 ]
 
@@ -2528,9 +2753,9 @@ dependencies = [
 
 [[package]]
 name = "glifo"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed4a1bb24121291d27230c1b1b44e07d6a9b28cefdb32fe1581dfb84e14f940a"
+checksum = "282a26c1e23de04bdab3e34a21b6f877a479b96737792516b9b8b8f69b6661be"
 dependencies = [
  "bytemuck",
  "foldhash 0.2.0",
@@ -2568,7 +2793,7 @@ dependencies = [
  "glutin_glx_sys",
  "glutin_wgl_sys",
  "libloading",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -2713,8 +2938,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a"
 [[package]]
 name = "hayro-jbig2"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69374b3668dd45aeb3d3145cda68f2c7b4f223aaa2511e67d076f1c7d741388d"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "hayro-ccitt",
 ]
@@ -2728,7 +2952,7 @@ checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1"
 [[package]]
 name = "hayro-syntax"
 version = "0.7.2"
-source = "git+https://github.com/storytold/craft-libs?rev=ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d#ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d"
+source = "git+https://github.com/storytold/craft-libs?rev=92d392cff132eaf53e13afff77f38b5c11b73aa0#92d392cff132eaf53e13afff77f38b5c11b73aa0"
 dependencies = [
  "hayro-jbig2",
  "hayro-jpeg2000",
@@ -2756,6 +2980,22 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "http"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
 [[package]]
 name = "icu_collections"
 version = "2.3.0"
@@ -2770,6 +3010,23 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_decimal"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eb8f655bba2d0c0459e43a5b0e6cd3cd388109898fb3d85d048165e8b0abd08"
+dependencies = [
+ "displaydoc",
+ "fixed_decimal",
+ "icu_locale_core",
+ "icu_pattern",
+ "icu_plurals",
+ "icu_provider",
+ "serde",
+ "writeable",
+ "zerovec",
+]
+
 [[package]]
 name = "icu_locale_core"
 version = "2.3.0"
@@ -2778,11 +3035,32 @@ checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb"
 dependencies = [
  "displaydoc",
  "litemap",
+ "serde",
  "tinystr",
  "writeable",
  "zerovec",
 ]
 
+[[package]]
+name = "icu_locale_fallback"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "251af8e57c9400e3eb58242fe5b8b1152b2a64fdf4cf632f923c38ccee6f2fa9"
+dependencies = [
+ "icu_locale_core",
+ "icu_locale_fallback_data",
+ "icu_provider",
+ "potential_utf",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_fallback_data"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "decf2a22ec8fa68f1a0c1129a3f8583f8f8bc24e8b9ccbe98ead99f62a4dc3a8"
+
 [[package]]
 name = "icu_normalizer"
 version = "2.3.0"
@@ -2795,6 +3073,7 @@ dependencies = [
  "icu_provider",
  "smallvec",
  "utf16_iter",
+ "utf8_iter",
  "write16",
  "zerovec",
 ]
@@ -2805,6 +3084,32 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0"
 
+[[package]]
+name = "icu_pattern"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b3db611446bd92c246b03e4aa0bafa71ddb194af431ddbb42b9d70e4bfce1a0"
+dependencies = [
+ "displaydoc",
+ "either",
+ "serde",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_plurals"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e475e6766ef87b1d3c1f97be6363995b0bfaeddbc789671615df598a97ff0593"
+dependencies = [
+ "displaydoc",
+ "fixed_decimal",
+ "icu_provider",
+ "serde",
+ "zerovec",
+]
+
 [[package]]
 name = "icu_properties"
 version = "2.3.0"
@@ -2834,6 +3139,9 @@ checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
+ "postcard",
+ "serde",
+ "stable_deref_trait",
  "writeable",
  "yoke",
  "zerofrom",
@@ -2841,6 +3149,30 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "icu_provider_adapters"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df887bc4f55dbc773c7c45a0c7dfa75be886f7b7812830a71ab7271cc1801820"
+dependencies = [
+ "icu_locale_fallback",
+ "icu_provider",
+]
+
+[[package]]
+name = "icu_provider_blob"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5916b44fac319d3f58e4d8d805a627df19e27937b582cd99fcde3bb6b7ce1b0e"
+dependencies = [
+ "icu_provider",
+ "postcard",
+ "serde",
+ "writeable",
+ "zerotrie",
+ "zerovec",
+]
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -3047,12 +3379,12 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kittest"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5"
+checksum = "0bb81a721ba76aa095b7f45deb180504f786904e56ca4b8e141f66eb89a78b75"
 dependencies = [
  "accesskit",
- "accesskit_consumer 0.35.0",
+ "accesskit_consumer",
 ]
 
 [[package]]
@@ -3128,9 +3460,9 @@ checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
 
 [[package]]
 name = "linesweeper"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c19728333c060c6569a53c9a0e56c4be0df52cb4e6e07a8fbe16084cecce769"
+checksum = "a25df1b0c5432893f41bba817150e323703ee5f6d974f3a6808ac7fd7f046d18"
 dependencies = [
  "arrayvec",
  "kurbo",
@@ -3156,6 +3488,9 @@ name = "litemap"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "litrs"
@@ -3180,9 +3515,9 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.6"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a"
+checksum = "ecbdfe44b1bd960b68170b417450a628c43f7cf56bb3c5317e61cb230ee7f226"
 
 [[package]]
 name = "mach2"
@@ -3269,18 +3604,17 @@ dependencies = [
 
 [[package]]
 name = "muda"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6744ab645ebe79f9c428455c7cb9dfa4275fa3b50a25408e08f927da8dc618c"
+checksum = "4340e89c178916e62879c5c36b7f699019369be413e496178a6983ce91b8bc03"
 dependencies = [
  "crossbeam-channel",
  "dpi",
  "keyboard-types",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
- "once_cell",
  "png",
  "thiserror 2.0.21",
  "windows-sys 0.61.2",
@@ -3375,12 +3709,33 @@ dependencies = [
  "jni-sys 0.3.1",
 ]
 
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags 2.13.2",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -3496,9 +3851,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8"
 dependencies = [
  "objc2-encode",
 ]
@@ -3527,7 +3882,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -3541,7 +3896,7 @@ checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
  "bitflags 2.13.2",
  "libc",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-audio",
  "objc2-core-audio-types",
  "objc2-core-foundation",
@@ -3579,7 +3934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
 dependencies = [
  "dispatch2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-audio-types",
  "objc2-core-foundation",
 ]
@@ -3591,7 +3946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -3614,7 +3969,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.13.2",
  "dispatch2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
 ]
 
 [[package]]
@@ -3625,7 +3980,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.13.2",
  "dispatch2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -3681,7 +4036,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
 ]
 
@@ -3692,7 +4047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
 ]
 
@@ -3728,7 +4083,7 @@ checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
  "bitflags 2.13.2",
  "block2 0.6.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-foundation 0.3.2",
 ]
 
@@ -3752,7 +4107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -3797,7 +4152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
  "bitflags 2.13.2",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
 ]
@@ -3844,6 +4199,12 @@ version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
 [[package]]
 name = "orbclient"
 version = "0.3.55"
@@ -3873,6 +4234,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -3934,14 +4305,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
-name = "phf"
-version = "0.13.1"
+name = "petgraph"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
- "phf_macros 0.13.1",
- "phf_shared 0.13.1",
- "serde",
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap",
 ]
 
 [[package]]
@@ -3950,18 +4321,9 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
 dependencies = [
- "phf_macros 0.14.0",
- "phf_shared 0.14.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
-dependencies = [
- "fastrand",
- "phf_shared 0.13.1",
+ "phf_macros",
+ "phf_shared",
+ "serde",
 ]
 
 [[package]]
@@ -3971,20 +4333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
 dependencies = [
  "fastrand",
- "phf_shared 0.14.0",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
-dependencies = [
- "phf_generator 0.13.1",
- "phf_shared 0.13.1",
- "proc-macro2",
- "quote",
- "syn 2.0.119",
+ "phf_shared",
 ]
 
 [[package]]
@@ -3993,22 +4342,13 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
 dependencies = [
- "phf_generator 0.14.0",
- "phf_shared 0.14.0",
+ "phf_generator",
+ "phf_shared",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.14.0"
@@ -4067,6 +4407,19 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "plist"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285"
+dependencies = [
+ "base64",
+ "indexmap",
+ "quick-xml 0.42.0",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "png"
 version = "0.18.1"
@@ -4130,12 +4483,24 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "postcard"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+dependencies = [
+ "cobs",
+ "serde",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661"
 dependencies = [
+ "serde_core",
+ "writeable",
  "zerovec",
 ]
 
@@ -4145,15 +4510,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
 [[package]]
 name = "presser"
 version = "0.3.1"
@@ -4186,16 +4542,17 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
 
 [[package]]
 name = "proptest"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
+checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0"
 dependencies = [
- "bit-set 0.8.0",
- "bit-vec 0.8.0",
+ "bit-set 0.11.1",
+ "bit-vec 0.10.1",
  "bitflags 2.13.2",
+ "chacha20",
+ "core_detect",
  "num-traits",
- "rand 0.9.5",
- "rand_chacha",
+ "rand",
  "rand_xorshift",
  "regex-syntax",
  "rusty-fork",
@@ -4253,6 +4610,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.47"
@@ -4274,16 +4640,6 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
-dependencies = [
- "rand_chacha",
- "rand_core 0.9.5",
-]
-
 [[package]]
 name = "rand"
 version = "0.10.3"
@@ -4292,26 +4648,7 @@ checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af"
 dependencies = [
  "chacha20",
  "getrandom 0.4.3",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -4322,11 +4659,11 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
 name = "rand_xorshift"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf"
 dependencies = [
- "rand_core 0.9.5",
+ "rand_core",
 ]
 
 [[package]]
@@ -4356,7 +4693,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
 dependencies = [
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
  "objc2-quartz-core 0.3.2",
@@ -4464,7 +4801,7 @@ dependencies = [
  "js-sys",
  "libc",
  "log",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -4480,6 +4817,20 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "roxmltree"
 version = "0.21.1"
@@ -4536,6 +4887,80 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a073f5dc7469f984c52ad2752b63b0807745133b6de880b7b64c1ac4c48aec4"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni 0.22.4",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.23"
@@ -4569,6 +4994,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cb23c424d8ee841bb4d813677ca237e2a610067d594fec130f87d6093495ab5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -4581,6 +5015,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.13.2",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.3.0"
@@ -4592,6 +5049,16 @@ name = "semver"
 version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
@@ -4625,9 +5092,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.151"
+version = "1.0.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
 dependencies = [
  "itoa",
  "memchr",
@@ -4656,6 +5123,17 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
 [[package]]
 name = "shlex"
 version = "2.0.1"
@@ -4815,6 +5293,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.9"
@@ -4890,6 +5378,12 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "symphonia"
 version = "0.5.5"
@@ -5087,7 +5581,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
 dependencies = [
+ "js-sys",
  "libc",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -5102,6 +5599,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "tar"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
+dependencies = [
+ "filetime",
+ "libc",
+]
+
 [[package]]
 name = "tempfile"
 version = "3.27.0"
@@ -5249,6 +5756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"
 dependencies = [
  "displaydoc",
+ "serde_core",
  "zerovec",
 ]
 
@@ -5350,6 +5858,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph",
+]
+
 [[package]]
 name = "type-map"
 version = "0.5.1"
@@ -5359,6 +5878,18 @@ dependencies = [
  "rustc-hash 2.1.3",
 ]
 
+[[package]]
+name = "typed-path"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce898823d8cd0f028662d2f349694b1af0a5cc9be83f1d213a00d3147445e1e"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
 [[package]]
 name = "uds_windows"
 version = "1.2.1"
@@ -5427,6 +5958,41 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde93ff05758a36a851a398a772b0b79a82fbe3c186a46f2696baaeaf84c966b"
+dependencies = [
+ "base64",
+ "flate2",
+ "log",
+ "percent-encoding",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "ureq-proto",
+ "utf8-zero",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"
+dependencies = [
+ "base64",
+ "http",
+ "httparse",
+ "log",
+]
+
 [[package]]
 name = "url"
 version = "2.5.8"
@@ -5445,6 +6011,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -5464,9 +6036,9 @@ dependencies = [
 
 [[package]]
 name = "vello_common"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e9aed918117e8152c9eddfd8362d73c465c23f26c44786aa331707b8a64fa2"
+checksum = "bbb2141a2bca6e6d598e471fd4d1d7eed8e020aad6a28187edda07f091a325dd"
 dependencies = [
  "bytemuck",
  "fearless_simd",
@@ -5479,9 +6051,9 @@ dependencies = [
 
 [[package]]
 name = "vello_cpu"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7349e1f55f6b801c7c277958df4ea53e7f20f21e8014910ad888b2ecda93ea"
+checksum = "ace506ca414548966fcf3c283be94eb1cad8254de488791ee698bf438b0890a9"
 dependencies = [
  "bytemuck",
  "glifo",
@@ -5489,6 +6061,16 @@ dependencies = [
  "vello_common",
 ]
 
+[[package]]
+name = "verifysign"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6acfcc42a8d44f340d001193d97ef56bf33210b51ad760ae8308c97d5241ca51"
+dependencies = [
+ "core-foundation 0.10.1",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -5514,6 +6096,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
 [[package]]
 name = "wasip2"
 version = "1.0.4+wasi-0.2.12"
@@ -5830,7 +6418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.41.0",
  "quote",
 ]
 
@@ -5875,13 +6463,22 @@ dependencies = [
  "jni 0.22.4",
  "log",
  "ndk-context",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-app-kit 0.3.2",
  "objc2-foundation 0.3.2",
  "url",
  "web-sys",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "weezl"
 version = "0.1.12"
@@ -6016,7 +6613,7 @@ dependencies = [
  "naga",
  "naga-types",
  "ndk-sys",
- "objc2 0.6.4",
+ "objc2 0.6.5",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -6205,6 +6802,17 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link",
+ "windows-result 0.4.1",
+ "windows-strings",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -6259,15 +6867,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -6301,30 +6900,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows-threading"
 version = "0.2.1"
@@ -6346,12 +6928,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -6364,12 +6940,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -6382,24 +6952,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -6412,12 +6970,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -6430,12 +6982,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -6448,12 +6994,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -6466,17 +7006,10 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winit"
 version = "0.30.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
+source = "git+https://github.com/storytold/winit.git?rev=a517b3846ee8457d84ee4975110bfda6797c44dc#a517b3846ee8457d84ee4975110bfda6797c44dc"
 dependencies = [
  "ahash",
  "android-activity",
@@ -6487,7 +7020,7 @@ dependencies = [
  "calloop 0.13.0",
  "cfg_aliases",
  "concurrent-queue",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics",
  "cursor-icon",
  "dpi",
@@ -6533,21 +7066,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "winresource"
-version = "0.1.31"
+name = "winreg"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0986a8b1d586b7d3e4fe3d9ea39fb451ae22869dcea4aa109d287a374d866087"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winresource"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bc6d36480b829272a5bdabf08e6dca8004761c1da7e35efef800540c66221b"
 dependencies = [
  "toml",
  "version_check",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ef0ffc427f045c0cc9ebffd6f4f91153dcd2a1547b5c3c29ee3f541e16e95c6"
+
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d7888ccd4896447b2d14d3a9350a85df2aeb6f181e2e7a31349d104ac46cac1"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix 1.1.5",
+ "thiserror 2.0.21",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -6559,6 +7126,9 @@ name = "writeable"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "x11-dl"
@@ -6625,9 +7195,11 @@ checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
 
 [[package]]
 name = "xtask"
-version = "0.10.0"
+version = "0.18.0"
 dependencies = [
+ "chrono",
  "serde_json",
+ "tempfile",
 ]
 
 [[package]]
@@ -6800,6 +7372,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zeroize"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879"
+
 [[package]]
 name = "zerotrie"
 version = "0.2.5"
@@ -6807,8 +7385,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f"
 dependencies = [
  "displaydoc",
+ "litemap",
+ "serde_core",
  "yoke",
  "zerofrom",
+ "zerovec",
 ]
 
 [[package]]
@@ -6817,6 +7398,7 @@ version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
 dependencies = [
+ "serde",
  "yoke",
  "zerofrom",
  "zerovec-derive",
@@ -6833,6 +7415,23 @@ dependencies = [
  "syn 3.0.6",
 ]
 
+[[package]]
+name = "zip"
+version = "9.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886b00003a72c4ccee3f42cfc34908d33b2508a74d827dc2a4244706475c704"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "getrandom 0.4.3",
+ "indexmap",
+ "memchr",
+ "nix",
+ "typed-path",
+ "windows-sys 0.61.2",
+ "zopfli",
+]
+
 [[package]]
 name = "zlib-rs"
 version = "0.6.8"
@@ -6845,6 +7444,18 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
+[[package]]
+name = "zopfli"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]
+
 [[package]]
 name = "zune-core"
 version = "0.5.3"
@@ -6909,3 +7520,23 @@ dependencies = [
  "syn 3.0.6",
  "winnow",
 ]
+
+[[patch.unused]]
+name = "egui_demo_lib"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_extras"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_inspection"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
+
+[[patch.unused]]
+name = "egui_system_font_provider"
+version = "0.37.0"
+source = "git+https://github.com/storytold/egui.git?rev=6d518fc799681571963842f95b55a6b68431b15a#6d518fc799681571963842f95b55a6b68431b15a"
diff --git a/Cargo.toml b/Cargo.toml
index 634bda76e..aa917fc63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,15 +4,17 @@ members = ["crates/*", "apps/*", "xtask"]
 default-members = ["crates/*", "apps/*"]
 
 [workspace.package]
-version = "0.10.0"
+version = "0.18.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
 repository = "https://github.com/storytold/effectcraft"
 
 [workspace.dependencies]
-craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.1.0", default-features = false, features = ["read"] }
-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
+craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.1.0", default-features = false, features = ["read"] }
+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
+craft-quit = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0" }
+craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["egui"] }
 # internal
 effectcraft-time = { path = "crates/time" }
 effectcraft-geom = { path = "crates/geom" }
@@ -52,6 +54,8 @@ thiserror = "2"
 serde = { version = "1", features = ["derive", "rc"] }
 serde_json = { version = "1", features = ["float_roundtrip"] }
 log = "0.4"
+# All date/time conversion goes through chrono (no hand-rolled calendar code beyond the 400-year range extension; AGENTS.md).
+chrono = { version = "0.4.45", default-features = false, features = ["std"] }
 rayon = "1"
 # std::time::Instant/SystemTime on native; the browser clock on wasm32 (std's panic there).
 web-time = "1"
@@ -100,14 +104,17 @@ symphonia = { version = "0.5.5", default-features = false, features = ["aiff"] }
 # gpu (the same wgpu eframe / egui-wgpu use)
 wgpu = { version = "30.0.1", features = ["fragile-send-sync-non-atomic-wasm"] }
 bytemuck = "1"
-pollster = "0.4"
+pollster = "1"
 
 # ui
 # Shared frontend components; keep this dependency above the engine boundary.
-craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }
-egui = "0.36"
-eframe = { version = "0.36", default-features = false }
-egui_kittest = "0.36"
+# Shared UI and the complete egui family select reviewed immutable commits below.
+craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", features = ["serde"] }
+# `default_fonts` and `monochrome_emoji_fonts` are explicit: the app's `FontDefinitions::default()`
+# and its `✔`/`▣` chrome glyphs need both, and kittest's own dev-dependencies do not propagate.
+egui = { version = "0.37", default-features = false, features = ["default_fonts", "monochrome_emoji_fonts"] }
+eframe = { version = "0.37", default-features = false }
+egui_kittest = "0.37"
 rfd = "0.17"
 cpal = "0.16"
 # The operating system's interface language (MIT/Apache-2.0, no dependencies on desktop).
@@ -129,17 +136,22 @@ sys-locale = "0.3"
 unsafe_code = "forbid"
 
 [workspace.lints.clippy]
+cognitive_complexity = "deny"
+too_many_arguments = "deny"
+wildcard_imports = "deny"
 dbg_macro = "warn"
 todo = "warn"
-too_many_arguments = "allow"
 needless_range_loop = "allow"
 type_complexity = "allow"
 
 [profile.dev.package."*"]
 opt-level = 2
+debug = false
 
 [profile.dev]
 opt-level = 1
+# Panics and backtraces keep file and line; full debug info only made the many test binaries large.
+debug = "line-tables-only"
 
 # Pixel hot loops: keep debug builds interactive.
 [profile.dev.package.effectcraft-raster]
@@ -211,4 +223,20 @@ lto = "thin"
 codegen-units = 1
 
 [patch.crates-io]
-hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.7.2" }
+hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.7.2" }
+hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "92d392cff132eaf53e13afff77f38b5c11b73aa0", version = "=0.3.0" }
+ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+epaint_default_fonts = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-winit = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui-wgpu = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_glow = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_extras = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_kittest = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_system_font_provider = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+eframe = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_demo_lib = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+egui_inspection = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" }
+winit = { git = "https://github.com/storytold/winit.git", rev = "a517b3846ee8457d84ee4975110bfda6797c44dc" }
diff --git a/NOTICE b/NOTICE
index 43bd2e2a9..5cf18a553 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,11 +12,280 @@ Third-party material
 This product bundles third-party material under its own licenses, listed below. The per-file
 list (author, source, license) is in ATTRIBUTION.md.
 
-Inter (assets/fonts/Inter-*.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-Inter.txt.
-Noto Serif (assets/fonts/NotoSerif-Regular.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-NotoSerif.txt.
-JetBrains Mono (assets/fonts/JetBrainsMono-Regular.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-JetBrainsMono.txt.
+Bundled fonts
+
+EffectCraft embeds Inter, Noto Serif, JetBrains Mono and Noto Sans Symbols 2 from
+assets/fonts/. The pinned egui dependency (epaint_default_fonts, revision
+6d518fc799681571963842f95b55a6b68431b15a) additionally embeds Ubuntu Light, Hack,
+Noto Emoji, egui-icons and emoji-icon-font through EffectCraft's enabled `default_fonts`
+and `monochrome_emoji_fonts` features; no font file from that dependency is added to
+this repository. The complete copyright notices and licence texts required for all of
+these fonts follow.
 
 The optional PDF document reader uses craft-pdf and Hayro-syntax 0.7.2, MIT OR Apache-2.0.
 The shared patched syntax source is centralized in storytold/craft-libs, transferred from
 PdfCraft revision 9ed3abe4907a127d36b12fbfeee71d7e26248da1. This parser-only use embeds no
 Hayro fonts, CMaps or image codecs; EffectCraft keeps its existing fonts and drawing filters.
+
+SIL Open Font License 1.1
+
+Applies to Inter (assets/fonts/Inter-*.ttf), Noto Serif (assets/fonts/NotoSerif-Regular.ttf),
+JetBrains Mono (assets/fonts/JetBrainsMono-Regular.ttf), Noto Sans Symbols 2
+(assets/fonts/NotoSansSymbols2-Regular.ttf) and Noto Emoji (NotoEmoji-Regular.ttf).
+Copyright notices:
+
+Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
+Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)
+Copyright 2013 Google Inc. All Rights Reserved.
+
+The fonts in assets/fonts/ also keep their upstream licence files at
+assets/fonts/OFL-<family>.txt. The complete licence text follows.
+
+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.
+
+Ubuntu Font Licence 1.0
+
+Applies to Ubuntu Light (Ubuntu-Light.ttf). Copyright notice:
+
+Copyright 2011 Canonical Ltd.  Licensed under the Ubuntu Font Licence 1.0
+
+-------------------------------
+UBUNTU FONT LICENCE Version 1.0
+-------------------------------
+
+PREAMBLE
+This licence allows the licensed fonts to be used, studied, modified and
+redistributed freely. The fonts, including any derivative works, can be
+bundled, embedded, and redistributed provided the terms of this licence
+are met. The fonts and derivatives, however, cannot be released under
+any other licence. The requirement for fonts to remain under this
+licence does not require any document created using the fonts or their
+derivatives to be published under this licence, as long as the primary
+purpose of the document is not to be a vehicle for the distribution of
+the fonts.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this licence and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Original Version" refers to the collection of Font Software components
+as received under this licence.
+
+"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.
+
+"Copyright Holder(s)" refers to all individuals and companies who have a
+copyright ownership of the Font Software.
+
+"Substantially Changed" refers to Modified Versions which can be easily
+identified as dissimilar to the Font Software by users of the Font
+Software comparing the Original Version with the Modified Version.
+
+To "Propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification and with or without charging
+a redistribution fee), making available to the public, and in some
+countries other activities as well.
+
+PERMISSION & CONDITIONS
+This licence does not grant any rights under trademark law and all such
+rights are reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to propagate the Font Software, subject to
+the below conditions:
+
+1) Each copy of the Font Software must contain the above copyright
+notice and this licence. 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.
+
+2) The font name complies with the following:
+(a) The Original Version must retain its name, unmodified.
+(b) Modified Versions which are Substantially Changed must be renamed to
+avoid use of the name of the Original Version or similar names entirely.
+(c) Modified Versions which are not Substantially Changed must be
+renamed to both (i) retain the name of the Original Version and (ii) add
+additional naming elements to distinguish the Modified Version from the
+Original Version. The name of such Modified Versions must be the name of
+the Original Version, with "derivative X" where X represents the name of
+the new work, appended to that name.
+
+3) The name(s) of the Copyright Holder(s) and any contributor to the
+Font Software shall not be used to promote, endorse or advertise any
+Modified Version, except (i) as required by this licence, (ii) to
+acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
+their explicit written permission.
+
+4) The Font Software, modified or unmodified, in part or in whole, must
+be distributed entirely under this licence, and must not be distributed
+under any other licence. The requirement for fonts to remain under this
+licence does not affect any document created using the Font Software,
+except any version of the Font Software extracted from a document
+created using the Font Software may only be distributed under this
+licence.
+
+TERMINATION
+This licence 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.
+
+Hack: MIT License and Bitstream Vera License
+
+Applies to Hack (Hack-Regular.ttf). Upstream notice and both licence texts:
+
+The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License
+
+The work in the DejaVu project was committed to the public domain.
+
+Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
+MIT License
+
+Copyright (c) 2018 Source Foundry Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+BITSTREAM VERA LICENSE
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+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 BITSTREAM OR THE GNOME FOUNDATION 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.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.
+
+MIT License (egui-icons and emoji-icon-font)
+
+Applies to egui-icons.ttf, a five-glyph subset of emoji-icon-font, and the parent
+emoji-icon-font.ttf, both by John Slegers, https://github.com/jslegers/emoji-icon-font.
+
+MIT License
+
+Copyright (c) 2014 John Slegers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 914a40907..81d42360c 100644
--- a/README.md
+++ b/README.md
@@ -8,14 +8,18 @@
 </p>
 
 
+<p align="center">
+  <img src="assets/app-icon/hicolor/256x256/apps/ai.storyteller.effectcraft.png" width="128" height="128" alt="EffectCraft icon: an engraved unicorn on a pink tile">
+</p>
+
 <h1 align="center">EffectCraft</h1>
 
 <p align="center">
-  <b>Motion graphics and visual effects; an open-source, clean-room reimplementation of Adobe After Effects, rebuilt in pure Rust.</b>
+  <b>Motion graphics and visual effects; an open-source, professional motion graphics and visual effects studio, built in pure Rust.</b>
 </p>
 
 <p align="center">
-  A free, open-source compositor in the spirit of After Effects: compositions, layers,
+  A free, open-source compositor: compositions, layers,
   keyframes, 306 effects, layer styles, expressions, 3D cameras and lights, and a render queue, native on macOS,
   Windows and Linux, and in the browser. Young, moving fast, and already usable.
 </p>
@@ -24,6 +28,9 @@
   <img alt="Status: young and moving fast" src="https://img.shields.io/badge/status-young%20and%20moving%20fast-e0368f?style=flat-square">
   <img alt="Written in Rust" src="https://img.shields.io/badge/rust-1.95%2B-b0206c?style=flat-square&logo=rust&logoColor=white">
   <img alt="License: MIT OR Apache-2.0" src="https://img.shields.io/badge/license-MIT%20%2F%20Apache--2.0-555?style=flat-square">
+  <br>
+  <a href="https://sonarcloud.io/project/overview?id=storytold_effectcraft"><img alt="Scanned by SonarCloud" src="https://img.shields.io/badge/Scanned_by-SonarCloud-4b9fd5?style=flat-square&logo=sonarqubecloud&logoColor=white"></a>
+  <a href="https://coderabbit.ai"><img alt="Reviewed by CodeRabbit" src="https://img.shields.io/coderabbit/prs/github/storytold/effectcraft?style=flat-square&label=Reviewed%20by%20CodeRabbit&logo=coderabbit"></a>
 </p>
 
 <p align="center">
@@ -64,13 +71,14 @@
 ## What EffectCraft is
 
 EffectCraft is for animated titles, motion graphics and compositing work: the kind of thing
-people reach for After Effects to do. You build a composition out of layers (solids, shapes,
+motion designers and VFX artists need. You build a composition out of layers (solids, shapes,
 text, footage, other compositions), animate their properties with keyframes, stack effects on
 them and render the result.
 
-The aim is to feel familiar to anyone who has used After Effects, with the same panels (Project,
-Composition, Timeline, Effect Controls, Effects & Presets) and the same keyframe behaviour, and
-then to go further in a few places where it matters to us:
+The interface feels natural and responsive, with dedicated panels (Project, Composition, Timeline,
+Layer, Footage, Effect Controls, Tools, Preview, Effects & Presets, Audio, Info, Paragraph,
+Character, Align, Progress, Render Queue) and standard motion graphics shortcuts, going further in
+a few places where it matters to us:
 
 - **Lottie import and export built in**, so animations can go straight to the web and apps
   without a plugin.
@@ -84,7 +92,7 @@ then to go further in a few places where it matters to us:
 
 ## Animate
 
-The panels, menus and shortcuts follow After Effects, so your muscle memory carries over:
+The panels, menus and shortcuts follow standard motion design conventions:
 Project, Composition, Timeline, Effect Controls, Properties, Effects & Presets, Character,
 Paragraph, Align, Info, Preview, Audio and the Render Queue, docked the way you expect. Drag
 footage, comps and effects between them: onto the comp viewer, where they land under the pointer,
@@ -102,7 +110,7 @@ or into the Timeline, between layers and at the time you point to.
   feather, expansion and vertex editing in the viewer.
 - **Text:** point and paragraph text with real shaping in any font installed on your machine, the
   Character and Paragraph panels, and text animators with range selectors.
-- **Expressions:** JavaScript with the After Effects object model (`wiggle`, `loopOut`,
+- **Expressions:** JavaScript with the standard motion expressions model (`wiggle`, `loopOut`,
   `thisComp.layer("…")`, vector maths on arrays), an inline editor and the pick-whip.
 - **Timeline like you know it:** twirl layers open to Transform, masks, effects and the rest; drag
   rows to reorder layers; rename with Enter or a double-click; the property shortcuts (A, P, S,
@@ -118,9 +126,9 @@ or into the Timeline, between layers and at the time you point to.
 
 ## Effects
 
-306 effects (every one of After Effects' 298, and more) across its categories, each with its parameter names, order and
-defaults: blur and sharpen, channel, color correction (Curves, Levels, Hue/Saturation, Lumetri
-Color…), distort (Warp, Bulge, Turbulent Displace, CC Power Pin…), generate (Fractal Noise,
+306 built-in effects across its categories, each with its parameter names, order and
+defaults: blur and sharpen, channel, color correction (Curves, Levels, Hue/Saturation, a full
+color-grading panel…), distort (Warp, Bulge, Turbulent Displace, CC Power Pin…), generate (Fractal Noise,
 Gradient Ramp, Stroke, Write-on, Audio Spectrum…), keying, matte, noise and grain, perspective,
 **simulation** (CC Particle World, CC Rainfall, Shatter, Card Dance, Caustics, Wave World…),
 stylize (Glow, CC Glass…), **time** (Echo, Posterize Time, Timewarp, Time Displacement…),
@@ -134,7 +142,7 @@ overlays, Stroke) with Global Light. Preview plays audio in sync, with meters an
 
 ## 3D
 
-Classic 3D the way After Effects does it: 3D layers with orientation and material options,
+Classic 3D compositing: 3D layers with orientation and material options,
 one- and two-node **cameras** with depth of field, **lights** (parallel, spot, point, ambient)
 with soft ray-traced shadows, layers that intersect correctly, orbit, pan and dolly camera
 tools, and Front, Top, Left and Custom views.
@@ -145,7 +153,7 @@ tools, and Front, Top, Left and Custom views.
 
 ## Export
 
-A Render Queue like After Effects', with Render Settings and Output Modules: **H.264** MP4 and
+A dedicated Render Queue, with Render Settings and Output Modules: **H.264** MP4 and
 **ProRes** MOV (Proxy to 4444 XQ with alpha) with audio, **HEVC** (Main / Main 10) and **AV1**
 MP4, **WebM** (VP9 with inter frames and alpha, or AV1; Opus audio), PNG, JPEG, TIFF and 32-bit EXR sequences, animated GIF and WAV/AIFF. Field
 rendering with 3:2 pulldown, effect/solo/guide/depth overrides, crop, region of interest and
@@ -219,25 +227,26 @@ tests, layering, asset attribution and the WebAssembly build). See [CONTRIBUTING
 
 ## Where it stands
 
-EffectCraft is young: its first commit was on 1 October 2026. Nearly every After Effects feature
-exists, including all of its effects, but existing is not the same as behaving exactly like After
-Effects, and we haven't measured that yet. Today it's a good place to try things and to tell us
-what breaks. It isn't yet a replacement for After Effects on client work. In particular:
+EffectCraft is young: its first commit was on 1 October 2026. A comprehensive feature set
+exists, including 306 effects, but breadth is not the same as full maturity across every edge
+case. Today it's a good place to try things and to tell us what breaks. It isn't yet recommended
+for production client work. In particular:
 
-- **After Effects projects can't be opened.** Projects are saved as `.ecproj`, readable versioned
-  JSON, but EffectCraft can't open `.aep` / `.aepx` files, and After Effects plug-ins don't run.
-- **Behaviour still differs from After Effects in places.** Nothing yet compares our renders with
-  After Effects automatically, so please report differences.
+- **Native project format.** Projects are saved as `.ecproj`, readable versioned JSON. Proprietary
+  project formats and After Effects SDK plug-ins are not supported.
+- **Fidelity is still being refined.** Automated rendering tests currently focus on small
+  compositions, so please report visual discrepancies or unexpected behaviour.
 - **macOS is the most tested platform.** Linux and Windows users have hit basic interaction
   bugs, which we're fixing first.
 - **The trained models are new.** Roto Brush can use MobileSAM (an optional 40 MB download in
   Settings ▸ Roto Brush) and face tracking can use Google's MediaPipe Face Landmarker (an optional
-  3.8 MB download in Settings ▸ Face Tracking). Neither is compared with After Effects yet.
+  3.8 MB download in Settings ▸ Face Tracking). Both are actively undergoing evaluation and tuning.
 
-EffectCraft is in **alpha**: about 91% of After Effects' features exist, and we estimate it is
-about 45% of the way to replacing After Effects for professional work. The [ROADMAP](ROADMAP.md)
-has the plan, [docs/target-app-parity.md](docs/target-app-parity.md) the measurement and
-[docs/gaps.md](docs/gaps.md) every known shortfall. The web build ([docs/web.md](docs/web.md)) runs the full app in the browser.
+EffectCraft is in **alpha**: about 91% of the features tracked in
+[docs/target-app-parity.md](docs/target-app-parity.md) exist, and we estimate it is about 45% of the
+way to being ready for full professional production work. The [ROADMAP](ROADMAP.md) has the plan,
+[docs/target-app-parity.md](docs/target-app-parity.md) the measurement and [docs/gaps.md](docs/gaps.md)
+every known shortfall. The web build ([docs/web.md](docs/web.md)) runs the full app in the browser.
 [Bug reports](https://github.com/storytold/effectcraft/issues) are the most useful thing you can
 send us right now.
 
@@ -245,8 +254,8 @@ send us right now.
 
 - **Engine first.** A stack of small crates with strict layering. The interface (egui) sits on
   top and nothing underneath depends on it.
-- **Clean room.** We work from After Effects' public documentation and how it behaves, never
-  from Adobe's files, icons, presets or code. No code is copied from GPL projects. The full rules
+- **Clean room.** We work from public documentation and observable behavior, never
+  from proprietary files, icons, presets or code. No code is copied from GPL projects. The full rules
   are in [AGENTS.md](AGENTS.md).
 - **Private by default.** No telemetry, and no network access unless you ask for it.
 - **One family.** EffectCraft shares its time model and text engine design with FilmCraft, and
@@ -266,9 +275,13 @@ send us right now.
 | arm64 (Snapdragon and other ARM PCs) | `effectcraft-<ver>-windows-arm64.msi` | `effectcraft-<ver>-windows-arm64-portable.zip` |
 | x86 (32-bit) | `effectcraft-<ver>-windows-x86.msi` | `effectcraft-<ver>-windows-x86-portable.zip` |
 
-Installers and executables are code-signed. The installer asks where to install EffectCraft
-(Program Files by default), and later versions install into the same folder. To install silently
+Installers and executables are code-signed. The installer asks who to install EffectCraft for and where. By default it installs for your
+account only, into `%LOCALAPPDATA%\Programs\ArtCraft\EffectCraft`, without an administrator prompt;
+"Everyone on this computer" installs into `C:\Program Files\ArtCraft\EffectCraft` (`Program Files (x86)` for the 32-bit build). Later versions
+install into the same folder. To install silently
 into a folder of your choice: `msiexec /i effectcraft-<ver>-windows-x64.msi /qn INSTALLFOLDER="D:\Apps\EffectCraft"`.
+A silent install is per-user by default. `INSTALLFOLDER` chooses the folder, not who it is installed for;
+add `ALLUSERS=1`, from an elevated terminal or deployment tool, for an all-users install.
 
 ### macOS
 
@@ -368,8 +381,6 @@ ArtCraft Team and are not covered by this license. They may be used only unmodif
 part of this repository and EffectCraft, under [`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt).
 Forks and modified versions must remove them.
 
-<sub>Adobe, Photoshop, Illustrator, Premiere Pro, Lightroom, Acrobat, After Effects and InDesign are trademarks or registered trademarks of Adobe Inc. in the United States and/or other countries. EffectCraft is an independent, open-source project and is not affiliated with, sponsored by or endorsed by Adobe Inc.; these names are used only to describe the workflows it is compatible with.</sub>
-
 <p align="center">
   <a href="https://getartcraft.com/"><img alt="ArtCraft" src="docs/brand/artcraft-mark.svg" width="28"></a><br>
   <sub>Made by the <a href="https://getartcraft.com/">ArtCraft</a> team and community.</sub>
diff --git a/ROADMAP.md b/ROADMAP.md
index e21039c02..f4c99d61f 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -97,7 +97,7 @@ UI strings translated out of ≈ 3,900 (detail: [localization-parity.md](docs/lo
 | Korean | none | 0% |
 | Vietnamese | none | 0% |
 
-Also shipped: Traditional Chinese (partial, 29%), Ukrainian (partial, 29%), Czech (partial, 29%) and Russian (menus only, 16%). No language has had
+Also shipped: Traditional Chinese (partial, 29%), Ukrainian (partial, 29%), Czech (partial, 29%), Georgian (partial, 38%; native-speaker reviewed) and Russian (menus only, 16%). No other language has had
 native-speaker review.
 
 ## Upcoming
@@ -117,6 +117,10 @@ Come tell us what matters most to you on [Discord](https://discord.gg/artcraft).
 
 ## Progress log
 
+- 2026-10-16: Convert To Bezier Path turns a shape layer's Rectangle, Ellipse or Polystar
+  path into an editable Path 1 with the same geometry, as After Effects does; it used to
+  apply to mask RotoBezier only, so a parametric shape path could not be converted at all
+  and its vertices could not be edited or animated (#932).
 - 2026-10-12: Roto Brush span edits report strokes outside a trimmed layer without panicking;
   strokes and undo history are preserved so restoring the timing allows the span edit again.
 - 2026-10-11: Ukrainian panels caught up with the Chinese catalogs. The 95 rows the panel
@@ -131,6 +135,7 @@ Come tell us what matters most to you on [Discord](https://discord.gg/artcraft).
   follow the shared standard: `docs/parity.md` became `docs/target-app-parity.md`; new
   `docs/roadmap.md`, `localization-parity.md`, `file-format-parity.md`, `hardware-parity.md`,
   `ui-parity.md`, `effects-parity.md` and `scripting-parity.md`.
+- 2026-10-14: Georgian (`ka`): every menu row, every panel-catalog row the Chinese catalogs have plus 195 Georgian-only ones, and the effect names and categories; Match System for `ka` / `ka-GE` / `ka_GE.UTF-8` locales. Reviewed by a native speaker.
 - 2026-10-10: Spanish (#460) and Brazilian Portuguese (#217) menu translations.
 - 2026-10-10: Japanese now translates the interface below the menu bar too: `crates/ui-egui/src/i18n/ui.rs` has a Japanese table with the same 396 rows as the Chinese ones (panels, dialogs, buttons and tooltips; the shape test keeps the three catalogs listing the same source strings). Menus were already Japanese.
 - 2026-10-09: Ukrainian now covers all 396 current panel-catalog strings, including dialogs, buttons and tooltips, alongside its menu translation. The catalog keeps the same source keys and placeholder counts as the Chinese catalogs; missing or engine-generated text still falls back to English.
diff --git a/apps/effectcraft-cli/src/main.rs b/apps/effectcraft-cli/src/main.rs
index 43e514048..6e5b8d6cc 100644
--- a/apps/effectcraft-cli/src/main.rs
+++ b/apps/effectcraft-cli/src/main.rs
@@ -6,6 +6,7 @@
 //! effectcraft-cli exec <command-id> [--params JSON]           run one command
 //! effectcraft-cli exec --list [--filter TEXT] [--schemas]     list engine commands (as `commands`)
 //! effectcraft-cli run <id> <json> [<id> <json> …]             run several commands in order
+//! effectcraft-cli run --args-file F                           the same, one argument per line of F
 //! effectcraft-cli props <comp> <layer> [--flat] [--time S]    a layer's property tree (with paths)
 //! effectcraft-cli get <comp> <layer> <path> [--time S]        read a property
 //! effectcraft-cli set <comp> <layer> <path> <value> [--time S] [--expression E]
@@ -16,6 +17,8 @@
 //!     [--profile main|main10] [--level auto|4.1] [--rate-control bitrate|quality] [--video-quality 1-100]
 //!     [--keyint FRAMES] [--webm-codec vp9|av1] [--audio-bitrate KBPS] [--opus-app audio|voice]
 //!     (a relative --out is relative to the working directory; --queue outputs follow the project's own settings)
+//!     [--progress]  report progress on stderr when it is not a terminal, up to four lines a second:
+//!     `progress <frames done> <frames total> <seconds elapsed> <seconds left, or - when unknown>`
 //! effectcraft-cli render --template T.ectemplate [--values V.json] --out FILE
 //! effectcraft-cli render-frame --template T.ectemplate [--values V.json] [--time S] [--out F.png]
 //! effectcraft-cli render F.ecproj --queue                    render the project's Render Queue
@@ -94,6 +97,7 @@ const USAGE: &str = "usage: effectcraft-cli <info|commands|exec|run|props|get|se
   commands [--filter TEXT] [--enabled]     list engine commands
   exec <command-id> [--params JSON]        run one engine command (exec --list: list them, as `commands`)
   run <id> <json> [<id> <json> ...]        run several commands in order
+  run --args-file F                        the same, one argument per line of F (no command-line length limit)
   props <comp> <layer> [--flat] [--time S] a layer's property tree with paths
   get <comp> <layer> <path> [--time S]     read a property
   set <comp> <layer> <path> <value> [--time S] [--expression E]
@@ -106,6 +110,8 @@ const USAGE: &str = "usage: effectcraft-cli <info|commands|exec|run|props|get|se
                                            (formats h264|hevc|av1|prores|webm|png|jpeg|tiff|exr|gif|wav|aiff;
                                            --profile..--keyint: HEVC / AV1, --audio-bitrate/--opus-app: WebM Opus)
                                            a relative --out is relative to the working directory
+                                           --progress: progress lines on stderr when it is not a terminal
+                                           (progress <frames done> <total> <seconds elapsed> <seconds left|->)
   render/render-frame --template T.ectemplate [--values V.json]   render one template instance
   bench [--comp C] [--time S] [--scale K] [--n N] [--play N] [--gpu [--adv3d]]   per-layer/effect render timings;
                                            --play N renders N consecutive frames with/without the layer cache;
@@ -144,6 +150,7 @@ const VALUED: &[&str] = &[
     "--expression",
     "--depth",
     "--eval",
+    "--args-file",
     // render
     "--template",
     "--values",
@@ -189,6 +196,7 @@ const FLAGS: &[&str] = &[
     "--small",
     "--adv3d",
     "--autosave",
+    "--progress",
 ];
 
 struct Args {
@@ -510,10 +518,15 @@ fn run(cmd: &str, args: &Args, json_out: bool) -> Result<(), Failure> {
             emit(&with_saved(r, saved), json_out);
         }
         "run" => {
-            if args.pos.is_empty() {
+            let mut pairs = args.pos.clone();
+            // Windows caps a command line at 32 767 characters: long batches come from a file.
+            if let Some(f) = args.opt("--args-file") {
+                let text = std::fs::read_to_string(f).map_err(|e| Failure::Usage(format!("--args-file {f}: {e}")))?;
+                pairs.extend(text.lines().map(str::trim).filter(|l| !l.is_empty()).map(String::from));
+            }
+            if pairs.is_empty() {
                 return usage_err("run needs <command-id> [<json>] pairs");
             }
-            let pairs = args.pos.clone();
             let mut b = backend(args, true)?;
             let mut results = vec![];
             let mut i = 0;
@@ -772,8 +785,21 @@ fn render(args: &Args, json_out: bool) -> Result<(), Failure> {
     }
     s.execute("renderQueue.render", json!({"wait": false})).map_err(err)?;
     let tty = std::io::IsTerminal::is_terminal(&std::io::stderr());
+    // `--progress`: one line per update for a program reading stderr (a terminal gets the live line).
+    let lines = args.flag("--progress") && !tty;
+    let (mut last_line, mut last_done) = (std::time::Instant::now(), u64::MAX);
     while s.is_rendering() {
         std::thread::sleep(std::time::Duration::from_millis(100));
+        if lines
+            && last_line.elapsed() >= std::time::Duration::from_millis(250)
+            && let Some(p) = s.render_progress()
+            && p.done != last_done
+        {
+            last_line = std::time::Instant::now();
+            last_done = p.done;
+            let left = p.remaining.map_or_else(|| "-".to_string(), |r| format!("{r:.1}"));
+            note!("progress {} {} {:.1} {left}", p.done, p.total, p.item_elapsed);
+        }
         if tty && let Some(p) = s.render_progress() {
             let left = p.remaining.map(|r| format!(", ~{r:.1}s left")).unwrap_or_default();
             let _ = write!(
diff --git a/apps/effectcraft-cli/src/template.rs b/apps/effectcraft-cli/src/template.rs
index f84303dd0..8cf5c124f 100644
--- a/apps/effectcraft-cli/src/template.rs
+++ b/apps/effectcraft-cli/src/template.rs
@@ -4,7 +4,7 @@ use std::io::Read;
 
 use effectcraft_engine::{
     EngineError, Session,
-    project::{ItemId, LayerId},
+    project::{ItemId, LayerId, essential::EgKind},
 };
 use serde_json::{Map, Value, json};
 
@@ -92,7 +92,7 @@ fn preflight(s: &Session, path: &str, values: &Map<String, Value>) -> Result<(),
         project.fix_next_id();
         let mut check = Session::new();
         check.project = project.into();
-        Ok(instantiate(&mut check, source, values))
+        Ok(instantiate(&mut check, source, values, false))
     })
     .map_err(|e| Failure::Error(e.to_string()))?
 }
@@ -105,10 +105,27 @@ pub(super) fn prepare(s: &mut Session, args: &Args) -> Result<(), Failure> {
     }
     let imported = execute(s, "essential.importTemplate", json!({"path": path, "addToComp": false}))?;
     let source = imported.get("comp").and_then(Value::as_u64).ok_or_else(|| Failure::Error("template import did not return a composition".into()))?;
-    instantiate(s, source, &values)
+    instantiate(s, source, &values, true)
 }
 
-fn instantiate(s: &mut Session, source: u64, values: &Map<String, Value>) -> Result<(), Failure> {
+/// The file a Media Replacement control is given: a path, or `{path|file|media: path}`.
+fn media_path(value: &Value) -> Option<&str> {
+    match value {
+        Value::String(path) => Some(path.as_str()),
+        Value::Object(m) => ["path", "file", "media"].iter().find_map(|k| m.get(*k)).and_then(Value::as_str),
+        _ => None,
+    }
+}
+
+/// Whether the template's control of that name (looked up as `essential.set` does) is a Media Replacement.
+fn is_media_control(s: &Session, source: u64, name: &str) -> bool {
+    let Some(eg) = s.project.comp(ItemId(source)).and_then(|c| c.essential.as_ref()) else { return false };
+    let all = eg.flat();
+    let control = all.iter().find(|c| c.name == name).or_else(|| all.iter().find(|c| c.name.eq_ignore_ascii_case(name)));
+    control.is_some_and(|c| matches!(c.kind, EgKind::Media { .. }))
+}
+
+fn instantiate(s: &mut Session, source: u64, values: &Map<String, Value>, import_media: bool) -> Result<(), Failure> {
     // Duplicate and empty the source with commands: this preserves exact rational frame rate,
     // Tick duration, background, work area and renderer settings without round-tripping floats.
     let duplicate = execute(s, "project.duplicate", json!({"items": [source]}))?;
@@ -133,8 +150,11 @@ fn instantiate(s: &mut Session, source: u64, values: &Map<String, Value>) -> Res
     }
     let added = execute(s, "layer.addItem", json!({"comp": parent, "item": source, "time": 0}))?;
     let instance = added.get("layer").and_then(Value::as_u64).ok_or_else(|| Failure::Error("cannot create template instance".into()))?;
-    // Keep a partial final frame: layer.addItem snaps its default end to the frame grid.
+    // Keep a partial final frame: layer.addItem snaps its default end to the frame grid. Give the
+    // wrapper the source's exact name, not Duplicate's numbered one, for `[compName]` outputs.
     s.edit("Template Duration", None, |project, _| {
+        let name = project.item(ItemId(source)).ok_or_else(|| EngineError::Other("template composition is missing".into()))?.name.clone();
+        project.item_mut(ItemId(parent)).ok_or_else(|| EngineError::Other("template render composition is missing".into()))?.name = name;
         let comp = project.comp_mut(ItemId(parent)).ok_or(EngineError::NoComp)?;
         let duration = comp.duration;
         let layer = comp.layer_mut(LayerId(instance)).ok_or_else(|| EngineError::Other("template instance is missing".into()))?;
@@ -145,6 +165,25 @@ fn instantiate(s: &mut Session, source: u64, values: &Map<String, Value>) -> Res
     // Let the wrapper carry the source composition's authored motion blur.
     execute(s, "layer.setSwitch", json!({"comp": parent, "layers": [instance], "switch": "motionBlur", "value": true}))?;
     for (control, value) in values {
+        if is_media_control(s, source, control) {
+            let path = media_path(value).ok_or_else(|| Failure::Error(format!("control `{control}` is a media control: give it a file path")))?;
+            // The preflight session cannot import files; the real run reports a bad path.
+            if !import_media {
+                continue;
+            }
+            let imported = execute(s, "file.import", json!({"paths": [path]}))?;
+            if let Some(err) = imported.get("errors").and_then(Value::as_array).and_then(|e| e.first()) {
+                return Err(Failure::Error(format!("control `{control}`: cannot import {path}: {err}")));
+            }
+            let item = imported
+                .get("items")
+                .and_then(Value::as_array)
+                .and_then(|items| items.first())
+                .and_then(Value::as_u64)
+                .ok_or_else(|| Failure::Error(format!("control `{control}`: {path} did not import as footage")))?;
+            execute(s, "essential.set", json!({"comp": parent, "layer": instance, "control": control, "item": item}))?;
+            continue;
+        }
         execute(s, "essential.set", json!({"comp": parent, "layer": instance, "control": control, "value": value}))?;
     }
     Ok(())
diff --git a/apps/effectcraft-cli/tests/cli.rs b/apps/effectcraft-cli/tests/it/cli.rs
similarity index 85%
rename from apps/effectcraft-cli/tests/cli.rs
rename to apps/effectcraft-cli/tests/it/cli.rs
index 30a0271b6..c7a905e58 100644
--- a/apps/effectcraft-cli/tests/cli.rs
+++ b/apps/effectcraft-cli/tests/it/cli.rs
@@ -7,7 +7,7 @@ use std::process::{Command, Stdio};
 use serde_json::{Value, json};
 
 fn bin() -> Command {
-    Command::new(env!("CARGO_BIN_EXE_effectcraft-cli"))
+    Command::new(crate::binary())
 }
 
 /// Run with `--json`; returns (exit code, parsed stdout).
@@ -110,6 +110,29 @@ fn exec_set_get_with_saved_project() {
     assert_eq!(v[1]["result"]["time"], v[0]["result"]["time"], "{v}");
 }
 
+/// `run --args-file` reads its command / params pairs from a file, one per line: a batch longer
+/// than a Windows command line (32 767 characters, os error 206) still runs.
+#[test]
+fn run_reads_arguments_from_a_file() {
+    let proj = tmp("args-file.ecproj");
+    let p = proj.to_str().unwrap();
+    let mut lines = vec!["comp.new".to_string(), json!({"name": "A", "width": 64, "height": 64}).to_string()];
+    for i in 0..400 {
+        lines.push("layer.newSolid".into());
+        lines.push(json!({"width": 8, "height": 8, "name": format!("Solid with a long name to pass the limit {i:04}")}).to_string());
+        lines.push(String::new());
+    }
+    let text = lines.join("\n");
+    assert!(text.len() > 32_767);
+    let file = tmp("args-file.txt");
+    std::fs::write(&file, text).unwrap();
+    let v = ok_json(&["run", "--args-file", file.to_str().unwrap(), "--empty", "--save-as", p]);
+    assert_eq!(v["result"].as_array().map(Vec::len), Some(401), "{v}");
+    let out = bin().args(["run", "--args-file", "no/such/file.txt", "--empty"]).output().unwrap();
+    assert_eq!(out.status.code(), Some(2));
+    assert!(String::from_utf8_lossy(&out.stderr).contains("--args-file no/such/file.txt"));
+}
+
 #[test]
 fn render_frame_writes_png() {
     let out = tmp("f.png");
@@ -593,3 +616,77 @@ solid.property("ADBE Transform Group").property("ADBE Opacity").addToMotionGraph
     assert_eq!(reply["error"], "command `renderQueue.add` is not available right now: select or open a composition", "{reply}");
     let _ = std::fs::remove_dir_all(&root);
 }
+
+/// `WGPU_ADAPTER_NAME` that matches nothing is a clean `--gpu` error listing the adapters
+/// found (wgpu's own helper panics). Read once per process, hence a subprocess.
+#[test]
+fn gpu_adapter_name_mismatch_is_a_clean_error() {
+    let out = bin()
+        .args(["render-frame", "--gpu", "--max-side", "64", "--out", tmp("nomatch.png").to_str().unwrap(), "--json"])
+        .env("WGPU_ADAPTER_NAME", "NoSuchAdapter-xyz")
+        .output()
+        .unwrap();
+    let stdout = String::from_utf8_lossy(&out.stdout);
+    assert_eq!(out.status.code(), Some(1), "stdout: {stdout}\nstderr: {}", String::from_utf8_lossy(&out.stderr));
+    let v: Value = serde_json::from_str(stdout.trim()).unwrap();
+    let e = v["error"].as_str().unwrap();
+    assert!(e.contains("WGPU_ADAPTER_NAME=\"NoSuchAdapter-xyz\""), "{e}");
+    assert!(e.contains("available: [") || e.contains("no adapters on the enabled backends"), "{e}");
+}
+
+/// An exported-but-empty `WGPU_ADAPTER_NAME` behaves like unset: it never produces the
+/// adapter-name error (whether a GPU exists on this machine is not asserted).
+#[test]
+fn gpu_adapter_name_empty_is_unset() {
+    let out = bin()
+        .args(["render-frame", "--gpu", "--max-side", "64", "--out", tmp("emptyname.png").to_str().unwrap(), "--json"])
+        .env("WGPU_ADAPTER_NAME", "  ")
+        .output()
+        .unwrap();
+    let all = format!("{}{}", String::from_utf8_lossy(&out.stdout), String::from_utf8_lossy(&out.stderr));
+    assert!(!all.contains("WGPU_ADAPTER_NAME"), "{all}");
+}
+
+/// Renders two seconds of the demo at quarter resolution (long enough for several progress
+/// updates) and returns stderr, which `output()` reads through a pipe: not a terminal.
+fn render_demo_stderr(name: &str, extra: &[&str]) -> String {
+    let out = tmp(name);
+    let mut args = vec!["render", "--demo", "--format", "gif", "--start", "0", "--end", "2", "--resolution", "quarter", "--out", out.to_str().unwrap()];
+    args.extend_from_slice(extra);
+    let o = bin().args(&args).output().unwrap();
+    let stderr = String::from_utf8_lossy(&o.stderr).to_string();
+    assert!(o.status.success(), "{args:?}: {stderr}");
+    let _ = std::fs::remove_file(out);
+    stderr
+}
+
+/// `render --progress` with a piped stderr reports the render's frames as
+/// `progress <frames done> <frames total> <seconds elapsed> <seconds left|->` lines, one per
+/// change (#1778).
+#[test]
+fn render_progress_reports_frames_on_a_piped_stderr() {
+    let stderr = render_demo_stderr("progress.gif", &["--progress"]);
+    let mut last_done = None;
+    let mut totals = vec![];
+    for line in stderr.lines().filter(|l| l.starts_with("progress")) {
+        let fields: Vec<&str> = line.split(' ').collect();
+        assert_eq!(fields.len(), 5, "{line}");
+        let done: u64 = fields[1].parse().unwrap_or_else(|e| panic!("{line}: frames done: {e}"));
+        let total: u64 = fields[2].parse().unwrap_or_else(|e| panic!("{line}: frames total: {e}"));
+        let elapsed: f64 = fields[3].parse().unwrap_or_else(|e| panic!("{line}: seconds elapsed: {e}"));
+        assert!(fields[4] == "-" || fields[4].parse::<f64>().is_ok_and(|left| left >= 0.0), "{line}: seconds left");
+        assert!(done <= total && total > 0 && elapsed >= 0.0, "{line}");
+        assert!(last_done.is_none_or(|last| done > last), "one line per change, and frames only go up: {stderr}");
+        last_done = Some(done);
+        totals.push(total);
+    }
+    assert!(!totals.is_empty(), "no progress line on a piped stderr: {stderr}");
+    assert!(totals.iter().all(|&t| t == totals[0]), "one render, one total: {stderr}");
+}
+
+/// Without `--progress`, the same render writes no progress lines to a piped stderr (#1778).
+#[test]
+fn render_without_progress_writes_no_progress_lines() {
+    let stderr = render_demo_stderr("no-progress.gif", &[]);
+    assert!(!stderr.lines().any(|l| l.starts_with("progress")), "{stderr}");
+}
diff --git a/apps/effectcraft-cli/tests/it/main.rs b/apps/effectcraft-cli/tests/it/main.rs
new file mode 100644
index 000000000..bca36ec78
--- /dev/null
+++ b/apps/effectcraft-cli/tests/it/main.rs
@@ -0,0 +1,9 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod cli;
+mod qa_template;
+
+/// Nextest archives relocate binaries; plain Cargo keeps the compile-time path valid.
+fn binary() -> std::ffi::OsString {
+    std::env::var_os("NEXTEST_BIN_EXE_effectcraft_cli").unwrap_or_else(|| env!("CARGO_BIN_EXE_effectcraft-cli").into())
+}
diff --git a/apps/effectcraft-cli/tests/qa_template.rs b/apps/effectcraft-cli/tests/it/qa_template.rs
similarity index 81%
rename from apps/effectcraft-cli/tests/qa_template.rs
rename to apps/effectcraft-cli/tests/it/qa_template.rs
index 2765b163e..ffbdb94e9 100644
--- a/apps/effectcraft-cli/tests/qa_template.rs
+++ b/apps/effectcraft-cli/tests/it/qa_template.rs
@@ -9,7 +9,7 @@ use std::process::Command;
 use serde_json::Value;
 
 fn cli(dir: &PathBuf, args: &[&str]) -> (i32, Value) {
-    let out = Command::new(env!("CARGO_BIN_EXE_effectcraft-cli")).current_dir(dir).args(args).arg("--json").output().unwrap();
+    let out = Command::new(crate::binary()).current_dir(dir).args(args).arg("--json").output().unwrap();
     let stdout = String::from_utf8_lossy(&out.stdout).to_string();
     let v = serde_json::from_str(stdout.trim()).unwrap_or_else(|e| panic!("{args:?}: {e}: {stdout} {}", String::from_utf8_lossy(&out.stderr)));
     (out.status.code().unwrap_or(-1), v)
@@ -152,6 +152,13 @@ fn essential_graphics_template_via_script_and_commands() {
     assert_eq!(image::open(&frames[0]).unwrap().to_rgba8(), edit);
     assert_eq!(std::fs::read(dir.join("lt.ectemplate")).unwrap(), original_template);
 
+    invalid_template_values_fail_cleanly(&dir);
+    template_usage_errors(&dir);
+    rational_template_keeps_exact_rate(&dir, &original_template);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+fn invalid_template_values_fail_cleanly(dir: &PathBuf) {
     // Invalid values fail before the queue creates an output directory, or frame rendering
     // overwrites an existing output. A JSON object and existing control names are required.
     for (name, values, expected) in [
@@ -164,25 +171,27 @@ fn essential_graphics_template_via_script_and_commands() {
         std::fs::write(dir.join(&values_file), values).unwrap();
         let output_dir = dir.join(format!("failed-{name}"));
         let out = output_dir.join("frame_[#####].png");
-        let (code, error) = cli(&dir, &["render", "--template", "lt.ectemplate", "--values", &values_file, "--out", out.to_str().unwrap()]);
+        let (code, error) = cli(dir, &["render", "--template", "lt.ectemplate", "--values", &values_file, "--out", out.to_str().unwrap()]);
         assert_eq!(code, 1, "{name}: {error}");
         assert!(error["error"].as_str().unwrap().contains(expected), "{name}: {error}");
         assert!(!output_dir.exists(), "{name}: invalid input created render output");
         std::fs::write(dir.join("untouched.png"), b"existing output").unwrap();
-        let (code, error) = cli(&dir, &["render-frame", "--template", "lt.ectemplate", "--values", &values_file, "--out", "untouched.png"]);
+        let (code, error) = cli(dir, &["render-frame", "--template", "lt.ectemplate", "--values", &values_file, "--out", "untouched.png"]);
         assert_eq!(code, 1, "{name}: {error}");
         assert_eq!(std::fs::read(dir.join("untouched.png")).unwrap(), b"existing output");
     }
-    let (code, error) = cli(&dir, &["render-frame", "--template", "lt.ectemplate", "--values", "missing-values.json", "--out", "missing.png"]);
+    let (code, error) = cli(dir, &["render-frame", "--template", "lt.ectemplate", "--values", "missing-values.json", "--out", "missing.png"]);
     assert_eq!(code, 1, "{error}");
     assert!(error["error"].as_str().unwrap().contains("cannot read values"), "{error}");
     assert!(!dir.join("missing.png").exists());
     std::fs::write(dir.join("large-values.json"), vec![b' '; 1024 * 1024 + 1]).unwrap();
-    let (code, error) = cli(&dir, &["render-frame", "--template", "lt.ectemplate", "--values", "large-values.json", "--out", "large.png"]);
+    let (code, error) = cli(dir, &["render-frame", "--template", "lt.ectemplate", "--values", "large-values.json", "--out", "large.png"]);
     assert_eq!(code, 1, "{error}");
     assert!(error["error"].as_str().unwrap().contains("exceeds 1 MiB"), "{error}");
     assert!(!dir.join("large.png").exists());
+}
 
+fn template_usage_errors(dir: &PathBuf) {
     for args in [
         vec!["render-frame", "--values", "values.json"],
         vec!["info", "--template", "lt.ectemplate"],
@@ -191,10 +200,12 @@ fn essential_graphics_template_via_script_and_commands() {
         vec!["render", "--template", "lt.ectemplate", "--queue"],
         vec!["render-frame", "--template", "lt.ectemplate", "--bridge", "1"],
     ] {
-        let output = Command::new(env!("CARGO_BIN_EXE_effectcraft-cli")).current_dir(&dir).args(&args).output().unwrap();
+        let output = Command::new(crate::binary()).current_dir(dir).args(&args).output().unwrap();
         assert_eq!(output.status.code(), Some(2), "{args:?}: {}", String::from_utf8_lossy(&output.stderr));
     }
+}
 
+fn rational_template_keeps_exact_rate(dir: &PathBuf, original_template: &[u8]) {
     // File-loaded templates can use exact rational rates that comp.new's float parser rounds.
     // Preserve that rate, Tick duration, work area, background and locked source layers.
     let mut project = effectcraft_engine::project::Project::from_json(&std::fs::read_to_string(dir.join("t.ecproj")).unwrap()).unwrap();
@@ -207,13 +218,13 @@ fn essential_graphics_template_via_script_and_commands() {
     comp.background = [0.08, 0.16, 0.24];
     comp.layers.first_mut().unwrap().switches.locked = true;
     std::fs::write(dir.join("rational.ecproj"), project.to_json()).unwrap();
-    ok(&dir, &["exec", "essential.exportTemplate", r#"{"comp":"Lower Third","path":"rational.ectemplate"}"#, "rational.ecproj"]);
+    ok(dir, &["exec", "essential.exportTemplate", r#"{"comp":"Lower Third","path":"rational.ectemplate"}"#, "rational.ecproj"]);
     let rational_template = std::fs::read(dir.join("rational.ectemplate")).unwrap();
-    let rational = ok(&dir, &["render-frame", "--template", "rational.ectemplate", "--frame", "5", "--out", "rational.png"]);
+    let rational = ok(dir, &["render-frame", "--template", "rational.ectemplate", "--frame", "5", "--out", "rational.png"]);
     assert!((rational["time"].as_f64().unwrap() - 5.0 / rate.as_f64()).abs() < 1e-9, "{rational}");
     assert_eq!((rational["width"].as_u64().unwrap(), rational["height"].as_u64().unwrap()), (320, 90));
     let output = dir.join("rational-work-area/frame_[#####].png");
-    ok(&dir, &["render", "--template", "rational.ectemplate", "--work-area", "--out", output.to_str().unwrap(), "--format", "png", "--resolution", "0.05"]);
+    ok(dir, &["render", "--template", "rational.ectemplate", "--work-area", "--out", output.to_str().unwrap(), "--format", "png", "--resolution", "0.05"]);
     let count = std::fs::read_dir(dir.join("rational-work-area"))
         .unwrap()
         .filter_map(Result::ok)
@@ -222,8 +233,8 @@ fn essential_graphics_template_via_script_and_commands() {
     assert_eq!(count, 4, "the template's exact work area contains frames 3 through 6");
     assert_eq!(std::fs::read(dir.join("rational.ectemplate")).unwrap(), rational_template);
     assert_eq!(std::fs::read(dir.join("lt.ectemplate")).unwrap(), original_template);
-    let _ = std::fs::remove_dir_all(&dir);
 }
+
 fn template_output_alias_fixture(case: &str) -> PathBuf {
     let dir = std::env::temp_dir().join(format!("ec-qa-template-output-{case}-{}", std::process::id()));
     let _ = std::fs::remove_dir_all(&dir);
@@ -251,7 +262,7 @@ fn assert_template_output_preserves_inputs(dir: &PathBuf, out: &str) -> Value {
     let template_before = std::fs::read(dir.join("lt.ectemplate")).unwrap();
     let values_before = std::fs::read(dir.join("values.json")).unwrap();
     // Read the inputs before interpreting the subprocess status or error text.
-    let result = Command::new(env!("CARGO_BIN_EXE_effectcraft-cli"))
+    let result = Command::new(crate::binary())
         .current_dir(dir)
         .args(["render-frame", "--template", "lt.ectemplate", "--values", "values.json", "--time", "1", "--out", out, "--json"])
         .output()
@@ -527,7 +538,7 @@ fn template_unknown_control_does_not_replace_extracted_media() {
     let invalid_values_before = std::fs::read(dir.join("bad-values.json")).unwrap();
 
     // Capture every file before interpreting status/JSON, so a failed command cannot hide a write.
-    let result = Command::new(env!("CARGO_BIN_EXE_effectcraft-cli"))
+    let result = Command::new(crate::binary())
         .current_dir(&dir)
         .args(["render-frame", "--template", "lt.ectemplate", "--values", "bad-values.json", "--time", "1", "--out", "failed.png", "--json"])
         .output()
@@ -623,11 +634,8 @@ fn template_missing_output_does_not_replace_extracted_media() {
     assert_ne!(sentinel_before, source_before);
 
     // Observe writes before interpreting the actual CLI usage exit.
-    let result = Command::new(env!("CARGO_BIN_EXE_effectcraft-cli"))
-        .current_dir(&dir)
-        .args(["render", "--template", "lt.ectemplate", "--values", "values.json", "--json"])
-        .output()
-        .unwrap();
+    let result =
+        Command::new(crate::binary()).current_dir(&dir).args(["render", "--template", "lt.ectemplate", "--values", "values.json", "--json"]).output().unwrap();
     let template_after = std::fs::read(dir.join("lt.ectemplate")).unwrap();
     let values_after = std::fs::read(dir.join("values.json")).unwrap();
     let source_after = std::fs::read(dir.join("source.png")).unwrap();
@@ -689,3 +697,123 @@ fn template_frame_output_cannot_alias_its_values_through_a_hard_link() {
     assert_eq!(reply["error"], "--out hard-linked-values.png would overwrite --values values.json", "{reply}");
     let _ = std::fs::remove_dir_all(&dir);
 }
+
+/// A template whose `Clip` control is a Media Replacement showing `source.png` (blue), with
+/// `other.png` (red) beside it to replace it with, exported as `lt.ectemplate` in a fresh `dir`.
+fn media_template(case: &str) -> PathBuf {
+    let temp_root = std::env::temp_dir().canonicalize().unwrap();
+    let dir = temp_root.join(format!("ec-qa-template-{case}-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    std::fs::write(dir.join("build.jsx"), BUILD).unwrap();
+    ok(&dir, &["script", "build.jsx", "--save-as", "t.ecproj"]);
+    image::RgbaImage::from_pixel(2, 2, image::Rgba([30, 60, 90, 255])).save(dir.join("source.png")).unwrap();
+    image::RgbaImage::from_pixel(2, 2, image::Rgba([200, 20, 40, 255])).save(dir.join("other.png")).unwrap();
+    let imported = ok(&dir, &["exec", "file.import", r#"{"paths":["source.png"]}"#, "t.ecproj", "--save"]);
+    let item = imported["result"]["items"][0].as_u64().unwrap();
+    let params = serde_json::json!({"comp": "Lower Third", "item": item, "position": [8, 8], "time": 0}).to_string();
+    let added = ok(&dir, &["exec", "layer.addItem", &params, "t.ecproj", "--save"]);
+    let layer = added["result"]["layer"].as_u64().unwrap();
+    let params = serde_json::json!({"comp": "Lower Third", "layer": layer, "name": "Clip"}).to_string();
+    ok(&dir, &["exec", "essential.addMedia", &params, "t.ecproj", "--save"]);
+    ok(&dir, &["exec", "essential.exportTemplate", r#"{"comp":"Lower Third","path":"lt.ectemplate"}"#, "t.ecproj"]);
+    dir
+}
+
+/// Renders the template's frame with `values` and checks that the control shows `other.png`.
+fn assert_renders_the_replacement(dir: &PathBuf, values: &str) {
+    std::fs::write(dir.join("values.json"), values).unwrap();
+    ok(dir, &["render-frame", "--template", "lt.ectemplate", "--values", "values.json", "--time", "1", "--out", "out.png"]);
+    let px = image::open(dir.join("out.png")).unwrap().to_rgba8().get_pixel(8, 8).0;
+    assert!(
+        (px[0] as i32 - 200).abs() <= 2 && (px[1] as i32 - 20).abs() <= 2 && (px[2] as i32 - 40).abs() <= 2,
+        "{values}: replacement media rendered: {px:?}"
+    );
+}
+
+#[test]
+fn template_values_fill_a_media_replacement_control_with_a_file_path() {
+    let dir = media_template("media-control");
+    assert_renders_the_replacement(&dir, r#"{"Clip":"other.png"}"#);
+
+    // A control that is not given a path is rejected with a clear message.
+    std::fs::write(dir.join("bad.json"), r#"{"Clip":5}"#).unwrap();
+    let (code, reply) = cli(&dir, &["render-frame", "--template", "lt.ectemplate", "--values", "bad.json", "--time", "1", "--out", "bad.png"]);
+    assert_eq!(code, 1, "{reply}");
+    assert!(reply["error"].as_str().unwrap().contains("media control"), "{reply}");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// The object forms `{"path"|"file"|"media": …}` take a file path too, and the control is found
+/// by name the way `essential.set` finds it: exactly, then ignoring case (#1787).
+#[test]
+fn template_media_control_takes_a_path_object_and_a_name_in_any_case() {
+    let dir = media_template("media-forms");
+    for values in [
+        r#"{"Clip":{"path":"other.png"}}"#,
+        r#"{"Clip":{"file":"other.png"}}"#,
+        r#"{"Clip":{"media":"other.png"}}"#,
+        r#"{"clip":"other.png"}"#,
+        r#"{"CLIP":{"path":"other.png"}}"#,
+    ] {
+        let _ = std::fs::remove_file(dir.join("out.png"));
+        assert_renders_the_replacement(&dir, values);
+    }
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// A media path that cannot be imported fails the render with an error naming the control and
+/// the path, and writes no frame (#1787).
+#[test]
+fn template_media_control_reports_a_path_that_cannot_be_imported() {
+    let dir = media_template("media-missing");
+    std::fs::write(dir.join("missing.json"), r#"{"Clip":"missing.png"}"#).unwrap();
+    let (code, reply) = cli(&dir, &["render-frame", "--template", "lt.ectemplate", "--values", "missing.json", "--time", "1", "--out", "missing-out.png"]);
+    assert_eq!(code, 1, "{reply}");
+    let error = reply["error"].as_str().unwrap();
+    assert!(error.contains("control `Clip`: cannot import missing.png"), "{reply}");
+    assert!(!dir.join("missing-out.png").exists(), "{reply}");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// Renders with `--template` name their outputs after the template's composition (#1937), not
+/// the numbered name a duplicate would get. The name ends in a number and differs from the
+/// archive's file name; an expression that looks the composition up by that name still finds it.
+#[test]
+fn template_render_outputs_keep_the_template_composition_name() {
+    let dir = std::env::temp_dir().join(format!("ec-qa-template-comp-name-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let build = BUILD.replace(r#"addComp("Lower Third""#, r#"addComp("Title Card 2""#).replace(
+        "var fill =",
+        "bar.property(\"ADBE Transform Group\").property(\"ADBE Position\").expression = '[comp(\"Title Card 2\").numLayers * 80, 65]';\nvar fill =",
+    );
+    std::fs::write(dir.join("build.jsx"), build).unwrap();
+    let built = ok(&dir, &["script", "build.jsx", "--save-as", "t.ecproj"]);
+    assert_eq!(built["output"], "controls: 3", "{built}");
+    ok(&dir, &["exec", "essential.exportTemplate", r#"{"comp":"Title Card 2","path":"card.ectemplate"}"#, "t.ecproj"]);
+    let template_before = std::fs::read(dir.join("card.ectemplate")).unwrap();
+    std::fs::write(dir.join("values.json"), r#"{"Title":"John Smith"}"#).unwrap();
+
+    for (case, values) in [("defaults", None), ("values", Some("values.json"))] {
+        let out = dir.join(case).join("[compName]_[#####].png");
+        let mut args =
+            vec!["render", "--template", "card.ectemplate", "--out", out.to_str().unwrap(), "--format", "png", "--start", "1", "--end", "1.0833333333333333"];
+        if let Some(values) = values {
+            args.extend(["--values", values]);
+        }
+        let rendered = ok(&dir, &args);
+        let rendered = rendered["rendered"].as_array().unwrap();
+        assert_eq!(rendered.len(), 1, "{case}: {rendered:?}");
+        assert_eq!(rendered[0]["comp"], "Title Card 2", "{case}: {rendered:?}");
+        let frames: Vec<_> = std::fs::read_dir(dir.join(case)).unwrap().map(|entry| entry.unwrap().file_name().to_string_lossy().into_owned()).collect();
+        assert_eq!(frames.len(), 1, "{case}: {frames:?}");
+        assert!(frames[0].starts_with("Title Card 2_") && frames[0].ends_with(".png"), "{case}: {frames:?}");
+        // The template's own two layers place the bar; the one-layer wrapper would move it left.
+        let frame = image::open(dir.join(case).join(&frames[0])).unwrap().to_rgba8();
+        let bar = frame.get_pixel(300, 75).0;
+        assert!(bar[0] > 240 && bar[1] < 15, "{case}: comp(\"Title Card 2\") is the template's composition: {bar:?}");
+    }
+    assert_eq!(std::fs::read(dir.join("card.ectemplate")).unwrap(), template_before);
+    let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/apps/effectcraft-web/Cargo.toml b/apps/effectcraft-web/Cargo.toml
index 6c30f9a56..28ea2f369 100644
--- a/apps/effectcraft-web/Cargo.toml
+++ b/apps/effectcraft-web/Cargo.toml
@@ -50,6 +50,7 @@ web-sys = { version = "0.3", features = [
     "HtmlElement",
     "HtmlInputElement",
     "Location",
+    "Navigator",
     "Url",
     "UrlSearchParams",
     "Window",
diff --git a/apps/effectcraft-web/js/host.js b/apps/effectcraft-web/js/host.js
index 3db6ad35c..9346acc29 100644
--- a/apps/effectcraft-web/js/host.js
+++ b/apps/effectcraft-web/js/host.js
@@ -19,7 +19,7 @@ const enc = (k) => encodeURIComponent(k);
 const dec = (n) => decodeURIComponent(n);
 
 async function opfs() {
-  if (!navigator.storage || !navigator.storage.getDirectory) throw new Error("no OPFS");
+  if (!navigator.storage?.getDirectory) throw new Error("no OPFS");
   const root = await navigator.storage.getDirectory();
   const dir = await root.getDirectoryHandle(DIR, { create: true });
   // Probe a write: some browsers expose OPFS but only write it from workers.
@@ -57,6 +57,26 @@ function req(r) {
   return new Promise((res, rej) => { r.onsuccess = () => res(r.result); r.onerror = () => rej(r.error); });
 }
 
+// Run `op` on `store` in a readwrite transaction of its own; resolves once the transaction has
+// committed. A request's success doesn't mean the write is stored: the transaction can still
+// abort afterwards (quota at commit, the browser closing), rolling it back, and a write
+// reported as saved then is never retried (#1242). A failed request aborts the transaction
+// with its error; an explicit abort leaves no error, hence the AbortError.
+function write(db, store, op) {
+  return new Promise((res, rej) => {
+    let tx = null;
+    try {
+      tx = db.transaction(store, "readwrite");
+      tx.oncomplete = () => res();
+      tx.onabort = () => rej(tx.error ?? new DOMException("the storage transaction was aborted", "AbortError"));
+      op(tx.objectStore(store));
+    } catch (e) {
+      try { tx?.abort(); } catch {}
+      rej(e);
+    }
+  });
+}
+
 async function idb() {
   if (!self.indexedDB) throw new Error("no IndexedDB");
   const open = indexedDB.open(DB, 1);
@@ -70,10 +90,10 @@ async function idb() {
       return all.map((r) => ({ key: r.key, data: new Uint8Array(r.data), modified: r.modified }));
     },
     async put(key, data, modified) {
-      await req(tx("readwrite").put({ key, data: data.slice().buffer, modified }));
+      await write(db, STORE, (s) => s.put({ key, data: data.slice().buffer, modified }));
     },
     async del(key) {
-      await req(tx("readwrite").delete(key));
+      await write(db, STORE, (s) => s.delete(key));
     },
   };
 }
@@ -96,7 +116,7 @@ export async function storeOpen(prefer) {
     try { backend = await make(); break; } catch (e) { console.info(`storage: ${make.name}: ${e.message ?? e}`); }
   }
   // Ask the browser not to evict the store under storage pressure (granted for installed apps).
-  try { if (navigator.storage && navigator.storage.persist) await navigator.storage.persist(); } catch {}
+  try { if (navigator.storage?.persist) await navigator.storage.persist(); } catch {}
   return backend.name;
 }
 
@@ -108,7 +128,7 @@ export async function storeDelete(key) { return backend.del(key); }
 /// Ask the browser to keep the origin's storage under pressure; resolves with whether it is.
 export async function storePersist() {
   try {
-    if (navigator.storage && navigator.storage.persist) return await navigator.storage.persist();
+    if (navigator.storage?.persist) return await navigator.storage.persist();
   } catch {}
   return false;
 }
@@ -207,7 +227,7 @@ export async function audioStart(workletUrl) {
       }
       if (gen !== generation) return;
       node = new AudioWorkletNode(c, "effectcraft-output", { numberOfInputs: 0, outputChannelCount: [2] });
-      node.port.onmessage = (e) => { if (e.data && e.data.underrun) underruns += e.data.underrun; };
+      node.port.onmessage = (e) => { if (e.data?.underrun) underruns += e.data.underrun; };
       kind = "worklet";
     } catch (e) {
       console.warn("audio: AudioWorklet unavailable, using ScriptProcessorNode", e);
@@ -298,11 +318,11 @@ function spawn(base) {
   const w = { worker, files: new Map(), ready: null, gpu: null };
   w.ready = new Promise((res, rej) => {
     worker.onmessage = (e) => {
-      if (e.data && e.data.type === "gpu") {
+      if (e.data?.type === "gpu") {
         w.gpu = e.data.gpu ? { adapter: e.data.gpu } : { cpu: e.data.error || "no GPU" };
         jobGpu = w.gpu;
       }
-      if (e.data && e.data.type === "ready") res();
+      if (e.data?.type === "ready") res();
     };
     worker.onerror = (e) => rej(new Error(e.message || "worker failed to start"));
   });
@@ -315,7 +335,15 @@ function spawn(base) {
 /// path, bytes)` receives "reply" (json), "file" (path, bytes: a rendered file to download),
 /// "store" (path, bytes: a file to keep in browser storage) and "error" (json = message).
 export function workerRun(id, json, files, base, onMessage) {
-  const w = idle.pop() ?? spawn(base);
+  let w;
+  try {
+    w = idle.pop() ?? spawn(base);
+  } catch (e) {
+    // `new Worker` throws at once when the page's origin is opaque (a sandboxed iframe): the job
+    // fails like one whose worker didn't start.
+    setTimeout(() => onMessage("error", String(e?.message || e), null, null));
+    return;
+  }
   running.set(id, w);
   w.ready.then(() => {
     w.worker.onmessage = (e) => {
@@ -380,10 +408,20 @@ const frameWorkers = [];
 /// GPU effects on it.
 export function frameWorkerStart(base, onMessage, gpu) {
   const index = frameWorkers.length;
-  const worker = new Worker(new URL("worker.js", base), { type: "module", name: `effectcraft-frames-${index}` });
+  let worker;
+  try {
+    worker = new Worker(new URL("worker.js", base), { type: "module", name: `effectcraft-frames-${index}` });
+  } catch (e) {
+    // The constructor throws at once when the page's origin is opaque (a sandboxed iframe). The
+    // slot stays, and the failure is reported like a worker that died, after the caller has
+    // recorded the index: frames then render on the page's thread (as with `?noworkers`).
+    frameWorkers.push(null);
+    setTimeout(() => onMessage(index, undefined, undefined, String(e?.message || e || "frame worker failed")));
+    return index;
+  }
   worker.onmessage = (e) => {
     const m = e.data;
-    if (m && m.type === "frameReply") onMessage(index, m.json, m.bytes ? new Uint8Array(m.bytes) : null, undefined);
+    if (m?.type === "frameReply") onMessage(index, m.json, m.bytes ? new Uint8Array(m.bytes) : null, undefined);
   };
   worker.onerror = (e) => {
     onMessage(index, undefined, undefined, String(e.message || "frame worker failed"));
@@ -409,7 +447,7 @@ const cacheDirHandles = {};
 
 async function cacheDir(kind = "frames") {
   if (cacheDirHandles[kind]) return cacheDirHandles[kind];
-  if (!navigator.storage || !navigator.storage.getDirectory) throw new Error("no Origin Private File System");
+  if (!navigator.storage?.getDirectory) throw new Error("no Origin Private File System");
   let d = await navigator.storage.getDirectory();
   for (const n of [CACHE_ROOT, "v1", kind]) d = await d.getDirectoryHandle(n, { create: true });
   cacheDirHandles[kind] = d;
@@ -456,8 +494,12 @@ export async function cacheRead(name) {
 /// resolves with its size.
 export async function cacheWrite(fullName, bytes) {
   const [dir, name] = await entryDir(fullName);
-  const canMove = typeof FileSystemHandle !== "undefined" && "move" in FileSystemHandle.prototype;
-  const tmp = canMove ? `${name}.tmp.${Math.random().toString(36).slice(2)}` : name;
+  const canMove =
+    typeof FileSystemHandle !== "undefined" &&
+    "move" in FileSystemHandle.prototype &&
+    typeof crypto !== "undefined" &&
+    typeof crypto.randomUUID === "function";
+  const tmp = canMove ? `${name}.tmp.${crypto.randomUUID()}` : name;
   const fh = await dir.getFileHandle(tmp, { create: true });
   if (fh.createSyncAccessHandle) {
     const h = await fh.createSyncAccessHandle();
@@ -502,7 +544,7 @@ export async function cacheClear() {
 
 /// Whether this thread has WebGPU (`navigator.gpu`).
 export function hasWebGpu() {
-  return !!(self.navigator && self.navigator.gpu);
+  return !!self.navigator?.gpu;
 }
 
 /// Post a message ({type: "frame", json} or {type: "file", path, bytes}) to frame worker `index`.
@@ -550,7 +592,7 @@ async function openFolder(handle, remember) {
   if (remember) {
     try {
       const db = await handlesDb();
-      await req(db.transaction("folders", "readwrite").objectStore("folders").put({ name, handle }));
+      await write(db, "folders", (s) => s.put({ name, handle }));
     } catch (e) { console.info("media browser: cannot remember the folder", e); }
   }
   return { name, entries };
@@ -602,7 +644,7 @@ export async function browseForget(name) {
   folders.delete(name);
   try {
     const db = await handlesDb();
-    await req(db.transaction("folders", "readwrite").objectStore("folders").delete(name));
+    await write(db, "folders", (s) => s.delete(name));
   } catch {}
 }
 
@@ -610,7 +652,7 @@ export async function browseForget(name) {
 export async function browseRead(path) {
   const rel = path.replace(/^\/Folders\//, "");
   const folder = folders.get(rel.split("/")[0]);
-  const h = folder && folder.files.get(rel);
+  const h = folder?.files.get(rel);
   if (!h) throw new Error(`${path}: its folder is not open (reconnect it)`);
   return new Uint8Array(await (await h.getFile()).arrayBuffer());
 }
@@ -664,7 +706,7 @@ export function showDeviceLost(message, kept) {
     self.effectcraft
       .execute("file.save", {})
       .catch(() => self.effectcraft.execute("file.saveAs", { path: "/Untitled Project.ecproj" }))
-      .catch((e) => (text.textContent = `Saving failed: ${(e && e.message) || e}`));
+      .catch((e) => (text.textContent = `Saving failed: ${e?.message || e}`));
   const reload = document.createElement("button");
   reload.textContent = "Reload";
   reload.onclick = async () => {
@@ -672,7 +714,7 @@ export function showDeviceLost(message, kept) {
     try {
       await self.effectcraft.flush();
     } catch (e) {
-      text.textContent = `Writing to browser storage failed (${(e && e.message) || e}). Save the project, or reload anyway and lose the changes.`;
+      text.textContent = `Writing to browser storage failed (${e?.message || e}). Save the project, or reload anyway and lose the changes.`;
       reload.textContent = "Reload Anyway";
       reload.disabled = false;
       reload.onclick = () => location.reload();
diff --git a/apps/effectcraft-web/src/app.rs b/apps/effectcraft-web/src/app.rs
index 1a6952408..169529e5d 100644
--- a/apps/effectcraft-web/src/app.rs
+++ b/apps/effectcraft-web/src/app.rs
@@ -86,27 +86,39 @@ pub struct WebApp {
 }
 
 impl eframe::App for WebApp {
+    /// Take dropped files out of `raw_input` before eframe can replay them on a hidden tab, read them asynchronously
+    /// through `open_or_import`, then run the shared app's input hook.
     fn raw_input_hook(&mut self, ctx: &egui::Context, raw_input: &mut egui::RawInput) {
+        // Files dropped on the page are input: read them here, where the browser's drop event is
+        // still the current pass's, not from a later (possibly logic-only) tick.
+        //
+        // The list is *taken* out of the raw input: a hidden tab runs `logic` and eframe appends
+        // the same prepared raw input back for the next pass, so leaving the files there would
+        // import them again on every hidden logic tick.
+        let dropped_files = std::mem::take(&mut raw_input.dropped_files);
+        let dropped: Vec<web_sys::File> = dropped_files.iter().filter_map(|f| f.web_file().cloned()).collect();
+        if !dropped.is_empty() {
+            files::read_files(dropped, |paths| post(move |app| open_or_import(app, paths)));
+        }
         self.app.raw_input_hook(ctx, raw_input);
     }
 
+    /// The browser host's logic tick: run queued UI actions, tick the shared app, poll API replies, flush Render
+    /// Queue downloads, persist the session snapshot when enabled, publish GPU/frame-worker/disk-cache info and close
+    /// the IME pass.
     fn logic(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         let actions = ACTIONS.with(|a| std::mem::take(&mut *a.borrow_mut()));
         for f in actions {
             f(&mut self.app);
         }
-        // Files dropped on the page: read them, then open/import.
-        let dropped: Vec<web_sys::File> = ctx.input(|i| i.raw.dropped_files.iter().filter_map(|f| f.web_file().cloned()).collect());
-        if !dropped.is_empty() {
-            files::read_files(dropped, |paths| post(move |app| open_or_import(app, paths)));
-        }
-        self.app.logic(ctx, frame);
+        self.app.tick(ctx, frame);
         api::poll_replies();
         // Render Queue outputs written this frame (here or by a worker) → downloads.
         files::flush_downloads();
         // What a reload comes back to.
         if self.persist {
-            persist::snapshot(&self.app.session, ctx.input(|i| i.time), 1.0);
+            // The app's monotonic clock: `ctx.input(|i| i.time)` is stale in a logic-only tick.
+            persist::snapshot(&self.app.session, self.app.now(), 1.0);
         }
         api::set_info("gpu", json!({"compositor": self.app.gpu_adapter(), "viewerOnGpu": self.app.viewer_on_gpu()}));
         api::set_info("frameWorkers", frames::stats());
@@ -114,6 +126,7 @@ impl eframe::App for WebApp {
         let d = &self.app.session.prefs.disk;
         diskcache::configure(d.disk_cache_enabled, d.disk_cache_max_gb, storage::quota());
         api::set_info("diskCache", diskcache::stats());
+        self.app.finish_ime_logic(ctx);
     }
 
     fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
@@ -184,13 +197,20 @@ fn install_hooks(app: &mut EffectcraftApp) {
 #[wasm_bindgen]
 pub async fn start(canvas_id: String) -> Result<(), JsValue> {
     eframe::WebLogger::init(log::LevelFilter::Info).ok();
+    // Match System follows `?lang=` in the address, then the browser's languages; a language
+    // chosen in Settings still wins.
+    let navigator = web_sys::window().map(|w| w.navigator());
+    let browser = navigator.iter().flat_map(|n| n.languages().iter().filter_map(|v| v.as_string()).collect::<Vec<_>>());
+    effectcraft_ui_egui::i18n::set_system_locales(query_value("lang"), browser.collect());
     let doc = web_sys::window().and_then(|w| w.document()).ok_or("no document")?;
     let canvas: web_sys::HtmlCanvasElement = doc.get_element_by_id(&canvas_id).ok_or("no canvas")?.dyn_into()?;
     let empty = query_flag("empty");
     let home = query_flag("home");
     // Browser storage: settings, recent projects, imported media, saved projects, auto-saves and
     // the last session come back.
-    let t0 = js_sys::Date::now();
+    // Monotonic (performance.now) rather than the wall clock: a system-time jump must not turn
+    // the storage-load report negative or huge.
+    let t0 = web_time::Instant::now();
     let stored = match persist::load(&query_value("storage").unwrap_or_default()).await {
         Ok(n) => n,
         Err(e) => {
@@ -198,7 +218,7 @@ pub async fn start(canvas_id: String) -> Result<(), JsValue> {
             0
         }
     };
-    api::set_info("storage", json!({"backend": persist::backend(), "entries": stored, "loadMs": js_sys::Date::now() - t0}));
+    api::set_info("storage", json!({"backend": persist::backend(), "entries": stored, "loadMs": t0.elapsed().as_secs_f64() * 1000.0}));
     audio::install_unlock();
     browse::restore();
     diskcache::init();
@@ -209,6 +229,7 @@ pub async fn start(canvas_id: String) -> Result<(), JsValue> {
             canvas,
             eframe::WebOptions::default(),
             Box::new(move |cc| {
+                EffectcraftApp::install_ime_reset_hooks(&cc.egui_ctx);
                 CTX.with(|c| *c.borrow_mut() = Some(cc.egui_ctx.clone()));
                 // The page owns this shared presentation device; worker devices retain their
                 // separate owned-device handlers. No browser error-scope future is blocked on.
@@ -257,6 +278,7 @@ pub async fn start(canvas_id: String) -> Result<(), JsValue> {
                 if n > 0 {
                     app.frames.set_remote(Some(Arc::new(frames::WebFrames::start(n, !query_flag("nogpuworkers")))));
                 }
+                app.frames.set_virtual_media(files::STORE.media_epoch(), Arc::new(|path| files::STORE.file_identity(path)));
                 let (tx, rx) = std::sync::mpsc::channel();
                 api::set_sender(tx);
                 app = app.with_control(rx);
diff --git a/apps/effectcraft-web/src/browse.rs b/apps/effectcraft-web/src/browse.rs
index ad7500fea..2fd680dcb 100644
--- a/apps/effectcraft-web/src/browse.rs
+++ b/apps/effectcraft-web/src/browse.rs
@@ -52,7 +52,7 @@ struct State {
 static STATE: LazyLock<Mutex<State>> = LazyLock::new(Mutex::default);
 
 fn state() -> std::sync::MutexGuard<'static, State> {
-    STATE.lock().unwrap_or_else(|e| e.into_inner())
+    STATE.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
 }
 
 /// The web app's Media Browser.
diff --git a/apps/effectcraft-web/src/files.rs b/apps/effectcraft-web/src/files.rs
index 3f3f3a99f..f6aac5aa4 100644
--- a/apps/effectcraft-web/src/files.rs
+++ b/apps/effectcraft-web/src/files.rs
@@ -48,14 +48,14 @@ pub fn list() -> Vec<(String, usize)> {
 
 /// The next write of `path` goes to browser storage only (no download).
 pub fn save_quietly(path: &str) {
-    QUIET.lock().unwrap_or_else(|e| e.into_inner()).push(path.to_string());
+    QUIET.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(path.to_string());
 }
 
 /// A rendered file (from the page's exporter or a worker): kept in the table unpersisted and
 /// downloaded at the next [`flush_downloads`].
 pub fn add_output(path: &str, data: Arc<[u8]>) {
     STORE.put_file(path, data, false);
-    OUTPUTS.lock().unwrap_or_else(|e| e.into_inner()).push(path.to_string());
+    OUTPUTS.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(path.to_string());
 }
 
 /// The table path for a picked/dropped file name.
@@ -120,7 +120,7 @@ impl Services for WebServices {
     fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
         put(path, data.into());
         let quiet = {
-            let mut q = QUIET.lock().unwrap_or_else(|e| e.into_inner());
+            let mut q = QUIET.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
             let n = q.len();
             q.retain(|p| p != path);
             q.len() != n
@@ -151,6 +151,10 @@ impl Services for WebServices {
     fn is_dir(&self, _path: &str) -> bool {
         false
     }
+    /// The table's keys are the paths themselves.
+    fn full_path(&self, path: &str) -> Option<String> {
+        Some(path.to_string())
+    }
 }
 
 /// Media import from the table (the bytes are also handed to the media pool, which decodes them).
@@ -184,7 +188,7 @@ pub fn export_sink() -> Arc<effectcraft_export::Sink> {
 
 /// Download the render outputs written since the last call.
 pub fn flush_downloads() {
-    let paths = std::mem::take(&mut *OUTPUTS.lock().unwrap_or_else(|e| e.into_inner()));
+    let paths = std::mem::take(&mut *OUTPUTS.lock().unwrap_or_else(std::sync::PoisonError::into_inner));
     let mut out: Vec<(String, Arc<[u8]>)> = paths.into_iter().filter_map(|p| get(&p).map(|d| (file_name(&p).to_string(), d))).collect();
     out.sort_by(|a, b| a.0.cmp(&b.0));
     out.dedup_by(|a, b| a.0 == b.0);
diff --git a/apps/effectcraft-web/src/frames.rs b/apps/effectcraft-web/src/frames.rs
index 523fd03c8..69089e308 100644
--- a/apps/effectcraft-web/src/frames.rs
+++ b/apps/effectcraft-web/src/frames.rs
@@ -311,10 +311,11 @@ pub fn stats() -> Value {
     })
 }
 
+type PendingFrameCheck = (js_sys::Function, js_sys::Function, (u32, u32, Vec<u8>), f64);
+
 thread_local! {
     /// `workerFrameCheck` promises waiting for their frame: id → (resolve, reject, local frame).
-    #[allow(clippy::type_complexity)]
-    static CHECKS: RefCell<std::collections::HashMap<u64, (js_sys::Function, js_sys::Function, (u32, u32, Vec<u8>), f64)>> = RefCell::new(Default::default());
+    static CHECKS: RefCell<std::collections::HashMap<u64, PendingFrameCheck>> = RefCell::new(Default::default());
 }
 
 /// `effectcraft.workerFrameCheck({time?, scale?, backend?})`: render the active comp's frame in
@@ -416,6 +417,7 @@ fn post_reply(r: &FrameReply, px: Option<&[u8]>) {
 fn new_server() -> FrameServer {
     let mut s = FrameServer::new(crate::worker::pool(), Some(Arc::new(effectcraft_expr::Expressions)));
     s.set_layer_store(Some(Arc::new(effectcraft_engine::render::PrefetchStore::default())));
+    s.set_virtual_id(Some(Arc::new(|path| crate::files::STORE.file_identity(path))));
     s
 }
 
diff --git a/apps/effectcraft-web/src/lib.rs b/apps/effectcraft-web/src/lib.rs
index 0d59906f2..97d2e887f 100644
--- a/apps/effectcraft-web/src/lib.rs
+++ b/apps/effectcraft-web/src/lib.rs
@@ -6,17 +6,17 @@
 //!
 //! | Desktop | Web |
 //! |---|---|
-//! | file system (`FsServices`, media reads, export writes) | a virtual file table ([`files`]) persisted to the Origin Private File System / IndexedDB ([`persist`], [`store`]) |
+//! | file system (`FsServices`, media reads, export writes) | a virtual file table (`files`) persisted to the Origin Private File System / IndexedDB (`persist`, [`store`]) |
 //! | config directory (settings, shortcuts, recent projects, auto-saves) | the same store ([`store::WebConfig`]) |
 //! | rfd file dialogs | `<input type=file>` pickers; drop files on the page |
-//! | Media Browser on the file system | browser storage and folders opened with the File System Access API ([`browse`]) |
+//! | Media Browser on the file system | browser storage and folders opened with the File System Access API (`browse`) |
 //! | written files (Save, Render Queue) | browser downloads (several render files as one `.zip`) |
-//! | frame render threads | frame workers, each with a project replica fed by diffs and its own WebGPU device ([`frames`]); `Frames::pump` on the UI thread without workers |
-//! | disk cache folder | frames in the Origin Private File System, written by the frame workers ([`diskcache`]) |
-//! | (none) | the storage manager: usage, quota, persistence, clearing ([`storage`]) |
-//! | Render Queue / analysis threads | Web Workers running their own engine instance ([`worker`]) |
-//! | cpal audio output | Web Audio: an AudioWorklet fed from the preview mixdown ([`audio`]) |
-//! | TCP control channel / MCP | `window.effectcraft` JavaScript API ([`api`]) |
+//! | frame render threads | frame workers, each with a project replica fed by diffs and its own WebGPU device (`frames`); `Frames::pump` on the UI thread without workers |
+//! | disk cache folder | frames in the Origin Private File System, written by the frame workers (`diskcache`) |
+//! | (none) | the storage manager: usage, quota, persistence, clearing (`storage`) |
+//! | Render Queue / analysis threads | Web Workers running their own engine instance (`worker`) |
+//! | cpal audio output | Web Audio: an AudioWorklet fed from the preview mixdown (`audio`) |
+//! | TCP control channel / MCP | `window.effectcraft` JavaScript API (`api`) |
 //!
 //! [`store`] is portable (unit-tested natively); everything else is `wasm32`-only.
 
diff --git a/apps/effectcraft-web/src/store.rs b/apps/effectcraft-web/src/store.rs
index b3a858def..8aafdac1c 100644
--- a/apps/effectcraft-web/src/store.rs
+++ b/apps/effectcraft-web/src/store.rs
@@ -20,6 +20,7 @@
 
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Mutex, OnceLock};
 
 use effectcraft_engine::config::{ConfigStore, FileOps};
@@ -45,6 +46,8 @@ pub struct Entry {
     /// Which write this is: new with every write of the key, so a file replaced by another of
     /// the same size still reads as changed (workers are sent it again, #218).
     pub version: u64,
+    /// FNV-1a of `data`, filled the first time a disk-cache key asks for it.
+    hash: Option<u64>,
 }
 
 /// A queued write for the browser storage: `data` = `None` deletes the key.
@@ -69,13 +72,13 @@ impl Mirror {
     /// An entry read from the browser's storage at startup (nothing to flush).
     pub fn load(&mut self, key: &str, data: Arc<[u8]>, modified: f64) {
         let version = self.next_version();
-        self.entries.insert(key.to_string(), Entry { data, modified, persist: true, version });
+        self.entries.insert(key.to_string(), Entry { data, modified, persist: true, version, hash: None });
     }
 
     pub fn put(&mut self, key: &str, data: Arc<[u8]>, modified: f64, persist: bool) {
         let was_persisted = self.entries.get(key).is_some_and(|e| e.persist);
         let version = self.next_version();
-        self.entries.insert(key.to_string(), Entry { data, modified, persist, version });
+        self.entries.insert(key.to_string(), Entry { data, modified, persist, version, hash: None });
         if persist || was_persisted {
             self.touch(key);
         }
@@ -149,19 +152,36 @@ pub fn key_path(key: &str) -> Option<&str> {
     key.strip_prefix(FILES).filter(|p| p.starts_with('/'))
 }
 
+/// FNV-1a 64. Computed when a disk-cache key first needs the file, not on every write.
+fn content_hash(data: &[u8]) -> u64 {
+    let mut h: u64 = 0xcbf2_9ce4_8422_2325;
+    for &b in data {
+        h ^= u64::from(b);
+        h = h.wrapping_mul(0x0000_0100_0000_01b3);
+    }
+    h
+}
+
 /// The persistent store: a [`Mirror`] and a hook that wakes the flusher after changes.
-#[derive(Default)]
 pub struct Store {
     pub mirror: Mutex<Mirror>,
     /// Called after every change that needs flushing (the web host schedules a flush).
     pub on_change: OnceLock<fn()>,
     /// Clock in milliseconds since the Unix epoch (tests pin it).
     pub clock: OnceLock<fn() -> f64>,
+    /// Bumped when a virtual file is written. Preview cache lookups key on it; they do not hash.
+    media_epoch: Arc<AtomicU64>,
+}
+
+impl Default for Store {
+    fn default() -> Self {
+        Self { mirror: Mutex::default(), on_change: OnceLock::new(), clock: OnceLock::new(), media_epoch: Arc::new(AtomicU64::new(0)) }
+    }
 }
 
 impl Store {
     pub fn lock(&self) -> std::sync::MutexGuard<'_, Mirror> {
-        self.mirror.lock().unwrap_or_else(|e| e.into_inner())
+        self.mirror.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
     }
 
     fn now(&self) -> f64 {
@@ -179,12 +199,40 @@ impl Store {
     /// Store a file under `path` (persisted unless `persist` is false: render outputs).
     pub fn put_file(&self, path: &str, data: Arc<[u8]>, persist: bool) {
         let now = self.now();
-        self.lock().put(&file_key(path), data, now, persist);
+        let key = file_key(path);
+        let replaced = self.lock().get(&key).is_none_or(|e| !Arc::ptr_eq(&e.data, &data));
+        self.lock().put(&key, data, now, persist);
+        if replaced {
+            self.media_epoch.fetch_add(1, Ordering::Relaxed);
+        }
         if persist {
             self.changed();
         }
     }
 
+    /// The generation preview cache lookups key on. It changes when [`Self::put_file`] writes
+    /// a different blob, and it is not a content hash.
+    pub fn media_epoch(&self) -> Arc<AtomicU64> {
+        self.media_epoch.clone()
+    }
+
+    /// Size and content hash of the file under `path`. The hash is stored on the entry so a
+    /// later key does not walk the bytes again.
+    pub fn file_identity(&self, path: &str) -> Option<(u64, u64)> {
+        let key = file_key(path);
+        let mut mirror = self.lock();
+        let entry = mirror.entries.get(&key)?;
+        if let Some(hash) = entry.hash {
+            return Some((entry.data.len() as u64, hash));
+        }
+        let hash = content_hash(&entry.data);
+        let len = entry.data.len() as u64;
+        if let Some(entry) = mirror.entries.get_mut(&key) {
+            entry.hash = Some(hash);
+        }
+        Some((len, hash))
+    }
+
     pub fn file(&self, path: &str) -> Option<Arc<[u8]>> {
         self.lock().get(&file_key(path)).map(|e| e.data.clone())
     }
@@ -446,6 +494,11 @@ mod tests {
         assert_ne!(a, b);
         assert_eq!(&data[..], b"blue");
         assert_eq!(s.file_versioned("/collision.png").map(|f| f.1), Some(b), "reading doesn't change it");
+        let epoch = s.media_epoch().load(Ordering::Relaxed);
+        let id = s.file_identity("/collision.png").expect("identity");
+        assert_eq!(id, (4, content_hash(b"blue")));
+        assert_eq!(s.file_identity("/collision.png"), Some(id), "the hash is kept on the entry");
+        assert!(epoch >= 2, "each new blob bumps the generation the preview keys on");
     }
 
     /// A write that failed is flushed again with the key's latest state (#215).
diff --git a/apps/effectcraft-web/tests/smoke.mjs b/apps/effectcraft-web/tests/smoke.mjs
index 3a6c1337c..83091a72a 100644
--- a/apps/effectcraft-web/tests/smoke.mjs
+++ b/apps/effectcraft-web/tests/smoke.mjs
@@ -162,7 +162,7 @@ try {
   const info = await js("effectcraft.info()");
   report.steps.gpu = { webgpu: info.webgpu, backend: info.backend, ...info.gpu };
   if (info.webgpu && info.backend === "BrowserWebGpu") {
-    check(info.gpu && info.gpu.compositor, "GPU compositor on WebGPU");
+    check(info.gpu?.compositor, "GPU compositor on WebGPU");
     check(info.gpu.viewerOnGpu, "viewer frames on the GPU");
   }
 
@@ -250,7 +250,7 @@ try {
   const st = await js(`(async () => { await new Promise((r) => setTimeout(r, 1200)); return effectcraft.execute("storage.info", {}); })()`);
   report.steps.storage = st;
   check(st.available && st.quota > 0 && st.usage > 0, `storage.info: ${JSON.stringify(st)}`);
-  check(st.diskCache && st.diskCache.enabled && st.diskCache.writes > 0, `disk cache in OPFS: ${JSON.stringify(st.diskCache)}`);
+  check(st.diskCache?.enabled && st.diskCache.writes > 0, `disk cache in OPFS: ${JSON.stringify(st.diskCache)}`);
   await js(`effectcraft.execute("prefs.open", {page: "disk"})`);
   await sleep(800);
   report.steps.storage.screenshot = await shot("01c-storage-manager");
@@ -378,14 +378,14 @@ try {
     const jobs = gj.workers.jobs || [];
     const rj = jobs.filter((j) => j.kind === "Render").pop();
     const wj = jobs.filter((j) => j.kind === "Warp").pop();
-    check(gj.workers.gpu && gj.workers.gpu.adapter, `job workers have a GPU: ${JSON.stringify(gj.workers)}`);
+    check(gj.workers.gpu?.adapter, `job workers have a GPU: ${JSON.stringify(gj.workers)}`);
     check(gj.status.every((st) => st === "Done"), `GPU job render: ${JSON.stringify(gj.status)}`);
-    check(rj && rj.gpu && rj.readbacks >= 3 && rj.passes >= 6, `Render Queue frames on the job worker's GPU, in passes: ${JSON.stringify(rj)}`);
+    check(rj?.gpu && rj.readbacks >= 3 && rj.passes >= 6, `Render Queue frames on the job worker's GPU, in passes: ${JSON.stringify(rj)}`);
     check(gj.warp.analyzed, `Warp Stabilizer analysed in a job worker: ${JSON.stringify(gj.warp)}`);
-    check(wj && wj.gpu && wj.readbacks > 0, `Warp Stabilizer input frames on the job worker's GPU: ${JSON.stringify(wj)}`);
+    check(wj?.gpu && wj.readbacks > 0, `Warp Stabilizer input frames on the job worker's GPU: ${JSON.stringify(wj)}`);
     const fj = jobs.filter((j) => j.kind === "ContentFill").pop();
     check(!gj.fill.error && gj.fillLayers.length > 0, `Content-Aware Fill in a job worker: ${JSON.stringify(gj.fill)} ${JSON.stringify(gj.fillLayers)}`);
-    check(fj && fj.gpu && fj.readbacks > 0, `Content-Aware Fill frames on the job worker's GPU: ${JSON.stringify(fj)}`);
+    check(fj?.gpu && fj.readbacks > 0, `Content-Aware Fill frames on the job worker's GPU: ${JSON.stringify(fj)}`);
     check(gj.maxGapMs < 400, `event loop blocked ${gj.maxGapMs} ms during the GPU jobs: ${JSON.stringify(gj.gaps)}`);
     check(gj.gaps.prepareFill < 50, `event loop blocked ${gj.gaps.prepareFill} ms while editing after the analysis (pre-compose, mask): ${JSON.stringify(gj.gaps)}`);
   } else {
@@ -418,7 +418,7 @@ try {
   check(mb.path === "/Browser Storage" && mb.entries.some((e) => e.name === "tone.wav" && e.kind === "audio"), `Media Browser: ${JSON.stringify(report.steps.mediaBrowser)}`);
   check(mb.actions.some((a) => a.id === "addFiles"), "Media Browser: Add Files…");
   const mbImport = await js(`effectcraft.execute("mediaBrowser.import", {paths: [${JSON.stringify(mb.entries.find((e) => e.name === "tone.wav")?.path ?? "/tone.wav")}]})`);
-  check(!mbImport.pending && mbImport.items && mbImport.items.length === 1, `Media Browser import: ${JSON.stringify(mbImport)}`);
+  check(!mbImport.pending && mbImport.items?.length === 1, `Media Browser import: ${JSON.stringify(mbImport)}`);
   await js(`effectcraft.request("ui.playback", {action: "stop"})`);
   await js(`effectcraft.execute("time.set", {time: 0})`);
   await js(`effectcraft.request("ui.playback", {action: "play"})`);
@@ -579,7 +579,7 @@ try {
   report.steps.final2 = { screenshot: await shot("03-offline") };
 } catch (e) {
   failed = true;
-  report.error = String(e && e.stack || e);
+  report.error = String(e?.stack || e);
   try { report.errorShot = await shot("error"); } catch {}
 }
 report.console = logs.slice(-40);
diff --git a/apps/effectcraft-web/tests/storage.mjs b/apps/effectcraft-web/tests/storage.mjs
new file mode 100644
index 000000000..0855c1674
--- /dev/null
+++ b/apps/effectcraft-web/tests/storage.mjs
@@ -0,0 +1,180 @@
+// The IndexedDB storage backend of the web app (js/host.js) under Node with a fake IndexedDB, no
+// browser or Wasm build needed:
+//
+//   node apps/effectcraft-web/tests/storage.mjs
+//
+// A write is acknowledged only once its transaction has committed, not when its request
+// succeeded: a transaction that aborts afterwards rolls the write back, and the write must be
+// reported as failed so the flush keeps it for a retry (#1242). Exits non-zero on failure.
+import assert from "node:assert/strict";
+import { dirname, join } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const tick = () => new Promise((r) => setTimeout(r, 0));
+globalThis.self = globalThis;
+
+// A small IndexedDB: requests succeed (or fail) one task after they're made, and a readwrite
+// transaction commits once its requests are done, unless it was aborted (which rolls back its
+// writes). `fault` makes the next request do something else.
+let fault = null; // "abortAfterSuccess" | "requestError" | "throw"
+const databases = new Map();
+
+class Request {
+  constructor(tx) {
+    this.transaction = tx;
+    this.result = undefined;
+    this.error = null;
+  }
+}
+
+class Store {
+  constructor(tx, rows) {
+    this.tx = tx;
+    this.rows = rows;
+  }
+  request(apply) {
+    const tx = this.tx;
+    if (tx.finished) throw new DOMException("the transaction has finished", "TransactionInactiveError");
+    const f = fault;
+    fault = null;
+    if (f === "throw") throw new DOMException("the value can't be cloned", "DataCloneError");
+    const r = new Request(tx);
+    tx.pending++;
+    setTimeout(() => {
+      tx.pending--;
+      if (tx.finished) return;
+      if (f === "requestError") {
+        r.error = new DOMException("the key already exists", "ConstraintError");
+        const e = { target: r, defaultPrevented: false, preventDefault() { this.defaultPrevented = true; } };
+        r.onerror?.(e);
+        tx.onerror?.(e);
+        if (!e.defaultPrevented) tx.fail(r.error);
+        return;
+      }
+      r.result = apply(tx.staged);
+      r.onsuccess?.({ target: r });
+      if (f === "abortAfterSuccess") tx.abort();
+      tx.maybeCommit();
+    }, 0);
+    return r;
+  }
+  put(v) {
+    return this.request((rows) => { rows.set(v[this.keyPath], structuredClone(v)); return v[this.keyPath]; });
+  }
+  delete(k) {
+    return this.request((rows) => { rows.delete(k); });
+  }
+  get(k) {
+    return this.request((rows) => rows.get(k));
+  }
+  getAll() {
+    return this.request((rows) => [...rows.values()]);
+  }
+}
+
+class Transaction {
+  constructor(db, name) {
+    this.db = db;
+    this.name = name;
+    this.staged = new Map(db.stores.get(name));
+    this.pending = 0;
+    this.finished = false;
+    this.error = null;
+    setTimeout(() => this.maybeCommit(), 0);
+  }
+  objectStore(name) {
+    const s = new Store(this, this.staged);
+    s.keyPath = this.db.keyPaths.get(name);
+    return s;
+  }
+  maybeCommit() {
+    if (this.finished || this.pending > 0) return;
+    this.finished = true;
+    this.db.stores.set(this.name, this.staged);
+    setTimeout(() => this.oncomplete?.(), 0);
+  }
+  fail(error) {
+    this.error = error;
+    this.abort();
+  }
+  abort() {
+    if (this.finished) throw new DOMException("the transaction has finished", "InvalidStateError");
+    this.finished = true;
+    setTimeout(() => this.onabort?.(), 0);
+  }
+}
+
+class Database {
+  constructor() {
+    this.stores = new Map();
+    this.keyPaths = new Map();
+  }
+  createObjectStore(name, { keyPath }) {
+    this.stores.set(name, new Map());
+    this.keyPaths.set(name, keyPath);
+  }
+  transaction(name) {
+    if (!this.stores.has(name)) throw new DOMException(`no store ${name}`, "NotFoundError");
+    return new Transaction(this, name);
+  }
+}
+
+globalThis.indexedDB = {
+  open(name) {
+    const r = new Request(null);
+    setTimeout(() => {
+      let db = databases.get(name);
+      if (!db) {
+        db = new Database();
+        databases.set(name, db);
+        r.result = db;
+        r.onupgradeneeded?.();
+      }
+      r.result = db;
+      r.onsuccess?.({ target: r });
+    }, 0);
+    return r;
+  },
+};
+
+const host = await import(pathToFileURL(join(here, "../js/host.js")));
+assert.equal(await host.storeOpen("indexeddb"), "indexeddb");
+const stored = (key) => databases.get("effectcraft").stores.get("entries").get(key);
+const bytes = (s) => new TextEncoder().encode(s);
+const text = (row) => row && new TextDecoder().decode(new Uint8Array(row.data));
+
+// A healthy write resolves once committed, and the store has it then.
+await host.storePut("project.json", bytes("v1"), 1);
+assert.equal(text(stored("project.json")), "v1", "a resolved put is committed");
+
+// The put's request succeeds, then the transaction aborts: the put fails, the old value stays.
+fault = "abortAfterSuccess";
+await assert.rejects(host.storePut("project.json", bytes("v2"), 2), { name: "AbortError" }, "an aborted put is reported");
+assert.equal(text(stored("project.json")), "v1", "the aborted put was rolled back");
+
+// The same for a delete: it fails and the entry stays.
+fault = "abortAfterSuccess";
+await assert.rejects(host.storeDelete("project.json"), { name: "AbortError" }, "an aborted delete is reported");
+assert.equal(text(stored("project.json")), "v1", "the aborted delete was rolled back");
+
+// A failed request aborts its transaction with the request's error.
+fault = "requestError";
+await assert.rejects(host.storePut("project.json", bytes("v3"), 3), { name: "ConstraintError" });
+assert.equal(text(stored("project.json")), "v1");
+
+// A request that throws at once (a value that can't be stored) fails the write.
+fault = "throw";
+await assert.rejects(host.storePut("project.json", bytes("v4"), 4), { name: "DataCloneError" });
+assert.equal(text(stored("project.json")), "v1");
+
+// The retry after a failure commits the latest value, and a later delete removes it.
+await host.storePut("project.json", bytes("v5"), 5);
+assert.equal(text(stored("project.json")), "v5");
+await host.storeDelete("project.json");
+assert.equal(stored("project.json"), undefined, "a resolved delete is committed");
+const all = await host.storeLoadAll();
+assert.deepEqual(all, [], "nothing else was written");
+
+await tick();
+console.log("storage: ok");
diff --git a/apps/effectcraft-web/tests/workers.mjs b/apps/effectcraft-web/tests/workers.mjs
index 15a77f1d5..58901885f 100644
--- a/apps/effectcraft-web/tests/workers.mjs
+++ b/apps/effectcraft-web/tests/workers.mjs
@@ -7,6 +7,8 @@
 //   (#218), and not when it is unchanged.
 // - A worker whose start fails fails its job and is terminated, instead of the job waiting for
 //   "ready" forever (#216): host.js on the worker's error, worker.js re-raising the failed start.
+// - A `new Worker` that throws (a sandboxed iframe's opaque origin, #1586) fails the job, and a
+//   frame worker is reported dead, instead of the exception escaping into startup.
 // Exits non-zero on failure.
 import assert from "node:assert/strict";
 import { copyFileSync, mkdtempSync, writeFileSync } from "node:fs";
@@ -67,6 +69,35 @@ assert.equal(failed.kind, "error");
 assert.ok(workers[1].terminated, "the failed worker is terminated");
 assert.equal(host.workerStats().running, 0);
 
+// A `new Worker` that throws (a sandboxed iframe's opaque origin): the job fails, and a frame
+// worker is reported dead, instead of the exception escaping into startup.
+failStart = false;
+const RealWorker = globalThis.Worker;
+globalThis.Worker = class {
+  constructor() {
+    throw new Error("SecurityError: cannot be accessed from origin 'null'");
+  }
+};
+// (Take the idle workers out of play first, so that a new one has to be built.)
+for (let n = host.workerStats().idle, id = 100; n > 0; n--, id++) {
+  host.workerRun(id, "{}", [], "http://localhost/", () => {});
+  host.workerCancel(id);
+}
+assert.equal(host.workerStats().idle, 0);
+const threw = await run(6, []);
+assert.equal(threw.kind, "error");
+assert.match(threw.json, /SecurityError/);
+assert.equal(host.workerStats().running, 0);
+let frameCall = null;
+const frameDone = new Promise((resolve) => {
+  frameCall = host.frameWorkerStart("http://localhost/", (index, json, bytes, error) => resolve({ index, error }), false);
+});
+const dead = await frameDone;
+assert.equal(dead.index, frameCall, "the dead worker keeps its index");
+assert.match(dead.error, /SecurityError/);
+host.frameWorkerPost(frameCall, { type: "frame" }); // no worker behind it: ignored
+globalThis.Worker = RealWorker;
+
 // #216, worker side: a rejected start is re-raised where the page's `onerror` sees it.
 const dir = mkdtempSync(join(tmpdir(), "ec-worker-"));
 copyFileSync(join(here, "../web/worker.js"), join(dir, "worker.js"));
diff --git a/apps/effectcraft-web/web/index.html b/apps/effectcraft-web/web/index.html
index 70ab93ff5..85049007f 100644
--- a/apps/effectcraft-web/web/index.html
+++ b/apps/effectcraft-web/web/index.html
@@ -71,7 +71,13 @@
         ...ec.info(),
         crossOriginIsolated: self.crossOriginIsolated,
         webgpu: !!navigator.gpu,
-        serviceWorker: !!(navigator.serviceWorker && navigator.serviceWorker.controller),
+        serviceWorker: (() => {
+          try {
+            return !!(navigator.serviceWorker && navigator.serviceWorker.controller);
+          } catch {
+            return false;
+          }
+        })(),
         load: window.effectcraftLoad,
       }),
       // Browser storage (OPFS / IndexedDB): save without downloading, list, remove, wait for writes.
@@ -83,8 +89,14 @@
       workerFrameCheck: (params) => ec.workerFrameCheck(params ?? {}).then(JSON.parse),
     };
     // Offline start and install (PWA): the service worker caches the app's files.
-    if ("serviceWorker" in navigator && !new URLSearchParams(location.search).has("nosw")) {
-      navigator.serviceWorker.register("sw.js").catch((e) => console.warn("service worker:", e));
+    if (!new URLSearchParams(location.search).has("nosw")) {
+      try {
+        if ("serviceWorker" in navigator && navigator.serviceWorker) {
+          navigator.serviceWorker.register("sw.js").catch((e) => console.warn("service worker:", e));
+        }
+      } catch (e) {
+        console.warn("service worker:", e);
+      }
     }
     try {
       // Compile once: the page and its render workers instantiate the same module.
diff --git a/apps/effectcraft-web/web/sw.js b/apps/effectcraft-web/web/sw.js
index 8c7efc2e5..4acbeeeeb 100644
--- a/apps/effectcraft-web/web/sw.js
+++ b/apps/effectcraft-web/web/sw.js
@@ -32,13 +32,15 @@ self.addEventListener("fetch", (event) => {
   if (req.method !== "GET" || url.origin !== self.location.origin) return;
   event.respondWith(
     (async () => {
-      const cache = await caches.open(CACHE);
-      // The page itself regardless of its query (?empty, ?demo…).
-      const key = req.mode === "navigate" ? new URL("./", self.registration.scope).href : req;
-      const hit = await cache.match(key, { ignoreSearch: req.mode === "navigate" });
-      if (hit) return hit;
+      const cache = await caches.open(CACHE).catch(() => null);
+      if (cache) {
+        // The page itself regardless of its query (?empty, ?demo…).
+        const key = req.mode === "navigate" ? new URL("./", self.registration.scope).href : req;
+        const hit = await cache.match(key, { ignoreSearch: req.mode === "navigate" }).catch(() => null);
+        if (hit) return hit;
+      }
       const res = await fetch(req);
-      if (res.ok && res.type === "basic") cache.put(req, res.clone());
+      if (cache && res.ok && res.type === "basic") void cache.put(req, res.clone()).catch(() => {});
       return res;
     })(),
   );
diff --git a/apps/effectcraft/Cargo.toml b/apps/effectcraft/Cargo.toml
index 5ad6c80d1..e09e7d8b2 100644
--- a/apps/effectcraft/Cargo.toml
+++ b/apps/effectcraft/Cargo.toml
@@ -15,7 +15,7 @@ effectcraft-host = { workspace = true }
 effectcraft-ui-egui = { workspace = true }
 egui = { workspace = true }
 # `links`: links (Help menu, Discord, Settings) open in the system browser.
-eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "links", "wayland", "x11"] }
+eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "clipboard", "links", "wayland", "x11"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 # The window's monitors, size and position (src/window.rs), and macOS event-loop options (no app
@@ -48,3 +48,6 @@ objc2-app-kit = { version = "0.3", default-features = false, features = ["std",
 # PhotoCraft and PdfCraft) registers the handler (Objective-C interop needs unsafe, which our
 # workspace forbids) behind a safe API. Pinned exactly: review the diff before bumping.
 fmv-macos-events = "=0.1.0"
+
+[target.'cfg(windows)'.dependencies]
+craft-update = { workspace = true }
diff --git a/apps/effectcraft/src/main.rs b/apps/effectcraft/src/main.rs
index 2f99bd5e0..64ab5443d 100644
--- a/apps/effectcraft/src/main.rs
+++ b/apps/effectcraft/src/main.rs
@@ -9,8 +9,8 @@
 //!
 //! `--control <port>` (or `EFFECTCRAFT_CONTROL_PORT`) starts a localhost JSON-lines control server;
 //! see `effectcraft_ui_egui::control` for the methods.
-#![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)]
+#![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]
 
 // Built everywhere so its tests run on every platform; only Linux AppImages use it.
 mod appearance;
@@ -23,8 +23,8 @@ mod control_server;
 mod launch_guard;
 #[cfg(target_os = "macos")]
 mod native_menu;
-// Built everywhere so it stays checked; only the macOS app uses it.
-#[cfg_attr(not(target_os = "macos"), allow(dead_code))]
+// Built everywhere so it stays checked; the macOS and Linux apps use it.
+#[cfg_attr(not(any(target_os = "macos", target_os = "linux")), allow(dead_code))]
 mod sheet_dialogs;
 mod window;
 
@@ -50,7 +50,7 @@ fn app_icon() -> egui::IconData {
 fn is_project_file(path: &str) -> bool {
     std::path::Path::new(path)
         .extension()
-        .and_then(|ext| ext.to_str())
+        .and_then(std::ffi::OsStr::to_str)
         .is_some_and(|ext| ext.eq_ignore_ascii_case("ecproj") || ext.eq_ignore_ascii_case("ecprojx"))
 }
 
@@ -122,7 +122,42 @@ fn control_port(name: &str, value: Option<&str>) -> Result<u16, String> {
     }
 }
 
+/// The commands' file dialogs open without blocking the frame where the host's backend would:
+/// on macOS as sheets instead of nested modal loops (#511), on Linux through the desktop
+/// portal from a worker thread — a blocking portal dialog leaves the main thread waiting on its
+/// answer without pumping events, so the window stops answering the compositor and the desktop
+/// offers to force-quit it while the Open dialog is up (#1275). Windows' blocking dialog pumps
+/// its own messages, so it keeps [`effectcraft_ui_egui::Hooks::pick_files`] and friends.
+/// The dialogs asked for in a frame show at its end ([`sheet_dialogs::show_asked`]), where the
+/// main window's handle is at hand.
+fn install_file_dialogs(app: &mut EffectcraftApp) -> Option<std::sync::mpsc::Receiver<sheet_dialogs::Asked>> {
+    #[cfg(any(target_os = "macos", target_os = "linux"))]
+    {
+        let (tx, rx) = std::sync::mpsc::channel::<sheet_dialogs::Asked>();
+        app.hooks.file_dialog_async = Some(Box::new(move |dialog, done| {
+            if tx.send((dialog, done)).is_err() {
+                log::error!("file dialog: the window is gone");
+            }
+        }));
+        Some(rx)
+    }
+    #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+    {
+        let _ = app;
+        None
+    }
+}
+
+/// Run a normal desktop launch: install logging and the panic hook, parse arguments (`--version` exits before the
+/// session log is attached), scan fonts, honor the launch guard's backend choice and open the eframe window.
+/// Builds the session, loads settings, plugins, the requested project/media and the optional control server, then
+/// reports startup failure through `startup_failed`. Returns the event loop's result.
 fn main() -> eframe::Result {
+    // Windows: the update helper is a copy of this program started with `--finish-update`.
+    #[cfg(windows)]
+    if let Some(result) = craft_update::self_update::finish(&craft_update::suite::EFFECTCRAFT, &std::env::args_os().skip(1).collect::<Vec<_>>()) {
+        std::process::exit(i32::from(result.is_err()));
+    }
     // First, so the panic hook and every start-up warning are recorded. Records go to stderr
     // and the session log; Help ▸ Enable Logging writes through this logger too, and warnings
     // feed the compatibility report.
@@ -187,6 +222,7 @@ fn main() -> eframe::Result {
         "EffectCraft",
         options,
         Box::new(move |cc| {
+            EffectcraftApp::install_ime_reset_hooks(&cc.egui_ctx);
             match &cc.wgpu_render_state {
                 Some(rs) => log::info!("graphics: {:?}", rs.adapter.get_info()),
                 None => log::info!("graphics: no wgpu device"),
@@ -247,6 +283,7 @@ fn main() -> eframe::Result {
             // reported in a toast and forgotten).
             let _ = session.execute("window.restoreScriptPanels", json!({}));
             let mut app = EffectcraftApp::new(session);
+            app.set_startup_update_check(true);
             app.set_gpu_failure_bridge(gpu_failures);
             app.ui.start_screen = show_home;
             if let Some(n) = notice {
@@ -301,11 +338,11 @@ fn main() -> eframe::Result {
                 let file = path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
                 d.set_file_name(file).save_file().map(|p| p.to_string_lossy().to_string())
             }));
+            // The commands' file dialogs don't block the frame where the platform's backend
+            // would (#511, #1275); see [`install_file_dialogs`].
+            let file_dialogs = install_file_dialogs(&mut app);
             #[cfg(target_os = "macos")]
             {
-                // The commands' file dialogs open as sheets instead of nested modal loops (#511).
-                let ctx = cc.egui_ctx.clone();
-                app.hooks.file_dialog_async = Some(Box::new(move |dialog, done| sheet_dialogs::show(dialog, done, ctx.clone())));
                 app.hooks.app_action = Some(Box::new(native_menu::app_action));
                 app.hooks.clipboard_text = Some(Box::new(native_menu::clipboard_text));
             }
@@ -321,20 +358,18 @@ fn main() -> eframe::Result {
                 #[cfg(target_os = "macos")]
                 apple_events: apple_events.connect(&cc.egui_ctx),
                 app,
+                file_dialogs,
                 window: window::Tracker::new(opened, saved_window, control_port.is_none()),
                 launch,
                 drawn: false,
             }))
         }),
     );
-    match &result {
-        Ok(()) => log::info!("the window closed"),
-        Err(e) => {
-            if on_gl {
-                launch_guard::opengl_failed(effectcraft_host::config_dir().as_deref());
-            }
-            startup_failed(e, !on_gl && cfg!(not(target_os = "macos")));
+    if let Err(e) = &result {
+        if on_gl {
+            launch_guard::opengl_failed(effectcraft_host::config_dir().as_deref());
         }
+        startup_failed(e, !on_gl && cfg!(not(target_os = "macos")));
     }
     result
 }
@@ -355,15 +390,22 @@ fn wgpu_options(backends: Option<eframe::wgpu::Backends>) -> eframe::WgpuConfigu
         // Iris Pro: the device is lost and the window never opens.
         // `WGPU_VALIDATION_INDIRECT_CALL=1` turns the check back on.
         setup.instance_descriptor.flags = setup.instance_descriptor.flags.difference(eframe::wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL).with_env();
-        setup.device_descriptor = std::sync::Arc::new(|adapter| eframe::wgpu::DeviceDescriptor {
-            label: Some("EffectCraft device"),
-            required_limits: device_limits(adapter.limits()),
-            ..Default::default()
-        });
+        setup.device_descriptor = std::sync::Arc::new(|adapter| device_descriptor(adapter.limits()));
     }
     config
 }
 
+/// The window device's descriptor: the adapter's limits ([`device_limits`]) and `MemoryUsage`,
+/// so memory the compositor frees on the shared device goes back to the driver.
+fn device_descriptor(adapter: eframe::wgpu::Limits) -> eframe::wgpu::DeviceDescriptor<'static> {
+    eframe::wgpu::DeviceDescriptor {
+        label: Some("EffectCraft device"),
+        required_limits: device_limits(adapter),
+        memory_hints: eframe::wgpu::MemoryHints::MemoryUsage,
+        ..Default::default()
+    }
+}
+
 /// The limits to request from an adapter that offers `adapter`: all of them, with textures
 /// capped at 16384 px like the headless renderer's device.
 fn device_limits(adapter: eframe::wgpu::Limits) -> eframe::wgpu::Limits {
@@ -395,6 +437,8 @@ fn startup_failed(e: &eframe::Error, gl_next: bool) {
 /// The desktop app: the egui app plus, on macOS, the system menu bar.
 struct Desktop {
     app: EffectcraftApp,
+    /// The commands' file dialogs, shown at the end of the frame that asked for them.
+    file_dialogs: Option<std::sync::mpsc::Receiver<sheet_dialogs::Asked>>,
     #[cfg(target_os = "macos")]
     menu: native_menu::NativeBar,
     /// Documents opened from Finder, the Dock or `open` (macOS).
@@ -408,14 +452,24 @@ struct Desktop {
 }
 
 impl eframe::App for Desktop {
+    /// The desktop host's logic tick: update the macOS menu bar, run the shared app tick, close the IME pass, show the
+    /// file dialogs asked for and, last, hand a close to the platform quit.
     fn logic(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         #[cfg(target_os = "macos")]
         self.menu.update(&mut self.app, ctx);
-        self.app.logic(ctx, frame);
+        self.app.tick(ctx, frame);
+        self.app.finish_ime_logic(ctx);
+        if let Some(asked) = &self.file_dialogs {
+            sheet_dialogs::show_asked(asked, frame, ctx);
+        }
+        effectcraft_ui_egui::panels::unsaved::quit_on_close(ctx);
     }
 
     fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         self.app.ui(ui, frame);
+        if let Some(asked) = &self.file_dialogs {
+            sheet_dialogs::show_asked(asked, frame, ui.ctx());
+        }
         self.window.frame(ui.ctx(), self.app.session.config.as_deref());
         if !self.drawn {
             self.drawn = true;
@@ -429,6 +483,9 @@ impl eframe::App for Desktop {
     }
 
     fn on_exit(&mut self) {
+        // On macOS the app quits through `-[NSApplication terminate:]`, and the process ends
+        // before `eframe::run_native` returns (#341).
+        log::info!("the window is closing");
         self.launch.exited();
         self.window.save(self.app.session.config.as_deref());
         self.app.on_exit();
@@ -523,6 +580,17 @@ mod tests {
         assert_eq!(super::device_limits(big).max_texture_dimension_2d, 16384);
     }
 
+    /// The window device asks for `MemoryUsage`: the adapter's limits, unchanged.
+    #[test]
+    fn the_window_device_favours_memory_usage() {
+        use eframe::wgpu::Limits;
+        let big = Limits { max_texture_dimension_2d: 32768, ..Limits::default() };
+        let d = super::device_descriptor(big);
+        assert!(matches!(d.memory_hints, eframe::wgpu::MemoryHints::MemoryUsage));
+        assert_eq!(d.required_limits.max_texture_dimension_2d, 16384);
+        assert_eq!(d.label, Some("EffectCraft device"));
+    }
+
     /// A positional .ecprojx is a project file, not an unsupported media import (#528).
     #[test]
     fn launch_classifies_xml_and_json_projects_as_projects() {
@@ -597,4 +665,17 @@ mod tests {
             assert_eq!(parse_env(&[], Err(not_utf8)).unwrap_err(), format!("{need}, not `9\u{fffd}`"));
         }
     }
+
+    /// #1275: a blocking desktop-portal dialog on Linux leaves the window not answering the
+    /// compositor while it is open, so the commands' file dialogs go through the non-blocking
+    /// host hook there (as they do on macOS, #511). Windows' dialog pumps its own messages.
+    #[test]
+    fn commands_file_dialogs_do_not_block_the_frame() {
+        let mut app = effectcraft_ui_egui::EffectcraftApp::new(effectcraft_engine::Session::default());
+        let asked = super::install_file_dialogs(&mut app);
+        #[cfg(any(target_os = "macos", target_os = "linux"))]
+        assert!(app.hooks.file_dialog_async.is_some() && asked.is_some(), "the commands' file dialogs must not block the frame");
+        #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+        assert!(app.hooks.file_dialog_async.is_none() && asked.is_none(), "the blocking dialog pumps its own messages here");
+    }
 }
diff --git a/apps/effectcraft/src/native_menu.rs b/apps/effectcraft/src/native_menu.rs
index 9db2ffe76..c3b142c5f 100644
--- a/apps/effectcraft/src/native_menu.rs
+++ b/apps/effectcraft/src/native_menu.rs
@@ -2,10 +2,10 @@
 //! [`effectcraft_ui_egui::native_menu`]'s spec of the engine's After Effects menu tree.
 //!
 //! Each frame [`NativeBar::update`] runs menu activations (the same command ids as the in-window
-//! bar), and when [`native_menu::state_key`] changed it rebuilds the spec and pushes labels,
-//! enabled and check state into the existing items; a structural change (Open Recent, a new
-//! shortcut preset) rebuilds the menu. Settings ▸ Appearance ▸ Use In-Window Menu Bar on macOS
-//! swaps back to the in-window bar.
+//! bar), and when [`native_menu::state_key`] or whether a text field has the keyboard changed it
+//! rebuilds the spec and pushes labels, enabled and check state into the existing items; a
+//! structural change (Open Recent, a new shortcut preset) rebuilds the menu. Settings ▸
+//! Appearance ▸ Use In-Window Menu Bar on macOS swaps back to the in-window bar.
 
 use std::collections::HashMap;
 use std::sync::mpsc::{Receiver, channel};
@@ -24,7 +24,7 @@ pub struct NativeBar {
     items: HashMap<String, CheckMenuItem>,
     spec: NativeMenu,
     structure: u64,
-    state: Option<u64>,
+    state: Option<(u64, bool)>,
     events: Receiver<MenuEvent>,
     /// The in-window-bar setting last applied (None: not yet).
     in_window: Option<bool>,
@@ -67,12 +67,13 @@ impl NativeBar {
         if in_window {
             return;
         }
-        let key = native_menu::state_key(app);
+        // While a text field has the keyboard, the Edit items it takes stay enabled.
+        let key = (native_menu::state_key(app), native_menu::text_field_window(ctx).is_some());
         if self.state == Some(key) && self.menu.is_some() {
             return;
         }
         self.state = Some(key);
-        let spec = native_menu::build(app);
+        let spec = native_menu::build_now(app, ctx);
         let structure = spec.structure();
         if self.menu.is_none() || structure != self.structure {
             self.install(&spec);
diff --git a/apps/effectcraft/src/sheet_dialogs.rs b/apps/effectcraft/src/sheet_dialogs.rs
index 577eb0b64..911870190 100644
--- a/apps/effectcraft/src/sheet_dialogs.rs
+++ b/apps/effectcraft/src/sheet_dialogs.rs
@@ -1,10 +1,14 @@
-//! File dialogs that don't block the frame (macOS), for `Hooks::file_dialog_async`.
+//! File dialogs that don't block the frame (macOS and Linux), for `Hooks::file_dialog_async`.
 //!
 //! A blocking `rfd::FileDialog` runs a nested modal event loop inside eframe's frame, that is
 //! inside winit's event handler. On macOS a file dragged over the window while that loop ran
 //! re-entered winit's handler, which panics across the Objective-C boundary and aborts the app
-//! (#511). `rfd::AsyncFileDialog` shows the dialog as a sheet on the window and returns at once;
-//! the answer arrives when the sheet closes, outside the frame, and the app runs the command then.
+//! (#511). On Linux the blocking dialog is worse than slow: rfd uses the XDG desktop portal, so
+//! the main thread sits waiting on the portal's answer and never pumps winit's events — the
+//! window stops answering the compositor and the desktop offers to force-quit the app while the
+//! Open dialog is up (#1275). `rfd::AsyncFileDialog` shows the dialog as a sheet on the window
+//! (macOS) or through the portal from a worker thread (Linux) and returns at once; the answer
+//! arrives when the dialog closes, outside the frame, and the app runs the command then.
 
 use effectcraft_ui_egui::{DialogDone, FileDialog};
 use rfd::{AsyncFileDialog, FileHandle};
@@ -13,10 +17,24 @@ use std::pin::Pin;
 
 type Answer = Pin<Box<dyn Future<Output = Vec<String>> + Send>>;
 
-/// Show `dialog` (on the main thread: the sheet opens here) and hand its paths to `done` once it
-/// closes, then wake the UI.
-pub fn show(dialog: FileDialog, done: DialogDone, ctx: egui::Context) {
-    let answer = open(dialog);
+/// A command's dialog waiting for [`show_asked`].
+pub type Asked = (FileDialog, DialogDone);
+
+/// Show the dialogs the commands asked for in this frame (on the main thread: a sheet opens
+/// here) and hand each one's paths to its `done` once it closes, then wake the UI.
+///
+/// On macOS the sheet goes on the main window (`frame`'s). Without a parent rfd puts it on
+/// AppKit's main window, which is a floating panel's OS window after a click in one; that
+/// window hides while the app has no focused window, and a sheet whose window goes away ends
+/// without answering, with later sheets queued behind it on the same window.
+pub fn show_asked(asked: &std::sync::mpsc::Receiver<Asked>, frame: &eframe::Frame, ctx: &egui::Context) {
+    while let Ok((dialog, done)) = asked.try_recv() {
+        show(dialog, done, frame, ctx.clone());
+    }
+}
+
+fn show(dialog: FileDialog, done: DialogDone, frame: &eframe::Frame, ctx: egui::Context) {
+    let answer = open(dialog, frame);
     let spawned = std::thread::Builder::new().name("ec-file-dialog".into()).spawn(move || {
         done(pollster::block_on(answer));
         ctx.request_repaint();
@@ -26,6 +44,13 @@ pub fn show(dialog: FileDialog, done: DialogDone, ctx: egui::Context) {
     }
 }
 
+/// A dialog on the main window. Linux keeps the portal's dialog unparented: rfd exports the
+/// window for the portal from the dialog's worker thread there.
+fn parented(frame: &eframe::Frame) -> AsyncFileDialog {
+    let d = AsyncFileDialog::new();
+    if cfg!(target_os = "macos") { d.set_parent(frame) } else { d }
+}
+
 fn paths(files: Option<Vec<FileHandle>>) -> Vec<String> {
     files.unwrap_or_default().into_iter().map(|f| f.path().to_string_lossy().to_string()).collect()
 }
@@ -35,10 +60,10 @@ fn path(file: Option<FileHandle>) -> Vec<String> {
 }
 
 /// The dialog, as the blocking hooks in `main.rs` show it.
-fn open(dialog: FileDialog) -> Answer {
+fn open(dialog: FileDialog, frame: &eframe::Frame) -> Answer {
     match dialog {
         FileDialog::Open { exts, many } => {
-            let d = AsyncFileDialog::new().add_filter("Media", &exts);
+            let d = parented(frame).add_filter("Media", &exts);
             if many {
                 let f = d.pick_files();
                 Box::pin(async move { paths(f.await) })
@@ -48,22 +73,22 @@ fn open(dialog: FileDialog) -> Answer {
             }
         }
         FileDialog::OpenProject => {
-            let f = AsyncFileDialog::new().add_filter("EffectCraft Project", &["ecproj", "ecprojx"]).pick_file();
+            let f = parented(frame).add_filter("EffectCraft Project", &["ecproj", "ecprojx"]).pick_file();
             Box::pin(async move { path(f.await) })
         }
         FileDialog::Folder => {
-            let f = AsyncFileDialog::new().pick_folder();
+            let f = parented(frame).pick_folder();
             Box::pin(async move { path(f.await) })
         }
         FileDialog::Save { default, ext, project } => {
             let at = std::path::Path::new(&default);
             let name = at.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default();
             let mut d = if project {
-                AsyncFileDialog::new().add_filter("EffectCraft Project", &["ecproj"])
+                parented(frame).add_filter("EffectCraft Project", &["ecproj"])
             } else if ext.is_empty() {
-                AsyncFileDialog::new()
+                parented(frame)
             } else {
-                AsyncFileDialog::new().add_filter(&ext, &[ext.as_str()])
+                parented(frame).add_filter(&ext, &[ext.as_str()])
             };
             // A default with a folder that exists opens the dialog there.
             if let Some(dir) = at.parent().filter(|d| d.is_dir()) {
diff --git a/apps/effectcraft/tests/args.rs b/apps/effectcraft/tests/args.rs
index 8367d2a99..62c591b45 100644
--- a/apps/effectcraft/tests/args.rs
+++ b/apps/effectcraft/tests/args.rs
@@ -1,11 +1,14 @@
 //! The desktop binary rejects a bad command line before it starts anything (#997).
-// Integration tests: unwrapping and panicking on failure is fine here.
-#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::path::PathBuf;
 use std::process::{Command, Stdio};
 use std::time::{Duration, Instant};
 
+/// Nextest archives relocate binaries; plain Cargo keeps the compile-time path valid.
+fn binary() -> std::ffi::OsString {
+    std::env::var_os("NEXTEST_BIN_EXE_effectcraft").unwrap_or_else(|| env!("CARGO_BIN_EXE_effectcraft").into())
+}
+
 /// A settings folder of its own, so a launch that got past the arguments would show up as
 /// preferences (Recent Footage) written there instead of in the user's settings.
 fn config_dir(name: &str) -> PathBuf {
@@ -19,7 +22,7 @@ fn config_dir(name: &str) -> PathBuf {
 /// regression fails instead of leaving a window open: the process is killed after 5 s.
 fn rejects(name: &str, args: &[&str], env: &[(&str, &str)], message: &str) {
     let config = config_dir(name);
-    let mut cmd = Command::new(env!("CARGO_BIN_EXE_effectcraft"));
+    let mut cmd = Command::new(binary());
     cmd.args(args).env_remove("EFFECTCRAFT_CONTROL_PORT").env_remove("RUST_LOG").env("EFFECTCRAFT_CONFIG_DIR", &config);
     for (k, v) in env {
         cmd.env(k, v);
@@ -67,7 +70,7 @@ fn a_bad_control_port_stops_the_launch() {
 
 #[test]
 fn version_still_prints_with_a_bad_port_variable() {
-    let out = Command::new(env!("CARGO_BIN_EXE_effectcraft")).arg("--version").env("EFFECTCRAFT_CONTROL_PORT", "abc").output().unwrap();
+    let out = Command::new(binary()).arg("--version").env("EFFECTCRAFT_CONTROL_PORT", "abc").output().unwrap();
     assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
     assert_eq!(String::from_utf8(out.stdout).unwrap(), format!("effectcraft {}\n", env!("CARGO_PKG_VERSION")));
 }
diff --git a/assets/fonts/NotoSansSymbols2-Regular.ttf b/assets/fonts/NotoSansSymbols2-Regular.ttf
new file mode 100644
index 000000000..caf89dd0e
Binary files /dev/null and b/assets/fonts/NotoSansSymbols2-Regular.ttf differ
diff --git a/assets/fonts/NotoSansSymbols2-Regular.ttf.attribution b/assets/fonts/NotoSansSymbols2-Regular.ttf.attribution
new file mode 100644
index 000000000..4d6d416be
--- /dev/null
+++ b/assets/fonts/NotoSansSymbols2-Regular.ttf.attribution
@@ -0,0 +1,8 @@
+asset:        NotoSansSymbols2-Regular.ttf
+title:        Noto Sans Symbols 2 Regular (chrome symbols such as ✔ and ▣)
+author:       The Noto Project Authors
+source:       https://github.com/notofonts/symbols (Google Fonts commit 47d54ca1ebb14fd864695f1d39dc734f39017c33, file ofl/notosanssymbols2/NotoSansSymbols2-Regular.ttf)
+license:      OFL-1.1
+license-file: assets/fonts/OFL-NotoSansSymbols2.txt
+added:        2026-10-24 by @skylartaylor
+notes:        Unmodified font file, sha256 7d5fb73b7ca67a6798101741f5d280a3d016a56a197afcd4199dbb57b4b82a21. Embedded with include_bytes! in crates/ui-egui/src/theme.rs as the last UI fallback so every family can draw the chrome symbols (U+2714 ✔, U+25A3 ▣) that Inter, Inter Medium, Inter SemiBold and JetBrains Mono lack.
diff --git a/assets/fonts/OFL-NotoSansSymbols2.txt b/assets/fonts/OFL-NotoSansSymbols2.txt
new file mode 100644
index 000000000..7c95767f5
--- /dev/null
+++ b/assets/fonts/OFL-NotoSansSymbols2.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)
+
+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:
+https://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.
diff --git a/clippy.toml b/clippy.toml
index 4b6c79f55..3522a15b6 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -2,3 +2,7 @@ allow-unwrap-in-tests = true
 allow-expect-in-tests = true
 allow-panic-in-tests = true
 allow-indexing-slicing-in-tests = true
+disallowed-types = [
+    { path = "egui::ComboBox", reason = "use craft_ui::ComboBox: egui's combo box menu can't grow back while open (egui#5225)" },
+]
+cognitive-complexity-threshold = 30
diff --git a/contributors/people.toml b/contributors/people.toml
index 2fa1927ce..1012a37bd 100644
--- a/contributors/people.toml
+++ b/contributors/people.toml
@@ -66,7 +66,7 @@ sync_github_name = true
 display_name = "Jason Brashear"
 
 [people.nanox333]
-display_name = "nanox333"
+display_name = "nnaannoo"
 
 [people.Nael-Nathanael]
 sync_github_name = true
@@ -87,3 +87,14 @@ sync_github_name = false
 real_name = "Marco Arnulfo"
 display_name = "Marco Arnulfo"
 sync_github_name = false
+
+[people.krinry]
+display_name = "krinry"
+sync_github_name = true
+
+[people.Silvertree2010]
+display_name = "Netter"
+sync_github_name = false
+
+[people.ki2pixel]
+display_name = "ki2pixel"
diff --git a/crates/automation/tests/qa/compositing.rs b/crates/automation/tests/qa/compositing.rs
index 52d5e4fb2..da78ae116 100644
--- a/crates/automation/tests/qa/compositing.rs
+++ b/crates/automation/tests/qa/compositing.rs
@@ -7,6 +7,10 @@ use serde_json::{Value, json};
 
 use crate::harness::{Img, Qa, coverage, luma, mean_diff};
 
+fn lum(i: &Img, x: u32, y: u32) -> f64 {
+    luma(i.get_pixel(x, y))
+}
+
 fn px(img: &Img, x: u32, y: u32) -> [u8; 4] {
     img.get_pixel(x, y).0
 }
@@ -25,13 +29,12 @@ fn write_sequence(qa: &Qa) -> String {
     qa.path("seq/ball_000.png")
 }
 
-#[test]
-fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
-    let mut qa = Qa::new("compositing");
-
+/// Import the sequence (reinterpreted at 12 fps) and a PSD written by the app; returns the
+/// sequence item and the PSD's composition.
+fn import_footage(qa: &mut Qa) -> (Value, Value) {
     // Footage: the sequence, and a layered PSD written by the app itself (Save Frame As ▸
     // Photoshop Layers) from a small comp.
-    let seq = write_sequence(&qa);
+    let seq = write_sequence(qa);
     let imp = qa.exec("file.import", json!({"paths": [seq]}));
     let seq_item = imp["items"][0].clone();
     let project = qa.tool("get_project", json!({}));
@@ -55,10 +58,14 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     let pc = qa.tool("get_comp", json!({"comp": psd_comp.clone()}));
     let names: Vec<&str> = pc["layers"].as_array().unwrap().iter().map(|l| l["name"].as_str().unwrap()).collect();
     assert_eq!(names, ["Bar", "Gray"], "the PSD's layers, top first: {pc}");
+    (seq_item, psd_comp)
+}
 
+/// The main comp: the sequence plays, then a Screen-blended PSD; returns the Normal-mode frame.
+fn main_comp_and_blend(qa: &mut Qa, seq_item: &Value, psd_comp: &Value) -> Img {
     // The main comp.
-    let main = qa.exec("comp.new", json!({"name": "Main", "width": 160, "height": 90, "frameRate": 12, "duration": 1}))["comp"].clone();
-    qa.exec("layer.addItem", json!({"item": seq_item}));
+    qa.exec("comp.new", json!({"name": "Main", "width": 160, "height": 90, "frameRate": 12, "duration": 1}));
+    qa.exec("layer.addItem", json!({"item": seq_item.clone()}));
     let a = qa.frame(None, 0.0);
     let b = qa.frame(None, 0.5);
     assert!(mean_diff(&a, &b) > 1.0, "the sequence plays");
@@ -75,7 +82,10 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     for c in 0..3 {
         assert!(s[c] > n[c] && s[c] > [32, 64, 96][c], "Screen brightens channel {c}: {s:?}");
     }
+    normal
+}
 
+fn track_matte(qa: &mut Qa) {
     // Track matte: a magenta solid seen only through text.
     qa.exec("layer.newText", json!({"text": "MATTE", "name": "Matte", "size": 40, "fill": "#ffffff"}));
     qa.exec("layer.newSolid", json!({"name": "Fill", "color": "#ff00ff", "width": 160, "height": 90}));
@@ -91,7 +101,9 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     let fill = info["layers"].as_array().unwrap().iter().find(|l| l["name"] == "Fill").unwrap().clone();
     assert_eq!(fill["trackMatte"]["kind"], "Alpha Matte");
     qa.exec("layer.setSwitch", json!({"layers": ["Fill", "Matte"], "switch": "video", "value": false}));
+}
 
+fn adjustment_layer(qa: &mut Qa, normal: &Img) {
     // Adjustment layer: Lumetri exposure, inside a feathered, expanded elliptical mask; then Glow.
     qa.exec("layer.newAdjustment", json!({"name": "Grade"}));
     let fx = qa.exec("effect.apply", json!({"effect": "Lumetri Color", "layers": ["Grade"]}));
@@ -103,7 +115,6 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     let mk = qa.exec("layer.addMask", json!({"layer": "Grade", "shape": "ellipse", "rect": [40, 20, 80, 50]}));
     assert!(mk["mask"].is_u64(), "{mk}");
     let hard = qa.frame(None, 0.5);
-    let lum = |i: &Img, x, y| luma(i.get_pixel(x, y));
     assert!(lum(&hard, 80, 45) > lum(&before, 80, 45) - 1.0 && lum(&hard, 5, 5) < lum(&before, 5, 5) - 10.0, "the mask limits the grade to the ellipse");
     qa.exec("layer.mask.set", json!({"layer": "Grade", "field": "expansion", "value": 8}));
     let grown = qa.frame(None, 0.5);
@@ -116,7 +127,7 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
         }
         n
     };
-    assert!(bright(&grown, &normal) > bright(&hard, &normal) + 100, "expansion grows the graded area");
+    assert!(bright(&grown, normal) > bright(&hard, normal) + 100, "expansion grows the graded area");
     qa.exec("layer.mask.set", json!({"layer": "Grade", "field": "feather", "value": 20}));
     let soft = qa.frame(None, 0.5);
     // At the ellipse's edge (x = 40 − 8): feathered is in between none and full.
@@ -125,7 +136,10 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     qa.exec("effect.apply", json!({"effect": "Glow", "layers": ["Grade"]}));
     let glow = qa.frame(None, 0.5);
     assert!(mean_diff(&soft, &glow) > 0.5, "Glow changes the frame");
+}
 
+/// The 3D stage with depth of field and a light; returns the stage comp.
+fn stage_3d(qa: &mut Qa) -> Value {
     // 3D stage: a near and a far card, a camera with depth of field, a light.
     let stage = qa.exec("comp.new", json!({"name": "Stage", "width": 160, "height": 90, "frameRate": 12, "duration": 1}))["comp"].clone();
     qa.exec("layer.newSolid", json!({"name": "Near", "color": "#ff4040", "width": 40, "height": 40}));
@@ -155,7 +169,10 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     let advanced = qa.frame(None, 0.0);
     assert!(mean_diff(&classic, &advanced) > 0.2, "Advanced 3D renders the stage its own way");
     assert!(lum(&advanced, 50, 45) > 60.0, "Advanced 3D still lights the card");
+    stage
+}
 
+fn alpha_renders(qa: &mut Qa, stage: &Value) {
     // Renders with alpha: the stage has no background layer, so most of it is transparent.
     let mov = qa.path("stage.mov");
     let webm = qa.path("stage.webm");
@@ -165,7 +182,7 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
     assert!(done["items"].as_array().unwrap().iter().all(|i| i["status"] == "Done"), "{done}");
     let reference = qa.tool("render_frame", json!({"comp": stage.clone(), "time": 0, "transparent": true, "inline": false}));
     assert_eq!(reference["width"], 160);
-    let refa = alpha_frame(&mut qa, stage.clone());
+    let refa = alpha_frame(qa, stage.clone());
     assert!(px(&refa, 2, 2)[3] < 40 && px(&refa, 50, 45)[3] == 255, "render_frame transparent keeps alpha: {:?} {:?}", px(&refa, 2, 2), px(&refa, 50, 45));
     // ProRes 4444 carries alpha in the frame; WebM VP9 as a second VP9 stream in BlockAdditions
     // (AlphaMode 1), which FilmCraft's Matroska reader decodes into the frame's alpha plane.
@@ -174,14 +191,24 @@ fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
         assert_eq!(r["errors"], json!([]));
         assert_eq!(r["unlabeledAlpha"], r["items"], "{path}: the importer sees an alpha channel");
         let c = qa.exec("file.newCompFromSelection", json!({}))["comps"][0].clone();
-        let f = alpha_frame(&mut qa, c.clone());
+        let f = alpha_frame(qa, c.clone());
         // The opaque card decodes to the stage's colours (lossy codecs, so loosely).
         let (got, want) = (px(&f, 50, 45), px(&refa, 50, 45));
         assert!((0..3).all(|c| got[c].abs_diff(want[c]) < 12), "{path} decodes to the stage: {got:?} vs {want:?}");
         assert!(mean_diff(&qa.frame(Some(c.clone()), 0.0), &qa.frame(Some(stage.clone()), 0.0)) < 8.0, "{path} composites like the stage");
         assert!(px(&f, 2, 2)[3] < 40 && px(&f, 50, 45)[3] > 250, "{path}: transparent corners, opaque card: {:?} {:?}", px(&f, 2, 2), px(&f, 50, 45));
     }
-    let _ = main;
+}
+
+#[test]
+fn compositing_matte_blend_adjustment_3d_and_alpha_renders() {
+    let mut qa = Qa::new("compositing");
+    let (seq_item, psd_comp) = import_footage(&mut qa);
+    let normal = main_comp_and_blend(&mut qa, &seq_item, &psd_comp);
+    track_matte(&mut qa);
+    adjustment_layer(&mut qa, &normal);
+    let stage = stage_3d(&mut qa);
+    alpha_renders(&mut qa, &stage);
 }
 
 fn alpha_frame(qa: &mut Qa, comp: Value) -> Img {
diff --git a/crates/av1enc/README.md b/crates/av1enc/README.md
index 6ced20ba1..c922c95eb 100644
--- a/crates/av1enc/README.md
+++ b/crates/av1enc/README.md
@@ -4,8 +4,8 @@ Clean-room, pure-Rust AV1 encoder for EffectCraft's MP4 / WebM export (layer L0,
 no `unsafe`, builds for `wasm32-unknown-unknown`).
 
 Output is decoded **bit-exactly** by libdav1d (`ffmpeg -c:v libdav1d`, checked in
-`tests/ffmpeg_oracle.rs` when ffmpeg is installed) and by FilmCraft's spec-derived
-`filmcraft-av1` decoder (`tests/roundtrip.rs`): every decoded frame equals the encoder's own
+`tests/it/ffmpeg_oracle.rs` when ffmpeg is installed) and by FilmCraft's spec-derived
+`filmcraft-av1` decoder (`tests/it/roundtrip.rs`): every decoded frame equals the encoder's own
 reconstruction, so prediction never drifts.
 
 ## What is implemented
diff --git a/crates/av1enc/src/cdf.rs b/crates/av1enc/src/cdf.rs
index 0466a1592..777164d1a 100644
--- a/crates/av1enc/src/cdf.rs
+++ b/crates/av1enc/src/cdf.rs
@@ -2,7 +2,15 @@
 //! init_coeff_cdfs that its syntax uses). Layout as in filmcraft-av1: each innermost array
 //! holds N cumulative values (the last is 32768) plus the adaptation counter.
 
-use crate::tables::*;
+use crate::tables::{
+    DEFAULT_ANGLE_DELTA_CDF, DEFAULT_COEFF_BASE_CDF, DEFAULT_COEFF_BASE_EOB_CDF, DEFAULT_COEFF_BR_CDF, DEFAULT_DC_SIGN_CDF, DEFAULT_DRL_MODE_CDF,
+    DEFAULT_EOB_EXTRA_CDF, DEFAULT_EOB_PT_16_CDF, DEFAULT_EOB_PT_32_CDF, DEFAULT_EOB_PT_64_CDF, DEFAULT_EOB_PT_128_CDF, DEFAULT_EOB_PT_256_CDF,
+    DEFAULT_EOB_PT_512_CDF, DEFAULT_EOB_PT_1024_CDF, DEFAULT_INTER_TX_TYPE_SET3_CDF, DEFAULT_INTRA_TX_TYPE_SET2_CDF, DEFAULT_IS_INTER_CDF, DEFAULT_MV_BIT_CDF,
+    DEFAULT_MV_CLASS_CDF, DEFAULT_MV_CLASS0_BIT_CDF, DEFAULT_MV_CLASS0_FR_CDF, DEFAULT_MV_FR_CDF, DEFAULT_MV_JOINT_CDF, DEFAULT_MV_SIGN_CDF,
+    DEFAULT_NEW_MV_CDF, DEFAULT_PARTITION_W8_CDF, DEFAULT_PARTITION_W16_CDF, DEFAULT_PARTITION_W32_CDF, DEFAULT_PARTITION_W64_CDF, DEFAULT_REF_MV_CDF,
+    DEFAULT_SINGLE_REF_CDF, DEFAULT_SKIP_CDF, DEFAULT_TXB_SKIP_CDF, DEFAULT_UV_MODE_CFL_ALLOWED_CDF, DEFAULT_UV_MODE_CFL_NOT_ALLOWED_CDF, DEFAULT_Y_MODE_CDF,
+    DEFAULT_ZERO_MV_CDF,
+};
 
 #[derive(Clone)]
 pub(crate) struct Cdfs {
diff --git a/crates/av1enc/src/decide.rs b/crates/av1enc/src/decide.rs
index 494e914c0..9bbd56823 100644
--- a/crates/av1enc/src/decide.rs
+++ b/crates/av1enc/src/decide.rs
@@ -3,8 +3,12 @@
 //! processes, so the reconstruction built here is exactly what a decoder produces; the syntax
 //! is written afterwards by `writer.rs`.
 
-use crate::pred::*;
-use crate::tables::*;
+use crate::pred::{INTRA_MODES_USED, InterBlock, IntraEdge, Plane, edges, predict_inter, predict_intra, subpel_plane};
+use crate::tables::{
+    AC_QLOOKUP, BLOCK_8X8, BLOCK_64X64, DC_PRED, DC_QLOOKUP, DCT_DCT, DEFAULT_SCAN_4X4, DEFAULT_SCAN_8X8, DEFAULT_SCAN_16X16, DEFAULT_SCAN_32X32, MODE_TO_TXFM,
+    NEWMV, NUM_4X4_BLOCKS_WIDE, PARTITION_SPLIT, PARTITION_SUBSIZE, TX_4X4, TX_8X8, TX_16X16, TX_32X32, TX_64X64, TX_SET_DCTONLY, TX_SET_INTER_3,
+    TX_SET_INTRA_2, TX_SIZE_SQR_UP, TX_TYPE_IN_SET_INTER, TX_TYPE_IN_SET_INTRA,
+};
 use crate::transform::{forward_2d, inverse_2d};
 
 /// Decisions for one coded block.
@@ -100,6 +104,17 @@ pub(crate) fn intra_uv_tx_type(uv_mode: usize, uv_tx: usize) -> usize {
     if tx_in_set(tx_set(uv_tx, false), false, t) { t } else { DCT_DCT }
 }
 
+/// Geometry and coding mode of one square transform block.
+#[derive(Clone, Copy)]
+struct TransformBlock {
+    plane: usize,
+    x: usize,
+    y: usize,
+    log2: u32,
+    tx_type: usize,
+    intra: bool,
+}
+
 struct TxResult {
     levels: Vec<i32>,
     nonzero: bool,
@@ -107,6 +122,38 @@ struct TxResult {
     bits: f64,
 }
 
+/// The output and scratch buffers of one reconstruction, each `n * n` entries long.
+struct ReconBuffers<'a> {
+    deq: &'a mut [i32],
+    resid: &'a mut [i32],
+    recon: &'a mut [u16],
+}
+
+/// Outcome of trying one transform block; the levels and the reconstruction stay in `TxScratch`.
+#[derive(Clone, Copy)]
+struct TxEval {
+    nonzero: bool,
+    dist: f64,
+    bits: f64,
+}
+
+/// Buffers of the transform path, sized for the largest coded transform block (32x32). Only the
+/// first `n * n` entries are used; they are reused across candidates instead of being allocated.
+struct TxScratch {
+    res: [i32; 1024],
+    coef: [f32; 1024],
+    levels: [i32; 1024],
+    deq: [i32; 1024],
+    resid: [i32; 1024],
+    recon: [u16; 1024],
+}
+
+impl Default for TxScratch {
+    fn default() -> Self {
+        TxScratch { res: [0; 1024], coef: [0.0; 1024], levels: [0; 1024], deq: [0; 1024], resid: [0; 1024], recon: [0; 1024] }
+    }
+}
+
 /// Saved encoder state of a block area (reconstruction, BlockDecoded flags).
 struct Snapshot {
     planes: [Vec<u16>; 3],
@@ -131,6 +178,8 @@ pub(crate) struct Decider<'a> {
     lambda_sad: f64,
     /// Half-sample interpolations of the reference luma (visible area): (8, 0), (0, 8), (8, 8).
     half: [Vec<u16>; 3],
+    /// Transform buffers, taken out while a block is being tried (see `code_tx`).
+    scratch: Option<Box<TxScratch>>,
 }
 
 const MODE_BITS_INTRA: f64 = 3.0;
@@ -166,6 +215,7 @@ impl<'a> Decider<'a> {
                 Some(rf) => [(8, 0), (0, 8), (8, 8)].map(|(fx, fy)| subpel_plane(&rf.planes[0], g.width, g.height, fx, fy, bd)),
                 None => Default::default(),
             },
+            scratch: None,
         }
     }
 
@@ -324,8 +374,10 @@ impl<'a> Decider<'a> {
         let log2 = (n4 * 4).trailing_zeros();
         let (sbr, sbc) = ((r & 15) as isize, (c & 15) as isize);
         let bd = self.bd;
-        let mut pred = vec![0u16; 32 * 32];
-        let mut best_pred = vec![0u16; 32 * 32];
+        let mut pred = [0u16; 32 * 32];
+        let mut best_pred = [0u16; 32 * 32];
+        let mut best_levels = [0i32; 32 * 32];
+        let mut best_recon = [0u16; 32 * 32];
         let n = 1usize << log2;
         // luma
         let e = IntraEdge {
@@ -343,26 +395,26 @@ impl<'a> Decider<'a> {
         let ed = edges(&self.rec[0], &e);
         // modes ranked by SATD, then a rate-distortion choice of mode and transform type among
         // the best three
-        let mut ranked: Vec<(f64, usize)> = INTRA_MODES_USED
-            .iter()
-            .map(|&mode| {
-                predict_intra(&ed, &e, mode, &mut pred);
-                let sad = self.satd(0, c * 4, r * 4, n, &pred[..n * n]) as f64;
-                (sad + self.lambda_sad * if mode == DC_PRED { 1.0 } else { MODE_BITS_INTRA }, mode)
-            })
-            .collect();
+        let mut ranked: [(f64, usize); INTRA_MODES_USED.len()] = INTRA_MODES_USED.map(|mode| {
+            predict_intra(&ed, &e, mode, &mut pred);
+            let sad = self.satd(0, c * 4, r * 4, n, &pred[..n * n]) as f64;
+            (sad + self.lambda_sad * if mode == DC_PRED { 1.0 } else { MODE_BITS_INTRA }, mode)
+        });
         ranked.sort_by(|a, b| a.0.total_cmp(&b.0));
         let tx_y = tx_size_for(log2);
-        let mut best: Option<(f64, usize, usize, TxResult, Option<Vec<u16>>)> = None;
+        let mut best: Option<(f64, usize, usize, TxEval, bool)> = None;
+        let mut sc = self.scratch.take().unwrap_or_default();
         for &(_, mode) in ranked.iter().take(3) {
             predict_intra(&ed, &e, mode, &mut pred);
-            let mut types = vec![DCT_DCT];
+            let mut types = [DCT_DCT; 2];
+            let mut n_types = 1;
             let alt = MODE_TO_TXFM[mode] as usize;
             if alt != DCT_DCT && tx_in_set(tx_set(tx_y, false), false, alt) {
-                types.push(alt);
+                types[1] = alt;
+                n_types = 2;
             }
-            for &t in &types {
-                let (res, recon) = self.try_tx(0, c * 4, r * 4, log2, t, &pred[..n * n], true);
+            for &t in &types[..n_types] {
+                let (res, has_recon) = self.try_tx(&mut sc, TransformBlock { plane: 0, x: c * 4, y: r * 4, log2, tx_type: t, intra: true }, &pred[..n * n]);
                 let type_bits = if !res.nonzero || tx_set(tx_y, false) == TX_SET_DCTONLY {
                     0.0
                 } else if t == DCT_DCT {
@@ -374,18 +426,24 @@ impl<'a> Decider<'a> {
                 let cost = res.dist + self.lambda * (res.bits + type_bits + mode_bits);
                 if best.as_ref().is_none_or(|b| cost < b.0) {
                     best_pred[..n * n].copy_from_slice(&pred[..n * n]);
-                    best = Some((cost, mode, t, res, recon));
+                    best_levels[..n * n].copy_from_slice(&sc.levels[..n * n]);
+                    if has_recon {
+                        best_recon[..n * n].copy_from_slice(&sc.recon[..n * n]);
+                    }
+                    best = Some((cost, mode, t, res, has_recon));
                 }
             }
         }
+        self.scratch = Some(sc);
         // Every ranked mode tries DCT_DCT, so `best` is always set; without a candidate the block
         // can't be coded intra (an infinite cost keeps it from being chosen).
-        let Some((_, y_mode, tx_type_y, ty, recon)) = best else {
+        let Some((_, y_mode, tx_type_y, ty, has_recon)) = best else {
             let leaf =
                 Leaf { bsize, is_inter: false, y_mode: DC_PRED, uv_mode: DC_PRED, tx_type_y: DCT_DCT, mv: [0, 0], skip: true, coefs: Default::default() };
             return (leaf, f64::INFINITY);
         };
-        self.put(0, c * 4, r * 4, n, recon.as_deref().unwrap_or(&best_pred[..n * n]));
+        self.put(0, c * 4, r * 4, n, if has_recon { &best_recon[..n * n] } else { &best_pred[..n * n] });
+        let ty = TxResult { levels: best_levels[..n * n].to_vec(), nonzero: ty.nonzero, dist: ty.dist, bits: ty.bits };
         let tx_type_y = if ty.nonzero { tx_type_y } else { DCT_DCT };
         self.mark_decoded(0, r, c, n4);
         // chroma (one mode for both planes)
@@ -422,7 +480,7 @@ impl<'a> Decider<'a> {
         let uv_type = intra_uv_tx_type(uv_mode, uv_tx);
         let mut code_uv = |i: usize| {
             predict_intra(&ced[i], &ce[i], uv_mode, &mut pred);
-            let t = self.code_tx(1 + i, c * 2, r * 2, clog2, uv_type, &pred[..cn * cn], true);
+            let t = self.code_tx(TransformBlock { plane: 1 + i, x: c * 2, y: r * 2, log2: clog2, tx_type: uv_type, intra: true }, &pred[..cn * cn]);
             self.mark_decoded(1 + i, r, c, n4);
             t
         };
@@ -450,13 +508,17 @@ impl<'a> Decider<'a> {
             let (vw, vh) = self.g.visible(p);
             let pn = n >> s;
             let (x, y) = ((c * 4) >> s, (r * 4) >> s);
-            predict_inter(&refr.planes[p], vw as i32 - 1, vh as i32 - 1, x, y, pn, pn, mv, s, self.bd, &mut pred[..pn * pn]);
+            predict_inter(
+                &refr.planes[p],
+                &InterBlock { last_x: vw as i32 - 1, last_y: vh as i32 - 1, x, y, width: pn, height: pn, mv, subsampling: s, bit_depth: self.bd },
+                &mut pred[..pn * pn],
+            );
             if bsize == BLOCK_64X64 {
                 // coded as a skip block: the prediction is the reconstruction
                 dist += self.sse(p, x, y, pn, &pred[..pn * pn]);
                 self.put(p, x, y, pn, &pred[..pn * pn]);
             } else {
-                let t = self.code_tx(p, x, y, log2 - s as u32, DCT_DCT, &pred[..pn * pn], false);
+                let t = self.code_tx(TransformBlock { plane: p, x, y, log2: log2 - s as u32, tx_type: DCT_DCT, intra: false }, &pred[..pn * pn]);
                 dist += t.dist;
                 tx.push(t);
             }
@@ -771,32 +833,38 @@ impl<'a> Decider<'a> {
 
     /// Transform, quantise and reconstruct one square transform block of `plane` at (x, y)
     /// over the prediction `pred`; the reconstruction is written to `rec`.
-    fn code_tx(&mut self, p: usize, x: usize, y: usize, log2: u32, tx_type: usize, pred: &[u16], intra: bool) -> TxResult {
-        let (res, recon) = self.try_tx(p, x, y, log2, tx_type, pred, intra);
+    fn code_tx(&mut self, block: TransformBlock, pred: &[u16]) -> TxResult {
+        let TransformBlock { plane: p, x, y, log2, .. } = block;
+        let mut sc = self.scratch.take().unwrap_or_default();
+        let (res, has_recon) = self.try_tx(&mut sc, block, pred);
         let n = 1usize << log2;
-        self.put(p, x, y, n, recon.as_deref().unwrap_or(pred));
-        res
+        self.put(p, x, y, n, if has_recon { &sc.recon[..n * n] } else { pred });
+        let levels = sc.levels[..n * n].to_vec();
+        self.scratch = Some(sc);
+        TxResult { levels, nonzero: res.nonzero, dist: res.dist, bits: res.bits }
     }
 
-    /// Transform and quantise one block; returns the result and its reconstruction (None: the
-    /// prediction) without writing it.
-    fn try_tx(&self, p: usize, x: usize, y: usize, log2: u32, tx_type: usize, pred: &[u16], intra: bool) -> (TxResult, Option<Vec<u16>>) {
+    /// Transform and quantise one block without writing it. The levels are left in `sc.levels`;
+    /// the flag tells whether `sc.recon` holds the reconstruction (false: it is the prediction).
+    fn try_tx(&self, sc: &mut TxScratch, block: TransformBlock, pred: &[u16]) -> (TxEval, bool) {
+        let TransformBlock { plane: p, x, y, log2, tx_type, intra } = block;
         let n = 1usize << log2;
+        let nn = n * n;
         let tx_sz = tx_size_for(log2);
         let bd = self.bd;
         let src = &self.src[p];
-        let mut res = vec![0i32; n * n];
+        let TxScratch { res, coef, levels, deq, resid, recon } = sc;
+        let (res, coef, levels) = (&mut res[..nn], &mut coef[..nn], &mut levels[..nn]);
         for i in 0..n {
             let row = &src.row(y + i)[x..x + n];
             for j in 0..n {
                 res[i * n + j] = row[j] as i32 - pred[i * n + j] as i32;
             }
         }
-        let mut coef = vec![0f32; n * n];
-        forward_2d(&res, &mut coef, n, tx_type);
+        forward_2d(res, coef, n, tx_type);
         // dead-zone quantiser: rounding offset below one half
         let rnd = if intra { 0.38f32 } else { 0.30f32 };
-        let mut levels = vec![0i32; n * n];
+        levels.fill(0);
         let mut nonzero = false;
         for (k, (&cf, l)) in coef.iter().zip(levels.iter_mut()).enumerate() {
             let q = if k == 0 { self.dc_q } else { self.ac_q };
@@ -808,23 +876,26 @@ impl<'a> Decider<'a> {
         }
         let zero_dist = self.sse(p, x, y, n, pred);
         if !nonzero {
-            return (TxResult { levels, nonzero, dist: zero_dist, bits: 1.0 }, None);
+            return (TxEval { nonzero, dist: zero_dist, bits: 1.0 }, false);
         }
-        let recon = self.reconstruct(&levels, tx_sz, tx_type, pred, n, bd);
-        let dist = self.sse(p, x, y, n, &recon);
-        let bits = estimate_bits(&levels, tx_sz);
+        let recon = &mut recon[..nn];
+        self.reconstruct(levels, ReconBuffers { deq: &mut deq[..nn], resid: &mut resid[..nn], recon }, tx_sz, tx_type, pred, bd);
+        let dist = self.sse(p, x, y, n, recon);
+        let bits = estimate_bits(levels, tx_sz);
         if dist + self.lambda * bits >= zero_dist + self.lambda {
-            levels.iter_mut().for_each(|l| *l = 0);
-            return (TxResult { levels, nonzero: false, dist: zero_dist, bits: 1.0 }, None);
+            levels.fill(0);
+            return (TxEval { nonzero: false, dist: zero_dist, bits: 1.0 }, false);
         }
-        (TxResult { levels, nonzero: true, dist, bits }, Some(recon))
+        (TxEval { nonzero: true, dist, bits }, true)
     }
 
-    /// Dequantisation (7.12.3) and the inverse transform, added to the prediction.
-    fn reconstruct(&self, levels: &[i32], tx_sz: usize, tx_type: usize, pred: &[u16], n: usize, bd: u32) -> Vec<u16> {
+    /// Dequantisation (7.12.3) and the inverse transform, added to the prediction; the result is
+    /// written to `recon`. `deq` and `resid` are scratch buffers of `n * n` entries.
+    fn reconstruct(&self, levels: &[i32], bufs: ReconBuffers, tx_sz: usize, tx_type: usize, pred: &[u16], bd: u32) {
+        let ReconBuffers { deq, resid, recon } = bufs;
         let denom: i64 = if tx_sz == TX_32X32 { 2 } else { 1 };
         let lim = 1i64 << (7 + bd);
-        let mut deq = vec![0i32; n * n];
+        deq.fill(0);
         for (k, (&l, d)) in levels.iter().zip(deq.iter_mut()).enumerate() {
             if l == 0 {
                 continue;
@@ -834,10 +905,11 @@ impl<'a> Decider<'a> {
             let mag = (dq.abs() & 0xFF_FFFF) / denom;
             *d = (if dq < 0 { -mag } else { mag }).clamp(-lim, lim - 1) as i32;
         }
-        let mut resid = vec![0i32; n * n];
-        inverse_2d(&deq, &mut resid, tx_sz, tx_type, bd);
+        inverse_2d(deq, resid, tx_sz, tx_type, bd);
         let max = (1i32 << bd) - 1;
-        pred.iter().zip(&resid).map(|(&p, &r)| (p as i32 + r).clamp(0, max) as u16).collect()
+        for ((o, &p), &r) in recon.iter_mut().zip(pred).zip(resid.iter()) {
+            *o = (p as i32 + r).clamp(0, max) as u16;
+        }
     }
 }
 
diff --git a/crates/av1enc/src/lib.rs b/crates/av1enc/src/lib.rs
index 6b1edfbe8..3fcf446bb 100644
--- a/crates/av1enc/src/lib.rs
+++ b/crates/av1enc/src/lib.rs
@@ -409,11 +409,13 @@ impl Encoder {
         };
         let bd = self.cfg.bit_depth as u32;
         let mut cache: Vec<(u32, u64)> = vec![(0, sse(&rec[0]))];
+        // one working copy of the luma plane for all candidate levels
+        let mut planes = [rec[0].clone(), Plane::new(0, 0), Plane::new(0, 0)];
         let mut eval = |lvl: u32| -> u64 {
             if let Some(&(_, e)) = cache.iter().find(|(l, _)| *l == lvl) {
                 return e;
             }
-            let mut planes = [rec[0].clone(), Plane::new(0, 0), Plane::new(0, 0)];
+            planes[0].data.copy_from_slice(&rec[0].data);
             loop_filter(&mut planes, info, [lvl; 4], bd, true, sb_row_step);
             let e = sse(&planes[0]);
             cache.push((lvl, e));
diff --git a/crates/av1enc/src/loopfilter.rs b/crates/av1enc/src/loopfilter.rs
index 2add41edc..cf350fbd2 100644
--- a/crates/av1enc/src/loopfilter.rs
+++ b/crates/av1enc/src/loopfilter.rs
@@ -3,7 +3,7 @@
 //! is 0 in the frames this encoder writes.
 
 use crate::pred::Plane;
-use crate::tables::*;
+use crate::tables::{MAX_LOOP_FILTER, NUM_4X4_BLOCKS_HIGH, NUM_4X4_BLOCKS_WIDE, SUBSAMPLED_SIZE, TX_HEIGHT, TX_WIDTH};
 
 /// Mode info the loop filter reads (per 4x4 luma unit, row stride `mi_cols`), and the
 /// transform size per 4x4 unit of each plane (`LoopfilterTxSizes`, row stride `mi_cols + 32`).
@@ -39,7 +39,7 @@ pub(crate) fn loop_filter(planes: &mut [Plane; 3], info: &LfInfo, level: [u32; 4
                 }
                 let mut col = 0;
                 while col < info.mi_cols {
-                    edge(pl, info, level, bit_depth, plane, pass, row, col);
+                    edge(pl, info, level, bit_depth, plane, pass, (row, col));
                     col += step;
                 }
                 row += step;
@@ -48,7 +48,8 @@ pub(crate) fn loop_filter(planes: &mut [Plane; 3], info: &LfInfo, level: [u32; 4
     }
 }
 
-fn edge(pl: &mut Plane, info: &LfInfo, level: [u32; 4], bd: u32, plane: usize, pass: usize, row: usize, col: usize) {
+fn edge(pl: &mut Plane, info: &LfInfo, level: [u32; 4], bd: u32, plane: usize, pass: usize, position: (usize, usize)) {
+    let (row, col) = position;
     let s = (plane > 0) as usize;
     let (dx, dy) = if pass == 0 { (1usize, 0usize) } else { (0, 1) };
     let x = col * 4;
@@ -88,13 +89,24 @@ fn edge(pl: &mut Plane, info: &LfInfo, level: [u32; 4], bd: u32, plane: usize, p
     let limit = lvl.max(1);
     let blimit = 2 * (lvl + 2) + limit;
     let thresh = lvl >> 4;
+    let strength = FilterStrength { limit, blimit, thresh };
     for k in 0..4 {
-        sample_filter(pl, xp + dy * k, yp + dx * k, plane, limit, blimit, thresh, dx as isize, dy as isize, filter_size, bd);
+        sample_filter(pl, (xp + dy * k, yp + dx * k), plane, &strength, (dx as isize, dy as isize), filter_size, bd);
     }
 }
 
+/// Thresholds derived from the loop-filter level (spec 7.14.4).
+struct FilterStrength {
+    limit: i32,
+    blimit: i32,
+    thresh: i32,
+}
+
 #[inline]
-fn sample_filter(pl: &mut Plane, x: usize, y: usize, plane: usize, limit: i32, blimit: i32, thresh: i32, dx: isize, dy: isize, filter_size: usize, bd: u32) {
+fn sample_filter(pl: &mut Plane, position: (usize, usize), plane: usize, strength: &FilterStrength, direction: (isize, isize), filter_size: usize, bd: u32) {
+    let (x, y) = position;
+    let (dx, dy) = direction;
+    let FilterStrength { limit, blimit, thresh } = *strength;
     let stride = pl.stride as isize;
     let step = dy * stride + dx;
     let base = y as isize * stride + x as isize;
diff --git a/crates/av1enc/src/pred.rs b/crates/av1enc/src/pred.rs
index d61a6fa94..7b354af1f 100644
--- a/crates/av1enc/src/pred.rs
+++ b/crates/av1enc/src/pred.rs
@@ -2,7 +2,10 @@
 //! modes plus V_PRED / H_PRED without edge filtering, 7.11.3 block inter prediction without
 //! reference scaling) so that the encoder predicts exactly like a decoder.
 
-use crate::tables::*;
+use crate::tables::{
+    DC_PRED, EIGHTTAP, H_PRED, PAETH_PRED, SM_WEIGHTS_TX_4X4, SM_WEIGHTS_TX_8X8, SM_WEIGHTS_TX_16X16, SM_WEIGHTS_TX_32X32, SMOOTH_H_PRED, SMOOTH_PRED,
+    SMOOTH_V_PRED, SUBPEL_FILTERS, V_PRED,
+};
 use crate::transform::round2;
 
 /// A plane buffer (padded to whole superblocks).
@@ -184,19 +187,20 @@ pub(crate) fn predict_intra(ed: &Edges, e: &IntraEdge, mode: usize, pred: &mut [
 /// final rounding is the identity) of the `w x h` block at plane position (x, y) displaced by
 /// `mv` (1/8 luma sample units, [row, col]). `last_x` / `last_y` are the largest sample
 /// coordinates of the reference plane; the result goes to `pred` (row stride `w`).
-pub(crate) fn predict_inter(
-    refp: &Plane,
-    last_x: i32,
-    last_y: i32,
-    x: usize,
-    y: usize,
-    w: usize,
-    h: usize,
-    mv: [i32; 2],
-    ss: usize,
-    bit_depth: u32,
-    pred: &mut [u16],
-) {
+pub(crate) struct InterBlock {
+    pub last_x: i32,
+    pub last_y: i32,
+    pub x: usize,
+    pub y: usize,
+    pub width: usize,
+    pub height: usize,
+    pub mv: [i32; 2],
+    pub subsampling: usize,
+    pub bit_depth: u32,
+}
+
+pub(crate) fn predict_inter(refp: &Plane, block: &InterBlock, pred: &mut [u16]) {
+    let InterBlock { last_x, last_y, x, y, width: w, height: h, mv, subsampling: ss, bit_depth } = *block;
     // positions in 1/16 sample units ((startX >> 6) & 15 is the filter phase)
     let px = ((x as i32) << 4) + ((2 * mv[1]) >> ss);
     let py = ((y as i32) << 4) + ((2 * mv[0]) >> ss);
@@ -340,7 +344,11 @@ mod tests {
             for (bx, by) in [(0i32, 0i32), (8, 8), (24, 16), (-5, 20), (30, -3)] {
                 let mut pred = vec![0u16; 64];
                 let mv = [by * 8 + fy as i32 / 2, bx * 8 + fx as i32 / 2];
-                predict_inter(&p, w as i32 - 1, h as i32 - 1, 0, 0, 8, 8, mv, 0, 8, &mut pred);
+                predict_inter(
+                    &p,
+                    &InterBlock { last_x: w as i32 - 1, last_y: h as i32 - 1, x: 0, y: 0, width: 8, height: 8, mv, subsampling: 0, bit_depth: 8 },
+                    &mut pred,
+                );
                 for r in 0..8 {
                     for c in 0..8 {
                         let (x, y) = ((bx + c).clamp(0, w as i32 - 1), (by + r).clamp(0, h as i32 - 1));
diff --git a/crates/av1enc/src/transform.rs b/crates/av1enc/src/transform.rs
index 90042e26a..048bfc0db 100644
--- a/crates/av1enc/src/transform.rs
+++ b/crates/av1enc/src/transform.rs
@@ -4,7 +4,7 @@
 
 use std::sync::OnceLock;
 
-use crate::tables::*;
+use crate::tables::{ADST_ADST, ADST_DCT, COS128_LOOKUP, DCT_ADST, DCT_DCT, TRANSFORM_ROW_SHIFT, TX_WIDTH_LOG2};
 
 #[inline(always)]
 fn round2_64(x: i64, n: u32) -> i32 {
@@ -71,6 +71,12 @@ fn inverse_dct(t: &mut [i32], n: u32, r: u32) {
     for i in 0..len {
         t[i] = copy[brev(n, i)];
     }
+    inverse_dct_initial_stages(t, n, r);
+    inverse_dct_final_stages(t, n, r);
+}
+
+/// Rotate the high-frequency branches before the four-point core.
+fn inverse_dct_initial_stages(t: &mut [i32], n: u32, r: u32) {
     if n >= 5 {
         for i in 0..8 {
             bf(t, 16 + i, 31 - i, 6 + ((brev(3, 7 - i) as i32) << 3), false);
@@ -103,6 +109,10 @@ fn inverse_dct(t: &mut [i32], n: u32, r: u32) {
             }
         }
     }
+}
+
+/// Evaluate the four-point core and merge progressively larger branches.
+fn inverse_dct_final_stages(t: &mut [i32], n: u32, r: u32) {
     for i in 0..2 {
         bf(t, 2 * i, 2 * i + 1, 32 + 16 * i as i32, i == 0);
     }
@@ -454,6 +464,7 @@ pub(crate) fn forward_2d(residual: &[i32], out: &mut [f32], n: usize, tx_type: u
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::tables::{TX_4X4, TX_8X8, TX_16X16, TX_32X32};
 
     /// forward (float) then the normative inverse reproduces the residual: the forward basis
     /// and scale match the decoder's inverse transforms for every supported size and type.
diff --git a/crates/av1enc/src/writer.rs b/crates/av1enc/src/writer.rs
index 54c545fa4..a10bd2e9a 100644
--- a/crates/av1enc/src/writer.rs
+++ b/crates/av1enc/src/writer.rs
@@ -8,7 +8,15 @@ use crate::cdf::Cdfs;
 use crate::decide::{FrameGeom, Leaf, Node, intra_uv_tx_type, scan_for, tx_in_set, tx_set, tx_size_for};
 use crate::loopfilter::LfInfo;
 use crate::symbol::SymbolWriter;
-use crate::tables::*;
+use crate::tables::{
+    ADST_ADST, ADST_DCT, ALTREF_FRAME, ALTREF2_FRAME, BLOCK_8X8, BLOCK_64X64, BR_CDF_SIZE, BWDREF_FRAME, CLASS0_SIZE, COEFF_BASE_CTX_OFFSET, COEFF_BASE_RANGE,
+    D67_PRED, DC_PRED, DCT_ADST, DCT_DCT, DEFAULT_INTRA_FRAME_Y_MODE_CDF, GLOBALMV, GOLDEN_FRAME, INTRA_FRAME, INTRA_MODE_CONTEXT, LAST_FRAME, LAST2_FRAME,
+    LAST3_FRAME, MAG_REF_OFFSET_WITH_TX_CLASS, MAX_ANGLE_DELTA, MAX_REF_MV_STACK_SIZE, MI_HEIGHT_LOG2, MI_WIDTH_LOG2, MV_BORDER, MV_CLASS_0, NEARESTMV, NEARMV,
+    NEWMV, NUM_4X4_BLOCKS_HIGH, NUM_4X4_BLOCKS_WIDE, NUM_BASE_LEVELS, PARTITION_HORZ, PARTITION_HORZ_4, PARTITION_HORZ_A, PARTITION_HORZ_B, PARTITION_NONE,
+    PARTITION_SPLIT, PARTITION_SUBSIZE, PARTITION_VERT, PARTITION_VERT_4, PARTITION_VERT_A, PARTITION_VERT_B, REF_CAT_LEVEL, SIG_REF_DIFF_OFFSET, SIZE_GROUP,
+    SUBSAMPLED_SIZE, TX_32X32, TX_CLASS_2D, TX_HEIGHT, TX_HEIGHT_LOG2, TX_SIZE_SQR, TX_SIZE_SQR_UP, TX_TYPE_INTER_INV_SET3, TX_TYPE_INTRA_INV_SET2, TX_WIDTH,
+    TX_WIDTH_LOG2, V_PRED,
+};
 
 type MvP = [i32; 2];
 
@@ -62,6 +70,8 @@ pub(crate) struct TileWriter<'a> {
     left_dc: [Vec<u8>; 3],
     /// LoopfilterTxSizes per plane (row stride mi_cols + 32).
     lf_tx: [Vec<u8>; 3],
+    /// Scratch for the levels coded so far in `coeffs`.
+    quant: Vec<i32>,
     // current block
     r: usize,
     c: usize,
@@ -114,6 +124,7 @@ impl<'a> TileWriter<'a> {
             left_level: std::array::from_fn(|_| vec![0; g.mi_rows + 64]),
             left_dc: std::array::from_fn(|_| vec![0; g.mi_rows + 64]),
             lf_tx: std::array::from_fn(|_| vec![0; (g.mi_cols + 32) * (g.mi_rows + 32)]),
+            quant: Vec::new(),
             r: 0,
             c: 0,
             bsize: 0,
@@ -181,10 +192,10 @@ impl<'a> TileWriter<'a> {
             self.sw.symbol(partition, cdf);
         } else if has_cols || has_rows {
             assert!(split, "blocks crossing the frame edge are split");
-            let pcdf: Vec<u16> = match bsl {
-                2 => self.cdf.partition_w16[ctx].to_vec(),
-                3 => self.cdf.partition_w32[ctx].to_vec(),
-                _ => self.cdf.partition_w64[ctx].to_vec(),
+            let pcdf: &[u16] = match bsl {
+                2 => &self.cdf.partition_w16[ctx],
+                3 => &self.cdf.partition_w32[ctx],
+                _ => &self.cdf.partition_w64[ctx],
             };
             let pr = |k: usize| pcdf[k] as i32 - if k == 0 { 0 } else { pcdf[k - 1] as i32 };
             let psum = if has_cols {
@@ -455,23 +466,7 @@ impl<'a> TileWriter<'a> {
             }
         } else {
             if plane == 0 {
-                // transform_type( )
-                let set = tx_set(tx_sz, b.is_inter);
-                let t = b.tx_type_y;
-                if set > 0 && self.qidx > 0 {
-                    let sqr = TX_SIZE_SQR[tx_sz] as usize;
-                    if b.is_inter {
-                        // The decision only picks types of this set (DCT_DCT otherwise).
-                        let s = TX_TYPE_INTER_INV_SET3.iter().position(|&v| v as usize == t).unwrap_or_default();
-                        self.sw.symbol(s, &mut self.cdf.inter_tx_type_set3[sqr]);
-                    } else {
-                        let s = TX_TYPE_INTRA_INV_SET2.iter().position(|&v| v as usize == t).unwrap_or_default();
-                        self.sw.symbol(s, &mut self.cdf.intra_tx_type_set2[sqr][b.y_mode]);
-                    }
-                } else {
-                    assert_eq!(t, DCT_DCT);
-                }
-                self.set_tx_types(x4, y4, tx_sz, t);
+                self.write_transform_type(x4, y4, tx_sz, b);
             }
             let plane_tx_type = self.compute_tx_type(plane, tx_sz, x4, y4, b);
             debug_assert!(plane_tx_type == DCT_DCT || matches!(plane_tx_type, ADST_DCT | DCT_ADST | ADST_ADST));
@@ -501,7 +496,9 @@ impl<'a> TileWriter<'a> {
             let height = TX_HEIGHT[tx_sz] as usize;
             let width = 1usize << bwl;
             // Quant[] as the decoder sees it while parsing: the levels coded so far (capped)
-            let mut quant = vec![0i32; width * height];
+            let mut quant = std::mem::take(&mut self.quant);
+            quant.clear();
+            quant.resize(width * height, 0);
             for c in (0..eob).rev() {
                 let pos = scan[c] as usize;
                 let a = levels[pos].unsigned_abs().min(15) as i32;
@@ -526,6 +523,7 @@ impl<'a> TileWriter<'a> {
                 }
                 quant[pos] = a;
             }
+            self.quant = quant;
             for c in 0..eob {
                 let pos = scan[c] as usize;
                 let v = levels[pos];
@@ -571,6 +569,26 @@ impl<'a> TileWriter<'a> {
         }
     }
 
+    fn write_transform_type(&mut self, x4: usize, y4: usize, tx_sz: usize, b: &Leaf) {
+        // transform_type( )
+        let set = tx_set(tx_sz, b.is_inter);
+        let t = b.tx_type_y;
+        if set > 0 && self.qidx > 0 {
+            let sqr = TX_SIZE_SQR[tx_sz] as usize;
+            if b.is_inter {
+                // The decision only picks types of this set (DCT_DCT otherwise).
+                let s = TX_TYPE_INTER_INV_SET3.iter().position(|&v| v as usize == t).unwrap_or_default();
+                self.sw.symbol(s, &mut self.cdf.inter_tx_type_set3[sqr]);
+            } else {
+                let s = TX_TYPE_INTRA_INV_SET2.iter().position(|&v| v as usize == t).unwrap_or_default();
+                self.sw.symbol(s, &mut self.cdf.intra_tx_type_set2[sqr][b.y_mode]);
+            }
+        } else {
+            assert_eq!(t, DCT_DCT);
+        }
+        self.set_tx_types(x4, y4, tx_sz, t);
+    }
+
     fn set_tx_types(&mut self, x4: usize, y4: usize, tx_sz: usize, t: usize) {
         for i in 0..(TX_WIDTH[tx_sz] as usize >> 2) {
             for j in 0..(TX_HEIGHT[tx_sz] as usize >> 2) {
diff --git a/crates/av1enc/tests/bench.rs b/crates/av1enc/tests/it/bench.rs
similarity index 97%
rename from crates/av1enc/tests/bench.rs
rename to crates/av1enc/tests/it/bench.rs
index 6577f8f9f..b29817e1a 100644
--- a/crates/av1enc/tests/bench.rs
+++ b/crates/av1enc/tests/it/bench.rs
@@ -1,7 +1,7 @@
 //! Speed / efficiency measurements on ffmpeg-generated test sources (ignored by default):
-//! `cargo test -p effectcraft-av1enc --test bench -- --ignored --nocapture`.
+//! `cargo test -p effectcraft-av1enc --test it bench:: -- --ignored --nocapture`.
 
-mod common;
+use crate::common;
 
 use std::process::Command;
 use std::time::Instant;
diff --git a/crates/av1enc/tests/common/mod.rs b/crates/av1enc/tests/it/common/mod.rs
similarity index 100%
rename from crates/av1enc/tests/common/mod.rs
rename to crates/av1enc/tests/it/common/mod.rs
diff --git a/crates/av1enc/tests/ffmpeg_oracle.rs b/crates/av1enc/tests/it/ffmpeg_oracle.rs
similarity index 99%
rename from crates/av1enc/tests/ffmpeg_oracle.rs
rename to crates/av1enc/tests/it/ffmpeg_oracle.rs
index 66f380ac2..b35cbf496 100644
--- a/crates/av1enc/tests/ffmpeg_oracle.rs
+++ b/crates/av1enc/tests/it/ffmpeg_oracle.rs
@@ -2,7 +2,7 @@
 //! bit for bit. Skipped when `ffmpeg` (with libdav1d) is not installed. ffmpeg's native `av1`
 //! decoder only drives hardware decoders, so it is not used.
 
-mod common;
+use crate::common;
 
 use std::process::Command;
 
diff --git a/crates/av1enc/tests/it/main.rs b/crates/av1enc/tests/it/main.rs
new file mode 100644
index 000000000..c66bacde5
--- /dev/null
+++ b/crates/av1enc/tests/it/main.rs
@@ -0,0 +1,6 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod bench;
+mod common;
+mod ffmpeg_oracle;
+mod roundtrip;
diff --git a/crates/av1enc/tests/roundtrip.rs b/crates/av1enc/tests/it/roundtrip.rs
similarity index 99%
rename from crates/av1enc/tests/roundtrip.rs
rename to crates/av1enc/tests/it/roundtrip.rs
index 1e777e509..282880e08 100644
--- a/crates/av1enc/tests/roundtrip.rs
+++ b/crates/av1enc/tests/it/roundtrip.rs
@@ -1,7 +1,7 @@
 //! Round trips through FilmCraft's spec-derived AV1 decoder: decoded frames must equal the
 //! encoder's own reconstruction bit for bit.
 
-mod common;
+use crate::common;
 
 use common::*;
 use effectcraft_av1enc::{EncoderConfig, RateControl};
diff --git a/crates/color/src/lib.rs b/crates/color/src/lib.rs
index 1fae0ea90..2a0dfc50e 100644
--- a/crates/color/src/lib.rs
+++ b/crates/color/src/lib.rs
@@ -39,7 +39,13 @@ impl Rgba {
     /// `#rrggbb` or `#rrggbbaa`.
     pub fn from_hex(s: &str) -> Option<Rgba> {
         let s = s.trim().trim_start_matches('#');
-        let p = |i: usize| u8::from_str_radix(s.get(i..i + 2)?, 16).ok();
+        let p = |i: usize| {
+            let pair = s.get(i..i + 2)?;
+            if !pair.bytes().all(|b| b.is_ascii_hexdigit()) {
+                return None;
+            }
+            u8::from_str_radix(pair, 16).ok()
+        };
         match s.len() {
             6 => Some(Rgba::from_u8(p(0)?, p(2)?, p(4)?)),
             8 => Some(Rgba { a: p(6)? as f32 / 255.0, ..Rgba::from_u8(p(0)?, p(2)?, p(4)?) }),
@@ -93,7 +99,7 @@ pub fn rgb_to_hsl(r: f32, g: f32, b: f32) -> (f32, f32, f32) {
     let d = max - min;
     let s = if l > 0.5 { d / (2.0 - max - min) } else { d / (max + min) };
     let h = if max == r {
-        ((g - b) / d + if g < b { 6.0 } else { 0.0 }) / 6.0
+        (((g - b) / d + if g < b { 6.0 } else { 0.0 }) / 6.0).rem_euclid(1.0)
     } else if max == g {
         ((b - r) / d + 2.0) / 6.0
     } else {
@@ -130,7 +136,7 @@ pub fn rgb_to_hsv(r: f32, g: f32, b: f32) -> (f32, f32, f32) {
     let h = if d < 1e-7 {
         0.0
     } else if max == r {
-        ((g - b) / d).rem_euclid(6.0) / 6.0
+        (((g - b) / d).rem_euclid(6.0) / 6.0).rem_euclid(1.0)
     } else if max == g {
         ((b - r) / d + 2.0) / 6.0
     } else {
@@ -141,7 +147,11 @@ pub fn rgb_to_hsv(r: f32, g: f32, b: f32) -> (f32, f32, f32) {
 }
 
 pub fn hsv_to_rgb(h: f32, s: f32, v: f32) -> (f32, f32, f32) {
-    let h6 = h.rem_euclid(1.0) * 6.0;
+    let mut h6 = h.rem_euclid(1.0) * 6.0;
+    // In f32, a tiny negative hue wraps to exactly 1.0; treat it as 0.
+    if h6 >= 6.0 {
+        h6 = 0.0;
+    }
     let i = h6.floor();
     let f = h6 - i;
     let p = v * (1.0 - s);
@@ -252,6 +262,28 @@ impl Label {
 mod tests {
     use super::*;
 
+    #[test]
+    fn hsv_to_rgb_tiny_negative_hue_is_red() {
+        let (r, g, b) = hsv_to_rgb(-1e-9, 1.0, 1.0);
+        assert!(r > 0.99 && g < 0.01 && b < 0.01, "{r} {g} {b}");
+    }
+
+    #[test]
+    fn hue_stays_below_one_for_tiny_blue() {
+        let (h, _, _) = rgb_to_hsv(1.0, 0.0, 1e-9);
+        assert!((0.0..1.0).contains(&h), "rgb_to_hsv hue {h} not in 0..1");
+        let (h, _, _) = rgb_to_hsl(1.0, 0.0, 1e-9);
+        assert!((0.0..1.0).contains(&h), "rgb_to_hsl hue {h} not in 0..1");
+    }
+
+    #[test]
+    fn rejects_signed_hex_pairs() {
+        assert!(Rgba::from_hex("#+1+2+3").is_none());
+        assert!(Rgba::from_hex("#1+2+3+").is_none());
+        assert!(Rgba::from_hex("#ff00+0ff").is_none());
+        assert!(Rgba::from_hex("#a1B2c3").is_some());
+    }
+
     #[test]
     fn srgb_roundtrip() {
         for i in 0..=100 {
diff --git a/crates/color/src/space.rs b/crates/color/src/space.rs
index ee7590eca..b570975aa 100644
--- a/crates/color/src/space.rs
+++ b/crates/color/src/space.rs
@@ -177,7 +177,7 @@ impl ColorSpace {
 
     /// Parse an id or label (case-insensitive, loose).
     pub fn parse(s: &str) -> Option<ColorSpace> {
-        let k: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
+        let k: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         match k.as_str() {
             "srgb" | "srgbiec6196621" | "srgbiec61966" | "iec6196621" => Some(ColorSpace::Srgb),
             "rec709" | "bt709" | "hdtvrec709" | "hdtv" | "709" => Some(ColorSpace::Rec709),
diff --git a/crates/effects/Cargo.toml b/crates/effects/Cargo.toml
index c37d09949..bb26d3127 100644
--- a/crates/effects/Cargo.toml
+++ b/crates/effects/Cargo.toml
@@ -21,4 +21,5 @@ rayon = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }
+chrono = { workspace = true }
 
diff --git a/crates/effects/src/blur2.rs b/crates/effects/src/blur2.rs
index e4f2b0348..929f41553 100644
--- a/crates/effects/src/blur2.rs
+++ b/crates/effects/src/blur2.rs
@@ -509,11 +509,24 @@ fn camera_lens_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
 // ---------------------------------------------------------------------------------------------
 // CC Radial Fast Blur
 
+/// Transparent pixels CC Radial Fast Blur adds on every side of a `w` × `h` buffer with Center
+/// at `c` (buffer pixels) and smear `s`: content `r` from Center streaks out to `r / (1 − s)`,
+/// so the farthest corner reaches `d · s / (1 − s)` past itself (at most 4096, as the other
+/// growing effects). Shared with the GPU path so both grow the same way.
+pub fn radial_fast_pad(c: (f64, f64), w: u32, h: u32, s: f64) -> u32 {
+    let (w, h) = (f64::from(w), f64::from(h));
+    let far = [(0.0, 0.0), (w, 0.0), (0.0, h), (w, h)].iter().map(|&(x, y)| (x - c.0).hypot(y - c.1)).fold(0.0, f64::max);
+    ((far * s / (1.0 - s)).ceil() + 1.0).min(4096.0) as u32
+}
+
 fn radial_fast_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let s = (ctx.params.f("amount") / 100.0).clamp(0.0, 1.0) * 0.5;
     if s <= 0.0 {
         return b;
     }
+    if !ctx.adjustment {
+        b.pad(radial_fast_pad(b.to_px(ctx.params.v2("center")), b.img.width, b.img.height, s));
+    }
     let c = b.to_px(ctx.params.v2("center"));
     let mode = ctx.params.e("zoom");
     let src = b.img.clone();
@@ -906,6 +919,23 @@ mod tests {
         assert_eq!(circle.len(), 21);
     }
 
+    #[test]
+    fn radial_fast_blur_streaks_past_the_layer_edge() {
+        // Center left of an opaque square: the streaks run right, beyond the layer rectangle (#2095).
+        let img = Image::filled(20, 20, [1.0, 1.0, 1.0, 1.0]);
+        let out = run("ec.blur.ccradialfast", &img, &[("center", Value::Vec2([-20.0, 10.0])), ("amount", num(80.0))]);
+        assert!(out.img.width > 20 && out.img.height > 20, "{}x{}", out.img.width, out.img.height);
+        let (o, d) = (out.offset[0] as i64, out.offset[1] as i64);
+        assert!(out.img.get(30 + o, 10 + d)[3] > 0.1, "{:?}", out.img.get(30 + o, 10 + d));
+        // Its streak samples only the square: still opaque, so the content keeps its place.
+        assert!((out.img.get(19 + o, 10 + d)[3] - 1.0).abs() < 1e-5, "{:?}", out.img.get(19 + o, 10 + d));
+        // An adjustment layer is comp-sized already; its buffer is not grown.
+        let s = find("ec.blur.ccradialfast").unwrap();
+        let params = Params { values: [("center".into(), Value::Vec2([-20.0, 10.0])), ("amount".into(), num(80.0))].into_iter().collect() };
+        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [20.0, 20.0], seed: 1, adjustment: true, env: Default::default() };
+        assert_eq!((s.render)(&ctx, Buf { img, offset: [0.0, 0.0], scale: 1.0 }).img.width, 20);
+    }
+
     #[test]
     fn reduce_flicker_blurs_vertically_only() {
         let mut img = Image::filled(8, 8, [0.0, 0.0, 0.0, 1.0]);
diff --git a/crates/effects/src/camera_tracker.rs b/crates/effects/src/camera_tracker.rs
index ff4e51fe4..ba7878abf 100644
--- a/crates/effects/src/camera_tracker.rs
+++ b/crates/effects/src/camera_tracker.rs
@@ -136,11 +136,11 @@ type Cache<T> = Mutex<HashMap<u64, Arc<T>>>;
 fn cached<T>(c: &'static OnceLock<Cache<T>>, json: &str, parse: impl Fn(&str) -> Option<T>) -> Option<Arc<T>> {
     let key = fnv(json.as_bytes());
     let c = c.get_or_init(Default::default);
-    if let Some(a) = c.lock().unwrap_or_else(|e| e.into_inner()).get(&key) {
+    if let Some(a) = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key) {
         return Some(a.clone());
     }
     let a = Arc::new(parse(json)?);
-    let mut m = c.lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 8 {
         m.clear();
     }
diff --git a/crates/effects/src/catalog.rs b/crates/effects/src/catalog.rs
index 0be2b04f5..80a937b22 100644
--- a/crates/effects/src/catalog.rs
+++ b/crates/effects/src/catalog.rs
@@ -92,7 +92,7 @@ const CPU_ONLY_CONTROLS: &[(&str, &[&str])] = &[
 ];
 
 /// Whether the GPU kernel of effect `id` covers the instance's current settings (see
-/// [`CPU_ONLY_CONTROLS`]; plus Cell Pattern's HQ variants and Turbulent Displace's locked
+/// `CPU_ONLY_CONTROLS`; plus Cell Pattern's HQ variants and Turbulent Displace's locked
 /// pinning).
 pub fn gpu_supported(id: &str, ctx: &crate::EffectCtx) -> bool {
     match id {
diff --git a/crates/effects/src/channel.rs b/crates/effects/src/channel.rs
index b763ac21f..44e9dd89a 100644
--- a/crates/effects/src/channel.rs
+++ b/crates/effects/src/channel.rs
@@ -49,12 +49,15 @@ fn set_channels(ctx: &EffectCtx, mut b: Buf) -> Buf {
     b
 }
 
+/// Shift Channels' Take … From menu. After Effects' ten options come first, in its order, so a
+/// project or script that sets 10 ("Full Off" there) turns the channel off here too; "Half On" is
+/// an EffectCraft extra and sits last.
 const SHIFT_ORDER: [Src; 11] =
-    [Src::Alpha, Src::Red, Src::Green, Src::Blue, Src::Luminance, Src::Hue, Src::Lightness, Src::Saturation, Src::Full, Src::Half, Src::Off];
-const SHIFT_NAMES: [&str; 11] = ["Alpha", "Red", "Green", "Blue", "Luminance", "Hue", "Lightness", "Saturation", "Full On", "Half On", "Full Off"];
+    [Src::Alpha, Src::Red, Src::Green, Src::Blue, Src::Luminance, Src::Hue, Src::Lightness, Src::Saturation, Src::Full, Src::Off, Src::Half];
+const SHIFT_NAMES: [&str; 11] = ["Alpha", "Red", "Green", "Blue", "Luminance", "Hue", "Lightness", "Saturation", "Full On", "Full Off", "Half On"];
 
 fn shift_channels(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let s = ["takeRedFrom", "takeGreenFrom", "takeBlueFrom", "takeAlphaFrom"].map(|id| SHIFT_ORDER[(ctx.params.e(id) as usize).min(10)]);
+    let s = ["takeRedFrom", "takeGreenFrom", "takeBlueFrom", "takeAlphaFrom"].map(|id| SHIFT_ORDER[(ctx.params.e(id) as usize).min(SHIFT_ORDER.len() - 1)]);
     route(&mut b, s);
     b
 }
@@ -548,6 +551,24 @@ mod tests {
         assert!(close(out.get(7, 0), [0.25, 0.25, 0.45, 0.5]));
     }
 
+    /// #1797: the Take … From menu keeps After Effects' order, where the tenth option (`Enum(9)`
+    /// here, 10 to a script) is Full Off, not Half On.
+    #[test]
+    fn shift_channels_menu_follows_after_effects_order() {
+        assert_eq!(SHIFT_NAMES[8..], ["Full On", "Full Off", "Half On"]);
+        // The sample's right-hand pixels are half transparent, so a straight 0.0 and 0.5 are
+        // stored as 0.0 and 0.25.
+        let off = run("ec.channel.shiftchannels", &[("takeGreenFrom", Value::Enum(9))], sample());
+        assert!(close(off.get(0, 0), [0.2, 0.0, 0.9, 1.0]), "{:?}", off.get(0, 0));
+        assert!(close(off.get(7, 0), [0.1, 0.0, 0.45, 0.5]), "{:?}", off.get(7, 0));
+        let half = run("ec.channel.shiftchannels", &[("takeGreenFrom", Value::Enum(10))], sample());
+        assert!(close(half.get(0, 0), [0.2, 0.5, 0.9, 1.0]), "{:?}", half.get(0, 0));
+        assert!(close(half.get(7, 0), [0.1, 0.25, 0.45, 0.5]), "{:?}", half.get(7, 0));
+        // A value past the last option stays on the last one instead of panicking.
+        let past = run("ec.channel.shiftchannels", &[("takeGreenFrom", Value::Enum(99))], sample());
+        assert_eq!(past.get(0, 0), half.get(0, 0));
+    }
+
     #[test]
     fn channel_combiner_hls_round_trip() {
         let img = sample();
diff --git a/crates/effects/src/channel3d.rs b/crates/effects/src/channel3d.rs
index 7884e8084..08241107c 100644
--- a/crates/effects/src/channel3d.rs
+++ b/crates/effects/src/channel3d.rs
@@ -37,16 +37,24 @@ fn index_map(b: &Buf, a: &AuxChannels) -> Vec<Option<usize>> {
 /// [`index_map`] sampling each pixel at sub-pixel position `at` (0..1).
 fn index_map_at(b: &Buf, a: &AuxChannels, at: [f64; 2]) -> Vec<Option<usize>> {
     let (w, h) = (b.img.width as usize, b.img.height as usize);
-    let inv = 1.0 / b.scale.max(1e-9);
     (0..w * h)
         .into_par_iter()
         .map(|i| {
-            let (x, y) = ((i % w) as f64 + at[0], (i / w) as f64 + at[1]);
-            a.index_at((x - b.offset[0]) * inv, (y - b.offset[1]) * inv)
+            let [x, y] = aux_point(b.scale, b.offset, [(i % w) as f64 + at[0], (i / w) as f64 + at[1]]);
+            a.index_at(x, y)
         })
         .collect()
 }
 
+/// The layer point where 3D Channel effects look up the aux for buffer position `p` (pixel
+/// `i` + sub-pixel offset) of a buffer with `scale` and `offset`. The Cryptomatte pick calls
+/// it too, so the two can't pick different aux pixels.
+#[inline]
+pub fn aux_point(scale: f64, offset: [f64; 2], p: [f64; 2]) -> [f64; 2] {
+    let inv = 1.0 / scale.max(1e-9);
+    [(p[0] - offset[0]) * inv, (p[1] - offset[1]) * inv]
+}
+
 /// A channel sampled into the buffer grid (`fill` outside).
 fn plane_of(b: &Buf, idx: &[Option<usize>], ch: &[f32], fill: f32) -> Plane {
     Plane { w: b.img.width as usize, h: b.img.height as usize, data: idx.par_iter().map(|i| i.map_or(fill, |i| ch[i])).collect() }
@@ -326,7 +334,7 @@ fn wild(pat: &str, name: &str) -> bool {
 /// Split a selection at its commas. A name in double or single quotes stays whole, commas
 /// included (Blender allows `Green, Glossy`), and a backslash takes the next character
 /// literally (`Green\, Glossy`, `\"`). Unquoted text is trimmed; the quotes are dropped.
-fn selection_names(sel: &str) -> Vec<String> {
+pub(crate) fn selection_names(sel: &str) -> Vec<String> {
     let mut out = vec![];
     let mut cur = String::new();
     let mut quote: Option<char> = None;
@@ -351,7 +359,7 @@ fn selection_names(sel: &str) -> Vec<String> {
     out
 }
 
-/// Parse a selection: comma-separated names (optionally quoted, see [`selection_names`]) or
+/// Parse a selection: comma-separated names (optionally quoted, see `selection_names`) or
 /// `<hex>` hashes / wildcards.
 pub fn selection_hashes(sel: &str, manifest: Option<&[(String, u32)]>) -> Vec<u32> {
     let mut out = vec![];
@@ -395,13 +403,42 @@ fn crypto_matte(planes: &RankPlanes, sel: &[u32], i: usize) -> f32 {
         .clamp(0.0, 1.0)
 }
 
+/// [`id_color`] of the last ID seen on each rank plane, per worker. Neighbouring pixels mostly
+/// carry the same IDs, so this skips the hash and the HSL conversion for most of them. Keyed by the
+/// ID's bits, so it returns exactly what [`id_color`] would.
+///
+/// Keep the per-pixel loop below as it is: with NaN coverage, which NaN payload ends up in a
+/// channel depends on the order the compiler adds the ranks in, and a row-wise loop let it reorder
+/// them (`crypto_aux_image_is_bit_exact_on_edge_values` catches that).
+#[derive(Default)]
+struct IdColorMemo(Vec<(u32, [f32; 3])>);
+
+impl IdColorMemo {
+    #[inline]
+    fn get(&mut self, rank: usize, id: f32) -> [f32; 3] {
+        let bits = id.to_bits();
+        match self.0.get_mut(rank) {
+            Some(e) if e.0 == bits => e.1,
+            Some(e) => {
+                *e = (bits, id_color(id));
+                e.1
+            }
+            None => {
+                let c = id_color(id);
+                self.0.resize(rank + 1, (bits, c));
+                c
+            }
+        }
+    }
+}
+
 /// The coverage-weighted ID colours at aux pixel `i` (the spec's preview).
 #[inline]
-fn crypto_colors(planes: &RankPlanes, i: usize) -> [f32; 3] {
+fn crypto_colors(planes: &RankPlanes, i: usize, memo: &mut IdColorMemo) -> [f32; 3] {
     let mut c = [0.0f32; 3];
-    for (id, cov) in planes {
+    for (rank, (id, cov)) in planes.iter().enumerate() {
         let (Some(&id), Some(&cov)) = (id.get(i), cov.get(i)) else { continue };
-        let k = id_color(id);
+        let k = memo.get(rank, id);
         for j in 0..3 {
             c[j] += k[j] * cov;
         }
@@ -413,10 +450,37 @@ fn crypto_colors(planes: &RankPlanes, i: usize) -> [f32; 3] {
 /// selection's coverage (A), computed in parallel with the rank planes resolved once. The GPU
 /// effect uploads this image and samples it per layer pixel.
 pub fn crypto_aux_image(a: &AuxChannels, layer: &str, sel: &[u32]) -> Image {
+    crypto_aux_image_with(a, layer, sel, CryptoAux::ColorsAndMatte)
+}
+
+/// What [`crypto_aux_image_with`] computes per aux pixel.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum CryptoAux {
+    /// The coverage-weighted ID colours (RGB) and the selection's coverage (A).
+    ColorsAndMatte,
+    /// Only the selection's coverage (A); the RGB stays 0.
+    MatteOnly,
+}
+
+impl CryptoAux {
+    /// What the Cryptomatte effect reads for `display` and Matte Only: the ID colours are only
+    /// read by the Colors display (0) without Matte Only; Matte, Preview and Matte Only need the
+    /// matte alone.
+    pub fn for_display(display: u32, matte_only: bool) -> Self {
+        if display == 0 && !matte_only { Self::ColorsAndMatte } else { Self::MatteOnly }
+    }
+}
+
+/// [`crypto_aux_image`]; with [`CryptoAux::MatteOnly`] the RGB stays 0 and only the matte (A) is
+/// computed, for the displays that never read the ID colours.
+pub fn crypto_aux_image_with(a: &AuxChannels, layer: &str, sel: &[u32], what: CryptoAux) -> Image {
     let planes = a.crypto_rank_planes(layer);
     let mut img = Image::new(a.width, a.height);
-    img.data.par_iter_mut().enumerate().for_each(|(i, px)| {
-        let c = crypto_colors(&planes, i);
+    img.data.par_iter_mut().enumerate().for_each_init(IdColorMemo::default, |memo, (i, px)| {
+        let c = match what {
+            CryptoAux::ColorsAndMatte => crypto_colors(&planes, i, memo),
+            CryptoAux::MatteOnly => [0.0; 3],
+        };
         *px = [c[0], c[1], c[2], crypto_matte(&planes, sel, i)];
     });
     img
@@ -436,9 +500,8 @@ fn cryptomatte(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let display = ctx.params.e("display");
     let matte_only = ctx.params.b("matteOnly");
     let planes = a.crypto_rank_planes(&layer);
-    let src = b.img.clone();
-    b.img.data.par_iter_mut().enumerate().for_each(|(i, px)| {
-        let m = idx[i].map_or(0.0, |k| crypto_matte(&planes, &sel, k));
+    b.img.data.par_iter_mut().zip(idx.par_iter()).for_each_init(IdColorMemo::default, |memo, (px, &k)| {
+        let m = k.map_or(0.0, |k| crypto_matte(&planes, &sel, k));
         if matte_only {
             *px = [m, m, m, m];
             return;
@@ -446,15 +509,15 @@ fn cryptomatte(ctx: &EffectCtx, mut b: Buf) -> Buf {
         *px = match display {
             // Colors: coverage-weighted ID colours (the spec's preview), selection brighter.
             0 => {
-                let c = idx[i].map_or([0.0; 3], |k| crypto_colors(&planes, k));
+                let c = k.map_or([0.0; 3], |k| crypto_colors(&planes, k, memo));
                 let c = c.map(|v| v * (1.0 - 0.5 * m) + 0.5 * m);
                 [c[0], c[1], c[2], 1.0]
             }
-            // Matte: the layer keyed by the selection.
-            1 => src.data[i].map(|v| v * m),
+            // Matte: the layer keyed by the selection (each pixel only reads itself, so no copy).
+            1 => px.map(|v| v * m),
             // Preview: the layer with the selection tinted.
             _ => {
-                let s = src.data[i];
+                let s = *px;
                 [s[0] * (1.0 - 0.5 * m) + 0.5 * m * s[3], s[1] * (1.0 - 0.5 * m) + 0.5 * m * s[3], s[2] * (1.0 - 0.5 * m), s[3]]
             }
         };
@@ -623,345 +686,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, EffectHost, LayerPixels, run_fx};
-    use effectcraft_raster::channels3d::crypto_float;
-
-    /// A 20×10 layer: left half object 1 at depth 100, right half object 2 at depth 500; the
-    /// top-right corner is background. Cryptomatte: "left" / "right".
-    struct AuxHost(Arc<AuxChannels>);
-    impl EffectHost for AuxHost {
-        fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
-            None
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-        fn aux(&self) -> Option<Arc<AuxChannels>> {
-            Some(self.0.clone())
-        }
-    }
-
-    fn scene() -> AuxHost {
-        let (w, h) = (20usize, 10usize);
-        let mut a = AuxChannels::new(w as u32, h as u32, 1.0);
-        let (mut z, mut id, mut r, mut g) = (vec![0.0; w * h], vec![0.0; w * h], vec![0.0; w * h], vec![0.0; w * h]);
-        let (hl, hr) = (crypto_hash("left"), crypto_hash("right"));
-        for y in 0..h {
-            for x in 0..w {
-                let i = y * w + x;
-                if x >= 15 && y < 3 {
-                    z[i] = BACKGROUND_DEPTH;
-                } else if x < 10 {
-                    z[i] = 100.0;
-                    id[i] = 1.0;
-                    r[i] = crypto_float(hl);
-                    g[i] = 1.0;
-                } else {
-                    z[i] = 500.0;
-                    id[i] = 2.0;
-                    r[i] = crypto_float(hr);
-                    g[i] = 1.0;
-                }
-            }
-        }
-        a.channels = vec![("Z".into(), z), ("ObjectID".into(), id), ("CryptoObject00.R".into(), r), ("CryptoObject00.G".into(), g)];
-        a.manifests = vec![("CryptoObject".into(), vec![("left".into(), hl), ("right".into(), hr)])];
-        AuxHost(Arc::new(a))
-    }
-
-    fn img() -> Image {
-        Image::filled(20, 10, [0.5, 0.5, 0.5, 1.0])
-    }
-
-    fn run(id: &str, vals: &[(&str, Value)], host: &AuxHost) -> Image {
-        run_fx(id, vals, img(), 0.0, EffectEnv { host: Some(host), ..Default::default() }).img
-    }
-
-    #[test]
-    fn passes_through_without_aux_channels() {
-        for s in specs() {
-            let out = run_fx(s.id, &[], img(), 0.0, EffectEnv::default());
-            assert_eq!(out.img.data, img().data, "{}", s.id);
-        }
-    }
-
-    #[test]
-    fn depth_matte_thresholds() {
-        let h = scene();
-        let o = run("ec.3d.depthmatte", &[("depth", num(300.0))], &h);
-        assert_eq!(o.get(2, 5)[3], 0.0);
-        assert_eq!(o.get(12, 5)[3], 1.0);
-        let inv = run("ec.3d.depthmatte", &[("depth", num(300.0)), ("invert", Value::Bool(true))], &h);
-        assert_eq!(inv.get(2, 5)[3], 1.0);
-        assert_eq!(inv.get(12, 5)[3], 0.0);
-        // Feather: a ramp of 800 units centred on 300 → depth 100 at 0.25, 500 at 0.75.
-        let f = run("ec.3d.depthmatte", &[("depth", num(300.0)), ("feather", num(800.0))], &h);
-        assert!((f.get(2, 5)[3] - 0.25).abs() < 1e-5 && (f.get(12, 5)[3] - 0.75).abs() < 1e-5);
-    }
-
-    #[test]
-    fn channel_extract_maps_depth_and_ids() {
-        let h = scene();
-        let o = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(1000.0))], &h);
-        assert!((o.get(2, 5)[0] - 0.1).abs() < 1e-6 && (o.get(12, 5)[0] - 0.5).abs() < 1e-6);
-        assert_eq!(o.get(17, 1)[0], 1.0);
-        let ids = run("ec.3d.channelextract", &[("channel", Value::Enum(1)), ("whitePoint", num(2.0))], &h);
-        assert_eq!(ids.get(2, 5)[0], 0.5);
-        // Invert Depth Map flips the ramp; without Clamp Output values run past 1.
-        let inv = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(1000.0)), ("invertDepthMap", Value::Bool(true))], &h);
-        assert!((inv.get(2, 5)[0] - 0.9).abs() < 1e-6);
-        let raw = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(100.0)), ("clampOutput", Value::Bool(false))], &h);
-        assert!(raw.get(12, 5)[0] > 1.5);
-    }
-
-    #[test]
-    fn id_matte_and_identifier() {
-        let h = scene();
-        let o = run("ec.3d.idmatte", &[("idSelection", num(2.0))], &h);
-        assert_eq!(o.get(2, 5)[3], 0.0);
-        assert_eq!(o.get(12, 5)[3], 1.0);
-        let l = run("ec.3d.identifier", &[("display", Value::Enum(1)), ("id", num(1.0))], &h);
-        assert_eq!(l.get(2, 5)[0], 1.0);
-        assert_eq!(l.get(12, 5)[0], 0.0);
-        let c = run("ec.3d.identifier", &[], &h);
-        assert_ne!(c.get(2, 5), c.get(12, 5));
-    }
-
-    /// The parallel aux image (rank planes resolved once) is bit-identical to the per-pixel
-    /// reduction over `crypto_ranks` it replaces.
-    #[test]
-    fn crypto_aux_image_matches_the_per_pixel_reduction() {
-        let (w, h) = (7u32, 5u32);
-        let n = (w * h) as usize;
-        let mut a = AuxChannels::new(w, h, 1.0);
-        let ids = [crypto_hash("cube"), crypto_hash("sphere"), crypto_hash("ring")].map(effectcraft_raster::channels3d::crypto_float);
-        for (k, ch) in ["00.R", "00.G", "00.B", "00.A", "01.R", "01.G", "01.B", "01.A"].iter().enumerate() {
-            let v: Vec<f32> = (0..n).map(|i| if k % 2 == 0 { ids[(i + k) % 3] } else { ((i * 7 + k * 3) % 11) as f32 / 10.0 }).collect();
-            a.channels.push((format!("CryptoObject{ch}"), v));
-        }
-        let sel = vec![crypto_hash("sphere"), crypto_hash("ring")];
-        let img = crypto_aux_image(&a, "CryptoObject", &sel);
-        for i in 0..n {
-            let ranks = a.crypto_ranks("CryptoObject", i);
-            let m: f32 = ranks.iter().filter(|(id, c)| *c > 0.0 && sel.contains(&id.to_bits())).map(|(_, c)| *c).sum::<f32>().clamp(0.0, 1.0);
-            let mut c = [0.0f32; 3];
-            for (id, cov) in &ranks {
-                let k = id_color(*id);
-                for j in 0..3 {
-                    c[j] += k[j] * cov;
-                }
-            }
-            let want = [c[0], c[1], c[2], m];
-            assert_eq!(img.data[i].map(f32::to_bits), want.map(f32::to_bits), "pixel {i}");
-        }
-    }
-
-    /// The lookup before #473, kept as the reference: the rank channels formatted and searched
-    /// by name for every pixel.
-    fn ranks_by_name(a: &AuxChannels, layer: &str, i: usize) -> Vec<(f32, f32)> {
-        let mut out = vec![];
-        for k in 0.. {
-            let get = |c: &str| a.get(&format!("{layer}{k:02}.{c}"));
-            let (Some(r), Some(g)) = (get("R"), get("G")) else { break };
-            out.push((r[i], g[i]));
-            if let (Some(b), Some(al)) = (get("B"), get("A")) {
-                out.push((b[i], al[i]));
-            }
-        }
-        out
-    }
-
-    /// The reduction before #473 over those ranks: (ID colours, selection coverage).
-    fn reduce_by_name(a: &AuxChannels, layer: &str, sel: &[u32], i: usize) -> ([f32; 3], f32) {
-        let ranks = ranks_by_name(a, layer, i);
-        let m: f32 = ranks.iter().filter(|(id, c)| *c > 0.0 && sel.contains(&id.to_bits())).map(|(_, c)| *c).sum::<f32>().clamp(0.0, 1.0);
-        let mut c = [0.0f32; 3];
-        for (id, cov) in &ranks {
-            let k = id_color(*id);
-            for j in 0..3 {
-                c[j] += k[j] * cov;
-            }
-        }
-        (c, m)
-    }
-
-    /// A 6×2 Cryptomatte layer with awkward values: NaN, ±inf, negative and -0.0 coverage, NaN
-    /// and -0.0 IDs; rank 01 has no B/A pair, rank 02 is missing, so rank 03 (filled with values
-    /// that would change every pixel) must be ignored as before.
-    fn edge_aux(with_rank_after_gap: bool) -> AuxChannels {
-        let (w, h) = (6u32, 2u32);
-        let nan_payload = f32::from_bits(0x7fc0_1234);
-        let (hs, hc) = (crypto_float(crypto_hash("sphere")), crypto_float(crypto_hash("cube")));
-        let cov = [f32::NAN, f32::INFINITY, f32::NEG_INFINITY, -0.5, -0.0, 0.0, 0.25, 1.0, 2.0, f32::MIN_POSITIVE, nan_payload, 0.5];
-        let ids = [hs, f32::NAN, hc, -0.0, 0.0, nan_payload, hs, hc, f32::NAN, hs, hc, -0.0];
-        let rot = |v: &[f32; 12], k: usize| -> Vec<f32> { (0..12).map(|i| v[(i + k) % 12]).collect() };
-        let mut a = AuxChannels::new(w, h, 1.0);
-        let mut push = |n: &str, v: Vec<f32>| a.channels.push((format!("CryptoObject{n}"), v));
-        push("00.R", rot(&ids, 0));
-        push("00.G", rot(&cov, 0));
-        push("00.B", rot(&ids, 3));
-        push("00.A", rot(&cov, 5));
-        push("01.R", rot(&ids, 7));
-        push("01.G", rot(&cov, 2));
-        if with_rank_after_gap {
-            push("03.R", vec![hs; 12]);
-            push("03.G", vec![1.0; 12]);
-            push("03.B", vec![hc; 12]);
-            push("03.A", vec![1.0; 12]);
-        }
-        a
-    }
-
-    fn edge_selection() -> Vec<u32> {
-        vec![crypto_hash("sphere"), f32::NAN.to_bits(), 0x7fc0_1234, (-0.0f32).to_bits()]
-    }
-
-    /// Edge values give bit-identical results to the lookup by name, the missing B/A pair is
-    /// skipped and a rank after a gap is ignored.
-    #[test]
-    fn crypto_aux_image_is_bit_exact_on_edge_values() {
-        let sel = edge_selection();
-        let a = edge_aux(true);
-        assert_eq!(a.crypto_rank_planes("CryptoObject").len(), 3, "00.R/G, 00.B/A, 01.R/G; not 03 after the gap");
-        let img = crypto_aux_image(&a, "CryptoObject", &sel);
-        let without_gap_rank = crypto_aux_image(&edge_aux(false), "CryptoObject", &sel);
-        for i in 0..12 {
-            let (c, m) = reduce_by_name(&a, "CryptoObject", &sel, i);
-            let want = [c[0], c[1], c[2], m];
-            assert_eq!(img.data[i].map(f32::to_bits), want.map(f32::to_bits), "pixel {i}");
-            assert_eq!(img.data[i].map(f32::to_bits), without_gap_rank.data[i].map(f32::to_bits), "pixel {i}: the rank after the gap was used");
-        }
-    }
-
-    /// The CPU effect on a 20×10 layer over the 6×2 edge aux: pixels inside the aux area match
-    /// the lookup by name bit for bit in every display mode, pixels outside it (no aux index)
-    /// get an empty matte and no ID colour.
-    #[test]
-    fn cryptomatte_cpu_path_is_bit_exact_inside_and_outside_the_aux_area() {
-        let a = edge_aux(true);
-        let host = AuxHost(Arc::new(a.clone()));
-        let names = "sphere, <7fc00000>, <7fc01234>, <80000000>";
-        assert_eq!(selection_hashes(names, None), edge_selection());
-        let src = img().data[0];
-        for (display, matte_only) in [(0, false), (1, false), (2, false), (0, true)] {
-            let out = run(
-                "ec.3d.cryptomatte",
-                &[("selection", Value::Str(names.into())), ("display", Value::Enum(display)), ("matteOnly", Value::Bool(matte_only))],
-                &host,
-            );
-            let expect = |c: [f32; 3], m: f32| -> [f32; 4] {
-                if matte_only {
-                    return [m; 4];
-                }
-                match display {
-                    0 => {
-                        let c = c.map(|v| v * (1.0 - 0.5 * m) + 0.5 * m);
-                        [c[0], c[1], c[2], 1.0]
-                    }
-                    1 => src.map(|v| v * m),
-                    _ => [src[0] * (1.0 - 0.5 * m) + 0.5 * m * src[3], src[1] * (1.0 - 0.5 * m) + 0.5 * m * src[3], src[2] * (1.0 - 0.5 * m), src[3]],
-                }
-            };
-            for (x, y) in [(0u32, 0u32), (1, 0), (5, 0), (0, 1), (3, 1), (5, 1)] {
-                let (c, m) = reduce_by_name(&a, "CryptoObject", &edge_selection(), (y * 6 + x) as usize);
-                assert_eq!(
-                    out.get(x as i64, y as i64).map(f32::to_bits),
-                    expect(c, m).map(f32::to_bits),
-                    "display {display} matteOnly {matte_only} at ({x}, {y})"
-                );
-            }
-            for (x, y) in [(6u32, 0u32), (19, 0), (0, 2), (12, 9)] {
-                assert_eq!(
-                    out.get(x as i64, y as i64).map(f32::to_bits),
-                    expect([0.0; 3], 0.0).map(f32::to_bits),
-                    "display {display} matteOnly {matte_only} outside the aux at ({x}, {y})"
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn cryptomatte_selects_by_name_and_wildcard() {
-        let h = scene();
-        let m = run("ec.3d.cryptomatte", &[("selection", Value::Str("right".into())), ("matteOnly", Value::Bool(true))], &h);
-        assert_eq!(m.get(2, 5)[3], 0.0);
-        assert_eq!(m.get(12, 5)[3], 1.0);
-        let w = run("ec.3d.cryptomatte", &[("selection", Value::Str("l*".into())), ("display", Value::Enum(1))], &h);
-        assert_eq!(w.get(2, 5)[3], 1.0);
-        assert_eq!(w.get(12, 5)[3], 0.0);
-        assert!(wild("*ight", "right") && wild("r*t", "right") && !wild("x*", "right"));
-        let hex = format!("<{:08x}>", crypto_hash("left"));
-        assert_eq!(selection_hashes(&hex, None), vec![crypto_hash("left")]);
-    }
-
-    /// #473: a name with a comma in it (Blender allows `Green, Glossy`) is selected when it is
-    /// quoted or its comma escaped, instead of being cut into two names that match nothing.
-    #[test]
-    fn cryptomatte_selection_keeps_quoted_names_with_commas_whole() {
-        let manifest = vec![("Green, Glossy".to_string(), 7), ("Green".to_string(), 1), ("Glossy".to_string(), 2), ("ring".to_string(), 3)];
-        let m = Some(manifest.as_slice());
-        assert_eq!(selection_hashes(r#""Green, Glossy""#, m), vec![7]);
-        assert_eq!(selection_hashes("'Green, Glossy', ring", m), vec![7, 3]);
-        assert_eq!(selection_hashes(r"Green\, Glossy", m), vec![7]);
-        assert_eq!(selection_hashes(r#"ring , "Green, Glossy""#, m), vec![3, 7]);
-        // Without a manifest the whole name is hashed.
-        assert_eq!(selection_hashes(r#""Green, Glossy""#, None), vec![crypto_hash("Green, Glossy")]);
-        // Plain lists, apostrophes inside names and an unclosed quote still parse.
-        assert_eq!(selection_hashes("Green, Glossy", m), vec![1, 2]);
-        assert_eq!(selection_names("Bob's mat, ring"), vec!["Bob's mat", "ring"]);
-        assert_eq!(selection_names(r#""Green, Glossy"#), vec!["Green, Glossy"]);
-        assert_eq!(selection_names(r#"say \"hi\""#), vec![r#"say "hi""#]);
-    }
-
-    #[test]
-    fn fog_and_depth_of_field_follow_depth() {
-        let h = scene();
-        let f = run("ec.3d.fog3d", &[("fogColor", col(1.0, 0.0, 0.0)), ("fogEndDepth", num(1000.0)), ("scatteringDensity", num(0.0))], &h);
-        // Linear fog: 10 % at depth 100, 50 % at 500, full on the background.
-        assert!((f.get(2, 5)[0] - 0.55).abs() < 1e-4, "{:?}", f.get(2, 5));
-        assert!((f.get(12, 5)[0] - 0.75).abs() < 1e-4);
-        assert!((f.get(17, 1)[0] - 1.0).abs() < 1e-4 && f.get(17, 1)[1] < 1e-4);
-        assert!((dof_radius(100.0, 100.0, 0.0, 10.0, 50.0)).abs() < 1e-6);
-        assert!((dof_radius(200.0, 100.0, 0.0, 10.0, 50.0) - 10.0).abs() < 1e-6);
-        assert_eq!(dof_radius(140.0, 100.0, 100.0, 10.0, 50.0), 0.0);
-        // A sharp edge at the far object blurs when focused near.
-        let mut pic = Image::new(20, 10);
-        for y in 0..10 {
-            for x in 0..20 {
-                let v = if x % 2 == 0 { 1.0 } else { 0.0 };
-                pic.set(x, y, [v, v, v, 1.0]);
-            }
-        }
-        let env = EffectEnv { host: Some(&h), ..Default::default() };
-        let d = run_fx("ec.3d.depthoffield", &[("focalPlane", num(100.0)), ("maximumRadius", num(4.0))], pic.clone(), 0.0, env).img;
-        assert_eq!(d.get(4, 5), pic.get(4, 5));
-        assert!((d.get(12, 5)[0] - 0.5).abs() < 0.3 && d.get(12, 5) != pic.get(12, 5));
-    }
-
-    #[test]
-    fn extractor_maps_named_channels() {
-        let h = scene();
-        let o = run("ec.3d.extractor", &[("red", Value::Str("Z".into())), ("whitePoint", num(1000.0))], &h);
-        assert!((o.get(2, 5)[0] - 0.1).abs() < 1e-6);
-        assert!((o.get(2, 5)[1] - 0.0005).abs() < 1e-6);
-        // Without aux: the layer's own channels can be swapped.
-        let s = run_fx("ec.3d.extractor", &[("red", Value::Str("A".into()))], Image::filled(2, 2, [0.2, 0.3, 0.4, 1.0]), 0.0, EffectEnv::default());
-        assert_eq!(s.img.get(0, 0), [1.0, 0.3, 0.4, 1.0]);
-    }
-
-    #[test]
-    fn channel_extract_antialias_averages_sub_pixels() {
-        // Depth at twice the layer resolution, alternating 0 / 1000 per aux column.
-        let mut a = AuxChannels::new(40, 20, 2.0);
-        a.channels = vec![("Z".into(), (0..800).map(|i| if i % 2 == 0 { 0.0 } else { 1000.0 }).collect())];
-        let host = AuxHost(Arc::new(a));
-        let vals = [("blackPoint", num(0.0)), ("whitePoint", num(1000.0))];
-        let hard = run("ec.3d.channelextract", &vals, &host);
-        let v = hard.get(5, 5)[0];
-        assert!(v == 0.0 || v == 1.0, "{v}");
-        let soft = run("ec.3d.channelextract", &[vals.as_slice(), &[("antialias", Value::Bool(true))]].concat(), &host);
-        assert!((soft.get(5, 5)[0] - 0.5).abs() < 1e-5, "{:?}", soft.get(5, 5));
-    }
-}
+mod tests;
diff --git a/crates/effects/src/channel3d/tests.rs b/crates/effects/src/channel3d/tests.rs
new file mode 100644
index 000000000..4fc84440e
--- /dev/null
+++ b/crates/effects/src/channel3d/tests.rs
@@ -0,0 +1,375 @@
+use super::*;
+use crate::{EffectEnv, EffectHost, LayerPixels, run_fx};
+use effectcraft_raster::channels3d::crypto_float;
+
+/// A 20×10 layer: left half object 1 at depth 100, right half object 2 at depth 500; the
+/// top-right corner is background. Cryptomatte: "left" / "right".
+struct AuxHost(Arc<AuxChannels>);
+impl EffectHost for AuxHost {
+    fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
+        None
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+    fn aux(&self) -> Option<Arc<AuxChannels>> {
+        Some(self.0.clone())
+    }
+}
+
+fn scene() -> AuxHost {
+    let (w, h) = (20usize, 10usize);
+    let mut a = AuxChannels::new(w as u32, h as u32, 1.0);
+    let (mut z, mut id, mut r, mut g) = (vec![0.0; w * h], vec![0.0; w * h], vec![0.0; w * h], vec![0.0; w * h]);
+    let (hl, hr) = (crypto_hash("left"), crypto_hash("right"));
+    for y in 0..h {
+        for x in 0..w {
+            let i = y * w + x;
+            if x >= 15 && y < 3 {
+                z[i] = BACKGROUND_DEPTH;
+            } else if x < 10 {
+                z[i] = 100.0;
+                id[i] = 1.0;
+                r[i] = crypto_float(hl);
+                g[i] = 1.0;
+            } else {
+                z[i] = 500.0;
+                id[i] = 2.0;
+                r[i] = crypto_float(hr);
+                g[i] = 1.0;
+            }
+        }
+    }
+    a.channels = vec![("Z".into(), z), ("ObjectID".into(), id), ("CryptoObject00.R".into(), r), ("CryptoObject00.G".into(), g)];
+    a.manifests = vec![("CryptoObject".into(), vec![("left".into(), hl), ("right".into(), hr)])];
+    AuxHost(Arc::new(a))
+}
+
+fn img() -> Image {
+    Image::filled(20, 10, [0.5, 0.5, 0.5, 1.0])
+}
+
+fn run(id: &str, vals: &[(&str, Value)], host: &AuxHost) -> Image {
+    run_fx(id, vals, img(), 0.0, EffectEnv { host: Some(host), ..Default::default() }).img
+}
+
+#[test]
+fn passes_through_without_aux_channels() {
+    for s in specs() {
+        let out = run_fx(s.id, &[], img(), 0.0, EffectEnv::default());
+        assert_eq!(out.img.data, img().data, "{}", s.id);
+    }
+}
+
+#[test]
+fn depth_matte_thresholds() {
+    let h = scene();
+    let o = run("ec.3d.depthmatte", &[("depth", num(300.0))], &h);
+    assert_eq!(o.get(2, 5)[3], 0.0);
+    assert_eq!(o.get(12, 5)[3], 1.0);
+    let inv = run("ec.3d.depthmatte", &[("depth", num(300.0)), ("invert", Value::Bool(true))], &h);
+    assert_eq!(inv.get(2, 5)[3], 1.0);
+    assert_eq!(inv.get(12, 5)[3], 0.0);
+    // Feather: a ramp of 800 units centred on 300 → depth 100 at 0.25, 500 at 0.75.
+    let f = run("ec.3d.depthmatte", &[("depth", num(300.0)), ("feather", num(800.0))], &h);
+    assert!((f.get(2, 5)[3] - 0.25).abs() < 1e-5 && (f.get(12, 5)[3] - 0.75).abs() < 1e-5);
+}
+
+#[test]
+fn channel_extract_maps_depth_and_ids() {
+    let h = scene();
+    let o = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(1000.0))], &h);
+    assert!((o.get(2, 5)[0] - 0.1).abs() < 1e-6 && (o.get(12, 5)[0] - 0.5).abs() < 1e-6);
+    assert_eq!(o.get(17, 1)[0], 1.0);
+    let ids = run("ec.3d.channelextract", &[("channel", Value::Enum(1)), ("whitePoint", num(2.0))], &h);
+    assert_eq!(ids.get(2, 5)[0], 0.5);
+    // Invert Depth Map flips the ramp; without Clamp Output values run past 1.
+    let inv = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(1000.0)), ("invertDepthMap", Value::Bool(true))], &h);
+    assert!((inv.get(2, 5)[0] - 0.9).abs() < 1e-6);
+    let raw = run("ec.3d.channelextract", &[("blackPoint", num(0.0)), ("whitePoint", num(100.0)), ("clampOutput", Value::Bool(false))], &h);
+    assert!(raw.get(12, 5)[0] > 1.5);
+}
+
+#[test]
+fn id_matte_and_identifier() {
+    let h = scene();
+    let o = run("ec.3d.idmatte", &[("idSelection", num(2.0))], &h);
+    assert_eq!(o.get(2, 5)[3], 0.0);
+    assert_eq!(o.get(12, 5)[3], 1.0);
+    let l = run("ec.3d.identifier", &[("display", Value::Enum(1)), ("id", num(1.0))], &h);
+    assert_eq!(l.get(2, 5)[0], 1.0);
+    assert_eq!(l.get(12, 5)[0], 0.0);
+    let c = run("ec.3d.identifier", &[], &h);
+    assert_ne!(c.get(2, 5), c.get(12, 5));
+}
+
+/// The parallel aux image (rank planes resolved once) is bit-identical to the per-pixel
+/// reduction over `crypto_ranks` it replaces.
+#[test]
+fn crypto_aux_image_matches_the_per_pixel_reduction() {
+    let (w, h) = (7u32, 5u32);
+    let n = (w * h) as usize;
+    let mut a = AuxChannels::new(w, h, 1.0);
+    let ids = [crypto_hash("cube"), crypto_hash("sphere"), crypto_hash("ring")].map(effectcraft_raster::channels3d::crypto_float);
+    for (k, ch) in ["00.R", "00.G", "00.B", "00.A", "01.R", "01.G", "01.B", "01.A"].iter().enumerate() {
+        let v: Vec<f32> = (0..n).map(|i| if k % 2 == 0 { ids[(i + k) % 3] } else { ((i * 7 + k * 3) % 11) as f32 / 10.0 }).collect();
+        a.channels.push((format!("CryptoObject{ch}"), v));
+    }
+    let sel = vec![crypto_hash("sphere"), crypto_hash("ring")];
+    let img = crypto_aux_image(&a, "CryptoObject", &sel);
+    for i in 0..n {
+        let ranks = a.crypto_ranks("CryptoObject", i);
+        let m: f32 = ranks.iter().filter(|(id, c)| *c > 0.0 && sel.contains(&id.to_bits())).map(|(_, c)| *c).sum::<f32>().clamp(0.0, 1.0);
+        let mut c = [0.0f32; 3];
+        for (id, cov) in &ranks {
+            let k = id_color(*id);
+            for j in 0..3 {
+                c[j] += k[j] * cov;
+            }
+        }
+        let want = [c[0], c[1], c[2], m];
+        assert_eq!(img.data[i].map(f32::to_bits), want.map(f32::to_bits), "pixel {i}");
+    }
+}
+
+/// The lookup before #473, kept as the reference: the rank channels formatted and searched
+/// by name for every pixel.
+fn ranks_by_name(a: &AuxChannels, layer: &str, i: usize) -> Vec<(f32, f32)> {
+    let mut out = vec![];
+    for k in 0.. {
+        let get = |c: &str| a.get(&format!("{layer}{k:02}.{c}"));
+        let (Some(r), Some(g)) = (get("R"), get("G")) else { break };
+        out.push((r[i], g[i]));
+        if let (Some(b), Some(al)) = (get("B"), get("A")) {
+            out.push((b[i], al[i]));
+        }
+    }
+    out
+}
+
+/// The reduction before #473 over those ranks: (ID colours, selection coverage).
+fn reduce_by_name(a: &AuxChannels, layer: &str, sel: &[u32], i: usize) -> ([f32; 3], f32) {
+    let ranks = ranks_by_name(a, layer, i);
+    let m: f32 = ranks.iter().filter(|(id, c)| *c > 0.0 && sel.contains(&id.to_bits())).map(|(_, c)| *c).sum::<f32>().clamp(0.0, 1.0);
+    let mut c = [0.0f32; 3];
+    for (id, cov) in &ranks {
+        let k = id_color(*id);
+        for j in 0..3 {
+            c[j] += k[j] * cov;
+        }
+    }
+    (c, m)
+}
+
+/// A 6×2 Cryptomatte layer with awkward values: NaN, ±inf, negative and -0.0 coverage, NaN
+/// and -0.0 IDs; rank 01 has no B/A pair, rank 02 is missing, so rank 03 (filled with values
+/// that would change every pixel) must be ignored as before.
+fn edge_aux(with_rank_after_gap: bool) -> AuxChannels {
+    let (w, h) = (6u32, 2u32);
+    let nan_payload = f32::from_bits(0x7fc0_1234);
+    let (hs, hc) = (crypto_float(crypto_hash("sphere")), crypto_float(crypto_hash("cube")));
+    let cov = [f32::NAN, f32::INFINITY, f32::NEG_INFINITY, -0.5, -0.0, 0.0, 0.25, 1.0, 2.0, f32::MIN_POSITIVE, nan_payload, 0.5];
+    let ids = [hs, f32::NAN, hc, -0.0, 0.0, nan_payload, hs, hc, f32::NAN, hs, hc, -0.0];
+    let rot = |v: &[f32; 12], k: usize| -> Vec<f32> { (0..12).map(|i| v[(i + k) % 12]).collect() };
+    let mut a = AuxChannels::new(w, h, 1.0);
+    let mut push = |n: &str, v: Vec<f32>| a.channels.push((format!("CryptoObject{n}"), v));
+    push("00.R", rot(&ids, 0));
+    push("00.G", rot(&cov, 0));
+    push("00.B", rot(&ids, 3));
+    push("00.A", rot(&cov, 5));
+    push("01.R", rot(&ids, 7));
+    push("01.G", rot(&cov, 2));
+    if with_rank_after_gap {
+        push("03.R", vec![hs; 12]);
+        push("03.G", vec![1.0; 12]);
+        push("03.B", vec![hc; 12]);
+        push("03.A", vec![1.0; 12]);
+    }
+    a
+}
+
+/// The memo hands out exactly `id_color`'s bits for every rank and pixel of the edge values
+/// (NaN IDs with and without a payload, -0.0 and 0.0 are keyed by their bits).
+#[test]
+fn id_color_memo_matches_id_color() {
+    let a = edge_aux(true);
+    let planes = a.crypto_rank_planes("CryptoObject");
+    let mut memo = IdColorMemo::default();
+    for i in 0..12 {
+        for (r, (id, _)) in planes.iter().enumerate() {
+            assert_eq!(memo.get(r, id[i]).map(f32::to_bits), id_color(id[i]).map(f32::to_bits), "pixel {i} rank {r}");
+        }
+    }
+}
+
+fn edge_selection() -> Vec<u32> {
+    vec![crypto_hash("sphere"), f32::NAN.to_bits(), 0x7fc0_1234, (-0.0f32).to_bits()]
+}
+
+/// Edge values give bit-identical results to the lookup by name, the missing B/A pair is
+/// skipped and a rank after a gap is ignored.
+#[test]
+fn crypto_aux_image_is_bit_exact_on_edge_values() {
+    let sel = edge_selection();
+    let a = edge_aux(true);
+    assert_eq!(a.crypto_rank_planes("CryptoObject").len(), 3, "00.R/G, 00.B/A, 01.R/G; not 03 after the gap");
+    let img = crypto_aux_image(&a, "CryptoObject", &sel);
+    let without_gap_rank = crypto_aux_image(&edge_aux(false), "CryptoObject", &sel);
+    for i in 0..12 {
+        let (c, m) = reduce_by_name(&a, "CryptoObject", &sel, i);
+        let want = [c[0], c[1], c[2], m];
+        assert_eq!(img.data[i].map(f32::to_bits), want.map(f32::to_bits), "pixel {i}");
+        assert_eq!(img.data[i].map(f32::to_bits), without_gap_rank.data[i].map(f32::to_bits), "pixel {i}: the rank after the gap was used");
+    }
+}
+
+/// Without the ID colours the matte (A) is bit-identical and the RGB is 0, on the edge values.
+#[test]
+fn crypto_aux_image_without_colors_keeps_the_matte() {
+    let a = edge_aux(true);
+    let sel = edge_selection();
+    let full = crypto_aux_image(&a, "CryptoObject", &sel);
+    let matte = crypto_aux_image_with(&a, "CryptoObject", &sel, CryptoAux::MatteOnly);
+    for (f, m) in full.data.iter().zip(&matte.data) {
+        assert_eq!(f[3].to_bits(), m[3].to_bits());
+        assert_eq!(m[..3], [0.0; 3]);
+    }
+}
+
+/// Only the Colors display without Matte Only reads the ID colours.
+#[test]
+fn crypto_aux_for_display_reads_colors_only_for_the_colors_display() {
+    assert_eq!(CryptoAux::for_display(0, false), CryptoAux::ColorsAndMatte);
+    assert_eq!(CryptoAux::for_display(0, true), CryptoAux::MatteOnly);
+    for display in [1, 2, 3, u32::MAX] {
+        for matte_only in [false, true] {
+            assert_eq!(CryptoAux::for_display(display, matte_only), CryptoAux::MatteOnly, "display {display}");
+        }
+    }
+}
+
+/// The CPU effect on a 20×10 layer over the 6×2 edge aux: pixels inside the aux area match
+/// the lookup by name bit for bit in every display mode, pixels outside it (no aux index)
+/// get an empty matte and no ID colour.
+#[test]
+fn cryptomatte_cpu_path_is_bit_exact_inside_and_outside_the_aux_area() {
+    let a = edge_aux(true);
+    let host = AuxHost(Arc::new(a.clone()));
+    let names = "sphere, <7fc00000>, <7fc01234>, <80000000>";
+    assert_eq!(selection_hashes(names, None), edge_selection());
+    let src = img().data[0];
+    for (display, matte_only) in [(0, false), (1, false), (2, false), (0, true)] {
+        let out = run(
+            "ec.3d.cryptomatte",
+            &[("selection", Value::Str(names.into())), ("display", Value::Enum(display)), ("matteOnly", Value::Bool(matte_only))],
+            &host,
+        );
+        let expect = |c: [f32; 3], m: f32| -> [f32; 4] {
+            if matte_only {
+                return [m; 4];
+            }
+            match display {
+                0 => {
+                    let c = c.map(|v| v * (1.0 - 0.5 * m) + 0.5 * m);
+                    [c[0], c[1], c[2], 1.0]
+                }
+                1 => src.map(|v| v * m),
+                _ => [src[0] * (1.0 - 0.5 * m) + 0.5 * m * src[3], src[1] * (1.0 - 0.5 * m) + 0.5 * m * src[3], src[2] * (1.0 - 0.5 * m), src[3]],
+            }
+        };
+        for (x, y) in [(0u32, 0u32), (1, 0), (5, 0), (0, 1), (3, 1), (5, 1)] {
+            let (c, m) = reduce_by_name(&a, "CryptoObject", &edge_selection(), (y * 6 + x) as usize);
+            assert_eq!(out.get(x as i64, y as i64).map(f32::to_bits), expect(c, m).map(f32::to_bits), "display {display} matteOnly {matte_only} at ({x}, {y})");
+        }
+        for (x, y) in [(6u32, 0u32), (19, 0), (0, 2), (12, 9)] {
+            assert_eq!(
+                out.get(x as i64, y as i64).map(f32::to_bits),
+                expect([0.0; 3], 0.0).map(f32::to_bits),
+                "display {display} matteOnly {matte_only} outside the aux at ({x}, {y})"
+            );
+        }
+    }
+}
+
+#[test]
+fn cryptomatte_selects_by_name_and_wildcard() {
+    let h = scene();
+    let m = run("ec.3d.cryptomatte", &[("selection", Value::Str("right".into())), ("matteOnly", Value::Bool(true))], &h);
+    assert_eq!(m.get(2, 5)[3], 0.0);
+    assert_eq!(m.get(12, 5)[3], 1.0);
+    let w = run("ec.3d.cryptomatte", &[("selection", Value::Str("l*".into())), ("display", Value::Enum(1))], &h);
+    assert_eq!(w.get(2, 5)[3], 1.0);
+    assert_eq!(w.get(12, 5)[3], 0.0);
+    assert!(wild("*ight", "right") && wild("r*t", "right") && !wild("x*", "right"));
+    let hex = format!("<{:08x}>", crypto_hash("left"));
+    assert_eq!(selection_hashes(&hex, None), vec![crypto_hash("left")]);
+}
+
+/// #473: a name with a comma in it (Blender allows `Green, Glossy`) is selected when it is
+/// quoted or its comma escaped, instead of being cut into two names that match nothing.
+#[test]
+fn cryptomatte_selection_keeps_quoted_names_with_commas_whole() {
+    let manifest = vec![("Green, Glossy".to_string(), 7), ("Green".to_string(), 1), ("Glossy".to_string(), 2), ("ring".to_string(), 3)];
+    let m = Some(manifest.as_slice());
+    assert_eq!(selection_hashes(r#""Green, Glossy""#, m), vec![7]);
+    assert_eq!(selection_hashes("'Green, Glossy', ring", m), vec![7, 3]);
+    assert_eq!(selection_hashes(r"Green\, Glossy", m), vec![7]);
+    assert_eq!(selection_hashes(r#"ring , "Green, Glossy""#, m), vec![3, 7]);
+    // Without a manifest the whole name is hashed.
+    assert_eq!(selection_hashes(r#""Green, Glossy""#, None), vec![crypto_hash("Green, Glossy")]);
+    // Plain lists, apostrophes inside names and an unclosed quote still parse.
+    assert_eq!(selection_hashes("Green, Glossy", m), vec![1, 2]);
+    assert_eq!(selection_names("Bob's mat, ring"), vec!["Bob's mat", "ring"]);
+    assert_eq!(selection_names(r#""Green, Glossy"#), vec!["Green, Glossy"]);
+    assert_eq!(selection_names(r#"say \"hi\""#), vec![r#"say "hi""#]);
+}
+
+#[test]
+fn fog_and_depth_of_field_follow_depth() {
+    let h = scene();
+    let f = run("ec.3d.fog3d", &[("fogColor", col(1.0, 0.0, 0.0)), ("fogEndDepth", num(1000.0)), ("scatteringDensity", num(0.0))], &h);
+    // Linear fog: 10 % at depth 100, 50 % at 500, full on the background.
+    assert!((f.get(2, 5)[0] - 0.55).abs() < 1e-4, "{:?}", f.get(2, 5));
+    assert!((f.get(12, 5)[0] - 0.75).abs() < 1e-4);
+    assert!((f.get(17, 1)[0] - 1.0).abs() < 1e-4 && f.get(17, 1)[1] < 1e-4);
+    assert!((dof_radius(100.0, 100.0, 0.0, 10.0, 50.0)).abs() < 1e-6);
+    assert!((dof_radius(200.0, 100.0, 0.0, 10.0, 50.0) - 10.0).abs() < 1e-6);
+    assert_eq!(dof_radius(140.0, 100.0, 100.0, 10.0, 50.0), 0.0);
+    // A sharp edge at the far object blurs when focused near.
+    let mut pic = Image::new(20, 10);
+    for y in 0..10 {
+        for x in 0..20 {
+            let v = if x % 2 == 0 { 1.0 } else { 0.0 };
+            pic.set(x, y, [v, v, v, 1.0]);
+        }
+    }
+    let env = EffectEnv { host: Some(&h), ..Default::default() };
+    let d = run_fx("ec.3d.depthoffield", &[("focalPlane", num(100.0)), ("maximumRadius", num(4.0))], pic.clone(), 0.0, env).img;
+    assert_eq!(d.get(4, 5), pic.get(4, 5));
+    assert!((d.get(12, 5)[0] - 0.5).abs() < 0.3 && d.get(12, 5) != pic.get(12, 5));
+}
+
+#[test]
+fn extractor_maps_named_channels() {
+    let h = scene();
+    let o = run("ec.3d.extractor", &[("red", Value::Str("Z".into())), ("whitePoint", num(1000.0))], &h);
+    assert!((o.get(2, 5)[0] - 0.1).abs() < 1e-6);
+    assert!((o.get(2, 5)[1] - 0.0005).abs() < 1e-6);
+    // Without aux: the layer's own channels can be swapped.
+    let s = run_fx("ec.3d.extractor", &[("red", Value::Str("A".into()))], Image::filled(2, 2, [0.2, 0.3, 0.4, 1.0]), 0.0, EffectEnv::default());
+    assert_eq!(s.img.get(0, 0), [1.0, 0.3, 0.4, 1.0]);
+}
+
+#[test]
+fn channel_extract_antialias_averages_sub_pixels() {
+    // Depth at twice the layer resolution, alternating 0 / 1000 per aux column.
+    let mut a = AuxChannels::new(40, 20, 2.0);
+    a.channels = vec![("Z".into(), (0..800).map(|i| if i % 2 == 0 { 0.0 } else { 1000.0 }).collect())];
+    let host = AuxHost(Arc::new(a));
+    let vals = [("blackPoint", num(0.0)), ("whitePoint", num(1000.0))];
+    let hard = run("ec.3d.channelextract", &vals, &host);
+    let v = hard.get(5, 5)[0];
+    assert!(v == 0.0 || v == 1.0, "{v}");
+    let soft = run("ec.3d.channelextract", &[vals.as_slice(), &[("antialias", Value::Bool(true))]].concat(), &host);
+    assert!((soft.get(5, 5)[0] - 0.5).abs() < 1e-5, "{:?}", soft.get(5, 5));
+}
diff --git a/crates/effects/src/color2.rs b/crates/effects/src/color2.rs
index 71dee87b4..25203cd7a 100644
--- a/crates/effects/src/color2.rs
+++ b/crates/effects/src/color2.rs
@@ -55,6 +55,17 @@ impl Curve {
     /// Parse "x,y x,y …" (separators: whitespace or ';'). Returns None for an identity curve or
     /// fewer than two valid points.
     pub fn parse(s: &str) -> Option<Curve> {
+        Self::parse_with(s, false)
+    }
+
+    /// [`Curve::parse`] interpolated as After Effects' Curves effect does: a natural cubic spline
+    /// through the points, clamped to 0..1 (AE 2026: RGB points (0,0) (125,199) (255,255) and
+    /// Red (0,0) (128,44) (255,255) map every grey step exactly as the natural spline does).
+    pub fn parse_natural(s: &str) -> Option<Curve> {
+        Self::parse_with(s, true)
+    }
+
+    fn parse_with(s: &str, natural: bool) -> Option<Curve> {
         let mut pts: Vec<(f32, f32)> = s
             .split(|c: char| c.is_whitespace() || c == ';')
             .filter(|t| !t.is_empty())
@@ -74,6 +85,12 @@ impl Curve {
         let ys: Vec<f32> = pts.iter().map(|p| p.1).collect();
         let n = xs.len();
         let d: Vec<f32> = (0..n - 1).map(|k| (ys[k + 1] - ys[k]) / (xs[k + 1] - xs[k])).collect();
+        if natural {
+            let ms = natural_slopes(&xs, &d);
+            let mut c = Curve { xs, ys, ms, lut: Vec::new() };
+            c.lut = (0..=LUT_N).map(|i| c.eval_exact(i as f32 / LUT_N as f32).clamp(0.0, 1.0)).collect();
+            return Some(c);
+        }
         let mut ms = vec![0.0f32; n];
         ms[0] = d[0];
         ms[n - 1] = d[n - 2];
@@ -136,6 +153,40 @@ impl Curve {
     }
 }
 
+/// Knot slopes of the natural cubic spline (zero curvature at both ends) through points with
+/// abscissae `xs` and segment slopes `d`; as Hermite tangents they reproduce the spline exactly.
+fn natural_slopes(xs: &[f32], d: &[f32]) -> Vec<f32> {
+    let n = xs.len();
+    if n < 3 {
+        return vec![d.first().copied().unwrap_or(0.0); n];
+    }
+    let h: Vec<f64> = (0..n - 1).map(|k| f64::from(xs[k + 1] - xs[k])).collect();
+    let dd: Vec<f64> = d.iter().map(|&v| f64::from(v)).collect();
+    // Second derivatives M[1..n-1] (M[0] = M[n-1] = 0): tridiagonal system, Thomas algorithm.
+    let m = n - 2;
+    let (mut a, mut b, mut c, mut r) = (vec![0.0; m], vec![0.0; m], vec![0.0; m], vec![0.0; m]);
+    for i in 0..m {
+        let k = i + 1;
+        a[i] = h[k - 1];
+        b[i] = 2.0 * (h[k - 1] + h[k]);
+        c[i] = h[k];
+        r[i] = 6.0 * (dd[k] - dd[k - 1]);
+    }
+    for i in 1..m {
+        let w = a[i] / b[i - 1];
+        b[i] -= w * c[i - 1];
+        r[i] -= w * r[i - 1];
+    }
+    let mut sec = vec![0.0f64; n];
+    for i in (0..m).rev() {
+        let next = if i + 1 < m { sec[i + 2] } else { 0.0 };
+        sec[i + 1] = (r[i] - c[i] * next) / b[i];
+    }
+    let mut ms: Vec<f32> = (0..n - 1).map(|k| (dd[k] - h[k] * (2.0 * sec[k] + sec[k + 1]) / 6.0) as f32).collect();
+    ms.push((dd[n - 2] + h[n - 2] * (sec[n - 2] + 2.0 * sec[n - 1]) / 6.0) as f32);
+    ms
+}
+
 fn ev(c: &Option<Curve>, v: f32) -> f32 {
     c.as_ref().map(|c| c.eval(v)).unwrap_or(v)
 }
@@ -145,7 +196,7 @@ fn ev(c: &Option<Curve>, v: f32) -> f32 {
 /// sorted on load); the default `"0,0 1,1"` is the identity. Colour channels go through the
 /// master RGB curve first, then their own curve.
 fn curves(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let [m, r, g, bl, a] = ["rgb", "red", "green", "blue", "alpha"].map(|id| Curve::parse(ctx.params.s(id)));
+    let [m, r, g, bl, a] = ["rgb", "red", "green", "blue", "alpha"].map(|id| Curve::parse_natural(ctx.params.s(id)));
     if m.is_none() && r.is_none() && g.is_none() && bl.is_none() && a.is_none() {
         return b;
     }
@@ -201,7 +252,7 @@ impl Lv {
         if clip_w {
             t = t.min(1.0);
         }
-        self.ob + (self.ow - self.ob) * t.max(0.0).powf(1.0 / self.g.max(0.01))
+        self.ob + (self.ow - self.ob) * crate::color_fx::levels_gamma(t, self.g.max(0.01))
     }
 }
 
@@ -217,7 +268,10 @@ fn levels_ic(ctx: &EffectCtx, mut b: Buf) -> Buf {
         return b;
     }
     let clip = crate::color_fx::levels_clip(ctx);
-    map_ca(&mut b.img, |c, a| ([0, 1, 2].map(|i| lv[i + 1].apply(lv[0].apply(c[i], clip), clip)), lv[4].apply(a, clip).clamp(0.0, 1.0)));
+    // Each channel's own controls first, then the RGB controls: After Effects 2026 with RGB
+    // (0.1, 0.9, gamma 1.5, 0.05, 0.95) and Green Input White 0.8 maps grey 32/255 to green
+    // 52/255 (RGB first would give 45).
+    map_ca(&mut b.img, |c, a| ([0, 1, 2].map(|i| lv[0].apply(lv[i + 1].apply(c[i], clip), clip)), lv[4].apply(a, clip).clamp(0.0, 1.0)));
     b
 }
 
@@ -1075,267 +1129,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{Params, find};
-
-    fn run(id: &str, img: &Image, over: &[(&str, Value)]) -> Image {
-        let s = find(id).unwrap();
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        for (k, v) in over {
-            params.values.insert(k.to_string(), v.clone());
-        }
-        let ctx =
-            EffectCtx { params: &params, time: 0.0, layer_size: [img.width as f64, img.height as f64], seed: 1, adjustment: false, env: Default::default() };
-        (s.render)(&ctx, Buf { img: img.clone(), offset: [0.0, 0.0], scale: 1.0 }).img
-    }
-
-    fn ramp() -> Image {
-        let mut img = Image::new(16, 8);
-        for y in 0..8 {
-            for x in 0..16 {
-                let v = x as f32 / 15.0;
-                let a = if y == 0 { 0.5 } else { 1.0 };
-                img.set(x, y, [v * a, (1.0 - v) * a, 0.3 * a, a]);
-            }
-        }
-        img
-    }
-
-    fn close(a: &Image, b: &Image, eps: f32) -> bool {
-        a.data.iter().zip(&b.data).all(|(p, q)| (0..4).all(|i| (p[i] - q[i]).abs() <= eps))
-    }
-
-    #[test]
-    fn curve_parsing() {
-        assert!(Curve::parse("0,0 1,1").is_none());
-        assert!(Curve::parse("garbage").is_none());
-        let c = Curve::parse("1,1; 0,0 0.5,0.7").unwrap();
-        assert_eq!(c.xs, vec![0.0, 0.5, 1.0]);
-        assert!((c.eval(0.5) - 0.7).abs() < 1e-3);
-        // Monotone: never decreases.
-        let mut last = -1.0;
-        for i in 0..=100 {
-            let v = c.eval(i as f32 / 100.0);
-            assert!(v >= last - 1e-6);
-            last = v;
-        }
-    }
-
-    #[test]
-    fn curves_identity_is_identity() {
-        let img = ramp();
-        assert_eq!(run("ec.color.curves", &img, &[]), img);
-        let explicit = run("ec.color.curves", &img, &[("rgb", Value::Str("0,0 0.25,0.25 1,1".into()))]);
-        assert!(close(&explicit, &img, 1e-4));
-    }
-
-    #[test]
-    fn curves_midpoint_brightens() {
-        let img = Image::filled(4, 4, [0.5, 0.5, 0.5, 1.0]);
-        let out = run("ec.color.curves", &img, &[("rgb", Value::Str("0,0 0.5,0.75 1,1".into()))]);
-        assert!((out.data[0][0] - 0.75).abs() < 1e-3);
-        let red = run("ec.color.curves", &img, &[("red", Value::Str("0,1 1,1".into()))]);
-        assert!((red.data[0][0] - 1.0).abs() < 1e-4 && (red.data[0][1] - 0.5).abs() < 1e-6);
-    }
-
-    #[test]
-    fn levels_ic_identity_and_red_only() {
-        let img = ramp();
-        assert_eq!(run("ec.color.levelsic", &img, &[]), img);
-        let out = run("ec.color.levelsic", &img, &[("red/redOutWhite", num(0.5))]);
-        let p = out.get(15, 3);
-        assert!((p[0] - 0.5).abs() < 1e-4 && (p[1] - 0.0).abs() < 1e-4);
-    }
-
-    #[test]
-    fn auto_levels_stretches_low_contrast() {
-        let mut img = Image::new(32, 4);
-        for y in 0..4 {
-            for x in 0..32 {
-                let v = 0.4 + 0.2 * x as f32 / 31.0;
-                img.set(x, y, [v, v, v, 1.0]);
-            }
-        }
-        let out = run("ec.color.autolevels", &img, &[("blackClip", num(0.0)), ("whiteClip", num(0.0))]);
-        let lo = out.data.iter().map(|p| p[0]).fold(1.0, f32::min);
-        let hi = out.data.iter().map(|p| p[0]).fold(0.0, f32::max);
-        assert!(lo < 0.02 && hi > 0.98, "{lo} {hi}");
-        let ac = run("ec.color.autocontrast", &img, &[("blackClip", num(0.0)), ("whiteClip", num(0.0))]);
-        assert!(ac.data.iter().map(|p| p[0]).fold(0.0, f32::max) > 0.98);
-    }
-
-    #[test]
-    fn auto_color_neutralises_cast() {
-        let mut img = Image::new(16, 4);
-        for y in 0..4 {
-            for x in 0..16 {
-                let v = x as f32 / 15.0;
-                img.set(x, y, [v * 0.6 + 0.1, v * 0.9, v * 0.5, 1.0]);
-            }
-        }
-        let out = run("ec.color.autocolor", &img, &[]);
-        let p = out.get(8, 1);
-        assert!((p[0] - p[1]).abs() < 0.08 && (p[1] - p[2]).abs() < 0.08, "{p:?}");
-    }
-
-    #[test]
-    fn equalize_flattens_histogram() {
-        let mut img = Image::new(64, 1);
-        for x in 0..64 {
-            let v = if x < 48 { 0.1 + x as f32 * 0.001 } else { 0.9 };
-            img.set(x, 0, [v, v, v, 1.0]);
-        }
-        let out = run("ec.color.equalize", &img, &[]);
-        // The crowded dark values are spread across the range.
-        assert!(out.get(47, 0)[0] > 0.6, "{}", out.get(47, 0)[0]);
-        assert!(out.get(0, 0)[0] < 0.1);
-        assert_eq!(run("ec.color.equalize", &img, &[("amount", num(0.0))]), img);
-    }
-
-    #[test]
-    fn selective_color_zero_is_identity_and_reds_respond() {
-        let img = ramp();
-        assert_eq!(run("ec.color.selectivecolor", &img, &[]), img);
-        let red = Image::filled(2, 2, [1.0, 0.1, 0.1, 1.0]);
-        let out = run("ec.color.selectivecolor", &red, &[("details/reds/redsCyan", num(100.0)), ("method", Value::Enum(1))]);
-        assert!(out.data[0][0] < 0.3, "{:?}", out.data[0]);
-        let blue = Image::filled(2, 2, [0.1, 0.1, 1.0, 1.0]);
-        assert_eq!(run("ec.color.selectivecolor", &blue, &[("details/reds/redsCyan", num(100.0))]), blue);
-    }
-
-    #[test]
-    fn color_offset_full_turn_is_identity() {
-        let img = ramp();
-        let out = run("ec.color.cccoloroffset", &img, &[("redPhase", num(360.0)), ("greenPhase", num(720.0))]);
-        assert_eq!(out, img);
-        let out = run("ec.color.cccoloroffset", &img, &[("redPhase", num(180.0))]);
-        assert!((out.get(0, 3)[0] - 0.5).abs() < 1e-4);
-    }
-
-    #[test]
-    fn broadcast_reduces_unsafe_color() {
-        let img = Image::filled(2, 2, [1.0, 1.0, 0.0, 1.0]);
-        let out = run("ec.color.broadcast", &img, &[]);
-        assert!(out.data[0][0] < 1.0);
-        let key = run("ec.color.broadcast", &img, &[("howToMakeSafe", Value::Enum(2))]);
-        assert_eq!(key.data[0][3], 0.0);
-        let gray = Image::filled(2, 2, [0.5, 0.5, 0.5, 1.0]);
-        assert_eq!(run("ec.color.broadcast", &gray, &[]), gray);
-    }
-
-    #[test]
-    fn color_balance_hls_zero_identity_and_hue_shift() {
-        let img = ramp();
-        assert_eq!(run("ec.color.colorbalancehls", &img, &[]), img);
-        let red = Image::filled(1, 1, [1.0, 0.0, 0.0, 1.0]);
-        let out = run("ec.color.colorbalancehls", &red, &[("hue", num(120.0))]);
-        assert!(out.data[0][1] > 0.99 && out.data[0][0] < 0.01);
-    }
-
-    #[test]
-    fn color_link_fills_with_average_keeping_alpha() {
-        let mut img = Image::new(2, 1);
-        img.set(0, 0, [1.0, 0.0, 0.0, 1.0]);
-        img.set(1, 0, [0.0, 0.0, 0.5, 0.5]);
-        let out = run("ec.color.colorlink", &img, &[]);
-        assert!((out.data[1][3] - 0.5).abs() < 1e-5);
-        let (c, _) = unpremul(out.data[0]);
-        assert!((c[0] - 2.0 / 3.0).abs() < 1e-3 && (c[2] - 1.0 / 3.0).abs() < 1e-3, "{c:?}");
-    }
-
-    #[test]
-    fn cc_kernel_identity_and_toner_duotone() {
-        let img = ramp();
-        assert_eq!(run("ec.color.cckernel", &img, &[]), img);
-        let g = Image::filled(1, 1, [0.5, 0.5, 0.5, 1.0]);
-        let t = run("ec.color.cctoner", &g, &[("tones", Value::Enum(0)), ("highlights", col(1.0, 0.0, 0.0))]);
-        assert!((t.data[0][0] - 0.5).abs() < 1e-3 && t.data[0][1] < 1e-3);
-    }
-
-    #[test]
-    fn shadow_highlight_lifts_shadows() {
-        let img = Image::filled(8, 8, [0.1, 0.1, 0.1, 1.0]);
-        let out = run("ec.color.shadowhighlight", &img, &[("autoAmounts", Value::Bool(false))]);
-        assert!(out.data[0][0] > 0.15);
-    }
-
-    #[test]
-    fn levels_ic_clip_popups() {
-        let img = Image::filled(2, 2, [0.9, 0.9, 0.9, 1.0]);
-        let lv = [("rgb/rgbInWhite", num(0.5))];
-        assert!((run("ec.color.levelsic", &img, &lv).data[0][0] - 1.0).abs() < 1e-6);
-        let off = [("rgb/rgbInWhite", num(0.5)), ("clipToOutputWhite", Value::Enum(0))];
-        assert!(run("ec.color.levelsic", &img, &off).data[0][0] > 1.5);
-    }
-
-    /// A host whose other layers and other frames are a fixed image.
-    struct ImgHost(Image);
-    impl crate::EffectHost for ImgHost {
-        fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
-            Some(crate::LayerPixels { buf: Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 }, size: [2.0, 2.0] })
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-        fn self_at(&self, _: f64, _: usize) -> Option<Buf> {
-            Some(Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 })
-        }
-    }
-
-    fn run_host(id: &str, img: &Image, over: &[(&str, Value)], host: &ImgHost) -> Image {
-        let env = crate::EffectEnv { host: Some(host), frame_rate: 10.0, ..Default::default() };
-        crate::run_fx(id, over, img.clone(), 1.0, env).img
-    }
-
-    #[test]
-    fn color_link_samples_clip_and_source_layer() {
-        let mut img = Image::new(5, 1);
-        for (x, v) in [0.0f32, 0.1, 0.2, 0.3, 1.0].iter().enumerate() {
-            img.set(x as u32, 0, [*v, *v, *v, 1.0]);
-        }
-        // Median ignores the outlier the average follows.
-        let med = run("ec.color.colorlink", &img, &[("sampleSource", Value::Enum(1))]);
-        assert!((med.data[0][0] - 0.2).abs() < 1e-5);
-        // Brightest with 20 % clip skips the brightest pixel.
-        let br = run("ec.color.colorlink", &img, &[("sampleSource", Value::Enum(2)), ("clip", num(20.0))]);
-        assert!((br.data[0][0] - 0.3).abs() < 1e-5);
-        // Min Alpha of a half-transparent source layer sets the alpha.
-        let host = ImgHost(Image::filled(2, 2, [0.25, 0.25, 0.25, 0.5]));
-        let out = run_host("ec.color.colorlink", &img, &[("sourceLayer", Value::Layer(Some(9))), ("sampleSource", Value::Enum(9))], &host);
-        assert!((out.data[4][3] - 0.5).abs() < 1e-5);
-        // Average of the source layer (not the effect's own pixels).
-        let out = run_host("ec.color.colorlink", &img, &[("sourceLayer", Value::Layer(Some(9)))], &host);
-        assert!((out.data[4][0] - 0.5).abs() < 1e-5);
-    }
-
-    #[test]
-    fn auto_levels_temporal_smoothing_reads_neighbour_frames() {
-        let mut img = Image::new(4, 1);
-        for x in 0..4 {
-            let v = 0.3 + 0.1 * x as f32;
-            img.set(x, 0, [v, v, v, 1.0]);
-        }
-        let wide = ImgHost(ramp());
-        let p0 = [("blackClip", num(0.0)), ("whiteClip", num(0.0))];
-        let alone = run_host("ec.color.autolevels", &img, &p0, &wide);
-        let smooth = run_host("ec.color.autolevels", &img, &[p0[0].clone(), p0[1].clone(), ("temporalSmoothing", num(0.2))], &wide);
-        // Alone the frame is stretched to full range; with full-range neighbours much less.
-        assert!(alone.data[0][0] < 0.01);
-        assert!(smooth.data[0][0] > 0.1, "{:?}", smooth.data[0]);
-    }
-
-    #[test]
-    fn shadow_highlight_clip_keeps_the_tonal_range() {
-        let img = ramp();
-        let lift = [("autoAmounts", Value::Bool(false)), ("shadowAmount", num(80.0))];
-        let unclipped = run(
-            "ec.color.shadowhighlight",
-            &img,
-            &[lift[0].clone(), lift[1].clone(), ("moreOptions/blackClip", num(0.0)), ("moreOptions/whiteClip", num(0.0))],
-        );
-        let clipped = run("ec.color.shadowhighlight", &img, &[lift[0].clone(), lift[1].clone(), ("moreOptions/blackClip", num(1.0))]);
-        let min = |im: &Image| im.data.iter().filter(|p| p[3] > 0.99).map(|p| luminance(p[0], p[1], p[2])).fold(f32::MAX, f32::min);
-        assert!(min(&clipped) < min(&unclipped));
-    }
-}
+mod tests;
diff --git a/crates/effects/src/color2/tests.rs b/crates/effects/src/color2/tests.rs
new file mode 100644
index 000000000..5f57692a0
--- /dev/null
+++ b/crates/effects/src/color2/tests.rs
@@ -0,0 +1,338 @@
+use super::*;
+use crate::{Params, find};
+
+fn run(id: &str, img: &Image, over: &[(&str, Value)]) -> Image {
+    let s = find(id).unwrap();
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    for (k, v) in over {
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [img.width as f64, img.height as f64], seed: 1, adjustment: false, env: Default::default() };
+    (s.render)(&ctx, Buf { img: img.clone(), offset: [0.0, 0.0], scale: 1.0 }).img
+}
+
+fn ramp() -> Image {
+    let mut img = Image::new(16, 8);
+    for y in 0..8 {
+        for x in 0..16 {
+            let v = x as f32 / 15.0;
+            let a = if y == 0 { 0.5 } else { 1.0 };
+            img.set(x, y, [v * a, (1.0 - v) * a, 0.3 * a, a]);
+        }
+    }
+    img
+}
+
+fn close(a: &Image, b: &Image, eps: f32) -> bool {
+    a.data.iter().zip(&b.data).all(|(p, q)| (0..4).all(|i| (p[i] - q[i]).abs() <= eps))
+}
+
+#[test]
+fn curve_parsing() {
+    assert!(Curve::parse("0,0 1,1").is_none());
+    assert!(Curve::parse("garbage").is_none());
+    let c = Curve::parse("1,1; 0,0 0.5,0.7").unwrap();
+    assert_eq!(c.xs, vec![0.0, 0.5, 1.0]);
+    assert!((c.eval(0.5) - 0.7).abs() < 1e-3);
+    // Monotone: never decreases.
+    let mut last = -1.0;
+    for i in 0..=100 {
+        let v = c.eval(i as f32 / 100.0);
+        assert!(v >= last - 1e-6);
+        last = v;
+    }
+}
+
+#[test]
+fn curves_identity_is_identity() {
+    let img = ramp();
+    assert_eq!(run("ec.color.curves", &img, &[]), img);
+    let explicit = run("ec.color.curves", &img, &[("rgb", Value::Str("0,0 0.25,0.25 1,1".into()))]);
+    assert!(close(&explicit, &img, 1e-4));
+}
+
+#[test]
+fn curves_midpoint_brightens() {
+    let img = Image::filled(4, 4, [0.5, 0.5, 0.5, 1.0]);
+    let out = run("ec.color.curves", &img, &[("rgb", Value::Str("0,0 0.5,0.75 1,1".into()))]);
+    assert!((out.data[0][0] - 0.75).abs() < 1e-3);
+    let red = run("ec.color.curves", &img, &[("red", Value::Str("0,1 1,1".into()))]);
+    assert!((red.data[0][0] - 1.0).abs() < 1e-4 && (red.data[0][1] - 0.5).abs() < 1e-6);
+}
+
+/// After Effects 2026, 32 bpc project, Levels (Individual Controls) with RGB Input Black 0.1,
+/// Input White 0.9, Gamma 1.5, Output Black 0.05, Output White 0.95, Red Gamma 0.8, Green
+/// Input White 0.8, Blue Output Black 0.2, both clips "Off for 32 bpc Color", on grey steps:
+/// the channel controls run first, nothing clips (8-bit captures clamp the results).
+#[test]
+fn levels_ic_matches_after_effects_in_32_bpc() {
+    let steps = [0, 16, 32, 64, 96, 128, 160, 192, 224, 255];
+    let ae = [
+        [0, 0, 70],
+        [0, 0, 88],
+        [0, 52, 104],
+        [61, 108, 132],
+        [102, 150, 158],
+        [138, 187, 181],
+        [171, 220, 203],
+        [203, 250, 223],
+        [233, 255, 243],
+        [255, 255, 255],
+    ];
+    let mut img = Image::new(10, 1);
+    for (x, v) in steps.iter().enumerate() {
+        let v = *v as f32 / 255.0;
+        img.set(x as u32, 0, [v, v, v, 1.0]);
+    }
+    let vals = [
+        ("rgb/rgbInBlack", Value::Scalar(0.1)),
+        ("rgb/rgbInWhite", Value::Scalar(0.9)),
+        ("rgb/rgbGamma", Value::Scalar(1.5)),
+        ("rgb/rgbOutBlack", Value::Scalar(0.05)),
+        ("rgb/rgbOutWhite", Value::Scalar(0.95)),
+        ("red/redGamma", Value::Scalar(0.8)),
+        ("green/greenInWhite", Value::Scalar(0.8)),
+        ("blue/blueOutBlack", Value::Scalar(0.2)),
+    ];
+    let s = find("ec.color.levelsic").unwrap();
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    for (k, v) in &vals {
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let render = |float_depth: bool| {
+        let env = crate::EffectEnv { float_depth, ..Default::default() };
+        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [10.0, 1.0], seed: 1, adjustment: false, env };
+        (s.render)(&ctx, Buf { img: img.clone(), offset: [0.0, 0.0], scale: 1.0 }).img
+    };
+    let out = render(true);
+    for (x, want) in ae.iter().enumerate() {
+        let p = out.get(x as i64, 0);
+        for c in 0..3 {
+            let got = p[c].clamp(0.0, 1.0) * 255.0;
+            assert!((got - want[c] as f32).abs() <= 2.0, "step {} channel {c}: {got} vs AE {}", steps[x], want[c]);
+        }
+    }
+    // In 8 / 16 bpc "Off for 32 bpc Color" clips: black stops at Output Black.
+    let clipped = render(false);
+    assert!((clipped.get(0, 0)[0] - 0.05).abs() < 1e-5, "{:?}", clipped.get(0, 0));
+}
+
+/// After Effects 2026 (cases 962 / 963): Curves through RGB (0,0) (125,199)
+/// (255,255) and Red (0,0) (128,44) (255,255) on grey steps 0..255, 8-bit results.
+#[test]
+fn curves_follow_a_natural_spline_as_in_after_effects() {
+    let steps = [0u8, 16, 32, 64, 96, 128, 160, 192, 224, 255];
+    let mut img = Image::new(10, 1);
+    for (x, v) in steps.iter().enumerate() {
+        let v = *v as f32 / 255.0;
+        img.set(x as u32, 0, [v, v, v, 1.0]);
+    }
+    let p = |pts: &[(f32, f32)]| Value::Str(pts.iter().map(|(x, y)| format!("{},{}", x / 255.0, y / 255.0)).collect::<Vec<_>>().join(" "));
+    let rgb = run("ec.color.curves", &img, &[("rgb", p(&[(0.0, 0.0), (125.0, 199.0), (255.0, 255.0)]))]);
+    let red = run("ec.color.curves", &img, &[("red", p(&[(0.0, 0.0), (128.0, 44.0), (255.0, 255.0)]))]);
+    let ae_rgb = [0, 30, 59, 115, 164, 202, 227, 242, 250, 255];
+    let ae_red = [0, 0, 1, 6, 19, 44, 83, 135, 194, 255];
+    for x in 0..10 {
+        let g = (rgb.get(x as i64, 0)[1] * 255.0).round() as i32;
+        let r = (red.get(x as i64, 0)[0] * 255.0).round() as i32;
+        assert!((g - ae_rgb[x]).abs() <= 1, "RGB step {}: {g} vs AE {}", steps[x], ae_rgb[x]);
+        assert!((r - ae_red[x]).abs() <= 1, "Red step {}: {r} vs AE {}", steps[x], ae_red[x]);
+    }
+}
+
+#[test]
+fn levels_ic_identity_and_red_only() {
+    let img = ramp();
+    assert_eq!(run("ec.color.levelsic", &img, &[]), img);
+    let out = run("ec.color.levelsic", &img, &[("red/redOutWhite", num(0.5))]);
+    let p = out.get(15, 3);
+    assert!((p[0] - 0.5).abs() < 1e-4 && (p[1] - 0.0).abs() < 1e-4);
+}
+
+#[test]
+fn auto_levels_stretches_low_contrast() {
+    let mut img = Image::new(32, 4);
+    for y in 0..4 {
+        for x in 0..32 {
+            let v = 0.4 + 0.2 * x as f32 / 31.0;
+            img.set(x, y, [v, v, v, 1.0]);
+        }
+    }
+    let out = run("ec.color.autolevels", &img, &[("blackClip", num(0.0)), ("whiteClip", num(0.0))]);
+    let lo = out.data.iter().map(|p| p[0]).fold(1.0, f32::min);
+    let hi = out.data.iter().map(|p| p[0]).fold(0.0, f32::max);
+    assert!(lo < 0.02 && hi > 0.98, "{lo} {hi}");
+    let ac = run("ec.color.autocontrast", &img, &[("blackClip", num(0.0)), ("whiteClip", num(0.0))]);
+    assert!(ac.data.iter().map(|p| p[0]).fold(0.0, f32::max) > 0.98);
+}
+
+#[test]
+fn auto_color_neutralises_cast() {
+    let mut img = Image::new(16, 4);
+    for y in 0..4 {
+        for x in 0..16 {
+            let v = x as f32 / 15.0;
+            img.set(x, y, [v * 0.6 + 0.1, v * 0.9, v * 0.5, 1.0]);
+        }
+    }
+    let out = run("ec.color.autocolor", &img, &[]);
+    let p = out.get(8, 1);
+    assert!((p[0] - p[1]).abs() < 0.08 && (p[1] - p[2]).abs() < 0.08, "{p:?}");
+}
+
+#[test]
+fn equalize_flattens_histogram() {
+    let mut img = Image::new(64, 1);
+    for x in 0..64 {
+        let v = if x < 48 { 0.1 + x as f32 * 0.001 } else { 0.9 };
+        img.set(x, 0, [v, v, v, 1.0]);
+    }
+    let out = run("ec.color.equalize", &img, &[]);
+    // The crowded dark values are spread across the range.
+    assert!(out.get(47, 0)[0] > 0.6, "{}", out.get(47, 0)[0]);
+    assert!(out.get(0, 0)[0] < 0.1);
+    assert_eq!(run("ec.color.equalize", &img, &[("amount", num(0.0))]), img);
+}
+
+#[test]
+fn selective_color_zero_is_identity_and_reds_respond() {
+    let img = ramp();
+    assert_eq!(run("ec.color.selectivecolor", &img, &[]), img);
+    let red = Image::filled(2, 2, [1.0, 0.1, 0.1, 1.0]);
+    let out = run("ec.color.selectivecolor", &red, &[("details/reds/redsCyan", num(100.0)), ("method", Value::Enum(1))]);
+    assert!(out.data[0][0] < 0.3, "{:?}", out.data[0]);
+    let blue = Image::filled(2, 2, [0.1, 0.1, 1.0, 1.0]);
+    assert_eq!(run("ec.color.selectivecolor", &blue, &[("details/reds/redsCyan", num(100.0))]), blue);
+}
+
+#[test]
+fn color_offset_full_turn_is_identity() {
+    let img = ramp();
+    let out = run("ec.color.cccoloroffset", &img, &[("redPhase", num(360.0)), ("greenPhase", num(720.0))]);
+    assert_eq!(out, img);
+    let out = run("ec.color.cccoloroffset", &img, &[("redPhase", num(180.0))]);
+    assert!((out.get(0, 3)[0] - 0.5).abs() < 1e-4);
+}
+
+#[test]
+fn broadcast_reduces_unsafe_color() {
+    let img = Image::filled(2, 2, [1.0, 1.0, 0.0, 1.0]);
+    let out = run("ec.color.broadcast", &img, &[]);
+    assert!(out.data[0][0] < 1.0);
+    let key = run("ec.color.broadcast", &img, &[("howToMakeSafe", Value::Enum(2))]);
+    assert_eq!(key.data[0][3], 0.0);
+    let gray = Image::filled(2, 2, [0.5, 0.5, 0.5, 1.0]);
+    assert_eq!(run("ec.color.broadcast", &gray, &[]), gray);
+}
+
+#[test]
+fn color_balance_hls_zero_identity_and_hue_shift() {
+    let img = ramp();
+    assert_eq!(run("ec.color.colorbalancehls", &img, &[]), img);
+    let red = Image::filled(1, 1, [1.0, 0.0, 0.0, 1.0]);
+    let out = run("ec.color.colorbalancehls", &red, &[("hue", num(120.0))]);
+    assert!(out.data[0][1] > 0.99 && out.data[0][0] < 0.01);
+}
+
+#[test]
+fn color_link_fills_with_average_keeping_alpha() {
+    let mut img = Image::new(2, 1);
+    img.set(0, 0, [1.0, 0.0, 0.0, 1.0]);
+    img.set(1, 0, [0.0, 0.0, 0.5, 0.5]);
+    let out = run("ec.color.colorlink", &img, &[]);
+    assert!((out.data[1][3] - 0.5).abs() < 1e-5);
+    let (c, _) = unpremul(out.data[0]);
+    assert!((c[0] - 2.0 / 3.0).abs() < 1e-3 && (c[2] - 1.0 / 3.0).abs() < 1e-3, "{c:?}");
+}
+
+#[test]
+fn cc_kernel_identity_and_toner_duotone() {
+    let img = ramp();
+    assert_eq!(run("ec.color.cckernel", &img, &[]), img);
+    let g = Image::filled(1, 1, [0.5, 0.5, 0.5, 1.0]);
+    let t = run("ec.color.cctoner", &g, &[("tones", Value::Enum(0)), ("highlights", col(1.0, 0.0, 0.0))]);
+    assert!((t.data[0][0] - 0.5).abs() < 1e-3 && t.data[0][1] < 1e-3);
+}
+
+#[test]
+fn shadow_highlight_lifts_shadows() {
+    let img = Image::filled(8, 8, [0.1, 0.1, 0.1, 1.0]);
+    let out = run("ec.color.shadowhighlight", &img, &[("autoAmounts", Value::Bool(false))]);
+    assert!(out.data[0][0] > 0.15);
+}
+
+#[test]
+fn levels_ic_clip_popups() {
+    let img = Image::filled(2, 2, [0.9, 0.9, 0.9, 1.0]);
+    let lv = [("rgb/rgbInWhite", num(0.5))];
+    assert!((run("ec.color.levelsic", &img, &lv).data[0][0] - 1.0).abs() < 1e-6);
+    let off = [("rgb/rgbInWhite", num(0.5)), ("clipToOutputWhite", Value::Enum(0))];
+    assert!(run("ec.color.levelsic", &img, &off).data[0][0] > 1.5);
+}
+
+/// A host whose other layers and other frames are a fixed image.
+struct ImgHost(Image);
+impl crate::EffectHost for ImgHost {
+    fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
+        Some(crate::LayerPixels { buf: Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 }, size: [2.0, 2.0] })
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+    fn self_at(&self, _: f64, _: usize) -> Option<Buf> {
+        Some(Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 })
+    }
+}
+
+fn run_host(id: &str, img: &Image, over: &[(&str, Value)], host: &ImgHost) -> Image {
+    let env = crate::EffectEnv { host: Some(host), frame_rate: 10.0, ..Default::default() };
+    crate::run_fx(id, over, img.clone(), 1.0, env).img
+}
+
+#[test]
+fn color_link_samples_clip_and_source_layer() {
+    let mut img = Image::new(5, 1);
+    for (x, v) in [0.0f32, 0.1, 0.2, 0.3, 1.0].iter().enumerate() {
+        img.set(x as u32, 0, [*v, *v, *v, 1.0]);
+    }
+    // Median ignores the outlier the average follows.
+    let med = run("ec.color.colorlink", &img, &[("sampleSource", Value::Enum(1))]);
+    assert!((med.data[0][0] - 0.2).abs() < 1e-5);
+    // Brightest with 20 % clip skips the brightest pixel.
+    let br = run("ec.color.colorlink", &img, &[("sampleSource", Value::Enum(2)), ("clip", num(20.0))]);
+    assert!((br.data[0][0] - 0.3).abs() < 1e-5);
+    // Min Alpha of a half-transparent source layer sets the alpha.
+    let host = ImgHost(Image::filled(2, 2, [0.25, 0.25, 0.25, 0.5]));
+    let out = run_host("ec.color.colorlink", &img, &[("sourceLayer", Value::Layer(Some(9))), ("sampleSource", Value::Enum(9))], &host);
+    assert!((out.data[4][3] - 0.5).abs() < 1e-5);
+    // Average of the source layer (not the effect's own pixels).
+    let out = run_host("ec.color.colorlink", &img, &[("sourceLayer", Value::Layer(Some(9)))], &host);
+    assert!((out.data[4][0] - 0.5).abs() < 1e-5);
+}
+
+#[test]
+fn auto_levels_temporal_smoothing_reads_neighbour_frames() {
+    let mut img = Image::new(4, 1);
+    for x in 0..4 {
+        let v = 0.3 + 0.1 * x as f32;
+        img.set(x, 0, [v, v, v, 1.0]);
+    }
+    let wide = ImgHost(ramp());
+    let p0 = [("blackClip", num(0.0)), ("whiteClip", num(0.0))];
+    let alone = run_host("ec.color.autolevels", &img, &p0, &wide);
+    let smooth = run_host("ec.color.autolevels", &img, &[p0[0].clone(), p0[1].clone(), ("temporalSmoothing", num(0.2))], &wide);
+    // Alone the frame is stretched to full range; with full-range neighbours much less.
+    assert!(alone.data[0][0] < 0.01);
+    assert!(smooth.data[0][0] > 0.1, "{:?}", smooth.data[0]);
+}
+
+#[test]
+fn shadow_highlight_clip_keeps_the_tonal_range() {
+    let img = ramp();
+    let lift = [("autoAmounts", Value::Bool(false)), ("shadowAmount", num(80.0))];
+    let unclipped =
+        run("ec.color.shadowhighlight", &img, &[lift[0].clone(), lift[1].clone(), ("moreOptions/blackClip", num(0.0)), ("moreOptions/whiteClip", num(0.0))]);
+    let clipped = run("ec.color.shadowhighlight", &img, &[lift[0].clone(), lift[1].clone(), ("moreOptions/blackClip", num(1.0))]);
+    let min = |im: &Image| im.data.iter().filter(|p| p[3] > 0.99).map(|p| luminance(p[0], p[1], p[2])).fold(f32::MAX, f32::min);
+    assert!(min(&clipped) < min(&unclipped));
+}
diff --git a/crates/effects/src/color3.rs b/crates/effects/src/color3.rs
index c85ab8d09..4850710ab 100644
--- a/crates/effects/src/color3.rs
+++ b/crates/effects/src/color3.rs
@@ -301,7 +301,8 @@ impl OffsetCurve {
         }
         let n = ext.len();
         // Tangents: the mean of the neighbouring slopes, flat at local extrema and next to flat
-        // segments so the curve never overshoots its points.
+        // segments, and at most three times either slope (Fritsch-Carlson) so the curve never
+        // overshoots its points, even beside a short steep segment.
         let slope = |k: usize| (ext[k + 1].1 - ext[k].1) / (ext[k + 1].0 - ext[k].0).max(1e-6);
         let m: Vec<f32> = (0..n)
             .map(|k| {
@@ -309,7 +310,12 @@ impl OffsetCurve {
                     return 0.0;
                 }
                 let (a, b) = (slope(k - 1), slope(k));
-                if a * b <= 0.0 { 0.0 } else { (a + b) * 0.5 }
+                if a * b <= 0.0 {
+                    0.0
+                } else {
+                    let lim = 3.0 * a.abs().min(b.abs());
+                    ((a + b) * 0.5).clamp(-lim, lim)
+                }
             })
             .collect();
         let eval = |x: f32| -> f32 {
@@ -989,6 +995,28 @@ mod tests {
         }
     }
 
+    #[test]
+    fn hue_saturation_curve_stays_between_its_points() {
+        // #1656: a point dragged to the bottom right next to another one. The steep short
+        // segment used to pull the long one beside it far outside the box (|offset| > 0.5).
+        // The third pair sits across the hue wrap (0.98 and 0.005 are neighbours).
+        let cases = [("0.3,0.4 0.31,0 0.7,0.6", true), ("0.1,0.3 0.3,0.5 0.31,1 0.7,0.5", false), ("0.5,0.6 0.98,0.4 0.005,0", true)];
+        for (pts, periodic) in cases {
+            let c = OffsetCurve::parse(pts, periodic).unwrap();
+            for i in 0..=1000 {
+                let x = i as f32 / 1000.0;
+                let v = c.at(x);
+                assert!((-0.5..=0.5).contains(&v), "{pts} at {x}: {v}");
+            }
+            for p in parse_points(pts) {
+                assert!((c.at(p.0) - (p.1 - 0.5)).abs() < 0.02, "{pts}: passes through {p:?}");
+            }
+            if periodic {
+                assert!((c.at(0.0) - c.at(1.0)).abs() < 1e-4, "{pts}: no seam at the wrap");
+            }
+        }
+    }
+
     fn close_px(a: [f32; 4], b: [f32; 4], eps: f32) -> bool {
         a.iter().zip(b).all(|(x, y)| (x - y).abs() <= eps)
     }
diff --git a/crates/effects/src/color_fx.rs b/crates/effects/src/color_fx.rs
index cf6698fee..3a52e7a54 100644
--- a/crates/effects/src/color_fx.rs
+++ b/crates/effects/src/color_fx.rs
@@ -14,12 +14,27 @@ fn mix(a: [f32; 3], b: [f32; 3], t: f32) -> [f32; 3] {
     [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t, a[2] + (b[2] - a[2]) * t]
 }
 
+/// Rec. 601 luminance on the working-space values (sRGB working space, not linearised: red
+/// 76/255, green 150/255, blue 29/255), as After Effects 2026 renders Tint, Tritone, Luma Key and
+/// Extract. Tritone, case 718: a red solid with Blend With Original 25 gives (132, 23, 46), from
+/// luminance 0.299; Rec. 709's 0.213 gave (113, 16, 49); on a grey ramp both weightings agree
+/// (case 815). Luma Key and Extract: Key Out Darker / Extract Black Point at 65, 166 and 24 on
+/// pure red, green and blue keep red (601: 76, 709: 54) and blue (29 / 18) and key out green
+/// (150 / 182). The GPU kernels (`pointwise` op 1, `fx_color` op 4, `fxk_key_luma`) mirror it.
+pub(crate) fn luma_601(c: [f32; 3]) -> f32 {
+    LUMA_601[0] * c[0] + LUMA_601[1] * c[1] + LUMA_601[2] * c[2]
+}
+
+/// The Rec. 601 luma weights of `luma_601`. The WGSL kernels repeat them as literals; the GPU
+/// test `shader_constants_match_the_cpu` checks that they are these.
+pub const LUMA_601: [f32; 3] = [0.299, 0.587, 0.114];
+
 fn tint(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let black = ctx.params.color("black");
     let white = ctx.params.color("white");
     let amt = ctx.params.f("amount") as f32 / 100.0;
     b.img.map_straight(|c| {
-        let l = luminance(c[0], c[1], c[2]).clamp(0.0, 1.0);
+        let l = luma_601(c).clamp(0.0, 1.0);
         let t = [black[0] + (white[0] - black[0]) * l, black[1] + (white[1] - black[1]) * l, black[2] + (white[2] - black[2]) * l];
         mix(c, t, amt)
     });
@@ -32,7 +47,7 @@ fn tritone(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let sh = ctx.params.color("shadows");
     let blend = 1.0 - ctx.params.f("blend") as f32 / 100.0;
     b.img.map_straight(|c| {
-        let l = luminance(c[0], c[1], c[2]).clamp(0.0, 1.0);
+        let l = luma_601(c).clamp(0.0, 1.0);
         let t = if l < 0.5 {
             mix([sh[0], sh[1], sh[2]], [mid[0], mid[1], mid[2]], l * 2.0)
         } else {
@@ -49,18 +64,22 @@ fn tritone(ctx: &EffectCtx, mut b: Buf) -> Buf {
 /// power toward white (`1-(1-v)^e`) or black (`v^e`); contrast uses `g = 1 + 0.53 c` instead of
 /// the old `2^(2c)` (that crushed 0.25 to ~8/255 at Contrast 100; AE is ~40/255). Values above 1
 /// pass through. The GPU kernel mirrors it.
+///
+/// Negative Brightness and Contrast are the inverse curves of the positive ones (After Effects
+/// 2026 ramps: Brightness −40 is Brightness +40 inverted within 2.6/255, Contrast −50 likewise),
+/// so they use the reciprocal exponents: Brightness −40 was 20/255 off AE, now 6.2.
 pub fn bc_modern(v: f32, b: f32, c: f32) -> f32 {
     if v >= 1.0 {
         return v;
     }
     let mut v = v.max(0.0);
-    if b > 0.0 {
-        v = 1.0 - (1.0 - v).powf(2f32.powf(1.24 * b));
-    } else if b < 0.0 {
-        v = v.powf(2f32.powf(-1.32 * b));
+    if b != 0.0 {
+        let e = 2f32.powf(1.24 * b.abs());
+        v = 1.0 - (1.0 - v).powf(if b > 0.0 { e } else { 1.0 / e });
     }
     if c != 0.0 {
-        let g = (1.0 + 0.53 * c).max(0.05);
+        let g = (1.0 + 0.53 * c.abs()).max(0.05);
+        let g = if c > 0.0 { g } else { 1.0 / g };
         v = if v < 0.5 { 0.5 * (2.0 * v).powf(g) } else { 1.0 - 0.5 * (2.0 - 2.0 * v).max(0.0).powf(g) };
     }
     v
@@ -197,16 +216,32 @@ fn hue_saturation(ctx: &EffectCtx, mut b: Buf) -> Buf {
 pub const LEVELS_CLIP: [&str; 3] = ["Off", "On", "Off for 32 bpc Color"];
 
 /// Whether Levels clips below Input Black / above Input White. "Off for 32 bpc Color" clips
-/// (effects can't see the project's bit depth; 8/16 bpc behaviour). The hidden `noClip` switch
-/// of projects saved before the two popups existed turns both off.
+/// in 8 and 16 bpc projects and not in 32 bpc ones (After Effects 2026, Levels (Individual
+/// Controls) in a 32 bpc project: values below Input Black end below Output Black). The hidden
+/// `noClip` switch of projects saved before the two popups existed turns both off.
 pub fn levels_clip(ctx: &EffectCtx) -> (bool, bool) {
     if ctx.params.b("noClip") {
         return (false, false);
     }
-    let on = |id: &str| ctx.params.get(id).is_none_or(|v| v.as_enum() != 0);
+    let on = |id: &str| levels_clip_on(ctx, id);
     (on("clipToOutputBlack"), on("clipToOutputWhite"))
 }
 
+/// One Clip To Output popup: 0 Off, 1 On, 2 Off for 32 bpc Color (missing: clip).
+pub fn levels_clip_on(ctx: &EffectCtx, id: &str) -> bool {
+    match ctx.params.get(id).map(|v| v.as_enum()) {
+        Some(0) => false,
+        Some(2) => !ctx.env.float_depth,
+        _ => true,
+    }
+}
+
+/// Levels' gamma on the normalised input `t`: unclipped values below Input Black extrapolate
+/// (the curve mirrored through 0) instead of stopping at Output Black.
+pub fn levels_gamma(t: f32, g: f32) -> f32 {
+    if t >= 0.0 { t.powf(1.0 / g) } else { -(-t).powf(1.0 / g) }
+}
+
 /// Levels' Channel popup.
 pub const LEVELS_CHANNELS: [&str; 5] = ["RGB", "Red", "Green", "Blue", "Alpha"];
 
@@ -232,8 +267,7 @@ fn level(v: f32, [ib, iw, g, ob, ow]: [f32; 5], (clip_b, clip_w): (bool, bool))
     if clip_w {
         t = t.min(1.0);
     }
-    let t = t.max(0.0).powf(1.0 / g);
-    ob + (ow - ob) * t
+    ob + (ow - ob) * levels_gamma(t, g)
 }
 
 const LEVELS_IDENTITY: [f32; 5] = [0.0, 1.0, 1.0, 0.0, 1.0];
@@ -276,7 +310,7 @@ pub fn levels_channel_settings(ctx: &EffectCtx) -> [([f32; 5], (bool, bool)); 4]
         let ids = levels_channel_ids(i + 1);
         let v: [f32; 5] = std::array::from_fn(|k| ctx.params.get(&ids[k]).map(|v| v.as_f64() as f32).unwrap_or(LEVELS_IDENTITY[k]));
         let pre = LEVELS_CHANNEL_PREFIX[i];
-        let on = |id: String| ctx.params.get(&id).is_none_or(|v| v.as_enum() != 0);
+        let on = |id: String| levels_clip_on(ctx, &id);
         let clip = if ctx.params.b("noClip") { (false, false) } else { (on(format!("{pre}ClipToOutputBlack")), on(format!("{pre}ClipToOutputWhite"))) };
         ([v[0], v[1], v[2].max(0.01), v[3], v[4]], clip)
     })
@@ -304,6 +338,18 @@ pub fn exposure_settings(ctx: &EffectCtx) -> [(f32, f32, f32); 3] {
     }
 }
 
+/// The power curve Exposure's own linear-light conversion uses (Bypass Linear Light Conversion
+/// off). After Effects decodes with a pure 2.2 power, not the piecewise sRGB curve: Offset 0.0005
+/// on black measures 8/255 there, which 2.2 predicts (8.06) and sRGB does not (1.65).
+/// `kernels.wgsl` repeats it as a literal; the GPU test `shader_constants_match_the_cpu` checks it.
+pub const EXPOSURE_LINEAR_GAMMA: f32 = 2.2;
+
+/// Exposure: per channel, `(value · 2^exposure + offset)^(1 / gamma)`, in linear light unless
+/// Bypass Linear Light Conversion is on. The conversion is the effect's own pure 2.2 power curve
+/// (see [`EXPOSURE_LINEAR_GAMMA`]), applied whatever the project's working space, also when it
+/// is already linear (Linearize Working Space), as before. Negative values (32 bpc, or a
+/// negative Offset) go through the curves mirrored, so a negative Offset darkens smoothly past
+/// black and the default settings leave every value unchanged.
 fn exposure(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let s = exposure_settings(ctx);
     let bypass = ctx.params.b("bypassLinearLight");
@@ -313,9 +359,9 @@ fn exposure(ctx: &EffectCtx, mut b: Buf) -> Buf {
             if bypass {
                 return mirror_pow(c[i] * e + off, 1.0 / g);
             }
-            let lin = effectcraft_color::srgb_to_linear(c[i].max(0.0));
+            let lin = mirror_pow(c[i], EXPOSURE_LINEAR_GAMMA);
             let o = mirror_pow(lin * e + off, 1.0 / g);
-            effectcraft_color::linear_to_srgb(o.abs()).copysign(o)
+            mirror_pow(o, 1.0 / EXPOSURE_LINEAR_GAMMA)
         })
     });
     b
@@ -333,6 +379,37 @@ pub fn mirror_pow(v: f32, p: f32) -> f32 {
 /// It used to offset the luminance by the HSL saturation, which is near 1 for any tinted
 /// near-black pixel: the faint colour noise of compressed footage's shadows came out as bright
 /// and black blocks (#1463), and 32-bpc overbrights divided by zero.
+/// Black & White's Tint: the tint colour's hue and saturation at the gray's luminosity, as a
+/// Color blend does (luminosity with weights 0.3 / 0.59 / 0.11, out-of-range channels pulled
+/// back toward the gray). After Effects 2026 with Tint Color [1, 0.5, 0]: gray 0.1 (a red solid
+/// at Reds 10, case 717) → (43, 21, 0), gray 0.6 (yellow at defaults, case 825) → (255, 129, 2),
+/// white → white; the old hue / saturation / lightness mix gave (51, 26, 0) for the first.
+/// The luminosity weights of `bw_tint` (a Color blend's). `fx_color.wgsl` repeats them; the GPU
+/// test `shader_constants_match_the_cpu` checks that they are these.
+pub const BW_TINT_LUMA: [f32; 3] = [0.3, 0.59, 0.11];
+
+pub fn bw_tint(tint: [f32; 3], gray: f32) -> [f32; 3] {
+    let lum = |c: [f32; 3]| BW_TINT_LUMA[0] * c[0] + BW_TINT_LUMA[1] * c[1] + BW_TINT_LUMA[2] * c[2];
+    if !gray.is_finite() || gray <= 0.0 {
+        return [0.0; 3];
+    }
+    if gray >= 1.0 {
+        return [gray; 3];
+    }
+    let d = gray - lum(tint);
+    let c = tint.map(|v| v + d);
+    let l = lum(c);
+    let (n, x) = (c[0].min(c[1]).min(c[2]), c[0].max(c[1]).max(c[2]));
+    let mut o = c;
+    if n < 0.0 && l - n > 1e-9 {
+        o = o.map(|v| l + (v - l) * l / (l - n));
+    }
+    if x > 1.0 && x - l > 1e-9 {
+        o = o.map(|v| l + (v - l) * (1.0 - l) / (x - l));
+    }
+    o
+}
+
 fn black_white(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let w = [ctx.params.f("reds"), ctx.params.f("yellows"), ctx.params.f("greens"), ctx.params.f("cyans"), ctx.params.f("blues"), ctx.params.f("magentas")]
         .map(|v| v as f32 / 100.0);
@@ -347,13 +424,7 @@ fn black_white(ctx: &EffectCtx, mut b: Buf) -> Buf {
         let wt = w[i] + (w[(i + 1) % 6] - w[i]) * f;
         let (max, min) = (c[0].max(c[1]).max(c[2]), c[0].min(c[1]).min(c[2]));
         let gray = (min + (max - min) * wt).max(0.0);
-        if tint_on {
-            let (th, ts, _) = rgb_to_hsl(tc[0], tc[1], tc[2]);
-            let (r, g, bl) = hsl_to_rgb(th, ts, gray.min(1.0));
-            [r, g, bl]
-        } else {
-            [gray, gray, gray]
-        }
+        if tint_on { bw_tint([tc[0], tc[1], tc[2]], gray) } else { [gray, gray, gray] }
     });
     b
 }
@@ -418,15 +489,12 @@ fn fill(ctx: &EffectCtx, mut b: Buf) -> Buf {
         });
         return b;
     }
+    // Without masks the layer becomes the fill colour, and Opacity is the layer's opacity: After
+    // Effects 2026 renders Fill (0, 0.5, 1) at Opacity 50 % as that colour at half alpha, with
+    // nothing of the original showing through (it is not a mix with the original).
     b.img.data.iter_mut().for_each(|px| {
-        let a = if invert { 1.0 - px[3] } else { px[3] };
-        let f = [c[0] * a, c[1] * a, c[2] * a];
-        for i in 0..3 {
-            px[i] += (f[i] - px[i]) * opacity;
-        }
-        if invert {
-            px[3] += (a - px[3]) * opacity;
-        }
+        let a = if invert { 1.0 - px[3] } else { px[3] } * opacity;
+        *px = [c[0] * a, c[1] * a, c[2] * a, a];
     });
     b
 }
@@ -687,7 +755,7 @@ impl ColoramaPalette {
         }
     }
 
-    /// Parse "pos:r,g,b[,a] pos:r,g,b …" (positions 0..1, channels 0..1). `None` without stops.
+    /// Parse "pos:r,g,b\[,a\] pos:r,g,b …" (positions 0..1, channels 0..1). `None` without stops.
     pub fn parse(s: &str) -> Option<ColoramaPalette> {
         let mut stops: Vec<(f32, [f32; 4])> = s
             .split_whitespace()
@@ -969,11 +1037,13 @@ pub fn specs() -> Vec<EffectSpec> {
             "Exposure",
             {
                 let mut v = vec![p("channels", "Channels", Value::Enum(0), popup(&["Master", "Individual Channels"]))];
+                // After Effects' ranges (valid, slider, decimals). Gamma values below 0.1 from
+                // older projects or Photoshop imports (0.01..9.99) are kept and still render.
                 let group = |ids: [&'static str; 3]| {
                     [
-                        p(ids[0], "Exposure", num(0.0), slider(-20.0, 20.0, -5.0, 5.0, 2)),
+                        p(ids[0], "Exposure", num(0.0), slider(-100.0, 100.0, -4.0, 4.0, 2)),
                         p(ids[1], "Offset", num(0.0), slider(-2.0, 2.0, -0.5, 0.5, 4)),
-                        p(ids[2], "Gamma Correction", num(1.0), slider(0.01, 9.99, 0.1, 3.0, 2)),
+                        p(ids[2], "Gamma Correction", num(1.0), slider(0.1, 10.0, 0.1, 10.0, 2)),
                     ]
                 };
                 v.extend(group(["master/exposure", "master/offset", "master/gamma"]));
@@ -1145,360 +1215,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, run_fx};
-    use effectcraft_raster::Image;
-
-    fn px(id: &str, vals: &[(&str, Value)], c: [f32; 4]) -> [f32; 4] {
-        run_fx(id, vals, Image::filled(2, 2, c), 0.0, EffectEnv::default()).img.get(0, 0)
-    }
-    fn close(a: [f32; 4], b: [f32; 4], eps: f32) -> bool {
-        a.iter().zip(b).all(|(x, y)| (x - y).abs() <= eps)
-    }
-
-    /// Projects saved before Use Legacy / the Photo Filter menu existed keep rendering as before.
-    #[test]
-    fn old_saves_get_legacy_values_for_added_params() {
-        use effectcraft_project::build::Ids;
-        let mut next = 1;
-        for (id, param, want) in
-            [("ec.color.brightnesscontrast", "useLegacy", Value::Bool(true)), ("ec.color.photofilter", "filter", Value::Enum(PHOTO_FILTER_CUSTOM))]
-        {
-            let spec = crate::find(id).unwrap();
-            let mut g = crate::instantiate(spec, &mut Ids(&mut next), spec.name, [10.0, 10.0]);
-            g.children.retain(|c| c.match_id() != param);
-            crate::migrate::upgrade_instance(spec, &mut g, &mut Ids(&mut next), [10.0, 10.0]);
-            assert_eq!(g.get(param).unwrap().value, want, "{id}");
-        }
-    }
-
-    #[test]
-    fn colorama_reads_get_phase_from() {
-        // Same intensity, different red: Intensity gives one colour, Red gives two.
-        let a = [0.6, 0.2, 0.2, 1.0];
-        let b = [0.2, 0.2, 0.6, 1.0];
-        let red = |c| px("ec.color.colorama", &[("inputPhase/mode", Value::Enum(1))], c);
-        assert!(!close(red(a), red(b), 1e-3));
-        // Zero maps everything to the start of the cycle (red).
-        assert!(close(px("ec.color.colorama", &[("inputPhase/mode", Value::Enum(9))], b), [1.0, 0.0, 0.0, 1.0], 1e-5));
-        // Interpolate Palette off posterizes: two nearby inputs land on the same colour.
-        let off = |v: f32| px("ec.color.colorama", &[("outputCycle/interpolatePalette", Value::Bool(false))], [v, v, v, 1.0]);
-        assert_eq!(off(0.20), off(0.22));
-    }
-
-    #[test]
-    fn brightness_contrast_modern_keeps_black_and_white_and_legacy_is_linear() {
-        let bc = |vals: &[(&str, Value)], v: f32| px("ec.color.brightnesscontrast", vals, [v, v, v, 1.0])[0];
-        let up = [("brightness", num(50.0)), ("contrast", num(40.0))];
-        assert_eq!(bc(&up, 0.0), 0.0);
-        assert!((bc(&up, 1.0) - 1.0).abs() < 1e-6);
-        assert!(bc(&up, 0.4) > 0.4);
-        let legacy = [("brightness", num(50.0)), ("useLegacy", Value::Bool(true))];
-        assert!((bc(&legacy, 0.2) - 0.7).abs() < 1e-5);
-        assert!((bc(&legacy, 0.0) - 0.5).abs() < 1e-5);
-    }
-
-    /// After Effects non-legacy ramps (kasper9n, #681). B0 C-100 matched B0 C-50 and is omitted.
-    #[test]
-    fn brightness_contrast_modern_matches_ae_ramp_samples() {
-        let u8 = |v: f32| (v * 255.0).round() as i32;
-        let go = |b: f64, c: f64, x: u8| {
-            u8(px("ec.color.brightnesscontrast", &[("brightness", num(b)), ("contrast", num(c))], [x as f32 / 255.0, x as f32 / 255.0, x as f32 / 255.0, 1.0])
-                [0])
-        };
-        // (brightness, contrast, input, AE 8-bit)
-        let samples: &[(f64, f64, u8, u8)] = &[
-            (0.0, 100.0, 64, 40),
-            (0.0, 100.0, 128, 129),
-            (0.0, 100.0, 192, 217),
-            (0.0, 50.0, 64, 53),
-            (0.0, 50.0, 192, 205),
-            (0.0, -50.0, 64, 77),
-            (100.0, 0.0, 128, 209),
-            (50.0, 0.0, 128, 171),
-            (106.0, -18.0, 128, 214),
-        ];
-        for &(b, c, x, ae) in samples {
-            let got = go(b, c, x);
-            assert!((got - ae as i32).abs() <= 10, "B{b} C{c} in {x}: got {got} AE {ae}");
-        }
-        // Old g=4 S-curve put Contrast 100 at ~8/255 here.
-        assert!(go(0.0, 100.0, 64) >= 30);
-    }
-
-    /// #1463: Black & White's sliders set the gray of each pure hue and blend between
-    /// neighbouring hues; neutral pixels keep their value, overbright ones too, and an overbright
-    /// colour stays finite (it used to divide by zero).
-    #[test]
-    fn black_white_sliders_set_the_gray_of_each_hue() {
-        let bw = |vals: &[(&str, Value)], c: [f32; 3]| px("ec.color.blackwhite", vals, [c[0], c[1], c[2], 1.0]);
-        let gray = |v: f32| [v, v, v, 1.0];
-        // The defaults: Reds 40, Yellows 60, Greens 40, Cyans 60, Blues 20, Magentas 80 (%).
-        let hues = [
-            ([1.0, 0.0, 0.0], 0.4),
-            ([1.0, 1.0, 0.0], 0.6),
-            ([0.0, 1.0, 0.0], 0.4),
-            ([0.0, 1.0, 1.0], 0.6),
-            ([0.0, 0.0, 1.0], 0.2),
-            ([1.0, 0.0, 1.0], 0.8),
-            // Half as bright, half the gray; orange is halfway from Reds to Yellows.
-            ([0.5, 0.0, 0.0], 0.2),
-            ([1.0, 0.5, 0.0], 0.5),
-            // Neutral pixels keep their value.
-            ([0.3, 0.3, 0.3], 0.3),
-            ([4.0, 4.0, 4.0], 4.0),
-            // An overbright red: its smallest channel plus its chroma at Reds' 40 %.
-            ([1.5, 0.5, 0.5], 0.9),
-        ];
-        for (c, want) in hues {
-            let o = bw(&[], c);
-            assert!(close(o, gray(want), 1e-5), "{c:?}: {o:?}, want {want}");
-        }
-        assert!(close(bw(&[("reds", num(120.0))], [1.0, 0.0, 0.0]), gray(1.2), 1e-5));
-        assert!(close(bw(&[("reds", num(-200.0))], [1.0, 0.0, 0.0]), gray(0.0), 1e-5));
-        assert!(close(bw(&[("blues", num(300.0))], [0.1, 0.1, 0.3]), gray(0.7), 1e-5));
-    }
-
-    /// #1463: faint colour noise stays faint. The shadows of compressed footage carry a code or
-    /// two of colour noise, which Black & White turned into bright and black blocks (the HSL
-    /// saturation it scaled is near 1 for any tinted near-black pixel). At 8, 16 and 32 bpc the
-    /// gray of a dark ramp with ±2 steps of colour noise stays within 2 steps of the clean ramp's.
-    #[test]
-    fn black_white_keeps_faint_colour_noise_faint() {
-        // A step of 8 bpc, of 16 bpc (After Effects' 0..32768), and a small 32-bpc float one.
-        for step in [1.0 / 255.0, 1.0 / 32768.0, 1e-3_f32] {
-            let (w, h) = (64u32, 4u32);
-            let (mut clean, mut noisy) = (Image::new(w, h), Image::new(w, h));
-            for y in 0..h {
-                for x in 0..w {
-                    // A dark ramp up to a quarter gray, in whole steps...
-                    let v = (x as f32 / w as f32 * 0.25 / step).round() * step;
-                    // ...and up to ±2 steps of noise per channel, mixed differently in each pixel.
-                    let n = |k: u32| (((x * 7 + y * 13 + k * 2) % 5) as f32 - 2.0) * step;
-                    clean.set(x, y, [v, v, v, 1.0]);
-                    noisy.set(x, y, [(v + n(0)).max(0.0), (v + n(1)).max(0.0), (v + n(2)).max(0.0), 1.0]);
-                }
-            }
-            let bw = |img| run_fx("ec.color.blackwhite", &[], img, 0.0, EffectEnv::default()).img;
-            let (a, b) = (bw(clean), bw(noisy));
-            let worst = a.data.iter().zip(&b.data).map(|(p, q)| (p[0] - q[0]).abs()).fold(0.0, f32::max);
-            assert!(worst <= 2.0 * step + 1e-6, "step {step}: the noise moved the gray by {} steps", worst / step);
-        }
-    }
-
-    #[test]
-    fn levels_clips_black_and_white_independently() {
-        let lv = |vals: &[(&str, Value)], v: f32| px("ec.color.levels", vals, [v, v, v, 1.0])[0];
-        let base = [("inBlack", num(0.2)), ("inWhite", num(0.6)), ("outBlack", num(0.1)), ("outWhite", num(0.9))];
-        assert!((lv(&base, 0.9) - 0.9).abs() < 1e-5);
-        let mut no_white = base.to_vec();
-        no_white.push(("clipToOutputWhite", Value::Enum(0)));
-        assert!(lv(&no_white, 0.9) > 0.9);
-        assert!((lv(&no_white, 0.0) - 0.1).abs() < 1e-5);
-        // The hidden switch of older projects turns both off.
-        let mut legacy = base.to_vec();
-        legacy.push(("noClip", Value::Bool(true)));
-        assert!(lv(&legacy, 0.9) > 0.9);
-    }
-
-    #[test]
-    fn exposure_individual_channels_and_bypass() {
-        let g = [0.5, 0.5, 0.5, 1.0];
-        let one = px("ec.color.exposure", &[("channels", Value::Enum(1)), ("red/redExposure", num(1.0))], g);
-        assert!(one[0] > 0.6 && (one[1] - 0.5).abs() < 1e-5 && (one[2] - 0.5).abs() < 1e-5);
-        // Master values are ignored in Individual Channels mode.
-        assert!(close(px("ec.color.exposure", &[("channels", Value::Enum(1)), ("master/exposure", num(2.0))], g), g, 1e-5));
-        // Bypass Linear Light Conversion: +1 stop doubles the raw value.
-        let raw = px("ec.color.exposure", &[("master/exposure", num(1.0)), ("bypassLinearLight", Value::Bool(true))], [0.25, 0.25, 0.25, 1.0]);
-        assert!((raw[0] - 0.5).abs() < 1e-5);
-        // Negative results are mirrored, not clipped.
-        let neg = px(
-            "ec.color.exposure",
-            &[("master/offset", num(-0.5)), ("bypassLinearLight", Value::Bool(true)), ("master/gamma", num(2.0))],
-            [0.25, 0.25, 0.25, 1.0],
-        );
-        assert!((neg[0] + 0.5).abs() < 1e-4, "{neg:?}");
-    }
-
-    #[test]
-    fn change_to_color_change_modes_tolerances_and_matte() {
-        let red = [0.8, 0.1, 0.1, 1.0];
-        let green = [0.1, 0.8, 0.1, 1.0];
-        let base = [("from", col(0.8, 0.1, 0.1)), ("to", col(0.1, 0.1, 0.8))];
-        // Hue only: red turns blue with its own lightness / saturation; green is untouched.
-        let o = px("ec.color.changetocolor", &base, red);
-        assert!(o[2] > 0.7 && o[0] < 0.2, "{o:?}");
-        assert!(close(px("ec.color.changetocolor", &base, green), green, 1e-5));
-        // The matte is white where matched, black elsewhere.
-        let mut m = base.to_vec();
-        m.push(("viewCorrectionMatte", Value::Bool(true)));
-        assert!(close(px("ec.color.changetocolor", &m, red), [1.0, 1.0, 1.0, 1.0], 1e-5));
-        assert!(close(px("ec.color.changetocolor", &m, green), [0.0, 0.0, 0.0, 1.0], 1e-5));
-        // A lightness tolerance of 0 rejects a lighter red.
-        let mut strict = m.clone();
-        strict.push(("toleranceGroup/lightness", num(0.0)));
-        strict.push(("softness", num(0.0)));
-        assert!(close(px("ec.color.changetocolor", &strict, [1.0, 0.5, 0.5, 1.0]), [0.0, 0.0, 0.0, 1.0], 1e-5));
-        // Hue, Lightness & Saturation, set: a matched pixel becomes the To colour.
-        let mut all = base.to_vec();
-        all.push(("change", Value::Enum(3)));
-        assert!(close(px("ec.color.changetocolor", &all, red), [0.1, 0.1, 0.8, 1.0], 1e-4));
-    }
-
-    #[test]
-    fn leave_color_tolerance_softness_and_match_mode() {
-        let green = [0.1, 0.8, 0.1, 1.0];
-        let lc = |vals: &[(&str, Value)]| {
-            let mut v = vec![("amount", num(100.0))];
-            v.extend_from_slice(vals);
-            px("ec.color.leavecolor", &v, green)
-        };
-        let g = luminance(0.1, 0.8, 0.1);
-        assert!(close(lc(&[]), [g, g, g, 1.0], 1e-5));
-        assert!(close(lc(&[("tolerance", num(100.0))]), green, 1e-6));
-        // Softness keeps part of the colour.
-        let s = lc(&[("tolerance", num(10.0)), ("edgeSoftness", num(100.0))]);
-        assert!(s[1] > g + 0.05 && s[1] < 0.8);
-        // Using Hue: a dark red still matches pure red.
-        let dark = px("ec.color.leavecolor", &[("amount", num(100.0)), ("tolerance", num(5.0)), ("matchColors", Value::Enum(1))], [0.4, 0.0, 0.0, 1.0]);
-        assert!(close(dark, [0.4, 0.0, 0.0, 1.0], 1e-6));
-    }
-
-    #[test]
-    fn photo_filter_presets_and_custom() {
-        let g = [0.5, 0.5, 0.5, 1.0];
-        let cool = px("ec.color.photofilter", &[("filter", Value::Enum(3)), ("preserveLuminosity", Value::Bool(false))], g);
-        assert!(cool[2] > cool[0], "a cooling filter is blue: {cool:?}");
-        let custom = |c| px("ec.color.photofilter", &[("filter", Value::Enum(PHOTO_FILTER_CUSTOM)), ("color", c)], g);
-        assert!(custom(col(0.0, 1.0, 0.0))[1] > custom(col(1.0, 0.0, 0.0))[1]);
-        // The Color swatch is ignored by the presets.
-        let warm = |c| px("ec.color.photofilter", &[("color", c)], g);
-        assert_eq!(warm(col(0.0, 1.0, 0.0)), warm(col(1.0, 0.0, 0.0)));
-    }
-
-    #[test]
-    fn color_balance_preserve_luminosity_and_black_stretch() {
-        let g = [0.5, 0.5, 0.5, 1.0];
-        let o = px("ec.color.colorbalance", &[("midRed", num(60.0)), ("preserveLuminosity", Value::Bool(true))], g);
-        assert!((luminance(o[0], o[1], o[2]) - 0.5).abs() < 1e-4 && o[0] > o[2]);
-        let dark = [0.1, 0.1, 0.1, 1.0];
-        assert!(px("ec.color.gammapedestalgain", &[("blackStretch", num(4.0))], dark)[0] > 0.15);
-        assert!(close(px("ec.color.gammapedestalgain", &[], dark), dark, 1e-6));
-    }
-
-    #[test]
-    fn levels_channel_controls_act_on_their_channel() {
-        let g = [0.5, 0.5, 0.5, 1.0];
-        assert!(close(px("ec.color.levels", &[("channel", Value::Enum(1))], g), g, 1e-6), "the popup alone changes nothing");
-        let r = px("ec.color.levels", &[("redOutWhite", num(0.5))], g);
-        assert!(close(r, [0.25, 0.5, 0.5, 1.0], 1e-5), "{r:?}");
-        let b = px("ec.color.levels", &[("blueGamma", num(2.0)), ("inWhite", num(0.5))], [0.25, 0.25, 0.25, 1.0]);
-        assert!(close(b, [0.5, 0.5, 0.5f32.sqrt(), 1.0], 1e-5), "RGB first, then blue: {b:?}");
-        let a = px("ec.color.levels", &[("alphaOutWhite", num(0.5))], [0.5, 0.5, 0.5, 1.0]);
-        assert!(close(a, [0.25, 0.25, 0.25, 0.5], 1e-5), "{a:?}");
-        // Per-channel clipping follows its own popups.
-        let hot = [0.9, 0.9, 0.9, 1.0];
-        let c = px("ec.color.levels", &[("greenInWhite", num(0.5))], hot)[1];
-        let nc = px("ec.color.levels", &[("greenInWhite", num(0.5)), ("greenClipToOutputWhite", Value::Enum(0))], hot)[1];
-        assert!((c - 1.0).abs() < 1e-6 && (nc - 1.8).abs() < 1e-5, "{c} {nc}");
-    }
-
-    #[test]
-    fn hue_saturation_ranges_adjust_their_hues_only() {
-        let red = [0.8, 0.1, 0.1, 1.0];
-        let blue = [0.1, 0.1, 0.8, 1.0];
-        let grey = [0.5, 0.5, 0.5, 1.0];
-        let v = [("redsSaturation", num(-100.0))];
-        let r = px("ec.color.huesaturation", &v, red);
-        assert!((r[0] - r[1]).abs() < 1e-4, "reds desaturated: {r:?}");
-        assert!(close(px("ec.color.huesaturation", &v, blue), blue, 1e-5));
-        assert!(close(px("ec.color.huesaturation", &v, grey), grey, 1e-5));
-        // Blues hue +120°: blue becomes red.
-        let b = px("ec.color.huesaturation", &[("bluesHue", num(120.0))], blue);
-        assert!(b[0] > 0.7 && b[2] < 0.2, "{b:?}");
-        // Fall-off: a hue 15° past the range end (Reds: −15..15, fall-off 30) gets half.
-        let orange_ish = {
-            let (r, g, b) = hsl_to_rgb(30.0 / 360.0, 0.8, 0.5);
-            [r, g, b, 1.0]
-        };
-        let o = px("ec.color.huesaturation", &[("redsLightness", num(100.0))], orange_ish);
-        let (_, _, l) = rgb_to_hsl(o[0], o[1], o[2]);
-        assert!((l - 0.75).abs() < 0.01, "half weight: {l}");
-        // Moving the range changes which hues it takes.
-        let o2 = px("ec.color.huesaturation", &[("redsLightness", num(100.0)), ("redsRangeEnd", num(40.0))], orange_ish);
-        assert!(rgb_to_hsl(o2[0], o2[1], o2[2]).2 > 0.99);
-        let params = crate::Params { values: [("redsHue".to_string(), num(10.0))].into_iter().collect() };
-        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [1.0, 1.0], seed: 0, adjustment: false, env: Default::default() };
-        assert!(!huesat_ranges_identity(&ctx));
-    }
-
-    #[test]
-    fn fill_mask_all_masks_feather_and_invert() {
-        let sq = |x0: f64, x1: f64| crate::MaskShape {
-            name: String::new(),
-            points: vec![[x0, 0.0], [x1, 0.0], [x1, 10.0], [x0, 10.0]],
-            closed: true,
-            inverted: false,
-        };
-        let masks = [sq(0.0, 5.0), sq(15.0, 20.0)];
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let grey = Image::filled(20, 10, [0.5, 0.5, 0.5, 1.0]);
-        let run = |vals: &[(&str, Value)]| run_fx("ec.generate.fill", vals, grey.clone(), 0.0, env).img;
-        let one = run(&[("fillMask", num(1.0))]);
-        assert_eq!(one.get(2, 5), [1.0, 0.0, 0.0, 1.0]);
-        assert_eq!(one.get(10, 5), [0.5, 0.5, 0.5, 1.0]);
-        assert_eq!(one.get(17, 5), [0.5, 0.5, 0.5, 1.0]);
-        let all = run(&[("allMasks", Value::Bool(true))]);
-        assert_eq!(all.get(17, 5), [1.0, 0.0, 0.0, 1.0]);
-        let inv = run(&[("fillMask", num(1.0)), ("invert", Value::Bool(true))]);
-        assert_eq!(inv.get(2, 5), [0.5, 0.5, 0.5, 1.0]);
-        assert_eq!(inv.get(10, 5), [1.0, 0.0, 0.0, 1.0]);
-        let soft = run(&[("fillMask", num(1.0)), ("horizontalFeather", num(6.0))]);
-        let v = soft.get(6, 5)[1];
-        assert!(v > 0.05 && v < 0.5, "feathered edge {v}");
-        // Without masks, Fill fills the layer as before.
-        let plain = run_fx("ec.generate.fill", &[("fillMask", num(1.0))], grey.clone(), 0.0, EffectEnv::default()).img;
-        assert_eq!(plain.get(10, 5), [1.0, 0.0, 0.0, 1.0]);
-    }
-
-    #[test]
-    fn colorama_palettes_modify_selection_masking_and_add_phase() {
-        let grey = [0.5, 0.5, 0.5, 1.0];
-        let red = [1.0, 0.0, 0.0, 1.0];
-        // Ramp Grayscale: intensity 0.5 maps to mid grey.
-        let g = px("ec.color.colorama", &[("outputCycle/usePresetPalette", Value::Enum(1))], grey);
-        assert!((g[0] - 0.5).abs() < 0.01 && (g[0] - g[2]).abs() < 1e-5, "{g:?}");
-        // Custom palette: two stops, black at 0 and blue at 0.5.
-        let custom = [("outputCycle/usePresetPalette", Value::Enum(8)), ("outputCycle/palette", Value::Str("0:0,0,0 0.5:0,0,1".into()))];
-        let c = px("ec.color.colorama", &custom, grey);
-        assert!(c[2] > 0.99 && c[0] < 0.01, "{c:?}");
-        // Modify Lightness keeps the hue of the pixel (red stays red).
-        let l = px("ec.color.colorama", &[("modify/modify", Value::Enum(5)), ("outputCycle/usePresetPalette", Value::Enum(1))], red);
-        assert!(l[0] > l[1] + 0.2 && l[1] < 0.01 + l[2] + 1e-4, "{l:?}");
-        // Pixel Selection: only colours near Matching Color change.
-        let sel = [
-            ("pixelSelection/matchingMode", Value::Enum(1)),
-            ("pixelSelection/matchingColor", col(1.0, 0.0, 0.0)),
-            ("pixelSelection/matchingTolerance", num(10.0)),
-        ];
-        assert!(close(px("ec.color.colorama", &sel, grey), grey, 1e-6));
-        assert!(!close(px("ec.color.colorama", &sel, red), red, 1e-3));
-        // Composite Over Layer off: unselected pixels vanish.
-        let mut off = sel.to_vec();
-        off.push(("masking/compositeOverLayer", Value::Bool(false)));
-        assert_eq!(px("ec.color.colorama", &off, grey)[3], 0.0);
-        // Modify Alpha takes the palette alpha.
-        let alpha = [
-            ("outputCycle/usePresetPalette", Value::Enum(8)),
-            ("outputCycle/palette", Value::Str("0:1,1,1,0.25".into())),
-            ("modify/modifyAlpha", Value::Bool(true)),
-        ];
-        assert!((px("ec.color.colorama", &alpha, grey)[3] - 0.25).abs() < 1e-5);
-        // Palette parsing and evaluation.
-        let p = ColoramaPalette::parse("0.5:0,0,1 0:1,0,0").unwrap();
-        assert_eq!(p.eval(0.25, true), [0.5, 0.0, 0.5, 1.0]);
-        assert_eq!(p.eval(0.75, true), [0.5, 0.0, 0.5, 1.0], "wraps around");
-        assert_eq!(p.eval(0.25, false), [1.0, 0.0, 0.0, 1.0]);
-    }
-}
+mod tests;
diff --git a/crates/effects/src/color_fx/tests.rs b/crates/effects/src/color_fx/tests.rs
new file mode 100644
index 000000000..2f3370204
--- /dev/null
+++ b/crates/effects/src/color_fx/tests.rs
@@ -0,0 +1,508 @@
+use super::*;
+use crate::{EffectEnv, run_fx};
+use effectcraft_raster::Image;
+
+fn px(id: &str, vals: &[(&str, Value)], c: [f32; 4]) -> [f32; 4] {
+    run_fx(id, vals, Image::filled(2, 2, c), 0.0, EffectEnv::default()).img.get(0, 0)
+}
+fn close(a: [f32; 4], b: [f32; 4], eps: f32) -> bool {
+    a.iter().zip(b).all(|(x, y)| (x - y).abs() <= eps)
+}
+
+/// Projects saved before Use Legacy / the Photo Filter menu existed keep rendering as before.
+#[test]
+fn old_saves_get_legacy_values_for_added_params() {
+    use effectcraft_project::build::Ids;
+    let mut next = 1;
+    for (id, param, want) in
+        [("ec.color.brightnesscontrast", "useLegacy", Value::Bool(true)), ("ec.color.photofilter", "filter", Value::Enum(PHOTO_FILTER_CUSTOM))]
+    {
+        let spec = crate::find(id).unwrap();
+        let mut g = crate::instantiate(spec, &mut Ids(&mut next), spec.name, [10.0, 10.0]);
+        g.children.retain(|c| c.match_id() != param);
+        crate::migrate::upgrade_instance(spec, &mut g, &mut Ids(&mut next), [10.0, 10.0]);
+        assert_eq!(g.get(param).unwrap().value, want, "{id}");
+    }
+}
+
+/// After Effects 2026 renders of full-frame solids with Tint at its defaults (sRGB working
+/// space, not linearised, 32 bpc, 8-bit capture): Rec. 601 weights on the encoded values.
+#[test]
+fn tint_defaults_match_after_effects_greys() {
+    for (c, want) in [([1.0, 0.0, 0.0], 76.0), ([0.0, 1.0, 0.0], 150.0), ([0.0, 0.0, 1.0], 29.0), ([0.5, 0.5, 0.5], 128.0)] {
+        let o = px("ec.color.tint", &[], [c[0], c[1], c[2], 1.0]);
+        let want = want / 255.0;
+        assert!(close(o, [want, want, want, 1.0], 1.0 / 255.0), "{c:?}: {o:?} vs {want}");
+    }
+}
+
+#[test]
+fn colorama_reads_get_phase_from() {
+    // Same intensity, different red: Intensity gives one colour, Red gives two.
+    let a = [0.6, 0.2, 0.2, 1.0];
+    let b = [0.2, 0.2, 0.6, 1.0];
+    let red = |c| px("ec.color.colorama", &[("inputPhase/mode", Value::Enum(1))], c);
+    assert!(!close(red(a), red(b), 1e-3));
+    // Zero maps everything to the start of the cycle (red).
+    assert!(close(px("ec.color.colorama", &[("inputPhase/mode", Value::Enum(9))], b), [1.0, 0.0, 0.0, 1.0], 1e-5));
+    // Interpolate Palette off posterizes: two nearby inputs land on the same colour.
+    let off = |v: f32| px("ec.color.colorama", &[("outputCycle/interpolatePalette", Value::Bool(false))], [v, v, v, 1.0]);
+    assert_eq!(off(0.20), off(0.22));
+}
+
+#[test]
+fn brightness_contrast_modern_keeps_black_and_white_and_legacy_is_linear() {
+    let bc = |vals: &[(&str, Value)], v: f32| px("ec.color.brightnesscontrast", vals, [v, v, v, 1.0])[0];
+    let up = [("brightness", num(50.0)), ("contrast", num(40.0))];
+    assert_eq!(bc(&up, 0.0), 0.0);
+    assert!((bc(&up, 1.0) - 1.0).abs() < 1e-6);
+    assert!(bc(&up, 0.4) > 0.4);
+    let legacy = [("brightness", num(50.0)), ("useLegacy", Value::Bool(true))];
+    assert!((bc(&legacy, 0.2) - 0.7).abs() < 1e-5);
+    assert!((bc(&legacy, 0.0) - 0.5).abs() < 1e-5);
+}
+
+/// After Effects non-legacy ramps (kasper9n, #681). B0 C-100 matched B0 C-50 and is omitted.
+#[test]
+fn brightness_contrast_modern_matches_ae_ramp_samples() {
+    let u8 = |v: f32| (v * 255.0).round() as i32;
+    let go = |b: f64, c: f64, x: u8| {
+        u8(px("ec.color.brightnesscontrast", &[("brightness", num(b)), ("contrast", num(c))], [x as f32 / 255.0, x as f32 / 255.0, x as f32 / 255.0, 1.0])[0])
+    };
+    // (brightness, contrast, input, AE 8-bit)
+    let samples: &[(f64, f64, u8, u8)] = &[
+        (0.0, 100.0, 64, 40),
+        (0.0, 100.0, 128, 129),
+        (0.0, 100.0, 192, 217),
+        (0.0, 50.0, 64, 53),
+        (0.0, 50.0, 192, 205),
+        (0.0, -50.0, 64, 77),
+        (100.0, 0.0, 128, 209),
+        (50.0, 0.0, 128, 171),
+        (106.0, -18.0, 128, 214),
+    ];
+    for &(b, c, x, ae) in samples {
+        let got = go(b, c, x);
+        assert!((got - ae as i32).abs() <= 10, "B{b} C{c} in {x}: got {got} AE {ae}");
+    }
+    // Old g=4 S-curve put Contrast 100 at ~8/255 here.
+    assert!(go(0.0, 100.0, 64) >= 30);
+}
+
+/// After Effects 2026: Tritone Highlights [1, 1, 0.8], Midtones [0.6, 0.2, 0.2], Shadows
+/// [0, 0, 0.3]. On a red solid with Blend With Original 25 (case 718) AE gives (132, 23, 46);
+/// on a grey ramp (case 815) levels 0, 63.9, 127.6, 191.4 give (0, 0, 77), (77, 26, 64),
+/// (153, 51, 51), (204, 153, 128).
+#[test]
+fn tritone_matches_after_effects() {
+    let colours =
+        [("highlights", Value::Color([1.0, 1.0, 0.8, 1.0])), ("midtones", Value::Color([0.6, 0.2, 0.2, 1.0])), ("shadows", Value::Color([0.0, 0.0, 0.3, 1.0]))];
+    let near = |o: [f32; 4], ae: [f32; 3]| (0..3).all(|i| (o[i] * 255.0 - ae[i]).abs() <= 1.0);
+    let mut red = colours.to_vec();
+    red.push(("blend", num(25.0)));
+    let o = px("ec.color.tritone", &red, [1.0, 0.0, 0.0, 1.0]);
+    assert!(near(o, [132.0, 23.0, 46.0]), "{:?}", o.map(|v| v * 255.0));
+    for (level, ae) in [(0.1f32, [0.0, 0.0, 77.0]), (63.9, [77.0, 26.0, 64.0]), (127.6, [153.0, 51.0, 51.0]), (191.4, [204.0, 153.0, 128.0])] {
+        let v = level / 255.0;
+        let o = px("ec.color.tritone", &colours, [v, v, v, 1.0]);
+        assert!(near(o, ae), "level {level}: {:?} vs {ae:?}", o.map(|v| v * 255.0));
+    }
+}
+
+/// After Effects 2026, Tint Color [1, 0.5, 0]: a red solid at Reds 10 (case 717) and yellow
+/// and white solids at the default sliders (case 825).
+#[test]
+fn black_white_tint_matches_after_effects() {
+    let tint = [("tint", Value::Bool(true)), ("tintColor", Value::Color([1.0, 0.5, 0.0, 1.0]))];
+    let near = |o: [f32; 4], ae: [f32; 3]| (0..3).all(|i| (o[i] * 255.0 - ae[i]).abs() <= 1.5);
+    let mut reds = tint.to_vec();
+    reds.push(("reds", num(10.0)));
+    let o = px("ec.color.blackwhite", &reds, [1.0, 0.0, 0.0, 1.0]);
+    assert!(near(o, [43.0, 21.0, 0.0]), "{:?}", o.map(|v| v * 255.0));
+    let o = px("ec.color.blackwhite", &tint, [1.0, 1.0, 0.0, 1.0]);
+    assert!(near(o, [255.0, 129.0, 2.0]), "{:?}", o.map(|v| v * 255.0));
+    let o = px("ec.color.blackwhite", &tint, [1.0, 1.0, 1.0, 1.0]);
+    assert!(near(o, [255.0, 255.0, 255.0]), "{:?}", o.map(|v| v * 255.0));
+    // Hostile grays stay finite.
+    for g in [f32::NAN, -1.0, 0.0, 4.0] {
+        assert!(bw_tint([1.0, 0.5, 0.0], g).iter().all(|v| v.is_finite()));
+    }
+}
+
+/// After Effects 2026 ramps (RENDERER round 2, session R8): negative Brightness and Contrast
+/// are the inverses of the positive curves. (brightness, contrast, input, AE 8-bit)
+#[test]
+fn negative_brightness_and_contrast_invert_the_positive_curves() {
+    let go = |b: f64, c: f64, x: u8| {
+        let v = x as f32 / 255.0;
+        (px("ec.color.brightnesscontrast", &[("brightness", num(b)), ("contrast", num(c))], [v, v, v, 1.0])[0] * 255.0).round() as i32
+    };
+    let samples: &[(f64, f64, u8, u8)] = &[
+        (-40.0, 0.0, 64, 50),
+        (-40.0, 0.0, 128, 99),
+        (-40.0, 0.0, 191, 155),
+        (-40.0, 0.0, 234, 207),
+        (0.0, -50.0, 21, 28),
+        (0.0, -50.0, 64, 76),
+        (0.0, -50.0, 191, 179),
+        (0.0, -50.0, 234, 227),
+        (40.0, 0.0, 128, 162),
+        (0.0, 50.0, 64, 52),
+    ];
+    for &(b, c, x, ae) in samples {
+        let got = go(b, c, x);
+        assert!((got - ae as i32).abs() <= 7, "B{b} C{c} in {x}: got {got} AE {ae}");
+    }
+}
+
+/// #1463: Black & White's sliders set the gray of each pure hue and blend between
+/// neighbouring hues; neutral pixels keep their value, overbright ones too, and an overbright
+/// colour stays finite (it used to divide by zero).
+#[test]
+fn black_white_sliders_set_the_gray_of_each_hue() {
+    let bw = |vals: &[(&str, Value)], c: [f32; 3]| px("ec.color.blackwhite", vals, [c[0], c[1], c[2], 1.0]);
+    let gray = |v: f32| [v, v, v, 1.0];
+    // The defaults: Reds 40, Yellows 60, Greens 40, Cyans 60, Blues 20, Magentas 80 (%).
+    let hues = [
+        ([1.0, 0.0, 0.0], 0.4),
+        ([1.0, 1.0, 0.0], 0.6),
+        ([0.0, 1.0, 0.0], 0.4),
+        ([0.0, 1.0, 1.0], 0.6),
+        ([0.0, 0.0, 1.0], 0.2),
+        ([1.0, 0.0, 1.0], 0.8),
+        // Half as bright, half the gray; orange is halfway from Reds to Yellows.
+        ([0.5, 0.0, 0.0], 0.2),
+        ([1.0, 0.5, 0.0], 0.5),
+        // Neutral pixels keep their value.
+        ([0.3, 0.3, 0.3], 0.3),
+        ([4.0, 4.0, 4.0], 4.0),
+        // An overbright red: its smallest channel plus its chroma at Reds' 40 %.
+        ([1.5, 0.5, 0.5], 0.9),
+    ];
+    for (c, want) in hues {
+        let o = bw(&[], c);
+        assert!(close(o, gray(want), 1e-5), "{c:?}: {o:?}, want {want}");
+    }
+    assert!(close(bw(&[("reds", num(120.0))], [1.0, 0.0, 0.0]), gray(1.2), 1e-5));
+    assert!(close(bw(&[("reds", num(-200.0))], [1.0, 0.0, 0.0]), gray(0.0), 1e-5));
+    assert!(close(bw(&[("blues", num(300.0))], [0.1, 0.1, 0.3]), gray(0.7), 1e-5));
+}
+
+/// #1463: faint colour noise stays faint. The shadows of compressed footage carry a code or
+/// two of colour noise, which Black & White turned into bright and black blocks (the HSL
+/// saturation it scaled is near 1 for any tinted near-black pixel). At 8, 16 and 32 bpc the
+/// gray of a dark ramp with ±2 steps of colour noise stays within 2 steps of the clean ramp's.
+#[test]
+fn black_white_keeps_faint_colour_noise_faint() {
+    // A step of 8 bpc, of 16 bpc (After Effects' 0..32768), and a small 32-bpc float one.
+    for step in [1.0 / 255.0, 1.0 / 32768.0, 1e-3_f32] {
+        let (w, h) = (64u32, 4u32);
+        let (mut clean, mut noisy) = (Image::new(w, h), Image::new(w, h));
+        for y in 0..h {
+            for x in 0..w {
+                // A dark ramp up to a quarter gray, in whole steps...
+                let v = (x as f32 / w as f32 * 0.25 / step).round() * step;
+                // ...and up to ±2 steps of noise per channel, mixed differently in each pixel.
+                let n = |k: u32| (((x * 7 + y * 13 + k * 2) % 5) as f32 - 2.0) * step;
+                clean.set(x, y, [v, v, v, 1.0]);
+                noisy.set(x, y, [(v + n(0)).max(0.0), (v + n(1)).max(0.0), (v + n(2)).max(0.0), 1.0]);
+            }
+        }
+        let bw = |img| run_fx("ec.color.blackwhite", &[], img, 0.0, EffectEnv::default()).img;
+        let (a, b) = (bw(clean), bw(noisy));
+        let worst = a.data.iter().zip(&b.data).map(|(p, q)| (p[0] - q[0]).abs()).fold(0.0, f32::max);
+        assert!(worst <= 2.0 * step + 1e-6, "step {step}: the noise moved the gray by {} steps", worst / step);
+    }
+}
+
+#[test]
+fn levels_clips_black_and_white_independently() {
+    let lv = |vals: &[(&str, Value)], v: f32| px("ec.color.levels", vals, [v, v, v, 1.0])[0];
+    let base = [("inBlack", num(0.2)), ("inWhite", num(0.6)), ("outBlack", num(0.1)), ("outWhite", num(0.9))];
+    assert!((lv(&base, 0.9) - 0.9).abs() < 1e-5);
+    let mut no_white = base.to_vec();
+    no_white.push(("clipToOutputWhite", Value::Enum(0)));
+    assert!(lv(&no_white, 0.9) > 0.9);
+    assert!((lv(&no_white, 0.0) - 0.1).abs() < 1e-5);
+    // The hidden switch of older projects turns both off.
+    let mut legacy = base.to_vec();
+    legacy.push(("noClip", Value::Bool(true)));
+    assert!(lv(&legacy, 0.9) > 0.9);
+}
+
+#[test]
+fn exposure_individual_channels_and_bypass() {
+    let g = [0.5, 0.5, 0.5, 1.0];
+    let one = px("ec.color.exposure", &[("channels", Value::Enum(1)), ("red/redExposure", num(1.0))], g);
+    assert!(one[0] > 0.6 && (one[1] - 0.5).abs() < 1e-5 && (one[2] - 0.5).abs() < 1e-5);
+    // Master values are ignored in Individual Channels mode.
+    assert!(close(px("ec.color.exposure", &[("channels", Value::Enum(1)), ("master/exposure", num(2.0))], g), g, 1e-5));
+    // Bypass Linear Light Conversion: +1 stop doubles the raw value.
+    let raw = px("ec.color.exposure", &[("master/exposure", num(1.0)), ("bypassLinearLight", Value::Bool(true))], [0.25, 0.25, 0.25, 1.0]);
+    assert!((raw[0] - 0.5).abs() < 1e-5);
+    // Negative results are mirrored, not clipped.
+    let neg =
+        px("ec.color.exposure", &[("master/offset", num(-0.5)), ("bypassLinearLight", Value::Bool(true)), ("master/gamma", num(2.0))], [0.25, 0.25, 0.25, 1.0]);
+    assert!((neg[0] + 0.5).abs() < 1e-4, "{neg:?}");
+}
+
+/// After Effects' Exposure ranges for all twelve sliders; a saved value outside them (a gamma
+/// of 0.05, valid before, as in Photoshop) survives loading and still renders.
+#[test]
+fn exposure_has_after_effects_ranges_and_keeps_old_values() {
+    use effectcraft_project::build::Ids;
+    let spec = crate::find("ec.color.exposure").unwrap();
+    let want = [(-100.0, 100.0, -4.0, 4.0, 2), (-2.0, 2.0, -0.5, 0.5, 4), (0.1, 10.0, 0.1, 10.0, 2)];
+    let sliders: Vec<_> = spec
+        .params
+        .iter()
+        .filter_map(|p| match p.ui {
+            ParamUi::Slider { min, max, slider_min, slider_max, decimals } => Some((p.id, (min, max, slider_min, slider_max, decimals))),
+            _ => None,
+        })
+        .collect();
+    assert_eq!(sliders.len(), 12);
+    for (i, (id, r)) in sliders.iter().enumerate() {
+        assert_eq!(*r, want[i % 3], "{id}");
+    }
+    let mut next = 1;
+    let mut g = crate::instantiate(spec, &mut Ids(&mut next), spec.name, [10.0, 10.0]);
+    let gamma = g.prop_mut("master/gamma").unwrap();
+    gamma.value = num(0.05);
+    gamma.ui = slider(0.01, 9.99, 0.1, 3.0, 2);
+    crate::migrate::upgrade_instance(spec, &mut g, &mut Ids(&mut next), [10.0, 10.0]);
+    let gamma = g.prop_mut("master/gamma").unwrap();
+    assert_eq!(gamma.value, num(0.05));
+    assert!(matches!(gamma.ui, ParamUi::Slider { min, .. } if min == 0.1));
+    let o = px("ec.color.exposure", &[("master/gamma", num(0.05)), ("bypassLinearLight", Value::Bool(true))], [0.5, 0.5, 0.5, 1.0]);
+    assert!((o[0] - 0.5f32.powf(20.0)).abs() < 1e-9, "{o:?}");
+}
+
+/// Exposure on a red [1, 0, 0] solid against After Effects 2026 renders (sRGB working space,
+/// not linearised, 32 bpc, 8-bit captures): the linear-light conversion is a pure 2.2 power.
+/// The piecewise sRGB curve gave 2 / 7 / 39 for the three smallest Offsets.
+#[test]
+fn exposure_matches_after_effects_gamma_2_2() {
+    let red = [1.0, 0.0, 0.0, 1.0];
+    let code = |o: [f32; 4], i: usize| o[i] * 255.0;
+    // Master Offset only: G and B carry the curve; R goes over 1 (255 in the 8-bit capture).
+    for (offset, ae) in [(0.0005, 8.0), (0.002, 15.0), (0.02, 43.0), (0.1, 90.0)] {
+        let o = px("ec.color.exposure", &[("master/offset", num(offset))], red);
+        for i in [1, 2] {
+            assert!((code(o, i) - ae).abs() <= 1.0, "offset {offset}: {} vs AE {ae}", code(o, i));
+        }
+        assert!(o[0] >= 1.0, "{o:?}");
+    }
+    // Exposure −2.25: AE 126; with Bypass Linear Light Conversion (gain on encoded values) 54.
+    let o = px("ec.color.exposure", &[("master/exposure", num(-2.25))], red);
+    assert!((code(o, 0) - 126.0).abs() <= 1.0 && o[1] == 0.0, "{o:?}");
+    let o = px("ec.color.exposure", &[("master/exposure", num(-2.25)), ("bypassLinearLight", Value::Bool(true))], red);
+    assert!((code(o, 0) - 54.0).abs() <= 1.0 && o[1] == 0.0, "{o:?}");
+    // Default settings leave 32-bpc values alone, negative and over-range ones included.
+    let hdr = [-0.25, 0.5, 2.0, 1.0];
+    assert!(close(px("ec.color.exposure", &[], hdr), hdr, 1e-5));
+    // A negative Offset pushes black below zero, mirrored, rather than clipping or NaN.
+    let o = px("ec.color.exposure", &[("master/offset", num(-0.02))], [0.0, 0.0, 0.0, 1.0]);
+    assert!((o[0] + 0.02f32.powf(1.0 / 2.2)).abs() < 1e-5, "{o:?}");
+}
+
+#[test]
+fn change_to_color_change_modes_tolerances_and_matte() {
+    let red = [0.8, 0.1, 0.1, 1.0];
+    let green = [0.1, 0.8, 0.1, 1.0];
+    let base = [("from", col(0.8, 0.1, 0.1)), ("to", col(0.1, 0.1, 0.8))];
+    // Hue only: red turns blue with its own lightness / saturation; green is untouched.
+    let o = px("ec.color.changetocolor", &base, red);
+    assert!(o[2] > 0.7 && o[0] < 0.2, "{o:?}");
+    assert!(close(px("ec.color.changetocolor", &base, green), green, 1e-5));
+    // The matte is white where matched, black elsewhere.
+    let mut m = base.to_vec();
+    m.push(("viewCorrectionMatte", Value::Bool(true)));
+    assert!(close(px("ec.color.changetocolor", &m, red), [1.0, 1.0, 1.0, 1.0], 1e-5));
+    assert!(close(px("ec.color.changetocolor", &m, green), [0.0, 0.0, 0.0, 1.0], 1e-5));
+    // A lightness tolerance of 0 rejects a lighter red.
+    let mut strict = m.clone();
+    strict.push(("toleranceGroup/lightness", num(0.0)));
+    strict.push(("softness", num(0.0)));
+    assert!(close(px("ec.color.changetocolor", &strict, [1.0, 0.5, 0.5, 1.0]), [0.0, 0.0, 0.0, 1.0], 1e-5));
+    // Hue, Lightness & Saturation, set: a matched pixel becomes the To colour.
+    let mut all = base.to_vec();
+    all.push(("change", Value::Enum(3)));
+    assert!(close(px("ec.color.changetocolor", &all, red), [0.1, 0.1, 0.8, 1.0], 1e-4));
+}
+
+#[test]
+fn leave_color_tolerance_softness_and_match_mode() {
+    let green = [0.1, 0.8, 0.1, 1.0];
+    let lc = |vals: &[(&str, Value)]| {
+        let mut v = vec![("amount", num(100.0))];
+        v.extend_from_slice(vals);
+        px("ec.color.leavecolor", &v, green)
+    };
+    let g = luminance(0.1, 0.8, 0.1);
+    assert!(close(lc(&[]), [g, g, g, 1.0], 1e-5));
+    assert!(close(lc(&[("tolerance", num(100.0))]), green, 1e-6));
+    // Softness keeps part of the colour.
+    let s = lc(&[("tolerance", num(10.0)), ("edgeSoftness", num(100.0))]);
+    assert!(s[1] > g + 0.05 && s[1] < 0.8);
+    // Using Hue: a dark red still matches pure red.
+    let dark = px("ec.color.leavecolor", &[("amount", num(100.0)), ("tolerance", num(5.0)), ("matchColors", Value::Enum(1))], [0.4, 0.0, 0.0, 1.0]);
+    assert!(close(dark, [0.4, 0.0, 0.0, 1.0], 1e-6));
+}
+
+#[test]
+fn photo_filter_presets_and_custom() {
+    let g = [0.5, 0.5, 0.5, 1.0];
+    let cool = px("ec.color.photofilter", &[("filter", Value::Enum(3)), ("preserveLuminosity", Value::Bool(false))], g);
+    assert!(cool[2] > cool[0], "a cooling filter is blue: {cool:?}");
+    let custom = |c| px("ec.color.photofilter", &[("filter", Value::Enum(PHOTO_FILTER_CUSTOM)), ("color", c)], g);
+    assert!(custom(col(0.0, 1.0, 0.0))[1] > custom(col(1.0, 0.0, 0.0))[1]);
+    // The Color swatch is ignored by the presets.
+    let warm = |c| px("ec.color.photofilter", &[("color", c)], g);
+    assert_eq!(warm(col(0.0, 1.0, 0.0)), warm(col(1.0, 0.0, 0.0)));
+}
+
+#[test]
+fn color_balance_preserve_luminosity_and_black_stretch() {
+    let g = [0.5, 0.5, 0.5, 1.0];
+    let o = px("ec.color.colorbalance", &[("midRed", num(60.0)), ("preserveLuminosity", Value::Bool(true))], g);
+    assert!((luminance(o[0], o[1], o[2]) - 0.5).abs() < 1e-4 && o[0] > o[2]);
+    let dark = [0.1, 0.1, 0.1, 1.0];
+    assert!(px("ec.color.gammapedestalgain", &[("blackStretch", num(4.0))], dark)[0] > 0.15);
+    assert!(close(px("ec.color.gammapedestalgain", &[], dark), dark, 1e-6));
+}
+
+#[test]
+fn levels_channel_controls_act_on_their_channel() {
+    let g = [0.5, 0.5, 0.5, 1.0];
+    assert!(close(px("ec.color.levels", &[("channel", Value::Enum(1))], g), g, 1e-6), "the popup alone changes nothing");
+    let r = px("ec.color.levels", &[("redOutWhite", num(0.5))], g);
+    assert!(close(r, [0.25, 0.5, 0.5, 1.0], 1e-5), "{r:?}");
+    let b = px("ec.color.levels", &[("blueGamma", num(2.0)), ("inWhite", num(0.5))], [0.25, 0.25, 0.25, 1.0]);
+    assert!(close(b, [0.5, 0.5, 0.5f32.sqrt(), 1.0], 1e-5), "RGB first, then blue: {b:?}");
+    let a = px("ec.color.levels", &[("alphaOutWhite", num(0.5))], [0.5, 0.5, 0.5, 1.0]);
+    assert!(close(a, [0.25, 0.25, 0.25, 0.5], 1e-5), "{a:?}");
+    // Per-channel clipping follows its own popups.
+    let hot = [0.9, 0.9, 0.9, 1.0];
+    let c = px("ec.color.levels", &[("greenInWhite", num(0.5))], hot)[1];
+    let nc = px("ec.color.levels", &[("greenInWhite", num(0.5)), ("greenClipToOutputWhite", Value::Enum(0))], hot)[1];
+    assert!((c - 1.0).abs() < 1e-6 && (nc - 1.8).abs() < 1e-5, "{c} {nc}");
+}
+
+#[test]
+fn hue_saturation_ranges_adjust_their_hues_only() {
+    let red = [0.8, 0.1, 0.1, 1.0];
+    let blue = [0.1, 0.1, 0.8, 1.0];
+    let grey = [0.5, 0.5, 0.5, 1.0];
+    let v = [("redsSaturation", num(-100.0))];
+    let r = px("ec.color.huesaturation", &v, red);
+    assert!((r[0] - r[1]).abs() < 1e-4, "reds desaturated: {r:?}");
+    assert!(close(px("ec.color.huesaturation", &v, blue), blue, 1e-5));
+    assert!(close(px("ec.color.huesaturation", &v, grey), grey, 1e-5));
+    // Blues hue +120°: blue becomes red.
+    let b = px("ec.color.huesaturation", &[("bluesHue", num(120.0))], blue);
+    assert!(b[0] > 0.7 && b[2] < 0.2, "{b:?}");
+    // Fall-off: a hue 15° past the range end (Reds: −15..15, fall-off 30) gets half.
+    let orange_ish = {
+        let (r, g, b) = hsl_to_rgb(30.0 / 360.0, 0.8, 0.5);
+        [r, g, b, 1.0]
+    };
+    let o = px("ec.color.huesaturation", &[("redsLightness", num(100.0))], orange_ish);
+    let (_, _, l) = rgb_to_hsl(o[0], o[1], o[2]);
+    assert!((l - 0.75).abs() < 0.01, "half weight: {l}");
+    // Moving the range changes which hues it takes.
+    let o2 = px("ec.color.huesaturation", &[("redsLightness", num(100.0)), ("redsRangeEnd", num(40.0))], orange_ish);
+    assert!(rgb_to_hsl(o2[0], o2[1], o2[2]).2 > 0.99);
+    let params = crate::Params { values: [("redsHue".to_string(), num(10.0))].into_iter().collect() };
+    let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [1.0, 1.0], seed: 0, adjustment: false, env: Default::default() };
+    assert!(!huesat_ranges_identity(&ctx));
+}
+
+#[test]
+fn fill_mask_all_masks_feather_and_invert() {
+    let sq =
+        |x0: f64, x1: f64| crate::MaskShape { name: String::new(), points: vec![[x0, 0.0], [x1, 0.0], [x1, 10.0], [x0, 10.0]], closed: true, inverted: false };
+    let masks = [sq(0.0, 5.0), sq(15.0, 20.0)];
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let grey = Image::filled(20, 10, [0.5, 0.5, 0.5, 1.0]);
+    let run = |vals: &[(&str, Value)]| run_fx("ec.generate.fill", vals, grey.clone(), 0.0, env).img;
+    let one = run(&[("fillMask", num(1.0))]);
+    assert_eq!(one.get(2, 5), [1.0, 0.0, 0.0, 1.0]);
+    assert_eq!(one.get(10, 5), [0.5, 0.5, 0.5, 1.0]);
+    assert_eq!(one.get(17, 5), [0.5, 0.5, 0.5, 1.0]);
+    let all = run(&[("allMasks", Value::Bool(true))]);
+    assert_eq!(all.get(17, 5), [1.0, 0.0, 0.0, 1.0]);
+    let inv = run(&[("fillMask", num(1.0)), ("invert", Value::Bool(true))]);
+    assert_eq!(inv.get(2, 5), [0.5, 0.5, 0.5, 1.0]);
+    assert_eq!(inv.get(10, 5), [1.0, 0.0, 0.0, 1.0]);
+    let soft = run(&[("fillMask", num(1.0)), ("horizontalFeather", num(6.0))]);
+    let v = soft.get(6, 5)[1];
+    assert!(v > 0.05 && v < 0.5, "feathered edge {v}");
+    // Without masks, Fill fills the layer as before.
+    let plain = run_fx("ec.generate.fill", &[("fillMask", num(1.0))], grey.clone(), 0.0, EffectEnv::default()).img;
+    assert_eq!(plain.get(10, 5), [1.0, 0.0, 0.0, 1.0]);
+}
+
+/// After Effects 2026: Fill (0, 0.5, 1) at Opacity 50 % on an opaque layer (a Gradient Ramp
+/// on a red solid) renders premultiplied (0, 0.251, 0.502) at alpha 0.502 everywhere: the
+/// fill colour at half the layer's alpha, nothing of the ramp left.
+#[test]
+fn fill_opacity_is_the_layers_opacity_as_in_after_effects() {
+    let mut img = Image::new(16, 4);
+    for x in 0..16 {
+        let v = x as f32 / 15.0;
+        for y in 0..4 {
+            img.set(x, y, [v, 0.0, 0.0, 1.0]);
+        }
+    }
+    let vals = [("color", Value::Color([0.0, 0.5, 1.0, 1.0])), ("opacity", num(50.0))];
+    let out = run_fx("ec.generate.fill", &vals, img, 0.0, EffectEnv::default()).img;
+    for x in [0, 7, 15] {
+        let p = out.get(x, 2);
+        let ae = [0.0, 0.251, 0.502, 0.502];
+        assert!(p.iter().zip(ae).all(|(v, a)| (v - a).abs() < 1.0 / 255.0), "x {x}: {p:?} vs AE {ae:?}");
+    }
+    // A half-transparent pixel ends at a quarter alpha, still the fill colour.
+    let half = run_fx("ec.generate.fill", &vals, Image::filled(2, 2, [0.2, 0.2, 0.2, 0.5]), 0.0, EffectEnv::default()).img;
+    assert_eq!(half.get(0, 0), [0.0, 0.125, 0.25, 0.25]);
+}
+
+#[test]
+fn colorama_palettes_modify_selection_masking_and_add_phase() {
+    let grey = [0.5, 0.5, 0.5, 1.0];
+    let red = [1.0, 0.0, 0.0, 1.0];
+    // Ramp Grayscale: intensity 0.5 maps to mid grey.
+    let g = px("ec.color.colorama", &[("outputCycle/usePresetPalette", Value::Enum(1))], grey);
+    assert!((g[0] - 0.5).abs() < 0.01 && (g[0] - g[2]).abs() < 1e-5, "{g:?}");
+    // Custom palette: two stops, black at 0 and blue at 0.5.
+    let custom = [("outputCycle/usePresetPalette", Value::Enum(8)), ("outputCycle/palette", Value::Str("0:0,0,0 0.5:0,0,1".into()))];
+    let c = px("ec.color.colorama", &custom, grey);
+    assert!(c[2] > 0.99 && c[0] < 0.01, "{c:?}");
+    // Modify Lightness keeps the hue of the pixel (red stays red).
+    let l = px("ec.color.colorama", &[("modify/modify", Value::Enum(5)), ("outputCycle/usePresetPalette", Value::Enum(1))], red);
+    assert!(l[0] > l[1] + 0.2 && l[1] < 0.01 + l[2] + 1e-4, "{l:?}");
+    // Pixel Selection: only colours near Matching Color change.
+    let sel = [
+        ("pixelSelection/matchingMode", Value::Enum(1)),
+        ("pixelSelection/matchingColor", col(1.0, 0.0, 0.0)),
+        ("pixelSelection/matchingTolerance", num(10.0)),
+    ];
+    assert!(close(px("ec.color.colorama", &sel, grey), grey, 1e-6));
+    assert!(!close(px("ec.color.colorama", &sel, red), red, 1e-3));
+    // Composite Over Layer off: unselected pixels vanish.
+    let mut off = sel.to_vec();
+    off.push(("masking/compositeOverLayer", Value::Bool(false)));
+    assert_eq!(px("ec.color.colorama", &off, grey)[3], 0.0);
+    // Modify Alpha takes the palette alpha.
+    let alpha = [
+        ("outputCycle/usePresetPalette", Value::Enum(8)),
+        ("outputCycle/palette", Value::Str("0:1,1,1,0.25".into())),
+        ("modify/modifyAlpha", Value::Bool(true)),
+    ];
+    assert!((px("ec.color.colorama", &alpha, grey)[3] - 0.25).abs() < 1e-5);
+    // Palette parsing and evaluation.
+    let p = ColoramaPalette::parse("0.5:0,0,1 0:1,0,0").unwrap();
+    assert_eq!(p.eval(0.25, true), [0.5, 0.0, 0.5, 1.0]);
+    assert_eq!(p.eval(0.75, true), [0.5, 0.0, 0.5, 1.0], "wraps around");
+    assert_eq!(p.eval(0.25, false), [1.0, 0.0, 0.0, 1.0]);
+}
diff --git a/crates/effects/src/crypto_select.rs b/crates/effects/src/crypto_select.rs
new file mode 100644
index 000000000..19d93cdba
--- /dev/null
+++ b/crates/effects/src/crypto_select.rs
@@ -0,0 +1,122 @@
+//! Editing a Cryptomatte effect's Selection text from a pick in the viewer (#473): replace it
+//! with the picked ID, add it, or remove it, in the grammar `selection_hashes` reads.
+
+use crate::channel3d::{selection_hashes, selection_names};
+
+/// How a pick changes the selection.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum PickMode {
+    Replace,
+    Add,
+    Remove,
+}
+
+/// A name as a selection token: quoted (with `\` escapes) when it has a comma, a quote or a
+/// backslash, which the selection parser would otherwise split on or read as syntax.
+fn quote(name: &str) -> String {
+    if !name.contains([',', '"', '\'', '\\']) {
+        return name.to_string();
+    }
+    let mut out = String::from("\"");
+    for c in name.chars() {
+        if c == '"' || c == '\\' {
+            out.push('\\');
+        }
+        out.push(c);
+    }
+    out.push('"');
+    out
+}
+
+/// The selection token for the ID `hash` named `name` in `manifest`: the (quoted) name when it
+/// reads back as exactly that ID, else `<hex>`. That covers unnamed IDs, names with `*` (which
+/// would select by wildcard), names that look like `<hex>`, names with surrounding spaces (the
+/// parser trims them) and names shared by several IDs.
+pub fn token_for(name: Option<&str>, hash: u32, manifest: Option<&[(String, u32)]>) -> String {
+    match name {
+        Some(n) if !n.is_empty() && !n.contains('*') && selection_hashes(&quote(n), manifest) == [hash] => quote(n),
+        _ => format!("<{hash:08x}>"),
+    }
+}
+
+/// `sel` edited by a pick of the ID `hash` whose token is `token` (see [`token_for`]). The text
+/// stays as typed when the edit wouldn't change what it selects: Replace when it selects just
+/// that ID, Add when it already selects it, Remove when no name or `<hex>` token selects it (a
+/// wildcard that matches it stays). Other tokens (wildcards included) keep their text,
+/// re-quoted where needed, separated by `, `.
+pub fn edit_selection(sel: &str, token: &str, hash: u32, mode: PickMode, manifest: Option<&[(String, u32)]>) -> String {
+    let tokens: Vec<String> = selection_names(sel).into_iter().filter(|t| !t.is_empty()).collect();
+    let selects = |t: &String| !t.contains('*') && selection_hashes(&quote(t), manifest).contains(&hash);
+    let kept: Vec<String> = match mode {
+        PickMode::Replace if selection_hashes(sel, manifest) == [hash] => return sel.to_string(),
+        PickMode::Replace => return token.to_string(),
+        PickMode::Add if selection_hashes(sel, manifest).contains(&hash) => return sel.to_string(),
+        PickMode::Add => tokens.iter().map(|t| quote(t)).chain([token.to_string()]).collect(),
+        PickMode::Remove if !tokens.iter().any(selects) => return sel.to_string(),
+        PickMode::Remove => tokens.iter().filter(|t| !selects(t)).map(|t| quote(t)).collect(),
+    };
+    kept.join(", ")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use effectcraft_raster::channels3d::crypto_hash;
+
+    fn manifest() -> Vec<(String, u32)> {
+        ["bunny", "Green, Glossy", r#"say "hi""#, r"back\slash", "  pad ", "star*", "<0000abcd>", "twin"]
+            .iter()
+            .map(|n| (n.to_string(), crypto_hash(n)))
+            .chain([("twin".to_string(), 7)])
+            .collect()
+    }
+
+    /// Every name's token reads back as exactly its ID, through the effect's own parser.
+    #[test]
+    fn tokens_round_trip_through_selection_hashes() {
+        let m = manifest();
+        for (n, h) in &m {
+            let t = token_for(Some(n), *h, Some(&m));
+            assert_eq!(selection_hashes(&t, Some(&m)), [*h], "{n:?} → {t:?}");
+        }
+        assert_eq!(token_for(Some("bunny"), crypto_hash("bunny"), Some(&m)), "bunny");
+        assert_eq!(token_for(Some("Green, Glossy"), crypto_hash("Green, Glossy"), Some(&m)), r#""Green, Glossy""#);
+        assert_eq!(token_for(Some(r#"say "hi""#), crypto_hash(r#"say "hi""#), Some(&m)), r#""say \"hi\"""#);
+        // Wildcard-looking, hash-looking, empty, unnamed and shared names: the hash.
+        assert_eq!(token_for(Some("star*"), crypto_hash("star*"), Some(&m)), format!("<{:08x}>", crypto_hash("star*")));
+        assert_eq!(token_for(Some("<0000abcd>"), crypto_hash("<0000abcd>"), Some(&m)), format!("<{:08x}>", crypto_hash("<0000abcd>")));
+        assert_eq!(token_for(Some(""), 5, Some(&m)), "<00000005>");
+        assert_eq!(token_for(Some("  pad "), crypto_hash("  pad "), Some(&m)), format!("<{:08x}>", crypto_hash("  pad ")));
+        assert_eq!(token_for(None, 0xdead_beef, None), "<deadbeef>");
+        assert_eq!(token_for(Some("twin"), 7, Some(&m)), "<00000007>", "the name selects the other twin");
+    }
+
+    #[test]
+    fn add_and_remove_keep_other_tokens_and_skip_duplicates() {
+        let m = manifest();
+        let (b, g) = (crypto_hash("bunny"), crypto_hash("Green, Glossy"));
+        let tok = |n: &str| token_for(Some(n), crypto_hash(n), Some(&m));
+        let edit = |sel: &str, n: &str, mode| edit_selection(sel, &tok(n), crypto_hash(n), mode, Some(&m));
+        assert_eq!(edit("anything, else", "bunny", PickMode::Replace), "bunny");
+        assert_eq!(edit(" bunny ", "bunny", PickMode::Replace), " bunny ", "same meaning: unchanged");
+        assert_eq!(edit("", "bunny", PickMode::Add), "bunny");
+        assert_eq!(edit("bunny", "Green, Glossy", PickMode::Add), r#"bunny, "Green, Glossy""#);
+        // Already selected: by name, by hash, by a wildcard. The text stays as typed.
+        assert_eq!(edit("bunny,floor", "bunny", PickMode::Add), "bunny,floor");
+        assert_eq!(edit(&format!("<{b:08x}>"), "bunny", PickMode::Add), format!("<{b:08x}>"));
+        assert_eq!(edit("bun*", "bunny", PickMode::Add), "bun*");
+        // Other tokens keep their meaning: quoted where needed, wildcards stay wildcards.
+        assert_eq!(edit(r#"'a, b', fl*, "x, *""#, "bunny", PickMode::Add), r#""a, b", fl*, "x, *", bunny"#);
+        assert_eq!(edit(r#""Green, Glossy", bunny"#, "bunny", PickMode::Remove), r#""Green, Glossy""#);
+        assert_eq!(edit(&format!("bunny, <{b:08x}>, x, bunny"), "bunny", PickMode::Remove), "x");
+        assert_eq!(edit(&format!("<{g:08x}>"), "Green, Glossy", PickMode::Remove), "");
+        // Not selected, or only by a wildcard: unchanged.
+        assert_eq!(edit("a ,b", "bunny", PickMode::Remove), "a ,b");
+        assert_eq!(edit("bun*, x", "bunny", PickMode::Remove), "bun*, x");
+        for sel in [r#""a, b", fl*, bunny"#, r#"x, "Green, Glossy", "say \"hi\"", "back\\slash""#] {
+            let before = selection_hashes(sel, Some(&m));
+            let after = selection_hashes(&edit(sel, "  pad ", PickMode::Add), Some(&m));
+            assert_eq!(after, [before, vec![crypto_hash("  pad ")]].concat(), "{sel}");
+        }
+    }
+}
diff --git a/crates/effects/src/distort.rs b/crates/effects/src/distort.rs
index a68de1094..916e162f6 100644
--- a/crates/effects/src/distort.rs
+++ b/crates/effects/src/distort.rs
@@ -164,7 +164,10 @@ fn wave_warp(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let kind = ctx.params.e("waveType");
     let pin = ctx.params.e("pinning");
     let seed = ctx.seed ^ 0x3a7e;
-    let (dx, dy) = (dir.sin(), -dir.cos());
+    // Cardinal directions must not acquire a tiny perpendicular slope: at a square-wave
+    // boundary cos(90°)'s rounding residue can flip a whole column on CPU but not GPU.
+    let axis = |v: f64| if v.abs() < 4.0 * f64::EPSILON { 0.0 } else { v };
+    let (dx, dy) = (axis(dir.sin()), -axis(dir.cos()));
     if !ctx.adjustment {
         b.pad(h.abs().ceil() as u32 + 1);
     }
@@ -272,27 +275,70 @@ pub fn transform_shutter(ctx: &EffectCtx) -> Option<(f64, f64, u32)> {
     (angle > 0.0).then_some((angle, phase, n.clamp(2, 64)))
 }
 
-fn transform_matrix(pr: &crate::Params, b: &Buf) -> Mat3 {
-    let anchor = b.to_px(pr.v2("anchor"));
-    let pos = b.to_px(pr.v2("position"));
+/// The Transform effect's matrix in buffer pixels (`to_px` maps layer pixels into the buffer),
+/// as After Effects 2026 draws it (cases 723, 819, 820): `position + K · R · S · (p − anchor)`
+/// with the skew `K = rot(−axis) · shearY(tan skew) · rot(axis)` applied after the rotation.
+pub fn transform_matrix_px(pr: &crate::Params, to_px: impl Fn([f64; 2]) -> (f64, f64)) -> Mat3 {
+    let anchor = to_px(pr.v2("anchor"));
+    let pos = to_px(pr.v2("position"));
     let sh = pr.f("scaleHeight");
     let sw = if pr.b("uniform") { sh } else { pr.f("scaleWidth") };
+    let axis = pr.f("skewAxis");
+    let k = pr.f("skew").clamp(-85.0, 85.0).to_radians().tan();
+    let k = if k.is_finite() { k } else { 0.0 };
+    let skew = Mat3::rotate_deg(-axis) * Mat3([[1.0, 0.0, 0.0], [k, 1.0, 0.0], [0.0, 0.0, 1.0]]) * Mat3::rotate_deg(axis);
     Mat3::translate(vec2(pos.0, pos.1))
+        * skew
         * Mat3::rotate_deg(pr.f("rotation"))
-        * Mat3::skew_deg(pr.f("skew"), pr.f("skewAxis"))
         * Mat3::scale(vec2(sw / 100.0, sh / 100.0))
         * Mat3::translate(vec2(-anchor.0, -anchor.1))
 }
 
+fn transform_matrix(pr: &crate::Params, b: &Buf) -> Mat3 {
+    transform_matrix_px(pr, |p| b.to_px(p))
+}
+
+/// The transparent margins (left, top, right, bottom) a `w` x `h` buffer needs so its warp by
+/// any of `ms` stays on it: After Effects draws Transform's result outside the layer's bounds
+/// (case 723). Each side grows by its own overshoot; the grown buffer is capped at 16 384 px a
+/// side and 16 Mpx in all (the margins shrink in proportion), so a layer moved far away costs
+/// a bounded allocation.
+pub fn transform_grow(ms: &[Mat3], w: u32, h: u32) -> [u32; 4] {
+    const SIDE: f64 = 16_384.0;
+    const AREA: f64 = 16_777_216.0;
+    let (wf, hf) = (w as f64, h as f64);
+    let mut m = [0.0f64; 4];
+    for mat in ms {
+        for (x, y) in [(0.0, 0.0), (wf, 0.0), (0.0, hf), (wf, hf)] {
+            let q = mat.apply(vec2(x, y));
+            if q.x.is_finite() && q.y.is_finite() {
+                m = [m[0].max(-q.x), m[1].max(-q.y), m[2].max(q.x - wf), m[3].max(q.y - hf)];
+            }
+        }
+    }
+    let m = m.map(|v| v.ceil().max(0.0));
+    let fit = |len: f64, a: f64, b: f64| -> f64 {
+        let room = (SIDE - len).max(0.0);
+        if a + b > room && a + b > 0.0 { room / (a + b) } else { 1.0 }
+    };
+    let kx = fit(wf, m[0], m[2]);
+    let ky = fit(hf, m[1], m[3]);
+    let area = |k: f64| (wf + (m[0] + m[2]) * kx * k) * (hf + (m[1] + m[3]) * ky * k);
+    let k = if area(1.0) > AREA && area(1.0) > wf * hf {
+        // Shrink both margins by the same factor until the area fits.
+        let (mut lo, mut hi) = (0.0f64, 1.0f64);
+        for _ in 0..40 {
+            let mid = (lo + hi) / 2.0;
+            if area(mid) > AREA { hi = mid } else { lo = mid }
+        }
+        lo
+    } else {
+        1.0
+    };
+    [m[0] * kx * k, m[1] * ky * k, m[2] * kx * k, m[3] * ky * k].map(|v| v.floor().clamp(0.0, SIDE) as u32)
+}
+
 fn transform(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let anchor = b.to_px(ctx.params.v2("anchor"));
-    let pos = b.to_px(ctx.params.v2("position"));
-    let uniform = ctx.params.b("uniform");
-    let sh = ctx.params.f("scaleHeight");
-    let sw = if uniform { sh } else { ctx.params.f("scaleWidth") };
-    let skew = ctx.params.f("skew");
-    let skew_axis = ctx.params.f("skewAxis");
-    let rot = ctx.params.f("rotation");
     let opacity = ctx.params.f("opacity") as f32 / 100.0;
     let sampling = if ctx.params.e("sampling") == 1 { effectcraft_raster::Sampling::Bicubic } else { effectcraft_raster::Sampling::Bilinear };
     // Motion blur: the transform at Samples instants across the shutter, averaged (the
@@ -301,33 +347,35 @@ fn transform(ctx: &EffectCtx, mut b: Buf) -> Buf {
         && let Some(host) = ctx.env.host
     {
         let fd = 1.0 / ctx.fps();
-        let mut acc = Image::new(b.img.width, b.img.height);
-        let mut count = 0.0f32;
-        for k in 0..n {
-            let t = ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd;
-            let Some(pr) = host.params_at(t) else { continue };
-            let mut one = Image::new(b.img.width, b.img.height);
-            let op = pr.f("opacity") as f32 / 100.0;
-            effectcraft_raster::composite_warp(
-                &mut one,
-                &b.img,
-                &transform_matrix(&pr, &b),
-                &effectcraft_raster::WarpOpts { opacity: op, sampling, ..Default::default() },
-            );
-            acc.data.iter_mut().zip(&one.data).for_each(|(a, o)| (0..4).for_each(|c| a[c] += o[c]));
-            count += 1.0;
-        }
-        if count > 0.0 {
+        let samples: Vec<crate::Params> = (0..n).filter_map(|k| host.params_at(ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd)).collect();
+        if !samples.is_empty() {
+            if !ctx.adjustment {
+                let ms: Vec<Mat3> = samples.iter().map(|pr| transform_matrix(pr, &b)).collect();
+                b.pad_sides(transform_grow(&ms, b.img.width, b.img.height));
+            }
+            let mut acc = Image::new(b.img.width, b.img.height);
+            for pr in &samples {
+                let mut one = Image::new(b.img.width, b.img.height);
+                let op = pr.f("opacity") as f32 / 100.0;
+                effectcraft_raster::composite_warp(
+                    &mut one,
+                    &b.img,
+                    &transform_matrix(pr, &b),
+                    &effectcraft_raster::WarpOpts { opacity: op, sampling, ..Default::default() },
+                );
+                acc.data.iter_mut().zip(&one.data).for_each(|(a, o)| (0..4).for_each(|c| a[c] += o[c]));
+            }
+            let count = samples.len() as f32;
             acc.data.iter_mut().for_each(|p| p.iter_mut().for_each(|v| *v /= count));
             b.img = acc;
             return b;
         }
     }
-    let m = Mat3::translate(vec2(pos.0, pos.1))
-        * Mat3::rotate_deg(rot)
-        * Mat3::skew_deg(skew, skew_axis)
-        * Mat3::scale(vec2(sw / 100.0, sh / 100.0))
-        * Mat3::translate(vec2(-anchor.0, -anchor.1));
+    if !ctx.adjustment {
+        let m = transform_matrix(ctx.params, &b);
+        b.pad_sides(transform_grow(&[m], b.img.width, b.img.height));
+    }
+    let m = transform_matrix(ctx.params, &b);
     let mut out = Image::new(b.img.width, b.img.height);
     effectcraft_raster::composite_warp(&mut out, &b.img, &m, &effectcraft_raster::WarpOpts { opacity, sampling, ..Default::default() });
     b.img = out;
@@ -556,8 +604,159 @@ mod tests {
             let (a, b) = (o.img.get(pad, y + pad), im.get(0, y));
             assert!((0..4).all(|i| (a[i] - b[i]).abs() < 0.01), "row {y}: {a:?} vs {b:?}");
         }
-        let free = run("ec.distort.wavewarp", &[("direction", num(0.0)), ("height", num(5.0))], im);
+        let free = run("ec.distort.wavewarp", &[("direction", num(0.0)), ("height", num(5.0))], im.clone());
         assert!(free.img.data.iter().zip(&o.img.data).any(|(a, b)| differs(*a, *b)));
+        // #1181: direction 90° → vertical displacement. Top Edge (4) holds the first row,
+        // Bottom Edge (6) the last, and the rest of the layer still moves.
+        for (pin, edge_row) in [(Value::Enum(4), 0i64), (Value::Enum(6), 29i64)] {
+            let set = [("direction", num(90.0)), ("height", num(5.0)), ("pinning", pin)];
+            let o = run("ec.distort.wavewarp", &set, im.clone());
+            let pad = ((o.img.width - im.width) / 2) as i64;
+            for x in 0..40 {
+                let (a, b) = (o.img.get(x + pad, edge_row + pad), im.get(x, edge_row));
+                assert!((0..4).all(|i| (a[i] - b[i]).abs() < 0.01), "pin {edge_row} col {x}: {a:?} vs {b:?}");
+            }
+            let mid = 15;
+            assert!((0..40).any(|x| differs(o.img.get(x + pad, mid + pad), im.get(x, mid))), "pin {edge_row}: the middle of the layer must still distort");
+        }
+    }
+
+    /// After Effects 2026 (cases 723, 819, 820): a grey 960 × 540 solid centred in a 1920 × 1080
+    /// comp with Transform. The skew applies after the rotation, and the result is drawn outside
+    /// the layer's bounds. Points are comp pixels sampled from AE's renders (at least 3 px from
+    /// an edge; true = the solid covers it), half where the old order and clipping differed.
+    #[test]
+    fn transform_matches_after_effects() {
+        let solid = Image::filled(960, 540, [0.5, 0.5, 0.5, 1.0]);
+        let p2 = |x: f64, y: f64| Value::Vec2([x, y]);
+        let cases: [(&str, Vec<(&str, Value)>, &[(u32, u32, bool)]); 3] = [
+            (
+                "723",
+                vec![
+                    ("anchor", p2(400.0, 200.0)),
+                    ("position", p2(500.0, 300.0)),
+                    ("uniform", Value::Bool(false)),
+                    ("scaleHeight", num(80.0)),
+                    ("scaleWidth", num(120.0)),
+                    ("skew", num(10.0)),
+                    ("skewAxis", num(20.0)),
+                    ("rotation", num(30.0)),
+                ],
+                &[
+                    (1465, 954, true),
+                    (1127, 821, true),
+                    (1378, 846, true),
+                    (1416, 878, true),
+                    (1486, 850, true),
+                    (492, 467, true),
+                    (706, 239, true),
+                    (1402, 1021, true),
+                    (518, 440, true),
+                    (1218, 882, true),
+                    (454, 448, true),
+                    (1473, 920, true),
+                    (1048, 654, true),
+                    (1050, 486, true),
+                    (1060, 736, true),
+                    (932, 804, true),
+                    (1074, 562, true),
+                    (653, 591, true),
+                    (1353, 466, false),
+                    (88, 1021, false),
+                    (1855, 886, false),
+                    (1796, 401, false),
+                    (497, 913, false),
+                    (1445, 515, false),
+                ],
+            ),
+            (
+                "819",
+                vec![("skew", num(15.0)), ("skewAxis", num(60.0))],
+                &[
+                    (465, 367, true),
+                    (554, 793, false),
+                    (481, 529, true),
+                    (1451, 599, true),
+                    (428, 575, true),
+                    (432, 600, true),
+                    (463, 444, true),
+                    (759, 803, false),
+                    (445, 684, true),
+                    (1411, 757, true),
+                    (915, 784, false),
+                    (480, 737, true),
+                    (758, 620, true),
+                    (975, 705, true),
+                    (1289, 376, true),
+                    (575, 420, true),
+                    (1015, 507, true),
+                    (1377, 448, true),
+                    (1679, 171, false),
+                    (194, 435, false),
+                    (413, 159, false),
+                    (327, 741, false),
+                    (1824, 138, false),
+                    (1093, 29, false),
+                ],
+            ),
+            (
+                "820",
+                vec![
+                    ("skew", num(15.0)),
+                    ("skewAxis", num(60.0)),
+                    ("rotation", num(-25.0)),
+                    ("uniform", Value::Bool(false)),
+                    ("scaleWidth", num(130.0)),
+                    ("scaleHeight", num(70.0)),
+                    ("anchor", p2(100.0, 50.0)),
+                ],
+                &[
+                    (1674, 566, true),
+                    (1425, 317, false),
+                    (1788, 278, true),
+                    (1530, 390, true),
+                    (1531, 652, true),
+                    (1589, 545, true),
+                    (1890, 441, true),
+                    (1724, 400, true),
+                    (1657, 511, true),
+                    (1895, 261, true),
+                    (1697, 344, true),
+                    (933, 840, true),
+                    (1413, 467, true),
+                    (1295, 691, true),
+                    (1353, 548, true),
+                    (1293, 548, true),
+                    (1103, 551, true),
+                    (973, 758, true),
+                    (446, 484, false),
+                    (1009, 420, false),
+                    (144, 761, false),
+                    (1812, 111, false),
+                    (1241, 10, false),
+                    (900, 854, false),
+                ],
+            ),
+        ];
+        for (case, set, pts) in cases {
+            let o = run("ec.distort.transform", &set, solid.clone());
+            for &(x, y, inside) in pts {
+                // Comp pixel → layer pixel (the solid's top-left sits at 480, 270) → buffer.
+                let (bx, by) = o.to_px([x as f64 + 0.5 - 480.0, y as f64 + 0.5 - 270.0]);
+                let a = if bx >= 0.0 && by >= 0.0 && bx < o.img.width as f64 && by < o.img.height as f64 { o.img.get(bx as i64, by as i64)[3] } else { 0.0 };
+                assert_eq!(a > 0.5, inside, "case {case}: comp pixel ({x}, {y}) alpha {a}");
+            }
+        }
+        // A huge scale stays within the buffer cap.
+        let o = run("ec.distort.transform", &[("scaleHeight", num(100_000.0))], Image::filled(8, 8, [1.0; 4]));
+        assert!(o.img.width <= 16_384 && o.img.height <= 16_384);
+        // A layer moved far right grows the buffer on that side only, within 16 Mpx.
+        let o = run("ec.distort.transform", &[("position", p2(960.0 + 2000.0, 540.0))], Image::filled(1920, 1080, [1.0; 4]));
+        assert_eq!((o.offset[0], o.img.height), (0.0, 1080), "only the right side grows");
+        assert!(o.img.width >= 1920 + 2000 && o.img.width as u64 * o.img.height as u64 <= 16_777_216, "{} x {}", o.img.width, o.img.height);
+        assert!(o.img.get(2000 + 960, 540)[3] > 0.99 && o.img.get(10, 540)[3] < 0.01);
+        let o = run("ec.distort.transform", &[("position", p2(40_000.0, 30_000.0))], Image::filled(1920, 1080, [1.0; 4]));
+        assert!(o.img.width as u64 * o.img.height as u64 <= 16_777_216, "{} x {}", o.img.width, o.img.height);
     }
 
     #[test]
diff --git a/crates/effects/src/distort3.rs b/crates/effects/src/distort3.rs
index 99139483f..a02ab5743 100644
--- a/crates/effects/src/distort3.rs
+++ b/crates/effects/src/distort3.rs
@@ -107,7 +107,14 @@ fn norm3(v: [f64; 3]) -> [f64; 3] {
     [v[0] / l, v[1] / l, v[2] / l]
 }
 
-fn dot3(a: [f64; 3], b: [f64; 3]) -> f64 {
+/// f32 normal/dot helpers for the CC Blobbylize lighting pass. The GPU kernel runs in f32;
+/// matching its precision here keeps specular highlights within the CPU/GPU parity tolerance.
+fn norm3f(v: [f32; 3]) -> [f32; 3] {
+    let l = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt().max(1e-12);
+    [v[0] / l, v[1] / l, v[2] / l]
+}
+
+fn dot3f(a: [f32; 3], b: [f32; 3]) -> f32 {
     a[0] * b[0] + a[1] * b[1] + a[2] * b[2]
 }
 
@@ -115,14 +122,23 @@ fn dot3(a: [f64; 3], b: [f64; 3]) -> f64 {
 
 fn cc_blobbylize(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let soft = ctx.params.f("softness").max(0.0) * b.scale;
-    let cut = (ctx.params.f("cutAway") / 100.0).clamp(0.0, 0.99) as f32;
+    let cut = (ctx.params.f("cutAway") / 100.0).clamp(0.0, 1.0) as f32;
+    if cut >= 1.0 {
+        // Endpoint guard: at Cut Away 100 the gradient antialias must not leave a half-covered
+        // pixel where an opaque source reaches exactly 1.0.
+        b.img.data.fill([0.0; 4]);
+        return b;
+    }
     let blob = layer_or_self(ctx, &b, "blobLayer", true, false);
     let prop = src_at(ctx.params.e("property"));
     let raw = Plane::from_image(&blob, |px| {
         let (c, a) = unpremul(px);
         pick(prop, c, a) * if matches!(prop, crate::util::Src::Alpha) { 1.0 } else { a }
     });
-    let h = gauss_plane(&raw, soft, soft);
+    // Oracle (AE 26.2, 16 bpc): a step thresholded at Cut 25/75 with Softness 20 moves the
+    // 50% contour by 5.55 px. For a Gaussian that is 0.67449 sigma, so sigma = 0.42 Softness.
+    // The same probe shows the matte stays a ~1 px antialiased threshold, not a broad ramp.
+    let h = gauss_plane(&raw, soft * 0.42, soft * 0.42);
     let intensity = ctx.params.f("lightIntensity") / 100.0;
     let lc = ctx.params.color("lightColor");
     let point = ctx.params.e("lightType") == 1;
@@ -135,37 +151,69 @@ fn cc_blobbylize(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let rough = ctx.params.f("roughness").clamp(0.001, 1.0);
     let metal = (ctx.params.f("metal") / 100.0) as f32;
     let shininess = (1.0 / rough).min(500.0);
-    let depth = (soft * 0.5).max(1.0);
     let src = b.img.clone();
     let (w, hh) = (b.img.width as usize, b.img.height as usize);
     let span = (w.max(hh) as f64).max(1.0);
+
+    // The source matte and the RGB refraction are separate in the oracle:
+    // - the matte edge of a self step moves 5/9/14/18 px at Softness 5/10/20/40. A normal
+    //   with z = 1, a ~30 px depth at 1920 and a slope scale of 1.5 Softness reproduces that;
+    // - RGB follows a height-field refraction with z = height: on a linear ramp the measured
+    //   horizontal offset is dx = -0.34 / h, independent of Softness.
+    let matte_slope = soft * 1.5;
+    let matte_depth = if soft > 0.05 { span / 64.0 } else { 0.0 };
+    let rgb_depth = span * 0.34 * b.scale;
+    let light_slope = (soft * 0.65).max(1.0);
+    let limit = span * 0.5;
     b.img.rows_mut().for_each(|(y, row)| {
         for (x, px) in row.iter_mut().enumerate() {
             let (xi, yi) = (x as i64, y as i64);
             let hv = h.get(x, y);
             let gx = (h.get_clamped(xi + 1, yi) - h.get_clamped(xi - 1, yi)) as f64 * 0.5;
             let gy = (h.get_clamped(xi, yi + 1) - h.get_clamped(xi, yi - 1)) as f64 * 0.5;
-            // Refraction-like displacement down the slope, then the blobby matte.
-            let sx = x as f64 + 0.5 - gx * depth * 2.0;
-            let sy = y as f64 + 0.5 - gy * depth * 2.0;
-            let s = src.sample_bilinear(sx, sy);
-            let (c, a) = unpremul(s);
-            let m = ((hv - cut) / ((1.0 - cut) * 0.5).max(1e-3)).clamp(0.0, 1.0);
-            let alpha = a.max(s[3]) * m;
+            let grad = (gx * gx + gy * gy).sqrt();
+            // One-pixel antialiased threshold. A flat field is either fully in or fully out.
+            let aa = (1.25 * grad).max(5e-4);
+            let m = if grad > 1e-9 {
+                (0.5 + (hv - cut) as f64 / aa).clamp(0.0, 1.0) as f32
+            } else if hv > cut {
+                1.0
+            } else {
+                0.0
+            };
+            if m <= 0.0 {
+                *px = [0.0; 4];
+                continue;
+            }
+            // Warp the source matte with the softness-scaled bevel normal (z = 1).
+            let na = norm3([-gx * matte_slope, -gy * matte_slope, 1.0]);
+            let sa = src.sample_bilinear(x as f64 + 0.5 + na[0] * matte_depth, y as f64 + 0.5 + na[1] * matte_depth);
+            let alpha = sa[3].max(0.0) * m;
             if alpha <= 0.0 {
                 *px = [0.0; 4];
                 continue;
             }
-            let n = norm3([-gx * depth, -gy * depth, 1.0]);
-            let l = if point { norm3([lpos.0 - x as f64, lpos.1 - y as f64, lheight / 100.0 * span]) } else { ldir };
-            let ndl = dot3(n, l).max(0.0);
-            let hv3 = norm3([l[0], l[1], l[2] + 1.0]);
-            let sp = dot3(n, hv3).max(0.0).powf(shininess) * specular;
+            // Refract the colour through the height field (z = height for this pass).
+            let hz = (hv as f64).max(1e-3);
+            let rx = (-rgb_depth * gx / hz).clamp(-limit, limit);
+            let ry = (-rgb_depth * gy / hz).clamp(-limit, limit);
+            let srgb = src.sample_bilinear(x as f64 + 0.5 + rx, y as f64 + 0.5 + ry);
+            let (c, _) = unpremul(srgb);
+            let (gx32, gy32) = (gx as f32, gy as f32);
+            let n = norm3f([-gx32 * light_slope as f32, -gy32 * light_slope as f32, 1.0]);
+            let l = if point {
+                norm3f([lpos.0 as f32 - (x as f32 + 0.5), lpos.1 as f32 - (y as f32 + 0.5), (lheight / 100.0 * span) as f32])
+            } else {
+                [ldir[0] as f32, ldir[1] as f32, ldir[2] as f32]
+            };
+            let ndl = dot3f(n, l).max(0.0);
+            let hv3 = norm3f([l[0], l[1], l[2] + 1.0]);
+            let sp = dot3f(n, hv3).max(0.0).powf(shininess as f32) * specular as f32;
             let mut out = [0.0f32; 3];
             for i in 0..3 {
-                let lit = (ambient + diffuse * ndl * intensity) as f32 * lc[i];
+                let lit = (ambient + diffuse * ndl as f64 * intensity) as f32 * lc[i];
                 let spec_col = (1.0 - metal) * lc[i] + metal * c[i] * lc[i];
-                out[i] = c[i] * lit + (sp * intensity) as f32 * spec_col;
+                out[i] = c[i] * lit + (sp as f64 * intensity) as f32 * spec_col;
             }
             *px = premul(out, alpha);
         }
@@ -880,19 +928,19 @@ pub fn specs() -> Vec<EffectSpec> {
             "CC Blobbylize",
             vec![
                 p("blobLayer", "Blob Layer", Value::Layer(None), ParamUi::Layer),
-                p("property", "Property", Value::Enum(3), popup(&crate::util::SRC_NAMES[..8])),
-                p("softness", "Softness", num(6.0), slider(0.0, 200.0, 0.0, 50.0, 1)),
-                p("cutAway", "Cut Away", num(0.0), pct()),
-                p("lightIntensity", "Light Intensity", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
+                p("property", "Property", Value::Enum(0), popup(&crate::util::SRC_NAMES[..8])),
+                p("softness", "Softness", num(20.0), slider(0.0, 500.0, 0.0, 50.0, 1)),
+                p("cutAway", "Cut Away", num(25.0), pct()),
+                p("lightIntensity", "Light Intensity", num(100.0), slider(0.0, 1000.0, 0.0, 200.0, 1)),
                 p("lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
                 p("lightType", "Light Type", Value::Enum(0), popup(&["Distant Light", "Point Light"])),
-                p("lightHeight", "Light Height", num(50.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
-                p("lightPosition", "Light Position", pt(0.25, 0.25), ParamUi::Point),
+                p("lightHeight", "Light Height", num(65.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
+                p("lightPosition", "Light Position", pt(0.5, 0.5), ParamUi::Point),
                 p("lightDirection", "Light Direction", num(-45.0), ParamUi::Angle),
-                p("ambient", "Ambient", num(20.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("diffuse", "Diffuse", num(70.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("specular", "Specular", num(40.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("roughness", "Roughness", num(0.05), slider(0.001, 0.5, 0.001, 0.5, 3)),
+                p("ambient", "Ambient", num(75.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("diffuse", "Diffuse", num(25.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("specular", "Specular", num(100.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("roughness", "Roughness", num(0.025), slider(0.001, 1.0, 0.001, 1.0, 3)),
                 p("metal", "Metal", num(100.0), pct()),
             ],
             cc_blobbylize,
@@ -1036,260 +1084,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, MaskShape, Params};
-
-    fn img(w: u32, h: u32) -> Image {
-        crate::util::gen_image(w, h, |x, y| [x as f32 / w as f32, y as f32 / h as f32, ((x * 7 + y * 3) % 11) as f32 / 11.0, 1.0])
-    }
-
-    /// Run with Point defaults scaled to the layer (like `instantiate`).
-    fn run(id: &str, set: &[(&str, Value)], im: Image, masks: &[MaskShape]) -> Buf {
-        let s = crate::find(id).unwrap();
-        let ls = [im.width as f64, im.height as f64];
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        for ps in &s.params {
-            if let (ParamUi::Point, Value::Vec2(v)) = (&ps.ui, &ps.default) {
-                params.values.insert(ps.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
-            }
-        }
-        for (k, v) in set {
-            assert!(params.values.contains_key(*k), "{id}: {k}");
-            params.values.insert(k.to_string(), v.clone());
-        }
-        let env = EffectEnv { masks, ..Default::default() };
-        let ctx = EffectCtx { params: &params, time: 0.5, layer_size: ls, seed: 1, adjustment: false, env };
-        crate::apply(s, &ctx, Buf { img: im, offset: [0.0, 0.0], scale: 1.0 })
-    }
-
-    fn maxd(a: &Image, b: &Image) -> f32 {
-        assert_eq!((a.width, a.height), (b.width, b.height));
-        a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|i| (p[i] - q[i]).abs()).fold(0.0, f32::max)).fold(0.0, f32::max)
-    }
-
-    fn rect_mask(x0: f64, y0: f64, x1: f64, y1: f64) -> MaskShape {
-        MaskShape { name: "m".into(), points: vec![[x0, y0], [x1, y0], [x1, y1], [x0, y1]], closed: true, inverted: false }
-    }
-
-    #[test]
-    fn identity_at_neutral_settings() {
-        let im = img(40, 30);
-        let cases: &[(&str, Vec<(&str, Value)>)] = &[
-            ("ec.distort.ccbender", vec![]),
-            ("ec.distort.ccpowerpin", vec![]),
-            ("ec.distort.ccripplepulse", vec![]),
-            ("ec.distort.ccslant", vec![]),
-            ("ec.distort.ccsmear", vec![("reach", num(0.0))]),
-            ("ec.distort.ccsplit", vec![("split", num(0.0))]),
-            ("ec.distort.ccsplit2", vec![("split1", num(0.0)), ("split2", num(0.0))]),
-            ("ec.distort.smear", vec![]),
-            ("ec.distort.reshape", vec![]),
-            ("ec.distort.twirllegacy", vec![]),
-            ("ec.distort.warp", vec![("warpStyle", Value::Enum(5))]),
-            ("ec.distort.upscale", vec![]),
-        ];
-        for (id, set) in cases {
-            let o = run(id, set, im.clone(), &[]);
-            assert!(maxd(&o.img, &im) < 1e-5, "{id} not identity");
-            assert_eq!(o.offset, [0.0, 0.0], "{id}");
-        }
-        // Power pin with perspective 0 at default corners is also identity.
-        let o = run("ec.distort.ccpowerpin", &[("perspective", num(0.0))], im.clone(), &[]);
-        assert!(maxd(&o.img, &im) < 1e-4);
-    }
-
-    #[test]
-    fn all_deterministic() {
-        let im = img(36, 28);
-        let masks = [rect_mask(8.0, 8.0, 16.0, 16.0), rect_mask(12.0, 10.0, 22.0, 20.0), rect_mask(2.0, 2.0, 34.0, 26.0)];
-        let cases: &[(&str, Vec<(&str, Value)>)] = &[
-            ("ec.distort.ccbender", vec![("amount", num(40.0)), ("style", Value::Enum(3))]),
-            ("ec.distort.ccblobbylize", vec![]),
-            ("ec.distort.ccpowerpin", vec![("topLeft", pt(5.0, 3.0)), ("perspective", num(40.0))]),
-            ("ec.distort.ccripplepulse", vec![("pulseLevel", num(80.0))]),
-            ("ec.distort.ccslant", vec![("slant", num(30.0)), ("stretching", Value::Bool(true))]),
-            ("ec.distort.ccsmear", vec![]),
-            ("ec.distort.ccsplit", vec![]),
-            ("ec.distort.ccsplit2", vec![("split2", num(10.0))]),
-            ("ec.distort.smear", vec![("sourceMask", Value::Enum(1)), ("boundaryMask", Value::Enum(3)), ("maskOffset", pt(4.0, 2.0))]),
-            ("ec.distort.reshape", vec![("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))]),
-            ("ec.distort.twirllegacy", vec![("angle", num(90.0))]),
-            ("ec.distort.warp", vec![("bend", num(50.0)), ("horizontalDistortion", num(20.0))]),
-            ("ec.distort.upscale", vec![("scale", num(200.0))]),
-        ];
-        for (id, set) in cases {
-            let a = run(id, set, im.clone(), &masks);
-            let b = run(id, set, im.clone(), &masks);
-            assert_eq!(a.img, b.img, "{id}");
-            assert!(a.img.data.iter().all(|p| p.iter().all(|v| v.is_finite())), "{id}");
-            assert!(a.img.width != im.width || a.img.height != im.height || maxd(&a.img, &im) > 1e-3, "{id} did nothing");
-        }
-    }
-
-    /// A text layer's buffer: 20 × 10 opaque pixels at (90, 45)–(110, 55) of its comp-sized
-    /// (200 × 100) layer bounds, after `id` with `set`.
-    fn on_text(id: &str, set: &[(&str, Value)]) -> Buf {
-        let s = crate::find(id).unwrap();
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        for (k, v) in set {
-            assert!(params.values.contains_key(*k), "{id}: {k}");
-            params.values.insert(k.to_string(), v.clone());
-        }
-        let mut im = Image::new(20, 10);
-        im.data.iter_mut().for_each(|p| *p = [1.0; 4]);
-        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [200.0, 100.0], seed: 1, adjustment: false, env: Default::default() };
-        crate::apply(s, &ctx, Buf { img: im, offset: [-90.0, -45.0], scale: 1.0 })
-    }
-
-    /// Alpha at layer point `p` (0 outside the buffer).
-    fn alpha_at(b: &Buf, p: [f64; 2]) -> f32 {
-        let (x, y) = b.to_px(p);
-        b.img.get(x.floor() as i64, y.floor() as i64)[3]
-    }
-
-    /// #659: CC Smear and CC Tiler on a text layer reach past the text's box to the layer bounds
-    /// (comp-sized, as in After Effects), not cut off where the glyphs end.
-    #[test]
-    fn effects_on_text_reach_past_its_box() {
-        let smear = on_text("ec.distort.ccsmear", &[("from", pt(100.0, 50.0)), ("to", pt(140.0, 50.0)), ("reach", num(100.0)), ("radius", num(30.0))]);
-        assert!(alpha_at(&smear, [130.0, 50.0]) > 0.9, "the smear is cut off at the text's box");
-        assert!(smear.img.width < 200, "it grows only as far as pixels move");
-        let tiles = on_text("ec.distort.cctiler", &[("scale", num(50.0)), ("center", pt(100.0, 50.0))]);
-        assert!(alpha_at(&tiles, [100.0, 50.0]) > 0.9);
-        assert!(alpha_at(&tiles, [2.0, 50.0]) > 0.9, "tiles fill the layer bounds");
-        assert!(alpha_at(&tiles, [50.0, 50.0]) < 0.1);
-        // A footage layer's buffer is its bounds already: no change.
-        let o = run("ec.distort.ccsmear", &[], img(40, 30), &[]);
-        assert_eq!((o.img.width, o.img.height, o.offset), (40, 30, [0.0, 0.0]));
-    }
-
-    #[test]
-    fn every_warp_style_runs_and_bends() {
-        let im = img(40, 30);
-        for s in 0..WARP_STYLES.len() as u32 {
-            for axis in 0..2 {
-                let o = run("ec.distort.warp", &[("warpStyle", Value::Enum(s)), ("warpAxis", Value::Enum(axis)), ("bend", num(50.0))], im.clone(), &[]);
-                let pad = o.offset[0] as u32;
-                // The layer centre's neighbourhood is still made of source pixels.
-                assert!(o.img.get(pad as i64 + 20, pad as i64 + 15)[3] > 0.5, "style {s}");
-                assert!(o.img.width > im.width);
-            }
-        }
-        // Arc with positive bend raises the middle of the layer: the top edge in the middle
-        // moves up (opaque pixels above the original top).
-        let o = run("ec.distort.warp", &[("warpStyle", Value::Enum(3)), ("bend", num(50.0))], im.clone(), &[]);
-        let pad = o.offset[1] as i64;
-        assert!(o.img.get(o.offset[0] as i64 + 20, pad - 3)[3] > 0.5);
-        assert!(o.img.get(o.offset[0] as i64 + 1, pad - 3)[3] < 0.5);
-    }
-
-    #[test]
-    fn power_pin_moves_corners() {
-        let im = img(20, 20);
-        // Pin to the right half: output x in 10..20 shows the whole layer squeezed.
-        let set = [("topLeft", pt(10.0, 0.0)), ("bottomLeft", pt(10.0, 20.0))];
-        let o = run("ec.distort.ccpowerpin", &set, im.clone(), &[]);
-        assert_eq!(o.img.get(3, 10)[3], 0.0);
-        let px = o.img.get(15, 10);
-        assert!((px[0] - 0.5).abs() < 0.1, "{px:?}");
-    }
-
-    #[test]
-    fn power_pin_unstretch_expands_pinned_region() {
-        let im = crate::util::gen_image(24, 16, |_, _| [1.0, 0.0, 0.0, 1.0]);
-        let inset = [("topLeft", pt(6.0, 4.0)), ("topRight", pt(18.0, 4.0)), ("bottomRight", pt(18.0, 12.0)), ("bottomLeft", pt(6.0, 12.0))];
-        let opaque = |o: &Buf| o.img.data.iter().filter(|p| p[3] > 0.99).count();
-        let off = run("ec.distort.ccpowerpin", &inset, im.clone(), &[]);
-        assert_eq!(opaque(&off), 96);
-        let mut set = inset.to_vec();
-        set.push(("unstretch", Value::Bool(true)));
-        let on = run("ec.distort.ccpowerpin", &set, im.clone(), &[]);
-        assert_eq!(opaque(&on), 24 * 16);
-        assert!(on.img.get(0, 0)[3] > 0.99);
-        // Default corners are the identity either way.
-        let id = run("ec.distort.ccpowerpin", &[("unstretch", Value::Bool(true))], im.clone(), &[]);
-        assert!(maxd(&id.img, &im) < 1e-4);
-    }
-
-    #[test]
-    fn split_opens_a_gap() {
-        let im = img(40, 30);
-        let o = run("ec.distort.ccsplit", &[("split", num(40.0))], im.clone(), &[]);
-        assert_eq!(o.img.get(20, 15)[3], 0.0);
-        assert_eq!(o.img.get(2, 2), im.get(2, 2));
-    }
-
-    #[test]
-    fn slant_shears_from_floor() {
-        let im = img(20, 20);
-        let o = run("ec.distort.ccslant", &[("slant", num(50.0))], im.clone(), &[]);
-        let pad = o.offset[0] as i64;
-        // Bottom row stays put; the top row shifts right by ~10 px.
-        assert!((o.img.get(pad + 5, pad + 19)[0] - im.get(5, 19)[0]).abs() < 0.05);
-        assert!((o.img.get(pad + 15, pad)[0] - im.get(5, 0)[0]).abs() < 0.08);
-    }
-
-    #[test]
-    fn reshape_moves_source_to_destination() {
-        // A bright square at the source mask; reshape to a shifted destination mask.
-        let im = crate::util::gen_image(40, 40, |x, y| if (10..20).contains(&x) && (10..20).contains(&y) { [1.0; 4] } else { [0.0, 0.0, 0.0, 1.0] });
-        let masks = [rect_mask(10.0, 10.0, 20.0, 20.0), rect_mask(16.0, 10.0, 26.0, 20.0), rect_mask(0.0, 0.0, 40.0, 40.0)];
-        let o = run("ec.distort.reshape", &[("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))], im, &masks);
-        assert!(o.img.get(24, 15)[0] > 0.8, "{:?}", o.img.get(24, 15));
-        assert!(o.img.get(11, 15)[0] < 0.3, "{:?}", o.img.get(11, 15));
-    }
-
-    #[test]
-    fn reshape_correspondence_points_steer_the_match() {
-        // Matching outlines with a zero pair change nothing; a quarter-turn offset twists.
-        let im = img(40, 40);
-        let masks = [rect_mask(10.0, 10.0, 30.0, 30.0), rect_mask(10.0, 10.0, 30.0, 30.0), rect_mask(0.0, 0.0, 40.0, 40.0)];
-        let base = [("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))];
-        let same = run("ec.distort.reshape", &[base.as_slice(), &[("correspondencePoints", Value::Str("0,0".into()))]].concat(), im.clone(), &masks);
-        assert!(maxd(&same.img, &im) < 1e-3, "matching outlines: no change");
-        let twisted = run("ec.distort.reshape", &[base.as_slice(), &[("correspondencePoints", Value::Str("0.25,0".into()))]].concat(), im.clone(), &masks);
-        assert!(maxd(&twisted.img, &im) > 0.1);
-        // Fraction mapping.
-        assert!((map_fraction(&[(0.0, 0.0), (0.5, 0.25)], 0.125, true) - 0.25).abs() < 1e-9);
-        assert!((map_fraction(&[(0.2, 0.0)], 0.9, true) - 0.1).abs() < 1e-9);
-        assert!((map_fraction(&[(0.5, 0.5)], 0.25, false) - 0.25).abs() < 1e-9);
-    }
-
-    #[test]
-    fn upscale_grows_about_centre() {
-        let im = img(20, 10);
-        let o = run("ec.distort.upscale", &[("scale", num(200.0)), ("detail", num(0.0))], im.clone(), &[]);
-        assert_eq!((o.img.width, o.img.height), (40, 20));
-        // Grown about the layer centre: layer point (0,0) now sits at buffer pixel (10,5), so the
-        // centre (10,5) lands in the middle of the 40×20 buffer.
-        assert_eq!(o.offset, [10.0, 5.0]);
-        let c = o.img.sample_bilinear(20.0, 10.0);
-        assert!((c[0] - im.sample_bilinear(10.0, 5.0)[0]).abs() < 0.03);
-    }
-
-    #[test]
-    fn twirl_legacy_rotates_inside_radius() {
-        let im = img(40, 40);
-        let o = run("ec.distort.twirllegacy", &[("angle", num(180.0)), ("radius", num(100.0))], im.clone(), &[]);
-        assert!(maxd(&o.img, &im) > 0.1);
-        // Corners lie outside the radius.
-        assert_eq!(o.img.get(0, 0), im.get(0, 0));
-    }
-
-    #[test]
-    fn half_resolution_matches_scaled_geometry() {
-        // Bender at scale 0.5: the buffer is half size, parameters in layer pixels.
-        let s = crate::find("ec.distort.ccbender").unwrap();
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        params.values.insert("amount".into(), num(30.0));
-        params.values.insert("top".into(), pt(20.0, 0.0));
-        params.values.insert("base".into(), pt(20.0, 40.0));
-        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [40.0, 40.0], seed: 1, adjustment: false, env: Default::default() };
-        let full = crate::apply(s, &ctx, Buf { img: img(40, 40), offset: [0.0; 2], scale: 1.0 });
-        let half = crate::apply(s, &ctx, Buf { img: effectcraft_raster::resample(&img(40, 40), 20, 20), offset: [0.0; 2], scale: 0.5 });
-        let a = full.img.sample_bilinear(20.0, 4.0)[3];
-        let b = half.img.sample_bilinear(10.0, 2.0)[3];
-        assert!((a - b).abs() < 0.3);
-    }
-}
+mod tests;
diff --git a/crates/effects/src/distort3/tests.rs b/crates/effects/src/distort3/tests.rs
new file mode 100644
index 000000000..b50d6b450
--- /dev/null
+++ b/crates/effects/src/distort3/tests.rs
@@ -0,0 +1,332 @@
+use super::*;
+use crate::{EffectEnv, MaskShape, Params};
+
+fn img(w: u32, h: u32) -> Image {
+    crate::util::gen_image(w, h, |x, y| [x as f32 / w as f32, y as f32 / h as f32, ((x * 7 + y * 3) % 11) as f32 / 11.0, 1.0])
+}
+
+/// Run with Point defaults scaled to the layer (like `instantiate`).
+fn run(id: &str, set: &[(&str, Value)], im: Image, masks: &[MaskShape]) -> Buf {
+    let s = crate::find(id).unwrap();
+    let ls = [im.width as f64, im.height as f64];
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    for ps in &s.params {
+        if let (ParamUi::Point, Value::Vec2(v)) = (&ps.ui, &ps.default) {
+            params.values.insert(ps.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
+        }
+    }
+    for (k, v) in set {
+        assert!(params.values.contains_key(*k), "{id}: {k}");
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let env = EffectEnv { masks, ..Default::default() };
+    let ctx = EffectCtx { params: &params, time: 0.5, layer_size: ls, seed: 1, adjustment: false, env };
+    crate::apply(s, &ctx, Buf { img: im, offset: [0.0, 0.0], scale: 1.0 })
+}
+
+fn maxd(a: &Image, b: &Image) -> f32 {
+    assert_eq!((a.width, a.height), (b.width, b.height));
+    a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|i| (p[i] - q[i]).abs()).fold(0.0, f32::max)).fold(0.0, f32::max)
+}
+
+fn rect_mask(x0: f64, y0: f64, x1: f64, y1: f64) -> MaskShape {
+    MaskShape { name: "m".into(), points: vec![[x0, y0], [x1, y0], [x1, y1], [x0, y1]], closed: true, inverted: false }
+}
+
+#[test]
+fn identity_at_neutral_settings() {
+    let im = img(40, 30);
+    let cases: &[(&str, Vec<(&str, Value)>)] = &[
+        ("ec.distort.ccbender", vec![]),
+        ("ec.distort.ccpowerpin", vec![]),
+        ("ec.distort.ccripplepulse", vec![]),
+        ("ec.distort.ccslant", vec![]),
+        ("ec.distort.ccsmear", vec![("reach", num(0.0))]),
+        ("ec.distort.ccsplit", vec![("split", num(0.0))]),
+        ("ec.distort.ccsplit2", vec![("split1", num(0.0)), ("split2", num(0.0))]),
+        ("ec.distort.smear", vec![]),
+        ("ec.distort.reshape", vec![]),
+        ("ec.distort.twirllegacy", vec![]),
+        ("ec.distort.warp", vec![("warpStyle", Value::Enum(5))]),
+        ("ec.distort.upscale", vec![]),
+    ];
+    for (id, set) in cases {
+        let o = run(id, set, im.clone(), &[]);
+        assert!(maxd(&o.img, &im) < 1e-5, "{id} not identity");
+        assert_eq!(o.offset, [0.0, 0.0], "{id}");
+    }
+    // Power pin with perspective 0 at default corners is also identity.
+    let o = run("ec.distort.ccpowerpin", &[("perspective", num(0.0))], im.clone(), &[]);
+    assert!(maxd(&o.img, &im) < 1e-4);
+}
+
+#[test]
+fn all_deterministic() {
+    let im = img(36, 28);
+    let masks = [rect_mask(8.0, 8.0, 16.0, 16.0), rect_mask(12.0, 10.0, 22.0, 20.0), rect_mask(2.0, 2.0, 34.0, 26.0)];
+    let cases: &[(&str, Vec<(&str, Value)>)] = &[
+        ("ec.distort.ccbender", vec![("amount", num(40.0)), ("style", Value::Enum(3))]),
+        ("ec.distort.ccblobbylize", vec![]),
+        ("ec.distort.ccpowerpin", vec![("topLeft", pt(5.0, 3.0)), ("perspective", num(40.0))]),
+        ("ec.distort.ccripplepulse", vec![("pulseLevel", num(80.0))]),
+        ("ec.distort.ccslant", vec![("slant", num(30.0)), ("stretching", Value::Bool(true))]),
+        ("ec.distort.ccsmear", vec![]),
+        ("ec.distort.ccsplit", vec![]),
+        ("ec.distort.ccsplit2", vec![("split2", num(10.0))]),
+        ("ec.distort.smear", vec![("sourceMask", Value::Enum(1)), ("boundaryMask", Value::Enum(3)), ("maskOffset", pt(4.0, 2.0))]),
+        ("ec.distort.reshape", vec![("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))]),
+        ("ec.distort.twirllegacy", vec![("angle", num(90.0))]),
+        ("ec.distort.warp", vec![("bend", num(50.0)), ("horizontalDistortion", num(20.0))]),
+        ("ec.distort.upscale", vec![("scale", num(200.0))]),
+    ];
+    for (id, set) in cases {
+        let a = run(id, set, im.clone(), &masks);
+        let b = run(id, set, im.clone(), &masks);
+        assert_eq!(a.img, b.img, "{id}");
+        assert!(a.img.data.iter().all(|p| p.iter().all(|v| v.is_finite())), "{id}");
+        assert!(a.img.width != im.width || a.img.height != im.height || maxd(&a.img, &im) > 1e-3, "{id} did nothing");
+    }
+}
+
+#[test]
+fn blobbylize_defaults_match_ae() {
+    let s = crate::find("ec.distort.ccblobbylize").unwrap();
+    let default = |id: &str| s.params.iter().find(|p| p.id == id).unwrap().default.clone();
+    assert_eq!(default("property"), Value::Enum(0), "Property defaults to Red");
+    assert_eq!(default("softness"), num(20.0));
+    assert_eq!(default("cutAway"), num(25.0));
+    assert_eq!(default("lightHeight"), num(65.0));
+    assert_eq!(default("lightPosition"), pt(0.5, 0.5));
+    assert_eq!(default("ambient"), num(75.0));
+    assert_eq!(default("diffuse"), num(25.0));
+    assert_eq!(default("specular"), num(100.0));
+    assert_eq!(default("roughness"), num(0.025));
+    assert_eq!(default("metal"), num(100.0));
+}
+
+#[test]
+fn blobbylize_cut_away_thresholds_a_height_ramp() {
+    // AE oracle: Cut Away is a linear height threshold with a ~1 px antialiased edge.
+    let im = crate::util::gen_image(1920, 8, |x, _| {
+        let h = x as f32 / 1920.0;
+        [h, h, h, 1.0]
+    });
+    let o = run("ec.distort.ccblobbylize", &[("property", Value::Enum(0)), ("softness", num(0.0)), ("cutAway", num(25.0))], im, &[]);
+    assert_eq!(o.img.get(400, 4)[3], 0.0, "below Cut Away must be transparent");
+    assert_eq!(o.img.get(560, 4)[3], 1.0, "above Cut Away must be opaque");
+    let edge = o.img.get(480, 4)[3];
+    assert!((0.45..=0.55).contains(&edge), "edge alpha {edge} is not a one-pixel threshold");
+    let partial = (450..510).filter(|&x| (0.001..0.999).contains(&o.img.get(x, 4)[3])).count();
+    assert!(partial <= 2, "{partial} antialiased columns instead of one");
+}
+
+#[test]
+fn blobbylize_cut_away_100_is_empty() {
+    // Regression: the old clamp to 0.99 left the top of the ramp opaque at Cut Away 100.
+    let im = crate::util::gen_image(1920, 8, |x, _| {
+        let h = x as f32 / 1920.0;
+        [h, h, h, 1.0]
+    });
+    let o = run("ec.distort.ccblobbylize", &[("property", Value::Enum(0)), ("softness", num(0.0)), ("cutAway", num(100.0))], im, &[]);
+    assert!(o.img.data.iter().all(|p| p[3] == 0.0), "Cut Away 100 left opaque pixels");
+}
+
+#[test]
+fn blobbylize_cut_away_100_clears_an_opaque_edge() {
+    // An opaque source reaches h = 1 on the high side of an edge; the gradient antialias
+    // used to leave m = 0.5 there, so Cut Away 100 still produced visible pixels.
+    let im = crate::util::gen_image(64, 8, |x, _| if x < 32 { [1.0; 4] } else { [0.0; 4] });
+    let o = run("ec.distort.ccblobbylize", &[("property", Value::Enum(3)), ("softness", num(0.0)), ("cutAway", num(100.0))], im, &[]);
+    assert!(o.img.data.iter().all(|p| p[3] == 0.0), "Cut Away 100 left an opaque edge");
+}
+
+#[test]
+fn blobbylize_softness_warps_a_step_matte_inward() {
+    // AE oracle T2: a self alpha step at x = 960, Softness 20, Cut Away 0 puts the matte
+    // edge at about x = 946, not at the source edge. The PR's matte-preserving version
+    // left it at 960; the effect must warp the source matte.
+    let im = crate::util::gen_image(1920, 32, |x, _| if x < 960 { [1.0; 4] } else { [0.0; 4] });
+    let o = run(
+        "ec.distort.ccblobbylize",
+        &[
+            ("property", Value::Enum(3)),
+            ("softness", num(20.0)),
+            ("cutAway", num(0.0)),
+            ("ambient", num(100.0)),
+            ("diffuse", num(0.0)),
+            ("specular", num(0.0)),
+            ("metal", num(0.0)),
+        ],
+        im,
+        &[],
+    );
+    assert!(o.img.get(945, 16)[3] > 0.95, "the matte did not move inward: {}", o.img.get(945, 16)[3]);
+    assert!(o.img.get(949, 16)[3] < 0.05, "source alpha leaked past the warped edge");
+    assert_eq!(o.img.get(960, 16)[3], 0.0, "the source matte was preserved instead of warped");
+}
+
+/// A text layer's buffer: 20 × 10 opaque pixels at (90, 45)–(110, 55) of its comp-sized
+/// (200 × 100) layer bounds, after `id` with `set`.
+fn on_text(id: &str, set: &[(&str, Value)]) -> Buf {
+    let s = crate::find(id).unwrap();
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    for (k, v) in set {
+        assert!(params.values.contains_key(*k), "{id}: {k}");
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let mut im = Image::new(20, 10);
+    im.data.iter_mut().for_each(|p| *p = [1.0; 4]);
+    let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [200.0, 100.0], seed: 1, adjustment: false, env: Default::default() };
+    crate::apply(s, &ctx, Buf { img: im, offset: [-90.0, -45.0], scale: 1.0 })
+}
+
+/// Alpha at layer point `p` (0 outside the buffer).
+fn alpha_at(b: &Buf, p: [f64; 2]) -> f32 {
+    let (x, y) = b.to_px(p);
+    b.img.get(x.floor() as i64, y.floor() as i64)[3]
+}
+
+/// #659: CC Smear and CC Tiler on a text layer reach past the text's box to the layer bounds
+/// (comp-sized, as in After Effects), not cut off where the glyphs end.
+#[test]
+fn effects_on_text_reach_past_its_box() {
+    let smear = on_text("ec.distort.ccsmear", &[("from", pt(100.0, 50.0)), ("to", pt(140.0, 50.0)), ("reach", num(100.0)), ("radius", num(30.0))]);
+    assert!(alpha_at(&smear, [130.0, 50.0]) > 0.9, "the smear is cut off at the text's box");
+    assert!(smear.img.width < 200, "it grows only as far as pixels move");
+    let tiles = on_text("ec.distort.cctiler", &[("scale", num(50.0)), ("center", pt(100.0, 50.0))]);
+    assert!(alpha_at(&tiles, [100.0, 50.0]) > 0.9);
+    assert!(alpha_at(&tiles, [2.0, 50.0]) > 0.9, "tiles fill the layer bounds");
+    assert!(alpha_at(&tiles, [50.0, 50.0]) < 0.1);
+    // A footage layer's buffer is its bounds already: no change.
+    let o = run("ec.distort.ccsmear", &[], img(40, 30), &[]);
+    assert_eq!((o.img.width, o.img.height, o.offset), (40, 30, [0.0, 0.0]));
+}
+
+#[test]
+fn every_warp_style_runs_and_bends() {
+    let im = img(40, 30);
+    for s in 0..WARP_STYLES.len() as u32 {
+        for axis in 0..2 {
+            let o = run("ec.distort.warp", &[("warpStyle", Value::Enum(s)), ("warpAxis", Value::Enum(axis)), ("bend", num(50.0))], im.clone(), &[]);
+            let pad = o.offset[0] as u32;
+            // The layer centre's neighbourhood is still made of source pixels.
+            assert!(o.img.get(pad as i64 + 20, pad as i64 + 15)[3] > 0.5, "style {s}");
+            assert!(o.img.width > im.width);
+        }
+    }
+    // Arc with positive bend raises the middle of the layer: the top edge in the middle
+    // moves up (opaque pixels above the original top).
+    let o = run("ec.distort.warp", &[("warpStyle", Value::Enum(3)), ("bend", num(50.0))], im.clone(), &[]);
+    let pad = o.offset[1] as i64;
+    assert!(o.img.get(o.offset[0] as i64 + 20, pad - 3)[3] > 0.5);
+    assert!(o.img.get(o.offset[0] as i64 + 1, pad - 3)[3] < 0.5);
+}
+
+#[test]
+fn power_pin_moves_corners() {
+    let im = img(20, 20);
+    // Pin to the right half: output x in 10..20 shows the whole layer squeezed.
+    let set = [("topLeft", pt(10.0, 0.0)), ("bottomLeft", pt(10.0, 20.0))];
+    let o = run("ec.distort.ccpowerpin", &set, im.clone(), &[]);
+    assert_eq!(o.img.get(3, 10)[3], 0.0);
+    let px = o.img.get(15, 10);
+    assert!((px[0] - 0.5).abs() < 0.1, "{px:?}");
+}
+
+#[test]
+fn power_pin_unstretch_expands_pinned_region() {
+    let im = crate::util::gen_image(24, 16, |_, _| [1.0, 0.0, 0.0, 1.0]);
+    let inset = [("topLeft", pt(6.0, 4.0)), ("topRight", pt(18.0, 4.0)), ("bottomRight", pt(18.0, 12.0)), ("bottomLeft", pt(6.0, 12.0))];
+    let opaque = |o: &Buf| o.img.data.iter().filter(|p| p[3] > 0.99).count();
+    let off = run("ec.distort.ccpowerpin", &inset, im.clone(), &[]);
+    assert_eq!(opaque(&off), 96);
+    let mut set = inset.to_vec();
+    set.push(("unstretch", Value::Bool(true)));
+    let on = run("ec.distort.ccpowerpin", &set, im.clone(), &[]);
+    assert_eq!(opaque(&on), 24 * 16);
+    assert!(on.img.get(0, 0)[3] > 0.99);
+    // Default corners are the identity either way.
+    let id = run("ec.distort.ccpowerpin", &[("unstretch", Value::Bool(true))], im.clone(), &[]);
+    assert!(maxd(&id.img, &im) < 1e-4);
+}
+
+#[test]
+fn split_opens_a_gap() {
+    let im = img(40, 30);
+    let o = run("ec.distort.ccsplit", &[("split", num(40.0))], im.clone(), &[]);
+    assert_eq!(o.img.get(20, 15)[3], 0.0);
+    assert_eq!(o.img.get(2, 2), im.get(2, 2));
+}
+
+#[test]
+fn slant_shears_from_floor() {
+    let im = img(20, 20);
+    let o = run("ec.distort.ccslant", &[("slant", num(50.0))], im.clone(), &[]);
+    let pad = o.offset[0] as i64;
+    // Bottom row stays put; the top row shifts right by ~10 px.
+    assert!((o.img.get(pad + 5, pad + 19)[0] - im.get(5, 19)[0]).abs() < 0.05);
+    assert!((o.img.get(pad + 15, pad)[0] - im.get(5, 0)[0]).abs() < 0.08);
+}
+
+#[test]
+fn reshape_moves_source_to_destination() {
+    // A bright square at the source mask; reshape to a shifted destination mask.
+    let im = crate::util::gen_image(40, 40, |x, y| if (10..20).contains(&x) && (10..20).contains(&y) { [1.0; 4] } else { [0.0, 0.0, 0.0, 1.0] });
+    let masks = [rect_mask(10.0, 10.0, 20.0, 20.0), rect_mask(16.0, 10.0, 26.0, 20.0), rect_mask(0.0, 0.0, 40.0, 40.0)];
+    let o = run("ec.distort.reshape", &[("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))], im, &masks);
+    assert!(o.img.get(24, 15)[0] > 0.8, "{:?}", o.img.get(24, 15));
+    assert!(o.img.get(11, 15)[0] < 0.3, "{:?}", o.img.get(11, 15));
+}
+
+#[test]
+fn reshape_correspondence_points_steer_the_match() {
+    // Matching outlines with a zero pair change nothing; a quarter-turn offset twists.
+    let im = img(40, 40);
+    let masks = [rect_mask(10.0, 10.0, 30.0, 30.0), rect_mask(10.0, 10.0, 30.0, 30.0), rect_mask(0.0, 0.0, 40.0, 40.0)];
+    let base = [("sourceMask", Value::Enum(1)), ("destinationMask", Value::Enum(2)), ("boundaryMask", Value::Enum(3))];
+    let same = run("ec.distort.reshape", &[base.as_slice(), &[("correspondencePoints", Value::Str("0,0".into()))]].concat(), im.clone(), &masks);
+    assert!(maxd(&same.img, &im) < 1e-3, "matching outlines: no change");
+    let twisted = run("ec.distort.reshape", &[base.as_slice(), &[("correspondencePoints", Value::Str("0.25,0".into()))]].concat(), im.clone(), &masks);
+    assert!(maxd(&twisted.img, &im) > 0.1);
+    // Fraction mapping.
+    assert!((map_fraction(&[(0.0, 0.0), (0.5, 0.25)], 0.125, true) - 0.25).abs() < 1e-9);
+    assert!((map_fraction(&[(0.2, 0.0)], 0.9, true) - 0.1).abs() < 1e-9);
+    assert!((map_fraction(&[(0.5, 0.5)], 0.25, false) - 0.25).abs() < 1e-9);
+}
+
+#[test]
+fn upscale_grows_about_centre() {
+    let im = img(20, 10);
+    let o = run("ec.distort.upscale", &[("scale", num(200.0)), ("detail", num(0.0))], im.clone(), &[]);
+    assert_eq!((o.img.width, o.img.height), (40, 20));
+    // Grown about the layer centre: layer point (0,0) now sits at buffer pixel (10,5), so the
+    // centre (10,5) lands in the middle of the 40×20 buffer.
+    assert_eq!(o.offset, [10.0, 5.0]);
+    let c = o.img.sample_bilinear(20.0, 10.0);
+    assert!((c[0] - im.sample_bilinear(10.0, 5.0)[0]).abs() < 0.03);
+}
+
+#[test]
+fn twirl_legacy_rotates_inside_radius() {
+    let im = img(40, 40);
+    let o = run("ec.distort.twirllegacy", &[("angle", num(180.0)), ("radius", num(100.0))], im.clone(), &[]);
+    assert!(maxd(&o.img, &im) > 0.1);
+    // Corners lie outside the radius.
+    assert_eq!(o.img.get(0, 0), im.get(0, 0));
+}
+
+#[test]
+fn half_resolution_matches_scaled_geometry() {
+    // Bender at scale 0.5: the buffer is half size, parameters in layer pixels.
+    let s = crate::find("ec.distort.ccbender").unwrap();
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    params.values.insert("amount".into(), num(30.0));
+    params.values.insert("top".into(), pt(20.0, 0.0));
+    params.values.insert("base".into(), pt(20.0, 40.0));
+    let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [40.0, 40.0], seed: 1, adjustment: false, env: Default::default() };
+    let full = crate::apply(s, &ctx, Buf { img: img(40, 40), offset: [0.0; 2], scale: 1.0 });
+    let half = crate::apply(s, &ctx, Buf { img: effectcraft_raster::resample(&img(40, 40), 20, 20), offset: [0.0; 2], scale: 0.5 });
+    let a = full.img.sample_bilinear(20.0, 4.0)[3];
+    let b = half.img.sample_bilinear(10.0, 2.0)[3];
+    assert!((a - b).abs() < 0.3);
+}
diff --git a/crates/effects/src/generate.rs b/crates/effects/src/generate.rs
index fd5a54123..637cc428e 100644
--- a/crates/effects/src/generate.rs
+++ b/crates/effects/src/generate.rs
@@ -112,10 +112,19 @@ pub(crate) fn gen_blend(o: Px, g: Px, mode: u32) -> Px {
     }
 }
 
+/// 4-Color Gradient's weights are inverse squared distances softened by Blend²: each point
+/// weighs 1 / (d² + Blend²) (pixels). Fitted to After Effects 2026 renders at Blend 10, 50, 100
+/// and 300 (power 2.00 at every Blend, softening 0 / 2367 / 9817 / 90127 ≈ Blend²; mean error
+/// 0.27/255, max 0.9). Returns Blend² in buffer pixels, never 0.
+pub fn four_color_softening(blend: f64, scale: f64) -> f64 {
+    let b = blend.max(0.0) * scale;
+    (b * b).max(1e-6)
+}
+
 fn four_color(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let pts: Vec<((f64, f64), [f32; 4])> =
         (1..=4).map(|i| (b.to_px(ctx.params.v2(&format!("positionsColors/point{i}"))), ctx.params.color(&format!("positionsColors/color{i}")))).collect();
-    let blend = ctx.params.f("blend").max(1.0);
+    let k = four_color_softening(ctx.params.f("blend"), b.scale);
     let jitter = (ctx.params.f("jitter") / 100.0).clamp(0.0, 1.0) as f32;
     let op = ctx.params.f("opacity") as f32 / 100.0;
     let mode = ctx.params.e("blendingMode");
@@ -126,7 +135,7 @@ fn four_color(ctx: &EffectCtx, mut b: Buf) -> Buf {
             let mut wsum = 0.0;
             for ((qx, qy), c) in &pts {
                 let d2 = (x as f64 + 0.5 - qx).powi(2) + (y as f64 + 0.5 - qy).powi(2);
-                let w = 1.0 / (d2 / (blend * 100.0) + 1e-6).powf(1.5);
+                let w = 1.0 / (d2 + k);
                 for i in 0..3 {
                     acc[i] += c[i] as f64 * w;
                 }
@@ -423,6 +432,59 @@ mod generator_tests {
         }
     }
 
+    /// After Effects 2026, 4-Color Gradient defaults (yellow, green, magenta, blue at 10 % / 90 %
+    /// of a 1920 × 1080 layer) at Blend 100 and 300, here on a tenth-size layer with Blend 10
+    /// and 30 (the weights scale with the layer): colours at AE pixels (10x + 5, 10y + 5).
+    #[test]
+    fn four_color_blend_matches_after_effects() {
+        let pts = [
+            ("positionsColors/point1", [19.2, 10.8]),
+            ("positionsColors/point2", [172.8, 10.8]),
+            ("positionsColors/point3", [19.2, 97.2]),
+            ("positionsColors/point4", [172.8, 97.2]),
+        ];
+        let cols = [
+            ("positionsColors/color1", [1.0, 1.0, 0.0, 1.0]),
+            ("positionsColors/color2", [0.0, 1.0, 0.0, 1.0]),
+            ("positionsColors/color3", [1.0, 0.0, 1.0, 1.0]),
+            ("positionsColors/color4", [0.0, 0.0, 1.0, 1.0]),
+        ];
+        let ae: [(f64, [(i64, i64, [f32; 3]); 5]); 2] = [
+            (
+                10.0,
+                [
+                    (30, 20, [249.0, 240.0, 15.0]),
+                    (150, 30, [20.0, 208.0, 47.0]),
+                    (60, 90, [213.0, 56.0, 199.0]),
+                    (100, 10, [115.0, 177.0, 78.0]),
+                    (10, 50, [238.0, 145.0, 110.0]),
+                ],
+            ),
+            (
+                30.0,
+                [
+                    (30, 20, [236.0, 214.0, 41.0]),
+                    (150, 30, [30.0, 189.0, 66.0]),
+                    (60, 90, [203.0, 67.0, 188.0]),
+                    (100, 10, [117.0, 173.0, 82.0]),
+                    (10, 50, [233.0, 140.0, 115.0]),
+                ],
+            ),
+        ];
+        for (blend, samples) in ae {
+            let mut vals: Vec<(&str, Value)> = pts.iter().map(|(k, v)| (*k, Value::Vec2(*v))).collect();
+            vals.extend(cols.iter().map(|(k, v)| (*k, Value::Color(*v))));
+            vals.push(("blend", num(blend)));
+            let o = run_fx("ec.generate.fourcolor", &vals, Image::filled(192, 108, [1.0, 0.0, 0.0, 1.0]), 0.0, EffectEnv::default());
+            for (x, y, want) in samples {
+                let p = o.img.get(x, y);
+                for c in 0..3 {
+                    assert!((p[c] * 255.0 - want[c]).abs() <= 3.0, "blend {blend} at ({x}, {y}) channel {c}: {} vs AE {}", p[c] * 255.0, want[c]);
+                }
+            }
+        }
+    }
+
     #[test]
     fn four_color_none_stays_inside_the_layer_alpha() {
         // #1381: like the Gradient Ramp, the gradient fills a shape or text, not its bounding box.
diff --git a/crates/effects/src/generate2.rs b/crates/effects/src/generate2.rs
index 80d32ce0e..b4781b793 100644
--- a/crates/effects/src/generate2.rs
+++ b/crates/effects/src/generate2.rs
@@ -61,7 +61,7 @@ const CELL_PATTERNS: [&str; 12] = [
     "Tubular",
 ];
 
-/// Shaping used for Cell Pattern option `i` (see [`cell_value`]).
+/// Shaping used for Cell Pattern option `i` (see `cell_value`).
 pub fn pattern_kind(i: u32) -> u32 {
     match i {
         0..=5 => i,
@@ -692,18 +692,33 @@ impl BoltCfg<'_> {
     }
 }
 
-/// Grow a bolt from `a` to `z` by midpoint displacement (`depth` levels), forking at random.
-/// Segments go to `out` with their intensity; `mains` marks the main core's segments.
-#[allow(clippy::too_many_arguments)]
-fn bolt(cfg: &BoltCfg, a: (f64, f64), z: (f64, f64), depth: u32, inten: f32, main: bool, rng: &mut Rng, out: &mut Vec<Seg>, mains: &mut Vec<bool>) {
-    if out.len() > 20_000 {
+/// One branch's geometry and recursive growth state.
+struct BoltBranch {
+    start: (f64, f64),
+    end: (f64, f64),
+    depth: u32,
+    intensity: f32,
+    main: bool,
+}
+
+/// Segments and their matching main-core flags, kept in the same traversal order.
+#[derive(Default)]
+struct BoltOutput {
+    segments: Vec<Seg>,
+    mains: Vec<bool>,
+}
+
+/// Grow a branch by midpoint displacement, recursively appending its segments and forks.
+fn bolt(cfg: &BoltCfg, branch: BoltBranch, rng: &mut Rng, output: &mut BoltOutput) {
+    let BoltBranch { start: a, end: z, depth, intensity: inten, main } = branch;
+    if output.segments.len() > 20_000 {
         return;
     }
     let (dx, dy) = (z.0 - a.0, z.1 - a.1);
     let len = (dx * dx + dy * dy).sqrt();
     if depth == 0 || len < 1.0 {
-        out.push((a, z, inten));
-        mains.push(main);
+        output.segments.push((a, z, inten));
+        output.mains.push(main);
         return;
     }
     let (nx, ny) = (-dy / len.max(1e-9), dx / len.max(1e-9));
@@ -725,8 +740,8 @@ fn bolt(cfg: &BoltCfg, a: (f64, f64), z: (f64, f64), depth: u32, inten: f32, mai
     if cfg.obstacle > 0.0 && !main && cfg.alpha_at(m) > 0.5 && rng.f() < cfg.obstacle / 10.0 {
         return;
     }
-    bolt(cfg, a, m, depth - 1, inten, main, rng, out, mains);
-    bolt(cfg, m, z, depth - 1, inten, main, rng, out, mains);
+    bolt(cfg, BoltBranch { start: a, end: m, depth: depth - 1, intensity: inten, main }, rng, output);
+    bolt(cfg, BoltBranch { start: m, end: z, depth: depth - 1, intensity: inten, main }, rng, output);
     if rng.f() < cfg.fork && inten > cfg.term && len >= cfg.min_fork {
         let ang = rng.s() * 0.7;
         let (s, c) = ang.sin_cos();
@@ -734,7 +749,7 @@ fn bolt(cfg: &BoltCfg, a: (f64, f64), z: (f64, f64), depth: u32, inten: f32, mai
         let k = 1.2;
         // Fork Strength 50 % keeps the decayed intensity; Fork Variation randomises it.
         let fi = inten * (1.0 - cfg.decay) * cfg.fork_strength * 2.0 * if cfg.fork_var > 0.0 { 1.0 - cfg.fork_var * rng.f() as f32 } else { 1.0 };
-        bolt(cfg, m, (m.0 + fx * k, m.1 + fy * k), depth.saturating_sub(1), fi.min(1.0), false, rng, out, mains);
+        bolt(cfg, BoltBranch { start: m, end: (m.0 + fx * k, m.1 + fy * k), depth: depth.saturating_sub(1), intensity: fi.min(1.0), main: false }, rng, output);
     }
 }
 
@@ -772,10 +787,9 @@ pub fn lightning_segments(ctx: &EffectCtx, b: &Buf) -> Vec<Seg> {
         fork_strength: (g("expertSettings/forkStrength", 50.0) / 100.0).clamp(0.0, 1.0) as f32,
         fork_var: (g("expertSettings/forkVariation", 0.0) / 100.0).clamp(0.0, 1.0) as f32,
     };
-    let mut segs = Vec::new();
-    let mut mains = Vec::new();
+    let mut output = BoltOutput::default();
     let (h, w) = (b.img.height as f64, b.img.width as f64);
-    let mut go = |a, z, depth, cfg: &BoltCfg, rng: &mut Rng| bolt(cfg, a, z, depth, 1.0, true, rng, &mut segs, &mut mains);
+    let mut go = |a, z, depth, cfg: &BoltCfg, rng: &mut Rng| bolt(cfg, BoltBranch { start: a, end: z, depth, intensity: 1.0, main: true }, rng, &mut output);
     // LIGHTNING_TYPES order.
     match kind {
         // Direction: travels toward the Direction point and beyond.
@@ -811,6 +825,7 @@ pub fn lightning_segments(ctx: &EffectCtx, b: &Buf) -> Vec<Seg> {
         // Strike.
         _ => go(o, d, depth, &cfg, &mut rng),
     }
+    let BoltOutput { segments: mut segs, mains } = output;
     let dist = |p: (f64, f64)| ((p.0 - o.0).powi(2) + (p.1 - o.1).powi(2)).sqrt();
     let far = segs.iter().map(|(_, z, _)| dist(*z)).fold(1e-9, f64::max);
     // Decay Main Core: the whole bolt fades with distance from the origin.
@@ -1223,315 +1238,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Params;
-    use effectcraft_raster::Image;
-
-    fn run(id: &str, set: &[(&str, Value)], img: Image) -> Buf {
-        let s = crate::find(id).unwrap();
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        let ls = [img.width as f64, img.height as f64];
-        for p in &s.params {
-            if let (ParamUi::Point, Value::Vec2(v)) = (&p.ui, &p.default) {
-                params.values.insert(p.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
-            }
-        }
-        for (k, v) in set {
-            params.values.insert(k.to_string(), v.clone());
-        }
-        let ctx = EffectCtx { params: &params, time: 0.5, layer_size: ls, seed: 3, adjustment: false, env: Default::default() };
-        crate::apply(s, &ctx, Buf { img, offset: [0.0, 0.0], scale: 1.0 })
-    }
-
-    #[test]
-    fn cell_pattern_is_deterministic_and_seeded() {
-        let a = run("ec.generate.cellpattern", &[("size", num(10.0))], Image::new(40, 30));
-        let b2 = run("ec.generate.cellpattern", &[("size", num(10.0))], Image::new(40, 30));
-        assert_eq!(a.img, b2.img);
-        let c = run("ec.generate.cellpattern", &[("size", num(10.0)), ("evolutionOptions/randomSeed", num(5.0))], Image::new(40, 30));
-        assert_ne!(a.img, c.img);
-        assert!(a.img.data.iter().all(|p| p[3] == 1.0 && (0.0..=1.0).contains(&p[0])));
-    }
-
-    #[test]
-    fn ellipse_ring_coverage() {
-        let o = run("ec.generate.ellipse", &[("width", num(40.0)), ("height", num(40.0)), ("thickness", num(6.0))], Image::new(64, 64));
-        // Ring passes through (32 + 20, 32); centre is empty.
-        assert!(o.img.get(51, 32)[3] > 0.9, "{:?}", o.img.get(51, 32));
-        assert!(o.img.get(32, 32)[3] < 1e-3);
-        assert!(o.img.get(2, 2)[3] < 1e-3);
-    }
-
-    #[test]
-    fn lightning_is_deterministic_per_conductivity() {
-        let a = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
-        let b2 = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
-        assert_eq!(a.img, b2.img);
-        assert!(a.img.data.iter().any(|p| p[3] > 0.5));
-        let c = run("ec.generate.advancedlightning", &[("conductivityState", num(11.0))], Image::new(64, 48));
-        assert_ne!(a.img, c.img);
-    }
-
-    #[test]
-    fn beam_draws_between_points() {
-        let o = run("ec.generate.beam", &[("length", num(100.0)), ("softness", num(0.0))], Image::new(64, 32));
-        assert!(o.img.get(32, 16)[3] > 0.99);
-        assert!(o.img.get(32, 2)[3] < 1e-3);
-        assert!(o.img.get(2, 16)[3] < 1e-3);
-    }
-
-    #[test]
-    fn cell_pattern_tiles() {
-        // 4×4-cell tiles of 8 px: the pattern repeats every 32 px.
-        let set = [
-            ("size", num(8.0)),
-            ("tilingOptions/enableTiling", Value::Bool(true)),
-            ("tilingOptions/cellsHorizontal", num(4.0)),
-            ("tilingOptions/cellsVertical", num(4.0)),
-        ];
-        let o = run("ec.generate.cellpattern", &set, Image::new(64, 64));
-        for (x, y) in [(3, 5), (10, 20), (17, 2)] {
-            let (a, b2) = (o.img.get(x, y), o.img.get(x + 32, y + 32));
-            assert!((a[0] - b2[0]).abs() < 1e-4, "{x},{y}: {a:?} vs {b2:?}");
-        }
-    }
-
-    #[test]
-    fn radio_waves_expansion_velocity_and_star() {
-        let r = |set: &[(&str, Value)], t: f64| {
-            let s = crate::find("ec.generate.radiowaves").unwrap();
-            let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-            params.values.insert("producerPoint".into(), Value::Vec2([32.0, 32.0]));
-            for (k, v) in set {
-                params.values.insert(k.to_string(), v.clone());
-            }
-            let ctx = EffectCtx { params: &params, time: t, layer_size: [64.0, 64.0], seed: 3, adjustment: false, env: Default::default() };
-            crate::apply(s, &ctx, Buf { img: Image::new(64, 64), offset: [0.0, 0.0], scale: 1.0 })
-        };
-        // One wave born at t = 0, 0.2 s old: radius = Expansion × age = 20 px.
-        let base = [("waveMotion/expansion", num(100.0)), ("waveMotion/frequency", num(0.5))];
-        let o = r(&base, 0.2);
-        assert!(o.img.get(52, 32)[3] > 0.9, "{:?}", o.img.get(52, 32));
-        assert!(o.img.get(32, 32)[3] < 0.01);
-        // Velocity moves the wave toward Direction (90° = right).
-        let mut moving = base.to_vec();
-        moving.push(("waveMotion/velocity", num(50.0)));
-        let o = r(&moving, 0.2);
-        assert!(o.img.get(62, 32)[3] > 0.9 && o.img.get(52, 32)[3] < 0.5, "{:?}", o.img.get(62, 32));
-        // A 4-point star: the outline dips toward the centre between the points.
-        let mut star = base.to_vec();
-        star.extend([("polygon/sides", num(4.0)), ("polygon/star", Value::Bool(true)), ("polygon/starDepth", num(-0.5))]);
-        let o = r(&star, 0.2);
-        assert!(o.img.get(32, 12)[3] > 0.9, "point straight up");
-        // Between points (45°) the outline sits near half the radius.
-        assert!(o.img.get(39, 24)[3] > 0.5, "{:?}", o.img.get(39, 24));
-        assert!(o.img.get(46, 18)[3] < 0.01, "no circle there");
-    }
-
-    #[test]
-    fn lightning_alpha_obstacle_and_expert_settings() {
-        let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
-        let alpha_in = |img: &Image, src: &Image| img.data.iter().zip(&src.data).filter(|(_, s)| s[3] > 0.5).map(|(p, _)| p[3]).sum::<f32>();
-        // A wall of opaque pixels across the middle of the bolt's path.
-        let mut wall = Image::new(64, 48);
-        for y in 0..48 {
-            for x in 0..64 {
-                if (18..30).contains(&y) && x < 50 {
-                    wall.set(x, y, [0.0, 0.0, 0.0, 1.0]);
-                }
-            }
-        }
-        let opts = |o: f64| {
-            vec![("alphaObstacle", num(o)), ("compositeOnOriginal", Value::Bool(false)), ("glowSettings/glowRadius", num(0.0)), ("forking", num(60.0))]
-        };
-        let free = run("ec.generate.advancedlightning", &opts(0.0), wall.clone());
-        let avoid = run("ec.generate.advancedlightning", &opts(10.0), wall.clone());
-        assert!(alpha_in(&avoid.img, &wall) < alpha_in(&free.img, &wall), "{} vs {}", alpha_in(&avoid.img, &wall), alpha_in(&free.img, &wall));
-        // Fractal Type, Core Drain, Fork Strength, Termination Threshold, Min Fork Distance.
-        let base = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
-        for (id, v) in [
-            ("expertSettings/fractalType", Value::Enum(2)),
-            ("expertSettings/coreDrain", num(100.0)),
-            ("expertSettings/forkStrength", num(100.0)),
-            ("expertSettings/forkVariation", num(100.0)),
-        ] {
-            assert_ne!(run("ec.generate.advancedlightning", &[(id, v)], Image::new(64, 48)).img, base.img, "{id}");
-        }
-        let drained = run("ec.generate.advancedlightning", &[("expertSettings/coreDrain", num(100.0))], Image::new(64, 48));
-        assert!(sum(&drained.img) < sum(&base.img));
-        let no_forks = run("ec.generate.advancedlightning", &[("expertSettings/minForkDistance", num(1000.0))], Image::new(64, 48));
-        let term = run("ec.generate.advancedlightning", &[("expertSettings/terminationThreshold", num(100.0))], Image::new(64, 48));
-        assert_eq!(no_forks.img, term.img, "no forks either way");
-        assert!(sum(&no_forks.img) < sum(&base.img));
-    }
-
-    #[test]
-    fn lightning_types_and_decay_main_core() {
-        let a = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
-        let strike = run("ec.generate.advancedlightning", &[("lightningType", Value::Enum(1))], Image::new(64, 48));
-        assert_eq!(a.img, strike.img, "Strike is the default");
-        for t in 0..8 {
-            let o = run("ec.generate.advancedlightning", &[("lightningType", Value::Enum(t))], Image::new(64, 48));
-            assert!(o.img.data.iter().any(|p| p[3] > 0.3), "type {t} draws");
-        }
-        let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
-        let d = run("ec.generate.advancedlightning", &[("decayMainCore", Value::Bool(true)), ("decay", num(0.9))], Image::new(64, 48));
-        let n = run("ec.generate.advancedlightning", &[("decay", num(0.9))], Image::new(64, 48));
-        assert!(sum(&d.img) < sum(&n.img));
-    }
-
-    #[test]
-    fn beam_3d_perspective_controls_thickness() {
-        // Short beam near the start: with 3D Perspective its thickness comes from its position
-        // (thin, near the start); without, its head takes the full ending thickness.
-        let set = |p: bool| {
-            vec![
-                ("length", num(20.0)),
-                ("time", num(0.0)),
-                ("softness", num(0.0)),
-                ("startThickness", num(2.0)),
-                ("endThickness", num(20.0)),
-                ("perspective3d", Value::Bool(p)),
-            ]
-        };
-        let on = run("ec.generate.beam", &set(true), Image::new(64, 32));
-        let off = run("ec.generate.beam", &set(false), Image::new(64, 32));
-        let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
-        assert!(sum(&off.img) > sum(&on.img) * 1.5, "{} {}", sum(&off.img), sum(&on.img));
-    }
-
-    #[test]
-    fn lens_flare_brightest_at_center() {
-        let o = run("ec.generate.lensflare", &[], Image::new(64, 64));
-        let c = o.img.get(16, 16)[0];
-        assert!(c > o.img.get(60, 4)[0]);
-        assert!(c > 0.5);
-    }
-
-    fn rw(set: &[(&str, Value)], t: f64, env: crate::EffectEnv) -> Image {
-        let mut v: Vec<(&str, Value)> =
-            vec![("producerPoint", Value::Vec2([32.0, 32.0])), ("waveMotion/frequency", num(0.5)), ("waveMotion/expansion", num(100.0))];
-        v.extend_from_slice(set);
-        crate::run_fx("ec.generate.radiowaves", &v, Image::new(64, 64), t, env).img
-    }
-
-    #[test]
-    fn signed_distance_of_a_square() {
-        let (w, h) = (20, 20);
-        let inside: Vec<bool> = (0..w * h).map(|i| (5..15).contains(&(i % w)) && (5..15).contains(&(i / w))).collect();
-        let d = crate::util::signed_distance(&inside, w, h);
-        assert!((d.get(10, 10) + 4.5).abs() < 1e-4, "{}", d.get(10, 10));
-        assert!((d.get(0, 10) - 4.5).abs() < 1e-4, "{}", d.get(0, 10));
-        assert!((d.get(0, 0) - (50f32.sqrt() - 0.5)).abs() < 1e-4);
-    }
-
-    #[test]
-    fn radio_waves_mask_contours_profile_reflection_and_birth() {
-        // Mask waves: a 10×10 square mask; after 0.1 s (10 px) the wave is 10 px outside it.
-        let sq = crate::MaskShape { name: String::new(), points: vec![[27.0, 27.0], [37.0, 27.0], [37.0, 37.0], [27.0, 37.0]], closed: true, inverted: false };
-        let masks = [sq];
-        let env = crate::EffectEnv { masks: &masks, ..Default::default() };
-        let m = rw(&[("waveType", Value::Enum(2)), ("waveMask/mask", num(1.0))], 0.1, env);
-        assert!(m.get(47, 32)[3] > 0.9, "{:?}", m.get(47, 32));
-        assert!(m.get(32, 32)[3] < 0.01 && m.get(40, 32)[3] < 0.01);
-        // Rounded corner: diagonal distance 10 from (37, 37).
-        assert!(m.get(44, 44)[3] > 0.5, "{:?}", m.get(44, 44));
-        // No mask chosen: nothing drawn.
-        assert!(rw(&[("waveType", Value::Enum(2))], 0.1, env).data.iter().all(|p| p[3] == 0.0));
-        // Image Contours: the bright square of a source layer.
-        struct Src;
-        impl crate::EffectHost for Src {
-            fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
-                let mut img = Image::new(64, 64);
-                for y in 27..37 {
-                    for x in 27..37 {
-                        img.set(x, y, [1.0, 1.0, 1.0, 1.0]);
-                    }
-                }
-                Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size: [64.0, 64.0] })
-            }
-            fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-                None
-            }
-            fn params_at(&self, t: f64) -> Option<Params> {
-                // Colour animates from red (born at 0) to green (born later).
-                let s = crate::find("ec.generate.radiowaves").unwrap();
-                let mut p = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-                p.values.insert("producerPoint".into(), Value::Vec2([32.0, 32.0]));
-                p.values.insert("waveMotion/frequency".into(), num(1.0));
-                p.values.insert("waveMotion/expansion".into(), num(20.0));
-                p.values.insert("waveStroke/color".into(), if t < 0.5 { col(1.0, 0.0, 0.0) } else { col(0.0, 1.0, 0.0) });
-                Some(p)
-            }
-        }
-        let env = crate::EffectEnv { host: Some(&Src), ..Default::default() };
-        let ic = rw(
-            &[
-                ("waveType", Value::Enum(1)),
-                ("imageContour/sourceLayer", Value::Layer(Some(1))),
-                ("imageContour/preBlur", num(0.0)),
-                ("imageContour/tolerance", num(0.0)),
-            ],
-            0.1,
-            env,
-        );
-        assert!(ic.get(47, 32)[3] > 0.9 && ic.get(32, 32)[3] < 0.01, "{:?}", ic.get(47, 32));
-        // Source Center off the square shifts the contour onto the producer point accordingly.
-        let sh = rw(
-            &[
-                ("waveType", Value::Enum(1)),
-                ("imageContour/sourceLayer", Value::Layer(Some(1))),
-                ("imageContour/sourceCenter", Value::Vec2([22.0, 32.0])),
-                ("imageContour/preBlur", num(0.0)),
-                ("imageContour/tolerance", num(0.0)),
-            ],
-            0.1,
-            env,
-        );
-        assert!(sh.get(57, 32)[3] > 0.9, "{:?}", sh.get(57, 32));
-        // Profile: Taper Both thins the stroke edges; Square is solid across.
-        let wide = [("waveStroke/startWidth", num(10.0)), ("waveStroke/endWidth", num(10.0))];
-        let sqr = rw(&wide, 0.2, crate::EffectEnv::default());
-        let mut tap = wide.to_vec();
-        tap.push(("waveStroke/profile", Value::Enum(3)));
-        let tap = rw(&tap, 0.2, crate::EffectEnv::default());
-        assert!(sqr.get(55, 32)[3] > 0.9 && tap.get(55, 32)[3] < 0.6, "{:?} {:?}", sqr.get(55, 32), tap.get(55, 32));
-        assert!(tap.get(52, 32)[3] > 0.8);
-        // Reflection: a fast wave bounces back off the right edge.
-        let fast = [("waveMotion/velocity", num(200.0)), ("waveMotion/expansion", num(10.0))];
-        let gone = rw(&fast, 0.3, crate::EffectEnv::default());
-        let mut rf = fast.to_vec();
-        rf.push(("waveMotion/reflection", Value::Bool(true)));
-        let back = rw(&rf, 0.3, crate::EffectEnv::default());
-        let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
-        assert!(sum(&back) > sum(&gone) + 5.0, "{} vs {}", sum(&back), sum(&gone));
-        // Parameters Are Set At Birth: the older wave keeps red, the newer one is green.
-        let both = rw(&[("parametersAreSetAt", Value::Enum(0)), ("waveMotion/frequency", num(1.0)), ("waveMotion/expansion", num(20.0))], 1.15, env);
-        let (old, new) = (both.get(55, 32), both.get(35, 32));
-        assert!(old[0] > 0.9 && old[1] < 0.1, "{old:?}");
-        assert!(new[1] > 0.9 && new[0] < 0.1, "{new:?}");
-    }
-
-    #[test]
-    fn cell_pattern_hq_variants_antialias() {
-        let s = crate::find("ec.generate.cellpattern").unwrap();
-        let r = |pat: u32| {
-            let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-            params.values.insert("cellPattern".into(), Value::Enum(pat));
-            params.values.insert("size".into(), num(12.0));
-            let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: Default::default() };
-            crate::apply(s, &ctx, Buf { img: Image::new(48, 48), offset: [0.0; 2], scale: 1.0 }).img
-        };
-        let distinct = |img: &Image| {
-            let mut v: Vec<u32> = img.data.iter().map(|p| (p[0] * 10000.0) as u32).collect();
-            v.sort_unstable();
-            v.dedup();
-            v.len()
-        };
-        let (std, hq) = (r(4), r(9));
-        assert_eq!(CELL_PATTERNS[9], "Crystallize HQ");
-        assert_ne!(std, hq);
-        assert!(distinct(&hq) > distinct(&std) * 2, "{} vs {}", distinct(&hq), distinct(&std));
-    }
-}
+mod tests;
diff --git a/crates/effects/src/generate2/tests.rs b/crates/effects/src/generate2/tests.rs
new file mode 100644
index 000000000..c2acff446
--- /dev/null
+++ b/crates/effects/src/generate2/tests.rs
@@ -0,0 +1,309 @@
+use super::*;
+use crate::Params;
+use effectcraft_raster::Image;
+
+fn run(id: &str, set: &[(&str, Value)], img: Image) -> Buf {
+    let s = crate::find(id).unwrap();
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    let ls = [img.width as f64, img.height as f64];
+    for p in &s.params {
+        if let (ParamUi::Point, Value::Vec2(v)) = (&p.ui, &p.default) {
+            params.values.insert(p.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
+        }
+    }
+    for (k, v) in set {
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let ctx = EffectCtx { params: &params, time: 0.5, layer_size: ls, seed: 3, adjustment: false, env: Default::default() };
+    crate::apply(s, &ctx, Buf { img, offset: [0.0, 0.0], scale: 1.0 })
+}
+
+#[test]
+fn cell_pattern_is_deterministic_and_seeded() {
+    let a = run("ec.generate.cellpattern", &[("size", num(10.0))], Image::new(40, 30));
+    let b2 = run("ec.generate.cellpattern", &[("size", num(10.0))], Image::new(40, 30));
+    assert_eq!(a.img, b2.img);
+    let c = run("ec.generate.cellpattern", &[("size", num(10.0)), ("evolutionOptions/randomSeed", num(5.0))], Image::new(40, 30));
+    assert_ne!(a.img, c.img);
+    assert!(a.img.data.iter().all(|p| p[3] == 1.0 && (0.0..=1.0).contains(&p[0])));
+}
+
+#[test]
+fn ellipse_ring_coverage() {
+    let o = run("ec.generate.ellipse", &[("width", num(40.0)), ("height", num(40.0)), ("thickness", num(6.0))], Image::new(64, 64));
+    // Ring passes through (32 + 20, 32); centre is empty.
+    assert!(o.img.get(51, 32)[3] > 0.9, "{:?}", o.img.get(51, 32));
+    assert!(o.img.get(32, 32)[3] < 1e-3);
+    assert!(o.img.get(2, 2)[3] < 1e-3);
+}
+
+#[test]
+fn lightning_is_deterministic_per_conductivity() {
+    let a = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
+    let b2 = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
+    assert_eq!(a.img, b2.img);
+    assert!(a.img.data.iter().any(|p| p[3] > 0.5));
+    let c = run("ec.generate.advancedlightning", &[("conductivityState", num(11.0))], Image::new(64, 48));
+    assert_ne!(a.img, c.img);
+}
+
+#[test]
+fn beam_draws_between_points() {
+    let o = run("ec.generate.beam", &[("length", num(100.0)), ("softness", num(0.0))], Image::new(64, 32));
+    assert!(o.img.get(32, 16)[3] > 0.99);
+    assert!(o.img.get(32, 2)[3] < 1e-3);
+    assert!(o.img.get(2, 16)[3] < 1e-3);
+}
+
+#[test]
+fn cell_pattern_tiles() {
+    // 4×4-cell tiles of 8 px: the pattern repeats every 32 px.
+    let set = [
+        ("size", num(8.0)),
+        ("tilingOptions/enableTiling", Value::Bool(true)),
+        ("tilingOptions/cellsHorizontal", num(4.0)),
+        ("tilingOptions/cellsVertical", num(4.0)),
+    ];
+    let o = run("ec.generate.cellpattern", &set, Image::new(64, 64));
+    for (x, y) in [(3, 5), (10, 20), (17, 2)] {
+        let (a, b2) = (o.img.get(x, y), o.img.get(x + 32, y + 32));
+        assert!((a[0] - b2[0]).abs() < 1e-4, "{x},{y}: {a:?} vs {b2:?}");
+    }
+}
+
+#[test]
+fn radio_waves_expansion_velocity_and_star() {
+    let r = |set: &[(&str, Value)], t: f64| {
+        let s = crate::find("ec.generate.radiowaves").unwrap();
+        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+        params.values.insert("producerPoint".into(), Value::Vec2([32.0, 32.0]));
+        for (k, v) in set {
+            params.values.insert(k.to_string(), v.clone());
+        }
+        let ctx = EffectCtx { params: &params, time: t, layer_size: [64.0, 64.0], seed: 3, adjustment: false, env: Default::default() };
+        crate::apply(s, &ctx, Buf { img: Image::new(64, 64), offset: [0.0, 0.0], scale: 1.0 })
+    };
+    // One wave born at t = 0, 0.2 s old: radius = Expansion × age = 20 px.
+    let base = [("waveMotion/expansion", num(100.0)), ("waveMotion/frequency", num(0.5))];
+    let o = r(&base, 0.2);
+    assert!(o.img.get(52, 32)[3] > 0.9, "{:?}", o.img.get(52, 32));
+    assert!(o.img.get(32, 32)[3] < 0.01);
+    // Velocity moves the wave toward Direction (90° = right).
+    let mut moving = base.to_vec();
+    moving.push(("waveMotion/velocity", num(50.0)));
+    let o = r(&moving, 0.2);
+    assert!(o.img.get(62, 32)[3] > 0.9 && o.img.get(52, 32)[3] < 0.5, "{:?}", o.img.get(62, 32));
+    // A 4-point star: the outline dips toward the centre between the points.
+    let mut star = base.to_vec();
+    star.extend([("polygon/sides", num(4.0)), ("polygon/star", Value::Bool(true)), ("polygon/starDepth", num(-0.5))]);
+    let o = r(&star, 0.2);
+    assert!(o.img.get(32, 12)[3] > 0.9, "point straight up");
+    // Between points (45°) the outline sits near half the radius.
+    assert!(o.img.get(39, 24)[3] > 0.5, "{:?}", o.img.get(39, 24));
+    assert!(o.img.get(46, 18)[3] < 0.01, "no circle there");
+}
+
+#[test]
+fn lightning_alpha_obstacle_and_expert_settings() {
+    let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
+    let alpha_in = |img: &Image, src: &Image| img.data.iter().zip(&src.data).filter(|(_, s)| s[3] > 0.5).map(|(p, _)| p[3]).sum::<f32>();
+    // A wall of opaque pixels across the middle of the bolt's path.
+    let mut wall = Image::new(64, 48);
+    for y in 0..48 {
+        for x in 0..64 {
+            if (18..30).contains(&y) && x < 50 {
+                wall.set(x, y, [0.0, 0.0, 0.0, 1.0]);
+            }
+        }
+    }
+    let opts =
+        |o: f64| vec![("alphaObstacle", num(o)), ("compositeOnOriginal", Value::Bool(false)), ("glowSettings/glowRadius", num(0.0)), ("forking", num(60.0))];
+    let free = run("ec.generate.advancedlightning", &opts(0.0), wall.clone());
+    let avoid = run("ec.generate.advancedlightning", &opts(10.0), wall.clone());
+    assert!(alpha_in(&avoid.img, &wall) < alpha_in(&free.img, &wall), "{} vs {}", alpha_in(&avoid.img, &wall), alpha_in(&free.img, &wall));
+    // Fractal Type, Core Drain, Fork Strength, Termination Threshold, Min Fork Distance.
+    let base = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
+    for (id, v) in [
+        ("expertSettings/fractalType", Value::Enum(2)),
+        ("expertSettings/coreDrain", num(100.0)),
+        ("expertSettings/forkStrength", num(100.0)),
+        ("expertSettings/forkVariation", num(100.0)),
+    ] {
+        assert_ne!(run("ec.generate.advancedlightning", &[(id, v)], Image::new(64, 48)).img, base.img, "{id}");
+    }
+    let drained = run("ec.generate.advancedlightning", &[("expertSettings/coreDrain", num(100.0))], Image::new(64, 48));
+    assert!(sum(&drained.img) < sum(&base.img));
+    let no_forks = run("ec.generate.advancedlightning", &[("expertSettings/minForkDistance", num(1000.0))], Image::new(64, 48));
+    let term = run("ec.generate.advancedlightning", &[("expertSettings/terminationThreshold", num(100.0))], Image::new(64, 48));
+    assert_eq!(no_forks.img, term.img, "no forks either way");
+    assert!(sum(&no_forks.img) < sum(&base.img));
+}
+
+#[test]
+fn lightning_types_and_decay_main_core() {
+    let a = run("ec.generate.advancedlightning", &[], Image::new(64, 48));
+    let strike = run("ec.generate.advancedlightning", &[("lightningType", Value::Enum(1))], Image::new(64, 48));
+    assert_eq!(a.img, strike.img, "Strike is the default");
+    for t in 0..8 {
+        let o = run("ec.generate.advancedlightning", &[("lightningType", Value::Enum(t))], Image::new(64, 48));
+        assert!(o.img.data.iter().any(|p| p[3] > 0.3), "type {t} draws");
+    }
+    let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
+    let d = run("ec.generate.advancedlightning", &[("decayMainCore", Value::Bool(true)), ("decay", num(0.9))], Image::new(64, 48));
+    let n = run("ec.generate.advancedlightning", &[("decay", num(0.9))], Image::new(64, 48));
+    assert!(sum(&d.img) < sum(&n.img));
+}
+
+#[test]
+fn beam_3d_perspective_controls_thickness() {
+    // Short beam near the start: with 3D Perspective its thickness comes from its position
+    // (thin, near the start); without, its head takes the full ending thickness.
+    let set = |p: bool| {
+        vec![
+            ("length", num(20.0)),
+            ("time", num(0.0)),
+            ("softness", num(0.0)),
+            ("startThickness", num(2.0)),
+            ("endThickness", num(20.0)),
+            ("perspective3d", Value::Bool(p)),
+        ]
+    };
+    let on = run("ec.generate.beam", &set(true), Image::new(64, 32));
+    let off = run("ec.generate.beam", &set(false), Image::new(64, 32));
+    let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
+    assert!(sum(&off.img) > sum(&on.img) * 1.5, "{} {}", sum(&off.img), sum(&on.img));
+}
+
+#[test]
+fn lens_flare_brightest_at_center() {
+    let o = run("ec.generate.lensflare", &[], Image::new(64, 64));
+    let c = o.img.get(16, 16)[0];
+    assert!(c > o.img.get(60, 4)[0]);
+    assert!(c > 0.5);
+}
+
+fn rw(set: &[(&str, Value)], t: f64, env: crate::EffectEnv) -> Image {
+    let mut v: Vec<(&str, Value)> =
+        vec![("producerPoint", Value::Vec2([32.0, 32.0])), ("waveMotion/frequency", num(0.5)), ("waveMotion/expansion", num(100.0))];
+    v.extend_from_slice(set);
+    crate::run_fx("ec.generate.radiowaves", &v, Image::new(64, 64), t, env).img
+}
+
+#[test]
+fn signed_distance_of_a_square() {
+    let (w, h) = (20, 20);
+    let inside: Vec<bool> = (0..w * h).map(|i| (5..15).contains(&(i % w)) && (5..15).contains(&(i / w))).collect();
+    let d = crate::util::signed_distance(&inside, w, h);
+    assert!((d.get(10, 10) + 4.5).abs() < 1e-4, "{}", d.get(10, 10));
+    assert!((d.get(0, 10) - 4.5).abs() < 1e-4, "{}", d.get(0, 10));
+    assert!((d.get(0, 0) - (50f32.sqrt() - 0.5)).abs() < 1e-4);
+}
+
+#[test]
+fn radio_waves_mask_contours_profile_reflection_and_birth() {
+    // Mask waves: a 10×10 square mask; after 0.1 s (10 px) the wave is 10 px outside it.
+    let sq = crate::MaskShape { name: String::new(), points: vec![[27.0, 27.0], [37.0, 27.0], [37.0, 37.0], [27.0, 37.0]], closed: true, inverted: false };
+    let masks = [sq];
+    let env = crate::EffectEnv { masks: &masks, ..Default::default() };
+    let m = rw(&[("waveType", Value::Enum(2)), ("waveMask/mask", num(1.0))], 0.1, env);
+    assert!(m.get(47, 32)[3] > 0.9, "{:?}", m.get(47, 32));
+    assert!(m.get(32, 32)[3] < 0.01 && m.get(40, 32)[3] < 0.01);
+    // Rounded corner: diagonal distance 10 from (37, 37).
+    assert!(m.get(44, 44)[3] > 0.5, "{:?}", m.get(44, 44));
+    // No mask chosen: nothing drawn.
+    assert!(rw(&[("waveType", Value::Enum(2))], 0.1, env).data.iter().all(|p| p[3] == 0.0));
+    // Image Contours: the bright square of a source layer.
+    struct Src;
+    impl crate::EffectHost for Src {
+        fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
+            let mut img = Image::new(64, 64);
+            for y in 27..37 {
+                for x in 27..37 {
+                    img.set(x, y, [1.0, 1.0, 1.0, 1.0]);
+                }
+            }
+            Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size: [64.0, 64.0] })
+        }
+        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+            None
+        }
+        fn params_at(&self, t: f64) -> Option<Params> {
+            // Colour animates from red (born at 0) to green (born later).
+            let s = crate::find("ec.generate.radiowaves").unwrap();
+            let mut p = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+            p.values.insert("producerPoint".into(), Value::Vec2([32.0, 32.0]));
+            p.values.insert("waveMotion/frequency".into(), num(1.0));
+            p.values.insert("waveMotion/expansion".into(), num(20.0));
+            p.values.insert("waveStroke/color".into(), if t < 0.5 { col(1.0, 0.0, 0.0) } else { col(0.0, 1.0, 0.0) });
+            Some(p)
+        }
+    }
+    let env = crate::EffectEnv { host: Some(&Src), ..Default::default() };
+    let ic = rw(
+        &[
+            ("waveType", Value::Enum(1)),
+            ("imageContour/sourceLayer", Value::Layer(Some(1))),
+            ("imageContour/preBlur", num(0.0)),
+            ("imageContour/tolerance", num(0.0)),
+        ],
+        0.1,
+        env,
+    );
+    assert!(ic.get(47, 32)[3] > 0.9 && ic.get(32, 32)[3] < 0.01, "{:?}", ic.get(47, 32));
+    // Source Center off the square shifts the contour onto the producer point accordingly.
+    let sh = rw(
+        &[
+            ("waveType", Value::Enum(1)),
+            ("imageContour/sourceLayer", Value::Layer(Some(1))),
+            ("imageContour/sourceCenter", Value::Vec2([22.0, 32.0])),
+            ("imageContour/preBlur", num(0.0)),
+            ("imageContour/tolerance", num(0.0)),
+        ],
+        0.1,
+        env,
+    );
+    assert!(sh.get(57, 32)[3] > 0.9, "{:?}", sh.get(57, 32));
+    // Profile: Taper Both thins the stroke edges; Square is solid across.
+    let wide = [("waveStroke/startWidth", num(10.0)), ("waveStroke/endWidth", num(10.0))];
+    let sqr = rw(&wide, 0.2, crate::EffectEnv::default());
+    let mut tap = wide.to_vec();
+    tap.push(("waveStroke/profile", Value::Enum(3)));
+    let tap = rw(&tap, 0.2, crate::EffectEnv::default());
+    assert!(sqr.get(55, 32)[3] > 0.9 && tap.get(55, 32)[3] < 0.6, "{:?} {:?}", sqr.get(55, 32), tap.get(55, 32));
+    assert!(tap.get(52, 32)[3] > 0.8);
+    // Reflection: a fast wave bounces back off the right edge.
+    let fast = [("waveMotion/velocity", num(200.0)), ("waveMotion/expansion", num(10.0))];
+    let gone = rw(&fast, 0.3, crate::EffectEnv::default());
+    let mut rf = fast.to_vec();
+    rf.push(("waveMotion/reflection", Value::Bool(true)));
+    let back = rw(&rf, 0.3, crate::EffectEnv::default());
+    let sum = |i: &Image| i.data.iter().map(|p| p[3]).sum::<f32>();
+    assert!(sum(&back) > sum(&gone) + 5.0, "{} vs {}", sum(&back), sum(&gone));
+    // Parameters Are Set At Birth: the older wave keeps red, the newer one is green.
+    let both = rw(&[("parametersAreSetAt", Value::Enum(0)), ("waveMotion/frequency", num(1.0)), ("waveMotion/expansion", num(20.0))], 1.15, env);
+    let (old, new) = (both.get(55, 32), both.get(35, 32));
+    assert!(old[0] > 0.9 && old[1] < 0.1, "{old:?}");
+    assert!(new[1] > 0.9 && new[0] < 0.1, "{new:?}");
+}
+
+#[test]
+fn cell_pattern_hq_variants_antialias() {
+    let s = crate::find("ec.generate.cellpattern").unwrap();
+    let r = |pat: u32| {
+        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+        params.values.insert("cellPattern".into(), Value::Enum(pat));
+        params.values.insert("size".into(), num(12.0));
+        let ctx = EffectCtx { params: &params, time: 0.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: Default::default() };
+        crate::apply(s, &ctx, Buf { img: Image::new(48, 48), offset: [0.0; 2], scale: 1.0 }).img
+    };
+    let distinct = |img: &Image| {
+        let mut v: Vec<u32> = img.data.iter().map(|p| (p[0] * 10000.0) as u32).collect();
+        v.sort_unstable();
+        v.dedup();
+        v.len()
+    };
+    let (std, hq) = (r(4), r(9));
+    assert_eq!(CELL_PATTERNS[9], "Crystallize HQ");
+    assert_ne!(std, hq);
+    assert!(distinct(&hq) > distinct(&std) * 2, "{} vs {}", distinct(&hq), distinct(&std));
+}
diff --git a/crates/effects/src/generate3.rs b/crates/effects/src/generate3.rs
index 6beec4cb7..a61c3f769 100644
--- a/crates/effects/src/generate3.rs
+++ b/crates/effects/src/generate3.rs
@@ -17,2430 +17,26 @@ use rayon::prelude::*;
 use crate::util::{Plane, gauss_plane, hash1, layer_or_self, morph_frac, poly_length, premul, smoothstep, unpremul};
 use crate::{Buf, EffectCtx, EffectSpec, Params, col, num, p, popup, slider};
 
-fn spec(id: &'static str, name: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
-    EffectSpec { id, name, category: "Generate", params, render, gpu: false, float: true }
-}
-
-fn pt(x: f64, y: f64) -> Value {
-    Value::Vec2([x, y])
-}
-
-fn pct() -> ParamUi {
-    slider(0.0, 100.0, 0.0, 100.0, 1)
-}
-
-// ---------------------------------------------------------------- shared rasterisation
-
-/// A round-capped line segment in buffer pixels with radius `r` and intensity `v`.
-#[derive(Clone, Copy, Debug)]
-pub struct Seg {
-    pub a: [f64; 2],
-    pub b: [f64; 2],
-    pub r: f64,
-    pub v: f32,
-}
-
-/// Rasterise segments into a coverage plane (max-combined). `hardness` (0..1) is the fraction
-/// of the radius that is fully opaque; the rest falls off smoothly.
-pub(crate) fn raster_segs(w: usize, h: usize, segs: &[Seg], hardness: f64) -> Plane {
-    let mut out = Plane::new(w, h);
-    if w == 0 || h == 0 || segs.is_empty() {
-        return out;
-    }
-    let mut buckets: Vec<Vec<u32>> = vec![Vec::new(); h];
-    for (i, s) in segs.iter().enumerate() {
-        let pad = s.r + 1.0;
-        let y0 = (s.a[1].min(s.b[1]) - pad).floor().max(0.0) as usize;
-        let y1 = (s.a[1].max(s.b[1]) + pad).ceil().min(h as f64);
-        if y1 <= 0.0 || y0 >= h {
-            continue;
-        }
-        for row in buckets.iter_mut().take(y1 as usize).skip(y0) {
-            row.push(i as u32);
-        }
-    }
-    let hard = hardness.clamp(0.0, 1.0);
-    out.data.par_chunks_mut(w).enumerate().for_each(|(y, row)| {
-        let py = y as f64 + 0.5;
-        for &i in &buckets[y] {
-            let s = segs[i as usize];
-            let pad = s.r + 1.0;
-            let x0 = (s.a[0].min(s.b[0]) - pad).floor().max(0.0) as usize;
-            let x1 = ((s.a[0].max(s.b[0]) + pad).ceil().max(0.0) as usize).min(w);
-            let (dx, dy) = (s.b[0] - s.a[0], s.b[1] - s.a[1]);
-            let l2 = dx * dx + dy * dy;
-            let inner = s.r * hard - 0.5;
-            let outer = s.r + 0.5;
-            for (x, o) in row.iter_mut().enumerate().take(x1).skip(x0) {
-                let px = x as f64 + 0.5;
-                let t = if l2 > 1e-12 { (((px - s.a[0]) * dx + (py - s.a[1]) * dy) / l2).clamp(0.0, 1.0) } else { 0.0 };
-                let d = ((px - s.a[0] - dx * t).powi(2) + (py - s.a[1] - dy * t).powi(2)).sqrt();
-                if d >= outer {
-                    continue;
-                }
-                let c = if d <= inner { 1.0 } else { 1.0 - smoothstep(inner as f32, outer as f32, d as f32) } * s.v;
-                if c > *o {
-                    *o = c;
-                }
-            }
-        }
-    });
-    out
-}
-
-/// Segments along a polyline (buffer px).
-pub fn poly_segs(pts: &[[f64; 2]], closed: bool, r: f64, v: f32, out: &mut Vec<Seg>) {
-    let n = pts.len();
-    if n == 1 {
-        out.push(Seg { a: pts[0], b: pts[0], r, v });
-    }
-    if n < 2 {
-        return;
-    }
-    let segs = if closed { n } else { n - 1 };
-    for i in 0..segs {
-        out.push(Seg { a: pts[i], b: pts[(i + 1) % n], r, v });
-    }
-}
-
-/// Portion `[s0, s1]` (arc length) of a polyline.
-pub(crate) fn trim_poly(pts: &[[f64; 2]], closed: bool, s0: f64, s1: f64) -> Vec<[f64; 2]> {
-    let n = pts.len();
-    let mut out = Vec::new();
-    if n < 2 || s1 <= s0 {
-        return out;
-    }
-    let segs = if closed { n } else { n - 1 };
-    let mut acc = 0.0;
-    for i in 0..segs {
-        let (a, b) = (pts[i], pts[(i + 1) % n]);
-        let l = ((b[0] - a[0]).powi(2) + (b[1] - a[1]).powi(2)).sqrt();
-        let (e0, e1) = (acc, acc + l);
-        acc = e1;
-        if e1 < s0 || e0 > s1 || l <= 0.0 {
-            continue;
-        }
-        let at = |s: f64| {
-            let t = ((s - e0) / l).clamp(0.0, 1.0);
-            [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t]
-        };
-        let p0 = at(s0.max(e0));
-        if out.last() != Some(&p0) {
-            out.push(p0);
-        }
-        out.push(at(s1.min(e1)));
-    }
-    out
-}
-
-/// How painted coverage meets the layer: 0 On Original Image, 1 On Transparent, 2 Reveal
-/// Original Image.
-pub(crate) fn paint(img: &mut Image, cov: &Plane, color: [f32; 4], opacity: f32, style: u32) {
-    img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
-        let a = (c * opacity * color[3]).clamp(0.0, 1.0);
-        let s = [color[0] * a, color[1] * a, color[2] * a, a];
-        *px = match style {
-            1 => s,
-            2 => [px[0] * a, px[1] * a, px[2] * a, px[3] * a],
-            _ => over(*px, s),
-        };
-    });
-}
-
-/// Coverage of a plan-drawn generator: round-capped segments rasterised by [`raster_segs`]
-/// with `hardness`, or the union of convex polygons ([`raster_convex`]).
-#[derive(Clone, Debug)]
-pub enum Coverage {
-    Segs { segs: Vec<Seg>, hardness: f64 },
-    Convex(Vec<Vec<[f64; 2]>>),
-}
-
-impl Coverage {
-    fn raster(&self, w: usize, h: usize) -> Plane {
-        match self {
-            Coverage::Segs { segs, hardness } => raster_segs(w, h, segs, *hardness),
-            Coverage::Convex(polys) => raster_convex(w, h, polys),
-        }
-    }
-}
-
-/// Stroke, Scribble, Vegas and Write-on, shared with the GPU compositor (effectcraft-gpu
-/// `fx_gen2`): the coverage and how it is painted. `style` 0–2 as [`paint`] (On Original
-/// Image, On Transparent, Reveal Original Image), 3 = under the layer (Vegas' Composite Under).
-#[derive(Clone, Debug)]
-pub struct PaintPlan {
-    pub cov: Coverage,
-    pub color: [f32; 4],
-    pub opacity: f32,
-    pub style: u32,
-}
-
-/// Draw a [`PaintPlan`].
-fn draw_paint(b: &mut Buf, plan: &PaintPlan) {
-    let cov = plan.cov.raster(b.img.width as usize, b.img.height as usize);
-    if plan.style == 3 {
-        let color = plan.color;
-        b.img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
-            let a = c * color[3];
-            *px = over([color[0] * a, color[1] * a, color[2] * a, a], *px);
-        });
-    } else {
-        paint(&mut b.img, &cov, plan.color, plan.opacity, plan.style);
-    }
-}
-
-/// Generators drawn from a plan that need the layer's own pixels (`b.img`) to build it.
-pub fn plan_reads_pixels(id: &str, ctx: &EffectCtx) -> bool {
-    match id {
-        // Image Contours read the layer itself when no (resolvable) Input Layer is chosen.
-        "ec.generate.vegas" => ctx.params.e("stroke") == 0,
-        "ec.generate.paintbucket" | "ec.generate.eyedropperfill" => true,
-        "ec.generate.advancedlightning" => ctx.params.f("alphaObstacle").clamp(-10.0, 10.0) != 0.0,
-        _ => false,
-    }
-}
-
-/// [`PaintPlan`] of Stroke, Scribble, Vegas or Write-on on `b`'s geometry (`b.img` is read
-/// only when [`plan_reads_pixels`]). `None`: Scribble without a usable mask (the layer is
-/// cleared when it composites On Transparent, else kept).
-pub fn paint_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PaintPlan> {
-    match id {
-        "ec.generate.stroke" => Some(stroke_plan(ctx, b)),
-        "ec.generate.scribble" => scribble_plan(ctx, b),
-        "ec.generate.vegas" => Some(vegas_plan(ctx, b)),
-        "ec.generate.writeon" => Some(write_on_plan(ctx, b)),
-        _ => None,
-    }
-}
-
-/// Scribble's Composite as a [`paint`] style.
-pub fn scribble_style(ctx: &EffectCtx) -> u32 {
-    match ctx.params.e("composite") {
-        0 => 0,
-        2 => 2,
-        _ => 1,
-    }
-}
-
-#[inline]
-fn over(dst: Px, src: Px) -> Px {
-    let k = 1.0 - src[3];
-    [src[0] + dst[0] * k, src[1] + dst[1] * k, src[2] + dst[2] * k, src[3] + dst[3] * k]
-}
-
-/// Mask `idx` (1-based; 0 = none) mapped to buffer pixels.
-pub(crate) fn mask_px(ctx: &EffectCtx, b: &Buf, idx: usize) -> Option<(Vec<[f64; 2]>, bool, bool)> {
-    let m = ctx.env.masks.get(idx.checked_sub(1)?)?;
-    if m.points.is_empty() {
-        return None;
-    }
-    Some((m.points.iter().map(|&q| [q[0] * b.scale + b.offset[0], q[1] * b.scale + b.offset[1]]).collect(), m.closed, m.inverted))
-}
-
-/// All masks mapped to buffer pixels.
-fn all_masks_px(ctx: &EffectCtx, b: &Buf) -> Vec<(Vec<[f64; 2]>, bool, bool)> {
-    (1..=ctx.env.masks.len()).filter_map(|i| mask_px(ctx, b, i)).collect()
-}
-
-/// Chaikin corner cutting (open polyline, endpoints kept).
-fn chaikin(pts: &[[f64; 2]], iters: usize) -> Vec<[f64; 2]> {
-    let mut cur = pts.to_vec();
-    for _ in 0..iters {
-        if cur.len() < 3 {
-            return cur;
-        }
-        let mut nx = Vec::with_capacity(cur.len() * 2);
-        nx.push(cur[0]);
-        for w in cur.windows(2) {
-            let (a, b) = (w[0], w[1]);
-            nx.push([a[0] * 0.75 + b[0] * 0.25, a[1] * 0.75 + b[1] * 0.25]);
-            nx.push([a[0] * 0.25 + b[0] * 0.75, a[1] * 0.25 + b[1] * 0.75]);
-        }
-        nx.push(*cur.last().unwrap_or(&[0.0; 2]));
-        cur = nx;
-    }
-    cur
-}
-
-// ---------------------------------------------------------------- Fractal
-
-#[derive(Clone, Copy)]
-struct FracSet {
-    /// Mandelbrot iterations start at the Julia centre (the "Over Julia" set choices).
-    over_julia: bool,
-    julia: bool,
-    inverse: bool,
-}
-
-/// Smooth escape count, or `None` inside the set.
-fn escape(z0: (f64, f64), c: (f64, f64), power: u32, limit: f64, max_iter: u32) -> Option<f64> {
-    let (mut x, mut y) = z0;
-    let lim2 = limit * limit;
-    for i in 0..max_iter {
-        let (nx, ny) = match power {
-            3 => (x * x * x - 3.0 * x * y * y, 3.0 * x * x * y - y * y * y),
-            4 => {
-                let (a, b) = (x * x - y * y, 2.0 * x * y);
-                (a * a - b * b, 2.0 * a * b)
-            }
-            _ => (x * x - y * y, 2.0 * x * y),
-        };
-        x = nx + c.0;
-        y = ny + c.1;
-        let m2 = x * x + y * y;
-        if m2 > lim2 {
-            let lz = m2.ln() * 0.5;
-            let nu = (lz / limit.max(1.0001).ln()).max(1e-9).ln() / (power as f64).ln();
-            return Some((i as f64 + 1.0 - nu).max(0.0));
-        }
-    }
-    None
-}
-
-/// Fractal Set Choice options.
-pub(crate) const FRACTAL_SETS: [&str; 6] =
-    ["Mandelbrot", "Mandelbrot Inverse", "Mandelbrot Over Julia", "Mandelbrot Inverse Over Julia", "Julia", "Julia Inverse"];
-/// Fractal Palette options.
-pub(crate) const FRACTAL_PALETTES: [&str; 4] = ["Lightness Gradient", "Hue Wheel", "Black And White", "Solid Color"];
-/// Fractal Oversample Method options.
-pub(crate) const FRACTAL_OVERSAMPLE: [&str; 2] = ["Edge Detect-Fast-May Miss Pixels", "Brute Force-Slow-Every Pixel"];
-
-fn fractal(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let set_choice = pr.e("setChoice");
-    let power = 2 + pr.e("equation").min(2);
-    let mc = (pr.f("mandelbrot/mandelbrotX"), pr.f("mandelbrot/mandelbrotY"));
-    let mmag = pr.f("mandelbrot/mandelbrotMagnification");
-    let mlim = pr.f("mandelbrot/mandelbrotEscapeLimit").max(1.01);
-    let jc = (pr.f("julia/juliaX"), pr.f("julia/juliaY"));
-    let jmag = pr.f("julia/juliaMagnification");
-    let jlim = pr.f("julia/juliaEscapeLimit").max(1.01);
-    let post = (pr.f("postInversionOffset/postInversionX"), pr.f("postInversionOffset/postInversionY"));
-    let overlay = pr.b("fractalColor/overlay");
-    let transparency = pr.b("fractalColor/transparency");
-    let transparent_inside = transparency || overlay;
-    let palette = pr.e("fractalColor/palette");
-    let hue = (pr.f("fractalColor/hue") / 360.0) as f32;
-    let steps = pr.f("fractalColor/cycleSteps").max(1.0);
-    let cyc_off = pr.f("fractalColor/cycleOffset") / 360.0;
-    let edge = pr.b("fractalColor/edgeHighlight");
-    let every = pr.e("highQualitySettings/samplingMethod") == 1;
-    let factor = pr.f("highQualitySettings/samplingFactor").round().clamp(1.0, 9.0) as usize;
-    let (w, h) = (b.img.width as usize, b.img.height as usize);
-    let lw = ctx.layer_size[0].max(1.0);
-    let lh = ctx.layer_size[1].max(1.0);
-    let inv = 1.0 / b.scale.max(1e-9);
-    let (off_x, off_y) = (b.offset[0], b.offset[1]);
-    // FRACTAL_SETS order.
-    let set = |julia, inverse, over_julia| FracSet { over_julia, julia, inverse };
-    let sets: (FracSet, Option<FracSet>) = match set_choice {
-        1 => (set(false, true, false), None),
-        2 => (set(false, false, true), None),
-        3 => (set(false, true, true), None),
-        4 => (set(true, false, false), None),
-        5 => (set(true, true, false), None),
-        _ => (set(false, false, false), None),
-    };
-    let iter_for = |mag: f64| (96.0 + 48.0 * mag.max(0.0)).clamp(64.0, 3000.0) as u32;
-    let eval_set = |s: FracSet, lx: f64, ly: f64| -> Option<f64> {
-        let (center, mag, lim) = if s.julia { (jc, jmag, jlim) } else { (mc, mmag, mlim) };
-        let span = 3.5 / 2f64.powf(mag);
-        let mut u = (lx - lw * 0.5) / lw * span + center.0;
-        let mut v = (ly - lh * 0.5) / lw * span + center.1;
-        if s.inverse {
-            let d = (u * u + v * v).max(1e-12);
-            u = u / d + post.0;
-            v = -v / d + post.1;
-        }
-        if s.julia {
-            escape((u, v), mc, power, lim, iter_for(mag))
-        } else {
-            let z0 = if s.over_julia { jc } else { (0.0, 0.0) };
-            escape(z0, (u, v), power, lim, iter_for(mag))
-        }
-    };
-    let eval = |lx: f64, ly: f64| -> Option<f64> {
-        let a = eval_set(sets.0, lx, ly);
-        match (a, sets.1) {
-            (None, Some(s2)) => eval_set(s2, lx, ly),
-            _ => a,
-        }
-    };
-    let shade = |n: Option<f64>| -> Px {
-        // Solid Color: only the inside of the set is drawn (Transparency flips the sides).
-        if palette == 3 {
-            let (r, g, bl) = hsl_to_rgb(hue, 1.0, 0.5);
-            return if n.is_none() != transparency { [r, g, bl, 1.0] } else { [0.0; 4] };
-        }
-        let Some(n) = n else {
-            return if transparent_inside { [0.0; 4] } else { [0.0, 0.0, 0.0, 1.0] };
-        };
-        let u = n / steps + cyc_off;
-        let band = (u.rem_euclid(1.0)) as f32;
-        let (r, g, bl) = match palette {
-            // Hue Wheel: the full hue circle at full saturation and brightness.
-            1 => hsl_to_rgb((hue + band).rem_euclid(1.0), 1.0, 0.5),
-            // Black And White: alternating bands.
-            2 => {
-                let v = if (u.floor() as i64).rem_euclid(2) == 0 { 0.0 } else { 1.0 };
-                (v, v, v)
-            }
-            // Lightness Gradient: black → hue → white, the hue moving 45° each cycle.
-            _ => hsl_to_rgb((hue + u.floor() as f32 * 0.125).rem_euclid(1.0), 0.85, band.clamp(0.0, 1.0)),
-        };
-        let mut c = [r, g, bl];
-        if edge && n.fract() < 0.12 {
-            c = [c[0] * 0.4 + 0.6, c[1] * 0.4 + 0.6, c[2] * 0.4 + 0.6];
-        }
-        [c[0], c[1], c[2], 1.0]
-    };
-    // First pass: one sample per pixel.
-    let mut first: Vec<Option<f64>> = vec![None; w * h];
-    first.par_chunks_mut(w.max(1)).enumerate().for_each(|(y, row)| {
-        for (x, v) in row.iter_mut().enumerate() {
-            *v = eval((x as f64 + 0.5 - off_x) * inv, (y as f64 + 0.5 - off_y) * inv);
-        }
-    });
-    let src = if overlay { Some(b.img.clone()) } else { None };
-    b.img.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let here = first[y * w + x];
-            let needs_ss = factor > 1
-                && (every || {
-                    let mut diff = false;
-                    for (dx, dy) in [(-1i64, 0i64), (1, 0), (0, -1), (0, 1)] {
-                        let (nx, ny) = (x as i64 + dx, y as i64 + dy);
-                        if nx < 0 || ny < 0 || nx >= w as i64 || ny >= h as i64 {
-                            continue;
-                        }
-                        let o = first[ny as usize * w + nx as usize];
-                        diff |= match (here, o) {
-                            (Some(a), Some(c)) => (a - c).abs() > steps * 0.25,
-                            (None, None) => false,
-                            _ => true,
-                        };
-                    }
-                    diff
-                });
-            let c = if needs_ss {
-                let mut acc = [0.0f32; 4];
-                for sy in 0..factor {
-                    for sx in 0..factor {
-                        let fx = x as f64 + (sx as f64 + 0.5) / factor as f64;
-                        let fy = y as f64 + (sy as f64 + 0.5) / factor as f64;
-                        let s = shade(eval((fx - off_x) * inv, (fy - off_y) * inv));
-                        let a = s[3];
-                        for k in 0..3 {
-                            acc[k] += s[k] * a;
-                        }
-                        acc[3] += a;
-                    }
-                }
-                let n = (factor * factor) as f32;
-                [acc[0] / n, acc[1] / n, acc[2] / n, acc[3] / n]
-            } else {
-                let s = shade(here);
-                [s[0] * s[3], s[1] * s[3], s[2] * s[3], s[3]]
-            };
-            *px = match &src {
-                Some(o) => over(o.data[y * w + x], c),
-                None => c,
-            };
-        }
-    });
-    b
-}
-
-// ---------------------------------------------------------------- Scribble
-
-/// Scan runs (start, end along direction `d`) of the fill region on the line `n·p = s`.
-#[allow(clippy::too_many_arguments)]
-fn scan_runs(polys: &[(Vec<[f64; 2]>, bool, bool)], fill: u32, ew: f64, d: [f64; 2], n: [f64; 2], s: f64, out: &mut Vec<(f64, f64)>) {
-    out.clear();
-    for (pts, _closed, inverted) in polys {
-        let m = pts.len();
-        if m < 2 {
-            continue;
-        }
-        // Crossings: (t along d, |sin| of crossing angle).
-        let mut xs: Vec<(f64, f64)> = Vec::new();
-        for i in 0..m {
-            let (a, b) = (pts[i], pts[(i + 1) % m]);
-            let (na, nb) = (a[0] * n[0] + a[1] * n[1] - s, b[0] * n[0] + b[1] * n[1] - s);
-            if (na > 0.0) == (nb > 0.0) {
-                continue;
-            }
-            let t = na / (na - nb);
-            let q = [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t];
-            let (ex, ey) = (b[0] - a[0], b[1] - a[1]);
-            let el = (ex * ex + ey * ey).sqrt().max(1e-9);
-            let sin = ((ex * n[0] + ey * n[1]) / el).abs().max(0.2);
-            xs.push((q[0] * d[0] + q[1] * d[1], sin));
-        }
-        xs.sort_by(|a, b| a.0.total_cmp(&b.0));
-        // Signed area decides which side is "left".
-        let area: f64 = (0..m).map(|i| pts[i][0] * pts[(i + 1) % m][1] - pts[(i + 1) % m][0] * pts[i][1]).sum();
-        let left_is_inside = area < 0.0;
-        let mode = match fill {
-            4 => {
-                if left_is_inside {
-                    2
-                } else {
-                    3
-                }
-            }
-            5 => {
-                if left_is_inside {
-                    3
-                } else {
-                    2
-                }
-            }
-            f => f,
-        };
-        let mode = if *inverted && mode == 0 { 6 } else { mode };
-        for (k, &(t, sin)) in xs.iter().enumerate() {
-            let entering = k % 2 == 0;
-            let l = ew / sin;
-            match mode {
-                0 if entering && k + 1 < xs.len() => {
-                    out.push((t, xs[k + 1].0));
-                }
-                1 => out.push((t - l * 0.5, t + l * 0.5)),
-                2 => out.push(if entering { (t, t + l) } else { (t - l, t) }),
-                3 => out.push(if entering { (t - l, t) } else { (t, t + l) }),
-                _ => {}
-            }
-        }
-        if mode == 6 {
-            // Inverted Inside: outside of the polygon within the bounds.
-            let lo = pts.iter().map(|q| q[0] * d[0] + q[1] * d[1]).fold(f64::INFINITY, f64::min) - ew;
-            let hi = pts.iter().map(|q| q[0] * d[0] + q[1] * d[1]).fold(f64::NEG_INFINITY, f64::max) + ew;
-            let mut cur = lo;
-            for pair in xs.chunks(2) {
-                out.push((cur, pair[0].0));
-                cur = pair.get(1).map(|v| v.0).unwrap_or(hi);
-            }
-            out.push((cur, hi));
-        }
-    }
-    out.sort_by(|a, b| a.0.total_cmp(&b.0));
-    // Merge overlaps.
-    let mut merged: Vec<(f64, f64)> = Vec::with_capacity(out.len());
-    for &(a, b) in out.iter() {
-        if let Some(last) = merged.last_mut()
-            && a <= last.1
-        {
-            last.1 = last.1.max(b);
-            continue;
-        }
-        merged.push((a, b));
-    }
-    *out = merged;
-}
-
-/// End Cap and Join options (Scribble's Edge Options).
-const END_CAPS: [&str; 3] = ["Round", "Butt", "Projecting"];
-const JOINS: [&str; 3] = ["Round", "Miter", "Bevel"];
-
-/// Convex polygons whose union is the stroke of the polylines `lines` with half width `r`:
-/// one quad per segment, plus the joins (Round discs, Miter wedges up to `miter_limit` × the
-/// half width, Bevel triangles) and the caps (Round discs, Butt none, Projecting square ends).
-pub(crate) fn stroke_outline(lines: &[Vec<[f64; 2]>], r: f64, cap: u32, join: u32, miter_limit: f64) -> Vec<Vec<[f64; 2]>> {
-    let disc = |c: [f64; 2]| -> Vec<[f64; 2]> {
-        (0..16).map(|k| (k as f64 / 16.0 * std::f64::consts::TAU).sin_cos()).map(|(s, co)| [c[0] + co * r, c[1] + s * r]).collect()
-    };
-    let mut out = Vec::new();
-    for l in lines {
-        let pts: Vec<[f64; 2]> = l.iter().copied().fold(Vec::new(), |mut v, p| {
-            if v.last().is_none_or(|q: &[f64; 2]| (q[0] - p[0]).hypot(q[1] - p[1]) > 1e-9) {
-                v.push(p);
-            }
-            v
-        });
-        if pts.len() < 2 {
-            if let (Some(p), 0) = (pts.first(), cap) {
-                out.push(disc(*p));
-            }
-            continue;
-        }
-        let dir = |a: [f64; 2], b: [f64; 2]| {
-            let (dx, dy) = (b[0] - a[0], b[1] - a[1]);
-            let l = dx.hypot(dy).max(1e-12);
-            [dx / l, dy / l]
-        };
-        let n = pts.len();
-        for k in 0..n - 1 {
-            let (mut a, mut b) = (pts[k], pts[k + 1]);
-            let d = dir(a, b);
-            // Projecting caps extend the end segments by the half width.
-            if cap == 2 && k == 0 {
-                a = [a[0] - d[0] * r, a[1] - d[1] * r];
-            }
-            if cap == 2 && k == n - 2 {
-                b = [b[0] + d[0] * r, b[1] + d[1] * r];
-            }
-            let nn = [-d[1] * r, d[0] * r];
-            out.push(vec![[a[0] + nn[0], a[1] + nn[1]], [b[0] + nn[0], b[1] + nn[1]], [b[0] - nn[0], b[1] - nn[1]], [a[0] - nn[0], a[1] - nn[1]]]);
-        }
-        // Joins.
-        for k in 1..n - 1 {
-            let (p, d0, d1) = (pts[k], dir(pts[k - 1], pts[k]), dir(pts[k], pts[k + 1]));
-            let cross = d0[0] * d1[1] - d0[1] * d1[0];
-            if cross.abs() < 1e-9 && d0[0] * d1[0] + d0[1] * d1[1] > 0.0 {
-                continue;
-            }
-            if join == 0 {
-                out.push(disc(p));
-                continue;
-            }
-            // The outer side of the turn.
-            let s = if cross > 0.0 { -1.0 } else { 1.0 };
-            let o0 = [p[0] - d0[1] * r * s, p[1] + d0[0] * r * s];
-            let o1 = [p[0] - d1[1] * r * s, p[1] + d1[0] * r * s];
-            let bevel = vec![p, o0, o1];
-            if join == 1 {
-                // Miter point: where the two offset edges meet.
-                let bis = [d0[0] - d1[0], d0[1] - d1[1]];
-                let bl = bis[0].hypot(bis[1]);
-                let cos_half = ((1.0 + d0[0] * d1[0] + d0[1] * d1[1]) * 0.5).max(0.0).sqrt();
-                let len = if cos_half > 1e-6 { r / cos_half } else { f64::INFINITY };
-                if bl > 1e-9 && len <= miter_limit * r {
-                    let m = [p[0] + (o0[0] + o1[0] - 2.0 * p[0]) * 0.5, p[1] + (o0[1] + o1[1] - 2.0 * p[1]) * 0.5];
-                    let ml = (m[0] - p[0]).hypot(m[1] - p[1]).max(1e-12);
-                    let tip = [p[0] + (m[0] - p[0]) / ml * len, p[1] + (m[1] - p[1]) / ml * len];
-                    out.push(vec![p, o0, tip, o1]);
-                    continue;
-                }
-            }
-            out.push(bevel);
-        }
-        if cap == 0 {
-            out.push(disc(pts[0]));
-            out.push(disc(pts[n - 1]));
-        }
-    }
-    out
-}
-
-/// Coverage (union, 4×4 samples per pixel) of convex polygons on a `w`×`h` grid.
-pub(crate) fn raster_convex(w: usize, h: usize, polys: &[Vec<[f64; 2]>]) -> Plane {
-    let mut out = Plane::new(w, h);
-    let inside = |poly: &[[f64; 2]], x: f64, y: f64| {
-        let n = poly.len();
-        let mut sign = 0.0;
-        for i in 0..n {
-            let (a, b) = (poly[i], poly[(i + 1) % n]);
-            let c = (b[0] - a[0]) * (y - a[1]) - (b[1] - a[1]) * (x - a[0]);
-            if c.abs() < 1e-12 {
-                continue;
-            }
-            if sign == 0.0 {
-                sign = c.signum();
-            } else if c.signum() != sign {
-                return false;
-            }
-        }
-        true
-    };
-    for poly in polys {
-        if poly.len() < 3 {
-            continue;
-        }
-        let (mut x0, mut y0, mut x1, mut y1) = (f64::INFINITY, f64::INFINITY, f64::NEG_INFINITY, f64::NEG_INFINITY);
-        for p in poly {
-            x0 = x0.min(p[0]);
-            y0 = y0.min(p[1]);
-            x1 = x1.max(p[0]);
-            y1 = y1.max(p[1]);
-        }
-        let (xa, xb) = (x0.floor().max(0.0) as usize, (x1.ceil().max(0.0) as usize).min(w));
-        let (ya, yb) = (y0.floor().max(0.0) as usize, (y1.ceil().max(0.0) as usize).min(h));
-        for y in ya..yb {
-            for x in xa..xb {
-                let mut hit = 0;
-                for sy in 0..4 {
-                    for sx in 0..4 {
-                        if inside(poly, x as f64 + (sx as f64 + 0.5) / 4.0, y as f64 + (sy as f64 + 0.5) / 4.0) {
-                            hit += 1;
-                        }
-                    }
-                }
-                let v = &mut out.data[y * w + x];
-                *v = v.max(hit as f32 / 16.0);
-            }
-        }
-    }
-    out
-}
-
-fn scribble(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    match scribble_plan(ctx, &b) {
-        Some(plan) => draw_paint(&mut b, &plan),
-        None if scribble_style(ctx) == 1 => b.img = Image::new(b.img.width, b.img.height),
-        None => {}
-    }
-    b
-}
-
-fn scribble_plan(ctx: &EffectCtx, b: &Buf) -> Option<PaintPlan> {
-    let pr = ctx.params;
-    let which = pr.e("scribble");
-    let polys: Vec<_> = if which == 0 { mask_px(ctx, b, pr.f("mask").round().max(1.0) as usize).into_iter().collect() } else { all_masks_px(ctx, b) };
-    let polys: Vec<_> = polys.into_iter().filter(|p| p.0.len() >= 3).map(|(p, c, i)| (p, c, i && which == 2)).collect();
-    let style = scribble_style(ctx);
-    if polys.is_empty() {
-        return None;
-    }
-    let sc = b.scale;
-    let fill = pr.e("fillType");
-    let ew = pr.f("edgeOptions/edgeWidth").max(0.1) * sc;
-    let ang = pr.f("angle").to_radians();
-    let d = [ang.cos(), ang.sin()];
-    let n = [-d[1], d[0]];
-    let width = (pr.f("strokeWidth") * sc).max(0.1);
-    let curv = pr.f("strokeOptions/curviness") / 100.0;
-    let curv_var = pr.f("strokeOptions/curvinessVariation") / 100.0;
-    let spacing = (pr.f("strokeOptions/spacing") * sc).max(0.75).max(width * 0.25);
-    let spacing_var = pr.f("strokeOptions/spacingVariation") / 100.0;
-    let overlap = pr.f("strokeOptions/pathOverlap") / 100.0;
-    let overlap_var = pr.f("strokeOptions/pathOverlapVariation") / 100.0;
-    let start = pr.f("start").clamp(0.0, 100.0) / 100.0;
-    let end = pr.f("end").clamp(0.0, 100.0) / 100.0;
-    let sequential = pr.b("fillPathsSequentially");
-    let wiggle = pr.e("wiggleType");
-    let wps = pr.f("wigglesPerSecond").max(0.0);
-    let seed = pr.f("randomSeed") as i64 as u32 ^ ctx.seed;
-    let (step, frac) = match wiggle {
-        0 => (0u32, 0.0f32),
-        1 => ((ctx.time * wps).floor().max(0.0) as u32, 0.0),
-        _ => {
-            let u = (ctx.time * wps).max(0.0);
-            (u.floor() as u32, smoothstep(0.0, 1.0, u.fract() as f32))
-        }
-    };
-    let rnd = |i: u32, k: u32| {
-        let a = hash1(i, k.wrapping_mul(31).wrapping_add(step.wrapping_mul(7919)), seed) * 2.0 - 1.0;
-        if frac > 0.0 {
-            let c = hash1(i, k.wrapping_mul(31).wrapping_add((step + 1).wrapping_mul(7919)), seed) * 2.0 - 1.0;
-            a + (c - a) * frac
-        } else {
-            a
-        }
-    };
-    let groups: Vec<Vec<(Vec<[f64; 2]>, bool, bool)>> =
-        if which == 0 || sequential { vec![polys.clone()] } else { polys.iter().map(|p| vec![p.clone()]).collect() };
-    // Per group a zig-zag polyline (in buffer px).
-    let mut lines: Vec<Vec<Vec<[f64; 2]>>> = Vec::new();
-    let mut runs = Vec::new();
-    for (gi, g) in groups.iter().enumerate() {
-        let mut nmin = f64::INFINITY;
-        let mut nmax = f64::NEG_INFINITY;
-        for (pts, _, _) in g {
-            for q in pts {
-                let v = q[0] * n[0] + q[1] * n[1];
-                nmin = nmin.min(v);
-                nmax = nmax.max(v);
-            }
-        }
-        nmin -= ew;
-        nmax += ew;
-        // Chains of zig-zags: each run joins the nearest chain that ended on the previous
-        // scan line (so separate regions get separate strokes).
-        let mut chains: Vec<(Vec<[f64; 2]>, u32)> = Vec::new();
-        let mut s = nmin + spacing * 0.5;
-        let mut li = 0u32;
-        let reach = spacing * 3.0 + ew;
-        while s < nmax && li < 20_000 {
-            scan_runs(g, fill, ew, d, n, s, &mut runs);
-            for (ri, &(a, bb)) in runs.iter().enumerate() {
-                let k = (gi as u32) << 20 | ri as u32;
-                let ov = spacing * (overlap + overlap_var * rnd(li, k * 4) as f64 * 0.5).max(-0.45);
-                let ov2 = spacing * (overlap + overlap_var * rnd(li, k * 4 + 1) as f64 * 0.5).max(-0.45);
-                let (a, bb) = (a - ov, bb + ov2);
-                if bb <= a {
-                    continue;
-                }
-                let at = |t: f64| [d[0] * t + n[0] * s, d[1] * t + n[1] * s];
-                let (pa, pb) = (at(a), at(bb));
-                let dist = |p: [f64; 2], q: [f64; 2]| ((p[0] - q[0]).powi(2) + (p[1] - q[1]).powi(2)).sqrt();
-                let best = chains
-                    .iter()
-                    .enumerate()
-                    .filter(|(_, c)| li > 0 && c.1 == li - 1)
-                    .map(|(i, c)| {
-                        let last = *c.0.last().unwrap_or(&pa);
-                        (i, dist(last, pa).min(dist(last, pb)))
-                    })
-                    .filter(|&(_, dd)| dd < reach)
-                    .min_by(|x, y| x.1.total_cmp(&y.1));
-                match best {
-                    Some((ci, _)) => {
-                        let last = *chains[ci].0.last().unwrap_or(&pa);
-                        let (p0, p1, dir) = if dist(last, pa) <= dist(last, pb) { (pa, pb, -1.0) } else { (pb, pa, 1.0) };
-                        // Curved turn: an extra point pushed past the edge.
-                        let c = (curv + curv_var * rnd(li, k * 4 + 2) as f64 * 0.5).max(0.0);
-                        let mid = [(last[0] + p0[0]) * 0.5 + d[0] * dir * c * spacing, (last[1] + p0[1]) * 0.5 + d[1] * dir * c * spacing];
-                        let ch = &mut chains[ci];
-                        ch.0.extend([mid, p0, p1]);
-                        ch.1 = li;
-                    }
-                    None => chains.push((vec![pa, pb], li)),
-                }
-            }
-            s += spacing * (1.0 + spacing_var * rnd(li, 3) as f64 * 0.5).max(0.25);
-            li += 1;
-        }
-        lines.push(chains.into_iter().map(|(z, _)| if curv > 0.0 { chaikin(&z, 2) } else { z }).collect());
-    }
-    let r = width * 0.5;
-    // Start / End Apply To: all of a mask's strokes as one path, or each stroke on its own.
-    let each = pr.e("startEndApplyTo") == 1;
-    let mut parts: Vec<Vec<[f64; 2]>> = Vec::new();
-    for group in &lines {
-        let lens: Vec<f64> = group.iter().map(|l| poly_length(l, false)).collect();
-        let total: f64 = lens.iter().sum();
-        let (g0, g1) = (total * start, total * end);
-        let mut acc = 0.0;
-        for (l, len) in group.iter().zip(lens) {
-            let part =
-                if each { trim_poly(l, false, len * start, len * end) } else { trim_poly(l, false, (g0 - acc).clamp(0.0, len), (g1 - acc).clamp(0.0, len)) };
-            acc += len;
-            parts.push(part);
-        }
-    }
-    let cap = pr.e("edgeOptions/endCap");
-    let join = pr.e("edgeOptions/join");
-    let cov = if cap == 0 && join == 0 {
-        let mut segs = Vec::new();
-        for part in &parts {
-            poly_segs(part, false, r, 1.0, &mut segs);
-        }
-        Coverage::Segs { segs, hardness: 0.9 }
-    } else {
-        Coverage::Convex(stroke_outline(&parts, r, cap, join, pr.f("edgeOptions/miterLimit").max(1.0)))
-    };
-    Some(PaintPlan { cov, color: pr.color("color"), opacity: (pr.f("opacity") / 100.0) as f32, style })
-}
-
-// ---------------------------------------------------------------- Stroke
-
-fn stroke(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let plan = stroke_plan(ctx, &b);
-    draw_paint(&mut b, &plan);
-    b
-}
-
-fn stroke_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
-    let pr = ctx.params;
-    let all = pr.b("allMasks");
-    let polys: Vec<_> = if all { all_masks_px(ctx, b) } else { mask_px(ctx, b, pr.f("path").round() as usize).into_iter().collect() };
-    let style = pr.e("paintStyle");
-    let size = (pr.f("brushSize") * b.scale).max(0.1);
-    let r = size * 0.5;
-    let hard = pr.f("brushHardness") / 100.0;
-    let start = pr.f("start").clamp(0.0, 100.0) / 100.0;
-    let end = pr.f("end").clamp(0.0, 100.0) / 100.0;
-    let spacing = pr.f("spacing") / 100.0;
-    let sequential = pr.b("strokeSequentially");
-    let lens: Vec<f64> = polys.iter().map(|(p, c, _)| poly_length(p, *c)).collect();
-    let total: f64 = lens.iter().sum();
-    let mut segs = Vec::new();
-    let mut acc = 0.0;
-    for ((pts, closed, _), &len) in polys.iter().zip(&lens) {
-        let (s0, s1) = if all && sequential {
-            let (g0, g1) = (total * start, total * end);
-            ((g0 - acc).clamp(0.0, len), (g1 - acc).clamp(0.0, len))
-        } else {
-            (len * start, len * end)
-        };
-        acc += len;
-        if s1 <= s0 {
-            continue;
-        }
-        if spacing <= 0.5 {
-            let part = trim_poly(pts, *closed, s0, s1);
-            poly_segs(&part, false, r, 1.0, &mut segs);
-        } else {
-            let step = (size * spacing).max(0.5);
-            let mut s = s0;
-            while s <= s1 + 1e-9 && segs.len() < 200_000 {
-                let (q, _) = crate::util::poly_point_at(pts, *closed, s);
-                segs.push(Seg { a: q, b: q, r, v: 1.0 });
-                s += step;
-            }
-        }
-    }
-    PaintPlan { cov: Coverage::Segs { segs, hardness: hard }, color: pr.color("color"), opacity: (pr.f("opacity") / 100.0) as f32, style }
-}
-
-// ---------------------------------------------------------------- Vegas
-
-/// Marching-squares iso-contours of `pl` at `thr`, chained into polylines (closed flag).
-fn contours(pl: &Plane, thr: f32) -> Vec<(Vec<[f64; 2]>, bool)> {
-    use std::collections::HashMap;
-    let (w, h) = (pl.w, pl.h);
-    if w < 2 || h < 2 {
-        return Vec::new();
-    }
-    // Edge key: horizontal edge (x,y)-(x+1,y) = 2*(y*w+x), vertical (x,y)-(x,y+1) = 2*(y*w+x)+1.
-    let hk = |x: usize, y: usize| 2 * (y * w + x) as u64;
-    let vk = |x: usize, y: usize| 2 * (y * w + x) as u64 + 1;
-    let mut pos: HashMap<u64, [f64; 2]> = HashMap::new();
-    let mut adj: HashMap<u64, Vec<u64>> = HashMap::new();
-    let v = |x: usize, y: usize| pl.data[y * w + x];
-    let interp = |a: f32, b: f32| if (b - a).abs() > 1e-9 { ((thr - a) / (b - a)).clamp(0.0, 1.0) as f64 } else { 0.5 };
-    for y in 0..h - 1 {
-        for x in 0..w - 1 {
-            let (a, bb, c, d) = (v(x, y), v(x + 1, y), v(x + 1, y + 1), v(x, y + 1));
-            let idx = (a > thr) as u8 | ((bb > thr) as u8) << 1 | ((c > thr) as u8) << 2 | ((d > thr) as u8) << 3;
-            if idx == 0 || idx == 15 {
-                continue;
-            }
-            // Edge points (pixel centres at +0.5).
-            let top = (hk(x, y), [x as f64 + 0.5 + interp(a, bb), y as f64 + 0.5]);
-            let right = (vk(x + 1, y), [x as f64 + 1.5, y as f64 + 0.5 + interp(bb, c)]);
-            let bottom = (hk(x, y + 1), [x as f64 + 0.5 + interp(d, c), y as f64 + 1.5]);
-            let left = (vk(x, y), [x as f64 + 0.5, y as f64 + 0.5 + interp(a, d)]);
-            let pairs: &[(usize, usize)] = match idx {
-                1 | 14 => &[(3, 0)],
-                2 | 13 => &[(0, 1)],
-                3 | 12 => &[(3, 1)],
-                4 | 11 => &[(1, 2)],
-                5 => &[(3, 0), (1, 2)],
-                6 | 9 => &[(0, 2)],
-                7 | 8 => &[(3, 2)],
-                10 => &[(0, 1), (2, 3)],
-                _ => &[],
-            };
-            let e = [top, right, bottom, left];
-            for &(i, j) in pairs {
-                pos.insert(e[i].0, e[i].1);
-                pos.insert(e[j].0, e[j].1);
-                adj.entry(e[i].0).or_default().push(e[j].0);
-                adj.entry(e[j].0).or_default().push(e[i].0);
-            }
-        }
-    }
-    let mut keys: Vec<u64> = adj.keys().copied().collect();
-    keys.sort_unstable();
-    // Start open chains at endpoints (degree 1) first, then closed loops.
-    keys.sort_by_key(|k| adj[k].len() != 1);
-    let mut used: std::collections::HashSet<(u64, u64)> = std::collections::HashSet::new();
-    let mut out = Vec::new();
-    for &k0 in &keys {
-        for &first in &adj[&k0] {
-            if used.contains(&(k0.min(first), k0.max(first))) {
-                continue;
-            }
-            let mut chain = vec![pos[&k0]];
-            let (mut prev, mut cur) = (k0, first);
-            used.insert((prev.min(cur), prev.max(cur)));
-            let mut closed = false;
-            loop {
-                chain.push(pos[&cur]);
-                if cur == k0 {
-                    closed = true;
-                    chain.pop();
-                    break;
-                }
-                let next = adj[&cur].iter().copied().find(|&n| n != prev && !used.contains(&(cur.min(n), cur.max(n))));
-                match next {
-                    Some(n) => {
-                        used.insert((cur.min(n), cur.max(n)));
-                        prev = cur;
-                        cur = n;
-                    }
-                    None => break,
-                }
-            }
-            if chain.len() >= 2 {
-                out.push((chain, closed));
-            }
-        }
-    }
-    out
-}
-
-fn vegas(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let plan = vegas_plan(ctx, &b);
-    draw_paint(&mut b, &plan);
-    b
-}
-
-fn vegas_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
-    let pr = ctx.params;
-    let (w, h) = (b.img.width as usize, b.img.height as usize);
-    let sc = b.scale;
-    let paths: Vec<(Vec<[f64; 2]>, bool)> = if pr.e("stroke") == 1 {
-        mask_px(ctx, b, pr.f("path").round() as usize).map(|(p, c, _)| vec![(p, c)]).unwrap_or_default()
-    } else {
-        let src = layer_or_self(ctx, b, "inputLayer", true, pr.e("ifLayerSizesDiffer") == 1);
-        let ch = pr.e("channel");
-        let inv = pr.b("invertInput");
-        let mut pl = Plane::from_image(&src, |px| {
-            let (c, a) = unpremul(px);
-            let v = match ch {
-                1 => c[0],
-                2 => c[1],
-                3 => c[2],
-                4 => a,
-                _ => luminance(c[0], c[1], c[2]) * a,
-            };
-            if inv { 1.0 - v } else { v }
-        });
-        let blur = pr.f("preBlur") * sc;
-        if blur > 0.05 {
-            pl = gauss_plane(&pl, blur, blur);
-        }
-        let mut cs = contours(&pl, (pr.f("threshold") / 100.0) as f32);
-        // Simplify by tolerance (drop points closer than tol × size).
-        let tol = pr.f("tolerance").max(0.0) * (w.max(h) as f64) * 0.1;
-        if tol > 0.0 {
-            for (c, _) in cs.iter_mut() {
-                let mut keep: Vec<[f64; 2]> = Vec::with_capacity(c.len());
-                for &q in c.iter() {
-                    if keep.last().is_none_or(|l: &[f64; 2]| ((l[0] - q[0]).powi(2) + (l[1] - q[1]).powi(2)).sqrt() >= tol) {
-                        keep.push(q);
-                    }
-                }
-                *c = keep;
-            }
-        }
-        cs.sort_by(|a, b| poly_length(&b.0, b.1).total_cmp(&poly_length(&a.0, a.1)));
-        if pr.e("renderMode") == 1 {
-            let sel = (pr.f("selectedContour").round().max(1.0) as usize) - 1;
-            cs.into_iter().skip(sel).take(1).collect()
-        } else {
-            cs
-        }
-    };
-    let nseg = pr.f("segments").round().clamp(1.0, 1000.0) as usize;
-    // Shorter Contours Have Fewer Segments: segment count scales with contour length.
-    let fewer = pr.e("stroke") == 0 && pr.e("shorterContoursHave") == 1;
-    let longest = paths.iter().map(|(p, c)| poly_length(p, *c)).fold(0.0, f64::max);
-    let seg_len = pr.f("length").clamp(0.0, 1.0);
-    let bunched = pr.e("segmentDistribution") == 0;
-    let rot = pr.f("rotation") / 360.0;
-    let random_phase = pr.b("randomPhase");
-    let seed = pr.f("randomSeed") as i64 as u32 ^ ctx.seed;
-    let width = (pr.f("width") * sc).max(0.1);
-    let hard = pr.f("hardness").clamp(0.0, 1.0);
-    let (o0, om, o1, mp) = (pr.f("startOpacity") as f32, pr.f("midpointOpacity") as f32, pr.f("endOpacity") as f32, pr.f("midpointPosition").clamp(0.01, 0.99));
-    let mut segs = Vec::new();
-    for (ci, (pts, closed)) in paths.iter().enumerate() {
-        let len = poly_length(pts, *closed);
-        if len <= 0.0 {
-            continue;
-        }
-        let phase = rot + if random_phase { hash1(ci as u32, 1, seed) as f64 } else { 0.0 };
-        let nseg = if fewer && longest > 0.0 { ((nseg as f64 * len / longest).round() as usize).max(1) } else { nseg };
-        let each = len / nseg as f64 * seg_len;
-        for i in 0..nseg {
-            let base = if bunched { (i as f64 + (hash1(ci as u32, i as u32 + 7, seed) as f64 - 0.5) * 0.8) / nseg as f64 } else { i as f64 / nseg as f64 };
-            let s0 = (base + phase).rem_euclid(1.0) * len;
-            // Sub-sample the segment so opacity can ramp along it.
-            let sub = 12usize;
-            let mut prev: Option<[f64; 2]> = None;
-            for k in 0..=sub {
-                let f = k as f64 / sub as f64;
-                let mut s = s0 + each * f;
-                if *closed {
-                    s = s.rem_euclid(len);
-                } else if s > len {
-                    break;
-                }
-                let (q, _) = crate::util::poly_point_at(pts, *closed, s);
-                let op = if f < mp { o0 + (om - o0) * (f / mp) as f32 } else { om + (o1 - om) * ((f - mp) / (1.0 - mp)) as f32 };
-                if let Some(pv) = prev
-                    && ((pv[0] - q[0]).powi(2) + (pv[1] - q[1]).powi(2)) < (each * 0.5).powi(2) + 4.0
-                {
-                    segs.push(Seg { a: pv, b: q, r: width * 0.5, v: op.clamp(0.0, 1.0) });
-                }
-                prev = Some(q);
-            }
-        }
-    }
-    let style = match pr.e("blendMode") {
-        1 => 0,
-        2 => 3,
-        3 => 2,
-        _ => 1,
-    };
-    PaintPlan { cov: Coverage::Segs { segs, hardness: hard }, color: pr.color("color"), opacity: 1.0, style }
-}
-
-// ---------------------------------------------------------------- Write-on / Glue Gun
-
-/// Write-on draws a stroke along the animated Brush Position, as in After Effects: a dab every
-/// Brush Spacing seconds from the layer's start up to now, each one lasting Stroke Length
-/// seconds (0: for ever). The dabs' positions come from the host's parameters at their times;
-/// with Paint Time Properties ▸ Opacity or Brush Time Properties ▸ Size each dab keeps its own
-/// opacity or size, else the current ones apply to every dab. (Colour and hardness are one per
-/// stroke: the current ones.) Without a host (or dabs) the current dab draws. Deterministic.
-fn write_on(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let plan = write_on_plan(ctx, &b);
-    draw_paint(&mut b, &plan);
-    b
-}
-
-/// The most dabs one Write-on frame draws; longer strokes lay them further apart, joined.
-const WRITE_ON_MAX_DABS: i64 = 4096;
-
-fn write_on_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
-    let pr = ctx.params;
-    let own_opacity = pr.e("paintTimeProperties") == 1;
-    let own_size = matches!(pr.e("brushTimeProperties"), 1 | 3);
-    let opacity = |p: &Params| (p.f("brushOpacity") / 100.0).clamp(0.0, 1.0) as f32;
-    let radius = |p: &Params| (p.f("brushSize") * b.scale * 0.5).max(0.05);
-    let dab = |p: &Params| {
-        let q = b.to_px(p.v2("brushPosition"));
-        ([q.0, q.1], radius(if own_size { p } else { pr }), if own_opacity { opacity(p) } else { 1.0 })
-    };
-    let mut segs = vec![];
-    let t = ctx.time;
-    let spacing = pr.f("brushSpacing").max(0.001);
-    let life = pr.f("strokeLength").max(0.0);
-    if let Some(host) = ctx.env.host
-        && t.is_finite()
-        && t >= 0.0
-    {
-        let start = if life > 0.0 { (t - life).max(0.0) } else { 0.0 };
-        let k0 = (start / spacing - 1e-9).ceil().max(0.0) as i64;
-        let k1 = (t / spacing + 1e-9).floor().max(0.0) as i64;
-        let n = k1.saturating_sub(k0).saturating_add(1);
-        let stride = (n / WRITE_ON_MAX_DABS).saturating_add(1).max(1);
-        let mut prev: Option<[f64; 2]> = None;
-        let mut k = k0;
-        while k <= k1 {
-            let tk = k as f64 * spacing;
-            let at = if (tk - t).abs() < 1e-9 { Some(dab(pr)) } else { host.params_at(tk).map(|p| dab(&p)) };
-            if let Some((q, r, v)) = at {
-                // Dabs laid further apart than the brush spacing are joined into a line.
-                let a = if stride > 1 { prev.unwrap_or(q) } else { q };
-                segs.push(Seg { a, b: q, r, v });
-                prev = Some(q);
-            }
-            k = k.saturating_add(stride);
-        }
-    }
-    if segs.is_empty() {
-        let (q, r, v) = dab(pr);
-        segs.push(Seg { a: q, b: q, r, v });
-    }
-    PaintPlan {
-        cov: Coverage::Segs { segs, hardness: pr.f("brushHardness") / 100.0 },
-        color: pr.color("color"),
-        opacity: if own_opacity { 1.0 } else { opacity(pr) },
-        style: pr.e("paintStyle"),
-    }
-}
-
-fn glue_gun(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let q = b.to_px(pr.v2("brushPosition"));
-    let rad = (pr.f("strokeWidth") * b.scale * 0.5).max(0.5);
-    let density = pr.f("density").max(0.0);
-    let refl = pr.f("reflection").to_radians();
-    let strength = (pr.f("strength") / 100.0) as f32;
-    let glue_only = pr.e("style") == 1;
-    let src = b.img.clone();
-    let light = [refl.cos() * 0.6, -refl.sin() * 0.6, 0.53];
-    let beads = (density.round() as usize).clamp(1, 32);
-    let seed = ctx.seed;
-    let centers: Vec<([f64; 2], f64)> = (0..beads)
-        .map(|i| {
-            let a = hash1(i as u32, 1, seed) as f64 * 2.0 * PI;
-            let d = if i == 0 { 0.0 } else { hash1(i as u32, 2, seed) as f64 * rad * 0.35 };
-            ([q.0 + a.cos() * d, q.1 + a.sin() * d], rad * (0.75 + 0.25 * hash1(i as u32, 3, seed) as f64))
-        })
-        .collect();
-    b.img.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let (fx, fy) = (x as f64 + 0.5, y as f64 + 0.5);
-            // Height field: union of hemispheres.
-            let mut best = (0.0f64, [0.0f64; 2], 1.0f64);
-            for &(c, r) in &centers {
-                let (dx, dy) = ((fx - c[0]) / r, (fy - c[1]) / r);
-                let d2 = dx * dx + dy * dy;
-                if d2 < 1.0 {
-                    let hgt = (1.0 - d2).sqrt();
-                    if hgt > best.0 {
-                        best = (hgt, [dx, dy], r);
-                    }
-                }
-            }
-            if best.0 <= 0.0 {
-                if glue_only {
-                    *px = [0.0; 4];
-                }
-                continue;
-            }
-            let nrm = [best.1[0], best.1[1], best.0];
-            let ndl = (nrm[0] * light[0] + nrm[1] * light[1] + nrm[2] * light[2]).max(0.0);
-            let spec = ndl.powi(24) as f32;
-            // Refraction: look through the bead.
-            let s = src.sample_bilinear_clamped(fx - nrm[0] * best.2 * 0.5 * strength as f64, fy - nrm[1] * best.2 * 0.5 * strength as f64);
-            let edge = smoothstep(0.0, 0.15, best.0 as f32);
-            let shade = 0.65 + 0.35 * ndl as f32;
-            let g = [s[0] * shade + spec, s[1] * shade + spec, s[2] * shade + spec, s[3].max(0.6)];
-            let gp = [g[0].min(g[3] + spec), g[1].min(g[3] + spec), g[2].min(g[3] + spec), g[3].min(1.0)];
-            let base = if glue_only { [0.0; 4] } else { *px };
-            *px = crate::util::lerp4(base, gp, edge * strength.clamp(0.0, 1.0).max(0.3));
-            px[3] = px[3].clamp(0.0, 1.0);
-        }
-    });
-    b
-}
-
-// ---------------------------------------------------------------- Paint Bucket
-
-/// Paint Bucket's filled region (1 inside) on `b`: the flood fill from the Fill Point over the
-/// layer's pixels (shared with the GPU compositor, which reads the layer back for it).
-pub fn paint_bucket_region(ctx: &EffectCtx, b: &Buf) -> Plane {
-    let pr = ctx.params;
-    let (w, h) = (b.img.width as usize, b.img.height as usize);
-    let fp = b.to_px(pr.v2("fillPoint"));
-    let (sx, sy) = (fp.0.floor() as i64, fp.1.floor() as i64);
-    let sel = pr.e("fillSelector");
-    let tol = (pr.f("tolerance") / 255.0) as f32;
-    let key = |p: Px| -> [f32; 4] {
-        let (c, a) = unpremul(p);
-        match sel {
-            1 => [c[0], c[1], c[2], 0.0],
-            2 => [0.0, 0.0, 0.0, if a <= 1e-3 { 0.0 } else { 1.0 }],
-            3 | 4 => [0.0, 0.0, 0.0, a],
-            _ => p,
-        }
-    };
-    let mut region = Plane::new(w, h);
-    if sx >= 0 && sy >= 0 && (sx as usize) < w && (sy as usize) < h {
-        let seed = key(b.img.data[sy as usize * w + sx as usize]);
-        let within = |i: usize| {
-            let k = key(b.img.data[i]);
-            if sel == 2 {
-                return k[3] == seed[3];
-            }
-            (0..4).all(|j| (k[j] - seed[j]).abs() <= tol + 1e-6)
-        };
-        let mut seen = vec![false; w * h];
-        let mut stack = vec![(sx as usize, sy as usize)];
-        while let Some((x, y)) = stack.pop() {
-            let row = y * w;
-            if seen[row + x] || !within(row + x) {
-                continue;
-            }
-            let mut l = x;
-            while l > 0 && !seen[row + l - 1] && within(row + l - 1) {
-                l -= 1;
-            }
-            let mut r = x;
-            while r + 1 < w && !seen[row + r + 1] && within(row + r + 1) {
-                r += 1;
-            }
-            for i in l..=r {
-                seen[row + i] = true;
-                region.data[row + i] = 1.0;
-                if y > 0 && !seen[row - w + i] {
-                    stack.push((i, y - 1));
-                }
-                if y + 1 < h && !seen[row + w + i] {
-                    stack.push((i, y + 1));
-                }
-            }
-        }
-    }
-    region
-}
-
-fn paint_bucket(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let (w, h) = (b.img.width as usize, b.img.height as usize);
-    if w == 0 || h == 0 {
-        return b;
-    }
-    let region = paint_bucket_region(ctx, &b);
-    if pr.b("viewThreshold") {
-        b.img.data.par_iter_mut().zip(region.data.par_iter()).for_each(|(px, &v)| *px = [v, v, v, 1.0]);
-        return b;
-    }
-    let sc = b.scale;
-    let mut cov = match pr.e("stroke") {
-        1 => {
-            let s = pr.f("featherSoftness") * sc * 0.5;
-            if s > 0.05 { gauss_plane(&region, s, s) } else { region.clone() }
-        }
-        2 => morph_frac(&region, pr.f("spreadRadius") * sc, true),
-        3 => morph_frac(&region, pr.f("spreadRadius") * sc, false),
-        4 => {
-            let r = pr.f("strokeWidth") * sc;
-            let out = morph_frac(&region, r * 0.5, true);
-            let inn = morph_frac(&region, r * 0.5, false);
-            out.zip_map(&inn, |a, b| (a - b).max(0.0))
-        }
-        _ => gauss_plane(&region, 0.5, 0.5),
-    };
-    if pr.e("stroke") == 0 {
-        // Antialias: keep the hard interior, soften only the boundary.
-        cov = cov.zip_map(&region, |a, r| if r > 0.0 { a.max(0.5) } else { a });
-    }
-    let color = pr.color("color");
-    let op = (pr.f("opacity") / 100.0) as f32;
-    let mode = pr.e("blendingMode");
-    b.img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
-        let k = (c * op * color[3]).clamp(0.0, 1.0);
-        if k <= 0.0 {
-            if mode == 9 {
-                *px = [0.0; 4];
-            }
-            return;
-        }
-        let (dc, da) = unpremul(*px);
-        let fc = [color[0], color[1], color[2]];
-        let mixed = match mode {
-            1 => [dc[0] + fc[0], dc[1] + fc[1], dc[2] + fc[2]],
-            2 => [dc[0] * fc[0], dc[1] * fc[1], dc[2] * fc[2]],
-            3 => [1.0 - (1.0 - dc[0]) * (1.0 - fc[0]), 1.0 - (1.0 - dc[1]) * (1.0 - fc[1]), 1.0 - (1.0 - dc[2]) * (1.0 - fc[2])],
-            4..=7 => {
-                let (dh, ds, dl) = rgb_to_hsl(dc[0], dc[1], dc[2]);
-                let (fh, fs, fl) = rgb_to_hsl(fc[0], fc[1], fc[2]);
-                let (r, g, bl) = match mode {
-                    4 => hsl_to_rgb(fh, ds, dl),
-                    5 => hsl_to_rgb(dh, fs, dl),
-                    6 => hsl_to_rgb(fh, fs, dl),
-                    _ => hsl_to_rgb(dh, ds, fl),
-                };
-                [r, g, bl]
-            }
-            _ => fc,
-        };
-        *px = match mode {
-            8 => over(premul(fc, k), *px),
-            9 => premul(fc, k),
-            0 => over(*px, premul(fc, k)),
-            _ => {
-                if da <= 1e-6 {
-                    return;
-                }
-                let c3 = crate::util::lerp3(dc, mixed, k);
-                premul(c3, da)
-            }
-        };
-    });
-    b
-}
-
-// ---------------------------------------------------------------- Eyedropper Fill
-
-fn eyedropper_fill(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let fill = eyedropper_color(ctx, &b);
-    let keep_alpha = pr.b("maintainOriginalAlpha");
-    let blend = (pr.f("blendWithOriginal") / 100.0) as f32;
-    b.img.data.par_iter_mut().for_each(|px| {
-        let a = if keep_alpha { px[3] } else { fill[3] };
-        let f = premul([fill[0], fill[1], fill[2]], a);
-        *px = crate::util::lerp4(f, *px, blend);
-    });
-    b
-}
-
-/// Eyedropper Fill's sampled colour (straight RGB, alpha) from the layer's pixels (shared with
-/// the GPU compositor, which reads the layer back for it).
-pub fn eyedropper_color(ctx: &EffectCtx, b: &Buf) -> Px {
-    let pr = ctx.params;
-    let (w, h) = (b.img.width as i64, b.img.height as i64);
-    let c = b.to_px(pr.v2("samplePoint"));
-    let r = (pr.f("sampleRadius") * b.scale).max(0.0);
-    let mode = pr.e("averagePixelColors");
-    let (cx, cy) = (c.0.floor() as i64, c.1.floor() as i64);
-    let ri = r.ceil() as i64;
-    let mut acc = [0.0f64; 4];
-    let mut n = 0.0f64;
-    for y in (cy - ri).max(0)..=(cy + ri).min(h - 1) {
-        for x in (cx - ri).max(0)..=(cx + ri).min(w - 1) {
-            if ((x - cx).pow(2) + (y - cy).pow(2)) as f64 > r * r + 0.5 {
-                continue;
-            }
-            let px = b.img.data[(y * w + x) as usize];
-            match mode {
-                0 => {
-                    if px[3] > 1e-4 {
-                        let (s, _) = unpremul(px);
-                        for k in 0..3 {
-                            acc[k] += s[k] as f64;
-                        }
-                        acc[3] += 1.0;
-                        n += 1.0;
-                    }
-                }
-                1 => {
-                    let (s, _) = unpremul(px);
-                    for k in 0..3 {
-                        acc[k] += s[k] as f64;
-                    }
-                    acc[3] += 1.0;
-                    n += 1.0;
-                }
-                2 => {
-                    for k in 0..3 {
-                        acc[k] += px[k] as f64;
-                    }
-                    acc[3] += 1.0;
-                    n += 1.0;
-                }
-                _ => {
-                    for k in 0..4 {
-                        acc[k] += px[k] as f64;
-                    }
-                    n += 1.0;
-                }
-            }
-        }
-    }
-    if n > 0.0 {
-        if mode == 3 {
-            let a = (acc[3] / n) as f32;
-            let s = if a > 1e-6 { [(acc[0] / n) as f32 / a, (acc[1] / n) as f32 / a, (acc[2] / n) as f32 / a] } else { [0.0; 3] };
-            [s[0], s[1], s[2], a]
-        } else {
-            [(acc[0] / n) as f32, (acc[1] / n) as f32, (acc[2] / n) as f32, 1.0]
-        }
-    } else {
-        [0.0, 0.0, 0.0, 0.0]
-    }
-}
-
-// ---------------------------------------------------------------- CC Threads
-
-fn threads(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let sc = b.scale;
-    let tw = (pr.f("width") * sc).max(1.0);
-    let th = (pr.f("height") * sc).max(1.0);
-    let overlaps = pr.f("overlaps").round().clamp(1.0, 20.0) as i64;
-    let ang = pr.f("direction").to_radians();
-    let (sn, cs) = ang.sin_cos();
-    let c = b.to_px(pr.v2("center"));
-    let coverage = (pr.f("coverage") / 100.0).clamp(0.0, 1.0);
-    let shadow = (pr.f("shadowing") / 100.0) as f32;
-    let texture = (pr.f("texture") / 100.0) as f32;
-    let src = b.img.clone();
-    let to_px = |u: f64, v: f64| (c.0 + u * cs - v * sn, c.1 + u * sn + v * cs);
-    b.img.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let (dx, dy) = (x as f64 + 0.5 - c.0, y as f64 + 0.5 - c.1);
-            let u = dx * cs + dy * sn;
-            let v = -dx * sn + dy * cs;
-            let (ci, cj) = ((u / tw).floor() as i64, (v / th).floor() as i64);
-            let (fu, fv) = (u / tw - ci as f64, v / th - cj as f64);
-            // Horizontal thread j occupies the band |fv-0.5| < coverage/2; vertical thread i the
-            // band |fu-0.5| < coverage/2.
-            let in_h = (fv - 0.5).abs() < coverage * 0.5;
-            let in_v = (fu - 0.5).abs() < coverage * 0.5;
-            // Twill: horizontal is on top when (i + j) mod (2·overlaps) < overlaps.
-            let h_top = (ci + cj).rem_euclid(2 * overlaps) < overlaps;
-            let which = match (in_h, in_v) {
-                (true, true) => Some(h_top),
-                (true, false) => Some(true),
-                (false, true) => Some(false),
-                _ => None,
-            };
-            let Some(horizontal) = which else {
-                *px = [0.0; 4];
-                continue;
-            };
-            // Thread colour: the source sampled along the thread centre line.
-            let (sx, sy) = if horizontal { to_px(u, (cj as f64 + 0.5) * th) } else { to_px((ci as f64 + 0.5) * tw, v) };
-            let s = src.sample_bilinear_clamped(sx, sy);
-            // Round profile across the thread + darkening where it dives under its neighbour.
-            let across = if horizontal { (fv - 0.5) / (coverage * 0.5).max(1e-6) } else { (fu - 0.5) / (coverage * 0.5).max(1e-6) };
-            let along = if horizontal { fu } else { fv };
-            let profile = (1.0 - across * across).max(0.0).sqrt() as f32;
-            let dive = 1.0 - (along - 0.5).abs() as f32 * 2.0;
-            let shade = 1.0 - shadow * (1.0 - profile) * 0.8 - shadow * 0.25 * (1.0 - dive) * if horizontal == h_top { 0.0 } else { 1.0 };
-            let fib =
-                if texture > 0.0 { 1.0 - texture * 0.3 * hash1((along * 64.0) as u32, (across * 8.0 + 8.0) as u32, ci as u32 ^ (cj as u32) << 8) } else { 1.0 };
-            let k = (shade * fib).max(0.0);
-            *px = [s[0] * k, s[1] * k, s[2] * k, s[3]];
-        }
-    });
-    b
-}
-
-// ---------------------------------------------------------------- Audio Spectrum / Waveform
-
-/// In-place iterative radix-2 FFT (`re`, `im` lengths a power of two).
-pub(crate) fn fft(re: &mut [f64], im: &mut [f64]) {
-    let n = re.len();
-    if n < 2 {
-        return;
-    }
-    let mut j = 0;
-    for i in 1..n {
-        let mut bit = n >> 1;
-        while j & bit != 0 {
-            j ^= bit;
-            bit >>= 1;
-        }
-        j |= bit;
-        if i < j {
-            re.swap(i, j);
-            im.swap(i, j);
-        }
-    }
-    let mut len = 2;
-    while len <= n {
-        let ang = -2.0 * PI / len as f64;
-        let (ws, wc) = ang.sin_cos();
-        for start in (0..n).step_by(len) {
-            let (mut cr, mut ci) = (1.0, 0.0);
-            for k in 0..len / 2 {
-                let (a, bb) = (start + k, start + k + len / 2);
-                let tr = re[bb] * cr - im[bb] * ci;
-                let ti = re[bb] * ci + im[bb] * cr;
-                re[bb] = re[a] - tr;
-                im[bb] = im[a] - ti;
-                re[a] += tr;
-                im[a] += ti;
-                let ncr = cr * wc - ci * ws;
-                ci = cr * ws + ci * wc;
-                cr = ncr;
-            }
-        }
-        len <<= 1;
-    }
-}
-
-const AUDIO_RATE: u32 = 48_000;
-
-/// Fetch mono (or one channel) samples of the audio layer around the current time.
-fn audio_window(ctx: &EffectCtx, dur_ms: f64, offset_ms: f64, channel: u32) -> Option<Vec<f64>> {
-    let id = ctx.params.get("audioLayer")?.as_layer()?;
-    let host = ctx.env.host?;
-    let dur = (dur_ms / 1000.0).max(0.001);
-    let frames = ((dur * AUDIO_RATE as f64) as usize).clamp(16, 1 << 16);
-    let start = ctx.env.comp_time + offset_ms / 1000.0 - dur * 0.5;
-    let s = host.audio(id, start, frames, AUDIO_RATE)?;
-    Some(
-        (0..frames)
-            .map(|i| {
-                let (l, r) = (*s.get(2 * i).unwrap_or(&0.0) as f64, *s.get(2 * i + 1).unwrap_or(&0.0) as f64);
-                match channel {
-                    1 => l,
-                    2 => r,
-                    _ => (l + r) * 0.5,
-                }
-            })
-            .collect(),
-    )
-}
-
-/// The drawing baseline: a polyline in buffer px (mask path or start→end line), sampled at
-/// parameter u∈[0,1] → (point, unit normal).
-struct Baseline {
-    pts: Vec<[f64; 2]>,
-    closed: bool,
-    len: f64,
-    polar: bool,
-    center: [f64; 2],
-    radius: f64,
-}
-
-impl Baseline {
-    fn new(ctx: &EffectCtx, b: &Buf) -> Baseline {
-        let pr = ctx.params;
-        let polar = pr.b("usePolarPath");
-        let (pts, closed) = match mask_px(ctx, b, pr.f("path").round() as usize) {
-            Some((p, c, _)) if !polar => (p, c),
-            _ => {
-                let s = b.to_px(pr.v2("startPoint"));
-                let e = b.to_px(pr.v2("endPoint"));
-                (vec![[s.0, s.1], [e.0, e.1]], false)
-            }
-        };
-        let len = poly_length(&pts, closed);
-        let center = pts[0];
-        let radius = if pts.len() > 1 { ((pts[1][0] - pts[0][0]).powi(2) + (pts[1][1] - pts[0][1]).powi(2)).sqrt() } else { 1.0 };
-        Baseline { pts, closed, len, polar, center, radius }
-    }
-    fn at(&self, u: f64) -> ([f64; 2], [f64; 2]) {
-        if self.polar {
-            let a = u * 2.0 * PI - PI * 0.5;
-            let (s, c) = a.sin_cos();
-            return ([self.center[0] + c * self.radius * 0.5, self.center[1] + s * self.radius * 0.5], [c, s]);
-        }
-        let (q, d) = crate::util::poly_point_at(&self.pts, self.closed, u * self.len);
-        (q, [d[1], -d[0]])
-    }
-}
-
-/// Draw line/dot marks with core (inside colour) and soft halo (outside colour).
-fn draw_marks(b: &mut Buf, segs_core: &[Seg], thickness: f64, softness: f64, inside: [f32; 4], outside: [f32; 4], composite: bool) {
-    let (w, h) = (b.img.width as usize, b.img.height as usize);
-    let core = raster_segs(w, h, segs_core, 1.0);
-    let halo_segs: Vec<Seg> = segs_core.iter().map(|s| Seg { r: s.r + thickness * softness.max(0.0) + 0.5, ..*s }).collect();
-    let halo = if softness > 0.0 { raster_segs(w, h, &halo_segs, 0.0) } else { core.clone() };
-    b.img.data.par_iter_mut().enumerate().for_each(|(i, px)| {
-        let (c, hl) = (core.data[i], halo.data[i]);
-        let a = c.max(hl);
-        let base = if composite { *px } else { [0.0; 4] };
-        if a <= 0.0 {
-            *px = base;
-            return;
-        }
-        let t = if a > 0.0 { c / a } else { 0.0 };
-        let col = crate::util::lerp3([outside[0], outside[1], outside[2]], [inside[0], inside[1], inside[2]], t);
-        *px = over(base, premul(col, a));
-    });
-}
-
-/// Audio Spectrum / Audio Waveform, shared with the GPU compositor (effectcraft-gpu `fx_gen2`):
-/// the marks (the audio analysis runs on the CPU) and how [`draw_marks`] colours them.
-#[derive(Clone, Debug)]
-pub struct MarksPlan {
-    pub segs: Vec<Seg>,
-    pub thickness: f64,
-    pub softness: f64,
-    pub inside: [f32; 4],
-    pub outside: [f32; 4],
-    pub composite: bool,
-}
-
-/// [`MarksPlan`] of Audio Spectrum or Audio Waveform on `b`'s geometry (`None` = no audio:
-/// the layer passes through).
-pub fn marks_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
-    match id {
-        "ec.generate.audiospectrum" => spectrum_plan(ctx, b),
-        "ec.generate.audiowaveform" => waveform_plan(ctx, b),
-        _ => None,
-    }
-}
-
-fn marks(ctx: &EffectCtx, segs: Vec<Seg>, thick: f64, soft: f64) -> MarksPlan {
-    let pr = ctx.params;
-    MarksPlan {
-        segs,
-        thickness: thick,
-        softness: soft * 2.0,
-        inside: pr.color("insideColor"),
-        outside: pr.color("outsideColor"),
-        composite: pr.b("compositeOnOriginal"),
-    }
-}
-
-fn audio_spectrum(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    if let Some(m) = spectrum_plan(ctx, &b) {
-        draw_marks(&mut b, &m.segs, m.thickness, m.softness, m.inside, m.outside, m.composite);
-    }
-    b
-}
-
-fn audio_waveform(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    if let Some(m) = waveform_plan(ctx, &b) {
-        draw_marks(&mut b, &m.segs, m.thickness, m.softness, m.inside, m.outside, m.composite);
-    }
-    b
-}
-
-fn compute_fft_mags(samples: &[f64]) -> (usize, f64, Vec<f64>) {
-    let m = samples.len();
-    let n = m.next_power_of_two().max(64);
-    let mut re = vec![0.0; n];
-    let mut im = vec![0.0; n];
-    let denom = (m.max(2) - 1) as f64;
-    for (i, s) in samples.iter().enumerate() {
-        let w = 0.5 - 0.5 * (2.0 * PI * i as f64 / denom).cos();
-        if let Some(r) = re.get_mut(i) {
-            *r = s * w;
-        }
-    }
-    fft(&mut re, &mut im);
-    let hz_per_bin = AUDIO_RATE as f64 / n as f64;
-    let scale = 4.0 / m.max(1) as f64;
-    let num_bins = n / 2 + 1;
-    let mut mags = Vec::with_capacity(num_bins);
-    for k in 0..num_bins {
-        let r = re.get(k).copied().unwrap_or(0.0);
-        let im_val = im.get(k).copied().unwrap_or(0.0);
-        let mag = (r * r + im_val * im_val).sqrt() * scale;
-        mags.push(mag);
-    }
-    (n, hz_per_bin, mags)
-}
-
-fn spectrum_plan(ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
-    let pr = ctx.params;
-    let samples = audio_window(ctx, pr.f("audioDuration"), pr.f("audioOffset"), 0)?;
-    let (_n, hz_per_bin, mags) = compute_fft_mags(&samples);
-
-    let bands = pr.f("frequencyBands").round().clamp(1.0, 4096.0) as usize;
-    let f0 = pr.f("startFrequency").max(0.0);
-    let f1 = pr.f("endFrequency").max(f0 + 1.0);
-    let max_bin = mags.len().saturating_sub(1);
-
-    let get_band_mag = |fc: f64| -> f64 {
-        if mags.is_empty() || hz_per_bin <= 0.0 {
-            return 0.0;
-        }
-        let k_float = (fc / hz_per_bin).clamp(0.0, max_bin as f64);
-        let k0 = (k_float.floor() as usize).min(max_bin.saturating_sub(1));
-        let k1 = (k0 + 1).min(max_bin);
-        let frac = (k_float - k0 as f64).clamp(0.0, 1.0);
-        let m0 = mags.get(k0).copied().unwrap_or(0.0);
-        let m1 = mags.get(k1).copied().unwrap_or(0.0);
-        m0 * (1.0 - frac) + m1 * frac
-    };
-
-    let max_h = pr.f("maximumHeight") * b.scale;
-    let thick = (pr.f("thickness") * b.scale).max(0.1);
-    let soft = pr.f("softness") / 100.0;
-    let disp = pr.e("displayOptions");
-    let side = pr.e("sideOptions");
-    let base = Baseline::new(ctx, b);
-    let mut tops = Vec::with_capacity(bands);
-    let mut segs = Vec::new();
-    for i in 0..bands {
-        let u = if bands > 1 { i as f64 / (bands - 1) as f64 } else { 0.5 };
-        let fc = f0 + (f1 - f0) * u;
-        let v = get_band_mag(fc);
-        let hgt = if (v * max_h).is_finite() { (v * max_h).clamp(0.0, max_h.max(0.0)) } else { 0.0 };
-        let (q, nrm) = base.at(u);
-        let (ua, ub) = match side {
-            0 => (0.0, hgt),
-            1 => (-hgt, 0.0),
-            _ => (-hgt, hgt),
-        };
-        let pa = [q[0] + nrm[0] * ua, q[1] + nrm[1] * ua];
-        let pb = [q[0] + nrm[0] * ub, q[1] + nrm[1] * ub];
-        match disp {
-            0 => segs.push(Seg { a: pa, b: pb, r: thick * 0.5, v: 1.0 }),
-            _ => tops.push((pa, pb)),
-        }
-    }
-    if disp == 1 {
-        for w2 in tops.windows(2) {
-            segs.push(Seg { a: w2[0].1, b: w2[1].1, r: thick * 0.5, v: 1.0 });
-            if side == 2 {
-                segs.push(Seg { a: w2[0].0, b: w2[1].0, r: thick * 0.5, v: 1.0 });
-            }
-        }
-    } else if disp == 2 {
-        for &(pa, pb) in &tops {
-            segs.push(Seg { a: pb, b: pb, r: thick * 0.5, v: 1.0 });
-            if side == 2 {
-                segs.push(Seg { a: pa, b: pa, r: thick * 0.5, v: 1.0 });
-            }
-        }
-    }
-    Some(marks(ctx, segs, thick, soft))
-}
-
-fn waveform_plan(ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
-    let pr = ctx.params;
-    let samples = audio_window(ctx, pr.f("audioDuration"), pr.f("audioOffset"), pr.e("waveformOptions"))?;
-    let count = pr.f("displayedSamples").round().clamp(2.0, 4096.0) as usize;
-    let max_h = pr.f("maximumHeight") * b.scale;
-    let thick = (pr.f("thickness") * b.scale).max(0.1);
-    let soft = pr.f("softness") / 100.0;
-    let disp = pr.e("displayOptions");
-    let base = Baseline::new(ctx, b);
-    let m = samples.len();
-    let mut pts = Vec::with_capacity(count);
-    let mut segs = Vec::new();
-    for i in 0..count {
-        let u = i as f64 / (count - 1) as f64;
-        let a = ((u * (m - 1) as f64) as usize).min(m - 1);
-        let bnd = (((i + 1) as f64 / count as f64 * (m - 1) as f64) as usize).clamp(a, m - 1);
-        // Peak with sign of the window for a stable digital display.
-        let (mut lo, mut hi) = (0.0f64, 0.0f64);
-        for s in &samples[a..=bnd] {
-            lo = lo.min(*s);
-            hi = hi.max(*s);
-        }
-        let (q, nrm) = base.at(u);
-        match disp {
-            0 => segs.push(Seg {
-                a: [q[0] + nrm[0] * lo * max_h, q[1] + nrm[1] * lo * max_h],
-                b: [q[0] + nrm[0] * hi * max_h, q[1] + nrm[1] * hi * max_h],
-                r: thick * 0.5,
-                v: 1.0,
-            }),
-            _ => {
-                let v = samples[a] * max_h;
-                pts.push([q[0] + nrm[0] * v, q[1] + nrm[1] * v]);
-            }
-        }
-    }
-    if disp == 1 {
-        poly_segs(&pts, false, thick * 0.5, 1.0, &mut segs);
-    } else if disp == 2 {
-        segs.extend(pts.iter().map(|&q| Seg { a: q, b: q, r: thick * 0.5, v: 1.0 }));
-    }
-    Some(marks(ctx, segs, thick, soft))
-}
-
-// ---------------------------------------------------------------- registry
-
-pub fn specs() -> Vec<EffectSpec> {
-    let ang = || ParamUi::Angle;
-    let check = |id: &'static str, name: &'static str, v: bool| p(id, name, Value::Bool(v), ParamUi::Checkbox);
-    let paint_style = || popup(&["On Original Image", "On Transparent", "Reveal Original Image"]);
-    let mask_idx = |id: &'static str, name: &'static str, d: f64| p(id, name, num(d), ParamUi::Mask);
-    let display = || popup(&["Digital", "Analog lines", "Analog dots"]);
-    vec![
-        spec(
-            "ec.generate.fractal",
-            "Fractal",
-            vec![
-                p("setChoice", "Set Choice", Value::Enum(0), popup(&FRACTAL_SETS)),
-                p("equation", "Equation", Value::Enum(0), popup(&["z = z^2 + c", "z = z^3 + c", "z = z^4 + c"])),
-                p("mandelbrot/mandelbrotX", "X (Real)", num(-0.74), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                p("mandelbrot/mandelbrotY", "Y (Imaginary)", num(0.15), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                p("mandelbrot/mandelbrotMagnification", "Magnification", num(0.0), slider(-5.0, 30.0, -5.0, 30.0, 2)),
-                p("mandelbrot/mandelbrotEscapeLimit", "Escape Limit", num(4.0), slider(1.0, 1000.0, 1.0, 100.0, 1)),
-                p("julia/juliaX", "X (Real)", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                p("julia/juliaY", "Y (Imaginary)", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                p("julia/juliaMagnification", "Magnification", num(0.0), slider(-5.0, 30.0, -5.0, 30.0, 2)),
-                p("julia/juliaEscapeLimit", "Escape Limit", num(4.0), slider(1.0, 1000.0, 1.0, 100.0, 1)),
-                p("postInversionOffset/postInversionX", "X Offset", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                p("postInversionOffset/postInversionY", "Y Offset", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
-                check("fractalColor/overlay", "Overlay", false),
-                check("fractalColor/transparency", "Transparency", false),
-                p("fractalColor/palette", "Palette", Value::Enum(0), popup(&FRACTAL_PALETTES)),
-                p("fractalColor/hue", "Hue", num(0.0), ang()),
-                p("fractalColor/cycleSteps", "Cycle Steps", num(32.0), slider(1.0, 1000.0, 1.0, 256.0, 0)),
-                p("fractalColor/cycleOffset", "Cycle Offset", num(0.0), ang()),
-                check("fractalColor/edgeHighlight", "Edge Highlight", false),
-                p("highQualitySettings/samplingMethod", "Oversample Method", Value::Enum(0), popup(&FRACTAL_OVERSAMPLE)),
-                p("highQualitySettings/samplingFactor", "Oversample Factor", num(2.0), slider(1.0, 9.0, 1.0, 9.0, 0)),
-            ],
-            fractal,
-        ),
-        spec(
-            "ec.generate.scribble",
-            "Scribble",
-            vec![
-                p("scribble", "Scribble", Value::Enum(0), popup(&["Single Mask", "All Masks", "All Masks Using Modes"])),
-                mask_idx("mask", "Mask", 1.0),
-                p("fillType", "Fill Type", Value::Enum(0), popup(&["Inside", "Centered Edge", "Inside Edge", "Outside Edge", "Left Edge", "Right Edge"])),
-                p("edgeOptions/edgeWidth", "Edge Width", num(10.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
-                p("edgeOptions/endCap", "End Cap", Value::Enum(0), popup(&END_CAPS)),
-                p("edgeOptions/join", "Join", Value::Enum(0), popup(&JOINS)),
-                p("edgeOptions/miterLimit", "Miter Limit", num(4.0), slider(1.0, 100.0, 1.0, 20.0, 1)),
-                p("color", "Color", col(1.0, 0.0, 0.0), ParamUi::Color),
-                p("opacity", "Opacity", num(100.0), pct()),
-                p("angle", "Angle", num(45.0), ang()),
-                p("strokeWidth", "Stroke Width", num(2.0), slider(0.1, 50.0, 0.1, 50.0, 1)),
-                p("strokeOptions/curviness", "Curviness", num(50.0), pct()),
-                p("strokeOptions/curvinessVariation", "Curviness Variation", num(50.0), pct()),
-                p("strokeOptions/spacing", "Spacing", num(5.0), slider(0.1, 100.0, 0.1, 50.0, 1)),
-                p("strokeOptions/spacingVariation", "Spacing Variation", num(50.0), pct()),
-                p("strokeOptions/pathOverlap", "Path Overlap", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
-                p("strokeOptions/pathOverlapVariation", "Path Overlap Variation", num(50.0), pct()),
-                p("start", "Start", num(0.0), pct()),
-                p("end", "End", num(100.0), pct()),
-                p("startEndApplyTo", "Start/End Apply To", Value::Enum(0), popup(&["All Strokes", "Each Stroke"])),
-                check("fillPathsSequentially", "Fill Paths Sequentially", true),
-                p("wiggleType", "Wiggle Type", Value::Enum(1), popup(&["Static", "Jumpy", "Smooth"])),
-                p("wigglesPerSecond", "Wiggles/Second", num(5.0), slider(0.0, 100.0, 0.0, 30.0, 2)),
-                p("randomSeed", "Random Seed", num(1.0), slider(0.0, 10000.0, 0.0, 100.0, 0)),
-                p("composite", "Composite", Value::Enum(1), popup(&["On Original Image", "On Transparent", "Reveal Original Image"])),
-            ],
-            scribble,
-        ),
-        spec(
-            "ec.generate.stroke",
-            "Stroke",
-            vec![
-                mask_idx("path", "Path", 1.0),
-                check("allMasks", "All Masks", false),
-                check("strokeSequentially", "Stroke Sequentially", true),
-                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("brushSize", "Brush Size", num(2.0), slider(0.0, 50.0, 0.0, 50.0, 1)),
-                p("brushHardness", "Brush Hardness", num(75.0), pct()),
-                p("opacity", "Opacity", num(100.0), pct()),
-                p("start", "Start", num(0.0), pct()),
-                p("end", "End", num(100.0), pct()),
-                p("spacing", "Spacing", num(15.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
-                p("paintStyle", "Paint Style", Value::Enum(0), paint_style()),
-            ],
-            stroke,
-        ),
-        spec(
-            "ec.generate.vegas",
-            "Vegas",
-            vec![
-                p("stroke", "Stroke", Value::Enum(0), popup(&["Image Contours", "Mask/Path"])),
-                p("inputLayer", "Image Contours: Input Layer", Value::Layer(None), ParamUi::Layer),
-                check("invertInput", "Image Contours: Invert Input", false),
-                p("ifLayerSizesDiffer", "Image Contours: If Layer Sizes Differ", Value::Enum(0), popup(&["Center", "Stretch to Fit"])),
-                p("channel", "Image Contours: Channel", Value::Enum(0), popup(&["Intensity", "Red", "Green", "Blue", "Alpha"])),
-                p("threshold", "Image Contours: Threshold", num(50.0), pct()),
-                p("preBlur", "Image Contours: Pre-Blur", num(1.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
-                p("tolerance", "Image Contours: Tolerance", num(0.01), slider(0.0, 1.0, 0.0, 0.1, 3)),
-                p("renderMode", "Image Contours: Render", Value::Enum(0), popup(&["All Contours", "Selected Contour"])),
-                p("selectedContour", "Image Contours: Selected Contour", num(1.0), slider(1.0, 1000.0, 1.0, 20.0, 0)),
-                p("shorterContoursHave", "Image Contours: Shorter Contours Have", Value::Enum(0), popup(&["Same Number of Segments", "Fewer Segments"])),
-                mask_idx("path", "Mask/Path: Path", 1.0),
-                p("segments", "Segments: Segments", num(32.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
-                p("length", "Segments: Length", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("segmentDistribution", "Segments: Segment Distribution", Value::Enum(0), popup(&["Bunched", "Even"])),
-                p("rotation", "Segments: Rotation", num(0.0), ang()),
-                check("randomPhase", "Segments: Random Phase", false),
-                p("randomSeed", "Segments: Random Seed", num(1.0), slider(1.0, 10000.0, 1.0, 100.0, 0)),
-                p("blendMode", "Rendering: Blend Mode", Value::Enum(1), popup(&["Transparent", "Over", "Under", "Stencil"])),
-                p("color", "Rendering: Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("width", "Rendering: Width", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
-                p("hardness", "Rendering: Hardness", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("startOpacity", "Rendering: Start Opacity", num(1.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("midpointOpacity", "Rendering: Mid-point Opacity", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("midpointPosition", "Rendering: Mid-point Position", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("endOpacity", "Rendering: End Opacity", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-            ],
-            vegas,
-        ),
-        spec(
-            "ec.generate.writeon",
-            "Write-on",
-            vec![
-                p("brushPosition", "Brush Position", pt(0.5, 0.5), ParamUi::Point),
-                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("brushSize", "Brush Size", num(6.0), slider(0.0, 50.0, 0.0, 50.0, 1)),
-                p("brushHardness", "Brush Hardness", num(75.0), pct()),
-                p("brushOpacity", "Brush Opacity", num(100.0), pct()),
-                p("strokeLength", "Stroke Length (secs)", num(0.0), slider(0.0, 30.0, 0.0, 30.0, 1)),
-                p("brushSpacing", "Brush Spacing (secs)", num(0.001), slider(0.001, 5.0, 0.001, 5.0, 3)),
-                p("paintTimeProperties", "Paint Time Properties", Value::Enum(0), popup(&["None", "Opacity", "Color"])),
-                p("brushTimeProperties", "Brush Time Properties", Value::Enum(0), popup(&["None", "Size", "Hardness", "Size & Hardness"])),
-                p("paintStyle", "Paint Style", Value::Enum(0), paint_style()),
-            ],
-            write_on,
-        ),
-        spec(
-            "ec.generate.paintbucket",
-            "Paint Bucket",
-            vec![
-                p("fillPoint", "Fill Point", pt(0.5, 0.5), ParamUi::Point),
-                p("fillSelector", "Fill Selector", Value::Enum(0), popup(&["Color & Alpha", "Straight Color", "Transparency", "Opacity", "Alpha Channel"])),
-                p("tolerance", "Tolerance", num(10.0), slider(0.0, 255.0, 0.0, 100.0, 1)),
-                check("viewThreshold", "View Threshold", false),
-                p("stroke", "Stroke", Value::Enum(0), popup(&["Antialias", "Feather", "Spread", "Choke", "Stroke"])),
-                p("featherSoftness", "Feather Softness", num(10.0), slider(0.0, 100.0, 0.0, 50.0, 1)),
-                p("spreadRadius", "Spread Radius", num(3.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
-                p("strokeWidth", "Stroke Width", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
-                p("color", "Color", col(1.0, 0.0, 0.0), ParamUi::Color),
-                p("opacity", "Opacity", num(100.0), pct()),
-                p(
-                    "blendingMode",
-                    "Blending Mode",
-                    Value::Enum(0),
-                    popup(&["Normal", "Add", "Multiply", "Screen", "Hue", "Saturation", "Color", "Luminosity", "Behind", "Fill Only"]),
-                ),
-            ],
-            paint_bucket,
-        ),
-        spec(
-            "ec.generate.eyedropperfill",
-            "Eyedropper Fill",
-            vec![
-                p("samplePoint", "Sample Point", pt(0.5, 0.5), ParamUi::Point),
-                p("sampleRadius", "Sample Radius", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
-                p("averagePixelColors", "Average Pixel Colors", Value::Enum(0), popup(&["Skip Empty", "All", "All Premultiplied", "Including Alpha"])),
-                check("maintainOriginalAlpha", "Maintain Original Alpha", false),
-                p("blendWithOriginal", "Blend With Original", num(0.0), pct()),
-            ],
-            eyedropper_fill,
-        ),
-        spec(
-            "ec.generate.ccgluegun",
-            "CC Glue Gun",
-            vec![
-                p("brushPosition", "Brush Position", pt(0.5, 0.5), ParamUi::Point),
-                p("strokeWidth", "Stroke Width", num(25.0), slider(0.0, 500.0, 0.0, 100.0, 1)),
-                p("density", "Density", num(5.0), slider(0.0, 32.0, 0.0, 32.0, 1)),
-                p("timeSpan", "Time Span (sec)", num(1.0), slider(0.0, 60.0, 0.0, 10.0, 2)),
-                p("reflection", "Reflection", num(45.0), ang()),
-                p("strength", "Strength", num(100.0), pct()),
-                p("style", "Style", Value::Enum(0), popup(&["Over Layer", "Glue Only"])),
-            ],
-            glue_gun,
-        ),
-        spec(
-            "ec.generate.ccthreads",
-            "CC Threads",
-            vec![
-                p("width", "Width", num(50.0), slider(1.0, 1000.0, 1.0, 200.0, 1)),
-                p("height", "Height", num(50.0), slider(1.0, 1000.0, 1.0, 200.0, 1)),
-                p("overlaps", "Overlaps", num(1.0), slider(1.0, 20.0, 1.0, 10.0, 0)),
-                p("direction", "Direction", num(0.0), ang()),
-                p("center", "Center", pt(0.5, 0.5), ParamUi::Point),
-                p("coverage", "Coverage", num(80.0), pct()),
-                p("shadowing", "Shadowing", num(50.0), pct()),
-                p("texture", "Texture", num(10.0), pct()),
-            ],
-            threads,
-        ),
-        spec(
-            "ec.generate.audiospectrum",
-            "Audio Spectrum",
-            vec![
-                p("audioLayer", "Audio Layer", Value::Layer(None), ParamUi::Layer),
-                p("startPoint", "Start Point", pt(0.1, 0.5), ParamUi::Point),
-                p("endPoint", "End Point", pt(0.9, 0.5), ParamUi::Point),
-                mask_idx("path", "Path", 0.0),
-                check("usePolarPath", "Use Polar Path", false),
-                p("startFrequency", "Start Frequency", num(20.0), slider(1.0, 20000.0, 1.0, 2000.0, 0)),
-                p("endFrequency", "End Frequency", num(2000.0), slider(1.0, 20000.0, 1.0, 10000.0, 0)),
-                p("frequencyBands", "Frequency bands", num(64.0), slider(1.0, 4096.0, 1.0, 256.0, 0)),
-                p("maximumHeight", "Maximum Height", num(50.0), slider(0.0, 10000.0, 0.0, 500.0, 1)),
-                p("audioDuration", "Audio Duration (milliseconds)", num(90.0), slider(1.0, 30000.0, 1.0, 1000.0, 1)),
-                p("audioOffset", "Audio Offset (milliseconds)", num(0.0), slider(-30000.0, 30000.0, -1000.0, 1000.0, 1)),
-                p("thickness", "Thickness", num(3.0), slider(0.0, 1000.0, 0.0, 50.0, 2)),
-                p("softness", "Softness", num(50.0), pct()),
-                p("insideColor", "Inside Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("outsideColor", "Outside Color", col(0.2, 0.4, 1.0), ParamUi::Color),
-                check("blendOverlappingColors", "Blend Overlapping Colors", true),
-                p("hueInterpolation", "Hue Interpolation", num(0.0), ang()),
-                check("dynamicHuePhase", "Dynamic Hue Phase", false),
-                check("colorSymmetry", "Color Symmetry", false),
-                p("displayOptions", "Display Options", Value::Enum(0), display()),
-                p("sideOptions", "Side Options", Value::Enum(0), popup(&["Side A", "Side B", "Side A & B"])),
-                check("durationAveraging", "Duration Averaging", false),
-                check("compositeOnOriginal", "Composite On Original", false),
-            ],
-            audio_spectrum,
-        ),
-        spec(
-            "ec.generate.audiowaveform",
-            "Audio Waveform",
-            vec![
-                p("audioLayer", "Audio Layer", Value::Layer(None), ParamUi::Layer),
-                p("startPoint", "Start Point", pt(0.1, 0.5), ParamUi::Point),
-                p("endPoint", "End Point", pt(0.9, 0.5), ParamUi::Point),
-                mask_idx("path", "Path", 0.0),
-                check("usePolarPath", "Use Polar Path", false),
-                p("displayedSamples", "Displayed Samples", num(200.0), slider(2.0, 4096.0, 2.0, 1000.0, 0)),
-                p("maximumHeight", "Maximum Height", num(100.0), slider(0.0, 10000.0, 0.0, 500.0, 1)),
-                p("audioDuration", "Audio Duration (milliseconds)", num(200.0), slider(1.0, 30000.0, 1.0, 1000.0, 1)),
-                p("audioOffset", "Audio Offset (milliseconds)", num(0.0), slider(-30000.0, 30000.0, -1000.0, 1000.0, 1)),
-                p("thickness", "Thickness", num(2.0), slider(0.0, 1000.0, 0.0, 50.0, 2)),
-                p("softness", "Softness", num(10.0), pct()),
-                p("randomSeed", "Random Seed (Analog)", num(1.0), slider(1.0, 10000.0, 1.0, 100.0, 0)),
-                p("insideColor", "Inside Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("outsideColor", "Outside Color", col(0.2, 0.4, 1.0), ParamUi::Color),
-                p("waveformOptions", "Waveform Options", Value::Enum(0), popup(&["Mono", "Left", "Right"])),
-                p("displayOptions", "Display Options", Value::Enum(1), display()),
-                check("compositeOnOriginal", "Composite On Original", false),
-            ],
-            audio_waveform,
-        ),
-    ]
-}
+mod audio;
+mod common;
+mod fill;
+mod fractal;
+mod paths;
+mod raster;
+mod registry;
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, EffectHost, LayerPixels, MaskShape, Params};
+pub(crate) use audio::fft;
+pub use audio::{MarksPlan, marks_plan};
+pub use fill::{eyedropper_color, paint_bucket_region};
+#[cfg(test)]
+use paths::contours;
+pub use paths::{Coverage, PaintPlan, paint_plan, plan_reads_pixels, scribble_style};
+pub use raster::{Seg, poly_segs};
+pub(crate) use raster::{mask_px, raster_segs};
+#[cfg(test)]
+pub(crate) use raster::{raster_convex, stroke_outline};
+pub use registry::specs;
 
-    /// Run with point defaults scaled to the layer size.
-    pub(crate) fn run_env(id: &str, set: &[(&str, Value)], img: Image, time: f64, env: EffectEnv) -> Buf {
-        let s = crate::find(id).unwrap();
-        let ls = [img.width as f64, img.height as f64];
-        let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        for p in &s.params {
-            if let (ParamUi::Point, Value::Vec2(v)) = (&p.ui, &p.default) {
-                params.values.insert(p.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
-            }
-        }
-        for (k, v) in set {
-            assert!(params.values.contains_key(*k), "{id}: unknown {k}");
-            params.values.insert(k.to_string(), v.clone());
-        }
-        let ctx = EffectCtx { params: &params, time, layer_size: ls, seed: 3, adjustment: false, env };
-        crate::apply(s, &ctx, Buf { img, offset: [0.0, 0.0], scale: 1.0 })
-    }
-
-    fn run(id: &str, set: &[(&str, Value)], img: Image) -> Buf {
-        run_env(id, set, img, 0.5, EffectEnv::default())
-    }
-
-    fn square_mask() -> Vec<MaskShape> {
-        vec![MaskShape { name: "Mask 1".into(), points: vec![[16.0, 16.0], [48.0, 16.0], [48.0, 48.0], [16.0, 48.0]], closed: true, inverted: false }]
-    }
-
-    fn alpha_sum(img: &Image, x0: usize, y0: usize, x1: usize, y1: usize) -> f32 {
-        let mut s = 0.0;
-        for y in y0..y1 {
-            for x in x0..x1 {
-                s += img.data[y * img.width as usize + x][3];
-            }
-        }
-        s
-    }
-
-    #[test]
-    fn audio_spectrum_linear_frequency_and_linear_amplitude() {
-        let host = Tone; // Tone produces 440 Hz
-        let env = EffectEnv { host: Some(&host), comp_time: 1.0, ..Default::default() };
-        let img = Image::new(200, 100);
-        let out = run_env(
-            "ec.generate.audiospectrum",
-            &[
-                ("audioLayer", Value::Layer(Some(1))),
-                ("startPoint", Value::Vec2([0.0, 50.0])),
-                ("endPoint", Value::Vec2([200.0, 50.0])),
-                ("startFrequency", num(20.0)),
-                ("endFrequency", num(2000.0)),
-                ("frequencyBands", num(100.0)),
-                ("maximumHeight", num(40.0)),
-                ("thickness", num(2.0)),
-                ("softness", num(0.0)),
-            ],
-            img,
-            1.0,
-            env,
-        );
-        // Verify 440 Hz tone produces a peak above baseline, while high frequencies have zero bar height
-        let peak_zone = alpha_sum(&out.img, 36, 10, 48, 48);
-        let high_zone = alpha_sum(&out.img, 120, 10, 150, 48);
-        let silent_zone = alpha_sum(&out.img, 170, 10, 195, 48);
-        assert!(peak_zone > 5.0, "peak zone has energy: {peak_zone}");
-        assert!(peak_zone > high_zone * 2.0, "linear peak is distinctly taller than far frequencies: {peak_zone} vs {high_zone}");
-        assert_eq!(silent_zone, 0.0, "silent end has zero height, not boosted by dB scale");
-    }
-
-    #[test]
-    fn fractal_deterministic_and_has_inside_set() {
-        let img = Image::new(64, 48);
-        let a = run("ec.generate.fractal", &[], img.clone());
-        let b = run("ec.generate.fractal", &[], img.clone());
-        assert_eq!(a.img.data, b.img.data);
-        // The default view contains the main cardioid (black, opaque) and escaped (coloured) points.
-        assert!(a.img.data.iter().any(|p| p[3] > 0.99 && p[0] + p[1] + p[2] < 0.01));
-        assert!(a.img.data.iter().any(|p| p[0] + p[1] + p[2] > 0.3));
-        let t = run("ec.generate.fractal", &[("fractalColor/transparency", Value::Bool(true))], img);
-        assert!(t.img.data.iter().any(|p| p[3] == 0.0));
-    }
-
-    #[test]
-    fn fractal_palettes_and_set_choices() {
-        let img = Image::new(64, 48);
-        // Solid Color: only the inside of the set is drawn; Transparency flips it.
-        let solid = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(3))], img.clone());
-        assert!(solid.img.data.iter().any(|p| p[3] == 0.0) && solid.img.data.iter().any(|p| p[3] > 0.99 && p[0] > 0.9));
-        let flipped = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(3)), ("fractalColor/transparency", Value::Bool(true))], img.clone());
-        for (a, b) in solid.img.data.iter().zip(&flipped.img.data) {
-            assert!((a[3] > 0.5) != (b[3] > 0.5) || (a[3] - 0.5).abs() < 0.49);
-        }
-        // Black And White: escaped pixels are pure black or white (away from supersampled edges).
-        let bw = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(2)), ("highQualitySettings/samplingFactor", num(1.0))], img.clone());
-        assert!(bw.img.data.iter().all(|p| p[0] == p[1] && p[1] == p[2] && (p[0] == 0.0 || p[0] == 1.0)));
-        // Mandelbrot Over Julia depends on the Julia centre.
-        let o1 = run("ec.generate.fractal", &[("setChoice", Value::Enum(2)), ("julia/juliaX", num(0.3))], img.clone());
-        let o2 = run("ec.generate.fractal", &[("setChoice", Value::Enum(2)), ("julia/juliaX", num(-0.2))], img.clone());
-        assert_ne!(o1.img.data, o2.img.data);
-        let plain = run("ec.generate.fractal", &[("julia/juliaX", num(0.3))], img);
-        assert_ne!(o1.img.data, plain.img.data);
-    }
-
-    #[test]
-    fn scribble_fills_mask_and_animates() {
-        let masks = square_mask();
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let img = Image::filled(64, 64, [0.0, 0.0, 1.0, 1.0]);
-        let a = run_env("ec.generate.scribble", &[], img.clone(), 0.5, env);
-        let b = run_env("ec.generate.scribble", &[], img.clone(), 0.5, env);
-        assert_eq!(a.img.data, b.img.data);
-        let inside = alpha_sum(&a.img, 18, 18, 46, 46);
-        let outside = alpha_sum(&a.img, 0, 0, 10, 64);
-        assert!(inside > 100.0 && outside < 1.0, "{inside} {outside}");
-        let c = run_env("ec.generate.scribble", &[], img.clone(), 1.5, env);
-        assert_ne!(a.img.data, c.img.data, "jumpy wiggle changes over time");
-        let s = run_env("ec.generate.scribble", &[("wiggleType", Value::Enum(0))], img.clone(), 0.5, env);
-        let s2 = run_env("ec.generate.scribble", &[("wiggleType", Value::Enum(0))], img.clone(), 3.5, env);
-        assert_eq!(s.img.data, s2.img.data, "static wiggle is constant");
-        let half = run_env("ec.generate.scribble", &[("end", num(50.0))], img, 0.5, env);
-        assert!(alpha_sum(&half.img, 0, 0, 64, 64) < alpha_sum(&a.img, 0, 0, 64, 64));
-    }
-
-    #[test]
-    fn scribble_edge_types() {
-        let masks = square_mask();
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let img = Image::new(64, 64);
-        let o = run_env("ec.generate.scribble", &[("fillType", Value::Enum(3)), ("edgeOptions/edgeWidth", num(6.0))], img, 0.5, env);
-        // Outside edge: paint near the border outside, nothing in the centre.
-        assert!(alpha_sum(&o.img, 26, 26, 38, 38) < 0.5);
-        assert!(alpha_sum(&o.img, 8, 8, 16, 56) > 5.0);
-    }
-
-    #[test]
-    fn stroke_draws_along_mask() {
-        let masks = square_mask();
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let img = Image::new(64, 64);
-        let a = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("paintStyle", Value::Enum(1))], img.clone(), 0.0, env);
-        assert!(a.img.get(32, 16)[3] > 0.9, "on the top edge");
-        assert!(a.img.get(32, 32)[3] < 0.01, "centre empty");
-        let b = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("end", num(25.0))], img.clone(), 0.0, env);
-        assert!(b.img.get(32, 16)[3] > 0.9 && b.img.get(48, 32)[3] < 0.01, "first quarter only");
-        let d = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("spacing", num(300.0))], img, 0.0, env);
-        assert!(alpha_sum(&d.img, 0, 0, 64, 64) < alpha_sum(&a.img, 0, 0, 64, 64), "spaced dabs");
-        // No masks: unchanged.
-        let src = Image::filled(8, 8, [0.2, 0.3, 0.4, 1.0]);
-        assert_eq!(run("ec.generate.stroke", &[], src.clone()).img.data, src.data);
-    }
-
-    #[test]
-    fn vegas_traces_contours() {
-        let mut img = Image::new(64, 64);
-        for y in 16..48 {
-            for x in 16..48 {
-                img.set(x, y, [1.0, 1.0, 1.0, 1.0]);
-            }
-        }
-        let a = run(
-            "ec.generate.vegas",
-            &[("blendMode", Value::Enum(0)), ("length", num(1.0)), ("midpointOpacity", num(1.0)), ("endOpacity", num(1.0))],
-            img.clone(),
-        );
-        let b = run(
-            "ec.generate.vegas",
-            &[("blendMode", Value::Enum(0)), ("length", num(1.0)), ("midpointOpacity", num(1.0)), ("endOpacity", num(1.0))],
-            img.clone(),
-        );
-        assert_eq!(a.img.data, b.img.data);
-        assert!(alpha_sum(&a.img, 14, 14, 50, 50) > 50.0, "edges drawn");
-        assert!(alpha_sum(&a.img, 26, 26, 38, 38) < 0.5, "interior untouched");
-        let r = run("ec.generate.vegas", &[("blendMode", Value::Enum(0)), ("rotation", num(90.0))], img);
-        assert_ne!(r.img.data, a.img.data);
-    }
-
-    #[test]
-    fn contours_of_square_are_closed() {
-        let mut pl = Plane::new(20, 20);
-        for y in 5..15 {
-            for x in 5..15 {
-                pl.data[y * 20 + x] = 1.0;
-            }
-        }
-        let c = contours(&pl, 0.5);
-        assert_eq!(c.len(), 1);
-        assert!(c[0].1);
-        let l = poly_length(&c[0].0, true);
-        assert!((l - 40.0).abs() < 4.0, "{l}");
-    }
-
-    #[test]
-    fn write_on_and_glue_gun_draw_at_brush() {
-        let img = Image::new(32, 32);
-        let a = run("ec.generate.writeon", &[], img.clone());
-        assert!(a.img.get(16, 16)[3] > 0.9 && a.img.get(2, 2)[3] == 0.0);
-        assert_eq!(a.img.data, run("ec.generate.writeon", &[], img.clone()).img.data);
-        let src = Image::filled(32, 32, [0.5, 0.2, 0.1, 1.0]);
-        let g = run("ec.generate.ccgluegun", &[], src.clone());
-        assert_eq!(g.img.data, run("ec.generate.ccgluegun", &[], src.clone()).img.data);
-        assert_ne!(g.img.get(16, 16), src.get(16, 16));
-        assert_eq!(g.img.get(0, 0), src.get(0, 0));
-    }
-
-    /// #536: an animated Brush Position draws a stroke that stays (Stroke Length 0), expires
-    /// after Stroke Length, and lays its dabs Brush Spacing seconds apart.
-    #[test]
-    fn write_on_accumulates_a_stroke_along_the_animated_brush() {
-        // Brush Position from [8, 16] at 0 s to [56, 16] at 1 s; red, hard, 6 px.
-        struct Brush(Vec<(&'static str, Value)>);
-        impl Brush {
-            fn at(&self, t: f64) -> Vec<(&'static str, Value)> {
-                let mut v = self.0.clone();
-                v.push(("brushPosition", Value::Vec2([8.0 + 48.0 * t.clamp(0.0, 1.0), 16.0])));
-                v
-            }
-        }
-        impl EffectHost for Brush {
-            fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
-                None
-            }
-            fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-                None
-            }
-            fn params_at(&self, t: f64) -> Option<Params> {
-                let s = crate::find("ec.generate.writeon").unwrap();
-                let mut p = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-                for (k, v) in self.at(t) {
-                    p.values.insert(k.to_string(), v);
-                }
-                Some(p)
-            }
-        }
-        let render = |extra: &[(&'static str, Value)], t: f64| {
-            let mut set = vec![("color", col(1.0, 0.0, 0.0)), ("brushSize", num(6.0)), ("brushHardness", num(100.0)), ("brushSpacing", num(0.05))];
-            set.extend(extra.iter().cloned());
-            let host = Brush(set);
-            let env = EffectEnv { host: Some(&host), ..Default::default() };
-            let at = host.at(t);
-            run_env("ec.generate.writeon", &at, Image::new(64, 32), t, env).img
-        };
-        let on = |img: &Image, x: i64| img.get(x, 16)[3] > 0.9;
-        let half = render(&[], 0.5);
-        assert!(on(&half, 8) && on(&half, 20) && on(&half, 32) && !on(&half, 44) && !on(&half, 56));
-        let end = render(&[], 1.0);
-        assert!([8, 20, 32, 44, 56].iter().all(|x| on(&end, *x)));
-        // Stroke Length 0.25 s: only the last quarter second's trail.
-        let trail = render(&[("strokeLength", num(0.25))], 1.0);
-        assert!(!on(&trail, 8) && !on(&trail, 32) && on(&trail, 48) && on(&trail, 56));
-        // Brush Spacing 0.5 s: three separate marks.
-        let spaced = render(&[("brushSpacing", num(0.5))], 1.0);
-        assert!(on(&spaced, 8) && on(&spaced, 32) && on(&spaced, 56) && !on(&spaced, 20) && !on(&spaced, 44));
-        // Paint Time Properties ▸ Opacity: each dab keeps the opacity it was laid with.
-        struct Fade;
-        impl EffectHost for Fade {
-            fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
-                None
-            }
-            fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-                None
-            }
-            fn params_at(&self, t: f64) -> Option<Params> {
-                let mut p = Brush(vec![("brushHardness", num(100.0)), ("brushSpacing", num(0.05)), ("paintTimeProperties", Value::Enum(1))]).params_at(t)?;
-                p.values.insert("brushOpacity".into(), num(if t < 0.5 { 100.0 } else { 20.0 }));
-                Some(p)
-            }
-        }
-        let p1 = Fade.params_at(1.0).unwrap();
-        let set: Vec<(&str, Value)> = p1.values.iter().map(|(k, v)| (k.as_str(), v.clone())).collect();
-        let faded = run_env("ec.generate.writeon", &set, Image::new(64, 32), 1.0, EffectEnv { host: Some(&Fade), ..Default::default() }).img;
-        assert!(faded.get(8, 16)[3] > 0.9 && (faded.get(56, 16)[3] - 0.2).abs() < 0.05, "{:?} {:?}", faded.get(8, 16), faded.get(56, 16));
-    }
-
-    #[test]
-    fn paint_bucket_fills_enclosed_region_only() {
-        let mut img = Image::filled(32, 32, [1.0, 1.0, 1.0, 1.0]);
-        for i in 8..24 {
-            for &(x, y) in &[(i, 8), (i, 23), (8, i), (23, i)] {
-                img.set(x, y, [0.0, 0.0, 0.0, 1.0]);
-            }
-        }
-        let out = run("ec.generate.paintbucket", &[], img.clone());
-        let inside = out.img.get(16, 16);
-        assert!(inside[0] > 0.99 && inside[1] < 0.01, "{inside:?}");
-        assert_eq!(out.img.get(2, 2), [1.0, 1.0, 1.0, 1.0], "outside untouched");
-        assert_eq!(out.img.get(8, 16), [0.0, 0.0, 0.0, 1.0], "border untouched");
-        assert_eq!(out.img.data, run("ec.generate.paintbucket", &[], img).img.data);
-    }
-
-    #[test]
-    fn eyedropper_fill_uses_sample() {
-        let mut img = Image::filled(16, 16, [0.0, 0.0, 1.0, 1.0]);
-        img.set(8, 8, [1.0, 0.0, 0.0, 1.0]);
-        let out = run("ec.generate.eyedropperfill", &[], img.clone());
-        assert!(out.img.data.iter().all(|p| *p == [1.0, 0.0, 0.0, 1.0]));
-        let blended = run("ec.generate.eyedropperfill", &[("blendWithOriginal", num(100.0))], img.clone());
-        assert_eq!(blended.img.data, img.data);
-    }
-
-    #[test]
-    fn threads_weave_is_deterministic_and_gappy() {
-        let src = Image::filled(64, 64, [0.4, 0.6, 0.2, 1.0]);
-        let a = run("ec.generate.ccthreads", &[("width", num(16.0)), ("height", num(16.0)), ("coverage", num(50.0))], src.clone());
-        assert_eq!(a.img.data, run("ec.generate.ccthreads", &[("width", num(16.0)), ("height", num(16.0)), ("coverage", num(50.0))], src).img.data);
-        assert!(a.img.data.iter().any(|p| p[3] == 0.0), "gaps between threads");
-        assert!(a.img.data.iter().any(|p| p[3] > 0.99), "threads");
-    }
-
-    struct Tone;
-    impl EffectHost for Tone {
-        fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
-            None
-        }
-        fn audio(&self, _: u64, start: f64, frames: usize, rate: u32) -> Option<Vec<f32>> {
-            Some(
-                (0..frames)
-                    .flat_map(|i| {
-                        let t = start + i as f64 / rate as f64;
-                        let v = (2.0 * PI * 440.0 * t).sin() as f32 * 0.8;
-                        [v, v]
-                    })
-                    .collect(),
-            )
-        }
-    }
-
-    #[test]
-    fn audio_effects_without_audio_pass_through() {
-        let src = Image::filled(16, 16, [0.3, 0.3, 0.3, 1.0]);
-        for id in ["ec.generate.audiospectrum", "ec.generate.audiowaveform"] {
-            assert_eq!(run(id, &[], src.clone()).img.data, src.data, "{id}");
-        }
-    }
-
-    #[test]
-    fn audio_effects_draw_with_host() {
-        let host = Tone;
-        let env = EffectEnv { host: Some(&host), comp_time: 1.0, ..Default::default() };
-        let img = Image::new(96, 64);
-        for id in ["ec.generate.audiospectrum", "ec.generate.audiowaveform"] {
-            let a = run_env(id, &[("audioLayer", Value::Layer(Some(1)))], img.clone(), 1.0, env);
-            let b = run_env(id, &[("audioLayer", Value::Layer(Some(1)))], img.clone(), 1.0, env);
-            assert_eq!(a.img.data, b.img.data, "{id}");
-            assert!(alpha_sum(&a.img, 0, 0, 96, 64) > 10.0, "{id} drew nothing");
-        }
-    }
-
-    #[test]
-    fn fft_finds_tone() {
-        let n = 256;
-        let mut re: Vec<f64> = (0..n).map(|i| (2.0 * PI * 8.0 * i as f64 / n as f64).cos()).collect();
-        let mut im = vec![0.0; n];
-        fft(&mut re, &mut im);
-        let mags: Vec<f64> = (0..n / 2).map(|k| (re[k] * re[k] + im[k] * im[k]).sqrt()).collect();
-        let peak = mags.iter().enumerate().max_by(|a, b| a.1.total_cmp(b.1)).unwrap().0;
-        assert_eq!(peak, 8);
-    }
-
-    #[test]
-    fn stroke_outline_caps_and_joins() {
-        let line = vec![vec![[10.0, 10.0], [30.0, 10.0]]];
-        let cov = |cap: u32| raster_convex(40, 20, &stroke_outline(&line, 3.0, cap, 0, 4.0));
-        // Round caps reach 3 px past the ends (on the axis), Butt stops there, Projecting is square.
-        let (round, butt, proj) = (cov(0), cov(1), cov(2));
-        assert!(round.get(8, 10) > 0.9 && butt.get(8, 10) < 0.1 && proj.get(8, 10) > 0.9);
-        assert!(proj.get(7, 7) > 0.9 && round.get(7, 7) < 0.5, "square corner");
-        // A right-angle turn: Miter fills the outer corner, Bevel cuts it.
-        let corner = vec![vec![[5.0, 30.0], [30.0, 30.0], [30.0, 5.0]]];
-        let j = |join: u32| raster_convex(40, 40, &stroke_outline(&corner, 3.0, 1, join, 4.0));
-        let (miter, bevel) = (j(1), j(2));
-        assert!(miter.get(32, 32) > 0.9 && bevel.get(32, 32) < 0.1, "{} {}", miter.get(32, 32), bevel.get(32, 32));
-        // A tight miter limit falls back to a bevel.
-        let limited = raster_convex(40, 40, &stroke_outline(&corner, 3.0, 1, 1, 1.0));
-        assert!(limited.get(32, 32) < 0.1);
-    }
-
-    #[test]
-    fn scribble_caps_and_start_end_apply_to() {
-        let masks = square_mask();
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let img = Image::new(64, 64);
-        let base = [("wiggleType", Value::Enum(0)), ("strokeWidth", num(3.0))];
-        let round = run_env("ec.generate.scribble", &base, img.clone(), 0.0, env);
-        let butt = run_env(
-            "ec.generate.scribble",
-            &[base.as_slice(), &[("edgeOptions/endCap", Value::Enum(1)), ("edgeOptions/join", Value::Enum(2))]].concat(),
-            img.clone(),
-            0.0,
-            env,
-        );
-        assert_ne!(round.img.data, butt.img.data);
-        // Each Stroke: every stroke is trimmed on its own, so the half-way image has ink all over.
-        let two = vec![
-            crate::MaskShape { name: String::new(), points: vec![[4.0, 4.0], [28.0, 4.0], [28.0, 60.0], [4.0, 60.0]], closed: true, inverted: false },
-            crate::MaskShape { name: String::new(), points: vec![[36.0, 4.0], [60.0, 4.0], [60.0, 60.0], [36.0, 60.0]], closed: true, inverted: false },
-        ];
-        let env2 = EffectEnv { masks: &two, ..Default::default() };
-        let seq = [("scribble", Value::Enum(1)), ("end", num(50.0))];
-        let all = run_env("ec.generate.scribble", &[base.as_slice(), &seq].concat(), img.clone(), 0.0, env2);
-        let each = run_env("ec.generate.scribble", &[base.as_slice(), &seq, &[("startEndApplyTo", Value::Enum(1))]].concat(), img, 0.0, env2);
-        assert_ne!(all.img.data, each.img.data);
-    }
-}
+#[cfg(test)]
+mod tests;
diff --git a/crates/effects/src/generate3/audio.rs b/crates/effects/src/generate3/audio.rs
new file mode 100644
index 000000000..6c8d66e4a
--- /dev/null
+++ b/crates/effects/src/generate3/audio.rs
@@ -0,0 +1,314 @@
+use super::raster::{Seg, mask_px, over, poly_segs, raster_segs};
+use super::{Buf, EffectCtx, IndexedParallelIterator, IntoParallelRefMutIterator, PI, ParallelIterator, poly_length, premul};
+
+// ---------------------------------------------------------------- Audio Spectrum / Waveform
+
+/// In-place iterative radix-2 FFT (`re`, `im` lengths a power of two).
+pub(crate) fn fft(re: &mut [f64], im: &mut [f64]) {
+    let n = re.len();
+    if n < 2 {
+        return;
+    }
+    let mut j = 0;
+    for i in 1..n {
+        let mut bit = n >> 1;
+        while j & bit != 0 {
+            j ^= bit;
+            bit >>= 1;
+        }
+        j |= bit;
+        if i < j {
+            re.swap(i, j);
+            im.swap(i, j);
+        }
+    }
+    let mut len = 2;
+    while len <= n {
+        let ang = -2.0 * PI / len as f64;
+        let (ws, wc) = ang.sin_cos();
+        for start in (0..n).step_by(len) {
+            let (mut cr, mut ci) = (1.0, 0.0);
+            for k in 0..len / 2 {
+                let (a, bb) = (start + k, start + k + len / 2);
+                let tr = re[bb] * cr - im[bb] * ci;
+                let ti = re[bb] * ci + im[bb] * cr;
+                re[bb] = re[a] - tr;
+                im[bb] = im[a] - ti;
+                re[a] += tr;
+                im[a] += ti;
+                let ncr = cr * wc - ci * ws;
+                ci = cr * ws + ci * wc;
+                cr = ncr;
+            }
+        }
+        len <<= 1;
+    }
+}
+
+const AUDIO_RATE: u32 = 48_000;
+
+/// Fetch mono (or one channel) samples of the audio layer around the current time.
+fn audio_window(ctx: &EffectCtx, dur_ms: f64, offset_ms: f64, channel: u32) -> Option<Vec<f64>> {
+    let id = ctx.params.get("audioLayer")?.as_layer()?;
+    let host = ctx.env.host?;
+    let dur = (dur_ms / 1000.0).max(0.001);
+    let frames = ((dur * AUDIO_RATE as f64) as usize).clamp(16, 1 << 16);
+    let start = ctx.env.comp_time + offset_ms / 1000.0 - dur * 0.5;
+    let s = host.audio(id, start, frames, AUDIO_RATE)?;
+    Some(
+        (0..frames)
+            .map(|i| {
+                let (l, r) = (*s.get(2 * i).unwrap_or(&0.0) as f64, *s.get(2 * i + 1).unwrap_or(&0.0) as f64);
+                match channel {
+                    1 => l,
+                    2 => r,
+                    _ => (l + r) * 0.5,
+                }
+            })
+            .collect(),
+    )
+}
+
+/// The drawing baseline: a polyline in buffer px (mask path or start→end line), sampled at
+/// parameter u∈[0,1] → (point, unit normal).
+struct Baseline {
+    pts: Vec<[f64; 2]>,
+    closed: bool,
+    len: f64,
+    polar: bool,
+    center: [f64; 2],
+    radius: f64,
+}
+
+impl Baseline {
+    fn new(ctx: &EffectCtx, b: &Buf) -> Baseline {
+        let pr = ctx.params;
+        let polar = pr.b("usePolarPath");
+        let (pts, closed) = match mask_px(ctx, b, pr.f("path").round() as usize) {
+            Some((p, c, _)) if !polar => (p, c),
+            _ => {
+                let s = b.to_px(pr.v2("startPoint"));
+                let e = b.to_px(pr.v2("endPoint"));
+                (vec![[s.0, s.1], [e.0, e.1]], false)
+            }
+        };
+        let len = poly_length(&pts, closed);
+        let center = pts[0];
+        let radius = if pts.len() > 1 { ((pts[1][0] - pts[0][0]).powi(2) + (pts[1][1] - pts[0][1]).powi(2)).sqrt() } else { 1.0 };
+        Baseline { pts, closed, len, polar, center, radius }
+    }
+    fn at(&self, u: f64) -> ([f64; 2], [f64; 2]) {
+        if self.polar {
+            let a = u * 2.0 * PI - PI * 0.5;
+            let (s, c) = a.sin_cos();
+            return ([self.center[0] + c * self.radius * 0.5, self.center[1] + s * self.radius * 0.5], [c, s]);
+        }
+        let (q, d) = crate::util::poly_point_at(&self.pts, self.closed, u * self.len);
+        (q, [d[1], -d[0]])
+    }
+}
+
+/// Draw line/dot marks with core (inside colour) and soft halo (outside colour).
+fn draw_marks(b: &mut Buf, segs_core: &[Seg], thickness: f64, softness: f64, inside: [f32; 4], outside: [f32; 4], composite: bool) {
+    let (w, h) = (b.img.width as usize, b.img.height as usize);
+    let core = raster_segs(w, h, segs_core, 1.0);
+    let halo_segs: Vec<Seg> = segs_core.iter().map(|s| Seg { r: s.r + thickness * softness.max(0.0) + 0.5, ..*s }).collect();
+    let halo = if softness > 0.0 { raster_segs(w, h, &halo_segs, 0.0) } else { core.clone() };
+    b.img.data.par_iter_mut().enumerate().for_each(|(i, px)| {
+        let (c, hl) = (core.data[i], halo.data[i]);
+        let a = c.max(hl);
+        let base = if composite { *px } else { [0.0; 4] };
+        if a <= 0.0 {
+            *px = base;
+            return;
+        }
+        let t = if a > 0.0 { c / a } else { 0.0 };
+        let col = crate::util::lerp3([outside[0], outside[1], outside[2]], [inside[0], inside[1], inside[2]], t);
+        *px = over(base, premul(col, a));
+    });
+}
+
+/// Audio Spectrum / Audio Waveform, shared with the GPU compositor (effectcraft-gpu `fx_gen2`):
+/// the marks (the audio analysis runs on the CPU) and how `draw_marks` colours them.
+#[derive(Clone, Debug)]
+pub struct MarksPlan {
+    pub segs: Vec<Seg>,
+    pub thickness: f64,
+    pub softness: f64,
+    pub inside: [f32; 4],
+    pub outside: [f32; 4],
+    pub composite: bool,
+}
+
+/// [`MarksPlan`] of Audio Spectrum or Audio Waveform on `b`'s geometry (`None` = no audio:
+/// the layer passes through).
+pub fn marks_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
+    match id {
+        "ec.generate.audiospectrum" => spectrum_plan(ctx, b),
+        "ec.generate.audiowaveform" => waveform_plan(ctx, b),
+        _ => None,
+    }
+}
+
+fn marks(ctx: &EffectCtx, segs: Vec<Seg>, thick: f64, soft: f64) -> MarksPlan {
+    let pr = ctx.params;
+    MarksPlan {
+        segs,
+        thickness: thick,
+        softness: soft * 2.0,
+        inside: pr.color("insideColor"),
+        outside: pr.color("outsideColor"),
+        composite: pr.b("compositeOnOriginal"),
+    }
+}
+
+pub(super) fn audio_spectrum(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    if let Some(m) = spectrum_plan(ctx, &b) {
+        draw_marks(&mut b, &m.segs, m.thickness, m.softness, m.inside, m.outside, m.composite);
+    }
+    b
+}
+
+pub(super) fn audio_waveform(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    if let Some(m) = waveform_plan(ctx, &b) {
+        draw_marks(&mut b, &m.segs, m.thickness, m.softness, m.inside, m.outside, m.composite);
+    }
+    b
+}
+
+fn compute_fft_mags(samples: &[f64]) -> (usize, f64, Vec<f64>) {
+    let m = samples.len();
+    let n = m.next_power_of_two().max(64);
+    let mut re = vec![0.0; n];
+    let mut im = vec![0.0; n];
+    let denom = (m.max(2) - 1) as f64;
+    for (i, s) in samples.iter().enumerate() {
+        let w = 0.5 - 0.5 * (2.0 * PI * i as f64 / denom).cos();
+        if let Some(r) = re.get_mut(i) {
+            *r = s * w;
+        }
+    }
+    fft(&mut re, &mut im);
+    let hz_per_bin = AUDIO_RATE as f64 / n as f64;
+    let scale = 4.0 / m.max(1) as f64;
+    let num_bins = n / 2 + 1;
+    let mut mags = Vec::with_capacity(num_bins);
+    for k in 0..num_bins {
+        let r = re.get(k).copied().unwrap_or(0.0);
+        let im_val = im.get(k).copied().unwrap_or(0.0);
+        let mag = (r * r + im_val * im_val).sqrt() * scale;
+        mags.push(mag);
+    }
+    (n, hz_per_bin, mags)
+}
+
+fn spectrum_plan(ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
+    let pr = ctx.params;
+    let samples = audio_window(ctx, pr.f("audioDuration"), pr.f("audioOffset"), 0)?;
+    let (_n, hz_per_bin, mags) = compute_fft_mags(&samples);
+
+    let bands = pr.f("frequencyBands").round().clamp(1.0, 4096.0) as usize;
+    let f0 = pr.f("startFrequency").max(0.0);
+    let f1 = pr.f("endFrequency").max(f0 + 1.0);
+    let max_bin = mags.len().saturating_sub(1);
+
+    let get_band_mag = |fc: f64| -> f64 {
+        if mags.is_empty() || hz_per_bin <= 0.0 {
+            return 0.0;
+        }
+        let k_float = (fc / hz_per_bin).clamp(0.0, max_bin as f64);
+        let k0 = (k_float.floor() as usize).min(max_bin.saturating_sub(1));
+        let k1 = (k0 + 1).min(max_bin);
+        let frac = (k_float - k0 as f64).clamp(0.0, 1.0);
+        let m0 = mags.get(k0).copied().unwrap_or(0.0);
+        let m1 = mags.get(k1).copied().unwrap_or(0.0);
+        m0 * (1.0 - frac) + m1 * frac
+    };
+
+    let max_h = pr.f("maximumHeight") * b.scale;
+    let thick = (pr.f("thickness") * b.scale).max(0.1);
+    let soft = pr.f("softness") / 100.0;
+    let disp = pr.e("displayOptions");
+    let side = pr.e("sideOptions");
+    let base = Baseline::new(ctx, b);
+    let mut tops = Vec::with_capacity(bands);
+    let mut segs = Vec::new();
+    for i in 0..bands {
+        let u = if bands > 1 { i as f64 / (bands - 1) as f64 } else { 0.5 };
+        let fc = f0 + (f1 - f0) * u;
+        let v = get_band_mag(fc);
+        let hgt = if (v * max_h).is_finite() { (v * max_h).clamp(0.0, max_h.max(0.0)) } else { 0.0 };
+        let (q, nrm) = base.at(u);
+        let (ua, ub) = match side {
+            0 => (0.0, hgt),
+            1 => (-hgt, 0.0),
+            _ => (-hgt, hgt),
+        };
+        let pa = [q[0] + nrm[0] * ua, q[1] + nrm[1] * ua];
+        let pb = [q[0] + nrm[0] * ub, q[1] + nrm[1] * ub];
+        match disp {
+            0 => segs.push(Seg { a: pa, b: pb, r: thick * 0.5, v: 1.0 }),
+            _ => tops.push((pa, pb)),
+        }
+    }
+    if disp == 1 {
+        for w2 in tops.windows(2) {
+            segs.push(Seg { a: w2[0].1, b: w2[1].1, r: thick * 0.5, v: 1.0 });
+            if side == 2 {
+                segs.push(Seg { a: w2[0].0, b: w2[1].0, r: thick * 0.5, v: 1.0 });
+            }
+        }
+    } else if disp == 2 {
+        for &(pa, pb) in &tops {
+            segs.push(Seg { a: pb, b: pb, r: thick * 0.5, v: 1.0 });
+            if side == 2 {
+                segs.push(Seg { a: pa, b: pa, r: thick * 0.5, v: 1.0 });
+            }
+        }
+    }
+    Some(marks(ctx, segs, thick, soft))
+}
+
+fn waveform_plan(ctx: &EffectCtx, b: &Buf) -> Option<MarksPlan> {
+    let pr = ctx.params;
+    let samples = audio_window(ctx, pr.f("audioDuration"), pr.f("audioOffset"), pr.e("waveformOptions"))?;
+    let count = pr.f("displayedSamples").round().clamp(2.0, 4096.0) as usize;
+    let max_h = pr.f("maximumHeight") * b.scale;
+    let thick = (pr.f("thickness") * b.scale).max(0.1);
+    let soft = pr.f("softness") / 100.0;
+    let disp = pr.e("displayOptions");
+    let base = Baseline::new(ctx, b);
+    let m = samples.len();
+    let mut pts = Vec::with_capacity(count);
+    let mut segs = Vec::new();
+    for i in 0..count {
+        let u = i as f64 / (count - 1) as f64;
+        let a = ((u * (m - 1) as f64) as usize).min(m - 1);
+        let bnd = (((i + 1) as f64 / count as f64 * (m - 1) as f64) as usize).clamp(a, m - 1);
+        // Peak with sign of the window for a stable digital display.
+        let (mut lo, mut hi) = (0.0f64, 0.0f64);
+        for s in &samples[a..=bnd] {
+            lo = lo.min(*s);
+            hi = hi.max(*s);
+        }
+        let (q, nrm) = base.at(u);
+        match disp {
+            0 => segs.push(Seg {
+                a: [q[0] + nrm[0] * lo * max_h, q[1] + nrm[1] * lo * max_h],
+                b: [q[0] + nrm[0] * hi * max_h, q[1] + nrm[1] * hi * max_h],
+                r: thick * 0.5,
+                v: 1.0,
+            }),
+            _ => {
+                let v = samples[a] * max_h;
+                pts.push([q[0] + nrm[0] * v, q[1] + nrm[1] * v]);
+            }
+        }
+    }
+    if disp == 1 {
+        poly_segs(&pts, false, thick * 0.5, 1.0, &mut segs);
+    } else if disp == 2 {
+        segs.extend(pts.iter().map(|&q| Seg { a: q, b: q, r: thick * 0.5, v: 1.0 }));
+    }
+    Some(marks(ctx, segs, thick, soft))
+}
diff --git a/crates/effects/src/generate3/common.rs b/crates/effects/src/generate3/common.rs
new file mode 100644
index 000000000..7e341ad8d
--- /dev/null
+++ b/crates/effects/src/generate3/common.rs
@@ -0,0 +1,13 @@
+use super::{EffectSpec, ParamUi, Value, slider};
+
+pub(super) fn spec(id: &'static str, name: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
+    EffectSpec { id, name, category: "Generate", params, render, gpu: false, float: true }
+}
+
+pub(super) fn pt(x: f64, y: f64) -> Value {
+    Value::Vec2([x, y])
+}
+
+pub(super) fn pct() -> ParamUi {
+    slider(0.0, 100.0, 0.0, 100.0, 1)
+}
diff --git a/crates/effects/src/generate3/fill.rs b/crates/effects/src/generate3/fill.rs
new file mode 100644
index 000000000..5df782a89
--- /dev/null
+++ b/crates/effects/src/generate3/fill.rs
@@ -0,0 +1,337 @@
+use super::raster::over;
+use super::{
+    Buf, EffectCtx, IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, PI, ParallelIterator, Plane, Px, gauss_plane, hash1,
+    hsl_to_rgb, morph_frac, premul, rgb_to_hsl, smoothstep, unpremul,
+};
+
+pub(super) fn glue_gun(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let q = b.to_px(pr.v2("brushPosition"));
+    let rad = (pr.f("strokeWidth") * b.scale * 0.5).max(0.5);
+    let density = pr.f("density").max(0.0);
+    let refl = pr.f("reflection").to_radians();
+    let strength = (pr.f("strength") / 100.0) as f32;
+    let glue_only = pr.e("style") == 1;
+    let src = b.img.clone();
+    let light = [refl.cos() * 0.6, -refl.sin() * 0.6, 0.53];
+    let beads = (density.round() as usize).clamp(1, 32);
+    let seed = ctx.seed;
+    let centers: Vec<([f64; 2], f64)> = (0..beads)
+        .map(|i| {
+            let a = hash1(i as u32, 1, seed) as f64 * 2.0 * PI;
+            let d = if i == 0 { 0.0 } else { hash1(i as u32, 2, seed) as f64 * rad * 0.35 };
+            ([q.0 + a.cos() * d, q.1 + a.sin() * d], rad * (0.75 + 0.25 * hash1(i as u32, 3, seed) as f64))
+        })
+        .collect();
+    b.img.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let (fx, fy) = (x as f64 + 0.5, y as f64 + 0.5);
+            // Height field: union of hemispheres.
+            let mut best = (0.0f64, [0.0f64; 2], 1.0f64);
+            for &(c, r) in &centers {
+                let (dx, dy) = ((fx - c[0]) / r, (fy - c[1]) / r);
+                let d2 = dx * dx + dy * dy;
+                if d2 < 1.0 {
+                    let hgt = (1.0 - d2).sqrt();
+                    if hgt > best.0 {
+                        best = (hgt, [dx, dy], r);
+                    }
+                }
+            }
+            if best.0 <= 0.0 {
+                if glue_only {
+                    *px = [0.0; 4];
+                }
+                continue;
+            }
+            let nrm = [best.1[0], best.1[1], best.0];
+            let ndl = (nrm[0] * light[0] + nrm[1] * light[1] + nrm[2] * light[2]).max(0.0);
+            let spec = ndl.powi(24) as f32;
+            // Refraction: look through the bead.
+            let s = src.sample_bilinear_clamped(fx - nrm[0] * best.2 * 0.5 * strength as f64, fy - nrm[1] * best.2 * 0.5 * strength as f64);
+            let edge = smoothstep(0.0, 0.15, best.0 as f32);
+            let shade = 0.65 + 0.35 * ndl as f32;
+            let g = [s[0] * shade + spec, s[1] * shade + spec, s[2] * shade + spec, s[3].max(0.6)];
+            let gp = [g[0].min(g[3] + spec), g[1].min(g[3] + spec), g[2].min(g[3] + spec), g[3].min(1.0)];
+            let base = if glue_only { [0.0; 4] } else { *px };
+            *px = crate::util::lerp4(base, gp, edge * strength.clamp(0.0, 1.0).max(0.3));
+            px[3] = px[3].clamp(0.0, 1.0);
+        }
+    });
+    b
+}
+
+// ---------------------------------------------------------------- Paint Bucket
+
+/// Paint Bucket's filled region (1 inside) on `b`: the flood fill from the Fill Point over the
+/// layer's pixels (shared with the GPU compositor, which reads the layer back for it).
+pub fn paint_bucket_region(ctx: &EffectCtx, b: &Buf) -> Plane {
+    let pr = ctx.params;
+    let (w, h) = (b.img.width as usize, b.img.height as usize);
+    let fp = b.to_px(pr.v2("fillPoint"));
+    let (sx, sy) = (fp.0.floor() as i64, fp.1.floor() as i64);
+    let sel = pr.e("fillSelector");
+    let tol = (pr.f("tolerance") / 255.0) as f32;
+    let key = |p: Px| -> [f32; 4] {
+        let (c, a) = unpremul(p);
+        match sel {
+            1 => [c[0], c[1], c[2], 0.0],
+            2 => [0.0, 0.0, 0.0, if a <= 1e-3 { 0.0 } else { 1.0 }],
+            3 | 4 => [0.0, 0.0, 0.0, a],
+            _ => p,
+        }
+    };
+    let mut region = Plane::new(w, h);
+    if sx >= 0 && sy >= 0 && (sx as usize) < w && (sy as usize) < h {
+        let seed = key(b.img.data[sy as usize * w + sx as usize]);
+        let within = |i: usize| {
+            let k = key(b.img.data[i]);
+            if sel == 2 {
+                return k[3] == seed[3];
+            }
+            (0..4).all(|j| (k[j] - seed[j]).abs() <= tol + 1e-6)
+        };
+        let mut seen = vec![false; w * h];
+        let mut stack = vec![(sx as usize, sy as usize)];
+        while let Some((x, y)) = stack.pop() {
+            let row = y * w;
+            if seen[row + x] || !within(row + x) {
+                continue;
+            }
+            let mut l = x;
+            while l > 0 && !seen[row + l - 1] && within(row + l - 1) {
+                l -= 1;
+            }
+            let mut r = x;
+            while r + 1 < w && !seen[row + r + 1] && within(row + r + 1) {
+                r += 1;
+            }
+            for i in l..=r {
+                seen[row + i] = true;
+                region.data[row + i] = 1.0;
+                if y > 0 && !seen[row - w + i] {
+                    stack.push((i, y - 1));
+                }
+                if y + 1 < h && !seen[row + w + i] {
+                    stack.push((i, y + 1));
+                }
+            }
+        }
+    }
+    region
+}
+
+pub(super) fn paint_bucket(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let (w, h) = (b.img.width as usize, b.img.height as usize);
+    if w == 0 || h == 0 {
+        return b;
+    }
+    let region = paint_bucket_region(ctx, &b);
+    if pr.b("viewThreshold") {
+        b.img.data.par_iter_mut().zip(region.data.par_iter()).for_each(|(px, &v)| *px = [v, v, v, 1.0]);
+        return b;
+    }
+    let sc = b.scale;
+    let mut cov = match pr.e("stroke") {
+        1 => {
+            let s = pr.f("featherSoftness") * sc * 0.5;
+            if s > 0.05 { gauss_plane(&region, s, s) } else { region.clone() }
+        }
+        2 => morph_frac(&region, pr.f("spreadRadius") * sc, true),
+        3 => morph_frac(&region, pr.f("spreadRadius") * sc, false),
+        4 => {
+            let r = pr.f("strokeWidth") * sc;
+            let out = morph_frac(&region, r * 0.5, true);
+            let inn = morph_frac(&region, r * 0.5, false);
+            out.zip_map(&inn, |a, b| (a - b).max(0.0))
+        }
+        _ => gauss_plane(&region, 0.5, 0.5),
+    };
+    if pr.e("stroke") == 0 {
+        // Antialias: keep the hard interior, soften only the boundary.
+        cov = cov.zip_map(&region, |a, r| if r > 0.0 { a.max(0.5) } else { a });
+    }
+    let color = pr.color("color");
+    let op = (pr.f("opacity") / 100.0) as f32;
+    let mode = pr.e("blendingMode");
+    b.img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
+        let k = (c * op * color[3]).clamp(0.0, 1.0);
+        if k <= 0.0 {
+            if mode == 9 {
+                *px = [0.0; 4];
+            }
+            return;
+        }
+        let (dc, da) = unpremul(*px);
+        let fc = [color[0], color[1], color[2]];
+        let mixed = match mode {
+            1 => [dc[0] + fc[0], dc[1] + fc[1], dc[2] + fc[2]],
+            2 => [dc[0] * fc[0], dc[1] * fc[1], dc[2] * fc[2]],
+            3 => [1.0 - (1.0 - dc[0]) * (1.0 - fc[0]), 1.0 - (1.0 - dc[1]) * (1.0 - fc[1]), 1.0 - (1.0 - dc[2]) * (1.0 - fc[2])],
+            4..=7 => {
+                let (dh, ds, dl) = rgb_to_hsl(dc[0], dc[1], dc[2]);
+                let (fh, fs, fl) = rgb_to_hsl(fc[0], fc[1], fc[2]);
+                let (r, g, bl) = match mode {
+                    4 => hsl_to_rgb(fh, ds, dl),
+                    5 => hsl_to_rgb(dh, fs, dl),
+                    6 => hsl_to_rgb(fh, fs, dl),
+                    _ => hsl_to_rgb(dh, ds, fl),
+                };
+                [r, g, bl]
+            }
+            _ => fc,
+        };
+        *px = match mode {
+            8 => over(premul(fc, k), *px),
+            9 => premul(fc, k),
+            0 => over(*px, premul(fc, k)),
+            _ => {
+                if da <= 1e-6 {
+                    return;
+                }
+                let c3 = crate::util::lerp3(dc, mixed, k);
+                premul(c3, da)
+            }
+        };
+    });
+    b
+}
+
+// ---------------------------------------------------------------- Eyedropper Fill
+
+pub(super) fn eyedropper_fill(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let fill = eyedropper_color(ctx, &b);
+    let keep_alpha = pr.b("maintainOriginalAlpha");
+    let blend = (pr.f("blendWithOriginal") / 100.0) as f32;
+    b.img.data.par_iter_mut().for_each(|px| {
+        let a = if keep_alpha { px[3] } else { fill[3] };
+        let f = premul([fill[0], fill[1], fill[2]], a);
+        *px = crate::util::lerp4(f, *px, blend);
+    });
+    b
+}
+
+/// Eyedropper Fill's sampled colour (straight RGB, alpha) from the layer's pixels (shared with
+/// the GPU compositor, which reads the layer back for it).
+pub fn eyedropper_color(ctx: &EffectCtx, b: &Buf) -> Px {
+    let pr = ctx.params;
+    let (w, h) = (b.img.width as i64, b.img.height as i64);
+    let c = b.to_px(pr.v2("samplePoint"));
+    let r = (pr.f("sampleRadius") * b.scale).max(0.0);
+    let mode = pr.e("averagePixelColors");
+    let (cx, cy) = (c.0.floor() as i64, c.1.floor() as i64);
+    let ri = r.ceil() as i64;
+    let mut acc = [0.0f64; 4];
+    let mut n = 0.0f64;
+    for y in (cy - ri).max(0)..=(cy + ri).min(h - 1) {
+        for x in (cx - ri).max(0)..=(cx + ri).min(w - 1) {
+            if ((x - cx).pow(2) + (y - cy).pow(2)) as f64 > r * r + 0.5 {
+                continue;
+            }
+            let px = b.img.data[(y * w + x) as usize];
+            match mode {
+                0 => {
+                    if px[3] > 1e-4 {
+                        let (s, _) = unpremul(px);
+                        for k in 0..3 {
+                            acc[k] += s[k] as f64;
+                        }
+                        acc[3] += 1.0;
+                        n += 1.0;
+                    }
+                }
+                1 => {
+                    let (s, _) = unpremul(px);
+                    for k in 0..3 {
+                        acc[k] += s[k] as f64;
+                    }
+                    acc[3] += 1.0;
+                    n += 1.0;
+                }
+                2 => {
+                    for k in 0..3 {
+                        acc[k] += px[k] as f64;
+                    }
+                    acc[3] += 1.0;
+                    n += 1.0;
+                }
+                _ => {
+                    for k in 0..4 {
+                        acc[k] += px[k] as f64;
+                    }
+                    n += 1.0;
+                }
+            }
+        }
+    }
+    if n > 0.0 {
+        if mode == 3 {
+            let a = (acc[3] / n) as f32;
+            let s = if a > 1e-6 { [(acc[0] / n) as f32 / a, (acc[1] / n) as f32 / a, (acc[2] / n) as f32 / a] } else { [0.0; 3] };
+            [s[0], s[1], s[2], a]
+        } else {
+            [(acc[0] / n) as f32, (acc[1] / n) as f32, (acc[2] / n) as f32, 1.0]
+        }
+    } else {
+        [0.0, 0.0, 0.0, 0.0]
+    }
+}
+
+// ---------------------------------------------------------------- CC Threads
+
+pub(super) fn threads(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let sc = b.scale;
+    let tw = (pr.f("width") * sc).max(1.0);
+    let th = (pr.f("height") * sc).max(1.0);
+    let overlaps = pr.f("overlaps").round().clamp(1.0, 20.0) as i64;
+    let ang = pr.f("direction").to_radians();
+    let (sn, cs) = ang.sin_cos();
+    let c = b.to_px(pr.v2("center"));
+    let coverage = (pr.f("coverage") / 100.0).clamp(0.0, 1.0);
+    let shadow = (pr.f("shadowing") / 100.0) as f32;
+    let texture = (pr.f("texture") / 100.0) as f32;
+    let src = b.img.clone();
+    let to_px = |u: f64, v: f64| (c.0 + u * cs - v * sn, c.1 + u * sn + v * cs);
+    b.img.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let (dx, dy) = (x as f64 + 0.5 - c.0, y as f64 + 0.5 - c.1);
+            let u = dx * cs + dy * sn;
+            let v = -dx * sn + dy * cs;
+            let (ci, cj) = ((u / tw).floor() as i64, (v / th).floor() as i64);
+            let (fu, fv) = (u / tw - ci as f64, v / th - cj as f64);
+            // Horizontal thread j occupies the band |fv-0.5| < coverage/2; vertical thread i the
+            // band |fu-0.5| < coverage/2.
+            let in_h = (fv - 0.5).abs() < coverage * 0.5;
+            let in_v = (fu - 0.5).abs() < coverage * 0.5;
+            // Twill: horizontal is on top when (i + j) mod (2·overlaps) < overlaps.
+            let h_top = (ci + cj).rem_euclid(2 * overlaps) < overlaps;
+            let which = match (in_h, in_v) {
+                (true, true) => Some(h_top),
+                (true, false) => Some(true),
+                (false, true) => Some(false),
+                _ => None,
+            };
+            let Some(horizontal) = which else {
+                *px = [0.0; 4];
+                continue;
+            };
+            // Thread colour: the source sampled along the thread centre line.
+            let (sx, sy) = if horizontal { to_px(u, (cj as f64 + 0.5) * th) } else { to_px((ci as f64 + 0.5) * tw, v) };
+            let s = src.sample_bilinear_clamped(sx, sy);
+            // Round profile across the thread + darkening where it dives under its neighbour.
+            let across = if horizontal { (fv - 0.5) / (coverage * 0.5).max(1e-6) } else { (fu - 0.5) / (coverage * 0.5).max(1e-6) };
+            let along = if horizontal { fu } else { fv };
+            let profile = (1.0 - across * across).max(0.0).sqrt() as f32;
+            let dive = 1.0 - (along - 0.5).abs() as f32 * 2.0;
+            let shade = 1.0 - shadow * (1.0 - profile) * 0.8 - shadow * 0.25 * (1.0 - dive) * if horizontal == h_top { 0.0 } else { 1.0 };
+            let fib =
+                if texture > 0.0 { 1.0 - texture * 0.3 * hash1((along * 64.0) as u32, (across * 8.0 + 8.0) as u32, ci as u32 ^ (cj as u32) << 8) } else { 1.0 };
+            let k = (shade * fib).max(0.0);
+            *px = [s[0] * k, s[1] * k, s[2] * k, s[3]];
+        }
+    });
+    b
+}
diff --git a/crates/effects/src/generate3/fractal.rs b/crates/effects/src/generate3/fractal.rs
new file mode 100644
index 000000000..05a76d5f0
--- /dev/null
+++ b/crates/effects/src/generate3/fractal.rs
@@ -0,0 +1,193 @@
+use super::raster::over;
+use super::{Buf, EffectCtx, IndexedParallelIterator, ParallelIterator, ParallelSliceMut, Px, hsl_to_rgb};
+
+// ---------------------------------------------------------------- Fractal
+
+#[derive(Clone, Copy)]
+struct FracSet {
+    /// Mandelbrot iterations start at the Julia centre (the "Over Julia" set choices).
+    over_julia: bool,
+    julia: bool,
+    inverse: bool,
+}
+
+/// Smooth escape count, or `None` inside the set.
+fn escape(z0: (f64, f64), c: (f64, f64), power: u32, limit: f64, max_iter: u32) -> Option<f64> {
+    let (mut x, mut y) = z0;
+    let lim2 = limit * limit;
+    for i in 0..max_iter {
+        let (nx, ny) = match power {
+            3 => (x * x * x - 3.0 * x * y * y, 3.0 * x * x * y - y * y * y),
+            4 => {
+                let (a, b) = (x * x - y * y, 2.0 * x * y);
+                (a * a - b * b, 2.0 * a * b)
+            }
+            _ => (x * x - y * y, 2.0 * x * y),
+        };
+        x = nx + c.0;
+        y = ny + c.1;
+        let m2 = x * x + y * y;
+        if m2 > lim2 {
+            let lz = m2.ln() * 0.5;
+            let nu = (lz / limit.max(1.0001).ln()).max(1e-9).ln() / (power as f64).ln();
+            return Some((i as f64 + 1.0 - nu).max(0.0));
+        }
+    }
+    None
+}
+
+/// Fractal Set Choice options.
+pub(crate) const FRACTAL_SETS: [&str; 6] =
+    ["Mandelbrot", "Mandelbrot Inverse", "Mandelbrot Over Julia", "Mandelbrot Inverse Over Julia", "Julia", "Julia Inverse"];
+
+/// Fractal Palette options.
+pub(crate) const FRACTAL_PALETTES: [&str; 4] = ["Lightness Gradient", "Hue Wheel", "Black And White", "Solid Color"];
+
+/// Fractal Oversample Method options.
+pub(crate) const FRACTAL_OVERSAMPLE: [&str; 2] = ["Edge Detect-Fast-May Miss Pixels", "Brute Force-Slow-Every Pixel"];
+
+pub(super) fn fractal(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let set_choice = pr.e("setChoice");
+    let power = 2 + pr.e("equation").min(2);
+    let mc = (pr.f("mandelbrot/mandelbrotX"), pr.f("mandelbrot/mandelbrotY"));
+    let mmag = pr.f("mandelbrot/mandelbrotMagnification");
+    let mlim = pr.f("mandelbrot/mandelbrotEscapeLimit").max(1.01);
+    let jc = (pr.f("julia/juliaX"), pr.f("julia/juliaY"));
+    let jmag = pr.f("julia/juliaMagnification");
+    let jlim = pr.f("julia/juliaEscapeLimit").max(1.01);
+    let post = (pr.f("postInversionOffset/postInversionX"), pr.f("postInversionOffset/postInversionY"));
+    let overlay = pr.b("fractalColor/overlay");
+    let transparency = pr.b("fractalColor/transparency");
+    let transparent_inside = transparency || overlay;
+    let palette = pr.e("fractalColor/palette");
+    let hue = (pr.f("fractalColor/hue") / 360.0) as f32;
+    let steps = pr.f("fractalColor/cycleSteps").max(1.0);
+    let cyc_off = pr.f("fractalColor/cycleOffset") / 360.0;
+    let edge = pr.b("fractalColor/edgeHighlight");
+    let every = pr.e("highQualitySettings/samplingMethod") == 1;
+    let factor = pr.f("highQualitySettings/samplingFactor").round().clamp(1.0, 9.0) as usize;
+    let (w, h) = (b.img.width as usize, b.img.height as usize);
+    let lw = ctx.layer_size[0].max(1.0);
+    let lh = ctx.layer_size[1].max(1.0);
+    let inv = 1.0 / b.scale.max(1e-9);
+    let (off_x, off_y) = (b.offset[0], b.offset[1]);
+    // FRACTAL_SETS order.
+    let set = |julia, inverse, over_julia| FracSet { over_julia, julia, inverse };
+    let sets: (FracSet, Option<FracSet>) = match set_choice {
+        1 => (set(false, true, false), None),
+        2 => (set(false, false, true), None),
+        3 => (set(false, true, true), None),
+        4 => (set(true, false, false), None),
+        5 => (set(true, true, false), None),
+        _ => (set(false, false, false), None),
+    };
+    let iter_for = |mag: f64| (96.0 + 48.0 * mag.max(0.0)).clamp(64.0, 3000.0) as u32;
+    let eval_set = |s: FracSet, lx: f64, ly: f64| -> Option<f64> {
+        let (center, mag, lim) = if s.julia { (jc, jmag, jlim) } else { (mc, mmag, mlim) };
+        let span = 3.5 / 2f64.powf(mag);
+        let mut u = (lx - lw * 0.5) / lw * span + center.0;
+        let mut v = (ly - lh * 0.5) / lw * span + center.1;
+        if s.inverse {
+            let d = (u * u + v * v).max(1e-12);
+            u = u / d + post.0;
+            v = -v / d + post.1;
+        }
+        if s.julia {
+            escape((u, v), mc, power, lim, iter_for(mag))
+        } else {
+            let z0 = if s.over_julia { jc } else { (0.0, 0.0) };
+            escape(z0, (u, v), power, lim, iter_for(mag))
+        }
+    };
+    let eval = |lx: f64, ly: f64| -> Option<f64> {
+        let a = eval_set(sets.0, lx, ly);
+        match (a, sets.1) {
+            (None, Some(s2)) => eval_set(s2, lx, ly),
+            _ => a,
+        }
+    };
+    let shade = |n: Option<f64>| -> Px {
+        // Solid Color: only the inside of the set is drawn (Transparency flips the sides).
+        if palette == 3 {
+            let (r, g, bl) = hsl_to_rgb(hue, 1.0, 0.5);
+            return if n.is_none() != transparency { [r, g, bl, 1.0] } else { [0.0; 4] };
+        }
+        let Some(n) = n else {
+            return if transparent_inside { [0.0; 4] } else { [0.0, 0.0, 0.0, 1.0] };
+        };
+        let u = n / steps + cyc_off;
+        let band = (u.rem_euclid(1.0)) as f32;
+        let (r, g, bl) = match palette {
+            // Hue Wheel: the full hue circle at full saturation and brightness.
+            1 => hsl_to_rgb((hue + band).rem_euclid(1.0), 1.0, 0.5),
+            // Black And White: alternating bands.
+            2 => {
+                let v = if (u.floor() as i64).rem_euclid(2) == 0 { 0.0 } else { 1.0 };
+                (v, v, v)
+            }
+            // Lightness Gradient: black → hue → white, the hue moving 45° each cycle.
+            _ => hsl_to_rgb((hue + u.floor() as f32 * 0.125).rem_euclid(1.0), 0.85, band.clamp(0.0, 1.0)),
+        };
+        let mut c = [r, g, bl];
+        if edge && n.fract() < 0.12 {
+            c = [c[0] * 0.4 + 0.6, c[1] * 0.4 + 0.6, c[2] * 0.4 + 0.6];
+        }
+        [c[0], c[1], c[2], 1.0]
+    };
+    // First pass: one sample per pixel.
+    let mut first: Vec<Option<f64>> = vec![None; w * h];
+    first.par_chunks_mut(w.max(1)).enumerate().for_each(|(y, row)| {
+        for (x, v) in row.iter_mut().enumerate() {
+            *v = eval((x as f64 + 0.5 - off_x) * inv, (y as f64 + 0.5 - off_y) * inv);
+        }
+    });
+    let src = if overlay { Some(b.img.clone()) } else { None };
+    b.img.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let here = first[y * w + x];
+            let needs_ss = factor > 1
+                && (every || {
+                    let mut diff = false;
+                    for (dx, dy) in [(-1i64, 0i64), (1, 0), (0, -1), (0, 1)] {
+                        let (nx, ny) = (x as i64 + dx, y as i64 + dy);
+                        if nx < 0 || ny < 0 || nx >= w as i64 || ny >= h as i64 {
+                            continue;
+                        }
+                        let o = first[ny as usize * w + nx as usize];
+                        diff |= match (here, o) {
+                            (Some(a), Some(c)) => (a - c).abs() > steps * 0.25,
+                            (None, None) => false,
+                            _ => true,
+                        };
+                    }
+                    diff
+                });
+            let c = if needs_ss {
+                let mut acc = [0.0f32; 4];
+                for sy in 0..factor {
+                    for sx in 0..factor {
+                        let fx = x as f64 + (sx as f64 + 0.5) / factor as f64;
+                        let fy = y as f64 + (sy as f64 + 0.5) / factor as f64;
+                        let s = shade(eval((fx - off_x) * inv, (fy - off_y) * inv));
+                        let a = s[3];
+                        for k in 0..3 {
+                            acc[k] += s[k] * a;
+                        }
+                        acc[3] += a;
+                    }
+                }
+                let n = (factor * factor) as f32;
+                [acc[0] / n, acc[1] / n, acc[2] / n, acc[3] / n]
+            } else {
+                let s = shade(here);
+                [s[0] * s[3], s[1] * s[3], s[2] * s[3], s[3]]
+            };
+            *px = match &src {
+                Some(o) => over(o.data[y * w + x], c),
+                None => c,
+            };
+        }
+    });
+    b
+}
diff --git a/crates/effects/src/generate3/paths.rs b/crates/effects/src/generate3/paths.rs
new file mode 100644
index 000000000..319368a82
--- /dev/null
+++ b/crates/effects/src/generate3/paths.rs
@@ -0,0 +1,556 @@
+use super::raster::{Seg, all_masks_px, chaikin, mask_px, over, poly_segs, raster_convex, raster_segs, scan_runs, stroke_outline, trim_poly};
+use super::{
+    Buf, EffectCtx, Image, IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator, Params, Plane, gauss_plane, hash1,
+    layer_or_self, luminance, poly_length, smoothstep, unpremul,
+};
+
+/// How painted coverage meets the layer: 0 On Original Image, 1 On Transparent, 2 Reveal
+/// Original Image.
+pub(crate) fn paint(img: &mut Image, cov: &Plane, color: [f32; 4], opacity: f32, style: u32) {
+    img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
+        let a = (c * opacity * color[3]).clamp(0.0, 1.0);
+        let s = [color[0] * a, color[1] * a, color[2] * a, a];
+        *px = match style {
+            1 => s,
+            2 => [px[0] * a, px[1] * a, px[2] * a, px[3] * a],
+            _ => over(*px, s),
+        };
+    });
+}
+
+/// Coverage of a plan-drawn generator: round-capped segments rasterised by `raster_segs`
+/// with `hardness`, or the union of convex polygons (`raster_convex`).
+#[derive(Clone, Debug)]
+pub enum Coverage {
+    Segs { segs: Vec<Seg>, hardness: f64 },
+    Convex(Vec<Vec<[f64; 2]>>),
+}
+
+impl Coverage {
+    fn raster(&self, w: usize, h: usize) -> Plane {
+        match self {
+            Coverage::Segs { segs, hardness } => raster_segs(w, h, segs, *hardness),
+            Coverage::Convex(polys) => raster_convex(w, h, polys),
+        }
+    }
+}
+
+/// Stroke, Scribble, Vegas and Write-on, shared with the GPU compositor (effectcraft-gpu
+/// `fx_gen2`): the coverage and how it is painted. `style` 0–2 as `paint` (On Original
+/// Image, On Transparent, Reveal Original Image), 3 = under the layer (Vegas' Composite Under).
+#[derive(Clone, Debug)]
+pub struct PaintPlan {
+    pub cov: Coverage,
+    pub color: [f32; 4],
+    pub opacity: f32,
+    pub style: u32,
+}
+
+/// Draw a [`PaintPlan`].
+fn draw_paint(b: &mut Buf, plan: &PaintPlan) {
+    let cov = plan.cov.raster(b.img.width as usize, b.img.height as usize);
+    if plan.style == 3 {
+        let color = plan.color;
+        b.img.data.par_iter_mut().zip(cov.data.par_iter()).for_each(|(px, &c)| {
+            let a = c * color[3];
+            *px = over([color[0] * a, color[1] * a, color[2] * a, a], *px);
+        });
+    } else {
+        paint(&mut b.img, &cov, plan.color, plan.opacity, plan.style);
+    }
+}
+
+/// Generators drawn from a plan that need the layer's own pixels (`b.img`) to build it.
+pub fn plan_reads_pixels(id: &str, ctx: &EffectCtx) -> bool {
+    match id {
+        // Image Contours read the layer itself when no (resolvable) Input Layer is chosen.
+        "ec.generate.vegas" => ctx.params.e("stroke") == 0,
+        "ec.generate.paintbucket" | "ec.generate.eyedropperfill" => true,
+        "ec.generate.advancedlightning" => ctx.params.f("alphaObstacle").clamp(-10.0, 10.0) != 0.0,
+        _ => false,
+    }
+}
+
+/// [`PaintPlan`] of Stroke, Scribble, Vegas or Write-on on `b`'s geometry (`b.img` is read
+/// only when [`plan_reads_pixels`]). `None`: Scribble without a usable mask (the layer is
+/// cleared when it composites On Transparent, else kept).
+pub fn paint_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PaintPlan> {
+    match id {
+        "ec.generate.stroke" => Some(stroke_plan(ctx, b)),
+        "ec.generate.scribble" => scribble_plan(ctx, b),
+        "ec.generate.vegas" => Some(vegas_plan(ctx, b)),
+        "ec.generate.writeon" => Some(write_on_plan(ctx, b)),
+        _ => None,
+    }
+}
+
+/// Scribble's Composite as a `paint` style.
+pub fn scribble_style(ctx: &EffectCtx) -> u32 {
+    match ctx.params.e("composite") {
+        0 => 0,
+        2 => 2,
+        _ => 1,
+    }
+}
+
+pub(super) fn scribble(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    match scribble_plan(ctx, &b) {
+        Some(plan) => draw_paint(&mut b, &plan),
+        None if scribble_style(ctx) == 1 => b.img = Image::new(b.img.width, b.img.height),
+        None => {}
+    }
+    b
+}
+
+fn scribble_plan(ctx: &EffectCtx, b: &Buf) -> Option<PaintPlan> {
+    let pr = ctx.params;
+    let which = pr.e("scribble");
+    let polys: Vec<_> = if which == 0 { mask_px(ctx, b, pr.f("mask").round().max(1.0) as usize).into_iter().collect() } else { all_masks_px(ctx, b) };
+    let polys: Vec<_> = polys.into_iter().filter(|p| p.0.len() >= 3).map(|(p, c, i)| (p, c, i && which == 2)).collect();
+    let style = scribble_style(ctx);
+    if polys.is_empty() {
+        return None;
+    }
+    let sc = b.scale;
+    let fill = pr.e("fillType");
+    let ew = pr.f("edgeOptions/edgeWidth").max(0.1) * sc;
+    let ang = pr.f("angle").to_radians();
+    let d = [ang.cos(), ang.sin()];
+    let n = [-d[1], d[0]];
+    let width = (pr.f("strokeWidth") * sc).max(0.1);
+    let curv = pr.f("strokeOptions/curviness") / 100.0;
+    let curv_var = pr.f("strokeOptions/curvinessVariation") / 100.0;
+    let spacing = (pr.f("strokeOptions/spacing") * sc).max(0.75).max(width * 0.25);
+    let spacing_var = pr.f("strokeOptions/spacingVariation") / 100.0;
+    let overlap = pr.f("strokeOptions/pathOverlap") / 100.0;
+    let overlap_var = pr.f("strokeOptions/pathOverlapVariation") / 100.0;
+    let start = pr.f("start").clamp(0.0, 100.0) / 100.0;
+    let end = pr.f("end").clamp(0.0, 100.0) / 100.0;
+    let sequential = pr.b("fillPathsSequentially");
+    let wiggle = pr.e("wiggleType");
+    let wps = pr.f("wigglesPerSecond").max(0.0);
+    let seed = pr.f("randomSeed") as i64 as u32 ^ ctx.seed;
+    let (step, frac) = match wiggle {
+        0 => (0u32, 0.0f32),
+        1 => ((ctx.time * wps).floor().max(0.0) as u32, 0.0),
+        _ => {
+            let u = (ctx.time * wps).max(0.0);
+            (u.floor() as u32, smoothstep(0.0, 1.0, u.fract() as f32))
+        }
+    };
+    let rnd = |i: u32, k: u32| {
+        let a = hash1(i, k.wrapping_mul(31).wrapping_add(step.wrapping_mul(7919)), seed) * 2.0 - 1.0;
+        if frac > 0.0 {
+            let c = hash1(i, k.wrapping_mul(31).wrapping_add((step + 1).wrapping_mul(7919)), seed) * 2.0 - 1.0;
+            a + (c - a) * frac
+        } else {
+            a
+        }
+    };
+    let groups: Vec<Vec<(Vec<[f64; 2]>, bool, bool)>> =
+        if which == 0 || sequential { vec![polys.clone()] } else { polys.iter().map(|p| vec![p.clone()]).collect() };
+    // Per group a zig-zag polyline (in buffer px).
+    let mut lines: Vec<Vec<Vec<[f64; 2]>>> = Vec::new();
+    let mut runs = Vec::new();
+    for (gi, g) in groups.iter().enumerate() {
+        let mut nmin = f64::INFINITY;
+        let mut nmax = f64::NEG_INFINITY;
+        for (pts, _, _) in g {
+            for q in pts {
+                let v = q[0] * n[0] + q[1] * n[1];
+                nmin = nmin.min(v);
+                nmax = nmax.max(v);
+            }
+        }
+        nmin -= ew;
+        nmax += ew;
+        // Chains of zig-zags: each run joins the nearest chain that ended on the previous
+        // scan line (so separate regions get separate strokes).
+        let mut chains: Vec<(Vec<[f64; 2]>, u32)> = Vec::new();
+        let mut s = nmin + spacing * 0.5;
+        let mut li = 0u32;
+        let reach = spacing * 3.0 + ew;
+        while s < nmax && li < 20_000 {
+            scan_runs(g, fill, ew, d, n, s, &mut runs);
+            for (ri, &(a, bb)) in runs.iter().enumerate() {
+                let k = (gi as u32) << 20 | ri as u32;
+                let ov = spacing * (overlap + overlap_var * rnd(li, k * 4) as f64 * 0.5).max(-0.45);
+                let ov2 = spacing * (overlap + overlap_var * rnd(li, k * 4 + 1) as f64 * 0.5).max(-0.45);
+                let (a, bb) = (a - ov, bb + ov2);
+                if bb <= a {
+                    continue;
+                }
+                let at = |t: f64| [d[0] * t + n[0] * s, d[1] * t + n[1] * s];
+                let (pa, pb) = (at(a), at(bb));
+                let dist = |p: [f64; 2], q: [f64; 2]| ((p[0] - q[0]).powi(2) + (p[1] - q[1]).powi(2)).sqrt();
+                let best = chains
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, c)| li > 0 && c.1 == li - 1)
+                    .map(|(i, c)| {
+                        let last = *c.0.last().unwrap_or(&pa);
+                        (i, dist(last, pa).min(dist(last, pb)))
+                    })
+                    .filter(|&(_, dd)| dd < reach)
+                    .min_by(|x, y| x.1.total_cmp(&y.1));
+                match best {
+                    Some((ci, _)) => {
+                        let last = *chains[ci].0.last().unwrap_or(&pa);
+                        let (p0, p1, dir) = if dist(last, pa) <= dist(last, pb) { (pa, pb, -1.0) } else { (pb, pa, 1.0) };
+                        // Curved turn: an extra point pushed past the edge.
+                        let c = (curv + curv_var * rnd(li, k * 4 + 2) as f64 * 0.5).max(0.0);
+                        let mid = [(last[0] + p0[0]) * 0.5 + d[0] * dir * c * spacing, (last[1] + p0[1]) * 0.5 + d[1] * dir * c * spacing];
+                        let ch = &mut chains[ci];
+                        ch.0.extend([mid, p0, p1]);
+                        ch.1 = li;
+                    }
+                    None => chains.push((vec![pa, pb], li)),
+                }
+            }
+            s += spacing * (1.0 + spacing_var * rnd(li, 3) as f64 * 0.5).max(0.25);
+            li += 1;
+        }
+        lines.push(chains.into_iter().map(|(z, _)| if curv > 0.0 { chaikin(&z, 2) } else { z }).collect());
+    }
+    let r = width * 0.5;
+    // Start / End Apply To: all of a mask's strokes as one path, or each stroke on its own.
+    let each = pr.e("startEndApplyTo") == 1;
+    let mut parts: Vec<Vec<[f64; 2]>> = Vec::new();
+    for group in &lines {
+        let lens: Vec<f64> = group.iter().map(|l| poly_length(l, false)).collect();
+        let total: f64 = lens.iter().sum();
+        let (g0, g1) = (total * start, total * end);
+        let mut acc = 0.0;
+        for (l, len) in group.iter().zip(lens) {
+            let part =
+                if each { trim_poly(l, false, len * start, len * end) } else { trim_poly(l, false, (g0 - acc).clamp(0.0, len), (g1 - acc).clamp(0.0, len)) };
+            acc += len;
+            parts.push(part);
+        }
+    }
+    let cap = pr.e("edgeOptions/endCap");
+    let join = pr.e("edgeOptions/join");
+    let cov = if cap == 0 && join == 0 {
+        let mut segs = Vec::new();
+        for part in &parts {
+            poly_segs(part, false, r, 1.0, &mut segs);
+        }
+        Coverage::Segs { segs, hardness: 0.9 }
+    } else {
+        Coverage::Convex(stroke_outline(&parts, r, cap, join, pr.f("edgeOptions/miterLimit").max(1.0)))
+    };
+    Some(PaintPlan { cov, color: pr.color("color"), opacity: (pr.f("opacity") / 100.0) as f32, style })
+}
+
+// ---------------------------------------------------------------- Stroke
+
+pub(super) fn stroke(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let plan = stroke_plan(ctx, &b);
+    draw_paint(&mut b, &plan);
+    b
+}
+
+fn stroke_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
+    let pr = ctx.params;
+    let all = pr.b("allMasks");
+    let polys: Vec<_> = if all { all_masks_px(ctx, b) } else { mask_px(ctx, b, pr.f("path").round() as usize).into_iter().collect() };
+    let style = pr.e("paintStyle");
+    let size = (pr.f("brushSize") * b.scale).max(0.1);
+    let r = size * 0.5;
+    let hard = pr.f("brushHardness") / 100.0;
+    let start = pr.f("start").clamp(0.0, 100.0) / 100.0;
+    let end = pr.f("end").clamp(0.0, 100.0) / 100.0;
+    let spacing = pr.f("spacing") / 100.0;
+    let sequential = pr.b("strokeSequentially");
+    let lens: Vec<f64> = polys.iter().map(|(p, c, _)| poly_length(p, *c)).collect();
+    let total: f64 = lens.iter().sum();
+    let mut segs = Vec::new();
+    let mut acc = 0.0;
+    for ((pts, closed, _), &len) in polys.iter().zip(&lens) {
+        let (s0, s1) = if all && sequential {
+            let (g0, g1) = (total * start, total * end);
+            ((g0 - acc).clamp(0.0, len), (g1 - acc).clamp(0.0, len))
+        } else {
+            (len * start, len * end)
+        };
+        acc += len;
+        if s1 <= s0 {
+            continue;
+        }
+        if spacing <= 0.5 {
+            let part = trim_poly(pts, *closed, s0, s1);
+            poly_segs(&part, false, r, 1.0, &mut segs);
+        } else {
+            let step = (size * spacing).max(0.5);
+            let mut s = s0;
+            while s <= s1 + 1e-9 && segs.len() < 200_000 {
+                let (q, _) = crate::util::poly_point_at(pts, *closed, s);
+                segs.push(Seg { a: q, b: q, r, v: 1.0 });
+                s += step;
+            }
+        }
+    }
+    PaintPlan { cov: Coverage::Segs { segs, hardness: hard }, color: pr.color("color"), opacity: (pr.f("opacity") / 100.0) as f32, style }
+}
+
+// ---------------------------------------------------------------- Vegas
+
+/// Marching-squares iso-contours of `pl` at `thr`, chained into polylines (closed flag).
+pub(super) fn contours(pl: &Plane, thr: f32) -> Vec<(Vec<[f64; 2]>, bool)> {
+    use std::collections::HashMap;
+    let (w, h) = (pl.w, pl.h);
+    if w < 2 || h < 2 {
+        return Vec::new();
+    }
+    // Edge key: horizontal edge (x,y)-(x+1,y) = 2*(y*w+x), vertical (x,y)-(x,y+1) = 2*(y*w+x)+1.
+    let hk = |x: usize, y: usize| 2 * (y * w + x) as u64;
+    let vk = |x: usize, y: usize| 2 * (y * w + x) as u64 + 1;
+    let mut pos: HashMap<u64, [f64; 2]> = HashMap::new();
+    let mut adj: HashMap<u64, Vec<u64>> = HashMap::new();
+    let v = |x: usize, y: usize| pl.data[y * w + x];
+    let interp = |a: f32, b: f32| if (b - a).abs() > 1e-9 { ((thr - a) / (b - a)).clamp(0.0, 1.0) as f64 } else { 0.5 };
+    for y in 0..h - 1 {
+        for x in 0..w - 1 {
+            let (a, bb, c, d) = (v(x, y), v(x + 1, y), v(x + 1, y + 1), v(x, y + 1));
+            let idx = (a > thr) as u8 | ((bb > thr) as u8) << 1 | ((c > thr) as u8) << 2 | ((d > thr) as u8) << 3;
+            if idx == 0 || idx == 15 {
+                continue;
+            }
+            // Edge points (pixel centres at +0.5).
+            let top = (hk(x, y), [x as f64 + 0.5 + interp(a, bb), y as f64 + 0.5]);
+            let right = (vk(x + 1, y), [x as f64 + 1.5, y as f64 + 0.5 + interp(bb, c)]);
+            let bottom = (hk(x, y + 1), [x as f64 + 0.5 + interp(d, c), y as f64 + 1.5]);
+            let left = (vk(x, y), [x as f64 + 0.5, y as f64 + 0.5 + interp(a, d)]);
+            let pairs: &[(usize, usize)] = match idx {
+                1 | 14 => &[(3, 0)],
+                2 | 13 => &[(0, 1)],
+                3 | 12 => &[(3, 1)],
+                4 | 11 => &[(1, 2)],
+                5 => &[(3, 0), (1, 2)],
+                6 | 9 => &[(0, 2)],
+                7 | 8 => &[(3, 2)],
+                10 => &[(0, 1), (2, 3)],
+                _ => &[],
+            };
+            let e = [top, right, bottom, left];
+            for &(i, j) in pairs {
+                pos.insert(e[i].0, e[i].1);
+                pos.insert(e[j].0, e[j].1);
+                adj.entry(e[i].0).or_default().push(e[j].0);
+                adj.entry(e[j].0).or_default().push(e[i].0);
+            }
+        }
+    }
+    let mut keys: Vec<u64> = adj.keys().copied().collect();
+    keys.sort_unstable();
+    // Start open chains at endpoints (degree 1) first, then closed loops.
+    keys.sort_by_key(|k| adj[k].len() != 1);
+    let mut used: std::collections::HashSet<(u64, u64)> = std::collections::HashSet::new();
+    let mut out = Vec::new();
+    for &k0 in &keys {
+        for &first in &adj[&k0] {
+            if used.contains(&(k0.min(first), k0.max(first))) {
+                continue;
+            }
+            let mut chain = vec![pos[&k0]];
+            let (mut prev, mut cur) = (k0, first);
+            used.insert((prev.min(cur), prev.max(cur)));
+            let mut closed = false;
+            loop {
+                chain.push(pos[&cur]);
+                if cur == k0 {
+                    closed = true;
+                    chain.pop();
+                    break;
+                }
+                let next = adj[&cur].iter().copied().find(|&n| n != prev && !used.contains(&(cur.min(n), cur.max(n))));
+                match next {
+                    Some(n) => {
+                        used.insert((cur.min(n), cur.max(n)));
+                        prev = cur;
+                        cur = n;
+                    }
+                    None => break,
+                }
+            }
+            if chain.len() >= 2 {
+                out.push((chain, closed));
+            }
+        }
+    }
+    out
+}
+
+pub(super) fn vegas(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let plan = vegas_plan(ctx, &b);
+    draw_paint(&mut b, &plan);
+    b
+}
+
+fn vegas_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
+    let pr = ctx.params;
+    let (w, h) = (b.img.width as usize, b.img.height as usize);
+    let sc = b.scale;
+    let paths: Vec<(Vec<[f64; 2]>, bool)> = if pr.e("stroke") == 1 {
+        mask_px(ctx, b, pr.f("path").round() as usize).map(|(p, c, _)| vec![(p, c)]).unwrap_or_default()
+    } else {
+        let src = layer_or_self(ctx, b, "inputLayer", true, pr.e("ifLayerSizesDiffer") == 1);
+        let ch = pr.e("channel");
+        let inv = pr.b("invertInput");
+        let mut pl = Plane::from_image(&src, |px| {
+            let (c, a) = unpremul(px);
+            let v = match ch {
+                1 => c[0],
+                2 => c[1],
+                3 => c[2],
+                4 => a,
+                _ => luminance(c[0], c[1], c[2]) * a,
+            };
+            if inv { 1.0 - v } else { v }
+        });
+        let blur = pr.f("preBlur") * sc;
+        if blur > 0.05 {
+            pl = gauss_plane(&pl, blur, blur);
+        }
+        let mut cs = contours(&pl, (pr.f("threshold") / 100.0) as f32);
+        // Simplify by tolerance (drop points closer than tol × size).
+        let tol = pr.f("tolerance").max(0.0) * (w.max(h) as f64) * 0.1;
+        if tol > 0.0 {
+            for (c, _) in cs.iter_mut() {
+                let mut keep: Vec<[f64; 2]> = Vec::with_capacity(c.len());
+                for &q in c.iter() {
+                    if keep.last().is_none_or(|l: &[f64; 2]| ((l[0] - q[0]).powi(2) + (l[1] - q[1]).powi(2)).sqrt() >= tol) {
+                        keep.push(q);
+                    }
+                }
+                *c = keep;
+            }
+        }
+        cs.sort_by(|a, b| poly_length(&b.0, b.1).total_cmp(&poly_length(&a.0, a.1)));
+        if pr.e("renderMode") == 1 {
+            let sel = (pr.f("selectedContour").round().max(1.0) as usize) - 1;
+            cs.into_iter().skip(sel).take(1).collect()
+        } else {
+            cs
+        }
+    };
+    let nseg = pr.f("segments").round().clamp(1.0, 1000.0) as usize;
+    // Shorter Contours Have Fewer Segments: segment count scales with contour length.
+    let fewer = pr.e("stroke") == 0 && pr.e("shorterContoursHave") == 1;
+    let longest = paths.iter().map(|(p, c)| poly_length(p, *c)).fold(0.0, f64::max);
+    let seg_len = pr.f("length").clamp(0.0, 1.0);
+    let bunched = pr.e("segmentDistribution") == 0;
+    let rot = pr.f("rotation") / 360.0;
+    let random_phase = pr.b("randomPhase");
+    let seed = pr.f("randomSeed") as i64 as u32 ^ ctx.seed;
+    let width = (pr.f("width") * sc).max(0.1);
+    let hard = pr.f("hardness").clamp(0.0, 1.0);
+    let (o0, om, o1, mp) = (pr.f("startOpacity") as f32, pr.f("midpointOpacity") as f32, pr.f("endOpacity") as f32, pr.f("midpointPosition").clamp(0.01, 0.99));
+    let mut segs = Vec::new();
+    for (ci, (pts, closed)) in paths.iter().enumerate() {
+        let len = poly_length(pts, *closed);
+        if len <= 0.0 {
+            continue;
+        }
+        let phase = rot + if random_phase { hash1(ci as u32, 1, seed) as f64 } else { 0.0 };
+        let nseg = if fewer && longest > 0.0 { ((nseg as f64 * len / longest).round() as usize).max(1) } else { nseg };
+        let each = len / nseg as f64 * seg_len;
+        for i in 0..nseg {
+            let base = if bunched { (i as f64 + (hash1(ci as u32, i as u32 + 7, seed) as f64 - 0.5) * 0.8) / nseg as f64 } else { i as f64 / nseg as f64 };
+            let s0 = (base + phase).rem_euclid(1.0) * len;
+            // Sub-sample the segment so opacity can ramp along it.
+            let sub = 12usize;
+            let mut prev: Option<[f64; 2]> = None;
+            for k in 0..=sub {
+                let f = k as f64 / sub as f64;
+                let mut s = s0 + each * f;
+                if *closed {
+                    s = s.rem_euclid(len);
+                } else if s > len {
+                    break;
+                }
+                let (q, _) = crate::util::poly_point_at(pts, *closed, s);
+                let op = if f < mp { o0 + (om - o0) * (f / mp) as f32 } else { om + (o1 - om) * ((f - mp) / (1.0 - mp)) as f32 };
+                if let Some(pv) = prev
+                    && ((pv[0] - q[0]).powi(2) + (pv[1] - q[1]).powi(2)) < (each * 0.5).powi(2) + 4.0
+                {
+                    segs.push(Seg { a: pv, b: q, r: width * 0.5, v: op.clamp(0.0, 1.0) });
+                }
+                prev = Some(q);
+            }
+        }
+    }
+    let style = match pr.e("blendMode") {
+        1 => 0,
+        2 => 3,
+        3 => 2,
+        _ => 1,
+    };
+    PaintPlan { cov: Coverage::Segs { segs, hardness: hard }, color: pr.color("color"), opacity: 1.0, style }
+}
+
+// ---------------------------------------------------------------- Write-on / Glue Gun
+
+/// Write-on draws a stroke along the animated Brush Position, as in After Effects: a dab every
+/// Brush Spacing seconds from the layer's start up to now, each one lasting Stroke Length
+/// seconds (0: for ever). The dabs' positions come from the host's parameters at their times;
+/// with Paint Time Properties ▸ Opacity or Brush Time Properties ▸ Size each dab keeps its own
+/// opacity or size, else the current ones apply to every dab. (Colour and hardness are one per
+/// stroke: the current ones.) Without a host (or dabs) the current dab draws. Deterministic.
+pub(super) fn write_on(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let plan = write_on_plan(ctx, &b);
+    draw_paint(&mut b, &plan);
+    b
+}
+
+/// The most dabs one Write-on frame draws; longer strokes lay them further apart, joined.
+const WRITE_ON_MAX_DABS: i64 = 4096;
+
+fn write_on_plan(ctx: &EffectCtx, b: &Buf) -> PaintPlan {
+    let pr = ctx.params;
+    let own_opacity = pr.e("paintTimeProperties") == 1;
+    let own_size = matches!(pr.e("brushTimeProperties"), 1 | 3);
+    let opacity = |p: &Params| (p.f("brushOpacity") / 100.0).clamp(0.0, 1.0) as f32;
+    let radius = |p: &Params| (p.f("brushSize") * b.scale * 0.5).max(0.05);
+    let dab = |p: &Params| {
+        let q = b.to_px(p.v2("brushPosition"));
+        ([q.0, q.1], radius(if own_size { p } else { pr }), if own_opacity { opacity(p) } else { 1.0 })
+    };
+    let mut segs = vec![];
+    let t = ctx.time;
+    let spacing = pr.f("brushSpacing").max(0.001);
+    let life = pr.f("strokeLength").max(0.0);
+    if let Some(host) = ctx.env.host
+        && t.is_finite()
+        && t >= 0.0
+    {
+        let start = if life > 0.0 { (t - life).max(0.0) } else { 0.0 };
+        let k0 = (start / spacing - 1e-9).ceil().max(0.0) as i64;
+        let k1 = (t / spacing + 1e-9).floor().max(0.0) as i64;
+        let n = k1.saturating_sub(k0).saturating_add(1);
+        let stride = (n / WRITE_ON_MAX_DABS).saturating_add(1).max(1);
+        let mut prev: Option<[f64; 2]> = None;
+        let mut k = k0;
+        while k <= k1 {
+            let tk = k as f64 * spacing;
+            let at = if (tk - t).abs() < 1e-9 { Some(dab(pr)) } else { host.params_at(tk).map(|p| dab(&p)) };
+            if let Some((q, r, v)) = at {
+                // Dabs laid further apart than the brush spacing are joined into a line.
+                let a = if stride > 1 { prev.unwrap_or(q) } else { q };
+                segs.push(Seg { a, b: q, r, v });
+                prev = Some(q);
+            }
+            k = k.saturating_add(stride);
+        }
+    }
+    if segs.is_empty() {
+        let (q, r, v) = dab(pr);
+        segs.push(Seg { a: q, b: q, r, v });
+    }
+    PaintPlan {
+        cov: Coverage::Segs { segs, hardness: pr.f("brushHardness") / 100.0 },
+        color: pr.color("color"),
+        opacity: if own_opacity { 1.0 } else { opacity(pr) },
+        style: pr.e("paintStyle"),
+    }
+}
diff --git a/crates/effects/src/generate3/raster.rs b/crates/effects/src/generate3/raster.rs
new file mode 100644
index 000000000..1b85818d0
--- /dev/null
+++ b/crates/effects/src/generate3/raster.rs
@@ -0,0 +1,368 @@
+use super::{Buf, EffectCtx, IndexedParallelIterator, ParallelIterator, ParallelSliceMut, Plane, Px, smoothstep};
+
+// ---------------------------------------------------------------- shared rasterisation
+
+/// A round-capped line segment in buffer pixels with radius `r` and intensity `v`.
+#[derive(Clone, Copy, Debug)]
+pub struct Seg {
+    pub a: [f64; 2],
+    pub b: [f64; 2],
+    pub r: f64,
+    pub v: f32,
+}
+
+/// Rasterise segments into a coverage plane (max-combined). `hardness` (0..1) is the fraction
+/// of the radius that is fully opaque; the rest falls off smoothly.
+pub(crate) fn raster_segs(w: usize, h: usize, segs: &[Seg], hardness: f64) -> Plane {
+    let mut out = Plane::new(w, h);
+    if w == 0 || h == 0 || segs.is_empty() {
+        return out;
+    }
+    let mut buckets: Vec<Vec<u32>> = vec![Vec::new(); h];
+    for (i, s) in segs.iter().enumerate() {
+        let pad = s.r + 1.0;
+        let y0 = (s.a[1].min(s.b[1]) - pad).floor().max(0.0) as usize;
+        let y1 = (s.a[1].max(s.b[1]) + pad).ceil().min(h as f64);
+        if y1 <= 0.0 || y0 >= h {
+            continue;
+        }
+        for row in buckets.iter_mut().take(y1 as usize).skip(y0) {
+            row.push(i as u32);
+        }
+    }
+    let hard = hardness.clamp(0.0, 1.0);
+    out.data.par_chunks_mut(w).enumerate().for_each(|(y, row)| {
+        let py = y as f64 + 0.5;
+        for &i in &buckets[y] {
+            let s = segs[i as usize];
+            let pad = s.r + 1.0;
+            let x0 = (s.a[0].min(s.b[0]) - pad).floor().max(0.0) as usize;
+            let x1 = ((s.a[0].max(s.b[0]) + pad).ceil().max(0.0) as usize).min(w);
+            let (dx, dy) = (s.b[0] - s.a[0], s.b[1] - s.a[1]);
+            let l2 = dx * dx + dy * dy;
+            let inner = s.r * hard - 0.5;
+            let outer = s.r + 0.5;
+            for (x, o) in row.iter_mut().enumerate().take(x1).skip(x0) {
+                let px = x as f64 + 0.5;
+                let t = if l2 > 1e-12 { (((px - s.a[0]) * dx + (py - s.a[1]) * dy) / l2).clamp(0.0, 1.0) } else { 0.0 };
+                let d = ((px - s.a[0] - dx * t).powi(2) + (py - s.a[1] - dy * t).powi(2)).sqrt();
+                if d >= outer {
+                    continue;
+                }
+                let c = if d <= inner { 1.0 } else { 1.0 - smoothstep(inner as f32, outer as f32, d as f32) } * s.v;
+                if c > *o {
+                    *o = c;
+                }
+            }
+        }
+    });
+    out
+}
+
+/// Segments along a polyline (buffer px).
+pub fn poly_segs(pts: &[[f64; 2]], closed: bool, r: f64, v: f32, out: &mut Vec<Seg>) {
+    let n = pts.len();
+    if n == 1 {
+        out.push(Seg { a: pts[0], b: pts[0], r, v });
+    }
+    if n < 2 {
+        return;
+    }
+    let segs = if closed { n } else { n - 1 };
+    for i in 0..segs {
+        out.push(Seg { a: pts[i], b: pts[(i + 1) % n], r, v });
+    }
+}
+
+/// Portion `[s0, s1]` (arc length) of a polyline.
+pub(crate) fn trim_poly(pts: &[[f64; 2]], closed: bool, s0: f64, s1: f64) -> Vec<[f64; 2]> {
+    let n = pts.len();
+    let mut out = Vec::new();
+    if n < 2 || s1 <= s0 {
+        return out;
+    }
+    let segs = if closed { n } else { n - 1 };
+    let mut acc = 0.0;
+    for i in 0..segs {
+        let (a, b) = (pts[i], pts[(i + 1) % n]);
+        let l = ((b[0] - a[0]).powi(2) + (b[1] - a[1]).powi(2)).sqrt();
+        let (e0, e1) = (acc, acc + l);
+        acc = e1;
+        if e1 < s0 || e0 > s1 || l <= 0.0 {
+            continue;
+        }
+        let at = |s: f64| {
+            let t = ((s - e0) / l).clamp(0.0, 1.0);
+            [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t]
+        };
+        let p0 = at(s0.max(e0));
+        if out.last() != Some(&p0) {
+            out.push(p0);
+        }
+        out.push(at(s1.min(e1)));
+    }
+    out
+}
+
+#[inline]
+pub(super) fn over(dst: Px, src: Px) -> Px {
+    let k = 1.0 - src[3];
+    [src[0] + dst[0] * k, src[1] + dst[1] * k, src[2] + dst[2] * k, src[3] + dst[3] * k]
+}
+
+/// Mask `idx` (1-based; 0 = none) mapped to buffer pixels.
+pub(crate) fn mask_px(ctx: &EffectCtx, b: &Buf, idx: usize) -> Option<(Vec<[f64; 2]>, bool, bool)> {
+    let m = ctx.env.masks.get(idx.checked_sub(1)?)?;
+    if m.points.is_empty() {
+        return None;
+    }
+    Some((m.points.iter().map(|&q| [q[0] * b.scale + b.offset[0], q[1] * b.scale + b.offset[1]]).collect(), m.closed, m.inverted))
+}
+
+/// All masks mapped to buffer pixels.
+pub(super) fn all_masks_px(ctx: &EffectCtx, b: &Buf) -> Vec<(Vec<[f64; 2]>, bool, bool)> {
+    (1..=ctx.env.masks.len()).filter_map(|i| mask_px(ctx, b, i)).collect()
+}
+
+/// Chaikin corner cutting (open polyline, endpoints kept).
+pub(super) fn chaikin(pts: &[[f64; 2]], iters: usize) -> Vec<[f64; 2]> {
+    let mut cur = pts.to_vec();
+    for _ in 0..iters {
+        if cur.len() < 3 {
+            return cur;
+        }
+        let mut nx = Vec::with_capacity(cur.len() * 2);
+        nx.push(cur[0]);
+        for w in cur.windows(2) {
+            let (a, b) = (w[0], w[1]);
+            nx.push([a[0] * 0.75 + b[0] * 0.25, a[1] * 0.75 + b[1] * 0.25]);
+            nx.push([a[0] * 0.25 + b[0] * 0.75, a[1] * 0.25 + b[1] * 0.75]);
+        }
+        nx.push(*cur.last().unwrap_or(&[0.0; 2]));
+        cur = nx;
+    }
+    cur
+}
+
+// ---------------------------------------------------------------- Scribble
+
+/// Scan runs (start, end along direction `d`) of the fill region on the line `n·p = s`.
+pub(super) fn scan_runs(polys: &[(Vec<[f64; 2]>, bool, bool)], fill: u32, ew: f64, d: [f64; 2], n: [f64; 2], s: f64, out: &mut Vec<(f64, f64)>) {
+    out.clear();
+    for (pts, _closed, inverted) in polys {
+        let m = pts.len();
+        if m < 2 {
+            continue;
+        }
+        // Crossings: (t along d, |sin| of crossing angle).
+        let mut xs: Vec<(f64, f64)> = Vec::new();
+        for i in 0..m {
+            let (a, b) = (pts[i], pts[(i + 1) % m]);
+            let (na, nb) = (a[0] * n[0] + a[1] * n[1] - s, b[0] * n[0] + b[1] * n[1] - s);
+            if (na > 0.0) == (nb > 0.0) {
+                continue;
+            }
+            let t = na / (na - nb);
+            let q = [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t];
+            let (ex, ey) = (b[0] - a[0], b[1] - a[1]);
+            let el = (ex * ex + ey * ey).sqrt().max(1e-9);
+            let sin = ((ex * n[0] + ey * n[1]) / el).abs().max(0.2);
+            xs.push((q[0] * d[0] + q[1] * d[1], sin));
+        }
+        xs.sort_by(|a, b| a.0.total_cmp(&b.0));
+        // Signed area decides which side is "left".
+        let area: f64 = (0..m).map(|i| pts[i][0] * pts[(i + 1) % m][1] - pts[(i + 1) % m][0] * pts[i][1]).sum();
+        let left_is_inside = area < 0.0;
+        let mode = match fill {
+            4 => {
+                if left_is_inside {
+                    2
+                } else {
+                    3
+                }
+            }
+            5 => {
+                if left_is_inside {
+                    3
+                } else {
+                    2
+                }
+            }
+            f => f,
+        };
+        let mode = if *inverted && mode == 0 { 6 } else { mode };
+        for (k, &(t, sin)) in xs.iter().enumerate() {
+            let entering = k % 2 == 0;
+            let l = ew / sin;
+            match mode {
+                0 if entering && k + 1 < xs.len() => {
+                    out.push((t, xs[k + 1].0));
+                }
+                1 => out.push((t - l * 0.5, t + l * 0.5)),
+                2 => out.push(if entering { (t, t + l) } else { (t - l, t) }),
+                3 => out.push(if entering { (t - l, t) } else { (t, t + l) }),
+                _ => {}
+            }
+        }
+        if mode == 6 {
+            // Inverted Inside: outside of the polygon within the bounds.
+            let lo = pts.iter().map(|q| q[0] * d[0] + q[1] * d[1]).fold(f64::INFINITY, f64::min) - ew;
+            let hi = pts.iter().map(|q| q[0] * d[0] + q[1] * d[1]).fold(f64::NEG_INFINITY, f64::max) + ew;
+            let mut cur = lo;
+            for pair in xs.chunks(2) {
+                out.push((cur, pair[0].0));
+                cur = pair.get(1).map(|v| v.0).unwrap_or(hi);
+            }
+            out.push((cur, hi));
+        }
+    }
+    out.sort_by(|a, b| a.0.total_cmp(&b.0));
+    // Merge overlaps.
+    let mut merged: Vec<(f64, f64)> = Vec::with_capacity(out.len());
+    for &(a, b) in out.iter() {
+        if let Some(last) = merged.last_mut()
+            && a <= last.1
+        {
+            last.1 = last.1.max(b);
+            continue;
+        }
+        merged.push((a, b));
+    }
+    *out = merged;
+}
+
+/// End Cap and Join options (Scribble's Edge Options).
+pub(super) const END_CAPS: [&str; 3] = ["Round", "Butt", "Projecting"];
+
+pub(super) const JOINS: [&str; 3] = ["Round", "Miter", "Bevel"];
+
+/// Convex polygons whose union is the stroke of the polylines `lines` with half width `r`:
+/// one quad per segment, plus the joins (Round discs, Miter wedges up to `miter_limit` × the
+/// half width, Bevel triangles) and the caps (Round discs, Butt none, Projecting square ends).
+pub(crate) fn stroke_outline(lines: &[Vec<[f64; 2]>], r: f64, cap: u32, join: u32, miter_limit: f64) -> Vec<Vec<[f64; 2]>> {
+    let disc = |c: [f64; 2]| -> Vec<[f64; 2]> {
+        (0..16).map(|k| (k as f64 / 16.0 * std::f64::consts::TAU).sin_cos()).map(|(s, co)| [c[0] + co * r, c[1] + s * r]).collect()
+    };
+    let mut out = Vec::new();
+    for l in lines {
+        let pts: Vec<[f64; 2]> = l.iter().copied().fold(Vec::new(), |mut v, p| {
+            if v.last().is_none_or(|q: &[f64; 2]| (q[0] - p[0]).hypot(q[1] - p[1]) > 1e-9) {
+                v.push(p);
+            }
+            v
+        });
+        if pts.len() < 2 {
+            if let (Some(p), 0) = (pts.first(), cap) {
+                out.push(disc(*p));
+            }
+            continue;
+        }
+        let dir = |a: [f64; 2], b: [f64; 2]| {
+            let (dx, dy) = (b[0] - a[0], b[1] - a[1]);
+            let l = dx.hypot(dy).max(1e-12);
+            [dx / l, dy / l]
+        };
+        let n = pts.len();
+        for k in 0..n - 1 {
+            let (mut a, mut b) = (pts[k], pts[k + 1]);
+            let d = dir(a, b);
+            // Projecting caps extend the end segments by the half width.
+            if cap == 2 && k == 0 {
+                a = [a[0] - d[0] * r, a[1] - d[1] * r];
+            }
+            if cap == 2 && k == n - 2 {
+                b = [b[0] + d[0] * r, b[1] + d[1] * r];
+            }
+            let nn = [-d[1] * r, d[0] * r];
+            out.push(vec![[a[0] + nn[0], a[1] + nn[1]], [b[0] + nn[0], b[1] + nn[1]], [b[0] - nn[0], b[1] - nn[1]], [a[0] - nn[0], a[1] - nn[1]]]);
+        }
+        // Joins.
+        for k in 1..n - 1 {
+            let (p, d0, d1) = (pts[k], dir(pts[k - 1], pts[k]), dir(pts[k], pts[k + 1]));
+            let cross = d0[0] * d1[1] - d0[1] * d1[0];
+            if cross.abs() < 1e-9 && d0[0] * d1[0] + d0[1] * d1[1] > 0.0 {
+                continue;
+            }
+            if join == 0 {
+                out.push(disc(p));
+                continue;
+            }
+            // The outer side of the turn.
+            let s = if cross > 0.0 { -1.0 } else { 1.0 };
+            let o0 = [p[0] - d0[1] * r * s, p[1] + d0[0] * r * s];
+            let o1 = [p[0] - d1[1] * r * s, p[1] + d1[0] * r * s];
+            let bevel = vec![p, o0, o1];
+            if join == 1 {
+                // Miter point: where the two offset edges meet.
+                let bis = [d0[0] - d1[0], d0[1] - d1[1]];
+                let bl = bis[0].hypot(bis[1]);
+                let cos_half = ((1.0 + d0[0] * d1[0] + d0[1] * d1[1]) * 0.5).max(0.0).sqrt();
+                let len = if cos_half > 1e-6 { r / cos_half } else { f64::INFINITY };
+                if bl > 1e-9 && len <= miter_limit * r {
+                    let m = [p[0] + (o0[0] + o1[0] - 2.0 * p[0]) * 0.5, p[1] + (o0[1] + o1[1] - 2.0 * p[1]) * 0.5];
+                    let ml = (m[0] - p[0]).hypot(m[1] - p[1]).max(1e-12);
+                    let tip = [p[0] + (m[0] - p[0]) / ml * len, p[1] + (m[1] - p[1]) / ml * len];
+                    out.push(vec![p, o0, tip, o1]);
+                    continue;
+                }
+            }
+            out.push(bevel);
+        }
+        if cap == 0 {
+            out.push(disc(pts[0]));
+            out.push(disc(pts[n - 1]));
+        }
+    }
+    out
+}
+
+/// Coverage (union, 4×4 samples per pixel) of convex polygons on a `w`×`h` grid.
+pub(crate) fn raster_convex(w: usize, h: usize, polys: &[Vec<[f64; 2]>]) -> Plane {
+    let mut out = Plane::new(w, h);
+    let inside = |poly: &[[f64; 2]], x: f64, y: f64| {
+        let n = poly.len();
+        let mut sign = 0.0;
+        for i in 0..n {
+            let (a, b) = (poly[i], poly[(i + 1) % n]);
+            let c = (b[0] - a[0]) * (y - a[1]) - (b[1] - a[1]) * (x - a[0]);
+            if c.abs() < 1e-12 {
+                continue;
+            }
+            if sign == 0.0 {
+                sign = c.signum();
+            } else if c.signum() != sign {
+                return false;
+            }
+        }
+        true
+    };
+    for poly in polys {
+        if poly.len() < 3 {
+            continue;
+        }
+        let (mut x0, mut y0, mut x1, mut y1) = (f64::INFINITY, f64::INFINITY, f64::NEG_INFINITY, f64::NEG_INFINITY);
+        for p in poly {
+            x0 = x0.min(p[0]);
+            y0 = y0.min(p[1]);
+            x1 = x1.max(p[0]);
+            y1 = y1.max(p[1]);
+        }
+        let (xa, xb) = (x0.floor().max(0.0) as usize, (x1.ceil().max(0.0) as usize).min(w));
+        let (ya, yb) = (y0.floor().max(0.0) as usize, (y1.ceil().max(0.0) as usize).min(h));
+        for y in ya..yb {
+            for x in xa..xb {
+                let mut hit = 0;
+                for sy in 0..4 {
+                    for sx in 0..4 {
+                        if inside(poly, x as f64 + (sx as f64 + 0.5) / 4.0, y as f64 + (sy as f64 + 0.5) / 4.0) {
+                            hit += 1;
+                        }
+                    }
+                }
+                let v = &mut out.data[y * w + x];
+                *v = v.max(hit as f32 / 16.0);
+            }
+        }
+    }
+    out
+}
diff --git a/crates/effects/src/generate3/registry.rs b/crates/effects/src/generate3/registry.rs
new file mode 100644
index 000000000..06c2b35fb
--- /dev/null
+++ b/crates/effects/src/generate3/registry.rs
@@ -0,0 +1,265 @@
+use super::audio::{audio_spectrum, audio_waveform};
+use super::common::{pct, pt, spec};
+use super::fill::{eyedropper_fill, glue_gun, paint_bucket, threads};
+use super::fractal::{FRACTAL_OVERSAMPLE, FRACTAL_PALETTES, FRACTAL_SETS, fractal};
+use super::paths::{scribble, stroke, vegas, write_on};
+use super::raster::{END_CAPS, JOINS};
+use super::{EffectSpec, ParamUi, Value, col, num, p, popup, slider};
+
+// ---------------------------------------------------------------- registry
+
+pub fn specs() -> Vec<EffectSpec> {
+    let ang = || ParamUi::Angle;
+    let check = |id: &'static str, name: &'static str, v: bool| p(id, name, Value::Bool(v), ParamUi::Checkbox);
+    let paint_style = || popup(&["On Original Image", "On Transparent", "Reveal Original Image"]);
+    let mask_idx = |id: &'static str, name: &'static str, d: f64| p(id, name, num(d), ParamUi::Mask);
+    let display = || popup(&["Digital", "Analog lines", "Analog dots"]);
+    vec![
+        spec(
+            "ec.generate.fractal",
+            "Fractal",
+            vec![
+                p("setChoice", "Set Choice", Value::Enum(0), popup(&FRACTAL_SETS)),
+                p("equation", "Equation", Value::Enum(0), popup(&["z = z^2 + c", "z = z^3 + c", "z = z^4 + c"])),
+                p("mandelbrot/mandelbrotX", "X (Real)", num(-0.74), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                p("mandelbrot/mandelbrotY", "Y (Imaginary)", num(0.15), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                p("mandelbrot/mandelbrotMagnification", "Magnification", num(0.0), slider(-5.0, 30.0, -5.0, 30.0, 2)),
+                p("mandelbrot/mandelbrotEscapeLimit", "Escape Limit", num(4.0), slider(1.0, 1000.0, 1.0, 100.0, 1)),
+                p("julia/juliaX", "X (Real)", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                p("julia/juliaY", "Y (Imaginary)", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                p("julia/juliaMagnification", "Magnification", num(0.0), slider(-5.0, 30.0, -5.0, 30.0, 2)),
+                p("julia/juliaEscapeLimit", "Escape Limit", num(4.0), slider(1.0, 1000.0, 1.0, 100.0, 1)),
+                p("postInversionOffset/postInversionX", "X Offset", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                p("postInversionOffset/postInversionY", "Y Offset", num(0.0), slider(-2.0, 2.0, -2.0, 2.0, 4)),
+                check("fractalColor/overlay", "Overlay", false),
+                check("fractalColor/transparency", "Transparency", false),
+                p("fractalColor/palette", "Palette", Value::Enum(0), popup(&FRACTAL_PALETTES)),
+                p("fractalColor/hue", "Hue", num(0.0), ang()),
+                p("fractalColor/cycleSteps", "Cycle Steps", num(32.0), slider(1.0, 1000.0, 1.0, 256.0, 0)),
+                p("fractalColor/cycleOffset", "Cycle Offset", num(0.0), ang()),
+                check("fractalColor/edgeHighlight", "Edge Highlight", false),
+                p("highQualitySettings/samplingMethod", "Oversample Method", Value::Enum(0), popup(&FRACTAL_OVERSAMPLE)),
+                p("highQualitySettings/samplingFactor", "Oversample Factor", num(2.0), slider(1.0, 9.0, 1.0, 9.0, 0)),
+            ],
+            fractal,
+        ),
+        spec(
+            "ec.generate.scribble",
+            "Scribble",
+            vec![
+                p("scribble", "Scribble", Value::Enum(0), popup(&["Single Mask", "All Masks", "All Masks Using Modes"])),
+                mask_idx("mask", "Mask", 1.0),
+                p("fillType", "Fill Type", Value::Enum(0), popup(&["Inside", "Centered Edge", "Inside Edge", "Outside Edge", "Left Edge", "Right Edge"])),
+                p("edgeOptions/edgeWidth", "Edge Width", num(10.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
+                p("edgeOptions/endCap", "End Cap", Value::Enum(0), popup(&END_CAPS)),
+                p("edgeOptions/join", "Join", Value::Enum(0), popup(&JOINS)),
+                p("edgeOptions/miterLimit", "Miter Limit", num(4.0), slider(1.0, 100.0, 1.0, 20.0, 1)),
+                p("color", "Color", col(1.0, 0.0, 0.0), ParamUi::Color),
+                p("opacity", "Opacity", num(100.0), pct()),
+                p("angle", "Angle", num(45.0), ang()),
+                p("strokeWidth", "Stroke Width", num(2.0), slider(0.1, 50.0, 0.1, 50.0, 1)),
+                p("strokeOptions/curviness", "Curviness", num(50.0), pct()),
+                p("strokeOptions/curvinessVariation", "Curviness Variation", num(50.0), pct()),
+                p("strokeOptions/spacing", "Spacing", num(5.0), slider(0.1, 100.0, 0.1, 50.0, 1)),
+                p("strokeOptions/spacingVariation", "Spacing Variation", num(50.0), pct()),
+                p("strokeOptions/pathOverlap", "Path Overlap", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
+                p("strokeOptions/pathOverlapVariation", "Path Overlap Variation", num(50.0), pct()),
+                p("start", "Start", num(0.0), pct()),
+                p("end", "End", num(100.0), pct()),
+                p("startEndApplyTo", "Start/End Apply To", Value::Enum(0), popup(&["All Strokes", "Each Stroke"])),
+                check("fillPathsSequentially", "Fill Paths Sequentially", true),
+                p("wiggleType", "Wiggle Type", Value::Enum(1), popup(&["Static", "Jumpy", "Smooth"])),
+                p("wigglesPerSecond", "Wiggles/Second", num(5.0), slider(0.0, 100.0, 0.0, 30.0, 2)),
+                p("randomSeed", "Random Seed", num(1.0), slider(0.0, 10000.0, 0.0, 100.0, 0)),
+                p("composite", "Composite", Value::Enum(1), popup(&["On Original Image", "On Transparent", "Reveal Original Image"])),
+            ],
+            scribble,
+        ),
+        spec(
+            "ec.generate.stroke",
+            "Stroke",
+            vec![
+                mask_idx("path", "Path", 1.0),
+                check("allMasks", "All Masks", false),
+                check("strokeSequentially", "Stroke Sequentially", true),
+                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("brushSize", "Brush Size", num(2.0), slider(0.0, 50.0, 0.0, 50.0, 1)),
+                p("brushHardness", "Brush Hardness", num(75.0), pct()),
+                p("opacity", "Opacity", num(100.0), pct()),
+                p("start", "Start", num(0.0), pct()),
+                p("end", "End", num(100.0), pct()),
+                p("spacing", "Spacing", num(15.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
+                p("paintStyle", "Paint Style", Value::Enum(0), paint_style()),
+            ],
+            stroke,
+        ),
+        spec(
+            "ec.generate.vegas",
+            "Vegas",
+            vec![
+                p("stroke", "Stroke", Value::Enum(0), popup(&["Image Contours", "Mask/Path"])),
+                p("inputLayer", "Image Contours: Input Layer", Value::Layer(None), ParamUi::Layer),
+                check("invertInput", "Image Contours: Invert Input", false),
+                p("ifLayerSizesDiffer", "Image Contours: If Layer Sizes Differ", Value::Enum(0), popup(&["Center", "Stretch to Fit"])),
+                p("channel", "Image Contours: Channel", Value::Enum(0), popup(&["Intensity", "Red", "Green", "Blue", "Alpha"])),
+                p("threshold", "Image Contours: Threshold", num(50.0), pct()),
+                p("preBlur", "Image Contours: Pre-Blur", num(1.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
+                p("tolerance", "Image Contours: Tolerance", num(0.01), slider(0.0, 1.0, 0.0, 0.1, 3)),
+                p("renderMode", "Image Contours: Render", Value::Enum(0), popup(&["All Contours", "Selected Contour"])),
+                p("selectedContour", "Image Contours: Selected Contour", num(1.0), slider(1.0, 1000.0, 1.0, 20.0, 0)),
+                p("shorterContoursHave", "Image Contours: Shorter Contours Have", Value::Enum(0), popup(&["Same Number of Segments", "Fewer Segments"])),
+                mask_idx("path", "Mask/Path: Path", 1.0),
+                p("segments", "Segments: Segments", num(32.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
+                p("length", "Segments: Length", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("segmentDistribution", "Segments: Segment Distribution", Value::Enum(0), popup(&["Bunched", "Even"])),
+                p("rotation", "Segments: Rotation", num(0.0), ang()),
+                check("randomPhase", "Segments: Random Phase", false),
+                p("randomSeed", "Segments: Random Seed", num(1.0), slider(1.0, 10000.0, 1.0, 100.0, 0)),
+                p("blendMode", "Rendering: Blend Mode", Value::Enum(1), popup(&["Transparent", "Over", "Under", "Stencil"])),
+                p("color", "Rendering: Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("width", "Rendering: Width", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
+                p("hardness", "Rendering: Hardness", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("startOpacity", "Rendering: Start Opacity", num(1.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("midpointOpacity", "Rendering: Mid-point Opacity", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("midpointPosition", "Rendering: Mid-point Position", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("endOpacity", "Rendering: End Opacity", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+            ],
+            vegas,
+        ),
+        spec(
+            "ec.generate.writeon",
+            "Write-on",
+            vec![
+                p("brushPosition", "Brush Position", pt(0.5, 0.5), ParamUi::Point),
+                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("brushSize", "Brush Size", num(6.0), slider(0.0, 50.0, 0.0, 50.0, 1)),
+                p("brushHardness", "Brush Hardness", num(75.0), pct()),
+                p("brushOpacity", "Brush Opacity", num(100.0), pct()),
+                p("strokeLength", "Stroke Length (secs)", num(0.0), slider(0.0, 30.0, 0.0, 30.0, 1)),
+                p("brushSpacing", "Brush Spacing (secs)", num(0.001), slider(0.001, 5.0, 0.001, 5.0, 3)),
+                p("paintTimeProperties", "Paint Time Properties", Value::Enum(0), popup(&["None", "Opacity", "Color"])),
+                p("brushTimeProperties", "Brush Time Properties", Value::Enum(0), popup(&["None", "Size", "Hardness", "Size & Hardness"])),
+                p("paintStyle", "Paint Style", Value::Enum(0), paint_style()),
+            ],
+            write_on,
+        ),
+        spec(
+            "ec.generate.paintbucket",
+            "Paint Bucket",
+            vec![
+                p("fillPoint", "Fill Point", pt(0.5, 0.5), ParamUi::Point),
+                p("fillSelector", "Fill Selector", Value::Enum(0), popup(&["Color & Alpha", "Straight Color", "Transparency", "Opacity", "Alpha Channel"])),
+                p("tolerance", "Tolerance", num(10.0), slider(0.0, 255.0, 0.0, 100.0, 1)),
+                check("viewThreshold", "View Threshold", false),
+                p("stroke", "Stroke", Value::Enum(0), popup(&["Antialias", "Feather", "Spread", "Choke", "Stroke"])),
+                p("featherSoftness", "Feather Softness", num(10.0), slider(0.0, 100.0, 0.0, 50.0, 1)),
+                p("spreadRadius", "Spread Radius", num(3.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
+                p("strokeWidth", "Stroke Width", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
+                p("color", "Color", col(1.0, 0.0, 0.0), ParamUi::Color),
+                p("opacity", "Opacity", num(100.0), pct()),
+                p(
+                    "blendingMode",
+                    "Blending Mode",
+                    Value::Enum(0),
+                    popup(&["Normal", "Add", "Multiply", "Screen", "Hue", "Saturation", "Color", "Luminosity", "Behind", "Fill Only"]),
+                ),
+            ],
+            paint_bucket,
+        ),
+        spec(
+            "ec.generate.eyedropperfill",
+            "Eyedropper Fill",
+            vec![
+                p("samplePoint", "Sample Point", pt(0.5, 0.5), ParamUi::Point),
+                p("sampleRadius", "Sample Radius", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
+                p("averagePixelColors", "Average Pixel Colors", Value::Enum(0), popup(&["Skip Empty", "All", "All Premultiplied", "Including Alpha"])),
+                check("maintainOriginalAlpha", "Maintain Original Alpha", false),
+                p("blendWithOriginal", "Blend With Original", num(0.0), pct()),
+            ],
+            eyedropper_fill,
+        ),
+        spec(
+            "ec.generate.ccgluegun",
+            "CC Glue Gun",
+            vec![
+                p("brushPosition", "Brush Position", pt(0.5, 0.5), ParamUi::Point),
+                p("strokeWidth", "Stroke Width", num(25.0), slider(0.0, 500.0, 0.0, 100.0, 1)),
+                p("density", "Density", num(5.0), slider(0.0, 32.0, 0.0, 32.0, 1)),
+                p("timeSpan", "Time Span (sec)", num(1.0), slider(0.0, 60.0, 0.0, 10.0, 2)),
+                p("reflection", "Reflection", num(45.0), ang()),
+                p("strength", "Strength", num(100.0), pct()),
+                p("style", "Style", Value::Enum(0), popup(&["Over Layer", "Glue Only"])),
+            ],
+            glue_gun,
+        ),
+        spec(
+            "ec.generate.ccthreads",
+            "CC Threads",
+            vec![
+                p("width", "Width", num(50.0), slider(1.0, 1000.0, 1.0, 200.0, 1)),
+                p("height", "Height", num(50.0), slider(1.0, 1000.0, 1.0, 200.0, 1)),
+                p("overlaps", "Overlaps", num(1.0), slider(1.0, 20.0, 1.0, 10.0, 0)),
+                p("direction", "Direction", num(0.0), ang()),
+                p("center", "Center", pt(0.5, 0.5), ParamUi::Point),
+                p("coverage", "Coverage", num(80.0), pct()),
+                p("shadowing", "Shadowing", num(50.0), pct()),
+                p("texture", "Texture", num(10.0), pct()),
+            ],
+            threads,
+        ),
+        spec(
+            "ec.generate.audiospectrum",
+            "Audio Spectrum",
+            vec![
+                p("audioLayer", "Audio Layer", Value::Layer(None), ParamUi::Layer),
+                p("startPoint", "Start Point", pt(0.1, 0.5), ParamUi::Point),
+                p("endPoint", "End Point", pt(0.9, 0.5), ParamUi::Point),
+                mask_idx("path", "Path", 0.0),
+                check("usePolarPath", "Use Polar Path", false),
+                p("startFrequency", "Start Frequency", num(20.0), slider(1.0, 20000.0, 1.0, 2000.0, 0)),
+                p("endFrequency", "End Frequency", num(2000.0), slider(1.0, 20000.0, 1.0, 10000.0, 0)),
+                p("frequencyBands", "Frequency bands", num(64.0), slider(1.0, 4096.0, 1.0, 256.0, 0)),
+                p("maximumHeight", "Maximum Height", num(50.0), slider(0.0, 10000.0, 0.0, 500.0, 1)),
+                p("audioDuration", "Audio Duration (milliseconds)", num(90.0), slider(1.0, 30000.0, 1.0, 1000.0, 1)),
+                p("audioOffset", "Audio Offset (milliseconds)", num(0.0), slider(-30000.0, 30000.0, -1000.0, 1000.0, 1)),
+                p("thickness", "Thickness", num(3.0), slider(0.0, 1000.0, 0.0, 50.0, 2)),
+                p("softness", "Softness", num(50.0), pct()),
+                p("insideColor", "Inside Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("outsideColor", "Outside Color", col(0.2, 0.4, 1.0), ParamUi::Color),
+                check("blendOverlappingColors", "Blend Overlapping Colors", true),
+                p("hueInterpolation", "Hue Interpolation", num(0.0), ang()),
+                check("dynamicHuePhase", "Dynamic Hue Phase", false),
+                check("colorSymmetry", "Color Symmetry", false),
+                p("displayOptions", "Display Options", Value::Enum(0), display()),
+                p("sideOptions", "Side Options", Value::Enum(0), popup(&["Side A", "Side B", "Side A & B"])),
+                check("durationAveraging", "Duration Averaging", false),
+                check("compositeOnOriginal", "Composite On Original", false),
+            ],
+            audio_spectrum,
+        ),
+        spec(
+            "ec.generate.audiowaveform",
+            "Audio Waveform",
+            vec![
+                p("audioLayer", "Audio Layer", Value::Layer(None), ParamUi::Layer),
+                p("startPoint", "Start Point", pt(0.1, 0.5), ParamUi::Point),
+                p("endPoint", "End Point", pt(0.9, 0.5), ParamUi::Point),
+                mask_idx("path", "Path", 0.0),
+                check("usePolarPath", "Use Polar Path", false),
+                p("displayedSamples", "Displayed Samples", num(200.0), slider(2.0, 4096.0, 2.0, 1000.0, 0)),
+                p("maximumHeight", "Maximum Height", num(100.0), slider(0.0, 10000.0, 0.0, 500.0, 1)),
+                p("audioDuration", "Audio Duration (milliseconds)", num(200.0), slider(1.0, 30000.0, 1.0, 1000.0, 1)),
+                p("audioOffset", "Audio Offset (milliseconds)", num(0.0), slider(-30000.0, 30000.0, -1000.0, 1000.0, 1)),
+                p("thickness", "Thickness", num(2.0), slider(0.0, 1000.0, 0.0, 50.0, 2)),
+                p("softness", "Softness", num(10.0), pct()),
+                p("randomSeed", "Random Seed (Analog)", num(1.0), slider(1.0, 10000.0, 1.0, 100.0, 0)),
+                p("insideColor", "Inside Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("outsideColor", "Outside Color", col(0.2, 0.4, 1.0), ParamUi::Color),
+                p("waveformOptions", "Waveform Options", Value::Enum(0), popup(&["Mono", "Left", "Right"])),
+                p("displayOptions", "Display Options", Value::Enum(1), display()),
+                check("compositeOnOriginal", "Composite On Original", false),
+            ],
+            audio_waveform,
+        ),
+    ]
+}
diff --git a/crates/effects/src/generate3/tests.rs b/crates/effects/src/generate3/tests.rs
new file mode 100644
index 000000000..0edad2f2d
--- /dev/null
+++ b/crates/effects/src/generate3/tests.rs
@@ -0,0 +1,397 @@
+use super::*;
+use crate::{EffectEnv, EffectHost, LayerPixels, MaskShape, Params};
+
+/// Run with point defaults scaled to the layer size.
+pub(crate) fn run_env(id: &str, set: &[(&str, Value)], img: Image, time: f64, env: EffectEnv) -> Buf {
+    let s = crate::find(id).unwrap();
+    let ls = [img.width as f64, img.height as f64];
+    let mut params = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    for p in &s.params {
+        if let (ParamUi::Point, Value::Vec2(v)) = (&p.ui, &p.default) {
+            params.values.insert(p.id.to_string(), Value::Vec2([v[0] * ls[0], v[1] * ls[1]]));
+        }
+    }
+    for (k, v) in set {
+        assert!(params.values.contains_key(*k), "{id}: unknown {k}");
+        params.values.insert(k.to_string(), v.clone());
+    }
+    let ctx = EffectCtx { params: &params, time, layer_size: ls, seed: 3, adjustment: false, env };
+    crate::apply(s, &ctx, Buf { img, offset: [0.0, 0.0], scale: 1.0 })
+}
+
+fn run(id: &str, set: &[(&str, Value)], img: Image) -> Buf {
+    run_env(id, set, img, 0.5, EffectEnv::default())
+}
+
+fn square_mask() -> Vec<MaskShape> {
+    vec![MaskShape { name: "Mask 1".into(), points: vec![[16.0, 16.0], [48.0, 16.0], [48.0, 48.0], [16.0, 48.0]], closed: true, inverted: false }]
+}
+
+fn alpha_sum(img: &Image, x0: usize, y0: usize, x1: usize, y1: usize) -> f32 {
+    let mut s = 0.0;
+    for y in y0..y1 {
+        for x in x0..x1 {
+            s += img.data[y * img.width as usize + x][3];
+        }
+    }
+    s
+}
+
+#[test]
+fn audio_spectrum_linear_frequency_and_linear_amplitude() {
+    let host = Tone; // Tone produces 440 Hz
+    let env = EffectEnv { host: Some(&host), comp_time: 1.0, ..Default::default() };
+    let img = Image::new(200, 100);
+    let out = run_env(
+        "ec.generate.audiospectrum",
+        &[
+            ("audioLayer", Value::Layer(Some(1))),
+            ("startPoint", Value::Vec2([0.0, 50.0])),
+            ("endPoint", Value::Vec2([200.0, 50.0])),
+            ("startFrequency", num(20.0)),
+            ("endFrequency", num(2000.0)),
+            ("frequencyBands", num(100.0)),
+            ("maximumHeight", num(40.0)),
+            ("thickness", num(2.0)),
+            ("softness", num(0.0)),
+        ],
+        img,
+        1.0,
+        env,
+    );
+    // Verify 440 Hz tone produces a peak above baseline, while high frequencies have zero bar height
+    let peak_zone = alpha_sum(&out.img, 36, 10, 48, 48);
+    let high_zone = alpha_sum(&out.img, 120, 10, 150, 48);
+    let silent_zone = alpha_sum(&out.img, 170, 10, 195, 48);
+    assert!(peak_zone > 5.0, "peak zone has energy: {peak_zone}");
+    assert!(peak_zone > high_zone * 2.0, "linear peak is distinctly taller than far frequencies: {peak_zone} vs {high_zone}");
+    assert_eq!(silent_zone, 0.0, "silent end has zero height, not boosted by dB scale");
+}
+
+#[test]
+fn fractal_deterministic_and_has_inside_set() {
+    let img = Image::new(64, 48);
+    let a = run("ec.generate.fractal", &[], img.clone());
+    let b = run("ec.generate.fractal", &[], img.clone());
+    assert_eq!(a.img.data, b.img.data);
+    // The default view contains the main cardioid (black, opaque) and escaped (coloured) points.
+    assert!(a.img.data.iter().any(|p| p[3] > 0.99 && p[0] + p[1] + p[2] < 0.01));
+    assert!(a.img.data.iter().any(|p| p[0] + p[1] + p[2] > 0.3));
+    let t = run("ec.generate.fractal", &[("fractalColor/transparency", Value::Bool(true))], img);
+    assert!(t.img.data.iter().any(|p| p[3] == 0.0));
+}
+
+#[test]
+fn fractal_palettes_and_set_choices() {
+    let img = Image::new(64, 48);
+    // Solid Color: only the inside of the set is drawn; Transparency flips it.
+    let solid = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(3))], img.clone());
+    assert!(solid.img.data.iter().any(|p| p[3] == 0.0) && solid.img.data.iter().any(|p| p[3] > 0.99 && p[0] > 0.9));
+    let flipped = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(3)), ("fractalColor/transparency", Value::Bool(true))], img.clone());
+    for (a, b) in solid.img.data.iter().zip(&flipped.img.data) {
+        assert!((a[3] > 0.5) != (b[3] > 0.5) || (a[3] - 0.5).abs() < 0.49);
+    }
+    // Black And White: escaped pixels are pure black or white (away from supersampled edges).
+    let bw = run("ec.generate.fractal", &[("fractalColor/palette", Value::Enum(2)), ("highQualitySettings/samplingFactor", num(1.0))], img.clone());
+    assert!(bw.img.data.iter().all(|p| p[0] == p[1] && p[1] == p[2] && (p[0] == 0.0 || p[0] == 1.0)));
+    // Mandelbrot Over Julia depends on the Julia centre.
+    let o1 = run("ec.generate.fractal", &[("setChoice", Value::Enum(2)), ("julia/juliaX", num(0.3))], img.clone());
+    let o2 = run("ec.generate.fractal", &[("setChoice", Value::Enum(2)), ("julia/juliaX", num(-0.2))], img.clone());
+    assert_ne!(o1.img.data, o2.img.data);
+    let plain = run("ec.generate.fractal", &[("julia/juliaX", num(0.3))], img);
+    assert_ne!(o1.img.data, plain.img.data);
+}
+
+#[test]
+fn scribble_fills_mask_and_animates() {
+    let masks = square_mask();
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let img = Image::filled(64, 64, [0.0, 0.0, 1.0, 1.0]);
+    let a = run_env("ec.generate.scribble", &[], img.clone(), 0.5, env);
+    let b = run_env("ec.generate.scribble", &[], img.clone(), 0.5, env);
+    assert_eq!(a.img.data, b.img.data);
+    let inside = alpha_sum(&a.img, 18, 18, 46, 46);
+    let outside = alpha_sum(&a.img, 0, 0, 10, 64);
+    assert!(inside > 100.0 && outside < 1.0, "{inside} {outside}");
+    let c = run_env("ec.generate.scribble", &[], img.clone(), 1.5, env);
+    assert_ne!(a.img.data, c.img.data, "jumpy wiggle changes over time");
+    let s = run_env("ec.generate.scribble", &[("wiggleType", Value::Enum(0))], img.clone(), 0.5, env);
+    let s2 = run_env("ec.generate.scribble", &[("wiggleType", Value::Enum(0))], img.clone(), 3.5, env);
+    assert_eq!(s.img.data, s2.img.data, "static wiggle is constant");
+    let half = run_env("ec.generate.scribble", &[("end", num(50.0))], img, 0.5, env);
+    assert!(alpha_sum(&half.img, 0, 0, 64, 64) < alpha_sum(&a.img, 0, 0, 64, 64));
+}
+
+#[test]
+fn scribble_edge_types() {
+    let masks = square_mask();
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let img = Image::new(64, 64);
+    let o = run_env("ec.generate.scribble", &[("fillType", Value::Enum(3)), ("edgeOptions/edgeWidth", num(6.0))], img, 0.5, env);
+    // Outside edge: paint near the border outside, nothing in the centre.
+    assert!(alpha_sum(&o.img, 26, 26, 38, 38) < 0.5);
+    assert!(alpha_sum(&o.img, 8, 8, 16, 56) > 5.0);
+}
+
+#[test]
+fn stroke_draws_along_mask() {
+    let masks = square_mask();
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let img = Image::new(64, 64);
+    let a = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("paintStyle", Value::Enum(1))], img.clone(), 0.0, env);
+    assert!(a.img.get(32, 16)[3] > 0.9, "on the top edge");
+    assert!(a.img.get(32, 32)[3] < 0.01, "centre empty");
+    let b = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("end", num(25.0))], img.clone(), 0.0, env);
+    assert!(b.img.get(32, 16)[3] > 0.9 && b.img.get(48, 32)[3] < 0.01, "first quarter only");
+    let d = run_env("ec.generate.stroke", &[("brushSize", num(4.0)), ("spacing", num(300.0))], img, 0.0, env);
+    assert!(alpha_sum(&d.img, 0, 0, 64, 64) < alpha_sum(&a.img, 0, 0, 64, 64), "spaced dabs");
+    // No masks: unchanged.
+    let src = Image::filled(8, 8, [0.2, 0.3, 0.4, 1.0]);
+    assert_eq!(run("ec.generate.stroke", &[], src.clone()).img.data, src.data);
+}
+
+#[test]
+fn vegas_traces_contours() {
+    let mut img = Image::new(64, 64);
+    for y in 16..48 {
+        for x in 16..48 {
+            img.set(x, y, [1.0, 1.0, 1.0, 1.0]);
+        }
+    }
+    let a =
+        run("ec.generate.vegas", &[("blendMode", Value::Enum(0)), ("length", num(1.0)), ("midpointOpacity", num(1.0)), ("endOpacity", num(1.0))], img.clone());
+    let b =
+        run("ec.generate.vegas", &[("blendMode", Value::Enum(0)), ("length", num(1.0)), ("midpointOpacity", num(1.0)), ("endOpacity", num(1.0))], img.clone());
+    assert_eq!(a.img.data, b.img.data);
+    assert!(alpha_sum(&a.img, 14, 14, 50, 50) > 50.0, "edges drawn");
+    assert!(alpha_sum(&a.img, 26, 26, 38, 38) < 0.5, "interior untouched");
+    let r = run("ec.generate.vegas", &[("blendMode", Value::Enum(0)), ("rotation", num(90.0))], img);
+    assert_ne!(r.img.data, a.img.data);
+}
+
+#[test]
+fn contours_of_square_are_closed() {
+    let mut pl = Plane::new(20, 20);
+    for y in 5..15 {
+        for x in 5..15 {
+            pl.data[y * 20 + x] = 1.0;
+        }
+    }
+    let c = contours(&pl, 0.5);
+    assert_eq!(c.len(), 1);
+    assert!(c[0].1);
+    let l = poly_length(&c[0].0, true);
+    assert!((l - 40.0).abs() < 4.0, "{l}");
+}
+
+#[test]
+fn write_on_and_glue_gun_draw_at_brush() {
+    let img = Image::new(32, 32);
+    let a = run("ec.generate.writeon", &[], img.clone());
+    assert!(a.img.get(16, 16)[3] > 0.9 && a.img.get(2, 2)[3] == 0.0);
+    assert_eq!(a.img.data, run("ec.generate.writeon", &[], img.clone()).img.data);
+    let src = Image::filled(32, 32, [0.5, 0.2, 0.1, 1.0]);
+    let g = run("ec.generate.ccgluegun", &[], src.clone());
+    assert_eq!(g.img.data, run("ec.generate.ccgluegun", &[], src.clone()).img.data);
+    assert_ne!(g.img.get(16, 16), src.get(16, 16));
+    assert_eq!(g.img.get(0, 0), src.get(0, 0));
+}
+
+/// #536: an animated Brush Position draws a stroke that stays (Stroke Length 0), expires
+/// after Stroke Length, and lays its dabs Brush Spacing seconds apart.
+#[test]
+fn write_on_accumulates_a_stroke_along_the_animated_brush() {
+    // Brush Position from [8, 16] at 0 s to [56, 16] at 1 s; red, hard, 6 px.
+    struct Brush(Vec<(&'static str, Value)>);
+    impl Brush {
+        fn at(&self, t: f64) -> Vec<(&'static str, Value)> {
+            let mut v = self.0.clone();
+            v.push(("brushPosition", Value::Vec2([8.0 + 48.0 * t.clamp(0.0, 1.0), 16.0])));
+            v
+        }
+    }
+    impl EffectHost for Brush {
+        fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
+            None
+        }
+        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+            None
+        }
+        fn params_at(&self, t: f64) -> Option<Params> {
+            let s = crate::find("ec.generate.writeon").unwrap();
+            let mut p = Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+            for (k, v) in self.at(t) {
+                p.values.insert(k.to_string(), v);
+            }
+            Some(p)
+        }
+    }
+    let render = |extra: &[(&'static str, Value)], t: f64| {
+        let mut set = vec![("color", col(1.0, 0.0, 0.0)), ("brushSize", num(6.0)), ("brushHardness", num(100.0)), ("brushSpacing", num(0.05))];
+        set.extend(extra.iter().cloned());
+        let host = Brush(set);
+        let env = EffectEnv { host: Some(&host), ..Default::default() };
+        let at = host.at(t);
+        run_env("ec.generate.writeon", &at, Image::new(64, 32), t, env).img
+    };
+    let on = |img: &Image, x: i64| img.get(x, 16)[3] > 0.9;
+    let half = render(&[], 0.5);
+    assert!(on(&half, 8) && on(&half, 20) && on(&half, 32) && !on(&half, 44) && !on(&half, 56));
+    let end = render(&[], 1.0);
+    assert!([8, 20, 32, 44, 56].iter().all(|x| on(&end, *x)));
+    // Stroke Length 0.25 s: only the last quarter second's trail.
+    let trail = render(&[("strokeLength", num(0.25))], 1.0);
+    assert!(!on(&trail, 8) && !on(&trail, 32) && on(&trail, 48) && on(&trail, 56));
+    // Brush Spacing 0.5 s: three separate marks.
+    let spaced = render(&[("brushSpacing", num(0.5))], 1.0);
+    assert!(on(&spaced, 8) && on(&spaced, 32) && on(&spaced, 56) && !on(&spaced, 20) && !on(&spaced, 44));
+    // Paint Time Properties ▸ Opacity: each dab keeps the opacity it was laid with.
+    struct Fade;
+    impl EffectHost for Fade {
+        fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
+            None
+        }
+        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+            None
+        }
+        fn params_at(&self, t: f64) -> Option<Params> {
+            let mut p = Brush(vec![("brushHardness", num(100.0)), ("brushSpacing", num(0.05)), ("paintTimeProperties", Value::Enum(1))]).params_at(t)?;
+            p.values.insert("brushOpacity".into(), num(if t < 0.5 { 100.0 } else { 20.0 }));
+            Some(p)
+        }
+    }
+    let p1 = Fade.params_at(1.0).unwrap();
+    let set: Vec<(&str, Value)> = p1.values.iter().map(|(k, v)| (k.as_str(), v.clone())).collect();
+    let faded = run_env("ec.generate.writeon", &set, Image::new(64, 32), 1.0, EffectEnv { host: Some(&Fade), ..Default::default() }).img;
+    assert!(faded.get(8, 16)[3] > 0.9 && (faded.get(56, 16)[3] - 0.2).abs() < 0.05, "{:?} {:?}", faded.get(8, 16), faded.get(56, 16));
+}
+
+#[test]
+fn paint_bucket_fills_enclosed_region_only() {
+    let mut img = Image::filled(32, 32, [1.0, 1.0, 1.0, 1.0]);
+    for i in 8..24 {
+        for &(x, y) in &[(i, 8), (i, 23), (8, i), (23, i)] {
+            img.set(x, y, [0.0, 0.0, 0.0, 1.0]);
+        }
+    }
+    let out = run("ec.generate.paintbucket", &[], img.clone());
+    let inside = out.img.get(16, 16);
+    assert!(inside[0] > 0.99 && inside[1] < 0.01, "{inside:?}");
+    assert_eq!(out.img.get(2, 2), [1.0, 1.0, 1.0, 1.0], "outside untouched");
+    assert_eq!(out.img.get(8, 16), [0.0, 0.0, 0.0, 1.0], "border untouched");
+    assert_eq!(out.img.data, run("ec.generate.paintbucket", &[], img).img.data);
+}
+
+#[test]
+fn eyedropper_fill_uses_sample() {
+    let mut img = Image::filled(16, 16, [0.0, 0.0, 1.0, 1.0]);
+    img.set(8, 8, [1.0, 0.0, 0.0, 1.0]);
+    let out = run("ec.generate.eyedropperfill", &[], img.clone());
+    assert!(out.img.data.iter().all(|p| *p == [1.0, 0.0, 0.0, 1.0]));
+    let blended = run("ec.generate.eyedropperfill", &[("blendWithOriginal", num(100.0))], img.clone());
+    assert_eq!(blended.img.data, img.data);
+}
+
+#[test]
+fn threads_weave_is_deterministic_and_gappy() {
+    let src = Image::filled(64, 64, [0.4, 0.6, 0.2, 1.0]);
+    let a = run("ec.generate.ccthreads", &[("width", num(16.0)), ("height", num(16.0)), ("coverage", num(50.0))], src.clone());
+    assert_eq!(a.img.data, run("ec.generate.ccthreads", &[("width", num(16.0)), ("height", num(16.0)), ("coverage", num(50.0))], src).img.data);
+    assert!(a.img.data.iter().any(|p| p[3] == 0.0), "gaps between threads");
+    assert!(a.img.data.iter().any(|p| p[3] > 0.99), "threads");
+}
+
+struct Tone;
+impl EffectHost for Tone {
+    fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
+        None
+    }
+    fn audio(&self, _: u64, start: f64, frames: usize, rate: u32) -> Option<Vec<f32>> {
+        Some(
+            (0..frames)
+                .flat_map(|i| {
+                    let t = start + i as f64 / rate as f64;
+                    let v = (2.0 * PI * 440.0 * t).sin() as f32 * 0.8;
+                    [v, v]
+                })
+                .collect(),
+        )
+    }
+}
+
+#[test]
+fn audio_effects_without_audio_pass_through() {
+    let src = Image::filled(16, 16, [0.3, 0.3, 0.3, 1.0]);
+    for id in ["ec.generate.audiospectrum", "ec.generate.audiowaveform"] {
+        assert_eq!(run(id, &[], src.clone()).img.data, src.data, "{id}");
+    }
+}
+
+#[test]
+fn audio_effects_draw_with_host() {
+    let host = Tone;
+    let env = EffectEnv { host: Some(&host), comp_time: 1.0, ..Default::default() };
+    let img = Image::new(96, 64);
+    for id in ["ec.generate.audiospectrum", "ec.generate.audiowaveform"] {
+        let a = run_env(id, &[("audioLayer", Value::Layer(Some(1)))], img.clone(), 1.0, env);
+        let b = run_env(id, &[("audioLayer", Value::Layer(Some(1)))], img.clone(), 1.0, env);
+        assert_eq!(a.img.data, b.img.data, "{id}");
+        assert!(alpha_sum(&a.img, 0, 0, 96, 64) > 10.0, "{id} drew nothing");
+    }
+}
+
+#[test]
+fn fft_finds_tone() {
+    let n = 256;
+    let mut re: Vec<f64> = (0..n).map(|i| (2.0 * PI * 8.0 * i as f64 / n as f64).cos()).collect();
+    let mut im = vec![0.0; n];
+    fft(&mut re, &mut im);
+    let mags: Vec<f64> = (0..n / 2).map(|k| (re[k] * re[k] + im[k] * im[k]).sqrt()).collect();
+    let peak = mags.iter().enumerate().max_by(|a, b| a.1.total_cmp(b.1)).unwrap().0;
+    assert_eq!(peak, 8);
+}
+
+#[test]
+fn stroke_outline_caps_and_joins() {
+    let line = vec![vec![[10.0, 10.0], [30.0, 10.0]]];
+    let cov = |cap: u32| raster_convex(40, 20, &stroke_outline(&line, 3.0, cap, 0, 4.0));
+    // Round caps reach 3 px past the ends (on the axis), Butt stops there, Projecting is square.
+    let (round, butt, proj) = (cov(0), cov(1), cov(2));
+    assert!(round.get(8, 10) > 0.9 && butt.get(8, 10) < 0.1 && proj.get(8, 10) > 0.9);
+    assert!(proj.get(7, 7) > 0.9 && round.get(7, 7) < 0.5, "square corner");
+    // A right-angle turn: Miter fills the outer corner, Bevel cuts it.
+    let corner = vec![vec![[5.0, 30.0], [30.0, 30.0], [30.0, 5.0]]];
+    let j = |join: u32| raster_convex(40, 40, &stroke_outline(&corner, 3.0, 1, join, 4.0));
+    let (miter, bevel) = (j(1), j(2));
+    assert!(miter.get(32, 32) > 0.9 && bevel.get(32, 32) < 0.1, "{} {}", miter.get(32, 32), bevel.get(32, 32));
+    // A tight miter limit falls back to a bevel.
+    let limited = raster_convex(40, 40, &stroke_outline(&corner, 3.0, 1, 1, 1.0));
+    assert!(limited.get(32, 32) < 0.1);
+}
+
+#[test]
+fn scribble_caps_and_start_end_apply_to() {
+    let masks = square_mask();
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let img = Image::new(64, 64);
+    let base = [("wiggleType", Value::Enum(0)), ("strokeWidth", num(3.0))];
+    let round = run_env("ec.generate.scribble", &base, img.clone(), 0.0, env);
+    let butt = run_env(
+        "ec.generate.scribble",
+        &[base.as_slice(), &[("edgeOptions/endCap", Value::Enum(1)), ("edgeOptions/join", Value::Enum(2))]].concat(),
+        img.clone(),
+        0.0,
+        env,
+    );
+    assert_ne!(round.img.data, butt.img.data);
+    // Each Stroke: every stroke is trimmed on its own, so the half-way image has ink all over.
+    let two = vec![
+        crate::MaskShape { name: String::new(), points: vec![[4.0, 4.0], [28.0, 4.0], [28.0, 60.0], [4.0, 60.0]], closed: true, inverted: false },
+        crate::MaskShape { name: String::new(), points: vec![[36.0, 4.0], [60.0, 4.0], [60.0, 60.0], [36.0, 60.0]], closed: true, inverted: false },
+    ];
+    let env2 = EffectEnv { masks: &two, ..Default::default() };
+    let seq = [("scribble", Value::Enum(1)), ("end", num(50.0))];
+    let all = run_env("ec.generate.scribble", &[base.as_slice(), &seq].concat(), img.clone(), 0.0, env2);
+    let each = run_env("ec.generate.scribble", &[base.as_slice(), &seq, &[("startEndApplyTo", Value::Enum(1))]].concat(), img, 0.0, env2);
+    assert_ne!(all.img.data, each.img.data);
+}
diff --git a/crates/effects/src/keying.rs b/crates/effects/src/keying.rs
index 9d61ff8c8..4953d482c 100644
--- a/crates/effects/src/keying.rs
+++ b/crates/effects/src/keying.rs
@@ -2,12 +2,13 @@
 //! matte clean-up. Written from public behaviour descriptions and the standard colour-difference /
 //! blue-screen matting literature (Vlahos; Smith & Blinn, "Blue Screen Matting").
 
-use effectcraft_color::{luminance, rgb_to_hsl, srgb_to_linear};
+use effectcraft_color::{rgb_to_hsl, srgb_to_linear};
 use effectcraft_keyframe::Value;
 use effectcraft_project::ParamUi;
 use effectcraft_raster::{Image, gaussian_blur};
 use rayon::prelude::*;
 
+use crate::color_fx::luma_601;
 use crate::util::{Plane, gauss_plane, morph_frac, premul, unpremul};
 use crate::{Buf, EffectCtx, EffectSpec, col, num, p, popup, slider};
 
@@ -135,46 +136,23 @@ fn color_key(ctx: &EffectCtx, mut b: Buf) -> Buf {
 
 // ---- Luma Key ----
 
+/// Luma Key as After Effects 2026 keys a grey ramp (cases 812-814, 719): Key Out Brighter and
+/// Darker cut hard at Threshold and ignore Tolerance; Key Out Similar removes, and Dissimilar
+/// keeps, a hard band of Threshold ± Tolerance (levels of 255). Edge Thin and Edge Feather
+/// then soften the cut.
 fn luma_key(ctx: &EffectCtx, mut b: Buf) -> Buf {
     let kind = ctx.params.e("keyType");
     let thr = ctx.params.f("threshold") as f32 / 255.0;
     let tol = ctx.params.f("tolerance") as f32 / 255.0;
     let m = matte_of(&b.img, |c, _| {
-        let l = luminance(c[0], c[1], c[2]);
-        match kind {
-            0 => {
-                if tol > 0.0 {
-                    ((thr + tol - l) / tol).clamp(0.0, 1.0)
-                } else if l > thr {
-                    0.0
-                } else {
-                    1.0
-                }
-            }
-            2 => {
-                if (l - thr).abs() <= tol {
-                    0.0
-                } else {
-                    1.0
-                }
-            }
-            3 => {
-                if (l - thr).abs() <= tol {
-                    1.0
-                } else {
-                    0.0
-                }
-            }
-            _ => {
-                if tol > 0.0 {
-                    ((l - (thr - tol)) / tol).clamp(0.0, 1.0)
-                } else if l < thr {
-                    0.0
-                } else {
-                    1.0
-                }
-            }
-        }
+        let l = luma_601([c[0], c[1], c[2]]);
+        let keep = match kind {
+            0 => l <= thr,
+            2 => (l - thr).abs() > tol,
+            3 => (l - thr).abs() <= tol,
+            _ => l >= thr,
+        };
+        if keep { 1.0 } else { 0.0 }
     });
     let m = thin_feather(m, ctx.params.f("edgeThin") * b.scale, ctx.params.f("edgeFeather") * b.scale);
     apply_matte(&mut b.img, &m, 0);
@@ -334,7 +312,7 @@ fn extract(ctx: &EffectCtx, mut b: Buf) -> Buf {
                 2 => c[1],
                 3 => c[2],
                 4 => a,
-                _ => luminance(c[0], c[1], c[2]),
+                _ => luma_601([c[0], c[1], c[2]]),
             };
         let mut k = 1.0f32;
         if v < bp {
@@ -802,6 +780,68 @@ mod tests {
         assert_eq!(out.get(1, 0)[3], 1.0);
     }
 
+    /// After Effects 2026 (cases 812-814): Luma Key on a vertical black-to-white ramp (row y
+    /// has level (y + 0.5) / 1080 × 255), Threshold 140, Tolerance 20. EffectCraft ramped the
+    /// matte over the tolerance (case 719: a 50 % grey kept 80 % of its alpha where AE keys it
+    /// out).
+    #[test]
+    fn luma_key_matches_after_effects() {
+        let ramp = || {
+            let mut img = Image::new(1, 1080);
+            for y in 0..1080 {
+                let v = (y as f32 + 0.5) / 1080.0;
+                img.set(0, y, [v, v, v, 1.0]);
+            }
+            img
+        };
+        let key = |kind: u32, thin: f64, feather: f64| {
+            let set =
+                [("keyType", Value::Enum(kind)), ("threshold", num(140.0)), ("tolerance", num(20.0)), ("edgeThin", num(thin)), ("edgeFeather", num(feather))];
+            let o = run("ec.key.luma", &set, ramp());
+            (0..1080).map(|y| o.get(0, y)[3]).collect::<Vec<f32>>()
+        };
+        // Key Out Darker (AE 2 = EffectCraft 1): keyed up to row 592, kept from 593.
+        let d = key(1, 0.0, 0.0);
+        assert!(d[..593].iter().all(|a| *a == 0.0) && d[593..].iter().all(|a| *a == 1.0), "{:?}", &d[588..598]);
+        // Key Out Similar: AE keys rows 509..=677 (levels 120.3..160.0) and keeps the rest; the
+        // rows at the band's ends sit within 0.1 level of 120 / 160, so they may go either way.
+        let s = key(2, 0.0, 0.0);
+        assert!(
+            (0..1080).filter(|y| !(507..=510).contains(y) && !(676..=679).contains(y)).all(|y| (s[y] == 0.0) == (509..=677).contains(&y)),
+            "{:?} {:?}",
+            &s[505..512],
+            &s[674..681]
+        );
+        // Key Out Brighter and Dissimilar are the complements.
+        let b = key(0, 0.0, 0.0);
+        assert!(b[595] == 0.0 && b[590] == 1.0);
+        let ds = key(3, 0.0, 0.0);
+        assert!(ds[600] == 1.0 && ds[400] == 0.0 && ds[700] == 0.0);
+        // A 50 % grey at Darker 140 / 20 is keyed out entirely (case 719).
+        let o =
+            run("ec.key.luma", &[("keyType", Value::Enum(1)), ("threshold", num(140.0)), ("tolerance", num(20.0))], Image::filled(2, 2, [0.5, 0.5, 0.5, 1.0]));
+        assert_eq!(o.get(0, 0)[3], 0.0);
+        // Edge Thin 1, Edge Feather 2.5 (case 814): AE's alpha rises over rows 591..596.
+        let f = key(1, 1.0, 2.5);
+        for (y, ae) in [(590, 0.0), (591, 0.026), (592, 0.139), (593, 0.357), (594, 0.635), (595, 0.868), (596, 0.97), (597, 1.0)] {
+            assert!((f[y] - ae).abs() < 0.2, "row {y}: {} vs AE {ae}", f[y]);
+        }
+    }
+
+    /// After Effects 2026: Key Out Darker and Extract's Black Point at 65 / 166 / 24 on pure
+    /// red / green / blue keep red and blue and key out green: Rec. 601 luminance (Rec. 709
+    /// would key out red and blue and keep green).
+    #[test]
+    fn luma_key_and_extract_use_rec601_as_after_effects() {
+        for (c, thr, kept) in [([1.0, 0.0, 0.0], 65.0, true), ([0.0, 1.0, 0.0], 166.0, false), ([0.0, 0.0, 1.0], 24.0, true)] {
+            let img = Image::filled(2, 1, [c[0], c[1], c[2], 1.0]);
+            let key = run("ec.key.luma", &[("keyType", Value::Enum(1)), ("threshold", num(thr))], img.clone());
+            let ext = run("ec.key.extract", &[("blackPoint", num(thr))], img);
+            let want = if kept { 1.0 } else { 0.0 };
+            assert_eq!((key.get(0, 0)[3], ext.get(0, 0)[3]), (want, want), "{c:?} at {thr}");
+        }
+    }
+
     #[test]
     fn extract_keeps_range() {
         let mut img = Image::new(3, 1);
diff --git a/crates/effects/src/keying2.rs b/crates/effects/src/keying2.rs
index f594bfbb3..a03fe804d 100644
--- a/crates/effects/src/keying2.rs
+++ b/crates/effects/src/keying2.rs
@@ -363,7 +363,9 @@ fn wire_removal(ctx: &EffectCtx, mut b: Buf) -> Buf {
             let (qx, qy) = (x as f64 + 0.5 - ax, y as f64 + 0.5 - ay);
             let d = qx * nx + qy * ny;
             let ad = d.abs();
-            if ad > half + soft_w {
+            // The wire is the segment A to B, not an endless line.
+            let along = qx * tx + qy * ty;
+            if !(0.0..=len).contains(&along) || ad > half + soft_w {
                 continue;
             }
             // Positions just outside the wire on both sides.
@@ -580,6 +582,24 @@ mod tests {
         }
     }
 
+    #[test]
+    fn wire_removal_stays_between_a_and_b() {
+        let mut img = Image::filled(20, 20, [0.5, 0.5, 0.5, 1.0]);
+        for y in 0..20 {
+            img.set(10, y, [0.0, 0.0, 0.0, 1.0]);
+        }
+        let out = run_fx(
+            "ec.key.ccsimplewireremoval",
+            &[("pointA", Value::Vec2([10.5, 5.0])), ("pointB", Value::Vec2([10.5, 15.0])), ("removalStyle", Value::Enum(0)), ("thickness", num(3.0))],
+            img.clone(),
+            0.0,
+            EffectEnv::default(),
+        );
+        assert!((out.img.get(10, 10)[0] - 0.5).abs() < 0.05, "inside the segment");
+        assert_eq!(out.img.get(10, 2), img.get(10, 2), "before A");
+        assert_eq!(out.img.get(10, 18), img.get(10, 18), "after B");
+    }
+
     #[test]
     fn wire_removal_frame_offset_uses_neighbour_frame() {
         use crate::{EffectHost, LayerPixels};
diff --git a/crates/effects/src/lib.rs b/crates/effects/src/lib.rs
index 40ed79a7d..204e651ec 100644
--- a/crates/effects/src/lib.rs
+++ b/crates/effects/src/lib.rs
@@ -21,6 +21,7 @@ mod color2;
 mod color3;
 mod color_fx;
 pub mod controls;
+pub mod crypto_select;
 mod distort;
 mod distort2;
 mod distort3;
@@ -70,14 +71,14 @@ use std::collections::HashMap;
 use std::sync::OnceLock;
 
 pub use card3d::{CompLight, CompScene};
-pub use color_fx::{COLORAMA_PRESETS, ColoramaPalette};
 pub use color_fx::{
-    HUESAT_CHANNELS, HUESAT_RANGES, LEVELS_CHANNELS, PHOTO_FILTER_CUSTOM, PHOTO_FILTERS, exposure_settings, fill_uses_masks, huesat_ranges_identity,
-    levels_channel_ids, levels_channel_settings, levels_channels_identity, levels_clip,
+    BW_TINT_LUMA, EXPOSURE_LINEAR_GAMMA, HUESAT_CHANNELS, HUESAT_RANGES, LEVELS_CHANNELS, LUMA_601, PHOTO_FILTER_CUSTOM, PHOTO_FILTERS, exposure_settings,
+    fill_uses_masks, huesat_ranges_identity, levels_channel_ids, levels_channel_settings, levels_channels_identity, levels_clip,
 };
+pub use color_fx::{COLORAMA_PRESETS, ColoramaPalette};
 pub use color2::{Curve, auto_correct_settings, color_link_mode, color_link_sample, equalize_tables, luma_clip_points, shadow_highlight_amounts};
 pub use color3::OffsetCurve;
-pub use distort::transform_shutter;
+pub use distort::{transform_grow, transform_matrix_px, transform_shutter};
 pub use distort2::{MAGNIFY_MODES, bezier_grid, parse_mesh};
 pub use distort3::{RESHAPE_POINTS, ReshapeSetup, SmearSetup, cc_smear_pad, reshape_setup, smear_setup, warp_inverse_map};
 pub use distort4::liquify_mesh;
@@ -85,13 +86,16 @@ use effectcraft_keyframe::Value;
 use effectcraft_project::build::Ids;
 use effectcraft_project::{GroupKind, ParamUi, PropGroup, Property};
 pub use effectcraft_raster::{AuxChannels, Image};
-pub use misc::{INVERT_ALPHA, INVERT_CHANNELS, glow_ab_t, glow_operation};
+pub use misc::{
+    GLOW_GAIN, GLOW_KNEE, INVERT_ALPHA, INVERT_CHANNELS, glow_ab_t, glow_operation, glow_sigma, radial_wipe_sigma, radial_wipe_wedge, venetian_cover,
+    venetian_origin,
+};
 pub use sim::particle_state;
 pub use sim3::{PgBlit, PgPlan, playground_plan, playground_state};
 pub use stylize2::strobe_on;
 // CPU helpers the GPU kernels share (effectcraft-gpu).
-pub use blur2::{camera_lens_plain, camera_lens_spans};
-pub use generate::gen_mode;
+pub use blur2::{camera_lens_plain, camera_lens_spans, radial_fast_pad};
+pub use generate::{four_color_softening, gen_mode};
 pub use generate2::pattern_kind as cell_pattern_kind;
 pub use generate2::{BoltSeg, Contour, Ghost, RadioPlan, Wave, flare_ghosts, lightning_segments, radio_plan};
 pub use generate3::{
@@ -103,14 +107,14 @@ pub use transition::place_layer;
 // effectcraft-gpu fx_noise.
 pub use keying2::{InnerOuterPlan, inner_outer_plan};
 pub use noise::remove_grain_level;
-pub use noise3::{FractalGpu, fractal_gpu};
+pub use noise3::{FractalGpu, NOISE_CELL, fractal_gpu};
 pub use stylize3::{BumpLight, bump_layer_id};
 pub use textfx::{TextLayer, text_layer};
 pub use time_fx::{PixelMotion, TimewarpPlan, TwStep, pmb_plan, posterized_time, time_frames, timewarp_crop, timewarp_plan};
 // effectcraft-gpu fx_tone.
 pub use ocio::color_stabilizer_maps;
 // GPU effects, part B (3D Channel, Immersive Video, colour management, simulation render passes).
-pub use channel3d::{CRYPTO_LAYERS, crypto_aux_image, id_color, selection_hashes};
+pub use channel3d::{CRYPTO_LAYERS, CryptoAux, aux_point, crypto_aux_image, crypto_aux_image_with, id_color, selection_hashes};
 pub use ocio::{ColorOp, Straight, Tf, color_program};
 pub use sim::{Acc, Blob, Bubble, Post, Shape, Sprite, SpritePlan, Tint, bubble_list, drizzle_drops, mercury_blobs, sprite_plan};
 pub use sim2::{
@@ -286,6 +290,27 @@ impl Buf {
         self.offset[0] += origin[0] * self.scale;
         self.offset[1] += origin[1] * self.scale;
     }
+    /// Grow by transparent pixels: `sides` = left, top, right, bottom. Content keeps its place.
+    pub fn pad_sides(&mut self, sides: [u32; 4]) {
+        let [l, t, r, b] = sides;
+        if l == 0 && t == 0 && r == 0 && b == 0 {
+            return;
+        }
+        let (Some(w), Some(h)) = (self.img.width.checked_add(l).and_then(|v| v.checked_add(r)), self.img.height.checked_add(t).and_then(|v| v.checked_add(b)))
+        else {
+            return;
+        };
+        let mut out = Image::new(w, h);
+        let (sw, ow) = (self.img.width as usize, w as usize);
+        for y in 0..self.img.height as usize {
+            let at = (y + t as usize) * ow + l as usize;
+            let (Some(src), Some(dst)) = (self.img.data.get(y * sw..(y + 1) * sw), out.data.get_mut(at..at + sw)) else { continue };
+            dst.copy_from_slice(src);
+        }
+        self.img = out;
+        self.offset[0] += l as f64;
+        self.offset[1] += t as f64;
+    }
     /// Grow by `pad` transparent pixels on every side.
     pub fn pad(&mut self, pad: u32) {
         if pad == 0 {
@@ -297,6 +322,43 @@ impl Buf {
     }
 }
 
+/// Motion Tile's output frame for a buffer with layer origin `offset` (pixels) at `scale`:
+/// `(width, height, offset)`. Output Width / Height grow (or crop) the layer rectangle about its
+/// centre, on adjustment layers too, where the rectangle is the comp's and starts at the comp
+/// origin in the buffer below (After Effects; a Transform after it brings the tiles into view,
+/// #1727). An adjustment at 100 % keeps the buffer it was given; one whose frame would pass
+/// 16 384 pixels a side does too.
+pub fn motion_tile_frame(ctx: &EffectCtx, offset: [f64; 2], size: (u32, u32), scale: f64) -> (u32, u32, [f64; 2]) {
+    let (lw, lh) = (ctx.layer_size[0], ctx.layer_size[1]);
+    let (pw, ph) = (ctx.params.f("outputWidth"), ctx.params.f("outputHeight"));
+    let ow = (lw * pw / 100.0).max(1.0 / scale);
+    let oh = (lh * ph / 100.0).max(1.0 / scale);
+    let (nw, nh) = ((ow * scale).round().max(1.0), (oh * scale).round().max(1.0));
+    let grow = [(ow - lw) * 0.5 * scale, (oh - lh) * 0.5 * scale];
+    if !ctx.adjustment {
+        return (nw as u32, nh as u32, grow);
+    }
+    // The grown rectangle's top-left in the buffer below, on whole pixels so the result lines
+    // up with the comp again when the stack ends.
+    let (x0, y0) = ((offset[0] - grow[0]).round(), (offset[1] - grow[1]).round());
+    let fits = [x0, y0, nw, nh].iter().all(|v| v.is_finite()) && nw <= 16384.0 && nh <= 16384.0;
+    if (pw == 100.0 && ph == 100.0) || !fits {
+        return (size.0, size.1, offset);
+    }
+    (nw as u32, nh as u32, [offset[0] - x0, offset[1] - y0])
+}
+
+/// Where an adjustment stack's result (comp origin at `offset`, `size` pixels) lies on the canvas
+/// it came from (comp origin at `canvas_offset`): the result pixel at canvas pixel (0, 0).
+/// `None` when it already is the canvas, frame for frame.
+pub fn adjustment_crop(offset: [f64; 2], canvas_offset: [f64; 2], size: (u32, u32), canvas: (u32, u32)) -> Option<(i64, i64)> {
+    let (dx, dy) = ((offset[0] - canvas_offset[0]).round(), (offset[1] - canvas_offset[1]).round());
+    if !dx.is_finite() || !dy.is_finite() || (dx == 0.0 && dy == 0.0 && size == canvas) {
+        return None;
+    }
+    Some((dx as i64, dy as i64))
+}
+
 /// Where [`Buf::cover`] would take a buffer: shift its pixels by `(dx, dy)` and resize it to
 /// `width` × `height` so it spans the `size`-layer-pixel region that starts at its offset — the
 /// whole layer rectangle, which a sized source's buffer already is. `None` when the buffer
@@ -406,6 +468,8 @@ pub struct EffectEnv<'a> {
     pub working_space: Option<effectcraft_color::ColorSpace>,
     /// Working-space pixels are linear light (Linearize Working Space).
     pub working_linear: bool,
+    /// The project works in 32 bpc float (Levels' "Off for 32 bpc Color" clips only below it).
+    pub float_depth: bool,
     /// The composition's shutter (angle and phase in degrees, samples per frame) when both the
     /// comp's and the layer's motion blur switches are on (Transform's Use Composition's
     /// Shutter Angle).
diff --git a/crates/effects/src/migrate.rs b/crates/effects/src/migrate.rs
index 0e037022e..b5976b761 100644
--- a/crates/effects/src/migrate.rs
+++ b/crates/effects/src/migrate.rs
@@ -499,6 +499,22 @@ mod tests {
         assert_eq!(pr.ui, popup.ui);
     }
 
+    /// #1797: Shift Channels' menu put Half On before Full Off; a project saved then keeps the
+    /// option it chose, by label.
+    #[test]
+    fn shift_channels_half_on_and_full_off_are_remapped_by_label() {
+        const OLD: [&str; 11] = ["Alpha", "Red", "Green", "Blue", "Luminance", "Hue", "Lightness", "Saturation", "Full On", "Half On", "Full Off"];
+        for (saved, want) in [(9u32, 10u32), (10, 9), (1, 1)] {
+            let mut next = 1;
+            let (spec, mut g) = instance("ec.channel.shiftchannels", &mut next);
+            let pr = g.get_mut("takeGreenFrom").unwrap();
+            pr.ui = ParamUi::Popup { options: OLD.iter().map(|s| s.to_string()).collect() };
+            pr.value = Value::Enum(saved);
+            upgrade_instance(spec, &mut g, &mut Ids(&mut next), SIZE);
+            assert_eq!(g.get("takeGreenFrom").unwrap().value, Value::Enum(want), "saved {saved}");
+        }
+    }
+
     /// #514: Apply Color LUT's LUT was hidden (set only by commands) and the OCIO files were
     /// plain text; old projects get the Choose… file parameter, keeping the path.
     #[test]
diff --git a/crates/effects/src/misc.rs b/crates/effects/src/misc.rs
index c119118db..e1f41954c 100644
--- a/crates/effects/src/misc.rs
+++ b/crates/effects/src/misc.rs
@@ -35,22 +35,44 @@ fn gaussian(ctx: &EffectCtx, mut b: Buf) -> Buf {
     if !repeat && !ctx.adjustment {
         b.pad((s * 3.0).ceil() as u32);
     }
-    b.img = gaussian_blur(&b.img, s * kx, s * ky, repeat || ctx.adjustment);
+    let (sx, sy) = (s * kx, s * ky);
+    // Small sigmas: integer-radius box passes would step (and do nothing below ~0.6 px), so sample the kernel (#1939).
+    b.img = if effectcraft_raster::gaussian_is_exact(sx, sy) {
+        effectcraft_raster::gaussian_blur_exact(&b.img, sx, sy, repeat || ctx.adjustment)
+    } else {
+        gaussian_blur(&b.img, sx, sy, repeat || ctx.adjustment)
+    };
     b
 }
 
 fn box_blur(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let r = (ctx.params.f("radius") * b.scale).round().max(0.0) as usize;
-    if r == 0 {
+    let radius = (ctx.params.f("radius") * b.scale).max(0.0);
+    let r = radius.floor() as usize;
+    let frac = (radius - r as f64) as f32;
+    // Fractional radius: blend the two neighbouring integer radii so the result changes continuously (#1939).
+    let frac = if frac < 1e-4 { 0.0 } else { frac };
+    if r == 0 && frac == 0.0 {
         return b;
     }
     let it = ctx.params.f("iterations").round().clamp(1.0, 50.0) as usize;
     let (kx, ky) = dims_xy(ctx.params.e("dimensions"));
     let repeat = ctx.params.b("repeatEdge");
     if !repeat && !ctx.adjustment {
-        b.pad((r * it) as u32 + 1);
+        let reach = if frac > 0.0 { r + 1 } else { r };
+        b.pad((reach * it) as u32 + 1);
+    }
+    let edge = repeat || ctx.adjustment;
+    let lo = effectcraft_raster::box_blur(&b.img, r * kx as usize, r * ky as usize, it, edge);
+    if frac == 0.0 {
+        b.img = lo;
+        return b;
+    }
+    let hi = effectcraft_raster::box_blur(&b.img, (r + 1) * kx as usize, (r + 1) * ky as usize, it, edge);
+    for ((l, h), o) in lo.data.iter().zip(hi.data.iter()).zip(b.img.data.iter_mut()) {
+        for c in 0..4 {
+            o[c] = l[c] + (h[c] - l[c]) * frac;
+        }
     }
-    b.img = effectcraft_raster::box_blur(&b.img, r * kx as usize, r * ky as usize, it, repeat || ctx.adjustment);
     b
 }
 
@@ -120,6 +142,28 @@ pub fn glow_ab_t(l: f32, looping: u32, loops: f32, phase: f32, mid: f32) -> f32
     t.max(0.0).powf(0.5f32.ln() / m.ln())
 }
 
+/// Glow's blur: a Gaussian of σ = 0.384 × Glow Radius. Fitted to After Effects 2026 (cases
+/// 807 and 808, Glow Radius 10 and 30 on a grey solid): the edge profile of the glow's
+/// coverage is an erfc step of that σ within 1.7/255 (it was σ = radius / 2).
+pub fn glow_sigma(radius: f64) -> f64 {
+    (radius * 0.384).max(0.5)
+}
+
+/// Glow's bright pass for the original colours, per channel of the straight colour `v`:
+/// `8 × (v − threshold + 0.0611)`, nothing below. Fitted to After Effects 2026 renders of grey
+/// 0.65 / 0.8 / 0.9 / 1, orange and light-blue solids at Threshold 40 / 60 / 80 % and Radius 10
+/// / 30 (36 channel values, exact to the 8-bit capture): the glow is linear in each channel,
+/// its gain is the same at every threshold and radius, and channels below the threshold add
+/// nothing (an orange solid glows red only).
+pub fn glow_bright_channel(v: f32, thr: f32) -> f32 {
+    (GLOW_GAIN * (v - thr + GLOW_KNEE)).max(0.0)
+}
+
+/// [`glow_bright_channel`]'s gain and threshold offset. `kernels.wgsl` repeats both as literals;
+/// the GPU test `glow_constants_match_the_cpu` checks that they are these.
+pub const GLOW_GAIN: f32 = 8.0;
+pub const GLOW_KNEE: f32 = 0.0611;
+
 /// Glow Operation options (blend modes the glow is applied with).
 pub const GLOW_OPERATIONS: [&str; 17] = [
     "Normal",
@@ -183,23 +227,31 @@ fn glow(ctx: &EffectCtx, mut b: Buf) -> Buf {
         // Glow Based On: brightness from the colours, or from the alpha channel.
         let l = if alpha_based { a } else { luminance(px[0] / a, px[1] / a, px[2] / a) };
         let k = ((l - thr) / (1.0 - thr).max(1e-3)).clamp(0.0, 1.0);
+        // Based on the colour channels, the glow's coverage is the layer's whole alpha, below
+        // the threshold too: After Effects darkens what lies under a dim layer's edge (glow_alpha).
+        let ga = if alpha_based { k * a } else { a };
         if let Some(map) = &arbitrary {
             let t = glow_ab_t(l, looping, loops, phase, mid);
             let c = map.iter().map(|cv| cv.as_ref().map_or(t, |cv| cv.eval(t))).collect::<Vec<f32>>();
-            *px = [c[0] * k * a, c[1] * k * a, c[2] * k * a, k * a];
+            *px = [c[0] * k * a, c[1] * k * a, c[2] * k * a, ga];
         } else if use_colors {
             let t = glow_ab_t(l, looping, loops, phase, mid);
             let c = [ca[0] + (cb[0] - ca[0]) * t, ca[1] + (cb[1] - ca[1]) * t, ca[2] + (cb[2] - ca[2]) * t];
-            *px = [c[0] * k * a, c[1] * k * a, c[2] * k * a, k * a];
+            *px = [c[0] * k * a, c[1] * k * a, c[2] * k * a, ga];
+        } else if alpha_based {
+            *px = [px[0] * k, px[1] * k, px[2] * k, ga];
         } else {
-            *px = px.map(|v| v * k);
+            // Original colours: each channel of the straight colour against the threshold.
+            let c = [px[0] / a, px[1] / a, px[2] / a].map(|v| glow_bright_channel(v, thr) * a);
+            *px = [c[0], c[1], c[2], ga];
         }
     });
-    let s = (radius / 2.0).max(0.5);
+    let s = glow_sigma(radius);
     let blurred = gaussian_blur(&bright, s * kx, s * ky, false);
     let mode = ctx.params.e("operation");
     b.img.data.par_iter_mut().zip(blurred.data.par_iter()).for_each(|(o, g)| {
-        let g = g.map(|v| v * intensity);
+        // Intensity scales the glow's colour; with the colour channels its coverage stays.
+        let g = [g[0] * intensity, g[1] * intensity, g[2] * intensity, if alpha_based { g[3] * intensity } else { g[3] }];
         match mode {
             // Behind: the glow shows only where the original is transparent.
             1 => {
@@ -503,22 +555,67 @@ fn linear_wipe(ctx: &EffectCtx, mut b: Buf) -> Buf {
     b
 }
 
+/// Standard normal CDF Φ (Abramowitz & Stegun 7.1.26 erf, |error| < 1.5e-7).
+fn norm_cdf(z: f64) -> f64 {
+    let x = z.abs() / std::f64::consts::SQRT_2;
+    let t = 1.0 / (1.0 + 0.327_591_1 * x);
+    let poly = t * (0.254_829_592 + t * (-0.284_496_736 + t * (1.421_413_741 + t * (-1.453_152_027 + t * 1.061_405_429))));
+    let erf = 1.0 - poly * (-x * x).exp();
+    if z >= 0.0 { 0.5 * (1.0 + erf) } else { 0.5 * (1.0 - erf) }
+}
+
+/// Radial Wipe's wiped wedge relative to the Start Angle: (first ray, span), degrees clockwise
+/// from up. Clockwise (0) wipes from the start angle on, Counterclockwise (1) back from it,
+/// Both (2) half each way.
+pub fn radial_wipe_wedge(wipe: u32, done: f64) -> (f64, f64) {
+    let span = done.clamp(0.0, 1.0) * 360.0;
+    match wipe {
+        1 => (-span, span),
+        2 => (-span / 2.0, span),
+        _ => (0.0, span),
+    }
+}
+
+/// Radial Wipe's feather: a Gaussian of σ = 0.4 × Feather pixels across both edges of the wedge
+/// (After Effects 2026, Feather 20: the edge profile is the same width in pixels at every
+/// radius, σ = 8.0 px, mean error 0.0002 over the frame).
+pub fn radial_wipe_sigma(feather: f64) -> f64 {
+    feather.max(0.0) * 0.4
+}
+
+/// Visible fraction of a pixel at `(ux, uy)` from the centre (y down) for a wiped wedge from
+/// `ray0` (absolute degrees clockwise from up) over `span` degrees: the signed distance to the
+/// wedge's nearer edge, through the feather's Gaussian.
+pub fn radial_wipe_alpha(ux: f64, uy: f64, ray0: f64, span: f64, sigma: f64) -> f64 {
+    let a = (ux.atan2(-uy).to_degrees() - ray0).rem_euclid(360.0);
+    let wiped = a < span;
+    let ray_dist = |deg: f64| {
+        let (s, c) = deg.to_radians().sin_cos();
+        // Ray direction (sin, −cos) in y-down pixels.
+        let along = ux * s - uy * c;
+        if along > 0.0 { (ux * c + uy * s).abs() } else { ux.hypot(uy) }
+    };
+    let d = ray_dist(ray0).min(ray_dist(ray0 + span));
+    let sd = if wiped { -d } else { d };
+    if sigma < 1e-3 {
+        return if wiped { 0.0 } else { 1.0 };
+    }
+    norm_cdf(sd / sigma)
+}
+
 fn radial_wipe(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let done = ctx.params.f("completion") / 100.0;
+    let done = (ctx.params.f("completion") / 100.0).clamp(0.0, 1.0);
+    if done <= 0.0 {
+        return b;
+    }
     let start = ctx.params.f("startAngle");
     let c = b.to_px(ctx.params.v2("center"));
-    let dir = ctx.params.e("wipe");
-    let feather = (ctx.params.f("feather")).max(0.01);
+    let (w0, span) = radial_wipe_wedge(ctx.params.e("wipe"), done);
+    let sigma = radial_wipe_sigma(ctx.params.f("feather")) * b.scale;
+    let full = done >= 1.0;
     b.img.rows_mut().for_each(|(y, row)| {
         for (x, px) in row.iter_mut().enumerate() {
-            let a = ((x as f64 + 0.5 - c.0).atan2(-(y as f64 + 0.5 - c.1)).to_degrees() - start).rem_euclid(360.0);
-            // Both: the wipe opens in both directions from the start angle at once.
-            let (a, edge) = match dir {
-                1 => (360.0 - a, done * 360.0),
-                2 => (a.min(360.0 - a), done * 180.0),
-                _ => (a, done * 360.0),
-            };
-            let k = ((a - edge) / feather + 0.5).clamp(0.0, 1.0) as f32;
+            let k = if full { 0.0 } else { radial_wipe_alpha(x as f64 + 0.5 - c.0, y as f64 + 0.5 - c.1, start + w0, span, sigma) as f32 };
             for ch in px.iter_mut() {
                 *ch *= k;
             }
@@ -527,16 +624,49 @@ fn radial_wipe(ctx: &EffectCtx, mut b: Buf) -> Buf {
     b
 }
 
+/// Venetian Blinds: how much of a pixel at phase `d` (0..`width`) a band of `done × width`
+/// covers, its two edges softened by a Gaussian of σ = Feather / 2 (σ in the units of `width`).
+/// Fitted to After Effects 2026 (Completion 40, Direction 30, Width 50, Feather 5 on 960 × 540
+/// and 480 × 270 layers): band from phase 0 to done × width, both edges Gaussian, within 6/255.
+pub fn venetian_cover(d: f64, width: f64, done: f64, sigma: f64) -> f64 {
+    let band = done * width;
+    if sigma < 1e-3 {
+        return if d < band { 1.0 } else { 0.0 };
+    }
+    // Wider than a few blinds the stripes blur into an even veil.
+    if sigma > 8.0 * width {
+        return done.clamp(0.0, 1.0);
+    }
+    let n = ((4.0 * sigma / width).ceil() as i64 + 1).clamp(1, 40);
+    let mut t = 0.0;
+    for k in -n..=n {
+        let u = d + k as f64 * width;
+        t += norm_cdf(u / sigma) - norm_cdf((u - band) / sigma);
+    }
+    t.clamp(0.0, 1.0)
+}
+
+/// Venetian Blinds' phase origin in layer pixels: the layer centre plus 0.6 px (fitted to the
+/// AE renders above; the stripes are measured from the layer's centre, not its corner).
+pub fn venetian_origin(layer_size: [f64; 2]) -> [f64; 2] {
+    [layer_size[0] / 2.0 + 0.6, layer_size[1] / 2.0 + 0.6]
+}
+
 fn venetian(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let done = ctx.params.f("completion") / 100.0;
+    let done = (ctx.params.f("completion") / 100.0).clamp(0.0, 1.0);
+    if done <= 0.0 {
+        return b;
+    }
     let ang = ctx.params.f("direction").to_radians();
     let width = (ctx.params.f("width") * b.scale).max(1.0);
-    let feather = (ctx.params.f("feather") * b.scale).max(0.001);
+    let sigma = ctx.params.f("feather").max(0.0) * b.scale / 2.0;
     let (dx, dy) = (ang.cos(), ang.sin());
+    let (ox, oy) = b.to_px(venetian_origin(ctx.layer_size));
     b.img.rows_mut().for_each(|(y, row)| {
+        let ry = (y as f64 + 0.5 - oy) * dy;
         for (x, px) in row.iter_mut().enumerate() {
-            let d = ((x as f64 + 0.5) * dx + (y as f64 + 0.5) * dy).rem_euclid(width);
-            let k = ((d - done * width) / feather + 0.5).clamp(0.0, 1.0) as f32;
+            let d = ((x as f64 + 0.5 - ox) * dx + ry).rem_euclid(width);
+            let k = (1.0 - venetian_cover(d, width, done, sigma)) as f32;
             for c in px.iter_mut() {
                 *c *= k;
             }
@@ -738,6 +868,42 @@ mod tests {
     use super::*;
     use crate::{EffectEnv, run_fx};
 
+    /// White left half, black right half (one vertical edge at x = 20).
+    fn edge() -> effectcraft_raster::Image {
+        let mut img = effectcraft_raster::Image::filled(40, 8, [0.0, 0.0, 0.0, 1.0]);
+        for y in 0..8 {
+            for x in 0..20 {
+                img.set(x, y, [1.0, 1.0, 1.0, 1.0]);
+            }
+        }
+        img
+    }
+
+    fn blurred_row(id: &str, param: &str, v: f64) -> Vec<f32> {
+        let out = run_fx(id, &[(param, num(v)), ("repeatEdge", Value::Bool(true))], edge(), 0.0, EffectEnv::default());
+        (16..24).map(|x| out.img.get(x, 4)[0]).collect()
+    }
+
+    #[test]
+    fn small_gaussian_blurriness_is_continuous() {
+        // #1939: 0.9 used to be identical to 0, and 1.2 / 1.6 / 2.0 identical to each other.
+        let row = |v| blurred_row("ec.blur.gaussian", "blurriness", v);
+        assert_ne!(row(0.0), row(0.9));
+        assert_ne!(row(0.9), row(1.2));
+        assert_ne!(row(1.2), row(1.6));
+        assert_ne!(row(1.6), row(2.0));
+        assert_ne!(row(2.0), row(2.4));
+    }
+
+    #[test]
+    fn fractional_box_blur_radius_is_continuous() {
+        let row = |v| blurred_row("ec.blur.fastbox", "radius", v);
+        assert_ne!(row(0.0), row(0.5));
+        assert_ne!(row(0.5), row(0.9));
+        assert_ne!(row(1.2), row(1.6));
+        assert_ne!(row(1.6), row(2.4));
+    }
+
     /// A bright square on mid grey.
     fn scene() -> effectcraft_raster::Image {
         let mut img = effectcraft_raster::Image::filled(24, 24, [0.3, 0.3, 0.3, 1.0]);
@@ -749,6 +915,189 @@ mod tests {
         img
     }
 
+    /// After Effects 2026 (cases 524, 807, 808, 809): Glow on a 50 % grey solid, which is below
+    /// the 60 % threshold, still covers a blurred copy of the layer's alpha with black, so the
+    /// red layer underneath darkens outside the edge. The halo is the same at Intensity 1 and 3
+    /// and with Composite Original On Top or Behind; its width follows Glow Radius.
+    #[test]
+    fn glow_halo_matches_after_effects() {
+        let grey = effectcraft_raster::Image::filled(200, 120, [0.5, 0.5, 0.5, 1.0]);
+        // AE's red under the halo at 0.5, 1.5, 3.5, 5.5 and 7.5 px outside the left edge
+        // (radius 10) and at 0.5, 5.5, 10.5, 20.5 px (radius 30); halo alpha = 1 − red.
+        let r10 = [(0.5, 140.0), (1.5, 165.0), (3.5, 208.0), (5.5, 234.0), (7.5, 248.0)];
+        let r30 = [(0.5, 132.0), (5.5, 173.0), (10.5, 208.0), (20.5, 245.0)];
+        for (radius, intensity, operation, profile) in [(10.0, 1.0, 1, &r10[..]), (10.0, 3.0, 1, &r10[..]), (10.0, 1.0, 0, &r10[..]), (30.0, 1.0, 1, &r30[..])]
+        {
+            let set = [
+                ("based", Value::Enum(1)),
+                ("threshold", num(60.0)),
+                ("radius", num(radius)),
+                ("intensity", num(intensity)),
+                ("operation", Value::Enum(operation)),
+            ];
+            let o = run_fx("ec.stylize.glow", &set, grey.clone(), 0.0, EffectEnv::default());
+            for &(d, red) in profile {
+                // Layer x = −d (pixel centre), mid-height; over AE's red: R = 1 − α, colour 0.
+                let (bx, by) = o.to_px([-d, 60.0]);
+                let p = o.img.get(bx.floor() as i64, by.floor() as i64);
+                let ae = 1.0 - red / 255.0;
+                assert!((p[3] - ae).abs() < 3.0 / 255.0, "radius {radius} intensity {intensity} op {operation} at {d} px: alpha {} vs AE {ae}", p[3]);
+                assert!(p[0].abs() < 1e-6, "the halo is black: {p:?}");
+            }
+        }
+    }
+
+    /// After Effects 2026, Glow at Threshold 60 %, Radius 10, Intensity 0.25 on 200 × 200
+    /// solids over red: the glow 1.5 px outside the left edge, premultiplied (the green / blue
+    /// channels of the render, where the red background adds nothing), and its alpha 0.353.
+    #[test]
+    fn glow_brightness_matches_after_effects() {
+        // (solid colour, channel, AE glow value 0..255)
+        let cases = [
+            ([0.65, 0.65, 0.65], 1, 20.0),
+            ([0.8, 0.8, 0.8], 1, 47.0),
+            ([0.9, 0.9, 0.9], 1, 65.0),
+            ([1.0, 1.0, 1.0], 1, 83.0),
+            ([1.0, 0.5, 0.0], 1, 0.0),
+            ([0.2, 0.6, 1.0], 1, 11.0),
+            ([0.2, 0.6, 1.0], 2, 83.0),
+        ];
+        for (c, ch, ae) in cases {
+            let img = effectcraft_raster::Image::filled(200, 200, [c[0], c[1], c[2], 1.0]);
+            let set = [("threshold", num(60.0)), ("radius", num(10.0)), ("intensity", num(0.25))];
+            let o = run_fx("ec.stylize.glow", &set, img, 0.0, EffectEnv::default());
+            let (bx, by) = o.to_px([-1.5, 100.0]);
+            let p = o.img.get(bx.floor() as i64, by.floor() as i64);
+            assert!((p[ch] * 255.0 - ae).abs() <= 2.5, "{c:?} channel {ch}: {} vs AE {ae}", p[ch] * 255.0);
+            assert!((p[3] - 0.353).abs() < 3.0 / 255.0, "{c:?}: alpha {}", p[3]);
+        }
+        // Intensity scales the colour linearly: white at Intensity 1 is 3.7 × its alpha.
+        let white = effectcraft_raster::Image::filled(200, 200, [1.0, 1.0, 1.0, 1.0]);
+        let o = run_fx("ec.stylize.glow", &[("threshold", num(60.0)), ("radius", num(10.0))], white, 0.0, EffectEnv::default());
+        let (bx, by) = o.to_px([-1.5, 100.0]);
+        let p = o.img.get(bx.floor() as i64, by.floor() as i64);
+        assert!((p[1] / p[3] - 3.69).abs() < 0.05, "{p:?}");
+    }
+
+    /// After Effects 2026: Radial Blur keeps the layer's edges. Zoom 20 on a flat grey 960 × 540
+    /// solid (case 713) leaves it flat and opaque to the edge (EffectCraft faded the edges toward
+    /// transparency, letting the red layer below show through); on a full-frame horizontal ramp
+    /// (case 829, centre [960, 540]) row 540 reads 2/255 at x = 2 and 253/255 at x = 1917.
+    #[test]
+    fn radial_blur_keeps_the_layer_edges_as_after_effects() {
+        let zoom = |c: [f64; 2]| [("amount", num(20.0)), ("type", Value::Enum(1)), ("center", Value::Vec2(c))];
+        let grey = effectcraft_raster::Image::filled(960, 540, [0.5, 0.5, 0.5, 1.0]);
+        let o = run_fx("ec.blur.radial", &zoom([600.0, 300.0]), grey, 0.0, EffectEnv::default());
+        for (x, y) in [(0, 270), (1, 270), (959, 270), (480, 0), (480, 539), (0, 0), (959, 539)] {
+            let p = o.img.get(x, y);
+            assert!((p[3] - 1.0).abs() < 1e-4 && (p[0] - 0.5).abs() < 1e-4, "({x}, {y}): {p:?}");
+        }
+        let mut ramp = effectcraft_raster::Image::new(1920, 1080);
+        ramp.rows_mut().for_each(|(_, row)| {
+            for (x, px) in row.iter_mut().enumerate() {
+                let v = (x as f32 + 0.5) / 1920.0;
+                *px = [v, v, v, 1.0];
+            }
+        });
+        let o = run_fx("ec.blur.radial", &zoom([960.0, 540.0]), ramp, 0.0, EffectEnv::default());
+        for (x, ae) in [(2, 2.0), (1917, 253.0)] {
+            let p = o.img.get(x, 540);
+            assert!((p[0] * 255.0 - ae).abs() <= 2.0 && (p[3] - 1.0).abs() < 1e-4, "x {x}: {p:?} vs AE {ae}");
+        }
+    }
+
+    /// After Effects 2026, Venetian Blinds Completion 40, Direction 30, Width 50, Feather 5 on
+    /// an opaque 480 × 270 layer: alpha (0..255) along row y = 135. The transparent band starts
+    /// at the layer centre's phase, both edges are Gaussian (σ = Feather / 2).
+    #[test]
+    fn venetian_blinds_match_after_effects() {
+        let img = effectcraft_raster::Image::filled(480, 270, [0.5, 0.5, 0.5, 1.0]);
+        let vals = [("completion", Value::Scalar(40.0)), ("direction", Value::Scalar(30.0)), ("width", Value::Scalar(50.0)), ("feather", Value::Scalar(5.0))];
+        let o = run_fx("ec.transition.venetian", &vals, img, 0.0, EffectEnv::default());
+        let ae = [
+            (200, 5.0),
+            (203, 47.0),
+            (206, 145.0),
+            (209, 228.0),
+            (212, 253.0),
+            (224, 255.0),
+            (236, 238.0),
+            (239, 168.0),
+            (242, 66.0),
+            (245, 10.0),
+            (251, 0.0),
+            (257, 2.0),
+            (260, 31.0),
+        ];
+        for (x, a) in ae {
+            let got = o.img.get(x, 135)[3] * 255.0;
+            assert!((got - a).abs() <= 6.0, "x {x}: alpha {got} vs AE {a}");
+        }
+        // No completion leaves the layer; full completion clears it; no feather is a hard edge.
+        let full = [("completion", Value::Scalar(100.0)), ("feather", Value::Scalar(5.0))];
+        let img = effectcraft_raster::Image::filled(40, 20, [0.5, 0.5, 0.5, 1.0]);
+        assert!(run_fx("ec.transition.venetian", &full, img.clone(), 0.0, EffectEnv::default()).img.data.iter().all(|p| p[3] < 1e-4));
+        assert_eq!(run_fx("ec.transition.venetian", &[("completion", Value::Scalar(0.0))], img.clone(), 0.0, EffectEnv::default()).img, img);
+        let hard = run_fx(
+            "ec.transition.venetian",
+            &[("completion", Value::Scalar(50.0)), ("width", Value::Scalar(10.0)), ("feather", Value::Scalar(0.0))],
+            img,
+            0.0,
+            EffectEnv::default(),
+        );
+        assert!(hard.img.data.iter().all(|p| p[3] == 0.0 || p[3] == 1.0));
+        // A feather far wider than the blinds is an even veil.
+        assert_eq!(venetian_cover(3.0, 10.0, 0.5, 1e9), 0.5);
+    }
+
+    /// After Effects 2026, Radial Wipe Completion 40, Start Angle 30, Wipe Counterclockwise,
+    /// Feather 20, centre (800, 500): visible fraction at pixel offsets from the centre on both
+    /// edges (8-bit captures of dark steps, so ±0.05).
+    #[test]
+    fn radial_wipe_feather_matches_after_effects() {
+        let img = effectcraft_raster::Image::filled(400, 300, [1.0, 1.0, 1.0, 1.0]);
+        let vals = [
+            ("completion", Value::Scalar(40.0)),
+            ("startAngle", Value::Scalar(30.0)),
+            ("center", Value::Vec2([200.0, 150.0])),
+            ("wipe", Value::Enum(1)),
+            ("feather", Value::Scalar(20.0)),
+        ];
+        let o = run_fx("ec.transition.radialwipe", &vals, img.clone(), 0.0, EffectEnv::default());
+        let ae = [
+            ((-50, 34), 0.922),
+            ((-52, 30), 0.797),
+            ((-54, 26), 0.609),
+            ((-55, 24), 0.5),
+            ((-56, 22), 0.406),
+            ((-57, 19), 0.266),
+            ((-58, 15), 0.125),
+            ((-104, 60), 0.951),
+            ((-108, 53), 0.732),
+            ((-111, 45), 0.341),
+            ((-114, 37), 0.062),
+            ((22, -56), 0.156),
+            ((26, -54), 0.312),
+            ((30, -52), 0.531),
+            ((34, -50), 0.729),
+            ((37, -47), 0.875),
+            ((53, -108), 0.177),
+            ((67, -99), 0.875),
+        ];
+        for ((dx, dy), a) in ae {
+            let got = o.img.get(200 + dx, 150 + dy)[3];
+            assert!((got - a).abs() < 0.05, "offset ({dx}, {dy}): {got} vs AE {a}");
+        }
+        // 0 % leaves the layer, 100 % clears it, Feather 0 is a hard edge.
+        let at = |c: f64, f: f64| {
+            let v = [("completion", Value::Scalar(c)), ("feather", Value::Scalar(f))];
+            run_fx("ec.transition.radialwipe", &v, img.clone(), 0.0, EffectEnv::default()).img
+        };
+        assert_eq!(at(0.0, 20.0), img);
+        assert!(at(100.0, 20.0).data.iter().all(|p| p[3] == 0.0));
+        assert!(at(50.0, 0.0).data.iter().all(|p| p[3] == 0.0 || p[3] == 1.0));
+    }
+
     #[test]
     fn glow_operation_and_arbitrary_map() {
         // Pixels addressed in layer space (Glow pads its buffer).
diff --git a/crates/effects/src/noise3.rs b/crates/effects/src/noise3.rs
index 88a5c01d5..49f200553 100644
--- a/crates/effects/src/noise3.rs
+++ b/crates/effects/src/noise3.rs
@@ -17,7 +17,7 @@ use effectcraft_keyframe::Value;
 use effectcraft_project::ParamUi;
 use rayon::prelude::*;
 
-use crate::generate::{fade, lattice};
+use crate::generate::lattice;
 use crate::{Buf, EffectCtx, EffectSpec, ParamSpec, num, p, popup, slider};
 
 /// Fractal Type options (shared by both effects).
@@ -60,6 +60,11 @@ pub const BLEND_NORMAL: u32 = 1;
 /// Index of "Soft Linear" in [`NOISE_TYPES`] (the default, and the GPU path's interpolation).
 pub const NOISE_SOFT_LINEAR: u32 = 2;
 
+/// Lattice cell of Fractal / Turbulent Noise in pixels per percent of Scale: After Effects 2026
+/// draws Block noise at Scale 100 in 66.67 px cells (and Soft Linear noise has the matching
+/// correlation length), not 100 px.
+pub const NOISE_CELL: f64 = 2.0 / 3.0;
+
 fn spec(id: &'static str, name: &'static str, params: Vec<ParamSpec>, render: crate::RenderFn) -> EffectSpec {
     EffectSpec { id, name, category: "Noise & Grain", params, render, gpu: false, float: true }
 }
@@ -139,7 +144,7 @@ fn bspline(t: f32) -> [f32; 3] {
 }
 
 /// 3D value noise in about 0..1 with the given [`NOISE_TYPES`] interpolation in x and y (the
-/// evolution axis z always fades smoothly).
+/// evolution axis z always interpolates linearly, so evolution moves at a constant rate).
 ///
 /// Soft Linear is linear interpolation softened by a one-cell box filter, which is the quadratic
 /// B-spline: smooth like Spline from 9 lattice values instead of 16. A fade between two values
@@ -149,7 +154,7 @@ pub fn typed_noise(x: f32, y: f32, z: f32, seed: u32, noise_type: u32) -> f32 {
     // Soft Linear's taps are centred on the nearest lattice point, the others start at the cell's.
     let h = if noise_type == NOISE_SOFT_LINEAR { 0.5 } else { 0.0 };
     let (x0, y0, z0) = ((x + h).floor(), (y + h).floor(), z.floor());
-    let (tx, ty, fz) = (x + h - x0, y + h - y0, fade(z - z0));
+    let (tx, ty, fz) = (x + h - x0, y + h - y0, z - z0);
     let (ix, iy, iz) = (x0 as i32, y0 as i32, z0 as i32);
     let l = |a: f32, b: f32, t: f32| a + (b - a) * t;
     let slice = |dz: i32| -> f32 {
@@ -236,7 +241,7 @@ impl Fractal {
             overflow: pr.e("overflow"),
             invert: pr.b("invert"),
             rot: rot.sin_cos(),
-            size: [(sw * b.scale).max(1.0) as f32, (sh * b.scale).max(1.0) as f32],
+            size: [(sw * NOISE_CELL * b.scale).max(1.0) as f32, (sh * NOISE_CELL * b.scale).max(1.0) as f32],
             origin: [ox as f32, oy as f32],
             center: [cx as f32, cy as f32],
             perspective: pr.b("transform/perspectiveOffset"),
@@ -333,7 +338,7 @@ impl Fractal {
 }
 
 /// Fractal / Turbulent Noise resolved for the GPU kernel (effectcraft-gpu `fx_noise`): the
-/// per-pixel constants and, per octave, the terms [`Fractal::raw`] computes before touching the
+/// per-pixel constants and, per octave, the terms `Fractal::raw` computes before touching the
 /// pixel, in the same f32 order.
 pub struct FractalGpu {
     pub kind: u32,
@@ -406,15 +411,20 @@ pub fn fractal_gpu(ctx: &EffectCtx, offset: [f64; 2], scale: f64, turbulent: boo
         sub_rotation: fr.sub_rotation != 0.0,
         norm,
         octaves,
-        mode: match ctx.params.get("blendingMode").map(Value::as_enum).unwrap_or(BLEND_NONE) {
-            BLEND_NONE => None,
-            m => Some(BLEND_MODES.get(m as usize).and_then(|l| BlendMode::from_name(l)).unwrap_or(BlendMode::Normal)),
-        },
+        mode: blend_mode(ctx.params.get("blendingMode").map(Value::as_enum).unwrap_or(BLEND_NONE)),
         opacity: (ctx.params.f("opacity") as f32 / 100.0).clamp(0.0, 1.0),
         blend: ctx.params.f("blend") as f32 / 100.0,
     }
 }
 
+/// Resolve a Blending Mode index: None → `None`, unknown → Normal.
+fn blend_mode(m: u32) -> Option<BlendMode> {
+    match m {
+        BLEND_NONE => None,
+        m => Some(BLEND_MODES.get(m as usize).and_then(|l| BlendMode::from_name(l)).unwrap_or(BlendMode::Normal)),
+    }
+}
+
 /// Map a value by an [`OVERFLOWS`] option.
 pub fn overflow(v: f32, mode: u32) -> f32 {
     match mode {
@@ -431,14 +441,11 @@ pub fn overflow(v: f32, mode: u32) -> f32 {
 /// Composite grey noise `val` over the original pixel by Blending Mode, Opacity and (ours) Blend
 /// With Original. The noise stays inside the layer's alpha, so a masked solid shows it only within
 /// its masks (#939).
-pub(crate) fn composite(orig: [f32; 4], val: f32, opacity: f32, mode: u32, blend_orig: f32) -> [f32; 4] {
+pub(crate) fn composite(orig: [f32; 4], val: f32, opacity: f32, mode: Option<BlendMode>, blend_orig: f32) -> [f32; 4] {
     let src = [val * opacity, val * opacity, val * opacity, opacity];
     let out = match mode {
-        BLEND_NONE => src,
-        m => {
-            let bm = BLEND_MODES.get(m as usize).and_then(|l| BlendMode::from_name(l)).unwrap_or(BlendMode::Normal);
-            blend_pixel(bm, orig, src, 0.5)
-        }
+        None => src,
+        Some(bm) => blend_pixel(bm, orig, src, 0.5),
     };
     let k = 1.0 - blend_orig;
     [0, 1, 2, 3].map(|c| orig[c] * blend_orig + out[c] * orig[3] * k)
@@ -447,7 +454,7 @@ pub(crate) fn composite(orig: [f32; 4], val: f32, opacity: f32, mode: u32, blend
 fn render(ctx: &EffectCtx, mut b: Buf, turbulent: bool) -> Buf {
     let fr = Fractal::from_params(ctx, &b, turbulent);
     let opacity = (ctx.params.f("opacity") as f32 / 100.0).clamp(0.0, 1.0);
-    let mode = ctx.params.get("blendingMode").map(Value::as_enum).unwrap_or(BLEND_NONE);
+    let mode = blend_mode(ctx.params.get("blendingMode").map(Value::as_enum).unwrap_or(BLEND_NONE));
     let blend = ctx.params.f("blend") as f32 / 100.0;
     b.img.rows_mut().for_each(|(y, row)| {
         for (x, px) in row.iter_mut().enumerate() {
@@ -476,6 +483,20 @@ mod tests {
         run_fx(id, vals, Image::filled(40, 24, [0.2, 0.4, 0.6, 1.0]), 0.0, EffectEnv::default()).img
     }
 
+    /// Evolution moves the noise at a constant rate: no ease in or out within a revolution.
+    #[test]
+    fn evolution_is_linear() {
+        for noise_type in [0, 1, 2, 3] {
+            let a = typed_noise(0.3, 0.7, 0.0, 5, noise_type);
+            let b = typed_noise(0.3, 0.7, 1.0, 5, noise_type);
+            for z in [0.25, 0.5, 0.75] {
+                let want = a + (b - a) * z;
+                let got = typed_noise(0.3, 0.7, z, 5, noise_type);
+                assert!((got - want).abs() < 1e-4, "type {noise_type} z {z}: {got} vs {want}");
+            }
+        }
+    }
+
     /// A Fractal Noise saved before the twirl-downs existed: flat ids move into their groups and
     /// the new controls take values that keep the old look.
     #[test]
@@ -519,14 +540,34 @@ mod tests {
 
     #[test]
     fn noise_types_differ_and_block_is_piecewise_constant() {
-        let a = run("ec.noise.fractal", &[("noiseType", Value::Enum(0)), ("complexity", num(1.0)), ("transform/scale", num(10.0))]);
-        // Block noise: neighbours inside one 10 px cell share a value.
+        let a = run("ec.noise.fractal", &[("noiseType", Value::Enum(0)), ("complexity", num(1.0)), ("transform/scale", num(15.0))]);
+        // Block noise: neighbours inside one 10 px cell (Scale 15) share a value.
         assert_eq!(a.get(4, 4), a.get(5, 5));
         let others: Vec<Image> = (1..4).map(|t| run("ec.noise.fractal", &[("noiseType", Value::Enum(t)), ("transform/scale", num(10.0))])).collect();
         assert_ne!(others[0], others[1]);
         assert_ne!(others[1], others[2]);
     }
 
+    /// After Effects 2026 (R9): Block noise at Scale 100, Complexity 1 changes value every
+    /// 66.67 px along a row.
+    #[test]
+    fn block_noise_cells_are_two_thirds_of_scale_as_in_after_effects() {
+        let img = run_fx(
+            "ec.noise.fractal",
+            &[("noiseType", Value::Enum(0)), ("complexity", num(1.0)), ("blendingMode", Value::Enum(BLEND_NONE))],
+            Image::filled(400, 8, [0.0, 0.0, 0.0, 1.0]),
+            0.0,
+            EffectEnv::default(),
+        )
+        .img;
+        let changes: Vec<i64> = (1..400).filter(|&x| img.get(x, 4) != img.get(x - 1, 4)).collect();
+        assert!(changes.len() >= 4, "{changes:?}");
+        for w in changes.windows(2) {
+            let d = (w[1] - w[0]) as f64;
+            assert!((d - 200.0 / 3.0).abs() <= 1.0, "cell width {d}: {changes:?}");
+        }
+    }
+
     #[test]
     fn scale_width_height_apply_without_uniform_scaling() {
         let base = &[("complexity", num(1.0)), ("transform/scale", num(8.0))];
@@ -665,4 +706,34 @@ mod tests {
         }
         assert!(axis / diag < 1.15, "gradient along the axes / along the diagonals: {}", axis / diag);
     }
+
+    /// The base composite, resolving the Blending Mode by name on every call, kept only to prove
+    /// the hoisted lookup changes nothing.
+    fn old_composite(orig: [f32; 4], val: f32, opacity: f32, mode: u32, blend_orig: f32) -> [f32; 4] {
+        let src = [val * opacity, val * opacity, val * opacity, opacity];
+        let out = match mode {
+            BLEND_NONE => src,
+            m => {
+                let bm = BLEND_MODES.get(m as usize).and_then(|l| BlendMode::from_name(l)).unwrap_or(BlendMode::Normal);
+                blend_pixel(bm, orig, src, 0.5)
+            }
+        };
+        let k = 1.0 - blend_orig;
+        [0, 1, 2, 3].map(|c| orig[c] * blend_orig + out[c] * orig[3] * k)
+    }
+
+    #[test]
+    fn resolved_blend_matches_per_pixel_lookup() {
+        for m in (0..BLEND_MODES.len() as u32).chain([24, 999]) {
+            for orig in [[0.2, 0.4, 0.6, 1.0], [0.9, 0.1, 0.5, 0.5], [0.0, 0.0, 0.0, 0.0]] {
+                for val in [0.0, 0.3, 0.75, 1.0] {
+                    for (op, bl) in [(1.0, 0.0), (0.6, 0.25)] {
+                        assert_eq!(composite(orig, val, op, blend_mode(m), bl), old_composite(orig, val, op, m, bl), "mode {m}");
+                    }
+                }
+            }
+        }
+        assert_eq!(blend_mode(BLEND_NONE), None);
+        assert_eq!(blend_mode(999), Some(BlendMode::Normal));
+    }
 }
diff --git a/crates/effects/src/object_matte.rs b/crates/effects/src/object_matte.rs
index 32a196af2..e61357c9f 100644
--- a/crates/effects/src/object_matte.rs
+++ b/crates/effects/src/object_matte.rs
@@ -284,9 +284,13 @@ pub fn frozen_alpha(params: &Params, layer_size: [f64; 2], fps: f64, f: i64, w:
         return None;
     }
     let fr = fc.frames.get(&f)?;
-    let a = rle::decode(&fr.a)?;
     let [fw, fh] = fc.size;
-    if fw == 0 || fh == 0 || a.len() != fw.checked_mul(fh)? {
+    let expected = fw.checked_mul(fh)?;
+    if fw == 0 || fh == 0 || expected > rle::MAX_PLANE_BYTES {
+        return None;
+    }
+    let a = rle::decode_bounded(&fr.a, expected)?;
+    if a.len() != expected {
         return None;
     }
     let af: Vec<f32> = a.iter().map(|v| *v as f32 / 255.0).collect();
@@ -354,20 +358,24 @@ pub enum FrameMatte {
     Outside,
 }
 
-/// The matte of layer frame `f` on the layer grid of `img` (the effect's input on that frame at
-/// `scale`), computing what is missing. `frame(g)`: the input on frame g on the same grid.
-#[allow(clippy::too_many_arguments)]
+/// The layer grid and timing used to compute one object matte.
+pub struct MatteFrame<'a> {
+    pub layer_size: [f64; 2],
+    pub fps: f64,
+    pub frame: i64,
+    pub scale: f64,
+    pub img: &'a Image,
+}
+
+/// Compute the object's alpha for one layer frame, loading other frames on the same grid as needed.
 pub fn frame_matte(
     params: &Params,
-    layer_size: [f64; 2],
-    fps: f64,
-    f: i64,
-    scale: f64,
-    img: &Image,
+    input: &MatteFrame<'_>,
     model: Option<Arc<dyn MaskModel>>,
     frame: &mut dyn FnMut(i64) -> Option<Arc<Image>>,
     cancel: &dyn Fn() -> bool,
 ) -> FrameMatte {
+    let MatteFrame { layer_size, fps, frame: f, scale, img } = *input;
     let Some(chain) = chain(params, layer_size, fps, f, scale, model) else { return FrameMatte::NoPrompt };
     if !chain.data.in_span(f) {
         return FrameMatte::Outside;
@@ -404,7 +412,7 @@ fn render(ctx: &EffectCtx, buf: Buf) -> Buf {
     if let Some(a) = frozen_alpha(ctx.params, layer_size, fps, f, w, h, model.as_deref()) {
         return compose(&buf, Some(&a), w, h, b(ctx.params, "invert"), param(ctx.params, "view").map(Value::as_enum).unwrap_or(0) == 1);
     }
-    let alpha = match frame_matte(ctx.params, layer_size, fps, f, sc, &img, model, &mut frame, &|| false) {
+    let alpha = match frame_matte(ctx.params, &MatteFrame { layer_size, fps, frame: f, scale: sc, img: &img }, model, &mut frame, &|| false) {
         FrameMatte::Alpha(a) if a.len() == w * h => Some(a),
         FrameMatte::NoPrompt => return buf,
         _ => None,
@@ -604,7 +612,11 @@ mod tests {
         assert_ne!(seed(&p, [100.0, 80.0], 25.0, Some(stub.as_ref())), seed(&p, [100.0, 80.0], 25.0, None));
         let img = frame_at(0);
         let mut frame = |g: i64| Some(Arc::new(frame_at(g)));
-        let FrameMatte::Alpha(a) = frame_matte(&p, [100.0, 80.0], 25.0, 0, 1.0, &img, Some(stub.clone()), &mut frame, &|| false) else { panic!("no matte") };
+        let FrameMatte::Alpha(a) =
+            frame_matte(&p, &MatteFrame { layer_size: [100.0, 80.0], fps: 25.0, frame: 0, scale: 1.0, img: &img }, Some(stub.clone()), &mut frame, &|| false)
+        else {
+            panic!("no matte")
+        };
         assert!(a[40 * 100 + 40] > 0.5 && a[5 * 100 + 5] < 0.5);
         assert_eq!(stub.calls.load(std::sync::atomic::Ordering::Relaxed), 1);
         assert_eq!(*stub.bbox.lock().unwrap(), None);
@@ -630,7 +642,11 @@ mod tests {
         let stub = Arc::new(Stub::default());
         let img = frame_at(0);
         let mut frame = |g: i64| Some(Arc::new(frame_at(g)));
-        let FrameMatte::Alpha(a) = frame_matte(&p, [100.0, 80.0], 25.0, 0, 1.0, &img, Some(stub.clone()), &mut frame, &|| false) else { panic!("no matte") };
+        let FrameMatte::Alpha(a) =
+            frame_matte(&p, &MatteFrame { layer_size: [100.0, 80.0], fps: 25.0, frame: 0, scale: 1.0, img: &img }, Some(stub.clone()), &mut frame, &|| false)
+        else {
+            panic!("no matte")
+        };
         assert_eq!(*stub.bbox.lock().unwrap(), Some([74.0, 54.0, 100.0, 80.0]));
         assert!(a[70 * 100 + 90] > 0.5 && a[40 * 100 + 40] < 0.5);
         // At half resolution the box is scaled with the frame (another Input Key, so the
@@ -639,7 +655,8 @@ mod tests {
         p.values.insert(INPUT_KEY.into(), Value::Str("half".into()));
         let half = effectcraft_raster::resample(&img, 50, 40);
         let mut frame = |g: i64| Some(Arc::new(effectcraft_raster::resample(&frame_at(g), 50, 40)));
-        let _ = frame_matte(&p, [100.0, 80.0], 25.0, 0, 0.5, &half, Some(stub.clone()), &mut frame, &|| false);
+        let _ =
+            frame_matte(&p, &MatteFrame { layer_size: [100.0, 80.0], fps: 25.0, frame: 0, scale: 0.5, img: &half }, Some(stub.clone()), &mut frame, &|| false);
         assert_eq!(*stub.bbox.lock().unwrap(), Some([37.0, 27.0, 50.0, 40.0]));
     }
 
diff --git a/crates/effects/src/obsolete.rs b/crates/effects/src/obsolete.rs
index c58f5ca6b..a2b161b39 100644
--- a/crates/effects/src/obsolete.rs
+++ b/crates/effects/src/obsolete.rs
@@ -99,7 +99,13 @@ fn gaussian_legacy(ctx: &EffectCtx, mut b: Buf) -> Buf {
     if !ctx.adjustment {
         b.pad((s * 3.0).ceil() as u32);
     }
-    b.img = gaussian_blur(&b.img, s * kx, s * ky, ctx.adjustment);
+    let (sx, sy) = (s * kx, s * ky);
+    // Small sigmas use the sampled kernel, like Gaussian Blur (#1939).
+    b.img = if effectcraft_raster::gaussian_is_exact(sx, sy) {
+        effectcraft_raster::gaussian_blur_exact(&b.img, sx, sy, ctx.adjustment)
+    } else {
+        gaussian_blur(&b.img, sx, sy, ctx.adjustment)
+    };
     b
 }
 
@@ -175,6 +181,16 @@ mod tests {
         assert!(out.img.get(c as i64, c as i64)[3] < 0.5);
     }
 
+    #[test]
+    fn gaussian_legacy_small_blurriness_blurs() {
+        // #1939: Blurriness under ~1.2 used to be a no-op.
+        let mut img = Image::new(15, 15);
+        img.set(7, 7, [1.0, 1.0, 1.0, 1.0]);
+        let out = run_fx("ec.obsolete.gaussianlegacy", &[("blurriness", num(0.9))], img, 0.0, EffectEnv::default());
+        let c = out.img.width / 2;
+        assert!(out.img.get(c as i64, c as i64)[3] < 0.9);
+    }
+
     #[test]
     fn moved_effects_are_obsolete() {
         for id in ["ec.key.luma", "ec.key.spill", "ec.blur.reduceflicker"] {
diff --git a/crates/effects/src/ocio.rs b/crates/effects/src/ocio.rs
index 74816b110..2daa9857d 100644
--- a/crates/effects/src/ocio.rs
+++ b/crates/effects/src/ocio.rs
@@ -37,1802 +37,31 @@ use crate::util::unpremul;
 use crate::utility::{Lut, parse_cube};
 use crate::{Buf, EffectCtx, EffectSpec, num, p, popup, slider};
 
-type M3 = [[f64; 3]; 3];
+mod cdl;
+mod effects;
+mod lut;
+mod program;
+mod registry;
+mod space;
 
-pub(crate) const D65: [f64; 2] = [0.3127, 0.3290];
-const ACES_WHITE: [f64; 2] = [0.32168, 0.33767];
-const AP0: [[f64; 2]; 3] = [[0.7347, 0.2653], [0.0, 1.0], [0.0001, -0.0770]];
-const AP1: [[f64; 2]; 3] = [[0.713, 0.293], [0.165, 0.830], [0.128, 0.044]];
-pub(crate) const REC709: [[f64; 2]; 3] = [[0.640, 0.330], [0.300, 0.600], [0.150, 0.060]];
-pub(crate) const REC2020: [[f64; 2]; 3] = [[0.708, 0.292], [0.170, 0.797], [0.131, 0.046]];
-pub(crate) const P3: [[f64; 2]; 3] = [[0.680, 0.320], [0.265, 0.690], [0.150, 0.060]];
-const IDENTITY: M3 = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]];
-
-/// Transfer functions (encoded ↔ linear).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Tf {
-    Linear,
-    Srgb,
-    Gamma(f64),
-    AcesCct,
-    /// ACEScc (Academy S-2014-003), the pure-log grading encoding.
-    AcesCc,
-    /// SMPTE ST 2084 with 1.0 = 100 cd/m².
-    Pq,
-}
-
-/// ACEScc: the lowest code value (linear 0 and below) and the end of its toe (linear 2⁻¹⁵).
-const ACESCC_MIN: f64 = (-16.0 + 9.72) / 17.52;
-const ACESCC_TOE: f64 = (-15.0 + 9.72) / 17.52;
-
-impl Tf {
-    pub fn decode(self, v: f64) -> f64 {
-        match self {
-            Tf::Linear => v,
-            Tf::Srgb => {
-                let a = v.abs();
-                let l = if a <= 0.04045 { a / 12.92 } else { ((a + 0.055) / 1.055).powf(2.4) };
-                l.copysign(v)
-            }
-            Tf::Gamma(g) => v.abs().powf(g).copysign(v),
-            Tf::AcesCct => {
-                if v <= 0.155_251_141_552_511 {
-                    (v - 0.072_905_534_195_835_5) / 10.540_237_741_654_5
-                } else if v < (65504f64.log2() + 9.72) / 17.52 {
-                    2f64.powf(v * 17.52 - 9.72)
-                } else {
-                    65504.0
-                }
-            }
-            Tf::AcesCc => {
-                if v < ACESCC_TOE {
-                    (2f64.powf(v * 17.52 - 9.72) - 2f64.powi(-16)) * 2.0
-                } else if v < (65504f64.log2() + 9.72) / 17.52 {
-                    2f64.powf(v * 17.52 - 9.72)
-                } else {
-                    65504.0
-                }
-            }
-            Tf::Pq => {
-                let (m1, m2, c1, c2, c3) = pq_consts();
-                let e = v.max(0.0).powf(1.0 / m2);
-                let l = ((e - c1).max(0.0) / (c2 - c3 * e)).powf(1.0 / m1);
-                l * 100.0
-            }
-        }
-    }
-    pub fn encode(self, v: f64) -> f64 {
-        match self {
-            Tf::Linear => v,
-            Tf::Srgb => {
-                let a = v.abs();
-                let e = if a <= 0.003_130_8 { a * 12.92 } else { 1.055 * a.powf(1.0 / 2.4) - 0.055 };
-                e.copysign(v)
-            }
-            Tf::Gamma(g) => v.abs().powf(1.0 / g).copysign(v),
-            Tf::AcesCct => {
-                if v <= 0.007_812_5 {
-                    10.540_237_741_654_5 * v + 0.072_905_534_195_835_5
-                } else {
-                    (v.log2() + 9.72) / 17.52
-                }
-            }
-            Tf::AcesCc => {
-                if v <= 0.0 {
-                    ACESCC_MIN
-                } else if v < 2f64.powi(-15) {
-                    ((2f64.powi(-16) + v * 0.5).log2() + 9.72) / 17.52
-                } else {
-                    (v.log2() + 9.72) / 17.52
-                }
-            }
-            Tf::Pq => {
-                let (m1, m2, c1, c2, c3) = pq_consts();
-                let y = (v / 100.0).max(0.0).powf(m1);
-                ((c1 + c2 * y) / (1.0 + c3 * y)).powf(m2)
-            }
-        }
-    }
-}
-
-fn pq_consts() -> (f64, f64, f64, f64, f64) {
-    (2610.0 / 16384.0, 2523.0 / 4096.0 * 128.0, 3424.0 / 4096.0, 2413.0 / 4096.0 * 32.0, 2392.0 / 4096.0 * 32.0)
-}
-
-/// A colour space of the built-in config.
-#[derive(Clone, Copy, Debug)]
-pub struct Space {
-    pub name: &'static str,
-    /// Primaries and white (None = CIE XYZ itself).
-    pub prims: Option<([[f64; 2]; 3], [f64; 2])>,
-    pub tf: Tf,
-    /// Passes data through untouched.
-    pub raw: bool,
-}
-
-pub(crate) const fn sp(name: &'static str, prims: [[f64; 2]; 3], white: [f64; 2], tf: Tf) -> Space {
-    Space { name, prims: Some((prims, white)), tf, raw: false }
-}
-
-/// The built-in configuration's colour spaces, in popup order.
-pub(crate) const ACES2065_1: Space = sp("ACES2065-1", AP0, ACES_WHITE, Tf::Linear);
-pub(crate) const ACES_CG: Space = sp("ACEScg", AP1, ACES_WHITE, Tf::Linear);
-const ACES_CCT: Space = sp("ACEScct", AP1, ACES_WHITE, Tf::AcesCct);
-
-pub const SPACES: &[Space] = &[
-    ACES2065_1,
-    ACES_CG,
-    ACES_CCT,
-    sp("Linear Rec.709 (sRGB)", REC709, D65, Tf::Linear),
-    sp("sRGB", REC709, D65, Tf::Srgb),
-    sp("Gamma 2.4 Rec.709", REC709, D65, Tf::Gamma(2.4)),
-    sp("Linear Rec.2020", REC2020, D65, Tf::Linear),
-    sp("Gamma 2.4 Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
-    sp("Linear P3-D65", P3, D65, Tf::Linear),
-    sp("Display P3", P3, D65, Tf::Srgb),
-    Space { name: "CIE-XYZ-D65", prims: None, tf: Tf::Linear, raw: false },
-    Space { name: "Raw", prims: None, tf: Tf::Linear, raw: true },
-];
-
-pub fn space_names() -> Vec<&'static str> {
-    SPACES.iter().map(|s| s.name).collect()
-}
+pub use cdl::Cdl;
+pub(crate) use effects::CUSTOM_CONFIG_FX;
+#[cfg(test)]
+pub use effects::parse_looks;
+pub use effects::{color_stabilizer_maps, warning};
+#[cfg(test)]
+use effects::{tonemap, tonemap_inv};
+pub use lut::{FileXform, load_file};
+#[cfg(test)]
+pub use lut::{parse_file, parse_spi1d, parse_spi3d, parse_spimtx};
+pub use program::{ColorOp, Straight, color_program};
+pub use registry::specs;
+#[cfg(test)]
+use space::M3;
+pub(crate) use space::{ACES_CG, ACES2065_1, D65, P3, REC709, REC2020, sp};
+#[cfg(test)]
+pub use space::{SPACES, Xform, bradford, space_by_name};
+pub use space::{Space, Tf, matrix};
 
 #[cfg(test)]
-pub fn space_by_name(n: &str) -> Option<&'static Space> {
-    SPACES.iter().find(|s| s.name.eq_ignore_ascii_case(n))
-}
-
-/// Bradford chromatic adaptation from white `src` to white `dst` (xy).
-pub fn bradford(src: [f64; 2], dst: [f64; 2]) -> M3 {
-    if src == dst {
-        return IDENTITY;
-    }
-    const MB: M3 = [[0.8951, 0.2664, -0.1614], [-0.7502, 1.7135, 0.0367], [0.0389, -0.0685, 1.0296]];
-    let xyz = |c: [f64; 2]| [c[0] / c[1], 1.0, (1.0 - c[0] - c[1]) / c[1]];
-    let s = mul_vec(&MB, xyz(src));
-    let d = mul_vec(&MB, xyz(dst));
-    let diag = [[d[0] / s[0], 0.0, 0.0], [0.0, d[1] / s[1], 0.0], [0.0, 0.0, d[2] / s[2]]];
-    mul(&invert(&MB), &mul(&diag, &MB))
-}
-
-impl Space {
-    /// Linear RGB → XYZ D65 (Bradford-adapted when `adapt`, else the space's own white).
-    pub fn to_ref(self, adapt: bool) -> M3 {
-        match self.prims {
-            None => IDENTITY,
-            Some((p, w)) => {
-                let m = rgb_to_xyz(p, w);
-                if adapt { mul(&bradford(w, D65), &m) } else { m }
-            }
-        }
-    }
-}
-
-/// Linear-RGB matrix from space `a` to space `b`.
-pub fn matrix(a: &Space, b: &Space) -> M3 {
-    mul(&invert(&b.to_ref(true)), &a.to_ref(true))
-}
-
-/// A compiled colour-space conversion.
-#[derive(Clone, Copy, Debug)]
-pub struct Xform {
-    dec: Tf,
-    m: [[f32; 3]; 3],
-    ident: bool,
-    enc: Tf,
-}
-
-impl Xform {
-    pub fn new(a: &Space, b: &Space) -> Xform {
-        if a.raw || b.raw {
-            return Xform { dec: Tf::Linear, m: IDENTITY.map(|r| r.map(|v| v as f32)), ident: true, enc: Tf::Linear };
-        }
-        let m = matrix(a, b);
-        let ident = (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-12));
-        Xform { dec: a.tf, m: m.map(|r| r.map(|v| v as f32)), ident, enc: b.tf }
-    }
-    #[inline]
-    pub fn apply(&self, c: [f32; 3]) -> [f32; 3] {
-        let l = c.map(|v| self.dec.decode(v as f64) as f32);
-        let l = if self.ident { l } else { [0, 1, 2].map(|i| self.m[i][0] * l[0] + self.m[i][1] * l[1] + self.m[i][2] * l[2]) };
-        l.map(|v| self.enc.encode(v as f64) as f32)
-    }
-}
-
-// ---------------------------------------------------------------- ASC CDL
-
-/// An ASC Colour Decision List correction.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Cdl {
-    pub slope: [f64; 3],
-    pub offset: [f64; 3],
-    pub power: [f64; 3],
-    pub sat: f64,
-}
-
-impl Default for Cdl {
-    fn default() -> Self {
-        Cdl { slope: [1.0; 3], offset: [0.0; 3], power: [1.0; 3], sat: 1.0 }
-    }
-}
-
-const LUMA: [f64; 3] = [0.2126, 0.7152, 0.0722];
-
-impl Cdl {
-    /// Forward CDL. `clamp` = the v1.2 style (results clamped to 0..1 after SOP and saturation).
-    pub fn apply(&self, c: [f64; 3], clamp: bool) -> [f64; 3] {
-        let mut o = [0.0; 3];
-        for i in 0..3 {
-            let v = c[i] * self.slope[i] + self.offset[i];
-            o[i] = if clamp {
-                v.clamp(0.0, 1.0).powf(self.power[i])
-            } else if v >= 0.0 {
-                v.powf(self.power[i])
-            } else {
-                v
-            };
-        }
-        let l = o[0] * LUMA[0] + o[1] * LUMA[1] + o[2] * LUMA[2];
-        let o = o.map(|v| l + self.sat * (v - l));
-        if clamp { o.map(|v| v.clamp(0.0, 1.0)) } else { o }
-    }
-    /// Exact inverse of [`Cdl::apply`] (inside the clamped range).
-    pub fn invert(&self, c: [f64; 3], clamp: bool) -> [f64; 3] {
-        let c = if clamp { c.map(|v| v.clamp(0.0, 1.0)) } else { c };
-        let l = c[0] * LUMA[0] + c[1] * LUMA[1] + c[2] * LUMA[2];
-        let s = if self.sat.abs() < 1e-9 { 1e-9 } else { self.sat };
-        let o = c.map(|v| l + (v - l) / s);
-        let mut r = [0.0; 3];
-        for i in 0..3 {
-            let v = if clamp { o[i].clamp(0.0, 1.0) } else { o[i] };
-            let pw = self.power[i].max(1e-9);
-            let u = if v >= 0.0 { v.powf(1.0 / pw) } else { v };
-            let sl = if self.slope[i].abs() < 1e-9 { 1e-9 } else { self.slope[i] };
-            r[i] = (u - self.offset[i]) / sl;
-        }
-        if clamp { r.map(|v| v.clamp(0.0, 1.0)) } else { r }
-    }
-}
-
-fn tag<'a>(xml: &'a str, name: &str) -> Option<&'a str> {
-    let open = xml.find(&format!("<{name}"))?;
-    let gt = open + xml[open..].find('>')?;
-    if xml[..gt].ends_with('/') {
-        return Some("");
-    }
-    let close = xml[gt..].find(&format!("</{name}>"))? + gt;
-    Some(&xml[gt + 1..close])
-}
-
-fn nums3(s: &str) -> Option<[f64; 3]> {
-    let v: Vec<f64> = s.split_whitespace().filter_map(|t| t.parse().ok()).collect();
-    (v.len() >= 3).then(|| [v[0], v[1], v[2]])
-}
-
-fn parse_cc(block: &str) -> Cdl {
-    let mut c = Cdl::default();
-    if let Some(s) = tag(block, "Slope").and_then(nums3) {
-        c.slope = s;
-    }
-    if let Some(s) = tag(block, "Offset").and_then(nums3) {
-        c.offset = s;
-    }
-    if let Some(s) = tag(block, "Power").and_then(nums3) {
-        c.power = s;
-    }
-    if let Some(s) = tag(block, "Saturation").and_then(|t| t.trim().parse().ok()) {
-        c.sat = s;
-    }
-    c
-}
-
-/// Parse ASC CDL XML (`.cc`, `.ccc`, `.cdl`): every `<ColorCorrection>` with its `id`.
-pub fn parse_cdl_xml(xml: &str) -> Vec<(String, Cdl)> {
-    let mut out = vec![];
-    let mut rest = xml;
-    while let Some(i) = rest.find("<ColorCorrection") {
-        let after = &rest[i..];
-        let head_end = after.find('>').unwrap_or(after.len());
-        let head = &after[..head_end];
-        let id = head
-            .find("id=")
-            .and_then(|k| {
-                let q = head[k + 3..].chars().next()?;
-                let s = &head[k + 4..];
-                s.find(q).map(|e| s[..e].to_string())
-            })
-            .unwrap_or_default();
-        let end = after.find("</ColorCorrection>").map(|e| e + "</ColorCorrection>".len()).unwrap_or(after.len());
-        out.push((id, parse_cc(&after[..end])));
-        rest = &after[end..];
-    }
-    out
-}
-
-// ---------------------------------------------------------------- LUT files
-
-/// A loaded transform file.
-#[derive(Clone, Debug)]
-pub enum FileXform {
-    /// A lattice/1D LUT with an optional per-channel piecewise-linear shaper (cineSpace pre-LUT).
-    Lut { lut: Lut, shaper: Option<[Vec<(f32, f32)>; 3]> },
-    /// CDL corrections by id (in file order).
-    Cdl(Vec<(String, Cdl)>),
-    /// A matrix with offset (Sony Imageworks `.spimtx`), as a MatrixTransform's.
-    Matrix { m: [f64; 16], offset: [f64; 4] },
-}
-
-/// Parse a Sony Imageworks `.spimtx` matrix: three rows of four numbers, three matrix columns
-/// and an offset in 16-bit code values (÷ 65535).
-pub fn parse_spimtx(text: &str) -> Option<FileXform> {
-    let v: Vec<f64> = text.split_whitespace().map(|t| t.parse().ok()).collect::<Option<_>>()?;
-    if v.len() != 12 || v.iter().any(|x| !x.is_finite()) {
-        return None;
-    }
-    let mut m = [0.0; 16];
-    let mut offset = [0.0; 4];
-    for (r, row) in v.as_chunks::<4>().0.iter().enumerate() {
-        m[r * 4..r * 4 + 3].copy_from_slice(&row[..3]);
-        offset[r] = row[3] / 65535.0;
-    }
-    m[15] = 1.0;
-    Some(FileXform::Matrix { m, offset })
-}
-
-/// Parse a Sony Imageworks `.spi1d` 1D LUT: `From <min> <max>`, `Length <n>`, `Components
-/// <1 | 3>`, then `{` the values `}`.
-pub fn parse_spi1d(text: &str) -> Option<Lut> {
-    let (mut from, mut len, mut comps) = ([0.0f32, 1.0], 0usize, 1usize);
-    let mut values: Vec<f32> = vec![];
-    let mut body = false;
-    for line in text.lines().map(str::trim).filter(|l| !l.is_empty()) {
-        if body {
-            if line.starts_with('}') {
-                break;
-            }
-            for t in line.split_whitespace() {
-                values.push(t.parse().ok()?);
-            }
-            continue;
-        }
-        let mut t = line.split_whitespace();
-        match t.next()? {
-            "{" => body = true,
-            "From" => from = [t.next()?.parse().ok()?, t.next()?.parse().ok()?],
-            "Length" => len = t.next()?.parse().ok()?,
-            "Components" => comps = t.next()?.parse().ok()?,
-            _ => {}
-        }
-    }
-    // A 1D table is interpolated by index, so cap it like the lattices (2²⁴ entries).
-    if !(2..=1 << 24).contains(&len)
-        || !matches!(comps, 1 | 3)
-        || values.len() != len.checked_mul(comps)?
-        || from[1] <= from[0]
-        || from.iter().any(|v| !v.is_finite())
-    {
-        return None;
-    }
-    let d1 = values.chunks_exact(comps).map(|c| if comps == 3 { [c[0], c[1], c[2]] } else { [c[0]; 3] }).collect();
-    Some(Lut { n1: len, d1, n3: 0, d3: vec![], dmin: [from[0]; 3], dmax: [from[1]; 3] })
-}
-
-/// Parse a Sony Imageworks `.spi3d` lattice: `SPILUT 1.0`, `3 3`, the sizes, then one
-/// `r g b  R G B` line per lattice point (indices, then the colour).
-pub fn parse_spi3d(text: &str) -> Option<Lut> {
-    let mut lines = text.lines().map(str::trim).filter(|l| !l.is_empty());
-    if !lines.next()?.starts_with("SPILUT") {
-        return None;
-    }
-    lines.next()?;
-    let size: Vec<usize> = lines.next()?.split_whitespace().map(|t| t.parse().ok()).collect::<Option<_>>()?;
-    let n = *size.first()?;
-    if size.len() != 3 || size.iter().any(|s| *s != n) || !(2..=129).contains(&n) {
-        return None;
-    }
-    let mut d3 = vec![[0.0f32; 3]; n * n * n];
-    let mut seen = 0usize;
-    for line in lines {
-        let v: Vec<&str> = line.split_whitespace().collect();
-        let [r, g, b, cr, cg, cb] = v.as_slice() else { return None };
-        let (r, g, b): (usize, usize, usize) = (r.parse().ok()?, g.parse().ok()?, b.parse().ok()?);
-        if r >= n || g >= n || b >= n {
-            return None;
-        }
-        // Our lattice is red fastest.
-        *d3.get_mut(r + g * n + b * n * n)? = [cr.parse().ok()?, cg.parse().ok()?, cb.parse().ok()?];
-        seen += 1;
-    }
-    (seen == n * n * n).then_some(Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] })
-}
-
-/// Parse an Autodesk `.3dl` lattice (integers, blue fastest; an optional input-mesh line).
-pub fn parse_3dl(text: &str) -> Option<Lut> {
-    let mut mesh: Option<Vec<f64>> = None;
-    let mut rows: Vec<[f64; 3]> = vec![];
-    let mut out_bits: Option<u32> = None;
-    for line in text.lines() {
-        let l = line.trim();
-        if l.is_empty() || l.starts_with('#') || l.starts_with('<') {
-            continue;
-        }
-        if l.starts_with(|c: char| c.is_ascii_alphabetic()) {
-            // "Mesh <in bits> <out bits>" (Lustre header); other keywords are ignored.
-            let t: Vec<&str> = l.split_whitespace().collect();
-            if t[0].eq_ignore_ascii_case("mesh") && t.len() >= 3 {
-                out_bits = t[2].parse().ok();
-            }
-            continue;
-        }
-        let v: Vec<f64> = l.split_whitespace().filter_map(|t| t.parse().ok()).collect();
-        if v.len() > 3 && mesh.is_none() && rows.is_empty() {
-            mesh = Some(v);
-        } else if v.len() == 3 {
-            rows.push([v[0], v[1], v[2]]);
-        } else {
-            return None;
-        }
-    }
-    let is_cube = |k: usize| {
-        let n = (k as f64).cbrt().round() as usize;
-        n * n * n == k
-    };
-    // A 3-entry input mesh (3³ lattice) looks like a data row: tell them apart by the count.
-    if mesh.is_none() && !is_cube(rows.len()) && rows.len() == 28 {
-        mesh = Some(rows.remove(0).to_vec());
-    }
-    let n = match &mesh {
-        Some(m) => m.len(),
-        None => (rows.len() as f64).cbrt().round() as usize,
-    };
-    if n < 2 || rows.len() != n * n * n {
-        return None;
-    }
-    let maxv = rows.iter().flat_map(|r| r.iter()).fold(0.0f64, |m, &v| m.max(v));
-    let out_max = match out_bits {
-        Some(b) if b > 0 && b < 32 => (1u64 << b) as f64 - 1.0,
-        _ => [255.0, 1023.0, 4095.0, 65535.0].into_iter().find(|&m| maxv <= m).unwrap_or(maxv.max(1.0)),
-    };
-    // .3dl rows: red slowest, blue fastest. Our lattice is red fastest.
-    let mut d3 = vec![[0.0f32; 3]; n * n * n];
-    for (k, r) in rows.iter().enumerate() {
-        let (ri, gi, bi) = (k / (n * n), (k / n) % n, k % n);
-        d3[ri + gi * n + bi * n * n] = r.map(|v| (v / out_max) as f32);
-    }
-    Some(Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] })
-}
-
-/// Parse a cineSpace `.csp` LUT (1D or 3D, with its three pre-LUT shapers).
-pub fn parse_csp(text: &str) -> Option<(Lut, [Vec<(f32, f32)>; 3])> {
-    let mut lines = text.lines().map(str::trim).filter(|l| !l.is_empty());
-    if !lines.next()?.starts_with("CSPLUTV100") {
-        return None;
-    }
-    let kind = lines.next()?;
-    let mut lines = lines.peekable();
-    if lines.peek().is_some_and(|l| l.starts_with("BEGIN METADATA")) {
-        for l in lines.by_ref() {
-            if l.starts_with("END METADATA") {
-                break;
-            }
-        }
-    }
-    let nums = |l: &str| -> Option<Vec<f32>> { l.split_whitespace().map(|t| t.parse().ok()).collect() };
-    let mut shaper: [Vec<(f32, f32)>; 3] = Default::default();
-    for ch in shaper.iter_mut() {
-        let n: usize = lines.next()?.parse().ok()?;
-        let ins = nums(lines.next()?)?;
-        let outs = nums(lines.next()?)?;
-        if ins.len() != n || outs.len() != n || n < 2 {
-            return None;
-        }
-        *ch = ins.into_iter().zip(outs).collect();
-    }
-    if kind.starts_with("3D") {
-        let sz = nums(lines.next()?)?;
-        if sz.len() != 3 || sz[0] != sz[1] || sz[1] != sz[2] {
-            return None;
-        }
-        let n = sz[0] as usize;
-        let mut d3 = Vec::with_capacity(n * n * n);
-        for _ in 0..n * n * n {
-            let v = nums(lines.next()?)?;
-            if v.len() != 3 {
-                return None;
-            }
-            d3.push([v[0], v[1], v[2]]);
-        }
-        (n >= 2).then_some((Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] }, shaper))
-    } else {
-        let n: usize = lines.next()?.parse().ok()?;
-        let mut d1 = Vec::with_capacity(n);
-        for _ in 0..n {
-            let v = nums(lines.next()?)?;
-            if v.len() != 3 {
-                return None;
-            }
-            d1.push([v[0], v[1], v[2]]);
-        }
-        (n >= 2).then_some((Lut { n1: n, d1, n3: 0, d3: vec![], dmin: [0.0; 3], dmax: [1.0; 3] }, shaper))
-    }
-}
-
-fn shape(curve: &[(f32, f32)], x: f32) -> f32 {
-    if curve.len() < 2 {
-        return x;
-    }
-    let i = curve.partition_point(|p| p.0 < x).clamp(1, curve.len() - 1);
-    let (a, b) = (curve[i - 1], curve[i]);
-    let t = ((x - a.0) / (b.0 - a.0).max(1e-12)).clamp(0.0, 1.0);
-    a.1 + (b.1 - a.1) * t
-}
-
-fn shape_inv(curve: &[(f32, f32)], y: f32) -> f32 {
-    let flipped: Vec<(f32, f32)> = curve.iter().map(|&(a, b)| (b, a)).collect();
-    shape(&flipped, y)
-}
-
-/// Parse transform text by its format (detected from `ext` or the content).
-pub fn parse_file(text: &str, ext: &str) -> Option<FileXform> {
-    let ext = ext.to_ascii_lowercase();
-    if ext == "cc" || ext == "ccc" || ext == "cdl" || text.contains("<ColorCorrection") {
-        let v = parse_cdl_xml(text);
-        return (!v.is_empty()).then_some(FileXform::Cdl(v));
-    }
-    if ext == "csp" || text.trim_start().starts_with("CSPLUTV100") {
-        return parse_csp(text).map(|(lut, s)| FileXform::Lut { lut, shaper: Some(s) });
-    }
-    if ext == "spimtx" {
-        return parse_spimtx(text);
-    }
-    if ext == "spi1d" || text.trim_start().starts_with("Version") {
-        return parse_spi1d(text).map(|lut| FileXform::Lut { lut, shaper: None });
-    }
-    if ext == "spi3d" || text.trim_start().starts_with("SPILUT") {
-        return parse_spi3d(text).map(|lut| FileXform::Lut { lut, shaper: None });
-    }
-    if ext == "cube" || text.contains("LUT_3D_SIZE") || text.contains("LUT_1D_SIZE") {
-        return parse_cube(text).map(|lut| FileXform::Lut { lut, shaper: None });
-    }
-    parse_3dl(text).map(|lut| FileXform::Lut { lut, shaper: None })
-}
-
-type FileCache = Mutex<HashMap<String, Option<Arc<FileXform>>>>;
-
-/// Load (and cache) a transform from a file path or inline content.
-pub fn load_file(src: &str) -> Option<Arc<FileXform>> {
-    let src_t = src.trim();
-    if src_t.is_empty() {
-        return None;
-    }
-    static CACHE: OnceLock<FileCache> = OnceLock::new();
-    let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new()));
-    if let Ok(m) = cache.lock()
-        && let Some(v) = m.get(src)
-    {
-        return v.clone();
-    }
-    let inline = src.contains('\n');
-    let parsed = if inline {
-        parse_file(src, "")
-    } else {
-        let ext = std::path::Path::new(src_t).extension().and_then(|e| e.to_str()).unwrap_or("");
-        std::fs::read_to_string(src_t).ok().and_then(|t| parse_file(&t, ext))
-    }
-    .map(Arc::new);
-    if let Ok(mut m) = cache.lock() {
-        m.insert(src.to_string(), parsed.clone());
-    }
-    parsed
-}
-
-impl FileXform {
-    pub fn apply(&self, c: [f32; 3], interp: u32, inverse: bool, ccc_id: &str) -> [f32; 3] {
-        match self {
-            FileXform::Cdl(list) => {
-                let cdl = list.iter().find(|(id, _)| !ccc_id.is_empty() && id == ccc_id).or(list.first()).map(|(_, c)| *c).unwrap_or_default();
-                let c64 = c.map(|v| v as f64);
-                let o = if inverse { cdl.invert(c64, true) } else { cdl.apply(c64, true) };
-                o.map(|v| v as f32)
-            }
-            FileXform::Matrix { m, offset } => crate::ocio_config::matrix_apply(m, offset, c.map(|v| v as f64), inverse).map(|v| v as f32),
-            FileXform::Lut { lut, shaper } => {
-                let fwd = |c: [f32; 3]| {
-                    let c = match shaper {
-                        Some(s) => [shape(&s[0], c[0]), shape(&s[1], c[1]), shape(&s[2], c[2])],
-                        None => c,
-                    };
-                    lut.apply_interp(c, interp)
-                };
-                if !inverse {
-                    return fwd(c);
-                }
-                if lut.n3 == 0 {
-                    // 1D: invert each channel exactly through the (monotone) tables.
-                    let mut x = c;
-                    if lut.n1 > 1 {
-                        x = [0, 1, 2].map(|i| {
-                            let curve: Vec<(f32, f32)> =
-                                (0..lut.n1).map(|k| (lut.d1[k][i], lut.dmin[i] + (lut.dmax[i] - lut.dmin[i]) * k as f32 / (lut.n1 - 1) as f32)).collect();
-                            shape(&curve, c[i])
-                        });
-                    }
-                    if let Some(s) = shaper {
-                        x = [shape_inv(&s[0], x[0]), shape_inv(&s[1], x[1]), shape_inv(&s[2], x[2])];
-                    }
-                    return x;
-                }
-                // 3D: damped fixed-point (Newton with an identity Jacobian) from the target.
-                let mut x = c;
-                for _ in 0..40 {
-                    let y = fwd(x);
-                    let e = [c[0] - y[0], c[1] - y[1], c[2] - y[2]];
-                    if e.iter().all(|v| v.abs() < 1e-6) {
-                        break;
-                    }
-                    x = [x[0] + e[0], x[1] + e[1], x[2] + e[2]];
-                }
-                x
-            }
-        }
-    }
-}
-
-// ---------------------------------------------------------------- displays, views and looks
-
-/// Displays of the built-in config: (name, display primaries/white, encoding).
-pub const DISPLAYS: &[(&str, [[f64; 2]; 3], Tf)] =
-    &[("sRGB", REC709, Tf::Srgb), ("Rec.1886 Rec.709", REC709, Tf::Gamma(2.4)), ("Display P3", P3, Tf::Srgb), ("Rec.2100-PQ", REC2020, Tf::Pq)];
-
-pub const VIEWS: &[&str] = &["Standard", "Tone Mapped", "Raw"];
-
-/// Configuration popup: the built-in config, or a custom `.ocio` file (Config File: a path or
-/// the config's text; spaces chosen by name, see [`crate::ocio_config`]).
-pub const CONFIGS: &[&str] = &["Built-in (EffectCraft minimal)", "Custom (.ocio file)"];
-
-/// Built-in looks: CDLs applied in ACEScct.
-pub fn looks() -> Vec<(&'static str, Cdl)> {
-    let grey = 0.413_588_402_492_442_1; // ACEScct of 0.18
-    let c = |slope: [f64; 3], offset: [f64; 3], sat: f64| Cdl { slope, offset, power: [1.0; 3], sat };
-    vec![
-        ("Warm", c([1.04, 1.0, 0.94], [0.0; 3], 1.0)),
-        ("Cool", c([0.95, 1.0, 1.06], [0.0; 3], 1.0)),
-        ("High Contrast", c([1.25; 3], [grey * (1.0 - 1.25); 3], 1.0)),
-        ("Low Contrast", c([0.8; 3], [grey * (1.0 - 0.8); 3], 1.0)),
-        ("Desaturated", c([1.0; 3], [0.0; 3], 0.6)),
-        ("Vivid", c([1.0; 3], [0.0; 3], 1.3)),
-    ]
-}
-
-/// Extended Reinhard roll-off (white point 16): maps 0..∞ into 0..1, ≈ identity near 0.
-fn tonemap(v: f64) -> f64 {
-    let w2 = 256.0;
-    if v <= 0.0 { v } else { v * (1.0 + v / w2) / (1.0 + v) }
-}
-
-fn tonemap_inv(y: f64) -> f64 {
-    if y <= 0.0 {
-        return y;
-    }
-    // Solve v² / w² + v (1 − y) − y = 0.
-    let (a, b, c) = (1.0 / 256.0, 1.0 - y, -y);
-    (-b + (b * b - 4.0 * a * c).sqrt()) / (2.0 * a)
-}
-
-/// Display transform of an input-space colour (`inverse`: display code values → input space).
-pub fn display_xform(input: &Space, display: usize, view: usize, inverse: bool) -> impl Fn([f32; 3]) -> [f32; 3] + Sync {
-    let (_, prims, tf) = DISPLAYS[display.min(DISPLAYS.len() - 1)];
-    let disp = Space { name: "display", prims: Some((prims, D65)), tf: Tf::Linear, raw: false };
-    let raw = view == 2 || input.raw;
-    let m_in = Xform::new(&Space { tf: Tf::Linear, ..*input }, &disp);
-    let m_out = Xform::new(&disp, &Space { tf: Tf::Linear, ..*input });
-    let in_tf = input.tf;
-    move |c: [f32; 3]| {
-        if raw {
-            return c;
-        }
-        if !inverse {
-            let lin = c.map(|v| in_tf.decode(v as f64) as f32);
-            let d = m_in.apply(lin);
-            d.map(|v| {
-                let v = v as f64;
-                let v = if view == 1 { tonemap(v) } else { v };
-                tf.encode(v) as f32
-            })
-        } else {
-            let d = c.map(|v| {
-                let l = tf.decode(v as f64);
-                (if view == 1 { tonemap_inv(l) } else { l }) as f32
-            });
-            m_out.apply(d).map(|v| in_tf.encode(v as f64) as f32)
-        }
-    }
-}
-
-// ---------------------------------------------------------------- effects
-
-fn spec(id: &'static str, name: &'static str, cat: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
-    EffectSpec { id, name, category: cat, params, render, gpu: false, float: true }
-}
-
-fn space_param(id: &'static str, name: &'static str, default: u32) -> crate::ParamSpec {
-    p(id, name, Value::Enum(default), popup(&space_names()))
-}
-
-fn direction() -> crate::ParamSpec {
-    p("direction", "Direction", Value::Enum(0), popup(&["Forward", "Inverse"]))
-}
-
-fn map_px(b: &mut Buf, f: impl Fn([f32; 3]) -> [f32; 3] + Sync) {
-    b.img.data.par_iter_mut().for_each(|px| {
-        let (c, a) = unpremul(*px);
-        if a <= 0.0 {
-            return;
-        }
-        let o = f(c);
-        *px = [o[0] * a, o[1] * a, o[2] * a, a];
-    });
-}
-
-fn space_at(i: u32) -> &'static Space {
-    &SPACES[(i as usize).min(SPACES.len() - 1)]
-}
-
-/// The effects that take Configuration ▸ Custom (a `.ocio` file).
-pub(crate) const CUSTOM_CONFIG_FX: [&str; 2] = ["ec.color.ociocolorspace", "ec.color.ociodisplay"];
-
-/// Effect `id`'s transform under Configuration ▸ Custom: the config's conversion from the source
-/// space to the destination space (Color Space Transform) or through a display's view (Display
-/// Transform), see [`crate::ocio_config`]. `Ok(None)` with the built-in configuration; an error
-/// (the pixels pass through) when the config can't be read or has no such colour space.
-fn custom_xf(id: &str, pr: &crate::Params) -> Result<Option<crate::ocio_config::Xf>, String> {
-    use crate::ocio_config::Xf;
-    if !CUSTOM_CONFIG_FX.contains(&id) || pr.e("config") != 1 {
-        return Ok(None);
-    }
-    let cfg = crate::ocio_config::load_config(pr.s("configFile")).map_err(|e| format!("Can't read the OCIO config: {e}"))?;
-    // A space by its typed name, else by the built-in popup's name.
-    let space = |name: &str, popup: u32| {
-        let name = if name.trim().is_empty() { space_at(popup).name } else { name.trim() };
-        cfg.space(name).ok_or_else(|| format!("The OCIO config has no color space `{name}`"))
-    };
-    let a = space(pr.s("sourceName"), pr.e("source"))?;
-    let inverse = pr.e("direction") == 1;
-    if id == "ec.color.ociodisplay" {
-        let (dn, vn) = display_view_names(pr);
-        let xf = cfg.display_path(a, dn, vn);
-        return Ok(Some(if inverse { Xf::Inverse(Box::new(xf)) } else { xf }));
-    }
-    let z = space(pr.s("destinationName"), pr.e("destination"))?;
-    // Inverse: the conversion the other way (OCIO's inverse ColorSpaceTransform).
-    Ok(Some(if inverse { cfg.path(z, a) } else { cfg.path(a, z) }))
-}
-
-/// The display and view a Display Transform names: the typed names, else the popups'.
-fn display_view_names(pr: &crate::Params) -> (&str, &str) {
-    let display = DISPLAYS.get(pr.e("display") as usize).map_or("", |d| d.0);
-    let view = VIEWS.get(pr.e("view") as usize).copied().unwrap_or("");
-    let typed = |k: &str, popup| if pr.s(k).trim().is_empty() { popup } else { pr.s(k).trim() };
-    (typed("displayName", display), typed("viewName", view))
-}
-
-/// Effect Controls' warning for effect `id`: a custom OCIO configuration that can't be read, has
-/// no such colour space, display or view, or uses transforms EffectCraft can't apply (colours
-/// pass through those steps, #410). `None` when the effect renders as asked.
-pub fn warning(id: &str, pr: &crate::Params) -> Option<String> {
-    let xf = match custom_xf(id, pr) {
-        Ok(x) => x?,
-        Err(e) => return Some(format!("{e}: the colors pass through.")),
-    };
-    let mut notes = vec![];
-    if id == "ec.color.ociodisplay"
-        && let Ok(cfg) = crate::ocio_config::load_config(pr.s("configFile"))
-    {
-        let (dn, vn) = display_view_names(pr);
-        if let Some((d, v)) = cfg.view(dn, vn)
-            && (!d.eq_ignore_ascii_case(dn) || !v.name.eq_ignore_ascii_case(vn))
-        {
-            notes.push(format!("The OCIO config has no display `{dn}` with a view `{vn}`: showing {d} / {}.", v.name));
-        }
-    }
-    let missing = xf.unsupported_list();
-    if !missing.is_empty() {
-        notes.push(format!("Not supported, the colors pass through: {}.", missing.join(", ")));
-    }
-    (!notes.is_empty()).then(|| notes.join(" "))
-}
-
-/// Configuration ▸ Custom: render through the config's transform. `false` with the built-in
-/// configuration (the caller renders it).
-fn custom_render(id: &str, ctx: &EffectCtx, b: &mut Buf) -> bool {
-    match custom_xf(id, ctx.params) {
-        Ok(None) => false,
-        Ok(Some(xf)) => {
-            map_px(b, |c| xf.apply(c.map(|v| v as f64), false).map(|v| v as f32));
-            true
-        }
-        // A config that can't be read, or an unknown space: the pixels pass through.
-        Err(_) => true,
-    }
-}
-
-fn ocio_cst(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    if custom_render("ec.color.ociocolorspace", ctx, &mut b) {
-        return b;
-    }
-    let (a, z) = (space_at(ctx.params.e("source")), space_at(ctx.params.e("destination")));
-    let (a, z) = if ctx.params.e("direction") == 1 { (z, a) } else { (a, z) };
-    if a.name == z.name {
-        return b;
-    }
-    let x = Xform::new(a, z);
-    map_px(&mut b, |c| x.apply(c));
-    b
-}
-
-fn cdl_from_params(pr: &crate::Params) -> Cdl {
-    Cdl {
-        slope: [pr.f("slopeRed"), pr.f("slopeGreen"), pr.f("slopeBlue")],
-        offset: [pr.f("offsetRed"), pr.f("offsetGreen"), pr.f("offsetBlue")],
-        power: [pr.f("powerRed").max(0.0), pr.f("powerGreen").max(0.0), pr.f("powerBlue").max(0.0)],
-        sat: pr.f("saturation").max(0.0),
-    }
-}
-
-fn ocio_cdl(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let cdl = cdl_from_params(ctx.params);
-    if cdl == Cdl::default() {
-        return b;
-    }
-    let clamp = ctx.params.e("style") == 0;
-    let inv = ctx.params.e("direction") == 1;
-    map_px(&mut b, |c| {
-        let c = c.map(|v| v as f64);
-        let o = if inv { cdl.invert(c, clamp) } else { cdl.apply(c, clamp) };
-        o.map(|v| v as f32)
-    });
-    b
-}
-
-fn ocio_display(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    if custom_render("ec.color.ociodisplay", ctx, &mut b) {
-        return b;
-    }
-    let input = space_at(ctx.params.e("source"));
-    let f = display_xform(input, ctx.params.e("display") as usize, ctx.params.e("view") as usize, ctx.params.e("direction") == 1);
-    map_px(&mut b, f);
-    b
-}
-
-fn ocio_file(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let Some(x) = load_file(ctx.params.s("file")) else { return b };
-    let interp = match ctx.params.e("interpolation") {
-        0 => 0,
-        1 => 1,
-        _ => 2,
-    };
-    let inv = ctx.params.e("direction") == 1;
-    let id = ctx.params.s("cccId").to_string();
-    map_px(&mut b, |c| x.apply(c, interp, inv, &id));
-    b
-}
-
-/// Parse a looks string: comma/space separated names, `-Name` = inverse.
-pub fn parse_looks(s: &str) -> Vec<(Cdl, bool)> {
-    let all = looks();
-    s.split([',', ':'])
-        .map(str::trim)
-        .filter(|t| !t.is_empty())
-        .filter_map(|t| {
-            let (inv, n) = match t.strip_prefix('-') {
-                Some(r) => (true, r.trim()),
-                None => (false, t.trim_start_matches('+').trim()),
-            };
-            all.iter().find(|(name, _)| name.eq_ignore_ascii_case(n)).map(|(_, c)| (*c, inv))
-        })
-        .collect()
-}
-
-fn ocio_look(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let mut list = parse_looks(ctx.params.s("looks"));
-    let pick = ctx.params.e("look");
-    if pick > 0
-        && let Some((_, c)) = looks().get(pick as usize - 1)
-    {
-        list.insert(0, (*c, false));
-    }
-    if list.is_empty() {
-        return b;
-    }
-    let (src, dst) = (space_at(ctx.params.e("source")), space_at(ctx.params.e("destination")));
-    let inv = ctx.params.e("direction") == 1;
-    let cct = &ACES_CCT;
-    let (a, z) = if inv { (dst, src) } else { (src, dst) };
-    let to_p = Xform::new(a, cct);
-    let from_p = Xform::new(cct, z);
-    if inv {
-        list.reverse();
-    }
-    map_px(&mut b, |c| {
-        let mut v = to_p.apply(c).map(|x| x as f64);
-        for (cdl, li) in &list {
-            v = if *li != inv { cdl.invert(v, false) } else { cdl.apply(v, false) };
-        }
-        from_p.apply(v.map(|x| x as f32))
-    });
-    b
-}
-
-// ---- Color Profile Converter (Utility)
-
-pub const PROFILES: &[&str] = &["Project Working Space", "sRGB IEC61966-2.1", "HDTV (Rec. 709)", "Rec. 2020", "Display P3", "ACEScg", "ACES2065-1"];
-
-fn profile(ctx: &EffectCtx, i: u32) -> (Space, bool) {
-    let ws = |cs: ColorSpace| match cs {
-        ColorSpace::Srgb => sp("sRGB", REC709, D65, Tf::Srgb),
-        ColorSpace::Rec709 => sp("Rec.709", REC709, D65, Tf::Gamma(2.4)),
-        ColorSpace::Rec2020 => sp("Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
-        ColorSpace::DisplayP3 => sp("Display P3", P3, D65, Tf::Srgb),
-        ColorSpace::AcesCg => ACES_CG,
-        ColorSpace::Aces2065 => ACES2065_1,
-        // HDR encodings are output spaces, never a working space.
-        ColorSpace::Rec2100Pq | ColorSpace::Rec2100Hlg => sp("Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
-    };
-    match i {
-        0 => (ws(ctx.env.working_space.unwrap_or(ColorSpace::Srgb)), ctx.env.working_linear),
-        1 => (ws(ColorSpace::Srgb), false),
-        2 => (ws(ColorSpace::Rec709), false),
-        3 => (ws(ColorSpace::Rec2020), false),
-        4 => (ws(ColorSpace::DisplayP3), false),
-        5 => (ACES_CG, true),
-        _ => (ACES2065_1, true),
-    }
-}
-
-/// Gamut compression for the perceptual intent: pull out-of-gamut (negative) colours toward
-/// their luminance just enough to bring every channel to ≥ 0, rolling off smoothly.
-fn compress_gamut(c: [f64; 3], luma: [f64; 3]) -> [f64; 3] {
-    let l = c[0] * luma[0] + c[1] * luma[1] + c[2] * luma[2];
-    if l <= 0.0 {
-        return c.map(|v| v.max(0.0));
-    }
-    let mn = c.iter().cloned().fold(f64::INFINITY, f64::min);
-    if mn >= 0.0 {
-        return c;
-    }
-    // Fraction of the way toward grey that reaches zero on the most negative channel.
-    let t = (l / (l - mn)).clamp(0.0, 1.0);
-    c.map(|v| l + (v - l) * t)
-}
-
-fn profile_converter(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let (inp, in_lin_default) = profile(ctx, ctx.params.e("inputProfile"));
-    let (out, out_lin_default) = profile(ctx, ctx.params.e("outputProfile"));
-    let in_lin = ctx.params.b("linearizeInputProfile") || in_lin_default && ctx.params.e("inputProfile") == 0;
-    let out_lin = ctx.params.b("linearizeOutputProfile") || out_lin_default && ctx.params.e("outputProfile") == 0;
-    let intent = ctx.params.e("intent");
-    let dec = if in_lin { Tf::Linear } else { inp.tf };
-    let enc = if out_lin { Tf::Linear } else { out.tf };
-    // Absolute colorimetric keeps the source white (no adaptation); the others adapt.
-    let m = if intent == 3 { mul(&invert(&out.to_ref(false)), &inp.to_ref(false)) } else { matrix(&inp, &out) };
-    let identity = dec == enc && (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-9));
-    if identity {
-        return b;
-    }
-    let out_luma = out.to_ref(true)[1];
-    map_px(&mut b, |c| {
-        let l = c.map(|v| dec.decode(v as f64));
-        let mut o = mul_vec(&m, l);
-        match intent {
-            0 => o = compress_gamut(o, out_luma),
-            2 => o = o.map(|v| v.max(0.0)),
-            _ => {}
-        }
-        o.map(|v| enc.encode(v) as f32)
-    });
-    b
-}
-
-// ---- Colour programs (the GPU compositor's colour-management kernels)
-
-/// One per-pixel step of a colour transform, in the order the CPU effect applies them (see
-/// [`color_program`]).
-#[derive(Clone, Debug)]
-pub enum ColorOp {
-    /// Transfer function, encoded → linear.
-    Decode(Tf),
-    /// Transfer function, linear → encoded.
-    Encode(Tf),
-    /// Linear-RGB matrix.
-    Matrix([[f32; 3]; 3]),
-    /// ASC CDL (forward or exact inverse; `clamp` = the v1.2 style).
-    Cdl { cdl: Cdl, clamp: bool, inverse: bool },
-    /// The Tone Mapped view's roll-off (or its inverse).
-    Tonemap { inverse: bool },
-    /// Color Profile Converter's perceptual gamut compression toward luminance `luma`.
-    Gamut([f64; 3]),
-    /// Negative channels to 0 (the saturation intent).
-    Max0,
-    /// A LUT (0 nearest, 1 trilinear, 2 tetrahedral) with an optional per-channel shaper, forward
-    /// or inverse (as [`FileXform::apply`]).
-    Lut { lut: Arc<Lut>, shaper: Option<Arc<[Vec<(f32, f32)>; 3]>>, interp: u32, inverse: bool },
-    /// `m × (c + pre) + post` (a custom config's MatrixTransform and RangeTransform).
-    Affine { m: [[f32; 3]; 3], pre: [f32; 3], post: [f32; 3] },
-    /// `max(c, 0) ^ p` per channel (ExponentTransform).
-    Pow([f32; 3]),
-    /// LogTransform / LogAffineTransform, forward or inverse (as `ocio_config::Xf::apply`).
-    LogAffine { base: f32, log_slope: [f32; 3], log_offset: [f32; 3], lin_slope: [f32; 3], lin_offset: [f32; 3], inverse: bool },
-    /// ExponentWithLinearTransform, forward (decode) or inverse (as
-    /// [`crate::ocio_config::moncurve`]).
-    MonCurve { gamma: [f32; 3], offset: [f32; 3], inverse: bool, mirror: bool },
-    /// Clamp each channel to `lo..=hi` (a clamping RangeTransform; ±`f32::MAX` = unbounded).
-    Clamp { lo: [f32; 3], hi: [f32; 3] },
-}
-
-/// The ops of a matrix-and-offset transform (MatrixTransform, `.spimtx`), forward or inverse
-/// (as [`crate::ocio_config::matrix_apply`]).
-fn matrix_ops(m: &[f64; 16], offset: &[f64; 4], inverse: bool, ops: &mut Vec<ColorOp>) {
-    if !inverse {
-        let m = [0, 1, 2].map(|r| [m[r * 4] as f32, m[r * 4 + 1] as f32, m[r * 4 + 2] as f32]);
-        ops.push(ColorOp::Affine { m, pre: [0.0; 3], post: [offset[0] as f32, offset[1] as f32, offset[2] as f32] });
-    } else if let Some(inv) = crate::ocio_config::mat3_inverse(m) {
-        let m = inv.map(|r| r.map(|v| v as f32));
-        ops.push(ColorOp::Affine { m, pre: [-offset[0] as f32, -offset[1] as f32, -offset[2] as f32], post: [0.0; 3] });
-    }
-}
-
-/// The ops of a LUT / CDL / matrix file transform (as [`FileXform::apply`]).
-fn file_ops(x: &FileXform, interp: u32, inverse: bool, ccc_id: &str, ops: &mut Vec<ColorOp>) {
-    match x {
-        FileXform::Cdl(list) => {
-            let cdl = list.iter().find(|(i, _)| !ccc_id.is_empty() && i == ccc_id).or(list.first()).map(|(_, c)| *c).unwrap_or_default();
-            ops.push(ColorOp::Cdl { cdl, clamp: true, inverse });
-        }
-        FileXform::Lut { lut, shaper } => {
-            ops.push(ColorOp::Lut { lut: Arc::new(lut.clone()), shaper: shaper.clone().map(Arc::new), interp, inverse });
-        }
-        FileXform::Matrix { m, offset } => matrix_ops(m, offset, inverse, ops),
-    }
-}
-
-/// The ops of a custom config's transform `x` (as `Xf::apply`).
-fn config_xf_ops(x: &crate::ocio_config::Xf, inverse: bool, ops: &mut Vec<ColorOp>) {
-    use crate::ocio_config::Xf;
-    let f3 = |v: &[f64; 3]| v.map(|x| x as f32);
-    match x {
-        Xf::Inverse(x) => config_xf_ops(x, !inverse, ops),
-        Xf::Matrix { m, offset } => matrix_ops(m, offset, inverse, ops),
-        Xf::File { xf: Some(x), interp, ccc, .. } => file_ops(x, *interp, inverse, ccc, ops),
-        Xf::ExponentLinear { gamma, offset, mirror } => ops.push(ColorOp::MonCurve { gamma: f3(gamma), offset: f3(offset), inverse, mirror: *mirror }),
-        // A BuiltinTransform's curve: forward decodes.
-        Xf::Curve(tf) => ops.push(if inverse { ColorOp::Encode(*tf) } else { ColorOp::Decode(*tf) }),
-        Xf::Named(_) => {}
-        Xf::File { xf: None, .. } | Xf::Unsupported(_) => {}
-        Xf::Exponent(e) => ops.push(ColorOp::Pow([0, 1, 2].map(|k| (if inverse { 1.0 / e[k].max(1e-9) } else { e[k] }) as f32))),
-        Xf::Log { base } => {
-            ops.push(ColorOp::LogAffine { base: *base as f32, log_slope: [1.0; 3], log_offset: [0.0; 3], lin_slope: [1.0; 3], lin_offset: [0.0; 3], inverse })
-        }
-        Xf::LogAffine { base, log_slope, log_offset, lin_slope, lin_offset } => ops.push(ColorOp::LogAffine {
-            base: *base as f32,
-            log_slope: f3(log_slope),
-            log_offset: f3(log_offset),
-            lin_slope: f3(lin_slope),
-            lin_offset: f3(lin_offset),
-            inverse,
-        }),
-        Xf::Cdl(cdl) => ops.push(ColorOp::Cdl { cdl: *cdl, clamp: true, inverse }),
-        Xf::Range(r) => {
-            let (k, off, lo, hi) = r.parts(inverse);
-            let k = k as f32;
-            ops.push(ColorOp::Affine { m: [[k, 0.0, 0.0], [0.0, k, 0.0], [0.0, 0.0, k]], pre: [0.0; 3], post: [off as f32; 3] });
-            if lo.is_finite() || hi.is_finite() {
-                let bound = |v: f64| (v as f32).clamp(-f32::MAX, f32::MAX);
-                ops.push(ColorOp::Clamp { lo: [bound(lo); 3], hi: [bound(hi); 3] });
-            }
-        }
-        Xf::Group(list) => {
-            if inverse {
-                list.iter().rev().for_each(|x| config_xf_ops(x, true, ops));
-            } else {
-                list.iter().for_each(|x| config_xf_ops(x, false, ops));
-            }
-        }
-    }
-}
-
-/// How a colour program meets premultiplied pixels.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Straight {
-    /// `unpremul` (colour 0 below alpha 1e-6); fully transparent pixels untouched (OCIO effects).
-    Unpremul,
-    /// Colour ÷ alpha; fully transparent pixels untouched (`Image::map_straight`, Apply Color LUT).
-    Divide,
-}
-
-fn xform_ops(x: &Xform, ops: &mut Vec<ColorOp>) {
-    if x.dec != Tf::Linear {
-        ops.push(ColorOp::Decode(x.dec));
-    }
-    if !x.ident {
-        ops.push(ColorOp::Matrix(x.m));
-    }
-    if x.enc != Tf::Linear {
-        ops.push(ColorOp::Encode(x.enc));
-    }
-}
-
-/// Effect `id`'s per-pixel transform as a list of [`ColorOp`]s that reproduces the CPU effect
-/// (empty = the layer passes through; custom OCIO configs compile their transforms too). `None`
-/// for another effect.
-pub fn color_program(id: &str, ctx: &EffectCtx) -> Option<(Vec<ColorOp>, Straight)> {
-    let pr = ctx.params;
-    let mut ops = vec![];
-    // Configuration ▸ Custom compiles the config's transforms (a config that can't be read, or
-    // names unknown spaces, passes the pixels through).
-    match custom_xf(id, pr) {
-        Ok(None) => {}
-        Ok(Some(xf)) => {
-            config_xf_ops(&xf, false, &mut ops);
-            return Some((ops, Straight::Unpremul));
-        }
-        Err(_) => return Some((ops, Straight::Unpremul)),
-    }
-    match id {
-        "ec.utility.applylut" => {
-            if let Some(lut) = crate::utility::load_lut(pr.s("lut")) {
-                ops.push(ColorOp::Lut { lut, shaper: None, interp: 2, inverse: false });
-            }
-            return Some((ops, Straight::Divide));
-        }
-        "ec.color.ociocolorspace" => {
-            let (a, z) = (space_at(pr.e("source")), space_at(pr.e("destination")));
-            let (a, z) = if pr.e("direction") == 1 { (z, a) } else { (a, z) };
-            if a.name != z.name {
-                xform_ops(&Xform::new(a, z), &mut ops);
-            }
-        }
-        "ec.color.ociocdl" => {
-            let cdl = cdl_from_params(pr);
-            if cdl != Cdl::default() {
-                ops.push(ColorOp::Cdl { cdl, clamp: pr.e("style") == 0, inverse: pr.e("direction") == 1 });
-            }
-        }
-        "ec.color.ociodisplay" => {
-            let input = space_at(pr.e("source"));
-            let (display, view, inverse) = (pr.e("display") as usize, pr.e("view") as usize, pr.e("direction") == 1);
-            let (_, prims, tf) = DISPLAYS[display.min(DISPLAYS.len() - 1)];
-            if view != 2 && !input.raw {
-                let disp = Space { name: "display", prims: Some((prims, D65)), tf: Tf::Linear, raw: false };
-                let lin = Space { tf: Tf::Linear, ..*input };
-                if !inverse {
-                    ops.push(ColorOp::Decode(input.tf));
-                    xform_ops(&Xform::new(&lin, &disp), &mut ops);
-                    if view == 1 {
-                        ops.push(ColorOp::Tonemap { inverse: false });
-                    }
-                    ops.push(ColorOp::Encode(tf));
-                } else {
-                    ops.push(ColorOp::Decode(tf));
-                    if view == 1 {
-                        ops.push(ColorOp::Tonemap { inverse: true });
-                    }
-                    xform_ops(&Xform::new(&disp, &lin), &mut ops);
-                    ops.push(ColorOp::Encode(input.tf));
-                }
-            }
-        }
-        "ec.color.ociofile" => {
-            if let Some(x) = load_file(pr.s("file")) {
-                let interp = match pr.e("interpolation") {
-                    0 => 0,
-                    1 => 1,
-                    _ => 2,
-                };
-                file_ops(&x, interp, pr.e("direction") == 1, pr.s("cccId"), &mut ops);
-            }
-        }
-        "ec.color.ociolook" => {
-            let mut list = parse_looks(pr.s("looks"));
-            let pick = pr.e("look");
-            if pick > 0
-                && let Some((_, c)) = looks().get(pick as usize - 1)
-            {
-                list.insert(0, (*c, false));
-            }
-            if !list.is_empty() {
-                let (src, dst) = (space_at(pr.e("source")), space_at(pr.e("destination")));
-                let inv = pr.e("direction") == 1;
-                let cct = &ACES_CCT;
-                let (a, z) = if inv { (dst, src) } else { (src, dst) };
-                if inv {
-                    list.reverse();
-                }
-                xform_ops(&Xform::new(a, cct), &mut ops);
-                for (cdl, li) in &list {
-                    ops.push(ColorOp::Cdl { cdl: *cdl, clamp: false, inverse: *li != inv });
-                }
-                xform_ops(&Xform::new(cct, z), &mut ops);
-            }
-        }
-        "ec.utility.colorprofileconverter" => {
-            let (inp, in_lin_default) = profile(ctx, pr.e("inputProfile"));
-            let (out, out_lin_default) = profile(ctx, pr.e("outputProfile"));
-            let in_lin = pr.b("linearizeInputProfile") || in_lin_default && pr.e("inputProfile") == 0;
-            let out_lin = pr.b("linearizeOutputProfile") || out_lin_default && pr.e("outputProfile") == 0;
-            let intent = pr.e("intent");
-            let dec = if in_lin { Tf::Linear } else { inp.tf };
-            let enc = if out_lin { Tf::Linear } else { out.tf };
-            let m = if intent == 3 { mul(&invert(&out.to_ref(false)), &inp.to_ref(false)) } else { matrix(&inp, &out) };
-            let identity = dec == enc && (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-9));
-            if !identity {
-                ops.push(ColorOp::Decode(dec));
-                ops.push(ColorOp::Matrix(m.map(|r| r.map(|v| v as f32))));
-                match intent {
-                    0 => ops.push(ColorOp::Gamut(out.to_ref(true)[1])),
-                    2 => ops.push(ColorOp::Max0),
-                    _ => {}
-                }
-                ops.push(ColorOp::Encode(enc));
-            }
-        }
-        _ => return None,
-    }
-    Some((ops, Straight::Unpremul))
-}
-
-// ---- Color Stabilizer
-
-/// Mean straight colour of a square (half-size `r` layer pixels) around layer point `pt`.
-fn sample_mean(b: &Buf, pt: [f64; 2], r: f64) -> [f64; 3] {
-    let (cx, cy) = b.to_px(pt);
-    let rr = (r * b.scale).max(0.5);
-    let (x0, x1) = ((cx - rr).floor().max(0.0) as i64, ((cx + rr).ceil() as i64).min(b.img.width as i64));
-    let (y0, y1) = ((cy - rr).floor().max(0.0) as i64, ((cy + rr).ceil() as i64).min(b.img.height as i64));
-    let mut acc = [0.0f64; 4];
-    for y in y0..y1 {
-        for x in x0..x1 {
-            let p = b.img.get(x, y);
-            for k in 0..4 {
-                acc[k] += p[k] as f64;
-            }
-        }
-    }
-    if acc[3] <= 1e-9 {
-        return [0.0; 3];
-    }
-    [acc[0] / acc[3], acc[1] / acc[3], acc[2] / acc[3]]
-}
-
-/// Monotone piecewise-quadratic curve through (0,0), three samples and (1,1) (linear between
-/// them is enough for a stabiliser and stays monotone).
-fn curve3(xs: [f64; 3], ys: [f64; 3], v: f64) -> f64 {
-    let mut pts = vec![(0.0, 0.0)];
-    let mut pairs: Vec<(f64, f64)> = xs.iter().cloned().zip(ys.iter().cloned()).collect();
-    pairs.sort_by(|a, b| a.0.total_cmp(&b.0));
-    for (x, y) in pairs {
-        if pts.last().is_some_and(|l| x > l.0 + 1e-4) && x < 1.0 - 1e-4 {
-            pts.push((x, y));
-        }
-    }
-    pts.push((1.0, 1.0));
-    let i = pts.partition_point(|p| p.0 < v).clamp(1, pts.len() - 1);
-    let (a, c) = (pts[i - 1], pts[i]);
-    a.1 + (c.1 - a.1) * (v - a.0) / (c.0 - a.0).max(1e-9)
-}
-
-/// Color Stabilizer's correction of buffer `b` as one piecewise-linear map per channel (points
-/// with increasing x; the end segments extend), the same maps [`color_stabilizer`] applies.
-/// `None` without a host or reference frame (the layer passes through). (The GPU effect.)
-pub fn color_stabilizer_maps(ctx: &EffectCtx, b: &Buf) -> Option<[Vec<(f64, f64)>; 3]> {
-    let reference = ctx.env.host?.self_at(ctx.params.f("referenceFrame"), ctx.env.effect_index)?;
-    let r = ctx.params.f("sampleSize").max(0.5);
-    let pts = [ctx.params.v2("blackPoint"), ctx.params.v2("midPoint"), ctx.params.v2("whitePoint")];
-    let cur = pts.map(|pt| sample_mean(b, pt, r));
-    let refv = pts.map(|pt| sample_mean(&reference, pt, r));
-    let mode = ctx.params.e("stabilize");
-    Some([0, 1, 2].map(|k| {
-        let offset = |c0: f64, r0: f64| vec![(0.0, r0 - c0), (1.0, 1.0 + r0 - c0)];
-        match mode {
-            0 => offset(cur[0][k], refv[0][k]),
-            1 => {
-                let (c0, c1, r0, r1) = (cur[0][k], cur[2][k], refv[0][k], refv[2][k]);
-                if (c1 - c0).abs() < 1e-6 {
-                    offset(c0, r0)
-                } else if c0 < c1 {
-                    vec![(c0, r0), (c1, r1)]
-                } else {
-                    vec![(c1, r1), (c0, r0)]
-                }
-            }
-            _ => {
-                let mut v = vec![(0.0, 0.0)];
-                let mut pairs: Vec<(f64, f64)> = (0..3).map(|i| (cur[i][k], refv[i][k])).collect();
-                pairs.sort_by(|a, b| a.0.total_cmp(&b.0));
-                for (x, y) in pairs {
-                    if v.last().is_some_and(|l| x > l.0 + 1e-4) && x < 1.0 - 1e-4 {
-                        v.push((x, y));
-                    }
-                }
-                v.push((1.0, 1.0));
-                v
-            }
-        }
-    }))
-}
-
-fn color_stabilizer(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let Some(host) = ctx.env.host else { return b };
-    let Some(reference) = host.self_at(ctx.params.f("referenceFrame"), ctx.env.effect_index) else { return b };
-    let r = ctx.params.f("sampleSize").max(0.5);
-    let pts = [ctx.params.v2("blackPoint"), ctx.params.v2("midPoint"), ctx.params.v2("whitePoint")];
-    let cur = pts.map(|pt| sample_mean(&b, pt, r));
-    let refv = pts.map(|pt| sample_mean(&reference, pt, r));
-    let mode = ctx.params.e("stabilize");
-    map_px(&mut b, |c| {
-        [0, 1, 2].map(|k| {
-            let v = c[k] as f64;
-            let o = match mode {
-                // Brightness: one sample (black point) — offset each channel.
-                0 => v + refv[0][k] - cur[0][k],
-                // Levels: black and white samples — linear map per channel.
-                1 => {
-                    let (c0, c1, r0, r1) = (cur[0][k], cur[2][k], refv[0][k], refv[2][k]);
-                    if (c1 - c0).abs() < 1e-6 { v + r0 - c0 } else { r0 + (v - c0) * (r1 - r0) / (c1 - c0) }
-                }
-                // Curves: three samples — a curve through them per channel.
-                _ => curve3([cur[0][k], cur[1][k], cur[2][k]], [refv[0][k], refv[1][k], refv[2][k]], v),
-            };
-            o as f32
-        })
-    });
-    b
-}
-
-fn sl(lo: f64, hi: f64, smin: f64, smax: f64) -> ParamUi {
-    slider(lo, hi, smin, smax, 3)
-}
-
-pub fn specs() -> Vec<EffectSpec> {
-    let cc = "Color Correction";
-    let srgb = SPACES.iter().position(|s| s.name == "sRGB").unwrap_or(0) as u32;
-    let lin709 = SPACES.iter().position(|s| s.name == "Linear Rec.709 (sRGB)").unwrap_or(0) as u32;
-    let acescg = SPACES.iter().position(|s| s.name == "ACEScg").unwrap_or(0) as u32;
-    let mut look_opts = vec!["None"];
-    look_opts.extend(looks().iter().map(|(n, _)| *n));
-    vec![
-        spec(
-            "ec.color.ociocdl",
-            "OCIO CDL Transform",
-            cc,
-            vec![
-                p("slopeRed", "Slope Red", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("slopeGreen", "Slope Green", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("slopeBlue", "Slope Blue", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("offsetRed", "Offset Red", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
-                p("offsetGreen", "Offset Green", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
-                p("offsetBlue", "Offset Blue", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
-                p("powerRed", "Power Red", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("powerGreen", "Power Green", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("powerBlue", "Power Blue", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("saturation", "Saturation", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
-                p("style", "Style", Value::Enum(0), popup(&["ASC CDL v1.2", "No Clamp"])),
-                direction(),
-            ],
-            ocio_cdl,
-        ),
-        spec(
-            "ec.color.ociocolorspace",
-            "OCIO Color Space Transform",
-            cc,
-            vec![
-                p("config", "Configuration", Value::Enum(0), popup(CONFIGS)),
-                p("configFile", "Config File (.ocio)", Value::Str(String::new()), crate::file_ui(&["ocio"])),
-                space_param("source", "Source", lin709),
-                p("sourceName", "Source (config name)", Value::Str(String::new()), ParamUi::Text),
-                space_param("destination", "Destination", srgb),
-                p("destinationName", "Destination (config name)", Value::Str(String::new()), ParamUi::Text),
-                direction(),
-            ],
-            ocio_cst,
-        ),
-        spec(
-            "ec.color.ociodisplay",
-            "OCIO Display Transform",
-            cc,
-            vec![
-                p("config", "Configuration", Value::Enum(0), popup(CONFIGS)),
-                p("configFile", "Config File (.ocio)", Value::Str(String::new()), crate::file_ui(&["ocio"])),
-                space_param("source", "Input Color Space", lin709),
-                p("sourceName", "Source (config name)", Value::Str(String::new()), ParamUi::Text),
-                p("display", "Display Device", Value::Enum(0), popup(&DISPLAYS.iter().map(|d| d.0).collect::<Vec<_>>())),
-                p("displayName", "Display (config name)", Value::Str(String::new()), ParamUi::Text),
-                p("view", "View Transform", Value::Enum(0), popup(VIEWS)),
-                p("viewName", "View (config name)", Value::Str(String::new()), ParamUi::Text),
-                direction(),
-            ],
-            ocio_display,
-        ),
-        // `file`: a path to a .cube/.3dl/.csp/.cc/.ccc/.cdl file, or the file's text itself.
-        spec(
-            "ec.color.ociofile",
-            "OCIO File Transform",
-            cc,
-            vec![
-                p("file", "File", Value::Str(String::new()), crate::file_ui(&["cube", "3dl", "csp", "cc", "ccc", "cdl", "spi1d", "spi3d", "spimtx"])),
-                p("cccId", "CCC ID", Value::Str(String::new()), ParamUi::Text),
-                p("interpolation", "Interpolation", Value::Enum(3), popup(&["Nearest", "Linear", "Tetrahedral", "Best"])),
-                direction(),
-            ],
-            ocio_file,
-        ),
-        spec(
-            "ec.color.ociolook",
-            "OCIO Look Transform",
-            cc,
-            vec![
-                p("config", "Configuration", Value::Enum(0), popup(&["Built-in (EffectCraft minimal)"])),
-                space_param("source", "Source", acescg),
-                space_param("destination", "Destination", acescg),
-                p("look", "Look", Value::Enum(0), popup(&look_opts)),
-                p("looks", "Looks", Value::Str(String::new()), ParamUi::Text),
-                direction(),
-            ],
-            ocio_look,
-        ),
-        spec(
-            "ec.color.colorstabilizer",
-            "Color Stabilizer",
-            cc,
-            vec![
-                // The pivot frame (After Effects' Set Frame button stores it).
-                p("referenceFrame", "Reference Frame (s)", num(0.0), slider(-100000.0, 100000.0, 0.0, 60.0, 2)),
-                p("stabilize", "Stabilize", Value::Enum(0), popup(&["Brightness", "Levels", "Curves"])),
-                p("blackPoint", "Black Point", Value::Vec2([0.25, 0.75]), ParamUi::Point),
-                p("midPoint", "Mid Point", Value::Vec2([0.5, 0.5]), ParamUi::Point),
-                p("whitePoint", "White Point", Value::Vec2([0.75, 0.25]), ParamUi::Point),
-                p("sampleSize", "Sample Size", num(5.0), slider(1.0, 100.0, 1.0, 50.0, 0)),
-            ],
-            color_stabilizer,
-        ),
-        spec(
-            "ec.utility.colorprofileconverter",
-            "Color Profile Converter",
-            "Utility",
-            vec![
-                p("inputProfile", "Input Profile", Value::Enum(0), popup(PROFILES)),
-                p("linearizeInputProfile", "Linearize Input Profile", Value::Bool(false), ParamUi::Checkbox),
-                p("outputProfile", "Output Profile", Value::Enum(1), popup(PROFILES)),
-                p("linearizeOutputProfile", "Linearize Output Profile", Value::Bool(false), ParamUi::Checkbox),
-                p("intent", "Intent", Value::Enum(1), popup(&["Perceptual", "Relative Colorimetric", "Saturation", "Absolute Colorimetric"])),
-                // Our built-in profiles share a zero black point and none is scene-referred, so
-                // these two are kept for compatibility and do not change the result.
-                p("useBlackPointCompensation", "Use Black Point Compensation", Value::Bool(true), ParamUi::Checkbox),
-                p("sceneRefCompensation", "Scene-ref. Profile Compensation", Value::Enum(2), popup(&["On", "Off", "Use Project Setting"])),
-            ],
-            profile_converter,
-        ),
-    ]
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, EffectHost, Image, LayerPixels, run_fx};
-
-    fn close(a: M3, b: M3, tol: f64) {
-        for i in 0..3 {
-            for j in 0..3 {
-                assert!((a[i][j] - b[i][j]).abs() < tol, "{a:?} vs {b:?}");
-            }
-        }
-    }
-
-    #[test]
-    fn aces_matrices_match_published_values() {
-        let ap0 = space_by_name("ACES2065-1").unwrap();
-        let ap1 = space_by_name("ACEScg").unwrap();
-        // Academy S-2014-004 AP0 → AP1.
-        close(
-            matrix(ap0, ap1),
-            [
-                [1.451_439_316_1, -0.236_510_746_9, -0.214_928_569_3],
-                [-0.076_553_773_4, 1.176_229_699_8, -0.099_675_926_4],
-                [0.008_316_148_4, -0.006_032_449_8, 0.997_716_301_4],
-            ],
-            2e-4,
-        );
-        // ACEScg → linear Rec.709 with Bradford adaptation (published ACES config value).
-        let lin = space_by_name("Linear Rec.709 (sRGB)").unwrap();
-        close(matrix(ap1, lin), [[1.705_05, -0.621_79, -0.083_26], [-0.130_26, 1.140_80, -0.010_55], [-0.024_00, -0.128_97, 1.152_97]], 2e-3);
-        // White maps to white.
-        let w = mul_vec(&matrix(ap1, lin), [1.0, 1.0, 1.0]);
-        assert!(w.iter().all(|v| (v - 1.0).abs() < 1e-3), "{w:?}");
-    }
-
-    #[test]
-    fn transfer_functions_round_trip() {
-        for tf in [Tf::Srgb, Tf::Gamma(2.4), Tf::AcesCct, Tf::Pq] {
-            for v in [0.0, 0.001, 0.18, 0.5, 1.0, 4.0] {
-                let r = tf.decode(tf.encode(v));
-                assert!((r - v).abs() < 1e-6 * v.max(1.0), "{tf:?} {v} {r}");
-            }
-        }
-        // ACEScct of 18 % grey (S-2016-001).
-        assert!((Tf::AcesCct.encode(0.18) - 0.413_588).abs() < 1e-5);
-        // PQ: 100 nits (1.0) encodes to ≈ 0.508.
-        assert!((Tf::Pq.encode(1.0) - 0.508).abs() < 1e-3);
-    }
-
-    #[test]
-    fn color_space_transform_effect_round_trips() {
-        let img = Image::filled(4, 4, [0.2, 0.5, 0.7, 1.0]);
-        let srgb = SPACES.iter().position(|s| s.name == "sRGB").unwrap() as u32;
-        let cg = SPACES.iter().position(|s| s.name == "ACEScg").unwrap() as u32;
-        let a = run_fx("ec.color.ociocolorspace", &[("source", Value::Enum(srgb)), ("destination", Value::Enum(cg))], img.clone(), 0.0, EffectEnv::default());
-        assert_ne!(a.img.data, img.data);
-        let b = run_fx("ec.color.ociocolorspace", &[("source", Value::Enum(cg)), ("destination", Value::Enum(srgb))], a.img.clone(), 0.0, EffectEnv::default());
-        let c = run_fx(
-            "ec.color.ociocolorspace",
-            &[("source", Value::Enum(srgb)), ("destination", Value::Enum(cg)), ("direction", Value::Enum(1))],
-            a.img,
-            0.0,
-            EffectEnv::default(),
-        );
-        for (x, y) in b.img.data.iter().zip(&img.data).chain(c.img.data.iter().zip(&img.data)) {
-            assert!((0..4).all(|k| (x[k] - y[k]).abs() < 1e-4), "{x:?} {y:?}");
-        }
-    }
-
-    #[test]
-    fn cdl_math() {
-        let cdl = Cdl { slope: [1.2, 1.0, 0.8], offset: [0.05, 0.0, -0.02], power: [1.1, 1.0, 0.9], sat: 0.8 };
-        let c = [0.3, 0.5, 0.7];
-        // Hand computation of the v1.2 formula.
-        let sop = [(0.3f64 * 1.2 + 0.05).powf(1.1), 0.5, (0.7f64 * 0.8 - 0.02).powf(0.9)];
-        let l = sop[0] * 0.2126 + sop[1] * 0.7152 + sop[2] * 0.0722;
-        let want = sop.map(|v| l + 0.8 * (v - l));
-        let got = cdl.apply(c, true);
-        for k in 0..3 {
-            assert!((got[k] - want[k]).abs() < 1e-12);
-        }
-        let back = cdl.invert(got, true);
-        for k in 0..3 {
-            assert!((back[k] - c[k]).abs() < 1e-9);
-        }
-        // v1.2 clamps, No Clamp keeps negatives.
-        let neg = Cdl { offset: [-0.5; 3], ..Cdl::default() };
-        assert_eq!(neg.apply([0.2; 3], true), [0.0; 3]);
-        assert!((neg.apply([0.2; 3], false)[0] + 0.3).abs() < 1e-12);
-        let img = Image::filled(2, 2, [0.3, 0.5, 0.7, 1.0]);
-        let out = run_fx("ec.color.ociocdl", &[("slopeRed", num(1.2)), ("offsetRed", num(0.05)), ("powerRed", num(1.1))], img, 0.0, EffectEnv::default());
-        let r = (0.3f64 * 1.2 + 0.05).powf(1.1);
-        assert!((out.img.get(0, 0)[0] as f64 - r).abs() < 1e-5);
-    }
-
-    fn identity_lattice(n: usize, f: impl Fn([f32; 3]) -> [f32; 3]) -> Vec<[f32; 3]> {
-        let mut v = vec![];
-        for b in 0..n {
-            for g in 0..n {
-                for r in 0..n {
-                    let s = (n - 1) as f32;
-                    v.push(f([r as f32 / s, g as f32 / s, b as f32 / s]));
-                }
-            }
-        }
-        v
-    }
-
-    /// Sony Imageworks `.spi1d`, `.spi3d` and `.spimtx` (Blender's configs use them, #410), and
-    /// malformed ones rejected without panicking.
-    #[test]
-    fn spi_files_parse() {
-        let spi1d = "Version 1\nFrom 0.0 2.0\nLength 3\nComponents 1\n{\n0.0\n0.25\n1.0\n}\n";
-        let x = parse_file(spi1d, "spi1d").unwrap();
-        let o = x.apply([1.0, 0.5, 2.0], 1, false, "");
-        assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.125).abs() < 1e-6 && (o[2] - 1.0).abs() < 1e-6, "{o:?}");
-        let back = x.apply(o, 1, true, "");
-        assert!((back[0] - 1.0).abs() < 1e-5 && (back[2] - 2.0).abs() < 1e-5, "{back:?}");
-        let three = parse_spi1d("Version 1\nFrom 0 1\nLength 2\nComponents 3\n{\n0 0 0\n1 0.5 2\n}\n").unwrap();
-        assert_eq!(three.d1, vec![[0.0; 3], [1.0, 0.5, 2.0]]);
-        let mut spi3d = String::from("SPILUT 1.0\n3 3\n2 2 2\n");
-        for (r, g, b) in (0..8).map(|i| (i & 1, (i >> 1) & 1, i >> 2)) {
-            spi3d += &format!("{r} {g} {b} {} {} {}\n", r as f32 * 0.5, g, b);
-        }
-        let x = parse_file(&spi3d, "spi3d").unwrap();
-        let o = x.apply([1.0, 0.5, 0.25], 1, false, "");
-        assert!((o[0] - 0.5).abs() < 1e-6 && (o[1] - 0.5).abs() < 1e-6 && (o[2] - 0.25).abs() < 1e-6, "{o:?}");
-        let m = parse_file("2 0 0 6553.5\n0 1 0 0\n0 0 1 0\n", "spimtx").unwrap();
-        let o = m.apply([0.25, 0.5, 1.0], 1, false, "");
-        assert!((o[0] - 0.6).abs() < 1e-6 && o[1] == 0.5 && o[2] == 1.0, "{o:?}");
-        assert!((m.apply(o, 1, true, "")[0] - 0.25).abs() < 1e-6);
-        for bad in [
-            "Version 1\nFrom 0 1\nLength 99999999999\nComponents 1\n{\n0\n}\n",
-            "Version 1\nFrom 1 0\nLength 2\nComponents 1\n{\n0\n1\n}\n",
-            "Version 1\nFrom 0 1\nLength 3\nComponents 1\n{\n0\n1\n}\n",
-            "Version 1\nFrom 0 1\nLength 2\nComponents 2\n{\n0 0\n1 1\n}\n",
-        ] {
-            assert!(parse_spi1d(bad).is_none(), "{bad}");
-        }
-        assert!(parse_spi3d("SPILUT 1.0\n3 3\n4000 4000 4000\n").is_none());
-        assert!(parse_spi3d("SPILUT 1.0\n3 3\n2 2 2\n9 0 0 1 1 1\n").is_none());
-        assert!(parse_spi3d("SPILUT 1.0\n3 3\n2 2 2\n0 0 0 1 1 1\n").is_none(), "incomplete lattice");
-        assert!(parse_spimtx("1 0 0\n0 1 0\n").is_none());
-        assert!(parse_spimtx("NaN 0 0 0 0 1 0 0 0 0 1 0").is_none());
-    }
-
-    #[test]
-    fn lut_files_parse_and_interpolate() {
-        // .cube with a non-linear lattice: trilinear between lattice points.
-        let f = |c: [f32; 3]| [c[0] * c[0], c[1], 1.0 - c[2]];
-        let mut cube = String::from("LUT_3D_SIZE 3\n");
-        for r in identity_lattice(3, f) {
-            cube += &format!("{} {} {}\n", r[0], r[1], r[2]);
-        }
-        let Some(FileXform::Lut { lut, .. }) = parse_file(&cube, "cube") else { panic!() };
-        // Trilinear between 0.5 (0.25) and 1.0 (1.0) at 0.75 → 0.625.
-        let o = lut.apply_interp([0.75, 0.3, 0.2], 1);
-        assert!((o[0] - 0.625).abs() < 1e-6 && (o[1] - 0.3).abs() < 1e-6 && (o[2] - 0.8).abs() < 1e-6, "{o:?}");
-        // Nearest snaps.
-        assert_eq!(lut.apply_interp([0.74, 0.0, 0.0], 0)[0], 0.25);
-        // .3dl (blue fastest, 10-bit integers, mesh line).
-        let mut tdl = String::from("0 511 1023\n");
-        for r in 0..3 {
-            for g in 0..3 {
-                for b in 0..3 {
-                    let v = [r, g, b].map(|i| i as f64 * 511.5);
-                    tdl += &format!("{} {} {}\n", v[0].round(), v[1].round(), (1023.0 - v[2]).round());
-                }
-            }
-        }
-        let Some(FileXform::Lut { lut, .. }) = parse_file(&tdl, "3dl") else { panic!() };
-        let o = lut.apply_interp([0.25, 0.5, 0.25], 1);
-        assert!((o[0] - 0.25).abs() < 2e-3 && (o[1] - 0.5).abs() < 2e-3 && (o[2] - 0.75).abs() < 2e-3, "{o:?}");
-        // .csp with a squaring pre-LUT on red and an identity 2³ lattice.
-        let mut csp = String::from("CSPLUTV100\n3D\n\n3\n0 0.5 1\n0 0.25 1\n2\n0 1\n0 1\n2\n0 1\n0 1\n\n2 2 2\n");
-        for r in identity_lattice(2, |c| c) {
-            csp += &format!("{} {} {}\n", r[0], r[1], r[2]);
-        }
-        let x = parse_file(&csp, "csp").unwrap();
-        let o = x.apply([0.5, 0.4, 0.6], 2, false, "");
-        assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.4).abs() < 1e-6, "{o:?}");
-        let inv = x.apply(o, 2, true, "");
-        assert!((inv[0] - 0.5).abs() < 1e-4, "{inv:?}");
-        // CDL collection: pick by id.
-        let ccc = r#"<ColorCorrectionCollection><ColorCorrection id="a"><SOPNode><Slope>2 2 2</Slope><Offset>0 0 0</Offset><Power>1 1 1</Power></SOPNode></ColorCorrection>
-            <ColorCorrection id='b'><SOPNode><Slope>0.5 0.5 0.5</Slope></SOPNode><SatNode><Saturation>1</Saturation></SatNode></ColorCorrection></ColorCorrectionCollection>"#;
-        let x = parse_file(ccc, "ccc").unwrap();
-        assert!((x.apply([0.4; 3], 2, false, "b")[0] - 0.2).abs() < 1e-6);
-        assert!((x.apply([0.4; 3], 2, false, "a")[0] - 0.8).abs() < 1e-6);
-        assert!((x.apply([0.4; 3], 2, false, "")[0] - 0.8).abs() < 1e-6);
-        // Effect with inline content; inverse of a 3D lattice.
-        let img = Image::filled(2, 2, [0.6, 0.3, 0.2, 1.0]);
-        let out = run_fx("ec.color.ociofile", &[("file", Value::Str(cube.clone()))], img.clone(), 0.0, EffectEnv::default());
-        let back = run_fx("ec.color.ociofile", &[("file", Value::Str(cube)), ("direction", Value::Enum(1))], out.img, 0.0, EffectEnv::default());
-        assert!((back.img.get(0, 0)[0] - 0.6).abs() < 1e-3, "{:?}", back.img.get(0, 0));
-        assert!(parse_file("garbage", "3dl").is_none());
-    }
-
-    #[test]
-    fn display_and_look_transforms() {
-        // Linear 0.18 through the sRGB display / Standard view = sRGB encoding of 0.18.
-        let img = Image::filled(2, 2, [0.18, 0.18, 0.18, 1.0]);
-        let out = run_fx("ec.color.ociodisplay", &[], img.clone(), 0.0, EffectEnv::default());
-        assert!((out.img.get(0, 0)[0] as f64 - Tf::Srgb.encode(0.18)).abs() < 1e-5);
-        let back = run_fx("ec.color.ociodisplay", &[("direction", Value::Enum(1))], out.img, 0.0, EffectEnv::default());
-        assert!((back.img.get(0, 0)[0] - 0.18).abs() < 1e-5);
-        // Tone mapped view keeps highlights below 1.
-        let hot = Image::filled(1, 1, [8.0, 8.0, 8.0, 1.0]);
-        let tm = run_fx("ec.color.ociodisplay", &[("view", Value::Enum(1))], hot, 0.0, EffectEnv::default());
-        assert!(tm.img.get(0, 0)[0] < 1.0);
-        assert!((tonemap_inv(tonemap(3.0)) - 3.0).abs() < 1e-9);
-        // Looks: Warm raises red over blue; its inverse undoes it.
-        let grey = Image::filled(1, 1, [0.18, 0.18, 0.18, 1.0]);
-        let w = run_fx("ec.color.ociolook", &[("looks", Value::Str("Warm".into()))], grey.clone(), 0.0, EffectEnv::default());
-        let px = w.img.get(0, 0);
-        assert!(px[0] > px[2]);
-        let u = run_fx("ec.color.ociolook", &[("looks", Value::Str("-Warm".into()))], w.img, 0.0, EffectEnv::default());
-        assert!((u.img.get(0, 0)[0] - 0.18).abs() < 1e-4 && (u.img.get(0, 0)[2] - 0.18).abs() < 1e-4);
-        assert_eq!(parse_looks("Warm, -Cool, nope").len(), 2);
-    }
-
-    #[test]
-    fn profile_converter_converts_and_round_trips() {
-        let img = Image::filled(2, 2, [0.8, 0.4, 0.1, 1.0]);
-        // sRGB → Rec. 2020 (relative), then back.
-        let a = run_fx(
-            "ec.utility.colorprofileconverter",
-            &[("inputProfile", Value::Enum(1)), ("outputProfile", Value::Enum(3))],
-            img.clone(),
-            0.0,
-            EffectEnv::default(),
-        );
-        assert_ne!(a.img.data, img.data);
-        let b = run_fx(
-            "ec.utility.colorprofileconverter",
-            &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1))],
-            a.img,
-            0.0,
-            EffectEnv::default(),
-        );
-        assert!((0..3).all(|k| (b.img.get(0, 0)[k] - img.get(0, 0)[k]).abs() < 1e-4));
-        // Same profile both sides: identity. Working space defaults to sRGB.
-        let c = run_fx(
-            "ec.utility.colorprofileconverter",
-            &[("inputProfile", Value::Enum(0)), ("outputProfile", Value::Enum(1))],
-            img.clone(),
-            0.0,
-            EffectEnv::default(),
-        );
-        assert_eq!(c.img.data, img.data);
-        // Perceptual pulls out-of-gamut colours inside: saturated Rec.2020 green into sRGB.
-        let g = Image::filled(1, 1, [0.0, 1.0, 0.0, 1.0]);
-        let rel = run_fx(
-            "ec.utility.colorprofileconverter",
-            &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1))],
-            g.clone(),
-            0.0,
-            EffectEnv::default(),
-        );
-        assert!(rel.img.get(0, 0)[0] < 0.0);
-        let per = run_fx(
-            "ec.utility.colorprofileconverter",
-            &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1)), ("intent", Value::Enum(0))],
-            g,
-            0.0,
-            EffectEnv::default(),
-        );
-        assert!(per.img.get(0, 0).iter().all(|v| *v >= -1e-6));
-    }
-
-    struct RefHost(Image);
-    impl EffectHost for RefHost {
-        fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
-            None
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-        fn self_at(&self, _: f64, _: usize) -> Option<Buf> {
-            Some(Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 })
-        }
-    }
-
-    #[test]
-    fn color_stabilizer_matches_the_reference_frame() {
-        let mk = |k: f32, o: f32| {
-            let mut img = Image::new(40, 40);
-            for y in 0..40 {
-                for x in 0..40 {
-                    let v = (x as f32 / 40.0) * k + o;
-                    img.set(x, y, [v, v * 0.9, v * 0.8, 1.0]);
-                }
-            }
-            img
-        };
-        let reference = mk(1.0, 0.0);
-        let flicker = mk(0.8, 0.1);
-        let host = RefHost(reference.clone());
-        let env = EffectEnv { host: Some(&host), ..Default::default() };
-        let pts = [("blackPoint", Value::Vec2([5.0, 20.0])), ("midPoint", Value::Vec2([20.0, 20.0])), ("whitePoint", Value::Vec2([35.0, 20.0]))];
-        let mut vals: Vec<(&str, Value)> = pts.to_vec();
-        vals.push(("stabilize", Value::Enum(1)));
-        vals.push(("sampleSize", num(1.0)));
-        let out = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, env);
-        for x in [5i64, 20, 35] {
-            let (o, r) = (out.img.get(x, 20), reference.get(x, 20));
-            assert!((o[0] - r[0]).abs() < 0.01, "x {x}: {o:?} vs {r:?}");
-        }
-        // Deterministic, and a no-op without a host.
-        let again = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, env);
-        assert_eq!(out.img.data, again.img.data);
-        let none = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, EffectEnv::default());
-        assert_eq!(none.img.data, flicker.data);
-        // Brightness mode corrects an offset at the black point.
-        let lifted = mk(1.0, 0.1);
-        let mut vals2: Vec<(&str, Value)> = pts.to_vec();
-        vals2.push(("sampleSize", num(1.0)));
-        let b = run_fx("ec.color.colorstabilizer", &vals2, lifted, 0.0, env);
-        assert!((b.img.get(5, 20)[0] - reference.get(5, 20)[0]).abs() < 0.01);
-    }
-}
+mod tests;
diff --git a/crates/effects/src/ocio/cdl.rs b/crates/effects/src/ocio/cdl.rs
new file mode 100644
index 000000000..dba8c68fe
--- /dev/null
+++ b/crates/effects/src/ocio/cdl.rs
@@ -0,0 +1,115 @@
+use super::{ParamUi, slider};
+
+// ---------------------------------------------------------------- ASC CDL
+
+/// An ASC Colour Decision List correction.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Cdl {
+    pub slope: [f64; 3],
+    pub offset: [f64; 3],
+    pub power: [f64; 3],
+    pub sat: f64,
+}
+
+impl Default for Cdl {
+    fn default() -> Self {
+        Cdl { slope: [1.0; 3], offset: [0.0; 3], power: [1.0; 3], sat: 1.0 }
+    }
+}
+
+const LUMA: [f64; 3] = [0.2126, 0.7152, 0.0722];
+
+impl Cdl {
+    /// Forward CDL. `clamp` = the v1.2 style (results clamped to 0..1 after SOP and saturation).
+    pub fn apply(&self, c: [f64; 3], clamp: bool) -> [f64; 3] {
+        let mut o = [0.0; 3];
+        for i in 0..3 {
+            let v = c[i] * self.slope[i] + self.offset[i];
+            o[i] = if clamp {
+                v.clamp(0.0, 1.0).powf(self.power[i])
+            } else if v >= 0.0 {
+                v.powf(self.power[i])
+            } else {
+                v
+            };
+        }
+        let l = o[0] * LUMA[0] + o[1] * LUMA[1] + o[2] * LUMA[2];
+        let o = o.map(|v| l + self.sat * (v - l));
+        if clamp { o.map(|v| v.clamp(0.0, 1.0)) } else { o }
+    }
+    /// Exact inverse of [`Cdl::apply`] (inside the clamped range).
+    pub fn invert(&self, c: [f64; 3], clamp: bool) -> [f64; 3] {
+        let c = if clamp { c.map(|v| v.clamp(0.0, 1.0)) } else { c };
+        let l = c[0] * LUMA[0] + c[1] * LUMA[1] + c[2] * LUMA[2];
+        let s = if self.sat.abs() < 1e-9 { 1e-9 } else { self.sat };
+        let o = c.map(|v| l + (v - l) / s);
+        let mut r = [0.0; 3];
+        for i in 0..3 {
+            let v = if clamp { o[i].clamp(0.0, 1.0) } else { o[i] };
+            let pw = self.power[i].max(1e-9);
+            let u = if v >= 0.0 { v.powf(1.0 / pw) } else { v };
+            let sl = if self.slope[i].abs() < 1e-9 { 1e-9 } else { self.slope[i] };
+            r[i] = (u - self.offset[i]) / sl;
+        }
+        if clamp { r.map(|v| v.clamp(0.0, 1.0)) } else { r }
+    }
+}
+
+fn tag<'a>(xml: &'a str, name: &str) -> Option<&'a str> {
+    let open = xml.find(&format!("<{name}"))?;
+    let gt = open + xml[open..].find('>')?;
+    if xml[..gt].ends_with('/') {
+        return Some("");
+    }
+    let close = xml[gt..].find(&format!("</{name}>"))? + gt;
+    Some(&xml[gt + 1..close])
+}
+
+fn nums3(s: &str) -> Option<[f64; 3]> {
+    let v: Vec<f64> = s.split_whitespace().filter_map(|t| t.parse().ok()).collect();
+    (v.len() >= 3).then(|| [v[0], v[1], v[2]])
+}
+
+fn parse_cc(block: &str) -> Cdl {
+    let mut c = Cdl::default();
+    if let Some(s) = tag(block, "Slope").and_then(nums3) {
+        c.slope = s;
+    }
+    if let Some(s) = tag(block, "Offset").and_then(nums3) {
+        c.offset = s;
+    }
+    if let Some(s) = tag(block, "Power").and_then(nums3) {
+        c.power = s;
+    }
+    if let Some(s) = tag(block, "Saturation").and_then(|t| t.trim().parse().ok()) {
+        c.sat = s;
+    }
+    c
+}
+
+/// Parse ASC CDL XML (`.cc`, `.ccc`, `.cdl`): every `<ColorCorrection>` with its `id`.
+pub fn parse_cdl_xml(xml: &str) -> Vec<(String, Cdl)> {
+    let mut out = vec![];
+    let mut rest = xml;
+    while let Some(i) = rest.find("<ColorCorrection") {
+        let after = &rest[i..];
+        let head_end = after.find('>').unwrap_or(after.len());
+        let head = &after[..head_end];
+        let id = head
+            .find("id=")
+            .and_then(|k| {
+                let q = head[k + 3..].chars().next()?;
+                let s = &head[k + 4..];
+                s.find(q).map(|e| s[..e].to_string())
+            })
+            .unwrap_or_default();
+        let end = after.find("</ColorCorrection>").map(|e| e + "</ColorCorrection>".len()).unwrap_or(after.len());
+        out.push((id, parse_cc(&after[..end])));
+        rest = &after[end..];
+    }
+    out
+}
+
+pub(super) fn sl(lo: f64, hi: f64, smin: f64, smax: f64) -> ParamUi {
+    slider(lo, hi, smin, smax, 3)
+}
diff --git a/crates/effects/src/ocio/effects.rs b/crates/effects/src/ocio/effects.rs
new file mode 100644
index 000000000..5df24096d
--- /dev/null
+++ b/crates/effects/src/ocio/effects.rs
@@ -0,0 +1,467 @@
+use super::cdl::Cdl;
+use super::lut::load_file;
+use super::space::{ACES_CCT, ACES_CG, ACES2065_1, D65, IDENTITY, P3, REC709, REC2020, SPACES, Space, Tf, Xform, matrix, sp, space_names};
+use super::{Buf, ColorSpace, EffectCtx, EffectSpec, IntoParallelRefMutIterator, ParallelIterator, Value, invert, mul, mul_vec, p, popup, unpremul};
+
+// ---------------------------------------------------------------- displays, views and looks
+
+/// Displays of the built-in config: (name, display primaries/white, encoding).
+pub const DISPLAYS: &[(&str, [[f64; 2]; 3], Tf)] =
+    &[("sRGB", REC709, Tf::Srgb), ("Rec.1886 Rec.709", REC709, Tf::Gamma(2.4)), ("Display P3", P3, Tf::Srgb), ("Rec.2100-PQ", REC2020, Tf::Pq)];
+
+pub const VIEWS: &[&str] = &["Standard", "Tone Mapped", "Raw"];
+
+/// Configuration popup: the built-in config, or a custom `.ocio` file (Config File: a path or
+/// the config's text; spaces chosen by name, see [`crate::ocio_config`]).
+pub const CONFIGS: &[&str] = &["Built-in (EffectCraft minimal)", "Custom (.ocio file)"];
+
+/// Built-in looks: CDLs applied in ACEScct.
+pub fn looks() -> Vec<(&'static str, Cdl)> {
+    let grey = 0.413_588_402_492_442_1; // ACEScct of 0.18
+    let c = |slope: [f64; 3], offset: [f64; 3], sat: f64| Cdl { slope, offset, power: [1.0; 3], sat };
+    vec![
+        ("Warm", c([1.04, 1.0, 0.94], [0.0; 3], 1.0)),
+        ("Cool", c([0.95, 1.0, 1.06], [0.0; 3], 1.0)),
+        ("High Contrast", c([1.25; 3], [grey * (1.0 - 1.25); 3], 1.0)),
+        ("Low Contrast", c([0.8; 3], [grey * (1.0 - 0.8); 3], 1.0)),
+        ("Desaturated", c([1.0; 3], [0.0; 3], 0.6)),
+        ("Vivid", c([1.0; 3], [0.0; 3], 1.3)),
+    ]
+}
+
+/// Extended Reinhard roll-off (white point 16): maps 0..∞ into 0..1, ≈ identity near 0.
+pub(super) fn tonemap(v: f64) -> f64 {
+    let w2 = 256.0;
+    if v <= 0.0 { v } else { v * (1.0 + v / w2) / (1.0 + v) }
+}
+
+pub(super) fn tonemap_inv(y: f64) -> f64 {
+    if y <= 0.0 {
+        return y;
+    }
+    // Solve v² / w² + v (1 − y) − y = 0.
+    let (a, b, c) = (1.0 / 256.0, 1.0 - y, -y);
+    (-b + (b * b - 4.0 * a * c).sqrt()) / (2.0 * a)
+}
+
+/// Display transform of an input-space colour (`inverse`: display code values → input space).
+pub fn display_xform(input: &Space, display: usize, view: usize, inverse: bool) -> impl Fn([f32; 3]) -> [f32; 3] + Sync {
+    let (_, prims, tf) = DISPLAYS[display.min(DISPLAYS.len() - 1)];
+    let disp = Space { name: "display", prims: Some((prims, D65)), tf: Tf::Linear, raw: false };
+    let raw = view == 2 || input.raw;
+    let m_in = Xform::new(&Space { tf: Tf::Linear, ..*input }, &disp);
+    let m_out = Xform::new(&disp, &Space { tf: Tf::Linear, ..*input });
+    let in_tf = input.tf;
+    move |c: [f32; 3]| {
+        if raw {
+            return c;
+        }
+        if !inverse {
+            let lin = c.map(|v| in_tf.decode(v as f64) as f32);
+            let d = m_in.apply(lin);
+            d.map(|v| {
+                let v = v as f64;
+                let v = if view == 1 { tonemap(v) } else { v };
+                tf.encode(v) as f32
+            })
+        } else {
+            let d = c.map(|v| {
+                let l = tf.decode(v as f64);
+                (if view == 1 { tonemap_inv(l) } else { l }) as f32
+            });
+            m_out.apply(d).map(|v| in_tf.encode(v as f64) as f32)
+        }
+    }
+}
+
+// ---------------------------------------------------------------- effects
+
+pub(super) fn spec(id: &'static str, name: &'static str, cat: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
+    EffectSpec { id, name, category: cat, params, render, gpu: false, float: true }
+}
+
+pub(super) fn space_param(id: &'static str, name: &'static str, default: u32) -> crate::ParamSpec {
+    p(id, name, Value::Enum(default), popup(&space_names()))
+}
+
+pub(super) fn direction() -> crate::ParamSpec {
+    p("direction", "Direction", Value::Enum(0), popup(&["Forward", "Inverse"]))
+}
+
+fn map_px(b: &mut Buf, f: impl Fn([f32; 3]) -> [f32; 3] + Sync) {
+    b.img.data.par_iter_mut().for_each(|px| {
+        let (c, a) = unpremul(*px);
+        if a <= 0.0 {
+            return;
+        }
+        let o = f(c);
+        *px = [o[0] * a, o[1] * a, o[2] * a, a];
+    });
+}
+
+pub(super) fn space_at(i: u32) -> &'static Space {
+    &SPACES[(i as usize).min(SPACES.len() - 1)]
+}
+
+/// The effects that take Configuration ▸ Custom (a `.ocio` file).
+pub(crate) const CUSTOM_CONFIG_FX: [&str; 2] = ["ec.color.ociocolorspace", "ec.color.ociodisplay"];
+
+/// Effect `id`'s transform under Configuration ▸ Custom: the config's conversion from the source
+/// space to the destination space (Color Space Transform) or through a display's view (Display
+/// Transform), see [`crate::ocio_config`]. `Ok(None)` with the built-in configuration; an error
+/// (the pixels pass through) when the config can't be read or has no such colour space.
+pub(super) fn custom_xf(id: &str, pr: &crate::Params) -> Result<Option<crate::ocio_config::Xf>, String> {
+    use crate::ocio_config::Xf;
+    if !CUSTOM_CONFIG_FX.contains(&id) || pr.e("config") != 1 {
+        return Ok(None);
+    }
+    let cfg = crate::ocio_config::load_config(pr.s("configFile")).map_err(|e| format!("Can't read the OCIO config: {e}"))?;
+    // A space by its typed name, else by the built-in popup's name.
+    let space = |name: &str, popup: u32| {
+        let name = if name.trim().is_empty() { space_at(popup).name } else { name.trim() };
+        cfg.space(name).ok_or_else(|| format!("The OCIO config has no color space `{name}`"))
+    };
+    let a = space(pr.s("sourceName"), pr.e("source"))?;
+    let inverse = pr.e("direction") == 1;
+    if id == "ec.color.ociodisplay" {
+        let (dn, vn) = display_view_names(pr);
+        let xf = cfg.display_path(a, dn, vn);
+        return Ok(Some(if inverse { Xf::Inverse(Box::new(xf)) } else { xf }));
+    }
+    let z = space(pr.s("destinationName"), pr.e("destination"))?;
+    // Inverse: the conversion the other way (OCIO's inverse ColorSpaceTransform).
+    Ok(Some(if inverse { cfg.path(z, a) } else { cfg.path(a, z) }))
+}
+
+/// The display and view a Display Transform names: the typed names, else the popups'.
+fn display_view_names(pr: &crate::Params) -> (&str, &str) {
+    let display = DISPLAYS.get(pr.e("display") as usize).map_or("", |d| d.0);
+    let view = VIEWS.get(pr.e("view") as usize).copied().unwrap_or("");
+    let typed = |k: &str, popup| if pr.s(k).trim().is_empty() { popup } else { pr.s(k).trim() };
+    (typed("displayName", display), typed("viewName", view))
+}
+
+/// Effect Controls' warning for effect `id`: a custom OCIO configuration that can't be read, has
+/// no such colour space, display or view, or uses transforms EffectCraft can't apply (colours
+/// pass through those steps, #410). `None` when the effect renders as asked.
+pub fn warning(id: &str, pr: &crate::Params) -> Option<String> {
+    let xf = match custom_xf(id, pr) {
+        Ok(x) => x?,
+        Err(e) => return Some(format!("{e}: the colors pass through.")),
+    };
+    let mut notes = vec![];
+    if id == "ec.color.ociodisplay"
+        && let Ok(cfg) = crate::ocio_config::load_config(pr.s("configFile"))
+    {
+        let (dn, vn) = display_view_names(pr);
+        if let Some((d, v)) = cfg.view(dn, vn)
+            && (!d.eq_ignore_ascii_case(dn) || !v.name.eq_ignore_ascii_case(vn))
+        {
+            notes.push(format!("The OCIO config has no display `{dn}` with a view `{vn}`: showing {d} / {}.", v.name));
+        }
+    }
+    let missing = xf.unsupported_list();
+    if !missing.is_empty() {
+        notes.push(format!("Not supported, the colors pass through: {}.", missing.join(", ")));
+    }
+    (!notes.is_empty()).then(|| notes.join(" "))
+}
+
+/// Configuration ▸ Custom: render through the config's transform. `false` with the built-in
+/// configuration (the caller renders it).
+fn custom_render(id: &str, ctx: &EffectCtx, b: &mut Buf) -> bool {
+    match custom_xf(id, ctx.params) {
+        Ok(None) => false,
+        Ok(Some(xf)) => {
+            map_px(b, |c| xf.apply(c.map(|v| v as f64), false).map(|v| v as f32));
+            true
+        }
+        // A config that can't be read, or an unknown space: the pixels pass through.
+        Err(_) => true,
+    }
+}
+
+pub(super) fn ocio_cst(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    if custom_render("ec.color.ociocolorspace", ctx, &mut b) {
+        return b;
+    }
+    let (a, z) = (space_at(ctx.params.e("source")), space_at(ctx.params.e("destination")));
+    let (a, z) = if ctx.params.e("direction") == 1 { (z, a) } else { (a, z) };
+    if a.name == z.name {
+        return b;
+    }
+    let x = Xform::new(a, z);
+    map_px(&mut b, |c| x.apply(c));
+    b
+}
+
+pub(super) fn cdl_from_params(pr: &crate::Params) -> Cdl {
+    Cdl {
+        slope: [pr.f("slopeRed"), pr.f("slopeGreen"), pr.f("slopeBlue")],
+        offset: [pr.f("offsetRed"), pr.f("offsetGreen"), pr.f("offsetBlue")],
+        power: [pr.f("powerRed").max(0.0), pr.f("powerGreen").max(0.0), pr.f("powerBlue").max(0.0)],
+        sat: pr.f("saturation").max(0.0),
+    }
+}
+
+pub(super) fn ocio_cdl(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let cdl = cdl_from_params(ctx.params);
+    if cdl == Cdl::default() {
+        return b;
+    }
+    let clamp = ctx.params.e("style") == 0;
+    let inv = ctx.params.e("direction") == 1;
+    map_px(&mut b, |c| {
+        let c = c.map(|v| v as f64);
+        let o = if inv { cdl.invert(c, clamp) } else { cdl.apply(c, clamp) };
+        o.map(|v| v as f32)
+    });
+    b
+}
+
+pub(super) fn ocio_display(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    if custom_render("ec.color.ociodisplay", ctx, &mut b) {
+        return b;
+    }
+    let input = space_at(ctx.params.e("source"));
+    let f = display_xform(input, ctx.params.e("display") as usize, ctx.params.e("view") as usize, ctx.params.e("direction") == 1);
+    map_px(&mut b, f);
+    b
+}
+
+pub(super) fn ocio_file(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let Some(x) = load_file(ctx.params.s("file")) else { return b };
+    let interp = match ctx.params.e("interpolation") {
+        0 => 0,
+        1 => 1,
+        _ => 2,
+    };
+    let inv = ctx.params.e("direction") == 1;
+    let id = ctx.params.s("cccId").to_string();
+    map_px(&mut b, |c| x.apply(c, interp, inv, &id));
+    b
+}
+
+/// Parse a looks string: comma/space separated names, `-Name` = inverse.
+pub fn parse_looks(s: &str) -> Vec<(Cdl, bool)> {
+    let all = looks();
+    s.split([',', ':'])
+        .map(str::trim)
+        .filter(|t| !t.is_empty())
+        .filter_map(|t| {
+            let (inv, n) = match t.strip_prefix('-') {
+                Some(r) => (true, r.trim()),
+                None => (false, t.trim_start_matches('+').trim()),
+            };
+            all.iter().find(|(name, _)| name.eq_ignore_ascii_case(n)).map(|(_, c)| (*c, inv))
+        })
+        .collect()
+}
+
+pub(super) fn ocio_look(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let mut list = parse_looks(ctx.params.s("looks"));
+    let pick = ctx.params.e("look");
+    if pick > 0
+        && let Some((_, c)) = looks().get(pick as usize - 1)
+    {
+        list.insert(0, (*c, false));
+    }
+    if list.is_empty() {
+        return b;
+    }
+    let (src, dst) = (space_at(ctx.params.e("source")), space_at(ctx.params.e("destination")));
+    let inv = ctx.params.e("direction") == 1;
+    let cct = &ACES_CCT;
+    let (a, z) = if inv { (dst, src) } else { (src, dst) };
+    let to_p = Xform::new(a, cct);
+    let from_p = Xform::new(cct, z);
+    if inv {
+        list.reverse();
+    }
+    map_px(&mut b, |c| {
+        let mut v = to_p.apply(c).map(|x| x as f64);
+        for (cdl, li) in &list {
+            v = if *li != inv { cdl.invert(v, false) } else { cdl.apply(v, false) };
+        }
+        from_p.apply(v.map(|x| x as f32))
+    });
+    b
+}
+
+// ---- Color Profile Converter (Utility)
+
+pub const PROFILES: &[&str] = &["Project Working Space", "sRGB IEC61966-2.1", "HDTV (Rec. 709)", "Rec. 2020", "Display P3", "ACEScg", "ACES2065-1"];
+
+pub(super) fn profile(ctx: &EffectCtx, i: u32) -> (Space, bool) {
+    let ws = |cs: ColorSpace| match cs {
+        ColorSpace::Srgb => sp("sRGB", REC709, D65, Tf::Srgb),
+        ColorSpace::Rec709 => sp("Rec.709", REC709, D65, Tf::Gamma(2.4)),
+        ColorSpace::Rec2020 => sp("Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
+        ColorSpace::DisplayP3 => sp("Display P3", P3, D65, Tf::Srgb),
+        ColorSpace::AcesCg => ACES_CG,
+        ColorSpace::Aces2065 => ACES2065_1,
+        // HDR encodings are output spaces, never a working space.
+        ColorSpace::Rec2100Pq | ColorSpace::Rec2100Hlg => sp("Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
+    };
+    match i {
+        0 => (ws(ctx.env.working_space.unwrap_or(ColorSpace::Srgb)), ctx.env.working_linear),
+        1 => (ws(ColorSpace::Srgb), false),
+        2 => (ws(ColorSpace::Rec709), false),
+        3 => (ws(ColorSpace::Rec2020), false),
+        4 => (ws(ColorSpace::DisplayP3), false),
+        5 => (ACES_CG, true),
+        _ => (ACES2065_1, true),
+    }
+}
+
+/// Gamut compression for the perceptual intent: pull out-of-gamut (negative) colours toward
+/// their luminance just enough to bring every channel to ≥ 0, rolling off smoothly.
+fn compress_gamut(c: [f64; 3], luma: [f64; 3]) -> [f64; 3] {
+    let l = c[0] * luma[0] + c[1] * luma[1] + c[2] * luma[2];
+    if l <= 0.0 {
+        return c.map(|v| v.max(0.0));
+    }
+    let mn = c.iter().cloned().fold(f64::INFINITY, f64::min);
+    if mn >= 0.0 {
+        return c;
+    }
+    // Fraction of the way toward grey that reaches zero on the most negative channel.
+    let t = (l / (l - mn)).clamp(0.0, 1.0);
+    c.map(|v| l + (v - l) * t)
+}
+
+pub(super) fn profile_converter(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let (inp, in_lin_default) = profile(ctx, ctx.params.e("inputProfile"));
+    let (out, out_lin_default) = profile(ctx, ctx.params.e("outputProfile"));
+    let in_lin = ctx.params.b("linearizeInputProfile") || in_lin_default && ctx.params.e("inputProfile") == 0;
+    let out_lin = ctx.params.b("linearizeOutputProfile") || out_lin_default && ctx.params.e("outputProfile") == 0;
+    let intent = ctx.params.e("intent");
+    let dec = if in_lin { Tf::Linear } else { inp.tf };
+    let enc = if out_lin { Tf::Linear } else { out.tf };
+    // Absolute colorimetric keeps the source white (no adaptation); the others adapt.
+    let m = if intent == 3 { mul(&invert(&out.to_ref(false)), &inp.to_ref(false)) } else { matrix(&inp, &out) };
+    let identity = dec == enc && (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-9));
+    if identity {
+        return b;
+    }
+    let out_luma = out.to_ref(true)[1];
+    map_px(&mut b, |c| {
+        let l = c.map(|v| dec.decode(v as f64));
+        let mut o = mul_vec(&m, l);
+        match intent {
+            0 => o = compress_gamut(o, out_luma),
+            2 => o = o.map(|v| v.max(0.0)),
+            _ => {}
+        }
+        o.map(|v| enc.encode(v) as f32)
+    });
+    b
+}
+
+// ---- Color Stabilizer
+
+/// Mean straight colour of a square (half-size `r` layer pixels) around layer point `pt`.
+fn sample_mean(b: &Buf, pt: [f64; 2], r: f64) -> [f64; 3] {
+    let (cx, cy) = b.to_px(pt);
+    let rr = (r * b.scale).max(0.5);
+    let (x0, x1) = ((cx - rr).floor().max(0.0) as i64, ((cx + rr).ceil() as i64).min(b.img.width as i64));
+    let (y0, y1) = ((cy - rr).floor().max(0.0) as i64, ((cy + rr).ceil() as i64).min(b.img.height as i64));
+    let mut acc = [0.0f64; 4];
+    for y in y0..y1 {
+        for x in x0..x1 {
+            let p = b.img.get(x, y);
+            for k in 0..4 {
+                acc[k] += p[k] as f64;
+            }
+        }
+    }
+    if acc[3] <= 1e-9 {
+        return [0.0; 3];
+    }
+    [acc[0] / acc[3], acc[1] / acc[3], acc[2] / acc[3]]
+}
+
+/// Monotone piecewise-quadratic curve through (0,0), three samples and (1,1) (linear between
+/// them is enough for a stabiliser and stays monotone).
+fn curve3(xs: [f64; 3], ys: [f64; 3], v: f64) -> f64 {
+    let mut pts = vec![(0.0, 0.0)];
+    let mut pairs: Vec<(f64, f64)> = xs.iter().cloned().zip(ys.iter().cloned()).collect();
+    pairs.sort_by(|a, b| a.0.total_cmp(&b.0));
+    for (x, y) in pairs {
+        if pts.last().is_some_and(|l| x > l.0 + 1e-4) && x < 1.0 - 1e-4 {
+            pts.push((x, y));
+        }
+    }
+    pts.push((1.0, 1.0));
+    let i = pts.partition_point(|p| p.0 < v).clamp(1, pts.len() - 1);
+    let (a, c) = (pts[i - 1], pts[i]);
+    a.1 + (c.1 - a.1) * (v - a.0) / (c.0 - a.0).max(1e-9)
+}
+
+/// Color Stabilizer's correction of buffer `b` as one piecewise-linear map per channel (points
+/// with increasing x; the end segments extend), the same maps `color_stabilizer` applies.
+/// `None` without a host or reference frame (the layer passes through). (The GPU effect.)
+pub fn color_stabilizer_maps(ctx: &EffectCtx, b: &Buf) -> Option<[Vec<(f64, f64)>; 3]> {
+    let reference = ctx.env.host?.self_at(ctx.params.f("referenceFrame"), ctx.env.effect_index)?;
+    let r = ctx.params.f("sampleSize").max(0.5);
+    let pts = [ctx.params.v2("blackPoint"), ctx.params.v2("midPoint"), ctx.params.v2("whitePoint")];
+    let cur = pts.map(|pt| sample_mean(b, pt, r));
+    let refv = pts.map(|pt| sample_mean(&reference, pt, r));
+    let mode = ctx.params.e("stabilize");
+    Some([0, 1, 2].map(|k| {
+        let offset = |c0: f64, r0: f64| vec![(0.0, r0 - c0), (1.0, 1.0 + r0 - c0)];
+        match mode {
+            0 => offset(cur[0][k], refv[0][k]),
+            1 => {
+                let (c0, c1, r0, r1) = (cur[0][k], cur[2][k], refv[0][k], refv[2][k]);
+                if (c1 - c0).abs() < 1e-6 {
+                    offset(c0, r0)
+                } else if c0 < c1 {
+                    vec![(c0, r0), (c1, r1)]
+                } else {
+                    vec![(c1, r1), (c0, r0)]
+                }
+            }
+            _ => {
+                let mut v = vec![(0.0, 0.0)];
+                let mut pairs: Vec<(f64, f64)> = (0..3).map(|i| (cur[i][k], refv[i][k])).collect();
+                pairs.sort_by(|a, b| a.0.total_cmp(&b.0));
+                for (x, y) in pairs {
+                    if v.last().is_some_and(|l| x > l.0 + 1e-4) && x < 1.0 - 1e-4 {
+                        v.push((x, y));
+                    }
+                }
+                v.push((1.0, 1.0));
+                v
+            }
+        }
+    }))
+}
+
+pub(super) fn color_stabilizer(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let Some(host) = ctx.env.host else { return b };
+    let Some(reference) = host.self_at(ctx.params.f("referenceFrame"), ctx.env.effect_index) else { return b };
+    let r = ctx.params.f("sampleSize").max(0.5);
+    let pts = [ctx.params.v2("blackPoint"), ctx.params.v2("midPoint"), ctx.params.v2("whitePoint")];
+    let cur = pts.map(|pt| sample_mean(&b, pt, r));
+    let refv = pts.map(|pt| sample_mean(&reference, pt, r));
+    let mode = ctx.params.e("stabilize");
+    map_px(&mut b, |c| {
+        [0, 1, 2].map(|k| {
+            let v = c[k] as f64;
+            let o = match mode {
+                // Brightness: one sample (black point) — offset each channel.
+                0 => v + refv[0][k] - cur[0][k],
+                // Levels: black and white samples — linear map per channel.
+                1 => {
+                    let (c0, c1, r0, r1) = (cur[0][k], cur[2][k], refv[0][k], refv[2][k]);
+                    if (c1 - c0).abs() < 1e-6 { v + r0 - c0 } else { r0 + (v - c0) * (r1 - r0) / (c1 - c0) }
+                }
+                // Curves: three samples — a curve through them per channel.
+                _ => curve3([cur[0][k], cur[1][k], cur[2][k]], [refv[0][k], refv[1][k], refv[2][k]], v),
+            };
+            o as f32
+        })
+    });
+    b
+}
diff --git a/crates/effects/src/ocio/lut.rs b/crates/effects/src/ocio/lut.rs
new file mode 100644
index 000000000..8a6481eb6
--- /dev/null
+++ b/crates/effects/src/ocio/lut.rs
@@ -0,0 +1,331 @@
+use super::cdl::{Cdl, parse_cdl_xml};
+use super::{Arc, HashMap, Lut, Mutex, OnceLock, parse_cube};
+
+// ---------------------------------------------------------------- LUT files
+
+/// A loaded transform file.
+#[derive(Clone, Debug)]
+pub enum FileXform {
+    /// A lattice/1D LUT with an optional per-channel piecewise-linear shaper (cineSpace pre-LUT).
+    Lut { lut: Lut, shaper: Option<[Vec<(f32, f32)>; 3]> },
+    /// CDL corrections by id (in file order).
+    Cdl(Vec<(String, Cdl)>),
+    /// A matrix with offset (Sony Imageworks `.spimtx`), as a MatrixTransform's.
+    Matrix { m: [f64; 16], offset: [f64; 4] },
+}
+
+/// Parse a Sony Imageworks `.spimtx` matrix: three rows of four numbers, three matrix columns
+/// and an offset in 16-bit code values (÷ 65535).
+pub fn parse_spimtx(text: &str) -> Option<FileXform> {
+    let v: Vec<f64> = text.split_whitespace().map(|t| t.parse().ok()).collect::<Option<_>>()?;
+    if v.len() != 12 || v.iter().any(|x| !x.is_finite()) {
+        return None;
+    }
+    let mut m = [0.0; 16];
+    let mut offset = [0.0; 4];
+    for (r, row) in v.as_chunks::<4>().0.iter().enumerate() {
+        m[r * 4..r * 4 + 3].copy_from_slice(&row[..3]);
+        offset[r] = row[3] / 65535.0;
+    }
+    m[15] = 1.0;
+    Some(FileXform::Matrix { m, offset })
+}
+
+/// Parse a Sony Imageworks `.spi1d` 1D LUT: `From <min> <max>`, `Length <n>`, `Components
+/// <1 | 3>`, then `{` the values `}`.
+pub fn parse_spi1d(text: &str) -> Option<Lut> {
+    let (mut from, mut len, mut comps) = ([0.0f32, 1.0], 0usize, 1usize);
+    let mut values: Vec<f32> = vec![];
+    let mut body = false;
+    for line in text.lines().map(str::trim).filter(|l| !l.is_empty()) {
+        if body {
+            if line.starts_with('}') {
+                break;
+            }
+            for t in line.split_whitespace() {
+                values.push(t.parse().ok()?);
+            }
+            continue;
+        }
+        let mut t = line.split_whitespace();
+        match t.next()? {
+            "{" => body = true,
+            "From" => from = [t.next()?.parse().ok()?, t.next()?.parse().ok()?],
+            "Length" => len = t.next()?.parse().ok()?,
+            "Components" => comps = t.next()?.parse().ok()?,
+            _ => {}
+        }
+    }
+    // A 1D table is interpolated by index, so cap it like the lattices (2²⁴ entries).
+    if !(2..=1 << 24).contains(&len)
+        || !matches!(comps, 1 | 3)
+        || values.len() != len.checked_mul(comps)?
+        || from[1] <= from[0]
+        || from.iter().any(|v| !v.is_finite())
+    {
+        return None;
+    }
+    let d1 = values.chunks_exact(comps).map(|c| if comps == 3 { [c[0], c[1], c[2]] } else { [c[0]; 3] }).collect();
+    Some(Lut { n1: len, d1, n3: 0, d3: vec![], dmin: [from[0]; 3], dmax: [from[1]; 3] })
+}
+
+/// Parse a Sony Imageworks `.spi3d` lattice: `SPILUT 1.0`, `3 3`, the sizes, then one
+/// `r g b  R G B` line per lattice point (indices, then the colour).
+pub fn parse_spi3d(text: &str) -> Option<Lut> {
+    let mut lines = text.lines().map(str::trim).filter(|l| !l.is_empty());
+    if !lines.next()?.starts_with("SPILUT") {
+        return None;
+    }
+    lines.next()?;
+    let size: Vec<usize> = lines.next()?.split_whitespace().map(|t| t.parse().ok()).collect::<Option<_>>()?;
+    let n = *size.first()?;
+    if size.len() != 3 || size.iter().any(|s| *s != n) || !(2..=129).contains(&n) {
+        return None;
+    }
+    let mut d3 = vec![[0.0f32; 3]; n * n * n];
+    let mut seen = 0usize;
+    for line in lines {
+        let v: Vec<&str> = line.split_whitespace().collect();
+        let [r, g, b, cr, cg, cb] = v.as_slice() else { return None };
+        let (r, g, b): (usize, usize, usize) = (r.parse().ok()?, g.parse().ok()?, b.parse().ok()?);
+        if r >= n || g >= n || b >= n {
+            return None;
+        }
+        // Our lattice is red fastest.
+        *d3.get_mut(r + g * n + b * n * n)? = [cr.parse().ok()?, cg.parse().ok()?, cb.parse().ok()?];
+        seen += 1;
+    }
+    (seen == n * n * n).then_some(Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] })
+}
+
+/// Parse an Autodesk `.3dl` lattice (integers, blue fastest; an optional input-mesh line).
+pub fn parse_3dl(text: &str) -> Option<Lut> {
+    let mut mesh: Option<Vec<f64>> = None;
+    let mut rows: Vec<[f64; 3]> = vec![];
+    let mut out_bits: Option<u32> = None;
+    for line in text.lines() {
+        let l = line.trim();
+        if l.is_empty() || l.starts_with('#') || l.starts_with('<') {
+            continue;
+        }
+        if l.starts_with(|c: char| c.is_ascii_alphabetic()) {
+            // "Mesh <in bits> <out bits>" (Lustre header); other keywords are ignored.
+            let t: Vec<&str> = l.split_whitespace().collect();
+            if t[0].eq_ignore_ascii_case("mesh") && t.len() >= 3 {
+                out_bits = t[2].parse().ok();
+            }
+            continue;
+        }
+        let v: Vec<f64> = l.split_whitespace().filter_map(|t| t.parse().ok()).collect();
+        if v.len() > 3 && mesh.is_none() && rows.is_empty() {
+            mesh = Some(v);
+        } else if v.len() == 3 {
+            rows.push([v[0], v[1], v[2]]);
+        } else {
+            return None;
+        }
+    }
+    let is_cube = |k: usize| {
+        let n = (k as f64).cbrt().round() as usize;
+        n * n * n == k
+    };
+    // A 3-entry input mesh (3³ lattice) looks like a data row: tell them apart by the count.
+    if mesh.is_none() && !is_cube(rows.len()) && rows.len() == 28 {
+        mesh = Some(rows.remove(0).to_vec());
+    }
+    let n = match &mesh {
+        Some(m) => m.len(),
+        None => (rows.len() as f64).cbrt().round() as usize,
+    };
+    if n < 2 || rows.len() != n * n * n {
+        return None;
+    }
+    let maxv = rows.iter().flat_map(|r| r.iter()).fold(0.0f64, |m, &v| m.max(v));
+    let out_max = match out_bits {
+        Some(b) if b > 0 && b < 32 => (1u64 << b) as f64 - 1.0,
+        _ => [255.0, 1023.0, 4095.0, 65535.0].into_iter().find(|&m| maxv <= m).unwrap_or(maxv.max(1.0)),
+    };
+    // .3dl rows: red slowest, blue fastest. Our lattice is red fastest.
+    let mut d3 = vec![[0.0f32; 3]; n * n * n];
+    for (k, r) in rows.iter().enumerate() {
+        let (ri, gi, bi) = (k / (n * n), (k / n) % n, k % n);
+        d3[ri + gi * n + bi * n * n] = r.map(|v| (v / out_max) as f32);
+    }
+    Some(Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] })
+}
+
+/// Parse a cineSpace `.csp` LUT (1D or 3D, with its three pre-LUT shapers).
+pub fn parse_csp(text: &str) -> Option<(Lut, [Vec<(f32, f32)>; 3])> {
+    let mut lines = text.lines().map(str::trim).filter(|l| !l.is_empty());
+    if !lines.next()?.starts_with("CSPLUTV100") {
+        return None;
+    }
+    let kind = lines.next()?;
+    let mut lines = lines.peekable();
+    if lines.peek().is_some_and(|l| l.starts_with("BEGIN METADATA")) {
+        for l in lines.by_ref() {
+            if l.starts_with("END METADATA") {
+                break;
+            }
+        }
+    }
+    let nums = |l: &str| -> Option<Vec<f32>> { l.split_whitespace().map(|t| t.parse().ok()).collect() };
+    let mut shaper: [Vec<(f32, f32)>; 3] = Default::default();
+    for ch in shaper.iter_mut() {
+        let n: usize = lines.next()?.parse().ok()?;
+        let ins = nums(lines.next()?)?;
+        let outs = nums(lines.next()?)?;
+        if ins.len() != n || outs.len() != n || n < 2 {
+            return None;
+        }
+        *ch = ins.into_iter().zip(outs).collect();
+    }
+    if kind.starts_with("3D") {
+        let sz = nums(lines.next()?)?;
+        if sz.len() != 3 || sz[0] != sz[1] || sz[1] != sz[2] {
+            return None;
+        }
+        let n = sz[0] as usize;
+        let mut d3 = Vec::with_capacity(n * n * n);
+        for _ in 0..n * n * n {
+            let v = nums(lines.next()?)?;
+            if v.len() != 3 {
+                return None;
+            }
+            d3.push([v[0], v[1], v[2]]);
+        }
+        (n >= 2).then_some((Lut { n1: 0, d1: vec![], n3: n, d3, dmin: [0.0; 3], dmax: [1.0; 3] }, shaper))
+    } else {
+        let n: usize = lines.next()?.parse().ok()?;
+        let mut d1 = Vec::with_capacity(n);
+        for _ in 0..n {
+            let v = nums(lines.next()?)?;
+            if v.len() != 3 {
+                return None;
+            }
+            d1.push([v[0], v[1], v[2]]);
+        }
+        (n >= 2).then_some((Lut { n1: n, d1, n3: 0, d3: vec![], dmin: [0.0; 3], dmax: [1.0; 3] }, shaper))
+    }
+}
+
+fn shape(curve: &[(f32, f32)], x: f32) -> f32 {
+    if curve.len() < 2 {
+        return x;
+    }
+    let i = curve.partition_point(|p| p.0 < x).clamp(1, curve.len() - 1);
+    let (a, b) = (curve[i - 1], curve[i]);
+    let t = ((x - a.0) / (b.0 - a.0).max(1e-12)).clamp(0.0, 1.0);
+    a.1 + (b.1 - a.1) * t
+}
+
+fn shape_inv(curve: &[(f32, f32)], y: f32) -> f32 {
+    let flipped: Vec<(f32, f32)> = curve.iter().map(|&(a, b)| (b, a)).collect();
+    shape(&flipped, y)
+}
+
+/// Parse transform text by its format (detected from `ext` or the content).
+pub fn parse_file(text: &str, ext: &str) -> Option<FileXform> {
+    let ext = ext.to_ascii_lowercase();
+    if ext == "cc" || ext == "ccc" || ext == "cdl" || text.contains("<ColorCorrection") {
+        let v = parse_cdl_xml(text);
+        return (!v.is_empty()).then_some(FileXform::Cdl(v));
+    }
+    if ext == "csp" || text.trim_start().starts_with("CSPLUTV100") {
+        return parse_csp(text).map(|(lut, s)| FileXform::Lut { lut, shaper: Some(s) });
+    }
+    if ext == "spimtx" {
+        return parse_spimtx(text);
+    }
+    if ext == "spi1d" || text.trim_start().starts_with("Version") {
+        return parse_spi1d(text).map(|lut| FileXform::Lut { lut, shaper: None });
+    }
+    if ext == "spi3d" || text.trim_start().starts_with("SPILUT") {
+        return parse_spi3d(text).map(|lut| FileXform::Lut { lut, shaper: None });
+    }
+    if ext == "cube" || text.contains("LUT_3D_SIZE") || text.contains("LUT_1D_SIZE") {
+        return parse_cube(text).map(|lut| FileXform::Lut { lut, shaper: None });
+    }
+    parse_3dl(text).map(|lut| FileXform::Lut { lut, shaper: None })
+}
+
+type FileCache = Mutex<HashMap<String, Option<Arc<FileXform>>>>;
+
+/// Load (and cache) a transform from a file path or inline content.
+pub fn load_file(src: &str) -> Option<Arc<FileXform>> {
+    let src_t = src.trim();
+    if src_t.is_empty() {
+        return None;
+    }
+    static CACHE: OnceLock<FileCache> = OnceLock::new();
+    let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new()));
+    if let Ok(m) = cache.lock()
+        && let Some(v) = m.get(src)
+    {
+        return v.clone();
+    }
+    let inline = src.contains('\n');
+    let parsed = if inline {
+        parse_file(src, "")
+    } else {
+        let ext = std::path::Path::new(src_t).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("");
+        std::fs::read_to_string(src_t).ok().and_then(|t| parse_file(&t, ext))
+    }
+    .map(Arc::new);
+    if let Ok(mut m) = cache.lock() {
+        m.insert(src.to_string(), parsed.clone());
+    }
+    parsed
+}
+
+impl FileXform {
+    pub fn apply(&self, c: [f32; 3], interp: u32, inverse: bool, ccc_id: &str) -> [f32; 3] {
+        match self {
+            FileXform::Cdl(list) => {
+                let cdl = list.iter().find(|(id, _)| !ccc_id.is_empty() && id == ccc_id).or(list.first()).map(|(_, c)| *c).unwrap_or_default();
+                let c64 = c.map(|v| v as f64);
+                let o = if inverse { cdl.invert(c64, true) } else { cdl.apply(c64, true) };
+                o.map(|v| v as f32)
+            }
+            FileXform::Matrix { m, offset } => crate::ocio_config::matrix_apply(m, offset, c.map(|v| v as f64), inverse).map(|v| v as f32),
+            FileXform::Lut { lut, shaper } => {
+                let fwd = |c: [f32; 3]| {
+                    let c = match shaper {
+                        Some(s) => [shape(&s[0], c[0]), shape(&s[1], c[1]), shape(&s[2], c[2])],
+                        None => c,
+                    };
+                    lut.apply_interp(c, interp)
+                };
+                if !inverse {
+                    return fwd(c);
+                }
+                if lut.n3 == 0 {
+                    // 1D: invert each channel exactly through the (monotone) tables.
+                    let mut x = c;
+                    if lut.n1 > 1 {
+                        x = [0, 1, 2].map(|i| {
+                            let curve: Vec<(f32, f32)> =
+                                (0..lut.n1).map(|k| (lut.d1[k][i], lut.dmin[i] + (lut.dmax[i] - lut.dmin[i]) * k as f32 / (lut.n1 - 1) as f32)).collect();
+                            shape(&curve, c[i])
+                        });
+                    }
+                    if let Some(s) = shaper {
+                        x = [shape_inv(&s[0], x[0]), shape_inv(&s[1], x[1]), shape_inv(&s[2], x[2])];
+                    }
+                    return x;
+                }
+                // 3D: damped fixed-point (Newton with an identity Jacobian) from the target.
+                let mut x = c;
+                for _ in 0..40 {
+                    let y = fwd(x);
+                    let e = [c[0] - y[0], c[1] - y[1], c[2] - y[2]];
+                    if e.iter().all(|v| v.abs() < 1e-6) {
+                        break;
+                    }
+                    x = [x[0] + e[0], x[1] + e[1], x[2] + e[2]];
+                }
+                x
+            }
+        }
+    }
+}
diff --git a/crates/effects/src/ocio/program.rs b/crates/effects/src/ocio/program.rs
new file mode 100644
index 000000000..a223dc7b4
--- /dev/null
+++ b/crates/effects/src/ocio/program.rs
@@ -0,0 +1,252 @@
+use super::cdl::Cdl;
+use super::effects::{DISPLAYS, cdl_from_params, custom_xf, looks, parse_looks, profile, space_at};
+use super::lut::{FileXform, load_file};
+use super::space::{ACES_CCT, D65, IDENTITY, Space, Tf, Xform, matrix};
+use super::{Arc, EffectCtx, Lut, invert, mul};
+
+// ---- Colour programs (the GPU compositor's colour-management kernels)
+
+/// One per-pixel step of a colour transform, in the order the CPU effect applies them (see
+/// [`color_program`]).
+#[derive(Clone, Debug)]
+pub enum ColorOp {
+    /// Transfer function, encoded → linear.
+    Decode(Tf),
+    /// Transfer function, linear → encoded.
+    Encode(Tf),
+    /// Linear-RGB matrix.
+    Matrix([[f32; 3]; 3]),
+    /// ASC CDL (forward or exact inverse; `clamp` = the v1.2 style).
+    Cdl { cdl: Cdl, clamp: bool, inverse: bool },
+    /// The Tone Mapped view's roll-off (or its inverse).
+    Tonemap { inverse: bool },
+    /// Color Profile Converter's perceptual gamut compression toward luminance `luma`.
+    Gamut([f64; 3]),
+    /// Negative channels to 0 (the saturation intent).
+    Max0,
+    /// A LUT (0 nearest, 1 trilinear, 2 tetrahedral) with an optional per-channel shaper, forward
+    /// or inverse (as `FileXform::apply`).
+    Lut { lut: Arc<Lut>, shaper: Option<Arc<[Vec<(f32, f32)>; 3]>>, interp: u32, inverse: bool },
+    /// `m × (c + pre) + post` (a custom config's MatrixTransform and RangeTransform).
+    Affine { m: [[f32; 3]; 3], pre: [f32; 3], post: [f32; 3] },
+    /// `max(c, 0) ^ p` per channel (ExponentTransform).
+    Pow([f32; 3]),
+    /// LogTransform / LogAffineTransform, forward or inverse (as `ocio_config::Xf::apply`).
+    LogAffine { base: f32, log_slope: [f32; 3], log_offset: [f32; 3], lin_slope: [f32; 3], lin_offset: [f32; 3], inverse: bool },
+    /// ExponentWithLinearTransform, forward (decode) or inverse (as
+    /// [`crate::ocio_config::moncurve`]).
+    MonCurve { gamma: [f32; 3], offset: [f32; 3], inverse: bool, mirror: bool },
+    /// Clamp each channel to `lo..=hi` (a clamping RangeTransform; ±`f32::MAX` = unbounded).
+    Clamp { lo: [f32; 3], hi: [f32; 3] },
+}
+
+/// The ops of a matrix-and-offset transform (MatrixTransform, `.spimtx`), forward or inverse
+/// (as [`crate::ocio_config::matrix_apply`]).
+fn matrix_ops(m: &[f64; 16], offset: &[f64; 4], inverse: bool, ops: &mut Vec<ColorOp>) {
+    if !inverse {
+        let m = [0, 1, 2].map(|r| [m[r * 4] as f32, m[r * 4 + 1] as f32, m[r * 4 + 2] as f32]);
+        ops.push(ColorOp::Affine { m, pre: [0.0; 3], post: [offset[0] as f32, offset[1] as f32, offset[2] as f32] });
+    } else if let Some(inv) = crate::ocio_config::mat3_inverse(m) {
+        let m = inv.map(|r| r.map(|v| v as f32));
+        ops.push(ColorOp::Affine { m, pre: [-offset[0] as f32, -offset[1] as f32, -offset[2] as f32], post: [0.0; 3] });
+    }
+}
+
+/// The ops of a LUT / CDL / matrix file transform (as [`FileXform::apply`]).
+fn file_ops(x: &FileXform, interp: u32, inverse: bool, ccc_id: &str, ops: &mut Vec<ColorOp>) {
+    match x {
+        FileXform::Cdl(list) => {
+            let cdl = list.iter().find(|(i, _)| !ccc_id.is_empty() && i == ccc_id).or(list.first()).map(|(_, c)| *c).unwrap_or_default();
+            ops.push(ColorOp::Cdl { cdl, clamp: true, inverse });
+        }
+        FileXform::Lut { lut, shaper } => {
+            ops.push(ColorOp::Lut { lut: Arc::new(lut.clone()), shaper: shaper.clone().map(Arc::new), interp, inverse });
+        }
+        FileXform::Matrix { m, offset } => matrix_ops(m, offset, inverse, ops),
+    }
+}
+
+/// The ops of a custom config's transform `x` (as `Xf::apply`).
+fn config_xf_ops(x: &crate::ocio_config::Xf, inverse: bool, ops: &mut Vec<ColorOp>) {
+    use crate::ocio_config::Xf;
+    let f3 = |v: &[f64; 3]| v.map(|x| x as f32);
+    match x {
+        Xf::Inverse(x) => config_xf_ops(x, !inverse, ops),
+        Xf::Matrix { m, offset } => matrix_ops(m, offset, inverse, ops),
+        Xf::File { xf: Some(x), interp, ccc, .. } => file_ops(x, *interp, inverse, ccc, ops),
+        Xf::ExponentLinear { gamma, offset, mirror } => ops.push(ColorOp::MonCurve { gamma: f3(gamma), offset: f3(offset), inverse, mirror: *mirror }),
+        // A BuiltinTransform's curve: forward decodes.
+        Xf::Curve(tf) => ops.push(if inverse { ColorOp::Encode(*tf) } else { ColorOp::Decode(*tf) }),
+        Xf::Named(_) => {}
+        Xf::File { xf: None, .. } | Xf::Unsupported(_) => {}
+        Xf::Exponent(e) => ops.push(ColorOp::Pow([0, 1, 2].map(|k| (if inverse { 1.0 / e[k].max(1e-9) } else { e[k] }) as f32))),
+        Xf::Log { base } => {
+            ops.push(ColorOp::LogAffine { base: *base as f32, log_slope: [1.0; 3], log_offset: [0.0; 3], lin_slope: [1.0; 3], lin_offset: [0.0; 3], inverse })
+        }
+        Xf::LogAffine { base, log_slope, log_offset, lin_slope, lin_offset } => ops.push(ColorOp::LogAffine {
+            base: *base as f32,
+            log_slope: f3(log_slope),
+            log_offset: f3(log_offset),
+            lin_slope: f3(lin_slope),
+            lin_offset: f3(lin_offset),
+            inverse,
+        }),
+        Xf::Cdl(cdl) => ops.push(ColorOp::Cdl { cdl: *cdl, clamp: true, inverse }),
+        Xf::Range(r) => {
+            let (k, off, lo, hi) = r.parts(inverse);
+            let k = k as f32;
+            ops.push(ColorOp::Affine { m: [[k, 0.0, 0.0], [0.0, k, 0.0], [0.0, 0.0, k]], pre: [0.0; 3], post: [off as f32; 3] });
+            if lo.is_finite() || hi.is_finite() {
+                let bound = |v: f64| (v as f32).clamp(-f32::MAX, f32::MAX);
+                ops.push(ColorOp::Clamp { lo: [bound(lo); 3], hi: [bound(hi); 3] });
+            }
+        }
+        Xf::Group(list) => {
+            if inverse {
+                list.iter().rev().for_each(|x| config_xf_ops(x, true, ops));
+            } else {
+                list.iter().for_each(|x| config_xf_ops(x, false, ops));
+            }
+        }
+    }
+}
+
+/// How a colour program meets premultiplied pixels.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Straight {
+    /// `unpremul` (colour 0 below alpha 1e-6); fully transparent pixels untouched (OCIO effects).
+    Unpremul,
+    /// Colour ÷ alpha; fully transparent pixels untouched (`Image::map_straight`, Apply Color LUT).
+    Divide,
+}
+
+fn xform_ops(x: &Xform, ops: &mut Vec<ColorOp>) {
+    if x.dec != Tf::Linear {
+        ops.push(ColorOp::Decode(x.dec));
+    }
+    if !x.ident {
+        ops.push(ColorOp::Matrix(x.m));
+    }
+    if x.enc != Tf::Linear {
+        ops.push(ColorOp::Encode(x.enc));
+    }
+}
+
+/// Effect `id`'s per-pixel transform as a list of [`ColorOp`]s that reproduces the CPU effect
+/// (empty = the layer passes through; custom OCIO configs compile their transforms too). `None`
+/// for another effect.
+pub fn color_program(id: &str, ctx: &EffectCtx) -> Option<(Vec<ColorOp>, Straight)> {
+    let pr = ctx.params;
+    let mut ops = vec![];
+    // Configuration ▸ Custom compiles the config's transforms (a config that can't be read, or
+    // names unknown spaces, passes the pixels through).
+    match custom_xf(id, pr) {
+        Ok(None) => {}
+        Ok(Some(xf)) => {
+            config_xf_ops(&xf, false, &mut ops);
+            return Some((ops, Straight::Unpremul));
+        }
+        Err(_) => return Some((ops, Straight::Unpremul)),
+    }
+    match id {
+        "ec.utility.applylut" => {
+            if let Some(lut) = crate::utility::load_lut(pr.s("lut")) {
+                ops.push(ColorOp::Lut { lut, shaper: None, interp: 2, inverse: false });
+            }
+            return Some((ops, Straight::Divide));
+        }
+        "ec.color.ociocolorspace" => {
+            let (a, z) = (space_at(pr.e("source")), space_at(pr.e("destination")));
+            let (a, z) = if pr.e("direction") == 1 { (z, a) } else { (a, z) };
+            if a.name != z.name {
+                xform_ops(&Xform::new(a, z), &mut ops);
+            }
+        }
+        "ec.color.ociocdl" => {
+            let cdl = cdl_from_params(pr);
+            if cdl != Cdl::default() {
+                ops.push(ColorOp::Cdl { cdl, clamp: pr.e("style") == 0, inverse: pr.e("direction") == 1 });
+            }
+        }
+        "ec.color.ociodisplay" => {
+            let input = space_at(pr.e("source"));
+            let (display, view, inverse) = (pr.e("display") as usize, pr.e("view") as usize, pr.e("direction") == 1);
+            let (_, prims, tf) = DISPLAYS[display.min(DISPLAYS.len() - 1)];
+            if view != 2 && !input.raw {
+                let disp = Space { name: "display", prims: Some((prims, D65)), tf: Tf::Linear, raw: false };
+                let lin = Space { tf: Tf::Linear, ..*input };
+                if !inverse {
+                    ops.push(ColorOp::Decode(input.tf));
+                    xform_ops(&Xform::new(&lin, &disp), &mut ops);
+                    if view == 1 {
+                        ops.push(ColorOp::Tonemap { inverse: false });
+                    }
+                    ops.push(ColorOp::Encode(tf));
+                } else {
+                    ops.push(ColorOp::Decode(tf));
+                    if view == 1 {
+                        ops.push(ColorOp::Tonemap { inverse: true });
+                    }
+                    xform_ops(&Xform::new(&disp, &lin), &mut ops);
+                    ops.push(ColorOp::Encode(input.tf));
+                }
+            }
+        }
+        "ec.color.ociofile" => {
+            if let Some(x) = load_file(pr.s("file")) {
+                let interp = match pr.e("interpolation") {
+                    0 => 0,
+                    1 => 1,
+                    _ => 2,
+                };
+                file_ops(&x, interp, pr.e("direction") == 1, pr.s("cccId"), &mut ops);
+            }
+        }
+        "ec.color.ociolook" => {
+            let mut list = parse_looks(pr.s("looks"));
+            let pick = pr.e("look");
+            if pick > 0
+                && let Some((_, c)) = looks().get(pick as usize - 1)
+            {
+                list.insert(0, (*c, false));
+            }
+            if !list.is_empty() {
+                let (src, dst) = (space_at(pr.e("source")), space_at(pr.e("destination")));
+                let inv = pr.e("direction") == 1;
+                let cct = &ACES_CCT;
+                let (a, z) = if inv { (dst, src) } else { (src, dst) };
+                if inv {
+                    list.reverse();
+                }
+                xform_ops(&Xform::new(a, cct), &mut ops);
+                for (cdl, li) in &list {
+                    ops.push(ColorOp::Cdl { cdl: *cdl, clamp: false, inverse: *li != inv });
+                }
+                xform_ops(&Xform::new(cct, z), &mut ops);
+            }
+        }
+        "ec.utility.colorprofileconverter" => {
+            let (inp, in_lin_default) = profile(ctx, pr.e("inputProfile"));
+            let (out, out_lin_default) = profile(ctx, pr.e("outputProfile"));
+            let in_lin = pr.b("linearizeInputProfile") || in_lin_default && pr.e("inputProfile") == 0;
+            let out_lin = pr.b("linearizeOutputProfile") || out_lin_default && pr.e("outputProfile") == 0;
+            let intent = pr.e("intent");
+            let dec = if in_lin { Tf::Linear } else { inp.tf };
+            let enc = if out_lin { Tf::Linear } else { out.tf };
+            let m = if intent == 3 { mul(&invert(&out.to_ref(false)), &inp.to_ref(false)) } else { matrix(&inp, &out) };
+            let identity = dec == enc && (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-9));
+            if !identity {
+                ops.push(ColorOp::Decode(dec));
+                ops.push(ColorOp::Matrix(m.map(|r| r.map(|v| v as f32))));
+                match intent {
+                    0 => ops.push(ColorOp::Gamut(out.to_ref(true)[1])),
+                    2 => ops.push(ColorOp::Max0),
+                    _ => {}
+                }
+                ops.push(ColorOp::Encode(enc));
+            }
+        }
+        _ => return None,
+    }
+    Some((ops, Straight::Unpremul))
+}
diff --git a/crates/effects/src/ocio/registry.rs b/crates/effects/src/ocio/registry.rs
new file mode 100644
index 000000000..cd3bd02a7
--- /dev/null
+++ b/crates/effects/src/ocio/registry.rs
@@ -0,0 +1,129 @@
+use super::cdl::sl;
+use super::effects::{
+    CONFIGS, DISPLAYS, PROFILES, VIEWS, color_stabilizer, direction, looks, ocio_cdl, ocio_cst, ocio_display, ocio_file, ocio_look, profile_converter,
+    space_param, spec,
+};
+use super::space::SPACES;
+use super::{EffectSpec, ParamUi, Value, num, p, popup, slider};
+
+pub fn specs() -> Vec<EffectSpec> {
+    let cc = "Color Correction";
+    let srgb = SPACES.iter().position(|s| s.name == "sRGB").unwrap_or(0) as u32;
+    let lin709 = SPACES.iter().position(|s| s.name == "Linear Rec.709 (sRGB)").unwrap_or(0) as u32;
+    let acescg = SPACES.iter().position(|s| s.name == "ACEScg").unwrap_or(0) as u32;
+    let mut look_opts = vec!["None"];
+    look_opts.extend(looks().iter().map(|(n, _)| *n));
+    vec![
+        spec(
+            "ec.color.ociocdl",
+            "OCIO CDL Transform",
+            cc,
+            vec![
+                p("slopeRed", "Slope Red", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("slopeGreen", "Slope Green", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("slopeBlue", "Slope Blue", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("offsetRed", "Offset Red", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
+                p("offsetGreen", "Offset Green", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
+                p("offsetBlue", "Offset Blue", num(0.0), sl(-100.0, 100.0, -1.0, 1.0)),
+                p("powerRed", "Power Red", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("powerGreen", "Power Green", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("powerBlue", "Power Blue", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("saturation", "Saturation", num(1.0), sl(0.0, 100.0, 0.0, 4.0)),
+                p("style", "Style", Value::Enum(0), popup(&["ASC CDL v1.2", "No Clamp"])),
+                direction(),
+            ],
+            ocio_cdl,
+        ),
+        spec(
+            "ec.color.ociocolorspace",
+            "OCIO Color Space Transform",
+            cc,
+            vec![
+                p("config", "Configuration", Value::Enum(0), popup(CONFIGS)),
+                p("configFile", "Config File (.ocio)", Value::Str(String::new()), crate::file_ui(&["ocio"])),
+                space_param("source", "Source", lin709),
+                p("sourceName", "Source (config name)", Value::Str(String::new()), ParamUi::Text),
+                space_param("destination", "Destination", srgb),
+                p("destinationName", "Destination (config name)", Value::Str(String::new()), ParamUi::Text),
+                direction(),
+            ],
+            ocio_cst,
+        ),
+        spec(
+            "ec.color.ociodisplay",
+            "OCIO Display Transform",
+            cc,
+            vec![
+                p("config", "Configuration", Value::Enum(0), popup(CONFIGS)),
+                p("configFile", "Config File (.ocio)", Value::Str(String::new()), crate::file_ui(&["ocio"])),
+                space_param("source", "Input Color Space", lin709),
+                p("sourceName", "Source (config name)", Value::Str(String::new()), ParamUi::Text),
+                p("display", "Display Device", Value::Enum(0), popup(&DISPLAYS.iter().map(|d| d.0).collect::<Vec<_>>())),
+                p("displayName", "Display (config name)", Value::Str(String::new()), ParamUi::Text),
+                p("view", "View Transform", Value::Enum(0), popup(VIEWS)),
+                p("viewName", "View (config name)", Value::Str(String::new()), ParamUi::Text),
+                direction(),
+            ],
+            ocio_display,
+        ),
+        // `file`: a path to a .cube/.3dl/.csp/.cc/.ccc/.cdl file, or the file's text itself.
+        spec(
+            "ec.color.ociofile",
+            "OCIO File Transform",
+            cc,
+            vec![
+                p("file", "File", Value::Str(String::new()), crate::file_ui(&["cube", "3dl", "csp", "cc", "ccc", "cdl", "spi1d", "spi3d", "spimtx"])),
+                p("cccId", "CCC ID", Value::Str(String::new()), ParamUi::Text),
+                p("interpolation", "Interpolation", Value::Enum(3), popup(&["Nearest", "Linear", "Tetrahedral", "Best"])),
+                direction(),
+            ],
+            ocio_file,
+        ),
+        spec(
+            "ec.color.ociolook",
+            "OCIO Look Transform",
+            cc,
+            vec![
+                p("config", "Configuration", Value::Enum(0), popup(&["Built-in (EffectCraft minimal)"])),
+                space_param("source", "Source", acescg),
+                space_param("destination", "Destination", acescg),
+                p("look", "Look", Value::Enum(0), popup(&look_opts)),
+                p("looks", "Looks", Value::Str(String::new()), ParamUi::Text),
+                direction(),
+            ],
+            ocio_look,
+        ),
+        spec(
+            "ec.color.colorstabilizer",
+            "Color Stabilizer",
+            cc,
+            vec![
+                // The pivot frame (After Effects' Set Frame button stores it).
+                p("referenceFrame", "Reference Frame (s)", num(0.0), slider(-100000.0, 100000.0, 0.0, 60.0, 2)),
+                p("stabilize", "Stabilize", Value::Enum(0), popup(&["Brightness", "Levels", "Curves"])),
+                p("blackPoint", "Black Point", Value::Vec2([0.25, 0.75]), ParamUi::Point),
+                p("midPoint", "Mid Point", Value::Vec2([0.5, 0.5]), ParamUi::Point),
+                p("whitePoint", "White Point", Value::Vec2([0.75, 0.25]), ParamUi::Point),
+                p("sampleSize", "Sample Size", num(5.0), slider(1.0, 100.0, 1.0, 50.0, 0)),
+            ],
+            color_stabilizer,
+        ),
+        spec(
+            "ec.utility.colorprofileconverter",
+            "Color Profile Converter",
+            "Utility",
+            vec![
+                p("inputProfile", "Input Profile", Value::Enum(0), popup(PROFILES)),
+                p("linearizeInputProfile", "Linearize Input Profile", Value::Bool(false), ParamUi::Checkbox),
+                p("outputProfile", "Output Profile", Value::Enum(1), popup(PROFILES)),
+                p("linearizeOutputProfile", "Linearize Output Profile", Value::Bool(false), ParamUi::Checkbox),
+                p("intent", "Intent", Value::Enum(1), popup(&["Perceptual", "Relative Colorimetric", "Saturation", "Absolute Colorimetric"])),
+                // Our built-in profiles share a zero black point and none is scene-referred, so
+                // these two are kept for compatibility and do not change the result.
+                p("useBlackPointCompensation", "Use Black Point Compensation", Value::Bool(true), ParamUi::Checkbox),
+                p("sceneRefCompensation", "Scene-ref. Profile Compensation", Value::Enum(2), popup(&["On", "Off", "Use Project Setting"])),
+            ],
+            profile_converter,
+        ),
+    ]
+}
diff --git a/crates/effects/src/ocio/space.rs b/crates/effects/src/ocio/space.rs
new file mode 100644
index 000000000..1a1d8f69b
--- /dev/null
+++ b/crates/effects/src/ocio/space.rs
@@ -0,0 +1,214 @@
+use super::{invert, mul, mul_vec, rgb_to_xyz};
+
+pub(super) type M3 = [[f64; 3]; 3];
+
+pub(crate) const D65: [f64; 2] = [0.3127, 0.3290];
+
+const ACES_WHITE: [f64; 2] = [0.32168, 0.33767];
+
+const AP0: [[f64; 2]; 3] = [[0.7347, 0.2653], [0.0, 1.0], [0.0001, -0.0770]];
+
+const AP1: [[f64; 2]; 3] = [[0.713, 0.293], [0.165, 0.830], [0.128, 0.044]];
+
+pub(crate) const REC709: [[f64; 2]; 3] = [[0.640, 0.330], [0.300, 0.600], [0.150, 0.060]];
+
+pub(crate) const REC2020: [[f64; 2]; 3] = [[0.708, 0.292], [0.170, 0.797], [0.131, 0.046]];
+
+pub(crate) const P3: [[f64; 2]; 3] = [[0.680, 0.320], [0.265, 0.690], [0.150, 0.060]];
+
+pub(super) const IDENTITY: M3 = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]];
+
+/// Transfer functions (encoded ↔ linear).
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Tf {
+    Linear,
+    Srgb,
+    Gamma(f64),
+    AcesCct,
+    /// ACEScc (Academy S-2014-003), the pure-log grading encoding.
+    AcesCc,
+    /// SMPTE ST 2084 with 1.0 = 100 cd/m².
+    Pq,
+}
+
+/// ACEScc: the lowest code value (linear 0 and below) and the end of its toe (linear 2⁻¹⁵).
+const ACESCC_MIN: f64 = (-16.0 + 9.72) / 17.52;
+
+const ACESCC_TOE: f64 = (-15.0 + 9.72) / 17.52;
+
+impl Tf {
+    pub fn decode(self, v: f64) -> f64 {
+        match self {
+            Tf::Linear => v,
+            Tf::Srgb => {
+                let a = v.abs();
+                let l = if a <= 0.04045 { a / 12.92 } else { ((a + 0.055) / 1.055).powf(2.4) };
+                l.copysign(v)
+            }
+            Tf::Gamma(g) => v.abs().powf(g).copysign(v),
+            Tf::AcesCct => {
+                if v <= 0.155_251_141_552_511 {
+                    (v - 0.072_905_534_195_835_5) / 10.540_237_741_654_5
+                } else if v < (65504f64.log2() + 9.72) / 17.52 {
+                    2f64.powf(v * 17.52 - 9.72)
+                } else {
+                    65504.0
+                }
+            }
+            Tf::AcesCc => {
+                if v < ACESCC_TOE {
+                    (2f64.powf(v * 17.52 - 9.72) - 2f64.powi(-16)) * 2.0
+                } else if v < (65504f64.log2() + 9.72) / 17.52 {
+                    2f64.powf(v * 17.52 - 9.72)
+                } else {
+                    65504.0
+                }
+            }
+            Tf::Pq => {
+                let (m1, m2, c1, c2, c3) = pq_consts();
+                let e = v.max(0.0).powf(1.0 / m2);
+                let l = ((e - c1).max(0.0) / (c2 - c3 * e)).powf(1.0 / m1);
+                l * 100.0
+            }
+        }
+    }
+    pub fn encode(self, v: f64) -> f64 {
+        match self {
+            Tf::Linear => v,
+            Tf::Srgb => {
+                let a = v.abs();
+                let e = if a <= 0.003_130_8 { a * 12.92 } else { 1.055 * a.powf(1.0 / 2.4) - 0.055 };
+                e.copysign(v)
+            }
+            Tf::Gamma(g) => v.abs().powf(1.0 / g).copysign(v),
+            Tf::AcesCct => {
+                if v <= 0.007_812_5 {
+                    10.540_237_741_654_5 * v + 0.072_905_534_195_835_5
+                } else {
+                    (v.log2() + 9.72) / 17.52
+                }
+            }
+            Tf::AcesCc => {
+                if v <= 0.0 {
+                    ACESCC_MIN
+                } else if v < 2f64.powi(-15) {
+                    ((2f64.powi(-16) + v * 0.5).log2() + 9.72) / 17.52
+                } else {
+                    (v.log2() + 9.72) / 17.52
+                }
+            }
+            Tf::Pq => {
+                let (m1, m2, c1, c2, c3) = pq_consts();
+                let y = (v / 100.0).max(0.0).powf(m1);
+                ((c1 + c2 * y) / (1.0 + c3 * y)).powf(m2)
+            }
+        }
+    }
+}
+
+fn pq_consts() -> (f64, f64, f64, f64, f64) {
+    (2610.0 / 16384.0, 2523.0 / 4096.0 * 128.0, 3424.0 / 4096.0, 2413.0 / 4096.0 * 32.0, 2392.0 / 4096.0 * 32.0)
+}
+
+/// A colour space of the built-in config.
+#[derive(Clone, Copy, Debug)]
+pub struct Space {
+    pub name: &'static str,
+    /// Primaries and white (None = CIE XYZ itself).
+    pub prims: Option<([[f64; 2]; 3], [f64; 2])>,
+    pub tf: Tf,
+    /// Passes data through untouched.
+    pub raw: bool,
+}
+
+pub(crate) const fn sp(name: &'static str, prims: [[f64; 2]; 3], white: [f64; 2], tf: Tf) -> Space {
+    Space { name, prims: Some((prims, white)), tf, raw: false }
+}
+
+/// The built-in configuration's colour spaces, in popup order.
+pub(crate) const ACES2065_1: Space = sp("ACES2065-1", AP0, ACES_WHITE, Tf::Linear);
+
+pub(crate) const ACES_CG: Space = sp("ACEScg", AP1, ACES_WHITE, Tf::Linear);
+
+pub(super) const ACES_CCT: Space = sp("ACEScct", AP1, ACES_WHITE, Tf::AcesCct);
+
+pub const SPACES: &[Space] = &[
+    ACES2065_1,
+    ACES_CG,
+    ACES_CCT,
+    sp("Linear Rec.709 (sRGB)", REC709, D65, Tf::Linear),
+    sp("sRGB", REC709, D65, Tf::Srgb),
+    sp("Gamma 2.4 Rec.709", REC709, D65, Tf::Gamma(2.4)),
+    sp("Linear Rec.2020", REC2020, D65, Tf::Linear),
+    sp("Gamma 2.4 Rec.2020", REC2020, D65, Tf::Gamma(2.4)),
+    sp("Linear P3-D65", P3, D65, Tf::Linear),
+    sp("Display P3", P3, D65, Tf::Srgb),
+    Space { name: "CIE-XYZ-D65", prims: None, tf: Tf::Linear, raw: false },
+    Space { name: "Raw", prims: None, tf: Tf::Linear, raw: true },
+];
+
+pub fn space_names() -> Vec<&'static str> {
+    SPACES.iter().map(|s| s.name).collect()
+}
+
+#[cfg(test)]
+pub fn space_by_name(n: &str) -> Option<&'static Space> {
+    SPACES.iter().find(|s| s.name.eq_ignore_ascii_case(n))
+}
+
+/// Bradford chromatic adaptation from white `src` to white `dst` (xy).
+pub fn bradford(src: [f64; 2], dst: [f64; 2]) -> M3 {
+    if src == dst {
+        return IDENTITY;
+    }
+    const MB: M3 = [[0.8951, 0.2664, -0.1614], [-0.7502, 1.7135, 0.0367], [0.0389, -0.0685, 1.0296]];
+    let xyz = |c: [f64; 2]| [c[0] / c[1], 1.0, (1.0 - c[0] - c[1]) / c[1]];
+    let s = mul_vec(&MB, xyz(src));
+    let d = mul_vec(&MB, xyz(dst));
+    let diag = [[d[0] / s[0], 0.0, 0.0], [0.0, d[1] / s[1], 0.0], [0.0, 0.0, d[2] / s[2]]];
+    mul(&invert(&MB), &mul(&diag, &MB))
+}
+
+impl Space {
+    /// Linear RGB → XYZ D65 (Bradford-adapted when `adapt`, else the space's own white).
+    pub fn to_ref(self, adapt: bool) -> M3 {
+        match self.prims {
+            None => IDENTITY,
+            Some((p, w)) => {
+                let m = rgb_to_xyz(p, w);
+                if adapt { mul(&bradford(w, D65), &m) } else { m }
+            }
+        }
+    }
+}
+
+/// Linear-RGB matrix from space `a` to space `b`.
+pub fn matrix(a: &Space, b: &Space) -> M3 {
+    mul(&invert(&b.to_ref(true)), &a.to_ref(true))
+}
+
+/// A compiled colour-space conversion.
+#[derive(Clone, Copy, Debug)]
+pub struct Xform {
+    pub(super) dec: Tf,
+    pub(super) m: [[f32; 3]; 3],
+    pub(super) ident: bool,
+    pub(super) enc: Tf,
+}
+
+impl Xform {
+    pub fn new(a: &Space, b: &Space) -> Xform {
+        if a.raw || b.raw {
+            return Xform { dec: Tf::Linear, m: IDENTITY.map(|r| r.map(|v| v as f32)), ident: true, enc: Tf::Linear };
+        }
+        let m = matrix(a, b);
+        let ident = (0..3).all(|i| (0..3).all(|j| (m[i][j] - IDENTITY[i][j]).abs() < 1e-12));
+        Xform { dec: a.tf, m: m.map(|r| r.map(|v| v as f32)), ident, enc: b.tf }
+    }
+    #[inline]
+    pub fn apply(&self, c: [f32; 3]) -> [f32; 3] {
+        let l = c.map(|v| self.dec.decode(v as f64) as f32);
+        let l = if self.ident { l } else { [0, 1, 2].map(|i| self.m[i][0] * l[0] + self.m[i][1] * l[1] + self.m[i][2] * l[2]) };
+        l.map(|v| self.enc.encode(v as f64) as f32)
+    }
+}
diff --git a/crates/effects/src/ocio/tests.rs b/crates/effects/src/ocio/tests.rs
new file mode 100644
index 000000000..edbc6eff2
--- /dev/null
+++ b/crates/effects/src/ocio/tests.rs
@@ -0,0 +1,313 @@
+use super::*;
+use crate::{EffectEnv, EffectHost, Image, LayerPixels, run_fx};
+
+fn close(a: M3, b: M3, tol: f64) {
+    for i in 0..3 {
+        for j in 0..3 {
+            assert!((a[i][j] - b[i][j]).abs() < tol, "{a:?} vs {b:?}");
+        }
+    }
+}
+
+#[test]
+fn aces_matrices_match_published_values() {
+    let ap0 = space_by_name("ACES2065-1").unwrap();
+    let ap1 = space_by_name("ACEScg").unwrap();
+    // Academy S-2014-004 AP0 → AP1.
+    close(
+        matrix(ap0, ap1),
+        [
+            [1.451_439_316_1, -0.236_510_746_9, -0.214_928_569_3],
+            [-0.076_553_773_4, 1.176_229_699_8, -0.099_675_926_4],
+            [0.008_316_148_4, -0.006_032_449_8, 0.997_716_301_4],
+        ],
+        2e-4,
+    );
+    // ACEScg → linear Rec.709 with Bradford adaptation (published ACES config value).
+    let lin = space_by_name("Linear Rec.709 (sRGB)").unwrap();
+    close(matrix(ap1, lin), [[1.705_05, -0.621_79, -0.083_26], [-0.130_26, 1.140_80, -0.010_55], [-0.024_00, -0.128_97, 1.152_97]], 2e-3);
+    // White maps to white.
+    let w = mul_vec(&matrix(ap1, lin), [1.0, 1.0, 1.0]);
+    assert!(w.iter().all(|v| (v - 1.0).abs() < 1e-3), "{w:?}");
+}
+
+#[test]
+fn transfer_functions_round_trip() {
+    for tf in [Tf::Srgb, Tf::Gamma(2.4), Tf::AcesCct, Tf::Pq] {
+        for v in [0.0, 0.001, 0.18, 0.5, 1.0, 4.0] {
+            let r = tf.decode(tf.encode(v));
+            assert!((r - v).abs() < 1e-6 * v.max(1.0), "{tf:?} {v} {r}");
+        }
+    }
+    // ACEScct of 18 % grey (S-2016-001).
+    assert!((Tf::AcesCct.encode(0.18) - 0.413_588).abs() < 1e-5);
+    // PQ: 100 nits (1.0) encodes to ≈ 0.508.
+    assert!((Tf::Pq.encode(1.0) - 0.508).abs() < 1e-3);
+}
+
+#[test]
+fn color_space_transform_effect_round_trips() {
+    let img = Image::filled(4, 4, [0.2, 0.5, 0.7, 1.0]);
+    let srgb = SPACES.iter().position(|s| s.name == "sRGB").unwrap() as u32;
+    let cg = SPACES.iter().position(|s| s.name == "ACEScg").unwrap() as u32;
+    let a = run_fx("ec.color.ociocolorspace", &[("source", Value::Enum(srgb)), ("destination", Value::Enum(cg))], img.clone(), 0.0, EffectEnv::default());
+    assert_ne!(a.img.data, img.data);
+    let b = run_fx("ec.color.ociocolorspace", &[("source", Value::Enum(cg)), ("destination", Value::Enum(srgb))], a.img.clone(), 0.0, EffectEnv::default());
+    let c = run_fx(
+        "ec.color.ociocolorspace",
+        &[("source", Value::Enum(srgb)), ("destination", Value::Enum(cg)), ("direction", Value::Enum(1))],
+        a.img,
+        0.0,
+        EffectEnv::default(),
+    );
+    for (x, y) in b.img.data.iter().zip(&img.data).chain(c.img.data.iter().zip(&img.data)) {
+        assert!((0..4).all(|k| (x[k] - y[k]).abs() < 1e-4), "{x:?} {y:?}");
+    }
+}
+
+#[test]
+fn cdl_math() {
+    let cdl = Cdl { slope: [1.2, 1.0, 0.8], offset: [0.05, 0.0, -0.02], power: [1.1, 1.0, 0.9], sat: 0.8 };
+    let c = [0.3, 0.5, 0.7];
+    // Hand computation of the v1.2 formula.
+    let sop = [(0.3f64 * 1.2 + 0.05).powf(1.1), 0.5, (0.7f64 * 0.8 - 0.02).powf(0.9)];
+    let l = sop[0] * 0.2126 + sop[1] * 0.7152 + sop[2] * 0.0722;
+    let want = sop.map(|v| l + 0.8 * (v - l));
+    let got = cdl.apply(c, true);
+    for k in 0..3 {
+        assert!((got[k] - want[k]).abs() < 1e-12);
+    }
+    let back = cdl.invert(got, true);
+    for k in 0..3 {
+        assert!((back[k] - c[k]).abs() < 1e-9);
+    }
+    // v1.2 clamps, No Clamp keeps negatives.
+    let neg = Cdl { offset: [-0.5; 3], ..Cdl::default() };
+    assert_eq!(neg.apply([0.2; 3], true), [0.0; 3]);
+    assert!((neg.apply([0.2; 3], false)[0] + 0.3).abs() < 1e-12);
+    let img = Image::filled(2, 2, [0.3, 0.5, 0.7, 1.0]);
+    let out = run_fx("ec.color.ociocdl", &[("slopeRed", num(1.2)), ("offsetRed", num(0.05)), ("powerRed", num(1.1))], img, 0.0, EffectEnv::default());
+    let r = (0.3f64 * 1.2 + 0.05).powf(1.1);
+    assert!((out.img.get(0, 0)[0] as f64 - r).abs() < 1e-5);
+}
+
+fn identity_lattice(n: usize, f: impl Fn([f32; 3]) -> [f32; 3]) -> Vec<[f32; 3]> {
+    let mut v = vec![];
+    for b in 0..n {
+        for g in 0..n {
+            for r in 0..n {
+                let s = (n - 1) as f32;
+                v.push(f([r as f32 / s, g as f32 / s, b as f32 / s]));
+            }
+        }
+    }
+    v
+}
+
+/// Sony Imageworks `.spi1d`, `.spi3d` and `.spimtx` (Blender's configs use them, #410), and
+/// malformed ones rejected without panicking.
+#[test]
+fn spi_files_parse() {
+    let spi1d = "Version 1\nFrom 0.0 2.0\nLength 3\nComponents 1\n{\n0.0\n0.25\n1.0\n}\n";
+    let x = parse_file(spi1d, "spi1d").unwrap();
+    let o = x.apply([1.0, 0.5, 2.0], 1, false, "");
+    assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.125).abs() < 1e-6 && (o[2] - 1.0).abs() < 1e-6, "{o:?}");
+    let back = x.apply(o, 1, true, "");
+    assert!((back[0] - 1.0).abs() < 1e-5 && (back[2] - 2.0).abs() < 1e-5, "{back:?}");
+    let three = parse_spi1d("Version 1\nFrom 0 1\nLength 2\nComponents 3\n{\n0 0 0\n1 0.5 2\n}\n").unwrap();
+    assert_eq!(three.d1, vec![[0.0; 3], [1.0, 0.5, 2.0]]);
+    let mut spi3d = String::from("SPILUT 1.0\n3 3\n2 2 2\n");
+    for (r, g, b) in (0..8).map(|i| (i & 1, (i >> 1) & 1, i >> 2)) {
+        spi3d += &format!("{r} {g} {b} {} {} {}\n", r as f32 * 0.5, g, b);
+    }
+    let x = parse_file(&spi3d, "spi3d").unwrap();
+    let o = x.apply([1.0, 0.5, 0.25], 1, false, "");
+    assert!((o[0] - 0.5).abs() < 1e-6 && (o[1] - 0.5).abs() < 1e-6 && (o[2] - 0.25).abs() < 1e-6, "{o:?}");
+    let m = parse_file("2 0 0 6553.5\n0 1 0 0\n0 0 1 0\n", "spimtx").unwrap();
+    let o = m.apply([0.25, 0.5, 1.0], 1, false, "");
+    assert!((o[0] - 0.6).abs() < 1e-6 && o[1] == 0.5 && o[2] == 1.0, "{o:?}");
+    assert!((m.apply(o, 1, true, "")[0] - 0.25).abs() < 1e-6);
+    for bad in [
+        "Version 1\nFrom 0 1\nLength 99999999999\nComponents 1\n{\n0\n}\n",
+        "Version 1\nFrom 1 0\nLength 2\nComponents 1\n{\n0\n1\n}\n",
+        "Version 1\nFrom 0 1\nLength 3\nComponents 1\n{\n0\n1\n}\n",
+        "Version 1\nFrom 0 1\nLength 2\nComponents 2\n{\n0 0\n1 1\n}\n",
+    ] {
+        assert!(parse_spi1d(bad).is_none(), "{bad}");
+    }
+    assert!(parse_spi3d("SPILUT 1.0\n3 3\n4000 4000 4000\n").is_none());
+    assert!(parse_spi3d("SPILUT 1.0\n3 3\n2 2 2\n9 0 0 1 1 1\n").is_none());
+    assert!(parse_spi3d("SPILUT 1.0\n3 3\n2 2 2\n0 0 0 1 1 1\n").is_none(), "incomplete lattice");
+    assert!(parse_spimtx("1 0 0\n0 1 0\n").is_none());
+    assert!(parse_spimtx("NaN 0 0 0 0 1 0 0 0 0 1 0").is_none());
+}
+
+#[test]
+fn lut_files_parse_and_interpolate() {
+    // .cube with a non-linear lattice: trilinear between lattice points.
+    let f = |c: [f32; 3]| [c[0] * c[0], c[1], 1.0 - c[2]];
+    let mut cube = String::from("LUT_3D_SIZE 3\n");
+    for r in identity_lattice(3, f) {
+        cube += &format!("{} {} {}\n", r[0], r[1], r[2]);
+    }
+    let Some(FileXform::Lut { lut, .. }) = parse_file(&cube, "cube") else { panic!() };
+    // Trilinear between 0.5 (0.25) and 1.0 (1.0) at 0.75 → 0.625.
+    let o = lut.apply_interp([0.75, 0.3, 0.2], 1);
+    assert!((o[0] - 0.625).abs() < 1e-6 && (o[1] - 0.3).abs() < 1e-6 && (o[2] - 0.8).abs() < 1e-6, "{o:?}");
+    // Nearest snaps.
+    assert_eq!(lut.apply_interp([0.74, 0.0, 0.0], 0)[0], 0.25);
+    // .3dl (blue fastest, 10-bit integers, mesh line).
+    let mut tdl = String::from("0 511 1023\n");
+    for r in 0..3 {
+        for g in 0..3 {
+            for b in 0..3 {
+                let v = [r, g, b].map(|i| i as f64 * 511.5);
+                tdl += &format!("{} {} {}\n", v[0].round(), v[1].round(), (1023.0 - v[2]).round());
+            }
+        }
+    }
+    let Some(FileXform::Lut { lut, .. }) = parse_file(&tdl, "3dl") else { panic!() };
+    let o = lut.apply_interp([0.25, 0.5, 0.25], 1);
+    assert!((o[0] - 0.25).abs() < 2e-3 && (o[1] - 0.5).abs() < 2e-3 && (o[2] - 0.75).abs() < 2e-3, "{o:?}");
+    // .csp with a squaring pre-LUT on red and an identity 2³ lattice.
+    let mut csp = String::from("CSPLUTV100\n3D\n\n3\n0 0.5 1\n0 0.25 1\n2\n0 1\n0 1\n2\n0 1\n0 1\n\n2 2 2\n");
+    for r in identity_lattice(2, |c| c) {
+        csp += &format!("{} {} {}\n", r[0], r[1], r[2]);
+    }
+    let x = parse_file(&csp, "csp").unwrap();
+    let o = x.apply([0.5, 0.4, 0.6], 2, false, "");
+    assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.4).abs() < 1e-6, "{o:?}");
+    let inv = x.apply(o, 2, true, "");
+    assert!((inv[0] - 0.5).abs() < 1e-4, "{inv:?}");
+    // CDL collection: pick by id.
+    let ccc = r#"<ColorCorrectionCollection><ColorCorrection id="a"><SOPNode><Slope>2 2 2</Slope><Offset>0 0 0</Offset><Power>1 1 1</Power></SOPNode></ColorCorrection>
+            <ColorCorrection id='b'><SOPNode><Slope>0.5 0.5 0.5</Slope></SOPNode><SatNode><Saturation>1</Saturation></SatNode></ColorCorrection></ColorCorrectionCollection>"#;
+    let x = parse_file(ccc, "ccc").unwrap();
+    assert!((x.apply([0.4; 3], 2, false, "b")[0] - 0.2).abs() < 1e-6);
+    assert!((x.apply([0.4; 3], 2, false, "a")[0] - 0.8).abs() < 1e-6);
+    assert!((x.apply([0.4; 3], 2, false, "")[0] - 0.8).abs() < 1e-6);
+    // Effect with inline content; inverse of a 3D lattice.
+    let img = Image::filled(2, 2, [0.6, 0.3, 0.2, 1.0]);
+    let out = run_fx("ec.color.ociofile", &[("file", Value::Str(cube.clone()))], img.clone(), 0.0, EffectEnv::default());
+    let back = run_fx("ec.color.ociofile", &[("file", Value::Str(cube)), ("direction", Value::Enum(1))], out.img, 0.0, EffectEnv::default());
+    assert!((back.img.get(0, 0)[0] - 0.6).abs() < 1e-3, "{:?}", back.img.get(0, 0));
+    assert!(parse_file("garbage", "3dl").is_none());
+}
+
+#[test]
+fn display_and_look_transforms() {
+    // Linear 0.18 through the sRGB display / Standard view = sRGB encoding of 0.18.
+    let img = Image::filled(2, 2, [0.18, 0.18, 0.18, 1.0]);
+    let out = run_fx("ec.color.ociodisplay", &[], img.clone(), 0.0, EffectEnv::default());
+    assert!((out.img.get(0, 0)[0] as f64 - Tf::Srgb.encode(0.18)).abs() < 1e-5);
+    let back = run_fx("ec.color.ociodisplay", &[("direction", Value::Enum(1))], out.img, 0.0, EffectEnv::default());
+    assert!((back.img.get(0, 0)[0] - 0.18).abs() < 1e-5);
+    // Tone mapped view keeps highlights below 1.
+    let hot = Image::filled(1, 1, [8.0, 8.0, 8.0, 1.0]);
+    let tm = run_fx("ec.color.ociodisplay", &[("view", Value::Enum(1))], hot, 0.0, EffectEnv::default());
+    assert!(tm.img.get(0, 0)[0] < 1.0);
+    assert!((tonemap_inv(tonemap(3.0)) - 3.0).abs() < 1e-9);
+    // Looks: Warm raises red over blue; its inverse undoes it.
+    let grey = Image::filled(1, 1, [0.18, 0.18, 0.18, 1.0]);
+    let w = run_fx("ec.color.ociolook", &[("looks", Value::Str("Warm".into()))], grey.clone(), 0.0, EffectEnv::default());
+    let px = w.img.get(0, 0);
+    assert!(px[0] > px[2]);
+    let u = run_fx("ec.color.ociolook", &[("looks", Value::Str("-Warm".into()))], w.img, 0.0, EffectEnv::default());
+    assert!((u.img.get(0, 0)[0] - 0.18).abs() < 1e-4 && (u.img.get(0, 0)[2] - 0.18).abs() < 1e-4);
+    assert_eq!(parse_looks("Warm, -Cool, nope").len(), 2);
+}
+
+#[test]
+fn profile_converter_converts_and_round_trips() {
+    let img = Image::filled(2, 2, [0.8, 0.4, 0.1, 1.0]);
+    // sRGB → Rec. 2020 (relative), then back.
+    let a = run_fx(
+        "ec.utility.colorprofileconverter",
+        &[("inputProfile", Value::Enum(1)), ("outputProfile", Value::Enum(3))],
+        img.clone(),
+        0.0,
+        EffectEnv::default(),
+    );
+    assert_ne!(a.img.data, img.data);
+    let b =
+        run_fx("ec.utility.colorprofileconverter", &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1))], a.img, 0.0, EffectEnv::default());
+    assert!((0..3).all(|k| (b.img.get(0, 0)[k] - img.get(0, 0)[k]).abs() < 1e-4));
+    // Same profile both sides: identity. Working space defaults to sRGB.
+    let c = run_fx(
+        "ec.utility.colorprofileconverter",
+        &[("inputProfile", Value::Enum(0)), ("outputProfile", Value::Enum(1))],
+        img.clone(),
+        0.0,
+        EffectEnv::default(),
+    );
+    assert_eq!(c.img.data, img.data);
+    // Perceptual pulls out-of-gamut colours inside: saturated Rec.2020 green into sRGB.
+    let g = Image::filled(1, 1, [0.0, 1.0, 0.0, 1.0]);
+    let rel = run_fx(
+        "ec.utility.colorprofileconverter",
+        &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1))],
+        g.clone(),
+        0.0,
+        EffectEnv::default(),
+    );
+    assert!(rel.img.get(0, 0)[0] < 0.0);
+    let per = run_fx(
+        "ec.utility.colorprofileconverter",
+        &[("inputProfile", Value::Enum(3)), ("outputProfile", Value::Enum(1)), ("intent", Value::Enum(0))],
+        g,
+        0.0,
+        EffectEnv::default(),
+    );
+    assert!(per.img.get(0, 0).iter().all(|v| *v >= -1e-6));
+}
+
+struct RefHost(Image);
+impl EffectHost for RefHost {
+    fn layer(&self, _: u64, _: bool) -> Option<LayerPixels> {
+        None
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+    fn self_at(&self, _: f64, _: usize) -> Option<Buf> {
+        Some(Buf { img: self.0.clone(), offset: [0.0; 2], scale: 1.0 })
+    }
+}
+
+#[test]
+fn color_stabilizer_matches_the_reference_frame() {
+    let mk = |k: f32, o: f32| {
+        let mut img = Image::new(40, 40);
+        for y in 0..40 {
+            for x in 0..40 {
+                let v = (x as f32 / 40.0) * k + o;
+                img.set(x, y, [v, v * 0.9, v * 0.8, 1.0]);
+            }
+        }
+        img
+    };
+    let reference = mk(1.0, 0.0);
+    let flicker = mk(0.8, 0.1);
+    let host = RefHost(reference.clone());
+    let env = EffectEnv { host: Some(&host), ..Default::default() };
+    let pts = [("blackPoint", Value::Vec2([5.0, 20.0])), ("midPoint", Value::Vec2([20.0, 20.0])), ("whitePoint", Value::Vec2([35.0, 20.0]))];
+    let mut vals: Vec<(&str, Value)> = pts.to_vec();
+    vals.push(("stabilize", Value::Enum(1)));
+    vals.push(("sampleSize", num(1.0)));
+    let out = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, env);
+    for x in [5i64, 20, 35] {
+        let (o, r) = (out.img.get(x, 20), reference.get(x, 20));
+        assert!((o[0] - r[0]).abs() < 0.01, "x {x}: {o:?} vs {r:?}");
+    }
+    // Deterministic, and a no-op without a host.
+    let again = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, env);
+    assert_eq!(out.img.data, again.img.data);
+    let none = run_fx("ec.color.colorstabilizer", &vals, flicker.clone(), 0.0, EffectEnv::default());
+    assert_eq!(none.img.data, flicker.data);
+    // Brightness mode corrects an offset at the black point.
+    let lifted = mk(1.0, 0.1);
+    let mut vals2: Vec<(&str, Value)> = pts.to_vec();
+    vals2.push(("sampleSize", num(1.0)));
+    let b = run_fx("ec.color.colorstabilizer", &vals2, lifted, 0.0, env);
+    assert!((b.img.get(5, 20)[0] - reference.get(5, 20)[0]).abs() < 0.01);
+}
diff --git a/crates/effects/src/ocio_config.rs b/crates/effects/src/ocio_config.rs
index 5ea844414..af860c2fc 100644
--- a/crates/effects/src/ocio_config.rs
+++ b/crates/effects/src/ocio_config.rs
@@ -20,7 +20,7 @@
 //! * `looks` (`name`, `process_space`, `transform`, `inverse_transform`) and look strings
 //!   (`+A, -B`, `A | B` = the first one the config has);
 //! * transforms: `MatrixTransform` (`matrix` 4×4 row-major, `offset`), `FileTransform` (the LUT,
-//!   CDL and matrix files [`super::ocio::parse_file`] reads; `interpolation`, `ccc_id`),
+//!   CDL and matrix files `super::ocio::parse_file` reads; `interpolation`, `ccc_id`),
 //!   `ExponentTransform` (`value`), `ExponentWithLinearTransform` (`gamma`, `offset`, `style:
 //!   mirror`; the power curve with a linear toe that the Academy CLF specification calls
 //!   "moncurve"), `LogTransform` (`base`), `LogAffineTransform` (`base`, `logSideSlope`,
@@ -1331,401 +1331,4 @@ pub fn load_config(src: &str) -> Result<Arc<Config>, String> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    const CONFIG: &str = r#"
-ocio_profile_version: 2
-
-name: Test Config   # a comment
-search_path: "luts:other"
-roles:
-  scene_linear: lin
-  color_timing: "log2"
-
-displays:
-  sRGB:
-    - !<View> {name: Standard, colorspace: gamma22}
-    - !<View> {name: Raw, colorspace: raw}
-
-colorspaces:
-  - !<ColorSpace>
-    name: lin
-    family: ""
-    description: |
-      The reference.
-      Linear.
-    isdata: false
-
-  - !<ColorSpace>
-    name: gamma22
-    aliases: [g22, "gamma 2.2"]
-    to_scene_reference: !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1]}
-
-  - !<ColorSpace>
-    name: half
-    from_reference: !<MatrixTransform> {matrix: [0.5, 0, 0, 0,
-                                                0, 0.5, 0, 0,
-                                                0, 0, 0.5, 0,
-                                                0, 0, 0, 1], offset: [0.1, 0.1, 0.1, 0]}
-
-  - !<ColorSpace>
-    name: log2
-    from_reference: !<GroupTransform>
-      children:
-        - !<MatrixTransform> {matrix: [2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1]}
-        - !<LogTransform> {base: 2}
-
-  - !<ColorSpace>
-    name: affine
-    to_reference: !<LogAffineTransform> {base: 10, logSideSlope: 0.5, logSideOffset: 0.2, linSideSlope: 2, linSideOffset: 0.01, direction: inverse}
-
-  - !<ColorSpace>
-    name: lut
-    to_reference: !<FileTransform> {src: double.cube, interpolation: linear}
-
-  - !<ColorSpace>
-    name: raw
-    isdata: true
-
-  - !<ColorSpace>
-    name: weird
-    to_reference: !<ExposureContrastTransform> {exposure: 1}
-"#;
-
-    fn close(a: [f64; 3], b: [f64; 3], tol: f64) -> bool {
-        (0..3).all(|i| (a[i] - b[i]).abs() < tol)
-    }
-
-    fn temp_dir(name: &str) -> PathBuf {
-        let dir = std::env::temp_dir().join(format!("ec-ocio-{name}-{}", std::process::id()));
-        std::fs::create_dir_all(dir.join("luts")).unwrap();
-        dir
-    }
-
-    #[test]
-    fn yaml_subset() {
-        let y = parse_yaml("a: 1\nb:\n  - x\n  - {k: [1, 2], s: 'q: r'}\nc: !<T> {v: 3}\nd:\n- 4\n- 5\n");
-        assert_eq!(y.get("a").and_then(Yaml::str), Some("1"));
-        assert_eq!(y.get("b").unwrap().seq().len(), 2);
-        assert_eq!(y.get("b").unwrap().seq()[1].get("k").unwrap().nums(), vec![1.0, 2.0]);
-        assert_eq!(y.get("b").unwrap().seq()[1].get("s").and_then(Yaml::str), Some("q: r"));
-        assert_eq!(y.get("c").unwrap().tag(), Some("T"));
-        assert_eq!(y.get("c").unwrap().get("v").and_then(Yaml::str), Some("3"));
-        assert_eq!(y.get("d").unwrap().seq().len(), 2, "a sequence at the key's indent");
-    }
-
-    /// Hostile nesting (flow brackets and block indentation) is cut off instead of exhausting
-    /// the stack.
-    #[test]
-    fn yaml_nesting_is_bounded() {
-        let flow = format!("a: {}\nb: 1\n", "[".repeat(200_000));
-        assert!(matches!(parse_yaml(&flow), Yaml::Map(_)));
-        let block: String = (0..2_000).map(|i| format!("{}k{i}:\n", " ".repeat(i))).collect();
-        assert!(matches!(parse_yaml(&block), Yaml::Map(_)));
-        let dashes: String = (0..2_000).map(|i| format!("{}- x{i}:\n", " ".repeat(2 * i))).collect();
-        let _ = parse_yaml(&dashes);
-        assert!(Config::parse(&flow, Path::new(".")).is_err());
-    }
-
-    #[test]
-    fn parses_spaces_roles_displays_and_converts() {
-        let dir = temp_dir("basic");
-        // A 1D LUT that doubles (0..1 → 0..2).
-        std::fs::write(dir.join("luts/double.cube"), "LUT_1D_SIZE 2\nDOMAIN_MIN 0 0 0\nDOMAIN_MAX 1 1 1\n0 0 0\n2 2 2\n").unwrap();
-        let c = Config::parse(CONFIG, &dir).unwrap();
-        assert_eq!(c.name, "Test Config");
-        assert_eq!(c.search_path, vec!["luts", "other"]);
-        assert_eq!(c.space_names(), vec!["lin", "gamma22", "half", "log2", "affine", "lut", "raw", "weird"]);
-        // Roles and aliases resolve.
-        assert_eq!(c.space("scene_linear").unwrap().name, "lin");
-        assert_eq!(c.space("G22").unwrap().name, "gamma22");
-        assert_eq!(c.space("gamma 2.2").unwrap().name, "gamma22");
-        assert_eq!(c.view("sRGB", "Standard").unwrap().1.colorspace, "gamma22");
-        let sp = |n: &str| c.space(n).unwrap();
-        // gamma22 → lin: decode with the exponent.
-        let g = c.convert(sp("gamma22"), sp("lin"), [0.5, 0.25, 1.0]);
-        assert!(close(g, [0.5f64.powf(2.2), 0.25f64.powf(2.2), 1.0], 1e-9), "{g:?}");
-        // lin → gamma22: the inverse (only to_reference given).
-        let back = c.convert(sp("lin"), sp("gamma22"), g);
-        assert!(close(back, [0.5, 0.25, 1.0], 1e-9), "{back:?}");
-        // The display's view is that conversion.
-        assert!(close(c.display_path(sp("lin"), "sRGB", "Standard").apply(g, false), [0.5, 0.25, 1.0], 1e-9));
-        // lin → half: matrix and offset; and back through the inverse matrix.
-        let h = c.convert(sp("lin"), sp("half"), [0.4, 0.6, 1.0]);
-        assert!(close(h, [0.3, 0.4, 0.6], 1e-9), "{h:?}");
-        assert!(close(c.convert(sp("half"), sp("lin"), h), [0.4, 0.6, 1.0], 1e-9));
-        // lin → log2: a group (×2 then log2): 0.5 → 0; 2 → 2.
-        let l = c.convert(sp("lin"), sp("log2"), [0.5, 2.0, 4.0]);
-        assert!(close(l, [0.0, 2.0, 3.0], 1e-9), "{l:?}");
-        assert!(close(c.convert(sp("log2"), sp("lin"), l), [0.5, 2.0, 4.0], 1e-9));
-        // LogAffine (inverse direction as to_reference) round-trips.
-        let a = c.convert(sp("lin"), sp("affine"), [0.18, 0.5, 1.0]);
-        let expect = [0.18f64, 0.5, 1.0].map(|v| 0.5 * (2.0 * v + 0.01).log10() + 0.2);
-        assert!(close(a, expect, 1e-9), "{a:?} vs {expect:?}");
-        assert!(close(c.convert(sp("affine"), sp("lin"), a), [0.18, 0.5, 1.0], 1e-9));
-        // FileTransform found on the search path.
-        let f = c.convert(sp("lut"), sp("lin"), [0.25, 0.5, 0.0]);
-        assert!(close(f, [0.5, 1.0, 0.0], 1e-6), "{f:?}");
-        // Data spaces pass through; unsupported transforms are reported.
-        assert_eq!(c.convert(sp("raw"), sp("gamma22"), [0.3, 0.3, 0.3]), [0.3, 0.3, 0.3]);
-        assert_eq!(c.unsupported(), vec!["ExposureContrastTransform".to_string()]);
-        assert_eq!(c.path(sp("lin"), sp("weird")).unsupported_list(), vec!["ExposureContrastTransform".to_string()]);
-        assert!(c.path(sp("lin"), sp("half")).unsupported_list().is_empty());
-        // Loading from a file path (cached), and errors.
-        std::fs::write(dir.join("config.ocio"), CONFIG).unwrap();
-        let loaded = load_config(&dir.join("config.ocio").to_string_lossy()).unwrap();
-        assert_eq!(loaded.spaces.len(), 8);
-        assert!(load_config("/no/such/config.ocio").is_err());
-        assert!(Config::parse("just: text\n", &dir).is_err());
-    }
-
-    /// The OCIO Color Space and Display Transform effects with Configuration ▸ Custom.
-    #[test]
-    fn effects_use_a_custom_config() {
-        use effectcraft_keyframe::Value;
-        let cfg = "ocio_profile_version: 1\nroles:\n  default: lin\ndisplays:\n  Monitor:\n    - !<View> {name: Video, colorspace: g2}\ncolorspaces:\n  - !<ColorSpace>\n    name: lin\n  - !<ColorSpace>\n    name: g2\n    to_reference: !<ExponentTransform> {value: [2, 2, 2, 1]}\n";
-        let img = crate::Image::filled(2, 2, [0.5, 0.25, 1.0, 1.0]);
-        let fx = |id: &str, extra: &[(&str, Value)]| {
-            let mut v = vec![("config", Value::Enum(1)), ("configFile", Value::Str(cfg.into()))];
-            v.extend(extra.iter().cloned());
-            crate::run_fx(id, &v, img.clone(), 0.0, crate::EffectEnv::default()).img.data[0]
-        };
-        let o = fx("ec.color.ociocolorspace", &[("sourceName", Value::Str("g2".into())), ("destinationName", Value::Str("default".into()))]);
-        assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.0625).abs() < 1e-6 && (o[2] - 1.0).abs() < 1e-6, "{o:?}");
-        // Inverse direction.
-        let o = fx(
-            "ec.color.ociocolorspace",
-            &[("sourceName", Value::Str("g2".into())), ("destinationName", Value::Str("lin".into())), ("direction", Value::Enum(1))],
-        );
-        assert!((o[0] - 0.5f32.sqrt()).abs() < 1e-6, "{o:?}");
-        // Display ▸ view → its colour space.
-        let o = fx(
-            "ec.color.ociodisplay",
-            &[("sourceName", Value::Str("lin".into())), ("displayName", Value::Str("Monitor".into())), ("viewName", Value::Str("Video".into()))],
-        );
-        assert!((o[0] - 0.5f32.sqrt()).abs() < 1e-6, "{o:?}");
-        // An unreadable config leaves pixels alone.
-        let o = crate::run_fx(
-            "ec.color.ociocolorspace",
-            &[("config", Value::Enum(1)), ("configFile", Value::Str("/missing.ocio".into()))],
-            img.clone(),
-            0.0,
-            crate::EffectEnv::default(),
-        );
-        assert_eq!(o.img.data, img.data);
-    }
-
-    /// A config laid out like Blender 4.x / 5.x's (written for this test): the reference space is
-    /// CIE XYZ with the E white, the D65 spaces adapt through a `.spimtx` matrix, sRGB is a
-    /// ColorSpaceTransform plus an ExponentWithLinearTransform, the display-referred spaces meet
-    /// the scene through the default view transform, and a log space uses an
-    /// AllocationTransform.
-    fn blender_like(dir: &Path) -> Config {
-        use effectcraft_color::space::{invert, rgb_to_xyz};
-        let e_to_d65 = crate::ocio::bradford([1.0 / 3.0, 1.0 / 3.0], D65);
-        let rows = |m: [[f64; 3]; 3], sep: &str, end: &str| m.iter().map(|r| format!("{}{sep}{}{sep}{}{end}", r[0], r[1], r[2])).collect::<Vec<_>>();
-        std::fs::write(dir.join("luts/e_to_d65.spimtx"), rows(e_to_d65, " ", " 0\n").concat()).unwrap();
-        let xyz_to_709 = rows(invert(&rgb_to_xyz(REC709, D65)), ", ", ", 0").join(", ");
-        let text = format!(
-            r#"ocio_profile_version: 2.4
-search_path: luts
-roles:
-  reference: Linear CIE-XYZ E
-  scene_linear: Linear Rec.709
-  cie_xyz_d65_interchange: XYZ D65 Display
-default_view_transform: Standard
-view_transforms:
-  - !<ViewTransform>
-    name: Standard
-    from_scene_reference: !<FileTransform> {{src: e_to_d65.spimtx, interpolation: linear}}
-displays:
-  sRGB:
-    - !<View> {{name: Standard, colorspace: sRGB}}
-    - !<View> {{name: Display, view_transform: Standard, display_colorspace: sRGB Display}}
-    - !<View> {{name: Log, colorspace: Log Encoding}}
-    - !<View> {{name: Log Brighter, colorspace: Log Encoding, looks: +Brighter}}
-    - !<View> {{name: Log Darker, colorspace: Log Encoding, looks: "-Brighter, Missing"}}
-    - !<View> {{name: Raw, colorspace: Non-Color}}
-display_colorspaces:
-  - !<ColorSpace>
-    name: XYZ D65 Display
-    isdata: false
-  - !<ColorSpace>
-    name: sRGB Display
-    from_display_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: cie_xyz_d65_interchange, dst: Linear Rec.709}}
-        - !<ExponentWithLinearTransform> {{gamma: 2.4, offset: 0.055, direction: inverse}}
-colorspaces:
-  - !<ColorSpace>
-    name: Linear CIE-XYZ E
-    aliases: [Linear CIE-XYZ I-E]
-  - !<ColorSpace>
-    name: Linear CIE-XYZ D65
-    from_scene_reference: !<FileTransform> {{src: e_to_d65.spimtx, interpolation: linear}}
-  - !<ColorSpace>
-    name: Linear Rec.709
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ I-E, dst: Linear CIE-XYZ D65}}
-        - !<MatrixTransform> {{matrix: [{xyz_to_709}, 0, 0, 0, 1]}}
-  - !<ColorSpace>
-    name: sRGB
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
-        - !<ExponentWithLinearTransform> {{gamma: 2.4, offset: 0.055, direction: inverse}}
-  - !<ColorSpace>
-    name: Log Encoding
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
-        - !<AllocationTransform> {{allocation: lg2, vars: [-12, 12]}}
-  - !<ColorSpace>
-    name: ACEScg
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65}}
-        - !<BuiltinTransform> {{style: "UTILITY - ACES-AP1_to_CIE-XYZ-D65_BFD", direction: inverse}}
-  - !<ColorSpace>
-    name: Clipped
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
-        - !<RangeTransform> {{min_in_value: 0, min_out_value: 0}}
-  - !<ColorSpace>
-    name: Graded
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
-        - !<GradingToneTransform>
-         shadows: {{rgb: [0.2, 0.2, 0.2], master: 0.35, start: 0.4, pivot: 0.1}}
-  - !<ColorSpace>
-    name: Loop
-    from_scene_reference: !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Loop}}
-  - !<ColorSpace>
-    name: Fan
-    from_scene_reference: !<GroupTransform>
-      children:
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
-        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
-  - !<ColorSpace>
-    name: Non-Color
-    isdata: true
-looks:
-  - !<Look>
-    name: Brighter
-    process_space: Log Encoding
-    transform: !<CDLTransform> {{offset: [0.05, 0.05, 0.05]}}
-"#
-        );
-        Config::parse(&text, dir).unwrap()
-    }
-
-    /// The sRGB encoding (IEC 61966-2-1).
-    fn srgb(v: f64) -> f64 {
-        if v <= 0.003_130_8 { v * 12.92 } else { 1.055 * v.powf(1.0 / 2.4) - 0.055 }
-    }
-
-    /// #410: with Blender's config, Linear Rec.709 → sRGB got no sRGB curve and a blue cast:
-    /// ColorSpaceTransform and ExponentWithLinearTransform passed colours through, so the
-    /// colours stayed in the E-white XYZ reference. Every route to sRGB now encodes greys to
-    /// neutral sRGB values (0.18 → 0.4614).
-    #[test]
-    fn blender_like_config_converts_linear_rec709_to_srgb() {
-        let dir = temp_dir("blender");
-        let c = blender_like(&dir);
-        assert!(c.unsupported().iter().all(|t| t == "GradingToneTransform"), "{:?}", c.unsupported());
-        let sp = |n: &str| c.space(n).unwrap();
-        let lin = sp("scene_linear");
-        let routes = [
-            ("Color Space Transform", c.path(lin, sp("sRGB"))),
-            ("display-referred sRGB", c.path(lin, sp("sRGB Display"))),
-            ("v1 view", c.display_path(lin, "sRGB", "Standard")),
-            ("v2 view", c.display_path(lin, "sRGB", "Display")),
-        ];
-        for (route, x) in &routes {
-            assert!(x.unsupported_list().is_empty(), "{route}: {:?}", x.unsupported_list());
-            for v in [0.0, 0.001, 0.18, 0.5, 1.0, 4.0] {
-                let o = x.apply([v; 3], false);
-                assert!(close(o, [srgb(v); 3], 2e-5), "{route}: {v} → {o:?}, want {}", srgb(v));
-            }
-            let red = x.apply([1.0, 0.0, 0.0], false);
-            assert!(close(red, [1.0, 0.0, 0.0], 1e-4), "{route}: red {red:?}");
-            // And back.
-            assert!(close(x.apply([srgb(0.18); 3], true), [0.18; 3], 1e-6), "{route}");
-        }
-        // AllocationTransform lg2 and a look in its process space; data passes through.
-        let log = |v: f64| (v.log2() + 12.0) / 24.0;
-        let o = c.display_path(lin, "sRGB", "Log").apply([0.18; 3], false);
-        assert!(close(o, [log(0.18); 3], 1e-6), "{o:?}");
-        let o = c.display_path(lin, "sRGB", "Log Brighter").apply([0.18; 3], false);
-        assert!(close(o, [log(0.18) + 0.05; 3], 1e-6), "{o:?}");
-        let darker = c.display_path(lin, "sRGB", "Log Darker");
-        assert!(close(darker.apply([0.18; 3], false), [log(0.18) - 0.05; 3], 1e-6));
-        assert_eq!(darker.unsupported_list(), vec!["Look `Missing` (not in the config)".to_string()]);
-        assert_eq!(c.display_path(lin, "sRGB", "Raw").apply([0.3, 2.0, -1.0], false), [0.3, 2.0, -1.0]);
-        // BuiltinTransform: the built-in config's Linear Rec.709 → ACEScg.
-        let want = crate::ocio::Xform::new(&sp_builtin("Linear Rec.709 (sRGB)"), &sp_builtin("ACEScg")).apply([1.0, 0.25, 0.0]);
-        let got = c.convert(lin, sp("ACEScg"), [1.0, 0.25, 0.0]);
-        assert!(close(got, want.map(f64::from), 1e-4), "{got:?} vs {want:?}");
-        // RangeTransform with only a minimum clamps below and shifts nothing.
-        let o = c.convert(lin, sp("Clipped"), [-0.5, 0.5, 2.0]);
-        assert!(close(o, [0.0, 0.5, 2.0], 1e-6), "{o:?}");
-        // Unsupported steps are listed (and pass through); loops stop.
-        assert_eq!(c.path(lin, sp("Graded")).unsupported_list(), vec!["GradingToneTransform".to_string()]);
-        assert!(c.path(lin, sp("Loop")).unsupported_list()[0].contains("nested"));
-        let fan = c.path(lin, sp("Fan"));
-        assert!(!fan.unsupported_list().is_empty());
-        assert!(matches!(&fan, Xf::Group(v) if v.len() <= MAX_OPS + 1));
-    }
-
-    fn sp_builtin(name: &str) -> Space {
-        *crate::ocio::SPACES.iter().find(|s| s.name == name).unwrap()
-    }
-
-    /// ExponentWithLinearTransform is the sRGB curve at gamma 2.4 / offset 0.055, continuous at
-    /// its break point and inverted exactly; mirror mirrors negatives.
-    #[test]
-    fn moncurve_matches_srgb_and_inverts() {
-        for v in [-0.2, 0.0, 0.002, 0.039, 0.0393, 0.2, 0.5, 1.0, 3.0] {
-            let lin = moncurve(v, 2.4, 0.055, false, false);
-            assert!((moncurve(lin, 2.4, 0.055, true, false) - v).abs() < 1e-12, "{v}");
-            if v >= 0.0 {
-                assert!((moncurve(srgb(v), 2.4, 0.055, false, false) - v).abs() < 2e-5, "{v}");
-            }
-        }
-        let xb = 0.055 / 1.4;
-        assert!((moncurve(xb - 1e-12, 2.4, 0.055, false, false) - moncurve(xb + 1e-12, 2.4, 0.055, false, false)).abs() < 1e-9);
-        assert_eq!(moncurve(-0.5, 2.4, 0.055, false, true), -moncurve(0.5, 2.4, 0.055, false, false));
-        assert_eq!(moncurve(-0.5, 1.0, 0.0, false, false), 0.0);
-    }
-
-    #[test]
-    fn builtin_styles() {
-        for style in ["IDENTITY", "DISPLAY - CIE-XYZ-D65_to_sRGB", "display - cie-xyz-d65_to_rec.2100-pq", "ACEScc_to_ACES2065-1", "ACEScct_to_ACES2065-1"] {
-            assert!(builtin(style).is_some(), "{style}");
-        }
-        assert!(builtin("ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO_1.0").is_none());
-        // D65 white in XYZ is display white.
-        let xyz = rgb_white_xyz();
-        for style in ["DISPLAY - CIE-XYZ-D65_to_sRGB", "DISPLAY - CIE-XYZ-D65_to_REC.1886-REC.709", "DISPLAY - CIE-XYZ-D65_to_DisplayP3"] {
-            let o = builtin(style).unwrap().apply(xyz, false);
-            assert!(close(o, [1.0; 3], 1e-6), "{style}: {o:?}");
-        }
-        // PQ: 1.0 = 100 nits → code value ≈ 0.508.
-        let pq = builtin("DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ").unwrap().apply(xyz, false);
-        assert!((pq[0] - 0.508).abs() < 1e-3, "{pq:?}");
-        // ACEScc and ACEScct of 0.18 (ACES2065-1 grey stays grey).
-        for (style, code) in [("ACEScc_to_ACES2065-1", 0.413_588_402_492_442_1), ("ACEScct_to_ACES2065-1", 0.413_588_402_492_442_1)] {
-            let o = builtin(style).unwrap().apply([code; 3], false);
-            assert!(close(o, [0.18; 3], 1e-6), "{style}: {o:?}");
-        }
-    }
-
-    fn rgb_white_xyz() -> [f64; 3] {
-        [D65[0] / D65[1], 1.0, (1.0 - D65[0] - D65[1]) / D65[1]]
-    }
-}
+mod tests;
diff --git a/crates/effects/src/ocio_config/tests.rs b/crates/effects/src/ocio_config/tests.rs
new file mode 100644
index 000000000..f534fe0e2
--- /dev/null
+++ b/crates/effects/src/ocio_config/tests.rs
@@ -0,0 +1,394 @@
+use super::*;
+
+const CONFIG: &str = r#"
+ocio_profile_version: 2
+
+name: Test Config   # a comment
+search_path: "luts:other"
+roles:
+  scene_linear: lin
+  color_timing: "log2"
+
+displays:
+  sRGB:
+    - !<View> {name: Standard, colorspace: gamma22}
+    - !<View> {name: Raw, colorspace: raw}
+
+colorspaces:
+  - !<ColorSpace>
+    name: lin
+    family: ""
+    description: |
+      The reference.
+      Linear.
+    isdata: false
+
+  - !<ColorSpace>
+    name: gamma22
+    aliases: [g22, "gamma 2.2"]
+    to_scene_reference: !<ExponentTransform> {value: [2.2, 2.2, 2.2, 1]}
+
+  - !<ColorSpace>
+    name: half
+    from_reference: !<MatrixTransform> {matrix: [0.5, 0, 0, 0,
+                                                0, 0.5, 0, 0,
+                                                0, 0, 0.5, 0,
+                                                0, 0, 0, 1], offset: [0.1, 0.1, 0.1, 0]}
+
+  - !<ColorSpace>
+    name: log2
+    from_reference: !<GroupTransform>
+      children:
+        - !<MatrixTransform> {matrix: [2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1]}
+        - !<LogTransform> {base: 2}
+
+  - !<ColorSpace>
+    name: affine
+    to_reference: !<LogAffineTransform> {base: 10, logSideSlope: 0.5, logSideOffset: 0.2, linSideSlope: 2, linSideOffset: 0.01, direction: inverse}
+
+  - !<ColorSpace>
+    name: lut
+    to_reference: !<FileTransform> {src: double.cube, interpolation: linear}
+
+  - !<ColorSpace>
+    name: raw
+    isdata: true
+
+  - !<ColorSpace>
+    name: weird
+    to_reference: !<ExposureContrastTransform> {exposure: 1}
+"#;
+
+fn close(a: [f64; 3], b: [f64; 3], tol: f64) -> bool {
+    (0..3).all(|i| (a[i] - b[i]).abs() < tol)
+}
+
+fn temp_dir(name: &str) -> PathBuf {
+    let dir = std::env::temp_dir().join(format!("ec-ocio-{name}-{}", std::process::id()));
+    std::fs::create_dir_all(dir.join("luts")).unwrap();
+    dir
+}
+
+#[test]
+fn yaml_subset() {
+    let y = parse_yaml("a: 1\nb:\n  - x\n  - {k: [1, 2], s: 'q: r'}\nc: !<T> {v: 3}\nd:\n- 4\n- 5\n");
+    assert_eq!(y.get("a").and_then(Yaml::str), Some("1"));
+    assert_eq!(y.get("b").unwrap().seq().len(), 2);
+    assert_eq!(y.get("b").unwrap().seq()[1].get("k").unwrap().nums(), vec![1.0, 2.0]);
+    assert_eq!(y.get("b").unwrap().seq()[1].get("s").and_then(Yaml::str), Some("q: r"));
+    assert_eq!(y.get("c").unwrap().tag(), Some("T"));
+    assert_eq!(y.get("c").unwrap().get("v").and_then(Yaml::str), Some("3"));
+    assert_eq!(y.get("d").unwrap().seq().len(), 2, "a sequence at the key's indent");
+}
+
+/// Hostile nesting (flow brackets and block indentation) is cut off instead of exhausting
+/// the stack.
+#[test]
+fn yaml_nesting_is_bounded() {
+    let flow = format!("a: {}\nb: 1\n", "[".repeat(200_000));
+    assert!(matches!(parse_yaml(&flow), Yaml::Map(_)));
+    let block: String = (0..2_000).map(|i| format!("{}k{i}:\n", " ".repeat(i))).collect();
+    assert!(matches!(parse_yaml(&block), Yaml::Map(_)));
+    let dashes: String = (0..2_000).map(|i| format!("{}- x{i}:\n", " ".repeat(2 * i))).collect();
+    let _ = parse_yaml(&dashes);
+    assert!(Config::parse(&flow, Path::new(".")).is_err());
+}
+
+#[test]
+fn parses_spaces_roles_displays_and_converts() {
+    let dir = temp_dir("basic");
+    // A 1D LUT that doubles (0..1 → 0..2).
+    std::fs::write(dir.join("luts/double.cube"), "LUT_1D_SIZE 2\nDOMAIN_MIN 0 0 0\nDOMAIN_MAX 1 1 1\n0 0 0\n2 2 2\n").unwrap();
+    let c = Config::parse(CONFIG, &dir).unwrap();
+    assert_eq!(c.name, "Test Config");
+    assert_eq!(c.search_path, vec!["luts", "other"]);
+    assert_eq!(c.space_names(), vec!["lin", "gamma22", "half", "log2", "affine", "lut", "raw", "weird"]);
+    // Roles and aliases resolve.
+    assert_eq!(c.space("scene_linear").unwrap().name, "lin");
+    assert_eq!(c.space("G22").unwrap().name, "gamma22");
+    assert_eq!(c.space("gamma 2.2").unwrap().name, "gamma22");
+    assert_eq!(c.view("sRGB", "Standard").unwrap().1.colorspace, "gamma22");
+    let sp = |n: &str| c.space(n).unwrap();
+    // gamma22 → lin: decode with the exponent.
+    let g = c.convert(sp("gamma22"), sp("lin"), [0.5, 0.25, 1.0]);
+    assert!(close(g, [0.5f64.powf(2.2), 0.25f64.powf(2.2), 1.0], 1e-9), "{g:?}");
+    // lin → gamma22: the inverse (only to_reference given).
+    let back = c.convert(sp("lin"), sp("gamma22"), g);
+    assert!(close(back, [0.5, 0.25, 1.0], 1e-9), "{back:?}");
+    // The display's view is that conversion.
+    assert!(close(c.display_path(sp("lin"), "sRGB", "Standard").apply(g, false), [0.5, 0.25, 1.0], 1e-9));
+    // lin → half: matrix and offset; and back through the inverse matrix.
+    let h = c.convert(sp("lin"), sp("half"), [0.4, 0.6, 1.0]);
+    assert!(close(h, [0.3, 0.4, 0.6], 1e-9), "{h:?}");
+    assert!(close(c.convert(sp("half"), sp("lin"), h), [0.4, 0.6, 1.0], 1e-9));
+    // lin → log2: a group (×2 then log2): 0.5 → 0; 2 → 2.
+    let l = c.convert(sp("lin"), sp("log2"), [0.5, 2.0, 4.0]);
+    assert!(close(l, [0.0, 2.0, 3.0], 1e-9), "{l:?}");
+    assert!(close(c.convert(sp("log2"), sp("lin"), l), [0.5, 2.0, 4.0], 1e-9));
+    // LogAffine (inverse direction as to_reference) round-trips.
+    let a = c.convert(sp("lin"), sp("affine"), [0.18, 0.5, 1.0]);
+    let expect = [0.18f64, 0.5, 1.0].map(|v| 0.5 * (2.0 * v + 0.01).log10() + 0.2);
+    assert!(close(a, expect, 1e-9), "{a:?} vs {expect:?}");
+    assert!(close(c.convert(sp("affine"), sp("lin"), a), [0.18, 0.5, 1.0], 1e-9));
+    // FileTransform found on the search path.
+    let f = c.convert(sp("lut"), sp("lin"), [0.25, 0.5, 0.0]);
+    assert!(close(f, [0.5, 1.0, 0.0], 1e-6), "{f:?}");
+    // Data spaces pass through; unsupported transforms are reported.
+    assert_eq!(c.convert(sp("raw"), sp("gamma22"), [0.3, 0.3, 0.3]), [0.3, 0.3, 0.3]);
+    assert_eq!(c.unsupported(), vec!["ExposureContrastTransform".to_string()]);
+    assert_eq!(c.path(sp("lin"), sp("weird")).unsupported_list(), vec!["ExposureContrastTransform".to_string()]);
+    assert!(c.path(sp("lin"), sp("half")).unsupported_list().is_empty());
+    // Loading from a file path (cached), and errors.
+    std::fs::write(dir.join("config.ocio"), CONFIG).unwrap();
+    let loaded = load_config(&dir.join("config.ocio").to_string_lossy()).unwrap();
+    assert_eq!(loaded.spaces.len(), 8);
+    assert!(load_config("/no/such/config.ocio").is_err());
+    assert!(Config::parse("just: text\n", &dir).is_err());
+}
+
+/// The OCIO Color Space and Display Transform effects with Configuration ▸ Custom.
+#[test]
+fn effects_use_a_custom_config() {
+    use effectcraft_keyframe::Value;
+    let cfg = "ocio_profile_version: 1\nroles:\n  default: lin\ndisplays:\n  Monitor:\n    - !<View> {name: Video, colorspace: g2}\ncolorspaces:\n  - !<ColorSpace>\n    name: lin\n  - !<ColorSpace>\n    name: g2\n    to_reference: !<ExponentTransform> {value: [2, 2, 2, 1]}\n";
+    let img = crate::Image::filled(2, 2, [0.5, 0.25, 1.0, 1.0]);
+    let fx = |id: &str, extra: &[(&str, Value)]| {
+        let mut v = vec![("config", Value::Enum(1)), ("configFile", Value::Str(cfg.into()))];
+        v.extend(extra.iter().cloned());
+        crate::run_fx(id, &v, img.clone(), 0.0, crate::EffectEnv::default()).img.data[0]
+    };
+    let o = fx("ec.color.ociocolorspace", &[("sourceName", Value::Str("g2".into())), ("destinationName", Value::Str("default".into()))]);
+    assert!((o[0] - 0.25).abs() < 1e-6 && (o[1] - 0.0625).abs() < 1e-6 && (o[2] - 1.0).abs() < 1e-6, "{o:?}");
+    // Inverse direction.
+    let o =
+        fx("ec.color.ociocolorspace", &[("sourceName", Value::Str("g2".into())), ("destinationName", Value::Str("lin".into())), ("direction", Value::Enum(1))]);
+    assert!((o[0] - 0.5f32.sqrt()).abs() < 1e-6, "{o:?}");
+    // Display ▸ view → its colour space.
+    let o = fx(
+        "ec.color.ociodisplay",
+        &[("sourceName", Value::Str("lin".into())), ("displayName", Value::Str("Monitor".into())), ("viewName", Value::Str("Video".into()))],
+    );
+    assert!((o[0] - 0.5f32.sqrt()).abs() < 1e-6, "{o:?}");
+    // An unreadable config leaves pixels alone.
+    let o = crate::run_fx(
+        "ec.color.ociocolorspace",
+        &[("config", Value::Enum(1)), ("configFile", Value::Str("/missing.ocio".into()))],
+        img.clone(),
+        0.0,
+        crate::EffectEnv::default(),
+    );
+    assert_eq!(o.img.data, img.data);
+}
+
+/// A config laid out like Blender 4.x / 5.x's (written for this test): the reference space is
+/// CIE XYZ with the E white, the D65 spaces adapt through a `.spimtx` matrix, sRGB is a
+/// ColorSpaceTransform plus an ExponentWithLinearTransform, the display-referred spaces meet
+/// the scene through the default view transform, and a log space uses an
+/// AllocationTransform.
+fn blender_like(dir: &Path) -> Config {
+    use effectcraft_color::space::{invert, rgb_to_xyz};
+    let e_to_d65 = crate::ocio::bradford([1.0 / 3.0, 1.0 / 3.0], D65);
+    let rows = |m: [[f64; 3]; 3], sep: &str, end: &str| m.iter().map(|r| format!("{}{sep}{}{sep}{}{end}", r[0], r[1], r[2])).collect::<Vec<_>>();
+    std::fs::write(dir.join("luts/e_to_d65.spimtx"), rows(e_to_d65, " ", " 0\n").concat()).unwrap();
+    let xyz_to_709 = rows(invert(&rgb_to_xyz(REC709, D65)), ", ", ", 0").join(", ");
+    let text = format!(
+        r#"ocio_profile_version: 2.4
+search_path: luts
+roles:
+  reference: Linear CIE-XYZ E
+  scene_linear: Linear Rec.709
+  cie_xyz_d65_interchange: XYZ D65 Display
+default_view_transform: Standard
+view_transforms:
+  - !<ViewTransform>
+    name: Standard
+    from_scene_reference: !<FileTransform> {{src: e_to_d65.spimtx, interpolation: linear}}
+displays:
+  sRGB:
+    - !<View> {{name: Standard, colorspace: sRGB}}
+    - !<View> {{name: Display, view_transform: Standard, display_colorspace: sRGB Display}}
+    - !<View> {{name: Log, colorspace: Log Encoding}}
+    - !<View> {{name: Log Brighter, colorspace: Log Encoding, looks: +Brighter}}
+    - !<View> {{name: Log Darker, colorspace: Log Encoding, looks: "-Brighter, Missing"}}
+    - !<View> {{name: Raw, colorspace: Non-Color}}
+display_colorspaces:
+  - !<ColorSpace>
+    name: XYZ D65 Display
+    isdata: false
+  - !<ColorSpace>
+    name: sRGB Display
+    from_display_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: cie_xyz_d65_interchange, dst: Linear Rec.709}}
+        - !<ExponentWithLinearTransform> {{gamma: 2.4, offset: 0.055, direction: inverse}}
+colorspaces:
+  - !<ColorSpace>
+    name: Linear CIE-XYZ E
+    aliases: [Linear CIE-XYZ I-E]
+  - !<ColorSpace>
+    name: Linear CIE-XYZ D65
+    from_scene_reference: !<FileTransform> {{src: e_to_d65.spimtx, interpolation: linear}}
+  - !<ColorSpace>
+    name: Linear Rec.709
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ I-E, dst: Linear CIE-XYZ D65}}
+        - !<MatrixTransform> {{matrix: [{xyz_to_709}, 0, 0, 0, 1]}}
+  - !<ColorSpace>
+    name: sRGB
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
+        - !<ExponentWithLinearTransform> {{gamma: 2.4, offset: 0.055, direction: inverse}}
+  - !<ColorSpace>
+    name: Log Encoding
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
+        - !<AllocationTransform> {{allocation: lg2, vars: [-12, 12]}}
+  - !<ColorSpace>
+    name: ACEScg
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear CIE-XYZ D65}}
+        - !<BuiltinTransform> {{style: "UTILITY - ACES-AP1_to_CIE-XYZ-D65_BFD", direction: inverse}}
+  - !<ColorSpace>
+    name: Clipped
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
+        - !<RangeTransform> {{min_in_value: 0, min_out_value: 0}}
+  - !<ColorSpace>
+    name: Graded
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Linear Rec.709}}
+        - !<GradingToneTransform>
+         shadows: {{rgb: [0.2, 0.2, 0.2], master: 0.35, start: 0.4, pivot: 0.1}}
+  - !<ColorSpace>
+    name: Loop
+    from_scene_reference: !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Loop}}
+  - !<ColorSpace>
+    name: Fan
+    from_scene_reference: !<GroupTransform>
+      children:
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
+        - !<ColorSpaceTransform> {{src: Linear CIE-XYZ E, dst: Fan}}
+  - !<ColorSpace>
+    name: Non-Color
+    isdata: true
+looks:
+  - !<Look>
+    name: Brighter
+    process_space: Log Encoding
+    transform: !<CDLTransform> {{offset: [0.05, 0.05, 0.05]}}
+"#
+    );
+    Config::parse(&text, dir).unwrap()
+}
+
+/// The sRGB encoding (IEC 61966-2-1).
+fn srgb(v: f64) -> f64 {
+    if v <= 0.003_130_8 { v * 12.92 } else { 1.055 * v.powf(1.0 / 2.4) - 0.055 }
+}
+
+/// #410: with Blender's config, Linear Rec.709 → sRGB got no sRGB curve and a blue cast:
+/// ColorSpaceTransform and ExponentWithLinearTransform passed colours through, so the
+/// colours stayed in the E-white XYZ reference. Every route to sRGB now encodes greys to
+/// neutral sRGB values (0.18 → 0.4614).
+#[test]
+fn blender_like_config_converts_linear_rec709_to_srgb() {
+    let dir = temp_dir("blender");
+    let c = blender_like(&dir);
+    assert!(c.unsupported().iter().all(|t| t == "GradingToneTransform"), "{:?}", c.unsupported());
+    let sp = |n: &str| c.space(n).unwrap();
+    let lin = sp("scene_linear");
+    let routes = [
+        ("Color Space Transform", c.path(lin, sp("sRGB"))),
+        ("display-referred sRGB", c.path(lin, sp("sRGB Display"))),
+        ("v1 view", c.display_path(lin, "sRGB", "Standard")),
+        ("v2 view", c.display_path(lin, "sRGB", "Display")),
+    ];
+    for (route, x) in &routes {
+        assert!(x.unsupported_list().is_empty(), "{route}: {:?}", x.unsupported_list());
+        for v in [0.0, 0.001, 0.18, 0.5, 1.0, 4.0] {
+            let o = x.apply([v; 3], false);
+            assert!(close(o, [srgb(v); 3], 2e-5), "{route}: {v} → {o:?}, want {}", srgb(v));
+        }
+        let red = x.apply([1.0, 0.0, 0.0], false);
+        assert!(close(red, [1.0, 0.0, 0.0], 1e-4), "{route}: red {red:?}");
+        // And back.
+        assert!(close(x.apply([srgb(0.18); 3], true), [0.18; 3], 1e-6), "{route}");
+    }
+    // AllocationTransform lg2 and a look in its process space; data passes through.
+    let log = |v: f64| (v.log2() + 12.0) / 24.0;
+    let o = c.display_path(lin, "sRGB", "Log").apply([0.18; 3], false);
+    assert!(close(o, [log(0.18); 3], 1e-6), "{o:?}");
+    let o = c.display_path(lin, "sRGB", "Log Brighter").apply([0.18; 3], false);
+    assert!(close(o, [log(0.18) + 0.05; 3], 1e-6), "{o:?}");
+    let darker = c.display_path(lin, "sRGB", "Log Darker");
+    assert!(close(darker.apply([0.18; 3], false), [log(0.18) - 0.05; 3], 1e-6));
+    assert_eq!(darker.unsupported_list(), vec!["Look `Missing` (not in the config)".to_string()]);
+    assert_eq!(c.display_path(lin, "sRGB", "Raw").apply([0.3, 2.0, -1.0], false), [0.3, 2.0, -1.0]);
+    // BuiltinTransform: the built-in config's Linear Rec.709 → ACEScg.
+    let want = crate::ocio::Xform::new(&sp_builtin("Linear Rec.709 (sRGB)"), &sp_builtin("ACEScg")).apply([1.0, 0.25, 0.0]);
+    let got = c.convert(lin, sp("ACEScg"), [1.0, 0.25, 0.0]);
+    assert!(close(got, want.map(f64::from), 1e-4), "{got:?} vs {want:?}");
+    // RangeTransform with only a minimum clamps below and shifts nothing.
+    let o = c.convert(lin, sp("Clipped"), [-0.5, 0.5, 2.0]);
+    assert!(close(o, [0.0, 0.5, 2.0], 1e-6), "{o:?}");
+    // Unsupported steps are listed (and pass through); loops stop.
+    assert_eq!(c.path(lin, sp("Graded")).unsupported_list(), vec!["GradingToneTransform".to_string()]);
+    assert!(c.path(lin, sp("Loop")).unsupported_list()[0].contains("nested"));
+    let fan = c.path(lin, sp("Fan"));
+    assert!(!fan.unsupported_list().is_empty());
+    assert!(matches!(&fan, Xf::Group(v) if v.len() <= MAX_OPS + 1));
+}
+
+fn sp_builtin(name: &str) -> Space {
+    *crate::ocio::SPACES.iter().find(|s| s.name == name).unwrap()
+}
+
+/// ExponentWithLinearTransform is the sRGB curve at gamma 2.4 / offset 0.055, continuous at
+/// its break point and inverted exactly; mirror mirrors negatives.
+#[test]
+fn moncurve_matches_srgb_and_inverts() {
+    for v in [-0.2, 0.0, 0.002, 0.039, 0.0393, 0.2, 0.5, 1.0, 3.0] {
+        let lin = moncurve(v, 2.4, 0.055, false, false);
+        assert!((moncurve(lin, 2.4, 0.055, true, false) - v).abs() < 1e-12, "{v}");
+        if v >= 0.0 {
+            assert!((moncurve(srgb(v), 2.4, 0.055, false, false) - v).abs() < 2e-5, "{v}");
+        }
+    }
+    let xb = 0.055 / 1.4;
+    assert!((moncurve(xb - 1e-12, 2.4, 0.055, false, false) - moncurve(xb + 1e-12, 2.4, 0.055, false, false)).abs() < 1e-9);
+    assert_eq!(moncurve(-0.5, 2.4, 0.055, false, true), -moncurve(0.5, 2.4, 0.055, false, false));
+    assert_eq!(moncurve(-0.5, 1.0, 0.0, false, false), 0.0);
+}
+
+#[test]
+fn builtin_styles() {
+    for style in ["IDENTITY", "DISPLAY - CIE-XYZ-D65_to_sRGB", "display - cie-xyz-d65_to_rec.2100-pq", "ACEScc_to_ACES2065-1", "ACEScct_to_ACES2065-1"] {
+        assert!(builtin(style).is_some(), "{style}");
+    }
+    assert!(builtin("ACES-OUTPUT - ACES2065-1_to_CIE-XYZ-D65 - SDR-VIDEO_1.0").is_none());
+    // D65 white in XYZ is display white.
+    let xyz = rgb_white_xyz();
+    for style in ["DISPLAY - CIE-XYZ-D65_to_sRGB", "DISPLAY - CIE-XYZ-D65_to_REC.1886-REC.709", "DISPLAY - CIE-XYZ-D65_to_DisplayP3"] {
+        let o = builtin(style).unwrap().apply(xyz, false);
+        assert!(close(o, [1.0; 3], 1e-6), "{style}: {o:?}");
+    }
+    // PQ: 1.0 = 100 nits → code value ≈ 0.508.
+    let pq = builtin("DISPLAY - CIE-XYZ-D65_to_REC.2100-PQ").unwrap().apply(xyz, false);
+    assert!((pq[0] - 0.508).abs() < 1e-3, "{pq:?}");
+    // ACEScc and ACEScct of 0.18 (ACES2065-1 grey stays grey).
+    for (style, code) in [("ACEScc_to_ACES2065-1", 0.413_588_402_492_442_1), ("ACEScct_to_ACES2065-1", 0.413_588_402_492_442_1)] {
+        let o = builtin(style).unwrap().apply([code; 3], false);
+        assert!(close(o, [0.18; 3], 1e-6), "{style}: {o:?}");
+    }
+}
+
+fn rgb_white_xyz() -> [f64; 3] {
+    [D65[0] / D65[1], 1.0, (1.0 - D65[0] - D65[1]) / D65[1]]
+}
diff --git a/crates/effects/src/puppet/mod.rs b/crates/effects/src/puppet.rs
similarity index 100%
rename from crates/effects/src/puppet/mod.rs
rename to crates/effects/src/puppet.rs
diff --git a/crates/effects/src/roto.rs b/crates/effects/src/roto.rs
index a6c80e742..2467a719d 100644
--- a/crates/effects/src/roto.rs
+++ b/crates/effects/src/roto.rs
@@ -560,10 +560,14 @@ fn matte_for(ctx: &EffectCtx, f: i64, img: &Arc<Image>, scale: f64) -> Option<(V
         && fc.key == frozen_key(ctx.params, ctx.layer_size, ctx.fps())
         && let Some(fr) = fc.frames.get(&f)
     {
-        let a = rle::decode(&fr.a)?;
-        let bnd = rle::decode(&fr.b)?;
         let [fw, fh] = fc.size;
-        if a.len() == fw * fh && bnd.len() == fw * fh {
+        let expected = fw.checked_mul(fh)?;
+        if fw == 0 || fh == 0 || expected > rle::MAX_PLANE_BYTES {
+            return None;
+        }
+        let a = rle::decode_bounded(&fr.a, expected)?;
+        let bnd = rle::decode_bounded(&fr.b, expected)?;
+        if a.len() == expected && bnd.len() == expected {
             let af: Vec<f32> = a.iter().map(|v| *v as f32 / 255.0).collect();
             let (alpha, band) = if fw == w && fh == h {
                 (af, bnd)
@@ -630,7 +634,7 @@ fn render(ctx: &EffectCtx, buf: Buf) -> Buf {
     let (w, h) = (img.width as usize, img.height as usize);
     let mp = matte_params(ctx.params);
     let mut rgb = rb::rgb_of(&img);
-    let map = refine::decontaminate(&mut rgb, &alpha, &band, w, h, &mp, rr * sc, sc);
+    let map = refine::decontaminate(&mut rgb, &alpha, &band, (w, h), &mp, rr * sc, sc);
     let view_map = b(ctx.params, "refineEdgeMatte/decontamination/viewDecontaminationMap");
     let (ox, oy) = (buf.offset[0].round() as i64, buf.offset[1].round() as i64);
     for y in 0..h {
diff --git a/crates/effects/src/sim.rs b/crates/effects/src/sim.rs
index 14146a9f4..3a0743af2 100644
--- a/crates/effects/src/sim.rs
+++ b/crates/effects/src/sim.rs
@@ -18,2016 +18,25 @@ use crate::generate::value_noise;
 use crate::util::{SimCache, hash1, params_key, params_key_except, unpremul};
 use crate::{Buf, EffectCtx, EffectSpec, col, num, p, popup, slider};
 
-pub(crate) fn spec(id: &'static str, name: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
-    EffectSpec { id, name, category: "Simulation", params, render, gpu: false, float: true }
-}
-
-pub(crate) fn pt(x: f64, y: f64) -> Value {
-    Value::Vec2([x, y])
-}
-
-pub(crate) fn pct() -> ParamUi {
-    slider(0.0, 100.0, 0.0, 100.0, 1)
-}
-
-/// Deterministic hash → [0, 1).
-#[inline]
-pub(crate) fn h(i: u32, k: u32, seed: u32) -> f32 {
-    hash1(i, k, seed)
-}
-
-/// Signed hash → [-1, 1).
-#[inline]
-pub(crate) fn hs(i: u32, k: u32, seed: u32) -> f32 {
-    hash1(i, k, seed) * 2.0 - 1.0
-}
-
-// ------------------------------------------------------------------ band rasteriser
-
-const BAND: usize = 16;
-
-/// How rasterised items combine with what is already in the target.
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum Acc {
-    /// Premultiplied "over" (later items on top).
-    Over,
-    /// Additive (glows, light).
-    Add,
-}
-
-/// Rasterise many small items into `img` (buffer pixels). `bbox` gives an item's pixel bounds
-/// `[x0, y0, x1, y1]` (or `None` to skip), `shade` its premultiplied colour at a pixel centre.
-/// Items are bucketed into horizontal bands rendered in parallel; within a band they are drawn
-/// in slice order.
-pub(crate) fn raster<T: Sync>(
-    img: &mut Image,
-    items: &[T],
-    bbox: impl Fn(&T) -> Option<[f32; 4]> + Sync,
-    shade: impl Fn(&T, f32, f32) -> Option<Px> + Sync,
-    acc: Acc,
-) {
-    let (w, hgt) = (img.width as usize, img.height as usize);
-    if w == 0 || hgt == 0 || items.is_empty() {
-        return;
-    }
-    let nb = hgt.div_ceil(BAND);
-    let boxes: Vec<Option<[i32; 4]>> = items
-        .par_iter()
-        .map(|it| {
-            let b = bbox(it)?;
-            if !(b[0].is_finite() && b[1].is_finite() && b[2].is_finite() && b[3].is_finite()) {
-                return None;
-            }
-            let x0 = b[0].floor().max(0.0) as i32;
-            let y0 = b[1].floor().max(0.0) as i32;
-            let x1 = (b[2].ceil() as i32).min(w as i32 - 1);
-            let y1 = (b[3].ceil() as i32).min(hgt as i32 - 1);
-            if x1 < x0 || y1 < y0 || b[2] < 0.0 || b[3] < 0.0 {
-                return None;
-            }
-            Some([x0, y0, x1, y1])
-        })
-        .collect();
-    let mut buckets: Vec<Vec<u32>> = vec![Vec::new(); nb];
-    for (i, b) in boxes.iter().enumerate() {
-        if let Some(b) = b {
-            for band in (b[1] as usize / BAND)..=(b[3] as usize / BAND).min(nb - 1) {
-                buckets[band].push(i as u32);
-            }
-        }
-    }
-    img.data.par_chunks_mut(w * BAND).enumerate().for_each(|(band, chunk)| {
-        let by0 = band * BAND;
-        let rows = chunk.len() / w;
-        for &i in &buckets[band] {
-            let Some(b) = boxes[i as usize] else { continue };
-            let it = &items[i as usize];
-            let ya = (b[1] as usize).max(by0);
-            let yb = (b[3] as usize).min(by0 + rows - 1);
-            for y in ya..=yb {
-                let row = &mut chunk[(y - by0) * w..(y - by0 + 1) * w];
-                for x in b[0] as usize..=b[2] as usize {
-                    if let Some(c) = shade(it, x as f32 + 0.5, y as f32 + 0.5) {
-                        let d = &mut row[x];
-                        match acc {
-                            Acc::Over => {
-                                let k = 1.0 - c[3];
-                                *d = [c[0] + d[0] * k, c[1] + d[1] * k, c[2] + d[2] * k, c[3] + d[3] * k];
-                            }
-                            Acc::Add => {
-                                *d = [d[0] + c[0], d[1] + c[1], d[2] + c[2], (d[3] + c[3]).min(1.0)];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    });
-}
-
-// ------------------------------------------------------------------ sprites
-
-#[derive(Clone, Copy, PartialEq, Debug)]
-pub enum Shape {
-    /// Soft round dot (Gaussian-like falloff).
-    Soft,
-    /// Hard anti-aliased disc.
-    Disc,
-    /// Lit sphere (upper-left light, specular).
-    Sphere,
-    /// Disc fading linearly to its rim.
-    Faded,
-    /// Thin ring with a highlight.
-    Bubble,
-    /// Four-point star.
-    Star,
-    /// Rotated square (angle in `rot`).
-    Square,
-    /// Triangle (angle in `rot`).
-    Tri,
-    /// Segment from (x, y) by (dx, dy), half-width `r`.
-    Line { dx: f32, dy: f32 },
-}
-
-/// A particle sprite in buffer pixels; `c` is straight colour + opacity.
-#[derive(Clone, Copy, Debug)]
-pub struct Sprite {
-    pub x: f32,
-    pub y: f32,
-    pub r: f32,
-    pub c: [f32; 4],
-    pub shape: Shape,
-    pub rot: f32,
-}
-
-impl Sprite {
-    pub(crate) fn new(x: f32, y: f32, r: f32, c: [f32; 4], shape: Shape) -> Sprite {
-        Sprite { x, y, r, c, shape, rot: 0.0 }
-    }
-}
-
-/// Where a sprite's colour comes from when it depends on the layer's pixels (resolved by
-/// [`SpritePlan::resolve`] on the CPU, per pixel by the GPU compositor). Positions are buffer
-/// pixels.
-#[derive(Clone, Copy, Debug)]
-pub enum Tint {
-    /// The sprite's own colour.
-    Fixed,
-    /// CC Rainfall's refracting drops: where the layer shows (alpha > 0), colour × (layer
-    /// colour × 0.6 + 0.5) sampled at (x, y).
-    Refract { x: f64, y: f64 },
-    /// CC Star Burst: the layer's colour at (x, y), opacity × its alpha (none where clear).
-    Source { x: f64, y: f64 },
-    /// CC Hair: the root's colour at (x, y) mixed with the hair colour (`inherit` = 1 keeps the
-    /// root's), × `shade`, + `spec`; no strand where the root's alpha is below ½.
-    Root { x: f64, y: f64, hair: [f32; 3], inherit: f32, shade: f32, spec: f32 },
-}
-
-/// How a sprite layer meets the original layer.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Post {
-    /// [`combine`] with this mode (0 Composite … 5 sprites only).
-    Combine(u32),
-    /// The sprites alone.
-    Replace,
-    /// The sprites, mixed toward the original by this fraction.
-    Lerp(f32),
-    /// The sprites over opaque black.
-    OverBlack,
-}
-
-/// What a sprite-drawing effect draws this frame: built on the CPU (closed-form or from the
-/// simulation state), rasterised by [`SpritePlan::finish`] or the GPU compositor.
-#[derive(Clone, Debug)]
-pub struct SpritePlan {
-    pub sprites: Vec<Sprite>,
-    /// Per sprite (empty = all [`Tint::Fixed`]).
-    pub tints: Vec<Tint>,
-    pub acc: Acc,
-    pub post: Post,
-}
-
-impl SpritePlan {
-    /// Resolve layer-dependent colours against the layer `src`.
-    pub fn resolve(&mut self, src: &Image) {
-        let tints = std::mem::take(&mut self.tints);
-        self.sprites.par_iter_mut().zip(tints.par_iter()).for_each(|(sp, t)| match *t {
-            Tint::Fixed => {}
-            Tint::Refract { x, y } => {
-                let (sc, sa) = unpremul(src.sample_bilinear(x, y));
-                if sa > 0.0 {
-                    let c = sp.c;
-                    sp.c = [(sc[0] * 0.6 + 0.5) * c[0], (sc[1] * 0.6 + 0.5) * c[1], (sc[2] * 0.6 + 0.5) * c[2], c[3]];
-                }
-            }
-            Tint::Source { x, y } => {
-                let (c, a) = unpremul(src.sample_bilinear(x, y));
-                sp.c = if a <= 0.0 { [0.0; 4] } else { [c[0], c[1], c[2], a * sp.c[3]] };
-            }
-            Tint::Root { x, y, hair, inherit, shade, spec } => {
-                let root = src.sample_bilinear(x, y);
-                if root[3] < 0.5 {
-                    sp.c = [0.0; 4];
-                    return;
-                }
-                let (rc, _) = unpremul(root);
-                let base: [f32; 3] = std::array::from_fn(|k| rc[k] + (hair[k] - rc[k]) * (1.0 - inherit));
-                sp.c = [base[0] * shade + spec, base[1] * shade + spec, base[2] * shade + spec, sp.c[3]];
-            }
-        });
-    }
-
-    /// Rasterise (after [`SpritePlan::resolve`]) and meet the original layer `b`.
-    pub fn finish(&self, b: Buf) -> Buf {
-        let fx = splat(b.img.width, b.img.height, &self.sprites, self.acc);
-        self.finish_with(b, fx)
-    }
-
-    /// [`finish`](Self::finish) with a prepared sprite image (the motion-blurred average of
-    /// several frames, #1195).
-    pub fn finish_with(&self, b: Buf, fx: Image) -> Buf {
-        self.post.apply(b, fx)
-    }
-}
-
-impl Post {
-    /// Meet the sprite image `fx` with the original layer `b` (see [`SpritePlan::finish`]).
-    fn apply(self, mut b: Buf, fx: Image) -> Buf {
-        b.img = match self {
-            Post::Combine(m) => combine(&b.img, &fx, m),
-            Post::Replace => fx,
-            Post::Lerp(t) => {
-                let mut o = fx;
-                o.data.par_iter_mut().zip(b.img.data.par_iter()).for_each(|(o, s0)| *o = crate::util::lerp4(*o, *s0, t));
-                o
-            }
-            Post::OverBlack => combine(&Image::filled(b.img.width, b.img.height, [0.0, 0.0, 0.0, 1.0]), &fx, 0),
-        };
-        b
-    }
-}
-
-/// The sprite plan of a sprite-drawing simulation effect for buffer geometry `b` (its pixels
-/// are not read), `None` for other effects or settings drawn otherwise (the GPU compositor's
-/// render pass).
-pub fn sprite_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
-    match id {
-        "ec.sim.ccrainfall" => Some(rainfall_plan(ctx, b)),
-        "ec.sim.ccsnowfall" => Some(snowfall_plan(ctx, b)),
-        "ec.sim.ccstarburst" => Some(star_burst_plan(ctx, b)),
-        "ec.sim.cchair" => crate::sim3::hair_plan(ctx, b),
-        "ec.sim.waveworld" => crate::sim2::wave_world_plan(ctx, b).and_then(|p| match p {
-            crate::sim2::WavePlan::Wire(sp) => Some(sp),
-            crate::sim2::WavePlan::Height { .. } => None,
-        }),
-        "ec.sim.foam" => crate::sim2::foam_plan(ctx, b),
-        "ec.sim.ccparticleworld" => particle_world_plan(ctx, b),
-        "ec.sim.ccparticlesystems2" => Some(particle_systems2_plan(ctx, b)),
-        _ => None,
-    }
-}
-
-fn sprite_bbox(s: &Sprite) -> Option<[f32; 4]> {
-    if s.c[3] <= 1e-5 || s.r <= 0.0 {
-        return None;
-    }
-    let r = s.r.max(0.5) + 1.0;
-    Some(match s.shape {
-        Shape::Line { dx, dy } => [s.x.min(s.x + dx) - r, s.y.min(s.y + dy) - r, s.x.max(s.x + dx) + r, s.y.max(s.y + dy) + r],
-        Shape::Star => [s.x - r * 2.0, s.y - r * 2.0, s.x + r * 2.0, s.y + r * 2.0],
-        _ => [s.x - r, s.y - r, s.x + r, s.y + r],
-    })
-}
-
-#[inline]
-fn aa(edge: f32) -> f32 {
-    (edge + 0.5).clamp(0.0, 1.0)
-}
-
-fn sprite_shade(s: &Sprite, x: f32, y: f32) -> Option<Px> {
-    // Sub-pixel sprites keep their energy: draw at radius 0.5 with reduced opacity.
-    let (r, fade) = if s.r < 0.5 { (0.5, s.r / 0.5) } else { (s.r, 1.0) };
-    let (dx, dy) = (x - s.x, y - s.y);
-    let mut rgb = [s.c[0], s.c[1], s.c[2]];
-    let cov = match s.shape {
-        Shape::Soft => {
-            let d2 = (dx * dx + dy * dy) / (r * r);
-            if d2 >= 1.0 {
-                return None;
-            }
-            let q = 1.0 - d2;
-            q * q
-        }
-        Shape::Disc => aa(r - (dx * dx + dy * dy).sqrt()),
-        Shape::Faded => {
-            let d = (dx * dx + dy * dy).sqrt() / r;
-            (1.0 - d).max(0.0).powf(1.5)
-        }
-        Shape::Sphere => {
-            let d = (dx * dx + dy * dy).sqrt();
-            let cv = aa(r - d);
-            if cv <= 0.0 {
-                return None;
-            }
-            let (nx, ny) = (dx / r, dy / r);
-            let nz = (1.0 - nx * nx - ny * ny).max(0.0).sqrt();
-            let (lx, ly, lz) = (-0.48, -0.58, 0.66);
-            let diff = (nx * lx + ny * ly + nz * lz).max(0.0);
-            let rz = 2.0 * diff * nz - lz;
-            let spec = rz.max(0.0).powi(20) * 0.6;
-            let k = 0.2 + 0.8 * diff;
-            rgb = [rgb[0] * k + spec, rgb[1] * k + spec, rgb[2] * k + spec];
-            cv
-        }
-        Shape::Bubble => {
-            let d = (dx * dx + dy * dy).sqrt() / r;
-            if d > 1.0 + 1.0 / r {
-                return None;
-            }
-            let ring = (1.0 - ((d - 0.9) / 0.12).powi(2)).max(0.0);
-            let hl = (1.0 - (((dx / r) + 0.4).powi(2) + ((dy / r) + 0.4).powi(2)) / 0.04).max(0.0);
-            (0.12 * (d <= 1.0) as u8 as f32 + ring * 0.8 + hl).min(1.0)
-        }
-        Shape::Star => {
-            let (sn, cs) = s.rot.sin_cos();
-            let (ux, uy) = ((dx * cs + dy * sn) / r, (-dx * sn + dy * cs) / r);
-            let d = (ux * ux + uy * uy).sqrt();
-            let core = (1.0 - d).max(0.0).powi(2);
-            let sx = (1.0 - ux.abs() / 2.0).max(0.0) * (1.0 - (uy.abs() * 6.0)).max(0.0);
-            let sy = (1.0 - uy.abs() / 2.0).max(0.0) * (1.0 - (ux.abs() * 6.0)).max(0.0);
-            (core + sx + sy).min(1.0)
-        }
-        Shape::Square => {
-            let (sn, cs) = s.rot.sin_cos();
-            let (ux, uy) = (dx * cs + dy * sn, -dx * sn + dy * cs);
-            let e = r * 0.75;
-            aa(e - ux.abs()) * aa(e - uy.abs())
-        }
-        Shape::Tri => {
-            let (sn, cs) = s.rot.sin_cos();
-            let (ux, uy) = (dx * cs + dy * sn, -dx * sn + dy * cs);
-            // Equilateral triangle with circumradius r: three half-planes.
-            let e = r * 0.5;
-            let mut m = f32::INFINITY;
-            for k in 0..3 {
-                let a = std::f32::consts::FRAC_PI_2 + k as f32 * std::f32::consts::TAU / 3.0;
-                let (ns, nc) = a.sin_cos();
-                m = m.min(e - (ux * nc + uy * ns));
-            }
-            aa(m)
-        }
-        Shape::Line { dx: lx, dy: ly } => {
-            let l2 = lx * lx + ly * ly;
-            let t = if l2 > 0.0 { ((dx * lx + dy * ly) / l2).clamp(0.0, 1.0) } else { 0.0 };
-            let (px, py) = (dx - lx * t, dy - ly * t);
-            aa(r - (px * px + py * py).sqrt())
-        }
-    };
-    let a = cov * s.c[3] * fade;
-    if a <= 1e-6 {
-        return None;
-    }
-    Some([rgb[0] * a, rgb[1] * a, rgb[2] * a, a])
-}
-
-/// Draw sprites into a new transparent image of `w`×`h`.
-pub(crate) fn splat(w: u32, hgt: u32, sprites: &[Sprite], acc: Acc) -> Image {
-    let mut img = Image::new(w, hgt);
-    raster(&mut img, sprites, sprite_bbox, sprite_shade, acc);
-    img
-}
-
-/// Combine an effect layer `fx` with the original `src` (both premultiplied, same size):
-/// 0 Composite (fx over src), 1 Screen, 2 Add, 3 Lighten, 4 Darken, 5 fx only.
-pub(crate) fn combine(src: &Image, fx: &Image, mode: u32) -> Image {
-    let mut out = fx.clone();
-    out.data.par_iter_mut().zip(src.data.par_iter()).for_each(|(o, s)| {
-        let f = *o;
-        *o = match mode {
-            0 => {
-                let k = 1.0 - f[3];
-                [f[0] + s[0] * k, f[1] + s[1] * k, f[2] + s[2] * k, f[3] + s[3] * k]
-            }
-            1 => [s[0] + f[0] - s[0] * f[0], s[1] + f[1] - s[1] * f[1], s[2] + f[2] - s[2] * f[2], s[3] + f[3] - s[3] * f[3]],
-            2 => [s[0] + f[0], s[1] + f[1], s[2] + f[2], (s[3] + f[3]).min(1.0)],
-            3 => [s[0].max(f[0]), s[1].max(f[1]), s[2].max(f[2]), s[3] + f[3] - s[3] * f[3]],
-            4 => {
-                let (fc, fa) = unpremul(f);
-                let m = |c: f32, k: usize| c - (c - c.min(fc[k] * s[3])) * fa;
-                [m(s[0], 0), m(s[1], 1), m(s[2], 2), s[3]]
-            }
-            _ => f,
-        };
-    });
-    out
-}
-
-// ------------------------------------------------------------------ CC Rainfall / CC Snowfall
-
-/// Shared weather layout: per-item depth factor `k` in (0, 1] (1 = nearest) from Scene Depth.
-#[inline]
-fn depth_k(z: f32, scene_depth: f32) -> f32 {
-    1.0 / (1.0 + z * scene_depth / 2500.0)
-}
-
-/// Wrap `v` into `[lo, lo + span)`.
-#[inline]
-fn wrap(v: f32, lo: f32, span: f32) -> f32 {
-    if span <= 0.0 { v } else { lo + (v - lo).rem_euclid(span) }
-}
-
-fn rainfall(ctx: &EffectCtx, b: Buf) -> Buf {
-    let mut plan = rainfall_plan(ctx, &b);
-    plan.resolve(&b.img);
-    plan.finish(b)
-}
-
-fn rainfall_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
-    let pr = ctx.params;
-    let n = pr.f("drops").clamp(0.0, 100_000.0) as u32;
-    let size = pr.f("size").max(0.0) as f32;
-    let depth = pr.f("sceneDepth").max(0.0) as f32;
-    let speed = pr.f("speed") as f32;
-    let wind = pr.f("wind") as f32;
-    let wvar = pr.f("windVariation") as f32 / 100.0;
-    let spread = pr.f("spread") as f32;
-    let color = pr.color("color");
-    let opacity = pr.f("opacity") as f32 / 100.0;
-    let mode = pr.e("transferMode");
-    let with_orig = pr.b("compositeWithOriginal");
-    let refract = pr.e("extras/appearance") == 0;
-    let off = pr.v2("extras/offset");
-    let seed = pr.f("extras/randomSeed") as u32 ^ ctx.seed.wrapping_mul(0x9e37);
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    let t = ctx.time as f32;
-    let (ox, oy) = (off[0] as f32 - lw * 0.5, off[1] as f32 - lh * 0.5);
-    let (sprites, tints): (Vec<Sprite>, Vec<Tint>) = (0..n)
-        .into_par_iter()
-        .map(|i| {
-            let z = h(i, 1, seed);
-            let k = depth_k(z, depth);
-            let vy = speed / 4000.0 * lh * 2.2 * k;
-            let w = wind / 1000.0 * lh * (1.0 + wvar * hs(i, 2, seed)) * k + spread * hs(i, 7, seed) * k;
-            let len = (vy * 0.04 * size.max(0.2)).max(1.0);
-            let lenx = w * 0.04 * size.max(0.2);
-            let margin = len + lenx.abs() + 4.0;
-            let y = wrap(h(i, 3, seed) * (lh + 2.0 * margin) + vy * t + oy, -margin, lh + 2.0 * margin);
-            let x = wrap(h(i, 4, seed) * (lw + 2.0 * margin) + w * t + ox, -margin, lw + 2.0 * margin);
-            let (bx, by) = b.to_px([x as f64, y as f64]);
-            let c = [color[0], color[1], color[2], opacity * (0.35 + 0.65 * k)];
-            // Refracting drops show the scene behind them, brightened and offset.
-            let tint = if refract { Tint::Refract { x: bx + 2.0 * s as f64, y: by } } else { Tint::Fixed };
-            let r = (size * 0.6 * k * s).max(0.25);
-            (Sprite::new(bx as f32, by as f32, r, c, Shape::Line { dx: -lenx * s, dy: -len * s }), tint)
-        })
-        .unzip();
-    SpritePlan { sprites, tints, acc: Acc::Over, post: weather_post(mode, with_orig) }
-}
-
-fn weather_post(mode: u32, with_orig: bool) -> Post {
-    if with_orig { Post::Combine(if mode == 1 { 3 } else { 0 }) } else { Post::Replace }
-}
-
-fn snowfall(ctx: &EffectCtx, b: Buf) -> Buf {
-    snowfall_plan(ctx, &b).finish(b)
-}
-
-fn snowfall_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
-    let pr = ctx.params;
-    let n = pr.f("flakes").clamp(0.0, 200_000.0) as u32;
-    let size = pr.f("size").max(0.0) as f32;
-    let svar = pr.f("sizeVariation") as f32 / 100.0;
-    let depth = pr.f("sceneDepth").max(0.0) as f32;
-    let speed = pr.f("speed") as f32;
-    let spvar = pr.f("speedVariation") as f32 / 100.0;
-    let wind = pr.f("wind") as f32;
-    let wvar = pr.f("windVariation") as f32 / 100.0;
-    let spread = pr.f("spread") as f32;
-    let wig = pr.f("wiggle/wiggleAmount") as f32;
-    let wigvar = pr.f("wiggle/wiggleAmountVariation") as f32 / 100.0;
-    let wfreq = pr.f("wiggle/wiggleFrequency") as f32;
-    let wfvar = pr.f("wiggle/wiggleFrequencyVariation") as f32 / 100.0;
-    let color = pr.color("color");
-    let opacity = pr.f("opacity") as f32 / 100.0;
-    let mode = pr.e("transferMode");
-    let with_orig = pr.b("compositeWithOriginal");
-    let off = pr.v2("extras/offset");
-    let seed = pr.f("extras/randomSeed") as u32 ^ ctx.seed.wrapping_mul(0x85eb);
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    let t = ctx.time as f32;
-    let (ox, oy) = (off[0] as f32 - lw * 0.5, off[1] as f32 - lh * 0.5);
-    let sprites: Vec<Sprite> = (0..n)
-        .into_par_iter()
-        .map(|i| {
-            let z = h(i, 1, seed);
-            let k = depth_k(z, depth);
-            let r = (size * 0.5 * k * (1.0 + svar * hs(i, 2, seed))).max(0.05);
-            let vy = speed * (lh / 600.0) * k * (1.0 + spvar * hs(i, 3, seed));
-            let vx = wind * (lh / 1200.0) * k * (1.0 + wvar * hs(i, 4, seed)) + spread * hs(i, 8, seed) * k;
-            let amp = wig * 2.0 * k * (1.0 + wigvar * hs(i, 5, seed));
-            let fr = wfreq * (1.0 + wfvar * hs(i, 6, seed));
-            let ph = h(i, 9, seed) * std::f32::consts::TAU;
-            let margin = r + amp.abs() + 2.0;
-            let y = wrap(h(i, 10, seed) * (lh + 2.0 * margin) + vy * t + oy, -margin, lh + 2.0 * margin);
-            let x = wrap(h(i, 11, seed) * (lw + 2.0 * margin) + vx * t + ox, -margin, lw + 2.0 * margin) + amp * (fr * t * std::f32::consts::TAU + ph).sin();
-            let (bx, by) = b.to_px([x as f64, y as f64]);
-            Sprite::new(bx as f32, by as f32, r * s, [color[0], color[1], color[2], opacity * (0.4 + 0.6 * k)], Shape::Soft)
-        })
-        .collect();
-    SpritePlan { sprites, tints: vec![], acc: Acc::Over, post: weather_post(mode, with_orig) }
-}
-
-// ------------------------------------------------------------------ CC Bubbles
-
-/// A CC Bubbles bubble in buffer pixels.
-#[derive(Clone, Copy, Debug)]
-pub struct Bubble {
-    pub x: f32,
-    pub y: f32,
-    pub r: f32,
-    /// Source sample centre (buffer px).
-    pub sx: f32,
-    pub sy: f32,
-}
-
-/// CC Bubbles' bubbles this frame (closed-form in time) for buffer geometry `b`.
-pub fn bubble_list(ctx: &EffectCtx, b: &Buf) -> Vec<Bubble> {
-    let pr = ctx.params;
-    let n = pr.f("bubbleAmount").clamp(0.0, 10_000.0) as u32;
-    let speed = pr.f("bubbleSpeed") as f32;
-    let wamp = pr.f("wobbleAmplitude") as f32;
-    let wfreq = pr.f("wobbleFrequency") as f32;
-    let bsize = pr.f("bubbleSize").max(0.0) as f32;
-    let seed = ctx.seed.wrapping_mul(0x27d4);
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    let t = ctx.time as f32;
-    let base = lw.min(lh) * 0.035 * bsize;
-    (0..n)
-        .map(|i| {
-            let r = base * (0.5 + h(i, 1, seed));
-            let travel = lh + 2.0 * r;
-            let v = speed * lh * 0.3 * (0.6 + 0.8 * h(i, 2, seed));
-            let y = lh + r - (h(i, 3, seed) * travel + v * t).rem_euclid(travel);
-            let x0 = h(i, 4, seed) * lw;
-            let x = x0 + wamp * (r / base.max(1e-3)) * (t * wfreq * std::f32::consts::TAU + h(i, 5, seed) * std::f32::consts::TAU).sin();
-            let (bx, by) = b.to_px([x as f64, y as f64]);
-            let (sx, sy) = b.to_px([x0 as f64, y as f64]);
-            Bubble { x: bx as f32, y: by as f32, r: r * s, sx: sx as f32, sy: sy as f32 }
-        })
-        .collect()
-}
-
-fn bubbles(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let metal = pr.e("reflectionType") == 1;
-    let shading = pr.e("shadingType");
-    let list = bubble_list(ctx, &b);
-    let src = b.img.clone();
-    let mut out = Image::new(src.width, src.height);
-    raster(
-        &mut out,
-        &list,
-        |q| Some([q.x - q.r - 1.0, q.y - q.r - 1.0, q.x + q.r + 1.0, q.y + q.r + 1.0]),
-        |q, x, y| {
-            let (dx, dy) = ((x - q.x) / q.r.max(0.5), (y - q.y) / q.r.max(0.5));
-            let d2 = dx * dx + dy * dy;
-            let d = d2.sqrt();
-            let cov = aa((1.0 - d) * q.r);
-            if cov <= 0.0 {
-                return None;
-            }
-            // Liquid refracts (inverted, magnified), metal reflects (wide-angle mirror).
-            let k = if metal { 1.6 } else { -0.7 };
-            let nz = (1.0 - d2).max(0.0).sqrt();
-            let p = src.sample_bilinear((q.sx + dx * q.r * k) as f64, (q.sy + dy * q.r * k) as f64);
-            let (c, sa) = unpremul(p);
-            let mut c = if sa <= 0.0 { [0.6, 0.7, 0.8] } else { c };
-            let mut a = cov;
-            match shading {
-                1 => c = c.map(|v| v * 0.7 + 0.3 * (1.0 - nz)),
-                2 => c = c.map(|v| v * (0.5 + 0.5 * nz)),
-                3 => a *= nz.powf(0.5),
-                4 => a *= 1.0 - nz * 0.8,
-                _ => {}
-            }
-            let hl = (1.0 - ((dx + 0.35).powi(2) + (dy + 0.35).powi(2)) / 0.05).max(0.0) * 0.8;
-            let c = c.map(|v| v + hl);
-            Some([c[0] * a, c[1] * a, c[2] * a, a])
-        },
-        Acc::Over,
-    );
-    b.img = out;
-    b
-}
-
-// ------------------------------------------------------------------ CC Drizzle
-
-/// CC Drizzle's live drops this frame (buffer px: centre x, y, ring radius, amplitude);
-/// `None` = no drops yet (the layer passes through).
-pub fn drizzle_drops(ctx: &EffectCtx, b: &Buf) -> Option<Vec<[f32; 4]>> {
-    let pr = ctx.params;
-    let rate = pr.f("dripRate").max(0.0);
-    let life = pr.f("longevity").max(0.01);
-    let spreading = pr.f("spreading") as f32;
-    let height = pr.f("rippleHeight") as f32 / 100.0;
-    let seed = ctx.seed.wrapping_mul(0x165667b1);
-    let t = ctx.time;
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    if rate <= 0.0 || t < 0.0 {
-        return None;
-    }
-    // Drops born at k / rate with hashed positions; alive while younger than the longevity.
-    let k0 = ((t - life) * rate).floor().max(0.0) as u32;
-    let k1 = (t * rate).floor() as u32;
-    let mut drops = Vec::new();
-    for k in k0..=k1 {
-        let born = k as f64 / rate;
-        let age = (t - born) as f32;
-        if age < 0.0 || age as f64 >= life {
-            continue;
-        }
-        let (x, y) = b.to_px([(h(k, 1, seed) * lw) as f64, (h(k, 2, seed) * lh) as f64]);
-        let radius = spreading * age * lh / 400.0 * s;
-        let amp = height * (1.0 - age / life as f32) * (0.6 + 0.4 * h(k, 3, seed));
-        drops.push([x as f32, y as f32, radius, amp]);
-    }
-    Some(drops)
-}
-
-fn drizzle(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let Some(drops) = drizzle_drops(ctx, &b) else { return b };
-    let rippling = (pr.f("rippling") / 360.0).max(0.05) as f32;
-    let disp = pr.f("displacement") as f32;
-    let li = pr.f("light/lightIntensity") as f32 / 100.0;
-    let lc = pr.color("light/lightColor");
-    let lheight = pr.f("light/lightHeight") as f32 / 100.0;
-    let ldir = (pr.f("light/lightDirection") as f32).to_radians();
-    let ambient = pr.f("shading/ambient") as f32 / 100.0;
-    let diffuse = pr.f("shading/diffuse") as f32 / 100.0;
-    let specular = pr.f("shading/specular") as f32 / 100.0;
-    let rough = pr.f("shading/roughness").max(0.001) as f32;
-    let lh = ctx.layer_size[1] as f32;
-    let s = b.scale as f32;
-    let wavelen = (lh * 0.04 * s).max(2.0) / rippling.clamp(0.25, 4.0);
-    let width = wavelen * (1.0 + rippling * 2.0);
-    let field = |x: f32, y: f32| -> f32 {
-        let mut v = 0.0;
-        for &[dx, dy, r, a] in &drops {
-            let d = ((x - dx).powi(2) + (y - dy).powi(2)).sqrt();
-            let u = (d - r) / width;
-            if u.abs() < 1.0 {
-                let env = 0.5 + 0.5 * (u * std::f32::consts::PI).cos();
-                v += a * env * ((d - r) / wavelen * std::f32::consts::TAU).cos();
-            }
-        }
-        v
-    };
-    let src = b.img.clone();
-    let (ls, lcs) = ldir.sin_cos();
-    let l = {
-        let v = [lcs, ls, lheight.max(0.05)];
-        let n = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
-        [v[0] / n, v[1] / n, v[2] / n]
-    };
-    b.img.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let (fx, fy) = (x as f32 + 0.5, y as f32 + 0.5);
-            let gx = field(fx + 1.0, fy) - field(fx - 1.0, fy);
-            let gy = field(fx, fy + 1.0) - field(fx, fy - 1.0);
-            if gx == 0.0 && gy == 0.0 {
-                continue;
-            }
-            let p = src.sample_bilinear_clamped((fx - gx * disp * s * 4.0) as f64, (fy - gy * disp * s * 4.0) as f64);
-            let n = {
-                let v = [-gx * 6.0, -gy * 6.0, 1.0];
-                let m = (v[0] * v[0] + v[1] * v[1] + 1.0).sqrt();
-                [v[0] / m, v[1] / m, v[2] / m]
-            };
-            let nl = (n[0] * l[0] + n[1] * l[1] + n[2] * l[2]).max(0.0);
-            let hz = (l[2] + 1.0) * 0.5;
-            let hv = {
-                let v = [l[0] * 0.5, l[1] * 0.5, hz];
-                let m = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
-                [v[0] / m, v[1] / m, v[2] / m]
-            };
-            let sp = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(1.0 / rough) * specular * li;
-            let shade = 1.0 + (ambient + diffuse * nl - diffuse * l[2]) * li;
-            let a = p[3];
-            *px = [p[0] * shade + sp * lc[0] * a, p[1] * shade + sp * lc[1] * a, p[2] * shade + sp * lc[2] * a, a];
-        }
-    });
-    b
-}
-
-// ------------------------------------------------------------------ CC Star Burst
-
-fn star_burst(ctx: &EffectCtx, b: Buf) -> Buf {
-    let mut plan = star_burst_plan(ctx, &b);
-    plan.resolve(&b.img);
-    plan.finish(b)
-}
-
-fn star_burst_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
-    let pr = ctx.params;
-    let scatter = pr.f("scatter") as f32;
-    let speed = pr.f("speed") as f32;
-    let phase = pr.f("phase") as f32 / 360.0;
-    let spacing = pr.f("gridSpacing").max(1.0) as f32;
-    let size = pr.f("size") as f32 / 100.0;
-    let blend = pr.f("blendWithOriginal") as f32 / 100.0;
-    let seed = ctx.seed.wrapping_mul(0x3c6e);
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    let t = ctx.time as f32;
-    let nx = (lw / spacing).ceil().max(1.0) as u32;
-    let ny = (lh / spacing).ceil().max(1.0) as u32;
-    let (cx, cy) = (lw * 0.5, lh * 0.5);
-    let mut list: Vec<(f32, Sprite, Tint)> = (0..nx * ny)
-        .into_par_iter()
-        .map(|i| {
-            let (gx, gy) = ((i % nx) as f32 * spacing + spacing * 0.5, (i / nx) as f32 * spacing + spacing * 0.5);
-            let (sx, sy) = b.to_px([gx as f64, gy as f64]);
-            // Depth cycles towards the viewer: z in [0, 1), perspective 1 / (1 - 0.9 z).
-            let z = (h(i, 1, seed) + t * speed * 0.25 + phase).rem_euclid(1.0);
-            let persp = 1.0 / (1.0 - 0.9 * z);
-            let jx = hs(i, 2, seed) * scatter * 0.01 * lw * 0.5;
-            let jy = hs(i, 3, seed) * scatter * 0.01 * lh * 0.5;
-            let x = cx + (gx - cx + jx) * persp;
-            let y = cy + (gy - cy + jy) * persp;
-            let (bx, by) = b.to_px([x as f64, y as f64]);
-            let r = spacing * 0.5 * size * persp * s;
-            let fade = (z * 8.0).min(1.0) * ((1.0 - z) * 6.0).min(1.0);
-            // The layer's colour at the grid point (none where it is clear).
-            (z, Sprite::new(bx as f32, by as f32, r, [0.0, 0.0, 0.0, fade], Shape::Disc), Tint::Source { x: sx, y: sy })
-        })
-        .collect();
-    list.sort_by(|a, b| a.0.total_cmp(&b.0));
-    let (sprites, tints) = list.into_iter().map(|(_, s, t)| (s, t)).unzip();
-    SpritePlan { sprites, tints, acc: Acc::Over, post: if blend > 0.0 { Post::Lerp(blend) } else { Post::Replace } }
-}
-
-// ------------------------------------------------------------------ particle engine
-
-/// Steps per second of the stepped particle simulations.
-pub(crate) const SPS: f64 = 60.0;
-
-/// Number of whole steps reached at layer time `t`.
-pub(crate) fn steps_at(t: f64) -> u64 {
-    if t <= 0.0 { 0 } else { (t * SPS + 1e-6).floor() as u64 }
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct Particle {
-    pub p: [f32; 3],
-    pub v: [f32; 3],
-    pub age: f32,
-    pub life: f32,
-    /// Per-particle random in [0, 1) (size variation, colour jitter…).
-    pub rnd: f32,
-    pub id: u32,
-}
-
-#[derive(Clone, Debug, Default)]
-pub(crate) struct PState {
-    pub parts: Vec<Particle>,
-    pub carry: f64,
-    pub next_id: u32,
-}
-
-/// Physics configuration (world units; y down).
-#[derive(Clone, Copy, Debug)]
-pub(crate) struct Phys {
-    /// Particles per second.
-    pub rate: f64,
-    pub life: f32,
-    pub producer: [f32; 3],
-    pub radius: [f32; 3],
-    pub anim: u32,
-    pub speed: f32,
-    pub gravity: [f32; 3],
-    pub resistance: f32,
-    pub axis: [f32; 3],
-    pub extra: f32,
-    pub extra_angle: f32,
-    pub seed: u32,
-    pub max: usize,
-    /// 2D systems keep z = 0.
-    pub flat: bool,
-}
-
-pub(crate) const PW_ANIMS: &[&str] =
-    &["Explosive", "Direction Axis", "Cone Axis", "Viscouse", "Twirly", "Vortex", "Fire", "Jet Sideways", "Fractal Omni", "Fractal Uni"];
-
-fn norm3(v: [f32; 3]) -> [f32; 3] {
-    let l = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
-    if l > 1e-9 { [v[0] / l, v[1] / l, v[2] / l] } else { [0.0, -1.0, 0.0] }
-}
-
-fn rand_dir(i: u32, k: u32, seed: u32, flat: bool) -> [f32; 3] {
-    if flat {
-        let a = h(i, k, seed) * std::f32::consts::TAU;
-        return [a.cos(), a.sin(), 0.0];
-    }
-    let z = hs(i, k, seed);
-    let a = h(i, k + 1, seed) * std::f32::consts::TAU;
-    let r = (1.0 - z * z).max(0.0).sqrt();
-    [r * a.cos(), r * a.sin(), z]
-}
-
-impl Phys {
-    fn spawn(&self, id: u32) -> Particle {
-        let seed = self.seed;
-        let mut p = [0.0f32; 3];
-        // Uniform in the producer ellipsoid.
-        let u = rand_dir(id, 1, seed, self.flat);
-        let rr = h(id, 3, seed).powf(if self.flat { 0.5 } else { 1.0 / 3.0 });
-        for k in 0..3 {
-            p[k] = self.producer[k] + u[k] * self.radius[k] * rr;
-        }
-        if self.flat {
-            p[2] = 0.0;
-        }
-        let ax = norm3(self.axis);
-        let jitter = rand_dir(id, 5, seed, self.flat);
-        let dir = match self.anim {
-            1 | 9 => norm3([ax[0] + jitter[0] * 0.08, ax[1] + jitter[1] * 0.08, ax[2] + jitter[2] * 0.08]),
-            2 => {
-                let k = (self.extra_angle.to_radians() * 0.5).tan().abs().min(20.0);
-                norm3([ax[0] + jitter[0] * k * h(id, 8, seed), ax[1] + jitter[1] * k * h(id, 8, seed), ax[2] + jitter[2] * k * h(id, 8, seed)])
-            }
-            5 => [jitter[0], 0.0, if self.flat { 0.0 } else { jitter[2] }],
-            6 => norm3([jitter[0] * 0.25, -1.0, jitter[2] * 0.25]),
-            7 => norm3([1.0, jitter[1] * 0.05, jitter[2] * 0.05]),
-            _ => jitter,
-        };
-        let sp = self.speed * (0.5 + 0.5 * h(id, 9, seed));
-        let mut v = [dir[0] * sp, dir[1] * sp, dir[2] * sp];
-        if self.flat {
-            v[2] = 0.0;
-        }
-        let life = self.life * (0.8 + 0.4 * h(id, 10, seed));
-        Particle { p, v, age: 0.0, life, rnd: h(id, 11, seed), id }
-    }
-
-    pub(crate) fn step(&self, st: &mut PState, step: u64) {
-        let dt = (1.0 / SPS) as f32;
-        let t = step as f32 * dt;
-        let mut drag = self.resistance;
-        if self.anim == 3 {
-            drag += 3.0 * self.extra.max(0.1);
-        }
-        let damp = (-drag * dt).exp();
-        let seed = self.seed;
-        st.parts.par_iter_mut().for_each(|q| {
-            let mut a = self.gravity;
-            match self.anim {
-                4 => {
-                    // Twirly: swirl around the vertical axis through the producer.
-                    let (dx, dz) = (q.p[0] - self.producer[0], q.p[2] - self.producer[2]);
-                    let k = 4.0 * self.extra;
-                    a[0] += -dz * k;
-                    a[2] += dx * k;
-                    if self.flat {
-                        let dy = q.p[1] - self.producer[1];
-                        a[0] += -dy * k;
-                        a[1] += dx * k;
-                    }
-                }
-                5 => {
-                    // Vortex: strong tangential + inward pull.
-                    let (dx, dy) = (q.p[0] - self.producer[0], q.p[1] - self.producer[1]);
-                    let k = 6.0 * self.extra;
-                    a[0] += -dy * k - dx * 2.0;
-                    a[1] += dx * k - dy * 2.0;
-                }
-                6 => {
-                    // Fire: buoyant, flickering turbulence.
-                    let n = value_noise(q.p[0] * 8.0, q.p[1] * 8.0, t * 3.0, seed) - 0.5;
-                    a[0] += n * 4.0 * self.extra;
-                    a[1] -= self.gravity[1] * 1.5 + 0.3 * self.extra;
-                }
-                8 | 9 => {
-                    let f = 6.0 * self.extra;
-                    a[0] += (value_noise(q.p[0] * 5.0, q.p[1] * 5.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
-                    a[1] += (value_noise(q.p[0] * 5.0 + 17.0, q.p[1] * 5.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
-                    if !self.flat {
-                        a[2] += (value_noise(q.p[0] * 5.0, q.p[1] * 5.0 + 31.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
-                    }
-                }
-                _ => {}
-            }
-            for k in 0..3 {
-                q.v[k] = (q.v[k] + a[k] * dt) * damp;
-                q.p[k] += q.v[k] * dt;
-            }
-            if self.flat {
-                q.p[2] = 0.0;
-                q.v[2] = 0.0;
-            }
-            q.age += dt;
-        });
-        st.parts.retain(|q| q.age < q.life);
-        st.carry += self.rate / SPS;
-        let n = st.carry.floor() as u32;
-        st.carry -= n as f64;
-        for _ in 0..n {
-            if st.parts.len() >= self.max {
-                break;
-            }
-            let id = st.next_id;
-            st.next_id = st.next_id.wrapping_add(1);
-            // Sub-step birth offset keeps continuous streams smooth.
-            let mut q = self.spawn(id);
-            let frac = h(id, 12, seed) * dt;
-            for k in 0..3 {
-                q.p[k] += q.v[k] * frac;
-            }
-            q.age = frac;
-            st.parts.push(q);
-        }
-    }
-}
-
-impl Phys {
-    /// The backend description (per-step and per-spawn constants evaluated here, in f32).
-    pub(crate) fn desc(&self) -> crate::psim::EngineDesc {
-        let mut drag = self.resistance;
-        if self.anim == 3 {
-            drag += 3.0 * self.extra.max(0.1);
-        }
-        let dt = (1.0 / SPS) as f32;
-        crate::psim::EngineDesc {
-            life: self.life,
-            producer: self.producer,
-            radius: self.radius,
-            anim: self.anim,
-            speed: self.speed,
-            gravity: self.gravity,
-            axis: norm3(self.axis),
-            extra: self.extra,
-            cone: (self.extra_angle.to_radians() * 0.5).tan().abs().min(20.0),
-            damp: (-drag * dt).exp(),
-            seed: self.seed,
-            flat: self.flat,
-        }
-    }
-}
-
-/// The state at layer time `ctx.time` from the host's particle backend (GPU particles), or
-/// `None` (simulate on the CPU).
-fn accelerated(ctx: &EffectCtx, key: u64, phys: &Phys) -> Option<std::sync::Arc<PState>> {
-    let backend = ctx.env.host?.particles()?;
-    let steps = steps_at(ctx.time);
-    let births = crate::psim::births(phys.rate, steps, phys.max)?;
-    let req = crate::psim::SimRequest { key, steps, births: &births, system: crate::psim::ParticleSystem::Engine(phys.desc()) };
-    let parts = backend.simulate(&req)?;
-    Some(std::sync::Arc::new(PState {
-        parts: parts.into_iter().map(|q| Particle { p: q.p, v: q.v, age: q.age, life: q.life, rnd: q.rnd, id: q.id }).collect(),
-        carry: 0.0,
-        next_id: births.len() as u32,
-    }))
-}
-
-/// The live particles of a stepped particle effect (`ec.sim.ccparticleworld`,
-/// `ec.sim.ccparticlesystems2`) at `ctx.time`: from the host's particle backend when it has
-/// one (GPU particles), else from the CPU simulation. For comparing the two.
-pub fn particle_state(id: &str, ctx: &EffectCtx) -> Option<Vec<crate::psim::SimParticle>> {
-    let (phys, cache, salt) = match id {
-        "ec.sim.ccparticleworld" => (pw_phys(ctx), &PW_CACHE, 1),
-        "ec.sim.ccparticlesystems2" => (ps2_phys(ctx), &PS2_CACHE, 2),
-        _ => return None,
-    };
-    let key = sim_key(ctx, salt);
-    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(cache, key, ctx.time, &phys));
-    Some(st.parts.iter().map(|q| crate::psim::SimParticle { p: q.p, v: q.v, age: q.age, life: q.life, rnd: q.rnd, id: q.id }).collect())
-}
-
-/// The simulation cache key of a stepped particle effect: every parameter but CC Particle World's
-/// Effect Camera, which only changes how the particles are seen (animating it doesn't restart
-/// the simulation).
-fn sim_key(ctx: &EffectCtx, salt: u64) -> u64 {
-    params_key_except(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, salt, &[PW_EFFECT_CAMERA])
-}
-
-/// Run a particle system to layer time `t` through `cache`.
-pub(crate) fn simulate(cache: &SimCache<PState>, key: u64, t: f64, phys: &Phys) -> std::sync::Arc<PState> {
-    cache.run(key, steps_at(t), PState::default, |st, i| phys.step(st, i))
-}
-
-pub(crate) const PARTICLE_TYPES: &[&str] =
-    &["Line", "Shaded Sphere", "Faded Sphere", "Bubble", "Star", "Motion Polygon", "Tri-Polygon", "Cube", "Textured Square"];
-
-/// Colour/size/opacity of a particle at its age.
-fn particle_look(q: &Particle, birth: [f32; 4], death: [f32; 4], bsize: f32, dsize: f32, svar: f32, max_op: f32) -> ([f32; 4], f32) {
-    let u = (q.age / q.life.max(1e-4)).clamp(0.0, 1.0);
-    let size = (bsize + (dsize - bsize) * u) * (1.0 + svar * (q.rnd * 2.0 - 1.0));
-    let fade = (u * 20.0).min(1.0) * ((1.0 - u) * 5.0).min(1.0);
-    let c = [birth[0] + (death[0] - birth[0]) * u, birth[1] + (death[1] - birth[1]) * u, birth[2] + (death[2] - birth[2]) * u, max_op * fade];
-    (c, size.max(0.0))
-}
-
-fn type_sprite(kind: u32, x: f32, y: f32, r: f32, c: [f32; 4], vx: f32, vy: f32, rot: f32) -> Sprite {
-    let vl = (vx * vx + vy * vy).sqrt().max(1e-6);
-    let shape = match kind {
-        0 => Shape::Line { dx: -vx / vl * r * 2.0, dy: -vy / vl * r * 2.0 },
-        1 => Shape::Sphere,
-        2 => Shape::Faded,
-        3 => Shape::Bubble,
-        4 => Shape::Star,
-        5 => Shape::Line { dx: -vx * 0.05, dy: -vy * 0.05 },
-        6 => Shape::Tri,
-        _ => Shape::Square,
-    };
-    let rr = match kind {
-        0 => (r * 0.08).max(0.5),
-        5 => r * 0.5,
-        _ => r,
-    };
-    Sprite { x, y, r: rr, c, shape, rot }
-}
-
-// ------------------------------------------------------------------ CC Particle World
-
-static PW_CACHE: SimCache<PState> = SimCache::new(6);
-
-/// CC Particle World's physics.
-fn pw_phys(ctx: &EffectCtx) -> Phys {
-    let pr = ctx.params;
-    Phys {
-        rate: pr.f("birthRate").max(0.0) * 120.0,
-        life: pr.f("longevity").max(0.0) as f32,
-        producer: [pr.f("producer/producerX") as f32, pr.f("producer/producerY") as f32, pr.f("producer/producerZ") as f32],
-        radius: [pr.f("producer/radiusX").max(0.0) as f32, pr.f("producer/radiusY").max(0.0) as f32, pr.f("producer/radiusZ").max(0.0) as f32],
-        anim: pr.e("physics/animation"),
-        speed: pr.f("physics/velocity") as f32 * 0.5,
-        gravity: {
-            let g = pr.f("physics/gravity") as f32;
-            let gv =
-                [pr.f("physics/gravityVector/gravityX") as f32, pr.f("physics/gravityVector/gravityY") as f32, pr.f("physics/gravityVector/gravityZ") as f32];
-            [gv[0] * g, gv[1] * g, gv[2] * g]
-        },
-        resistance: pr.f("physics/resistance").max(0.0) as f32,
-        axis: [pr.f("physics/directionAxis/axisX") as f32, pr.f("physics/directionAxis/axisY") as f32, pr.f("physics/directionAxis/axisZ") as f32],
-        extra: pr.f("physics/extra") as f32,
-        extra_angle: pr.f("physics/extraAngle") as f32,
-        seed: (pr.f("extras/randomSeed") as u32).wrapping_mul(0x9e3779b9) ^ ctx.seed,
-        max: 40_000,
-        flat: false,
-    }
-}
-
-fn particle_world(ctx: &EffectCtx, b: Buf) -> Buf {
-    // #1195: with the comp's motion-blur shutter open, particles draw as motion trails: the
-    // sprite fields of samples across the shutter are averaged, as Transform averages its
-    // matrix samples. (The GPU compositor runs this case on the CPU: catalog::gpu_supported.)
-    if let Some((angle, phase, n)) = ctx.env.shutter.filter(|(a, _, _)| *a > 0.0) {
-        let n = (n.clamp(2, 64) as usize).max(2);
-        let fd = 1.0 / ctx.fps().max(0.001);
-        let mut acc = Image::new(b.img.width, b.img.height);
-        let mut post: Option<Post> = None;
-        for k in 0..n {
-            let t = ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd;
-            let sub = EffectCtx { params: ctx.params, time: t, layer_size: ctx.layer_size, seed: ctx.seed, adjustment: ctx.adjustment, env: ctx.env };
-            if let Some(plan) = particle_world_plan(&sub, &b) {
-                let fx = splat(b.img.width, b.img.height, &plan.sprites, plan.acc);
-                acc.data.iter_mut().zip(&fx.data).for_each(|(a, o)| (0..4).for_each(|c| a[c] += o[c]));
-                post.get_or_insert(plan.post);
-            }
-        }
-        acc.data.iter_mut().for_each(|p| p.iter_mut().for_each(|v| *v /= n as f32));
-        return match post {
-            Some(p) => p.apply(b, acc),
-            None => b,
-        };
-    }
-    match particle_world_plan(ctx, &b) {
-        Some(plan) => plan.finish(b),
-        None => b,
-    }
-}
-
-/// CC Particle World's Extras ▸ Effect Camera parameters (id prefix).
-const PW_EFFECT_CAMERA: &str = "extras/effectCamera/";
-/// Effect Camera ▸ FOV's default (degrees).
-const PW_FOV: f64 = 50.0;
-
-/// What CC Particle World sees its particles through.
-enum PwCamera {
-    /// Extras ▸ Effect Camera, in world units (layer widths): `dist` from the world origin (the
-    /// layer centre) along −z, the world turned by `rot` (`None` = not turned) about the origin,
-    /// `focal` the scale at unit depth; particles nearer than `near` aren't drawn.
-    Effect { rot: Option<[[f32; 3]; 3]>, dist: f32, focal: f32, near: f32 },
-    /// The comp's active camera layer, on buffer-world points (After Effects then ignores the
-    /// Effect Camera).
-    Comp(crate::card3d::Proj),
-}
-
-/// A particle as the camera sees it: depth (larger is farther), buffer pixel, size scale `k`
-/// (buffer pixels per world unit = `k · layer width · buffer scale`) and velocity in world units
-/// on screen (× the same factor for buffer pixels).
-struct PwSeen {
-    depth: f32,
-    x: f32,
-    y: f32,
-    k: f32,
-    v: [f32; 2],
-}
-
-impl PwCamera {
-    fn new(ctx: &EffectCtx, b: &Buf) -> PwCamera {
-        let [lw, lh] = ctx.layer_size;
-        if let Some(cam) = ctx.env.host.and_then(|h| h.comp_scene()).filter(|sc| sc.camera_layer).and_then(|sc| sc.camera) {
-            let c = [b.offset[0] + lw * 0.5 * b.scale, b.offset[1] + lh * 0.5 * b.scale];
-            return PwCamera::Comp(crate::card3d::comp_proj(&cam, c, b));
-        }
-        let f = |id: &str, d: f64| ctx.params.get(&format!("{PW_EFFECT_CAMERA}{id}")).map(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(d);
-        // The camera keeps the origin's plane at the scale Distance gives it as FOV changes
-        // (moving in for a wider view), so FOV sets how strong the perspective is. Distance 2
-        // shows the origin's plane at the layer's own scale.
-        let half = |fov: f64| (fov.clamp(1.0, 179.0).to_radians() * 0.5).tan();
-        let zoom = half(PW_FOV) / half(f("fov", PW_FOV));
-        let dist = f("distance", 2.0).max(0.01) * zoom;
-        let a = [f("rotationX", 0.0), f("rotationY", 0.0), f("rotationZ", 0.0)];
-        let rot = (a != [0.0; 3]).then(|| {
-            let r = crate::card3d::rot_ordered(a[0].to_radians(), a[1].to_radians(), a[2].to_radians(), 0);
-            r.map(|row| row.map(|v| v as f32))
-        });
-        PwCamera::Effect { rot, dist: dist as f32, focal: (2.0 * zoom) as f32, near: (0.025 * dist) as f32 }
-    }
-
-    /// How the camera sees world point `p` moving at `v`; `None` behind or too close to it.
-    fn see(&self, p: [f32; 3], v: [f32; 3], lw: f32, lh: f32, b: &Buf) -> Option<PwSeen> {
-        match self {
-            PwCamera::Effect { rot, dist, focal, near } => {
-                let turn = |r: &[[f32; 3]; 3], q: [f32; 3]| r.map(|row| row[0] * q[0] + row[1] * q[1] + row[2] * q[2]);
-                let (p, v) = match rot {
-                    Some(r) => (turn(r, p), turn(r, v)),
-                    None => (p, v),
-                };
-                let zc = dist + p[2];
-                if zc.is_nan() || zc <= *near {
-                    return None;
-                }
-                let k = focal / zc;
-                let (x, y) = b.to_px([(lw * 0.5 + p[0] * lw * k) as f64, (lh * 0.5 + p[1] * lw * k) as f64]);
-                Some(PwSeen { depth: zc, x: x as f32, y: y as f32, k, v: [v[0], v[1]] })
-            }
-            PwCamera::Comp(proj) => {
-                let (s, lw, lh) = (b.scale, lw as f64, lh as f64);
-                let u = lw * s;
-                let at = [b.offset[0] + lw * 0.5 * s + p[0] as f64 * u, b.offset[1] + lh * 0.5 * s + p[1] as f64 * u, p[2] as f64 * u];
-                let seen = proj.view(at, [v[0] as f64, v[1] as f64, v[2] as f64])?;
-                let k = seen.scale;
-                Some(PwSeen {
-                    depth: seen.depth as f32,
-                    x: seen.at[0] as f32,
-                    y: seen.at[1] as f32,
-                    k: k as f32,
-                    v: [(seen.vel[0] / k) as f32, (seen.vel[1] / k) as f32],
-                })
-            }
-        }
-    }
-}
-
-/// CC Particle World's sprites (far to near), `None` before anything is born.
-fn particle_world_plan(ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
-    let pr = ctx.params;
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let phys = pw_phys(ctx);
-    if phys.rate <= 0.0 && ctx.time <= 0.0 {
-        return None;
-    }
-    let key = sim_key(ctx, 1);
-    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(&PW_CACHE, key, ctx.time, &phys));
-    let kind = pr.e("particle/particleType");
-    let birth = pr.color("particle/birthColor");
-    let death = pr.color("particle/deathColor");
-    let (bs, ds) = (pr.f("particle/birthSize") as f32, pr.f("particle/deathSize") as f32);
-    let svar = pr.f("particle/sizeVariation") as f32 / 100.0;
-    let max_op = pr.f("particle/maxOpacity") as f32 / 100.0;
-    let s = b.scale as f32;
-    let cam = PwCamera::new(ctx, b);
-    let mut list: Vec<(f32, Sprite)> = st
-        .parts
-        .par_iter()
-        .filter_map(|q| {
-            let PwSeen { depth, x, y, k, v } = cam.see(q.p, q.v, lw, lh, b)?;
-            let (c, size) = particle_look(q, birth, death, bs, ds, svar, max_op);
-            let r = size * 0.5 * lw * k * s * 0.25;
-            let sp = type_sprite(kind, x, y, r, c, v[0] * lw * k * s, v[1] * lw * k * s, (q.id % 628) as f32 * 0.01 + q.age * 2.0);
-            Some((depth, sp))
-        })
-        .collect();
-    list.sort_by(|a, b| b.0.total_cmp(&a.0));
-    let sprites: Vec<Sprite> = list.into_iter().map(|(_, s)| s).collect();
-    Some(particle_sprites(sprites, pr.e("particle/transferMode")))
-}
-
-/// The CC particle systems' sprites with their Transfer Mode (Composite, Screen, Add, Black
-/// Background).
-fn particle_sprites(sprites: Vec<Sprite>, mode: u32) -> SpritePlan {
-    // The particles replace the layer (After Effects shows no trace of the source in any
-    // Transfer Mode, which sets how the particles meet each other).
-    SpritePlan { sprites, tints: vec![], acc: if mode == 2 { Acc::Add } else { Acc::Over }, post: Post::Replace }
-}
-
-// ------------------------------------------------------------------ CC Particle Systems II
-
-static PS2_CACHE: SimCache<PState> = SimCache::new(6);
-
-/// CC Particle Systems II's physics.
-fn ps2_phys(ctx: &EffectCtx) -> Phys {
-    let pr = ctx.params;
-    let lh = ctx.layer_size[1] as f32;
-    let unit = lh.max(1.0);
-    let pos = pr.v2("producer/position");
-    let dir = (pr.f("physics/direction") as f32).to_radians();
-    Phys {
-        rate: pr.f("birthRate").max(0.0) * 60.0,
-        life: pr.f("longevity").max(0.0) as f32,
-        producer: [pos[0] as f32 / unit, pos[1] as f32 / unit, 0.0],
-        radius: [pr.f("producer/radiusX").max(0.0) as f32 / unit, pr.f("producer/radiusY").max(0.0) as f32 / unit, 0.0],
-        anim: [0u32, 1, 2, 3, 4, 5, 6, 7, 8, 9][pr.e("physics/animation").min(9) as usize],
-        speed: pr.f("physics/velocity") as f32 * 0.25,
-        gravity: [0.0, pr.f("physics/gravity") as f32 * 0.5, 0.0],
-        resistance: pr.f("physics/resistance").max(0.0) as f32,
-        // AE angles: 0° = up, clockwise.
-        axis: [dir.sin(), -dir.cos(), 0.0],
-        extra: pr.f("physics/extra") as f32,
-        extra_angle: 45.0 * pr.f("physics/extra") as f32,
-        seed: (pr.f("randomSeed") as u32).wrapping_mul(0x85ebca6b) ^ ctx.seed,
-        max: 40_000,
-        flat: true,
-    }
-}
-
-fn particle_systems2(ctx: &EffectCtx, b: Buf) -> Buf {
-    particle_systems2_plan(ctx, &b).finish(b)
-}
-
-/// CC Particle Systems II's sprites.
-fn particle_systems2_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
-    let pr = ctx.params;
-    let lh = ctx.layer_size[1] as f32;
-    let unit = lh.max(1.0);
-    let phys = ps2_phys(ctx);
-    let key = sim_key(ctx, 2);
-    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(&PS2_CACHE, key, ctx.time, &phys));
-    let kind = pr.e("particle/particleType");
-    let birth = pr.color("particle/birthColor");
-    let death = pr.color("particle/deathColor");
-    let (bs, ds) = (pr.f("particle/birthSize") as f32, pr.f("particle/deathSize") as f32);
-    let svar = pr.f("particle/sizeVariation") as f32 / 100.0;
-    let max_op = pr.f("particle/maxOpacity") as f32 / 100.0;
-    let s = b.scale as f32;
-    let sprites: Vec<Sprite> = st
-        .parts
-        .iter()
-        .map(|q| {
-            let (bx, by) = b.to_px([(q.p[0] * unit) as f64, (q.p[1] * unit) as f64]);
-            let (c, size) = particle_look(q, birth, death, bs, ds, svar, max_op);
-            let r = size * unit * 0.02 * s;
-            type_sprite(kind, bx as f32, by as f32, r, c, q.v[0] * unit * s, q.v[1] * unit * s, (q.id % 628) as f32 * 0.01 + q.age * 2.0)
-        })
-        .collect();
-    particle_sprites(sprites, pr.e("particle/transferMode"))
-}
-
-// ------------------------------------------------------------------ CC Mr. Mercury
-
-static MERCURY_CACHE: SimCache<PState> = SimCache::new(6);
-
-/// A CC Mr. Mercury blob (buffer px).
-#[derive(Clone, Copy, Debug)]
-pub struct Blob {
-    pub x: f32,
-    pub y: f32,
-    pub r: f32,
-}
-
-/// CC Mr. Mercury's blobs this frame, from its particle simulation (for buffer geometry `b`).
-pub fn mercury_blobs(ctx: &EffectCtx, b: &Buf) -> Vec<Blob> {
-    let pr = ctx.params;
-    let lh = ctx.layer_size[1] as f32;
-    let unit = lh.max(1.0);
-    let pos = pr.v2("producer");
-    let dir = (pr.f("direction") as f32).to_radians();
-    let phys = Phys {
-        rate: pr.f("birthRate").max(0.0) * 10.0,
-        life: pr.f("longevity").max(0.0) as f32,
-        producer: [pos[0] as f32 / unit, pos[1] as f32 / unit, 0.0],
-        radius: [pr.f("radiusX").max(0.0) as f32 / unit, pr.f("radiusY").max(0.0) as f32 / unit, 0.0],
-        anim: [0u32, 1, 2, 3, 4, 5, 6, 7, 8, 9][pr.e("animation").min(9) as usize],
-        speed: pr.f("velocity") as f32 * 0.3,
-        gravity: [0.0, pr.f("gravity") as f32 * 0.5, 0.0],
-        resistance: pr.f("resistance").max(0.0) as f32,
-        axis: [dir.sin(), -dir.cos(), 0.0],
-        extra: pr.f("extra") as f32,
-        extra_angle: 45.0 * pr.f("extra") as f32,
-        seed: ctx.seed.wrapping_mul(0xc2b2ae35),
-        max: 4_000,
-        flat: true,
-    };
-    let st = simulate(&MERCURY_CACHE, params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, 3), ctx.time, &phys);
-    let (bs, ds) = (pr.f("blobBirthSize") as f32, pr.f("blobDeathSize") as f32);
-    let s = b.scale as f32;
-    st.parts
-        .iter()
-        .map(|q| {
-            let u = (q.age / q.life.max(1e-4)).clamp(0.0, 1.0);
-            let size = bs + (ds - bs) * u;
-            let (bx, by) = b.to_px([(q.p[0] * unit) as f64, (q.p[1] * unit) as f64]);
-            Blob { x: bx as f32, y: by as f32, r: (size * unit * 0.08 * s).max(0.0) }
-        })
-        .filter(|q| q.r > 0.1)
-        .collect()
-}
-
-fn mr_mercury(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let pr = ctx.params;
-    let blobs = mercury_blobs(ctx, &b);
-    let influence = pr.f("blobInfluence") as f32 / 100.0;
-    let s = b.scale as f32;
-    let (w, hh) = (b.img.width, b.img.height);
-    // Field and gradient accumulate additively: [f, gx, gy, _].
-    let mut field = Image::new(w, hh);
-    let infl = 1.0 + influence;
-    raster(
-        &mut field,
-        &blobs,
-        |q| {
-            let e = q.r * 2.0 * infl;
-            Some([q.x - e, q.y - e, q.x + e, q.y + e])
-        },
-        |q, x, y| {
-            let (dx, dy) = (x - q.x, y - q.y);
-            let rr = q.r * 2.0 * infl;
-            let d2 = (dx * dx + dy * dy) / (rr * rr);
-            if d2 >= 1.0 {
-                return None;
-            }
-            let k = 1.0 - d2;
-            let f = k * k * k;
-            let g = -6.0 * k * k / (rr * rr);
-            Some([f, g * dx, g * dy, 0.0])
-        },
-        Acc::Add,
-    );
-    let thr = 0.35f32;
-    let ambient = pr.f("shading/ambient") as f32 / 100.0;
-    let diffuse = pr.f("shading/diffuse") as f32 / 100.0;
-    let specular = pr.f("shading/specular") as f32 / 100.0;
-    let rough = pr.f("shading/roughness").max(0.001) as f32;
-    let metal = pr.f("shading/metal") as f32 / 100.0;
-    let li = pr.f("light/lightIntensity") as f32 / 100.0;
-    let lc = pr.color("light/lightColor");
-    let ldir = (pr.f("light/lightDirection") as f32).to_radians();
-    let lheight = pr.f("light/lightHeight") as f32 / 100.0;
-    let l = norm3([ldir.sin(), -ldir.cos(), lheight.max(0.05)]);
-    let src = b.img.clone();
-    let mut out = Image::new(w, hh);
-    out.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let fv = field.data[y * w as usize + x];
-            let f = fv[0];
-            if f <= thr * 0.8 {
-                continue;
-            }
-            let cov = ((f - thr * 0.8) / (thr * 0.4)).clamp(0.0, 1.0);
-            let n = norm3([fv[1] * 3.0, fv[2] * 3.0, 1.0 / (1.0 + f)]);
-            // Refract the layer through the blob.
-            let sp = src.sample_bilinear_clamped(x as f64 + 0.5 - n[0] as f64 * 12.0 * s as f64, y as f64 + 0.5 - n[1] as f64 * 12.0 * s as f64);
-            let (c, sa) = unpremul(sp);
-            let base = if sa > 0.0 { c } else { [0.7, 0.7, 0.75] };
-            let nl = (n[0] * l[0] + n[1] * l[1] + n[2] * l[2]).max(0.0);
-            let hv = norm3([l[0], l[1], l[2] + 1.0]);
-            let spec = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(1.0 / rough) * specular * li;
-            let shade = ambient + diffuse * nl * li;
-            let cc: [f32; 3] = std::array::from_fn(|k| base[k] * shade + spec * (lc[k] * (1.0 - metal) + base[k] * metal));
-            *px = [cc[0] * cov, cc[1] * cov, cc[2] * cov, cov];
-        }
-    });
-    b.img = out;
-    b
-}
-
-// ------------------------------------------------------------------ specs
-
-pub fn specs() -> Vec<EffectSpec> {
-    let transfer = || popup(&["Composite", "Lighten"]);
-    vec![
-        spec(
-            "ec.sim.ccrainfall",
-            "CC Rainfall",
-            vec![
-                p("drops", "Drops", num(5000.0), slider(0.0, 100_000.0, 0.0, 20_000.0, 0)),
-                p("size", "Size", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 2)),
-                p("sceneDepth", "Scene Depth", num(5000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
-                p("speed", "Speed", num(4000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
-                p("wind", "Wind", num(0.0), slider(-10_000.0, 10_000.0, -2000.0, 2000.0, 1)),
-                p("windVariation", "Variation % (Wind)", num(0.0), pct()),
-                p("spread", "Spread", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
-                p("color", "Color", col(0.8, 0.8, 0.8), ParamUi::Color),
-                p("opacity", "Opacity", num(25.0), pct()),
-                p("transferMode", "Transfer Mode", Value::Enum(1), transfer()),
-                p("compositeWithOriginal", "Composite With Original", Value::Bool(true), ParamUi::Checkbox),
-                p("extras/appearance", "Appearance", Value::Enum(0), popup(&["Refracting", "Soft Solid"])),
-                p("extras/offset", "Offset", pt(0.5, 0.5), ParamUi::Point),
-                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-            ],
-            rainfall,
-        ),
-        spec(
-            "ec.sim.ccsnowfall",
-            "CC Snowfall",
-            vec![
-                p("flakes", "Flakes", num(10_000.0), slider(0.0, 200_000.0, 0.0, 50_000.0, 0)),
-                p("size", "Size", num(3.0), slider(0.0, 50.0, 0.0, 20.0, 2)),
-                p("sizeVariation", "Variation % (Size)", num(50.0), pct()),
-                p("sceneDepth", "Scene Depth", num(5000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
-                p("speed", "Speed", num(100.0), slider(0.0, 5000.0, 0.0, 1000.0, 1)),
-                p("speedVariation", "Variation % (Speed)", num(50.0), pct()),
-                p("wind", "Wind", num(25.0), slider(-5000.0, 5000.0, -500.0, 500.0, 1)),
-                p("windVariation", "Variation % (Wind)", num(50.0), pct()),
-                p("spread", "Spread", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
-                p("wiggle/wiggleAmount", "Amount", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
-                p("wiggle/wiggleAmountVariation", "Variation % (Amount)", num(50.0), pct()),
-                p("wiggle/wiggleFrequency", "Frequency", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("wiggle/wiggleFrequencyVariation", "Variation % (Frequency)", num(50.0), pct()),
-                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("opacity", "Opacity", num(100.0), pct()),
-                p("transferMode", "Transfer Mode", Value::Enum(0), transfer()),
-                p("compositeWithOriginal", "Composite With Original", Value::Bool(true), ParamUi::Checkbox),
-                p("extras/offset", "Offset", pt(0.5, 0.5), ParamUi::Point),
-                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-            ],
-            snowfall,
-        ),
-        spec(
-            "ec.sim.ccbubbles",
-            "CC Bubbles",
-            vec![
-                p("bubbleAmount", "Bubble Amount", num(100.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-                p("bubbleSpeed", "Bubble Speed", num(0.5), slider(-10.0, 10.0, -2.0, 2.0, 2)),
-                p("wobbleAmplitude", "Wobble Amplitude", num(5.0), slider(0.0, 500.0, 0.0, 100.0, 1)),
-                p("wobbleFrequency", "Wobble Frequency", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 2)),
-                p("bubbleSize", "Bubble Size", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("reflectionType", "Reflection Type", Value::Enum(0), popup(&["Liquid", "Metal"])),
-                p("shadingType", "Shading Type", Value::Enum(0), popup(&["None", "Lighten", "Darken", "Fade Inwards", "Fade Outwards"])),
-            ],
-            bubbles,
-        ),
-        spec(
-            "ec.sim.ccdrizzle",
-            "CC Drizzle",
-            vec![
-                p("dripRate", "Drip Rate", num(10.0), slider(0.0, 200.0, 0.0, 50.0, 2)),
-                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 30.0, 0.0, 5.0, 2)),
-                p("rippling", "Rippling", num(360.0), ParamUi::Angle),
-                p("displacement", "Displacement", num(5.0), slider(0.0, 100.0, 0.0, 30.0, 2)),
-                p("rippleHeight", "Ripple Height", num(30.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("spreading", "Spreading", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
-                p("light/lightIntensity", "Light Intensity", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
-                p("light/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("light/lightHeight", "Light Height", num(25.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
-                p("light/lightDirection", "Light Direction", num(-45.0), ParamUi::Angle),
-                p("shading/ambient", "Ambient", num(0.0), slider(-200.0, 200.0, -100.0, 100.0, 1)),
-                p("shading/diffuse", "Diffuse", num(0.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("shading/specular", "Specular", num(20.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("shading/roughness", "Roughness", num(0.05), slider(0.001, 1.0, 0.001, 0.5, 3)),
-            ],
-            drizzle,
-        ),
-        spec(
-            "ec.sim.ccstarburst",
-            "CC Star Burst",
-            vec![
-                p("scatter", "Scatter", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
-                p("speed", "Speed", num(1.0), slider(-10.0, 10.0, -4.0, 4.0, 2)),
-                p("phase", "Phase", num(0.0), ParamUi::Angle),
-                p("gridSpacing", "Grid Spacing", num(2.0), slider(1.0, 100.0, 1.0, 20.0, 0)),
-                p("size", "Size", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
-                p("blendWithOriginal", "Blend w. Original", num(0.0), pct()),
-            ],
-            star_burst,
-        ),
-        spec(
-            "ec.sim.ccparticleworld",
-            "CC Particle World",
-            vec![
-                p("birthRate", "Birth Rate", num(0.5), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("producer/producerX", "Position X", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
-                p("producer/producerY", "Position Y", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
-                p("producer/producerZ", "Position Z", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
-                p("producer/radiusX", "Radius X", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
-                p("producer/radiusY", "Radius Y", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
-                p("producer/radiusZ", "Radius Z", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
-                p("physics/animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
-                p("physics/velocity", "Velocity", num(1.0), slider(-10.0, 10.0, 0.0, 5.0, 2)),
-                p("physics/inheritVelocity", "Inherit Velocity %", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
-                p("physics/gravity", "Gravity", num(0.5), slider(-10.0, 10.0, -2.0, 2.0, 3)),
-                p("physics/resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("physics/extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
-                p("physics/extraAngle", "Extra Angle", num(360.0), ParamUi::Angle),
-                p("physics/directionAxis/axisX", "Axis X", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("physics/directionAxis/axisY", "Axis Y", num(-1.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("physics/directionAxis/axisZ", "Axis Z", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("physics/gravityVector/gravityX", "Gravity X", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("physics/gravityVector/gravityY", "Gravity Y", num(1.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("physics/gravityVector/gravityZ", "Gravity Z", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
-                p("particle/particleType", "Particle Type", Value::Enum(0), popup(PARTICLE_TYPES)),
-                p("particle/birthSize", "Birth Size", num(0.2), slider(0.0, 10.0, 0.0, 1.0, 3)),
-                p("particle/deathSize", "Death Size", num(0.2), slider(0.0, 10.0, 0.0, 1.0, 3)),
-                p("particle/sizeVariation", "Size Variation", num(0.0), pct()),
-                p("particle/maxOpacity", "Max Opacity", num(75.0), pct()),
-                p("particle/birthColor", "Birth Color", col(1.0, 1.0, 0.0), ParamUi::Color),
-                p("particle/deathColor", "Death Color", col(0.6, 0.0, 0.0), ParamUi::Color),
-                p("particle/transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Screen", "Add", "Black Matte"])),
-                p("extras/effectCamera/distance", "Distance", num(2.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("extras/effectCamera/rotationX", "Rotation X", num(0.0), ParamUi::Angle),
-                p("extras/effectCamera/rotationY", "Rotation Y", num(0.0), ParamUi::Angle),
-                p("extras/effectCamera/rotationZ", "Rotation Z", num(0.0), ParamUi::Angle),
-                p("extras/effectCamera/fov", "FOV", num(PW_FOV), slider(1.0, 179.0, 10.0, 120.0, 1)),
-                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-            ],
-            particle_world,
-        ),
-        spec(
-            "ec.sim.ccparticlesystems2",
-            "CC Particle Systems II",
-            vec![
-                p("birthRate", "Birth Rate", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
-                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("producer/position", "Position", pt(0.5, 0.5), ParamUi::Point),
-                p("producer/radiusX", "Radius X", num(0.0), slider(0.0, 2000.0, 0.0, 200.0, 1)),
-                p("producer/radiusY", "Radius Y", num(0.0), slider(0.0, 2000.0, 0.0, 200.0, 1)),
-                p("physics/animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
-                p("physics/velocity", "Velocity", num(2.0), slider(-20.0, 20.0, 0.0, 10.0, 2)),
-                p("physics/inheritVelocity", "Inherit Velocity %", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
-                p("physics/gravity", "Gravity", num(1.0), slider(-20.0, 20.0, -5.0, 5.0, 2)),
-                p("physics/resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("physics/direction", "Direction", num(0.0), ParamUi::Angle),
-                p("physics/extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
-                p("particle/particleType", "Particle Type", Value::Enum(0), popup(PARTICLE_TYPES)),
-                p("particle/birthSize", "Birth Size", num(0.5), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("particle/deathSize", "Death Size", num(1.5), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("particle/sizeVariation", "Size Variation", num(0.0), pct()),
-                p("particle/maxOpacity", "Max Opacity", num(75.0), pct()),
-                p("particle/birthColor", "Birth Color", col(1.0, 1.0, 0.0), ParamUi::Color),
-                p("particle/deathColor", "Death Color", col(0.6, 0.0, 0.0), ParamUi::Color),
-                p("particle/transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Screen", "Add", "Black Matte"])),
-                p("randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-            ],
-            particle_systems2,
-        ),
-        spec(
-            "ec.sim.ccmrmercury",
-            "CC Mr. Mercury",
-            vec![
-                p("radiusX", "Radius X", num(50.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
-                p("radiusY", "Radius Y", num(50.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
-                p("producer", "Producer", pt(0.5, 0.5), ParamUi::Point),
-                p("direction", "Direction", num(0.0), ParamUi::Angle),
-                p("velocity", "Velocity", num(1.0), slider(-20.0, 20.0, 0.0, 5.0, 2)),
-                p("birthRate", "Birth Rate", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("longevity", "Longevity (sec)", num(2.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("gravity", "Gravity", num(0.5), slider(-20.0, 20.0, -5.0, 5.0, 2)),
-                p("resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
-                p("extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
-                p("animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
-                p("blobInfluence", "Blob Influence", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
-                p("blobBirthSize", "Blob Birth Size", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 2)),
-                p("blobDeathSize", "Blob Death Size", num(0.25), slider(0.0, 10.0, 0.0, 2.0, 2)),
-                p("light/lightIntensity", "Light Intensity", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
-                p("light/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("light/lightHeight", "Light Height", num(50.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
-                p("light/lightDirection", "Light Direction", num(-45.0), ParamUi::Angle),
-                p("shading/ambient", "Ambient", num(0.0), slider(-200.0, 200.0, -100.0, 100.0, 1)),
-                p("shading/diffuse", "Diffuse", num(75.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("shading/specular", "Specular", num(50.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
-                p("shading/roughness", "Roughness", num(0.05), slider(0.001, 1.0, 0.001, 0.5, 3)),
-                p("shading/metal", "Metal", num(100.0), pct()),
-            ],
-            mr_mercury,
-        ),
-    ]
-}
+mod common;
+mod engine;
+mod particle_fx;
+mod registry;
+mod sprites;
+mod weather;
+
+pub(crate) use common::{h, hs, pct, pt, spec};
+pub use engine::particle_state;
+#[cfg(test)]
+pub(crate) use engine::{PState, PW_ANIMS, Phys, simulate};
+#[cfg(test)]
+use engine::{PW_EFFECT_CAMERA, sim_key};
+pub(crate) use engine::{SPS, steps_at};
+pub use particle_fx::{Blob, mercury_blobs};
+pub use registry::{specs, sprite_plan};
+pub use sprites::{Acc, Post, Shape, Sprite, SpritePlan, Tint};
+pub(crate) use sprites::{combine, raster, splat};
+pub use weather::{Bubble, bubble_list, drizzle_drops};
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, run_fx};
-
-    fn grey(w: u32, hh: u32) -> Image {
-        Image::filled(w, hh, [0.2, 0.2, 0.2, 1.0])
-    }
-
-    fn ramp(w: u32, hh: u32) -> Image {
-        let mut img = Image::new(w, hh);
-        for y in 0..hh {
-            for x in 0..w {
-                img.set(x, y, [x as f32 / w as f32, y as f32 / hh as f32, 0.4, 1.0]);
-            }
-        }
-        img
-    }
-
-    fn run(id: &str, vals: &[(&str, Value)], img: Image, t: f64) -> Image {
-        run_fx(id, vals, img, t, EffectEnv::default()).img
-    }
-
-    fn diff(a: &Image, b: &Image) -> f32 {
-        a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>()).sum()
-    }
-
-    /// Centre of mass (luminance-weighted difference from `base`), `[-1, -1]` when equal.
-    fn mass(img: &Image, base: &Image) -> [f32; 2] {
-        let (mut m, mut sx, mut sy) = (0.0, 0.0, 0.0);
-        for y in 0..img.height {
-            for x in 0..img.width {
-                let i = img.idx(x, y);
-                let d: f32 = (0..3).map(|k| (img.data[i][k] - base.data[i][k]).abs()).sum();
-                m += d;
-                sx += d * x as f32;
-                sy += d * y as f32;
-            }
-        }
-        if m > 0.0 { [sx / m, sy / m] } else { [-1.0; 2] }
-    }
-
-    /// [`mass`] in y.
-    fn mass_y(img: &Image, base: &Image) -> f32 {
-        mass(img, base)[1]
-    }
-
-    #[test]
-    fn rasteriser_over_and_add() {
-        let s = [Sprite::new(5.0, 5.0, 2.0, [1.0, 0.0, 0.0, 1.0], Shape::Disc)];
-        let img = splat(10, 40, &s, Acc::Over);
-        assert!(img.get(5, 5)[0] > 0.99 && img.get(9, 30)[3] == 0.0);
-        let two = [s[0], s[0]];
-        let add = splat(10, 40, &two, Acc::Add);
-        assert!(add.get(5, 5)[0] > 1.9);
-        // Items spanning band boundaries are drawn in every band.
-        let tall = [Sprite::new(5.0, 16.0, 6.0, [0.0, 1.0, 0.0, 1.0], Shape::Square)];
-        let t = splat(10, 40, &tall, Acc::Over);
-        assert!(t.get(5, 13)[1] > 0.9 && t.get(5, 18)[1] > 0.9);
-    }
-
-    #[test]
-    fn rainfall_deterministic_and_falls() {
-        let vals = [("drops", num(200.0)), ("opacity", num(100.0)), ("extras/appearance", Value::Enum(1)), ("color", col(1.0, 1.0, 1.0))];
-        let a = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.5);
-        let b = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.5);
-        assert_eq!(a, b);
-        assert!(diff(&a, &grey(40, 40)) > 1.0, "drops visible");
-        let none = run("ec.sim.ccrainfall", &[("drops", num(0.0))], grey(40, 40), 0.5);
-        assert_eq!(none, grey(40, 40));
-        let later = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.52);
-        assert!(diff(&a, &later) > 0.1, "rain moves");
-    }
-
-    #[test]
-    fn snowfall_deterministic_and_moves() {
-        let vals = [("flakes", num(300.0))];
-        let a = run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.0);
-        assert_eq!(a, run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.0));
-        assert!(diff(&a, &grey(40, 40)) > 1.0);
-        assert!(diff(&a, &run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.2)) > 0.1);
-        let off = run("ec.sim.ccsnowfall", &[("flakes", num(300.0)), ("compositeWithOriginal", Value::Bool(false))], grey(40, 40), 1.0);
-        assert!(off.data.iter().any(|p| p[3] == 0.0), "without original the background is transparent");
-    }
-
-    #[test]
-    fn bubbles_rise() {
-        let vals = [("bubbleAmount", num(30.0)), ("bubbleSize", num(3.0))];
-        let a = run("ec.sim.ccbubbles", &vals, ramp(40, 40), 0.3);
-        assert_eq!(a, run("ec.sim.ccbubbles", &vals, ramp(40, 40), 0.3));
-        assert!(a.data.iter().any(|p| p[3] > 0.5));
-        let none = run("ec.sim.ccbubbles", &[("bubbleAmount", num(0.0))], ramp(40, 40), 0.3);
-        assert!(none.data.iter().all(|p| p[3] == 0.0), "bubbles replace the layer");
-        // A single slow bubble moves up over a short time.
-        let one = [("bubbleAmount", num(1.0)), ("bubbleSize", num(4.0)), ("wobbleAmplitude", num(0.0)), ("bubbleSpeed", num(0.2))];
-        let blank = Image::new(40, 40);
-        let y0 = mass_y(&run("ec.sim.ccbubbles", &one, ramp(40, 40), 0.0), &blank);
-        let y1 = mass_y(&run("ec.sim.ccbubbles", &one, ramp(40, 40), 0.1), &blank);
-        assert!(y0 >= 0.0 && y1 >= 0.0 && (y1 < y0 || y0 < 8.0), "{y0} -> {y1}");
-    }
-
-    #[test]
-    fn drizzle_ripples() {
-        let a = run("ec.sim.ccdrizzle", &[], ramp(48, 48), 0.6);
-        assert_eq!(a, run("ec.sim.ccdrizzle", &[], ramp(48, 48), 0.6));
-        assert!(diff(&a, &ramp(48, 48)) > 0.1);
-        let none = run("ec.sim.ccdrizzle", &[("dripRate", num(0.0))], ramp(48, 48), 0.6);
-        assert_eq!(none, ramp(48, 48));
-    }
-
-    #[test]
-    fn star_burst_moves_stars() {
-        let a = run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.5);
-        assert_eq!(a, run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.5));
-        assert!(a.data.iter().any(|p| p[3] > 0.0));
-        let b = run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.9);
-        assert!(diff(&a, &b) > 0.5);
-        let full = run("ec.sim.ccstarburst", &[("blendWithOriginal", num(100.0))], ramp(40, 40), 0.5);
-        assert!(diff(&full, &ramp(40, 40)) < 1e-3);
-    }
-
-    fn pw_vals(seed: f64) -> Vec<(&'static str, Value)> {
-        vec![
-            ("birthRate", num(1.0)),
-            ("extras/randomSeed", num(seed)),
-            ("particle/particleType", Value::Enum(2)),
-            ("particle/birthSize", num(0.3)),
-            ("particle/deathSize", num(0.3)),
-        ]
-    }
-
-    /// #1195: with the comp's shutter open, the particles smear across it: the average of the
-    /// sampled sprite fields differs from the sharp frame, touches more pixels and keeps the
-    /// alpha energy.
-    #[test]
-    fn particle_world_motion_blur_trails() {
-        let v = pw_vals(21.0);
-        let blank = Image::new(40, 40);
-        let sharp = run("ec.sim.ccparticleworld", &v, blank.clone(), 2.0);
-        let blurred = crate::run_fx(
-            "ec.sim.ccparticleworld",
-            &v,
-            blank.clone(),
-            2.0,
-            EffectEnv { frame_rate: 10.0, shutter: Some((360.0, -180.0, 8)), ..Default::default() },
-        )
-        .img;
-        assert!(sharp.data.iter().any(|p| p[3] > 0.0), "sharp frame has particles");
-        assert_ne!(sharp.data, blurred.data, "the shutter smears the particles");
-        let lit = |img: &Image| img.data.iter().filter(|p| p[3] > 0.005).count();
-        let sum = |img: &Image| img.data.iter().map(|p| p[3]).sum::<f32>();
-        assert!(lit(&blurred) > lit(&sharp), "trails light more pixels: {} vs {}", lit(&blurred), lit(&sharp));
-        let (sa, ba) = (sum(&sharp), sum(&blurred));
-        assert!((ba - sa).abs() < sa * 0.6 + 1.0, "alpha energy roughly kept: {ba} vs {sa}");
-    }
-
-    #[test]
-    fn particle_world_seek_consistent() {
-        let v = pw_vals(11.0);
-        let direct = run("ec.sim.ccparticleworld", &v, Image::new(40, 40), 2.0);
-        let v2 = pw_vals(12.0);
-        let _ = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 1.0);
-        let stepped = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 2.0);
-        let direct2 = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 2.0);
-        assert_eq!(stepped, direct2);
-        assert!(direct.data.iter().any(|p| p[3] > 0.0), "particles alive");
-        // Before birth nothing is drawn.
-        let t0 = run("ec.sim.ccparticleworld", &v, Image::new(40, 40), 0.0);
-        assert!(t0.data.iter().all(|p| p[3] == 0.0));
-    }
-
-    #[test]
-    fn engine_resume_equals_from_scratch() {
-        for anim in 0..PW_ANIMS.len() as u32 {
-            let phys = Phys {
-                rate: 90.0,
-                life: 1.5,
-                producer: [0.0; 3],
-                radius: [0.05; 3],
-                anim,
-                speed: 0.5,
-                gravity: [0.0, 0.5, 0.0],
-                resistance: 0.2,
-                axis: [0.0, -1.0, 0.0],
-                extra: 1.0,
-                extra_angle: 60.0,
-                seed: 9,
-                max: 10_000,
-                flat: anim % 2 == 0,
-            };
-            let a: SimCache<PState> = SimCache::new(2);
-            let b: SimCache<PState> = SimCache::new(2);
-            let direct = simulate(&a, 1, 2.0, &phys);
-            let _ = simulate(&b, 1, 1.0, &phys);
-            let _ = simulate(&b, 1, 0.37, &phys);
-            let resumed = simulate(&b, 1, 2.0, &phys);
-            assert_eq!(direct.parts.len(), resumed.parts.len(), "anim {anim}");
-            assert!(direct.parts.iter().zip(&resumed.parts).all(|(p, q)| p.p == q.p && p.v == q.v && p.id == q.id), "anim {anim}");
-            assert!(!direct.parts.is_empty());
-        }
-    }
-
-    #[test]
-    fn particle_world_gravity_pulls_down() {
-        let base = |g: f64| {
-            vec![
-                ("birthRate", num(2.0)),
-                ("physics/velocity", num(0.2)),
-                ("physics/gravity", num(g)),
-                ("particle/particleType", Value::Enum(2)),
-                ("particle/birthSize", num(0.2)),
-                ("particle/deathSize", num(0.2)),
-                ("longevity", num(3.0)),
-            ]
-        };
-        let blank = Image::new(48, 48);
-        let up = mass_y(&run("ec.sim.ccparticleworld", &base(0.0), blank.clone(), 1.0), &blank);
-        let down = mass_y(&run("ec.sim.ccparticleworld", &base(2.0), blank.clone(), 1.0), &blank);
-        assert!(down > up + 2.0, "{up} {down}");
-    }
-
-    /// A comp whose camera is `camera` ([`crate::CompScene::camera`]); `layer`: a camera layer
-    /// (else the comp's default view).
-    struct Comp {
-        camera: [[f64; 4]; 3],
-        layer: bool,
-    }
-    impl crate::EffectHost for Comp {
-        fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
-            None
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-        fn comp_scene(&self) -> Option<crate::CompScene> {
-            Some(crate::CompScene { camera: Some(self.camera), camera_layer: self.layer, light: None })
-        }
-    }
-
-    /// A camera `d` px in front of layer point `c` looking at it, moved right by `dx` px and
-    /// zoomed by `zoom` (1 = identity on the layer plane): `c + zoom·d·(p − c − dx) / (z + d)`.
-    fn cam(c: [f64; 2], d: f64, dx: f64, zoom: f64) -> [[f64; 4]; 3] {
-        let k = zoom * d;
-        [[k, 0.0, c[0], d * c[0] - k * (c[0] + dx)], [0.0, k, c[1], d * c[1] - k * c[1]], [0.0, 0.0, 1.0, d]]
-    }
-
-    fn pw_in(comp: &Comp, vals: &[(&str, Value)]) -> Image {
-        run_fx("ec.sim.ccparticleworld", vals, Image::new(48, 48), 1.0, EffectEnv { host: Some(comp), ..Default::default() }).img
-    }
-
-    fn finite(img: &Image) -> bool {
-        img.data.iter().all(|p| p.iter().all(|c| c.is_finite()))
-    }
-
-    /// #397: with a camera layer in the comp, the particles are seen through it.
-    #[test]
-    fn particle_world_follows_the_comp_camera() {
-        let v = pw_vals(3.0);
-        let blank = Image::new(48, 48);
-        let here = Comp { camera: cam([24.0, 24.0], 96.0, 0.0, 1.0), layer: true };
-        let base = pw_in(&here, &v);
-        assert!(base.data.iter().any(|p| p[3] > 0.0), "particles alive");
-        // Moving the camera right moves the particles left.
-        let moved = pw_in(&Comp { camera: cam([24.0, 24.0], 96.0, 8.0, 1.0), ..here }, &v);
-        let (a, b) = (mass(&base, &blank), mass(&moved, &blank));
-        assert!(b[0] < a[0] - 4.0 && (b[1] - a[1]).abs() < 2.0, "{a:?} -> {b:?}");
-        // Zooming in spreads them out.
-        let zoomed = pw_in(&Comp { camera: cam([24.0, 24.0], 96.0, 0.0, 2.0), ..here }, &v);
-        let cover = |i: &Image| i.data.iter().filter(|p| p[3] > 0.01).count();
-        assert!(cover(&zoomed) > cover(&base), "{} {}", cover(&zoomed), cover(&base));
-        // The Effect Camera is ignored then.
-        let mut turned = v.clone();
-        turned.push(("extras/effectCamera/rotationY", num(60.0)));
-        assert_eq!(pw_in(&here, &turned), base);
-        // The comp's default view (no camera layer) leaves it to the Effect Camera.
-        let default_view = Comp { layer: false, ..here };
-        assert_eq!(pw_in(&default_view, &v), run("ec.sim.ccparticleworld", &v, blank.clone(), 1.0));
-        // A camera facing away, or a degenerate one, draws nothing and never NaN.
-        for camera in [[[96.0, 0.0, 24.0, 0.0], [0.0, 96.0, 24.0, 0.0], [0.0, 0.0, -1.0, -96.0]], [[0.0; 4]; 3], [[f64::NAN; 4]; 3]] {
-            assert_eq!(pw_in(&Comp { camera, layer: true }, &v), blank);
-        }
-        // A camera among the particles draws the ones in front of it.
-        let inside = pw_in(&Comp { camera: cam([24.0, 24.0], 1.0, 0.0, 1.0), ..here }, &v);
-        assert!(finite(&inside));
-    }
-
-    /// Extras ▸ Effect Camera: the defaults are the fixed camera Particle World always had.
-    #[test]
-    fn particle_world_effect_camera() {
-        let v = pw_vals(5.0);
-        let base = run("ec.sim.ccparticleworld", &v, Image::new(48, 48), 1.0);
-        let with = |extra: &[(&'static str, Value)]| {
-            let mut w = v.clone();
-            w.extend_from_slice(extra);
-            run("ec.sim.ccparticleworld", &w, Image::new(48, 48), 1.0)
-        };
-        // Missing parameters (projects saved before) read as the defaults.
-        let spec = crate::find("ec.sim.ccparticleworld").unwrap();
-        let mut params = crate::Params { values: spec.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        params.values.retain(|k, _| !k.starts_with(PW_EFFECT_CAMERA));
-        for (k, val) in &v {
-            params.values.insert(k.to_string(), val.clone());
-        }
-        let ctx = EffectCtx { params: &params, time: 1.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: EffectEnv::default() };
-        assert_eq!(crate::apply(spec, &ctx, Buf { img: Image::new(48, 48), offset: [0.0; 2], scale: 1.0 }).img, base);
-        assert_eq!(with(&[("extras/effectCamera/fov", num(f64::NAN))]), base);
-        // Turning or pulling back the camera changes the view.
-        let turned = with(&[("extras/effectCamera/rotationY", num(60.0))]);
-        assert!(diff(&turned, &base) > 1.0);
-        let cover = |i: &Image| i.data.iter().filter(|p| p[3] > 0.01).count();
-        let far = with(&[("extras/effectCamera/distance", num(4.0))]);
-        assert!(cover(&far) < cover(&base), "{} {}", cover(&far), cover(&base));
-        assert!(diff(&with(&[("extras/effectCamera/fov", num(120.0))]), &base) > 0.1);
-        // Extremes never panic or produce NaN.
-        for extra in [
-            ("extras/effectCamera/distance", num(0.0)),
-            ("extras/effectCamera/distance", num(-5.0)),
-            ("extras/effectCamera/fov", num(0.0)),
-            ("extras/effectCamera/fov", num(180.0)),
-            ("extras/effectCamera/rotationX", num(1e12)),
-        ] {
-            assert!(finite(&with(std::slice::from_ref(&extra))), "{extra:?}");
-        }
-        // Moving the camera doesn't restart the simulation.
-        let key = |pr: &crate::Params| {
-            sim_key(&EffectCtx { params: pr, time: 1.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: EffectEnv::default() }, 1)
-        };
-        let mut moved = params.clone();
-        moved.values.insert("extras/effectCamera/rotationZ".into(), num(30.0));
-        assert_eq!(key(&params), key(&moved));
-        moved.values.insert("extras/randomSeed".into(), num(9.0));
-        assert_ne!(key(&params), key(&moved));
-    }
-
-    #[test]
-    fn particle_systems2_seek_and_direction() {
-        let v = vec![
-            ("producer/position", pt(24.0, 24.0)),
-            ("birthRate", num(3.0)),
-            ("physics/gravity", num(0.0)),
-            ("physics/velocity", num(1.0)),
-            ("physics/animation", Value::Enum(1)),
-        ];
-        let _ = run("ec.sim.ccparticlesystems2", &v, Image::new(48, 48), 0.5);
-        let a = run("ec.sim.ccparticlesystems2", &v, Image::new(48, 48), 1.0);
-        let mut v2 = v.clone();
-        v2.push(("randomSeed", num(0.0)));
-        assert_eq!(a, run("ec.sim.ccparticlesystems2", &v2, Image::new(48, 48), 1.0));
-        // Direction 0° (up): particles above the producer.
-        let blank = Image::new(48, 48);
-        let y = mass_y(&a, &blank);
-        assert!((0.0..24.0).contains(&y), "{y}");
-        // The particles replace the layer: with none born it is empty.
-        let none = run("ec.sim.ccparticlesystems2", &[("birthRate", num(0.0))], grey(20, 20), 1.0);
-        assert_eq!(none, Image::new(20, 20));
-    }
-
-    /// CC Particle World and CC Particle Systems II replace their layer with the particles, in
-    /// every Transfer Mode (which only sets how particles meet each other). SceneYard frames from
-    /// After Effects 2026 show no trace of the source solid: "Task Preparation UI" (black solids
-    /// under fireworks hid a white page), "Burnout matchstick" (a red rectangle around the
-    /// flame), "Documentary Man Falling" (a black block over the light).
-    #[test]
-    fn cc_particles_replace_their_layer() {
-        let red = || {
-            let mut img = Image::new(48, 48);
-            img.data.iter_mut().for_each(|p| *p = [0.7, 0.1, 0.1, 1.0]);
-            img
-        };
-        for id in ["ec.sim.ccparticlesystems2", "ec.sim.ccparticleworld"] {
-            for mode in 0..4 {
-                let v = vec![("birthRate", num(3.0)), ("particle/transferMode", Value::Enum(mode))];
-                let _ = run(id, &v, red(), 0.5);
-                let out = run(id, &v, red(), 1.0);
-                // No source left: the corners, far from the producer, are clear.
-                for (x, y) in [(0, 0), (47, 0), (0, 47), (47, 47)] {
-                    assert!(out.get(x, y)[3] < 1e-6, "{id} mode {mode} ({x},{y}): {:?}", out.get(x, y));
-                }
-                assert!(out.data.iter().any(|p| p[3] > 0.05), "{id} mode {mode}: particles drawn");
-            }
-        }
-    }
-
-    #[test]
-    fn mercury_blobs_and_seek() {
-        let v = vec![("producer", pt(24.0, 16.0)), ("radiusX", num(5.0)), ("radiusY", num(5.0)), ("birthRate", num(3.0))];
-        let _ = run("ec.sim.ccmrmercury", &v, ramp(48, 48), 0.7);
-        let a = run("ec.sim.ccmrmercury", &v, ramp(48, 48), 1.4);
-        let mut v2 = v.clone();
-        v2.push(("shading/metal", num(100.0)));
-        let b = run("ec.sim.ccmrmercury", &v2, ramp(48, 48), 1.4);
-        assert_eq!(a, b);
-        assert!(a.data.iter().any(|p| p[3] > 0.5), "blobs visible");
-        let none = run("ec.sim.ccmrmercury", &[("birthRate", num(0.0))], ramp(48, 48), 1.4);
-        assert!(none.data.iter().all(|p| p[3] == 0.0));
-    }
-
-    #[test]
-    fn half_resolution_scales_sprites() {
-        // Downsampled buffers render the same layout at half size.
-        let s = crate::find("ec.sim.ccsnowfall").unwrap();
-        let mut params = crate::Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
-        params.values.insert("flakes".into(), num(50.0));
-        params.values.insert("offset".into(), pt(20.0, 20.0));
-        let ctx = EffectCtx { params: &params, time: 0.5, layer_size: [40.0, 40.0], seed: 1, adjustment: false, env: EffectEnv::default() };
-        let full = crate::apply(s, &ctx, Buf { img: grey(40, 40), offset: [0.0; 2], scale: 1.0 });
-        let half = crate::apply(s, &ctx, Buf { img: grey(20, 20), offset: [0.0; 2], scale: 0.5 });
-        let sum = |i: &Image| i.data.iter().map(|p| p[0]).sum::<f32>() / i.data.len() as f32;
-        assert!((sum(&full.img) - sum(&half.img)).abs() < 0.05, "{} {}", sum(&full.img), sum(&half.img));
-    }
-}
+mod tests;
diff --git a/crates/effects/src/sim/common.rs b/crates/effects/src/sim/common.rs
new file mode 100644
index 000000000..294d787f1
--- /dev/null
+++ b/crates/effects/src/sim/common.rs
@@ -0,0 +1,25 @@
+use super::{EffectSpec, ParamUi, Value, hash1, slider};
+
+pub(crate) fn spec(id: &'static str, name: &'static str, params: Vec<crate::ParamSpec>, render: crate::RenderFn) -> EffectSpec {
+    EffectSpec { id, name, category: "Simulation", params, render, gpu: false, float: true }
+}
+
+pub(crate) fn pt(x: f64, y: f64) -> Value {
+    Value::Vec2([x, y])
+}
+
+pub(crate) fn pct() -> ParamUi {
+    slider(0.0, 100.0, 0.0, 100.0, 1)
+}
+
+/// Deterministic hash → [0, 1).
+#[inline]
+pub(crate) fn h(i: u32, k: u32, seed: u32) -> f32 {
+    hash1(i, k, seed)
+}
+
+/// Signed hash → [-1, 1).
+#[inline]
+pub(crate) fn hs(i: u32, k: u32, seed: u32) -> f32 {
+    hash1(i, k, seed) * 2.0 - 1.0
+}
diff --git a/crates/effects/src/sim/engine.rs b/crates/effects/src/sim/engine.rs
new file mode 100644
index 000000000..b379636ce
--- /dev/null
+++ b/crates/effects/src/sim/engine.rs
@@ -0,0 +1,288 @@
+use super::common::{h, hs};
+use super::particle_fx::{PS2_CACHE, PW_CACHE, ps2_phys, pw_phys};
+use super::sprites::{Shape, Sprite};
+use super::{Buf, EffectCtx, Image, IntoParallelRefMutIterator, ParallelIterator, SimCache, params_key_except, value_noise};
+
+// ------------------------------------------------------------------ particle engine
+
+/// Steps per second of the stepped particle simulations.
+pub(crate) const SPS: f64 = 60.0;
+
+/// Number of whole steps reached at layer time `t`.
+pub(crate) fn steps_at(t: f64) -> u64 {
+    if t <= 0.0 { 0 } else { (t * SPS + 1e-6).floor() as u64 }
+}
+
+#[derive(Clone, Debug)]
+pub(crate) struct Particle {
+    pub p: [f32; 3],
+    pub v: [f32; 3],
+    pub age: f32,
+    pub life: f32,
+    /// Per-particle random in [0, 1) (size variation, colour jitter…).
+    pub rnd: f32,
+    pub id: u32,
+}
+
+#[derive(Clone, Debug, Default)]
+pub(crate) struct PState {
+    pub parts: Vec<Particle>,
+    pub carry: f64,
+    pub next_id: u32,
+}
+
+/// Physics configuration (world units; y down).
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Phys {
+    /// Particles per second.
+    pub rate: f64,
+    pub life: f32,
+    pub producer: [f32; 3],
+    pub radius: [f32; 3],
+    pub anim: u32,
+    pub speed: f32,
+    pub gravity: [f32; 3],
+    pub resistance: f32,
+    pub axis: [f32; 3],
+    pub extra: f32,
+    pub extra_angle: f32,
+    pub seed: u32,
+    pub max: usize,
+    /// 2D systems keep z = 0.
+    pub flat: bool,
+}
+
+pub(crate) const PW_ANIMS: &[&str] =
+    &["Explosive", "Direction Axis", "Cone Axis", "Viscouse", "Twirly", "Vortex", "Fire", "Jet Sideways", "Fractal Omni", "Fractal Uni"];
+
+pub(super) fn norm3(v: [f32; 3]) -> [f32; 3] {
+    let l = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
+    if l > 1e-9 { [v[0] / l, v[1] / l, v[2] / l] } else { [0.0, -1.0, 0.0] }
+}
+
+fn rand_dir(i: u32, k: u32, seed: u32, flat: bool) -> [f32; 3] {
+    if flat {
+        let a = h(i, k, seed) * std::f32::consts::TAU;
+        return [a.cos(), a.sin(), 0.0];
+    }
+    let z = hs(i, k, seed);
+    let a = h(i, k + 1, seed) * std::f32::consts::TAU;
+    let r = (1.0 - z * z).max(0.0).sqrt();
+    [r * a.cos(), r * a.sin(), z]
+}
+
+impl Phys {
+    fn spawn(&self, id: u32) -> Particle {
+        let seed = self.seed;
+        let mut p = [0.0f32; 3];
+        // Uniform in the producer ellipsoid.
+        let u = rand_dir(id, 1, seed, self.flat);
+        let rr = h(id, 3, seed).powf(if self.flat { 0.5 } else { 1.0 / 3.0 });
+        for k in 0..3 {
+            p[k] = self.producer[k] + u[k] * self.radius[k] * rr;
+        }
+        if self.flat {
+            p[2] = 0.0;
+        }
+        let ax = norm3(self.axis);
+        let jitter = rand_dir(id, 5, seed, self.flat);
+        let dir = match self.anim {
+            1 | 9 => norm3([ax[0] + jitter[0] * 0.08, ax[1] + jitter[1] * 0.08, ax[2] + jitter[2] * 0.08]),
+            2 => {
+                let k = (self.extra_angle.to_radians() * 0.5).tan().abs().min(20.0);
+                norm3([ax[0] + jitter[0] * k * h(id, 8, seed), ax[1] + jitter[1] * k * h(id, 8, seed), ax[2] + jitter[2] * k * h(id, 8, seed)])
+            }
+            5 => [jitter[0], 0.0, if self.flat { 0.0 } else { jitter[2] }],
+            6 => norm3([jitter[0] * 0.25, -1.0, jitter[2] * 0.25]),
+            7 => norm3([1.0, jitter[1] * 0.05, jitter[2] * 0.05]),
+            _ => jitter,
+        };
+        let sp = self.speed * (0.5 + 0.5 * h(id, 9, seed));
+        let mut v = [dir[0] * sp, dir[1] * sp, dir[2] * sp];
+        if self.flat {
+            v[2] = 0.0;
+        }
+        let life = self.life * (0.8 + 0.4 * h(id, 10, seed));
+        Particle { p, v, age: 0.0, life, rnd: h(id, 11, seed), id }
+    }
+
+    pub(crate) fn step(&self, st: &mut PState, step: u64) {
+        let dt = (1.0 / SPS) as f32;
+        let t = step as f32 * dt;
+        let mut drag = self.resistance;
+        if self.anim == 3 {
+            drag += 3.0 * self.extra.max(0.1);
+        }
+        let damp = (-drag * dt).exp();
+        let seed = self.seed;
+        st.parts.par_iter_mut().for_each(|q| {
+            let mut a = self.gravity;
+            match self.anim {
+                4 => {
+                    // Twirly: swirl around the vertical axis through the producer.
+                    let (dx, dz) = (q.p[0] - self.producer[0], q.p[2] - self.producer[2]);
+                    let k = 4.0 * self.extra;
+                    a[0] += -dz * k;
+                    a[2] += dx * k;
+                    if self.flat {
+                        let dy = q.p[1] - self.producer[1];
+                        a[0] += -dy * k;
+                        a[1] += dx * k;
+                    }
+                }
+                5 => {
+                    // Vortex: strong tangential + inward pull.
+                    let (dx, dy) = (q.p[0] - self.producer[0], q.p[1] - self.producer[1]);
+                    let k = 6.0 * self.extra;
+                    a[0] += -dy * k - dx * 2.0;
+                    a[1] += dx * k - dy * 2.0;
+                }
+                6 => {
+                    // Fire: buoyant, flickering turbulence.
+                    let n = value_noise(q.p[0] * 8.0, q.p[1] * 8.0, t * 3.0, seed) - 0.5;
+                    a[0] += n * 4.0 * self.extra;
+                    a[1] -= self.gravity[1] * 1.5 + 0.3 * self.extra;
+                }
+                8 | 9 => {
+                    let f = 6.0 * self.extra;
+                    a[0] += (value_noise(q.p[0] * 5.0, q.p[1] * 5.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
+                    a[1] += (value_noise(q.p[0] * 5.0 + 17.0, q.p[1] * 5.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
+                    if !self.flat {
+                        a[2] += (value_noise(q.p[0] * 5.0, q.p[1] * 5.0 + 31.0, q.p[2] * 5.0 + t, seed) - 0.5) * f;
+                    }
+                }
+                _ => {}
+            }
+            for k in 0..3 {
+                q.v[k] = (q.v[k] + a[k] * dt) * damp;
+                q.p[k] += q.v[k] * dt;
+            }
+            if self.flat {
+                q.p[2] = 0.0;
+                q.v[2] = 0.0;
+            }
+            q.age += dt;
+        });
+        st.parts.retain(|q| q.age < q.life);
+        st.carry += self.rate / SPS;
+        let n = st.carry.floor() as u32;
+        st.carry -= n as f64;
+        for _ in 0..n {
+            if st.parts.len() >= self.max {
+                break;
+            }
+            let id = st.next_id;
+            st.next_id = st.next_id.wrapping_add(1);
+            // Sub-step birth offset keeps continuous streams smooth.
+            let mut q = self.spawn(id);
+            let frac = h(id, 12, seed) * dt;
+            for k in 0..3 {
+                q.p[k] += q.v[k] * frac;
+            }
+            q.age = frac;
+            st.parts.push(q);
+        }
+    }
+}
+
+impl Phys {
+    /// The backend description (per-step and per-spawn constants evaluated here, in f32).
+    pub(crate) fn desc(&self) -> crate::psim::EngineDesc {
+        let mut drag = self.resistance;
+        if self.anim == 3 {
+            drag += 3.0 * self.extra.max(0.1);
+        }
+        let dt = (1.0 / SPS) as f32;
+        crate::psim::EngineDesc {
+            life: self.life,
+            producer: self.producer,
+            radius: self.radius,
+            anim: self.anim,
+            speed: self.speed,
+            gravity: self.gravity,
+            axis: norm3(self.axis),
+            extra: self.extra,
+            cone: (self.extra_angle.to_radians() * 0.5).tan().abs().min(20.0),
+            damp: (-drag * dt).exp(),
+            seed: self.seed,
+            flat: self.flat,
+        }
+    }
+}
+
+/// The state at layer time `ctx.time` from the host's particle backend (GPU particles), or
+/// `None` (simulate on the CPU).
+pub(super) fn accelerated(ctx: &EffectCtx, key: u64, phys: &Phys) -> Option<std::sync::Arc<PState>> {
+    let backend = ctx.env.host?.particles()?;
+    let steps = steps_at(ctx.time);
+    let births = crate::psim::births(phys.rate, steps, phys.max)?;
+    let req = crate::psim::SimRequest { key, steps, births: &births, system: crate::psim::ParticleSystem::Engine(phys.desc()) };
+    let parts = backend.simulate(&req)?;
+    Some(std::sync::Arc::new(PState {
+        parts: parts.into_iter().map(|q| Particle { p: q.p, v: q.v, age: q.age, life: q.life, rnd: q.rnd, id: q.id }).collect(),
+        carry: 0.0,
+        next_id: births.len() as u32,
+    }))
+}
+
+/// The live particles of a stepped particle effect (`ec.sim.ccparticleworld`,
+/// `ec.sim.ccparticlesystems2`) at `ctx.time`: from the host's particle backend when it has
+/// one (GPU particles), else from the CPU simulation. For comparing the two.
+pub fn particle_state(id: &str, ctx: &EffectCtx) -> Option<Vec<crate::psim::SimParticle>> {
+    let (phys, cache, salt) = match id {
+        "ec.sim.ccparticleworld" => (pw_phys(ctx), &PW_CACHE, 1),
+        "ec.sim.ccparticlesystems2" => (ps2_phys(ctx), &PS2_CACHE, 2),
+        _ => return None,
+    };
+    let key = sim_key(ctx, salt);
+    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(cache, key, ctx.time, &phys));
+    Some(st.parts.iter().map(|q| crate::psim::SimParticle { p: q.p, v: q.v, age: q.age, life: q.life, rnd: q.rnd, id: q.id }).collect())
+}
+
+/// The simulation cache key of a stepped particle effect: every parameter but CC Particle World's
+/// Effect Camera, which only changes how the particles are seen (animating it doesn't restart
+/// the simulation).
+pub(super) fn sim_key(ctx: &EffectCtx, salt: u64) -> u64 {
+    params_key_except(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, salt, &[PW_EFFECT_CAMERA])
+}
+
+/// Run a particle system to layer time `t` through `cache`.
+pub(crate) fn simulate(cache: &SimCache<PState>, key: u64, t: f64, phys: &Phys) -> std::sync::Arc<PState> {
+    cache.run(key, steps_at(t), PState::default, |st, i| phys.step(st, i))
+}
+
+pub(crate) const PARTICLE_TYPES: &[&str] =
+    &["Line", "Shaded Sphere", "Faded Sphere", "Bubble", "Star", "Motion Polygon", "Tri-Polygon", "Cube", "Textured Square"];
+
+/// Colour/size/opacity of a particle at its age.
+pub(super) fn particle_look(q: &Particle, birth: [f32; 4], death: [f32; 4], bsize: f32, dsize: f32, svar: f32, max_op: f32) -> ([f32; 4], f32) {
+    let u = (q.age / q.life.max(1e-4)).clamp(0.0, 1.0);
+    let size = (bsize + (dsize - bsize) * u) * (1.0 + svar * (q.rnd * 2.0 - 1.0));
+    let fade = (u * 20.0).min(1.0) * ((1.0 - u) * 5.0).min(1.0);
+    let c = [birth[0] + (death[0] - birth[0]) * u, birth[1] + (death[1] - birth[1]) * u, birth[2] + (death[2] - birth[2]) * u, max_op * fade];
+    (c, size.max(0.0))
+}
+
+pub(super) fn type_sprite(kind: u32, x: f32, y: f32, r: f32, c: [f32; 4], velocity: [f32; 2], rot: f32) -> Sprite {
+    let [vx, vy] = velocity;
+    let vl = (vx * vx + vy * vy).sqrt().max(1e-6);
+    let shape = match kind {
+        0 => Shape::Line { dx: -vx / vl * r * 2.0, dy: -vy / vl * r * 2.0 },
+        1 => Shape::Sphere,
+        2 => Shape::Faded,
+        3 => Shape::Bubble,
+        4 => Shape::Star,
+        5 => Shape::Line { dx: -vx * 0.05, dy: -vy * 0.05 },
+        6 => Shape::Tri,
+        _ => Shape::Square,
+    };
+    let rr = match kind {
+        0 => (r * 0.08).max(0.5),
+        5 => r * 0.5,
+        _ => r,
+    };
+    Sprite { x, y, r: rr, c, shape, rot }
+}
+
+/// CC Particle World's Extras ▸ Effect Camera parameters (id prefix).
+pub(super) const PW_EFFECT_CAMERA: &str = "extras/effectCamera/";
diff --git a/crates/effects/src/sim/particle_fx.rs b/crates/effects/src/sim/particle_fx.rs
new file mode 100644
index 000000000..6b6c27b01
--- /dev/null
+++ b/crates/effects/src/sim/particle_fx.rs
@@ -0,0 +1,367 @@
+use super::engine::{PState, PW_EFFECT_CAMERA, Phys, accelerated, norm3, particle_look, sim_key, simulate, type_sprite};
+use super::sprites::{Acc, Post, Sprite, SpritePlan, raster, splat};
+use super::{Buf, EffectCtx, Image, IntoParallelRefIterator, ParallelIterator, SimCache, Value, params_key, unpremul};
+
+// ------------------------------------------------------------------ CC Particle World
+
+pub(super) static PW_CACHE: SimCache<PState> = SimCache::new(6);
+
+/// CC Particle World's physics.
+pub(super) fn pw_phys(ctx: &EffectCtx) -> Phys {
+    let pr = ctx.params;
+    Phys {
+        rate: pr.f("birthRate").max(0.0) * 120.0,
+        life: pr.f("longevity").max(0.0) as f32,
+        producer: [pr.f("producer/producerX") as f32, pr.f("producer/producerY") as f32, pr.f("producer/producerZ") as f32],
+        radius: [pr.f("producer/radiusX").max(0.0) as f32, pr.f("producer/radiusY").max(0.0) as f32, pr.f("producer/radiusZ").max(0.0) as f32],
+        anim: pr.e("physics/animation"),
+        speed: pr.f("physics/velocity") as f32 * 0.5,
+        gravity: {
+            let g = pr.f("physics/gravity") as f32;
+            let gv =
+                [pr.f("physics/gravityVector/gravityX") as f32, pr.f("physics/gravityVector/gravityY") as f32, pr.f("physics/gravityVector/gravityZ") as f32];
+            [gv[0] * g, gv[1] * g, gv[2] * g]
+        },
+        resistance: pr.f("physics/resistance").max(0.0) as f32,
+        axis: [pr.f("physics/directionAxis/axisX") as f32, pr.f("physics/directionAxis/axisY") as f32, pr.f("physics/directionAxis/axisZ") as f32],
+        extra: pr.f("physics/extra") as f32,
+        extra_angle: pr.f("physics/extraAngle") as f32,
+        seed: (pr.f("extras/randomSeed") as u32).wrapping_mul(0x9e3779b9) ^ ctx.seed,
+        max: 40_000,
+        flat: false,
+    }
+}
+
+pub(super) fn particle_world(ctx: &EffectCtx, b: Buf) -> Buf {
+    // #1195: with the comp's motion-blur shutter open, particles draw as motion trails: the
+    // sprite fields of samples across the shutter are averaged, as Transform averages its
+    // matrix samples. (The GPU compositor runs this case on the CPU: catalog::gpu_supported.)
+    if let Some((angle, phase, n)) = ctx.env.shutter.filter(|(a, _, _)| *a > 0.0) {
+        let n = (n.clamp(2, 64) as usize).max(2);
+        let fd = 1.0 / ctx.fps().max(0.001);
+        let mut acc = Image::new(b.img.width, b.img.height);
+        let mut post: Option<Post> = None;
+        for k in 0..n {
+            let t = ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd;
+            let sub = EffectCtx { params: ctx.params, time: t, layer_size: ctx.layer_size, seed: ctx.seed, adjustment: ctx.adjustment, env: ctx.env };
+            if let Some(plan) = particle_world_plan(&sub, &b) {
+                let fx = splat(b.img.width, b.img.height, &plan.sprites, plan.acc);
+                acc.data.iter_mut().zip(&fx.data).for_each(|(a, o)| (0..4).for_each(|c| a[c] += o[c]));
+                post.get_or_insert(plan.post);
+            }
+        }
+        acc.data.iter_mut().for_each(|p| p.iter_mut().for_each(|v| *v /= n as f32));
+        return match post {
+            Some(p) => p.apply(b, acc),
+            None => b,
+        };
+    }
+    match particle_world_plan(ctx, &b) {
+        Some(plan) => plan.finish(b),
+        None => b,
+    }
+}
+
+/// Effect Camera ▸ FOV's default (degrees).
+pub(super) const PW_FOV: f64 = 50.0;
+
+/// What CC Particle World sees its particles through.
+enum PwCamera {
+    /// Extras ▸ Effect Camera, in world units (layer widths): `dist` from the world origin (the
+    /// layer centre) along −z, the world turned by `rot` (`None` = not turned) about the origin,
+    /// `focal` the scale at unit depth; particles nearer than `near` aren't drawn.
+    Effect { rot: Option<[[f32; 3]; 3]>, dist: f32, focal: f32, near: f32 },
+    /// The comp's active camera layer, on buffer-world points (After Effects then ignores the
+    /// Effect Camera).
+    Comp(crate::card3d::Proj),
+}
+
+/// A particle as the camera sees it: depth (larger is farther), buffer pixel, size scale `k`
+/// (buffer pixels per world unit = `k · layer width · buffer scale`) and velocity in world units
+/// on screen (× the same factor for buffer pixels).
+struct PwSeen {
+    depth: f32,
+    x: f32,
+    y: f32,
+    k: f32,
+    v: [f32; 2],
+}
+
+impl PwCamera {
+    fn new(ctx: &EffectCtx, b: &Buf) -> PwCamera {
+        let [lw, lh] = ctx.layer_size;
+        if let Some(cam) = ctx.env.host.and_then(|h| h.comp_scene()).filter(|sc| sc.camera_layer).and_then(|sc| sc.camera) {
+            let c = [b.offset[0] + lw * 0.5 * b.scale, b.offset[1] + lh * 0.5 * b.scale];
+            return PwCamera::Comp(crate::card3d::comp_proj(&cam, c, b));
+        }
+        let f = |id: &str, d: f64| ctx.params.get(&format!("{PW_EFFECT_CAMERA}{id}")).map(Value::as_f64).filter(|v| v.is_finite()).unwrap_or(d);
+        // The camera keeps the origin's plane at the scale Distance gives it as FOV changes
+        // (moving in for a wider view), so FOV sets how strong the perspective is. Distance 2
+        // shows the origin's plane at the layer's own scale.
+        let half = |fov: f64| (fov.clamp(1.0, 179.0).to_radians() * 0.5).tan();
+        let zoom = half(PW_FOV) / half(f("fov", PW_FOV));
+        let dist = f("distance", 2.0).max(0.01) * zoom;
+        let a = [f("rotationX", 0.0), f("rotationY", 0.0), f("rotationZ", 0.0)];
+        let rot = (a != [0.0; 3]).then(|| {
+            let r = crate::card3d::rot_ordered(a[0].to_radians(), a[1].to_radians(), a[2].to_radians(), 0);
+            r.map(|row| row.map(|v| v as f32))
+        });
+        PwCamera::Effect { rot, dist: dist as f32, focal: (2.0 * zoom) as f32, near: (0.025 * dist) as f32 }
+    }
+
+    /// How the camera sees world point `p` moving at `v`; `None` behind or too close to it.
+    fn see(&self, p: [f32; 3], v: [f32; 3], lw: f32, lh: f32, b: &Buf) -> Option<PwSeen> {
+        match self {
+            PwCamera::Effect { rot, dist, focal, near } => {
+                let turn = |r: &[[f32; 3]; 3], q: [f32; 3]| r.map(|row| row[0] * q[0] + row[1] * q[1] + row[2] * q[2]);
+                let (p, v) = match rot {
+                    Some(r) => (turn(r, p), turn(r, v)),
+                    None => (p, v),
+                };
+                let zc = dist + p[2];
+                if zc.is_nan() || zc <= *near {
+                    return None;
+                }
+                let k = focal / zc;
+                let (x, y) = b.to_px([(lw * 0.5 + p[0] * lw * k) as f64, (lh * 0.5 + p[1] * lw * k) as f64]);
+                Some(PwSeen { depth: zc, x: x as f32, y: y as f32, k, v: [v[0], v[1]] })
+            }
+            PwCamera::Comp(proj) => {
+                let (s, lw, lh) = (b.scale, lw as f64, lh as f64);
+                let u = lw * s;
+                let at = [b.offset[0] + lw * 0.5 * s + p[0] as f64 * u, b.offset[1] + lh * 0.5 * s + p[1] as f64 * u, p[2] as f64 * u];
+                let seen = proj.view(at, [v[0] as f64, v[1] as f64, v[2] as f64])?;
+                let k = seen.scale;
+                Some(PwSeen {
+                    depth: seen.depth as f32,
+                    x: seen.at[0] as f32,
+                    y: seen.at[1] as f32,
+                    k: k as f32,
+                    v: [(seen.vel[0] / k) as f32, (seen.vel[1] / k) as f32],
+                })
+            }
+        }
+    }
+}
+
+/// CC Particle World's sprites (far to near), `None` before anything is born.
+pub(super) fn particle_world_plan(ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
+    let pr = ctx.params;
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let phys = pw_phys(ctx);
+    if phys.rate <= 0.0 && ctx.time <= 0.0 {
+        return None;
+    }
+    let key = sim_key(ctx, 1);
+    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(&PW_CACHE, key, ctx.time, &phys));
+    let kind = pr.e("particle/particleType");
+    let birth = pr.color("particle/birthColor");
+    let death = pr.color("particle/deathColor");
+    let (bs, ds) = (pr.f("particle/birthSize") as f32, pr.f("particle/deathSize") as f32);
+    let svar = pr.f("particle/sizeVariation") as f32 / 100.0;
+    let max_op = pr.f("particle/maxOpacity") as f32 / 100.0;
+    let s = b.scale as f32;
+    let cam = PwCamera::new(ctx, b);
+    let mut list: Vec<(f32, Sprite)> = st
+        .parts
+        .par_iter()
+        .filter_map(|q| {
+            let PwSeen { depth, x, y, k, v } = cam.see(q.p, q.v, lw, lh, b)?;
+            let (c, size) = particle_look(q, birth, death, bs, ds, svar, max_op);
+            let r = size * 0.5 * lw * k * s * 0.25;
+            let sp = type_sprite(kind, x, y, r, c, [v[0] * lw * k * s, v[1] * lw * k * s], (q.id % 628) as f32 * 0.01 + q.age * 2.0);
+            Some((depth, sp))
+        })
+        .collect();
+    list.sort_by(|a, b| b.0.total_cmp(&a.0));
+    let sprites: Vec<Sprite> = list.into_iter().map(|(_, s)| s).collect();
+    Some(particle_sprites(sprites, pr.e("particle/transferMode")))
+}
+
+/// The CC particle systems' sprites with their Transfer Mode (Composite, Screen, Add, Black
+/// Background).
+fn particle_sprites(sprites: Vec<Sprite>, mode: u32) -> SpritePlan {
+    // The particles replace the layer (After Effects shows no trace of the source in any
+    // Transfer Mode, which sets how the particles meet each other).
+    SpritePlan { sprites, tints: vec![], acc: if mode == 2 { Acc::Add } else { Acc::Over }, post: Post::Replace }
+}
+
+// ------------------------------------------------------------------ CC Particle Systems II
+
+pub(super) static PS2_CACHE: SimCache<PState> = SimCache::new(6);
+
+/// CC Particle Systems II's physics.
+pub(super) fn ps2_phys(ctx: &EffectCtx) -> Phys {
+    let pr = ctx.params;
+    let lh = ctx.layer_size[1] as f32;
+    let unit = lh.max(1.0);
+    let pos = pr.v2("producer/position");
+    let dir = (pr.f("physics/direction") as f32).to_radians();
+    Phys {
+        rate: pr.f("birthRate").max(0.0) * 60.0,
+        life: pr.f("longevity").max(0.0) as f32,
+        producer: [pos[0] as f32 / unit, pos[1] as f32 / unit, 0.0],
+        radius: [pr.f("producer/radiusX").max(0.0) as f32 / unit, pr.f("producer/radiusY").max(0.0) as f32 / unit, 0.0],
+        anim: [0u32, 1, 2, 3, 4, 5, 6, 7, 8, 9][pr.e("physics/animation").min(9) as usize],
+        speed: pr.f("physics/velocity") as f32 * 0.25,
+        gravity: [0.0, pr.f("physics/gravity") as f32 * 0.5, 0.0],
+        resistance: pr.f("physics/resistance").max(0.0) as f32,
+        // AE angles: 0° = up, clockwise.
+        axis: [dir.sin(), -dir.cos(), 0.0],
+        extra: pr.f("physics/extra") as f32,
+        extra_angle: 45.0 * pr.f("physics/extra") as f32,
+        seed: (pr.f("randomSeed") as u32).wrapping_mul(0x85ebca6b) ^ ctx.seed,
+        max: 40_000,
+        flat: true,
+    }
+}
+
+pub(super) fn particle_systems2(ctx: &EffectCtx, b: Buf) -> Buf {
+    particle_systems2_plan(ctx, &b).finish(b)
+}
+
+/// CC Particle Systems II's sprites.
+pub(super) fn particle_systems2_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
+    let pr = ctx.params;
+    let lh = ctx.layer_size[1] as f32;
+    let unit = lh.max(1.0);
+    let phys = ps2_phys(ctx);
+    let key = sim_key(ctx, 2);
+    let st = accelerated(ctx, key, &phys).unwrap_or_else(|| simulate(&PS2_CACHE, key, ctx.time, &phys));
+    let kind = pr.e("particle/particleType");
+    let birth = pr.color("particle/birthColor");
+    let death = pr.color("particle/deathColor");
+    let (bs, ds) = (pr.f("particle/birthSize") as f32, pr.f("particle/deathSize") as f32);
+    let svar = pr.f("particle/sizeVariation") as f32 / 100.0;
+    let max_op = pr.f("particle/maxOpacity") as f32 / 100.0;
+    let s = b.scale as f32;
+    let sprites: Vec<Sprite> = st
+        .parts
+        .iter()
+        .map(|q| {
+            let (bx, by) = b.to_px([(q.p[0] * unit) as f64, (q.p[1] * unit) as f64]);
+            let (c, size) = particle_look(q, birth, death, bs, ds, svar, max_op);
+            let r = size * unit * 0.02 * s;
+            type_sprite(kind, bx as f32, by as f32, r, c, [q.v[0] * unit * s, q.v[1] * unit * s], (q.id % 628) as f32 * 0.01 + q.age * 2.0)
+        })
+        .collect();
+    particle_sprites(sprites, pr.e("particle/transferMode"))
+}
+
+// ------------------------------------------------------------------ CC Mr. Mercury
+
+static MERCURY_CACHE: SimCache<PState> = SimCache::new(6);
+
+/// A CC Mr. Mercury blob (buffer px).
+#[derive(Clone, Copy, Debug)]
+pub struct Blob {
+    pub x: f32,
+    pub y: f32,
+    pub r: f32,
+}
+
+/// CC Mr. Mercury's blobs this frame, from its particle simulation (for buffer geometry `b`).
+pub fn mercury_blobs(ctx: &EffectCtx, b: &Buf) -> Vec<Blob> {
+    let pr = ctx.params;
+    let lh = ctx.layer_size[1] as f32;
+    let unit = lh.max(1.0);
+    let pos = pr.v2("producer");
+    let dir = (pr.f("direction") as f32).to_radians();
+    let phys = Phys {
+        rate: pr.f("birthRate").max(0.0) * 10.0,
+        life: pr.f("longevity").max(0.0) as f32,
+        producer: [pos[0] as f32 / unit, pos[1] as f32 / unit, 0.0],
+        radius: [pr.f("radiusX").max(0.0) as f32 / unit, pr.f("radiusY").max(0.0) as f32 / unit, 0.0],
+        anim: [0u32, 1, 2, 3, 4, 5, 6, 7, 8, 9][pr.e("animation").min(9) as usize],
+        speed: pr.f("velocity") as f32 * 0.3,
+        gravity: [0.0, pr.f("gravity") as f32 * 0.5, 0.0],
+        resistance: pr.f("resistance").max(0.0) as f32,
+        axis: [dir.sin(), -dir.cos(), 0.0],
+        extra: pr.f("extra") as f32,
+        extra_angle: 45.0 * pr.f("extra") as f32,
+        seed: ctx.seed.wrapping_mul(0xc2b2ae35),
+        max: 4_000,
+        flat: true,
+    };
+    let st = simulate(&MERCURY_CACHE, params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, 3), ctx.time, &phys);
+    let (bs, ds) = (pr.f("blobBirthSize") as f32, pr.f("blobDeathSize") as f32);
+    let s = b.scale as f32;
+    st.parts
+        .iter()
+        .map(|q| {
+            let u = (q.age / q.life.max(1e-4)).clamp(0.0, 1.0);
+            let size = bs + (ds - bs) * u;
+            let (bx, by) = b.to_px([(q.p[0] * unit) as f64, (q.p[1] * unit) as f64]);
+            Blob { x: bx as f32, y: by as f32, r: (size * unit * 0.08 * s).max(0.0) }
+        })
+        .filter(|q| q.r > 0.1)
+        .collect()
+}
+
+pub(super) fn mr_mercury(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let blobs = mercury_blobs(ctx, &b);
+    let influence = pr.f("blobInfluence") as f32 / 100.0;
+    let s = b.scale as f32;
+    let (w, hh) = (b.img.width, b.img.height);
+    // Field and gradient accumulate additively: [f, gx, gy, _].
+    let mut field = Image::new(w, hh);
+    let infl = 1.0 + influence;
+    raster(
+        &mut field,
+        &blobs,
+        |q| {
+            let e = q.r * 2.0 * infl;
+            Some([q.x - e, q.y - e, q.x + e, q.y + e])
+        },
+        |q, x, y| {
+            let (dx, dy) = (x - q.x, y - q.y);
+            let rr = q.r * 2.0 * infl;
+            let d2 = (dx * dx + dy * dy) / (rr * rr);
+            if d2 >= 1.0 {
+                return None;
+            }
+            let k = 1.0 - d2;
+            let f = k * k * k;
+            let g = -6.0 * k * k / (rr * rr);
+            Some([f, g * dx, g * dy, 0.0])
+        },
+        Acc::Add,
+    );
+    let thr = 0.35f32;
+    let ambient = pr.f("shading/ambient") as f32 / 100.0;
+    let diffuse = pr.f("shading/diffuse") as f32 / 100.0;
+    let specular = pr.f("shading/specular") as f32 / 100.0;
+    let rough = pr.f("shading/roughness").max(0.001) as f32;
+    let metal = pr.f("shading/metal") as f32 / 100.0;
+    let li = pr.f("light/lightIntensity") as f32 / 100.0;
+    let lc = pr.color("light/lightColor");
+    let ldir = (pr.f("light/lightDirection") as f32).to_radians();
+    let lheight = pr.f("light/lightHeight") as f32 / 100.0;
+    let l = norm3([ldir.sin(), -ldir.cos(), lheight.max(0.05)]);
+    let src = b.img.clone();
+    let mut out = Image::new(w, hh);
+    out.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let fv = field.data[y * w as usize + x];
+            let f = fv[0];
+            if f <= thr * 0.8 {
+                continue;
+            }
+            let cov = ((f - thr * 0.8) / (thr * 0.4)).clamp(0.0, 1.0);
+            let n = norm3([fv[1] * 3.0, fv[2] * 3.0, 1.0 / (1.0 + f)]);
+            // Refract the layer through the blob.
+            let sp = src.sample_bilinear_clamped(x as f64 + 0.5 - n[0] as f64 * 12.0 * s as f64, y as f64 + 0.5 - n[1] as f64 * 12.0 * s as f64);
+            let (c, sa) = unpremul(sp);
+            let base = if sa > 0.0 { c } else { [0.7, 0.7, 0.75] };
+            let nl = (n[0] * l[0] + n[1] * l[1] + n[2] * l[2]).max(0.0);
+            let hv = norm3([l[0], l[1], l[2] + 1.0]);
+            let spec = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(1.0 / rough) * specular * li;
+            let shade = ambient + diffuse * nl * li;
+            let cc: [f32; 3] = std::array::from_fn(|k| base[k] * shade + spec * (lc[k] * (1.0 - metal) + base[k] * metal));
+            *px = [cc[0] * cov, cc[1] * cov, cc[2] * cov, cov];
+        }
+    });
+    b.img = out;
+    b
+}
diff --git a/crates/effects/src/sim/registry.rs b/crates/effects/src/sim/registry.rs
new file mode 100644
index 000000000..f29eb2653
--- /dev/null
+++ b/crates/effects/src/sim/registry.rs
@@ -0,0 +1,229 @@
+use super::common::{pct, pt, spec};
+use super::engine::{PARTICLE_TYPES, PW_ANIMS};
+use super::particle_fx::{PW_FOV, mr_mercury, particle_systems2, particle_systems2_plan, particle_world, particle_world_plan};
+use super::sprites::SpritePlan;
+use super::weather::{bubbles, drizzle, rainfall, rainfall_plan, snowfall, snowfall_plan, star_burst, star_burst_plan};
+use super::{Buf, EffectCtx, EffectSpec, ParamUi, Value, col, num, p, popup, slider};
+
+/// The sprite plan of a sprite-drawing simulation effect for buffer geometry `b` (its pixels
+/// are not read), `None` for other effects or settings drawn otherwise (the GPU compositor's
+/// render pass).
+pub fn sprite_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
+    match id {
+        "ec.sim.ccrainfall" => Some(rainfall_plan(ctx, b)),
+        "ec.sim.ccsnowfall" => Some(snowfall_plan(ctx, b)),
+        "ec.sim.ccstarburst" => Some(star_burst_plan(ctx, b)),
+        "ec.sim.cchair" => crate::sim3::hair_plan(ctx, b),
+        "ec.sim.waveworld" => crate::sim2::wave_world_plan(ctx, b).and_then(|p| match p {
+            crate::sim2::WavePlan::Wire(sp) => Some(sp),
+            crate::sim2::WavePlan::Height { .. } => None,
+        }),
+        "ec.sim.foam" => crate::sim2::foam_plan(ctx, b),
+        "ec.sim.ccparticleworld" => particle_world_plan(ctx, b),
+        "ec.sim.ccparticlesystems2" => Some(particle_systems2_plan(ctx, b)),
+        _ => None,
+    }
+}
+
+// ------------------------------------------------------------------ specs
+
+pub fn specs() -> Vec<EffectSpec> {
+    let transfer = || popup(&["Composite", "Lighten"]);
+    vec![
+        spec(
+            "ec.sim.ccrainfall",
+            "CC Rainfall",
+            vec![
+                p("drops", "Drops", num(5000.0), slider(0.0, 100_000.0, 0.0, 20_000.0, 0)),
+                p("size", "Size", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 2)),
+                p("sceneDepth", "Scene Depth", num(5000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
+                p("speed", "Speed", num(4000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
+                p("wind", "Wind", num(0.0), slider(-10_000.0, 10_000.0, -2000.0, 2000.0, 1)),
+                p("windVariation", "Variation % (Wind)", num(0.0), pct()),
+                p("spread", "Spread", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
+                p("color", "Color", col(0.8, 0.8, 0.8), ParamUi::Color),
+                p("opacity", "Opacity", num(25.0), pct()),
+                p("transferMode", "Transfer Mode", Value::Enum(1), transfer()),
+                p("compositeWithOriginal", "Composite With Original", Value::Bool(true), ParamUi::Checkbox),
+                p("extras/appearance", "Appearance", Value::Enum(0), popup(&["Refracting", "Soft Solid"])),
+                p("extras/offset", "Offset", pt(0.5, 0.5), ParamUi::Point),
+                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+            ],
+            rainfall,
+        ),
+        spec(
+            "ec.sim.ccsnowfall",
+            "CC Snowfall",
+            vec![
+                p("flakes", "Flakes", num(10_000.0), slider(0.0, 200_000.0, 0.0, 50_000.0, 0)),
+                p("size", "Size", num(3.0), slider(0.0, 50.0, 0.0, 20.0, 2)),
+                p("sizeVariation", "Variation % (Size)", num(50.0), pct()),
+                p("sceneDepth", "Scene Depth", num(5000.0), slider(0.0, 20_000.0, 0.0, 10_000.0, 0)),
+                p("speed", "Speed", num(100.0), slider(0.0, 5000.0, 0.0, 1000.0, 1)),
+                p("speedVariation", "Variation % (Speed)", num(50.0), pct()),
+                p("wind", "Wind", num(25.0), slider(-5000.0, 5000.0, -500.0, 500.0, 1)),
+                p("windVariation", "Variation % (Wind)", num(50.0), pct()),
+                p("spread", "Spread", num(0.0), slider(0.0, 1000.0, 0.0, 100.0, 1)),
+                p("wiggle/wiggleAmount", "Amount", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
+                p("wiggle/wiggleAmountVariation", "Variation % (Amount)", num(50.0), pct()),
+                p("wiggle/wiggleFrequency", "Frequency", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("wiggle/wiggleFrequencyVariation", "Variation % (Frequency)", num(50.0), pct()),
+                p("color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("opacity", "Opacity", num(100.0), pct()),
+                p("transferMode", "Transfer Mode", Value::Enum(0), transfer()),
+                p("compositeWithOriginal", "Composite With Original", Value::Bool(true), ParamUi::Checkbox),
+                p("extras/offset", "Offset", pt(0.5, 0.5), ParamUi::Point),
+                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+            ],
+            snowfall,
+        ),
+        spec(
+            "ec.sim.ccbubbles",
+            "CC Bubbles",
+            vec![
+                p("bubbleAmount", "Bubble Amount", num(100.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+                p("bubbleSpeed", "Bubble Speed", num(0.5), slider(-10.0, 10.0, -2.0, 2.0, 2)),
+                p("wobbleAmplitude", "Wobble Amplitude", num(5.0), slider(0.0, 500.0, 0.0, 100.0, 1)),
+                p("wobbleFrequency", "Wobble Frequency", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 2)),
+                p("bubbleSize", "Bubble Size", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("reflectionType", "Reflection Type", Value::Enum(0), popup(&["Liquid", "Metal"])),
+                p("shadingType", "Shading Type", Value::Enum(0), popup(&["None", "Lighten", "Darken", "Fade Inwards", "Fade Outwards"])),
+            ],
+            bubbles,
+        ),
+        spec(
+            "ec.sim.ccdrizzle",
+            "CC Drizzle",
+            vec![
+                p("dripRate", "Drip Rate", num(10.0), slider(0.0, 200.0, 0.0, 50.0, 2)),
+                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 30.0, 0.0, 5.0, 2)),
+                p("rippling", "Rippling", num(360.0), ParamUi::Angle),
+                p("displacement", "Displacement", num(5.0), slider(0.0, 100.0, 0.0, 30.0, 2)),
+                p("rippleHeight", "Ripple Height", num(30.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("spreading", "Spreading", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
+                p("light/lightIntensity", "Light Intensity", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
+                p("light/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("light/lightHeight", "Light Height", num(25.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
+                p("light/lightDirection", "Light Direction", num(-45.0), ParamUi::Angle),
+                p("shading/ambient", "Ambient", num(0.0), slider(-200.0, 200.0, -100.0, 100.0, 1)),
+                p("shading/diffuse", "Diffuse", num(0.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("shading/specular", "Specular", num(20.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("shading/roughness", "Roughness", num(0.05), slider(0.001, 1.0, 0.001, 0.5, 3)),
+            ],
+            drizzle,
+        ),
+        spec(
+            "ec.sim.ccstarburst",
+            "CC Star Burst",
+            vec![
+                p("scatter", "Scatter", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
+                p("speed", "Speed", num(1.0), slider(-10.0, 10.0, -4.0, 4.0, 2)),
+                p("phase", "Phase", num(0.0), ParamUi::Angle),
+                p("gridSpacing", "Grid Spacing", num(2.0), slider(1.0, 100.0, 1.0, 20.0, 0)),
+                p("size", "Size", num(100.0), slider(0.0, 1000.0, 0.0, 300.0, 1)),
+                p("blendWithOriginal", "Blend w. Original", num(0.0), pct()),
+            ],
+            star_burst,
+        ),
+        spec(
+            "ec.sim.ccparticleworld",
+            "CC Particle World",
+            vec![
+                p("birthRate", "Birth Rate", num(0.5), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("producer/producerX", "Position X", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
+                p("producer/producerY", "Position Y", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
+                p("producer/producerZ", "Position Z", num(0.0), slider(-10.0, 10.0, -1.0, 1.0, 2)),
+                p("producer/radiusX", "Radius X", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
+                p("producer/radiusY", "Radius Y", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
+                p("producer/radiusZ", "Radius Z", num(0.025), slider(0.0, 10.0, 0.0, 1.0, 3)),
+                p("physics/animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
+                p("physics/velocity", "Velocity", num(1.0), slider(-10.0, 10.0, 0.0, 5.0, 2)),
+                p("physics/inheritVelocity", "Inherit Velocity %", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
+                p("physics/gravity", "Gravity", num(0.5), slider(-10.0, 10.0, -2.0, 2.0, 3)),
+                p("physics/resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("physics/extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
+                p("physics/extraAngle", "Extra Angle", num(360.0), ParamUi::Angle),
+                p("physics/directionAxis/axisX", "Axis X", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("physics/directionAxis/axisY", "Axis Y", num(-1.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("physics/directionAxis/axisZ", "Axis Z", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("physics/gravityVector/gravityX", "Gravity X", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("physics/gravityVector/gravityY", "Gravity Y", num(1.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("physics/gravityVector/gravityZ", "Gravity Z", num(0.0), slider(-1.0, 1.0, -1.0, 1.0, 2)),
+                p("particle/particleType", "Particle Type", Value::Enum(0), popup(PARTICLE_TYPES)),
+                p("particle/birthSize", "Birth Size", num(0.2), slider(0.0, 10.0, 0.0, 1.0, 3)),
+                p("particle/deathSize", "Death Size", num(0.2), slider(0.0, 10.0, 0.0, 1.0, 3)),
+                p("particle/sizeVariation", "Size Variation", num(0.0), pct()),
+                p("particle/maxOpacity", "Max Opacity", num(75.0), pct()),
+                p("particle/birthColor", "Birth Color", col(1.0, 1.0, 0.0), ParamUi::Color),
+                p("particle/deathColor", "Death Color", col(0.6, 0.0, 0.0), ParamUi::Color),
+                p("particle/transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Screen", "Add", "Black Matte"])),
+                p("extras/effectCamera/distance", "Distance", num(2.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("extras/effectCamera/rotationX", "Rotation X", num(0.0), ParamUi::Angle),
+                p("extras/effectCamera/rotationY", "Rotation Y", num(0.0), ParamUi::Angle),
+                p("extras/effectCamera/rotationZ", "Rotation Z", num(0.0), ParamUi::Angle),
+                p("extras/effectCamera/fov", "FOV", num(PW_FOV), slider(1.0, 179.0, 10.0, 120.0, 1)),
+                p("extras/randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+            ],
+            particle_world,
+        ),
+        spec(
+            "ec.sim.ccparticlesystems2",
+            "CC Particle Systems II",
+            vec![
+                p("birthRate", "Birth Rate", num(2.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
+                p("longevity", "Longevity (sec)", num(1.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("producer/position", "Position", pt(0.5, 0.5), ParamUi::Point),
+                p("producer/radiusX", "Radius X", num(0.0), slider(0.0, 2000.0, 0.0, 200.0, 1)),
+                p("producer/radiusY", "Radius Y", num(0.0), slider(0.0, 2000.0, 0.0, 200.0, 1)),
+                p("physics/animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
+                p("physics/velocity", "Velocity", num(2.0), slider(-20.0, 20.0, 0.0, 10.0, 2)),
+                p("physics/inheritVelocity", "Inherit Velocity %", num(0.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
+                p("physics/gravity", "Gravity", num(1.0), slider(-20.0, 20.0, -5.0, 5.0, 2)),
+                p("physics/resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("physics/direction", "Direction", num(0.0), ParamUi::Angle),
+                p("physics/extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
+                p("particle/particleType", "Particle Type", Value::Enum(0), popup(PARTICLE_TYPES)),
+                p("particle/birthSize", "Birth Size", num(0.5), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("particle/deathSize", "Death Size", num(1.5), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("particle/sizeVariation", "Size Variation", num(0.0), pct()),
+                p("particle/maxOpacity", "Max Opacity", num(75.0), pct()),
+                p("particle/birthColor", "Birth Color", col(1.0, 1.0, 0.0), ParamUi::Color),
+                p("particle/deathColor", "Death Color", col(0.6, 0.0, 0.0), ParamUi::Color),
+                p("particle/transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Screen", "Add", "Black Matte"])),
+                p("randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+            ],
+            particle_systems2,
+        ),
+        spec(
+            "ec.sim.ccmrmercury",
+            "CC Mr. Mercury",
+            vec![
+                p("radiusX", "Radius X", num(50.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
+                p("radiusY", "Radius Y", num(50.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
+                p("producer", "Producer", pt(0.5, 0.5), ParamUi::Point),
+                p("direction", "Direction", num(0.0), ParamUi::Angle),
+                p("velocity", "Velocity", num(1.0), slider(-20.0, 20.0, 0.0, 5.0, 2)),
+                p("birthRate", "Birth Rate", num(1.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("longevity", "Longevity (sec)", num(2.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("gravity", "Gravity", num(0.5), slider(-20.0, 20.0, -5.0, 5.0, 2)),
+                p("resistance", "Resistance", num(0.0), slider(0.0, 20.0, 0.0, 5.0, 2)),
+                p("extra", "Extra", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 2)),
+                p("animation", "Animation", Value::Enum(0), popup(PW_ANIMS)),
+                p("blobInfluence", "Blob Influence", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
+                p("blobBirthSize", "Blob Birth Size", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 2)),
+                p("blobDeathSize", "Blob Death Size", num(0.25), slider(0.0, 10.0, 0.0, 2.0, 2)),
+                p("light/lightIntensity", "Light Intensity", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
+                p("light/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("light/lightHeight", "Light Height", num(50.0), slider(-100.0, 100.0, -100.0, 100.0, 1)),
+                p("light/lightDirection", "Light Direction", num(-45.0), ParamUi::Angle),
+                p("shading/ambient", "Ambient", num(0.0), slider(-200.0, 200.0, -100.0, 100.0, 1)),
+                p("shading/diffuse", "Diffuse", num(75.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("shading/specular", "Specular", num(50.0), slider(0.0, 200.0, 0.0, 100.0, 1)),
+                p("shading/roughness", "Roughness", num(0.05), slider(0.001, 1.0, 0.001, 0.5, 3)),
+                p("shading/metal", "Metal", num(100.0), pct()),
+            ],
+            mr_mercury,
+        ),
+    ]
+}
diff --git a/crates/effects/src/sim/sprites.rs b/crates/effects/src/sim/sprites.rs
new file mode 100644
index 000000000..78c405abd
--- /dev/null
+++ b/crates/effects/src/sim/sprites.rs
@@ -0,0 +1,361 @@
+use super::{Buf, Image, IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator, ParallelSliceMut, Px, unpremul};
+
+// ------------------------------------------------------------------ band rasteriser
+
+const BAND: usize = 16;
+
+/// How rasterised items combine with what is already in the target.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub enum Acc {
+    /// Premultiplied "over" (later items on top).
+    Over,
+    /// Additive (glows, light).
+    Add,
+}
+
+/// Rasterise many small items into `img` (buffer pixels). `bbox` gives an item's pixel bounds
+/// `[x0, y0, x1, y1]` (or `None` to skip), `shade` its premultiplied colour at a pixel centre.
+/// Items are bucketed into horizontal bands rendered in parallel; within a band they are drawn
+/// in slice order.
+pub(crate) fn raster<T: Sync>(
+    img: &mut Image,
+    items: &[T],
+    bbox: impl Fn(&T) -> Option<[f32; 4]> + Sync,
+    shade: impl Fn(&T, f32, f32) -> Option<Px> + Sync,
+    acc: Acc,
+) {
+    let (w, hgt) = (img.width as usize, img.height as usize);
+    if w == 0 || hgt == 0 || items.is_empty() {
+        return;
+    }
+    let nb = hgt.div_ceil(BAND);
+    let boxes: Vec<Option<[i32; 4]>> = items
+        .par_iter()
+        .map(|it| {
+            let b = bbox(it)?;
+            if !(b[0].is_finite() && b[1].is_finite() && b[2].is_finite() && b[3].is_finite()) {
+                return None;
+            }
+            let x0 = b[0].floor().max(0.0) as i32;
+            let y0 = b[1].floor().max(0.0) as i32;
+            let x1 = (b[2].ceil() as i32).min(w as i32 - 1);
+            let y1 = (b[3].ceil() as i32).min(hgt as i32 - 1);
+            if x1 < x0 || y1 < y0 || b[2] < 0.0 || b[3] < 0.0 {
+                return None;
+            }
+            Some([x0, y0, x1, y1])
+        })
+        .collect();
+    let mut buckets: Vec<Vec<u32>> = vec![Vec::new(); nb];
+    for (i, b) in boxes.iter().enumerate() {
+        if let Some(b) = b {
+            for band in (b[1] as usize / BAND)..=(b[3] as usize / BAND).min(nb - 1) {
+                buckets[band].push(i as u32);
+            }
+        }
+    }
+    img.data.par_chunks_mut(w * BAND).enumerate().for_each(|(band, chunk)| {
+        let by0 = band * BAND;
+        let rows = chunk.len() / w;
+        for &i in &buckets[band] {
+            let Some(b) = boxes[i as usize] else { continue };
+            let it = &items[i as usize];
+            let ya = (b[1] as usize).max(by0);
+            let yb = (b[3] as usize).min(by0 + rows - 1);
+            for y in ya..=yb {
+                let row = &mut chunk[(y - by0) * w..(y - by0 + 1) * w];
+                for x in b[0] as usize..=b[2] as usize {
+                    if let Some(c) = shade(it, x as f32 + 0.5, y as f32 + 0.5) {
+                        let d = &mut row[x];
+                        match acc {
+                            Acc::Over => {
+                                let k = 1.0 - c[3];
+                                *d = [c[0] + d[0] * k, c[1] + d[1] * k, c[2] + d[2] * k, c[3] + d[3] * k];
+                            }
+                            Acc::Add => {
+                                *d = [d[0] + c[0], d[1] + c[1], d[2] + c[2], (d[3] + c[3]).min(1.0)];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    });
+}
+
+// ------------------------------------------------------------------ sprites
+
+#[derive(Clone, Copy, PartialEq, Debug)]
+pub enum Shape {
+    /// Soft round dot (Gaussian-like falloff).
+    Soft,
+    /// Hard anti-aliased disc.
+    Disc,
+    /// Lit sphere (upper-left light, specular).
+    Sphere,
+    /// Disc fading linearly to its rim.
+    Faded,
+    /// Thin ring with a highlight.
+    Bubble,
+    /// Four-point star.
+    Star,
+    /// Rotated square (angle in `rot`).
+    Square,
+    /// Triangle (angle in `rot`).
+    Tri,
+    /// Segment from (x, y) by (dx, dy), half-width `r`.
+    Line { dx: f32, dy: f32 },
+}
+
+/// A particle sprite in buffer pixels; `c` is straight colour + opacity.
+#[derive(Clone, Copy, Debug)]
+pub struct Sprite {
+    pub x: f32,
+    pub y: f32,
+    pub r: f32,
+    pub c: [f32; 4],
+    pub shape: Shape,
+    pub rot: f32,
+}
+
+impl Sprite {
+    pub(crate) fn new(x: f32, y: f32, r: f32, c: [f32; 4], shape: Shape) -> Sprite {
+        Sprite { x, y, r, c, shape, rot: 0.0 }
+    }
+}
+
+/// Where a sprite's colour comes from when it depends on the layer's pixels (resolved by
+/// [`SpritePlan::resolve`] on the CPU, per pixel by the GPU compositor). Positions are buffer
+/// pixels.
+#[derive(Clone, Copy, Debug)]
+pub enum Tint {
+    /// The sprite's own colour.
+    Fixed,
+    /// CC Rainfall's refracting drops: where the layer shows (alpha > 0), colour × (layer
+    /// colour × 0.6 + 0.5) sampled at (x, y).
+    Refract { x: f64, y: f64 },
+    /// CC Star Burst: the layer's colour at (x, y), opacity × its alpha (none where clear).
+    Source { x: f64, y: f64 },
+    /// CC Hair: the root's colour at (x, y) mixed with the hair colour (`inherit` = 1 keeps the
+    /// root's), × `shade`, + `spec`; no strand where the root's alpha is below ½.
+    Root { x: f64, y: f64, hair: [f32; 3], inherit: f32, shade: f32, spec: f32 },
+}
+
+/// How a sprite layer meets the original layer.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Post {
+    /// `combine` with this mode (0 Composite … 5 sprites only).
+    Combine(u32),
+    /// The sprites alone.
+    Replace,
+    /// The sprites, mixed toward the original by this fraction.
+    Lerp(f32),
+    /// The sprites over opaque black.
+    OverBlack,
+}
+
+/// What a sprite-drawing effect draws this frame: built on the CPU (closed-form or from the
+/// simulation state), rasterised by [`SpritePlan::finish`] or the GPU compositor.
+#[derive(Clone, Debug)]
+pub struct SpritePlan {
+    pub sprites: Vec<Sprite>,
+    /// Per sprite (empty = all [`Tint::Fixed`]).
+    pub tints: Vec<Tint>,
+    pub acc: Acc,
+    pub post: Post,
+}
+
+impl SpritePlan {
+    /// Resolve layer-dependent colours against the layer `src`.
+    pub fn resolve(&mut self, src: &Image) {
+        let tints = std::mem::take(&mut self.tints);
+        self.sprites.par_iter_mut().zip(tints.par_iter()).for_each(|(sp, t)| match *t {
+            Tint::Fixed => {}
+            Tint::Refract { x, y } => {
+                let (sc, sa) = unpremul(src.sample_bilinear(x, y));
+                if sa > 0.0 {
+                    let c = sp.c;
+                    sp.c = [(sc[0] * 0.6 + 0.5) * c[0], (sc[1] * 0.6 + 0.5) * c[1], (sc[2] * 0.6 + 0.5) * c[2], c[3]];
+                }
+            }
+            Tint::Source { x, y } => {
+                let (c, a) = unpremul(src.sample_bilinear(x, y));
+                sp.c = if a <= 0.0 { [0.0; 4] } else { [c[0], c[1], c[2], a * sp.c[3]] };
+            }
+            Tint::Root { x, y, hair, inherit, shade, spec } => {
+                let root = src.sample_bilinear(x, y);
+                if root[3] < 0.5 {
+                    sp.c = [0.0; 4];
+                    return;
+                }
+                let (rc, _) = unpremul(root);
+                let base: [f32; 3] = std::array::from_fn(|k| rc[k] + (hair[k] - rc[k]) * (1.0 - inherit));
+                sp.c = [base[0] * shade + spec, base[1] * shade + spec, base[2] * shade + spec, sp.c[3]];
+            }
+        });
+    }
+
+    /// Rasterise (after [`SpritePlan::resolve`]) and meet the original layer `b`.
+    pub fn finish(&self, b: Buf) -> Buf {
+        let fx = splat(b.img.width, b.img.height, &self.sprites, self.acc);
+        self.finish_with(b, fx)
+    }
+
+    /// [`finish`](Self::finish) with a prepared sprite image (the motion-blurred average of
+    /// several frames, #1195).
+    pub fn finish_with(&self, b: Buf, fx: Image) -> Buf {
+        self.post.apply(b, fx)
+    }
+}
+
+impl Post {
+    /// Meet the sprite image `fx` with the original layer `b` (see [`SpritePlan::finish`]).
+    pub(super) fn apply(self, mut b: Buf, fx: Image) -> Buf {
+        b.img = match self {
+            Post::Combine(m) => combine(&b.img, &fx, m),
+            Post::Replace => fx,
+            Post::Lerp(t) => {
+                let mut o = fx;
+                o.data.par_iter_mut().zip(b.img.data.par_iter()).for_each(|(o, s0)| *o = crate::util::lerp4(*o, *s0, t));
+                o
+            }
+            Post::OverBlack => combine(&Image::filled(b.img.width, b.img.height, [0.0, 0.0, 0.0, 1.0]), &fx, 0),
+        };
+        b
+    }
+}
+
+fn sprite_bbox(s: &Sprite) -> Option<[f32; 4]> {
+    if s.c[3] <= 1e-5 || s.r <= 0.0 {
+        return None;
+    }
+    let r = s.r.max(0.5) + 1.0;
+    Some(match s.shape {
+        Shape::Line { dx, dy } => [s.x.min(s.x + dx) - r, s.y.min(s.y + dy) - r, s.x.max(s.x + dx) + r, s.y.max(s.y + dy) + r],
+        Shape::Star => [s.x - r * 2.0, s.y - r * 2.0, s.x + r * 2.0, s.y + r * 2.0],
+        _ => [s.x - r, s.y - r, s.x + r, s.y + r],
+    })
+}
+
+#[inline]
+pub(super) fn aa(edge: f32) -> f32 {
+    (edge + 0.5).clamp(0.0, 1.0)
+}
+
+fn sprite_shade(s: &Sprite, x: f32, y: f32) -> Option<Px> {
+    // Sub-pixel sprites keep their energy: draw at radius 0.5 with reduced opacity.
+    let (r, fade) = if s.r < 0.5 { (0.5, s.r / 0.5) } else { (s.r, 1.0) };
+    let (dx, dy) = (x - s.x, y - s.y);
+    let mut rgb = [s.c[0], s.c[1], s.c[2]];
+    let cov = match s.shape {
+        Shape::Soft => {
+            let d2 = (dx * dx + dy * dy) / (r * r);
+            if d2 >= 1.0 {
+                return None;
+            }
+            let q = 1.0 - d2;
+            q * q
+        }
+        Shape::Disc => aa(r - (dx * dx + dy * dy).sqrt()),
+        Shape::Faded => {
+            let d = (dx * dx + dy * dy).sqrt() / r;
+            (1.0 - d).max(0.0).powf(1.5)
+        }
+        Shape::Sphere => {
+            let d = (dx * dx + dy * dy).sqrt();
+            let cv = aa(r - d);
+            if cv <= 0.0 {
+                return None;
+            }
+            let (nx, ny) = (dx / r, dy / r);
+            let nz = (1.0 - nx * nx - ny * ny).max(0.0).sqrt();
+            let (lx, ly, lz) = (-0.48, -0.58, 0.66);
+            let diff = (nx * lx + ny * ly + nz * lz).max(0.0);
+            let rz = 2.0 * diff * nz - lz;
+            let spec = rz.max(0.0).powi(20) * 0.6;
+            let k = 0.2 + 0.8 * diff;
+            rgb = [rgb[0] * k + spec, rgb[1] * k + spec, rgb[2] * k + spec];
+            cv
+        }
+        Shape::Bubble => {
+            let d = (dx * dx + dy * dy).sqrt() / r;
+            if d > 1.0 + 1.0 / r {
+                return None;
+            }
+            let ring = (1.0 - ((d - 0.9) / 0.12).powi(2)).max(0.0);
+            let hl = (1.0 - (((dx / r) + 0.4).powi(2) + ((dy / r) + 0.4).powi(2)) / 0.04).max(0.0);
+            (0.12 * (d <= 1.0) as u8 as f32 + ring * 0.8 + hl).min(1.0)
+        }
+        Shape::Star => {
+            let (sn, cs) = s.rot.sin_cos();
+            let (ux, uy) = ((dx * cs + dy * sn) / r, (-dx * sn + dy * cs) / r);
+            let d = (ux * ux + uy * uy).sqrt();
+            let core = (1.0 - d).max(0.0).powi(2);
+            let sx = (1.0 - ux.abs() / 2.0).max(0.0) * (1.0 - (uy.abs() * 6.0)).max(0.0);
+            let sy = (1.0 - uy.abs() / 2.0).max(0.0) * (1.0 - (ux.abs() * 6.0)).max(0.0);
+            (core + sx + sy).min(1.0)
+        }
+        Shape::Square => {
+            let (sn, cs) = s.rot.sin_cos();
+            let (ux, uy) = (dx * cs + dy * sn, -dx * sn + dy * cs);
+            let e = r * 0.75;
+            aa(e - ux.abs()) * aa(e - uy.abs())
+        }
+        Shape::Tri => {
+            let (sn, cs) = s.rot.sin_cos();
+            let (ux, uy) = (dx * cs + dy * sn, -dx * sn + dy * cs);
+            // Equilateral triangle with circumradius r: three half-planes.
+            let e = r * 0.5;
+            let mut m = f32::INFINITY;
+            for k in 0..3 {
+                let a = std::f32::consts::FRAC_PI_2 + k as f32 * std::f32::consts::TAU / 3.0;
+                let (ns, nc) = a.sin_cos();
+                m = m.min(e - (ux * nc + uy * ns));
+            }
+            aa(m)
+        }
+        Shape::Line { dx: lx, dy: ly } => {
+            let l2 = lx * lx + ly * ly;
+            let t = if l2 > 0.0 { ((dx * lx + dy * ly) / l2).clamp(0.0, 1.0) } else { 0.0 };
+            let (px, py) = (dx - lx * t, dy - ly * t);
+            aa(r - (px * px + py * py).sqrt())
+        }
+    };
+    let a = cov * s.c[3] * fade;
+    if a <= 1e-6 {
+        return None;
+    }
+    Some([rgb[0] * a, rgb[1] * a, rgb[2] * a, a])
+}
+
+/// Draw sprites into a new transparent image of `w`×`h`.
+pub(crate) fn splat(w: u32, hgt: u32, sprites: &[Sprite], acc: Acc) -> Image {
+    let mut img = Image::new(w, hgt);
+    raster(&mut img, sprites, sprite_bbox, sprite_shade, acc);
+    img
+}
+
+/// Combine an effect layer `fx` with the original `src` (both premultiplied, same size):
+/// 0 Composite (fx over src), 1 Screen, 2 Add, 3 Lighten, 4 Darken, 5 fx only.
+pub(crate) fn combine(src: &Image, fx: &Image, mode: u32) -> Image {
+    let mut out = fx.clone();
+    out.data.par_iter_mut().zip(src.data.par_iter()).for_each(|(o, s)| {
+        let f = *o;
+        *o = match mode {
+            0 => {
+                let k = 1.0 - f[3];
+                [f[0] + s[0] * k, f[1] + s[1] * k, f[2] + s[2] * k, f[3] + s[3] * k]
+            }
+            1 => [s[0] + f[0] - s[0] * f[0], s[1] + f[1] - s[1] * f[1], s[2] + f[2] - s[2] * f[2], s[3] + f[3] - s[3] * f[3]],
+            2 => [s[0] + f[0], s[1] + f[1], s[2] + f[2], (s[3] + f[3]).min(1.0)],
+            3 => [s[0].max(f[0]), s[1].max(f[1]), s[2].max(f[2]), s[3] + f[3] - s[3] * f[3]],
+            4 => {
+                let (fc, fa) = unpremul(f);
+                let m = |c: f32, k: usize| c - (c - c.min(fc[k] * s[3])) * fa;
+                [m(s[0], 0), m(s[1], 1), m(s[2], 2), s[3]]
+            }
+            _ => f,
+        };
+    });
+    out
+}
diff --git a/crates/effects/src/sim/tests.rs b/crates/effects/src/sim/tests.rs
new file mode 100644
index 000000000..c6f83ab4e
--- /dev/null
+++ b/crates/effects/src/sim/tests.rs
@@ -0,0 +1,407 @@
+use super::*;
+use crate::{EffectEnv, run_fx};
+
+fn grey(w: u32, hh: u32) -> Image {
+    Image::filled(w, hh, [0.2, 0.2, 0.2, 1.0])
+}
+
+fn ramp(w: u32, hh: u32) -> Image {
+    let mut img = Image::new(w, hh);
+    for y in 0..hh {
+        for x in 0..w {
+            img.set(x, y, [x as f32 / w as f32, y as f32 / hh as f32, 0.4, 1.0]);
+        }
+    }
+    img
+}
+
+fn run(id: &str, vals: &[(&str, Value)], img: Image, t: f64) -> Image {
+    run_fx(id, vals, img, t, EffectEnv::default()).img
+}
+
+fn diff(a: &Image, b: &Image) -> f32 {
+    a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>()).sum()
+}
+
+/// Centre of mass (luminance-weighted difference from `base`), `[-1, -1]` when equal.
+fn mass(img: &Image, base: &Image) -> [f32; 2] {
+    let (mut m, mut sx, mut sy) = (0.0, 0.0, 0.0);
+    for y in 0..img.height {
+        for x in 0..img.width {
+            let i = img.idx(x, y);
+            let d: f32 = (0..3).map(|k| (img.data[i][k] - base.data[i][k]).abs()).sum();
+            m += d;
+            sx += d * x as f32;
+            sy += d * y as f32;
+        }
+    }
+    if m > 0.0 { [sx / m, sy / m] } else { [-1.0; 2] }
+}
+
+/// [`mass`] in y.
+fn mass_y(img: &Image, base: &Image) -> f32 {
+    mass(img, base)[1]
+}
+
+#[test]
+fn rasteriser_over_and_add() {
+    let s = [Sprite::new(5.0, 5.0, 2.0, [1.0, 0.0, 0.0, 1.0], Shape::Disc)];
+    let img = splat(10, 40, &s, Acc::Over);
+    assert!(img.get(5, 5)[0] > 0.99 && img.get(9, 30)[3] == 0.0);
+    let two = [s[0], s[0]];
+    let add = splat(10, 40, &two, Acc::Add);
+    assert!(add.get(5, 5)[0] > 1.9);
+    // Items spanning band boundaries are drawn in every band.
+    let tall = [Sprite::new(5.0, 16.0, 6.0, [0.0, 1.0, 0.0, 1.0], Shape::Square)];
+    let t = splat(10, 40, &tall, Acc::Over);
+    assert!(t.get(5, 13)[1] > 0.9 && t.get(5, 18)[1] > 0.9);
+}
+
+#[test]
+fn rainfall_deterministic_and_falls() {
+    let vals = [("drops", num(200.0)), ("opacity", num(100.0)), ("extras/appearance", Value::Enum(1)), ("color", col(1.0, 1.0, 1.0))];
+    let a = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.5);
+    let b = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.5);
+    assert_eq!(a, b);
+    assert!(diff(&a, &grey(40, 40)) > 1.0, "drops visible");
+    let none = run("ec.sim.ccrainfall", &[("drops", num(0.0))], grey(40, 40), 0.5);
+    assert_eq!(none, grey(40, 40));
+    let later = run("ec.sim.ccrainfall", &vals, grey(40, 40), 0.52);
+    assert!(diff(&a, &later) > 0.1, "rain moves");
+}
+
+#[test]
+fn snowfall_deterministic_and_moves() {
+    let vals = [("flakes", num(300.0))];
+    let a = run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.0);
+    assert_eq!(a, run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.0));
+    assert!(diff(&a, &grey(40, 40)) > 1.0);
+    assert!(diff(&a, &run("ec.sim.ccsnowfall", &vals, grey(40, 40), 1.2)) > 0.1);
+    let off = run("ec.sim.ccsnowfall", &[("flakes", num(300.0)), ("compositeWithOriginal", Value::Bool(false))], grey(40, 40), 1.0);
+    assert!(off.data.iter().any(|p| p[3] == 0.0), "without original the background is transparent");
+}
+
+#[test]
+fn bubbles_rise() {
+    let vals = [("bubbleAmount", num(30.0)), ("bubbleSize", num(3.0))];
+    let a = run("ec.sim.ccbubbles", &vals, ramp(40, 40), 0.3);
+    assert_eq!(a, run("ec.sim.ccbubbles", &vals, ramp(40, 40), 0.3));
+    assert!(a.data.iter().any(|p| p[3] > 0.5));
+    let none = run("ec.sim.ccbubbles", &[("bubbleAmount", num(0.0))], ramp(40, 40), 0.3);
+    assert!(none.data.iter().all(|p| p[3] == 0.0), "bubbles replace the layer");
+    // A single slow bubble moves up over a short time.
+    let one = [("bubbleAmount", num(1.0)), ("bubbleSize", num(4.0)), ("wobbleAmplitude", num(0.0)), ("bubbleSpeed", num(0.2))];
+    let blank = Image::new(40, 40);
+    let y0 = mass_y(&run("ec.sim.ccbubbles", &one, ramp(40, 40), 0.0), &blank);
+    let y1 = mass_y(&run("ec.sim.ccbubbles", &one, ramp(40, 40), 0.1), &blank);
+    assert!(y0 >= 0.0 && y1 >= 0.0 && (y1 < y0 || y0 < 8.0), "{y0} -> {y1}");
+}
+
+#[test]
+fn drizzle_ripples() {
+    let a = run("ec.sim.ccdrizzle", &[], ramp(48, 48), 0.6);
+    assert_eq!(a, run("ec.sim.ccdrizzle", &[], ramp(48, 48), 0.6));
+    assert!(diff(&a, &ramp(48, 48)) > 0.1);
+    let none = run("ec.sim.ccdrizzle", &[("dripRate", num(0.0))], ramp(48, 48), 0.6);
+    assert_eq!(none, ramp(48, 48));
+}
+
+#[test]
+fn star_burst_moves_stars() {
+    let a = run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.5);
+    assert_eq!(a, run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.5));
+    assert!(a.data.iter().any(|p| p[3] > 0.0));
+    let b = run("ec.sim.ccstarburst", &[("gridSpacing", num(4.0))], ramp(40, 40), 0.9);
+    assert!(diff(&a, &b) > 0.5);
+    let full = run("ec.sim.ccstarburst", &[("blendWithOriginal", num(100.0))], ramp(40, 40), 0.5);
+    assert!(diff(&full, &ramp(40, 40)) < 1e-3);
+}
+
+fn pw_vals(seed: f64) -> Vec<(&'static str, Value)> {
+    vec![
+        ("birthRate", num(1.0)),
+        ("extras/randomSeed", num(seed)),
+        ("particle/particleType", Value::Enum(2)),
+        ("particle/birthSize", num(0.3)),
+        ("particle/deathSize", num(0.3)),
+    ]
+}
+
+/// #1195: with the comp's shutter open, the particles smear across it: the average of the
+/// sampled sprite fields differs from the sharp frame, touches more pixels and keeps the
+/// alpha energy.
+#[test]
+fn particle_world_motion_blur_trails() {
+    let v = pw_vals(21.0);
+    let blank = Image::new(40, 40);
+    let sharp = run("ec.sim.ccparticleworld", &v, blank.clone(), 2.0);
+    let blurred = crate::run_fx(
+        "ec.sim.ccparticleworld",
+        &v,
+        blank.clone(),
+        2.0,
+        EffectEnv { frame_rate: 10.0, shutter: Some((360.0, -180.0, 8)), ..Default::default() },
+    )
+    .img;
+    assert!(sharp.data.iter().any(|p| p[3] > 0.0), "sharp frame has particles");
+    assert_ne!(sharp.data, blurred.data, "the shutter smears the particles");
+    let lit = |img: &Image| img.data.iter().filter(|p| p[3] > 0.005).count();
+    let sum = |img: &Image| img.data.iter().map(|p| p[3]).sum::<f32>();
+    assert!(lit(&blurred) > lit(&sharp), "trails light more pixels: {} vs {}", lit(&blurred), lit(&sharp));
+    let (sa, ba) = (sum(&sharp), sum(&blurred));
+    assert!((ba - sa).abs() < sa * 0.6 + 1.0, "alpha energy roughly kept: {ba} vs {sa}");
+}
+
+#[test]
+fn particle_world_seek_consistent() {
+    let v = pw_vals(11.0);
+    let direct = run("ec.sim.ccparticleworld", &v, Image::new(40, 40), 2.0);
+    let v2 = pw_vals(12.0);
+    let _ = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 1.0);
+    let stepped = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 2.0);
+    let direct2 = run("ec.sim.ccparticleworld", &v2, Image::new(40, 40), 2.0);
+    assert_eq!(stepped, direct2);
+    assert!(direct.data.iter().any(|p| p[3] > 0.0), "particles alive");
+    // Before birth nothing is drawn.
+    let t0 = run("ec.sim.ccparticleworld", &v, Image::new(40, 40), 0.0);
+    assert!(t0.data.iter().all(|p| p[3] == 0.0));
+}
+
+#[test]
+fn engine_resume_equals_from_scratch() {
+    for anim in 0..PW_ANIMS.len() as u32 {
+        let phys = Phys {
+            rate: 90.0,
+            life: 1.5,
+            producer: [0.0; 3],
+            radius: [0.05; 3],
+            anim,
+            speed: 0.5,
+            gravity: [0.0, 0.5, 0.0],
+            resistance: 0.2,
+            axis: [0.0, -1.0, 0.0],
+            extra: 1.0,
+            extra_angle: 60.0,
+            seed: 9,
+            max: 10_000,
+            flat: anim % 2 == 0,
+        };
+        let a: SimCache<PState> = SimCache::new(2);
+        let b: SimCache<PState> = SimCache::new(2);
+        let direct = simulate(&a, 1, 2.0, &phys);
+        let _ = simulate(&b, 1, 1.0, &phys);
+        let _ = simulate(&b, 1, 0.37, &phys);
+        let resumed = simulate(&b, 1, 2.0, &phys);
+        assert_eq!(direct.parts.len(), resumed.parts.len(), "anim {anim}");
+        assert!(direct.parts.iter().zip(&resumed.parts).all(|(p, q)| p.p == q.p && p.v == q.v && p.id == q.id), "anim {anim}");
+        assert!(!direct.parts.is_empty());
+    }
+}
+
+#[test]
+fn particle_world_gravity_pulls_down() {
+    let base = |g: f64| {
+        vec![
+            ("birthRate", num(2.0)),
+            ("physics/velocity", num(0.2)),
+            ("physics/gravity", num(g)),
+            ("particle/particleType", Value::Enum(2)),
+            ("particle/birthSize", num(0.2)),
+            ("particle/deathSize", num(0.2)),
+            ("longevity", num(3.0)),
+        ]
+    };
+    let blank = Image::new(48, 48);
+    let up = mass_y(&run("ec.sim.ccparticleworld", &base(0.0), blank.clone(), 1.0), &blank);
+    let down = mass_y(&run("ec.sim.ccparticleworld", &base(2.0), blank.clone(), 1.0), &blank);
+    assert!(down > up + 2.0, "{up} {down}");
+}
+
+/// A comp whose camera is `camera` ([`crate::CompScene::camera`]); `layer`: a camera layer
+/// (else the comp's default view).
+struct Comp {
+    camera: [[f64; 4]; 3],
+    layer: bool,
+}
+impl crate::EffectHost for Comp {
+    fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
+        None
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+    fn comp_scene(&self) -> Option<crate::CompScene> {
+        Some(crate::CompScene { camera: Some(self.camera), camera_layer: self.layer, light: None })
+    }
+}
+
+/// A camera `d` px in front of layer point `c` looking at it, moved right by `dx` px and
+/// zoomed by `zoom` (1 = identity on the layer plane): `c + zoom·d·(p − c − dx) / (z + d)`.
+fn cam(c: [f64; 2], d: f64, dx: f64, zoom: f64) -> [[f64; 4]; 3] {
+    let k = zoom * d;
+    [[k, 0.0, c[0], d * c[0] - k * (c[0] + dx)], [0.0, k, c[1], d * c[1] - k * c[1]], [0.0, 0.0, 1.0, d]]
+}
+
+fn pw_in(comp: &Comp, vals: &[(&str, Value)]) -> Image {
+    run_fx("ec.sim.ccparticleworld", vals, Image::new(48, 48), 1.0, EffectEnv { host: Some(comp), ..Default::default() }).img
+}
+
+fn finite(img: &Image) -> bool {
+    img.data.iter().all(|p| p.iter().all(|c| c.is_finite()))
+}
+
+/// #397: with a camera layer in the comp, the particles are seen through it.
+#[test]
+fn particle_world_follows_the_comp_camera() {
+    let v = pw_vals(3.0);
+    let blank = Image::new(48, 48);
+    let here = Comp { camera: cam([24.0, 24.0], 96.0, 0.0, 1.0), layer: true };
+    let base = pw_in(&here, &v);
+    assert!(base.data.iter().any(|p| p[3] > 0.0), "particles alive");
+    // Moving the camera right moves the particles left.
+    let moved = pw_in(&Comp { camera: cam([24.0, 24.0], 96.0, 8.0, 1.0), ..here }, &v);
+    let (a, b) = (mass(&base, &blank), mass(&moved, &blank));
+    assert!(b[0] < a[0] - 4.0 && (b[1] - a[1]).abs() < 2.0, "{a:?} -> {b:?}");
+    // Zooming in spreads them out.
+    let zoomed = pw_in(&Comp { camera: cam([24.0, 24.0], 96.0, 0.0, 2.0), ..here }, &v);
+    let cover = |i: &Image| i.data.iter().filter(|p| p[3] > 0.01).count();
+    assert!(cover(&zoomed) > cover(&base), "{} {}", cover(&zoomed), cover(&base));
+    // The Effect Camera is ignored then.
+    let mut turned = v.clone();
+    turned.push(("extras/effectCamera/rotationY", num(60.0)));
+    assert_eq!(pw_in(&here, &turned), base);
+    // The comp's default view (no camera layer) leaves it to the Effect Camera.
+    let default_view = Comp { layer: false, ..here };
+    assert_eq!(pw_in(&default_view, &v), run("ec.sim.ccparticleworld", &v, blank.clone(), 1.0));
+    // A camera facing away, or a degenerate one, draws nothing and never NaN.
+    for camera in [[[96.0, 0.0, 24.0, 0.0], [0.0, 96.0, 24.0, 0.0], [0.0, 0.0, -1.0, -96.0]], [[0.0; 4]; 3], [[f64::NAN; 4]; 3]] {
+        assert_eq!(pw_in(&Comp { camera, layer: true }, &v), blank);
+    }
+    // A camera among the particles draws the ones in front of it.
+    let inside = pw_in(&Comp { camera: cam([24.0, 24.0], 1.0, 0.0, 1.0), ..here }, &v);
+    assert!(finite(&inside));
+}
+
+/// Extras ▸ Effect Camera: the defaults are the fixed camera Particle World always had.
+#[test]
+fn particle_world_effect_camera() {
+    let v = pw_vals(5.0);
+    let base = run("ec.sim.ccparticleworld", &v, Image::new(48, 48), 1.0);
+    let with = |extra: &[(&'static str, Value)]| {
+        let mut w = v.clone();
+        w.extend_from_slice(extra);
+        run("ec.sim.ccparticleworld", &w, Image::new(48, 48), 1.0)
+    };
+    // Missing parameters (projects saved before) read as the defaults.
+    let spec = crate::find("ec.sim.ccparticleworld").unwrap();
+    let mut params = crate::Params { values: spec.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    params.values.retain(|k, _| !k.starts_with(PW_EFFECT_CAMERA));
+    for (k, val) in &v {
+        params.values.insert(k.to_string(), val.clone());
+    }
+    let ctx = EffectCtx { params: &params, time: 1.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: EffectEnv::default() };
+    assert_eq!(crate::apply(spec, &ctx, Buf { img: Image::new(48, 48), offset: [0.0; 2], scale: 1.0 }).img, base);
+    assert_eq!(with(&[("extras/effectCamera/fov", num(f64::NAN))]), base);
+    // Turning or pulling back the camera changes the view.
+    let turned = with(&[("extras/effectCamera/rotationY", num(60.0))]);
+    assert!(diff(&turned, &base) > 1.0);
+    let cover = |i: &Image| i.data.iter().filter(|p| p[3] > 0.01).count();
+    let far = with(&[("extras/effectCamera/distance", num(4.0))]);
+    assert!(cover(&far) < cover(&base), "{} {}", cover(&far), cover(&base));
+    assert!(diff(&with(&[("extras/effectCamera/fov", num(120.0))]), &base) > 0.1);
+    // Extremes never panic or produce NaN.
+    for extra in [
+        ("extras/effectCamera/distance", num(0.0)),
+        ("extras/effectCamera/distance", num(-5.0)),
+        ("extras/effectCamera/fov", num(0.0)),
+        ("extras/effectCamera/fov", num(180.0)),
+        ("extras/effectCamera/rotationX", num(1e12)),
+    ] {
+        assert!(finite(&with(std::slice::from_ref(&extra))), "{extra:?}");
+    }
+    // Moving the camera doesn't restart the simulation.
+    let key =
+        |pr: &crate::Params| sim_key(&EffectCtx { params: pr, time: 1.0, layer_size: [48.0, 48.0], seed: 1, adjustment: false, env: EffectEnv::default() }, 1);
+    let mut moved = params.clone();
+    moved.values.insert("extras/effectCamera/rotationZ".into(), num(30.0));
+    assert_eq!(key(&params), key(&moved));
+    moved.values.insert("extras/randomSeed".into(), num(9.0));
+    assert_ne!(key(&params), key(&moved));
+}
+
+#[test]
+fn particle_systems2_seek_and_direction() {
+    let v = vec![
+        ("producer/position", pt(24.0, 24.0)),
+        ("birthRate", num(3.0)),
+        ("physics/gravity", num(0.0)),
+        ("physics/velocity", num(1.0)),
+        ("physics/animation", Value::Enum(1)),
+    ];
+    let _ = run("ec.sim.ccparticlesystems2", &v, Image::new(48, 48), 0.5);
+    let a = run("ec.sim.ccparticlesystems2", &v, Image::new(48, 48), 1.0);
+    let mut v2 = v.clone();
+    v2.push(("randomSeed", num(0.0)));
+    assert_eq!(a, run("ec.sim.ccparticlesystems2", &v2, Image::new(48, 48), 1.0));
+    // Direction 0° (up): particles above the producer.
+    let blank = Image::new(48, 48);
+    let y = mass_y(&a, &blank);
+    assert!((0.0..24.0).contains(&y), "{y}");
+    // The particles replace the layer: with none born it is empty.
+    let none = run("ec.sim.ccparticlesystems2", &[("birthRate", num(0.0))], grey(20, 20), 1.0);
+    assert_eq!(none, Image::new(20, 20));
+}
+
+/// CC Particle World and CC Particle Systems II replace their layer with the particles, in
+/// every Transfer Mode (which only sets how particles meet each other). SceneYard frames from
+/// After Effects 2026 show no trace of the source solid: "Task Preparation UI" (black solids
+/// under fireworks hid a white page), "Burnout matchstick" (a red rectangle around the
+/// flame), "Documentary Man Falling" (a black block over the light).
+#[test]
+fn cc_particles_replace_their_layer() {
+    let red = || {
+        let mut img = Image::new(48, 48);
+        img.data.iter_mut().for_each(|p| *p = [0.7, 0.1, 0.1, 1.0]);
+        img
+    };
+    for id in ["ec.sim.ccparticlesystems2", "ec.sim.ccparticleworld"] {
+        for mode in 0..4 {
+            let v = vec![("birthRate", num(3.0)), ("particle/transferMode", Value::Enum(mode))];
+            let _ = run(id, &v, red(), 0.5);
+            let out = run(id, &v, red(), 1.0);
+            // No source left: the corners, far from the producer, are clear.
+            for (x, y) in [(0, 0), (47, 0), (0, 47), (47, 47)] {
+                assert!(out.get(x, y)[3] < 1e-6, "{id} mode {mode} ({x},{y}): {:?}", out.get(x, y));
+            }
+            assert!(out.data.iter().any(|p| p[3] > 0.05), "{id} mode {mode}: particles drawn");
+        }
+    }
+}
+
+#[test]
+fn mercury_blobs_and_seek() {
+    let v = vec![("producer", pt(24.0, 16.0)), ("radiusX", num(5.0)), ("radiusY", num(5.0)), ("birthRate", num(3.0))];
+    let _ = run("ec.sim.ccmrmercury", &v, ramp(48, 48), 0.7);
+    let a = run("ec.sim.ccmrmercury", &v, ramp(48, 48), 1.4);
+    let mut v2 = v.clone();
+    v2.push(("shading/metal", num(100.0)));
+    let b = run("ec.sim.ccmrmercury", &v2, ramp(48, 48), 1.4);
+    assert_eq!(a, b);
+    assert!(a.data.iter().any(|p| p[3] > 0.5), "blobs visible");
+    let none = run("ec.sim.ccmrmercury", &[("birthRate", num(0.0))], ramp(48, 48), 1.4);
+    assert!(none.data.iter().all(|p| p[3] == 0.0));
+}
+
+#[test]
+fn half_resolution_scales_sprites() {
+    // Downsampled buffers render the same layout at half size.
+    let s = crate::find("ec.sim.ccsnowfall").unwrap();
+    let mut params = crate::Params { values: s.params.iter().map(|p| (p.id.to_string(), p.default.clone())).collect() };
+    params.values.insert("flakes".into(), num(50.0));
+    params.values.insert("offset".into(), pt(20.0, 20.0));
+    let ctx = EffectCtx { params: &params, time: 0.5, layer_size: [40.0, 40.0], seed: 1, adjustment: false, env: EffectEnv::default() };
+    let full = crate::apply(s, &ctx, Buf { img: grey(40, 40), offset: [0.0; 2], scale: 1.0 });
+    let half = crate::apply(s, &ctx, Buf { img: grey(20, 20), offset: [0.0; 2], scale: 0.5 });
+    let sum = |i: &Image| i.data.iter().map(|p| p[0]).sum::<f32>() / i.data.len() as f32;
+    assert!((sum(&full.img) - sum(&half.img)).abs() < 0.05, "{} {}", sum(&full.img), sum(&half.img));
+}
diff --git a/crates/effects/src/sim/weather.rs b/crates/effects/src/sim/weather.rs
new file mode 100644
index 000000000..b93c0e48b
--- /dev/null
+++ b/crates/effects/src/sim/weather.rs
@@ -0,0 +1,352 @@
+use super::common::{h, hs};
+use super::sprites::{Acc, Post, Shape, Sprite, SpritePlan, Tint, aa, raster};
+use super::{Buf, EffectCtx, Image, IntoParallelIterator, ParallelIterator, unpremul};
+
+// ------------------------------------------------------------------ CC Rainfall / CC Snowfall
+
+/// Shared weather layout: per-item depth factor `k` in (0, 1] (1 = nearest) from Scene Depth.
+#[inline]
+fn depth_k(z: f32, scene_depth: f32) -> f32 {
+    1.0 / (1.0 + z * scene_depth / 2500.0)
+}
+
+/// Wrap `v` into `[lo, lo + span)`.
+#[inline]
+fn wrap(v: f32, lo: f32, span: f32) -> f32 {
+    if span <= 0.0 { v } else { lo + (v - lo).rem_euclid(span) }
+}
+
+pub(super) fn rainfall(ctx: &EffectCtx, b: Buf) -> Buf {
+    let mut plan = rainfall_plan(ctx, &b);
+    plan.resolve(&b.img);
+    plan.finish(b)
+}
+
+pub(super) fn rainfall_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
+    let pr = ctx.params;
+    let n = pr.f("drops").clamp(0.0, 100_000.0) as u32;
+    let size = pr.f("size").max(0.0) as f32;
+    let depth = pr.f("sceneDepth").max(0.0) as f32;
+    let speed = pr.f("speed") as f32;
+    let wind = pr.f("wind") as f32;
+    let wvar = pr.f("windVariation") as f32 / 100.0;
+    let spread = pr.f("spread") as f32;
+    let color = pr.color("color");
+    let opacity = pr.f("opacity") as f32 / 100.0;
+    let mode = pr.e("transferMode");
+    let with_orig = pr.b("compositeWithOriginal");
+    let refract = pr.e("extras/appearance") == 0;
+    let off = pr.v2("extras/offset");
+    let seed = pr.f("extras/randomSeed") as u32 ^ ctx.seed.wrapping_mul(0x9e37);
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    let t = ctx.time as f32;
+    let (ox, oy) = (off[0] as f32 - lw * 0.5, off[1] as f32 - lh * 0.5);
+    let (sprites, tints): (Vec<Sprite>, Vec<Tint>) = (0..n)
+        .into_par_iter()
+        .map(|i| {
+            let z = h(i, 1, seed);
+            let k = depth_k(z, depth);
+            let vy = speed / 4000.0 * lh * 2.2 * k;
+            let w = wind / 1000.0 * lh * (1.0 + wvar * hs(i, 2, seed)) * k + spread * hs(i, 7, seed) * k;
+            let len = (vy * 0.04 * size.max(0.2)).max(1.0);
+            let lenx = w * 0.04 * size.max(0.2);
+            let margin = len + lenx.abs() + 4.0;
+            let y = wrap(h(i, 3, seed) * (lh + 2.0 * margin) + vy * t + oy, -margin, lh + 2.0 * margin);
+            let x = wrap(h(i, 4, seed) * (lw + 2.0 * margin) + w * t + ox, -margin, lw + 2.0 * margin);
+            let (bx, by) = b.to_px([x as f64, y as f64]);
+            let c = [color[0], color[1], color[2], opacity * (0.35 + 0.65 * k)];
+            // Refracting drops show the scene behind them, brightened and offset.
+            let tint = if refract { Tint::Refract { x: bx + 2.0 * s as f64, y: by } } else { Tint::Fixed };
+            let r = (size * 0.6 * k * s).max(0.25);
+            (Sprite::new(bx as f32, by as f32, r, c, Shape::Line { dx: -lenx * s, dy: -len * s }), tint)
+        })
+        .unzip();
+    SpritePlan { sprites, tints, acc: Acc::Over, post: weather_post(mode, with_orig) }
+}
+
+fn weather_post(mode: u32, with_orig: bool) -> Post {
+    if with_orig { Post::Combine(if mode == 1 { 3 } else { 0 }) } else { Post::Replace }
+}
+
+pub(super) fn snowfall(ctx: &EffectCtx, b: Buf) -> Buf {
+    snowfall_plan(ctx, &b).finish(b)
+}
+
+pub(super) fn snowfall_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
+    let pr = ctx.params;
+    let n = pr.f("flakes").clamp(0.0, 200_000.0) as u32;
+    let size = pr.f("size").max(0.0) as f32;
+    let svar = pr.f("sizeVariation") as f32 / 100.0;
+    let depth = pr.f("sceneDepth").max(0.0) as f32;
+    let speed = pr.f("speed") as f32;
+    let spvar = pr.f("speedVariation") as f32 / 100.0;
+    let wind = pr.f("wind") as f32;
+    let wvar = pr.f("windVariation") as f32 / 100.0;
+    let spread = pr.f("spread") as f32;
+    let wig = pr.f("wiggle/wiggleAmount") as f32;
+    let wigvar = pr.f("wiggle/wiggleAmountVariation") as f32 / 100.0;
+    let wfreq = pr.f("wiggle/wiggleFrequency") as f32;
+    let wfvar = pr.f("wiggle/wiggleFrequencyVariation") as f32 / 100.0;
+    let color = pr.color("color");
+    let opacity = pr.f("opacity") as f32 / 100.0;
+    let mode = pr.e("transferMode");
+    let with_orig = pr.b("compositeWithOriginal");
+    let off = pr.v2("extras/offset");
+    let seed = pr.f("extras/randomSeed") as u32 ^ ctx.seed.wrapping_mul(0x85eb);
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    let t = ctx.time as f32;
+    let (ox, oy) = (off[0] as f32 - lw * 0.5, off[1] as f32 - lh * 0.5);
+    let sprites: Vec<Sprite> = (0..n)
+        .into_par_iter()
+        .map(|i| {
+            let z = h(i, 1, seed);
+            let k = depth_k(z, depth);
+            let r = (size * 0.5 * k * (1.0 + svar * hs(i, 2, seed))).max(0.05);
+            let vy = speed * (lh / 600.0) * k * (1.0 + spvar * hs(i, 3, seed));
+            let vx = wind * (lh / 1200.0) * k * (1.0 + wvar * hs(i, 4, seed)) + spread * hs(i, 8, seed) * k;
+            let amp = wig * 2.0 * k * (1.0 + wigvar * hs(i, 5, seed));
+            let fr = wfreq * (1.0 + wfvar * hs(i, 6, seed));
+            let ph = h(i, 9, seed) * std::f32::consts::TAU;
+            let margin = r + amp.abs() + 2.0;
+            let y = wrap(h(i, 10, seed) * (lh + 2.0 * margin) + vy * t + oy, -margin, lh + 2.0 * margin);
+            let x = wrap(h(i, 11, seed) * (lw + 2.0 * margin) + vx * t + ox, -margin, lw + 2.0 * margin) + amp * (fr * t * std::f32::consts::TAU + ph).sin();
+            let (bx, by) = b.to_px([x as f64, y as f64]);
+            Sprite::new(bx as f32, by as f32, r * s, [color[0], color[1], color[2], opacity * (0.4 + 0.6 * k)], Shape::Soft)
+        })
+        .collect();
+    SpritePlan { sprites, tints: vec![], acc: Acc::Over, post: weather_post(mode, with_orig) }
+}
+
+// ------------------------------------------------------------------ CC Bubbles
+
+/// A CC Bubbles bubble in buffer pixels.
+#[derive(Clone, Copy, Debug)]
+pub struct Bubble {
+    pub x: f32,
+    pub y: f32,
+    pub r: f32,
+    /// Source sample centre (buffer px).
+    pub sx: f32,
+    pub sy: f32,
+}
+
+/// CC Bubbles' bubbles this frame (closed-form in time) for buffer geometry `b`.
+pub fn bubble_list(ctx: &EffectCtx, b: &Buf) -> Vec<Bubble> {
+    let pr = ctx.params;
+    let n = pr.f("bubbleAmount").clamp(0.0, 10_000.0) as u32;
+    let speed = pr.f("bubbleSpeed") as f32;
+    let wamp = pr.f("wobbleAmplitude") as f32;
+    let wfreq = pr.f("wobbleFrequency") as f32;
+    let bsize = pr.f("bubbleSize").max(0.0) as f32;
+    let seed = ctx.seed.wrapping_mul(0x27d4);
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    let t = ctx.time as f32;
+    let base = lw.min(lh) * 0.035 * bsize;
+    (0..n)
+        .map(|i| {
+            let r = base * (0.5 + h(i, 1, seed));
+            let travel = lh + 2.0 * r;
+            let v = speed * lh * 0.3 * (0.6 + 0.8 * h(i, 2, seed));
+            let y = lh + r - (h(i, 3, seed) * travel + v * t).rem_euclid(travel);
+            let x0 = h(i, 4, seed) * lw;
+            let x = x0 + wamp * (r / base.max(1e-3)) * (t * wfreq * std::f32::consts::TAU + h(i, 5, seed) * std::f32::consts::TAU).sin();
+            let (bx, by) = b.to_px([x as f64, y as f64]);
+            let (sx, sy) = b.to_px([x0 as f64, y as f64]);
+            Bubble { x: bx as f32, y: by as f32, r: r * s, sx: sx as f32, sy: sy as f32 }
+        })
+        .collect()
+}
+
+pub(super) fn bubbles(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let metal = pr.e("reflectionType") == 1;
+    let shading = pr.e("shadingType");
+    let list = bubble_list(ctx, &b);
+    let src = b.img.clone();
+    let mut out = Image::new(src.width, src.height);
+    raster(
+        &mut out,
+        &list,
+        |q| Some([q.x - q.r - 1.0, q.y - q.r - 1.0, q.x + q.r + 1.0, q.y + q.r + 1.0]),
+        |q, x, y| {
+            let (dx, dy) = ((x - q.x) / q.r.max(0.5), (y - q.y) / q.r.max(0.5));
+            let d2 = dx * dx + dy * dy;
+            let d = d2.sqrt();
+            let cov = aa((1.0 - d) * q.r);
+            if cov <= 0.0 {
+                return None;
+            }
+            // Liquid refracts (inverted, magnified), metal reflects (wide-angle mirror).
+            let k = if metal { 1.6 } else { -0.7 };
+            let nz = (1.0 - d2).max(0.0).sqrt();
+            let p = src.sample_bilinear((q.sx + dx * q.r * k) as f64, (q.sy + dy * q.r * k) as f64);
+            let (c, sa) = unpremul(p);
+            let mut c = if sa <= 0.0 { [0.6, 0.7, 0.8] } else { c };
+            let mut a = cov;
+            match shading {
+                1 => c = c.map(|v| v * 0.7 + 0.3 * (1.0 - nz)),
+                2 => c = c.map(|v| v * (0.5 + 0.5 * nz)),
+                3 => a *= nz.powf(0.5),
+                4 => a *= 1.0 - nz * 0.8,
+                _ => {}
+            }
+            let hl = (1.0 - ((dx + 0.35).powi(2) + (dy + 0.35).powi(2)) / 0.05).max(0.0) * 0.8;
+            let c = c.map(|v| v + hl);
+            Some([c[0] * a, c[1] * a, c[2] * a, a])
+        },
+        Acc::Over,
+    );
+    b.img = out;
+    b
+}
+
+// ------------------------------------------------------------------ CC Drizzle
+
+/// CC Drizzle's live drops this frame (buffer px: centre x, y, ring radius, amplitude);
+/// `None` = no drops yet (the layer passes through).
+pub fn drizzle_drops(ctx: &EffectCtx, b: &Buf) -> Option<Vec<[f32; 4]>> {
+    let pr = ctx.params;
+    let rate = pr.f("dripRate").max(0.0);
+    let life = pr.f("longevity").max(0.01);
+    let spreading = pr.f("spreading") as f32;
+    let height = pr.f("rippleHeight") as f32 / 100.0;
+    let seed = ctx.seed.wrapping_mul(0x165667b1);
+    let t = ctx.time;
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    if rate <= 0.0 || t < 0.0 {
+        return None;
+    }
+    // Drops born at k / rate with hashed positions; alive while younger than the longevity.
+    let k0 = ((t - life) * rate).floor().max(0.0) as u32;
+    let k1 = (t * rate).floor() as u32;
+    let mut drops = Vec::new();
+    for k in k0..=k1 {
+        let born = k as f64 / rate;
+        let age = (t - born) as f32;
+        if age < 0.0 || age as f64 >= life {
+            continue;
+        }
+        let (x, y) = b.to_px([(h(k, 1, seed) * lw) as f64, (h(k, 2, seed) * lh) as f64]);
+        let radius = spreading * age * lh / 400.0 * s;
+        let amp = height * (1.0 - age / life as f32) * (0.6 + 0.4 * h(k, 3, seed));
+        drops.push([x as f32, y as f32, radius, amp]);
+    }
+    Some(drops)
+}
+
+pub(super) fn drizzle(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let pr = ctx.params;
+    let Some(drops) = drizzle_drops(ctx, &b) else { return b };
+    let rippling = (pr.f("rippling") / 360.0).max(0.05) as f32;
+    let disp = pr.f("displacement") as f32;
+    let li = pr.f("light/lightIntensity") as f32 / 100.0;
+    let lc = pr.color("light/lightColor");
+    let lheight = pr.f("light/lightHeight") as f32 / 100.0;
+    let ldir = (pr.f("light/lightDirection") as f32).to_radians();
+    let ambient = pr.f("shading/ambient") as f32 / 100.0;
+    let diffuse = pr.f("shading/diffuse") as f32 / 100.0;
+    let specular = pr.f("shading/specular") as f32 / 100.0;
+    let rough = pr.f("shading/roughness").max(0.001) as f32;
+    let lh = ctx.layer_size[1] as f32;
+    let s = b.scale as f32;
+    let wavelen = (lh * 0.04 * s).max(2.0) / rippling.clamp(0.25, 4.0);
+    let width = wavelen * (1.0 + rippling * 2.0);
+    let field = |x: f32, y: f32| -> f32 {
+        let mut v = 0.0;
+        for &[dx, dy, r, a] in &drops {
+            let d = ((x - dx).powi(2) + (y - dy).powi(2)).sqrt();
+            let u = (d - r) / width;
+            if u.abs() < 1.0 {
+                let env = 0.5 + 0.5 * (u * std::f32::consts::PI).cos();
+                v += a * env * ((d - r) / wavelen * std::f32::consts::TAU).cos();
+            }
+        }
+        v
+    };
+    let src = b.img.clone();
+    let (ls, lcs) = ldir.sin_cos();
+    let l = {
+        let v = [lcs, ls, lheight.max(0.05)];
+        let n = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
+        [v[0] / n, v[1] / n, v[2] / n]
+    };
+    b.img.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let (fx, fy) = (x as f32 + 0.5, y as f32 + 0.5);
+            let gx = field(fx + 1.0, fy) - field(fx - 1.0, fy);
+            let gy = field(fx, fy + 1.0) - field(fx, fy - 1.0);
+            if gx == 0.0 && gy == 0.0 {
+                continue;
+            }
+            let p = src.sample_bilinear_clamped((fx - gx * disp * s * 4.0) as f64, (fy - gy * disp * s * 4.0) as f64);
+            let n = {
+                let v = [-gx * 6.0, -gy * 6.0, 1.0];
+                let m = (v[0] * v[0] + v[1] * v[1] + 1.0).sqrt();
+                [v[0] / m, v[1] / m, v[2] / m]
+            };
+            let nl = (n[0] * l[0] + n[1] * l[1] + n[2] * l[2]).max(0.0);
+            let hz = (l[2] + 1.0) * 0.5;
+            let hv = {
+                let v = [l[0] * 0.5, l[1] * 0.5, hz];
+                let m = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
+                [v[0] / m, v[1] / m, v[2] / m]
+            };
+            let sp = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(1.0 / rough) * specular * li;
+            let shade = 1.0 + (ambient + diffuse * nl - diffuse * l[2]) * li;
+            let a = p[3];
+            *px = [p[0] * shade + sp * lc[0] * a, p[1] * shade + sp * lc[1] * a, p[2] * shade + sp * lc[2] * a, a];
+        }
+    });
+    b
+}
+
+// ------------------------------------------------------------------ CC Star Burst
+
+pub(super) fn star_burst(ctx: &EffectCtx, b: Buf) -> Buf {
+    let mut plan = star_burst_plan(ctx, &b);
+    plan.resolve(&b.img);
+    plan.finish(b)
+}
+
+pub(super) fn star_burst_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
+    let pr = ctx.params;
+    let scatter = pr.f("scatter") as f32;
+    let speed = pr.f("speed") as f32;
+    let phase = pr.f("phase") as f32 / 360.0;
+    let spacing = pr.f("gridSpacing").max(1.0) as f32;
+    let size = pr.f("size") as f32 / 100.0;
+    let blend = pr.f("blendWithOriginal") as f32 / 100.0;
+    let seed = ctx.seed.wrapping_mul(0x3c6e);
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    let t = ctx.time as f32;
+    let nx = (lw / spacing).ceil().max(1.0) as u32;
+    let ny = (lh / spacing).ceil().max(1.0) as u32;
+    let (cx, cy) = (lw * 0.5, lh * 0.5);
+    let mut list: Vec<(f32, Sprite, Tint)> = (0..nx * ny)
+        .into_par_iter()
+        .map(|i| {
+            let (gx, gy) = ((i % nx) as f32 * spacing + spacing * 0.5, (i / nx) as f32 * spacing + spacing * 0.5);
+            let (sx, sy) = b.to_px([gx as f64, gy as f64]);
+            // Depth cycles towards the viewer: z in [0, 1), perspective 1 / (1 - 0.9 z).
+            let z = (h(i, 1, seed) + t * speed * 0.25 + phase).rem_euclid(1.0);
+            let persp = 1.0 / (1.0 - 0.9 * z);
+            let jx = hs(i, 2, seed) * scatter * 0.01 * lw * 0.5;
+            let jy = hs(i, 3, seed) * scatter * 0.01 * lh * 0.5;
+            let x = cx + (gx - cx + jx) * persp;
+            let y = cy + (gy - cy + jy) * persp;
+            let (bx, by) = b.to_px([x as f64, y as f64]);
+            let r = spacing * 0.5 * size * persp * s;
+            let fade = (z * 8.0).min(1.0) * ((1.0 - z) * 6.0).min(1.0);
+            // The layer's colour at the grid point (none where it is clear).
+            (z, Sprite::new(bx as f32, by as f32, r, [0.0, 0.0, 0.0, fade], Shape::Disc), Tint::Source { x: sx, y: sy })
+        })
+        .collect();
+    list.sort_by(|a, b| a.0.total_cmp(&b.0));
+    let (sprites, tints) = list.into_iter().map(|(_, s, t)| (s, t)).unzip();
+    SpritePlan { sprites, tints, acc: Acc::Over, post: if blend > 0.0 { Post::Lerp(blend) } else { Post::Replace } }
+}
diff --git a/crates/effects/src/sim2.rs b/crates/effects/src/sim2.rs
index cf7322bda..497b60f16 100644
--- a/crates/effects/src/sim2.rs
+++ b/crates/effects/src/sim2.rs
@@ -16,2683 +16,28 @@ use crate::sim::{Acc, Post, Shape, Sprite, SpritePlan, h, hs, pct, pt, raster, s
 use crate::util::{Plane, SimCache, gauss_plane, layer_or_self, params_key, unpremul};
 use crate::{Buf, EffectCtx, EffectSpec, col, num, p, popup, slider};
 
-// ------------------------------------------------------------------ 3D pieces
-
-pub(crate) type M3 = [[f64; 3]; 3];
-
-fn mat_mul(a: &M3, b: &M3) -> M3 {
-    std::array::from_fn(|i| std::array::from_fn(|j| (0..3).map(|k| a[i][k] * b[k][j]).sum()))
-}
-
-/// Rotation from Euler angles (radians), applied X then Y then Z.
-fn rot_xyz(x: f64, y: f64, z: f64) -> M3 {
-    let (sx, cx) = x.sin_cos();
-    let (sy, cy) = y.sin_cos();
-    let (sz, cz) = z.sin_cos();
-    let rx = [[1.0, 0.0, 0.0], [0.0, cx, -sx], [0.0, sx, cx]];
-    let ry = [[cy, 0.0, sy], [0.0, 1.0, 0.0], [-sy, 0.0, cy]];
-    let rz = [[cz, -sz, 0.0], [sz, cz, 0.0], [0.0, 0.0, 1.0]];
-    mat_mul(&rz, &mat_mul(&ry, &rx))
-}
-
-/// Rotation by `angle` about unit `axis` (Rodrigues).
-pub(crate) fn rot_axis(axis: [f64; 3], angle: f64) -> M3 {
-    let l = (axis[0] * axis[0] + axis[1] * axis[1] + axis[2] * axis[2]).sqrt();
-    if l < 1e-12 || angle == 0.0 {
-        return [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]];
-    }
-    let (x, y, z) = (axis[0] / l, axis[1] / l, axis[2] / l);
-    let (s, c) = angle.sin_cos();
-    let t = 1.0 - c;
-    [
-        [t * x * x + c, t * x * y - s * z, t * x * z + s * y],
-        [t * x * y + s * z, t * y * y + c, t * y * z - s * x],
-        [t * x * z - s * y, t * y * z + s * x, t * z * z + c],
-    ]
-}
-
-fn inv3(m: &M3) -> Option<M3> {
-    let det = m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1]) - m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0])
-        + m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]);
-    if det.abs() < 1e-12 {
-        return None;
-    }
-    let d = 1.0 / det;
-    Some([
-        [(m[1][1] * m[2][2] - m[1][2] * m[2][1]) * d, (m[0][2] * m[2][1] - m[0][1] * m[2][2]) * d, (m[0][1] * m[1][2] - m[0][2] * m[1][1]) * d],
-        [(m[1][2] * m[2][0] - m[1][0] * m[2][2]) * d, (m[0][0] * m[2][2] - m[0][2] * m[2][0]) * d, (m[0][2] * m[1][0] - m[0][0] * m[1][2]) * d],
-        [(m[1][0] * m[2][1] - m[1][1] * m[2][0]) * d, (m[0][1] * m[2][0] - m[0][0] * m[2][1]) * d, (m[0][0] * m[1][1] - m[0][1] * m[1][0]) * d],
-    ])
-}
-
-/// Perspective camera looking down +z at the layer plane z = 0, `d` pixels away, centred on
-/// `c` (buffer pixels): screen = c + (P - c) · d / (d + z).
-#[derive(Clone, Copy)]
-struct Cam {
-    c: [f64; 2],
-    d: f64,
-}
-
-impl Cam {
-    fn proj(self) -> Proj {
-        Proj::simple(self.c, self.d)
-    }
-}
-
-/// A planar textured piece ready to draw.
-#[derive(Clone, Copy, Debug)]
-pub struct Piece {
-    /// Screen (buffer px, homogeneous) → piece-local (a, b, w).
-    pub inv: [[f64; 3]; 3],
-    /// Rest centre of the piece in texture pixels.
-    pub c0: [f32; 2],
-    /// Convex polygon (texture pixels), counter-clockwise in y-down space.
-    pub poly: [[f32; 2]; 6],
-    pub n: u8,
-    pub bbox: [f32; 4],
-    pub shade: f32,
-    /// Lighting: colour multiplier and additive specular highlight.
-    pub tint: [f32; 3],
-    pub spec: [f32; 3],
-    pub alpha: f32,
-    /// Flat straight colour instead of the texture.
-    pub flat: Option<[f32; 3]>,
-    /// Facing away from the camera (draw the back texture).
-    pub back: bool,
-    /// Back faces sample their texture mirrored about the piece centre: 0 no, 1 vertically
-    /// (flipped about the X axis), 2 horizontally (about the Y axis).
-    pub back_mirror: u8,
-    depth: f64,
-}
-
-/// A piece texture: the layer itself or another image (buffer-aligned).
-#[derive(Clone, Debug)]
-pub enum PieceTex {
-    Layer,
-    Image(Image),
-}
-
-/// What a piece-drawing effect (Card Dance, Shatter, Card Wipe) draws this frame: pieces sorted
-/// far to near over a transparent frame, textured by `front` (and `back` for pieces facing
-/// away; none = they take `front`).
-#[derive(Clone, Debug)]
-pub struct PiecePlan {
-    pub pieces: Vec<Piece>,
-    pub front: PieceTex,
-    pub back: Option<PieceTex>,
-}
-
-impl PiecePlan {
-    /// Rasterise over a transparent frame of the layer `b`'s size.
-    pub fn finish(&self, mut b: Buf) -> Buf {
-        let mut out = Image::new(b.img.width, b.img.height);
-        let front = match &self.front {
-            PieceTex::Layer => &b.img,
-            PieceTex::Image(i) => i,
-        };
-        let back = self.back.as_ref().map(|t| match t {
-            PieceTex::Layer => &b.img,
-            PieceTex::Image(i) => i,
-        });
-        draw_pieces(&mut out, &self.pieces, front, back);
-        b.img = out;
-        b
-    }
-}
-
-/// The piece plan of Card Dance, Shatter (Rendered view) or Card Wipe for layer `b` (its pixels
-/// may be read: gradient maps and textures default to the layer), `None` for other effects or
-/// views drawn otherwise.
-pub fn piece_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PiecePlan> {
-    match id {
-        "ec.sim.carddance" => Some(card_dance_plan(ctx, b)),
-        "ec.sim.shatter" if ctx.params.e("view") == 0 => match shatter_impl(ctx, b) {
-            ShatterPlan::Pieces(plan) => Some(plan),
-            ShatterPlan::Wire(_) => None,
-        },
-        "ec.transition.cardwipe" => crate::transition::card_wipe_plan(ctx, b),
-        _ => None,
-    }
-}
-
-impl Piece {
-    /// Place polygon `poly` (texture px, around rest centre `c0`) with rotation `r` and its
-    /// centre at 3D `pos` (buffer px; z away from the camera), seen through `cam`.
-    pub(crate) fn new(poly: &[[f32; 2]], c0: [f32; 2], r: &M3, pos: [f64; 3], cam: impl Into<Proj>) -> Option<Piece> {
-        let cam: Proj = cam.into();
-        let n = poly.len().min(6);
-        if n < 3 {
-            return None;
-        }
-        let m = &cam.m;
-        let row = |i: usize| -> [f64; 3] {
-            [
-                m[i][0] * r[0][0] + m[i][1] * r[1][0] + m[i][2] * r[2][0],
-                m[i][0] * r[0][1] + m[i][1] * r[1][1] + m[i][2] * r[2][1],
-                m[i][0] * pos[0] + m[i][1] * pos[1] + m[i][2] * pos[2] + m[i][3],
-            ]
-        };
-        let hm: M3 = [row(0), row(1), row(2)];
-        let mut bb = [f32::INFINITY, f32::INFINITY, f32::NEG_INFINITY, f32::NEG_INFINITY];
-        for v in &poly[..n] {
-            let (a, b) = ((v[0] - c0[0]) as f64, (v[1] - c0[1]) as f64);
-            let w = hm[2][0] * a + hm[2][1] * b + hm[2][2];
-            if w < cam.near {
-                return None;
-            }
-            let sx = ((hm[0][0] * a + hm[0][1] * b + hm[0][2]) / w) as f32;
-            let sy = ((hm[1][0] * a + hm[1][1] * b + hm[1][2]) / w) as f32;
-            bb = [bb[0].min(sx), bb[1].min(sy), bb[2].max(sx), bb[3].max(sy)];
-        }
-        let inv = inv3(&hm)?;
-        let mut pp = [[0.0f32; 2]; 6];
-        pp[..n].copy_from_slice(&poly[..n]);
-        // Normalise winding so "inside" is cross >= 0 for every edge.
-        let area: f32 = (0..n).map(|i| pp[i][0] * pp[(i + 1) % n][1] - pp[(i + 1) % n][0] * pp[i][1]).sum();
-        if area < 0.0 {
-            pp[..n].reverse();
-        }
-        // The front faces -z at rest; it faces the camera when its normal points at the eye.
-        let eye = cam.eye();
-        let nrm = [-r[0][2], -r[1][2], -r[2][2]];
-        let to_eye = [eye[0] - pos[0], eye[1] - pos[1], eye[2] - pos[2]];
-        let facing = nrm[0] * to_eye[0] + nrm[1] * to_eye[1] + nrm[2] * to_eye[2];
-        let depth = hm[2][2];
-        Some(Piece {
-            inv,
-            c0,
-            poly: pp,
-            n: n as u8,
-            bbox: [bb[0] - 1.0, bb[1] - 1.0, bb[2] + 1.0, bb[3] + 1.0],
-            shade: 1.0,
-            tint: [1.0; 3],
-            spec: [0.0; 3],
-            alpha: 1.0,
-            flat: None,
-            back: facing < 0.0,
-            back_mirror: 0,
-            depth,
-        })
-    }
-
-    /// Lambert factor of the piece normal against a light shining along +z.
-    fn facing(r: &M3) -> f32 {
-        r[2][2].abs() as f32
-    }
-
-    /// Light the piece (rotation `r`, centre `pos`) with Lighting / Material.
-    pub(crate) fn light(&mut self, l: &Lighting, r: &M3, pos: [f64; 3], eye: [f64; 3]) {
-        let (t, s) = l.shade([-r[0][2], -r[1][2], -r[2][2]], pos, eye);
-        self.tint = t;
-        self.spec = s;
-    }
-}
-
-impl From<Cam> for Proj {
-    fn from(c: Cam) -> Proj {
-        c.proj()
-    }
-}
-
-/// Draw pieces (already sorted far → near) over `out`.
-pub(crate) fn draw_pieces(out: &mut Image, pieces: &[Piece], front: &Image, back: Option<&Image>) {
-    raster(
-        out,
-        pieces,
-        |q| Some(q.bbox),
-        |q, x, y| {
-            let (xf, yf) = (x as f64, y as f64);
-            let m = &q.inv;
-            let w = m[2][0] * xf + m[2][1] * yf + m[2][2];
-            if w.abs() < 1e-12 {
-                return None;
-            }
-            let u = ((m[0][0] * xf + m[0][1] * yf + m[0][2]) / w) as f32 + q.c0[0];
-            let v = ((m[1][0] * xf + m[1][1] * yf + m[1][2]) / w) as f32 + q.c0[1];
-            let n = q.n as usize;
-            let mut md = f32::INFINITY;
-            for i in 0..n {
-                let a = q.poly[i];
-                let b = q.poly[(i + 1) % n];
-                let (ex, ey) = (b[0] - a[0], b[1] - a[1]);
-                let l = (ex * ex + ey * ey).sqrt().max(1e-6);
-                md = md.min((ex * (v - a[1]) - ey * (u - a[0])) / l);
-            }
-            // Coverage extends half a pixel past the edge so abutting pieces leave no seams.
-            let cov = (md + 1.0).clamp(0.0, 1.0);
-            if cov <= 0.0 {
-                return None;
-            }
-            let (c, a) = match q.flat {
-                Some(c) => (c, 1.0),
-                None => {
-                    let tex = if q.back { back.unwrap_or(front) } else { front };
-                    let (u, v) = match (q.back, q.back_mirror) {
-                        (true, 1) => (u, 2.0 * q.c0[1] - v),
-                        (true, 2) => (2.0 * q.c0[0] - u, v),
-                        _ => (u, v),
-                    };
-                    unpremul(tex.sample_bilinear(u as f64, v as f64))
-                }
-            };
-            let a = a * cov * q.alpha;
-            if a <= 1e-6 {
-                return None;
-            }
-            let k = q.shade;
-            let o: [f32; 3] = std::array::from_fn(|i| c[i] * k * q.tint[i] + q.spec[i]);
-            Some([o[0] * a, o[1] * a, o[2] * a, a])
-        },
-        Acc::Over,
-    );
-}
-
-pub(crate) fn sort_far_first(pieces: &mut [Piece]) {
-    pieces.sort_by(|a, b| b.depth.total_cmp(&a.depth));
-}
-
-// ------------------------------------------------------------------ CC Ball Action
-
-fn ball_action(ctx: &EffectCtx, b: Buf) -> Buf {
-    ball_action_plan(ctx, &b).finish(b)
-}
-
-/// CC Ball Action's balls (far to near), coloured by the layer's pixels.
-fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
-    let pr = ctx.params;
-    let scatter = pr.f("scatter") as f32;
-    let axis = pr.e("rotationAxis");
-    let rot = pr.f("rotation").to_radians();
-    let twist_prop = pr.e("twistProperty");
-    let twist = pr.f("twistAngle").to_radians();
-    let spacing = pr.f("gridSpacing").max(1.0) as f32;
-    let size = pr.f("ballSize") as f32 / 100.0;
-    let instab = pr.f("instabilityState").to_radians() as f32;
-    let seed = ctx.seed.wrapping_mul(0x2545f491);
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let s = b.scale as f32;
-    let nx = (lw / spacing).ceil().max(1.0) as u32;
-    let ny = (lh / spacing).ceil().max(1.0) as u32;
-    let d = 2.0 * lw.max(lh) as f64;
-    let (cx, cy) = (lw as f64 * 0.5, lh as f64 * 0.5);
-    let src = &b.img;
-    let ax: [f64; 3] = match axis {
-        0 => [1.0, 0.0, 0.0],
-        1 => [0.0, 1.0, 0.0],
-        2 => [0.0, 0.0, 1.0],
-        3 => [1.0, 1.0, 0.0],
-        4 => [1.0, 0.0, 1.0],
-        5 => [0.0, 1.0, 1.0],
-        _ => [1.0, 1.0, 1.0],
-    };
-    let maxr = ((lw * lw + lh * lh).sqrt() * 0.5).max(1.0);
-    let mut balls: Vec<(f64, Sprite)> = (0..nx * ny)
-        .into_par_iter()
-        .filter_map(|i| {
-            let gx = (i % nx) as f32 * spacing + spacing * 0.5;
-            let gy = (i / nx) as f32 * spacing + spacing * 0.5;
-            let (sx, sy) = b.to_px([gx as f64, gy as f64]);
-            let (c, a) = unpremul(src.sample_bilinear(sx, sy));
-            if a <= 0.0 || size <= 0.0 {
-                return None;
-            }
-            let tp = match twist_prop {
-                0 => gx / lw.max(1.0),
-                1 => gy / lh.max(1.0),
-                2 => ((gx - cx as f32).hypot(gy - cy as f32)) / maxr,
-                _ => crate::util::rgb3([c[0], c[1], c[2], 0.0]).iter().sum::<f32>() / 3.0,
-            } as f64;
-            let ang = rot + twist * tp;
-            // Scatter: random 3D offsets whose direction drifts with the instability state.
-            let ph = h(i, 1, seed) * std::f32::consts::TAU + instab;
-            let sc = scatter * h(i, 2, seed);
-            let off = [(sc * ph.cos()) as f64, (sc * ph.sin()) as f64, (scatter * hs(i, 3, seed)) as f64];
-            let p0 = [gx as f64 - cx + off[0], gy as f64 - cy + off[1], off[2]];
-            let m = rot_axis(ax, ang);
-            let q: [f64; 3] = std::array::from_fn(|k| m[k][0] * p0[0] + m[k][1] * p0[1] + m[k][2] * p0[2]);
-            if d + q[2] <= d * 0.05 {
-                return None;
-            }
-            let persp = d / (d + q[2]);
-            let (bx, by) = b.to_px([cx + q[0] * persp, cy + q[1] * persp]);
-            let r = spacing * 0.5 * size * persp as f32 * s;
-            Some((q[2], Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], a], Shape::Sphere)))
-        })
-        .collect();
-    balls.sort_by(|a, b| b.0.total_cmp(&a.0));
-    let sprites: Vec<Sprite> = balls.into_iter().map(|(_, s)| s).collect();
-    SpritePlan { sprites, tints: vec![], acc: Acc::Over, post: Post::Replace }
-}
-
-// ------------------------------------------------------------------ CC Pixel Polly
-
-fn pixel_polly(ctx: &EffectCtx, b: Buf) -> Buf {
-    match pixel_polly_plan(ctx, &b) {
-        Some(plan) => plan.finish(b),
-        None => b,
-    }
-}
-
-/// CC Pixel Polly's pieces, `None` before Start Time (the layer as is).
-fn pixel_polly_plan(ctx: &EffectCtx, b: &Buf) -> Option<PiecePlan> {
-    let pr = ctx.params;
-    let t = ctx.time - pr.f("startTime");
-    if t <= 0.0 {
-        return None;
-    }
-    let force = pr.f("force");
-    let gravity = pr.f("gravity");
-    let spin = pr.f("spinning").to_radians();
-    let fc = pr.v2("forceCenter");
-    let dir_rand = pr.f("directionRandomness") / 100.0;
-    let spd_rand = pr.f("speedRandomness") / 100.0;
-    let g = pr.f("gridSpacing").max(1.0);
-    let object = pr.e("object");
-    let depth_sort = pr.b("enableDepthSort");
-    let seed = ctx.seed.wrapping_mul(0x632be5ab);
-    let [lw, lh] = ctx.layer_size;
-    let s = b.scale;
-    let cam = Cam { c: [b.offset[0] + lw * 0.5 * s, b.offset[1] + lh * 0.5 * s], d: 2.0 * lw.max(lh) * s };
-    let nx = (lw / g).ceil().max(1.0) as u32;
-    let ny = (lh / g).ceil().max(1.0) as u32;
-    let tri = object <= 1;
-    let textured = object == 1 || object == 3;
-    let maxd = lw.max(lh);
-    let src = &b.img;
-    let per = if tri { 2 } else { 1 };
-    let mut pieces: Vec<Piece> = (0..nx * ny * per)
-        .into_par_iter()
-        .filter_map(|i| {
-            let cell = i / per;
-            let (x0, y0) = ((cell % nx) as f64 * g, (cell / nx) as f64 * g);
-            let poly: Vec<[f64; 2]> = if !tri {
-                vec![[x0, y0], [x0 + g, y0], [x0 + g, y0 + g], [x0, y0 + g]]
-            } else if i % 2 == 0 {
-                vec![[x0, y0], [x0 + g, y0], [x0, y0 + g]]
-            } else {
-                vec![[x0 + g, y0], [x0 + g, y0 + g], [x0, y0 + g]]
-            };
-            let c = [poly.iter().map(|v| v[0]).sum::<f64>() / poly.len() as f64, poly.iter().map(|v| v[1]).sum::<f64>() / poly.len() as f64];
-            let (dx, dy) = (c[0] - fc[0], c[1] - fc[1]);
-            let dist = (dx * dx + dy * dy).sqrt().max(1e-6);
-            let ang = dy.atan2(dx) + dir_rand * std::f64::consts::PI * hs(i, 1, seed) as f64;
-            let speed = force / 100.0 * 0.6 * maxd / (1.0 + dist / (0.5 * maxd)) * (1.0 + spd_rand * hs(i, 2, seed) as f64);
-            let vz = -speed * 0.5 * h(i, 3, seed) as f64;
-            let pos = [c[0] + ang.cos() * speed * t, c[1] + ang.sin() * speed * t + 0.5 * gravity * 0.5 * lh * t * t, vz * t];
-            let axis = [hs(i, 4, seed) as f64, hs(i, 5, seed) as f64, hs(i, 6, seed) as f64];
-            let r = rot_axis(axis, t * (std::f64::consts::PI * h(i, 7, seed) as f64 + spin));
-            let tex: Vec<[f32; 2]> = poly.iter().map(|v| [(v[0] * s + b.offset[0]) as f32, (v[1] * s + b.offset[1]) as f32]).collect();
-            let c0 = [(c[0] * s + b.offset[0]) as f32, (c[1] * s + b.offset[1]) as f32];
-            let posb = [pos[0] * s + b.offset[0], pos[1] * s + b.offset[1], pos[2] * s];
-            let mut pc = Piece::new(&tex, c0, &r, posb, cam)?;
-            pc.shade = 0.35 + 0.65 * Piece::facing(&r);
-            if !textured {
-                let (cc, a) = unpremul(src.sample_bilinear(c0[0] as f64, c0[1] as f64));
-                if a <= 0.0 {
-                    return None;
-                }
-                pc.flat = Some(cc);
-                pc.alpha = a;
-            }
-            Some(pc)
-        })
-        .collect();
-    if depth_sort {
-        sort_far_first(&mut pieces);
-    }
-    Some(PiecePlan { pieces, front: PieceTex::Layer, back: None })
-}
-
-// ------------------------------------------------------------------ CC Scatterize
-
-fn scatterize(ctx: &EffectCtx, b: Buf) -> Buf {
-    match scatterize_plan(ctx, &b) {
-        Some(plan) => plan.finish(b),
-        None => b,
-    }
-}
-
-/// CC Scatterize's pixel dots, `None` when nothing moves (the layer as is).
-fn scatterize_plan(ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
-    let pr = ctx.params;
-    let scatter = pr.f("scatter") as f32;
-    let right = pr.f("rightTwist").to_radians();
-    let left = pr.f("leftTwist").to_radians();
-    if scatter == 0.0 && right == 0.0 && left == 0.0 {
-        return None;
-    }
-    let add = pr.e("transferMode") == 1;
-    let seed = ctx.seed.wrapping_mul(0x7feb352d);
-    let s = b.scale;
-    let (w, hh) = (b.img.width, b.img.height);
-    let (cx, cy) = (b.offset[0] + ctx.layer_size[0] * 0.5 * s, b.offset[1] + ctx.layer_size[1] * 0.5 * s);
-    let half = (ctx.layer_size[0] * 0.5 * s).max(1.0);
-    let d = 2.0 * ctx.layer_size[0].max(ctx.layer_size[1]) * s;
-    let src = &b.img;
-    let sprites: Vec<Sprite> = (0..w * hh)
-        .into_par_iter()
-        .filter_map(|i| {
-            let px = src.data[i as usize];
-            if px[3] <= 0.0 {
-                return None;
-            }
-            let (x, y) = ((i % w) as f64 + 0.5, (i / w) as f64 + 0.5);
-            // Twist about the horizontal axis through the centre, growing towards each side.
-            let k = ((x - cx) / half).abs().min(1.0);
-            let ang = if x < cx { left } else { right } * k;
-            let (sa, ca) = ang.sin_cos();
-            let (yy, zz) = ((y - cy) * ca, (y - cy) * sa);
-            let persp = d / (d + zz).max(d * 0.05);
-            let jx = hs(i, 1, seed) * scatter * s as f32;
-            let jy = hs(i, 2, seed) * scatter * s as f32;
-            let sx = cx + (x - cx) * persp + jx as f64;
-            let sy = cy + yy * persp + jy as f64;
-            let (c, a) = unpremul(px);
-            Some(Sprite::new(sx as f32, sy as f32, 0.6 * persp as f32, [c[0], c[1], c[2], a], Shape::Disc))
-        })
-        .collect();
-    Some(SpritePlan { sprites, tints: vec![], acc: if add { Acc::Add } else { Acc::Over }, post: Post::Replace })
-}
-
-/// What a particle effect that reads the layer's pixels draws this frame (CC Ball Action, CC
-/// Pixel Polly, CC Scatterize, Shatter's wireframe views), for layer `b`; `None` for other
-/// effects or a frame showing the layer as is.
-pub enum PixelPlan {
-    Sprites(SpritePlan),
-    Pieces(PiecePlan),
-}
-
-/// The [`PixelPlan`] of effect `id` for layer `b` (its pixels are read).
-pub fn pixel_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PixelPlan> {
-    match id {
-        "ec.sim.ccballaction" => Some(PixelPlan::Sprites(ball_action_plan(ctx, b))),
-        "ec.sim.ccpixelpolly" => pixel_polly_plan(ctx, b).map(PixelPlan::Pieces),
-        "ec.sim.ccscatterize" => scatterize_plan(ctx, b).map(PixelPlan::Sprites),
-        "ec.sim.shatter" => Some(match shatter_impl(ctx, b) {
-            ShatterPlan::Pieces(plan) => PixelPlan::Pieces(plan),
-            ShatterPlan::Wire(plan) => PixelPlan::Sprites(plan),
-        }),
-        _ => None,
-    }
-}
-
-// ------------------------------------------------------------------ Card Dance
-
-const CD_SOURCES: &[&str] = &["None", "Intensity 1", "Red 1", "Green 1", "Blue 1", "Alpha 1", "Intensity 2", "Red 2", "Green 2", "Blue 2", "Alpha 2"];
-/// (param id prefix, twirl-down group match id) per transformed card property.
-const CD_PROPS: [(&str, &str); 8] = [
-    ("xPos", "xPosition"),
-    ("yPos", "yPosition"),
-    ("zPos", "zPosition"),
-    ("xRot", "xRotation"),
-    ("yRot", "yRotation"),
-    ("zRot", "zRotation"),
-    ("xScale", "xScale"),
-    ("yScale", "yScale"),
-];
-
-fn card_source(src: u32, g1: [f32; 4], g2: [f32; 4]) -> f32 {
-    let (c1, a1) = unpremul(g1);
-    let (c2, a2) = unpremul(g2);
-    let lum = |c: [f32; 3]| effectcraft_color::luminance(c[0], c[1], c[2]);
-    match src {
-        1 => lum(c1),
-        2 => c1[0],
-        3 => c1[1],
-        4 => c1[2],
-        5 => a1,
-        6 => lum(c2),
-        7 => c2[0],
-        8 => c2[1],
-        9 => c2[2],
-        10 => a2,
-        _ => 0.0,
-    }
-}
-
-fn card_dance(ctx: &EffectCtx, b: Buf) -> Buf {
-    card_dance_plan(ctx, &b).finish(b)
-}
-
-fn card_dance_plan(ctx: &EffectCtx, b: &Buf) -> PiecePlan {
-    let pr = ctx.params;
-    let rows = pr.f("rows").clamp(1.0, 1000.0) as u32;
-    let cols = if pr.e("rowsColumns") == 1 { rows } else { pr.f("columns").clamp(1.0, 1000.0) as u32 };
-    let g1 = layer_or_self(ctx, b, "gradientLayer1", true, true);
-    let g2 = layer_or_self(ctx, b, "gradientLayer2", true, true);
-    let back = ctx.layer_param("backLayer", true).map(|o| crate::util::fit_layer(ctx, b, &o, true));
-    let [lw, lh] = ctx.layer_size;
-    let s = b.scale;
-    let (cw, ch) = (lw / cols as f64, lh / rows as f64);
-    let cam = crate::card3d::projection(ctx, b);
-    let eye = cam.eye();
-    let light = Lighting::from(ctx, b);
-    let props: Vec<(u32, f64, f64)> =
-        CD_PROPS.iter().map(|(id, g)| (pr.e(&format!("{g}/{id}Source")), pr.f(&format!("{g}/{id}Multiplier")), pr.f(&format!("{g}/{id}Offset")))).collect();
-    let mut pieces: Vec<Piece> = (0..rows * cols)
-        .into_par_iter()
-        .filter_map(|i| {
-            let (cx0, cy0) = ((i % cols) as f64 * cw, (i / cols) as f64 * ch);
-            let c = [cx0 + cw * 0.5, cy0 + ch * 0.5];
-            let (bx, by) = (c[0] * s + b.offset[0], c[1] * s + b.offset[1]);
-            let (gp1, gp2) = (g1.sample_bilinear(bx, by), g2.sample_bilinear(bx, by));
-            let val = |k: usize| {
-                let (sr, m, o) = props[k];
-                o + m * card_source(sr, gp1, gp2) as f64
-            };
-            let (sx, sy) = (val(6), val(7));
-            let r = rot_xyz(val(3).to_radians(), val(4).to_radians(), val(5).to_radians());
-            let rs: M3 = std::array::from_fn(|k| [r[k][0] * sx, r[k][1] * sy, r[k][2]]);
-            let pos = [bx + val(0) * cw * s, by + val(1) * ch * s, val(2) * cw.max(ch) * s];
-            let (tx0, ty0) = ((cx0 * s + b.offset[0]) as f32, (cy0 * s + b.offset[1]) as f32);
-            let (tw, th) = ((cw * s) as f32, (ch * s) as f32);
-            let poly = [[tx0, ty0], [tx0 + tw, ty0], [tx0 + tw, ty0 + th], [tx0, ty0 + th]];
-            let mut pc = Piece::new(&poly, [bx as f32, by as f32], &rs, pos, cam)?;
-            pc.light(&light, &r, pos, eye);
-            Some(pc)
-        })
-        .collect();
-    sort_far_first(&mut pieces);
-    PiecePlan { pieces, front: PieceTex::Layer, back: back.map(PieceTex::Image) }
-}
-
-// ------------------------------------------------------------------ Shatter
-
-/// Shatter's Pattern options; the last, Custom, takes its pieces from Custom Shatter Map.
-const SHATTER_PATTERNS: &[&str] = &["Bricks", "Glass", "Hexagons", "Squares", "Triangles", "Custom"];
-
-/// Pattern cells (polygons in pattern space, before rotation) covering `[x0, x1]×[y0, y1]`.
-fn pattern_cells(kind: u32, cell: f64, x0: f64, y0: f64, x1: f64, y1: f64, seed: u32) -> Vec<Vec<[f64; 2]>> {
-    let mut out = Vec::new();
-    let i0 = (x0 / cell).floor() as i64 - 1;
-    let i1 = (x1 / cell).ceil() as i64 + 1;
-    let j0 = (y0 / cell).floor() as i64 - 1;
-    let j1 = (y1 / cell).ceil() as i64 + 1;
-    match kind {
-        0 => {
-            let bh = cell * 0.5;
-            let r0 = (y0 / bh).floor() as i64 - 1;
-            let r1 = (y1 / bh).ceil() as i64 + 1;
-            for r in r0..=r1 {
-                let sh = if r.rem_euclid(2) == 1 { cell * 0.5 } else { 0.0 };
-                for i in i0..=i1 {
-                    let (x, y) = (i as f64 * cell + sh, r as f64 * bh);
-                    out.push(vec![[x, y], [x + cell, y], [x + cell, y + bh], [x, y + bh]]);
-                }
-            }
-        }
-        1 => {
-            // Jittered lattice split into triangles along a random diagonal.
-            let jit = |i: i64, j: i64| -> [f64; 2] {
-                let (a, b) = (i as u32, j as u32);
-                [i as f64 * cell + hs(a, b.wrapping_add(17), seed) as f64 * cell * 0.35, j as f64 * cell + hs(a, b.wrapping_add(91), seed) as f64 * cell * 0.35]
-            };
-            for j in j0..=j1 {
-                for i in i0..=i1 {
-                    let (p00, p10, p11, p01) = (jit(i, j), jit(i + 1, j), jit(i + 1, j + 1), jit(i, j + 1));
-                    if h(i as u32, j as u32, seed ^ 0x55) < 0.5 {
-                        out.push(vec![p00, p10, p11]);
-                        out.push(vec![p00, p11, p01]);
-                    } else {
-                        out.push(vec![p00, p10, p01]);
-                        out.push(vec![p10, p11, p01]);
-                    }
-                }
-            }
-        }
-        2 => {
-            let r = cell / 3f64.sqrt();
-            let dx = 1.5 * r;
-            let dy = 3f64.sqrt() * r;
-            let c0 = (x0 / dx).floor() as i64 - 1;
-            let c1 = (x1 / dx).ceil() as i64 + 1;
-            let rr0 = (y0 / dy).floor() as i64 - 1;
-            let rr1 = (y1 / dy).ceil() as i64 + 1;
-            for ci in c0..=c1 {
-                for rj in rr0..=rr1 {
-                    let cx = ci as f64 * dx;
-                    let cy = (rj as f64 + if ci.rem_euclid(2) == 1 { 0.5 } else { 0.0 }) * dy;
-                    out.push(
-                        (0..6)
-                            .map(|k| {
-                                let a = k as f64 * std::f64::consts::PI / 3.0;
-                                [cx + r * a.cos(), cy + r * a.sin()]
-                            })
-                            .collect(),
-                    );
-                }
-            }
-        }
-        3 => {
-            for j in j0..=j1 {
-                for i in i0..=i1 {
-                    let (x, y) = (i as f64 * cell, j as f64 * cell);
-                    out.push(vec![[x, y], [x + cell, y], [x + cell, y + cell], [x, y + cell]]);
-                }
-            }
-        }
-        _ => {
-            for j in j0..=j1 {
-                for i in i0..=i1 {
-                    let (x, y) = (i as f64 * cell, j as f64 * cell);
-                    if (i + j).rem_euclid(2) == 0 {
-                        out.push(vec![[x, y], [x + cell, y], [x, y + cell]]);
-                        out.push(vec![[x + cell, y], [x + cell, y + cell], [x, y + cell]]);
-                    } else {
-                        out.push(vec![[x, y], [x + cell, y], [x + cell, y + cell]]);
-                        out.push(vec![[x, y], [x + cell, y + cell], [x, y + cell]]);
-                    }
-                }
-            }
-        }
-    }
-    out
-}
-
-/// `∫0^t e^{-ks} ds` and `∫0^t ∫0^u e^{-ks} ds du` (drag-damped ballistic factors).
-fn drag_factors(k: f64, t: f64) -> (f64, f64) {
-    if k < 1e-6 {
-        (t, 0.5 * t * t)
-    } else {
-        let e = (-k * t).exp();
-        ((1.0 - e) / k, t / k - (1.0 - e) / (k * k))
-    }
-}
-/// Shatter's Front / Side / Back Mode options.
-const SHATTER_TEXTURE_MODES: [&str; 3] = ["Color", "Layer", "Tinted Layer"];
-
-/// One face's texture: a flat colour, a layer, or a layer tinted by the Textures colour.
-struct Face {
-    mode: u32,
-    img: Option<Image>,
-}
-
-impl Face {
-    fn from(ctx: &EffectCtx, b: &Buf, mode: &str, layer: &str, default_mode: u32) -> Face {
-        let mode = ctx.params.get(mode).map(|v| v.as_enum()).unwrap_or(default_mode);
-        // A face layer of None is the effect's own layer.
-        let img = (mode != 0).then(|| layer_or_self(ctx, b, layer, true, true));
-        Face { mode, img }
-    }
-}
-
-/// Group key of a Custom Shatter Map colour (pieces of one colour break as one).
-fn map_key(c: [f32; 4]) -> u32 {
-    let (c, a) = unpremul(c);
-    if a < 0.5 {
-        return u32::MAX;
-    }
-    let q = |v: f32| ((v.clamp(0.0, 1.0) * 15.0).round() as u32) & 15;
-    q(c[0]) << 8 | q(c[1]) << 4 | q(c[2])
-}
-
-fn shatter(ctx: &EffectCtx, b: Buf) -> Buf {
-    match shatter_impl(ctx, &b) {
-        ShatterPlan::Pieces(plan) => plan.finish(b),
-        ShatterPlan::Wire(plan) => plan.finish(b),
-    }
-}
-
-/// What Shatter draws: the pieces (Rendered view) or the wireframe lines.
-enum ShatterPlan {
-    Pieces(PiecePlan),
-    Wire(SpritePlan),
-}
-
-fn shatter_impl(ctx: &EffectCtx, b: &Buf) -> ShatterPlan {
-    let pr = ctx.params;
-    let view = pr.e("view");
-    let render = pr.e("render");
-    let kind = pr.e("shape/pattern");
-    let custom = kind as usize == SHATTER_PATTERNS.len() - 1;
-    let reps = pr.f("shape/repetitions").clamp(1.0, 500.0);
-    let dir = pr.f("shape/direction").to_radians();
-    let origin = pr.v2("shape/origin");
-    let forces = [
-        (pr.v2("force1/force1Position"), pr.f("force1/force1Depth"), pr.f("force1/force1Radius"), pr.f("force1/force1Strength")),
-        (pr.v2("force2/force2Position"), pr.f("force2/force2Depth"), pr.f("force2/force2Radius"), pr.f("force2/force2Strength")),
-    ];
-    let rot_speed = pr.f("physics/rotationSpeed");
-    let tumble = pr.e("physics/tumbleAxis");
-    let randomness = pr.f("physics/randomness");
-    let k = pr.f("physics/viscosity").max(0.0) * 5.0;
-    let mass_var = pr.f("physics/massVariance") / 100.0;
-    let gravity = pr.f("physics/gravity");
-    let gdir = pr.f("physics/gravityDirection").to_radians();
-    let ginc = pr.f("physics/gravityInclination").to_radians();
-    let seed = (pr.f("randomSeed") as u32).wrapping_mul(0x9e3779b1) ^ ctx.seed;
-    let [lw, lh] = ctx.layer_size;
-    let s = b.scale;
-    let t = ctx.time.max(0.0);
-    let unit = lw * 0.1;
-    let cell = lw / reps;
-    let extrude = pr.f("shape/extrusionDepth").max(0.0) * cell * s;
-    let cam = crate::card3d::projection(ctx, b);
-    let eye = cam.eye();
-    let light = Lighting::from(ctx, b);
-    // Gradient: with a gradient layer only pieces at least as bright as 1 − Shatter Threshold
-    // (Invert Gradient: as dark) break.
-    let gradient = ctx.layer_param("gradient/gradientLayer", true).map(|o| crate::util::fit_layer(ctx, b, &o, true));
-    let threshold = pr.get("gradient/shatterThreshold").map(Value::as_f64).unwrap_or(0.0) / 100.0;
-    let invert_gradient = pr.b("gradient/invertGradient");
-    // Textures.
-    let tex_color = pr.get("textures/color").map(|v| v.as_color()).unwrap_or([1.0; 4]);
-    let tex_opacity = pr.get("textures/opacity").map(Value::as_f64).unwrap_or(1.0).clamp(0.0, 1.0) as f32;
-    let front = Face::from(ctx, b, "textures/frontMode", "textures/frontLayer", 1);
-    let side = Face::from(ctx, b, "textures/sideMode", "textures/sideLayer", 0);
-    let backf = Face::from(ctx, b, "textures/backMode", "textures/backLayer", 1);
-    let custom_map = custom.then(|| layer_or_self(ctx, b, "shape/customShatterMap", true, true));
-    let white_fixed = pr.b("shape/whiteTilesFixed");
-    let (sd, cd) = dir.sin_cos();
-    let to_layer = |q: [f64; 2]| [origin[0] + q[0] * cd - q[1] * sd, origin[1] + q[0] * sd + q[1] * cd];
-    // Pattern-space bounds of the layer rectangle.
-    let corners = [[0.0, 0.0], [lw, 0.0], [lw, lh], [0.0, lh]].map(|c: [f64; 2]| {
-        let (dx, dy) = (c[0] - origin[0], c[1] - origin[1]);
-        [dx * cd + dy * sd, -dx * sd + dy * cd]
-    });
-    let (px0, px1) = (corners.iter().map(|c| c[0]).fold(f64::INFINITY, f64::min), corners.iter().map(|c| c[0]).fold(f64::NEG_INFINITY, f64::max));
-    let (py0, py1) = (corners.iter().map(|c| c[1]).fold(f64::INFINITY, f64::min), corners.iter().map(|c| c[1]).fold(f64::NEG_INFINITY, f64::max));
-    // Custom Shatter Map: square cells grouped by the map's colour.
-    let cells = pattern_cells(if custom { 3 } else { kind }, cell, px0, py0, px1, py1, seed);
-    let polys: Vec<Vec<[f64; 2]>> = cells.iter().map(|poly| poly.iter().map(|&q| to_layer(q)).collect()).collect();
-    let centre = |lp: &[[f64; 2]]| [lp.iter().map(|v| v[0]).sum::<f64>() / lp.len() as f64, lp.iter().map(|v| v[1]).sum::<f64>() / lp.len() as f64];
-    let keys: Vec<u32> = match &custom_map {
-        Some(m) => polys
-            .iter()
-            .map(|lp| {
-                let c = centre(lp);
-                map_key(m.sample_bilinear(c[0] * s + b.offset[0], c[1] * s + b.offset[1]))
-            })
-            .collect(),
-        None => (0..polys.len() as u32).collect(),
-    };
-    // Group centres (custom map) — each group moves as one rigid piece.
-    let mut groups: std::collections::HashMap<u32, ([f64; 2], f64)> = std::collections::HashMap::new();
-    for (lp, &key) in polys.iter().zip(&keys) {
-        let c = centre(lp);
-        let e = groups.entry(key).or_insert(([0.0; 2], 0.0));
-        e.0[0] += c[0];
-        e.0[1] += c[1];
-        e.1 += 1.0;
-    }
-    let g3 = [gdir.sin() * ginc.cos() * gravity * unit, -gdir.cos() * ginc.cos() * gravity * unit, ginc.sin() * gravity * unit];
-    let mut pieces: Vec<Piece> = polys
-        .par_iter()
-        .zip(keys.par_iter())
-        .flat_map_iter(|(lp, &key)| {
-            let mut out: Vec<Piece> = vec![];
-            let (mnx, mxx) = (lp.iter().map(|v| v[0]).fold(f64::INFINITY, f64::min), lp.iter().map(|v| v[0]).fold(f64::NEG_INFINITY, f64::max));
-            let (mny, mxy) = (lp.iter().map(|v| v[1]).fold(f64::INFINITY, f64::min), lp.iter().map(|v| v[1]).fold(f64::NEG_INFINITY, f64::max));
-            if mxx < 0.0 || mxy < 0.0 || mnx > lw || mny > lh || key == u32::MAX {
-                return out.into_iter();
-            }
-            let pc_c = centre(lp);
-            let (gsum, gn) = groups[&key];
-            let gc = [gsum[0] / gn, gsum[1] / gn];
-            let i = key;
-            // Broken when inside a force sphere (centred `depth` in front of the layer).
-            let mut v = [0.0f64; 3];
-            let mut broken = false;
-            for (fp, fd, fr, fs) in forces {
-                let rad = fr * lw;
-                if rad <= 0.0 {
-                    continue;
-                }
-                let dv = [gc[0] - fp[0], gc[1] - fp[1], fd * lw];
-                let dist = (dv[0] * dv[0] + dv[1] * dv[1] + dv[2] * dv[2]).sqrt();
-                if dist < rad {
-                    broken = true;
-                    let f = fs * (1.0 - dist / rad) * unit / dist.max(1e-6);
-                    for q in 0..3 {
-                        v[q] += dv[q] * f;
-                    }
-                }
-            }
-            if broken && let Some(g) = &gradient {
-                let (c, _) = unpremul(g.sample_bilinear(gc[0] * s + b.offset[0], gc[1] * s + b.offset[1]));
-                let mut l = effectcraft_color::luminance(c[0], c[1], c[2]).clamp(0.0, 1.0) as f64;
-                if invert_gradient {
-                    l = 1.0 - l;
-                }
-                broken = threshold > 0.0 && l >= 1.0 - threshold;
-            }
-            if broken && custom && white_fixed && key == 0xfff {
-                broken = false;
-            }
-            if (broken && render == 1) || (!broken && render == 2) {
-                return out.into_iter();
-            }
-            let mut gpos = [gc[0], gc[1], 0.0];
-            let mut r = rot_axis([1.0, 0.0, 0.0], 0.0);
-            let moving = broken && t > 0.0;
-            if moving {
-                let mass = 1.0 + mass_var * hs(i, 1, seed) as f64;
-                for q in 0..3 {
-                    v[q] = v[q] / mass + randomness * unit * hs(i, 2 + q as u32, seed) as f64 * 2.0;
-                }
-                let (f1, f2) = drag_factors(k, t);
-                for q in 0..3 {
-                    gpos[q] += v[q] * f1 + g3[q] * f2;
-                }
-                let axis = match tumble {
-                    1 => [0.0, 0.0, 0.0],
-                    2 => [1.0, 0.0, 0.0],
-                    3 => [0.0, 1.0, 0.0],
-                    4 => [0.0, 0.0, 1.0],
-                    5 => [hs(i, 6, seed) as f64, hs(i, 7, seed) as f64, 0.0],
-                    6 => [hs(i, 6, seed) as f64, 0.0, hs(i, 8, seed) as f64],
-                    7 => [0.0, hs(i, 7, seed) as f64, hs(i, 8, seed) as f64],
-                    _ => [hs(i, 6, seed) as f64, hs(i, 7, seed) as f64, hs(i, 8, seed) as f64],
-                };
-                let speed = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt() / unit;
-                let omega = rot_speed * std::f64::consts::TAU * (0.5 + h(i, 9, seed) as f64) * speed.min(10.0);
-                r = rot_axis(axis, omega * f1);
-            }
-            // The piece's centre: its offset from the group centre, rotated with the group.
-            let off = [pc_c[0] - gc[0], pc_c[1] - gc[1], 0.0];
-            let pos: [f64; 3] = std::array::from_fn(|q| gpos[q] + (0..3).map(|k| r[q][k] * off[k]).sum::<f64>());
-            let tex: Vec<[f32; 2]> = lp.iter().map(|v| [(v[0] * s + b.offset[0]) as f32, (v[1] * s + b.offset[1]) as f32]).collect();
-            let c0 = [(pc_c[0] * s + b.offset[0]) as f32, (pc_c[1] * s + b.offset[1]) as f32];
-            let posb = [pos[0] * s + b.offset[0], pos[1] * s + b.offset[1], pos[2] * s];
-            let Some(mut pc) = Piece::new(&tex, c0, &r, posb, cam) else { return out.into_iter() };
-            pc.light(&light, &r, posb, eye);
-            pc.alpha = tex_opacity;
-            let face = if pc.back { &backf } else { &front };
-            if face.mode == 0 {
-                pc.flat = Some([tex_color[0], tex_color[1], tex_color[2]]);
-            } else if face.mode == 2 {
-                pc.tint = std::array::from_fn(|q| pc.tint[q] * tex_color[q]);
-            }
-            // Extrusion: the sides of a moving piece, from its front outline back by the depth.
-            if moving && extrude > 0.0 {
-                let nb = [r[0][2], r[1][2], r[2][2]];
-                let n = tex.len();
-                for e in 0..n {
-                    let (a, bv) = (tex[e], tex[(e + 1) % n]);
-                    let ed = [(bv[0] - a[0]) as f64, (bv[1] - a[1]) as f64];
-                    let len = (ed[0] * ed[0] + ed[1] * ed[1]).sqrt();
-                    if len < 1e-6 {
-                        continue;
-                    }
-                    let ew: [f64; 3] = std::array::from_fn(|q| (r[q][0] * ed[0] + r[q][1] * ed[1]) / len);
-                    let third = [ew[1] * nb[2] - ew[2] * nb[1], ew[2] * nb[0] - ew[0] * nb[2], ew[0] * nb[1] - ew[1] * nb[0]];
-                    let rs: M3 = std::array::from_fn(|q| [ew[q], nb[q], third[q]]);
-                    // Side centre in world: edge midpoint (world) plus half the depth backwards.
-                    let mid = [((a[0] + bv[0]) * 0.5 - c0[0]) as f64, ((a[1] + bv[1]) * 0.5 - c0[1]) as f64];
-                    let mw: [f64; 3] = std::array::from_fn(|q| posb[q] + r[q][0] * mid[0] + r[q][1] * mid[1] + nb[q] * extrude * 0.5);
-                    let (hl, hd) = ((len * 0.5) as f32, (extrude * 0.5) as f32);
-                    let cs = [(a[0] + bv[0]) * 0.5, (a[1] + bv[1]) * 0.5];
-                    let quad = [[cs[0] - hl, cs[1] - hd], [cs[0] + hl, cs[1] - hd], [cs[0] + hl, cs[1] + hd], [cs[0] - hl, cs[1] + hd]];
-                    if let Some(mut sp) = Piece::new(&quad, cs, &rs, mw, cam) {
-                        sp.light(&light, &rs, mw, eye);
-                        sp.alpha = tex_opacity;
-                        let colour = match (&side.img, side.mode) {
-                            (Some(img), m) if m != 0 => {
-                                let (c, _) = unpremul(img.sample_bilinear(cs[0] as f64, cs[1] as f64));
-                                if m == 2 { std::array::from_fn(|q| c[q] * tex_color[q]) } else { c }
-                            }
-                            _ => [tex_color[0], tex_color[1], tex_color[2]],
-                        };
-                        sp.flat = Some(colour);
-                        out.push(sp);
-                    }
-                }
-            }
-            out.push(pc);
-            out.into_iter()
-        })
-        .collect();
-    sort_far_first(&mut pieces);
-    if view == 0 {
-        let tex = |i: &Option<Image>| i.clone().map(PieceTex::Image);
-        let front_t = tex(&front.img).unwrap_or(PieceTex::Layer);
-        let back_t = tex(&backf.img).unwrap_or_else(|| front_t.clone());
-        return ShatterPlan::Pieces(PiecePlan { pieces, front: front_t, back: Some(back_t) });
-    }
-    {
-        // Wireframes: piece outlines (front view: at rest; otherwise animated), plus forces.
-        let animated = view == 2 || view == 4;
-        let mut lines = Vec::new();
-        for pc in &pieces {
-            let n = pc.n as usize;
-            let pts: Vec<[f32; 2]> = if animated {
-                let fw = inv3(&pc.inv);
-                match fw {
-                    Some(m) => pc.poly[..n]
-                        .iter()
-                        .map(|v| {
-                            let (a, bb) = ((v[0] - pc.c0[0]) as f64, (v[1] - pc.c0[1]) as f64);
-                            let w = m[2][0] * a + m[2][1] * bb + m[2][2];
-                            [((m[0][0] * a + m[0][1] * bb + m[0][2]) / w) as f32, ((m[1][0] * a + m[1][1] * bb + m[1][2]) / w) as f32]
-                        })
-                        .collect(),
-                    None => continue,
-                }
-            } else {
-                pc.poly[..n].to_vec()
-            };
-            for e in 0..n {
-                let (a, c) = (pts[e], pts[(e + 1) % n]);
-                lines.push(Sprite::new(a[0], a[1], 0.5, [0.75, 0.85, 1.0, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
-            }
-        }
-        if view >= 3 {
-            for (fp, _, fr, _) in forces {
-                let (fx, fy) = b.to_px(fp);
-                let rad = fr * lw * s;
-                for k in 0..64 {
-                    let (a0, a1) = (k as f64 / 64.0 * std::f64::consts::TAU, (k + 1) as f64 / 64.0 * std::f64::consts::TAU);
-                    let (x0, y0) = (fx + rad * a0.cos(), fy + rad * a0.sin());
-                    let (x1, y1) = (fx + rad * a1.cos(), fy + rad * a1.sin());
-                    lines.push(Sprite::new(x0 as f32, y0 as f32, 0.5, [1.0, 0.3, 0.3, 1.0], Shape::Line { dx: (x1 - x0) as f32, dy: (y1 - y0) as f32 }));
-                }
-            }
-        }
-        ShatterPlan::Wire(SpritePlan { sprites: lines, tints: vec![], acc: Acc::Over, post: Post::Replace })
-    }
-}
-
-// ------------------------------------------------------------------ Caustics
-
-/// Sample with repeat mode: 0 Once (transparent outside), 1 Tiled, 2 Reflected.
-fn sample_repeat(img: &Image, x: f64, y: f64, mode: u32) -> Px {
-    let (w, hh) = (img.width as f64, img.height as f64);
-    match mode {
-        1 => img.sample_bilinear_clamped(x.rem_euclid(w), y.rem_euclid(hh)),
-        2 => {
-            let m = |v: f64, n: f64| {
-                let r = v.rem_euclid(2.0 * n);
-                if r > n { 2.0 * n - r } else { r }
-            };
-            img.sample_bilinear_clamped(m(x, w), m(y, hh))
-        }
-        _ => img.sample_bilinear(x, y),
-    }
-}
-
-/// Everything Caustics' per-pixel pass needs, prepared on the CPU (the other layers it reads
-/// and the parameter conversions); the layer's own pixels are not read.
-pub struct CausticsSetup {
-    /// The Bottom layer fitted to the buffer, `None` = the layer itself.
-    pub bottom: Option<Image>,
-    /// Gaussian σ (buffer px) blurring the bottom (transparent edges), 0 = none.
-    pub bottom_sigma: f64,
-    /// The water surface's height field (smoothed luminance), `None` = flat.
-    pub height: Option<Plane>,
-    /// The Sky layer fitted to the buffer.
-    pub sky: Option<Image>,
-    pub scaling: f64,
-    pub repeat: u32,
-    pub wave_h: f64,
-    /// Displacement per unit of height gradient.
-    pub k: f64,
-    /// Layer centre (buffer px).
-    pub cx: f64,
-    pub cy: f64,
-    /// Layer width (buffer px).
-    pub lw: f64,
-    pub surf: [f32; 4],
-    pub surf_op: f32,
-    pub cstr: f32,
-    pub lc: [f32; 4],
-    pub li: f32,
-    /// Light position (buffer px) and height (layer widths); `point` = from the position to
-    /// each pixel, else one direction from above the layer centre.
-    pub lx: f64,
-    pub ly: f64,
-    pub lheight: f64,
-    pub point: bool,
-    pub ambient: f32,
-    pub diffuse: f32,
-    pub specular: f32,
-    pub sharp: f32,
-    pub sky_scaling: f64,
-    pub sky_repeat: u32,
-    pub sky_int: f32,
-    pub convergence: f64,
-}
-
-/// Caustics' setup for layer geometry `b` (see [`CausticsSetup`]).
-pub fn caustics_setup(ctx: &EffectCtx, b: &Buf) -> CausticsSetup {
-    let pr = ctx.params;
-    let s = b.scale;
-    let bottom = ctx.layer_param("bottom/bottom", true).map(|o| crate::util::fit_layer(ctx, b, &o, pr.e("bottom/bottomSizeDiffers") == 1));
-    let blur = pr.f("bottom/blur") * s;
-    let wave_h = pr.f("water/waveHeight");
-    let smoothing = pr.f("water/smoothing") * s;
-    let depth = pr.f("water/waterDepth");
-    let ior = pr.f("water/refractiveIndex").max(1.0);
-    let lpos = pr.v2("lighting/lightPosition");
-    // Height field of the water surface (luminance of the chosen layer; none = flat).
-    let height = ctx.layer_param("water/waterSurface", true).map(|o| {
-        let img = crate::util::fit_layer(ctx, b, &o, true);
-        let pl = Plane::luma(&img);
-        if smoothing > 0.05 { gauss_plane(&pl, smoothing * 0.5, smoothing * 0.5) } else { pl }
-    });
-    let lw = ctx.layer_size[0] * s;
-    let k = wave_h * depth * (1.0 - 1.0 / ior) * lw * 2.0;
-    let (cx, cy) = (b.offset[0] + ctx.layer_size[0] * 0.5 * s, b.offset[1] + ctx.layer_size[1] * 0.5 * s);
-    let (lx, ly) = b.to_px(lpos);
-    let (lc, li, lheight) = (pr.color("lighting/lightColor"), pr.f("lighting/lightIntensity") as f32, pr.f("lighting/lightHeight").max(0.01));
-    // Light Type: Distant Source (one direction, from the light position above the layer
-    // centre), Point Source (from the light position to each pixel) or First Comp Light.
-    let light_type = pr.e("lighting/lightType");
-    let comp_light = if light_type == 2 { ctx.env.host.and_then(|h| h.comp_scene()).and_then(|sc| sc.light) } else { None };
-    let (lc, li, lx, ly, lheight, point) = match (light_type, comp_light) {
-        (2, Some(l)) => {
-            let c = [l.color[0], l.color[1], l.color[2], 1.0];
-            // Comp space: z away from the viewer; the light above the water is at −z.
-            let (px, py) = (l.pos[0] * s + b.offset[0], l.pos[1] * s + b.offset[1]);
-            (c, li, px, py, (-l.pos[2] / ctx.layer_size[0].max(1.0)).max(0.01), l.kind == 1)
-        }
-        (2, None) => (lc, 0.0, lx, ly, lheight, false),
-        (1, _) => (lc, li, lx, ly, lheight, true),
-        _ => (lc, li, lx, ly, lheight, false),
-    };
-    // Sky: the layer the water surface reflects (Surface Opacity 1 = a mirror of it).
-    let sky = ctx.layer_param("sky/sky", true).map(|o| crate::util::fit_layer(ctx, b, &o, pr.e("sky/skySizeDiffers") == 1));
-    CausticsSetup {
-        bottom,
-        bottom_sigma: if blur > 0.05 { blur * 0.5 } else { 0.0 },
-        height,
-        sky,
-        scaling: pr.f("bottom/scaling").max(0.01),
-        repeat: pr.e("bottom/repeatMode"),
-        wave_h,
-        k,
-        cx,
-        cy,
-        lw,
-        surf: pr.color("water/surfaceColor"),
-        surf_op: pr.f("water/surfaceOpacity") as f32,
-        cstr: pr.f("water/causticsStrength") as f32,
-        lc,
-        li,
-        lx,
-        ly,
-        lheight,
-        point,
-        ambient: pr.f("lighting/ambientLight") as f32,
-        diffuse: pr.f("material/diffuse") as f32,
-        specular: pr.f("material/specular") as f32,
-        sharp: pr.f("material/highlightSharpness").max(1.0) as f32,
-        sky_scaling: pr.get("sky/scaling").map(Value::as_f64).unwrap_or(1.0).max(0.01),
-        sky_repeat: pr.e("sky/repeatMode"),
-        sky_int: pr.get("sky/intensity").map(Value::as_f64).unwrap_or(0.3) as f32,
-        convergence: pr.get("sky/convergence").map(Value::as_f64).unwrap_or(0.5).clamp(0.0, 1.0),
-    }
-}
-
-fn caustics(ctx: &EffectCtx, mut b: Buf) -> Buf {
-    let st = caustics_setup(ctx, &b);
-    let mut bottom = st.bottom.clone().unwrap_or_else(|| b.img.clone());
-    if st.bottom_sigma > 0.0 {
-        bottom = effectcraft_raster::gaussian_blur(&bottom, st.bottom_sigma, st.bottom_sigma, false);
-    }
-    let CausticsSetup {
-        scaling,
-        repeat,
-        wave_h,
-        k,
-        cx,
-        cy,
-        lw,
-        surf,
-        surf_op,
-        cstr,
-        lc,
-        li,
-        lx,
-        ly,
-        lheight,
-        point,
-        ambient,
-        diffuse,
-        specular,
-        sharp,
-        sky_scaling,
-        sky_repeat,
-        sky_int,
-        convergence,
-        ..
-    } = st;
-    let (height, sky) = (&st.height, &st.sky);
-    let (w, hh) = (b.img.width as usize, b.img.height as usize);
-    let norm3 = |v: [f64; 3]| {
-        let n = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt().max(1e-12);
-        [(v[0] / n) as f32, (v[1] / n) as f32, (v[2] / n) as f32]
-    };
-    let lv_at = |x: f64, y: f64| {
-        if point {
-            norm3([(lx - x) / lw.max(1.0), (ly - y) / lw.max(1.0), lheight])
-        } else {
-            norm3([(lx - cx) / lw.max(1.0), (ly - cy) / lw.max(1.0), lheight])
-        }
-    };
-    let grad = |x: usize, y: usize| -> (f64, f64) {
-        match height {
-            Some(pl) => {
-                let gx = (pl.get_clamped(x as i64 + 1, y as i64) - pl.get_clamped(x as i64 - 1, y as i64)) as f64 * 0.5;
-                let gy = (pl.get_clamped(x as i64, y as i64 + 1) - pl.get_clamped(x as i64, y as i64 - 1)) as f64 * 0.5;
-                (gx, gy)
-            }
-            None => (0.0, 0.0),
-        }
-    };
-    // Displacement and its Jacobian (caustic focusing) per pixel.
-    let disp: Vec<(f64, f64)> = (0..w * hh)
-        .into_par_iter()
-        .map(|i| {
-            let (gx, gy) = grad(i % w, i / w);
-            (-gx * k, -gy * k)
-        })
-        .collect();
-    b.img.rows_mut().for_each(|(y, row)| {
-        for (x, px) in row.iter_mut().enumerate() {
-            let i = y * w + x;
-            let (dx, dy) = disp[i];
-            let d = |xx: usize, yy: usize| disp[yy.min(hh - 1) * w + xx.min(w - 1)];
-            let (dxr, _) = d(x + 1, y);
-            let (_, dyd) = d(x, y + 1);
-            let (dxl, _) = d(x.saturating_sub(1), y);
-            let (_, dyu) = d(x, y.saturating_sub(1));
-            let jac = (1.0 + (dxr - dxl) * 0.5) * (1.0 + (dyd - dyu) * 0.5);
-            let focus = ((1.0 / jac.abs().max(0.2)) as f32 - 1.0).clamp(-1.0, 4.0);
-            let sx = cx + (x as f64 + 0.5 + dx - cx) / scaling;
-            let sy = cy + (y as f64 + 0.5 + dy - cy) / scaling;
-            let p = sample_repeat(&bottom, sx, sy, repeat);
-            let (c, a) = unpremul(p);
-            let (gx, gy) = grad(x, y);
-            let n = {
-                let v = [-gx * wave_h * 20.0, -gy * wave_h * 20.0, 1.0];
-                let m = (v[0] * v[0] + v[1] * v[1] + 1.0).sqrt();
-                [(v[0] / m) as f32, (v[1] / m) as f32, (v[2] / m) as f32]
-            };
-            let lv = lv_at(x as f64 + 0.5, y as f64 + 0.5);
-            let nl = (n[0] * lv[0] + n[1] * lv[1] + n[2] * lv[2]).max(0.0);
-            let hv = {
-                let v = [lv[0], lv[1], lv[2] + 1.0];
-                let m = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
-                [v[0] / m, v[1] / m, v[2] / m]
-            };
-            let spec = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(sharp) * specular * li;
-            let light = ambient + diffuse * li * nl + cstr * focus * li;
-            // The surface: its colour lit like the water, or the sky it reflects (sampled along
-            // the surface normal; Convergence pulls the reflection towards the pixel itself).
-            let surface: [f32; 3] = match &sky {
-                Some(sk) => {
-                    let reach = (1.0 - convergence) * lw * 0.5;
-                    let (rx, ry) = (x as f64 + 0.5 + n[0] as f64 * reach, y as f64 + 0.5 + n[1] as f64 * reach);
-                    let (rx, ry) = (cx + (rx - cx) / sky_scaling, cy + (ry - cy) / sky_scaling);
-                    let (sc, _) = unpremul(sample_repeat(sk, rx, ry, sky_repeat));
-                    std::array::from_fn(|q| sc[q] * sky_int * 3.0 * surf[q])
-                }
-                None => std::array::from_fn(|q| surf[q] * (ambient + diffuse * li * nl)),
-            };
-            let cc: [f32; 3] = std::array::from_fn(|q| {
-                let base = c[q] * light * lc[q];
-                base * (1.0 - surf_op) + surface[q] * surf_op + spec * lc[q]
-            });
-            let a = (a + surf_op * (1.0 - a)).min(1.0);
-            *px = [cc[0] * a, cc[1] * a, cc[2] * a, a];
-        }
-    });
-    b
-}
-
-// ------------------------------------------------------------------ Wave World
-
-/// Wave World's simulated surface: an `nx` × `ny` grid of heights `u` and velocities `v`.
-#[derive(Clone, Debug)]
-pub struct Waves {
-    pub nx: usize,
-    pub ny: usize,
-    pub u: Vec<f32>,
-    pub v: Vec<f32>,
-}
-
-struct Producer {
-    ring: bool,
-    pos: [f32; 2],
-    len: f32,
-    width: f32,
-    angle: f32,
-    amp: f32,
-    freq: f32,
-    phase: f32,
-}
-
-impl Producer {
-    /// Weight of a grid point (layer-fraction coordinates, x in widths, y in widths).
-    fn weight(&self, x: f32, y: f32) -> f32 {
-        let (dx, dy) = (x - self.pos[0], y - self.pos[1]);
-        let (sa, ca) = self.angle.sin_cos();
-        let (u, v) = (dx * ca + dy * sa, -dx * sa + dy * ca);
-        let d = if self.ring {
-            let (a, bb) = ((self.len * 0.5).max(1e-3), (self.width * 0.5).max(1e-3));
-            ((u / a).powi(2) + (v / bb).powi(2)).sqrt()
-        } else {
-            let l = (self.len * 0.5).max(1e-3);
-            let wd = (self.width * 0.5).max(1e-3);
-            (u.abs() / l).max(v.abs() / wd)
-        };
-        (1.0 - d).clamp(0.0, 1.0).min(1.0)
-    }
-}
-
-static WAVE_CACHE: SimCache<Waves> = SimCache::new(4);
-
-/// What Wave World draws: the Height Map view of the simulated surface (grid heights and,
-/// with a ground layer, water depths per grid point), or the wireframe preview's lines.
-pub enum WavePlan {
-    Height { st: std::sync::Arc<Waves>, depth: Option<Vec<f32>> },
-    Wire(crate::sim::SpritePlan),
-}
-
-fn wave_world(ctx: &EffectCtx, b: Buf) -> Buf {
-    match wave_world_impl(ctx, &b, false) {
-        Ok(img) => Buf { img, ..b },
-        Err(WavePlan::Wire(plan)) => plan.finish(b),
-        Err(WavePlan::Height { .. }) => b,
-    }
-}
-
-/// Wave World's simulation state for the frame, as a [`WavePlan`] (its pixels are not read).
-pub fn wave_world_plan(ctx: &EffectCtx, b: &Buf) -> Option<WavePlan> {
-    wave_world_impl(ctx, b, true).err()
-}
-
-fn wave_world_impl(ctx: &EffectCtx, b: &Buf, plan_only: bool) -> Result<Image, WavePlan> {
-    let pr = ctx.params;
-    let [lw, lh] = ctx.layer_size;
-    let res = pr.f("simulation/gridResolution").clamp(1.0, 400.0) as usize;
-    let res = if pr.b("simulation/gridResDownsamples") { ((res as f64) * b.scale).round().max(1.0) as usize } else { res };
-    let nx = res.max(2) + 1;
-    let ny = ((res as f64 * lh / lw.max(1.0)).round() as usize).max(2) + 1;
-    let speed = pr.f("simulation/waveSpeed").max(0.0) as f32;
-    let damping = pr.f("simulation/damping").max(0.0) as f32;
-    let reflect = pr.e("simulation/reflectEdges");
-    let preroll = pr.f("simulation/preRoll").max(0.0);
-    let prods: Vec<Producer> = [1, 2]
-        .iter()
-        .map(|k| {
-            let pos = pr.v2(&format!("producer{k}/producer{k}Position"));
-            Producer {
-                ring: pr.e(&format!("producer{k}/producer{k}Type")) == 0,
-                pos: [(pos[0] / lw.max(1.0)) as f32, (pos[1] / lw.max(1.0)) as f32],
-                len: pr.f(&format!("producer{k}/producer{k}Length")) as f32,
-                width: pr.f(&format!("producer{k}/producer{k}Width")) as f32,
-                angle: (pr.f(&format!("producer{k}/producer{k}Angle")) as f32).to_radians(),
-                amp: pr.f(&format!("producer{k}/producer{k}Amplitude")) as f32,
-                freq: pr.f(&format!("producer{k}/producer{k}Frequency")) as f32,
-                phase: (pr.f(&format!("producer{k}/producer{k}Phase")) as f32).to_radians(),
-            }
-        })
-        .collect();
-    let sps = crate::sim::SPS as f32;
-    // Wave speed in layer widths per second → cells per second; sub-steps keep it stable.
-    let cps = speed * (nx - 1) as f32;
-    let sub = ((cps * 2.0 / sps).ceil() as usize).clamp(1, 64);
-    let dt = 1.0 / (sps * sub as f32);
-    let cell = 1.0 / (nx - 1) as f32;
-    let weights: Vec<Vec<f32>> = prods.iter().map(|p| (0..nx * ny).map(|i| p.weight((i % nx) as f32 * cell, (i / nx) as f32 * cell)).collect()).collect();
-    // Ground: the ground layer's first frame, its luminance an elevation (× Steepness). Where
-    // it rises above Height the grid is dry (a wall the waves reflect from); shallow water
-    // slows the waves by Wave Strength.
-    let ground = pr.get("ground/ground").and_then(Value::as_layer).and_then(|id| {
-        let host = ctx.env.host?;
-        host.layer_at(id, ctx.env.comp_time - ctx.time, true)
-    });
-    let steep = pr.get("ground/steepness").map(Value::as_f64).unwrap_or(0.25) as f32;
-    let level = pr.get("ground/height").map(Value::as_f64).unwrap_or(0.25) as f32;
-    let wave_strength = pr.f("ground/waveStrength").clamp(0.0, 1.0) as f32;
-    // Water depth per grid point (None without ground: deep everywhere).
-    let depth: Option<Vec<f32>> = ground.as_ref().map(|lp| {
-        let (gw, gh) = (lp.size[0].max(1.0), lp.size[1].max(1.0));
-        (0..nx * ny)
-            .map(|i| {
-                let (fx, fy) = ((i % nx) as f64 / (nx - 1) as f64, (i / nx) as f64 / (ny - 1) as f64);
-                let (c, a) = unpremul(lp.buf.img.sample_bilinear_clamped(fx * gw * lp.buf.scale + lp.buf.offset[0], fy * gh * lp.buf.scale + lp.buf.offset[1]));
-                level - steep * effectcraft_color::luminance(c[0], c[1], c[2]) * a
-            })
-            .collect()
-    });
-    let speed_k: Vec<f32> = match &depth {
-        Some(d) => d.iter().map(|&v| if v <= 0.0 { 0.0 } else { 1.0 - wave_strength * (1.0 - (v / level.max(1e-3)).clamp(0.0, 1.0).sqrt()) }).collect(),
-        None => vec![1.0; nx * ny],
-    };
-    let mut key =
-        params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: if pr.b("simulation/gridResDownsamples") { b.scale } else { 1.0 } }, 4);
-    if let Some(d) = &depth {
-        key ^= d.iter().fold(0u64, |a, v| a.rotate_left(3) ^ v.to_bits() as u64);
-    }
-    let steps = crate::sim::steps_at(ctx.time + preroll);
-    let st = WAVE_CACHE.run(
-        key,
-        steps,
-        || Waves { nx, ny, u: vec![0.0; nx * ny], v: vec![0.0; nx * ny] },
-        |w, step| {
-            for k in 0..sub {
-                let t = (step as f32 + k as f32 / sub as f32) / sps - preroll as f32;
-                let c2 = cps * cps;
-                let mut acc = vec![0.0f32; nx * ny];
-                for y in 0..ny {
-                    for x in 0..nx {
-                        let i = y * nx + x;
-                        let g = |xx: usize, yy: usize| w.u[yy * nx + xx];
-                        let l = g(x.saturating_sub(1), y) + g((x + 1).min(nx - 1), y) + g(x, y.saturating_sub(1)) + g(x, (y + 1).min(ny - 1)) - 4.0 * w.u[i];
-                        acc[i] = c2 * speed_k[i] * speed_k[i] * l - damping * 4.0 * w.v[i];
-                    }
-                }
-                for i in 0..nx * ny {
-                    w.v[i] += acc[i] * dt;
-                    w.u[i] += w.v[i] * dt;
-                }
-                // Producers drive the surface.
-                for (p, wt) in prods.iter().zip(&weights) {
-                    if p.amp == 0.0 {
-                        continue;
-                    }
-                    let target = p.amp * (std::f32::consts::TAU * p.freq * t + p.phase).sin();
-                    for i in 0..nx * ny {
-                        if wt[i] > 0.0 {
-                            w.u[i] += (target - w.u[i]) * wt[i];
-                            w.v[i] *= 1.0 - wt[i];
-                        }
-                    }
-                }
-                // Dry ground holds the surface flat.
-                for i in 0..nx * ny {
-                    if speed_k[i] <= 0.0 {
-                        w.u[i] = 0.0;
-                        w.v[i] = 0.0;
-                    }
-                }
-                // Edges: reflective ones mirror; the others absorb in a thin sponge layer.
-                let refl = |side: u32| reflect == 5 || reflect == side;
-                let sponge = 4usize.min(nx / 4).max(1);
-                for y in 0..ny {
-                    for x in 0..nx {
-                        let i = y * nx + x;
-                        let mut f = 1.0f32;
-                        if !refl(1) && x < sponge {
-                            f = f.min(x as f32 / sponge as f32);
-                        }
-                        if !refl(3) && nx - 1 - x < sponge {
-                            f = f.min((nx - 1 - x) as f32 / sponge as f32);
-                        }
-                        if !refl(2) && y < sponge {
-                            f = f.min(y as f32 / sponge as f32);
-                        }
-                        if !refl(4) && ny - 1 - y < sponge {
-                            f = f.min((ny - 1 - y) as f32 / sponge as f32);
-                        }
-                        if f < 1.0 {
-                            let k = 0.85 + 0.15 * f;
-                            w.u[i] *= k;
-                            w.v[i] *= k;
-                        }
-                    }
-                }
-            }
-        },
-    );
-    let s = b.scale;
-    let (bw, bh) = (b.img.width, b.img.height);
-    let sample = |x: f64, y: f64| -> f32 {
-        let gx = (x / lw.max(1.0) * (st.nx - 1) as f64).clamp(0.0, (st.nx - 1) as f64);
-        let gy = (y / lw.max(1.0) * (st.nx - 1) as f64).clamp(0.0, (st.ny - 1) as f64);
-        let (x0, y0) = (gx.floor() as usize, gy.floor() as usize);
-        let (x1, y1) = ((x0 + 1).min(st.nx - 1), (y0 + 1).min(st.ny - 1));
-        let (tx, ty) = ((gx - x0 as f64) as f32, (gy - y0 as f64) as f32);
-        let g = |xx: usize, yy: usize| st.u[yy * st.nx + xx];
-        let a = g(x0, y0) + (g(x1, y0) - g(x0, y0)) * tx;
-        let c = g(x0, y1) + (g(x1, y1) - g(x0, y1)) * tx;
-        a + (c - a) * ty
-    };
-    if plan_only && pr.e("view") == 1 {
-        return Err(WavePlan::Height { st, depth });
-    }
-    if pr.e("view") == 1 {
-        let mut img = Image::new(bw, bh);
-        let bright = pr.f("heightMapControls/brightness") as f32;
-        let contrast = pr.f("heightMapControls/contrast") as f32;
-        let gamma = pr.f("heightMapControls/gamma").max(0.01) as f32;
-        let alpha = 1.0 - pr.f("heightMapControls/transparency") as f32;
-        let dry_transparent = pr.e("heightMapControls/renderDryAreasAs") == 1;
-        let dry_at = |x: f64, y: f64| -> bool {
-            let Some(d) = &depth else { return false };
-            let gx = (x / lw.max(1.0) * (st.nx - 1) as f64).round().clamp(0.0, (st.nx - 1) as f64) as usize;
-            let gy = (y / lw.max(1.0) * (st.nx - 1) as f64).round().clamp(0.0, (st.ny - 1) as f64) as usize;
-            d[gy * st.nx + gx] <= 0.0
-        };
-        img.rows_mut().for_each(|(y, row)| {
-            for (x, px) in row.iter_mut().enumerate() {
-                let lx = (x as f64 + 0.5 - b.offset[0]) / s;
-                let ly = (y as f64 + 0.5 - b.offset[1]) / s;
-                let v = (bright + contrast * sample(lx, ly)).clamp(0.0, 1.0).powf(1.0 / gamma);
-                let al = if dry_transparent && dry_at(lx, ly) { 0.0 } else { alpha };
-                *px = [v * al, v * al, v * al, al];
-            }
-        });
-        Ok(img)
-    } else {
-        // Wireframe preview: the grid turned by Horizontal Rotation about the vertical axis,
-        // tilted by Vertical Rotation, heights scaled by Vertical Scale.
-        let hr = pr.f("wireframeControls/horizontalRotation").to_radians();
-        let vr = pr.get("wireframeControls/verticalRotation").map(Value::as_f64).unwrap_or(53.0).to_radians();
-        let vs = pr.get("wireframeControls/verticalScale").map(Value::as_f64).unwrap_or(0.5);
-        let (sh, ch) = hr.sin_cos();
-        let (sv, cv) = vr.sin_cos();
-        let to = |x: usize, y: usize| -> [f32; 2] {
-            // Grid point relative to the layer centre (layer px), height in layer px.
-            let gx = x as f64 / (st.nx - 1) as f64 * lw - lw * 0.5;
-            let gy = y as f64 / (st.nx - 1) as f64 * lw - (st.ny - 1) as f64 / (st.nx - 1) as f64 * lw * 0.5;
-            let hgt = st.u[y * st.nx + x] as f64 * vs * lh * 0.5;
-            let (rx, ry) = (gx * ch - gy * sh, gx * sh + gy * ch);
-            let (px, py) = b.to_px([lw * 0.5 + rx, lh * 0.5 + ry * cv - hgt * sv]);
-            [px as f32, py as f32]
-        };
-        let mut lines = Vec::new();
-        for y in 0..st.ny {
-            for x in 0..st.nx {
-                let a = to(x, y);
-                if x + 1 < st.nx {
-                    let c = to(x + 1, y);
-                    lines.push(Sprite::new(a[0], a[1], 0.4, [0.4, 0.9, 0.4, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
-                }
-                if y + 1 < st.ny {
-                    let c = to(x, y + 1);
-                    lines.push(Sprite::new(a[0], a[1], 0.4, [0.4, 0.9, 0.4, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
-                }
-            }
-        }
-        let plan = crate::sim::SpritePlan { sprites: lines, tints: vec![], acc: Acc::Over, post: crate::sim::Post::OverBlack };
-        if plan_only {
-            return Err(WavePlan::Wire(plan));
-        }
-        Ok(plan.finish(Buf { img: Image::new(bw, bh), offset: b.offset, scale: b.scale }).img)
-    }
-}
-
-// ------------------------------------------------------------------ Foam
-
-#[derive(Clone, Debug)]
-struct FoamBubble {
-    p: [f32; 2],
-    v: [f32; 2],
-    age: f32,
-    size: f32,
-    /// Spin (radians) for Physical Orientation.
-    spin: f32,
-    id: u32,
-}
-
-#[derive(Clone, Debug, Default)]
-struct FoamState {
-    b: Vec<FoamBubble>,
-    carry: f32,
-    next: u32,
-}
-
-static FOAM_CACHE: SimCache<FoamState> = SimCache::new(4);
-
-/// Foam steps once per frame at 30 frames per second.
-const FOAM_FPS: f64 = 30.0;
-
-/// Foam's Bubble Texture options (the last uses Bubble Texture Layer).
-const FOAM_TEXTURES: [&str; 6] = ["Default Bubble", "Spit", "Bubblegum", "Dishwater", "Milky", "User Defined"];
-
-/// Age (in simulation steps) at which bubble `id` pops: its lifespan, shortened at random for
-/// frail bubbles (`frailty` 0 = every bubble reaches `lifespan`, 1 = uniformly early).
-fn foam_pop_age(id: u32, lifespan: f32, frailty: f32, seed: u32) -> f32 {
-    lifespan * (1.0 - frailty * (hs(id, 11, seed) * 0.5 + 0.5))
-}
-
-/// Foam: bubbles born in the producer rectangle grow to their size, drift with the wind,
-/// turbulence and the Flow Map (bubbles run downhill on its luminance), repel and stick to each
-/// other, wobble, and pop at the end of their (Strength-shortened) lifespan, pushing their
-/// neighbours away at Pop Velocity. Rendered bubbles use a built-in texture or the Bubble
-/// Texture Layer, oriented by Bubble Orientation, and reflect the Environment Map.
-fn foam(ctx: &EffectCtx, b: Buf) -> Buf {
-    foam_full_plan(ctx, &b).finish(b)
-}
-
-/// Foam's bubbles as sprites, `None` when it draws more than sprites (a User Defined bubble
-/// texture, an Environment Map reflection or the Draft + Flow Map view's flow map).
-pub(crate) fn foam_plan(ctx: &EffectCtx, b: &Buf) -> Option<crate::sim::SpritePlan> {
-    let plan = foam_full_plan(ctx, b);
-    (plan.user.is_none() && plan.env.is_none() && plan.flow.is_none()).then_some(plan.sprites)
-}
-
-/// A bubble disc filled by Foam's User Defined texture (buffer px; `rot` radians).
-#[derive(Clone, Copy, Debug)]
-pub struct FoamDisc {
-    pub x: f64,
-    pub y: f64,
-    pub r: f32,
-    pub rot: f32,
-    pub fade: f32,
-}
-
-/// Foam's Environment Map reflection: the map fitted to the buffer, Reflection Convergence and
-/// Strength, and the bubble discs reflecting it (`rot` and `fade` unused).
-pub struct FoamEnv {
-    pub img: Image,
-    pub conv: f64,
-    pub strength: f32,
-    pub discs: Vec<FoamDisc>,
-}
-
-/// What Foam draws this frame over a transparent frame of the layer's size: the bubble sprites,
-/// then the User Defined texture's discs, the Environment Map's reflections and (Draft + Flow
-/// Map) the flow map under it all, each [`foam_disc`]-composited in bubble order.
-pub struct FoamPlan {
-    pub sprites: crate::sim::SpritePlan,
-    pub user: Option<(crate::LayerPixels, Vec<FoamDisc>)>,
-    pub env: Option<FoamEnv>,
-    /// The flow map fitted to the buffer.
-    pub flow: Option<Image>,
-}
-
-impl FoamPlan {
-    pub fn finish(&self, b: Buf) -> Buf {
-        let mut out = splat(b.img.width, b.img.height, &self.sprites.sprites, self.sprites.acc);
-        // User Defined: the texture layer fills each bubble's disc.
-        if let Some((tex, discs)) = &self.user {
-            for d in discs {
-                let (rot, fade) = (d.rot, d.fade);
-                foam_disc(&mut out, d.x, d.y, d.r as f64, |u, v| {
-                    // u, v in −1..1 across the bubble, rotated into the texture.
-                    let (sr, cr) = rot.sin_cos();
-                    let (tu, tv) = (u as f32 * cr + v as f32 * sr, -u as f32 * sr + v as f32 * cr);
-                    let (x, y) = ((tu as f64 * 0.5 + 0.5) * tex.size[0], (tv as f64 * 0.5 + 0.5) * tex.size[1]);
-                    let px = tex.buf.img.sample_bilinear(x * tex.buf.scale + tex.buf.offset[0], y * tex.buf.scale + tex.buf.offset[1]);
-                    px.map(|c| c * fade)
-                });
-            }
-        }
-        // Environment Map: each bubble reflects the map along its sphere normal (Reflection
-        // Convergence pulls the reflection towards the bubble's own spot of the map).
-        if let Some(env) = &self.env {
-            let (conv, strength) = (env.conv, env.strength);
-            let (w, h) = (b.img.width as f64, b.img.height as f64);
-            for d in &env.discs {
-                let (bx, by) = (d.x, d.y);
-                foam_disc(&mut out, bx, by, d.r as f64, |u, v| {
-                    // Sphere normal; the reflection looks across the whole map, or (convergence 1)
-                    // just behind the bubble.
-                    let (ex, ey) =
-                        if conv >= 1.0 { (bx, by) } else { (bx * conv + (u * 0.5 + 0.5) * w * (1.0 - conv), by * conv + (v * 0.5 + 0.5) * h * (1.0 - conv)) };
-                    let e = env.img.sample_bilinear(ex, ey);
-                    let rim = ((u * u + v * v) as f32).min(1.0);
-                    let k = strength * (0.3 + 0.7 * rim);
-                    [e[0] * k, e[1] * k, e[2] * k, 0.0]
-                });
-            }
-        }
-        // Draft + Flow Map shows the flow map under the bubbles.
-        if let Some(fm) = &self.flow {
-            out.data.par_iter_mut().zip(fm.data.par_iter()).for_each(|(o, f)| {
-                let k = 1.0 - o[3];
-                for c in 0..4 {
-                    o[c] += f[c] * 0.5 * k;
-                }
-            });
-        }
-        Buf { img: out, ..b }
-    }
-}
-
-/// Foam's [`FoamPlan`] for layer geometry `b` (its size; its pixels are not read).
-pub fn foam_full_plan(ctx: &EffectCtx, b: &Buf) -> FoamPlan {
-    let pr = ctx.params;
-    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
-    let unit = lw * 0.01;
-    let prod = pr.v2("producer/producerPoint");
-    let (psx, psy) = (pr.f("producer/producerXSize") as f32 * lw, pr.f("producer/producerYSize") as f32 * lh);
-    let porient = (pr.f("producer/producerOrientation") as f32).to_radians();
-    let rate = pr.f("producer/productionRate").max(0.0) as f32;
-    let size = pr.f("bubbles/size").max(0.0) as f32;
-    let size_var = pr.f("bubbles/sizeVariance") as f32;
-    let lifespan = pr.f("bubbles/lifespan").max(1.0) as f32;
-    let growth = pr.f("bubbles/growthSpeed").max(0.0001) as f32;
-    // Strength: weaker bubbles tend to pop before their lifespan (at 20 or more every bubble
-    // lives the full lifespan); each bubble gets its own pop age.
-    let frailty = 1.0 - (pr.f("bubbles/strength") as f32 / 20.0).clamp(0.0, 1.0);
-    let init_speed = pr.f("physics/initialSpeed") as f32;
-    let init_dir = (pr.f("physics/initialDirection") as f32).to_radians();
-    let wind = pr.f("physics/windSpeed") as f32;
-    let wind_dir = (pr.f("physics/windDirection") as f32).to_radians();
-    let turb = pr.f("physics/turbulence") as f32;
-    let wobble = pr.f("physics/wobbleAmount").max(0.0) as f32;
-    let repulsion = pr.f("physics/repulsion") as f32;
-    let pop_velocity = pr.f("physics/popVelocity") as f32;
-    let viscosity = pr.f("physics/viscosity").clamp(0.0, 1.0) as f32;
-    let sticky = pr.f("physics/stickiness").clamp(0.0, 1.0) as f32;
-    let universe = pr.f("universeSize").max(0.01) as f32;
-    let seed = (pr.f("randomSeed") as u32).wrapping_mul(0x68e31da4) ^ ctx.seed;
-    let wvec = [wind_dir.sin() * wind * unit, -wind_dir.cos() * wind * unit];
-    // Flow Map: the map layer's first frame, its luminance a height field (Fits the layer or
-    // the whole universe).
-    let flow = pr.get("flowMap/flowMap").and_then(Value::as_layer).and_then(|id| {
-        let host = ctx.env.host?;
-        let me = pr.get(&crate::layer_source_id("flowMap/flowMap")).is_none_or(|v| v.as_enum() != 0);
-        host.layer_at(id, ctx.env.comp_time - ctx.time, me)
-    });
-    let steep = pr.f("flowMap/flowMapSteepness") as f32;
-    let fits_universe = pr.e("flowMap/flowMapFits") == 1;
-    let substeps = match pr.e("flowMap/simulationQuality") {
-        1 => 2,
-        2 => 4,
-        _ => 1,
-    };
-    let height = flow.as_ref().map(|lp| {
-        let img = &lp.buf.img;
-        let pl = Plane::from_image(img, |px| {
-            let (c, a) = unpremul(px);
-            effectcraft_color::luminance(c[0], c[1], c[2]) * a
-        });
-        (pl, lp.buf.scale, lp.buf.offset, lp.size)
-    });
-    let (ux0, uy0) = (-(universe - 1.0) * 0.5 * lw, -(universe - 1.0) * 0.5 * lh);
-    let (ux1, uy1) = (lw - ux0, lh - uy0);
-    // Height at a layer point (0..1).
-    let h_at = |x: f32, y: f32| -> f32 {
-        let Some((pl, s, off, size)) = &height else { return 0.0 };
-        let (fx, fy) = if fits_universe { ((x - ux0) / (ux1 - ux0), (y - uy0) / (uy1 - uy0)) } else { (x / lw, y / lh) };
-        pl.sample(fx as f64 * size[0] * s + off[0], fy as f64 * size[1] * s + off[1])
-    };
-    let mut key = params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, 5);
-    if let Some((pl, ..)) = &height {
-        key ^= pl.data.iter().step_by(5).fold(0u64, |a, v| a.rotate_left(3) ^ v.to_bits() as u64);
-    }
-    let steps = if ctx.time <= 0.0 { 0 } else { (ctx.time * FOAM_FPS + 1e-6).floor() as u64 };
-    let rad = |q: &FoamBubble| q.size * unit * 3.0 * (q.age * growth).min(1.0);
-    let st = FOAM_CACHE.run(key, steps, FoamState::default, |st, step| {
-        let t = step as f32 / FOAM_FPS as f32;
-        // Births.
-        st.carry += rate;
-        let n = st.carry.floor() as u32;
-        st.carry -= n as f32;
-        for _ in 0..n {
-            if st.b.len() >= 3000 {
-                break;
-            }
-            let id = st.next;
-            st.next = st.next.wrapping_add(1);
-            let (ux, uy) = (hs(id, 1, seed) * 0.5 * psx, hs(id, 2, seed) * 0.5 * psy);
-            let (so, co) = porient.sin_cos();
-            let p = [prod[0] as f32 + ux * co - uy * so, prod[1] as f32 + ux * so + uy * co];
-            let v = [init_dir.sin() * init_speed * unit, -init_dir.cos() * init_speed * unit];
-            let sz = (size * (1.0 + size_var * hs(id, 3, seed))).max(0.01);
-            st.b.push(FoamBubble { p, v, age: 0.0, size: sz, spin: hs(id, 12, seed) * std::f32::consts::PI, id });
-        }
-        for _ in 0..substeps {
-            let k = 1.0 / substeps as f32;
-            // Forces: drift towards the wind, turbulence, viscosity, the flow map's slope.
-            for q in st.b.iter_mut() {
-                let n1 = value_noise(q.p[0] / (lw * 0.15), q.p[1] / (lw * 0.15), t * 0.5, seed) - 0.5;
-                let n2 = value_noise(q.p[0] / (lw * 0.15) + 19.0, q.p[1] / (lw * 0.15), t * 0.5, seed) - 0.5;
-                for c in 0..2 {
-                    q.v[c] += (wvec[c] - q.v[c]) * 0.1 * k;
-                    q.v[c] *= 1.0 - viscosity * 0.5 * k;
-                }
-                q.v[0] += n1 * turb * unit * k;
-                q.v[1] += n2 * turb * unit * k;
-                if height.is_some() && steep != 0.0 {
-                    let e = unit.max(1.0);
-                    let gx = (h_at(q.p[0] + e, q.p[1]) - h_at(q.p[0] - e, q.p[1])) / (2.0 * e);
-                    let gy = (h_at(q.p[0], q.p[1] + e) - h_at(q.p[0], q.p[1] - e)) / (2.0 * e);
-                    // Downhill: from light (high) to dark (low).
-                    q.v[0] -= gx * steep * lw * 0.5 * k;
-                    q.v[1] -= gy * steep * lw * 0.5 * k;
-                }
-                // Physical Orientation: bubbles roll with their sideways motion.
-                q.spin += q.v[0] / (rad(q).max(0.5)) * k;
-            }
-            // Repulsion between overlapping bubbles (grid hashed, deterministic order).
-            if repulsion > 0.0 && st.b.len() > 1 {
-                let maxr = st.b.iter().map(rad).fold(0.0f32, f32::max).max(1.0);
-                let cs = maxr * 2.0;
-                let mut grid: std::collections::HashMap<(i32, i32), Vec<usize>> = std::collections::HashMap::new();
-                for (i, q) in st.b.iter().enumerate() {
-                    grid.entry(((q.p[0] / cs).floor() as i32, (q.p[1] / cs).floor() as i32)).or_default().push(i);
-                }
-                let mut push = vec![[0.0f32; 2]; st.b.len()];
-                for (i, q) in st.b.iter().enumerate() {
-                    let (gx, gy) = ((q.p[0] / cs).floor() as i32, (q.p[1] / cs).floor() as i32);
-                    for dy in -1..=1 {
-                        for dx in -1..=1 {
-                            let Some(list) = grid.get(&(gx + dx, gy + dy)) else { continue };
-                            for &j in list {
-                                if j <= i {
-                                    continue;
-                                }
-                                let o = &st.b[j];
-                                let (ddx, ddy) = (o.p[0] - q.p[0], o.p[1] - q.p[1]);
-                                let d = (ddx * ddx + ddy * ddy).sqrt().max(1e-4);
-                                let overlap = rad(q) + rad(o) - d;
-                                if overlap > 0.0 {
-                                    let f = overlap * 0.5 * repulsion.min(4.0) * (1.0 - sticky * 0.5) / d * k;
-                                    push[i][0] -= ddx * f;
-                                    push[i][1] -= ddy * f;
-                                    push[j][0] += ddx * f;
-                                    push[j][1] += ddy * f;
-                                }
-                            }
-                        }
-                    }
-                }
-                for (q, d) in st.b.iter_mut().zip(&push) {
-                    q.p[0] += d[0].clamp(-maxr, maxr);
-                    q.p[1] += d[1].clamp(-maxr, maxr);
-                }
-            }
-            for q in st.b.iter_mut() {
-                q.p[0] += q.v[0] * k;
-                q.p[1] += q.v[1] * k;
-            }
-        }
-        for q in st.b.iter_mut() {
-            q.age += 1.0;
-        }
-        // Pops: bubbles past their pop age burst, pushing their neighbours away.
-        let popped: Vec<([f32; 2], f32)> = st.b.iter().filter(|q| q.age >= foam_pop_age(q.id, lifespan, frailty, seed)).map(|q| (q.p, rad(q))).collect();
-        if pop_velocity != 0.0 {
-            for (pp, pr_) in &popped {
-                let reach = (pr_ * 3.0).max(unit);
-                for q in st.b.iter_mut() {
-                    let (dx, dy) = (q.p[0] - pp[0], q.p[1] - pp[1]);
-                    let d = (dx * dx + dy * dy).sqrt();
-                    if d > 1e-4 && d < reach {
-                        let f = pop_velocity * unit * (1.0 - d / reach) / d;
-                        q.v[0] += dx * f;
-                        q.v[1] += dy * f;
-                    }
-                }
-            }
-        }
-        st.b.retain(|q| q.age < foam_pop_age(q.id, lifespan, frailty, seed) && q.p[0] > ux0 && q.p[0] < ux1 && q.p[1] > uy0 && q.p[1] < uy1);
-    });
-    let view = pr.e("view");
-    let zoom = pr.f("zoom").max(0.01) as f32;
-    let zoom_producer = pr.b("producer/zoomProducerPoint");
-    let texture = pr.e("rendering/bubbleTexture");
-    let orient = pr.e("rendering/bubbleOrientation");
-    let blend = pr.e("rendering/blendMode");
-    let s = b.scale as f32;
-    // Zoom centres on the layer, or on the producer with Zoom Producer Point.
-    let (cx, cy) = if zoom_producer { (prod[0] as f32, prod[1] as f32) } else { (lw * 0.5, lh * 0.5) };
-    let mut order: Vec<&FoamBubble> = st.b.iter().collect();
-    if blend == 2 {
-        // Solid New on Top: oldest first.
-        order.sort_by(|a, c| c.age.total_cmp(&a.age).then(a.id.cmp(&c.id)));
-    } else if blend == 1 {
-        order.sort_by(|a, c| a.age.total_cmp(&c.age).then(a.id.cmp(&c.id)));
-    }
-    // Where a bubble is drawn: buffer centre, radius, rotation (radians).
-    let place = |q: &FoamBubble| {
-        let wob = if wobble > 0.0 { 1.0 + wobble * 0.15 * ((q.age * 0.35) + hs(q.id, 13, seed) * 6.0).sin() } else { 1.0 };
-        let r = rad(q) * wob * zoom * s;
-        let (bx, by) = b.to_px([(cx + (q.p[0] - cx) * zoom) as f64, (cy + (q.p[1] - cy) * zoom) as f64]);
-        let rot = match orient {
-            1 => q.spin,
-            2 => q.v[1].atan2(q.v[0]),
-            _ => 0.0,
-        };
-        (bx, by, r, rot)
-    };
-    let user_tex = (view == 2 && texture == 5).then(|| ctx.layer_param("rendering/bubbleTextureLayer", true)).flatten();
-    let sprites: Vec<Sprite> = order
-        .iter()
-        .filter(|_| user_tex.is_none())
-        .map(|q| {
-            let (bx, by, r, rot) = place(q);
-            let fade = ((foam_pop_age(q.id, lifespan, frailty, seed) - q.age) / 5.0).clamp(0.0, 1.0);
-            // Draft and Draft + Flow Map show the wireframe-style bubbles.
-            let mut sp = if view != 2 {
-                Sprite::new(bx as f32, by as f32, r, [0.55, 0.75, 1.0, fade], Shape::Bubble)
-            } else {
-                let (c, shape) = match texture {
-                    1 => ([0.95, 0.95, 0.92], Shape::Faded),
-                    2 => ([1.0, 0.6, 0.8], Shape::Bubble),
-                    3 => ([0.8, 0.85, 0.75], Shape::Bubble),
-                    4 => ([0.97, 0.97, 0.95], Shape::Sphere),
-                    _ => ([1.0, 1.0, 1.0], Shape::Bubble),
-                };
-                Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], fade], shape)
-            };
-            sp.rot = rot;
-            sp
-        })
-        .collect();
-    let acc = if blend == 0 && view == 2 { Acc::Add } else { Acc::Over };
-    let disc = |q: &&FoamBubble| {
-        let (x, y, r, rot) = place(q);
-        let fade = ((foam_pop_age(q.id, lifespan, frailty, seed) - q.age) / 5.0).clamp(0.0, 1.0);
-        FoamDisc { x, y, r, rot, fade }
-    };
-    let user = user_tex.map(|tex| (tex, order.iter().map(disc).collect()));
-    let strength = pr.f("rendering/reflectionStrength").clamp(0.0, 1.0) as f32;
-    let env = if view == 2
-        && strength > 0.0
-        && let Some(env) = ctx.layer_param("rendering/environmentMap", true)
-    {
-        Some(FoamEnv {
-            img: crate::util::fit_layer(ctx, b, &env, true),
-            conv: pr.f("rendering/reflectionConvergence").clamp(0.0, 1.0),
-            strength,
-            discs: order.iter().map(disc).collect(),
-        })
-    } else {
-        None
-    };
-    let flow = if view == 1
-        && let Some(lp) = &flow
-    {
-        Some(crate::util::fit_layer(ctx, b, lp, true))
-    } else {
-        None
-    };
-    FoamPlan { sprites: crate::sim::SpritePlan { sprites, tints: vec![], acc, post: crate::sim::Post::Replace }, user, env, flow }
-}
-
-/// Add `f(u, v)` (premultiplied; u, v ∈ −1..1 across the disc) over the disc of radius `r` at
-/// (`x`, `y`) with anti-aliased edges ("over" for opaque texels, additive for alpha 0).
-fn foam_disc(out: &mut Image, x: f64, y: f64, r: f64, f: impl Fn(f64, f64) -> Px) {
-    if r <= 0.0 {
-        return;
-    }
-    let (x0, x1) = ((x - r - 1.0).floor().max(0.0) as i64, (x + r + 1.0).ceil().min(out.width as f64) as i64);
-    let (y0, y1) = ((y - r - 1.0).floor().max(0.0) as i64, (y + r + 1.0).ceil().min(out.height as f64) as i64);
-    for py in y0..y1 {
-        for px in x0..x1 {
-            let (u, v) = ((px as f64 + 0.5 - x) / r, (py as f64 + 0.5 - y) / r);
-            let d = (u * u + v * v).sqrt();
-            let cov = ((1.0 - d) * r + 0.5).clamp(0.0, 1.0) as f32;
-            if cov <= 0.0 {
-                continue;
-            }
-            let s = f(u.clamp(-1.0, 1.0), v.clamp(-1.0, 1.0)).map(|c| c * cov);
-            let o = out.get(px, py);
-            let k = 1.0 - s[3];
-            out.set(px as u32, py as u32, [s[0] + o[0] * k, s[1] + o[1] * k, s[2] + o[2] * k, (s[3] + o[3] * k).min(1.0)]);
-        }
-    }
-}
-
-// ------------------------------------------------------------------ specs
-
-fn producer_params(k: u32, amp: f64, pos: (f64, f64)) -> Vec<crate::ParamSpec> {
-    let ids: [&'static str; 8] = match k {
-        1 => [
-            "producer1/producer1Type",
-            "producer1/producer1Position",
-            "producer1/producer1Length",
-            "producer1/producer1Width",
-            "producer1/producer1Angle",
-            "producer1/producer1Amplitude",
-            "producer1/producer1Frequency",
-            "producer1/producer1Phase",
-        ],
-        _ => [
-            "producer2/producer2Type",
-            "producer2/producer2Position",
-            "producer2/producer2Length",
-            "producer2/producer2Width",
-            "producer2/producer2Angle",
-            "producer2/producer2Amplitude",
-            "producer2/producer2Frequency",
-            "producer2/producer2Phase",
-        ],
-    };
-    vec![
-        p(ids[0], "Type", Value::Enum(0), popup(&["Ring", "Line"])),
-        p(ids[1], "Position", pt(pos.0, pos.1), ParamUi::Point),
-        p(ids[2], "Height/Length", num(0.1), slider(0.0, 2.0, 0.0, 1.0, 3)),
-        p(ids[3], "Width", num(0.1), slider(0.0, 2.0, 0.0, 1.0, 3)),
-        p(ids[4], "Angle", num(0.0), ParamUi::Angle),
-        p(ids[5], "Amplitude", num(amp), slider(-5.0, 5.0, -1.0, 1.0, 3)),
-        p(ids[6], "Frequency", num(1.0), slider(0.0, 30.0, 0.0, 5.0, 3)),
-        p(ids[7], "Phase", num(0.0), ParamUi::Angle),
-    ]
-}
-
-fn card_dance_params() -> Vec<crate::ParamSpec> {
-    let mut v = vec![
-        p("rowsColumns", "Rows & Columns", Value::Enum(0), popup(&["Independent", "Columns Follows Rows"])),
-        p("rows", "Rows", num(10.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
-        p("columns", "Columns", num(10.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
-        p("backLayer", "Back Layer", Value::Layer(None), ParamUi::Layer),
-        p("gradientLayer1", "Gradient Layer 1", Value::Layer(None), ParamUi::Layer),
-        p("gradientLayer2", "Gradient Layer 2", Value::Layer(None), ParamUi::Layer),
-    ];
-    let names: [[&'static str; 4]; 8] = [
-        ["xPosition/xPosSource", "xPosition/xPosMultiplier", "xPosition/xPosOffset", "X Position"],
-        ["yPosition/yPosSource", "yPosition/yPosMultiplier", "yPosition/yPosOffset", "Y Position"],
-        ["zPosition/zPosSource", "zPosition/zPosMultiplier", "zPosition/zPosOffset", "Z Position"],
-        ["xRotation/xRotSource", "xRotation/xRotMultiplier", "xRotation/xRotOffset", "X Rotation"],
-        ["yRotation/yRotSource", "yRotation/yRotMultiplier", "yRotation/yRotOffset", "Y Rotation"],
-        ["zRotation/zRotSource", "zRotation/zRotMultiplier", "zRotation/zRotOffset", "Z Rotation"],
-        ["xScale/xScaleSource", "xScale/xScaleMultiplier", "xScale/xScaleOffset", "X Scale"],
-        ["yScale/yScaleSource", "yScale/yScaleMultiplier", "yScale/yScaleOffset", "Y Scale"],
-    ];
-    debug_assert_eq!(names.len(), CD_PROPS.len());
-    for (i, n) in names.iter().enumerate() {
-        let rot = (3..6).contains(&i);
-        let scale = i >= 6;
-        let (lo, hi) = if rot { (-3600.0, 3600.0) } else { (-100.0, 100.0) };
-        v.push(p(n[0], "Source", Value::Enum(0), popup(CD_SOURCES)));
-        v.push(p(n[1], "Multiplier", num(0.0), slider(lo, hi, if rot { -360.0 } else { -10.0 }, if rot { 360.0 } else { 10.0 }, 2)));
-        v.push(p(n[2], "Offset", num(if scale { 1.0 } else { 0.0 }), slider(lo, hi, if rot { -360.0 } else { -10.0 }, if rot { 360.0 } else { 10.0 }, 2)));
-    }
-    v.extend(crate::card3d::camera_params(2.0));
-    v.extend(crate::card3d::lighting_params(1.0, 0.25));
-    v.extend(crate::card3d::material_params(0.75));
-    v
-}
-
-pub fn specs() -> Vec<EffectSpec> {
-    vec![
-        spec(
-            "ec.sim.ccballaction",
-            "CC Ball Action",
-            vec![
-                p("scatter", "Scatter", num(0.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
-                p("rotationAxis", "Rotation Axis", Value::Enum(0), popup(&["X Axis", "Y Axis", "Z Axis", "XY Axis", "XZ Axis", "YZ Axis", "XYZ Axis"])),
-                p("rotation", "Rotation", num(0.0), ParamUi::Angle),
-                p("twistProperty", "Twist Property", Value::Enum(0), popup(&["X Axis", "Y Axis", "Radius", "Brightness"])),
-                p("twistAngle", "Twist Angle", num(0.0), ParamUi::Angle),
-                p("gridSpacing", "Grid Spacing", num(4.0), slider(1.0, 200.0, 1.0, 50.0, 0)),
-                p("ballSize", "Ball Size", num(40.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
-                p("instabilityState", "Instability State", num(0.0), ParamUi::Angle),
-            ],
-            ball_action,
-        ),
-        spec(
-            "ec.sim.ccpixelpolly",
-            "CC Pixel Polly",
-            vec![
-                p("force", "Force", num(100.0), slider(-1000.0, 1000.0, -300.0, 300.0, 1)),
-                p("gravity", "Gravity", num(1.0), slider(-20.0, 20.0, -5.0, 5.0, 2)),
-                p("spinning", "Spinning", num(0.0), ParamUi::Angle),
-                p("forceCenter", "Force Center", pt(0.5, 0.5), ParamUi::Point),
-                p("directionRandomness", "Direction Randomness", num(10.0), pct()),
-                p("speedRandomness", "Speed Randomness", num(10.0), pct()),
-                p("gridSpacing", "Grid Spacing", num(10.0), slider(1.0, 500.0, 2.0, 100.0, 0)),
-                p("object", "Object", Value::Enum(0), popup(&["Polygon", "Textured Polygon", "Square", "Textured Square"])),
-                p("enableDepthSort", "Enable Depth Sort", Value::Bool(true), ParamUi::Checkbox),
-                p("startTime", "Start Time (sec)", num(0.0), slider(-1000.0, 1000.0, 0.0, 10.0, 2)),
-            ],
-            pixel_polly,
-        ),
-        spec(
-            "ec.sim.ccscatterize",
-            "CC Scatterize",
-            vec![
-                p("scatter", "Scatter", num(0.0), slider(0.0, 1000.0, 0.0, 200.0, 1)),
-                p("rightTwist", "Right Twist", num(0.0), ParamUi::Angle),
-                p("leftTwist", "Left Twist", num(0.0), ParamUi::Angle),
-                p("transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Add"])),
-            ],
-            scatterize,
-        ),
-        spec("ec.sim.carddance", "Card Dance", card_dance_params(), card_dance),
-        spec(
-            "ec.sim.caustics",
-            "Caustics",
-            vec![
-                p("bottom/bottom", "Bottom", Value::Layer(None), ParamUi::Layer),
-                p("bottom/scaling", "Scaling", num(1.0), slider(0.01, 10.0, 0.1, 3.0, 3)),
-                p("bottom/repeatMode", "Repeat Mode", Value::Enum(2), popup(&["Once", "Tiled", "Reflected"])),
-                p("bottom/bottomSizeDiffers", "If Layer Size Differs", Value::Enum(1), popup(&["Center", "Stretch to Fit"])),
-                p("bottom/blur", "Blur", num(0.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
-                p("water/waterSurface", "Water Surface", Value::Layer(None), ParamUi::Layer),
-                p("water/waveHeight", "Wave Height", num(0.2), slider(-1.0, 1.0, -1.0, 1.0, 3)),
-                p("water/smoothing", "Smoothing", num(5.0), slider(0.0, 100.0, 0.0, 50.0, 1)),
-                p("water/waterDepth", "Water Depth", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("water/refractiveIndex", "Refractive Index", num(1.2), slider(1.0, 3.0, 1.0, 2.0, 3)),
-                p("water/surfaceColor", "Surface Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("water/surfaceOpacity", "Surface Opacity", num(0.3), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("water/causticsStrength", "Caustics Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("sky/sky", "Sky", Value::Layer(None), ParamUi::Layer),
-                p("sky/scaling", "Scaling", num(1.0), slider(0.01, 10.0, 0.1, 3.0, 3)),
-                p("sky/repeatMode", "Repeat Mode", Value::Enum(2), popup(&["Once", "Tiled", "Reflected"])),
-                p("sky/skySizeDiffers", "If Layer Size Differs", Value::Enum(1), popup(&["Center", "Stretch to Fit"])),
-                p("sky/intensity", "Intensity", num(0.3), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("sky/convergence", "Convergence", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("lighting/lightType", "Light Type", Value::Enum(0), popup(&crate::card3d::LIGHT_TYPES)),
-                p("lighting/lightIntensity", "Light Intensity", num(1.0), slider(0.0, 4.0, 0.0, 2.0, 2)),
-                p("lighting/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("lighting/lightPosition", "Light Position", pt(0.0, 0.0), ParamUi::Point),
-                p("lighting/lightHeight", "Light Height", num(1.0), slider(0.0, 10.0, 0.0, 4.0, 2)),
-                p("lighting/ambientLight", "Ambient Light", num(0.35), slider(0.0, 2.0, 0.0, 1.0, 2)),
-                p("material/diffuse", "Diffuse Reflection", num(0.75), slider(0.0, 2.0, 0.0, 1.0, 2)),
-                p("material/specular", "Specular Reflection", num(0.2), slider(0.0, 2.0, 0.0, 1.0, 2)),
-                p("material/highlightSharpness", "Highlight Sharpness", num(15.0), slider(1.0, 100.0, 1.0, 100.0, 1)),
-            ],
-            caustics,
-        ),
-        spec(
-            "ec.sim.waveworld",
-            "Wave World",
-            {
-                let mut v = vec![
-                    p("view", "View", Value::Enum(0), popup(&["Wireframe Preview", "Height Map"])),
-                    p("wireframeControls/horizontalRotation", "Horizontal Rotation", num(0.0), ParamUi::Angle),
-                    p("wireframeControls/verticalRotation", "Vertical Rotation", num(53.0), slider(0.0, 90.0, 0.0, 90.0, 1)),
-                    p("wireframeControls/verticalScale", "Vertical Scale", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
-                    p("heightMapControls/brightness", "Brightness", num(0.5), slider(-1.0, 2.0, 0.0, 1.0, 3)),
-                    p("heightMapControls/contrast", "Contrast", num(0.75), slider(0.0, 4.0, 0.0, 2.0, 3)),
-                    p("heightMapControls/gamma", "Gamma Adjustment", num(1.0), slider(0.01, 10.0, 0.2, 5.0, 3)),
-                    p("heightMapControls/renderDryAreasAs", "Render Dry Areas As", Value::Enum(0), popup(&["Solid", "Transparent"])),
-                    p("heightMapControls/transparency", "Transparency", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                    p("simulation/gridResolution", "Grid Resolution", num(60.0), slider(1.0, 400.0, 1.0, 200.0, 0)),
-                    p("simulation/gridResDownsamples", "Grid Res Downsamples", Value::Bool(false), ParamUi::Checkbox),
-                    p("simulation/waveSpeed", "Wave Speed", num(0.2), slider(0.0, 5.0, 0.0, 1.0, 3)),
-                    p("simulation/damping", "Damping", num(0.05), slider(0.0, 5.0, 0.0, 1.0, 3)),
-                    p("simulation/reflectEdges", "Reflect Edges", Value::Enum(0), popup(&["None", "Left", "Top", "Right", "Bottom", "All"])),
-                    p("simulation/preRoll", "Pre-roll (seconds)", num(0.0), slider(0.0, 30.0, 0.0, 10.0, 2)),
-                    p("ground/ground", "Ground", Value::Layer(None), ParamUi::Layer),
-                    p("ground/steepness", "Steepness", num(0.25), slider(0.0, 2.0, 0.0, 1.0, 3)),
-                    p("ground/height", "Height", num(0.25), slider(0.0, 2.0, 0.0, 1.0, 3)),
-                    p("ground/waveStrength", "Wave Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                ];
-                v.extend(producer_params(1, 0.5, (0.5, 0.5)));
-                v.extend(producer_params(2, 0.0, (0.25, 0.25)));
-                v
-            },
-            wave_world,
-        ),
-        spec(
-            "ec.sim.shatter",
-            "Shatter",
-            vec![
-                p(
-                    "view",
-                    "View",
-                    Value::Enum(1),
-                    popup(&["Rendered", "Wireframe Front View", "Wireframe", "Wireframe Front View + Forces", "Wireframe + Forces"]),
-                ),
-                p("render", "Render", Value::Enum(0), popup(&["All", "Layer", "Pieces"])),
-                p("shape/pattern", "Pattern", Value::Enum(0), popup(SHATTER_PATTERNS)),
-                p("shape/repetitions", "Repetitions", num(10.0), slider(1.0, 500.0, 1.0, 100.0, 2)),
-                p("shape/direction", "Direction", num(0.0), ParamUi::Angle),
-                p("shape/origin", "Origin", pt(0.5, 0.5), ParamUi::Point),
-                p("shape/customShatterMap", "Custom Shatter Map", Value::Layer(None), ParamUi::Layer),
-                p("shape/whiteTilesFixed", "White Tiles Fixed", Value::Bool(false), ParamUi::Checkbox),
-                p("shape/extrusionDepth", "Extrusion Depth", num(0.05), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("force1/force1Position", "Position", pt(0.5, 0.5), ParamUi::Point),
-                p("force1/force1Depth", "Depth", num(0.1), slider(-1.0, 1.0, -1.0, 1.0, 3)),
-                p("force1/force1Radius", "Radius", num(0.4), slider(0.0, 4.0, 0.0, 2.0, 3)),
-                p("force1/force1Strength", "Strength", num(5.0), slider(-20.0, 20.0, -10.0, 10.0, 2)),
-                p("force2/force2Position", "Position", pt(0.25, 0.25), ParamUi::Point),
-                p("force2/force2Depth", "Depth", num(0.1), slider(-1.0, 1.0, -1.0, 1.0, 3)),
-                p("force2/force2Radius", "Radius", num(0.0), slider(0.0, 4.0, 0.0, 2.0, 3)),
-                p("force2/force2Strength", "Strength", num(5.0), slider(-20.0, 20.0, -10.0, 10.0, 2)),
-                p("physics/rotationSpeed", "Rotation Speed", num(0.2), slider(0.0, 5.0, 0.0, 1.0, 3)),
-                p("physics/tumbleAxis", "Tumble Axis", Value::Enum(0), popup(&["Free", "None", "X", "Y", "Z", "XY", "XZ", "YZ"])),
-                p("physics/randomness", "Randomness", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("physics/viscosity", "Viscosity", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("physics/massVariance", "Mass Variance", num(30.0), pct()),
-                p("physics/gravity", "Gravity", num(3.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
-                p("physics/gravityDirection", "Gravity Direction", num(180.0), ParamUi::Angle),
-                p("physics/gravityInclination", "Gravity Inclination", num(0.0), slider(-90.0, 90.0, -90.0, 90.0, 1)),
-                p("gradient/shatterThreshold", "Shatter Threshold", num(0.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
-                p("gradient/gradientLayer", "Gradient Layer", Value::Layer(None), ParamUi::Layer),
-                p("gradient/invertGradient", "Invert Gradient", Value::Bool(false), ParamUi::Checkbox),
-                p("textures/color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
-                p("textures/opacity", "Opacity", num(1.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("textures/frontMode", "Front Mode", Value::Enum(1), popup(&SHATTER_TEXTURE_MODES)),
-                p("textures/sideMode", "Side Mode", Value::Enum(0), popup(&SHATTER_TEXTURE_MODES)),
-                p("textures/backMode", "Back Mode", Value::Enum(1), popup(&SHATTER_TEXTURE_MODES)),
-                p("textures/frontLayer", "Front Layer", Value::Layer(None), ParamUi::Layer),
-                p("textures/sideLayer", "Side Layer", Value::Layer(None), ParamUi::Layer),
-                p("textures/backLayer", "Back Layer", Value::Layer(None), ParamUi::Layer),
-            ]
-            .into_iter()
-            .chain(crate::card3d::camera_params(4.0))
-            .chain(crate::card3d::lighting_params(1.0, 0.25))
-            .chain(crate::card3d::material_params(0.75))
-            .chain([p("randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0))])
-            .collect(),
-            shatter,
-        ),
-        spec(
-            "ec.sim.foam",
-            "Foam",
-            vec![
-                p("view", "View", Value::Enum(0), popup(&["Draft", "Draft + Flow Map", "Rendered"])),
-                p("producer/producerPoint", "Producer Point", pt(0.5, 0.5), ParamUi::Point),
-                p("producer/producerXSize", "Producer X Size", num(0.05), slider(0.0, 2.0, 0.0, 1.0, 3)),
-                p("producer/producerYSize", "Producer Y Size", num(0.05), slider(0.0, 2.0, 0.0, 1.0, 3)),
-                p("producer/producerOrientation", "Producer Orientation", num(0.0), ParamUi::Angle),
-                p("producer/zoomProducerPoint", "Zoom Producer Point", Value::Bool(false), ParamUi::Checkbox),
-                p("producer/productionRate", "Production Rate", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 3)),
-                p("bubbles/size", "Size", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
-                p("bubbles/sizeVariance", "Size Variance", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("bubbles/lifespan", "Lifespan", num(300.0), slider(1.0, 30_000.0, 1.0, 1000.0, 1)),
-                p("bubbles/growthSpeed", "Bubble Growth Speed", num(0.1), slider(0.0001, 10.0, 0.0001, 1.0, 3)),
-                p("bubbles/strength", "Strength", num(10.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
-                p("physics/initialSpeed", "Initial Speed", num(0.0), slider(-100.0, 100.0, -10.0, 10.0, 3)),
-                p("physics/initialDirection", "Initial Direction", num(0.0), ParamUi::Angle),
-                p("physics/windSpeed", "Wind Speed", num(0.5), slider(-100.0, 100.0, -10.0, 10.0, 3)),
-                p("physics/windDirection", "Wind Direction", num(90.0), ParamUi::Angle),
-                p("physics/turbulence", "Turbulence", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
-                p("physics/wobbleAmount", "Wobble Amount", num(0.05), slider(0.0, 10.0, 0.0, 2.0, 3)),
-                p("physics/repulsion", "Repulsion", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 3)),
-                p("physics/popVelocity", "Pop Velocity", num(1.0), slider(-100.0, 100.0, -10.0, 10.0, 3)),
-                p("physics/viscosity", "Viscosity", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("physics/stickiness", "Stickiness", num(0.75), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("zoom", "Zoom", num(1.0), slider(0.01, 50.0, 0.1, 5.0, 3)),
-                p("universeSize", "Universe Size", num(1.0), slider(0.01, 10.0, 0.5, 3.0, 3)),
-                p("rendering/blendMode", "Blend Mode", Value::Enum(0), popup(&["Transparent", "Solid Old on Top", "Solid New on Top"])),
-                p("rendering/bubbleTexture", "Bubble Texture", Value::Enum(0), popup(&FOAM_TEXTURES)),
-                p("rendering/bubbleTextureLayer", "Bubble Texture Layer", Value::Layer(None), ParamUi::Layer),
-                p("rendering/bubbleOrientation", "Bubble Orientation", Value::Enum(0), popup(&["Fixed", "Physical Orientation", "Bubble Velocity"])),
-                p("rendering/environmentMap", "Environment Map", Value::Layer(None), ParamUi::Layer),
-                p("rendering/reflectionStrength", "Reflection Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("rendering/reflectionConvergence", "Reflection Convergence", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
-                p("flowMap/flowMap", "Flow Map", Value::Layer(None), ParamUi::Layer),
-                p("flowMap/flowMapSteepness", "Flow Map Steepness", num(0.05), slider(-100.0, 100.0, -1.0, 1.0, 3)),
-                p("flowMap/flowMapFits", "Flow Map Fits", Value::Enum(0), popup(&["Background", "Universe"])),
-                p("flowMap/simulationQuality", "Simulation Quality", Value::Enum(0), popup(&["Normal", "High", "Intense"])),
-                p("randomSeed", "Random Seed", num(1.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
-            ],
-            foam,
-        ),
-    ]
-}
+mod foam;
+mod pieces;
+mod pixels;
+mod registry;
+mod shatter;
+mod surfaces;
+
+pub(crate) use foam::foam_plan;
+#[cfg(test)]
+use foam::foam_pop_age;
+pub use foam::{FoamDisc, FoamEnv, FoamPlan, foam_full_plan};
+#[cfg(test)]
+use pieces::Cam;
+#[cfg(test)]
+pub(crate) use pieces::draw_pieces;
+pub use pieces::{Piece, PiecePlan, PieceTex, piece_plan};
+pub(crate) use pieces::{rot_axis, sort_far_first};
+pub use pixels::{PixelPlan, pixel_plan};
+pub use registry::specs;
+#[cfg(test)]
+use shatter::SHATTER_PATTERNS;
+pub use surfaces::{CausticsSetup, WavePlan, Waves, caustics_setup, wave_world_plan};
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, run_fx};
-
-    fn ramp(w: u32, hh: u32) -> Image {
-        let mut img = Image::new(w, hh);
-        for y in 0..hh {
-            for x in 0..w {
-                img.set(x, y, [x as f32 / w as f32, y as f32 / hh as f32, 0.4, 1.0]);
-            }
-        }
-        img
-    }
-
-    fn run(id: &str, vals: &[(&str, Value)], img: Image, t: f64) -> Image {
-        run_fx(id, vals, img, t, EffectEnv::default()).img
-    }
-
-    fn max_diff(a: &Image, b: &Image) -> f32 {
-        a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).fold(0.0, f32::max)).fold(0.0, f32::max)
-    }
-
-    fn sum_diff(a: &Image, b: &Image) -> f32 {
-        a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>()).sum()
-    }
-
-    #[test]
-    fn piece_at_rest_is_identity() {
-        let src = ramp(16, 16);
-        let cam = Cam { c: [8.0, 8.0], d: 64.0 };
-        let id = rot_axis([1.0, 0.0, 0.0], 0.0);
-        let pc = Piece::new(&[[0.0, 0.0], [16.0, 0.0], [16.0, 16.0], [0.0, 16.0]], [8.0, 8.0], &id, [8.0, 8.0, 0.0], cam).unwrap();
-        let mut out = Image::new(16, 16);
-        draw_pieces(&mut out, &[pc], &src, None);
-        assert!(max_diff(&out, &src) < 1e-4);
-    }
-
-    #[test]
-    fn ball_action_draws_balls() {
-        let v = [("ballSize", num(80.0))];
-        let a = run("ec.sim.ccballaction", &v, ramp(32, 32), 0.0);
-        assert_eq!(a, run("ec.sim.ccballaction", &v, ramp(32, 32), 0.0));
-        assert!(a.data.iter().any(|p| p[3] > 0.9) && a.data.iter().any(|p| p[3] == 0.0), "balls with gaps");
-        let none = run("ec.sim.ccballaction", &[("ballSize", num(0.0))], ramp(32, 32), 0.0);
-        assert!(none.data.iter().all(|p| p[3] == 0.0));
-        let sc = run("ec.sim.ccballaction", &[("ballSize", num(80.0)), ("scatter", num(20.0))], ramp(32, 32), 0.0);
-        assert!(sum_diff(&a, &sc) > 1.0);
-    }
-
-    #[test]
-    fn pixel_polly_breaks_after_start() {
-        let v = [("forceCenter", pt(16.0, 16.0)), ("gridSpacing", num(4.0))];
-        let before = run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.0);
-        assert_eq!(before, ramp(32, 32), "intact before the start time");
-        let a = run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.5);
-        assert_eq!(a, run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.5));
-        assert!(sum_diff(&a, &ramp(32, 32)) > 10.0);
-        let tex = run("ec.sim.ccpixelpolly", &[("forceCenter", pt(16.0, 16.0)), ("gridSpacing", num(4.0)), ("object", Value::Enum(3))], ramp(32, 32), 0.5);
-        assert!(sum_diff(&a, &tex) > 0.1);
-    }
-
-    #[test]
-    fn scatterize_identity_and_scatter() {
-        assert_eq!(run("ec.sim.ccscatterize", &[], ramp(24, 24), 0.0), ramp(24, 24));
-        let a = run("ec.sim.ccscatterize", &[("scatter", num(5.0))], ramp(24, 24), 0.0);
-        assert_eq!(a, run("ec.sim.ccscatterize", &[("scatter", num(5.0))], ramp(24, 24), 0.0));
-        assert!(sum_diff(&a, &ramp(24, 24)) > 1.0);
-        let tw = run("ec.sim.ccscatterize", &[("leftTwist", num(80.0)), ("rightTwist", num(80.0))], ramp(24, 24), 0.0);
-        assert!(sum_diff(&tw, &ramp(24, 24)) > 1.0);
-    }
-
-    #[test]
-    fn card_dance_identity_and_rotation() {
-        let src = ramp(30, 20);
-        let a = run("ec.sim.carddance", &[], src.clone(), 0.0);
-        assert!(max_diff(&a, &src) < 0.02, "flat cards reproduce the layer: {}", max_diff(&a, &src));
-        let r = run("ec.sim.carddance", &[("yRotation/yRotSource", Value::Enum(1)), ("yRotation/yRotMultiplier", num(90.0))], src.clone(), 0.0);
-        assert_eq!(r, run("ec.sim.carddance", &[("yRotation/yRotSource", Value::Enum(1)), ("yRotation/yRotMultiplier", num(90.0))], src.clone(), 0.0));
-        assert!(sum_diff(&r, &src) > 5.0);
-        let z = run("ec.sim.carddance", &[("zPosition/zPosOffset", num(-1.0))], src.clone(), 0.0);
-        assert!(sum_diff(&z, &src) > 5.0, "cards pulled towards the camera grow");
-    }
-
-    #[test]
-    fn shatter_at_rest_then_breaks() {
-        let v = [("view", Value::Enum(0)), ("force1/force1Position", pt(16.0, 16.0)), ("shape/origin", pt(16.0, 16.0))];
-        let src = ramp(32, 32);
-        let t0 = run("ec.sim.shatter", &v, src.clone(), 0.0);
-        assert!(max_diff(&t0, &src) < 0.03, "{}", max_diff(&t0, &src));
-        let t1 = run("ec.sim.shatter", &v, src.clone(), 0.5);
-        assert_eq!(t1, run("ec.sim.shatter", &v, src.clone(), 0.5));
-        assert!(sum_diff(&t1, &src) > 10.0);
-        for pat in 0..SHATTER_PATTERNS.len() as u32 {
-            let vv =
-                [("view", Value::Enum(0)), ("shape/pattern", Value::Enum(pat)), ("force1/force1Position", pt(16.0, 16.0)), ("shape/origin", pt(16.0, 16.0))];
-            let r = run("ec.sim.shatter", &vv, src.clone(), 0.0);
-            assert!(max_diff(&r, &src) < 0.05, "pattern {pat} tiles the layer: {}", max_diff(&r, &src));
-        }
-        let wire = run("ec.sim.shatter", &[("shape/repetitions", num(3.0))], src.clone(), 0.0);
-        assert!(wire.data.iter().any(|p| p[3] > 0.5) && wire.data.iter().any(|p| p[3] == 0.0));
-        let layer_only =
-            run("ec.sim.shatter", &[("view", Value::Enum(0)), ("render", Value::Enum(1)), ("force1/force1Position", pt(16.0, 16.0))], src.clone(), 0.5);
-        assert!(layer_only.get(16, 16)[3] == 0.0, "broken centre removed");
-    }
-
-    #[test]
-    fn caustics_flat_water() {
-        let src = ramp(24, 24);
-        let a = run(
-            "ec.sim.caustics",
-            &[
-                ("water/surfaceOpacity", num(0.0)),
-                ("lighting/ambientLight", num(0.0)),
-                ("material/diffuse", num(1.0)),
-                ("lighting/lightHeight", num(1000.0)),
-                ("material/specular", num(0.0)),
-            ],
-            src.clone(),
-            0.0,
-        );
-        assert!(max_diff(&a, &src) < 0.01, "flat water, light overhead = bottom: {}", max_diff(&a, &src));
-        let b = run("ec.sim.caustics", &[], src.clone(), 0.0);
-        assert_eq!(b, run("ec.sim.caustics", &[], src.clone(), 0.0));
-        assert!(sum_diff(&b, &src) > 0.1);
-    }
-
-    #[test]
-    fn caustics_sky_and_light_types() {
-        let src = Image::filled(32, 32, [0.5, 0.5, 0.5, 1.0]);
-        let env = EffectEnv { host: Some(&FoamHost), ..Default::default() };
-        let run_h = |vals: &[(&str, Value)]| run_fx("ec.sim.caustics", vals, src.clone(), 0.0, env).img;
-        // A mirror-like surface shows the (green) sky.
-        let mirror = [("water/surfaceOpacity", num(1.0)), ("sky/sky", Value::Layer(Some(2))), ("sky/intensity", num(1.0))];
-        let p = run_h(&mirror).get(16, 16);
-        assert!(p[1] > p[0] + 0.3 && p[1] > p[2] + 0.3, "{p:?}");
-        // Point Source lights pixels by their own direction to the light: the image is no
-        // longer uniform; Distant Source lights the flat water evenly.
-        let lit = |t: u32| {
-            run_h(&[
-                ("lighting/lightType", Value::Enum(t)),
-                ("lighting/lightPosition", pt(0.0, 0.0)),
-                ("lighting/lightHeight", num(0.2)),
-                ("water/surfaceOpacity", num(0.0)),
-            ])
-        };
-        let (distant, point) = (lit(0), lit(1));
-        assert!((distant.get(2, 2)[0] - distant.get(30, 30)[0]).abs() < 1e-5);
-        assert!(point.get(2, 2)[0] > point.get(30, 30)[0] + 0.02, "{:?} {:?}", point.get(2, 2), point.get(30, 30));
-        // First Comp Light without a comp light: ambient only.
-        let none = run_h(&[("lighting/lightType", Value::Enum(2)), ("water/surfaceOpacity", num(0.0))]);
-        assert!(none.get(16, 16)[0] < distant.get(16, 16)[0]);
-    }
-
-    #[test]
-    fn wave_world_wireframe_controls_ground_and_dry_areas() {
-        let base = [("producer1/producer1Position", pt(8.0, 16.0)), ("simulation/gridResolution", num(24.0))];
-        let wire = |extra: &[(&str, Value)]| run("ec.sim.waveworld", &[base.as_slice(), extra].concat(), Image::new(32, 32), 0.5);
-        assert_ne!(wire(&[]), wire(&[("wireframeControls/horizontalRotation", num(40.0))]));
-        assert_ne!(wire(&[]), wire(&[("wireframeControls/verticalScale", num(3.0))]));
-        // Ground (left dark, right light): the light side rises above the water and is dry.
-        let env = EffectEnv { host: Some(&FoamHost), ..Default::default() };
-        let hm = |extra: &[(&str, Value)]| {
-            let mut v: Vec<(&str, Value)> = base.to_vec();
-            v.extend([("view", Value::Enum(1)), ("ground/ground", Value::Layer(Some(1))), ("ground/steepness", num(0.5)), ("ground/height", num(0.25))]);
-            v.extend_from_slice(extra);
-            run_fx("ec.sim.waveworld", &v, Image::new(32, 32), 1.0, env).img
-        };
-        let solid = hm(&[]);
-        let clear = hm(&[("heightMapControls/renderDryAreasAs", Value::Enum(1))]);
-        assert!(solid.get(30, 16)[3] > 0.99 && clear.get(30, 16)[3] == 0.0);
-        assert!(clear.get(4, 16)[3] > 0.99, "wet side stays");
-        // Dry ground stays flat: mid grey (brightness 0.5) there.
-        assert!((solid.get(30, 16)[0] - 0.5).abs() < 1e-4);
-        // Wave Strength slows waves over shallow water: the surface differs.
-        assert_ne!(hm(&[]), hm(&[("ground/waveStrength", num(1.0))]));
-    }
-
-    #[test]
-    fn wave_world_seek_and_waves() {
-        let v = vec![("view", Value::Enum(1)), ("producer1/producer1Position", pt(16.0, 16.0)), ("simulation/gridResolution", num(24.0))];
-        let _ = run("ec.sim.waveworld", &v, Image::new(32, 32), 0.5);
-        let a = run("ec.sim.waveworld", &v, Image::new(32, 32), 1.0);
-        let mut v2 = v.clone();
-        v2.push(("heightMapControls/transparency", num(0.0)));
-        assert_eq!(a, run("ec.sim.waveworld", &v2, Image::new(32, 32), 1.0));
-        // Waves spread: some pixels differ from the flat-water grey.
-        assert!(a.data.iter().any(|p| (p[0] - 0.5).abs() > 0.05), "waves");
-        let flat = run("ec.sim.waveworld", &[("view", Value::Enum(1)), ("producer1/producer1Amplitude", num(0.0))], Image::new(32, 32), 1.0);
-        assert!(flat.data.iter().all(|p| (p[0] - 0.5).abs() < 1e-5));
-        let wire =
-            run("ec.sim.waveworld", &[("producer1/producer1Position", pt(16.0, 16.0)), ("simulation/gridResolution", num(10.0))], Image::new(32, 32), 0.3);
-        assert!(wire.data.iter().any(|p| p[1] > 0.3));
-    }
-
-    #[test]
-    fn wave_world_steps_match_direct() {
-        // Fresh caches: resumed simulation equals simulation from scratch.
-        let v = vec![
-            ("view", Value::Enum(1)),
-            ("producer1/producer1Position", pt(16.0, 16.0)),
-            ("simulation/gridResolution", num(20.0)),
-            ("simulation/damping", num(0.07)),
-        ];
-        let a = run("ec.sim.waveworld", &v, Image::new(32, 32), 1.3);
-        let mut v2 = v.clone();
-        v2.push(("simulation/damping", num(0.07000001)));
-        // Different key: computed from scratch at 1.3 directly vs via 0.4 (both fresh keys).
-        let _ = run("ec.sim.waveworld", &v2, Image::new(32, 32), 0.4);
-        let b = run("ec.sim.waveworld", &v2, Image::new(32, 32), 1.3);
-        assert!(max_diff(&a, &b) < 1e-3, "{}", max_diff(&a, &b));
-    }
-
-    #[test]
-    fn foam_bubbles_drift_and_seek() {
-        let v = vec![("producer/producerPoint", pt(16.0, 16.0)), ("view", Value::Enum(2)), ("producer/productionRate", num(2.0))];
-        let none = run("ec.sim.foam", &v, Image::new(32, 32), 0.0);
-        assert!(none.data.iter().all(|p| p[3] == 0.0));
-        let _ = run("ec.sim.foam", &v, Image::new(32, 32), 0.6);
-        let a = run("ec.sim.foam", &v, Image::new(32, 32), 1.2);
-        let mut v2 = v.clone();
-        v2.push(("randomSeed", num(1.0)));
-        assert_eq!(a, run("ec.sim.foam", &v2, Image::new(32, 32), 1.2));
-        assert!(a.data.iter().any(|p| p[3] > 0.05), "bubbles");
-        let draft = run("ec.sim.foam", &[("producer/producerPoint", pt(16.0, 16.0)), ("producer/productionRate", num(2.0))], Image::new(32, 32), 1.0);
-        assert!(draft.data.iter().any(|p| p[3] > 0.05));
-    }
-
-    #[test]
-    fn foam_strength_controls_early_popping() {
-        // Strong bubbles all live their full lifespan; weak ones pop at random earlier.
-        assert_eq!(foam_pop_age(7, 300.0, 0.0, 1), 300.0);
-        let early = (0..200).filter(|&id| foam_pop_age(id, 300.0, 1.0, 1) < 150.0).count();
-        assert!(early > 60 && early < 140, "{early}");
-        let count = |strength: f64| {
-            let v = vec![
-                ("producer/producerPoint", pt(16.0, 16.0)),
-                ("producer/productionRate", num(3.0)),
-                ("bubbles/lifespan", num(40.0)),
-                ("bubbles/strength", num(strength)),
-                ("physics/windSpeed", num(0.0)),
-            ];
-            run("ec.sim.foam", &v, Image::new(32, 32), 1.5).data.iter().map(|p| p[3]).sum::<f32>()
-        };
-        assert!(count(0.0) < count(20.0) * 0.9, "{} vs {}", count(0.0), count(20.0));
-    }
-
-    /// A host with a comp camera (identity, or tilted) and a first comp light.
-    struct Scene {
-        camera: Option<[[f64; 4]; 3]>,
-        light: Option<crate::CompLight>,
-        layer: Option<Image>,
-    }
-    impl crate::EffectHost for Scene {
-        fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
-            let img = self.layer.clone()?;
-            let size = [img.width as f64, img.height as f64];
-            Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size })
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-        fn comp_scene(&self) -> Option<crate::CompScene> {
-            Some(crate::CompScene { camera: self.camera, camera_layer: true, light: self.light })
-        }
-    }
-
-    fn run_env(id: &str, vals: &[(&str, Value)], img: Image, t: f64, host: &Scene) -> Image {
-        run_fx(id, vals, img, t, EffectEnv { host: Some(host), ..Default::default() }).img
-    }
-
-    #[test]
-    fn card_dance_camera_systems() {
-        let src = ramp(40, 30);
-        // Camera Position: rotating the camera changes the view; zero rotation is the layer.
-        let r = run("ec.sim.carddance", &[("cameraPosition/yRotation", num(30.0))], src.clone(), 0.0);
-        assert!(sum_diff(&r, &src) > 10.0);
-        let order = run("ec.sim.carddance", &[("cameraPosition/yRotation", num(30.0)), ("cameraPosition/xRotation", num(30.0))], src.clone(), 0.0);
-        let order2 = run(
-            "ec.sim.carddance",
-            &[("cameraPosition/yRotation", num(30.0)), ("cameraPosition/xRotation", num(30.0)), ("cameraPosition/transformOrder", Value::Enum(5))],
-            src.clone(),
-            0.0,
-        );
-        assert!(sum_diff(&order, &order2) > 1.0, "Transform Order matters");
-        // X, Y Position moves the view: the layer shifts by the offset.
-        let moved = run("ec.sim.carddance", &[("cameraPosition/xyPosition", pt(30.0, 15.0))], src.clone(), 0.0);
-        assert!((moved.get(25, 10)[0] - src.get(15, 10)[0]).abs() < 0.03, "{:?} {:?}", moved.get(25, 10), src.get(15, 10));
-        // Corner Pins: the layer's corners land on the pins.
-        let pins = [
-            ("cameraSystem", Value::Enum(1)),
-            ("cornerPins/upperLeftCorner", pt(10.0, 5.0)),
-            ("cornerPins/upperRightCorner", pt(30.0, 5.0)),
-            ("cornerPins/lowerLeftCorner", pt(10.0, 25.0)),
-            ("cornerPins/lowerRightCorner", pt(30.0, 25.0)),
-        ];
-        let cp = run("ec.sim.carddance", &pins, src.clone(), 0.0);
-        assert_eq!(cp.get(3, 3)[3], 0.0, "outside the pinned quad");
-        assert!(cp.get(20, 15)[3] > 0.99);
-        assert!((cp.get(20, 15)[0] - src.get(20, 15)[0]).abs() < 0.05, "centre maps to centre");
-        // Comp Camera: the identity camera reproduces the layer; a camera that doubles x moves it.
-        let ident = Scene { camera: Some([[1.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0], [0.0, 0.0, 0.002, 1.0]]), light: None, layer: None };
-        let cc = run_env("ec.sim.carddance", &[("cameraSystem", Value::Enum(2))], src.clone(), 0.0, &ident);
-        assert!(max_diff(&cc, &src) < 0.02, "{}", max_diff(&cc, &src));
-        let half = Scene { camera: Some([[0.5, 0.0, 0.0, 0.0], [0.0, 0.5, 0.0, 0.0], [0.0, 0.0, 0.002, 1.0]]), ..ident };
-        let cc = run_env("ec.sim.carddance", &[("cameraSystem", Value::Enum(2))], src.clone(), 0.0, &half);
-        assert_eq!(cc.get(35, 25)[3], 0.0, "half-size view leaves the far corner empty");
-    }
-
-    #[test]
-    fn card_dance_lighting_and_material() {
-        let src = Image::filled(40, 30, [0.5, 0.5, 0.5, 1.0]);
-        let tilt = [("rows", num(1.0)), ("columns", num(1.0)), ("yRotation/yRotSource", Value::Enum(0)), ("yRotation/yRotOffset", num(60.0))];
-        let lit = |extra: &[(&str, Value)]| {
-            let mut v: Vec<(&str, Value)> = tilt.to_vec();
-            v.extend_from_slice(extra);
-            run("ec.sim.carddance", &v, src.clone(), 0.0).get(20, 15)
-        };
-        let base = lit(&[]);
-        // Tilted cards facing away from a frontal light get darker than flat ones.
-        assert!(base[0] < 0.45, "{base:?}");
-        // Light colour tints; intensity brightens; ambient alone lights evenly.
-        let red = lit(&[("lighting/lightColor", col(1.0, 0.0, 0.0))]);
-        assert!(red[0] > red[1] + 0.05);
-        assert!(lit(&[("lighting/lightIntensity", num(2.0))])[0] > base[0]);
-        let amb = lit(&[("lighting/ambientLight", num(1.0)), ("material/diffuse", num(0.0))]);
-        assert!((amb[0] - 0.5).abs() < 1e-3);
-        // A light placed to the side (Point Source) changes the shading of the tilted card.
-        let side = lit(&[("lighting/lightType", Value::Enum(1)), ("lighting/lightPosition", pt(200.0, 15.0)), ("lighting/lightDepth", num(0.2))]);
-        assert!((side[0] - base[0]).abs() > 0.02, "{side:?} vs {base:?}");
-        // Specular adds a highlight on flat, frontally lit cards.
-        let flat = run("ec.sim.carddance", &[("material/specular", num(0.5))], src.clone(), 0.0).get(20, 15);
-        assert!(flat[0] > 0.9, "{flat:?}");
-        // First Comp Light: no light in the comp → ambient only; a light from the host is used.
-        let none = Scene { camera: None, light: None, layer: None };
-        let a = run_env("ec.sim.carddance", &[("lighting/lightType", Value::Enum(2))], src.clone(), 0.0, &none).get(20, 15);
-        assert!((a[0] - 0.5 * (0.25 + 0.75)).abs() < 1e-3, "{a:?}");
-        let blue = Scene { light: Some(crate::CompLight { pos: [20.0, 15.0, -100.0], dir: [0.0, 0.0, 1.0], color: [0.0, 0.0, 1.0], kind: 0 }), ..none };
-        let a = run_env("ec.sim.carddance", &[("lighting/lightType", Value::Enum(2))], src.clone(), 0.0, &blue).get(20, 15);
-        assert!(a[2] > a[0] + 0.2, "{a:?}");
-    }
-
-    #[test]
-    fn shatter_custom_map_gradient_textures_and_extrusion() {
-        let src = ramp(32, 32);
-        let base = [("view", Value::Enum(0)), ("force1/force1Position", pt(16.0, 16.0)), ("force1/force1Radius", num(2.0)), ("shape/origin", pt(16.0, 16.0))];
-        let with = |extra: &[(&str, Value)], t: f64, host: Option<&Scene>| {
-            let mut v: Vec<(&str, Value)> = base.to_vec();
-            v.extend_from_slice(extra);
-            match host {
-                Some(h) => run_env("ec.sim.shatter", &v, src.clone(), t, h),
-                None => run("ec.sim.shatter", &v, src.clone(), t),
-            }
-        };
-        // Custom Shatter Map: a map white on the left and black on the right; with White Tiles
-        // Fixed the left half stays put while the right half breaks away.
-        let mut map = Image::new(32, 32);
-        for y in 0..32 {
-            for x in 0..32 {
-                map.set(x, y, if x < 16 { [1.0; 4] } else { [0.0, 0.0, 0.0, 1.0] });
-            }
-        }
-        let host = Scene { camera: None, light: None, layer: Some(map) };
-        let custom = [("shape/pattern", Value::Enum(5)), ("shape/customShatterMap", Value::Layer(Some(1))), ("shape/whiteTilesFixed", Value::Bool(true))];
-        let at_rest = with(&custom, 0.0, Some(&host));
-        assert!(max_diff(&at_rest, &src) < 0.05, "custom pieces tile the layer: {}", max_diff(&at_rest, &src));
-        let broke = with(&custom, 1.0, Some(&host));
-        assert!(max_diff_region(&broke, &src, 0..12) < 0.05, "white tiles fixed");
-        assert!(sum_diff_region(&broke, &src, 20..32) > 5.0, "black group moved");
-        // Gradient: a black gradient layer with threshold 50 % keeps everything together.
-        let black = Scene { camera: None, light: None, layer: Some(Image::filled(32, 32, [0.0, 0.0, 0.0, 1.0])) };
-        let g = with(&[("gradient/gradientLayer", Value::Layer(Some(1))), ("gradient/shatterThreshold", num(50.0))], 1.0, Some(&black));
-        assert!(max_diff(&g, &src) < 0.05);
-        let gi = with(
-            &[("gradient/gradientLayer", Value::Layer(Some(1))), ("gradient/shatterThreshold", num(50.0)), ("gradient/invertGradient", Value::Bool(true))],
-            1.0,
-            Some(&black),
-        );
-        assert!(sum_diff(&gi, &src) > 10.0);
-        // Textures: Front Mode Color paints the pieces flat; Opacity fades them.
-        let flat = with(&[("textures/frontMode", Value::Enum(0)), ("textures/color", col(0.0, 1.0, 0.0))], 0.0, None);
-        let p = flat.get(16, 16);
-        assert!(p[1] > 0.95 && p[0] < 0.05, "{p:?}");
-        let half = with(&[("textures/opacity", num(0.5)), ("shape/repetitions", num(2.0))], 0.0, None);
-        assert!((half.get(8, 4)[3] - 0.5).abs() < 0.02, "{:?}", half.get(8, 4));
-        // Extrusion: thicker pieces cover more once they tumble.
-        let cover = |d: f64| {
-            with(&[("shape/extrusionDepth", num(d)), ("textures/sideMode", Value::Enum(0)), ("textures/color", col(1.0, 1.0, 1.0))], 0.6, None)
-                .data
-                .iter()
-                .map(|p| p[3])
-                .sum::<f32>()
-        };
-        assert!(cover(1.0) > cover(0.0) + 1.0, "{} vs {}", cover(1.0), cover(0.0));
-        // Deterministic and seek-consistent.
-        assert_eq!(with(&custom, 0.7, Some(&host)), with(&custom, 0.7, Some(&host)));
-    }
-
-    fn max_diff_region(a: &Image, b: &Image, xs: std::ops::Range<u32>) -> f32 {
-        let mut m = 0.0f32;
-        for y in 0..a.height {
-            for x in xs.clone() {
-                let (p, q) = (a.get(x as i64, y as i64), b.get(x as i64, y as i64));
-                m = (0..4).map(|k| (p[k] - q[k]).abs()).fold(m, f32::max);
-            }
-        }
-        m
-    }
-
-    fn sum_diff_region(a: &Image, b: &Image, xs: std::ops::Range<u32>) -> f32 {
-        let mut s = 0.0;
-        for y in 0..a.height {
-            for x in xs.clone() {
-                let (p, q) = (a.get(x as i64, y as i64), b.get(x as i64, y as i64));
-                s += (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>();
-            }
-        }
-        s
-    }
-
-    /// Layer 1 = a left-dark, right-light ramp; layer 2 = solid green.
-    struct FoamHost;
-    impl crate::EffectHost for FoamHost {
-        fn layer(&self, id: u64, _: bool) -> Option<crate::LayerPixels> {
-            let img = if id == 1 { ramp(32, 32) } else { Image::filled(32, 32, [0.0, 1.0, 0.0, 1.0]) };
-            Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size: [32.0, 32.0] })
-        }
-        fn layer_at(&self, id: u64, _: f64, me: bool) -> Option<crate::LayerPixels> {
-            self.layer(id, me)
-        }
-        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-            None
-        }
-    }
-
-    #[test]
-    fn foam_flow_map_pop_velocity_wobble_textures_and_reflection() {
-        let base = vec![
-            ("producer/producerPoint", pt(16.0, 16.0)),
-            ("producer/productionRate", num(2.0)),
-            ("physics/windSpeed", num(0.0)),
-            ("physics/turbulence", num(0.0)),
-            ("view", Value::Enum(2)),
-        ];
-        let with = |extra: &[(&str, Value)], t: f64| {
-            let mut v = base.clone();
-            v.extend_from_slice(extra);
-            run_fx("ec.sim.foam", &v, Image::new(32, 32), t, EffectEnv { host: Some(&FoamHost), ..Default::default() }).img
-        };
-        let cx = |img: &Image| {
-            let (mut s, mut n) = (0.0, 0.0);
-            for y in 0..32 {
-                for x in 0..32 {
-                    let a = img.get(x, y)[3];
-                    s += a * x as f32;
-                    n += a;
-                }
-            }
-            s / n.max(1e-6)
-        };
-        // Flow map: bubbles run downhill (towards the dark left side).
-        let still = with(&[], 1.0);
-        let flowing = with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0))], 1.0);
-        assert!(cx(&flowing) < cx(&still) - 1.0, "{} vs {}", cx(&flowing), cx(&still));
-        let hq =
-            with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0)), ("flowMap/simulationQuality", Value::Enum(2))], 1.0);
-        assert_eq!(
-            hq,
-            with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0)), ("flowMap/simulationQuality", Value::Enum(2))], 1.0)
-        );
-        // Pop velocity scatters the survivors when short-lived bubbles pop.
-        let short = [("bubbles/lifespan", num(8.0)), ("bubbles/strength", num(0.0))];
-        let a = with(&[short.as_slice(), &[("physics/popVelocity", num(0.0))]].concat(), 1.0);
-        let b2 = with(&[short.as_slice(), &[("physics/popVelocity", num(20.0))]].concat(), 1.0);
-        assert_ne!(a, b2);
-        // Wobble changes the drawn bubbles.
-        assert_ne!(with(&[("physics/wobbleAmount", num(0.0))], 1.0), with(&[("physics/wobbleAmount", num(3.0))], 1.0));
-        // User Defined texture: bubbles show the texture layer (green).
-        let tex = with(&[("rendering/bubbleTexture", Value::Enum(5)), ("rendering/bubbleTextureLayer", Value::Layer(Some(2)))], 1.0);
-        assert!(tex.data.iter().any(|p| p[1] > 0.5 && p[0] < 0.1));
-        // Environment map: reflections tint the bubbles.
-        let refl = with(&[("rendering/environmentMap", Value::Layer(Some(2))), ("rendering/reflectionStrength", num(1.0))], 1.0);
-        let g = |i: &Image| i.data.iter().map(|p| p[1] - p[0]).sum::<f32>();
-        assert!(g(&refl) > g(&still) + 1.0);
-        // Zoom Producer Point zooms about the producer instead of the layer centre.
-        let off = [("producer/producerPoint", pt(8.0, 8.0)), ("zoom", num(2.0))];
-        let z1 = with(&off, 1.0);
-        let z2 = with(&[off.as_slice(), &[("producer/zoomProducerPoint", Value::Bool(true))]].concat(), 1.0);
-        assert!((cx(&z2) - 8.0).abs() < 2.0 && cx(&z1) < 4.0, "{} vs {}", cx(&z2), cx(&z1));
-    }
-}
+mod tests;
diff --git a/crates/effects/src/sim2/foam.rs b/crates/effects/src/sim2/foam.rs
new file mode 100644
index 000000000..fc187d191
--- /dev/null
+++ b/crates/effects/src/sim2/foam.rs
@@ -0,0 +1,411 @@
+use super::{
+    Acc, Buf, EffectCtx, Image, IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator, Plane, Px, Shape, SimCache,
+    Sprite, Value, hs, params_key, splat, unpremul, value_noise,
+};
+
+// ------------------------------------------------------------------ Foam
+
+#[derive(Clone, Debug)]
+struct FoamBubble {
+    p: [f32; 2],
+    v: [f32; 2],
+    age: f32,
+    size: f32,
+    /// Spin (radians) for Physical Orientation.
+    spin: f32,
+    id: u32,
+}
+
+#[derive(Clone, Debug, Default)]
+struct FoamState {
+    b: Vec<FoamBubble>,
+    carry: f32,
+    next: u32,
+}
+
+static FOAM_CACHE: SimCache<FoamState> = SimCache::new(4);
+
+/// Foam steps once per frame at 30 frames per second.
+const FOAM_FPS: f64 = 30.0;
+
+/// Foam's Bubble Texture options (the last uses Bubble Texture Layer).
+pub(super) const FOAM_TEXTURES: [&str; 6] = ["Default Bubble", "Spit", "Bubblegum", "Dishwater", "Milky", "User Defined"];
+
+/// Age (in simulation steps) at which bubble `id` pops: its lifespan, shortened at random for
+/// frail bubbles (`frailty` 0 = every bubble reaches `lifespan`, 1 = uniformly early).
+pub(super) fn foam_pop_age(id: u32, lifespan: f32, frailty: f32, seed: u32) -> f32 {
+    lifespan * (1.0 - frailty * (hs(id, 11, seed) * 0.5 + 0.5))
+}
+
+/// Foam: bubbles born in the producer rectangle grow to their size, drift with the wind,
+/// turbulence and the Flow Map (bubbles run downhill on its luminance), repel and stick to each
+/// other, wobble, and pop at the end of their (Strength-shortened) lifespan, pushing their
+/// neighbours away at Pop Velocity. Rendered bubbles use a built-in texture or the Bubble
+/// Texture Layer, oriented by Bubble Orientation, and reflect the Environment Map.
+pub(super) fn foam(ctx: &EffectCtx, b: Buf) -> Buf {
+    foam_full_plan(ctx, &b).finish(b)
+}
+
+/// Foam's bubbles as sprites, `None` when it draws more than sprites (a User Defined bubble
+/// texture, an Environment Map reflection or the Draft + Flow Map view's flow map).
+pub(crate) fn foam_plan(ctx: &EffectCtx, b: &Buf) -> Option<crate::sim::SpritePlan> {
+    let plan = foam_full_plan(ctx, b);
+    (plan.user.is_none() && plan.env.is_none() && plan.flow.is_none()).then_some(plan.sprites)
+}
+
+/// A bubble disc filled by Foam's User Defined texture (buffer px; `rot` radians).
+#[derive(Clone, Copy, Debug)]
+pub struct FoamDisc {
+    pub x: f64,
+    pub y: f64,
+    pub r: f32,
+    pub rot: f32,
+    pub fade: f32,
+}
+
+/// Foam's Environment Map reflection: the map fitted to the buffer, Reflection Convergence and
+/// Strength, and the bubble discs reflecting it (`rot` and `fade` unused).
+pub struct FoamEnv {
+    pub img: Image,
+    pub conv: f64,
+    pub strength: f32,
+    pub discs: Vec<FoamDisc>,
+}
+
+/// What Foam draws this frame over a transparent frame of the layer's size: the bubble sprites,
+/// then the User Defined texture's discs, the Environment Map's reflections and (Draft + Flow
+/// Map) the flow map under it all, each `foam_disc`-composited in bubble order.
+pub struct FoamPlan {
+    pub sprites: crate::sim::SpritePlan,
+    pub user: Option<(crate::LayerPixels, Vec<FoamDisc>)>,
+    pub env: Option<FoamEnv>,
+    /// The flow map fitted to the buffer.
+    pub flow: Option<Image>,
+}
+
+impl FoamPlan {
+    pub fn finish(&self, b: Buf) -> Buf {
+        let mut out = splat(b.img.width, b.img.height, &self.sprites.sprites, self.sprites.acc);
+        // User Defined: the texture layer fills each bubble's disc.
+        if let Some((tex, discs)) = &self.user {
+            for d in discs {
+                let (rot, fade) = (d.rot, d.fade);
+                foam_disc(&mut out, d.x, d.y, d.r as f64, |u, v| {
+                    // u, v in −1..1 across the bubble, rotated into the texture.
+                    let (sr, cr) = rot.sin_cos();
+                    let (tu, tv) = (u as f32 * cr + v as f32 * sr, -u as f32 * sr + v as f32 * cr);
+                    let (x, y) = ((tu as f64 * 0.5 + 0.5) * tex.size[0], (tv as f64 * 0.5 + 0.5) * tex.size[1]);
+                    let px = tex.buf.img.sample_bilinear(x * tex.buf.scale + tex.buf.offset[0], y * tex.buf.scale + tex.buf.offset[1]);
+                    px.map(|c| c * fade)
+                });
+            }
+        }
+        // Environment Map: each bubble reflects the map along its sphere normal (Reflection
+        // Convergence pulls the reflection towards the bubble's own spot of the map).
+        if let Some(env) = &self.env {
+            let (conv, strength) = (env.conv, env.strength);
+            let (w, h) = (b.img.width as f64, b.img.height as f64);
+            for d in &env.discs {
+                let (bx, by) = (d.x, d.y);
+                foam_disc(&mut out, bx, by, d.r as f64, |u, v| {
+                    // Sphere normal; the reflection looks across the whole map, or (convergence 1)
+                    // just behind the bubble.
+                    let (ex, ey) =
+                        if conv >= 1.0 { (bx, by) } else { (bx * conv + (u * 0.5 + 0.5) * w * (1.0 - conv), by * conv + (v * 0.5 + 0.5) * h * (1.0 - conv)) };
+                    let e = env.img.sample_bilinear(ex, ey);
+                    let rim = ((u * u + v * v) as f32).min(1.0);
+                    let k = strength * (0.3 + 0.7 * rim);
+                    [e[0] * k, e[1] * k, e[2] * k, 0.0]
+                });
+            }
+        }
+        // Draft + Flow Map shows the flow map under the bubbles.
+        if let Some(fm) = &self.flow {
+            out.data.par_iter_mut().zip(fm.data.par_iter()).for_each(|(o, f)| {
+                let k = 1.0 - o[3];
+                for c in 0..4 {
+                    o[c] += f[c] * 0.5 * k;
+                }
+            });
+        }
+        Buf { img: out, ..b }
+    }
+}
+
+/// Foam's [`FoamPlan`] for layer geometry `b` (its size; its pixels are not read).
+pub fn foam_full_plan(ctx: &EffectCtx, b: &Buf) -> FoamPlan {
+    let pr = ctx.params;
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let unit = lw * 0.01;
+    let prod = pr.v2("producer/producerPoint");
+    let (psx, psy) = (pr.f("producer/producerXSize") as f32 * lw, pr.f("producer/producerYSize") as f32 * lh);
+    let porient = (pr.f("producer/producerOrientation") as f32).to_radians();
+    let rate = pr.f("producer/productionRate").max(0.0) as f32;
+    let size = pr.f("bubbles/size").max(0.0) as f32;
+    let size_var = pr.f("bubbles/sizeVariance") as f32;
+    let lifespan = pr.f("bubbles/lifespan").max(1.0) as f32;
+    let growth = pr.f("bubbles/growthSpeed").max(0.0001) as f32;
+    // Strength: weaker bubbles tend to pop before their lifespan (at 20 or more every bubble
+    // lives the full lifespan); each bubble gets its own pop age.
+    let frailty = 1.0 - (pr.f("bubbles/strength") as f32 / 20.0).clamp(0.0, 1.0);
+    let init_speed = pr.f("physics/initialSpeed") as f32;
+    let init_dir = (pr.f("physics/initialDirection") as f32).to_radians();
+    let wind = pr.f("physics/windSpeed") as f32;
+    let wind_dir = (pr.f("physics/windDirection") as f32).to_radians();
+    let turb = pr.f("physics/turbulence") as f32;
+    let wobble = pr.f("physics/wobbleAmount").max(0.0) as f32;
+    let repulsion = pr.f("physics/repulsion") as f32;
+    let pop_velocity = pr.f("physics/popVelocity") as f32;
+    let viscosity = pr.f("physics/viscosity").clamp(0.0, 1.0) as f32;
+    let sticky = pr.f("physics/stickiness").clamp(0.0, 1.0) as f32;
+    let universe = pr.f("universeSize").max(0.01) as f32;
+    let seed = (pr.f("randomSeed") as u32).wrapping_mul(0x68e31da4) ^ ctx.seed;
+    let wvec = [wind_dir.sin() * wind * unit, -wind_dir.cos() * wind * unit];
+    // Flow Map: the map layer's first frame, its luminance a height field (Fits the layer or
+    // the whole universe).
+    let flow = pr.get("flowMap/flowMap").and_then(Value::as_layer).and_then(|id| {
+        let host = ctx.env.host?;
+        let me = pr.get(&crate::layer_source_id("flowMap/flowMap")).is_none_or(|v| v.as_enum() != 0);
+        host.layer_at(id, ctx.env.comp_time - ctx.time, me)
+    });
+    let steep = pr.f("flowMap/flowMapSteepness") as f32;
+    let fits_universe = pr.e("flowMap/flowMapFits") == 1;
+    let substeps = match pr.e("flowMap/simulationQuality") {
+        1 => 2,
+        2 => 4,
+        _ => 1,
+    };
+    let height = flow.as_ref().map(|lp| {
+        let img = &lp.buf.img;
+        let pl = Plane::from_image(img, |px| {
+            let (c, a) = unpremul(px);
+            effectcraft_color::luminance(c[0], c[1], c[2]) * a
+        });
+        (pl, lp.buf.scale, lp.buf.offset, lp.size)
+    });
+    let (ux0, uy0) = (-(universe - 1.0) * 0.5 * lw, -(universe - 1.0) * 0.5 * lh);
+    let (ux1, uy1) = (lw - ux0, lh - uy0);
+    // Height at a layer point (0..1).
+    let h_at = |x: f32, y: f32| -> f32 {
+        let Some((pl, s, off, size)) = &height else { return 0.0 };
+        let (fx, fy) = if fits_universe { ((x - ux0) / (ux1 - ux0), (y - uy0) / (uy1 - uy0)) } else { (x / lw, y / lh) };
+        pl.sample(fx as f64 * size[0] * s + off[0], fy as f64 * size[1] * s + off[1])
+    };
+    let mut key = params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: 1.0 }, 5);
+    if let Some((pl, ..)) = &height {
+        key ^= pl.data.iter().step_by(5).fold(0u64, |a, v| a.rotate_left(3) ^ v.to_bits() as u64);
+    }
+    let steps = if ctx.time <= 0.0 { 0 } else { (ctx.time * FOAM_FPS + 1e-6).floor() as u64 };
+    let rad = |q: &FoamBubble| q.size * unit * 3.0 * (q.age * growth).min(1.0);
+    let st = FOAM_CACHE.run(key, steps, FoamState::default, |st, step| {
+        let t = step as f32 / FOAM_FPS as f32;
+        // Births.
+        st.carry += rate;
+        let n = st.carry.floor() as u32;
+        st.carry -= n as f32;
+        for _ in 0..n {
+            if st.b.len() >= 3000 {
+                break;
+            }
+            let id = st.next;
+            st.next = st.next.wrapping_add(1);
+            let (ux, uy) = (hs(id, 1, seed) * 0.5 * psx, hs(id, 2, seed) * 0.5 * psy);
+            let (so, co) = porient.sin_cos();
+            let p = [prod[0] as f32 + ux * co - uy * so, prod[1] as f32 + ux * so + uy * co];
+            let v = [init_dir.sin() * init_speed * unit, -init_dir.cos() * init_speed * unit];
+            let sz = (size * (1.0 + size_var * hs(id, 3, seed))).max(0.01);
+            st.b.push(FoamBubble { p, v, age: 0.0, size: sz, spin: hs(id, 12, seed) * std::f32::consts::PI, id });
+        }
+        for _ in 0..substeps {
+            let k = 1.0 / substeps as f32;
+            // Forces: drift towards the wind, turbulence, viscosity, the flow map's slope.
+            for q in st.b.iter_mut() {
+                let n1 = value_noise(q.p[0] / (lw * 0.15), q.p[1] / (lw * 0.15), t * 0.5, seed) - 0.5;
+                let n2 = value_noise(q.p[0] / (lw * 0.15) + 19.0, q.p[1] / (lw * 0.15), t * 0.5, seed) - 0.5;
+                for c in 0..2 {
+                    q.v[c] += (wvec[c] - q.v[c]) * 0.1 * k;
+                    q.v[c] *= 1.0 - viscosity * 0.5 * k;
+                }
+                q.v[0] += n1 * turb * unit * k;
+                q.v[1] += n2 * turb * unit * k;
+                if height.is_some() && steep != 0.0 {
+                    let e = unit.max(1.0);
+                    let gx = (h_at(q.p[0] + e, q.p[1]) - h_at(q.p[0] - e, q.p[1])) / (2.0 * e);
+                    let gy = (h_at(q.p[0], q.p[1] + e) - h_at(q.p[0], q.p[1] - e)) / (2.0 * e);
+                    // Downhill: from light (high) to dark (low).
+                    q.v[0] -= gx * steep * lw * 0.5 * k;
+                    q.v[1] -= gy * steep * lw * 0.5 * k;
+                }
+                // Physical Orientation: bubbles roll with their sideways motion.
+                q.spin += q.v[0] / (rad(q).max(0.5)) * k;
+            }
+            // Repulsion between overlapping bubbles (grid hashed, deterministic order).
+            if repulsion > 0.0 && st.b.len() > 1 {
+                let maxr = st.b.iter().map(rad).fold(0.0f32, f32::max).max(1.0);
+                let cs = maxr * 2.0;
+                let mut grid: std::collections::HashMap<(i32, i32), Vec<usize>> = std::collections::HashMap::new();
+                for (i, q) in st.b.iter().enumerate() {
+                    grid.entry(((q.p[0] / cs).floor() as i32, (q.p[1] / cs).floor() as i32)).or_default().push(i);
+                }
+                let mut push = vec![[0.0f32; 2]; st.b.len()];
+                for (i, q) in st.b.iter().enumerate() {
+                    let (gx, gy) = ((q.p[0] / cs).floor() as i32, (q.p[1] / cs).floor() as i32);
+                    for dy in -1..=1 {
+                        for dx in -1..=1 {
+                            let Some(list) = grid.get(&(gx + dx, gy + dy)) else { continue };
+                            for &j in list {
+                                if j <= i {
+                                    continue;
+                                }
+                                let o = &st.b[j];
+                                let (ddx, ddy) = (o.p[0] - q.p[0], o.p[1] - q.p[1]);
+                                let d = (ddx * ddx + ddy * ddy).sqrt().max(1e-4);
+                                let overlap = rad(q) + rad(o) - d;
+                                if overlap > 0.0 {
+                                    let f = overlap * 0.5 * repulsion.min(4.0) * (1.0 - sticky * 0.5) / d * k;
+                                    push[i][0] -= ddx * f;
+                                    push[i][1] -= ddy * f;
+                                    push[j][0] += ddx * f;
+                                    push[j][1] += ddy * f;
+                                }
+                            }
+                        }
+                    }
+                }
+                for (q, d) in st.b.iter_mut().zip(&push) {
+                    q.p[0] += d[0].clamp(-maxr, maxr);
+                    q.p[1] += d[1].clamp(-maxr, maxr);
+                }
+            }
+            for q in st.b.iter_mut() {
+                q.p[0] += q.v[0] * k;
+                q.p[1] += q.v[1] * k;
+            }
+        }
+        for q in st.b.iter_mut() {
+            q.age += 1.0;
+        }
+        // Pops: bubbles past their pop age burst, pushing their neighbours away.
+        let popped: Vec<([f32; 2], f32)> = st.b.iter().filter(|q| q.age >= foam_pop_age(q.id, lifespan, frailty, seed)).map(|q| (q.p, rad(q))).collect();
+        if pop_velocity != 0.0 {
+            for (pp, pr_) in &popped {
+                let reach = (pr_ * 3.0).max(unit);
+                for q in st.b.iter_mut() {
+                    let (dx, dy) = (q.p[0] - pp[0], q.p[1] - pp[1]);
+                    let d = (dx * dx + dy * dy).sqrt();
+                    if d > 1e-4 && d < reach {
+                        let f = pop_velocity * unit * (1.0 - d / reach) / d;
+                        q.v[0] += dx * f;
+                        q.v[1] += dy * f;
+                    }
+                }
+            }
+        }
+        st.b.retain(|q| q.age < foam_pop_age(q.id, lifespan, frailty, seed) && q.p[0] > ux0 && q.p[0] < ux1 && q.p[1] > uy0 && q.p[1] < uy1);
+    });
+    let view = pr.e("view");
+    let zoom = pr.f("zoom").max(0.01) as f32;
+    let zoom_producer = pr.b("producer/zoomProducerPoint");
+    let texture = pr.e("rendering/bubbleTexture");
+    let orient = pr.e("rendering/bubbleOrientation");
+    let blend = pr.e("rendering/blendMode");
+    let s = b.scale as f32;
+    // Zoom centres on the layer, or on the producer with Zoom Producer Point.
+    let (cx, cy) = if zoom_producer { (prod[0] as f32, prod[1] as f32) } else { (lw * 0.5, lh * 0.5) };
+    let mut order: Vec<&FoamBubble> = st.b.iter().collect();
+    if blend == 2 {
+        // Solid New on Top: oldest first.
+        order.sort_by(|a, c| c.age.total_cmp(&a.age).then(a.id.cmp(&c.id)));
+    } else if blend == 1 {
+        order.sort_by(|a, c| a.age.total_cmp(&c.age).then(a.id.cmp(&c.id)));
+    }
+    // Where a bubble is drawn: buffer centre, radius, rotation (radians).
+    let place = |q: &FoamBubble| {
+        let wob = if wobble > 0.0 { 1.0 + wobble * 0.15 * ((q.age * 0.35) + hs(q.id, 13, seed) * 6.0).sin() } else { 1.0 };
+        let r = rad(q) * wob * zoom * s;
+        let (bx, by) = b.to_px([(cx + (q.p[0] - cx) * zoom) as f64, (cy + (q.p[1] - cy) * zoom) as f64]);
+        let rot = match orient {
+            1 => q.spin,
+            2 => q.v[1].atan2(q.v[0]),
+            _ => 0.0,
+        };
+        (bx, by, r, rot)
+    };
+    let user_tex = (view == 2 && texture == 5).then(|| ctx.layer_param("rendering/bubbleTextureLayer", true)).flatten();
+    let sprites: Vec<Sprite> = order
+        .iter()
+        .filter(|_| user_tex.is_none())
+        .map(|q| {
+            let (bx, by, r, rot) = place(q);
+            let fade = ((foam_pop_age(q.id, lifespan, frailty, seed) - q.age) / 5.0).clamp(0.0, 1.0);
+            // Draft and Draft + Flow Map show the wireframe-style bubbles.
+            let mut sp = if view != 2 {
+                Sprite::new(bx as f32, by as f32, r, [0.55, 0.75, 1.0, fade], Shape::Bubble)
+            } else {
+                let (c, shape) = match texture {
+                    1 => ([0.95, 0.95, 0.92], Shape::Faded),
+                    2 => ([1.0, 0.6, 0.8], Shape::Bubble),
+                    3 => ([0.8, 0.85, 0.75], Shape::Bubble),
+                    4 => ([0.97, 0.97, 0.95], Shape::Sphere),
+                    _ => ([1.0, 1.0, 1.0], Shape::Bubble),
+                };
+                Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], fade], shape)
+            };
+            sp.rot = rot;
+            sp
+        })
+        .collect();
+    let acc = if blend == 0 && view == 2 { Acc::Add } else { Acc::Over };
+    let disc = |q: &&FoamBubble| {
+        let (x, y, r, rot) = place(q);
+        let fade = ((foam_pop_age(q.id, lifespan, frailty, seed) - q.age) / 5.0).clamp(0.0, 1.0);
+        FoamDisc { x, y, r, rot, fade }
+    };
+    let user = user_tex.map(|tex| (tex, order.iter().map(disc).collect()));
+    let strength = pr.f("rendering/reflectionStrength").clamp(0.0, 1.0) as f32;
+    let env = if view == 2
+        && strength > 0.0
+        && let Some(env) = ctx.layer_param("rendering/environmentMap", true)
+    {
+        Some(FoamEnv {
+            img: crate::util::fit_layer(ctx, b, &env, true),
+            conv: pr.f("rendering/reflectionConvergence").clamp(0.0, 1.0),
+            strength,
+            discs: order.iter().map(disc).collect(),
+        })
+    } else {
+        None
+    };
+    let flow = if view == 1
+        && let Some(lp) = &flow
+    {
+        Some(crate::util::fit_layer(ctx, b, lp, true))
+    } else {
+        None
+    };
+    FoamPlan { sprites: crate::sim::SpritePlan { sprites, tints: vec![], acc, post: crate::sim::Post::Replace }, user, env, flow }
+}
+
+/// Add `f(u, v)` (premultiplied; u, v ∈ −1..1 across the disc) over the disc of radius `r` at
+/// (`x`, `y`) with anti-aliased edges ("over" for opaque texels, additive for alpha 0).
+fn foam_disc(out: &mut Image, x: f64, y: f64, r: f64, f: impl Fn(f64, f64) -> Px) {
+    if r <= 0.0 {
+        return;
+    }
+    let (x0, x1) = ((x - r - 1.0).floor().max(0.0) as i64, (x + r + 1.0).ceil().min(out.width as f64) as i64);
+    let (y0, y1) = ((y - r - 1.0).floor().max(0.0) as i64, (y + r + 1.0).ceil().min(out.height as f64) as i64);
+    for py in y0..y1 {
+        for px in x0..x1 {
+            let (u, v) = ((px as f64 + 0.5 - x) / r, (py as f64 + 0.5 - y) / r);
+            let d = (u * u + v * v).sqrt();
+            let cov = ((1.0 - d) * r + 0.5).clamp(0.0, 1.0) as f32;
+            if cov <= 0.0 {
+                continue;
+            }
+            let s = f(u.clamp(-1.0, 1.0), v.clamp(-1.0, 1.0)).map(|c| c * cov);
+            let o = out.get(px, py);
+            let k = 1.0 - s[3];
+            out.set(px as u32, py as u32, [s[0] + o[0] * k, s[1] + o[1] * k, s[2] + o[2] * k, (s[3] + o[3] * k).min(1.0)]);
+        }
+    }
+}
diff --git a/crates/effects/src/sim2/pieces.rs b/crates/effects/src/sim2/pieces.rs
new file mode 100644
index 000000000..bff5943c0
--- /dev/null
+++ b/crates/effects/src/sim2/pieces.rs
@@ -0,0 +1,277 @@
+use super::shatter::{ShatterPlan, card_dance_plan, shatter_impl};
+use super::{Acc, Buf, EffectCtx, Image, Lighting, Proj, raster, unpremul};
+
+// ------------------------------------------------------------------ 3D pieces
+
+pub(crate) type M3 = [[f64; 3]; 3];
+
+fn mat_mul(a: &M3, b: &M3) -> M3 {
+    std::array::from_fn(|i| std::array::from_fn(|j| (0..3).map(|k| a[i][k] * b[k][j]).sum()))
+}
+
+/// Rotation from Euler angles (radians), applied X then Y then Z.
+pub(super) fn rot_xyz(x: f64, y: f64, z: f64) -> M3 {
+    let (sx, cx) = x.sin_cos();
+    let (sy, cy) = y.sin_cos();
+    let (sz, cz) = z.sin_cos();
+    let rx = [[1.0, 0.0, 0.0], [0.0, cx, -sx], [0.0, sx, cx]];
+    let ry = [[cy, 0.0, sy], [0.0, 1.0, 0.0], [-sy, 0.0, cy]];
+    let rz = [[cz, -sz, 0.0], [sz, cz, 0.0], [0.0, 0.0, 1.0]];
+    mat_mul(&rz, &mat_mul(&ry, &rx))
+}
+
+/// Rotation by `angle` about unit `axis` (Rodrigues).
+pub(crate) fn rot_axis(axis: [f64; 3], angle: f64) -> M3 {
+    let l = (axis[0] * axis[0] + axis[1] * axis[1] + axis[2] * axis[2]).sqrt();
+    if l < 1e-12 || angle == 0.0 {
+        return [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]];
+    }
+    let (x, y, z) = (axis[0] / l, axis[1] / l, axis[2] / l);
+    let (s, c) = angle.sin_cos();
+    let t = 1.0 - c;
+    [
+        [t * x * x + c, t * x * y - s * z, t * x * z + s * y],
+        [t * x * y + s * z, t * y * y + c, t * y * z - s * x],
+        [t * x * z - s * y, t * y * z + s * x, t * z * z + c],
+    ]
+}
+
+pub(super) fn inv3(m: &M3) -> Option<M3> {
+    let det = m[0][0] * (m[1][1] * m[2][2] - m[1][2] * m[2][1]) - m[0][1] * (m[1][0] * m[2][2] - m[1][2] * m[2][0])
+        + m[0][2] * (m[1][0] * m[2][1] - m[1][1] * m[2][0]);
+    if det.abs() < 1e-12 {
+        return None;
+    }
+    let d = 1.0 / det;
+    Some([
+        [(m[1][1] * m[2][2] - m[1][2] * m[2][1]) * d, (m[0][2] * m[2][1] - m[0][1] * m[2][2]) * d, (m[0][1] * m[1][2] - m[0][2] * m[1][1]) * d],
+        [(m[1][2] * m[2][0] - m[1][0] * m[2][2]) * d, (m[0][0] * m[2][2] - m[0][2] * m[2][0]) * d, (m[0][2] * m[1][0] - m[0][0] * m[1][2]) * d],
+        [(m[1][0] * m[2][1] - m[1][1] * m[2][0]) * d, (m[0][1] * m[2][0] - m[0][0] * m[2][1]) * d, (m[0][0] * m[1][1] - m[0][1] * m[1][0]) * d],
+    ])
+}
+
+/// Perspective camera looking down +z at the layer plane z = 0, `d` pixels away, centred on
+/// `c` (buffer pixels): screen = c + (P - c) · d / (d + z).
+#[derive(Clone, Copy)]
+pub(super) struct Cam {
+    pub(super) c: [f64; 2],
+    pub(super) d: f64,
+}
+
+impl Cam {
+    fn proj(self) -> Proj {
+        Proj::simple(self.c, self.d)
+    }
+}
+
+/// A planar textured piece ready to draw.
+#[derive(Clone, Copy, Debug)]
+pub struct Piece {
+    /// Screen (buffer px, homogeneous) → piece-local (a, b, w).
+    pub inv: [[f64; 3]; 3],
+    /// Rest centre of the piece in texture pixels.
+    pub c0: [f32; 2],
+    /// Convex polygon (texture pixels), counter-clockwise in y-down space.
+    pub poly: [[f32; 2]; 6],
+    pub n: u8,
+    pub bbox: [f32; 4],
+    pub shade: f32,
+    /// Lighting: colour multiplier and additive specular highlight.
+    pub tint: [f32; 3],
+    pub spec: [f32; 3],
+    pub alpha: f32,
+    /// Flat straight colour instead of the texture.
+    pub flat: Option<[f32; 3]>,
+    /// Facing away from the camera (draw the back texture).
+    pub back: bool,
+    /// Back faces sample their texture mirrored about the piece centre: 0 no, 1 vertically
+    /// (flipped about the X axis), 2 horizontally (about the Y axis).
+    pub back_mirror: u8,
+    depth: f64,
+}
+
+/// A piece texture: the layer itself or another image (buffer-aligned).
+#[derive(Clone, Debug)]
+pub enum PieceTex {
+    Layer,
+    Image(Image),
+}
+
+/// What a piece-drawing effect (Card Dance, Shatter, Card Wipe) draws this frame: pieces sorted
+/// far to near over a transparent frame, textured by `front` (and `back` for pieces facing
+/// away; none = they take `front`).
+#[derive(Clone, Debug)]
+pub struct PiecePlan {
+    pub pieces: Vec<Piece>,
+    pub front: PieceTex,
+    pub back: Option<PieceTex>,
+}
+
+impl PiecePlan {
+    /// Rasterise over a transparent frame of the layer `b`'s size.
+    pub fn finish(&self, mut b: Buf) -> Buf {
+        let mut out = Image::new(b.img.width, b.img.height);
+        let front = match &self.front {
+            PieceTex::Layer => &b.img,
+            PieceTex::Image(i) => i,
+        };
+        let back = self.back.as_ref().map(|t| match t {
+            PieceTex::Layer => &b.img,
+            PieceTex::Image(i) => i,
+        });
+        draw_pieces(&mut out, &self.pieces, front, back);
+        b.img = out;
+        b
+    }
+}
+
+/// The piece plan of Card Dance, Shatter (Rendered view) or Card Wipe for layer `b` (its pixels
+/// may be read: gradient maps and textures default to the layer), `None` for other effects or
+/// views drawn otherwise.
+pub fn piece_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PiecePlan> {
+    match id {
+        "ec.sim.carddance" => Some(card_dance_plan(ctx, b)),
+        "ec.sim.shatter" if ctx.params.e("view") == 0 => match shatter_impl(ctx, b) {
+            ShatterPlan::Pieces(plan) => Some(plan),
+            ShatterPlan::Wire(_) => None,
+        },
+        "ec.transition.cardwipe" => crate::transition::card_wipe_plan(ctx, b),
+        _ => None,
+    }
+}
+
+impl Piece {
+    /// Place polygon `poly` (texture px, around rest centre `c0`) with rotation `r` and its
+    /// centre at 3D `pos` (buffer px; z away from the camera), seen through `cam`.
+    pub(crate) fn new(poly: &[[f32; 2]], c0: [f32; 2], r: &M3, pos: [f64; 3], cam: impl Into<Proj>) -> Option<Piece> {
+        let cam: Proj = cam.into();
+        let n = poly.len().min(6);
+        if n < 3 {
+            return None;
+        }
+        let m = &cam.m;
+        let row = |i: usize| -> [f64; 3] {
+            [
+                m[i][0] * r[0][0] + m[i][1] * r[1][0] + m[i][2] * r[2][0],
+                m[i][0] * r[0][1] + m[i][1] * r[1][1] + m[i][2] * r[2][1],
+                m[i][0] * pos[0] + m[i][1] * pos[1] + m[i][2] * pos[2] + m[i][3],
+            ]
+        };
+        let hm: M3 = [row(0), row(1), row(2)];
+        let mut bb = [f32::INFINITY, f32::INFINITY, f32::NEG_INFINITY, f32::NEG_INFINITY];
+        for v in &poly[..n] {
+            let (a, b) = ((v[0] - c0[0]) as f64, (v[1] - c0[1]) as f64);
+            let w = hm[2][0] * a + hm[2][1] * b + hm[2][2];
+            if w < cam.near {
+                return None;
+            }
+            let sx = ((hm[0][0] * a + hm[0][1] * b + hm[0][2]) / w) as f32;
+            let sy = ((hm[1][0] * a + hm[1][1] * b + hm[1][2]) / w) as f32;
+            bb = [bb[0].min(sx), bb[1].min(sy), bb[2].max(sx), bb[3].max(sy)];
+        }
+        let inv = inv3(&hm)?;
+        let mut pp = [[0.0f32; 2]; 6];
+        pp[..n].copy_from_slice(&poly[..n]);
+        // Normalise winding so "inside" is cross >= 0 for every edge.
+        let area: f32 = (0..n).map(|i| pp[i][0] * pp[(i + 1) % n][1] - pp[(i + 1) % n][0] * pp[i][1]).sum();
+        if area < 0.0 {
+            pp[..n].reverse();
+        }
+        // The front faces -z at rest; it faces the camera when its normal points at the eye.
+        let eye = cam.eye();
+        let nrm = [-r[0][2], -r[1][2], -r[2][2]];
+        let to_eye = [eye[0] - pos[0], eye[1] - pos[1], eye[2] - pos[2]];
+        let facing = nrm[0] * to_eye[0] + nrm[1] * to_eye[1] + nrm[2] * to_eye[2];
+        let depth = hm[2][2];
+        Some(Piece {
+            inv,
+            c0,
+            poly: pp,
+            n: n as u8,
+            bbox: [bb[0] - 1.0, bb[1] - 1.0, bb[2] + 1.0, bb[3] + 1.0],
+            shade: 1.0,
+            tint: [1.0; 3],
+            spec: [0.0; 3],
+            alpha: 1.0,
+            flat: None,
+            back: facing < 0.0,
+            back_mirror: 0,
+            depth,
+        })
+    }
+
+    /// Lambert factor of the piece normal against a light shining along +z.
+    pub(super) fn facing(r: &M3) -> f32 {
+        r[2][2].abs() as f32
+    }
+
+    /// Light the piece (rotation `r`, centre `pos`) with Lighting / Material.
+    pub(crate) fn light(&mut self, l: &Lighting, r: &M3, pos: [f64; 3], eye: [f64; 3]) {
+        let (t, s) = l.shade([-r[0][2], -r[1][2], -r[2][2]], pos, eye);
+        self.tint = t;
+        self.spec = s;
+    }
+}
+
+impl From<Cam> for Proj {
+    fn from(c: Cam) -> Proj {
+        c.proj()
+    }
+}
+
+/// Draw pieces (already sorted far → near) over `out`.
+pub(crate) fn draw_pieces(out: &mut Image, pieces: &[Piece], front: &Image, back: Option<&Image>) {
+    raster(
+        out,
+        pieces,
+        |q| Some(q.bbox),
+        |q, x, y| {
+            let (xf, yf) = (x as f64, y as f64);
+            let m = &q.inv;
+            let w = m[2][0] * xf + m[2][1] * yf + m[2][2];
+            if w.abs() < 1e-12 {
+                return None;
+            }
+            let u = ((m[0][0] * xf + m[0][1] * yf + m[0][2]) / w) as f32 + q.c0[0];
+            let v = ((m[1][0] * xf + m[1][1] * yf + m[1][2]) / w) as f32 + q.c0[1];
+            let n = q.n as usize;
+            let mut md = f32::INFINITY;
+            for i in 0..n {
+                let a = q.poly[i];
+                let b = q.poly[(i + 1) % n];
+                let (ex, ey) = (b[0] - a[0], b[1] - a[1]);
+                let l = (ex * ex + ey * ey).sqrt().max(1e-6);
+                md = md.min((ex * (v - a[1]) - ey * (u - a[0])) / l);
+            }
+            // Coverage extends half a pixel past the edge so abutting pieces leave no seams.
+            let cov = (md + 1.0).clamp(0.0, 1.0);
+            if cov <= 0.0 {
+                return None;
+            }
+            let (c, a) = match q.flat {
+                Some(c) => (c, 1.0),
+                None => {
+                    let tex = if q.back { back.unwrap_or(front) } else { front };
+                    let (u, v) = match (q.back, q.back_mirror) {
+                        (true, 1) => (u, 2.0 * q.c0[1] - v),
+                        (true, 2) => (2.0 * q.c0[0] - u, v),
+                        _ => (u, v),
+                    };
+                    unpremul(tex.sample_bilinear(u as f64, v as f64))
+                }
+            };
+            let a = a * cov * q.alpha;
+            if a <= 1e-6 {
+                return None;
+            }
+            let k = q.shade;
+            let o: [f32; 3] = std::array::from_fn(|i| c[i] * k * q.tint[i] + q.spec[i]);
+            Some([o[0] * a, o[1] * a, o[2] * a, a])
+        },
+        Acc::Over,
+    );
+}
+
+pub(crate) fn sort_far_first(pieces: &mut [Piece]) {
+    pieces.sort_by(|a, b| b.depth.total_cmp(&a.depth));
+}
diff --git a/crates/effects/src/sim2/pixels.rs b/crates/effects/src/sim2/pixels.rs
new file mode 100644
index 000000000..2cda428db
--- /dev/null
+++ b/crates/effects/src/sim2/pixels.rs
@@ -0,0 +1,228 @@
+use super::pieces::{Cam, Piece, PiecePlan, PieceTex, rot_axis, sort_far_first};
+use super::shatter::{ShatterPlan, shatter_impl};
+use super::{Acc, Buf, EffectCtx, IntoParallelIterator, ParallelIterator, Post, Shape, Sprite, SpritePlan, h, hs, unpremul};
+
+// ------------------------------------------------------------------ CC Ball Action
+
+pub(super) fn ball_action(ctx: &EffectCtx, b: Buf) -> Buf {
+    ball_action_plan(ctx, &b).finish(b)
+}
+
+/// CC Ball Action's balls (far to near), coloured by the layer's pixels.
+fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan {
+    let pr = ctx.params;
+    let scatter = pr.f("scatter") as f32;
+    let axis = pr.e("rotationAxis");
+    let rot = pr.f("rotation").to_radians();
+    let twist_prop = pr.e("twistProperty");
+    let twist = pr.f("twistAngle").to_radians();
+    let spacing = pr.f("gridSpacing").max(1.0) as f32;
+    let size = pr.f("ballSize") as f32 / 100.0;
+    let instab = pr.f("instabilityState").to_radians() as f32;
+    let seed = ctx.seed.wrapping_mul(0x2545f491);
+    let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32);
+    let s = b.scale as f32;
+    let nx = (lw / spacing).ceil().max(1.0) as u32;
+    let ny = (lh / spacing).ceil().max(1.0) as u32;
+    let d = 2.0 * lw.max(lh) as f64;
+    let (cx, cy) = (lw as f64 * 0.5, lh as f64 * 0.5);
+    let src = &b.img;
+    let ax: [f64; 3] = match axis {
+        0 => [1.0, 0.0, 0.0],
+        1 => [0.0, 1.0, 0.0],
+        2 => [0.0, 0.0, 1.0],
+        3 => [1.0, 1.0, 0.0],
+        4 => [1.0, 0.0, 1.0],
+        5 => [0.0, 1.0, 1.0],
+        _ => [1.0, 1.0, 1.0],
+    };
+    let maxr = ((lw * lw + lh * lh).sqrt() * 0.5).max(1.0);
+    let mut balls: Vec<(f64, Sprite)> = (0..nx * ny)
+        .into_par_iter()
+        .filter_map(|i| {
+            let gx = (i % nx) as f32 * spacing + spacing * 0.5;
+            let gy = (i / nx) as f32 * spacing + spacing * 0.5;
+            let (sx, sy) = b.to_px([gx as f64, gy as f64]);
+            let (c, a) = unpremul(src.sample_bilinear(sx, sy));
+            if a <= 0.0 || size <= 0.0 {
+                return None;
+            }
+            let tp = match twist_prop {
+                0 => gx / lw.max(1.0),
+                1 => gy / lh.max(1.0),
+                2 => ((gx - cx as f32).hypot(gy - cy as f32)) / maxr,
+                _ => crate::util::rgb3([c[0], c[1], c[2], 0.0]).iter().sum::<f32>() / 3.0,
+            } as f64;
+            let ang = rot + twist * tp;
+            // Scatter: random 3D offsets whose direction drifts with the instability state.
+            let ph = h(i, 1, seed) * std::f32::consts::TAU + instab;
+            let sc = scatter * h(i, 2, seed);
+            let off = [(sc * ph.cos()) as f64, (sc * ph.sin()) as f64, (scatter * hs(i, 3, seed)) as f64];
+            let p0 = [gx as f64 - cx + off[0], gy as f64 - cy + off[1], off[2]];
+            let m = rot_axis(ax, ang);
+            let q: [f64; 3] = std::array::from_fn(|k| m[k][0] * p0[0] + m[k][1] * p0[1] + m[k][2] * p0[2]);
+            if d + q[2] <= d * 0.05 {
+                return None;
+            }
+            let persp = d / (d + q[2]);
+            let (bx, by) = b.to_px([cx + q[0] * persp, cy + q[1] * persp]);
+            let r = spacing * 0.5 * size * persp as f32 * s;
+            Some((q[2], Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], a], Shape::Sphere)))
+        })
+        .collect();
+    balls.sort_by(|a, b| b.0.total_cmp(&a.0));
+    let sprites: Vec<Sprite> = balls.into_iter().map(|(_, s)| s).collect();
+    SpritePlan { sprites, tints: vec![], acc: Acc::Over, post: Post::Replace }
+}
+
+// ------------------------------------------------------------------ CC Pixel Polly
+
+pub(super) fn pixel_polly(ctx: &EffectCtx, b: Buf) -> Buf {
+    match pixel_polly_plan(ctx, &b) {
+        Some(plan) => plan.finish(b),
+        None => b,
+    }
+}
+
+/// CC Pixel Polly's pieces, `None` before Start Time (the layer as is).
+fn pixel_polly_plan(ctx: &EffectCtx, b: &Buf) -> Option<PiecePlan> {
+    let pr = ctx.params;
+    let t = ctx.time - pr.f("startTime");
+    if t <= 0.0 {
+        return None;
+    }
+    let force = pr.f("force");
+    let gravity = pr.f("gravity");
+    let spin = pr.f("spinning").to_radians();
+    let fc = pr.v2("forceCenter");
+    let dir_rand = pr.f("directionRandomness") / 100.0;
+    let spd_rand = pr.f("speedRandomness") / 100.0;
+    let g = pr.f("gridSpacing").max(1.0);
+    let object = pr.e("object");
+    let depth_sort = pr.b("enableDepthSort");
+    let seed = ctx.seed.wrapping_mul(0x632be5ab);
+    let [lw, lh] = ctx.layer_size;
+    let s = b.scale;
+    let cam = Cam { c: [b.offset[0] + lw * 0.5 * s, b.offset[1] + lh * 0.5 * s], d: 2.0 * lw.max(lh) * s };
+    let nx = (lw / g).ceil().max(1.0) as u32;
+    let ny = (lh / g).ceil().max(1.0) as u32;
+    let tri = object <= 1;
+    let textured = object == 1 || object == 3;
+    let maxd = lw.max(lh);
+    let src = &b.img;
+    let per = if tri { 2 } else { 1 };
+    let mut pieces: Vec<Piece> = (0..nx * ny * per)
+        .into_par_iter()
+        .filter_map(|i| {
+            let cell = i / per;
+            let (x0, y0) = ((cell % nx) as f64 * g, (cell / nx) as f64 * g);
+            let poly: Vec<[f64; 2]> = if !tri {
+                vec![[x0, y0], [x0 + g, y0], [x0 + g, y0 + g], [x0, y0 + g]]
+            } else if i % 2 == 0 {
+                vec![[x0, y0], [x0 + g, y0], [x0, y0 + g]]
+            } else {
+                vec![[x0 + g, y0], [x0 + g, y0 + g], [x0, y0 + g]]
+            };
+            let c = [poly.iter().map(|v| v[0]).sum::<f64>() / poly.len() as f64, poly.iter().map(|v| v[1]).sum::<f64>() / poly.len() as f64];
+            let (dx, dy) = (c[0] - fc[0], c[1] - fc[1]);
+            let dist = (dx * dx + dy * dy).sqrt().max(1e-6);
+            let ang = dy.atan2(dx) + dir_rand * std::f64::consts::PI * hs(i, 1, seed) as f64;
+            let speed = force / 100.0 * 0.6 * maxd / (1.0 + dist / (0.5 * maxd)) * (1.0 + spd_rand * hs(i, 2, seed) as f64);
+            let vz = -speed * 0.5 * h(i, 3, seed) as f64;
+            let pos = [c[0] + ang.cos() * speed * t, c[1] + ang.sin() * speed * t + 0.5 * gravity * 0.5 * lh * t * t, vz * t];
+            let axis = [hs(i, 4, seed) as f64, hs(i, 5, seed) as f64, hs(i, 6, seed) as f64];
+            let r = rot_axis(axis, t * (std::f64::consts::PI * h(i, 7, seed) as f64 + spin));
+            let tex: Vec<[f32; 2]> = poly.iter().map(|v| [(v[0] * s + b.offset[0]) as f32, (v[1] * s + b.offset[1]) as f32]).collect();
+            let c0 = [(c[0] * s + b.offset[0]) as f32, (c[1] * s + b.offset[1]) as f32];
+            let posb = [pos[0] * s + b.offset[0], pos[1] * s + b.offset[1], pos[2] * s];
+            let mut pc = Piece::new(&tex, c0, &r, posb, cam)?;
+            pc.shade = 0.35 + 0.65 * Piece::facing(&r);
+            if !textured {
+                let (cc, a) = unpremul(src.sample_bilinear(c0[0] as f64, c0[1] as f64));
+                if a <= 0.0 {
+                    return None;
+                }
+                pc.flat = Some(cc);
+                pc.alpha = a;
+            }
+            Some(pc)
+        })
+        .collect();
+    if depth_sort {
+        sort_far_first(&mut pieces);
+    }
+    Some(PiecePlan { pieces, front: PieceTex::Layer, back: None })
+}
+
+// ------------------------------------------------------------------ CC Scatterize
+
+pub(super) fn scatterize(ctx: &EffectCtx, b: Buf) -> Buf {
+    match scatterize_plan(ctx, &b) {
+        Some(plan) => plan.finish(b),
+        None => b,
+    }
+}
+
+/// CC Scatterize's pixel dots, `None` when nothing moves (the layer as is).
+fn scatterize_plan(ctx: &EffectCtx, b: &Buf) -> Option<SpritePlan> {
+    let pr = ctx.params;
+    let scatter = pr.f("scatter") as f32;
+    let right = pr.f("rightTwist").to_radians();
+    let left = pr.f("leftTwist").to_radians();
+    if scatter == 0.0 && right == 0.0 && left == 0.0 {
+        return None;
+    }
+    let add = pr.e("transferMode") == 1;
+    let seed = ctx.seed.wrapping_mul(0x7feb352d);
+    let s = b.scale;
+    let (w, hh) = (b.img.width, b.img.height);
+    let (cx, cy) = (b.offset[0] + ctx.layer_size[0] * 0.5 * s, b.offset[1] + ctx.layer_size[1] * 0.5 * s);
+    let half = (ctx.layer_size[0] * 0.5 * s).max(1.0);
+    let d = 2.0 * ctx.layer_size[0].max(ctx.layer_size[1]) * s;
+    let src = &b.img;
+    let sprites: Vec<Sprite> = (0..w * hh)
+        .into_par_iter()
+        .filter_map(|i| {
+            let px = src.data[i as usize];
+            if px[3] <= 0.0 {
+                return None;
+            }
+            let (x, y) = ((i % w) as f64 + 0.5, (i / w) as f64 + 0.5);
+            // Twist about the horizontal axis through the centre, growing towards each side.
+            let k = ((x - cx) / half).abs().min(1.0);
+            let ang = if x < cx { left } else { right } * k;
+            let (sa, ca) = ang.sin_cos();
+            let (yy, zz) = ((y - cy) * ca, (y - cy) * sa);
+            let persp = d / (d + zz).max(d * 0.05);
+            let jx = hs(i, 1, seed) * scatter * s as f32;
+            let jy = hs(i, 2, seed) * scatter * s as f32;
+            let sx = cx + (x - cx) * persp + jx as f64;
+            let sy = cy + yy * persp + jy as f64;
+            let (c, a) = unpremul(px);
+            Some(Sprite::new(sx as f32, sy as f32, 0.6 * persp as f32, [c[0], c[1], c[2], a], Shape::Disc))
+        })
+        .collect();
+    Some(SpritePlan { sprites, tints: vec![], acc: if add { Acc::Add } else { Acc::Over }, post: Post::Replace })
+}
+
+/// What a particle effect that reads the layer's pixels draws this frame (CC Ball Action, CC
+/// Pixel Polly, CC Scatterize, Shatter's wireframe views), for layer `b`; `None` for other
+/// effects or a frame showing the layer as is.
+pub enum PixelPlan {
+    Sprites(SpritePlan),
+    Pieces(PiecePlan),
+}
+
+/// The [`PixelPlan`] of effect `id` for layer `b` (its pixels are read).
+pub fn pixel_plan(id: &str, ctx: &EffectCtx, b: &Buf) -> Option<PixelPlan> {
+    match id {
+        "ec.sim.ccballaction" => Some(PixelPlan::Sprites(ball_action_plan(ctx, b))),
+        "ec.sim.ccpixelpolly" => pixel_polly_plan(ctx, b).map(PixelPlan::Pieces),
+        "ec.sim.ccscatterize" => scatterize_plan(ctx, b).map(PixelPlan::Sprites),
+        "ec.sim.shatter" => Some(match shatter_impl(ctx, b) {
+            ShatterPlan::Pieces(plan) => PixelPlan::Pieces(plan),
+            ShatterPlan::Wire(plan) => PixelPlan::Sprites(plan),
+        }),
+        _ => None,
+    }
+}
diff --git a/crates/effects/src/sim2/registry.rs b/crates/effects/src/sim2/registry.rs
new file mode 100644
index 000000000..333916a16
--- /dev/null
+++ b/crates/effects/src/sim2/registry.rs
@@ -0,0 +1,288 @@
+use super::foam::{FOAM_TEXTURES, foam};
+use super::pixels::{ball_action, pixel_polly, scatterize};
+use super::shatter::{CD_PROPS, CD_SOURCES, SHATTER_PATTERNS, SHATTER_TEXTURE_MODES, card_dance, shatter};
+use super::surfaces::{caustics, wave_world};
+use super::{EffectSpec, ParamUi, Value, col, num, p, pct, popup, pt, slider, spec};
+
+// ------------------------------------------------------------------ specs
+
+fn producer_params(k: u32, amp: f64, pos: (f64, f64)) -> Vec<crate::ParamSpec> {
+    let ids: [&'static str; 8] = match k {
+        1 => [
+            "producer1/producer1Type",
+            "producer1/producer1Position",
+            "producer1/producer1Length",
+            "producer1/producer1Width",
+            "producer1/producer1Angle",
+            "producer1/producer1Amplitude",
+            "producer1/producer1Frequency",
+            "producer1/producer1Phase",
+        ],
+        _ => [
+            "producer2/producer2Type",
+            "producer2/producer2Position",
+            "producer2/producer2Length",
+            "producer2/producer2Width",
+            "producer2/producer2Angle",
+            "producer2/producer2Amplitude",
+            "producer2/producer2Frequency",
+            "producer2/producer2Phase",
+        ],
+    };
+    vec![
+        p(ids[0], "Type", Value::Enum(0), popup(&["Ring", "Line"])),
+        p(ids[1], "Position", pt(pos.0, pos.1), ParamUi::Point),
+        p(ids[2], "Height/Length", num(0.1), slider(0.0, 2.0, 0.0, 1.0, 3)),
+        p(ids[3], "Width", num(0.1), slider(0.0, 2.0, 0.0, 1.0, 3)),
+        p(ids[4], "Angle", num(0.0), ParamUi::Angle),
+        p(ids[5], "Amplitude", num(amp), slider(-5.0, 5.0, -1.0, 1.0, 3)),
+        p(ids[6], "Frequency", num(1.0), slider(0.0, 30.0, 0.0, 5.0, 3)),
+        p(ids[7], "Phase", num(0.0), ParamUi::Angle),
+    ]
+}
+
+fn card_dance_params() -> Vec<crate::ParamSpec> {
+    let mut v = vec![
+        p("rowsColumns", "Rows & Columns", Value::Enum(0), popup(&["Independent", "Columns Follows Rows"])),
+        p("rows", "Rows", num(10.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
+        p("columns", "Columns", num(10.0), slider(1.0, 1000.0, 1.0, 100.0, 0)),
+        p("backLayer", "Back Layer", Value::Layer(None), ParamUi::Layer),
+        p("gradientLayer1", "Gradient Layer 1", Value::Layer(None), ParamUi::Layer),
+        p("gradientLayer2", "Gradient Layer 2", Value::Layer(None), ParamUi::Layer),
+    ];
+    let names: [[&'static str; 4]; 8] = [
+        ["xPosition/xPosSource", "xPosition/xPosMultiplier", "xPosition/xPosOffset", "X Position"],
+        ["yPosition/yPosSource", "yPosition/yPosMultiplier", "yPosition/yPosOffset", "Y Position"],
+        ["zPosition/zPosSource", "zPosition/zPosMultiplier", "zPosition/zPosOffset", "Z Position"],
+        ["xRotation/xRotSource", "xRotation/xRotMultiplier", "xRotation/xRotOffset", "X Rotation"],
+        ["yRotation/yRotSource", "yRotation/yRotMultiplier", "yRotation/yRotOffset", "Y Rotation"],
+        ["zRotation/zRotSource", "zRotation/zRotMultiplier", "zRotation/zRotOffset", "Z Rotation"],
+        ["xScale/xScaleSource", "xScale/xScaleMultiplier", "xScale/xScaleOffset", "X Scale"],
+        ["yScale/yScaleSource", "yScale/yScaleMultiplier", "yScale/yScaleOffset", "Y Scale"],
+    ];
+    debug_assert_eq!(names.len(), CD_PROPS.len());
+    for (i, n) in names.iter().enumerate() {
+        let rot = (3..6).contains(&i);
+        let scale = i >= 6;
+        let (lo, hi) = if rot { (-3600.0, 3600.0) } else { (-100.0, 100.0) };
+        v.push(p(n[0], "Source", Value::Enum(0), popup(CD_SOURCES)));
+        v.push(p(n[1], "Multiplier", num(0.0), slider(lo, hi, if rot { -360.0 } else { -10.0 }, if rot { 360.0 } else { 10.0 }, 2)));
+        v.push(p(n[2], "Offset", num(if scale { 1.0 } else { 0.0 }), slider(lo, hi, if rot { -360.0 } else { -10.0 }, if rot { 360.0 } else { 10.0 }, 2)));
+    }
+    v.extend(crate::card3d::camera_params(2.0));
+    v.extend(crate::card3d::lighting_params(1.0, 0.25));
+    v.extend(crate::card3d::material_params(0.75));
+    v
+}
+
+pub fn specs() -> Vec<EffectSpec> {
+    vec![
+        spec(
+            "ec.sim.ccballaction",
+            "CC Ball Action",
+            vec![
+                p("scatter", "Scatter", num(0.0), slider(0.0, 2000.0, 0.0, 300.0, 1)),
+                p("rotationAxis", "Rotation Axis", Value::Enum(0), popup(&["X Axis", "Y Axis", "Z Axis", "XY Axis", "XZ Axis", "YZ Axis", "XYZ Axis"])),
+                p("rotation", "Rotation", num(0.0), ParamUi::Angle),
+                p("twistProperty", "Twist Property", Value::Enum(0), popup(&["X Axis", "Y Axis", "Radius", "Brightness"])),
+                p("twistAngle", "Twist Angle", num(0.0), ParamUi::Angle),
+                p("gridSpacing", "Grid Spacing", num(4.0), slider(1.0, 200.0, 1.0, 50.0, 0)),
+                p("ballSize", "Ball Size", num(40.0), slider(0.0, 400.0, 0.0, 200.0, 1)),
+                p("instabilityState", "Instability State", num(0.0), ParamUi::Angle),
+            ],
+            ball_action,
+        ),
+        spec(
+            "ec.sim.ccpixelpolly",
+            "CC Pixel Polly",
+            vec![
+                p("force", "Force", num(100.0), slider(-1000.0, 1000.0, -300.0, 300.0, 1)),
+                p("gravity", "Gravity", num(1.0), slider(-20.0, 20.0, -5.0, 5.0, 2)),
+                p("spinning", "Spinning", num(0.0), ParamUi::Angle),
+                p("forceCenter", "Force Center", pt(0.5, 0.5), ParamUi::Point),
+                p("directionRandomness", "Direction Randomness", num(10.0), pct()),
+                p("speedRandomness", "Speed Randomness", num(10.0), pct()),
+                p("gridSpacing", "Grid Spacing", num(10.0), slider(1.0, 500.0, 2.0, 100.0, 0)),
+                p("object", "Object", Value::Enum(0), popup(&["Polygon", "Textured Polygon", "Square", "Textured Square"])),
+                p("enableDepthSort", "Enable Depth Sort", Value::Bool(true), ParamUi::Checkbox),
+                p("startTime", "Start Time (sec)", num(0.0), slider(-1000.0, 1000.0, 0.0, 10.0, 2)),
+            ],
+            pixel_polly,
+        ),
+        spec(
+            "ec.sim.ccscatterize",
+            "CC Scatterize",
+            vec![
+                p("scatter", "Scatter", num(0.0), slider(0.0, 1000.0, 0.0, 200.0, 1)),
+                p("rightTwist", "Right Twist", num(0.0), ParamUi::Angle),
+                p("leftTwist", "Left Twist", num(0.0), ParamUi::Angle),
+                p("transferMode", "Transfer Mode", Value::Enum(0), popup(&["Composite", "Add"])),
+            ],
+            scatterize,
+        ),
+        spec("ec.sim.carddance", "Card Dance", card_dance_params(), card_dance),
+        spec(
+            "ec.sim.caustics",
+            "Caustics",
+            vec![
+                p("bottom/bottom", "Bottom", Value::Layer(None), ParamUi::Layer),
+                p("bottom/scaling", "Scaling", num(1.0), slider(0.01, 10.0, 0.1, 3.0, 3)),
+                p("bottom/repeatMode", "Repeat Mode", Value::Enum(2), popup(&["Once", "Tiled", "Reflected"])),
+                p("bottom/bottomSizeDiffers", "If Layer Size Differs", Value::Enum(1), popup(&["Center", "Stretch to Fit"])),
+                p("bottom/blur", "Blur", num(0.0), slider(0.0, 100.0, 0.0, 20.0, 1)),
+                p("water/waterSurface", "Water Surface", Value::Layer(None), ParamUi::Layer),
+                p("water/waveHeight", "Wave Height", num(0.2), slider(-1.0, 1.0, -1.0, 1.0, 3)),
+                p("water/smoothing", "Smoothing", num(5.0), slider(0.0, 100.0, 0.0, 50.0, 1)),
+                p("water/waterDepth", "Water Depth", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("water/refractiveIndex", "Refractive Index", num(1.2), slider(1.0, 3.0, 1.0, 2.0, 3)),
+                p("water/surfaceColor", "Surface Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("water/surfaceOpacity", "Surface Opacity", num(0.3), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("water/causticsStrength", "Caustics Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("sky/sky", "Sky", Value::Layer(None), ParamUi::Layer),
+                p("sky/scaling", "Scaling", num(1.0), slider(0.01, 10.0, 0.1, 3.0, 3)),
+                p("sky/repeatMode", "Repeat Mode", Value::Enum(2), popup(&["Once", "Tiled", "Reflected"])),
+                p("sky/skySizeDiffers", "If Layer Size Differs", Value::Enum(1), popup(&["Center", "Stretch to Fit"])),
+                p("sky/intensity", "Intensity", num(0.3), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("sky/convergence", "Convergence", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("lighting/lightType", "Light Type", Value::Enum(0), popup(&crate::card3d::LIGHT_TYPES)),
+                p("lighting/lightIntensity", "Light Intensity", num(1.0), slider(0.0, 4.0, 0.0, 2.0, 2)),
+                p("lighting/lightColor", "Light Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("lighting/lightPosition", "Light Position", pt(0.0, 0.0), ParamUi::Point),
+                p("lighting/lightHeight", "Light Height", num(1.0), slider(0.0, 10.0, 0.0, 4.0, 2)),
+                p("lighting/ambientLight", "Ambient Light", num(0.35), slider(0.0, 2.0, 0.0, 1.0, 2)),
+                p("material/diffuse", "Diffuse Reflection", num(0.75), slider(0.0, 2.0, 0.0, 1.0, 2)),
+                p("material/specular", "Specular Reflection", num(0.2), slider(0.0, 2.0, 0.0, 1.0, 2)),
+                p("material/highlightSharpness", "Highlight Sharpness", num(15.0), slider(1.0, 100.0, 1.0, 100.0, 1)),
+            ],
+            caustics,
+        ),
+        spec(
+            "ec.sim.waveworld",
+            "Wave World",
+            {
+                let mut v = vec![
+                    p("view", "View", Value::Enum(0), popup(&["Wireframe Preview", "Height Map"])),
+                    p("wireframeControls/horizontalRotation", "Horizontal Rotation", num(0.0), ParamUi::Angle),
+                    p("wireframeControls/verticalRotation", "Vertical Rotation", num(53.0), slider(0.0, 90.0, 0.0, 90.0, 1)),
+                    p("wireframeControls/verticalScale", "Vertical Scale", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
+                    p("heightMapControls/brightness", "Brightness", num(0.5), slider(-1.0, 2.0, 0.0, 1.0, 3)),
+                    p("heightMapControls/contrast", "Contrast", num(0.75), slider(0.0, 4.0, 0.0, 2.0, 3)),
+                    p("heightMapControls/gamma", "Gamma Adjustment", num(1.0), slider(0.01, 10.0, 0.2, 5.0, 3)),
+                    p("heightMapControls/renderDryAreasAs", "Render Dry Areas As", Value::Enum(0), popup(&["Solid", "Transparent"])),
+                    p("heightMapControls/transparency", "Transparency", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                    p("simulation/gridResolution", "Grid Resolution", num(60.0), slider(1.0, 400.0, 1.0, 200.0, 0)),
+                    p("simulation/gridResDownsamples", "Grid Res Downsamples", Value::Bool(false), ParamUi::Checkbox),
+                    p("simulation/waveSpeed", "Wave Speed", num(0.2), slider(0.0, 5.0, 0.0, 1.0, 3)),
+                    p("simulation/damping", "Damping", num(0.05), slider(0.0, 5.0, 0.0, 1.0, 3)),
+                    p("simulation/reflectEdges", "Reflect Edges", Value::Enum(0), popup(&["None", "Left", "Top", "Right", "Bottom", "All"])),
+                    p("simulation/preRoll", "Pre-roll (seconds)", num(0.0), slider(0.0, 30.0, 0.0, 10.0, 2)),
+                    p("ground/ground", "Ground", Value::Layer(None), ParamUi::Layer),
+                    p("ground/steepness", "Steepness", num(0.25), slider(0.0, 2.0, 0.0, 1.0, 3)),
+                    p("ground/height", "Height", num(0.25), slider(0.0, 2.0, 0.0, 1.0, 3)),
+                    p("ground/waveStrength", "Wave Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                ];
+                v.extend(producer_params(1, 0.5, (0.5, 0.5)));
+                v.extend(producer_params(2, 0.0, (0.25, 0.25)));
+                v
+            },
+            wave_world,
+        ),
+        spec(
+            "ec.sim.shatter",
+            "Shatter",
+            vec![
+                p(
+                    "view",
+                    "View",
+                    Value::Enum(1),
+                    popup(&["Rendered", "Wireframe Front View", "Wireframe", "Wireframe Front View + Forces", "Wireframe + Forces"]),
+                ),
+                p("render", "Render", Value::Enum(0), popup(&["All", "Layer", "Pieces"])),
+                p("shape/pattern", "Pattern", Value::Enum(0), popup(SHATTER_PATTERNS)),
+                p("shape/repetitions", "Repetitions", num(10.0), slider(1.0, 500.0, 1.0, 100.0, 2)),
+                p("shape/direction", "Direction", num(0.0), ParamUi::Angle),
+                p("shape/origin", "Origin", pt(0.5, 0.5), ParamUi::Point),
+                p("shape/customShatterMap", "Custom Shatter Map", Value::Layer(None), ParamUi::Layer),
+                p("shape/whiteTilesFixed", "White Tiles Fixed", Value::Bool(false), ParamUi::Checkbox),
+                p("shape/extrusionDepth", "Extrusion Depth", num(0.05), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("force1/force1Position", "Position", pt(0.5, 0.5), ParamUi::Point),
+                p("force1/force1Depth", "Depth", num(0.1), slider(-1.0, 1.0, -1.0, 1.0, 3)),
+                p("force1/force1Radius", "Radius", num(0.4), slider(0.0, 4.0, 0.0, 2.0, 3)),
+                p("force1/force1Strength", "Strength", num(5.0), slider(-20.0, 20.0, -10.0, 10.0, 2)),
+                p("force2/force2Position", "Position", pt(0.25, 0.25), ParamUi::Point),
+                p("force2/force2Depth", "Depth", num(0.1), slider(-1.0, 1.0, -1.0, 1.0, 3)),
+                p("force2/force2Radius", "Radius", num(0.0), slider(0.0, 4.0, 0.0, 2.0, 3)),
+                p("force2/force2Strength", "Strength", num(5.0), slider(-20.0, 20.0, -10.0, 10.0, 2)),
+                p("physics/rotationSpeed", "Rotation Speed", num(0.2), slider(0.0, 5.0, 0.0, 1.0, 3)),
+                p("physics/tumbleAxis", "Tumble Axis", Value::Enum(0), popup(&["Free", "None", "X", "Y", "Z", "XY", "XZ", "YZ"])),
+                p("physics/randomness", "Randomness", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("physics/viscosity", "Viscosity", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("physics/massVariance", "Mass Variance", num(30.0), pct()),
+                p("physics/gravity", "Gravity", num(3.0), slider(0.0, 100.0, 0.0, 10.0, 2)),
+                p("physics/gravityDirection", "Gravity Direction", num(180.0), ParamUi::Angle),
+                p("physics/gravityInclination", "Gravity Inclination", num(0.0), slider(-90.0, 90.0, -90.0, 90.0, 1)),
+                p("gradient/shatterThreshold", "Shatter Threshold", num(0.0), slider(0.0, 100.0, 0.0, 100.0, 1)),
+                p("gradient/gradientLayer", "Gradient Layer", Value::Layer(None), ParamUi::Layer),
+                p("gradient/invertGradient", "Invert Gradient", Value::Bool(false), ParamUi::Checkbox),
+                p("textures/color", "Color", col(1.0, 1.0, 1.0), ParamUi::Color),
+                p("textures/opacity", "Opacity", num(1.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("textures/frontMode", "Front Mode", Value::Enum(1), popup(&SHATTER_TEXTURE_MODES)),
+                p("textures/sideMode", "Side Mode", Value::Enum(0), popup(&SHATTER_TEXTURE_MODES)),
+                p("textures/backMode", "Back Mode", Value::Enum(1), popup(&SHATTER_TEXTURE_MODES)),
+                p("textures/frontLayer", "Front Layer", Value::Layer(None), ParamUi::Layer),
+                p("textures/sideLayer", "Side Layer", Value::Layer(None), ParamUi::Layer),
+                p("textures/backLayer", "Back Layer", Value::Layer(None), ParamUi::Layer),
+            ]
+            .into_iter()
+            .chain(crate::card3d::camera_params(4.0))
+            .chain(crate::card3d::lighting_params(1.0, 0.25))
+            .chain(crate::card3d::material_params(0.75))
+            .chain([p("randomSeed", "Random Seed", num(0.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0))])
+            .collect(),
+            shatter,
+        ),
+        spec(
+            "ec.sim.foam",
+            "Foam",
+            vec![
+                p("view", "View", Value::Enum(0), popup(&["Draft", "Draft + Flow Map", "Rendered"])),
+                p("producer/producerPoint", "Producer Point", pt(0.5, 0.5), ParamUi::Point),
+                p("producer/producerXSize", "Producer X Size", num(0.05), slider(0.0, 2.0, 0.0, 1.0, 3)),
+                p("producer/producerYSize", "Producer Y Size", num(0.05), slider(0.0, 2.0, 0.0, 1.0, 3)),
+                p("producer/producerOrientation", "Producer Orientation", num(0.0), ParamUi::Angle),
+                p("producer/zoomProducerPoint", "Zoom Producer Point", Value::Bool(false), ParamUi::Checkbox),
+                p("producer/productionRate", "Production Rate", num(1.0), slider(0.0, 50.0, 0.0, 10.0, 3)),
+                p("bubbles/size", "Size", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
+                p("bubbles/sizeVariance", "Size Variance", num(0.5), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("bubbles/lifespan", "Lifespan", num(300.0), slider(1.0, 30_000.0, 1.0, 1000.0, 1)),
+                p("bubbles/growthSpeed", "Bubble Growth Speed", num(0.1), slider(0.0001, 10.0, 0.0001, 1.0, 3)),
+                p("bubbles/strength", "Strength", num(10.0), slider(0.0, 100.0, 0.0, 20.0, 2)),
+                p("physics/initialSpeed", "Initial Speed", num(0.0), slider(-100.0, 100.0, -10.0, 10.0, 3)),
+                p("physics/initialDirection", "Initial Direction", num(0.0), ParamUi::Angle),
+                p("physics/windSpeed", "Wind Speed", num(0.5), slider(-100.0, 100.0, -10.0, 10.0, 3)),
+                p("physics/windDirection", "Wind Direction", num(90.0), ParamUi::Angle),
+                p("physics/turbulence", "Turbulence", num(0.5), slider(0.0, 10.0, 0.0, 2.0, 3)),
+                p("physics/wobbleAmount", "Wobble Amount", num(0.05), slider(0.0, 10.0, 0.0, 2.0, 3)),
+                p("physics/repulsion", "Repulsion", num(1.0), slider(0.0, 10.0, 0.0, 2.0, 3)),
+                p("physics/popVelocity", "Pop Velocity", num(1.0), slider(-100.0, 100.0, -10.0, 10.0, 3)),
+                p("physics/viscosity", "Viscosity", num(0.1), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("physics/stickiness", "Stickiness", num(0.75), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("zoom", "Zoom", num(1.0), slider(0.01, 50.0, 0.1, 5.0, 3)),
+                p("universeSize", "Universe Size", num(1.0), slider(0.01, 10.0, 0.5, 3.0, 3)),
+                p("rendering/blendMode", "Blend Mode", Value::Enum(0), popup(&["Transparent", "Solid Old on Top", "Solid New on Top"])),
+                p("rendering/bubbleTexture", "Bubble Texture", Value::Enum(0), popup(&FOAM_TEXTURES)),
+                p("rendering/bubbleTextureLayer", "Bubble Texture Layer", Value::Layer(None), ParamUi::Layer),
+                p("rendering/bubbleOrientation", "Bubble Orientation", Value::Enum(0), popup(&["Fixed", "Physical Orientation", "Bubble Velocity"])),
+                p("rendering/environmentMap", "Environment Map", Value::Layer(None), ParamUi::Layer),
+                p("rendering/reflectionStrength", "Reflection Strength", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("rendering/reflectionConvergence", "Reflection Convergence", num(0.0), slider(0.0, 1.0, 0.0, 1.0, 3)),
+                p("flowMap/flowMap", "Flow Map", Value::Layer(None), ParamUi::Layer),
+                p("flowMap/flowMapSteepness", "Flow Map Steepness", num(0.05), slider(-100.0, 100.0, -1.0, 1.0, 3)),
+                p("flowMap/flowMapFits", "Flow Map Fits", Value::Enum(0), popup(&["Background", "Universe"])),
+                p("flowMap/simulationQuality", "Simulation Quality", Value::Enum(0), popup(&["Normal", "High", "Intense"])),
+                p("randomSeed", "Random Seed", num(1.0), slider(0.0, 10_000.0, 0.0, 1000.0, 0)),
+            ],
+            foam,
+        ),
+    ]
+}
diff --git a/crates/effects/src/sim2/shatter.rs b/crates/effects/src/sim2/shatter.rs
new file mode 100644
index 000000000..844fbb4b3
--- /dev/null
+++ b/crates/effects/src/sim2/shatter.rs
@@ -0,0 +1,484 @@
+use super::pieces::{M3, Piece, PiecePlan, PieceTex, inv3, rot_axis, rot_xyz, sort_far_first};
+use super::{
+    Acc, Buf, EffectCtx, Image, IndexedParallelIterator, IntoParallelIterator, IntoParallelRefIterator, Lighting, ParallelIterator, Post, Shape, Sprite,
+    SpritePlan, Value, h, hs, layer_or_self, unpremul,
+};
+
+// ------------------------------------------------------------------ Card Dance
+
+pub(super) const CD_SOURCES: &[&str] =
+    &["None", "Intensity 1", "Red 1", "Green 1", "Blue 1", "Alpha 1", "Intensity 2", "Red 2", "Green 2", "Blue 2", "Alpha 2"];
+
+/// (param id prefix, twirl-down group match id) per transformed card property.
+pub(super) const CD_PROPS: [(&str, &str); 8] = [
+    ("xPos", "xPosition"),
+    ("yPos", "yPosition"),
+    ("zPos", "zPosition"),
+    ("xRot", "xRotation"),
+    ("yRot", "yRotation"),
+    ("zRot", "zRotation"),
+    ("xScale", "xScale"),
+    ("yScale", "yScale"),
+];
+
+fn card_source(src: u32, g1: [f32; 4], g2: [f32; 4]) -> f32 {
+    let (c1, a1) = unpremul(g1);
+    let (c2, a2) = unpremul(g2);
+    let lum = |c: [f32; 3]| effectcraft_color::luminance(c[0], c[1], c[2]);
+    match src {
+        1 => lum(c1),
+        2 => c1[0],
+        3 => c1[1],
+        4 => c1[2],
+        5 => a1,
+        6 => lum(c2),
+        7 => c2[0],
+        8 => c2[1],
+        9 => c2[2],
+        10 => a2,
+        _ => 0.0,
+    }
+}
+
+pub(super) fn card_dance(ctx: &EffectCtx, b: Buf) -> Buf {
+    card_dance_plan(ctx, &b).finish(b)
+}
+
+pub(super) fn card_dance_plan(ctx: &EffectCtx, b: &Buf) -> PiecePlan {
+    let pr = ctx.params;
+    let rows = pr.f("rows").clamp(1.0, 1000.0) as u32;
+    let cols = if pr.e("rowsColumns") == 1 { rows } else { pr.f("columns").clamp(1.0, 1000.0) as u32 };
+    let g1 = layer_or_self(ctx, b, "gradientLayer1", true, true);
+    let g2 = layer_or_self(ctx, b, "gradientLayer2", true, true);
+    let back = ctx.layer_param("backLayer", true).map(|o| crate::util::fit_layer(ctx, b, &o, true));
+    let [lw, lh] = ctx.layer_size;
+    let s = b.scale;
+    let (cw, ch) = (lw / cols as f64, lh / rows as f64);
+    let cam = crate::card3d::projection(ctx, b);
+    let eye = cam.eye();
+    let light = Lighting::from(ctx, b);
+    let props: Vec<(u32, f64, f64)> =
+        CD_PROPS.iter().map(|(id, g)| (pr.e(&format!("{g}/{id}Source")), pr.f(&format!("{g}/{id}Multiplier")), pr.f(&format!("{g}/{id}Offset")))).collect();
+    let mut pieces: Vec<Piece> = (0..rows * cols)
+        .into_par_iter()
+        .filter_map(|i| {
+            let (cx0, cy0) = ((i % cols) as f64 * cw, (i / cols) as f64 * ch);
+            let c = [cx0 + cw * 0.5, cy0 + ch * 0.5];
+            let (bx, by) = (c[0] * s + b.offset[0], c[1] * s + b.offset[1]);
+            let (gp1, gp2) = (g1.sample_bilinear(bx, by), g2.sample_bilinear(bx, by));
+            let val = |k: usize| {
+                let (sr, m, o) = props[k];
+                o + m * card_source(sr, gp1, gp2) as f64
+            };
+            let (sx, sy) = (val(6), val(7));
+            let r = rot_xyz(val(3).to_radians(), val(4).to_radians(), val(5).to_radians());
+            let rs: M3 = std::array::from_fn(|k| [r[k][0] * sx, r[k][1] * sy, r[k][2]]);
+            let pos = [bx + val(0) * cw * s, by + val(1) * ch * s, val(2) * cw.max(ch) * s];
+            let (tx0, ty0) = ((cx0 * s + b.offset[0]) as f32, (cy0 * s + b.offset[1]) as f32);
+            let (tw, th) = ((cw * s) as f32, (ch * s) as f32);
+            let poly = [[tx0, ty0], [tx0 + tw, ty0], [tx0 + tw, ty0 + th], [tx0, ty0 + th]];
+            let mut pc = Piece::new(&poly, [bx as f32, by as f32], &rs, pos, cam)?;
+            pc.light(&light, &r, pos, eye);
+            Some(pc)
+        })
+        .collect();
+    sort_far_first(&mut pieces);
+    PiecePlan { pieces, front: PieceTex::Layer, back: back.map(PieceTex::Image) }
+}
+
+// ------------------------------------------------------------------ Shatter
+
+/// Shatter's Pattern options; the last, Custom, takes its pieces from Custom Shatter Map.
+pub(super) const SHATTER_PATTERNS: &[&str] = &["Bricks", "Glass", "Hexagons", "Squares", "Triangles", "Custom"];
+
+/// Pattern cells (polygons in pattern space, before rotation) covering `[x0, x1]×[y0, y1]`.
+fn pattern_cells(kind: u32, cell: f64, x0: f64, y0: f64, x1: f64, y1: f64, seed: u32) -> Vec<Vec<[f64; 2]>> {
+    let mut out = Vec::new();
+    let i0 = (x0 / cell).floor() as i64 - 1;
+    let i1 = (x1 / cell).ceil() as i64 + 1;
+    let j0 = (y0 / cell).floor() as i64 - 1;
+    let j1 = (y1 / cell).ceil() as i64 + 1;
+    match kind {
+        0 => {
+            let bh = cell * 0.5;
+            let r0 = (y0 / bh).floor() as i64 - 1;
+            let r1 = (y1 / bh).ceil() as i64 + 1;
+            for r in r0..=r1 {
+                let sh = if r.rem_euclid(2) == 1 { cell * 0.5 } else { 0.0 };
+                for i in i0..=i1 {
+                    let (x, y) = (i as f64 * cell + sh, r as f64 * bh);
+                    out.push(vec![[x, y], [x + cell, y], [x + cell, y + bh], [x, y + bh]]);
+                }
+            }
+        }
+        1 => {
+            // Jittered lattice split into triangles along a random diagonal.
+            let jit = |i: i64, j: i64| -> [f64; 2] {
+                let (a, b) = (i as u32, j as u32);
+                [i as f64 * cell + hs(a, b.wrapping_add(17), seed) as f64 * cell * 0.35, j as f64 * cell + hs(a, b.wrapping_add(91), seed) as f64 * cell * 0.35]
+            };
+            for j in j0..=j1 {
+                for i in i0..=i1 {
+                    let (p00, p10, p11, p01) = (jit(i, j), jit(i + 1, j), jit(i + 1, j + 1), jit(i, j + 1));
+                    if h(i as u32, j as u32, seed ^ 0x55) < 0.5 {
+                        out.push(vec![p00, p10, p11]);
+                        out.push(vec![p00, p11, p01]);
+                    } else {
+                        out.push(vec![p00, p10, p01]);
+                        out.push(vec![p10, p11, p01]);
+                    }
+                }
+            }
+        }
+        2 => {
+            let r = cell / 3f64.sqrt();
+            let dx = 1.5 * r;
+            let dy = 3f64.sqrt() * r;
+            let c0 = (x0 / dx).floor() as i64 - 1;
+            let c1 = (x1 / dx).ceil() as i64 + 1;
+            let rr0 = (y0 / dy).floor() as i64 - 1;
+            let rr1 = (y1 / dy).ceil() as i64 + 1;
+            for ci in c0..=c1 {
+                for rj in rr0..=rr1 {
+                    let cx = ci as f64 * dx;
+                    let cy = (rj as f64 + if ci.rem_euclid(2) == 1 { 0.5 } else { 0.0 }) * dy;
+                    out.push(
+                        (0..6)
+                            .map(|k| {
+                                let a = k as f64 * std::f64::consts::PI / 3.0;
+                                [cx + r * a.cos(), cy + r * a.sin()]
+                            })
+                            .collect(),
+                    );
+                }
+            }
+        }
+        3 => {
+            for j in j0..=j1 {
+                for i in i0..=i1 {
+                    let (x, y) = (i as f64 * cell, j as f64 * cell);
+                    out.push(vec![[x, y], [x + cell, y], [x + cell, y + cell], [x, y + cell]]);
+                }
+            }
+        }
+        _ => {
+            for j in j0..=j1 {
+                for i in i0..=i1 {
+                    let (x, y) = (i as f64 * cell, j as f64 * cell);
+                    if (i + j).rem_euclid(2) == 0 {
+                        out.push(vec![[x, y], [x + cell, y], [x, y + cell]]);
+                        out.push(vec![[x + cell, y], [x + cell, y + cell], [x, y + cell]]);
+                    } else {
+                        out.push(vec![[x, y], [x + cell, y], [x + cell, y + cell]]);
+                        out.push(vec![[x, y], [x + cell, y + cell], [x, y + cell]]);
+                    }
+                }
+            }
+        }
+    }
+    out
+}
+
+/// `∫0^t e^{-ks} ds` and `∫0^t ∫0^u e^{-ks} ds du` (drag-damped ballistic factors).
+fn drag_factors(k: f64, t: f64) -> (f64, f64) {
+    if k < 1e-6 {
+        (t, 0.5 * t * t)
+    } else {
+        let e = (-k * t).exp();
+        ((1.0 - e) / k, t / k - (1.0 - e) / (k * k))
+    }
+}
+
+/// Shatter's Front / Side / Back Mode options.
+pub(super) const SHATTER_TEXTURE_MODES: [&str; 3] = ["Color", "Layer", "Tinted Layer"];
+
+/// One face's texture: a flat colour, a layer, or a layer tinted by the Textures colour.
+struct Face {
+    mode: u32,
+    img: Option<Image>,
+}
+
+impl Face {
+    fn from(ctx: &EffectCtx, b: &Buf, mode: &str, layer: &str, default_mode: u32) -> Face {
+        let mode = ctx.params.get(mode).map(|v| v.as_enum()).unwrap_or(default_mode);
+        // A face layer of None is the effect's own layer.
+        let img = (mode != 0).then(|| layer_or_self(ctx, b, layer, true, true));
+        Face { mode, img }
+    }
+}
+
+/// Group key of a Custom Shatter Map colour (pieces of one colour break as one).
+fn map_key(c: [f32; 4]) -> u32 {
+    let (c, a) = unpremul(c);
+    if a < 0.5 {
+        return u32::MAX;
+    }
+    let q = |v: f32| ((v.clamp(0.0, 1.0) * 15.0).round() as u32) & 15;
+    q(c[0]) << 8 | q(c[1]) << 4 | q(c[2])
+}
+
+pub(super) fn shatter(ctx: &EffectCtx, b: Buf) -> Buf {
+    match shatter_impl(ctx, &b) {
+        ShatterPlan::Pieces(plan) => plan.finish(b),
+        ShatterPlan::Wire(plan) => plan.finish(b),
+    }
+}
+
+/// What Shatter draws: the pieces (Rendered view) or the wireframe lines.
+pub(super) enum ShatterPlan {
+    Pieces(PiecePlan),
+    Wire(SpritePlan),
+}
+
+pub(super) fn shatter_impl(ctx: &EffectCtx, b: &Buf) -> ShatterPlan {
+    let pr = ctx.params;
+    let view = pr.e("view");
+    let render = pr.e("render");
+    let kind = pr.e("shape/pattern");
+    let custom = kind as usize == SHATTER_PATTERNS.len() - 1;
+    let reps = pr.f("shape/repetitions").clamp(1.0, 500.0);
+    let dir = pr.f("shape/direction").to_radians();
+    let origin = pr.v2("shape/origin");
+    let forces = [
+        (pr.v2("force1/force1Position"), pr.f("force1/force1Depth"), pr.f("force1/force1Radius"), pr.f("force1/force1Strength")),
+        (pr.v2("force2/force2Position"), pr.f("force2/force2Depth"), pr.f("force2/force2Radius"), pr.f("force2/force2Strength")),
+    ];
+    let rot_speed = pr.f("physics/rotationSpeed");
+    let tumble = pr.e("physics/tumbleAxis");
+    let randomness = pr.f("physics/randomness");
+    let k = pr.f("physics/viscosity").max(0.0) * 5.0;
+    let mass_var = pr.f("physics/massVariance") / 100.0;
+    let gravity = pr.f("physics/gravity");
+    let gdir = pr.f("physics/gravityDirection").to_radians();
+    let ginc = pr.f("physics/gravityInclination").to_radians();
+    let seed = (pr.f("randomSeed") as u32).wrapping_mul(0x9e3779b1) ^ ctx.seed;
+    let [lw, lh] = ctx.layer_size;
+    let s = b.scale;
+    let t = ctx.time.max(0.0);
+    let unit = lw * 0.1;
+    let cell = lw / reps;
+    let extrude = pr.f("shape/extrusionDepth").max(0.0) * cell * s;
+    let cam = crate::card3d::projection(ctx, b);
+    let eye = cam.eye();
+    let light = Lighting::from(ctx, b);
+    // Gradient: with a gradient layer only pieces at least as bright as 1 − Shatter Threshold
+    // (Invert Gradient: as dark) break.
+    let gradient = ctx.layer_param("gradient/gradientLayer", true).map(|o| crate::util::fit_layer(ctx, b, &o, true));
+    let threshold = pr.get("gradient/shatterThreshold").map(Value::as_f64).unwrap_or(0.0) / 100.0;
+    let invert_gradient = pr.b("gradient/invertGradient");
+    // Textures.
+    let tex_color = pr.get("textures/color").map(|v| v.as_color()).unwrap_or([1.0; 4]);
+    let tex_opacity = pr.get("textures/opacity").map(Value::as_f64).unwrap_or(1.0).clamp(0.0, 1.0) as f32;
+    let front = Face::from(ctx, b, "textures/frontMode", "textures/frontLayer", 1);
+    let side = Face::from(ctx, b, "textures/sideMode", "textures/sideLayer", 0);
+    let backf = Face::from(ctx, b, "textures/backMode", "textures/backLayer", 1);
+    let custom_map = custom.then(|| layer_or_self(ctx, b, "shape/customShatterMap", true, true));
+    let white_fixed = pr.b("shape/whiteTilesFixed");
+    let (sd, cd) = dir.sin_cos();
+    let to_layer = |q: [f64; 2]| [origin[0] + q[0] * cd - q[1] * sd, origin[1] + q[0] * sd + q[1] * cd];
+    // Pattern-space bounds of the layer rectangle.
+    let corners = [[0.0, 0.0], [lw, 0.0], [lw, lh], [0.0, lh]].map(|c: [f64; 2]| {
+        let (dx, dy) = (c[0] - origin[0], c[1] - origin[1]);
+        [dx * cd + dy * sd, -dx * sd + dy * cd]
+    });
+    let (px0, px1) = (corners.iter().map(|c| c[0]).fold(f64::INFINITY, f64::min), corners.iter().map(|c| c[0]).fold(f64::NEG_INFINITY, f64::max));
+    let (py0, py1) = (corners.iter().map(|c| c[1]).fold(f64::INFINITY, f64::min), corners.iter().map(|c| c[1]).fold(f64::NEG_INFINITY, f64::max));
+    // Custom Shatter Map: square cells grouped by the map's colour.
+    let cells = pattern_cells(if custom { 3 } else { kind }, cell, px0, py0, px1, py1, seed);
+    let polys: Vec<Vec<[f64; 2]>> = cells.iter().map(|poly| poly.iter().map(|&q| to_layer(q)).collect()).collect();
+    let centre = |lp: &[[f64; 2]]| [lp.iter().map(|v| v[0]).sum::<f64>() / lp.len() as f64, lp.iter().map(|v| v[1]).sum::<f64>() / lp.len() as f64];
+    let keys: Vec<u32> = match &custom_map {
+        Some(m) => polys
+            .iter()
+            .map(|lp| {
+                let c = centre(lp);
+                map_key(m.sample_bilinear(c[0] * s + b.offset[0], c[1] * s + b.offset[1]))
+            })
+            .collect(),
+        None => (0..polys.len() as u32).collect(),
+    };
+    // Group centres (custom map) — each group moves as one rigid piece.
+    let mut groups: std::collections::HashMap<u32, ([f64; 2], f64)> = std::collections::HashMap::new();
+    for (lp, &key) in polys.iter().zip(&keys) {
+        let c = centre(lp);
+        let e = groups.entry(key).or_insert(([0.0; 2], 0.0));
+        e.0[0] += c[0];
+        e.0[1] += c[1];
+        e.1 += 1.0;
+    }
+    let g3 = [gdir.sin() * ginc.cos() * gravity * unit, -gdir.cos() * ginc.cos() * gravity * unit, ginc.sin() * gravity * unit];
+    let mut pieces: Vec<Piece> = polys
+        .par_iter()
+        .zip(keys.par_iter())
+        .flat_map_iter(|(lp, &key)| {
+            let mut out: Vec<Piece> = vec![];
+            let (mnx, mxx) = (lp.iter().map(|v| v[0]).fold(f64::INFINITY, f64::min), lp.iter().map(|v| v[0]).fold(f64::NEG_INFINITY, f64::max));
+            let (mny, mxy) = (lp.iter().map(|v| v[1]).fold(f64::INFINITY, f64::min), lp.iter().map(|v| v[1]).fold(f64::NEG_INFINITY, f64::max));
+            if mxx < 0.0 || mxy < 0.0 || mnx > lw || mny > lh || key == u32::MAX {
+                return out.into_iter();
+            }
+            let pc_c = centre(lp);
+            let (gsum, gn) = groups[&key];
+            let gc = [gsum[0] / gn, gsum[1] / gn];
+            let i = key;
+            // Broken when inside a force sphere (centred `depth` in front of the layer).
+            let mut v = [0.0f64; 3];
+            let mut broken = false;
+            for (fp, fd, fr, fs) in forces {
+                let rad = fr * lw;
+                if rad <= 0.0 {
+                    continue;
+                }
+                let dv = [gc[0] - fp[0], gc[1] - fp[1], fd * lw];
+                let dist = (dv[0] * dv[0] + dv[1] * dv[1] + dv[2] * dv[2]).sqrt();
+                if dist < rad {
+                    broken = true;
+                    let f = fs * (1.0 - dist / rad) * unit / dist.max(1e-6);
+                    for q in 0..3 {
+                        v[q] += dv[q] * f;
+                    }
+                }
+            }
+            if broken && let Some(g) = &gradient {
+                let (c, _) = unpremul(g.sample_bilinear(gc[0] * s + b.offset[0], gc[1] * s + b.offset[1]));
+                let mut l = effectcraft_color::luminance(c[0], c[1], c[2]).clamp(0.0, 1.0) as f64;
+                if invert_gradient {
+                    l = 1.0 - l;
+                }
+                broken = threshold > 0.0 && l >= 1.0 - threshold;
+            }
+            if broken && custom && white_fixed && key == 0xfff {
+                broken = false;
+            }
+            if (broken && render == 1) || (!broken && render == 2) {
+                return out.into_iter();
+            }
+            let mut gpos = [gc[0], gc[1], 0.0];
+            let mut r = rot_axis([1.0, 0.0, 0.0], 0.0);
+            let moving = broken && t > 0.0;
+            if moving {
+                let mass = 1.0 + mass_var * hs(i, 1, seed) as f64;
+                for q in 0..3 {
+                    v[q] = v[q] / mass + randomness * unit * hs(i, 2 + q as u32, seed) as f64 * 2.0;
+                }
+                let (f1, f2) = drag_factors(k, t);
+                for q in 0..3 {
+                    gpos[q] += v[q] * f1 + g3[q] * f2;
+                }
+                let axis = match tumble {
+                    1 => [0.0, 0.0, 0.0],
+                    2 => [1.0, 0.0, 0.0],
+                    3 => [0.0, 1.0, 0.0],
+                    4 => [0.0, 0.0, 1.0],
+                    5 => [hs(i, 6, seed) as f64, hs(i, 7, seed) as f64, 0.0],
+                    6 => [hs(i, 6, seed) as f64, 0.0, hs(i, 8, seed) as f64],
+                    7 => [0.0, hs(i, 7, seed) as f64, hs(i, 8, seed) as f64],
+                    _ => [hs(i, 6, seed) as f64, hs(i, 7, seed) as f64, hs(i, 8, seed) as f64],
+                };
+                let speed = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt() / unit;
+                let omega = rot_speed * std::f64::consts::TAU * (0.5 + h(i, 9, seed) as f64) * speed.min(10.0);
+                r = rot_axis(axis, omega * f1);
+            }
+            // The piece's centre: its offset from the group centre, rotated with the group.
+            let off = [pc_c[0] - gc[0], pc_c[1] - gc[1], 0.0];
+            let pos: [f64; 3] = std::array::from_fn(|q| gpos[q] + (0..3).map(|k| r[q][k] * off[k]).sum::<f64>());
+            let tex: Vec<[f32; 2]> = lp.iter().map(|v| [(v[0] * s + b.offset[0]) as f32, (v[1] * s + b.offset[1]) as f32]).collect();
+            let c0 = [(pc_c[0] * s + b.offset[0]) as f32, (pc_c[1] * s + b.offset[1]) as f32];
+            let posb = [pos[0] * s + b.offset[0], pos[1] * s + b.offset[1], pos[2] * s];
+            let Some(mut pc) = Piece::new(&tex, c0, &r, posb, cam) else { return out.into_iter() };
+            pc.light(&light, &r, posb, eye);
+            pc.alpha = tex_opacity;
+            let face = if pc.back { &backf } else { &front };
+            if face.mode == 0 {
+                pc.flat = Some([tex_color[0], tex_color[1], tex_color[2]]);
+            } else if face.mode == 2 {
+                pc.tint = std::array::from_fn(|q| pc.tint[q] * tex_color[q]);
+            }
+            // Extrusion: the sides of a moving piece, from its front outline back by the depth.
+            if moving && extrude > 0.0 {
+                let nb = [r[0][2], r[1][2], r[2][2]];
+                let n = tex.len();
+                for e in 0..n {
+                    let (a, bv) = (tex[e], tex[(e + 1) % n]);
+                    let ed = [(bv[0] - a[0]) as f64, (bv[1] - a[1]) as f64];
+                    let len = (ed[0] * ed[0] + ed[1] * ed[1]).sqrt();
+                    if len < 1e-6 {
+                        continue;
+                    }
+                    let ew: [f64; 3] = std::array::from_fn(|q| (r[q][0] * ed[0] + r[q][1] * ed[1]) / len);
+                    let third = [ew[1] * nb[2] - ew[2] * nb[1], ew[2] * nb[0] - ew[0] * nb[2], ew[0] * nb[1] - ew[1] * nb[0]];
+                    let rs: M3 = std::array::from_fn(|q| [ew[q], nb[q], third[q]]);
+                    // Side centre in world: edge midpoint (world) plus half the depth backwards.
+                    let mid = [((a[0] + bv[0]) * 0.5 - c0[0]) as f64, ((a[1] + bv[1]) * 0.5 - c0[1]) as f64];
+                    let mw: [f64; 3] = std::array::from_fn(|q| posb[q] + r[q][0] * mid[0] + r[q][1] * mid[1] + nb[q] * extrude * 0.5);
+                    let (hl, hd) = ((len * 0.5) as f32, (extrude * 0.5) as f32);
+                    let cs = [(a[0] + bv[0]) * 0.5, (a[1] + bv[1]) * 0.5];
+                    let quad = [[cs[0] - hl, cs[1] - hd], [cs[0] + hl, cs[1] - hd], [cs[0] + hl, cs[1] + hd], [cs[0] - hl, cs[1] + hd]];
+                    if let Some(mut sp) = Piece::new(&quad, cs, &rs, mw, cam) {
+                        sp.light(&light, &rs, mw, eye);
+                        sp.alpha = tex_opacity;
+                        let colour = match (&side.img, side.mode) {
+                            (Some(img), m) if m != 0 => {
+                                let (c, _) = unpremul(img.sample_bilinear(cs[0] as f64, cs[1] as f64));
+                                if m == 2 { std::array::from_fn(|q| c[q] * tex_color[q]) } else { c }
+                            }
+                            _ => [tex_color[0], tex_color[1], tex_color[2]],
+                        };
+                        sp.flat = Some(colour);
+                        out.push(sp);
+                    }
+                }
+            }
+            out.push(pc);
+            out.into_iter()
+        })
+        .collect();
+    sort_far_first(&mut pieces);
+    if view == 0 {
+        let tex = |i: &Option<Image>| i.clone().map(PieceTex::Image);
+        let front_t = tex(&front.img).unwrap_or(PieceTex::Layer);
+        let back_t = tex(&backf.img).unwrap_or_else(|| front_t.clone());
+        return ShatterPlan::Pieces(PiecePlan { pieces, front: front_t, back: Some(back_t) });
+    }
+    {
+        // Wireframes: piece outlines (front view: at rest; otherwise animated), plus forces.
+        let animated = view == 2 || view == 4;
+        let mut lines = Vec::new();
+        for pc in &pieces {
+            let n = pc.n as usize;
+            let pts: Vec<[f32; 2]> = if animated {
+                let fw = inv3(&pc.inv);
+                match fw {
+                    Some(m) => pc.poly[..n]
+                        .iter()
+                        .map(|v| {
+                            let (a, bb) = ((v[0] - pc.c0[0]) as f64, (v[1] - pc.c0[1]) as f64);
+                            let w = m[2][0] * a + m[2][1] * bb + m[2][2];
+                            [((m[0][0] * a + m[0][1] * bb + m[0][2]) / w) as f32, ((m[1][0] * a + m[1][1] * bb + m[1][2]) / w) as f32]
+                        })
+                        .collect(),
+                    None => continue,
+                }
+            } else {
+                pc.poly[..n].to_vec()
+            };
+            for e in 0..n {
+                let (a, c) = (pts[e], pts[(e + 1) % n]);
+                lines.push(Sprite::new(a[0], a[1], 0.5, [0.75, 0.85, 1.0, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
+            }
+        }
+        if view >= 3 {
+            for (fp, _, fr, _) in forces {
+                let (fx, fy) = b.to_px(fp);
+                let rad = fr * lw * s;
+                for k in 0..64 {
+                    let (a0, a1) = (k as f64 / 64.0 * std::f64::consts::TAU, (k + 1) as f64 / 64.0 * std::f64::consts::TAU);
+                    let (x0, y0) = (fx + rad * a0.cos(), fy + rad * a0.sin());
+                    let (x1, y1) = (fx + rad * a1.cos(), fy + rad * a1.sin());
+                    lines.push(Sprite::new(x0 as f32, y0 as f32, 0.5, [1.0, 0.3, 0.3, 1.0], Shape::Line { dx: (x1 - x0) as f32, dy: (y1 - y0) as f32 }));
+                }
+            }
+        }
+        ShatterPlan::Wire(SpritePlan { sprites: lines, tints: vec![], acc: Acc::Over, post: Post::Replace })
+    }
+}
diff --git a/crates/effects/src/sim2/surfaces.rs b/crates/effects/src/sim2/surfaces.rs
new file mode 100644
index 000000000..7c3c032f0
--- /dev/null
+++ b/crates/effects/src/sim2/surfaces.rs
@@ -0,0 +1,524 @@
+use super::{Acc, Buf, EffectCtx, Image, IntoParallelIterator, ParallelIterator, Plane, Px, Shape, SimCache, Sprite, Value, gauss_plane, params_key, unpremul};
+
+// ------------------------------------------------------------------ Caustics
+
+/// Sample with repeat mode: 0 Once (transparent outside), 1 Tiled, 2 Reflected.
+fn sample_repeat(img: &Image, x: f64, y: f64, mode: u32) -> Px {
+    let (w, hh) = (img.width as f64, img.height as f64);
+    match mode {
+        1 => img.sample_bilinear_clamped(x.rem_euclid(w), y.rem_euclid(hh)),
+        2 => {
+            let m = |v: f64, n: f64| {
+                let r = v.rem_euclid(2.0 * n);
+                if r > n { 2.0 * n - r } else { r }
+            };
+            img.sample_bilinear_clamped(m(x, w), m(y, hh))
+        }
+        _ => img.sample_bilinear(x, y),
+    }
+}
+
+/// Everything Caustics' per-pixel pass needs, prepared on the CPU (the other layers it reads
+/// and the parameter conversions); the layer's own pixels are not read.
+pub struct CausticsSetup {
+    /// The Bottom layer fitted to the buffer, `None` = the layer itself.
+    pub bottom: Option<Image>,
+    /// Gaussian σ (buffer px) blurring the bottom (transparent edges), 0 = none.
+    pub bottom_sigma: f64,
+    /// The water surface's height field (smoothed luminance), `None` = flat.
+    pub height: Option<Plane>,
+    /// The Sky layer fitted to the buffer.
+    pub sky: Option<Image>,
+    pub scaling: f64,
+    pub repeat: u32,
+    pub wave_h: f64,
+    /// Displacement per unit of height gradient.
+    pub k: f64,
+    /// Layer centre (buffer px).
+    pub cx: f64,
+    pub cy: f64,
+    /// Layer width (buffer px).
+    pub lw: f64,
+    pub surf: [f32; 4],
+    pub surf_op: f32,
+    pub cstr: f32,
+    pub lc: [f32; 4],
+    pub li: f32,
+    /// Light position (buffer px) and height (layer widths); `point` = from the position to
+    /// each pixel, else one direction from above the layer centre.
+    pub lx: f64,
+    pub ly: f64,
+    pub lheight: f64,
+    pub point: bool,
+    pub ambient: f32,
+    pub diffuse: f32,
+    pub specular: f32,
+    pub sharp: f32,
+    pub sky_scaling: f64,
+    pub sky_repeat: u32,
+    pub sky_int: f32,
+    pub convergence: f64,
+}
+
+/// Caustics' setup for layer geometry `b` (see [`CausticsSetup`]).
+pub fn caustics_setup(ctx: &EffectCtx, b: &Buf) -> CausticsSetup {
+    let pr = ctx.params;
+    let s = b.scale;
+    let bottom = ctx.layer_param("bottom/bottom", true).map(|o| crate::util::fit_layer(ctx, b, &o, pr.e("bottom/bottomSizeDiffers") == 1));
+    let blur = pr.f("bottom/blur") * s;
+    let wave_h = pr.f("water/waveHeight");
+    let smoothing = pr.f("water/smoothing") * s;
+    let depth = pr.f("water/waterDepth");
+    let ior = pr.f("water/refractiveIndex").max(1.0);
+    let lpos = pr.v2("lighting/lightPosition");
+    // Height field of the water surface (luminance of the chosen layer; none = flat).
+    let height = ctx.layer_param("water/waterSurface", true).map(|o| {
+        let img = crate::util::fit_layer(ctx, b, &o, true);
+        let pl = Plane::luma(&img);
+        if smoothing > 0.05 { gauss_plane(&pl, smoothing * 0.5, smoothing * 0.5) } else { pl }
+    });
+    let lw = ctx.layer_size[0] * s;
+    let k = wave_h * depth * (1.0 - 1.0 / ior) * lw * 2.0;
+    let (cx, cy) = (b.offset[0] + ctx.layer_size[0] * 0.5 * s, b.offset[1] + ctx.layer_size[1] * 0.5 * s);
+    let (lx, ly) = b.to_px(lpos);
+    let (lc, li, lheight) = (pr.color("lighting/lightColor"), pr.f("lighting/lightIntensity") as f32, pr.f("lighting/lightHeight").max(0.01));
+    // Light Type: Distant Source (one direction, from the light position above the layer
+    // centre), Point Source (from the light position to each pixel) or First Comp Light.
+    let light_type = pr.e("lighting/lightType");
+    let comp_light = if light_type == 2 { ctx.env.host.and_then(|h| h.comp_scene()).and_then(|sc| sc.light) } else { None };
+    let (lc, li, lx, ly, lheight, point) = match (light_type, comp_light) {
+        (2, Some(l)) => {
+            let c = [l.color[0], l.color[1], l.color[2], 1.0];
+            // Comp space: z away from the viewer; the light above the water is at −z.
+            let (px, py) = (l.pos[0] * s + b.offset[0], l.pos[1] * s + b.offset[1]);
+            (c, li, px, py, (-l.pos[2] / ctx.layer_size[0].max(1.0)).max(0.01), l.kind == 1)
+        }
+        (2, None) => (lc, 0.0, lx, ly, lheight, false),
+        (1, _) => (lc, li, lx, ly, lheight, true),
+        _ => (lc, li, lx, ly, lheight, false),
+    };
+    // Sky: the layer the water surface reflects (Surface Opacity 1 = a mirror of it).
+    let sky = ctx.layer_param("sky/sky", true).map(|o| crate::util::fit_layer(ctx, b, &o, pr.e("sky/skySizeDiffers") == 1));
+    CausticsSetup {
+        bottom,
+        bottom_sigma: if blur > 0.05 { blur * 0.5 } else { 0.0 },
+        height,
+        sky,
+        scaling: pr.f("bottom/scaling").max(0.01),
+        repeat: pr.e("bottom/repeatMode"),
+        wave_h,
+        k,
+        cx,
+        cy,
+        lw,
+        surf: pr.color("water/surfaceColor"),
+        surf_op: pr.f("water/surfaceOpacity") as f32,
+        cstr: pr.f("water/causticsStrength") as f32,
+        lc,
+        li,
+        lx,
+        ly,
+        lheight,
+        point,
+        ambient: pr.f("lighting/ambientLight") as f32,
+        diffuse: pr.f("material/diffuse") as f32,
+        specular: pr.f("material/specular") as f32,
+        sharp: pr.f("material/highlightSharpness").max(1.0) as f32,
+        sky_scaling: pr.get("sky/scaling").map(Value::as_f64).unwrap_or(1.0).max(0.01),
+        sky_repeat: pr.e("sky/repeatMode"),
+        sky_int: pr.get("sky/intensity").map(Value::as_f64).unwrap_or(0.3) as f32,
+        convergence: pr.get("sky/convergence").map(Value::as_f64).unwrap_or(0.5).clamp(0.0, 1.0),
+    }
+}
+
+pub(super) fn caustics(ctx: &EffectCtx, mut b: Buf) -> Buf {
+    let st = caustics_setup(ctx, &b);
+    let mut bottom = st.bottom.clone().unwrap_or_else(|| b.img.clone());
+    if st.bottom_sigma > 0.0 {
+        bottom = effectcraft_raster::gaussian_blur(&bottom, st.bottom_sigma, st.bottom_sigma, false);
+    }
+    let CausticsSetup {
+        scaling,
+        repeat,
+        wave_h,
+        k,
+        cx,
+        cy,
+        lw,
+        surf,
+        surf_op,
+        cstr,
+        lc,
+        li,
+        lx,
+        ly,
+        lheight,
+        point,
+        ambient,
+        diffuse,
+        specular,
+        sharp,
+        sky_scaling,
+        sky_repeat,
+        sky_int,
+        convergence,
+        ..
+    } = st;
+    let (height, sky) = (&st.height, &st.sky);
+    let (w, hh) = (b.img.width as usize, b.img.height as usize);
+    let norm3 = |v: [f64; 3]| {
+        let n = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt().max(1e-12);
+        [(v[0] / n) as f32, (v[1] / n) as f32, (v[2] / n) as f32]
+    };
+    let lv_at = |x: f64, y: f64| {
+        if point {
+            norm3([(lx - x) / lw.max(1.0), (ly - y) / lw.max(1.0), lheight])
+        } else {
+            norm3([(lx - cx) / lw.max(1.0), (ly - cy) / lw.max(1.0), lheight])
+        }
+    };
+    let grad = |x: usize, y: usize| -> (f64, f64) {
+        match height {
+            Some(pl) => {
+                let gx = (pl.get_clamped(x as i64 + 1, y as i64) - pl.get_clamped(x as i64 - 1, y as i64)) as f64 * 0.5;
+                let gy = (pl.get_clamped(x as i64, y as i64 + 1) - pl.get_clamped(x as i64, y as i64 - 1)) as f64 * 0.5;
+                (gx, gy)
+            }
+            None => (0.0, 0.0),
+        }
+    };
+    // Displacement and its Jacobian (caustic focusing) per pixel.
+    let disp: Vec<(f64, f64)> = (0..w * hh)
+        .into_par_iter()
+        .map(|i| {
+            let (gx, gy) = grad(i % w, i / w);
+            (-gx * k, -gy * k)
+        })
+        .collect();
+    b.img.rows_mut().for_each(|(y, row)| {
+        for (x, px) in row.iter_mut().enumerate() {
+            let i = y * w + x;
+            let (dx, dy) = disp[i];
+            let d = |xx: usize, yy: usize| disp[yy.min(hh - 1) * w + xx.min(w - 1)];
+            let (dxr, _) = d(x + 1, y);
+            let (_, dyd) = d(x, y + 1);
+            let (dxl, _) = d(x.saturating_sub(1), y);
+            let (_, dyu) = d(x, y.saturating_sub(1));
+            let jac = (1.0 + (dxr - dxl) * 0.5) * (1.0 + (dyd - dyu) * 0.5);
+            let focus = ((1.0 / jac.abs().max(0.2)) as f32 - 1.0).clamp(-1.0, 4.0);
+            let sx = cx + (x as f64 + 0.5 + dx - cx) / scaling;
+            let sy = cy + (y as f64 + 0.5 + dy - cy) / scaling;
+            let p = sample_repeat(&bottom, sx, sy, repeat);
+            let (c, a) = unpremul(p);
+            let (gx, gy) = grad(x, y);
+            let n = {
+                let v = [-gx * wave_h * 20.0, -gy * wave_h * 20.0, 1.0];
+                let m = (v[0] * v[0] + v[1] * v[1] + 1.0).sqrt();
+                [(v[0] / m) as f32, (v[1] / m) as f32, (v[2] / m) as f32]
+            };
+            let lv = lv_at(x as f64 + 0.5, y as f64 + 0.5);
+            let nl = (n[0] * lv[0] + n[1] * lv[1] + n[2] * lv[2]).max(0.0);
+            let hv = {
+                let v = [lv[0], lv[1], lv[2] + 1.0];
+                let m = (v[0] * v[0] + v[1] * v[1] + v[2] * v[2]).sqrt();
+                [v[0] / m, v[1] / m, v[2] / m]
+            };
+            let spec = (n[0] * hv[0] + n[1] * hv[1] + n[2] * hv[2]).max(0.0).powf(sharp) * specular * li;
+            let light = ambient + diffuse * li * nl + cstr * focus * li;
+            // The surface: its colour lit like the water, or the sky it reflects (sampled along
+            // the surface normal; Convergence pulls the reflection towards the pixel itself).
+            let surface: [f32; 3] = match &sky {
+                Some(sk) => {
+                    let reach = (1.0 - convergence) * lw * 0.5;
+                    let (rx, ry) = (x as f64 + 0.5 + n[0] as f64 * reach, y as f64 + 0.5 + n[1] as f64 * reach);
+                    let (rx, ry) = (cx + (rx - cx) / sky_scaling, cy + (ry - cy) / sky_scaling);
+                    let (sc, _) = unpremul(sample_repeat(sk, rx, ry, sky_repeat));
+                    std::array::from_fn(|q| sc[q] * sky_int * 3.0 * surf[q])
+                }
+                None => std::array::from_fn(|q| surf[q] * (ambient + diffuse * li * nl)),
+            };
+            let cc: [f32; 3] = std::array::from_fn(|q| {
+                let base = c[q] * light * lc[q];
+                base * (1.0 - surf_op) + surface[q] * surf_op + spec * lc[q]
+            });
+            let a = (a + surf_op * (1.0 - a)).min(1.0);
+            *px = [cc[0] * a, cc[1] * a, cc[2] * a, a];
+        }
+    });
+    b
+}
+
+// ------------------------------------------------------------------ Wave World
+
+/// Wave World's simulated surface: an `nx` × `ny` grid of heights `u` and velocities `v`.
+#[derive(Clone, Debug)]
+pub struct Waves {
+    pub nx: usize,
+    pub ny: usize,
+    pub u: Vec<f32>,
+    pub v: Vec<f32>,
+}
+
+struct Producer {
+    ring: bool,
+    pos: [f32; 2],
+    len: f32,
+    width: f32,
+    angle: f32,
+    amp: f32,
+    freq: f32,
+    phase: f32,
+}
+
+impl Producer {
+    /// Weight of a grid point (layer-fraction coordinates, x in widths, y in widths).
+    fn weight(&self, x: f32, y: f32) -> f32 {
+        let (dx, dy) = (x - self.pos[0], y - self.pos[1]);
+        let (sa, ca) = self.angle.sin_cos();
+        let (u, v) = (dx * ca + dy * sa, -dx * sa + dy * ca);
+        let d = if self.ring {
+            let (a, bb) = ((self.len * 0.5).max(1e-3), (self.width * 0.5).max(1e-3));
+            ((u / a).powi(2) + (v / bb).powi(2)).sqrt()
+        } else {
+            let l = (self.len * 0.5).max(1e-3);
+            let wd = (self.width * 0.5).max(1e-3);
+            (u.abs() / l).max(v.abs() / wd)
+        };
+        (1.0 - d).clamp(0.0, 1.0).min(1.0)
+    }
+}
+
+static WAVE_CACHE: SimCache<Waves> = SimCache::new(4);
+
+/// What Wave World draws: the Height Map view of the simulated surface (grid heights and,
+/// with a ground layer, water depths per grid point), or the wireframe preview's lines.
+pub enum WavePlan {
+    Height { st: std::sync::Arc<Waves>, depth: Option<Vec<f32>> },
+    Wire(crate::sim::SpritePlan),
+}
+
+pub(super) fn wave_world(ctx: &EffectCtx, b: Buf) -> Buf {
+    match wave_world_impl(ctx, &b, false) {
+        Ok(img) => Buf { img, ..b },
+        Err(WavePlan::Wire(plan)) => plan.finish(b),
+        Err(WavePlan::Height { .. }) => b,
+    }
+}
+
+/// Wave World's simulation state for the frame, as a [`WavePlan`] (its pixels are not read).
+pub fn wave_world_plan(ctx: &EffectCtx, b: &Buf) -> Option<WavePlan> {
+    wave_world_impl(ctx, b, true).err()
+}
+
+fn wave_world_impl(ctx: &EffectCtx, b: &Buf, plan_only: bool) -> Result<Image, WavePlan> {
+    let pr = ctx.params;
+    let [lw, lh] = ctx.layer_size;
+    let res = pr.f("simulation/gridResolution").clamp(1.0, 400.0) as usize;
+    let res = if pr.b("simulation/gridResDownsamples") { ((res as f64) * b.scale).round().max(1.0) as usize } else { res };
+    let nx = res.max(2) + 1;
+    let ny = ((res as f64 * lh / lw.max(1.0)).round() as usize).max(2) + 1;
+    let speed = pr.f("simulation/waveSpeed").max(0.0) as f32;
+    let damping = pr.f("simulation/damping").max(0.0) as f32;
+    let reflect = pr.e("simulation/reflectEdges");
+    let preroll = pr.f("simulation/preRoll").max(0.0);
+    let prods: Vec<Producer> = [1, 2]
+        .iter()
+        .map(|k| {
+            let pos = pr.v2(&format!("producer{k}/producer{k}Position"));
+            Producer {
+                ring: pr.e(&format!("producer{k}/producer{k}Type")) == 0,
+                pos: [(pos[0] / lw.max(1.0)) as f32, (pos[1] / lw.max(1.0)) as f32],
+                len: pr.f(&format!("producer{k}/producer{k}Length")) as f32,
+                width: pr.f(&format!("producer{k}/producer{k}Width")) as f32,
+                angle: (pr.f(&format!("producer{k}/producer{k}Angle")) as f32).to_radians(),
+                amp: pr.f(&format!("producer{k}/producer{k}Amplitude")) as f32,
+                freq: pr.f(&format!("producer{k}/producer{k}Frequency")) as f32,
+                phase: (pr.f(&format!("producer{k}/producer{k}Phase")) as f32).to_radians(),
+            }
+        })
+        .collect();
+    let sps = crate::sim::SPS as f32;
+    // Wave speed in layer widths per second → cells per second; sub-steps keep it stable.
+    let cps = speed * (nx - 1) as f32;
+    let sub = ((cps * 2.0 / sps).ceil() as usize).clamp(1, 64);
+    let dt = 1.0 / (sps * sub as f32);
+    let cell = 1.0 / (nx - 1) as f32;
+    let weights: Vec<Vec<f32>> = prods.iter().map(|p| (0..nx * ny).map(|i| p.weight((i % nx) as f32 * cell, (i / nx) as f32 * cell)).collect()).collect();
+    // Ground: the ground layer's first frame, its luminance an elevation (× Steepness). Where
+    // it rises above Height the grid is dry (a wall the waves reflect from); shallow water
+    // slows the waves by Wave Strength.
+    let ground = pr.get("ground/ground").and_then(Value::as_layer).and_then(|id| {
+        let host = ctx.env.host?;
+        host.layer_at(id, ctx.env.comp_time - ctx.time, true)
+    });
+    let steep = pr.get("ground/steepness").map(Value::as_f64).unwrap_or(0.25) as f32;
+    let level = pr.get("ground/height").map(Value::as_f64).unwrap_or(0.25) as f32;
+    let wave_strength = pr.f("ground/waveStrength").clamp(0.0, 1.0) as f32;
+    // Water depth per grid point (None without ground: deep everywhere).
+    let depth: Option<Vec<f32>> = ground.as_ref().map(|lp| {
+        let (gw, gh) = (lp.size[0].max(1.0), lp.size[1].max(1.0));
+        (0..nx * ny)
+            .map(|i| {
+                let (fx, fy) = ((i % nx) as f64 / (nx - 1) as f64, (i / nx) as f64 / (ny - 1) as f64);
+                let (c, a) = unpremul(lp.buf.img.sample_bilinear_clamped(fx * gw * lp.buf.scale + lp.buf.offset[0], fy * gh * lp.buf.scale + lp.buf.offset[1]));
+                level - steep * effectcraft_color::luminance(c[0], c[1], c[2]) * a
+            })
+            .collect()
+    });
+    let speed_k: Vec<f32> = match &depth {
+        Some(d) => d.iter().map(|&v| if v <= 0.0 { 0.0 } else { 1.0 - wave_strength * (1.0 - (v / level.max(1e-3)).clamp(0.0, 1.0).sqrt()) }).collect(),
+        None => vec![1.0; nx * ny],
+    };
+    let mut key =
+        params_key(ctx, &Buf { img: Image::new(0, 0), offset: [0.0; 2], scale: if pr.b("simulation/gridResDownsamples") { b.scale } else { 1.0 } }, 4);
+    if let Some(d) = &depth {
+        key ^= d.iter().fold(0u64, |a, v| a.rotate_left(3) ^ v.to_bits() as u64);
+    }
+    let steps = crate::sim::steps_at(ctx.time + preroll);
+    let st = WAVE_CACHE.run(
+        key,
+        steps,
+        || Waves { nx, ny, u: vec![0.0; nx * ny], v: vec![0.0; nx * ny] },
+        |w, step| {
+            for k in 0..sub {
+                let t = (step as f32 + k as f32 / sub as f32) / sps - preroll as f32;
+                let c2 = cps * cps;
+                let mut acc = vec![0.0f32; nx * ny];
+                for y in 0..ny {
+                    for x in 0..nx {
+                        let i = y * nx + x;
+                        let g = |xx: usize, yy: usize| w.u[yy * nx + xx];
+                        let l = g(x.saturating_sub(1), y) + g((x + 1).min(nx - 1), y) + g(x, y.saturating_sub(1)) + g(x, (y + 1).min(ny - 1)) - 4.0 * w.u[i];
+                        acc[i] = c2 * speed_k[i] * speed_k[i] * l - damping * 4.0 * w.v[i];
+                    }
+                }
+                for i in 0..nx * ny {
+                    w.v[i] += acc[i] * dt;
+                    w.u[i] += w.v[i] * dt;
+                }
+                // Producers drive the surface.
+                for (p, wt) in prods.iter().zip(&weights) {
+                    if p.amp == 0.0 {
+                        continue;
+                    }
+                    let target = p.amp * (std::f32::consts::TAU * p.freq * t + p.phase).sin();
+                    for i in 0..nx * ny {
+                        if wt[i] > 0.0 {
+                            w.u[i] += (target - w.u[i]) * wt[i];
+                            w.v[i] *= 1.0 - wt[i];
+                        }
+                    }
+                }
+                // Dry ground holds the surface flat.
+                for i in 0..nx * ny {
+                    if speed_k[i] <= 0.0 {
+                        w.u[i] = 0.0;
+                        w.v[i] = 0.0;
+                    }
+                }
+                // Edges: reflective ones mirror; the others absorb in a thin sponge layer.
+                let refl = |side: u32| reflect == 5 || reflect == side;
+                let sponge = 4usize.min(nx / 4).max(1);
+                for y in 0..ny {
+                    for x in 0..nx {
+                        let i = y * nx + x;
+                        let mut f = 1.0f32;
+                        if !refl(1) && x < sponge {
+                            f = f.min(x as f32 / sponge as f32);
+                        }
+                        if !refl(3) && nx - 1 - x < sponge {
+                            f = f.min((nx - 1 - x) as f32 / sponge as f32);
+                        }
+                        if !refl(2) && y < sponge {
+                            f = f.min(y as f32 / sponge as f32);
+                        }
+                        if !refl(4) && ny - 1 - y < sponge {
+                            f = f.min((ny - 1 - y) as f32 / sponge as f32);
+                        }
+                        if f < 1.0 {
+                            let k = 0.85 + 0.15 * f;
+                            w.u[i] *= k;
+                            w.v[i] *= k;
+                        }
+                    }
+                }
+            }
+        },
+    );
+    let s = b.scale;
+    let (bw, bh) = (b.img.width, b.img.height);
+    let sample = |x: f64, y: f64| -> f32 {
+        let gx = (x / lw.max(1.0) * (st.nx - 1) as f64).clamp(0.0, (st.nx - 1) as f64);
+        let gy = (y / lw.max(1.0) * (st.nx - 1) as f64).clamp(0.0, (st.ny - 1) as f64);
+        let (x0, y0) = (gx.floor() as usize, gy.floor() as usize);
+        let (x1, y1) = ((x0 + 1).min(st.nx - 1), (y0 + 1).min(st.ny - 1));
+        let (tx, ty) = ((gx - x0 as f64) as f32, (gy - y0 as f64) as f32);
+        let g = |xx: usize, yy: usize| st.u[yy * st.nx + xx];
+        let a = g(x0, y0) + (g(x1, y0) - g(x0, y0)) * tx;
+        let c = g(x0, y1) + (g(x1, y1) - g(x0, y1)) * tx;
+        a + (c - a) * ty
+    };
+    if plan_only && pr.e("view") == 1 {
+        return Err(WavePlan::Height { st, depth });
+    }
+    if pr.e("view") == 1 {
+        let mut img = Image::new(bw, bh);
+        let bright = pr.f("heightMapControls/brightness") as f32;
+        let contrast = pr.f("heightMapControls/contrast") as f32;
+        let gamma = pr.f("heightMapControls/gamma").max(0.01) as f32;
+        let alpha = 1.0 - pr.f("heightMapControls/transparency") as f32;
+        let dry_transparent = pr.e("heightMapControls/renderDryAreasAs") == 1;
+        let dry_at = |x: f64, y: f64| -> bool {
+            let Some(d) = &depth else { return false };
+            let gx = (x / lw.max(1.0) * (st.nx - 1) as f64).round().clamp(0.0, (st.nx - 1) as f64) as usize;
+            let gy = (y / lw.max(1.0) * (st.nx - 1) as f64).round().clamp(0.0, (st.ny - 1) as f64) as usize;
+            d[gy * st.nx + gx] <= 0.0
+        };
+        img.rows_mut().for_each(|(y, row)| {
+            for (x, px) in row.iter_mut().enumerate() {
+                let lx = (x as f64 + 0.5 - b.offset[0]) / s;
+                let ly = (y as f64 + 0.5 - b.offset[1]) / s;
+                let v = (bright + contrast * sample(lx, ly)).clamp(0.0, 1.0).powf(1.0 / gamma);
+                let al = if dry_transparent && dry_at(lx, ly) { 0.0 } else { alpha };
+                *px = [v * al, v * al, v * al, al];
+            }
+        });
+        Ok(img)
+    } else {
+        // Wireframe preview: the grid turned by Horizontal Rotation about the vertical axis,
+        // tilted by Vertical Rotation, heights scaled by Vertical Scale.
+        let hr = pr.f("wireframeControls/horizontalRotation").to_radians();
+        let vr = pr.get("wireframeControls/verticalRotation").map(Value::as_f64).unwrap_or(53.0).to_radians();
+        let vs = pr.get("wireframeControls/verticalScale").map(Value::as_f64).unwrap_or(0.5);
+        let (sh, ch) = hr.sin_cos();
+        let (sv, cv) = vr.sin_cos();
+        let to = |x: usize, y: usize| -> [f32; 2] {
+            // Grid point relative to the layer centre (layer px), height in layer px.
+            let gx = x as f64 / (st.nx - 1) as f64 * lw - lw * 0.5;
+            let gy = y as f64 / (st.nx - 1) as f64 * lw - (st.ny - 1) as f64 / (st.nx - 1) as f64 * lw * 0.5;
+            let hgt = st.u[y * st.nx + x] as f64 * vs * lh * 0.5;
+            let (rx, ry) = (gx * ch - gy * sh, gx * sh + gy * ch);
+            let (px, py) = b.to_px([lw * 0.5 + rx, lh * 0.5 + ry * cv - hgt * sv]);
+            [px as f32, py as f32]
+        };
+        let mut lines = Vec::new();
+        for y in 0..st.ny {
+            for x in 0..st.nx {
+                let a = to(x, y);
+                if x + 1 < st.nx {
+                    let c = to(x + 1, y);
+                    lines.push(Sprite::new(a[0], a[1], 0.4, [0.4, 0.9, 0.4, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
+                }
+                if y + 1 < st.ny {
+                    let c = to(x, y + 1);
+                    lines.push(Sprite::new(a[0], a[1], 0.4, [0.4, 0.9, 0.4, 1.0], Shape::Line { dx: c[0] - a[0], dy: c[1] - a[1] }));
+                }
+            }
+        }
+        let plan = crate::sim::SpritePlan { sprites: lines, tints: vec![], acc: Acc::Over, post: crate::sim::Post::OverBlack };
+        if plan_only {
+            return Err(WavePlan::Wire(plan));
+        }
+        Ok(plan.finish(Buf { img: Image::new(bw, bh), offset: b.offset, scale: b.scale }).img)
+    }
+}
diff --git a/crates/effects/src/sim2/tests.rs b/crates/effects/src/sim2/tests.rs
new file mode 100644
index 000000000..2ef35b122
--- /dev/null
+++ b/crates/effects/src/sim2/tests.rs
@@ -0,0 +1,485 @@
+use super::*;
+use crate::{EffectEnv, run_fx};
+
+fn ramp(w: u32, hh: u32) -> Image {
+    let mut img = Image::new(w, hh);
+    for y in 0..hh {
+        for x in 0..w {
+            img.set(x, y, [x as f32 / w as f32, y as f32 / hh as f32, 0.4, 1.0]);
+        }
+    }
+    img
+}
+
+fn run(id: &str, vals: &[(&str, Value)], img: Image, t: f64) -> Image {
+    run_fx(id, vals, img, t, EffectEnv::default()).img
+}
+
+fn max_diff(a: &Image, b: &Image) -> f32 {
+    a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).fold(0.0, f32::max)).fold(0.0, f32::max)
+}
+
+fn sum_diff(a: &Image, b: &Image) -> f32 {
+    a.data.iter().zip(&b.data).map(|(p, q)| (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>()).sum()
+}
+
+#[test]
+fn piece_at_rest_is_identity() {
+    let src = ramp(16, 16);
+    let cam = Cam { c: [8.0, 8.0], d: 64.0 };
+    let id = rot_axis([1.0, 0.0, 0.0], 0.0);
+    let pc = Piece::new(&[[0.0, 0.0], [16.0, 0.0], [16.0, 16.0], [0.0, 16.0]], [8.0, 8.0], &id, [8.0, 8.0, 0.0], cam).unwrap();
+    let mut out = Image::new(16, 16);
+    draw_pieces(&mut out, &[pc], &src, None);
+    assert!(max_diff(&out, &src) < 1e-4);
+}
+
+#[test]
+fn ball_action_draws_balls() {
+    let v = [("ballSize", num(80.0))];
+    let a = run("ec.sim.ccballaction", &v, ramp(32, 32), 0.0);
+    assert_eq!(a, run("ec.sim.ccballaction", &v, ramp(32, 32), 0.0));
+    assert!(a.data.iter().any(|p| p[3] > 0.9) && a.data.iter().any(|p| p[3] == 0.0), "balls with gaps");
+    let none = run("ec.sim.ccballaction", &[("ballSize", num(0.0))], ramp(32, 32), 0.0);
+    assert!(none.data.iter().all(|p| p[3] == 0.0));
+    let sc = run("ec.sim.ccballaction", &[("ballSize", num(80.0)), ("scatter", num(20.0))], ramp(32, 32), 0.0);
+    assert!(sum_diff(&a, &sc) > 1.0);
+}
+
+#[test]
+fn pixel_polly_breaks_after_start() {
+    let v = [("forceCenter", pt(16.0, 16.0)), ("gridSpacing", num(4.0))];
+    let before = run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.0);
+    assert_eq!(before, ramp(32, 32), "intact before the start time");
+    let a = run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.5);
+    assert_eq!(a, run("ec.sim.ccpixelpolly", &v, ramp(32, 32), 0.5));
+    assert!(sum_diff(&a, &ramp(32, 32)) > 10.0);
+    let tex = run("ec.sim.ccpixelpolly", &[("forceCenter", pt(16.0, 16.0)), ("gridSpacing", num(4.0)), ("object", Value::Enum(3))], ramp(32, 32), 0.5);
+    assert!(sum_diff(&a, &tex) > 0.1);
+}
+
+#[test]
+fn scatterize_identity_and_scatter() {
+    assert_eq!(run("ec.sim.ccscatterize", &[], ramp(24, 24), 0.0), ramp(24, 24));
+    let a = run("ec.sim.ccscatterize", &[("scatter", num(5.0))], ramp(24, 24), 0.0);
+    assert_eq!(a, run("ec.sim.ccscatterize", &[("scatter", num(5.0))], ramp(24, 24), 0.0));
+    assert!(sum_diff(&a, &ramp(24, 24)) > 1.0);
+    let tw = run("ec.sim.ccscatterize", &[("leftTwist", num(80.0)), ("rightTwist", num(80.0))], ramp(24, 24), 0.0);
+    assert!(sum_diff(&tw, &ramp(24, 24)) > 1.0);
+}
+
+#[test]
+fn card_dance_identity_and_rotation() {
+    let src = ramp(30, 20);
+    let a = run("ec.sim.carddance", &[], src.clone(), 0.0);
+    assert!(max_diff(&a, &src) < 0.02, "flat cards reproduce the layer: {}", max_diff(&a, &src));
+    let r = run("ec.sim.carddance", &[("yRotation/yRotSource", Value::Enum(1)), ("yRotation/yRotMultiplier", num(90.0))], src.clone(), 0.0);
+    assert_eq!(r, run("ec.sim.carddance", &[("yRotation/yRotSource", Value::Enum(1)), ("yRotation/yRotMultiplier", num(90.0))], src.clone(), 0.0));
+    assert!(sum_diff(&r, &src) > 5.0);
+    let z = run("ec.sim.carddance", &[("zPosition/zPosOffset", num(-1.0))], src.clone(), 0.0);
+    assert!(sum_diff(&z, &src) > 5.0, "cards pulled towards the camera grow");
+}
+
+#[test]
+fn shatter_at_rest_then_breaks() {
+    let v = [("view", Value::Enum(0)), ("force1/force1Position", pt(16.0, 16.0)), ("shape/origin", pt(16.0, 16.0))];
+    let src = ramp(32, 32);
+    let t0 = run("ec.sim.shatter", &v, src.clone(), 0.0);
+    assert!(max_diff(&t0, &src) < 0.03, "{}", max_diff(&t0, &src));
+    let t1 = run("ec.sim.shatter", &v, src.clone(), 0.5);
+    assert_eq!(t1, run("ec.sim.shatter", &v, src.clone(), 0.5));
+    assert!(sum_diff(&t1, &src) > 10.0);
+    for pat in 0..SHATTER_PATTERNS.len() as u32 {
+        let vv = [("view", Value::Enum(0)), ("shape/pattern", Value::Enum(pat)), ("force1/force1Position", pt(16.0, 16.0)), ("shape/origin", pt(16.0, 16.0))];
+        let r = run("ec.sim.shatter", &vv, src.clone(), 0.0);
+        assert!(max_diff(&r, &src) < 0.05, "pattern {pat} tiles the layer: {}", max_diff(&r, &src));
+    }
+    let wire = run("ec.sim.shatter", &[("shape/repetitions", num(3.0))], src.clone(), 0.0);
+    assert!(wire.data.iter().any(|p| p[3] > 0.5) && wire.data.iter().any(|p| p[3] == 0.0));
+    let layer_only =
+        run("ec.sim.shatter", &[("view", Value::Enum(0)), ("render", Value::Enum(1)), ("force1/force1Position", pt(16.0, 16.0))], src.clone(), 0.5);
+    assert!(layer_only.get(16, 16)[3] == 0.0, "broken centre removed");
+}
+
+#[test]
+fn caustics_flat_water() {
+    let src = ramp(24, 24);
+    let a = run(
+        "ec.sim.caustics",
+        &[
+            ("water/surfaceOpacity", num(0.0)),
+            ("lighting/ambientLight", num(0.0)),
+            ("material/diffuse", num(1.0)),
+            ("lighting/lightHeight", num(1000.0)),
+            ("material/specular", num(0.0)),
+        ],
+        src.clone(),
+        0.0,
+    );
+    assert!(max_diff(&a, &src) < 0.01, "flat water, light overhead = bottom: {}", max_diff(&a, &src));
+    let b = run("ec.sim.caustics", &[], src.clone(), 0.0);
+    assert_eq!(b, run("ec.sim.caustics", &[], src.clone(), 0.0));
+    assert!(sum_diff(&b, &src) > 0.1);
+}
+
+#[test]
+fn caustics_sky_and_light_types() {
+    let src = Image::filled(32, 32, [0.5, 0.5, 0.5, 1.0]);
+    let env = EffectEnv { host: Some(&FoamHost), ..Default::default() };
+    let run_h = |vals: &[(&str, Value)]| run_fx("ec.sim.caustics", vals, src.clone(), 0.0, env).img;
+    // A mirror-like surface shows the (green) sky.
+    let mirror = [("water/surfaceOpacity", num(1.0)), ("sky/sky", Value::Layer(Some(2))), ("sky/intensity", num(1.0))];
+    let p = run_h(&mirror).get(16, 16);
+    assert!(p[1] > p[0] + 0.3 && p[1] > p[2] + 0.3, "{p:?}");
+    // Point Source lights pixels by their own direction to the light: the image is no
+    // longer uniform; Distant Source lights the flat water evenly.
+    let lit = |t: u32| {
+        run_h(&[
+            ("lighting/lightType", Value::Enum(t)),
+            ("lighting/lightPosition", pt(0.0, 0.0)),
+            ("lighting/lightHeight", num(0.2)),
+            ("water/surfaceOpacity", num(0.0)),
+        ])
+    };
+    let (distant, point) = (lit(0), lit(1));
+    assert!((distant.get(2, 2)[0] - distant.get(30, 30)[0]).abs() < 1e-5);
+    assert!(point.get(2, 2)[0] > point.get(30, 30)[0] + 0.02, "{:?} {:?}", point.get(2, 2), point.get(30, 30));
+    // First Comp Light without a comp light: ambient only.
+    let none = run_h(&[("lighting/lightType", Value::Enum(2)), ("water/surfaceOpacity", num(0.0))]);
+    assert!(none.get(16, 16)[0] < distant.get(16, 16)[0]);
+}
+
+#[test]
+fn wave_world_wireframe_controls_ground_and_dry_areas() {
+    let base = [("producer1/producer1Position", pt(8.0, 16.0)), ("simulation/gridResolution", num(24.0))];
+    let wire = |extra: &[(&str, Value)]| run("ec.sim.waveworld", &[base.as_slice(), extra].concat(), Image::new(32, 32), 0.5);
+    assert_ne!(wire(&[]), wire(&[("wireframeControls/horizontalRotation", num(40.0))]));
+    assert_ne!(wire(&[]), wire(&[("wireframeControls/verticalScale", num(3.0))]));
+    // Ground (left dark, right light): the light side rises above the water and is dry.
+    let env = EffectEnv { host: Some(&FoamHost), ..Default::default() };
+    let hm = |extra: &[(&str, Value)]| {
+        let mut v: Vec<(&str, Value)> = base.to_vec();
+        v.extend([("view", Value::Enum(1)), ("ground/ground", Value::Layer(Some(1))), ("ground/steepness", num(0.5)), ("ground/height", num(0.25))]);
+        v.extend_from_slice(extra);
+        run_fx("ec.sim.waveworld", &v, Image::new(32, 32), 1.0, env).img
+    };
+    let solid = hm(&[]);
+    let clear = hm(&[("heightMapControls/renderDryAreasAs", Value::Enum(1))]);
+    assert!(solid.get(30, 16)[3] > 0.99 && clear.get(30, 16)[3] == 0.0);
+    assert!(clear.get(4, 16)[3] > 0.99, "wet side stays");
+    // Dry ground stays flat: mid grey (brightness 0.5) there.
+    assert!((solid.get(30, 16)[0] - 0.5).abs() < 1e-4);
+    // Wave Strength slows waves over shallow water: the surface differs.
+    assert_ne!(hm(&[]), hm(&[("ground/waveStrength", num(1.0))]));
+}
+
+#[test]
+fn wave_world_seek_and_waves() {
+    let v = vec![("view", Value::Enum(1)), ("producer1/producer1Position", pt(16.0, 16.0)), ("simulation/gridResolution", num(24.0))];
+    let _ = run("ec.sim.waveworld", &v, Image::new(32, 32), 0.5);
+    let a = run("ec.sim.waveworld", &v, Image::new(32, 32), 1.0);
+    let mut v2 = v.clone();
+    v2.push(("heightMapControls/transparency", num(0.0)));
+    assert_eq!(a, run("ec.sim.waveworld", &v2, Image::new(32, 32), 1.0));
+    // Waves spread: some pixels differ from the flat-water grey.
+    assert!(a.data.iter().any(|p| (p[0] - 0.5).abs() > 0.05), "waves");
+    let flat = run("ec.sim.waveworld", &[("view", Value::Enum(1)), ("producer1/producer1Amplitude", num(0.0))], Image::new(32, 32), 1.0);
+    assert!(flat.data.iter().all(|p| (p[0] - 0.5).abs() < 1e-5));
+    let wire = run("ec.sim.waveworld", &[("producer1/producer1Position", pt(16.0, 16.0)), ("simulation/gridResolution", num(10.0))], Image::new(32, 32), 0.3);
+    assert!(wire.data.iter().any(|p| p[1] > 0.3));
+}
+
+#[test]
+fn wave_world_steps_match_direct() {
+    // Fresh caches: resumed simulation equals simulation from scratch.
+    let v = vec![
+        ("view", Value::Enum(1)),
+        ("producer1/producer1Position", pt(16.0, 16.0)),
+        ("simulation/gridResolution", num(20.0)),
+        ("simulation/damping", num(0.07)),
+    ];
+    let a = run("ec.sim.waveworld", &v, Image::new(32, 32), 1.3);
+    let mut v2 = v.clone();
+    v2.push(("simulation/damping", num(0.07000001)));
+    // Different key: computed from scratch at 1.3 directly vs via 0.4 (both fresh keys).
+    let _ = run("ec.sim.waveworld", &v2, Image::new(32, 32), 0.4);
+    let b = run("ec.sim.waveworld", &v2, Image::new(32, 32), 1.3);
+    assert!(max_diff(&a, &b) < 1e-3, "{}", max_diff(&a, &b));
+}
+
+#[test]
+fn foam_bubbles_drift_and_seek() {
+    let v = vec![("producer/producerPoint", pt(16.0, 16.0)), ("view", Value::Enum(2)), ("producer/productionRate", num(2.0))];
+    let none = run("ec.sim.foam", &v, Image::new(32, 32), 0.0);
+    assert!(none.data.iter().all(|p| p[3] == 0.0));
+    let _ = run("ec.sim.foam", &v, Image::new(32, 32), 0.6);
+    let a = run("ec.sim.foam", &v, Image::new(32, 32), 1.2);
+    let mut v2 = v.clone();
+    v2.push(("randomSeed", num(1.0)));
+    assert_eq!(a, run("ec.sim.foam", &v2, Image::new(32, 32), 1.2));
+    assert!(a.data.iter().any(|p| p[3] > 0.05), "bubbles");
+    let draft = run("ec.sim.foam", &[("producer/producerPoint", pt(16.0, 16.0)), ("producer/productionRate", num(2.0))], Image::new(32, 32), 1.0);
+    assert!(draft.data.iter().any(|p| p[3] > 0.05));
+}
+
+#[test]
+fn foam_strength_controls_early_popping() {
+    // Strong bubbles all live their full lifespan; weak ones pop at random earlier.
+    assert_eq!(foam_pop_age(7, 300.0, 0.0, 1), 300.0);
+    let early = (0..200).filter(|&id| foam_pop_age(id, 300.0, 1.0, 1) < 150.0).count();
+    assert!(early > 60 && early < 140, "{early}");
+    let count = |strength: f64| {
+        let v = vec![
+            ("producer/producerPoint", pt(16.0, 16.0)),
+            ("producer/productionRate", num(3.0)),
+            ("bubbles/lifespan", num(40.0)),
+            ("bubbles/strength", num(strength)),
+            ("physics/windSpeed", num(0.0)),
+        ];
+        run("ec.sim.foam", &v, Image::new(32, 32), 1.5).data.iter().map(|p| p[3]).sum::<f32>()
+    };
+    assert!(count(0.0) < count(20.0) * 0.9, "{} vs {}", count(0.0), count(20.0));
+}
+
+/// A host with a comp camera (identity, or tilted) and a first comp light.
+struct Scene {
+    camera: Option<[[f64; 4]; 3]>,
+    light: Option<crate::CompLight>,
+    layer: Option<Image>,
+}
+impl crate::EffectHost for Scene {
+    fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
+        let img = self.layer.clone()?;
+        let size = [img.width as f64, img.height as f64];
+        Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size })
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+    fn comp_scene(&self) -> Option<crate::CompScene> {
+        Some(crate::CompScene { camera: self.camera, camera_layer: true, light: self.light })
+    }
+}
+
+fn run_env(id: &str, vals: &[(&str, Value)], img: Image, t: f64, host: &Scene) -> Image {
+    run_fx(id, vals, img, t, EffectEnv { host: Some(host), ..Default::default() }).img
+}
+
+#[test]
+fn card_dance_camera_systems() {
+    let src = ramp(40, 30);
+    // Camera Position: rotating the camera changes the view; zero rotation is the layer.
+    let r = run("ec.sim.carddance", &[("cameraPosition/yRotation", num(30.0))], src.clone(), 0.0);
+    assert!(sum_diff(&r, &src) > 10.0);
+    let order = run("ec.sim.carddance", &[("cameraPosition/yRotation", num(30.0)), ("cameraPosition/xRotation", num(30.0))], src.clone(), 0.0);
+    let order2 = run(
+        "ec.sim.carddance",
+        &[("cameraPosition/yRotation", num(30.0)), ("cameraPosition/xRotation", num(30.0)), ("cameraPosition/transformOrder", Value::Enum(5))],
+        src.clone(),
+        0.0,
+    );
+    assert!(sum_diff(&order, &order2) > 1.0, "Transform Order matters");
+    // X, Y Position moves the view: the layer shifts by the offset.
+    let moved = run("ec.sim.carddance", &[("cameraPosition/xyPosition", pt(30.0, 15.0))], src.clone(), 0.0);
+    assert!((moved.get(25, 10)[0] - src.get(15, 10)[0]).abs() < 0.03, "{:?} {:?}", moved.get(25, 10), src.get(15, 10));
+    // Corner Pins: the layer's corners land on the pins.
+    let pins = [
+        ("cameraSystem", Value::Enum(1)),
+        ("cornerPins/upperLeftCorner", pt(10.0, 5.0)),
+        ("cornerPins/upperRightCorner", pt(30.0, 5.0)),
+        ("cornerPins/lowerLeftCorner", pt(10.0, 25.0)),
+        ("cornerPins/lowerRightCorner", pt(30.0, 25.0)),
+    ];
+    let cp = run("ec.sim.carddance", &pins, src.clone(), 0.0);
+    assert_eq!(cp.get(3, 3)[3], 0.0, "outside the pinned quad");
+    assert!(cp.get(20, 15)[3] > 0.99);
+    assert!((cp.get(20, 15)[0] - src.get(20, 15)[0]).abs() < 0.05, "centre maps to centre");
+    // Comp Camera: the identity camera reproduces the layer; a camera that doubles x moves it.
+    let ident = Scene { camera: Some([[1.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0], [0.0, 0.0, 0.002, 1.0]]), light: None, layer: None };
+    let cc = run_env("ec.sim.carddance", &[("cameraSystem", Value::Enum(2))], src.clone(), 0.0, &ident);
+    assert!(max_diff(&cc, &src) < 0.02, "{}", max_diff(&cc, &src));
+    let half = Scene { camera: Some([[0.5, 0.0, 0.0, 0.0], [0.0, 0.5, 0.0, 0.0], [0.0, 0.0, 0.002, 1.0]]), ..ident };
+    let cc = run_env("ec.sim.carddance", &[("cameraSystem", Value::Enum(2))], src.clone(), 0.0, &half);
+    assert_eq!(cc.get(35, 25)[3], 0.0, "half-size view leaves the far corner empty");
+}
+
+#[test]
+fn card_dance_lighting_and_material() {
+    let src = Image::filled(40, 30, [0.5, 0.5, 0.5, 1.0]);
+    let tilt = [("rows", num(1.0)), ("columns", num(1.0)), ("yRotation/yRotSource", Value::Enum(0)), ("yRotation/yRotOffset", num(60.0))];
+    let lit = |extra: &[(&str, Value)]| {
+        let mut v: Vec<(&str, Value)> = tilt.to_vec();
+        v.extend_from_slice(extra);
+        run("ec.sim.carddance", &v, src.clone(), 0.0).get(20, 15)
+    };
+    let base = lit(&[]);
+    // Tilted cards facing away from a frontal light get darker than flat ones.
+    assert!(base[0] < 0.45, "{base:?}");
+    // Light colour tints; intensity brightens; ambient alone lights evenly.
+    let red = lit(&[("lighting/lightColor", col(1.0, 0.0, 0.0))]);
+    assert!(red[0] > red[1] + 0.05);
+    assert!(lit(&[("lighting/lightIntensity", num(2.0))])[0] > base[0]);
+    let amb = lit(&[("lighting/ambientLight", num(1.0)), ("material/diffuse", num(0.0))]);
+    assert!((amb[0] - 0.5).abs() < 1e-3);
+    // A light placed to the side (Point Source) changes the shading of the tilted card.
+    let side = lit(&[("lighting/lightType", Value::Enum(1)), ("lighting/lightPosition", pt(200.0, 15.0)), ("lighting/lightDepth", num(0.2))]);
+    assert!((side[0] - base[0]).abs() > 0.02, "{side:?} vs {base:?}");
+    // Specular adds a highlight on flat, frontally lit cards.
+    let flat = run("ec.sim.carddance", &[("material/specular", num(0.5))], src.clone(), 0.0).get(20, 15);
+    assert!(flat[0] > 0.9, "{flat:?}");
+    // First Comp Light: no light in the comp → ambient only; a light from the host is used.
+    let none = Scene { camera: None, light: None, layer: None };
+    let a = run_env("ec.sim.carddance", &[("lighting/lightType", Value::Enum(2))], src.clone(), 0.0, &none).get(20, 15);
+    assert!((a[0] - 0.5 * (0.25 + 0.75)).abs() < 1e-3, "{a:?}");
+    let blue = Scene { light: Some(crate::CompLight { pos: [20.0, 15.0, -100.0], dir: [0.0, 0.0, 1.0], color: [0.0, 0.0, 1.0], kind: 0 }), ..none };
+    let a = run_env("ec.sim.carddance", &[("lighting/lightType", Value::Enum(2))], src.clone(), 0.0, &blue).get(20, 15);
+    assert!(a[2] > a[0] + 0.2, "{a:?}");
+}
+
+#[test]
+fn shatter_custom_map_gradient_textures_and_extrusion() {
+    let src = ramp(32, 32);
+    let base = [("view", Value::Enum(0)), ("force1/force1Position", pt(16.0, 16.0)), ("force1/force1Radius", num(2.0)), ("shape/origin", pt(16.0, 16.0))];
+    let with = |extra: &[(&str, Value)], t: f64, host: Option<&Scene>| {
+        let mut v: Vec<(&str, Value)> = base.to_vec();
+        v.extend_from_slice(extra);
+        match host {
+            Some(h) => run_env("ec.sim.shatter", &v, src.clone(), t, h),
+            None => run("ec.sim.shatter", &v, src.clone(), t),
+        }
+    };
+    // Custom Shatter Map: a map white on the left and black on the right; with White Tiles
+    // Fixed the left half stays put while the right half breaks away.
+    let mut map = Image::new(32, 32);
+    for y in 0..32 {
+        for x in 0..32 {
+            map.set(x, y, if x < 16 { [1.0; 4] } else { [0.0, 0.0, 0.0, 1.0] });
+        }
+    }
+    let host = Scene { camera: None, light: None, layer: Some(map) };
+    let custom = [("shape/pattern", Value::Enum(5)), ("shape/customShatterMap", Value::Layer(Some(1))), ("shape/whiteTilesFixed", Value::Bool(true))];
+    let at_rest = with(&custom, 0.0, Some(&host));
+    assert!(max_diff(&at_rest, &src) < 0.05, "custom pieces tile the layer: {}", max_diff(&at_rest, &src));
+    let broke = with(&custom, 1.0, Some(&host));
+    assert!(max_diff_region(&broke, &src, 0..12) < 0.05, "white tiles fixed");
+    assert!(sum_diff_region(&broke, &src, 20..32) > 5.0, "black group moved");
+    // Gradient: a black gradient layer with threshold 50 % keeps everything together.
+    let black = Scene { camera: None, light: None, layer: Some(Image::filled(32, 32, [0.0, 0.0, 0.0, 1.0])) };
+    let g = with(&[("gradient/gradientLayer", Value::Layer(Some(1))), ("gradient/shatterThreshold", num(50.0))], 1.0, Some(&black));
+    assert!(max_diff(&g, &src) < 0.05);
+    let gi = with(
+        &[("gradient/gradientLayer", Value::Layer(Some(1))), ("gradient/shatterThreshold", num(50.0)), ("gradient/invertGradient", Value::Bool(true))],
+        1.0,
+        Some(&black),
+    );
+    assert!(sum_diff(&gi, &src) > 10.0);
+    // Textures: Front Mode Color paints the pieces flat; Opacity fades them.
+    let flat = with(&[("textures/frontMode", Value::Enum(0)), ("textures/color", col(0.0, 1.0, 0.0))], 0.0, None);
+    let p = flat.get(16, 16);
+    assert!(p[1] > 0.95 && p[0] < 0.05, "{p:?}");
+    let half = with(&[("textures/opacity", num(0.5)), ("shape/repetitions", num(2.0))], 0.0, None);
+    assert!((half.get(8, 4)[3] - 0.5).abs() < 0.02, "{:?}", half.get(8, 4));
+    // Extrusion: thicker pieces cover more once they tumble.
+    let cover = |d: f64| {
+        with(&[("shape/extrusionDepth", num(d)), ("textures/sideMode", Value::Enum(0)), ("textures/color", col(1.0, 1.0, 1.0))], 0.6, None)
+            .data
+            .iter()
+            .map(|p| p[3])
+            .sum::<f32>()
+    };
+    assert!(cover(1.0) > cover(0.0) + 1.0, "{} vs {}", cover(1.0), cover(0.0));
+    // Deterministic and seek-consistent.
+    assert_eq!(with(&custom, 0.7, Some(&host)), with(&custom, 0.7, Some(&host)));
+}
+
+fn max_diff_region(a: &Image, b: &Image, xs: std::ops::Range<u32>) -> f32 {
+    let mut m = 0.0f32;
+    for y in 0..a.height {
+        for x in xs.clone() {
+            let (p, q) = (a.get(x as i64, y as i64), b.get(x as i64, y as i64));
+            m = (0..4).map(|k| (p[k] - q[k]).abs()).fold(m, f32::max);
+        }
+    }
+    m
+}
+
+fn sum_diff_region(a: &Image, b: &Image, xs: std::ops::Range<u32>) -> f32 {
+    let mut s = 0.0;
+    for y in 0..a.height {
+        for x in xs.clone() {
+            let (p, q) = (a.get(x as i64, y as i64), b.get(x as i64, y as i64));
+            s += (0..4).map(|k| (p[k] - q[k]).abs()).sum::<f32>();
+        }
+    }
+    s
+}
+
+/// Layer 1 = a left-dark, right-light ramp; layer 2 = solid green.
+struct FoamHost;
+impl crate::EffectHost for FoamHost {
+    fn layer(&self, id: u64, _: bool) -> Option<crate::LayerPixels> {
+        let img = if id == 1 { ramp(32, 32) } else { Image::filled(32, 32, [0.0, 1.0, 0.0, 1.0]) };
+        Some(crate::LayerPixels { buf: Buf { img, offset: [0.0; 2], scale: 1.0 }, size: [32.0, 32.0] })
+    }
+    fn layer_at(&self, id: u64, _: f64, me: bool) -> Option<crate::LayerPixels> {
+        self.layer(id, me)
+    }
+    fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+        None
+    }
+}
+
+#[test]
+fn foam_flow_map_pop_velocity_wobble_textures_and_reflection() {
+    let base = vec![
+        ("producer/producerPoint", pt(16.0, 16.0)),
+        ("producer/productionRate", num(2.0)),
+        ("physics/windSpeed", num(0.0)),
+        ("physics/turbulence", num(0.0)),
+        ("view", Value::Enum(2)),
+    ];
+    let with = |extra: &[(&str, Value)], t: f64| {
+        let mut v = base.clone();
+        v.extend_from_slice(extra);
+        run_fx("ec.sim.foam", &v, Image::new(32, 32), t, EffectEnv { host: Some(&FoamHost), ..Default::default() }).img
+    };
+    let cx = |img: &Image| {
+        let (mut s, mut n) = (0.0, 0.0);
+        for y in 0..32 {
+            for x in 0..32 {
+                let a = img.get(x, y)[3];
+                s += a * x as f32;
+                n += a;
+            }
+        }
+        s / n.max(1e-6)
+    };
+    // Flow map: bubbles run downhill (towards the dark left side).
+    let still = with(&[], 1.0);
+    let flowing = with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0))], 1.0);
+    assert!(cx(&flowing) < cx(&still) - 1.0, "{} vs {}", cx(&flowing), cx(&still));
+    let hq = with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0)), ("flowMap/simulationQuality", Value::Enum(2))], 1.0);
+    assert_eq!(
+        hq,
+        with(&[("flowMap/flowMap", Value::Layer(Some(1))), ("flowMap/flowMapSteepness", num(1.0)), ("flowMap/simulationQuality", Value::Enum(2))], 1.0)
+    );
+    // Pop velocity scatters the survivors when short-lived bubbles pop.
+    let short = [("bubbles/lifespan", num(8.0)), ("bubbles/strength", num(0.0))];
+    let a = with(&[short.as_slice(), &[("physics/popVelocity", num(0.0))]].concat(), 1.0);
+    let b2 = with(&[short.as_slice(), &[("physics/popVelocity", num(20.0))]].concat(), 1.0);
+    assert_ne!(a, b2);
+    // Wobble changes the drawn bubbles.
+    assert_ne!(with(&[("physics/wobbleAmount", num(0.0))], 1.0), with(&[("physics/wobbleAmount", num(3.0))], 1.0));
+    // User Defined texture: bubbles show the texture layer (green).
+    let tex = with(&[("rendering/bubbleTexture", Value::Enum(5)), ("rendering/bubbleTextureLayer", Value::Layer(Some(2)))], 1.0);
+    assert!(tex.data.iter().any(|p| p[1] > 0.5 && p[0] < 0.1));
+    // Environment map: reflections tint the bubbles.
+    let refl = with(&[("rendering/environmentMap", Value::Layer(Some(2))), ("rendering/reflectionStrength", num(1.0))], 1.0);
+    let g = |i: &Image| i.data.iter().map(|p| p[1] - p[0]).sum::<f32>();
+    assert!(g(&refl) > g(&still) + 1.0);
+    // Zoom Producer Point zooms about the producer instead of the layer centre.
+    let off = [("producer/producerPoint", pt(8.0, 8.0)), ("zoom", num(2.0))];
+    let z1 = with(&off, 1.0);
+    let z2 = with(&[off.as_slice(), &[("producer/zoomProducerPoint", Value::Bool(true))]].concat(), 1.0);
+    assert!((cx(&z2) - 8.0).abs() < 2.0 && cx(&z1) < 4.0, "{} vs {}", cx(&z2), cx(&z1));
+}
diff --git a/crates/effects/src/sim3.rs b/crates/effects/src/sim3.rs
index 35c758faa..88a16d981 100644
--- a/crates/effects/src/sim3.rs
+++ b/crates/effects/src/sim3.rs
@@ -575,7 +575,8 @@ fn mapper_from(ctx: &EffectCtx, group: &str, ephemeral: bool) -> Option<Mapper>
 
 /// Draw a map layer frame as a particle: centred on (x, y) buffer px, rotated `angle` degrees
 /// and scaled, over `out`.
-fn blit_layer(out: &mut Image, lp: &crate::LayerPixels, x: f64, y: f64, angle: f64, scale: [f64; 2], buf_scale: f64, alpha: f32) {
+fn blit_layer(out: &mut Image, lp: &crate::LayerPixels, position: [f64; 2], angle: f64, scale: [f64; 2], buf_scale: f64, alpha: f32) {
+    let [x, y] = position;
     let (w, h) = (lp.size[0] * scale[0].abs() * buf_scale, lp.size[1] * scale[1].abs() * buf_scale);
     let r = (w * w + h * h).sqrt() * 0.5 + 1.0;
     let (x0, x1) = ((x - r).floor().max(0.0) as i64, (x + r).ceil().min(out.width as f64) as i64);
@@ -925,7 +926,7 @@ impl PgPlan {
     pub fn finish(&self, mut b: Buf) -> Buf {
         let mut fx = splat(b.img.width, b.img.height, &self.sprites.sprites, self.sprites.acc);
         for q in &self.blits {
-            blit_layer(&mut fx, &self.frames[q.frame], q.x, q.y, q.angle, q.scale, b.scale, q.alpha);
+            blit_layer(&mut fx, &self.frames[q.frame], [q.x, q.y], q.angle, q.scale, b.scale, q.alpha);
         }
         // Particles replace the layer's own pixels.
         b.img = combine(&b.img, &fx, 5);
@@ -1176,379 +1177,4 @@ pub fn specs() -> Vec<EffectSpec> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{EffectEnv, MaskShape, run_fx};
-
-    fn run(vals: &[(&str, Value)], t: f64) -> Image {
-        run_fx("ec.sim.particleplayground", vals, Image::filled(80, 60, [0.2, 0.2, 0.2, 1.0]), t, EffectEnv::default()).img
-    }
-
-    fn cannon(t: f64) -> Image {
-        run(&[("cannon/cannonPosition", Value::Vec2([40.0, 50.0])), ("cannon/velocity", num(60.0)), ("gravity/gravityForce", num(30.0))], t)
-    }
-
-    #[test]
-    fn cannon_stream_is_seek_consistent() {
-        let a = cannon(1.0);
-        // Particles replace the layer: some coverage, mostly transparent, red.
-        let cov: f32 = a.data.iter().map(|p| p[3]).sum();
-        assert!(cov > 5.0, "{cov}");
-        assert!(a.data.iter().any(|p| p[3] > 0.5 && p[0] > 0.5 && p[1] < 0.1));
-        // Seek back and forth: the same frame every time.
-        let _ = cannon(2.0);
-        let b = cannon(1.0);
-        assert_eq!(a.data, b.data);
-        let c = cannon(0.5);
-        assert_ne!(a.data, c.data);
-        // Nothing has been fired at time 0.
-        let z = cannon(0.0);
-        assert!(z.data.iter().all(|p| p[3] == 0.0));
-    }
-
-    #[test]
-    fn grid_falls_with_gravity_and_bounces_off_a_wall() {
-        let grid = |t: f64, env: EffectEnv| {
-            run_fx(
-                "ec.sim.particleplayground",
-                &[
-                    ("cannonEnabled", Value::Bool(false)),
-                    ("grid/gridPosition", Value::Vec2([40.0, 10.0])),
-                    ("grid/gridWidth", num(40.0)),
-                    ("grid/gridHeight", num(0.0)),
-                    ("grid/particlesAcross", num(5.0)),
-                    ("grid/particlesDown", num(1.0)),
-                    ("gravity/gravityForce", num(100.0)),
-                    ("wall/wallBoundary", num(1.0)),
-                ],
-                Image::new(80, 60),
-                t,
-                env,
-            )
-            .img
-        };
-        // Alpha-weighted mean height of the particles.
-        let row_of = |img: &Image| {
-            let (mut s, mut n) = (0.0f64, 0.0f64);
-            for y in 0..60 {
-                for x in 0..80 {
-                    let a = img.get(x, y)[3] as f64;
-                    s += (y as f64 + 0.5) * a;
-                    n += a;
-                }
-            }
-            (s / n.max(1e-9)).round() as i64
-        };
-        let t0 = grid(0.0, EffectEnv::default());
-        let t1 = grid(0.5, EffectEnv::default());
-        assert_eq!(row_of(&t0), 10);
-        // ½ g t² = 12.5 px.
-        assert!((row_of(&t1) - 22).abs() <= 2, "{}", row_of(&t1));
-        // A wall (mask 1) whose floor is at y = 15 keeps them above it.
-        let masks = [MaskShape { name: "w".into(), points: vec![[0.0, 0.0], [80.0, 0.0], [80.0, 15.0], [0.0, 15.0]], closed: true, inverted: false }];
-        let env = EffectEnv { masks: &masks, ..Default::default() };
-        let w = grid(1.5, env);
-        assert!(row_of(&w) <= 16, "{}", row_of(&w));
-    }
-
-    #[test]
-    fn repel_spreads_particles() {
-        let spread = |force: f64| {
-            let img = run(
-                &[
-                    ("cannonEnabled", Value::Bool(false)),
-                    ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
-                    ("grid/gridWidth", num(6.0)),
-                    ("grid/gridHeight", num(6.0)),
-                    ("grid/particlesAcross", num(3.0)),
-                    ("grid/particlesDown", num(3.0)),
-                    ("gravity/gravityForce", num(0.0)),
-                    ("repel/repelForce", num(force)),
-                    ("repel/repelForceRadius", num(20.0)),
-                ],
-                0.5,
-            );
-            let (mut x0, mut x1) = (80, 0);
-            for y in 0..60 {
-                for x in 0..80 {
-                    if img.get(x, y)[3] > 0.3 {
-                        x0 = x0.min(x);
-                        x1 = x1.max(x);
-                    }
-                }
-            }
-            x1 - x0
-        };
-        assert!(spread(0.2) > spread(0.0) + 4, "{} vs {}", spread(0.2), spread(0.0));
-    }
-
-    #[test]
-    fn property_mapper_and_layer_map_read_layers() {
-        // Without a host, the layer-based features are inert (deterministic output).
-        let a = run(
-            &[
-                ("persistentPropertyMapper/mapRedTo", Value::Enum(8)),
-                ("persistentPropertyMapper/redMin", num(-50.0)),
-                ("persistentPropertyMapper/redMax", num(50.0)),
-            ],
-            0.7,
-        );
-        let b = run(
-            &[
-                ("persistentPropertyMapper/mapRedTo", Value::Enum(8)),
-                ("persistentPropertyMapper/redMin", num(-50.0)),
-                ("persistentPropertyMapper/redMax", num(50.0)),
-            ],
-            0.7,
-        );
-        assert_eq!(a.data, b.data);
-        let st =
-            Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0, 0.0, 0.5, 1.0]), [(15, 0, 0.0, 120.0), (0, 0, 0.0, 1.0), (9, 0, 0.0, 2.0)])), ..bare(1) };
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
-        st.step(&mut s);
-        // Red 1 → X speed 120 px/s; blue 0.5 → scale 1.
-        assert!((s.parts[0].v[0] - 120.0).abs() < 1e-3);
-        assert!((s.parts[0].scale[0] - 1.0).abs() < 1e-3);
-    }
-
-    /// A Pg with nothing switched on.
-    fn bare(seed: u32) -> Pg {
-        Pg {
-            cannon: false,
-            pos: [0.0; 2],
-            barrel_angle: 0.0,
-            barrel_radius: 0.0,
-            rate: 0.0,
-            dir_spread: 0.0,
-            vel: 0.0,
-            vel_spread: 0.0,
-            color: [1.0; 4],
-            radius: 2.0,
-            cannon_text: vec![],
-            pex_radius: 0.0,
-            pex_dispersion: 0.0,
-            pex_affects: Affects::default(),
-            gravity: [0.0; 2],
-            grav_spread: 0.0,
-            grav_affects: Affects::default(),
-            repel: 0.0,
-            repel_radius: 0.0,
-            repel_affects: Affects::default(),
-            wall: None,
-            wall_affects: Affects::default(),
-            persistent: None,
-            ephemeral: None,
-            seed,
-            bounds: [-1e6, -1e6, 1e6, 1e6],
-        }
-    }
-
-    fn mapper(img: Image, chans: [(u32, u32, f32, f32); 3]) -> Mapper {
-        Mapper { map: MapImg { img, k: [1.0; 2], o: [0.0; 2] }, chans, affects: Affects::default() }
-    }
-
-    #[test]
-    fn barrel_radius_square_or_disc() {
-        let pg = |r: f32| Pg { cannon: true, barrel_radius: r, ..bare(3) };
-        let (sq, disc) = (pg(10.0), pg(-10.0));
-        let mut corner = false;
-        for id in 0..400 {
-            let a = sq.spawn(id).p;
-            assert!(a[0].abs() <= 10.0 && a[1].abs() <= 10.0);
-            // A square barrel fills its corners (both offsets in use, not a line).
-            corner |= a[0].abs() > 7.5 && a[1].abs() > 7.5;
-            let b = disc.spawn(id).p;
-            assert!(b[0].hypot(b[1]) <= 10.0 + 1e-4);
-        }
-        assert!(corner);
-        // Radius 0: every particle starts at the cannon position.
-        assert_eq!(pg(0.0).spawn(5).p, [0.0, 0.0]);
-    }
-
-    #[test]
-    fn mapper_drives_position_and_opacity_in_ae_order() {
-        let st =
-            Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0, 0.5, 0.25, 1.0]), [(12, 0, 0.0, 30.0), (20, 0, 0.0, 1.0), (4, 0, 0.0, 1.0)])), ..bare(1) };
-        assert_eq!(MAP_TARGETS[12], "X");
-        assert_eq!(MAP_TARGETS[20], "Opacity");
-        assert_eq!(MAP_TARGETS[26], "Scale Speed");
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
-        st.step(&mut s);
-        assert!((s.parts[0].p[0] - 30.0).abs() < 1e-3, "{:?}", s.parts[0].p);
-        assert!((s.parts[0].c[3] - 0.5).abs() < 1e-3);
-        assert!((s.parts[0].friction - 0.25).abs() < 1e-3);
-    }
-
-    #[test]
-    fn ephemeral_mapper_holds_for_one_step_with_operators() {
-        // Ephemeral X Speed = 60 px/s (Set): the particle moves, but keeps no velocity.
-        let st = Pg { ephemeral: Some(mapper(Image::filled(4, 4, [1.0, 1.0, 1.0, 1.0]), [(15, 0, 0.0, 60.0), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)])), ..bare(1) };
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
-        st.step(&mut s);
-        assert!((s.parts[0].p[0] - 2.0).abs() < 1e-4, "{:?}", s.parts[0].p);
-        assert!(s.parts[0].v[0].abs() < 1e-4);
-        // Operators: Add / Multiply / Max on the particle's own value.
-        let op = |o: u32, cur: f32| {
-            let m = mapper(Image::filled(4, 4, [1.0, 1.0, 1.0, 1.0]), [(21, o, 0.0, 3.0), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)]);
-            let mut q = PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID);
-            q.mass = cur;
-            m.apply(&mut q);
-            q.mass
-        };
-        assert_eq!(MAP_OPERATORS[1], "Add");
-        assert!((op(1, 2.0) - 5.0).abs() < 1e-5);
-        assert!((op(4, 2.0) - 6.0).abs() < 1e-5);
-        assert!((op(6, 5.0) - 5.0).abs() < 1e-5);
-        assert!((op(2, 5.0) - 2.0).abs() < 1e-5, "Difference");
-    }
-
-    #[test]
-    fn affects_select_by_source_age_and_characters() {
-        let mut q = PgParticle::new([0.0; 2], [0.0; 2], [1.0; 4], 2.0, 0, SRC_CANNON);
-        let a = Affects { from: 2, ..Default::default() };
-        assert_eq!(a.weight(&q), 0.0, "grid only");
-        q.src = SRC_GRID;
-        assert_eq!(a.weight(&q), 1.0);
-        let older = Affects { age: 1.0, ..Default::default() };
-        q.age = 0.5;
-        assert_eq!(older.weight(&q), 0.0);
-        q.age = 1.5;
-        assert_eq!(older.weight(&q), 1.0);
-        let younger = Affects { age: -1.0, feather: 1.0, ..Default::default() };
-        q.age = 1.0;
-        assert!((younger.weight(&q) - 0.5).abs() < 1e-5, "feathered");
-        let chars = Affects { chars: vec!['A', 'B'], ..Default::default() };
-        q.ch = 'B' as u32;
-        assert_eq!(chars.weight(&q), 1.0);
-        q.ch = 'C' as u32;
-        assert_eq!(chars.weight(&q), 0.0);
-        // Gravity restricted to the cannon leaves grid particles in place.
-        let st = Pg { gravity: [0.0, 100.0], grav_affects: Affects { from: 1, ..Default::default() }, ..bare(1) };
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([5.0, 5.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
-        s.parts.push(PgParticle::new([5.0, 5.0], [0.0; 2], [1.0; 4], 2.0, 1, SRC_CANNON));
-        for _ in 0..10 {
-            st.step(&mut s);
-        }
-        assert_eq!(s.parts[0].p, [5.0, 5.0]);
-        assert!(s.parts[1].p[1] > 5.0);
-    }
-
-    #[test]
-    fn particle_exploder_bursts_big_particles() {
-        let st = Pg { pex_radius: 2.0, pex_dispersion: 30.0, ..bare(1) };
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([50.0, 50.0], [0.0; 2], [1.0; 4], 6.0, 0, SRC_GRID));
-        s.next_id = 1;
-        st.step(&mut s);
-        assert_eq!(s.parts.len(), 9, "(6/2)² new particles");
-        assert!(s.parts.iter().all(|q| q.r == 2.0 && q.src == SRC_PARTICLE_EXPLODER));
-        st.step(&mut s);
-        assert_eq!(s.parts.len(), 9, "new particles do not burst again");
-        // Lifespan from a mapper removes particles once they are older.
-        let life = Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0; 4]), [(22, 0, 0.0, 0.05), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)])), ..bare(1) };
-        let mut s = PgState::default();
-        s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
-        for _ in 0..2 {
-            life.step(&mut s);
-        }
-        assert_eq!(s.parts.len(), 1);
-        for _ in 0..3 {
-            life.step(&mut s);
-        }
-        assert!(s.parts.is_empty());
-    }
-
-    #[test]
-    fn text_particles_draw_characters() {
-        let grid = |text: &str| {
-            run(
-                &[
-                    ("cannonEnabled", Value::Bool(false)),
-                    ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
-                    ("grid/gridWidth", num(40.0)),
-                    ("grid/gridHeight", num(0.0)),
-                    ("grid/particlesAcross", num(3.0)),
-                    ("grid/particlesDown", num(1.0)),
-                    ("grid/gridParticleRadius", num(16.0)),
-                    ("gravity/gravityForce", num(0.0)),
-                    ("options/gridText", Value::Str(text.into())),
-                ],
-                0.1,
-            )
-        };
-        let dots = grid("");
-        let text = grid("I-O");
-        assert_ne!(dots.data, text.data);
-        // "I" is a vertical bar: ink above and below the grid point, not a round dot.
-        assert!(text.get(20, 26)[3] > 0.3 && text.get(20, 34)[3] > 0.3, "{:?}", text.get(20, 26));
-        // A space leaves its grid point empty.
-        let gap = grid("I O");
-        assert!(gap.get(40, 30)[3] < 0.05);
-        // Cannon text: particles carry the characters in order.
-        let pg = Pg { cannon_text: vec!['A', 'B'], ..bare(1) };
-        assert_eq!(pg.spawn(0).ch, 'A' as u32);
-        assert_eq!(pg.spawn(3).ch, 'B' as u32);
-    }
-
-    #[test]
-    fn layer_map_shows_the_map_layer_at_its_time_offset() {
-        /// A 6×6 map layer whose colour encodes the comp time it was fetched at.
-        struct Clock;
-        impl crate::EffectHost for Clock {
-            fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
-                None
-            }
-            fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
-                None
-            }
-            fn layer_at(&self, _: u64, t: f64, _: bool) -> Option<crate::LayerPixels> {
-                let v = (t as f32 / 4.0).clamp(0.0, 1.0);
-                Some(crate::LayerPixels { buf: Buf { img: Image::filled(6, 6, [v, 0.0, 1.0 - v, 1.0]), offset: [0.0; 2], scale: 1.0 }, size: [6.0, 6.0] })
-            }
-        }
-        let render = |kind: u32, offset: f64| {
-            let vals = [
-                ("cannonEnabled", Value::Bool(false)),
-                ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
-                ("grid/particlesAcross", num(1.0)),
-                ("grid/particlesDown", num(1.0)),
-                ("gravity/gravityForce", num(0.0)),
-                ("layerMap/layerMapLayer", Value::Layer(Some(9))),
-                ("layerMap/timeOffsetType", Value::Enum(kind)),
-                ("layerMap/timeOffset", num(offset)),
-            ];
-            let env = EffectEnv { host: Some(&Clock), comp_time: 1.0, frame_rate: 10.0, ..Default::default() };
-            run_fx("ec.sim.particleplayground", &vals, Image::filled(80, 60, [0.2, 0.2, 0.2, 1.0]), 1.0, env).img
-        };
-        // The particle is a 6×6 copy of the map layer.
-        let rel = render(0, 1.0);
-        assert!(rel.get(40, 30)[3] > 0.99 && rel.get(46, 30)[3] < 0.01);
-        assert!((rel.get(40, 30)[0] - 0.5).abs() < 1e-3, "relative: now + 1 s = 2 s");
-        let abs = render(1, 3.0);
-        assert!((abs.get(40, 30)[0] - 0.75).abs() < 1e-3, "absolute: 3 s");
-    }
-
-    #[test]
-    fn cc_hair_grows_from_opaque_pixels() {
-        let mut img = Image::new(60, 60);
-        for y in 20..40 {
-            for x in 20..40 {
-                img.set(x, y, [0.8, 0.6, 0.4, 1.0]);
-            }
-        }
-        let out = run_fx("ec.sim.cchair", &[("length", num(12.0)), ("density", num(300.0))], img.clone(), 0.0, EffectEnv::default());
-        // Hair reaches beyond the square (above it: hair leans up, then droops).
-        let outside: f32 = (0..60).flat_map(|x| (0..20).map(move |y| (x, y))).map(|(x, y)| out.img.get(x, y)[3]).sum();
-        assert!(outside > 1.0, "{outside}");
-        // Nothing grows from transparent areas far away.
-        assert_eq!(out.img.get(2, 58)[3], 0.0);
-        let again = run_fx("ec.sim.cchair", &[("length", num(12.0)), ("density", num(300.0))], img.clone(), 3.0, EffectEnv::default());
-        assert_eq!(out.img.data, again.img.data);
-        let none = run_fx("ec.sim.cchair", &[("length", num(0.0))], img.clone(), 0.0, EffectEnv::default());
-        assert_eq!(none.img.data, img.data);
-    }
-}
+mod tests;
diff --git a/crates/effects/src/sim3/tests.rs b/crates/effects/src/sim3/tests.rs
new file mode 100644
index 000000000..ffce0ae6d
--- /dev/null
+++ b/crates/effects/src/sim3/tests.rs
@@ -0,0 +1,372 @@
+use super::*;
+use crate::{EffectEnv, MaskShape, run_fx};
+
+fn run(vals: &[(&str, Value)], t: f64) -> Image {
+    run_fx("ec.sim.particleplayground", vals, Image::filled(80, 60, [0.2, 0.2, 0.2, 1.0]), t, EffectEnv::default()).img
+}
+
+fn cannon(t: f64) -> Image {
+    run(&[("cannon/cannonPosition", Value::Vec2([40.0, 50.0])), ("cannon/velocity", num(60.0)), ("gravity/gravityForce", num(30.0))], t)
+}
+
+#[test]
+fn cannon_stream_is_seek_consistent() {
+    let a = cannon(1.0);
+    // Particles replace the layer: some coverage, mostly transparent, red.
+    let cov: f32 = a.data.iter().map(|p| p[3]).sum();
+    assert!(cov > 5.0, "{cov}");
+    assert!(a.data.iter().any(|p| p[3] > 0.5 && p[0] > 0.5 && p[1] < 0.1));
+    // Seek back and forth: the same frame every time.
+    let _ = cannon(2.0);
+    let b = cannon(1.0);
+    assert_eq!(a.data, b.data);
+    let c = cannon(0.5);
+    assert_ne!(a.data, c.data);
+    // Nothing has been fired at time 0.
+    let z = cannon(0.0);
+    assert!(z.data.iter().all(|p| p[3] == 0.0));
+}
+
+#[test]
+fn grid_falls_with_gravity_and_bounces_off_a_wall() {
+    let grid = |t: f64, env: EffectEnv| {
+        run_fx(
+            "ec.sim.particleplayground",
+            &[
+                ("cannonEnabled", Value::Bool(false)),
+                ("grid/gridPosition", Value::Vec2([40.0, 10.0])),
+                ("grid/gridWidth", num(40.0)),
+                ("grid/gridHeight", num(0.0)),
+                ("grid/particlesAcross", num(5.0)),
+                ("grid/particlesDown", num(1.0)),
+                ("gravity/gravityForce", num(100.0)),
+                ("wall/wallBoundary", num(1.0)),
+            ],
+            Image::new(80, 60),
+            t,
+            env,
+        )
+        .img
+    };
+    // Alpha-weighted mean height of the particles.
+    let row_of = |img: &Image| {
+        let (mut s, mut n) = (0.0f64, 0.0f64);
+        for y in 0..60 {
+            for x in 0..80 {
+                let a = img.get(x, y)[3] as f64;
+                s += (y as f64 + 0.5) * a;
+                n += a;
+            }
+        }
+        (s / n.max(1e-9)).round() as i64
+    };
+    let t0 = grid(0.0, EffectEnv::default());
+    let t1 = grid(0.5, EffectEnv::default());
+    assert_eq!(row_of(&t0), 10);
+    // ½ g t² = 12.5 px.
+    assert!((row_of(&t1) - 22).abs() <= 2, "{}", row_of(&t1));
+    // A wall (mask 1) whose floor is at y = 15 keeps them above it.
+    let masks = [MaskShape { name: "w".into(), points: vec![[0.0, 0.0], [80.0, 0.0], [80.0, 15.0], [0.0, 15.0]], closed: true, inverted: false }];
+    let env = EffectEnv { masks: &masks, ..Default::default() };
+    let w = grid(1.5, env);
+    assert!(row_of(&w) <= 16, "{}", row_of(&w));
+}
+
+#[test]
+fn repel_spreads_particles() {
+    let spread = |force: f64| {
+        let img = run(
+            &[
+                ("cannonEnabled", Value::Bool(false)),
+                ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
+                ("grid/gridWidth", num(6.0)),
+                ("grid/gridHeight", num(6.0)),
+                ("grid/particlesAcross", num(3.0)),
+                ("grid/particlesDown", num(3.0)),
+                ("gravity/gravityForce", num(0.0)),
+                ("repel/repelForce", num(force)),
+                ("repel/repelForceRadius", num(20.0)),
+            ],
+            0.5,
+        );
+        let (mut x0, mut x1) = (80, 0);
+        for y in 0..60 {
+            for x in 0..80 {
+                if img.get(x, y)[3] > 0.3 {
+                    x0 = x0.min(x);
+                    x1 = x1.max(x);
+                }
+            }
+        }
+        x1 - x0
+    };
+    assert!(spread(0.2) > spread(0.0) + 4, "{} vs {}", spread(0.2), spread(0.0));
+}
+
+#[test]
+fn property_mapper_and_layer_map_read_layers() {
+    // Without a host, the layer-based features are inert (deterministic output).
+    let a = run(
+        &[
+            ("persistentPropertyMapper/mapRedTo", Value::Enum(8)),
+            ("persistentPropertyMapper/redMin", num(-50.0)),
+            ("persistentPropertyMapper/redMax", num(50.0)),
+        ],
+        0.7,
+    );
+    let b = run(
+        &[
+            ("persistentPropertyMapper/mapRedTo", Value::Enum(8)),
+            ("persistentPropertyMapper/redMin", num(-50.0)),
+            ("persistentPropertyMapper/redMax", num(50.0)),
+        ],
+        0.7,
+    );
+    assert_eq!(a.data, b.data);
+    let st = Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0, 0.0, 0.5, 1.0]), [(15, 0, 0.0, 120.0), (0, 0, 0.0, 1.0), (9, 0, 0.0, 2.0)])), ..bare(1) };
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
+    st.step(&mut s);
+    // Red 1 → X speed 120 px/s; blue 0.5 → scale 1.
+    assert!((s.parts[0].v[0] - 120.0).abs() < 1e-3);
+    assert!((s.parts[0].scale[0] - 1.0).abs() < 1e-3);
+}
+
+/// A Pg with nothing switched on.
+fn bare(seed: u32) -> Pg {
+    Pg {
+        cannon: false,
+        pos: [0.0; 2],
+        barrel_angle: 0.0,
+        barrel_radius: 0.0,
+        rate: 0.0,
+        dir_spread: 0.0,
+        vel: 0.0,
+        vel_spread: 0.0,
+        color: [1.0; 4],
+        radius: 2.0,
+        cannon_text: vec![],
+        pex_radius: 0.0,
+        pex_dispersion: 0.0,
+        pex_affects: Affects::default(),
+        gravity: [0.0; 2],
+        grav_spread: 0.0,
+        grav_affects: Affects::default(),
+        repel: 0.0,
+        repel_radius: 0.0,
+        repel_affects: Affects::default(),
+        wall: None,
+        wall_affects: Affects::default(),
+        persistent: None,
+        ephemeral: None,
+        seed,
+        bounds: [-1e6, -1e6, 1e6, 1e6],
+    }
+}
+
+fn mapper(img: Image, chans: [(u32, u32, f32, f32); 3]) -> Mapper {
+    Mapper { map: MapImg { img, k: [1.0; 2], o: [0.0; 2] }, chans, affects: Affects::default() }
+}
+
+#[test]
+fn barrel_radius_square_or_disc() {
+    let pg = |r: f32| Pg { cannon: true, barrel_radius: r, ..bare(3) };
+    let (sq, disc) = (pg(10.0), pg(-10.0));
+    let mut corner = false;
+    for id in 0..400 {
+        let a = sq.spawn(id).p;
+        assert!(a[0].abs() <= 10.0 && a[1].abs() <= 10.0);
+        // A square barrel fills its corners (both offsets in use, not a line).
+        corner |= a[0].abs() > 7.5 && a[1].abs() > 7.5;
+        let b = disc.spawn(id).p;
+        assert!(b[0].hypot(b[1]) <= 10.0 + 1e-4);
+    }
+    assert!(corner);
+    // Radius 0: every particle starts at the cannon position.
+    assert_eq!(pg(0.0).spawn(5).p, [0.0, 0.0]);
+}
+
+#[test]
+fn mapper_drives_position_and_opacity_in_ae_order() {
+    let st = Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0, 0.5, 0.25, 1.0]), [(12, 0, 0.0, 30.0), (20, 0, 0.0, 1.0), (4, 0, 0.0, 1.0)])), ..bare(1) };
+    assert_eq!(MAP_TARGETS[12], "X");
+    assert_eq!(MAP_TARGETS[20], "Opacity");
+    assert_eq!(MAP_TARGETS[26], "Scale Speed");
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
+    st.step(&mut s);
+    assert!((s.parts[0].p[0] - 30.0).abs() < 1e-3, "{:?}", s.parts[0].p);
+    assert!((s.parts[0].c[3] - 0.5).abs() < 1e-3);
+    assert!((s.parts[0].friction - 0.25).abs() < 1e-3);
+}
+
+#[test]
+fn ephemeral_mapper_holds_for_one_step_with_operators() {
+    // Ephemeral X Speed = 60 px/s (Set): the particle moves, but keeps no velocity.
+    let st = Pg { ephemeral: Some(mapper(Image::filled(4, 4, [1.0, 1.0, 1.0, 1.0]), [(15, 0, 0.0, 60.0), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)])), ..bare(1) };
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
+    st.step(&mut s);
+    assert!((s.parts[0].p[0] - 2.0).abs() < 1e-4, "{:?}", s.parts[0].p);
+    assert!(s.parts[0].v[0].abs() < 1e-4);
+    // Operators: Add / Multiply / Max on the particle's own value.
+    let op = |o: u32, cur: f32| {
+        let m = mapper(Image::filled(4, 4, [1.0, 1.0, 1.0, 1.0]), [(21, o, 0.0, 3.0), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)]);
+        let mut q = PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID);
+        q.mass = cur;
+        m.apply(&mut q);
+        q.mass
+    };
+    assert_eq!(MAP_OPERATORS[1], "Add");
+    assert!((op(1, 2.0) - 5.0).abs() < 1e-5);
+    assert!((op(4, 2.0) - 6.0).abs() < 1e-5);
+    assert!((op(6, 5.0) - 5.0).abs() < 1e-5);
+    assert!((op(2, 5.0) - 2.0).abs() < 1e-5, "Difference");
+}
+
+#[test]
+fn affects_select_by_source_age_and_characters() {
+    let mut q = PgParticle::new([0.0; 2], [0.0; 2], [1.0; 4], 2.0, 0, SRC_CANNON);
+    let a = Affects { from: 2, ..Default::default() };
+    assert_eq!(a.weight(&q), 0.0, "grid only");
+    q.src = SRC_GRID;
+    assert_eq!(a.weight(&q), 1.0);
+    let older = Affects { age: 1.0, ..Default::default() };
+    q.age = 0.5;
+    assert_eq!(older.weight(&q), 0.0);
+    q.age = 1.5;
+    assert_eq!(older.weight(&q), 1.0);
+    let younger = Affects { age: -1.0, feather: 1.0, ..Default::default() };
+    q.age = 1.0;
+    assert!((younger.weight(&q) - 0.5).abs() < 1e-5, "feathered");
+    let chars = Affects { chars: vec!['A', 'B'], ..Default::default() };
+    q.ch = 'B' as u32;
+    assert_eq!(chars.weight(&q), 1.0);
+    q.ch = 'C' as u32;
+    assert_eq!(chars.weight(&q), 0.0);
+    // Gravity restricted to the cannon leaves grid particles in place.
+    let st = Pg { gravity: [0.0, 100.0], grav_affects: Affects { from: 1, ..Default::default() }, ..bare(1) };
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([5.0, 5.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
+    s.parts.push(PgParticle::new([5.0, 5.0], [0.0; 2], [1.0; 4], 2.0, 1, SRC_CANNON));
+    for _ in 0..10 {
+        st.step(&mut s);
+    }
+    assert_eq!(s.parts[0].p, [5.0, 5.0]);
+    assert!(s.parts[1].p[1] > 5.0);
+}
+
+#[test]
+fn particle_exploder_bursts_big_particles() {
+    let st = Pg { pex_radius: 2.0, pex_dispersion: 30.0, ..bare(1) };
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([50.0, 50.0], [0.0; 2], [1.0; 4], 6.0, 0, SRC_GRID));
+    s.next_id = 1;
+    st.step(&mut s);
+    assert_eq!(s.parts.len(), 9, "(6/2)² new particles");
+    assert!(s.parts.iter().all(|q| q.r == 2.0 && q.src == SRC_PARTICLE_EXPLODER));
+    st.step(&mut s);
+    assert_eq!(s.parts.len(), 9, "new particles do not burst again");
+    // Lifespan from a mapper removes particles once they are older.
+    let life = Pg { persistent: Some(mapper(Image::filled(4, 4, [1.0; 4]), [(22, 0, 0.0, 0.05), (0, 0, 0.0, 1.0), (0, 0, 0.0, 1.0)])), ..bare(1) };
+    let mut s = PgState::default();
+    s.parts.push(PgParticle::new([1.0, 1.0], [0.0; 2], [1.0; 4], 2.0, 0, SRC_GRID));
+    for _ in 0..2 {
+        life.step(&mut s);
+    }
+    assert_eq!(s.parts.len(), 1);
+    for _ in 0..3 {
+        life.step(&mut s);
+    }
+    assert!(s.parts.is_empty());
+}
+
+#[test]
+fn text_particles_draw_characters() {
+    let grid = |text: &str| {
+        run(
+            &[
+                ("cannonEnabled", Value::Bool(false)),
+                ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
+                ("grid/gridWidth", num(40.0)),
+                ("grid/gridHeight", num(0.0)),
+                ("grid/particlesAcross", num(3.0)),
+                ("grid/particlesDown", num(1.0)),
+                ("grid/gridParticleRadius", num(16.0)),
+                ("gravity/gravityForce", num(0.0)),
+                ("options/gridText", Value::Str(text.into())),
+            ],
+            0.1,
+        )
+    };
+    let dots = grid("");
+    let text = grid("I-O");
+    assert_ne!(dots.data, text.data);
+    // "I" is a vertical bar: ink above and below the grid point, not a round dot.
+    assert!(text.get(20, 26)[3] > 0.3 && text.get(20, 34)[3] > 0.3, "{:?}", text.get(20, 26));
+    // A space leaves its grid point empty.
+    let gap = grid("I O");
+    assert!(gap.get(40, 30)[3] < 0.05);
+    // Cannon text: particles carry the characters in order.
+    let pg = Pg { cannon_text: vec!['A', 'B'], ..bare(1) };
+    assert_eq!(pg.spawn(0).ch, 'A' as u32);
+    assert_eq!(pg.spawn(3).ch, 'B' as u32);
+}
+
+#[test]
+fn layer_map_shows_the_map_layer_at_its_time_offset() {
+    /// A 6×6 map layer whose colour encodes the comp time it was fetched at.
+    struct Clock;
+    impl crate::EffectHost for Clock {
+        fn layer(&self, _: u64, _: bool) -> Option<crate::LayerPixels> {
+            None
+        }
+        fn audio(&self, _: u64, _: f64, _: usize, _: u32) -> Option<Vec<f32>> {
+            None
+        }
+        fn layer_at(&self, _: u64, t: f64, _: bool) -> Option<crate::LayerPixels> {
+            let v = (t as f32 / 4.0).clamp(0.0, 1.0);
+            Some(crate::LayerPixels { buf: Buf { img: Image::filled(6, 6, [v, 0.0, 1.0 - v, 1.0]), offset: [0.0; 2], scale: 1.0 }, size: [6.0, 6.0] })
+        }
+    }
+    let render = |kind: u32, offset: f64| {
+        let vals = [
+            ("cannonEnabled", Value::Bool(false)),
+            ("grid/gridPosition", Value::Vec2([40.0, 30.0])),
+            ("grid/particlesAcross", num(1.0)),
+            ("grid/particlesDown", num(1.0)),
+            ("gravity/gravityForce", num(0.0)),
+            ("layerMap/layerMapLayer", Value::Layer(Some(9))),
+            ("layerMap/timeOffsetType", Value::Enum(kind)),
+            ("layerMap/timeOffset", num(offset)),
+        ];
+        let env = EffectEnv { host: Some(&Clock), comp_time: 1.0, frame_rate: 10.0, ..Default::default() };
+        run_fx("ec.sim.particleplayground", &vals, Image::filled(80, 60, [0.2, 0.2, 0.2, 1.0]), 1.0, env).img
+    };
+    // The particle is a 6×6 copy of the map layer.
+    let rel = render(0, 1.0);
+    assert!(rel.get(40, 30)[3] > 0.99 && rel.get(46, 30)[3] < 0.01);
+    assert!((rel.get(40, 30)[0] - 0.5).abs() < 1e-3, "relative: now + 1 s = 2 s");
+    let abs = render(1, 3.0);
+    assert!((abs.get(40, 30)[0] - 0.75).abs() < 1e-3, "absolute: 3 s");
+}
+
+#[test]
+fn cc_hair_grows_from_opaque_pixels() {
+    let mut img = Image::new(60, 60);
+    for y in 20..40 {
+        for x in 20..40 {
+            img.set(x, y, [0.8, 0.6, 0.4, 1.0]);
+        }
+    }
+    let out = run_fx("ec.sim.cchair", &[("length", num(12.0)), ("density", num(300.0))], img.clone(), 0.0, EffectEnv::default());
+    // Hair reaches beyond the square (above it: hair leans up, then droops).
+    let outside: f32 = (0..60).flat_map(|x| (0..20).map(move |y| (x, y))).map(|(x, y)| out.img.get(x, y)[3]).sum();
+    assert!(outside > 1.0, "{outside}");
+    // Nothing grows from transparent areas far away.
+    assert_eq!(out.img.get(2, 58)[3], 0.0);
+    let again = run_fx("ec.sim.cchair", &[("length", num(12.0)), ("density", num(300.0))], img.clone(), 3.0, EffectEnv::default());
+    assert_eq!(out.img.data, again.img.data);
+    let none = run_fx("ec.sim.cchair", &[("length", num(0.0))], img.clone(), 0.0, EffectEnv::default());
+    assert_eq!(none.img.data, img.data);
+}
diff --git a/crates/effects/src/stylize2.rs b/crates/effects/src/stylize2.rs
index b957b4e41..e0354ea75 100644
--- a/crates/effects/src/stylize2.rs
+++ b/crates/effects/src/stylize2.rs
@@ -433,13 +433,7 @@ fn motion_tile(ctx: &EffectCtx, b: Buf) -> Buf {
     let mirror = ctx.params.b("mirrorEdges");
     let phase = ctx.params.f("phase") / 360.0;
     let hshift = ctx.params.b("horizontalPhaseShift");
-    let (nw, nh, noff) = if ctx.adjustment {
-        (b.img.width, b.img.height, b.offset)
-    } else {
-        let ow = (lw * ctx.params.f("outputWidth") / 100.0).max(1.0 / s);
-        let oh = (lh * ctx.params.f("outputHeight") / 100.0).max(1.0 / s);
-        ((ow * s).round().max(1.0) as u32, (oh * s).round().max(1.0) as u32, [(ow - lw) * 0.5 * s, (oh - lh) * 0.5 * s])
-    };
+    let (nw, nh, noff) = crate::motion_tile_frame(ctx, b.offset, (b.img.width, b.img.height), s);
     let mut out = Image::new(nw, nh);
     let src = &b.img;
     out.rows_mut().for_each(|(y, row)| {
diff --git a/crates/effects/src/textfx.rs b/crates/effects/src/textfx.rs
index 34282c272..cb172dfc5 100644
--- a/crates/effects/src/textfx.rs
+++ b/crates/effects/src/textfx.rs
@@ -288,20 +288,39 @@ fn look_from(ctx: &EffectCtx, b: &Buf, on_original_id: &str) -> TextLook {
 const MONTHS: [&str; 12] = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
 const DAYS: [&str; 7] = ["Saturday", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"];
 
-/// Proleptic Gregorian date from a day count since 2000-01-01 (a Saturday).
+/// `num_days_from_ce` of 2000-01-01: the day count since 2000-01-01 (Numbers' date epoch, a
+/// Saturday) rebased so that chrono's `num_days_from_ce` (0001-01-01 is day 1) can convert it.
+const CE_FROM_2000: i64 = 730_120;
+
+/// Days in one 400-year Gregorian cycle; the proleptic calendar repeats after it.
+const DAYS_PER_400_YEARS: i64 = 146_097;
+
+/// Proleptic Gregorian date (year, month, day, Saturday-indexed weekday) from a day count since
+/// 2000-01-01 (a Saturday), for any `i64` count.
+///
+/// chrono's `NaiveDate` stops near ±262143, but Numbers' `value` slider is a plain scalar with
+/// no range guard, so a keyframed count can run past that. The calendar repeats every 400 years,
+/// so chrono converts the day within one cycle and the whole cycles are added back as years (via
+/// i128 so `i64::MIN`/`MAX` can't overflow); the result matches the pre-chrono count for every
+/// year. The weekday comes from the same resolved date, so it can never disagree with it.
 fn date_from_days(days: i64) -> (i64, u32, u32, usize) {
-    // Days since 0000-03-01 based civil calendar conversion.
-    let z = days + 730_425; // 2000-01-01 relative to 0000-03-01
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let y = yoe + era * 400;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = (doy - (153 * mp + 2) / 5 + 1) as u32;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 } as u32;
-    let y = if m <= 2 { y + 1 } else { y };
-    (y, m, d, days.rem_euclid(7) as usize)
+    use chrono::Datelike;
+    let from_ce = i128::from(days) + i128::from(CE_FROM_2000);
+    let (cycles, rest) = (from_ce.div_euclid(i128::from(DAYS_PER_400_YEARS)), from_ce.rem_euclid(i128::from(DAYS_PER_400_YEARS)));
+    // `rest` is 0..146_097, so it is always a valid `num_days_from_ce` day inside chrono's range.
+    let date = i32::try_from(rest).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    // Unreachable fallback: every `rest` in 0..146_097 converts. 2000-01-01 keeps the epoch's date.
+    let (y, m, d, wd) = match date {
+        Some(date) => {
+            let year = i128::from(date.year()) + cycles * 400;
+            let year = i64::try_from(year).unwrap_or(if year < 0 { i64::MIN } else { i64::MAX });
+            // DAYS is Saturday-indexed; chrono counts from Sunday.
+            let wd = (date.weekday().num_days_from_sunday() as usize + 1) % 7;
+            (year, date.month(), date.day(), wd)
+        }
+        None => (2000, 1, 1, 0),
+    };
+    (y, m, d, wd)
 }
 
 fn timecode(frames: i64, fps: f64) -> String {
@@ -1123,6 +1142,10 @@ mod tests {
         assert_eq!(txt(&[("value", num(255.0)), ("type", Value::Enum(9))], 0.0), "FF");
         assert_eq!(txt(&[("value", num(0.0)), ("type", Value::Enum(6))], 0.0), "01/01/00");
         assert_eq!(txt(&[("value", num(60.0)), ("type", Value::Enum(8))], 0.0), "Wednesday, March 1, 2000");
+        // A keyframed date count past chrono's ±262143 range still renders its real date and a
+        // matching weekday (275790-09-13 is a Monday), not an epoch-derived stand-in.
+        assert_eq!(txt(&[("value", num(100_000_000.0)), ("type", Value::Enum(8))], 0.0), "Monday, September 13, 275790");
+        assert_eq!(txt(&[("value", num(-100_000_000.0)), ("type", Value::Enum(7))], 0.0), "Apr 20, -271791");
         assert_eq!(txt(&[("value", num(1.0)), ("currentTimeDate", Value::Bool(true)), ("decimalPlaces", num(1.0))], 2.0), "3.0");
         assert_ne!(
             txt(&[("value", num(100.0)), ("randomValues", Value::Bool(true))], 0.0),
@@ -1130,6 +1153,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn date_from_days_past_chrono_range() {
+        // chrono's NaiveDate stops near ±262143, but Numbers' `value` has no range guard, so a
+        // keyframed day count can run past it. The 400-year cycle keeps the real date (and a
+        // matching weekday) for every count; values from the pre-chrono formula, both directions,
+        // both sides of the 2000-01-01 epoch.
+        for (days, date, day) in [
+            (0_i64, (2000, 1, 1), "Saturday"),
+            (60, (2000, 3, 1), "Wednesday"),
+            (95_015_644, (262143, 12, 31), "Tuesday"), // chrono's last representable date
+            (100_000_000, (275790, 9, 13), "Monday"),  // past it: used to read as the epoch
+            (-96_476_616, (-262145, 12, 31), "Monday"),
+            (-100_000_000, (-271791, 4, 20), "Thursday"),
+        ] {
+            let (y, m, d, wd) = super::date_from_days(days);
+            assert_eq!((y, m, d), date, "days={days}");
+            assert_eq!(super::DAYS[wd], day, "days={days}");
+        }
+        // Extremes don't overflow (i128 intermediates).
+        let _ = (super::date_from_days(i64::MAX), super::date_from_days(i64::MIN));
+    }
+
     #[test]
     fn numbers_draws_glyph_at_position() {
         let img = Image::new(80, 60);
diff --git a/crates/effects/src/util.rs b/crates/effects/src/util.rs
index 1527e221f..ae55d095d 100644
--- a/crates/effects/src/util.rs
+++ b/crates/effects/src/util.rs
@@ -537,7 +537,7 @@ impl<S: Clone> SimCache<S> {
     pub fn run(&self, key: u64, target: u64, init: impl FnOnce() -> S, mut step: impl FnMut(&mut S, u64)) -> std::sync::Arc<S> {
         use std::sync::Arc;
         let start = {
-            let mut g = self.inner.lock().unwrap_or_else(|e| e.into_inner());
+            let mut g = self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
             let tick = g.iter().map(|e| e.used).max().unwrap_or(0) + 1;
             g.iter_mut().find(|e| e.key == key).and_then(|e| {
                 e.used = tick;
@@ -563,7 +563,7 @@ impl<S: Clone> SimCache<S> {
         }
         let out = Arc::new(st);
         fresh.push((target, out.clone()));
-        let mut g = self.inner.lock().unwrap_or_else(|e| e.into_inner());
+        let mut g = self.inner.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
         let tick = g.iter().map(|e| e.used).max().unwrap_or(0) + 1;
         let idx = match g.iter().position(|e| e.key == key) {
             Some(ix) => ix,
diff --git a/crates/effects/src/warp_stab.rs b/crates/effects/src/warp_stab.rs
index 595cb5200..226654a04 100644
--- a/crates/effects/src/warp_stab.rs
+++ b/crates/effects/src/warp_stab.rs
@@ -191,11 +191,11 @@ fn analysis_cached(json: &str) -> Option<(u64, Arc<WarpAnalysis>)> {
     static C: OnceLock<AnalysisCache> = OnceLock::new();
     let key = fnv(json.as_bytes());
     let c = C.get_or_init(Default::default);
-    if let Some(a) = c.lock().unwrap_or_else(|e| e.into_inner()).get(&key) {
+    if let Some(a) = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key) {
         return Some((key, a.clone()));
     }
     let a = Arc::new(WarpAnalysis::from_json(json)?);
-    let mut m = c.lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 8 {
         m.clear();
     }
@@ -294,7 +294,7 @@ pub fn store_summary(key: [u64; 2], summary: PlanSummary) {
 }
 
 fn keep_summary(key: (u64, u64), summary: Arc<PlanSummary>) {
-    let mut m = summaries().lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = summaries().lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 32 {
         m.clear();
     }
@@ -305,7 +305,7 @@ fn keep_summary(key: (u64, u64), summary: Arc<PlanSummary>) {
 /// cached (seconds for a long Subspace Warp clip). `None` when not analysed.
 pub fn summary(params: &Params) -> Option<([u64; 2], Arc<PlanSummary>)> {
     let (key, a, st) = plan_key(params)?;
-    let cached = summaries().lock().unwrap_or_else(|e| e.into_inner()).get(&key).cloned();
+    let cached = summaries().lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key).cloned();
     let sum = match cached {
         Some(s) => s,
         None => {
@@ -333,7 +333,7 @@ pub fn summary_at(params: &Params, time: f64) -> Option<(usize, Arc<PlanSummary>
 pub fn cached_summary_at(params: &Params, time: f64) -> Option<(usize, Arc<PlanSummary>)> {
     let (key, a, _) = plan_key(params)?;
     let k = a.frame_at(time)?;
-    let sum = summaries().lock().unwrap_or_else(|e| e.into_inner()).get(&key).cloned();
+    let sum = summaries().lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key).cloned();
     let sum = match sum {
         Some(s) => s,
         None => {
@@ -445,15 +445,15 @@ fn render(ctx: &EffectCtx, buf: Buf) -> Buf {
             }
         }
         if !local.is_empty() {
-            let mut n = need_m.lock().unwrap_or_else(|e| e.into_inner());
+            let mut n = need_m.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
             for (x, w) in local {
                 n[y * ow as usize + x] = w;
             }
         }
     });
-    let need = need_m.into_inner().unwrap_or_else(|e| e.into_inner());
+    let need = need_m.into_inner().unwrap_or_else(std::sync::PoisonError::into_inner);
     if synth && need.iter().any(|w| *w > 0.0) {
-        synthesize(ctx, &a, k, &src_of, &crop, sc, &mut out, &need);
+        synthesize(ctx, &a, k, &SynthesisGrid { src_of: &src_of, crop: &crop, scale: sc }, &mut out, &need);
     }
     if b(ctx.params, "advanced/showTrackPoints") {
         let r = (2.5 * f(ctx.params, "advanced/trackPointSize") / 100.0 * sc).max(0.5);
@@ -465,19 +465,16 @@ fn render(ctx: &EffectCtx, buf: Buf) -> Buf {
     Buf { img: out, offset: [0.0; 2], scale: sc }
 }
 
-/// Fill the pixels flagged in `need` (weight = how much synthesized content they take) from
-/// neighbouring frames, nearest first.
-#[allow(clippy::too_many_arguments)]
-fn synthesize(
-    ctx: &EffectCtx,
-    a: &WarpAnalysis,
-    k: usize,
-    src_of: &(dyn Fn([f64; 2]) -> [f64; 2] + Sync),
-    crop: &[f64; 4],
-    sc: f64,
-    out: &mut Image,
-    need: &[f32],
-) {
+/// Maps an output sample into the uncropped source grid shared by neighbouring frames.
+struct SynthesisGrid<'a> {
+    src_of: &'a (dyn Fn([f64; 2]) -> [f64; 2] + Sync),
+    crop: &'a [f64; 4],
+    scale: f64,
+}
+
+/// Fill the pixels flagged in `need` from neighbouring frames, nearest first.
+fn synthesize(ctx: &EffectCtx, a: &WarpAnalysis, k: usize, grid: &SynthesisGrid<'_>, out: &mut Image, need: &[f32]) {
+    let SynthesisGrid { src_of, crop, scale: sc } = *grid;
     let Some(host) = ctx.env.host else { return };
     let n = a.frames.len();
     let range = ((f(ctx.params, "advanced/synthesizeInputRange").max(0.0) / a.frame_duration.max(1e-6)).round() as usize).min(60);
diff --git a/crates/effects/tests/gen_golden.rs b/crates/effects/tests/it/gen_golden.rs
similarity index 100%
rename from crates/effects/tests/gen_golden.rs
rename to crates/effects/tests/it/gen_golden.rs
diff --git a/crates/effects/tests/it/main.rs b/crates/effects/tests/it/main.rs
new file mode 100644
index 000000000..7b12e25c6
--- /dev/null
+++ b/crates/effects/tests/it/main.rs
@@ -0,0 +1,6 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod gen_golden;
+mod particle_golden;
+mod sim_golden;
+mod timewarp_golden;
diff --git a/crates/effects/tests/particle_golden.rs b/crates/effects/tests/it/particle_golden.rs
similarity index 100%
rename from crates/effects/tests/particle_golden.rs
rename to crates/effects/tests/it/particle_golden.rs
diff --git a/crates/effects/tests/sim_golden.rs b/crates/effects/tests/it/sim_golden.rs
similarity index 100%
rename from crates/effects/tests/sim_golden.rs
rename to crates/effects/tests/it/sim_golden.rs
diff --git a/crates/effects/tests/timewarp_golden.rs b/crates/effects/tests/it/timewarp_golden.rs
similarity index 100%
rename from crates/effects/tests/timewarp_golden.rs
rename to crates/effects/tests/it/timewarp_golden.rs
diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml
index 0e26cca58..7104bc1cc 100644
--- a/crates/engine/Cargo.toml
+++ b/crates/engine/Cargo.toml
@@ -34,6 +34,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 log = { workspace = true }
+chrono = { workspace = true }
 rayon = { workspace = true }
 image = { workspace = true }
 web-time = { workspace = true }
diff --git a/crates/engine/src/analysis.rs b/crates/engine/src/analysis.rs
new file mode 100644
index 000000000..fa2b8b4ec
--- /dev/null
+++ b/crates/engine/src/analysis.rs
@@ -0,0 +1,6 @@
+pub mod camera_track;
+pub mod mask_track;
+pub mod models;
+pub mod roto;
+pub mod tracking;
+pub mod warp;
diff --git a/crates/engine/src/camera_track.rs b/crates/engine/src/analysis/camera_track.rs
similarity index 99%
rename from crates/engine/src/camera_track.rs
rename to crates/engine/src/analysis/camera_track.rs
index adc5aee69..29961f533 100644
--- a/crates/engine/src/camera_track.rs
+++ b/crates/engine/src/analysis/camera_track.rs
@@ -7,7 +7,7 @@
 //! camera"). When only the solve settings changed (Shot Type, Angle of View, Solve Method,
 //! deleted points) the stored tracks are re-solved without re-tracking. Results are written into
 //! the effect's hidden parameters as one undo step; edits that change the layer's frames clear
-//! them and queue the effect again ([`invalidate`], run after every edit), like After Effects.
+//! them and queue the effect again (`invalidate`, run after every edit), like After Effects.
 //!
 //! Composition space: the solve's canonical frame maps to comp world by
 //! [`CameraSolve::world`] with the zoom of the first solved frame (focal length × the layer's
diff --git a/crates/engine/src/mask_track.rs b/crates/engine/src/analysis/mask_track.rs
similarity index 98%
rename from crates/engine/src/mask_track.rs
rename to crates/engine/src/analysis/mask_track.rs
index f85ba6b70..79c2b4643 100644
--- a/crates/engine/src/mask_track.rs
+++ b/crates/engine/src/analysis/mask_track.rs
@@ -80,10 +80,10 @@ impl MaskMethod {
         }
     }
     pub fn from_name(s: &str) -> Option<MaskMethod> {
-        let n: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
+        let n: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         MaskMethod::ALL
             .into_iter()
-            .find(|m| m.id().to_ascii_lowercase() == n || m.label().chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase() == n)
+            .find(|m| m.id().to_ascii_lowercase() == n || m.label().chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase() == n)
     }
     pub fn model(self) -> Model {
         match self {
diff --git a/crates/engine/src/models.rs b/crates/engine/src/analysis/models.rs
similarity index 100%
rename from crates/engine/src/models.rs
rename to crates/engine/src/analysis/models.rs
diff --git a/crates/engine/src/roto.rs b/crates/engine/src/analysis/roto.rs
similarity index 98%
rename from crates/engine/src/roto.rs
rename to crates/engine/src/analysis/roto.rs
index 49f53d39b..813561969 100644
--- a/crates/engine/src/roto.rs
+++ b/crates/engine/src/analysis/roto.rs
@@ -6,7 +6,7 @@
 //! `wait`; in the browser the background is a Web Worker whose segmentations stream back,
 //! [`crate::offload`]), frame by frame outward from the base frame, rendering the effect's input
 //! (`Renderer::layer_input`, source → masks → the effects above it). `roto.freeze` runs the same
-//! pass and stores the final mattes in the effect (one undo step). [`sync`], run after every
+//! pass and stores the final mattes in the effect (one undo step). `sync`, run after every
 //! edit, keeps each instance's hidden Input Key equal to a signature of what its frames are made
 //! of (the layer's source and timing, its masks and the effects above it) and drops frozen
 //! mattes made from other frames.
@@ -450,7 +450,18 @@ async fn run_work(w: Work, shared: &RotoShared) {
             (RotoTask::Propagate, true) => om::ensure(&w.params, w.size, w.fps, *f, model.clone(), &mut get, &cancel).is_some(),
             (RotoTask::Freeze, true) => {
                 let img = get(*f);
-                match img.map(|img| (om::frame_matte(&w.params, w.size, w.fps, *f, 1.0, &img, model.clone(), &mut get, &cancel), img)) {
+                match img.map(|img| {
+                    (
+                        om::frame_matte(
+                            &w.params,
+                            &om::MatteFrame { layer_size: w.size, fps: w.fps, frame: *f, scale: 1.0, img: &img },
+                            model.clone(),
+                            &mut get,
+                            &cancel,
+                        ),
+                        img,
+                    )
+                }) {
                     Some((om::FrameMatte::Alpha(a), img)) => {
                         frozen.size = [img.width as usize, img.height as usize];
                         frozen.frames.insert(*f, fx::freeze_frame(&a, &[]));
diff --git a/crates/engine/src/tracking.rs b/crates/engine/src/analysis/tracking.rs
similarity index 99%
rename from crates/engine/src/tracking.rs
rename to crates/engine/src/analysis/tracking.rs
index cfdd12441..434cdd8af 100644
--- a/crates/engine/src/tracking.rs
+++ b/crates/engine/src/analysis/tracking.rs
@@ -157,7 +157,7 @@ pub struct TrackShared {
 }
 
 pub(crate) fn lock<T>(m: &Mutex<T>) -> std::sync::MutexGuard<'_, T> {
-    m.lock().unwrap_or_else(|e| e.into_inner())
+    m.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
 }
 
 /// A running (or finished, not yet polled) analysis.
diff --git a/crates/engine/src/warp.rs b/crates/engine/src/analysis/warp.rs
similarity index 99%
rename from crates/engine/src/warp.rs
rename to crates/engine/src/analysis/warp.rs
index 7928a5cab..5472d4e8c 100644
--- a/crates/engine/src/warp.rs
+++ b/crates/engine/src/analysis/warp.rs
@@ -7,7 +7,7 @@
 //! stabilization plan once to validate the result. When the job finishes, the analysis is
 //! written into the effect's hidden Analysis parameter as one undo step, together with a key of
 //! what it was made from (the layer's source, In/Out, start, stretch and Time Remap). Edits that
-//! change those clear the analysis ([`invalidate`], run after every edit) and queue the effect
+//! change those clear the analysis (`invalidate`, run after every edit) and queue the effect
 //! for re-analysis, which frontends start with [`Session::poll_warp`] (After Effects re-analyses
 //! automatically too).
 
diff --git a/crates/engine/src/background.rs b/crates/engine/src/background.rs
new file mode 100644
index 000000000..d4d404d95
--- /dev/null
+++ b/crates/engine/src/background.rs
@@ -0,0 +1,3 @@
+pub mod jobs;
+pub mod offload;
+pub mod remote;
diff --git a/crates/engine/src/jobs.rs b/crates/engine/src/background/jobs.rs
similarity index 100%
rename from crates/engine/src/jobs.rs
rename to crates/engine/src/background/jobs.rs
diff --git a/crates/engine/src/offload.rs b/crates/engine/src/background/offload.rs
similarity index 72%
rename from crates/engine/src/offload.rs
rename to crates/engine/src/background/offload.rs
index ad2c0cde0..23cff4da6 100644
--- a/crates/engine/src/offload.rs
+++ b/crates/engine/src/background/offload.rs
@@ -289,10 +289,10 @@ pub struct Inbox(Mutex<Vec<WorkerReply>>);
 
 impl Inbox {
     pub fn push(&self, r: WorkerReply) {
-        self.0.lock().unwrap_or_else(|e| e.into_inner()).push(r);
+        self.0.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(r);
     }
     pub fn take(&self) -> Vec<WorkerReply> {
-        std::mem::take(&mut *self.0.lock().unwrap_or_else(|e| e.into_inner()))
+        std::mem::take(&mut *self.0.lock().unwrap_or_else(std::sync::PoisonError::into_inner))
     }
 }
 
@@ -992,317 +992,4 @@ pub(crate) fn merge_group(base: &PropGroup, live: &PropGroup, result: &PropGroup
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn round<T: Serialize + for<'de> Deserialize<'de>>(v: &T) -> String {
-        let a = serde_json::to_string(v).unwrap();
-        let back: T = serde_json::from_str(&a).unwrap();
-        let b = serde_json::to_string(&back).unwrap();
-        assert_eq!(a, b);
-        a
-    }
-
-    /// A group with properties `a` (uid 2) and `b` (uid 3) and a sub-group (uid 4) holding `c`
-    /// (uid 5).
-    fn group() -> PropGroup {
-        use effectcraft_keyframe::Value as KV;
-        use effectcraft_project::{Node, Property};
-        let mut sub = PropGroup::new(4, "sub", "Sub");
-        sub.children.push(Node::Prop(Property::new(5, "c", "C", KV::Scalar(0.0))));
-        let mut g = PropGroup::new(1, "fx", "Effect");
-        g.children.push(Node::Prop(Property::new(2, "a", "A", KV::Scalar(0.0))));
-        g.children.push(Node::Prop(Property::new(3, "b", "B", KV::Scalar(0.0))));
-        g.children.push(Node::Group(sub));
-        g
-    }
-
-    fn set(g: &mut PropGroup, uid: Uid, v: f64) {
-        g.find_mut(uid).unwrap().value = effectcraft_keyframe::Value::Scalar(v);
-    }
-
-    fn get(g: &PropGroup, uid: Uid) -> f64 {
-        match g.find(uid).unwrap().value {
-            effectcraft_keyframe::Value::Scalar(v) => v,
-            ref v => panic!("{v:?}"),
-        }
-    }
-
-    #[test]
-    fn analysis_results_merge_with_edits_made_meanwhile() {
-        use effectcraft_project::Node;
-        let base = group();
-        // The user changes `a` and switches the effect off; the analysis writes `b` and `c`.
-        let mut live = base.clone();
-        set(&mut live, 2, 1.0);
-        live.enabled = false;
-        let mut result = base.clone();
-        set(&mut result, 3, 2.0);
-        set(&mut result, 5, 3.0);
-        let m = merge_group(&base, &live, &result).unwrap();
-        assert_eq!((get(&m, 2), get(&m, 3), get(&m, 5), m.enabled), (1.0, 2.0, 3.0, false));
-        // Unchanged on either side: the other side wins whole.
-        assert_eq!(merge_group(&base, &base, &result).unwrap(), result);
-        assert_eq!(merge_group(&base, &live, &base).unwrap(), live);
-        // Both changed `b`, differently: a conflict (nothing is applied). The same way: fine.
-        let mut both = live.clone();
-        set(&mut both, 3, 9.0);
-        assert!(merge_group(&base, &both, &result).is_none());
-        set(&mut both, 3, 2.0);
-        assert_eq!(get(&merge_group(&base, &both, &result).unwrap(), 3), 2.0);
-        // The analysis adds a child (a result group) while the user edits `a`: both kept.
-        let mut added = result.clone();
-        added.children.push(Node::Group(PropGroup::new(6, "out", "Output")));
-        let m = merge_group(&base, &live, &added).unwrap();
-        assert!(m.find_group(6).is_some() && get(&m, 2) == 1.0);
-        // The analysis drops the sub-group the user didn't touch: dropped.
-        let mut dropped = result.clone();
-        dropped.children.retain(|n| !matches!(n, Node::Group(g) if g.uid == 4));
-        let m = merge_group(&base, &live, &dropped).unwrap();
-        assert!(m.find_group(4).is_none() && get(&m, 2) == 1.0);
-        // …but if the user changed something in it, that's a conflict.
-        let mut touched = live.clone();
-        set(&mut touched, 5, 7.0);
-        assert!(merge_group(&base, &touched, &dropped).is_none());
-    }
-
-    #[test]
-    fn protocol_round_trips() {
-        let mut s = Session::default();
-        s.execute("file.openDemoProject", serde_json::json!({})).unwrap();
-        let comp = s.active_comp_id().unwrap();
-        s.execute("renderQueue.add", serde_json::json!({})).unwrap();
-        let item = s.project.render_queue[0].clone();
-        let reqs = [
-            WorkerJob::Render { items: vec![vec![(item.clone(), "/out.gif".into())]] },
-            WorkerJob::Warp { comp, layer: LayerId(3), effect: 9 },
-            WorkerJob::WarpPlan { comp, layer: LayerId(3), effect: 9, time: Tick::from_seconds_f64(0.5) },
-            WorkerJob::RotoFreeze { comp, layer: LayerId(3), effect: 9 },
-            WorkerJob::Camera { comp, layer: LayerId(3), effect: 9 },
-            WorkerJob::RotoPropagate { comp, layer: LayerId(3), effect: 9, direction: crate::roto::Direction::Forward },
-            WorkerJob::Track {
-                comp,
-                layer: LayerId(1),
-                tracker: 4,
-                direction: crate::tracking::Direction::Backward,
-                settings: TrackerSettings::default(),
-                points: vec![PointValues {
-                    uid: 5,
-                    spec: effectcraft_track::PointSpec { center: [1.0, 2.0], feature_size: [3.0, 4.0], search_offset: [0.5, 0.0], search_size: [9.0, 9.0] },
-                    attach_offset: [0.25, -1.0],
-                }],
-                times: vec![Tick::ZERO, Tick::from_seconds_f64(0.5)],
-            },
-            WorkerJob::MaskTrack {
-                comp,
-                layer: LayerId(2),
-                mask: 7,
-                direction: crate::tracking::Direction::Forward,
-                path: ShapePath::ellipse([10.0, 20.0], 5.0, 6.0),
-                method: MaskMethod::Perspective,
-                times: vec![Tick::from_seconds_f64(1.0)],
-            },
-            WorkerJob::ContentFill {
-                plan: Box::new(crate::commands::content_fill::FillPlan {
-                    comp,
-                    layer: LayerId(2),
-                    name: "Clip".into(),
-                    width: 4,
-                    height: 3,
-                    times: vec![Tick::ZERO],
-                    method: "object".into(),
-                    lighting: 0.5,
-                    expand: 1,
-                    reference: Some((LayerId(1), Tick::ZERO)),
-                    dir: "/Fill/Clip_Fill_1".into(),
-                }),
-            },
-        ];
-        for job in reqs {
-            let kind = job.kind();
-            let req = WorkerRequest { id: 42, project: s.project.to_json(), files: footage_files(&s.project), job };
-            let t = round(&req);
-            assert!(t.contains("\"kind\":"), "{kind:?}");
-            let back: WorkerRequest = serde_json::from_str(&t).unwrap();
-            assert_eq!(back.job.kind(), kind);
-            assert_eq!(Project::from_json(&back.project).unwrap(), *s.project);
-        }
-        let g = s.active_comp().unwrap().layers[0].props.clone();
-        for r in [
-            WorkerReply::Render { state: JobState { current: Some(3), done: 4, total: 10, items_total: 1, ..Default::default() } },
-            WorkerReply::Item { update: ItemUpdate::Started { id: 3, unix: 1_700_000_000 } },
-            WorkerReply::Item { update: ItemUpdate::Finished { id: 3, status: RenderStatus::Failed("x".into()), seconds: 1.5, output: Some("/a.gif".into()) } },
-            WorkerReply::Progress { done: 1, total: 2 },
-            WorkerReply::WarpPlan {
-                key: [1, u64::MAX],
-                summary: Box::new(effectcraft_effects::warp_stab::PlanSummary {
-                    warps: vec![[[1.0, 0.0, 2.5], [0.0, 1.0, -1.0], [0.0, 0.0, 1.0]]],
-                    auto_scale: 1.08,
-                    crop: Some([1.0, 2.0, 300.0, 200.0]),
-                    valid_fraction: 0.9,
-                }),
-            },
-            WorkerReply::Group { comp, layer: LayerId(1), group: Box::new(g), message: "ok".into() },
-            WorkerReply::Segs { segs: vec![SegData::new(5, &effectcraft_track::roto::FrameSeg::empty(4, 3))] },
-            WorkerReply::Fill {
-                plan: Box::new(crate::commands::content_fill::FillPlan {
-                    comp,
-                    layer: LayerId(2),
-                    name: "Clip".into(),
-                    width: 4,
-                    height: 3,
-                    times: vec![Tick::ZERO],
-                    method: "object".into(),
-                    lighting: 0.5,
-                    expand: 1,
-                    reference: Some((LayerId(1), Tick::ZERO)),
-                    dir: "/Fill/Clip_Fill_1".into(),
-                }),
-                files: vec!["/Fill/Clip_Fill_1/fill_00000.png".into()],
-            },
-            WorkerReply::Failed { error: "boom".into() },
-            WorkerReply::Done,
-        ] {
-            let t = round(&r);
-            assert!(t.starts_with("{\"type\":"), "{t}");
-        }
-    }
-
-    /// An [`Offload`] that runs the job right away in a second session, through JSON (what a
-    /// Web Worker does, minus the threads).
-    struct Inline;
-    impl Offload for Inline {
-        fn start(&self, req: WorkerRequest, inbox: Arc<Inbox>) -> Result<(), String> {
-            let req: WorkerRequest = serde_json::from_str(&serde_json::to_string(&req).unwrap()).unwrap();
-            let mut w = Session { exporter: Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() })), ..Default::default() };
-            let post: Post = Rc::new(move |r| inbox.push(serde_json::from_str(&serde_json::to_string(&r).unwrap()).unwrap()));
-            run_request(&mut w, req, &post);
-            Ok(())
-        }
-        fn cancel(&self, _: u64) {}
-    }
-
-    #[test]
-    fn render_runs_through_the_offload() {
-        let mut s = Session {
-            exporter: Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() })),
-            offload: Some(Arc::new(Inline)),
-            ..Default::default()
-        };
-        s.execute("file.openDemoProject", serde_json::json!({})).unwrap();
-        s.execute("renderQueue.add", serde_json::json!({"output": "/x.gif"})).unwrap();
-        let ids = s.start_render(false).unwrap();
-        // (the inline offload has replied already; replies are applied when polled)
-        s.poll_render();
-        assert!(s.render_job.is_none());
-        let it = s.project.render_queue.iter().find(|i| i.id == ids[0]).unwrap();
-        assert_eq!(it.status, RenderStatus::Done, "{:?}", it.status);
-        assert!(it.last_output.as_deref().is_some_and(|o| o.ends_with("x.gif")));
-        // `wait` renders inline.
-        s.execute("renderQueue.add", serde_json::json!({"output": "/y.gif"})).unwrap();
-        s.start_render(true).unwrap();
-        assert!(s.render_job.is_none() || s.render_job.as_ref().unwrap().remote.is_none());
-    }
-
-    /// Runs jobs in a session sharing `footage` (the synthetic clip of the tracking tests).
-    struct InlineWith(Arc<dyn effectcraft_render::FootageSource>);
-    impl Offload for InlineWith {
-        fn start(&self, req: WorkerRequest, inbox: Arc<Inbox>) -> Result<(), String> {
-            let req: WorkerRequest = serde_json::from_str(&serde_json::to_string(&req).unwrap()).unwrap();
-            let mut w = Session { footage: self.0.clone(), ..Default::default() };
-            let post: Post = Rc::new(move |r| inbox.push(serde_json::from_str(&serde_json::to_string(&r).unwrap()).unwrap()));
-            run_request(&mut w, req, &post);
-            Ok(())
-        }
-        fn cancel(&self, _: u64) {}
-    }
-
-    /// Never replies (a job still running); records cancellations.
-    #[derive(Default)]
-    struct Hanging(Mutex<Vec<u64>>);
-    impl Offload for Hanging {
-        fn start(&self, _: WorkerRequest, _: Arc<Inbox>) -> Result<(), String> {
-            Ok(())
-        }
-        fn cancel(&self, id: u64) {
-            self.0.lock().unwrap().push(id);
-        }
-    }
-
-    fn pose(f: u32) -> ([f64; 2], f64, f64) {
-        ([150.0 + 2.0 * f as f64, 110.0 + 1.0 * f as f64], 0.0, 1.0)
-    }
-
-    #[test]
-    fn track_analysis_runs_through_the_offload_as_one_undo_step() {
-        let (mut s, clip, _) = crate::tests_track::setup(crate::tests_track::patch_frames(pose));
-        s.offload = Some(Arc::new(InlineWith(s.footage.clone())));
-        s.execute("track.motion", serde_json::json!({})).unwrap();
-        s.execute("track.setPoint", serde_json::json!({"point": 1, "center": pose(0).0, "featureSize": [36, 36], "searchSize": [80, 80]})).unwrap();
-        let undo = s.history.undo.len();
-        s.execute("track.analyze", serde_json::json!({"direction": "forward"})).unwrap();
-        assert!(s.is_tracking() && s.track_job.is_none(), "offloaded, not on a thread");
-        assert!(s.track_progress().is_some());
-        assert!(s.poll_offload());
-        assert!(!s.is_tracking() && s.offloaded.is_empty());
-        let l = s.active_comp().unwrap().layer(clip).unwrap();
-        let tp = l.trackers().next().unwrap().0.track_points().next().unwrap().clone();
-        let fc = tp.get("featureCenter").unwrap();
-        assert_eq!(fc.keys.len(), 25);
-        let v = fc.value_at(crate::tests_track::frame_time(12)).as_vec2();
-        assert!((v[0] - pose(12).0[0]).abs() < 0.3 && (v[1] - pose(12).0[1]).abs() < 0.3, "{v:?}");
-        assert_eq!(s.history.undo.len(), undo + 1);
-        assert_eq!(s.history.undo.last().unwrap().0, "Analyze Track");
-        assert!(s.events.iter().any(|e| matches!(e, Event::Toast { message, error: false } if message.starts_with("Tracked"))));
-        assert!(s.undo());
-        let l = s.active_comp().unwrap().layer(clip).unwrap();
-        assert!(l.trackers().next().unwrap().0.track_points().next().unwrap().get("featureCenter").unwrap().keys.is_empty());
-        // `wait` runs inline.
-        s.redo();
-        s.execute("track.analyze", serde_json::json!({"direction": "forward", "wait": true})).ok();
-        assert!(s.offloaded.is_empty());
-    }
-
-    #[test]
-    fn cancelling_offloaded_jobs() {
-        let (mut s, _, _) = crate::tests_track::setup(crate::tests_track::patch_frames(pose));
-        let off = Arc::new(Hanging::default());
-        s.offload = Some(off.clone());
-        s.exporter = Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() }));
-        // Analysis: stopping drops the job, nothing is written.
-        s.execute("track.motion", serde_json::json!({})).unwrap();
-        let rev = s.revision;
-        s.execute("track.analyze", serde_json::json!({})).unwrap();
-        assert!(s.is_tracking());
-        assert!(s.execute("track.analyze", serde_json::json!({})).is_err(), "one at a time");
-        assert!(s.stop_track());
-        s.poll_offload();
-        assert!(!s.is_tracking());
-        assert_eq!(off.0.lock().unwrap().len(), 1);
-        assert!(s.events.iter().any(|e| matches!(e, Event::Toast { message, .. } if message.contains("stopped"))));
-        assert!(s.revision > rev);
-        // Render: the queued items become User Stopped.
-        s.execute("renderQueue.add", serde_json::json!({"output": "/a.gif"})).unwrap();
-        let ids = s.start_render(false).unwrap();
-        assert!(s.is_rendering());
-        assert!(s.stop_render());
-        s.poll_render();
-        assert!(!s.is_rendering());
-        assert_eq!(off.0.lock().unwrap().len(), 2);
-        let it = s.project.render_queue.iter().find(|i| i.id == ids[0]).unwrap();
-        assert_eq!(it.status, RenderStatus::UserStopped);
-    }
-
-    #[test]
-    fn progress_hook_is_scoped() {
-        report(1, 2); // no hook: nothing happens
-        let seen = Rc::new(RefCell::new(vec![]));
-        let s2 = seen.clone();
-        effectcraft_render::passes::block_on(with_hook(Box::new(move |d, t| s2.borrow_mut().push((d, t))), async {
-            report(1, 3);
-            report(2, 3);
-        }));
-        report(3, 3);
-        assert_eq!(*seen.borrow(), vec![(1, 3), (2, 3)]);
-    }
-}
+mod tests;
diff --git a/crates/engine/src/background/offload/tests.rs b/crates/engine/src/background/offload/tests.rs
new file mode 100644
index 000000000..c08623189
--- /dev/null
+++ b/crates/engine/src/background/offload/tests.rs
@@ -0,0 +1,309 @@
+use super::*;
+
+fn round<T: Serialize + for<'de> Deserialize<'de>>(v: &T) -> String {
+    let a = serde_json::to_string(v).unwrap();
+    let back: T = serde_json::from_str(&a).unwrap();
+    let b = serde_json::to_string(&back).unwrap();
+    assert_eq!(a, b);
+    a
+}
+
+/// A group with properties `a` (uid 2) and `b` (uid 3) and a sub-group (uid 4) holding `c`
+/// (uid 5).
+fn group() -> PropGroup {
+    use effectcraft_keyframe::Value as KV;
+    use effectcraft_project::{Node, Property};
+    let mut sub = PropGroup::new(4, "sub", "Sub");
+    sub.children.push(Node::Prop(Property::new(5, "c", "C", KV::Scalar(0.0))));
+    let mut g = PropGroup::new(1, "fx", "Effect");
+    g.children.push(Node::Prop(Property::new(2, "a", "A", KV::Scalar(0.0))));
+    g.children.push(Node::Prop(Property::new(3, "b", "B", KV::Scalar(0.0))));
+    g.children.push(Node::Group(sub));
+    g
+}
+
+fn set(g: &mut PropGroup, uid: Uid, v: f64) {
+    g.find_mut(uid).unwrap().value = effectcraft_keyframe::Value::Scalar(v);
+}
+
+fn get(g: &PropGroup, uid: Uid) -> f64 {
+    match g.find(uid).unwrap().value {
+        effectcraft_keyframe::Value::Scalar(v) => v,
+        ref v => panic!("{v:?}"),
+    }
+}
+
+#[test]
+fn analysis_results_merge_with_edits_made_meanwhile() {
+    use effectcraft_project::Node;
+    let base = group();
+    // The user changes `a` and switches the effect off; the analysis writes `b` and `c`.
+    let mut live = base.clone();
+    set(&mut live, 2, 1.0);
+    live.enabled = false;
+    let mut result = base.clone();
+    set(&mut result, 3, 2.0);
+    set(&mut result, 5, 3.0);
+    let m = merge_group(&base, &live, &result).unwrap();
+    assert_eq!((get(&m, 2), get(&m, 3), get(&m, 5), m.enabled), (1.0, 2.0, 3.0, false));
+    // Unchanged on either side: the other side wins whole.
+    assert_eq!(merge_group(&base, &base, &result).unwrap(), result);
+    assert_eq!(merge_group(&base, &live, &base).unwrap(), live);
+    // Both changed `b`, differently: a conflict (nothing is applied). The same way: fine.
+    let mut both = live.clone();
+    set(&mut both, 3, 9.0);
+    assert!(merge_group(&base, &both, &result).is_none());
+    set(&mut both, 3, 2.0);
+    assert_eq!(get(&merge_group(&base, &both, &result).unwrap(), 3), 2.0);
+    // The analysis adds a child (a result group) while the user edits `a`: both kept.
+    let mut added = result.clone();
+    added.children.push(Node::Group(PropGroup::new(6, "out", "Output")));
+    let m = merge_group(&base, &live, &added).unwrap();
+    assert!(m.find_group(6).is_some() && get(&m, 2) == 1.0);
+    // The analysis drops the sub-group the user didn't touch: dropped.
+    let mut dropped = result.clone();
+    dropped.children.retain(|n| !matches!(n, Node::Group(g) if g.uid == 4));
+    let m = merge_group(&base, &live, &dropped).unwrap();
+    assert!(m.find_group(4).is_none() && get(&m, 2) == 1.0);
+    // …but if the user changed something in it, that's a conflict.
+    let mut touched = live.clone();
+    set(&mut touched, 5, 7.0);
+    assert!(merge_group(&base, &touched, &dropped).is_none());
+}
+
+#[test]
+fn protocol_round_trips() {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", serde_json::json!({})).unwrap();
+    let comp = s.active_comp_id().unwrap();
+    s.execute("renderQueue.add", serde_json::json!({})).unwrap();
+    let item = s.project.render_queue[0].clone();
+    let reqs = [
+        WorkerJob::Render { items: vec![vec![(item.clone(), "/out.gif".into())]] },
+        WorkerJob::Warp { comp, layer: LayerId(3), effect: 9 },
+        WorkerJob::WarpPlan { comp, layer: LayerId(3), effect: 9, time: Tick::from_seconds_f64(0.5) },
+        WorkerJob::RotoFreeze { comp, layer: LayerId(3), effect: 9 },
+        WorkerJob::Camera { comp, layer: LayerId(3), effect: 9 },
+        WorkerJob::RotoPropagate { comp, layer: LayerId(3), effect: 9, direction: crate::roto::Direction::Forward },
+        WorkerJob::Track {
+            comp,
+            layer: LayerId(1),
+            tracker: 4,
+            direction: crate::tracking::Direction::Backward,
+            settings: TrackerSettings::default(),
+            points: vec![PointValues {
+                uid: 5,
+                spec: effectcraft_track::PointSpec { center: [1.0, 2.0], feature_size: [3.0, 4.0], search_offset: [0.5, 0.0], search_size: [9.0, 9.0] },
+                attach_offset: [0.25, -1.0],
+            }],
+            times: vec![Tick::ZERO, Tick::from_seconds_f64(0.5)],
+        },
+        WorkerJob::MaskTrack {
+            comp,
+            layer: LayerId(2),
+            mask: 7,
+            direction: crate::tracking::Direction::Forward,
+            path: ShapePath::ellipse([10.0, 20.0], 5.0, 6.0),
+            method: MaskMethod::Perspective,
+            times: vec![Tick::from_seconds_f64(1.0)],
+        },
+        WorkerJob::ContentFill {
+            plan: Box::new(crate::commands::content_fill::FillPlan {
+                comp,
+                layer: LayerId(2),
+                name: "Clip".into(),
+                width: 4,
+                height: 3,
+                times: vec![Tick::ZERO],
+                method: "object".into(),
+                lighting: 0.5,
+                expand: 1,
+                reference: Some((LayerId(1), Tick::ZERO)),
+                dir: "/Fill/Clip_Fill_1".into(),
+            }),
+        },
+    ];
+    for job in reqs {
+        let kind = job.kind();
+        let req = WorkerRequest { id: 42, project: s.project.to_json(), files: footage_files(&s.project), job };
+        let t = round(&req);
+        assert!(t.contains("\"kind\":"), "{kind:?}");
+        let back: WorkerRequest = serde_json::from_str(&t).unwrap();
+        assert_eq!(back.job.kind(), kind);
+        assert_eq!(Project::from_json(&back.project).unwrap(), *s.project);
+    }
+    let g = s.active_comp().unwrap().layers[0].props.clone();
+    for r in [
+        WorkerReply::Render { state: JobState { current: Some(3), done: 4, total: 10, items_total: 1, ..Default::default() } },
+        WorkerReply::Item { update: ItemUpdate::Started { id: 3, unix: 1_700_000_000 } },
+        WorkerReply::Item { update: ItemUpdate::Finished { id: 3, status: RenderStatus::Failed("x".into()), seconds: 1.5, output: Some("/a.gif".into()) } },
+        WorkerReply::Progress { done: 1, total: 2 },
+        WorkerReply::WarpPlan {
+            key: [1, u64::MAX],
+            summary: Box::new(effectcraft_effects::warp_stab::PlanSummary {
+                warps: vec![[[1.0, 0.0, 2.5], [0.0, 1.0, -1.0], [0.0, 0.0, 1.0]]],
+                auto_scale: 1.08,
+                crop: Some([1.0, 2.0, 300.0, 200.0]),
+                valid_fraction: 0.9,
+            }),
+        },
+        WorkerReply::Group { comp, layer: LayerId(1), group: Box::new(g), message: "ok".into() },
+        WorkerReply::Segs { segs: vec![SegData::new(5, &effectcraft_track::roto::FrameSeg::empty(4, 3))] },
+        WorkerReply::Fill {
+            plan: Box::new(crate::commands::content_fill::FillPlan {
+                comp,
+                layer: LayerId(2),
+                name: "Clip".into(),
+                width: 4,
+                height: 3,
+                times: vec![Tick::ZERO],
+                method: "object".into(),
+                lighting: 0.5,
+                expand: 1,
+                reference: Some((LayerId(1), Tick::ZERO)),
+                dir: "/Fill/Clip_Fill_1".into(),
+            }),
+            files: vec!["/Fill/Clip_Fill_1/fill_00000.png".into()],
+        },
+        WorkerReply::Failed { error: "boom".into() },
+        WorkerReply::Done,
+    ] {
+        let t = round(&r);
+        assert!(t.starts_with("{\"type\":"), "{t}");
+    }
+}
+
+/// An [`Offload`] that runs the job right away in a second session, through JSON (what a
+/// Web Worker does, minus the threads).
+struct Inline;
+impl Offload for Inline {
+    fn start(&self, req: WorkerRequest, inbox: Arc<Inbox>) -> Result<(), String> {
+        let req: WorkerRequest = serde_json::from_str(&serde_json::to_string(&req).unwrap()).unwrap();
+        let mut w = Session { exporter: Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() })), ..Default::default() };
+        let post: Post = Rc::new(move |r| inbox.push(serde_json::from_str(&serde_json::to_string(&r).unwrap()).unwrap()));
+        run_request(&mut w, req, &post);
+        Ok(())
+    }
+    fn cancel(&self, _: u64) {}
+}
+
+#[test]
+fn render_runs_through_the_offload() {
+    let mut s =
+        Session { exporter: Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() })), offload: Some(Arc::new(Inline)), ..Default::default() };
+    s.execute("file.openDemoProject", serde_json::json!({})).unwrap();
+    s.execute("renderQueue.add", serde_json::json!({"output": "/x.gif"})).unwrap();
+    let ids = s.start_render(false).unwrap();
+    // (the inline offload has replied already; replies are applied when polled)
+    s.poll_render();
+    assert!(s.render_job.is_none());
+    let it = s.project.render_queue.iter().find(|i| i.id == ids[0]).unwrap();
+    assert_eq!(it.status, RenderStatus::Done, "{:?}", it.status);
+    assert!(it.last_output.as_deref().is_some_and(|o| o.ends_with("x.gif")));
+    // `wait` renders inline.
+    s.execute("renderQueue.add", serde_json::json!({"output": "/y.gif"})).unwrap();
+    s.start_render(true).unwrap();
+    assert!(s.render_job.is_none() || s.render_job.as_ref().unwrap().remote.is_none());
+}
+
+/// Runs jobs in a session sharing `footage` (the synthetic clip of the tracking tests).
+struct InlineWith(Arc<dyn effectcraft_render::FootageSource>);
+impl Offload for InlineWith {
+    fn start(&self, req: WorkerRequest, inbox: Arc<Inbox>) -> Result<(), String> {
+        let req: WorkerRequest = serde_json::from_str(&serde_json::to_string(&req).unwrap()).unwrap();
+        let mut w = Session { footage: self.0.clone(), ..Default::default() };
+        let post: Post = Rc::new(move |r| inbox.push(serde_json::from_str(&serde_json::to_string(&r).unwrap()).unwrap()));
+        run_request(&mut w, req, &post);
+        Ok(())
+    }
+    fn cancel(&self, _: u64) {}
+}
+
+/// Never replies (a job still running); records cancellations.
+#[derive(Default)]
+struct Hanging(Mutex<Vec<u64>>);
+impl Offload for Hanging {
+    fn start(&self, _: WorkerRequest, _: Arc<Inbox>) -> Result<(), String> {
+        Ok(())
+    }
+    fn cancel(&self, id: u64) {
+        self.0.lock().unwrap().push(id);
+    }
+}
+
+fn pose(f: u32) -> ([f64; 2], f64, f64) {
+    ([150.0 + 2.0 * f as f64, 110.0 + 1.0 * f as f64], 0.0, 1.0)
+}
+
+#[test]
+fn track_analysis_runs_through_the_offload_as_one_undo_step() {
+    let (mut s, clip, _) = crate::tests::track::setup(crate::tests::track::patch_frames(pose));
+    s.offload = Some(Arc::new(InlineWith(s.footage.clone())));
+    s.execute("track.motion", serde_json::json!({})).unwrap();
+    s.execute("track.setPoint", serde_json::json!({"point": 1, "center": pose(0).0, "featureSize": [36, 36], "searchSize": [80, 80]})).unwrap();
+    let undo = s.history.undo.len();
+    s.execute("track.analyze", serde_json::json!({"direction": "forward"})).unwrap();
+    assert!(s.is_tracking() && s.track_job.is_none(), "offloaded, not on a thread");
+    assert!(s.track_progress().is_some());
+    assert!(s.poll_offload());
+    assert!(!s.is_tracking() && s.offloaded.is_empty());
+    let l = s.active_comp().unwrap().layer(clip).unwrap();
+    let tp = l.trackers().next().unwrap().0.track_points().next().unwrap().clone();
+    let fc = tp.get("featureCenter").unwrap();
+    assert_eq!(fc.keys.len(), 25);
+    let v = fc.value_at(crate::tests::track::frame_time(12)).as_vec2();
+    assert!((v[0] - pose(12).0[0]).abs() < 0.3 && (v[1] - pose(12).0[1]).abs() < 0.3, "{v:?}");
+    assert_eq!(s.history.undo.len(), undo + 1);
+    assert_eq!(s.history.undo.last().unwrap().0, "Analyze Track");
+    assert!(s.events.iter().any(|e| matches!(e, Event::Toast { message, error: false } if message.starts_with("Tracked"))));
+    assert!(s.undo());
+    let l = s.active_comp().unwrap().layer(clip).unwrap();
+    assert!(l.trackers().next().unwrap().0.track_points().next().unwrap().get("featureCenter").unwrap().keys.is_empty());
+    // `wait` runs inline.
+    s.redo();
+    s.execute("track.analyze", serde_json::json!({"direction": "forward", "wait": true})).ok();
+    assert!(s.offloaded.is_empty());
+}
+
+#[test]
+fn cancelling_offloaded_jobs() {
+    let (mut s, _, _) = crate::tests::track::setup(crate::tests::track::patch_frames(pose));
+    let off = Arc::new(Hanging::default());
+    s.offload = Some(off.clone());
+    s.exporter = Some(Arc::new(crate::rq_tests::MockExporter { log: Default::default() }));
+    // Analysis: stopping drops the job, nothing is written.
+    s.execute("track.motion", serde_json::json!({})).unwrap();
+    let rev = s.revision;
+    s.execute("track.analyze", serde_json::json!({})).unwrap();
+    assert!(s.is_tracking());
+    assert!(s.execute("track.analyze", serde_json::json!({})).is_err(), "one at a time");
+    assert!(s.stop_track());
+    s.poll_offload();
+    assert!(!s.is_tracking());
+    assert_eq!(off.0.lock().unwrap().len(), 1);
+    assert!(s.events.iter().any(|e| matches!(e, Event::Toast { message, .. } if message.contains("stopped"))));
+    assert!(s.revision > rev);
+    // Render: the queued items become User Stopped.
+    s.execute("renderQueue.add", serde_json::json!({"output": "/a.gif"})).unwrap();
+    let ids = s.start_render(false).unwrap();
+    assert!(s.is_rendering());
+    assert!(s.stop_render());
+    s.poll_render();
+    assert!(!s.is_rendering());
+    assert_eq!(off.0.lock().unwrap().len(), 2);
+    let it = s.project.render_queue.iter().find(|i| i.id == ids[0]).unwrap();
+    assert_eq!(it.status, RenderStatus::UserStopped);
+}
+
+#[test]
+fn progress_hook_is_scoped() {
+    report(1, 2); // no hook: nothing happens
+    let seen = Rc::new(RefCell::new(vec![]));
+    let s2 = seen.clone();
+    effectcraft_render::passes::block_on(with_hook(Box::new(move |d, t| s2.borrow_mut().push((d, t))), async {
+        report(1, 3);
+        report(2, 3);
+    }));
+    report(3, 3);
+    assert_eq!(*seen.borrow(), vec![(1, 3), (2, 3)]);
+}
diff --git a/crates/engine/src/remote.rs b/crates/engine/src/background/remote.rs
similarity index 54%
rename from crates/engine/src/remote.rs
rename to crates/engine/src/background/remote.rs
index 207367b07..6539ac767 100644
--- a/crates/engine/src/remote.rs
+++ b/crates/engine/src/background/remote.rs
@@ -9,7 +9,7 @@
 //!   added, changed or removed; arrays element-wise when their length is unchanged, else
 //!   replaced). Lossless (unlike JSON Merge Patch, `null` values survive).
 //! - [`Mirror`] (page side): what the worker holds; turns the next project revision into a
-//!   [`FrameMsg::Sync`] (a full project the first time, a diff afterwards).
+//!   [`FrameMsg::Project`] the first time and [`FrameMsg::Patch`] for subsequent diffs.
 //! - [`FrameServer`] (worker side): applies syncs, relayed Roto Brush segmentations and render
 //!   requests, and renders frames as premultiplied RGBA8 ([`rgba8_premultiplied`]).
 //!
@@ -263,6 +263,8 @@ pub struct FrameServer {
     /// The disk cache's layer buffers (see the module docs) and the project's salt.
     layer_store: Option<Arc<PrefetchStore>>,
     salt: u64,
+    /// Size and content hash for footage paths with no native metadata (the browser file table).
+    virtual_id: Option<Arc<dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync>>,
 }
 
 /// A frame whose readbacks are in flight.
@@ -294,9 +296,16 @@ impl FrameServer {
             pending: None,
             layer_store: None,
             salt: 0,
+            virtual_id: None,
         }
     }
 
+    /// Identity of virtual footage files, used when native metadata cannot describe the path.
+    /// Called from `FrameServer::load`, not from the UI thread's cache lookup.
+    pub fn set_virtual_id(&mut self, id: Option<Arc<dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync>>) {
+        self.virtual_id = id;
+    }
+
     /// The store behind the layer cache when a request asks for `layers` (the browser: the
     /// disk cache's layer buffers, fetched before the request).
     pub fn set_layer_store(&mut self, store: Option<Arc<PrefetchStore>>) {
@@ -338,7 +347,7 @@ impl FrameServer {
 
     fn load(&mut self, revision: u64) -> Result<(), String> {
         let p = Project::from_json(&self.doc.to_string()).map_err(|e| e.to_string())?;
-        self.salt = effectcraft_render::disk_cache::footage_salt(&p);
+        self.salt = effectcraft_render::disk_cache::footage_salt_with(&p, self.virtual_id.as_deref());
         self.cache.set_store_salt(self.salt);
         self.project = Some(Arc::new(p));
         self.revision = Some(revision);
@@ -463,331 +472,4 @@ impl FrameServer {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Session;
-    use serde_json::json;
-
-    fn round<T: Serialize + for<'de> Deserialize<'de>>(v: &T) -> T {
-        serde_json::from_str(&serde_json::to_string(v).unwrap()).unwrap()
-    }
-
-    #[test]
-    fn diff_and_patch_round_trip() {
-        let a = json!({"a": 1, "b": [1, 2, {"c": null}], "d": {"e": "x", "f": [1]}, "g": null});
-        let b = json!({"a": 2, "b": [1, 3, {"c": 4}], "d": {"f": [1, 2]}, "g": null, "h": {"i": null}});
-        let ops = diff(&a, &b);
-        assert!(!ops.is_empty());
-        let mut x = a.clone();
-        patch(&mut x, &round(&ops)).unwrap();
-        assert_eq!(x, b);
-        // Removal and the reverse direction.
-        let mut y = b.clone();
-        patch(&mut y, &diff(&b, &a)).unwrap();
-        assert_eq!(y, a);
-        assert!(diff(&a, &a).is_empty());
-        // A whole-document change.
-        let mut z = json!(1);
-        patch(&mut z, &diff(&json!(1), &json!([1]))).unwrap();
-        assert_eq!(z, json!([1]));
-        // A patch for another document fails cleanly.
-        assert!(patch(&mut json!(3), &diff(&a, &b)).is_err());
-    }
-
-    fn server(s: &Session) -> FrameServer {
-        FrameServer::new(s.footage.clone(), s.expr.clone())
-    }
-
-    /// Pixels the page itself would render.
-    fn local(s: &Session, comp: ItemId, t: Tick, opts: RenderOpts) -> Vec<u8> {
-        let mut r = Renderer::new(&s.project, s.footage.as_ref(), opts);
-        r.expr = s.expr.as_deref();
-        rgba8_premultiplied(&r.comp_frame(comp, t))
-    }
-
-    /// Layer buffers through the disk store: a worker's slow buffers queue up as entries; the
-    /// page plans what another worker fetches before its frame (recent misses on disk); that
-    /// worker's mid-render lookups find them and the pixels match.
-    #[test]
-    fn layer_buffers_go_through_the_disk_store() {
-        use effectcraft_render::disk_cache::{DiskIndex, Kind, LayerPrefetch};
-        let mut s = Session::default();
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        let comp = s.active_comp_id().unwrap();
-        let opts = RenderOpts { scale: 0.25, ..Default::default() };
-        let t = Tick::from_seconds_f64(1.0);
-        let req = |id: u64, layers: bool, prefetch: Vec<String>| {
-            round(&FrameMsg::Render { id, revision: s.revision, comp, time: t, opts: Box::new(opts), disk: None, layers, prefetch })
-        };
-        let worker = || {
-            let mut w = server(&s);
-            let store = Arc::new(PrefetchStore::new(64 << 20).with_min_ms(0));
-            w.set_layer_store(Some(store.clone()));
-            let mut m = Mirror::default();
-            assert!(w.handle(round(&m.sync(s.revision, &s.project).unwrap())).is_empty());
-            (w, store)
-        };
-        let unhex = |v: &[String]| v.iter().map(|k| u128::from_str_radix(k, 16).unwrap()).collect::<Vec<u128>>();
-        // Worker A: everything misses; its buffers queue up for the disk.
-        let (mut a, store_a) = worker();
-        let out = a.handle(req(1, true, vec![]));
-        let (FrameReply::Frame { layer_misses, layer_hits, .. }, Some(px_a)) = &out[0] else { panic!("{:?}", out[0].0) };
-        assert!(!layer_misses.is_empty() && layer_hits.is_empty());
-        let writes = store_a.take_writes();
-        assert!(!writes.is_empty());
-        assert!(writes.iter().all(|(k, _)| (*k >> 64) as u64 == a.salt()), "keys are salted per project");
-        let mut index = DiskIndex::default();
-        let mut disk = std::collections::HashMap::new();
-        for (k, e) in writes {
-            index.insert(Kind::Layer, k, e.len() as u64);
-            disk.insert(k, e);
-        }
-        index.insert(Kind::Frame, 1, 10);
-        // The page: recent misses that are on disk, most recent first.
-        let mut plan = LayerPrefetch::default();
-        plan.note_misses(unhex(layer_misses));
-        let keys = plan.plan(&index, 64);
-        assert!(!keys.is_empty() && keys.len() <= index.len());
-        // Worker B fetches them before its first frame: its lookups hit.
-        let (mut b, store_b) = worker();
-        for k in &keys {
-            assert!(store_b.provide(*k, &disk[k]));
-        }
-        assert!(!store_b.provide(1, b"damaged"));
-        let out = b.handle(req(1, true, keys.iter().map(|k| format!("{k:032x}")).collect()));
-        let (FrameReply::Frame { layer_misses: mb, layer_hits: hb, .. }, Some(px_b)) = &out[0] else { panic!("{:?}", out[0].0) };
-        assert_eq!(unhex(hb).len(), keys.len(), "every fetched buffer was used");
-        assert!(mb.len() < layer_misses.len());
-        assert_eq!(px_a, px_b);
-        assert_eq!(*px_b, local(&s, comp, t, opts));
-        // Nothing new to write: what B rendered itself was rendered by A too.
-        assert!(store_b.take_writes().iter().all(|(k, _)| disk.contains_key(k)));
-        // Without `layers` the store is not consulted.
-        let (mut c, store_c) = worker();
-        c.handle(req(1, false, vec![]));
-        assert!(store_c.take_misses().is_empty() && store_c.take_writes().is_empty());
-        // Purge empties the store.
-        b.handle(round(&FrameMsg::Purge));
-        assert!(!store_b.has(keys[0]));
-        // LRU across frames and layers in the shared index: a touched layer outlives the frame.
-        index.touch(Kind::Layer, keys[0]);
-        let order = index.lru_order();
-        assert_eq!(order.last(), Some(&(Kind::Layer, keys[0])));
-        assert!(order.iter().position(|e| *e == (Kind::Frame, 1)).unwrap() < order.len() - 1);
-    }
-
-    #[test]
-    fn replica_follows_edits_through_diffs_and_renders_the_same_frames() {
-        let mut s = Session::default();
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        let comp = s.active_comp_id().unwrap();
-        let opts = RenderOpts { scale: 0.25, guides: true, ..Default::default() };
-        let mut m = Mirror::default();
-        let mut w = server(&s);
-        let send = |m: FrameMsg, w: &mut FrameServer| w.handle(round(&m));
-        // First sync: the whole project.
-        let first = m.sync(s.revision, &s.project).unwrap();
-        assert!(matches!(first, FrameMsg::Project { .. }));
-        assert!(send(first, &mut w).is_empty());
-        assert!(m.sync(s.revision, &s.project).is_none(), "nothing new");
-        let t = Tick::from_seconds_f64(1.0);
-        let render = |w: &mut FrameServer, rev: u64, id: u64| {
-            w.handle(round(&FrameMsg::Render { id, revision: rev, comp, time: t, opts: Box::new(opts), disk: None, layers: false, prefetch: vec![] }))
-        };
-        let out = render(&mut w, s.revision, 1);
-        let (FrameReply::Frame { id, width, height, .. }, Some(px)) = &out[0] else { panic!("{:?}", out[0].0) };
-        assert_eq!((*id, *width as usize * *height as usize * 4), (1, px.len()));
-        assert_eq!(*px, local(&s, comp, t, opts));
-        // An edit travels as a small diff; the replica renders the edited frame.
-        s.execute("layer.newSolid", json!({"color": "#ff8800", "name": "Orange"})).unwrap();
-        let msg = m.sync(s.revision, &s.project).unwrap();
-        let FrameMsg::Patch { ops, .. } = &msg else { panic!("expected a patch") };
-        assert!(!ops.is_empty() && serde_json::to_string(ops).unwrap().len() < s.project.to_json().len() / 2);
-        assert!(send(msg, &mut w).is_empty());
-        assert_eq!(**w.project().unwrap(), *s.project);
-        let out = render(&mut w, s.revision, 2);
-        assert_eq!(out[0].1.as_deref(), Some(&local(&s, comp, t, opts)[..]));
-        // A request for another revision is refused as stale.
-        let out = render(&mut w, s.revision + 7, 3);
-        assert!(matches!(out[0].0, FrameReply::Failed { id: 3, stale: true, .. }));
-        // A patch from the wrong base asks for a resync; the mirror then sends the project.
-        let bad = FrameMsg::Patch { from: 999, revision: 1000, ops: vec![] };
-        assert!(matches!(send(bad, &mut w)[0].0, FrameReply::Resync { .. }));
-        m.reset();
-        assert!(matches!(m.sync(s.revision, &s.project), Some(FrameMsg::Project { .. })));
-    }
-
-    #[test]
-    fn frame_messages_round_trip() {
-        for m in [
-            FrameMsg::Purge,
-            FrameMsg::Segs { segs: vec![SegData { key: 7, data: "AAAA".into() }] },
-            FrameMsg::Render {
-                id: 3,
-                revision: 4,
-                comp: ItemId(2),
-                time: Tick::from_seconds_f64(0.5),
-                opts: Box::new(RenderOpts { scale: 0.5, draft: true, roi: Some([1.0, 2.0, 3.0, 4.0]), ..Default::default() }),
-                disk: Some(format!("{:032x}", 0xabcdu128)),
-                layers: true,
-                prefetch: vec![format!("{:032x}", 7u128)],
-            },
-        ] {
-            let a = serde_json::to_string(&m).unwrap();
-            assert_eq!(serde_json::to_string(&round(&m)).unwrap(), a);
-            assert!(a.starts_with("{\"type\":"), "{a}");
-        }
-        for r in [
-            FrameReply::Frame { id: 1, width: 2, height: 3, ms: 4.5, passes: 2, gpu: true, layer_misses: vec!["0a".into()], layer_hits: vec![] },
-            FrameReply::Stored { key: "00ff".into(), bytes: 9, layer: false },
-            FrameReply::Stored { key: "00fe".into(), bytes: 8, layer: true },
-            FrameReply::Info { gpu: Some("Adapter (BrowserWebGpu)".into()), error: None },
-            FrameReply::Failed { id: 1, error: "x".into(), stale: true },
-            FrameReply::Resync { error: "y".into() },
-        ] {
-            assert_eq!(round(&r), r);
-        }
-    }
-
-    /// An accelerator with deferred readbacks: a GPU effect chain is "read back" one
-    /// [`Deferred::settle`] after it was first asked for (computed with the CPU effects, so the
-    /// finished frame equals the CPU render); until then it misses and returns its input.
-    #[derive(Default)]
-    struct Deferred {
-        ready: std::sync::Mutex<std::collections::HashSet<u64>>,
-        asked: std::sync::Mutex<std::collections::HashSet<u64>>,
-        gate: Arc<std::sync::atomic::AtomicBool>,
-        chains: std::sync::atomic::AtomicUsize,
-        auto: effectcraft_render::AutoPick,
-    }
-
-    impl Deferred {
-        fn settle(&self) {
-            let asked: Vec<u64> = self.asked.lock().unwrap().drain().collect();
-            self.ready.lock().unwrap().extend(asked);
-        }
-    }
-
-    impl Accelerator for Deferred {
-        fn name(&self) -> String {
-            "deferred".into()
-        }
-        fn comp_frame(&self, _: &Renderer, _: ItemId, _: Tick) -> Option<Image> {
-            None
-        }
-        fn supports_effect(&self, id: &str) -> bool {
-            effectcraft_effects::GPU_EFFECTS.contains(&id)
-        }
-        fn effects(&self, chain: &[effectcraft_render::FxStep], buf: &effectcraft_effects::Buf, levels: Option<f32>) -> Option<effectcraft_effects::Buf> {
-            use std::hash::{Hash, Hasher};
-            let mut h = std::collections::hash_map::DefaultHasher::new();
-            for s in chain {
-                s.spec.id.hash(&mut h);
-                s.ctx.time.to_bits().hash(&mut h);
-            }
-            (buf.img.width, buf.img.height).hash(&mut h);
-            for p in &buf.img.data {
-                for c in p {
-                    c.to_bits().hash(&mut h);
-                }
-            }
-            let key = h.finish();
-            if !self.ready.lock().unwrap().contains(&key) {
-                self.asked.lock().unwrap().insert(key);
-                self.gate.store(true, std::sync::atomic::Ordering::Relaxed);
-                return Some(buf.clone());
-            }
-            self.chains.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-            let mut b = buf.clone();
-            for s in chain {
-                b = effectcraft_effects::apply(s.spec, &s.ctx, b);
-                if let Some(l) = levels {
-                    effectcraft_render::color::quantize(&mut b.img, l);
-                }
-            }
-            Some(b)
-        }
-        fn auto_pick(&self) -> Option<&effectcraft_render::AutoPick> {
-            Some(&self.auto)
-        }
-        fn frame_begin(&self) {
-            self.ready.lock().unwrap().clear();
-        }
-        fn pass_begin(&self) {
-            self.gate.store(false, std::sync::atomic::Ordering::Relaxed);
-        }
-        fn pass_missed(&self) -> bool {
-            self.gate.load(std::sync::atomic::Ordering::Relaxed)
-        }
-        fn miss_gate(&self) -> Option<Arc<std::sync::atomic::AtomicBool>> {
-            Some(self.gate.clone())
-        }
-    }
-
-    #[test]
-    fn deferred_readbacks_render_in_passes() {
-        let mut s = Session::default();
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        let comp = s.active_comp_id().unwrap();
-        s.execute("layer.newSolid", json!({"color": "#3388ff", "name": "Blue", "width": 200, "height": 120})).unwrap();
-        s.execute("effect.apply", json!({"effect": "ec.blur.gaussian"})).unwrap();
-        s.execute("effect.apply", json!({"effect": "ec.stylize.glow"})).unwrap();
-        s.execute("layer.newSolid", json!({"color": "#ffcc00", "name": "Yellow", "width": 80, "height": 80})).unwrap();
-        s.execute("effect.apply", json!({"effect": "ec.color.levels"})).unwrap();
-        let opts = RenderOpts { scale: 0.25, backend: Backend::Gpu, ..Default::default() };
-        let t = Tick::from_seconds_f64(1.0);
-        let mut w = server(&s);
-        let acc = Arc::new(Deferred::default());
-        w.set_accel(Some(acc.clone()));
-        let mut m = Mirror::default();
-        w.handle(round(&m.sync(s.revision, &s.project).unwrap()));
-        let req = |id| round(&FrameMsg::Render { id, revision: s.revision, comp, time: t, opts: Box::new(opts), disk: None, layers: false, prefetch: vec![] });
-        assert!(w.handle(req(1)).is_empty() && w.waiting(), "the first pass misses");
-        let mut out = vec![];
-        for _ in 0..10 {
-            acc.settle();
-            out = w.resume();
-            if !w.waiting() {
-                break;
-            }
-        }
-        let (FrameReply::Frame { id: 1, passes, gpu: true, .. }, Some(px)) = &out[0] else { panic!("{:?}", out.first().map(|o| &o.0)) };
-        assert!(*passes >= 2, "{passes}");
-        assert!(acc.chains.load(std::sync::atomic::Ordering::Relaxed) >= 2);
-        // The same pixels as the CPU: no placeholder survived, in the frame or the layer cache.
-        assert_eq!(*px, local(&s, comp, t, RenderOpts { backend: Backend::Cpu, ..opts }));
-        let out = w.handle(req(2));
-        let out = if out.is_empty() {
-            acc.settle();
-            w.resume()
-        } else {
-            out
-        };
-        assert_eq!(out[0].1.as_deref(), Some(&px[..]));
-        // CPU requests never touch the accelerator; Auto times whole frames.
-        let cpu = RenderOpts { backend: Backend::Cpu, ..opts };
-        let out =
-            w.handle(round(&FrameMsg::Render { id: 3, revision: s.revision, comp, time: t, opts: Box::new(cpu), disk: None, layers: false, prefetch: vec![] }));
-        assert!(matches!(out[0].0, FrameReply::Frame { id: 3, passes: 1, gpu: false, .. }));
-        for id in 4..12 {
-            let auto = RenderOpts { backend: Backend::Auto, ..opts };
-            let mut out = w.handle(round(&FrameMsg::Render {
-                id,
-                revision: s.revision,
-                comp,
-                time: t,
-                opts: Box::new(auto),
-                disk: None,
-                layers: false,
-                prefetch: vec![],
-            }));
-            while w.waiting() {
-                acc.settle();
-                out = w.resume();
-            }
-            assert_eq!(out[0].1.as_deref(), Some(&px[..]), "frame {id}");
-        }
-        let st = acc.auto.stats(effectcraft_render::AutoKey::new(comp, opts.scale, false)).unwrap();
-        assert!(st.cpu_frames > 0 && st.gpu_frames > 0, "{st:?}");
-    }
-}
+mod tests;
diff --git a/crates/engine/src/background/remote/tests.rs b/crates/engine/src/background/remote/tests.rs
new file mode 100644
index 000000000..85f7a1807
--- /dev/null
+++ b/crates/engine/src/background/remote/tests.rs
@@ -0,0 +1,318 @@
+use super::*;
+use crate::Session;
+use serde_json::json;
+
+fn round<T: Serialize + for<'de> Deserialize<'de>>(v: &T) -> T {
+    serde_json::from_str(&serde_json::to_string(v).unwrap()).unwrap()
+}
+
+#[test]
+fn diff_and_patch_round_trip() {
+    let a = json!({"a": 1, "b": [1, 2, {"c": null}], "d": {"e": "x", "f": [1]}, "g": null});
+    let b = json!({"a": 2, "b": [1, 3, {"c": 4}], "d": {"f": [1, 2]}, "g": null, "h": {"i": null}});
+    let ops = diff(&a, &b);
+    assert!(!ops.is_empty());
+    let mut x = a.clone();
+    patch(&mut x, &round(&ops)).unwrap();
+    assert_eq!(x, b);
+    // Removal and the reverse direction.
+    let mut y = b.clone();
+    patch(&mut y, &diff(&b, &a)).unwrap();
+    assert_eq!(y, a);
+    assert!(diff(&a, &a).is_empty());
+    // A whole-document change.
+    let mut z = json!(1);
+    patch(&mut z, &diff(&json!(1), &json!([1]))).unwrap();
+    assert_eq!(z, json!([1]));
+    // A patch for another document fails cleanly.
+    assert!(patch(&mut json!(3), &diff(&a, &b)).is_err());
+}
+
+fn server(s: &Session) -> FrameServer {
+    FrameServer::new(s.footage.clone(), s.expr.clone())
+}
+
+/// Pixels the page itself would render.
+fn local(s: &Session, comp: ItemId, t: Tick, opts: RenderOpts) -> Vec<u8> {
+    let mut r = Renderer::new(&s.project, s.footage.as_ref(), opts);
+    r.expr = s.expr.as_deref();
+    rgba8_premultiplied(&r.comp_frame(comp, t))
+}
+
+/// Layer buffers through the disk store: a worker's slow buffers queue up as entries; the
+/// page plans what another worker fetches before its frame (recent misses on disk); that
+/// worker's mid-render lookups find them and the pixels match.
+#[test]
+fn layer_buffers_go_through_the_disk_store() {
+    use effectcraft_render::disk_cache::{DiskIndex, Kind, LayerPrefetch};
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let comp = s.active_comp_id().unwrap();
+    let opts = RenderOpts { scale: 0.25, ..Default::default() };
+    let t = Tick::from_seconds_f64(1.0);
+    let req = |id: u64, layers: bool, prefetch: Vec<String>| {
+        round(&FrameMsg::Render { id, revision: s.revision, comp, time: t, opts: Box::new(opts), disk: None, layers, prefetch })
+    };
+    let worker = || {
+        let mut w = server(&s);
+        let store = Arc::new(PrefetchStore::new(64 << 20).with_min_ms(0));
+        w.set_layer_store(Some(store.clone()));
+        let mut m = Mirror::default();
+        assert!(w.handle(round(&m.sync(s.revision, &s.project).unwrap())).is_empty());
+        (w, store)
+    };
+    let unhex = |v: &[String]| v.iter().map(|k| u128::from_str_radix(k, 16).unwrap()).collect::<Vec<u128>>();
+    // Worker A: everything misses; its buffers queue up for the disk.
+    let (mut a, store_a) = worker();
+    let out = a.handle(req(1, true, vec![]));
+    let (FrameReply::Frame { layer_misses, layer_hits, .. }, Some(px_a)) = &out[0] else { panic!("{:?}", out[0].0) };
+    assert!(!layer_misses.is_empty() && layer_hits.is_empty());
+    let writes = store_a.take_writes();
+    assert!(!writes.is_empty());
+    assert!(writes.iter().all(|(k, _)| (*k >> 64) as u64 == a.salt()), "keys are salted per project");
+    let mut index = DiskIndex::default();
+    let mut disk = std::collections::HashMap::new();
+    for (k, e) in writes {
+        index.insert(Kind::Layer, k, e.len() as u64);
+        disk.insert(k, e);
+    }
+    index.insert(Kind::Frame, 1, 10);
+    // The page: recent misses that are on disk, most recent first.
+    let mut plan = LayerPrefetch::default();
+    plan.note_misses(unhex(layer_misses));
+    let keys = plan.plan(&index, 64);
+    assert!(!keys.is_empty() && keys.len() <= index.len());
+    // Worker B fetches them before its first frame: its lookups hit.
+    let (mut b, store_b) = worker();
+    for k in &keys {
+        assert!(store_b.provide(*k, &disk[k]));
+    }
+    assert!(!store_b.provide(1, b"damaged"));
+    let out = b.handle(req(1, true, keys.iter().map(|k| format!("{k:032x}")).collect()));
+    let (FrameReply::Frame { layer_misses: mb, layer_hits: hb, .. }, Some(px_b)) = &out[0] else { panic!("{:?}", out[0].0) };
+    assert_eq!(unhex(hb).len(), keys.len(), "every fetched buffer was used");
+    assert!(mb.len() < layer_misses.len());
+    assert_eq!(px_a, px_b);
+    assert_eq!(*px_b, local(&s, comp, t, opts));
+    // Nothing new to write: what B rendered itself was rendered by A too.
+    assert!(store_b.take_writes().iter().all(|(k, _)| disk.contains_key(k)));
+    // Without `layers` the store is not consulted.
+    let (mut c, store_c) = worker();
+    c.handle(req(1, false, vec![]));
+    assert!(store_c.take_misses().is_empty() && store_c.take_writes().is_empty());
+    // Purge empties the store.
+    b.handle(round(&FrameMsg::Purge));
+    assert!(!store_b.has(keys[0]));
+    // LRU across frames and layers in the shared index: a touched layer outlives the frame.
+    index.touch(Kind::Layer, keys[0]);
+    let order = index.lru_order();
+    assert_eq!(order.last(), Some(&(Kind::Layer, keys[0])));
+    assert!(order.iter().position(|e| *e == (Kind::Frame, 1)).unwrap() < order.len() - 1);
+}
+
+#[test]
+fn replica_follows_edits_through_diffs_and_renders_the_same_frames() {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let comp = s.active_comp_id().unwrap();
+    let opts = RenderOpts { scale: 0.25, guides: true, ..Default::default() };
+    let mut m = Mirror::default();
+    let mut w = server(&s);
+    let send = |m: FrameMsg, w: &mut FrameServer| w.handle(round(&m));
+    // First sync: the whole project.
+    let first = m.sync(s.revision, &s.project).unwrap();
+    assert!(matches!(first, FrameMsg::Project { .. }));
+    assert!(send(first, &mut w).is_empty());
+    assert!(m.sync(s.revision, &s.project).is_none(), "nothing new");
+    let t = Tick::from_seconds_f64(1.0);
+    let render = |w: &mut FrameServer, rev: u64, id: u64| {
+        w.handle(round(&FrameMsg::Render { id, revision: rev, comp, time: t, opts: Box::new(opts), disk: None, layers: false, prefetch: vec![] }))
+    };
+    let out = render(&mut w, s.revision, 1);
+    let (FrameReply::Frame { id, width, height, .. }, Some(px)) = &out[0] else { panic!("{:?}", out[0].0) };
+    assert_eq!((*id, *width as usize * *height as usize * 4), (1, px.len()));
+    assert_eq!(*px, local(&s, comp, t, opts));
+    // An edit travels as a small diff; the replica renders the edited frame.
+    s.execute("layer.newSolid", json!({"color": "#ff8800", "name": "Orange"})).unwrap();
+    let msg = m.sync(s.revision, &s.project).unwrap();
+    let FrameMsg::Patch { ops, .. } = &msg else { panic!("expected a patch") };
+    assert!(!ops.is_empty() && serde_json::to_string(ops).unwrap().len() < s.project.to_json().len() / 2);
+    assert!(send(msg, &mut w).is_empty());
+    assert_eq!(**w.project().unwrap(), *s.project);
+    let out = render(&mut w, s.revision, 2);
+    assert_eq!(out[0].1.as_deref(), Some(&local(&s, comp, t, opts)[..]));
+    // A request for another revision is refused as stale.
+    let out = render(&mut w, s.revision + 7, 3);
+    assert!(matches!(out[0].0, FrameReply::Failed { id: 3, stale: true, .. }));
+    // A patch from the wrong base asks for a resync; the mirror then sends the project.
+    let bad = FrameMsg::Patch { from: 999, revision: 1000, ops: vec![] };
+    assert!(matches!(send(bad, &mut w)[0].0, FrameReply::Resync { .. }));
+    m.reset();
+    assert!(matches!(m.sync(s.revision, &s.project), Some(FrameMsg::Project { .. })));
+}
+
+#[test]
+fn frame_messages_round_trip() {
+    for m in [
+        FrameMsg::Purge,
+        FrameMsg::Segs { segs: vec![SegData { key: 7, data: "AAAA".into() }] },
+        FrameMsg::Render {
+            id: 3,
+            revision: 4,
+            comp: ItemId(2),
+            time: Tick::from_seconds_f64(0.5),
+            opts: Box::new(RenderOpts { scale: 0.5, draft: true, roi: Some([1.0, 2.0, 3.0, 4.0]), ..Default::default() }),
+            disk: Some(format!("{:032x}", 0xabcdu128)),
+            layers: true,
+            prefetch: vec![format!("{:032x}", 7u128)],
+        },
+    ] {
+        let a = serde_json::to_string(&m).unwrap();
+        assert_eq!(serde_json::to_string(&round(&m)).unwrap(), a);
+        assert!(a.starts_with("{\"type\":"), "{a}");
+    }
+    for r in [
+        FrameReply::Frame { id: 1, width: 2, height: 3, ms: 4.5, passes: 2, gpu: true, layer_misses: vec!["0a".into()], layer_hits: vec![] },
+        FrameReply::Stored { key: "00ff".into(), bytes: 9, layer: false },
+        FrameReply::Stored { key: "00fe".into(), bytes: 8, layer: true },
+        FrameReply::Info { gpu: Some("Adapter (BrowserWebGpu)".into()), error: None },
+        FrameReply::Failed { id: 1, error: "x".into(), stale: true },
+        FrameReply::Resync { error: "y".into() },
+    ] {
+        assert_eq!(round(&r), r);
+    }
+}
+
+/// An accelerator with deferred readbacks: a GPU effect chain is "read back" one
+/// [`Deferred::settle`] after it was first asked for (computed with the CPU effects, so the
+/// finished frame equals the CPU render); until then it misses and returns its input.
+#[derive(Default)]
+struct Deferred {
+    ready: std::sync::Mutex<std::collections::HashSet<u64>>,
+    asked: std::sync::Mutex<std::collections::HashSet<u64>>,
+    gate: Arc<std::sync::atomic::AtomicBool>,
+    chains: std::sync::atomic::AtomicUsize,
+    auto: effectcraft_render::AutoPick,
+}
+
+impl Deferred {
+    fn settle(&self) {
+        let asked: Vec<u64> = self.asked.lock().unwrap().drain().collect();
+        self.ready.lock().unwrap().extend(asked);
+    }
+}
+
+impl Accelerator for Deferred {
+    fn name(&self) -> String {
+        "deferred".into()
+    }
+    fn comp_frame(&self, _: &Renderer, _: ItemId, _: Tick) -> Option<Image> {
+        None
+    }
+    fn supports_effect(&self, id: &str) -> bool {
+        effectcraft_effects::GPU_EFFECTS.contains(&id)
+    }
+    fn effects(&self, chain: &[effectcraft_render::FxStep], buf: &effectcraft_effects::Buf, levels: Option<f32>) -> Option<effectcraft_effects::Buf> {
+        use std::hash::{Hash, Hasher};
+        let mut h = std::collections::hash_map::DefaultHasher::new();
+        for s in chain {
+            s.spec.id.hash(&mut h);
+            s.ctx.time.to_bits().hash(&mut h);
+        }
+        (buf.img.width, buf.img.height).hash(&mut h);
+        for p in &buf.img.data {
+            for c in p {
+                c.to_bits().hash(&mut h);
+            }
+        }
+        let key = h.finish();
+        if !self.ready.lock().unwrap().contains(&key) {
+            self.asked.lock().unwrap().insert(key);
+            self.gate.store(true, std::sync::atomic::Ordering::Relaxed);
+            return Some(buf.clone());
+        }
+        self.chains.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+        let mut b = buf.clone();
+        for s in chain {
+            b = effectcraft_effects::apply(s.spec, &s.ctx, b);
+            if let Some(l) = levels {
+                effectcraft_render::color::quantize(&mut b.img, l);
+            }
+        }
+        Some(b)
+    }
+    fn auto_pick(&self) -> Option<&effectcraft_render::AutoPick> {
+        Some(&self.auto)
+    }
+    fn frame_begin(&self) {
+        self.ready.lock().unwrap().clear();
+    }
+    fn pass_begin(&self) {
+        self.gate.store(false, std::sync::atomic::Ordering::Relaxed);
+    }
+    fn pass_missed(&self) -> bool {
+        self.gate.load(std::sync::atomic::Ordering::Relaxed)
+    }
+    fn miss_gate(&self) -> Option<Arc<std::sync::atomic::AtomicBool>> {
+        Some(self.gate.clone())
+    }
+}
+
+#[test]
+fn deferred_readbacks_render_in_passes() {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let comp = s.active_comp_id().unwrap();
+    s.execute("layer.newSolid", json!({"color": "#3388ff", "name": "Blue", "width": 200, "height": 120})).unwrap();
+    s.execute("effect.apply", json!({"effect": "ec.blur.gaussian"})).unwrap();
+    s.execute("effect.apply", json!({"effect": "ec.stylize.glow"})).unwrap();
+    s.execute("layer.newSolid", json!({"color": "#ffcc00", "name": "Yellow", "width": 80, "height": 80})).unwrap();
+    s.execute("effect.apply", json!({"effect": "ec.color.levels"})).unwrap();
+    let opts = RenderOpts { scale: 0.25, backend: Backend::Gpu, ..Default::default() };
+    let t = Tick::from_seconds_f64(1.0);
+    let mut w = server(&s);
+    let acc = Arc::new(Deferred::default());
+    w.set_accel(Some(acc.clone()));
+    let mut m = Mirror::default();
+    w.handle(round(&m.sync(s.revision, &s.project).unwrap()));
+    let req = |id| round(&FrameMsg::Render { id, revision: s.revision, comp, time: t, opts: Box::new(opts), disk: None, layers: false, prefetch: vec![] });
+    assert!(w.handle(req(1)).is_empty() && w.waiting(), "the first pass misses");
+    let mut out = vec![];
+    for _ in 0..10 {
+        acc.settle();
+        out = w.resume();
+        if !w.waiting() {
+            break;
+        }
+    }
+    let (FrameReply::Frame { id: 1, passes, gpu: true, .. }, Some(px)) = &out[0] else { panic!("{:?}", out.first().map(|o| &o.0)) };
+    assert!(*passes >= 2, "{passes}");
+    assert!(acc.chains.load(std::sync::atomic::Ordering::Relaxed) >= 2);
+    // The same pixels as the CPU: no placeholder survived, in the frame or the layer cache.
+    assert_eq!(*px, local(&s, comp, t, RenderOpts { backend: Backend::Cpu, ..opts }));
+    let out = w.handle(req(2));
+    let out = if out.is_empty() {
+        acc.settle();
+        w.resume()
+    } else {
+        out
+    };
+    assert_eq!(out[0].1.as_deref(), Some(&px[..]));
+    // CPU requests never touch the accelerator; Auto times whole frames.
+    let cpu = RenderOpts { backend: Backend::Cpu, ..opts };
+    let out =
+        w.handle(round(&FrameMsg::Render { id: 3, revision: s.revision, comp, time: t, opts: Box::new(cpu), disk: None, layers: false, prefetch: vec![] }));
+    assert!(matches!(out[0].0, FrameReply::Frame { id: 3, passes: 1, gpu: false, .. }));
+    for id in 4..12 {
+        let auto = RenderOpts { backend: Backend::Auto, ..opts };
+        let mut out =
+            w.handle(round(&FrameMsg::Render { id, revision: s.revision, comp, time: t, opts: Box::new(auto), disk: None, layers: false, prefetch: vec![] }));
+        while w.waiting() {
+            acc.settle();
+            out = w.resume();
+        }
+        assert_eq!(out[0].1.as_deref(), Some(&px[..]), "frame {id}");
+    }
+    let st = acc.auto.stats(effectcraft_render::AutoKey::new(comp, opts.scale, false)).unwrap();
+    assert!(st.cpu_frames > 0 && st.gpu_frames > 0, "{st:?}");
+}
diff --git a/crates/engine/src/cmd.rs b/crates/engine/src/cmd.rs
new file mode 100644
index 000000000..cba6df6ef
--- /dev/null
+++ b/crates/engine/src/cmd.rs
@@ -0,0 +1,296 @@
+//! The command registry. Ids follow After Effects' menu structure; every menu item, panel button,
+//! shortcut and viewer/timeline gesture maps to one of these.
+
+mod align;
+mod align_data;
+mod anim;
+mod anim_presets;
+pub mod anim_tools;
+mod animation;
+pub(crate) mod app_more;
+mod autotrace;
+mod batch;
+mod camera_cmds;
+mod comp;
+pub(crate) mod comp_more;
+pub mod content_fill;
+mod create;
+mod edit;
+mod effect;
+pub use effect::CryptoProbeJob;
+pub(crate) use effect::{CryptoProbeSlot, crypto_probe_job, crypto_probe_ready, keep_crypto_probe, kept_crypto_probe};
+pub mod essential;
+pub mod expr_tools;
+mod file;
+pub(crate) mod file_more;
+mod focus;
+pub mod footage_panel;
+pub(crate) mod frame_export;
+mod frontend;
+mod help;
+mod import_project;
+mod key_labels;
+mod key_transform;
+mod keys_more;
+mod layer;
+mod layer_menu;
+mod layer_time;
+pub(crate) mod link;
+mod liquify;
+mod lottie;
+pub mod markers;
+mod mask;
+pub mod mask_interp;
+pub(crate) mod model3d;
+mod nav_more;
+pub mod paint;
+pub mod panels_cmds;
+pub(crate) mod path_nulls;
+mod paths;
+mod project_items;
+pub(crate) mod prop;
+mod prop_groups;
+mod proxy;
+pub mod puppet;
+mod query;
+mod quick_offset;
+mod relink;
+pub(crate) mod relink_moved;
+mod render_queue;
+pub(crate) mod rig3d;
+pub mod roto_cmds;
+mod scene_detect;
+pub mod scripts;
+mod settings;
+pub mod shape_stroke;
+pub mod shape_tool;
+mod stubs;
+mod styles;
+mod text_anim;
+pub mod text_edit;
+mod three_d;
+pub mod time;
+mod timeline;
+mod track;
+mod view;
+pub mod viewer_cmds;
+pub(crate) mod vpe;
+pub(crate) mod vr_editor;
+mod warp_cmds;
+pub(crate) mod watch_folder;
+#[cfg(test)]
+pub(crate) use app_more::report_text as report_text_for_tests;
+pub(crate) use app_more::view_command;
+#[cfg(test)]
+pub(crate) use file::open as open_for_tests;
+#[cfg(test)]
+pub(crate) use keys_more::amplitudes as amplitudes_for_tests;
+#[cfg(test)]
+pub(crate) use mask::split_segment as split_segment_for_tests;
+
+use std::sync::OnceLock;
+
+use effectcraft_project::{Comp, ItemId, Layer, LayerId};
+use effectcraft_time::Tick;
+use serde_json::Value;
+
+use crate::{EngineError, Result, Session};
+
+pub type Run = fn(&mut Session, &Value) -> Result<Value>;
+pub type Enabled = fn(&Session) -> std::result::Result<(), String>;
+
+/// Metadata + implementation for one command.
+pub struct CommandSpec {
+    pub id: &'static str,
+    pub label: &'static str,
+    /// Menu placement, e.g. `["Layer", "New"]`. Empty = not in menus.
+    pub menu: &'static [&'static str],
+    /// Default shortcut (egui-style names, `Cmd` = ⌘ on macOS / Ctrl elsewhere).
+    pub shortcut: Option<&'static str>,
+    /// Further default shortcuts (the menus and tooltips show `shortcut`).
+    pub alt_shortcuts: &'static [&'static str],
+    /// Parameter description for agents and the MCP schema.
+    pub params: &'static str,
+    pub enabled: Enabled,
+    pub run: Run,
+    /// Record in the journal (false for pure queries).
+    pub journal: bool,
+}
+
+#[macro_export]
+macro_rules! cmd {
+    // Several default shortcuts: `["PageDown", "Cmd+ArrowRight"]`.
+    ($id:literal, $label:literal, [$($m:literal),*], [$sc:literal, $($alt:literal),+], $params:literal, $en:expr, $run:expr) => {
+        $crate::commands::CommandSpec { alt_shortcuts: &[$($alt),+], ..$crate::cmd!($id, $label, [$($m),*], Some($sc), $params, $en, $run) }
+    };
+    ($id:literal, $label:literal, [$($m:literal),*], $sc:expr, $params:literal, $en:expr, $run:expr) => {
+        $crate::commands::CommandSpec {
+            id: $id,
+            label: $label,
+            menu: &[$($m),*],
+            shortcut: $sc,
+            alt_shortcuts: &[],
+            params: $params,
+            enabled: $en,
+            run: $run,
+            journal: true,
+        }
+    };
+}
+#[macro_export]
+macro_rules! query {
+    ($id:literal, $label:literal, $params:literal, $run:expr) => {
+        $crate::commands::CommandSpec {
+            id: $id,
+            label: $label,
+            menu: &[],
+            shortcut: None,
+            alt_shortcuts: &[],
+            params: $params,
+            enabled: $crate::commands::always,
+            run: $run,
+            journal: false,
+        }
+    };
+}
+
+mod enabled;
+mod params;
+mod schema;
+
+use super::commands;
+pub use enabled::always;
+pub(crate) use enabled::{has_comp, has_keys, has_layers, has_project_selection, not_yet, not_yet_run};
+pub use params::match_path_of;
+pub(crate) use params::{
+    b_p, bad, comp_id, f_p, frontend, layer_mut, layer_p, layers_p, merge_p, resolve_effect_path, resolve_layer, selectable, selected_leaf_props, str_p,
+    time_p, unlocked, visible_p,
+};
+pub use schema::{accepted_params, check_params, params_schema};
+
+pub fn command_specs() -> &'static [CommandSpec] {
+    static SPECS: OnceLock<Vec<CommandSpec>> = OnceLock::new();
+    SPECS.get_or_init(|| {
+        let mut v = Vec::new();
+        v.extend(file::specs());
+        v.extend(crate::models::specs());
+        v.extend(edit::specs());
+        v.extend(comp::specs());
+        v.extend(layer::specs());
+        v.extend(styles::specs());
+        v.extend(three_d::specs());
+        v.extend(model3d::specs());
+        v.extend(rig3d::specs());
+        v.extend(text_anim::specs());
+        v.extend(text_edit::specs());
+        v.extend(layer_time::specs());
+        v.extend(prop::specs());
+        v.extend(prop_groups::specs());
+        v.extend(project_items::specs());
+        v.extend(anim::specs());
+        v.extend(anim_tools::specs());
+        v.extend(link::specs());
+        v.extend(markers::specs());
+        v.extend(mask::specs());
+        v.extend(paths::specs());
+        v.extend(effect::specs());
+        v.extend(time::specs());
+        v.extend(nav_more::specs());
+        v.extend(render_queue::specs());
+        v.extend(help::specs());
+        v.extend(query::specs());
+        v.extend(batch::specs());
+        v.extend(layer_menu::specs());
+        v.extend(create::specs());
+        v.extend(animation::specs());
+        v.extend(anim_presets::specs());
+        v.extend(view::specs());
+        v.extend(viewer_cmds::specs());
+        v.extend(shape_stroke::specs());
+        v.extend(shape_tool::specs());
+        v.extend(focus::specs());
+        v.extend(key_labels::specs());
+        v.extend(key_transform::specs());
+        v.extend(quick_offset::specs());
+        v.extend(file_more::specs());
+        v.extend(relink::specs());
+        v.extend(relink_moved::specs());
+        v.extend(lottie::specs());
+        v.extend(import_project::specs());
+        v.extend(timeline::specs());
+        v.extend(comp_more::specs());
+        v.extend(frame_export::specs());
+        v.extend(watch_folder::specs());
+        v.extend(vpe::specs());
+        v.extend(path_nulls::specs());
+        v.extend(vr_editor::specs());
+        v.extend(frontend::specs());
+        v.extend(track::specs());
+        v.extend(mask_interp::specs());
+        v.extend(warp_cmds::specs());
+        v.extend(camera_cmds::specs());
+        v.extend(roto_cmds::specs());
+        v.extend(paint::specs());
+        v.extend(puppet::specs());
+        v.extend(liquify::specs());
+        v.extend(settings::specs());
+        v.extend(app_more::specs());
+        v.extend(keys_more::specs());
+        v.extend(essential::specs());
+        v.extend(expr_tools::specs());
+        v.extend(proxy::specs());
+        v.extend(scripts::specs());
+        v.extend(panels_cmds::specs());
+        v.extend(footage_panel::specs());
+        v.extend(autotrace::specs());
+        v.extend(scene_detect::specs());
+        v.extend(align_data::specs());
+        v.extend(align::specs());
+        v.extend(content_fill::specs());
+        v.extend(stubs::specs());
+        v.extend(crate::storage::specs());
+        v.extend(crate::learn::specs());
+        v.extend(crate::templates::specs());
+        v.extend(crate::preview::specs());
+        v
+    })
+}
+
+/// Set `footage` as the proxy of `item` (File ▸ Create Proxy's post-render action).
+pub(crate) fn proxy_set(s: &mut Session, item: ItemId, footage: effectcraft_project::Footage) -> Result<()> {
+    proxy::set_proxy_footage(s, &[item], footage)
+}
+
+/// (id, name) of the text animation presets.
+pub fn text_preset_list() -> Vec<(String, String)> {
+    text_anim::preset_names()
+}
+
+/// (id, name, category) of the built-in animation presets (Transitions…).
+pub fn builtin_preset_list() -> Vec<(String, String, String)> {
+    anim_presets::preset_names()
+}
+
+pub fn find(id: &str) -> Option<&'static CommandSpec> {
+    // Every command execution looks its spec up: index the ~2,000 ids once.
+    static INDEX: OnceLock<std::collections::HashMap<&'static str, usize>> = OnceLock::new();
+    let index = INDEX.get_or_init(|| {
+        let mut m = std::collections::HashMap::new();
+        for (i, c) in command_specs().iter().enumerate() {
+            m.entry(c.id).or_insert(i);
+        }
+        m
+    });
+    index.get(id).map(|&i| &command_specs()[i])
+}
+
+/// Font families available to text layers (bundled + scanned system fonts).
+/// Text animation presets: (id, name), for menus.
+pub fn text_presets() -> Vec<(String, String)> {
+    commands::text_preset_list()
+}
+
+/// Built-in animation presets (Effects & Presets ▸ * Animation Presets): (id, name, category).
+pub fn animation_presets() -> Vec<(String, String, String)> {
+    commands::builtin_preset_list()
+}
diff --git a/crates/engine/src/commands/align.rs b/crates/engine/src/cmd/align.rs
similarity index 100%
rename from crates/engine/src/commands/align.rs
rename to crates/engine/src/cmd/align.rs
diff --git a/crates/engine/src/commands/align_data.rs b/crates/engine/src/cmd/align_data.rs
similarity index 90%
rename from crates/engine/src/commands/align_data.rs
rename to crates/engine/src/cmd/align_data.rs
index 097bddc22..99ed3d113 100644
--- a/crates/engine/src/commands/align_data.rs
+++ b/crates/engine/src/cmd/align_data.rs
@@ -33,14 +33,16 @@ pub struct Stamp {
     pub dated: bool,
 }
 
-fn days_from_civil(y: i64, m: i64, d: i64) -> i64 {
-    let y = if m <= 2 { y - 1 } else { y };
-    let era = y.div_euclid(400);
-    let yoe = y - era * 400;
-    let mp = (m + 9) % 12;
-    let doy = (153 * mp + 2) / 5 + d - 1;
-    let doe = yoe * 365 + yoe / 4 - yoe / 100 + doy;
-    era * 146_097 + doe - 719_468
+/// Days since 1970-01-01 of the proleptic-Gregorian date `(y, m, d)`. `d` is added linearly (as
+/// the previous hand-rolled `days_from_civil` did), so a day past the month's end rolls over;
+/// `None` when the year/month is out of chrono's range. `m` must be 1..=12.
+fn days_from_civil(y: i64, m: i64, d: i64) -> Option<i64> {
+    let year = i32::try_from(y).ok()?;
+    let month = u32::try_from(m).ok()?;
+    let first = chrono::NaiveDate::from_ymd_opt(year, month, 1)?;
+    // Days since the Unix epoch: `num_days_from_ce` counts from 0001-01-01; 719_162 days precede 1970-01-01.
+    use chrono::Datelike;
+    i64::from(first.num_days_from_ce()).checked_sub(719_163)?.checked_add(d.checked_sub(1)?)
 }
 
 /// `hh:mm:ss(.fff)` or timecode `hh:mm:ss:ff` / `hh:mm:ss;ff` → seconds.
@@ -70,9 +72,9 @@ pub fn parse_stamp(v: &Value, fps: f64) -> Option<Stamp> {
             }
             // ISO 8601: date [T| ] time [zone].
             if s.len() >= 10 && s.as_bytes()[4] == b'-' && s.as_bytes()[7] == b'-' {
-                let (y, m, d) = (s[0..4].parse::<i64>().ok()?, s[5..7].parse::<i64>().ok()?, s[8..10].parse::<i64>().ok()?);
-                let mut secs = days_from_civil(y, m, d) as f64 * 86_400.0;
-                let rest = s[10..].trim_start_matches(['T', 't', ' ']);
+                let (y, m, d) = (s.get(0..4)?.parse::<i64>().ok()?, s.get(5..7)?.parse::<i64>().ok()?, s.get(8..10)?.parse::<i64>().ok()?);
+                let mut secs = days_from_civil(y, m, d)? as f64 * 86_400.0;
+                let rest = s.get(10..)?.trim_start_matches(['T', 't', ' ']);
                 if !rest.is_empty() {
                     // Zone: Z or ±hh:mm / ±hhmm.
                     let (time, zone) = match rest.find(['Z', 'z', '+']).or_else(|| rest.rfind('-')) {
@@ -227,6 +229,12 @@ pub fn specs() -> Vec<CommandSpec> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn multibyte_date_is_rejected() {
+        assert_eq!(parse_stamp(&json!("2026-05-0é"), 25.0), None);
+        assert_eq!(parse_stamp(&json!("2026-05-01é"), 25.0), None);
+    }
+
     #[test]
     fn parses_timestamps() {
         let p = |v: Value| parse_stamp(&v, 25.0).unwrap();
diff --git a/crates/engine/src/commands/anim.rs b/crates/engine/src/cmd/anim.rs
similarity index 82%
rename from crates/engine/src/commands/anim.rs
rename to crates/engine/src/cmd/anim.rs
index 3ea27b0df..325845115 100644
--- a/crates/engine/src/commands/anim.rs
+++ b/crates/engine/src/cmd/anim.rs
@@ -1,8 +1,8 @@
 //! Keyframe clipboard, selection, nudging, direct key/ease edits (Graph Editor handles) and key
 //! inspection for the Keyframe Velocity / Keyframe Interpolation dialogs.
 
-use effectcraft_keyframe::{Ease, Interp, Keyframe, key_at, retime_roving, side_ease};
-use effectcraft_project::{LayerId, Property, Uid};
+use effectcraft_keyframe::{Ease, Interp, Keyframe, ShapePath, Value as KValue, key_at, retime_roving, side_ease};
+use effectcraft_project::{ItemId, LayerId, Property, Uid};
 use effectcraft_time::Tick;
 use serde_json::{Value, json};
 
@@ -61,6 +61,13 @@ fn paste(s: &mut Session, p: &Value) -> Result<Value> {
     if clip.is_empty() {
         return Err(bad("keys.paste", "no keyframes have been copied"));
     }
+    // A copied Mask Path / shape Path key pasted onto Position becomes a motion path (#1425).
+    if let [c] = clip.as_slice()
+        && let Some(KValue::Path(path)) = c.keys.first().map(|k| &k.value)
+        && let Some(target) = path_target(s, p)?
+    {
+        return paste_path(s, p, target, path);
+    }
     let cid = comp_id(s, p)?;
     let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
     let t = time_p(s, p, Some(comp));
@@ -134,6 +141,86 @@ fn paste(s: &mut Session, p: &Value) -> Result<Value> {
     })
 }
 
+/// The spatial property (Position, Anchor Point…) a copied path pastes onto as a motion path:
+/// the `prop` / `path` given, else a selected one of the target layers. `None` when there's none.
+pub(super) fn path_target(s: &Session, p: &Value) -> Result<Option<(ItemId, LayerId, Uid)>> {
+    let (cid, targets) = layers_p(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let motion = |pr: &Property| pr.spatial && !pr.static_only && matches!(pr.value, KValue::Vec2(_) | KValue::Vec3(_));
+    let explicit = targets.first().and_then(|lid| {
+        let l = comp.layer(*lid)?;
+        let pr = match p.get("prop").and_then(Value::as_u64) {
+            Some(u) => l.props.find(u),
+            None => l.props.prop(str_p(p, "path")?),
+        }?;
+        Some((*lid, pr))
+    });
+    if p.get("prop").is_some() || p.get("path").is_some() {
+        return Ok(explicit.filter(|(_, pr)| motion(pr)).map(|(lid, pr)| (cid, lid, pr.uid)));
+    }
+    let selected = s
+        .state
+        .selected_props
+        .iter()
+        .filter(|(lid, _)| targets.contains(lid))
+        .find(|(lid, uid)| comp.layer(*lid).and_then(|l| l.props.find(*uid)).is_some_and(motion));
+    Ok(selected.map(|(lid, uid)| (cid, *lid, *uid)))
+}
+
+/// Paste a mask or shape path onto a spatial property as After Effects does: a keyframe per
+/// vertex with the path's tangents, from the CTI over 2 s (a closed path ends back on its first
+/// vertex), the inner keys roving so the layer moves at one speed. Like After Effects, the
+/// vertices are pasted as they are (layer-space numbers, not converted to the target's space).
+pub(super) fn paste_path(s: &mut Session, p: &Value, (cid, lid, uid): (ItemId, LayerId, Uid), path: &ShapePath) -> Result<Value> {
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let t = time_p(s, p, Some(comp));
+    let target = comp.layer(lid).ok_or(EngineError::NoComp)?;
+    let mut order: Vec<usize> = (0..path.vertices.len()).collect();
+    if path.closed && !order.is_empty() {
+        order.push(0);
+    }
+    if order.is_empty() {
+        return Err(bad("keys.paste", "the copied path has no points"));
+    }
+    let span = Tick::from_seconds_f64(2.0).0 / i64::try_from(order.len().saturating_sub(1).max(1)).unwrap_or(i64::MAX);
+    let at = |xy: Option<&[f64; 2]>| {
+        let [x, y] = xy.copied().unwrap_or_default();
+        [x, y, 0.0]
+    };
+    let last = order.len() - 1;
+    let keys: Vec<(Tick, KValue, [f64; 3], [f64; 3], bool)> = order
+        .iter()
+        .enumerate()
+        .map(|(i, &v)| {
+            let [x, y, z] = at(path.vertices.get(v));
+            let value = match target.props.find(uid).map(|pr| &pr.value) {
+                Some(KValue::Vec2(_)) => KValue::Vec2([x, y]),
+                _ => KValue::Vec3([x, y, z]),
+            };
+            let time = target.layer_time(t + Tick(span.saturating_mul(i64::try_from(i).unwrap_or(i64::MAX))));
+            (time, value, at(path.in_tangents.get(v)), at(path.out_tangents.get(v)), i != 0 && i != last)
+        })
+        .collect();
+    s.edit("Paste Keyframes", merge_p(p), |proj, st| {
+        let l = super::layer_mut(proj, cid, lid)?;
+        let pr = l.props.find_mut(uid).ok_or_else(|| bad("keys.paste", "no property"))?;
+        let mut sel = vec![];
+        for (time, value, spatial_in, spatial_out, roving) in keys {
+            let k = Keyframe { spatial_in, spatial_out, spatial_auto: false, roving, ..Keyframe::new(time, value) };
+            match pr.keys.binary_search_by(|x| x.time.cmp(&time)) {
+                Ok(i) => pr.keys[i] = k,
+                Err(i) => pr.keys.insert(i, k),
+            }
+            sel.push(time);
+        }
+        // Re-timing keeps the keys' order, so the pasted keys are found again by index.
+        let pasted: Vec<usize> = pr.keys.iter().enumerate().filter(|(_, k)| sel.contains(&k.time)).map(|(i, _)| i).collect();
+        retime_roving(&mut pr.keys, pr.spatial);
+        st.selected_keys = pasted.iter().filter_map(|&i| pr.keys.get(i)).map(|k| KeyRef { layer: lid, prop: uid, time: k.time }).collect();
+        Ok(json!(st.selected_keys.len()))
+    })
+}
+
 /// Select every keyframe of the selected properties, or of the given / selected layers.
 fn select_all(s: &mut Session, p: &Value) -> Result<Value> {
     let (cid, mut layers) = layers_p(s, p)?;
diff --git a/crates/engine/src/commands/anim_presets.rs b/crates/engine/src/cmd/anim_presets.rs
similarity index 100%
rename from crates/engine/src/commands/anim_presets.rs
rename to crates/engine/src/cmd/anim_presets.rs
diff --git a/crates/engine/src/commands/anim_tools.rs b/crates/engine/src/cmd/anim_tools.rs
similarity index 100%
rename from crates/engine/src/commands/anim_tools.rs
rename to crates/engine/src/cmd/anim_tools.rs
diff --git a/crates/engine/src/commands/animation.rs b/crates/engine/src/cmd/animation.rs
similarity index 99%
rename from crates/engine/src/commands/animation.rs
rename to crates/engine/src/cmd/animation.rs
index a556d9a42..1bdf3fed7 100644
--- a/crates/engine/src/commands/animation.rs
+++ b/crates/engine/src/cmd/animation.rs
@@ -10,7 +10,7 @@ use effectcraft_project::{GroupKind, Layer, LayerId, LayerSource, Node, Project,
 use effectcraft_time::Tick;
 use serde_json::{Value, json};
 
-use super::{CommandSpec, bad, frontend, has_comp, has_keys, has_layers, layer_mut, layers_p, match_path_of, selected_leaf_props, str_p};
+use super::{CommandSpec, bad, frontend, has_comp, has_keys, has_layers, layer_mut, layers_p, match_path_of, resolve_effect_path, selected_leaf_props, str_p};
 use crate::{EngineError, KeyRef, Result, Session, cmd};
 
 /// Preset file format version tag (`*.ecpreset`, JSON).
@@ -147,7 +147,8 @@ fn apply_preset(s: &mut Session, p: &Value) -> Result<Value> {
                 }
             }
             for (path, src) in &props {
-                match l.props.prop_mut(path) {
+                let resolved = resolve_effect_path(l, path);
+                match l.props.prop_mut(&resolved) {
                     Some(pr) if std::mem::discriminant(&pr.value) == std::mem::discriminant(&src.value) => {
                         pr.value = src.value.clone();
                         pr.keys = src
diff --git a/crates/engine/src/commands/app_more.rs b/crates/engine/src/cmd/app_more.rs
similarity index 90%
rename from crates/engine/src/commands/app_more.rs
rename to crates/engine/src/cmd/app_more.rs
index 1bb94952f..f607c8288 100644
--- a/crates/engine/src/commands/app_more.rs
+++ b/crates/engine/src/cmd/app_more.rs
@@ -13,14 +13,23 @@ use super::{CommandSpec, always, b_p, bad, comp_id, has_comp, has_layers, has_pr
 use crate::{EngineError, Event, Result, Session, cmd, query};
 
 /// Run `f` (which may run several undoable commands) as one undo step named `label`; on error
-/// the project is restored.
+/// the project, editor state and undo history are restored.
+///
+/// Front-end events emitted by a failed `f` are discarded with the state. Pending-analysis
+/// queues and the journal are not part of this rollback and keep their existing behaviour.
 pub(crate) fn grouped<T>(s: &mut Session, label: &str, f: impl FnOnce(&mut Session) -> Result<T>) -> Result<T> {
     // The steps `f` records go to an empty stack (so the undo limit can't drop the snapshot
-    // taken before them), then become one step on the real one.
+    // taken before them), then become one step on the real one. Keep the complete pre-`f`
+    // history and editor state for a failure: rollback must not leave a partially retargeted
+    // editor or a `f`-recorded redo/branch behind.
+    let saved_history = s.history.clone();
     let saved = std::mem::take(&mut s.history.undo);
     let before = s.project.clone();
+    let before_state = s.state.clone();
+    let event_mark = s.events.len();
     let r = f(s);
     let changed = !s.history.undo.is_empty();
+    let interim_revision = s.ime_revision;
     s.history.undo = saved;
     s.history.merge_key = None;
     match r {
@@ -36,9 +45,22 @@ pub(crate) fn grouped<T>(s: &mut Session, label: &str, f: impl FnOnce(&mut Sessi
             Ok(v)
         }
         Err(e) => {
+            // Snapshot the failing editor before restoring the pre-`f` state: an intermediate
+            // text.edit / text change / comp switch must invalidate the pre-`f` editor token
+            // instead of reviving it.
+            let edited = super::text_edit::active_editor_snapshot(s);
+            s.project = before;
+            s.state = before_state;
+            s.history = saved_history;
+            s.history.merge_key = None;
+            // A failed intermediate comp switch must not reach the front end through an
+            // `OpenComp` event while its state has been rolled back.
+            s.events.truncate(event_mark);
+            s.sanitize_after_replacement(edited.as_ref());
+            // As in the batch rollback, the IME revision is a high-water mark: leave the highest
+            // intermediate stamp rather than rewinding to before `f`.
+            s.ime_revision = s.ime_revision.max(interim_revision);
             if changed {
-                s.project = before;
-                s.sanitize_state();
                 s.bump();
             }
             Err(e)
@@ -332,7 +354,7 @@ fn assign_view_shortcut(s: &mut Session, p: &Value) -> Result<Value> {
     reassign(s, view_command(cur), &slot, "view.assign3dShortcut")
 }
 
-/// Window ▸ Assign Shortcut to "<workspace>" Workspace: Shift+F10, Shift+F11 or Shift+F12.
+/// Window ▸ Assign Shortcut to `"<workspace>"` Workspace: Shift+F10, Shift+F11 or Shift+F12.
 /// The frontend fills in the current workspace.
 fn assign_workspace_shortcut(s: &mut Session, p: &Value) -> Result<Value> {
     let slot = slot_p(p, "window.assignWorkspaceShortcut", true)?;
@@ -646,6 +668,9 @@ fn extract_cubemap(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(r)
 }
 
+/// The specs for the commands in this module: history steps, recent footage and presets, Save
+/// a Copy As XML, footage replacement and Execute File, 3D-view and workspace shortcuts,
+/// logging and the system report, VR environment/cubemap creation and System Information.
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!("edit.history", "History", [], None, "{steps?: n (undo n steps), redo?: n}", has_history, history),
@@ -704,6 +729,36 @@ pub fn specs() -> Vec<CommandSpec> {
 mod tests {
     use serde_json::json;
 
+    #[test]
+    fn grouped_rollback_restores_the_editor_state_and_history_after_a_transient_text_change() {
+        let mut s = crate::Session::default();
+        s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "duration": 1})).unwrap();
+        let lid = s.execute("layer.newText", json!({"text": "abcdef"})).unwrap()["layer"].as_u64().unwrap();
+        s.execute("text.edit", json!({"layer": lid, "caret": 3})).unwrap();
+        let original_comp = s.active_comp_id().unwrap();
+        let owner = s.state.text_edit.as_ref().unwrap().session;
+        let other =
+            s.execute("comp.new", json!({"name": "Other", "width": 160, "height": 90, "duration": 1, "open": false})).unwrap()["comp"].as_u64().unwrap();
+        let undo = s.history.undo.len();
+        s.drain_events();
+
+        let r = super::grouped(&mut s, "Rollback", |s| -> crate::Result<()> {
+            // An intermediate document edit and state switch, both undone by the error path.
+            s.execute("layer.setText", json!({"layer": lid, "text": "ab"}))?;
+            s.execute("comp.open", json!({"comp": other}))?;
+            Err(crate::EngineError::Other("stop".into()))
+        });
+        assert!(r.is_err());
+        assert_eq!(s.active_comp_id(), Some(original_comp), "the pre-group comp is restored");
+        assert_eq!(super::super::text_edit::layer_doc(&s, effectcraft_project::LayerId(lid)).unwrap().text, "abcdef", "the document is restored");
+        assert_eq!(s.history.undo.len(), undo, "the partial grouped steps are not left in history");
+        assert_ne!(s.state.text_edit.as_ref().unwrap().session, owner, "a transient replacement does not revive the old IME token");
+        assert!(
+            !s.drain_events().iter().any(|e| matches!(e, crate::Event::OpenComp(_))),
+            "the failed intermediate comp switch is not published to the front end"
+        );
+    }
+
     /// `File.execute()` opens the file as a well-formed `file://` URL (spaces, `#`, `%`).
     #[test]
     fn execute_file_opens_an_encoded_file_url() {
diff --git a/crates/engine/src/commands/autotrace.rs b/crates/engine/src/cmd/autotrace.rs
similarity index 100%
rename from crates/engine/src/commands/autotrace.rs
rename to crates/engine/src/cmd/autotrace.rs
diff --git a/crates/engine/src/commands/batch.rs b/crates/engine/src/cmd/batch.rs
similarity index 69%
rename from crates/engine/src/commands/batch.rs
rename to crates/engine/src/cmd/batch.rs
index 4bfd2b2b1..f6e6901cc 100644
--- a/crates/engine/src/commands/batch.rs
+++ b/crates/engine/src/cmd/batch.rs
@@ -51,11 +51,25 @@ fn substitute(v: &Value, results: &[Value]) -> Result<Value> {
     })
 }
 
+/// `engine.batch`: runs `steps` (`[{command|id, params?}]`) as engine commands, substituting
+/// `$N` / `$N.key.0` strings in each step's params with earlier results, and returns
+/// `{steps, results}`.
+///
+/// `engine.batch`, `file.runScript` and `script.run` are refused inside a batch. Successful
+/// steps are folded into one undo step named `label` (default "Batch"). With the default
+/// `atomic: true`, a failing step restores the project, history and editor state, drops the
+/// events the batch published, sanitizes the editor against the failing intermediate state (so
+/// no pre-batch IME token is revived) and keeps the higher process IME revision; with
+/// `atomic: false` the steps before the failure stay applied. Either way the error names the
+/// failing step and command.
 fn batch(s: &mut Session, p: &Value) -> Result<Value> {
     let steps = p.get("steps").and_then(Value::as_array).ok_or_else(|| bad("engine.batch", "missing `steps`: [{command, params?}, …]"))?.clone();
     let label = str_p(p, "label").unwrap_or("Batch").to_string();
     let atomic = p.get("atomic").and_then(Value::as_bool).unwrap_or(true);
     let (project, history, state) = (s.project.clone(), s.history.clone(), s.state.clone());
+    // Rolled-back steps may have queued events (an `OpenComp`, a Toast) for the state that is
+    // about to be dropped: the UI must not act on them.
+    let event_mark = s.events.len();
     let mut results: Vec<Value> = Vec::with_capacity(steps.len());
     for (i, step) in steps.iter().enumerate() {
         let run = |s: &mut Session, results: &[Value]| -> Result<Value> {
@@ -75,10 +89,21 @@ fn batch(s: &mut Session, p: &Value) -> Result<Value> {
             Err(e) => {
                 let id = step.get("command").or_else(|| step.get("id")).and_then(Value::as_str).unwrap_or("?");
                 let note = if atomic {
+                    // The snapshot is the intermediate state the failing step left: comparing it
+                    // with the restored editor detects a restart or cross-comp switch inside the
+                    // batch, so the pre-batch token is never revived. Do not restore
+                    // `ime_revision`: a transient text edit inside the batch already advanced
+                    // this process-monotonic high-water mark, and rewinding it would reuse a
+                    // stamp (letting a wide-selection composition look current). An unrelated
+                    // failed batch did not advance it, so its value stays exactly as it was.
+                    let edited = crate::commands::text_edit::active_editor_snapshot(s);
+                    let interim_revision = s.ime_revision;
                     s.project = project;
                     s.history = history;
                     s.state = state;
-                    s.sanitize_state();
+                    s.events.truncate(event_mark);
+                    s.sanitize_after_replacement(edited.as_ref());
+                    s.ime_revision = s.ime_revision.max(interim_revision);
                     s.bump();
                     "; the batch was rolled back (nothing changed)".to_string()
                 } else {
@@ -124,6 +149,32 @@ mod tests {
 
     use crate::Session;
 
+    /// Failed atomic steps discard their UI events while preserving events queued beforehand.
+    #[test]
+    fn atomic_batch_event_rollback_preserves_prior_events() {
+        for atomic in [true, false] {
+            let mut s = Session::default();
+            s.execute("comp.new", json!({"name": "First", "width": 100, "height": 100})).unwrap();
+            let first = s.active_comp_id().unwrap();
+            s.execute("comp.new", json!({"name": "Second", "width": 100, "height": 100})).unwrap();
+            let second = s.active_comp_id().unwrap();
+            s.drain_events();
+            s.execute("comp.open", json!({"comp": first.0})).unwrap();
+            let result = s.execute_checked(
+                "engine.batch",
+                json!({"atomic": atomic, "steps": [
+                    {"command": "comp.open", "params": {"comp": second.0}},
+                    {"command": "no.suchCommand", "params": {}}
+                ]}),
+            );
+            assert!(result.is_err());
+            assert_eq!(s.active_comp_id(), Some(if atomic { first } else { second }));
+            let opened: Vec<_> =
+                s.drain_events().into_iter().filter_map(|event| if let crate::Event::OpenComp(id) = event { Some(id) } else { None }).collect();
+            assert_eq!(opened, if atomic { vec![first] } else { vec![first, second] });
+        }
+    }
+
     #[test]
     fn batch_refs_one_undo_step_and_rollback() {
         let mut s = Session::default();
diff --git a/crates/engine/src/commands/camera_cmds.rs b/crates/engine/src/cmd/camera_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/camera_cmds.rs
rename to crates/engine/src/cmd/camera_cmds.rs
diff --git a/crates/engine/src/commands/comp.rs b/crates/engine/src/cmd/comp.rs
similarity index 100%
rename from crates/engine/src/commands/comp.rs
rename to crates/engine/src/cmd/comp.rs
diff --git a/crates/engine/src/commands/comp_more.rs b/crates/engine/src/cmd/comp_more.rs
similarity index 100%
rename from crates/engine/src/commands/comp_more.rs
rename to crates/engine/src/cmd/comp_more.rs
diff --git a/crates/engine/src/commands/content_fill.rs b/crates/engine/src/cmd/content_fill.rs
similarity index 100%
rename from crates/engine/src/commands/content_fill.rs
rename to crates/engine/src/cmd/content_fill.rs
diff --git a/crates/engine/src/commands/create.rs b/crates/engine/src/cmd/create.rs
similarity index 100%
rename from crates/engine/src/commands/create.rs
rename to crates/engine/src/cmd/create.rs
diff --git a/crates/engine/src/commands/edit.rs b/crates/engine/src/cmd/edit.rs
similarity index 90%
rename from crates/engine/src/commands/edit.rs
rename to crates/engine/src/cmd/edit.rs
index 422728ea3..0130aff70 100644
--- a/crates/engine/src/commands/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -1,7 +1,8 @@
 //! Edit menu.
 
 use effectcraft_color::Label;
-use effectcraft_project::{Comp, Expression, ItemKind, Layer, LayerId, LayerSource, TrackMatte};
+use effectcraft_keyframe::Value as KV;
+use effectcraft_project::{Comp, Expression, ItemId, ItemKind, Layer, LayerId, LayerSource, TrackMatte};
 use effectcraft_time::Tick;
 use serde_json::{Value, json};
 
@@ -73,6 +74,10 @@ fn select_all(s: &mut Session, _: &Value) -> Result<Value> {
     Ok(json!(s.state.selected_layers.len()))
 }
 fn deselect_all(s: &mut Session, _: &Value) -> Result<Value> {
+    // A deselected layer never keeps an open text edit: commit the edit first, exactly as
+    // `text.endEdit` (an empty Type-tool layer included), so every route — menu, shortcut,
+    // script, MCP — leaves one final state.
+    super::text_edit::end_edit(s, &Value::Null)?;
     s.state.selected_layers.clear();
     s.state.selected_props.clear();
     s.state.selected_keys.clear();
@@ -115,6 +120,11 @@ fn duplicate(s: &mut Session, p: &Value) -> Result<Value> {
         if !items.is_empty() {
             return super::prop_groups::duplicate_contents(s, &items);
         }
+        // Text animators or their selectors selected → duplicate them inside their text layers.
+        let items = super::prop_groups::selected_animator_items(s);
+        if !items.is_empty() {
+            return super::prop_groups::duplicate_contents(s, &items);
+        }
     }
     let (cid, ids) = layers_p(s, p)?;
     let new = s.edit("Duplicate", None, |proj, st| {
@@ -139,46 +149,73 @@ fn duplicate(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!(new.iter().map(|l| l.0).collect::<Vec<_>>()))
 }
 
+/// `edit.clear`: delegates to `text.delete` while editing text (deleting the selection or
+/// preceding character/word), then handles selected Time Remap (turning remapping off), keyframes, loose mask
+/// vertices, puppet pins, effects, masks/shape items/text animators/trackers, and finally the
+/// selected (or given) unlocked layers. Layer and selected-property-group paths return the number
+/// removed; text, Time Remap, keyframe, loose-vertex, puppet-pin and effect paths return their
+/// delegated command's result.
+///
+/// Layer removal also unparents surviving children in place, clears track mattes that pointed
+/// at a removed layer and rewrites layer-reference values and keys to `None` in the same undo
+/// step; the text-edit session is then sanitized so a removed layer's editor is not reused.
 fn delete(s: &mut Session, p: &Value) -> Result<Value> {
-    if s.state.text_edit.is_some() && p.get("layers").is_none() {
-        return s.execute("text.delete", json!({}));
+    if let Some(done) = delete_selection(s, p)? {
+        return Ok(done);
+    }
+    let (cid, ids) = layers_p(s, p)?;
+    let ids = super::unlocked(s, cid, ids, "edit.clear")?;
+    clear_layers(s, cid, &ids)?;
+    // A removed layer may have been the edited one: end that session before another command
+    // can reuse it. Undo restores a layer as a new editor, never by reviving the old IME session.
+    s.sanitize_state();
+    Ok(json!(ids.len()))
+}
+
+/// Deletes the selected things that are not layers. `None` when the layers are deleted
+/// instead (nothing else is selected, or the command names its layers).
+fn delete_selection(s: &mut Session, p: &Value) -> Result<Option<Value>> {
+    let no_layers = p.get("layers").is_none();
+    if s.state.text_edit.is_some() && no_layers {
+        return Ok(Some(s.execute("text.delete", json!({}))?));
     }
     // Time Remap selected (its name, which selects all its keys) → time remapping off, not the
     // layer (After Effects).
-    if p.get("layers").is_none() {
+    if no_layers {
         let remapped = super::layer_time::selected_time_remap(s);
         if !remapped.is_empty() {
-            return super::layer_time::disable_time_remap(s, &remapped);
+            return Ok(Some(super::layer_time::disable_time_remap(s, &remapped)?));
         }
     }
     // Keyframes selected → delete keys; mask vertices → delete them; else layers.
-    if !s.state.selected_keys.is_empty() && p.get("layers").is_none() {
-        return s.execute("keys.delete", json!({}));
+    if !s.state.selected_keys.is_empty() && no_layers {
+        return Ok(Some(s.execute("keys.delete", json!({}))?));
     }
     // (Points selected with their mask, which selecting a mask does: the mask goes, below.)
     let comp = s.active_comp();
     let loose = s.state.selected_vertices.iter().any(|v| {
         !s.state.selected_props.contains(&(v.layer, v.mask)) && comp.and_then(|c| c.layer(v.layer)).is_some_and(|l| l.props.find_group(v.mask).is_some())
     });
-    if loose && p.get("layers").is_none() {
-        return s.execute("mask.deleteVertices", json!({}));
+    if loose && no_layers {
+        return Ok(Some(s.execute("mask.deleteVertices", json!({}))?));
     }
     // Puppet pins selected → delete the pins (not their layer).
-    if p.get("layers").is_none() && !super::puppet::selected_pins(s).is_empty() {
-        return s.execute("puppet.removePin", json!({}));
+    if no_layers && !super::puppet::selected_pins(s).is_empty() {
+        return Ok(Some(s.execute("puppet.removePin", json!({}))?));
     }
     // Effects selected → remove them.
-    if p.get("layers").is_none() && !super::effect::selected_effects(s).is_empty() {
-        return s.execute("effect.remove", json!({}));
+    if no_layers && !super::effect::selected_effects(s).is_empty() {
+        return Ok(Some(s.execute("effect.remove", json!({}))?));
     }
     // Masks, shape items, text animators or trackers selected → remove them.
-    if p.get("layers").is_none()
-        && let Some(n) = super::prop_groups::remove_selected(s)?
-    {
-        return Ok(n);
+    if no_layers && let Some(n) = super::prop_groups::remove_selected(s)? {
+        return Ok(Some(n));
     }
-    let (cid, ids) = layers_p(s, p)?;
-    let ids = super::unlocked(s, cid, ids, "edit.clear")?;
+    Ok(None)
+}
+
+/// Removes layers `ids` from comp `cid` in one undoable step, and clears what referred to them.
+fn clear_layers(s: &mut Session, cid: ItemId, ids: &[LayerId]) -> Result<()> {
     // Children of deleted layers are unparented where they are (like After Effects).
     let comp = s.project.comp(cid).ok_or(crate::EngineError::NoComp)?;
     let orphans: Vec<LayerId> = comp.layers.iter().filter(|l| !ids.contains(&l.id) && l.parent.is_some_and(|p| ids.contains(&p))).map(|l| l.id).collect();
@@ -196,13 +233,27 @@ fn delete(s: &mut Session, p: &Value) -> Result<Value> {
             if l.track_matte.is_some_and(|m| ids.contains(&m.layer)) {
                 l.track_matte = None;
             }
+            // A layer-reference property (an Environment light's Source, an effect's Clone Source,
+            // Back Layer…) must read as None once its layer is gone, in this same history step: a
+            // dead id renders as nothing while the UI shows "None", which means "fall back to the
+            // comp's Environment Layer" (#2153). Keys carry the same value kind as the property.
+            l.props.walk_mut(&mut |p| {
+                let dead = |v: &KV| matches!(v, KV::Layer(Some(id)) if ids.contains(&LayerId(*id)));
+                if dead(&p.value) {
+                    p.value = KV::Layer(None);
+                }
+                for k in &mut p.keys {
+                    if dead(&k.value) {
+                        k.value = KV::Layer(None);
+                    }
+                }
+            });
         }
         st.selected_layers.clear();
         st.selected_props.clear();
         st.selected_keys.clear();
         Ok(())
-    })?;
-    Ok(json!(ids.len()))
+    })
 }
 
 fn clear_clipboards(s: &mut Session) {
@@ -328,7 +379,8 @@ fn paste_properties(s: &mut Session, p: &Value) -> Result<Value> {
             }
             let lt = l.layer_time(t);
             for (path, v) in &values {
-                if let Some(pr) = l.props.prop_mut(path)
+                let path = super::resolve_effect_path(l, path);
+                if let Some(pr) = l.props.prop_mut(&path)
                     && let Some(v) = pr.value.coerce_json(&v.to_json())
                 {
                     pr.set_value_at(lt, v);
@@ -458,7 +510,8 @@ fn paste_links(s: &mut Session, clip: LinkClip) -> Result<Value> {
         for lid in &ids {
             let l = super::layer_mut(proj, cid, *lid)?;
             for (path, e) in &pairs {
-                if let Some(pr) = l.props.prop_mut(path) {
+                let path = super::resolve_effect_path(l, path);
+                if let Some(pr) = l.props.prop_mut(&path) {
                     pr.expr = Some(e.clone());
                     n += 1;
                 }
@@ -496,6 +549,13 @@ fn paste(s: &mut Session, p: &Value) -> Result<Value> {
     if let Some(clip) = s.state.link_clipboard.clone() {
         return paste_links(s, clip);
     }
+    // A copied Mask Path / shape Path pasted onto Position becomes a motion path (#1425).
+    if let [(_, effectcraft_keyframe::Value::Path(path))] = s.state.value_clipboard.as_slice()
+        && let Some(target) = super::anim::path_target(s, p)?
+    {
+        let path = path.clone();
+        return super::anim::paste_path(s, p, target, &path);
+    }
     if !s.state.value_clipboard.is_empty() {
         return paste_properties(s, p);
     }
@@ -787,10 +847,12 @@ pub(crate) fn disk_stats(s: &mut Session, _: &Value) -> Result<Value> {
         "layers": dc.keys(effectcraft_render::disk_cache::Kind::Layer).len(),
         "bytes": st.bytes,
         "maxBytes": st.max_bytes,
+        "limitBytes": st.limit_bytes,
         "hits": st.hits,
         "misses": st.misses,
         "writes": st.writes,
         "evictions": st.evictions,
+        "failed": st.failed,
     }))
 }
 
@@ -813,7 +875,7 @@ fn original_path(s: &Session) -> Option<String> {
 /// importer takes. Anything else (a folder or app bundle, a script, a shortcut) is refused.
 pub(crate) fn openable_original(path: &str) -> std::result::Result<(), String> {
     let media = |p: &std::path::Path| {
-        let ext = p.extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase).unwrap_or_default();
+        let ext = p.extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase).unwrap_or_default();
         crate::media_browser::kind_of(&p.to_string_lossy()).is_some_and(|k| k != "project") || matches!(ext.as_str(), "pdf" | "ai" | "eps")
     };
     let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_else(|| path.to_string());
diff --git a/crates/engine/src/commands/effect.rs b/crates/engine/src/cmd/effect.rs
similarity index 62%
rename from crates/engine/src/commands/effect.rs
rename to crates/engine/src/cmd/effect.rs
index ce773e545..0a1354fd6 100644
--- a/crates/engine/src/commands/effect.rs
+++ b/crates/engine/src/cmd/effect.rs
@@ -186,6 +186,386 @@ fn pick_color(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({"prop": uid, "color": color}))
 }
 
+/// What a Cryptomatte effect has at a layer-space point: the ID with the most coverage in its
+/// Cryptomatte layer, with the aux channels (for the manifest) and the effect's Selection.
+struct CryptoHit {
+    at: (effectcraft_project::ItemId, LayerId, Tick),
+    probe: std::sync::Arc<CryptoProbe>,
+    aux: std::sync::Arc<effectcraft_raster::AuxChannels>,
+    layer: String,
+    hash: u32,
+    selection: String,
+    prop: Uid,
+    /// The Selection has an expression: setting its value wouldn't change what it reads.
+    driven: bool,
+}
+
+impl CryptoHit {
+    fn manifest(&self) -> Option<&[(String, u32)]> {
+        self.aux.manifests.iter().find(|(l, _)| *l == self.layer).map(|(_, m)| m.as_slice())
+    }
+    fn reply(&self, sel: &str) -> Value {
+        let selected = effectcraft_effects::selection_hashes(sel, self.manifest()).contains(&self.hash);
+        let name = self.aux.manifest_name(&self.layer, self.hash);
+        json!({"name": name, "hash": format!("{:08x}", self.hash), "layer": self.layer, "selected": selected})
+    }
+}
+
+/// What a pick at one frame needs besides the point: the aux channels the Cryptomatte effect
+/// reads, its layer, and the effect's input buffer grid (scale, offset). Building it can render
+/// (a precomp's ID pass, the effects before the Cryptomatte effect); a point lookup in it is a
+/// few array reads. The session keeps the last one (see [`Session::crypto_probe_job`]).
+pub struct CryptoProbe {
+    key: ProbeKey,
+    grid: std::result::Result<ProbeGrid, String>,
+}
+
+#[derive(Clone)]
+struct ProbeGrid {
+    aux: std::sync::Arc<effectcraft_raster::AuxChannels>,
+    layer: String,
+    scale: f64,
+    offset: [f64; 2],
+}
+
+/// What a probe depends on: the project revision, the effect (and its index), the frame, the
+/// scale and the render prefs ([`Session::render_opts`]: nested switches, draft shadows).
+#[derive(Clone, Copy, PartialEq, Debug)]
+struct ProbeKey {
+    revision: u64,
+    at: (effectcraft_project::ItemId, LayerId, Uid, usize),
+    frame: ProbeFrame,
+    scale: f64,
+    prefs: (bool, bool),
+}
+
+/// The frame a probe reads. On footage whose masks and effects up to the Cryptomatte effect
+/// don't change over time, its source frame: a still has one, held or remapped frames share
+/// theirs. Otherwise the comp time.
+#[derive(Clone, Copy, PartialEq, Debug)]
+enum ProbeFrame {
+    Source(i64),
+    Comp(Tick),
+}
+
+/// The session's kept probe, and the generation of the latest request: a build stores its
+/// result only while no newer request or edit came since.
+#[derive(Default)]
+pub struct CryptoProbeSlot {
+    probe: Option<std::sync::Arc<CryptoProbe>>,
+    want: Option<ProbeKey>,
+    generation: u64,
+    /// Jobs run (each on its thread), and those that built (not cancelled before they began).
+    jobs: u64,
+    builds: u64,
+}
+
+impl CryptoProbeSlot {
+    /// Drop the kept probe and cancel builds in flight.
+    pub(crate) fn clear(&mut self) {
+        (self.probe, self.want) = (None, None);
+        self.generation += 1;
+    }
+    pub(crate) fn kept(&self) -> bool {
+        self.probe.is_some()
+    }
+    pub(crate) fn builds(&self) -> (u64, u64) {
+        (self.jobs, self.builds)
+    }
+}
+
+/// A probe built off the UI thread into the session's slot.
+pub type CryptoProbeJob = Box<dyn FnOnce() + Send>;
+
+const NO_CRYPTO: &str = "this layer has no Cryptomatte channels (a multi-layer OpenEXR with Cryptomatte, or a 3D precomp)";
+
+impl CryptoProbe {
+    /// `None` when `live` turns false between its stages (a newer request or an edit since):
+    /// a cancelled build stops early and lets go of what it read.
+    fn build(r: &effectcraft_render::Renderer, key: ProbeKey, time: Tick, live: &dyn Fn() -> bool) -> Option<CryptoProbe> {
+        let (cid, lid, _, pos) = key.at;
+        let build = || -> std::result::Result<Option<ProbeGrid>, String> {
+            let comp = r.project.comp(cid).ok_or("no composition")?;
+            let layer = comp.layer(lid).ok_or("no such layer")?;
+            let g = layer.effects().and_then(|fx| fx.groups().nth(pos)).ok_or("no such effect")?;
+            let ctx = effectcraft_render::EvalCtx { project: r.project, comp_id: cid, comp, time, expr: r.expr, footage: None };
+            let params = effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(layer, pr));
+            let want = effectcraft_effects::CRYPTO_LAYERS.get(params.e("layer") as usize).copied().unwrap_or("CryptoAsset");
+            let aux = r.layer_aux(&ctx, layer).ok_or(NO_CRYPTO)?;
+            if !live() {
+                return Ok(None);
+            }
+            let layer_name = aux.resolve_crypto_layer(want).ok_or(NO_CRYPTO)?;
+            // The grid of the effect's input buffer (footage keeps native pixels from 3/4 scale
+            // up, proxies have their own size, earlier effects can pad it), rendered and cached.
+            if !live() {
+                return Ok(None);
+            }
+            let b = r.layer_input(&ctx, layer, pos).ok_or("this layer has no pixels")?;
+            Ok(Some(ProbeGrid { aux, layer: layer_name, scale: b.scale, offset: b.offset }))
+        };
+        // On another thread no command guard runs: a panic becomes the probe's error.
+        let grid = crate::guard::guarded("Reading the Cryptomatte IDs", || Ok(build())).unwrap_or_else(|e| Err(e.to_string()));
+        Some(CryptoProbe { key, grid: grid.transpose()? })
+    }
+}
+
+/// Whether a property in `g` other than `skip` changes over time (keyframes or an expression).
+fn moves(g: &PropGroup, skip: Option<Uid>) -> bool {
+    g.children.iter().any(|c| match c {
+        effectcraft_project::Node::Prop(p) => Some(p.uid) != skip && (p.is_animated() || p.has_expression()),
+        effectcraft_project::Node::Group(g) => moves(g, skip),
+    })
+}
+
+/// [`ProbeFrame`] of the effect at index `pos` of `layer`.
+fn probe_frame(ctx: &effectcraft_render::EvalCtx, layer: &Layer, pos: usize) -> ProbeFrame {
+    let comp = ProbeFrame::Comp(ctx.time);
+    let effectcraft_project::LayerSource::Footage { item } = layer.source else { return comp };
+    let Some(effectcraft_project::ItemKind::Footage(f)) = ctx.project.item(item).map(|i| &i.kind) else { return comp };
+    let fx = layer.effects().into_iter().flat_map(|fx| fx.groups().take(pos + 1));
+    let time_fx = |g: &PropGroup| matches!(&g.kind, GroupKind::Effect { effect } if effect.starts_with("ec.time."));
+    let still = f.kind == effectcraft_project::FootageKind::Still;
+    let blend = !still && ctx.comp.enable_frame_blending && layer.switches.frame_blend != effectcraft_project::FrameBlend::Off;
+    // The Cryptomatte effect's own Selection isn't read by the probe: animated, it keeps it.
+    let own = |i: usize, g: &PropGroup| if i == pos { g.prop("selection").map(|p| p.uid) } else { None };
+    if blend || layer.masks().is_some_and(|m| moves(m, None)) || fx.enumerate().any(|(i, g)| moves(g, own(i, g)) || time_fx(g)) {
+        return comp;
+    }
+    ProbeFrame::Source(if still { 0 } else { effectcraft_render::frame_position(ctx.source_time(layer), f.frame_rate).0 })
+}
+
+/// The Cryptomatte effect `{layer?, effect?, scale?, time?}` names: its probe key, the comp
+/// time, its layer, group and Selection property.
+#[allow(clippy::type_complexity)]
+fn probe_key<'a>(s: &'a Session, p: &Value, cmd: &str) -> Result<(ProbeKey, Tick, &'a Layer, &'a PropGroup, &'a effectcraft_project::Property)> {
+    let (cid, lid, fx_uid) = find_fx(s, p, cmd)?;
+    let scale = f_p(p, "scale").unwrap_or(1.0);
+    if !(scale.is_finite() && scale > 0.0 && scale <= 1.0) {
+        return Err(bad(cmd, "`scale` is the preview's resolution factor, above 0 and at most 1"));
+    }
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let layer = comp.layer(lid).ok_or(EngineError::NoComp)?;
+    let fx = layer.effects().ok_or_else(|| bad(cmd, "no effects"))?;
+    let pos = fx.groups().position(|g| g.uid == fx_uid).ok_or_else(|| bad(cmd, "no such effect"))?;
+    let g = fx.groups().nth(pos).ok_or_else(|| bad(cmd, "no such effect"))?;
+    let prop = g.prop("selection").filter(|_| g.match_id == "ec.3d.cryptomatte").ok_or_else(|| bad(cmd, "not a Cryptomatte effect"))?;
+    let time = super::time_p(s, p, Some(comp));
+    let ctx = effectcraft_render::EvalCtx { project: &s.project, comp_id: cid, comp, time, expr: s.expr.as_deref(), footage: None };
+    let frame = probe_frame(&ctx, layer, pos);
+    let o = s.render_opts(Default::default());
+    let prefs = (o.nested_switches, o.draft_shadows);
+    Ok((ProbeKey { revision: s.revision, at: (cid, lid, fx_uid, pos), frame, scale, prefs }, time, layer, g, prop))
+}
+
+/// The kept probe if it answers for the current revision, for [`keep_crypto_probe`] (taken
+/// before an undo, redo or history jump).
+pub(crate) fn kept_crypto_probe(s: &Session) -> Option<std::sync::Arc<CryptoProbe>> {
+    s.crypto_probe.lock().ok()?.probe.clone().filter(|p| p.key.revision == s.revision)
+}
+
+/// After an undo, redo or history jump from `before` (which dropped the probe): `kept`, the
+/// probe from before, still answers when only Cryptomatte Selections changed, which the probe
+/// doesn't read (undoing a pick, as the pick itself keeps it).
+pub(crate) fn keep_crypto_probe(s: &Session, kept: Option<std::sync::Arc<CryptoProbe>>, before: &effectcraft_project::Project) {
+    let Some(p) = kept else { return };
+    if !only_crypto_selections_differ(before, &s.project) {
+        return;
+    }
+    if let Ok(mut slot) = s.crypto_probe.lock()
+        && slot.probe.is_none()
+    {
+        slot.probe = Some(std::sync::Arc::new(CryptoProbe { key: ProbeKey { revision: s.revision, ..p.key }, grid: p.grid.clone() }));
+    }
+}
+
+/// Whether projects `a` and `b` differ at most in the Selections of Cryptomatte effects.
+fn only_crypto_selections_differ(a: &effectcraft_project::Project, b: &effectcraft_project::Project) -> bool {
+    let mut x = a.clone();
+    for (cid, it) in x.items.iter_mut() {
+        let effectcraft_project::ItemKind::Comp(c) = &mut it.kind else { continue };
+        let sels: Vec<(LayerId, Uid)> = c
+            .layers
+            .iter()
+            .flat_map(|l| {
+                l.effects()
+                    .into_iter()
+                    .flat_map(|fx| fx.groups())
+                    .filter(|g| g.match_id == "ec.3d.cryptomatte")
+                    .filter_map(move |g| g.get("selection").map(|p| (l.id, p.uid)))
+            })
+            .collect();
+        if sels.is_empty() {
+            continue;
+        }
+        let Some(bc) = b.comp(*cid) else { return false };
+        let c = std::sync::Arc::make_mut(c);
+        for (lid, uid) in sels {
+            let Some(src) = bc.layer(lid).and_then(|l| l.props.find(uid)) else { return false };
+            if let Some(dst) = c.layer_mut(lid).and_then(|l| l.props.find_mut(uid)) {
+                *dst = src.clone();
+            }
+        }
+    }
+    x.same_content(b)
+}
+
+/// The session's probe when it has `key`'s.
+fn cached_probe(s: &Session, key: ProbeKey) -> Option<std::sync::Arc<CryptoProbe>> {
+    s.crypto_probe.lock().ok()?.probe.clone().filter(|p| p.key == key)
+}
+
+/// [`Session::crypto_probe_ready`].
+pub(crate) fn crypto_probe_ready(s: &Session, p: &Value) -> Result<bool> {
+    let (key, ..) = probe_key(s, p, "effect.cryptomatteAt")?;
+    Ok(cached_probe(s, key).is_some())
+}
+
+/// [`Session::crypto_probe_job`].
+pub(crate) fn crypto_probe_job(s: &Session, p: &Value) -> Result<Option<CryptoProbeJob>> {
+    let (key, time, ..) = probe_key(s, p, "effect.cryptomatteAt")?;
+    let generation = {
+        let mut slot = s.crypto_probe.lock().map_err(|_| EngineError::Other("the Cryptomatte probe is unavailable".into()))?;
+        if slot.probe.as_ref().is_some_and(|p| p.key == key) {
+            return Ok(None);
+        }
+        // A request for another probe cancels the one in flight.
+        if slot.want != Some(key) {
+            (slot.want, slot.generation) = (Some(key), slot.generation + 1);
+        }
+        slot.generation
+    };
+    let (project, footage, expr, cache, accel, slot) =
+        (s.project.clone(), s.footage.clone(), s.expr.clone(), s.layer_cache.clone(), s.accel.clone(), s.crypto_probe.clone());
+    let opts = s.render_opts(effectcraft_render::RenderOpts { scale: key.scale, ..Default::default() });
+    // The slot while this is still the newest request.
+    fn current(slot: &std::sync::Mutex<CryptoProbeSlot>, generation: u64) -> Option<std::sync::MutexGuard<'_, CryptoProbeSlot>> {
+        slot.lock().ok().filter(|s| s.generation == generation)
+    }
+    Ok(Some(Box::new(move || {
+        match slot.lock() {
+            Ok(mut s) if s.generation == generation => (s.jobs, s.builds) = (s.jobs + 1, s.builds + 1),
+            Ok(mut s) => return s.jobs += 1,
+            Err(_) => return,
+        }
+        let mut r = effectcraft_render::Renderer::new(&project, footage.as_ref(), opts);
+        r.expr = expr.as_deref();
+        r.cache = Some(&cache);
+        r.accel = accel.as_deref();
+        // Checked between its stages too: a superseded build stops at the next one.
+        let Some(probe) = CryptoProbe::build(&r, key, time, &|| current(&slot, generation).is_some()) else { return };
+        let probe = std::sync::Arc::new(probe);
+        // Only the newest request's result, and never over a newer probe.
+        if let Some(mut s) = current(&slot, generation)
+            && s.probe.as_ref().is_none_or(|p| p.key.revision <= key.revision)
+        {
+            s.probe = Some(probe);
+        }
+    })))
+}
+
+/// What a pick finds at a point.
+enum Hit {
+    /// `probeOnly` and the probe isn't built yet.
+    Pending,
+    Nothing,
+    Id(CryptoHit),
+}
+
+/// The ID under `{x, y}` (effect space, which is layer space on footage and precomp layers) for
+/// the Cryptomatte effect `{layer?, effect?}`, from the aux channels its render reads. The point
+/// snaps to the centre of the pixel the effect's input buffer samples in a render at `scale`
+/// (the viewer's resolution). Without a kept probe it builds one, unless `probeOnly`.
+fn crypto_hit(s: &Session, p: &Value, cmd: &str) -> Result<Hit> {
+    let (key, time, layer, g, prop) = probe_key(s, p, cmd)?;
+    let (Some(x), Some(y)) = (f_p(p, "x"), f_p(p, "y")) else { return Err(bad(cmd, "missing `x` / `y` (layer pixels)")) };
+    let probe = match cached_probe(s, key) {
+        Some(probe) => probe,
+        None if b_p(p, "probeOnly").unwrap_or(false) => return Ok(Hit::Pending),
+        None => {
+            let r = s.renderer(effectcraft_render::RenderOpts { scale: key.scale, ..Default::default() });
+            if let Ok(mut slot) = s.crypto_probe.lock() {
+                slot.clear();
+                slot.builds += 1;
+            }
+            // (Never cancelled here: nothing else runs on this thread.)
+            let Some(probe) = CryptoProbe::build(&r, key, time, &|| true).map(std::sync::Arc::new) else { return Ok(Hit::Pending) };
+            if let Ok(mut slot) = s.crypto_probe.lock() {
+                slot.probe = Some(probe.clone());
+            }
+            probe
+        }
+    };
+    let b = probe.grid.as_ref().map_err(|e| bad(cmd, e.clone()))?;
+    let (bs, o) = (b.scale, b.offset);
+    // The centre of its pixel under the point, at the aux point the effect reads there.
+    let [ax, ay] = effectcraft_effects::aux_point(bs, o, [(x * bs + o[0]).floor() + 0.5, (y * bs + o[1]).floor() + 0.5]);
+    let Some(hash) = b.aux.index_at(ax, ay).and_then(|i| b.aux.crypto_id_at(&b.layer, i)) else { return Ok(Hit::Nothing) };
+    let (cid, lid, ..) = key.at;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let ctx = effectcraft_render::EvalCtx { project: &s.project, comp_id: cid, comp, time, expr: s.expr.as_deref(), footage: None };
+    let selection = effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(layer, pr)).s("selection").to_string();
+    let driven = prop.expr.as_ref().is_some_and(|e| e.enabled);
+    let (aux, layer_name) = (b.aux.clone(), b.layer.clone());
+    Ok(Hit::Id(CryptoHit { at: (cid, lid, time), probe: probe.clone(), aux, layer: layer_name, hash, selection, prop: prop.uid, driven }))
+}
+
+/// `effect.cryptomatteAt`: the ID under a point, for the viewer's hover hint. The first call per
+/// frame renders the effect's input to learn its pixel grid (kept afterwards); with `probeOnly`
+/// it answers `{pending: true}` instead.
+fn crypto_at(s: &mut Session, p: &Value) -> Result<Value> {
+    Ok(match crypto_hit(s, p, "effect.cryptomatteAt")? {
+        Hit::Pending => json!({"pending": true}),
+        Hit::Nothing => Value::Null,
+        Hit::Id(h) => h.reply(&h.selection),
+    })
+}
+
+/// The Cryptomatte eyedropper: replace the effect's Selection with the ID under a point, add it
+/// or remove it, in one undo step at the time it was read (none when its meaning stays).
+fn pick_crypto(s: &mut Session, p: &Value) -> Result<Value> {
+    use effectcraft_effects::crypto_select::{PickMode, edit_selection, token_for};
+    let cmd = "effect.pickCryptomatte";
+    let mode = match str_p(p, "mode").unwrap_or("replace") {
+        "replace" => PickMode::Replace,
+        "add" => PickMode::Add,
+        "remove" => PickMode::Remove,
+        m => return Err(bad(cmd, format!("unknown `mode` {m:?} (replace, add or remove)"))),
+    };
+    let h = match crypto_hit(s, p, cmd)? {
+        Hit::Id(h) => h,
+        Hit::Pending => return Ok(json!({"pending": true, "changed": false})),
+        Hit::Nothing => return Err(bad(cmd, "no Cryptomatte ID there (empty or outside the layer)")),
+    };
+    if h.driven {
+        return Err(bad(cmd, "the Selection is driven by an expression; disable it to pick"));
+    }
+    let m = h.manifest();
+    let sel = edit_selection(&h.selection, &token_for(h.aux.manifest_name(&h.layer, h.hash), h.hash, m), h.hash, mode, m);
+    let changed = sel != h.selection;
+    if changed {
+        let (cid, lid, t) = h.at;
+        s.execute("prop.set", json!({"comp": cid.0, "layer": lid.0, "prop": h.prop, "value": sel, "time": t.seconds(), "timeBase": "comp"}))?;
+        // The step says what made it (Edit ▸ Undo Pick Cryptomatte, the History panel), not
+        // "Change Property" like any other edit. (A changed Selection is always a new step.)
+        if let Some(step) = s.history.undo.last_mut() {
+            step.0 = "Pick Cryptomatte".into();
+        }
+        // Only the Selection changed, which the probe doesn't read: the next hover keeps it.
+        // (The edit dropped it; a probe built since is newer.)
+        if let Ok(mut slot) = s.crypto_probe.lock()
+            && slot.probe.is_none()
+        {
+            let key = ProbeKey { revision: s.revision, ..h.probe.key };
+            slot.probe = Some(std::sync::Arc::new(CryptoProbe { key, grid: h.probe.grid.clone() }));
+        }
+    }
+    let mut out = h.reply(&sel);
+    out["selection"] = json!(sel);
+    out["changed"] = json!(changed);
+    Ok(out)
+}
+
 fn remove(s: &mut Session, p: &Value) -> Result<Value> {
     let cid = super::comp_id(s, p)?;
     let fx = effects_p(s, p, "effect.remove")?;
@@ -632,6 +1012,21 @@ pub fn specs() -> Vec<CommandSpec> {
             has_layers,
             pick_color
         ),
+        cmd!(
+            "effect.pickCryptomatte",
+            "Pick Cryptomatte",
+            [],
+            None,
+            "{layer?, effect?: index|uid|name, x, y (effect space), mode?: replace|add|remove (default replace), scale? (preview resolution, default 1), time?, probeOnly?} → {name, hash, layer, selection, changed, selected} | {pending} — edits the Cryptomatte effect's Selection with the ID under the point",
+            has_layers,
+            pick_crypto
+        ),
+        crate::query!(
+            "effect.cryptomatteAt",
+            "Cryptomatte At",
+            "{layer?, effect?: index|uid|name, x, y (effect space), scale?, time?, probeOnly?: bool (don't build the probe)} → {name, hash, layer, selected} | {pending} | null — the Cryptomatte ID under the point",
+            crypto_at
+        ),
         cmd!("effect.applyLast", "Last Effect", ["Effect"], Some("Cmd+Alt+Shift+E"), "{layers?}", has_layers, last),
         cmd!("effect.removeAll", "Remove All", ["Effect"], Some("Cmd+Shift+E"), "{layers?}", has_layers, remove_all),
         cmd!("effect.remove", "Remove Effect", [], None, "{layer?, effect: index|uid|name}", has_layers, remove),
diff --git a/crates/engine/src/cmd/enabled.rs b/crates/engine/src/cmd/enabled.rs
new file mode 100644
index 000000000..fb28b60c4
--- /dev/null
+++ b/crates/engine/src/cmd/enabled.rs
@@ -0,0 +1,38 @@
+use super::{EngineError, Result, Session, Value};
+
+// ---------- enablement ----------
+
+pub fn always(_: &Session) -> std::result::Result<(), String> {
+    Ok(())
+}
+
+pub(crate) fn has_comp(s: &Session) -> std::result::Result<(), String> {
+    s.active_comp().map(|_| ()).ok_or_else(|| "no composition is open".into())
+}
+
+pub(crate) fn has_layers(s: &Session) -> std::result::Result<(), String> {
+    has_comp(s)?;
+    if s.state.selected_layers.is_empty() { Err("select a layer first".into()) } else { Ok(()) }
+}
+
+pub(crate) fn has_keys(s: &Session) -> std::result::Result<(), String> {
+    has_comp(s)?;
+    if s.state.selected_keys.is_empty() { Err("select keyframes first".into()) } else { Ok(()) }
+}
+
+pub(crate) fn has_project_selection(s: &Session) -> std::result::Result<(), String> {
+    if s.state.project_selection.is_empty() { Err("select an item in the Project panel first".into()) } else { Ok(()) }
+}
+
+/// Disabled-command enablement (menu entries whose implementation lands with another milestone;
+/// none are left, kept for future stubs).
+#[allow(dead_code)]
+pub(crate) fn not_yet(_: &Session) -> std::result::Result<(), String> {
+    Err("not available yet in EffectCraft".into())
+}
+
+/// `run` of a not-yet-available command.
+#[allow(dead_code)]
+pub(crate) fn not_yet_run(_: &mut Session, _: &Value) -> Result<Value> {
+    Err(EngineError::Other("not available yet in EffectCraft".into()))
+}
diff --git a/crates/engine/src/commands/essential.rs b/crates/engine/src/cmd/essential.rs
similarity index 100%
rename from crates/engine/src/commands/essential.rs
rename to crates/engine/src/cmd/essential.rs
diff --git a/crates/engine/src/commands/expr_tools.rs b/crates/engine/src/cmd/expr_tools.rs
similarity index 100%
rename from crates/engine/src/commands/expr_tools.rs
rename to crates/engine/src/cmd/expr_tools.rs
diff --git a/crates/engine/src/commands/file.rs b/crates/engine/src/cmd/file.rs
similarity index 97%
rename from crates/engine/src/commands/file.rs
rename to crates/engine/src/cmd/file.rs
index 760c1f223..b3922c7d6 100644
--- a/crates/engine/src/commands/file.rs
+++ b/crates/engine/src/cmd/file.rs
@@ -404,6 +404,13 @@ fn prepare_import(s: &mut Session, p: &Value) -> Result<PendingImport> {
             }
         }
         paths = rest;
+        // Composition imports already made their sources, so they bypass add_footage's
+        // probed-footage refresh. Refresh them before any background probe job starts (#1070).
+        for id in &items {
+            if let Some(ItemKind::Footage(f)) = s.project.item(ItemId(*id)).map(|it| &it.kind) {
+                s.forget_decoded(f);
+            }
+        }
     }
     // Numbered stills as image sequences (the Import dialog's "<format> Sequence" and Force
     // Alphabetical Order), at `frameRate` or Settings ▸ Import ▸ Sequence Footage.
@@ -553,7 +560,7 @@ pub const DATA_EXTENSIONS: &[&str] = &["json", "csv", "tsv"];
 
 /// A data footage item for `path` (JSON / CSV / TSV), `None` for other files.
 pub(crate) fn data_footage(services: &dyn crate::Services, path: &str) -> Option<std::result::Result<effectcraft_project::Footage, String>> {
-    let ext = std::path::Path::new(path).extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase();
+    let ext = std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_ascii_lowercase();
     if !DATA_EXTENSIONS.contains(&ext.as_str()) {
         return None;
     }
@@ -658,6 +665,15 @@ fn project_settings(s: &mut Session, p: &Value) -> Result<Value> {
             proj.settings.time_display = effectcraft_project::TimeDisplayStyle::parse(t)
                 .ok_or_else(|| bad("file.projectSettings", format!("timeDisplay: timecode|frames|feet35|feet16, not `{t}`")))?;
         }
+        if let Some(f) = p.get("frameStart") {
+            // Frame Count: After Effects offers Start at 0 and Start at 1 only. Scripts and dialog
+            // number fields may send `1.0`.
+            proj.settings.frame_start = match f.as_f64() {
+                Some(0.0) => 0,
+                Some(1.0) => 1,
+                _ => return Err(bad(cmd, format!("frameStart: 0|1, not `{f}`"))),
+            };
+        }
         Ok(())
     })?;
     Ok(serde_json::to_value(&s.project.settings).unwrap_or_default())
@@ -738,7 +754,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Project Settings...",
             ["File"],
             Some("Cmd+Alt+Shift+K"),
-            "{bitDepth?: 8|16|32, colorEngine?: adobe|ocio, workingSpace?: none|srgb|rec709|rec2020|p3|acescg|aces2065, workingGamma?: 2.2|2.4 (with no working space), linearize?, blendLinear?, hdr?: clip|compand|toneMap, outputSpace?: srgb|rec709|rec2020|p3|rec2100pq|rec2100hlg, renderer?: gpu|software, timeDisplay?: timecode|frames|feet35|feet16}",
+            "{bitDepth?: 8|16|32, colorEngine?: adobe|ocio, workingSpace?: none|srgb|rec709|rec2020|p3|acescg|aces2065, workingGamma?: 2.2|2.4 (with no working space), linearize?, blendLinear?, hdr?: clip|compand|toneMap, outputSpace?: srgb|rec709|rec2020|p3|rec2100pq|rec2100hlg, renderer?: gpu|software, timeDisplay?: timecode|frames|feet35|feet16, frameStart?: 0|1 (Frame Count: Start at 0 / Start at 1)}",
             always,
             project_settings
         ),
diff --git a/crates/engine/src/commands/file_more.rs b/crates/engine/src/cmd/file_more.rs
similarity index 96%
rename from crates/engine/src/commands/file_more.rs
rename to crates/engine/src/cmd/file_more.rs
index 74a86e1d8..c9d581581 100644
--- a/crates/engine/src/commands/file_more.rs
+++ b/crates/engine/src/cmd/file_more.rs
@@ -430,6 +430,20 @@ fn collect_files(s: &mut Session, p: &Value) -> Result<Value> {
 /// array or JSON lines of `{"command": id, "params": {…}}` (also accepts the control channel's
 /// `{"method": "engine.execute", "params": {"id", "params"}}`).
 fn run_script(s: &mut Session, p: &Value) -> Result<Value> {
+    // File ▸ Scripts ▸ Recent Script Files ▸ <script> (0 is the most recent).
+    if let Some(i) = p.get("recent") {
+        let i = i.as_u64().ok_or_else(|| bad("file.runScript", format!("`recent` must be an index, not {i}")))?;
+        let script = match s.prefs.recent_scripts.get(usize::try_from(i).unwrap_or(usize::MAX)) {
+            Some(x) => x.clone(),
+            None if s.prefs.recent_scripts.is_empty() => return Err(bad("file.runScript", "no recent script files")),
+            None => return Err(bad("file.runScript", format!("no recent script file #{i}"))),
+        };
+        let q = match script {
+            crate::prefs::RecentScript::Path(path) => json!({"path": path}),
+            crate::prefs::RecentScript::Name(name) => json!({"name": name}),
+        };
+        return run_script(s, &q);
+    }
     // File ▸ Scripts ▸ <installed or sample script>.
     if let Some(name) = str_p(p, "name")
         && p.get("path").is_none()
@@ -446,15 +460,22 @@ fn run_script(s: &mut Session, p: &Value) -> Result<Value> {
             return Err(bad("file.runScript", JSXBIN));
         }
         let bytes = s.services.read_file(path).map_err(|e| EngineError::Other(format!("cannot read {path}: {e}")))?;
+        let full = s.services.full_path(path);
         let code = String::from_utf8_lossy(&bytes).to_string();
         let name = std::path::Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.to_string());
         let out = run_js(s, &code, path, false)?;
-        return report_js(s, &name, out);
+        let result = report_js(s, &name, out)?;
+        if let Some(full) = full {
+            remember_script(s, crate::prefs::RecentScript::Path(full));
+        }
+        return Ok(result);
     }
+    let mut script_path = None;
     let steps: Vec<Value> = match (p.get("steps"), str_p(p, "path")) {
         (Some(Value::Array(a)), _) => a.clone(),
         (_, Some(path)) => {
             let bytes = s.services.read_file(path).map_err(|e| EngineError::Other(format!("cannot read {path}: {e}")))?;
+            script_path = s.services.full_path(path);
             let text = String::from_utf8_lossy(&bytes).to_string();
             match serde_json::from_str::<Value>(&text) {
                 Ok(Value::Array(a)) => a,
@@ -487,9 +508,19 @@ fn run_script(s: &mut Session, p: &Value) -> Result<Value> {
         let r = r.map_err(|e| EngineError::Other(format!("step {} ({id}): {e}", i + 1)))?;
         results.push(r);
     }
+    if let Some(path) = script_path {
+        remember_script(s, crate::prefs::RecentScript::Path(path));
+    }
     Ok(json!({"steps": results.len(), "results": results}))
 }
 
+/// Remember a script that runs for File ▸ Scripts ▸ Recent Script Files.
+pub(super) fn remember_script(s: &mut Session, script: crate::prefs::RecentScript) {
+    s.prefs.push_recent_script(script);
+    s.save_prefs();
+    s.prefs_revision += 1;
+}
+
 /// `.jsx` / `.js` (and `.jsxbin`, rejected) are JavaScript; `.json` / `.jsonl` / other files are
 /// command scripts.
 fn is_js_script(path: &str) -> bool {
@@ -1017,7 +1048,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Run Script File...",
             ["File", "Scripts"],
             None,
-            "{path (.jsx/.js JavaScript, or a .jsonl/.json command script) | name (an installed or sample script, see file.scripts.list) | steps: [{command, params}]}",
+            "{path (.jsx/.js JavaScript, or a .jsonl/.json command script) | name (an installed or sample script, see file.scripts.list) | recent: index (File ▸ Scripts ▸ Recent Script Files, 0 = the most recent) | steps: [{command, params}]}",
             always,
             run_script
         ),
diff --git a/crates/engine/src/commands/focus.rs b/crates/engine/src/cmd/focus.rs
similarity index 100%
rename from crates/engine/src/commands/focus.rs
rename to crates/engine/src/cmd/focus.rs
diff --git a/crates/engine/src/commands/footage_panel.rs b/crates/engine/src/cmd/footage_panel.rs
similarity index 100%
rename from crates/engine/src/commands/footage_panel.rs
rename to crates/engine/src/cmd/footage_panel.rs
diff --git a/crates/engine/src/commands/frame_export.rs b/crates/engine/src/cmd/frame_export.rs
similarity index 97%
rename from crates/engine/src/commands/frame_export.rs
rename to crates/engine/src/cmd/frame_export.rs
index c939d67e1..baad9b6ef 100644
--- a/crates/engine/src/commands/frame_export.rs
+++ b/crates/engine/src/cmd/frame_export.rs
@@ -140,9 +140,10 @@ fn srgb_to_linear(c: f32) -> f32 {
     if c <= 0.04045 { c / 12.92 } else { ((c + 0.055) / 1.055).powf(2.4) }
 }
 
-/// A unique EXR layer name (no dots: they separate the layer from the channel).
+/// A unique EXR layer name (no dots: they separate the layer from the channel). Printable ASCII only:
+/// the `exr` crate panics on characters it cannot store in a channel name (#1702).
 fn exr_name(name: &str, used: &mut Vec<String>) -> String {
-    let base: String = name.chars().map(|c| if c == '.' || c.is_control() { '_' } else { c }).collect();
+    let base: String = name.chars().map(|c| if c == '.' || !(c == ' ' || c.is_ascii_graphic()) { '_' } else { c }).collect();
     let base = if base.trim().is_empty() { "Layer".to_string() } else { base };
     let mut n = base.clone();
     let mut k = 2;
diff --git a/crates/engine/src/commands/frontend.rs b/crates/engine/src/cmd/frontend.rs
similarity index 100%
rename from crates/engine/src/commands/frontend.rs
rename to crates/engine/src/cmd/frontend.rs
diff --git a/crates/engine/src/commands/help.rs b/crates/engine/src/cmd/help.rs
similarity index 100%
rename from crates/engine/src/commands/help.rs
rename to crates/engine/src/cmd/help.rs
diff --git a/crates/engine/src/commands/import_project.rs b/crates/engine/src/cmd/import_project.rs
similarity index 100%
rename from crates/engine/src/commands/import_project.rs
rename to crates/engine/src/cmd/import_project.rs
diff --git a/crates/engine/src/commands/key_labels.rs b/crates/engine/src/cmd/key_labels.rs
similarity index 100%
rename from crates/engine/src/commands/key_labels.rs
rename to crates/engine/src/cmd/key_labels.rs
diff --git a/crates/engine/src/commands/key_transform.rs b/crates/engine/src/cmd/key_transform.rs
similarity index 100%
rename from crates/engine/src/commands/key_transform.rs
rename to crates/engine/src/cmd/key_transform.rs
diff --git a/crates/engine/src/commands/keys_more.rs b/crates/engine/src/cmd/keys_more.rs
similarity index 100%
rename from crates/engine/src/commands/keys_more.rs
rename to crates/engine/src/cmd/keys_more.rs
diff --git a/crates/engine/src/cmd/layer.rs b/crates/engine/src/cmd/layer.rs
new file mode 100644
index 000000000..f6d2feb04
--- /dev/null
+++ b/crates/engine/src/cmd/layer.rs
@@ -0,0 +1,212 @@
+//! Layer menu.
+
+use effectcraft_color::{BlendMode, Label};
+use effectcraft_keyframe::{Justify, TextDoc, Value as KV};
+use effectcraft_project::build::{self, Ids};
+use effectcraft_project::{
+    Comp, FootageKind, FrameBlend, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, MaskMode, MatteKind, Node, Project, PropGroup, Quality, Solid,
+    TrackMatte, limits,
+};
+use effectcraft_time::Tick;
+use serde_json::{Value, json};
+
+use super::{CommandSpec, b_p, bad, comp_id, f_p, has_comp, has_layers, layer_mut, layer_p, layers_p, merge_p, resolve_layer, str_p, unlocked};
+use crate::{EngineError, Result, Session, cmd};
+
+mod contents;
+mod create;
+mod parent;
+mod replace;
+mod select;
+mod switches;
+mod timing;
+mod transform;
+
+use contents::{add_mask, add_shape_item, mask_props, set_text};
+use create::{add_item, new_adjustment, new_null, new_shape, new_solid, new_text};
+pub(crate) use create::{color_p, index_p, insert_layer, insert_layer_at, place, position_p};
+pub(crate) use parent::parent_fixes;
+use parent::set_parent;
+use replace::{has_replace_source, replace_source};
+use select::{select, select_next, select_prev, select_step};
+use switches::{blend, rename, set_comment, set_switch, track_matte};
+use timing::{arrange, move_frames, precompose, slip, timing};
+use transform::{has_layer_settings, layer_settings, transform_op};
+pub(crate) use transform::{offset_position, transform_default, update_position};
+
+/// `p` with `key` set.
+fn with(p: &Value, key: &str, v: Value) -> Value {
+    let mut p = if p.is_object() { p.clone() } else { json!({}) };
+    p[key] = v;
+    p
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!(
+            "layer.newText",
+            "Text",
+            ["Layer", "New"],
+            Some("Cmd+Alt+Shift+T"),
+            "{text?, name? (layer name; default the text), position? [x,y], box? [x,y,w,h] (paragraph text, comp space), vertical?, edit? (start editing), font?, style?, size?, fill?, stroke?, applyFill?, applyStroke?, strokeWidth?, tracking?, leading?, baselineShift?, hScale?, vScale?, tsume?, fauxBold?, fauxItalic?, allCaps?, smallCaps?, baseline?, superscript?, subscript?, kerning?, ligatures?, justify?, indentLeft?, indentRight?, indentFirst?, spaceBefore?, spaceAfter?, direction?, composer?, hangingPunctuation?, strokeOverFill?} (attributes as layer.setText)",
+            has_comp,
+            new_text
+        ),
+        cmd!("layer.newSolid", "Solid...", ["Layer", "New"], Some("Cmd+Y"), "{name?, color? #hex|[r,g,b], width?, height?, pixelAspect?}", has_comp, new_solid),
+        cmd!("layer.newNull", "Null Object", ["Layer", "New"], Some("Cmd+Alt+Shift+Y"), "{name?}", has_comp, new_null),
+        cmd!(
+            "layer.newShape",
+            "Shape Layer",
+            ["Layer", "New"],
+            None,
+            "{kind?: rect|rounded|ellipse|star|polygon|none, name?, size?, fill?, fillType?, fillBlend?, fillOpacity?, stroke?, strokeType?, strokeBlend?, strokeOpacity?, strokeWidth?, position?}",
+            has_comp,
+            new_shape
+        ),
+        cmd!("layer.newAdjustment", "Adjustment Layer", ["Layer", "New"], Some("Cmd+Alt+Y"), "{name?}", has_comp, new_adjustment),
+        cmd!(
+            "layer.settings",
+            "Layer Settings...",
+            ["Layer"],
+            Some("Cmd+Shift+Y"),
+            "{layer?, name?, color?, width?, height?, pixelAspect?, affectAll?: bool (default true; false gives this layer its own copy of a solid other layers use)} → {layer, solid?}",
+            has_layer_settings,
+            layer_settings
+        ),
+        cmd!(
+            "layer.addItem",
+            "Add Footage to Comp",
+            ["File"],
+            Some("Cmd+/"),
+            "{item: id|name, time? (s, the In point), index? (1-based stack position; default above the selected layer), position? ([x, y] comp px; default the centre), duration? (s, for a still)}",
+            has_comp,
+            add_item
+        ),
+        cmd!(
+            "layer.replaceSource",
+            "Replace Layer Source",
+            [],
+            Some("Cmd+Alt+/"),
+            "{comp?, layers?, layer?, item?: id|name (default the Project panel selection), fixExpressions?: bool (accepted for After Effects compatibility)} → {layers, item}",
+            has_replace_source,
+            replace_source
+        ),
+        cmd!("layer.select", "Select Layers", [], None, "{layers: [id|name|#n], add?, toggle?}", has_comp, select),
+        cmd!("layer.selectNext", "Select Next Layer", [], Some("Cmd+ArrowDown"), "{add?}", has_comp, select_next),
+        cmd!("layer.selectPrevious", "Select Previous Layer", [], Some("Cmd+ArrowUp"), "{add?}", has_comp, select_prev),
+        cmd!("layer.extendSelectionNext", "Extend Selection to Next Layer", [], Some("Cmd+Shift+ArrowDown"), "{}", has_comp, |s, _| select_step(
+            s,
+            &json!({"add": true}),
+            1
+        )),
+        cmd!("layer.extendSelectionPrevious", "Extend Selection to Previous Layer", [], Some("Cmd+Shift+ArrowUp"), "{}", has_comp, |s, _| select_step(
+            s,
+            &json!({"add": true}),
+            -1
+        )),
+        cmd!(
+            "layer.setSwitch",
+            "Layer Switch",
+            [],
+            None,
+            "{layers?, switch: video|audio|solo|lock|shy|collapse|quality|fx|frameBlend|motionBlur|adjustment|threeD|guide|preserveTransparency, value?, merge?, others? (the named layers alone: the other layers get the opposite state, or come back)}",
+            has_layers,
+            set_switch
+        ),
+        cmd!("layer.rename", "Rename", [], Some("Enter"), "{layer?, name}", has_layers, rename),
+        cmd!("layer.setComment", "Layer Comment", [], None, "{layers?, comment}", has_layers, set_comment),
+        cmd!("layer.setBlendMode", "Blending Mode", [], None, "{layers?, mode?: Normal|Multiply|Screen|…, step?: ±1}", has_layers, blend),
+        cmd!(
+            "layer.setTrackMatte",
+            "Track Matte",
+            [],
+            None,
+            "{layer?, matte: layer|null, kind?: alpha|alphaInverted|luma|lumaInverted}",
+            has_layers,
+            track_matte
+        ),
+        cmd!("layer.setParent", "Parent", [], None, "{layers?, parent: layer|null, compensate?: bool}", has_layers, set_parent),
+        cmd!(
+            "layer.timing",
+            "Layer Timing",
+            [],
+            None,
+            "{layers?, op?: moveInToTime|moveOutToTime|moveInToStart|moveOutToEnd|trimInToTime|trimOutToTime, delta?, start?, in?, out?, inDelta?, outDelta? (seconds, per layer), merge?}",
+            has_layers,
+            timing
+        ),
+        cmd!("layer.moveInToStart", "Move Layer In Point to Beginning of Comp", [], Some("Alt+Home"), "{layers?}", has_layers, |s, p| timing(
+            s,
+            &with(p, "op", json!("moveInToStart"))
+        )),
+        cmd!("layer.moveOutToEnd", "Move Layer Out Point to End of Comp", [], Some("Alt+End"), "{layers?}", has_layers, |s, p| timing(
+            s,
+            &with(p, "op", json!("moveOutToEnd"))
+        )),
+        cmd!("layer.moveEarlier", "Move Layers 1 Frame Earlier", [], Some("Alt+PageUp"), "{layers?}", has_layers, |s, p| move_frames(s, p, -1)),
+        cmd!("layer.moveLater", "Move Layers 1 Frame Later", [], Some("Alt+PageDown"), "{layers?}", has_layers, |s, p| move_frames(s, p, 1)),
+        cmd!("layer.moveEarlier10", "Move Layers 10 Frames Earlier", [], Some("Alt+Shift+PageUp"), "{layers?}", has_layers, |s, p| move_frames(s, p, -10)),
+        cmd!("layer.moveLater10", "Move Layers 10 Frames Later", [], Some("Alt+Shift+PageDown"), "{layers?}", has_layers, |s, p| move_frames(s, p, 10)),
+        cmd!("layer.slip", "Slip Edit", [], None, "{layers?, delta? (seconds) | frames?, merge?}", has_layers, slip),
+        cmd!("layer.slipBack", "Slip Edit 1 Frame Earlier", [], None, "{layers?}", has_layers, |s, p| {
+            let mut p = p.clone();
+            p["frames"] = json!(-1);
+            slip(s, &p)
+        }),
+        cmd!("layer.slipForward", "Slip Edit 1 Frame Later", [], None, "{layers?}", has_layers, |s, p| {
+            let mut p = p.clone();
+            p["frames"] = json!(1);
+            slip(s, &p)
+        }),
+        cmd!("layer.arrange", "Arrange", ["Layer", "Arrange"], None, "{layers?, to: front|forward|backward|back, index?, above?: layer}", has_layers, arrange),
+        cmd!(
+            "layer.precompose",
+            "Pre-compose...",
+            ["Layer"],
+            Some("Cmd+Shift+C"),
+            "{layers?, name?, mode?: move|leave, adjustDuration?, open?}",
+            has_layers,
+            precompose
+        ),
+        cmd!(
+            "layer.addMask",
+            "New Mask",
+            ["Layer", "Mask"],
+            Some("Cmd+Shift+N"),
+            "{layer?, shape?: rect|ellipse|rounded|polygon|star, rect? [x,y,w,h] (layer space; a polygon or star fits its width), mode?}",
+            has_layers,
+            add_mask
+        ),
+        cmd!("layer.setMask", "Mask Mode", [], None, "{layer?, mask: index|uid|name, mode?, inverted?}", has_layers, mask_props),
+        cmd!(
+            "layer.addShapeItem",
+            "Add (Shape)",
+            [],
+            None,
+            "{layer?, kind: group|rect|ellipse|star|polygon|path|fill|stroke|gfill|gstroke|trim|repeater|round|offset|pucker|twist|zigzag|wiggle|merge|frontColor|bevelColor|sideColor|backColor, group?: uid|path} → {uid, path} (frontColor…backColor: the group's Front / Bevel / Side / Back item, which colours that surface of every extruded paint in the group in Advanced 3D)",
+            has_layers,
+            add_shape_item
+        ),
+        cmd!(
+            "layer.setText",
+            "Edit Text",
+            [],
+            None,
+            "{layer?, range?: [start, end] (characters; default all), text?, font?, style?, size?, fill?, stroke?, applyFill?, applyStroke?, strokeWidth?, tracking?, leading?: px|\"auto\", baselineShift? px, hScale? %, vScale? %, tsume? %, fauxBold?, fauxItalic?, allCaps?, smallCaps?, baseline?: normal|superscript|subscript, superscript?, subscript?, kerning?: metrics|optical|number, ligatures?, discretionaryLigatures? (OpenType), contextualAlternates?, stylisticAlternates?, stylisticSets?: [1–20], ss01?, ss02?, ss03?, ss04?, ss05?, ss06?, ss07?, ss08?, ss09?, ss10?, ss11?, ss12?, ss13?, ss14?, ss15?, ss16?, ss17?, ss18?, ss19?, ss20?, swash?, titling?, ordinals?, fractions?, allSmallCaps?, figureStyle?: default|lining|oldStyle, figureWidth?: default|proportional|tabular, figures?, variations?: {tag: value} (variable font axes; null resets), justify?: left|center|right|justifyLeft|justifyCenter|justifyRight|justifyAll, indentLeft?, indentRight?, indentFirst?, spaceBefore?, spaceAfter?, direction?: ltr|rtl, composer?: everyLine|singleLine, hangingPunctuation?, strokeOverFill?, box?: [x,y,w,h]|null (layer space), vertical?}",
+            has_layers,
+            set_text
+        ),
+        cmd!(
+            "layer.transform",
+            "Transform",
+            ["Layer", "Transform"],
+            None,
+            "{layers?, op: reset|center|fit|fitWidth|fitHeight|flipH|flipV}",
+            has_layers,
+            transform_op
+        ),
+    ]
+}
+
+#[allow(dead_code)]
+fn unused(_: &Comp) {}
diff --git a/crates/engine/src/cmd/layer/contents.rs b/crates/engine/src/cmd/layer/contents.rs
new file mode 100644
index 000000000..d8824fc9e
--- /dev/null
+++ b/crates/engine/src/cmd/layer/contents.rs
@@ -0,0 +1,208 @@
+use super::create::{apply_text_params, text_range_p};
+use super::{
+    EngineError, GroupKind, Ids, ItemId, KV, LayerId, MaskMode, Node, Project, PropGroup, Result, Session, TextDoc, Value, b_p, bad, build, json, layer_mut,
+    layer_p, merge_p, str_p,
+};
+
+pub(super) fn add_mask(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.addMask")?;
+    let layer = s.project.comp(cid).and_then(|c| c.layer(lid)).ok_or(EngineError::NoComp)?.clone();
+    let (w, h) = effectcraft_render::source_size(&s.project, &layer);
+    let (w, h) = if w == 0 { (400.0, 300.0) } else { (w as f64, h as f64) };
+    let shape = str_p(p, "shape").unwrap_or("rect");
+    let r = p.get("rect").and_then(Value::as_array).map(|a| [0, 1, 2, 3].map(|i| a.get(i).and_then(Value::as_f64).unwrap_or(0.0)));
+    let (cx, cy, rw, rh) = match r {
+        Some([x, y, rw, rh]) => (x + rw / 2.0, y + rh / 2.0, rw, rh),
+        None => (if w > 0.0 { w / 2.0 } else { 0.0 }, h / 2.0, w * 0.6, h * 0.6),
+    };
+    // The shape tools' masks: rectangle, ellipse, rounded rectangle, polygon or star.
+    let path = crate::cmd::shape_tool::mask_path(shape, [cx, cy], [rw, rh])
+        .ok_or_else(|| bad("layer.addMask", format!("unknown shape `{shape}`; one of rect, ellipse, rounded, polygon, star")))?;
+    let mode = str_p(p, "mode").and_then(MaskMode::from_name).unwrap_or(MaskMode::Add);
+    let cycle = s.prefs.appearance.cycle_mask_colors;
+    let uid = s.edit("New Mask", None, |proj, _| {
+        let mut next = proj.next_id;
+        let l = layer_mut(proj, cid, lid)?;
+        let masks = l.props.sub_mut("masks").ok_or_else(|| bad("layer.addMask", "this layer can't have masks"))?;
+        let n = masks.children.len();
+        let g = build::mask(&mut Ids(&mut next), &format!("Mask {}", n + 1), path, mode, crate::prefs::mask_color(cycle, n));
+        let uid = g.uid;
+        masks.children.push(g.into());
+        proj.next_id = next;
+        Ok(uid)
+    })?;
+    Ok(json!({"mask": uid}))
+}
+
+pub(super) fn mask_props(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.setMask")?;
+    let target = p.get("mask").cloned().unwrap_or(json!(1));
+    let mode = str_p(p, "mode").and_then(MaskMode::from_name);
+    let inverted = b_p(p, "inverted");
+    s.edit("Mask Settings", None, |proj, _| {
+        let l = layer_mut(proj, cid, lid)?;
+        let masks = l.props.sub_mut("masks").ok_or_else(|| bad("layer.setMask", "the layer has no masks (add one with layer.addMask)"))?;
+        let g = match &target {
+            Value::Number(n) => {
+                let n = n.as_u64().unwrap_or(1);
+                if let Some(i) = masks.children.iter().position(|c| c.uid() == n) {
+                    masks.children[i].as_group_mut()
+                } else {
+                    masks.children.get_mut(n.saturating_sub(1) as usize).and_then(|c| c.as_group_mut())
+                }
+            }
+            Value::String(name) => masks.children.iter_mut().find(|c| c.name() == name).and_then(|c| c.as_group_mut()),
+            _ => None,
+        }
+        .ok_or_else(|| bad("layer.setMask", "no such mask"))?;
+        if let GroupKind::Mask { mode: m, inverted: inv, .. } = &mut g.kind {
+            if let Some(mm) = mode {
+                *m = mm;
+            }
+            if let Some(i) = inverted {
+                *inv = i;
+            }
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+pub(super) fn add_shape_item(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.addShapeItem")?;
+    let kind = str_p(p, "kind").ok_or_else(|| bad("layer.addShapeItem", "missing `kind`"))?.to_string();
+    // `group`: a uid or a property path (`contents/group`).
+    let group_uid = match p.get("group") {
+        Some(Value::String(path)) => Some(
+            s.project
+                .comp(cid)
+                .and_then(|c| c.layer(lid))
+                .and_then(|l| l.props.group(path))
+                .map(|g| g.uid)
+                .ok_or_else(|| bad("layer.addShapeItem", format!("no group `{path}`")))?,
+        ),
+        v => v.and_then(Value::as_u64),
+    };
+    let uid = s.edit("Add Shape Item", None, |proj, _| {
+        let mut next = proj.next_id;
+        let mut ids = Ids(&mut next);
+        // Front / Bevel / Side / Back ▸ property: into the group's surface item (one per group).
+        if let Some((surface, prop)) = build::shape_surface_kind(&kind) {
+            let target = shape_item_target(proj, cid, lid, group_uid)?;
+            let item = match target.children.iter().position(|c| matches!(c, Node::Group(g) if g.match_id == surface)) {
+                Some(i) => i,
+                None => {
+                    let g = build::shape_surface(&mut ids, surface).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{kind}`")))?;
+                    target.children.push(g.into());
+                    target.children.len() - 1
+                }
+            };
+            let Some(Node::Group(g)) = target.children.get_mut(item) else { return Err(bad("layer.addShapeItem", "no such group")) };
+            if g.get(prop).is_none() {
+                let p = build::shape_surface_prop(&mut ids, prop).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{kind}`")))?;
+                g.children.push(p.into());
+            }
+            let uid = g.uid;
+            proj.next_id = next;
+            return Ok(uid);
+        }
+        let g = match kind.as_str() {
+            "group" => build::shape_group(&mut ids, "Group 1", vec![]),
+            "rect" | "rectangle" => build::shape_rect(&mut ids, [200.0, 200.0], [0.0, 0.0], 0.0),
+            "ellipse" => build::shape_ellipse(&mut ids, [200.0, 200.0], [0.0, 0.0]),
+            "star" => build::shape_star(&mut ids, true, 5.0, [0.0, 0.0], 100.0, 50.0),
+            "polygon" => build::shape_star(&mut ids, false, 5.0, [0.0, 0.0], 100.0, 0.0),
+            "fill" => build::shape_fill(&mut ids, [1.0, 0.0, 0.0, 1.0]),
+            "stroke" => build::shape_stroke(&mut ids, [1.0, 1.0, 1.0, 1.0], 2.0),
+            "path" => build::shape_path(&mut ids, Default::default()),
+            "gfill" | "gradientFill" => build::shape_gradient_fill(&mut ids, false, [-100.0, 0.0], [100.0, 0.0], Default::default()),
+            "gstroke" | "gradientStroke" => build::shape_gradient_stroke(&mut ids, false, [-100.0, 0.0], [100.0, 0.0], Default::default(), 2.0),
+            "trim" | "trimPaths" => build::shape_trim(&mut ids, 0.0, 100.0, 0.0),
+            "repeater" => build::shape_repeater(&mut ids, 3.0, [100.0, 0.0]),
+            k => build::shape_simple_op(&mut ids, k).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{k}`")))?,
+        };
+        let uid = g.uid;
+        proj.next_id = next;
+        shape_item_target(proj, cid, lid, group_uid)?.children.push(g.into());
+        Ok(uid)
+    })?;
+    // The new item's property path, ready for prop.set / add_keyframe (`contents/trim#2/end`).
+    let path = s.project.comp(cid).and_then(|c| c.layer(lid)).and_then(|l| l.props.match_path_of(uid));
+    Ok(json!({"uid": uid, "path": path}))
+}
+
+/// The contents a new shape item goes into: the shape group `group_uid` (its Contents), else the
+/// layer's Contents.
+fn shape_item_target(proj: &mut Project, cid: ItemId, lid: LayerId, group_uid: Option<u64>) -> Result<&mut PropGroup> {
+    let l = layer_mut(proj, cid, lid)?;
+    let contents = l.props.sub_mut("contents").ok_or_else(|| bad("layer.addShapeItem", "not a shape layer"))?;
+    Ok(match group_uid {
+        Some(u) => contents
+            .find_group_mut(u)
+            .and_then(|g| if g.match_id == "contents" { Some(g) } else { g.sub_mut("contents") })
+            .ok_or_else(|| bad("layer.addShapeItem", "no such group"))?,
+        None => contents,
+    })
+}
+
+/// `layer.setText`: sets a text layer's Source Text and/or character attributes at the CTI.
+///
+/// A `font` name is also added to the recent fonts and the preferences saved. With an empty
+/// `range` and no `text`, while that layer is being edited and its document is non-empty,
+/// recognised character attributes are also staged in the pending insertion style without
+/// changing existing characters. Paragraph/document attributes still apply through the edit;
+/// the session is bumped whenever this branch runs. Document changes use [`Session::edit`],
+/// merged by `merge_p`. With `text` given, a layer whose name is empty or starts with `Text`
+/// takes the new first line (up to 40 characters) when that line is non-empty. Replies `null`.
+pub(super) fn set_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.setText")?;
+    // The Character panel's recent fonts (Settings ▸ Type ▸ Number of Recent Fonts to Display).
+    if let Some(f) = str_p(p, "font") {
+        s.prefs.push_recent_font(f);
+        s.save_prefs();
+    }
+    let t = s.time();
+    let range = text_range_p(p);
+    // Character attributes with only a caret (no selected text) set the insertion style.
+    if let Some(r) = range.clone().filter(|r| r.is_empty() && str_p(p, "text").is_none())
+        && s.state.text_edit.as_ref().is_some_and(|e| e.layer == lid)
+        && let Some(doc) = crate::cmd::text_edit::layer_doc(s, lid)
+        && doc.char_len() > 0
+        && let Some(obj) = p.as_object()
+        && let Some(e) = s.state.text_edit.as_mut()
+    {
+        let mut st = e.pending.clone().unwrap_or_else(|| doc.insertion_style(r.start));
+        let mut any = false;
+        for (k, v) in obj {
+            any |= effectcraft_keyframe::text_doc::apply_char_attr(&mut st, k, v).map_err(|m| bad("layer.setText", m))?;
+        }
+        if any {
+            e.pending = Some(st);
+        }
+        s.bump();
+    }
+    // A changed Source Text is handled by `Session::edit`: its boundary clamps the selection and
+    // starts a new IME epoch only when the CTI document actually changed, so an identical text
+    // write stays a no-op and keeps the editor's owner.
+    s.edit("Edit Text", merge_p(p), |proj, _| {
+        let l = layer_mut(proj, cid, lid)?;
+        let lt = l.layer_time(t);
+        let pr = l.props.prop_mut("text/sourceText").ok_or_else(|| bad("layer.setText", "not a text layer"))?;
+        let mut doc = match pr.value_at(lt) {
+            KV::Text(d) => *d,
+            KV::Str(t) => TextDoc::plain(&t),
+            _ => TextDoc::default(),
+        };
+        apply_text_params("layer.setText", p, &mut doc, range.clone())?;
+        pr.set_value_at(lt, KV::Text(Box::new(doc.clone())));
+        if let Some(first) = doc.text.lines().next()
+            && str_p(p, "text").is_some()
+            && !first.is_empty()
+            && (l.name.starts_with("Text") || l.name.is_empty())
+        {
+            l.name = first.chars().take(40).collect();
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
diff --git a/crates/engine/src/cmd/layer/create.rs b/crates/engine/src/cmd/layer/create.rs
new file mode 100644
index 000000000..7962c2485
--- /dev/null
+++ b/crates/engine/src/cmd/layer/create.rs
@@ -0,0 +1,315 @@
+use super::{
+    EngineError, Ids, ItemId, ItemKind, Justify, KV, Label, Layer, LayerId, LayerSource, Project, Result, Session, Solid, TextDoc, Tick, Value, b_p, bad,
+    build, comp_id, f_p, json, limits, str_p,
+};
+
+pub(crate) fn color_p(p: &Value, k: &str) -> Option<[f32; 3]> {
+    match p.get(k)? {
+        Value::String(s) => effectcraft_color::Rgba::from_hex(s).map(|c| [c.r, c.g, c.b]),
+        Value::Array(a) => {
+            let g = |i: usize| a.get(i).and_then(Value::as_f64).unwrap_or(0.0) as f32;
+            Some([g(0), g(1), g(2)])
+        }
+        _ => None,
+    }
+}
+
+/// Insert a new layer above the selection (or at the top) and select it.
+pub(crate) fn insert_layer(proj: &mut Project, st: &mut crate::EditorState, cid: ItemId, layer: Layer) -> Result<LayerId> {
+    insert_layer_at(proj, st, cid, layer, None)
+}
+
+/// `index`: an `index` parameter, the layer's 1-based place in the stack (1 = top; past the
+/// bottom = the bottom), as 0-based.
+pub(crate) fn index_p(p: &Value, cmd: &str) -> Result<Option<usize>> {
+    match p.get("index") {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => {
+            v.as_u64().filter(|i| *i >= 1).map(|i| Some(usize::try_from(i - 1).unwrap_or(usize::MAX))).ok_or_else(|| bad(cmd, "index: 1-based stack position"))
+        }
+    }
+}
+
+/// A `position` parameter: `[x, y]` in comp pixels (finite).
+pub(crate) fn position_p(p: &Value, cmd: &str) -> Result<Option<[f64; 2]>> {
+    match p.get("position") {
+        None | Some(Value::Null) => Ok(None),
+        Some(v) => v
+            .as_array()
+            .and_then(|a| Some([a.first()?.as_f64()?, a.get(1)?.as_f64()?]))
+            .filter(|c| c.iter().all(|x| x.is_finite()))
+            .map(Some)
+            .ok_or_else(|| bad(cmd, "position: [x, y] in comp pixels")),
+    }
+}
+
+/// Put a new layer's Position at `pos` (comp pixels).
+pub(crate) fn place(l: &mut Layer, pos: Option<[f64; 2]>) {
+    if let Some([x, y]) = pos
+        && let Some(pr) = l.props.prop_mut("transform/position")
+    {
+        let z = match pr.value {
+            KV::Vec3(v) => v[2],
+            _ => 0.0,
+        };
+        pr.value = KV::Vec3([x, y, z]);
+    }
+}
+
+/// [`insert_layer`] at stack position `at` (0 = top) instead of above the selected layer.
+pub(crate) fn insert_layer_at(proj: &mut Project, st: &mut crate::EditorState, cid: ItemId, mut layer: Layer, at: Option<usize>) -> Result<LayerId> {
+    // Text and shape layers in Advanced 3D comps get Geometry Options (extrusion, bevels).
+    if proj.comp(cid).is_some_and(|c| c.renderer == effectcraft_project::Renderer::Advanced3D) {
+        crate::cmd::model3d::add_geometry_options(&mut proj.next_id, &mut layer);
+    }
+    let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+    let at = match at {
+        Some(i) => i.min(comp.layers.len()),
+        None => st.selected_layers.first().and_then(|id| comp.layers.iter().position(|l| l.id == *id)).unwrap_or(0),
+    };
+    let id = layer.id;
+    comp.layers.insert(at, layer);
+    st.selected_layers = vec![id];
+    st.selected_props.clear();
+    st.selected_keys.clear();
+    Ok(id)
+}
+
+fn solids_folder(proj: &mut Project) -> ItemId {
+    proj.folder_named("Solids").unwrap_or_else(|| proj.add_item("Solids", Label::Yellow, None, ItemKind::Folder))
+}
+
+fn new_solid_like(s: &mut Session, p: &Value, adjustment: bool) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let color = color_p(p, "color").unwrap_or(if adjustment { [1.0, 1.0, 1.0] } else { [0.85, 0.2, 0.2] });
+    // 1 to 30,000 px a side (#788): the layer is sized from the same numbers as its solid.
+    let w = p.get("width").and_then(Value::as_u64).map(limits::size).unwrap_or(comp.width);
+    let h = p.get("height").and_then(Value::as_u64).map(limits::size).unwrap_or(comp.height);
+    let pixel_aspect = pixel_aspect_p(p)?.unwrap_or(comp.pixel_aspect);
+    let default_name = if adjustment { "Adjustment Layer 1".to_string() } else { "Solid 1".to_string() };
+    let name = str_p(p, "name").map(str::to_string).unwrap_or(default_name);
+    let id = s.edit(if adjustment { "New Adjustment Layer" } else { "New Solid" }, None, |proj, st| {
+        let folder = solids_folder(proj);
+        let sid = proj.add_item(&name, Label::Red, Some(folder), ItemKind::Solid(Solid { color, width: w, height: h, pixel_aspect }));
+        let mut l = build::layer(proj, &comp, &name, LayerSource::Solid { item: sid }, (w, h), None);
+        if adjustment {
+            l.switches.adjustment = true;
+            l.label = Label::Purple;
+        }
+        insert_layer(proj, st, cid, l)
+    })?;
+    Ok(json!({"layer": id.0}))
+}
+
+/// `pixelAspect` (a positive number), when given.
+pub(super) fn pixel_aspect_p(p: &Value) -> Result<Option<f64>> {
+    match p.get("pixelAspect").and_then(Value::as_f64) {
+        Some(v) if !(v.is_finite() && v > 0.0) => Err(bad("layer.settings", "`pixelAspect` must be a positive number")),
+        v => Ok(v.map(limits::pixel_aspect)),
+    }
+}
+
+pub(super) fn new_solid(s: &mut Session, p: &Value) -> Result<Value> {
+    new_solid_like(s, p, false)
+}
+
+pub(super) fn new_adjustment(s: &mut Session, p: &Value) -> Result<Value> {
+    new_solid_like(s, p, true)
+}
+
+/// Parameters of `layer.setText` / `layer.newText` that aren't text attributes.
+const NOT_ATTRS: &[&str] = &["layer", "layers", "comp", "merge", "text", "range", "position", "edit"];
+
+/// Apply `layer.setText` keys to `d`: `text` replaces characters `r` (or everything), then each
+/// character / paragraph / document attribute applies to `r` (or everything).
+pub(super) fn apply_text_params(cmd: &str, p: &Value, d: &mut TextDoc, r: Option<std::ops::Range<usize>>) -> Result<()> {
+    let mut r = r;
+    if let Some(t) = str_p(p, "text") {
+        match r.clone() {
+            Some(rr) => {
+                d.replace_range(rr.clone(), t, None);
+                r = Some(rr.start..rr.start + t.chars().count());
+            }
+            None => d.set_text(t),
+        }
+    }
+    let Some(obj) = p.as_object() else { return Ok(()) };
+    for (k, v) in obj {
+        if NOT_ATTRS.contains(&k.as_str()) {
+            continue;
+        }
+        if !d.set_attr(k, v, r.clone()).map_err(|e| bad(cmd, e))? {
+            return Err(bad(cmd, format!("unknown text attribute {k}")));
+        }
+    }
+    Ok(())
+}
+
+pub(super) fn text_range_p(p: &Value) -> Option<std::ops::Range<usize>> {
+    let a = p.get("range")?.as_array()?;
+    let g = |i: usize| a.get(i).and_then(Value::as_u64).map(|x| x as usize);
+    let (x, y) = (g(0)?, g(1).or(g(0))?);
+    Some(x.min(y)..x.max(y))
+}
+
+/// `layer.newText`: adds a Text layer to the comp at the CTI and returns `{layer}`.
+///
+/// The document starts as centre-justified "Text", with the optional text parameters applied.
+/// With `box` `[x, y, w, h]`, `(x, y)` is the paragraph box's top-left in comp space. Its width
+/// and height are `w.abs().max(1.0)` and `h.abs().max(1.0)`; the layer position is the box centre.
+/// It is left justified unless `justify` is given. The layer is named by `name`, else the first 40
+/// characters of the first text line, else "Text". `edit: true` also opens a new editing
+/// session with anchor `0` and the caret after the text, selecting all initial text so the next
+/// insertion replaces it. The session has `created: true`, so leaving it empty removes the layer.
+pub(super) fn new_text(s: &mut Session, p: &Value) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let mut doc = TextDoc { text: "Text".into(), justify: Justify::Center, ..Default::default() };
+    // A paragraph box given in comp space: the layer sits at its centre.
+    let bx = p.get("box").and_then(Value::as_array).map(|a| [0, 1, 2, 3].map(|i| a.get(i).and_then(Value::as_f64).unwrap_or(0.0)));
+    let mut q = p.clone();
+    if let Some(o) = q.as_object_mut() {
+        o.remove("box");
+        o.remove("name");
+    }
+    let layer_name = str_p(p, "name").map(str::to_string);
+    apply_text_params("layer.newText", &q, &mut doc, None)?;
+    let mut pos = position_p(p, "layer.newText")?;
+    if let Some([x, y, w, h]) = bx {
+        let (w, h) = (w.abs().max(1.0), h.abs().max(1.0));
+        doc.box_size = Some([w, h]);
+        doc.box_pos = [-w / 2.0, -h / 2.0];
+        pos = Some([x + w / 2.0, y + h / 2.0]);
+        if p.get("justify").is_none() {
+            doc.set_attr("justify", &json!("left"), None).map_err(|e| bad("layer.newText", e))?;
+        }
+    }
+    let edit = b_p(p, "edit").unwrap_or(false);
+    let id = s.edit("New Text Layer", None, |proj, st| {
+        let name: String = layer_name.clone().unwrap_or_else(|| doc.text.lines().next().unwrap_or("").chars().take(40).collect());
+        let mut l = build::layer(proj, &comp, if name.is_empty() { "Text" } else { &name }, LayerSource::Text, (comp.width, comp.height), None);
+        if let Some(pr) = l.props.prop_mut("text/sourceText") {
+            pr.value = KV::Text(Box::new(doc.clone()));
+        }
+        if let Some(pos) = pos
+            && let Some(pr) = l.props.prop_mut("transform/position")
+        {
+            pr.value = KV::Vec3([pos[0], pos[1], 0.0]);
+        }
+        let n = doc.char_len();
+        let id = insert_layer(proj, st, cid, l)?;
+        if edit {
+            st.text_edit = Some(crate::cmd::text_edit::TextEdit {
+                layer: id,
+                anchor: 0,
+                caret: n,
+                created: true,
+                session: crate::cmd::text_edit::next_edit_session(),
+                ..Default::default()
+            });
+        }
+        Ok(id)
+    })?;
+    Ok(json!({"layer": id.0}))
+}
+
+pub(super) fn new_shape(s: &mut Session, p: &Value) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let kind = str_p(p, "kind").unwrap_or("none").to_string();
+    let size = p
+        .get("size")
+        .and_then(Value::as_array)
+        .map(|a| [a.first().and_then(Value::as_f64).unwrap_or(200.0), a.get(1).and_then(Value::as_f64).unwrap_or(200.0)])
+        .unwrap_or([300.0, 300.0]);
+    // A fill, and a stroke only with a width (not the Tools bar's paint).
+    let paint = crate::cmd::shape_tool::paint_p(p, &Default::default(), "layer.newShape")?;
+    let pos = p
+        .get("position")
+        .and_then(|v| v.as_array())
+        .map(|a| [a.first().and_then(Value::as_f64).unwrap_or(0.0), a.get(1).and_then(Value::as_f64).unwrap_or(0.0)]);
+    let name = str_p(p, "name").unwrap_or("Shape Layer 1").to_string();
+    let id = s.edit("New Shape Layer", None, |proj, st| {
+        let lid = crate::cmd::shape_tool::new_shape_layer(proj, st, &comp, cid, Some(&name), pos)?;
+        let mut next = proj.next_id;
+        let g = crate::cmd::shape_tool::shape_group(&mut Ids(&mut next), &kind, size, &paint);
+        proj.next_id = next;
+        if let Some(g) = g {
+            crate::cmd::shape_tool::add_to_contents(proj, cid, lid, g, [0.0, 0.0], "layer.newShape")?;
+        }
+        Ok(lid)
+    })?;
+    Ok(json!({"layer": id.0}))
+}
+
+fn new_simple(s: &mut Session, p: &Value, src: LayerSource, name: &str, label: &str) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let name = str_p(p, "name").unwrap_or(name).to_string();
+    let id = s.edit(label, None, |proj, st| {
+        let l = build::layer(proj, &comp, &name, src, (comp.width, comp.height), None);
+        insert_layer(proj, st, cid, l)
+    })?;
+    Ok(json!({"layer": id.0}))
+}
+
+pub(super) fn new_null(s: &mut Session, p: &Value) -> Result<Value> {
+    new_simple(s, p, LayerSource::Null, "Null 1", "New Null Object")
+}
+
+pub(super) fn add_item(s: &mut Session, p: &Value) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let item = match p.get("item") {
+        Some(Value::Number(n)) => ItemId(n.as_u64().unwrap_or(0)),
+        Some(Value::String(name)) => s.project.find_by_name(name).map(|i| i.id).ok_or_else(|| bad("layer.addItem", format!("no item `{name}`")))?,
+        _ => *s.state.project_selection.first().ok_or_else(|| bad("layer.addItem", "missing `item`"))?,
+    };
+    if s.project.comp_contains(item, cid) {
+        return Err(bad("layer.addItem", "a composition can't contain itself"));
+    }
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let it = s.project.item(item).ok_or_else(|| bad("layer.addItem", "no such item"))?.clone();
+    let (src, size, dur) = match &it.kind {
+        ItemKind::Comp(c) => (LayerSource::Comp { item }, (c.width, c.height), Some(c.duration)),
+        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Still => {
+            // `duration`, else Settings ▸ Import ▸ Still Footage: length of the composition or a
+            // duration.
+            let d = f_p(p, "duration")
+                .filter(|d| d.is_finite() && *d > 0.0)
+                .or((s.prefs.import.still_footage == "seconds").then_some(s.prefs.import.still_seconds))
+                .map(Tick::from_seconds_f64);
+            (LayerSource::Footage { item }, (f.width, f.height), d)
+        }
+        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Data => {
+            return Err(bad("layer.addItem", "data files can't be layers; read them in expressions with footage(\"name\").sourceData"));
+        }
+        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Model => {
+            return crate::cmd::model3d::new_model(
+                s,
+                &serde_json::json!({"comp": cid.0, "item": item.0, "time": f_p(p, "time"), "index": p.get("index"), "position": p.get("position")}),
+            );
+        }
+        ItemKind::Footage(f) => (LayerSource::Footage { item }, (f.width, f.height), Some(f.looped_duration())),
+        ItemKind::Solid(so) => (LayerSource::Solid { item }, (so.width, so.height), None),
+        ItemKind::Folder => return Err(bad("layer.addItem", "folders can't be layers")),
+    };
+    let index = index_p(p, "layer.addItem")?;
+    let position = position_p(p, "layer.addItem")?;
+    let fr = comp.frame_rate;
+    // Settings ▸ General ▸ Create Layers at Composition Start Time (off: at the current time).
+    let default_start = if s.prefs.general.create_layers_at_comp_start || s.active_comp_id() != Some(cid) { Tick::ZERO } else { s.time() };
+    let start = fr.snap_nearest(f_p(p, "time").map(Tick::from_seconds_f64).unwrap_or(default_start));
+    let id = s.edit("Add Footage to Comp", None, |proj, st| {
+        let mut l = build::layer(proj, &comp, &it.name, src, size, dur);
+        l.start_time = start;
+        l.in_point = start;
+        // Footage and precomps keep their full length past the comp's end (After Effects); items
+        // without a duration (solids, comp-length stills) end with the comp.
+        let end = dur.map_or((start + comp.duration).min(comp.duration), |d| start + d);
+        l.out_point = fr.snap_nearest(end).max(start + fr.frame_duration());
+        place(&mut l, position);
+        insert_layer_at(proj, st, cid, l, index)
+    })?;
+    Ok(json!({"layer": id.0}))
+}
diff --git a/crates/engine/src/cmd/layer/parent.rs b/crates/engine/src/cmd/layer/parent.rs
new file mode 100644
index 000000000..fbaec14e4
--- /dev/null
+++ b/crates/engine/src/cmd/layer/parent.rs
@@ -0,0 +1,453 @@
+use super::{Comp, EngineError, ItemId, KV, Layer, LayerId, PropGroup, Result, Session, Tick, Value, b_p, bad, layers_p, resolve_layer};
+
+/// Re-express a layer in its new parent space without moving its anchor.
+pub(crate) struct ParentFix {
+    pub layer: LayerId,
+    /// Maps Position from the old parent's space into the new one's.
+    m: effectcraft_geom::Mat3,
+    /// Added to Rotation.
+    rotation: f64,
+    /// Multiply Scale.
+    scale: [f64; 2],
+    /// 3D AV layers retain their world-space anchor, including Z.
+    position_3d: Option<effectcraft_geom::Mat4>,
+    /// A uniform relative parent transform can preserve static Orientation and Scale.
+    pose_3d: Option<([f64; 3], f64)>,
+}
+
+impl ParentFix {
+    /// Re-express the layer's Position, Rotation and Scale (every key) in the new parent's space.
+    pub fn apply(&self, l: &mut Layer) {
+        let Some(tr) = l.props.sub_mut("transform") else { return };
+        if let Some(m) = self.position_3d {
+            // Spatial Position speed measures distance along its path. Its parent-space
+            // unit changes even when the child's Orientation cannot be re-expressed.
+            let position_speed = uniform_parent_pose(m, [0.0; 3]).map(|(_, factor)| factor.abs());
+            let map_position = |v: &KV| {
+                let q = m.apply(effectcraft_geom::Vec3::from(v.as_vec3()));
+                KV::Vec3([q.x, q.y, q.z])
+            };
+            // Read all separated axes before writing any of them.
+            let names = ["positionX", "positionY", "positionZ"];
+            if tr.get("positionX").is_some() {
+                let axes = names.map(|name| tr.get(name).cloned());
+                let current = axes.each_ref().map(|pr| pr.as_ref().map(|pr| pr.value.as_f64()).unwrap_or(0.0));
+                let q = m.apply(effectcraft_geom::Vec3::from(current));
+                for (i, name) in names.into_iter().enumerate() {
+                    if let Some(pr) = tr.get_mut(name) {
+                        pr.value = KV::Scalar([q.x, q.y, q.z].get(i).copied().unwrap_or(0.0));
+                        for key in &mut pr.keys {
+                            let p = axes.each_ref().map(|axis| axis.as_ref().map(|axis| axis.value_at(key.time).as_f64()).unwrap_or(0.0));
+                            let q = m.apply(effectcraft_geom::Vec3::from(p));
+                            key.value = KV::Scalar([q.x, q.y, q.z].get(i).copied().unwrap_or(0.0));
+                        }
+                    }
+                }
+            }
+            if let Some(pr) = tr.get_mut("position") {
+                pr.value = map_position(&pr.value);
+                for key in &mut pr.keys {
+                    key.value = map_position(&key.value);
+                    // Spatial tangents are vectors, so the parent's translation is excluded.
+                    for tangent in [&mut key.spatial_in, &mut key.spatial_out] {
+                        let v = m.apply_vec(effectcraft_geom::Vec3::from(*tangent));
+                        *tangent = [v.x, v.y, v.z];
+                    }
+                }
+                if let Some(factor) = position_speed
+                    .filter(|_| pr.spatial)
+                    .filter(|factor| pr.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * *factor).is_finite()))
+                {
+                    for key in &mut pr.keys {
+                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
+                            ease.speed *= factor;
+                        }
+                    }
+                }
+            }
+            // Cameras and lights aim with Point of Interest: move it by the same parent-space
+            // change, so a two-node rig keeps its world frame (#1010, #1020).
+            if let Some(pr) = tr.get_mut("poi") {
+                pr.value = map_position(&pr.value);
+                for key in &mut pr.keys {
+                    key.value = map_position(&key.value);
+                    for tangent in [&mut key.spatial_in, &mut key.spatial_out] {
+                        let v = m.apply_vec(effectcraft_geom::Vec3::from(*tangent));
+                        *tangent = [v.x, v.y, v.z];
+                    }
+                }
+                if let Some(factor) = position_speed
+                    .filter(|_| pr.spatial)
+                    .filter(|factor| pr.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * *factor).is_finite()))
+                {
+                    for key in &mut pr.keys {
+                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
+                            ease.speed *= factor;
+                        }
+                    }
+                }
+            }
+            if let Some((orientation, factor)) = self.pose_3d {
+                if let Some(pr) = tr.get_mut("orientation") {
+                    pr.value = KV::Vec3(orientation);
+                }
+                if let Some(pr) = tr.get_mut("scale") {
+                    let scaled = |value: &KV| KV::Vec3(value.as_vec3().map(|v| v * factor));
+                    pr.value = scaled(&pr.value);
+                    for key in &mut pr.keys {
+                        key.value = scaled(&key.value);
+                        // Scale's temporal speeds use the same units as its values.
+                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
+                            ease.speed *= factor;
+                        }
+                    }
+                }
+            }
+            return;
+        }
+        let map = |pr: &mut effectcraft_project::Property, f: &dyn Fn(&KV) -> KV| {
+            pr.value = f(&pr.value);
+            for key in &mut pr.keys {
+                key.value = f(&key.value);
+            }
+        };
+        let m = self.m;
+        if tr.get("positionX").is_some() {
+            // Separated dimensions: X and Y move together, key by key at the same times.
+            // Everything is read before anything is written.
+            let [x, y] = [tr.get("positionX"), tr.get("positionY")].map(|p| p.map(|p| p.value.as_f64()).unwrap_or(0.0));
+            let q = m.apply(effectcraft_geom::vec2(x, y));
+            let keys_x: Vec<(Tick, f64)> = tr.get("positionX").map(|p| p.keys.iter().map(|k| (k.time, k.value.as_f64())).collect()).unwrap_or_default();
+            let keys_y: Vec<(Tick, f64)> = tr.get("positionY").map(|p| p.keys.iter().map(|k| (k.time, k.value.as_f64())).collect()).unwrap_or_default();
+            let at = |keys: &[(Tick, f64)], name: &str, t: Tick, tr: &PropGroup| {
+                keys.iter().find(|k| k.0 == t).map(|k| k.1).unwrap_or_else(|| tr.get(name).map(|p| p.value_at(t).as_f64()).unwrap_or(0.0))
+            };
+            let (xs, ys): (Vec<f64>, Vec<f64>) = (
+                keys_x.iter().map(|&(t, x)| m.apply(effectcraft_geom::vec2(x, at(&keys_y, "positionY", t, tr))).x).collect(),
+                keys_y.iter().map(|&(t, y)| m.apply(effectcraft_geom::vec2(at(&keys_x, "positionX", t, tr), y)).y).collect(),
+            );
+            for (name, value, vals) in [("positionX", q.x, xs), ("positionY", q.y, ys)] {
+                if let Some(pr) = tr.get_mut(name) {
+                    pr.value = KV::Scalar(value);
+                    for (k, v) in pr.keys.iter_mut().zip(vals) {
+                        k.value = KV::Scalar(v);
+                    }
+                }
+            }
+        } else if let Some(pr) = tr.get_mut("position") {
+            map(pr, &|v| {
+                let c = v.as_vec3();
+                let q = m.apply(effectcraft_geom::vec2(c[0], c[1]));
+                KV::Vec3([q.x, q.y, c[2]])
+            });
+        }
+        let (dr, k) = (self.rotation, self.scale);
+        if let Some(pr) = tr.get_mut("rotation") {
+            map(pr, &|v| KV::Scalar(v.as_f64() + dr));
+        }
+        if let Some(pr) = tr.get_mut("scale") {
+            map(pr, &|v| {
+                let c = v.as_vec3();
+                KV::Vec3([c[0] * k[0], c[1] * k[1], c[2]])
+            });
+        }
+    }
+}
+
+/// A uniform factor commutes with authored axis Rotation and Scale; prepend its orthogonal
+/// rotation to static Orientation using the existing Rz * Ry * Rx order.
+fn uniform_parent_pose(m: effectcraft_geom::Mat4, orientation: [f64; 3]) -> Option<([f64; 3], f64)> {
+    use effectcraft_geom::{Mat4, Vec3, vec3};
+    if !orientation.iter().all(|v| v.is_finite()) {
+        return None;
+    }
+    let a = m.0;
+    let columns = [vec3(a[0][0], a[1][0], a[2][0]), vec3(a[0][1], a[1][1], a[2][1]), vec3(a[0][2], a[1][2], a[2][2])];
+    let magnitude = columns[0].x.hypot(columns[0].y).hypot(columns[0].z);
+    if !magnitude.is_finite() || magnitude <= 0.0 {
+        return None;
+    }
+    let c = columns.map(|c| c / magnitude);
+    if c.iter().any(|c| (c.dot(*c) - 1.0).abs() > 1e-9) || c[0].dot(c[1]).abs() > 1e-9 || c[0].dot(c[2]).abs() > 1e-9 || c[1].dot(c[2]).abs() > 1e-9 {
+        return None;
+    }
+    let cross = vec3(c[1].y * c[2].z - c[1].z * c[2].y, c[1].z * c[2].x - c[1].x * c[2].z, c[1].x * c[2].y - c[1].y * c[2].x);
+    let factor = if c[0].dot(cross) < 0.0 { -magnitude } else { magnitude };
+    let mut rotation = Mat4::IDENTITY;
+    for row in 0..3 {
+        for col in 0..3 {
+            rotation.0[row][col] = a[row][col] / factor;
+        }
+    }
+    if (0..3).all(|row| (0..3).all(|col| (rotation.0[row][col] - if row == col { 1.0 } else { 0.0 }).abs() < 1e-12)) {
+        return Some((orientation, factor));
+    }
+    let r = (rotation * Mat4::orientation(Vec3::from(orientation))).0;
+    // atan2 rather than asin: near ±90 degrees asin loses precision, while cos(y) stays exact.
+    let cy = r[0][0].hypot(r[1][0]);
+    let y = (-r[2][0]).atan2(cy);
+    let (x, z) = if cy > 1e-9 { (r[2][1].atan2(r[2][2]), r[1][0].atan2(r[0][0])) } else { ((-r[1][2]).atan2(r[1][1]), 0.0) };
+    Some(([x.to_degrees(), y.to_degrees(), z.to_degrees()], factor))
+}
+
+/// A parent change retains 2D transforms and the world-space anchor of 3D layers (Position,
+/// and Point of Interest for two-node cameras and lights). Position is
+/// re-expressed in the new parent's space (`None`: the composition), evaluated at the current
+/// time.
+pub(crate) fn parent_fixes(s: &Session, cid: ItemId, ids: &[LayerId], parent: Option<LayerId>) -> Vec<ParentFix> {
+    let Some(comp) = s.project.comp(cid) else { return vec![] };
+    let ectx =
+        effectcraft_render::EvalCtx { project: &s.project, comp_id: cid, comp, time: s.time(), expr: s.expr.as_deref(), footage: Some(s.footage.as_ref()) };
+    let space = |id: Option<LayerId>| -> effectcraft_geom::Mat3 {
+        id.and_then(|i| comp.layer(i)).filter(|l| !l.is_3d()).map(|l| ectx.layer_to_comp(l).0).unwrap_or(effectcraft_geom::Mat3::IDENTITY)
+    };
+    let decompose = |m: &effectcraft_geom::Mat3| {
+        let a = m.0;
+        let sx = (a[0][0] * a[0][0] + a[1][0] * a[1][0]).sqrt();
+        let det = a[0][0] * a[1][1] - a[0][1] * a[1][0];
+        (a[1][0].atan2(a[0][0]).to_degrees(), sx, if sx > 1e-12 { det / sx } else { 0.0 })
+    };
+    let new_m = space(parent);
+    let Some(inv) = new_m.inverse() else { return vec![] };
+    let (rn, sxn, syn) = decompose(&new_m);
+    let mut fixes: Vec<_> = comp
+        .layers
+        .iter()
+        .filter(|l| ids.contains(&l.id) && !l.is_3d() && l.parent != parent)
+        .map(|l| {
+            let old_m = space(l.parent);
+            let (ro, sxo, syo) = decompose(&old_m);
+            let scale = [if sxn.abs() > 1e-12 { sxo / sxn } else { 1.0 }, if syn.abs() > 1e-12 { syo / syn } else { 1.0 }];
+            ParentFix { layer: l.id, m: inv * old_m, rotation: ro - rn, scale, position_3d: None, pose_3d: None }
+        })
+        .collect();
+    let space_3d = |id: Option<LayerId>| {
+        id.and_then(|id| comp.layer(id)).map_or(effectcraft_geom::Mat4::IDENTITY, |layer| {
+            // Parent transforms do not inherit the parent's source pixel-aspect stretch.
+            let world = ectx.world_matrix(layer);
+            let par = ectx.par_ratio(layer);
+            let a = layer.transform().map(|tr| ectx.v3(layer, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
+            let anchor = effectcraft_geom::vec3(a[0], a[1], if layer.is_3d() { a[2] } else { 0.0 });
+            world
+                * effectcraft_geom::Mat4::translate(anchor)
+                * effectcraft_geom::Mat4::scale(effectcraft_geom::vec3(1.0 / par, 1.0, 1.0))
+                * effectcraft_geom::Mat4::translate(-anchor)
+        })
+    };
+    if let Some(inv) = space_3d(parent).inverse().filter(|m| m.0.iter().flatten().all(|v| v.is_finite())) {
+        // Cameras and lights compensate like 3D layers (Position, and Point of Interest for
+        // two-node rigs), so parenting keeps the world frame (#1010, #1020). They have no
+        // Scale, so `pose_3d` below stays `None` and Orientation is kept as authored.
+        for layer in comp.layers.iter().filter(|l| ids.contains(&l.id) && l.is_3d() && l.parent != parent) {
+            let m = inv * space_3d(layer.parent);
+            if m.0.iter().flatten().all(|v| v.is_finite()) {
+                let pose_3d = layer.transform().and_then(|tr| {
+                    let orientation = tr.get("orientation")?;
+                    let scale = tr.get("scale")?;
+                    // Animated Euler Orientation and auto-orient cannot be re-expressed by
+                    // prepending a constant Euler value. Expression-driven values stay authored.
+                    if !orientation.keys.is_empty()
+                        || orientation.expr.is_some()
+                        || scale.expr.is_some()
+                        || layer.auto_orient != effectcraft_project::AutoOrient::Off
+                    {
+                        return None;
+                    }
+                    let pose = uniform_parent_pose(m, orientation.value.as_vec3())?;
+                    let factor = pose.1;
+                    let values_finite = std::iter::once(&scale.value)
+                        .chain(scale.keys.iter().map(|key| &key.value))
+                        .all(|value| value.as_vec3().iter().all(|v| (v * factor).is_finite()));
+                    let speeds_finite = scale.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * factor).is_finite());
+                    (values_finite && speeds_finite).then_some(pose)
+                });
+                fixes.push(ParentFix { layer: layer.id, m: effectcraft_geom::Mat3::IDENTITY, rotation: 0.0, scale: [1.0; 2], position_3d: Some(m), pose_3d });
+            }
+        }
+    }
+    fixes
+}
+
+/// Validate the proposed ancestor chain before any authored edit, including when compensation
+/// is disabled. Bound both unique ancestors and linear lookup/selection work on loaded graphs.
+fn check_parent_chain(comp: &Comp, ids: &[LayerId], parent: Option<LayerId>, max_visits: usize, max_work: usize) -> Result<()> {
+    let mut seen = std::collections::HashSet::new();
+    let mut work = 0usize;
+    let mut cur = parent;
+    while let Some(id) = cur {
+        if seen.len() >= max_visits {
+            return Err(bad("layer.setParent", "parent chain exceeds the safety visit limit"));
+        }
+        if !seen.insert(id) {
+            return Err(bad("layer.setParent", "parent chain contains an existing cycle"));
+        }
+        for selected in ids {
+            if work >= max_work {
+                return Err(bad("layer.setParent", "parent chain exceeds the safety work limit"));
+            }
+            work += 1;
+            if *selected == id {
+                return Err(bad("layer.setParent", "parenting would create a cycle"));
+            }
+        }
+        let mut ancestor = None;
+        for layer in &comp.layers {
+            if work >= max_work {
+                return Err(bad("layer.setParent", "parent chain exceeds the safety work limit"));
+            }
+            work += 1;
+            if layer.id == id {
+                ancestor = Some(layer);
+                break;
+            }
+        }
+        let layer = ancestor.ok_or_else(|| bad("layer.setParent", "parent chain refers to a missing layer"))?;
+        cur = layer.parent;
+    }
+    Ok(())
+}
+
+pub(super) fn set_parent(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let parent = match p.get("parent") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(resolve_layer(comp, v).ok_or_else(|| bad("layer.setParent", "no such parent layer"))?),
+    };
+    // A loaded cycle need not include a selected child. Validate before compensation or edit;
+    // do not impose the renderer's 64-ancestor truncation as a new ordinary hierarchy limit.
+    check_parent_chain(comp, &ids, parent, 4096, 1_048_576)?;
+    // Like AE's pick-whip, parenting keeps the layer where it is: its transform is re-expressed
+    // in the new parent's space (Position, Rotation, Scale), unless `compensate: false`.
+    let compensate = b_p(p, "compensate").unwrap_or(true);
+    let fixes = if compensate { parent_fixes(s, cid, &ids, parent) } else { vec![] };
+    s.edit("Parent", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            l.parent = parent;
+            if let Some(f) = fixes.iter().find(|f| f.layer == l.id) {
+                f.apply(l);
+            }
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+#[cfg(test)]
+mod parent_chain_tests {
+    use super::super::json;
+    use super::*;
+    use std::sync::Arc;
+
+    fn fixture() -> (Session, u64, u64, u64) {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name":"Parent safety","width":16,"height":16,"duration":1})).unwrap();
+        let a = s.execute("layer.newSolid", json!({"name":"A"})).unwrap()["layer"].as_u64().unwrap();
+        let b = s.execute("layer.newSolid", json!({"name":"B"})).unwrap()["layer"].as_u64().unwrap();
+        let c = s.execute("layer.newSolid", json!({"name":"C"})).unwrap()["layer"].as_u64().unwrap();
+        for id in [a, b, c] {
+            s.execute("prop.set", json!({"layer":id,"path":"transform/anchor","value":[0,0,0]})).unwrap();
+        }
+        s.execute("prop.set", json!({"layer":a,"path":"transform/position","value":[100,200,0]})).unwrap();
+        s.execute("prop.set", json!({"layer":c,"path":"transform/position","value":[10,20,0]})).unwrap();
+        s.history.undo.clear();
+        (s, a, b, c)
+    }
+    fn malformed_parent(s: &mut Session, child: u64, parent: u64) {
+        let cid = s.active_comp_id().unwrap();
+        Arc::make_mut(&mut s.project).comp_mut(cid).unwrap().layer_mut(LayerId(child)).unwrap().parent = Some(LayerId(parent));
+    }
+    fn assert_atomic_error(s: &mut Session, child: u64, parent: u64, compensate: bool, message: &str) {
+        let before = s.project.clone();
+        let revision = s.revision;
+        let undo = s.history.undo.len();
+        let err = s.execute("layer.setParent", json!({"layers":[child],"parent":parent,"compensate":compensate})).unwrap_err();
+        assert!(err.to_string().contains(message), "{err}");
+        assert!(Arc::ptr_eq(&before, &s.project));
+        assert_eq!(s.revision, revision);
+        assert_eq!(s.history.undo.len(), undo);
+    }
+    #[test]
+    fn loaded_cycle_excluding_selected_child_is_rejected_atomically() {
+        for compensate in [true, false] {
+            let (mut s, a, b, c) = fixture();
+            // Simulate a malformed loaded project. Never execute this on the unguarded baseline.
+            malformed_parent(&mut s, a, b);
+            malformed_parent(&mut s, b, a);
+            assert_atomic_error(&mut s, c, a, compensate, "existing cycle");
+        }
+    }
+    #[test]
+    fn dangling_loaded_parent_is_rejected_atomically() {
+        for compensate in [true, false] {
+            let (mut s, a, _, c) = fixture();
+            malformed_parent(&mut s, a, u64::MAX);
+            assert_atomic_error(&mut s, c, a, compensate, "missing layer");
+        }
+    }
+    #[test]
+    fn selected_descendant_and_direct_self_are_rejected() {
+        let (mut s, a, _, c) = fixture();
+        assert_atomic_error(&mut s, c, c, false, "create a cycle");
+        s.execute("layer.setParent", json!({"layers":[a],"parent":c,"compensate":false})).unwrap();
+        assert_atomic_error(&mut s, c, a, true, "create a cycle");
+    }
+    #[test]
+    fn ordinary_parent_and_unparent_keep_explicit_false_and_undo_semantics() {
+        for compensate in [true, false] {
+            let (mut s, a, _, c) = fixture();
+            let old = s.project.clone();
+            let world = |s: &Session| {
+                let cid = s.active_comp_id().unwrap();
+                let comp = s.active_comp().unwrap();
+                let ctx = effectcraft_render::EvalCtx::new(&s.project, cid, comp, s.time());
+                ctx.world_matrix(comp.layer(LayerId(c)).unwrap()).apply(effectcraft_geom::Vec3::ZERO)
+            };
+            let before = world(&s);
+            s.execute("layer.setParent", json!({"layers":[c],"parent":a,"compensate":compensate})).unwrap();
+            let expected = if compensate { before } else { before + effectcraft_geom::vec3(100.0, 200.0, 0.0) };
+            assert!((world(&s) - expected).length() < 1e-9);
+            assert_eq!(s.active_comp().unwrap().layer(LayerId(c)).unwrap().parent, Some(LayerId(a)));
+            assert_eq!(s.history.undo.len(), 1);
+            let parented = s.project.clone();
+            assert!(s.undo());
+            assert!(Arc::ptr_eq(&s.project, &old));
+            assert!(s.redo());
+            assert!(Arc::ptr_eq(&s.project, &parented));
+            s.execute("layer.setParent", json!({"layers":[c],"parent":null,"compensate":compensate})).unwrap();
+            assert_eq!(s.active_comp().unwrap().layer(LayerId(c)).unwrap().parent, None);
+            assert!(s.undo());
+            assert!(Arc::ptr_eq(&s.project, &parented));
+        }
+    }
+    #[test]
+    fn ancestor_and_lookup_work_budgets_fail_closed() {
+        let (mut s, a, b, c) = fixture();
+        malformed_parent(&mut s, a, b);
+        let comp = s.active_comp().unwrap();
+        // New solids are inserted above the selection: C,B,A. Walking A->B scans
+        // three then two layers, and compares the one selected child twice: seven work units.
+        assert_eq!(comp.layers.iter().map(|l| l.id).collect::<Vec<_>>(), vec![LayerId(c), LayerId(b), LayerId(a)]);
+        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 7).is_ok());
+        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 6).unwrap_err().to_string().contains("work limit"));
+        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 256).is_ok());
+        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 1, 256).unwrap_err().to_string().contains("visit limit"));
+        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 1).unwrap_err().to_string().contains("work limit"));
+        assert!(check_parent_chain(comp, &[LayerId(c)], None, 0, 0).is_ok(), "unparenting does not traverse ancestors");
+    }
+
+    #[test]
+    fn well_formed_chain_beyond_renderer_depth_is_not_unnecessarily_rejected() {
+        let (s, _, _, c) = fixture();
+        let mut comp = s.active_comp().unwrap().clone();
+        let template = comp.layers.first().unwrap().clone();
+        for n in 0..80 {
+            let mut layer = template.clone();
+            layer.id = LayerId(10_000 + n);
+            layer.parent = (n < 79).then_some(LayerId(10_001 + n));
+            comp.layers.push(layer);
+        }
+        assert!(check_parent_chain(&comp, &[LayerId(c)], Some(LayerId(10_000)), 4096, 1_048_576).is_ok());
+    }
+}
diff --git a/crates/engine/src/cmd/layer/replace.rs b/crates/engine/src/cmd/layer/replace.rs
new file mode 100644
index 000000000..80e5be807
--- /dev/null
+++ b/crates/engine/src/cmd/layer/replace.rs
@@ -0,0 +1,101 @@
+use super::{
+    EngineError, FootageKind, Ids, ItemId, ItemKind, Layer, LayerSource, Project, Result, Session, Value, bad, build, has_comp, json, layer_mut, layers_p,
+    unlocked,
+};
+
+/// A layer whose source is an item (footage, precomposition or solid), as in After Effects'
+/// Replace Source. Text, shape, null, camera, light and 3D model layers have no AVItem source to
+/// replace.
+fn replaceable_layer(l: &Layer) -> bool {
+    matches!(l.source, LayerSource::Footage { .. } | LayerSource::Comp { .. } | LayerSource::Solid { .. })
+}
+
+/// The source a Project item gives a layer, or why it can't replace one.
+fn replacement_source(item: ItemId, it: &effectcraft_project::Item) -> Result<LayerSource> {
+    const CMD: &str = "layer.replaceSource";
+    match &it.kind {
+        ItemKind::Comp(_) => Ok(LayerSource::Comp { item }),
+        ItemKind::Footage(f) if f.kind == FootageKind::Data => {
+            Err(bad(CMD, "data files can't be layer sources; read them in expressions with footage(\"name\").sourceData"))
+        }
+        ItemKind::Footage(f) if f.kind == FootageKind::Model => Err(bad(CMD, "3D model items can't replace a 2D layer source; add them as 3D layers")),
+        ItemKind::Footage(_) => Ok(LayerSource::Footage { item }),
+        ItemKind::Solid(_) => Ok(LayerSource::Solid { item }),
+        ItemKind::Folder => Err(bad(CMD, "folders can't be layer sources")),
+    }
+}
+
+/// Whether a source brings audio properties (precompositions always can; footage when it has an
+/// audio stream).
+fn source_has_audio(project: &Project, source: &LayerSource) -> bool {
+    match source {
+        LayerSource::Comp { .. } => true,
+        LayerSource::Footage { item } => project.item(*item).is_some_and(|i| matches!(&i.kind, ItemKind::Footage(f) if f.has_audio)),
+        _ => false,
+    }
+}
+
+pub(super) fn has_replace_source(s: &Session) -> std::result::Result<(), String> {
+    has_comp(s)?;
+    let c = s.active_comp().ok_or("no composition")?;
+    if !s.state.selected_layers.iter().filter_map(|l| c.layer(*l)).any(replaceable_layer) {
+        return Err("select a footage, composition or solid layer".into());
+    }
+    if s.state.project_selection.is_empty() {
+        return Err("select a footage item, a composition or a solid in the Project panel".into());
+    }
+    Ok(())
+}
+
+/// Replace the source of the selected (or `layers`) AV layers with a Project item, as After
+/// Effects' Alt-drag and Ctrl+Alt+/ do. The layer keeps every property: name, timing, transforms,
+/// keyframes, expressions, effects, masks, switches, parenting and track matte. Only its source
+/// changes; precompositions bring their Essential Properties group through `sync_project`, and a
+/// source with audio adds an Audio group when the layer has none.
+pub(super) fn replace_source(s: &mut Session, p: &Value) -> Result<Value> {
+    const CMD: &str = "layer.replaceSource";
+    let (cid, ids) = layers_p(s, p)?;
+    let ids = unlocked(s, cid, ids, CMD)?;
+    if ids.is_empty() {
+        return Err(bad(CMD, "select a layer first"));
+    }
+    let item = match p.get("item") {
+        Some(Value::Number(n)) => ItemId(n.as_u64().ok_or_else(|| bad(CMD, "item: a project item id"))?),
+        Some(Value::String(name)) => s.project.find_by_name(name).map(|i| i.id).ok_or_else(|| bad(CMD, format!("no item `{name}`")))?,
+        _ => *s.state.project_selection.first().ok_or_else(|| bad(CMD, "select a footage item, a composition or a solid in the Project panel"))?,
+    };
+    let it = s.project.item(item).ok_or_else(|| bad(CMD, format!("no item {}", item.0)))?;
+    let source = replacement_source(item, it)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    for lid in &ids {
+        let l = comp.layer(*lid).ok_or_else(|| bad(CMD, "no such layer"))?;
+        if !replaceable_layer(l) {
+            return Err(bad(CMD, format!("“{}” has no source item to replace", l.name)));
+        }
+    }
+    if let LayerSource::Comp { item: new } = &source
+        && s.project.comp_contains(*new, cid)
+    {
+        return Err(bad(CMD, "a composition can't contain itself"));
+    }
+    let has_audio = source_has_audio(&s.project, &source);
+    let source_for_edit = source.clone();
+    s.edit("Replace Layer Source", None, |proj, _| {
+        for lid in &ids {
+            let needs_audio = has_audio && proj.comp(cid).and_then(|c| c.layer(*lid)).is_some_and(|l| l.props.sub("audio").is_none());
+            let audio = if needs_audio {
+                let mut next = Ids(&mut proj.next_id);
+                Some(build::audio(&mut next))
+            } else {
+                None
+            };
+            let l = layer_mut(proj, cid, *lid)?;
+            l.source = source_for_edit.clone();
+            if let Some(audio) = audio {
+                l.props.children.push(audio.into());
+            }
+        }
+        Ok(())
+    })?;
+    Ok(json!({"layers": ids.iter().map(|l| l.0).collect::<Vec<_>>(), "item": item.0}))
+}
diff --git a/crates/engine/src/cmd/layer/select.rs b/crates/engine/src/cmd/layer/select.rs
new file mode 100644
index 000000000..0edf7a72c
--- /dev/null
+++ b/crates/engine/src/cmd/layer/select.rs
@@ -0,0 +1,73 @@
+use super::{EngineError, LayerId, Result, Session, Value, b_p, comp_id, json, resolve_layer};
+
+pub(super) fn select(s: &mut Session, p: &Value) -> Result<Value> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let ids: Vec<LayerId> = match p.get("layers").or(p.get("layer")) {
+        Some(Value::Array(a)) => a.iter().filter_map(|v| resolve_layer(comp, v)).collect(),
+        Some(v) => resolve_layer(comp, v).into_iter().collect(),
+        None => vec![],
+    };
+    let add = b_p(p, "add").unwrap_or(false);
+    let toggle = b_p(p, "toggle").unwrap_or(false);
+    if toggle {
+        for id in ids {
+            if let Some(i) = s.state.selected_layers.iter().position(|l| *l == id) {
+                s.state.selected_layers.remove(i);
+            } else {
+                s.state.selected_layers.push(id);
+            }
+        }
+    } else if add {
+        for id in ids {
+            if !s.state.selected_layers.contains(&id) {
+                s.state.selected_layers.push(id);
+            }
+        }
+    } else {
+        s.state.selected_layers = ids;
+        s.state.selected_props.clear();
+        s.state.selected_keys.clear();
+        let keep = s.state.selected_layers.clone();
+        s.state.selected_vertices.retain(|v| keep.contains(&v.layer));
+    }
+    Ok(json!(s.state.selected_layers.iter().map(|l| l.0).collect::<Vec<_>>()))
+}
+
+pub(super) fn select_step(s: &mut Session, p: &Value, dir: i64) -> Result<Value> {
+    let comp = s.active_comp().ok_or(EngineError::NoComp)?;
+    if comp.layers.is_empty() {
+        return Ok(Value::Null);
+    }
+    let cur = s.state.selected_layers.first().and_then(|id| comp.layers.iter().position(|l| l.id == *id));
+    let n = comp.layers.len() as i64;
+    // The next layer that can be selected (locked and hidden shy layers are stepped over); at
+    // the end of the stack the selection stays.
+    let start = match cur {
+        Some(i) => i as i64 + dir,
+        None if dir > 0 => 0,
+        None => n - 1,
+    };
+    let next = std::iter::successors(Some(start), |i| Some(i + dir))
+        .take_while(|i| (0..n).contains(i))
+        .find(|i| crate::cmd::selectable(comp, &comp.layers[*i as usize]));
+    let Some(i) = next.or(cur.map(|i| i as i64)) else { return Ok(Value::Null) };
+    let id = comp.layers[i as usize].id;
+    let add = b_p(p, "add").unwrap_or(false);
+    if add {
+        if !s.state.selected_layers.contains(&id) {
+            s.state.selected_layers.insert(0, id);
+        }
+    } else {
+        s.state.selected_layers = vec![id];
+    }
+    Ok(json!(id.0))
+}
+
+pub(super) fn select_next(s: &mut Session, p: &Value) -> Result<Value> {
+    select_step(s, p, 1)
+}
+
+pub(super) fn select_prev(s: &mut Session, p: &Value) -> Result<Value> {
+    select_step(s, p, -1)
+}
diff --git a/crates/engine/src/cmd/layer/switches.rs b/crates/engine/src/cmd/layer/switches.rs
new file mode 100644
index 000000000..38689afbb
--- /dev/null
+++ b/crates/engine/src/cmd/layer/switches.rs
@@ -0,0 +1,213 @@
+use super::{
+    BlendMode, EngineError, FrameBlend, ItemId, KV, Layer, LayerId, MatteKind, Quality, Result, Session, TrackMatte, Value, b_p, bad, json, layer_mut, layer_p,
+    layers_p, merge_p, resolve_layer, str_p,
+};
+
+pub(super) fn set_switch(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let name = str_p(p, "switch").ok_or_else(|| bad("layer.setSwitch", "missing `switch`"))?.to_string();
+    let v = b_p(p, "value");
+    let label = format!("Layer Switch ({name})");
+    if b_p(p, "others") == Some(true) {
+        return set_switch_others(s, cid, &ids, &name, v, &label);
+    }
+    // `merge`: a switch dragged over several layers in the Timeline is one undo step.
+    let r = s.edit(&label, merge_p(p), |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        let mut last = false;
+        // Toggle relative to the first layer so a multi-selection ends up consistent.
+        let first = comp.layers.iter().find(|l| ids.contains(&l.id)).map(|l| switch_value(l, &name)).unwrap_or(Some(false));
+        let Some(first) = first else { return Err(bad("layer.setSwitch", format!("unknown switch `{name}`"))) };
+        let target = v.unwrap_or(!first);
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            set_switch_value(l, &name, target);
+            last = target;
+        }
+        Ok(last)
+    })?;
+    Ok(json!(r))
+}
+
+/// `layer.setSwitch {others: true}` (Alt-click on an A/V feature in the Timeline): the named
+/// layers stand alone, shown / heard / soloed / unlocked while every other layer the switch
+/// applies to is the opposite; when they already do, the other layers come back. `value` sets
+/// the other layers directly.
+fn set_switch_others(s: &mut Session, cid: ItemId, ids: &[LayerId], name: &str, value: Option<bool>, label: &str) -> Result<Value> {
+    let r = s.edit(label, None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        // The state that sets a layer apart: unlocked for Lock, on for the rest.
+        let active = !matches!(name, "lock" | "locked");
+        // Track mattes keep their video off by design.
+        let mattes: Vec<LayerId> =
+            if matches!(name, "video" | "eye") { comp.layers.iter().filter_map(|l| l.track_matte.map(|m| m.layer)).collect() } else { Vec::new() };
+        let applies = |l: &Layer| match name {
+            "audio" => l.props.sub("audio").is_some(),
+            "lock" | "locked" => true,
+            // Every layer has a Video switch (it hides a null's outline in the viewer and turns a
+            // camera or light off), as the Timeline's eye cell shows; track mattes keep theirs off
+            // by design.
+            "video" | "eye" => !mattes.contains(&l.id),
+            _ => l.source.is_av() && !mattes.contains(&l.id),
+        };
+        let mut alone = true;
+        for l in comp.layers.iter().filter(|l| applies(l)) {
+            let Some(on) = switch_value(l, name) else { return Err(bad("layer.setSwitch", format!("unknown switch `{name}`"))) };
+            alone &= on == (ids.contains(&l.id) == active);
+        }
+        let others = value.unwrap_or(alone == active);
+        for l in comp.layers.iter_mut().filter(|l| applies(l)) {
+            let v = if ids.contains(&l.id) { active } else { others };
+            set_switch_value(l, name, v);
+        }
+        Ok(others)
+    })?;
+    Ok(json!(r))
+}
+
+fn switch_value(l: &Layer, name: &str) -> Option<bool> {
+    let sw = &l.switches;
+    Some(match name {
+        "video" | "eye" => sw.video,
+        "audio" => sw.audio,
+        "solo" => sw.solo,
+        "lock" | "locked" => sw.locked,
+        "shy" => sw.shy,
+        "collapse" => sw.collapse,
+        "quality" => sw.quality == Quality::Best,
+        "fx" | "effects" => sw.effects,
+        "frameBlend" => sw.frame_blend != FrameBlend::Off,
+        "motionBlur" => sw.motion_blur,
+        "adjustment" => sw.adjustment,
+        "threeD" | "3d" | "3D" => sw.three_d,
+        "guide" => sw.guide,
+        "preserveTransparency" => l.preserve_transparency,
+        _ => return None,
+    })
+}
+
+fn set_switch_value(l: &mut Layer, name: &str, v: bool) {
+    let sw = &mut l.switches;
+    match name {
+        "video" | "eye" => sw.video = v,
+        "audio" => sw.audio = v,
+        "solo" => sw.solo = v,
+        "lock" | "locked" => sw.locked = v,
+        "shy" => sw.shy = v,
+        "collapse" => sw.collapse = v,
+        "quality" => sw.quality = if v { Quality::Best } else { Quality::Draft },
+        "fx" | "effects" => sw.effects = v,
+        "frameBlend" => sw.frame_blend = if v { FrameBlend::FrameMix } else { FrameBlend::Off },
+        "motionBlur" => sw.motion_blur = v,
+        "adjustment" => sw.adjustment = v,
+        "threeD" | "3d" | "3D" => {
+            if sw.three_d && !v {
+                drop_3d_values(l);
+            }
+            l.switches.three_d = v;
+        }
+        "guide" => sw.guide = v,
+        "preserveTransparency" => l.preserve_transparency = v,
+        _ => {}
+    }
+}
+
+/// Turning the 3D switch off discards Z values, Orientation and X/Y Rotation (as in AE).
+fn drop_3d_values(l: &mut Layer) {
+    let Some(tr) = l.transform_mut() else { return };
+    for (m, keep) in [("position", 0.0), ("anchor", 0.0), ("scale", 100.0)] {
+        if let Some(pr) = tr.get_mut(m) {
+            let flat = |v: &mut KV| {
+                if let KV::Vec3(a) = v {
+                    a[2] = keep;
+                }
+            };
+            flat(&mut pr.value);
+            for k in &mut pr.keys {
+                flat(&mut k.value);
+            }
+        }
+    }
+    for (m, zero) in [("orientation", KV::Vec3([0.0; 3])), ("rotationX", KV::Scalar(0.0)), ("rotationY", KV::Scalar(0.0))] {
+        if let Some(pr) = tr.get_mut(m) {
+            pr.keys.clear();
+            pr.expr = None;
+            pr.value = zero;
+        }
+    }
+}
+
+pub(super) fn rename(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.rename")?;
+    let name = str_p(p, "name").ok_or_else(|| bad("layer.rename", "missing `name`"))?.to_string();
+    s.edit("Rename Layer", None, |proj, _| {
+        layer_mut(proj, cid, lid)?.name = name.clone();
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+/// The Timeline's Comment column.
+pub(super) fn set_comment(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let text = str_p(p, "comment").ok_or_else(|| bad("layer.setComment", "missing `comment`"))?.to_string();
+    s.edit("Layer Comment", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            l.comment = text.clone();
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+pub(super) fn blend(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let mode = str_p(p, "mode").and_then(BlendMode::from_name);
+    let step = p.get("step").and_then(Value::as_i64).unwrap_or(0);
+    if mode.is_none() && step == 0 {
+        return Err(bad("layer.setBlendMode", "need `mode` (e.g. Multiply) or `step` ±1"));
+    }
+    s.edit("Blending Mode", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            l.blend_mode = match mode {
+                Some(m) => m,
+                None if step > 0 => l.blend_mode.next(),
+                None => l.blend_mode.previous(),
+            };
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+pub(super) fn track_matte(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.setTrackMatte")?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let matte = match p.get("matte") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(resolve_layer(comp, v).ok_or_else(|| bad("layer.setTrackMatte", "no such matte layer"))?),
+    };
+    let kind = str_p(p, "kind")
+        .map(|k| match k.to_ascii_lowercase().replace([' ', '_', '-'], "").as_str() {
+            "alphainverted" | "alphainv" => MatteKind::AlphaInverted,
+            "luma" => MatteKind::Luma,
+            "lumainverted" | "lumainv" => MatteKind::LumaInverted,
+            _ => MatteKind::Alpha,
+        })
+        .unwrap_or(MatteKind::Alpha);
+    s.edit("Track Matte", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        if let Some(m) = matte {
+            if m == lid {
+                return Err(bad("layer.setTrackMatte", "a layer can't be its own matte"));
+            }
+            if let Some(ml) = comp.layer_mut(m) {
+                ml.switches.video = false;
+            }
+        }
+        comp.layer_mut(lid).ok_or(EngineError::NoComp)?.track_matte = matte.map(|layer| TrackMatte { layer, kind });
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
diff --git a/crates/engine/src/cmd/layer/timing.rs b/crates/engine/src/cmd/layer/timing.rs
new file mode 100644
index 000000000..711eefee2
--- /dev/null
+++ b/crates/engine/src/cmd/layer/timing.rs
@@ -0,0 +1,286 @@
+use super::{
+    EngineError, ItemKind, Label, Layer, LayerId, LayerSource, Result, Session, Tick, Value, b_p, bad, build, f_p, json, layer_mut, layers_p, merge_p,
+    resolve_layer, str_p, unlocked, with,
+};
+
+pub(super) fn timing(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let t = s.time();
+    let op = str_p(p, "op").unwrap_or("set").to_string();
+    // Layer times stay on frame boundaries of the comp (as in AE).
+    let fr = s.project.comp(cid).ok_or(EngineError::NoComp)?.frame_rate;
+    let snap = |k: &str| f_p(p, k).map(|v| fr.snap_nearest(Tick::from_seconds_f64(v)));
+    let (delta, start, inp, outp) = (snap("delta"), snap("start"), snap("in"), snap("out"));
+    // Relative trims: each layer moves its own in/out point by the same amount, so dragging an
+    // edge of several selected layers trims them all together (as in AE).
+    let (in_delta, out_delta) = (snap("inDelta"), snap("outDelta"));
+    s.edit("Layer Timing", merge_p(p), |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        let fd = comp.frame_duration();
+        let comp_dur = comp.duration;
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            let shift = |l: &mut Layer, d: Tick| {
+                l.start_time += d;
+                l.in_point += d;
+                l.out_point += d;
+            };
+            match op.as_str() {
+                "moveInToTime" => {
+                    let d = t - l.in_point;
+                    shift(l, d);
+                }
+                "moveOutToTime" => {
+                    let d = t - l.out_point;
+                    shift(l, d);
+                }
+                "moveInToStart" => {
+                    let d = Tick::ZERO - l.in_point;
+                    shift(l, d);
+                }
+                "moveOutToEnd" => {
+                    let d = comp_dur - l.out_point;
+                    shift(l, d);
+                }
+                "trimInToTime" => l.in_point = t.min(l.out_point - fd),
+                "trimOutToTime" => l.out_point = t.max(l.in_point + fd),
+                _ => {
+                    if let Some(d) = delta {
+                        shift(l, d);
+                    }
+                    if let Some(st) = start {
+                        let d = st - l.start_time;
+                        shift(l, d);
+                    }
+                    if let Some(i) = inp {
+                        l.in_point = i.min(l.out_point - fd);
+                    }
+                    if let Some(o) = outp {
+                        l.out_point = o.max(l.in_point + fd);
+                    }
+                    // Stops at the comp start/end (a point already past it doesn't jump onto
+                    // it), keeping at least one frame of layer.
+                    if let Some(d) = in_delta {
+                        l.in_point = (l.in_point + d).max(Tick::ZERO.min(l.in_point)).min(l.out_point - fd);
+                    }
+                    if let Some(d) = out_delta {
+                        l.out_point = (l.out_point + d).min(comp_dur.max(l.out_point)).max(l.in_point + fd);
+                    }
+                }
+            }
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+/// Move the layers `frames` frames in time (Alt+Page Up / Page Down, with Shift ten frames).
+pub(super) fn move_frames(s: &mut Session, p: &Value, frames: i64) -> Result<Value> {
+    let (cid, _) = layers_p(s, p)?;
+    let delta = s.project.comp(cid).ok_or(EngineError::NoComp)?.frame_rate.tick_of(frames).seconds();
+    timing(s, &with(p, "delta", json!(delta)))
+}
+
+/// Slip edit: move a layer's source (footage or precomp) under its fixed in and out points, like
+/// dragging the source-duration bar in After Effects. `delta` in seconds or `frames`; positive
+/// moves the source later. Clamped so the source still covers the in–out span. Keyframes and
+/// layer markers are in layer time, so they travel with the source.
+pub(super) fn slip(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let fr = comp.frame_rate;
+    let delta = match (p.get("frames").and_then(Value::as_i64), f_p(p, "delta")) {
+        (Some(f), _) => fr.tick_of(f),
+        (None, Some(d)) => fr.snap_nearest(Tick::from_seconds_f64(d)),
+        _ => return Err(bad("layer.slip", "delta (seconds) or frames required")),
+    };
+    // Allowed shift per layer: the source span [lo, hi] in comp time must keep covering in..out.
+    let mut shifts: Vec<(LayerId, Tick)> = Vec::new();
+    for l in comp.layers.iter().filter(|l| ids.contains(&l.id)) {
+        if l.props.get("timeRemap").is_some() {
+            continue;
+        }
+        let dur = match &l.source {
+            LayerSource::Footage { item } => match s.project.item(*item).map(|i| &i.kind) {
+                Some(ItemKind::Footage(f)) if f.kind != effectcraft_project::FootageKind::Still => Some(f.looped_duration()),
+                _ => None,
+            },
+            LayerSource::Comp { item } => s.project.comp(*item).map(|c| c.duration),
+            _ => None,
+        };
+        let Some(dur) = dur else { continue };
+        let (a, b) = (l.comp_time(Tick::ZERO), l.comp_time(dur));
+        let (lo, hi) = (a.min(b), a.max(b));
+        let (min_d, max_d) = (l.out_point - hi, l.in_point - lo);
+        if min_d > max_d {
+            continue;
+        }
+        shifts.push((l.id, delta.max(min_d).min(max_d)));
+    }
+    if shifts.is_empty() {
+        return Err(bad("layer.slip", "select a footage or precomp layer (without time remapping)"));
+    }
+    s.edit("Slip Edit", merge_p(p), |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        for (id, d) in &shifts {
+            if let Some(l) = comp.layer_mut(*id) {
+                l.start_time += *d;
+            }
+        }
+        Ok(())
+    })?;
+    Ok(json!({"slipped": shifts.iter().map(|(id, d)| json!({"layer": id.0, "delta": d.seconds()})).collect::<Vec<_>>()}))
+}
+
+pub(super) fn arrange(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let ids = unlocked(s, cid, ids, "layer.arrange")?;
+    let how = str_p(p, "to").unwrap_or("front").to_string();
+    let index = p.get("index").and_then(Value::as_u64).map(|i| i as usize);
+    // `above`: put the layers right above that one (the timeline's drag to reorder).
+    let above = match p.get("above") {
+        Some(v) => {
+            let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+            let a = resolve_layer(comp, v).ok_or_else(|| bad("layer.arrange", "no such layer for `above`"))?;
+            if ids.contains(&a) {
+                return Err(bad("layer.arrange", "`above` must be a layer that isn't being moved"));
+            }
+            Some(a)
+        }
+        None => None,
+    };
+    s.edit("Arrange Layers", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        // Bring Forward / Send Backward move each layer one step past the next layer that isn't
+        // moving (a run of selected layers moves as one; one already at the end stays).
+        if above.is_none() && index.is_none() && matches!(how.as_str(), "forward" | "backward") {
+            let picked = |l: &Layer| ids.contains(&l.id);
+            let n = comp.layers.len();
+            if how == "forward" {
+                for i in 1..n {
+                    if picked(&comp.layers[i]) && !picked(&comp.layers[i - 1]) {
+                        let run_end = (i..n).find(|j| !picked(&comp.layers[*j])).unwrap_or(n);
+                        comp.layers[i - 1..run_end].rotate_left(1);
+                    }
+                }
+            } else {
+                for i in (0..n.saturating_sub(1)).rev() {
+                    if picked(&comp.layers[i]) && !picked(&comp.layers[i + 1]) {
+                        let run_start = (0..=i).rev().find(|j| !picked(&comp.layers[*j])).map_or(0, |j| j + 1);
+                        comp.layers[run_start..=i + 1].rotate_right(1);
+                    }
+                }
+            }
+            return Ok(());
+        }
+        let mut picked: Vec<Layer> = Vec::new();
+        comp.layers.retain(|l| {
+            if ids.contains(&l.id) {
+                picked.push(l.clone());
+                false
+            } else {
+                true
+            }
+        });
+        let at = match (how.as_str(), index) {
+            _ if above.is_some() => comp.layers.iter().position(|l| Some(l.id) == above).unwrap_or(comp.layers.len()),
+            (_, Some(i)) => i.saturating_sub(1).min(comp.layers.len()),
+            ("back", _) => comp.layers.len(),
+            _ => 0,
+        };
+        for (k, l) in picked.into_iter().enumerate() {
+            comp.layers.insert((at + k).min(comp.layers.len()), l);
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+/// Layer ▸ Pre-compose. `mode: move` (default; "Move all attributes into the new composition")
+/// nests the selected layers as they are; `mode: leave` ("Leave all attributes in", one footage,
+/// solid or precomp layer) nests only the layer's source, sized to it, and keeps the layer's
+/// transform, masks, effects and timing in the current comp. `adjustDuration` (move) trims the
+/// new comp to the selected layers' span; `open` opens the new comp.
+pub(super) fn precompose(s: &mut Session, p: &Value) -> Result<Value> {
+    let c = "layer.precompose";
+    let (cid, ids) = layers_p(s, p)?;
+    if ids.is_empty() {
+        return Err(bad(c, "no layers"));
+    }
+    let name = str_p(p, "name").unwrap_or("Pre-comp 1").to_string();
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let leave = match str_p(p, "mode").unwrap_or("move") {
+        "move" => false,
+        "leave" => true,
+        x => return Err(bad(c, format!("mode: move|leave, got `{x}`"))),
+    };
+    let adjust = b_p(p, "adjustDuration").unwrap_or(false);
+    if leave {
+        let [lid] = ids[..] else { return Err(bad(c, "\"Leave all attributes\" needs exactly one layer")) };
+        let layer = comp.layer(lid).ok_or(EngineError::NoComp)?.clone();
+        let Some(src_item) = layer.source.item() else {
+            return Err(bad(c, "\"Leave all attributes\" is available for footage, solid and precomp layers only"));
+        };
+        let (w, h) = effectcraft_render::source_size(&s.project, &layer);
+        let (w, h) = if w == 0 || h == 0 { (comp.width, comp.height) } else { (w, h) };
+        let dur = match s.project.item(src_item).map(|i| &i.kind) {
+            Some(ItemKind::Comp(nc)) => nc.duration,
+            Some(ItemKind::Footage(f)) if f.duration > Tick(0) => f.duration,
+            _ => comp.duration,
+        };
+        let new = s.edit("Pre-compose", None, |proj, st| {
+            let mut inner = comp.nested_like(w, h, dur);
+            let mut il = build::layer(proj, &inner, &layer.name, layer.source.clone(), (w, h), Some(dur));
+            il.name = layer.name.clone();
+            inner.layers.push(il);
+            let iid = proj.add_item(&name, Label::Sandstone, None, ItemKind::Comp(inner.into()));
+            let l = layer_mut(proj, cid, lid)?;
+            l.source = LayerSource::Comp { item: iid };
+            l.name = name.clone();
+            st.selected_layers = vec![lid];
+            Ok((iid, lid))
+        })?;
+        if b_p(p, "open").unwrap_or(false) {
+            s.open_comp(new.0);
+        }
+        return Ok(json!({"comp": new.0.0, "layer": new.1.0}));
+    }
+    let span = {
+        let sel: Vec<&effectcraft_project::Layer> = comp.layers.iter().filter(|l| ids.contains(&l.id)).collect();
+        let a = sel.iter().map(|l| l.in_point).min().unwrap_or(Tick(0)).max(Tick(0));
+        let b = sel.iter().map(|l| l.out_point).max().unwrap_or(comp.duration).min(comp.duration);
+        (a, b)
+    };
+    let (offset, dur) = if adjust && span.1 > span.0 { (span.0, span.1 - span.0) } else { (Tick(0), comp.duration) };
+    let new = s.edit("Pre-compose", None, |proj, st| {
+        let mut inner = comp.nested_like(comp.width, comp.height, dur);
+        inner.layers = comp.layers.iter().filter(|l| ids.contains(&l.id)).cloned().collect();
+        for l in &mut inner.layers {
+            if l.parent.is_some_and(|p| !ids.contains(&p)) {
+                l.parent = None;
+            }
+            if l.track_matte.is_some_and(|m| !ids.contains(&m.layer)) {
+                l.track_matte = None;
+            }
+            l.start_time -= offset;
+            l.in_point -= offset;
+            l.out_point -= offset;
+        }
+        let iid = proj.add_item(&name, Label::Sandstone, None, ItemKind::Comp(inner.into()));
+        let mut l = build::layer(proj, &comp, &name, LayerSource::Comp { item: iid }, (comp.width, comp.height), Some(dur));
+        l.name = name.clone();
+        l.start_time = offset;
+        l.in_point = offset;
+        l.out_point = offset + dur;
+        let c = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        let at = c.layers.iter().position(|l| ids.contains(&l.id)).unwrap_or(0);
+        c.layers.retain(|l| !ids.contains(&l.id));
+        let lid = l.id;
+        c.layers.insert(at.min(c.layers.len()), l);
+        st.selected_layers = vec![lid];
+        Ok((iid, lid))
+    })?;
+    if b_p(p, "open").unwrap_or(false) {
+        s.open_comp(new.0);
+    }
+    Ok(json!({"comp": new.0.0, "layer": new.1.0}))
+}
diff --git a/crates/engine/src/cmd/layer/transform.rs b/crates/engine/src/cmd/layer/transform.rs
new file mode 100644
index 000000000..8b75dcbc8
--- /dev/null
+++ b/crates/engine/src/cmd/layer/transform.rs
@@ -0,0 +1,194 @@
+use super::create::{color_p, pixel_aspect_p};
+use super::{
+    EngineError, ItemKind, KV, LayerId, LayerSource, PropGroup, Result, Session, Tick, Value, bad, has_layers, json, layer_mut, layer_p, layers_p, limits,
+    str_p, unlocked,
+};
+
+/// Move Position by `(dx, dy)`, including every key. Separated dimensions move X and Y as well
+/// as the combined property the channels were split from.
+pub(crate) fn offset_position(tr: &mut PropGroup, dx: f64, dy: f64) {
+    if dx == 0.0 && dy == 0.0 {
+        return;
+    }
+    if tr.get("positionX").is_some() {
+        for (name, d) in [("positionX", dx), ("positionY", dy)] {
+            if let Some(pr) = tr.get_mut(name) {
+                pr.value = KV::Scalar(pr.value.as_f64() + d);
+                for k in &mut pr.keys {
+                    k.value = KV::Scalar(k.value.as_f64() + d);
+                }
+            }
+        }
+    }
+    if let Some(pr) = tr.get_mut("position") {
+        let shift = |v: &KV| match v {
+            KV::Vec2(a) => KV::Vec2([a[0] + dx, a[1] + dy]),
+            other => {
+                let a = other.as_vec3();
+                KV::Vec3([a[0] + dx, a[1] + dy, a[2]])
+            }
+        };
+        pr.value = shift(&pr.value);
+        for k in &mut pr.keys {
+            k.value = shift(&k.value);
+        }
+    }
+}
+
+/// Set a layer's Position at layer time `lt` to `f(current)`: X/Y/Z Position when its dimensions
+/// are separated.
+pub(crate) fn update_position(tr: &mut PropGroup, lt: Tick, f: impl Fn([f64; 3]) -> [f64; 3]) {
+    const SEPARATE: [&str; 3] = ["positionX", "positionY", "positionZ"];
+    if tr.get("positionX").is_some() {
+        let v = f(SEPARATE.map(|m| tr.get(m).map(|p| p.value_at(lt).as_f64()).unwrap_or(0.0)));
+        for (m, x) in SEPARATE.iter().zip(v) {
+            if let Some(pr) = tr.get_mut(m) {
+                pr.set_value_at(lt, KV::Scalar(x));
+            }
+        }
+    } else if let Some(pr) = tr.get_mut("position") {
+        let v = f(pr.value_at(lt).as_vec3());
+        pr.set_value_at(lt, KV::Vec3(v));
+    }
+}
+
+/// A Transform property's default (Reset) by match id: the anchor at the centre of the source
+/// (`w`×`h`), the position at the comp's (`cw`×`ch`), 100% scale and opacity, no rotation.
+pub(crate) fn transform_default(m: &str, (w, h): (f64, f64), (cw, ch): (f64, f64)) -> Option<KV> {
+    Some(match m {
+        "anchor" => KV::Vec3([w / 2.0, h / 2.0, 0.0]),
+        "position" => KV::Vec3([cw / 2.0, ch / 2.0, 0.0]),
+        "positionX" => KV::Scalar(cw / 2.0),
+        "positionY" => KV::Scalar(ch / 2.0),
+        "positionZ" | "rotation" | "rotationX" | "rotationY" => KV::Scalar(0.0),
+        "scale" => KV::Vec3([100.0; 3]),
+        "orientation" => KV::Vec3([0.0; 3]),
+        "opacity" => KV::Scalar(100.0),
+        _ => return None,
+    })
+}
+
+pub(super) fn transform_op(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let ids = unlocked(s, cid, ids, "layer.transform")?;
+    let op = str_p(p, "op").unwrap_or("reset").to_string();
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
+    let t = s.time();
+    let sizes: Vec<(LayerId, (u32, u32))> =
+        comp.layers.iter().filter(|l| ids.contains(&l.id)).map(|l| (l.id, effectcraft_render::source_size(&s.project, l))).collect();
+    s.edit("Transform", None, |proj, _| {
+        for (lid, (w, h)) in &sizes {
+            let l = layer_mut(proj, cid, *lid)?;
+            let lt = l.layer_time(t);
+            let (cw, ch) = (comp.width as f64, comp.height as f64);
+            let (w, h) = (*w as f64, *h as f64);
+            let Some(tr) = l.transform_mut() else { continue };
+            let set = |tr: &mut PropGroup, m: &str, v: KV| {
+                if let Some(pr) = tr.get_mut(m) {
+                    pr.set_value_at(lt, v);
+                }
+            };
+            match op.as_str() {
+                "reset" => {
+                    for m in ["anchor", "scale", "rotation", "rotationX", "rotationY", "orientation", "opacity"] {
+                        if let Some(v) = transform_default(m, (w, h), (cw, ch)) {
+                            set(tr, m, v);
+                        }
+                    }
+                    update_position(tr, lt, |_| [cw / 2.0, ch / 2.0, 0.0]);
+                }
+                // Centred in the frame; a 3D layer keeps its depth.
+                "center" => update_position(tr, lt, |p| [cw / 2.0, ch / 2.0, p[2]]),
+                "fit" | "fitWidth" | "fitHeight" if w > 0.0 && h > 0.0 => {
+                    let (sx, sy) = match op.as_str() {
+                        "fitWidth" => (cw / w, cw / w),
+                        "fitHeight" => (ch / h, ch / h),
+                        _ => (cw / w, ch / h),
+                    };
+                    let z = |m: &str, d: f64| tr.get(m).map(|p| p.value_at(lt).as_vec3()[2]).unwrap_or(d);
+                    let (sz, az) = (z("scale", 100.0), z("anchor", 0.0));
+                    set(tr, "scale", KV::Vec3([sx * 100.0, sy * 100.0, sz]));
+                    update_position(tr, lt, |p| [cw / 2.0, ch / 2.0, p[2]]);
+                    set(tr, "anchor", KV::Vec3([w / 2.0, h / 2.0, az]));
+                }
+                "flipH" | "flipV" => {
+                    let cur = tr.get("scale").map(|p| p.value_at(lt).as_vec3()).unwrap_or([100.0; 3]);
+                    let v = if op == "flipH" { [-cur[0], cur[1], cur[2]] } else { [cur[0], -cur[1], cur[2]] };
+                    set(tr, "scale", KV::Vec3(v));
+                }
+                _ => {}
+            }
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
+/// Layer ▸ Layer Settings: cameras and lights open their own settings; solids (and adjustment
+/// layers, which are solids) edit their Solid Settings. With `affectAll: false`, a solid other
+/// layers also use is copied into a new solid for this layer instead of being changed for all of
+/// them (After Effects' "Affect all layers that use this solid"). `name` renames the layer and
+/// its solid.
+pub(super) fn layer_settings(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, lid) = layer_p(s, p, "layer.settings")?;
+    // Cameras and lights open their own settings (Camera Settings / Light Settings).
+    match s.project.comp(cid).and_then(|c| c.layer(lid)).map(|l| l.source.clone()) {
+        Some(LayerSource::Camera) => return s.execute("layer.cameraSettings", with_layer(p, lid)),
+        Some(LayerSource::Light { .. }) => return s.execute("layer.lightSettings", with_layer(p, lid)),
+        _ => {}
+    }
+    let color = color_p(p, "color");
+    let w = p.get("width").and_then(Value::as_u64).map(limits::size);
+    let h = p.get("height").and_then(Value::as_u64).map(limits::size);
+    let pixel_aspect = pixel_aspect_p(p)?;
+    let name = str_p(p, "name").map(str::trim).filter(|n| !n.is_empty()).map(str::to_string);
+    let affect_all = p.get("affectAll").and_then(Value::as_bool).unwrap_or(true);
+    let solid = s.edit("Layer Settings", None, |proj, _| {
+        let src = layer_mut(proj, cid, lid)?.source.clone();
+        if let Some(n) = &name {
+            layer_mut(proj, cid, lid)?.name = n.clone();
+        }
+        let LayerSource::Solid { item } = src else { return Ok(None) };
+        let shared = proj.comps().flat_map(|(_, c)| &c.layers).filter(|l| l.source == src).count() > 1;
+        let target = if shared && !affect_all {
+            // This layer gets its own copy of the solid.
+            let it = proj.item(item).ok_or_else(|| bad("layer.settings", "the layer's solid is missing"))?.clone();
+            let copy = proj.add_item(name.as_deref().unwrap_or(&it.name), it.label, it.parent, it.kind);
+            layer_mut(proj, cid, lid)?.source = LayerSource::Solid { item: copy };
+            copy
+        } else {
+            item
+        };
+        let it = proj.item_mut(target).ok_or_else(|| bad("layer.settings", "the layer's solid is missing"))?;
+        if let Some(n) = &name {
+            it.name = n.clone();
+        }
+        if let ItemKind::Solid(so) = &mut it.kind {
+            so.color = color.unwrap_or(so.color);
+            so.width = w.unwrap_or(so.width);
+            so.height = h.unwrap_or(so.height);
+            so.pixel_aspect = pixel_aspect.unwrap_or(so.pixel_aspect);
+        }
+        Ok(Some(target))
+    })?;
+    Ok(match solid {
+        Some(item) => json!({"layer": lid.0, "solid": item.0}),
+        None => json!({"layer": lid.0}),
+    })
+}
+
+/// Layer Settings applies to solids (and adjustment layers), nulls, cameras and lights.
+pub(super) fn has_layer_settings(s: &Session) -> std::result::Result<(), String> {
+    has_layers(s)?;
+    let l = s.active_comp().zip(s.state.selected_layers.first()).and_then(|(c, l)| c.layer(*l)).ok_or("select a layer first")?;
+    match l.source {
+        LayerSource::Solid { .. } | LayerSource::Null | LayerSource::Camera | LayerSource::Light { .. } => Ok(()),
+        _ => Err("this kind of layer has no settings".into()),
+    }
+}
+
+fn with_layer(p: &Value, lid: LayerId) -> Value {
+    let mut p = if p.is_object() { p.clone() } else { json!({}) };
+    p["layer"] = json!(lid.0);
+    p
+}
diff --git a/crates/engine/src/commands/layer_menu.rs b/crates/engine/src/cmd/layer_menu.rs
similarity index 96%
rename from crates/engine/src/commands/layer_menu.rs
rename to crates/engine/src/cmd/layer_menu.rs
index 9cac80412..33d17bb4f 100644
--- a/crates/engine/src/commands/layer_menu.rs
+++ b/crates/engine/src/cmd/layer_menu.rs
@@ -114,10 +114,10 @@ fn frame_blending(s: &mut Session, p: &Value) -> Result<Value> {
 fn hide_other_video(s: &mut Session, p: &Value) -> Result<Value> {
     let (cid, ids) = layers_p(s, p)?;
     s.edit("Hide Other Video", None, |proj, _| {
-        for l in proj.comp_mut(cid).ok_or(EngineError::NoComp)?.layers.iter_mut() {
-            if !ids.contains(&l.id) && (l.source.is_av() || matches!(l.source, LayerSource::Null)) {
-                l.switches.video = false;
-            }
+        // Every layer has a Video switch (nulls, cameras and lights included, as the Timeline's
+        // eye cell shows): the selection stays shown.
+        for l in proj.comp_mut(cid).ok_or(EngineError::NoComp)?.layers.iter_mut().filter(|l| !ids.contains(&l.id)) {
+            l.switches.video = false;
         }
         Ok(())
     })?;
@@ -708,7 +708,7 @@ const BUNDLE_EXTENSIONS: &[&str] = &[
 /// Whether the system file manager would open folder `dir` as something other than a folder: a
 /// bundle (`Tool.app`), or a Windows folder with a `{CLSID}` extension.
 fn opens_as_bundle(dir: &std::path::Path) -> bool {
-    let ext = dir.extension().and_then(|e| e.to_str()).unwrap_or_default().to_ascii_lowercase();
+    let ext = dir.extension().and_then(std::ffi::OsStr::to_str).unwrap_or_default().to_ascii_lowercase();
     ext.starts_with('{') || BUNDLE_EXTENSIONS.contains(&ext.as_str())
 }
 
@@ -754,17 +754,33 @@ fn reveal_in_finder(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 fn reveal_source(s: &mut Session, p: &Value) -> Result<Value> {
-    let item = source_item(s, p, "layer.revealSource")?;
-    s.state.project_selection = vec![item];
-    frontend(s, "window.panel", &json!({"panel": "project"}))?;
-    Ok(json!({"item": item.0}))
+    let (cid, ids) = layers_p(s, p)?;
+    let mut items: Vec<ItemId> = Vec::new();
+    {
+        let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+        for layer in ids.iter().filter_map(|id| comp.layer(*id)) {
+            if let Some(item) = layer.source.item()
+                && s.project.item(item).is_some()
+                && !items.contains(&item)
+            {
+                items.push(item);
+            }
+        }
+    }
+    if items.is_empty() {
+        return Err(bad("layer.revealSource", "the selected layers have no source item"));
+    }
+    s.state.project_selection = items.clone();
+    let raw: Vec<u64> = items.iter().map(|item| item.0).collect();
+    frontend(s, "project.reveal", &json!({"items": raw}))?;
+    Ok(json!({"item": items[0].0, "items": raw}))
 }
 
 fn reveal_comp(s: &mut Session, p: &Value) -> Result<Value> {
     let cid = comp_id(s, p)?;
     s.state.project_selection = vec![cid];
-    frontend(s, "window.panel", &json!({"panel": "project"}))?;
-    Ok(json!({"item": cid.0}))
+    frontend(s, "project.reveal", &json!({"items": [cid.0]}))?;
+    Ok(json!({"item": cid.0, "items": [cid.0]}))
 }
 
 impl Session {
@@ -909,7 +925,7 @@ pub fn specs() -> Vec<CommandSpec> {
         cmd!("layer.trackMatte", "Track Matte", [], None, "{layers?, op: none|alpha|alphaInverted|luma|lumaInverted|above|below}", has_layers, track_matte_op),
         cmd!("layer.openSource", "Open Layer Source", ["Layer"], None, "{layer?}", has_source_item, open_source),
         cmd!("layer.revealInFinder", "Reveal in Finder", ["Layer"], None, "{layer?}", has_footage_layer, reveal_in_finder),
-        cmd!("layer.revealSource", "Reveal Layer Source in Project", ["Layer", "Reveal"], None, "{layer?}", has_source_item, reveal_source),
+        cmd!("layer.revealSource", "Reveal Layer Source in Project", ["Layer", "Reveal"], None, "{layers?}", has_source_item, reveal_source),
         cmd!("comp.revealInProject", "Reveal Composition in Project", ["Layer", "Reveal"], None, "{comp?}", has_comp, reveal_comp),
         cmd!("layer.revealExpressionErrors", "Reveal Expression Errors", ["Layer", "Reveal"], None, "{comp?}", has_comp, reveal_expression_errors),
         cmd!(
diff --git a/crates/engine/src/commands/layer_time.rs b/crates/engine/src/cmd/layer_time.rs
similarity index 100%
rename from crates/engine/src/commands/layer_time.rs
rename to crates/engine/src/cmd/layer_time.rs
diff --git a/crates/engine/src/commands/link.rs b/crates/engine/src/cmd/link.rs
similarity index 100%
rename from crates/engine/src/commands/link.rs
rename to crates/engine/src/cmd/link.rs
diff --git a/crates/engine/src/commands/liquify.rs b/crates/engine/src/cmd/liquify.rs
similarity index 100%
rename from crates/engine/src/commands/liquify.rs
rename to crates/engine/src/cmd/liquify.rs
diff --git a/crates/engine/src/commands/lottie.rs b/crates/engine/src/cmd/lottie.rs
similarity index 100%
rename from crates/engine/src/commands/lottie.rs
rename to crates/engine/src/cmd/lottie.rs
diff --git a/crates/engine/src/commands/markers.rs b/crates/engine/src/cmd/markers.rs
similarity index 100%
rename from crates/engine/src/commands/markers.rs
rename to crates/engine/src/cmd/markers.rs
diff --git a/crates/engine/src/commands/mask.rs b/crates/engine/src/cmd/mask.rs
similarity index 100%
rename from crates/engine/src/commands/mask.rs
rename to crates/engine/src/cmd/mask.rs
diff --git a/crates/engine/src/commands/mask_interp.rs b/crates/engine/src/cmd/mask_interp.rs
similarity index 100%
rename from crates/engine/src/commands/mask_interp.rs
rename to crates/engine/src/cmd/mask_interp.rs
diff --git a/crates/engine/src/commands/model3d.rs b/crates/engine/src/cmd/model3d.rs
similarity index 100%
rename from crates/engine/src/commands/model3d.rs
rename to crates/engine/src/cmd/model3d.rs
diff --git a/crates/engine/src/commands/nav_more.rs b/crates/engine/src/cmd/nav_more.rs
similarity index 100%
rename from crates/engine/src/commands/nav_more.rs
rename to crates/engine/src/cmd/nav_more.rs
diff --git a/crates/engine/src/commands/paint.rs b/crates/engine/src/cmd/paint.rs
similarity index 99%
rename from crates/engine/src/commands/paint.rs
rename to crates/engine/src/cmd/paint.rs
index 73f600b56..c02a1849d 100644
--- a/crates/engine/src/commands/paint.rs
+++ b/crates/engine/src/cmd/paint.rs
@@ -107,7 +107,7 @@ impl Default for PaintOptions {
 }
 
 fn norm(s: &str) -> String {
-    s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase()
+    s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase()
 }
 
 /// Index of `v` in `names` (by number or case/space-insensitive name).
diff --git a/crates/engine/src/commands/panels_cmds.rs b/crates/engine/src/cmd/panels_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/panels_cmds.rs
rename to crates/engine/src/cmd/panels_cmds.rs
diff --git a/crates/engine/src/cmd/params.rs b/crates/engine/src/cmd/params.rs
new file mode 100644
index 000000000..7c4e1c292
--- /dev/null
+++ b/crates/engine/src/cmd/params.rs
@@ -0,0 +1,199 @@
+use super::{Comp, EngineError, ItemId, Layer, LayerId, Result, Session, Tick, Value};
+
+/// Hand a frontend-only command to the UI ([`crate::Event::Frontend`]).
+pub(crate) fn frontend(s: &mut Session, id: &str, p: &Value) -> Result<Value> {
+    s.events.push(crate::Event::Frontend { command: id.to_string(), params: p.clone() });
+    Ok(serde_json::json!({"frontend": id}))
+}
+
+/// Match path of a node (`transform/position`, `effects/#2/blurriness` style with `match#n`
+/// occurrences) so it can be found again on another layer.
+pub fn match_path_of(g: &effectcraft_project::PropGroup, uid: effectcraft_project::Uid) -> Option<String> {
+    for c in &g.children {
+        let nth = g.children.iter().take_while(|x| !std::ptr::eq(*x, c)).filter(|x| x.match_id() == c.match_id()).count() + 1;
+        let seg = if nth == 1 { c.match_id().to_string() } else { format!("{}#{nth}", c.match_id()) };
+        if c.uid() == uid {
+            return Some(seg);
+        }
+        if let effectcraft_project::Node::Group(sub) = c
+            && let Some(rest) = match_path_of(sub, uid)
+        {
+            return Some(format!("{seg}/{rest}"));
+        }
+    }
+    None
+}
+
+/// Turn `effects/<match name>[#n]/<property>` (as [`match_path_of`] writes it) into a uid path on
+/// `l`. Path parsing splits on `.`, which would cut a match name like `ec.control.slider` apart.
+/// Any other path, or an effect that is not on the layer, comes back unchanged.
+pub(crate) fn resolve_effect_path(l: &Layer, path: &str) -> String {
+    let Some((seg, tail)) = path.strip_prefix("effects/").and_then(|r| r.split_once('/')) else { return path.to_string() };
+    let (match_id, nth) = match seg.rsplit_once('#') {
+        Some((m, n)) if !m.is_empty() => match n.parse::<usize>() {
+            Ok(n) if n >= 1 => (m, n),
+            _ => (seg, 1),
+        },
+        _ => (seg, 1),
+    };
+    match l.effects().and_then(|fx| fx.groups().filter(|g| g.match_id == match_id).nth(nth - 1)) {
+        Some(g) => format!("effects/@{}/{tail}", g.uid),
+        None => path.to_string(),
+    }
+}
+
+/// Selected properties (leaves) of the active comp as (layer, uid); selected groups expand to
+/// their properties.
+pub(crate) fn selected_leaf_props(s: &Session) -> Vec<(LayerId, effectcraft_project::Uid)> {
+    let Some(comp) = s.active_comp() else { return vec![] };
+    let mut out = vec![];
+    for (lid, uid) in &s.state.selected_props {
+        let Some(l) = comp.layer(*lid) else { continue };
+        if l.props.find(*uid).is_some() {
+            out.push((*lid, *uid));
+        } else if let Some(g) = l.props.find_group(*uid) {
+            g.walk("", &mut |_, p| out.push((*lid, p.uid)));
+        }
+    }
+    out
+}
+
+// ---------- params ----------
+
+pub(crate) fn bad(cmd: &str, msg: impl Into<String>) -> EngineError {
+    EngineError::BadParams { cmd: cmd.into(), msg: msg.into() }
+}
+
+pub(crate) fn str_p<'a>(p: &'a Value, k: &str) -> Option<&'a str> {
+    p.get(k).and_then(Value::as_str)
+}
+
+pub(crate) fn f_p(p: &Value, k: &str) -> Option<f64> {
+    p.get(k).and_then(Value::as_f64)
+}
+
+pub(crate) fn b_p(p: &Value, k: &str) -> Option<bool> {
+    p.get(k).and_then(Value::as_bool)
+}
+
+pub(crate) fn merge_p(p: &Value) -> Option<&str> {
+    str_p(p, "merge")
+}
+
+/// `comp`: item id or name (an all-digit string that names no comp is taken as an id, as MCP
+/// clients often send numbers as strings); default the active comp.
+pub(crate) fn comp_id(s: &Session, p: &Value) -> Result<ItemId> {
+    let missing = |v: &Value| EngineError::NoSuchComp(v.to_string());
+    match p.get("comp") {
+        Some(v @ Value::Number(n)) => n.as_u64().map(ItemId).filter(|id| s.project.comp(*id).is_some()).ok_or_else(|| missing(v)),
+        Some(v @ Value::String(name)) => s
+            .project
+            .items
+            .values()
+            .find(|i| &i.name == name && i.as_comp().is_some())
+            .map(|i| i.id)
+            .or_else(|| digits_id(name).map(ItemId).filter(|id| s.project.comp(*id).is_some()))
+            .ok_or_else(|| missing(v)),
+        _ => s.active_comp_id().ok_or(EngineError::NoComp),
+    }
+}
+
+/// An all-ASCII-digit string as a number (`"98"` -> 98); anything else (names, `#n`, signs) is `None`.
+fn digits_id(s: &str) -> Option<u64> {
+    if s.is_empty() || !s.bytes().all(|b| b.is_ascii_digit()) {
+        return None;
+    }
+    s.parse().ok()
+}
+
+/// Resolve a layer reference: id (number), `#n` / index (1-based), or name. An all-digit string
+/// that names no layer is resolved as the number it spells.
+pub(crate) fn resolve_layer(comp: &Comp, v: &Value) -> Option<LayerId> {
+    match v {
+        Value::Number(n) => {
+            let id = n.as_u64()?;
+            if comp.layer(LayerId(id)).is_some() { Some(LayerId(id)) } else { comp.layers.get((id as usize).checked_sub(1)?).map(|l| l.id) }
+        }
+        Value::String(s) => {
+            if let Some(i) = s.strip_prefix('#').and_then(|i| i.parse::<usize>().ok()) {
+                return comp.layers.get(i.checked_sub(1)?).map(|l| l.id);
+            }
+            comp.layers.iter().find(|l| &l.name == s).map(|l| l.id).or_else(|| digits_id(s).and_then(|id| resolve_layer(comp, &Value::from(id))))
+        }
+        _ => None,
+    }
+}
+
+/// `layer` param or the first selected layer.
+pub(crate) fn layer_p(s: &Session, p: &Value, cmd: &str) -> Result<(ItemId, LayerId)> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    if let Some(v) = p.get("layer") {
+        return resolve_layer(comp, v).map(|l| (cid, l)).ok_or_else(|| bad(cmd, format!("no layer {v}")));
+    }
+    s.state
+        .selected_layers
+        .first()
+        .copied()
+        .filter(|l| comp.layer(*l).is_some())
+        .map(|l| (cid, l))
+        .ok_or_else(|| bad(cmd, "no `layer` given and no layer selected"))
+}
+
+/// `layers` param (array) or the selection.
+pub(crate) fn layers_p(s: &Session, p: &Value) -> Result<(ItemId, Vec<LayerId>)> {
+    let cid = comp_id(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    // Explicit references that match no layer are an error (agents otherwise get a silent no-op).
+    let resolve =
+        |v: &Value| resolve_layer(comp, v).ok_or_else(|| EngineError::Other(format!("no layer {v} (use a layer id, \"#n\" or a name from comp.info)")));
+    if let Some(Value::Array(a)) = p.get("layers") {
+        return Ok((cid, a.iter().map(resolve).collect::<Result<_>>()?));
+    }
+    if let Some(v) = p.get("layer").filter(|v| !v.is_null()) {
+        return Ok((cid, vec![resolve(v)?]));
+    }
+    Ok((cid, s.state.selected_layers.iter().copied().filter(|l| comp.layer(*l).is_some()).collect()))
+}
+
+/// Whether a layer can be picked by the user (Select All, Ctrl+Up/Down, a Timeline click): not
+/// locked, and not hidden by the composition's Hide Shy Layers.
+pub(crate) fn selectable(comp: &Comp, l: &Layer) -> bool {
+    !(l.switches.locked || (comp.hide_shy && l.switches.shy))
+}
+
+/// The layers of `ids` a command may edit: locked layers are left alone, as in After Effects.
+/// An error when every one of them is locked.
+pub(crate) fn unlocked(s: &Session, cid: ItemId, ids: Vec<LayerId>, cmd: &str) -> Result<Vec<LayerId>> {
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let locked = |id: &LayerId| comp.layer(*id).is_some_and(|l| l.switches.locked);
+    match ids.iter().find(|id| locked(id)) {
+        Some(first) if ids.iter().all(locked) => {
+            let name = comp.layer(*first).map(|l| l.name.clone()).unwrap_or_default();
+            Err(bad(cmd, format!("“{name}” is locked (Layer ▸ Switches ▸ Unlock All Layers)")))
+        }
+        _ => Ok(ids.into_iter().filter(|id| !locked(id)).collect()),
+    }
+}
+
+/// `visible: [{layer, prop}]`: the properties the Timeline shows (J / K and Select All
+/// Keyframes use only those, as in After Effects). `None` when not given.
+pub(crate) fn visible_p(p: &Value) -> Option<Vec<(LayerId, effectcraft_project::Uid)>> {
+    let a = p.get("visible")?.as_array()?;
+    Some(a.iter().filter_map(|v| Some((LayerId(v.get("layer")?.as_u64()?), v.get("prop")?.as_u64()?))).collect())
+}
+
+/// `time` (seconds) or `frame` param, else the CTI.
+pub(crate) fn time_p(s: &Session, p: &Value, comp: Option<&Comp>) -> Tick {
+    if let Some(t) = f_p(p, "time") {
+        return Tick::from_seconds_f64(t);
+    }
+    if let (Some(f), Some(c)) = (p.get("frame").and_then(Value::as_i64), comp) {
+        return c.frame_rate.tick_of(f);
+    }
+    s.time()
+}
+
+pub(crate) fn layer_mut(p: &mut effectcraft_project::Project, cid: ItemId, lid: LayerId) -> Result<&mut Layer> {
+    p.comp_mut(cid).ok_or(EngineError::NoComp)?.layer_mut(lid).ok_or(EngineError::Project(effectcraft_project::ProjectError::NoLayer(lid)))
+}
diff --git a/crates/engine/src/commands/path_nulls.rs b/crates/engine/src/cmd/path_nulls.rs
similarity index 100%
rename from crates/engine/src/commands/path_nulls.rs
rename to crates/engine/src/cmd/path_nulls.rs
diff --git a/crates/engine/src/commands/paths.rs b/crates/engine/src/cmd/paths.rs
similarity index 82%
rename from crates/engine/src/commands/paths.rs
rename to crates/engine/src/cmd/paths.rs
index c74c3bb5e..afd7aba12 100644
--- a/crates/engine/src/commands/paths.rs
+++ b/crates/engine/src/cmd/paths.rs
@@ -108,13 +108,89 @@ fn roto_bezier(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({"rotoBezier": on}))
 }
 
+/// The parametric shape paths that Convert To Bezier Path replaces with an editable path.
+const PARAMETRIC: [&str; 3] = ["rect", "ellipse", "star"];
+
+/// The path a parametric shape group draws, in the group's own space, read at `lt`. This is the
+/// geometry the renderer builds from the same values (`render::shapes::collect`), so the converted
+/// path is the shape that was on screen rather than an approximation of it; the defaults match
+/// that code for a property a group doesn't carry (a polygon has no inner radius or roundness).
+fn parametric_path(g: &PropGroup, lt: effectcraft_time::Tick) -> Option<ShapePath> {
+    let f = |id: &str, d: f64| g.prop(id).map_or(d, |pr| pr.value_at(lt).as_f64());
+    let v2 = |id: &str, d: [f64; 2]| g.prop(id).map_or(d, |pr| pr.value_at(lt).as_vec2());
+    let path = match g.match_id.as_str() {
+        "rect" => effectcraft_path::rect(v2("size", [100.0; 2]), v2("position", [0.0; 2]), f("roundness", 0.0)),
+        "ellipse" => effectcraft_path::ellipse(v2("size", [100.0; 2]), v2("position", [0.0; 2])),
+        "star" => effectcraft_path::polystar(effectcraft_path::Polystar {
+            star: g.prop("type").map_or(0, |pr| pr.value_at(lt).as_enum()) == 0,
+            points: f("points", 5.0),
+            pos: v2("position", [0.0; 2]),
+            rotation: f("rotation", 0.0),
+            inner: f("innerRadius", 50.0),
+            outer: f("outerRadius", 100.0),
+            inner_round: f("innerRoundness", 0.0),
+            outer_round: f("outerRoundness", 0.0),
+        }),
+        _ => return None,
+    };
+    // A closed parametric shape is one subpath; anything else would not be this shape.
+    effectcraft_path::from_kurbo(&path).into_iter().next()
+}
+
 fn convert_to_bezier(s: &mut Session, p: &Value) -> Result<Value> {
-    edit_mask_groups(s, p, "Convert To Bezier Path", |g| {
-        if let GroupKind::Mask { roto_bezier, .. } = &mut g.kind {
-            *roto_bezier = false;
+    // On a shape layer this replaces a Rectangle, Ellipse or Polystar path with an editable
+    // Path 1 of the same geometry, as After Effects does (#932). The parametric properties are
+    // read at the current time and the path that comes out is static: a size or roundness
+    // animation cannot survive the conversion, in After Effects either.
+    let (cid, items) = selected_shape_items(s, p)?;
+    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
+    let shapes: Vec<(LayerId, Uid)> = items
+        .into_iter()
+        .filter(|(l, u)| {
+            comp.layer(*l).and_then(|l| l.props.sub("contents")).and_then(|c| c.find_group(*u)).is_some_and(|g| PARAMETRIC.contains(&g.match_id.as_str()))
+        })
+        .collect();
+    if shapes.is_empty() {
+        return edit_mask_groups(s, p, "Convert To Bezier Path", |g| {
+            if let GroupKind::Mask { roto_bezier, .. } = &mut g.kind {
+                *roto_bezier = false;
+            }
+            Ok(())
+        });
+    }
+    let t = s.time();
+    let n = shapes.len();
+    let made = s.edit("Convert To Bezier Path", None, |proj, st| {
+        let mut next = proj.next_id;
+        let mut made = Vec::new();
+        for (lid, uid) in &shapes {
+            let l = layer_mut(proj, cid, *lid)?;
+            let lt = l.layer_time(t);
+            let contents = l.props.sub_mut("contents").ok_or_else(|| bad("path.convertToBezier", "not a shape layer"))?;
+            let Some(old) = contents.find_group(*uid) else { continue };
+            let Some(path) = parametric_path(old, lt) else { continue };
+            // Path Direction is the shape's own, not a default: reversing is a separate command.
+            let direction = old.prop("direction").map_or(0, |pr| pr.value_at(lt).as_enum());
+            let enabled = old.enabled;
+            let mut g = build::shape_path(&mut Ids(&mut next), path);
+            if let Some(pr) = g.prop_mut("direction") {
+                pr.value = KV::Enum(direction);
+            }
+            g.enabled = enabled;
+            let new_uid = g.uid;
+            let parent = contents.parent_of_mut(*uid).ok_or_else(|| bad("path.convertToBezier", "no such shape item"))?;
+            let Some(at) = parent.children.iter().position(|c| c.uid() == *uid) else { continue };
+            parent.children[at] = Node::Group(g);
+            made.push((*lid, new_uid));
         }
-        Ok(())
-    })
+        proj.next_id = next;
+        // The new paths are what is selected, so the vertices can be edited straight away.
+        if !made.is_empty() {
+            st.selected_props = made.clone();
+        }
+        Ok(made)
+    })?;
+    Ok(json!({"paths": made.len(), "of": n}))
 }
 
 // ---------------------------------------------------------------- mask options
diff --git a/crates/engine/src/commands/project_items.rs b/crates/engine/src/cmd/project_items.rs
similarity index 100%
rename from crates/engine/src/commands/project_items.rs
rename to crates/engine/src/cmd/project_items.rs
diff --git a/crates/engine/src/commands/prop.rs b/crates/engine/src/cmd/prop.rs
similarity index 92%
rename from crates/engine/src/commands/prop.rs
rename to crates/engine/src/cmd/prop.rs
index 29da9c1e0..00232967e 100644
--- a/crates/engine/src/commands/prop.rs
+++ b/crates/engine/src/cmd/prop.rs
@@ -22,8 +22,11 @@ pub(crate) fn prop_ref(s: &Session, p: &Value, cmd: &str) -> Result<(ItemId, Lay
         });
     }
     let path = str_p(p, "path").ok_or_else(|| bad(cmd, "missing `path` (e.g. transform/position) or `prop` uid"))?;
-    let pr = layer.props.prop(path).ok_or_else(|| {
-        let group = layer.props.group(path).or_else(|| path.trim().strip_prefix('@')?.parse().ok().and_then(|uid| layer.props.find_group(uid)));
+    // `effects/<match name>[#n]/<property>` is how `essential.list`, presets and Copy write an
+    // effect property; turn it into the uid path `PropGroup::prop` parses (#2064).
+    let resolved = super::resolve_effect_path(layer, path);
+    let pr = layer.props.prop(&resolved).ok_or_else(|| {
+        let group = layer.props.group(&resolved).or_else(|| path.trim().strip_prefix('@')?.parse().ok().and_then(|uid| layer.props.find_group(uid)));
         if group.is_some() {
             bad(cmd, format!("`{path}` is a property group; use layer.tree (MCP: get_layer) to inspect its children, then select a leaf property"))
         } else {
@@ -44,7 +47,8 @@ fn with_prop<T>(
 ) -> Result<T> {
     let t = s.time_of(cid);
     let linear = s.prefs.general.default_spatial_linear;
-    s.edit(label, merge, |proj, _| {
+    s.edit(label, merge, |proj, state| {
+        let mut next = proj.next_id;
         let l = layer_mut(proj, cid, lid)?;
         let lt = l.layer_time(t);
         let pr = l.props.find_mut(uid).ok_or_else(|| bad("prop", "property vanished"))?;
@@ -59,10 +63,61 @@ fn with_prop<T>(
                 k.spatial_out = [0.0; 3];
             }
         }
+        if pr.match_id == "type" {
+            let removed = sync_polystar_type(l, uid, lt, &mut next)?;
+            if !removed.is_empty() {
+                state.selected_props.retain(|(layer, prop)| *layer != lid || !removed.contains(prop));
+                state.selected_keys.retain(|key| key.layer != lid || !removed.contains(&key.prop));
+            }
+        }
+        proj.next_id = next;
         Ok(r)
     })
 }
 
+/// A static Polygon has no inner controls; switching to Star creates them in schema order
+/// with AE's switch defaults (#1685). Animated/expression-driven types need the controls at
+/// every time, including when the current value is Polygon.
+fn sync_polystar_type(layer: &mut Layer, uid: Uid, time: Tick, next: &mut Uid) -> Result<Vec<Uid>> {
+    if !matches!(layer.source, effectcraft_project::LayerSource::Shape) {
+        return Ok(vec![]);
+    }
+    let Some(group) =
+        layer.props.parent_of_mut(uid).filter(|g| g.match_id == "star" && matches!(g.kind, GroupKind::Indexed) && g.get("type").is_some_and(|p| p.uid == uid))
+    else {
+        return Ok(vec![]);
+    };
+    let Some(kind) = group.get("type") else { return Ok(vec![]) };
+    let needs_inner = kind.is_animated() || kind.has_expression() || kind.value_at(time) == effectcraft_keyframe::Value::Enum(0);
+    if !needs_inner {
+        let mut removed = vec![];
+        group.children.retain(|node| {
+            if let effectcraft_project::Node::Prop(p) = node
+                && matches!(p.match_id.as_str(), "innerRadius" | "innerRoundness")
+            {
+                removed.push(p.uid);
+                return false;
+            }
+            true
+        });
+        return Ok(removed);
+    }
+    for (inner, name, outer, value, ui) in [
+        ("innerRadius", "Inner Radius", "outerRadius", 50.0, effectcraft_project::ParamUi::Pixels),
+        ("innerRoundness", "Inner Roundness", "outerRoundness", 0.0, effectcraft_project::ParamUi::Percent),
+    ] {
+        if group.get(inner).is_none() {
+            let uid = *next;
+            *next = next.checked_add(1).ok_or_else(|| bad("prop", "property ids exhausted"))?;
+            let prop = Property::new(uid, inner, name, effectcraft_keyframe::Value::Scalar(value)).with_ui(ui);
+            let index =
+                group.children.iter().position(|n| matches!(n, effectcraft_project::Node::Prop(p) if p.match_id == outer)).unwrap_or(group.children.len());
+            group.children.insert(index, effectcraft_project::Node::Prop(prop));
+        }
+    }
+    Ok(vec![])
+}
+
 /// Explicit command key times default to layer time; readers and the CTI use comp time.
 #[derive(Clone, Copy)]
 pub(crate) enum KeyTimeBase {
@@ -127,7 +182,9 @@ pub(crate) fn key_time(layer: &Layer, frame_rate: FrameRate, p: &Value, param: &
 pub(crate) fn key_timing(layer: &Layer, t: Tick) -> Value {
     let ct = layer.comp_time(t);
     let mut out = json!({"time": t.seconds(), "layerTime": t.seconds(), "compTime": ct.seconds()});
-    if !layer.is_active_at(ct) {
+    // A key exactly on the out point ends a fade normally: it is outside the half-open visible
+    // range, but it is not a caller mistake, so it does not warn (#2084).
+    if ct < layer.in_point || ct > layer.out_point {
         out["warning"] = json!(format!(
             "Keyframe at comp time {} s is outside the layer's active range [{} s, {} s).",
             ct.seconds(),
@@ -241,7 +298,9 @@ pub(crate) fn proportional_share(index: usize, count: usize) -> f64 {
 }
 
 /// `prop.set`; with `selected`, also on the other selected layers: the same value, or with
-/// `offset` (a scrub) the same change from each layer's own value. With `offset` and
+/// `offset` (a scrub) the same change from each layer's own value. A typed value with `dims`
+/// (the components edited, e.g. `[2]` for Z) sets only those components on the other layers,
+/// which keep the rest of their own value (#1434). With `offset` and
 /// `proportional` (Proportional Scrubbing) each layer takes [`proportional_share`] of the change
 /// by its place in the selection order, the scrubbed layer too. One undo step (with `merge`,
 /// one that a continuing scrub keeps folding into).
@@ -261,6 +320,23 @@ fn set_selected(s: &mut Session, p: &Value) -> Result<Value> {
         .then(|| s.state.selected_layers.iter().copied().filter(|o| *o == lid || twins.iter().any(|(t, _)| t == o)).collect());
     let share = |l: LayerId| order.as_ref().map_or(1.0, |o| o.iter().position(|x| *x == l).map_or(1.0, |i| proportional_share(i, o.len())));
     let scalar = p.get("value").is_some_and(Value::is_number);
+    // Typed into some components only: the others stay each layer's own.
+    let dims: Option<Vec<usize>> = match (&delta, p.get("dims").and_then(Value::as_array), &new) {
+        (None, Some(a), Some(_)) if !scalar => Some(a.iter().filter_map(Value::as_u64).filter_map(|d| usize::try_from(d).ok()).collect()),
+        _ => None,
+    };
+    let typed = |s: &Session, q: &mut Value, olid: LayerId, ouid: Uid| {
+        if let (Some(dims), Some(n)) = (&dims, &new)
+            && let Some(mut c) = current_components(s, cid, olid, ouid)
+        {
+            for &d in dims {
+                if let (Some(slot), Some(v)) = (c.get_mut(d), n.get(d)) {
+                    *slot = *v;
+                }
+            }
+            q["value"] = json!(c);
+        }
+    };
     // `p` aimed at (layer, prop) with its value moved by `k` × the change.
     let shifted = |s: &Session, q: &mut Value, olid: LayerId, ouid: Uid, k: f64| {
         if let Some(d) = &delta
@@ -291,6 +367,7 @@ fn set_selected(s: &mut Session, p: &Value) -> Result<Value> {
             }
             let mut q = twin_params(p, olid, ouid);
             shifted(s, &mut q, olid, ouid, k);
+            typed(s, &mut q, olid, ouid);
             // (a layer that can't take it, e.g. a clamped or static property, keeps its value)
             let _ = set(s, &q);
         }
@@ -967,6 +1044,7 @@ fn delete_keys(s: &mut Session, _: &Value) -> Result<Value> {
     let sel = s.state.selected_keys.clone();
     s.edit("Delete Keyframes", None, |proj, st| {
         let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        let mut removed = 0usize;
         for k in &sel {
             if let Some(pr) = comp.layer_mut(k.layer).and_then(|l| l.props.find_mut(k.prop))
                 && let Some(i) = key_at(&pr.keys, k.time)
@@ -975,10 +1053,13 @@ fn delete_keys(s: &mut Session, _: &Value) -> Result<Value> {
                     pr.value = pr.keys[0].value.clone();
                 }
                 pr.keys.remove(i);
+                removed += 1;
             }
         }
         st.selected_keys.clear();
-        Ok(json!(sel.len()))
+        // The keys actually removed: a selected key that is gone (or listed twice) isn't counted,
+        // so a caller can tell that a delete changed nothing.
+        Ok(json!(removed))
     })
 }
 
@@ -1229,7 +1310,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Set Property Value",
             [],
             None,
-            "{layer?, path|prop, value, time? (layer s by default), timeBase?: layer|comp, merge?, selected? (also the other selected layers), offset? (them by the same change), proportional? (with offset: Proportional Scrubbing, each layer by its share in selection order, the first none, the last all)}",
+            "{layer?, path|prop, value, time? (layer s by default), timeBase?: layer|comp, merge?, selected? (also the other selected layers), offset? (them by the same change), proportional? (with offset: Proportional Scrubbing, each layer by its share in selection order, the first none, the last all), dims? (with selected, a typed value: the components edited, e.g. [2] for Z; the other layers keep the rest of their own value)}",
             has_layers,
             set_selected
         ),
diff --git a/crates/engine/src/commands/prop_groups.rs b/crates/engine/src/cmd/prop_groups.rs
similarity index 80%
rename from crates/engine/src/commands/prop_groups.rs
rename to crates/engine/src/cmd/prop_groups.rs
index e4d80b16d..6f7d74aef 100644
--- a/crates/engine/src/commands/prop_groups.rs
+++ b/crates/engine/src/cmd/prop_groups.rs
@@ -100,6 +100,22 @@ pub(crate) fn selected_contents(s: &Session) -> Vec<(LayerId, Uid)> {
     out
 }
 
+/// Text animators and their selectors selected on the active comp's text layers, top to bottom.
+/// A selector inside a selected animator isn't listed, since it is copied with it.
+pub(crate) fn selected_animator_items(s: &Session) -> Vec<(LayerId, Uid)> {
+    let mut out = vec![];
+    let Some(c) = s.active_comp().filter(|_| !s.state.selected_props.is_empty()) else { return out };
+    for l in c.layers.iter().filter(|l| matches!(l.source, LayerSource::Text)) {
+        if let Some(animators) = l.props.group("text/animators") {
+            let selected = |u: Uid| s.state.selected_props.contains(&(l.id, u));
+            let mut uids = vec![];
+            collect_selected(animators, &selected, &mut uids, 0);
+            out.extend(uids.into_iter().map(|u| (l.id, u)));
+        }
+    }
+    out
+}
+
 fn collect_selected(g: &PropGroup, selected: &dyn Fn(Uid) -> bool, out: &mut Vec<Uid>, depth: usize) {
     if depth > super::shape_stroke::MAX_DEPTH {
         return;
@@ -127,8 +143,9 @@ pub(crate) fn cut_contents(s: &mut Session, items: &[(LayerId, Uid)]) -> Result<
 }
 
 /// Edit ▸ Paste with shape items on the clipboard: copies go into each selected shape layer's
-/// Contents, above its topmost selected item (in that item's group), else on top. Names stay
-/// unique in their group ("Rectangle 2"…), and the copies are selected.
+/// Contents, above its topmost selected item (in that item's group), else on top (paints and path
+/// operations alone: at the bottom). Names stay unique in their group ("Rectangle 2"…), and the
+/// copies are selected.
 pub(crate) fn paste_contents(s: &mut Session, p: &Value) -> Result<Value> {
     let c = "edit.paste";
     let clip = s.state.contents_clipboard.clone();
@@ -140,6 +157,9 @@ pub(crate) fn paste_contents(s: &mut Session, p: &Value) -> Result<Value> {
         return Err(bad(c, "select a shape layer to paste shape items into"));
     }
     let sel = selected_contents(s);
+    let acts_on_above = clip.iter().all(|g| !matches!(g.match_id.as_str(), "group" | "rect" | "ellipse" | "star" | "path"));
+    // Merge Paths clears the draws above it, so at the bottom it would erase the paints (#1681).
+    let has_merge = clip.iter().any(|g| g.match_id == "merge");
     let label = match clip.as_slice() {
         [g] => format!("Paste {}", g.name),
         _ => "Paste".to_string(),
@@ -154,11 +174,19 @@ pub(crate) fn paste_contents(s: &mut Session, p: &Value) -> Result<Value> {
                 let parent = l.props.parent_of(*u)?;
                 Some((parent.uid, parent.children.iter().position(|n| n.uid() == *u)?))
             });
+            let unselected = spot.is_none();
             let (parent, at) = match spot {
                 Some((pu, i)) => (l.props.find_group_mut(pu), i),
                 None => (l.props.sub_mut("contents"), 0),
             };
             let parent = parent.ok_or_else(|| bad(c, "the layer has no contents"))?;
+            // Trim Paths, Wiggle Paths, fills… act on the items above them (as Add places them),
+            // so with nothing selected they go to the bottom: on top they'd affect nothing (#1681).
+            let at = match unselected {
+                true if has_merge => merge_spot(parent),
+                true if acts_on_above => parent.children.len(),
+                _ => at,
+            };
             for (k, g) in clip.iter().enumerate() {
                 let mut g = g.clone();
                 g.reassign_uids(&mut next);
@@ -174,8 +202,21 @@ pub(crate) fn paste_contents(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({"contents": pasted.iter().map(|(_, u)| *u).collect::<Vec<_>>()}))
 }
 
-/// Edit ▸ Duplicate with shape items selected: each is copied in place, above the original and
-/// named as After Effects does ("Rectangle 1" → "Rectangle 2"), and the copies are selected.
+/// Where Merge Paths goes in `contents` when nothing is selected: before the first paint, so the
+/// paints still draw the merged path (the renderer drops the draws above a Merge Paths), else after
+/// the last path item.
+fn merge_spot(contents: &PropGroup) -> usize {
+    let is = |n: &Node, ids: &[&str]| matches!(n, Node::Group(g) if ids.contains(&g.match_id.as_str()));
+    let paints = ["fill", "stroke", "gfill", "gstroke"];
+    match contents.children.iter().position(|n| is(n, &paints)) {
+        Some(i) => i,
+        None => contents.children.iter().rposition(|n| is(n, &["rect", "ellipse", "star", "path"])).map_or(0, |i| i + 1),
+    }
+}
+
+/// Edit ▸ Duplicate with shape items, text animators or selectors selected: each is copied in
+/// place, above the original and named as After Effects does ("Rectangle 1" → "Rectangle 2"),
+/// and the copies are selected.
 pub(crate) fn duplicate_contents(s: &mut Session, items: &[(LayerId, Uid)]) -> Result<Value> {
     let c = "edit.duplicate";
     let cid = s.active_comp_id().ok_or(EngineError::NoComp)?;
@@ -183,7 +224,7 @@ pub(crate) fn duplicate_contents(s: &mut Session, items: &[(LayerId, Uid)]) -> R
         let mut next = proj.next_id;
         let mut out = vec![];
         for (lid, uid) in items {
-            let parent = layer_mut(proj, cid, *lid)?.props.parent_of_mut(*uid).ok_or_else(|| bad(c, "the shape item is gone"))?;
+            let parent = layer_mut(proj, cid, *lid)?.props.parent_of_mut(*uid).ok_or_else(|| bad(c, "the group is gone"))?;
             let Some((i, Node::Group(g))) = parent.children.iter().enumerate().find(|(_, n)| n.uid() == *uid) else { continue };
             let mut g = g.clone();
             g.reassign_uids(&mut next);
diff --git a/crates/engine/src/commands/proxy.rs b/crates/engine/src/cmd/proxy.rs
similarity index 100%
rename from crates/engine/src/commands/proxy.rs
rename to crates/engine/src/cmd/proxy.rs
diff --git a/crates/engine/src/commands/puppet.rs b/crates/engine/src/cmd/puppet.rs
similarity index 100%
rename from crates/engine/src/commands/puppet.rs
rename to crates/engine/src/cmd/puppet.rs
diff --git a/crates/engine/src/commands/query.rs b/crates/engine/src/cmd/query.rs
similarity index 100%
rename from crates/engine/src/commands/query.rs
rename to crates/engine/src/cmd/query.rs
diff --git a/crates/engine/src/commands/quick_offset.rs b/crates/engine/src/cmd/quick_offset.rs
similarity index 100%
rename from crates/engine/src/commands/quick_offset.rs
rename to crates/engine/src/cmd/quick_offset.rs
diff --git a/crates/engine/src/commands/relink.rs b/crates/engine/src/cmd/relink.rs
similarity index 99%
rename from crates/engine/src/commands/relink.rs
rename to crates/engine/src/cmd/relink.rs
index 2d7c2ea13..d899decbe 100644
--- a/crates/engine/src/commands/relink.rs
+++ b/crates/engine/src/cmd/relink.rs
@@ -103,7 +103,7 @@ fn run(s: &mut Session, p: &Value) -> Result<Value> {
             }
             let supported = matches!(old.kind, FootageKind::Still | FootageKind::Sequence | FootageKind::Video | FootageKind::Audio)
                 && old.layer.is_none() && old.page == 0;
-            let name = Path::new(&old.path).file_name().and_then(|n| n.to_str()).unwrap_or("");
+            let name = Path::new(&old.path).file_name().and_then(std::ffi::OsStr::to_str).unwrap_or("");
             let paths = index.get(name).cloned().unwrap_or_default();
             let mut candidates = vec![];
             let mut accepted = vec![];
diff --git a/crates/engine/src/commands/relink_moved.rs b/crates/engine/src/cmd/relink_moved.rs
similarity index 100%
rename from crates/engine/src/commands/relink_moved.rs
rename to crates/engine/src/cmd/relink_moved.rs
diff --git a/crates/engine/src/commands/render_queue.rs b/crates/engine/src/cmd/render_queue.rs
similarity index 98%
rename from crates/engine/src/commands/render_queue.rs
rename to crates/engine/src/cmd/render_queue.rs
index 09a7c7d2f..1cda510e0 100644
--- a/crates/engine/src/commands/render_queue.rs
+++ b/crates/engine/src/cmd/render_queue.rs
@@ -205,23 +205,8 @@ fn apply_om_template(om: &mut OutputModule, t: &OutputModule) {
 /// The `format` parameter's values.
 const FORMATS: &str = "format: h264|hevc|av1|prores|uncompressed|webm|png|jpeg|tiff|exr|gif|wav|aiff";
 
-/// Apply Output Module parameters (`template` first). `roi`: the viewer's region of interest
-/// (captured by `crop.useRoi`).
-fn apply_output(om: &mut OutputModule, templates: &RenderTemplates, roi: Option<[f64; 4]>, p: &Value, cmd: &str) -> Result<bool> {
-    let mut any = false;
-    if let Some(t) = str_p(p, "template") {
-        let t = templates.output_module(t).ok_or_else(|| bad(cmd, format!("no Output Module template “{t}”")))?;
-        apply_om_template(om, &t);
-        any = true;
-    }
-    let before = om.clone();
-    if let Some(f) = str_p(p, "format") {
-        let f = OutputFormat::from_name(f).ok_or_else(|| bad(cmd, FORMATS))?;
-        om.set_format(f);
-    }
-    // Before Channels: the WebM codec decides whether alpha can be written, so an explicit
-    // `channels: rgba` with `webmCodec: av1` is refused rather than dropped (#166).
-    any |= apply_codec_options(om, p, cmd)?;
+/// `channels` (refusing RGBA where the format has no alpha) and `color`/`alphaMode`.
+fn apply_channels_and_alpha(om: &mut OutputModule, p: &Value, cmd: &str) -> Result<()> {
     if let Some(c) = str_p(p, "channels") {
         om.channels = match c.to_ascii_lowercase().replace([' ', '+'], "").as_str() {
             "rgb" => Channels::Rgb,
@@ -244,21 +229,11 @@ fn apply_output(om: &mut OutputModule, templates: &RenderTemplates, roi: Option<
             _ => return Err(bad(cmd, "color: straight|premultiplied")),
         };
     }
-    if let Some(q) = f_p(p, "quality") {
-        om.quality = q.clamp(1.0, 100.0) as u8;
-    }
-    if let Some(b) = f_p(p, "bitrate") {
-        om.bitrate_kbps = b.clamp(50.0, 500_000.0) as u32;
-    }
-    if let Some(b) = b_p(p, "webmBitrate") {
-        om.webm_bitrate = b;
-    }
-    if let Some(k) = p.get("keyframeInterval").and_then(Value::as_u64) {
-        om.keyframe_interval = k.min(100_000) as u32;
-    }
-    if let Some(pp) = str_p(p, "proresProfile") {
-        om.prores_profile = ProResProfile::from_name(pp).ok_or_else(|| bad(cmd, "proresProfile: proxy|lt|standard|hq|4444|4444xq"))?;
-    }
+    Ok(())
+}
+
+/// `crop` plus the flat dialog keys (`cropTop`… and `resizeWidth`/`resizeHeight`).
+fn apply_crop(om: &mut OutputModule, roi: Option<[f64; 4]>, p: &Value, cmd: &str) -> Result<()> {
     match p.get("crop") {
         Some(Value::Bool(b)) => om.crop.enabled = *b,
         Some(Value::Object(c)) => {
@@ -298,6 +273,11 @@ fn apply_output(om: &mut OutputModule, templates: &RenderTemplates, roi: Option<
             om.resize.enabled = true;
         }
     }
+    Ok(())
+}
+
+/// `resize` (bool or object).
+fn apply_resize(om: &mut OutputModule, p: &Value, cmd: &str) -> Result<()> {
     match p.get("resize") {
         Some(Value::Bool(b)) => om.resize.enabled = *b,
         Some(Value::Object(r)) => {
@@ -328,6 +308,44 @@ fn apply_output(om: &mut OutputModule, templates: &RenderTemplates, roi: Option<
         Some(Value::Null) | None => {}
         Some(_) => return Err(bad(cmd, "resize: bool or {enabled?, preset?, width?, height?, lockAspect?, quality?: low|high}")),
     }
+    Ok(())
+}
+
+/// Apply Output Module parameters (`template` first). `roi`: the viewer's region of interest
+/// (captured by `crop.useRoi`).
+fn apply_output(om: &mut OutputModule, templates: &RenderTemplates, roi: Option<[f64; 4]>, p: &Value, cmd: &str) -> Result<bool> {
+    let mut any = false;
+    if let Some(t) = str_p(p, "template") {
+        let t = templates.output_module(t).ok_or_else(|| bad(cmd, format!("no Output Module template “{t}”")))?;
+        apply_om_template(om, &t);
+        any = true;
+    }
+    let before = om.clone();
+    if let Some(f) = str_p(p, "format") {
+        let f = OutputFormat::from_name(f).ok_or_else(|| bad(cmd, FORMATS))?;
+        om.set_format(f);
+    }
+    // Before Channels: the WebM codec decides whether alpha can be written, so an explicit
+    // `channels: rgba` with `webmCodec: av1` is refused rather than dropped (#166).
+    any |= apply_codec_options(om, p, cmd)?;
+    apply_channels_and_alpha(om, p, cmd)?;
+    if let Some(q) = f_p(p, "quality") {
+        om.quality = q.clamp(1.0, 100.0) as u8;
+    }
+    if let Some(b) = f_p(p, "bitrate") {
+        om.bitrate_kbps = b.clamp(50.0, 500_000.0) as u32;
+    }
+    if let Some(b) = b_p(p, "webmBitrate") {
+        om.webm_bitrate = b;
+    }
+    if let Some(k) = p.get("keyframeInterval").and_then(Value::as_u64) {
+        om.keyframe_interval = k.min(100_000) as u32;
+    }
+    if let Some(pp) = str_p(p, "proresProfile") {
+        om.prores_profile = ProResProfile::from_name(pp).ok_or_else(|| bad(cmd, "proresProfile: proxy|lt|standard|hq|4444|4444xq"))?;
+    }
+    apply_crop(om, roi, p, cmd)?;
+    apply_resize(om, p, cmd)?;
     if let Some(a) = p.get("audio") {
         om.audio = match a {
             Value::Bool(true) => AudioOutput::On,
diff --git a/crates/engine/src/commands/rig3d.rs b/crates/engine/src/cmd/rig3d.rs
similarity index 100%
rename from crates/engine/src/commands/rig3d.rs
rename to crates/engine/src/cmd/rig3d.rs
diff --git a/crates/engine/src/commands/roto_cmds.rs b/crates/engine/src/cmd/roto_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/roto_cmds.rs
rename to crates/engine/src/cmd/roto_cmds.rs
diff --git a/crates/engine/src/commands/scene_detect.rs b/crates/engine/src/cmd/scene_detect.rs
similarity index 100%
rename from crates/engine/src/commands/scene_detect.rs
rename to crates/engine/src/cmd/scene_detect.rs
diff --git a/crates/engine/src/cmd/schema.rs b/crates/engine/src/cmd/schema.rs
new file mode 100644
index 000000000..c74ab277e
--- /dev/null
+++ b/crates/engine/src/cmd/schema.rs
@@ -0,0 +1,119 @@
+use super::params::bad;
+use super::{CommandSpec, Result, Value};
+
+// ---------- parameter validation (agents) ----------
+
+/// Top-level keys accepted by a params doc such as `{layers: [id|name|#n], add?, toggle?}` or
+/// `{time? (s) | frame? | timecode?}`; `None` when the doc isn't a `{…}` key list.
+pub fn accepted_params(doc: &str) -> Option<Vec<String>> {
+    let body = doc.trim().strip_prefix('{')?;
+    // Top-level pieces up to the matching close brace, split at `,` and `|`; `:` starts a value.
+    let (mut keys, mut cur, mut depth, mut in_value) = (Vec::new(), String::new(), 0i32, false);
+    let push = |cur: &mut String, keys: &mut Vec<String>| {
+        let k: String = cur.trim().chars().take_while(|c| c.is_ascii_alphanumeric() || *c == '_').collect();
+        if !k.is_empty() && !keys.contains(&k) {
+            keys.push(k);
+        }
+        cur.clear();
+    };
+    for c in body.chars() {
+        match c {
+            '{' | '[' | '(' => depth += 1,
+            ']' | ')' => depth -= 1,
+            '}' if depth == 0 => {
+                push(&mut cur, &mut keys);
+                return Some(keys);
+            }
+            '}' => depth -= 1,
+            ',' if depth == 0 => {
+                push(&mut cur, &mut keys);
+                in_value = false;
+            }
+            '|' if depth == 0 && !in_value => push(&mut cur, &mut keys),
+            ':' if depth == 0 => {
+                push(&mut cur, &mut keys);
+                in_value = true;
+            }
+            _ if depth == 0 && !in_value => cur.push(c),
+            _ => {}
+        }
+    }
+    None
+}
+
+/// Top-level pieces of a params doc (split at depth-0 commas), e.g. `{layer?, path|prop, value}`
+/// → `["layer?", "path|prop", "value"]`.
+fn doc_pieces(doc: &str) -> Option<Vec<String>> {
+    let body = doc.trim().strip_prefix('{')?;
+    let (mut out, mut cur, mut depth) = (Vec::new(), String::new(), 0i32);
+    for c in body.chars() {
+        match c {
+            '{' | '[' | '(' => depth += 1,
+            ']' | ')' => depth -= 1,
+            '}' if depth == 0 => {
+                if !cur.trim().is_empty() {
+                    out.push(cur.trim().to_string());
+                }
+                return Some(out);
+            }
+            '}' => depth -= 1,
+            ',' if depth == 0 => {
+                if !cur.trim().is_empty() {
+                    out.push(cur.trim().to_string());
+                }
+                cur.clear();
+                continue;
+            }
+            _ => {}
+        }
+        cur.push(c);
+    }
+    None
+}
+
+/// The JSON Schema of a command's parameters, derived from its params doc: one property per
+/// accepted key (described by its piece of the doc), no others. MCP `describe_command` and
+/// `list_commands {schemas: true}` serve it.
+pub fn params_schema(spec: &CommandSpec) -> Value {
+    let mut props = serde_json::Map::new();
+    let mut required = vec![];
+    for piece in doc_pieces(spec.params).unwrap_or_default() {
+        let keys = accepted_params(&format!("{{{piece}}}")).unwrap_or_default();
+        let alternatives = keys.len() > 1;
+        for k in keys {
+            // `key?` is optional; so is any key with alternatives (`path|prop`).
+            let optional = alternatives || piece.contains(&format!("{k}?"));
+            if !optional && !required.contains(&k) {
+                required.push(k.clone());
+            }
+            props.insert(k, serde_json::json!({"description": piece}));
+        }
+    }
+    serde_json::json!({
+        "type": "object",
+        "description": spec.params,
+        "properties": props,
+        "required": required,
+        "additionalProperties": accepted_params(spec.params).is_none(),
+    })
+}
+
+/// Keys every command understands (comp targeting, gesture merging) and accepted aliases.
+const ALWAYS_OK: &[&str] = &["comp", "merge"];
+
+const ALIASES: &[(&str, &str)] = &[("layers", "layer"), ("layer", "layers"), ("time", "frame"), ("frameRate", "fps"), ("properties", "property")];
+
+/// Reject unknown top-level parameters (typos, guessed names) with the list of accepted keys.
+pub fn check_params(spec: &CommandSpec, params: &Value) -> Result<()> {
+    let (Some(obj), Some(accepted)) = (params.as_object(), accepted_params(spec.params)) else { return Ok(()) };
+    let ok = |k: &str| ALWAYS_OK.contains(&k) || accepted.iter().any(|a| a == k || ALIASES.iter().any(|(doc, alias)| doc == a && *alias == k));
+    let unknown: Vec<&str> = obj.keys().map(String::as_str).filter(|k| !ok(k)).collect();
+    if unknown.is_empty() {
+        return Ok(());
+    }
+    let list = if accepted.is_empty() { "none".to_string() } else { accepted.join(", ") };
+    Err(bad(
+        spec.id,
+        format!("unknown parameter(s) {}; accepted: {list} (doc: {})", unknown.iter().map(|k| format!("`{k}`")).collect::<Vec<_>>().join(", "), spec.params),
+    ))
+}
diff --git a/crates/engine/src/commands/scripts.rs b/crates/engine/src/cmd/scripts.rs
similarity index 74%
rename from crates/engine/src/commands/scripts.rs
rename to crates/engine/src/cmd/scripts.rs
index 24049459c..635429d6b 100644
--- a/crates/engine/src/commands/scripts.rs
+++ b/crates/engine/src/cmd/scripts.rs
@@ -234,14 +234,18 @@ fn uninstall(s: &mut Session, p: &Value) -> Result<Value> {
     if removed { Ok(json!({"removed": name})) } else { Err(bad(c, format!("`{name}` is not installed"))) }
 }
 
-/// Run an installed or bundled script by name (File ▸ Scripts ▸ <name>). A ScriptUI panel run
-/// this way gets `this` = a floating palette-like panel window.
+/// Run an installed or bundled script by name (File ▸ Scripts ▸ `<name>`). A ScriptUI panel run
+/// this way gets `this` = a floating palette-like panel window. A script listed under File ▸
+/// Scripts runs before a panel of the same name.
 pub(crate) fn run_named(s: &mut Session, name: &str) -> Result<Value> {
-    let (panel, code) = script_code(s, name, None).ok_or_else(|| bad("file.runScript", format!("no installed or bundled script `{name}`")))?;
+    let found = script_code(s, name, Some(false)).or_else(|| script_code(s, name, None));
+    let (panel, code) = found.ok_or_else(|| bad("file.runScript", format!("no installed or bundled script `{name}`")))?;
     if panel {
         return open_panel(s, &json!({"name": name}));
     }
-    super::file_more::run_js_named(s, &code, name)
+    let result = super::file_more::run_js_named(s, &code, name)?;
+    super::file_more::remember_script(s, crate::prefs::RecentScript::Name(name.to_string()));
+    Ok(result)
 }
 
 /// The code a ScriptUI panel runs with: `this` is a dockable Panel titled after the script.
@@ -308,7 +312,7 @@ fn restore_panels(s: &mut Session, _: &Value) -> Result<Value> {
     Ok(json!({"opened": opened, "failed": failed}))
 }
 
-/// Window ▸ <ScriptUI panel>: run the panel script (or bring its panel forward).
+/// Window ▸ `<ScriptUI panel>`: run the panel script (or bring its panel forward).
 fn open_panel(s: &mut Session, p: &Value) -> Result<Value> {
     let c = "window.scriptPanel";
     let name = str_p(p, "name").ok_or_else(|| bad(c, "missing `name` (a script in the ScriptUI Panels folder)"))?.to_string();
@@ -553,6 +557,175 @@ mod tests {
         let _ = std::fs::remove_dir_all(&root);
     }
 
+    /// File ▸ Scripts ▸ Recent Script Files: the ten scripts run last, newest first, kept in the
+    /// settings; Cmd+Alt+Shift+D runs the first one again.
+    #[test]
+    fn recent_script_files_run_again() {
+        use crate::prefs::{MAX_RECENT_SCRIPTS, PREFS_FILE, Prefs, RecentScript};
+        let (mut s, root) = session_in_tmp("recent");
+        assert_eq!(crate::menus::dynamic(&s, "recentScripts", &Default::default()), (vec![], Some("No Recent Script Files")));
+        assert!(bad_params(&s.execute("file.runScript", json!({"recent": 0}))));
+        assert_eq!(s.shortcuts().shortcut_of("file.runScript", &json!({"recent": 0})), Some("Cmd+Alt+Shift+D"));
+        let tool = root.join("Tool.jsx");
+        std::fs::write(&tool, "tool").unwrap();
+        let tool = tool.to_string_lossy().into_owned();
+        s.execute("file.runScript", json!({"path": tool})).unwrap();
+        s.execute("file.runScript", json!({"name": "Rename Layers.jsx"})).unwrap();
+        // A ScriptUI panel opened from File ▸ Scripts is not a recent script file.
+        std::fs::write(root.join("settings").join(PANELS_DIR).join("Panel.jsx"), "panel").unwrap();
+        s.execute("file.runScript", json!({"name": "Panel.jsx"})).unwrap();
+        let (path, name) = (RecentScript::Path(tool.clone()), RecentScript::Name("Rename Layers.jsx".into()));
+        assert_eq!(s.prefs.recent_scripts, [name.clone(), path.clone()]);
+        let (e, _) = crate::menus::dynamic(&s, "recentScripts", &Default::default());
+        assert_eq!(e.iter().map(|e| e.label.as_str()).collect::<Vec<_>>(), ["Rename Layers.jsx", "Tool.jsx"]);
+        assert_eq!((e[1].command.as_str(), &e[1].params), ("file.runScript", &json!({"recent": 1})));
+        // Running one again runs that file and moves it to the top.
+        assert_eq!(s.execute("file.runScript", json!({"recent": 1})).unwrap()["ran"], "tool");
+        assert_eq!(s.prefs.recent_scripts, [path.clone(), name.clone()]);
+        let sample = BUNDLED.iter().find(|b| b.0 == "Rename Layers.jsx").unwrap().3;
+        assert_eq!(s.execute("file.runScript", json!({"recent": 1})).unwrap()["ran"], sample);
+        assert!(bad_params(&s.execute("file.runScript", json!({"recent": 2}))));
+        assert!(bad_params(&s.execute("file.runScript", json!({"recent": "Tool.jsx"}))));
+        // A file named like a bundled script runs again as that file.
+        let local = root.join("Rename Layers.jsx");
+        std::fs::write(&local, "local").unwrap();
+        s.execute("file.runScript", json!({"path": local.to_string_lossy()})).unwrap();
+        assert_eq!(s.execute("file.runScript", json!({"recent": 0})).unwrap()["ran"], "local");
+        assert_eq!(s.execute("file.runScript", json!({"recent": 1})).unwrap()["ran"], sample);
+        // Ten at most, saved with the settings.
+        let mut last = String::new();
+        for i in 0..MAX_RECENT_SCRIPTS + 2 {
+            let f = root.join(format!("Step {i}.jsonl"));
+            std::fs::write(&f, "").unwrap();
+            last = f.to_string_lossy().into_owned();
+            s.execute("file.runScript", json!({"path": last})).unwrap();
+        }
+        assert_eq!(s.prefs.recent_scripts.len(), MAX_RECENT_SCRIPTS);
+        assert_eq!(s.prefs.recent_scripts[0], RecentScript::Path(last));
+        let saved = std::fs::read_to_string(root.join("settings").join(PREFS_FILE)).unwrap();
+        assert_eq!(Prefs::from_json(&saved).recent_scripts, s.prefs.recent_scripts);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[test]
+    fn recent_script_history_uses_the_selected_script() {
+        let (mut s, root) = session_in_tmp("recent-panel-collision");
+        let name = "Rename Layers.jsx";
+        std::fs::write(root.join("settings").join(PANELS_DIR).join(name), "panel").unwrap();
+        assert!(super::scripts(&s).iter().any(|entry| entry.name == name && !entry.panel));
+        assert!(script_code(&s, name, None).unwrap().0);
+        let sample = BUNDLED.iter().find(|b| b.0 == name).unwrap().3;
+        assert_eq!(s.execute("file.runScript", json!({"name": name})).unwrap()["ran"], sample);
+        assert!(super::open_panel_names(&s).is_empty(), "the listed script runs instead of the panel");
+        assert_eq!(s.prefs.recent_scripts, [crate::prefs::RecentScript::Name(name.to_string())]);
+        let _ = std::fs::remove_dir_all(root);
+    }
+
+    #[test]
+    fn recent_script_history_keeps_successful_entries_when_scripts_fail() {
+        fn fail_or_echo(_: &mut Session, request: &ScriptRequest) -> Value {
+            if request.code == "fail" { json!({"error": {"message": "script failed"}}) } else { json!({"ran": request.code}) }
+        }
+        let (mut s, root) = session_in_tmp("recent-failed");
+        s.script = Some(fail_or_echo);
+        let good = root.join("good.jsonl");
+        std::fs::write(&good, "[]").unwrap();
+        s.execute("file.runScript", json!({"path": good})).unwrap();
+        let remembered = s.prefs.recent_scripts.clone();
+        for (name, code) in [("parse.jsonl", "{"), ("step.jsonl", r#"{"command":"does.not.exist"}"#), ("missing-command.jsonl", "{}"), ("runtime.jsx", "fail")]
+        {
+            let path = root.join(name);
+            std::fs::write(&path, code).unwrap();
+            assert!(s.execute("file.runScript", json!({"path": path})).is_err(), "{name}");
+            assert_eq!(s.prefs.recent_scripts, remembered, "{name}");
+        }
+        std::fs::write(root.join("settings").join(SCRIPTS_DIR).join("Failed.jsx"), "fail").unwrap();
+        assert!(s.execute("file.runScript", json!({"name": "Failed.jsx"})).is_err());
+        assert_eq!(s.prefs.recent_scripts, remembered);
+        let _ = std::fs::remove_dir_all(root);
+    }
+
+    /// Reads relative paths from a working directory that a test can change.
+    struct InFolder(std::sync::Mutex<PathBuf>);
+
+    impl InFolder {
+        fn at(&self, path: &str) -> PathBuf {
+            self.0.lock().unwrap().join(path)
+        }
+    }
+
+    impl crate::Services for InFolder {
+        fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>> {
+            std::fs::read(self.at(path))
+        }
+        fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
+            std::fs::write(self.at(path), data)
+        }
+        fn full_path(&self, path: &str) -> Option<String> {
+            Some(self.at(path).to_string_lossy().into_owned())
+        }
+    }
+
+    /// Reads from a folder but can't make paths absolute.
+    struct NoFullPath(PathBuf);
+
+    impl crate::Services for NoFullPath {
+        fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>> {
+            std::fs::read(self.0.join(path))
+        }
+        fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
+            std::fs::write(self.0.join(path), data)
+        }
+        fn full_path(&self, _path: &str) -> Option<String> {
+            None
+        }
+    }
+
+    /// A script whose path can't be made absolute still runs, and Recent Script Files does not
+    /// keep its relative path.
+    #[test]
+    fn unresolved_script_paths_are_not_remembered() {
+        let (mut s, root) = session_in_tmp("recent-unresolved");
+        std::fs::write(root.join("Tool.jsx"), "a").unwrap();
+        std::fs::write(root.join("steps.jsonl"), "[]").unwrap();
+        s.services = Arc::new(NoFullPath(root.clone()));
+        assert_eq!(s.execute("file.runScript", json!({"path": "Tool.jsx"})).unwrap()["ran"], "a");
+        s.execute("file.runScript", json!({"path": "steps.jsonl"})).unwrap();
+        assert!(s.prefs.recent_scripts.is_empty(), "{:?}", s.prefs.recent_scripts);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    /// A script run from a relative path runs the same file again from Recent Script Files after
+    /// the working directory changes, and two scripts with the same file name show their paths.
+    #[test]
+    fn recent_script_files_keep_the_file_that_ran() {
+        let (mut s, root) = session_in_tmp("recent-relative");
+        let (a, b) = (root.join("a"), root.join("b"));
+        for (dir, code) in [(&a, "a"), (&b, "b")] {
+            std::fs::create_dir_all(dir).unwrap();
+            std::fs::write(dir.join("Tool.jsx"), code).unwrap();
+        }
+        let services = Arc::new(InFolder(std::sync::Mutex::new(a.clone())));
+        s.services = services.clone();
+        assert_eq!(s.execute("file.runScript", json!({"path": "Tool.jsx"})).unwrap()["ran"], "a");
+        *services.0.lock().unwrap() = b.clone();
+        assert_eq!(s.execute("file.runScript", json!({"recent": 0})).unwrap()["ran"], "a");
+        let (e, _) = crate::menus::dynamic(&s, "recentScripts", &Default::default());
+        assert_eq!(e.iter().map(|e| e.label.as_str()).collect::<Vec<_>>(), ["Tool.jsx"]);
+        assert_eq!(s.execute("file.runScript", json!({"path": "Tool.jsx"})).unwrap()["ran"], "b");
+        let (e, _) = crate::menus::dynamic(&s, "recentScripts", &Default::default());
+        let (a, b) = (a.join("Tool.jsx").to_string_lossy().into_owned(), b.join("Tool.jsx").to_string_lossy().into_owned());
+        assert_eq!(e.iter().map(|e| e.label.as_str()).collect::<Vec<_>>(), [b.as_str(), a.as_str()]);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    /// Native script paths are kept absolute.
+    #[test]
+    fn native_full_paths_are_absolute() {
+        use crate::Services;
+        assert!(crate::FsServices.full_path("Tool.jsx").is_some_and(|p| std::path::Path::new(&p).is_absolute()));
+    }
+
     #[test]
     fn only_scripts_are_read_or_removed() {
         // A settings file in the Scripts folder that is not a script (.jsx / .js).
diff --git a/crates/engine/src/commands/settings.rs b/crates/engine/src/cmd/settings.rs
similarity index 100%
rename from crates/engine/src/commands/settings.rs
rename to crates/engine/src/cmd/settings.rs
diff --git a/crates/engine/src/commands/shape_stroke.rs b/crates/engine/src/cmd/shape_stroke.rs
similarity index 100%
rename from crates/engine/src/commands/shape_stroke.rs
rename to crates/engine/src/cmd/shape_stroke.rs
diff --git a/crates/engine/src/commands/shape_tool.rs b/crates/engine/src/cmd/shape_tool.rs
similarity index 98%
rename from crates/engine/src/commands/shape_tool.rs
rename to crates/engine/src/cmd/shape_tool.rs
index a48c32b7f..e1f3607b1 100644
--- a/crates/engine/src/commands/shape_tool.rs
+++ b/crates/engine/src/cmd/shape_tool.rs
@@ -221,7 +221,16 @@ pub fn mask_path(kind: &str, centre: [f64; 2], size: [f64; 2]) -> Option<ShapePa
         "rounded" | "roundedRect" => effectcraft_path::rect(size, centre, roundness(size)),
         k => {
             let (star, points, outer, inner) = polystar_of(k, size)?;
-            effectcraft_path::polystar(star, points, centre, 0.0, inner, outer, 0.0, 0.0)
+            effectcraft_path::polystar(effectcraft_path::Polystar {
+                star,
+                points,
+                pos: centre,
+                rotation: 0.0,
+                inner,
+                outer,
+                inner_round: 0.0,
+                outer_round: 0.0,
+            })
         }
     };
     effectcraft_path::from_kurbo(&bez).into_iter().next()
diff --git a/crates/engine/src/commands/stubs.rs b/crates/engine/src/cmd/stubs.rs
similarity index 100%
rename from crates/engine/src/commands/stubs.rs
rename to crates/engine/src/cmd/stubs.rs
diff --git a/crates/engine/src/commands/styles.rs b/crates/engine/src/cmd/styles.rs
similarity index 100%
rename from crates/engine/src/commands/styles.rs
rename to crates/engine/src/cmd/styles.rs
diff --git a/crates/engine/src/commands/text_anim.rs b/crates/engine/src/cmd/text_anim.rs
similarity index 100%
rename from crates/engine/src/commands/text_anim.rs
rename to crates/engine/src/cmd/text_anim.rs
diff --git a/crates/engine/src/commands/text_edit.rs b/crates/engine/src/cmd/text_edit.rs
similarity index 55%
rename from crates/engine/src/commands/text_edit.rs
rename to crates/engine/src/cmd/text_edit.rs
index 5dcb6d09a..0d9b25aec 100644
--- a/crates/engine/src/commands/text_edit.rs
+++ b/crates/engine/src/cmd/text_edit.rs
@@ -6,15 +6,64 @@
 //! Positions are character indices. The selection is `anchor..caret` (either order).
 
 use effectcraft_keyframe::{CharStyle, TextDoc, Value as KV};
-use effectcraft_project::{LayerId, LayerSource};
+use effectcraft_project::{ItemId, LayerId, LayerSource};
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 
+/// Session tokens for the on-canvas editor, unique across the process (so a recreated session
+/// never reuses a live IME context). Exhaustion wraps; it cannot panic.
+static NEXT_EDIT_SESSION: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
+
+/// Takes the next session token: returns the counter's current value and increments it, so
+/// successive tokens differ until the process-wide `u64` counter wraps.
+pub(super) fn next_edit_session() -> u64 {
+    NEXT_EDIT_SESSION.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
+}
+
+/// Process-global checked high-water allocator for [`crate::Session::ime_revision`] stamps.
+///
+/// egui's unavailable-IME receipt identity must be process-monotonic. Allocating the stamp from
+/// one process-global counter means neither a second session nor a rollback can reuse a value.
+/// The counter fails closed at `u64::MAX`: it returns `None` without wrapping, and callers keep
+/// their existing stamp. An unavailable before/after pair then compares equal, so it earns no
+/// receipt rather than claiming a mutation with a reused revision.
+static NEXT_IME_REVISION: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+
+/// Allocates a fresh process-wide IME revision, or `None` once the counter has nowhere left
+/// to advance; callers keep their existing stamp rather than reuse one.
+pub(crate) fn next_ime_revision() -> Option<u64> {
+    allocate_ime_revision(&NEXT_IME_REVISION)
+}
+
+/// Takes the next value of `counter` with a compare-exchange loop: `Some(current + 1)` after
+/// storing it, or `None` without storing when the counter is already `u64::MAX`.
+fn allocate_ime_revision(counter: &std::sync::atomic::AtomicU64) -> Option<u64> {
+    use std::sync::atomic::Ordering::Relaxed;
+    let mut current = counter.load(Relaxed);
+    loop {
+        let next = current.checked_add(1)?;
+        match counter.compare_exchange_weak(current, next, Relaxed, Relaxed) {
+            Ok(_) => return Some(next),
+            Err(observed) => current = observed,
+        }
+    }
+}
+
+#[test]
+fn ime_revision_allocation_stops_at_exhaustion_without_reusing_a_stamp() {
+    use std::sync::atomic::{AtomicU64, Ordering::Relaxed};
+    let counter = AtomicU64::new(u64::MAX - 1);
+    assert_eq!(allocate_ime_revision(&counter), Some(u64::MAX));
+    assert_eq!(allocate_ime_revision(&counter), None);
+    assert_eq!(allocate_ime_revision(&counter), None);
+    assert_eq!(counter.load(Relaxed), u64::MAX);
+}
+
 use super::{CommandSpec, b_p, bad, comp_id, layer_mut, resolve_layer, str_p};
 use crate::{EditorState, EngineError, Result, Session, cmd};
 
 /// An on-canvas text editing session.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct TextEdit {
     pub layer: LayerId,
     pub anchor: usize,
@@ -28,6 +77,25 @@ pub struct TextEdit {
     /// Line position kept by repeated up / down moves (layout space).
     #[serde(default)]
     pub goal_x: Option<f64>,
+    /// This editing session's identity.
+    ///
+    /// It changes when the editor is started and when its layer or document is replaced, by
+    /// undo/redo, a history jump, a rollback, or a time change showing another document. A
+    /// restore that keeps the same composition, layer and byte/style-equal document (an opacity
+    /// undo while editing) keeps it, so an active IME composition survives an unrelated change.
+    /// It is deliberately not serialized: a saved token belongs to a previous process and
+    /// cannot identify a new target. The IME owner uses it as its replacement epoch, so an old
+    /// composition is never inherited by a recreated layer or a replaced document.
+    #[serde(skip, default = "next_edit_session")]
+    pub session: u64,
+}
+
+impl Default for TextEdit {
+    /// An empty, uncreated editing session on layer `0` with no selection, pending style or goal
+    /// column, and a fresh process-wide session token.
+    fn default() -> Self {
+        Self { layer: LayerId(0), anchor: 0, caret: 0, pending: None, created: false, goal_x: None, session: next_edit_session() }
+    }
 }
 
 impl TextEdit {
@@ -49,6 +117,139 @@ pub fn layer_doc(s: &Session, lid: LayerId) -> Option<TextDoc> {
     }
 }
 
+/// The largest committed-text window an IME observation copies.
+///
+/// This mirrors `egui::output::MAX_IME_SURROUNDING_TEXT_BYTES`: a selection wider than this is
+/// reported as unavailable rather than silently truncated.
+pub const MAX_IME_TEXT_BYTES: usize = 4000;
+
+/// The editor's committed-text revision for an IME receipt whose surrounding text is
+/// unavailable (a selection wider than [`MAX_IME_TEXT_BYTES`]).
+///
+/// Unlike [`Session::revision`], unrelated project edits (an opacity undo) do not advance it, so
+/// they cannot make an active composition look stale.
+pub fn ime_stamp_revision(s: &Session) -> u64 {
+    s.ime_revision
+}
+
+/// Bounded committed text around an IME selection, with UTF-8 byte offsets.
+///
+/// The Type tool keeps the input method's pre-edit in egui's temporary data, never in the
+/// layer's [`TextDoc`], so [`Self::text`] is committed text only.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ImeSurrounding {
+    /// At most [`MAX_IME_TEXT_BYTES`] bytes of the edited layer's text.
+    pub text: String,
+    /// The caret (primary selection end) as a UTF-8 byte offset in [`Self::text`].
+    pub cursor: usize,
+    /// The other selection end; larger than `cursor` for a reversed selection.
+    pub anchor: usize,
+}
+
+impl ImeSurrounding {
+    /// A bounded window of `text` around the selection `cursor`/`anchor`.
+    ///
+    /// Returns `None` when an offset is past the text or inside a character, or when the
+    /// selection itself is wider than [`MAX_IME_TEXT_BYTES`]: the caller then reports
+    /// surrounding text as unavailable instead of sending a truncated selection.
+    pub fn from_text(text: &str, cursor: usize, anchor: usize) -> Option<Self> {
+        if cursor > text.len() || anchor > text.len() || !text.is_char_boundary(cursor) || !text.is_char_boundary(anchor) {
+            return None;
+        }
+        let (start, end) = (cursor.min(anchor), cursor.max(anchor));
+        let selection = end - start;
+        if selection > MAX_IME_TEXT_BYTES {
+            return None;
+        }
+        // Spend the remaining budget on both sides of the selection, giving unused room on one
+        // side to the other. Only this bounded window is copied.
+        let budget = MAX_IME_TEXT_BYTES - selection;
+        let mut before = (budget / 2).min(start);
+        let mut after = (budget - before).min(text.len() - end);
+        before = (budget - after).min(start);
+        after = (budget - before).min(text.len() - end);
+        let mut window_start = start - before;
+        let mut window_end = end + after;
+        // Byte budgets can land inside a multi-byte character: shrink the window so it never
+        // splits one and the selection stays inside it.
+        while window_start < start && !text.is_char_boundary(window_start) {
+            window_start += 1;
+        }
+        while end < window_end && !text.is_char_boundary(window_end) {
+            window_end -= 1;
+        }
+        Some(Self {
+            text: text.get(window_start..window_end)?.to_owned(),
+            cursor: cursor.checked_sub(window_start)?,
+            anchor: anchor.checked_sub(window_start)?,
+        })
+    }
+}
+
+/// The edited layer's committed text around its selection, or `None` when there is no edit
+/// session, the layer is gone, or the selection is wider than [`MAX_IME_TEXT_BYTES`].
+///
+/// The caret and the anchor are converted to UTF-8 byte offsets separately, so a reversed
+/// selection stays reversed. A valid empty document is `Some` with empty text, never `None`.
+pub fn ime_surrounding(s: &Session) -> Option<ImeSurrounding> {
+    let e = s.state.text_edit.as_ref()?;
+    let comp = s.active_comp()?;
+    let layer = comp.layer(e.layer)?;
+    let prop = layer.props.prop("text/sourceText")?;
+    // A static Source Text (the normal case) is borrowed in place; only an animated one has to
+    // be evaluated into a temporary. Either way only the bounded window is copied.
+    if !prop.is_animated() {
+        return match &prop.value {
+            KV::Text(doc) => {
+                let (caret, anchor) = doc_bytes(doc, e.caret, e.anchor);
+                ImeSurrounding::from_text(&doc.text, caret, anchor)
+            }
+            KV::Str(text) => {
+                let (caret, anchor) = char_bytes(text, e.caret, e.anchor);
+                ImeSurrounding::from_text(text, caret, anchor)
+            }
+            _ => None,
+        };
+    }
+    match prop.value_at(layer.layer_time(s.time())) {
+        KV::Text(doc) => {
+            let (caret, anchor) = doc_bytes(&doc, e.caret, e.anchor);
+            ImeSurrounding::from_text(&doc.text, caret, anchor)
+        }
+        KV::Str(text) => {
+            let (caret, anchor) = char_bytes(&text, e.caret, e.anchor);
+            ImeSurrounding::from_text(&text, caret, anchor)
+        }
+        _ => None,
+    }
+}
+
+/// Byte offsets of two character positions in `text` (clamped to its end), scanning once.
+///
+/// The second position may be before the first; the returned pair keeps the caller's order.
+fn char_bytes(text: &str, first: usize, second: usize) -> (usize, usize) {
+    let (lo, hi) = if first <= second { (first, second) } else { (second, first) };
+    let mut lo_byte = if lo == 0 { 0 } else { text.len() };
+    let mut hi_byte = if hi == 0 { 0 } else { text.len() };
+    if hi != 0 {
+        for (i, (b, _)) in text.char_indices().enumerate() {
+            if i == lo {
+                lo_byte = b;
+            }
+            if i == hi {
+                hi_byte = b;
+                break;
+            }
+        }
+    }
+    if first <= second { (lo_byte, hi_byte) } else { (hi_byte, lo_byte) }
+}
+
+/// Byte offsets of the editor's caret and anchor in a document, in that order.
+fn doc_bytes(doc: &TextDoc, caret: usize, anchor: usize) -> (usize, usize) {
+    char_bytes(&doc.text, caret, anchor)
+}
+
 /// The text layer a text command targets: `layer`, the edited layer, or the selected text layer.
 fn target(s: &Session, p: &Value, cmd: &str) -> Result<LayerId> {
     let cid = comp_id(s, p)?;
@@ -78,7 +279,7 @@ fn session_on(s: &mut Session, lid: LayerId) -> TextEdit {
         Some(e) if e.layer == lid => e.clone(),
         _ => {
             let n = layer_doc(s, lid).map_or(0, |d| d.char_len());
-            let e = TextEdit { layer: lid, anchor: n, caret: n, ..Default::default() };
+            let e = TextEdit { layer: lid, anchor: n, caret: n, session: next_edit_session(), ..Default::default() };
             s.state.selected_layers = vec![lid];
             s.state.text_edit = Some(e.clone());
             e
@@ -101,7 +302,8 @@ pub(crate) fn edit_doc(
 ) -> Result<()> {
     let cid = s.active_comp_id().ok_or(EngineError::NoComp)?;
     let t = s.time();
-    s.edit(label, merge, |proj, st| {
+    let revision = s.revision;
+    s.edit_text_doc(label, merge, |proj, st| {
         let l = layer_mut(proj, cid, lid)?;
         let lt = l.layer_time(t);
         let pr = l.props.prop_mut("text/sourceText").ok_or_else(|| bad("text", "not a text layer"))?;
@@ -110,16 +312,28 @@ pub(crate) fn edit_doc(
             KV::Str(t) => TextDoc::plain(&t),
             _ => TextDoc::default(),
         };
-        let before = first_line_name(&doc.text);
+        let original = doc.clone();
         f(&mut doc, st)?;
-        let after = first_line_name(&doc.text);
-        pr.set_value_at(lt, KV::Text(Box::new(doc)));
-        // Text layers are named after their text until renamed.
-        if before != after && !after.is_empty() && (l.name == before || l.name.starts_with("Text") || l.name.is_empty()) {
-            l.name = after;
+        // A no-op (an IME deletion with nothing around the selection, a set to the value it
+        // already has) must not turn a static Str into Text or add a keyframe at the CTI: that
+        // would change the project and record an empty undo step.
+        if doc != original {
+            let before = first_line_name(&original.text);
+            let after = first_line_name(&doc.text);
+            pr.set_value_at(lt, KV::Text(Box::new(doc)));
+            // Text layers are named after their text until renamed.
+            if before != after && !after.is_empty() && (l.name == before || l.name.starts_with("Text") || l.name.is_empty()) {
+                l.name = after;
+            }
         }
         Ok(())
-    })
+    })?;
+    // The editor's unavailable-text receipt identity follows only its own document: an edit to
+    // another text layer while this editor is open must not cancel the composition.
+    if s.revision != revision && s.state.text_edit.as_ref().is_some_and(|e| e.layer == lid) {
+        s.note_text_edit_change();
+    }
+    Ok(())
 }
 
 fn range_p(p: &Value) -> Option<std::ops::Range<usize>> {
@@ -153,13 +367,13 @@ fn edit(s: &mut Session, p: &Value) -> Result<Value> {
     };
     let created = b_p(p, "created").unwrap_or(false);
     s.state.selected_layers = vec![lid];
-    s.state.text_edit = Some(TextEdit { layer: lid, anchor, caret, created, ..Default::default() });
+    s.state.text_edit = Some(TextEdit { layer: lid, anchor, caret, created, session: next_edit_session(), ..Default::default() });
     s.bump();
     Ok(state_json(s))
 }
 
 /// `text.endEdit`: stop editing (a Type-tool layer left empty is deleted).
-fn end_edit(s: &mut Session, _: &Value) -> Result<Value> {
+pub(crate) fn end_edit(s: &mut Session, _: &Value) -> Result<Value> {
     let Some(e) = s.state.text_edit.take() else { return Ok(Value::Null) };
     if e.created && layer_doc(s, e.layer).is_some_and(|d| d.text.is_empty()) {
         let cid = s.active_comp_id().ok_or(EngineError::NoComp)?;
@@ -314,6 +528,78 @@ fn delete(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(state_json(s))
 }
 
+/// How many whole characters `before_bytes` / `after_bytes` cover around `r`.
+///
+/// This is the input method's own byte count, as winit reports it: a count that ends inside a
+/// UTF-8 character leaves that whole character (stock egui's `surrounding_bytes_to_chars`), so a
+/// malformed or platform-specific offset never splits or corrupts the document.
+fn surrounding_bytes_as_chars(text: &str, n: usize, r: std::ops::Range<usize>, before_bytes: usize, after_bytes: usize) -> (usize, usize) {
+    let r = r.start.min(n)..r.end.min(n);
+    let (start_byte, end_byte) = char_bytes(text, r.start, r.end);
+    let from = start_byte.saturating_sub(before_bytes);
+    let before = text.get(..start_byte).map_or(0, |head| head.char_indices().rev().take_while(|(i, _)| *i >= from).count());
+    let after = text.get(end_byte..).map_or(0, |tail| tail.char_indices().take_while(|(i, c)| i.saturating_add(c.len_utf8()) <= after_bytes).count());
+    (before.min(r.start), after.min(n.saturating_sub(r.end)))
+}
+
+/// Delete the text an input method marks for replacement around the selection
+/// (`DeleteSurrounding`, `DeleteSurroundingBytes`).
+///
+/// Unlike [`delete`] with an explicit range, the **selection stays**: the characters before its
+/// start and after its end are removed in two separate ranges, and the following `Commit`
+/// replaces the selected text. `bytes` counts UTF-8 bytes (`before`/`after` are characters
+/// otherwise); a count that ends inside a character leaves that character.
+///
+/// The counts are computed from the one document `edit_doc` already evaluated, so an animated
+/// Source Text and a large static document are not copied or evaluated again just to decide what
+/// the input method asked to replace.
+fn delete_surrounding(s: &mut Session, p: &Value) -> Result<Value> {
+    let lid = target(s, p, "text.deleteSurrounding")?;
+    // Only an open edit session has a selection to keep: without one there is nothing an input
+    // method could be replacing.
+    let e = match &s.state.text_edit {
+        Some(e) if e.layer == lid => e.clone(),
+        _ => return Err(bad("text.deleteSurrounding", "not editing this text layer")),
+    };
+    let count = |k: &str| p.get(k).and_then(Value::as_u64).map_or(0, |v| usize::try_from(v).unwrap_or(usize::MAX));
+    let (before_count, after_count) = (count("before"), count("after"));
+    let bytes = b_p(p, "bytes").unwrap_or(false);
+    let merge = str_p(p, "merge").map(str::to_string);
+    edit_doc(s, "Edit Text", merge.as_deref(), lid, |doc, st| {
+        let n = doc.char_len();
+        let r = e.range().start.min(n)..e.range().end.min(n);
+        let (before, after) = if bytes {
+            surrounding_bytes_as_chars(&doc.text, n, r.clone(), before_count, after_count)
+        } else {
+            (before_count.min(r.start), after_count.min(n.saturating_sub(r.end)))
+        };
+        let start = r.start.saturating_sub(before);
+        let end = r.end.saturating_add(after).min(n);
+        if start == r.start && end == r.end {
+            // Deletion-only batches with an empty count, or a document with nothing around the
+            // selection: no empty undo step.
+            return Ok(());
+        }
+        // The selection keeps its text: remove after it first, then before it, so the two ranges
+        // stay valid and the caret/selection shift by the characters before it.
+        if end > r.end {
+            doc.replace_range(r.end..end, "", None);
+        }
+        if r.start > start {
+            doc.replace_range(start..r.start, "", None);
+        }
+        if let Some(ed) = st.text_edit.as_mut().filter(|ed| ed.layer == lid) {
+            let shift = r.start.saturating_sub(start);
+            ed.anchor = ed.anchor.saturating_sub(shift);
+            ed.caret = ed.caret.saturating_sub(shift);
+            ed.pending = None;
+            ed.goal_x = None;
+        }
+        Ok(())
+    })?;
+    Ok(state_json(s))
+}
+
 /// Selected text (plain) of the session, and its formatted fragment.
 fn selection_doc(s: &Session) -> Option<TextDoc> {
     let e = s.state.text_edit.as_ref()?;
@@ -448,16 +734,111 @@ fn paste_formatting(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(state_json(s))
 }
 
-/// Keep the session valid after undo / external edits: clamp the selection, drop it when the
+/// Give the current editor a fresh replacement epoch after its document/layer was replaced.
+pub(crate) fn invalidate_session(s: &mut Session) {
+    let replaced = s.state.text_edit.is_some();
+    if let Some(e) = s.state.text_edit.as_mut() {
+        e.session = next_edit_session();
+    }
+    if replaced {
+        s.note_text_edit_change();
+    }
+}
+
+/// Clamp the editor selection and give it a fresh IME epoch after its document was replaced.
+///
+/// This is the one replacement path for document changes outside `edit_doc`:
+/// [`crate::Session::edit`] calls [`after_external_change`] after every edit, [`crate::Session::set_time`]
+/// and [`crate::Session::sync_related_times`] call it after moving the CTI, and
+/// [`crate::Session::sanitize_after_replacement`] calls it with the editor document snapshotted
+/// before a history restore or rollback.
+/// Clamping first means a shortened document leaves the caret in range, so the next Backspace
+/// deletes instead of being swallowed by an out-of-range selection.
+pub(crate) fn document_replaced(s: &mut Session) {
+    sanitize(s);
+    invalidate_session(s);
+}
+
+/// The identity and document of the active on-canvas editor at one moment.
+///
+/// The composition and the editor session are part of the identity: a restoration must not keep
+/// a composition alive when the snapshot came from another comp, or from an intermediate editor
+/// that was restarted during the operation being rolled back.
+#[derive(Clone, Debug, PartialEq)]
+pub struct EditorSnapshot {
+    /// The composition the editor was attached to.
+    pub comp: ItemId,
+    /// The edited layer.
+    pub layer: LayerId,
+    /// The editor session token, unique across the process.
+    pub session: u64,
+    /// The Source Text the editor was showing.
+    pub doc: TextDoc,
+}
+
+/// The identity and document the active on-canvas editor is showing.
+///
+/// [`crate::Session::edit`] and the time setters snapshot this before a change and compare it
+/// afterwards: only a change that actually replaces this document starts a new epoch, while a
+/// write to another property, layer or composition, a move to a time showing the same text, or a
+/// write that leaves the text as it was, keeps the editor's owner. With no editor open this is a
+/// single `Option` check, with no document copy.
+pub fn active_editor_snapshot(s: &Session) -> Option<EditorSnapshot> {
+    let e = s.state.text_edit.as_ref()?;
+    Some(EditorSnapshot { comp: s.active_comp_id()?, layer: e.layer, session: e.session, doc: layer_doc(s, e.layer)? })
+}
+
+/// Finish an edit outside the editor: if it replaced the document the editor owned, clamp the
+/// selection and start a new IME epoch.
+///
+/// An edit that itself moves or closes the editor owns the resulting session, so an identity
+/// mismatch is not a replacement here.
+pub(crate) fn after_external_change(s: &mut Session, before: Option<&EditorSnapshot>) {
+    let Some(before) = before else { return };
+    let Some(e) = s.state.text_edit.as_ref() else { return };
+    if s.state.active_comp != Some(before.comp) || e.layer != before.layer || e.session != before.session {
+        return;
+    }
+    if layer_doc(s, before.layer).as_ref() != Some(&before.doc) {
+        document_replaced(s);
+    }
+}
+
+/// Finish a project-state replacement (undo, redo, a history jump, a rollback): keep the editor
+/// only when the restored state still has the same composition, layer and editor session and
+/// shows byte/style-equal text.
+///
+/// The restored session token is the one saved in the replaced state, so an intermediate
+/// restart or cross-comp switch must be detected against the snapshot instead of being assumed
+/// to be the editor's own change.
+pub(crate) fn after_replacement(s: &mut Session, before: Option<&EditorSnapshot>) {
+    let Some(before) = before else {
+        // No editor was open when the snapshot was taken: a restored editor must not inherit a
+        // composition from the state the replacement replaced.
+        if s.state.text_edit.is_some() {
+            document_replaced(s);
+        }
+        return;
+    };
+    let same = s.state.text_edit.as_ref().is_some_and(|e| s.state.active_comp == Some(before.comp) && e.layer == before.layer && e.session == before.session);
+    if !same || layer_doc(s, before.layer).as_ref() != Some(&before.doc) {
+        document_replaced(s);
+    }
+}
+
+/// Keep the session valid after routine state cleanup: clamp the selection, drop it when the
 /// layer is gone or not in the active comp.
+///
+/// This is also called after project-item cleanup that leaves the edited document alone, so it
+/// must not advance [`TextEdit::session`]: that would make the viewer treat unrelated cleanup as
+/// a document replacement and interrupt the active IME composition. Replacement paths call
+/// [`document_replaced`] instead.
 pub(crate) fn sanitize(s: &mut Session) {
     let Some(e) = s.state.text_edit.clone() else { return };
     match layer_doc(s, e.layer) {
         Some(d) => {
             let n = d.char_len();
-            if (e.anchor > n || e.caret > n)
-                && let Some(ed) = s.state.text_edit.as_mut()
-            {
+            if let Some(ed) = s.state.text_edit.as_mut() {
                 ed.anchor = ed.anchor.min(n);
                 ed.caret = ed.caret.min(n);
             }
@@ -536,6 +917,8 @@ fn editing(s: &Session) -> std::result::Result<(), String> {
     if s.state.text_edit.is_some() { Ok(()) } else { Err("not editing text".into()) }
 }
 
+/// The command specs of this module: the `text.*` editing, selection and caret commands and
+/// the two `edit.pasteText*` commands, each with its parameter shape and enablement predicate.
 pub fn specs() -> Vec<CommandSpec> {
     vec![
         cmd!(
@@ -594,6 +977,15 @@ pub fn specs() -> Vec<CommandSpec> {
             editing_or_text_layer,
             delete
         ),
+        cmd!(
+            "text.deleteSurrounding",
+            "Delete Text Around Selection",
+            [],
+            None,
+            "{layer?, before?, after?, bytes?, merge?} (input-method replacement: the characters before and after the selection are deleted, the selection stays; bytes counts UTF-8 bytes)",
+            editing_or_text_layer,
+            delete_surrounding
+        ),
         cmd!(
             "edit.pasteTextMatchFormatting",
             "Paste Text and Match Formatting",
diff --git a/crates/engine/src/commands/three_d.rs b/crates/engine/src/cmd/three_d.rs
similarity index 100%
rename from crates/engine/src/commands/three_d.rs
rename to crates/engine/src/cmd/three_d.rs
diff --git a/crates/engine/src/commands/time.rs b/crates/engine/src/cmd/time.rs
similarity index 94%
rename from crates/engine/src/commands/time.rs
rename to crates/engine/src/cmd/time.rs
index 8cb3071bf..556c02bcb 100644
--- a/crates/engine/src/commands/time.rs
+++ b/crates/engine/src/cmd/time.rs
@@ -28,6 +28,20 @@ pub fn display_time(s: &Session, comp: &Comp, t: Tick) -> String {
     }
 }
 
+/// A length (a layer's Duration) in the project's Time Display Style: a count of frames, so
+/// neither Start Numbering Frames At nor the comp's Start Timecode moves it.
+pub fn display_duration(s: &Session, comp: &Comp, len: Tick) -> String {
+    let fr = comp.frame_rate;
+    let n = fr.frame_at(len);
+    match s.project.settings.time_display {
+        TimeDisplayStyle::Frames => format!("{n:05}"),
+        TimeDisplayStyle::Feet35 | TimeDisplayStyle::Feet16 => {
+            effectcraft_time::format_feet_frames(n, s.project.settings.time_display.frames_per_foot().unwrap_or(16))
+        }
+        TimeDisplayStyle::Timecode => effectcraft_time::format_timecode_ae(n, fr, false),
+    }
+}
+
 /// Parse a time typed in the project's Time Display Style (relative `+n`/`-n` from frame
 /// `current`) into a comp frame.
 pub fn parse_display_time(s: &Session, comp: &Comp, text: &str, current: i64) -> std::result::Result<i64, String> {
diff --git a/crates/engine/src/commands/timeline.rs b/crates/engine/src/cmd/timeline.rs
similarity index 100%
rename from crates/engine/src/commands/timeline.rs
rename to crates/engine/src/cmd/timeline.rs
diff --git a/crates/engine/src/commands/track.rs b/crates/engine/src/cmd/track.rs
similarity index 100%
rename from crates/engine/src/commands/track.rs
rename to crates/engine/src/cmd/track.rs
diff --git a/crates/engine/src/commands/view.rs b/crates/engine/src/cmd/view.rs
similarity index 100%
rename from crates/engine/src/commands/view.rs
rename to crates/engine/src/cmd/view.rs
diff --git a/crates/engine/src/commands/viewer_cmds.rs b/crates/engine/src/cmd/viewer_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/viewer_cmds.rs
rename to crates/engine/src/cmd/viewer_cmds.rs
diff --git a/crates/engine/src/commands/vpe.rs b/crates/engine/src/cmd/vpe.rs
similarity index 100%
rename from crates/engine/src/commands/vpe.rs
rename to crates/engine/src/cmd/vpe.rs
diff --git a/crates/engine/src/commands/vr_editor.rs b/crates/engine/src/cmd/vr_editor.rs
similarity index 100%
rename from crates/engine/src/commands/vr_editor.rs
rename to crates/engine/src/cmd/vr_editor.rs
diff --git a/crates/engine/src/commands/warp_cmds.rs b/crates/engine/src/cmd/warp_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/warp_cmds.rs
rename to crates/engine/src/cmd/warp_cmds.rs
diff --git a/crates/engine/src/commands/watch_folder.rs b/crates/engine/src/cmd/watch_folder.rs
similarity index 100%
rename from crates/engine/src/commands/watch_folder.rs
rename to crates/engine/src/cmd/watch_folder.rs
diff --git a/crates/engine/src/commands/layer.rs b/crates/engine/src/commands/layer.rs
deleted file mode 100644
index b798493b1..000000000
--- a/crates/engine/src/commands/layer.rs
+++ /dev/null
@@ -1,1866 +0,0 @@
-//! Layer menu.
-
-use effectcraft_color::{BlendMode, Label};
-use effectcraft_keyframe::{Justify, TextDoc, Value as KV};
-use effectcraft_project::build::{self, Ids};
-use effectcraft_project::{
-    Comp, FrameBlend, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, MaskMode, MatteKind, Node, Project, PropGroup, Quality, Solid, TrackMatte,
-    limits,
-};
-use effectcraft_time::Tick;
-use serde_json::{Value, json};
-
-use super::{CommandSpec, b_p, bad, comp_id, f_p, has_comp, has_layers, layer_mut, layer_p, layers_p, merge_p, resolve_layer, str_p, unlocked};
-use crate::{EngineError, Result, Session, cmd};
-
-pub(crate) fn color_p(p: &Value, k: &str) -> Option<[f32; 3]> {
-    match p.get(k)? {
-        Value::String(s) => effectcraft_color::Rgba::from_hex(s).map(|c| [c.r, c.g, c.b]),
-        Value::Array(a) => {
-            let g = |i: usize| a.get(i).and_then(Value::as_f64).unwrap_or(0.0) as f32;
-            Some([g(0), g(1), g(2)])
-        }
-        _ => None,
-    }
-}
-
-/// Insert a new layer above the selection (or at the top) and select it.
-pub(crate) fn insert_layer(proj: &mut Project, st: &mut crate::EditorState, cid: ItemId, layer: Layer) -> Result<LayerId> {
-    insert_layer_at(proj, st, cid, layer, None)
-}
-
-/// `index`: an `index` parameter, the layer's 1-based place in the stack (1 = top; past the
-/// bottom = the bottom), as 0-based.
-pub(crate) fn index_p(p: &Value, cmd: &str) -> Result<Option<usize>> {
-    match p.get("index") {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => {
-            v.as_u64().filter(|i| *i >= 1).map(|i| Some(usize::try_from(i - 1).unwrap_or(usize::MAX))).ok_or_else(|| bad(cmd, "index: 1-based stack position"))
-        }
-    }
-}
-
-/// A `position` parameter: `[x, y]` in comp pixels (finite).
-pub(crate) fn position_p(p: &Value, cmd: &str) -> Result<Option<[f64; 2]>> {
-    match p.get("position") {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => v
-            .as_array()
-            .and_then(|a| Some([a.first()?.as_f64()?, a.get(1)?.as_f64()?]))
-            .filter(|c| c.iter().all(|x| x.is_finite()))
-            .map(Some)
-            .ok_or_else(|| bad(cmd, "position: [x, y] in comp pixels")),
-    }
-}
-
-/// Put a new layer's Position at `pos` (comp pixels).
-pub(crate) fn place(l: &mut Layer, pos: Option<[f64; 2]>) {
-    if let Some([x, y]) = pos
-        && let Some(pr) = l.props.prop_mut("transform/position")
-    {
-        let z = match pr.value {
-            KV::Vec3(v) => v[2],
-            _ => 0.0,
-        };
-        pr.value = KV::Vec3([x, y, z]);
-    }
-}
-
-/// [`insert_layer`] at stack position `at` (0 = top) instead of above the selected layer.
-pub(crate) fn insert_layer_at(proj: &mut Project, st: &mut crate::EditorState, cid: ItemId, mut layer: Layer, at: Option<usize>) -> Result<LayerId> {
-    // Text and shape layers in Advanced 3D comps get Geometry Options (extrusion, bevels).
-    if proj.comp(cid).is_some_and(|c| c.renderer == effectcraft_project::Renderer::Advanced3D) {
-        super::model3d::add_geometry_options(&mut proj.next_id, &mut layer);
-    }
-    let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-    let at = match at {
-        Some(i) => i.min(comp.layers.len()),
-        None => st.selected_layers.first().and_then(|id| comp.layers.iter().position(|l| l.id == *id)).unwrap_or(0),
-    };
-    let id = layer.id;
-    comp.layers.insert(at, layer);
-    st.selected_layers = vec![id];
-    st.selected_props.clear();
-    st.selected_keys.clear();
-    Ok(id)
-}
-
-fn solids_folder(proj: &mut Project) -> ItemId {
-    proj.folder_named("Solids").unwrap_or_else(|| proj.add_item("Solids", Label::Yellow, None, ItemKind::Folder))
-}
-
-fn new_solid_like(s: &mut Session, p: &Value, adjustment: bool) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let color = color_p(p, "color").unwrap_or(if adjustment { [1.0, 1.0, 1.0] } else { [0.85, 0.2, 0.2] });
-    // 1 to 30,000 px a side (#788): the layer is sized from the same numbers as its solid.
-    let w = p.get("width").and_then(Value::as_u64).map(limits::size).unwrap_or(comp.width);
-    let h = p.get("height").and_then(Value::as_u64).map(limits::size).unwrap_or(comp.height);
-    let pixel_aspect = pixel_aspect_p(p)?.unwrap_or(comp.pixel_aspect);
-    let default_name = if adjustment { "Adjustment Layer 1".to_string() } else { "Solid 1".to_string() };
-    let name = str_p(p, "name").map(str::to_string).unwrap_or(default_name);
-    let id = s.edit(if adjustment { "New Adjustment Layer" } else { "New Solid" }, None, |proj, st| {
-        let folder = solids_folder(proj);
-        let sid = proj.add_item(&name, Label::Red, Some(folder), ItemKind::Solid(Solid { color, width: w, height: h, pixel_aspect }));
-        let mut l = build::layer(proj, &comp, &name, LayerSource::Solid { item: sid }, (w, h), None);
-        if adjustment {
-            l.switches.adjustment = true;
-            l.label = Label::Purple;
-        }
-        insert_layer(proj, st, cid, l)
-    })?;
-    Ok(json!({"layer": id.0}))
-}
-
-/// `pixelAspect` (a positive number), when given.
-fn pixel_aspect_p(p: &Value) -> Result<Option<f64>> {
-    match p.get("pixelAspect").and_then(Value::as_f64) {
-        Some(v) if !(v.is_finite() && v > 0.0) => Err(bad("layer.settings", "`pixelAspect` must be a positive number")),
-        v => Ok(v.map(limits::pixel_aspect)),
-    }
-}
-
-fn new_solid(s: &mut Session, p: &Value) -> Result<Value> {
-    new_solid_like(s, p, false)
-}
-fn new_adjustment(s: &mut Session, p: &Value) -> Result<Value> {
-    new_solid_like(s, p, true)
-}
-
-/// Parameters of `layer.setText` / `layer.newText` that aren't text attributes.
-const NOT_ATTRS: &[&str] = &["layer", "layers", "comp", "merge", "text", "range", "position", "edit"];
-
-/// Apply `layer.setText` keys to `d`: `text` replaces characters `r` (or everything), then each
-/// character / paragraph / document attribute applies to `r` (or everything).
-fn apply_text_params(cmd: &str, p: &Value, d: &mut TextDoc, r: Option<std::ops::Range<usize>>) -> Result<()> {
-    let mut r = r;
-    if let Some(t) = str_p(p, "text") {
-        match r.clone() {
-            Some(rr) => {
-                d.replace_range(rr.clone(), t, None);
-                r = Some(rr.start..rr.start + t.chars().count());
-            }
-            None => d.set_text(t),
-        }
-    }
-    let Some(obj) = p.as_object() else { return Ok(()) };
-    for (k, v) in obj {
-        if NOT_ATTRS.contains(&k.as_str()) {
-            continue;
-        }
-        if !d.set_attr(k, v, r.clone()).map_err(|e| bad(cmd, e))? {
-            return Err(bad(cmd, format!("unknown text attribute {k}")));
-        }
-    }
-    Ok(())
-}
-
-fn text_range_p(p: &Value) -> Option<std::ops::Range<usize>> {
-    let a = p.get("range")?.as_array()?;
-    let g = |i: usize| a.get(i).and_then(Value::as_u64).map(|x| x as usize);
-    let (x, y) = (g(0)?, g(1).or(g(0))?);
-    Some(x.min(y)..x.max(y))
-}
-
-fn new_text(s: &mut Session, p: &Value) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let mut doc = TextDoc { text: "Text".into(), justify: Justify::Center, ..Default::default() };
-    // A paragraph box given in comp space: the layer sits at its centre.
-    let bx = p.get("box").and_then(Value::as_array).map(|a| [0, 1, 2, 3].map(|i| a.get(i).and_then(Value::as_f64).unwrap_or(0.0)));
-    let mut q = p.clone();
-    if let Some(o) = q.as_object_mut() {
-        o.remove("box");
-        o.remove("name");
-    }
-    let layer_name = str_p(p, "name").map(str::to_string);
-    apply_text_params("layer.newText", &q, &mut doc, None)?;
-    let mut pos = position_p(p, "layer.newText")?;
-    if let Some([x, y, w, h]) = bx {
-        let (w, h) = (w.abs().max(1.0), h.abs().max(1.0));
-        doc.box_size = Some([w, h]);
-        doc.box_pos = [-w / 2.0, -h / 2.0];
-        pos = Some([x + w / 2.0, y + h / 2.0]);
-        if p.get("justify").is_none() {
-            doc.set_attr("justify", &json!("left"), None).map_err(|e| bad("layer.newText", e))?;
-        }
-    }
-    let edit = b_p(p, "edit").unwrap_or(false);
-    let id = s.edit("New Text Layer", None, |proj, st| {
-        let name: String = layer_name.clone().unwrap_or_else(|| doc.text.lines().next().unwrap_or("").chars().take(40).collect());
-        let mut l = build::layer(proj, &comp, if name.is_empty() { "Text" } else { &name }, LayerSource::Text, (comp.width, comp.height), None);
-        if let Some(pr) = l.props.prop_mut("text/sourceText") {
-            pr.value = KV::Text(Box::new(doc.clone()));
-        }
-        if let Some(pos) = pos
-            && let Some(pr) = l.props.prop_mut("transform/position")
-        {
-            pr.value = KV::Vec3([pos[0], pos[1], 0.0]);
-        }
-        let n = doc.char_len();
-        let id = insert_layer(proj, st, cid, l)?;
-        if edit {
-            st.text_edit = Some(super::text_edit::TextEdit { layer: id, anchor: 0, caret: n, created: true, ..Default::default() });
-        }
-        Ok(id)
-    })?;
-    Ok(json!({"layer": id.0}))
-}
-
-fn new_shape(s: &mut Session, p: &Value) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let kind = str_p(p, "kind").unwrap_or("none").to_string();
-    let size = p
-        .get("size")
-        .and_then(Value::as_array)
-        .map(|a| [a.first().and_then(Value::as_f64).unwrap_or(200.0), a.get(1).and_then(Value::as_f64).unwrap_or(200.0)])
-        .unwrap_or([300.0, 300.0]);
-    // A fill, and a stroke only with a width (not the Tools bar's paint).
-    let paint = super::shape_tool::paint_p(p, &Default::default(), "layer.newShape")?;
-    let pos = p
-        .get("position")
-        .and_then(|v| v.as_array())
-        .map(|a| [a.first().and_then(Value::as_f64).unwrap_or(0.0), a.get(1).and_then(Value::as_f64).unwrap_or(0.0)]);
-    let name = str_p(p, "name").unwrap_or("Shape Layer 1").to_string();
-    let id = s.edit("New Shape Layer", None, |proj, st| {
-        let lid = super::shape_tool::new_shape_layer(proj, st, &comp, cid, Some(&name), pos)?;
-        let mut next = proj.next_id;
-        let g = super::shape_tool::shape_group(&mut Ids(&mut next), &kind, size, &paint);
-        proj.next_id = next;
-        if let Some(g) = g {
-            super::shape_tool::add_to_contents(proj, cid, lid, g, [0.0, 0.0], "layer.newShape")?;
-        }
-        Ok(lid)
-    })?;
-    Ok(json!({"layer": id.0}))
-}
-
-fn new_simple(s: &mut Session, p: &Value, src: LayerSource, name: &str, label: &str) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let name = str_p(p, "name").unwrap_or(name).to_string();
-    let id = s.edit(label, None, |proj, st| {
-        let l = build::layer(proj, &comp, &name, src, (comp.width, comp.height), None);
-        insert_layer(proj, st, cid, l)
-    })?;
-    Ok(json!({"layer": id.0}))
-}
-
-fn new_null(s: &mut Session, p: &Value) -> Result<Value> {
-    new_simple(s, p, LayerSource::Null, "Null 1", "New Null Object")
-}
-
-fn add_item(s: &mut Session, p: &Value) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let item = match p.get("item") {
-        Some(Value::Number(n)) => ItemId(n.as_u64().unwrap_or(0)),
-        Some(Value::String(name)) => s.project.find_by_name(name).map(|i| i.id).ok_or_else(|| bad("layer.addItem", format!("no item `{name}`")))?,
-        _ => *s.state.project_selection.first().ok_or_else(|| bad("layer.addItem", "missing `item`"))?,
-    };
-    if s.project.comp_contains(item, cid) {
-        return Err(bad("layer.addItem", "a composition can't contain itself"));
-    }
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let it = s.project.item(item).ok_or_else(|| bad("layer.addItem", "no such item"))?.clone();
-    let (src, size, dur) = match &it.kind {
-        ItemKind::Comp(c) => (LayerSource::Comp { item }, (c.width, c.height), Some(c.duration)),
-        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Still => {
-            // `duration`, else Settings ▸ Import ▸ Still Footage: length of the composition or a
-            // duration.
-            let d = f_p(p, "duration")
-                .filter(|d| d.is_finite() && *d > 0.0)
-                .or((s.prefs.import.still_footage == "seconds").then_some(s.prefs.import.still_seconds))
-                .map(Tick::from_seconds_f64);
-            (LayerSource::Footage { item }, (f.width, f.height), d)
-        }
-        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Data => {
-            return Err(bad("layer.addItem", "data files can't be layers; read them in expressions with footage(\"name\").sourceData"));
-        }
-        ItemKind::Footage(f) if f.kind == effectcraft_project::FootageKind::Model => {
-            return super::model3d::new_model(
-                s,
-                &serde_json::json!({"comp": cid.0, "item": item.0, "time": f_p(p, "time"), "index": p.get("index"), "position": p.get("position")}),
-            );
-        }
-        ItemKind::Footage(f) => (LayerSource::Footage { item }, (f.width, f.height), Some(f.looped_duration())),
-        ItemKind::Solid(so) => (LayerSource::Solid { item }, (so.width, so.height), None),
-        ItemKind::Folder => return Err(bad("layer.addItem", "folders can't be layers")),
-    };
-    let index = index_p(p, "layer.addItem")?;
-    let position = position_p(p, "layer.addItem")?;
-    let fr = comp.frame_rate;
-    // Settings ▸ General ▸ Create Layers at Composition Start Time (off: at the current time).
-    let default_start = if s.prefs.general.create_layers_at_comp_start || s.active_comp_id() != Some(cid) { Tick::ZERO } else { s.time() };
-    let start = fr.snap_nearest(f_p(p, "time").map(Tick::from_seconds_f64).unwrap_or(default_start));
-    let id = s.edit("Add Footage to Comp", None, |proj, st| {
-        let mut l = build::layer(proj, &comp, &it.name, src, size, dur);
-        l.start_time = start;
-        l.in_point = start;
-        // Footage and precomps keep their full length past the comp's end (After Effects); items
-        // without a duration (solids, comp-length stills) end with the comp.
-        let end = dur.map_or((start + comp.duration).min(comp.duration), |d| start + d);
-        l.out_point = fr.snap_nearest(end).max(start + fr.frame_duration());
-        place(&mut l, position);
-        insert_layer_at(proj, st, cid, l, index)
-    })?;
-    Ok(json!({"layer": id.0}))
-}
-
-fn select(s: &mut Session, p: &Value) -> Result<Value> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    let ids: Vec<LayerId> = match p.get("layers").or(p.get("layer")) {
-        Some(Value::Array(a)) => a.iter().filter_map(|v| resolve_layer(comp, v)).collect(),
-        Some(v) => resolve_layer(comp, v).into_iter().collect(),
-        None => vec![],
-    };
-    let add = b_p(p, "add").unwrap_or(false);
-    let toggle = b_p(p, "toggle").unwrap_or(false);
-    if toggle {
-        for id in ids {
-            if let Some(i) = s.state.selected_layers.iter().position(|l| *l == id) {
-                s.state.selected_layers.remove(i);
-            } else {
-                s.state.selected_layers.push(id);
-            }
-        }
-    } else if add {
-        for id in ids {
-            if !s.state.selected_layers.contains(&id) {
-                s.state.selected_layers.push(id);
-            }
-        }
-    } else {
-        s.state.selected_layers = ids;
-        s.state.selected_props.clear();
-        s.state.selected_keys.clear();
-        let keep = s.state.selected_layers.clone();
-        s.state.selected_vertices.retain(|v| keep.contains(&v.layer));
-    }
-    Ok(json!(s.state.selected_layers.iter().map(|l| l.0).collect::<Vec<_>>()))
-}
-
-fn select_step(s: &mut Session, p: &Value, dir: i64) -> Result<Value> {
-    let comp = s.active_comp().ok_or(EngineError::NoComp)?;
-    if comp.layers.is_empty() {
-        return Ok(Value::Null);
-    }
-    let cur = s.state.selected_layers.first().and_then(|id| comp.layers.iter().position(|l| l.id == *id));
-    let n = comp.layers.len() as i64;
-    // The next layer that can be selected (locked and hidden shy layers are stepped over); at
-    // the end of the stack the selection stays.
-    let start = match cur {
-        Some(i) => i as i64 + dir,
-        None if dir > 0 => 0,
-        None => n - 1,
-    };
-    let next =
-        std::iter::successors(Some(start), |i| Some(i + dir)).take_while(|i| (0..n).contains(i)).find(|i| super::selectable(comp, &comp.layers[*i as usize]));
-    let Some(i) = next.or(cur.map(|i| i as i64)) else { return Ok(Value::Null) };
-    let id = comp.layers[i as usize].id;
-    let add = b_p(p, "add").unwrap_or(false);
-    if add {
-        if !s.state.selected_layers.contains(&id) {
-            s.state.selected_layers.insert(0, id);
-        }
-    } else {
-        s.state.selected_layers = vec![id];
-    }
-    Ok(json!(id.0))
-}
-
-fn select_next(s: &mut Session, p: &Value) -> Result<Value> {
-    select_step(s, p, 1)
-}
-fn select_prev(s: &mut Session, p: &Value) -> Result<Value> {
-    select_step(s, p, -1)
-}
-
-fn set_switch(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let name = str_p(p, "switch").ok_or_else(|| bad("layer.setSwitch", "missing `switch`"))?.to_string();
-    let v = b_p(p, "value");
-    let label = format!("Layer Switch ({name})");
-    if b_p(p, "others") == Some(true) {
-        return set_switch_others(s, cid, &ids, &name, v, &label);
-    }
-    // `merge`: a switch dragged over several layers in the Timeline is one undo step.
-    let r = s.edit(&label, merge_p(p), |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        let mut last = false;
-        // Toggle relative to the first layer so a multi-selection ends up consistent.
-        let first = comp.layers.iter().find(|l| ids.contains(&l.id)).map(|l| switch_value(l, &name)).unwrap_or(Some(false));
-        let Some(first) = first else { return Err(bad("layer.setSwitch", format!("unknown switch `{name}`"))) };
-        let target = v.unwrap_or(!first);
-        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
-            set_switch_value(l, &name, target);
-            last = target;
-        }
-        Ok(last)
-    })?;
-    Ok(json!(r))
-}
-
-/// `layer.setSwitch {others: true}` (Alt-click on an A/V feature in the Timeline): the named
-/// layers stand alone, shown / heard / soloed / unlocked while every other layer the switch
-/// applies to is the opposite; when they already do, the other layers come back. `value` sets
-/// the other layers directly.
-fn set_switch_others(s: &mut Session, cid: ItemId, ids: &[LayerId], name: &str, value: Option<bool>, label: &str) -> Result<Value> {
-    let r = s.edit(label, None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        // The state that sets a layer apart: unlocked for Lock, on for the rest.
-        let active = !matches!(name, "lock" | "locked");
-        // Track mattes keep their video off by design.
-        let mattes: Vec<LayerId> =
-            if matches!(name, "video" | "eye") { comp.layers.iter().filter_map(|l| l.track_matte.map(|m| m.layer)).collect() } else { Vec::new() };
-        let applies = |l: &Layer| match name {
-            "audio" => l.props.sub("audio").is_some(),
-            "lock" | "locked" => true,
-            // Nulls have a Video switch too (it hides their outline in the viewer).
-            "video" | "eye" => (l.source.is_av() || matches!(l.source, LayerSource::Null)) && !mattes.contains(&l.id),
-            _ => l.source.is_av() && !mattes.contains(&l.id),
-        };
-        let mut alone = true;
-        for l in comp.layers.iter().filter(|l| applies(l)) {
-            let Some(on) = switch_value(l, name) else { return Err(bad("layer.setSwitch", format!("unknown switch `{name}`"))) };
-            alone &= on == (ids.contains(&l.id) == active);
-        }
-        let others = value.unwrap_or(alone == active);
-        for l in comp.layers.iter_mut().filter(|l| applies(l)) {
-            let v = if ids.contains(&l.id) { active } else { others };
-            set_switch_value(l, name, v);
-        }
-        Ok(others)
-    })?;
-    Ok(json!(r))
-}
-
-fn switch_value(l: &Layer, name: &str) -> Option<bool> {
-    let sw = &l.switches;
-    Some(match name {
-        "video" | "eye" => sw.video,
-        "audio" => sw.audio,
-        "solo" => sw.solo,
-        "lock" | "locked" => sw.locked,
-        "shy" => sw.shy,
-        "collapse" => sw.collapse,
-        "quality" => sw.quality == Quality::Best,
-        "fx" | "effects" => sw.effects,
-        "frameBlend" => sw.frame_blend != FrameBlend::Off,
-        "motionBlur" => sw.motion_blur,
-        "adjustment" => sw.adjustment,
-        "threeD" | "3d" | "3D" => sw.three_d,
-        "guide" => sw.guide,
-        "preserveTransparency" => l.preserve_transparency,
-        _ => return None,
-    })
-}
-
-fn set_switch_value(l: &mut Layer, name: &str, v: bool) {
-    let sw = &mut l.switches;
-    match name {
-        "video" | "eye" => sw.video = v,
-        "audio" => sw.audio = v,
-        "solo" => sw.solo = v,
-        "lock" | "locked" => sw.locked = v,
-        "shy" => sw.shy = v,
-        "collapse" => sw.collapse = v,
-        "quality" => sw.quality = if v { Quality::Best } else { Quality::Draft },
-        "fx" | "effects" => sw.effects = v,
-        "frameBlend" => sw.frame_blend = if v { FrameBlend::FrameMix } else { FrameBlend::Off },
-        "motionBlur" => sw.motion_blur = v,
-        "adjustment" => sw.adjustment = v,
-        "threeD" | "3d" | "3D" => {
-            if sw.three_d && !v {
-                drop_3d_values(l);
-            }
-            l.switches.three_d = v;
-        }
-        "guide" => sw.guide = v,
-        "preserveTransparency" => l.preserve_transparency = v,
-        _ => {}
-    }
-}
-
-/// Turning the 3D switch off discards Z values, Orientation and X/Y Rotation (as in AE).
-fn drop_3d_values(l: &mut Layer) {
-    let Some(tr) = l.transform_mut() else { return };
-    for (m, keep) in [("position", 0.0), ("anchor", 0.0), ("scale", 100.0)] {
-        if let Some(pr) = tr.get_mut(m) {
-            let flat = |v: &mut KV| {
-                if let KV::Vec3(a) = v {
-                    a[2] = keep;
-                }
-            };
-            flat(&mut pr.value);
-            for k in &mut pr.keys {
-                flat(&mut k.value);
-            }
-        }
-    }
-    for (m, zero) in [("orientation", KV::Vec3([0.0; 3])), ("rotationX", KV::Scalar(0.0)), ("rotationY", KV::Scalar(0.0))] {
-        if let Some(pr) = tr.get_mut(m) {
-            pr.keys.clear();
-            pr.expr = None;
-            pr.value = zero;
-        }
-    }
-}
-
-fn rename(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.rename")?;
-    let name = str_p(p, "name").ok_or_else(|| bad("layer.rename", "missing `name`"))?.to_string();
-    s.edit("Rename Layer", None, |proj, _| {
-        layer_mut(proj, cid, lid)?.name = name.clone();
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// The Timeline's Comment column.
-fn set_comment(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let text = str_p(p, "comment").ok_or_else(|| bad("layer.setComment", "missing `comment`"))?.to_string();
-    s.edit("Layer Comment", None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
-            l.comment = text.clone();
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-fn blend(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let mode = str_p(p, "mode").and_then(BlendMode::from_name);
-    let step = p.get("step").and_then(Value::as_i64).unwrap_or(0);
-    if mode.is_none() && step == 0 {
-        return Err(bad("layer.setBlendMode", "need `mode` (e.g. Multiply) or `step` ±1"));
-    }
-    s.edit("Blending Mode", None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
-            l.blend_mode = match mode {
-                Some(m) => m,
-                None if step > 0 => l.blend_mode.next(),
-                None => l.blend_mode.previous(),
-            };
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-fn track_matte(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.setTrackMatte")?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    let matte = match p.get("matte") {
-        None | Some(Value::Null) => None,
-        Some(v) => Some(resolve_layer(comp, v).ok_or_else(|| bad("layer.setTrackMatte", "no such matte layer"))?),
-    };
-    let kind = str_p(p, "kind")
-        .map(|k| match k.to_ascii_lowercase().replace([' ', '_', '-'], "").as_str() {
-            "alphainverted" | "alphainv" => MatteKind::AlphaInverted,
-            "luma" => MatteKind::Luma,
-            "lumainverted" | "lumainv" => MatteKind::LumaInverted,
-            _ => MatteKind::Alpha,
-        })
-        .unwrap_or(MatteKind::Alpha);
-    s.edit("Track Matte", None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        if let Some(m) = matte {
-            if m == lid {
-                return Err(bad("layer.setTrackMatte", "a layer can't be its own matte"));
-            }
-            if let Some(ml) = comp.layer_mut(m) {
-                ml.switches.video = false;
-            }
-        }
-        comp.layer_mut(lid).ok_or(EngineError::NoComp)?.track_matte = matte.map(|layer| TrackMatte { layer, kind });
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// Re-express a layer in its new parent space without moving its anchor.
-pub(crate) struct ParentFix {
-    pub layer: LayerId,
-    /// Maps Position from the old parent's space into the new one's.
-    m: effectcraft_geom::Mat3,
-    /// Added to Rotation.
-    rotation: f64,
-    /// Multiply Scale.
-    scale: [f64; 2],
-    /// 3D AV layers retain their world-space anchor, including Z.
-    position_3d: Option<effectcraft_geom::Mat4>,
-    /// A uniform relative parent transform can preserve static Orientation and Scale.
-    pose_3d: Option<([f64; 3], f64)>,
-}
-
-impl ParentFix {
-    /// Re-express the layer's Position, Rotation and Scale (every key) in the new parent's space.
-    pub fn apply(&self, l: &mut Layer) {
-        let Some(tr) = l.props.sub_mut("transform") else { return };
-        if let Some(m) = self.position_3d {
-            // Spatial Position speed measures distance along its path. Its parent-space
-            // unit changes even when the child's Orientation cannot be re-expressed.
-            let position_speed = uniform_parent_pose(m, [0.0; 3]).map(|(_, factor)| factor.abs());
-            let map_position = |v: &KV| {
-                let q = m.apply(effectcraft_geom::Vec3::from(v.as_vec3()));
-                KV::Vec3([q.x, q.y, q.z])
-            };
-            // Read all separated axes before writing any of them.
-            let names = ["positionX", "positionY", "positionZ"];
-            if tr.get("positionX").is_some() {
-                let axes = names.map(|name| tr.get(name).cloned());
-                let current = axes.each_ref().map(|pr| pr.as_ref().map(|pr| pr.value.as_f64()).unwrap_or(0.0));
-                let q = m.apply(effectcraft_geom::Vec3::from(current));
-                for (i, name) in names.into_iter().enumerate() {
-                    if let Some(pr) = tr.get_mut(name) {
-                        pr.value = KV::Scalar([q.x, q.y, q.z].get(i).copied().unwrap_or(0.0));
-                        for key in &mut pr.keys {
-                            let p = axes.each_ref().map(|axis| axis.as_ref().map(|axis| axis.value_at(key.time).as_f64()).unwrap_or(0.0));
-                            let q = m.apply(effectcraft_geom::Vec3::from(p));
-                            key.value = KV::Scalar([q.x, q.y, q.z].get(i).copied().unwrap_or(0.0));
-                        }
-                    }
-                }
-            }
-            if let Some(pr) = tr.get_mut("position") {
-                pr.value = map_position(&pr.value);
-                for key in &mut pr.keys {
-                    key.value = map_position(&key.value);
-                    // Spatial tangents are vectors, so the parent's translation is excluded.
-                    for tangent in [&mut key.spatial_in, &mut key.spatial_out] {
-                        let v = m.apply_vec(effectcraft_geom::Vec3::from(*tangent));
-                        *tangent = [v.x, v.y, v.z];
-                    }
-                }
-                if let Some(factor) = position_speed
-                    .filter(|_| pr.spatial)
-                    .filter(|factor| pr.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * *factor).is_finite()))
-                {
-                    for key in &mut pr.keys {
-                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
-                            ease.speed *= factor;
-                        }
-                    }
-                }
-            }
-            // Cameras and lights aim with Point of Interest: move it by the same parent-space
-            // change, so a two-node rig keeps its world frame (#1010, #1020).
-            if let Some(pr) = tr.get_mut("poi") {
-                pr.value = map_position(&pr.value);
-                for key in &mut pr.keys {
-                    key.value = map_position(&key.value);
-                    for tangent in [&mut key.spatial_in, &mut key.spatial_out] {
-                        let v = m.apply_vec(effectcraft_geom::Vec3::from(*tangent));
-                        *tangent = [v.x, v.y, v.z];
-                    }
-                }
-                if let Some(factor) = position_speed
-                    .filter(|_| pr.spatial)
-                    .filter(|factor| pr.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * *factor).is_finite()))
-                {
-                    for key in &mut pr.keys {
-                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
-                            ease.speed *= factor;
-                        }
-                    }
-                }
-            }
-            if let Some((orientation, factor)) = self.pose_3d {
-                if let Some(pr) = tr.get_mut("orientation") {
-                    pr.value = KV::Vec3(orientation);
-                }
-                if let Some(pr) = tr.get_mut("scale") {
-                    let scaled = |value: &KV| KV::Vec3(value.as_vec3().map(|v| v * factor));
-                    pr.value = scaled(&pr.value);
-                    for key in &mut pr.keys {
-                        key.value = scaled(&key.value);
-                        // Scale's temporal speeds use the same units as its values.
-                        for ease in key.in_ease.iter_mut().chain(&mut key.out_ease) {
-                            ease.speed *= factor;
-                        }
-                    }
-                }
-            }
-            return;
-        }
-        let map = |pr: &mut effectcraft_project::Property, f: &dyn Fn(&KV) -> KV| {
-            pr.value = f(&pr.value);
-            for key in &mut pr.keys {
-                key.value = f(&key.value);
-            }
-        };
-        let m = self.m;
-        if tr.get("positionX").is_some() {
-            // Separated dimensions: X and Y move together, key by key at the same times.
-            // Everything is read before anything is written.
-            let [x, y] = [tr.get("positionX"), tr.get("positionY")].map(|p| p.map(|p| p.value.as_f64()).unwrap_or(0.0));
-            let q = m.apply(effectcraft_geom::vec2(x, y));
-            let keys_x: Vec<(Tick, f64)> = tr.get("positionX").map(|p| p.keys.iter().map(|k| (k.time, k.value.as_f64())).collect()).unwrap_or_default();
-            let keys_y: Vec<(Tick, f64)> = tr.get("positionY").map(|p| p.keys.iter().map(|k| (k.time, k.value.as_f64())).collect()).unwrap_or_default();
-            let at = |keys: &[(Tick, f64)], name: &str, t: Tick, tr: &PropGroup| {
-                keys.iter().find(|k| k.0 == t).map(|k| k.1).unwrap_or_else(|| tr.get(name).map(|p| p.value_at(t).as_f64()).unwrap_or(0.0))
-            };
-            let (xs, ys): (Vec<f64>, Vec<f64>) = (
-                keys_x.iter().map(|&(t, x)| m.apply(effectcraft_geom::vec2(x, at(&keys_y, "positionY", t, tr))).x).collect(),
-                keys_y.iter().map(|&(t, y)| m.apply(effectcraft_geom::vec2(at(&keys_x, "positionX", t, tr), y)).y).collect(),
-            );
-            for (name, value, vals) in [("positionX", q.x, xs), ("positionY", q.y, ys)] {
-                if let Some(pr) = tr.get_mut(name) {
-                    pr.value = KV::Scalar(value);
-                    for (k, v) in pr.keys.iter_mut().zip(vals) {
-                        k.value = KV::Scalar(v);
-                    }
-                }
-            }
-        } else if let Some(pr) = tr.get_mut("position") {
-            map(pr, &|v| {
-                let c = v.as_vec3();
-                let q = m.apply(effectcraft_geom::vec2(c[0], c[1]));
-                KV::Vec3([q.x, q.y, c[2]])
-            });
-        }
-        let (dr, k) = (self.rotation, self.scale);
-        if let Some(pr) = tr.get_mut("rotation") {
-            map(pr, &|v| KV::Scalar(v.as_f64() + dr));
-        }
-        if let Some(pr) = tr.get_mut("scale") {
-            map(pr, &|v| {
-                let c = v.as_vec3();
-                KV::Vec3([c[0] * k[0], c[1] * k[1], c[2]])
-            });
-        }
-    }
-}
-
-/// A uniform factor commutes with authored axis Rotation and Scale; prepend its orthogonal
-/// rotation to static Orientation using the existing Rz * Ry * Rx order.
-fn uniform_parent_pose(m: effectcraft_geom::Mat4, orientation: [f64; 3]) -> Option<([f64; 3], f64)> {
-    use effectcraft_geom::{Mat4, Vec3, vec3};
-    if !orientation.iter().all(|v| v.is_finite()) {
-        return None;
-    }
-    let a = m.0;
-    let columns = [vec3(a[0][0], a[1][0], a[2][0]), vec3(a[0][1], a[1][1], a[2][1]), vec3(a[0][2], a[1][2], a[2][2])];
-    let magnitude = columns[0].x.hypot(columns[0].y).hypot(columns[0].z);
-    if !magnitude.is_finite() || magnitude <= 0.0 {
-        return None;
-    }
-    let c = columns.map(|c| c / magnitude);
-    if c.iter().any(|c| (c.dot(*c) - 1.0).abs() > 1e-9) || c[0].dot(c[1]).abs() > 1e-9 || c[0].dot(c[2]).abs() > 1e-9 || c[1].dot(c[2]).abs() > 1e-9 {
-        return None;
-    }
-    let cross = vec3(c[1].y * c[2].z - c[1].z * c[2].y, c[1].z * c[2].x - c[1].x * c[2].z, c[1].x * c[2].y - c[1].y * c[2].x);
-    let factor = if c[0].dot(cross) < 0.0 { -magnitude } else { magnitude };
-    let mut rotation = Mat4::IDENTITY;
-    for row in 0..3 {
-        for col in 0..3 {
-            rotation.0[row][col] = a[row][col] / factor;
-        }
-    }
-    if (0..3).all(|row| (0..3).all(|col| (rotation.0[row][col] - if row == col { 1.0 } else { 0.0 }).abs() < 1e-12)) {
-        return Some((orientation, factor));
-    }
-    let r = (rotation * Mat4::orientation(Vec3::from(orientation))).0;
-    // atan2 rather than asin: near ±90 degrees asin loses precision, while cos(y) stays exact.
-    let cy = r[0][0].hypot(r[1][0]);
-    let y = (-r[2][0]).atan2(cy);
-    let (x, z) = if cy > 1e-9 { (r[2][1].atan2(r[2][2]), r[1][0].atan2(r[0][0])) } else { ((-r[1][2]).atan2(r[1][1]), 0.0) };
-    Some(([x.to_degrees(), y.to_degrees(), z.to_degrees()], factor))
-}
-
-/// A parent change retains 2D transforms and the world-space anchor of 3D layers (Position,
-/// and Point of Interest for two-node cameras and lights). Position is
-/// re-expressed in the new parent's space (`None`: the composition), evaluated at the current
-/// time.
-pub(crate) fn parent_fixes(s: &Session, cid: ItemId, ids: &[LayerId], parent: Option<LayerId>) -> Vec<ParentFix> {
-    let Some(comp) = s.project.comp(cid) else { return vec![] };
-    let ectx =
-        effectcraft_render::EvalCtx { project: &s.project, comp_id: cid, comp, time: s.time(), expr: s.expr.as_deref(), footage: Some(s.footage.as_ref()) };
-    let space = |id: Option<LayerId>| -> effectcraft_geom::Mat3 {
-        id.and_then(|i| comp.layer(i)).filter(|l| !l.is_3d()).map(|l| ectx.layer_to_comp(l).0).unwrap_or(effectcraft_geom::Mat3::IDENTITY)
-    };
-    let decompose = |m: &effectcraft_geom::Mat3| {
-        let a = m.0;
-        let sx = (a[0][0] * a[0][0] + a[1][0] * a[1][0]).sqrt();
-        let det = a[0][0] * a[1][1] - a[0][1] * a[1][0];
-        (a[1][0].atan2(a[0][0]).to_degrees(), sx, if sx > 1e-12 { det / sx } else { 0.0 })
-    };
-    let new_m = space(parent);
-    let Some(inv) = new_m.inverse() else { return vec![] };
-    let (rn, sxn, syn) = decompose(&new_m);
-    let mut fixes: Vec<_> = comp
-        .layers
-        .iter()
-        .filter(|l| ids.contains(&l.id) && !l.is_3d() && l.parent != parent)
-        .map(|l| {
-            let old_m = space(l.parent);
-            let (ro, sxo, syo) = decompose(&old_m);
-            let scale = [if sxn.abs() > 1e-12 { sxo / sxn } else { 1.0 }, if syn.abs() > 1e-12 { syo / syn } else { 1.0 }];
-            ParentFix { layer: l.id, m: inv * old_m, rotation: ro - rn, scale, position_3d: None, pose_3d: None }
-        })
-        .collect();
-    let space_3d = |id: Option<LayerId>| {
-        id.and_then(|id| comp.layer(id)).map_or(effectcraft_geom::Mat4::IDENTITY, |layer| {
-            // Parent transforms do not inherit the parent's source pixel-aspect stretch.
-            let world = ectx.world_matrix(layer);
-            let par = ectx.par_ratio(layer);
-            let a = layer.transform().map(|tr| ectx.v3(layer, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
-            let anchor = effectcraft_geom::vec3(a[0], a[1], if layer.is_3d() { a[2] } else { 0.0 });
-            world
-                * effectcraft_geom::Mat4::translate(anchor)
-                * effectcraft_geom::Mat4::scale(effectcraft_geom::vec3(1.0 / par, 1.0, 1.0))
-                * effectcraft_geom::Mat4::translate(-anchor)
-        })
-    };
-    if let Some(inv) = space_3d(parent).inverse().filter(|m| m.0.iter().flatten().all(|v| v.is_finite())) {
-        // Cameras and lights compensate like 3D layers (Position, and Point of Interest for
-        // two-node rigs), so parenting keeps the world frame (#1010, #1020). They have no
-        // Scale, so `pose_3d` below stays `None` and Orientation is kept as authored.
-        for layer in comp.layers.iter().filter(|l| ids.contains(&l.id) && l.is_3d() && l.parent != parent) {
-            let m = inv * space_3d(layer.parent);
-            if m.0.iter().flatten().all(|v| v.is_finite()) {
-                let pose_3d = layer.transform().and_then(|tr| {
-                    let orientation = tr.get("orientation")?;
-                    let scale = tr.get("scale")?;
-                    // Animated Euler Orientation and auto-orient cannot be re-expressed by
-                    // prepending a constant Euler value. Expression-driven values stay authored.
-                    if !orientation.keys.is_empty()
-                        || orientation.expr.is_some()
-                        || scale.expr.is_some()
-                        || layer.auto_orient != effectcraft_project::AutoOrient::Off
-                    {
-                        return None;
-                    }
-                    let pose = uniform_parent_pose(m, orientation.value.as_vec3())?;
-                    let factor = pose.1;
-                    let values_finite = std::iter::once(&scale.value)
-                        .chain(scale.keys.iter().map(|key| &key.value))
-                        .all(|value| value.as_vec3().iter().all(|v| (v * factor).is_finite()));
-                    let speeds_finite = scale.keys.iter().flat_map(|key| key.in_ease.iter().chain(&key.out_ease)).all(|ease| (ease.speed * factor).is_finite());
-                    (values_finite && speeds_finite).then_some(pose)
-                });
-                fixes.push(ParentFix { layer: layer.id, m: effectcraft_geom::Mat3::IDENTITY, rotation: 0.0, scale: [1.0; 2], position_3d: Some(m), pose_3d });
-            }
-        }
-    }
-    fixes
-}
-
-/// Validate the proposed ancestor chain before any authored edit, including when compensation
-/// is disabled. Bound both unique ancestors and linear lookup/selection work on loaded graphs.
-fn check_parent_chain(comp: &Comp, ids: &[LayerId], parent: Option<LayerId>, max_visits: usize, max_work: usize) -> Result<()> {
-    let mut seen = std::collections::HashSet::new();
-    let mut work = 0usize;
-    let mut cur = parent;
-    while let Some(id) = cur {
-        if seen.len() >= max_visits {
-            return Err(bad("layer.setParent", "parent chain exceeds the safety visit limit"));
-        }
-        if !seen.insert(id) {
-            return Err(bad("layer.setParent", "parent chain contains an existing cycle"));
-        }
-        for selected in ids {
-            if work >= max_work {
-                return Err(bad("layer.setParent", "parent chain exceeds the safety work limit"));
-            }
-            work += 1;
-            if *selected == id {
-                return Err(bad("layer.setParent", "parenting would create a cycle"));
-            }
-        }
-        let mut ancestor = None;
-        for layer in &comp.layers {
-            if work >= max_work {
-                return Err(bad("layer.setParent", "parent chain exceeds the safety work limit"));
-            }
-            work += 1;
-            if layer.id == id {
-                ancestor = Some(layer);
-                break;
-            }
-        }
-        let layer = ancestor.ok_or_else(|| bad("layer.setParent", "parent chain refers to a missing layer"))?;
-        cur = layer.parent;
-    }
-    Ok(())
-}
-
-fn set_parent(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    let parent = match p.get("parent") {
-        None | Some(Value::Null) => None,
-        Some(v) => Some(resolve_layer(comp, v).ok_or_else(|| bad("layer.setParent", "no such parent layer"))?),
-    };
-    // A loaded cycle need not include a selected child. Validate before compensation or edit;
-    // do not impose the renderer's 64-ancestor truncation as a new ordinary hierarchy limit.
-    check_parent_chain(comp, &ids, parent, 4096, 1_048_576)?;
-    // Like AE's pick-whip, parenting keeps the layer where it is: its transform is re-expressed
-    // in the new parent's space (Position, Rotation, Scale), unless `compensate: false`.
-    let compensate = b_p(p, "compensate").unwrap_or(true);
-    let fixes = if compensate { parent_fixes(s, cid, &ids, parent) } else { vec![] };
-    s.edit("Parent", None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
-            l.parent = parent;
-            if let Some(f) = fixes.iter().find(|f| f.layer == l.id) {
-                f.apply(l);
-            }
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-fn timing(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let t = s.time();
-    let op = str_p(p, "op").unwrap_or("set").to_string();
-    // Layer times stay on frame boundaries of the comp (as in AE).
-    let fr = s.project.comp(cid).ok_or(EngineError::NoComp)?.frame_rate;
-    let snap = |k: &str| f_p(p, k).map(|v| fr.snap_nearest(Tick::from_seconds_f64(v)));
-    let (delta, start, inp, outp) = (snap("delta"), snap("start"), snap("in"), snap("out"));
-    // Relative trims: each layer moves its own in/out point by the same amount, so dragging an
-    // edge of several selected layers trims them all together (as in AE).
-    let (in_delta, out_delta) = (snap("inDelta"), snap("outDelta"));
-    s.edit("Layer Timing", merge_p(p), |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        let fd = comp.frame_duration();
-        let comp_dur = comp.duration;
-        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
-            let shift = |l: &mut Layer, d: Tick| {
-                l.start_time += d;
-                l.in_point += d;
-                l.out_point += d;
-            };
-            match op.as_str() {
-                "moveInToTime" => {
-                    let d = t - l.in_point;
-                    shift(l, d);
-                }
-                "moveOutToTime" => {
-                    let d = t - l.out_point;
-                    shift(l, d);
-                }
-                "moveInToStart" => {
-                    let d = Tick::ZERO - l.in_point;
-                    shift(l, d);
-                }
-                "moveOutToEnd" => {
-                    let d = comp_dur - l.out_point;
-                    shift(l, d);
-                }
-                "trimInToTime" => l.in_point = t.min(l.out_point - fd),
-                "trimOutToTime" => l.out_point = t.max(l.in_point + fd),
-                _ => {
-                    if let Some(d) = delta {
-                        shift(l, d);
-                    }
-                    if let Some(st) = start {
-                        let d = st - l.start_time;
-                        shift(l, d);
-                    }
-                    if let Some(i) = inp {
-                        l.in_point = i.min(l.out_point - fd);
-                    }
-                    if let Some(o) = outp {
-                        l.out_point = o.max(l.in_point + fd);
-                    }
-                    // Stops at the comp start/end (a point already past it doesn't jump onto
-                    // it), keeping at least one frame of layer.
-                    if let Some(d) = in_delta {
-                        l.in_point = (l.in_point + d).max(Tick::ZERO.min(l.in_point)).min(l.out_point - fd);
-                    }
-                    if let Some(d) = out_delta {
-                        l.out_point = (l.out_point + d).min(comp_dur.max(l.out_point)).max(l.in_point + fd);
-                    }
-                }
-            }
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// `p` with `key` set.
-fn with(p: &Value, key: &str, v: Value) -> Value {
-    let mut p = if p.is_object() { p.clone() } else { json!({}) };
-    p[key] = v;
-    p
-}
-
-/// Move the layers `frames` frames in time (Alt+Page Up / Page Down, with Shift ten frames).
-fn move_frames(s: &mut Session, p: &Value, frames: i64) -> Result<Value> {
-    let (cid, _) = layers_p(s, p)?;
-    let delta = s.project.comp(cid).ok_or(EngineError::NoComp)?.frame_rate.tick_of(frames).seconds();
-    timing(s, &with(p, "delta", json!(delta)))
-}
-
-/// Slip edit: move a layer's source (footage or precomp) under its fixed in and out points, like
-/// dragging the source-duration bar in After Effects. `delta` in seconds or `frames`; positive
-/// moves the source later. Clamped so the source still covers the in–out span. Keyframes and
-/// layer markers are in layer time, so they travel with the source.
-fn slip(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    let fr = comp.frame_rate;
-    let delta = match (p.get("frames").and_then(Value::as_i64), f_p(p, "delta")) {
-        (Some(f), _) => fr.tick_of(f),
-        (None, Some(d)) => fr.snap_nearest(Tick::from_seconds_f64(d)),
-        _ => return Err(bad("layer.slip", "delta (seconds) or frames required")),
-    };
-    // Allowed shift per layer: the source span [lo, hi] in comp time must keep covering in..out.
-    let mut shifts: Vec<(LayerId, Tick)> = Vec::new();
-    for l in comp.layers.iter().filter(|l| ids.contains(&l.id)) {
-        if l.props.get("timeRemap").is_some() {
-            continue;
-        }
-        let dur = match &l.source {
-            LayerSource::Footage { item } => match s.project.item(*item).map(|i| &i.kind) {
-                Some(ItemKind::Footage(f)) if f.kind != effectcraft_project::FootageKind::Still => Some(f.looped_duration()),
-                _ => None,
-            },
-            LayerSource::Comp { item } => s.project.comp(*item).map(|c| c.duration),
-            _ => None,
-        };
-        let Some(dur) = dur else { continue };
-        let (a, b) = (l.comp_time(Tick::ZERO), l.comp_time(dur));
-        let (lo, hi) = (a.min(b), a.max(b));
-        let (min_d, max_d) = (l.out_point - hi, l.in_point - lo);
-        if min_d > max_d {
-            continue;
-        }
-        shifts.push((l.id, delta.max(min_d).min(max_d)));
-    }
-    if shifts.is_empty() {
-        return Err(bad("layer.slip", "select a footage or precomp layer (without time remapping)"));
-    }
-    s.edit("Slip Edit", merge_p(p), |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        for (id, d) in &shifts {
-            if let Some(l) = comp.layer_mut(*id) {
-                l.start_time += *d;
-            }
-        }
-        Ok(())
-    })?;
-    Ok(json!({"slipped": shifts.iter().map(|(id, d)| json!({"layer": id.0, "delta": d.seconds()})).collect::<Vec<_>>()}))
-}
-
-fn arrange(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let ids = unlocked(s, cid, ids, "layer.arrange")?;
-    let how = str_p(p, "to").unwrap_or("front").to_string();
-    let index = p.get("index").and_then(Value::as_u64).map(|i| i as usize);
-    // `above`: put the layers right above that one (the timeline's drag to reorder).
-    let above = match p.get("above") {
-        Some(v) => {
-            let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-            let a = resolve_layer(comp, v).ok_or_else(|| bad("layer.arrange", "no such layer for `above`"))?;
-            if ids.contains(&a) {
-                return Err(bad("layer.arrange", "`above` must be a layer that isn't being moved"));
-            }
-            Some(a)
-        }
-        None => None,
-    };
-    s.edit("Arrange Layers", None, |proj, _| {
-        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        // Bring Forward / Send Backward move each layer one step past the next layer that isn't
-        // moving (a run of selected layers moves as one; one already at the end stays).
-        if above.is_none() && index.is_none() && matches!(how.as_str(), "forward" | "backward") {
-            let picked = |l: &Layer| ids.contains(&l.id);
-            let n = comp.layers.len();
-            if how == "forward" {
-                for i in 1..n {
-                    if picked(&comp.layers[i]) && !picked(&comp.layers[i - 1]) {
-                        let run_end = (i..n).find(|j| !picked(&comp.layers[*j])).unwrap_or(n);
-                        comp.layers[i - 1..run_end].rotate_left(1);
-                    }
-                }
-            } else {
-                for i in (0..n.saturating_sub(1)).rev() {
-                    if picked(&comp.layers[i]) && !picked(&comp.layers[i + 1]) {
-                        let run_start = (0..=i).rev().find(|j| !picked(&comp.layers[*j])).map_or(0, |j| j + 1);
-                        comp.layers[run_start..=i + 1].rotate_right(1);
-                    }
-                }
-            }
-            return Ok(());
-        }
-        let mut picked: Vec<Layer> = Vec::new();
-        comp.layers.retain(|l| {
-            if ids.contains(&l.id) {
-                picked.push(l.clone());
-                false
-            } else {
-                true
-            }
-        });
-        let at = match (how.as_str(), index) {
-            _ if above.is_some() => comp.layers.iter().position(|l| Some(l.id) == above).unwrap_or(comp.layers.len()),
-            (_, Some(i)) => i.saturating_sub(1).min(comp.layers.len()),
-            ("back", _) => comp.layers.len(),
-            _ => 0,
-        };
-        for (k, l) in picked.into_iter().enumerate() {
-            comp.layers.insert((at + k).min(comp.layers.len()), l);
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// Layer ▸ Pre-compose. `mode: move` (default; "Move all attributes into the new composition")
-/// nests the selected layers as they are; `mode: leave` ("Leave all attributes in", one footage,
-/// solid or precomp layer) nests only the layer's source, sized to it, and keeps the layer's
-/// transform, masks, effects and timing in the current comp. `adjustDuration` (move) trims the
-/// new comp to the selected layers' span; `open` opens the new comp.
-fn precompose(s: &mut Session, p: &Value) -> Result<Value> {
-    let c = "layer.precompose";
-    let (cid, ids) = layers_p(s, p)?;
-    if ids.is_empty() {
-        return Err(bad(c, "no layers"));
-    }
-    let name = str_p(p, "name").unwrap_or("Pre-comp 1").to_string();
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let leave = match str_p(p, "mode").unwrap_or("move") {
-        "move" => false,
-        "leave" => true,
-        x => return Err(bad(c, format!("mode: move|leave, got `{x}`"))),
-    };
-    let adjust = b_p(p, "adjustDuration").unwrap_or(false);
-    if leave {
-        let [lid] = ids[..] else { return Err(bad(c, "\"Leave all attributes\" needs exactly one layer")) };
-        let layer = comp.layer(lid).ok_or(EngineError::NoComp)?.clone();
-        let Some(src_item) = layer.source.item() else {
-            return Err(bad(c, "\"Leave all attributes\" is available for footage, solid and precomp layers only"));
-        };
-        let (w, h) = effectcraft_render::source_size(&s.project, &layer);
-        let (w, h) = if w == 0 || h == 0 { (comp.width, comp.height) } else { (w, h) };
-        let dur = match s.project.item(src_item).map(|i| &i.kind) {
-            Some(ItemKind::Comp(nc)) => nc.duration,
-            Some(ItemKind::Footage(f)) if f.duration > Tick(0) => f.duration,
-            _ => comp.duration,
-        };
-        let new = s.edit("Pre-compose", None, |proj, st| {
-            let mut inner = comp.nested_like(w, h, dur);
-            let mut il = build::layer(proj, &inner, &layer.name, layer.source.clone(), (w, h), Some(dur));
-            il.name = layer.name.clone();
-            inner.layers.push(il);
-            let iid = proj.add_item(&name, Label::Sandstone, None, ItemKind::Comp(inner.into()));
-            let l = layer_mut(proj, cid, lid)?;
-            l.source = LayerSource::Comp { item: iid };
-            l.name = name.clone();
-            st.selected_layers = vec![lid];
-            Ok((iid, lid))
-        })?;
-        if b_p(p, "open").unwrap_or(false) {
-            s.open_comp(new.0);
-        }
-        return Ok(json!({"comp": new.0.0, "layer": new.1.0}));
-    }
-    let span = {
-        let sel: Vec<&effectcraft_project::Layer> = comp.layers.iter().filter(|l| ids.contains(&l.id)).collect();
-        let a = sel.iter().map(|l| l.in_point).min().unwrap_or(Tick(0)).max(Tick(0));
-        let b = sel.iter().map(|l| l.out_point).max().unwrap_or(comp.duration).min(comp.duration);
-        (a, b)
-    };
-    let (offset, dur) = if adjust && span.1 > span.0 { (span.0, span.1 - span.0) } else { (Tick(0), comp.duration) };
-    let new = s.edit("Pre-compose", None, |proj, st| {
-        let mut inner = comp.nested_like(comp.width, comp.height, dur);
-        inner.layers = comp.layers.iter().filter(|l| ids.contains(&l.id)).cloned().collect();
-        for l in &mut inner.layers {
-            if l.parent.is_some_and(|p| !ids.contains(&p)) {
-                l.parent = None;
-            }
-            if l.track_matte.is_some_and(|m| !ids.contains(&m.layer)) {
-                l.track_matte = None;
-            }
-            l.start_time -= offset;
-            l.in_point -= offset;
-            l.out_point -= offset;
-        }
-        let iid = proj.add_item(&name, Label::Sandstone, None, ItemKind::Comp(inner.into()));
-        let mut l = build::layer(proj, &comp, &name, LayerSource::Comp { item: iid }, (comp.width, comp.height), Some(dur));
-        l.name = name.clone();
-        l.start_time = offset;
-        l.in_point = offset;
-        l.out_point = offset + dur;
-        let c = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
-        let at = c.layers.iter().position(|l| ids.contains(&l.id)).unwrap_or(0);
-        c.layers.retain(|l| !ids.contains(&l.id));
-        let lid = l.id;
-        c.layers.insert(at.min(c.layers.len()), l);
-        st.selected_layers = vec![lid];
-        Ok((iid, lid))
-    })?;
-    if b_p(p, "open").unwrap_or(false) {
-        s.open_comp(new.0);
-    }
-    Ok(json!({"comp": new.0.0, "layer": new.1.0}))
-}
-
-fn add_mask(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.addMask")?;
-    let layer = s.project.comp(cid).and_then(|c| c.layer(lid)).ok_or(EngineError::NoComp)?.clone();
-    let (w, h) = effectcraft_render::source_size(&s.project, &layer);
-    let (w, h) = if w == 0 { (400.0, 300.0) } else { (w as f64, h as f64) };
-    let shape = str_p(p, "shape").unwrap_or("rect");
-    let r = p.get("rect").and_then(Value::as_array).map(|a| [0, 1, 2, 3].map(|i| a.get(i).and_then(Value::as_f64).unwrap_or(0.0)));
-    let (cx, cy, rw, rh) = match r {
-        Some([x, y, rw, rh]) => (x + rw / 2.0, y + rh / 2.0, rw, rh),
-        None => (if w > 0.0 { w / 2.0 } else { 0.0 }, h / 2.0, w * 0.6, h * 0.6),
-    };
-    // The shape tools' masks: rectangle, ellipse, rounded rectangle, polygon or star.
-    let path = super::shape_tool::mask_path(shape, [cx, cy], [rw, rh])
-        .ok_or_else(|| bad("layer.addMask", format!("unknown shape `{shape}`; one of rect, ellipse, rounded, polygon, star")))?;
-    let mode = str_p(p, "mode").and_then(MaskMode::from_name).unwrap_or(MaskMode::Add);
-    let cycle = s.prefs.appearance.cycle_mask_colors;
-    let uid = s.edit("New Mask", None, |proj, _| {
-        let mut next = proj.next_id;
-        let l = layer_mut(proj, cid, lid)?;
-        let masks = l.props.sub_mut("masks").ok_or_else(|| bad("layer.addMask", "this layer can't have masks"))?;
-        let n = masks.children.len();
-        let g = build::mask(&mut Ids(&mut next), &format!("Mask {}", n + 1), path, mode, crate::prefs::mask_color(cycle, n));
-        let uid = g.uid;
-        masks.children.push(g.into());
-        proj.next_id = next;
-        Ok(uid)
-    })?;
-    Ok(json!({"mask": uid}))
-}
-
-fn mask_props(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.setMask")?;
-    let target = p.get("mask").cloned().unwrap_or(json!(1));
-    let mode = str_p(p, "mode").and_then(MaskMode::from_name);
-    let inverted = b_p(p, "inverted");
-    s.edit("Mask Settings", None, |proj, _| {
-        let l = layer_mut(proj, cid, lid)?;
-        let masks = l.props.sub_mut("masks").ok_or_else(|| bad("layer.setMask", "the layer has no masks (add one with layer.addMask)"))?;
-        let g = match &target {
-            Value::Number(n) => {
-                let n = n.as_u64().unwrap_or(1);
-                if let Some(i) = masks.children.iter().position(|c| c.uid() == n) {
-                    masks.children[i].as_group_mut()
-                } else {
-                    masks.children.get_mut(n.saturating_sub(1) as usize).and_then(|c| c.as_group_mut())
-                }
-            }
-            Value::String(name) => masks.children.iter_mut().find(|c| c.name() == name).and_then(|c| c.as_group_mut()),
-            _ => None,
-        }
-        .ok_or_else(|| bad("layer.setMask", "no such mask"))?;
-        if let GroupKind::Mask { mode: m, inverted: inv, .. } = &mut g.kind {
-            if let Some(mm) = mode {
-                *m = mm;
-            }
-            if let Some(i) = inverted {
-                *inv = i;
-            }
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-fn add_shape_item(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.addShapeItem")?;
-    let kind = str_p(p, "kind").ok_or_else(|| bad("layer.addShapeItem", "missing `kind`"))?.to_string();
-    // `group`: a uid or a property path (`contents/group`).
-    let group_uid = match p.get("group") {
-        Some(Value::String(path)) => Some(
-            s.project
-                .comp(cid)
-                .and_then(|c| c.layer(lid))
-                .and_then(|l| l.props.group(path))
-                .map(|g| g.uid)
-                .ok_or_else(|| bad("layer.addShapeItem", format!("no group `{path}`")))?,
-        ),
-        v => v.and_then(Value::as_u64),
-    };
-    let uid = s.edit("Add Shape Item", None, |proj, _| {
-        let mut next = proj.next_id;
-        let mut ids = Ids(&mut next);
-        // Front / Bevel / Side / Back ▸ property: into the group's surface item (one per group).
-        if let Some((surface, prop)) = build::shape_surface_kind(&kind) {
-            let target = shape_item_target(proj, cid, lid, group_uid)?;
-            let item = match target.children.iter().position(|c| matches!(c, Node::Group(g) if g.match_id == surface)) {
-                Some(i) => i,
-                None => {
-                    let g = build::shape_surface(&mut ids, surface).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{kind}`")))?;
-                    target.children.push(g.into());
-                    target.children.len() - 1
-                }
-            };
-            let Some(Node::Group(g)) = target.children.get_mut(item) else { return Err(bad("layer.addShapeItem", "no such group")) };
-            if g.get(prop).is_none() {
-                let p = build::shape_surface_prop(&mut ids, prop).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{kind}`")))?;
-                g.children.push(p.into());
-            }
-            let uid = g.uid;
-            proj.next_id = next;
-            return Ok(uid);
-        }
-        let g = match kind.as_str() {
-            "group" => build::shape_group(&mut ids, "Group 1", vec![]),
-            "rect" | "rectangle" => build::shape_rect(&mut ids, [200.0, 200.0], [0.0, 0.0], 0.0),
-            "ellipse" => build::shape_ellipse(&mut ids, [200.0, 200.0], [0.0, 0.0]),
-            "star" => build::shape_star(&mut ids, true, 5.0, [0.0, 0.0], 100.0, 50.0),
-            "polygon" => build::shape_star(&mut ids, false, 5.0, [0.0, 0.0], 100.0, 0.0),
-            "fill" => build::shape_fill(&mut ids, [1.0, 0.0, 0.0, 1.0]),
-            "stroke" => build::shape_stroke(&mut ids, [1.0, 1.0, 1.0, 1.0], 2.0),
-            "path" => build::shape_path(&mut ids, Default::default()),
-            "gfill" | "gradientFill" => build::shape_gradient_fill(&mut ids, false, [-100.0, 0.0], [100.0, 0.0], Default::default()),
-            "gstroke" | "gradientStroke" => build::shape_gradient_stroke(&mut ids, false, [-100.0, 0.0], [100.0, 0.0], Default::default(), 2.0),
-            "trim" | "trimPaths" => build::shape_trim(&mut ids, 0.0, 100.0, 0.0),
-            "repeater" => build::shape_repeater(&mut ids, 3.0, [100.0, 0.0]),
-            k => build::shape_simple_op(&mut ids, k).ok_or_else(|| bad("layer.addShapeItem", format!("unknown kind `{k}`")))?,
-        };
-        let uid = g.uid;
-        proj.next_id = next;
-        shape_item_target(proj, cid, lid, group_uid)?.children.push(g.into());
-        Ok(uid)
-    })?;
-    // The new item's property path, ready for prop.set / add_keyframe (`contents/trim#2/end`).
-    let path = s.project.comp(cid).and_then(|c| c.layer(lid)).and_then(|l| l.props.match_path_of(uid));
-    Ok(json!({"uid": uid, "path": path}))
-}
-
-/// The contents a new shape item goes into: the shape group `group_uid` (its Contents), else the
-/// layer's Contents.
-fn shape_item_target(proj: &mut Project, cid: ItemId, lid: LayerId, group_uid: Option<u64>) -> Result<&mut PropGroup> {
-    let l = layer_mut(proj, cid, lid)?;
-    let contents = l.props.sub_mut("contents").ok_or_else(|| bad("layer.addShapeItem", "not a shape layer"))?;
-    Ok(match group_uid {
-        Some(u) => contents
-            .find_group_mut(u)
-            .and_then(|g| if g.match_id == "contents" { Some(g) } else { g.sub_mut("contents") })
-            .ok_or_else(|| bad("layer.addShapeItem", "no such group"))?,
-        None => contents,
-    })
-}
-
-fn set_text(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.setText")?;
-    // The Character panel's recent fonts (Settings ▸ Type ▸ Number of Recent Fonts to Display).
-    if let Some(f) = str_p(p, "font") {
-        s.prefs.push_recent_font(f);
-        s.save_prefs();
-    }
-    let t = s.time();
-    let range = text_range_p(p);
-    // Character attributes with only a caret (no selected text) set the insertion style.
-    if let Some(r) = range.clone().filter(|r| r.is_empty() && str_p(p, "text").is_none())
-        && s.state.text_edit.as_ref().is_some_and(|e| e.layer == lid)
-        && let Some(doc) = super::text_edit::layer_doc(s, lid)
-        && doc.char_len() > 0
-        && let Some(obj) = p.as_object()
-        && let Some(e) = s.state.text_edit.as_mut()
-    {
-        let mut st = e.pending.clone().unwrap_or_else(|| doc.insertion_style(r.start));
-        let mut any = false;
-        for (k, v) in obj {
-            any |= effectcraft_keyframe::text_doc::apply_char_attr(&mut st, k, v).map_err(|m| bad("layer.setText", m))?;
-        }
-        if any {
-            e.pending = Some(st);
-        }
-        s.bump();
-    }
-    s.edit("Edit Text", merge_p(p), |proj, _| {
-        let l = layer_mut(proj, cid, lid)?;
-        let lt = l.layer_time(t);
-        let pr = l.props.prop_mut("text/sourceText").ok_or_else(|| bad("layer.setText", "not a text layer"))?;
-        let mut doc = match pr.value_at(lt) {
-            KV::Text(d) => *d,
-            KV::Str(t) => TextDoc::plain(&t),
-            _ => TextDoc::default(),
-        };
-        apply_text_params("layer.setText", p, &mut doc, range.clone())?;
-        pr.set_value_at(lt, KV::Text(Box::new(doc.clone())));
-        if let Some(first) = doc.text.lines().next()
-            && str_p(p, "text").is_some()
-            && !first.is_empty()
-            && (l.name.starts_with("Text") || l.name.is_empty())
-        {
-            l.name = first.chars().take(40).collect();
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// Move Position by `(dx, dy)`, including every key. Separated dimensions move X and Y as well
-/// as the combined property the channels were split from.
-pub(crate) fn offset_position(tr: &mut PropGroup, dx: f64, dy: f64) {
-    if dx == 0.0 && dy == 0.0 {
-        return;
-    }
-    if tr.get("positionX").is_some() {
-        for (name, d) in [("positionX", dx), ("positionY", dy)] {
-            if let Some(pr) = tr.get_mut(name) {
-                pr.value = KV::Scalar(pr.value.as_f64() + d);
-                for k in &mut pr.keys {
-                    k.value = KV::Scalar(k.value.as_f64() + d);
-                }
-            }
-        }
-    }
-    if let Some(pr) = tr.get_mut("position") {
-        let shift = |v: &KV| match v {
-            KV::Vec2(a) => KV::Vec2([a[0] + dx, a[1] + dy]),
-            other => {
-                let a = other.as_vec3();
-                KV::Vec3([a[0] + dx, a[1] + dy, a[2]])
-            }
-        };
-        pr.value = shift(&pr.value);
-        for k in &mut pr.keys {
-            k.value = shift(&k.value);
-        }
-    }
-}
-
-/// Set a layer's Position at layer time `lt` to `f(current)`: X/Y/Z Position when its dimensions
-/// are separated.
-pub(crate) fn update_position(tr: &mut PropGroup, lt: Tick, f: impl Fn([f64; 3]) -> [f64; 3]) {
-    const SEPARATE: [&str; 3] = ["positionX", "positionY", "positionZ"];
-    if tr.get("positionX").is_some() {
-        let v = f(SEPARATE.map(|m| tr.get(m).map(|p| p.value_at(lt).as_f64()).unwrap_or(0.0)));
-        for (m, x) in SEPARATE.iter().zip(v) {
-            if let Some(pr) = tr.get_mut(m) {
-                pr.set_value_at(lt, KV::Scalar(x));
-            }
-        }
-    } else if let Some(pr) = tr.get_mut("position") {
-        let v = f(pr.value_at(lt).as_vec3());
-        pr.set_value_at(lt, KV::Vec3(v));
-    }
-}
-
-/// A Transform property's default (Reset) by match id: the anchor at the centre of the source
-/// (`w`×`h`), the position at the comp's (`cw`×`ch`), 100% scale and opacity, no rotation.
-pub(crate) fn transform_default(m: &str, (w, h): (f64, f64), (cw, ch): (f64, f64)) -> Option<KV> {
-    Some(match m {
-        "anchor" => KV::Vec3([w / 2.0, h / 2.0, 0.0]),
-        "position" => KV::Vec3([cw / 2.0, ch / 2.0, 0.0]),
-        "positionX" => KV::Scalar(cw / 2.0),
-        "positionY" => KV::Scalar(ch / 2.0),
-        "positionZ" | "rotation" | "rotationX" | "rotationY" => KV::Scalar(0.0),
-        "scale" => KV::Vec3([100.0; 3]),
-        "orientation" => KV::Vec3([0.0; 3]),
-        "opacity" => KV::Scalar(100.0),
-        _ => return None,
-    })
-}
-
-fn transform_op(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, ids) = layers_p(s, p)?;
-    let ids = unlocked(s, cid, ids, "layer.transform")?;
-    let op = str_p(p, "op").unwrap_or("reset").to_string();
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?.clone();
-    let t = s.time();
-    let sizes: Vec<(LayerId, (u32, u32))> =
-        comp.layers.iter().filter(|l| ids.contains(&l.id)).map(|l| (l.id, effectcraft_render::source_size(&s.project, l))).collect();
-    s.edit("Transform", None, |proj, _| {
-        for (lid, (w, h)) in &sizes {
-            let l = layer_mut(proj, cid, *lid)?;
-            let lt = l.layer_time(t);
-            let (cw, ch) = (comp.width as f64, comp.height as f64);
-            let (w, h) = (*w as f64, *h as f64);
-            let Some(tr) = l.transform_mut() else { continue };
-            let set = |tr: &mut PropGroup, m: &str, v: KV| {
-                if let Some(pr) = tr.get_mut(m) {
-                    pr.set_value_at(lt, v);
-                }
-            };
-            match op.as_str() {
-                "reset" => {
-                    for m in ["anchor", "scale", "rotation", "rotationX", "rotationY", "orientation", "opacity"] {
-                        if let Some(v) = transform_default(m, (w, h), (cw, ch)) {
-                            set(tr, m, v);
-                        }
-                    }
-                    update_position(tr, lt, |_| [cw / 2.0, ch / 2.0, 0.0]);
-                }
-                // Centred in the frame; a 3D layer keeps its depth.
-                "center" => update_position(tr, lt, |p| [cw / 2.0, ch / 2.0, p[2]]),
-                "fit" | "fitWidth" | "fitHeight" if w > 0.0 && h > 0.0 => {
-                    let (sx, sy) = match op.as_str() {
-                        "fitWidth" => (cw / w, cw / w),
-                        "fitHeight" => (ch / h, ch / h),
-                        _ => (cw / w, ch / h),
-                    };
-                    let z = |m: &str, d: f64| tr.get(m).map(|p| p.value_at(lt).as_vec3()[2]).unwrap_or(d);
-                    let (sz, az) = (z("scale", 100.0), z("anchor", 0.0));
-                    set(tr, "scale", KV::Vec3([sx * 100.0, sy * 100.0, sz]));
-                    update_position(tr, lt, |p| [cw / 2.0, ch / 2.0, p[2]]);
-                    set(tr, "anchor", KV::Vec3([w / 2.0, h / 2.0, az]));
-                }
-                "flipH" | "flipV" => {
-                    let cur = tr.get("scale").map(|p| p.value_at(lt).as_vec3()).unwrap_or([100.0; 3]);
-                    let v = if op == "flipH" { [-cur[0], cur[1], cur[2]] } else { [cur[0], -cur[1], cur[2]] };
-                    set(tr, "scale", KV::Vec3(v));
-                }
-                _ => {}
-            }
-        }
-        Ok(())
-    })?;
-    Ok(Value::Null)
-}
-
-/// Layer ▸ Layer Settings: cameras and lights open their own settings; solids (and adjustment
-/// layers, which are solids) edit their Solid Settings. With `affectAll: false`, a solid other
-/// layers also use is copied into a new solid for this layer instead of being changed for all of
-/// them (After Effects' "Affect all layers that use this solid"). `name` renames the layer and
-/// its solid.
-fn layer_settings(s: &mut Session, p: &Value) -> Result<Value> {
-    let (cid, lid) = layer_p(s, p, "layer.settings")?;
-    // Cameras and lights open their own settings (Camera Settings / Light Settings).
-    match s.project.comp(cid).and_then(|c| c.layer(lid)).map(|l| l.source.clone()) {
-        Some(LayerSource::Camera) => return s.execute("layer.cameraSettings", with_layer(p, lid)),
-        Some(LayerSource::Light { .. }) => return s.execute("layer.lightSettings", with_layer(p, lid)),
-        _ => {}
-    }
-    let color = color_p(p, "color");
-    let w = p.get("width").and_then(Value::as_u64).map(limits::size);
-    let h = p.get("height").and_then(Value::as_u64).map(limits::size);
-    let pixel_aspect = pixel_aspect_p(p)?;
-    let name = str_p(p, "name").map(str::trim).filter(|n| !n.is_empty()).map(str::to_string);
-    let affect_all = p.get("affectAll").and_then(Value::as_bool).unwrap_or(true);
-    let solid = s.edit("Layer Settings", None, |proj, _| {
-        let src = layer_mut(proj, cid, lid)?.source.clone();
-        if let Some(n) = &name {
-            layer_mut(proj, cid, lid)?.name = n.clone();
-        }
-        let LayerSource::Solid { item } = src else { return Ok(None) };
-        let shared = proj.comps().flat_map(|(_, c)| &c.layers).filter(|l| l.source == src).count() > 1;
-        let target = if shared && !affect_all {
-            // This layer gets its own copy of the solid.
-            let it = proj.item(item).ok_or_else(|| bad("layer.settings", "the layer's solid is missing"))?.clone();
-            let copy = proj.add_item(name.as_deref().unwrap_or(&it.name), it.label, it.parent, it.kind);
-            layer_mut(proj, cid, lid)?.source = LayerSource::Solid { item: copy };
-            copy
-        } else {
-            item
-        };
-        let it = proj.item_mut(target).ok_or_else(|| bad("layer.settings", "the layer's solid is missing"))?;
-        if let Some(n) = &name {
-            it.name = n.clone();
-        }
-        if let ItemKind::Solid(so) = &mut it.kind {
-            so.color = color.unwrap_or(so.color);
-            so.width = w.unwrap_or(so.width);
-            so.height = h.unwrap_or(so.height);
-            so.pixel_aspect = pixel_aspect.unwrap_or(so.pixel_aspect);
-        }
-        Ok(Some(target))
-    })?;
-    Ok(match solid {
-        Some(item) => json!({"layer": lid.0, "solid": item.0}),
-        None => json!({"layer": lid.0}),
-    })
-}
-
-/// Layer Settings applies to solids (and adjustment layers), nulls, cameras and lights.
-fn has_layer_settings(s: &Session) -> std::result::Result<(), String> {
-    has_layers(s)?;
-    let l = s.active_comp().zip(s.state.selected_layers.first()).and_then(|(c, l)| c.layer(*l)).ok_or("select a layer first")?;
-    match l.source {
-        LayerSource::Solid { .. } | LayerSource::Null | LayerSource::Camera | LayerSource::Light { .. } => Ok(()),
-        _ => Err("this kind of layer has no settings".into()),
-    }
-}
-
-fn with_layer(p: &Value, lid: LayerId) -> Value {
-    let mut p = if p.is_object() { p.clone() } else { json!({}) };
-    p["layer"] = json!(lid.0);
-    p
-}
-
-pub fn specs() -> Vec<CommandSpec> {
-    vec![
-        cmd!(
-            "layer.newText",
-            "Text",
-            ["Layer", "New"],
-            Some("Cmd+Alt+Shift+T"),
-            "{text?, name? (layer name; default the text), position? [x,y], box? [x,y,w,h] (paragraph text, comp space), vertical?, edit? (start editing), font?, style?, size?, fill?, stroke?, applyFill?, applyStroke?, strokeWidth?, tracking?, leading?, baselineShift?, hScale?, vScale?, tsume?, fauxBold?, fauxItalic?, allCaps?, smallCaps?, baseline?, superscript?, subscript?, kerning?, ligatures?, justify?, indentLeft?, indentRight?, indentFirst?, spaceBefore?, spaceAfter?, direction?, composer?, hangingPunctuation?, strokeOverFill?} (attributes as layer.setText)",
-            has_comp,
-            new_text
-        ),
-        cmd!("layer.newSolid", "Solid...", ["Layer", "New"], Some("Cmd+Y"), "{name?, color? #hex|[r,g,b], width?, height?, pixelAspect?}", has_comp, new_solid),
-        cmd!("layer.newNull", "Null Object", ["Layer", "New"], Some("Cmd+Alt+Shift+Y"), "{name?}", has_comp, new_null),
-        cmd!(
-            "layer.newShape",
-            "Shape Layer",
-            ["Layer", "New"],
-            None,
-            "{kind?: rect|rounded|ellipse|star|polygon|none, name?, size?, fill?, fillType?, fillBlend?, fillOpacity?, stroke?, strokeType?, strokeBlend?, strokeOpacity?, strokeWidth?, position?}",
-            has_comp,
-            new_shape
-        ),
-        cmd!("layer.newAdjustment", "Adjustment Layer", ["Layer", "New"], Some("Cmd+Alt+Y"), "{name?}", has_comp, new_adjustment),
-        cmd!(
-            "layer.settings",
-            "Layer Settings...",
-            ["Layer"],
-            Some("Cmd+Shift+Y"),
-            "{layer?, name?, color?, width?, height?, pixelAspect?, affectAll?: bool (default true; false gives this layer its own copy of a solid other layers use)} → {layer, solid?}",
-            has_layer_settings,
-            layer_settings
-        ),
-        cmd!(
-            "layer.addItem",
-            "Add Footage to Comp",
-            ["File"],
-            Some("Cmd+/"),
-            "{item: id|name, time? (s, the In point), index? (1-based stack position; default above the selected layer), position? ([x, y] comp px; default the centre), duration? (s, for a still)}",
-            has_comp,
-            add_item
-        ),
-        cmd!("layer.select", "Select Layers", [], None, "{layers: [id|name|#n], add?, toggle?}", has_comp, select),
-        cmd!("layer.selectNext", "Select Next Layer", [], Some("Cmd+ArrowDown"), "{add?}", has_comp, select_next),
-        cmd!("layer.selectPrevious", "Select Previous Layer", [], Some("Cmd+ArrowUp"), "{add?}", has_comp, select_prev),
-        cmd!("layer.extendSelectionNext", "Extend Selection to Next Layer", [], Some("Cmd+Shift+ArrowDown"), "{}", has_comp, |s, _| select_step(
-            s,
-            &json!({"add": true}),
-            1
-        )),
-        cmd!("layer.extendSelectionPrevious", "Extend Selection to Previous Layer", [], Some("Cmd+Shift+ArrowUp"), "{}", has_comp, |s, _| select_step(
-            s,
-            &json!({"add": true}),
-            -1
-        )),
-        cmd!(
-            "layer.setSwitch",
-            "Layer Switch",
-            [],
-            None,
-            "{layers?, switch: video|audio|solo|lock|shy|collapse|quality|fx|frameBlend|motionBlur|adjustment|threeD|guide|preserveTransparency, value?, merge?, others? (the named layers alone: the other layers get the opposite state, or come back)}",
-            has_layers,
-            set_switch
-        ),
-        cmd!("layer.rename", "Rename", [], Some("Enter"), "{layer?, name}", has_layers, rename),
-        cmd!("layer.setComment", "Layer Comment", [], None, "{layers?, comment}", has_layers, set_comment),
-        cmd!("layer.setBlendMode", "Blending Mode", [], None, "{layers?, mode?: Normal|Multiply|Screen|…, step?: ±1}", has_layers, blend),
-        cmd!(
-            "layer.setTrackMatte",
-            "Track Matte",
-            [],
-            None,
-            "{layer?, matte: layer|null, kind?: alpha|alphaInverted|luma|lumaInverted}",
-            has_layers,
-            track_matte
-        ),
-        cmd!("layer.setParent", "Parent", [], None, "{layers?, parent: layer|null, compensate?: bool}", has_layers, set_parent),
-        cmd!(
-            "layer.timing",
-            "Layer Timing",
-            [],
-            None,
-            "{layers?, op?: moveInToTime|moveOutToTime|moveInToStart|moveOutToEnd|trimInToTime|trimOutToTime, delta?, start?, in?, out?, inDelta?, outDelta? (seconds, per layer), merge?}",
-            has_layers,
-            timing
-        ),
-        cmd!("layer.moveInToStart", "Move Layer In Point to Beginning of Comp", [], Some("Alt+Home"), "{layers?}", has_layers, |s, p| timing(
-            s,
-            &with(p, "op", json!("moveInToStart"))
-        )),
-        cmd!("layer.moveOutToEnd", "Move Layer Out Point to End of Comp", [], Some("Alt+End"), "{layers?}", has_layers, |s, p| timing(
-            s,
-            &with(p, "op", json!("moveOutToEnd"))
-        )),
-        cmd!("layer.moveEarlier", "Move Layers 1 Frame Earlier", [], Some("Alt+PageUp"), "{layers?}", has_layers, |s, p| move_frames(s, p, -1)),
-        cmd!("layer.moveLater", "Move Layers 1 Frame Later", [], Some("Alt+PageDown"), "{layers?}", has_layers, |s, p| move_frames(s, p, 1)),
-        cmd!("layer.moveEarlier10", "Move Layers 10 Frames Earlier", [], Some("Alt+Shift+PageUp"), "{layers?}", has_layers, |s, p| move_frames(s, p, -10)),
-        cmd!("layer.moveLater10", "Move Layers 10 Frames Later", [], Some("Alt+Shift+PageDown"), "{layers?}", has_layers, |s, p| move_frames(s, p, 10)),
-        cmd!("layer.slip", "Slip Edit", [], None, "{layers?, delta? (seconds) | frames?, merge?}", has_layers, slip),
-        cmd!("layer.slipBack", "Slip Edit 1 Frame Earlier", [], None, "{layers?}", has_layers, |s, p| {
-            let mut p = p.clone();
-            p["frames"] = json!(-1);
-            slip(s, &p)
-        }),
-        cmd!("layer.slipForward", "Slip Edit 1 Frame Later", [], None, "{layers?}", has_layers, |s, p| {
-            let mut p = p.clone();
-            p["frames"] = json!(1);
-            slip(s, &p)
-        }),
-        cmd!("layer.arrange", "Arrange", ["Layer", "Arrange"], None, "{layers?, to: front|forward|backward|back, index?, above?: layer}", has_layers, arrange),
-        cmd!(
-            "layer.precompose",
-            "Pre-compose...",
-            ["Layer"],
-            Some("Cmd+Shift+C"),
-            "{layers?, name?, mode?: move|leave, adjustDuration?, open?}",
-            has_layers,
-            precompose
-        ),
-        cmd!(
-            "layer.addMask",
-            "New Mask",
-            ["Layer", "Mask"],
-            Some("Cmd+Shift+N"),
-            "{layer?, shape?: rect|ellipse|rounded|polygon|star, rect? [x,y,w,h] (layer space; a polygon or star fits its width), mode?}",
-            has_layers,
-            add_mask
-        ),
-        cmd!("layer.setMask", "Mask Mode", [], None, "{layer?, mask: index|uid|name, mode?, inverted?}", has_layers, mask_props),
-        cmd!(
-            "layer.addShapeItem",
-            "Add (Shape)",
-            [],
-            None,
-            "{layer?, kind: group|rect|ellipse|star|polygon|path|fill|stroke|gfill|gstroke|trim|repeater|round|offset|pucker|twist|zigzag|wiggle|merge|frontColor|bevelColor|sideColor|backColor, group?: uid|path} → {uid, path} (frontColor…backColor: the group's Front / Bevel / Side / Back item, which colours that surface of every extruded paint in the group in Advanced 3D)",
-            has_layers,
-            add_shape_item
-        ),
-        cmd!(
-            "layer.setText",
-            "Edit Text",
-            [],
-            None,
-            "{layer?, range?: [start, end] (characters; default all), text?, font?, style?, size?, fill?, stroke?, applyFill?, applyStroke?, strokeWidth?, tracking?, leading?: px|\"auto\", baselineShift? px, hScale? %, vScale? %, tsume? %, fauxBold?, fauxItalic?, allCaps?, smallCaps?, baseline?: normal|superscript|subscript, superscript?, subscript?, kerning?: metrics|optical|number, ligatures?, discretionaryLigatures? (OpenType), contextualAlternates?, stylisticAlternates?, stylisticSets?: [1–20], ss01?, ss02?, ss03?, ss04?, ss05?, ss06?, ss07?, ss08?, ss09?, ss10?, ss11?, ss12?, ss13?, ss14?, ss15?, ss16?, ss17?, ss18?, ss19?, ss20?, swash?, titling?, ordinals?, fractions?, allSmallCaps?, figureStyle?: default|lining|oldStyle, figureWidth?: default|proportional|tabular, figures?, variations?: {tag: value} (variable font axes; null resets), justify?: left|center|right|justifyLeft|justifyCenter|justifyRight|justifyAll, indentLeft?, indentRight?, indentFirst?, spaceBefore?, spaceAfter?, direction?: ltr|rtl, composer?: everyLine|singleLine, hangingPunctuation?, strokeOverFill?, box?: [x,y,w,h]|null (layer space), vertical?}",
-            has_layers,
-            set_text
-        ),
-        cmd!(
-            "layer.transform",
-            "Transform",
-            ["Layer", "Transform"],
-            None,
-            "{layers?, op: reset|center|fit|fitWidth|fitHeight|flipH|flipV}",
-            has_layers,
-            transform_op
-        ),
-    ]
-}
-
-#[allow(dead_code)]
-fn unused(_: &Comp) {}
-
-#[cfg(test)]
-mod parent_chain_tests {
-    use super::*;
-    use std::sync::Arc;
-
-    fn fixture() -> (Session, u64, u64, u64) {
-        let mut s = Session::default();
-        s.execute("comp.new", json!({"name":"Parent safety","width":16,"height":16,"duration":1})).unwrap();
-        let a = s.execute("layer.newSolid", json!({"name":"A"})).unwrap()["layer"].as_u64().unwrap();
-        let b = s.execute("layer.newSolid", json!({"name":"B"})).unwrap()["layer"].as_u64().unwrap();
-        let c = s.execute("layer.newSolid", json!({"name":"C"})).unwrap()["layer"].as_u64().unwrap();
-        for id in [a, b, c] {
-            s.execute("prop.set", json!({"layer":id,"path":"transform/anchor","value":[0,0,0]})).unwrap();
-        }
-        s.execute("prop.set", json!({"layer":a,"path":"transform/position","value":[100,200,0]})).unwrap();
-        s.execute("prop.set", json!({"layer":c,"path":"transform/position","value":[10,20,0]})).unwrap();
-        s.history.undo.clear();
-        (s, a, b, c)
-    }
-    fn malformed_parent(s: &mut Session, child: u64, parent: u64) {
-        let cid = s.active_comp_id().unwrap();
-        Arc::make_mut(&mut s.project).comp_mut(cid).unwrap().layer_mut(LayerId(child)).unwrap().parent = Some(LayerId(parent));
-    }
-    fn assert_atomic_error(s: &mut Session, child: u64, parent: u64, compensate: bool, message: &str) {
-        let before = s.project.clone();
-        let revision = s.revision;
-        let undo = s.history.undo.len();
-        let err = s.execute("layer.setParent", json!({"layers":[child],"parent":parent,"compensate":compensate})).unwrap_err();
-        assert!(err.to_string().contains(message), "{err}");
-        assert!(Arc::ptr_eq(&before, &s.project));
-        assert_eq!(s.revision, revision);
-        assert_eq!(s.history.undo.len(), undo);
-    }
-    #[test]
-    fn loaded_cycle_excluding_selected_child_is_rejected_atomically() {
-        for compensate in [true, false] {
-            let (mut s, a, b, c) = fixture();
-            // Simulate a malformed loaded project. Never execute this on the unguarded baseline.
-            malformed_parent(&mut s, a, b);
-            malformed_parent(&mut s, b, a);
-            assert_atomic_error(&mut s, c, a, compensate, "existing cycle");
-        }
-    }
-    #[test]
-    fn dangling_loaded_parent_is_rejected_atomically() {
-        for compensate in [true, false] {
-            let (mut s, a, _, c) = fixture();
-            malformed_parent(&mut s, a, u64::MAX);
-            assert_atomic_error(&mut s, c, a, compensate, "missing layer");
-        }
-    }
-    #[test]
-    fn selected_descendant_and_direct_self_are_rejected() {
-        let (mut s, a, _, c) = fixture();
-        assert_atomic_error(&mut s, c, c, false, "create a cycle");
-        s.execute("layer.setParent", json!({"layers":[a],"parent":c,"compensate":false})).unwrap();
-        assert_atomic_error(&mut s, c, a, true, "create a cycle");
-    }
-    #[test]
-    fn ordinary_parent_and_unparent_keep_explicit_false_and_undo_semantics() {
-        for compensate in [true, false] {
-            let (mut s, a, _, c) = fixture();
-            let old = s.project.clone();
-            let world = |s: &Session| {
-                let cid = s.active_comp_id().unwrap();
-                let comp = s.active_comp().unwrap();
-                let ctx = effectcraft_render::EvalCtx::new(&s.project, cid, comp, s.time());
-                ctx.world_matrix(comp.layer(LayerId(c)).unwrap()).apply(effectcraft_geom::Vec3::ZERO)
-            };
-            let before = world(&s);
-            s.execute("layer.setParent", json!({"layers":[c],"parent":a,"compensate":compensate})).unwrap();
-            let expected = if compensate { before } else { before + effectcraft_geom::vec3(100.0, 200.0, 0.0) };
-            assert!((world(&s) - expected).length() < 1e-9);
-            assert_eq!(s.active_comp().unwrap().layer(LayerId(c)).unwrap().parent, Some(LayerId(a)));
-            assert_eq!(s.history.undo.len(), 1);
-            let parented = s.project.clone();
-            assert!(s.undo());
-            assert!(Arc::ptr_eq(&s.project, &old));
-            assert!(s.redo());
-            assert!(Arc::ptr_eq(&s.project, &parented));
-            s.execute("layer.setParent", json!({"layers":[c],"parent":null,"compensate":compensate})).unwrap();
-            assert_eq!(s.active_comp().unwrap().layer(LayerId(c)).unwrap().parent, None);
-            assert!(s.undo());
-            assert!(Arc::ptr_eq(&s.project, &parented));
-        }
-    }
-    #[test]
-    fn ancestor_and_lookup_work_budgets_fail_closed() {
-        let (mut s, a, b, c) = fixture();
-        malformed_parent(&mut s, a, b);
-        let comp = s.active_comp().unwrap();
-        // New solids are inserted above the selection: C,B,A. Walking A->B scans
-        // three then two layers, and compares the one selected child twice: seven work units.
-        assert_eq!(comp.layers.iter().map(|l| l.id).collect::<Vec<_>>(), vec![LayerId(c), LayerId(b), LayerId(a)]);
-        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 7).is_ok());
-        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 6).unwrap_err().to_string().contains("work limit"));
-        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 256).is_ok());
-        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 1, 256).unwrap_err().to_string().contains("visit limit"));
-        assert!(check_parent_chain(comp, &[LayerId(c)], Some(LayerId(a)), 2, 1).unwrap_err().to_string().contains("work limit"));
-        assert!(check_parent_chain(comp, &[LayerId(c)], None, 0, 0).is_ok(), "unparenting does not traverse ancestors");
-    }
-
-    #[test]
-    fn well_formed_chain_beyond_renderer_depth_is_not_unnecessarily_rejected() {
-        let (s, _, _, c) = fixture();
-        let mut comp = s.active_comp().unwrap().clone();
-        let template = comp.layers.first().unwrap().clone();
-        for n in 0..80 {
-            let mut layer = template.clone();
-            layer.id = LayerId(10_000 + n);
-            layer.parent = (n < 79).then_some(LayerId(10_001 + n));
-            comp.layers.push(layer);
-        }
-        assert!(check_parent_chain(&comp, &[LayerId(c)], Some(LayerId(10_000)), 4096, 1_048_576).is_ok());
-    }
-}
diff --git a/crates/engine/src/commands/mod.rs b/crates/engine/src/commands/mod.rs
deleted file mode 100644
index 685d4dad8..000000000
--- a/crates/engine/src/commands/mod.rs
+++ /dev/null
@@ -1,595 +0,0 @@
-//! The command registry. Ids follow After Effects' menu structure; every menu item, panel button,
-//! shortcut and viewer/timeline gesture maps to one of these.
-
-mod align;
-mod align_data;
-mod anim;
-mod anim_presets;
-pub mod anim_tools;
-mod animation;
-pub(crate) mod app_more;
-mod autotrace;
-mod batch;
-mod camera_cmds;
-mod comp;
-pub(crate) mod comp_more;
-pub mod content_fill;
-mod create;
-mod edit;
-mod effect;
-pub mod essential;
-pub mod expr_tools;
-mod file;
-pub(crate) mod file_more;
-mod focus;
-pub mod footage_panel;
-pub(crate) mod frame_export;
-mod frontend;
-mod help;
-mod import_project;
-mod key_labels;
-mod key_transform;
-mod keys_more;
-mod layer;
-mod layer_menu;
-mod layer_time;
-pub(crate) mod link;
-mod liquify;
-mod lottie;
-pub mod markers;
-mod mask;
-pub mod mask_interp;
-pub(crate) mod model3d;
-mod nav_more;
-pub mod paint;
-pub mod panels_cmds;
-pub(crate) mod path_nulls;
-mod paths;
-mod project_items;
-pub(crate) mod prop;
-mod prop_groups;
-mod proxy;
-pub mod puppet;
-mod query;
-mod quick_offset;
-mod relink;
-pub(crate) mod relink_moved;
-mod render_queue;
-pub(crate) mod rig3d;
-pub mod roto_cmds;
-mod scene_detect;
-pub mod scripts;
-mod settings;
-pub mod shape_stroke;
-pub mod shape_tool;
-mod stubs;
-mod styles;
-mod text_anim;
-pub mod text_edit;
-mod three_d;
-pub mod time;
-mod timeline;
-mod track;
-mod view;
-pub mod viewer_cmds;
-pub(crate) mod vpe;
-pub(crate) mod vr_editor;
-mod warp_cmds;
-pub(crate) mod watch_folder;
-#[cfg(test)]
-pub(crate) use app_more::report_text as report_text_for_tests;
-pub(crate) use app_more::view_command;
-#[cfg(test)]
-pub(crate) use file::open as open_for_tests;
-#[cfg(test)]
-pub(crate) use keys_more::amplitudes as amplitudes_for_tests;
-#[cfg(test)]
-pub(crate) use mask::split_segment as split_segment_for_tests;
-
-use std::sync::OnceLock;
-
-use effectcraft_project::{Comp, ItemId, Layer, LayerId};
-use effectcraft_time::Tick;
-use serde_json::Value;
-
-use crate::{EngineError, Result, Session};
-
-pub type Run = fn(&mut Session, &Value) -> Result<Value>;
-pub type Enabled = fn(&Session) -> std::result::Result<(), String>;
-
-/// Metadata + implementation for one command.
-pub struct CommandSpec {
-    pub id: &'static str,
-    pub label: &'static str,
-    /// Menu placement, e.g. `["Layer", "New"]`. Empty = not in menus.
-    pub menu: &'static [&'static str],
-    /// Default shortcut (egui-style names, `Cmd` = ⌘ on macOS / Ctrl elsewhere).
-    pub shortcut: Option<&'static str>,
-    /// Further default shortcuts (the menus and tooltips show `shortcut`).
-    pub alt_shortcuts: &'static [&'static str],
-    /// Parameter description for agents and the MCP schema.
-    pub params: &'static str,
-    pub enabled: Enabled,
-    pub run: Run,
-    /// Record in the journal (false for pure queries).
-    pub journal: bool,
-}
-
-#[macro_export]
-macro_rules! cmd {
-    // Several default shortcuts: `["PageDown", "Cmd+ArrowRight"]`.
-    ($id:literal, $label:literal, [$($m:literal),*], [$sc:literal, $($alt:literal),+], $params:literal, $en:expr, $run:expr) => {
-        $crate::commands::CommandSpec { alt_shortcuts: &[$($alt),+], ..$crate::cmd!($id, $label, [$($m),*], Some($sc), $params, $en, $run) }
-    };
-    ($id:literal, $label:literal, [$($m:literal),*], $sc:expr, $params:literal, $en:expr, $run:expr) => {
-        $crate::commands::CommandSpec {
-            id: $id,
-            label: $label,
-            menu: &[$($m),*],
-            shortcut: $sc,
-            alt_shortcuts: &[],
-            params: $params,
-            enabled: $en,
-            run: $run,
-            journal: true,
-        }
-    };
-}
-#[macro_export]
-macro_rules! query {
-    ($id:literal, $label:literal, $params:literal, $run:expr) => {
-        $crate::commands::CommandSpec {
-            id: $id,
-            label: $label,
-            menu: &[],
-            shortcut: None,
-            alt_shortcuts: &[],
-            params: $params,
-            enabled: $crate::commands::always,
-            run: $run,
-            journal: false,
-        }
-    };
-}
-
-pub fn command_specs() -> &'static [CommandSpec] {
-    static SPECS: OnceLock<Vec<CommandSpec>> = OnceLock::new();
-    SPECS.get_or_init(|| {
-        let mut v = Vec::new();
-        v.extend(file::specs());
-        v.extend(crate::models::specs());
-        v.extend(edit::specs());
-        v.extend(comp::specs());
-        v.extend(layer::specs());
-        v.extend(styles::specs());
-        v.extend(three_d::specs());
-        v.extend(model3d::specs());
-        v.extend(rig3d::specs());
-        v.extend(text_anim::specs());
-        v.extend(text_edit::specs());
-        v.extend(layer_time::specs());
-        v.extend(prop::specs());
-        v.extend(prop_groups::specs());
-        v.extend(project_items::specs());
-        v.extend(anim::specs());
-        v.extend(anim_tools::specs());
-        v.extend(link::specs());
-        v.extend(markers::specs());
-        v.extend(mask::specs());
-        v.extend(paths::specs());
-        v.extend(effect::specs());
-        v.extend(time::specs());
-        v.extend(nav_more::specs());
-        v.extend(render_queue::specs());
-        v.extend(help::specs());
-        v.extend(query::specs());
-        v.extend(batch::specs());
-        v.extend(layer_menu::specs());
-        v.extend(create::specs());
-        v.extend(animation::specs());
-        v.extend(anim_presets::specs());
-        v.extend(view::specs());
-        v.extend(viewer_cmds::specs());
-        v.extend(shape_stroke::specs());
-        v.extend(shape_tool::specs());
-        v.extend(focus::specs());
-        v.extend(key_labels::specs());
-        v.extend(key_transform::specs());
-        v.extend(quick_offset::specs());
-        v.extend(file_more::specs());
-        v.extend(relink::specs());
-        v.extend(relink_moved::specs());
-        v.extend(lottie::specs());
-        v.extend(import_project::specs());
-        v.extend(timeline::specs());
-        v.extend(comp_more::specs());
-        v.extend(frame_export::specs());
-        v.extend(watch_folder::specs());
-        v.extend(vpe::specs());
-        v.extend(path_nulls::specs());
-        v.extend(vr_editor::specs());
-        v.extend(frontend::specs());
-        v.extend(track::specs());
-        v.extend(mask_interp::specs());
-        v.extend(warp_cmds::specs());
-        v.extend(camera_cmds::specs());
-        v.extend(roto_cmds::specs());
-        v.extend(paint::specs());
-        v.extend(puppet::specs());
-        v.extend(liquify::specs());
-        v.extend(settings::specs());
-        v.extend(app_more::specs());
-        v.extend(keys_more::specs());
-        v.extend(essential::specs());
-        v.extend(expr_tools::specs());
-        v.extend(proxy::specs());
-        v.extend(scripts::specs());
-        v.extend(panels_cmds::specs());
-        v.extend(footage_panel::specs());
-        v.extend(autotrace::specs());
-        v.extend(scene_detect::specs());
-        v.extend(align_data::specs());
-        v.extend(align::specs());
-        v.extend(content_fill::specs());
-        v.extend(stubs::specs());
-        v.extend(crate::storage::specs());
-        v.extend(crate::learn::specs());
-        v.extend(crate::templates::specs());
-        v.extend(crate::preview::specs());
-        v
-    })
-}
-
-/// Set `footage` as the proxy of `item` (File ▸ Create Proxy's post-render action).
-pub(crate) fn proxy_set(s: &mut Session, item: ItemId, footage: effectcraft_project::Footage) -> Result<()> {
-    proxy::set_proxy_footage(s, &[item], footage)
-}
-
-/// (id, name) of the text animation presets.
-pub fn text_preset_list() -> Vec<(String, String)> {
-    text_anim::preset_names()
-}
-
-/// (id, name, category) of the built-in animation presets (Transitions…).
-pub fn builtin_preset_list() -> Vec<(String, String, String)> {
-    anim_presets::preset_names()
-}
-
-pub fn find(id: &str) -> Option<&'static CommandSpec> {
-    // Every command execution looks its spec up: index the ~2,000 ids once.
-    static INDEX: OnceLock<std::collections::HashMap<&'static str, usize>> = OnceLock::new();
-    let index = INDEX.get_or_init(|| {
-        let mut m = std::collections::HashMap::new();
-        for (i, c) in command_specs().iter().enumerate() {
-            m.entry(c.id).or_insert(i);
-        }
-        m
-    });
-    index.get(id).map(|&i| &command_specs()[i])
-}
-
-// ---------- parameter validation (agents) ----------
-
-/// Top-level keys accepted by a params doc such as `{layers: [id|name|#n], add?, toggle?}` or
-/// `{time? (s) | frame? | timecode?}`; `None` when the doc isn't a `{…}` key list.
-pub fn accepted_params(doc: &str) -> Option<Vec<String>> {
-    let body = doc.trim().strip_prefix('{')?;
-    // Top-level pieces up to the matching close brace, split at `,` and `|`; `:` starts a value.
-    let (mut keys, mut cur, mut depth, mut in_value) = (Vec::new(), String::new(), 0i32, false);
-    let push = |cur: &mut String, keys: &mut Vec<String>| {
-        let k: String = cur.trim().chars().take_while(|c| c.is_ascii_alphanumeric() || *c == '_').collect();
-        if !k.is_empty() && !keys.contains(&k) {
-            keys.push(k);
-        }
-        cur.clear();
-    };
-    for c in body.chars() {
-        match c {
-            '{' | '[' | '(' => depth += 1,
-            ']' | ')' => depth -= 1,
-            '}' if depth == 0 => {
-                push(&mut cur, &mut keys);
-                return Some(keys);
-            }
-            '}' => depth -= 1,
-            ',' if depth == 0 => {
-                push(&mut cur, &mut keys);
-                in_value = false;
-            }
-            '|' if depth == 0 && !in_value => push(&mut cur, &mut keys),
-            ':' if depth == 0 => {
-                push(&mut cur, &mut keys);
-                in_value = true;
-            }
-            _ if depth == 0 && !in_value => cur.push(c),
-            _ => {}
-        }
-    }
-    None
-}
-
-/// Top-level pieces of a params doc (split at depth-0 commas), e.g. `{layer?, path|prop, value}`
-/// → `["layer?", "path|prop", "value"]`.
-fn doc_pieces(doc: &str) -> Option<Vec<String>> {
-    let body = doc.trim().strip_prefix('{')?;
-    let (mut out, mut cur, mut depth) = (Vec::new(), String::new(), 0i32);
-    for c in body.chars() {
-        match c {
-            '{' | '[' | '(' => depth += 1,
-            ']' | ')' => depth -= 1,
-            '}' if depth == 0 => {
-                if !cur.trim().is_empty() {
-                    out.push(cur.trim().to_string());
-                }
-                return Some(out);
-            }
-            '}' => depth -= 1,
-            ',' if depth == 0 => {
-                if !cur.trim().is_empty() {
-                    out.push(cur.trim().to_string());
-                }
-                cur.clear();
-                continue;
-            }
-            _ => {}
-        }
-        cur.push(c);
-    }
-    None
-}
-
-/// The JSON Schema of a command's parameters, derived from its params doc: one property per
-/// accepted key (described by its piece of the doc), no others. MCP `describe_command` and
-/// `list_commands {schemas: true}` serve it.
-pub fn params_schema(spec: &CommandSpec) -> Value {
-    let mut props = serde_json::Map::new();
-    let mut required = vec![];
-    for piece in doc_pieces(spec.params).unwrap_or_default() {
-        let keys = accepted_params(&format!("{{{piece}}}")).unwrap_or_default();
-        let alternatives = keys.len() > 1;
-        for k in keys {
-            // `key?` is optional; so is any key with alternatives (`path|prop`).
-            let optional = alternatives || piece.contains(&format!("{k}?"));
-            if !optional && !required.contains(&k) {
-                required.push(k.clone());
-            }
-            props.insert(k, serde_json::json!({"description": piece}));
-        }
-    }
-    serde_json::json!({
-        "type": "object",
-        "description": spec.params,
-        "properties": props,
-        "required": required,
-        "additionalProperties": accepted_params(spec.params).is_none(),
-    })
-}
-
-/// Keys every command understands (comp targeting, gesture merging) and accepted aliases.
-const ALWAYS_OK: &[&str] = &["comp", "merge"];
-const ALIASES: &[(&str, &str)] = &[("layers", "layer"), ("layer", "layers"), ("time", "frame"), ("frameRate", "fps"), ("properties", "property")];
-
-/// Reject unknown top-level parameters (typos, guessed names) with the list of accepted keys.
-pub fn check_params(spec: &CommandSpec, params: &Value) -> Result<()> {
-    let (Some(obj), Some(accepted)) = (params.as_object(), accepted_params(spec.params)) else { return Ok(()) };
-    let ok = |k: &str| ALWAYS_OK.contains(&k) || accepted.iter().any(|a| a == k || ALIASES.iter().any(|(doc, alias)| doc == a && *alias == k));
-    let unknown: Vec<&str> = obj.keys().map(String::as_str).filter(|k| !ok(k)).collect();
-    if unknown.is_empty() {
-        return Ok(());
-    }
-    let list = if accepted.is_empty() { "none".to_string() } else { accepted.join(", ") };
-    Err(bad(
-        spec.id,
-        format!("unknown parameter(s) {}; accepted: {list} (doc: {})", unknown.iter().map(|k| format!("`{k}`")).collect::<Vec<_>>().join(", "), spec.params),
-    ))
-}
-
-// ---------- enablement ----------
-
-pub fn always(_: &Session) -> std::result::Result<(), String> {
-    Ok(())
-}
-pub(crate) fn has_comp(s: &Session) -> std::result::Result<(), String> {
-    s.active_comp().map(|_| ()).ok_or_else(|| "no composition is open".into())
-}
-pub(crate) fn has_layers(s: &Session) -> std::result::Result<(), String> {
-    has_comp(s)?;
-    if s.state.selected_layers.is_empty() { Err("select a layer first".into()) } else { Ok(()) }
-}
-pub(crate) fn has_keys(s: &Session) -> std::result::Result<(), String> {
-    has_comp(s)?;
-    if s.state.selected_keys.is_empty() { Err("select keyframes first".into()) } else { Ok(()) }
-}
-
-pub(crate) fn has_project_selection(s: &Session) -> std::result::Result<(), String> {
-    if s.state.project_selection.is_empty() { Err("select an item in the Project panel first".into()) } else { Ok(()) }
-}
-
-/// Disabled-command enablement (menu entries whose implementation lands with another milestone;
-/// none are left, kept for future stubs).
-#[allow(dead_code)]
-pub(crate) fn not_yet(_: &Session) -> std::result::Result<(), String> {
-    Err("not available yet in EffectCraft".into())
-}
-
-/// `run` of a not-yet-available command.
-#[allow(dead_code)]
-pub(crate) fn not_yet_run(_: &mut Session, _: &Value) -> Result<Value> {
-    Err(EngineError::Other("not available yet in EffectCraft".into()))
-}
-
-/// Hand a frontend-only command to the UI ([`crate::Event::Frontend`]).
-pub(crate) fn frontend(s: &mut Session, id: &str, p: &Value) -> Result<Value> {
-    s.events.push(crate::Event::Frontend { command: id.to_string(), params: p.clone() });
-    Ok(serde_json::json!({"frontend": id}))
-}
-
-/// Match path of a node (`transform/position`, `effects/#2/blurriness` style with `match#n`
-/// occurrences) so it can be found again on another layer.
-pub fn match_path_of(g: &effectcraft_project::PropGroup, uid: effectcraft_project::Uid) -> Option<String> {
-    for c in &g.children {
-        let nth = g.children.iter().take_while(|x| !std::ptr::eq(*x, c)).filter(|x| x.match_id() == c.match_id()).count() + 1;
-        let seg = if nth == 1 { c.match_id().to_string() } else { format!("{}#{nth}", c.match_id()) };
-        if c.uid() == uid {
-            return Some(seg);
-        }
-        if let effectcraft_project::Node::Group(sub) = c
-            && let Some(rest) = match_path_of(sub, uid)
-        {
-            return Some(format!("{seg}/{rest}"));
-        }
-    }
-    None
-}
-
-/// Selected properties (leaves) of the active comp as (layer, uid); selected groups expand to
-/// their properties.
-pub(crate) fn selected_leaf_props(s: &Session) -> Vec<(LayerId, effectcraft_project::Uid)> {
-    let Some(comp) = s.active_comp() else { return vec![] };
-    let mut out = vec![];
-    for (lid, uid) in &s.state.selected_props {
-        let Some(l) = comp.layer(*lid) else { continue };
-        if l.props.find(*uid).is_some() {
-            out.push((*lid, *uid));
-        } else if let Some(g) = l.props.find_group(*uid) {
-            g.walk("", &mut |_, p| out.push((*lid, p.uid)));
-        }
-    }
-    out
-}
-
-// ---------- params ----------
-
-pub(crate) fn bad(cmd: &str, msg: impl Into<String>) -> EngineError {
-    EngineError::BadParams { cmd: cmd.into(), msg: msg.into() }
-}
-pub(crate) fn str_p<'a>(p: &'a Value, k: &str) -> Option<&'a str> {
-    p.get(k).and_then(Value::as_str)
-}
-pub(crate) fn f_p(p: &Value, k: &str) -> Option<f64> {
-    p.get(k).and_then(Value::as_f64)
-}
-pub(crate) fn b_p(p: &Value, k: &str) -> Option<bool> {
-    p.get(k).and_then(Value::as_bool)
-}
-pub(crate) fn merge_p(p: &Value) -> Option<&str> {
-    str_p(p, "merge")
-}
-
-/// `comp`: item id or name (an all-digit string that names no comp is taken as an id, as MCP
-/// clients often send numbers as strings); default the active comp.
-pub(crate) fn comp_id(s: &Session, p: &Value) -> Result<ItemId> {
-    let missing = |v: &Value| EngineError::NoSuchComp(v.to_string());
-    match p.get("comp") {
-        Some(v @ Value::Number(n)) => n.as_u64().map(ItemId).filter(|id| s.project.comp(*id).is_some()).ok_or_else(|| missing(v)),
-        Some(v @ Value::String(name)) => s
-            .project
-            .items
-            .values()
-            .find(|i| &i.name == name && i.as_comp().is_some())
-            .map(|i| i.id)
-            .or_else(|| digits_id(name).map(ItemId).filter(|id| s.project.comp(*id).is_some()))
-            .ok_or_else(|| missing(v)),
-        _ => s.active_comp_id().ok_or(EngineError::NoComp),
-    }
-}
-
-/// An all-ASCII-digit string as a number (`"98"` -> 98); anything else (names, `#n`, signs) is `None`.
-fn digits_id(s: &str) -> Option<u64> {
-    if s.is_empty() || !s.bytes().all(|b| b.is_ascii_digit()) {
-        return None;
-    }
-    s.parse().ok()
-}
-
-/// Resolve a layer reference: id (number), `#n` / index (1-based), or name. An all-digit string
-/// that names no layer is resolved as the number it spells.
-pub(crate) fn resolve_layer(comp: &Comp, v: &Value) -> Option<LayerId> {
-    match v {
-        Value::Number(n) => {
-            let id = n.as_u64()?;
-            if comp.layer(LayerId(id)).is_some() { Some(LayerId(id)) } else { comp.layers.get((id as usize).checked_sub(1)?).map(|l| l.id) }
-        }
-        Value::String(s) => {
-            if let Some(i) = s.strip_prefix('#').and_then(|i| i.parse::<usize>().ok()) {
-                return comp.layers.get(i.checked_sub(1)?).map(|l| l.id);
-            }
-            comp.layers.iter().find(|l| &l.name == s).map(|l| l.id).or_else(|| digits_id(s).and_then(|id| resolve_layer(comp, &Value::from(id))))
-        }
-        _ => None,
-    }
-}
-
-/// `layer` param or the first selected layer.
-pub(crate) fn layer_p(s: &Session, p: &Value, cmd: &str) -> Result<(ItemId, LayerId)> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    if let Some(v) = p.get("layer") {
-        return resolve_layer(comp, v).map(|l| (cid, l)).ok_or_else(|| bad(cmd, format!("no layer {v}")));
-    }
-    s.state
-        .selected_layers
-        .first()
-        .copied()
-        .filter(|l| comp.layer(*l).is_some())
-        .map(|l| (cid, l))
-        .ok_or_else(|| bad(cmd, "no `layer` given and no layer selected"))
-}
-
-/// `layers` param (array) or the selection.
-pub(crate) fn layers_p(s: &Session, p: &Value) -> Result<(ItemId, Vec<LayerId>)> {
-    let cid = comp_id(s, p)?;
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    // Explicit references that match no layer are an error (agents otherwise get a silent no-op).
-    let resolve =
-        |v: &Value| resolve_layer(comp, v).ok_or_else(|| EngineError::Other(format!("no layer {v} (use a layer id, \"#n\" or a name from comp.info)")));
-    if let Some(Value::Array(a)) = p.get("layers") {
-        return Ok((cid, a.iter().map(resolve).collect::<Result<_>>()?));
-    }
-    if let Some(v) = p.get("layer").filter(|v| !v.is_null()) {
-        return Ok((cid, vec![resolve(v)?]));
-    }
-    Ok((cid, s.state.selected_layers.iter().copied().filter(|l| comp.layer(*l).is_some()).collect()))
-}
-
-/// Whether a layer can be picked by the user (Select All, Ctrl+Up/Down, a Timeline click): not
-/// locked, and not hidden by the composition's Hide Shy Layers.
-pub(crate) fn selectable(comp: &Comp, l: &Layer) -> bool {
-    !(l.switches.locked || (comp.hide_shy && l.switches.shy))
-}
-
-/// The layers of `ids` a command may edit: locked layers are left alone, as in After Effects.
-/// An error when every one of them is locked.
-pub(crate) fn unlocked(s: &Session, cid: ItemId, ids: Vec<LayerId>, cmd: &str) -> Result<Vec<LayerId>> {
-    let comp = s.project.comp(cid).ok_or(EngineError::NoComp)?;
-    let locked = |id: &LayerId| comp.layer(*id).is_some_and(|l| l.switches.locked);
-    match ids.iter().find(|id| locked(id)) {
-        Some(first) if ids.iter().all(locked) => {
-            let name = comp.layer(*first).map(|l| l.name.clone()).unwrap_or_default();
-            Err(bad(cmd, format!("“{name}” is locked (Layer ▸ Switches ▸ Unlock All Layers)")))
-        }
-        _ => Ok(ids.into_iter().filter(|id| !locked(id)).collect()),
-    }
-}
-
-/// `visible: [{layer, prop}]`: the properties the Timeline shows (J / K and Select All
-/// Keyframes use only those, as in After Effects). `None` when not given.
-pub(crate) fn visible_p(p: &Value) -> Option<Vec<(LayerId, effectcraft_project::Uid)>> {
-    let a = p.get("visible")?.as_array()?;
-    Some(a.iter().filter_map(|v| Some((LayerId(v.get("layer")?.as_u64()?), v.get("prop")?.as_u64()?))).collect())
-}
-
-/// `time` (seconds) or `frame` param, else the CTI.
-pub(crate) fn time_p(s: &Session, p: &Value, comp: Option<&Comp>) -> Tick {
-    if let Some(t) = f_p(p, "time") {
-        return Tick::from_seconds_f64(t);
-    }
-    if let (Some(f), Some(c)) = (p.get("frame").and_then(Value::as_i64), comp) {
-        return c.frame_rate.tick_of(f);
-    }
-    s.time()
-}
-
-pub(crate) fn layer_mut(p: &mut effectcraft_project::Project, cid: ItemId, lid: LayerId) -> Result<&mut Layer> {
-    p.comp_mut(cid).ok_or(EngineError::NoComp)?.layer_mut(lid).ok_or(EngineError::Project(effectcraft_project::ProjectError::NoLayer(lid)))
-}
diff --git a/crates/engine/src/doc_state.rs b/crates/engine/src/doc_state.rs
new file mode 100644
index 000000000..954a7d24e
--- /dev/null
+++ b/crates/engine/src/doc_state.rs
@@ -0,0 +1,197 @@
+use super::{Deserialize, ItemId, Layer, LayerId, Serialize, Tick, Uid, commands, mask_track, media_browser, roto, viewer};
+
+/// A keyframe reference: layer, property uid, key time (layer time).
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct KeyRef {
+    pub layer: LayerId,
+    pub prop: Uid,
+    pub time: Tick,
+}
+
+/// A keyframe drag in progress (`keys.move` steps sharing a merge key): the selection it
+/// started from and the total offset so far, so every step is applied to the keys as they were
+/// before the drag. A key passed over on the way is never overwritten; only the drop position
+/// counts, as in After Effects.
+#[derive(Clone, Debug)]
+pub struct KeyMove {
+    pub merge: String,
+    pub from: Vec<KeyRef>,
+    pub total: Tick,
+}
+
+/// Keyframes of one property on the keyframe clipboard.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct KeyClip {
+    pub layer: LayerId,
+    /// Match-id path relative to the layer (`transform/position`), portable between layers.
+    pub path: String,
+    /// Keys with times relative to the earliest copied key (layer time).
+    pub keys: Vec<effectcraft_keyframe::Keyframe>,
+}
+
+/// A selected mask vertex: layer, mask group uid, vertex index.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct VertexRef {
+    pub layer: LayerId,
+    pub mask: Uid,
+    pub index: usize,
+}
+
+/// One composition's selection. The active comp's copy lives in [`EditorState::selected_layers`]
+/// (and the property, key, and vertex lists); every other comp keeps its own here (#1001).
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct CompSelection {
+    pub layers: Vec<LayerId>,
+    pub props: Vec<(LayerId, Uid)>,
+    pub keys: Vec<KeyRef>,
+    pub vertices: Vec<VertexRef>,
+}
+
+impl CompSelection {
+    pub(crate) fn is_empty(&self) -> bool {
+        self.layers.is_empty() && self.props.is_empty() && self.keys.is_empty() && self.vertices.is_empty()
+    }
+}
+
+/// Editing state that commands depend on (headless-relevant, serde for agents).
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct EditorState {
+    pub active_comp: Option<ItemId>,
+    /// Open compositions (viewer/timeline tabs), in tab order.
+    pub open_comps: Vec<ItemId>,
+    /// Compositions that were active before the current one, most recent first (Shift+Esc).
+    #[serde(default)]
+    pub recent_comps: Vec<ItemId>,
+    /// Current time per comp (the CTI).
+    pub times: std::collections::BTreeMap<ItemId, Tick>,
+    /// Layer selection of the active comp. Other comps' selections are in [`Self::comp_selections`].
+    pub selected_layers: Vec<LayerId>,
+    /// Selections of comps that are not active, keyed by comp id (#1001).
+    #[serde(default)]
+    pub comp_selections: std::collections::BTreeMap<ItemId, CompSelection>,
+    /// Selected properties / groups (by uid) of selected layers.
+    pub selected_props: Vec<(LayerId, Uid)>,
+    pub selected_keys: Vec<KeyRef>,
+    pub project_selection: Vec<ItemId>,
+    /// Layer clipboard (serialized layers) and keyframe clipboard.
+    #[serde(skip)]
+    pub clipboard: Vec<Layer>,
+    /// Copied keyframes (times relative to the earliest copied key).
+    #[serde(skip)]
+    pub key_clipboard: Vec<KeyClip>,
+    /// The last copy was keyframes (Paste pastes keys at the CTI).
+    #[serde(skip)]
+    pub clip_is_keys: bool,
+    /// Values of selected unanimated properties (match path, value), copied with Edit ▸ Copy;
+    /// Paste sets the same properties of the selected layers.
+    #[serde(skip)]
+    pub value_clipboard: Vec<(String, effectcraft_keyframe::Value)>,
+    /// Copied effect instances, with comp-time key offsets from the earliest copied key.
+    /// Paste adds them to the selected layers at the destination comp's CTI.
+    #[serde(skip)]
+    pub effect_clipboard: Vec<effectcraft_project::PropGroup>,
+    /// Copied shape items (Edit ▸ Copy with groups, paths, paints or path operations selected in
+    /// a shape layer's Contents); Paste adds them to the selected shape layers.
+    #[serde(skip)]
+    pub contents_clipboard: Vec<effectcraft_project::PropGroup>,
+    /// Selected mask vertices (viewer Selection tool / pen).
+    #[serde(default)]
+    pub selected_vertices: Vec<VertexRef>,
+    pub snapping: bool,
+    /// Tools bar ▸ Snapping options (which features snap, Snap Edges Extended).
+    #[serde(default)]
+    pub snap_features: viewer::SnapFeatures,
+    /// Last applied effect id (Effect ▸ last effect).
+    pub last_effect: Option<String>,
+    /// Viewer region of interest `[x, y, w, h]` in comp pixels (Composition ▸ Crop Comp to Region
+    /// of Interest).
+    #[serde(default)]
+    pub region_of_interest: Option<[f64; 4]>,
+    /// Property-link clipboard (Edit ▸ Copy with Property Links / Copy Expression Only).
+    #[serde(skip)]
+    pub link_clipboard: Option<LinkClip>,
+    /// File ▸ Interpret Footage ▸ Remember Interpretation.
+    #[serde(skip)]
+    pub interpretation: Option<effectcraft_project::Footage>,
+    /// Viewer 3D view per comp (Active Camera / Front / … / Custom View 3 and edited view cameras).
+    #[serde(default)]
+    pub views3d: std::collections::BTreeMap<ItemId, effectcraft_render::three_d::Views3D>,
+    /// Tracker panel ▸ Current Track: (tracked layer, tracker group uid) in the active comp.
+    #[serde(default)]
+    pub current_track: Option<(LayerId, Uid)>,
+    /// Tracker panel ▸ Method in mask mode (Track Mask).
+    #[serde(default)]
+    pub mask_track_method: mask_track::MaskMethod,
+    /// 3D Camera Tracker: the selected track points (ids) in the viewer.
+    #[serde(default)]
+    pub camera_points: Vec<u32>,
+    /// Mask Interpolation panel options.
+    #[serde(default)]
+    pub mask_interp: commands::mask_interp::MaskInterpOptions,
+    /// Paint and Brushes panel options (Brush, Clone Stamp and Eraser tools).
+    #[serde(default)]
+    pub paint: commands::paint::PaintOptions,
+    /// Roto Brush and Refine Edge tool options.
+    #[serde(default)]
+    pub roto: roto::RotoOptions,
+    /// Puppet tool options for new meshes.
+    #[serde(default)]
+    pub puppet: commands::puppet::PuppetOptions,
+    /// The shape tools' and the Pen's options (Tool Creates Shape / Mask, Fill and Stroke).
+    #[serde(default)]
+    pub shape_tool: commands::shape_tool::ShapeTool,
+    /// View ▸ Switch View Layout: 1, 2 or 4 views side by side in the Composition viewer.
+    #[serde(default = "one_view")]
+    pub view_layout: u8,
+    /// View ▸ Switch View Layout ▸ Share View Options (grid, guides… in every view).
+    #[serde(default)]
+    pub share_view_options: bool,
+    /// Layer ▸ Mask ▸ Hide Locked Masks (viewer outlines).
+    #[serde(default)]
+    pub hide_locked_masks: bool,
+    /// On-canvas text editing (Type tool): the edited layer, selection and insertion style.
+    #[serde(default)]
+    pub text_edit: Option<commands::text_edit::TextEdit>,
+    /// Text copied while editing (with its formatting), for Paste / Paste Text Formatting Only.
+    #[serde(skip)]
+    pub text_clipboard: Option<effectcraft_keyframe::TextDoc>,
+    /// Composition viewer display options (Show Channel, exposure, snapshot, Fast Previews).
+    #[serde(default)]
+    pub viewer: commands::viewer_cmds::ViewOptions,
+    /// Essential Graphics panel ▸ Primary composition (`None` = the active comp).
+    #[serde(default)]
+    pub essential_primary: Option<ItemId>,
+    /// Essential Graphics panel ▸ Solo Supported Properties (the timeline shows only properties
+    /// Essential Graphics can expose).
+    #[serde(default)]
+    pub essential_solo: bool,
+    /// File ▸ Watch Folder: the folder being watched for projects to render (frontends call
+    /// `file.watchFolder.poll` periodically while it is set).
+    #[serde(default)]
+    pub watch_folder: Option<String>,
+    /// The Footage panel: the footage shown, its time and In/Out marks (source time).
+    #[serde(default)]
+    pub footage_panel: Option<commands::footage_panel::FootageView>,
+    /// Media Browser: the folder shown and the favourites.
+    #[serde(default)]
+    pub media_browser: media_browser::BrowserState,
+    /// Content-Aware Fill panel settings.
+    #[serde(default)]
+    pub content_fill: commands::content_fill::FillSettings,
+    /// View ▸ Split with New Locked Viewer: the second viewer's comp and 3D view.
+    #[serde(default)]
+    pub locked_viewer: Option<commands::viewer_cmds::LockedViewer>,
+}
+
+fn one_view() -> u8 {
+    1
+}
+
+/// What Copy with Property Links / Copy Expression Only put on the clipboard.
+#[derive(Clone, Debug, PartialEq)]
+pub enum LinkClip {
+    /// Expressions that link back to the source properties: (match path, expression text).
+    Links { relative: bool, links: Vec<(String, String)> },
+    /// Expressions only: (match path, expression).
+    Expressions(Vec<(String, effectcraft_project::Expression)>),
+}
diff --git a/crates/engine/src/error.rs b/crates/engine/src/error.rs
new file mode 100644
index 000000000..75e9e4467
--- /dev/null
+++ b/crates/engine/src/error.rs
@@ -0,0 +1,20 @@
+#[derive(Debug, thiserror::Error)]
+pub enum EngineError {
+    #[error("unknown command `{0}`")]
+    UnknownCommand(String),
+    #[error("command `{0}` is not available right now: {1}")]
+    Disabled(String, String),
+    #[error("invalid parameters for `{cmd}`: {msg}")]
+    BadParams { cmd: String, msg: String },
+    #[error("no active composition")]
+    NoComp,
+    /// A `comp` reference (name or id) that names no composition.
+    #[error("no composition {0}")]
+    NoSuchComp(String),
+    #[error("{0}")]
+    Project(#[from] effectcraft_project::ProjectError),
+    #[error("{0}")]
+    Other(String),
+}
+
+pub type Result<T> = std::result::Result<T, EngineError>;
diff --git a/crates/engine/src/event.rs b/crates/engine/src/event.rs
new file mode 100644
index 000000000..e1f5e0535
--- /dev/null
+++ b/crates/engine/src/event.rs
@@ -0,0 +1,32 @@
+use super::{ItemId, Serialize, Value};
+
+/// Events for frontends (drained each frame).
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub enum Event {
+    ProjectChanged {
+        revision: u64,
+    },
+    Toast {
+        message: String,
+        error: bool,
+    },
+    OpenComp(ItemId),
+    OpenUrl(String),
+    /// A frontend-only command (viewer zoom, panels, dialogs…) ran: the UI performs it. Headless
+    /// sessions ignore these.
+    Frontend {
+        command: String,
+        params: Value,
+    },
+    /// Drop cached frames / renders (Edit ▸ Purge).
+    PurgeCaches,
+    /// Put an image on the system clipboard (Composition ▸ Copy Frame to Clipboard): `rgba` is
+    /// `width` × `height` straight-alpha RGBA8 rows. Headless sessions ignore it; the pixels are
+    /// not serialized.
+    CopyImage {
+        width: u32,
+        height: u32,
+        #[serde(skip)]
+        rgba: Vec<u8>,
+    },
+}
diff --git a/crates/engine/src/fonts.rs b/crates/engine/src/fonts.rs
new file mode 100644
index 000000000..6b06d6f5b
--- /dev/null
+++ b/crates/engine/src/fonts.rs
@@ -0,0 +1,92 @@
+use super::prefs;
+
+pub fn text_families() -> Vec<String> {
+    effectcraft_text::families().into_iter().map(|(f, _)| f).collect()
+}
+
+/// The styles a family offers (its own faces, in weight order), for the style menus. A family
+/// that isn't installed offers the usual styles, which resolve to Inter's.
+pub fn font_styles(family: &str) -> Vec<String> {
+    effectcraft_text::families()
+        .into_iter()
+        .find(|(f, _)| f.eq_ignore_ascii_case(family))
+        .map(|(_, st)| st)
+        .filter(|st| !st.is_empty())
+        .unwrap_or_else(|| ["Regular", "Medium", "SemiBold", "Bold", "Italic"].iter().map(|s| s.to_string()).collect())
+}
+
+/// The OpenType feature tags (GSUB / GPOS) of the face a family + style resolves to.
+pub fn font_features(family: &str, style: &str) -> Vec<String> {
+    effectcraft_text::fonts::face(effectcraft_text::resolve(family, style).face).features()
+}
+
+/// One row of the Character panel's font menu.
+#[derive(Clone, Debug, PartialEq)]
+pub struct FontRow {
+    /// The family to apply (empty for the separator after the recent fonts).
+    pub family: String,
+    /// What the menu shows: the English family name, or the font's own-language name when
+    /// Settings ▸ Type ▸ Show Font Names in English is off.
+    pub display: String,
+    pub recent: bool,
+    /// A variable font (the menu's Variable Fonts filter keeps only these).
+    pub variable: bool,
+}
+
+/// Outline polylines of "Sample" set in `family` at `size` px (baseline at y = 0, y down), for
+/// the font menu's preview (Settings ▸ Type ▸ Show Font Preview).
+pub fn font_preview(family: &str, size: f64) -> Vec<Vec<[f32; 2]>> {
+    use kurbo::PathEl;
+    let st = effectcraft_keyframe::text_doc::CharStyle { font: family.to_string(), size, ..Default::default() };
+    let mut out = vec![];
+    let mut x = 0.0;
+    for ch in "Sample".chars() {
+        let (path, adv) = effectcraft_text::char_glyph_style(&st, ch);
+        let mut cur: Vec<[f32; 2]> = vec![];
+        let pt = |p: kurbo::Point| [(p.x + x) as f32, p.y as f32];
+        kurbo::flatten(&path, 0.2, |el| match el {
+            PathEl::MoveTo(p) => {
+                if cur.len() > 1 {
+                    out.push(std::mem::take(&mut cur));
+                }
+                cur = vec![pt(p)];
+            }
+            PathEl::LineTo(p) => cur.push(pt(p)),
+            PathEl::ClosePath => {
+                if let Some(f) = cur.first().copied() {
+                    cur.push(f);
+                }
+                if cur.len() > 1 {
+                    out.push(std::mem::take(&mut cur));
+                }
+            }
+            _ => {}
+        });
+        if cur.len() > 1 {
+            out.push(cur);
+        }
+        x += adv;
+    }
+    out
+}
+
+/// The Character panel's font menu: the recent fonts (Settings ▸ Type ▸ Number of Recent Fonts
+/// to Display), a separator, then every family. Each row says whether the family is variable,
+/// for the menu's Variable Fonts filter.
+pub fn font_menu(prefs: &prefs::Prefs) -> Vec<FontRow> {
+    let all = text_families();
+    let native = if prefs.type_.font_names_in_english { Default::default() } else { effectcraft_text::fonts::native_families() };
+    let variable = effectcraft_text::fonts::variable_families();
+    let row = |f: &String, recent: bool| FontRow {
+        family: f.clone(),
+        display: native.get(f).cloned().unwrap_or_else(|| f.clone()),
+        recent,
+        variable: variable.contains(f),
+    };
+    let mut out: Vec<FontRow> = prefs.recent_fonts_shown().iter().filter(|f| all.contains(f)).map(|f| row(f, true)).collect();
+    if !out.is_empty() {
+        out.push(FontRow { family: String::new(), display: "-".into(), recent: false, variable: false });
+    }
+    out.extend(all.iter().map(|f| row(f, false)));
+    out
+}
diff --git a/crates/engine/src/footage.rs b/crates/engine/src/footage.rs
new file mode 100644
index 000000000..21e67d8be
--- /dev/null
+++ b/crates/engine/src/footage.rs
@@ -0,0 +1,6 @@
+pub mod doc_path;
+pub mod footage_check;
+pub mod footage_reload;
+pub mod media_browser;
+pub mod media_cache;
+pub mod sequence;
diff --git a/crates/engine/src/doc_path.rs b/crates/engine/src/footage/doc_path.rs
similarity index 86%
rename from crates/engine/src/doc_path.rs
rename to crates/engine/src/footage/doc_path.rs
index c7416a8ce..7161b6177 100644
--- a/crates/engine/src/doc_path.rs
+++ b/crates/engine/src/footage/doc_path.rs
@@ -3,7 +3,7 @@
 //! document's folder, and only local files, or files on the network share the document itself is
 //! on, are followed (see `craft_docpath`).
 //!
-//! Loading a document resolves its footage paths once ([`resolve_footage`]): followed paths are
+//! Loading a document resolves its footage paths once (`resolve_footage`): followed paths are
 //! replaced by the resolved path, and an item with a refused path is marked missing, so the media
 //! layer never reads it. The session then remembers which paths came from which document
 //! ([`StoredPaths`]); the footage check, the changed-on-disk scan, Reload Footage, Relink, Edit
@@ -46,13 +46,22 @@ pub fn resolve(stored: &str, project: Option<&str>) -> Result<PathBuf, NotFollow
         let p = Path::new(p);
         std::path::absolute(p).unwrap_or_else(|_| p.to_path_buf())
     });
-    let path = craft_docpath::resolve(stored, project.as_deref()).map_err(NotFollowed::Refused)?;
-    // A path that is still relative would be taken from the working directory, which the
-    // project does not choose.
-    if path.is_relative() {
-        return Err(NotFollowed::NoProjectFolder);
-    }
-    Ok(path)
+    craft_docpath::resolve_absolute(stored, project.as_deref()).map_err(|why| match why {
+        // Resolved, but still relative: it would be taken from the working directory, which the
+        // project does not choose. A Windows drive or share path (`C:\x`) stays invalid outside
+        // Windows even with a project.
+        Refused::Invalid if project.is_none() && craft_docpath::resolve(stored, None).is_ok_and(|p| cfg!(windows) || !is_windows_rooted(&p)) => {
+            NotFollowed::NoProjectFolder
+        }
+        why => NotFollowed::Refused(why),
+    })
+}
+
+/// Whether `p` is a Windows drive or share path, which a project cannot make absolute outside Windows.
+fn is_windows_rooted(p: &Path) -> bool {
+    let s = p.to_string_lossy();
+    let b = s.as_bytes();
+    (b.len() >= 2 && b[0].is_ascii_alphabetic() && b[1] == b':') || s.starts_with(r"\\") || s.starts_with("//")
 }
 
 /// The paths of `f` (its file and every frame of an image sequence) resolved against the document
diff --git a/crates/engine/src/doc_path/tests.rs b/crates/engine/src/footage/doc_path/tests.rs
similarity index 85%
rename from crates/engine/src/doc_path/tests.rs
rename to crates/engine/src/footage/doc_path/tests.rs
index b8dcbc190..d9d971247 100644
--- a/crates/engine/src/doc_path/tests.rs
+++ b/crates/engine/src/footage/doc_path/tests.rs
@@ -34,9 +34,11 @@ impl Services for Recording {
     }
 }
 
-/// Probes every file as a still.
+/// Probes every file as a still. Only the Unix part of the test below imports files.
+#[cfg(unix)]
 struct Stills;
 
+#[cfg(unix)]
 impl crate::Importer for Stills {
     fn probe(&self, path: &str) -> Result<Footage, String> {
         if !std::path::Path::new(path).is_file() {
@@ -147,7 +149,23 @@ fn stored_paths_resolve_against_the_project() {
     let doc = doc.to_str().unwrap();
     assert_eq!(super::resolve("clip.mov", Some(doc)), Ok(std::env::temp_dir().join("art").join("clip.mov")));
     assert_eq!(super::resolve("clip.mov", None), Err(super::NotFollowed::NoProjectFolder));
+    assert_eq!(super::resolve("../logo.png", None), Err(super::NotFollowed::NoProjectFolder));
+    // A drive path is not a local file on Unix, with or without a project: it is not a missing project.
+    #[cfg(unix)]
+    for stored in [r"C:\x.mov", "C:x.mov"] {
+        assert_eq!(super::resolve(stored, None), Err(super::NotFollowed::Refused(super::Refused::Invalid)), "{stored}");
+    }
     assert_eq!(super::resolve(r"\\192.0.2.1\share\x.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Network)));
+    assert_eq!(super::resolve("jar:clip.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Url)));
+    // Windows reads a colon in a name as an alternate data stream; elsewhere it is a plain character.
+    if cfg!(windows) {
+        assert_eq!(super::resolve("shots/take:1.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Invalid)));
+    } else {
+        assert_eq!(super::resolve("shots/take:1.mov", Some(doc)), Ok(std::env::temp_dir().join("art").join("shots").join("take:1.mov")));
+    }
+    // A Windows drive path names no file on other platforms.
+    #[cfg(unix)]
+    assert_eq!(super::resolve(r"C:\art\clip.mov", Some(doc)), Err(super::NotFollowed::Refused(super::Refused::Invalid)));
     #[cfg(windows)]
     assert!(super::resolve(r"\\server\share\x.mov", Some(r"\\SERVER\share\job\intro.ecproj")).is_ok());
 }
diff --git a/crates/engine/src/footage_check.rs b/crates/engine/src/footage/footage_check.rs
similarity index 100%
rename from crates/engine/src/footage_check.rs
rename to crates/engine/src/footage/footage_check.rs
diff --git a/crates/engine/src/footage_reload.rs b/crates/engine/src/footage/footage_reload.rs
similarity index 92%
rename from crates/engine/src/footage_reload.rs
rename to crates/engine/src/footage/footage_reload.rs
index fa12b27aa..75fd0f936 100644
--- a/crates/engine/src/footage_reload.rs
+++ b/crates/engine/src/footage/footage_reload.rs
@@ -129,17 +129,22 @@ pub fn reload_items(s: &mut Session, ids: &[ItemId]) -> crate::Result<usize> {
 /// writing it) is left as it was. Returns the number reloaded and the files that couldn't be read
 /// (only without `undoable`).
 fn reload(s: &mut Session, ids: &[ItemId], undoable: bool) -> crate::Result<(usize, BTreeSet<String>)> {
-    if s.importer.is_none() {
+    let Some(importer) = s.importer.clone() else {
         return Err(crate::EngineError::Other("media import is not available in this build".into()));
-    }
+    };
     let mut updates = vec![];
     let mut paths = BTreeSet::new();
     let mut failed = BTreeSet::new();
     for i in ids {
         if let Some(ItemKind::Footage(f)) = s.project.item(*i).map(|x| &x.kind) {
-            // Probed the way it imports by default, so a sequence is found as one. A path that
-            // is not followed is not read.
-            let probed = s.stored_paths.check(f).map_err(|(p, why)| crate::doc_path::refusal(&p, why)).and_then(|_| s.probe_footage(&f.path));
+            // A sequence is probed the way it imports by default, so its run is found again; any
+            // other item is its one file, not the run a numbered still sits in (#2074). A path
+            // that is not followed is not read.
+            let probed = s
+                .stored_paths
+                .check(f)
+                .map_err(|(p, why)| crate::doc_path::refusal(&p, why))
+                .and_then(|_| if f.kind == FootageKind::Sequence { s.probe_footage(&f.path) } else { importer.probe(&f.path) });
             let nf = match probed {
                 Ok(p) => refreshed(s, f, p),
                 Err(_) if undoable => Footage { missing: true, ..f.clone() },
@@ -154,6 +159,14 @@ fn reload(s: &mut Session, ids: &[ItemId], undoable: bool) -> crate::Result<(usi
         }
     }
     let n = updates.len();
+    apply_reloads(s, updates, undoable)?;
+    forget(s, &paths);
+    Ok((n, failed))
+}
+
+/// Puts reloaded footage into the project: an undoable edit, or (not undoable) a disk change
+/// that leaves the project's dirty state as it was.
+fn apply_reloads(s: &mut Session, updates: Vec<(ItemId, Footage)>, undoable: bool) -> crate::Result<()> {
     if undoable {
         s.edit("Reload Footage", None, |proj, _| {
             for (i, f) in updates {
@@ -183,8 +196,7 @@ fn reload(s: &mut Session, ids: &[ItemId], undoable: bool) -> crate::Result<(usi
             }
         }
     }
-    forget(s, &paths);
-    Ok((n, failed))
+    Ok(())
 }
 
 /// Make the media layer and the layer cache let go of `paths`, so renders read them again.
@@ -193,6 +205,8 @@ fn forget(s: &mut Session, paths: &BTreeSet<String>) {
         s.footage.forget(p);
     }
     s.layer_cache.clear();
+    // Reloaded files may keep their footage settings but not their size and time.
+    s.refresh_disk_salt(true);
     s.events.push(crate::Event::PurgeCaches);
 }
 
diff --git a/crates/engine/src/media_browser.rs b/crates/engine/src/footage/media_browser.rs
similarity index 91%
rename from crates/engine/src/media_browser.rs
rename to crates/engine/src/footage/media_browser.rs
index d22875f17..c0e20be71 100644
--- a/crates/engine/src/media_browser.rs
+++ b/crates/engine/src/footage/media_browser.rs
@@ -264,22 +264,33 @@ pub fn parent(dir: &str) -> Option<String> {
     std::path::Path::new(dir).parent().map(|p| p.to_string_lossy().to_string()).filter(|p| !p.is_empty())
 }
 
-/// Format seconds since the epoch as an ISO 8601 UTC date-time.
+/// Format seconds since the epoch as an ISO 8601 UTC date-time. Years far outside chrono's own
+/// range are preserved (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
 pub fn iso_date(secs: u64) -> String {
-    let days = (secs / 86_400) as i64;
-    let rem = secs % 86_400;
-    // Civil-from-days (Howard Hinnant's algorithm).
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z - era * 146_097;
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let y = yoe + era * 400;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = if m <= 2 { y + 1 } else { y };
-    format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}Z", rem / 3600, rem % 3600 / 60, rem % 60)
+    let (y, t) = utc_parts(secs);
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", t.format("%m-%dT%H:%M:%SZ"))
+}
+
+/// Unix seconds → (proleptic Gregorian year, the same wall-clock instant moved into chrono's range
+/// by whole 400-year cycles). The Gregorian calendar repeats every 400 years (146_097 days), so
+/// month, day and time of day come from chrono and only the year is carried, which keeps every
+/// input exact instead of collapsing out-of-range years to the epoch. `secs` is `u64`, so `days`
+/// always fits an `i64`.
+fn utc_parts(secs: u64) -> (i64, chrono::NaiveDateTime) {
+    use chrono::Datelike;
+    let (days, sod) = ((secs / 86_400) as i64, (secs % 86_400) as i64);
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(i64::MAX), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
 }
 
 /// File dates and size: (created, modified, size).
@@ -506,5 +517,10 @@ mod tests {
         assert_eq!(iso_date(0), "1970-01-01T00:00:00Z");
         assert_eq!(iso_date(1_700_000_000), "2023-11-14T22:13:20Z");
         assert_eq!(iso_date(951_782_400), "2000-02-29T00:00:00Z");
+        // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+        // them) rather than collapsing to the epoch.
+        assert_eq!(iso_date(253_402_300_800), "10000-01-01T00:00:00Z");
+        assert_eq!(iso_date(10_000_000_000_000), "318857-05-20T17:46:40Z");
+        assert_eq!(iso_date(u64::MAX), "584554051223-11-09T07:00:15Z");
     }
 }
diff --git a/crates/engine/src/media_cache.rs b/crates/engine/src/footage/media_cache.rs
similarity index 100%
rename from crates/engine/src/media_cache.rs
rename to crates/engine/src/footage/media_cache.rs
diff --git a/crates/engine/src/sequence.rs b/crates/engine/src/footage/sequence.rs
similarity index 98%
rename from crates/engine/src/sequence.rs
rename to crates/engine/src/footage/sequence.rs
index c98aba1d3..46dca154c 100644
--- a/crates/engine/src/sequence.rs
+++ b/crates/engine/src/footage/sequence.rs
@@ -20,7 +20,7 @@ use crate::{Importer, Services};
 /// How an import treats numbered stills.
 #[derive(Clone, Copy, Debug)]
 pub struct SequenceOptions {
-    /// The "<format> Sequence" checkbox: picked numbered stills of one run import as a sequence.
+    /// The `"<format> Sequence"` checkbox: picked numbered stills of one run import as a sequence.
     pub sequence: bool,
     /// The numbered stills inside a picked or dropped folder import as sequences.
     pub folders: bool,
@@ -44,7 +44,7 @@ impl SequenceOptions {
 
     /// `file.import`'s options. Dropped files (`drag: true`) import as stills, as in After
     /// Effects, while a folder's numbered stills import as sequences unless `sequence: false`
-    /// (Alt-drag of a folder). The Import dialog passes its "<format> Sequence" checkbox (off
+    /// (Alt-drag of a folder). The Import dialog passes its `"<format> Sequence"` checkbox (off
     /// unless ticked) as `sequence`. Without `sequence` or `drag` (scripts, agents) a numbered
     /// still brings its run, as it always has.
     pub fn for_import(p: &serde_json::Value) -> SequenceOptions {
diff --git a/crates/engine/src/history.rs b/crates/engine/src/history.rs
index 8b178a05c..ae314d65d 100644
--- a/crates/engine/src/history.rs
+++ b/crates/engine/src/history.rs
@@ -314,6 +314,9 @@ impl Session {
         }
         // Every state off the new line goes into branches: a chain per first child, the other
         // children starting branches of their own.
+        /// Adds to `out` one [`Branch`] for the off-line subtree at `start`: it follows the first
+        /// child that is not on the new history line, and records every other such child as a further
+        /// branch from the state it forked at (`parent`).
         fn chain(a: &Arena, start: usize, parent: usize, in_new: &[bool], out: &mut Vec<Branch>) {
             let mut steps = vec![];
             let mut n = start;
@@ -341,14 +344,17 @@ impl Session {
         let k = new_line.iter().position(|&i| i == target).unwrap_or(0);
         let undo: Vec<(String, Arc<Project>)> = (0..k).map(|i| (a.label[new_line[i + 1]].clone(), a.state[new_line[i]].clone())).collect();
         let redo: Vec<(String, Arc<Project>)> = new_line[k + 1..].iter().rev().map(|&i| (a.label[i].clone(), a.state[i].clone())).collect();
+        let edited = crate::commands::text_edit::active_editor_snapshot(self);
+        let probe = crate::commands::kept_crypto_probe(self);
         let cur = std::mem::replace(&mut self.project, a.state[target].clone());
         self.keep_view_settings(&cur);
         self.history.undo = undo;
         self.history.redo = redo;
         self.history.branches = branches;
         self.history.merge_key = None;
-        self.sanitize_state();
+        self.sanitize_after_replacement(edited.as_ref());
         self.bump();
+        crate::commands::keep_crypto_probe(self, probe, &cur);
         true
     }
 }
diff --git a/crates/engine/src/home.rs b/crates/engine/src/home.rs
new file mode 100644
index 000000000..183461aa4
--- /dev/null
+++ b/crates/engine/src/home.rs
@@ -0,0 +1,4 @@
+pub mod demo;
+pub mod learn;
+pub mod links;
+pub mod templates;
diff --git a/crates/engine/src/demo.rs b/crates/engine/src/home/demo.rs
similarity index 95%
rename from crates/engine/src/demo.rs
rename to crates/engine/src/home/demo.rs
index df07f5204..656bd7708 100644
--- a/crates/engine/src/demo.rs
+++ b/crates/engine/src/home/demo.rs
@@ -130,8 +130,20 @@ fn solid_sized(p: &mut Project, comp: &Comp, folder: ItemId, name: &str, color:
     build::layer(p, comp, name, LayerSource::Solid { item: sid }, (w, h), None)
 }
 
+/// What `card` draws: name, gradient end colors (hex), size, position and Y rotation.
+#[derive(Clone, Copy)]
+struct CardSpec<'a> {
+    name: &'a str,
+    a: &'a str,
+    b: &'a str,
+    size: (u32, u32),
+    pos: [f64; 3],
+    rot_y: f64,
+}
+
 /// A 3D card: a solid with a diagonal gradient and a thin border grid.
-fn card(p: &mut Project, comp: &Comp, folder: ItemId, name: &str, a: &str, b: &str, size: (u32, u32), pos: [f64; 3], rot_y: f64) -> Layer {
+fn card(p: &mut Project, comp: &Comp, folder: ItemId, spec: &CardSpec) -> Layer {
+    let CardSpec { name, a, b, size, pos, rot_y } = *spec;
     let mut l = solid_sized(p, comp, folder, name, [1.0, 1.0, 1.0], size.0, size.1);
     let (w, h) = (size.0 as f64, size.1 as f64);
     effect(
@@ -192,11 +204,11 @@ fn showcase_3d(p: &mut Project, solids: ItemId) -> Comp {
     set(&mut floor, "materialOptions/specularIntensity", Value::Scalar(10.0));
 
     // Cards at different depths and angles; the centre pair intersects.
-    let left = card(p, &c, solids, "Card Blue", "#2E7BF0", "#7A4DFF", (520, 340), [520.0, 560.0, 120.0], 28.0);
-    let right = card(p, &c, solids, "Card Coral", "#FF6A5C", "#FFB347", (520, 340), [1420.0, 560.0, 260.0], -32.0);
-    let mut x1 = card(p, &c, solids, "Cross A", "#1FD1A5", "#2E7BF0", (460, 460), [960.0, 470.0, 520.0], 40.0);
+    let left = card(p, &c, solids, &CardSpec { name: "Card Blue", a: "#2E7BF0", b: "#7A4DFF", size: (520, 340), pos: [520.0, 560.0, 120.0], rot_y: 28.0 });
+    let right = card(p, &c, solids, &CardSpec { name: "Card Coral", a: "#FF6A5C", b: "#FFB347", size: (520, 340), pos: [1420.0, 560.0, 260.0], rot_y: -32.0 });
+    let mut x1 = card(p, &c, solids, &CardSpec { name: "Cross A", a: "#1FD1A5", b: "#2E7BF0", size: (460, 460), pos: [960.0, 470.0, 520.0], rot_y: 40.0 });
     set(&mut x1, "materialOptions/lightTransmission", Value::Scalar(30.0));
-    let x2 = card(p, &c, solids, "Cross B", "#F0E14A", "#FF6A5C", (460, 460), [960.0, 470.0, 520.0], -40.0);
+    let x2 = card(p, &c, solids, &CardSpec { name: "Cross B", a: "#F0E14A", b: "#FF6A5C", size: (460, 460), pos: [960.0, 470.0, 520.0], rot_y: -40.0 });
     // Hero title in 3D space, gently turning.
     let mut title = text_layer(
         p,
diff --git a/crates/engine/src/learn.rs b/crates/engine/src/home/learn.rs
similarity index 100%
rename from crates/engine/src/learn.rs
rename to crates/engine/src/home/learn.rs
diff --git a/crates/engine/src/links.rs b/crates/engine/src/home/links.rs
similarity index 100%
rename from crates/engine/src/links.rs
rename to crates/engine/src/home/links.rs
diff --git a/crates/engine/src/templates.rs b/crates/engine/src/home/templates.rs
similarity index 99%
rename from crates/engine/src/templates.rs
rename to crates/engine/src/home/templates.rs
index a8009f476..500308b72 100644
--- a/crates/engine/src/templates.rs
+++ b/crates/engine/src/home/templates.rs
@@ -486,10 +486,10 @@ pub fn encode_thumb(w: u32, h: u32, rgba: &[u8]) -> String {
 /// Decode a thumbnail to RGB bytes (THUMB_W×THUMB_H×3).
 pub fn decode_thumb(text: &str) -> Option<Vec<u8>> {
     let t = text.trim();
-    if t.len() != THUMB_W * THUMB_H * 6 {
+    if t.len() != THUMB_W * THUMB_H * 6 || !t.is_ascii() {
         return None;
     }
-    (0..t.len()).step_by(2).map(|i| u8::from_str_radix(&t[i..i + 2], 16).ok()).collect()
+    (0..t.len()).step_by(2).map(|i| u8::from_str_radix(t.get(i..i + 2)?, 16).ok()).collect()
 }
 
 /// Render a project's main comp at its poster time into a thumbnail.
@@ -943,6 +943,12 @@ mod tests {
     use super::*;
     use crate::config::{DirConfig, MemoryConfig};
 
+    #[test]
+    fn non_ascii_thumbnail_is_rejected_without_panicking() {
+        let malformed = format!("aé{}", "0".repeat(THUMB_W * THUMB_H * 6 - 3));
+        assert!(decode_thumb(&malformed).is_none());
+    }
+
     #[test]
     fn every_builtin_builds_with_controls_and_renders() {
         let s = Session::default();
diff --git a/crates/engine/src/interchange.rs b/crates/engine/src/interchange.rs
new file mode 100644
index 000000000..ec4cff579
--- /dev/null
+++ b/crates/engine/src/interchange.rs
@@ -0,0 +1,3 @@
+pub mod psd_import;
+pub mod vector;
+pub mod xml_project;
diff --git a/crates/engine/src/psd_import.rs b/crates/engine/src/interchange/psd_import.rs
similarity index 100%
rename from crates/engine/src/psd_import.rs
rename to crates/engine/src/interchange/psd_import.rs
diff --git a/crates/engine/src/vector.rs b/crates/engine/src/interchange/vector.rs
similarity index 99%
rename from crates/engine/src/vector.rs
rename to crates/engine/src/interchange/vector.rs
index 3c349a7df..324d3a82a 100644
--- a/crates/engine/src/vector.rs
+++ b/crates/engine/src/interchange/vector.rs
@@ -160,7 +160,7 @@ fn clipped_items(ids: &mut Ids, s: &effectcraft_svg::Shape, m: Affine, clips: &[
 /// Blend Mode). Top of the paint order first.
 ///
 /// Clipping groups (PDF / Illustrator clipping masks): shapes inside them are intersected with
-/// the clip paths through Merge Paths ▸ Intersect (see [`clipped_items`]). Clips enclosing the
+/// the clip paths through Merge Paths ▸ Intersect (see `clipped_items`). Clips enclosing the
 /// whole document are layer masks instead ([`vector_clip_masks`], used by
 /// [`shapes_from_vector`]). Images are skipped (Layer ▸ Create makes them footage layers, see
 /// [`split_at_images`]); soft masks are not converted.
diff --git a/crates/engine/src/xml_project.rs b/crates/engine/src/interchange/xml_project.rs
similarity index 100%
rename from crates/engine/src/xml_project.rs
rename to crates/engine/src/interchange/xml_project.rs
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index a5b016b74..7be59c277 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -10,45 +10,20 @@
 
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 
-pub mod autosave;
-pub mod camera_track;
-pub mod commands;
-pub mod config;
-pub mod demo;
-pub mod doc_path;
-pub mod footage_check;
-pub mod footage_reload;
-pub mod guard;
+mod analysis;
+mod background;
+pub mod cmd;
+mod footage;
 pub mod history;
-pub mod jobs;
-pub mod learn;
-pub mod links;
-pub mod logging;
-pub mod mask_track;
-pub mod media_browser;
-pub mod media_cache;
+mod home;
+mod interchange;
 pub mod menus;
-pub mod models;
-pub mod offload;
-pub mod perf;
-pub mod prefs;
 pub mod preview;
-pub mod psd_import;
-pub mod remote;
 pub mod render_queue;
-pub mod roto;
 pub mod scriptui;
-pub mod sequence;
-mod session_settings;
-pub mod shortcuts;
-pub mod storage;
-pub mod sysinfo;
-pub mod templates;
-pub mod tracking;
-pub mod vector;
+mod settings;
+mod system;
 pub mod viewer;
-pub mod warp;
-pub mod xml_project;
 
 use std::sync::Arc;
 
@@ -59,7 +34,17 @@ use effectcraft_time::Tick;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-pub use commands::{CommandSpec, command_specs, find as find_command};
+pub use analysis::camera_track;
+pub use analysis::mask_track;
+pub use analysis::models;
+pub use analysis::roto;
+pub use analysis::tracking;
+pub use analysis::warp;
+pub use background::jobs;
+pub use background::offload;
+pub use background::remote;
+pub use cmd as commands;
+pub use cmd::{CommandSpec, command_specs, find as find_command};
 pub use effectcraft_color as color;
 pub use effectcraft_effects as effects;
 pub use effectcraft_geom as geom;
@@ -71,324 +56,59 @@ pub use effectcraft_segment as segment;
 pub use effectcraft_text as text;
 pub use effectcraft_time as time;
 pub use effectcraft_track as track;
+pub use footage::doc_path;
+pub use footage::footage_check;
+pub use footage::footage_reload;
+pub use footage::media_browser;
+pub use footage::media_cache;
+pub use footage::sequence;
 pub use history::{Branch, History, HistoryNode};
+pub use home::demo;
+pub use home::learn;
+pub use home::links;
+pub use home::templates;
+pub use interchange::psd_import;
+pub use interchange::vector;
+pub use interchange::xml_project;
 pub use render_queue::{ExportJob, ExportResult, Exporter, JobState};
+pub use settings::autosave;
+pub use settings::config;
+pub use settings::prefs;
+pub use settings::shortcuts;
+pub use system::guard;
+pub use system::logging;
+pub use system::perf;
+pub use system::storage;
+pub use system::sysinfo;
 
-#[derive(Debug, thiserror::Error)]
-pub enum EngineError {
-    #[error("unknown command `{0}`")]
-    UnknownCommand(String),
-    #[error("command `{0}` is not available right now: {1}")]
-    Disabled(String, String),
-    #[error("invalid parameters for `{cmd}`: {msg}")]
-    BadParams { cmd: String, msg: String },
-    #[error("no active composition")]
-    NoComp,
-    /// A `comp` reference (name or id) that names no composition.
-    #[error("no composition {0}")]
-    NoSuchComp(String),
-    #[error("{0}")]
-    Project(#[from] effectcraft_project::ProjectError),
-    #[error("{0}")]
-    Other(String),
-}
+mod doc_state;
+mod error;
+mod event;
+mod fonts;
+mod services;
+mod session;
 
-pub type Result<T> = std::result::Result<T, EngineError>;
-
-/// Host services (file access) injected by the frontend.
-pub trait Services: Send + Sync {
-    fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>>;
-    fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()>;
-    /// Whether a file exists (the background footage check after open).
-    fn exists(&self, path: &str) -> bool {
-        std::path::Path::new(path).exists()
-    }
-    /// A file's size and modification time (nanoseconds since 1970), to notice that it changed
-    /// on disk (Settings ▸ Import ▸ Reload Footage Changed on Disk); `None` when it can't be read.
-    fn stamp(&self, path: &str) -> Option<(u64, u128)> {
-        let meta = std::fs::metadata(path).ok()?;
-        let modified = meta.modified().ok()?.duration_since(std::time::UNIX_EPOCH).ok()?;
-        Some((meta.len(), modified.as_nanos()))
-    }
-    /// Keep a file the app made for itself (footage extracted from a template): like
-    /// [`Services::write_file`], creating its folder, but never offered as a download (web: it
-    /// goes to browser storage only).
-    fn store_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
-        if let Some(d) = std::path::Path::new(path).parent().filter(|d| !d.as_os_str().is_empty()) {
-            let _ = std::fs::create_dir_all(d);
-        }
-        self.write_file(path, data)
-    }
-    /// The files in folder `dir` (full paths; no folders, no hidden files), for image-sequence
-    /// detection on import. Empty when it can't be read.
-    fn list_dir(&self, dir: &str) -> Vec<String> {
-        let Ok(rd) = std::fs::read_dir(if dir.is_empty() { "." } else { dir }) else { return vec![] };
-        rd.filter_map(|e| e.ok())
-            .filter(|e| e.file_type().is_ok_and(|t| t.is_file()) && !e.file_name().to_string_lossy().starts_with('.'))
-            .map(|e| e.path().to_string_lossy().to_string())
-            .collect()
-    }
-    /// Whether `path` is a folder (dropped or picked folders import their files).
-    fn is_dir(&self, path: &str) -> bool {
-        std::path::Path::new(path).is_dir()
-    }
-}
-
-/// Native filesystem.
-pub struct FsServices;
-impl Services for FsServices {
-    fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>> {
-        std::fs::read(path)
-    }
-    fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
-        config::atomic_write(std::path::Path::new(path), data)
-    }
-}
-
-/// Imports media files into the project (implemented by the media layer).
-pub trait Importer: Send + Sync {
-    /// Probe one file and return footage metadata. Image sequences are the engine's
-    /// ([`sequence`]): it groups numbered stills and probes their first file here.
-    fn probe(&self, path: &str) -> std::result::Result<effectcraft_project::Footage, String>;
-    /// A footage file's bytes are now at `path` (extracted from a template): hosts whose media
-    /// layer reads from memory (the browser) register them; file-based ones need nothing.
-    fn register(&self, _path: &str, _data: &[u8]) {}
-    /// An image sequence's other frames (its first was probed) are footage now: hosts whose
-    /// media layer reads from memory (the browser) register them; file-based ones need nothing.
-    fn add_frames(&self, _paths: &[String]) {}
-}
-
-/// A keyframe reference: layer, property uid, key time (layer time).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct KeyRef {
-    pub layer: LayerId,
-    pub prop: Uid,
-    pub time: Tick,
-}
-
-/// A keyframe drag in progress (`keys.move` steps sharing a merge key): the selection it
-/// started from and the total offset so far, so every step is applied to the keys as they were
-/// before the drag. A key passed over on the way is never overwritten; only the drop position
-/// counts, as in After Effects.
-#[derive(Clone, Debug)]
-pub struct KeyMove {
-    pub merge: String,
-    pub from: Vec<KeyRef>,
-    pub total: Tick,
-}
-
-/// Keyframes of one property on the keyframe clipboard.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct KeyClip {
-    pub layer: LayerId,
-    /// Match-id path relative to the layer (`transform/position`), portable between layers.
-    pub path: String,
-    /// Keys with times relative to the earliest copied key (layer time).
-    pub keys: Vec<effectcraft_keyframe::Keyframe>,
-}
-
-/// A selected mask vertex: layer, mask group uid, vertex index.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct VertexRef {
-    pub layer: LayerId,
-    pub mask: Uid,
-    pub index: usize,
-}
-
-/// One composition's selection. The active comp's copy lives in [`EditorState::selected_layers`]
-/// (and the property, key, and vertex lists); every other comp keeps its own here (#1001).
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-pub struct CompSelection {
-    pub layers: Vec<LayerId>,
-    pub props: Vec<(LayerId, Uid)>,
-    pub keys: Vec<KeyRef>,
-    pub vertices: Vec<VertexRef>,
-}
-
-impl CompSelection {
-    fn is_empty(&self) -> bool {
-        self.layers.is_empty() && self.props.is_empty() && self.keys.is_empty() && self.vertices.is_empty()
-    }
-}
-
-/// Editing state that commands depend on (headless-relevant, serde for agents).
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-pub struct EditorState {
-    pub active_comp: Option<ItemId>,
-    /// Open compositions (viewer/timeline tabs), in tab order.
-    pub open_comps: Vec<ItemId>,
-    /// Compositions that were active before the current one, most recent first (Shift+Esc).
-    #[serde(default)]
-    pub recent_comps: Vec<ItemId>,
-    /// Current time per comp (the CTI).
-    pub times: std::collections::BTreeMap<ItemId, Tick>,
-    /// Layer selection of the active comp. Other comps' selections are in [`Self::comp_selections`].
-    pub selected_layers: Vec<LayerId>,
-    /// Selections of comps that are not active, keyed by comp id (#1001).
-    #[serde(default)]
-    pub comp_selections: std::collections::BTreeMap<ItemId, CompSelection>,
-    /// Selected properties / groups (by uid) of selected layers.
-    pub selected_props: Vec<(LayerId, Uid)>,
-    pub selected_keys: Vec<KeyRef>,
-    pub project_selection: Vec<ItemId>,
-    /// Layer clipboard (serialized layers) and keyframe clipboard.
-    #[serde(skip)]
-    pub clipboard: Vec<Layer>,
-    /// Copied keyframes (times relative to the earliest copied key).
-    #[serde(skip)]
-    pub key_clipboard: Vec<KeyClip>,
-    /// The last copy was keyframes (Paste pastes keys at the CTI).
-    #[serde(skip)]
-    pub clip_is_keys: bool,
-    /// Values of selected unanimated properties (match path, value), copied with Edit ▸ Copy;
-    /// Paste sets the same properties of the selected layers.
-    #[serde(skip)]
-    pub value_clipboard: Vec<(String, effectcraft_keyframe::Value)>,
-    /// Copied effect instances, with comp-time key offsets from the earliest copied key.
-    /// Paste adds them to the selected layers at the destination comp's CTI.
-    #[serde(skip)]
-    pub effect_clipboard: Vec<effectcraft_project::PropGroup>,
-    /// Copied shape items (Edit ▸ Copy with groups, paths, paints or path operations selected in
-    /// a shape layer's Contents); Paste adds them to the selected shape layers.
-    #[serde(skip)]
-    pub contents_clipboard: Vec<effectcraft_project::PropGroup>,
-    /// Selected mask vertices (viewer Selection tool / pen).
-    #[serde(default)]
-    pub selected_vertices: Vec<VertexRef>,
-    pub snapping: bool,
-    /// Tools bar ▸ Snapping options (which features snap, Snap Edges Extended).
-    #[serde(default)]
-    pub snap_features: viewer::SnapFeatures,
-    /// Last applied effect id (Effect ▸ last effect).
-    pub last_effect: Option<String>,
-    /// Viewer region of interest `[x, y, w, h]` in comp pixels (Composition ▸ Crop Comp to Region
-    /// of Interest).
-    #[serde(default)]
-    pub region_of_interest: Option<[f64; 4]>,
-    /// Property-link clipboard (Edit ▸ Copy with Property Links / Copy Expression Only).
-    #[serde(skip)]
-    pub link_clipboard: Option<LinkClip>,
-    /// File ▸ Interpret Footage ▸ Remember Interpretation.
-    #[serde(skip)]
-    pub interpretation: Option<effectcraft_project::Footage>,
-    /// Viewer 3D view per comp (Active Camera / Front / … / Custom View 3 and edited view cameras).
-    #[serde(default)]
-    pub views3d: std::collections::BTreeMap<ItemId, effectcraft_render::three_d::Views3D>,
-    /// Tracker panel ▸ Current Track: (tracked layer, tracker group uid) in the active comp.
-    #[serde(default)]
-    pub current_track: Option<(LayerId, Uid)>,
-    /// Tracker panel ▸ Method in mask mode (Track Mask).
-    #[serde(default)]
-    pub mask_track_method: mask_track::MaskMethod,
-    /// 3D Camera Tracker: the selected track points (ids) in the viewer.
-    #[serde(default)]
-    pub camera_points: Vec<u32>,
-    /// Mask Interpolation panel options.
-    #[serde(default)]
-    pub mask_interp: commands::mask_interp::MaskInterpOptions,
-    /// Paint and Brushes panel options (Brush, Clone Stamp and Eraser tools).
-    #[serde(default)]
-    pub paint: commands::paint::PaintOptions,
-    /// Roto Brush and Refine Edge tool options.
-    #[serde(default)]
-    pub roto: roto::RotoOptions,
-    /// Puppet tool options for new meshes.
-    #[serde(default)]
-    pub puppet: commands::puppet::PuppetOptions,
-    /// The shape tools' and the Pen's options (Tool Creates Shape / Mask, Fill and Stroke).
-    #[serde(default)]
-    pub shape_tool: commands::shape_tool::ShapeTool,
-    /// View ▸ Switch View Layout: 1, 2 or 4 views side by side in the Composition viewer.
-    #[serde(default = "one_view")]
-    pub view_layout: u8,
-    /// View ▸ Switch View Layout ▸ Share View Options (grid, guides… in every view).
-    #[serde(default)]
-    pub share_view_options: bool,
-    /// Layer ▸ Mask ▸ Hide Locked Masks (viewer outlines).
-    #[serde(default)]
-    pub hide_locked_masks: bool,
-    /// On-canvas text editing (Type tool): the edited layer, selection and insertion style.
-    #[serde(default)]
-    pub text_edit: Option<commands::text_edit::TextEdit>,
-    /// Text copied while editing (with its formatting), for Paste / Paste Text Formatting Only.
-    #[serde(skip)]
-    pub text_clipboard: Option<effectcraft_keyframe::TextDoc>,
-    /// Composition viewer display options (Show Channel, exposure, snapshot, Fast Previews).
-    #[serde(default)]
-    pub viewer: commands::viewer_cmds::ViewOptions,
-    /// Essential Graphics panel ▸ Primary composition (`None` = the active comp).
-    #[serde(default)]
-    pub essential_primary: Option<ItemId>,
-    /// Essential Graphics panel ▸ Solo Supported Properties (the timeline shows only properties
-    /// Essential Graphics can expose).
-    #[serde(default)]
-    pub essential_solo: bool,
-    /// File ▸ Watch Folder: the folder being watched for projects to render (frontends call
-    /// `file.watchFolder.poll` periodically while it is set).
-    #[serde(default)]
-    pub watch_folder: Option<String>,
-    /// The Footage panel: the footage shown, its time and In/Out marks (source time).
-    #[serde(default)]
-    pub footage_panel: Option<commands::footage_panel::FootageView>,
-    /// Media Browser: the folder shown and the favourites.
-    #[serde(default)]
-    pub media_browser: media_browser::BrowserState,
-    /// Content-Aware Fill panel settings.
-    #[serde(default)]
-    pub content_fill: commands::content_fill::FillSettings,
-    /// View ▸ Split with New Locked Viewer: the second viewer's comp and 3D view.
-    #[serde(default)]
-    pub locked_viewer: Option<commands::viewer_cmds::LockedViewer>,
-}
-
-fn one_view() -> u8 {
-    1
-}
-
-/// What Copy with Property Links / Copy Expression Only put on the clipboard.
-#[derive(Clone, Debug, PartialEq)]
-pub enum LinkClip {
-    /// Expressions that link back to the source properties: (match path, expression text).
-    Links { relative: bool, links: Vec<(String, String)> },
-    /// Expressions only: (match path, expression).
-    Expressions(Vec<(String, effectcraft_project::Expression)>),
-}
-
-/// Events for frontends (drained each frame).
-#[derive(Clone, Debug, PartialEq, Serialize)]
-pub enum Event {
-    ProjectChanged {
-        revision: u64,
-    },
-    Toast {
-        message: String,
-        error: bool,
-    },
-    OpenComp(ItemId),
-    OpenUrl(String),
-    /// A frontend-only command (viewer zoom, panels, dialogs…) ran: the UI performs it. Headless
-    /// sessions ignore these.
-    Frontend {
-        command: String,
-        params: Value,
-    },
-    /// Drop cached frames / renders (Edit ▸ Purge).
-    PurgeCaches,
-    /// Put an image on the system clipboard (Composition ▸ Copy Frame to Clipboard): `rgba` is
-    /// `width` × `height` straight-alpha RGBA8 rows. Headless sessions ignore it; the pixels are
-    /// not serialized.
-    CopyImage {
-        width: u32,
-        height: u32,
-        #[serde(skip)]
-        rgba: Vec<u8>,
-    },
-}
+pub use cmd::{animation_presets, text_presets};
+pub use doc_state::{CompSelection, EditorState, KeyClip, KeyMove, KeyRef, LinkClip, VertexRef};
+pub use error::{EngineError, Result};
+pub use event::Event;
+pub use fonts::{FontRow, font_features, font_menu, font_preview, font_styles, text_families};
+pub use services::{FsServices, Importer, Services};
+pub use session::upgrade_effects;
 
 pub struct Session {
     pub project: Arc<Project>,
     pub history: History,
     pub revision: u64,
+    /// Process-unique monotonic revision of the on-canvas editor's committed text and session.
+    /// Unlike [`Session::revision`], unrelated project edits do not advance it; the IME receipt
+    /// uses it when surrounding text is unavailable. Read it with
+    /// [`commands::text_edit::ime_stamp_revision`].
+    ///
+    /// Stamps come from a process-global checked allocator and are never rewound: a failed
+    /// atomic batch keeps the highest intermediate stamp. On allocator exhaustion no stamp is
+    /// issued, so an unavailable receipt cannot be accepted with a reused revision.
+    pub ime_revision: u64,
     pub saved_revision: u64,
     /// The project as last opened or saved: the project is unmodified while it is this very
     /// snapshot, so undoing back to the saved state clears the modified mark.
@@ -442,6 +162,10 @@ pub struct Session {
     pub journal: Vec<(String, Value)>,
     /// Processed-layer pixels reused across frames and edits (content-keyed, never stale).
     pub layer_cache: Arc<LayerCache>,
+    /// The last Cryptomatte pick probe (see [`Session::crypto_probe_job`]). Public only so that
+    /// other crates can build a `Session { .. }`; its type is crate-private.
+    #[doc(hidden)]
+    pub crypto_probe: Arc<std::sync::Mutex<commands::CryptoProbeSlot>>,
     /// The persistent disk cache (Settings ▸ Media & Disk Cache), when enabled.
     pub disk_cache: Option<Arc<effectcraft_render::disk_cache::DiskCache>>,
     /// Settings (Preferences).
@@ -482,6 +206,8 @@ pub struct Session {
     pub key_move: Option<KeyMove>,
     /// Reads the system's memory in the background for [`Session::memory_tick`].
     pub memory_watch: sysinfo::MemoryWatch,
+    /// Reads the disk cache's free disk space in the background for [`Session::memory_tick`].
+    pub disk_watch: sysinfo::DiskWatch,
     /// Switches Affect Nested Comps as last applied (a change empties the layer cache).
     pub applied_nested_switches: Option<bool>,
     /// Runs renders and analyses off the UI thread where there are no threads (the web app's
@@ -516,6 +242,8 @@ pub struct Session {
     pub footage_stamps: std::collections::HashMap<String, footage_reload::Stamp>,
     /// The stamps being taken on a worker thread ([`footage_reload::start_scan`]).
     pub footage_scan: Option<footage_reload::Scan>,
+    /// The disk cache's footage salt and the footage it was taken for ([`Session::refresh_disk_salt`]).
+    pub disk_salt: Option<(u64, u64)>,
     /// How many script-issued commands are running ([`Session::execute_for_script`]): while one
     /// is, settings that guard what scripts may do can't change (see
     /// [`prefs::Scripting::same_permissions`]).
@@ -548,6 +276,10 @@ pub type ScriptRunner = fn(&mut Session, &ScriptRequest) -> Value;
 pub type PluginLoader = fn(&[u8], &str) -> std::result::Result<Value, String>;
 
 impl Default for Session {
+    /// A new unsaved session: a default project that is both current and saved, no path, no
+    /// active jobs, the plain `FsServices`/`NoFootage` defaults, default preferences and keymaps,
+    /// empty history, events and journal, and a fresh process-wide IME stamp (`u64::MAX` when the
+    /// allocator is exhausted).
     fn default() -> Self {
         let project = Arc::new(Project::default());
         Session {
@@ -555,6 +287,8 @@ impl Default for Session {
             project,
             history: History::default(),
             revision: 0,
+            // A fresh session gets its own process-monotonic stamp even before its first edit.
+            ime_revision: commands::text_edit::next_ime_revision().unwrap_or(u64::MAX),
             saved_revision: 0,
             path: None,
             state: EditorState { snapping: true, view_layout: 1, ..Default::default() },
@@ -582,6 +316,7 @@ impl Default for Session {
             events: vec![],
             journal: vec![],
             layer_cache: Arc::new(LayerCache::default()),
+            crypto_probe: Default::default(),
             disk_cache: None,
             prefs: prefs::Prefs::default(),
             prefs_revision: 0,
@@ -599,6 +334,7 @@ impl Default for Session {
             sys_memory: None,
             key_move: None,
             memory_watch: Default::default(),
+            disk_watch: Default::default(),
             applied_nested_switches: None,
             offload: None,
             offloaded: vec![],
@@ -613,810 +349,14 @@ impl Default for Session {
             check_footage_on_open: false,
             stored_paths: Default::default(),
             footage_stamps: Default::default(),
+            disk_salt: None,
             footage_scan: None,
             script_calls: ScriptCalls::default(),
         }
     }
 }
 
-impl Session {
-    pub fn new() -> Session {
-        Session::default()
-    }
-
-    /// Run a command by id.
-    pub fn execute(&mut self, id: &str, params: Value) -> Result<Value> {
-        let spec = commands::find(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
-        if let Err(why) = (spec.enabled)(self) {
-            // Explicit targets (agents, scripts) don't need a UI selection.
-            let explicit = (["layer", "layers", "prop", "keys"].iter().any(|k| params.get(k).is_some()) && commands::has_comp(self).is_ok())
-                || ["item", "items"].iter().any(|k| params.get(k).is_some())
-                // An explicit composition (the enablement looks at the active one).
-                || params.get("comp").is_some_and(|c| !c.is_null() && self.resolve_comp(Some(c)).is_ok());
-            if !explicit {
-                return Err(EngineError::Disabled(id.to_string(), why));
-            }
-        }
-        // Last-resort guard: a panicking command reports an error instead of crashing the app.
-        let r = guard::guarded(&format!("command `{id}`"), || (spec.run)(self, &params))?;
-        self.learn_observe(id, &params);
-        if spec.journal {
-            self.journal.push((id.to_string(), params));
-            if self.journal.len() > 10_000 {
-                self.journal.drain(..1000);
-            }
-        }
-        Ok(r)
-    }
-
-    /// [`Session::execute`] for agents and scripts (MCP, CLI, control channel): unknown top-level
-    /// parameters are rejected with the accepted keys instead of being silently ignored.
-    pub fn execute_checked(&mut self, id: &str, params: Value) -> Result<Value> {
-        let spec = commands::find(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
-        commands::check_params(spec, &params)?;
-        self.execute(id, params)
-    }
-
-    /// [`Session::execute`] for a command a script asked for (the JavaScript engine's
-    /// `app.run`, ScriptUI callbacks…). The command and everything it runs count as the script's:
-    /// it may not change the settings that limit scripts (Settings ▸ Scripting & Expressions ▸
-    /// Application Scripting), which only the user can, from the UI, CLI or control channel.
-    pub fn execute_for_script(&mut self, id: &str, params: Value) -> Result<Value> {
-        self.script_calls.0 = self.script_calls.0.saturating_add(1);
-        let r = self.execute(id, params);
-        self.script_calls.0 = self.script_calls.0.saturating_sub(1);
-        r
-    }
-
-    /// Whether the command running was issued by a script ([`Session::execute_for_script`]).
-    pub fn running_for_script(&self) -> bool {
-        self.script_calls.0 > 0
-    }
-
-    pub fn is_enabled(&self, id: &str) -> bool {
-        commands::find(id).is_some_and(|c| (c.enabled)(self).is_ok())
-    }
-
-    /// Apply an undoable edit. `merge`: consecutive edits with the same key fold into one step.
-    pub fn edit<T>(&mut self, label: &str, merge: Option<&str>, f: impl FnOnce(&mut Project, &mut EditorState) -> Result<T>) -> Result<T> {
-        let before = self.project.clone();
-        let mut p = (*self.project).clone();
-        let mut st = self.state.clone();
-        let r = f(&mut p, &mut st)?;
-        // Layer styles: one Global Light per comp, whichever layer edited it.
-        effectcraft_project::styles::sync_global_light(&before, &mut p);
-        // Essential Properties of precomp layers follow their comps' Essential Graphics.
-        effectcraft_project::essential::sync_project(&before, &mut p);
-        // Warp Stabilizer analyses made from other frames are cleared (and queued again).
-        for w in warp::invalidate(&before, &mut p) {
-            if !self.warp_pending.contains(&w) {
-                self.warp_pending.push(w);
-            }
-        }
-        // So are 3D Camera Tracker tracks (and solves made with other settings).
-        for w in camera_track::invalidate(&before, &mut p) {
-            if !self.camera_pending.contains(&w) {
-                self.camera_pending.push(w);
-            }
-        }
-        // Roto Brush Input Keys follow the frames; edited instances propagate again.
-        for r in roto::sync(&before, &mut p) {
-            if !self.roto_pending.contains(&r) {
-                self.roto_pending.push(r);
-            }
-        }
-        // Nothing changed (a value set to what it already was): no undo step, not modified.
-        if p.same_content(&before) {
-            self.state = st;
-            return Ok(r);
-        }
-        let same = merge.is_some() && merge.map(str::to_string) == self.history.merge_key;
-        if !same {
-            // Undone steps aren't lost: they stay in the History panel as a branch.
-            let levels = self.prefs.general.undo_levels.max(1) as usize;
-            self.history.record(label, before, levels);
-        } else {
-            self.history.abandon_redo(&before);
-        }
-        self.history.merge_key = merge.map(str::to_string);
-        self.project = Arc::new(p);
-        self.state = st;
-        self.bump();
-        Ok(r)
-    }
-
-    pub fn bump(&mut self) {
-        self.revision += 1;
-        // Back at the saved state (undo, redo, a history jump or a rolled-back batch).
-        if Arc::ptr_eq(&self.project, &self.saved_project) {
-            self.saved_revision = self.revision;
-        }
-        if self.disk_cache.is_some() {
-            self.layer_cache.set_disk_salt(effectcraft_render::disk_cache::footage_salt(&self.project));
-        }
-        self.events.push(Event::ProjectChanged { revision: self.revision });
-    }
-
-    /// Set a comp's Resolution. As in After Effects it is saved with the project (which becomes
-    /// modified) but is no undo step, and it changes no pixels: the comp's cached frames stay
-    /// valid ([`effectcraft_project::Comp::same_pixels`]).
-    pub fn set_resolution(&mut self, comp: ItemId, r: effectcraft_project::Resolution) -> Result<()> {
-        if self.project.comp(comp).ok_or(EngineError::NoComp)?.resolution == r {
-            return Ok(());
-        }
-        Arc::make_mut(&mut self.project).comp_mut(comp).ok_or(EngineError::NoComp)?.resolution = r;
-        self.bump();
-        Ok(())
-    }
-
-    /// Keep what lives outside the undo history (each comp's Resolution) as it is in `from`, the
-    /// project before undo, redo or a history jump restored another state.
-    pub(crate) fn keep_view_settings(&mut self, from: &Project) {
-        let keep: Vec<(ItemId, effectcraft_project::Resolution)> =
-            self.project.comps().filter_map(|(id, c)| from.comp(*id).map(|f| (*id, f.resolution)).filter(|(_, r)| *r != c.resolution)).collect();
-        if keep.is_empty() {
-            return;
-        }
-        let p = Arc::make_mut(&mut self.project);
-        for (id, r) in keep {
-            if let Some(c) = p.comp_mut(id) {
-                c.resolution = r;
-            }
-        }
-    }
-
-    pub fn undo(&mut self) -> bool {
-        let Some((label, p)) = self.history.undo.pop() else { return false };
-        let cur = std::mem::replace(&mut self.project, p);
-        self.keep_view_settings(&cur);
-        self.history.redo.push((label, cur));
-        self.history.merge_key = None;
-        self.sanitize_state();
-        self.bump();
-        true
-    }
-
-    pub fn redo(&mut self) -> bool {
-        let Some((label, p)) = self.history.redo.pop() else { return false };
-        let cur = std::mem::replace(&mut self.project, p);
-        self.keep_view_settings(&cur);
-        self.history.undo.push((label, cur));
-        self.history.merge_key = None;
-        self.sanitize_state();
-        self.bump();
-        true
-    }
-
-    /// Drop selections that no longer exist. Each comp keeps its own selection (#1001); a layer id
-    /// counts only inside the comp that owns it, so the active comp never sees another comp's layers.
-    pub fn sanitize_state(&mut self) {
-        let p = self.project.clone();
-        self.state.open_comps.retain(|c| p.comp(*c).is_some());
-        self.state.comp_selections.retain(|cid, sel| {
-            let Some(c) = p.comp(*cid) else { return false };
-            let ids: Vec<LayerId> = c.layers.iter().map(|l| l.id).collect();
-            sel.layers.retain(|l| ids.contains(l));
-            sel.props.retain(|(l, _)| ids.contains(l));
-            sel.keys.retain(|k| ids.contains(&k.layer));
-            sel.vertices.retain(|v| ids.contains(&v.layer));
-            !sel.is_empty()
-        });
-        if self.state.active_comp.is_some_and(|c| p.comp(c).is_none()) {
-            self.clear_live_selection();
-            self.state.active_comp = self.state.open_comps.first().copied();
-            if let Some(id) = self.state.active_comp {
-                self.recall_selection(id);
-            }
-        }
-        if let Some(c) = self.active_comp() {
-            let ids: Vec<LayerId> = c.layers.iter().map(|l| l.id).collect();
-            self.state.selected_layers.retain(|l| ids.contains(l));
-            self.state.selected_props.retain(|(l, _)| ids.contains(l));
-            self.state.selected_keys.retain(|k| ids.contains(&k.layer));
-            self.state.selected_vertices.retain(|v| ids.contains(&v.layer));
-        }
-        if let Some((l, t)) = self.state.current_track
-            && self.active_comp().and_then(|c| c.layer(l)).and_then(|l| l.tracker(t)).is_none()
-        {
-            self.state.current_track = None;
-        }
-        self.state.project_selection.retain(|i| p.item(*i).is_some());
-        commands::text_edit::sanitize(self);
-    }
-
-    pub fn is_dirty(&self) -> bool {
-        self.revision != self.saved_revision
-    }
-
-    /// The project as it is now is the saved one (after opening or saving it).
-    pub fn mark_saved(&mut self) {
-        self.saved_project = self.project.clone();
-        self.saved_revision = self.revision;
-    }
-
-    /// The project has changes its file doesn't (a session restored with unsaved changes): it
-    /// stays modified until it is saved, whatever is undone.
-    pub fn mark_unsaved(&mut self) {
-        self.saved_project = Arc::new(Project::default());
-        self.bump();
-    }
-
-    pub fn active_comp(&self) -> Option<&Comp> {
-        self.project.comp(self.state.active_comp?)
-    }
-    /// [`Session::active_comp`] as a shared snapshot (an `Arc` clone, not a deep copy).
-    pub fn active_comp_arc(&self) -> Option<std::sync::Arc<Comp>> {
-        self.project.comp_arc(self.state.active_comp?)
-    }
-    pub fn active_comp_id(&self) -> Option<ItemId> {
-        self.state.active_comp.filter(|c| self.project.comp(*c).is_some())
-    }
-
-    /// Current time of a comp.
-    pub fn time_of(&self, comp: ItemId) -> Tick {
-        self.state.times.get(&comp).copied().unwrap_or(Tick::ZERO)
-    }
-
-    /// Current time of the active comp.
-    pub fn time(&self) -> Tick {
-        self.state.active_comp.and_then(|c| self.state.times.get(&c).copied()).unwrap_or(Tick::ZERO)
-    }
-
-    pub fn set_time(&mut self, t: Tick) {
-        if let Some(c) = self.state.active_comp {
-            let comp = self.project.comp(c);
-            let t = match comp {
-                Some(comp) => comp.frame_rate.snap_nearest(t.clamp(Tick::ZERO, comp.duration - comp.frame_duration())),
-                None => t,
-            };
-            self.state.times.insert(c, t);
-            if self.prefs.general.sync_time_related_items {
-                self.sync_related_times(c, t);
-            }
-        }
-    }
-
-    /// Settings ▸ General ▸ Synchronize Time of All Related Items: moving the current time of
-    /// `comp` moves the current time of the comps nested in it (through their precomp layers'
-    /// timing) and of the comps it is nested in, so every related viewer shows the same moment.
-    pub fn sync_related_times(&mut self, comp: ItemId, t: Tick) {
-        let mut seen = std::collections::BTreeSet::from([comp]);
-        let mut todo = vec![(comp, t)];
-        let mut found = vec![];
-        while let Some((cid, ct)) = todo.pop() {
-            if cid != comp {
-                found.push((cid, ct));
-            }
-            let Some(c) = self.project.comp(cid) else { continue };
-            // Down: the comps this one nests.
-            for l in &c.layers {
-                if let effectcraft_project::LayerSource::Comp { item } = &l.source
-                    && seen.insert(*item)
-                {
-                    todo.push((*item, l.layer_time(ct)));
-                }
-            }
-            // Up: the comps nesting this one.
-            for iid in self.project.items.keys() {
-                if let Some(pc) = self.project.comp(*iid)
-                    && let Some(l) = pc.layers.iter().find(|l| matches!(&l.source, effectcraft_project::LayerSource::Comp { item } if *item == cid))
-                    && seen.insert(*iid)
-                {
-                    todo.push((*iid, l.comp_time(ct)));
-                }
-            }
-        }
-        for (cid, ct) in found {
-            if let Some(c) = self.project.comp(cid) {
-                let ct = c.frame_rate.snap_nearest(ct.clamp(Tick::ZERO, (c.duration - c.frame_duration()).max(Tick::ZERO)));
-                self.state.times.insert(cid, ct);
-            }
-        }
-    }
-
-    /// Make `id` the active comp, parking the previous comp's selection and restoring this one's.
-    pub fn activate_comp(&mut self, id: ItemId) {
-        if self.project.comp(id).is_none() || self.state.active_comp == Some(id) {
-            return;
-        }
-        self.remember_selection();
-        self.state.active_comp = Some(id);
-        self.recall_selection(id);
-        self.state.current_track = None;
-    }
-
-    /// Leave no comp active, keeping the one that was active in [`EditorState::comp_selections`].
-    pub fn activate_comp_none(&mut self) {
-        self.remember_selection();
-        self.state.active_comp = None;
-        self.clear_live_selection();
-        self.state.current_track = None;
-    }
-
-    fn remember_selection(&mut self) {
-        let Some(id) = self.state.active_comp else { return };
-        let sel = CompSelection {
-            layers: self.state.selected_layers.clone(),
-            props: self.state.selected_props.clone(),
-            keys: self.state.selected_keys.clone(),
-            vertices: self.state.selected_vertices.clone(),
-        };
-        if sel.is_empty() {
-            self.state.comp_selections.remove(&id);
-        } else {
-            self.state.comp_selections.insert(id, sel);
-        }
-    }
-
-    fn recall_selection(&mut self, id: ItemId) {
-        match self.state.comp_selections.remove(&id) {
-            Some(sel) => {
-                self.state.selected_layers = sel.layers;
-                self.state.selected_props = sel.props;
-                self.state.selected_keys = sel.keys;
-                self.state.selected_vertices = sel.vertices;
-            }
-            None => self.clear_live_selection(),
-        }
-    }
-
-    fn clear_live_selection(&mut self) {
-        self.state.selected_layers.clear();
-        self.state.selected_props.clear();
-        self.state.selected_keys.clear();
-        self.state.selected_vertices.clear();
-    }
-
-    /// Open a comp in the viewer/timeline and make it active.
-    pub fn open_comp(&mut self, id: ItemId) {
-        if self.project.comp(id).is_none() {
-            return;
-        }
-        if !self.state.open_comps.contains(&id) {
-            self.state.open_comps.push(id);
-        }
-        if self.state.active_comp != Some(id) {
-            let previous = self.state.active_comp;
-            self.state.recent_comps.retain(|c| *c != id && Some(*c) != previous);
-            if let Some(previous) = previous {
-                self.state.recent_comps.insert(0, previous);
-                self.state.recent_comps.truncate(32);
-            }
-        }
-        self.activate_comp(id);
-        self.events.push(Event::OpenComp(id));
-    }
-
-    /// The open compositions, as a project file records them ([`effectcraft_project::SavedView`]).
-    pub fn saved_view(&self) -> effectcraft_project::SavedView {
-        effectcraft_project::SavedView { active_comp: self.state.active_comp, open_comps: self.state.open_comps.clone() }
-    }
-
-    /// Reopen the compositions a project file was saved with (#748). Ids that no longer name a
-    /// comp are skipped; with none left the project stays on the comp [`Session::replace_project`]
-    /// opened (its first), as files from before the view was saved do.
-    pub fn restore_view(&mut self, view: &effectcraft_project::SavedView) {
-        let mut open: Vec<ItemId> = Vec::new();
-        for id in view.open_comps.iter().copied().filter(|id| self.project.comp(*id).is_some()) {
-            if !open.contains(&id) {
-                open.push(id);
-            }
-        }
-        let Some(active) = view.active_comp.filter(|id| self.project.comp(*id).is_some()).or_else(|| open.first().copied()) else { return };
-        self.state.open_comps = open;
-        self.open_comp(active);
-    }
-
-    pub fn toast(&mut self, msg: impl Into<String>) {
-        self.events.push(Event::Toast { message: msg.into(), error: false });
-    }
-
-    pub fn drain_events(&mut self) -> Vec<Event> {
-        std::mem::take(&mut self.events)
-    }
-
-    /// The 3D view camera of a comp's viewer (None = the active camera).
-    pub fn view_camera(&self, comp: ItemId) -> Option<effectcraft_render::three_d::CameraState> {
-        let c = self.project.comp(comp)?;
-        if !c.has_3d() {
-            return None;
-        }
-        self.state.views3d.get(&comp)?.override_camera(c.width as f64, c.height as f64)
-    }
-
-    /// Render a comp frame with the session's footage + expression hosts.
-    pub fn render(&self, comp: ItemId, t: Tick, opts: RenderOpts) -> Image {
-        let opts = RenderOpts { nested_switches: self.prefs.general.switches_affect_nested_comps, draft_shadows: self.prefs.three_d.realtime_shadows, ..opts };
-        let mut r = Renderer::new(&self.project, self.footage.as_ref(), opts);
-        r.expr = self.expr.as_deref();
-        r.cache = Some(&self.layer_cache);
-        r.accel = self.accel.as_deref();
-        r.comp_frame(comp, t)
-    }
-
-    /// Resolve a comp reference (item id number or name; `None`/null = the active comp).
-    pub fn resolve_comp(&self, comp: Option<&Value>) -> Result<ItemId> {
-        let p = match comp {
-            Some(v) if !v.is_null() => serde_json::json!({ "comp": v }),
-            _ => serde_json::json!({}),
-        };
-        commands::comp_id(self, &p)
-    }
-
-    /// Render a comp frame (comp time `t`) as opaque 8-bit RGBA over the comp background, scaled
-    /// so the longest side is at most `max_side` pixels (0 = full size). Returns (width, height, rgba).
-    pub fn render_rgba8(&self, comp: ItemId, t: Tick, max_side: u32) -> Result<(u32, u32, Vec<u8>)> {
-        let c = self.project.comp(comp).ok_or(EngineError::NoComp)?;
-        let long = c.width.max(c.height).max(1) as f64;
-        let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
-        let img = self.render(comp, t, RenderOpts { scale, backend: effectcraft_render::Backend::Auto, ..Default::default() });
-        Ok((img.width, img.height, img.to_rgba8_over(c.background)))
-    }
-
-    /// A Project panel thumbnail of an item (a comp at `t`, footage at its first frame), longest
-    /// side at most `max_side`, as a job that owns everything it reads: frontends run it off the
-    /// UI thread (a big comp takes far longer than a frame). `None` for items without pixels.
-    pub fn thumbnail_job(&self, item: ItemId, t: Tick, max_side: u32) -> Option<ThumbnailJob> {
-        let it = self.project.item(item)?;
-        let footage = self.footage.clone();
-        match &it.kind {
-            effectcraft_project::ItemKind::Comp(c) => {
-                let (project, expr, cache) = (self.project.clone(), self.expr.clone(), self.layer_cache.clone());
-                let long = c.width.max(c.height).max(1) as f64;
-                let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
-                let opts = RenderOpts {
-                    scale,
-                    nested_switches: self.prefs.general.switches_affect_nested_comps,
-                    draft_shadows: self.prefs.three_d.realtime_shadows,
-                    ..Default::default()
-                };
-                let bg = c.background;
-                Some(Box::new(move || {
-                    let mut r = Renderer::new(&project, footage.as_ref(), opts);
-                    r.expr = expr.as_deref();
-                    r.cache = Some(&cache);
-                    let img = r.comp_frame(item, t);
-                    Some((img.width, img.height, img.to_rgba8_over(bg)))
-                }))
-            }
-            effectcraft_project::ItemKind::Footage(f) if f.has_video => {
-                let f = f.clone();
-                Some(Box::new(move || {
-                    let img = footage.frame(item, &f, Tick(0))?;
-                    // Point-sample down to at most `max_side` on the long side.
-                    let step = (img.width.max(img.height) as f32 / max_side.max(1) as f32).ceil().max(1.0) as u32;
-                    let (w, h) = (img.width.div_ceil(step), img.height.div_ceil(step));
-                    let full = img.to_rgba8();
-                    let mut px = Vec::with_capacity((w * h * 4) as usize);
-                    for y in 0..h {
-                        for x in 0..w {
-                            let i = (((y * step) * img.width + x * step) * 4) as usize;
-                            px.extend_from_slice(&full[i..i + 4]);
-                        }
-                    }
-                    Some((w, h, px))
-                }))
-            }
-            _ => None,
-        }
-    }
-
-    /// [`Session::render_rgba8`], or with `transparent` the frame's own straight alpha (what a
-    /// render with RGB + Alpha channels writes) instead of compositing over the background.
-    pub fn render_rgba8_alpha(&self, comp: ItemId, t: Tick, max_side: u32, transparent: bool) -> Result<(u32, u32, Vec<u8>)> {
-        if !transparent {
-            return self.render_rgba8(comp, t, max_side);
-        }
-        let c = self.project.comp(comp).ok_or(EngineError::NoComp)?;
-        let long = c.width.max(c.height).max(1) as f64;
-        let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
-        let img = self.render(comp, t, RenderOpts { scale, backend: effectcraft_render::Backend::Auto, ..Default::default() });
-        Ok((img.width, img.height, img.to_rgba8()))
-    }
-
-    /// Make the media layer and the layer cache let go of what they decoded from `footage`'s
-    /// files (it keys frames by path, so an overwritten file would keep showing its old pixels).
-    pub(crate) fn forget_decoded(&self, footage: &effectcraft_project::Footage) {
-        for p in std::iter::once(&footage.path).chain(&footage.sequence) {
-            self.footage.forget(p);
-        }
-        self.layer_cache.clear();
-    }
-
-    /// Replace the whole project (open/new), resetting history and state.
-    pub fn replace_project(&mut self, mut p: Project, path: Option<String>) {
-        if self.stop_render()
-            && let Some(mut job) = self.render_job.take()
-        {
-            // Let the worker notice the cancel; its updates refer to the old project.
-            job.wait();
-        }
-        self.render_job = None;
-        self.stored_paths = Default::default();
-        self.stop_track();
-        self.track_job = None;
-        self.stop_mask_track();
-        self.mask_job = None;
-        self.stop_warp();
-        self.warp_job = None;
-        self.warp_pending.clear();
-        self.stop_camera();
-        self.camera_job = None;
-        self.camera_pending.clear();
-        self.stop_roto();
-        self.roto_job = None;
-        self.roto_pending.clear();
-        self.drop_tasks();
-        self.script_ui.project_epoch = self.script_ui.project_epoch.wrapping_add(1);
-        p.fix_next_id();
-        upgrade_effects(&mut p);
-        // The media layer keys decoded frames by path: files of the new project may have changed
-        // since an earlier project decoded them (#1070).
-        for it in p.items.values() {
-            if let effectcraft_project::ItemKind::Footage(f) = &it.kind {
-                self.forget_decoded(f);
-            }
-        }
-        self.layer_cache.clear();
-        self.project = Arc::new(p);
-        self.history = History::default();
-        self.state = EditorState { snapping: true, view_layout: 1, ..Default::default() };
-        self.path = path;
-        self.bump();
-        self.mark_saved();
-        let first = self.project.comps().next().map(|(id, _)| *id);
-        if let Some(c) = first {
-            self.open_comp(c);
-        }
-    }
-}
-
-/// Bring effect instances saved by earlier versions up to date with the effect registry
-/// (renamed / regrouped / added parameters, reordered popups; see
-/// [`effectcraft_effects::migrate`]), and a project from before
-/// [`effectcraft_project::SCHEMA_EFFECT_SPACE`] into effect space
-/// ([`effectcraft_effects::migrate::to_effect_space`]). Stamps the current schema.
-pub fn upgrade_effects(p: &mut Project) {
-    let to_effect_space = p.schema < effectcraft_project::SCHEMA_EFFECT_SPACE;
-    // Effect bounds per layer: (size, top-left in layer coordinates).
-    let mut bounds = std::collections::HashMap::new();
-    for (cid, c) in p.comps() {
-        for l in &c.layers {
-            bounds.insert((*cid, l.id), effectcraft_render::effect_bounds(p, c, l));
-        }
-    }
-    let mut next = p.next_id;
-    for (cid, it) in p.items.iter_mut() {
-        let effectcraft_project::ItemKind::Comp(c) = &mut it.kind else { continue };
-        for l in &mut std::sync::Arc::make_mut(c).layers {
-            let (size, origin) = bounds.get(&(*cid, l.id)).copied().unwrap_or(([100.0, 100.0], [0.0; 2]));
-            // Effect space starts at the bounds' top-left: positions move by minus that corner.
-            // Adjustment layers run their effects on the comp below as it is: nothing moves.
-            let shift = |o: [f64; 2]| [-o[0], -o[1]];
-            let d = if l.switches.adjustment { [0.0; 2] } else { shift(origin) };
-            let clone_d = |src: Option<u64>| match src {
-                Some(id) => bounds.get(&(*cid, effectcraft_project::LayerId(id))).map_or([0.0; 2], |b| shift(b.1)),
-                None => d,
-            };
-            let Some(fx) = l.props.sub_mut("effects") else { continue };
-            for n in &mut fx.children {
-                let effectcraft_project::Node::Group(g) = n else { continue };
-                let effectcraft_project::GroupKind::Effect { effect } = &g.kind else { continue };
-                if let Some(spec) = effectcraft_effects::find(effect) {
-                    effectcraft_effects::migrate::upgrade_instance(spec, g, &mut effectcraft_project::build::Ids(&mut next), size);
-                    if to_effect_space {
-                        effectcraft_effects::migrate::to_effect_space(spec, g, size, d, &clone_d);
-                    }
-                }
-            }
-        }
-    }
-    p.next_id = next;
-    p.schema = effectcraft_project::SCHEMA_VERSION;
-}
-
 #[cfg(test)]
 mod rq_tests;
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_3d;
-#[cfg(test)]
-mod tests_anim_presets;
-#[cfg(test)]
-mod tests_anim_tools;
-#[cfg(test)]
-mod tests_camera_track;
-#[cfg(test)]
-mod tests_codec_options;
-#[cfg(test)]
-mod tests_color_view;
-#[cfg(test)]
-mod tests_disk_cache;
-#[cfg(test)]
-mod tests_effects;
-#[cfg(test)]
-mod tests_essential;
-#[cfg(test)]
-mod tests_essential_more;
-#[cfg(test)]
-mod tests_face;
-#[cfg(test)]
-mod tests_fidelity;
-#[cfg(test)]
-mod tests_frame_export;
-#[cfg(test)]
-mod tests_fuzz_open;
-#[cfg(test)]
-mod tests_import_project;
-#[cfg(test)]
-mod tests_key_metadata_order;
-#[cfg(test)]
-mod tests_keylight;
-#[cfg(test)]
-mod tests_limits;
-#[cfg(test)]
-mod tests_lottie;
-#[cfg(test)]
-mod tests_m137;
-#[cfg(test)]
-mod tests_m145;
-#[cfg(test)]
-mod tests_markers;
-#[cfg(test)]
-mod tests_mask_warp;
-#[cfg(test)]
-mod tests_menu_cmds;
-#[cfg(test)]
-mod tests_model3d;
-#[cfg(test)]
-mod tests_motion_blur_depth;
-#[cfg(test)]
-mod tests_project_items;
-#[cfg(test)]
-mod tests_proxy;
-#[cfg(test)]
-mod tests_quick_offset;
-#[cfg(test)]
-mod tests_rig3d;
-#[cfg(test)]
-mod tests_sequence;
-#[cfg(test)]
-mod tests_settings;
-#[cfg(test)]
-mod tests_shortcut_cmds;
-#[cfg(test)]
-mod tests_stubs;
-#[cfg(test)]
-mod tests_styles;
-#[cfg(test)]
-mod tests_tail;
-#[cfg(test)]
-mod tests_text;
-#[cfg(test)]
-mod tests_text_edit;
-#[cfg(test)]
-mod tests_timeline;
-#[cfg(test)]
-mod tests_timeline_interchange;
-#[cfg(test)]
-mod tests_track;
-#[cfg(test)]
-mod tests_vector_import;
-#[cfg(test)]
-mod tests_viewer;
-
-/// Font families available to text layers (bundled + scanned system fonts).
-/// Text animation presets: (id, name), for menus.
-pub fn text_presets() -> Vec<(String, String)> {
-    commands::text_preset_list()
-}
-
-/// Built-in animation presets (Effects & Presets ▸ * Animation Presets): (id, name, category).
-pub fn animation_presets() -> Vec<(String, String, String)> {
-    commands::builtin_preset_list()
-}
-
-pub fn text_families() -> Vec<String> {
-    effectcraft_text::families().into_iter().map(|(f, _)| f).collect()
-}
-
-/// The styles a family offers (its own faces, in weight order), for the style menus. A family
-/// that isn't installed offers the usual styles, which resolve to Inter's.
-pub fn font_styles(family: &str) -> Vec<String> {
-    effectcraft_text::families()
-        .into_iter()
-        .find(|(f, _)| f.eq_ignore_ascii_case(family))
-        .map(|(_, st)| st)
-        .filter(|st| !st.is_empty())
-        .unwrap_or_else(|| ["Regular", "Medium", "SemiBold", "Bold", "Italic"].iter().map(|s| s.to_string()).collect())
-}
-
-/// The OpenType feature tags (GSUB / GPOS) of the face a family + style resolves to.
-pub fn font_features(family: &str, style: &str) -> Vec<String> {
-    effectcraft_text::fonts::face(effectcraft_text::resolve(family, style).face).features()
-}
-
-/// One row of the Character panel's font menu.
-#[derive(Clone, Debug, PartialEq)]
-pub struct FontRow {
-    /// The family to apply (empty for the separator after the recent fonts).
-    pub family: String,
-    /// What the menu shows: the English family name, or the font's own-language name when
-    /// Settings ▸ Type ▸ Show Font Names in English is off.
-    pub display: String,
-    pub recent: bool,
-    /// A variable font (the menu's Variable Fonts filter keeps only these).
-    pub variable: bool,
-}
-
-/// Outline polylines of "Sample" set in `family` at `size` px (baseline at y = 0, y down), for
-/// the font menu's preview (Settings ▸ Type ▸ Show Font Preview).
-pub fn font_preview(family: &str, size: f64) -> Vec<Vec<[f32; 2]>> {
-    use kurbo::PathEl;
-    let st = effectcraft_keyframe::text_doc::CharStyle { font: family.to_string(), size, ..Default::default() };
-    let mut out = vec![];
-    let mut x = 0.0;
-    for ch in "Sample".chars() {
-        let (path, adv) = effectcraft_text::char_glyph_style(&st, ch);
-        let mut cur: Vec<[f32; 2]> = vec![];
-        let pt = |p: kurbo::Point| [(p.x + x) as f32, p.y as f32];
-        kurbo::flatten(&path, 0.2, |el| match el {
-            PathEl::MoveTo(p) => {
-                if cur.len() > 1 {
-                    out.push(std::mem::take(&mut cur));
-                }
-                cur = vec![pt(p)];
-            }
-            PathEl::LineTo(p) => cur.push(pt(p)),
-            PathEl::ClosePath => {
-                if let Some(f) = cur.first().copied() {
-                    cur.push(f);
-                }
-                if cur.len() > 1 {
-                    out.push(std::mem::take(&mut cur));
-                }
-            }
-            _ => {}
-        });
-        if cur.len() > 1 {
-            out.push(cur);
-        }
-        x += adv;
-    }
-    out
-}
-
-/// The Character panel's font menu: the recent fonts (Settings ▸ Type ▸ Number of Recent Fonts
-/// to Display), a separator, then every family. Each row says whether the family is variable,
-/// for the menu's Variable Fonts filter.
-pub fn font_menu(prefs: &prefs::Prefs) -> Vec<FontRow> {
-    let all = text_families();
-    let native = if prefs.type_.font_names_in_english { Default::default() } else { effectcraft_text::fonts::native_families() };
-    let variable = effectcraft_text::fonts::variable_families();
-    let row = |f: &String, recent: bool| FontRow {
-        family: f.clone(),
-        display: native.get(f).cloned().unwrap_or_else(|| f.clone()),
-        recent,
-        variable: variable.contains(f),
-    };
-    let mut out: Vec<FontRow> = prefs.recent_fonts_shown().iter().filter(|f| all.contains(f)).map(|f| row(f, true)).collect();
-    if !out.is_empty() {
-        out.push(FontRow { family: String::new(), display: "-".into(), recent: false, variable: false });
-    }
-    out.extend(all.iter().map(|f| row(f, false)));
-    out
-}
-#[cfg(test)]
-mod tests_history;
-#[cfg(test)]
-mod tests_models;
-#[cfg(test)]
-mod tests_paint;
-#[cfg(test)]
-mod tests_panels;
-#[cfg(test)]
-mod tests_roto;
-
-#[cfg(test)]
-mod tests_key_time;
diff --git a/crates/engine/src/menus.rs b/crates/engine/src/menus.rs
index bc486a0c5..df07c633b 100644
--- a/crates/engine/src/menus.rs
+++ b/crates/engine/src/menus.rs
@@ -61,6 +61,12 @@ fn file_name(p: &str) -> String {
     std::path::Path::new(p).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| p.to_string())
 }
 
+/// The labels of a recent-files list: `names[i]`, or the whole of `full[i]` when another entry
+/// has the same name, so entries for two files named `Tool.jsx` tell them apart.
+fn distinct_labels(names: Vec<String>, full: &[String]) -> Vec<String> {
+    names.iter().zip(full).map(|(n, f)| if names.iter().filter(|m| *m == n).count() > 1 { f.clone() } else { n.clone() }).collect()
+}
+
 fn dyn_entry(label: String, command: &str, params: Value) -> MenuEntry {
     MenuEntry { label, command: command.into(), params, shortcut: None, alt_shortcuts: vec![] }
 }
@@ -72,26 +78,34 @@ fn holder_of(s: &Session, keys: &str) -> Option<String> {
 }
 
 /// The entries of a `@dynamic:<name>` node, and the disabled placeholder shown when there are
-/// none: `recentProjects`, `recentFootage`, `recentPresets`, `history` (undo steps, newest
+/// none: `recentProjects`, `recentFootage`, `recentPresets`, `recentScripts` (File ▸ Scripts ▸
+/// Recent Script Files), `history` (undo steps, newest
 /// first), `view3dShortcuts`, `workspaceShortcuts`, `savedWorkspaces` (Window ▸ Workspace) and
 /// `openViewers` (open compositions other than the active one), `scripts` (File ▸ Scripts) and
 /// `scriptPanels` (ScriptUI panels).
 pub fn dynamic(s: &Session, name: &str, cx: &DynCtx) -> (Vec<MenuEntry>, Option<&'static str>) {
     use serde_json::json;
     let indexed = |list: &[String], cmd: &str, stem: bool| -> Vec<MenuEntry> {
-        list.iter()
-            .enumerate()
-            .map(|(i, p)| {
-                let n =
-                    if stem { std::path::Path::new(p).file_stem().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| p.clone()) } else { file_name(p) };
-                dyn_entry(n, cmd, json!({"index": i}))
-            })
-            .collect()
+        let names = list
+            .iter()
+            .map(
+                |p| if stem { std::path::Path::new(p).file_stem().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| p.clone()) } else { file_name(p) },
+            )
+            .collect();
+        distinct_labels(names, list).into_iter().enumerate().map(|(i, n)| dyn_entry(n, cmd, json!({"index": i}))).collect()
     };
     match name {
         "recentProjects" => (indexed(&s.prefs.recent_projects, "file.openRecent", false), Some("No Recent Projects")),
         "recentFootage" => (indexed(&s.prefs.recent_footage, "file.importRecent", false), Some("No Recent Footage")),
         "recentPresets" => (indexed(&s.prefs.recent_presets, "anim.applyRecentPreset", true), Some("No Recent Presets")),
+        "recentScripts" => {
+            let full: Vec<String> = s.prefs.recent_scripts.iter().map(|r| r.text().to_string()).collect();
+            let names = full.iter().map(|p| file_name(p)).collect();
+            (
+                distinct_labels(names, &full).into_iter().enumerate().map(|(i, n)| dyn_entry(n, "file.runScript", json!({"recent": i}))).collect(),
+                Some("No Recent Script Files"),
+            )
+        }
         "history" => (
             s.history.undo.iter().rev().enumerate().map(|(i, (l, _))| dyn_entry(format!("Undo {l}"), "edit.history", json!({"steps": i + 1}))).collect(),
             Some("No History"),
@@ -576,6 +590,8 @@ File
     Install Script File... | file.installScript
     Install ScriptUI Panel... | file.installScriptUIPanel
     Run Script File... | file.runScript
+    Recent Script Files
+      @dynamic:recentScripts
   ---
   Create Proxy
     Still... | file.createProxy {"kind":"still"}
@@ -733,6 +749,7 @@ Layer
     Shape Layer | layer.newShape
     Adjustment Layer | layer.newAdjustment
     Content-Aware Fill Layer... | layer.newContentAwareFill
+    3D Primitive... | layer.newPrimitive
     Cube | layer.new3dPrimitive {"kind":"cube"}
     Sphere | layer.new3dPrimitive {"kind":"sphere"}
     Plane | layer.new3dPrimitive {"kind":"plane"}
diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs
deleted file mode 100644
index 3abf336b0..000000000
--- a/crates/engine/src/prefs.rs
+++ /dev/null
@@ -1,1487 +0,0 @@
-//! Settings (After Effects' Preferences): a versioned serde model, addressed by dotted keys
-//! (`general.undoLevels`, `autoSave.intervalMinutes`, `labels.3.name`), plus the page schema the
-//! Settings dialog and agents (`prefs.pages`) are built from.
-//!
-//! Settings are stored as JSON (`prefs.json`) through the session's [`crate::config::ConfigStore`].
-//! Loading is forgiving: missing keys take their defaults, unknown keys (written by a newer
-//! version) are kept and written back, and older layouts are migrated ([`migrate`]).
-//!
-//! Every setting in [`pages`] says whether it already changes behaviour (`live`). Settings that
-//! don't yet are still shown (After Effects parity of the dialog) and are listed in
-//! `docs/preferences.md`; a test keeps that list in step with the schema.
-
-use std::collections::BTreeMap;
-
-use effectcraft_color::Label;
-use effectcraft_time::Tick;
-use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value, json};
-
-/// Current settings layout version.
-pub const PREFS_VERSION: u32 = 2;
-/// Settings file name in the config store.
-pub const PREFS_FILE: &str = "prefs.json";
-
-/// Settings ▸ General ▸ Language: (label, `general.language` value).
-pub const LANGUAGES: &[(&str, &str)] = &[
-    ("Match System", "system"),
-    ("English", "en"),
-    ("日本語", "ja"),
-    ("简体中文", "zh-hans"),
-    ("繁體中文", "zh-hant"),
-    ("Українська", "uk"),
-    ("Español", "es"),
-    ("Português (Brasil)", "pt-br"),
-    ("Русский", "ru"),
-    ("Français", "fr"),
-    ("Deutsch", "de"),
-    ("Čeština", "cs"),
-];
-
-/// Settings ▸ Startup & Repair ▸ Window Graphics: (label, `startup.windowGraphics` value).
-pub const WINDOW_GRAPHICS: &[(&str, &str)] = &[("Automatic", "auto"), ("OpenGL (compatibility)", "gl")];
-
-/// Settings ▸ Appearance ▸ Appearance Mode: (label, `appearance.appearanceMode` value). Auto
-/// follows the operating system's light or dark appearance.
-pub const APPEARANCE_MODES: &[(&str, &str)] = &[("Sync with System", "auto"), ("Dark", "dark"), ("Light", "light")];
-
-/// The dark family of themes: (label, `appearance.darkTheme` value).
-pub const DARK_THEMES: &[(&str, &str)] = &[("Dark", "dark"), ("Darker", "darker")];
-
-/// The light family of themes: (label, `appearance.lightTheme` value).
-pub const LIGHT_THEMES: &[(&str, &str)] = &[("Light", "light")];
-
-/// Every theme (the legacy single-theme `appearance.theme`).
-pub const THEMES: &[(&str, &str)] = &[("Dark", "dark"), ("Darker", "darker"), ("Light", "light")];
-
-/// The settings whose value must be one of their choices.
-fn choices(key: &str) -> Option<&'static [(&'static str, &'static str)]> {
-    match key {
-        "general.language" => Some(LANGUAGES),
-        "startup.windowGraphics" => Some(WINDOW_GRAPHICS),
-        "appearance.appearanceMode" => Some(APPEARANCE_MODES),
-        "appearance.darkTheme" => Some(DARK_THEMES),
-        "appearance.lightTheme" => Some(LIGHT_THEMES),
-        "appearance.theme" => Some(THEMES),
-        _ => None,
-    }
-}
-
-fn is_choice(choices: &[(&str, &str)], v: &str) -> bool {
-    choices.iter().any(|(_, c)| *c == v)
-}
-
-/// Unknown keys inside a page, kept so a newer version's settings survive a round trip.
-type Extra = BTreeMap<String, Value>;
-
-macro_rules! page {
-    ($(#[$m:meta])* $name:ident { $($(#[$fm:meta])* $f:ident : $t:ty = $d:expr),* $(,)? }) => {
-        $(#[$m])*
-        #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-        #[serde(default, rename_all = "camelCase")]
-        pub struct $name {
-            $($(#[$fm])* pub $f: $t,)*
-            #[serde(flatten)]
-            pub extra: Extra,
-        }
-        impl Default for $name {
-            fn default() -> Self {
-                $name { $($f: $d,)* extra: Extra::new() }
-            }
-        }
-    };
-}
-
-page!(General {
-    /// Interface language: `system` (the operating system's, where EffectCraft has it, else
-    /// English), or a language code from `LANGUAGES`.
-    language: String = "system".into(),
-    /// Levels of Undo (1–99).
-    undo_levels: u32 = 32,
-    /// Path Point and Handle Size (px).
-    path_point_size: u32 = 5,
-    show_tool_tips: bool = true,
-    /// Create New Layers at Composition Start Time (off: at the current time).
-    create_layers_at_comp_start: bool = true,
-    switches_affect_nested_comps: bool = true,
-    /// Default Spatial Interpolation to Linear.
-    default_spatial_linear: bool = false,
-    preserve_constant_vertex_count: bool = true,
-    /// Synchronize Time of All Related Items.
-    sync_time_related_items: bool = true,
-    expression_pick_whip_compact: bool = true,
-    create_split_layers_above: bool = false,
-    use_system_color_picker: bool = false,
-    /// Number of projects in File ▸ Open Recent.
-    recent_items: u32 = 10,
-});
-
-page!(Startup {
-    show_home_on_launch: bool = true,
-    show_home_on_open_project: bool = false,
-    /// After a crash, offer to open the most recent auto-save.
-    offer_crash_recovery: bool = true,
-    /// What the desktop window draws with, from the next launch: `auto` (the platform's best
-    /// graphics API) or `gl` (OpenGL, for drivers that crash with the others). A launch that
-    /// stops as its window opens switches it to `gl` (#243).
-    window_graphics: String = "auto".into(),
-});
-
-page!(ProjectPrefs {
-    /// Open a template project for File ▸ New ▸ New Project.
-    use_template: bool = false,
-    template_path: String = String::new(),
-});
-
-page!(AutoSave {
-    enabled: bool = true,
-    interval_minutes: u32 = 20,
-    max_versions: u32 = 5,
-    /// `nextToProject` (an "EffectCraft Auto-Save" folder beside the project) or `custom`.
-    location: String = "nextToProject".into(),
-    folder: String = String::new(),
-    save_on_render_start: bool = false,
-});
-
-page!(CompositionPrefs {
-    /// Motion path: `all`, `none`, `seconds`, `keyframes`.
-    motion_path: String = "keyframes".into(),
-    motion_path_seconds: f64 = 15.0,
-    motion_path_keyframes: u32 = 15,
-    show_rendering_progress: bool = true,
-    hardware_accelerate_panels: bool = true,
-});
-
-page!(Previews {
-    /// Largest downsampling while playing back: `1/2`, `1/4`, `1/8`.
-    adaptive_resolution_limit: String = "1/8".into(),
-    show_internal_wireframes: bool = false,
-    cache_frames_when_idle: bool = false,
-    fast_previews: bool = false,
-    /// `faster` or `moreAccurate`.
-    zoom_quality: String = "moreAccurate".into(),
-    show_gpu_info: bool = false,
-    /// The monitor's colour space for View ▸ Use Display Color Management: `srgb` or `p3`.
-    display_profile: String = "srgb".into(),
-});
-
-page!(Appearance {
-    /// The single theme before appearance modes (`dark`, `darker` or `light`), kept for older
-    /// settings files and automation: setting it picks its family's mode and theme. While the mode
-    /// is Dark or Light it mirrors the theme in use.
-    theme: String = "dark".into(),
-    /// `auto` (follow the operating system), `dark` or `light`. New installs stay Dark.
-    appearance_mode: String = "dark".into(),
-    /// The theme used in dark appearance: `dark` or `darker`.
-    dark_theme: String = "dark".into(),
-    /// The theme used in light appearance: `light`.
-    light_theme: String = "light".into(),
-    /// Theme shortcuts in the appearance context menu.
-    favorite_themes: Vec<String> = Vec::new(),
-    /// User interface brightness, -1 (darker) … 1 (lighter).
-    brightness: f64 = 0.0,
-    /// The size of the whole interface in percent (75–200), on top of the display's own scale.
-    ui_scale: u32 = 100,
-    use_label_color_for_handles: bool = true,
-    use_label_color_for_tabs: bool = true,
-    cycle_mask_colors: bool = true,
-    use_gradients: bool = true,
-    /// macOS: draw the menu bar inside the window instead of the system menu bar.
-    in_window_menu_bar_mac: bool = false,
-});
-
-page!(Grids {
-    grid_color: String = "#7a9cff".into(),
-    grid_spacing: f64 = 100.0,
-    grid_subdivisions: u32 = 4,
-    /// `lines`, `dashed` or `dots`.
-    grid_style: String = "lines".into(),
-    proportional_horizontal: u32 = 4,
-    proportional_vertical: u32 = 4,
-    guide_color: String = "#3cc8f0".into(),
-    guide_style: String = "lines".into(),
-    action_safe: f64 = 10.0,
-    title_safe: f64 = 20.0,
-});
-
-page!(TypePrefs {
-    /// `latin` or `southAsian` (South Asian and Middle Eastern).
-    text_engine: String = "latin".into(),
-    font_preview: bool = true,
-    recent_fonts: u32 = 10,
-    font_names_in_english: bool = false,
-});
-
-page!(Import {
-    /// Still footage duration: `compLength` or `seconds`.
-    still_footage: String = "compLength".into(),
-    still_seconds: f64 = 5.0,
-    sequence_fps: f64 = 30.0,
-    report_missing_frames: bool = true,
-    /// Automatically Reload Footage whose file another app changed (size or modification time),
-    /// checked every two seconds and when the window comes back to the front: `off`,
-    /// `nonSequence` (the default, as in After Effects: image sequences are left alone) or `all`.
-    auto_reload_footage: String = "nonSequence".into(),
-    /// Interpret unlabeled alpha as: `ask`, `guess`, `ignore`, `straight`, `premultiplied`.
-    unlabeled_alpha: String = "ask".into(),
-    /// Default drag import as: `footage`, `comp`, `compLayerSizes`.
-    drag_import_as: String = "footage".into(),
-});
-
-page!(Export {
-    default_output_folder: String = String::new(),
-    segment_sequences: bool = false,
-    segment_sequence_files: u32 = 700,
-    segment_movies: bool = false,
-    segment_movie_mb: u32 = 1024,
-    append_bits_to_name: bool = false,
-});
-
-page!(Audio {
-    /// Output device name (empty = the system default).
-    output_device: String = String::new(),
-    /// Output mapping: device channel for the left / right output (1-based).
-    output_left: u32 = 1,
-    output_right: u32 = 2,
-    preview_sample_rate: u32 = 48_000,
-});
-
-page!(Disk {
-    disk_cache_enabled: bool = true,
-    disk_cache_max_gb: u32 = 100,
-    disk_cache_folder: String = String::new(),
-    media_cache_folder: String = String::new(),
-    conformed_media_folder: String = String::new(),
-});
-
-page!(Memory {
-    ram_reserved_gb: u32 = 6,
-    /// Processed-layer cache budget (MB).
-    layer_cache_mb: u32 = 1024,
-    /// Decoded footage frame cache budget (MB).
-    media_cache_mb: u32 = 1024,
-    /// RAM preview (viewer frame) cache budget (MB).
-    preview_cache_mb: u32 = 3072,
-    reduce_cache_when_low: bool = true,
-});
-
-page!(Video {
-    enable_output: bool = false,
-    device: String = String::new(),
-    output_during_playback: bool = true,
-    mirror_on_monitor: bool = true,
-    disable_when_background: bool = false,
-});
-
-page!(ThreeD {
-    /// Default 3D renderer for new compositions: `classic` or `advanced`.
-    default_renderer: String = "classic".into(),
-    show_reference_axes: bool = true,
-    extended_viewer: bool = false,
-    realtime_shadows: bool = true,
-});
-
-page!(
-    /// Settings ▸ Roto Brush.
-    RotoPrefs {
-        /// The segmentation model Roto Brush 2.0 / 3.0 use: `classical` (built in) or a model id
-        /// from `effectcraft_segment::MODELS` (once installed).
-        model: String = "classical".into(),
-    }
-);
-
-page!(
-    /// Settings ▸ Face Tracking.
-    FacePrefs {
-        /// The model Track Mask ▸ Face Tracking uses: `classical` (built in) or a model id from
-        /// `effectcraft_segment::MODELS` (once installed).
-        model: String = "classical".into(),
-    }
-);
-
-page!(Scripting {
-    allow_scripts_write_files: bool = false,
-    warn_executing_files: bool = true,
-    enable_js_debugger: bool = false,
-    editor_font_size: u32 = 13,
-    syntax_highlighting: bool = true,
-    line_numbers: bool = true,
-    auto_complete: bool = true,
-    bracket_matching: bool = true,
-    word_wrap: bool = false,
-    error_banner: bool = true,
-});
-
-impl Scripting {
-    /// Whether `other` grants scripts the same as this: Application Scripting (file and network
-    /// access, the warning before executing files, the debugger). Scripts can't change these
-    /// ([`crate::Session::execute_for_script`]): a script could otherwise give itself the
-    /// access the user withheld.
-    pub fn same_permissions(&self, other: &Scripting) -> bool {
-        self.allow_scripts_write_files == other.allow_scripts_write_files
-            && self.warn_executing_files == other.warn_executing_files
-            && self.enable_js_debugger == other.enable_js_debugger
-    }
-
-    /// Take `from`'s Application Scripting settings (see [`Scripting::same_permissions`]).
-    pub fn keep_permissions(&mut self, from: &Scripting) {
-        self.allow_scripts_write_files = from.allow_scripts_write_files;
-        self.warn_executing_files = from.warn_executing_files;
-        self.enable_js_debugger = from.enable_js_debugger;
-    }
-}
-
-/// One editable label: name and `#rrggbb` colour.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct LabelPref {
-    pub name: String,
-    pub color: String,
-}
-
-/// A Composition Settings preset the user saved (Composition Settings ▸ Preset ▸ Save): the
-/// frame size, pixel aspect and frame rate, as in After Effects' own presets.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CompPreset {
-    pub name: String,
-    pub width: u32,
-    pub height: u32,
-    pub pixel_aspect: f64,
-    pub frame_rate: f64,
-}
-
-impl CompPreset {
-    /// Longest preset name kept.
-    pub const MAX_NAME: usize = 128;
-
-    /// Values a composition accepts (a hand-edited settings file can hold anything).
-    pub fn is_valid(&self) -> bool {
-        let size = 4..=30000;
-        !self.name.trim().is_empty()
-            && self.name.chars().count() <= Self::MAX_NAME
-            && size.contains(&self.width)
-            && size.contains(&self.height)
-            && self.pixel_aspect.is_finite()
-            && (0.01..=100.0).contains(&self.pixel_aspect)
-            && self.frame_rate.is_finite()
-            && (1.0..=999.0).contains(&self.frame_rate)
-    }
-}
-
-/// Saved composition presets, skipping entries that don't parse instead of losing the list.
-fn lenient_comp_presets<'de, D: serde::Deserializer<'de>>(d: D) -> Result<Vec<CompPreset>, D::Error> {
-    let v = Vec::<Value>::deserialize(d)?;
-    Ok(v.into_iter().filter_map(|x| serde_json::from_value(x).ok()).collect())
-}
-
-fn default_labels() -> Vec<LabelPref> {
-    Label::ALL.iter().skip(1).map(|l| LabelPref { name: l.name().to_string(), color: hex(l.rgb()) }).collect()
-}
-
-fn hex([r, g, b]: [u8; 3]) -> String {
-    format!("#{r:02x}{g:02x}{b:02x}")
-}
-
-fn parse_hex(s: &str) -> Option<[u8; 3]> {
-    let h = s.trim().trim_start_matches('#');
-    if h.len() != 6 {
-        return None;
-    }
-    let p = |i: usize| u8::from_str_radix(h.get(i..i + 2)?, 16).ok();
-    Some([p(0)?, p(2)?, p(4)?])
-}
-
-/// All settings.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct Prefs {
-    pub version: u32,
-    pub general: General,
-    pub startup: Startup,
-    pub project: ProjectPrefs,
-    pub auto_save: AutoSave,
-    pub composition: CompositionPrefs,
-    pub previews: Previews,
-    pub appearance: Appearance,
-    pub grids: Grids,
-    /// The 16 labels (Red … Dark Green), in order.
-    pub labels: Vec<LabelPref>,
-    #[serde(rename = "type")]
-    pub type_: TypePrefs,
-    pub import: Import,
-    pub export: Export,
-    pub audio: Audio,
-    pub disk: Disk,
-    pub memory: Memory,
-    pub video: Video,
-    #[serde(rename = "threeD")]
-    pub three_d: ThreeD,
-    pub scripting: Scripting,
-    pub roto: RotoPrefs,
-    pub face: FacePrefs,
-    /// File ▸ Open Recent, newest first.
-    pub recent_projects: Vec<String>,
-    /// File ▸ Import Recent Footage, newest first.
-    pub recent_footage: Vec<String>,
-    /// Animation ▸ Recent Animation Presets (`.ecpreset` paths or built-in preset ids), newest
-    /// first.
-    pub recent_presets: Vec<String>,
-    /// Character panel: recently used font families, newest first.
-    pub recent_fonts: Vec<String>,
-    /// Preview panel: every shortcut's options.
-    pub preview: crate::preview::PreviewSettings,
-    /// View ▸ Simulate Output ▸ My Custom RGB.
-    pub custom_rgb: crate::viewer::CustomRgb,
-    /// Composition Settings presets the user saved, in the order saved.
-    #[serde(deserialize_with = "lenient_comp_presets")]
-    pub comp_presets: Vec<CompPreset>,
-    /// Top-level keys this version doesn't know (kept for newer versions).
-    #[serde(flatten)]
-    pub extra: Extra,
-}
-
-impl Default for Prefs {
-    fn default() -> Self {
-        Prefs {
-            version: PREFS_VERSION,
-            general: General::default(),
-            startup: Startup::default(),
-            project: ProjectPrefs::default(),
-            auto_save: AutoSave::default(),
-            composition: CompositionPrefs::default(),
-            previews: Previews::default(),
-            appearance: Appearance::default(),
-            grids: Grids::default(),
-            labels: default_labels(),
-            type_: TypePrefs::default(),
-            import: Import::default(),
-            export: Export::default(),
-            audio: Audio::default(),
-            disk: Disk::default(),
-            memory: Memory::default(),
-            video: Video::default(),
-            three_d: ThreeD::default(),
-            scripting: Scripting::default(),
-            roto: RotoPrefs::default(),
-            face: FacePrefs::default(),
-            recent_projects: vec![],
-            recent_footage: vec![],
-            recent_presets: vec![],
-            recent_fonts: vec![],
-            preview: crate::preview::PreviewSettings::default(),
-            custom_rgb: crate::viewer::CustomRgb::default(),
-            comp_presets: vec![],
-            extra: Extra::new(),
-        }
-    }
-}
-
-/// Bring an older settings document up to [`PREFS_VERSION`].
-///
-/// - version 0/1 (early builds) kept a flat object: `undoLevels`, `autoSaveEnabled`,
-///   `autoSaveMinutes`, `autoSaveVersions`, `labelNames` (array) and `theme` at the top level.
-pub fn migrate(mut v: Value) -> Value {
-    let Some(obj) = v.as_object_mut() else { return json!({}) };
-    let version = obj.get("version").and_then(Value::as_u64).unwrap_or(0);
-    if version < 2 {
-        let moved = |from: &str, page: &str, key: &str, obj: &mut Map<String, Value>| {
-            if let Some(x) = obj.remove(from) {
-                let p = obj.entry(page.to_string()).or_insert_with(|| json!({}));
-                if let Some(p) = p.as_object_mut() {
-                    p.entry(key.to_string()).or_insert(x);
-                }
-            }
-        };
-        moved("undoLevels", "general", "undoLevels", obj);
-        moved("autoSaveEnabled", "autoSave", "enabled", obj);
-        moved("autoSaveMinutes", "autoSave", "intervalMinutes", obj);
-        moved("autoSaveVersions", "autoSave", "maxVersions", obj);
-        moved("theme", "appearance", "theme", obj);
-        if let Some(Value::Array(names)) = obj.remove("labelNames") {
-            let mut labels = default_labels();
-            for (l, n) in labels.iter_mut().zip(names) {
-                if let Some(n) = n.as_str() {
-                    l.name = n.to_string();
-                }
-            }
-            obj.insert("labels".into(), serde_json::to_value(labels).unwrap_or_default());
-        }
-    }
-    // Settings saved before appearance modes had one theme: keep showing it, as a fixed Dark or
-    // Light mode, instead of switching established users to Auto.
-    if let Some(a) = obj.get_mut("appearance").and_then(Value::as_object_mut)
-        && !a.contains_key("appearanceMode")
-        && let Some(theme) = a.get("theme").and_then(Value::as_str).map(str::to_string)
-        && let Some((mode, slot)) = theme_family(&theme)
-    {
-        a.insert("appearanceMode".into(), json!(mode));
-        a.insert(slot.into(), json!(theme));
-    }
-    obj.insert("version".into(), json!(PREFS_VERSION));
-    v
-}
-
-/// The appearance mode and the per-mode setting a theme belongs to (`darker` → (`dark`,
-/// `darkTheme`)); `None` for an unknown theme.
-pub fn theme_family(theme: &str) -> Option<(&'static str, &'static str)> {
-    if is_choice(DARK_THEMES, theme) {
-        Some(("dark", "darkTheme"))
-    } else if is_choice(LIGHT_THEMES, theme) {
-        Some(("light", "lightTheme"))
-    } else {
-        None
-    }
-}
-
-impl Appearance {
-    /// Show the legacy single `theme`: fix the mode to its family and remember it as that
-    /// family's theme. An unknown theme changes nothing.
-    pub fn select_theme(&mut self) {
-        match theme_family(&self.theme) {
-            Some((mode, "darkTheme")) => {
-                self.appearance_mode = mode.into();
-                self.dark_theme = self.theme.clone();
-            }
-            Some((mode, _)) => {
-                self.appearance_mode = mode.into();
-                self.light_theme = self.theme.clone();
-            }
-            None => {}
-        }
-    }
-
-    /// The theme to show: the light or dark family's choice by the mode; Auto follows `system_light`
-    /// (`None` = the system said nothing: dark).
-    pub fn resolved_theme(&self, system_light: Option<bool>) -> &str {
-        let light = match self.appearance_mode.as_str() {
-            "light" => true,
-            "auto" => system_light == Some(true),
-            _ => false,
-        };
-        if light { &self.light_theme } else { &self.dark_theme }
-    }
-}
-
-impl Prefs {
-    /// Parse a settings document (migrating older layouts; unknown keys are kept, bad values
-    /// fall back to defaults).
-    pub fn from_json(text: &str) -> Prefs {
-        let v: Value = serde_json::from_str(text).unwrap_or_else(|_| json!({}));
-        let v = migrate(v);
-        let mut p: Prefs = match serde_json::from_value(v.clone()) {
-            Ok(p) => p,
-            // One bad value shouldn't lose everything: take each page that parses.
-            Err(_) => {
-                let mut base = serde_json::to_value(Prefs::default()).unwrap_or_default();
-                if let (Some(b), Some(o)) = (base.as_object_mut(), v.as_object()) {
-                    for (k, x) in o {
-                        let mut trial = b.clone();
-                        trial.insert(k.clone(), x.clone());
-                        if serde_json::from_value::<Prefs>(Value::Object(trial)).is_ok() {
-                            b.insert(k.clone(), x.clone());
-                        }
-                    }
-                }
-                serde_json::from_value(base).unwrap_or_default()
-            }
-        };
-        p.normalize();
-        p
-    }
-
-    pub fn to_json(&self) -> String {
-        serde_json::to_string_pretty(self).unwrap_or_default()
-    }
-
-    /// Clamp values into their valid ranges and fill missing labels.
-    pub fn normalize(&mut self) {
-        self.version = PREFS_VERSION;
-        self.comp_presets.retain(CompPreset::is_valid);
-        if !is_choice(WINDOW_GRAPHICS, &self.startup.window_graphics) {
-            self.startup.window_graphics = Startup::default().window_graphics;
-        }
-        let g = &mut self.general;
-        if !is_choice(LANGUAGES, &g.language) {
-            g.language = General::default().language;
-        }
-        g.undo_levels = g.undo_levels.clamp(1, 99);
-        g.path_point_size = g.path_point_size.clamp(3, 20);
-        g.recent_items = g.recent_items.clamp(1, 30);
-        let a = &mut self.auto_save;
-        a.interval_minutes = a.interval_minutes.clamp(1, 240);
-        a.max_versions = a.max_versions.clamp(1, 99);
-        let ap = &mut self.appearance;
-        let mut seen = std::collections::BTreeSet::new();
-        ap.favorite_themes.retain(|id| is_choice(THEMES, id) && seen.insert(id.clone()));
-        if !is_choice(APPEARANCE_MODES, &ap.appearance_mode) {
-            ap.appearance_mode = Appearance::default().appearance_mode;
-        }
-        if !is_choice(DARK_THEMES, &ap.dark_theme) {
-            ap.dark_theme = Appearance::default().dark_theme;
-        }
-        if !is_choice(LIGHT_THEMES, &ap.light_theme) {
-            ap.light_theme = Appearance::default().light_theme;
-        }
-        // The legacy single theme mirrors the theme a fixed mode shows (Auto depends on the
-        // system, so it keeps the last one).
-        match ap.appearance_mode.as_str() {
-            "dark" => ap.theme = ap.dark_theme.clone(),
-            "light" => ap.theme = ap.light_theme.clone(),
-            _ if !is_choice(THEMES, &ap.theme) => ap.theme = ap.dark_theme.clone(),
-            _ => {}
-        }
-        self.appearance.brightness = self.appearance.brightness.clamp(-1.0, 1.0);
-        self.appearance.ui_scale = self.appearance.ui_scale.clamp(75, 200);
-        let defaults = default_labels();
-        self.labels.truncate(defaults.len());
-        for d in defaults.iter().skip(self.labels.len()) {
-            self.labels.push(d.clone());
-        }
-        for (l, d) in self.labels.iter_mut().zip(&defaults) {
-            if parse_hex(&l.color).is_none() {
-                l.color = d.color.clone();
-            }
-        }
-        let m = &mut self.memory;
-        m.layer_cache_mb = m.layer_cache_mb.clamp(64, 1 << 20);
-        m.media_cache_mb = m.media_cache_mb.clamp(64, 1 << 20);
-        m.preview_cache_mb = m.preview_cache_mb.clamp(64, 1 << 20);
-        self.grids.grid_spacing = self.grids.grid_spacing.clamp(1.0, 10_000.0);
-        let n = self.general.recent_items as usize;
-        self.recent_projects.truncate(n);
-    }
-
-    /// The value at a dotted key (`general.undoLevels`, `labels.3.color`); `""` = everything.
-    pub fn get(&self, key: &str) -> Option<Value> {
-        let v = serde_json::to_value(self).ok()?;
-        if key.is_empty() {
-            return Some(v);
-        }
-        let ptr = format!("/{}", key.replace('.', "/"));
-        v.pointer(&ptr).cloned()
-    }
-
-    /// Set the value at a dotted key. The key must exist and the value must have its type.
-    pub fn set(&mut self, key: &str, value: Value) -> Result<(), String> {
-        if let Some(c) = choices(key)
-            && !value.as_str().is_some_and(|v| is_choice(c, v))
-        {
-            let all: Vec<&str> = c.iter().map(|(_, v)| *v).collect();
-            return Err(format!("`{key}` expects one of {}", all.join(", ")));
-        }
-        let favorites = if key == "appearance.favoriteThemes" {
-            Some(&value)
-        } else if key == "appearance" {
-            value.get("favoriteThemes")
-        } else {
-            None
-        };
-        if let Some(favorites) = favorites {
-            let values = favorites.as_array().ok_or("favorite themes must be a list")?;
-            let mut seen = std::collections::BTreeSet::new();
-            for value in values {
-                let id = value.as_str().ok_or("favorite theme must be a string")?;
-                if !is_choice(THEMES, id) || !seen.insert(id) {
-                    return Err("unknown or duplicate favorite theme".into());
-                }
-            }
-        }
-        // Older clients set the single theme (by key, or inside the page object): it still picks
-        // a visible theme, fixing the mode to its family.
-        let legacy_theme = key == "appearance.theme" || (key == "appearance" && value.get("theme").is_some() && value.get("appearanceMode").is_none());
-        let mut v = serde_json::to_value(&*self).map_err(|e| e.to_string())?;
-        let ptr = format!("/{}", key.replace('.', "/"));
-        let slot = v.pointer_mut(&ptr).ok_or_else(|| format!("unknown setting `{key}`"))?;
-        let value = coerce(slot, value).ok_or_else(|| format!("`{key}` expects a {}", kind_name(slot)))?;
-        *slot = value;
-        let mut next: Prefs = serde_json::from_value(v).map_err(|e| format!("`{key}`: {e}"))?;
-        let (a, b) = (&self.appearance, &next.appearance);
-        let only_theme_changed = a.theme != b.theme && a.appearance_mode == b.appearance_mode && a.dark_theme == b.dark_theme && a.light_theme == b.light_theme;
-        if legacy_theme || only_theme_changed {
-            next.appearance.select_theme();
-        }
-        next.normalize();
-        *self = next;
-        Ok(())
-    }
-
-    /// Reset one page (`general`, `labels`, `autoSave`…) or everything (`None`). Open Recent and
-    /// the saved composition presets are kept.
-    pub fn reset(&mut self, page: Option<&str>) -> Result<(), String> {
-        let d = Prefs::default();
-        let Some(page) = page else {
-            *self = Prefs {
-                recent_projects: std::mem::take(&mut self.recent_projects),
-                recent_footage: std::mem::take(&mut self.recent_footage),
-                recent_presets: std::mem::take(&mut self.recent_presets),
-                recent_fonts: std::mem::take(&mut self.recent_fonts),
-                preview: std::mem::take(&mut self.preview),
-                comp_presets: std::mem::take(&mut self.comp_presets),
-                ..d
-            };
-            return Ok(());
-        };
-        let keys: Vec<&str> = match page {
-            "project" => vec!["project", "autoSave"],
-            p => vec![section_key(p).ok_or_else(|| format!("unknown settings page `{p}`"))?],
-        };
-        let dv = serde_json::to_value(&d).map_err(|e| e.to_string())?;
-        for k in keys {
-            if let Some(x) = dv.get(k) {
-                self.set(k, x.clone())?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Display name of a label (Labels settings).
-    pub fn label_name(&self, l: Label) -> String {
-        match label_index(l) {
-            Some(i) => self.labels.get(i).map(|p| p.name.clone()).unwrap_or_else(|| l.name().to_string()),
-            None => l.name().to_string(),
-        }
-    }
-
-    /// sRGB colour of a label (Labels settings).
-    pub fn label_rgb(&self, l: Label) -> [u8; 3] {
-        label_index(l).and_then(|i| self.labels.get(i)).and_then(|p| parse_hex(&p.color)).unwrap_or(l.rgb())
-    }
-
-    /// A label by its built-in name or its (renamed) display name.
-    pub fn label_from_name(&self, s: &str) -> Option<Label> {
-        Label::from_name(s).or_else(|| Label::ALL.iter().skip(1).copied().find(|l| self.label_name(*l).eq_ignore_ascii_case(s)))
-    }
-
-    /// Remember a project in File ▸ Open Recent.
-    pub fn push_recent(&mut self, path: &str) {
-        self.recent_projects.retain(|p| p != path);
-        self.recent_projects.insert(0, path.to_string());
-        self.recent_projects.truncate(self.general.recent_items as usize);
-    }
-
-    /// Layer / media / preview cache budgets in bytes.
-    pub fn layer_cache_bytes(&self) -> usize {
-        (self.memory.layer_cache_mb as usize) << 20
-    }
-    pub fn media_cache_bytes(&self) -> usize {
-        (self.memory.media_cache_mb as usize) << 20
-    }
-    pub fn preview_cache_bytes(&self) -> usize {
-        (self.memory.preview_cache_mb as usize) << 20
-    }
-
-    /// The adaptive resolution limit as a render-scale floor (1/2 → 0.5).
-    pub fn adaptive_limit(&self) -> f64 {
-        match self.previews.adaptive_resolution_limit.as_str() {
-            "1/2" => 0.5,
-            "1/4" => 0.25,
-            _ => 0.125,
-        }
-    }
-
-    /// The Memory & CPU cache budgets in effect: the configured layer / footage / preview
-    /// budgets, scaled down so together they leave **RAM Reserved for Other Applications** free,
-    /// and halved while the system is low on memory when **Reduce Cache Size When System Is Low
-    /// on Memory** is on. `mem` = the system's memory (`None` = unknown: configured budgets).
-    /// In the browser the layer and footage caches also stay within [`WEB_LAYER_CACHE`] and
-    /// [`WEB_MEDIA_CACHE`].
-    pub fn cache_budgets(&self, mem: Option<crate::sysinfo::SysMemory>) -> CacheBudgets {
-        self.cache_budgets_in(mem, cfg!(target_arch = "wasm32"))
-    }
-
-    /// [`Prefs::cache_budgets`], in the browser's memory (`web`) or not.
-    pub(crate) fn cache_budgets_in(&self, mem: Option<crate::sysinfo::SysMemory>, web: bool) -> CacheBudgets {
-        let (mut l, mut m, mut p) = (self.layer_cache_bytes() as u64, self.media_cache_bytes() as u64, self.preview_cache_bytes() as u64);
-        if web {
-            (l, m) = (l.min(WEB_LAYER_CACHE), m.min(WEB_MEDIA_CACHE));
-        }
-        let floor = 64u64 << 20;
-        let mut capped = false;
-        let mut reduced = false;
-        if let Some(mem) = mem.filter(|m| m.total > 0) {
-            let reserved = (self.memory.ram_reserved_gb as u64) << 30;
-            let cap = mem.total.saturating_sub(reserved).max(3 * floor);
-            let sum = l + m + p;
-            if sum > cap {
-                let k = cap as f64 / sum as f64;
-                (l, m, p) = ((l as f64 * k) as u64, (m as f64 * k) as u64, (p as f64 * k) as u64);
-                capped = true;
-            }
-            if self.memory.reduce_cache_when_low && mem.is_low() {
-                (l, m, p) = (l / 2, m / 2, p / 2);
-                reduced = true;
-            }
-        }
-        CacheBudgets { layer: l.max(floor) as usize, media: m.max(floor) as usize, preview: p.max(floor) as usize, capped, reduced }
-    }
-
-    /// Composition ▸ Motion Path: the layer-time span of a motion path to draw around `now`
-    /// (layer time), for keyframes at `keys` (sorted). `None` = No Motion Path.
-    pub fn motion_path_span(&self, keys: &[Tick], now: Tick) -> Option<(Tick, Tick)> {
-        let (first, last) = (*keys.first()?, *keys.last()?);
-        let c = &self.composition;
-        match c.motion_path.as_str() {
-            "none" => None,
-            "seconds" => {
-                let half = Tick::from_seconds_f64(c.motion_path_seconds.max(0.0) / 2.0);
-                let (a, b) = ((now - half).max(first), (now + half).min(last));
-                (a < b).then_some((a, b))
-            }
-            "keyframes" => {
-                let n = (c.motion_path_keyframes.max(1) as usize).min(keys.len());
-                if n < 2 {
-                    return None;
-                }
-                // The n keyframes centred on the current time.
-                let at = keys.partition_point(|k| *k < now);
-                let start = at.saturating_sub(n / 2).min(keys.len() - n);
-                Some((keys[start], keys[start + n - 1]))
-            }
-            _ => Some((first, last)),
-        }
-    }
-
-    /// Previews ▸ Viewer Zoom Quality: smooth (bilinear) scaling of the viewer image, or nearest
-    /// neighbour ("Faster").
-    pub fn viewer_zoom_smooth(&self) -> bool {
-        self.previews.zoom_quality != "faster"
-    }
-
-    /// Import ▸ Interpret Unlabeled Alpha As, for footage whose file has an alpha channel that
-    /// doesn't state how it is stored. `None` = Ask User (keep straight and open Interpret
-    /// Footage); `guess` takes premultiplied for movies (codecs with alpha are usually written
-    /// premultiplied) and straight for stills.
-    pub fn unlabeled_alpha(&self, movie: bool) -> Option<effectcraft_project::AlphaMode> {
-        use effectcraft_project::AlphaMode::*;
-        Some(match self.import.unlabeled_alpha.as_str() {
-            "ignore" => Ignore,
-            "straight" => Straight,
-            "premultiplied" => Premultiplied,
-            "guess" if movie => Premultiplied,
-            "guess" => Straight,
-            _ => return None,
-        })
-    }
-
-    /// Import ▸ Default Drag Import As, as `file.import`'s `importAs`.
-    pub fn drag_import_as(&self) -> &'static str {
-        match self.import.drag_import_as.as_str() {
-            "comp" => "composition",
-            "compLayerSizes" => "compositionLayerSizes",
-            _ => "footage",
-        }
-    }
-
-    /// Export ▸ Append Bit Depth to File Name: `Comp 1.png` → `Comp 1_16bpc.png` (sequence frame
-    /// runs and folders are kept).
-    pub fn output_name(&self, path: &str, bits: u32) -> String {
-        if !self.export.append_bits_to_name {
-            return path.to_string();
-        }
-        let p = std::path::Path::new(path);
-        let (Some(stem), dir) = (p.file_stem().map(|s| s.to_string_lossy().to_string()), p.parent()) else { return path.to_string() };
-        let tag = format!("_{bits}bpc");
-        if stem.ends_with(&tag) {
-            return path.to_string();
-        }
-        let name = match p.extension() {
-            Some(e) => format!("{stem}{tag}.{}", e.to_string_lossy()),
-            None => format!("{stem}{tag}"),
-        };
-        match dir.filter(|d| !d.as_os_str().is_empty()) {
-            Some(d) => d.join(name).to_string_lossy().to_string(),
-            None => name,
-        }
-    }
-
-    /// Export ▸ Segment Sequences / Segment Movie Files: how many frames go in each segment of an
-    /// output of `frames` frames (`None` = one file / folder). Sequences split every Files per
-    /// Segment frames; movies every Segment Size MB at the output's data rate
-    /// (`bytes_per_frame`, estimated from the format's bitrate).
-    pub fn segment_frames(&self, frames: u64, sequence: bool, bytes_per_frame: f64) -> Option<u64> {
-        let e = &self.export;
-        let per = if sequence {
-            e.segment_sequences.then_some(e.segment_sequence_files.max(1) as u64)?
-        } else {
-            if !e.segment_movies || bytes_per_frame <= 0.0 {
-                return None;
-            }
-            (((e.segment_movie_mb.max(1) as f64) * 1_048_576.0 / bytes_per_frame).floor() as u64).max(1)
-        };
-        (per < frames).then_some(per)
-    }
-
-    /// Remember a font in the Character panel's recent fonts (Type ▸ Number of Recent Fonts).
-    pub fn push_recent_font(&mut self, family: &str) {
-        push_mru(&mut self.recent_fonts, family, 30);
-    }
-
-    /// The recent fonts the Character panel shows (at most Number of Recent Fonts to Display).
-    pub fn recent_fonts_shown(&self) -> &[String] {
-        let n = (self.type_.recent_fonts as usize).min(self.recent_fonts.len());
-        &self.recent_fonts[..n]
-    }
-
-    /// Remember imported footage for File ▸ Import Recent Footage.
-    pub fn push_recent_footage(&mut self, path: &str) {
-        push_mru(&mut self.recent_footage, path, self.general.recent_items as usize);
-    }
-
-    /// Remember an applied animation preset for Animation ▸ Recent Animation Presets.
-    pub fn push_recent_preset(&mut self, path: &str) {
-        push_mru(&mut self.recent_presets, path, self.general.recent_items as usize);
-    }
-}
-
-fn push_mru(list: &mut Vec<String>, v: &str, max: usize) {
-    list.retain(|x| x != v);
-    list.insert(0, v.to_string());
-    list.truncate(max.max(1));
-}
-
-/// The most the layer cache holds in the browser. A wasm32 page addresses at most 4 GiB, which
-/// these caches share with the app and with the decoders' own decoded frames (FilmCraft keeps
-/// up to 384 MB per open movie): with the desktop's 1 GB defaults, eight stacked 1080p clips ran
-/// the page out of memory a few seconds into playback.
-pub const WEB_LAYER_CACHE: u64 = 512 << 20;
-
-/// The most the footage frame cache holds in the browser (see [`WEB_LAYER_CACHE`]).
-pub const WEB_MEDIA_CACHE: u64 = 256 << 20;
-
-/// Effective cache budgets in bytes (see [`Prefs::cache_budgets`]).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
-pub struct CacheBudgets {
-    pub layer: usize,
-    pub media: usize,
-    pub preview: usize,
-    /// Scaled down to leave the reserved RAM free.
-    pub capped: bool,
-    /// Halved because the system is low on memory.
-    pub reduced: bool,
-}
-
-/// Colour of the `k`-th mask of a layer: Appearance ▸ Cycle Mask Colors cycles through the mask
-/// colours, otherwise every new mask takes the first one.
-pub fn mask_color(cycle: bool, k: usize) -> [u8; 3] {
-    use effectcraft_project::build::MASK_COLORS;
-    if cycle { MASK_COLORS[k % MASK_COLORS.len()] } else { MASK_COLORS[0] }
-}
-
-fn label_index(l: Label) -> Option<usize> {
-    Label::ALL.iter().position(|x| *x == l).and_then(|i| i.checked_sub(1))
-}
-
-/// Settings key of a page id (`3d` → `threeD`).
-pub fn section_key(page: &str) -> Option<&'static str> {
-    Some(match page {
-        "general" => "general",
-        "startup" => "startup",
-        "project" => "project",
-        "autoSave" | "autosave" => "autoSave",
-        "composition" | "display" => "composition",
-        "previews" => "previews",
-        "appearance" => "appearance",
-        "grids" => "grids",
-        "labels" => "labels",
-        "type" => "type",
-        "import" => "import",
-        "export" => "export",
-        "audio" => "audio",
-        "disk" => "disk",
-        "memory" => "memory",
-        "video" => "video",
-        "3d" | "threeD" => "threeD",
-        "scripting" => "scripting",
-        "roto" => "roto",
-        "face" => "face",
-        _ => return None,
-    })
-}
-
-/// Settings page id for a page name, including older After Effects page names
-/// (Auto-Save → Project, Media & Disk Cache → Disk, Memory & Performance → Memory & CPU…).
-pub fn page_id(name: &str) -> Option<&'static str> {
-    let n = name.to_ascii_lowercase().replace([' ', '&', '-', '_'], "");
-    let id = match n.as_str() {
-        "general" => "general",
-        "startup" | "startuprepair" => "startup",
-        "project" | "autosave" | "newproject" => "project",
-        "composition" | "display" => "composition",
-        "previews" | "preview" => "previews",
-        "appearance" => "appearance",
-        "grids" | "gridsguides" => "grids",
-        "labels" => "labels",
-        "type" => "type",
-        "import" => "import",
-        "export" | "output" => "export",
-        "audio" | "audiohardware" | "audiooutputmapping" => "audio",
-        "disk" | "mediadiskcache" | "mediacache" => "disk",
-        "memory" | "memorycpu" | "memoryperformance" => "memory",
-        "video" | "videopreview" => "video",
-        "3d" | "threed" => "3d",
-        "scripting" | "scriptingexpressions" => "scripting",
-        "roto" | "rotobrush" | "models" => "roto",
-        "face" | "facetracking" => "face",
-        _ => return None,
-    };
-    Some(id)
-}
-
-fn kind_name(v: &Value) -> &'static str {
-    match v {
-        Value::Bool(_) => "boolean",
-        Value::Number(_) => "number",
-        Value::String(_) => "string",
-        Value::Array(_) => "list",
-        Value::Object(_) => "object",
-        Value::Null => "value",
-    }
-}
-
-/// `value` converted to the type of `slot` (numbers from strings, booleans from 0/1…).
-fn coerce(slot: &Value, value: Value) -> Option<Value> {
-    Some(match (slot, value) {
-        (Value::Bool(_), Value::Bool(b)) => json!(b),
-        (Value::Bool(_), Value::Number(n)) => json!(n.as_f64()? != 0.0),
-        (Value::Bool(_), Value::String(s)) => json!(matches!(s.as_str(), "true" | "on" | "1" | "yes")),
-        (Value::Number(cur), v) => {
-            let f = match &v {
-                Value::Number(n) => n.as_f64()?,
-                Value::String(s) => s.trim().parse().ok()?,
-                _ => return None,
-            };
-            if cur.is_u64() || cur.is_i64() { json!(f.round().max(0.0) as u64) } else { json!(f) }
-        }
-        (Value::String(_), Value::String(s)) => json!(s),
-        (Value::String(_), Value::Number(n)) => json!(n.to_string()),
-        (Value::Array(_), v @ Value::Array(_)) => v,
-        (Value::Object(_), v @ Value::Object(_)) => v,
-        _ => return None,
-    })
-}
-
-// ---------------------------------------------------------------- schema (Settings dialog)
-
-/// What a setting row edits.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Kind {
-    Bool,
-    /// Integer with range and unit.
-    Int(i64, i64, &'static str),
-    /// Number with range and unit.
-    Float(f64, f64, &'static str),
-    /// One of (label, value).
-    Choice(&'static [(&'static str, &'static str)]),
-    Text,
-    /// A folder or file path (text + Choose…).
-    Path,
-    /// `#rrggbb`.
-    Color,
-    /// UI brightness slider.
-    Slider(f64, f64),
-}
-
-/// One row of a settings page.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Item {
-    Section(&'static str),
-    Setting {
-        key: &'static str,
-        label: &'static str,
-        kind: Kind,
-        /// Changes behaviour today (false = shown for parity, listed in docs/preferences.md).
-        live: bool,
-    },
-    /// A button running a command (`params` is JSON).
-    Button {
-        label: &'static str,
-        command: &'static str,
-        params: &'static str,
-    },
-    /// The 16 label names and colours.
-    Labels,
-    /// Output device picker (device list from the host).
-    AudioDevices {
-        key: &'static str,
-    },
-    /// Read-only information line.
-    Note(&'static str),
-    /// The browser's storage manager (web app only, `storage.*`): usage and quota, persistent
-    /// storage, Clear buttons. Not shown where there is no browser storage.
-    BrowserStorage,
-    /// A task's trained models (`roto.models`, `face.models`): authors, licence, size, install,
-    /// choose.
-    Models(effectcraft_segment::Task),
-}
-
-/// One page of the Settings dialog.
-#[derive(Clone, Debug)]
-pub struct Page {
-    pub id: &'static str,
-    pub title: &'static str,
-    pub items: Vec<Item>,
-}
-
-const fn s(key: &'static str, label: &'static str, kind: Kind, live: bool) -> Item {
-    Item::Setting { key, label, kind, live }
-}
-
-const B: Kind = Kind::Bool;
-const ON_OFF_RES: &[(&str, &str)] = &[("1/2", "1/2"), ("1/4", "1/4"), ("1/8", "1/8")];
-const STYLES: &[(&str, &str)] = &[("Lines", "lines"), ("Dashed Lines", "dashed"), ("Dots", "dots")];
-
-/// The Settings pages in After Effects 2026 order.
-pub fn pages() -> Vec<Page> {
-    use Item::*;
-    vec![
-        Page {
-            id: "general",
-            title: "General",
-            items: vec![
-                s("general.language", "Language", Kind::Choice(LANGUAGES), true),
-                s("general.undoLevels", "Levels of Undo", Kind::Int(1, 99, ""), true),
-                s("general.pathPointSize", "Path Point and Handle Size", Kind::Int(3, 20, "px"), true),
-                s("general.recentItems", "Recent Projects Shown", Kind::Int(1, 30, ""), true),
-                Section("Options"),
-                s("general.showToolTips", "Show Tool Tips", B, true),
-                s("general.createLayersAtCompStart", "Create Layers at Composition Start Time", B, true),
-                s("general.switchesAffectNestedComps", "Switches Affect Nested Comps", B, true),
-                s("general.defaultSpatialLinear", "Default Spatial Interpolation to Linear", B, true),
-                s("general.preserveConstantVertexCount", "Preserve Constant Vertex and Feather Point Count when Editing Masks", B, true),
-                s("general.syncTimeRelatedItems", "Synchronize Time of All Related Items", B, true),
-                s("general.expressionPickWhipCompact", "Expression Pick Whip Writes Compact English", B, true),
-                s("general.createSplitLayersAbove", "Create Split Layers Above Original Layer", B, true),
-                s("general.useSystemColorPicker", "Use System Color Picker", B, false),
-                Note("EffectCraft always uses its own colour picker (the same on every platform and the web)."),
-            ],
-        },
-        Page {
-            id: "startup",
-            title: "Startup & Repair",
-            items: vec![
-                s("startup.showHomeOnLaunch", "Show Home Screen When Launching", B, true),
-                s("startup.showHomeOnOpenProject", "Show Home Screen When Opening a Project", B, true),
-                s("startup.offerCrashRecovery", "Offer to Open the Latest Auto-Save After a Crash", B, true),
-                s("startup.windowGraphics", "Window Graphics", Kind::Choice(WINDOW_GRAPHICS), true),
-                Note(
-                    "Window Graphics applies from the next launch. When the graphics driver stops EffectCraft as its window opens, the next launch switches to OpenGL.",
-                ),
-                Section("Repair"),
-                Button { label: "Reset Settings", command: "prefs.reset", params: "{}" },
-                Button { label: "Reset Keyboard Shortcuts", command: "shortcuts.reset", params: "{}" },
-                Button { label: "Empty Disk Cache", command: "edit.purge", params: r#"{"what":"disk"}"# },
-            ],
-        },
-        Page {
-            id: "project",
-            title: "Project",
-            items: vec![
-                Section("New Project"),
-                s("project.useTemplate", "New Project Loads Template", B, true),
-                s("project.templatePath", "Template Project", Kind::Path, true),
-                Section("Auto-Save"),
-                s("autoSave.enabled", "Automatically Save Projects", B, true),
-                s("autoSave.intervalMinutes", "Save Every", Kind::Int(1, 240, "Minutes"), true),
-                s("autoSave.maxVersions", "Maximum Project Versions", Kind::Int(1, 99, ""), true),
-                s("autoSave.location", "Auto-Save Location", Kind::Choice(&[("Next to Project", "nextToProject"), ("Custom Location", "custom")]), true),
-                s("autoSave.folder", "Custom Location", Kind::Path, true),
-                s("autoSave.saveOnRenderStart", "Save When Starting Render Queue", B, true),
-                Button { label: "Save Now", command: "file.autoSave", params: "{}" },
-            ],
-        },
-        Page {
-            id: "composition",
-            title: "Composition",
-            items: vec![
-                Section("Motion Path"),
-                s(
-                    "composition.motionPath",
-                    "Motion Path",
-                    Kind::Choice(&[
-                        ("All Keyframes", "all"),
-                        ("No Motion Path", "none"),
-                        ("No More Than (Seconds)", "seconds"),
-                        ("No More Than (Keyframes)", "keyframes"),
-                    ]),
-                    true,
-                ),
-                s("composition.motionPathSeconds", "Seconds", Kind::Float(0.0, 3600.0, "s"), true),
-                s("composition.motionPathKeyframes", "Keyframes", Kind::Int(1, 10_000, ""), true),
-                Section("Display"),
-                s("composition.showRenderingProgress", "Show Rendering Progress in Info Panel and Flowchart", B, true),
-                s("composition.hardwareAcceleratePanels", "Hardware Accelerate Composition, Layer and Footage Panels", B, false),
-                Note("Panels are always drawn by the GPU (wgpu)."),
-            ],
-        },
-        Page {
-            id: "previews",
-            title: "Previews",
-            items: vec![
-                s("previews.adaptiveResolutionLimit", "Adaptive Resolution Limit", Kind::Choice(ON_OFF_RES), true),
-                s("previews.showInternalWireframes", "Show Internal Wireframes", B, true),
-                s("previews.cacheFramesWhenIdle", "Cache Frames When Idle", B, true),
-                s("previews.fastPreviews", "Fast Previews (Draft 3D, Faster Effects)", B, true),
-                s("previews.zoomQuality", "Viewer Zoom Quality", Kind::Choice(&[("Faster", "faster"), ("More Accurate", "moreAccurate")]), true),
-                s("previews.displayProfile", "Display Color Space", Kind::Choice(&[("sRGB", "srgb"), ("Display P3", "p3")]), true),
-                Button { label: "GPU Information...", command: "app.gpuInfo", params: "{}" },
-            ],
-        },
-        Page {
-            id: "appearance",
-            title: "Appearance",
-            items: vec![
-                s("appearance.appearanceMode", "Appearance Mode", Kind::Choice(APPEARANCE_MODES), true),
-                s("appearance.lightTheme", "Light Theme", Kind::Choice(LIGHT_THEMES), true),
-                s("appearance.darkTheme", "Dark Theme", Kind::Choice(DARK_THEMES), true),
-                s("appearance.brightness", "Brightness", Kind::Slider(-1.0, 1.0), true),
-                s("appearance.uiScale", "UI Scale", Kind::Int(75, 200, "%"), true),
-                Section("Labels and Colors"),
-                s("appearance.useLabelColorForHandles", "Use Label Color for Layer Handles and Paths", B, true),
-                s("appearance.useLabelColorForTabs", "Use Label Color for Related Tabs", B, true),
-                s("appearance.cycleMaskColors", "Cycle Mask Colors", B, true),
-                s("appearance.useGradients", "Use Gradients", B, true),
-                Section("Menu Bar"),
-                s("appearance.inWindowMenuBarMac", "Use In-Window Menu Bar on macOS", B, true),
-            ],
-        },
-        Page {
-            id: "grids",
-            title: "Grids & Guides",
-            items: vec![
-                Section("Grid"),
-                s("grids.gridColor", "Color", Kind::Color, true),
-                s("grids.gridSpacing", "Gridline Every", Kind::Float(1.0, 10_000.0, "px"), true),
-                s("grids.gridSubdivisions", "Subdivisions", Kind::Int(1, 100, ""), true),
-                s("grids.gridStyle", "Style", Kind::Choice(STYLES), true),
-                Section("Proportional Grid"),
-                s("grids.proportionalHorizontal", "Horizontal", Kind::Int(1, 100, ""), true),
-                s("grids.proportionalVertical", "Vertical", Kind::Int(1, 100, ""), true),
-                Section("Guides"),
-                s("grids.guideColor", "Color", Kind::Color, true),
-                s("grids.guideStyle", "Style", Kind::Choice(STYLES), true),
-                Section("Safe Margins"),
-                s("grids.actionSafe", "Action-safe", Kind::Float(0.0, 50.0, "%"), true),
-                s("grids.titleSafe", "Title-safe", Kind::Float(0.0, 50.0, "%"), true),
-            ],
-        },
-        Page { id: "labels", title: "Labels", items: vec![Labels] },
-        Page {
-            id: "type",
-            title: "Type",
-            items: vec![
-                s("type.textEngine", "Text Engine", Kind::Choice(&[("Latin", "latin"), ("South Asian and Middle Eastern", "southAsian")]), true),
-                s("type.fontPreview", "Show Font Preview", B, true),
-                s("type.recentFonts", "Number of Recent Fonts to Display", Kind::Int(0, 30, ""), true),
-                s("type.fontNamesInEnglish", "Show Font Names in English", B, true),
-            ],
-        },
-        Page {
-            id: "import",
-            title: "Import",
-            items: vec![
-                s("import.stillFootage", "Still Footage", Kind::Choice(&[("Length of Composition", "compLength"), ("Duration (Seconds)", "seconds")]), true),
-                s("import.stillSeconds", "Still Duration", Kind::Float(0.04, 86_400.0, "s"), true),
-                s("import.sequenceFps", "Sequence Footage", Kind::Float(1.0, 999.0, "frames per second"), true),
-                s("import.reportMissingFrames", "Report Missing Frames", B, true),
-                s(
-                    "import.autoReloadFootage",
-                    "Automatically Reload Footage",
-                    Kind::Choice(&[("Off", "off"), ("Non-Sequence Footage", "nonSequence"), ("All Footage", "all")]),
-                    true,
-                ),
-                s(
-                    "import.unlabeledAlpha",
-                    "Interpret Unlabeled Alpha As",
-                    Kind::Choice(&[
-                        ("Ask User", "ask"),
-                        ("Guess", "guess"),
-                        ("Ignore", "ignore"),
-                        ("Straight", "straight"),
-                        ("Premultiplied", "premultiplied"),
-                    ]),
-                    true,
-                ),
-                s(
-                    "import.dragImportAs",
-                    "Default Drag Import As",
-                    Kind::Choice(&[("Footage", "footage"), ("Composition", "comp"), ("Composition - Retain Layer Sizes", "compLayerSizes")]),
-                    true,
-                ),
-            ],
-        },
-        Page {
-            id: "export",
-            title: "Export",
-            items: vec![
-                s("export.defaultOutputFolder", "Default Output Folder", Kind::Path, true),
-                s("export.segmentSequences", "Segment Sequences", B, true),
-                s("export.segmentSequenceFiles", "Files per Segment", Kind::Int(1, 100_000, "files"), true),
-                s("export.segmentMovies", "Segment Movie Files", B, true),
-                s("export.segmentMovieMb", "Segment Size", Kind::Int(1, 1_000_000, "MB"), true),
-                s("export.appendBitsToName", "Append Bit Depth to File Name", B, true),
-            ],
-        },
-        Page {
-            id: "audio",
-            title: "Audio",
-            items: vec![
-                Section("Audio Hardware"),
-                AudioDevices { key: "audio.outputDevice" },
-                s("audio.previewSampleRate", "Preview Sample Rate", Kind::Int(8_000, 192_000, "Hz"), true),
-                Section("Audio Output Mapping"),
-                s("audio.outputLeft", "Left", Kind::Int(1, 64, "channel"), true),
-                s("audio.outputRight", "Right", Kind::Int(1, 64, "channel"), true),
-            ],
-        },
-        Page {
-            id: "disk",
-            title: "Disk",
-            items: vec![
-                Section("Disk Cache"),
-                s("disk.diskCacheEnabled", "Enable Disk Cache", B, true),
-                s("disk.diskCacheMaxGb", "Maximum Disk Cache Size", Kind::Int(1, 100_000, "GB"), true),
-                s("disk.diskCacheFolder", "Disk Cache Folder", Kind::Path, true),
-                Button { label: "Empty Disk Cache", command: "edit.purge", params: r#"{"what":"disk"}"# },
-                BrowserStorage,
-                Section("Media Cache"),
-                s("disk.mediaCacheFolder", "Database and Cache Folder", Kind::Path, true),
-                s("disk.conformedMediaFolder", "Conformed Audio Folder", Kind::Path, true),
-            ],
-        },
-        Page {
-            id: "memory",
-            title: "Memory & CPU",
-            items: vec![
-                s("memory.ramReservedGb", "RAM Reserved for Other Applications", Kind::Int(0, 1024, "GB"), true),
-                Section("Cache Budgets"),
-                s("memory.layerCacheMb", "Layer Cache", Kind::Int(64, 1 << 20, "MB"), true),
-                s("memory.mediaCacheMb", "Footage Frame Cache", Kind::Int(64, 1 << 20, "MB"), true),
-                s("memory.previewCacheMb", "Preview (RAM) Cache", Kind::Int(64, 1 << 20, "MB"), true),
-                s("memory.reduceCacheWhenLow", "Reduce Cache Size When System Is Low on Memory", B, true),
-            ],
-        },
-        Page {
-            id: "video",
-            title: "Video",
-            items: vec![
-                s("video.enableOutput", "Enable Video Preview Output", B, true),
-                s("video.device", "Video Device", Kind::Choice(&[("Floating Window", ""), ("Full Screen", "fullscreen")]), true),
-                s("video.outputDuringPlayback", "Video Output During Playback", B, true),
-                s("video.mirrorOnMonitor", "Mirror on Computer Monitor", B, true),
-                s("video.disableWhenBackground", "Disable Video Output When in Background", B, true),
-            ],
-        },
-        Page {
-            id: "3d",
-            title: "3D",
-            items: vec![
-                s("threeD.defaultRenderer", "Default 3D Renderer", Kind::Choice(&[("Classic 3D", "classic"), ("Advanced 3D", "advanced")]), true),
-                s("threeD.showReferenceAxes", "Show 3D Reference Axes", B, true),
-                s("threeD.extendedViewer", "Extended Viewer", B, true),
-                s("threeD.realtimeShadows", "Realtime Shadows in Draft", B, true),
-            ],
-        },
-        Page {
-            id: "scripting",
-            title: "Scripting & Expressions",
-            items: vec![
-                Section("Application Scripting"),
-                s("scripting.allowScriptsWriteFiles", "Allow Scripts to Write Files and Access Network", B, true),
-                s("scripting.warnExecutingFiles", "Warn User When Executing Files", B, true),
-                s("scripting.enableJsDebugger", "Enable JavaScript Debugger", B, false),
-                Section("Expressions Editor"),
-                s("scripting.editorFontSize", "Font Size", Kind::Int(8, 40, "pt"), true),
-                s("scripting.syntaxHighlighting", "Syntax Highlighting", B, true),
-                s("scripting.lineNumbers", "Line Numbers", B, true),
-                s("scripting.autoComplete", "Auto-complete", B, true),
-                s("scripting.bracketMatching", "Bracket Matching", B, true),
-                s("scripting.wordWrap", "Word Wrap", B, true),
-                s("scripting.errorBanner", "Show Expression Error Banner", B, true),
-                Note("Expressions use the JavaScript engine. Script errors report their file and line in the Script Console; there is no step debugger."),
-            ],
-        },
-        Page {
-            id: "roto",
-            title: "Roto Brush",
-            items: vec![
-                Section("Segmentation Model"),
-                Note(
-                    "Roto Brush 2.0 and 3.0 use the model chosen here (Version 1.0 always uses the classic engine). Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
-                ),
-                Models(effectcraft_segment::Task::Mask),
-            ],
-        },
-        Page {
-            id: "face",
-            title: "Face Tracking",
-            items: vec![
-                Section("Face Model"),
-                Note(
-                    "Face tracking in the Tracker panel (Outline Only and Detailed Features) uses the model chosen here. Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
-                ),
-                Models(effectcraft_segment::Task::Face),
-            ],
-        },
-    ]
-}
-
-/// Keys of every setting that doesn't change behaviour yet (the TODO list in
-/// `docs/preferences.md`).
-pub fn todo_keys() -> Vec<&'static str> {
-    pages()
-        .into_iter()
-        .flat_map(|p| p.items)
-        .filter_map(|i| match i {
-            Item::Setting { key, live: false, .. } => Some(key),
-            _ => None,
-        })
-        .collect()
-}
-
-/// The schema as JSON (for `prefs.pages`).
-pub fn pages_json() -> Value {
-    let kind = |k: &Kind| -> Value {
-        match k {
-            Kind::Bool => json!({"type": "bool"}),
-            Kind::Int(a, b, u) => json!({"type": "int", "min": a, "max": b, "unit": u}),
-            Kind::Float(a, b, u) => json!({"type": "number", "min": a, "max": b, "unit": u}),
-            Kind::Choice(o) => json!({"type": "choice", "options": o.iter().map(|(l, v)| json!({"label": l, "value": v})).collect::<Vec<_>>()}),
-            Kind::Text => json!({"type": "text"}),
-            Kind::Path => json!({"type": "path"}),
-            Kind::Color => json!({"type": "color"}),
-            Kind::Slider(a, b) => json!({"type": "slider", "min": a, "max": b}),
-        }
-    };
-    let pages: Vec<Value> = pages()
-        .iter()
-        .map(|p| {
-            let items: Vec<Value> = p
-                .items
-                .iter()
-                .map(|i| match i {
-                    Item::Section(t) => json!({"section": t}),
-                    Item::Setting { key, label, kind: k, live } => {
-                        let mut o = kind(k);
-                        o["key"] = json!(key);
-                        o["label"] = json!(label);
-                        o["live"] = json!(live);
-                        o
-                    }
-                    Item::Button { label, command, params } => {
-                        json!({"button": label, "command": command, "params": serde_json::from_str::<Value>(params).unwrap_or_default()})
-                    }
-                    Item::Labels => json!({"labels": "labels.N.name / labels.N.color (N = 0..15)"}),
-                    Item::AudioDevices { key } => json!({"type": "device", "key": key, "label": "Default Output"}),
-                    Item::Note(t) => json!({"note": t}),
-                    Item::BrowserStorage => json!({"browserStorage": "storage.info / storage.persist / storage.clear (web app)"}),
-                    Item::Models(task) => {
-                        let p = if *task == effectcraft_segment::Task::Face { "face" } else { "roto" };
-                        json!({"models": format!("{p}.models / {p}.model.select / {p}.model.download / {p}.model.install / {p}.model.remove"), "key": format!("{p}.model")})
-                    }
-                })
-                .collect();
-            json!({"id": p.id, "title": p.title, "items": items})
-        })
-        .collect();
-    json!(pages)
-}
diff --git a/crates/engine/src/render_queue.rs b/crates/engine/src/render_queue.rs
index 74b333151..27e9a7dce 100644
--- a/crates/engine/src/render_queue.rs
+++ b/crates/engine/src/render_queue.rs
@@ -110,7 +110,7 @@ pub struct JobShared {
 }
 
 pub(crate) fn lock<T>(m: &Mutex<T>) -> std::sync::MutexGuard<'_, T> {
-    m.lock().unwrap_or_else(|e| e.into_inner())
+    m.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
 }
 
 impl JobShared {
diff --git a/crates/engine/src/rq_tests.rs b/crates/engine/src/rq_tests.rs
index 81a187226..4c39cc89e 100644
--- a/crates/engine/src/rq_tests.rs
+++ b/crates/engine/src/rq_tests.rs
@@ -67,11 +67,11 @@ fn add_configure_render() {
     let r = s.execute("renderQueue.setOutputModule", json!({"item": id, "format": "png", "channels": "rgba"})).unwrap();
     assert!(r["outputPath"].as_str().unwrap().ends_with("_[#####].png"), "{r}");
     assert!(s.execute("renderQueue.setOutputModule", json!({"item": id, "format": "jpeg", "channels": "rgba"})).is_err());
-    let r = s.execute("renderQueue.setOutput", json!({"item": id, "path": crate::tests_stubs::tmp_out("rq/out.mov")})).unwrap();
+    let r = s.execute("renderQueue.setOutput", json!({"item": id, "path": crate::tests::stubs::tmp_out("rq/out.mov")})).unwrap();
     assert_eq!(r["output"]["format"], "ProRes", "Output To with .mov switches to ProRes");
-    assert_eq!(std::path::Path::new(r["outputPath"].as_str().unwrap()), std::path::PathBuf::from(crate::tests_stubs::tmp_out("rq/out.mov")));
+    assert_eq!(std::path::Path::new(r["outputPath"].as_str().unwrap()), std::path::PathBuf::from(crate::tests::stubs::tmp_out("rq/out.mov")));
     // A second item that fails, a third that is unqueued.
-    let b = s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests_stubs::tmp_out("rq/fail.gif")})).unwrap();
+    let b = s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests::stubs::tmp_out("rq/fail.gif")})).unwrap();
     let c = s.execute("renderQueue.add", json!({"output": "/tmp/rq/skip.mp4"})).unwrap();
     s.execute("renderQueue.setRender", json!({"item": c["item"], "render": false})).unwrap();
     assert_eq!(s.project.render_queue[2].status.label(), "Unqueued");
@@ -79,12 +79,12 @@ fn add_configure_render() {
     assert_eq!(r["items"].as_array().unwrap().len(), 2);
     assert_eq!(
         ex.log.lock().unwrap().iter().map(std::path::PathBuf::from).collect::<Vec<_>>(),
-        [std::path::PathBuf::from(crate::tests_stubs::tmp_out("rq/out.mov")), std::path::PathBuf::from(crate::tests_stubs::tmp_out("rq/fail.gif"))]
+        [std::path::PathBuf::from(crate::tests::stubs::tmp_out("rq/out.mov")), std::path::PathBuf::from(crate::tests::stubs::tmp_out("rq/fail.gif"))]
     );
     let q = &s.project.render_queue;
     assert_eq!(q[0].status.label(), "Done");
     assert!(q[0].started.is_some() && q[0].render_time.is_some());
-    assert_eq!(std::path::Path::new(q[0].last_output.as_deref().unwrap()), std::path::PathBuf::from(crate::tests_stubs::tmp_out("rq/out.mov")));
+    assert_eq!(std::path::Path::new(q[0].last_output.as_deref().unwrap()), std::path::PathBuf::from(crate::tests::stubs::tmp_out("rq/out.mov")));
     assert_eq!(q[1].status, RenderStatus::Failed("boom".into()));
     assert_eq!(q[2].status.label(), "Unqueued");
     let events = s.drain_events();
@@ -130,8 +130,8 @@ fn failure_toast_names_the_first_reason() {
     }
     let mut s = demo();
     s.exporter = Some(Arc::new(Failing));
-    s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests_stubs::tmp_out("rq/first.gif")})).unwrap();
-    s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests_stubs::tmp_out("rq/second.gif")})).unwrap();
+    s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests::stubs::tmp_out("rq/first.gif")})).unwrap();
+    s.execute("renderQueue.add", json!({"format": "gif", "output": crate::tests::stubs::tmp_out("rq/second.gif")})).unwrap();
     s.execute("renderQueue.render", json!({})).unwrap();
     let events = s.drain_events();
     let toast = events.iter().find_map(|e| if let Event::Toast { message, error: true } = e { Some(message.as_str()) } else { None });
diff --git a/crates/engine/src/services.rs b/crates/engine/src/services.rs
new file mode 100644
index 000000000..adbd3ab81
--- /dev/null
+++ b/crates/engine/src/services.rs
@@ -0,0 +1,72 @@
+use super::config;
+
+/// Host services (file access) injected by the frontend.
+pub trait Services: Send + Sync {
+    fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>>;
+    fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()>;
+    /// Whether a file exists (the background footage check after open).
+    fn exists(&self, path: &str) -> bool {
+        std::path::Path::new(path).exists()
+    }
+    /// A file's size and modification time (nanoseconds since 1970), to notice that it changed
+    /// on disk (Settings ▸ Import ▸ Reload Footage Changed on Disk); `None` when it can't be read.
+    fn stamp(&self, path: &str) -> Option<(u64, u128)> {
+        let meta = std::fs::metadata(path).ok()?;
+        let modified = meta.modified().ok()?.duration_since(std::time::UNIX_EPOCH).ok()?;
+        Some((meta.len(), modified.as_nanos()))
+    }
+    /// Keep a file the app made for itself (footage extracted from a template): like
+    /// [`Services::write_file`], creating its folder, but never offered as a download (web: it
+    /// goes to browser storage only).
+    fn store_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
+        if let Some(d) = std::path::Path::new(path).parent().filter(|d| !d.as_os_str().is_empty()) {
+            let _ = std::fs::create_dir_all(d);
+        }
+        self.write_file(path, data)
+    }
+    /// The files in folder `dir` (full paths; no folders, no hidden files), for image-sequence
+    /// detection on import. Empty when it can't be read.
+    fn list_dir(&self, dir: &str) -> Vec<String> {
+        let Ok(rd) = std::fs::read_dir(if dir.is_empty() { "." } else { dir }) else { return vec![] };
+        rd.filter_map(|e| e.ok())
+            .filter(|e| e.file_type().is_ok_and(|t| t.is_file()) && !e.file_name().to_string_lossy().starts_with('.'))
+            .map(|e| e.path().to_string_lossy().to_string())
+            .collect()
+    }
+    /// Whether `path` is a folder (dropped or picked folders import their files).
+    fn is_dir(&self, path: &str) -> bool {
+        std::path::Path::new(path).is_dir()
+    }
+    /// `path` as a list of recent files keeps it (File ▸ Scripts ▸ Recent Script Files): a
+    /// relative path is made absolute against the working directory, so it opens the same file
+    /// after the working directory changes. `None` when the path can't be made absolute (the
+    /// working directory can't be read); the script is then not added to the list.
+    fn full_path(&self, path: &str) -> Option<String> {
+        std::path::absolute(path).ok().map(|p| p.to_string_lossy().into_owned())
+    }
+}
+
+/// Native filesystem.
+pub struct FsServices;
+
+impl Services for FsServices {
+    fn read_file(&self, path: &str) -> std::io::Result<Vec<u8>> {
+        std::fs::read(path)
+    }
+    fn write_file(&self, path: &str, data: &[u8]) -> std::io::Result<()> {
+        config::atomic_write(std::path::Path::new(path), data)
+    }
+}
+
+/// Imports media files into the project (implemented by the media layer).
+pub trait Importer: Send + Sync {
+    /// Probe one file and return footage metadata. Image sequences are the engine's
+    /// ([`sequence`]): it groups numbered stills and probes their first file here.
+    fn probe(&self, path: &str) -> std::result::Result<effectcraft_project::Footage, String>;
+    /// A footage file's bytes are now at `path` (extracted from a template): hosts whose media
+    /// layer reads from memory (the browser) register them; file-based ones need nothing.
+    fn register(&self, _path: &str, _data: &[u8]) {}
+    /// An image sequence's other frames (its first was probed) are footage now: hosts whose
+    /// media layer reads from memory (the browser) register them; file-based ones need nothing.
+    fn add_frames(&self, _paths: &[String]) {}
+}
diff --git a/crates/engine/src/session.rs b/crates/engine/src/session.rs
new file mode 100644
index 000000000..18b0ff4cf
--- /dev/null
+++ b/crates/engine/src/session.rs
@@ -0,0 +1,13 @@
+use super::doc_state::{CompSelection, EditorState};
+use super::error::{EngineError, Result};
+use super::event::Event;
+use super::{
+    Arc, Comp, History, Image, ItemId, LayerId, Project, RenderOpts, Renderer, Session, ThumbnailJob, Tick, Value, camera_track, commands, guard, roto, warp,
+};
+
+mod comps;
+mod dispatch;
+mod edit;
+mod render;
+
+pub use edit::upgrade_effects;
diff --git a/crates/engine/src/session/comps.rs b/crates/engine/src/session/comps.rs
new file mode 100644
index 000000000..ed3810e79
--- /dev/null
+++ b/crates/engine/src/session/comps.rs
@@ -0,0 +1,283 @@
+use super::{Comp, CompSelection, Event, ItemId, LayerId, Result, Session, Tick, Value, commands};
+
+/// `t` as a current time of `comp`: a frame within its duration.
+fn comp_frame_at(comp: &Comp, t: Tick) -> Tick {
+    comp.frame_rate.snap_nearest(t.min(comp.duration - comp.frame_duration()).max(Tick::ZERO))
+}
+
+impl Session {
+    /// Keep selections valid after the project was replaced by another state (undo, redo, a
+    /// history jump, a rollback): the same layer id can name a different document, so the
+    /// on-canvas editor gets a fresh IME epoch only when its own document changed.
+    ///
+    /// Normally `before` is [`commands::text_edit::active_editor_snapshot`] taken from the
+    /// state this call is about to replace. Atomic batch rollback is the exception: it has
+    /// already restored the pre-batch state and passes the snapshot of the failing intermediate
+    /// state, so a transient restart or component switch inside the batch still rejects reviving
+    /// the old composition. A restored state that still has the same composition, layer and
+    /// editor session and shows byte/style-equivalent text (an opacity or other property undo)
+    /// keeps the editor's owner and selection; a different document, comp, layer or session clamps the
+    /// selection and starts a new epoch. A closed editor stays closed, and a fallback comp's
+    /// matching layer id never inherits the old comp's session. `None` means no editor was open
+    /// when the snapshot was taken; if one is open after the replacement it is treated as an
+    /// unverified document replacement, so it never inherits an old composition.
+    pub fn sanitize_after_replacement(&mut self, before: Option<&commands::text_edit::EditorSnapshot>) {
+        self.sanitize_state();
+        commands::text_edit::after_replacement(self, before);
+    }
+
+    /// Drop selections that no longer exist. Each comp keeps its own selection (#1001); a layer id
+    /// counts only inside the comp that owns it, so the active comp never sees another comp's layers.
+    pub fn sanitize_state(&mut self) {
+        let p = self.project.clone();
+        self.state.open_comps.retain(|c| p.comp(*c).is_some());
+        self.state.comp_selections.retain(|cid, sel| {
+            let Some(c) = p.comp(*cid) else { return false };
+            let ids: Vec<LayerId> = c.layers.iter().map(|l| l.id).collect();
+            sel.layers.retain(|l| ids.contains(l));
+            sel.props.retain(|(l, _)| ids.contains(l));
+            sel.keys.retain(|k| ids.contains(&k.layer));
+            sel.vertices.retain(|v| ids.contains(&v.layer));
+            !sel.is_empty()
+        });
+        if self.state.active_comp.is_some_and(|c| p.comp(c).is_none()) {
+            self.clear_live_selection();
+            // A matching layer id in the fallback comp is not the document being edited.
+            self.state.text_edit = None;
+            self.state.active_comp = self.state.open_comps.first().copied();
+            if let Some(id) = self.state.active_comp {
+                self.recall_selection(id);
+            }
+        }
+        if let Some(c) = self.active_comp() {
+            let ids: Vec<LayerId> = c.layers.iter().map(|l| l.id).collect();
+            self.state.selected_layers.retain(|l| ids.contains(l));
+            self.state.selected_props.retain(|(l, _)| ids.contains(l));
+            self.state.selected_keys.retain(|k| ids.contains(&k.layer));
+            self.state.selected_vertices.retain(|v| ids.contains(&v.layer));
+        }
+        if let Some((l, t)) = self.state.current_track
+            && self.active_comp().and_then(|c| c.layer(l)).and_then(|l| l.tracker(t)).is_none()
+        {
+            self.state.current_track = None;
+        }
+        self.state.project_selection.retain(|i| p.item(*i).is_some());
+        commands::text_edit::sanitize(self);
+    }
+
+    pub fn active_comp(&self) -> Option<&Comp> {
+        self.project.comp(self.state.active_comp?)
+    }
+
+    /// [`Session::active_comp`] as a shared snapshot (an `Arc` clone, not a deep copy).
+    pub fn active_comp_arc(&self) -> Option<std::sync::Arc<Comp>> {
+        self.project.comp_arc(self.state.active_comp?)
+    }
+
+    pub fn active_comp_id(&self) -> Option<ItemId> {
+        self.state.active_comp.filter(|c| self.project.comp(*c).is_some())
+    }
+
+    /// Current time of a comp.
+    pub fn time_of(&self, comp: ItemId) -> Tick {
+        self.state.times.get(&comp).copied().unwrap_or(Tick::ZERO)
+    }
+
+    /// Current time of the active comp.
+    pub fn time(&self) -> Tick {
+        self.state.active_comp.and_then(|c| self.state.times.get(&c).copied()).unwrap_or(Tick::ZERO)
+    }
+
+    /// Move the active comp's current time.
+    ///
+    /// Time is an external boundary for the on-canvas text editor too: an animated Source Text
+    /// can show a different document at another time. The document is snapshotted only while an
+    /// editor is open, so playback with no text editor does no text copying.
+    pub fn set_time(&mut self, t: Tick) {
+        if let Some(c) = self.state.active_comp {
+            let t = self.project.comp(c).map_or(t, |comp| comp_frame_at(comp, t));
+            let edited = commands::text_edit::active_editor_snapshot(self);
+            self.state.times.insert(c, t);
+            if self.prefs.general.sync_time_related_items {
+                // Direct call: this `set_time` owns the editor snapshot for both time changes,
+                // so a synced move does not take a second snapshot or start a second epoch.
+                self.sync_related_times_inner(c, t);
+            }
+            commands::text_edit::after_external_change(self, edited.as_ref());
+        }
+    }
+
+    /// Settings ▸ General ▸ Synchronize Time of All Related Items: moving the current time of
+    /// `comp` moves the current time of the comps nested in it (through their precomp layers'
+    /// timing) and of the comps it is nested in, so every related viewer shows the same moment.
+    pub fn sync_related_times(&mut self, comp: ItemId, t: Tick) {
+        // Moving a related comp can move the active one, so the editor's document is checked
+        // here too; the snapshot is skipped entirely when no text editor is open.
+        let edited = commands::text_edit::active_editor_snapshot(self);
+        self.sync_related_times_inner(comp, t);
+        commands::text_edit::after_external_change(self, edited.as_ref());
+    }
+
+    /// Sets the time of every comp related to `comp` through precomp layers: down into the comps
+    /// it nests (through each layer's timing) and up into the comps nesting it. A seen-set keeps
+    /// cycles and diamonds finite; each found time is clamped to its comp's last frame, snapped to
+    /// the nearest frame and stored in `state.times`. The caller owns the text-editor boundary.
+    fn sync_related_times_inner(&mut self, comp: ItemId, t: Tick) {
+        let mut seen = std::collections::BTreeSet::from([comp]);
+        let mut todo = vec![(comp, t)];
+        let mut found = vec![];
+        while let Some((cid, ct)) = todo.pop() {
+            if cid != comp {
+                found.push((cid, ct));
+            }
+            let Some(c) = self.project.comp(cid) else { continue };
+            // Down: the comps this one nests.
+            for l in &c.layers {
+                if let effectcraft_project::LayerSource::Comp { item } = &l.source
+                    && seen.insert(*item)
+                {
+                    todo.push((*item, l.layer_time(ct)));
+                }
+            }
+            // Up: the comps nesting this one.
+            for iid in self.project.items.keys() {
+                if let Some(pc) = self.project.comp(*iid)
+                    && let Some(l) = pc.layers.iter().find(|l| matches!(&l.source, effectcraft_project::LayerSource::Comp { item } if *item == cid))
+                    && seen.insert(*iid)
+                {
+                    todo.push((*iid, l.comp_time(ct)));
+                }
+            }
+        }
+        for (cid, ct) in found {
+            if let Some(c) = self.project.comp(cid) {
+                let ct = c.frame_rate.snap_nearest(ct.clamp(Tick::ZERO, (c.duration - c.frame_duration()).max(Tick::ZERO)));
+                self.state.times.insert(cid, ct);
+            }
+        }
+    }
+
+    /// Make `id` the active comp, parking the previous comp's selection and restoring this one's.
+    pub fn activate_comp(&mut self, id: ItemId) {
+        if self.project.comp(id).is_none() || self.state.active_comp == Some(id) {
+            return;
+        }
+        self.remember_selection();
+        self.state.active_comp = Some(id);
+        self.recall_selection(id);
+        self.state.current_track = None;
+        // A text-edit session belongs to the comp that owned it. Switching comps ends it; even
+        // a same-numbered layer in the new comp must not inherit the old IME composition.
+        self.state.text_edit = None;
+    }
+
+    /// Leave no comp active, keeping the one that was active in [`EditorState::comp_selections`].
+    pub fn activate_comp_none(&mut self) {
+        self.remember_selection();
+        self.state.active_comp = None;
+        self.clear_live_selection();
+        self.state.current_track = None;
+        self.state.text_edit = None;
+    }
+
+    fn remember_selection(&mut self) {
+        let Some(id) = self.state.active_comp else { return };
+        let sel = CompSelection {
+            layers: self.state.selected_layers.clone(),
+            props: self.state.selected_props.clone(),
+            keys: self.state.selected_keys.clone(),
+            vertices: self.state.selected_vertices.clone(),
+        };
+        if sel.is_empty() {
+            self.state.comp_selections.remove(&id);
+        } else {
+            self.state.comp_selections.insert(id, sel);
+        }
+    }
+
+    fn recall_selection(&mut self, id: ItemId) {
+        match self.state.comp_selections.remove(&id) {
+            Some(sel) => {
+                self.state.selected_layers = sel.layers;
+                self.state.selected_props = sel.props;
+                self.state.selected_keys = sel.keys;
+                self.state.selected_vertices = sel.vertices;
+            }
+            None => self.clear_live_selection(),
+        }
+    }
+
+    fn clear_live_selection(&mut self) {
+        self.state.selected_layers.clear();
+        self.state.selected_props.clear();
+        self.state.selected_keys.clear();
+        self.state.selected_vertices.clear();
+    }
+
+    /// Open a comp in the viewer/timeline and make it active.
+    pub fn open_comp(&mut self, id: ItemId) {
+        if self.project.comp(id).is_none() {
+            return;
+        }
+        if !self.state.open_comps.contains(&id) {
+            self.state.open_comps.push(id);
+        }
+        if self.state.active_comp != Some(id) {
+            let previous = self.state.active_comp;
+            self.state.recent_comps.retain(|c| *c != id && Some(*c) != previous);
+            if let Some(previous) = previous {
+                self.state.recent_comps.insert(0, previous);
+                self.state.recent_comps.truncate(32);
+            }
+        }
+        self.activate_comp(id);
+        self.events.push(Event::OpenComp(id));
+    }
+
+    /// The open compositions and their current times, as a project file records them
+    /// ([`effectcraft_project::SavedView`]).
+    pub fn saved_view(&self) -> effectcraft_project::SavedView {
+        let comp_times = self.state.times.iter().filter(|(id, _)| self.project.comp(**id).is_some()).map(|(id, t)| (*id, *t)).collect();
+        effectcraft_project::SavedView { active_comp: self.state.active_comp, open_comps: self.state.open_comps.clone(), comp_times }
+    }
+
+    /// Reopen the compositions a project file was saved with (#748), each at its saved current
+    /// time (#1714). Ids that no longer name a comp are skipped; with none left the project stays
+    /// on the comp [`Session::replace_project`] opened (its first), as files from before the view
+    /// was saved do.
+    pub fn restore_view(&mut self, view: &effectcraft_project::SavedView) {
+        for (id, t) in &view.comp_times {
+            if let Some(comp) = self.project.comp(*id) {
+                let t = comp_frame_at(comp, *t);
+                self.state.times.insert(*id, t);
+            }
+        }
+        let mut open: Vec<ItemId> = Vec::new();
+        for id in view.open_comps.iter().copied().filter(|id| self.project.comp(*id).is_some()) {
+            if !open.contains(&id) {
+                open.push(id);
+            }
+        }
+        let Some(active) = view.active_comp.filter(|id| self.project.comp(*id).is_some()).or_else(|| open.first().copied()) else { return };
+        self.state.open_comps = open;
+        self.open_comp(active);
+    }
+
+    /// The 3D view camera of a comp's viewer (None = the active camera).
+    pub fn view_camera(&self, comp: ItemId) -> Option<effectcraft_render::three_d::CameraState> {
+        let c = self.project.comp(comp)?;
+        if !c.has_3d() {
+            return None;
+        }
+        self.state.views3d.get(&comp)?.override_camera(c.width as f64, c.height as f64)
+    }
+
+    /// Resolve a comp reference (item id number or name; `None`/null = the active comp).
+    pub fn resolve_comp(&self, comp: Option<&Value>) -> Result<ItemId> {
+        let p = match comp {
+            Some(v) if !v.is_null() => serde_json::json!({ "comp": v }),
+            _ => serde_json::json!({}),
+        };
+        commands::comp_id(self, &p)
+    }
+}
diff --git a/crates/engine/src/session/dispatch.rs b/crates/engine/src/session/dispatch.rs
new file mode 100644
index 000000000..36c7f0a51
--- /dev/null
+++ b/crates/engine/src/session/dispatch.rs
@@ -0,0 +1,70 @@
+use super::{EngineError, Event, Result, Session, Value, commands, guard};
+
+impl Session {
+    pub fn new() -> Session {
+        Session::default()
+    }
+
+    /// Run a command by id.
+    pub fn execute(&mut self, id: &str, params: Value) -> Result<Value> {
+        let spec = commands::find(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
+        if let Err(why) = (spec.enabled)(self) {
+            // Explicit targets (agents, scripts) don't need a UI selection.
+            let explicit = (["layer", "layers", "prop", "keys"].iter().any(|k| params.get(k).is_some()) && commands::has_comp(self).is_ok())
+                || ["item", "items"].iter().any(|k| params.get(k).is_some())
+                // An explicit composition (the enablement looks at the active one).
+                || params.get("comp").is_some_and(|c| !c.is_null() && self.resolve_comp(Some(c)).is_ok());
+            if !explicit {
+                return Err(EngineError::Disabled(id.to_string(), why));
+            }
+        }
+        // Last-resort guard: a panicking command reports an error instead of crashing the app.
+        let r = guard::guarded(&format!("command `{id}`"), || (spec.run)(self, &params))?;
+        self.learn_observe(id, &params);
+        if spec.journal {
+            self.journal.push((id.to_string(), params));
+            if self.journal.len() > 10_000 {
+                self.journal.drain(..1000);
+            }
+        }
+        Ok(r)
+    }
+
+    /// [`Session::execute`] for agents and scripts (MCP, CLI, control channel): unknown top-level
+    /// parameters are rejected with the accepted keys instead of being silently ignored.
+    pub fn execute_checked(&mut self, id: &str, params: Value) -> Result<Value> {
+        let spec = commands::find(id).ok_or_else(|| EngineError::UnknownCommand(id.to_string()))?;
+        commands::check_params(spec, &params)?;
+        self.execute(id, params)
+    }
+
+    /// [`Session::execute`] for a command a script asked for (the JavaScript engine's
+    /// `app.run`, ScriptUI callbacks…). The command and everything it runs count as the script's:
+    /// it may not change the settings that limit scripts (Settings ▸ Scripting & Expressions ▸
+    /// Application Scripting), which only the user can, from the UI, CLI or control channel.
+    pub fn execute_for_script(&mut self, id: &str, params: Value) -> Result<Value> {
+        self.script_calls.0 = self.script_calls.0.saturating_add(1);
+        let r = self.execute(id, params);
+        self.script_calls.0 = self.script_calls.0.saturating_sub(1);
+        r
+    }
+
+    /// Whether the command running was issued by a script ([`Session::execute_for_script`]).
+    pub fn running_for_script(&self) -> bool {
+        self.script_calls.0 > 0
+    }
+
+    /// Whether `id` names a known command whose `enabled` predicate returns `Ok` for this session;
+    /// an unknown id or a predicate error reads as disabled.
+    pub fn is_enabled(&self, id: &str) -> bool {
+        commands::find(id).is_some_and(|c| (c.enabled)(self).is_ok())
+    }
+
+    pub fn toast(&mut self, msg: impl Into<String>) {
+        self.events.push(Event::Toast { message: msg.into(), error: false });
+    }
+
+    pub fn drain_events(&mut self) -> Vec<Event> {
+        std::mem::take(&mut self.events)
+    }
+}
diff --git a/crates/engine/src/session/edit.rs b/crates/engine/src/session/edit.rs
new file mode 100644
index 000000000..c2590abc3
--- /dev/null
+++ b/crates/engine/src/session/edit.rs
@@ -0,0 +1,314 @@
+use super::{Arc, EditorState, EngineError, Event, History, ItemId, Project, Result, Session, camera_track, commands, roto, warp};
+
+impl Session {
+    /// Apply an undoable edit. `merge`: consecutive edits with the same key fold into one step.
+    ///
+    /// Every edit is an external boundary for the on-canvas text editor: if it replaced the
+    /// document the editor is showing, the selection is clamped and the editor gets a fresh IME
+    /// epoch. The editor's own typing goes through `edit_text_doc`, which owns that
+    /// document and must not treat its own keystrokes as a replacement.
+    pub fn edit<T>(&mut self, label: &str, merge: Option<&str>, f: impl FnOnce(&mut Project, &mut EditorState) -> Result<T>) -> Result<T> {
+        let edited = commands::text_edit::active_editor_snapshot(self);
+        let out = self.edit_inner(label, merge, f)?;
+        commands::text_edit::after_external_change(self, edited.as_ref());
+        Ok(out)
+    }
+
+    /// [`Session::edit`] for the on-canvas editor's own text changes. Its document is the one
+    /// the editor owns, so a change here is typing, not a replacement behind the IME's back.
+    pub(crate) fn edit_text_doc<T>(&mut self, label: &str, merge: Option<&str>, f: impl FnOnce(&mut Project, &mut EditorState) -> Result<T>) -> Result<T> {
+        self.edit_inner(label, merge, f)
+    }
+
+    /// The shared body of [`Session::edit`] and [`Session::edit_text_doc`].
+    ///
+    /// Runs `f` on a clone of the project and editor state, then synchronizes derived data (global
+    /// light and Essential Graphics), queues invalidated Warp Stabilizer/camera-tracker work and
+    /// Roto Brush instances needing re-propagation in the `*_pending` lists. If the clone has the same
+    /// content the project and history are left as they were (only editor-state changes from `f`
+    /// are kept) and no revision is bumped; otherwise the previous project is recorded as an
+    /// undo step under `label`, unless it merges with the current merge key (then the redo branch
+    /// is dropped). An `Err` from `f` propagates with the session unchanged.
+    fn edit_inner<T>(&mut self, label: &str, merge: Option<&str>, f: impl FnOnce(&mut Project, &mut EditorState) -> Result<T>) -> Result<T> {
+        let before = self.project.clone();
+        let mut p = (*self.project).clone();
+        let mut st = self.state.clone();
+        let r = f(&mut p, &mut st)?;
+        // Layer styles: one Global Light per comp, whichever layer edited it.
+        effectcraft_project::styles::sync_global_light(&before, &mut p);
+        // Essential Properties of precomp layers follow their comps' Essential Graphics.
+        effectcraft_project::essential::sync_project(&before, &mut p);
+        // Warp Stabilizer analyses made from other frames are cleared (and queued again).
+        for w in warp::invalidate(&before, &mut p) {
+            if !self.warp_pending.contains(&w) {
+                self.warp_pending.push(w);
+            }
+        }
+        // So are 3D Camera Tracker tracks (and solves made with other settings).
+        for w in camera_track::invalidate(&before, &mut p) {
+            if !self.camera_pending.contains(&w) {
+                self.camera_pending.push(w);
+            }
+        }
+        // Roto Brush Input Keys follow the frames; edited instances propagate again.
+        for r in roto::sync(&before, &mut p) {
+            if !self.roto_pending.contains(&r) {
+                self.roto_pending.push(r);
+            }
+        }
+        // Nothing changed (a value set to what it already was): no undo step, not modified.
+        if p.same_content(&before) {
+            self.state = st;
+            return Ok(r);
+        }
+        let same = merge.is_some() && merge.map(str::to_string) == self.history.merge_key;
+        if !same {
+            // Undone steps aren't lost: they stay in the History panel as a branch.
+            let levels = self.prefs.general.undo_levels.max(1) as usize;
+            self.history.record(label, before, levels);
+        } else {
+            self.history.abandon_redo(&before);
+        }
+        self.history.merge_key = merge.map(str::to_string);
+        self.project = Arc::new(p);
+        self.state = st;
+        self.bump();
+        Ok(r)
+    }
+
+    /// Note a change to the on-canvas editor's committed text or session.
+    ///
+    /// Frontends compare this with [`commands::text_edit::ime_stamp_revision`]; an unrelated
+    /// project change must not advance it.
+    pub(crate) fn note_text_edit_change(&mut self) {
+        // Checked process-wide allocation: a stamp is never wrapped or reused. On exhaustion
+        // keep the previous value; an unavailable before/after pair then compares equal and
+        // earns no receipt instead of accepting a stale revision.
+        if let Some(revision) = commands::text_edit::next_ime_revision() {
+            self.ime_revision = self.ime_revision.max(revision);
+        }
+    }
+
+    pub fn bump(&mut self) {
+        self.revision += 1;
+        // A Cryptomatte probe is keyed by the revision: an older one never answers again.
+        self.drop_crypto_probe();
+        // Back at the saved state (undo, redo, a history jump or a rolled-back batch).
+        if Arc::ptr_eq(&self.project, &self.saved_project) {
+            self.saved_revision = self.revision;
+        }
+        self.refresh_disk_salt(false);
+        self.events.push(Event::ProjectChanged { revision: self.revision });
+    }
+
+    /// Salt the disk cache's layer keys with the project's footage files
+    /// ([`effectcraft_render::disk_cache::footage_salt`]). Taking it reads the size and time of
+    /// every file, every frame of an image sequence included, so it is taken again only when the
+    /// footage items changed, or with `force` (a project opened, footage reloaded, the disk cache
+    /// attached), not at every edit: with a few large sequences that cost each keystroke in a
+    /// text field over half a second (#1926).
+    pub fn refresh_disk_salt(&mut self, force: bool) -> Option<u64> {
+        use std::hash::{Hash, Hasher};
+        if self.disk_cache.is_none() {
+            self.disk_salt = None;
+            return None;
+        }
+        let mut h = std::collections::hash_map::DefaultHasher::new();
+        for (id, it) in &self.project.items {
+            if let effectcraft_project::ItemKind::Footage(f) = &it.kind {
+                id.hash(&mut h);
+                format!("{f:?}").hash(&mut h);
+            }
+        }
+        let footage = h.finish();
+        if let Some((seen, salt)) = self.disk_salt
+            && seen == footage
+            && !force
+        {
+            return Some(salt);
+        }
+        let salt = effectcraft_render::disk_cache::footage_salt(&self.project);
+        self.disk_salt = Some((footage, salt));
+        self.layer_cache.set_disk_salt(salt);
+        Some(salt)
+    }
+
+    /// Set a comp's Resolution. As in After Effects it is saved with the project (which becomes
+    /// modified) but is no undo step, and it changes no pixels: the comp's cached frames stay
+    /// valid ([`effectcraft_project::Comp::same_pixels`]).
+    pub fn set_resolution(&mut self, comp: ItemId, r: effectcraft_project::Resolution) -> Result<()> {
+        if self.project.comp(comp).ok_or(EngineError::NoComp)?.resolution == r {
+            return Ok(());
+        }
+        Arc::make_mut(&mut self.project).comp_mut(comp).ok_or(EngineError::NoComp)?.resolution = r;
+        self.bump();
+        Ok(())
+    }
+
+    /// Keep what lives outside the undo history (each comp's Resolution) as it is in `from`, the
+    /// project before undo, redo or a history jump restored another state.
+    pub(crate) fn keep_view_settings(&mut self, from: &Project) {
+        let keep: Vec<(ItemId, effectcraft_project::Resolution)> =
+            self.project.comps().filter_map(|(id, c)| from.comp(*id).map(|f| (*id, f.resolution)).filter(|(_, r)| *r != c.resolution)).collect();
+        if keep.is_empty() {
+            return;
+        }
+        let p = Arc::make_mut(&mut self.project);
+        for (id, r) in keep {
+            if let Some(c) = p.comp_mut(id) {
+                c.resolution = r;
+            }
+        }
+    }
+
+    /// Undoes one step: the current project goes onto the redo stack, per-comp Resolution is kept
+    /// as it was, the merge key is cleared, selections are sanitized for the replaced state (the
+    /// on-canvas editor gets a new IME epoch only when its own document changed) and the session is
+    /// bumped. Returns `false`, changing nothing, when there is nothing to undo.
+    pub fn undo(&mut self) -> bool {
+        let Some((label, p)) = self.history.undo.pop() else { return false };
+        let edited = commands::text_edit::active_editor_snapshot(self);
+        let probe = commands::kept_crypto_probe(self);
+        let cur = std::mem::replace(&mut self.project, p);
+        self.keep_view_settings(&cur);
+        self.history.merge_key = None;
+        self.sanitize_after_replacement(edited.as_ref());
+        self.bump();
+        commands::keep_crypto_probe(self, probe, &cur);
+        self.history.redo.push((label, cur));
+        true
+    }
+
+    /// Redoes one step: the current project goes back onto the undo stack, per-comp Resolution is
+    /// kept, the merge key is cleared, selections are sanitized for the replaced state (a changed
+    /// text document starts a new IME epoch) and the session is bumped. Returns `false`, changing
+    /// nothing, when there is nothing to redo.
+    pub fn redo(&mut self) -> bool {
+        let Some((label, p)) = self.history.redo.pop() else { return false };
+        let edited = commands::text_edit::active_editor_snapshot(self);
+        let probe = commands::kept_crypto_probe(self);
+        let cur = std::mem::replace(&mut self.project, p);
+        self.keep_view_settings(&cur);
+        self.history.merge_key = None;
+        self.sanitize_after_replacement(edited.as_ref());
+        self.bump();
+        commands::keep_crypto_probe(self, probe, &cur);
+        self.history.undo.push((label, cur));
+        true
+    }
+
+    pub fn is_dirty(&self) -> bool {
+        self.revision != self.saved_revision
+    }
+
+    /// The project as it is now is the saved one (after opening or saving it).
+    pub fn mark_saved(&mut self) {
+        self.saved_project = self.project.clone();
+        self.saved_revision = self.revision;
+    }
+
+    /// The project has changes its file doesn't (a session restored with unsaved changes): it
+    /// stays modified until it is saved, whatever is undone.
+    pub fn mark_unsaved(&mut self) {
+        self.saved_project = Arc::new(Project::default());
+        self.bump();
+    }
+
+    /// Replace the whole project (open/new), resetting history and state.
+    pub fn replace_project(&mut self, mut p: Project, path: Option<String>) {
+        if self.stop_render()
+            && let Some(mut job) = self.render_job.take()
+        {
+            // Let the worker notice the cancel; its updates refer to the old project.
+            job.wait();
+        }
+        self.render_job = None;
+        self.stored_paths = Default::default();
+        self.stop_track();
+        self.track_job = None;
+        self.stop_mask_track();
+        self.mask_job = None;
+        self.stop_warp();
+        self.warp_job = None;
+        self.warp_pending.clear();
+        self.stop_camera();
+        self.camera_job = None;
+        self.camera_pending.clear();
+        self.stop_roto();
+        self.roto_job = None;
+        self.roto_pending.clear();
+        self.drop_tasks();
+        self.script_ui.project_epoch = self.script_ui.project_epoch.wrapping_add(1);
+        p.fix_next_id();
+        upgrade_effects(&mut p);
+        // The media layer keys decoded frames by path: files of the new project may have changed
+        // since an earlier project decoded them (#1070).
+        for it in p.items.values() {
+            if let effectcraft_project::ItemKind::Footage(f) = &it.kind {
+                self.forget_decoded(f);
+            }
+        }
+        self.layer_cache.clear();
+        self.project = Arc::new(p);
+        // Its files may have changed since they were last stamped.
+        self.disk_salt = None;
+        self.history = History::default();
+        self.state = EditorState { snapping: true, view_layout: 1, ..Default::default() };
+        self.path = path;
+        self.bump();
+        self.mark_saved();
+        let first = self.project.comps().next().map(|(id, _)| *id);
+        if let Some(c) = first {
+            self.open_comp(c);
+        }
+    }
+}
+
+/// Bring effect instances saved by earlier versions up to date with the effect registry
+/// (renamed / regrouped / added parameters, reordered popups; see
+/// [`effectcraft_effects::migrate`]), and a project from before
+/// [`effectcraft_project::SCHEMA_EFFECT_SPACE`] into effect space
+/// ([`effectcraft_effects::migrate::to_effect_space`]). Shape path operations get the
+/// properties added since ([`effectcraft_project::build::upgrade_shape_contents`]). Stamps the
+/// current schema.
+pub fn upgrade_effects(p: &mut Project) {
+    let to_effect_space = p.schema < effectcraft_project::SCHEMA_EFFECT_SPACE;
+    // Effect bounds per layer: (size, top-left in layer coordinates).
+    let mut bounds = std::collections::HashMap::new();
+    for (cid, c) in p.comps() {
+        for l in &c.layers {
+            bounds.insert((*cid, l.id), effectcraft_render::effect_bounds(p, c, l));
+        }
+    }
+    let mut next = p.next_id;
+    for (cid, it) in p.items.iter_mut() {
+        let effectcraft_project::ItemKind::Comp(c) = &mut it.kind else { continue };
+        for l in &mut std::sync::Arc::make_mut(c).layers {
+            let (size, origin) = bounds.get(&(*cid, l.id)).copied().unwrap_or(([100.0, 100.0], [0.0; 2]));
+            // Effect space starts at the bounds' top-left: positions move by minus that corner.
+            // Adjustment layers run their effects on the comp below as it is: nothing moves.
+            let shift = |o: [f64; 2]| [-o[0], -o[1]];
+            let d = if l.switches.adjustment { [0.0; 2] } else { shift(origin) };
+            let clone_d = |src: Option<u64>| match src {
+                Some(id) => bounds.get(&(*cid, effectcraft_project::LayerId(id))).map_or([0.0; 2], |b| shift(b.1)),
+                None => d,
+            };
+            if let Some(contents) = l.props.sub_mut("contents") {
+                effectcraft_project::build::upgrade_shape_contents(&mut effectcraft_project::build::Ids(&mut next), contents);
+            }
+            let Some(fx) = l.props.sub_mut("effects") else { continue };
+            for n in &mut fx.children {
+                let effectcraft_project::Node::Group(g) = n else { continue };
+                let effectcraft_project::GroupKind::Effect { effect } = &g.kind else { continue };
+                if let Some(spec) = effectcraft_effects::find(effect) {
+                    effectcraft_effects::migrate::upgrade_instance(spec, g, &mut effectcraft_project::build::Ids(&mut next), size);
+                    if to_effect_space {
+                        effectcraft_effects::migrate::to_effect_space(spec, g, size, d, &clone_d);
+                    }
+                }
+            }
+        }
+    }
+    p.next_id = next;
+    p.schema = effectcraft_project::SCHEMA_VERSION;
+}
diff --git a/crates/engine/src/session/render.rs b/crates/engine/src/session/render.rs
new file mode 100644
index 000000000..6f2d273ad
--- /dev/null
+++ b/crates/engine/src/session/render.rs
@@ -0,0 +1,140 @@
+use super::{EngineError, Image, ItemId, RenderOpts, Renderer, Result, Session, ThumbnailJob, Tick, Value, commands};
+
+impl Session {
+    /// Render a comp frame with the session's footage + expression hosts.
+    pub fn render(&self, comp: ItemId, t: Tick, opts: RenderOpts) -> Image {
+        self.renderer(opts).comp_frame(comp, t)
+    }
+
+    /// The renderer [`Session::render`] uses: the session's footage, expressions, layer cache and
+    /// accelerator, and the render prefs (nested switches, draft shadows) over `opts`.
+    pub fn renderer(&self, opts: RenderOpts) -> Renderer<'_> {
+        let mut r = Renderer::new(&self.project, self.footage.as_ref(), self.render_opts(opts));
+        r.expr = self.expr.as_deref();
+        r.cache = Some(&self.layer_cache);
+        r.accel = self.accel.as_deref();
+        r
+    }
+
+    /// `opts` with the render prefs (nested switches, draft shadows), as [`Session::renderer`].
+    pub fn render_opts(&self, opts: RenderOpts) -> RenderOpts {
+        RenderOpts { nested_switches: self.prefs.general.switches_affect_nested_comps, draft_shadows: self.prefs.three_d.realtime_shadows, ..opts }
+    }
+
+    /// Whether `effect.cryptomatteAt` with params `p` answers from the kept probe (a few array
+    /// reads; `probeOnly` queries answer `pending` until then). Changes nothing: ask it every
+    /// frame, and start [`Session::crypto_probe_job`] only when a build will actually run.
+    pub fn crypto_probe_ready(&self, p: &Value) -> Result<bool> {
+        commands::crypto_probe_ready(self, p)
+    }
+
+    /// For the Cryptomatte eyedropper: `None` when `effect.cryptomatteAt` with params `p` answers
+    /// from the kept probe, else a job that builds that probe (it may render a precomp's ID pass)
+    /// off the UI thread, for the next query to use. Asking for a job supersedes a build in
+    /// flight for another probe (it then stores nothing): ask only to run it.
+    pub fn crypto_probe_job(&self, p: &Value) -> Result<Option<commands::CryptoProbeJob>> {
+        commands::crypto_probe_job(self, p)
+    }
+
+    /// Let go of the kept Cryptomatte probe (and its aux channels), and cancel a build in
+    /// flight: the eyedropper was disarmed. Edits, footage changes and Open / New do it too.
+    pub fn drop_crypto_probe(&self) {
+        if let Ok(mut slot) = self.crypto_probe.lock() {
+            slot.clear();
+        }
+    }
+
+    /// Whether a Cryptomatte probe is kept, and how many were built so far (for tests).
+    #[doc(hidden)]
+    pub fn crypto_probe_stats(&self) -> (bool, u64) {
+        self.crypto_probe.lock().map_or((false, 0), |s| (s.kept(), s.builds().1))
+    }
+
+    /// How many probe jobs ran so far, built or cancelled before they began (for tests: each
+    /// is a thread in the eyedropper).
+    #[doc(hidden)]
+    pub fn crypto_probe_jobs(&self) -> u64 {
+        self.crypto_probe.lock().map_or(0, |s| s.builds().0)
+    }
+
+    /// Render a comp frame (comp time `t`) as opaque 8-bit RGBA over the comp background, scaled
+    /// so the longest side is at most `max_side` pixels (0 = full size). Returns (width, height, rgba).
+    pub fn render_rgba8(&self, comp: ItemId, t: Tick, max_side: u32) -> Result<(u32, u32, Vec<u8>)> {
+        let c = self.project.comp(comp).ok_or(EngineError::NoComp)?;
+        let long = c.width.max(c.height).max(1) as f64;
+        let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
+        let img = self.render(comp, t, RenderOpts { scale, backend: effectcraft_render::Backend::Auto, ..Default::default() });
+        Ok((img.width, img.height, img.to_rgba8_over(c.background)))
+    }
+
+    /// A Project panel thumbnail of an item (a comp at `t`, footage at its first frame), longest
+    /// side at most `max_side`, as a job that owns everything it reads: frontends run it off the
+    /// UI thread (a big comp takes far longer than a frame). `None` for items without pixels.
+    pub fn thumbnail_job(&self, item: ItemId, t: Tick, max_side: u32) -> Option<ThumbnailJob> {
+        let it = self.project.item(item)?;
+        let footage = self.footage.clone();
+        match &it.kind {
+            effectcraft_project::ItemKind::Comp(c) => {
+                let (project, expr, cache) = (self.project.clone(), self.expr.clone(), self.layer_cache.clone());
+                let long = c.width.max(c.height).max(1) as f64;
+                let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
+                let opts = RenderOpts {
+                    scale,
+                    nested_switches: self.prefs.general.switches_affect_nested_comps,
+                    draft_shadows: self.prefs.three_d.realtime_shadows,
+                    ..Default::default()
+                };
+                let bg = c.background;
+                Some(Box::new(move || {
+                    let mut r = Renderer::new(&project, footage.as_ref(), opts);
+                    r.expr = expr.as_deref();
+                    r.cache = Some(&cache);
+                    let img = r.comp_frame(item, t);
+                    Some((img.width, img.height, img.to_rgba8_over(bg)))
+                }))
+            }
+            effectcraft_project::ItemKind::Footage(f) if f.has_video => {
+                let f = f.clone();
+                Some(Box::new(move || {
+                    let img = footage.frame(item, &f, Tick(0))?;
+                    // Point-sample down to at most `max_side` on the long side.
+                    let step = (img.width.max(img.height) as f32 / max_side.max(1) as f32).ceil().max(1.0) as u32;
+                    let (w, h) = (img.width.div_ceil(step), img.height.div_ceil(step));
+                    let full = img.to_rgba8();
+                    let mut px = Vec::with_capacity((w * h * 4) as usize);
+                    for y in 0..h {
+                        for x in 0..w {
+                            let i = (((y * step) * img.width + x * step) * 4) as usize;
+                            px.extend_from_slice(&full[i..i + 4]);
+                        }
+                    }
+                    Some((w, h, px))
+                }))
+            }
+            _ => None,
+        }
+    }
+
+    /// [`Session::render_rgba8`], or with `transparent` the frame's own straight alpha (what a
+    /// render with RGB + Alpha channels writes) instead of compositing over the background.
+    pub fn render_rgba8_alpha(&self, comp: ItemId, t: Tick, max_side: u32, transparent: bool) -> Result<(u32, u32, Vec<u8>)> {
+        if !transparent {
+            return self.render_rgba8(comp, t, max_side);
+        }
+        let c = self.project.comp(comp).ok_or(EngineError::NoComp)?;
+        let long = c.width.max(c.height).max(1) as f64;
+        let scale = if max_side == 0 { 1.0 } else { (max_side as f64 / long).min(1.0) };
+        let img = self.render(comp, t, RenderOpts { scale, backend: effectcraft_render::Backend::Auto, ..Default::default() });
+        Ok((img.width, img.height, img.to_rgba8()))
+    }
+
+    /// Make the media layer and the layer cache let go of what they decoded from `footage`'s
+    /// files (it keys frames by path, so an overwritten file would keep showing its old pixels).
+    pub(crate) fn forget_decoded(&self, footage: &effectcraft_project::Footage) {
+        for p in std::iter::once(&footage.path).chain(&footage.sequence) {
+            self.footage.forget(p);
+        }
+        self.layer_cache.clear();
+        self.drop_crypto_probe();
+    }
+}
diff --git a/crates/engine/src/settings.rs b/crates/engine/src/settings.rs
new file mode 100644
index 000000000..5981d4591
--- /dev/null
+++ b/crates/engine/src/settings.rs
@@ -0,0 +1,5 @@
+pub mod autosave;
+pub mod config;
+pub mod prefs;
+pub(super) mod session_settings;
+pub mod shortcuts;
diff --git a/crates/engine/src/autosave.rs b/crates/engine/src/settings/autosave.rs
similarity index 99%
rename from crates/engine/src/autosave.rs
rename to crates/engine/src/settings/autosave.rs
index 37127ac56..e70e819fd 100644
--- a/crates/engine/src/autosave.rs
+++ b/crates/engine/src/settings/autosave.rs
@@ -143,7 +143,7 @@ pub fn write(prefs: &Prefs, project: Option<&str>, fallback: Option<&Path>, last
     write_in(&StdFiles, prefs, project, fallback, last_slot, json)
 }
 
-/// [`write`] through `fs`.
+/// [`write()`] through `fs`.
 pub fn write_in(
     fs: &dyn FileOps,
     prefs: &Prefs,
diff --git a/crates/engine/src/config.rs b/crates/engine/src/settings/config.rs
similarity index 100%
rename from crates/engine/src/config.rs
rename to crates/engine/src/settings/config.rs
diff --git a/crates/engine/src/settings/prefs.rs b/crates/engine/src/settings/prefs.rs
new file mode 100644
index 000000000..d2db7cd55
--- /dev/null
+++ b/crates/engine/src/settings/prefs.rs
@@ -0,0 +1,132 @@
+//! Settings (After Effects' Preferences): a versioned serde model, addressed by dotted keys
+//! (`general.undoLevels`, `autoSave.intervalMinutes`, `labels.3.name`), plus the page schema the
+//! Settings dialog and agents (`prefs.pages`) are built from.
+//!
+//! Settings are stored as JSON (`prefs.json`) through the session's [`crate::config::ConfigStore`].
+//! Loading is forgiving: missing keys take their defaults, unknown keys (written by a newer
+//! version) are kept and written back, and older layouts are migrated ([`migrate`]).
+//!
+//! Every setting in [`pages`] says whether it already changes behaviour (`live`). Settings that
+//! don't yet are still shown (After Effects parity of the dialog) and are listed in
+//! `docs/preferences.md`; a test keeps that list in step with the schema.
+
+use std::collections::BTreeMap;
+
+use effectcraft_color::Label;
+use effectcraft_time::Tick;
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value, json};
+
+mod choices;
+mod dialog;
+mod document;
+mod queries;
+mod recent;
+mod sections;
+
+pub use choices::{APPEARANCE_MODES, DARK_THEMES, LANGUAGES, LIGHT_THEMES, THEMES, WINDOW_GRAPHICS, theme_family};
+pub use dialog::{Item, Kind, Page, pages, pages_json, todo_keys};
+pub use document::{migrate, page_id, section_key};
+pub use queries::{CacheBudgets, WEB_LAYER_CACHE, WEB_MEDIA_CACHE, mask_color};
+pub use recent::{MAX_RECENT_SCRIPTS, RecentScript};
+pub use sections::{
+    Appearance, Audio, AutoSave, CompPreset, CompositionPrefs, Disk, Export, FacePrefs, General, Grids, Import, LabelPref, Memory, Previews, ProjectPrefs,
+    RotoPrefs, Scripting, Startup, ThreeD, TypePrefs, Video,
+};
+use sections::{Extra, default_labels, lenient_comp_presets};
+
+/// Current settings layout version.
+pub const PREFS_VERSION: u32 = 3;
+/// Settings file name in the config store.
+pub const PREFS_FILE: &str = "prefs.json";
+
+/// All settings.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct Prefs {
+    pub version: u32,
+    pub general: General,
+    pub startup: Startup,
+    pub project: ProjectPrefs,
+    pub auto_save: AutoSave,
+    pub composition: CompositionPrefs,
+    pub previews: Previews,
+    pub appearance: Appearance,
+    pub grids: Grids,
+    /// The 16 labels (Red … Dark Green), in order.
+    pub labels: Vec<LabelPref>,
+    #[serde(rename = "type")]
+    pub type_: TypePrefs,
+    pub import: Import,
+    pub export: Export,
+    pub audio: Audio,
+    pub disk: Disk,
+    pub memory: Memory,
+    pub video: Video,
+    #[serde(rename = "threeD")]
+    pub three_d: ThreeD,
+    pub scripting: Scripting,
+    pub roto: RotoPrefs,
+    pub face: FacePrefs,
+    /// File ▸ Open Recent, newest first.
+    pub recent_projects: Vec<String>,
+    /// File ▸ Import Recent Footage, newest first.
+    pub recent_footage: Vec<String>,
+    /// Animation ▸ Recent Animation Presets (`.ecpreset` paths or built-in preset ids), newest
+    /// first.
+    pub recent_presets: Vec<String>,
+    /// File ▸ Scripts ▸ Recent Script Files, newest first, at most [`MAX_RECENT_SCRIPTS`].
+    pub recent_scripts: Vec<RecentScript>,
+    /// Character panel: recently used font families, newest first.
+    pub recent_fonts: Vec<String>,
+    /// Effects & Presets: the starred effects' ids, in the order starred.
+    pub effects_favorites: Vec<String>,
+    /// Preview panel: every shortcut's options.
+    pub preview: crate::preview::PreviewSettings,
+    /// View ▸ Simulate Output ▸ My Custom RGB.
+    pub custom_rgb: crate::viewer::CustomRgb,
+    /// Composition Settings presets the user saved, in the order saved.
+    #[serde(deserialize_with = "lenient_comp_presets")]
+    pub comp_presets: Vec<CompPreset>,
+    /// Top-level keys this version doesn't know (kept for newer versions).
+    #[serde(flatten)]
+    pub extra: Extra,
+}
+
+impl Default for Prefs {
+    fn default() -> Self {
+        Prefs {
+            version: PREFS_VERSION,
+            general: General::default(),
+            startup: Startup::default(),
+            project: ProjectPrefs::default(),
+            auto_save: AutoSave::default(),
+            composition: CompositionPrefs::default(),
+            previews: Previews::default(),
+            appearance: Appearance::default(),
+            grids: Grids::default(),
+            labels: default_labels(),
+            type_: TypePrefs::default(),
+            import: Import::default(),
+            export: Export::default(),
+            audio: Audio::default(),
+            disk: Disk::default(),
+            memory: Memory::default(),
+            video: Video::default(),
+            three_d: ThreeD::default(),
+            scripting: Scripting::default(),
+            roto: RotoPrefs::default(),
+            face: FacePrefs::default(),
+            recent_projects: vec![],
+            recent_footage: vec![],
+            recent_presets: vec![],
+            recent_scripts: vec![],
+            recent_fonts: vec![],
+            effects_favorites: vec![],
+            preview: crate::preview::PreviewSettings::default(),
+            custom_rgb: crate::viewer::CustomRgb::default(),
+            comp_presets: vec![],
+            extra: Extra::new(),
+        }
+    }
+}
diff --git a/crates/engine/src/settings/prefs/choices.rs b/crates/engine/src/settings/prefs/choices.rs
new file mode 100644
index 000000000..4145e0161
--- /dev/null
+++ b/crates/engine/src/settings/prefs/choices.rs
@@ -0,0 +1,63 @@
+/// Settings ▸ General ▸ Language: (label, `general.language` value).
+pub const LANGUAGES: &[(&str, &str)] = &[
+    ("Match System", "system"),
+    ("English", "en"),
+    // Alphabetical by the language's own name after English; Cyrillic, Georgian, then CJK names
+    // follow the Latin ones.
+    ("Čeština", "cs"),
+    ("Deutsch", "de"),
+    ("Español", "es"),
+    ("Français", "fr"),
+    ("Português (Brasil)", "pt-br"),
+    ("Русский", "ru"),
+    ("Українська", "uk"),
+    ("ქართული", "ka"),
+    ("日本語", "ja"),
+    ("简体中文", "zh-hans"),
+    ("繁體中文", "zh-hant"),
+];
+
+/// Settings ▸ Startup & Repair ▸ Window Graphics: (label, `startup.windowGraphics` value).
+pub const WINDOW_GRAPHICS: &[(&str, &str)] = &[("Automatic", "auto"), ("OpenGL (compatibility)", "gl")];
+
+/// Settings ▸ Appearance ▸ Appearance Mode: (label, `appearance.appearanceMode` value). Auto
+/// follows the operating system's light or dark appearance.
+pub const APPEARANCE_MODES: &[(&str, &str)] = &[("Sync with System", "auto"), ("Dark", "dark"), ("Light", "light")];
+
+/// The dark family of themes: (label, `appearance.darkTheme` value).
+pub const DARK_THEMES: &[(&str, &str)] = &[("Dark", "dark"), ("Darker", "darker")];
+
+/// The light family of themes: (label, `appearance.lightTheme` value).
+pub const LIGHT_THEMES: &[(&str, &str)] = &[("Light", "light")];
+
+/// Every theme (the legacy single-theme `appearance.theme`).
+pub const THEMES: &[(&str, &str)] = &[("Dark", "dark"), ("Darker", "darker"), ("Light", "light")];
+
+/// The settings whose value must be one of their choices.
+pub(super) fn choices(key: &str) -> Option<&'static [(&'static str, &'static str)]> {
+    match key {
+        "general.language" => Some(LANGUAGES),
+        "startup.windowGraphics" => Some(WINDOW_GRAPHICS),
+        "appearance.appearanceMode" => Some(APPEARANCE_MODES),
+        "appearance.darkTheme" => Some(DARK_THEMES),
+        "appearance.lightTheme" => Some(LIGHT_THEMES),
+        "appearance.theme" => Some(THEMES),
+        _ => None,
+    }
+}
+
+pub(super) fn is_choice(choices: &[(&str, &str)], v: &str) -> bool {
+    choices.iter().any(|(_, c)| *c == v)
+}
+
+/// The appearance mode and the per-mode setting a theme belongs to (`darker` → (`dark`,
+/// `darkTheme`)); `None` for an unknown theme.
+pub fn theme_family(theme: &str) -> Option<(&'static str, &'static str)> {
+    if is_choice(DARK_THEMES, theme) {
+        Some(("dark", "darkTheme"))
+    } else if is_choice(LIGHT_THEMES, theme) {
+        Some(("light", "lightTheme"))
+    } else {
+        None
+    }
+}
diff --git a/crates/engine/src/settings/prefs/dialog.rs b/crates/engine/src/settings/prefs/dialog.rs
new file mode 100644
index 000000000..e3f2006d8
--- /dev/null
+++ b/crates/engine/src/settings/prefs/dialog.rs
@@ -0,0 +1,430 @@
+use super::choices::{APPEARANCE_MODES, DARK_THEMES, LANGUAGES, LIGHT_THEMES, WINDOW_GRAPHICS};
+use super::{Value, json};
+
+// ---------------------------------------------------------------- schema (Settings dialog)
+
+/// What a setting row edits.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Kind {
+    Bool,
+    /// Integer with range and unit.
+    Int(i64, i64, &'static str),
+    /// Number with range and unit.
+    Float(f64, f64, &'static str),
+    /// One of (label, value).
+    Choice(&'static [(&'static str, &'static str)]),
+    Text,
+    /// A folder or file path (text + Choose…).
+    Path,
+    /// `#rrggbb`.
+    Color,
+    /// UI brightness slider.
+    Slider(f64, f64),
+}
+
+/// One row of a settings page.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Item {
+    Section(&'static str),
+    Setting {
+        key: &'static str,
+        label: &'static str,
+        kind: Kind,
+        /// Changes behaviour today (false = shown for parity, listed in docs/preferences.md).
+        live: bool,
+    },
+    /// A button running a command (`params` is JSON).
+    Button {
+        label: &'static str,
+        command: &'static str,
+        params: &'static str,
+    },
+    /// The 16 label names and colours.
+    Labels,
+    /// Output device picker (device list from the host).
+    AudioDevices {
+        key: &'static str,
+    },
+    /// Read-only information line.
+    Note(&'static str),
+    /// The browser's storage manager (web app only, `storage.*`): usage and quota, persistent
+    /// storage, Clear buttons. Not shown where there is no browser storage.
+    BrowserStorage,
+    /// A task's trained models (`roto.models`, `face.models`): authors, licence, size, install,
+    /// choose.
+    Models(effectcraft_segment::Task),
+}
+
+/// One page of the Settings dialog.
+#[derive(Clone, Debug)]
+pub struct Page {
+    pub id: &'static str,
+    pub title: &'static str,
+    pub items: Vec<Item>,
+}
+
+const fn s(key: &'static str, label: &'static str, kind: Kind, live: bool) -> Item {
+    Item::Setting { key, label, kind, live }
+}
+
+const B: Kind = Kind::Bool;
+
+const ON_OFF_RES: &[(&str, &str)] = &[("1/2", "1/2"), ("1/4", "1/4"), ("1/8", "1/8")];
+
+const STYLES: &[(&str, &str)] = &[("Lines", "lines"), ("Dashed Lines", "dashed"), ("Dots", "dots")];
+
+/// The Settings pages in After Effects 2026 order.
+pub fn pages() -> Vec<Page> {
+    use Item::*;
+    vec![
+        Page {
+            id: "general",
+            title: "General",
+            items: vec![
+                s("general.language", "Language", Kind::Choice(LANGUAGES), true),
+                s("general.undoLevels", "Levels of Undo", Kind::Int(1, 99, ""), true),
+                s("general.pathPointSize", "Path Point and Handle Size", Kind::Int(3, 20, "px"), true),
+                s("general.recentItems", "Recent Projects Shown", Kind::Int(1, 30, ""), true),
+                Section("Options"),
+                s("general.showToolTips", "Show Tool Tips", B, true),
+                s("general.createLayersAtCompStart", "Create Layers at Composition Start Time", B, true),
+                s("general.switchesAffectNestedComps", "Switches Affect Nested Comps", B, true),
+                s("general.defaultSpatialLinear", "Default Spatial Interpolation to Linear", B, true),
+                s("general.preserveConstantVertexCount", "Preserve Constant Vertex and Feather Point Count when Editing Masks", B, true),
+                s("general.syncTimeRelatedItems", "Synchronize Time of All Related Items", B, true),
+                s("general.expressionPickWhipCompact", "Expression Pick Whip Writes Compact English", B, true),
+                s("general.createSplitLayersAbove", "Create Split Layers Above Original Layer", B, true),
+                s("general.useSystemColorPicker", "Use System Color Picker", B, false),
+                Note("EffectCraft always uses its own colour picker (the same on every platform and the web)."),
+            ],
+        },
+        Page {
+            id: "startup",
+            title: "Startup & Repair",
+            items: vec![
+                s("startup.showHomeOnLaunch", "Show Home Screen When Launching", B, true),
+                s("startup.showHomeOnOpenProject", "Show Home Screen When Opening a Project", B, true),
+                s("startup.offerCrashRecovery", "Offer to Open the Latest Auto-Save After a Crash", B, true),
+                s("startup.windowGraphics", "Window Graphics", Kind::Choice(WINDOW_GRAPHICS), true),
+                Note(
+                    "Window Graphics applies from the next launch. When the graphics driver stops EffectCraft as its window opens, the next launch switches to OpenGL.",
+                ),
+                Section("Repair"),
+                Button { label: "Reset Settings", command: "prefs.reset", params: "{}" },
+                Button { label: "Reset Keyboard Shortcuts", command: "shortcuts.reset", params: "{}" },
+                Button { label: "Empty Disk Cache", command: "edit.purge", params: r#"{"what":"disk"}"# },
+            ],
+        },
+        Page {
+            id: "project",
+            title: "Project",
+            items: vec![
+                Section("New Project"),
+                s("project.useTemplate", "New Project Loads Template", B, true),
+                s("project.templatePath", "Template Project", Kind::Path, true),
+                Section("Auto-Save"),
+                s("autoSave.enabled", "Automatically Save Projects", B, true),
+                s("autoSave.intervalMinutes", "Save Every", Kind::Int(1, 240, "Minutes"), true),
+                s("autoSave.maxVersions", "Maximum Project Versions", Kind::Int(1, 99, ""), true),
+                s("autoSave.location", "Auto-Save Location", Kind::Choice(&[("Next to Project", "nextToProject"), ("Custom Location", "custom")]), true),
+                s("autoSave.folder", "Custom Location", Kind::Path, true),
+                s("autoSave.saveOnRenderStart", "Save When Starting Render Queue", B, true),
+                Button { label: "Save Now", command: "file.autoSave", params: "{}" },
+            ],
+        },
+        Page {
+            id: "composition",
+            title: "Composition",
+            items: vec![
+                Section("Motion Path"),
+                s(
+                    "composition.motionPath",
+                    "Motion Path",
+                    Kind::Choice(&[
+                        ("All Keyframes", "all"),
+                        ("No Motion Path", "none"),
+                        ("No More Than (Seconds)", "seconds"),
+                        ("No More Than (Keyframes)", "keyframes"),
+                    ]),
+                    true,
+                ),
+                s("composition.motionPathSeconds", "Seconds", Kind::Float(0.0, 3600.0, "s"), true),
+                s("composition.motionPathKeyframes", "Keyframes", Kind::Int(1, 10_000, ""), true),
+                Section("Display"),
+                s("composition.showRenderingProgress", "Show Rendering Progress in Info Panel and Flowchart", B, true),
+                s("composition.hardwareAcceleratePanels", "Hardware Accelerate Composition, Layer and Footage Panels", B, false),
+                Note("Panels are always drawn by the GPU (wgpu)."),
+            ],
+        },
+        Page {
+            id: "previews",
+            title: "Previews",
+            items: vec![
+                s("previews.adaptiveResolutionLimit", "Adaptive Resolution Limit", Kind::Choice(ON_OFF_RES), true),
+                s("previews.showInternalWireframes", "Show Internal Wireframes", B, true),
+                s("previews.cacheFramesWhenIdle", "Cache Frames When Idle", B, true),
+                s("previews.fastPreviews", "Fast Previews (Draft 3D, Faster Effects)", B, true),
+                s("previews.zoomQuality", "Viewer Zoom Quality", Kind::Choice(&[("Faster", "faster"), ("More Accurate", "moreAccurate")]), true),
+                s("previews.displayProfile", "Display Color Space", Kind::Choice(&[("sRGB", "srgb"), ("Display P3", "p3")]), true),
+                Button { label: "GPU Information...", command: "app.gpuInfo", params: "{}" },
+            ],
+        },
+        Page {
+            id: "appearance",
+            title: "Appearance",
+            items: vec![
+                s("appearance.appearanceMode", "Appearance Mode", Kind::Choice(APPEARANCE_MODES), true),
+                s("appearance.lightTheme", "Light Theme", Kind::Choice(LIGHT_THEMES), true),
+                s("appearance.darkTheme", "Dark Theme", Kind::Choice(DARK_THEMES), true),
+                s("appearance.brightness", "Brightness", Kind::Slider(-1.0, 1.0), true),
+                s("appearance.uiScale", "UI Scale", Kind::Int(75, 200, "%"), true),
+                Section("Labels and Colors"),
+                s("appearance.useLabelColorForHandles", "Use Label Color for Layer Handles and Paths", B, true),
+                s("appearance.useLabelColorForTabs", "Use Label Color for Related Tabs", B, true),
+                s("appearance.cycleMaskColors", "Cycle Mask Colors", B, true),
+                s("appearance.useGradients", "Use Gradients", B, true),
+                Section("Menu Bar"),
+                s("appearance.inWindowMenuBarMac", "Use In-Window Menu Bar on macOS", B, true),
+            ],
+        },
+        Page {
+            id: "grids",
+            title: "Grids & Guides",
+            items: vec![
+                Section("Grid"),
+                s("grids.gridColor", "Color", Kind::Color, true),
+                s("grids.gridSpacing", "Gridline Every", Kind::Float(1.0, 10_000.0, "px"), true),
+                s("grids.gridSubdivisions", "Subdivisions", Kind::Int(1, 100, ""), true),
+                s("grids.gridStyle", "Style", Kind::Choice(STYLES), true),
+                Section("Proportional Grid"),
+                s("grids.proportionalHorizontal", "Horizontal", Kind::Int(1, 100, ""), true),
+                s("grids.proportionalVertical", "Vertical", Kind::Int(1, 100, ""), true),
+                Section("Guides"),
+                s("grids.guideColor", "Color", Kind::Color, true),
+                s("grids.guideStyle", "Style", Kind::Choice(STYLES), true),
+                Section("Safe Margins"),
+                s("grids.actionSafe", "Action-safe", Kind::Float(0.0, 50.0, "%"), true),
+                s("grids.titleSafe", "Title-safe", Kind::Float(0.0, 50.0, "%"), true),
+            ],
+        },
+        Page { id: "labels", title: "Labels", items: vec![Labels] },
+        Page {
+            id: "type",
+            title: "Type",
+            items: vec![
+                s("type.textEngine", "Text Engine", Kind::Choice(&[("Latin", "latin"), ("South Asian and Middle Eastern", "southAsian")]), true),
+                s("type.fontPreview", "Show Font Preview", B, true),
+                s("type.recentFonts", "Number of Recent Fonts to Display", Kind::Int(0, 30, ""), true),
+                s("type.fontNamesInEnglish", "Show Font Names in English", B, true),
+            ],
+        },
+        Page {
+            id: "import",
+            title: "Import",
+            items: vec![
+                s("import.stillFootage", "Still Footage", Kind::Choice(&[("Length of Composition", "compLength"), ("Duration (Seconds)", "seconds")]), true),
+                s("import.stillSeconds", "Still Duration", Kind::Float(0.04, 86_400.0, "s"), true),
+                s("import.sequenceFps", "Sequence Footage", Kind::Float(1.0, 999.0, "frames per second"), true),
+                s("import.reportMissingFrames", "Report Missing Frames", B, true),
+                s(
+                    "import.autoReloadFootage",
+                    "Automatically Reload Footage",
+                    Kind::Choice(&[("Off", "off"), ("Non-Sequence Footage", "nonSequence"), ("All Footage", "all")]),
+                    true,
+                ),
+                s(
+                    "import.unlabeledAlpha",
+                    "Interpret Unlabeled Alpha As",
+                    Kind::Choice(&[
+                        ("Ask User", "ask"),
+                        ("Guess", "guess"),
+                        ("Ignore", "ignore"),
+                        ("Straight", "straight"),
+                        ("Premultiplied", "premultiplied"),
+                    ]),
+                    true,
+                ),
+                s(
+                    "import.dragImportAs",
+                    "Default Drag Import As",
+                    Kind::Choice(&[("Footage", "footage"), ("Composition", "comp"), ("Composition - Retain Layer Sizes", "compLayerSizes")]),
+                    true,
+                ),
+            ],
+        },
+        Page {
+            id: "export",
+            title: "Export",
+            items: vec![
+                s("export.defaultOutputFolder", "Default Output Folder", Kind::Path, true),
+                s("export.segmentSequences", "Segment Sequences", B, true),
+                s("export.segmentSequenceFiles", "Files per Segment", Kind::Int(1, 100_000, "files"), true),
+                s("export.segmentMovies", "Segment Movie Files", B, true),
+                s("export.segmentMovieMb", "Segment Size", Kind::Int(1, 1_000_000, "MB"), true),
+                s("export.appendBitsToName", "Append Bit Depth to File Name", B, true),
+            ],
+        },
+        Page {
+            id: "audio",
+            title: "Audio",
+            items: vec![
+                Section("Audio Hardware"),
+                AudioDevices { key: "audio.outputDevice" },
+                s("audio.previewSampleRate", "Preview Sample Rate", Kind::Int(8_000, 192_000, "Hz"), true),
+                Section("Audio Output Mapping"),
+                s("audio.outputLeft", "Left", Kind::Int(1, 64, "channel"), true),
+                s("audio.outputRight", "Right", Kind::Int(1, 64, "channel"), true),
+            ],
+        },
+        Page {
+            id: "disk",
+            title: "Disk",
+            items: vec![
+                Section("Disk Cache"),
+                s("disk.diskCacheEnabled", "Enable Disk Cache", B, true),
+                s("disk.diskCacheMaxGb", "Maximum Disk Cache Size", Kind::Int(1, 100_000, "GB"), true),
+                s("disk.diskCacheFolder", "Disk Cache Folder", Kind::Path, true),
+                Button { label: "Empty Disk Cache", command: "edit.purge", params: r#"{"what":"disk"}"# },
+                BrowserStorage,
+                Section("Media Cache"),
+                s("disk.mediaCacheFolder", "Database and Cache Folder", Kind::Path, true),
+                s("disk.conformedMediaFolder", "Conformed Audio Folder", Kind::Path, true),
+            ],
+        },
+        Page {
+            id: "memory",
+            title: "Memory & CPU",
+            items: vec![
+                s("memory.ramReservedGb", "RAM Reserved for Other Applications", Kind::Int(0, 1024, "GB"), true),
+                Section("Cache Budgets"),
+                s("memory.layerCacheMb", "Layer Cache", Kind::Int(64, 1 << 20, "MB"), true),
+                s("memory.mediaCacheMb", "Footage Frame Cache", Kind::Int(64, 1 << 20, "MB"), true),
+                s("memory.previewCacheMb", "Preview (RAM) Cache", Kind::Int(64, 1 << 20, "MB"), true),
+                s("memory.reduceCacheWhenLow", "Reduce Cache Size When System Is Low on Memory", B, true),
+            ],
+        },
+        Page {
+            id: "video",
+            title: "Video",
+            items: vec![
+                s("video.enableOutput", "Enable Video Preview Output", B, true),
+                s("video.device", "Video Device", Kind::Choice(&[("Floating Window", ""), ("Full Screen", "fullscreen")]), true),
+                s("video.outputDuringPlayback", "Video Output During Playback", B, true),
+                s("video.mirrorOnMonitor", "Mirror on Computer Monitor", B, true),
+                s("video.disableWhenBackground", "Disable Video Output When in Background", B, true),
+            ],
+        },
+        Page {
+            id: "3d",
+            title: "3D",
+            items: vec![
+                s("threeD.defaultRenderer", "Default 3D Renderer", Kind::Choice(&[("Classic 3D", "classic"), ("Advanced 3D", "advanced")]), true),
+                s("threeD.showReferenceAxes", "Show 3D Reference Axes", B, true),
+                s("threeD.extendedViewer", "Extended Viewer", B, true),
+                s("threeD.realtimeShadows", "Realtime Shadows in Draft", B, true),
+            ],
+        },
+        Page {
+            id: "scripting",
+            title: "Scripting & Expressions",
+            items: vec![
+                Section("Application Scripting"),
+                s("scripting.allowScriptsWriteFiles", "Allow Scripts to Write Files and Access Network", B, true),
+                s("scripting.warnExecutingFiles", "Warn User When Executing Files", B, true),
+                s("scripting.enableJsDebugger", "Enable JavaScript Debugger", B, false),
+                Section("Expressions Editor"),
+                s("scripting.editorFontSize", "Font Size", Kind::Int(8, 40, "pt"), true),
+                s("scripting.syntaxHighlighting", "Syntax Highlighting", B, true),
+                s("scripting.lineNumbers", "Line Numbers", B, true),
+                s("scripting.autoComplete", "Auto-complete", B, true),
+                s("scripting.bracketMatching", "Bracket Matching", B, true),
+                s("scripting.wordWrap", "Word Wrap", B, true),
+                s("scripting.errorBanner", "Show Expression Error Banner", B, true),
+                Note("Expressions use the JavaScript engine. Script errors report their file and line in the Script Console; there is no step debugger."),
+            ],
+        },
+        Page {
+            id: "roto",
+            title: "Roto Brush",
+            items: vec![
+                Section("Segmentation Model"),
+                Note(
+                    "Roto Brush 2.0 and 3.0 use the model chosen here (Version 1.0 always uses the classic engine). Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+                ),
+                Models(effectcraft_segment::Task::Mask),
+            ],
+        },
+        Page {
+            id: "face",
+            title: "Face Tracking",
+            items: vec![
+                Section("Face Model"),
+                Note(
+                    "Face tracking in the Tracker panel (Outline Only and Detailed Features) uses the model chosen here. Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+                ),
+                Models(effectcraft_segment::Task::Face),
+            ],
+        },
+    ]
+}
+
+/// Keys of every setting that doesn't change behaviour yet (the TODO list in
+/// `docs/preferences.md`).
+pub fn todo_keys() -> Vec<&'static str> {
+    pages()
+        .into_iter()
+        .flat_map(|p| p.items)
+        .filter_map(|i| match i {
+            Item::Setting { key, live: false, .. } => Some(key),
+            _ => None,
+        })
+        .collect()
+}
+
+/// The schema as JSON (for `prefs.pages`).
+pub fn pages_json() -> Value {
+    let kind = |k: &Kind| -> Value {
+        match k {
+            Kind::Bool => json!({"type": "bool"}),
+            Kind::Int(a, b, u) => json!({"type": "int", "min": a, "max": b, "unit": u}),
+            Kind::Float(a, b, u) => json!({"type": "number", "min": a, "max": b, "unit": u}),
+            Kind::Choice(o) => json!({"type": "choice", "options": o.iter().map(|(l, v)| json!({"label": l, "value": v})).collect::<Vec<_>>()}),
+            Kind::Text => json!({"type": "text"}),
+            Kind::Path => json!({"type": "path"}),
+            Kind::Color => json!({"type": "color"}),
+            Kind::Slider(a, b) => json!({"type": "slider", "min": a, "max": b}),
+        }
+    };
+    let pages: Vec<Value> = pages()
+        .iter()
+        .map(|p| {
+            let items: Vec<Value> = p
+                .items
+                .iter()
+                .map(|i| match i {
+                    Item::Section(t) => json!({"section": t}),
+                    Item::Setting { key, label, kind: k, live } => {
+                        let mut o = kind(k);
+                        o["key"] = json!(key);
+                        o["label"] = json!(label);
+                        o["live"] = json!(live);
+                        o
+                    }
+                    Item::Button { label, command, params } => {
+                        json!({"button": label, "command": command, "params": serde_json::from_str::<Value>(params).unwrap_or_default()})
+                    }
+                    Item::Labels => json!({"labels": "labels.N.name / labels.N.color (N = 0..15)"}),
+                    Item::AudioDevices { key } => json!({"type": "device", "key": key, "label": "Default Output"}),
+                    Item::Note(t) => json!({"note": t}),
+                    Item::BrowserStorage => json!({"browserStorage": "storage.info / storage.persist / storage.clear (web app)"}),
+                    Item::Models(task) => {
+                        let p = if *task == effectcraft_segment::Task::Face { "face" } else { "roto" };
+                        json!({"models": format!("{p}.models / {p}.model.select / {p}.model.download / {p}.model.install / {p}.model.remove"), "key": format!("{p}.model")})
+                    }
+                })
+                .collect();
+            json!({"id": p.id, "title": p.title, "items": items})
+        })
+        .collect();
+    json!(pages)
+}
diff --git a/crates/engine/src/settings/prefs/document.rs b/crates/engine/src/settings/prefs/document.rs
new file mode 100644
index 000000000..d82205352
--- /dev/null
+++ b/crates/engine/src/settings/prefs/document.rs
@@ -0,0 +1,325 @@
+use super::choices::{APPEARANCE_MODES, DARK_THEMES, LANGUAGES, LIGHT_THEMES, THEMES, WINDOW_GRAPHICS, choices, is_choice, theme_family};
+use super::recent::{MAX_EFFECTS_FAVORITES, MAX_RECENT_SCRIPTS};
+use super::sections::{CompPreset, default_labels, parse_hex};
+use super::{Appearance, General, Map, PREFS_VERSION, Prefs, Startup, Value, json};
+
+/// Bring an older settings document up to [`PREFS_VERSION`].
+///
+/// - version 0/1 (early builds) kept a flat object: `undoLevels`, `autoSaveEnabled`,
+///   `autoSaveMinutes`, `autoSaveVersions`, `labelNames` (array) and `theme` at the top level.
+/// - version 2 defaulted the disk cache to 100 GB, more than most laptops have free; the stored
+///   old default becomes the new one (a size the user chose is kept).
+pub fn migrate(mut v: Value) -> Value {
+    let Some(obj) = v.as_object_mut() else { return json!({}) };
+    let version = obj.get("version").and_then(Value::as_u64).unwrap_or(0);
+    if version < 2 {
+        let moved = |from: &str, page: &str, key: &str, obj: &mut Map<String, Value>| {
+            if let Some(x) = obj.remove(from) {
+                let p = obj.entry(page.to_string()).or_insert_with(|| json!({}));
+                if let Some(p) = p.as_object_mut() {
+                    p.entry(key.to_string()).or_insert(x);
+                }
+            }
+        };
+        moved("undoLevels", "general", "undoLevels", obj);
+        moved("autoSaveEnabled", "autoSave", "enabled", obj);
+        moved("autoSaveMinutes", "autoSave", "intervalMinutes", obj);
+        moved("autoSaveVersions", "autoSave", "maxVersions", obj);
+        moved("theme", "appearance", "theme", obj);
+        if let Some(Value::Array(names)) = obj.remove("labelNames") {
+            let mut labels = default_labels();
+            for (l, n) in labels.iter_mut().zip(names) {
+                if let Some(n) = n.as_str() {
+                    l.name = n.to_string();
+                }
+            }
+            obj.insert("labels".into(), serde_json::to_value(labels).unwrap_or_default());
+        }
+    }
+    if version < 3
+        && let Some(d) = obj.get_mut("disk").and_then(Value::as_object_mut)
+        && d.get("diskCacheMaxGb").and_then(Value::as_u64) == Some(100)
+    {
+        d.insert("diskCacheMaxGb".into(), json!(20));
+    }
+    // Settings saved before appearance modes had one theme: keep showing it, as a fixed Dark or
+    // Light mode, instead of switching established users to Auto.
+    if let Some(a) = obj.get_mut("appearance").and_then(Value::as_object_mut)
+        && !a.contains_key("appearanceMode")
+        && let Some(theme) = a.get("theme").and_then(Value::as_str).map(str::to_string)
+        && let Some((mode, slot)) = theme_family(&theme)
+    {
+        a.insert("appearanceMode".into(), json!(mode));
+        a.insert(slot.into(), json!(theme));
+    }
+    obj.insert("version".into(), json!(PREFS_VERSION));
+    v
+}
+
+impl Prefs {
+    /// Parse a settings document (migrating older layouts; unknown keys are kept, bad values
+    /// fall back to defaults).
+    pub fn from_json(text: &str) -> Prefs {
+        let v: Value = serde_json::from_str(text).unwrap_or_else(|_| json!({}));
+        let v = migrate(v);
+        let mut p: Prefs = match serde_json::from_value(v.clone()) {
+            Ok(p) => p,
+            // One bad value shouldn't lose everything: take each page that parses.
+            Err(_) => {
+                let mut base = serde_json::to_value(Prefs::default()).unwrap_or_default();
+                if let (Some(b), Some(o)) = (base.as_object_mut(), v.as_object()) {
+                    for (k, x) in o {
+                        let mut trial = b.clone();
+                        trial.insert(k.clone(), x.clone());
+                        if serde_json::from_value::<Prefs>(Value::Object(trial)).is_ok() {
+                            b.insert(k.clone(), x.clone());
+                        }
+                    }
+                }
+                serde_json::from_value(base).unwrap_or_default()
+            }
+        };
+        p.normalize();
+        p
+    }
+
+    pub fn to_json(&self) -> String {
+        serde_json::to_string_pretty(self).unwrap_or_default()
+    }
+
+    /// Clamp values into their valid ranges and fill missing labels.
+    pub fn normalize(&mut self) {
+        self.version = PREFS_VERSION;
+        self.comp_presets.retain(CompPreset::is_valid);
+        let mut seen = std::collections::HashSet::new();
+        self.effects_favorites.retain(|id| !id.is_empty() && seen.insert(id.clone()));
+        self.effects_favorites.truncate(MAX_EFFECTS_FAVORITES);
+        if !is_choice(WINDOW_GRAPHICS, &self.startup.window_graphics) {
+            self.startup.window_graphics = Startup::default().window_graphics;
+        }
+        let g = &mut self.general;
+        if !is_choice(LANGUAGES, &g.language) {
+            g.language = General::default().language;
+        }
+        g.undo_levels = g.undo_levels.clamp(1, 99);
+        g.path_point_size = g.path_point_size.clamp(3, 20);
+        g.recent_items = g.recent_items.clamp(1, 30);
+        let a = &mut self.auto_save;
+        a.interval_minutes = a.interval_minutes.clamp(1, 240);
+        a.max_versions = a.max_versions.clamp(1, 99);
+        let ap = &mut self.appearance;
+        let mut seen = std::collections::BTreeSet::new();
+        ap.favorite_themes.retain(|id| is_choice(THEMES, id) && seen.insert(id.clone()));
+        if !is_choice(APPEARANCE_MODES, &ap.appearance_mode) {
+            ap.appearance_mode = Appearance::default().appearance_mode;
+        }
+        if !is_choice(DARK_THEMES, &ap.dark_theme) {
+            ap.dark_theme = Appearance::default().dark_theme;
+        }
+        if !is_choice(LIGHT_THEMES, &ap.light_theme) {
+            ap.light_theme = Appearance::default().light_theme;
+        }
+        // The legacy single theme mirrors the theme a fixed mode shows (Auto depends on the
+        // system, so it keeps the last one).
+        match ap.appearance_mode.as_str() {
+            "dark" => ap.theme = ap.dark_theme.clone(),
+            "light" => ap.theme = ap.light_theme.clone(),
+            _ if !is_choice(THEMES, &ap.theme) => ap.theme = ap.dark_theme.clone(),
+            _ => {}
+        }
+        self.appearance.brightness = self.appearance.brightness.clamp(-1.0, 1.0);
+        self.appearance.ui_scale = self.appearance.ui_scale.clamp(75, 200);
+        let defaults = default_labels();
+        self.labels.truncate(defaults.len());
+        for d in defaults.iter().skip(self.labels.len()) {
+            self.labels.push(d.clone());
+        }
+        for (l, d) in self.labels.iter_mut().zip(&defaults) {
+            if parse_hex(&l.color).is_none() {
+                l.color = d.color.clone();
+            }
+        }
+        let m = &mut self.memory;
+        m.layer_cache_mb = m.layer_cache_mb.clamp(64, 1 << 20);
+        m.media_cache_mb = m.media_cache_mb.clamp(64, 1 << 20);
+        m.preview_cache_mb = m.preview_cache_mb.clamp(64, 1 << 20);
+        self.grids.grid_spacing = self.grids.grid_spacing.clamp(1.0, 10_000.0);
+        let n = self.general.recent_items as usize;
+        self.recent_projects.truncate(n);
+        self.recent_scripts.truncate(MAX_RECENT_SCRIPTS);
+    }
+
+    /// The value at a dotted key (`general.undoLevels`, `labels.3.color`); `""` = everything.
+    pub fn get(&self, key: &str) -> Option<Value> {
+        let v = serde_json::to_value(self).ok()?;
+        if key.is_empty() {
+            return Some(v);
+        }
+        let ptr = format!("/{}", key.replace('.', "/"));
+        v.pointer(&ptr).cloned()
+    }
+
+    /// Set the value at a dotted key. The key must exist and the value must have its type.
+    pub fn set(&mut self, key: &str, value: Value) -> Result<(), String> {
+        if let Some(c) = choices(key)
+            && !value.as_str().is_some_and(|v| is_choice(c, v))
+        {
+            let all: Vec<&str> = c.iter().map(|(_, v)| *v).collect();
+            return Err(format!("`{key}` expects one of {}", all.join(", ")));
+        }
+        let favorites = if key == "appearance.favoriteThemes" {
+            Some(&value)
+        } else if key == "appearance" {
+            value.get("favoriteThemes")
+        } else {
+            None
+        };
+        if let Some(favorites) = favorites {
+            let values = favorites.as_array().ok_or("favorite themes must be a list")?;
+            let mut seen = std::collections::BTreeSet::new();
+            for value in values {
+                let id = value.as_str().ok_or("favorite theme must be a string")?;
+                if !is_choice(THEMES, id) || !seen.insert(id) {
+                    return Err("unknown or duplicate favorite theme".into());
+                }
+            }
+        }
+        // Older clients set the single theme (by key, or inside the page object): it still picks
+        // a visible theme, fixing the mode to its family.
+        let legacy_theme = key == "appearance.theme" || (key == "appearance" && value.get("theme").is_some() && value.get("appearanceMode").is_none());
+        let mut v = serde_json::to_value(&*self).map_err(|e| e.to_string())?;
+        let ptr = format!("/{}", key.replace('.', "/"));
+        let slot = v.pointer_mut(&ptr).ok_or_else(|| format!("unknown setting `{key}`"))?;
+        let value = coerce(slot, value).ok_or_else(|| format!("`{key}` expects a {}", kind_name(slot)))?;
+        *slot = value;
+        let mut next: Prefs = serde_json::from_value(v).map_err(|e| format!("`{key}`: {e}"))?;
+        let (a, b) = (&self.appearance, &next.appearance);
+        let only_theme_changed = a.theme != b.theme && a.appearance_mode == b.appearance_mode && a.dark_theme == b.dark_theme && a.light_theme == b.light_theme;
+        if legacy_theme || only_theme_changed {
+            next.appearance.select_theme();
+        }
+        next.normalize();
+        *self = next;
+        Ok(())
+    }
+
+    /// Reset one page (`general`, `labels`, `autoSave`…) or everything (`None`). Open Recent and
+    /// the saved composition presets are kept.
+    pub fn reset(&mut self, page: Option<&str>) -> Result<(), String> {
+        let d = Prefs::default();
+        let Some(page) = page else {
+            *self = Prefs {
+                recent_projects: std::mem::take(&mut self.recent_projects),
+                recent_footage: std::mem::take(&mut self.recent_footage),
+                recent_presets: std::mem::take(&mut self.recent_presets),
+                recent_scripts: std::mem::take(&mut self.recent_scripts),
+                recent_fonts: std::mem::take(&mut self.recent_fonts),
+                effects_favorites: std::mem::take(&mut self.effects_favorites),
+                preview: std::mem::take(&mut self.preview),
+                comp_presets: std::mem::take(&mut self.comp_presets),
+                ..d
+            };
+            return Ok(());
+        };
+        let keys: Vec<&str> = match page {
+            "project" => vec!["project", "autoSave"],
+            p => vec![section_key(p).ok_or_else(|| format!("unknown settings page `{p}`"))?],
+        };
+        let dv = serde_json::to_value(&d).map_err(|e| e.to_string())?;
+        for k in keys {
+            if let Some(x) = dv.get(k) {
+                self.set(k, x.clone())?;
+            }
+        }
+        Ok(())
+    }
+}
+
+/// Settings key of a page id (`3d` → `threeD`).
+pub fn section_key(page: &str) -> Option<&'static str> {
+    Some(match page {
+        "general" => "general",
+        "startup" => "startup",
+        "project" => "project",
+        "autoSave" | "autosave" => "autoSave",
+        "composition" | "display" => "composition",
+        "previews" => "previews",
+        "appearance" => "appearance",
+        "grids" => "grids",
+        "labels" => "labels",
+        "type" => "type",
+        "import" => "import",
+        "export" => "export",
+        "audio" => "audio",
+        "disk" => "disk",
+        "memory" => "memory",
+        "video" => "video",
+        "3d" | "threeD" => "threeD",
+        "scripting" => "scripting",
+        "roto" => "roto",
+        "face" => "face",
+        _ => return None,
+    })
+}
+
+/// Settings page id for a page name, including older After Effects page names
+/// (Auto-Save → Project, Media & Disk Cache → Disk, Memory & Performance → Memory & CPU…).
+pub fn page_id(name: &str) -> Option<&'static str> {
+    let n = name.to_ascii_lowercase().replace([' ', '&', '-', '_'], "");
+    let id = match n.as_str() {
+        "general" => "general",
+        "startup" | "startuprepair" => "startup",
+        "project" | "autosave" | "newproject" => "project",
+        "composition" | "display" => "composition",
+        "previews" | "preview" => "previews",
+        "appearance" => "appearance",
+        "grids" | "gridsguides" => "grids",
+        "labels" => "labels",
+        "type" => "type",
+        "import" => "import",
+        "export" | "output" => "export",
+        "audio" | "audiohardware" | "audiooutputmapping" => "audio",
+        "disk" | "mediadiskcache" | "mediacache" => "disk",
+        "memory" | "memorycpu" | "memoryperformance" => "memory",
+        "video" | "videopreview" => "video",
+        "3d" | "threed" => "3d",
+        "scripting" | "scriptingexpressions" => "scripting",
+        "roto" | "rotobrush" | "models" => "roto",
+        "face" | "facetracking" => "face",
+        _ => return None,
+    };
+    Some(id)
+}
+
+fn kind_name(v: &Value) -> &'static str {
+    match v {
+        Value::Bool(_) => "boolean",
+        Value::Number(_) => "number",
+        Value::String(_) => "string",
+        Value::Array(_) => "list",
+        Value::Object(_) => "object",
+        Value::Null => "value",
+    }
+}
+
+/// `value` converted to the type of `slot` (numbers from strings, booleans from 0/1…).
+fn coerce(slot: &Value, value: Value) -> Option<Value> {
+    Some(match (slot, value) {
+        (Value::Bool(_), Value::Bool(b)) => json!(b),
+        (Value::Bool(_), Value::Number(n)) => json!(n.as_f64()? != 0.0),
+        (Value::Bool(_), Value::String(s)) => json!(matches!(s.as_str(), "true" | "on" | "1" | "yes")),
+        (Value::Number(cur), v) => {
+            let f = match &v {
+                Value::Number(n) => n.as_f64()?,
+                Value::String(s) => s.trim().parse().ok()?,
+                _ => return None,
+            };
+            if cur.is_u64() || cur.is_i64() { json!(f.round().max(0.0) as u64) } else { json!(f) }
+        }
+        (Value::String(_), Value::String(s)) => json!(s),
+        (Value::String(_), Value::Number(n)) => json!(n.to_string()),
+        (Value::Array(_), v @ Value::Array(_)) => v,
+        (Value::Object(_), v @ Value::Object(_)) => v,
+        _ => return None,
+    })
+}
diff --git a/crates/engine/src/settings/prefs/queries.rs b/crates/engine/src/settings/prefs/queries.rs
new file mode 100644
index 000000000..74be30f8f
--- /dev/null
+++ b/crates/engine/src/settings/prefs/queries.rs
@@ -0,0 +1,208 @@
+use super::sections::parse_hex;
+use super::{Label, Prefs, Serialize, Tick};
+
+impl Prefs {
+    /// Display name of a label (Labels settings).
+    pub fn label_name(&self, l: Label) -> String {
+        match label_index(l) {
+            Some(i) => self.labels.get(i).map(|p| p.name.clone()).unwrap_or_else(|| l.name().to_string()),
+            None => l.name().to_string(),
+        }
+    }
+
+    /// sRGB colour of a label (Labels settings).
+    pub fn label_rgb(&self, l: Label) -> [u8; 3] {
+        label_index(l).and_then(|i| self.labels.get(i)).and_then(|p| parse_hex(&p.color)).unwrap_or(l.rgb())
+    }
+
+    /// A label by its built-in name or its (renamed) display name.
+    pub fn label_from_name(&self, s: &str) -> Option<Label> {
+        Label::from_name(s).or_else(|| Label::ALL.iter().skip(1).copied().find(|l| self.label_name(*l).eq_ignore_ascii_case(s)))
+    }
+
+    /// Layer / media / preview cache budgets in bytes.
+    pub fn layer_cache_bytes(&self) -> usize {
+        (self.memory.layer_cache_mb as usize) << 20
+    }
+
+    pub fn media_cache_bytes(&self) -> usize {
+        (self.memory.media_cache_mb as usize) << 20
+    }
+
+    pub fn preview_cache_bytes(&self) -> usize {
+        (self.memory.preview_cache_mb as usize) << 20
+    }
+
+    /// The adaptive resolution limit as a render-scale floor (1/2 → 0.5).
+    pub fn adaptive_limit(&self) -> f64 {
+        match self.previews.adaptive_resolution_limit.as_str() {
+            "1/2" => 0.5,
+            "1/4" => 0.25,
+            _ => 0.125,
+        }
+    }
+
+    /// The Memory & CPU cache budgets in effect: the configured layer / footage / preview
+    /// budgets, scaled down so together they leave **RAM Reserved for Other Applications** free,
+    /// and halved while the system is low on memory when **Reduce Cache Size When System Is Low
+    /// on Memory** is on. `mem` = the system's memory (`None` = unknown: configured budgets).
+    /// In the browser the layer and footage caches also stay within [`WEB_LAYER_CACHE`] and
+    /// [`WEB_MEDIA_CACHE`].
+    pub fn cache_budgets(&self, mem: Option<crate::sysinfo::SysMemory>) -> CacheBudgets {
+        self.cache_budgets_in(mem, cfg!(target_arch = "wasm32"))
+    }
+
+    /// [`Prefs::cache_budgets`], in the browser's memory (`web`) or not.
+    pub(crate) fn cache_budgets_in(&self, mem: Option<crate::sysinfo::SysMemory>, web: bool) -> CacheBudgets {
+        let (mut l, mut m, mut p) = (self.layer_cache_bytes() as u64, self.media_cache_bytes() as u64, self.preview_cache_bytes() as u64);
+        if web {
+            (l, m) = (l.min(WEB_LAYER_CACHE), m.min(WEB_MEDIA_CACHE));
+        }
+        let floor = 64u64 << 20;
+        let mut capped = false;
+        let mut reduced = false;
+        if let Some(mem) = mem.filter(|m| m.total > 0) {
+            let reserved = (self.memory.ram_reserved_gb as u64) << 30;
+            let cap = mem.total.saturating_sub(reserved).max(3 * floor);
+            let sum = l + m + p;
+            if sum > cap {
+                let k = cap as f64 / sum as f64;
+                (l, m, p) = ((l as f64 * k) as u64, (m as f64 * k) as u64, (p as f64 * k) as u64);
+                capped = true;
+            }
+            if self.memory.reduce_cache_when_low && mem.is_low() {
+                (l, m, p) = (l / 2, m / 2, p / 2);
+                reduced = true;
+            }
+        }
+        CacheBudgets { layer: l.max(floor) as usize, media: m.max(floor) as usize, preview: p.max(floor) as usize, capped, reduced }
+    }
+
+    /// Composition ▸ Motion Path: the layer-time span of a motion path to draw around `now`
+    /// (layer time), for keyframes at `keys` (sorted). `None` = No Motion Path.
+    pub fn motion_path_span(&self, keys: &[Tick], now: Tick) -> Option<(Tick, Tick)> {
+        let (first, last) = (*keys.first()?, *keys.last()?);
+        let c = &self.composition;
+        match c.motion_path.as_str() {
+            "none" => None,
+            "seconds" => {
+                let half = Tick::from_seconds_f64(c.motion_path_seconds.max(0.0) / 2.0);
+                let (a, b) = ((now - half).max(first), (now + half).min(last));
+                (a < b).then_some((a, b))
+            }
+            "keyframes" => {
+                let n = (c.motion_path_keyframes.max(1) as usize).min(keys.len());
+                if n < 2 {
+                    return None;
+                }
+                // The n keyframes centred on the current time.
+                let at = keys.partition_point(|k| *k < now);
+                let start = at.saturating_sub(n / 2).min(keys.len() - n);
+                Some((keys[start], keys[start + n - 1]))
+            }
+            _ => Some((first, last)),
+        }
+    }
+
+    /// Previews ▸ Viewer Zoom Quality: smooth (bilinear) scaling of the viewer image, or nearest
+    /// neighbour ("Faster").
+    pub fn viewer_zoom_smooth(&self) -> bool {
+        self.previews.zoom_quality != "faster"
+    }
+
+    /// Import ▸ Interpret Unlabeled Alpha As, for footage whose file has an alpha channel that
+    /// doesn't state how it is stored. `None` = Ask User (keep straight and open Interpret
+    /// Footage); `guess` takes premultiplied for movies (codecs with alpha are usually written
+    /// premultiplied) and straight for stills.
+    pub fn unlabeled_alpha(&self, movie: bool) -> Option<effectcraft_project::AlphaMode> {
+        use effectcraft_project::AlphaMode::*;
+        Some(match self.import.unlabeled_alpha.as_str() {
+            "ignore" => Ignore,
+            "straight" => Straight,
+            "premultiplied" => Premultiplied,
+            "guess" if movie => Premultiplied,
+            "guess" => Straight,
+            _ => return None,
+        })
+    }
+
+    /// Import ▸ Default Drag Import As, as `file.import`'s `importAs`.
+    pub fn drag_import_as(&self) -> &'static str {
+        match self.import.drag_import_as.as_str() {
+            "comp" => "composition",
+            "compLayerSizes" => "compositionLayerSizes",
+            _ => "footage",
+        }
+    }
+
+    /// Export ▸ Append Bit Depth to File Name: `Comp 1.png` → `Comp 1_16bpc.png` (sequence frame
+    /// runs and folders are kept).
+    pub fn output_name(&self, path: &str, bits: u32) -> String {
+        if !self.export.append_bits_to_name {
+            return path.to_string();
+        }
+        let p = std::path::Path::new(path);
+        let (Some(stem), dir) = (p.file_stem().map(|s| s.to_string_lossy().to_string()), p.parent()) else { return path.to_string() };
+        let tag = format!("_{bits}bpc");
+        if stem.ends_with(&tag) {
+            return path.to_string();
+        }
+        let name = match p.extension() {
+            Some(e) => format!("{stem}{tag}.{}", e.to_string_lossy()),
+            None => format!("{stem}{tag}"),
+        };
+        match dir.filter(|d| !d.as_os_str().is_empty()) {
+            Some(d) => d.join(name).to_string_lossy().to_string(),
+            None => name,
+        }
+    }
+
+    /// Export ▸ Segment Sequences / Segment Movie Files: how many frames go in each segment of an
+    /// output of `frames` frames (`None` = one file / folder). Sequences split every Files per
+    /// Segment frames; movies every Segment Size MB at the output's data rate
+    /// (`bytes_per_frame`, estimated from the format's bitrate).
+    pub fn segment_frames(&self, frames: u64, sequence: bool, bytes_per_frame: f64) -> Option<u64> {
+        let e = &self.export;
+        let per = if sequence {
+            e.segment_sequences.then_some(e.segment_sequence_files.max(1) as u64)?
+        } else {
+            if !e.segment_movies || bytes_per_frame <= 0.0 {
+                return None;
+            }
+            (((e.segment_movie_mb.max(1) as f64) * 1_048_576.0 / bytes_per_frame).floor() as u64).max(1)
+        };
+        (per < frames).then_some(per)
+    }
+}
+
+/// The most the layer cache holds in the browser. A wasm32 page addresses at most 4 GiB, which
+/// these caches share with the app and with the decoders' own decoded frames (FilmCraft keeps
+/// up to 384 MB per open movie): with the desktop's 1 GB defaults, eight stacked 1080p clips ran
+/// the page out of memory a few seconds into playback.
+pub const WEB_LAYER_CACHE: u64 = 512 << 20;
+
+/// The most the footage frame cache holds in the browser (see [`WEB_LAYER_CACHE`]).
+pub const WEB_MEDIA_CACHE: u64 = 256 << 20;
+
+/// Effective cache budgets in bytes (see [`Prefs::cache_budgets`]).
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)]
+pub struct CacheBudgets {
+    pub layer: usize,
+    pub media: usize,
+    pub preview: usize,
+    /// Scaled down to leave the reserved RAM free.
+    pub capped: bool,
+    /// Halved because the system is low on memory.
+    pub reduced: bool,
+}
+
+/// Colour of the `k`-th mask of a layer: Appearance ▸ Cycle Mask Colors cycles through the mask
+/// colours, otherwise every new mask takes the first one.
+pub fn mask_color(cycle: bool, k: usize) -> [u8; 3] {
+    use effectcraft_project::build::MASK_COLORS;
+    if cycle { MASK_COLORS[k % MASK_COLORS.len()] } else { MASK_COLORS[0] }
+}
+
+fn label_index(l: Label) -> Option<usize> {
+    Label::ALL.iter().position(|x| *x == l).and_then(|i| i.checked_sub(1))
+}
diff --git a/crates/engine/src/settings/prefs/recent.rs b/crates/engine/src/settings/prefs/recent.rs
new file mode 100644
index 000000000..2b12499f4
--- /dev/null
+++ b/crates/engine/src/settings/prefs/recent.rs
@@ -0,0 +1,87 @@
+use serde::{Deserialize, Serialize};
+
+use super::Prefs;
+
+impl Prefs {
+    /// Remember a project in File ▸ Open Recent.
+    pub fn push_recent(&mut self, path: &str) {
+        self.recent_projects.retain(|p| p != path);
+        self.recent_projects.insert(0, path.to_string());
+        self.recent_projects.truncate(self.general.recent_items as usize);
+    }
+
+    /// Remember a font in the Character panel's recent fonts (Type ▸ Number of Recent Fonts).
+    pub fn push_recent_font(&mut self, family: &str) {
+        push_mru(&mut self.recent_fonts, family, 30);
+    }
+
+    /// Is effect `id` starred in Effects & Presets?
+    pub fn is_effect_favorite(&self, id: &str) -> bool {
+        self.effects_favorites.iter().any(|f| f == id)
+    }
+
+    /// Star effect `id` in Effects & Presets, or un-star it; true when it is starred now.
+    pub fn toggle_effect_favorite(&mut self, id: &str) -> bool {
+        if self.is_effect_favorite(id) {
+            self.effects_favorites.retain(|f| f != id);
+            false
+        } else {
+            self.effects_favorites.push(id.to_string());
+            self.effects_favorites.truncate(MAX_EFFECTS_FAVORITES);
+            self.is_effect_favorite(id)
+        }
+    }
+
+    /// The recent fonts the Character panel shows (at most Number of Recent Fonts to Display).
+    pub fn recent_fonts_shown(&self) -> &[String] {
+        let n = (self.type_.recent_fonts as usize).min(self.recent_fonts.len());
+        &self.recent_fonts[..n]
+    }
+
+    /// Remember imported footage for File ▸ Import Recent Footage.
+    pub fn push_recent_footage(&mut self, path: &str) {
+        push_mru(&mut self.recent_footage, path, self.general.recent_items as usize);
+    }
+
+    /// Remember an applied animation preset for Animation ▸ Recent Animation Presets.
+    pub fn push_recent_preset(&mut self, path: &str) {
+        push_mru(&mut self.recent_presets, path, self.general.recent_items as usize);
+    }
+
+    /// Remember a script that ran for File ▸ Scripts ▸ Recent Script Files.
+    pub fn push_recent_script(&mut self, script: RecentScript) {
+        self.recent_scripts.retain(|x| *x != script);
+        self.recent_scripts.insert(0, script);
+        self.recent_scripts.truncate(MAX_RECENT_SCRIPTS);
+    }
+}
+
+/// Most scripts File ▸ Scripts ▸ Recent Script Files lists.
+pub const MAX_RECENT_SCRIPTS: usize = 10;
+
+/// A File ▸ Scripts ▸ Recent Script Files entry, stored as the `file.runScript` parameter that
+/// ran it: `{"path": …}` for a script file, `{"name": …}` for an installed or bundled script.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum RecentScript {
+    Path(String),
+    Name(String),
+}
+
+impl RecentScript {
+    /// The file's path or the script's name.
+    pub fn text(&self) -> &str {
+        match self {
+            RecentScript::Path(s) | RecentScript::Name(s) => s,
+        }
+    }
+}
+
+/// Most effects Effects & Presets keeps starred (a hand-edited settings file can hold more).
+pub(super) const MAX_EFFECTS_FAVORITES: usize = 1000;
+
+fn push_mru(list: &mut Vec<String>, v: &str, max: usize) {
+    list.retain(|x| x != v);
+    list.insert(0, v.to_string());
+    list.truncate(max.max(1));
+}
diff --git a/crates/engine/src/settings/prefs/sections.rs b/crates/engine/src/settings/prefs/sections.rs
new file mode 100644
index 000000000..e0bea8b85
--- /dev/null
+++ b/crates/engine/src/settings/prefs/sections.rs
@@ -0,0 +1,352 @@
+use super::choices::theme_family;
+use super::{BTreeMap, Deserialize, Label, Serialize, Value};
+
+/// Unknown keys inside a page, kept so a newer version's settings survive a round trip.
+pub(super) type Extra = BTreeMap<String, Value>;
+
+macro_rules! page {
+    ($(#[$m:meta])* $name:ident { $($(#[$fm:meta])* $f:ident : $t:ty = $d:expr),* $(,)? }) => {
+        $(#[$m])*
+        #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+        #[serde(default, rename_all = "camelCase")]
+        pub struct $name {
+            $($(#[$fm])* pub $f: $t,)*
+            #[serde(flatten)]
+            pub extra: Extra,
+        }
+        impl Default for $name {
+            fn default() -> Self {
+                $name { $($f: $d,)* extra: Extra::new() }
+            }
+        }
+    };
+}
+
+page!(General {
+    /// Interface language: `system` (the operating system's, where EffectCraft has it, else
+    /// English), or a language code from `LANGUAGES`.
+    language: String = "system".into(),
+    /// Levels of Undo (1–99).
+    undo_levels: u32 = 32,
+    /// Path Point and Handle Size (px).
+    path_point_size: u32 = 5,
+    show_tool_tips: bool = true,
+    /// Create New Layers at Composition Start Time (off: at the current time).
+    create_layers_at_comp_start: bool = true,
+    switches_affect_nested_comps: bool = true,
+    /// Default Spatial Interpolation to Linear.
+    default_spatial_linear: bool = false,
+    preserve_constant_vertex_count: bool = true,
+    /// Synchronize Time of All Related Items.
+    sync_time_related_items: bool = true,
+    expression_pick_whip_compact: bool = true,
+    /// Create Split Layers Above Original Layer (After Effects' default).
+    create_split_layers_above: bool = true,
+    use_system_color_picker: bool = false,
+    /// Number of projects in File ▸ Open Recent.
+    recent_items: u32 = 10,
+});
+
+page!(Startup {
+    show_home_on_launch: bool = true,
+    show_home_on_open_project: bool = false,
+    /// After a crash, offer to open the most recent auto-save.
+    offer_crash_recovery: bool = true,
+    /// What the desktop window draws with, from the next launch: `auto` (the platform's best
+    /// graphics API) or `gl` (OpenGL, for drivers that crash with the others). A launch that
+    /// stops as its window opens switches it to `gl` (#243).
+    window_graphics: String = "auto".into(),
+});
+
+page!(ProjectPrefs {
+    /// Open a template project for File ▸ New ▸ New Project.
+    use_template: bool = false,
+    template_path: String = String::new(),
+});
+
+page!(AutoSave {
+    enabled: bool = true,
+    interval_minutes: u32 = 20,
+    max_versions: u32 = 5,
+    /// `nextToProject` (an "EffectCraft Auto-Save" folder beside the project) or `custom`.
+    location: String = "nextToProject".into(),
+    folder: String = String::new(),
+    save_on_render_start: bool = false,
+});
+
+page!(CompositionPrefs {
+    /// Motion path: `all`, `none`, `seconds`, `keyframes`.
+    motion_path: String = "keyframes".into(),
+    motion_path_seconds: f64 = 15.0,
+    motion_path_keyframes: u32 = 15,
+    show_rendering_progress: bool = true,
+    hardware_accelerate_panels: bool = true,
+});
+
+page!(Previews {
+    /// Largest downsampling while playing back: `1/2`, `1/4`, `1/8`.
+    adaptive_resolution_limit: String = "1/8".into(),
+    show_internal_wireframes: bool = false,
+    cache_frames_when_idle: bool = false,
+    fast_previews: bool = false,
+    /// `faster` or `moreAccurate`.
+    zoom_quality: String = "moreAccurate".into(),
+    show_gpu_info: bool = false,
+    /// The monitor's colour space for View ▸ Use Display Color Management: `srgb` or `p3`.
+    display_profile: String = "srgb".into(),
+});
+
+page!(Appearance {
+    /// The single theme before appearance modes (`dark`, `darker` or `light`), kept for older
+    /// settings files and automation: setting it picks its family's mode and theme. While the mode
+    /// is Dark or Light it mirrors the theme in use.
+    theme: String = "dark".into(),
+    /// `auto` (follow the operating system), `dark` or `light`. New installs stay Dark.
+    appearance_mode: String = "dark".into(),
+    /// The theme used in dark appearance: `dark` or `darker`.
+    dark_theme: String = "dark".into(),
+    /// The theme used in light appearance: `light`.
+    light_theme: String = "light".into(),
+    /// Theme shortcuts in the appearance context menu.
+    favorite_themes: Vec<String> = Vec::new(),
+    /// User interface brightness, -1 (darker) … 1 (lighter).
+    brightness: f64 = 0.0,
+    /// The size of the whole interface in percent (75–200), on top of the display's own scale.
+    ui_scale: u32 = 100,
+    use_label_color_for_handles: bool = true,
+    use_label_color_for_tabs: bool = true,
+    cycle_mask_colors: bool = true,
+    use_gradients: bool = true,
+    /// macOS: draw the menu bar inside the window instead of the system menu bar.
+    in_window_menu_bar_mac: bool = false,
+});
+
+page!(Grids {
+    grid_color: String = "#7a9cff".into(),
+    grid_spacing: f64 = 100.0,
+    grid_subdivisions: u32 = 4,
+    /// `lines`, `dashed` or `dots`.
+    grid_style: String = "lines".into(),
+    proportional_horizontal: u32 = 4,
+    proportional_vertical: u32 = 4,
+    guide_color: String = "#3cc8f0".into(),
+    guide_style: String = "lines".into(),
+    action_safe: f64 = 10.0,
+    title_safe: f64 = 20.0,
+});
+
+page!(TypePrefs {
+    /// `latin` or `southAsian` (South Asian and Middle Eastern).
+    text_engine: String = "latin".into(),
+    font_preview: bool = true,
+    recent_fonts: u32 = 10,
+    font_names_in_english: bool = false,
+});
+
+page!(Import {
+    /// Still footage duration: `compLength` or `seconds`.
+    still_footage: String = "compLength".into(),
+    still_seconds: f64 = 5.0,
+    sequence_fps: f64 = 30.0,
+    report_missing_frames: bool = true,
+    /// Automatically Reload Footage whose file another app changed (size or modification time),
+    /// checked every two seconds and when the window comes back to the front: `off`,
+    /// `nonSequence` (the default, as in After Effects: image sequences are left alone) or `all`.
+    auto_reload_footage: String = "nonSequence".into(),
+    /// Interpret unlabeled alpha as: `ask`, `guess`, `ignore`, `straight`, `premultiplied`.
+    unlabeled_alpha: String = "ask".into(),
+    /// Default drag import as: `footage`, `comp`, `compLayerSizes`.
+    drag_import_as: String = "footage".into(),
+});
+
+page!(Export {
+    default_output_folder: String = String::new(),
+    segment_sequences: bool = false,
+    segment_sequence_files: u32 = 700,
+    segment_movies: bool = false,
+    segment_movie_mb: u32 = 1024,
+    append_bits_to_name: bool = false,
+});
+
+page!(Audio {
+    /// Output device name (empty = the system default).
+    output_device: String = String::new(),
+    /// Output mapping: device channel for the left / right output (1-based).
+    output_left: u32 = 1,
+    output_right: u32 = 2,
+    preview_sample_rate: u32 = 48_000,
+});
+
+page!(Disk {
+    disk_cache_enabled: bool = true,
+    disk_cache_max_gb: u32 = 20,
+    disk_cache_folder: String = String::new(),
+    media_cache_folder: String = String::new(),
+    conformed_media_folder: String = String::new(),
+});
+
+page!(Memory {
+    ram_reserved_gb: u32 = 6,
+    /// Processed-layer cache budget (MB).
+    layer_cache_mb: u32 = 1024,
+    /// Decoded footage frame cache budget (MB).
+    media_cache_mb: u32 = 1024,
+    /// RAM preview (viewer frame) cache budget (MB).
+    preview_cache_mb: u32 = 3072,
+    reduce_cache_when_low: bool = true,
+});
+
+page!(Video {
+    enable_output: bool = false,
+    device: String = String::new(),
+    output_during_playback: bool = true,
+    mirror_on_monitor: bool = true,
+    disable_when_background: bool = false,
+});
+
+page!(ThreeD {
+    /// Default 3D renderer for new compositions: `classic` or `advanced`.
+    default_renderer: String = "classic".into(),
+    show_reference_axes: bool = true,
+    extended_viewer: bool = false,
+    realtime_shadows: bool = true,
+});
+
+page!(
+    /// Settings ▸ Roto Brush.
+    RotoPrefs {
+        /// The segmentation model Roto Brush 2.0 / 3.0 use: `classical` (built in) or a model id
+        /// from `effectcraft_segment::MODELS` (once installed).
+        model: String = "classical".into(),
+    }
+);
+
+page!(
+    /// Settings ▸ Face Tracking.
+    FacePrefs {
+        /// The model Track Mask ▸ Face Tracking uses: `classical` (built in) or a model id from
+        /// `effectcraft_segment::MODELS` (once installed).
+        model: String = "classical".into(),
+    }
+);
+
+page!(Scripting {
+    allow_scripts_write_files: bool = false,
+    warn_executing_files: bool = true,
+    enable_js_debugger: bool = false,
+    editor_font_size: u32 = 13,
+    syntax_highlighting: bool = true,
+    line_numbers: bool = true,
+    auto_complete: bool = true,
+    bracket_matching: bool = true,
+    word_wrap: bool = false,
+    error_banner: bool = true,
+});
+
+impl Scripting {
+    /// Whether `other` grants scripts the same as this: Application Scripting (file and network
+    /// access, the warning before executing files, the debugger). Scripts can't change these
+    /// ([`crate::Session::execute_for_script`]): a script could otherwise give itself the
+    /// access the user withheld.
+    pub fn same_permissions(&self, other: &Scripting) -> bool {
+        self.allow_scripts_write_files == other.allow_scripts_write_files
+            && self.warn_executing_files == other.warn_executing_files
+            && self.enable_js_debugger == other.enable_js_debugger
+    }
+
+    /// Take `from`'s Application Scripting settings (see [`Scripting::same_permissions`]).
+    pub fn keep_permissions(&mut self, from: &Scripting) {
+        self.allow_scripts_write_files = from.allow_scripts_write_files;
+        self.warn_executing_files = from.warn_executing_files;
+        self.enable_js_debugger = from.enable_js_debugger;
+    }
+}
+
+/// One editable label: name and `#rrggbb` colour.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct LabelPref {
+    pub name: String,
+    pub color: String,
+}
+
+/// A Composition Settings preset the user saved (Composition Settings ▸ Preset ▸ Save): the
+/// frame size, pixel aspect and frame rate, as in After Effects' own presets.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CompPreset {
+    pub name: String,
+    pub width: u32,
+    pub height: u32,
+    pub pixel_aspect: f64,
+    pub frame_rate: f64,
+}
+
+impl CompPreset {
+    /// Longest preset name kept.
+    pub const MAX_NAME: usize = 128;
+
+    /// Values a composition accepts (a hand-edited settings file can hold anything).
+    pub fn is_valid(&self) -> bool {
+        let size = 4..=30000;
+        !self.name.trim().is_empty()
+            && self.name.chars().count() <= Self::MAX_NAME
+            && size.contains(&self.width)
+            && size.contains(&self.height)
+            && self.pixel_aspect.is_finite()
+            && (0.01..=100.0).contains(&self.pixel_aspect)
+            && self.frame_rate.is_finite()
+            && (1.0..=999.0).contains(&self.frame_rate)
+    }
+}
+
+/// Saved composition presets, skipping entries that don't parse instead of losing the list.
+pub(super) fn lenient_comp_presets<'de, D: serde::Deserializer<'de>>(d: D) -> Result<Vec<CompPreset>, D::Error> {
+    let v = Vec::<Value>::deserialize(d)?;
+    Ok(v.into_iter().filter_map(|x| serde_json::from_value(x).ok()).collect())
+}
+
+pub(super) fn default_labels() -> Vec<LabelPref> {
+    Label::ALL.iter().skip(1).map(|l| LabelPref { name: l.name().to_string(), color: hex(l.rgb()) }).collect()
+}
+
+fn hex([r, g, b]: [u8; 3]) -> String {
+    format!("#{r:02x}{g:02x}{b:02x}")
+}
+
+pub(super) fn parse_hex(s: &str) -> Option<[u8; 3]> {
+    let h = s.trim().trim_start_matches('#');
+    if h.len() != 6 {
+        return None;
+    }
+    let p = |i: usize| u8::from_str_radix(h.get(i..i + 2)?, 16).ok();
+    Some([p(0)?, p(2)?, p(4)?])
+}
+
+impl Appearance {
+    /// Show the legacy single `theme`: fix the mode to its family and remember it as that
+    /// family's theme. An unknown theme changes nothing.
+    pub fn select_theme(&mut self) {
+        match theme_family(&self.theme) {
+            Some((mode, "darkTheme")) => {
+                self.appearance_mode = mode.into();
+                self.dark_theme = self.theme.clone();
+            }
+            Some((mode, _)) => {
+                self.appearance_mode = mode.into();
+                self.light_theme = self.theme.clone();
+            }
+            None => {}
+        }
+    }
+
+    /// The theme to show: the light or dark family's choice by the mode; Auto follows `system_light`
+    /// (`None` = the system said nothing: dark).
+    pub fn resolved_theme(&self, system_light: Option<bool>) -> &str {
+        let light = match self.appearance_mode.as_str() {
+            "light" => true,
+            "auto" => system_light == Some(true),
+            _ => false,
+        };
+        if light { &self.light_theme } else { &self.dark_theme }
+    }
+}
diff --git a/crates/engine/src/session_settings.rs b/crates/engine/src/settings/session_settings.rs
similarity index 89%
rename from crates/engine/src/session_settings.rs
rename to crates/engine/src/settings/session_settings.rs
index ef3e748a6..609ad5987 100644
--- a/crates/engine/src/session_settings.rs
+++ b/crates/engine/src/settings/session_settings.rs
@@ -82,7 +82,9 @@ impl Session {
     /// Take the latest reading of the system's memory and start the next one in the background
     /// (desktop frontends call this every few seconds; it never waits for the system), then
     /// re-apply the cache budgets when the reading changes them. Returns the effective budgets.
+    /// The disk cache's free disk space is read the same way (it keeps a reserve free).
     pub fn memory_tick(&mut self) -> crate::prefs::CacheBudgets {
+        self.poll_disk_space();
         let before = self.prefs.cache_budgets(self.sys_memory);
         self.sys_memory = self.memory_watch.latest().or(self.sys_memory);
         self.memory_watch.poll();
@@ -98,11 +100,24 @@ impl Session {
         after
     }
 
+    /// Read the disk cache's free disk space in the background and apply it there (the reserve
+    /// it keeps free): the free space and the cache's size are taken at the same moment, and the
+    /// reader holds its own cache, so a reading never reaches another folder's.
+    fn poll_disk_space(&mut self) {
+        if let Some(dc) = &self.disk_cache {
+            let dc = dc.clone();
+            self.disk_watch.poll_with("ec-disk-space", move || {
+                dc.set_disk_space(crate::sysinfo::disk_space(dc.folder()));
+                Some(())
+            });
+        }
+    }
+
     /// Apply Settings ▸ Media & Disk Cache ▸ Disk Cache: open (or close) the persistent cache
     /// and attach it to the layer cache. Without a folder setting the platform cache folder is
     /// used, but only by frontends with a settings store (headless sessions stay off disk).
     pub fn configure_disk_cache(&mut self) {
-        use effectcraft_render::disk_cache::{DiskCache, default_folder, footage_salt};
+        use effectcraft_render::disk_cache::{DiskCache, default_folder};
         let d = &self.prefs.disk;
         let folder = if d.disk_cache_folder.trim().is_empty() {
             (self.config.is_some() && !cfg!(target_arch = "wasm32")).then(default_folder)
@@ -113,25 +128,41 @@ impl Session {
         // (no file system in the browser: the disk cache stays off there)
         let Some(folder) = folder.filter(|_| d.disk_cache_enabled && !cfg!(target_arch = "wasm32")) else {
             self.disk_cache = None;
+            self.disk_watch = Default::default();
             self.layer_cache.set_disk(None);
             return;
         };
+        // Tests: the Roto/Object Matte segment store below is one per process, so a test that
+        // opens a disk cache (often the platform folder, through a settings store) would take
+        // over the store of a roto test running beside it. Serialise them with the roto tests.
+        #[cfg(test)]
+        crate::tests::roto::hold_roto_cache_test_lock();
         let dc = match &self.disk_cache {
             Some(c) if c.folder() == folder.as_path() => {
                 c.set_max_bytes(max);
                 c.clone()
             }
+            // A new folder: the free-space reading was for the old one (a reader still running
+            // holds the old watcher's state, so it can't write into the new one).
             _ => match DiskCache::open(&folder, max) {
-                Ok(c) => c,
+                Ok(c) => {
+                    self.disk_watch = Default::default();
+                    c
+                }
                 Err(e) => {
                     log::warn!("disk cache at {}: {e}", folder.display());
                     self.disk_cache = None;
+                    self.disk_watch = Default::default();
                     self.layer_cache.set_disk(None);
                     return;
                 }
             },
         };
-        self.layer_cache.set_disk(Some((dc.clone(), footage_salt(&self.project))));
+        self.disk_cache = Some(dc.clone());
+        // The reserve applies from the start (a new folder's watcher is idle).
+        self.poll_disk_space();
+        let salt = self.refresh_disk_salt(true).unwrap_or_default();
+        self.layer_cache.set_disk(Some((dc.clone(), salt)));
         // Roto Brush / Object Matte segmentations persist there too (held weakly: switching the
         // disk cache off drops it).
         let store: std::sync::Arc<dyn effectcraft_effects::roto::SegStore> = dc.clone();
diff --git a/crates/engine/src/shortcuts.rs b/crates/engine/src/settings/shortcuts.rs
similarity index 96%
rename from crates/engine/src/shortcuts.rs
rename to crates/engine/src/settings/shortcuts.rs
index 3d4ab3661..2eb6fa680 100644
--- a/crates/engine/src/shortcuts.rs
+++ b/crates/engine/src/settings/shortcuts.rs
@@ -105,6 +105,21 @@ pub fn bindables(ui: &[UiCommand]) -> Vec<Bindable> {
             &mut out,
         );
     }
+    // File ▸ Scripts ▸ Recent Script Files lists its scripts at run time; the first one, the most
+    // recent, has a key.
+    let recent = json!({"recent": 0});
+    push(
+        Bindable {
+            key: binding_key("file.runScript", &recent),
+            command: "file.runScript".into(),
+            params: recent,
+            label: "Run Most Recent Script File".into(),
+            path: vec!["File".into(), "Scripts".into(), "Recent Script Files".into()],
+            scope: APP_SCOPE.into(),
+            defaults: normalize("Cmd+Alt+Shift+D").into_iter().collect(),
+        },
+        &mut out,
+    );
     for c in crate::command_specs() {
         if !c.journal || entries.iter().any(|(_, e)| e.command == c.id) {
             continue;
diff --git a/crates/engine/src/system.rs b/crates/engine/src/system.rs
new file mode 100644
index 000000000..d292e1232
--- /dev/null
+++ b/crates/engine/src/system.rs
@@ -0,0 +1,5 @@
+pub mod guard;
+pub mod logging;
+pub mod perf;
+pub mod storage;
+pub mod sysinfo;
diff --git a/crates/engine/src/guard.rs b/crates/engine/src/system/guard.rs
similarity index 100%
rename from crates/engine/src/guard.rs
rename to crates/engine/src/system/guard.rs
diff --git a/crates/engine/src/logging.rs b/crates/engine/src/system/logging.rs
similarity index 88%
rename from crates/engine/src/logging.rs
rename to crates/engine/src/system/logging.rs
index 2c89466ae..ec5785f7e 100644
--- a/crates/engine/src/logging.rs
+++ b/crates/engine/src/system/logging.rs
@@ -93,28 +93,34 @@ fn thread_name() -> String {
     return "main".to_string();
 }
 
-/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds) for `ms` milliseconds since 1970.
+/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds) for `ms` milliseconds since 1970. A clock set
+/// absurdly far ahead keeps its real year (preserved) instead of reading as the epoch.
 fn timestamp(ms: u64) -> String {
-    let secs = ms / 1000;
-    let (days, rem) = (secs / 86_400, secs % 86_400);
-    let (y, m, d) = civil_from_days(days);
-    format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{:03}Z", rem / 3600, rem % 3600 / 60, rem % 60, ms % 1000)
+    let (secs, millis) = (ms / 1000, (ms % 1000) as u32);
+    let (y, t) = utc_parts(secs, millis * 1_000_000);
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", t.format("%m-%dT%H:%M:%S%.3fZ"))
 }
 
-/// Days since 1970-01-01 to a proleptic Gregorian (year, month, day) (Howard Hinnant's
-/// `civil_from_days`, unsigned since the clock is clamped at the epoch). `days` is at most
-/// `u64::MAX / 86_400_000`, so none of the arithmetic below can overflow.
-fn civil_from_days(days: u64) -> (u64, u64, u64) {
-    let z = days + 719_468;
-    let era = z / 146_097;
-    let doe = z % 146_097;
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = yoe + era * 400 + u64::from(m <= 2);
-    (y, m, d)
+/// Unix seconds (+ nanos) → (proleptic Gregorian year, the same wall-clock instant moved into
+/// chrono's range by whole 400-year cycles). The Gregorian calendar repeats every 400 years
+/// (146_097 days), so month, day and time of day come from chrono and only the year is carried,
+/// which keeps every input exact instead of collapsing out-of-range years to the epoch. `secs` is
+/// `u64` (the clock is clamped at the epoch before 1970), so `days` always fits an `i64`.
+fn utc_parts(secs: u64, nanos: u32) -> (i64, chrono::NaiveDateTime) {
+    use chrono::Datelike;
+    let (days, sod) = ((secs / 86_400) as i64, (secs % 86_400) as i64);
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, nanos.min(999_999_999)));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(i64::MAX), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
 }
 
 /// One log line (without the newline): `<timestamp> <LEVEL> [<thread>] <target>: <message>`.
@@ -358,7 +364,12 @@ mod tests {
         assert_eq!(timestamp(1_709_164_800_000), "2024-02-29T00:00:00.000Z");
         assert_eq!(timestamp(951_782_400_000), "2000-02-29T00:00:00.000Z");
         assert_eq!(timestamp(1_767_225_599_000), "2025-12-31T23:59:59.000Z");
-        let _ = timestamp(u64::MAX);
+        // Years past 9999 keep the plain zero-padded year (no `+`).
+        assert_eq!(timestamp(253_402_300_800_000), "10000-01-01T00:00:00.000Z");
+        // A clock absurdly far ahead keeps its real year (years far outside chrono's own range are
+        // preserved) instead of collapsing to the epoch (reviewer rule from the sibling PRs).
+        assert_eq!(timestamp(10_000_000_000_000_000), "318857-05-20T17:46:40.000Z");
+        assert_eq!(timestamp(u64::MAX), "584556019-04-03T14:25:51.615Z");
     }
 
     /// Each launch keeps the previous runs' logs, so the log of a run that crashed survives.
diff --git a/crates/engine/src/perf.rs b/crates/engine/src/system/perf.rs
similarity index 100%
rename from crates/engine/src/perf.rs
rename to crates/engine/src/system/perf.rs
diff --git a/crates/engine/src/storage.rs b/crates/engine/src/system/storage.rs
similarity index 100%
rename from crates/engine/src/storage.rs
rename to crates/engine/src/system/storage.rs
diff --git a/crates/engine/src/sysinfo.rs b/crates/engine/src/system/sysinfo.rs
similarity index 60%
rename from crates/engine/src/sysinfo.rs
rename to crates/engine/src/system/sysinfo.rs
index de39974da..bfb471e92 100644
--- a/crates/engine/src/sysinfo.rs
+++ b/crates/engine/src/system/sysinfo.rs
@@ -1,11 +1,12 @@
 //! Host information for Settings ▸ Memory & CPU (RAM reserved for other applications, reducing
-//! caches when the system is low on memory) and Help ▸ System Compatibility Report.
+//! caches when the system is low on memory), the disk cache's free-space reserve and Help ▸
+//! System Compatibility Report.
 //!
 //! Pure Rust and dependency-free: the values come from the operating system's own reporting
-//! (`/proc/meminfo` on Linux, `sysctl`/`vm_stat` on macOS, `wmic`/PowerShell on Windows). Every
-//! query may fail (sandboxes, the web): callers treat `None` as "unknown" and keep their
-//! configured budgets. The periodic reading behind the cache budgets runs on a background
-//! thread ([`MemoryWatch`]): on Windows it starts PowerShell, which takes about a second.
+//! (`/proc/meminfo` on Linux, `sysctl`/`vm_stat` on macOS, `df` on Unix, `wmic`/PowerShell on
+//! Windows). Every query may fail (sandboxes, the web): callers treat `None` as "unknown" and
+//! keep their configured budgets. The periodic readings behind the cache budgets run on a
+//! background thread ([`Watch`]): on Windows they start PowerShell, which takes about a second.
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, PoisonError};
@@ -27,47 +28,74 @@ impl SysMemory {
     }
 }
 
-/// The system's memory, read in the background: [`MemoryWatch::poll`] starts a reading (unless
-/// one is running) and [`MemoryWatch::latest`] returns the last one without waiting.
-#[derive(Clone, Default)]
-pub struct MemoryWatch {
-    latest: Arc<Mutex<Option<SysMemory>>>,
+/// A system value read in the background: [`Watch::poll_with`] starts a reading (unless one is
+/// running) and [`Watch::latest`] returns the last one without waiting.
+#[derive(Clone)]
+pub struct Watch<T> {
+    latest: Arc<Mutex<Option<T>>>,
     busy: Arc<AtomicBool>,
 }
 
-impl MemoryWatch {
-    /// Start a new reading in the background (no threads on the web: read inline, it is
-    /// unknown there anyway).
-    pub fn poll(&self) {
+impl<T> Default for Watch<T> {
+    fn default() -> Self {
+        Watch { latest: Arc::new(Mutex::new(None)), busy: Arc::new(AtomicBool::new(false)) }
+    }
+}
+
+/// The system's memory ([`memory`]).
+pub type MemoryWatch = Watch<SysMemory>;
+/// The disk cache's free-space reading ([`disk_space`]): the reader applies it to its cache
+/// itself, so only the busy guard is used.
+pub type DiskWatch = Watch<()>;
+
+impl<T: Copy + Send + 'static> Watch<T> {
+    /// Start a new reading in the background on a thread called `name` (no threads on the web:
+    /// read inline, it is unknown there anyway).
+    pub fn poll_with(&self, name: &str, read: impl FnOnce() -> Option<T> + Send + 'static) {
         if self.busy.swap(true, Ordering::AcqRel) {
             return;
         }
         let (latest, busy) = (self.latest.clone(), self.busy.clone());
         let read = move || {
-            if let Some(m) = memory() {
-                *latest.lock().unwrap_or_else(PoisonError::into_inner) = Some(m);
-            }
+            // A failed reading clears the last one: a stale value is worse than none.
+            *latest.lock().unwrap_or_else(PoisonError::into_inner) = read();
             busy.store(false, Ordering::Release);
         };
         #[cfg(not(target_arch = "wasm32"))]
-        if std::thread::Builder::new().name("ec-memory".into()).spawn(read).is_err() {
+        if std::thread::Builder::new().name(name.into()).spawn(read).is_err() {
             self.busy.store(false, Ordering::Release);
         }
         #[cfg(target_arch = "wasm32")]
-        read();
+        {
+            let _ = name;
+            read();
+        }
     }
 
-    /// The last reading (`None` until one finished).
-    pub fn latest(&self) -> Option<SysMemory> {
+    /// The last reading (`None` until one finished or when the last one failed).
+    pub fn latest(&self) -> Option<T> {
         *self.latest.lock().unwrap_or_else(PoisonError::into_inner)
     }
 }
 
+impl MemoryWatch {
+    /// Start a new reading of the system's memory in the background.
+    pub fn poll(&self) {
+        self.poll_with("ec-memory", memory);
+    }
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 #[allow(dead_code)]
 fn run(cmd: &str, args: &[&str]) -> Option<String> {
+    run_env(cmd, args, &[])
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[allow(dead_code)]
+fn run_env(cmd: &str, args: &[&str], env: &[(&str, &std::ffi::OsStr)]) -> Option<String> {
     let mut c = std::process::Command::new(cmd);
-    c.args(args);
+    c.args(args).envs(env.iter().copied());
     // A console program started from the windowed app would flash a console window.
     #[cfg(target_os = "windows")]
     std::os::windows::process::CommandExt::creation_flags(&mut c, 0x0800_0000); // CREATE_NO_WINDOW
@@ -139,6 +167,46 @@ pub fn memory() -> Option<SysMemory> {
     None
 }
 
+/// Parse `df -Pk` output: the disk's total and available bytes.
+pub fn parse_df(text: &str) -> Option<(u64, u64)> {
+    let line = text.lines().skip(1).find(|l| !l.trim().is_empty())?;
+    let f: Vec<&str> = line.split_whitespace().collect();
+    // A full disk into its root-reserved blocks reports negative numbers (Linux): none free.
+    let num = |v: &str| match v.strip_prefix('-') {
+        Some(d) => d.parse::<u64>().ok().map(|_| 0),
+        None => v.parse::<u64>().ok(),
+    };
+    // Size, used, available and capacity follow the device name (which may contain spaces).
+    let i = (0..f.len().saturating_sub(3))
+        .find(|&i| f.get(i + 3).is_some_and(|c| c.ends_with('%')) && f.get(i..i + 3).is_some_and(|n| n.iter().all(|v| num(v).is_some())))?;
+    let kb = |j: usize| f.get(j).and_then(|v| num(v)).map(|v| v.saturating_mul(1024));
+    Some((kb(i)?, kb(i + 2)?))
+}
+
+/// Total and available bytes of the disk holding `path`, when the system reports them.
+pub fn disk_space(path: &std::path::Path) -> Option<(u64, u64)> {
+    #[cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd"))]
+    {
+        return parse_df(&run("df", &["-Pk", &path.to_string_lossy()])?);
+    }
+    #[cfg(target_os = "windows")]
+    {
+        // The path goes through the environment: no quoting.
+        let text = run_env(
+            "powershell",
+            &["-NoProfile", "-Command", "$d=[IO.DriveInfo]::new($env:EC_DISK_PATH); \"$($d.TotalSize) $($d.AvailableFreeSpace)\""],
+            &[("EC_DISK_PATH", path.as_os_str())],
+        )?;
+        let mut it = text.split_whitespace().filter_map(|v| v.parse::<u64>().ok());
+        return Some((it.next()?, it.next()?));
+    }
+    #[allow(unreachable_code)]
+    {
+        let _ = path;
+        None
+    }
+}
+
 /// CPU model name.
 pub fn cpu_name() -> Option<String> {
     #[cfg(target_os = "linux")]
@@ -225,6 +293,42 @@ mod tests {
         assert_eq!(m.available, 1000);
     }
 
+    #[test]
+    fn a_failed_reading_clears_the_last_one() {
+        let w = Watch::<u64>::default();
+        let wait = || {
+            for _ in 0..500 {
+                if !w.busy.load(Ordering::Acquire) {
+                    return;
+                }
+                std::thread::sleep(std::time::Duration::from_millis(2));
+            }
+            panic!("the reading never finished");
+        };
+        w.poll_with("ec-test", || Some(7));
+        wait();
+        assert_eq!(w.latest(), Some(7));
+        w.poll_with("ec-test", || None);
+        wait();
+        assert_eq!(w.latest(), None);
+    }
+
+    #[test]
+    fn parses_df() {
+        let linux = "Filesystem     1024-blocks      Used Available Capacity Mounted on\n/dev/nvme0n1p2   488281250 123456789 364824461      26% /\n";
+        assert_eq!(parse_df(linux), Some((488_281_250 * 1024, 364_824_461 * 1024)));
+        // macOS: a device name with spaces and a mount point with spaces.
+        let mac = "Filesystem 1024-blocks Used Available Capacity  Mounted on\nmap auto_home 0 0 0 100% /System/Volumes/Data/home\n";
+        assert_eq!(parse_df(mac), Some((0, 0)));
+        let spaced = "Filesystem 1024-blocks Used Available Capacity Mounted on\n//nas/My Share 1000 400 600 40% /Volumes/My Share\n";
+        assert_eq!(parse_df(spaced), Some((1000 * 1024, 600 * 1024)));
+        // A full disk into its reserved blocks: nothing available.
+        let full = "Filesystem 1024-blocks Used Available Capacity Mounted on\n/dev/sda2 1000 1010 -10 101% /\n";
+        assert_eq!(parse_df(full), Some((1000 * 1024, 0)));
+        assert_eq!(parse_df("Filesystem 1024-blocks\n"), None);
+        assert_eq!(parse_df(""), None);
+    }
+
     #[test]
     fn parses_proc_meminfo_and_vm_stat() {
         let m = parse_meminfo("MemTotal:       16000000 kB\nMemFree:  1000 kB\nMemAvailable:    8000000 kB\n").unwrap();
diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs
index 72133c5d6..579d3d30d 100644
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@ -1,688 +1,53 @@
-use serde_json::json;
-
-use crate::Session;
-
-fn demo() -> Session {
-    let mut s = Session::default();
-    s.execute("file.openDemoProject", json!({})).unwrap();
-    s
-}
-
-#[test]
-fn demo_opens_and_renders() {
-    let s = demo();
-    let cid = s.active_comp_id().unwrap();
-    let img = s.render(cid, s.time(), effectcraft_render::RenderOpts { scale: 0.25, ..Default::default() });
-    assert_eq!((img.width, img.height), (480, 270));
-    let lit = img.data.iter().filter(|p| p[3] > 0.99).count();
-    assert!(lit > 100_000, "{lit}");
-}
-
-/// The session's layer cache never changes pixels: scrubbing the demo (including back and
-/// forth, and across an edit made through a command) matches cache-less renders exactly.
-#[test]
-fn demo_layer_cache_is_transparent() {
-    let mut s = demo();
-    let cid = s.active_comp_id().unwrap();
-    let opts = effectcraft_render::RenderOpts { scale: 0.25, ..Default::default() };
-    let uncached = |s: &Session, t: f64| {
-        let mut r = effectcraft_render::Renderer::new(&s.project, s.footage.as_ref(), opts);
-        r.expr = s.expr.as_deref();
-        r.comp_frame(cid, effectcraft_time::Tick::from_seconds_f64(t))
-    };
-    let check = |s: &Session, t: f64| {
-        let a = s.render(cid, effectcraft_time::Tick::from_seconds_f64(t), opts);
-        let b = uncached(s, t);
-        assert!(a.data.iter().zip(&b.data).all(|(p, q)| (0..4).all(|c| (p[c] - q[c]).abs() < 1e-6)), "t={t}");
-    };
-    for t in [0.5, 1.0, 3.0, 3.0334, 6.0, 3.0, 0.5] {
-        check(&s, t);
-    }
-    assert!(s.layer_cache.stats().hits > 0);
-    // Edit the title's glow through the command layer, then scrub again.
-    let title = s.project.comp(cid).unwrap().layers.iter().find(|l| l.name == "EFFECTCRAFT").map(|l| l.id.0).unwrap();
-    s.execute("prop.set", json!({"layer": title, "path": "effects/#1/radius", "value": 5.0})).unwrap();
-    for t in [3.0, 0.5] {
-        check(&s, t);
-    }
-}
-
-/// `layer.addItem` puts the layer at `index` (1-based) in the stack and starts it at `time`, as a
-/// drop in the Timeline does (#89).
-#[test]
-fn add_item_at_a_stack_index_and_time() {
-    let mut s = Session::default();
-    let clip = s.execute("comp.new", json!({"name": "Clip", "width": 16, "height": 16, "frameRate": 30, "duration": 1})).unwrap()["comp"].as_u64().unwrap();
-    s.execute("comp.new", json!({"name": "Main", "width": 32, "height": 32, "frameRate": 30, "duration": 4})).unwrap();
-    for name in ["C", "B", "A"] {
-        s.execute("layer.newSolid", json!({"name": name})).unwrap();
-    }
-    let names = |s: &Session| s.active_comp().unwrap().layers.iter().map(|l| l.name.clone()).collect::<Vec<_>>();
-    s.execute("layer.addItem", json!({"item": clip, "index": 2, "time": 1.01})).unwrap();
-    assert_eq!(names(&s), ["A", "Clip", "B", "C"]);
-    let l = &s.active_comp().unwrap().layers[1];
-    assert_eq!(l.in_point, effectcraft_time::Tick::from_seconds_f64(1.0), "on the nearest frame");
-    // Past the bottom: the bottom.
-    s.execute("layer.addItem", json!({"item": clip, "index": 99})).unwrap();
-    assert_eq!(names(&s).last().map(String::as_str), Some("Clip 2"));
-    assert!(s.execute("layer.addItem", json!({"item": clip, "index": 0})).is_err(), "1-based");
-}
-
-/// Files dropped on the Timeline or the Composition viewer (`file.import {addToComp}`) become
-/// layers of the comp that was active, one under the other, where they were dropped (#85, #89).
-#[test]
-fn imported_files_go_into_the_comp_where_they_were_dropped() {
-    use effectcraft_project::{Footage, FootageKind};
-    struct Probe;
-    impl crate::Importer for Probe {
-        fn probe(&self, path: &str) -> Result<Footage, String> {
-            Ok(Footage { path: path.into(), kind: FootageKind::Still, width: 64, height: 32, has_video: true, ..Default::default() })
-        }
-    }
-    let mut s = Session { importer: Some(std::sync::Arc::new(Probe)), ..Default::default() };
-    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
-    s.execute("layer.newSolid", json!({"name": "Bg"})).unwrap();
-    let params = json!({"paths": ["/drop/a.png", "/drop/b.png"], "addToComp": true, "position": [40.0, 50.0], "index": 1, "time": 1.0});
-    s.execute("file.import", params).unwrap();
-    let comp = s.active_comp().unwrap();
-    assert_eq!(comp.layers.iter().map(|l| l.name.as_str()).collect::<Vec<_>>(), ["a.png", "b.png", "Bg"]);
-    for l in &comp.layers[..2] {
-        assert_eq!(l.props.prop("transform/position").map(|p| p.value.clone()), Some(effectcraft_keyframe::Value::Vec3([40.0, 50.0, 0.0])));
-        assert_eq!(l.in_point, effectcraft_time::Tick::from_seconds_f64(1.0));
-    }
-    // Without `addToComp` they only import.
-    s.execute("file.import", json!({"paths": ["/drop/c.png"]})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.len(), 3);
-    assert!(s.execute("layer.addItem", json!({"item": "a.png", "position": [1.0]})).is_err(), "position needs x and y");
-}
-
-/// #270: files dropped or picked in the Import dialog (`file.import {background}`) are probed in
-/// a background job that says which file it is reading and how many are left; then they arrive
-/// in one undo step, all selected, with a count. The same file imported again arrives again.
-#[test]
-fn background_imports_report_progress_and_select_what_arrived() {
-    use effectcraft_project::{Footage, FootageKind, ItemId};
-    use std::sync::Arc;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    /// Probes file k once `allow` > k (a slow video; 5 s at most, so an import that waits for it
-    /// fails the test instead of hanging it); `.xyz` files fail.
-    struct Gated {
-        started: AtomicUsize,
-        allow: Arc<AtomicUsize>,
-    }
-    impl crate::Importer for Gated {
-        fn probe(&self, path: &str) -> Result<Footage, String> {
-            let k = self.started.fetch_add(1, Ordering::SeqCst);
-            let until = std::time::Instant::now() + std::time::Duration::from_secs(5);
-            while self.allow.load(Ordering::SeqCst) <= k && std::time::Instant::now() < until {
-                std::thread::sleep(std::time::Duration::from_millis(1));
-            }
-            if path.ends_with(".xyz") {
-                return Err("unsupported file".into());
-            }
-            Ok(Footage { path: path.into(), kind: FootageKind::Still, width: 64, height: 32, has_video: true, ..Default::default() })
-        }
-    }
-    let allow = Arc::new(AtomicUsize::new(1));
-    let mut s = Session { importer: Some(Arc::new(Gated { started: AtomicUsize::new(0), allow: allow.clone() })), ..Default::default() };
-    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
-    let undo = s.history.undo.len();
-    let r = s.execute("file.import", json!({"paths": ["/drop/a.png", "/drop/b.png", "/drop/a.png"], "background": true})).unwrap();
-    let job = r["job"].as_str().unwrap().to_string();
-    // The first file is through; the second is being read.
-    let running = |s: &mut Session| s.execute("jobs.list", json!({})).unwrap()["running"].as_array().unwrap().clone();
-    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
-    while running(&mut s)[0]["done"] != json!(1) && std::time::Instant::now() < deadline {
-        std::thread::sleep(std::time::Duration::from_millis(2));
-    }
-    let row = running(&mut s)[0].clone();
-    assert_eq!(row["id"], json!(job));
-    assert_eq!(row["label"], json!("Importing 3 files"));
-    assert_eq!(row["message"], json!("b.png (2 of 3)"));
-    assert_eq!((row["done"].as_u64(), row["total"].as_u64()), (Some(1), Some(3)));
-    assert!(s.project.items.values().all(|i| i.name != "a.png"), "nothing is added before the import finishes");
-    allow.store(usize::MAX, Ordering::SeqCst);
-    s.execute("jobs.wait", json!({})).unwrap();
-    let names = |s: &Session, ids: &[ItemId]| ids.iter().map(|i| s.project.item(*i).unwrap().name.clone()).collect::<Vec<_>>();
-    assert_eq!(names(&s, &s.state.project_selection), ["a.png", "b.png", "a.png"], "everything imported is selected, the same file twice too");
-    assert_eq!(s.history.undo.len(), undo + 1, "one undo step");
-    let rec = s.job_log.last().unwrap();
-    assert_eq!((rec.status.as_str(), rec.message.as_str()), ("done", "Imported 3 items"));
-    assert!(s.drain_events().iter().any(|e| matches!(e, crate::Event::Toast { message, .. } if message == "Imported 3 items")));
-    // Dropped on the viewer: they become layers too; a file that can't be read is reported.
-    s.execute("file.import", json!({"paths": ["/drop/c.png", "/drop/d.xyz"], "background": true, "addToComp": true, "position": [10.0, 20.0]})).unwrap();
-    s.execute("jobs.wait", json!({})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.iter().map(|l| l.name.as_str()).collect::<Vec<_>>(), ["c.png"]);
-    assert_eq!(s.job_log.last().unwrap().message, "Imported 1 item. /drop/d.xyz: unsupported file");
-    // Agents and scripts import at once by default.
-    let r = s.execute("file.import", json!({"paths": ["/drop/e.png"]})).unwrap();
-    assert_eq!(r["items"].as_array().map(Vec::len), Some(1));
-}
-
-/// Audio, Lock and Shy don't change pixels: toggling them keeps the cached layers (#103).
-#[test]
-fn audio_lock_and_shy_keep_cached_layers() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "C", "width": 160, "height": 90, "frameRate": 30, "duration": 1})).unwrap();
-    s.execute("layer.newSolid", json!({"color": "#3080ff", "width": 80, "height": 40})).unwrap();
-    s.execute("effect.apply", json!({"layer": "#1", "effect": "Gaussian Blur"})).unwrap();
-    s.execute("prop.set", json!({"layer": "#1", "path": "effects/#1/blurriness", "value": 12})).unwrap();
-    let cid = s.active_comp_id().unwrap();
-    let t = s.time();
-    s.render(cid, t, Default::default());
-    let before = s.layer_cache.stats();
-    for sw in ["audio", "lock", "shy"] {
-        s.execute("layer.setSwitch", json!({"layers": ["#1"], "switch": sw, "value": sw != "audio"})).unwrap();
-    }
-    s.render(cid, t, Default::default());
-    let after = s.layer_cache.stats();
-    assert_eq!(after.misses, before.misses, "no layer rendered again");
-    assert!(after.hits > before.hits);
-}
-
-#[test]
-fn every_command_has_unique_id_and_runs_or_reports() {
-    let mut ids = std::collections::HashSet::new();
-    for c in crate::command_specs() {
-        assert!(ids.insert(c.id), "duplicate {}", c.id);
-    }
-    assert!(ids.len() >= 90, "{}", ids.len());
-}
-
-#[test]
-fn layer_workflow_with_undo() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "Test", "width": 640, "height": 360, "frameRate": 30, "duration": 4})).unwrap();
-    let r = s.execute("layer.newSolid", json!({"color": "#336699"})).unwrap();
-    let lid = r["layer"].as_u64().unwrap();
-    s.execute("prop.set", json!({"layer": lid, "path": "transform/opacity", "value": 50})).unwrap();
-    let tree = s.execute("layer.tree", json!({"layer": lid})).unwrap();
-    assert!(tree.to_string().contains("\"value\":50.0"));
-    s.execute("prop.toggleAnimation", json!({"layer": lid, "path": "transform/position"})).unwrap();
-    s.execute("time.set", json!({"time": 2.0})).unwrap();
-    s.execute("prop.set", json!({"layer": lid, "path": "transform/position", "value": [100, 100]})).unwrap();
-    let comp = s.active_comp().unwrap();
-    let pos = comp.layers[0].props.prop("transform/position").unwrap();
-    assert_eq!(pos.keys.len(), 2);
-    s.execute("prop.select", json!({"layer": lid, "path": "transform/position"})).unwrap();
-    assert_eq!(s.state.selected_keys.len(), 2);
-    s.execute("keys.easyEase", json!({})).unwrap();
-    s.execute("keys.move", json!({"delta": 0.5})).unwrap();
-    let pos = s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().clone();
-    assert!((pos.keys[0].time.seconds() - 0.5).abs() < 0.02);
-    assert_eq!(pos.keys[0].out_interp, effectcraft_keyframe::Interp::Bezier);
-    // undo back to before the move
-    s.execute("edit.undo", json!({})).unwrap();
-    let pos = s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().clone();
-    assert!(pos.keys[0].time.seconds().abs() < 0.02);
-    s.execute("effect.apply", json!({"layer": lid, "effect": "Gaussian Blur"})).unwrap();
-    s.execute("prop.set", json!({"layer": lid, "path": "effects/#1/blurriness", "value": 12})).unwrap();
-    // Applying selects the new effect (Edit ▸ Duplicate would duplicate it); select the layer.
-    s.execute("layer.select", json!({"layers": [lid]})).unwrap();
-    s.execute("edit.duplicate", json!({})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.len(), 2);
-    s.execute("layer.precompose", json!({"layers": [1, 2], "name": "Pre"})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
-}
-
-#[test]
-fn text_shape_mask_matte_parent() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"width": 800, "height": 450, "duration": 3})).unwrap();
-    let t = s.execute("layer.newText", json!({"text": "Hello", "size": 90})).unwrap()["layer"].as_u64().unwrap();
-    s.execute("layer.addTextAnimator", json!({"layer": t, "properties": ["position", "opacity"]})).unwrap();
-    let sh = s.execute("layer.newShape", json!({"kind": "star", "fill": "#ffcc00"})).unwrap()["layer"].as_u64().unwrap();
-    s.execute("layer.addShapeItem", json!({"layer": sh, "kind": "trim"})).unwrap();
-    s.execute("layer.addMask", json!({"layer": sh, "shape": "ellipse"})).unwrap();
-    s.execute("layer.setMask", json!({"layer": sh, "mask": 1, "mode": "Subtract", "inverted": true})).unwrap();
-    s.execute("layer.setTrackMatte", json!({"layer": sh, "matte": t, "kind": "luma"})).unwrap();
-    s.execute("layer.setParent", json!({"layers": [sh], "parent": t})).unwrap();
-    assert!(s.execute("layer.setParent", json!({"layers": [t], "parent": sh})).is_err());
-    s.execute("layer.setBlendMode", json!({"layers": [sh], "mode": "Screen"})).unwrap();
-    s.execute("layer.setSwitch", json!({"layers": [sh], "switch": "threeD"})).unwrap();
-    let cid = s.active_comp_id().unwrap();
-    let _ = s.render(cid, s.time(), Default::default());
-    let info = s.execute("comp.info", json!({})).unwrap();
-    assert_eq!(info["layers"].as_array().unwrap().len(), 2);
-}
-
-/// The toolbar's Fill / Stroke change a selected shape layer's paint (#205): a shape drawn
-/// without a stroke gets one, later edits change it, and the Contents "Add:" items (#206) include
-/// an empty Path and a Gradient Stroke that render.
-#[test]
-fn toolbar_fill_and_stroke_paint_selected_shape_layers() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
-    let sh = s.execute("layer.newShape", json!({"kind": "rect", "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
-    let paint = |s: &mut Session| s.execute("shape.fillStroke", json!({})).unwrap();
-    assert_eq!(paint(&mut s)["stroke"], serde_json::Value::Null, "drawn without a stroke");
-    s.execute("shape.fillStroke", json!({"stroke": "#00ff00", "strokeWidth": 6})).unwrap();
-    let p = paint(&mut s);
-    assert_eq!((p["stroke"][1].as_f64(), p["strokeWidth"].as_f64()), (Some(1.0), Some(6.0)), "{p}");
-    s.execute("shape.fillStroke", json!({"fill": "#0000ff", "strokeWidth": 3})).unwrap();
-    let p = paint(&mut s);
-    assert_eq!((p["fill"][2].as_f64(), p["strokeWidth"].as_f64()), (Some(1.0), Some(3.0)), "{p}");
-    // One stroke, before the fill (paths, stroke, fill), and each change is one undo step.
-    let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap().clone();
-    let group = l.props.group("contents/group").unwrap();
-    let order: Vec<&str> = group.sub("contents").unwrap().groups().map(|g| g.match_id.as_str()).collect();
-    assert_eq!(order, ["rect", "stroke", "fill"]);
-    s.execute("edit.undo", json!({})).unwrap();
-    assert_eq!(paint(&mut s)["strokeWidth"].as_f64(), Some(6.0));
-    // Only shape layers.
-    s.execute("layer.newSolid", json!({"color": "#808080"})).unwrap();
-    assert!(s.execute("shape.fillStroke", json!({"fill": "#ffffff"})).is_err());
-    for kind in ["path", "gstroke"] {
-        let r = s.execute("layer.addShapeItem", json!({"layer": sh, "kind": kind})).unwrap();
-        assert!(r["path"].as_str().is_some_and(|p| p.starts_with("contents/")), "{r}");
-    }
-    let cid = s.active_comp_id().unwrap();
-    let _ = s.render(cid, s.time(), Default::default());
-}
-
-/// The toolbar's Fill Options / Stroke Options change a selected shape layer's paint kind (#732):
-/// None switches the fill off, a gradient turns the Fill into a Gradient Fill that keeps its
-/// opacity, Solid Color turns it back, and a Stroke kind adds a stroke where there is none.
-#[test]
-fn toolbar_fill_and_stroke_kinds_change_selected_shape_layers() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
-    let sh = s.execute("layer.newShape", json!({"kind": "rect", "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
-    let items = |s: &Session| -> Vec<(String, bool)> {
-        let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap();
-        l.props.group("contents/group/contents").unwrap().groups().map(|g| (g.match_id.clone(), g.enabled)).collect()
-    };
-    let kinds = |s: &mut Session| {
-        let p = s.execute("shape.fillStroke", json!({})).unwrap();
-        (p["fillType"].as_str().unwrap().to_string(), p["strokeType"].as_str().unwrap().to_string())
-    };
-    assert_eq!(kinds(&mut s), ("solid".into(), "none".into()));
-    let cid = s.active_comp_id().unwrap();
-    let centre = |s: &Session| s.render(cid, s.time(), Default::default()).get(200, 150);
-    let red = centre(&s);
-    // None switches the fill off: nothing is drawn, and the item stays.
-    s.execute("shape.fillStroke", json!({"fillType": "none"})).unwrap();
-    assert_eq!(items(&s), [("rect".into(), true), ("fill".into(), false)]);
-    assert_eq!(kinds(&mut s).0, "none");
-    assert_ne!(centre(&s), red, "the fill is off");
-    // A radial gradient: the Fill becomes a Gradient Fill (switched on) that keeps its opacity.
-    s.execute("shape.fillStroke", json!({"fillType": "solid", "fill": "#ff0000"})).unwrap();
-    assert_eq!(centre(&s), red);
-    let opacity = |s: &Session, m: &str| {
-        let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap();
-        l.props.group(&format!("contents/group/contents/{m}")).unwrap().get("opacity").unwrap().value.as_f64()
-    };
-    s.execute("prop.set", json!({"layer": sh, "path": "contents/group/contents/fill/opacity", "value": 40})).unwrap();
-    s.execute("shape.fillStroke", json!({"fillType": "radial"})).unwrap();
-    assert_eq!(items(&s), [("rect".into(), true), ("gfill".into(), true)]);
-    assert_eq!((kinds(&mut s).0.as_str(), opacity(&s, "gfill")), ("radial", 40.0));
-    s.execute("shape.fillStroke", json!({"fillType": "linear"})).unwrap();
-    assert_eq!(kinds(&mut s).0, "linear");
-    s.execute("shape.fillStroke", json!({"fillType": "solid", "fill": "#00ff00"})).unwrap();
-    assert_eq!(items(&s), [("rect".into(), true), ("fill".into(), true)]);
-    assert_eq!(opacity(&s, "fill"), 40.0);
-    // A Stroke kind adds a stroke (before the fill); None switches it off again; undo is per step.
-    s.execute("shape.fillStroke", json!({"strokeType": "linear"})).unwrap();
-    assert_eq!(items(&s), [("rect".into(), true), ("gstroke".into(), true), ("fill".into(), true)]);
-    s.execute("shape.fillStroke", json!({"strokeType": "none"})).unwrap();
-    assert_eq!(kinds(&mut s), ("solid".into(), "none".into()));
-    s.execute("edit.undo", json!({})).unwrap();
-    assert_eq!(kinds(&mut s), ("solid".into(), "linear".into()));
-    assert!(s.execute("shape.fillStroke", json!({"fillType": "plaid"})).is_err());
-}
-
-/// Selecting a mask in the Timeline (its row or its Mask Path) selects all of its points, so the
-/// viewer drags the whole mask (#203); a shape's Path item works the same way.
-#[test]
-fn selecting_a_mask_selects_its_points() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
-    let l = s.execute("layer.newSolid", json!({"color": "#808080"})).unwrap()["layer"].as_u64().unwrap();
-    let m1 = s.execute("layer.addMask", json!({"layer": l, "shape": "rect"})).unwrap()["mask"].as_u64().unwrap();
-    let m2 = s.execute("layer.addMask", json!({"layer": l, "shape": "ellipse"})).unwrap()["mask"].as_u64().unwrap();
-    let points = |s: &Session, m: u64| s.state.selected_vertices.iter().filter(|v| v.mask == m).count();
-    s.execute("prop.select", json!({"layer": l, "prop": m1, "selectKeys": false})).unwrap();
-    assert_eq!((points(&s, m1), s.state.selected_vertices.len()), (4, 4));
-    // Mask Path selects them too; Shift-adding another mask keeps the first.
-    let path = s.active_comp().unwrap().layer(effectcraft_project::LayerId(l)).unwrap().props.find_group(m2).unwrap().get("path").unwrap().uid;
-    s.execute("prop.select", json!({"layer": l, "prop": path, "add": true})).unwrap();
-    assert_eq!((points(&s, m1), points(&s, m2)), (4, 4));
-    // Another mask replaces them; another property deselects them.
-    s.execute("prop.select", json!({"layer": l, "prop": m2})).unwrap();
-    assert_eq!((points(&s, m1), points(&s, m2)), (0, 4));
-    // Delete removes the selected mask (not only its points).
-    s.execute("edit.clear", json!({})).unwrap();
-    let masks = |s: &Session| s.active_comp().unwrap().layer(effectcraft_project::LayerId(l)).unwrap().masks().unwrap().children.len();
-    assert_eq!(masks(&s), 1);
-    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
-    assert!(s.state.selected_vertices.is_empty());
-    let sh = s.execute("layer.newShape", json!({"kind": "star"})).unwrap()["layer"].as_u64().unwrap();
-    let star = s.execute("layer.addShapeItem", json!({"layer": sh, "kind": "path"})).unwrap()["uid"].as_u64().unwrap();
-    s.execute("prop.select", json!({"layer": sh, "prop": star})).unwrap();
-    assert_eq!(s.state.selected_vertices.len(), 0, "an empty Path has no points");
-}
-
-#[test]
-fn save_and_open_roundtrip() {
-    let mut s = demo();
-    let dir = std::env::temp_dir().join(format!("ec-test-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    let path = dir.join("demo.ecproj").to_string_lossy().to_string();
-    s.execute("file.saveAs", json!({"path": path})).unwrap();
-    let before = s.project.clone();
-    let mut s2 = Session::default();
-    s2.execute("file.open", json!({"path": path})).unwrap();
-    assert_eq!(*before, *s2.project);
-    let _ = std::fs::remove_dir_all(dir);
-}
-
-#[test]
-fn help_links_emit_urls() {
-    let mut s = Session::default();
-    let r = s.execute("help.discord", json!({})).unwrap();
-    assert_eq!(r["url"], "https://discord.gg/artcraft");
-    assert!(s.drain_events().iter().any(|e| matches!(e, crate::Event::OpenUrl(u) if u.contains("discord"))));
-    assert_eq!(s.execute("help.github", json!({})).unwrap()["url"], "https://github.com/storytold/effectcraft");
-}
-
-#[test]
-fn time_navigation() {
-    let mut s = demo();
-    s.execute("time.start", json!({})).unwrap();
-    let r = s.execute("time.nextKey", json!({})).unwrap();
-    assert!(r["time"].as_f64().unwrap() > 0.0);
-    s.execute("time.set", json!({"frame": 45})).unwrap();
-    assert_eq!(s.execute("time.step", json!({"frames": 5})).unwrap()["frame"], 50);
-}
-
-#[test]
-fn time_navigation_per_property() {
-    let mut s = demo();
-    // An animated property and the comp times of its keys.
-    let comp = s.active_comp().unwrap().clone();
-    let mut found = None;
-    for l in &comp.layers {
-        l.props.walk("", &mut |_, pr| {
-            if found.is_none() && pr.keys.len() >= 2 {
-                found = Some((pr.uid, pr.keys.iter().map(|k| l.comp_time(k.time)).collect::<Vec<_>>()));
-            }
-        });
-    }
-    let (uid, times) = found.expect("demo has an animated property");
-    s.set_time(effectcraft_time::Tick::ZERO);
-    let half = comp.frame_duration().0 / 2;
-    let expect = times.iter().copied().filter(|t| t.0 > half).min().unwrap();
-    s.execute("time.go", json!({"to": "nextKey", "prop": uid})).unwrap();
-    let snap = |t| comp.frame_rate.snap(t);
-    assert_eq!(s.time(), snap(expect));
-    // Going back from past the last key lands on the last key.
-    s.set_time(comp.duration);
-    s.execute("time.go", json!({"to": "prevKey", "prop": uid})).unwrap();
-    assert_eq!(s.time(), snap(*times.iter().max().unwrap()));
-}
-
-#[test]
-fn set_text_paragraph_fill_and_leading() {
-    use effectcraft_keyframe::{Justify, Value as KValue};
-    let mut s = demo();
-    let t = s.execute("layer.newText", json!({"text": "Hi"})).unwrap()["layer"].as_u64().unwrap();
-    let doc = |s: &Session| {
-        let l = s.active_comp().unwrap().layer(crate::project::LayerId(t)).unwrap().clone();
-        match &l.props.prop("text/sourceText").unwrap().value {
-            KValue::Text(d) => (**d).clone(),
-            v => panic!("{v:?}"),
-        }
-    };
-    for (key, j) in [
-        ("justifyLeft", Justify::JustifyLastLeft),
-        ("justifyCenter", Justify::JustifyLastCenter),
-        ("justifyRight", Justify::JustifyLastRight),
-        ("justifyAll", Justify::JustifyAll),
-        ("center", Justify::Center),
-    ] {
-        s.execute("layer.setText", json!({"layer": t, "justify": key})).unwrap();
-        assert_eq!(doc(&s).justify, j, "{key}");
-    }
-    s.execute("layer.setText", json!({"layer": t, "leading": 50, "applyFill": false, "applyStroke": true})).unwrap();
-    let d = doc(&s);
-    assert_eq!((d.leading, d.apply_fill, d.apply_stroke), (Some(50.0), false, true));
-    s.execute("layer.setText", json!({"layer": t, "leading": "auto"})).unwrap();
-    assert_eq!(doc(&s).leading, None);
-    s.execute("layer.setText", json!({"layer": t, "hScale": 120, "vScale": 80, "baselineShift": 4, "smallCaps": true, "strokeOverFill": true})).unwrap();
-    let d = doc(&s);
-    assert_eq!((d.h_scale, d.v_scale, d.baseline_shift, d.small_caps, d.stroke_over_fill), (120.0, 80.0, 4.0, true, true));
-}
-
-#[test]
-fn property_groups_report_actionable_errors() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "T"})).unwrap();
-    let l = s.execute("layer.newText", json!({"text": "Hi"})).unwrap()["layer"].as_u64().unwrap();
-    let uid = s.active_comp().unwrap().layer(crate::project::LayerId(l)).unwrap().props.group("text/pathOptions").unwrap().uid;
-    for selector in [json!({"path": "text"}), json!({"path": "text/pathOptions"}), json!({"path": format!("@{uid}")}), json!({"prop": uid})] {
-        let mut params = selector;
-        params["layer"] = json!(l);
-        for cmd in ["prop.get", "prop.set"] {
-            let err = s.execute(cmd, params.clone()).unwrap_err().to_string();
-            assert!(err.contains("is a property group"), "{cmd}: {err}");
-            assert!(err.contains("get_layer"), "{cmd}: {err}");
-        }
-    }
-    assert!(s.execute("prop.get", json!({"layer": l, "path": "text/sourceText"})).is_ok());
-    let err = s.execute("prop.get", json!({"layer": l, "path": "missing"})).unwrap_err().to_string();
-    assert!(err.contains("no property `missing`"), "{err}");
-}
-
-#[test]
-fn prop_get_and_render_rgba8() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "T", "width": 320, "height": 180, "duration": 2.0, "frameRate": 30})).unwrap();
-    let l = s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
-    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 0.0, "value": [0, 0]})).unwrap();
-    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 1.0, "value": [100, 50]})).unwrap();
-    let v = s.execute("prop.get", json!({"layer": l, "path": "transform/position", "time": 1.0})).unwrap();
-    assert_eq!(v["animated"], true);
-    assert_eq!(v["keys"].as_array().unwrap().len(), 2);
-    assert_eq!(v["value"][0].as_f64().unwrap(), 100.0);
-    let cid = s.resolve_comp(Some(&json!("T"))).unwrap();
-    let (w, h, rgba) = s.render_rgba8(cid, effectcraft_time::Tick::ZERO, 160).unwrap();
-    assert_eq!((w, h), (160, 90));
-    assert_eq!(rgba.len(), (w * h * 4) as usize);
-}
-
-#[test]
-fn params_docs_parse() {
-    use crate::commands::accepted_params;
-    let k = |d: &str| accepted_params(d).unwrap();
-    assert_eq!(k("{layers: [id|name|#n], add?, toggle?}"), ["layers", "add", "toggle"]);
-    assert_eq!(k("{time? (s) | frame? | timecode?}"), ["time", "frame", "timecode"]);
-    assert_eq!(k("{interpolation?|in?|out?: linear|bezier|hold, autoBezier?}"), ["interpolation", "in", "out", "autoBezier"]);
-    assert_eq!(k("{keys: [{layer, prop, time}], add?}"), ["keys", "add"]);
-    assert_eq!(k("{label: Red|Yellow|Aqua|…, layers?}"), ["label", "layers"]);
-    assert_eq!(k("{name?, background? [r,g,b]|#hex, open?}"), ["name", "background", "open"]);
-    assert!(k("{}").is_empty());
-    assert!(accepted_params("free text").is_none());
-    // Every registered command documents its params as a parseable key list.
-    for c in crate::command_specs() {
-        assert!(accepted_params(c.params).is_some(), "{}: {}", c.id, c.params);
-    }
-}
-
-#[test]
-fn execute_checked_rejects_unknown_params() {
-    let mut s = demo();
-    let e = s.execute_checked("layer.select", json!({"index": 2})).unwrap_err().to_string();
-    assert!(e.contains("`index`") && e.contains("layers, add, toggle"), "{e}");
-    s.execute_checked("layer.select", json!({"layers": ["#2"]})).unwrap();
-    assert_eq!(s.state.selected_layers.len(), 1);
-    // Aliases and always-accepted keys.
-    s.execute_checked("layer.select", json!({"layer": "#1", "comp": s.active_comp_id().unwrap().0})).unwrap();
-    s.execute_checked("time.set", json!({"frame": 3})).unwrap();
-    assert!(s.execute_checked("edit.undo", json!({"steps": 2})).is_err());
-    // Non-object params are not validated; the unchecked path stays lenient.
-    s.execute("layer.select", json!({"layers": ["#1"], "index": 2})).unwrap();
-}
-
-#[test]
-fn layer_tree_paths_resolve() {
-    let mut s = demo();
-    s.execute("effect.apply", json!({"layer": 1, "effect": "Gaussian Blur"})).unwrap();
-    let comp = s.execute("comp.info", json!({})).unwrap();
-    let mut checked = 0;
-    for l in comp["layers"].as_array().unwrap() {
-        let tree = s.execute("layer.tree", json!({"layer": l["id"]})).unwrap();
-        let mut stack = vec![tree["properties"].clone()];
-        while let Some(n) = stack.pop() {
-            if let Some(ch) = n["children"].as_array() {
-                stack.extend(ch.iter().cloned());
-                continue;
-            }
-            let path = n["path"].as_str().unwrap();
-            let got = s.execute("prop.get", json!({"layer": l["id"], "path": path})).unwrap();
-            assert_eq!(got["uid"], n["uid"], "path {path} on layer {}", l["name"]);
-            checked += 1;
-        }
-    }
-    assert!(checked > 20, "{checked}");
-}
-
-#[test]
-fn comp_settings_anchor_start_timecode_renderer() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "A", "width": 100, "height": 100, "duration": 2.0})).unwrap();
-    let l = s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
-    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 0.0, "value": [10, 20]})).unwrap();
-    let pos = |s: &Session| {
-        let pr = s.active_comp().unwrap().layer(crate::project::LayerId(l)).unwrap().props.prop("transform/position").unwrap().clone();
-        pr.keys[0].value.components()
-    };
-    // Center anchor: grow by 100x50 → shift by half.
-    s.execute("comp.settings", json!({"width": 200, "height": 150})).unwrap();
-    assert_eq!(pos(&s)[..2], [60.0, 45.0]);
-    // Top-left anchor: no shift. Bottom-right: full shift.
-    s.execute("comp.settings", json!({"width": 300, "anchor": 0})).unwrap();
-    assert_eq!(pos(&s)[..2], [60.0, 45.0]);
-    s.execute("comp.settings", json!({"width": 200, "height": 100, "anchor": 8})).unwrap();
-    assert_eq!(pos(&s)[..2], [-40.0, -5.0]);
-    s.execute("comp.settings", json!({"startTimecode": "0:00:01:00", "renderer": "advanced3D"})).unwrap();
-    let c = s.active_comp().unwrap();
-    assert_eq!(c.display_start, c.frame_rate.tick_of(30));
-    assert_eq!(c.renderer, crate::project::Renderer::Advanced3D);
-}
-
-/// `advanced3D` is a value of `renderer`, not a key: comp.new / comp.settings don't advertise it
-/// in their schemas and reject it as unknown instead of ignoring it (#177).
-#[test]
-fn renderer_values_are_not_parameter_keys() {
-    let mut s = Session::default();
-    for (id, p) in [("comp.new", json!({"name": "A"})), ("comp.settings", json!({}))] {
-        let spec = crate::command_specs().iter().find(|c| c.id == id).unwrap();
-        let keys = crate::commands::accepted_params(spec.params).unwrap();
-        assert!(keys.contains(&"renderer".to_string()) && !keys.contains(&"advanced3D".to_string()), "{id}: {keys:?}");
-        let mut bad = p.clone();
-        bad["advanced3D"] = json!(true);
-        let e = s.execute_checked(id, bad).unwrap_err().to_string();
-        assert!(e.contains("unknown parameter(s) `advanced3D`"), "{id}: {e}");
-        let mut good = p;
-        good["renderer"] = json!("advanced3D");
-        s.execute_checked(id, good).unwrap();
-        assert_eq!(s.active_comp().unwrap().renderer, crate::project::Renderer::Advanced3D, "{id}");
-        s.execute("comp.renderer", json!({"renderer": "classic3d"})).unwrap();
-    }
-}
-
-#[test]
-fn comp_rejects_zero_and_negative_frame_rates() {
-    let mut s = Session::default();
-    for fps in [0.0, -30.0, 0.0001] {
-        assert!(s.execute("comp.new", json!({"frameRate": fps})).is_err(), "{fps}");
-    }
-    s.execute("comp.new", json!({"frameRate": 30, "duration": 1})).unwrap();
-    assert!(s.execute("comp.settings", json!({"frameRate": 0})).is_err());
-    assert_eq!(s.active_comp().unwrap().frame_rate, crate::time::FrameRate::FPS_30);
-}
-
-#[test]
-fn render_queue_add_accepts_documented_settings_when_checked() {
-    let mut s = demo();
-    let r = s.execute_checked(
-        "renderQueue.add",
-        json!({"format": "gif", "output": "/tmp/x.gif", "resolution": "quarter", "timeSpan": "custom", "start": 0.0, "end": 0.5, "quality": "draft", "loop": true}),
-    );
-    // Without an exporter the add itself still succeeds (rendering is what needs one).
-    assert!(r.is_ok(), "{r:?}");
-    assert!(s.execute_checked("renderQueue.add", json!({"bogus": 1})).is_err());
-}
-
-#[test]
-fn new_text_rejects_malformed_positions_without_creating_a_layer() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "C", "width": 64, "height": 64, "duration": 1})).unwrap();
-    for position in [json!([]), json!([10]), json!(["x", 20]), json!([null, 20])] {
-        let err = s.execute("layer.newText", json!({"text": "Hello", "position": position})).unwrap_err();
-        assert!(err.to_string().contains("position: [x, y]"), "{err}");
-        assert!(s.active_comp().unwrap().layers.is_empty());
-    }
-    s.execute("layer.newText", json!({"name": "Valid", "text": "Hello", "position": [10, 20]})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().value, effectcraft_keyframe::Value::Vec3([10.0, 20.0, 0.0]));
-    s.execute("layer.newText", json!({"text": "No explicit position"})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.len(), 2);
-}
-
-/// The active comp and the open comp tabs are saved with the project and restored on open (#748).
-#[test]
-fn reopening_a_project_restores_its_active_comp() {
-    use effectcraft_project::ItemId;
-    let dir = std::env::temp_dir().join(format!("ec-test-748-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    let path = dir.join("view.ecproj").to_string_lossy().to_string();
-    let mut s = Session::default();
-    let a = s.execute("comp.new", json!({"name": "CompA"})).unwrap()["comp"].as_u64().unwrap();
-    let b = s.execute("comp.new", json!({"name": "CompB"})).unwrap()["comp"].as_u64().unwrap();
-    let c = s.execute("comp.new", json!({"name": "CompC"})).unwrap()["comp"].as_u64().unwrap();
-    s.execute("comp.open", json!({"comp": "CompB"})).unwrap();
-    s.state.open_comps.retain(|id| id.0 != c);
-    s.execute("file.saveAs", json!({"path": path})).unwrap();
-    let mut s2 = Session::default();
-    s2.execute("file.open", json!({"path": path})).unwrap();
-    assert_eq!(s2.state.active_comp, Some(ItemId(b)));
-    assert_eq!(s2.state.open_comps, vec![ItemId(a), ItemId(b)]);
-    assert!(!s2.is_dirty());
-
-    // A file from before the view was saved opens on its first comp, as it always did.
-    let text = std::fs::read_to_string(&path).unwrap();
-    let mut old: serde_json::Value = serde_json::from_str(&text).unwrap();
-    let obj = old.as_object_mut().unwrap();
-    obj.remove("activeComp");
-    obj.remove("openComps");
-    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
-    let mut s3 = Session::default();
-    s3.execute("file.open", json!({"path": path})).unwrap();
-    assert_eq!((s3.state.active_comp, s3.state.open_comps.clone()), (Some(ItemId(a)), vec![ItemId(a)]));
-
-    // Ids that no longer name a comp (edited by hand, or written by another tool) fall back.
-    obj_set(&mut old, json!(999), json!([999, b, "x"]));
-    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
-    let mut s4 = Session::default();
-    s4.execute("file.open", json!({"path": path})).unwrap();
-    assert_eq!((s4.state.active_comp, s4.state.open_comps.clone()), (Some(ItemId(b)), vec![ItemId(b)]));
-    obj_set(&mut old, json!(999), json!([]));
-    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
-    let mut s5 = Session::default();
-    s5.execute("file.open", json!({"path": path})).unwrap();
-    assert_eq!((s5.state.active_comp, s5.state.open_comps.clone()), (Some(ItemId(a)), vec![ItemId(a)]));
-
-    // XML copies carry it too.
-    let xml = dir.join("view.ecprojx").to_string_lossy().to_string();
-    s.execute("file.saveAs", json!({"path": xml})).unwrap();
-    let mut s6 = Session::default();
-    s6.execute("file.open", json!({"path": xml})).unwrap();
-    assert_eq!(s6.state.active_comp, Some(ItemId(b)));
-    let _ = std::fs::remove_dir_all(dir);
-
-    fn obj_set(v: &mut serde_json::Value, active: serde_json::Value, open: serde_json::Value) {
-        let o = v.as_object_mut().unwrap();
-        o.insert("activeComp".into(), active);
-        o.insert("openComps".into(), open);
-    }
-}
+mod anim_presets;
+mod anim_tools;
+mod camera_track;
+mod codec_options;
+mod color_view;
+mod crypto_pick;
+mod delete_keys;
+mod disk_cache;
+mod effects;
+mod essential;
+mod essential_more;
+mod face;
+mod fidelity;
+mod frame_export;
+mod fuzz_open;
+mod history;
+mod import_project;
+mod key_metadata_order;
+mod key_time;
+mod keylight;
+mod limits;
+mod lottie;
+mod m137;
+mod m145;
+mod markers;
+mod mask_warp;
+mod menu_cmds;
+mod model3d;
+mod models;
+mod motion_blur_depth;
+mod paint;
+mod panels;
+mod project_items;
+mod proxy;
+mod quick_offset;
+mod replace_source;
+mod rig3d;
+pub(crate) mod roto;
+mod sequence;
+mod session;
+mod settings;
+mod shortcut_cmds;
+pub(crate) mod stubs;
+mod styles;
+mod tail;
+mod text;
+mod text_edit;
+mod three_d;
+mod timeline;
+mod timeline_interchange;
+pub(crate) mod track;
+mod vector_import;
+mod viewer;
diff --git a/crates/engine/src/tests_anim_presets.rs b/crates/engine/src/tests/anim_presets.rs
similarity index 100%
rename from crates/engine/src/tests_anim_presets.rs
rename to crates/engine/src/tests/anim_presets.rs
diff --git a/crates/engine/src/tests_anim_tools.rs b/crates/engine/src/tests/anim_tools.rs
similarity index 99%
rename from crates/engine/src/tests_anim_tools.rs
rename to crates/engine/src/tests/anim_tools.rs
index 69b6afa06..06d194001 100644
--- a/crates/engine/src/tests_anim_tools.rs
+++ b/crates/engine/src/tests/anim_tools.rs
@@ -3,7 +3,7 @@
 use effectcraft_keyframe::evaluate;
 use serde_json::json;
 
-use crate::tests_timeline::{animate, prop, setup};
+use crate::tests::timeline::{animate, prop, setup};
 
 fn select(s: &mut crate::Session, layer: u64, path: &str) {
     s.execute("prop.select", json!({"layer": layer, "path": path})).unwrap();
diff --git a/crates/engine/src/tests_camera_track.rs b/crates/engine/src/tests/camera_track.rs
similarity index 87%
rename from crates/engine/src/tests_camera_track.rs
rename to crates/engine/src/tests/camera_track.rs
index 5bd5539c1..3ca8578a9 100644
--- a/crates/engine/src/tests_camera_track.rs
+++ b/crates/engine/src/tests/camera_track.rs
@@ -3,7 +3,7 @@
 
 use effectcraft_effects::camera_tracker as ct;
 use effectcraft_geom::vec3;
-use effectcraft_project::LayerId;
+use effectcraft_project::{Comp, Layer, LayerId, PropGroup};
 use effectcraft_raster::Image;
 use effectcraft_render::EvalCtx;
 use effectcraft_render::three_d::camera::active_camera;
@@ -11,7 +11,8 @@ use effectcraft_track::camtrack::linalg::{self, M3, V3};
 use serde_json::{Value, json};
 
 use crate::Session;
-use crate::tests_track::{H, W, frame_time, setup, texture};
+use crate::camera_track::Placed;
+use crate::tests::track::{H, W, frame_time, setup, texture};
 
 const F: f64 = 260.0;
 
@@ -77,10 +78,9 @@ fn status(s: &mut Session) -> Value {
     s.execute("camera.solveStatus", json!({})).unwrap()
 }
 
-#[test]
-fn track_camera_solves_and_creates_layers_on_the_plane() {
-    let (mut s, clip) = tracked(json!({}));
-    let st = status(&mut s);
+/// Solved with a sane error and focal length; returns the Camera Tracker effect group.
+fn assert_solved(s: &mut Session, clip: LayerId) -> PropGroup {
+    let st = status(s);
     assert_eq!(st["solved"], true, "{st}");
     let err = st["averageError"].as_f64().unwrap();
     assert!(err < 0.5, "average error {err}");
@@ -90,9 +90,12 @@ fn track_camera_solves_and_creates_layers_on_the_plane() {
     // Method Used / Average Error are reported in the effect.
     let g = s.active_comp().unwrap().layer(clip).unwrap().effects().unwrap().groups().next().unwrap().clone();
     assert!(matches!(g.prop(ct::METHOD_USED).map(|p| &p.value), Some(effectcraft_keyframe::Value::Str(m)) if !m.is_empty()));
+    g
+}
 
-    // Pick floor points on frame 12 (their 3D positions lie on y = 1.5 in the true scene: the
-    // ones seen below the horizon at the bottom of the frame).
+/// Pick floor points on frame 12 (their 3D positions lie on y = 1.5 in the true scene: the
+/// ones seen below the horizon at the bottom of the frame).
+fn select_floor_points(s: &mut Session) -> Vec<u64> {
     s.execute("time.set", json!({"time": frame_time(12).seconds()})).unwrap();
     let pts = s.execute("camera.points", json!({})).unwrap();
     let list = pts["points"].as_array().unwrap();
@@ -101,32 +104,19 @@ fn track_camera_solves_and_creates_layers_on_the_plane() {
     assert!(floor.len() >= 3, "{floor:?}");
     s.execute("camera.selectPoints", json!({"points": floor})).unwrap();
     assert_eq!(s.state.camera_points.len(), floor.len());
+    floor
+}
 
-    // Create Solid and Camera: one undo step, camera + solid.
-    let r = s.execute_checked("camera.createFromSolve", json!({"kind": "solid"})).unwrap();
-    let cam = LayerId(r["camera"].as_u64().unwrap());
-    let solid = LayerId(r["layers"][0].as_u64().unwrap());
-    let comp = s.active_comp().unwrap().clone();
-    assert!(comp.layer(cam).unwrap().is_camera());
-    assert_eq!(comp.layer(cam).unwrap().name, "3D Tracker Camera");
-    assert_eq!(comp.layers[0].id, cam);
-    let sl = comp.layer(solid).unwrap();
-    assert!(sl.switches.three_d);
-    assert!(sl.name.starts_with("Track Solid"));
-    // The camera is keyed on every frame.
-    assert_eq!(comp.layer(cam).unwrap().props.prop("transform/position").unwrap().keys.len(), 25);
-
-    // Every solved point projects through the created camera exactly where the solve puts it,
-    // and onto its tracked position (the footage fills the comp, so layer pixels are comp
-    // pixels): within 1 px for 95 % of the observations (the rest are the solve's outliers:
-    // features on occlusion edges), 0.5 px on average.
+/// Every solved point projects through the created camera exactly where the solve puts it,
+/// and onto its tracked position (the footage fills the comp, so layer pixels are comp
+/// pixels): within 1 px for 95 % of the observations (the rest are the solve's outliers:
+/// features on occlusion edges), 0.5 px on average.
+fn assert_reprojection(s: &Session, comp: &Comp, pl: &Placed, g: &PropGroup) {
     let cid = s.active_comp_id().unwrap();
-    let uid = g.uid;
-    let pl = crate::camera_track::placed(&s.project, cid, clip, uid).unwrap();
-    let tracks = ct::tracks(&crate::camera_track::static_params(&g)).unwrap();
+    let tracks = ct::tracks(&crate::camera_track::static_params(g)).unwrap();
     let mut errs = vec![];
     for k in [0u32, 6, 12, 18, 24] {
-        let ctx = EvalCtx::new(&s.project, cid, &comp, frame_time(k));
+        let ctx = EvalCtx::new(&s.project, cid, comp, frame_time(k));
         let camst = active_camera(&ctx);
         for sp in pl.solve.visible(k as usize) {
             let Some(obs) = tracks.track(sp.id).and_then(|t| t.at(k)) else { continue };
@@ -142,34 +132,31 @@ fn track_camera_solves_and_creates_layers_on_the_plane() {
     let p95 = errs[errs.len() * 95 / 100];
     let mean = errs.iter().sum::<f64>() / errs.len() as f64;
     assert!(p95 < 1.0 && mean < 0.5, "p95 {p95} px, mean {mean} px");
+}
 
-    // The solid lies on the selected points' plane.
+/// The solid lies on the selected points' plane and faces the camera.
+fn assert_solid_on_plane(s: &Session, comp: &Comp, sl: &Layer, pl: &Placed, size: f64) {
+    let cid = s.active_comp_id().unwrap();
     let tr = sl.props.sub("transform").unwrap();
     let pos = tr.get("position").unwrap().value.as_vec3();
     let ori = tr.get("orientation").unwrap().value.as_vec3();
     let normal = linalg::mv(&linalg::from_euler_xyz(ori), [0.0, 0.0, -1.0]);
-    let size = r["target"]["size"].as_f64().unwrap();
     for id in &s.state.camera_points {
         let w = pl.to_world(pl.solve.point(*id).unwrap().pos);
         let d = linalg::dot(linalg::sub(w, pos), normal).abs();
         assert!(d < 0.05 * size.max(1.0) + 1.0, "point {id} is {d} px off the plane");
     }
-    // The solid faces the camera.
-    let ctx = EvalCtx::new(&s.project, cid, &comp, frame_time(12));
+    let ctx = EvalCtx::new(&s.project, cid, comp, frame_time(12));
     let eye = active_camera(&ctx).eye;
     assert!(linalg::dot(normal, linalg::sub([eye.x, eye.y, eye.z], pos)) > 0.0);
+}
 
-    // Undo removes both layers; redo brings them back.
-    let before = comp.layers.len();
-    assert!(s.undo());
-    assert_eq!(s.active_comp().unwrap().layers.len(), before - 2);
-    assert!(s.redo());
-    assert_eq!(s.active_comp().unwrap().layers.len(), before);
-
-    // A second create reuses the camera: Create Multiple Nulls and Camera.
+/// A second create reuses the camera (Create Multiple Nulls and Camera), then Text and
+/// Shadow Catcher (+ light).
+fn assert_create_kinds(s: &mut Session, cam: LayerId, n_floor: usize) {
     let r = s.execute_checked("camera.createFromSolve", json!({"kind": "null", "multiple": true})).unwrap();
     assert_eq!(r["camera"].as_u64().unwrap(), cam.0);
-    assert_eq!(r["layers"].as_array().unwrap().len(), floor.len());
+    assert_eq!(r["layers"].as_array().unwrap().len(), n_floor);
     // Text and Shadow Catcher (+ light).
     let r = s.execute_checked("camera.createFromSolve", json!({"kind": "text"})).unwrap();
     assert_eq!(r["layers"].as_array().unwrap().len(), 1);
@@ -180,11 +167,12 @@ fn track_camera_solves_and_creates_layers_on_the_plane() {
     assert_eq!(comp.layer(ids[0]).unwrap().props.prop("materialOptions/acceptsShadows").unwrap().value.as_enum(), 2);
     assert!(comp.layer(ids[1]).unwrap().is_light());
     assert!(s.execute_checked("camera.createFromSolve", json!({"kind": "teapot"})).is_err());
+}
 
-    // Set Ground Plane and Origin: the target becomes the origin; a null created there sits at
-    // (0, 0, 0) lying on the X-Z plane (its front facing up, −y).
+/// Set Ground Plane and Origin, then an explicit target.
+fn assert_ground_and_target(s: &mut Session) {
     s.execute_checked("camera.setGroundPlane", json!({})).unwrap();
-    assert_eq!(status(&mut s)["groundPlane"], true);
+    assert_eq!(status(s)["groundPlane"], true);
     let r = s.execute_checked("camera.createFromSolve", json!({"kind": "null"})).unwrap();
     let null = LayerId(r["layers"][0].as_u64().unwrap());
     let tr = s.active_comp().unwrap().layer(null).unwrap().props.sub("transform").unwrap().clone();
@@ -203,6 +191,44 @@ fn track_camera_solves_and_creates_layers_on_the_plane() {
     assert!(linalg::norm(linalg::sub(pos, [10.0, 0.0, 20.0])) < 1e-6, "{pos:?}");
     let front = linalg::mv(&linalg::from_euler_xyz(tr.get("orientation").unwrap().value.as_vec3()), [0.0, 0.0, -1.0]);
     assert!(linalg::norm(linalg::sub(front, [0.0, 0.0, -1.0])) < 1e-6, "{front:?}");
+}
+
+#[test]
+fn track_camera_solves_and_creates_layers_on_the_plane() {
+    let (mut s, clip) = tracked(json!({}));
+    let g = assert_solved(&mut s, clip);
+    let floor = select_floor_points(&mut s);
+
+    // Create Solid and Camera: one undo step, camera + solid.
+    let r = s.execute_checked("camera.createFromSolve", json!({"kind": "solid"})).unwrap();
+    let cam = LayerId(r["camera"].as_u64().unwrap());
+    let solid = LayerId(r["layers"][0].as_u64().unwrap());
+    let comp = s.active_comp().unwrap().clone();
+    assert!(comp.layer(cam).unwrap().is_camera());
+    assert_eq!(comp.layer(cam).unwrap().name, "3D Tracker Camera");
+    assert_eq!(comp.layers[0].id, cam);
+    let sl = comp.layer(solid).unwrap();
+    assert!(sl.switches.three_d);
+    assert!(sl.name.starts_with("Track Solid"));
+    // The camera is keyed on every frame.
+    assert_eq!(comp.layer(cam).unwrap().props.prop("transform/position").unwrap().keys.len(), 25);
+
+    let cid = s.active_comp_id().unwrap();
+    let uid = g.uid;
+    let pl = crate::camera_track::placed(&s.project, cid, clip, uid).unwrap();
+    assert_reprojection(&s, &comp, &pl, &g);
+    assert_solid_on_plane(&s, &comp, sl, &pl, r["target"]["size"].as_f64().unwrap());
+
+    // Undo removes both layers; redo brings them back.
+    let before = comp.layers.len();
+    assert!(s.undo());
+    assert_eq!(s.active_comp().unwrap().layers.len(), before - 2);
+    assert!(s.redo());
+    assert_eq!(s.active_comp().unwrap().layers.len(), before);
+
+    assert_create_kinds(&mut s, cam, floor.len());
+
+    assert_ground_and_target(&mut s);
 
     // Serde keeps the analysis.
     let back = effectcraft_project::Project::from_json(&s.project.to_json()).unwrap();
diff --git a/crates/engine/src/tests_codec_options.rs b/crates/engine/src/tests/codec_options.rs
similarity index 100%
rename from crates/engine/src/tests_codec_options.rs
rename to crates/engine/src/tests/codec_options.rs
diff --git a/crates/engine/src/tests_color_view.rs b/crates/engine/src/tests/color_view.rs
similarity index 100%
rename from crates/engine/src/tests_color_view.rs
rename to crates/engine/src/tests/color_view.rs
diff --git a/crates/engine/src/tests/crypto_pick.rs b/crates/engine/src/tests/crypto_pick.rs
new file mode 100644
index 000000000..eacae55af
--- /dev/null
+++ b/crates/engine/src/tests/crypto_pick.rs
@@ -0,0 +1,787 @@
+//! `effect.pickCryptomatte` / `effect.cryptomatteAt` (#473): the Cryptomatte eyedropper reads the
+//! aux channels the effect renders from (footage at its source time, a 3D precomp's generated
+//! pass) and edits the Selection text in one undo step.
+
+use std::sync::Arc;
+
+use effectcraft_project::{Footage, FootageKind, ItemId};
+use effectcraft_raster::channels3d::{crypto_float, crypto_hash};
+use effectcraft_raster::{AuxChannels, Image};
+use effectcraft_time::{FrameRate, Tick};
+use serde_json::{Value, json};
+
+use crate::Session;
+use crate::render::FootageSource;
+
+const COMMA: &str = "Green, \"Glossy\"";
+
+/// 8 × 4 footage with a 16 × 8 Cryptomatte (two aux pixels per layer pixel). Layer pixels in x:
+/// 0-1 `left` (0.6) over `right` (0.4); 2-3 `left` (0.3) under the comma name (0.7), ranks out of
+/// order; 4-5 `star*`; 6 an ID missing from the manifest; 7 a 0.5 / 0.5 tie of `left` and
+/// `right`. Rows 3+ are empty. From 1 s of source time `late` replaces columns 0-1.
+struct Crypto;
+
+fn aux_at(t: Tick) -> AuxChannels {
+    let (w, h) = (16usize, 8usize);
+    let mut planes = vec![vec![0.0f32; w * h]; 4];
+    for (i, x) in (0..w * h).map(|i| (i, i % w)).filter(|(i, _)| i / w < 6) {
+        let late = if t >= Tick::from_seconds_f64(1.0) { "late" } else { "left" };
+        let (a, ca, b, cb) = match x {
+            0..4 => (late, 0.6, "right", 0.4),
+            4..8 => ("left", 0.3, COMMA, 0.7),
+            8..12 => ("star*", 1.0, "", 0.0),
+            12..14 => ("ghost", 1.0, "", 0.0),
+            _ => ("left", 0.5, "right", 0.5),
+        };
+        for (k, v) in [crypto_float(crypto_hash(a)), ca, crypto_float(crypto_hash(b)), cb].into_iter().enumerate() {
+            planes[k][i] = v;
+        }
+    }
+    let mut aux = AuxChannels::new(w as u32, h as u32, 1.0);
+    for (k, c) in ["R", "G", "B", "A"].iter().enumerate() {
+        aux.channels.push((format!("CryptoObject00.{c}"), planes[k].clone()));
+    }
+    aux.manifests = vec![("CryptoObject".into(), ["left", "right", "late", COMMA, "star*"].iter().map(|n| (n.to_string(), crypto_hash(n))).collect())];
+    aux
+}
+
+impl FootageSource for Crypto {
+    fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+        Some(Arc::new(Image::new(f.width, f.height)))
+    }
+    fn aux(&self, _: ItemId, _: &Footage, t: Tick) -> Option<Arc<AuxChannels>> {
+        Some(Arc::new(aux_at(t)))
+    }
+}
+
+struct Probe;
+impl crate::Importer for Probe {
+    fn probe(&self, path: &str) -> Result<Footage, String> {
+        let duration = Tick::from_seconds_f64(2.0);
+        // A half-size proxy of the EXR.
+        let (width, height) = if path.contains("proxy") { (4, 2) } else { (8, 4) };
+        Ok(Footage {
+            path: path.into(),
+            kind: FootageKind::Video,
+            width,
+            height,
+            has_video: true,
+            frame_rate: FrameRate::from_f64(24.0),
+            duration,
+            ..Default::default()
+        })
+    }
+}
+
+fn session() -> Session {
+    let mut s = Session { footage: Arc::new(Crypto), importer: Some(Arc::new(Probe)), ..Default::default() };
+    let item = s.execute("file.import", json!({"paths": ["/renders/crypto.exr"]})).unwrap()["items"][0].clone();
+    s.execute("comp.new", json!({"name": "C", "width": 8, "height": 4, "frameRate": 24, "duration": 2})).unwrap();
+    s.execute("layer.addItem", json!({"item": item})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    s
+}
+
+fn pick(s: &mut Session, x: f64, mode: &str) -> Value {
+    s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": x, "y": 1.5, "mode": mode})).unwrap()
+}
+
+fn selection(s: &Session) -> String {
+    let l = &s.active_comp().unwrap().layers[0];
+    let g = l.effects().unwrap().groups().next().unwrap();
+    match &g.prop("selection").unwrap().value {
+        effectcraft_keyframe::Value::Str(t) => t.clone(),
+        v => panic!("{v:?}"),
+    }
+}
+
+#[test]
+fn picks_replace_add_and_remove_in_one_undo_step_each() {
+    let mut s = session();
+    let steps = s.history.undo.len();
+    let r = pick(&mut s, 0.5, "replace");
+    assert_eq!((r["name"].as_str(), r["selection"].as_str(), r["changed"].as_bool()), (Some("left"), Some("left"), Some(true)), "{r}");
+    assert_eq!(r["hash"], format!("{:08x}", crypto_hash("left")));
+    assert_eq!(s.history.undo.len(), steps + 1);
+    // The highest coverage wins even when it is not rank 0; the name is quoted.
+    assert_eq!(pick(&mut s, 2.5, "add")["selection"], r#"left, "Green, \"Glossy\"""#);
+    // Adding it again changes nothing and leaves no undo step.
+    let again = pick(&mut s, 3.5, "add");
+    assert_eq!((again["changed"].as_bool(), s.history.undo.len()), (Some(false), steps + 2));
+    // A `*` name and an unnamed ID go in as hashes; a tie goes to rank 0.
+    pick(&mut s, 4.5, "add");
+    assert_eq!(pick(&mut s, 6.5, "add")["selection"], format!(r#"left, "Green, \"Glossy\"", <{:08x}>, <{:08x}>"#, crypto_hash("star*"), crypto_hash("ghost")));
+    assert_eq!(s.execute("effect.cryptomatteAt", json!({"effect": 1, "x": 7.5, "y": 0.5})).unwrap()["name"], "left");
+    let r = pick(&mut s, 0.0, "remove");
+    assert_eq!(r["selection"], format!(r#""Green, \"Glossy\"", <{:08x}>, <{:08x}>"#, crypto_hash("star*"), crypto_hash("ghost")));
+    assert_eq!(r["selected"], false);
+    // The text parses back to exactly the picked IDs.
+    let manifest = aux_at(Tick::ZERO).manifests[0].1.clone();
+    let got = effectcraft_effects::selection_hashes(&selection(&s), Some(&manifest));
+    assert_eq!(got, [COMMA, "star*", "ghost"].map(crypto_hash));
+    assert_eq!(s.history.undo.len(), steps + 5);
+    s.execute("edit.undo", json!({})).unwrap();
+    assert!(selection(&s).starts_with("left, "), "{}", selection(&s));
+    pick(&mut s, 2.0, "replace");
+    assert_eq!(selection(&s), r#""Green, \"Glossy\"""#);
+    // The same selection with other spacing: no change, no undo step.
+    s.execute_checked("prop.set", json!({"path": "effects/#1/selection", "value": " \"Green, \\\"Glossy\\\"\" "})).unwrap();
+    let n = s.history.undo.len();
+    assert_eq!((pick(&mut s, 2.0, "replace")["changed"].as_bool(), s.history.undo.len()), (Some(false), n));
+}
+
+#[test]
+fn bad_points_layers_and_modes_are_errors_and_change_nothing() {
+    let mut s = session();
+    let at = |s: &mut Session, x: f64, y: f64| s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": x, "y": y}));
+    for (x, y) in [(-0.1, 1.0), (8.0, 1.0), (1.0, 4.0), (1.0, 3.5), (1e300, -1e300)] {
+        assert!(at(&mut s, x, y).is_err(), "{x},{y}");
+        assert_eq!(s.execute("effect.cryptomatteAt", json!({"effect": 1, "x": x, "y": y})).unwrap(), Value::Null);
+    }
+    assert!(s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 1, "y": 1, "mode": "toggle"})).is_err());
+    assert!(s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 1})).is_err());
+    for scale in [0.0, -1.0, 2.0] {
+        assert!(s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 1, "y": 1, "scale": scale})).is_err(), "{scale}");
+    }
+    s.execute_checked("effect.apply", json!({"effect": "Gaussian Blur"})).unwrap();
+    assert!(s.execute_checked("effect.pickCryptomatte", json!({"effect": 2, "x": 1, "y": 1})).is_err(), "not a Cryptomatte effect");
+    assert_eq!(selection(&s), "");
+    // A layer without aux channels.
+    s.execute("layer.newSolid", json!({"name": "S"})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    let e = s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 1, "y": 1})).unwrap_err().to_string();
+    assert!(e.contains("no Cryptomatte channels"), "{e}");
+    // An expression-driven Selection would ignore the edit.
+    let mut s = session();
+    s.execute_checked("prop.setExpression", json!({"path": "effects/#1/selection", "expression": "\"right\""})).unwrap();
+    assert!(s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 1, "y": 1})).is_err());
+    assert_eq!(s.execute("effect.cryptomatteAt", json!({"effect": 1, "x": 1, "y": 1})).unwrap()["selected"], false);
+}
+
+/// The pick reads the frame the render shows: Time Remap's source time, not the layer time.
+#[test]
+fn time_remap_picks_the_shown_source_frame() {
+    let mut s = session();
+    assert_eq!(pick(&mut s, 0.5, "replace")["name"], "left");
+    s.execute_checked("layer.enableTimeRemap", json!({})).unwrap();
+    s.execute_checked("prop.set", json!({"path": "timeRemap", "value": 1.5})).unwrap();
+    assert_eq!(pick(&mut s, 0.5, "replace")["name"], "late");
+}
+
+/// A precomp of a 3D comp: the generated CryptoObject pass names its layers.
+#[test]
+fn picks_on_a_precomp_of_a_3d_comp() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Outer", "width": 40, "height": 20, "frameRate": 24, "duration": 1})).unwrap();
+    let l = s.execute("layer.newSolid", json!({"name": "Red, Ball", "width": 40, "height": 20})).unwrap()["layer"].clone();
+    s.execute("layer.setSwitch", json!({"layers": [l], "switch": "threeD", "value": true})).unwrap();
+    s.execute("layer.precompose", json!({"layers": [l], "name": "Inner"})).unwrap();
+    s.execute("layer.select", json!({"layers": [s.active_comp().unwrap().layers[0].id.0]})).ok();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    let r = s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 20, "y": 10})).unwrap();
+    assert_eq!((r["name"].as_str(), r["selection"].as_str()), (Some("Red, Ball"), Some("\"Red, Ball\"")), "{r}");
+}
+
+/// The matte the rendered Cryptomatte effect gives the picked ID at the buffer pixel under
+/// `{x, y}`: the pick has to name the ID the effect's own input buffer samples there.
+fn rendered_matte_of_pick(s: &mut Session, x: f64, y: f64, scale: f64) -> (String, f32) {
+    let r = s.execute_checked("effect.pickCryptomatte", json!({"effect": "Cryptomatte", "x": x, "y": y, "scale": scale, "mode": "replace"})).unwrap();
+    let fx = s.active_comp().unwrap().layers[0].effects().unwrap().groups().position(|g| g.match_id == "ec.3d.cryptomatte").unwrap() + 1;
+    s.execute_checked("prop.set", json!({"path": format!("effects/#{fx}/matteOnly"), "value": true})).unwrap();
+    let (cid, comp) = (s.active_comp_id().unwrap(), s.active_comp().unwrap());
+    let layer = &comp.layers[0];
+    let ctx = effectcraft_render::EvalCtx { project: &s.project, comp_id: cid, comp, time: Tick::ZERO, expr: None, footage: None };
+    let buf = s.renderer(effectcraft_render::RenderOpts { scale, ..Default::default() }).content_buf(&ctx, layer).unwrap();
+    let (px, py) = buf.to_px([x, y]);
+    let m = buf.img.get(px.floor() as i64, py.floor() as i64)[0];
+    (r["name"].as_str().unwrap_or("?").to_string(), m)
+}
+
+/// Between 3/4 and full resolution footage keeps its native pixels: at 0.8 the effect samples
+/// layer pixel 2 (the comma name, 0.7) at x = 2.2, not the 0.8-grid pixel snapped back to 1.
+#[test]
+fn pick_at_scale_0_8_matches_the_native_buffer_the_effect_renders() {
+    let mut s = session();
+    let (name, m) = rendered_matte_of_pick(&mut s, 2.2, 1.5, 0.8);
+    assert!(m >= 0.5, "picked {name:?}, but the render gives it matte {m} there");
+    assert_eq!(name, COMMA);
+}
+
+/// A half-size proxy renders a buffer at 0.5 layer pixels per pixel even at full resolution:
+/// x = 6.5 lies in buffer pixel 3, which samples layer x = 7 (the `left` / `right` tie).
+#[test]
+fn pick_on_a_proxy_matches_the_proxy_sized_buffer() {
+    let mut s = session();
+    let item = *s.project.items.iter().find(|(_, i)| matches!(i.kind, effectcraft_project::ItemKind::Footage(_))).unwrap().0;
+    s.execute("file.setProxy", json!({"item": item.0, "path": "/renders/crypto_proxy.exr"})).unwrap();
+    let (name, m) = rendered_matte_of_pick(&mut s, 6.5, 1.5, 1.0);
+    assert!(m >= 0.5, "picked {name:?}, but the render gives it matte {m} there");
+    assert_eq!(name, "left");
+}
+
+/// 1920-px footage with `left` up to x = 120 and `right` after it, and a 104-px proxy.
+struct Edge;
+impl FootageSource for Edge {
+    fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+        Some(Arc::new(Image::new(f.width, f.height)))
+    }
+    fn aux(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<AuxChannels>> {
+        let (w, h) = (1920usize, 40usize);
+        let mut aux = AuxChannels::new(w as u32, h as u32, 1.0);
+        let ids = (0..w * h).map(|i| crypto_float(crypto_hash(if i % w < 120 { "left" } else { "right" }))).collect();
+        aux.channels = vec![("CryptoObject00.R".into(), ids), ("CryptoObject00.G".into(), vec![1.0; w * h])];
+        aux.manifests = vec![("CryptoObject".into(), ["left", "right"].iter().map(|n| (n.to_string(), crypto_hash(n))).collect())];
+        Some(Arc::new(aux))
+    }
+}
+
+/// Proxy buffer pixel 6's centre maps to layer x = 6.5 / (104 / 1920): 120.0 by division, but
+/// 119.99999999999999 by the reciprocal the effect multiplies with. The pick must agree.
+#[test]
+fn pick_maps_pixel_centres_bit_exactly_as_the_effect() {
+    let mut s = Session { footage: Arc::new(Edge), ..Default::default() };
+    let at = |path: &str, width| Footage {
+        path: path.into(),
+        kind: FootageKind::Video,
+        width,
+        height: 40,
+        has_video: true,
+        frame_rate: FrameRate::from_f64(24.0),
+        duration: Tick::from_seconds_f64(2.0),
+        ..Default::default()
+    };
+    s.importer = Some(Arc::new(EdgeProbe(at("/renders/edge.exr", 1920), at("/renders/edge_proxy.exr", 104))));
+    let item = s.execute("file.import", json!({"paths": ["/renders/edge.exr"]})).unwrap()["items"][0].clone();
+    s.execute("comp.new", json!({"name": "C", "width": 1920, "height": 40, "frameRate": 24, "duration": 2})).unwrap();
+    s.execute("layer.addItem", json!({"item": item})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    s.execute("file.setProxy", json!({"item": item, "path": "/renders/edge_proxy.exr"})).unwrap();
+    let (name, m) = rendered_matte_of_pick(&mut s, 118.0, 5.0, 1.0);
+    assert_eq!((name.as_str(), m), ("left", 1.0));
+}
+
+struct EdgeProbe(Footage, Footage);
+impl crate::Importer for EdgeProbe {
+    fn probe(&self, path: &str) -> Result<Footage, String> {
+        Ok(if path.contains("proxy") { self.1.clone() } else { self.0.clone() })
+    }
+}
+
+/// Footage whose decoded frames are `num / den` of the probed size (a file re-rendered at another
+/// resolution, a relinked file): the render stretches them over the layer.
+struct OffNominal(u32, u32);
+impl FootageSource for OffNominal {
+    fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+        Some(Arc::new(Image::new(f.width * self.0 / self.1, f.height * self.0 / self.1)))
+    }
+    fn aux(&self, _: ItemId, _: &Footage, t: Tick) -> Option<Arc<AuxChannels>> {
+        Some(Arc::new(aux_at(t)))
+    }
+}
+
+/// Points along rows `ys` where the picked ID isn't lit in the rendered matte under the point.
+fn mismatches(s: &mut Session, scales: &[f64], xs: impl Iterator<Item = f64> + Clone, ys: &[f64]) -> Vec<String> {
+    let mut bad = vec![];
+    for &scale in scales {
+        for (x, &y) in ys.iter().flat_map(|y| xs.clone().map(move |x| (x, y))) {
+            if s.execute("effect.cryptomatteAt", json!({"effect": "Cryptomatte", "x": x, "y": y, "scale": scale})).unwrap().is_null() {
+                continue;
+            }
+            let (name, m) = rendered_matte_of_pick(s, x, y, scale);
+            if m < 0.5 {
+                bad.push(format!("scale {scale} ({x:.2}, {y}): picked {name:?}, matte {m}"));
+            }
+        }
+    }
+    bad
+}
+
+const PREVIEW_SCALES: [f64; 7] = [1.0, 0.8, 0.75, 0.74, 0.5, 0.33, 0.25];
+
+/// The pick follows the decoded frame's real size, not the footage's nominal one.
+#[test]
+fn pick_matches_the_render_when_frames_decode_off_nominal_size() {
+    for (num, den) in [(2, 1), (1, 2), (3, 4)] {
+        let mut s = Session { footage: Arc::new(OffNominal(num, den)), importer: Some(Arc::new(Probe)), ..Default::default() };
+        let item = s.execute("file.import", json!({"paths": ["/renders/crypto.exr"]})).unwrap()["items"][0].clone();
+        s.execute("comp.new", json!({"name": "C", "width": 8, "height": 4, "frameRate": 24, "duration": 2})).unwrap();
+        s.execute("layer.addItem", json!({"item": item})).unwrap();
+        s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+        let bad = mismatches(&mut s, &PREVIEW_SCALES, (0..80).map(|i| i as f64 * 0.1 + 0.05), &[0.3, 1.7, 2.6]);
+        assert!(bad.is_empty(), "decode {num}/{den}: {} mismatches:\n{}", bad.len(), bad.join("\n"));
+    }
+}
+
+/// A precomp of a 3D comp, with and without Preserve Resolution (drawn at full size below full
+/// resolution), behind a disabled effect: the pick names the ID the rendered matte shows.
+#[test]
+fn pick_matches_the_render_on_precomps_with_and_without_preserve_resolution() {
+    for preserve in [false, true] {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Outer", "width": 40, "height": 20, "frameRate": 24, "duration": 2})).unwrap();
+        let a = s.execute("layer.newSolid", json!({"name": "A", "width": 40, "height": 20})).unwrap()["layer"].clone();
+        let b = s.execute("layer.newSolid", json!({"name": "B", "width": 7, "height": 20})).unwrap()["layer"].clone();
+        s.execute_checked("prop.set", json!({"layer": b, "path": "transform/position", "value": [3.5, 10, -10]})).unwrap();
+        s.execute("layer.setSwitch", json!({"layers": [a, b], "switch": "threeD", "value": true})).unwrap();
+        s.execute("layer.precompose", json!({"layers": [a, b], "name": "Inner"})).unwrap();
+        let inner = *s.project.items.iter().find(|(_, i)| i.name == "Inner").unwrap().0;
+        s.execute_checked("comp.settings", json!({"comp": inner.0, "preserveResolution": preserve})).unwrap();
+        s.execute("layer.select", json!({"layers": [s.active_comp().unwrap().layers[0].id.0]})).ok();
+        s.execute_checked("effect.apply", json!({"effect": "Gaussian Blur"})).unwrap();
+        s.execute_checked("effect.toggle", json!({"effect": 1, "value": false})).unwrap();
+        s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+        let bad = mismatches(&mut s, &PREVIEW_SCALES, (0..93).map(|i| i as f64 * 0.15 + 0.05), &[10.0]);
+        assert!(bad.is_empty(), "preserve {preserve}: {} mismatches:\n{}", bad.len(), bad.join("\n"));
+    }
+}
+
+/// `w` × `h` footage whose Cryptomatte has an ID per 37 × 29 px cell (`c<col>_<row>`, all in the
+/// manifest), one aux pixel per layer pixel. Built once, as the media pool keeps decoded aux.
+struct Cells(u32, u32, std::sync::OnceLock<Arc<AuxChannels>>);
+impl Cells {
+    fn name(x: usize, y: usize) -> String {
+        format!("c{}_{}", x / 37, y / 29)
+    }
+}
+impl FootageSource for Cells {
+    fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+        Some(Arc::new(Image::new(f.width, f.height)))
+    }
+    fn aux(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<AuxChannels>> {
+        Some(self.2.get_or_init(|| Arc::new(self.build())).clone())
+    }
+}
+impl Cells {
+    fn build(&self) -> AuxChannels {
+        let (w, h) = (self.0 as usize, self.1 as usize);
+        let ids = (0..w * h).map(|i| crypto_float(crypto_hash(&Cells::name(i % w, i / w)))).collect();
+        let mut aux = AuxChannels::new(w as u32, h as u32, 1.0);
+        aux.channels = vec![("CryptoObject00.R".into(), ids), ("CryptoObject00.G".into(), vec![1.0; w * h])];
+        let names = (0..w.div_ceil(37)).flat_map(|x| (0..h.div_ceil(29)).map(move |y| Cells::name(x * 37, y * 29)));
+        aux.manifests = vec![("CryptoObject".into(), names.map(|n| (n.clone(), crypto_hash(&n))).collect())];
+        aux
+    }
+}
+
+struct CellsProbe(u32, u32);
+impl crate::Importer for CellsProbe {
+    fn probe(&self, path: &str) -> Result<Footage, String> {
+        // `…_proxy` is a half-size proxy (rounded up); `…still…` a still image.
+        let (width, height) = if path.contains("proxy") { (self.0.div_ceil(2), self.1.div_ceil(2)) } else { (self.0, self.1) };
+        let (frame_rate, duration) = (FrameRate::from_f64(24.0), Tick::from_seconds_f64(2.0));
+        let kind = if path.contains("still") { FootageKind::Still } else { FootageKind::Video };
+        Ok(Footage { path: path.into(), kind, width, height, has_video: true, frame_rate, duration, ..Default::default() })
+    }
+}
+
+fn cells_session(w: u32, h: u32, blur: bool) -> Session {
+    cells_session_at(w, h, blur, "/renders/cells.exr")
+}
+
+fn cells_session_at(w: u32, h: u32, blur: bool, path: &str) -> Session {
+    let mut s = Session { footage: Arc::new(Cells(w, h, Default::default())), importer: Some(Arc::new(CellsProbe(w, h))), ..Default::default() };
+    let item = s.execute("file.import", json!({"paths": [path]})).unwrap()["items"][0].clone();
+    s.execute("comp.new", json!({"name": "C", "width": w, "height": h, "frameRate": 24, "duration": 2})).unwrap();
+    s.execute("layer.addItem", json!({"item": item})).unwrap();
+    if blur {
+        s.execute_checked("effect.apply", json!({"effect": "Gaussian Blur"})).unwrap();
+        s.execute_checked("prop.set", json!({"path": "effects/#1/blurriness", "value": 40.0})).unwrap();
+    }
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    s
+}
+
+/// Hover latency of `effect.cryptomatteAt` (dev profile): the first call after the viewer's frame
+/// and the next ones, on footage (1080p, 4K, 4K behind a blur) and a 1080p 3D precomp. Run with
+/// `--ignored --nocapture`; it measures, it doesn't assert.
+#[test]
+#[ignore]
+fn hover_latency() {
+    let mut cases: Vec<(&str, Session)> = vec![
+        ("footage 1920x1080", cells_session(1920, 1080, false)),
+        ("footage 3840x2160", cells_session(3840, 2160, false)),
+        ("footage 3840x2160 + blur 40", cells_session(3840, 2160, true)),
+    ];
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Outer", "width": 1920, "height": 1080, "frameRate": 24, "duration": 2})).unwrap();
+    let a = s.execute("layer.newSolid", json!({"name": "A", "width": 1920, "height": 1080})).unwrap()["layer"].clone();
+    let b = s.execute("layer.newSolid", json!({"name": "B", "width": 400, "height": 1080})).unwrap()["layer"].clone();
+    s.execute("layer.setSwitch", json!({"layers": [a, b], "switch": "threeD", "value": true})).unwrap();
+    s.execute("layer.precompose", json!({"layers": [a, b], "name": "Inner"})).unwrap();
+    s.execute("layer.select", json!({"layers": [s.active_comp().unwrap().layers[0].id.0]})).ok();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    cases.push(("3D precomp 1920x1080", s));
+    for (name, mut s) in cases {
+        let cid = s.active_comp_id().unwrap();
+        let _ = s.render(cid, Tick::ZERO, effectcraft_render::RenderOpts::default());
+        let ms: Vec<String> = (0..6)
+            .map(|i| {
+                let t0 = std::time::Instant::now();
+                let r = s.execute("effect.cryptomatteAt", json!({"effect": "Cryptomatte", "x": 100.0 + 40.0 * i as f64, "y": 500.0})).unwrap();
+                assert!(!r.is_null(), "{name}");
+                format!("{:.3}", t0.elapsed().as_secs_f64() * 1e3)
+            })
+            .collect();
+        eprintln!("HOVER {name}: first {} ms, then {} ms", ms[0], ms[1..].join(" / "));
+    }
+}
+
+/// The hover's probe: built off the thread that asks, kept while only the Selection changes,
+/// rebuilt when anything it reads changes, and a job finished for an older state is not used.
+#[test]
+fn hover_probe_is_built_by_a_job_kept_across_picks_and_dropped_on_other_edits() {
+    let mut s = session();
+    let q = json!({"effect": 1, "x": 0.5, "y": 1.5});
+    let job = s.crypto_probe_job(&q).unwrap().expect("nothing built yet");
+    std::thread::spawn(job).join().unwrap();
+    assert!(s.crypto_probe_job(&q).unwrap().is_none(), "built");
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap()["name"], "left");
+    // Another scale or time is another probe.
+    assert!(s.crypto_probe_job(&json!({"effect": 1, "x": 0.5, "y": 1.5, "scale": 0.5})).unwrap().is_some());
+    assert!(s.crypto_probe_job(&json!({"effect": 1, "x": 0.5, "y": 1.5, "time": 1.0})).unwrap().is_some());
+    // A pick edits only the Selection: the probe stays.
+    pick(&mut s, 0.5, "replace");
+    assert!(s.crypto_probe_job(&q).unwrap().is_none(), "kept across the pick");
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap()["selected"], true);
+    // Other edits rebuild it, and the answer follows them.
+    s.execute_checked("layer.enableTimeRemap", json!({})).unwrap();
+    s.execute_checked("prop.set", json!({"path": "timeRemap", "value": 1.5})).unwrap();
+    let stale = s.crypto_probe_job(&q).unwrap().expect("time remap changed it");
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap()["name"], "late");
+    // A job that finishes after the next edit doesn't answer for it.
+    s.execute_checked("prop.set", json!({"path": "timeRemap", "value": 0.5})).unwrap();
+    stale();
+    assert!(s.crypto_probe_job(&q).unwrap().is_some(), "stale job result is not used");
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap()["name"], "left");
+    // Errors are kept too, and still errors.
+    s.execute("layer.newSolid", json!({"name": "S"})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    let solid = json!({"effect": 1, "x": 1, "y": 1});
+    s.crypto_probe_job(&solid).unwrap().expect("solid")();
+    assert!(s.crypto_probe_job(&solid).unwrap().is_none());
+    assert!(s.execute("effect.cryptomatteAt", solid).unwrap_err().to_string().contains("no Cryptomatte channels"));
+}
+
+/// Picks on 1080p, 4K and odd-sized footage, at the viewer's resolutions and on a half-size proxy,
+/// name the ID the rendered matte shows under the point (points next to cell edges).
+#[test]
+fn picks_match_the_render_at_1080p_4k_odd_sizes_and_on_proxies() {
+    for (w, h) in [(1920, 1080), (3840, 2160), (1919, 1079)] {
+        let mut s = cells_session(w, h, false);
+        let (wl, hl) = (f64::from(w), f64::from(h));
+        let xs = [36.6, 37.2, 0.4, wl / 2.0 + 0.3, wl - 0.6, wl - 37.4];
+        let ys = [28.7, 29.1, hl - 0.5, hl / 3.0];
+        let mut bad = mismatches(&mut s, &[1.0, 0.5, 0.33, 0.25], xs.iter().copied(), &ys);
+        let item = *s.project.items.iter().find(|(_, i)| matches!(i.kind, effectcraft_project::ItemKind::Footage(_))).unwrap().0;
+        s.execute("file.setProxy", json!({"item": item.0, "path": "/renders/cells_proxy.exr"})).unwrap();
+        bad.extend(mismatches(&mut s, &[1.0, 0.5, 0.33, 0.25], xs.iter().copied(), &ys).into_iter().map(|b| format!("proxy {b}")));
+        assert!(bad.is_empty(), "{w}x{h}: {} mismatches:\n{}", bad.len(), bad.join("\n"));
+    }
+}
+
+/// The kept probe, and the aux channels it holds, go when the eyedropper is disarmed, when its
+/// layer or effect is deleted, on Open / New, and when its footage changes.
+#[test]
+fn hover_probe_is_released_on_disarm_delete_open_and_footage_changes() {
+    let q = json!({"effect": "Cryptomatte", "x": 100.0, "y": 100.0});
+    let ends: [(&str, fn(&mut Session)); 5] = [
+        ("disarm", |s| s.drop_crypto_probe()),
+        ("layer delete", |s| {
+            let lid = s.active_comp().unwrap().layers[0].id.0;
+            s.execute_checked("edit.clear", json!({"layers": [lid]})).unwrap();
+        }),
+        ("effect delete", |s| {
+            s.execute_checked("effect.remove", json!({"effect": "Cryptomatte"})).unwrap();
+        }),
+        ("open / new", |s| s.replace_project(effectcraft_project::Project::default(), None)),
+        ("footage change", |s| {
+            let f = s.project.items.values().find_map(|i| match &i.kind {
+                effectcraft_project::ItemKind::Footage(f) => Some(f.clone()),
+                _ => None,
+            });
+            s.forget_decoded(&f.unwrap());
+        }),
+    ];
+    for (what, end) in ends {
+        let mut s = cells_session(640, 360, false);
+        let aux = s.footage.aux(ItemId(0), &Footage::default(), Tick::ZERO).unwrap();
+        let unpinned = Arc::strong_count(&aux);
+        assert!(!s.execute("effect.cryptomatteAt", q.clone()).unwrap().is_null());
+        assert!(s.crypto_probe_stats().0 && Arc::strong_count(&aux) > unpinned, "{what}: kept");
+        end(&mut s);
+        assert!(!s.crypto_probe_stats().0, "{what}: the probe is gone");
+        assert_eq!(Arc::strong_count(&aux), unpinned, "{what}: its aux channels are let go");
+    }
+}
+
+/// A probe is keyed by the frame it reads: on a still, or footage held by Time Remap, every comp
+/// time shares one; each footage frame has its own, and so does each comp time once something
+/// before the Cryptomatte effect is animated.
+#[test]
+fn hover_probe_is_keyed_by_the_source_frame() {
+    let builds = |s: &mut Session, times: &[f64]| -> Vec<u64> {
+        let b = s.crypto_probe_stats().1;
+        times
+            .iter()
+            .map(|t| {
+                let r = s.execute("effect.cryptomatteAt", json!({"effect": "Cryptomatte", "x": 40.0, "y": 30.0, "time": t})).unwrap();
+                assert_eq!(r["name"], "c1_1");
+                s.crypto_probe_stats().1 - b
+            })
+            .collect()
+    };
+    let f = 1.0 / 24.0;
+    let mut s = cells_session_at(320, 180, false, "/renders/still.exr");
+    assert_eq!(builds(&mut s, &[0.0, f, 0.5, 1.9]), [1, 1, 1, 1], "a still: one probe");
+    let mut s = cells_session(320, 180, false);
+    assert_eq!(builds(&mut s, &[0.0, f * 0.4, f, f * 1.5, 0.0]), [1, 1, 2, 2, 3], "footage: a probe per frame");
+    s.execute_checked("layer.enableTimeRemap", json!({})).unwrap();
+    s.execute_checked("prop.toggleAnimation", json!({"path": "timeRemap", "value": false})).unwrap();
+    s.execute_checked("prop.set", json!({"path": "timeRemap", "value": 0.5})).unwrap();
+    assert_eq!(builds(&mut s, &[0.0, f, 1.2]), [1, 1, 1], "held by Time Remap: one source frame");
+    let mut s = cells_session_at(320, 180, true, "/renders/still.exr");
+    assert_eq!(builds(&mut s, &[0.0, f]), [1, 1], "a still blur");
+    s.execute_checked("prop.addKey", json!({"path": "effects/#1/blurriness", "time": 0.0, "value": 2.0})).unwrap();
+    s.execute_checked("prop.addKey", json!({"path": "effects/#1/blurriness", "time": 1.0, "value": 6.0})).unwrap();
+    assert_eq!(builds(&mut s, &[0.0, f, f]), [1, 2, 2], "an animated blur before it: per comp time");
+}
+
+/// Probes of two Cryptomatte effects (on two footage layers) at the same revision and frame
+/// don't answer for each other.
+#[test]
+fn hover_probes_are_per_layer_and_effect() {
+    /// `…late…` files have the IDs [`Crypto`] has from 1 s.
+    struct ByFile;
+    impl FootageSource for ByFile {
+        fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+            Some(Arc::new(Image::new(f.width, f.height)))
+        }
+        fn aux(&self, _: ItemId, f: &Footage, t: Tick) -> Option<Arc<AuxChannels>> {
+            Some(Arc::new(aux_at(if f.path.contains("late") { Tick::from_seconds_f64(1.0) } else { t })))
+        }
+    }
+    let mut s = Session { footage: Arc::new(ByFile), importer: Some(Arc::new(Probe)), ..Default::default() };
+    let items = s.execute("file.import", json!({"paths": ["/renders/crypto.exr", "/renders/late.exr"]})).unwrap()["items"].clone();
+    s.execute("comp.new", json!({"name": "C", "width": 8, "height": 4, "frameRate": 24, "duration": 2})).unwrap();
+    let layers: Vec<Value> = (0..2).map(|i| s.execute("layer.addItem", json!({"item": items[i]})).unwrap()["layer"].clone()).collect();
+    for l in &layers {
+        s.execute_checked("effect.apply", json!({"layers": [l], "effect": "Cryptomatte"})).unwrap();
+    }
+    let on = |l: &Value| json!({"layer": l, "effect": 1, "x": 0.5, "y": 1.5});
+    for (l, want) in [(&layers[0], "left"), (&layers[1], "late"), (&layers[0], "left")] {
+        assert_eq!(s.execute("effect.cryptomatteAt", on(l)).unwrap()["name"], want);
+    }
+}
+
+/// [`Crypto`]'s IDs, counting the reads, and holding them while `hold` is set (a build caught
+/// in the middle).
+#[derive(Default)]
+struct Gate {
+    reads: std::sync::atomic::AtomicUsize,
+    hold: std::sync::atomic::AtomicBool,
+    entered: std::sync::atomic::AtomicBool,
+    /// Picture frames read (the effect's input render).
+    frames: std::sync::atomic::AtomicUsize,
+}
+impl FootageSource for Gate {
+    fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+        self.frames.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+        Some(Arc::new(Image::new(f.width, f.height)))
+    }
+    fn aux(&self, _: ItemId, _: &Footage, t: Tick) -> Option<Arc<AuxChannels>> {
+        use std::sync::atomic::Ordering::SeqCst;
+        self.reads.fetch_add(1, SeqCst);
+        self.entered.store(true, SeqCst);
+        while self.hold.load(SeqCst) {
+            std::thread::sleep(std::time::Duration::from_millis(1));
+        }
+        Some(Arc::new(aux_at(t)))
+    }
+}
+
+/// Only the newest request's build is kept: a job that finishes late doesn't evict a newer probe,
+/// a job superseded before it runs doesn't build, one superseded (or outdated by an edit) while
+/// it builds stores nothing, and `probeOnly` never builds on the asking thread.
+#[test]
+fn hover_probe_builds_store_only_the_newest_and_never_build_for_probe_only() {
+    use std::sync::atomic::Ordering::SeqCst;
+    let gate = Arc::new(Gate::default());
+    let mut s = session();
+    s.footage = gate.clone();
+    let at = |t: f64| json!({"effect": 1, "x": 0.5, "y": 1.5, "time": t});
+    let reads = || gate.reads.load(SeqCst);
+    // A late job for another frame doesn't evict the probe built since.
+    let job0 = s.crypto_probe_job(&at(0.0)).unwrap().unwrap();
+    s.execute("effect.cryptomatteAt", at(1.0)).unwrap();
+    assert!(s.crypto_probe_job(&at(1.0)).unwrap().is_none());
+    job0();
+    assert!(s.crypto_probe_job(&at(1.0)).unwrap().is_none(), "the late job evicted the newer probe");
+    // A request for another probe cancels the earlier job: it doesn't even build.
+    let (old, new) = (s.crypto_probe_job(&at(0.5)).unwrap().unwrap(), s.crypto_probe_job(&at(0.25)).unwrap().unwrap());
+    let before = reads();
+    old();
+    assert_eq!(reads(), before, "a superseded job doesn't build");
+    new();
+    assert!(reads() > before);
+    assert!(s.crypto_probe_job(&at(0.25)).unwrap().is_none(), "the newest request's probe is kept");
+    // The same request again doesn't cancel the job in flight.
+    let (a, b) = (s.crypto_probe_job(&at(1.5)).unwrap().unwrap(), s.crypto_probe_job(&at(1.5)).unwrap().unwrap());
+    a();
+    drop(b);
+    assert!(s.crypto_probe_job(&at(1.5)).unwrap().is_none());
+    // Superseded, or outdated by an edit, while it builds: it stores nothing.
+    for edit in [false, true] {
+        let job = s.crypto_probe_job(&at(0.75)).unwrap().unwrap();
+        gate.hold.store(true, SeqCst);
+        gate.entered.store(false, SeqCst);
+        let run = std::thread::spawn(job);
+        while !gate.entered.load(SeqCst) {
+            std::thread::sleep(std::time::Duration::from_millis(1));
+        }
+        if edit {
+            s.execute_checked("prop.set", json!({"path": "effects/#1/matteOnly", "value": true})).unwrap();
+        } else {
+            drop(s.crypto_probe_job(&at(0.8)).unwrap());
+        }
+        gate.hold.store(false, SeqCst);
+        run.join().unwrap();
+        let stored = if edit { s.crypto_probe_stats().0 } else { s.crypto_probe_job(&at(0.75)).unwrap().is_none() };
+        assert!(!stored, "edit {edit}: the outdated build was stored");
+    }
+    // `probeOnly`: pending without a probe, and nothing built.
+    let before = reads();
+    let mut q = at(0.0);
+    q["probeOnly"] = json!(true);
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap(), json!({"pending": true}));
+    q["mode"] = json!("add");
+    assert_eq!(s.execute("effect.pickCryptomatte", q.clone()).unwrap()["pending"], true);
+    assert_eq!(reads(), before, "nothing built for probeOnly");
+    s.crypto_probe_job(&q).unwrap().unwrap()();
+    assert_eq!(s.execute("effect.pickCryptomatte", q.clone()).unwrap()["selection"], "left");
+}
+
+/// A build cancelled while it reads the IDs (a newer request, disarming, an edit, another
+/// project) stops before it renders the effect's input, so the next build isn't kept waiting.
+#[test]
+fn a_cancelled_build_stops_before_rendering_its_input() {
+    use std::sync::atomic::Ordering::SeqCst;
+    let cancels: [(&str, fn(&mut Session)); 4] = [
+        ("newer request", |s| drop(s.crypto_probe_job(&json!({"effect": 1, "x": 0.5, "y": 1.5, "time": 1.5})).unwrap())),
+        ("disarm", |s| s.drop_crypto_probe()),
+        ("edit", |s| drop(s.execute_checked("prop.set", json!({"path": "effects/#1/matteOnly", "value": true})).unwrap())),
+        ("project switch", |s| s.replace_project(effectcraft_project::Project::default(), None)),
+    ];
+    for (what, cancel) in [("not cancelled", None), ("newer request", Some(0)), ("disarm", Some(1)), ("edit", Some(2)), ("project switch", Some(3))] {
+        let gate = Arc::new(Gate::default());
+        let mut s = session();
+        s.footage = gate.clone();
+        let job = s.crypto_probe_job(&json!({"effect": 1, "x": 0.5, "y": 1.5, "time": 0.5})).unwrap().unwrap();
+        gate.hold.store(true, SeqCst);
+        let run = std::thread::spawn(job);
+        while !gate.entered.load(SeqCst) {
+            std::thread::sleep(std::time::Duration::from_millis(1));
+        }
+        if let Some(k) = cancel {
+            cancels[k].1(&mut s);
+        }
+        gate.hold.store(false, SeqCst);
+        run.join().unwrap();
+        let rendered = gate.frames.load(SeqCst) > 0;
+        assert_eq!(rendered, cancel.is_none(), "{what}: the input was rendered: {rendered}");
+    }
+}
+
+/// The probe doesn't read the Cryptomatte effect's own Selection: keyframed, a still keeps one
+/// probe for every comp time (an animated effect before it still makes one per time).
+#[test]
+fn an_animated_selection_keeps_one_probe_on_a_still() {
+    let mut s = cells_session_at(320, 180, false, "/renders/still.exr");
+    for (t, v) in [(0.0, "c1_1"), (1.0, "c2_2")] {
+        s.execute_checked("prop.addKey", json!({"path": "effects/#1/selection", "time": t, "value": v})).unwrap();
+    }
+    let b = s.crypto_probe_stats().1;
+    for t in [0.0, 1.0 / 24.0, 0.5, 1.5] {
+        assert_eq!(s.execute("effect.cryptomatteAt", json!({"effect": "Cryptomatte", "x": 40.0, "y": 30.0, "time": t})).unwrap()["name"], "c1_1");
+    }
+    assert_eq!(s.crypto_probe_stats().1 - b, 1, "one probe for the still");
+}
+
+/// A panic while a probe is built on another thread becomes the probe's error: the job returns,
+/// the hover reports it, and it isn't retried for that frame.
+#[test]
+fn a_panicking_probe_build_becomes_an_error() {
+    struct Broken;
+    impl FootageSource for Broken {
+        fn frame(&self, _: ItemId, f: &Footage, _: Tick) -> Option<Arc<Image>> {
+            Some(Arc::new(Image::new(f.width, f.height)))
+        }
+        fn aux(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<AuxChannels>> {
+            panic!("a broken EXR reader")
+        }
+    }
+    let mut s = Session { footage: Arc::new(Broken), importer: Some(Arc::new(Probe)), ..Default::default() };
+    let item = s.execute("file.import", json!({"paths": ["/renders/crypto.exr"]})).unwrap()["items"][0].clone();
+    s.execute("comp.new", json!({"name": "C", "width": 8, "height": 4, "frameRate": 24, "duration": 2})).unwrap();
+    s.execute("layer.addItem", json!({"item": item})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    let q = json!({"effect": 1, "x": 0.5, "y": 1.5, "probeOnly": true});
+    let job = s.crypto_probe_job(&q).unwrap().unwrap();
+    assert!(std::thread::spawn(job).join().is_ok(), "the job caught the panic");
+    assert!(s.crypto_probe_job(&q).unwrap().is_none(), "the error is kept");
+    let e = s.execute("effect.cryptomatteAt", q).unwrap_err().to_string();
+    assert!(e.contains("Reading the Cryptomatte IDs failed") && e.contains("a broken EXR reader"), "{e}");
+}
+
+/// Asking whether the probe is built changes nothing: asked for other frames while a build runs
+/// (the eyedropper's hover while a click waits), it doesn't cancel that build.
+#[test]
+fn asking_whether_a_probe_is_ready_cancels_no_build() {
+    let s = session();
+    let at = |t: f64| json!({"effect": 1, "x": 0.5, "y": 1.5, "time": t, "probeOnly": true});
+    let job = s.crypto_probe_job(&at(0.0)).unwrap().unwrap();
+    for t in [1.0, 0.5, 1.0, 0.25] {
+        assert!(!s.crypto_probe_ready(&at(t)).unwrap());
+    }
+    job();
+    assert!(s.crypto_probe_ready(&at(0.0)).unwrap(), "the build was cancelled");
+    assert!(s.crypto_probe_job(&at(0.0)).unwrap().is_none());
+}
+
+/// The probe renders with the render prefs (nested switches, draft shadows): changing them asks
+/// for a new one.
+#[test]
+fn a_render_prefs_change_asks_for_a_new_probe() {
+    let mut s = session();
+    let q = json!({"effect": 1, "x": 0.5, "y": 1.5});
+    s.crypto_probe_job(&q).unwrap().unwrap()();
+    assert!(s.crypto_probe_ready(&q).unwrap());
+    s.prefs.three_d.realtime_shadows = !s.prefs.three_d.realtime_shadows;
+    assert!(!s.crypto_probe_ready(&q).unwrap(), "draft shadows changed");
+    s.crypto_probe_job(&q).unwrap().unwrap()();
+    s.prefs.general.switches_affect_nested_comps = !s.prefs.general.switches_affect_nested_comps;
+    assert!(!s.crypto_probe_ready(&q).unwrap(), "nested switches changed");
+}
+
+/// A pick is an undo step named for it, and undoing, redoing or jumping over picks keeps the
+/// probe (only the Selection changed); undoing any other edit doesn't.
+#[test]
+fn undoing_picks_keeps_the_probe_and_the_step_says_pick() {
+    let mut s = session();
+    let q = json!({"effect": 1, "x": 0.5, "y": 1.5, "probeOnly": true});
+    s.crypto_probe_job(&q).unwrap().unwrap()();
+    let before = crate::history::state_id(&s.project);
+    pick(&mut s, 0.5, "replace");
+    assert_eq!(s.history.undo.last().unwrap().0, "Pick Cryptomatte");
+    pick(&mut s, 4.5, "add");
+    for (what, cmd) in [("undo", "edit.undo"), ("undo", "edit.undo"), ("redo", "edit.redo")] {
+        s.execute_checked(cmd, json!({})).unwrap();
+        assert!(s.crypto_probe_ready(&q).unwrap(), "{what} {}: probe dropped", selection(&s));
+    }
+    assert_eq!(s.execute("effect.cryptomatteAt", q.clone()).unwrap()["selected"], true);
+    assert!(s.goto_history(&before) && selection(&s).is_empty());
+    assert!(s.crypto_probe_ready(&q).unwrap(), "history jump: probe dropped");
+    s.execute_checked("prop.set", json!({"path": "transform/opacity", "value": 50})).unwrap();
+    s.crypto_probe_job(&q).unwrap().unwrap()();
+    s.execute_checked("edit.undo", json!({})).unwrap();
+    assert!(!s.crypto_probe_ready(&q).unwrap(), "an undone opacity change needs a new probe");
+}
diff --git a/crates/engine/src/tests/delete_keys.rs b/crates/engine/src/tests/delete_keys.rs
new file mode 100644
index 000000000..b1b9af316
--- /dev/null
+++ b/crates/engine/src/tests/delete_keys.rs
@@ -0,0 +1,45 @@
+//! `keys.delete` reports the keys it removed, not the keys it was asked to remove.
+
+use effectcraft_project::LayerId;
+use serde_json::json;
+
+use crate::{KeyRef, Session};
+
+fn setup() -> (Session, u64, u64) {
+    let mut s = Session::default();
+    s.execute_checked("comp.new", json!({"width": 64, "height": 64, "frameRate": 30, "duration": 4})).unwrap();
+    let layer = s.execute_checked("layer.newSolid", json!({"name": "Box", "color": "#fff"})).unwrap()["layer"].as_u64().unwrap();
+    for t in 0..3 {
+        s.execute_checked("prop.addKey", json!({"layer": layer, "path": "transform/opacity", "time": t, "value": t * 25})).unwrap();
+    }
+    let prop = s.active_comp().unwrap().layer(LayerId(layer)).unwrap().props.prop("transform/opacity").unwrap().uid;
+    (s, layer, prop)
+}
+
+fn keys_of(s: &Session, layer: u64, prop: u64) -> Vec<KeyRef> {
+    let keys = &s.active_comp().unwrap().layer(LayerId(layer)).unwrap().props.find(prop).unwrap().keys;
+    keys.iter().map(|k| KeyRef { layer: LayerId(layer), prop, time: k.time }).collect()
+}
+
+#[test]
+fn delete_keys_counts_only_the_keys_it_removed() {
+    let (mut s, layer, prop) = setup();
+    let keys = keys_of(&s, layer, prop);
+    assert_eq!(keys.len(), 3);
+    // Two real keys, one of them listed twice, and a key of a property that does not exist.
+    let missing = KeyRef { layer: LayerId(layer), prop: u64::MAX, time: keys[1].time };
+    s.state.selected_keys = vec![keys[0], keys[2], keys[0], missing];
+    let removed = s.execute_checked("keys.delete", json!({})).unwrap();
+    assert_eq!(removed, json!(2));
+    assert_eq!(keys_of(&s, layer, prop), vec![keys[1]]);
+}
+
+#[test]
+fn delete_keys_reports_zero_when_no_selected_key_exists() {
+    let (mut s, layer, prop) = setup();
+    let keys = keys_of(&s, layer, prop);
+    s.state.selected_keys = vec![KeyRef { layer: LayerId(layer), prop: u64::MAX, time: keys[0].time }];
+    let removed = s.execute_checked("keys.delete", json!({})).unwrap();
+    assert_eq!(removed, json!(0));
+    assert_eq!(keys_of(&s, layer, prop), keys);
+}
diff --git a/crates/engine/src/tests_disk_cache.rs b/crates/engine/src/tests/disk_cache.rs
similarity index 98%
rename from crates/engine/src/tests_disk_cache.rs
rename to crates/engine/src/tests/disk_cache.rs
index 3091964ad..119699aa8 100644
--- a/crates/engine/src/tests_disk_cache.rs
+++ b/crates/engine/src/tests/disk_cache.rs
@@ -30,12 +30,12 @@ fn project(s: &mut Session) -> effectcraft_project::ItemId {
 
 #[test]
 fn disk_cache_settings_persistence_and_invalidation() {
-    crate::tests_roto::hold_roto_cache_test_lock();
+    crate::tests::roto::hold_roto_cache_test_lock();
     let dir = folder("persist");
     let mut s = session(&dir);
     let st = s.execute_checked("cache.diskStats", json!({})).unwrap();
     assert_eq!(st["enabled"], json!(true));
-    assert_eq!(st["maxBytes"], json!(100u64 << 30));
+    assert_eq!(st["maxBytes"], json!(20u64 << 30));
     let cid = project(&mut s);
     let t = s.time();
     let first = s.render(cid, t, RenderOpts::default());
diff --git a/crates/engine/src/tests_effects.rs b/crates/engine/src/tests/effects.rs
similarity index 90%
rename from crates/engine/src/tests_effects.rs
rename to crates/engine/src/tests/effects.rs
index 6f87b4aea..1ea57f4cf 100644
--- a/crates/engine/src/tests_effects.rs
+++ b/crates/engine/src/tests/effects.rs
@@ -741,3 +741,77 @@ fn effect_colour_labels_set_clear_undo_and_round_trip() {
     let l = old.comp(s.active_comp_id().unwrap()).unwrap().layer(LayerId(a)).unwrap().clone();
     assert_eq!(l.effects().unwrap().groups().next().unwrap().label, None);
 }
+
+/// #1746: a preset saved from an effect property (`effects/ec.control.slider/slider`, `#2` for the second
+/// instance) applies back to the same layer instead of landing in `skipped`.
+#[test]
+fn preset_round_trips_effect_properties_by_match_name() {
+    let (mut s, a, _) = comp_with_two_solids();
+    apply(&mut s, a, "Slider Control");
+    apply(&mut s, a, "Slider Control");
+    let slider = |s: &Session, n: usize| match layer(s, a).effects().unwrap().groups().nth(n).unwrap().get("slider").unwrap().value {
+        KV::Scalar(v) => v,
+        ref other => panic!("not a scalar: {other:?}"),
+    };
+    for (n, value) in [(1, 30.0), (2, 70.0)] {
+        s.execute("prop.set", json!({"layer": a, "path": format!("effects/#{n}/slider"), "value": value})).unwrap();
+    }
+    for n in [1, 2] {
+        let path = std::env::temp_dir().join(format!("ec-1746-{}-{n}.ecpreset", std::process::id())).to_string_lossy().to_string();
+        s.execute("prop.select", json!({"layer": a, "path": format!("effects/#{n}/slider")})).unwrap();
+        s.execute("anim.savePreset", json!({"path": path})).unwrap();
+        let saved = std::fs::read_to_string(&path).unwrap();
+        let want = if n == 1 { "effects/ec.control.slider/slider" } else { "effects/ec.control.slider#2/slider" };
+        assert!(saved.contains(want), "{saved}");
+        s.execute("prop.set", json!({"layer": a, "path": format!("effects/#{n}/slider"), "value": 0.0})).unwrap();
+        let r = s.execute("anim.applyPreset", json!({"path": path, "layers": [a]})).unwrap();
+        let _ = std::fs::remove_file(&path);
+        assert_eq!(r["applied"], 1, "{r}");
+        assert_eq!(r["skipped"], json!([]), "{r}");
+        assert_eq!(slider(&s, n - 1), if n == 1 { 30.0 } else { 70.0 });
+    }
+}
+
+/// #2064: `prop.addKey` accepts the `effects/<match name>[#n]/<property>` path that
+/// `essential.list` reports.
+#[test]
+fn add_key_resolves_effect_match_name_paths() {
+    let (mut s, a, _) = comp_with_two_solids();
+    apply(&mut s, a, "Slider Control");
+    apply(&mut s, a, "Slider Control");
+    let slider = |s: &Session, n: usize| match layer(s, a).effects().unwrap().groups().nth(n).unwrap().get("slider").unwrap().value {
+        KV::Scalar(v) => v,
+        ref other => panic!("not a scalar: {other:?}"),
+    };
+    for (path, n, value) in [("effects/ec.control.slider/slider", 0, 30.0), ("effects/ec.control.slider#2/slider", 1, 70.0)] {
+        let reply = s.execute("prop.addKey", json!({"layer": a, "path": path, "time": 0, "value": value})).unwrap();
+        assert_eq!(reply, json!(1), "{path}");
+        let got = s.execute("prop.get", json!({"layer": a, "path": path, "time": 0})).unwrap();
+        assert_eq!(got["value"], json!(value), "{path}");
+        assert_eq!(got["keys"].as_array().unwrap().len(), 1, "{path}");
+        assert_eq!(slider(&s, n), 0.0, "the static value stays put; the key carries {value}");
+    }
+}
+
+/// #1746: Edit ▸ Copy of an effect property writes the same `effects/ec.blur.gaussian/blurriness` path,
+/// and Paste (the value, or Copy Expression Only) sets that property of the other layer's effect.
+#[test]
+fn copied_effect_property_pastes_onto_the_same_effect() {
+    let (mut s, a, b) = comp_with_two_solids();
+    apply(&mut s, a, "Gaussian Blur");
+    apply(&mut s, b, "Gaussian Blur");
+    s.execute("prop.set", json!({"layer": a, "path": "effects/#1/blurriness", "value": 12.5})).unwrap();
+    s.execute("prop.select", json!({"layer": a, "path": "effects/#1/blurriness"})).unwrap();
+    s.execute("edit.copy", json!({})).unwrap();
+    s.execute("layer.select", json!({"layers": [b]})).unwrap();
+    let r = s.execute("edit.paste", json!({})).unwrap();
+    assert_eq!(r["values"], 1, "{r}");
+    assert_eq!(layer(&s, b).props.prop("effects/#1/blurriness").unwrap().value, KV::Scalar(12.5));
+    s.execute("prop.setExpression", json!({"layer": a, "path": "effects/#1/blurriness", "expression": "time * 10"})).unwrap();
+    s.execute("prop.select", json!({"layer": a, "path": "effects/#1/blurriness"})).unwrap();
+    s.execute("edit.copyExpressionOnly", json!({})).unwrap();
+    s.execute("layer.select", json!({"layers": [b]})).unwrap();
+    let r = s.execute("edit.paste", json!({})).unwrap();
+    assert_eq!(r["expressions"], 1, "{r}");
+    assert_eq!(layer(&s, b).props.prop("effects/#1/blurriness").unwrap().expr.as_ref().unwrap().text, "time * 10");
+}
diff --git a/crates/engine/src/tests_essential.rs b/crates/engine/src/tests/essential.rs
similarity index 100%
rename from crates/engine/src/tests_essential.rs
rename to crates/engine/src/tests/essential.rs
diff --git a/crates/engine/src/tests_essential_more.rs b/crates/engine/src/tests/essential_more.rs
similarity index 100%
rename from crates/engine/src/tests_essential_more.rs
rename to crates/engine/src/tests/essential_more.rs
diff --git a/crates/engine/src/tests_face.rs b/crates/engine/src/tests/face.rs
similarity index 99%
rename from crates/engine/src/tests_face.rs
rename to crates/engine/src/tests/face.rs
index 9e713ff8b..2a45da98f 100644
--- a/crates/engine/src/tests_face.rs
+++ b/crates/engine/src/tests/face.rs
@@ -6,7 +6,7 @@ use effectcraft_track::face::{FaceParams, LANDMARKS, MEASUREMENTS, render_synthe
 use serde_json::json;
 
 use crate::mask_track::MaskMethod;
-use crate::tests_track::{H, W, frame_time, setup};
+use crate::tests::track::{H, W, frame_time, setup};
 
 fn face(f: u32) -> FaceParams {
     let t = f as f64;
diff --git a/crates/engine/src/tests_fidelity.rs b/crates/engine/src/tests/fidelity.rs
similarity index 100%
rename from crates/engine/src/tests_fidelity.rs
rename to crates/engine/src/tests/fidelity.rs
diff --git a/crates/engine/src/tests_frame_export.rs b/crates/engine/src/tests/frame_export.rs
similarity index 91%
rename from crates/engine/src/tests_frame_export.rs
rename to crates/engine/src/tests/frame_export.rs
index 87b0864ac..a45c5d444 100644
--- a/crates/engine/src/tests_frame_export.rs
+++ b/crates/engine/src/tests/frame_export.rs
@@ -77,6 +77,19 @@ fn proexr_writes_layer_prefixed_channels_and_the_composite() {
     assert!(at("R", 16, 16) < 0.5, "multiplied by 50% blue (linear)");
 }
 
+#[test]
+fn proexr_names_a_non_ascii_layer_with_underscores_instead_of_panicking() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Frame", "width": 8, "height": 8, "frameRate": 24, "duration": 1})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "你好", "color": "#ff0000"})).unwrap();
+    let dir = out_dir("frame-exr-non-ascii");
+    let path = dir.join("frame.exr").to_string_lossy().to_string();
+    let r = s.execute("comp.saveFrameAsExr", json!({"path": path})).unwrap();
+    let names: Vec<&str> = r["channels"].as_array().unwrap().iter().map(|c| c.as_str().unwrap()).collect();
+    assert!(names.contains(&"__.R") && names.contains(&"__.A"), "{names:?}");
+    assert!(std::path::Path::new(&path).exists());
+}
+
 /// Save a 32×32 comp holding one opaque solid of `color` (an sRGB-encoded triple) as ProEXR and
 /// return the centre pixel of the composite and of the solid's own layer: `[R, G, B]` each.
 fn proexr_centre(color: [f64; 3], bit_depth: u64) -> ([f32; 3], [f32; 3]) {
diff --git a/crates/engine/src/tests_fuzz_open.rs b/crates/engine/src/tests/fuzz_open.rs
similarity index 100%
rename from crates/engine/src/tests_fuzz_open.rs
rename to crates/engine/src/tests/fuzz_open.rs
diff --git a/crates/engine/src/tests_history.rs b/crates/engine/src/tests/history.rs
similarity index 100%
rename from crates/engine/src/tests_history.rs
rename to crates/engine/src/tests/history.rs
diff --git a/crates/engine/src/tests_import_project.rs b/crates/engine/src/tests/import_project.rs
similarity index 100%
rename from crates/engine/src/tests_import_project.rs
rename to crates/engine/src/tests/import_project.rs
diff --git a/crates/engine/src/tests_key_metadata_order.rs b/crates/engine/src/tests/key_metadata_order.rs
similarity index 100%
rename from crates/engine/src/tests_key_metadata_order.rs
rename to crates/engine/src/tests/key_metadata_order.rs
diff --git a/crates/engine/src/tests_key_time.rs b/crates/engine/src/tests/key_time.rs
similarity index 95%
rename from crates/engine/src/tests_key_time.rs
rename to crates/engine/src/tests/key_time.rs
index 4d4ab367b..b5ec3a159 100644
--- a/crates/engine/src/tests_key_time.rs
+++ b/crates/engine/src/tests/key_time.rs
@@ -4,7 +4,7 @@ use effectcraft_project::LayerId;
 use effectcraft_time::Tick;
 use serde_json::{Value, json};
 
-use crate::{Session, tests_timeline::prop};
+use crate::{Session, tests::timeline::prop};
 
 fn offset_layer(start: f64, stretch: f64) -> (Session, u64) {
     let mut s = Session::default();
@@ -57,7 +57,10 @@ fn default_layer_times_are_preserved_and_outside_keys_warn() {
     assert!(selected.get("warning").is_some());
     let moved = s.execute("keys.set", json!({"layer": layer, "path": "transform/opacity", "time": 15.3, "newTime": 9.5, "timeBase": "layer"})).unwrap();
     assert_seconds(&moved["compTime"], 20.0);
-    assert!(moved.get("warning").is_some(), "out point is exclusive");
+    assert!(moved.get("warning").is_none(), "a key on the out point is accepted");
+    let past = s.execute("prop.addKey", json!({"layer": layer, "path": "transform/rotation", "time": 20.1, "timeBase": "comp", "value": 45})).unwrap();
+    assert_seconds(&past["compTime"], 20.1);
+    assert!(past.get("warning").is_some(), "a key past the out point warns");
 }
 
 #[test]
diff --git a/crates/engine/src/tests_keylight.rs b/crates/engine/src/tests/keylight.rs
similarity index 100%
rename from crates/engine/src/tests_keylight.rs
rename to crates/engine/src/tests/keylight.rs
diff --git a/crates/engine/src/tests_limits.rs b/crates/engine/src/tests/limits.rs
similarity index 75%
rename from crates/engine/src/tests_limits.rs
rename to crates/engine/src/tests/limits.rs
index 68f2c04c0..524719bbf 100644
--- a/crates/engine/src/tests_limits.rs
+++ b/crates/engine/src/tests/limits.rs
@@ -102,3 +102,38 @@ fn commands_cap_sizes_at_30000_px() {
     let f = s.project.items.values().find_map(|i| if let ItemKind::Footage(f) = &i.kind { Some(f.clone()) } else { None }).unwrap();
     assert_eq!((f.width, f.height, f.frame_rate), (limits::MAX_SIZE, 8, FrameRate::FPS_29_97));
 }
+
+#[test]
+fn a_project_with_a_precomp_cycle_opens_adds_and_renders_without_running_out_of_stack() {
+    // Comps A and B nest each other (a damaged file); C is unrelated. Checking whether A
+    // contains C walked the A ⇄ B cycle until the stack ran out (#1237).
+    let mut s = Session::default();
+    let mut ids = vec![];
+    for name in ["A", "B", "C"] {
+        s.execute("comp.new", json!({"name": name, "width": 32, "height": 32, "frameRate": 30, "duration": 1})).unwrap();
+        ids.push(s.active_comp_id().unwrap());
+    }
+    let (a, b, c) = (ids[0], ids[1], ids[2]);
+    {
+        let proj = std::sync::Arc::make_mut(&mut s.project);
+        for (outer, inner) in [(a, b), (b, a)] {
+            let comp = proj.comp(outer).unwrap().clone();
+            let l = effectcraft_project::build::layer(proj, &comp, "pre", effectcraft_project::LayerSource::Comp { item: inner }, (32, 32), None);
+            let ItemKind::Comp(cc) = &mut proj.item_mut(outer).unwrap().kind else { panic!("comp") };
+            std::sync::Arc::make_mut(cc).layers.push(l);
+        }
+    }
+    let path = tmp("cycle.ecproj");
+    std::fs::write(&path, s.project.to_file_json().unwrap()).unwrap();
+    let mut t = Session::default();
+    t.execute("file.open", json!({"path": path})).unwrap();
+    t.open_comp(c);
+    // Adding A into C asks whether A contains C: it doesn't, so the layer goes in.
+    let r = t.execute("layer.addItem", json!({"comp": c.0, "item": a.0})).unwrap();
+    assert!(r["layer"].as_u64().is_some(), "{r}");
+    // Adding C into A would nest C in itself through A: refused, as before.
+    assert!(t.execute("layer.addItem", json!({"comp": a.0, "item": c.0})).is_err());
+    // C renders: inside A the renderer skips B's copy of A instead of looping.
+    let img = t.render(c, Tick::ZERO, RenderOpts { scale: 1.0, ..Default::default() });
+    assert_eq!((img.width, img.height), (32, 32));
+}
diff --git a/crates/engine/src/tests_lottie.rs b/crates/engine/src/tests/lottie.rs
similarity index 100%
rename from crates/engine/src/tests_lottie.rs
rename to crates/engine/src/tests/lottie.rs
diff --git a/crates/engine/src/tests_m137.rs b/crates/engine/src/tests/m137.rs
similarity index 100%
rename from crates/engine/src/tests_m137.rs
rename to crates/engine/src/tests/m137.rs
diff --git a/crates/engine/src/tests_m145.rs b/crates/engine/src/tests/m145.rs
similarity index 98%
rename from crates/engine/src/tests_m145.rs
rename to crates/engine/src/tests/m145.rs
index fe0a16936..831a05ead 100644
--- a/crates/engine/src/tests_m145.rs
+++ b/crates/engine/src/tests/m145.rs
@@ -42,14 +42,14 @@ fn split_layers_go_above_or_below_the_original() {
     let mut s = session();
     let a = solid(&mut s, "#ff0000");
     s.execute("time.set", json!({"time": 1.0})).unwrap();
-    let below = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
-    let order: Vec<u64> = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
-    assert_eq!(order, vec![a, below], "off (default): the new part goes below");
-    s.execute("edit.undo", json!({})).unwrap();
-    s.execute("prefs.set", json!({"key": "general.createSplitLayersAbove", "value": true})).unwrap();
     let above = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
     let order: Vec<u64> = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
-    assert_eq!(order, vec![above, a]);
+    assert_eq!(order, vec![above, a], "on (default): the new part goes above");
+    s.execute("edit.undo", json!({})).unwrap();
+    s.execute("prefs.set", json!({"key": "general.createSplitLayersAbove", "value": false})).unwrap();
+    let below = s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap()[0].as_u64().unwrap();
+    let order: Vec<u64> = s.active_comp().unwrap().layers.iter().map(|l| l.id.0).collect();
+    assert_eq!(order, vec![a, below]);
 }
 
 #[test]
@@ -345,7 +345,7 @@ fn render_queue_uses_default_folder_bit_depth_names_and_segments() {
 fn every_wired_setting_is_live_and_display_only_ones_are_documented() {
     let todo = crate::prefs::todo_keys();
     assert_eq!(todo, ["general.useSystemColorPicker", "composition.hardwareAcceleratePanels", "scripting.enableJsDebugger"]);
-    let docs = include_str!("../../../docs/preferences.md");
+    let docs = include_str!("../../../../docs/preferences.md");
     assert!(docs.contains("### Display-only settings"));
     assert!(!docs.contains("Not wired yet"));
 }
@@ -708,6 +708,11 @@ fn dynamic_menus_and_window_viewer_labels() {
     s.prefs.push_recent("/p/One.ecproj");
     let (e, _) = crate::menus::dynamic(&s, "recentProjects", &Default::default());
     assert_eq!((e[0].label.as_str(), e[0].command.as_str()), ("One.ecproj", "file.openRecent"));
+    // Two projects with the same file name show their paths.
+    s.prefs.push_recent("/q/One.ecproj");
+    s.prefs.push_recent("/p/Two.ecproj");
+    let (e, _) = crate::menus::dynamic(&s, "recentProjects", &Default::default());
+    assert_eq!(e.iter().map(|e| e.label.as_str()).collect::<Vec<_>>(), ["Two.ecproj", "/q/One.ecproj", "/p/One.ecproj"]);
     assert_eq!(crate::menus::dynamic(&s, "history", &Default::default()).0.len(), s.history.undo.len());
     let a = solid(&mut s, "#ff0000");
     s.state.selected_layers = vec![LayerId(a)];
diff --git a/crates/engine/src/tests_markers.rs b/crates/engine/src/tests/markers.rs
similarity index 99%
rename from crates/engine/src/tests_markers.rs
rename to crates/engine/src/tests/markers.rs
index afe4b9890..66aac5694 100644
--- a/crates/engine/src/tests_markers.rs
+++ b/crates/engine/src/tests/markers.rs
@@ -3,7 +3,7 @@
 
 use serde_json::json;
 
-use crate::tests_timeline::setup;
+use crate::tests::timeline::setup;
 
 #[test]
 fn comp_marker_dialog_fields_and_undo() {
diff --git a/crates/engine/src/tests_mask_warp.rs b/crates/engine/src/tests/mask_warp.rs
similarity index 98%
rename from crates/engine/src/tests_mask_warp.rs
rename to crates/engine/src/tests/mask_warp.rs
index 137feb1cb..adcea44be 100644
--- a/crates/engine/src/tests_mask_warp.rs
+++ b/crates/engine/src/tests/mask_warp.rs
@@ -11,7 +11,7 @@ use effectcraft_track::Homography;
 use serde_json::json;
 
 use crate::Session;
-use crate::tests_track::{FPS, H, W, frame_time, patch_frames, rotating_pose, setup, texture};
+use crate::tests::track::{FPS, H, W, frame_time, patch_frames, rotating_pose, setup, texture};
 
 fn pose_h(f: u32) -> Homography {
     let (c, rot, sc) = rotating_pose(f);
@@ -239,6 +239,28 @@ fn set_param(s: &mut Session, layer: LayerId, path: &str, v: serde_json::Value)
     s.execute("prop.set", json!({"layer": layer.0, "path": format!("effects/#1/{path}"), "value": v})).unwrap();
 }
 
+/// Stabilize, Crop, Auto-scale (the default) hides the borders; Crop leaves an opaque centre.
+fn assert_crop_framing(s: &mut Session, clip: LayerId) {
+    set_param(s, clip, "borders/framing", json!(2));
+    let st = s.execute("warp.status", json!({})).unwrap();
+    assert!(st["autoScale"].as_f64().unwrap() > 100.5, "{st}");
+    for f in 0..25 {
+        assert_eq!(transparent(&render(s, f)), 0, "frame {f}");
+    }
+    set_param(s, clip, "borders/framing", json!(1));
+    let st = s.execute("warp.status", json!({})).unwrap();
+    let crop: [f64; 4] = serde_json::from_value(st["crop"].clone()).unwrap();
+    for f in [0, 9, 24] {
+        let img = render(s, f);
+        for y in (crop[1].ceil() as u32 + 1)..(crop[3].floor() as u32 - 1) {
+            for x in (crop[0].ceil() as u32 + 1)..(crop[2].floor() as u32 - 1) {
+                assert!(img.get(x as i64, y as i64)[3] > 0.99, "frame {f} ({x}, {y})");
+            }
+        }
+        assert!(img.get(0, 0)[3] < 0.01);
+    }
+}
+
 #[test]
 fn warp_stabilizer_analyzes_and_stabilizes() {
     let (mut s, clip, solid) = setup(shaky);
@@ -289,25 +311,7 @@ fn warp_stabilizer_analyzes_and_stabilizes() {
     }
     set_param(&mut s, clip, "stabilization/result", json!(0));
 
-    // Stabilize, Crop, Auto-scale (the default) hides the borders; Crop leaves an opaque centre.
-    set_param(&mut s, clip, "borders/framing", json!(2));
-    let st = s.execute("warp.status", json!({})).unwrap();
-    assert!(st["autoScale"].as_f64().unwrap() > 100.5, "{st}");
-    for f in 0..25 {
-        assert_eq!(transparent(&render(&s, f)), 0, "frame {f}");
-    }
-    set_param(&mut s, clip, "borders/framing", json!(1));
-    let st = s.execute("warp.status", json!({})).unwrap();
-    let crop: [f64; 4] = serde_json::from_value(st["crop"].clone()).unwrap();
-    for f in [0, 9, 24] {
-        let img = render(&s, f);
-        for y in (crop[1].ceil() as u32 + 1)..(crop[3].floor() as u32 - 1) {
-            for x in (crop[0].ceil() as u32 + 1)..(crop[2].floor() as u32 - 1) {
-                assert!(img.get(x as i64, y as i64)[3] > 0.99, "frame {f} ({x}, {y})");
-            }
-        }
-        assert!(img.get(0, 0)[3] < 0.01);
-    }
+    assert_crop_framing(&mut s, clip);
     // Synthesize Edges fills most of the borders from neighbouring frames.
     set_param(&mut s, clip, "borders/framing", json!(3));
     let synth: usize = (0..25).map(|f| transparent(&render(&s, f))).sum();
diff --git a/crates/engine/src/tests_menu_cmds.rs b/crates/engine/src/tests/menu_cmds.rs
similarity index 91%
rename from crates/engine/src/tests_menu_cmds.rs
rename to crates/engine/src/tests/menu_cmds.rs
index 4e01e380f..eb99d809f 100644
--- a/crates/engine/src/tests_menu_cmds.rs
+++ b/crates/engine/src/tests/menu_cmds.rs
@@ -111,6 +111,29 @@ fn set_switch_others() {
     assert!(s.execute("layer.setSwitch", json!({"layers": [c], "switch": "nope", "others": true})).is_err());
 }
 
+/// The Video switch has a cell on every layer's row, cameras and lights included, so Alt-clicking
+/// it (and Hide Other Video) takes them along with the rest.
+#[test]
+fn video_others_takes_cameras_and_lights() {
+    let mut s = comp();
+    let a = solid(&mut s, "#ff0000");
+    let cam = s.execute("layer.newCamera", json!({})).unwrap()["layer"].as_u64().unwrap();
+    let light = s.execute("layer.newLight", json!({"kind": "Point"})).unwrap()["layer"].as_u64().unwrap();
+    let get = |s: &Session, f: fn(&effectcraft_project::Layer) -> bool| [a, cam, light].map(|l| f(&layer(s, l)));
+    // The camera and the light are hidden: Alt-click on the solid's eye brings them back, since
+    // they stand apart with it, and the next Alt-click hides them with every other layer.
+    s.execute("layer.setSwitch", json!({"layers": [cam, light], "switch": "video", "value": false})).unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [a], "switch": "video", "others": true})).unwrap();
+    assert_eq!(get(&s, |l| l.switches.video), [true; 3]);
+    s.execute("layer.setSwitch", json!({"layers": [a], "switch": "video", "others": true})).unwrap();
+    assert_eq!(get(&s, |l| l.switches.video), [true, false, false]);
+    // Hide Other Video takes them too.
+    s.execute("layer.showAllVideo", json!({})).unwrap();
+    assert_eq!(get(&s, |l| l.switches.video), [true; 3]);
+    s.execute("layer.hideOtherVideo", json!({"layers": [a]})).unwrap();
+    assert_eq!(get(&s, |l| l.switches.video), [true, false, false]);
+}
+
 /// A null's Video switch (the eye) works like any layer's, as in After Effects: it toggles,
 /// Alt-click and Hide Other Video take nulls along, and its children still follow it while it is
 /// hidden (parenting ignores the eye).
@@ -618,7 +641,7 @@ fn work_area_stays_ordered_when_the_start_passes_the_end() {
 
 #[test]
 fn label_group_purge_and_edit_original() {
-    crate::tests_roto::hold_roto_cache_test_lock();
+    crate::tests::roto::hold_roto_cache_test_lock();
     let mut s = comp();
     let a = solid(&mut s, "#ff0000");
     let b = solid(&mut s, "#00ff00");
@@ -725,6 +748,37 @@ fn reveal_properties() {
     assert!(frontend_events(&mut s).iter().all(|(c, _)| c == "timeline.revealProps"));
 }
 
+#[test]
+fn reveal_layer_source_selects_each_layers_source_item() {
+    let mut s = comp();
+    let a = solid(&mut s, "#ff0000");
+    let b = solid(&mut s, "#00ff00");
+    let ia = layer(&s, a).source.item().unwrap();
+    let ib = layer(&s, b).source.item().unwrap();
+    assert_ne!(ia, ib);
+    s.execute("layer.select", json!({"layers": [a, b]})).unwrap();
+    let r = s.execute("layer.revealSource", json!({})).unwrap();
+    assert_eq!(r["item"], ia.0);
+    assert_eq!(r["items"], json!([ia.0, ib.0]));
+    assert_eq!(s.state.project_selection, vec![ia, ib]);
+    assert_eq!(frontend_events(&mut s), vec![("project.reveal".to_string(), json!({"items": [ia.0, ib.0]}))]);
+    // A null has no source. Alone it is refused; in a mixed selection only the sources are revealed.
+    let n = s.execute("layer.newNull", json!({})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.select", json!({"layers": [n]})).unwrap();
+    assert!(s.execute("layer.revealSource", json!({})).is_err());
+    s.execute("layer.select", json!({"layers": [n, a]})).unwrap();
+    let r = s.execute("layer.revealSource", json!({})).unwrap();
+    assert_eq!(r["items"], json!([ia.0]));
+    assert_eq!(s.state.project_selection, vec![ia]);
+    // Reveal Composition in Project opens the same panel and folders.
+    let cid = s.active_comp_id().unwrap();
+    s.drain_events();
+    let r = s.execute("comp.revealInProject", json!({"comp": cid.0})).unwrap();
+    assert_eq!(r["item"], cid.0);
+    assert_eq!(s.state.project_selection, vec![cid]);
+    assert_eq!(frontend_events(&mut s), vec![("project.reveal".to_string(), json!({"items": [cid.0]}))]);
+}
+
 #[test]
 fn sequence_layers() {
     let mut s = comp();
@@ -1445,6 +1499,60 @@ fn keys_from_several_layers_paste_in_order_and_paste_reversed_respects_stretch()
     assert_eq!(vals, vec![10.0, 0.0], "reversed");
 }
 
+/// #1425: a mask path (its value, or a keyframe of it) pasted onto Position becomes a motion
+/// path, as in After Effects: a key per vertex with the path's tangents, over 2 s from the CTI,
+/// the inner keys roving; a closed path returns to its start. AE pastes the layer-space numbers
+/// as they are, so the source layer's and the target parent's transforms don't move them.
+#[test]
+fn a_copied_path_pastes_onto_position_as_a_motion_path() {
+    let mut s = comp();
+    let a = solid(&mut s, "#ff0000");
+    // A moved and scaled source: converting to comp space would give 2v + (200, 100).
+    s.execute("prop.set", json!({"layer": a, "path": "transform/position", "value": [400, 200]})).unwrap();
+    s.execute("prop.set", json!({"layer": a, "path": "transform/scale", "value": [200, 200]})).unwrap();
+    let rect = json!([[0, 0], [40, 0], [40, 40], [0, 40]]);
+    s.execute("mask.new", json!({"layer": a, "vertices": rect.clone(), "outTangents": [[10, 0]], "closed": true})).unwrap();
+    // B's parent would shift a converted Position by (0, −50).
+    let parent = solid(&mut s, "#0000ff");
+    s.execute("prop.set", json!({"layer": parent, "path": "transform/position", "value": [100, 100]})).unwrap();
+    let b = solid(&mut s, "#00ff00");
+    s.execute("layer.setParent", json!({"layers": [b], "parent": parent})).unwrap();
+    let motion = |s: &Session, id: u64| {
+        let l = layer(s, id);
+        let pr = l.props.prop("transform/position").unwrap().clone();
+        pr.keys.iter().map(|k| (l.comp_time(k.time).seconds(), k.value.as_vec3(), k.spatial_out, k.roving)).collect::<Vec<_>>()
+    };
+    let check = |keys: Vec<(f64, [f64; 3], [f64; 3], bool)>, t0: f64| {
+        let want = [[0.0, 0.0], [40.0, 0.0], [40.0, 40.0], [0.0, 40.0], [0.0, 0.0]];
+        assert_eq!(keys.len(), 5, "a key per vertex and the closing one: {keys:?}");
+        for (i, ((t, v, _, roving), w)) in keys.iter().zip(want).enumerate() {
+            assert!((v[0] - w[0]).abs() < 1e-6 && (v[1] - w[1]).abs() < 1e-6, "key {i}: {v:?}");
+            assert_eq!(*roving, i != 0 && i != 4, "key {i} roving");
+            assert!(*t > t0 - 1e-6 && *t < t0 + 2.0 + 1e-6, "key {i} at {t}");
+        }
+        assert!((keys[0].0 - t0).abs() < 1e-6 && (keys[4].0 - t0 - 2.0).abs() < 1e-6, "2 s from the CTI");
+        assert!(keys.windows(2).all(|w| w[0].0 < w[1].0));
+        assert_eq!(keys[0].2[..2], [10.0, 0.0], "the path's tangent");
+    };
+    // A Mask Path keyframe, pasted at 1 s.
+    s.execute("prop.toggleAnimation", json!({"layer": a, "path": "masks/#1/path"})).unwrap();
+    s.execute("prop.select", json!({"layer": a, "path": "masks/#1/path"})).unwrap();
+    s.execute("edit.copy", json!({})).unwrap();
+    s.execute("time.set", json!({"time": 1.0})).unwrap();
+    s.execute("prop.select", json!({"layer": b, "path": "transform/position"})).unwrap();
+    s.execute("edit.paste", json!({})).unwrap();
+    check(motion(&s, b), 1.0);
+    // The same path as an unanimated mask, pasted at 5 s onto an unparented layer.
+    s.execute("mask.new", json!({"layer": a, "vertices": rect, "outTangents": [[10, 0]], "closed": true})).unwrap();
+    s.execute("prop.select", json!({"layer": a, "path": "masks/#2/path"})).unwrap();
+    s.execute("edit.copy", json!({})).unwrap();
+    let c = solid(&mut s, "#ffffff");
+    s.execute("time.set", json!({"time": 5.0})).unwrap();
+    s.execute("prop.select", json!({"layer": c, "path": "transform/position"})).unwrap();
+    s.execute("edit.paste", json!({})).unwrap();
+    check(motion(&s, c), 5.0);
+}
+
 #[test]
 fn j_and_k_stop_at_keys_markers_and_the_work_area() {
     let mut s = comp();
@@ -1541,6 +1649,40 @@ fn shape_contents_copy_cut_and_paste_between_shape_layers() {
     assert!(s.execute("edit.paste", json!({})).is_err());
 }
 
+/// Pasting Trim Paths into another shape layer with nothing selected puts it below the shapes,
+/// where it acts on them (it acts on the items above it); on top it would trim nothing (#1681, #1629).
+#[test]
+fn pasted_path_operator_goes_below_the_shapes_it_acts_on() {
+    let mut s = comp();
+    let a = s.execute("layer.newShape", json!({"kind": "rect"})).unwrap()["layer"].as_u64().unwrap();
+    let trim = s.execute("layer.addShapeItem", json!({"layer": a, "kind": "trim"})).unwrap()["uid"].as_u64().unwrap();
+    let b = s.execute("layer.newShape", json!({"kind": "star", "name": "B"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.select", json!({"layer": a, "prop": trim})).unwrap();
+    s.execute("edit.copy", json!({})).unwrap();
+    s.execute("layer.select", json!({"layers": [b]})).unwrap();
+    s.execute("edit.paste", json!({})).unwrap();
+    assert_eq!(contents_names(&s, b), ["Polystar 1", "Trim Paths 1"]);
+}
+
+/// Pasting Merge Paths onto a painted layer with nothing selected keeps the paint: the renderer
+/// drops the draws above a Merge Paths, so it goes between the path and the paints (#1681).
+#[test]
+fn pasted_merge_paths_keeps_the_targets_paint() {
+    let mut s = comp();
+    let a = s.execute("layer.newShape", json!({"kind": "none", "name": "A"})).unwrap()["layer"].as_u64().unwrap();
+    let merge = s.execute("layer.addShapeItem", json!({"layer": a, "kind": "merge"})).unwrap()["uid"].as_u64().unwrap();
+    let b = s.execute("layer.newShape", json!({"kind": "none", "name": "B"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.addShapeItem", json!({"layer": b, "kind": "rect"})).unwrap();
+    s.execute("layer.addShapeItem", json!({"layer": b, "kind": "fill"})).unwrap();
+    let before = opaque_centroid(&s).2;
+    s.execute("prop.select", json!({"layer": a, "prop": merge})).unwrap();
+    s.execute("edit.copy", json!({})).unwrap();
+    s.execute("layer.select", json!({"layers": [b]})).unwrap();
+    s.execute("edit.paste", json!({})).unwrap();
+    assert_eq!(contents_names(&s, b), ["Rectangle Path 1", "Merge Paths 1", "Fill 1"]);
+    assert_eq!(opaque_centroid(&s).2, before);
+}
+
 /// Edit ▸ Duplicate with shape items selected duplicates them in their layer, above the
 /// original and named "Rectangle 2", not the layer (#227).
 #[test]
diff --git a/crates/engine/src/tests_model3d.rs b/crates/engine/src/tests/model3d.rs
similarity index 100%
rename from crates/engine/src/tests_model3d.rs
rename to crates/engine/src/tests/model3d.rs
diff --git a/crates/engine/src/tests_models.rs b/crates/engine/src/tests/models.rs
similarity index 98%
rename from crates/engine/src/tests_models.rs
rename to crates/engine/src/tests/models.rs
index 66111eb34..21d316e75 100644
--- a/crates/engine/src/tests_models.rs
+++ b/crates/engine/src/tests/models.rs
@@ -28,7 +28,7 @@ fn wait_loaded(s: &mut Session, task: Task) {
 
 #[test]
 fn models_are_listed_chosen_and_verified() {
-    crate::tests_roto::hold_roto_cache_test_lock();
+    crate::tests::roto::hold_roto_cache_test_lock();
     let (mut s, d) = session("list");
     std::fs::create_dir_all(&d).unwrap();
     let bogus = d.join("bogus.bin");
diff --git a/crates/engine/src/tests_motion_blur_depth.rs b/crates/engine/src/tests/motion_blur_depth.rs
similarity index 100%
rename from crates/engine/src/tests_motion_blur_depth.rs
rename to crates/engine/src/tests/motion_blur_depth.rs
diff --git a/crates/engine/src/tests_paint.rs b/crates/engine/src/tests/paint.rs
similarity index 100%
rename from crates/engine/src/tests_paint.rs
rename to crates/engine/src/tests/paint.rs
diff --git a/crates/engine/src/tests_panels.rs b/crates/engine/src/tests/panels.rs
similarity index 100%
rename from crates/engine/src/tests_panels.rs
rename to crates/engine/src/tests/panels.rs
diff --git a/crates/engine/src/tests_project_items.rs b/crates/engine/src/tests/project_items.rs
similarity index 100%
rename from crates/engine/src/tests_project_items.rs
rename to crates/engine/src/tests/project_items.rs
diff --git a/crates/engine/src/tests_proxy.rs b/crates/engine/src/tests/proxy.rs
similarity index 98%
rename from crates/engine/src/tests_proxy.rs
rename to crates/engine/src/tests/proxy.rs
index 82cd1dcfd..16e0cb00c 100644
--- a/crates/engine/src/tests_proxy.rs
+++ b/crates/engine/src/tests/proxy.rs
@@ -20,7 +20,7 @@ use crate::render::{FootageSource, RenderOpts};
 struct Synthetic;
 
 fn file_px(path: &str, x: u32, y: u32) -> [f32; 4] {
-    let name = std::path::Path::new(path).file_name().and_then(|n| n.to_str()).unwrap_or("");
+    let name = std::path::Path::new(path).file_name().and_then(std::ffi::OsStr::to_str).unwrap_or("");
     match name {
         "red16.png" => [1.0, 0.0, 0.0, 1.0],
         "blue8.png" => [0.0, 0.0, 1.0, 1.0],
@@ -43,7 +43,7 @@ fn file_px(path: &str, x: u32, y: u32) -> [f32; 4] {
 }
 
 fn size_of(path: &str) -> (u32, u32) {
-    match std::path::Path::new(path).file_name().and_then(|n| n.to_str()).unwrap_or("") {
+    match std::path::Path::new(path).file_name().and_then(std::ffi::OsStr::to_str).unwrap_or("") {
         "red16.png" => (16, 16),
         "blue8.png" => (8, 8),
         "lines.mov" | "matte_black.png" | "matte_white.png" | "half.png" => (4, 4),
diff --git a/crates/engine/src/tests_quick_offset.rs b/crates/engine/src/tests/quick_offset.rs
similarity index 100%
rename from crates/engine/src/tests_quick_offset.rs
rename to crates/engine/src/tests/quick_offset.rs
diff --git a/crates/engine/src/tests/replace_source.rs b/crates/engine/src/tests/replace_source.rs
new file mode 100644
index 000000000..a5cb252ce
--- /dev/null
+++ b/crates/engine/src/tests/replace_source.rs
@@ -0,0 +1,158 @@
+//! Layer ▸ Replace Source (#991, and the `replaceSource` part of #813): Alt-drag and Ctrl+Alt+/
+//! replace an AV layer's source while every other layer property stays.
+
+use std::sync::Arc;
+
+use effectcraft_color::Label;
+use effectcraft_project::{Footage, FootageKind, ItemId, ItemKind, LayerSource, Solid};
+use serde_json::json;
+
+use crate::Session;
+
+fn comp() -> Session {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "frameRate": 30, "duration": 10})).unwrap();
+    s
+}
+
+fn layer(s: &Session, id: u64) -> effectcraft_project::Layer {
+    s.active_comp().unwrap().layer(effectcraft_project::LayerId(id)).unwrap().clone()
+}
+
+fn solid(s: &mut Session, name: &str) -> u64 {
+    s.execute("layer.newSolid", json!({"name": name, "color": "#ff0000", "width": 200, "height": 100})).unwrap()["layer"].as_u64().unwrap()
+}
+
+fn add_footage(s: &mut Session, name: &str, kind: FootageKind, width: u32, height: u32, has_audio: bool) -> ItemId {
+    let f = Footage { path: format!("/tmp/{name}"), kind, width, height, has_video: kind != FootageKind::Data, has_audio, ..Default::default() };
+    Arc::make_mut(&mut s.project).add_item(name, Label::None, None, ItemKind::Footage(f))
+}
+
+/// The replacement changes `source` and nothing else: name, label, comment, timing, stretch,
+/// switches, blending, parenting, track matte and the whole property tree (keys, expression,
+/// effect, mask) stay.
+#[test]
+fn replace_source_keeps_every_layer_property() {
+    let mut s = comp();
+    let a = solid(&mut s, "Hero");
+    let parent = solid(&mut s, "Parent");
+    let matte = solid(&mut s, "Matte");
+    s.execute("layer.timing", json!({"layers": [a], "in": 1.0, "out": 5.0})).unwrap();
+    s.execute("layer.timeStretch", json!({"layers": [a], "percent": 50})).unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [a], "switch": "preserveTransparency", "value": true})).unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [a], "switch": "motionBlur", "value": true})).unwrap();
+    s.execute("layer.setBlendMode", json!({"layers": [a], "mode": "Multiply"})).unwrap();
+    s.execute("layer.setParent", json!({"layers": [a], "parent": parent, "compensate": false})).unwrap();
+    s.execute("layer.setTrackMatte", json!({"layer": a, "matte": matte, "kind": "alpha"})).unwrap();
+    s.execute("layer.setComment", json!({"layers": [a], "comment": "keep me"})).unwrap();
+    s.execute("effect.apply", json!({"layer": a, "effect": "Gaussian Blur"})).unwrap();
+    s.execute("mask.new", json!({"layer": a, "vertices": [[10, 10], [90, 10], [90, 90]], "closed": true})).unwrap();
+    s.execute("prop.addKey", json!({"layer": a, "path": "transform/opacity", "time": 1.0, "value": 25.0})).unwrap();
+    s.execute("prop.addKey", json!({"layer": a, "path": "transform/opacity", "time": 2.0, "value": 75.0})).unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "time * 90"})).unwrap();
+    let before = layer(&s, a);
+    let item = add_footage(&mut s, "new.png", FootageKind::Still, 120, 80, false);
+    s.execute("layer.replaceSource", json!({"layers": [a], "item": item.0})).unwrap();
+    let after = layer(&s, a);
+    assert_eq!(after.source, LayerSource::Footage { item });
+    assert_eq!(after.name, before.name);
+    assert_eq!(after.label, before.label);
+    assert_eq!(after.comment, before.comment);
+    assert_eq!((after.start_time, after.in_point, after.out_point, after.stretch), (before.start_time, before.in_point, before.out_point, before.stretch));
+    assert_eq!((after.switches, after.blend_mode, after.preserve_transparency), (before.switches, before.blend_mode, before.preserve_transparency));
+    assert_eq!((after.parent, after.track_matte), (before.parent, before.track_matte));
+    assert_eq!(after.props, before.props);
+    assert_eq!(s.active_comp().unwrap().layers.len(), 3, "no layer is added or removed");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(layer(&s, a).source, before.source, "one undo step restores the source");
+}
+
+/// Composition, footage and solid sources are interchangeable; a precomposition adds its Audio
+/// group when the layer has none, and an existing Audio group is kept when the next source has no
+/// audio.
+#[test]
+fn replace_source_crosses_types_and_adds_audio() {
+    let mut s = comp();
+    let a = solid(&mut s, "Layer");
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 200, "height": 100, "frameRate": 25, "duration": 3})).unwrap()["comp"].as_u64().unwrap();
+    let main = s.project.items.values().find(|i| i.name == "Main").unwrap().id;
+    s.execute("comp.open", json!({"comp": main})).unwrap();
+    let before = layer(&s, a);
+    s.execute("layer.replaceSource", json!({"layers": [a], "item": inner})).unwrap();
+    let after = layer(&s, a);
+    assert_eq!(after.source, LayerSource::Comp { item: ItemId(inner) });
+    assert_eq!(after.name, before.name);
+    assert!(after.props.sub("audio").is_some(), "a precomposition brings Audio");
+    let footage = add_footage(&mut s, "still.png", FootageKind::Still, 64, 32, false);
+    s.execute("layer.replaceSource", json!({"layers": [a], "item": footage.0})).unwrap();
+    let after = layer(&s, a);
+    assert_eq!(after.source, LayerSource::Footage { item: footage });
+    assert!(after.props.sub("audio").is_some(), "the Audio group is preserved for the next source");
+    let new_solid = Arc::make_mut(&mut s.project).add_item(
+        "New Solid",
+        Label::None,
+        None,
+        ItemKind::Solid(Solid { color: [0.0, 1.0, 0.0], width: 10, height: 10, pixel_aspect: 1.0 }),
+    );
+    s.execute("layer.replaceSource", json!({"layers": [a], "item": new_solid.0})).unwrap();
+    assert_eq!(layer(&s, a).source, LayerSource::Solid { item: new_solid });
+    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(layer(&s, a).source, LayerSource::Footage { item: footage });
+}
+
+/// Folders, data files, 3D models, non-source layers and composition cycles are refused before
+/// anything is edited.
+#[test]
+fn replace_source_refuses_invalid_sources_targets_and_cycles() {
+    let mut s = comp();
+    let a = solid(&mut s, "Layer");
+    let folder = Arc::make_mut(&mut s.project).add_item("Folder", Label::None, None, ItemKind::Folder);
+    let data = add_footage(&mut s, "data.txt", FootageKind::Data, 0, 0, false);
+    let model = add_footage(&mut s, "model.glb", FootageKind::Model, 10, 10, false);
+    for (item, needle) in [(folder, "folder"), (data, "data"), (model, "3D model")] {
+        let err = s.execute("layer.replaceSource", json!({"layers": [a], "item": item.0})).unwrap_err().to_string();
+        assert!(err.contains(needle), "{err}");
+    }
+    let footage = add_footage(&mut s, "still.png", FootageKind::Still, 10, 10, false);
+    let text = s.execute("layer.newText", json!({"text": "Hello"})).unwrap()["layer"].as_u64().unwrap();
+    let err = s.execute("layer.replaceSource", json!({"layers": [text], "item": footage.0})).unwrap_err().to_string();
+    assert!(err.contains("no source item"), "{err}");
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
+    let main = s.project.items.values().find(|i| i.name == "Main").unwrap().id;
+    s.execute("comp.open", json!({"comp": main})).unwrap();
+    let inner_layer = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
+    let err = s.execute("layer.replaceSource", json!({"layers": [inner_layer], "item": main.0})).unwrap_err().to_string();
+    assert!(err.contains("contain"), "{err}");
+}
+
+/// Ctrl+Alt+/ takes the source from the Project panel selection and replaces every selected
+/// layer; locked layers are left alone (and an all-locked selection is an error).
+#[test]
+fn replace_source_uses_the_project_selection_and_skips_locked_layers() {
+    let mut s = comp();
+    let a = solid(&mut s, "A");
+    let b = solid(&mut s, "B");
+    let footage = add_footage(&mut s, "still.png", FootageKind::Still, 10, 10, false);
+    s.state.project_selection = vec![footage];
+    let r = s.execute("layer.replaceSource", json!({"layers": [a, b]})).unwrap();
+    assert_eq!(r["item"], json!(footage.0));
+    assert!(matches!(layer(&s, a).source, LayerSource::Footage { item } if item == footage));
+    assert!(matches!(layer(&s, b).source, LayerSource::Footage { item } if item == footage));
+    s.execute("edit.undo", json!({})).unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [b], "switch": "lock", "value": true})).unwrap();
+    let old_b = layer(&s, b).source;
+    let r = s.execute("layer.replaceSource", json!({"layers": [a, b], "item": footage.0})).unwrap();
+    assert_eq!(r["layers"], json!([a]));
+    assert!(matches!(layer(&s, a).source, LayerSource::Footage { item } if item == footage));
+    assert_eq!(layer(&s, b).source, old_b);
+    let err = s.execute("layer.replaceSource", json!({"layers": [b], "item": footage.0})).unwrap_err().to_string();
+    assert!(err.contains("locked"), "{err}");
+}
+
+/// After Effects' Ctrl+Alt+/ default (Cmd+Alt+/ in EffectCraft's shortcut syntax).
+#[test]
+fn replace_source_is_bound_to_ctrl_alt_slash() {
+    let b = crate::shortcuts::bindables(&[]).into_iter().find(|b| b.command == "layer.replaceSource").expect("layer.replaceSource is bindable");
+    assert!(b.defaults.iter().any(|d| d == "Cmd+Alt+/"), "{:?}", b.defaults);
+}
diff --git a/crates/engine/src/tests_rig3d.rs b/crates/engine/src/tests/rig3d.rs
similarity index 90%
rename from crates/engine/src/tests_rig3d.rs
rename to crates/engine/src/tests/rig3d.rs
index d3b965107..d801a743a 100644
--- a/crates/engine/src/tests_rig3d.rs
+++ b/crates/engine/src/tests/rig3d.rs
@@ -49,45 +49,38 @@ fn camera(s: &mut Session) -> u64 {
     s.execute("layer.newCamera", json!({"name": "Cam", "position": [320, 180, -800], "poi": [320, 180, 0], "zoom": 900})).unwrap()["layer"].as_u64().unwrap()
 }
 
-#[test]
-fn stereo_rig_builds_eye_comps_and_glasses() {
-    let mut s = session();
-    let src = cid(&s);
-    let cam = camera(&mut s);
-    let items_before = s.project.items.len();
-    let r = s.execute("camera.stereoRig", json!({"sceneDepth": 4})).unwrap();
-    assert_eq!(s.project.items.len(), items_before + 3, "left, right and stereo comps");
-    assert_eq!(r["master"].as_u64(), Some(cam));
-    // Controls on a hidden null in the source comp.
-    let ctl = layer_in(&s, src, r["controls"].as_u64().unwrap());
+/// Controls on a hidden null in the source comp.
+fn assert_stereo_controls(ctl: &Layer) {
     assert_eq!(ctl.name, "Stereo 3D Controls");
     assert!(!ctl.switches.video);
     let fx = ctl.effects().unwrap().groups().next().unwrap().clone();
     assert!(matches!(&fx.kind, GroupKind::Effect { effect } if effect == effectcraft_effects::controls::STEREO_CONTROLS));
     assert_eq!(fx.get("sceneDepth").unwrap().value, KV::Scalar(4.0));
-    // Eye comps: an eye camera (two-node, linked by expressions) and the collapsed source comp.
-    let d = 0.04 * 640.0;
-    for (key, name, x) in [("leftComp", "Scene Left Eye", 320.0 - d / 2.0), ("rightComp", "Scene Right Eye", 320.0 + d / 2.0)] {
-        let ec = ItemId(r[key].as_u64().unwrap());
-        assert_eq!(s.project.item(ec).unwrap().name, name);
-        let c = s.project.comp(ec).unwrap();
-        assert_eq!((c.width, c.height), (640, 360));
-        assert_eq!(c.layers.len(), 2);
-        let cam = &c.layers[0];
-        assert!(cam.is_camera() && effectcraft_render::three_d::camera::is_two_node(cam));
-        assert!(close3(v3(cam, "transform/position"), [x, 180.0, -800.0], 1e-6), "{:?}", v3(cam, "transform/position"));
-        // Parallel eyes (no convergence): each looks straight ahead.
-        assert!(close3(v3(cam, "transform/poi"), [x, 180.0, 0.0], 1e-6), "{:?}", v3(cam, "transform/poi"));
-        assert_eq!(cam.props.prop("cameraOptions/zoom").unwrap().value, KV::Scalar(900.0));
-        for p in ["transform/position", "transform/poi", "cameraOptions/zoom"] {
-            let e = cam.props.prop(p).unwrap().expr.clone().unwrap();
-            assert!(e.text.contains("comp(\"Scene\")") && e.text.contains("Cam"), "{p}: {}", e.text);
-        }
-        let nest = &c.layers[1];
-        assert_eq!(nest.source, LayerSource::Comp { item: src });
-        assert!(nest.switches.collapse && nest.switches.three_d);
+}
+
+/// An eye comp: an eye camera (two-node, linked by expressions) at `x` and the collapsed source comp.
+fn assert_eye_comp(s: &Session, src: ItemId, ec: ItemId, name: &str, x: f64) {
+    assert_eq!(s.project.item(ec).unwrap().name, name);
+    let c = s.project.comp(ec).unwrap();
+    assert_eq!((c.width, c.height), (640, 360));
+    assert_eq!(c.layers.len(), 2);
+    let cam = &c.layers[0];
+    assert!(cam.is_camera() && effectcraft_render::three_d::camera::is_two_node(cam));
+    assert!(close3(v3(cam, "transform/position"), [x, 180.0, -800.0], 1e-6), "{:?}", v3(cam, "transform/position"));
+    // Parallel eyes (no convergence): each looks straight ahead.
+    assert!(close3(v3(cam, "transform/poi"), [x, 180.0, 0.0], 1e-6), "{:?}", v3(cam, "transform/poi"));
+    assert_eq!(cam.props.prop("cameraOptions/zoom").unwrap().value, KV::Scalar(900.0));
+    for p in ["transform/position", "transform/poi", "cameraOptions/zoom"] {
+        let e = cam.props.prop(p).unwrap().expr.clone().unwrap();
+        assert!(e.text.contains("comp(\"Scene\")") && e.text.contains("Cam"), "{p}: {}", e.text);
     }
-    // The stereo comp: left eye on top with 3D Glasses fed by both eyes; right eye hidden.
+    let nest = &c.layers[1];
+    assert_eq!(nest.source, LayerSource::Comp { item: src });
+    assert!(nest.switches.collapse && nest.switches.three_d);
+}
+
+/// The stereo comp: left eye on top with 3D Glasses fed by both eyes; right eye hidden.
+fn assert_stereo_comp(s: &Session, r: &serde_json::Value) {
     let oc = ItemId(r["stereoComp"].as_u64().unwrap());
     let out = s.project.comp(oc).unwrap();
     assert_eq!(s.project.item(oc).unwrap().name, "Scene Stereo 3D");
@@ -98,6 +91,23 @@ fn stereo_rig_builds_eye_comps_and_glasses() {
     assert!(matches!(&g.kind, GroupKind::Effect { effect } if effect == "ec.perspective.3dglasses"));
     assert_eq!(g.get("leftView").unwrap().value, KV::Layer(Some(l)));
     assert_eq!(g.get("rightView").unwrap().value, KV::Layer(Some(rr)));
+}
+
+#[test]
+fn stereo_rig_builds_eye_comps_and_glasses() {
+    let mut s = session();
+    let src = cid(&s);
+    let cam = camera(&mut s);
+    let items_before = s.project.items.len();
+    let r = s.execute("camera.stereoRig", json!({"sceneDepth": 4})).unwrap();
+    assert_eq!(s.project.items.len(), items_before + 3, "left, right and stereo comps");
+    assert_eq!(r["master"].as_u64(), Some(cam));
+    assert_stereo_controls(&layer_in(&s, src, r["controls"].as_u64().unwrap()));
+    let d = 0.04 * 640.0;
+    for (key, name, x) in [("leftComp", "Scene Left Eye", 320.0 - d / 2.0), ("rightComp", "Scene Right Eye", 320.0 + d / 2.0)] {
+        assert_eye_comp(&s, src, ItemId(r[key].as_u64().unwrap()), name, x);
+    }
+    assert_stereo_comp(&s, &r);
     // One undo step; redo; serde.
     let json = serde_json::to_string(&*s.project).unwrap();
     let back: Project = serde_json::from_str(&json).unwrap();
diff --git a/crates/engine/src/tests_roto.rs b/crates/engine/src/tests/roto.rs
similarity index 99%
rename from crates/engine/src/tests_roto.rs
rename to crates/engine/src/tests/roto.rs
index 33500b4ec..423af1d2f 100644
--- a/crates/engine/src/tests_roto.rs
+++ b/crates/engine/src/tests/roto.rs
@@ -8,7 +8,7 @@ use effectcraft_track::roto::rle;
 use serde_json::{Value, json};
 
 use crate::Session;
-use crate::tests_track::{H, W, frame_time, setup};
+use crate::tests::track::{H, W, frame_time, setup};
 
 /// Keep cache/model mutation tests from clearing segmentations under another fixture.
 /// Libtest runs each test on its own thread; the guard lives until that thread exits.
diff --git a/crates/engine/src/tests_sequence.rs b/crates/engine/src/tests/sequence.rs
similarity index 80%
rename from crates/engine/src/tests_sequence.rs
rename to crates/engine/src/tests/sequence.rs
index 7f937596f..3e81961ce 100644
--- a/crates/engine/src/tests_sequence.rs
+++ b/crates/engine/src/tests/sequence.rs
@@ -8,14 +8,16 @@ use serde_json::{Value, json};
 
 use crate::Session;
 
-/// Probes every file as a 64×32 still (the media layer's single-file probe).
+/// Probes every file as a still 64 + its byte length wide and 32 high (the media layer's
+/// single-file probe).
 struct Stills;
 impl crate::Importer for Stills {
     fn probe(&self, path: &str) -> Result<Footage, String> {
         if !std::path::Path::new(path).is_file() {
             return Err(format!("{path}: no such file"));
         }
-        Ok(Footage { path: path.into(), kind: FootageKind::Still, width: 64, height: 32, has_video: true, codec: "PNG".into(), ..Default::default() })
+        let width = 64 + std::fs::metadata(path).map_or(0, |m| m.len() as u32);
+        Ok(Footage { path: path.into(), kind: FootageKind::Still, width, height: 32, has_video: true, codec: "PNG".into(), ..Default::default() })
     }
 }
 
@@ -196,6 +198,19 @@ fn replace_footage_and_reload_keep_sequences() {
     assert_eq!(f.duration, FrameRate::from_f64(12.0).tick_of(5));
 }
 
+/// #2074: reloading a numbered still probed it as its run, so it took the first file's size.
+#[test]
+fn reloading_a_numbered_still_measures_its_own_file() {
+    let dir = folder(&RUN);
+    let mut s = session();
+    let item = s.execute("file.import", json!({"paths": [at(&dir, "shot_0002.png")], "sequence": false})).unwrap()["items"][0].clone();
+    std::fs::write(at(&dir, "shot_0002.png"), [0; 16]).unwrap();
+    s.execute("file.reloadFootage", json!({"items": [item]})).unwrap();
+    let (name, f) = footage(&s, &item);
+    assert_eq!((name.as_str(), f.kind, f.width, f.sequence.len()), ("shot_0002.png", FootageKind::Still, 80, 0));
+    assert_eq!(f.path, at(&dir, "shot_0002.png"));
+}
+
 /// #756: numbered DPX and Cineon scans import as sequences, as in After Effects (`.cin` was not
 /// an image to the Media Browser, so its runs came in one file at a time).
 #[test]
@@ -207,3 +222,31 @@ fn dpx_and_cineon_runs_import_as_sequences() {
     got.sort();
     assert_eq!(got, [("plate.[0001-0003].dpx".to_string(), 3), ("scan_[01-02].cin".to_string(), 2)], "{r}");
 }
+
+/// #1926: an edit that leaves the footage alone doesn't stamp every frame of its image sequences
+/// again for the disk cache's salt (with large sequences each keystroke in a text field took over
+/// half a second); Reload Footage does, and so does new footage.
+#[test]
+fn edits_keep_the_disk_salt_and_reload_stamps_the_files_again() {
+    let dir = folder(&RUN);
+    let cache = std::env::temp_dir().join(format!("ec-seq-salt-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&cache);
+    let mut s = session();
+    s.execute_checked("prefs.set", json!({"values": {"disk.diskCacheFolder": cache.to_string_lossy(), "disk.diskCacheEnabled": true}})).unwrap();
+    s.execute("comp.new", json!({"name": "C", "width": 64, "height": 32, "frameRate": 30, "duration": 1})).unwrap();
+    let r = s.execute("file.import", json!({"paths": [at(&dir, "shot_0002.png")], "sequence": true, "addToComp": true})).unwrap();
+    let item = r["items"][0].clone();
+    let salt = s.refresh_disk_salt(false).expect("a disk cache");
+    // A frame rewritten in place: same footage settings, another size on disk.
+    std::fs::write(at(&dir, "shot_0004.png"), b"a new render of this frame").unwrap();
+    s.execute("layer.newText", json!({"text": "title"})).unwrap();
+    s.execute("layer.setText", json!({"text": "title 2"})).unwrap();
+    assert_eq!(s.refresh_disk_salt(false), Some(salt), "edits don't stamp the files again");
+    s.execute("file.reloadFootage", json!({"items": [item]})).unwrap();
+    let reloaded = s.refresh_disk_salt(false).unwrap();
+    assert_ne!(reloaded, salt, "Reload Footage stamps them again");
+    std::fs::write(at(&dir, "extra.png"), b"").unwrap();
+    s.execute("file.import", json!({"paths": [at(&dir, "extra.png")]})).unwrap();
+    assert_ne!(s.refresh_disk_salt(false), Some(reloaded), "new footage counts");
+    let _ = std::fs::remove_dir_all(&cache);
+}
diff --git a/crates/engine/src/tests/session.rs b/crates/engine/src/tests/session.rs
new file mode 100644
index 000000000..b5d1cbb5f
--- /dev/null
+++ b/crates/engine/src/tests/session.rs
@@ -0,0 +1,760 @@
+use serde_json::json;
+
+use crate::Session;
+
+fn demo() -> Session {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    s
+}
+
+#[test]
+fn demo_opens_and_renders() {
+    let s = demo();
+    let cid = s.active_comp_id().unwrap();
+    let img = s.render(cid, s.time(), effectcraft_render::RenderOpts { scale: 0.25, ..Default::default() });
+    assert_eq!((img.width, img.height), (480, 270));
+    let lit = img.data.iter().filter(|p| p[3] > 0.99).count();
+    assert!(lit > 100_000, "{lit}");
+}
+
+/// The session's layer cache never changes pixels: scrubbing the demo (including back and
+/// forth, and across an edit made through a command) matches cache-less renders exactly.
+#[test]
+fn demo_layer_cache_is_transparent() {
+    let mut s = demo();
+    let cid = s.active_comp_id().unwrap();
+    let opts = effectcraft_render::RenderOpts { scale: 0.25, ..Default::default() };
+    let uncached = |s: &Session, t: f64| {
+        let mut r = effectcraft_render::Renderer::new(&s.project, s.footage.as_ref(), opts);
+        r.expr = s.expr.as_deref();
+        r.comp_frame(cid, effectcraft_time::Tick::from_seconds_f64(t))
+    };
+    let check = |s: &Session, t: f64| {
+        let a = s.render(cid, effectcraft_time::Tick::from_seconds_f64(t), opts);
+        let b = uncached(s, t);
+        assert!(a.data.iter().zip(&b.data).all(|(p, q)| (0..4).all(|c| (p[c] - q[c]).abs() < 1e-6)), "t={t}");
+    };
+    for t in [0.5, 1.0, 3.0, 3.0334, 6.0, 3.0, 0.5] {
+        check(&s, t);
+    }
+    assert!(s.layer_cache.stats().hits > 0);
+    // Edit the title's glow through the command layer, then scrub again.
+    let title = s.project.comp(cid).unwrap().layers.iter().find(|l| l.name == "EFFECTCRAFT").map(|l| l.id.0).unwrap();
+    s.execute("prop.set", json!({"layer": title, "path": "effects/#1/radius", "value": 5.0})).unwrap();
+    for t in [3.0, 0.5] {
+        check(&s, t);
+    }
+}
+
+/// `layer.addItem` puts the layer at `index` (1-based) in the stack and starts it at `time`, as a
+/// drop in the Timeline does (#89).
+#[test]
+fn add_item_at_a_stack_index_and_time() {
+    let mut s = Session::default();
+    let clip = s.execute("comp.new", json!({"name": "Clip", "width": 16, "height": 16, "frameRate": 30, "duration": 1})).unwrap()["comp"].as_u64().unwrap();
+    s.execute("comp.new", json!({"name": "Main", "width": 32, "height": 32, "frameRate": 30, "duration": 4})).unwrap();
+    for name in ["C", "B", "A"] {
+        s.execute("layer.newSolid", json!({"name": name})).unwrap();
+    }
+    let names = |s: &Session| s.active_comp().unwrap().layers.iter().map(|l| l.name.clone()).collect::<Vec<_>>();
+    s.execute("layer.addItem", json!({"item": clip, "index": 2, "time": 1.01})).unwrap();
+    assert_eq!(names(&s), ["A", "Clip", "B", "C"]);
+    let l = &s.active_comp().unwrap().layers[1];
+    assert_eq!(l.in_point, effectcraft_time::Tick::from_seconds_f64(1.0), "on the nearest frame");
+    // Past the bottom: the bottom.
+    s.execute("layer.addItem", json!({"item": clip, "index": 99})).unwrap();
+    assert_eq!(names(&s).last().map(String::as_str), Some("Clip 2"));
+    assert!(s.execute("layer.addItem", json!({"item": clip, "index": 0})).is_err(), "1-based");
+}
+
+/// Files dropped on the Timeline or the Composition viewer (`file.import {addToComp}`) become
+/// layers of the comp that was active, one under the other, where they were dropped (#85, #89).
+#[test]
+fn imported_files_go_into_the_comp_where_they_were_dropped() {
+    use effectcraft_project::{Footage, FootageKind};
+    struct Probe;
+    impl crate::Importer for Probe {
+        fn probe(&self, path: &str) -> Result<Footage, String> {
+            Ok(Footage { path: path.into(), kind: FootageKind::Still, width: 64, height: 32, has_video: true, ..Default::default() })
+        }
+    }
+    let mut s = Session { importer: Some(std::sync::Arc::new(Probe)), ..Default::default() };
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Bg"})).unwrap();
+    let params = json!({"paths": ["/drop/a.png", "/drop/b.png"], "addToComp": true, "position": [40.0, 50.0], "index": 1, "time": 1.0});
+    s.execute("file.import", params).unwrap();
+    let comp = s.active_comp().unwrap();
+    assert_eq!(comp.layers.iter().map(|l| l.name.as_str()).collect::<Vec<_>>(), ["a.png", "b.png", "Bg"]);
+    for l in &comp.layers[..2] {
+        assert_eq!(l.props.prop("transform/position").map(|p| p.value.clone()), Some(effectcraft_keyframe::Value::Vec3([40.0, 50.0, 0.0])));
+        assert_eq!(l.in_point, effectcraft_time::Tick::from_seconds_f64(1.0));
+    }
+    // Without `addToComp` they only import.
+    s.execute("file.import", json!({"paths": ["/drop/c.png"]})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 3);
+    assert!(s.execute("layer.addItem", json!({"item": "a.png", "position": [1.0]})).is_err(), "position needs x and y");
+}
+
+/// #270: files dropped or picked in the Import dialog (`file.import {background}`) are probed in
+/// a background job that says which file it is reading and how many are left; then they arrive
+/// in one undo step, all selected, with a count. The same file imported again arrives again.
+#[test]
+fn background_imports_report_progress_and_select_what_arrived() {
+    use effectcraft_project::{Footage, FootageKind, ItemId};
+    use std::sync::Arc;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    /// Probes file k once `allow` > k (a slow video; 5 s at most, so an import that waits for it
+    /// fails the test instead of hanging it); `.xyz` files fail.
+    struct Gated {
+        started: AtomicUsize,
+        allow: Arc<AtomicUsize>,
+    }
+    impl crate::Importer for Gated {
+        fn probe(&self, path: &str) -> Result<Footage, String> {
+            let k = self.started.fetch_add(1, Ordering::SeqCst);
+            let until = std::time::Instant::now() + std::time::Duration::from_secs(5);
+            while self.allow.load(Ordering::SeqCst) <= k && std::time::Instant::now() < until {
+                std::thread::sleep(std::time::Duration::from_millis(1));
+            }
+            if path.ends_with(".xyz") {
+                return Err("unsupported file".into());
+            }
+            Ok(Footage { path: path.into(), kind: FootageKind::Still, width: 64, height: 32, has_video: true, ..Default::default() })
+        }
+    }
+    let allow = Arc::new(AtomicUsize::new(1));
+    let mut s = Session { importer: Some(Arc::new(Gated { started: AtomicUsize::new(0), allow: allow.clone() })), ..Default::default() };
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
+    let undo = s.history.undo.len();
+    let r = s.execute("file.import", json!({"paths": ["/drop/a.png", "/drop/b.png", "/drop/a.png"], "background": true})).unwrap();
+    let job = r["job"].as_str().unwrap().to_string();
+    // The first file is through; the second is being read.
+    let running = |s: &mut Session| s.execute("jobs.list", json!({})).unwrap()["running"].as_array().unwrap().clone();
+    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(10);
+    while running(&mut s)[0]["done"] != json!(1) && std::time::Instant::now() < deadline {
+        std::thread::sleep(std::time::Duration::from_millis(2));
+    }
+    let row = running(&mut s)[0].clone();
+    assert_eq!(row["id"], json!(job));
+    assert_eq!(row["label"], json!("Importing 3 files"));
+    assert_eq!(row["message"], json!("b.png (2 of 3)"));
+    assert_eq!((row["done"].as_u64(), row["total"].as_u64()), (Some(1), Some(3)));
+    assert!(s.project.items.values().all(|i| i.name != "a.png"), "nothing is added before the import finishes");
+    allow.store(usize::MAX, Ordering::SeqCst);
+    s.execute("jobs.wait", json!({})).unwrap();
+    let names = |s: &Session, ids: &[ItemId]| ids.iter().map(|i| s.project.item(*i).unwrap().name.clone()).collect::<Vec<_>>();
+    assert_eq!(names(&s, &s.state.project_selection), ["a.png", "b.png", "a.png"], "everything imported is selected, the same file twice too");
+    assert_eq!(s.history.undo.len(), undo + 1, "one undo step");
+    let rec = s.job_log.last().unwrap();
+    assert_eq!((rec.status.as_str(), rec.message.as_str()), ("done", "Imported 3 items"));
+    assert!(s.drain_events().iter().any(|e| matches!(e, crate::Event::Toast { message, .. } if message == "Imported 3 items")));
+    // Dropped on the viewer: they become layers too; a file that can't be read is reported.
+    s.execute("file.import", json!({"paths": ["/drop/c.png", "/drop/d.xyz"], "background": true, "addToComp": true, "position": [10.0, 20.0]})).unwrap();
+    s.execute("jobs.wait", json!({})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.iter().map(|l| l.name.as_str()).collect::<Vec<_>>(), ["c.png"]);
+    assert_eq!(s.job_log.last().unwrap().message, "Imported 1 item. /drop/d.xyz: unsupported file");
+    // Agents and scripts import at once by default.
+    let r = s.execute("file.import", json!({"paths": ["/drop/e.png"]})).unwrap();
+    assert_eq!(r["items"].as_array().map(Vec::len), Some(1));
+}
+
+/// Audio, Lock and Shy don't change pixels: toggling them keeps the cached layers (#103).
+#[test]
+fn audio_lock_and_shy_keep_cached_layers() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 160, "height": 90, "frameRate": 30, "duration": 1})).unwrap();
+    s.execute("layer.newSolid", json!({"color": "#3080ff", "width": 80, "height": 40})).unwrap();
+    s.execute("effect.apply", json!({"layer": "#1", "effect": "Gaussian Blur"})).unwrap();
+    s.execute("prop.set", json!({"layer": "#1", "path": "effects/#1/blurriness", "value": 12})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let t = s.time();
+    s.render(cid, t, Default::default());
+    let before = s.layer_cache.stats();
+    for sw in ["audio", "lock", "shy"] {
+        s.execute("layer.setSwitch", json!({"layers": ["#1"], "switch": sw, "value": sw != "audio"})).unwrap();
+    }
+    s.render(cid, t, Default::default());
+    let after = s.layer_cache.stats();
+    assert_eq!(after.misses, before.misses, "no layer rendered again");
+    assert!(after.hits > before.hits);
+}
+
+#[test]
+fn every_command_has_unique_id_and_runs_or_reports() {
+    let mut ids = std::collections::HashSet::new();
+    for c in crate::command_specs() {
+        assert!(ids.insert(c.id), "duplicate {}", c.id);
+    }
+    assert!(ids.len() >= 90, "{}", ids.len());
+}
+
+#[test]
+fn layer_workflow_with_undo() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Test", "width": 640, "height": 360, "frameRate": 30, "duration": 4})).unwrap();
+    let r = s.execute("layer.newSolid", json!({"color": "#336699"})).unwrap();
+    let lid = r["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": lid, "path": "transform/opacity", "value": 50})).unwrap();
+    let tree = s.execute("layer.tree", json!({"layer": lid})).unwrap();
+    assert!(tree.to_string().contains("\"value\":50.0"));
+    s.execute("prop.toggleAnimation", json!({"layer": lid, "path": "transform/position"})).unwrap();
+    s.execute("time.set", json!({"time": 2.0})).unwrap();
+    s.execute("prop.set", json!({"layer": lid, "path": "transform/position", "value": [100, 100]})).unwrap();
+    let comp = s.active_comp().unwrap();
+    let pos = comp.layers[0].props.prop("transform/position").unwrap();
+    assert_eq!(pos.keys.len(), 2);
+    s.execute("prop.select", json!({"layer": lid, "path": "transform/position"})).unwrap();
+    assert_eq!(s.state.selected_keys.len(), 2);
+    s.execute("keys.easyEase", json!({})).unwrap();
+    s.execute("keys.move", json!({"delta": 0.5})).unwrap();
+    let pos = s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().clone();
+    assert!((pos.keys[0].time.seconds() - 0.5).abs() < 0.02);
+    assert_eq!(pos.keys[0].out_interp, effectcraft_keyframe::Interp::Bezier);
+    // undo back to before the move
+    s.execute("edit.undo", json!({})).unwrap();
+    let pos = s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().clone();
+    assert!(pos.keys[0].time.seconds().abs() < 0.02);
+    s.execute("effect.apply", json!({"layer": lid, "effect": "Gaussian Blur"})).unwrap();
+    s.execute("prop.set", json!({"layer": lid, "path": "effects/#1/blurriness", "value": 12})).unwrap();
+    // Applying selects the new effect (Edit ▸ Duplicate would duplicate it); select the layer.
+    s.execute("layer.select", json!({"layers": [lid]})).unwrap();
+    s.execute("edit.duplicate", json!({})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 2);
+    s.execute("layer.precompose", json!({"layers": [1, 2], "name": "Pre"})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
+}
+
+#[test]
+fn text_shape_mask_matte_parent() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 800, "height": 450, "duration": 3})).unwrap();
+    let t = s.execute("layer.newText", json!({"text": "Hello", "size": 90})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.addTextAnimator", json!({"layer": t, "properties": ["position", "opacity"]})).unwrap();
+    let sh = s.execute("layer.newShape", json!({"kind": "star", "fill": "#ffcc00"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.addShapeItem", json!({"layer": sh, "kind": "trim"})).unwrap();
+    s.execute("layer.addMask", json!({"layer": sh, "shape": "ellipse"})).unwrap();
+    s.execute("layer.setMask", json!({"layer": sh, "mask": 1, "mode": "Subtract", "inverted": true})).unwrap();
+    s.execute("layer.setTrackMatte", json!({"layer": sh, "matte": t, "kind": "luma"})).unwrap();
+    s.execute("layer.setParent", json!({"layers": [sh], "parent": t})).unwrap();
+    assert!(s.execute("layer.setParent", json!({"layers": [t], "parent": sh})).is_err());
+    s.execute("layer.setBlendMode", json!({"layers": [sh], "mode": "Screen"})).unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [sh], "switch": "threeD"})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let _ = s.render(cid, s.time(), Default::default());
+    let info = s.execute("comp.info", json!({})).unwrap();
+    assert_eq!(info["layers"].as_array().unwrap().len(), 2);
+}
+
+/// The toolbar's Fill / Stroke change a selected shape layer's paint (#205): a shape drawn
+/// without a stroke gets one, later edits change it, and the Contents "Add:" items (#206) include
+/// an empty Path and a Gradient Stroke that render.
+#[test]
+fn toolbar_fill_and_stroke_paint_selected_shape_layers() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
+    let sh = s.execute("layer.newShape", json!({"kind": "rect", "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    let paint = |s: &mut Session| s.execute("shape.fillStroke", json!({})).unwrap();
+    assert_eq!(paint(&mut s)["stroke"], serde_json::Value::Null, "drawn without a stroke");
+    s.execute("shape.fillStroke", json!({"stroke": "#00ff00", "strokeWidth": 6})).unwrap();
+    let p = paint(&mut s);
+    assert_eq!((p["stroke"][1].as_f64(), p["strokeWidth"].as_f64()), (Some(1.0), Some(6.0)), "{p}");
+    s.execute("shape.fillStroke", json!({"fill": "#0000ff", "strokeWidth": 3})).unwrap();
+    let p = paint(&mut s);
+    assert_eq!((p["fill"][2].as_f64(), p["strokeWidth"].as_f64()), (Some(1.0), Some(3.0)), "{p}");
+    // One stroke, before the fill (paths, stroke, fill), and each change is one undo step.
+    let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap().clone();
+    let group = l.props.group("contents/group").unwrap();
+    let order: Vec<&str> = group.sub("contents").unwrap().groups().map(|g| g.match_id.as_str()).collect();
+    assert_eq!(order, ["rect", "stroke", "fill"]);
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(paint(&mut s)["strokeWidth"].as_f64(), Some(6.0));
+    // Only shape layers.
+    s.execute("layer.newSolid", json!({"color": "#808080"})).unwrap();
+    assert!(s.execute("shape.fillStroke", json!({"fill": "#ffffff"})).is_err());
+    for kind in ["path", "gstroke"] {
+        let r = s.execute("layer.addShapeItem", json!({"layer": sh, "kind": kind})).unwrap();
+        assert!(r["path"].as_str().is_some_and(|p| p.starts_with("contents/")), "{r}");
+    }
+    let cid = s.active_comp_id().unwrap();
+    let _ = s.render(cid, s.time(), Default::default());
+}
+
+/// A Wiggle Paths saved without Spatial Phase gets the property, at 0°, after Temporal Phase when
+/// the project opens.
+#[test]
+fn opening_a_wiggle_paths_without_spatial_phase_adds_it() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
+    let sh = s.execute("layer.newShape", json!({"kind": "rect", "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    let uid = s.execute("layer.addShapeItem", json!({"layer": sh, "kind": "wiggle"})).unwrap()["uid"].as_u64().unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let mut old = effectcraft_project::Project::from_json(&s.project.to_file_json().unwrap()).unwrap();
+    let l = old.comp_mut(cid).unwrap().layer_mut(effectcraft_project::LayerId(sh)).unwrap();
+    let g = l.props.find_group_mut(uid).unwrap();
+    g.children.retain(|c| c.match_id() != "spatialPhase");
+    assert_eq!(g.children.len(), 7);
+    let next = old.next_id;
+    s.replace_project(old, None);
+    let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap().clone();
+    let g = l.props.find_group(uid).unwrap();
+    let ids: Vec<&str> = g.children.iter().map(|c| c.match_id()).collect();
+    assert_eq!(ids, ["size", "detail", "points", "speed", "correlation", "phase", "spatialPhase", "seed"]);
+    let sp = g.get("spatialPhase").unwrap();
+    assert_eq!((sp.name.as_str(), &sp.value), ("Spatial Phase", &effectcraft_keyframe::Value::Scalar(0.0)));
+    assert!(sp.uid >= next && s.project.next_id > sp.uid, "a fresh uid: {} (next {next})", sp.uid);
+}
+
+/// The toolbar's Fill Options / Stroke Options change a selected shape layer's paint kind (#732):
+/// None switches the fill off, a gradient turns the Fill into a Gradient Fill that keeps its
+/// opacity, Solid Color turns it back, and a Stroke kind adds a stroke where there is none.
+#[test]
+fn toolbar_fill_and_stroke_kinds_change_selected_shape_layers() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
+    let sh = s.execute("layer.newShape", json!({"kind": "rect", "fill": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    let items = |s: &Session| -> Vec<(String, bool)> {
+        let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap();
+        l.props.group("contents/group/contents").unwrap().groups().map(|g| (g.match_id.clone(), g.enabled)).collect()
+    };
+    let kinds = |s: &mut Session| {
+        let p = s.execute("shape.fillStroke", json!({})).unwrap();
+        (p["fillType"].as_str().unwrap().to_string(), p["strokeType"].as_str().unwrap().to_string())
+    };
+    assert_eq!(kinds(&mut s), ("solid".into(), "none".into()));
+    let cid = s.active_comp_id().unwrap();
+    let centre = |s: &Session| s.render(cid, s.time(), Default::default()).get(200, 150);
+    let red = centre(&s);
+    // None switches the fill off: nothing is drawn, and the item stays.
+    s.execute("shape.fillStroke", json!({"fillType": "none"})).unwrap();
+    assert_eq!(items(&s), [("rect".into(), true), ("fill".into(), false)]);
+    assert_eq!(kinds(&mut s).0, "none");
+    assert_ne!(centre(&s), red, "the fill is off");
+    // A radial gradient: the Fill becomes a Gradient Fill (switched on) that keeps its opacity.
+    s.execute("shape.fillStroke", json!({"fillType": "solid", "fill": "#ff0000"})).unwrap();
+    assert_eq!(centre(&s), red);
+    let opacity = |s: &Session, m: &str| {
+        let l = s.active_comp().unwrap().layer(effectcraft_project::LayerId(sh)).unwrap();
+        l.props.group(&format!("contents/group/contents/{m}")).unwrap().get("opacity").unwrap().value.as_f64()
+    };
+    s.execute("prop.set", json!({"layer": sh, "path": "contents/group/contents/fill/opacity", "value": 40})).unwrap();
+    s.execute("shape.fillStroke", json!({"fillType": "radial"})).unwrap();
+    assert_eq!(items(&s), [("rect".into(), true), ("gfill".into(), true)]);
+    assert_eq!((kinds(&mut s).0.as_str(), opacity(&s, "gfill")), ("radial", 40.0));
+    s.execute("shape.fillStroke", json!({"fillType": "linear"})).unwrap();
+    assert_eq!(kinds(&mut s).0, "linear");
+    s.execute("shape.fillStroke", json!({"fillType": "solid", "fill": "#00ff00"})).unwrap();
+    assert_eq!(items(&s), [("rect".into(), true), ("fill".into(), true)]);
+    assert_eq!(opacity(&s, "fill"), 40.0);
+    // A Stroke kind adds a stroke (before the fill); None switches it off again; undo is per step.
+    s.execute("shape.fillStroke", json!({"strokeType": "linear"})).unwrap();
+    assert_eq!(items(&s), [("rect".into(), true), ("gstroke".into(), true), ("fill".into(), true)]);
+    s.execute("shape.fillStroke", json!({"strokeType": "none"})).unwrap();
+    assert_eq!(kinds(&mut s), ("solid".into(), "none".into()));
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(kinds(&mut s), ("solid".into(), "linear".into()));
+    assert!(s.execute("shape.fillStroke", json!({"fillType": "plaid"})).is_err());
+}
+
+/// Selecting a mask in the Timeline (its row or its Mask Path) selects all of its points, so the
+/// viewer drags the whole mask (#203); a shape's Path item works the same way.
+#[test]
+fn selecting_a_mask_selects_its_points() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 400, "height": 300, "duration": 2})).unwrap();
+    let l = s.execute("layer.newSolid", json!({"color": "#808080"})).unwrap()["layer"].as_u64().unwrap();
+    let m1 = s.execute("layer.addMask", json!({"layer": l, "shape": "rect"})).unwrap()["mask"].as_u64().unwrap();
+    let m2 = s.execute("layer.addMask", json!({"layer": l, "shape": "ellipse"})).unwrap()["mask"].as_u64().unwrap();
+    let points = |s: &Session, m: u64| s.state.selected_vertices.iter().filter(|v| v.mask == m).count();
+    s.execute("prop.select", json!({"layer": l, "prop": m1, "selectKeys": false})).unwrap();
+    assert_eq!((points(&s, m1), s.state.selected_vertices.len()), (4, 4));
+    // Mask Path selects them too; Shift-adding another mask keeps the first.
+    let path = s.active_comp().unwrap().layer(effectcraft_project::LayerId(l)).unwrap().props.find_group(m2).unwrap().get("path").unwrap().uid;
+    s.execute("prop.select", json!({"layer": l, "prop": path, "add": true})).unwrap();
+    assert_eq!((points(&s, m1), points(&s, m2)), (4, 4));
+    // Another mask replaces them; another property deselects them.
+    s.execute("prop.select", json!({"layer": l, "prop": m2})).unwrap();
+    assert_eq!((points(&s, m1), points(&s, m2)), (0, 4));
+    // Delete removes the selected mask (not only its points).
+    s.execute("edit.clear", json!({})).unwrap();
+    let masks = |s: &Session| s.active_comp().unwrap().layer(effectcraft_project::LayerId(l)).unwrap().masks().unwrap().children.len();
+    assert_eq!(masks(&s), 1);
+    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
+    assert!(s.state.selected_vertices.is_empty());
+    let sh = s.execute("layer.newShape", json!({"kind": "star"})).unwrap()["layer"].as_u64().unwrap();
+    let star = s.execute("layer.addShapeItem", json!({"layer": sh, "kind": "path"})).unwrap()["uid"].as_u64().unwrap();
+    s.execute("prop.select", json!({"layer": sh, "prop": star})).unwrap();
+    assert_eq!(s.state.selected_vertices.len(), 0, "an empty Path has no points");
+}
+
+#[test]
+fn save_and_open_roundtrip() {
+    let mut s = demo();
+    let dir = std::env::temp_dir().join(format!("ec-test-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("demo.ecproj").to_string_lossy().to_string();
+    s.execute("file.saveAs", json!({"path": path})).unwrap();
+    let before = s.project.clone();
+    let mut s2 = Session::default();
+    s2.execute("file.open", json!({"path": path})).unwrap();
+    assert_eq!(*before, *s2.project);
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+#[test]
+fn help_links_emit_urls() {
+    let mut s = Session::default();
+    let r = s.execute("help.discord", json!({})).unwrap();
+    assert_eq!(r["url"], "https://discord.gg/artcraft");
+    assert!(s.drain_events().iter().any(|e| matches!(e, crate::Event::OpenUrl(u) if u.contains("discord"))));
+    assert_eq!(s.execute("help.github", json!({})).unwrap()["url"], "https://github.com/storytold/effectcraft");
+}
+
+#[test]
+fn time_navigation() {
+    let mut s = demo();
+    s.execute("time.start", json!({})).unwrap();
+    let r = s.execute("time.nextKey", json!({})).unwrap();
+    assert!(r["time"].as_f64().unwrap() > 0.0);
+    s.execute("time.set", json!({"frame": 45})).unwrap();
+    assert_eq!(s.execute("time.step", json!({"frames": 5})).unwrap()["frame"], 50);
+}
+
+#[test]
+fn time_navigation_per_property() {
+    let mut s = demo();
+    // An animated property and the comp times of its keys.
+    let comp = s.active_comp().unwrap().clone();
+    let mut found = None;
+    for l in &comp.layers {
+        l.props.walk("", &mut |_, pr| {
+            if found.is_none() && pr.keys.len() >= 2 {
+                found = Some((pr.uid, pr.keys.iter().map(|k| l.comp_time(k.time)).collect::<Vec<_>>()));
+            }
+        });
+    }
+    let (uid, times) = found.expect("demo has an animated property");
+    s.set_time(effectcraft_time::Tick::ZERO);
+    let half = comp.frame_duration().0 / 2;
+    let expect = times.iter().copied().filter(|t| t.0 > half).min().unwrap();
+    s.execute("time.go", json!({"to": "nextKey", "prop": uid})).unwrap();
+    let snap = |t| comp.frame_rate.snap(t);
+    assert_eq!(s.time(), snap(expect));
+    // Going back from past the last key lands on the last key.
+    s.set_time(comp.duration);
+    s.execute("time.go", json!({"to": "prevKey", "prop": uid})).unwrap();
+    assert_eq!(s.time(), snap(*times.iter().max().unwrap()));
+}
+
+#[test]
+fn set_text_paragraph_fill_and_leading() {
+    use effectcraft_keyframe::{Justify, Value as KValue};
+    let mut s = demo();
+    let t = s.execute("layer.newText", json!({"text": "Hi"})).unwrap()["layer"].as_u64().unwrap();
+    let doc = |s: &Session| {
+        let l = s.active_comp().unwrap().layer(crate::project::LayerId(t)).unwrap().clone();
+        match &l.props.prop("text/sourceText").unwrap().value {
+            KValue::Text(d) => (**d).clone(),
+            v => panic!("{v:?}"),
+        }
+    };
+    for (key, j) in [
+        ("justifyLeft", Justify::JustifyLastLeft),
+        ("justifyCenter", Justify::JustifyLastCenter),
+        ("justifyRight", Justify::JustifyLastRight),
+        ("justifyAll", Justify::JustifyAll),
+        ("center", Justify::Center),
+    ] {
+        s.execute("layer.setText", json!({"layer": t, "justify": key})).unwrap();
+        assert_eq!(doc(&s).justify, j, "{key}");
+    }
+    s.execute("layer.setText", json!({"layer": t, "leading": 50, "applyFill": false, "applyStroke": true})).unwrap();
+    let d = doc(&s);
+    assert_eq!((d.leading, d.apply_fill, d.apply_stroke), (Some(50.0), false, true));
+    s.execute("layer.setText", json!({"layer": t, "leading": "auto"})).unwrap();
+    assert_eq!(doc(&s).leading, None);
+    s.execute("layer.setText", json!({"layer": t, "hScale": 120, "vScale": 80, "baselineShift": 4, "smallCaps": true, "strokeOverFill": true})).unwrap();
+    let d = doc(&s);
+    assert_eq!((d.h_scale, d.v_scale, d.baseline_shift, d.small_caps, d.stroke_over_fill), (120.0, 80.0, 4.0, true, true));
+}
+
+#[test]
+fn property_groups_report_actionable_errors() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "T"})).unwrap();
+    let l = s.execute("layer.newText", json!({"text": "Hi"})).unwrap()["layer"].as_u64().unwrap();
+    let uid = s.active_comp().unwrap().layer(crate::project::LayerId(l)).unwrap().props.group("text/pathOptions").unwrap().uid;
+    for selector in [json!({"path": "text"}), json!({"path": "text/pathOptions"}), json!({"path": format!("@{uid}")}), json!({"prop": uid})] {
+        let mut params = selector;
+        params["layer"] = json!(l);
+        for cmd in ["prop.get", "prop.set"] {
+            let err = s.execute(cmd, params.clone()).unwrap_err().to_string();
+            assert!(err.contains("is a property group"), "{cmd}: {err}");
+            assert!(err.contains("get_layer"), "{cmd}: {err}");
+        }
+    }
+    assert!(s.execute("prop.get", json!({"layer": l, "path": "text/sourceText"})).is_ok());
+    let err = s.execute("prop.get", json!({"layer": l, "path": "missing"})).unwrap_err().to_string();
+    assert!(err.contains("no property `missing`"), "{err}");
+}
+
+#[test]
+fn prop_get_and_render_rgba8() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "T", "width": 320, "height": 180, "duration": 2.0, "frameRate": 30})).unwrap();
+    let l = s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 0.0, "value": [0, 0]})).unwrap();
+    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 1.0, "value": [100, 50]})).unwrap();
+    let v = s.execute("prop.get", json!({"layer": l, "path": "transform/position", "time": 1.0})).unwrap();
+    assert_eq!(v["animated"], true);
+    assert_eq!(v["keys"].as_array().unwrap().len(), 2);
+    assert_eq!(v["value"][0].as_f64().unwrap(), 100.0);
+    let cid = s.resolve_comp(Some(&json!("T"))).unwrap();
+    let (w, h, rgba) = s.render_rgba8(cid, effectcraft_time::Tick::ZERO, 160).unwrap();
+    assert_eq!((w, h), (160, 90));
+    assert_eq!(rgba.len(), (w * h * 4) as usize);
+}
+
+#[test]
+fn params_docs_parse() {
+    use crate::commands::accepted_params;
+    let k = |d: &str| accepted_params(d).unwrap();
+    assert_eq!(k("{layers: [id|name|#n], add?, toggle?}"), ["layers", "add", "toggle"]);
+    assert_eq!(k("{time? (s) | frame? | timecode?}"), ["time", "frame", "timecode"]);
+    assert_eq!(k("{interpolation?|in?|out?: linear|bezier|hold, autoBezier?}"), ["interpolation", "in", "out", "autoBezier"]);
+    assert_eq!(k("{keys: [{layer, prop, time}], add?}"), ["keys", "add"]);
+    assert_eq!(k("{label: Red|Yellow|Aqua|…, layers?}"), ["label", "layers"]);
+    assert_eq!(k("{name?, background? [r,g,b]|#hex, open?}"), ["name", "background", "open"]);
+    assert!(k("{}").is_empty());
+    assert!(accepted_params("free text").is_none());
+    // Every registered command documents its params as a parseable key list.
+    for c in crate::command_specs() {
+        assert!(accepted_params(c.params).is_some(), "{}: {}", c.id, c.params);
+    }
+}
+
+#[test]
+fn execute_checked_rejects_unknown_params() {
+    let mut s = demo();
+    let e = s.execute_checked("layer.select", json!({"index": 2})).unwrap_err().to_string();
+    assert!(e.contains("`index`") && e.contains("layers, add, toggle"), "{e}");
+    s.execute_checked("layer.select", json!({"layers": ["#2"]})).unwrap();
+    assert_eq!(s.state.selected_layers.len(), 1);
+    // Aliases and always-accepted keys.
+    s.execute_checked("layer.select", json!({"layer": "#1", "comp": s.active_comp_id().unwrap().0})).unwrap();
+    s.execute_checked("time.set", json!({"frame": 3})).unwrap();
+    assert!(s.execute_checked("edit.undo", json!({"steps": 2})).is_err());
+    // Non-object params are not validated; the unchecked path stays lenient.
+    s.execute("layer.select", json!({"layers": ["#1"], "index": 2})).unwrap();
+}
+
+#[test]
+fn layer_tree_paths_resolve() {
+    let mut s = demo();
+    s.execute("effect.apply", json!({"layer": 1, "effect": "Gaussian Blur"})).unwrap();
+    let comp = s.execute("comp.info", json!({})).unwrap();
+    let mut checked = 0;
+    for l in comp["layers"].as_array().unwrap() {
+        let tree = s.execute("layer.tree", json!({"layer": l["id"]})).unwrap();
+        let mut stack = vec![tree["properties"].clone()];
+        while let Some(n) = stack.pop() {
+            if let Some(ch) = n["children"].as_array() {
+                stack.extend(ch.iter().cloned());
+                continue;
+            }
+            let path = n["path"].as_str().unwrap();
+            let got = s.execute("prop.get", json!({"layer": l["id"], "path": path})).unwrap();
+            assert_eq!(got["uid"], n["uid"], "path {path} on layer {}", l["name"]);
+            checked += 1;
+        }
+    }
+    assert!(checked > 20, "{checked}");
+}
+
+#[test]
+fn comp_settings_anchor_start_timecode_renderer() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "A", "width": 100, "height": 100, "duration": 2.0})).unwrap();
+    let l = s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.addKey", json!({"layer": l, "path": "transform/position", "time": 0.0, "value": [10, 20]})).unwrap();
+    let pos = |s: &Session| {
+        let pr = s.active_comp().unwrap().layer(crate::project::LayerId(l)).unwrap().props.prop("transform/position").unwrap().clone();
+        pr.keys[0].value.components()
+    };
+    // Center anchor: grow by 100x50 → shift by half.
+    s.execute("comp.settings", json!({"width": 200, "height": 150})).unwrap();
+    assert_eq!(pos(&s)[..2], [60.0, 45.0]);
+    // Top-left anchor: no shift. Bottom-right: full shift.
+    s.execute("comp.settings", json!({"width": 300, "anchor": 0})).unwrap();
+    assert_eq!(pos(&s)[..2], [60.0, 45.0]);
+    s.execute("comp.settings", json!({"width": 200, "height": 100, "anchor": 8})).unwrap();
+    assert_eq!(pos(&s)[..2], [-40.0, -5.0]);
+    s.execute("comp.settings", json!({"startTimecode": "0:00:01:00", "renderer": "advanced3D"})).unwrap();
+    let c = s.active_comp().unwrap();
+    assert_eq!(c.display_start, c.frame_rate.tick_of(30));
+    assert_eq!(c.renderer, crate::project::Renderer::Advanced3D);
+}
+
+/// `advanced3D` is a value of `renderer`, not a key: comp.new / comp.settings don't advertise it
+/// in their schemas and reject it as unknown instead of ignoring it (#177).
+#[test]
+fn renderer_values_are_not_parameter_keys() {
+    let mut s = Session::default();
+    for (id, p) in [("comp.new", json!({"name": "A"})), ("comp.settings", json!({}))] {
+        let spec = crate::command_specs().iter().find(|c| c.id == id).unwrap();
+        let keys = crate::commands::accepted_params(spec.params).unwrap();
+        assert!(keys.contains(&"renderer".to_string()) && !keys.contains(&"advanced3D".to_string()), "{id}: {keys:?}");
+        let mut bad = p.clone();
+        bad["advanced3D"] = json!(true);
+        let e = s.execute_checked(id, bad).unwrap_err().to_string();
+        assert!(e.contains("unknown parameter(s) `advanced3D`"), "{id}: {e}");
+        let mut good = p;
+        good["renderer"] = json!("advanced3D");
+        s.execute_checked(id, good).unwrap();
+        assert_eq!(s.active_comp().unwrap().renderer, crate::project::Renderer::Advanced3D, "{id}");
+        s.execute("comp.renderer", json!({"renderer": "classic3d"})).unwrap();
+    }
+}
+
+#[test]
+fn comp_rejects_zero_and_negative_frame_rates() {
+    let mut s = Session::default();
+    for fps in [0.0, -30.0, 0.0001] {
+        assert!(s.execute("comp.new", json!({"frameRate": fps})).is_err(), "{fps}");
+    }
+    s.execute("comp.new", json!({"frameRate": 30, "duration": 1})).unwrap();
+    assert!(s.execute("comp.settings", json!({"frameRate": 0})).is_err());
+    assert_eq!(s.active_comp().unwrap().frame_rate, crate::time::FrameRate::FPS_30);
+}
+
+#[test]
+fn render_queue_add_accepts_documented_settings_when_checked() {
+    let mut s = demo();
+    let r = s.execute_checked(
+        "renderQueue.add",
+        json!({"format": "gif", "output": "/tmp/x.gif", "resolution": "quarter", "timeSpan": "custom", "start": 0.0, "end": 0.5, "quality": "draft", "loop": true}),
+    );
+    // Without an exporter the add itself still succeeds (rendering is what needs one).
+    assert!(r.is_ok(), "{r:?}");
+    assert!(s.execute_checked("renderQueue.add", json!({"bogus": 1})).is_err());
+}
+
+#[test]
+fn new_text_rejects_malformed_positions_without_creating_a_layer() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 64, "height": 64, "duration": 1})).unwrap();
+    for position in [json!([]), json!([10]), json!(["x", 20]), json!([null, 20])] {
+        let err = s.execute("layer.newText", json!({"text": "Hello", "position": position})).unwrap_err();
+        assert!(err.to_string().contains("position: [x, y]"), "{err}");
+        assert!(s.active_comp().unwrap().layers.is_empty());
+    }
+    s.execute("layer.newText", json!({"name": "Valid", "text": "Hello", "position": [10, 20]})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers[0].props.prop("transform/position").unwrap().value, effectcraft_keyframe::Value::Vec3([10.0, 20.0, 0.0]));
+    s.execute("layer.newText", json!({"text": "No explicit position"})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 2);
+}
+
+/// The active comp and the open comp tabs are saved with the project and restored on open (#748).
+#[test]
+fn reopening_a_project_restores_its_active_comp() {
+    use effectcraft_project::ItemId;
+    let dir = std::env::temp_dir().join(format!("ec-test-748-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("view.ecproj").to_string_lossy().to_string();
+    let mut s = Session::default();
+    let a = s.execute("comp.new", json!({"name": "CompA"})).unwrap()["comp"].as_u64().unwrap();
+    let b = s.execute("comp.new", json!({"name": "CompB"})).unwrap()["comp"].as_u64().unwrap();
+    let c = s.execute("comp.new", json!({"name": "CompC"})).unwrap()["comp"].as_u64().unwrap();
+    s.execute("comp.open", json!({"comp": "CompB"})).unwrap();
+    s.state.open_comps.retain(|id| id.0 != c);
+    s.execute("file.saveAs", json!({"path": path})).unwrap();
+    let mut s2 = Session::default();
+    s2.execute("file.open", json!({"path": path})).unwrap();
+    assert_eq!(s2.state.active_comp, Some(ItemId(b)));
+    assert_eq!(s2.state.open_comps, vec![ItemId(a), ItemId(b)]);
+    assert!(!s2.is_dirty());
+
+    // A file from before the view was saved opens on its first comp, as it always did.
+    let text = std::fs::read_to_string(&path).unwrap();
+    let mut old: serde_json::Value = serde_json::from_str(&text).unwrap();
+    let obj = old.as_object_mut().unwrap();
+    obj.remove("activeComp");
+    obj.remove("openComps");
+    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
+    let mut s3 = Session::default();
+    s3.execute("file.open", json!({"path": path})).unwrap();
+    assert_eq!((s3.state.active_comp, s3.state.open_comps.clone()), (Some(ItemId(a)), vec![ItemId(a)]));
+
+    // Ids that no longer name a comp (edited by hand, or written by another tool) fall back.
+    obj_set(&mut old, json!(999), json!([999, b, "x"]));
+    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
+    let mut s4 = Session::default();
+    s4.execute("file.open", json!({"path": path})).unwrap();
+    assert_eq!((s4.state.active_comp, s4.state.open_comps.clone()), (Some(ItemId(b)), vec![ItemId(b)]));
+    obj_set(&mut old, json!(999), json!([]));
+    std::fs::write(&path, serde_json::to_string_pretty(&old).unwrap()).unwrap();
+    let mut s5 = Session::default();
+    s5.execute("file.open", json!({"path": path})).unwrap();
+    assert_eq!((s5.state.active_comp, s5.state.open_comps.clone()), (Some(ItemId(a)), vec![ItemId(a)]));
+
+    // XML copies carry it too.
+    let xml = dir.join("view.ecprojx").to_string_lossy().to_string();
+    s.execute("file.saveAs", json!({"path": xml})).unwrap();
+    let mut s6 = Session::default();
+    s6.execute("file.open", json!({"path": xml})).unwrap();
+    assert_eq!(s6.state.active_comp, Some(ItemId(b)));
+    let _ = std::fs::remove_dir_all(dir);
+
+    fn obj_set(v: &mut serde_json::Value, active: serde_json::Value, open: serde_json::Value) {
+        let o = v.as_object_mut().unwrap();
+        o.insert("activeComp".into(), active);
+        o.insert("openComps".into(), open);
+    }
+}
+
+/// Layer times are saved as exact ticks and read back unchanged, and each comp reopens at the
+/// current time it was saved at, not at 0, where a layer starting later shows nothing (#1714).
+#[test]
+fn reopening_a_project_restores_layer_times_and_current_time() {
+    use effectcraft_project::ItemId;
+    use effectcraft_time::{FrameRate, Tick};
+    let dir = std::env::temp_dir().join(format!("ec-test-1714-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("times.ecproj").to_string_lossy().to_string();
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 108, "height": 192, "duration": 60})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "crown"})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let comp = std::sync::Arc::make_mut(&mut s.project).comp_mut(cid).unwrap();
+    comp.frame_rate = FrameRate::FPS_59_94;
+    // The layer from the issue: 34f, 315f and 3033f at 59.94 fps.
+    let l = comp.layers.first_mut().unwrap();
+    (l.start_time, l.in_point, l.out_point) = (Tick(144_086_342_400), Tick(1_334_917_584_000), Tick(12_853_349_308_800));
+    s.execute("time.set", json!({"time": 6.0})).unwrap();
+    let t = s.time();
+    // A second comp keeps its own time.
+    let b = ItemId(s.execute("comp.new", json!({"name": "B"})).unwrap()["comp"].as_u64().unwrap());
+    s.execute("time.set", json!({"time": 2.0})).unwrap();
+    let tb = s.time();
+    s.execute("comp.open", json!({"comp": "C"})).unwrap();
+    s.execute("file.saveAs", json!({"path": path})).unwrap();
+
+    let mut s2 = Session::default();
+    s2.execute("file.open", json!({"path": path})).unwrap();
+    let l = s2.project.comp(cid).unwrap().layers.first().unwrap();
+    assert_eq!((l.start_time, l.in_point, l.out_point), (Tick(144_086_342_400), Tick(1_334_917_584_000), Tick(12_853_349_308_800)));
+    assert_eq!((s2.time(), s2.state.times.get(&b).copied()), (t, Some(tb)));
+    assert!(l.in_point <= s2.time() && s2.time() < l.out_point, "the layer shows at the reopened time");
+    assert!(!s2.is_dirty());
+
+    // Hand-edited times past the end or before the start land on the last or first frame.
+    let mut file: serde_json::Value = serde_json::from_str(&std::fs::read_to_string(&path).unwrap()).unwrap();
+    file["compTimes"] = json!({cid.0.to_string(): i64::MAX, b.0.to_string(): -5});
+    std::fs::write(&path, file.to_string()).unwrap();
+    let mut s3 = Session::default();
+    s3.execute("file.open", json!({"path": path})).unwrap();
+    let c = s3.project.comp(cid).unwrap();
+    assert_eq!(s3.time(), c.frame_rate.snap_nearest(c.duration - c.frame_duration()));
+    assert_eq!(s3.time(), c.frame_rate.snap_nearest(c.duration - c.frame_duration()));
+    assert_eq!(s3.state.times.get(&b).copied(), Some(Tick::ZERO));
+}
diff --git a/crates/engine/src/tests_settings.rs b/crates/engine/src/tests/settings.rs
similarity index 95%
rename from crates/engine/src/tests_settings.rs
rename to crates/engine/src/tests/settings.rs
index 58819f55c..81bed3c43 100644
--- a/crates/engine/src/tests_settings.rs
+++ b/crates/engine/src/tests/settings.rs
@@ -71,6 +71,14 @@ fn prefs_migrate_old_layout_and_keep_unknown_keys() {
     assert_eq!(Prefs::from_json("not json"), Prefs::default());
 }
 
+#[test]
+fn prefs_migrate_old_disk_cache_default() {
+    // The old 100 GB default becomes 20 GB; a size the user chose stays (#2551).
+    assert_eq!(Prefs::from_json(r#"{"version": 2, "disk": {"diskCacheMaxGb": 100}}"#).disk.disk_cache_max_gb, 20);
+    assert_eq!(Prefs::from_json(r#"{"version": 2, "disk": {"diskCacheMaxGb": 50}}"#).disk.disk_cache_max_gb, 50);
+    assert_eq!(Prefs::from_json(r#"{"version": 3, "disk": {"diskCacheMaxGb": 100}}"#).disk.disk_cache_max_gb, 100);
+}
+
 #[test]
 fn prefs_set_validates_keys_types_and_ranges() {
     let mut p = Prefs::default();
@@ -181,7 +189,7 @@ fn every_schema_key_exists_and_docs_list_the_todo_settings() {
             assert!(ids.contains(&page), "{path:?} opens unknown page {page}");
         }
     }
-    let docs = include_str!("../../../docs/preferences.md");
+    let docs = include_str!("../../../../docs/preferences.md");
     for k in crate::prefs::todo_keys() {
         assert!(docs.contains(&format!("`{k}`")), "docs/preferences.md must list the not-yet-wired setting `{k}`");
     }
@@ -212,6 +220,34 @@ fn prefs_commands_get_set_reset_and_persist() {
     );
 }
 
+/// Effects & Presets' starred effects live in the settings (#1692): they come back in the next
+/// session, un-starring sticks too, Reset All keeps them, and a hand-edited list loses its
+/// repeats and empty ids on load.
+#[test]
+fn effects_favorites_persist_across_sessions() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = Session { config: Some(store.clone()), ..Default::default() };
+    assert!(s.prefs.toggle_effect_favorite("ADBE Gaussian Blur 2"));
+    assert!(s.prefs.toggle_effect_favorite("ADBE Glo2"));
+    s.save_prefs();
+    let reopen = |store: &Arc<MemoryConfig>| {
+        let mut s = Session { config: Some(store.clone()), ..Default::default() };
+        s.load_settings();
+        s
+    };
+    let mut s2 = reopen(&store);
+    assert_eq!(s2.prefs.effects_favorites, ["ADBE Gaussian Blur 2", "ADBE Glo2"]);
+    assert!(!s2.prefs.toggle_effect_favorite("ADBE Glo2"), "un-starred");
+    s2.save_prefs();
+    let mut s3 = reopen(&store);
+    assert_eq!(s3.prefs.effects_favorites, ["ADBE Gaussian Blur 2"]);
+    s3.execute("prefs.reset", json!({})).unwrap();
+    assert!(s3.prefs.is_effect_favorite("ADBE Gaussian Blur 2"), "Reset All keeps the stars");
+    let edited = store.read(PREFS_FILE).unwrap().replace("\"effectsFavorites\": [", "\"effectsFavorites\": [\"\", \"ADBE Glo2\", \"ADBE Glo2\", ");
+    store.write(PREFS_FILE, &edited).unwrap();
+    assert_eq!(reopen(&store).prefs.effects_favorites, ["ADBE Glo2", "ADBE Gaussian Blur 2"]);
+}
+
 /// Composition Settings presets the user saves live in the settings: they persist, a save with
 /// an existing name replaces it, they survive Reset All, and invalid ones (from a hand-edited
 /// settings file) are dropped on load.
@@ -1036,6 +1072,12 @@ fn interface_language_is_validated_persisted_and_backward_compatible() {
     cs.load_settings();
     assert_eq!(cs.prefs.general.language, "cs");
     assert_eq!(Prefs::from_json(r#"{"general":{"language":"cs"}}"#).general.language, "cs");
+    // Georgian too.
+    assert!(crate::prefs::LANGUAGES.contains(&("ქართული", "ka")));
+    s.execute("prefs.set", json!({"key": "general.language", "value": "ka"})).unwrap();
+    let mut ka = Session { config: Some(store.clone()), ..Default::default() };
+    ka.load_settings();
+    assert_eq!(ka.prefs.general.language, "ka");
     s.execute("prefs.set", json!({"key": "general.language", "value": "ja"})).unwrap();
     let mut reloaded = Session { config: Some(store), ..Default::default() };
     reloaded.load_settings();
diff --git a/crates/engine/src/tests_shortcut_cmds.rs b/crates/engine/src/tests/shortcut_cmds.rs
similarity index 100%
rename from crates/engine/src/tests_shortcut_cmds.rs
rename to crates/engine/src/tests/shortcut_cmds.rs
diff --git a/crates/engine/src/tests_stubs.rs b/crates/engine/src/tests/stubs.rs
similarity index 81%
rename from crates/engine/src/tests_stubs.rs
rename to crates/engine/src/tests/stubs.rs
index edf773552..84321ee7e 100644
--- a/crates/engine/src/tests_stubs.rs
+++ b/crates/engine/src/tests/stubs.rs
@@ -476,3 +476,110 @@ fn implemented_stubs_are_enabled_and_workspaces_are_frontend() {
         assert!(!s.is_enabled(id), "{id}");
     }
 }
+
+/// The first path item in a shape layer's Contents, at any depth: (uid, match_id). A new shape
+/// layer nests it in a group ("Rectangle 1" ▸ "Rectangle Path 1"), as After Effects does.
+fn first_shape(s: &Session, l: u64) -> (u64, String) {
+    fn walk(g: &effectcraft_project::PropGroup) -> Option<(u64, String)> {
+        if ["rect", "ellipse", "star", "path"].contains(&g.match_id.as_str()) {
+            return Some((g.uid, g.match_id.clone()));
+        }
+        g.groups().find_map(walk)
+    }
+    walk(layer(s, l).props.sub("contents").unwrap()).unwrap()
+}
+
+fn shape_path_of(s: &Session, l: u64, uid: u64) -> effectcraft_keyframe::ShapePath {
+    let ly = layer(s, l);
+    let g = ly.props.sub("contents").unwrap().find_group(uid).unwrap();
+    let _ = &g;
+    g.get("path").unwrap().value.as_path().unwrap().clone()
+}
+
+/// Convert To Bezier Path on a shape layer's parametric path gives an editable Path 1 with the
+/// same geometry, as After Effects does (#932). The command only turned RotoBezier off for masks,
+/// so a Rectangle, Ellipse or Polystar path could not be converted at all.
+#[test]
+fn convert_to_bezier_turns_a_parametric_shape_into_an_editable_path() {
+    let convert = |args: serde_json::Value| {
+        let mut s = comp();
+        let l = s.execute("layer.newShape", args).unwrap()["layer"].as_u64().unwrap();
+        let (uid, was) = first_shape(&s, l);
+        assert_ne!(was, "path", "it starts out parametric");
+        s.state.selected_props = vec![(LayerId(l), uid)];
+        let out = s.execute("path.convertToBezier", json!({})).unwrap();
+        assert_eq!(out["paths"].as_u64(), Some(1));
+        let (new_uid, now) = first_shape(&s, l);
+        assert_eq!(now, "path", "it is a bezier path now");
+        // The new path is selected, so its vertices can be edited straight away.
+        assert_eq!(s.state.selected_props, vec![(LayerId(l), new_uid)]);
+        let path = shape_path_of(&s, l, new_uid);
+        assert!(path.closed, "a closed shape stays closed");
+        (s, l, was, path)
+    };
+    let radius = |v: [f64; 2]| v[0].hypot(v[1]);
+
+    // A 120 x 80 rectangle is its four corners, joined by straight edges.
+    let (mut s, l, was, rect) = convert(json!({"kind": "rect", "size": [120, 80]}));
+    assert_eq!(rect.vertices, vec![[-60.0, -40.0], [60.0, -40.0], [60.0, 40.0], [-60.0, 40.0]]);
+    assert!(rect.in_tangents.iter().chain(&rect.out_tangents).all(|t| *t == [0.0, 0.0]), "straight edges: {rect:?}");
+    // Undo brings the parametric shape back.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(first_shape(&s, l).1, was, "undo restores the parametric shape");
+
+    // An ellipse is four cubic arcs: a vertex on each axis, with tangents of 0.5523 x the radius
+    // (the usual circle approximation). Straight lines here would be a diamond.
+    let (_, _, _, ell) = convert(json!({"kind": "ellipse", "size": [120, 80]}));
+    assert_eq!(ell.vertices, vec![[0.0, -40.0], [60.0, 0.0], [0.0, 40.0], [-60.0, 0.0]]);
+    let kappa = 4.0 / 3.0 * (std::f64::consts::SQRT_2 - 1.0);
+    for (i, want) in [60.0 * kappa, 40.0 * kappa, 60.0 * kappa, 40.0 * kappa].into_iter().enumerate() {
+        let t = ell.in_tangents[i];
+        assert!((radius(t) - want).abs() < 1e-6, "vertex {i}: tangent {t:?} should be {want}");
+    }
+
+    // A five-point star alternates the outer and inner radius, so ten vertices.
+    let (_, _, _, star) = convert(json!({"kind": "star", "size": [120, 120]}));
+    assert_eq!(star.vertices.len(), 10);
+    for (i, v) in star.vertices.iter().enumerate() {
+        let want = if i % 2 == 0 { 60.0 } else { 30.0 };
+        assert!((radius(*v) - want).abs() < 1e-6, "vertex {i} at {v:?} should be {want} from the centre");
+    }
+
+    // A polygon has one vertex per point, all at the outer radius.
+    let (_, _, _, poly) = convert(json!({"kind": "polygon", "size": [120, 120]}));
+    assert!(poly.vertices.len() >= 3);
+    assert!(poly.vertices.iter().all(|v| (radius(*v) - 60.0).abs() < 1e-6), "{:?}", poly.vertices);
+    assert_ne!(poly.vertices.len(), star.vertices.len(), "a polygon is not a star");
+}
+
+/// The shape's own values are read, not defaults: Roundness rounds the corners and Position moves
+/// the path, both at the time the conversion is made.
+#[test]
+fn convert_to_bezier_reads_the_shape_as_it_is_set() {
+    let mut s = comp();
+    let l = s.execute("layer.newShape", json!({"kind": "rect", "size": [120, 80]})).unwrap()["layer"].as_u64().unwrap();
+    let (uid, _) = first_shape(&s, l);
+    // Properties are addressed by their own uid.
+    let pr_uid = |s: &Session, id: &str| {
+        let ly = layer(s, l);
+        ly.props.sub("contents").unwrap().find_group(uid).unwrap().get(id).unwrap().uid
+    };
+    let (round, pos) = (pr_uid(&s, "roundness"), pr_uid(&s, "position"));
+    s.execute("prop.set", json!({"layer": l, "path": format!("@{round}"), "value": 20.0})).unwrap();
+    s.execute("prop.set", json!({"layer": l, "path": format!("@{pos}"), "value": [10.0, 5.0]})).unwrap();
+
+    s.state.selected_props = vec![(LayerId(l), uid)];
+    s.execute("path.convertToBezier", json!({})).unwrap();
+    let (new_uid, now) = first_shape(&s, l);
+    assert_eq!(now, "path");
+    let path = shape_path_of(&s, l, new_uid);
+
+    // Rounded corners need more than four vertices, and curves between them.
+    assert!(path.vertices.len() > 4, "roundness rounds the corners: {} vertices", path.vertices.len());
+    assert!(path.in_tangents.iter().chain(&path.out_tangents).any(|t| *t != [0.0, 0.0]), "with curves");
+    // Position moves the path: the bounds are centred on it, not on the origin.
+    let xs: Vec<f64> = path.vertices.iter().map(|v| v[0]).collect();
+    let ys: Vec<f64> = path.vertices.iter().map(|v| v[1]).collect();
+    let mid = |v: &[f64]| (v.iter().copied().fold(f64::MAX, f64::min) + v.iter().copied().fold(f64::MIN, f64::max)) / 2.0;
+    assert!((mid(&xs) - 10.0).abs() < 1e-6 && (mid(&ys) - 5.0).abs() < 1e-6, "centred on the position: {:?} {:?}", mid(&xs), mid(&ys));
+}
diff --git a/crates/engine/src/tests_styles.rs b/crates/engine/src/tests/styles.rs
similarity index 100%
rename from crates/engine/src/tests_styles.rs
rename to crates/engine/src/tests/styles.rs
diff --git a/crates/engine/src/tests_tail.rs b/crates/engine/src/tests/tail.rs
similarity index 100%
rename from crates/engine/src/tests_tail.rs
rename to crates/engine/src/tests/tail.rs
diff --git a/crates/engine/src/tests_text.rs b/crates/engine/src/tests/text.rs
similarity index 89%
rename from crates/engine/src/tests_text.rs
rename to crates/engine/src/tests/text.rs
index a57f87a70..3980c7bb5 100644
--- a/crates/engine/src/tests_text.rs
+++ b/crates/engine/src/tests/text.rs
@@ -2,7 +2,7 @@
 //! undo/redo and serde round-trips).
 
 use effectcraft_keyframe::Value as KV;
-use effectcraft_project::{Node, Project, PropGroup};
+use effectcraft_project::{LayerId, Node, Project, PropGroup};
 use serde_json::json;
 
 use crate::Session;
@@ -198,7 +198,7 @@ fn cached_text_presets_keep_the_catalog_and_application_independent() {
 #[ignore = "warm text-preset listing benchmark"]
 fn text_preset_listing_benchmark() {
     let old = || {
-        let v: serde_json::Value = serde_json::from_str(include_str!("../presets/text_animators.json")).unwrap();
+        let v: serde_json::Value = serde_json::from_str(include_str!("../../presets/text_animators.json")).unwrap();
         let presets = v["presets"].as_array().unwrap().clone();
         presets.iter().map(|p| (p["id"].as_str().unwrap().to_string(), p["name"].as_str().unwrap().to_string())).collect::<Vec<_>>()
     };
@@ -244,3 +244,27 @@ fn menus_have_text_animation_entries() {
     assert!(s.is_enabled("layer.enablePerChar3D"));
     assert!(!s.is_enabled("layer.addTextSelector"), "needs an animator");
 }
+
+/// Duplicate with a Range Selector selected under a text animator copies the selector, not the
+/// whole text layer (#1665); a selected animator is copied the same way.
+#[test]
+fn duplicate_copies_selected_text_selector_not_the_layer() {
+    let (mut s, t) = session();
+    s.execute("layer.addTextAnimator", json!({"layer": t, "properties": ["tracking"]})).unwrap();
+    let anims = |s: &Session| s.active_comp().unwrap().layer(LayerId(t)).unwrap().props.group("text/animators").unwrap().clone();
+    let selectors = |s: &Session| -> Vec<u64> { anims(s).groups().next().unwrap().sub("selectors").unwrap().groups().map(|g| g.uid).collect() };
+    let sel = selectors(&s)[0];
+
+    s.execute("prop.select", json!({"layer": t, "prop": sel, "selectKeys": false})).unwrap();
+    s.execute("edit.duplicate", json!({})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 1, "no second text layer");
+    assert_eq!(selectors(&s).len(), 2, "the selector is copied");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(selectors(&s), vec![sel]);
+
+    let anim = anims(&s).groups().next().unwrap().uid;
+    s.execute("prop.select", json!({"layer": t, "prop": anim, "selectKeys": false})).unwrap();
+    s.execute("edit.duplicate", json!({})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
+    assert_eq!(anims(&s).groups().count(), 2, "the animator is copied");
+}
diff --git a/crates/engine/src/tests/text_edit.rs b/crates/engine/src/tests/text_edit.rs
new file mode 100644
index 000000000..17d0345d8
--- /dev/null
+++ b/crates/engine/src/tests/text_edit.rs
@@ -0,0 +1,1220 @@
+//! On-canvas text editing and per-character styles through commands: run-scoped
+//! `layer.setText`, text.insert / delete / setSelection / moveCaret, the text clipboard and the
+//! paste-formatting commands, with undo / redo.
+
+use effectcraft_keyframe::{BaselineOption, Justify, Kerning, TextDoc};
+use serde_json::json;
+
+use crate::Session;
+use crate::commands::text_edit::{MAX_IME_TEXT_BYTES, ime_stamp_revision, ime_surrounding, layer_doc};
+
+fn session(text: &str) -> (Session, u64) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let t = s.execute("layer.newText", json!({"text": text, "size": 60, "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    (s, t)
+}
+
+fn doc(s: &Session, t: u64) -> TextDoc {
+    layer_doc(s, effectcraft_project::LayerId(t)).unwrap()
+}
+
+fn sel(s: &Session) -> (usize, usize) {
+    let e = s.state.text_edit.as_ref().unwrap();
+    (e.anchor, e.caret)
+}
+
+/// Start editing the text layer with everything selected (no caret given).
+fn begin_edit(s: &mut Session, t: u64) {
+    s.execute("text.edit", json!({"layer": t})).unwrap();
+}
+
+/// Start editing the text layer with the caret at `caret`.
+fn begin_edit_at(s: &mut Session, t: u64, caret: usize) {
+    s.execute("text.edit", json!({"layer": t, "caret": caret})).unwrap();
+}
+
+/// A session with one text layer already open in the editor at `caret`.
+fn editing(text: &str, caret: usize) -> (Session, u64) {
+    let (mut s, t) = session(text);
+    begin_edit_at(&mut s, t, caret);
+    (s, t)
+}
+
+/// A session with one text layer already open in the editor with everything selected.
+fn editing_all(text: &str) -> (Session, u64) {
+    let (mut s, t) = session(text);
+    begin_edit(&mut s, t);
+    (s, t)
+}
+
+/// The IME owner token of the open editor.
+fn ime_owner(s: &Session) -> u64 {
+    s.state.text_edit.as_ref().unwrap().session
+}
+
+fn undo_steps(s: &Session) -> usize {
+    s.history.undo.len()
+}
+
+/// The editor kept its document (same IME owner).
+fn assert_ime_owner(s: &Session, expected: u64, why: &str) {
+    assert_eq!(ime_owner(s), expected, "{why}");
+}
+
+/// The editor's document was replaced (new IME owner/epoch).
+fn assert_ime_epoch_changed(s: &Session, previous: u64, why: &str) {
+    assert_ne!(ime_owner(s), previous, "{why}");
+}
+
+fn assert_text(s: &Session, t: u64, expected: &str) {
+    assert_eq!(doc(s, t).text, expected);
+}
+
+/// A new, empty composition called "Other" (the standard second comp).
+fn new_other_comp(s: &mut Session) -> u64 {
+    s.execute("comp.new", json!({"name": "Other", "width": 320, "height": 180, "duration": 2})).unwrap()["comp"].as_u64().unwrap()
+}
+
+/// Stopwatch the layer's Source Text (one key at the CTI).
+fn animate_source(s: &mut Session, t: u64) {
+    s.execute("prop.toggleAnimation", json!({"layer": t, "path": "text/sourceText"})).unwrap();
+}
+
+/// Add a Source Text key at `time`.
+fn add_source_key(s: &mut Session, t: u64, time: f64, value: &str) {
+    s.execute("prop.addKey", json!({"layer": t, "path": "text/sourceText", "time": time, "value": value})).unwrap();
+}
+
+/// Write Source Text as a static value (a replacement when it differs from the shown text).
+fn set_source(s: &mut Session, t: u64, value: &str) {
+    s.execute("prop.set", json!({"layer": t, "path": "text/sourceText", "value": value})).unwrap();
+}
+
+/// Write the Source Text key at `time`.
+fn set_source_key(s: &mut Session, t: u64, time: f64, value: &str) {
+    s.execute("prop.set", json!({"layer": t, "path": "text/sourceText", "time": time, "value": value})).unwrap();
+}
+
+/// Set the Source Text key at the CTI (`keys.set`).
+fn set_source_cti_key(s: &mut Session, t: u64, time: f64, value: &str) {
+    s.execute("keys.set", json!({"layer": t, "path": "text/sourceText", "time": time, "value": value})).unwrap();
+}
+
+/// Replace the whole Source Text of the layer (`layer.setText`).
+fn replace_text(s: &mut Session, t: u64, text: &str) {
+    s.execute("layer.setText", json!({"layer": t, "text": text})).unwrap();
+}
+
+/// Select the character range `start..end` in the open editor.
+fn select(s: &mut Session, start: usize, end: usize) {
+    s.execute("text.setSelection", json!({"start": start, "end": end})).unwrap();
+}
+
+/// Set both selection ends, keeping their direction (`anchor` is the other end).
+fn select_anchor(s: &mut Session, anchor: usize, caret: usize) {
+    s.execute("text.setSelection", json!({"anchor": anchor, "caret": caret})).unwrap();
+}
+
+#[test]
+fn set_text_with_a_range_creates_runs_and_undoes() {
+    let (mut s, t) = session("Hello World");
+    s.execute("layer.setText", json!({"layer": t, "range": [6, 11], "size": 30, "fill": "#ff0000", "kerning": "optical"})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.runs().len(), 2);
+    assert_eq!(d.style_at(0).size, 60.0);
+    assert_eq!(d.style_at(7).size, 30.0);
+    assert_eq!(d.style_at(7).fill, [1.0, 0.0, 0.0, 1.0]);
+    assert_eq!(d.style_at(7).kerning, Kerning::Optical);
+    // Paragraph attributes apply to the paragraphs the range touches; document ones to all.
+    s.execute("layer.setText", json!({"layer": t, "range": [0, 1], "justify": "justifyAll", "indentFirst": 20, "spaceAfter": 6, "direction": "rtl"})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!((d.justify, d.indent_first, d.space_after), (Justify::JustifyAll, 20.0, 6.0));
+    // Unknown attributes and bad values are errors (nothing changes).
+    assert!(s.execute("layer.setText", json!({"layer": t, "sizee": 3})).is_err());
+    assert!(s.execute("layer.setText", json!({"layer": t, "size": "big"})).is_err());
+    assert!(s.execute("edit.undo", json!({})).is_ok());
+    assert_eq!(doc(&s, t).justify, Justify::Left);
+    assert!(s.execute("edit.undo", json!({})).is_ok());
+    assert!(doc(&s, t).is_uniform());
+    s.execute("edit.redo", json!({})).unwrap();
+    assert_eq!(doc(&s, t).runs().len(), 2);
+    // Without a range everything changes and the runs collapse again.
+    s.execute("layer.setText", json!({"layer": t, "size": 44, "superscript": true})).unwrap();
+    let d = doc(&s, t);
+    assert!(d.runs().iter().all(|r| r.style.size == 44.0 && r.style.baseline == BaselineOption::Superscript));
+    // Replacing a range's text keeps the formatting around it.
+    s.execute("layer.setText", json!({"layer": t, "range": [0, 5], "text": "Howdy", "fauxBold": true})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.text, "Howdy World");
+    assert!(d.style_at(2).faux_bold && !d.style_at(7).faux_bold);
+}
+
+#[test]
+fn typing_deleting_and_caret_movement() {
+    let (mut s, t) = session("abc def");
+    s.execute("text.edit", json!({"layer": t})).unwrap();
+    assert_eq!(sel(&s), (0, 7), "editing starts with everything selected");
+    s.execute("text.setSelection", json!({"start": 3})).unwrap();
+    s.execute("text.insert", json!({"text": "XY", "merge": "typing-1"})).unwrap();
+    s.execute("text.insert", json!({"text": "Z", "merge": "typing-1"})).unwrap();
+    assert_eq!(doc(&s, t).text, "abcXYZ def");
+    assert_eq!(sel(&s), (6, 6));
+    // One undo step for the merged typing.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc(&s, t).text, "abc def");
+    assert_eq!(sel(&s), (6, 6));
+    s.execute("edit.redo", json!({})).unwrap();
+    s.execute("text.setSelection", json!({"start": 6})).unwrap();
+    // Backspace / Delete, by character and by word.
+    s.execute("text.delete", json!({})).unwrap();
+    assert_eq!(doc(&s, t).text, "abcXY def");
+    s.execute("text.delete", json!({"direction": "forward", "word": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "abcXY");
+    s.execute("text.delete", json!({"word": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "");
+    s.execute("text.insert", json!({"text": "one two\nthree"})).unwrap();
+    assert_eq!(sel(&s), (13, 13));
+    // Caret movement: words, lines, up / down, extend.
+    let mv = |s: &mut Session, to: &str, extend: bool| -> (usize, usize) {
+        let r = s.execute("text.moveCaret", json!({"to": to, "extend": extend})).unwrap();
+        (r["anchor"].as_u64().unwrap() as usize, r["caret"].as_u64().unwrap() as usize)
+    };
+    assert_eq!(mv(&mut s, "lineStart", false), (8, 8));
+    assert_eq!(mv(&mut s, "up", false).1, 0);
+    assert_eq!(mv(&mut s, "wordRight", false), (3, 3));
+    assert_eq!(mv(&mut s, "wordRight", true), (3, 7));
+    assert_eq!(mv(&mut s, "left", false), (3, 3), "left collapses a selection to its start");
+    assert_eq!(mv(&mut s, "lineEnd", false), (7, 7));
+    assert_eq!(mv(&mut s, "down", false).1, 13);
+    assert_eq!(mv(&mut s, "start", true), (13, 0));
+    assert_eq!(mv(&mut s, "paraEnd", false), (7, 7));
+    // Select All while editing selects the text, not the layers.
+    s.execute("edit.selectAll", json!({})).unwrap();
+    assert_eq!(sel(&s), (0, 13));
+    // Undo past the insertion clamps the selection.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert!(sel(&s).0 <= doc(&s, t).char_len() && sel(&s).1 <= doc(&s, t).char_len());
+    s.execute("text.endEdit", json!({})).unwrap();
+    assert!(s.state.text_edit.is_none());
+}
+
+#[test]
+fn caret_style_applies_to_the_next_typed_text() {
+    let (mut s, t) = session("ab");
+    s.execute("text.edit", json!({"layer": t, "caret": 1})).unwrap();
+    s.execute("layer.setText", json!({"layer": t, "range": [1, 1], "size": 12, "fill": [0, 1, 0]})).unwrap();
+    assert!(doc(&s, t).is_uniform(), "a caret-only change doesn't touch the text");
+    s.execute("text.insert", json!({"text": "Q"})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.text, "aQb");
+    assert_eq!(d.style_at(1).size, 12.0);
+    assert_eq!(d.style_at(1).fill, [0.0, 1.0, 0.0, 1.0]);
+    assert_eq!(d.style_at(2).size, 60.0);
+    // Typing again continues the new style (the character before the caret).
+    s.execute("text.insert", json!({"text": "R"})).unwrap();
+    assert_eq!(doc(&s, t).style_at(2).size, 12.0);
+}
+
+#[test]
+fn clipboard_and_paste_formatting() {
+    let (mut s, t) = session("red plain");
+    s.execute("layer.setText", json!({"layer": t, "range": [0, 3], "fill": "#ff0000", "size": 20})).unwrap();
+    s.execute("text.edit", json!({"layer": t, "select": [0, 3]})).unwrap();
+    let r = s.execute("edit.copy", json!({})).unwrap();
+    assert_eq!(r["text"], "red");
+    // Paste keeps the copied formatting.
+    s.execute("text.setSelection", json!({"start": 9})).unwrap();
+    s.execute("edit.paste", json!({})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.text, "red plainred");
+    assert_eq!(d.style_at(10).fill, [1.0, 0.0, 0.0, 1.0]);
+    assert_eq!(sel(&s), (12, 12));
+    // Different text from the system clipboard pastes in the caret's style.
+    s.execute("text.setSelection", json!({"start": 4})).unwrap();
+    s.execute("edit.paste", json!({"text": "new "})).unwrap();
+    assert_eq!(doc(&s, t).text, "red new plainred");
+    assert_eq!(doc(&s, t).style_at(5).size, 60.0);
+    // Paste Text and Match Formatting: the copied text in the caret's style.
+    s.execute("text.setSelection", json!({"start": 8})).unwrap();
+    s.execute("edit.pasteTextMatchFormatting", json!({})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.text, "red new redplainred");
+    assert_eq!(d.style_at(9).fill, [1.0; 4]);
+    // Paste Text Formatting Only onto a selection.
+    s.execute("text.setSelection", json!({"start": 11, "end": 16})).unwrap();
+    s.execute("edit.pasteTextFormattingOnly", json!({})).unwrap();
+    let d = doc(&s, t);
+    assert_eq!(d.style_at(12).fill, [1.0, 0.0, 0.0, 1.0]);
+    assert_eq!(d.style_at(12).size, 20.0);
+    // Cut removes the selection.
+    s.execute("text.setSelection", json!({"start": 0, "end": 4})).unwrap();
+    assert_eq!(s.execute("edit.cut", json!({})).unwrap()["text"], "red ");
+    assert_eq!(doc(&s, t).text, "new redplainred");
+    // Not editing: Paste Text Formatting Only restyles the whole selected text layer.
+    s.execute("text.endEdit", json!({})).unwrap();
+    s.execute("layer.select", json!({"layers": [t]})).unwrap();
+    s.execute("edit.pasteTextFormattingOnly", json!({})).unwrap();
+    assert!(doc(&s, t).is_uniform());
+    assert_eq!(doc(&s, t).size, 20.0);
+}
+
+#[test]
+fn type_tool_layers_point_box_and_empty_cleanup() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let t = s.execute("layer.newText", json!({"text": "", "position": [100, 200], "justify": "left", "edit": true})).unwrap()["layer"].as_u64().unwrap();
+    assert_eq!(s.state.text_edit.as_ref().map(|e| e.layer.0), Some(t));
+    // Leaving an untouched Type-tool layer deletes it.
+    s.execute("text.endEdit", json!({})).unwrap();
+    assert!(s.active_comp().unwrap().layers.is_empty());
+    let b = s.execute("layer.newText", json!({"text": "", "box": [40, 50, 300, 120], "edit": true})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("text.insert", json!({"text": "Boxed"})).unwrap();
+    let d = doc(&s, b);
+    assert_eq!(d.box_size, Some([300.0, 120.0]));
+    assert_eq!(d.box_pos, [-150.0, -60.0]);
+    let l = s.active_comp().unwrap().layers[0].clone();
+    assert_eq!(l.name, "Boxed", "named after its text");
+    let pos = l.props.prop("transform/position").unwrap().value.as_vec3();
+    assert_eq!([pos[0], pos[1]], [190.0, 110.0]);
+    s.execute("text.endEdit", json!({})).unwrap();
+    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
+    // Resizing the box (layer space) is an attribute too.
+    s.execute("layer.setText", json!({"layer": b, "box": [-100, -60, 200, 120]})).unwrap();
+    assert_eq!(doc(&s, b).box_size, Some([200.0, 120.0]));
+    s.execute("layer.setText", json!({"layer": b, "vertical": true})).unwrap();
+    assert!(doc(&s, b).vertical);
+}
+
+#[test]
+fn edit_state_round_trips_through_serde() {
+    let (mut s, t) = session("abc");
+    s.execute("text.edit", json!({"layer": t, "select": [1, 2]})).unwrap();
+    let j = serde_json::to_value(&s.state).unwrap();
+    let back: crate::EditorState = serde_json::from_value(j).unwrap();
+    let before = s.state.text_edit.clone().expect("editing");
+    let after = back.text_edit.clone().expect("editing");
+    assert_eq!((after.layer, after.anchor, after.caret), (before.layer, before.anchor, before.caret));
+    assert_ne!(after.session, before.session, "a restored editor gets a process-unique replacement epoch");
+    assert_ne!(after.session, 0, "the restored epoch is always a real session token");
+}
+
+#[test]
+fn ime_session_epoch_tracks_replaced_text_and_layer_restoration() {
+    let (mut s, t) = editing_all("abc");
+    let first = ime_owner(&s);
+
+    // Replacing Source Text is a new document even though the layer id stays.
+    replace_text(&mut s, t, "replaced");
+    let replaced = ime_owner(&s);
+    assert_ne!(replaced, first, "layer.setText starts a new IME epoch");
+
+    // Undo restores another document: it must not revive the token from before either edit.
+    s.execute("edit.undo", json!({})).unwrap();
+    let undone = ime_owner(&s);
+    assert_ne!(undone, replaced);
+    assert_ne!(undone, first);
+
+    // Clear + immediate undo in the same command sequence: the layer is gone long enough to
+    // end the session, and the restored layer cannot inherit a composition.
+    begin_edit(&mut s, t);
+    s.execute("edit.clear", json!({"layers": [t]})).unwrap();
+    assert!(s.state.text_edit.is_none(), "clearing the edited layer ends the session");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert!(s.state.text_edit.is_none(), "undo does not recreate the old composition session");
+    begin_edit(&mut s, t);
+    assert_ne!(ime_owner(&s), first);
+}
+
+#[test]
+fn no_op_ime_deletion_keeps_a_static_plain_text_value_and_records_no_step() {
+    use effectcraft_keyframe::Value as KV;
+    let (mut s, t) = session("abc");
+    // Legacy/imported text can still be stored as a plain Str rather than a TextDoc.
+    let cid = s.active_comp_id().unwrap();
+    let pr = std::sync::Arc::make_mut(&mut s.project)
+        .comp_mut(cid)
+        .unwrap()
+        .layer_mut(effectcraft_project::LayerId(t))
+        .unwrap()
+        .props
+        .prop_mut("text/sourceText")
+        .unwrap();
+    pr.value = KV::Str("abc".into());
+    begin_edit_at(&mut s, t, 0);
+    let steps = undo_steps(&s);
+
+    // A non-zero before count at the document start deletes nothing.
+    s.execute("text.deleteSurrounding", json!({"before": 1, "after": 0})).unwrap();
+
+    let pr = s.active_comp().unwrap().layer(effectcraft_project::LayerId(t)).unwrap().props.prop("text/sourceText").unwrap();
+    assert!(matches!(&pr.value, KV::Str(_)), "a no-op keeps the static Str variant");
+    assert!(pr.keys.is_empty());
+    assert_eq!(undo_steps(&s), steps, "a no-op adds no undo step");
+}
+
+#[test]
+fn no_op_ime_deletion_does_not_add_a_keyframe_to_animated_source_text() {
+    let (mut s, t) = editing("abc", 0);
+    animate_source(&mut s, t);
+    let lid = effectcraft_project::LayerId(t);
+    let keys = |s: &Session| s.active_comp().unwrap().layer(lid).unwrap().props.prop("text/sourceText").unwrap().keys.len();
+    assert_eq!(keys(&s), 1, "one key from the stopwatch");
+    s.execute("time.set", json!({"time": 1.0})).unwrap();
+    let steps = undo_steps(&s);
+
+    // A non-zero before count at the document start deletes nothing, at a time with no key.
+    s.execute("text.deleteSurrounding", json!({"before": 1, "after": 0})).unwrap();
+
+    assert_eq!(keys(&s), 1, "a no-op does not key Source Text at the CTI");
+    assert_eq!(undo_steps(&s), steps, "a no-op adds no undo step");
+}
+
+#[test]
+fn property_writes_replace_the_edited_document_only_when_the_text_changes() {
+    let (mut s, t) = session("abc");
+    let other = s.execute("layer.newText", json!({"text": "other"})).unwrap()["layer"].as_u64().unwrap();
+    begin_edit_at(&mut s, t, 1);
+    let owner = ime_owner(&s);
+    let steps = undo_steps(&s);
+
+    // Writing the text the document already has is a no-op: same document, same owner, no step.
+    set_source(&mut s, t, "abc");
+    assert_ime_owner(&s, owner, "a no-op write keeps the IME owner");
+    assert_eq!(undo_steps(&s), steps, "a no-op write records no undo step");
+    replace_text(&mut s, t, "abc");
+    assert_ime_owner(&s, owner, "a no-op layer.setText keeps the IME owner");
+    assert_eq!(undo_steps(&s), steps, "a no-op layer.setText records no undo step");
+
+    // Another property of the edited layer leaves its document alone.
+    s.execute("prop.set", json!({"layer": t, "path": "transform/opacity", "value": 50})).unwrap();
+    assert_ime_owner(&s, owner, "an unrelated property keeps the IME owner");
+
+    // Source Text of another layer is not the editor's document either.
+    set_source(&mut s, other, "changed");
+    assert_ime_owner(&s, owner, "another layer's text keeps the IME owner");
+
+    // Replacing the edited layer's Source Text is a document replacement: a new IME epoch.
+    set_source(&mut s, t, "replaced");
+    assert_text(&s, t, "replaced");
+    assert_ime_epoch_changed(&s, owner, "replacing the document changes the IME owner");
+}
+
+#[test]
+fn undo_and_redo_of_an_unrelated_property_keep_the_ime_owner_and_selection() {
+    let (mut s, t) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+
+    s.execute("prop.set", json!({"layer": t, "path": "transform/opacity", "value": 50})).unwrap();
+    assert_ime_owner(&s, owner, "the opacity write keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "the opacity write keeps the selection");
+
+    // The opacity step does not change Source Text: restoring it keeps the same editor.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_ime_owner(&s, owner, "undoing only opacity keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "undoing only opacity keeps the selection");
+
+    s.execute("edit.redo", json!({})).unwrap();
+    assert_ime_owner(&s, owner, "redoing only opacity keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "redoing only opacity keeps the selection");
+}
+
+#[test]
+fn a_style_only_text_change_and_its_undo_replace_the_editor_epoch() {
+    let (mut s, t) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+
+    // The same characters with another run style are still a different document.
+    s.execute("layer.setText", json!({"layer": t, "range": [1, 4], "size": 12})).unwrap();
+    assert_eq!(doc(&s, t).text, "abcdef");
+    assert_eq!(doc(&s, t).style_at(2).size, 12.0);
+    assert_ime_epoch_changed(&s, owner, "a style-only change starts a new IME epoch");
+    assert_eq!(sel(&s), (3, 3), "a same-length style change keeps the caret in range");
+    let styled = ime_owner(&s);
+
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc(&s, t).style_at(2).size, 60.0);
+    assert_ime_epoch_changed(&s, styled, "undoing a style change starts a new IME epoch");
+}
+
+#[test]
+fn history_jumps_keep_the_owner_over_unrelated_steps_and_replace_it_when_the_text_changes() {
+    let (mut s, t) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+    s.execute("prop.set", json!({"layer": t, "path": "transform/opacity", "value": 50})).unwrap();
+    s.execute("prop.set", json!({"layer": t, "path": "transform/opacity", "value": 25})).unwrap();
+    let states = s.execute("edit.history.list", json!({})).unwrap()["states"].as_array().unwrap().clone();
+    let cur = states.iter().find(|n| n["current"] == true).unwrap()["index"].as_u64().unwrap();
+    let parent = states.iter().find(|n| n["index"].as_u64() == Some(cur)).unwrap()["parent"].as_u64().unwrap();
+
+    // Both states show the same Source Text: jumping between them keeps the editor.
+    s.execute("edit.history.goto", json!({"index": parent})).unwrap();
+    assert_ime_owner(&s, owner, "jumping to another opacity state keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "and the selection");
+    s.execute("edit.history.goto", json!({"index": cur})).unwrap();
+    assert_ime_owner(&s, owner, "jumping back keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "and the selection");
+
+    // A history state whose Source Text differs is a document replacement.
+    set_source(&mut s, t, "abc");
+    let changed = ime_owner(&s);
+    assert_ne!(changed, owner);
+    s.execute("edit.history.goto", json!({"index": parent})).unwrap();
+    assert_text(&s, t, "abcdef");
+    assert_ime_epoch_changed(&s, changed, "jumping to a different document starts a new epoch");
+}
+
+#[test]
+fn atomic_batch_rollback_keeps_the_owner_for_unrelated_steps_and_replaces_it_for_text_changes() {
+    let (mut s, t) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "prop.set", "params": {"layer": t, "path": "transform/opacity", "value": 50}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_ime_owner(&s, owner, "rolling back an unrelated step keeps the owner");
+    assert_eq!(sel(&s), (3, 3), "and the selection");
+
+    // A partially applied text replacement was still shown before the rollback restores the
+    // original document, so the editor must not revive the composition it had before the batch.
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "layer.setText", "params": {"layer": t, "text": "ab"}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_text(&s, t, "abcdef");
+    assert_ime_epoch_changed(&s, owner, "a rolled-back text change does not revive the old owner");
+    assert_eq!(sel(&s), (3, 3), "the restored document keeps the caret in range");
+}
+
+#[test]
+fn atomic_batch_rollback_after_a_transient_editor_restart_bumps_the_epoch() {
+    let (mut s, t) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+
+    // `text.edit` restarts the session even on the layer that is already edited. The rollback
+    // restores the pre-batch TextEdit (with the old token), so the intermediate restart must be
+    // detected from the snapshot: neither the old composition nor its token may be revived.
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "text.edit", "params": {"layer": t, "caret": 1}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(sel(&s), (3, 3), "the restored selection is the pre-batch one");
+    assert_ime_epoch_changed(&s, owner, "a canceled intermediate editor must not revive the old token");
+}
+
+#[test]
+fn atomic_batch_rollback_after_a_cross_comp_editor_switch_bumps_the_epoch() {
+    let (mut s, t) = session("abcdef");
+    let original = s.active_comp_id().unwrap();
+    // Give the other comp a layer with the same id and the same Source Text, so only the comp
+    // and editor-session identity distinguishes the two editors.
+    let layer = s.active_comp().unwrap().layer(effectcraft_project::LayerId(t)).unwrap().clone();
+    let other = new_other_comp(&mut s);
+    let other_id = effectcraft_project::ItemId(other);
+    std::sync::Arc::make_mut(&mut s.project).comp_mut(other_id).unwrap().layers.push(layer);
+    s.execute("comp.open", json!({"comp": original.0})).unwrap();
+    begin_edit_at(&mut s, t, 3);
+    let owner = ime_owner(&s);
+
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "comp.open", "params": {"comp": other}},
+            {"command": "text.edit", "params": {"layer": t, "caret": 1}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(s.active_comp_id(), Some(original), "the batch restored the original comp");
+    assert_eq!(sel(&s), (3, 3), "and the pre-batch selection");
+    assert_ime_epoch_changed(&s, owner, "an identical layer in another comp must not revive the old token");
+}
+
+#[test]
+fn an_atomic_batch_drops_the_events_its_failed_steps_queued() {
+    let (mut s, _) = session("abcdef");
+    let original = s.active_comp_id().unwrap();
+    // `comp.new` opens the comp it creates; go back so the batch's switch is a real one.
+    let other = new_other_comp(&mut s);
+    s.execute("comp.open", json!({"comp": original.0})).unwrap();
+    s.drain_events();
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "comp.open", "params": {"comp": other}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(s.active_comp_id(), Some(original), "the batch restored the original comp");
+    assert!(
+        !s.drain_events().iter().any(|e| matches!(e, crate::Event::OpenComp(id) if id.0 == other)),
+        "the rolled-back step's OpenComp is not queued for the UI"
+    );
+}
+
+#[test]
+fn atomic_batch_rollback_after_closing_the_editor_does_not_revive_it() {
+    let (mut s, t) = session("abcdef");
+    let original = s.active_comp_id().unwrap();
+    let other = new_other_comp(&mut s);
+    s.execute("comp.open", json!({"comp": original.0})).unwrap();
+    begin_edit_at(&mut s, t, 3);
+    let owner = ime_owner(&s);
+
+    // The failing state has no editor at all: the restoration brings the pre-batch one back and
+    // must treat it as unverified rather than revive its composition.
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "comp.open", "params": {"comp": other}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert!(s.state.text_edit.is_some(), "the batch restored the editor state");
+    assert_eq!(sel(&s), (3, 3));
+    assert_ime_epoch_changed(&s, owner, "a canceled editor close must not revive the old token");
+}
+
+#[test]
+fn restoring_without_an_editor_snapshot_replaces_an_open_editor() {
+    let (mut s, _) = editing("abcdef", 3);
+    let owner = ime_owner(&s);
+
+    // `None` means no editor was open when the state was replaced; an editor that is open
+    // afterwards cannot prove it kept its document.
+    s.sanitize_after_replacement(None);
+    assert_ime_epoch_changed(&s, owner, "an unverified restored editor starts a new epoch");
+    assert_eq!(sel(&s), (3, 3));
+}
+
+#[test]
+fn undo_to_a_shorter_document_clamps_the_caret() {
+    let (mut s, t) = editing("abc", 3);
+    replace_text(&mut s, t, "abcdef");
+    select_anchor(&mut s, 6, 6);
+    let owner = ime_owner(&s);
+    assert_eq!(sel(&s), (6, 6));
+
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_text(&s, t, "abc");
+    assert_eq!(sel(&s), (3, 3), "undoing to a shorter document clamps the caret");
+    assert_ime_epoch_changed(&s, owner, "and starts a new epoch");
+}
+
+#[test]
+fn the_ime_stamp_revision_follows_the_editor_not_unrelated_project_edits() {
+    let (mut s, t) = editing("abcdef", 6);
+    let revision = ime_stamp_revision(&s);
+
+    s.execute("prop.set", json!({"layer": t, "path": "transform/opacity", "value": 50})).unwrap();
+    assert_eq!(ime_stamp_revision(&s), revision, "an unrelated property write does not advance it");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(ime_stamp_revision(&s), revision, "undoing it does not either");
+
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "prop.set", "params": {"layer": t, "path": "transform/opacity", "value": 25}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(ime_stamp_revision(&s), revision, "a rolled-back unrelated batch restores it");
+
+    s.execute("text.insert", json!({"text": "x"})).unwrap();
+    assert!(ime_stamp_revision(&s) > revision, "typing advances it");
+    let typed = ime_stamp_revision(&s);
+    s.execute("layer.setText", json!({"layer": t, "text": "y"})).unwrap();
+    assert!(ime_stamp_revision(&s) > typed, "a replaced document advances it too");
+}
+
+#[test]
+fn a_failed_atomic_batch_with_a_transient_edit_keeps_its_high_water_ime_revision() {
+    let (mut s, t) = editing("abcdef", 6);
+    let revision = ime_stamp_revision(&s);
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "text.insert", "params": {"text": "x"}},
+            {"command": "text.delete", "params": {}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_text(&s, t, "abcdef");
+    // The intermediate document edit is real even though the final document equals the
+    // pre-batch one: its stamp must remain the high-water mark.
+    assert!(ime_stamp_revision(&s) > revision, "a transient edit must not rewind the IME revision");
+    let after_transient = ime_stamp_revision(&s);
+
+    // An unrelated failed batch really did not edit the document: it must preserve the revision
+    // exactly, or every wide-selection composition would be canceled by unrelated work.
+    let r = s.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "prop.set", "params": {"layer": t, "path": "transform/opacity", "value": 25}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(ime_stamp_revision(&s), after_transient, "an unrelated rolled-back batch preserves the revision");
+}
+
+#[test]
+fn a_replacing_property_write_clamps_the_selection_so_the_next_backspace_deletes() {
+    let (mut s, t) = editing("abcdef", 6);
+    let owner = ime_owner(&s);
+
+    set_source(&mut s, t, "a");
+    assert_text(&s, t, "a");
+    assert_eq!(sel(&s), (1, 1), "the shortened document leaves the caret in range");
+    assert_ne!(ime_owner(&s), owner);
+
+    // Backspace at the clamped caret removes the character instead of no-opping on 5..6.
+    s.execute("text.delete", json!({})).unwrap();
+    assert_text(&s, t, "");
+    assert_eq!(sel(&s), (0, 0));
+}
+
+#[test]
+fn keyframe_writes_on_source_text_replace_the_edited_document_only_when_the_cti_value_changes() {
+    let (mut s, t) = editing("abc", 1);
+    // Keying the text the CTI already shows leaves the document equal.
+    animate_source(&mut s, t);
+    let owner = ime_owner(&s);
+
+    set_source_cti_key(&mut s, t, 0.0, "abc");
+    assert_ime_owner(&s, owner, "a no-op key write keeps the IME owner");
+
+    // `keys.set` changes the key at the CTI: a document replacement.
+    set_source_cti_key(&mut s, t, 0.0, "replaced");
+    assert_text(&s, t, "replaced");
+    assert_ime_epoch_changed(&s, owner, "a changed keyframe changes the IME owner");
+}
+
+#[test]
+fn deleting_the_cti_keyframe_first_replaces_the_document_then_the_last_key_is_a_noop() {
+    let (mut s, t) = editing("abc", 1);
+    animate_source(&mut s, t);
+    add_source_key(&mut s, t, 1.0, "later");
+    let owner = ime_owner(&s);
+    let lid = effectcraft_project::LayerId(t);
+    let pr = s.active_comp().unwrap().layer(lid).unwrap().props.prop("text/sourceText").unwrap();
+    let uid = pr.uid;
+    let times: Vec<_> = pr.keys.iter().map(|k| k.time).collect();
+    assert_eq!(times.len(), 2);
+
+    // Deleting the key at the CTI (0s) while the 1s key remains shows the later text: replacing
+    // the document starts a new epoch.
+    s.state.selected_keys = vec![crate::KeyRef { layer: lid, prop: uid, time: times[0] }];
+    assert_eq!(s.execute("keys.delete", json!({})).unwrap(), json!(1));
+    assert_text(&s, t, "later");
+    let replaced = ime_owner(&s);
+    assert_ne!(replaced, owner, "deleting the CTI key changed the document");
+
+    // Removing the last key turns its value into the static CTI value. That value is what the
+    // CTI already showed, so the document does not change and the new owner stays.
+    s.state.selected_keys = vec![crate::KeyRef { layer: lid, prop: uid, time: times[1] }];
+    assert_eq!(s.execute("keys.delete", json!({})).unwrap(), json!(1));
+    assert_text(&s, t, "later");
+    assert_ime_owner(&s, replaced, "removing the last key is a document no-op");
+}
+
+#[test]
+fn moving_the_cti_to_a_shorter_animated_key_clamps_and_starts_a_new_epoch() {
+    let (mut s, t) = session("abcdef");
+    animate_source(&mut s, t);
+    add_source_key(&mut s, t, 1.0, "a");
+    begin_edit_at(&mut s, t, 6);
+    let owner = ime_owner(&s);
+
+    // The same time still shows the same document: no new epoch.
+    s.execute("time.set", json!({"time": 0.0})).unwrap();
+    assert_text(&s, t, "abcdef");
+    assert_ime_owner(&s, owner, "an unchanged CTI document keeps the IME owner");
+
+    // The key at 1s holds shorter text: the document changes, the selection is clamped and the
+    // editor gets a new epoch.
+    s.execute("time.set", json!({"time": 1.0})).unwrap();
+    assert_text(&s, t, "a");
+    assert_eq!(sel(&s), (1, 1), "the shortened document leaves the caret in range");
+    let replaced = ime_owner(&s);
+    assert_ne!(replaced, owner, "a changed CTI document starts a new IME epoch");
+
+    // Backspace at the clamped caret removes the character instead of no-opping on 5..6.
+    s.execute("text.delete", json!({})).unwrap();
+    assert_text(&s, t, "");
+    assert_eq!(sel(&s), (0, 0));
+    assert_ime_owner(&s, replaced, "typing after the replacement keeps its owner");
+
+    // Staying at the same time after the edit is a no-op for the document too.
+    s.execute("time.set", json!({"time": 1.0})).unwrap();
+    assert_text(&s, t, "");
+    assert_ime_owner(&s, replaced, "a no-op time move keeps the IME owner");
+}
+
+#[test]
+fn sync_related_times_replaces_the_edited_document_when_it_moves_the_active_comp() {
+    let (mut s, t) = session("abcdef");
+    animate_source(&mut s, t);
+    add_source_key(&mut s, t, 1.0, "a");
+    let outer = s.active_comp_id().unwrap();
+    let r = s.execute("layer.precompose", json!({"layers": [t], "name": "Inner", "open": true})).unwrap();
+    let inner = effectcraft_project::ItemId(r["comp"].as_u64().unwrap());
+    assert_eq!(s.active_comp_id(), Some(inner));
+
+    begin_edit_at(&mut s, t, 6);
+    let owner = ime_owner(&s);
+    s.sync_related_times(outer, effectcraft_time::Tick::from_seconds_f64(1.0));
+
+    assert_text(&s, t, "a");
+    assert_eq!(sel(&s), (1, 1), "the related time move clamps the selection");
+    assert_ime_epoch_changed(&s, owner, "the related time move changed the document");
+}
+
+#[test]
+fn applying_a_preset_that_writes_source_text_replaces_the_edited_document() {
+    let (mut s, t) = editing("abc", 1);
+    let owner = ime_owner(&s);
+    let preset = json!({
+        "effectcraftAnimationPreset": 1,
+        "properties": [{"path": "text/sourceText", "value": {"t": "Text", "v": {"text": "replaced"}}, "keys": []}],
+    });
+    s.execute("anim.applyPreset", json!({"preset": preset, "layers": [t]})).unwrap();
+    assert_text(&s, t, "replaced");
+    assert_ime_epoch_changed(&s, owner, "a preset that replaces source text changes the IME owner");
+}
+
+#[test]
+fn a_failed_property_write_keeps_the_edited_document_and_its_owner() {
+    let (mut s, t) = editing("abc", 1);
+    let owner = ime_owner(&s);
+    let steps = undo_steps(&s);
+
+    // null cannot coerce to a Text value: the edit fails before anything is committed.
+    assert!(s.execute("prop.set", json!({"layer": t, "path": "text/sourceText", "value": null})).is_err());
+    assert_text(&s, t, "abc");
+    assert_ime_owner(&s, owner, "a failed write keeps the IME owner");
+    assert_eq!(undo_steps(&s), steps, "a failed write records no undo step");
+}
+
+#[test]
+fn property_writes_off_the_cti_keep_the_owner_until_they_change_the_cti_document() {
+    let (mut s, t) = editing("abc", 1);
+    animate_source(&mut s, t);
+    add_source_key(&mut s, t, 1.0, "later");
+    let owner = ime_owner(&s);
+
+    // Writing a key at 1s leaves the CTI (0s) value as it was.
+    set_source_key(&mut s, t, 1.0, "changed");
+    assert_text(&s, t, "abc");
+    assert_ime_owner(&s, owner, "an off-CTI write keeps the IME owner");
+
+    // Writing the CTI value itself replaces the document.
+    set_source(&mut s, t, "cti");
+    assert_text(&s, t, "cti");
+    assert_ime_epoch_changed(&s, owner, "a CTI write changes the IME owner");
+}
+
+#[test]
+fn unrelated_project_cleanup_keeps_the_ime_owner_but_replacement_changes_it() {
+    let (mut s, t) = editing("abc", 1);
+    let owner = ime_owner(&s);
+
+    // file.removeUnusedFootage calls sanitize_state while the edited document is untouched.
+    s.execute("file.importSolid", json!({"name": "Unused"})).unwrap();
+    let removed = s.execute("file.removeUnusedFootage", json!({})).unwrap();
+    assert_eq!(removed["removed"], json!(1), "the unused solid was actually removed");
+    assert_ime_owner(&s, owner, "unrelated cleanup keeps the IME owner");
+
+    // Replacing the Source Text is a document replacement: a new owner.
+    replace_text(&mut s, t, "replaced");
+    assert_ime_epoch_changed(&s, owner, "replacing the document changes the owner");
+}
+
+#[test]
+fn ime_session_does_not_cross_a_composition_switch() {
+    let (mut s, _) = editing_all("abc");
+    let other = new_other_comp(&mut s);
+    s.execute("comp.open", json!({"comp": other})).unwrap();
+    assert!(s.state.text_edit.is_none(), "the old comp's editor is not reused in another comp");
+}
+
+#[test]
+fn removing_the_active_comp_does_not_retarget_its_text_editor() {
+    for replacement in [false, true] {
+        let (mut s, t) = session("original");
+        let original = s.active_comp_id().unwrap();
+        let layer = s.active_comp().unwrap().layer(effectcraft_project::LayerId(t)).unwrap().clone();
+        let other = new_other_comp(&mut s);
+        let other_id = effectcraft_project::ItemId(other);
+        std::sync::Arc::make_mut(&mut s.project).comp_mut(other_id).unwrap().layers.push(layer);
+        s.execute("comp.open", json!({"comp": other})).unwrap();
+        s.execute("comp.open", json!({"comp": original.0})).unwrap();
+        begin_edit_at(&mut s, t, 1);
+        assert!(s.state.text_edit.is_some());
+
+        // Reproduce cleanup after a project replacement, bypassing Session::edit's earlier
+        // document guard so this specifically exercises sanitize_state's fallback-comp branch.
+        let edited = crate::commands::text_edit::active_editor_snapshot(&s);
+        std::sync::Arc::make_mut(&mut s.project).items.remove(&original);
+        if replacement {
+            s.sanitize_after_replacement(edited.as_ref());
+        } else {
+            s.sanitize_state();
+        }
+        assert_eq!(s.active_comp_id(), Some(other_id));
+        assert!(s.state.text_edit.is_none(), "the same-numbered layer belongs to a different comp");
+        assert!(s.execute("text.insert", json!({"text": "wrong document"})).is_err());
+        assert_eq!(doc(&s, t).text, "original", "the fallback comp was not edited");
+    }
+}
+
+#[test]
+fn opentype_features_per_range_render_and_query() {
+    let (mut s, t) = session("Office 1/2");
+    s.execute("layer.setText", json!({"layer": t, "range": [7, 10], "fractions": true, "ss01": true})).unwrap();
+    let d = doc(&s, t);
+    assert!(!d.style_at(0).opentype.fractions);
+    assert!(d.style_at(8).opentype.fractions && d.style_at(8).opentype.stylistic_set(1));
+    // The laid-out glyphs change (frac turns 1/2 into a fraction).
+    let plain = effectcraft_text::layout_doc(&TextDoc { text: "1/2".into(), ..Default::default() });
+    let frac = effectcraft_text::layout_doc(&d.slice(7..10));
+    let ids = |l: &effectcraft_text::TextLayout| l.glyphs.iter().map(|g| g.gid).collect::<Vec<_>>();
+    assert_ne!(ids(&plain), ids(&frac));
+    // Undo restores the uniform style.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert!(doc(&s, t).is_uniform());
+    // Font feature query (font by name, or the layer's).
+    let f = s.execute("text.fontFeatures", json!({"font": "Noto Serif"})).unwrap();
+    assert_eq!(f["options"]["smallCaps"], true);
+    assert!(f["features"].as_array().unwrap().iter().any(|t| t == "onum"));
+    let f = s.execute("text.fontFeatures", json!({"layer": t})).unwrap();
+    assert_eq!(f["family"], "Inter");
+    assert!(f["options"]["stylisticSets"].as_array().unwrap().contains(&json!(1)));
+    assert_eq!(f["options"]["smallCaps"], false);
+}
+
+#[test]
+fn fonts_lists_bundled_and_installed_families() {
+    let mut s = Session::default();
+    let r = s.execute("text.fonts", json!({})).unwrap();
+    let fams = r["families"].as_array().unwrap();
+    assert_eq!(r["count"].as_u64().unwrap() as usize, fams.len());
+    let inter = fams.iter().find(|f| f["family"] == "Inter").unwrap();
+    assert_eq!(inter["origin"], "bundled");
+    assert!(inter["styles"].as_array().unwrap().contains(&json!("Bold")));
+    // Installed fonts are listed without any layer having asked for one.
+    use effectcraft_text::fonts::FontSource as _;
+    let installed = effectcraft_text::fonts::DirectorySource::system().faces();
+    for face in &installed {
+        assert!(fams.iter().any(|f| f["family"].as_str().unwrap().eq_ignore_ascii_case(&face.family)), "{} not listed", face.family);
+    }
+    // Filtered by name; rescanning keeps what was there.
+    let r = s.execute("text.fonts", json!({"query": "noto ser", "rescan": true})).unwrap();
+    assert_eq!(r["families"][0]["family"], "Noto Serif");
+    // The bundled face is Regular; the OS can also provide Bold, Italic, or other faces.
+    // Compare against the independent directory inventory rather than assuming an empty OS.
+    let mut expected_styles = std::collections::BTreeSet::from(["Regular".to_string()]);
+    expected_styles.extend(installed.iter().filter(|face| face.family.eq_ignore_ascii_case("Noto Serif")).map(|face| face.style.clone()));
+    let styles: Vec<String> = r["families"][0]["styles"].as_array().unwrap().iter().map(|style| style.as_str().unwrap().to_string()).collect();
+    assert_eq!(styles.iter().cloned().collect::<std::collections::BTreeSet<_>>(), expected_styles);
+    assert_eq!(styles.len(), expected_styles.len(), "style menu has no duplicates");
+    assert!(r["families"].as_array().unwrap().iter().all(|f| f["family"].as_str().unwrap().to_lowercase().contains("noto ser")));
+    // The style menus offer a family's own styles.
+    assert_eq!(crate::font_styles("noto serif"), styles);
+    assert_eq!(crate::font_styles("NOTO SERIF"), styles);
+    assert_eq!(crate::font_styles("No Such Family").len(), 5);
+}
+
+/// A big-endian `u16` array, as sfnt tables store them.
+fn u16s(v: &[u16]) -> Vec<u8> {
+    v.iter().flat_map(|x| x.to_be_bytes()).collect()
+}
+
+/// A `name` table with one Windows/Unicode English record per `(id, text)`.
+fn name_table(strings: &[(u16, String)]) -> Vec<u8> {
+    let enc: Vec<(u16, Vec<u8>)> = strings.iter().map(|(id, s)| (*id, s.encode_utf16().flat_map(|u| u.to_be_bytes()).collect())).collect();
+    let mut name = u16s(&[0, enc.len() as u16, 6 + 12 * enc.len() as u16]);
+    let mut off = 0;
+    for (id, st) in &enc {
+        name.extend(u16s(&[3, 1, 0x409, *id, st.len() as u16, off]));
+        off += st.len() as u16;
+    }
+    enc.iter().for_each(|(_, st)| name.extend(st));
+    name
+}
+
+/// A single-face font with `tables` in order (zero checksums, offsets after the directory).
+fn sfnt(tables: &[(&[u8; 4], Vec<u8>)]) -> Vec<u8> {
+    let mut out = u16s(&[1, 0, tables.len() as u16, 0, 0, 0]);
+    let mut body: Vec<u8> = vec![];
+    for (tag, data) in tables {
+        out.extend(*tag);
+        out.extend([0u8; 4]);
+        out.extend(((12 + 16 * tables.len() + body.len()) as u32).to_be_bytes());
+        out.extend((data.len() as u32).to_be_bytes());
+        body.extend(data);
+    }
+    out.extend(body);
+    out
+}
+
+/// A font file of just `name` (the family, Regular) and an `fvar` table with one axis pinned at
+/// 400 (so the helpers that look for an installed font with a real axis range never pick it).
+fn pinned_variable_font(family: &str) -> Vec<u8> {
+    let mut fvar = u16s(&[1, 0, 16, 2, 1, 20, 0, 8]);
+    fvar.extend(b"wght".iter().copied().chain(u16s(&[0x190, 0, 0x190, 0, 0x190, 0, 0, 256])));
+    let name = name_table(&[(1, family.to_owned()), (2, "Regular".to_owned())]);
+    sfnt(&[(b"fvar", fvar), (b"name", name)])
+}
+
+/// The font menu's Variable Fonts filter (After Effects 26.3): `text.fonts {variable: true}`
+/// lists only families with variation axes, every listing says which families are variable, and
+/// the font menu's rows carry the flag the filter uses.
+#[test]
+fn fonts_filter_variable_families() {
+    const FAMILY: &str = "EffectCraft Variable Filter Test";
+    assert_eq!(effectcraft_text::fonts::add_font_data(pinned_variable_font(FAMILY)).len(), 1);
+    let mut s = Session::default();
+    let all = s.execute("text.fonts", json!({})).unwrap();
+    let fams = all["families"].as_array().unwrap();
+    let flag = |name: &str| fams.iter().find(|f| f["family"] == name).map(|f| f["variable"].clone());
+    assert_eq!(flag("Inter"), Some(json!(false)), "the bundled fonts are static");
+    assert_eq!(flag(FAMILY), Some(json!(true)));
+    let var = s.execute("text.fonts", json!({"variable": true})).unwrap();
+    let listed = var["families"].as_array().unwrap();
+    assert_eq!(var["count"].as_u64(), Some(listed.len() as u64));
+    assert!(listed.iter().all(|f| f["variable"] == true), "{var}");
+    assert!(listed.iter().any(|f| f["family"] == FAMILY), "{var}");
+    assert!(listed.len() < fams.len(), "the filter drops the static families");
+    // Combined with the name query.
+    let both = s.execute("text.fonts", json!({"variable": true, "query": "variable filter"})).unwrap();
+    assert_eq!(both["families"].as_array().map(Vec::len), Some(1), "{both}");
+    let none = s.execute("text.fonts", json!({"variable": true, "query": "jetbrains mono"})).unwrap();
+    assert!(!none["families"].as_array().unwrap().iter().any(|f| f["family"] == "JetBrains Mono"), "{none}");
+    // The font menu's rows.
+    let menu = crate::font_menu(&s.prefs);
+    assert!(menu.iter().any(|r| r.family == FAMILY && r.variable));
+    assert!(menu.iter().any(|r| r.family == "Inter" && !r.variable));
+}
+
+/// A variable font of `name` and `fvar` only: one `wght` axis 100..900 (default 300, style
+/// `Light`) and the named `instances` (style, `wght`), each with a PostScript name
+/// `<family without spaces>-<style without spaces>`.
+fn instanced_variable_font(family: &str, instances: &[(&str, f32)]) -> Vec<u8> {
+    let squash = |s: &str| s.chars().filter(char::is_ascii_alphanumeric).collect::<String>();
+    let mut strings: Vec<(u16, String)> = vec![(1, family.into()), (2, "Light".into())];
+    let mut fvar = u16s(&[1, 0, 16, 2, 1, 20, instances.len() as u16, 10]);
+    fvar.extend(b"wght".iter().copied().chain(u16s(&[100, 0, 300, 0, 900, 0, 0, 256])));
+    for (i, (style, w)) in instances.iter().enumerate() {
+        let id = 256 + 2 * i as u16;
+        strings.push((id, (*style).into()));
+        strings.push((id + 1, format!("{}-{}", squash(family), squash(style))));
+        fvar.extend(u16s(&[id, 0]));
+        fvar.extend(((w * 65536.0) as i32).to_be_bytes());
+        fvar.extend(u16s(&[id + 1]));
+    }
+    sfnt(&[(b"fvar", fvar), (b"name", name_table(&strings))])
+}
+
+/// #1563: a variable font's named instances are styles of its family in `text.fonts`, and a
+/// text layer set in one (by style, or by the instance's PostScript name as After Effects scripts
+/// do) is laid out at the instance's axis values; an axis set on the text still wins.
+#[test]
+fn variable_font_named_instances_are_styles() {
+    const FAMILY: &str = "EffectCraft Named Instance Test";
+    assert_eq!(effectcraft_text::fonts::add_font_data(instanced_variable_font(FAMILY, &[("Light", 300.0), ("Regular", 400.0), ("Black", 900.0)])).len(), 1);
+    let (mut s, t) = session("Hi");
+    let fonts = s.execute("text.fonts", json!({"query": FAMILY})).unwrap();
+    assert_eq!(fonts["families"][0]["styles"], json!(["Light", "Regular", "Black"]), "{fonts}");
+    let wght = |s: &Session| -> Vec<Vec<(String, f32)>> { effectcraft_text::layout_doc(&doc(s, t)).glyphs.iter().map(|g| g.variations.clone()).collect() };
+    let black = vec![("wght".to_string(), 900.0)];
+    s.execute("layer.setText", json!({"layer": t, "font": FAMILY, "style": "Black"})).unwrap();
+    let by_style = wght(&s);
+    assert!(!by_style.is_empty() && by_style.iter().all(|v| v == &black), "{by_style:?}");
+    s.execute("layer.setText", json!({"layer": t, "font": "EffectCraftNamedInstanceTest-Black", "style": "Regular"})).unwrap();
+    let by_ps = wght(&s);
+    assert!(!by_ps.is_empty() && by_ps.iter().all(|v| v == &black), "{by_ps:?}");
+    s.execute("layer.setText", json!({"layer": t, "variations": {"wght": 650}})).unwrap();
+    assert!(wght(&s).iter().all(|v| v == &[("wght".to_string(), 650.0)]), "{:?}", wght(&s));
+}
+
+/// `layer.setText`'s schema lists every OpenType key as optional, so checked execution (control
+/// channel, MCP) accepts them and requires none (#520).
+#[test]
+fn set_text_schema_accepts_every_opentype_key_and_requires_none() {
+    let spec = crate::commands::find("layer.setText").unwrap();
+    let schema = crate::commands::params_schema(spec);
+    assert_eq!(schema["required"], json!([]));
+    for key in ["discretionaryLigatures", "ss01", "ss02", "ss20", "swash"] {
+        assert!(schema["properties"].get(key).is_some(), "{key} is not in the schema");
+    }
+    assert!(schema["properties"].get("OpenType").is_none());
+    let (mut s, t) = session("Office 1/2");
+    s.execute_checked("layer.setText", json!({"layer": t, "discretionaryLigatures": true, "ss02": true, "ss20": true})).unwrap();
+    assert!(doc(&s, t).style_at(0).opentype.stylistic_set(20));
+}
+
+/// Incoming IME replacement (stock `DeleteSurrounding` / the fork's `DeleteSurroundingBytes`):
+/// the characters around the selection go, the selected text stays for the following commit, and
+/// a byte count that ends inside a UTF-8 character leaves that character.
+#[test]
+fn ime_replacement_keeps_the_selection_and_never_splits_a_character() {
+    let (mut s, t) = editing_all("abcdef");
+    select(&mut s, 1, 4);
+    // One character before "bcd" and everything after it: the selection survives for the commit.
+    s.execute("text.deleteSurrounding", json!({"before": 1, "after": 99, "merge": "typing-0"})).unwrap();
+    assert_text(&s, t, "bcd");
+    assert_eq!(sel(&s), (0, 3), "the selection is kept for the commit that follows");
+    s.execute("text.insert", json!({"text": "X", "merge": "typing-0"})).unwrap();
+    assert_text(&s, t, "X");
+    assert_eq!(sel(&s), (1, 1));
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc(&s, t).text, "abcdef", "the surrounding delete and its commit are one undo step");
+    // An empty count is a no-op (deletion-only batches, empty commits), never an undo step.
+    s.execute("edit.redo", json!({})).unwrap();
+    select(&mut s, 0, 1);
+    s.execute("text.deleteSurrounding", json!({"before": 0, "after": 0})).unwrap();
+    assert_text(&s, t, "X");
+
+    // Byte counts end inside a character: it stays whole (never a split UTF-8 sequence).
+    let (mut s, t) = editing_all("A😀B");
+    select(&mut s, 3, 3);
+    s.execute("text.deleteSurrounding", json!({"before": 2, "after": 0, "bytes": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "A😀", "B is whole, the emoji only partly covered, so both are not one range");
+    select(&mut s, 2, 2);
+    s.execute("text.deleteSurrounding", json!({"before": 4, "after": 0, "bytes": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "A", "four bytes cover the whole emoji");
+
+    // A combining mark is one character of two bytes: one byte of it removes nothing.
+    let (mut s, t) = editing_all("e\u{301}");
+    select(&mut s, 2, 2);
+    s.execute("text.deleteSurrounding", json!({"before": 1, "after": 0, "bytes": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "e\u{301}", "a partial combining mark stays");
+    s.execute("text.deleteSurrounding", json!({"before": 2, "after": 0, "bytes": true})).unwrap();
+    assert_eq!(doc(&s, t).text, "e", "the whole combining mark is one character");
+}
+
+/// The outgoing IME query: logical committed text (the pre-edit never enters the model), UTF-8
+/// byte offsets in either selection direction, a bounded window, and an explicit unavailable
+/// answer for a selection that cannot be represented.
+#[test]
+fn ime_surrounding_maps_characters_to_bytes_and_preserves_direction() {
+    let (mut s, _) = editing_all("café😀");
+    select_anchor(&mut s, 2, 5);
+    let w = ime_surrounding(&s).expect("an available document");
+    assert_eq!(w.text, "café😀");
+    assert_eq!((w.cursor, w.anchor), (9, 2), "the caret is six characters in, after the emoji; the anchor stays at byte 2");
+    assert_eq!(&w.text[w.cursor..], "");
+    assert_eq!(&w.text[..w.anchor], "ca");
+
+    // Reversed: the caret stays the primary end and the anchor the other one.
+    select_anchor(&mut s, 5, 2);
+    let reversed = ime_surrounding(&s).expect("an available document");
+    assert_eq!((reversed.cursor, reversed.anchor), (2, 9), "cursor > anchor is preserved after the conversion");
+    assert_eq!(&reversed.text[reversed.cursor..reversed.anchor], "fé😀");
+
+    // An available empty document is not the unavailable state.
+    let (s, _) = editing_all("");
+    let empty = ime_surrounding(&s).expect("empty text is available");
+    assert_eq!((empty.text.as_str(), empty.cursor, empty.anchor), ("", 0, 0));
+
+    // No edit session: unavailable, not an empty document.
+    let (s, _) = session("text");
+    assert!(ime_surrounding(&s).is_none());
+}
+
+#[test]
+fn ime_surrounding_is_bounded_and_refuses_a_too_wide_selection() {
+    // A long line: the query copies only a window around the caret, never the document.
+    let text = "a".repeat(20_000);
+    let (mut s, _) = editing(&text, 10_000);
+    let w = ime_surrounding(&s).expect("a collapsed caret fits");
+    assert!(w.text.len() <= MAX_IME_TEXT_BYTES, "the payload is bounded");
+    assert!(w.text.len() > 1000, "the caret keeps a useful amount of context");
+    assert!(w.text.is_char_boundary(w.cursor) && w.text.is_char_boundary(w.anchor));
+    assert_eq!(w.cursor, w.anchor);
+
+    // A selection wider than the protocol limit is unavailable, not a truncated one.
+    select(&mut s, 0, 20_000);
+    assert!(ime_surrounding(&s).is_none(), "a too-wide selection is unavailable");
+
+    // Multi-byte text at the window boundary is never split, and offsets stay on boundaries.
+    let text = "é".repeat(5_000);
+    let (s, _) = editing(&text, 2_500);
+    let w = ime_surrounding(&s).expect("a collapsed caret fits");
+    assert!(w.text.len() <= MAX_IME_TEXT_BYTES);
+    assert!(w.text.is_char_boundary(w.cursor));
+    assert_eq!(&w.text[w.cursor..w.cursor + "é".len()], "é");
+}
+
+/// A reversed selection survives a byte-count deletion: both endpoints shift by the removed
+/// characters before the selection, its direction stays reversed, and partial characters on
+/// either side stay whole.
+#[test]
+fn ime_byte_deletion_keeps_a_reversed_selection_direction() {
+    let (mut s, t) = editing_all("😀ab😀");
+    select_anchor(&mut s, 3, 1);
+    let (anchor, caret) = sel(&s);
+    assert_eq!((anchor, caret), (3, 1), "reversed before the replacement");
+
+    // Three bytes cover only part of either four-byte emoji: neither is split or removed.
+    s.execute("text.deleteSurrounding", json!({"before": 3, "after": 3, "bytes": true})).unwrap();
+    assert_text(&s, t, "😀ab😀");
+
+    // Four bytes cover each whole emoji: the selection text stays, shifted, still reversed.
+    s.execute("text.deleteSurrounding", json!({"before": 4, "after": 4, "bytes": true})).unwrap();
+    assert_text(&s, t, "ab");
+    assert_eq!(sel(&s), (2, 0), "the anchor stays after the caret");
+    let w = ime_surrounding(&s).expect("available");
+    assert_eq!((w.text.as_str(), w.cursor, w.anchor), ("ab", 0, 2), "the outgoing offsets keep the direction");
+}
+
+#[test]
+fn deselect_all_ends_the_open_edit() {
+    let (mut s, t) = editing("Hello", 5);
+    s.execute("text.insert", json!({"text": "!"})).unwrap();
+    assert_eq!(doc(&s, t).text, "Hello!");
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    assert!(s.state.text_edit.is_none(), "Deselect All ends the open text edit on every route");
+    assert!(s.state.selected_layers.is_empty(), "and leaves nothing selected");
+    assert_eq!(doc(&s, t).text, "Hello!", "the text stays committed");
+    // Ending an edit is no undoable step of its own (as with text.endEdit): undo takes
+    // the typed text, it does not reopen the edit.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc(&s, t).text, "Hello", "undo reverts the typed text, not the deselection");
+    assert!(s.state.text_edit.is_none(), "undo does not reopen the edit");
+}
+
+#[test]
+fn deselect_all_discards_an_empty_type_tool_layer() {
+    let (mut s, _keep) = session("Hello");
+    let new = s.execute("layer.newText", json!({"text": "", "position": [80.0, 80.0], "edit": true})).unwrap()["layer"].as_u64().unwrap();
+    assert!(
+        s.state.text_edit.as_ref().is_some_and(|e| e.created && e.layer == effectcraft_project::LayerId(new)),
+        "the Type tool opens the edit on its new, empty layer"
+    );
+    let count = |s: &Session| s.active_comp().map_or(0, |c| c.layers.len());
+    let before = count(&s);
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    assert!(s.state.text_edit.is_none());
+    assert!(s.state.selected_layers.is_empty());
+    assert_eq!(count(&s), before - 1, "a Type-tool layer left empty is removed, as text.endEdit does");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(count(&s), before, "that removal is one undo step of its own, as on text.endEdit");
+}
diff --git a/crates/engine/src/tests_3d.rs b/crates/engine/src/tests/three_d.rs
similarity index 92%
rename from crates/engine/src/tests_3d.rs
rename to crates/engine/src/tests/three_d.rs
index cf9773f9a..07a48af1c 100644
--- a/crates/engine/src/tests_3d.rs
+++ b/crates/engine/src/tests/three_d.rs
@@ -131,6 +131,23 @@ fn environment_light_is_listed_and_takes_a_source_layer() {
     assert_eq!(prop(&s, env, "lightOptions/source").as_layer(), None);
 }
 
+/// Deleting the layer a Source points at leaves no dangling id: "None" means the comp's
+/// Environment Layer, and a dead id rendered as nothing at all (#2153).
+#[test]
+fn deleting_a_source_layer_clears_the_reference() {
+    let mut s = session();
+    let sky = s.execute("layer.newSolid", json!({"width": 256, "height": 128, "name": "Sky"})).unwrap()["layer"].as_u64().unwrap();
+    let env = s.execute("layer.newLight", json!({"kind": "Environment", "name": "Env"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": env, "path": "lightOptions/source", "value": sky})).unwrap();
+    assert_eq!(prop(&s, env, "lightOptions/source").as_layer(), Some(sky));
+    s.execute("edit.clear", json!({"layers": [sky]})).unwrap();
+    assert_eq!(prop(&s, env, "lightOptions/source").as_layer(), None, "the reference goes with the layer");
+    // One history step with the delete, so undo brings both back.
+    s.undo();
+    assert_eq!(prop(&s, env, "lightOptions/source").as_layer(), Some(sky));
+    assert!(s.active_comp().unwrap().layer(effectcraft_project::LayerId(sky)).is_some());
+}
+
 #[test]
 fn three_d_switch_undo_redo() {
     let mut s = session();
diff --git a/crates/engine/src/tests_timeline.rs b/crates/engine/src/tests/timeline.rs
similarity index 93%
rename from crates/engine/src/tests_timeline.rs
rename to crates/engine/src/tests/timeline.rs
index 14eb7dd4d..33dac7795 100644
--- a/crates/engine/src/tests_timeline.rs
+++ b/crates/engine/src/tests/timeline.rs
@@ -613,6 +613,51 @@ fn time_set_reads_frames_style_digits_as_a_frame_count() {
     assert_eq!(r["display"], "00100");
 }
 
+/// Project Settings ▸ Time Display Style ▸ Frames ▸ Frame Count: Start at 0 / Start at 1
+/// (`app.project.framesCountType`), undoable and saved with the project (#1807).
+#[test]
+fn project_settings_frame_count_starts_at_one() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Count", "width": 64, "height": 64, "frameRate": 30, "duration": 2})).unwrap();
+    s.execute("file.projectSettings", json!({"timeDisplay": "frames"})).unwrap();
+    assert_eq!(s.execute("time.set", json!({"frame": 12})).unwrap()["display"], "00012");
+
+    s.execute("file.projectSettings", json!({"frameStart": 1})).unwrap();
+    assert_eq!(s.execute("time.set", json!({"frame": 12})).unwrap()["display"], "00013");
+    for bad in [json!(2), json!(-1), json!("one")] {
+        assert!(s.execute("file.projectSettings", json!({"frameStart": bad})).is_err(), "{bad}");
+    }
+    assert_eq!(s.project.settings.frame_start, 1);
+
+    let dir = std::env::temp_dir().join(format!("ec-frame-start-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("count.ecproj").to_string_lossy().to_string();
+    s.execute("file.save", json!({"path": path})).unwrap();
+    let mut reopened = Session::default();
+    reopened.execute("file.open", json!({"path": path})).unwrap();
+    let _ = std::fs::remove_dir_all(dir);
+    assert_eq!(reopened.project.settings.frame_start, 1);
+
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(s.execute("time.set", json!({"frame": 12})).unwrap()["display"], "00012");
+}
+
+/// A Duration is a count of frames: Start at 1 and the comp's Start Timecode number positions,
+/// not lengths (#1807).
+#[test]
+fn durations_ignore_the_frame_count_and_the_start_timecode() {
+    use crate::commands::time::display_duration;
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Len", "width": 64, "height": 64, "frameRate": 30, "duration": 10, "startTimecode": "0:00:01:00"})).unwrap();
+    s.execute("file.projectSettings", json!({"frameStart": 1})).unwrap();
+    let comp = s.active_comp().unwrap().clone();
+    let len = comp.frame_rate.tick_of(30);
+    for (style, want) in [("frames", "00030"), ("feet35", "0001+14"), ("timecode", "0:00:01:00")] {
+        s.execute("file.projectSettings", json!({"timeDisplay": style})).unwrap();
+        assert_eq!(display_duration(&s, &comp, len), want, "{style}");
+    }
+}
+
 #[test]
 fn separate_dimensions_split_and_rejoin() {
     let (mut s, l) = setup();
@@ -1343,3 +1388,45 @@ fn relative_trim_moves_every_selected_layer_by_the_same_delta() {
     s.execute("layer.timing", json!({"layers": [a], "inDelta": 0.1})).unwrap();
     assert!(near(io(&s, a).0, -0.9), "{:?}", io(&s, a));
 }
+
+/// #1434: with several 3D layers selected, typing a value into one component (Z Position) sets
+/// that component on each of them; their other components stay their own. Before, every
+/// selected layer took the edited layer's whole value and they piled up on top of it.
+#[test]
+fn a_typed_component_applies_only_that_component_to_the_selected_layers() {
+    let (mut s, a) = setup();
+    let b = s.execute("layer.newSolid", json!({"color": "#ff0000", "width": 50, "height": 50})).unwrap()["layer"].as_u64().unwrap();
+    let c = s.execute("layer.newSolid", json!({"color": "#00ff00", "width": 50, "height": 50})).unwrap()["layer"].as_u64().unwrap();
+    for (l, xy) in [(a, [10.0, 20.0]), (b, [110.0, 120.0]), (c, [210.0, 220.0])] {
+        s.execute("layer.setSwitch", json!({"layers": [l], "switch": "threeD", "value": true})).unwrap();
+        s.execute("prop.set", json!({"layer": l, "path": "transform/position", "value": [xy[0], xy[1], 5.0]})).unwrap();
+    }
+    s.execute("layer.select", json!({"layers": [a, b, c]})).unwrap();
+    let pos = |s: &Session, l: u64| prop(s, l, "transform/position").value.components();
+    let uid = prop(&s, a, "transform/position").uid;
+    // The panels send the edited layer's value with the typed component, and which one it was.
+    let undo = s.history.undo.len();
+    s.execute_checked("prop.set", json!({"layer": a, "prop": uid, "value": [10.0, 20.0, -300.0], "selected": true, "offset": false, "dims": [2]})).unwrap();
+    assert_eq!(pos(&s, a), vec![10.0, 20.0, -300.0]);
+    assert_eq!(pos(&s, b), vec![110.0, 120.0, -300.0], "B keeps its X and Y");
+    assert_eq!(pos(&s, c), vec![210.0, 220.0, -300.0], "C keeps its X and Y");
+    assert_eq!(s.history.undo.len(), undo + 1, "one undo step");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(pos(&s, b), vec![110.0, 120.0, 5.0]);
+
+    // Linked Scale: both edited components go to every layer, Z stays each layer's own.
+    s.execute("prop.set", json!({"layer": c, "path": "transform/scale", "value": [50.0, 50.0, 30.0]})).unwrap();
+    let scale_uid = prop(&s, a, "transform/scale").uid;
+    s.execute("prop.set", json!({"layer": a, "prop": scale_uid, "value": [200.0, 200.0, 100.0], "selected": true, "dims": [0, 1]})).unwrap();
+    assert_eq!(prop(&s, c, "transform/scale").value.components(), vec![200.0, 200.0, 30.0]);
+
+    // Position with Separate Dimensions on one of the other layers.
+    s.execute("prop.separateDimensions", json!({"layer": b, "value": true})).unwrap();
+    s.execute("prop.set", json!({"layer": a, "prop": uid, "value": [10.0, 20.0, 40.0], "selected": true, "dims": [2]})).unwrap();
+    let axis = |m: &str| prop(&s, b, &format!("transform/{m}")).value.as_f64();
+    assert_eq!((axis("positionX"), axis("positionY"), axis("positionZ")), (110.0, 120.0, 40.0));
+
+    // Without `dims` (agents setting a whole value) every selected layer takes the value as is.
+    s.execute("prop.set", json!({"layer": a, "prop": uid, "value": [1.0, 2.0, 3.0], "selected": true})).unwrap();
+    assert_eq!(pos(&s, c), vec![1.0, 2.0, 3.0]);
+}
diff --git a/crates/engine/src/tests_timeline_interchange.rs b/crates/engine/src/tests/timeline_interchange.rs
similarity index 99%
rename from crates/engine/src/tests_timeline_interchange.rs
rename to crates/engine/src/tests/timeline_interchange.rs
index b32e19c49..45be0f7a1 100644
--- a/crates/engine/src/tests_timeline_interchange.rs
+++ b/crates/engine/src/tests/timeline_interchange.rs
@@ -1,5 +1,5 @@
 //! File ▸ Import / Export ▸ Adobe Premiere Pro Project… (timeline interchange) through the command
-//! registry, without media decoding (pixels: `crates/host/tests/timeline_interop.rs`).
+//! registry, without media decoding (pixels: `crates/host/tests/it/timeline_interop.rs`).
 
 use serde_json::json;
 
diff --git a/crates/engine/src/tests_track.rs b/crates/engine/src/tests/track.rs
similarity index 100%
rename from crates/engine/src/tests_track.rs
rename to crates/engine/src/tests/track.rs
diff --git a/crates/engine/src/tests_vector_import.rs b/crates/engine/src/tests/vector_import.rs
similarity index 95%
rename from crates/engine/src/tests_vector_import.rs
rename to crates/engine/src/tests/vector_import.rs
index 63513b910..9cfb94ecc 100644
--- a/crates/engine/src/tests_vector_import.rs
+++ b/crates/engine/src/tests/vector_import.rs
@@ -2,7 +2,7 @@
 
 use effectcraft_color::BlendMode;
 use effectcraft_keyframe::Value as KV;
-use effectcraft_project::{ItemKind, LayerSource, MaskMode};
+use effectcraft_project::{Comp, ItemKind, Layer, LayerSource, MaskMode};
 use effectcraft_psd::write::*;
 use effectcraft_psd::{DValue, Descriptor, Rect};
 use serde_json::json;
@@ -74,22 +74,8 @@ pub(crate) fn sample_psd() -> Vec<u8> {
     write(&d)
 }
 
-#[test]
-fn psd_imports_as_composition() {
-    let path = tmp("sample.psd");
-    std::fs::write(&path, sample_psd()).unwrap();
-    let mut s = Session::default();
-    let r = s.execute_checked("file.import", json!({"paths": [path], "importAs": "composition"})).unwrap();
-    assert_eq!(r["errors"], json!([]), "{r}");
-    let cid = effectcraft_project::ItemId(r["comps"][0].as_u64().unwrap());
-    assert_eq!(s.state.active_comp, Some(cid));
-    assert_eq!(s.project.item(cid).unwrap().name, "sample");
-    let c = s.project.comp(cid).unwrap().clone();
-    assert_eq!((c.width, c.height), (120, 80));
-    let names: Vec<&str> = c.layers.iter().map(|l| l.name.as_str()).collect();
-    assert_eq!(names, ["Title", "Hue Shift", "Vector Masked", "Clipped", "Base", "Group A", "Background"]);
-    // Text layer: editable text, positioned at the type origin.
-    let title = &c.layers[0];
+/// Text layer: editable text, positioned at the type origin.
+fn assert_title_layer(title: &Layer) {
     assert!(matches!(title.source, LayerSource::Text));
     let Some(KV::Text(doc)) = title.props.prop("text/sourceText").map(|p| p.value.clone()) else { panic!("text") };
     assert_eq!(doc.text, "Hello PSD");
@@ -97,14 +83,18 @@ fn psd_imports_as_composition() {
     assert_eq!(doc.font, "Inter");
     assert_eq!(doc.style, "Bold");
     assert_eq!(title.props.prop("transform/position").unwrap().value.as_vec2(), [8.0, 70.0]);
-    // Adjustment layer with Hue/Saturation.
-    let hue = &c.layers[1];
+}
+
+/// Adjustment layer with Hue/Saturation.
+fn assert_hue_layer(hue: &Layer) {
     assert!(hue.switches.adjustment);
     let fx = hue.effects().unwrap().groups().next().unwrap();
     assert_eq!(fx.get("hue").unwrap().value.as_f64(), 40.0);
     assert_eq!(fx.get("saturation").unwrap().value.as_f64(), 10.0);
-    // Vector mask → mask; Stroke style.
-    let vm = &c.layers[2];
+}
+
+/// Vector mask → mask; Stroke style.
+fn assert_vector_mask_layer(vm: &Layer) {
     let m = vm.masks().unwrap().groups().next().unwrap();
     assert!(matches!(m.kind, effectcraft_project::GroupKind::Mask { mode: MaskMode::Add, .. }));
     let Some(KV::Path(p)) = m.get("path").map(|p| p.value.clone()) else { panic!("mask path") };
@@ -113,19 +103,23 @@ fn psd_imports_as_composition() {
     let st = vm.props.group("layerStyles/stroke").unwrap();
     assert_eq!(st.get("size").unwrap().value.as_f64(), 2.0);
     assert_eq!(st.get("position").unwrap().value, KV::Enum(1));
-    // Clipped → preserve transparency; opacity and blend mode.
+}
+
+/// Clipped → preserve transparency (opacity, blend mode); drop shadow.
+fn assert_clipped_and_shadow(c: &Comp) {
     let clipped = &c.layers[3];
     assert!(clipped.preserve_transparency);
     assert_eq!(clipped.blend_mode, BlendMode::Screen);
     assert!((clipped.props.prop("transform/opacity").unwrap().value.as_f64() - 128.0 / 255.0 * 100.0).abs() < 1e-9);
-    // Drop shadow.
     let ds = c.layers[4].props.group("layerStyles/dropShadow").unwrap();
     assert_eq!(ds.get("distance").unwrap().value.as_f64(), 9.0);
     assert_eq!(ds.get("angle").unwrap().value.as_f64(), 45.0);
     assert_eq!(ds.get("useGlobalLight").unwrap().value, KV::Bool(false));
     assert_eq!(ds.get("opacity").unwrap().value.as_f64(), 60.0);
-    // Group → collapsed precomp (pass through) with its layers.
-    let g = &c.layers[5];
+}
+
+/// Group → collapsed precomp (pass through) with its layers; footage items name their Photoshop layer.
+fn assert_group_precomp(s: &Session, g: &Layer) {
     assert!(g.switches.collapse);
     let LayerSource::Comp { item } = g.source else { panic!("precomp") };
     let inner = s.project.comp(item).unwrap();
@@ -140,6 +134,27 @@ fn psd_imports_as_composition() {
     assert_eq!((sl.name.as_str(), sl.layer_size), ("Masked Square", false));
     assert_eq!((f.width, f.height), (120, 80));
     assert_eq!(s.project.item(item).unwrap().name, "Masked Square/sample.psd");
+}
+
+#[test]
+fn psd_imports_as_composition() {
+    let path = tmp("sample.psd");
+    std::fs::write(&path, sample_psd()).unwrap();
+    let mut s = Session::default();
+    let r = s.execute_checked("file.import", json!({"paths": [path], "importAs": "composition"})).unwrap();
+    assert_eq!(r["errors"], json!([]), "{r}");
+    let cid = effectcraft_project::ItemId(r["comps"][0].as_u64().unwrap());
+    assert_eq!(s.state.active_comp, Some(cid));
+    assert_eq!(s.project.item(cid).unwrap().name, "sample");
+    let c = s.project.comp(cid).unwrap().clone();
+    assert_eq!((c.width, c.height), (120, 80));
+    let names: Vec<&str> = c.layers.iter().map(|l| l.name.as_str()).collect();
+    assert_eq!(names, ["Title", "Hue Shift", "Vector Masked", "Clipped", "Base", "Group A", "Background"]);
+    assert_title_layer(&c.layers[0]);
+    assert_hue_layer(&c.layers[1]);
+    assert_vector_mask_layer(&c.layers[2]);
+    assert_clipped_and_shadow(&c);
+    assert_group_precomp(&s, &c.layers[5]);
     // One undo step removes everything.
     s.execute("edit.undo", json!({})).unwrap();
     assert!(s.project.comp(cid).is_none());
diff --git a/crates/engine/src/tests_viewer.rs b/crates/engine/src/tests/viewer.rs
similarity index 90%
rename from crates/engine/src/tests_viewer.rs
rename to crates/engine/src/tests/viewer.rs
index be3edf469..5ed0848b9 100644
--- a/crates/engine/src/tests_viewer.rs
+++ b/crates/engine/src/tests/viewer.rs
@@ -637,3 +637,63 @@ fn each_comp_keeps_its_resolution_outside_the_undo_history_and_in_the_file() {
     s.execute_checked("view.res.auto", json!({})).unwrap();
     assert_eq!(s.active_comp().unwrap().resolution, Resolution::Auto);
 }
+
+/// #1685: changing Type updates the property tree in the same undo step, including when
+/// addressed by uid (as in the UI) rather than by path (scripts/control channel).
+#[test]
+fn polystar_type_switch_updates_inner_controls_and_undoes() {
+    let mut s = comp();
+    let lid = s.execute("layer.newShape", json!({"kind": "polygon"})).unwrap()["layer"].as_u64().unwrap();
+    let group = |s: &Session| layer(s, lid).props.group("contents/group/contents/star").unwrap().clone();
+    let polygon = group(&s);
+    let type_uid = polygon.get("type").unwrap().uid;
+    assert!(polygon.get("innerRadius").is_none());
+    s.execute("prop.set", json!({"layer": lid, "prop": type_uid, "value": 0})).unwrap();
+    let star = group(&s);
+    assert_eq!(star.get("innerRadius").unwrap().value, KV::Scalar(50.0));
+    assert_eq!(star.get("innerRoundness").unwrap().value, KV::Scalar(0.0));
+    assert_eq!(star.get("innerRadius").unwrap().ui, effectcraft_project::ParamUi::Pixels);
+    assert_eq!(star.get("innerRoundness").unwrap().ui, effectcraft_project::ParamUi::Percent);
+    let names: Vec<_> = star.children.iter().filter_map(|n| n.as_prop()).map(|p| p.match_id.as_str()).collect();
+    assert_eq!(names, ["direction", "type", "points", "position", "rotation", "innerRadius", "outerRadius", "innerRoundness", "outerRoundness"]);
+    assert_eq!(star.get("outerRadius"), polygon.get("outerRadius"));
+    assert!(s.undo());
+    assert_eq!(group(&s), polygon);
+    assert!(s.redo());
+    assert_eq!(group(&s), star);
+    // Reapplying the same Type must not reset custom inner values or allocate new ids.
+    s.execute("prop.set", json!({"layer": lid, "path": "contents/group/contents/star/innerRadius", "value": 37})).unwrap();
+    let before = group(&s);
+    let next = s.project.next_id;
+    s.execute("prop.set", json!({"layer": lid, "path": "contents/group/contents/star/type", "value": 0})).unwrap();
+    assert_eq!(group(&s), before);
+    assert_eq!(s.project.next_id, next);
+    let inner_uid = before.get("innerRadius").unwrap().uid;
+    s.state.selected_props = vec![(LayerId(lid), inner_uid)];
+    s.state.selected_keys = vec![crate::KeyRef { layer: LayerId(lid), prop: inner_uid, time: Tick::ZERO }];
+    s.execute("prop.set", json!({"layer": lid, "path": "contents/group/contents/star/type", "value": 1})).unwrap();
+    assert_eq!(group(&s).get("type").unwrap().value, KV::Enum(1));
+    assert!(group(&s).get("innerRadius").is_none());
+    assert!(group(&s).get("innerRoundness").is_none());
+    assert!(s.state.selected_props.is_empty());
+    assert!(s.state.selected_keys.is_empty());
+    assert!(s.undo());
+    assert_eq!(group(&s), before, "undo restores the original inner values and ids");
+    assert!(s.redo());
+    assert!(group(&s).get("innerRadius").is_none());
+    s.execute("prop.set", json!({"layer": lid, "prop": type_uid, "value": 0})).unwrap();
+    assert_eq!(group(&s).get("innerRadius").unwrap().value, KV::Scalar(50.0));
+}
+
+#[test]
+fn polystar_animated_type_keeps_the_inner_controls_needed_by_other_frames() {
+    let mut s = comp();
+    let lid = s.execute("layer.newShape", json!({"kind": "star"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": lid, "path": "contents/group/contents/star/innerRadius", "value": 27})).unwrap();
+    s.execute("prop.toggleAnimation", json!({"layer": lid, "path": "contents/group/contents/star/type", "value": true})).unwrap();
+    s.execute("prop.set", json!({"layer": lid, "path": "contents/group/contents/star/type", "time": 1, "value": 1})).unwrap();
+    let star = layer(&s, lid).props.group("contents/group/contents/star").unwrap().clone();
+    assert_eq!(star.get("type").unwrap().value_at(Tick::ZERO), KV::Enum(0));
+    assert_eq!(star.get("type").unwrap().value_at(Tick::from_seconds_f64(1.0)), KV::Enum(1));
+    assert_eq!(star.get("innerRadius").unwrap().value, KV::Scalar(27.0));
+}
diff --git a/crates/engine/src/tests_text_edit.rs b/crates/engine/src/tests_text_edit.rs
deleted file mode 100644
index 3e41688d2..000000000
--- a/crates/engine/src/tests_text_edit.rs
+++ /dev/null
@@ -1,334 +0,0 @@
-//! On-canvas text editing and per-character styles through commands: run-scoped
-//! `layer.setText`, text.insert / delete / setSelection / moveCaret, the text clipboard and the
-//! paste-formatting commands, with undo / redo.
-
-use effectcraft_keyframe::{BaselineOption, Justify, Kerning, TextDoc};
-use serde_json::json;
-
-use crate::Session;
-use crate::commands::text_edit::layer_doc;
-
-fn session(text: &str) -> (Session, u64) {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "C", "width": 640, "height": 360, "duration": 4})).unwrap();
-    let t = s.execute("layer.newText", json!({"text": text, "size": 60, "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
-    (s, t)
-}
-
-fn doc(s: &Session, t: u64) -> TextDoc {
-    layer_doc(s, effectcraft_project::LayerId(t)).unwrap()
-}
-
-fn sel(s: &Session) -> (usize, usize) {
-    let e = s.state.text_edit.as_ref().unwrap();
-    (e.anchor, e.caret)
-}
-
-#[test]
-fn set_text_with_a_range_creates_runs_and_undoes() {
-    let (mut s, t) = session("Hello World");
-    s.execute("layer.setText", json!({"layer": t, "range": [6, 11], "size": 30, "fill": "#ff0000", "kerning": "optical"})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.runs().len(), 2);
-    assert_eq!(d.style_at(0).size, 60.0);
-    assert_eq!(d.style_at(7).size, 30.0);
-    assert_eq!(d.style_at(7).fill, [1.0, 0.0, 0.0, 1.0]);
-    assert_eq!(d.style_at(7).kerning, Kerning::Optical);
-    // Paragraph attributes apply to the paragraphs the range touches; document ones to all.
-    s.execute("layer.setText", json!({"layer": t, "range": [0, 1], "justify": "justifyAll", "indentFirst": 20, "spaceAfter": 6, "direction": "rtl"})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!((d.justify, d.indent_first, d.space_after), (Justify::JustifyAll, 20.0, 6.0));
-    // Unknown attributes and bad values are errors (nothing changes).
-    assert!(s.execute("layer.setText", json!({"layer": t, "sizee": 3})).is_err());
-    assert!(s.execute("layer.setText", json!({"layer": t, "size": "big"})).is_err());
-    assert!(s.execute("edit.undo", json!({})).is_ok());
-    assert_eq!(doc(&s, t).justify, Justify::Left);
-    assert!(s.execute("edit.undo", json!({})).is_ok());
-    assert!(doc(&s, t).is_uniform());
-    s.execute("edit.redo", json!({})).unwrap();
-    assert_eq!(doc(&s, t).runs().len(), 2);
-    // Without a range everything changes and the runs collapse again.
-    s.execute("layer.setText", json!({"layer": t, "size": 44, "superscript": true})).unwrap();
-    let d = doc(&s, t);
-    assert!(d.runs().iter().all(|r| r.style.size == 44.0 && r.style.baseline == BaselineOption::Superscript));
-    // Replacing a range's text keeps the formatting around it.
-    s.execute("layer.setText", json!({"layer": t, "range": [0, 5], "text": "Howdy", "fauxBold": true})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.text, "Howdy World");
-    assert!(d.style_at(2).faux_bold && !d.style_at(7).faux_bold);
-}
-
-#[test]
-fn typing_deleting_and_caret_movement() {
-    let (mut s, t) = session("abc def");
-    s.execute("text.edit", json!({"layer": t})).unwrap();
-    assert_eq!(sel(&s), (0, 7), "editing starts with everything selected");
-    s.execute("text.setSelection", json!({"start": 3})).unwrap();
-    s.execute("text.insert", json!({"text": "XY", "merge": "typing-1"})).unwrap();
-    s.execute("text.insert", json!({"text": "Z", "merge": "typing-1"})).unwrap();
-    assert_eq!(doc(&s, t).text, "abcXYZ def");
-    assert_eq!(sel(&s), (6, 6));
-    // One undo step for the merged typing.
-    s.execute("edit.undo", json!({})).unwrap();
-    assert_eq!(doc(&s, t).text, "abc def");
-    assert_eq!(sel(&s), (6, 6));
-    s.execute("edit.redo", json!({})).unwrap();
-    s.execute("text.setSelection", json!({"start": 6})).unwrap();
-    // Backspace / Delete, by character and by word.
-    s.execute("text.delete", json!({})).unwrap();
-    assert_eq!(doc(&s, t).text, "abcXY def");
-    s.execute("text.delete", json!({"direction": "forward", "word": true})).unwrap();
-    assert_eq!(doc(&s, t).text, "abcXY");
-    s.execute("text.delete", json!({"word": true})).unwrap();
-    assert_eq!(doc(&s, t).text, "");
-    s.execute("text.insert", json!({"text": "one two\nthree"})).unwrap();
-    assert_eq!(sel(&s), (13, 13));
-    // Caret movement: words, lines, up / down, extend.
-    let mv = |s: &mut Session, to: &str, extend: bool| -> (usize, usize) {
-        let r = s.execute("text.moveCaret", json!({"to": to, "extend": extend})).unwrap();
-        (r["anchor"].as_u64().unwrap() as usize, r["caret"].as_u64().unwrap() as usize)
-    };
-    assert_eq!(mv(&mut s, "lineStart", false), (8, 8));
-    assert_eq!(mv(&mut s, "up", false).1, 0);
-    assert_eq!(mv(&mut s, "wordRight", false), (3, 3));
-    assert_eq!(mv(&mut s, "wordRight", true), (3, 7));
-    assert_eq!(mv(&mut s, "left", false), (3, 3), "left collapses a selection to its start");
-    assert_eq!(mv(&mut s, "lineEnd", false), (7, 7));
-    assert_eq!(mv(&mut s, "down", false).1, 13);
-    assert_eq!(mv(&mut s, "start", true), (13, 0));
-    assert_eq!(mv(&mut s, "paraEnd", false), (7, 7));
-    // Select All while editing selects the text, not the layers.
-    s.execute("edit.selectAll", json!({})).unwrap();
-    assert_eq!(sel(&s), (0, 13));
-    // Undo past the insertion clamps the selection.
-    s.execute("edit.undo", json!({})).unwrap();
-    assert!(sel(&s).0 <= doc(&s, t).char_len() && sel(&s).1 <= doc(&s, t).char_len());
-    s.execute("text.endEdit", json!({})).unwrap();
-    assert!(s.state.text_edit.is_none());
-}
-
-#[test]
-fn caret_style_applies_to_the_next_typed_text() {
-    let (mut s, t) = session("ab");
-    s.execute("text.edit", json!({"layer": t, "caret": 1})).unwrap();
-    s.execute("layer.setText", json!({"layer": t, "range": [1, 1], "size": 12, "fill": [0, 1, 0]})).unwrap();
-    assert!(doc(&s, t).is_uniform(), "a caret-only change doesn't touch the text");
-    s.execute("text.insert", json!({"text": "Q"})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.text, "aQb");
-    assert_eq!(d.style_at(1).size, 12.0);
-    assert_eq!(d.style_at(1).fill, [0.0, 1.0, 0.0, 1.0]);
-    assert_eq!(d.style_at(2).size, 60.0);
-    // Typing again continues the new style (the character before the caret).
-    s.execute("text.insert", json!({"text": "R"})).unwrap();
-    assert_eq!(doc(&s, t).style_at(2).size, 12.0);
-}
-
-#[test]
-fn clipboard_and_paste_formatting() {
-    let (mut s, t) = session("red plain");
-    s.execute("layer.setText", json!({"layer": t, "range": [0, 3], "fill": "#ff0000", "size": 20})).unwrap();
-    s.execute("text.edit", json!({"layer": t, "select": [0, 3]})).unwrap();
-    let r = s.execute("edit.copy", json!({})).unwrap();
-    assert_eq!(r["text"], "red");
-    // Paste keeps the copied formatting.
-    s.execute("text.setSelection", json!({"start": 9})).unwrap();
-    s.execute("edit.paste", json!({})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.text, "red plainred");
-    assert_eq!(d.style_at(10).fill, [1.0, 0.0, 0.0, 1.0]);
-    assert_eq!(sel(&s), (12, 12));
-    // Different text from the system clipboard pastes in the caret's style.
-    s.execute("text.setSelection", json!({"start": 4})).unwrap();
-    s.execute("edit.paste", json!({"text": "new "})).unwrap();
-    assert_eq!(doc(&s, t).text, "red new plainred");
-    assert_eq!(doc(&s, t).style_at(5).size, 60.0);
-    // Paste Text and Match Formatting: the copied text in the caret's style.
-    s.execute("text.setSelection", json!({"start": 8})).unwrap();
-    s.execute("edit.pasteTextMatchFormatting", json!({})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.text, "red new redplainred");
-    assert_eq!(d.style_at(9).fill, [1.0; 4]);
-    // Paste Text Formatting Only onto a selection.
-    s.execute("text.setSelection", json!({"start": 11, "end": 16})).unwrap();
-    s.execute("edit.pasteTextFormattingOnly", json!({})).unwrap();
-    let d = doc(&s, t);
-    assert_eq!(d.style_at(12).fill, [1.0, 0.0, 0.0, 1.0]);
-    assert_eq!(d.style_at(12).size, 20.0);
-    // Cut removes the selection.
-    s.execute("text.setSelection", json!({"start": 0, "end": 4})).unwrap();
-    assert_eq!(s.execute("edit.cut", json!({})).unwrap()["text"], "red ");
-    assert_eq!(doc(&s, t).text, "new redplainred");
-    // Not editing: Paste Text Formatting Only restyles the whole selected text layer.
-    s.execute("text.endEdit", json!({})).unwrap();
-    s.execute("layer.select", json!({"layers": [t]})).unwrap();
-    s.execute("edit.pasteTextFormattingOnly", json!({})).unwrap();
-    assert!(doc(&s, t).is_uniform());
-    assert_eq!(doc(&s, t).size, 20.0);
-}
-
-#[test]
-fn type_tool_layers_point_box_and_empty_cleanup() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "C", "width": 640, "height": 360, "duration": 4})).unwrap();
-    let t = s.execute("layer.newText", json!({"text": "", "position": [100, 200], "justify": "left", "edit": true})).unwrap()["layer"].as_u64().unwrap();
-    assert_eq!(s.state.text_edit.as_ref().map(|e| e.layer.0), Some(t));
-    // Leaving an untouched Type-tool layer deletes it.
-    s.execute("text.endEdit", json!({})).unwrap();
-    assert!(s.active_comp().unwrap().layers.is_empty());
-    let b = s.execute("layer.newText", json!({"text": "", "box": [40, 50, 300, 120], "edit": true})).unwrap()["layer"].as_u64().unwrap();
-    s.execute("text.insert", json!({"text": "Boxed"})).unwrap();
-    let d = doc(&s, b);
-    assert_eq!(d.box_size, Some([300.0, 120.0]));
-    assert_eq!(d.box_pos, [-150.0, -60.0]);
-    let l = s.active_comp().unwrap().layers[0].clone();
-    assert_eq!(l.name, "Boxed", "named after its text");
-    let pos = l.props.prop("transform/position").unwrap().value.as_vec3();
-    assert_eq!([pos[0], pos[1]], [190.0, 110.0]);
-    s.execute("text.endEdit", json!({})).unwrap();
-    assert_eq!(s.active_comp().unwrap().layers.len(), 1);
-    // Resizing the box (layer space) is an attribute too.
-    s.execute("layer.setText", json!({"layer": b, "box": [-100, -60, 200, 120]})).unwrap();
-    assert_eq!(doc(&s, b).box_size, Some([200.0, 120.0]));
-    s.execute("layer.setText", json!({"layer": b, "vertical": true})).unwrap();
-    assert!(doc(&s, b).vertical);
-}
-
-#[test]
-fn edit_state_round_trips_through_serde() {
-    let (mut s, t) = session("abc");
-    s.execute("text.edit", json!({"layer": t, "select": [1, 2]})).unwrap();
-    let j = serde_json::to_value(&s.state).unwrap();
-    let back: crate::EditorState = serde_json::from_value(j).unwrap();
-    assert_eq!(back.text_edit, s.state.text_edit);
-}
-
-#[test]
-fn opentype_features_per_range_render_and_query() {
-    let (mut s, t) = session("Office 1/2");
-    s.execute("layer.setText", json!({"layer": t, "range": [7, 10], "fractions": true, "ss01": true})).unwrap();
-    let d = doc(&s, t);
-    assert!(!d.style_at(0).opentype.fractions);
-    assert!(d.style_at(8).opentype.fractions && d.style_at(8).opentype.stylistic_set(1));
-    // The laid-out glyphs change (frac turns 1/2 into a fraction).
-    let plain = effectcraft_text::layout_doc(&TextDoc { text: "1/2".into(), ..Default::default() });
-    let frac = effectcraft_text::layout_doc(&d.slice(7..10));
-    let ids = |l: &effectcraft_text::TextLayout| l.glyphs.iter().map(|g| g.gid).collect::<Vec<_>>();
-    assert_ne!(ids(&plain), ids(&frac));
-    // Undo restores the uniform style.
-    s.execute("edit.undo", json!({})).unwrap();
-    assert!(doc(&s, t).is_uniform());
-    // Font feature query (font by name, or the layer's).
-    let f = s.execute("text.fontFeatures", json!({"font": "Noto Serif"})).unwrap();
-    assert_eq!(f["options"]["smallCaps"], true);
-    assert!(f["features"].as_array().unwrap().iter().any(|t| t == "onum"));
-    let f = s.execute("text.fontFeatures", json!({"layer": t})).unwrap();
-    assert_eq!(f["family"], "Inter");
-    assert!(f["options"]["stylisticSets"].as_array().unwrap().contains(&json!(1)));
-    assert_eq!(f["options"]["smallCaps"], false);
-}
-
-#[test]
-fn fonts_lists_bundled_and_installed_families() {
-    let mut s = Session::default();
-    let r = s.execute("text.fonts", json!({})).unwrap();
-    let fams = r["families"].as_array().unwrap();
-    assert_eq!(r["count"].as_u64().unwrap() as usize, fams.len());
-    let inter = fams.iter().find(|f| f["family"] == "Inter").unwrap();
-    assert_eq!(inter["origin"], "bundled");
-    assert!(inter["styles"].as_array().unwrap().contains(&json!("Bold")));
-    // Installed fonts are listed without any layer having asked for one.
-    use effectcraft_text::fonts::FontSource as _;
-    let installed = effectcraft_text::fonts::DirectorySource::system().faces();
-    for face in &installed {
-        assert!(fams.iter().any(|f| f["family"].as_str().unwrap().eq_ignore_ascii_case(&face.family)), "{} not listed", face.family);
-    }
-    // Filtered by name; rescanning keeps what was there.
-    let r = s.execute("text.fonts", json!({"query": "noto ser", "rescan": true})).unwrap();
-    assert_eq!(r["families"][0]["family"], "Noto Serif");
-    // The bundled face is Regular; the OS can also provide Bold, Italic, or other faces.
-    // Compare against the independent directory inventory rather than assuming an empty OS.
-    let mut expected_styles = std::collections::BTreeSet::from(["Regular".to_string()]);
-    expected_styles.extend(installed.iter().filter(|face| face.family.eq_ignore_ascii_case("Noto Serif")).map(|face| face.style.clone()));
-    let styles: Vec<String> = r["families"][0]["styles"].as_array().unwrap().iter().map(|style| style.as_str().unwrap().to_string()).collect();
-    assert_eq!(styles.iter().cloned().collect::<std::collections::BTreeSet<_>>(), expected_styles);
-    assert_eq!(styles.len(), expected_styles.len(), "style menu has no duplicates");
-    assert!(r["families"].as_array().unwrap().iter().all(|f| f["family"].as_str().unwrap().to_lowercase().contains("noto ser")));
-    // The style menus offer a family's own styles.
-    assert_eq!(crate::font_styles("noto serif"), styles);
-    assert_eq!(crate::font_styles("NOTO SERIF"), styles);
-    assert_eq!(crate::font_styles("No Such Family").len(), 5);
-}
-
-/// A font file of just `name` (the family, Regular) and an `fvar` table with one axis pinned at
-/// 400 (so the helpers that look for an installed font with a real axis range never pick it).
-fn pinned_variable_font(family: &str) -> Vec<u8> {
-    let u16s = |v: &[u16]| -> Vec<u8> { v.iter().flat_map(|x| x.to_be_bytes()).collect() };
-    let strings: Vec<Vec<u8>> = [family, "Regular"].iter().map(|s| s.encode_utf16().flat_map(|u| u.to_be_bytes()).collect()).collect();
-    let mut name = u16s(&[0, 2, 30]);
-    let mut off = 0;
-    for (id, st) in strings.iter().enumerate() {
-        name.extend(u16s(&[3, 1, 0x409, id as u16 + 1, st.len() as u16, off]));
-        off += st.len() as u16;
-    }
-    strings.iter().for_each(|st| name.extend(st));
-    let mut fvar = u16s(&[1, 0, 16, 2, 1, 20, 0, 8]);
-    fvar.extend(b"wght".iter().copied().chain(u16s(&[0x190, 0, 0x190, 0, 0x190, 0, 0, 256])));
-    let mut out = u16s(&[1, 0, 2, 0, 0, 0]);
-    let mut body: Vec<u8> = vec![];
-    for (tag, data) in [(b"fvar", fvar), (b"name", name)] {
-        out.extend(tag);
-        out.extend([0u8; 4]);
-        out.extend(((12 + 32 + body.len()) as u32).to_be_bytes());
-        out.extend((data.len() as u32).to_be_bytes());
-        body.extend(data);
-    }
-    out.extend(body);
-    out
-}
-
-/// The font menu's Variable Fonts filter (After Effects 26.3): `text.fonts {variable: true}`
-/// lists only families with variation axes, every listing says which families are variable, and
-/// the font menu's rows carry the flag the filter uses.
-#[test]
-fn fonts_filter_variable_families() {
-    const FAMILY: &str = "EffectCraft Variable Filter Test";
-    assert_eq!(effectcraft_text::fonts::add_font_data(pinned_variable_font(FAMILY)).len(), 1);
-    let mut s = Session::default();
-    let all = s.execute("text.fonts", json!({})).unwrap();
-    let fams = all["families"].as_array().unwrap();
-    let flag = |name: &str| fams.iter().find(|f| f["family"] == name).map(|f| f["variable"].clone());
-    assert_eq!(flag("Inter"), Some(json!(false)), "the bundled fonts are static");
-    assert_eq!(flag(FAMILY), Some(json!(true)));
-    let var = s.execute("text.fonts", json!({"variable": true})).unwrap();
-    let listed = var["families"].as_array().unwrap();
-    assert_eq!(var["count"].as_u64(), Some(listed.len() as u64));
-    assert!(listed.iter().all(|f| f["variable"] == true), "{var}");
-    assert!(listed.iter().any(|f| f["family"] == FAMILY), "{var}");
-    assert!(listed.len() < fams.len(), "the filter drops the static families");
-    // Combined with the name query.
-    let both = s.execute("text.fonts", json!({"variable": true, "query": "variable filter"})).unwrap();
-    assert_eq!(both["families"].as_array().map(Vec::len), Some(1), "{both}");
-    let none = s.execute("text.fonts", json!({"variable": true, "query": "jetbrains mono"})).unwrap();
-    assert!(!none["families"].as_array().unwrap().iter().any(|f| f["family"] == "JetBrains Mono"), "{none}");
-    // The font menu's rows.
-    let menu = crate::font_menu(&s.prefs);
-    assert!(menu.iter().any(|r| r.family == FAMILY && r.variable));
-    assert!(menu.iter().any(|r| r.family == "Inter" && !r.variable));
-}
-
-/// `layer.setText`'s schema lists every OpenType key as optional, so checked execution (control
-/// channel, MCP) accepts them and requires none (#520).
-#[test]
-fn set_text_schema_accepts_every_opentype_key_and_requires_none() {
-    let spec = crate::commands::find("layer.setText").unwrap();
-    let schema = crate::commands::params_schema(spec);
-    assert_eq!(schema["required"], json!([]));
-    for key in ["discretionaryLigatures", "ss01", "ss02", "ss20", "swash"] {
-        assert!(schema["properties"].get(key).is_some(), "{key} is not in the schema");
-    }
-    assert!(schema["properties"].get("OpenType").is_none());
-    let (mut s, t) = session("Office 1/2");
-    s.execute_checked("layer.setText", json!({"layer": t, "discretionaryLigatures": true, "ss02": true, "ss20": true})).unwrap();
-    assert!(doc(&s, t).style_at(0).opentype.stylistic_set(20));
-}
diff --git a/crates/engine/src/viewer.rs b/crates/engine/src/viewer.rs
index 997c2023b..6b6e5ce99 100644
--- a/crates/engine/src/viewer.rs
+++ b/crates/engine/src/viewer.rs
@@ -663,10 +663,10 @@ impl SimProfile {
     }
 
     pub fn parse(s: &str) -> Option<SimProfile> {
-        let k: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
+        let k: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         SimProfile::ALL
             .into_iter()
-            .find(|p| p.id().to_ascii_lowercase() == k || p.label().chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase() == k)
+            .find(|p| p.id().to_ascii_lowercase() == k || p.label().chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase() == k)
             .or(match k.as_str() {
                 "off" => Some(SimProfile::None),
                 "hdtv" | "bt709" => Some(SimProfile::Rec709),
diff --git a/crates/engine/tests/key_time_post_snap_bounds.rs b/crates/engine/tests/it/key_time_post_snap_bounds.rs
similarity index 100%
rename from crates/engine/tests/key_time_post_snap_bounds.rs
rename to crates/engine/tests/it/key_time_post_snap_bounds.rs
diff --git a/crates/engine/tests/key_time_reply_contract.rs b/crates/engine/tests/it/key_time_reply_contract.rs
similarity index 100%
rename from crates/engine/tests/key_time_reply_contract.rs
rename to crates/engine/tests/it/key_time_reply_contract.rs
diff --git a/crates/engine/tests/it/main.rs b/crates/engine/tests/it/main.rs
new file mode 100644
index 000000000..ac1484cfb
--- /dev/null
+++ b/crates/engine/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod key_time_post_snap_bounds;
+mod key_time_reply_contract;
+mod parenting_3d_position;
diff --git a/crates/engine/tests/parenting_3d_position.rs b/crates/engine/tests/it/parenting_3d_position.rs
similarity index 100%
rename from crates/engine/tests/parenting_3d_position.rs
rename to crates/engine/tests/it/parenting_3d_position.rs
diff --git a/crates/export/src/encode.rs b/crates/export/src/encode.rs
index e4a45561d..e48bc4bb1 100644
--- a/crates/export/src/encode.rs
+++ b/crates/export/src/encode.rs
@@ -26,9 +26,49 @@ pub(crate) struct Packet {
     pub(crate) cto: i32,
 }
 
-pub(crate) trait VideoEncoder {
+/// A frame for the movie encoder: 8-bit RGBA, or 8-bit 4:2:0 planes already converted on the
+/// render threads (for encoders whose [`VideoEncoder::takes_yuv420`] is true).
+pub(crate) enum Pixels {
+    Rgba(Vec<u8>),
+    Yuv420(Yuv420),
+}
+
+/// BT.709 limited-range 8-bit 4:2:0 planes ([`rgba_to_yuv420`], or Y then U and V from the
+/// accelerator).
+pub(crate) enum Yuv420 {
+    Planes { y: Vec<u8>, u: Vec<u8>, v: Vec<u8> },
+    Packed(Vec<u8>),
+}
+
+impl Yuv420 {
+    fn from_rgba(rgba: &[u8], w: usize, h: usize) -> Yuv420 {
+        let (mut y, mut u, mut v) = (vec![], vec![], vec![]);
+        rgba_to_yuv420(rgba, w, h, &mut y, &mut u, &mut v);
+        Yuv420::Planes { y, u, v }
+    }
+    fn slices(&self, w: usize, h: usize) -> (&[u8], &[u8], &[u8]) {
+        match self {
+            Yuv420::Planes { y, u, v } => (y, u, v),
+            Yuv420::Packed(p) => {
+                let (cw, ch) = (w.div_ceil(2), h.div_ceil(2));
+                let (y, uv) = p.split_at(w * h);
+                let (u, v) = uv.split_at(cw * ch);
+                (y, u, v)
+            }
+        }
+    }
+}
+
+pub(crate) trait VideoEncoder: Send {
     fn sample_entry(&self) -> SampleEntry;
     fn encode(&mut self, rgba: &[u8], index: u64) -> Result<Vec<Packet>>;
+    /// Whether frames should come as [`Pixels::Yuv420`] (converted while other frames render).
+    fn takes_yuv420(&self) -> bool {
+        false
+    }
+    fn encode_yuv420(&mut self, _frame: &Yuv420, _index: u64) -> Result<Vec<Packet>> {
+        Err(ExportError::Unsupported("this encoder takes RGBA frames".into()))
+    }
     fn flush(&mut self) -> Result<Vec<Packet>>;
     /// Edit-list media start (B-frame delay) in the track timescale.
     fn media_start(&self) -> Option<i64> {
@@ -73,9 +113,22 @@ impl VideoEncoder for H264 {
         SampleEntry::avc(cfg, self.w as u16, self.h as u16)
     }
     fn encode(&mut self, rgba: &[u8], index: u64) -> Result<Vec<Packet>> {
-        rgba_to_yuv420(rgba, self.w as usize, self.h as usize, &mut self.y, &mut self.u, &mut self.v);
-        let cw = (self.w as usize).div_ceil(2);
-        let frame = filmcraft_h264enc::YuvFrame { y: &self.y, u: &self.u, v: &self.v, y_stride: self.w as usize, uv_stride: cw };
+        let (mut y, mut u, mut v) = (std::mem::take(&mut self.y), std::mem::take(&mut self.u), std::mem::take(&mut self.v));
+        rgba_to_yuv420(rgba, self.w as usize, self.h as usize, &mut y, &mut u, &mut v);
+        let planes = Yuv420::Planes { y, u, v };
+        let r = self.encode_yuv420(&planes, index);
+        if let Yuv420::Planes { y, u, v } = planes {
+            (self.y, self.u, self.v) = (y, u, v);
+        }
+        r
+    }
+    fn takes_yuv420(&self) -> bool {
+        true
+    }
+    fn encode_yuv420(&mut self, p: &Yuv420, index: u64) -> Result<Vec<Packet>> {
+        let (w, cw) = (self.w as usize, (self.w as usize).div_ceil(2));
+        let (y, u, v) = p.slices(w, self.h as usize);
+        let frame = filmcraft_h264enc::YuvFrame { y, u, v, y_stride: w, uv_stride: cw };
         let ps = self.enc.try_encode(&frame, index as i64 * self.rate.den).map_err(enc)?;
         Ok(self.packets(ps))
     }
@@ -88,33 +141,7 @@ impl VideoEncoder for H264 {
     }
 }
 
-/// BT.709 limited-range 8-bit 4:2:0 from RGBA8 (2×2 chroma average; alpha ignored).
-pub(crate) fn rgba_to_yuv420(rgba: &[u8], w: usize, h: usize, y: &mut Vec<u8>, u: &mut Vec<u8>, v: &mut Vec<u8>) {
-    let (cw, ch) = (w.div_ceil(2), h.div_ceil(2));
-    y.resize(w * h, 0);
-    u.resize(cw * ch, 0);
-    v.resize(cw * ch, 0);
-    y.par_chunks_mut(w * 2).zip(u.par_chunks_mut(cw).zip(v.par_chunks_mut(cw))).enumerate().for_each(|(cy, (yr, (ur, vr)))| {
-        let rows = yr.len() / w;
-        let mut acc = vec![(0f32, 0f32, 0f32); cw];
-        for dy in 0..rows {
-            let src = &rgba[(cy * 2 + dy) * w * 4..][..w * 4];
-            for x in 0..w {
-                let (r, g, b) = (src[x * 4] as f32 / 255.0, src[x * 4 + 1] as f32 / 255.0, src[x * 4 + 2] as f32 / 255.0);
-                let l = 0.2126 * r + 0.7152 * g + 0.0722 * b;
-                yr[dy * w + x] = (16.0 + 219.0 * l).round().clamp(1.0, 254.0) as u8;
-                let a = &mut acc[x / 2];
-                a.0 += (b - l) / 1.8556;
-                a.1 += (r - l) / 1.5748;
-                a.2 += 1.0;
-            }
-        }
-        for (cx, a) in acc.iter().enumerate() {
-            ur[cx] = (128.0 + 224.0 * a.0 / a.2).round().clamp(1.0, 254.0) as u8;
-            vr[cx] = (128.0 + 224.0 * a.1 / a.2).round().clamp(1.0, 254.0) as u8;
-        }
-    });
-}
+pub(crate) use effectcraft_raster::yuv::rgba_to_yuv420;
 
 // ---------------------------------------------------------------- ProRes
 
@@ -265,15 +292,41 @@ pub(crate) async fn movie(job: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut St
     };
     let brand = if matches!(fmt, OutputFormat::ProRes | OutputFormat::Uncompressed) { Brand::Mov } else { Brand::Mp4 };
     let batch = batch_size();
-    let render = |_: u64, img: effectcraft_raster::Image| -> Vec<u8> { job.pixels(&img, comp, channels, w, h) };
+    let yuv = venc.takes_yuv420();
+    let render = |_: u64, img: effectcraft_raster::Image| -> Pixels {
+        let px = job.pixels(&img, comp, channels, w, h);
+        if yuv { Pixels::Yuv420(Yuv420::from_rgba(&px, w as usize, h as usize)) } else { Pixels::Rgba(px) }
+    };
+    // H.264 frames the accelerator can convert itself come back as planes (12 MB instead of
+    // 133 MB of RGBA f32 read back at 4K); everything else renders and converts as before.
+    // Deferred readbacks (a browser worker) keep their pass-based path: no blocking there.
+    let gpu_yuv = yuv && channels == Channels::Rgb && !job.deferred();
+    let batch_frames = async |ks: Vec<u64>| -> Vec<Pixels> {
+        if gpu_yuv { job.h264_frames(comp, ks, w, h, |p| Pixels::Yuv420(Yuv420::Packed(p)), render) } else { job.frames(comp, ks, render).await }
+    };
+    let encode = |venc: &mut Box<dyn VideoEncoder>, px: &Pixels, index: u64| match px {
+        Pixels::Rgba(rgba) => venc.encode(rgba, index),
+        Pixels::Yuv420(planes) => venc.encode_yuv420(planes, index),
+    };
+
+    let beside = crate::pipeline::Beside::shared();
+    let total = st.total;
 
     // Encode the first batch before creating tracks: encoders finalise their config on frame 1.
-    let first_end = batch.min(st.total);
-    let first: Vec<Vec<u8>> = job.frames(comp, (0..first_end).collect(), render).await;
-    let mut pending = Vec::new();
-    for (k, px) in first.iter().enumerate() {
-        pending.extend(venc.encode(px, k as u64)?);
-    }
+    // Each batch encodes while the next one renders.
+    let first_end = batch.min(total);
+    let first: Vec<Pixels> = batch_frames((0..first_end).collect()).await;
+    let next_end = (first_end + batch).min(total);
+    let (pending, mut ready) = job
+        .beside(beside, batch_frames((first_end..next_end).collect()), || -> Result<Vec<Packet>> {
+            let mut pending = Vec::new();
+            for (k, px) in first.iter().enumerate() {
+                pending.extend(encode(&mut venc, px, k as u64)?);
+            }
+            Ok(pending)
+        })
+        .await?;
+    let pending = pending?;
     drop(first);
     st.advance(first_end)?;
 
@@ -351,19 +404,25 @@ pub(crate) async fn movie(job: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut St
         }
         Ok(())
     };
-    let total = st.total;
     let frame_end_time = |k: u64| -> Tick { if k >= total { span_end } else { job.settings.frame_time(comp, k) } };
     write_video(&mut mux, pending)?;
     write_audio_until(&mut mux, frame_end_time(first_end), &mut cursor)?;
     let mut i = first_end;
     while i < total {
         let end = (i + batch).min(total);
-        let frames: Vec<Vec<u8>> = job.frames(comp, (i..end).collect(), render).await;
-        for (k, px) in frames.iter().enumerate() {
-            let ps = venc.encode(px, i + k as u64)?;
-            write_video(&mut mux, ps)?;
-        }
-        write_audio_until(&mut mux, frame_end_time(end), &mut cursor)?;
+        let next_end = (end + batch).min(total);
+        let frames = std::mem::take(&mut ready);
+        let (done, next) = job
+            .beside(beside, batch_frames((end..next_end).collect()), || -> Result<()> {
+                for (k, px) in frames.iter().enumerate() {
+                    let ps = encode(&mut venc, px, i + k as u64)?;
+                    write_video(&mut mux, ps)?;
+                }
+                write_audio_until(&mut mux, frame_end_time(end), &mut cursor)
+            })
+            .await?;
+        done?;
+        ready = next;
         st.advance(end - i)?;
         i = end;
     }
@@ -382,8 +441,74 @@ pub(crate) async fn movie(job: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut St
 
 #[cfg(test)]
 mod tests {
+    use effectcraft_raster::yuv::{UNIT8, round_pos};
+
     use super::*;
 
+    /// The conversion as first written (per-pixel division and `f32::round`).
+    fn yuv420_reference(rgba: &[u8], w: usize, h: usize) -> (Vec<u8>, Vec<u8>, Vec<u8>) {
+        let (cw, ch) = (w.div_ceil(2), h.div_ceil(2));
+        let (mut y, mut u, mut v) = (vec![0u8; w * h], vec![0u8; cw * ch], vec![0u8; cw * ch]);
+        for cy in 0..ch {
+            let mut acc = vec![(0f32, 0f32, 0f32); cw];
+            for row in cy * 2..(cy * 2 + 2).min(h) {
+                for x in 0..w {
+                    let s = &rgba[(row * w + x) * 4..];
+                    let (r, g, b) = (s[0] as f32 / 255.0, s[1] as f32 / 255.0, s[2] as f32 / 255.0);
+                    let l = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+                    y[row * w + x] = (16.0 + 219.0 * l).round().clamp(1.0, 254.0) as u8;
+                    let a = &mut acc[x / 2];
+                    a.0 += (b - l) / 1.8556;
+                    a.1 += (r - l) / 1.5748;
+                    a.2 += 1.0;
+                }
+            }
+            for (cx, a) in acc.iter().enumerate() {
+                u[cy * cw + cx] = (128.0 + 224.0 * a.0 / a.2).round().clamp(1.0, 254.0) as u8;
+                v[cy * cw + cx] = (128.0 + 224.0 * a.1 / a.2).round().clamp(1.0, 254.0) as u8;
+            }
+        }
+        (y, u, v)
+    }
+
+    #[test]
+    fn round_pos_is_round() {
+        for i in 0..2_000_000u32 {
+            let v = i as f32 * 0.000_25;
+            assert_eq!(round_pos(v).to_bits(), v.round().to_bits(), "{v}");
+            let n = f32::from_bits(v.to_bits().wrapping_sub(1)).max(0.0);
+            assert_eq!(round_pos(n).to_bits(), n.round().to_bits(), "{n}");
+        }
+        for k in 0..1024u32 {
+            for v in [k as f32 + 0.5, f32::from_bits((k as f32 + 0.5).to_bits() - 1), f32::from_bits((k as f32 + 0.5).to_bits() + 1)] {
+                assert_eq!(round_pos(v), v.round(), "{v}");
+            }
+        }
+        for (i, u) in UNIT8.iter().enumerate() {
+            assert_eq!(u.to_bits(), (i as f32 / 255.0).to_bits());
+        }
+    }
+
+    #[test]
+    fn yuv420_matches_the_reference() {
+        // Every 8-bit level in every channel, odd sizes, and pseudo-random pixels.
+        for (w, h) in [(1, 1), (2, 2), (3, 5), (17, 9), (64, 33)] {
+            let mut rgba = vec![0u8; w * h * 4];
+            let mut seed = (w * 31 + h) as u32;
+            for (i, b) in rgba.iter_mut().enumerate() {
+                seed = seed.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
+                *b = if i % 7 == 0 { (i / 4 % 256) as u8 } else { (seed >> 24) as u8 };
+            }
+            let (mut y, mut u, mut v) = (vec![], vec![], vec![]);
+            rgba_to_yuv420(&rgba, w, h, &mut y, &mut u, &mut v);
+            assert_eq!((y, u, v), yuv420_reference(&rgba, w, h), "{w}x{h}");
+        }
+        let grey: Vec<u8> = (0..=255u8).flat_map(|g| [g, g, g, 255, g, 255 - g, g / 2, 255]).collect();
+        let (mut y, mut u, mut v) = (vec![], vec![], vec![]);
+        rgba_to_yuv420(&grey, 512, 1, &mut y, &mut u, &mut v);
+        assert_eq!((y, u, v), yuv420_reference(&grey, 512, 1));
+    }
+
     #[test]
     fn yuv_of_primaries() {
         let rgba = [255u8, 255, 255, 255, 0, 0, 0, 255, 255, 0, 0, 255, 0, 255, 0, 255];
diff --git a/crates/export/src/lib.rs b/crates/export/src/lib.rs
index eda979958..7ea28b571 100644
--- a/crates/export/src/lib.rs
+++ b/crates/export/src/lib.rs
@@ -13,7 +13,7 @@
 //! | AV1 | MP4 (`av01`) | `effectcraft-av1enc` Main 8/10-bit 4:2:0, key + inter frames | no | AAC-LC (FilmCraft) |
 //! | WAV / AIFF | RIFF WAVE / AIFF (AIFF-C for float) | — | — | PCM 16/24-bit or 32-bit float, mono/stereo (audio only) |
 //!
-//! Every frame goes through [`pipeline`]: the Render Settings overrides (Effects, Solo Switches,
+//! Every frame goes through the internal `pipeline` module: the Render Settings overrides (Effects, Solo Switches,
 //! Guide Layers, Frame Blending, Motion Blur, Color Depth), field rendering (two fields half a
 //! frame apart woven line by line, with optional 3:2 pulldown from film frames at 4/5 of the
 //! rate), then the Output Module's Crop (edges or the region of interest) and Resize. Channels
@@ -270,7 +270,7 @@ async fn sequence(cx: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut State<'_>)
                 let path = sequence_path(cx.path, f0 + k as i64);
                 // Encode in memory first: the storage hook decides where it fits.
                 let mut buf = std::io::Cursor::new(Vec::new());
-                write_still(cx, &mut buf, fmt, &img, comp, channels, w, h, cx.output.quality)?;
+                write_still(cx, &mut buf, &img, comp, StillOutput { format: fmt, channels, size: (w, h), quality: cx.output.quality })?;
                 let data = buf.into_inner();
                 let path = cx.place(&path, data.len() as u64);
                 let mut f = cx.create(&path)?;
@@ -287,18 +287,15 @@ async fn sequence(cx: &Cx<'_>, comp: &Comp, w: u32, h: u32, st: &mut State<'_>)
     Ok(Report { path: sequence_path(cx.path, f0), frames: 0, width: w, height: h, seconds: 0.0, bytes, audio: false, log: None, overflow: vec![] })
 }
 
-#[allow(clippy::too_many_arguments)]
-fn write_still<W: std::io::Write + std::io::Seek>(
-    cx: &Cx,
-    file: &mut W,
-    fmt: OutputFormat,
-    img: &Image,
-    comp: &Comp,
+struct StillOutput {
+    format: OutputFormat,
     channels: Channels,
-    w: u32,
-    h: u32,
+    size: (u32, u32),
     quality: u8,
-) -> Result<()> {
+}
+
+fn write_still<W: std::io::Write + std::io::Seek>(cx: &Cx, file: &mut W, img: &Image, comp: &Comp, output: StillOutput) -> Result<()> {
+    let StillOutput { format: fmt, channels, size: (w, h), quality } = output;
     use image::{ExtendedColorType, ImageEncoder, ImageFormat};
     match fmt {
         OutputFormat::ExrSequence => {
diff --git a/crates/export/src/pipeline.rs b/crates/export/src/pipeline.rs
index 8dcee03e4..ae52d3478 100644
--- a/crates/export/src/pipeline.rs
+++ b/crates/export/src/pipeline.rs
@@ -91,6 +91,24 @@ pub(crate) fn map_frames_while<I: Send, T: Send>(
     out
 }
 
+/// Threads that encode one batch of frames while the next renders ([`Cx::frames_beside`]).
+/// Their own pool: the encoder's parallel steps (colour conversion) would otherwise queue behind
+/// the render's work in the global pool. `None` where threads can't be started (a browser
+/// without them): encoding and rendering then take turns.
+pub(crate) struct Beside(Option<rayon::ThreadPool>);
+
+impl Beside {
+    fn new() -> Beside {
+        Beside(rayon::ThreadPoolBuilder::new().thread_name(|i| format!("export-encode-{i}")).build().ok())
+    }
+
+    /// The process's encode threads, started by the first movie export and shared by all.
+    pub fn shared() -> &'static Beside {
+        static SHARED: std::sync::OnceLock<Beside> = std::sync::OnceLock::new();
+        SHARED.get_or_init(Beside::new)
+    }
+}
+
 /// A job being exported: the job, the project with the Render Settings overrides applied, the
 /// job's layer cache and per-frame timing for the render log.
 pub(crate) struct Cx<'a> {
@@ -214,6 +232,52 @@ impl<'a> Cx<'a> {
         map_frames_while(ks, self.gpu_cap(), gpu_live, |k| self.frame(comp, k), f)
     }
 
+    /// [`Cx::frames`] for `ks` while `encode` runs beside them on `beside`'s threads, so the
+    /// render threads don't wait for the (largely sequential) encoder of the previous batch.
+    /// With deferred readbacks, or where no encode thread could be started, `encode` runs first.
+    #[cfg(test)]
+    pub async fn frames_beside<T: Send, A: Send>(
+        &self,
+        beside: &Beside,
+        comp: &Comp,
+        ks: Vec<u64>,
+        f: impl Fn(u64, Image) -> T + Sync + Send,
+        encode: impl FnOnce() -> A + Send,
+    ) -> crate::Result<(A, Vec<T>)> {
+        self.beside(beside, self.frames(comp, ks, f), encode).await
+    }
+
+    /// Run `encode` on `beside`'s threads while `frames` renders the next batch. With deferred
+    /// readbacks, or where no encode thread could be started, `encode` runs first.
+    pub async fn beside<T: Send, A: Send>(
+        &self,
+        beside: &Beside,
+        frames: impl std::future::Future<Output = Vec<T>>,
+        encode: impl FnOnce() -> A + Send,
+    ) -> crate::Result<(A, Vec<T>)> {
+        match &beside.0 {
+            Some(pool) if !self.deferred() => {
+                let mut done = None;
+                let frames = pool.in_place_scope(|s| {
+                    s.spawn(|_| done = Some(std::panic::catch_unwind(std::panic::AssertUnwindSafe(encode))));
+                    effectcraft_render::passes::block_on(frames)
+                });
+                match done {
+                    Some(Ok(a)) => Ok((a, frames)),
+                    Some(Err(panic)) => {
+                        let why = panic.downcast_ref::<&str>().map(|s| s.to_string()).or_else(|| panic.downcast_ref::<String>().cloned()).unwrap_or_default();
+                        Err(crate::ExportError::Encode(format!("the encoder stopped unexpectedly: {why}")))
+                    }
+                    None => Err(crate::ExportError::Encode("the encoder stopped unexpectedly".into())),
+                }
+            }
+            _ => {
+                let a = encode();
+                Ok((a, frames.await))
+            }
+        }
+    }
+
     /// GPU frames rendered at once (#879), decided once per batch: with a GPU accelerator every
     /// frame in flight holds its own working textures, so a whole batch rendered at once can
     /// exhaust VRAM (or shared memory, which crashes instead of falling back). `None` when the
@@ -247,11 +311,68 @@ impl<'a> Cx<'a> {
         }
         let img = self.crop_resize(img);
         if let Some(ft) = &self.frame_times {
-            ft.lock().unwrap_or_else(|e| e.into_inner()).push((i, t0.elapsed().as_secs_f64()));
+            ft.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push((i, t0.elapsed().as_secs_f64()));
         }
         img
     }
 
+    /// Output frame `i` as the H.264 export's 4:2:0 planes at `w`×`h`, rendered and converted
+    /// by the accelerator ([`effectcraft_render::Accelerator::comp_frame_yuv420`]). Only for
+    /// frames that need nothing done after the render (progressive, at the project's depth, no
+    /// crop or resize, rendered at exactly `w`×`h`). `None`: render it with [`Cx::frame`].
+    pub fn yuv420_frame(&self, comp: &Comp, i: u64, w: u32, h: u32) -> Option<Vec<u8>> {
+        if self.deferred() {
+            return None;
+        }
+        let FrameSample::Progressive(t) = self.job.settings.sample(comp, i) else { return None };
+        let depth = self.job.settings.color_depth;
+        if depth != ColorDepth::Current && depth.resolve(self.project.settings.bit_depth).levels().is_some() {
+            return None;
+        }
+        let om = self.job.output;
+        let scale = self.job.settings.resolution.clamp(0.01, 4.0);
+        let size = |n: u32| ((n as f64 * scale).round() as u32).max(1);
+        if om.resize.enabled || (size(comp.width), size(comp.height)) != (w, h) || om.crop.edges(w, h, scale) != (0, 0, 0, 0) {
+            return None;
+        }
+        let t0 = Instant::now();
+        let r = self.renderer();
+        let planes = r.active_accel()?.comp_frame_yuv420(&r, self.job.comp, t, comp.background)?;
+        let (cw, ch) = (w.div_ceil(2) as usize, h.div_ceil(2) as usize);
+        if planes.len() != w as usize * h as usize + 2 * cw * ch {
+            return None;
+        }
+        if let Some(ft) = &self.frame_times {
+            ft.lock().unwrap_or_else(|e| e.into_inner()).push((i, t0.elapsed().as_secs_f64()));
+        }
+        Some(planes)
+    }
+
+    /// Output frames `ks` for the H.264 encoder: the accelerator's planes
+    /// ([`Cx::yuv420_frame`]) where it can, otherwise `fallback` of the frame rendered as usual.
+    pub(crate) fn h264_frames<T: Send>(
+        &self,
+        comp: &Comp,
+        ks: Vec<u64>,
+        w: u32,
+        h: u32,
+        planes: impl Fn(Vec<u8>) -> T + Sync + Send,
+        fallback: impl Fn(u64, Image) -> T + Sync + Send,
+    ) -> Vec<T> {
+        // As in `frames`: once the GPU has stopped for good, the rest render in parallel.
+        let gpu_live = || self.job.accel.is_none_or(|a| a.available());
+        map_frames_while(
+            ks,
+            self.gpu_cap(),
+            gpu_live,
+            |k| self.yuv420_frame(comp, k, w, h).ok_or_else(|| self.frame(comp, k)),
+            |k, r| match r {
+                Ok(p) => planes(p),
+                Err(img) => fallback(k, img),
+            },
+        )
+    }
+
     /// Output Module ▸ Crop, then Resize.
     fn crop_resize(&self, img: Image) -> Image {
         let om = self.job.output;
@@ -327,7 +448,7 @@ impl<'a> Cx<'a> {
         for dir in &self.job.options.overflow {
             let p = std::path::Path::new(dir).join(&name).to_string_lossy().to_string();
             if q.has_room(&p, bytes) {
-                self.overflowed.lock().unwrap_or_else(|e| e.into_inner()).push(p.clone());
+                self.overflowed.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(p.clone());
                 return p;
             }
         }
@@ -351,7 +472,7 @@ impl<'a> Cx<'a> {
             Ok(r) => s.push_str(&format!("Result: Done ({} frames, {}×{}, {} bytes) in {seconds:.2} s\n", r.frames, r.width, r.height, r.bytes)),
             Err(e) => s.push_str(&format!("Result: Failed\nError: {e}\n")),
         }
-        let over = self.overflowed.lock().unwrap_or_else(|e| e.into_inner());
+        let over = self.overflowed.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
         if !over.is_empty() {
             s.push_str(&format!("Storage overflow: {} file(s) written to overflow folders (first: {})\n", over.len(), over[0]));
         }
@@ -366,7 +487,7 @@ impl<'a> Cx<'a> {
             }
         }
         if let (RenderLog::PlusPerFrameInfo, Some(ft), Some(c)) = (level, &self.frame_times, comp) {
-            let mut v = ft.lock().unwrap_or_else(|e| e.into_inner()).clone();
+            let mut v = ft.lock().unwrap_or_else(std::sync::PoisonError::into_inner).clone();
             v.sort_by_key(|(i, _)| *i);
             s.push_str("\nFrames:\n");
             let f0 = self.job.settings.first_frame(c);
@@ -706,6 +827,45 @@ mod tests {
         assert!(stats.hits >= 9, "{stats:?}");
     }
 
+    #[test]
+    fn frames_render_beside_the_encoder() {
+        use effectcraft_project::render_queue::{OutputFormat, OutputModule, RenderSettings};
+        use effectcraft_render::NoFootage;
+        use effectcraft_time::FrameRate;
+        let mut p = Project::default();
+        let comp = Comp::new(32, 16, FrameRate::FPS_25, Tick::from_seconds_f64(1.0));
+        let cid = p.add_item("Comp", effectcraft_color::Label::Sandstone, None, effectcraft_project::ItemKind::Comp(comp.into()));
+        let (settings, output) = (RenderSettings::default(), OutputModule::for_format(OutputFormat::H264));
+        let job = Job {
+            project: &p,
+            footage: &NoFootage,
+            expr: None,
+            accel: None,
+            comp: cid,
+            settings: &settings,
+            output: &output,
+            path: "/c/out.mp4",
+            sink: None,
+            nested_switches: true,
+            options: Default::default(),
+        };
+        let cx = Cx::new(&job);
+        let comp = cx.comp().unwrap();
+        use effectcraft_render::passes::block_on;
+        let want = block_on(cx.frames(comp, (0..6).collect(), |k, img| (k, img.width, img.height)));
+        // On threads of their own, and taking turns (no threads): the same frames, in order.
+        for beside in [Beside::shared(), &Beside(None)] {
+            let (a, frames) = block_on(cx.frames_beside(beside, comp, (0..6).collect(), |k, img| (k, img.width, img.height), || 7)).unwrap();
+            assert_eq!((a, &frames), (7, &want));
+        }
+        // A panicking encoder fails the export instead of taking the render thread down.
+        let r = block_on(cx.frames_beside(Beside::shared(), comp, vec![0], |k, _| k, || -> u32 { panic!("encoder bug") }));
+        match r {
+            Err(crate::ExportError::Encode(e)) => assert!(e.contains("encoder bug"), "{e}"),
+            other => panic!("{:?}", other.map(|(a, f)| (a, f.len()))),
+        }
+    }
+
     #[test]
     fn interleave_takes_alternate_lines() {
         let a = Image::filled(3, 4, [1.0, 0.0, 0.0, 1.0]);
diff --git a/crates/export/tests/audio_sample_positions.rs b/crates/export/tests/it/audio_sample_positions.rs
similarity index 100%
rename from crates/export/tests/audio_sample_positions.rs
rename to crates/export/tests/it/audio_sample_positions.rs
diff --git a/crates/export/tests/it/h264_gpu_yuv.rs b/crates/export/tests/it/h264_gpu_yuv.rs
new file mode 100644
index 000000000..59e670779
--- /dev/null
+++ b/crates/export/tests/it/h264_gpu_yuv.rs
@@ -0,0 +1,180 @@
+//! H.264 export with an accelerator that converts frames to 4:2:0 itself
+//! (`Accelerator::comp_frame_yuv420`): the file is the same as the CPU conversion's, and frames
+//! the accelerator can't take (odd sizes, crop) fall back to the RGBA path.
+
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+use effectcraft_color::Label;
+use effectcraft_export::render_queue::{OutputFormat, OutputModule, RenderSettings, TimeSpan};
+use effectcraft_export::{Job, export};
+use effectcraft_project::{Comp, ItemId, ItemKind, LayerSource, Project, Solid, build};
+use effectcraft_raster::Image;
+use effectcraft_render::{Accelerator, NoFootage, Renderer};
+use effectcraft_time::{FrameRate, Tick};
+
+/// Renders on the CPU; converts to 4:2:0 with the export's own function when `yuv` is set.
+/// `deferred`: claims deferred readbacks (a browser worker's GPU), whose frames render in passes.
+/// `stop_after`: the device stops for good after that many planes (`available` turns false).
+struct Fake {
+    yuv: bool,
+    yuv_frames: AtomicUsize,
+    deferred: bool,
+    stop_after: usize,
+    /// Frames asking for planes right now, and the most at once after the stop.
+    asking: AtomicUsize,
+    most_after_stop: AtomicUsize,
+}
+
+impl Fake {
+    fn new(yuv: bool, deferred: bool, stop_after: usize) -> Self {
+        Fake { yuv, yuv_frames: AtomicUsize::new(0), deferred, stop_after, asking: AtomicUsize::new(0), most_after_stop: AtomicUsize::new(0) }
+    }
+}
+
+impl Accelerator for Fake {
+    fn name(&self) -> String {
+        "fake".into()
+    }
+    fn comp_frame(&self, r: &Renderer, comp: ItemId, t: Tick) -> Option<Image> {
+        Some(r.comp_frame_cpu(comp, t))
+    }
+    fn comp_frame_yuv420(&self, r: &Renderer, comp: ItemId, t: Tick, bg: [f32; 3]) -> Option<Vec<u8>> {
+        if !self.yuv {
+            return None;
+        }
+        if self.yuv_frames.fetch_add(1, Ordering::SeqCst) >= self.stop_after {
+            self.yuv_frames.fetch_sub(1, Ordering::SeqCst);
+            // Stopped: every frame still asks first, so asks that overlap are frames rendering at once.
+            let now = self.asking.fetch_add(1, Ordering::SeqCst) + 1;
+            self.most_after_stop.fetch_max(now, Ordering::SeqCst);
+            std::thread::sleep(std::time::Duration::from_millis(30));
+            self.asking.fetch_sub(1, Ordering::SeqCst);
+            return None;
+        }
+        Some(effectcraft_raster::yuv::yuv420_over(&r.comp_frame_cpu(comp, t), bg))
+    }
+    fn available(&self) -> bool {
+        self.yuv_frames.load(Ordering::SeqCst) < self.stop_after
+    }
+    fn miss_gate(&self) -> Option<std::sync::Arc<std::sync::atomic::AtomicBool>> {
+        self.deferred.then(Default::default)
+    }
+    fn supports_effect(&self, _id: &str) -> bool {
+        false
+    }
+    fn effects(&self, _chain: &[effectcraft_render::FxStep], _buf: &effectcraft_effects::Buf, _levels: Option<f32>) -> Option<effectcraft_effects::Buf> {
+        None
+    }
+}
+
+fn out_dir(name: &str) -> PathBuf {
+    let d = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/export").join(name);
+    let _ = std::fs::remove_dir_all(&d);
+    std::fs::create_dir_all(&d).expect("mkdir");
+    d
+}
+
+fn project() -> (Project, ItemId) {
+    let mut p = Project::default();
+    p.settings.gpu_acceleration = true;
+    let mut comp = Comp::new(64, 48, FrameRate::new(10, 1), Tick::from_seconds_f64(0.6));
+    comp.background = [0.1, 0.1, 0.4];
+    let sid = p.add_item("Red", Label::Red, None, ItemKind::Solid(Solid { color: [1.0, 0.2, 0.0], width: 30, height: 20, pixel_aspect: 1.0 }));
+    let mut l = build::layer(&mut p, &comp, "Red", LayerSource::Solid { item: sid }, (30, 20), None);
+    l.in_point = comp.frame_rate.tick_of(2);
+    comp.layers.push(l);
+    let cid = p.add_item("Comp 1", Label::Sandstone, None, ItemKind::Comp(comp.into()));
+    (p, cid)
+}
+
+fn run(p: &Project, cid: ItemId, accel: Option<&dyn Accelerator>, s: &RenderSettings, path: &Path) -> Vec<u8> {
+    let om = OutputModule { bitrate_kbps: 4000, ..OutputModule::for_format(OutputFormat::H264) };
+    let path = path.to_string_lossy().to_string();
+    let job = Job {
+        project: p,
+        footage: &NoFootage,
+        expr: None,
+        accel,
+        comp: cid,
+        settings: s,
+        output: &om,
+        path: &path,
+        sink: None,
+        options: Default::default(),
+        nested_switches: true,
+    };
+    export(&job, &mut |_| true).expect("export");
+    std::fs::read(&path).expect("read")
+}
+
+#[test]
+fn accelerator_planes_encode_like_the_cpu_conversion() {
+    let d = out_dir("h264-gpu-yuv");
+    let (mut p, cid) = project();
+    // Across more than one 16-frame batch so the second batch renders beside the encoder.
+    p.comp_mut(cid).unwrap().duration = Tick::from_seconds_f64(2.0);
+    let s = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    let yuv = Fake::new(true, false, usize::MAX);
+    let rgba = Fake::new(false, false, usize::MAX);
+    let yuv_mp4 = d.join("yuv.mp4");
+    let a = run(&p, cid, Some(&yuv), &s, &yuv_mp4);
+    let b = run(&p, cid, Some(&rgba), &s, &d.join("rgba.mp4"));
+    let c = run(&p, cid, None, &s, &d.join("cpu.mp4"));
+    assert_eq!(yuv.yuv_frames.load(Ordering::SeqCst), 20, "every frame came from the accelerator");
+    assert!(a == b && b == c, "the three files differ");
+    let f = effectcraft_media::probe(&yuv_mp4).expect("probe yuv.mp4");
+    assert_eq!((f.width, f.height), (64, 48));
+    assert_eq!(f.frame_rate.frame_at(f.duration - Tick(1)) + 1, 20);
+    let pool = effectcraft_media::MediaPool::new();
+    for k in 0..20 {
+        let img = pool.frame_at(&f, f.frame_rate.tick_of(k)).expect("decode frame");
+        assert_eq!((img.width, img.height), (64, 48));
+    }
+}
+
+#[test]
+fn frames_the_accelerator_cannot_take_fall_back_to_rgba() {
+    let d = out_dir("h264-gpu-yuv-fallback");
+    let (p, cid) = project();
+    let base = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    // Renders at 62×47, encodes at 62×46 (the codec size): planes of the render would not fit.
+    let odd = RenderSettings { resolution: 31.0 / 32.0, ..base.clone() };
+    let yuv = Fake::new(true, false, usize::MAX);
+    let a = run(&p, cid, Some(&yuv), &odd, &d.join("yuv.mp4"));
+    let c = run(&p, cid, None, &odd, &d.join("cpu.mp4"));
+    assert_eq!(yuv.yuv_frames.load(Ordering::SeqCst), 0);
+    assert!(a == c);
+}
+
+/// With deferred readbacks the export keeps rendering frames in passes (`Cx::frames`), never
+/// through the blocking per-frame path the planes use.
+#[test]
+fn deferred_accelerators_keep_the_pass_based_path() {
+    let d = out_dir("h264-gpu-yuv-deferred");
+    let (p, cid) = project();
+    let s = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    let deferred = Fake::new(true, true, usize::MAX);
+    let a = run(&p, cid, Some(&deferred), &s, &d.join("deferred.mp4"));
+    let c = run(&p, cid, None, &s, &d.join("cpu.mp4"));
+    assert_eq!(deferred.yuv_frames.load(Ordering::SeqCst), 0, "no planes asked for");
+    assert!(a == c);
+}
+
+/// An accelerator that stops for good mid-export (`available` false): the frames left render
+/// on the CPU side by side, not one at a time under the GPU's frames-in-flight cap (as
+/// `Cx::frames` does), and the file is still the CPU's.
+#[test]
+fn frames_after_the_accelerator_stops_render_on_the_cpu() {
+    let d = out_dir("h264-gpu-yuv-stops");
+    let (p, cid) = project();
+    let s = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    let stops = Fake::new(true, false, 1);
+    // Enough threads for frames to overlap wherever the machine runs it.
+    let pool = rayon::ThreadPoolBuilder::new().num_threads(4).build().unwrap();
+    let a = pool.install(|| run(&p, cid, Some(&stops), &s, &d.join("stops.mp4")));
+    let c = run(&p, cid, None, &s, &d.join("cpu.mp4"));
+    assert_eq!(stops.yuv_frames.load(Ordering::SeqCst), 1, "planes only until the stop");
+    assert!(stops.most_after_stop.load(Ordering::SeqCst) > 1, "frames after the stop rendered one at a time");
+    assert!(a == c);
+}
diff --git a/crates/export/tests/hevc_av1_roundtrip.rs b/crates/export/tests/it/hevc_av1_roundtrip.rs
similarity index 100%
rename from crates/export/tests/hevc_av1_roundtrip.rs
rename to crates/export/tests/it/hevc_av1_roundtrip.rs
diff --git a/crates/export/tests/it/main.rs b/crates/export/tests/it/main.rs
new file mode 100644
index 000000000..9b37d1809
--- /dev/null
+++ b/crates/export/tests/it/main.rs
@@ -0,0 +1,16 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod audio_sample_positions;
+mod h264_gpu_yuv;
+mod hevc_av1_roundtrip;
+#[cfg(not(target_arch = "wasm32"))]
+mod mov_audio_sample_positions;
+mod movie_bytes;
+mod ms_rounded_footage;
+#[cfg(not(target_arch = "wasm32"))]
+mod native_audio_sample_positions;
+mod opus_roundtrip;
+mod render_settings;
+mod roundtrip;
+mod uncompressed_mov;
+mod vp9_roundtrip;
diff --git a/crates/export/tests/mov_audio_sample_positions.rs b/crates/export/tests/it/mov_audio_sample_positions.rs
similarity index 99%
rename from crates/export/tests/mov_audio_sample_positions.rs
rename to crates/export/tests/it/mov_audio_sample_positions.rs
index c58d2b14d..a46a49271 100644
--- a/crates/export/tests/mov_audio_sample_positions.rs
+++ b/crates/export/tests/it/mov_audio_sample_positions.rs
@@ -1,5 +1,3 @@
-#![cfg(not(target_arch = "wasm32"))]
-
 //! Tiny native WAV to ProRes PCM MOV sample-position proof.
 use effectcraft_export::render_queue::{AudioFormat, OutputFormat, OutputModule, RenderSettings};
 use effectcraft_export::{Job, JobOptions, Sink, export};
diff --git a/crates/export/tests/it/movie_bytes.rs b/crates/export/tests/it/movie_bytes.rs
new file mode 100644
index 000000000..5f1f8eb6b
--- /dev/null
+++ b/crates/export/tests/it/movie_bytes.rs
@@ -0,0 +1,104 @@
+//! Movie exports pinned byte for byte: a comp longer than one render batch, with a rotating
+//! stroked ring (mostly transparent, bilinear), a fading half-transparent solid at a fractional
+//! position and a Screen-mode shape, in 8 bpc. The comp is at most four macroblock rows high,
+//! so the H.264 encoder writes one slice per frame on any number of cores. The hashes are those of the files written before
+//! frames rendered while the previous batch encoded, before transparent source tiles were
+//! skipped and before blended pixels were quantised as they were drawn: those changes must not
+//! move a single byte.
+
+use effectcraft_color::{BlendMode, Label};
+use effectcraft_export::render_queue::{OutputFormat, OutputModule, RenderSettings, TimeSpan};
+use effectcraft_export::{Job, Sink, export};
+use effectcraft_keyframe::{Keyframe, Value};
+use effectcraft_project::build::{self, Ids};
+use effectcraft_project::{Comp, ItemId, ItemKind, LayerSource, Project, Solid};
+use effectcraft_render::NoFootage;
+use effectcraft_time::{FrameRate, Tick};
+
+fn fnv1a(data: &[u8]) -> u64 {
+    data.iter().fold(0xcbf2_9ce4_8422_2325u64, |h, &b| (h ^ b as u64).wrapping_mul(0x100_0000_01b3))
+}
+
+fn project() -> (Project, ItemId) {
+    let mut p = Project::default();
+    let mut comp = Comp::new(160, 64, FrameRate::new(30, 1), Tick::from_seconds_f64(2.0));
+    comp.background = [0.05, 0.1, 0.3];
+    let t = Tick::from_seconds_f64;
+
+    let sid = p.add_item("Half", Label::Red, None, ItemKind::Solid(Solid { color: [0.9, 0.5, 0.1], width: 70, height: 40, pixel_aspect: 1.0 }));
+    let mut solid = build::layer(&mut p, &comp, "Half", LayerSource::Solid { item: sid }, (70, 40), None);
+    if let Some(pr) = solid.props.prop_mut("transform/position") {
+        pr.value = Value::Vec3([60.25, 36.5, 0.0]);
+    }
+    if let Some(pr) = solid.props.prop_mut("transform/opacity") {
+        pr.keys = vec![Keyframe::new(t(0.0), Value::Scalar(20.0)), Keyframe::new(t(2.0), Value::Scalar(70.0))];
+    }
+
+    let mut ring = build::layer(&mut p, &comp, "Ring", LayerSource::Shape, (160, 64), None);
+    let mut box_ = build::layer(&mut p, &comp, "Box", LayerSource::Shape, (160, 64), None);
+    let mut next = p.next_id;
+    {
+        let mut ids = Ids(&mut next);
+        let e = build::shape_ellipse(&mut ids, [56.0, 56.0], [0.0, 0.0]);
+        let s = build::shape_stroke(&mut ids, [0.3, 0.8, 1.0, 1.0], 3.0);
+        let g = build::shape_group(&mut ids, "Ring", vec![e, s]);
+        if let Some(c) = ring.props.sub_mut("contents") {
+            c.children.push(g.into());
+        }
+        let r = build::shape_rect(&mut ids, [30.0, 20.0], [25.0, -10.0], 4.0);
+        let f = build::shape_fill(&mut ids, [0.2, 1.0, 0.4, 0.8]);
+        let g = build::shape_group(&mut ids, "Box", vec![r, f]);
+        if let Some(c) = box_.props.sub_mut("contents") {
+            c.children.push(g.into());
+        }
+    }
+    p.next_id = next;
+    if let Some(pr) = ring.props.prop_mut("transform/rotation") {
+        pr.keys = vec![Keyframe::new(t(0.0), Value::Scalar(0.0)), Keyframe::new(t(2.0), Value::Scalar(130.0))];
+    }
+    if let Some(pr) = box_.props.prop_mut("transform/position") {
+        pr.keys = vec![Keyframe::new(t(0.0), Value::Vec3([70.0, 30.0, 0.0])), Keyframe::new(t(2.0), Value::Vec3([95.5, 38.25, 0.0]))];
+    }
+    box_.blend_mode = BlendMode::Screen;
+
+    comp.layers = vec![box_, ring, solid];
+    let cid = p.add_item("Comp 1", Label::Sandstone, None, ItemKind::Comp(comp.into()));
+    (p, cid)
+}
+
+fn export_bytes(format: OutputFormat, name: &str) -> Vec<u8> {
+    let (p, cid) = project();
+    let settings = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    let om = OutputModule::for_format(format);
+    let out = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
+    let file = out.clone();
+    let sink: &Sink = &move |_: &str, data: Vec<u8>| *file.lock().unwrap() = data;
+    let job = Job {
+        project: &p,
+        footage: &NoFootage,
+        expr: None,
+        accel: None,
+        comp: cid,
+        settings: &settings,
+        output: &om,
+        path: name,
+        sink: Some(sink),
+        options: Default::default(),
+        nested_switches: true,
+    };
+    let r = export(&job, &mut |_| true).expect("export");
+    assert_eq!(r.frames, 60);
+    std::mem::take(&mut *out.lock().unwrap())
+}
+
+#[test]
+fn h264_movie_bytes_are_pinned() {
+    let data = export_bytes(OutputFormat::H264, "/out/pinned.mp4");
+    assert_eq!((data.len(), fnv1a(&data)), (104_161, 10_466_446_817_305_548_344), "H.264 MP4");
+}
+
+#[test]
+fn prores_movie_bytes_are_pinned() {
+    let data = export_bytes(OutputFormat::ProRes, "/out/pinned.mov");
+    assert_eq!((data.len(), fnv1a(&data)), (270_094, 8_038_709_743_204_075_800), "ProRes MOV");
+}
diff --git a/crates/export/tests/it/ms_rounded_footage.rs b/crates/export/tests/it/ms_rounded_footage.rs
new file mode 100644
index 000000000..3d6880232
--- /dev/null
+++ b/crates/export/tests/it/ms_rounded_footage.rs
@@ -0,0 +1,148 @@
+//! Footage whose frame times are rounded to whole milliseconds (#1442), as phones and messaging
+//! apps write MP4s: a 30 fps clip's frames last 33 or 34 ms, a 60 fps clip's 16 or 17 ms. It
+//! imports at its true rate, a comp made from it (New Comp from Selection takes the footage's
+//! rate) renders every source frame once, and the H.264 output has that rate and frame count.
+//!
+//! The fixtures are written here with FilmCraft's own encoder and muxer: 128×32 frames showing
+//! their index in binary (eight bars, white for a set bit).
+
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
+use effectcraft_color::Label;
+use effectcraft_export::render_queue::{OutputFormat, OutputModule, RenderSettings, TimeSpan};
+use effectcraft_export::{Job, export};
+use effectcraft_media::MediaPool;
+use effectcraft_project::{Comp, Footage, ItemKind, LayerSource, Project, build};
+use effectcraft_raster::Image;
+use effectcraft_time::{FrameRate, Tick};
+use filmcraft_isobmff::{AvcConfig, Brand, Mp4Writer, SampleEntry, TrackConfig, WriteSample, WriterOptions};
+
+const W: u32 = 128;
+const H: u32 = 32;
+const BARS: u32 = 8;
+
+fn out_dir(name: &str) -> PathBuf {
+    let d = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/export").join(name);
+    let _ = std::fs::remove_dir_all(&d);
+    std::fs::create_dir_all(&d).expect("mkdir");
+    d
+}
+
+/// Durations of `n` frames at `rate` with their times rounded to whole milliseconds.
+fn ms_rounded(rate: FrameRate, n: i64) -> Vec<u32> {
+    let at = |k: i64| (2 * k * 1000 * rate.den + rate.num) / (2 * rate.num);
+    (0..n).map(|k| u32::try_from(at(k + 1) - at(k)).expect("duration")).collect()
+}
+
+/// An H.264 MP4 (video track timescale 1000) with one frame per entry of `durations` (ms);
+/// frame k shows k in binary.
+fn write_movie(path: &Path, durations: &[u32]) {
+    let mut cfg = filmcraft_h264enc::EncoderConfig::new(W, H, 30, 1);
+    cfg.format = filmcraft_h264enc::PacketFormat::LengthPrefixed;
+    cfg.aud = false;
+    cfg.bframes = 0;
+    cfg.keyint = 30;
+    cfg.scenecut = false;
+    let mut enc = filmcraft_h264enc::Encoder::new(cfg).expect("encoder");
+    let (u, v) = (vec![128u8; (W * H / 4) as usize], vec![128u8; (W * H / 4) as usize]);
+    let mut packets = Vec::new();
+    for k in 0..durations.len() {
+        let y: Vec<u8> = (0..W * H).map(|i| if (k >> (i % W * BARS / W)) & 1 == 1 { 235 } else { 16 }).collect();
+        let frame = filmcraft_h264enc::YuvFrame { y: &y, u: &u, v: &v, y_stride: W as usize, uv_stride: W as usize / 2 };
+        packets.extend(enc.try_encode(&frame, k as i64).expect("encode"));
+    }
+    packets.extend(enc.flush());
+    assert_eq!(packets.len(), durations.len(), "one access unit per frame");
+    let avcc = AvcConfig::parse(&enc.avcc()).expect("avcC");
+    let file = std::fs::File::create(path).expect("create");
+    let mut mux = Mp4Writer::new(file, WriterOptions::new(Brand::Mp4)).expect("mux");
+    let t = mux.add_track(TrackConfig::new(SampleEntry::avc(avcc, W as u16, H as u16), 1000)).expect("track");
+    for (p, &duration) in packets.iter().zip(durations) {
+        mux.write_sample(t, WriteSample { data: &p.data, duration, composition_offset: 0, is_sync: p.keyframe }).expect("sample");
+    }
+    mux.finish().expect("finish");
+}
+
+/// The frame index a decoded frame shows.
+fn shown(img: &Image) -> u32 {
+    (0..BARS).filter(|b| img.data[img.idx(b * W / BARS + W / BARS / 2, H / 2)][1] > 0.5).map(|b| 1 << b).sum()
+}
+
+fn frame_count(f: &Footage) -> i64 {
+    f.frame_rate.frame_at(f.duration - Tick(1)) + 1
+}
+
+/// Every frame of a movie in order, as indices.
+fn frames_of(f: &Footage) -> Vec<u32> {
+    let pool = MediaPool::new();
+    (0..frame_count(f)).map(|k| shown(&pool.frame_at(f, f.frame_rate.tick_of(k)).expect("decode"))).collect()
+}
+
+/// Import `path`, make a comp from it as New Comp from Selection does (the footage's size, rate
+/// and duration), render it to H.264 and return the output's footage.
+fn comp_from_footage(path: &Path, out: &Path) -> Footage {
+    let footage = effectcraft_media::probe(path).expect("probe");
+    let mut p = Project::default();
+    let fid = p.add_item("clip.mp4", Label::Aqua, None, ItemKind::Footage(footage.clone()));
+    let rate = p.item(fid).and_then(|it| it.frame_rate()).expect("a movie has a rate");
+    let mut comp = Comp::new(W, H, rate, footage.duration);
+    comp.layers.push(build::layer(&mut p, &comp, "clip.mp4", LayerSource::Footage { item: fid }, (W, H), None));
+    let cid = p.add_item("clip", Label::Sandstone, None, ItemKind::Comp(comp.into()));
+    let pool = MediaPool::new();
+    let settings = RenderSettings { time_span: TimeSpan::LengthOfComp, ..Default::default() };
+    let om = OutputModule { bitrate_kbps: 4000, ..OutputModule::for_format(OutputFormat::H264) };
+    let out_path = out.to_string_lossy().to_string();
+    let job = Job {
+        project: &p,
+        footage: &pool,
+        expr: None,
+        accel: None,
+        comp: cid,
+        settings: &settings,
+        output: &om,
+        path: &out_path,
+        sink: None,
+        options: Default::default(),
+        nested_switches: true,
+    };
+    let r = export(&job, &mut |_| true).expect("export");
+    assert_eq!(r.frames as i64, frame_count(&footage), "the render has the footage's frames");
+    effectcraft_media::probe(out).expect("probe the render")
+}
+
+#[test]
+fn millisecond_rounded_footage_keeps_its_rate_through_comp_and_render() {
+    let d = out_dir("ms_rounded");
+    for (rate, frames) in [(FrameRate::FPS_30, 120), (FrameRate::FPS_60, 240)] {
+        let path = d.join(format!("ms-{}.mp4", rate.num));
+        write_movie(&path, &ms_rounded(rate, frames));
+        let f = effectcraft_media::probe(&path).expect("probe");
+        assert_eq!((f.frame_rate, frame_count(&f)), (rate, frames), "{rate:?} footage");
+        let bytes: Arc<[u8]> = std::fs::read(&path).expect("read").into();
+        let from_bytes = effectcraft_media::probe_bytes(&path.to_string_lossy(), bytes).expect("probe bytes");
+        assert_eq!(from_bytes.frame_rate, rate, "{rate:?} footage read from memory");
+        let all: Vec<u32> = (0..frames as u32).collect();
+        assert_eq!(frames_of(&f), all, "{rate:?} footage: each source frame once");
+
+        let out = comp_from_footage(&path, &d.join(format!("render-{}.mp4", rate.num)));
+        assert_eq!((out.frame_rate, frame_count(&out)), (rate, frames), "{rate:?} render");
+        assert_eq!(out.duration, Tick::from_seconds_f64(4.0), "{rate:?} render duration");
+        assert_eq!(frames_of(&out), all, "{rate:?} render: no frame skipped or repeated");
+    }
+}
+
+#[test]
+fn ntsc_and_variable_rate_footage_is_not_pulled_to_a_round_rate() {
+    let d = out_dir("ms_rounded_controls");
+    for rate in [FrameRate::FPS_23_976, FrameRate::FPS_29_97, FrameRate::FPS_59_94] {
+        let path = d.join(format!("ms-{}.mp4", rate.num));
+        write_movie(&path, &ms_rounded(rate, 60));
+        assert_eq!(effectcraft_media::probe(&path).expect("probe").frame_rate, rate);
+    }
+    // Frames of 40, 45 and 50 ms: the reader's median (45 ms, 22.2 fps) stands.
+    let path = d.join("variable.mp4");
+    write_movie(&path, &[40, 45, 50].repeat(20));
+    let f = effectcraft_media::probe(&path).expect("probe");
+    assert!(!FrameRate::COMMON.contains(&f.frame_rate) && (f.frame_rate.as_f64() - 1000.0 / 45.0).abs() < 0.01, "{:?}", f.frame_rate);
+}
diff --git a/crates/export/tests/native_audio_sample_positions.rs b/crates/export/tests/it/native_audio_sample_positions.rs
similarity index 99%
rename from crates/export/tests/native_audio_sample_positions.rs
rename to crates/export/tests/it/native_audio_sample_positions.rs
index 1b59e8c11..9222d0f23 100644
--- a/crates/export/tests/native_audio_sample_positions.rs
+++ b/crates/export/tests/it/native_audio_sample_positions.rs
@@ -1,5 +1,3 @@
-#![cfg(not(target_arch = "wasm32"))]
-
 //! Native MediaPool decoding and native WAV export preserve selected sample positions.
 use effectcraft_export::render_queue::{AudioFormat, OutputFormat, OutputModule, RenderSettings};
 use effectcraft_export::{Job, JobOptions, Sink, export};
diff --git a/crates/export/tests/opus_roundtrip.rs b/crates/export/tests/it/opus_roundtrip.rs
similarity index 100%
rename from crates/export/tests/opus_roundtrip.rs
rename to crates/export/tests/it/opus_roundtrip.rs
diff --git a/crates/export/tests/render_settings.rs b/crates/export/tests/it/render_settings.rs
similarity index 99%
rename from crates/export/tests/render_settings.rs
rename to crates/export/tests/it/render_settings.rs
index 9e9a0a18f..465d8e5fe 100644
--- a/crates/export/tests/render_settings.rs
+++ b/crates/export/tests/it/render_settings.rs
@@ -45,7 +45,7 @@ fn custom(start: f64, end: f64) -> RenderSettings {
 }
 
 fn run_with(p: &Project, cid: ItemId, s: &RenderSettings, om: &OutputModule, path: &str, options: JobOptions, cancel: bool) -> (Result<Report, String>, Files) {
-    run_on(p, cid, s, om, path, options, None, cancel)
+    run_on(p, cid, s, om, path, options, (None, cancel))
 }
 
 /// [`run_with`] with an accelerator.
@@ -56,9 +56,9 @@ fn run_on(
     om: &OutputModule,
     path: &str,
     options: JobOptions,
-    accel: Option<&dyn Accelerator>,
-    cancel: bool,
+    execution: (Option<&dyn Accelerator>, bool),
 ) -> (Result<Report, String>, Files) {
+    let (accel, cancel) = execution;
     let files: Files = Default::default();
     let f = files.clone();
     let sink: Box<Sink> = Box::new(move |path: &str, data: Vec<u8>| f.lock().unwrap().push((path.to_string(), data)));
@@ -456,7 +456,7 @@ fn a_job_renders_on_one_compositor() {
     let om = OutputModule::for_format(OutputFormat::PngSequence);
     let s = custom(0.0, 0.4);
     let render = |p: &Project, accel: &GreenAccel, path: &str| {
-        let (r, files) = run_on(p, cid, &s, &om, path, JobOptions::default(), Some(accel), false);
+        let (r, files) = run_on(p, cid, &s, &om, path, JobOptions::default(), (Some(accel), false));
         r.expect("export");
         (0..10).map(|i| png(&files, i)).collect::<Vec<_>>()
     };
diff --git a/crates/export/tests/roundtrip.rs b/crates/export/tests/it/roundtrip.rs
similarity index 100%
rename from crates/export/tests/roundtrip.rs
rename to crates/export/tests/it/roundtrip.rs
diff --git a/crates/export/tests/uncompressed_mov.rs b/crates/export/tests/it/uncompressed_mov.rs
similarity index 100%
rename from crates/export/tests/uncompressed_mov.rs
rename to crates/export/tests/it/uncompressed_mov.rs
diff --git a/crates/export/tests/vp9_roundtrip.rs b/crates/export/tests/it/vp9_roundtrip.rs
similarity index 100%
rename from crates/export/tests/vp9_roundtrip.rs
rename to crates/export/tests/it/vp9_roundtrip.rs
diff --git a/crates/expr/src/host.rs b/crates/expr/src/host.rs
index 87d2d8be8..a25fbc4f0 100644
--- a/crates/expr/src/host.rs
+++ b/crates/expr/src/host.rs
@@ -37,8 +37,12 @@ pub enum Req {
     LayerLookup { comp: u64, key: Key },
     /// `[name, index, inPoint, outPoint, startTime, width, height, parentId|null, hasVideo, is3D, source, enabled]`.
     LayerInfo { comp: u64, layer: u64 },
-    /// `[path, isGroup, name, matchName, numChildren]` or null.
+    /// `[path, isGroup, name, matchName, numChildren, propertyIndex]` or null.
     Child { comp: u64, layer: u64, group: String, key: Key },
+    /// `propertyGroup(up)` of the property or group at `path`: the group `up` levels above it as
+    /// `[path, isGroup, name, matchName, numChildren, propertyIndex]`, `"layer"` when that is the
+    /// layer itself, or null above the layer.
+    Ancestor { comp: u64, layer: u64, path: String, up: i64 },
     /// `[name, uid, kind, dims, keyTimes, keyValues, hasExpression, propertyIndex, matchName]`.
     PropInfo { comp: u64, layer: u64, path: String },
     /// Value at comp time `t`; `pre` = keyframes only (no expression).
@@ -256,6 +260,18 @@ fn alias(key: &str) -> &str {
     }
 }
 
+/// A child node as expression data (see [`Req::Child`]); `index` is 1-based among its siblings.
+fn node_resp(path: String, n: &Node, index: usize) -> Resp {
+    Resp::List(vec![
+        Resp::Str(path),
+        Resp::Bool(n.as_group().is_some()),
+        Resp::Str(n.name().into()),
+        Resp::Str(n.match_id().into()),
+        Resp::Num(n.as_group().map_or(0, |g| g.children.len()) as f64),
+        Resp::Num(index as f64),
+    ])
+}
+
 fn find_child<'g>(g: &'g PropGroup, key: &Key) -> Option<&'g Node> {
     match key {
         Key::Index(i) => usize::try_from(*i).ok().filter(|i| *i >= 1).and_then(|i| g.children.get(i - 1)),
@@ -297,6 +313,32 @@ impl<'a> Resolver<'a> {
         self.try_resolve(req).unwrap_or(Resp::Null)
     }
 
+    /// Resolve an ancestor from its UID path while preserving child indexing.
+    fn ancestor(&self, comp: u64, layer: u64, path: &str, up: i64) -> Option<Resp> {
+        let l = self.layer(comp, layer)?;
+        // The node's full `@uid/@uid/…` path from the layer: its ancestors are its prefixes.
+        let uid = match self.prop(comp, layer, path) {
+            Some((_, p)) => p.uid,
+            None => l.props.node(path)?.uid(),
+        };
+        let full = l.props.path_of(uid)?;
+        let segs: Vec<&str> = full.split('/').collect();
+        let up = usize::try_from(up).ok().filter(|u| *u >= 1 && *u <= segs.len())?;
+        if up == segs.len() {
+            return Some(Resp::Str("layer".into()));
+        }
+        let keep = segs.len() - up;
+        let group_path = segs.get(..keep)?.join("/");
+        let parent = match keep {
+            1 => &l.props,
+            _ => l.props.group(&segs.get(..keep - 1)?.join("/"))?,
+        };
+        let uid = segs.get(keep - 1)?.strip_prefix('@')?.parse::<u64>().ok()?;
+        let index = parent.children.iter().position(|c| c.uid() == uid)?;
+        let n = parent.children.get(index)?;
+        Some(node_resp(group_path, n, index + 1))
+    }
+
     fn try_resolve(&self, req: &Req) -> Option<Resp> {
         let project = self.ctx.project;
         Some(match req {
@@ -353,16 +395,11 @@ impl<'a> Resolver<'a> {
                 let l = self.layer(*comp, *layer)?;
                 let g = if group.is_empty() { &l.props } else { l.props.group(group)? };
                 let n = find_child(g, key)?;
+                let index = g.children.iter().position(|c| c.uid() == n.uid()).unwrap_or(0) + 1;
                 let path = if group.is_empty() { format!("@{}", n.uid()) } else { format!("{group}/@{}", n.uid()) };
-                let count = n.as_group().map_or(0, |g| g.children.len());
-                Resp::List(vec![
-                    Resp::Str(path),
-                    Resp::Bool(n.as_group().is_some()),
-                    Resp::Str(n.name().into()),
-                    Resp::Str(n.match_id().into()),
-                    Resp::Num(count as f64),
-                ])
+                node_resp(path, n, index)
             }
+            Req::Ancestor { comp, layer, path, up } => return self.ancestor(*comp, *layer, path, *up),
             Req::PropInfo { comp, layer, path } => {
                 let (l, p) = self.prop(*comp, *layer, path)?;
                 let dims = prop_dims(l, p);
diff --git a/crates/expr/src/lib.rs b/crates/expr/src/lib.rs
index 4963810c4..c77af5b37 100644
--- a/crates/expr/src/lib.rs
+++ b/crates/expr/src/lib.rs
@@ -93,7 +93,7 @@ impl ExprHost for Expressions {
             return Ok([v.first().copied().unwrap_or(100.0), v.get(1).copied().unwrap_or(100.0), v.get(2).copied().unwrap_or(100.0)]);
         };
         let value = prop.value_at(layer.layer_time(ctx.time));
-        let out = evaluate_out(self, ctx, layer, prop, &value, &e.text, [index as f64 + 1.0, total as f64], selector)?;
+        let out = evaluate_out(self, ctx, layer, prop, &value, &e.text, TextSelector { index_total: [index as f64 + 1.0, total as f64], value: selector })?;
         let num = |o: &runtime::Out| match o {
             runtime::Out::Num(x) => Some(*x),
             runtime::Out::Bool(b) => Some(if *b { 100.0 } else { 0.0 }),
@@ -124,13 +124,17 @@ impl Drop for FrameGuard {
 /// Evaluate `text` as the expression of `prop` on `layer` at `ctx.time`, given its keyframed
 /// `value`. Other properties' expressions are evaluated through `host`.
 pub fn evaluate(host: &dyn ExprHost, ctx: &EvalCtx, layer: &Layer, prop: &Property, value: &Value, text: &str) -> Result<Value, String> {
-    let out = evaluate_out(host, ctx, layer, prop, value, text, [1.0, 1.0], [100.0; 3])?;
+    let out = evaluate_out(host, ctx, layer, prop, value, text, TextSelector { index_total: [1.0, 1.0], value: [100.0; 3] })?;
     runtime::to_value(&out, value)
 }
 
-/// Run an expression and return the raw script result. `text_sel` / `selector` are the text
-/// Expression Selector's `[textIndex, textTotal]` and `selectorValue`.
-#[allow(clippy::too_many_arguments)]
+/// Expression Selector state: `[textIndex, textTotal]` and `selectorValue`.
+struct TextSelector {
+    index_total: [f64; 2],
+    value: [f64; 3],
+}
+
+/// Run an expression and return the raw script result.
 fn evaluate_out(
     host: &dyn ExprHost,
     ctx: &EvalCtx,
@@ -138,9 +142,9 @@ fn evaluate_out(
     prop: &Property,
     value: &Value,
     text: &str,
-    text_sel: [f64; 2],
-    selector: [f64; 3],
+    text_selector: TextSelector,
 ) -> Result<runtime::Out, String> {
+    let TextSelector { index_total: text_sel, value: selector } = text_selector;
     let owner = Owner { comp: ctx.comp_id.0, layer: layer.id.0, uid: prop.uid, time: ctx.time, text: text.to_string() };
     let (depth, cycle) = FRAMES.with(|f| {
         let f = f.borrow();
diff --git a/crates/expr/src/prelude.js b/crates/expr/src/prelude.js
index a1dff678d..6611d36aa 100644
--- a/crates/expr/src/prelude.js
+++ b/crates/expr/src/prelude.js
@@ -18,7 +18,7 @@ var selectorValue = [100, 100, 100];
 
 // Request ops (must match runtime.rs).
 var __COMP = 0, __COMPNAME = 1, __LAYER = 2, __LINFO = 3, __CHILD = 4, __PINFO = 5, __VALUE = 6, __XFORM = 7, __RECT = 8, __MARKERS = 9, __DOC = 10;
-var __FOOT = 11, __FDATA = 12, __SAMPLE = 13, __PROJ = 14, __SOURCE = 15;
+var __FOOT = 11, __FDATA = 12, __SAMPLE = 13, __PROJ = 14, __SOURCE = 15, __ANCESTOR = 16;
 
 function __begin(t, v, c, l, path, uid, idx, fd, ti, tt, sv) {
   time = t;
@@ -427,6 +427,18 @@ function __child(c, l, group, key) {
   return info[1] ? __mkGroup(c, l, info) : __mkProp(c, l, info[0]);
 }
 
+// `propertyGroup(countUp)` of the property or group at `path`: the group `countUp` levels above
+// it (default 1), the layer at the top (#1619).
+function __ancestor(c, l, path, countUp) {
+  var n = countUp === undefined ? 1 : __v(countUp);
+  if (typeof n !== 'number' || !(n >= 1) || !isFinite(n)) __err('propertyGroup(' + countUp + '): the count must be a number of 1 or more');
+  n = Math.floor(n);
+  var info = __h(__ANCESTOR, c, l, path, n);
+  if (info === 'layer') return new Layer(c, l);
+  if (info === null) __err('propertyGroup(' + n + ') goes above the layer');
+  return __mkGroup(c, l, info);
+}
+
 // Comp ------------------------------------------------------------------------------------------
 
 function Comp(c) { this.__c = c; this.__i = null; }
@@ -449,7 +461,7 @@ Comp.prototype = {
       var l = this.layer(i);
       if (l.__info[10] === 'Camera' && l.active) return l;
     }
-    __err('Composition "' + this.name + '" has no active camera');
+    return __err('Composition "' + this.name + '" has no active camera');
   },
   layer: function (a, rel) {
     if (a !== null && typeof a === 'object' && a.__isLayer) return this.layer(a.index + (rel || 0));
@@ -645,6 +657,8 @@ var __GroupProto = {
   get name() { return this.__info[2]; },
   get matchName() { return this.__info[3]; },
   get numProperties() { return this.__info[4]; },
+  get propertyIndex() { return this.__info[5]; },
+  propertyGroup: function (n) { return __ancestor(this.__c, this.__l, this.__p, n); },
   get active() { return true; },
   toString: function () { return '[object PropertyGroup]'; },
 };
@@ -730,6 +744,7 @@ Prop.prototype = {
   get numKeys() { return this.__info[4].length; },
   get propertyIndex() { return this.__info[7]; },
   get matchName() { return this.__info[8]; },
+  propertyGroup: function (n) { return __ancestor(this.__c, this.__l, this.__p, n); },
   __wrap: function (v) {
     var kind = this.__info[2];
     if (kind === 'layer') return v === null ? null : new Layer(this.__c, v);
@@ -825,14 +840,14 @@ var __propHandler = {
     // A layer-valued property (a Layer Control's Layer) is named as its layer (#809).
     if (k === 'name' && t.__info[2] === 'layer') {
       var lv = t.value;
-      if (lv !== null && lv !== undefined && lv.__isLayer) return lv.name;
+      if (lv?.__isLayer) return lv.name;
     }
     if (k in t) return t[k];
     var v = t.value;
     if (v === null || v === undefined) return undefined;
     var x = v[k];
     // Property groups are callable proxies: hand them over as they are, not bound like methods (#809).
-    if (x !== null && x !== undefined && x.__isGroup) return x;
+    if (x?.__isGroup) return x;
     return typeof x === 'function' ? x.bind(v) : x;
   },
 };
@@ -889,8 +904,8 @@ __TextStyle.prototype = {
   },
   get text() {
     var t = this.__d.text;
-    for (var k = 0; k < this.__ops.length; k++) {
-      var o = this.__ops[k];
+    for (const elem of this.__ops) {
+      var o = elem;
       if (o[0] !== 'text') continue;
       if (o[2] < 0) t = String(o[1]);
       else t = t.slice(0, o[2]) + String(o[1]) + (o[3] < 0 ? '' : t.slice(o[2] + o[3]));
diff --git a/crates/expr/src/rewrite.rs b/crates/expr/src/rewrite.rs
index 55e9800aa..35c373bb4 100644
--- a/crates/expr/src/rewrite.rs
+++ b/crates/expr/src/rewrite.rs
@@ -528,8 +528,9 @@ fn rewrite_seq(items: &[Item]) -> String {
                 let end = assignment_end(items, j + 1);
                 let rhs = rewrite_seq(&items[j + 1..end]);
                 let h = helper(&op.text[..1]).unwrap_or("__add");
+                let target = compound_assignment_target(items, i, j);
                 out.push_str(&p.ws);
-                out.push_str(&format!("{} ={}{h}({}, ({rhs}))", p.body, op.ws, p.body));
+                out.push_str(&format!("{target} ={}{h}({target}, ({rhs}))", op.ws));
                 i = end;
                 continue;
             }
@@ -543,6 +544,34 @@ fn rewrite_seq(items: &[Item]) -> String {
     out
 }
 
+fn raw_ref(item: &Item) -> String {
+    match item {
+        Item::Tok(t) => format!("{}{}", t.ws, t.text),
+        Item::Group { open, inner, close } => {
+            let mut out = format!("{}{}", open.ws, open.text);
+            if has_assign(inner) {
+                // shortcut: nested assignments stay verbatim (rewriting them would double per level), so arithmetic beside them is not array-aware
+                for item in inner {
+                    out.push_str(&raw_ref(item));
+                }
+            } else {
+                out.push_str(&rewrite_seq(inner));
+            }
+            if let Some(close) = close {
+                out.push_str(&close.text);
+            }
+            out
+        }
+    }
+}
+
+fn has_assign(items: &[Item]) -> bool {
+    items.iter().any(|it| match it {
+        Item::Tok(t) => ASSIGN.contains(&t.text.as_str()),
+        Item::Group { inner, .. } => has_assign(inner),
+    })
+}
+
 fn push_piece(out: &mut String, p: Piece) {
     out.push_str(&p.ws);
     out.push_str(&p.body);
@@ -552,8 +581,20 @@ fn push_piece(out: &mut String, p: Piece) {
 /// rewrite (which nests a call per arithmetic operator). The JavaScript parser and compiler
 /// recurse per level and a 2 MiB thread overflows its stack (aborting the app) at about 75
 /// nested brackets, so deeper expressions are rejected with an error instead. Constructs that
-/// nest without brackets count as part of a level ([`too_nested`]).
+/// nest without brackets count as part of a level (`too_nested`).
 pub const MAX_NESTING: usize = 32;
+/// Hard limit on bytes emitted by the array-math source rewrite.
+pub const MAX_REWRITTEN_BYTES: usize = 4 * 1024 * 1024;
+
+fn over_rewrite_limit(text: &str) -> bool {
+    text.len() > MAX_REWRITTEN_BYTES
+}
+
+fn compound_assignment_target(items: &[Item], start: usize, end: usize) -> String {
+    // Rewriting the whole left side duplicates nested computed assignment targets. Keep the
+    // original target syntax for both reads/writes; source length is bounded above.
+    items[start..end].iter().map(raw_ref).collect()
+}
 
 /// Stack cost of one level of brackets (also of a template substitution, a regex group and a
 /// prefix operator, which cost the parser about as much or are never chained in real code).
@@ -567,7 +608,7 @@ const HEAVY: usize = 32;
 /// about 3 800 links).
 const LIGHT: usize = 6;
 
-/// One bracket level of [`too_nested`]'s walk.
+/// One bracket level of `too_nested`'s walk.
 #[derive(Default)]
 struct Level {
     /// `[`: commas separate elements (a loop in the parser), not operands.
@@ -669,7 +710,7 @@ fn too_nested(toks: &[Tok]) -> bool {
     too_nested_from(toks, 0)
 }
 
-/// [`too_nested`] for code that already sits `base` deep (a template substitution).
+/// `too_nested` for code that already sits `base` deep (a template substitution).
 fn too_nested_from(toks: &[Tok], base: usize) -> bool {
     let mut levels = vec![Level::default()];
     let mut prefix = 0usize;
@@ -746,12 +787,18 @@ fn too_nested_from(toks: &[Tok], base: usize) -> bool {
 
 /// An error when `src` nests deeper than [`MAX_NESTING`] levels (before or after the rewrite).
 pub fn check_nesting(src: &str) -> Result<(), String> {
+    if over_rewrite_limit(src) {
+        return Err(too_large());
+    }
     let (toks, tail) = tokenize(src);
     if too_nested(&toks) {
         return Err(too_deep());
     }
     let mut out = rewrite_seq(&build(toks));
     out.push_str(&tail);
+    if over_rewrite_limit(&out) {
+        return Err(too_large());
+    }
     if too_nested(&tokenize(&out).0) {
         return Err(too_deep());
     }
@@ -765,12 +812,18 @@ fn too_deep() -> String {
 /// Rewrite an expression's source for array-aware arithmetic. Line breaks are preserved.
 /// An expression nested deeper than [`MAX_NESTING`] becomes a `throw` of that error.
 pub fn rewrite(src: &str) -> String {
+    if over_rewrite_limit(src) {
+        return throw_too_large();
+    }
     let (toks, tail) = tokenize(src);
     if too_nested(&toks) {
         return throw_too_deep();
     }
     let mut out = rewrite_seq(&build(toks));
     out.push_str(&tail);
+    if over_rewrite_limit(&out) {
+        return throw_too_large();
+    }
     if too_nested(&tokenize(&out).0) {
         return throw_too_deep();
     }
@@ -781,6 +834,14 @@ fn throw_too_deep() -> String {
     format!("throw new RangeError({:?})", too_deep().trim_start_matches("Error: "))
 }
 
+fn too_large() -> String {
+    format!("Error: expression exceeds the {MAX_REWRITTEN_BYTES}-byte rewrite limit")
+}
+
+fn throw_too_large() -> String {
+    format!("throw new RangeError({:?})", too_large().trim_start_matches("Error: "))
+}
+
 #[cfg(test)]
 mod tests {
     use super::{MAX_NESTING, check_nesting, rewrite};
@@ -821,6 +882,8 @@ mod tests {
     #[test]
     fn compound_assignment_and_functions() {
         assert_eq!(n(&rewrite("x += [1, 0];")), n("x = __add(x, ( [1, 0]));"));
+        assert_eq!(n(&rewrite("obj[key] += 1")), n("obj[key] = __add(obj[key], (1))"));
+        assert_eq!(n(&rewrite("o[a + b] += 1")), n("o[__add(a, b)] = __add(o[__add(a, b)], (1))"));
         assert_eq!(n(&rewrite("function f(a) { return a * 2 }")), n("function f(a) { return __mul(a,  2) }"));
         assert_eq!(n(&rewrite("var g = (a) => a - 1")), n("var g = (a) => __sub(a,  1)"));
         assert_eq!(n(&rewrite("typeof a + 'x'")), n("__add(typeof a,  'x')"));
@@ -828,6 +891,20 @@ mod tests {
         assert_eq!(n(&rewrite("2 ** 3 * 2")), n("__mul(2 ** 3,  2)"));
     }
 
+    #[test]
+    fn source_expansion_is_bounded_before_rewriting() {
+        let src = "x += 1;".repeat(super::MAX_REWRITTEN_BYTES / 6 + 1);
+        assert!(check_nesting(&src).unwrap_err().contains("rewrite limit"));
+        assert!(rewrite(&src).starts_with("throw new RangeError("));
+    }
+
+    #[test]
+    fn output_expansion_is_bounded() {
+        let src = format!("{} += 1", "a".repeat(super::MAX_REWRITTEN_BYTES / 2));
+        assert!(check_nesting(&src).unwrap_err().contains("rewrite limit"));
+        assert!(rewrite(&src).starts_with("throw new RangeError("));
+    }
+
     #[test]
     fn deep_nesting_is_an_error_not_a_stack_overflow() {
         // Each level costs the JavaScript parser stack: ~60 nested brackets overflowed a 2 MiB
diff --git a/crates/expr/src/runtime.rs b/crates/expr/src/runtime.rs
index 9ec8172aa..53c2960ba 100644
--- a/crates/expr/src/runtime.rs
+++ b/crates/expr/src/runtime.rs
@@ -186,6 +186,7 @@ fn native_host(_: &JsValue, args: &[JsValue], ctx: &mut Context) -> JsResult<JsV
         },
         14 => Req::Project,
         15 => Req::SourceInfo { comp: id(args, 1, ctx)?, layer: id(args, 2, ctx)? },
+        16 => Req::Ancestor { comp: id(args, 1, ctx)?, layer: id(args, 2, ctx)?, path: string(args, 3, ctx)?, up: num(args, 4, ctx)? as i64 },
         _ => return Err(JsNativeError::typ().with_message("unknown host request").into()),
     };
     let found = FRAMES.with(|f| {
diff --git a/crates/expr/src/sample.rs b/crates/expr/src/sample.rs
index bff5a2149..28f830bb2 100644
--- a/crates/expr/src/sample.rs
+++ b/crates/expr/src/sample.rs
@@ -99,8 +99,8 @@ pub fn sample_image(ctx: EvalCtx, comp: ItemId, layer: &Layer, point: [f64; 2],
     };
     let mut acc = [0.0f64; 4];
     let mut n = 0.0;
-    for y in y0..=y1.min(y0 + 4096) {
-        for x in x0..=x1.min(x0 + 4096) {
+    for y in y0..=y1.min(y0.saturating_add(4096)) {
+        for x in x0..=x1.min(x0.saturating_add(4096)) {
             let p = b.img.get(x, y);
             for k in 0..4 {
                 acc[k] += p[k] as f64;
diff --git a/crates/expr/src/tests.rs b/crates/expr/src/tests.rs
index 8a4db485b..7d2790255 100644
--- a/crates/expr/src/tests.rs
+++ b/crates/expr/src/tests.rs
@@ -1166,6 +1166,13 @@ fn sample_image_reads_rendered_pixels() {
     assert_close!(f.num(&code("thisComp.layer(\"B\").sampleImage([-50, -50])"), 0.0), 0.0);
 }
 
+/// A huge sample point saturates the pixel coordinates; it must not overflow the loop bounds.
+#[test]
+fn sample_image_huge_point_is_transparent() {
+    let f = fx();
+    assert_close!(f.num("var c = thisComp.layer(\"B\").sampleImage([1e300, 1e300]); c[3]", 0.0), 0.0);
+}
+
 fn data_item(p: &mut Project, name: &str, text: &str) {
     let f = effectcraft_project::Footage {
         path: format!("/data/{name}"),
@@ -1362,3 +1369,5 @@ fn time_to_frames_preserves_coercion_and_small_durations() {
         assert_eq!(f.num(expression, 0.0), expected, "{expression}");
     }
 }
+
+mod property_group;
diff --git a/crates/expr/src/tests/fuzz.rs b/crates/expr/src/tests/fuzz.rs
index b9fb752be..1bfaf8c16 100644
--- a/crates/expr/src/tests/fuzz.rs
+++ b/crates/expr/src/tests/fuzz.rs
@@ -78,6 +78,8 @@ const SEEDS: &[&str] = &[
     "mask('Mask 1').maskOpacity",
     "mask('Mask 1').maskPath.points()[0]",
     "content('Rectangle 1').content('Rectangle Path 1').size[0]",
+    "thisProperty.propertyGroup(1).propertyIndex * 10 + thisProperty.propertyGroup(1).numProperties",
+    "effect(1)(1).propertyGroup(1).propertyGroup(2).name",
     "marker.numKeys > 0 ? marker.key(1).time : 0",
     "marker.nearestKey(time).comment",
     "thisComp.marker.key(1).time",
@@ -130,7 +132,7 @@ const TOKENS: &[&str] = &[
     "catch", "finally", "throw ", "class ", "this", "null", "undefined", "NaN", "Infinity", "true", "-0", "0x", "1e", "1n",
     "/a+/g", "time", "value", "index", "thisComp", "thisLayer", "thisProperty", "layer(", "comp(", "effect(", "mask(",
     "content(", "key(", "marker", "valueAtTime(", "wiggle(", "loopOut(", "sourceRectAtTime(", "toComp(", "text.sourceText",
-    ".style", ".setText(", "createPath(", "seedRandom(", "random(", "linear(", "__h(", "__begin", "__S", "arguments",
+    ".style", ".setText(", ".propertyGroup(", ".propertyIndex", "createPath(", "seedRandom(", "random(", "linear(", "__h(", "__begin", "__S", "arguments",
 ];
 
 /// Numbers swapped in for numeric literals.
diff --git a/crates/expr/src/tests/property_group.rs b/crates/expr/src/tests/property_group.rs
new file mode 100644
index 000000000..debe5e5ac
--- /dev/null
+++ b/crates/expr/src/tests/property_group.rs
@@ -0,0 +1,124 @@
+//! `propertyGroup(countUp)` on properties and property groups, and a group's `propertyIndex`
+//! (#1619): name-independent references up the property tree, as in After Effects.
+
+use super::*;
+
+const SCALE_1: &str = "contents/#1/transform/scale";
+const SCALE_2: &str = "contents/#2/transform/scale";
+
+/// The test comp with a second shape group "Rectangle 2" on layer "Shape", and "Rectangle 1"'s
+/// Transform ▸ Scale keyed 0 → 100 over 0–1 s.
+fn staggered() -> Fx {
+    let mut f = fx();
+    let g = group_push(&mut f.p, |ids| {
+        let rect = build::shape_rect(ids, [20.0, 20.0], [0.0, 0.0], 0.0);
+        build::shape_group(ids, "Rectangle 2", vec![rect])
+    });
+    let shape = f.layer_mut(f.shape);
+    shape.props.sub_mut("contents").unwrap().children.push(g.into());
+    shape.props.prop_mut(SCALE_1).unwrap().keys =
+        vec![Keyframe::new(Tick::ZERO, Value::Vec2([0.0, 0.0])), Keyframe::new(secs(1.0), Value::Vec2([100.0, 100.0]))];
+    f
+}
+
+impl Fx {
+    fn shape_num(&self, path: &str, text: &str) -> f64 {
+        match self.ev(self.shape, path, &format!("var r = ({text}); [r, r]"), 0.0) {
+            Ok(v) => v.as_vec2()[0],
+            Err(e) => panic!("{text}: {e}"),
+        }
+    }
+    fn shape_err(&self, path: &str, text: &str) -> String {
+        match self.ev(self.shape, path, text, 0.0) {
+            Ok(v) => panic!("{text}: expected an error, got {v:?}"),
+            Err(e) => e,
+        }
+    }
+}
+
+#[test]
+fn shape_group_stagger_from_the_adobe_community_answer() {
+    let f = staggered();
+    // thisProperty = Scale, propertyGroup(1) = Transform, propertyGroup(2) = the shape group.
+    let text = "offset = .1;\nid = thisProperty.propertyGroup(2).propertyIndex;\ncontent(\"Rectangle 1\").transform.scale.valueAtTime(time-id*offset)";
+    let v = f.ev(f.shape, SCALE_2, text, 0.5).unwrap().as_vec2();
+    // "Rectangle 2" is the second group in Contents: Rectangle 1's scale 0.2 s earlier.
+    assert_close!(v[0], 30.0);
+    assert_close!(v[1], 30.0);
+}
+
+#[test]
+fn property_group_walks_up_from_the_evaluated_property() {
+    let f = staggered();
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(1).name == 'Transform' ? 1 : 0"), 1.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup().name == 'Transform' ? 1 : 0"), 1.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(2).name == 'Rectangle 2' ? 1 : 0"), 1.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(3).name == 'Contents' ? 1 : 0"), 1.0);
+    assert_close!(f.shape_num(SCALE_1, "thisProperty.propertyGroup(2).propertyIndex"), 1.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(2).propertyIndex"), 2.0);
+    // A shape group holds Blend Mode, Contents and Transform, in After Effects' order.
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(1).propertyIndex"), 3.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(2).numProperties"), 3.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(3).numProperties"), 2.0);
+    // Groups walk on: Transform → group → Contents.
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(1).propertyGroup(2).name == 'Contents' ? 1 : 0"), 1.0);
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(1).propertyGroup(1).propertyIndex"), 2.0);
+}
+
+#[test]
+fn property_group_reaches_the_layer() {
+    let f = fx();
+    assert_close!(f.num("thisProperty.propertyGroup(1).name == 'Transform' ? 1 : 0", 0.0), 1.0);
+    assert_close!(f.num("thisProperty.propertyGroup(2).name == 'A' ? 1 : 0", 0.0), 1.0);
+    assert_close!(f.num("thisProperty.propertyGroup(2).index", 0.0), 1.0);
+    assert_close!(f.num("thisProperty.propertyGroup(1).propertyGroup(1).name == 'A' ? 1 : 0", 0.0), 1.0);
+    let s = staggered();
+    assert_close!(s.shape_num(SCALE_2, "thisProperty.propertyGroup(4).name == 'Shape' ? 1 : 0"), 1.0);
+}
+
+#[test]
+fn property_group_of_an_effect_parameter_is_the_effect() {
+    let f = fx();
+    let path = "effects/#1/slider";
+    let ev = |text: &str| f.ev(f.a, path, text, 0.0).unwrap().as_f64();
+    assert_close!(ev("thisProperty.propertyGroup(1).name == 'Slider Control' ? 1 : 0"), 1.0);
+    assert_close!(ev("thisProperty.propertyGroup(2).name == 'Effects' ? 1 : 0"), 1.0);
+    // The name-independent rig: read the effect this parameter belongs to by its own name.
+    assert_close!(ev("effect(thisProperty.propertyGroup(1).name)('Slider') + 1"), 43.0);
+    assert_close!(ev("thisProperty.propertyGroup(1).propertyIndex"), 1.0);
+}
+
+#[test]
+fn property_group_on_other_layers_properties_and_groups() {
+    let f = staggered();
+    // From layer B: another layer's property and group, reached by name.
+    let ev = |text: &str| f.ev(f.b, ROT, text, 0.0).unwrap().as_f64();
+    assert_close!(ev("thisComp.layer('A').effect(1)('Slider').propertyGroup(1).name == 'Slider Control' ? 1 : 0"), 1.0);
+    assert_close!(ev("thisComp.layer('Shape').content('Rectangle 2').propertyIndex"), 2.0);
+    assert_close!(ev("thisComp.layer('Shape').content('Rectangle 2').transform.scale.propertyGroup(2).propertyIndex"), 2.0);
+    assert_close!(ev("thisComp.layer('Shape').content('Rectangle 1').content('Fill 1').propertyGroup(2).name == 'Rectangle 1' ? 1 : 0"), 1.0);
+    assert_close!(ev("thisComp.layer('Shape').content('Rectangle 1').propertyGroup(2).name == 'Shape' ? 1 : 0"), 1.0);
+    assert_close!(ev("thisComp.layer('A').effect('Slider Control').propertyIndex"), 1.0);
+    assert_close!(ev("thisComp.layer('A').mask('Mask 1').propertyGroup(1).numProperties"), 1.0);
+}
+
+#[test]
+fn property_group_out_of_range_is_an_error_not_a_crash() {
+    let f = staggered();
+    for text in [
+        "thisProperty.propertyGroup(0)",
+        "thisProperty.propertyGroup(-1)",
+        "thisProperty.propertyGroup(5)",
+        "thisProperty.propertyGroup(1e300)",
+        "thisProperty.propertyGroup(NaN)",
+        "thisProperty.propertyGroup('x')",
+        "thisProperty.propertyGroup(1).propertyGroup(4)",
+    ] {
+        let e = f.shape_err(SCALE_2, text);
+        assert!(e.contains("propertyGroup"), "{text}: {e}");
+    }
+    let e = f.err("thisProperty.propertyGroup(3)");
+    assert!(e.contains("propertyGroup"), "{e}");
+    // A fractional count rounds down, as an index does.
+    assert_close!(f.shape_num(SCALE_2, "thisProperty.propertyGroup(2.7).propertyIndex"), 2.0);
+}
diff --git a/crates/geom/src/lib.rs b/crates/geom/src/lib.rs
index a03c9d46c..d86784f1e 100644
--- a/crates/geom/src/lib.rs
+++ b/crates/geom/src/lib.rs
@@ -360,6 +360,9 @@ impl Mat4 {
     }
     /// General inverse (Gauss-Jordan with partial pivoting).
     pub fn inverse(&self) -> Option<Mat4> {
+        if !self.0.iter().flatten().all(|v| v.is_finite()) {
+            return None;
+        }
         let mut a = self.0;
         let mut inv = Mat4::IDENTITY.0;
         for col in 0..4 {
@@ -450,6 +453,16 @@ mod tests {
         (a - b).length() < 1e-9
     }
 
+    #[test]
+    fn mat4_inverse_rejects_non_finite() {
+        for (r, c, v) in [(0, 0, f64::NAN), (2, 1, f64::NAN), (1, 3, f64::INFINITY)] {
+            let mut m = Mat4::IDENTITY;
+            m.0[r][c] = v;
+            assert!(m.inverse().is_none(), "{r},{c},{v}");
+        }
+        assert!(Mat4::IDENTITY.inverse().is_some());
+    }
+
     #[test]
     fn layer_2d_maps_anchor_to_position() {
         let m = Mat3::layer_2d(vec2(50.0, 25.0), vec2(960.0, 540.0), vec2(200.0, 50.0), 30.0);
diff --git a/crates/gpu/src/adv3d.rs b/crates/gpu/src/adv3d.rs
index 6ae11445a..24c5a3b35 100644
--- a/crates/gpu/src/adv3d.rs
+++ b/crates/gpu/src/adv3d.rs
@@ -320,7 +320,12 @@ fn pack(s: &Scene) -> [Vec<u8>; 7] {
     let lit = !(s.lights.is_empty() && s.env.is_none() && s.ambient == [0.0; 3]);
     globals.extend([e.rotation, lit as u32 as f32, 0.0, 0.0]);
     let mats = s.materials.iter().flat_map(|m| {
-        let flags = (m.double_sided as u32) | (m.unlit as u32) << 1 | (m.accepts_lights as u32) << 2 | (m.receives_shadows as u32) << 3 | (m.alpha_mode << 8);
+        let flags = (m.double_sided as u32)
+            | (m.unlit as u32) << 1
+            | (m.accepts_lights as u32) << 2
+            | (m.receives_shadows as u32) << 3
+            | (m.shadows_only as u32) << 4
+            | (m.alpha_mode << 8);
         [
             m.base[0],
             m.base[1],
diff --git a/crates/gpu/src/bokeh.rs b/crates/gpu/src/bokeh.rs
index ac07448c9..39dc0bdea 100644
--- a/crates/gpu/src/bokeh.rs
+++ b/crates/gpu/src/bokeh.rs
@@ -26,7 +26,7 @@ pub(crate) fn apply(e: &mut Enc, src: &GpuImage, d: &PlaneDof) -> Option<GpuImag
         padded
     };
     let prefix = e.image(w + 1, h);
-    e.dispatch("bokeh_prefix", &Params::default(), &boosted, None, &prefix, None, (h.div_ceil(64), 1));
+    e.dispatch("bokeh_prefix", &Params::default(), crate::context::KernelImages { src: &boosted, aux: None, out: &prefix }, None, (h.div_ceil(64), 1));
     // Radius map, then every level's spans.
     let mut data: Vec<f32> = d.radius.as_ref().clone();
     let mut levels = vec![];
diff --git a/crates/gpu/src/classic3d.rs b/crates/gpu/src/classic3d.rs
index 7ee2988f9..65dc52a6e 100644
--- a/crates/gpu/src/classic3d.rs
+++ b/crates/gpu/src/classic3d.rs
@@ -126,6 +126,10 @@ const LIGHT_BYTES: usize = 6 * 16;
 /// Composite a prepared Classic 3D run over `canvas`. `None` when it cannot run here (the
 /// caller draws it on the CPU).
 pub(crate) fn draw_run(e: &mut Enc, run: &Run3d, canvas: &GpuImage) -> Option<GpuImage> {
+    // FXC (DirectX 12) may fail to build the kernel (#613): the caller renders the run on the CPU.
+    if !e.g.has_kernel("classic3d") {
+        return None;
+    }
     let (w, h) = (canvas.width, canvas.height);
     let boxes: Vec<[i64; 4]> = run.planes.iter().filter(|p| p.draw).map(|p| p.bbox).collect();
     if boxes.is_empty() {
@@ -214,7 +218,14 @@ pub(crate) fn draw_run(e: &mut Enc, run: &Run3d, canvas: &GpuImage) -> Option<Gp
     let mut p = Params::default();
     p.u[0] = [run.planes.len() as u32, run.lights.len() as u32, run.casters.len() as u32, 0];
     let out = e.scratch(w, h);
-    e.dispatch_ext("classic3d", &p, &atlas, Some(canvas), &out, Some(&mb), (w.div_ceil(16), h.div_ceil(16)), Some([&pb, &gb, &lb, &cb]));
+    e.dispatch_ext(
+        "classic3d",
+        &p,
+        crate::context::KernelImages { src: &atlas, aux: Some(canvas), out: &out },
+        Some(&mb),
+        (w.div_ceil(16), h.div_ceil(16)),
+        Some([&pb, &gb, &lb, &cb]),
+    );
     Some(out)
 }
 
diff --git a/crates/gpu/src/context.rs b/crates/gpu/src/context.rs
index 3c372222a..bcd929304 100644
--- a/crates/gpu/src/context.rs
+++ b/crates/gpu/src/context.rs
@@ -30,7 +30,8 @@ const ENTRIES: &[&str] = &[
 const EFFECT_ENTRIES: &[&str] = &["box_h", "box_v", "directional", "glow_bright", "glow_combine", "shadow_make", "shadow_combine", "pointwise"];
 
 /// Entry points that also bind group 1 (four read-only storage buffers; see
-/// [`Enc::dispatch_ext`]).
+/// [`Enc::dispatch_ext`]). Like the effect kernels, one that fails to build (FXC on DirectX 12
+/// can't unroll `classic3d`'s loops, #613) leaves its work to the CPU.
 const EXT_ENTRIES: &[&str] = &["classic3d"];
 
 /// Pixel format of every working texture: premultiplied RGBA, 32-bit float (32 bpc headroom;
@@ -140,6 +141,74 @@ pub struct TransferStats {
     pub readback_bytes: u64,
 }
 
+/// `WGPU_ADAPTER_NAME` trimmed; empty or whitespace-only counts as unset (an empty
+/// substring would otherwise match the first adapter and skip the power preference).
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+fn wanted_adapter_name(var: Option<&str>) -> Option<&str> {
+    var.map(str::trim).filter(|w| !w.is_empty())
+}
+
+/// Index of the first adapter whose name contains `want`, compared case-insensitively.
+/// Only the name is matched, as in wgpu (the backend is chosen with `WGPU_BACKEND`).
+/// `Err` lists each distinct adapter once as `name (backend)`, so a typo or an
+/// OS/driver-specific name is easy to spot.
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+fn match_adapter_name(want: &str, adapters: &[(String, String)]) -> Result<usize, String> {
+    if adapters.is_empty() {
+        return Err(format!("WGPU_ADAPTER_NAME={want:?}: no adapters on the enabled backends"));
+    }
+    let w = want.to_lowercase();
+    adapters.iter().position(|(n, _)| n.to_lowercase().contains(&w)).ok_or_else(|| {
+        let mut list: Vec<String> = Vec::new();
+        for l in adapters.iter().map(|(n, b)| format!("{n} ({b})")) {
+            if !list.contains(&l) {
+                list.push(l);
+            }
+        }
+        format!(
+            "no adapter name matches WGPU_ADAPTER_NAME={want:?} (matched against the name only; \
+             select a backend with WGPU_BACKEND); available: [{}]",
+            list.join(", ")
+        )
+    })
+}
+
+/// The adapter named by `WGPU_ADAPTER_NAME` (case-insensitive substring, like wgpu's
+/// `initialize_adapter_from_env`, which panics when none matches). `None` when unset or empty.
+#[cfg(not(target_arch = "wasm32"))]
+async fn adapter_by_name(instance: &wgpu::Instance) -> Option<Result<wgpu::Adapter, String>> {
+    let var = std::env::var("WGPU_ADAPTER_NAME").ok();
+    let want = wanted_adapter_name(var.as_deref())?;
+    let mut all = instance.enumerate_adapters(wgpu::Backends::all()).await;
+    let adapters: Vec<(String, String)> = all
+        .iter()
+        .map(|a| {
+            let i = a.get_info();
+            (i.name, format!("{:?}", i.backend))
+        })
+        .collect();
+    Some(match_adapter_name(want, &adapters).map(|i| all.swap_remove(i)))
+}
+/// `WGPU_POWER_PREF` (`low` / `high` / `none`), default HighPerformance. wgpu ignores an
+/// unknown value silently; warn so a typo is noticed.
+#[cfg(not(target_arch = "wasm32"))]
+fn power_pref_from_env() -> wgpu::PowerPreference {
+    wgpu::PowerPreference::from_env().unwrap_or_else(|| {
+        if let Ok(v) = std::env::var("WGPU_POWER_PREF") {
+            log::warn!("gpu: ignoring WGPU_POWER_PREF={v:?} (expected low, high or none)");
+        }
+        wgpu::PowerPreference::HighPerformance
+    })
+}
+#[cfg(target_arch = "wasm32")]
+fn power_pref_from_env() -> wgpu::PowerPreference {
+    wgpu::PowerPreference::HighPerformance
+}
+#[cfg(target_arch = "wasm32")]
+async fn adapter_by_name(_: &wgpu::Instance) -> Option<Result<wgpu::Adapter, String>> {
+    None
+}
+
 impl Transfers {
     fn count(&self, up: bool, bytes: usize) {
         use std::sync::atomic::Ordering::Relaxed;
@@ -283,6 +352,7 @@ pub struct GpuContext {
     pub queue: wgpu::Queue,
     pub(crate) name: String,
     pub(crate) max_dim: u32,
+    pub(crate) median_kernel: crate::fx_noise::MedianKernel,
     bgl: wgpu::BindGroupLayout,
     bgl_ext: wgpu::BindGroupLayout,
     pipelines: HashMap<&'static str, wgpu::ComputePipeline>,
@@ -315,6 +385,12 @@ pub struct GpuContext {
     pub(crate) particle_states: crate::particles::StatesCell,
     /// Deferred readbacks (a browser worker's WebGPU device), see [`crate::deferred`].
     pub(crate) deferred: Option<Arc<crate::deferred::Deferred>>,
+    /// The adapter is a software rasteriser (llvmpipe, WARP): its float maths follows the
+    /// CPU's exactly, so the YUV tests hold it to exact parity.
+    #[cfg_attr(not(test), allow(dead_code))]
+    pub(crate) software: bool,
+    /// Export frame → YUV 4:2:0 kernel (built on first use).
+    pub(crate) yuv: std::sync::OnceLock<Result<crate::yuv::YuvPipe, String>>,
     readbacks: Arc<crate::readback::Readbacks>,
 }
 
@@ -368,7 +444,7 @@ pub(crate) fn init_resource<T>(device: &wgpu::Device, label: &str, create: impl
 /// Browser scope completion is asynchronous. Preserve the existing browser constructor;
 /// never block its event loop or introduce a guard across an asynchronous boundary here.
 #[cfg(target_arch = "wasm32")]
-fn init_resource<T>(_device: &wgpu::Device, _label: &str, create: impl FnOnce() -> T) -> Result<T, String> {
+pub(crate) fn init_resource<T>(_device: &wgpu::Device, _label: &str, create: impl FnOnce() -> T) -> Result<T, String> {
     Ok(create())
 }
 
@@ -394,6 +470,12 @@ pub(crate) fn buffer_init(device: &wgpu::Device, queue: &wgpu::Queue, label: Opt
     buffer
 }
 
+/// The descriptor for a device the compositor owns: `MemoryUsage` so freed textures give their
+/// allocator blocks back instead of a few long-lived objects pinning large ones.
+pub(crate) fn device_descriptor(required_limits: wgpu::Limits) -> wgpu::DeviceDescriptor<'static> {
+    wgpu::DeviceDescriptor { label: Some("effectcraft gpu"), required_limits, memory_hints: wgpu::MemoryHints::MemoryUsage, ..Default::default() }
+}
+
 impl GpuContext {
     /// [`buffer_init`] on this context's device.
     pub(crate) fn buffer_init(&self, label: Option<&str>, contents: &[u8], usage: wgpu::BufferUsages) -> wgpu::Buffer {
@@ -407,6 +489,9 @@ impl GpuContext {
     /// [`Self::device_failure_notifier`] for immediate readback cancellation.
     pub fn new(adapter: &wgpu::Adapter, device: wgpu::Device, queue: wgpu::Queue) -> Result<GpuContext, String> {
         let info = adapter.get_info();
+        let median_kernel = crate::fx_noise::MedianKernel::for_adapter(info.backend, info.device_type);
+        #[cfg(test)]
+        let median_kernel = median_kernel.test_override()?;
         if !adapter.get_downlevel_capabilities().flags.contains(wgpu::DownlevelFlags::COMPUTE_SHADERS) {
             return Err(format!("{} ({:?}): no compute shaders", info.name, info.backend));
         }
@@ -426,6 +511,7 @@ impl GpuContext {
             ("max_compute_workgroup_size_x", l.max_compute_workgroup_size_x, 64),
             ("max_compute_workgroup_size_y", l.max_compute_workgroup_size_y, 16),
             ("max_compute_invocations_per_workgroup", l.max_compute_invocations_per_workgroup, 256),
+            ("max_compute_workgroup_storage_size", l.max_compute_workgroup_storage_size, median_kernel.workgroup_storage()),
         ];
         if let Some((limit, have, need)) = needs.iter().find(|(_, have, need)| have < need) {
             return Err(format!("{} ({:?}): device limit {limit} is {have}, needs {need}", info.name, info.backend));
@@ -451,6 +537,7 @@ impl GpuContext {
             include_str!("shaders/fx_key.wgsl"),
             include_str!("shaders/fx_stylize.wgsl"),
             include_str!("shaders/fx_noise.wgsl"),
+            median_kernel.source(),
             include_str!("shaders/fx_tone.wgsl"),
             include_str!("shaders/fx_warp.wgsl"),
             include_str!("shaders/fx_extra.wgsl"),
@@ -536,15 +623,21 @@ impl GpuContext {
             })
         };
         // The compositor's own kernels are required; an effect kernel that doesn't build is
-        // left out, and its effects render on the CPU (see `Enc::take_missing`).
-        let mut pipelines = ENTRIES
-            .iter()
-            .chain(crate::adv3d::SKY_KERNELS)
-            .map(|e| (e, &layout))
-            .chain(EXT_ENTRIES.iter().map(|e| (e, &layout_ext)))
-            .map(|(e, layout)| Ok((*e, build(e, layout)?)))
-            .collect::<Result<HashMap<_, _>, String>>()?;
+        // left out, and its effects render on the CPU (see `Enc::take_missing`). So is a
+        // missing Classic 3D kernel: its 3D runs render on the CPU.
+        let mut pipelines = ENTRIES.iter().chain(crate::adv3d::SKY_KERNELS).map(|e| Ok((*e, build(e, &layout)?))).collect::<Result<HashMap<_, _>, String>>()?;
         let mut unavailable = vec![];
+        for e in EXT_ENTRIES {
+            match build(e, &layout_ext) {
+                Ok(p) => {
+                    pipelines.insert(*e, p);
+                }
+                Err(why) => {
+                    log::warn!("gpu {name}: kernel {e} unavailable, its 3D layers render on the CPU: {why}");
+                    unavailable.push((*e, why));
+                }
+            }
+        }
         for e in EFFECT_ENTRIES
             .iter()
             .chain(crate::fx_color::KERNELS)
@@ -632,6 +725,7 @@ impl GpuContext {
             queue,
             name,
             max_dim,
+            median_kernel,
             bgl,
             bgl_ext,
             pipelines,
@@ -650,6 +744,8 @@ impl GpuContext {
             transfers: Default::default(),
             zeros: Default::default(),
             adv3d: std::sync::OnceLock::new(),
+            yuv: std::sync::OnceLock::new(),
+            software: info.device_type == wgpu::DeviceType::Cpu,
             adv3d_raster: adv3d_unsupported.is_none(),
             particles: Default::default(),
             particle_states: Default::default(),
@@ -665,6 +761,18 @@ impl GpuContext {
         self.readbacks.check()
     }
 
+    /// Export frame → YUV 4:2:0 kernel, initialized once and `None` when shader or pipeline creation fails.
+    pub(crate) fn yuv_pipe(&self) -> Option<&crate::yuv::YuvPipe> {
+        self.yuv
+            .get_or_init(|| {
+                crate::yuv::YuvPipe::new(&self.device).inspect_err(|e| {
+                    log::warn!(target: "effectcraft_gpu", "yuv420 kernel unavailable: {e}");
+                })
+            })
+            .as_ref()
+            .ok()
+    }
+
     /// A notification hook for the owner of a shared device's error/loss handlers.
     /// Invoke it with diagnostic context when the host observes a device failure.
     /// It retires this context and settles pending readbacks without replacing any
@@ -774,29 +882,38 @@ impl GpuContext {
         let mut desc = wgpu::InstanceDescriptor::new_without_display_handle();
         #[cfg(not(target_arch = "wasm32"))]
         {
-            // Match eframe's backend override so CLI and headless acceptance tests
-            // exercise the backend requested for the native viewer.
-            desc.backends = wgpu::Backends::from_env().unwrap_or(desc.backends);
+            // Honour the same wgpu env vars as the viewer (WGPU_BACKEND, WGPU_DX12_COMPILER,
+            // WGPU_VALIDATION, WGPU_DEBUG, WGPU_POWER_PREF), plus WGPU_ADAPTER_NAME (CLI/headless
+            // only for now; the viewer ignores it). Not full parity: the viewer also changes
+            // instance flags and has a GL fallback.
+            // Note: with_env() also resets memory_budget_thresholds to their default (unused here).
+            desc = desc.with_env();
         }
         #[cfg(target_arch = "wasm32")]
         {
             desc.backends = wgpu::Backends::BROWSER_WEBGPU;
         }
         let instance = wgpu::Instance::new(desc);
-        let adapter = instance
-            .request_adapter(&wgpu::RequestAdapterOptions { power_preference: wgpu::PowerPreference::HighPerformance, ..Default::default() })
-            .await
-            .map_err(|e| format!("no adapter: {e}"))?;
+        let (adapter, by_name) = match adapter_by_name(&instance).await {
+            Some(a) => (a?, true),
+            None => (
+                instance
+                    .request_adapter(&wgpu::RequestAdapterOptions { power_preference: power_pref_from_env(), ..Default::default() })
+                    .await
+                    .map_err(|e| format!("no adapter: {e}"))?,
+                false,
+            ),
+        };
         let limits = adapter.limits();
         let required_limits = wgpu::Limits {
             max_texture_dimension_2d: limits.max_texture_dimension_2d.min(16384),
             max_buffer_size: limits.max_buffer_size,
             ..wgpu::Limits::default()
         };
-        let (device, queue) = adapter
-            .request_device(&wgpu::DeviceDescriptor { label: Some("effectcraft gpu"), required_limits, ..Default::default() })
-            .await
-            .map_err(|e| format!("no device: {e}"))?;
+        let (device, queue) = adapter.request_device(&device_descriptor(required_limits)).await.map_err(|e| match by_name {
+            true => format!("no device on {} (picked by WGPU_ADAPTER_NAME): {e}", adapter.get_info().name),
+            false => format!("no device: {e}"),
+        })?;
         let context = GpuContext::new(&adapter, device, queue)?;
         // This path owns the device; install handlers only after construction succeeds.
         crate::readback::install(&context.device, &context.readbacks);
@@ -817,6 +934,11 @@ impl GpuContext {
         &self.unavailable
     }
 
+    /// Whether kernel `entry` was built (an effect or Classic 3D kernel can be missing, #613).
+    pub(crate) fn has_kernel(&self, entry: &str) -> bool {
+        self.pipelines.contains_key(entry)
+    }
+
     /// Leave kernel `entry` out, as if it had failed to build (tests of the CPU fallback).
     #[cfg(test)]
     pub(crate) fn drop_kernel(&mut self, entry: &'static str) {
@@ -824,6 +946,49 @@ impl GpuContext {
         self.unavailable.push((entry, "dropped by a test".into()));
     }
 
+    /// A copy of this context sharing the same [`wgpu::Device`] and [`wgpu::Queue`] with
+    /// kernel `entry` left out, as if it had failed to build (tests of the CPU fallback
+    /// without opening a second device on `llvmpipe`).
+    #[cfg(test)]
+    pub(crate) fn without_kernel(&self, entry: &'static str) -> GpuContext {
+        let mut pipelines = self.pipelines.clone();
+        pipelines.remove(entry);
+        let mut unavailable = self.unavailable.clone();
+        unavailable.push((entry, "dropped by a test".into()));
+        GpuContext {
+            device: self.device.clone(),
+            queue: self.queue.clone(),
+            name: self.name.clone(),
+            max_dim: self.max_dim,
+            median_kernel: self.median_kernel,
+            bgl: self.bgl.clone(),
+            bgl_ext: self.bgl_ext.clone(),
+            pipelines,
+            unavailable,
+            display_bgl: self.display_bgl.clone(),
+            display: self.display.clone(),
+            display_mip: self.display_mip.clone(),
+            dummy_tex: self.dummy_tex.clone(),
+            dummy: self.dummy.clone(),
+            dummy_buf: self.dummy_buf.clone(),
+            uploads: Mutex::new(Uploads::default()),
+            upload_budget: std::sync::atomic::AtomicUsize::new(UPLOAD_BUDGET),
+            upload_full_warned: Default::default(),
+            pool: self.pool.clone(),
+            staging: Default::default(),
+            transfers: Default::default(),
+            zeros: Default::default(),
+            adv3d: std::sync::OnceLock::new(),
+            adv3d_raster: self.adv3d_raster,
+            particles: Default::default(),
+            particle_states: Default::default(),
+            deferred: self.deferred.clone(),
+            readbacks: self.readbacks.clone(),
+            software: self.software,
+            yuv: std::sync::OnceLock::new(),
+        }
+    }
+
     /// Bytes of readback staging buffers kept for reuse (tests).
     #[cfg(test)]
     pub(crate) fn staging_bytes(&self) -> u64 {
@@ -999,6 +1164,13 @@ pub(crate) struct Enc<'g> {
     owner: u64,
 }
 
+/// Images bound to a compute kernel's source, optional auxiliary and output slots.
+pub(crate) struct KernelImages<'a> {
+    pub src: &'a GpuImage,
+    pub aux: Option<&'a GpuImage>,
+    pub out: &'a GpuImage,
+}
+
 impl Drop for Enc<'_> {
     fn drop(&mut self) {
         // Unsubmitted work is discarded, so nothing recorded will read pooled textures.
@@ -1072,32 +1244,21 @@ impl<'g> Enc<'g> {
     }
 
     /// Run kernel `entry` writing `out` (dispatched over `groups` workgroups).
-    pub fn dispatch(
-        &mut self,
-        entry: &str,
-        p: &Params,
-        src: &GpuImage,
-        aux: Option<&GpuImage>,
-        out: &GpuImage,
-        data: Option<&wgpu::Buffer>,
-        groups: (u32, u32),
-    ) {
-        self.dispatch_ext(entry, p, src, aux, out, data, groups, None);
+    pub fn dispatch(&mut self, entry: &str, p: &Params, images: KernelImages<'_>, data: Option<&wgpu::Buffer>, groups: (u32, u32)) {
+        self.dispatch_ext(entry, p, images, data, groups, None);
     }
 
     /// [`Enc::dispatch`] for the kernels in `EXT_ENTRIES`, with their group 1 storage buffers.
-    #[allow(clippy::too_many_arguments)]
     pub fn dispatch_ext(
         &mut self,
         entry: &str,
         p: &Params,
-        src: &GpuImage,
-        aux: Option<&GpuImage>,
-        out: &GpuImage,
+        images: KernelImages<'_>,
         data: Option<&wgpu::Buffer>,
         groups: (u32, u32),
         ext: Option<[&wgpu::Buffer; 4]>,
     ) {
+        let KernelImages { src, aux, out } = images;
         let g = self.g;
         let Some(pipe) = g.pipelines.get(entry) else {
             if !g.unavailable.iter().any(|(e, _)| *e == entry) {
@@ -1153,7 +1314,7 @@ impl<'g> Enc<'g> {
     /// Per-pixel kernel over `out`'s size (16×16 workgroups).
     pub fn pixels(&mut self, entry: &str, p: &Params, src: &GpuImage, aux: Option<&GpuImage>, out: &GpuImage, data: Option<&wgpu::Buffer>) {
         let groups = (out.width.div_ceil(16), out.height.div_ceil(16));
-        self.dispatch(entry, p, src, aux, out, data, groups);
+        self.dispatch(entry, p, KernelImages { src, aux, out }, data, groups);
     }
 
     /// Copy `src` into a larger zeroed image at (`x`, `y`) (Buf::pad).
@@ -1166,6 +1327,24 @@ impl<'g> Enc<'g> {
         );
     }
 
+    /// A `w` × `h` image showing `src` with its pixel (`x`, `y`) at the top-left, transparent
+    /// where `src` doesn't reach (Image::crop).
+    pub fn crop(&mut self, src: &GpuImage, x: i64, y: i64, w: u32, h: u32) -> GpuImage {
+        let dst = self.image(w, h);
+        let span = |o: i64, n: u32, len: u32| {
+            let (a, b) = (o.max(0), (o + n as i64).min(len as i64));
+            (b > a).then(|| (a as u32, (a - o) as u32, (b - a) as u32))
+        };
+        let (Some((sx, dx, cw)), Some((sy, dy, ch))) = (span(x, w, src.width), span(y, h, src.height)) else { return dst };
+        let enc = self.encoder();
+        enc.copy_texture_to_texture(
+            wgpu::TexelCopyTextureInfo { texture: &src.texture, mip_level: 0, origin: wgpu::Origin3d { x: sx, y: sy, z: 0 }, aspect: wgpu::TextureAspect::All },
+            wgpu::TexelCopyTextureInfo { texture: &dst.texture, mip_level: 0, origin: wgpu::Origin3d { x: dx, y: dy, z: 0 }, aspect: wgpu::TextureAspect::All },
+            wgpu::Extent3d { width: cw, height: ch, depth_or_array_layers: 1 },
+        );
+        dst
+    }
+
     /// Submit recorded work.
     pub fn submit(&mut self) {
         if let Some((enc, id)) = self.enc.take() {
@@ -1392,3 +1571,66 @@ impl<'g> Enc<'g> {
 pub(crate) fn mip_levels(w: u32, h: u32) -> u32 {
     u32::BITS - w.max(h).max(1).leading_zeros()
 }
+
+#[cfg(test)]
+mod adapter_name_tests {
+    use super::{match_adapter_name, wanted_adapter_name};
+
+    fn adapters() -> Vec<(String, String)> {
+        [("NVIDIA GeForce GTX 1070", "Vulkan"), ("Intel(R) UHD Graphics 630", "Dx12"), ("llvmpipe (LLVM 19.1.7, 256 bits)", "Gl")]
+            .map(|(n, b)| (n.into(), b.into()))
+            .to_vec()
+    }
+
+    #[test]
+    fn matches_case_insensitive_substring() {
+        assert_eq!(match_adapter_name("intel", &adapters()), Ok(1));
+        assert_eq!(match_adapter_name("GTX 1070", &adapters()), Ok(0));
+        assert_eq!(match_adapter_name("LLVMPIPE", &adapters()), Ok(2));
+    }
+
+    #[test]
+    fn first_match_wins() {
+        assert_eq!(match_adapter_name("i", &adapters()), Ok(0));
+    }
+
+    #[test]
+    fn empty_or_blank_name_is_unset_and_value_is_trimmed() {
+        assert_eq!(wanted_adapter_name(None), None);
+        assert_eq!(wanted_adapter_name(Some("")), None);
+        assert_eq!(wanted_adapter_name(Some("  ")), None);
+        assert_eq!(wanted_adapter_name(Some(" intel ")), Some("intel"));
+        assert_eq!(match_adapter_name(wanted_adapter_name(Some(" intel ")).unwrap(), &adapters()), Ok(1));
+    }
+
+    #[test]
+    fn mismatch_lists_name_and_backend() {
+        let e = match_adapter_name("NoSuch", &adapters()).unwrap_err();
+        assert!(e.contains("\"NoSuch\""), "{e}");
+        assert!(e.contains("Intel(R) UHD Graphics 630 (Dx12)"), "{e}");
+        assert!(e.contains("NVIDIA GeForce GTX 1070 (Vulkan)"), "{e}");
+    }
+
+    #[test]
+    fn backend_is_not_part_of_the_match_and_message_says_so() {
+        let e = match_adapter_name("dx12", &adapters()).unwrap_err();
+        assert!(e.contains("name only"), "{e}");
+        assert!(e.contains("WGPU_BACKEND"), "{e}");
+    }
+
+    #[test]
+    fn mismatch_lists_identical_name_and_backend_once() {
+        let mut a = adapters();
+        a.insert(2, ("Intel(R) UHD Graphics 630".into(), "Dx12".into()));
+        a.push(("Intel(R) UHD Graphics 630".into(), "Vulkan".into()));
+        let e = match_adapter_name("NoSuch", &a).unwrap_err();
+        assert_eq!(e.matches("Intel(R) UHD Graphics 630 (Dx12)").count(), 1, "{e}");
+        assert_eq!(e.matches("Intel(R) UHD Graphics 630 (Vulkan)").count(), 1, "{e}");
+    }
+
+    #[test]
+    fn no_adapters_has_its_own_message() {
+        let e = match_adapter_name("x", &[]).unwrap_err();
+        assert!(e.contains("no adapters on the enabled backends"), "{e}");
+    }
+}
diff --git a/crates/gpu/src/deferred.rs b/crates/gpu/src/deferred.rs
index 3ac2c67e6..e96b54a1d 100644
--- a/crates/gpu/src/deferred.rs
+++ b/crates/gpu/src/deferred.rs
@@ -252,6 +252,7 @@ pub(crate) fn chain_key(chain: &[FxStep], buf: &Buf, levels: Option<f32>) -> u12
         k.u64(e.effect_index as u64);
         k.debug(&e.working_space);
         k.u64(e.working_linear as u64);
+        k.u64(e.float_depth as u64);
         k.debug(&e.shutter);
     }
     k.finish()
diff --git a/crates/gpu/src/effects.rs b/crates/gpu/src/effects.rs
index 42d2bab71..1e97b7eab 100644
--- a/crates/gpu/src/effects.rs
+++ b/crates/gpu/src/effects.rs
@@ -2,7 +2,6 @@
 //! radii, parameter conversions), with the pixel loops as compute kernels.
 
 use effectcraft_effects::{Buf, EffectCtx};
-use effectcraft_geom::{Mat3, vec2};
 use effectcraft_raster::Sampling;
 use effectcraft_render::FxStep;
 
@@ -27,6 +26,24 @@ impl GBuf {
         (p[0] * self.scale + self.offset[0], p[1] * self.scale + self.offset[1])
     }
 
+    /// Buf::pad_sides: grow by transparent pixels (left, top, right, bottom).
+    pub fn pad_sides(&mut self, e: &mut Enc, sides: [u32; 4]) -> Option<()> {
+        let [l, t, r, b] = sides;
+        if l == 0 && t == 0 && r == 0 && b == 0 {
+            return Some(());
+        }
+        let (w, h) = (self.img.width.checked_add(l)?.checked_add(r)?, self.img.height.checked_add(t)?.checked_add(b)?);
+        if !e.g.fits(w, h) {
+            return None;
+        }
+        let out = e.image(w, h);
+        e.copy_into(&self.img, &out, l, t);
+        self.img = out;
+        self.offset[0] += l as f64;
+        self.offset[1] += t as f64;
+        Some(())
+    }
+
     /// Buf::pad: grow by `pad` transparent pixels on every side.
     pub fn pad(&mut self, e: &mut Enc, pad: u32) -> Option<()> {
         if pad == 0 {
@@ -234,7 +251,13 @@ pub(crate) fn box_passes(e: &mut Enc, img: &GpuImage, rx: &[usize], ry: &[usize]
         let mut p = Params::default();
         p.u[0] = [r as u32, repeat as u32, block, 0];
         let out = e.scratch(cur.width, cur.height);
-        e.dispatch(if vertical { "box_v" } else { "box_h" }, &p, &cur, None, &out, None, (lines.div_ceil(64), n.div_ceil(block)));
+        e.dispatch(
+            if vertical { "box_v" } else { "box_h" },
+            &p,
+            crate::context::KernelImages { src: &cur, aux: None, out: &out },
+            None,
+            (lines.div_ceil(64), n.div_ceil(block)),
+        );
         cur = out;
     }
     cur
@@ -261,6 +284,10 @@ fn gaussian(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
         return Some(b);
     }
     let (kx, ky) = dims_xy(ctx.params.e("dimensions"));
+    // Small sigmas use the CPU's sampled kernel (#1939).
+    if effectcraft_raster::gaussian_is_exact(s * kx, s * ky) {
+        return None;
+    }
     let repeat = ctx.params.b("repeatEdge");
     if !repeat && !ctx.adjustment {
         b.pad(e, (s * 3.0).ceil() as u32)?;
@@ -270,7 +297,12 @@ fn gaussian(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
 }
 
 fn box_blur(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
-    let r = (ctx.params.f("radius") * b.scale).round().max(0.0) as usize;
+    let radius = (ctx.params.f("radius") * b.scale).max(0.0);
+    // Fractional radii blend two integer radii on the CPU (#1939).
+    if radius - radius.floor() >= 1e-4 {
+        return None;
+    }
+    let r = radius.floor() as usize;
     if r == 0 {
         return Some(b);
     }
@@ -324,10 +356,11 @@ fn glow(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
     p.f[2] = cb;
     let bright = e.image(b.img.width, b.img.height);
     e.pixels("glow_bright", &p, &b.img, None, &bright, None);
-    let s = (radius / 2.0).max(0.5);
+    let s = effectcraft_effects::glow_sigma(radius);
     let blurred = gaussian_blur(e, &bright, s * kx, s * ky, false);
     let mut p = Params::default();
     p.u[0][0] = ctx.params.e("operation").min(2);
+    p.u[0][1] = (ctx.params.e("based") == 0) as u32;
     p.f[0][0] = intensity;
     let out = e.scratch(b.img.width, b.img.height);
     e.pixels("glow_combine", &p, &b.img, Some(&blurred), &out, None);
@@ -369,26 +402,24 @@ fn transform(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
     if ctx.env.host.is_some() && effectcraft_effects::transform_shutter(ctx).is_some() {
         return None;
     }
-    let anchor = b.to_px(ctx.params.v2("anchor"));
-    let pos = b.to_px(ctx.params.v2("position"));
-    let sh = ctx.params.f("scaleHeight");
-    let sw = if ctx.params.b("uniform") { sh } else { ctx.params.f("scaleWidth") };
     let opacity = ctx.params.f("opacity") as f32 / 100.0;
-    let m = Mat3::translate(vec2(pos.0, pos.1))
-        * Mat3::rotate_deg(ctx.params.f("rotation"))
-        * Mat3::skew_deg(ctx.params.f("skew"), ctx.params.f("skewAxis"))
-        * Mat3::scale(vec2(sw / 100.0, sh / 100.0))
-        * Mat3::translate(vec2(-anchor.0, -anchor.1));
+    // As distort::transform: After Effects' matrix, drawn outside the layer's bounds.
+    if !ctx.adjustment {
+        let m = effectcraft_effects::transform_matrix_px(ctx.params, |p| b.to_px(p));
+        let sides = effectcraft_effects::transform_grow(&[m], b.img.width, b.img.height);
+        b.pad_sides(e, sides)?;
+    }
+    let m = effectcraft_effects::transform_matrix_px(ctx.params, |p| b.to_px(p));
     let sampling = if ctx.params.e("sampling") == 1 { Sampling::Bicubic } else { Sampling::Bilinear };
     let empty = e.image(b.img.width, b.img.height);
-    b.img = ops::warp(e, &empty, &b.img, &m, sampling, effectcraft_color::BlendMode::Normal, opacity, 0, None);
+    b.img = ops::warp(e, &empty, &b.img, &m, ops::WarpOptions { sampling, mode: effectcraft_color::BlendMode::Normal, opacity, seed: 0 }, None);
     Some(b)
 }
 
 // ---------------------------------------------------------------- per-pixel
 
 fn curves(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
-    let parsed = ["rgb", "red", "green", "blue", "alpha"].map(|id| effectcraft_effects::Curve::parse(ctx.params.s(id)));
+    let parsed = ["rgb", "red", "green", "blue", "alpha"].map(|id| effectcraft_effects::Curve::parse_natural(ctx.params.s(id)));
     if parsed.iter().all(Option::is_none) {
         return Some(b);
     }
@@ -528,9 +559,19 @@ fn pointwise(e: &mut Enc, id: &str, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
             let sub = (f("subSettings/subScaling") / 100.0).clamp(0.1, 1.0);
             p.u[0] = [10, kind, octaves.ceil() as u32, f("evolutionOptions/seed") as u32 ^ 0x51ed];
             p.u[1] = [pr.b("invert") as u32, pr.e("overflow"), mode, 0];
-            p.f[0] = [f("contrast") as f32 / 100.0, f("brightness") as f32 / 100.0, (sw * b.scale).max(1.0) as f32, (octaves - octaves.floor()) as f32];
+            p.f[0] = [
+                f("contrast") as f32 / 100.0,
+                f("brightness") as f32 / 100.0,
+                (sw * effectcraft_effects::NOISE_CELL * b.scale).max(1.0) as f32,
+                (octaves - octaves.floor()) as f32,
+            ];
             p.f[1] = [ox as f32, oy as f32, sr, cr];
-            p.f[2] = [f("evolution") as f32 / 360.0, f("blend") as f32 / 100.0, (f("opacity") as f32 / 100.0).clamp(0.0, 1.0), (sh * b.scale).max(1.0) as f32];
+            p.f[2] = [
+                f("evolution") as f32 / 360.0,
+                f("blend") as f32 / 100.0,
+                (f("opacity") as f32 / 100.0).clamp(0.0, 1.0),
+                (sh * effectcraft_effects::NOISE_CELL * b.scale).max(1.0) as f32,
+            ];
             p.f[3] = [(f("subSettings/subInfluence") as f32 / 100.0).clamp(0.0, 1.0), 1.0 / sub as f32, 0.0, 0.0];
         }
         _ => return None,
diff --git a/crates/gpu/src/fx_color.rs b/crates/gpu/src/fx_color.rs
index b9ae5282c..18bd8409f 100644
--- a/crates/gpu/src/fx_color.rs
+++ b/crates/gpu/src/fx_color.rs
@@ -90,11 +90,10 @@ fn point(e: &mut Enc, id: &str, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
         "ec.color.blackwhite" => {
             let w = ["reds", "yellows", "greens", "cyans", "blues", "magentas"].map(|k| f(k) / 100.0);
             let tc = pr.color("tintColor");
-            let (th, ts, _) = rgb_to_hsl(tc[0], tc[1], tc[2]);
             p.u[0] = [3, pr.b("tint") as u32, 0, 0];
             p.f[0] = [w[0], w[1], w[2], w[3]];
             p.f[1] = [w[4], w[5], 0.0, 0.0];
-            p.f[2] = [th, ts, 0.0, 0.0];
+            p.f[2] = [tc[0], tc[1], tc[2], 0.0];
         }
         "ec.color.tritone" => {
             p.u[0][0] = 4;
diff --git a/crates/gpu/src/fx_depth.rs b/crates/gpu/src/fx_depth.rs
index 4931afe2a..eb2a96adb 100644
--- a/crates/gpu/src/fx_depth.rs
+++ b/crates/gpu/src/fx_depth.rs
@@ -278,7 +278,11 @@ fn cryptomatte(e: &mut Enc, ctx: &EffectCtx, b: GBuf, a: &AuxChannels) -> Option
     let sel = effectcraft_effects::selection_hashes(pr.s("selection"), manifest);
     // Per aux pixel: coverage-weighted ID colours (RGB) and the selection's coverage (A), on all
     // cores with the rank planes resolved once.
-    let img = effectcraft_effects::crypto_aux_image(a, &layer, &sel);
+    // The ID colours are only read by the Colors display; Matte, Preview and Matte Only need the
+    // matte alone.
+    // `tests::fx_depth::cryptomatte_every_display_matches_the_cpu` guards this against the shader.
+    let what = effectcraft_effects::CryptoAux::for_display(pr.e("display"), pr.b("matteOnly"));
+    let img = effectcraft_effects::crypto_aux_image_with(a, &layer, &sel, what);
     let tex = e.g.upload_image(&img)?;
     let plane = lookup(e, &b, a, &tex, [0.5, 0.5], [0.0; 4]);
     let mut p = op(7);
diff --git a/crates/gpu/src/fx_distort.rs b/crates/gpu/src/fx_distort.rs
index a62ad6831..ce7133822 100644
--- a/crates/gpu/src/fx_distort.rs
+++ b/crates/gpu/src/fx_distort.rs
@@ -111,7 +111,10 @@ fn wave_warp(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
     let dir = ctx.params.f("direction").to_radians();
     let speed = ctx.params.f("speed");
     let phase = ctx.params.f("phase").to_radians() + ctx.time * speed * TAU;
-    let (dx, dy) = (dir.sin(), -dir.cos());
+    // Cardinal directions must not acquire a tiny perpendicular slope: at a square-wave
+    // boundary cos(90°)'s rounding residue can flip a whole column on CPU but not GPU.
+    let axis = |v: f64| if v.abs() < 4.0 * f64::EPSILON { 0.0 } else { v };
+    let (dx, dy) = (axis(dir.sin()), -axis(dir.cos()));
     if !ctx.adjustment {
         b.pad(e, h.abs().ceil() as u32 + 1)?;
     }
diff --git a/crates/gpu/src/fx_extra.rs b/crates/gpu/src/fx_extra.rs
index 2e8bb85b8..cff516305 100644
--- a/crates/gpu/src/fx_extra.rs
+++ b/crates/gpu/src/fx_extra.rs
@@ -188,6 +188,10 @@ fn gaussian_legacy(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
         2 => (0.0, 1.0),
         _ => (1.0, 1.0),
     };
+    // Small sigmas use the CPU's sampled kernel (#1939).
+    if effectcraft_raster::gaussian_is_exact(s * kx, s * ky) {
+        return None;
+    }
     if !ctx.adjustment {
         b.pad(e, (s * 3.0).ceil() as u32)?;
     }
diff --git a/crates/gpu/src/fx_generate.rs b/crates/gpu/src/fx_generate.rs
index 3744ec4fa..d0c96a029 100644
--- a/crates/gpu/src/fx_generate.rs
+++ b/crates/gpu/src/fx_generate.rs
@@ -117,11 +117,14 @@ fn radial_blur(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
     run(e, "gen_radial_blur", &p, b, None, Some(&data))
 }
 
-fn radial_fast(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
+fn radial_fast(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
     let s = (ctx.params.f("amount") / 100.0).clamp(0.0, 1.0) * 0.5;
     if s <= 0.0 {
         return Some(b);
     }
+    if !ctx.adjustment {
+        b.pad(e, effectcraft_effects::radial_fast_pad(b.to_px(ctx.params.v2("center")), b.img.width, b.img.height, s))?;
+    }
     let c = b.to_px(ctx.params.v2("center"));
     let mut p = Params::default();
     p.u[0][0] = ctx.params.e("zoom");
@@ -162,7 +165,7 @@ fn camera_lens(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
             return None;
         }
         let pre = e.image(w + 1, h);
-        e.dispatch("gen_row_prefix", &Params::default(), &src, None, &pre, None, (h.div_ceil(64), 1));
+        e.dispatch("gen_row_prefix", &Params::default(), crate::context::KernelImages { src: &src, aux: None, out: &pre }, None, (h.div_ceil(64), 1));
         Some(pre)
     } else {
         None
@@ -204,55 +207,53 @@ fn linear_wipe(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
 }
 
 fn venetian(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
-    let done = ctx.params.f("completion") / 100.0;
+    let done = (ctx.params.f("completion") / 100.0).clamp(0.0, 1.0);
+    if done <= 0.0 {
+        return Some(b);
+    }
     let ang = ctx.params.f("direction").to_radians();
     let width = (ctx.params.f("width") * b.scale).max(1.0);
-    let feather = (ctx.params.f("feather") * b.scale).max(0.001);
+    let sigma = ctx.params.f("feather").max(0.0) * b.scale / 2.0;
+    // The CPU's even veil and term count (effects::venetian_cover).
+    if sigma > 8.0 * width {
+        return None;
+    }
     let (dx, dy) = (ang.cos(), ang.sin());
-    let mut data = Vec::with_capacity((6 * b.img.width + 2 * b.img.height) as usize);
+    let (ox, oy) = b.to_px(effectcraft_effects::venetian_origin(ctx.layer_size));
+    let mut data = Vec::with_capacity((4 * b.img.width + 2 * b.img.height) as usize);
     for x in 0..b.img.width {
-        let cx = ((x as f64 + 0.5) * dx).rem_euclid(width);
-        data.extend(hl(cx - done * width));
-        data.extend(hl(cx - width - done * width));
+        let cx = ((x as f64 + 0.5 - ox) * dx).rem_euclid(width);
+        data.extend(hl(cx));
         data.extend(hl(cx - width));
     }
     for y in 0..b.img.height {
-        data.extend(hl(((y as f64 + 0.5) * dy).rem_euclid(width)));
+        data.extend(hl(((y as f64 + 0.5 - oy) * dy).rem_euclid(width)));
     }
     let mut p = Params::default();
-    p.u[0][0] = 6 * b.img.width;
-    p.f[0][0] = feather as f32;
+    p.u[0][0] = 4 * b.img.width;
+    p.u[0][1] = if sigma < 1e-3 { 0 } else { ((4.0 * sigma / width).ceil() as u32 + 1).clamp(1, 40) };
+    p.f[0] = [width as f32, (done * width) as f32, sigma as f32, 0.0];
     run(e, "gen_venetian", &p, b, None, Some(&data))
 }
 
 fn radial_wipe(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
-    let done = ctx.params.f("completion") / 100.0;
+    let done = (ctx.params.f("completion") / 100.0).clamp(0.0, 1.0);
+    if done <= 0.0 {
+        return Some(b);
+    }
     let start = ctx.params.f("startAngle");
     let c = b.to_px(ctx.params.v2("center"));
-    let dir = ctx.params.e("wipe");
-    let feather = ctx.params.f("feather").max(0.01);
-    let edge = if dir == 2 { done * 180.0 } else { done * 360.0 };
-    // Rotations: the start angle, and the start angle ± the edge (where the wipe's edge lies).
-    let rots = [start, start + edge, start - edge].map(|r| r.to_radians().sin_cos());
-    let mut data = Vec::with_capacity(9 * (b.img.width + b.img.height) as usize);
-    for x in 0..b.img.width {
-        let ux = x as f64 + 0.5 - c.0;
-        for (s, co) in rots {
-            data.extend(hl(ux * co));
-            data.push((ux * s) as f32);
-        }
-    }
-    for y in 0..b.img.height {
-        let uy = -(y as f64 + 0.5 - c.1);
-        for (s, co) in rots {
-            data.extend(hl(uy * s));
-            data.push((uy * co) as f32);
-        }
-    }
+    let (w0, span) = effectcraft_effects::radial_wipe_wedge(ctx.params.e("wipe"), done);
+    let sigma = effectcraft_effects::radial_wipe_sigma(ctx.params.f("feather")) * b.scale;
+    let ray0 = start + w0;
+    let (s0, c0) = ray0.to_radians().sin_cos();
+    let (s1, c1) = (ray0 + span).to_radians().sin_cos();
     let mut p = Params::default();
-    p.u[0] = [9 * b.img.width, dir.min(2), 0, 0];
-    p.f[0] = [edge as f32, feather as f32, 0.0, 0.0];
-    run(e, "gen_radial_wipe", &p, b, None, Some(&data))
+    p.u[0] = [(done >= 1.0) as u32, (sigma < 1e-3) as u32, 0, 0];
+    p.f[0] = [c.0 as f32, c.1 as f32, sigma.max(1e-3) as f32, ray0.rem_euclid(360.0) as f32];
+    p.f[1] = [s0 as f32, c0 as f32, s1 as f32, c1 as f32];
+    p.f[2][0] = span as f32;
+    run(e, "gen_radial_wipe", &p, b, None, None)
 }
 
 fn gradient_wipe(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
@@ -353,10 +354,10 @@ fn four_color(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
         p.f[i] = [q.0 as f32, q.1 as f32, 0.0, 0.0];
         p.f[4 + i] = ctx.params.color(&format!("positionsColors/color{}", i + 1));
     }
-    let blend = ctx.params.f("blend").max(1.0);
+    let k = effectcraft_effects::four_color_softening(ctx.params.f("blend"), b.scale);
     let jitter = (ctx.params.f("jitter") / 100.0).clamp(0.0, 1.0) as f32;
     p.u[0] = [gen_mode(ctx.params.e("blendingMode")), ctx.seed, 0, 0];
-    p.f[8] = [(blend * 100.0) as f32, jitter, ctx.params.f("opacity") as f32 / 100.0, 0.0];
+    p.f[8] = [k as f32, jitter, ctx.params.f("opacity") as f32 / 100.0, 0.0];
     run(e, "gen_fourcolor", &p, b, None, None)
 }
 
diff --git a/crates/gpu/src/fx_key.rs b/crates/gpu/src/fx_key.rs
index 1099bccd1..3bb5a87ab 100644
--- a/crates/gpu/src/fx_key.rs
+++ b/crates/gpu/src/fx_key.rs
@@ -438,8 +438,10 @@ fn refine(e: &mut Enc, ctx: &EffectCtx, b: GBuf, hard: bool) -> Option<GBuf> {
 
 const SET_CHANNEL_LAYERS: [&str; 4] = ["sourceLayer1", "sourceLayer2", "sourceLayer3", "sourceLayer4"];
 
+/// Shift Channels' Take … From menu, in the order of `effects`' `SHIFT_ORDER`: the two must agree,
+/// or the source depends on whether the effect renders on the GPU.
 const SHIFT_ORDER: [Src; 11] =
-    [Src::Alpha, Src::Red, Src::Green, Src::Blue, Src::Luminance, Src::Hue, Src::Lightness, Src::Saturation, Src::Full, Src::Half, Src::Off];
+    [Src::Alpha, Src::Red, Src::Green, Src::Blue, Src::Luminance, Src::Hue, Src::Lightness, Src::Saturation, Src::Full, Src::Off, Src::Half];
 
 const MATTE_ORDER: [Src; 10] = [Src::Red, Src::Green, Src::Blue, Src::Alpha, Src::Luminance, Src::Hue, Src::Lightness, Src::Saturation, Src::Full, Src::Off];
 
@@ -527,7 +529,8 @@ fn point(e: &mut Enc, id: &str, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
             p.f[0] = [level, pr.f("softness").clamp(0.0, 100.0) as f32 / 100.0, 0.0, 0.0];
         }
         "ec.channel.shiftchannels" => {
-            let s = ["takeRedFrom", "takeGreenFrom", "takeBlueFrom", "takeAlphaFrom"].map(|id| src_index(SHIFT_ORDER[(pr.e(id) as usize).min(10)]));
+            let s = ["takeRedFrom", "takeGreenFrom", "takeBlueFrom", "takeAlphaFrom"]
+                .map(|id| src_index(SHIFT_ORDER[(pr.e(id) as usize).min(SHIFT_ORDER.len() - 1)]));
             return route(e, b, s);
         }
         "ec.channel.removecolormatting" => {
diff --git a/crates/gpu/src/fx_noise.rs b/crates/gpu/src/fx_noise.rs
index 1a20aa453..22f23fd86 100644
--- a/crates/gpu/src/fx_noise.rs
+++ b/crates/gpu/src/fx_noise.rs
@@ -73,6 +73,53 @@ pub(crate) const IDS: &[&str] = &[
 /// not its square.
 pub(crate) const MEDIAN_BISECT_R: usize = 4;
 
+/// Physical GPUs retain the original parallel private histogram. Software Vulkan
+/// uses bounded workgroup storage to avoid its expensive first-use private-array
+/// lowering. This trades some warmed software throughput for bounded first use.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum MedianKernel {
+    Private64,
+    Software2,
+}
+
+impl MedianKernel {
+    pub(crate) fn for_adapter(backend: wgpu::Backend, device_type: wgpu::DeviceType) -> Self {
+        if backend == wgpu::Backend::Vulkan && device_type == wgpu::DeviceType::Cpu { Self::Software2 } else { Self::Private64 }
+    }
+
+    pub(crate) fn rows_per_workgroup(self) -> u32 {
+        match self {
+            Self::Private64 => 64,
+            Self::Software2 => 2,
+        }
+    }
+
+    pub(crate) fn workgroup_storage(self) -> u32 {
+        match self {
+            Self::Private64 => 0,
+            Self::Software2 => 16_384,
+        }
+    }
+
+    pub(crate) fn source(self) -> &'static str {
+        match self {
+            Self::Private64 => include_str!("shaders/median_private.wgsl"),
+            Self::Software2 => include_str!("shaders/median_software.wgsl"),
+        }
+    }
+
+    /// Separate test processes can qualify both implementations against existing oracles.
+    #[cfg(test)]
+    pub(crate) fn test_override(self) -> Result<Self, String> {
+        match std::env::var("EFFECTCRAFT_TEST_MEDIAN_KERNEL") {
+            Err(std::env::VarError::NotPresent) => Ok(self),
+            Ok(value) if value == "private64" => Ok(Self::Private64),
+            Ok(value) if value == "software2" => Ok(Self::Software2),
+            value => Err(format!("invalid EFFECTCRAFT_TEST_MEDIAN_KERNEL {value:?}; expected private64 or software2")),
+        }
+    }
+}
+
 /// Run effect `id` (one of [`IDS`]); `None` = this parameter combination runs on the CPU.
 pub(crate) fn apply(e: &mut Enc, id: &str, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
     match id {
@@ -166,7 +213,8 @@ pub(crate) fn median_image(e: &mut Enc, img: &GpuImage, r: usize, straight: bool
     // sliding along the rest.
     let seg = (4 * r as u32).clamp(32, 512).min(q.width);
     let out = e.scratch(q.width, q.height);
-    e.dispatch("fxn_median_huang", &with_u0([r as u32, seg, 0, 0]), &q, None, &out, Some(&levels), (q.height.div_ceil(64), q.width.div_ceil(seg)));
+    let groups = (q.height.div_ceil(e.g.median_kernel.rows_per_workgroup()), q.width.div_ceil(seg));
+    e.dispatch("fxn_median_huang", &with_u0([r as u32, seg, 0, 0]), crate::context::KernelImages { src: &q, aux: None, out: &out }, Some(&levels), groups);
     out
 }
 
diff --git a/crates/gpu/src/fx_pixel2.rs b/crates/gpu/src/fx_pixel2.rs
index 9de26f013..acba936d0 100644
--- a/crates/gpu/src/fx_pixel2.rs
+++ b/crates/gpu/src/fx_pixel2.rs
@@ -493,7 +493,7 @@ fn wire_removal(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
     let mut p = Params::default();
     p.u[0][0] = ctx.params.e("removalStyle");
     p.f[0] = [a.0 as f32, a.1 as f32, -ty as f32, tx as f32];
-    p.f[1] = [half as f32, (half * slope as f64) as f32, mirror, 0.0];
+    p.f[1] = [half as f32, (half * slope as f64) as f32, mirror, len as f32];
     run(e, "fp2_wire", &p, b, None, None)
 }
 
diff --git a/crates/gpu/src/fx_stylize.rs b/crates/gpu/src/fx_stylize.rs
index f5b7708d9..cc9045a41 100644
--- a/crates/gpu/src/fx_stylize.rs
+++ b/crates/gpu/src/fx_stylize.rs
@@ -637,13 +637,7 @@ fn motion_tile(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
     let mirror = ctx.params.b("mirrorEdges");
     let phase = ctx.params.f("phase") / 360.0;
     let hshift = ctx.params.b("horizontalPhaseShift");
-    let (nw, nh, noff) = if ctx.adjustment {
-        (b.img.width, b.img.height, b.offset)
-    } else {
-        let ow = (lw * ctx.params.f("outputWidth") / 100.0).max(1.0 / s);
-        let oh = (lh * ctx.params.f("outputHeight") / 100.0).max(1.0 / s);
-        ((ow * s).round().max(1.0) as u32, (oh * s).round().max(1.0) as u32, [(ow - lw) * 0.5 * s, (oh - lh) * 0.5 * s])
-    };
+    let (nw, nh, noff) = effectcraft_effects::motion_tile_frame(ctx, b.offset, (b.img.width, b.img.height), s);
     if !e.g.fits(nw, nh) {
         return None;
     }
@@ -885,7 +879,7 @@ fn corner_pin(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
     let o = b.to_px([0.0, 0.0]);
     let m = quad * Mat3::scale(vec2(1.0 / (w * b.scale), 1.0 / (h * b.scale))) * Mat3::translate(vec2(-o.0, -o.1));
     let empty = e.image(b.img.width, b.img.height);
-    b.img = ops::warp(e, &empty, &b.img, &m, Sampling::Bilinear, BlendMode::Normal, 1.0, 0, None);
+    b.img = ops::warp(e, &empty, &b.img, &m, ops::WarpOptions { sampling: Sampling::Bilinear, mode: BlendMode::Normal, opacity: 1.0, seed: 0 }, None);
     Some(b)
 }
 
@@ -943,11 +937,12 @@ pub(crate) fn glow(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBuf> {
         p.f[2] = ctx.params.color("colorB");
         e.pixels("glow_bright", &p, &b.img, None, &bright, None);
     }
-    let s = (radius / 2.0).max(0.5);
+    let s = effectcraft_effects::glow_sigma(radius);
     let blurred = gaussian_blur(e, &bright, s * kx, s * ky, false);
     let operation = ctx.params.e("operation");
     let glow_op = effectcraft_effects::glow_operation(ctx);
     let mut p = Params::default();
+    p.u[0][1] = (ctx.params.e("based") == 0) as u32;
     p.f[0][0] = intensity;
     let out = e.scratch(b.img.width, b.img.height);
     if operation == 0 && glow_op != BlendMode::Add {
@@ -969,15 +964,7 @@ pub(crate) fn transform_blur(ctx: &EffectCtx) -> bool {
 
 /// distort::transform_matrix.
 fn transform_matrix(pr: &effectcraft_effects::Params, b: &GBuf) -> Mat3 {
-    let anchor = b.to_px(pr.v2("anchor"));
-    let pos = b.to_px(pr.v2("position"));
-    let sh = pr.f("scaleHeight");
-    let sw = if pr.b("uniform") { sh } else { pr.f("scaleWidth") };
-    Mat3::translate(vec2(pos.0, pos.1))
-        * Mat3::rotate_deg(pr.f("rotation"))
-        * Mat3::skew_deg(pr.f("skew"), pr.f("skewAxis"))
-        * Mat3::scale(vec2(sw / 100.0, sh / 100.0))
-        * Mat3::translate(vec2(-anchor.0, -anchor.1))
+    effectcraft_effects::transform_matrix_px(pr, |p| b.to_px(p))
 }
 
 /// distort::transform's motion blur: the transform at Samples instants across the shutter,
@@ -987,15 +974,24 @@ pub(crate) fn transform(e: &mut Enc, ctx: &EffectCtx, mut b: GBuf) -> Option<GBu
     let host = ctx.env.host?;
     let sampling = if ctx.params.e("sampling") == 1 { Sampling::Bicubic } else { Sampling::Bilinear };
     let fd = 1.0 / ctx.fps();
+    let samples: Vec<effectcraft_effects::Params> =
+        (0..n).filter_map(|k| host.params_at(ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd)).collect();
+    if samples.is_empty() {
+        // The CPU renders the frame sharp.
+        return None;
+    }
+    if !ctx.adjustment {
+        let ms: Vec<Mat3> = samples.iter().map(|pr| transform_matrix(pr, &b)).collect();
+        let sides = effectcraft_effects::transform_grow(&ms, b.img.width, b.img.height);
+        b.pad_sides(e, sides)?;
+    }
     let (w, h) = (b.img.width, b.img.height);
     let mut acc = e.image(w, h);
     let mut count = 0u32;
-    for k in 0..n {
-        let t = ctx.time + (phase + angle * k as f64 / (n - 1) as f64) / 360.0 * fd;
-        let Some(pr) = host.params_at(t) else { continue };
+    for pr in &samples {
         let op = pr.f("opacity") as f32 / 100.0;
         let empty = e.image(w, h);
-        let one = ops::warp(e, &empty, &b.img, &transform_matrix(&pr, &b), sampling, BlendMode::Normal, op, 0, None);
+        let one = ops::warp(e, &empty, &b.img, &transform_matrix(pr, &b), ops::WarpOptions { sampling, mode: BlendMode::Normal, opacity: op, seed: 0 }, None);
         let sum = e.image(w, h);
         e.pixels("fxs_add", &Params::default(), &acc, Some(&one), &sum, None);
         acc = sum;
diff --git a/crates/gpu/src/fx_transition.rs b/crates/gpu/src/fx_transition.rs
index a0ad54658..60378491e 100644
--- a/crates/gpu/src/fx_transition.rs
+++ b/crates/gpu/src/fx_transition.rs
@@ -586,17 +586,19 @@ fn blobbylize(e: &mut Enc, ctx: &EffectCtx, b: GBuf) -> Option<GBuf> {
     let soft = pr.f("softness").max(0.0) * b.scale;
     let blob = layer_or_self(e, ctx, &b, "blobLayer")?;
     let raw = plane(e, &blob, pr.e("property").min(10));
-    let h = gaussian_blur(e, &raw, soft, soft, true);
+    let h = gaussian_blur(e, &raw, soft * 0.42, soft * 0.42, true);
     let lpos = b.to_px(pr.v2("lightPosition"));
     let lheight = pr.f("lightHeight");
     let (d, el) = (pr.f("lightDirection").to_radians(), (lheight / 100.0).clamp(0.0, 1.0) * std::f64::consts::FRAC_PI_2);
     let ldir = [d.sin() * el.cos(), -d.cos() * el.cos(), el.sin()];
     let span = (b.img.width.max(b.img.height) as f64).max(1.0);
     let mut p = Params::default();
-    p.f[0] = f4([(soft * 0.5).max(1.0), (pr.f("cutAway") / 100.0).clamp(0.0, 0.99), pr.f("lightIntensity") / 100.0, pr.f("ambient") / 100.0]);
+    p.f[0] = f4([(pr.f("cutAway") / 100.0).clamp(0.0, 1.0), pr.f("lightIntensity") / 100.0, pr.f("ambient") / 100.0, soft * 1.5]);
     p.f[1] = f4([pr.f("diffuse") / 100.0, pr.f("specular") / 100.0, (1.0 / pr.f("roughness").clamp(0.001, 1.0)).min(500.0), pr.f("metal") / 100.0]);
     p.f[2] = f4([lpos.0, lpos.1, lheight / 100.0 * span, (pr.e("lightType") == 1) as u32 as f64]);
     p.f[3] = f4([ldir[0], ldir[1], ldir[2], 0.0]);
     p.f[4] = rgb(pr.color("lightColor"), 0.0);
+    p.f[5] = f4([if soft > 0.05 { span / 64.0 } else { 0.0 }, span * 0.34 * b.scale, (soft * 0.65).max(1.0), 1.25]);
+    p.f[6] = f4([span * 0.5, 0.0, 0.0, 0.0]);
     run(e, "ftr_blob", &p, b, Some(&h), None)
 }
diff --git a/crates/gpu/src/fx_vr.rs b/crates/gpu/src/fx_vr.rs
index e719d606f..438eeb661 100644
--- a/crates/gpu/src/fx_vr.rs
+++ b/crates/gpu/src/fx_vr.rs
@@ -181,7 +181,13 @@ fn sphere_blur(e: &mut Enc, img: &GpuImage, sigma: f64) -> GpuImage {
         let mut p = Params::default();
         p.u[0][0] = 256;
         let out = e.scratch(cur.width, cur.height);
-        e.dispatch("fxv_box_h", &p, &cur, None, &out, Some(&buf), (cur.height.div_ceil(64), cur.width.div_ceil(256)));
+        e.dispatch(
+            "fxv_box_h",
+            &p,
+            crate::context::KernelImages { src: &cur, aux: None, out: &out },
+            Some(&buf),
+            (cur.height.div_ceil(64), cur.width.div_ceil(256)),
+        );
         cur = out;
     }
     for &r in &radii {
@@ -192,7 +198,13 @@ fn sphere_blur(e: &mut Enc, img: &GpuImage, sigma: f64) -> GpuImage {
         let mut p = Params::default();
         p.u[0] = [block, r as u32, 0, 0];
         let out = e.scratch(cur.width, cur.height);
-        e.dispatch("fxv_box_v", &p, &cur, None, &out, None, (cur.width.div_ceil(64), cur.height.div_ceil(block)));
+        e.dispatch(
+            "fxv_box_v",
+            &p,
+            crate::context::KernelImages { src: &cur, aux: None, out: &out },
+            None,
+            (cur.width.div_ceil(64), cur.height.div_ceil(block)),
+        );
         cur = out;
     }
     cur
diff --git a/crates/gpu/src/lib.rs b/crates/gpu/src/lib.rs
index 1cff8be07..94b95166a 100644
--- a/crates/gpu/src/lib.rs
+++ b/crates/gpu/src/lib.rs
@@ -83,6 +83,7 @@ mod ops;
 mod particles;
 mod readback;
 mod walk;
+mod yuv;
 
 use std::sync::Arc;
 
@@ -339,6 +340,25 @@ impl Accelerator for Gpu {
         img
     }
 
+    fn comp_frame_yuv420(&self, r: &Renderer, comp: ItemId, t: Tick, bg: [f32; 3]) -> Option<Vec<u8>> {
+        self.ctx.check_health().ok()?;
+        if !self.ctx.can_readback() || self.ctx.deferred.is_some() {
+            return None;
+        }
+        // Sizes the kernel can't take fall back before any GPU work, not after a render.
+        let (w, h) = walk::frame_size(r, comp, t)?;
+        if !yuv::supported(w, h) || !yuv::fits_limits(w, h, &self.ctx.device.limits()) {
+            return None;
+        }
+        let yp = self.ctx.yuv_pipe()?;
+        let mut e = Enc::new(&self.ctx);
+        let img = walk::render(&mut e, r, comp, t)?;
+        let planes = yuv::convert(&mut e, yp, &img, bg)?;
+        // A device fault seen while the frame recorded makes the planes untrustworthy.
+        self.ctx.check_health().ok()?;
+        Some(planes)
+    }
+
     fn supports_effect(&self, id: &str) -> bool {
         self.ctx.check_health().is_ok() && self.ctx.can_readback() && effects::supports(id)
     }
@@ -407,57 +427,3 @@ impl effectcraft_effects::psim::ParticleSim for Gpu {
 
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_3d;
-#[cfg(test)]
-mod tests_adjust;
-#[cfg(test)]
-mod tests_adv3d;
-#[cfg(test)]
-mod tests_deferred;
-#[cfg(test)]
-mod tests_deferred_jobs;
-#[cfg(test)]
-mod tests_fx_color;
-#[cfg(test)]
-mod tests_fx_depth;
-#[cfg(test)]
-mod tests_fx_distort;
-#[cfg(test)]
-mod tests_fx_extra;
-#[cfg(test)]
-mod tests_fx_gen2;
-#[cfg(test)]
-mod tests_fx_generate;
-#[cfg(test)]
-mod tests_fx_key;
-#[cfg(test)]
-mod tests_fx_light;
-#[cfg(test)]
-mod tests_fx_lut;
-#[cfg(test)]
-mod tests_fx_noise;
-#[cfg(test)]
-mod tests_fx_particles;
-#[cfg(test)]
-mod tests_fx_pixel2;
-#[cfg(test)]
-mod tests_fx_sim;
-#[cfg(test)]
-mod tests_fx_stylize;
-#[cfg(test)]
-mod tests_fx_text;
-#[cfg(test)]
-mod tests_fx_time;
-#[cfg(test)]
-mod tests_fx_tone;
-#[cfg(test)]
-mod tests_fx_transition;
-#[cfg(test)]
-mod tests_fx_vr;
-#[cfg(test)]
-mod tests_fx_warp;
-#[cfg(all(test, not(target_arch = "wasm32")))]
-mod tests_init;
-#[cfg(test)]
-mod tests_particles;
diff --git a/crates/gpu/src/ops.rs b/crates/gpu/src/ops.rs
index c9e0900e9..30c8c9bea 100644
--- a/crates/gpu/src/ops.rs
+++ b/crates/gpu/src/ops.rs
@@ -32,37 +32,23 @@ pub fn half(e: &mut Enc, src: &GpuImage) -> GpuImage {
     out
 }
 
-/// `raster::composite_warp` (and, with `accumulate = Some(weight)`, `accumulate_warp`): draw
-/// `src` transformed by `m` (src pixels → dst pixels) onto `dst`.
-pub fn warp(
-    e: &mut Enc,
-    dst: &GpuImage,
-    src: &GpuImage,
-    m: &Mat3,
-    sampling: Sampling,
-    mode: BlendMode,
-    opacity: f32,
-    seed: u32,
-    accumulate: Option<f32>,
-) -> GpuImage {
-    warp_q(e, dst, src, m, sampling, mode, opacity, seed, accumulate, None)
+/// Sampling and blending policy for a transformed GPU image.
+pub struct WarpOptions {
+    pub sampling: Sampling,
+    pub mode: BlendMode,
+    pub opacity: f32,
+    pub seed: u32,
+}
+
+/// Draw `src` transformed by `m` onto `dst`, or accumulate it with a sample weight.
+pub fn warp(e: &mut Enc, dst: &GpuImage, src: &GpuImage, m: &Mat3, opts: WarpOptions, accumulate: Option<f32>) -> GpuImage {
+    warp_q(e, dst, src, m, opts, accumulate, None)
 }
 
 /// [`warp`], clamping and quantising the result to `levels` (8/16 bpc: the comp after a layer,
 /// in the same pass).
-#[allow(clippy::too_many_arguments)]
-pub fn warp_q(
-    e: &mut Enc,
-    dst: &GpuImage,
-    src: &GpuImage,
-    m: &Mat3,
-    sampling: Sampling,
-    mode: BlendMode,
-    opacity: f32,
-    seed: u32,
-    accumulate: Option<f32>,
-    levels: Option<f32>,
-) -> GpuImage {
+pub fn warp_q(e: &mut Enc, dst: &GpuImage, src: &GpuImage, m: &Mat3, opts: WarpOptions, accumulate: Option<f32>, levels: Option<f32>) -> GpuImage {
+    let WarpOptions { sampling, mode, opacity, seed } = opts;
     if src.width == 0 || src.height == 0 || opacity <= 0.0 {
         return dst.clone();
     }
diff --git a/crates/gpu/src/shaders/advanced3d.wgsl b/crates/gpu/src/shaders/advanced3d.wgsl
index e1dbc8f58..4eea78c8c 100644
--- a/crates/gpu/src/shaders/advanced3d.wgsl
+++ b/crates/gpu/src/shaders/advanced3d.wgsl
@@ -179,7 +179,41 @@ fn equirect_uv(d: vec3<f32>, rot: f32) -> vec2<f32> {
     return vec2<f32>(u - floor(u), v);
 }
 
-fn shadow_factor(m: u32, p: vec3<f32>, n_l: f32) -> f32 {
+fn shadow_texel_at(offset: u32, sz: i32, x: i32, y: i32) -> f32 {
+    if (x < 0 || y < 0 || x >= sz || y >= sz) {
+        return 1e30; // outside the map: the light was never blocked there (finite stand-in for the CPU path's infinity sentinel)
+    }
+    return shadow_texels[offset + u32(y * sz + x)];
+}
+
+fn tap_hash(x: i32, y: i32) -> u32 {
+    var h: u32 = (u32(x) * 0x9E3779B9u) ^ (u32(y) * 0x85EBCA6Bu);
+    h = h ^ (h >> 16u);
+    h = h * 0x2545F491u;
+    h = h ^ (h >> 15u);
+    return h;
+}
+
+const PCF_MAX_TAPS: i32 = 10;
+const PLANE_SLOPE_MAX: f32 = 64.0;
+
+// shade::shadow_factor's `open`: 1 where texel (x, y) does not occlude the receiver
+// plane (depth slope -t in texel footprints per texel) at the texel's centre; the
+// perspective compare runs on inverse depth (iz + g·iq), which is linear across the map.
+fn shadow_open(offset: u32, sz: i32, x: i32, y: i32, ortho: bool, z: f32, texel: f32, bias: f32, t: vec2<f32>, u: f32, v: f32, iz: f32, iq: f32) -> f32 {
+    let s = shadow_texel_at(offset, sz, x, y) + bias;
+    let g = t.x * (f32(x) + 0.5 - u) + t.y * (f32(y) + 0.5 - v);
+    var lit: bool;
+    if (ortho) {
+        lit = z - g * texel <= s;
+    } else {
+        let inv = iz + g * iq;
+        lit = inv <= 0.0 || inv * s >= 1.0;
+    }
+    return select(0.0, 1.0, lit);
+}
+
+fn shadow_factor(m: u32, p: vec3<f32>, ng: vec3<f32>, n_l: f32) -> f32 {
     let r0 = shadows[m];
     let r1 = shadows[m + 1u];
     let r2 = shadows[m + 2u];
@@ -205,28 +239,66 @@ fn shadow_factor(m: u32, p: vec3<f32>, n_l: f32) -> f32 {
     }
     let z = q.z;
     let texel = select(abs(z) / focal, 1.0 / focal, ortho);
-    let bias = extra.x * texel * (1.0 + extra.y) * (1.0 + 3.0 * (1.0 - clamp(n_l, 0.0, 1.0)));
-    let step = extra.y / 2.0;
+    // CPU mirror (shade::shadow_factor), step for step: slope-scaled bias at texel
+    // scale (independent of the PCF radius extra.y; a diffusion-scaled bias lifts
+    // shadows off their casters), each texel compared against the receiver plane's
+    // depth at its centre so wide kernels never self-shadow a lit surface, an N×N grid
+    // jittered by an integer hash (bit-identical across backends) of the sub-texel
+    // cell and tap index, and bilinear compares of the four nearest texel centres.
+    // extra.y is the wanted penumbra in output pixels; dividing by the receiver's
+    // texel footprint keeps it in output pixels at any map resolution, and the reach
+    // is at least two texels so hard edges ramp over texel steps instead of showing them.
+    let bias = extra.x * texel * (1.0 + 3.0 * (1.0 - clamp(n_l, 0.0, 1.0)));
     let sz = i32(size);
+    let nv = vec3<f32>(dot(r0.xyz, ng), dot(r1.xyz, ng), dot(r2.xyz, ng));
+    var den0 = nv.z;
+    if (!ortho) {
+        den0 = nv.x * ((u - c) / focal) + nv.y * ((v - c) / focal) + nv.z;
+    }
+    var t = vec2<f32>(0.0, 0.0);
+    if (den0 < -1e-6) {
+        t = vec2<f32>(clamp(nv.x / den0, -PLANE_SLOPE_MAX, PLANE_SLOPE_MAX), clamp(nv.y / den0, -PLANE_SLOPE_MAX, PLANE_SLOPE_MAX));
+    }
+    let iz = 1.0 / z;
+    let iq = 1.0 / (focal * z);
+    var reach = clamp(extra.y / texel, 2.0, 256.0);
+    if (!(reach < 1e30)) {
+        reach = 1.0;
+    }
+    let n = clamp(i32(ceil(reach)) + 1, 5, PCF_MAX_TAPS);
+    let step = reach / f32(n - 1);
+    let half = f32(n - 1) * 0.5;
+    let cx = i32(floor(u * 8.0));
+    let cy = i32(floor(v * 8.0));
     var lit = 0.0;
-    for (var j = -2; j <= 2; j = j + 1) {
-        for (var i = -2; i <= 2; i = i + 1) {
-            let x = i32(floor(u + f32(i) * step));
-            let y = i32(floor(v + f32(j) * step));
-            if (x < 0 || y < 0 || x >= sz || y >= sz) {
-                lit = lit + 1.0;
-                continue;
-            }
-            let d = shadow_texels[offset + u32(y * sz + x)];
-            if (z - bias <= d) {
-                lit = lit + 1.0;
-            }
+    for (var j = 0; j < n; j = j + 1) {
+        for (var i = 0; i < n; i = i + 1) {
+            let h = tap_hash(cx + i * 7919, cy + j * 7919);
+            let jx = f32(h & 0xFFFFu) * (1.0 / 65536.0) - 0.5;
+            let jy = f32((h >> 16u) & 0xFFFFu) * (1.0 / 65536.0) - 0.5;
+            let su = u + ((f32(i) - half) + jx) * step;
+            let sv = v + ((f32(j) - half) + jy) * step;
+            // Texel (x, y) holds the depth at its centre (x + 0.5, y + 0.5); each of the
+            // four is compared against the receiver plane at that centre.
+            let tu = su - 0.5;
+            let tv = sv - 0.5;
+            let fx = tu - floor(tu);
+            let fy = tv - floor(tv);
+            let x0 = i32(floor(tu));
+            let y0 = i32(floor(tv));
+            let h00 = shadow_open(offset, sz, x0, y0, ortho, z, texel, bias, t, u, v, iz, iq);
+            let h10 = shadow_open(offset, sz, x0 + 1, y0, ortho, z, texel, bias, t, u, v, iz, iq);
+            let h01 = shadow_open(offset, sz, x0, y0 + 1, ortho, z, texel, bias, t, u, v, iz, iq);
+            let h11 = shadow_open(offset, sz, x0 + 1, y0 + 1, ortho, z, texel, bias, t, u, v, iz, iq);
+            let a = h00 + (h10 - h00) * fx;
+            let b = h01 + (h11 - h01) * fx;
+            lit = lit + a + (b - a) * fy;
         }
     }
-    return lit / 25.0;
+    return lit / f32(n * n);
 }
 
-fn light_shadow(li: u32, kind: u32, lpos: vec3<f32>, shadow: i32, darkness: f32, p: vec3<f32>, n_l: f32) -> f32 {
+fn light_shadow(li: u32, kind: u32, lpos: vec3<f32>, shadow: i32, darkness: f32, p: vec3<f32>, ng: vec3<f32>, n_l: f32) -> f32 {
     if (shadow < 0) {
         return 1.0;
     }
@@ -242,7 +314,7 @@ fn light_shadow(li: u32, kind: u32, lpos: vec3<f32>, shadow: i32, darkness: f32,
             face = select(5u, 4u, d.z > 0.0);
         }
     }
-    let f = shadow_factor((u32(shadow) + face) * SHADOW_STRIDE, p, n_l);
+    let f = shadow_factor((u32(shadow) + face) * SHADOW_STRIDE, p, ng, n_l);
     return 1.0 - darkness * (1.0 - f);
 }
 
@@ -288,6 +360,53 @@ struct FOut {
     @location(1) depth: u32,
 };
 
+// shade::to_light: unit direction to the light (xyz) and its distance (w).
+fn to_light(kind: u32, lpos: vec3<f32>, ldir: vec3<f32>, pos: vec3<f32>) -> vec4<f32> {
+    if (kind == 0u) {
+        return vec4<f32>(-ldir, 1e30);
+    }
+    let d = lpos - pos;
+    let len = sqrt(dot(d, d));
+    if (len < 1e-6) {
+        return vec4<f32>(0.0, 0.0, -1.0, 0.0);
+    }
+    return vec4<f32>(d / len, len);
+}
+
+// shade::shadow_only: the strongest shadow any light casts on the fragment.
+fn shadow_only_amount(unlit: bool, normal: vec3<f32>, front: bool, pos: vec3<f32>) -> f32 {
+    var amount = 0.0;
+    if (unlit) {
+        return amount;
+    }
+    var n = norm3(normal);
+    if (!front) {
+        n = -n;
+    }
+    let nl_count = u32(g.fwd.w);
+    for (var li = 0u; li < nl_count; li = li + 1u) {
+        let lb = li * LIGHT_STRIDE;
+        let l0 = lights[lb];
+        let l1 = lights[lb + 1u];
+        let l2 = lights[lb + 2u];
+        let l3 = lights[lb + 3u];
+        let l4 = lights[lb + 4u];
+        let kind = u32(l0.w);
+        let tl = to_light(kind, l0.xyz, l1.xyz, pos);
+        let to_l = tl.xyz;
+        let dist = tl.w;
+        if (attenuation(kind, u32(l3.x), l3.y, l3.z, l2.w, l1.w, l1.xyz, to_l, dist) <= 0.0) {
+            continue;
+        }
+        let n_l = dot(n, to_l);
+        if (n_l <= 0.0) {
+            continue;
+        }
+        amount = max(amount, 1.0 - light_shadow(li, kind, l0.xyz, i32(l3.w), l4.x, pos, n, n_l));
+    }
+    return amount;
+}
+
 @fragment
 fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
     let mb = i.material * MAT_STRIDE;
@@ -302,6 +421,7 @@ fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
     let unlit = (flags & 2u) != 0u;
     let accepts_lights = (flags & 4u) != 0u;
     let receives_shadows = (flags & 8u) != 0u;
+    let shadows_only = (flags & 16u) != 0u;
     let alpha_mode = (flags >> 8u) & 3u;
     if (!front && !double_sided) {
         discard;
@@ -330,6 +450,10 @@ fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
     }
     var out: FOut;
     out.depth = bitcast<u32>(dot(g.view_z.xyz, i.pos) + g.view_z.w);
+    if (shadows_only) {
+        out.color = vec4<f32>(0.0, 0.0, 0.0, alpha * shadow_only_amount(unlit || !accepts_lights, i.normal, front, i.pos));
+        return out;
+    }
     if (unlit || !accepts_lights || g.env2.y < 0.5) {
         let c = rgb + emissive;
         out.color = vec4<f32>(c * alpha, alpha);
@@ -347,6 +471,8 @@ fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
     if (!front) {
         n = -n;
     }
+    // Shadow lookups follow the geometric surface, not the normal map.
+    let ng = n;
     let tex_n = i32(m3.z);
     if (tex_n >= 0) {
         let t = sample_tex(tex_n, i.uv);
@@ -381,22 +507,9 @@ fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
         let l3 = lights[lb + 3u];
         let l4 = lights[lb + 4u];
         let kind = u32(l0.w);
-        var to_l: vec3<f32>;
-        var dist: f32;
-        if (kind == 0u) {
-            to_l = -l1.xyz;
-            dist = 1e30;
-        } else {
-            let d = l0.xyz - i.pos;
-            let len = sqrt(dot(d, d));
-            if (len < 1e-6) {
-                to_l = vec3<f32>(0.0, 0.0, -1.0);
-                dist = 0.0;
-            } else {
-                to_l = d / len;
-                dist = len;
-            }
-        }
+        let tl = to_light(kind, l0.xyz, l1.xyz, i.pos);
+        let to_l = tl.xyz;
+        let dist = tl.w;
         let k = attenuation(kind, u32(l3.x), l3.y, l3.z, l2.w, l1.w, l1.xyz, to_l, dist);
         if (k <= 0.0) {
             continue;
@@ -407,7 +520,7 @@ fn fs(i: VOut, @builtin(front_facing) front: bool) -> FOut {
         }
         var sh = 1.0;
         if (receives_shadows) {
-            sh = light_shadow(li, kind, l0.xyz, i32(l3.w), l4.x, i.pos, n_l);
+            sh = light_shadow(li, kind, l0.xyz, i32(l3.w), l4.x, i.pos, ng, n_l);
         }
         let b = brdf(rgb, metallic, rough, spec_k, diff_k, n, v, to_l);
         acc = acc + b * l2.xyz * k * sh;
diff --git a/crates/gpu/src/shaders/classic3d.wgsl b/crates/gpu/src/shaders/classic3d.wgsl
index d2cad8324..1c963385a 100644
--- a/crates/gpu/src/shaders/classic3d.wgsl
+++ b/crates/gpu/src/shaders/classic3d.wgsl
@@ -255,16 +255,14 @@ fn occlusion(c: u32, p: vec3<f32>, l: u32) -> vec3<f32> {
     }
     let tr = pl.mat1.y;
     let dark = li.shadow.x;
-    var o = vec3<f32>(1.0);
-    for (var k = 0; k < 3; k++) {
-        var st = 0.0;
-        if (px.w > 0.0) {
-            st = clamp(px[k] / px.w, 0.0, 1.0);
-        }
-        let through = (1.0 - alpha) + alpha * tr * st;
-        o[k] = 1.0 - dark * (1.0 - through);
+    // Per channel, as whole vectors: FXC (DirectX 12) can't write a vector component through a
+    // loop index without unrolling every loop around the call, and fails (#613).
+    var st = vec3<f32>(0.0);
+    if (px.w > 0.0) {
+        st = clamp(px.xyz / px.w, vec3<f32>(0.0), vec3<f32>(1.0));
     }
-    return o;
+    let through = (1.0 - alpha) + alpha * tr * st;
+    return 1.0 - dark * (1.0 - through);
 }
 
 fn shadow_of(it: u32, l: u32, p: vec3<f32>) -> vec3<f32> {
diff --git a/crates/gpu/src/shaders/fx_color.wgsl b/crates/gpu/src/shaders/fx_color.wgsl
index 6b8641dd9..f616a2d9d 100644
--- a/crates/gpu/src/shaders/fx_color.wgsl
+++ b/crates/gpu/src/shaders/fx_color.wgsl
@@ -100,11 +100,36 @@ fn fxc_sc_weights(c0: vec3<f32>) -> array<f32, 9> {
     return w;
 }
 
+// Black & White's Tint (effects::color_fx::bw_tint): the tint's hue and saturation at the
+// gray's luminosity (Color blend, weights 0.3 / 0.59 / 0.11, channels clipped toward the gray).
+// The weights are effects::BW_TINT_LUMA (checked by the test shader_constants_match_the_cpu).
+fn fxc_bw_tint(tint: vec3<f32>, gray: f32) -> vec3<f32> {
+    if (!(gray > 0.0)) {
+        return vec3<f32>(0.0);
+    }
+    if (gray >= 1.0) {
+        return vec3<f32>(gray);
+    }
+    let w = vec3<f32>(0.3, 0.59, 0.11);
+    let c = tint + vec3<f32>(gray - dot(tint, w));
+    let l = dot(c, w);
+    let n = min(min(c.x, c.y), c.z);
+    let x = max(max(c.x, c.y), c.z);
+    var o = c;
+    if (n < 0.0 && l - n > 1e-9) {
+        o = vec3<f32>(l) + (o - vec3<f32>(l)) * l / (l - n);
+    }
+    if (x > 1.0 && x - l > 1e-9) {
+        o = vec3<f32>(l) + (o - vec3<f32>(l)) * (1.0 - l) / (x - l);
+    }
+    return o;
+}
+
 // u[0].x = op:
 //  1 Color Balance   f[0] = shadows, f[1] = midtones, f[2] = highlights; u[0].y = preserve luminosity
 //  2 Vibrance        f[0] = (vibrance, saturation)
 //  3 Black & White   f[0] = (reds, yellows, greens, cyans), f[1] = (blues, magentas);
-//                    u[0].y = tint; f[2] = (tint hue, tint saturation)
+//                    u[0].y = tint; f[2] = tint colour
 //  4 Tritone         f[0] = highlights, f[1] = midtones, f[2] = shadows; f[3].x = 1 − blend
 //  5 Colorama        u[0].y = phase mode, u[0].z = interpolate; f[0] = (cycles, shift, 1 − blend)
 //  6 Channel Mixer   f[0..3] = output rows (r, g, b, const); u[0].y = monochrome
@@ -159,7 +184,7 @@ fn fxc_point(@builtin(global_invocation_id) gid: vec3<u32>) {
                 let gray = max(mn + (mx - mn) * wt, 0.0);
                 var o = vec3<f32>(gray);
                 if (P.u[0].y != 0u) {
-                    o = hsl_to_rgb(P.f[2].x, P.f[2].y, min(gray, 1.0));
+                    o = fxc_bw_tint(P.f[2].xyz, gray);
                 }
                 px = vec4<f32>(o * a, a);
             }
@@ -167,7 +192,9 @@ fn fxc_point(@builtin(global_invocation_id) gid: vec3<u32>) {
         case 4u: {
             if (a > 0.0) {
                 let c = px.xyz / a;
-                let l = clamp(luminance(c), 0.0, 1.0);
+                // Rec. 601 weights, as effects::color_fx::tritone: effects::LUMA_601 (checked by
+                // the test shader_constants_match_the_cpu).
+                let l = clamp(dot(c, vec3<f32>(0.299, 0.587, 0.114)), 0.0, 1.0);
                 var t: vec3<f32>;
                 if (l < 0.5) {
                     t = fxc_mix(P.f[2].xyz, P.f[1].xyz, l * 2.0);
diff --git a/crates/gpu/src/shaders/fx_generate.wgsl b/crates/gpu/src/shaders/fx_generate.wgsl
index f46b2f0ba..57d1c89e3 100644
--- a/crates/gpu/src/shaders/fx_generate.wgsl
+++ b/crates/gpu/src/shaders/fx_generate.wgsl
@@ -42,6 +42,15 @@ fn gen_sum(a: vec2<f32>, b: vec2<f32>) -> f32 {
     return (a.x + b.x) + (a.y + b.y);
 }
 
+// Standard normal CDF (Abramowitz & Stegun 7.1.26 erf; effects::misc::norm_cdf).
+fn gen_norm_cdf(z: f32) -> f32 {
+    let x = abs(z) * 0.70710678;
+    let t = 1.0 / (1.0 + 0.3275911 * x);
+    let poly = t * (0.254829592 + t * (-0.284496736 + t * (1.421413741 + t * (-1.453152027 + t * 1.061405429))));
+    let erf = 1.0 - poly * exp(-x * x);
+    return select(0.5 * (1.0 - erf), 0.5 * (1.0 + erf), z >= 0.0);
+}
+
 // ---------------------------------------------------------------- Radial Blur (raster::radial_blur)
 
 // u[0] = (zoom, samples); f[0] = (cx, cy); data = per sample (sin, cos) (spin) or k (zoom).
@@ -67,7 +76,10 @@ fn gen_radial_blur(@builtin(global_invocation_id) gid: vec3<u32>) {
             let cs = data[2u * i + 1u];
             s = vec2<f32>(c.x + v.x * cs - v.y * sn, c.y + v.x * sn + v.y * cs);
         }
-        acc += sample_bilinear(src, s.x, s.y);
+        // Edge samples repeat (raster::radial_blur).
+        let hi = vec2<f32>(f32(dims.x), f32(dims.y)) - vec2<f32>(0.5);
+        let sc = clamp(s, vec2<f32>(0.5), max(hi, vec2<f32>(0.5)));
+        acc += sample_bilinear(src, sc.x, sc.y);
     }
     textureStore(out, p, acc / f32(n));
 }
@@ -235,9 +247,9 @@ fn gen_linear_wipe(@builtin(global_invocation_id) gid: vec3<u32>) {
     textureStore(out, p, textureLoad(src, p, 0) * k);
 }
 
-// Venetian Blinds. Per column (6 floats): (cx − done·w), (cx − w − done·w), (cx − w) as
-// (hi, lo), with cx = ((x + 0.5)·dx) mod w; per row (2 floats): ((y + 0.5)·dy) mod w.
-// u[0].x = row table offset; f[0].x = feather.
+// Venetian Blinds (effects::venetian_cover). Per column (4 floats): cx, (cx − w) as (hi, lo),
+// with cx = ((x + 0.5 − ox)·dx) mod w; per row (2 floats): ((y + 0.5 − oy)·dy) mod w.
+// u[0] = (row table offset, Gaussian terms per side, 0 = hard edge); f[0] = (w, band, σ).
 @compute @workgroup_size(16, 16)
 fn gen_venetian(@builtin(global_invocation_id) gid: vec3<u32>) {
     let dims = out_dims();
@@ -245,34 +257,33 @@ fn gen_venetian(@builtin(global_invocation_id) gid: vec3<u32>) {
     if (p.x >= dims.x || p.y >= dims.y) {
         return;
     }
-    let col = 6u * u32(p.x);
+    let col = 4u * u32(p.x);
     let row = gen_hl(P.u[0].x + 2u * u32(p.y));
     // (d mod w) wraps once the column and row terms reach w.
-    let wrapped = gen_sum(gen_hl(col + 4u), row) >= 0.0;
-    var t: f32;
-    if (wrapped) {
-        t = gen_sum(gen_hl(col + 2u), row);
-    } else {
-        t = gen_sum(gen_hl(col), row);
+    var d = gen_sum(gen_hl(col), row);
+    if (gen_sum(gen_hl(col + 2u), row) >= 0.0) {
+        d = gen_sum(gen_hl(col + 2u), row);
     }
-    let k = clamp(t / P.f[0].x + 0.5, 0.0, 1.0);
-    textureStore(out, p, textureLoad(src, p, 0) * k);
+    let w = P.f[0].x;
+    let band = P.f[0].y;
+    let sigma = P.f[0].z;
+    let n = i32(P.u[0].y);
+    var t = 0.0;
+    if (n == 0) {
+        t = select(0.0, 1.0, d < band);
+    } else {
+        for (var k = -n; k <= n; k++) {
+            let u = d + f32(k) * w;
+            t += gen_norm_cdf(u / sigma) - gen_norm_cdf((u - band) / sigma);
+        }
+    }
+    let cover = clamp(t, 0.0, 1.0);
+    textureStore(out, p, textureLoad(src, p, 0) * (1.0 - cover));
 }
 
-// Angle (degrees, clockwise from up) of the pixel vector rotated by rotation `r` (0 = start,
-// 1 = start + edge, 2 = start − edge), from the per-column / per-row tables of Radial Wipe.
-fn gen_psi(r: u32, x: u32, y: u32) -> f32 {
-    let c = 9u * x + 3u * r;
-    let w = P.u[0].x + 9u * y + 3u * r;
-    // x' = ux·cos R − uy·sin R (cancels at the edge), y' = uy·cos R + ux·sin R.
-    let xr = (data[c] - data[w]) + (data[c + 1u] - data[w + 1u]);
-    let yr = data[w + 2u] + data[c + 2u];
-    return atan2(xr, yr) * GEN_DEG;
-}
-
-// Radial Wipe. data: per column 9 floats (for each rotation: ux·cos R (hi, lo), ux·sin R),
-// per row 9 floats (uy·sin R (hi, lo), uy·cos R); u[0] = (row offset, wipe);
-// f[0] = (edge, feather).
+// Radial Wipe (effects::misc::radial_wipe_alpha). u[0] = (fully wiped, hard edge);
+// f[0] = (centre x, centre y, σ, first ray in degrees); f[1] = (sin, cos) of both rays;
+// f[2].x = span in degrees.
 @compute @workgroup_size(16, 16)
 fn gen_radial_wipe(@builtin(global_invocation_id) gid: vec3<u32>) {
     let dims = out_dims();
@@ -280,30 +291,31 @@ fn gen_radial_wipe(@builtin(global_invocation_id) gid: vec3<u32>) {
     if (p.x >= dims.x || p.y >= dims.y) {
         return;
     }
-    let x = u32(p.x);
-    let y = u32(p.y);
-    let dir = P.u[0].y;
-    let edge = P.f[0].x;
-    var a = gen_psi(0u, x, y);
-    if (a < 0.0) {
-        a += 360.0;
-    }
-    var base: f32;
-    if (dir == 0u || (dir == 2u && a <= 180.0)) {
-        base = a - edge;
-        if (abs(base) < 90.0) {
-            base = gen_psi(1u, x, y);
-        }
-    } else {
-        base = (360.0 - a) - edge;
-        if (abs(base) < 90.0) {
-            base = -gen_psi(2u, x, y);
+    var k = 0.0;
+    if (P.u[0].x == 0u) {
+        let ux = f32(p.x) + 0.5 - P.f[0].x;
+        let uy = f32(p.y) + 0.5 - P.f[0].y;
+        var a = atan2(ux, -uy) * GEN_DEG - P.f[0].w;
+        a = a - 360.0 * floor(a / 360.0);
+        let wiped = a < P.f[2].x;
+        let d = min(gen_ray_dist(ux, uy, P.f[1].x, P.f[1].y), gen_ray_dist(ux, uy, P.f[1].z, P.f[1].w));
+        if (P.u[0].y != 0u) {
+            k = select(1.0, 0.0, wiped);
+        } else {
+            k = gen_norm_cdf(select(d, -d, wiped) / P.f[0].z);
         }
     }
-    let k = clamp(base / P.f[0].y + 0.5, 0.0, 1.0);
     textureStore(out, p, textureLoad(src, p, 0) * k);
 }
 
+// Distance from (ux, uy) to the ray from the centre in direction (s, −c) (y down).
+fn gen_ray_dist(ux: f32, uy: f32, s: f32, c: f32) -> f32 {
+    if (ux * s - uy * c > 0.0) {
+        return abs(ux * c + uy * s);
+    }
+    return length(vec2<f32>(ux, uy));
+}
+
 // Gradient Wipe: aux = the placed gradient layer. u[0].x = invert; f[0] = (done, softness).
 @compute @workgroup_size(16, 16)
 fn gen_gradient_wipe(@builtin(global_invocation_id) gid: vec3<u32>) {
@@ -500,7 +512,7 @@ fn gen_fourcolor(@builtin(global_invocation_id) gid: vec3<u32>) {
         let dx = f32(p.x) + 0.5 - q.x;
         let dy = f32(p.y) + 0.5 - q.y;
         let d2 = dx * dx + dy * dy;
-        let w = 1.0 / pow(d2 / bl + 1e-6, 1.5);
+        let w = 1.0 / (d2 + bl);
         acc += P.f[4 + i].xyz * w;
         wsum += w;
     }
diff --git a/crates/gpu/src/shaders/fx_key.wgsl b/crates/gpu/src/shaders/fx_key.wgsl
index a28ecc65c..bee93ea65 100644
--- a/crates/gpu/src/shaders/fx_key.wgsl
+++ b/crates/gpu/src/shaders/fx_key.wgsl
@@ -62,6 +62,12 @@ fn fxk_range_components(space: u32, c: vec3<f32>) -> vec3<f32> {
 }
 
 // keying::matte_levels.
+// Luma Key / Extract luminance: Rec. 601, effects::LUMA_601 (checked by the test
+// shader_constants_match_the_cpu).
+fn fxk_key_luma(c: vec3<f32>) -> f32 {
+    return dot(c, vec3<f32>(0.299, 0.587, 0.114));
+}
+
 fn fxk_matte_levels(v: f32, in_b: f32, in_w: f32, gamma: f32, out_b: f32, out_w: f32) -> f32 {
     var t = clamp((v - in_b / 255.0) / max((in_w - in_b) / 255.0, 1e-4), 0.0, 1.0);
     t = powz(t, 1.0 / max(gamma, 0.01));
@@ -195,27 +201,17 @@ fn fxk_point(@builtin(global_invocation_id) gid: vec3<u32>) {
             o = vec4<f32>(select(1.0, 0.0, d <= f0.w));
         }
         case 2u: {
-            let l = luminance(c);
+            let l = fxk_key_luma(c);
             let thr = f0.x;
             let tol = f0.y;
             var m: f32;
+            // As effects::keying::luma_key: Brighter / Darker cut hard at the threshold
+            // (Tolerance only shapes Similar / Dissimilar), as After Effects.
             switch u0.y {
-                case 0u: {
-                    if (tol > 0.0) {
-                        m = clamp((thr + tol - l) / tol, 0.0, 1.0);
-                    } else {
-                        m = select(1.0, 0.0, l > thr);
-                    }
-                }
+                case 0u: { m = select(1.0, 0.0, l > thr); }
                 case 2u: { m = select(1.0, 0.0, abs(l - thr) <= tol); }
                 case 3u: { m = select(0.0, 1.0, abs(l - thr) <= tol); }
-                default: {
-                    if (tol > 0.0) {
-                        m = clamp((l - (thr - tol)) / tol, 0.0, 1.0);
-                    } else {
-                        m = select(1.0, 0.0, l < thr);
-                    }
-                }
+                default: { m = select(1.0, 0.0, l < thr); }
             }
             o = vec4<f32>(m);
         }
@@ -241,7 +237,7 @@ fn fxk_point(@builtin(global_invocation_id) gid: vec3<u32>) {
                 case 2u: { v = c.y; }
                 case 3u: { v = c.z; }
                 case 4u: { v = a; }
-                default: { v = luminance(c); }
+                default: { v = fxk_key_luma(c); }
             }
             v = 255.0 * v;
             let bp = f0.x;
diff --git a/crates/gpu/src/shaders/fx_noise.wgsl b/crates/gpu/src/shaders/fx_noise.wgsl
index 1f62d4429..d2f2977ad 100644
--- a/crates/gpu/src/shaders/fx_noise.wgsl
+++ b/crates/gpu/src/shaders/fx_noise.wgsl
@@ -82,69 +82,6 @@ fn fxn_median(@builtin(global_invocation_id) gid: vec3<u32>) {
     textureStore(out, p, vec4<f32>(data[level.x], data[level.y], data[level.z], data[level.w]));
 }
 
-// The same median for large radii, as the CPU computes it: a sliding 512-bin histogram per
-// channel (Huang). One invocation per row segment of u[0].y pixels: it fills the histogram for
-// the segment's first window, then slides right one column at a time (remove the column
-// leaving, add the one entering) and moves each channel's median by the counts below it.
-// u[0] = (r, segment length); dispatched over (rows, segments) with 64 × 1 workgroups.
-// data = the 512 CPU-rounded level / 511 values.
-@compute @workgroup_size(64, 1)
-fn fxn_median_huang(@builtin(global_invocation_id) gid: vec3<u32>) {
-    let dims = out_dims();
-    let y = i32(gid.x);
-    let seg = i32(P.u[0].y);
-    let x0 = i32(gid.y) * seg;
-    if (y >= dims.y || x0 >= dims.x) {
-        return;
-    }
-    let x1 = min(x0 + seg, dims.x);
-    let r = i32(P.u[0].x);
-    let half = u32((2 * r + 1) * (2 * r + 1) / 2);
-    var hist: array<u32, 2048>;
-    for (var dy = -r; dy <= r; dy++) {
-        for (var dx = -r; dx <= r; dx++) {
-            let v = vec4<u32>(tex_get_clamped(src, x0 + dx, y + dy));
-            hist[v.x] += 1u;
-            hist[512u + v.y] += 1u;
-            hist[1024u + v.z] += 1u;
-            hist[1536u + v.w] += 1u;
-        }
-    }
-    // Per channel: the median level and the count of values below it.
-    var med = vec4<u32>(0u);
-    var lt = vec4<u32>(0u);
-    for (var x = x0; x < x1; x++) {
-        if (x > x0) {
-            for (var dy = -r; dy <= r; dy++) {
-                let o = vec4<u32>(tex_get_clamped(src, x - 1 - r, y + dy));
-                let n = vec4<u32>(tex_get_clamped(src, x + r, y + dy));
-                for (var c = 0u; c < 4u; c++) {
-                    hist[c * 512u + o[c]] -= 1u;
-                    if (o[c] < med[c]) {
-                        lt[c] -= 1u;
-                    }
-                    hist[c * 512u + n[c]] += 1u;
-                    if (n[c] < med[c]) {
-                        lt[c] += 1u;
-                    }
-                }
-            }
-        }
-        for (var c = 0u; c < 4u; c++) {
-            let base = c * 512u;
-            while (lt[c] > half) {
-                med[c] -= 1u;
-                lt[c] -= hist[base + med[c]];
-            }
-            while (lt[c] + hist[base + med[c]] <= half) {
-                lt[c] += hist[base + med[c]];
-                med[c] += 1u;
-            }
-        }
-        textureStore(out, vec2<i32>(x, y), vec4<f32>(data[med.x], data[med.y], data[med.z], data[med.w]));
-    }
-}
-
 // noise::median_px.
 fn fxn_median_px(o: vec4<f32>, m: vec4<f32>, on_alpha: bool) -> vec4<f32> {
     if (on_alpha) {
@@ -538,7 +475,7 @@ fn fxn_typed_noise(x: f32, y: f32, z: f32, seed: u32, nt: u32) -> f32 {
     let z0 = floor(z);
     let tx = x - x0;
     let ty = y - y0;
-    let fz = fade(z - z0);
+    let fz = z - z0;
     let a = fxn_slice(i32(x0), i32(y0), i32(z0), tx, ty, seed, nt);
     let b = fxn_slice(i32(x0), i32(y0), i32(z0) + 1, tx, ty, seed, nt);
     return a + (b - a) * fz;
diff --git a/crates/gpu/src/shaders/fx_pixel2.wgsl b/crates/gpu/src/shaders/fx_pixel2.wgsl
index 21bb8b5d8..a63a91fed 100644
--- a/crates/gpu/src/shaders/fx_pixel2.wgsl
+++ b/crates/gpu/src/shaders/fx_pixel2.wgsl
@@ -828,7 +828,7 @@ fn fp2_io_final(@builtin(global_invocation_id) gid: vec3<u32>) {
 }
 
 // ---------------------------------------------------------------- CC Simple Wire Removal (keying2::wire_removal)
-// u[0].x = style; f[0] = (ax, ay, nx, ny); f[1] = (hw thickness, soft width, mirror).
+// u[0].x = style; f[0] = (ax, ay, nx, ny); f[1] = (hw thickness, soft width, mirror, segment length).
 
 fn fp2_wire_pos(base: vec2<f32>, nrm: vec2<f32>, s: f32) -> vec4<f32> {
     return sample_bilinear_clamped(src, base.x + nrm.x * s, base.y + nrm.y * s);
@@ -851,7 +851,9 @@ fn fp2_wire(@builtin(global_invocation_id) gid: vec3<u32>) {
     let q = vec2<f32>(fx - a.x, fy - a.y);
     let d = q.x * nrm.x + q.y * nrm.y;
     let ad = abs(d);
-    if (ad > hw + soft_w) {
+    // The wire is the segment A to B: the tangent is the normal turned back by 90 degrees.
+    let along = q.x * nrm.y - q.y * nrm.x;
+    if (along < 0.0 || along > P.f[1].w || ad > hw + soft_w) {
         textureStore(out, p, px);
         return;
     }
diff --git a/crates/gpu/src/shaders/fx_stylize.wgsl b/crates/gpu/src/shaders/fx_stylize.wgsl
index 3db442750..97db06c52 100644
--- a/crates/gpu/src/shaders/fx_stylize.wgsl
+++ b/crates/gpu/src/shaders/fx_stylize.wgsl
@@ -922,18 +922,28 @@ fn fxs_glow_map(@builtin(global_invocation_id) gid: vec3<u32>) {
     let k = clamp((l - thr) / max(1.0 - thr, 1e-3), 0.0, 1.0);
     let t = glow_ab_t(l);
     let c = vec3<f32>(curve_eval(P.f[1].x, t), curve_eval(P.f[1].y, t), curve_eval(P.f[1].z, t));
-    textureStore(out, p, vec4<f32>(c * k * a, k * a));
+    // Based on the colour channels the glow covers the layer's whole alpha (effects::misc::glow).
+    var ga = a;
+    if (P.u[0].y != 0u) {
+        ga = k * a;
+    }
+    textureStore(out, p, vec4<f32>(c * k * a, ga));
 }
 
 // On Top with another Glow Operation: blend_pixel(mode, original, glow · intensity, 0).
-// aux = the blurred glow; u[0].x = blend mode id; f[0].x = intensity
+// aux = the blurred glow; u[0].x = blend mode id; u[0].y = based on alpha (intensity also
+// scales the glow's alpha); f[0].x = intensity
 @compute @workgroup_size(16, 16)
 fn fxs_glow_op(@builtin(global_invocation_id) gid: vec3<u32>) {
     let p = vec2<i32>(gid.xy);
     if (!fxs_inside(p)) {
         return;
     }
-    let g = textureLoad(aux, p, 0) * P.f[0].x;
+    let gs = textureLoad(aux, p, 0);
+    var g = vec4<f32>(gs.xyz * P.f[0].x, gs.w);
+    if (P.u[0].y != 0u) {
+        g.w = gs.w * P.f[0].x;
+    }
     var o = blend_pixel(P.u[0].x, textureLoad(src, p, 0), g, 0.0);
     o.w = clamp(o.w, 0.0, 1.0);
     textureStore(out, p, o);
diff --git a/crates/gpu/src/shaders/fx_tone.wgsl b/crates/gpu/src/shaders/fx_tone.wgsl
index 39db34588..c99d199c5 100644
--- a/crates/gpu/src/shaders/fx_tone.wgsl
+++ b/crates/gpu/src/shaders/fx_tone.wgsl
@@ -20,6 +20,14 @@ fn fxt_rem360(x: f32) -> f32 {
 }
 
 // Levels (Individual Controls) channel `i` (data: 5 × (ib, iw, g, ob, ow, identity)).
+// color_fx::levels_gamma: unclipped values below 0 mirror the curve.
+fn fxt_gamma(t: f32, g: f32) -> f32 {
+    if (t >= 0.0) {
+        return powz(t, 1.0 / g);
+    }
+    return -powz(-t, 1.0 / g);
+}
+
 fn fxt_lv(i: u32, v: f32, clip_b: bool, clip_w: bool) -> f32 {
     let o = i * 6u;
     if (data[o + 5u] != 0.0) {
@@ -32,7 +40,7 @@ fn fxt_lv(i: u32, v: f32, clip_b: bool, clip_w: bool) -> f32 {
     if (clip_w) {
         t = min(t, 1.0);
     }
-    return data[o + 3u] + (data[o + 4u] - data[o + 3u]) * powz(max(t, 0.0), 1.0 / max(data[o + 2u], 0.01));
+    return data[o + 3u] + (data[o + 4u] - data[o + 3u]) * fxt_gamma(t, max(data[o + 2u], 0.01));
 }
 
 // color_fx::level (data offset o: ib, iw, g, ob, ow, clip black, clip white).
@@ -44,8 +52,7 @@ fn fxt_level(o: u32, v: f32) -> f32 {
     if (data[o + 6u] != 0.0) {
         t = min(t, 1.0);
     }
-    t = powz(max(t, 0.0), 1.0 / data[o + 2u]);
-    return data[o + 3u] + (data[o + 4u] - data[o + 3u]) * t;
+    return data[o + 3u] + (data[o + 4u] - data[o + 3u]) * fxt_gamma(t, data[o + 2u]);
 }
 
 fn fxt_level_ident(o: u32) -> bool {
@@ -177,7 +184,7 @@ fn fxt_point(@builtin(global_invocation_id) gid: vec3<u32>) {
                 let aa = max(a, 0.0);
                 var nc: vec3<f32>;
                 for (var i = 0u; i < 3u; i++) {
-                    nc[i] = fxt_lv(i + 1u, fxt_lv(0u, c[i], cb, cw), cb, cw);
+                    nc[i] = fxt_lv(0u, fxt_lv(i + 1u, c[i], cb, cw), cb, cw);
                 }
                 let na = clamp(clamp(fxt_lv(4u, aa, cb, cw), 0.0, 1.0), 0.0, 1.0);
                 o = vec4<f32>(nc * na, na);
diff --git a/crates/gpu/src/shaders/fx_transition.wgsl b/crates/gpu/src/shaders/fx_transition.wgsl
index 379b64469..5037ec9a6 100644
--- a/crates/gpu/src/shaders/fx_transition.wgsl
+++ b/crates/gpu/src/shaders/fx_transition.wgsl
@@ -569,9 +569,11 @@ fn ftr_bender(@builtin(global_invocation_id) gid: vec3<u32>) {
 }
 
 // ---------------------------------------------------------------- CC Blobbylize (distort3::cc_blobbylize)
-// aux = the blurred blob plane (x). f[0] = (depth, cut away, intensity, ambient);
-// f[1] = (diffuse, specular, shininess, metal); f[2] = (light x, y, point light height,
-// point light); f[3] = distant light direction; f[4] = light colour.
+// aux = the Softness-blurred blob plane (x). f[0] = (cut away, intensity, ambient,
+// matte slope); f[1] = (diffuse, specular, shininess, metal); f[2] = (light x, y,
+// point light height, point); f[3] = distant light direction; f[4] = light colour;
+// f[5] = (matte depth, RGB depth, light slope, matte antialias width);
+// f[6].x = displacement clamp.
 
 @compute @workgroup_size(16, 16)
 fn ftr_blob(@builtin(global_invocation_id) gid: vec3<u32>) {
@@ -579,32 +581,55 @@ fn ftr_blob(@builtin(global_invocation_id) gid: vec3<u32>) {
     if (!ftr_inside(p)) {
         return;
     }
-    let depth = P.f[0].x;
-    let cut = P.f[0].y;
+    let cut = P.f[0].x;
+    if (cut >= 1.0) {
+        // Endpoint guard: an opaque source can reach h = 1.0, where the gradient antialias
+        // would otherwise leave a half-covered pixel at Cut Away 100.
+        textureStore(out, p, vec4<f32>(0.0));
+        return;
+    }
     let hv = textureLoad(aux, p, 0).x;
     let g = ftr_grad(p);
+    let grad = length(g);
+    var m = 0.0;
+    if (grad > 1e-9) {
+        let aa = max(P.f[5].w * grad, 5e-4);
+        m = clamp(0.5 + (hv - cut) / aa, 0.0, 1.0);
+    } else if (hv > cut) {
+        m = 1.0;
+    }
+    if (m <= 0.0) {
+        textureStore(out, p, vec4<f32>(0.0));
+        return;
+    }
     let f = ftr_centre(p);
-    let s = sample_bilinear(src, f.x - g.x * depth * 2.0, f.y - g.y * depth * 2.0);
-    let c = ftr_unpremul(s);
-    let a = max(s.w, 0.0);
-    let m = clamp((hv - cut) / max((1.0 - cut) * 0.5, 1e-3), 0.0, 1.0);
-    let alpha = max(a, s.w) * m;
+    // Softness-scaled bevel warp of the source matte (normal z = 1).
+    let na = normalize(vec3<f32>(-g.x * P.f[0].w, -g.y * P.f[0].w, 1.0));
+    let sa = sample_bilinear(src, f.x + na.x * P.f[5].x, f.y + na.y * P.f[5].x);
+    let alpha = max(sa.w, 0.0) * m;
     if (alpha <= 0.0) {
         textureStore(out, p, vec4<f32>(0.0));
         return;
     }
-    let n = normalize(vec3<f32>(-g.x * depth, -g.y * depth, 1.0));
+    // Height-field refraction of the colour (normal z = height), independent of Softness.
+    let hz = max(hv, 1e-3);
+    let d = -g * P.f[5].y / hz;
+    let lim = P.f[6].x;
+    let disp = vec2<f32>(clamp(d.x, -lim, lim), clamp(d.y, -lim, lim));
+    let srgb = sample_bilinear(src, f.x + disp.x, f.y + disp.y);
+    let c = ftr_unpremul(srgb);
+    let n = normalize(vec3<f32>(-g.x * P.f[5].z, -g.y * P.f[5].z, 1.0));
     var l = P.f[3].xyz;
     if (P.f[2].w != 0.0) {
-        l = normalize(vec3<f32>(P.f[2].x - f32(p.x), P.f[2].y - f32(p.y), P.f[2].z));
+        l = normalize(vec3<f32>(P.f[2].x - f.x, P.f[2].y - f.y, P.f[2].z));
     }
-    let intensity = P.f[0].z;
+    let intensity = P.f[0].y;
     let ndl = max(dot(n, l), 0.0);
     let h3 = normalize(vec3<f32>(l.x, l.y, l.z + 1.0));
     let sp = powz(max(dot(n, h3), 0.0), P.f[1].z) * P.f[1].y;
     let lc = P.f[4].xyz;
     let metal = P.f[1].w;
-    let lit = (P.f[0].w + P.f[1].x * ndl * intensity) * lc;
+    let lit = (P.f[0].z + P.f[1].x * ndl * intensity) * lc;
     let spec_col = (1.0 - metal) * lc + metal * c * lc;
     let o = c * lit + (sp * intensity) * spec_col;
     textureStore(out, p, vec4<f32>(o * alpha, alpha));
diff --git a/crates/gpu/src/shaders/kernels.wgsl b/crates/gpu/src/shaders/kernels.wgsl
index defbb5bf4..834c5f528 100644
--- a/crates/gpu/src/shaders/kernels.wgsl
+++ b/crates/gpu/src/shaders/kernels.wgsl
@@ -380,19 +380,31 @@ fn glow_bright(@builtin(global_invocation_id) gid: vec3<u32>) {
         l = a;
     }
     let k = clamp((l - thr) / max(1.0 - thr, 1e-3), 0.0, 1.0);
+    // Based on the colour channels the glow covers the layer's whole alpha (effects::misc::glow).
+    var ga = a;
+    if (P.u[0].y != 0u) {
+        ga = k * a;
+    }
     if (P.u[0].x != 0u) {
         let t = glow_ab_t(l);
         let ca = P.f[1].xyz;
         let cb = P.f[2].xyz;
         let c = ca + (cb - ca) * t;
-        textureStore(out, p, vec4<f32>(c * k * a, k * a));
+        textureStore(out, p, vec4<f32>(c * k * a, ga));
+    } else if (P.u[0].y != 0u) {
+        textureStore(out, p, vec4<f32>(px.xyz * k, ga));
     } else {
-        textureStore(out, p, px * k);
+        // Original colours, per channel (effects::misc::glow_bright_channel): gain 8.0 is
+        // effects::GLOW_GAIN, 0.0611 is effects::GLOW_KNEE (checked by the test
+        // glow_constants_match_the_cpu).
+        let c = max(8.0 * (px.xyz / a - vec3<f32>(thr - 0.0611)), vec3<f32>(0.0));
+        textureStore(out, p, vec4<f32>(c * a, ga));
     }
 }
 
 // Glow composite: original `src` with the blurred glow `aux`. u[0].x = 0 on top, 1 behind,
-// 2 none (glow only); f[0].x = intensity.
+// 2 none (glow only); u[0].y = based on alpha (intensity also scales the glow's alpha);
+// f[0].x = intensity.
 @compute @workgroup_size(16, 16)
 fn glow_combine(@builtin(global_invocation_id) gid: vec3<u32>) {
     let dims = out_dims();
@@ -401,7 +413,11 @@ fn glow_combine(@builtin(global_invocation_id) gid: vec3<u32>) {
         return;
     }
     var o = textureLoad(src, p, 0);
-    let g = textureLoad(aux, p, 0) * P.f[0].x;
+    let gs = textureLoad(aux, p, 0);
+    var g = vec4<f32>(gs.xyz * P.f[0].x, gs.w);
+    if (P.u[0].y != 0u) {
+        g.w = gs.w * P.f[0].x;
+    }
     if (P.u[0].x == 2u) {
         o = g;
     } else if (P.u[0].x == 1u) {
@@ -561,7 +577,7 @@ fn soft_linear_noise(x: f32, y: f32, z: f32, seed: u32) -> f32 {
     let wy = bspline(y + 0.5 - y0);
     let a = soft_linear_slice(i32(x0), i32(y0), i32(z0), wx, wy, seed);
     let b = soft_linear_slice(i32(x0), i32(y0), i32(z0) + 1, wx, wy, seed);
-    let n = a + (b - a) * fade(z - z0);
+    let n = a + (b - a) * (z - z0);
     return 0.5 + (n - 0.5) * SOFT_LINEAR_GAIN;
 }
 
@@ -605,7 +621,9 @@ fn pointwise(@builtin(global_invocation_id) gid: vec3<u32>) {
         case 1u: {
             if (a > 0.0) {
                 let c = straight(px);
-                let l = clamp(luminance(c), 0.0, 1.0);
+                // Rec. 601 weights, as After Effects: effects::LUMA_601 (checked by the test
+                // shader_constants_match_the_cpu).
+                let l = clamp(0.299 * c.x + 0.587 * c.y + 0.114 * c.z, 0.0, 1.0);
                 let blk = P.f[0].xyz;
                 let wht = P.f[1].xyz;
                 let t = blk + (wht - blk) * l;
@@ -623,14 +641,20 @@ fn pointwise(@builtin(global_invocation_id) gid: vec3<u32>) {
                 } else if (P.u[0].y == 2u) {
                     // Brightness & Contrast tone curves (effects crate bc_modern, AE-fitted #681).
                     var o = c;
-                    let g = max(1.0 + 0.53 * ct, 0.05);
+                    // Negative settings invert the positive curves (reciprocal exponents).
+                    var g = max(1.0 + 0.53 * abs(ct), 0.05);
+                    if (ct < 0.0) {
+                        g = 1.0 / g;
+                    }
+                    var e = exp2(1.24 * abs(br));
+                    if (br < 0.0) {
+                        e = 1.0 / e;
+                    }
                     for (var i = 0; i < 3; i++) {
                         if (c[i] < 1.0) {
                             var v = max(c[i], 0.0);
-                            if (br > 0.0) {
-                                v = 1.0 - powz(1.0 - v, exp2(1.24 * br));
-                            } else if (br < 0.0) {
-                                v = powz(v, exp2(-1.32 * br));
+                            if (br != 0.0) {
+                                v = 1.0 - powz(1.0 - v, e);
                             }
                             if (ct != 0.0) {
                                 if (v < 0.5) {
@@ -702,7 +726,12 @@ fn pointwise(@builtin(global_invocation_id) gid: vec3<u32>) {
                     if (P.u[0].z != 0u) {
                         t = min(t, 1.0);
                     }
-                    t = powz(max(t, 0.0), 1.0 / g);
+                    // color_fx::levels_gamma: unclipped values below 0 mirror the curve.
+                    if (t >= 0.0) {
+                        t = powz(t, 1.0 / g);
+                    } else {
+                        t = -powz(-t, 1.0 / g);
+                    }
                     o[i] = ob + (ow - ob) * t;
                 }
                 px = vec4<f32>(o * a, a);
@@ -713,14 +742,16 @@ fn pointwise(@builtin(global_invocation_id) gid: vec3<u32>) {
                 let c = straight(px);
                 var o = vec3<f32>(0.0);
                 for (var i = 0; i < 3; i++) {
-                    // Per-channel gain, offset, gamma; negative values are mirrored.
+                    // Per-channel gain, offset, gamma; negative values are mirrored. The
+                    // linear-light conversion is a pure 2.2 power: effects::EXPOSURE_LINEAR_GAMMA
+                    // (checked by the test shader_constants_match_the_cpu).
                     if (P.u[0].y != 0u) {
                         let x = c[i] * P.f[0][i] + P.f[1][i];
                         o[i] = sign(x) * powz(abs(x), 1.0 / P.f[2][i]);
                     } else {
-                        let lin = srgb_to_linear(max(c[i], 0.0));
+                        let lin = sign(c[i]) * powz(abs(c[i]), 2.2);
                         let x = lin * P.f[0][i] + P.f[1][i];
-                        o[i] = sign(x) * linear_to_srgb(powz(abs(x), 1.0 / P.f[2][i]));
+                        o[i] = sign(x) * powz(powz(abs(x), 1.0 / P.f[2][i]), 1.0 / 2.2);
                     }
                 }
                 px = vec4<f32>(o * a, a);
@@ -753,17 +784,13 @@ fn pointwise(@builtin(global_invocation_id) gid: vec3<u32>) {
             let c = P.f[0];
             let invert = P.u[0].y != 0u;
             let opacity = P.f[1].x;
+            // The fill colour at the layer's (or inverted) alpha times Opacity (color_fx::fill).
             var fa = px.w;
             if (invert) {
                 fa = 1.0 - px.w;
             }
-            let f = c.xyz * fa;
-            let rgb = px.xyz + (f - px.xyz) * opacity;
-            var alpha = px.w;
-            if (invert) {
-                alpha = px.w + (fa - px.w) * opacity;
-            }
-            px = vec4<f32>(rgb, alpha);
+            fa = fa * opacity;
+            px = vec4<f32>(c.xyz * fa, fa);
         }
         case 8u: {
             // effects::color2::map_ca: transparent pixels only change through the alpha curve.
diff --git a/crates/gpu/src/shaders/median_private.wgsl b/crates/gpu/src/shaders/median_private.wgsl
new file mode 100644
index 000000000..5b3afefe4
--- /dev/null
+++ b/crates/gpu/src/shaders/median_private.wgsl
@@ -0,0 +1,63 @@
+// The same median for large radii, as the CPU computes it: a sliding 512-bin histogram per
+// channel (Huang). One invocation per row segment of u[0].y pixels: it fills the histogram for
+// the segment's first window, then slides right one column at a time (remove the column
+// leaving, add the one entering) and moves each channel's median by the counts below it.
+// u[0] = (r, segment length); dispatched over (rows, segments) with 64 × 1 workgroups.
+// data = the 512 CPU-rounded level / 511 values.
+@compute @workgroup_size(64, 1)
+fn fxn_median_huang(@builtin(global_invocation_id) gid: vec3<u32>) {
+    let dims = out_dims();
+    let y = i32(gid.x);
+    let seg = i32(P.u[0].y);
+    let x0 = i32(gid.y) * seg;
+    if (y >= dims.y || x0 >= dims.x) {
+        return;
+    }
+    let x1 = min(x0 + seg, dims.x);
+    let r = i32(P.u[0].x);
+    let half = u32((2 * r + 1) * (2 * r + 1) / 2);
+    var hist: array<u32, 2048>;
+    for (var dy = -r; dy <= r; dy++) {
+        for (var dx = -r; dx <= r; dx++) {
+            let v = vec4<u32>(tex_get_clamped(src, x0 + dx, y + dy));
+            hist[v.x] += 1u;
+            hist[512u + v.y] += 1u;
+            hist[1024u + v.z] += 1u;
+            hist[1536u + v.w] += 1u;
+        }
+    }
+    // Per channel: the median level and the count of values below it.
+    var med = vec4<u32>(0u);
+    var lt = vec4<u32>(0u);
+    for (var x = x0; x < x1; x++) {
+        if (x > x0) {
+            for (var dy = -r; dy <= r; dy++) {
+                let o = vec4<u32>(tex_get_clamped(src, x - 1 - r, y + dy));
+                let n = vec4<u32>(tex_get_clamped(src, x + r, y + dy));
+                for (var c = 0u; c < 4u; c++) {
+                    hist[c * 512u + o[c]] -= 1u;
+                    if (o[c] < med[c]) {
+                        lt[c] -= 1u;
+                    }
+                    hist[c * 512u + n[c]] += 1u;
+                    if (n[c] < med[c]) {
+                        lt[c] += 1u;
+                    }
+                }
+            }
+        }
+        for (var c = 0u; c < 4u; c++) {
+            let base = c * 512u;
+            while (lt[c] > half) {
+                med[c] -= 1u;
+                lt[c] -= hist[base + med[c]];
+            }
+            while (lt[c] + hist[base + med[c]] <= half) {
+                lt[c] += hist[base + med[c]];
+                med[c] += 1u;
+            }
+        }
+        textureStore(out, vec2<i32>(x, y), vec4<f32>(data[med.x], data[med.y], data[med.z], data[med.w]));
+    }
+}
+
diff --git a/crates/gpu/src/shaders/median_software.wgsl b/crates/gpu/src/shaders/median_software.wgsl
new file mode 100644
index 000000000..606a5e4b4
--- /dev/null
+++ b/crates/gpu/src/shaders/median_software.wgsl
@@ -0,0 +1,65 @@
+// The same median for large radii, as the CPU computes it: a sliding 512-bin histogram per
+// channel (Huang). One invocation per row segment of u[0].y pixels: it fills the histogram for
+// the segment's first window, then slides right one column at a time (remove the column
+// leaving, add the one entering) and moves each channel's median by the counts below it.
+// Each invocation owns one 8 KiB slice of the workgroup's zero-initialized histogram.
+// Two slices fit the guaranteed 16 KiB workgroup storage limit. No bins are shared.
+var<workgroup> median_hist: array<array<u32, 2048>, 2>;
+// u[0] = (r, segment length); dispatched over (rows, segments) with 2 × 1 workgroups.
+// data = the 512 CPU-rounded level / 511 values.
+@compute @workgroup_size(2, 1)
+fn fxn_median_huang(@builtin(global_invocation_id) gid: vec3<u32>, @builtin(local_invocation_index) lane: u32) {
+    let dims = out_dims();
+    let y = i32(gid.x);
+    let seg = i32(P.u[0].y);
+    let x0 = i32(gid.y) * seg;
+    if (y >= dims.y || x0 >= dims.x) {
+        return;
+    }
+    let x1 = min(x0 + seg, dims.x);
+    let r = i32(P.u[0].x);
+    let half = u32((2 * r + 1) * (2 * r + 1) / 2);
+    for (var dy = -r; dy <= r; dy++) {
+        for (var dx = -r; dx <= r; dx++) {
+            let v = vec4<u32>(tex_get_clamped(src, x0 + dx, y + dy));
+            median_hist[lane][v.x] += 1u;
+            median_hist[lane][512u + v.y] += 1u;
+            median_hist[lane][1024u + v.z] += 1u;
+            median_hist[lane][1536u + v.w] += 1u;
+        }
+    }
+    // Per channel: the median level and the count of values below it.
+    var med = vec4<u32>(0u);
+    var lt = vec4<u32>(0u);
+    for (var x = x0; x < x1; x++) {
+        if (x > x0) {
+            for (var dy = -r; dy <= r; dy++) {
+                let o = vec4<u32>(tex_get_clamped(src, x - 1 - r, y + dy));
+                let n = vec4<u32>(tex_get_clamped(src, x + r, y + dy));
+                for (var c = 0u; c < 4u; c++) {
+                    median_hist[lane][c * 512u + o[c]] -= 1u;
+                    if (o[c] < med[c]) {
+                        lt[c] -= 1u;
+                    }
+                    median_hist[lane][c * 512u + n[c]] += 1u;
+                    if (n[c] < med[c]) {
+                        lt[c] += 1u;
+                    }
+                }
+            }
+        }
+        for (var c = 0u; c < 4u; c++) {
+            let base = c * 512u;
+            while (lt[c] > half) {
+                med[c] -= 1u;
+                lt[c] -= median_hist[lane][base + med[c]];
+            }
+            while (lt[c] + median_hist[lane][base + med[c]] <= half) {
+                lt[c] += median_hist[lane][base + med[c]];
+                med[c] += 1u;
+            }
+        }
+        textureStore(out, vec2<i32>(x, y), vec4<f32>(data[med.x], data[med.y], data[med.z], data[med.w]));
+    }
+}
+
diff --git a/crates/gpu/src/shaders/yuv.wgsl b/crates/gpu/src/shaders/yuv.wgsl
new file mode 100644
index 000000000..935acb4dc
--- /dev/null
+++ b/crates/gpu/src/shaders/yuv.wgsl
@@ -0,0 +1,96 @@
+// Finished frame → 8-bit BT.709 limited-range 4:2:0 (Y, U, V planes packed 4 bytes per word),
+// composited over the comp background: the GPU twin of `Image::to_rgba8_over` followed by
+// export's `rgba_to_yuv420`, operation for operation (same order of float operations, the same
+// rounding: `as u8` truncation of `x * 255 + 0.5`, `f32::round` half away from zero).
+
+struct YP {
+    // width, height, chroma width, Y words
+    size: vec4<u32>,
+    bg: vec4<f32>,
+}
+
+@group(0) @binding(0) var<uniform> Y: YP;
+@group(0) @binding(1) var frame: texture_2d<f32>;
+@group(0) @binding(2) var<storage, read_write> outw: array<u32>;
+
+// NaN by its bits: drivers may assume arithmetic never sees NaN.
+fn is_nan(x: f32) -> bool {
+    return (bitcast<u32>(x) & 0x7fffffffu) > 0x7f800000u;
+}
+
+// `(c.clamp(0, 1) * 255 + 0.5) as u8`; the CPU's `as u8` turns NaN into 0.
+fn q8(c: f32, nan: bool) -> f32 {
+    if (nan) {
+        return 0.0;
+    }
+    return floor(clamp(c, 0.0, 1.0) * 255.0 + 0.5);
+}
+
+// f32::round for x >= 0 (half away from zero).
+fn round_pos(x: f32) -> f32 {
+    let f = floor(x);
+    return select(f, f + 1.0, x - f >= 0.5);
+}
+
+fn px(x: u32, y: u32) -> vec3<f32> {
+    let p = textureLoad(frame, vec2<i32>(i32(x), i32(y)), 0);
+    // A NaN alpha makes every channel NaN on the CPU (k is NaN).
+    let na = is_nan(p.w);
+    let k = select(1.0 - clamp(p.w, 0.0, 1.0), 0.0, na);
+    let c = vec3<f32>(q8(p.x + Y.bg.x * k, na || is_nan(p.x)), q8(p.y + Y.bg.y * k, na || is_nan(p.y)), q8(p.z + Y.bg.z * k, na || is_nan(p.z)));
+    return c / 255.0;
+}
+
+fn luma(c: vec3<f32>) -> f32 {
+    return 0.2126 * c.x + 0.7152 * c.y + 0.0722 * c.z;
+}
+
+fn y8(l: f32) -> u32 {
+    return u32(clamp(round_pos(16.0 + 219.0 * l), 1.0, 254.0));
+}
+
+// One invocation: 4 chroma samples = 8 × 2 pixels.
+@compute @workgroup_size(8, 8)
+fn yuv420(@builtin(global_invocation_id) gid: vec3<u32>) {
+    let w = Y.size.x;
+    let h = Y.size.y;
+    let cw = Y.size.z;
+    if (gid.x * 4u >= cw || gid.y * 2u >= h) {
+        return;
+    }
+    let x0 = gid.x * 8u;
+    let cy = gid.y;
+    var uw = 0u;
+    var vw = 0u;
+    var yw = array<u32, 4>(0u, 0u, 0u, 0u);
+    for (var q = 0u; q < 4u; q++) {
+        // Accumulate in the CPU's order: row 0 left, right; row 1 left, right.
+        var a0 = 0.0;
+        var a1 = 0.0;
+        for (var dy = 0u; dy < 2u; dy++) {
+            for (var dx = 0u; dx < 2u; dx++) {
+                let x = x0 + q * 2u + dx;
+                let c = px(x, cy * 2u + dy);
+                let l = luma(c);
+                let byte = q * 2u + dx;
+                yw[dy * 2u + byte / 4u] |= y8(l) << (8u * (byte % 4u));
+                a0 += (c.z - l) / 1.8556;
+                a1 += (c.x - l) / 1.5748;
+            }
+        }
+        let u = u32(clamp(round_pos(128.0 + 224.0 * a0 / 4.0), 1.0, 254.0));
+        let v = u32(clamp(round_pos(128.0 + 224.0 * a1 / 4.0), 1.0, 254.0));
+        uw |= u << (8u * q);
+        vw |= v << (8u * q);
+    }
+    let r0 = (cy * 2u * w + x0) / 4u;
+    let r1 = ((cy * 2u + 1u) * w + x0) / 4u;
+    outw[r0] = yw[0];
+    outw[r0 + 1u] = yw[1];
+    outw[r1] = yw[2];
+    outw[r1 + 1u] = yw[3];
+    let cwords = cw / 4u * (h / 2u);
+    let ci = (cy * cw) / 4u + gid.x;
+    outw[Y.size.w + ci] = uw;
+    outw[Y.size.w + cwords + ci] = vw;
+}
diff --git a/crates/gpu/src/tests.rs b/crates/gpu/src/tests.rs
index 24f8c9614..4b3375411 100644
--- a/crates/gpu/src/tests.rs
+++ b/crates/gpu/src/tests.rs
@@ -26,6 +26,36 @@ use effectcraft_time::{FrameRate, Tick};
 
 use crate::Gpu;
 
+mod adjust;
+mod adv3d;
+mod deferred;
+mod deferred_jobs;
+mod fx_color;
+mod fx_depth;
+mod fx_distort;
+mod fx_extra;
+mod fx_gen2;
+mod fx_generate;
+mod fx_key;
+mod fx_light;
+mod fx_lut;
+mod fx_noise;
+mod fx_particles;
+mod fx_pixel2;
+mod fx_sim;
+mod fx_stylize;
+mod fx_text;
+mod fx_time;
+mod fx_tone;
+mod fx_transition;
+mod fx_vr;
+mod fx_warp;
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod init;
+mod particles;
+mod three_d;
+mod wgsl_grammar;
+
 /// One GPU test at a time in this process: the calling test thread holds a process-wide lock
 /// until it exits (libtest runs every test on a thread of its own). wgpu's OpenGL backend (Mesa
 /// llvmpipe on FreeBSD, Linux without Vulkan) has one context lock per adapter and panics when a
@@ -52,9 +82,29 @@ pub(crate) fn gpu() -> Option<&'static Gpu> {
     static G: OnceLock<Result<Gpu, String>> = OnceLock::new();
     hold_gpu_lock();
     let g = G.get_or_init(|| {
+        // Readback mapping/allocation errors become None without necessarily retiring the
+        // context. Preserve their original messages alongside the failure's health snapshot.
+        struct GpuTestLog;
+        impl log::Log for GpuTestLog {
+            fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
+                metadata.level() <= log::Level::Warn && metadata.target().starts_with("effectcraft_gpu")
+            }
+
+            fn log(&self, record: &log::Record<'_>) {
+                if self.enabled(record.metadata()) {
+                    eprintln!("{} {}: {}", record.level(), record.target(), record.args());
+                }
+            }
+
+            fn flush(&self) {}
+        }
+        static LOGGER: GpuTestLog = GpuTestLog;
+        if log::set_logger(&LOGGER).is_ok() {
+            log::set_max_level(log::LevelFilter::Warn);
+        }
         let g = Gpu::try_headless();
         match &g {
-            Ok(g) => eprintln!("effectcraft-gpu tests: adapter {}", g.ctx.name),
+            Ok(g) => eprintln!("effectcraft-gpu tests: adapter {}, median {:?}", g.ctx.name, g.ctx.median_kernel),
             Err(e) => eprintln!("effectcraft-gpu tests: no GPU ({e}), skipping GPU comparisons"),
         }
         g
@@ -79,6 +129,35 @@ pub(crate) fn on_gl() -> bool {
     gpu().is_some_and(|g| g.ctx.name.ends_with("(Gl)"))
 }
 
+/// The test device is Mesa's software rasteriser, llvmpipe: on OpenGL, or as lavapipe on Vulkan
+/// (the Linux CI gate).
+pub(crate) fn on_llvmpipe() -> bool {
+    gpu().is_some_and(|g| g.ctx.name.starts_with("llvmpipe"))
+}
+
+thread_local! {
+    static LLVMPIPE_FLIPS: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
+}
+
+/// Until the guard drops, comparisons on lavapipe get [`GL_BOUNDARY_FLIPS`] too. Only the tests
+/// that measured such flips there opt in (CC HexTile cell edges, CC Threshold RGB thresholds);
+/// every other comparison on the Linux gate stays exact.
+pub(crate) fn allow_llvmpipe_boundary_flips() -> impl Drop {
+    struct Reset;
+    impl Drop for Reset {
+        fn drop(&mut self) {
+            LLVMPIPE_FLIPS.with(|f| f.set(false));
+        }
+    }
+    LLVMPIPE_FLIPS.with(|f| f.set(true));
+    Reset
+}
+
+/// The boundary-flip allowance applies: OpenGL, or llvmpipe in a test that opted in.
+fn boundary_flips_allowed() -> bool {
+    on_gl() || (LLVMPIPE_FLIPS.with(std::cell::Cell::get) && on_llvmpipe())
+}
+
 /// On GL, the fraction of pixels allowed past the tolerance: pixels on a decision boundary (a
 /// hex cell's edge, a threshold, a corner pin's coverage edge, a median's rank tie) may land on
 /// the other side, since GL drivers may divide through a reciprocal and GLSL's `fma` need not be
@@ -255,7 +334,7 @@ pub(crate) fn check(label: &str, d: Option<Diff>, allow: f64) {
     let frac = d.over as f64 / d.total as f64;
     // Quantised depths: rounding-boundary flips (see the module docs).
     let (allow, cap) = if d.quantized && allow == 0.0 { (0.003, 4.0 / 255.0 + 1e-6) } else { (allow, f32::INFINITY) };
-    let (allow, cap) = if on_gl() { (allow.max(GL_BOUNDARY_FLIPS), f32::INFINITY) } else { (allow, cap) };
+    let (allow, cap) = if boundary_flips_allowed() { (allow.max(GL_BOUNDARY_FLIPS), f32::INFINITY) } else { (allow, cap) };
     assert!(frac <= allow && d.max <= cap, "{label}: {} of {} pixels over tolerance (max {:.6}); worst {:?}", d.over, d.total, d.max, d.worst);
     if d.over > 0 {
         eprintln!("{label}: {} of {} pixels over tolerance (max {:.6})", d.over, d.total, d.max);
@@ -446,15 +525,28 @@ pub(crate) fn effect_direct(id: &str, vals: &[(&str, Value)], adjustment: bool)
     for (k, v) in vals {
         params.values.insert(k.to_string(), v.clone());
     }
+    let expect_empty = id == "ec.distort.ccblobbylize" && vals.iter().any(|(k, v)| *k == "cutAway" && matches!(v, Value::Scalar(x) if *x == 100.0));
     for scale in [1.0, 0.5] {
         let img = pattern(7, (size[0] * scale) as u32, (size[1] * scale) as u32);
         let buf = effectcraft_effects::Buf { img, offset: [0.0, 0.0], scale };
         let ctx = || effectcraft_effects::EffectCtx { params: &params, time: 0.25, layer_size: size, seed: 11, adjustment, env: Default::default() };
         let cpu = (spec.render)(&ctx(), buf.clone());
-        let out = effectcraft_render::Accelerator::effects(g, &[effectcraft_render::FxStep { spec, ctx: ctx() }], &buf, None).expect("the GPU runs the effect");
+        let started = std::time::Instant::now();
+        let out = effectcraft_render::Accelerator::effects(g, &[effectcraft_render::FxStep { spec, ctx: ctx() }], &buf, None).unwrap_or_else(|| {
+            panic!(
+                "the GPU runs {id} {vals:?} adj {adjustment} scale {scale}; elapsed={:?}, health={:?}, unavailable={:?}, transfers={:?}",
+                started.elapsed(),
+                g.ctx.check_health(),
+                g.ctx.unavailable_kernels(),
+                g.ctx.transfer_stats()
+            )
+        });
+        if expect_empty {
+            assert!(out.img.data.iter().all(|p| p[3] == 0.0), "{id} {vals:?} adj {adjustment} scale {scale}: Cut Away 100 produced non-zero alpha");
+        }
         assert_eq!((out.offset, out.scale), (cpu.offset, cpu.scale), "{id}: geometry");
         let d = diff(&cpu.img, &out.img, 1e-3);
-        let allow = if on_gl() { (d.total as f64 * GL_BOUNDARY_FLIPS) as usize } else { 0 };
+        let allow = if boundary_flips_allowed() { (d.total as f64 * GL_BOUNDARY_FLIPS) as usize } else { 0 };
         assert!(
             d.over <= allow,
             "{id} {vals:?} adj {adjustment} scale {scale}: {} of {} pixels over 1e-3 (max {}); worst {:?}",
@@ -491,12 +583,27 @@ pub(crate) fn c(r: f64, g: f64, b: f64) -> Value {
     Value::Color([r, g, b, 1.0])
 }
 
+#[test]
+fn small_blurs_fall_back_to_the_cpu() {
+    // #1939: small Gaussian sigmas and fractional box radii render on the CPU kernel.
+    for (id, vals) in [("ec.blur.gaussian", [("blurriness", n(0.9))]), ("ec.blur.fastbox", [("radius", n(1.5))])] {
+        let mut s = Scene::new(BitDepth::Bpc32);
+        let bg = s.solid([0.15, 0.1, 0.2], 97, 61);
+        s.push(bg);
+        let mut l = s.footage(70, 44);
+        s.effect(&mut l, id, &vals);
+        s.push(l);
+        check(&format!("{id} {vals:?}"), compare_at(&s, opts(), Tick::ZERO), 0.0);
+    }
+}
+
 #[test]
 fn gpu_effects_match_cpu() {
-    effect_case("ec.blur.gaussian", &[("blurriness", n(9.0))]);
-    effect_case("ec.blur.gaussian", &[("blurriness", n(4.0)), ("dimensions", Value::Enum(1)), ("repeatEdge", Value::Bool(true))]);
-    effect_case("ec.blur.fastbox", &[("radius", n(5.0)), ("iterations", n(2.0))]);
-    effect_case("ec.blur.fastbox", &[("radius", n(3.0)), ("dimensions", Value::Enum(2)), ("repeatEdge", Value::Bool(true))]);
+    // Sigma 3 px and up and even radii, so the half-scale pass stays on the GPU too (#1939).
+    effect_case("ec.blur.gaussian", &[("blurriness", n(14.0))]);
+    effect_case("ec.blur.gaussian", &[("blurriness", n(12.0)), ("dimensions", Value::Enum(1)), ("repeatEdge", Value::Bool(true))]);
+    effect_case("ec.blur.fastbox", &[("radius", n(6.0)), ("iterations", n(2.0))]);
+    effect_case("ec.blur.fastbox", &[("radius", n(4.0)), ("dimensions", Value::Enum(2)), ("repeatEdge", Value::Bool(true))]);
     effect_case("ec.blur.directional", &[("direction", n(30.0)), ("length", n(12.0))]);
     effect_case("ec.stylize.glow", &[("threshold", n(40.0)), ("radius", n(14.0)), ("intensity", n(1.5))]);
     effect_case("ec.stylize.glow", &[("colors", Value::Enum(1)), ("operation", Value::Enum(1)), ("colorA", c(1.0, 0.8, 0.1))]);
@@ -851,6 +958,62 @@ fn effects_whose_kernels_failed_render_on_the_cpu() {
     }
 }
 
+/// WGSL cannot read the CPU's constants, so Glow's bright pass repeats them as literals; this
+/// ties them to `effects::GLOW_GAIN` / `GLOW_KNEE` (runs without a GPU).
+#[test]
+fn glow_constants_match_the_cpu() {
+    use effectcraft_effects::{GLOW_GAIN, GLOW_KNEE};
+    let kernels = include_str!("shaders/kernels.wgsl");
+    let want = format!("max({GLOW_GAIN:?} * (px.xyz / a - vec3<f32>(thr - {GLOW_KNEE:?})), vec3<f32>(0.0))");
+    assert!(kernels.contains(&want), "Glow's bright pass in kernels.wgsl is not `{want}`");
+}
+
+/// The GPU Tint gives After Effects 2026's greys for full-frame solids at its defaults (sRGB
+/// working space, not linearised): Rec. 601 weights, as the CPU (`color_fx::luma_601`).
+#[test]
+fn gpu_tint_defaults_match_after_effects_greys() {
+    let Some(g) = gpu() else {
+        // Visible skip (EFFECTCRAFT_REQUIRE_GPU=1 makes a missing adapter fail instead).
+        eprintln!("gpu_tint_defaults_match_after_effects_greys: skipped: no GPU adapter");
+        return;
+    };
+    for (col, want) in [([1.0, 0.0, 0.0], 76.0), ([0.0, 1.0, 0.0], 150.0), ([0.0, 0.0, 1.0], 29.0), ([0.5, 0.5, 0.5], 128.0)] {
+        let mut s = Scene::new(BitDepth::Bpc32);
+        s.p.settings.working_space = Some(ColorSpace::Srgb);
+        let mut l = s.solid(col, 97, 61);
+        s.effect(&mut l, "ec.color.tint", &[]);
+        s.push(l);
+        let mut r = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Gpu, ..opts() });
+        r.accel = Some(g);
+        let o = g.render(&r, s.cid, Tick::ZERO).expect("the GPU renders the frame").get(48, 30);
+        let want = want / 255.0;
+        assert!(o[..3].iter().all(|v| (v - want).abs() <= 1.0 / 255.0), "{col:?}: {o:?} vs {want}");
+    }
+}
+
+/// WGSL has no way to read the CPU's constants, so the kernels repeat them as literals; this
+/// ties each literal to its Rust source (runs without a GPU): Rec. 601 luma for Tint (`pointwise`
+/// op 1), Tritone and Luma Key / Extract, Black & White's tint weights and Exposure's 2.2 power.
+#[test]
+fn shader_constants_match_the_cpu() {
+    use effectcraft_effects::{BW_TINT_LUMA, EXPOSURE_LINEAR_GAMMA, LUMA_601};
+    let kernels = include_str!("shaders/kernels.wgsl");
+    let color = include_str!("shaders/fx_color.wgsl");
+    let key = include_str!("shaders/fx_key.wgsl");
+    let [r, g, b] = LUMA_601;
+    let dot = format!("dot(c, vec3<f32>({r}, {g}, {b}))");
+    assert!(kernels.contains(&format!("clamp({r} * c.x + {g} * c.y + {b} * c.z, 0.0, 1.0)")), "Tint luma in kernels.wgsl is not {LUMA_601:?}");
+    assert!(color.contains(&format!("clamp({dot}, 0.0, 1.0)")), "Tritone luma in fx_color.wgsl is not {LUMA_601:?}");
+    assert!(key.contains(&format!("return {dot};")), "fxk_key_luma in fx_key.wgsl is not {LUMA_601:?}");
+    let [r, g, b] = BW_TINT_LUMA;
+    assert!(color.contains(&format!("let w = vec3<f32>({r}, {g}, {b});")), "fxc_bw_tint weights are not {BW_TINT_LUMA:?}");
+    let gamma = EXPOSURE_LINEAR_GAMMA;
+    assert!(
+        kernels.contains(&format!("powz(abs(c[i]), {gamma})")) && kernels.contains(&format!("1.0 / {gamma})")),
+        "Exposure's power in kernels.wgsl is not {gamma}"
+    );
+}
+
 /// A layer whose bounds change every frame reads back at a new size each time: the staging
 /// buffers kept for reuse stay within budget instead of growing for the whole render (#2081).
 #[test]
@@ -1071,3 +1234,13 @@ fn upload_cache_drops_textures_of_freed_buffers() {
     let kept = g.ctx.upload_entries();
     assert!(kept <= before + 1, "the upload cache kept {kept} textures of freed buffers (had {before})");
 }
+
+/// The device the compositor owns asks for `MemoryUsage` so freed textures give
+/// their allocator blocks back, while its label and limits stay as they were.
+#[test]
+fn owned_devices_favour_memory_usage() {
+    let d = crate::context::device_descriptor(wgpu::Limits::default());
+    assert!(matches!(d.memory_hints, wgpu::MemoryHints::MemoryUsage));
+    assert_eq!(d.label, Some("effectcraft gpu"));
+    assert_eq!(d.required_limits.max_texture_dimension_2d, wgpu::Limits::default().max_texture_dimension_2d);
+}
diff --git a/crates/gpu/src/tests_adjust.rs b/crates/gpu/src/tests/adjust.rs
similarity index 100%
rename from crates/gpu/src/tests_adjust.rs
rename to crates/gpu/src/tests/adjust.rs
diff --git a/crates/gpu/src/tests_adv3d.rs b/crates/gpu/src/tests/adv3d.rs
similarity index 91%
rename from crates/gpu/src/tests_adv3d.rs
rename to crates/gpu/src/tests/adv3d.rs
index 869c60aae..21422aa6b 100644
--- a/crates/gpu/src/tests_adv3d.rs
+++ b/crates/gpu/src/tests/adv3d.rs
@@ -155,6 +155,56 @@ fn gpu_matches_cpu_unlit_and_full_frames() {
     assert!((diff as f64) < 0.02 * cpu.data.len() as f64, "{diff} pixels differ");
 }
 
+#[test]
+fn gpu_matches_cpu_shadow_catcher() {
+    // #1691: the floor plane as a shadow catcher ("Accepts Shadows: Only").
+    let Some(g) = gpu() else { return };
+    let (mut p, cid) = scene_project();
+    let floor = p.comp_mut(cid).unwrap().layers.last_mut().unwrap();
+    set(floor, "materialOptions/acceptsShadows", Value::Enum(2));
+    let s = scene(&p, cid);
+    assert!(s.materials.iter().any(|m| m.shadows_only) && !s.shadows.is_empty());
+    compare(&s, &g);
+}
+
+#[test]
+fn gpu_matches_cpu_wide_penumbrae() {
+    // Both lights cast with wide Shadow Diffusion. Penumbrae cover much of the frame, so a
+    // backend drift in the PCF (jitter hash, tap grid, receiver-plane compare) would hide
+    // inside the scene-wide 1.5 % silhouette budget; here every shadowed pixel off a
+    // silhouette must match the CPU within 2/255.
+    let Some(g) = gpu() else { return };
+    let (mut p, cid) = scene_project();
+    let comp = p.comp_mut(cid).unwrap();
+    set(&mut comp.layers[1], "lightOptions/shadowDiffusion", Value::Scalar(48.0));
+    set(&mut comp.layers[0], "lightOptions/castsShadows", Value::Bool(true));
+    set(&mut comp.layers[0], "lightOptions/shadowDiffusion", Value::Scalar(30.0));
+    let s = scene(&p, cid);
+    let (cpu, gt) = (adv::raster::render(&s), g.raster_3d(&s).expect("gpu raster"));
+    for l in &mut p.comp_mut(cid).unwrap().layers[..2] {
+        set(l, "lightOptions/castsShadows", Value::Bool(false));
+    }
+    let unshadowed = adv::raster::render(&scene(&p, cid));
+    let w = cpu.width as usize;
+    let luma = |c: &[f32; 4]| (c[0] + c[1] + c[2]) / 3.0;
+    // Off a silhouette: the pixel and its four neighbours see one continuous surface.
+    let smooth = |i: usize| -> bool {
+        let (x, y) = (i % w, i / w);
+        let d = cpu.depth[i];
+        x > 0
+            && y > 0
+            && x + 1 < w
+            && i + w < cpu.depth.len()
+            && d.is_finite()
+            && [i - 1, i + 1, i - w, i + w].iter().all(|&j| (cpu.depth[j] - d).abs() < 0.01 * d.abs().max(1.0))
+    };
+    let shadowed: Vec<usize> = (0..cpu.color.len()).filter(|&i| luma(&unshadowed.color[i]) - luma(&cpu.color[i]) > 0.01 && smooth(i)).collect();
+    let bad = shadowed.iter().filter(|&&i| (0..4).any(|k| (cpu.color[i][k] - gt.color[i][k]).abs() / cpu.color[i][k].abs().max(1.0) > 2.0 / 255.0)).count();
+    eprintln!("adv3d wide penumbrae: {bad}/{} shadowed pixels beyond 2/255", shadowed.len());
+    assert!(shadowed.len() > 2000, "the shadows cover a large area: {}", shadowed.len());
+    assert!(bad as f64 <= 0.002 * shadowed.len() as f64, "{bad}/{} shadowed pixels differ", shadowed.len());
+}
+
 #[test]
 fn gpu_raster_perf_smoke() {
     let Some(g) = gpu() else { return };
diff --git a/crates/gpu/src/tests_deferred.rs b/crates/gpu/src/tests/deferred.rs
similarity index 98%
rename from crates/gpu/src/tests_deferred.rs
rename to crates/gpu/src/tests/deferred.rs
index b6e43b55f..e8778b628 100644
--- a/crates/gpu/src/tests_deferred.rs
+++ b/crates/gpu/src/tests/deferred.rs
@@ -30,7 +30,7 @@ pub(crate) fn deferred_gpu() -> Option<(&'static Gpu, std::sync::MutexGuard<'sta
         g
     });
     let g = crate::tests::require_gpu("deferred gpu tests", g.as_ref())?;
-    Some((g, LOCK.lock().unwrap_or_else(|e| e.into_inner())))
+    Some((g, LOCK.lock().unwrap_or_else(std::sync::PoisonError::into_inner)))
 }
 
 /// Footage with GPU effects around a CPU-only one, a solid with Glow, and a precomp whose
diff --git a/crates/gpu/src/tests_deferred_jobs.rs b/crates/gpu/src/tests/deferred_jobs.rs
similarity index 95%
rename from crates/gpu/src/tests_deferred_jobs.rs
rename to crates/gpu/src/tests/deferred_jobs.rs
index 7f10f53d4..7e5edbedd 100644
--- a/crates/gpu/src/tests_deferred_jobs.rs
+++ b/crates/gpu/src/tests/deferred_jobs.rs
@@ -8,10 +8,10 @@ use effectcraft_render::three_d::adv;
 use effectcraft_render::{Accelerator, Backend, LayerCache, NoFootage, RenderOpts, Renderer};
 use effectcraft_time::Tick;
 
+use crate::tests::adv3d::{off_share, run_of, scene, scene_project};
+use crate::tests::deferred::{deferred_gpu, render_passes};
+use crate::tests::particles::{Host, agree, params};
 use crate::tests::{Pattern, diff, n, tolerance};
-use crate::tests_adv3d::{off_share, run_of, scene, scene_project};
-use crate::tests_deferred::{deferred_gpu, render_passes};
-use crate::tests_particles::{Host, agree, params};
 
 /// The device's readbacks have landed (the browser's event loop; natively a poll).
 fn settle(g: &crate::Gpu) {
@@ -87,7 +87,7 @@ fn advanced_3d_resolves_in_passes() {
 #[test]
 fn job_frames_render_in_passes() {
     let Some((g, _lock)) = deferred_gpu() else { return };
-    let s = crate::tests_deferred::scene();
+    let s = crate::tests::deferred::scene();
     let t = Tick::from_seconds_f64(0.5);
     let cache = LayerCache::default();
     cache.set_gate(g.miss_gate());
diff --git a/crates/gpu/src/tests_fx_color.rs b/crates/gpu/src/tests/fx_color.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_color.rs
rename to crates/gpu/src/tests/fx_color.rs
diff --git a/crates/gpu/src/tests_fx_depth.rs b/crates/gpu/src/tests/fx_depth.rs
similarity index 95%
rename from crates/gpu/src/tests_fx_depth.rs
rename to crates/gpu/src/tests/fx_depth.rs
index b84b4849d..8a6665655 100644
--- a/crates/gpu/src/tests_fx_depth.rs
+++ b/crates/gpu/src/tests/fx_depth.rs
@@ -251,6 +251,18 @@ fn ids_and_cryptomatte() {
     case("ec.3d.cryptomatte", &[("selection", Value::Str("alpha".into())), ("matteOnly", on())]);
 }
 
+/// The GPU skips the ID colours for displays that do not read them
+/// ([`effectcraft_effects::CryptoAux::for_display`]): every display × Matte Only must still match
+/// the CPU effect, so a shader that starts reading RGB in another mode fails here.
+#[test]
+fn cryptomatte_every_display_matches_the_cpu() {
+    for display in 0..3 {
+        for matte_only in [false, true] {
+            case("ec.3d.cryptomatte", &[("selection", Value::Str("beta, delta".into())), ("display", e(display)), ("matteOnly", Value::Bool(matte_only))]);
+        }
+    }
+}
+
 #[test]
 fn extractor() {
     case("ec.3d.extractor", &[("red", Value::Str("Z".into())), ("green", Value::Str("UV.U".into())), ("whitePoint", n(1000.0))]);
diff --git a/crates/gpu/src/tests_fx_distort.rs b/crates/gpu/src/tests/fx_distort.rs
similarity index 89%
rename from crates/gpu/src/tests_fx_distort.rs
rename to crates/gpu/src/tests/fx_distort.rs
index e0e89fb67..19cdcd605 100644
--- a/crates/gpu/src/tests_fx_distort.rs
+++ b/crates/gpu/src/tests/fx_distort.rs
@@ -28,6 +28,11 @@ fn twirl_bulge_ripple_wave_warp() {
     effect_case("ec.distort.wavewarp", &[("waveType", e(2)), ("pinning", e(1)), ("phase", n(400.0)), ("speed", n(-2.0))]);
     effect_case("ec.distort.wavewarp", &[("waveType", e(8)), ("pinning", e(2)), ("height", n(-5.0)), ("direction", n(200.0))]);
     effect_case("ec.distort.wavewarp", &[("waveType", e(4)), ("pinning", e(7)), ("width", n(33.0))]);
+    // #1181: the single-edge pinning paths, with the default vertical displacement direction.
+    effect_case("ec.distort.wavewarp", &[("direction", n(90.0)), ("height", n(7.0)), ("width", n(25.0)), ("pinning", e(4))]);
+    effect_case("ec.distort.wavewarp", &[("direction", n(90.0)), ("height", n(7.0)), ("width", n(19.0)), ("pinning", e(6)), ("waveType", e(1))]);
+    effect_case("ec.distort.wavewarp", &[("direction", n(45.0)), ("height", n(-6.0)), ("pinning", e(4)), ("speed", n(2.0))]);
+    effect_case("ec.distort.wavewarp", &[("direction", n(45.0)), ("height", n(-6.0)), ("pinning", e(6)), ("speed", n(2.0))]);
 }
 
 #[test]
@@ -79,6 +84,9 @@ fn shape_case(id: &str, vals: &[(&str, Value)]) {
 fn edge_pinning_on_a_shape_layer() {
     shape_case("ec.distort.turbulentdisplace", &[("size", n(30.0)), ("amount", n(20.0))]);
     shape_case("ec.distort.wavewarp", &[("pinning", e(1)), ("height", n(6.0)), ("width", n(25.0))]);
+    // #1181: single-edge pinning over the layer rect, not just All Edges.
+    shape_case("ec.distort.wavewarp", &[("pinning", e(4)), ("direction", n(90.0)), ("height", n(6.0)), ("width", n(25.0))]);
+    shape_case("ec.distort.wavewarp", &[("pinning", e(6)), ("direction", n(90.0)), ("height", n(6.0)), ("width", n(25.0))]);
     shape_case(
         "ec.distort.bulge",
         &[("pinAllEdges", on()), ("height", n(2.0)), ("hradius", n(40.0)), ("vradius", n(30.0)), ("center", Value::Vec2([28.5, 20.5]))],
diff --git a/crates/gpu/src/tests_fx_extra.rs b/crates/gpu/src/tests/fx_extra.rs
similarity index 94%
rename from crates/gpu/src/tests_fx_extra.rs
rename to crates/gpu/src/tests/fx_extra.rs
index b7fe6cbd2..136a66d2f 100644
--- a/crates/gpu/src/tests_fx_extra.rs
+++ b/crates/gpu/src/tests/fx_extra.rs
@@ -46,6 +46,7 @@ fn bevels_and_legacy_gaussian() {
     effect_case("ec.perspective.bevelalpha", &[("edgeThickness", n(2.0)), ("lightAngle", n(200.0)), ("lightColor", c(1.0, 0.8, 0.5))]);
     effect_case("ec.perspective.beveledges", &[("edgeThickness", n(0.1)), ("lightIntensity", n(0.5))]);
     effect_case("ec.perspective.beveledges", &[("edgeThickness", n(0.3)), ("lightAngle", n(130.0))]);
-    effect_case("ec.obsolete.gaussianlegacy", &[("blurriness", n(7.0))]);
-    effect_case("ec.obsolete.gaussianlegacy", &[("blurriness", n(5.0)), ("blurDimensions", e(2))]);
+    // Sigma 3 px and up at half scale too: smaller ones render on the CPU (#1939).
+    effect_case("ec.obsolete.gaussianlegacy", &[("blurriness", n(14.0))]);
+    effect_case("ec.obsolete.gaussianlegacy", &[("blurriness", n(12.0)), ("blurDimensions", e(2))]);
 }
diff --git a/crates/gpu/src/tests_fx_gen2.rs b/crates/gpu/src/tests/fx_gen2.rs
similarity index 99%
rename from crates/gpu/src/tests_fx_gen2.rs
rename to crates/gpu/src/tests/fx_gen2.rs
index 8eba75c8c..620cced13 100644
--- a/crates/gpu/src/tests_fx_gen2.rs
+++ b/crates/gpu/src/tests/fx_gen2.rs
@@ -7,8 +7,8 @@
 use effectcraft_keyframe::Value;
 use effectcraft_time::Tick;
 
+use crate::tests::fx_pixel2::{e, env_case, env_case_allow, env_case_at, off, on, pt};
 use crate::tests::{c, n};
-use crate::tests_fx_pixel2::{e, env_case, env_case_allow, env_case_at, off, on, pt};
 
 fn layer(id: u64) -> Value {
     Value::Layer(Some(id))
diff --git a/crates/gpu/src/tests_fx_generate.rs b/crates/gpu/src/tests/fx_generate.rs
similarity index 97%
rename from crates/gpu/src/tests_fx_generate.rs
rename to crates/gpu/src/tests/fx_generate.rs
index e15abb37e..ebe2f2bf0 100644
--- a/crates/gpu/src/tests_fx_generate.rs
+++ b/crates/gpu/src/tests/fx_generate.rs
@@ -31,6 +31,8 @@ fn cc_radial_fast_blur() {
     effect_case("ec.blur.ccradialfast", &[("amount", n(40.0))]);
     effect_case("ec.blur.ccradialfast", &[("amount", n(70.0)), ("zoom", e(1)), ("center", pt(22.4, 16.1))]);
     effect_case("ec.blur.ccradialfast", &[("amount", n(25.0)), ("zoom", e(2))]);
+    // Center outside the layer: the buffer grows so the streaks pass its edge (#2095).
+    effect_case("ec.blur.ccradialfast", &[("amount", n(80.0)), ("center", pt(-30.0, 20.0))]);
 }
 
 #[test]
diff --git a/crates/gpu/src/tests_fx_key.rs b/crates/gpu/src/tests/fx_key.rs
similarity index 98%
rename from crates/gpu/src/tests_fx_key.rs
rename to crates/gpu/src/tests/fx_key.rs
index 5ece27e69..35303bb0b 100644
--- a/crates/gpu/src/tests_fx_key.rs
+++ b/crates/gpu/src/tests/fx_key.rs
@@ -155,6 +155,9 @@ fn refine_mattes() {
 fn channel_effects() {
     effect_case("ec.channel.setchannels", &[("setRedTo", e(2)), ("setGreenTo", e(4)), ("setBlueTo", e(5)), ("setAlphaTo", e(6))]);
     effect_case("ec.channel.shiftchannels", &[("takeRedFrom", e(3)), ("takeGreenFrom", e(7)), ("takeAlphaFrom", e(4))]);
+    // #1797: the constant sources at the end of the menu, where the GPU's order could drift from
+    // the CPU's (Full On, Full Off, Half On).
+    effect_case("ec.channel.shiftchannels", &[("takeRedFrom", e(8)), ("takeGreenFrom", e(9)), ("takeBlueFrom", e(10))]);
     effect_case("ec.channel.removecolormatting", &[("backgroundColor", c(0.3, 0.5, 0.7))]);
     effect_case("ec.channel.removecolormatting", &[("backgroundColor", c(0.8, 0.2, 0.1)), ("clipHdr", off())]);
     for op in [0, 2, 3, 4, 8, 10, 12] {
diff --git a/crates/gpu/src/tests_fx_light.rs b/crates/gpu/src/tests/fx_light.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_light.rs
rename to crates/gpu/src/tests/fx_light.rs
diff --git a/crates/gpu/src/tests_fx_lut.rs b/crates/gpu/src/tests/fx_lut.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_lut.rs
rename to crates/gpu/src/tests/fx_lut.rs
diff --git a/crates/gpu/src/tests_fx_noise.rs b/crates/gpu/src/tests/fx_noise.rs
similarity index 89%
rename from crates/gpu/src/tests_fx_noise.rs
rename to crates/gpu/src/tests/fx_noise.rs
index 476f08642..38a30aca5 100644
--- a/crates/gpu/src/tests_fx_noise.rs
+++ b/crates/gpu/src/tests/fx_noise.rs
@@ -22,6 +22,24 @@ fn pt(x: f64, y: f64) -> Value {
     Value::Vec2([x, y])
 }
 
+#[test]
+fn median_kernel_selection_preserves_physical_gpu_path() {
+    use crate::fx_noise::MedianKernel;
+    for backend in [wgpu::Backend::Vulkan, wgpu::Backend::Metal, wgpu::Backend::Dx12, wgpu::Backend::Gl, wgpu::Backend::BrowserWebGpu] {
+        for device_type in
+            [wgpu::DeviceType::DiscreteGpu, wgpu::DeviceType::IntegratedGpu, wgpu::DeviceType::VirtualGpu, wgpu::DeviceType::Cpu, wgpu::DeviceType::Other]
+        {
+            let selected = MedianKernel::for_adapter(backend, device_type);
+            let expected =
+                if backend == wgpu::Backend::Vulkan && device_type == wgpu::DeviceType::Cpu { MedianKernel::Software2 } else { MedianKernel::Private64 };
+            assert_eq!(selected, expected, "{backend:?} {device_type:?}");
+        }
+    }
+    assert_eq!(MedianKernel::Private64.rows_per_workgroup(), 64);
+    assert_eq!(MedianKernel::Software2.rows_per_workgroup(), 2);
+    assert_eq!(MedianKernel::Software2.workgroup_storage(), 16_384);
+}
+
 #[test]
 fn medians() {
     effect_case("ec.noise.median", &[("radius", n(2.0))]);
@@ -237,8 +255,17 @@ fn median_levels_match_cpu_division() {
         // A monotone row's median is its centre, including repeated edges. Exercise both
         // the bisection and sliding-histogram kernels at every quantised level.
         let mut enc = crate::context::Enc::new(&g.ctx);
+        let started = std::time::Instant::now();
         let median = crate::fx_noise::median_image(&mut enc, &input, radius, false);
-        let actual = enc.download(&median).unwrap();
+        let actual = enc.download(&median).unwrap_or_else(|| {
+            panic!(
+                "median download radius {radius}; elapsed={:?}, health={:?}, unavailable={:?}, transfers={:?}",
+                started.elapsed(),
+                g.ctx.check_health(),
+                g.ctx.unavailable_kernels(),
+                g.ctx.transfer_stats()
+            )
+        });
         for (level, (want, got)) in image.data.iter().zip(&actual.data).enumerate() {
             assert_eq!(got, want, "radius {radius}, level {level}");
         }
@@ -273,7 +300,16 @@ fn dust_strict_threshold_boundaries() {
             let buf = effectcraft_effects::Buf { img, offset: [0.0; 2], scale: 1.0 };
             let cpu = (spec.render)(&ctx(), buf.clone());
             assert_eq!(cpu.img.data[24] != original, replaced, "CPU radius {radius}, threshold {threshold}");
-            let gpu = effectcraft_render::Accelerator::effects(g, &[effectcraft_render::FxStep { spec, ctx: ctx() }], &buf, None).unwrap();
+            let started = std::time::Instant::now();
+            let gpu = effectcraft_render::Accelerator::effects(g, &[effectcraft_render::FxStep { spec, ctx: ctx() }], &buf, None).unwrap_or_else(|| {
+                panic!(
+                    "dust radius {radius}, threshold {threshold}; elapsed={:?}, health={:?}, unavailable={:?}, transfers={:?}",
+                    started.elapsed(),
+                    g.ctx.check_health(),
+                    g.ctx.unavailable_kernels(),
+                    g.ctx.transfer_stats()
+                )
+            });
             assert_eq!(gpu.img.data[24], cpu.img.data[24], "radius {radius}, threshold {threshold}");
         }
     }
diff --git a/crates/gpu/src/tests_fx_particles.rs b/crates/gpu/src/tests/fx_particles.rs
similarity index 99%
rename from crates/gpu/src/tests_fx_particles.rs
rename to crates/gpu/src/tests/fx_particles.rs
index b67df9a43..e8c3a7ce6 100644
--- a/crates/gpu/src/tests_fx_particles.rs
+++ b/crates/gpu/src/tests/fx_particles.rs
@@ -7,8 +7,8 @@ use effectcraft_project::{BitDepth, LayerSource, build};
 use effectcraft_render::RenderOpts;
 use effectcraft_time::Tick;
 
+use crate::tests::fx_sim::{case, composited, e, off, on};
 use crate::tests::{Scene, check, compare_at, n, opts, set};
-use crate::tests_fx_sim::{case, composited, e, off, on};
 
 fn v2(x: f64, y: f64) -> Value {
     Value::Vec2([x, y])
diff --git a/crates/gpu/src/tests_fx_pixel2.rs b/crates/gpu/src/tests/fx_pixel2.rs
similarity index 98%
rename from crates/gpu/src/tests_fx_pixel2.rs
rename to crates/gpu/src/tests/fx_pixel2.rs
index 899955b85..4a7886afe 100644
--- a/crates/gpu/src/tests_fx_pixel2.rs
+++ b/crates/gpu/src/tests/fx_pixel2.rs
@@ -12,7 +12,7 @@ use effectcraft_project::{BitDepth, MaskMode};
 use effectcraft_render::RenderOpts;
 use effectcraft_time::Tick;
 
-use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern, set};
+use crate::tests::{Scene, allow_llvmpipe_boundary_flips, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern, set};
 
 pub(crate) fn e(v: u32) -> Value {
     Value::Enum(v)
@@ -193,6 +193,7 @@ fn composites_and_colour() {
 
 #[test]
 fn stylize() {
+    let _flips = allow_llvmpipe_boundary_flips();
     for (done, flags) in
         [(30.0, [true, true, true, false]), (55.0, [false, true, false, true]), (70.0, [true, false, false, false]), (10.0, [false, false, true, true])]
     {
diff --git a/crates/gpu/src/tests_fx_sim.rs b/crates/gpu/src/tests/fx_sim.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_sim.rs
rename to crates/gpu/src/tests/fx_sim.rs
diff --git a/crates/gpu/src/tests_fx_stylize.rs b/crates/gpu/src/tests/fx_stylize.rs
similarity index 82%
rename from crates/gpu/src/tests_fx_stylize.rs
rename to crates/gpu/src/tests/fx_stylize.rs
index 44e156aec..df99e1ced 100644
--- a/crates/gpu/src/tests_fx_stylize.rs
+++ b/crates/gpu/src/tests/fx_stylize.rs
@@ -6,7 +6,7 @@ use effectcraft_project::BitDepth;
 use effectcraft_render::RenderOpts;
 use effectcraft_time::Tick;
 
-use crate::tests::{Scene, c, check, compare_at, effect_case, n, opts, set};
+use crate::tests::{Scene, allow_llvmpipe_boundary_flips, c, check, compare_at, effect_case, n, opts, set};
 
 fn e(v: u32) -> Value {
     Value::Enum(v)
@@ -22,6 +22,7 @@ fn pt(x: f64, y: f64) -> Value {
 
 #[test]
 fn posterize_thresholds_strobe_vignette() {
+    let _flips = allow_llvmpipe_boundary_flips();
     effect_case("ec.stylize.posterize", &[("level", n(4.0))]);
     effect_case("ec.stylize.posterize", &[("level", n(9.0))]);
     effect_case("ec.stylize.threshold", &[("level", n(100.0))]);
@@ -88,6 +89,8 @@ fn tiles_kaleida_repetile() {
         "ec.stylize.motiontile",
         &[("horizontalPhaseShift", on()), ("phase", n(33.0)), ("tileCenter", pt(30.0, 17.0)), ("tileHeight", n(55.0)), ("outputWidth", n(80.0))],
     );
+    // Output under 100 % on an adjustment crops the comp below (#1727).
+    effect_case("ec.stylize.motiontile", &[("outputWidth", n(60.0)), ("outputHeight", n(300.0)), ("mirrorEdges", on())]);
     effect_case("ec.stylize.cckaleida", &[]);
     effect_case("ec.stylize.cckaleida", &[("mirroring", e(2)), ("rotation", n(20.0)), ("size", n(150.0))]);
     effect_case("ec.stylize.ccrepetile", &[("expandRight", n(10.0)), ("expandUp", n(4.0))]);
@@ -224,3 +227,42 @@ fn transform_motion_blur() {
         check(&format!("{label} half"), compare_at(&s, RenderOpts { scale: 0.5, ..opts() }, Tick::from_seconds_f64(0.3)), 0.0);
     }
 }
+
+/// Motion Tile's Output size on an adjustment layer with a Transform after it that scales the
+/// tiles into view, and cropping (Output under 100 %): the stack's grown or cropped frame goes
+/// back onto the canvas as on the CPU (#1727).
+#[test]
+fn adjustment_motion_tile_output_then_transform() {
+    for (out_w, out_h, scale) in [(300.0, 300.0, 40.0), (250.0, 120.0, 70.0), (60.0, 80.0, 100.0)] {
+        for depth in [BitDepth::Bpc8, BitDepth::Bpc32] {
+            let mut s = Scene::new(depth);
+            let bg = s.footage(97, 61);
+            s.push(bg);
+            let mut adj = s.solid([1.0, 1.0, 1.0], 97, 61);
+            adj.switches.adjustment = true;
+            s.effect(&mut adj, "ec.stylize.motiontile", &[("outputWidth", n(out_w)), ("outputHeight", n(out_h)), ("mirrorEdges", on())]);
+            s.effect(&mut adj, "ec.distort.transform", &[("scaleHeight", n(scale)), ("scaleWidth", n(scale))]);
+            s.push(adj);
+            let label = format!("adjustment Motion Tile {out_w}×{out_h} % then Scale {scale} % {depth:?}");
+            check(&label, compare_at(&s, opts(), Tick::ZERO), 0.0);
+            check(&format!("{label} half"), compare_at(&s, RenderOpts { scale: 0.5, ..opts() }, Tick::ZERO), 0.0);
+        }
+    }
+}
+
+/// The same on a full-frame footage layer (#1991).
+#[test]
+fn layer_motion_tile_output_then_transform() {
+    for (out_w, out_h, scale) in [(300.0, 300.0, 40.0), (250.0, 120.0, 70.0)] {
+        for depth in [BitDepth::Bpc8, BitDepth::Bpc32] {
+            let mut s = Scene::new(depth);
+            let mut l = s.footage(97, 61);
+            s.effect(&mut l, "ec.stylize.motiontile", &[("outputWidth", n(out_w)), ("outputHeight", n(out_h)), ("mirrorEdges", on())]);
+            s.effect(&mut l, "ec.distort.transform", &[("scaleHeight", n(scale)), ("scaleWidth", n(scale))]);
+            s.push(l);
+            let label = format!("layer Motion Tile {out_w}×{out_h} % then Scale {scale} % {depth:?}");
+            check(&label, compare_at(&s, opts(), Tick::ZERO), 0.0);
+            check(&format!("{label} half"), compare_at(&s, RenderOpts { scale: 0.5, ..opts() }, Tick::ZERO), 0.0);
+        }
+    }
+}
diff --git a/crates/gpu/src/tests_fx_text.rs b/crates/gpu/src/tests/fx_text.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_text.rs
rename to crates/gpu/src/tests/fx_text.rs
diff --git a/crates/gpu/src/tests_fx_time.rs b/crates/gpu/src/tests/fx_time.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_time.rs
rename to crates/gpu/src/tests/fx_time.rs
diff --git a/crates/gpu/src/tests_fx_tone.rs b/crates/gpu/src/tests/fx_tone.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_tone.rs
rename to crates/gpu/src/tests/fx_tone.rs
diff --git a/crates/gpu/src/tests_fx_transition.rs b/crates/gpu/src/tests/fx_transition.rs
similarity index 99%
rename from crates/gpu/src/tests_fx_transition.rs
rename to crates/gpu/src/tests/fx_transition.rs
index b4b3572a0..abe9273dc 100644
--- a/crates/gpu/src/tests_fx_transition.rs
+++ b/crates/gpu/src/tests/fx_transition.rs
@@ -126,6 +126,7 @@ fn distort() {
         "ec.distort.ccblobbylize",
         &[("property", e(4)), ("softness", n(3.0)), ("cutAway", n(30.0)), ("lightType", e(1)), ("lightPosition", pt(20.0, 10.0))],
     );
+    effect_case("ec.distort.ccblobbylize", &[("cutAway", n(100.0))]);
     effect_case("ec.distort.ccblobbylize", &[("property", e(5)), ("metal", n(30.0)), ("roughness", n(0.2))]);
 }
 
diff --git a/crates/gpu/src/tests_fx_vr.rs b/crates/gpu/src/tests/fx_vr.rs
similarity index 100%
rename from crates/gpu/src/tests_fx_vr.rs
rename to crates/gpu/src/tests/fx_vr.rs
diff --git a/crates/gpu/src/tests_fx_warp.rs b/crates/gpu/src/tests/fx_warp.rs
similarity index 95%
rename from crates/gpu/src/tests_fx_warp.rs
rename to crates/gpu/src/tests/fx_warp.rs
index 39bcba13c..1482c268b 100644
--- a/crates/gpu/src/tests_fx_warp.rs
+++ b/crates/gpu/src/tests/fx_warp.rs
@@ -2,6 +2,8 @@
 //! Emboss, Cartoon) vs the CPU effects (the oracle): direct on a buffer at full and half
 //! resolution, as adjustment, and composited at 8 and 32 bpc.
 
+use std::io::Write;
+
 use effectcraft_effects::MaskShape;
 use effectcraft_keyframe::{ShapePath, Value};
 use effectcraft_project::build::{self, Ids};
@@ -9,7 +11,7 @@ use effectcraft_project::{BitDepth, MaskMode};
 use effectcraft_render::RenderOpts;
 use effectcraft_time::Tick;
 
-use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, opts, pattern};
+use crate::tests::{Scene, c, check, compare_at, diff, effect_case, gpu, n, on_llvmpipe, opts, pattern};
 
 fn e(v: u32) -> Value {
     Value::Enum(v)
@@ -182,6 +184,12 @@ fn smear_and_reshape() {
         ],
     ];
     for vals in reshape {
+        if on_llvmpipe() && vals.iter().any(|(k, _)| *k == "boundaryMask") {
+            // Straight to stderr: libtest captures `eprintln!` of passing tests, and the skip
+            // should show in the log.
+            let _ = writeln!(std::io::stderr(), "tests_fx_warp::smear_and_reshape: skipping ec.distort.reshape {vals:?} on llvmpipe (crashes lavapipe, #2238)");
+            continue;
+        }
         direct_with_masks("ec.distort.reshape", vals);
         composite_with_masks("ec.distort.reshape", vals);
     }
diff --git a/crates/gpu/src/tests_init.rs b/crates/gpu/src/tests/init.rs
similarity index 89%
rename from crates/gpu/src/tests_init.rs
rename to crates/gpu/src/tests/init.rs
index 9c579ae69..4578a8489 100644
--- a/crates/gpu/src/tests_init.rs
+++ b/crates/gpu/src/tests/init.rs
@@ -2,7 +2,6 @@
 //! Set EFFECTCRAFT_REQUIRE_GPU=1 for acceptance: unavailable adapters/devices then fail
 //! instead of taking the explicitly logged headless-CI skip path.
 #![cfg(not(target_arch = "wasm32"))]
-#![allow(clippy::expect_used)] // Test helpers require successful setup to exercise rejection.
 
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -149,23 +148,28 @@ fn opengl_adapters_get_cpu_compositing_at_once() {
     assert!(t.elapsed() < std::time::Duration::from_secs(1), "{:?}", t.elapsed());
 }
 
+/// #613: FXC (DirectX 12's default shader compiler) builds Classic 3D, so the compositor starts
+/// on DirectX 12 with its 3D kernel, and initialization leaves the caller's error scope and the
+/// host's error handler untouched. Ignored by default: FXC compiles every kernel, which takes
+/// minutes. Skips where there is no DirectX 12 adapter.
 #[test]
 #[cfg(target_os = "windows")]
-#[ignore = "requires the reproduced Windows DX12/FXC pointwise compiler failure; no adapter skips"]
-fn reproduced_fxc_pointwise_failure_returns_error_without_escaping_or_notifying_host() {
+#[ignore = "slow: FXC compiles every kernel"]
+fn fxc_builds_classic3d_and_initialization_errors_stay_scoped() {
     let mut desc = wgpu::InstanceDescriptor::new_without_display_handle();
     desc.backends = wgpu::Backends::DX12;
     desc.backend_options.dx12.shader_compiler = wgpu::Dx12Compiler::Fxc;
-    let (adapter, device, queue) = native_device(desc, true).expect("required DX12 device");
+    let Some((adapter, device, queue)) = native_device(desc, false) else { return };
     assert_eq!(adapter.get_info().backend, wgpu::Backend::Dx12);
     let host = count_host_errors(&device);
     let outer = device.push_error_scope(wgpu::ErrorFilter::Validation);
     let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| GpuContext::new(&adapter, device.clone(), queue)));
-    let error = match result.expect("FXC compiler failure must not escape the constructor") {
-        Err(error) => error,
-        Ok(_) => panic!("the platform-specific FXC failure no longer reproduces; reassess this diagnostic"),
+    let ctx = match result.expect("an FXC compiler failure must not escape the constructor") {
+        Ok(ctx) => ctx,
+        Err(error) => panic!("the compositor starts on DirectX 12 with FXC: {}", brief(error)),
     };
-    assert!(error.contains("GPU initialization (pointwise)") && error.contains("FXC D3DCompile"), "{}", brief(error));
+    let missing: Vec<&str> = ctx.unavailable_kernels().iter().map(|(e, _)| *e).collect();
+    assert!(ctx.has_kernel("classic3d"), "FXC builds classic3d (unavailable: {missing:?})");
     assert!(pollster::block_on(outer.pop()).is_none(), "constructor must drain its own scopes and leave the caller's scope clean");
     assert_eq!(host.load(Ordering::SeqCst), 0);
     valid_pipeline(&device);
diff --git a/crates/gpu/src/tests_particles.rs b/crates/gpu/src/tests/particles.rs
similarity index 100%
rename from crates/gpu/src/tests_particles.rs
rename to crates/gpu/src/tests/particles.rs
diff --git a/crates/gpu/src/tests_3d.rs b/crates/gpu/src/tests/three_d.rs
similarity index 89%
rename from crates/gpu/src/tests_3d.rs
rename to crates/gpu/src/tests/three_d.rs
index bd9455b9e..32f11a341 100644
--- a/crates/gpu/src/tests_3d.rs
+++ b/crates/gpu/src/tests/three_d.rs
@@ -11,7 +11,7 @@ use effectcraft_project::{BitDepth, Comp, ItemKind, Layer, LayerSource, LightKin
 use effectcraft_render::{Backend, RenderOpts, Renderer};
 use effectcraft_time::{FrameRate, Tick};
 
-use crate::tests::{Pattern, Scene, check, compare_at, gpu, n, opts, set};
+use crate::tests::{Pattern, Scene, check, compare_at, diff, gpu, n, opts, set, tolerance};
 
 const W: u32 = 160;
 const H: u32 = 100;
@@ -209,6 +209,10 @@ fn the_gpu_draws_classic_3d_runs_itself() {
     assert_eq!(prep.planes.iter().filter(|p| p.draw).count(), 3);
     let mut e = crate::context::Enc::new(g.context());
     let canvas = e.image(W, H);
+    if !g.context().has_kernel("classic3d") {
+        // FXC (DirectX 12) can't build the kernel (#613); the CPU fallback is tested below.
+        return;
+    }
     let out = crate::classic3d::draw_run(&mut e, &prep, &canvas).expect("the kernel draws the run");
     let img = e.download(&out).unwrap();
     let mut cpu = effectcraft_raster::Image::new(W, H);
@@ -253,7 +257,9 @@ fn bokeh_depth_of_field_runs_on_the_gpu() {
                 assert!(prep.planes.iter().filter(|p| p.draw).all(|p| p.dof.is_some()), "{label}: depth of field deferred to the GPU");
                 let mut e = crate::context::Enc::new(g.context());
                 let canvas = e.image(W, H);
-                assert!(crate::classic3d::draw_run(&mut e, &prep, &canvas).is_some(), "{label}: drawn on the GPU");
+                if g.context().has_kernel("classic3d") {
+                    assert!(crate::classic3d::draw_run(&mut e, &prep, &canvas).is_some(), "{label}: drawn on the GPU");
+                }
             }
         }
     }
@@ -288,3 +294,27 @@ fn two_d_layer_with_a_three_d_track_matte() {
         }
     }
 }
+
+/// #613: FXC on DirectX 12 fails to build `classic3d` (it can't unroll its loops). The
+/// compositor still starts without it, lists it, and 3D runs render on the CPU, matching the
+/// CPU render.
+#[test]
+fn classic_3d_runs_render_on_the_cpu_without_the_kernel() {
+    let Some(base) = gpu() else {
+        return;
+    };
+    let ctx = base.context().without_kernel("classic3d");
+    assert!(!ctx.has_kernel("classic3d"));
+    let g = crate::Gpu::from_context(ctx);
+    for depth in [BitDepth::Bpc8, BitDepth::Bpc32] {
+        let mut s = crossing(depth, BlendMode::Normal);
+        camera(&mut s, [30.0, 20.0, -260.0], None);
+        let cpu = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Cpu, ..opts() }).comp_frame_cpu(s.cid, Tick::ZERO);
+        let mut r = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Gpu, ..opts() });
+        r.accel = Some(&g);
+        let img = g.render(&r, s.cid, Tick::ZERO).expect("the GPU renders the frame");
+        let mut d = diff(&cpu, &img, tolerance(depth));
+        d.quantized = depth != BitDepth::Bpc32;
+        check(&format!("classic 3D without its kernel {depth:?}"), Some(d), 0.0);
+    }
+}
diff --git a/crates/gpu/src/tests/wgsl_grammar.rs b/crates/gpu/src/tests/wgsl_grammar.rs
new file mode 100644
index 000000000..d68a12ac4
--- /dev/null
+++ b/crates/gpu/src/tests/wgsl_grammar.rs
@@ -0,0 +1,233 @@
+//! WGSL rules naga accepts but stricter front-ends (Tint, i.e. the browser's
+//! WebGPU, which receives the WGSL source verbatim on wasm) reject.
+//!
+//! WGSL gives the bitwise operators `&`, `|` and `^` no precedence against any other
+//! binary operator: `a * b ^ c` must be written `(a * b) ^ c`, and `a & b == c` as
+//! `(a & b) == c`. Only a chain of the same bitwise operator may go unparenthesised.
+
+use std::fs;
+use std::path::Path;
+
+#[derive(Clone, Copy, PartialEq)]
+enum Tok<'a> {
+    Operand,
+    Open,
+    Close,
+    Op(&'a str),
+    /// A unary prefix (`!`, `~`): the operator after it cannot be binary.
+    Prefix,
+    /// Ends an expression: `,` `;` `{` `}` `:` `=` compound assignment, `->`, `@`.
+    Sep,
+}
+
+const BITWISE: [&str; 3] = ["&", "|", "^"];
+
+const OPS: [&str; 18] = ["&&", "||", "==", "!=", "<=", ">=", "<<", ">>", "<", ">", "+", "-", "*", "/", "%", "&", "|", "^"];
+
+/// Drop comments and template argument lists (`vec3<f32>`, `array<vec4<u32>>`), whose
+/// angle brackets are not relational operators.
+fn strip(src: &str) -> String {
+    let mut out = drop_comments(src);
+    loop {
+        let (next, changed) = drop_template_lists_once(&out);
+        out = next;
+        if !changed {
+            return out;
+        }
+    }
+}
+
+fn drop_comments(src: &str) -> String {
+    let mut out = String::with_capacity(src.len());
+    let b = src.as_bytes();
+    let mut i = 0;
+    while i < b.len() {
+        if b[i..].starts_with(b"//") {
+            while i < b.len() && b[i] != b'\n' {
+                i += 1;
+            }
+        } else if b[i..].starts_with(b"/*") {
+            i += 2;
+            while i + 1 < b.len() && !b[i..].starts_with(b"*/") {
+                out.push(if b[i] == b'\n' { '\n' } else { ' ' });
+                i += 1;
+            }
+            i += 2;
+        } else {
+            out.push(b[i] as char);
+            i += 1;
+        }
+    }
+    out
+}
+
+/// One pass over `out` dropping every template argument list. Returns whether one was dropped.
+fn drop_template_lists_once(out: &str) -> (String, bool) {
+    let mut changed = false;
+    let mut next = String::with_capacity(out.len());
+    let c: Vec<char> = out.chars().collect();
+    let mut i = 0;
+    while i < c.len() {
+        if let Some(end) = template_list_end(&c, i) {
+            i = end;
+            changed = true;
+            continue;
+        }
+        next.push(c[i]);
+        i += 1;
+    }
+    (next, changed)
+}
+
+/// If `c[i]` opens a template argument list after an identifier, the index just past its `>`.
+fn template_list_end(c: &[char], i: usize) -> Option<usize> {
+    let prev = i.checked_sub(1).and_then(|p| c.get(p))?;
+    if c.get(i) != Some(&'<') || !(prev.is_alphanumeric() || *prev == '_') {
+        return None;
+    }
+    let mut j = i + 1;
+    while let Some(&ch) = c.get(j) {
+        if !(ch.is_alphanumeric() || ch == '_' || ch == ',' || ch == ' ') {
+            break;
+        }
+        j += 1;
+    }
+    (c.get(j) == Some(&'>')).then_some(j + 1)
+}
+
+/// Scans the token starting at `*at` (not whitespace) and advances `*at` past it.
+fn next_token<'a>(s: &'a str, at: &mut usize) -> Tok<'a> {
+    let b = s.as_bytes();
+    let Some(&ch) = b.get(*at) else {
+        return Tok::Sep;
+    };
+    let mut i = *at;
+    let tok = if ch.is_ascii_alphanumeric() || ch == b'_' || ch == b'.' {
+        // Identifier, member access or number (`1e-6`, `0x9E3779B9u`).
+        let start = i;
+        while i < b.len() && (b[i].is_ascii_alphanumeric() || b[i] == b'_' || b[i] == b'.') {
+            if (b[i] == b'e' || b[i] == b'E')
+                && b[start].is_ascii_digit()
+                && !s[start..i].starts_with("0x")
+                && i + 1 < b.len()
+                && (b[i + 1] == b'-' || b[i + 1] == b'+')
+            {
+                i += 1;
+            }
+            i += 1;
+        }
+        Tok::Operand
+    } else if ch == b'(' || ch == b'[' {
+        i += 1;
+        Tok::Open
+    } else if ch == b')' || ch == b']' {
+        i += 1;
+        Tok::Close
+    } else if b[i..].starts_with(b"->") || b[i..].starts_with(b"++") || b[i..].starts_with(b"--") {
+        i += 2;
+        Tok::Sep
+    } else if matches!(ch, b',' | b';' | b'{' | b'}' | b':' | b'@') {
+        i += 1;
+        Tok::Sep
+    } else if let Some(op) = OPS.iter().find(|op| b[i..].starts_with(op.as_bytes())) {
+        i += op.len();
+        if b.get(i) == Some(&b'=') && !matches!(*op, "==" | "!=" | "<=" | ">=") {
+            i += 1;
+            Tok::Sep // compound assignment
+        } else {
+            Tok::Op(op)
+        }
+    } else if ch == b'=' {
+        i += 1;
+        Tok::Sep
+    } else {
+        i += 1;
+        Tok::Prefix
+    };
+    *at = i;
+    tok
+}
+
+/// Records a binary operator at the current parenthesis level, reporting it if it mixes with
+/// one already seen there.
+fn note_operator<'a>(level: &mut Vec<&'a str>, op: &'a str, line: usize, out: &mut Vec<(usize, String)>) {
+    let mixes = |a: &str, b: &str| a != b && (BITWISE.contains(&a) || BITWISE.contains(&b));
+    if let Some(other) = level.iter().find(|o| mixes(o, op)) {
+        out.push((line, format!("mixing '{other}' and '{op}' requires parentheses")));
+    }
+    level.push(op);
+}
+
+/// `(line, message)` for every bitwise operator mixed with another binary operator at
+/// the same parenthesis level.
+fn violations(src: &str) -> Vec<(usize, String)> {
+    let s = strip(src);
+    let b = s.as_bytes();
+    let mut out = vec![];
+    // Binary operators seen at each open parenthesis level.
+    let mut levels: Vec<Vec<&str>> = vec![vec![]];
+    let mut prev = Tok::Sep;
+    let (mut i, mut line) = (0, 1);
+    while i < b.len() {
+        let ch = b[i];
+        if ch == b'\n' {
+            line += 1;
+            i += 1;
+            continue;
+        }
+        if ch.is_ascii_whitespace() {
+            i += 1;
+            continue;
+        }
+        let tok = next_token(&s, &mut i);
+        match tok {
+            Tok::Open => levels.push(vec![]),
+            Tok::Close => {
+                if levels.len() > 1 {
+                    levels.pop();
+                }
+            }
+            Tok::Sep => {
+                if let Some(l) = levels.last_mut() {
+                    l.clear();
+                }
+            }
+            Tok::Op(op) if matches!(prev, Tok::Operand | Tok::Close) => {
+                let level = levels.last_mut().expect("level");
+                note_operator(level, op, line, &mut out);
+            }
+            _ => {}
+        }
+        prev = tok;
+    }
+    out
+}
+
+#[test]
+fn checker_flags_unparenthesised_bitwise_mixes() {
+    assert_eq!(violations("let h = u32(x) * 3u ^ u32(y) * 5u;").len(), 2);
+    assert_eq!(violations("let a = b & c == d;").len(), 1);
+    assert!(violations("let h = (u32(x) * 3u) ^ (u32(y) * 5u);").is_empty());
+    assert!(violations("let h = a ^ b ^ c; let m = f32(h & 0xFFFFu) * (1.0 / 65536.0) - 0.5;").is_empty());
+    assert!(violations("let v: vec3<f32> = vec3<f32>(1e-6, -x, a < b); if (a < b && c > d) { h ^= h >> 16u; }").is_empty());
+    assert!(violations("var p = &x; let y = -a & b;").is_empty());
+}
+
+#[test]
+fn shaders_parenthesise_bitwise_operators() {
+    let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("src/shaders");
+    let mut bad = vec![];
+    let mut files = 0;
+    for entry in fs::read_dir(&dir).expect("shader dir") {
+        let path = entry.expect("entry").path();
+        if path.extension().is_some_and(|e| e == "wgsl") {
+            files += 1;
+            let src = fs::read_to_string(&path).expect("shader source");
+            for (line, msg) in violations(&src) {
+                bad.push(format!("{}:{line}: {msg}", path.file_name().map(|n| n.to_string_lossy()).unwrap_or_default()));
+            }
+        }
+    }
+    assert!(files > 10, "found the shaders: {files}");
+    assert!(bad.is_empty(), "WGSL a strict front-end rejects:\n{}", bad.join("\n"));
+}
diff --git a/crates/gpu/src/walk.rs b/crates/gpu/src/walk.rs
index b1209070a..78a6857fb 100644
--- a/crates/gpu/src/walk.rs
+++ b/crates/gpu/src/walk.rs
@@ -17,6 +17,12 @@ use effectcraft_time::Tick;
 use crate::context::{Enc, GpuImage};
 use crate::ops;
 
+/// The size [`render`] renders `comp_id` at, without rendering it.
+pub(crate) fn frame_size(r: &Renderer, comp_id: ItemId, t: Tick) -> Option<(u32, u32)> {
+    let ctx = r.eval_ctx(comp_id, t)?;
+    Some(effectcraft_render::frame_size(ctx.comp.width, ctx.comp.height, r.opts.scale))
+}
+
 /// Render a comp frame into a GPU image (the canvas in the output space, as
 /// `Renderer::comp_frame_cpu` returns it). `None` when something cannot run here (the caller
 /// renders on the CPU instead).
@@ -26,9 +32,7 @@ pub(crate) fn render<'g>(e: &mut Enc<'g>, r: &Renderer, comp_id: ItemId, t: Tick
         return None;
     }
     let ctx = r.eval_ctx(comp_id, t)?;
-    let s = r.opts.scale;
-    let w = ((ctx.comp.width as f64 * s).round() as u32).max(1);
-    let h = ((ctx.comp.height as f64 * s).round() as u32).max(1);
+    let (w, h) = effectcraft_render::frame_size(ctx.comp.width, ctx.comp.height, r.opts.scale);
     if r.depth() > 16 || !e.g.fits(w, h) {
         return None;
     }
@@ -357,7 +361,11 @@ fn draw_adjustment(e: &mut Enc, r: &Renderer, ctx: &EvalCtx, layer: &Layer, canv
     };
     let mut fx = crate::effects::GpuFx::new(e, below, [0.0; 2], r.opts.scale, pipe.levels);
     r.run_effects_on(ctx, layer, true, &mut fx);
-    let (mut adjusted, _, _) = fx.finish()?;
+    let (mut adjusted, offset, _) = fx.finish()?;
+    // An effect that changed the frame (Motion Tile's Output size): back onto the canvas.
+    if let Some((dx, dy)) = effectcraft_effects::adjustment_crop(offset, [0.0; 2], (adjusted.width, adjusted.height), (w, h)) {
+        adjusted = e.crop(&adjusted, dx, dy, w, h);
+    }
     if adjusted.width != w || adjusted.height != h {
         return Some(());
     }
@@ -464,12 +472,12 @@ fn place_src(
 ) -> Option<GpuImage> {
     let pl = r.placement(ctx, layer, buf);
     if let [m] = pl.matrices.as_slice() {
-        return Some(ops::warp_q(e, target, &src, m, pl.sampling, mode, opacity, pl.seed, None, levels));
+        return Some(ops::warp_q(e, target, &src, m, ops::WarpOptions { sampling: pl.sampling, mode, opacity, seed: pl.seed }, None, levels));
     }
     let mut acc = e.zeros(target.width, target.height);
     let k = 1.0 / pl.matrices.len() as f32;
     for m in &pl.matrices {
-        acc = ops::warp(e, &acc, &src, m, pl.sampling, BlendMode::Normal, 1.0, 0, Some(k));
+        acc = ops::warp(e, &acc, &src, m, ops::WarpOptions { sampling: pl.sampling, mode: BlendMode::Normal, opacity: 1.0, seed: 0 }, Some(k));
     }
     Some(ops::blend_full(e, target, &acc, mode, opacity, pl.seed, levels))
 }
diff --git a/crates/gpu/src/yuv.rs b/crates/gpu/src/yuv.rs
new file mode 100644
index 000000000..aba3ec700
--- /dev/null
+++ b/crates/gpu/src/yuv.rs
@@ -0,0 +1,403 @@
+//! Export frames converted on the device to the H.264 encoder's input (8-bit BT.709 limited
+//! range 4:2:0, see `shaders/yuv.wgsl`): a 4K frame reads back 12 MB of planes instead of
+//! 133 MB of RGBA f32, and the CPU skips `to_rgba8_over` + `rgba_to_yuv420`.
+
+use wgpu::util::DeviceExt;
+
+use crate::context::{Enc, GpuImage};
+
+pub(crate) struct YuvPipe {
+    bgl: wgpu::BindGroupLayout,
+    pipe: wgpu::ComputePipeline,
+}
+
+impl YuvPipe {
+    pub(crate) fn new(device: &wgpu::Device) -> Result<YuvPipe, String> {
+        crate::context::init_resource(device, "yuv420", || {
+            let module = device.create_shader_module(wgpu::ShaderModuleDescriptor {
+                label: Some("yuv420"),
+                source: wgpu::ShaderSource::Wgsl(include_str!("shaders/yuv.wgsl").into()),
+            });
+            let storage =
+                wgpu::BindingType::Buffer { ty: wgpu::BufferBindingType::Storage { read_only: false }, has_dynamic_offset: false, min_binding_size: None };
+            let bgl = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
+                label: Some("yuv420"),
+                entries: &[
+                    wgpu::BindGroupLayoutEntry {
+                        binding: 0,
+                        visibility: wgpu::ShaderStages::COMPUTE,
+                        ty: wgpu::BindingType::Buffer { ty: wgpu::BufferBindingType::Uniform, has_dynamic_offset: false, min_binding_size: None },
+                        count: None,
+                    },
+                    wgpu::BindGroupLayoutEntry {
+                        binding: 1,
+                        visibility: wgpu::ShaderStages::COMPUTE,
+                        ty: wgpu::BindingType::Texture {
+                            sample_type: wgpu::TextureSampleType::Float { filterable: false },
+                            view_dimension: wgpu::TextureViewDimension::D2,
+                            multisampled: false,
+                        },
+                        count: None,
+                    },
+                    wgpu::BindGroupLayoutEntry { binding: 2, visibility: wgpu::ShaderStages::COMPUTE, ty: storage, count: None },
+                ],
+            });
+            let layout =
+                device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { label: Some("yuv420"), bind_group_layouts: &[Some(&bgl)], immediate_size: 0 });
+            let pipe = device.create_compute_pipeline(&wgpu::ComputePipelineDescriptor {
+                label: Some("yuv420"),
+                layout: Some(&layout),
+                module: &module,
+                entry_point: Some("yuv420"),
+                compilation_options: Default::default(),
+                cache: None,
+            });
+            YuvPipe { bgl, pipe }
+        })
+    }
+}
+
+/// The frame sizes the kernel handles: width a multiple of 8 (4 chroma samples per
+/// invocation), height even.
+pub(crate) fn supported(w: u32, h: u32) -> bool {
+    w > 0 && h > 0 && w.is_multiple_of(8) && h.is_multiple_of(2)
+}
+
+/// Bytes of the planes: Y `w×h`, then U and V `w/2 × h/2`.
+pub(crate) fn planes_len(w: u32, h: u32) -> u64 {
+    w as u64 * h as u64 + 2 * ((w / 2) as u64 * (h / 2) as u64)
+}
+
+/// Whether the [`planes_len`] storage and staging buffers for `w×h` fit within `limits`.
+pub(crate) fn fits_limits(w: u32, h: u32, limits: &wgpu::Limits) -> bool {
+    let size = planes_len(w, h);
+    size <= limits.max_storage_buffer_binding_size && size <= limits.max_buffer_size
+}
+
+/// Record the conversion of `img` over `bg` into a new `MAP_READ` buffer of
+/// [`planes_len`] bytes and submit it. `None`: the size is not [`supported`], exceeds the
+/// device's buffer limits, or buffer allocation failed.
+pub(crate) fn record(e: &mut Enc, yp: &YuvPipe, img: &GpuImage, bg: [f32; 3]) -> Option<wgpu::Buffer> {
+    let (w, h) = (img.width, img.height);
+    let g = e.g;
+    if !supported(w, h) || !fits_limits(w, h, &g.device.limits()) {
+        return None;
+    }
+    let cw = w / 2;
+    let size = planes_len(w, h);
+    let mut params = [0u8; 32];
+    // w * h fits in u32: both are at most the texture limit (16384).
+    for (i, v) in [w, h, cw, w * h / 4].into_iter().enumerate() {
+        params[i * 4..i * 4 + 4].copy_from_slice(&v.to_le_bytes());
+    }
+    for (i, v) in [bg[0], bg[1], bg[2], 1.0].into_iter().enumerate() {
+        params[16 + i * 4..16 + i * 4 + 4].copy_from_slice(&v.to_le_bytes());
+    }
+    let (out, stg, ub) = match crate::context::init_resource(&g.device, "yuv420 buffers", || {
+        let out = g.device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("yuv420 out"),
+            size,
+            usage: wgpu::BufferUsages::STORAGE | wgpu::BufferUsages::COPY_SRC,
+            mapped_at_creation: false,
+        });
+        let stg = g.device.create_buffer(&wgpu::BufferDescriptor {
+            label: Some("yuv420 staging"),
+            size,
+            usage: wgpu::BufferUsages::MAP_READ | wgpu::BufferUsages::COPY_DST,
+            mapped_at_creation: false,
+        });
+        let ub = g.device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
+            label: Some("yuv420 params"),
+            contents: &params,
+            usage: wgpu::BufferUsages::UNIFORM,
+        });
+        (out, stg, ub)
+    }) {
+        Ok(buffers) => buffers,
+        Err(err) => {
+            log::warn!(target: "effectcraft_gpu", "yuv420 buffers: {err}");
+            return None;
+        }
+    };
+    let view = img.texture.create_view(&Default::default());
+    let group = g.device.create_bind_group(&wgpu::BindGroupDescriptor {
+        label: Some("yuv420"),
+        layout: &yp.bgl,
+        entries: &[
+            wgpu::BindGroupEntry { binding: 0, resource: ub.as_entire_binding() },
+            wgpu::BindGroupEntry { binding: 1, resource: wgpu::BindingResource::TextureView(&view) },
+            wgpu::BindGroupEntry { binding: 2, resource: out.as_entire_binding() },
+        ],
+    });
+    {
+        let enc = e.encoder();
+        {
+            let mut pass = enc.begin_compute_pass(&wgpu::ComputePassDescriptor { label: Some("yuv420"), timestamp_writes: None });
+            pass.set_pipeline(&yp.pipe);
+            pass.set_bind_group(0, &group, &[]);
+            pass.dispatch_workgroups((w / 8).div_ceil(8), (h / 2).div_ceil(8), 1);
+        }
+        enc.copy_buffer_to_buffer(&out, 0, &stg, 0, size);
+    }
+    e.submit();
+    Some(stg)
+}
+
+/// Convert `img` over `bg` and read the planes back, waiting for the device.
+pub(crate) fn convert(e: &mut Enc, yp: &YuvPipe, img: &GpuImage, bg: [f32; 3]) -> Option<Vec<u8>> {
+    let stg = record(e, yp, img, bg)?;
+    let n = planes_len(img.width, img.height) as usize;
+    e.g.read_buffer(&stg, n, n, 1).map_err(|err| log::error!(target: "effectcraft_gpu", "yuv420 readback: {err}")).ok()
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use effectcraft_raster::Image;
+
+    /// The export's conversion (`to_rgba8_over` + `rgba_to_yuv420`), the reference the kernel
+    /// is held to.
+    pub(crate) fn cpu(img: &Image, bg: [f32; 3]) -> Vec<u8> {
+        effectcraft_raster::yuv::yuv420_over(img, bg)
+    }
+
+    /// Premultiplied noise with some out-of-range values, opaque pixels, exact 8-bit levels and
+    /// a few NaN and infinite components (the CPU writes 0 for NaN).
+    pub(crate) fn noise(w: u32, h: u32, seed: u32) -> Image {
+        let mut img = Image::new(w, h);
+        let mut s = seed | 1;
+        let mut rnd = || {
+            s ^= s << 13;
+            s ^= s >> 17;
+            s ^= s << 5;
+            s as f32 / u32::MAX as f32
+        };
+        for (i, p) in img.data.iter_mut().enumerate() {
+            let a = if i % 7 == 0 { 1.0 } else { rnd() };
+            *p = if i % 97 == 3 {
+                [f32::NAN, 0.5, f32::INFINITY, a]
+            } else if i % 101 == 5 {
+                [0.2, 0.3, 0.4, f32::NAN]
+            } else if i % 103 == 7 {
+                [f32::NEG_INFINITY, 0.1, 0.9, f32::INFINITY]
+            } else if i % 5 == 0 {
+                let q = (i % 256) as f32 / 255.0;
+                [q, 1.0 - q, q * 0.5, 1.0]
+            } else {
+                [rnd() * a * 1.1 - 0.02, rnd() * a, rnd() * a, a]
+            };
+        }
+        img
+    }
+
+    /// Check `got` against the CPU's `want`. Software adapters (llvmpipe, WARP) must match
+    /// exactly. A hardware driver may contract multiply-adds or divide less exactly, which
+    /// moves a value near a rounding boundary by one level (seen on an RTX 3090 under Vulkan):
+    /// there every byte must be within one level and at most `budget` of them off (about 2–3×
+    /// the rate measured on the 3090). A wrong formula, rounding mode or NaN rule fails either
+    /// way on software adapters.
+    pub(crate) fn assert_parity(g: &crate::Gpu, got: &[u8], want: &[u8], budget: f64, what: &str) {
+        assert_eq!(got.len(), want.len(), "{what}: length");
+        let diff: Vec<usize> = (0..got.len()).filter(|&i| got[i] != want[i]).collect();
+        let max = diff.iter().map(|&i| (got[i] as i32 - want[i] as i32).abs()).max().unwrap_or(0);
+        eprintln!("{what} on {}: {} of {} bytes differ (max {max})", g.ctx.name, diff.len(), got.len());
+        if g.ctx.software {
+            assert!(diff.is_empty(), "{what}: a software adapter must match exactly, first diffs at {:?}", &diff[..diff.len().min(10)]);
+            return;
+        }
+        assert!(max <= 1, "{what}: a byte is {max} levels off, first diffs at {:?}", &diff[..diff.len().min(10)]);
+        assert!(diff.len() as f64 <= budget * got.len() as f64, "{what}: {} of {} bytes off by one", diff.len(), got.len());
+    }
+
+    #[test]
+    fn yuv420_matches_cpu() {
+        let Some(g) = crate::tests::gpu() else { return };
+        let yp = super::YuvPipe::new(&g.ctx.device).expect("yuv420 pipe");
+        for (w, h, bg) in [(264u32, 150u32, [0.05, 0.1, 0.2]), (8, 2, [1.0, 1.0, 1.0]), (1928, 6, [0.0, 0.0, 0.0])] {
+            let img = noise(w, h, w ^ (h << 16));
+            let src = g.ctx.upload_image(&img).expect("upload");
+            let got = super::convert(&mut crate::context::Enc::new(&g.ctx), &yp, &src, bg).expect("readback");
+            assert_parity(g, &got, &cpu(&img, bg), 0.00005, &format!("noise {w}x{h}"));
+        }
+    }
+
+    #[test]
+    fn unsupported_sizes_are_declined() {
+        assert!(super::supported(8, 2));
+        for (w, h) in [(0, 2), (8, 0), (12, 2), (8, 3), (7, 4)] {
+            assert!(!super::supported(w, h), "{w}x{h}");
+        }
+        assert_eq!(super::planes_len(8, 2), 16 + 2 * 4);
+    }
+
+    #[test]
+    fn sizes_exceeding_buffer_limits_are_declined() {
+        let def = wgpu::Limits::default();
+        assert!(super::fits_limits(3840, 2160, &def));
+        // 16384×16384 planes are 384 MiB, over default max_storage_buffer_binding_size (128 MiB)
+        // and max_buffer_size (256 MiB).
+        assert!(!super::fits_limits(16384, 16384, &def));
+        let size = super::planes_len(64, 64);
+        assert!(super::fits_limits(64, 64, &wgpu::Limits { max_storage_buffer_binding_size: size, max_buffer_size: size, ..def.clone() }));
+        assert!(!super::fits_limits(64, 64, &wgpu::Limits { max_storage_buffer_binding_size: size - 1, max_buffer_size: size, ..def.clone() }));
+        assert!(!super::fits_limits(64, 64, &wgpu::Limits { max_storage_buffer_binding_size: size, max_buffer_size: size - 1, ..def.clone() }));
+
+        let Some(_) = crate::tests::gpu() else { return };
+        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::new_without_display_handle());
+        let adapter = pollster::block_on(instance.request_adapter(&Default::default())).expect("adapter");
+        let required_limits = wgpu::Limits { max_storage_buffer_binding_size: 4096, max_buffer_size: 4096, ..def };
+        let (device, queue) = pollster::block_on(adapter.request_device(&crate::context::device_descriptor(required_limits))).expect("limited device");
+        let g = crate::Gpu::new(&adapter, device, queue).expect("limited Gpu");
+        let yp = super::YuvPipe::new(&g.ctx.device).expect("yuv420 pipe");
+        let src = g.ctx.upload_image(&noise(64, 64, 1)).expect("upload");
+        assert!(super::convert(&mut crate::context::Enc::new(&g.ctx), &yp, &src, [0.0; 3]).is_none());
+        assert!(g.ctx.check_health().is_ok());
+    }
+
+    #[test]
+    fn unsupported_sizes_are_not_converted() {
+        let Some(g) = crate::tests::gpu() else { return };
+        let yp = super::YuvPipe::new(&g.ctx.device).expect("yuv420 pipe");
+        let src = g.ctx.upload_image(&noise(12, 4, 3)).expect("upload");
+        assert!(super::convert(&mut crate::context::Enc::new(&g.ctx), &yp, &src, [0.0; 3]).is_none());
+    }
+}
+
+#[cfg(test)]
+mod accel_tests {
+    use effectcraft_color::Label;
+    use effectcraft_project::{BitDepth, Comp, ItemKind};
+    use effectcraft_render::{Accelerator, Backend, RenderOpts, Renderer};
+    use effectcraft_time::{FrameRate, Tick};
+
+    use crate::tests::{Pattern, Scene, opts};
+
+    fn scene(w: u32, h: u32) -> Scene {
+        let mut s = Scene::new(BitDepth::Bpc8);
+        let comp = Comp::new(w, h, FrameRate::FPS_30, Tick::from_seconds_f64(2.0));
+        s.cid = s.p.add_item("Comp yuv", Label::Sandstone, None, ItemKind::Comp(comp.clone().into()));
+        s.comp = comp;
+        let l = s.footage(w + 7, h + 3);
+        s.push(l);
+        let sol = s.solid([0.9, 0.2, 0.4], w / 2, h / 3);
+        s.push(sol);
+        s
+    }
+
+    /// The accelerator's YUV frame is the export's CPU conversion of the very frame
+    /// `comp_frame` returns.
+    #[test]
+    fn comp_frame_yuv420_is_the_cpu_conversion_of_comp_frame() {
+        let Some(g) = crate::tests::gpu() else { return };
+        let s = scene(96, 60);
+        let mut r = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Gpu, ..opts() });
+        r.accel = Some(g);
+        let bg = [0.2, 0.3, 0.4];
+        let rgba = g.comp_frame(&r, s.cid, Tick::ZERO).expect("rgba frame");
+        let yuv = g.comp_frame_yuv420(&r, s.cid, Tick::ZERO, bg).expect("yuv frame");
+        super::tests::assert_parity(g, &yuv, &super::tests::cpu(&rgba, bg), 0.006, "comp frame");
+    }
+
+    #[test]
+    fn odd_sized_comps_fall_back_to_the_cpu() {
+        let Some(g) = crate::tests::gpu() else { return };
+        let s = scene(97, 61);
+        let mut r = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Gpu, ..opts() });
+        r.accel = Some(g);
+        assert!(g.comp_frame(&r, s.cid, Tick::ZERO).is_some());
+        assert!(g.comp_frame_yuv420(&r, s.cid, Tick::ZERO, [0.0; 3]).is_none());
+    }
+
+    #[test]
+    fn comp_frame_yuv420_falls_back_when_pipeline_init_failed() {
+        let Some(_) = crate::tests::gpu() else { return };
+        let g = crate::Gpu::try_headless().expect("headless Gpu");
+        let _ = g.ctx.yuv.set(Err("simulated yuv420 init failure".into()));
+        let s = scene(96, 60);
+        let mut r = Renderer::new(&s.p, &Pattern, RenderOpts { backend: Backend::Gpu, ..opts() });
+        r.accel = Some(&g);
+        assert!(g.comp_frame_yuv420(&r, s.cid, Tick::ZERO, [0.0; 3]).is_none());
+    }
+}
+
+#[cfg(test)]
+mod tie_tests {
+    use effectcraft_raster::Image;
+
+    fn lum(r: u8, g: u8, b: u8) -> f32 {
+        let (r, g, b) = (r as f32 / 255.0, g as f32 / 255.0, b as f32 / 255.0);
+        0.2126 * r + 0.7152 * g + 0.0722 * b
+    }
+
+    fn px(p: [u8; 3]) -> [f32; 4] {
+        [p[0] as f32 / 255.0, p[1] as f32 / 255.0, p[2] as f32 / 255.0, 1.0]
+    }
+
+    /// Opaque pixels whose Y (or whose 2×2 block's U or V) lands exactly on .5 in the CPU's f32
+    /// math: a kernel that rounds ties the other way moves most of them.
+    #[test]
+    fn rounding_ties_match_cpu() {
+        let mut ties: Vec<[u8; 3]> = vec![];
+        for r in 0..=255u8 {
+            for g in 0..=255u8 {
+                for b in 0..=255u8 {
+                    let x = 16.0 + 219.0 * lum(r, g, b);
+                    if x - x.floor() == 0.5 {
+                        ties.push([r, g, b]);
+                    }
+                }
+            }
+        }
+        assert!(!ties.is_empty());
+        let mut blocks: Vec<[[u8; 3]; 4]> = vec![];
+        let mut s = 12345u32;
+        let mut rnd = || {
+            s ^= s << 13;
+            s ^= s >> 17;
+            s ^= s << 5;
+            (s >> 24) as u8
+        };
+        // Bounded so the search stays quick in debug builds (a few hundred blocks).
+        for _ in 0..8_000_000 {
+            let blk = [[rnd(), rnd(), rnd()], [rnd(), rnd(), rnd()], [rnd(), rnd(), rnd()], [rnd(), rnd(), rnd()]];
+            let (mut a0, mut a1) = (0f32, 0f32);
+            for p in blk {
+                let l = lum(p[0], p[1], p[2]);
+                a0 += (p[2] as f32 / 255.0 - l) / 1.8556;
+                a1 += (p[0] as f32 / 255.0 - l) / 1.5748;
+            }
+            let u = 128.0 + 224.0 * a0 / 4.0;
+            let v = 128.0 + 224.0 * a1 / 4.0;
+            if u - u.floor() == 0.5 || v - v.floor() == 0.5 {
+                blocks.push(blk);
+            }
+        }
+        eprintln!("Y tie pixels: {}, chroma tie blocks: {}", ties.len(), blocks.len());
+        assert!(!blocks.is_empty());
+        let Some(g) = crate::tests::gpu() else { return };
+        let yp = super::YuvPipe::new(&g.ctx.device).expect("yuv420 pipe");
+        let w = 1024usize;
+        let h = (ties.len().div_ceil(w) + 1) & !1;
+        let mut img = Image::new(w as u32, h as u32);
+        for (i, p) in img.data.iter_mut().enumerate() {
+            *p = px(ties[i % ties.len()]);
+        }
+        let src = g.ctx.upload_image(&img).expect("upload");
+        let got = super::convert(&mut crate::context::Enc::new(&g.ctx), &yp, &src, [0.0; 3]).expect("readback");
+        super::tests::assert_parity(g, &got, &super::tests::cpu(&img, [0.0; 3]), 0.02, "Y ties");
+        let cw = 512usize;
+        let rows = blocks.len().div_ceil(cw);
+        let mut img = Image::new((cw * 2) as u32, (rows * 2) as u32);
+        for cy in 0..rows {
+            for cx in 0..cw {
+                let b = blocks[(cy * cw + cx) % blocks.len()];
+                for (k, p) in b.iter().enumerate() {
+                    let (x, y) = (cx * 2 + k % 2, cy * 2 + k / 2);
+                    img.data[y * cw * 2 + x] = px(*p);
+                }
+            }
+        }
+        let src = g.ctx.upload_image(&img).expect("upload");
+        let got = super::convert(&mut crate::context::Enc::new(&g.ctx), &yp, &src, [0.0; 3]).expect("readback");
+        super::tests::assert_parity(g, &got, &super::tests::cpu(&img, [0.0; 3]), 0.06, "chroma ties");
+    }
+}
diff --git a/crates/hevcenc/src/deblock.rs b/crates/hevcenc/src/deblock.rs
index 6f5d17b87..6d326e5d4 100644
--- a/crates/hevcenc/src/deblock.rs
+++ b/crates/hevcenc/src/deblock.rs
@@ -78,7 +78,6 @@ pub fn deblock(planes: &mut [Vec<u16>; 3], blk: &[Blk], w: usize, h: usize, qp:
 
 /// Filter one 4-sample luma edge segment. `o` = offset of q0 of the first line, `step` = distance
 /// between samples across the edge, `along` = distance between lines.
-#[allow(clippy::too_many_arguments)]
 fn filter_luma(s: &mut [u16], o: usize, step: usize, along: usize, tc: i32, beta: i32, bd: u32) {
     let px = |s: &[u16], k: usize, i: usize| s[o + k * along - (i + 1) * step] as i32;
     let qx = |s: &[u16], k: usize, i: usize| s[o + k * along + i * step] as i32;
diff --git a/crates/hevcenc/src/frame.rs b/crates/hevcenc/src/frame.rs
index 760bea2b0..ee141e3e7 100644
--- a/crates/hevcenc/src/frame.rs
+++ b/crates/hevcenc/src/frame.rs
@@ -7,7 +7,10 @@ use crate::inter::{self, PlaneRef};
 use crate::intra::{self, Refs};
 use crate::me::MeRef;
 use crate::params::{LOG2_CTB, LOG2_MAX_TB, LOG2_MIN_CB, MAX_MERGE_CAND};
-use crate::tables::*;
+use crate::tables::{
+    ABS_MVD_GT0, ABS_MVD_GT1, CBF_CHROMA, CBF_LUMA, CODED_SUB_BLOCK, CTX_IDX_MAP, CU_SKIP, GT1, GT2, INTRA_CHROMA, LAST_X_PREFIX, LAST_Y_PREFIX, MERGE_FLAG,
+    MERGE_IDX, MVP_FLAG, PART_MODE, PRED_MODE, PREV_INTRA_LUMA, RQT_ROOT_CBF, SCAN_4, SIG_COEFF, SPLIT_CU, qpc_420, scan_order,
+};
 use crate::transform;
 
 pub const F_INTRA: u8 = 1;
@@ -73,6 +76,40 @@ pub enum SliceKind {
     P,
 }
 
+/// Picture geometry and slice coding parameters shared by the CTU encoder.
+pub struct FrameConfig {
+    pub bit_depth: u32,
+    pub width: usize,
+    pub height: usize,
+    pub kind: SliceKind,
+    pub slice_qp: i32,
+}
+
+/// A square node in the coding or transform quadtree.
+#[derive(Clone, Copy)]
+struct TreeNode {
+    x: usize,
+    y: usize,
+    log2: u32,
+    depth: u32,
+}
+
+impl TreeNode {
+    fn children(self) -> impl Iterator<Item = Self> {
+        let h = 1usize << (self.log2 - 1);
+        [(0, 0), (h, 0), (0, h), (h, h)].into_iter().map(move |(dx, dy)| Self { x: self.x + dx, y: self.y + dy, log2: self.log2 - 1, depth: self.depth + 1 })
+    }
+}
+
+/// Transform syntax inherited from the parent node and the enclosing CU.
+#[derive(Clone, Copy)]
+struct TransformState {
+    blk_idx: u32,
+    parent: [bool; 2],
+    intra: bool,
+    nxn: bool,
+}
+
 pub struct FrameCoder<'a> {
     pub bd: u32,
     pub w: usize,
@@ -114,17 +151,8 @@ fn morton(x: u32, y: u32) -> u32 {
 const COARSE_MODES: [u32; 11] = [0, 1, 2, 6, 10, 14, 18, 22, 26, 30, 34];
 
 impl<'a> FrameCoder<'a> {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        bd: u32,
-        w: usize,
-        h: usize,
-        kind: SliceKind,
-        slice_qp: i32,
-        src: &'a [Vec<u16>; 3],
-        refp: Option<&'a [Vec<u16>; 3]>,
-        me: Option<&'a MeRef>,
-    ) -> Self {
+    pub fn new(config: FrameConfig, src: &'a [Vec<u16>; 3], refp: Option<&'a [Vec<u16>; 3]>, me: Option<&'a MeRef>) -> Self {
+        let FrameConfig { bit_depth: bd, width: w, height: h, kind, slice_qp } = config;
         let off = 6 * (bd as i32 - 8);
         let qpi = slice_qp.clamp(-off, 57);
         let qp_c = qpc_420(qpi) + off;
@@ -256,7 +284,7 @@ impl<'a> FrameCoder<'a> {
             let mut decs = Vec::with_capacity(64);
             self.decide(x, y, LOG2_CTB, 0, &mut est, &mut decs);
             let mut idx = 0;
-            self.write_cq(enc, x, y, LOG2_CTB, 0, &decs, &mut idx);
+            self.write_cq(enc, TreeNode { x, y, log2: LOG2_CTB, depth: 0 }, &decs, &mut idx);
             debug_assert_eq!(idx, decs.len());
             debug_assert_eq!(est.ctx, enc.ctx);
             enc.terminate((i + 1 == total) as u32); // end_of_slice_segment_flag
@@ -276,7 +304,8 @@ impl<'a> FrameCoder<'a> {
     }
 
     /// Final pass: re-code the decided quadtree with the real arithmetic coder.
-    fn write_cq(&mut self, enc: &mut CabacEncoder, x: usize, y: usize, log2: u32, depth: u32, decs: &[CuDec], idx: &mut usize) {
+    fn write_cq(&mut self, enc: &mut CabacEncoder, node: TreeNode, decs: &[CuDec], idx: &mut usize) {
+        let TreeNode { x, y, log2, depth } = node;
         if x >= self.w || y >= self.h {
             return;
         }
@@ -294,9 +323,8 @@ impl<'a> FrameCoder<'a> {
             let (eff, _) = self.encode_cu(enc, x, y, log2, depth, d.mode);
             debug_assert_eq!(eff, d.mode);
         } else {
-            let h = n / 2;
-            for (dx, dy) in [(0, 0), (h, 0), (0, h), (h, h)] {
-                self.write_cq(enc, x + dx, y + dy, log2 - 1, depth + 1, decs, idx);
+            for child in node.children() {
+                self.write_cq(enc, child, decs, idx);
             }
         }
     }
@@ -447,7 +475,7 @@ impl<'a> FrameCoder<'a> {
                 self.write_intra_modes(s, x, y, n, nxn, &modes);
                 s.decision(INTRA_CHROMA, 0); // intra_chroma_pred_mode 4 (DM)
                 let mut ti = 0;
-                self.write_tt(s, x, y, x, y, log2, 0, 0, [true, true], true, nxn, &mut ti);
+                self.write_tt(s, TreeNode { x, y, log2, depth: 0 }, TransformState { blk_idx: 0, parent: [true, true], intra: true, nxn }, &mut ti);
                 (mode, self.cu_dist(x, y, n))
             }
             _ => {
@@ -490,7 +518,12 @@ impl<'a> FrameCoder<'a> {
                         s.decision(MERGE_FLAG, 1);
                         write_merge_idx(s, idx as usize);
                         let mut ti = 0;
-                        self.write_tt(s, x, y, x, y, log2, 0, 0, [true, true], false, false, &mut ti);
+                        self.write_tt(
+                            s,
+                            TreeNode { x, y, log2, depth: 0 },
+                            TransformState { blk_idx: 0, parent: [true, true], intra: false, nxn: false },
+                            &mut ti,
+                        );
                     }
                     CuMode::Amvp { mv, mvp } => {
                         s.decision(CU_SKIP + skip_ctx, 0);
@@ -503,7 +536,12 @@ impl<'a> FrameCoder<'a> {
                         s.decision(RQT_ROOT_CBF, root as u32);
                         if root {
                             let mut ti = 0;
-                            self.write_tt(s, x, y, x, y, log2, 0, 0, [true, true], false, false, &mut ti);
+                            self.write_tt(
+                                s,
+                                TreeNode { x, y, log2, depth: 0 },
+                                TransformState { blk_idx: 0, parent: [true, true], intra: false, nxn: false },
+                                &mut ti,
+                            );
                         }
                     }
                     // Handled by the arm above.
@@ -715,22 +753,9 @@ impl<'a> FrameCoder<'a> {
 
     /// transform_tree() (7.3.8.8) over the coded transform blocks of the CU; no split flag is ever
     /// coded (max_transform_hierarchy_depth_* = 0), splits are inferred.
-    #[allow(clippy::too_many_arguments)]
-    fn write_tt<S: Sink>(
-        &self,
-        s: &mut S,
-        x0: usize,
-        y0: usize,
-        xb: usize,
-        yb: usize,
-        log2: u32,
-        depth: u32,
-        blk_idx: u32,
-        parent: [bool; 2],
-        intra: bool,
-        nxn: bool,
-        ti: &mut usize,
-    ) {
+    fn write_tt<S: Sink>(&self, s: &mut S, node: TreeNode, state: TransformState, ti: &mut usize) {
+        let TreeNode { x: x0, y: y0, log2, depth } = node;
+        let TransformState { blk_idx, parent, intra, nxn } = state;
         let n = 1usize << log2;
         let split = log2 > LOG2_MAX_TB || (nxn && depth == 0);
         let mut cbf_c = [false; 2];
@@ -745,13 +770,11 @@ impl<'a> FrameCoder<'a> {
             cbf_c = parent;
         }
         if split {
-            let h = n / 2;
-            for (i, (dx, dy)) in [(0, 0), (h, 0), (0, h), (h, h)].into_iter().enumerate() {
-                self.write_tt(s, x0 + dx, y0 + dy, x0, y0, log2 - 1, depth + 1, i as u32, cbf_c, intra, nxn, ti);
+            for (i, child) in node.children().enumerate() {
+                self.write_tt(s, child, TransformState { blk_idx: i as u32, parent: cbf_c, ..state }, ti);
             }
             return;
         }
-        let _ = (xb, yb);
         let tb = self.tbs[*ti];
         *ti += 1;
         debug_assert_eq!(tb.c, 0);
@@ -874,9 +897,9 @@ impl<'a> FrameCoder<'a> {
             let (px, py, pn, pw, ph) = if c == 0 { (x, y, n, self.w, self.h) } else { (x / 2, y / 2, n / 2, self.cw, self.ch) };
             let pr = PlaneRef { data: &refp[c], w: pw, h: ph };
             if c == 0 {
-                inter::mc_luma(pr, self.bd, px as i32, py as i32, mv, pn, pn, &mut self.pred);
+                inter::mc_luma(pr, self.bd, px as i32, py as i32, mv, (pn, pn), &mut self.pred);
             } else {
-                inter::mc_chroma(pr, self.bd, px as i32, py as i32, mv, pn, pn, &mut self.pred);
+                inter::mc_chroma(pr, self.bd, px as i32, py as i32, mv, (pn, pn), &mut self.pred);
             }
             inter::put_uni(&self.pred, pn, pn, self.bd, &mut self.rec[c][py * pw + px..], pw);
         }
@@ -1153,8 +1176,119 @@ fn last_prefix(v: u32) -> (u32, u32, u32) {
     }
 }
 
+/// Context increment for significant_coeff_flag (H.265 9.3.4.2).
+fn significance_context(group: (usize, usize), pos: (usize, usize), log2: u32, prev_csbf: u8, c: usize, scan_idx: usize) -> usize {
+    let (xs, ys) = group;
+    let (xp, yp) = pos;
+    let (xc, yc) = (xs * 4 + xp, ys * 4 + yp);
+    if log2 == 2 {
+        CTX_IDX_MAP[(yc << 2) + xc] as usize
+    } else if xc + yc == 0 {
+        0
+    } else {
+        let mut sc = match prev_csbf {
+            0 => {
+                if xp + yp == 0 {
+                    2
+                } else if xp + yp < 3 {
+                    1
+                } else {
+                    0
+                }
+            }
+            1 => {
+                if yp == 0 {
+                    2
+                } else if yp == 1 {
+                    1
+                } else {
+                    0
+                }
+            }
+            2 => {
+                if xp == 0 {
+                    2
+                } else if xp == 1 {
+                    1
+                } else {
+                    0
+                }
+            }
+            _ => 2,
+        };
+        if c == 0 {
+            if xs + ys > 0 {
+                sc += 3;
+            }
+            sc += if log2 == 3 { if scan_idx == 0 { 9 } else { 15 } } else { 21 };
+        } else {
+            sc += if log2 == 3 { 9 } else { 12 };
+        }
+        sc
+    }
+}
+
+/// Absolute levels, signs and Rice remainders for one significant coefficient group.
+fn write_coefficient_levels<S: Sink>(s: &mut S, sig: &[u8], at: impl Fn(usize) -> i32, i: usize, c: usize, prev_g1: &mut Option<u32>) {
+    let nsig = sig.len();
+    let abs_at = |k: usize| at(sig[k] as usize).unsigned_abs();
+    let mut ctx_set = if i == 0 || c > 0 { 0 } else { 2 };
+    if *prev_g1 == Some(0) {
+        ctx_set += 1;
+    }
+    let mut g1ctx = 1u32;
+    let mut gt1 = [0u8; 16];
+    let mut first_g1: Option<usize> = None;
+    let c_off_g1 = if c > 0 { 16 } else { 0 };
+    for k in 0..nsig.min(8) {
+        let f = abs_at(k) > 1;
+        s.decision(GT1 + ctx_set * 4 + g1ctx.min(3) as usize + c_off_g1, f as u32);
+        gt1[k] = f as u8;
+        if f {
+            g1ctx = 0;
+            if first_g1.is_none() {
+                first_g1 = Some(k);
+            }
+        } else if g1ctx > 0 {
+            g1ctx += 1;
+        }
+    }
+    *prev_g1 = Some(g1ctx);
+    let mut gt2 = 0u32;
+    if let Some(k) = first_g1 {
+        gt2 = (abs_at(k) > 2) as u32;
+        s.decision(GT2 + ctx_set + if c > 0 { 4 } else { 0 }, gt2);
+    }
+    // sign data hiding: the sign of the first coefficient in scan order (sig[nsig - 1]) is
+    // inferred from the parity of the sum of absolute levels
+    let hidden = sig[0] as i32 - sig[nsig - 1] as i32 > 3;
+    let nsigns = if hidden { nsig - 1 } else { nsig };
+    for k in 0..nsigns {
+        s.bypass((at(sig[k] as usize) < 0) as u32);
+    }
+    if hidden {
+        let sum: u32 = (0..nsig).map(abs_at).sum();
+        debug_assert_eq!(at(sig[nsig - 1] as usize) < 0, sum & 1 == 1, "sign hiding parity");
+    }
+    let mut rice = 0u32;
+    for k in 0..nsig {
+        let mut base = 1 + gt1[k] as u32;
+        if Some(k) == first_g1 {
+            base += gt2;
+        }
+        let thresh = if k < 8 { if Some(k) == first_g1 { 3 } else { 2 } } else { 1 };
+        if base == thresh {
+            let level = abs_at(k);
+            write_remaining(s, level - base, rice);
+            if level > 3 * (1 << rice) {
+                rice = (rice + 1).min(4);
+            }
+        }
+    }
+}
+
 /// residual_coding() (7.3.8.11) of one transform block of levels (row-major, n x n). No transform
-/// skip, no sign data hiding.
+/// skip; signs use sign data hiding where the coefficient span permits it.
 fn residual_coding<S: Sink>(s: &mut S, lv: &[i32], log2: u32, c: usize, scan_idx: usize) {
     let n = 1usize << log2;
     let log2sb = log2 - 2;
@@ -1233,51 +1367,7 @@ fn residual_coding<S: Sink>(s: &mut S, lv: &[i32], log2: u32, c: usize, scan_idx
             let (xc, yc) = (xs * 4 + xp, ys * 4 + yp);
             let v = lv[yc * n + xc] != 0;
             if np > 0 || !infer_dc {
-                let sig_ctx = if log2 == 2 {
-                    CTX_IDX_MAP[(yc << 2) + xc] as usize
-                } else if xc + yc == 0 {
-                    0
-                } else {
-                    let mut sc = match prev_csbf {
-                        0 => {
-                            if xp + yp == 0 {
-                                2
-                            } else if xp + yp < 3 {
-                                1
-                            } else {
-                                0
-                            }
-                        }
-                        1 => {
-                            if yp == 0 {
-                                2
-                            } else if yp == 1 {
-                                1
-                            } else {
-                                0
-                            }
-                        }
-                        2 => {
-                            if xp == 0 {
-                                2
-                            } else if xp == 1 {
-                                1
-                            } else {
-                                0
-                            }
-                        }
-                        _ => 2,
-                    };
-                    if c == 0 {
-                        if xs + ys > 0 {
-                            sc += 3;
-                        }
-                        sc += if log2 == 3 { if scan_idx == 0 { 9 } else { 15 } } else { 21 };
-                    } else {
-                        sc += if log2 == 3 { 9 } else { 12 };
-                    }
-                    sc
-                };
+                let sig_ctx = significance_context((xs, ys), (xp, yp), log2, prev_csbf, c, scan_idx);
                 s.decision(SIG_COEFF + c_off_sig + sig_ctx, v as u32);
                 if v {
                     sig[nsig] = p as u8;
@@ -1294,60 +1384,7 @@ fn residual_coding<S: Sink>(s: &mut S, lv: &[i32], log2: u32, c: usize, scan_idx
         if nsig == 0 {
             continue;
         }
-        let abs_at = |k: usize| at(xs, ys, sig[k] as usize).unsigned_abs();
-        let mut ctx_set = if i == 0 || c > 0 { 0 } else { 2 };
-        if prev_g1 == Some(0) {
-            ctx_set += 1;
-        }
-        let mut g1ctx = 1u32;
-        let mut gt1 = [0u8; 16];
-        let mut first_g1: Option<usize> = None;
-        let c_off_g1 = if c > 0 { 16 } else { 0 };
-        for k in 0..nsig.min(8) {
-            let f = abs_at(k) > 1;
-            s.decision(GT1 + ctx_set * 4 + g1ctx.min(3) as usize + c_off_g1, f as u32);
-            gt1[k] = f as u8;
-            if f {
-                g1ctx = 0;
-                if first_g1.is_none() {
-                    first_g1 = Some(k);
-                }
-            } else if g1ctx > 0 {
-                g1ctx += 1;
-            }
-        }
-        prev_g1 = Some(g1ctx);
-        let mut gt2 = 0u32;
-        if let Some(k) = first_g1 {
-            gt2 = (abs_at(k) > 2) as u32;
-            s.decision(GT2 + ctx_set + if c > 0 { 4 } else { 0 }, gt2);
-        }
-        // sign data hiding: the sign of the first coefficient in scan order (sig[nsig - 1]) is
-        // inferred from the parity of the sum of absolute levels
-        let hidden = sig[0] as i32 - sig[nsig - 1] as i32 > 3;
-        let nsigns = if hidden { nsig - 1 } else { nsig };
-        for k in 0..nsigns {
-            s.bypass((at(xs, ys, sig[k] as usize) < 0) as u32);
-        }
-        if hidden {
-            let sum: u32 = (0..nsig).map(abs_at).sum();
-            debug_assert_eq!(at(xs, ys, sig[nsig - 1] as usize) < 0, sum & 1 == 1, "sign hiding parity");
-        }
-        let mut rice = 0u32;
-        for k in 0..nsig {
-            let mut base = 1 + gt1[k] as u32;
-            if Some(k) == first_g1 {
-                base += gt2;
-            }
-            let thresh = if k < 8 { if Some(k) == first_g1 { 3 } else { 2 } } else { 1 };
-            if base == thresh {
-                let level = abs_at(k);
-                write_remaining(s, level - base, rice);
-                if level > 3 * (1 << rice) {
-                    rice = (rice + 1).min(4);
-                }
-            }
-        }
+        write_coefficient_levels(s, &sig[..nsig], |p| at(xs, ys, p), i, c, &mut prev_g1);
     }
 }
 
diff --git a/crates/hevcenc/src/inter.rs b/crates/hevcenc/src/inter.rs
index e363871b5..03bf50ffb 100644
--- a/crates/hevcenc/src/inter.rs
+++ b/crates/hevcenc/src/inter.rs
@@ -35,7 +35,8 @@ impl PlaneRef<'_> {
 
 /// Luma prediction samples (14-bit intermediate) of a w x h block at (x, y) displaced by the
 /// quarter-sample vector `mv`, into `out` (stride w).
-pub fn mc_luma(f: PlaneRef, bd: u32, x: i32, y: i32, mv: [i16; 2], w: usize, h: usize, out: &mut [i16]) {
+pub fn mc_luma(f: PlaneRef, bd: u32, x: i32, y: i32, mv: [i16; 2], size: (usize, usize), out: &mut [i16]) {
+    let (w, h) = size;
     let (fx, fy) = ((mv[0] & 3) as usize, (mv[1] & 3) as usize);
     let xi = x + (mv[0] as i32 >> 2);
     let yi = y + (mv[1] as i32 >> 2);
@@ -89,7 +90,8 @@ pub fn mc_luma(f: PlaneRef, bd: u32, x: i32, y: i32, mv: [i16; 2], w: usize, h:
 }
 
 /// Chroma prediction samples of a w x h block at chroma position (x, y) with a 1/8-sample vector.
-pub fn mc_chroma(f: PlaneRef, bd: u32, x: i32, y: i32, mv: [i16; 2], w: usize, h: usize, out: &mut [i16]) {
+pub fn mc_chroma(f: PlaneRef, bd: u32, x: i32, y: i32, mv: [i16; 2], size: (usize, usize), out: &mut [i16]) {
+    let (w, h) = size;
     let (fx, fy) = ((mv[0] & 7) as usize, (mv[1] & 7) as usize);
     let xi = x + (mv[0] as i32 >> 3);
     let yi = y + (mv[1] as i32 >> 3);
diff --git a/crates/hevcenc/src/lib.rs b/crates/hevcenc/src/lib.rs
index b2e86b6a1..4d38f84d9 100644
--- a/crates/hevcenc/src/lib.rs
+++ b/crates/hevcenc/src/lib.rs
@@ -15,8 +15,6 @@
 //! ```
 
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
-// Index loops over fixed-size blocks read more clearly than iterator chains in codec code.
-#![allow(clippy::needless_range_loop, clippy::too_many_arguments)]
 
 mod bitstream;
 mod cabac;
@@ -311,7 +309,7 @@ impl Encoder {
         let kind = if idr { SliceKind::I } else { SliceKind::P };
         let me = if idr { None } else { self.reference.as_ref().map(|r| me::MeRef::new(&r[0], w, h, bd)) };
         let refp = if idr { None } else { self.reference.as_ref() };
-        let mut fc = FrameCoder::new(bd, w, h, kind, qp, &src, refp, me.as_ref());
+        let mut fc = FrameCoder::new(frame::FrameConfig { bit_depth: bd, width: w, height: h, kind, slice_qp: qp }, &src, refp, me.as_ref());
 
         // slice_segment_header() (7.3.6.1)
         let mut bw = BitWriter::new();
diff --git a/crates/host/src/lib.rs b/crates/host/src/lib.rs
index bdb4e2bc3..08e1616a7 100644
--- a/crates/host/src/lib.rs
+++ b/crates/host/src/lib.rs
@@ -82,7 +82,7 @@ impl Exporter for FileExporter {
 
 /// A new session with media, import, expressions, scripting and export enabled.
 pub fn session() -> Session {
-    Session {
+    let mut s = Session {
         // The desktop app, the CLI and the MCP server share installed Roto Brush models.
         models_dir: config_dir().map(|d| d.join("models")),
         exporter: Some(Arc::new(FileExporter::default())),
@@ -90,11 +90,11 @@ pub fn session() -> Session {
         importer: Some(Arc::new(MediaImporter)),
         expr: Some(Arc::new(effectcraft_expr::Expressions)),
         expr_check: Some(effectcraft_expr::check_syntax),
-        script: Some(effectcraft_script::runner),
-        script_ui: effectcraft_engine::scriptui::ScriptUi { dispatch: Some(effectcraft_script::dispatch_ui), ..Default::default() },
         plugin_loader: effectcraft_plugin::wasm_available().then_some(effectcraft_plugin::loader as effectcraft_engine::PluginLoader),
         ..Default::default()
-    }
+    };
+    effectcraft_script::install(&mut s);
+    s
 }
 
 /// The platform config directory for EffectCraft (`EFFECTCRAFT_CONFIG_DIR` overrides):
@@ -106,538 +106,4 @@ pub fn config_dir() -> Option<std::path::PathBuf> {
 }
 
 #[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    /// Layer ▸ Camera ▸ Link Focus Distance to Point of Interest / to Layer: the expressions
-    /// evaluate to the camera's focus on the target.
-    #[test]
-    fn focus_link_expressions_track_the_target() {
-        use effectcraft_engine::geom::vec3;
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "F", "width": 400, "height": 300, "duration": 2})).unwrap();
-        let t = s.execute("layer.newSolid", json!({"color": "#ffffff", "width": 50, "height": 50})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("layer.setSwitch", json!({"layers": [t], "switch": "threeD", "value": true})).unwrap();
-        s.execute("layer.setTransform", json!({"layer": t, "prop": "position", "value": [260, 120, 400]})).unwrap();
-        let cam = s.execute("layer.newCamera", json!({})).unwrap()["layer"].as_u64().unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let focus = |s: &effectcraft_engine::Session| {
-            let comp = s.project.comp(cid).unwrap();
-            let mut ctx = effectcraft_engine::render::EvalCtx::new(&s.project, cid, comp, s.time());
-            ctx.expr = s.expr.as_deref();
-            let l = comp.layer(effectcraft_engine::project::LayerId(cam)).unwrap();
-            ctx.value(l, l.props.prop("cameraOptions/focusDistance").unwrap()).as_f64()
-        };
-        let depth = |s: &effectcraft_engine::Session| {
-            let comp = s.project.comp(cid).unwrap();
-            let ctx = effectcraft_engine::render::EvalCtx::new(&s.project, cid, comp, s.time());
-            let c = comp.layer(effectcraft_engine::project::LayerId(cam)).unwrap();
-            let tl = comp.layer(effectcraft_engine::project::LayerId(t)).unwrap();
-            let cs = effectcraft_engine::render::three_d::camera::layer_camera(&ctx, c);
-            cs.depth(ctx.world_matrix(tl).apply(vec3(25.0, 25.0, 0.0)))
-        };
-        s.execute("layer.select", json!({"layers": [cam, t]})).unwrap();
-        let set = s.execute("camera.setFocusToLayer", json!({})).unwrap()["focusDistance"].as_f64().unwrap();
-        assert!((set - depth(&s)).abs() < 1e-6 && (focus(&s) - set).abs() < 1e-6);
-        s.execute("camera.linkFocusToLayer", json!({})).unwrap();
-        // Move the target: the linked focus follows.
-        s.execute("layer.setTransform", json!({"layer": t, "prop": "position", "value": [200, 150, 900]})).unwrap();
-        assert!((focus(&s) - depth(&s)).abs() < 1e-3, "{} vs {}", focus(&s), depth(&s));
-        s.execute("camera.linkFocusToPoi", json!({"camera": cam})).unwrap();
-        let poi = {
-            let l = s.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(cam)).unwrap();
-            let p = l.props.prop("transform/position").unwrap().value.as_vec3();
-            let q = l.props.prop("transform/poi").unwrap().value.as_vec3();
-            ((p[0] - q[0]).powi(2) + (p[1] - q[1]).powi(2) + (p[2] - q[2]).powi(2)).sqrt()
-        };
-        assert!((focus(&s) - poi).abs() < 1e-6, "{} vs {poi}", focus(&s));
-    }
-
-    #[test]
-    fn wired_session_renders_demo_with_expressions() {
-        let mut s = super::session();
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let lid = s.active_comp().unwrap().layers[1].id.0;
-        s.execute("prop.setExpression", json!({"layer": lid, "path": "transform/rotation", "expression": "time * 90"})).unwrap();
-        let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts { scale: 0.25, ..Default::default() });
-        assert!(img.data.iter().any(|p| p[3] > 0.5));
-    }
-
-    /// File ▸ Import of glTF/GLB/OBJ models through the media layer, placed as model layers and
-    /// drawn by the Advanced 3D renderer.
-    #[test]
-    fn imported_models_render_in_advanced_3d() {
-        let fx = |n: &str| format!("{}/../model/tests/fixtures/{n}", env!("CARGO_MANIFEST_DIR"));
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "M", "width": 160, "height": 120, "renderer": "advanced3d"})).unwrap();
-        let r = s.execute("file.import", json!({"paths": [fx("cube.obj"), fx("quad.glb"), fx("quad.gltf")]})).unwrap();
-        assert_eq!(r["errors"], json!([]), "{r}");
-        let items: Vec<u64> = r["items"].as_array().unwrap().iter().map(|v| v.as_u64().unwrap()).collect();
-        assert_eq!(items.len(), 3);
-        let cube = s.execute("layer.addItem", json!({"item": items[0]})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("prop.set", json!({"layer": cube, "path": "transform/rotationY", "value": 30})).unwrap();
-        s.execute("prop.set", json!({"layer": cube, "path": "transform/rotationX", "value": 20})).unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let opts = effectcraft_engine::render::RenderOpts::default();
-        let img = s.render(cid, s.time(), opts);
-        let covered = img.data.iter().filter(|p| p[3] > 0.99).count();
-        assert!(covered > 1000, "the cube covers part of the frame: {covered}");
-        // Red faces (material Red) are visible.
-        assert!(img.data.iter().any(|p| p[3] > 0.99 && p[0] > 0.5 && p[1] < 0.2));
-        // The textured binary glTF quad.
-        for _ in 0..3 {
-            s.execute("edit.undo", json!({})).unwrap();
-        }
-        s.execute("layer.addItem", json!({"item": items[1]})).unwrap();
-        let img = s.render(cid, s.time(), opts);
-        assert!(img.data.iter().filter(|p| p[3] > 0.99).count() > 1000);
-        // Classic 3D doesn't draw models.
-        s.execute("comp.renderer", json!({"renderer": "classic3d"})).unwrap();
-        assert!(s.render(cid, s.time(), opts).data.iter().all(|p| p[3] == 0.0));
-    }
-
-    /// A binary glTF of a red cube 2 units wide (positions and indices only).
-    fn glb_cube() -> Vec<u8> {
-        let mut bin: Vec<u8> = (0..8u32).flat_map(|i| [i & 1, (i >> 1) & 1, (i >> 2) & 1].map(|b| b as f32 * 2.0 - 1.0)).flat_map(f32::to_le_bytes).collect();
-        let faces: [[u16; 4]; 6] = [[0, 2, 3, 1], [4, 5, 7, 6], [0, 1, 5, 4], [2, 6, 7, 3], [0, 4, 6, 2], [1, 3, 7, 5]];
-        bin.extend(faces.iter().flat_map(|f| [f[0], f[1], f[2], f[0], f[2], f[3]]).flat_map(u16::to_le_bytes));
-        let gltf = json!({
-            "asset": {"version": "2.0"},
-            "scene": 0,
-            "scenes": [{"nodes": [0]}],
-            "nodes": [{"mesh": 0}],
-            "meshes": [{"primitives": [{"attributes": {"POSITION": 0}, "indices": 1, "material": 0}]}],
-            "materials": [{"pbrMetallicRoughness": {"baseColorFactor": [1, 0, 0, 1], "metallicFactor": 0, "roughnessFactor": 1}}],
-            "buffers": [{"byteLength": bin.len()}],
-            "bufferViews": [{"buffer": 0, "byteOffset": 0, "byteLength": 96}, {"buffer": 0, "byteOffset": 96, "byteLength": 72}],
-            "accessors": [
-                {"bufferView": 0, "componentType": 5126, "count": 8, "type": "VEC3", "min": [-1, -1, -1], "max": [1, 1, 1]},
-                {"bufferView": 1, "componentType": 5123, "count": 36, "type": "SCALAR"}
-            ]
-        });
-        let mut text = gltf.to_string().into_bytes();
-        text.resize(text.len().div_ceil(4) * 4, b' ');
-        let chunk = |kind: &[u8; 4], data: &[u8]| [&(data.len() as u32).to_le_bytes()[..], kind, data].concat();
-        let body = [chunk(b"JSON", &text), chunk(b"BIN\0", &bin)].concat();
-        [&b"glTF"[..], &2u32.to_le_bytes(), &(12 + body.len() as u32).to_le_bytes(), &body].concat()
-    }
-
-    /// #264: a model imported into a new composition (Classic 3D by default) was invisible on
-    /// every renderer, because only Advanced 3D draws models. Adding it now switches the comp,
-    /// and the software renderer (no GPU, as on the reporter's Intel HD Graphics 5500) draws it.
-    #[test]
-    fn imported_glb_shows_in_a_new_composition() {
-        let path = std::env::temp_dir().join(format!("effectcraft-264-cube-{}.glb", std::process::id()));
-        std::fs::write(&path, glb_cube()).unwrap();
-        let mut s = super::session();
-        assert!(s.accel.is_none(), "renders in software");
-        let r = s.execute("file.import", json!({"paths": [path.to_string_lossy()]})).unwrap();
-        assert_eq!(r["errors"], json!([]), "{r}");
-        s.state.project_selection = vec![effectcraft_project::ItemId(r["items"][0].as_u64().unwrap())];
-        s.execute("file.newCompFromSelection", json!({})).unwrap();
-        let comp = s.active_comp().unwrap();
-        assert_eq!(comp.renderer, effectcraft_project::Renderer::Advanced3D);
-        let layer = comp.layers[0].id.0;
-        s.execute("prop.set", json!({"layer": layer, "path": "transform/rotationY", "value": 30})).unwrap();
-        s.execute("prop.set", json!({"layer": layer, "path": "transform/rotationX", "value": 20})).unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts { scale: 0.25, ..Default::default() });
-        let red = img.data.iter().filter(|p| p[3] > 0.99 && p[0] > 0.2 && p[1] < 0.05 && p[2] < 0.05).count();
-        let _ = std::fs::remove_file(&path);
-        // Half the comp height wide, seen at an angle: well over 5% of the frame.
-        assert!(red * 20 > img.data.len(), "red cube pixels: {red} of {}", img.data.len());
-    }
-
-    /// #651: an animated GIF imported from disk plays: the layer shows each frame at its time,
-    /// in the viewer's renders and in exports alike.
-    #[test]
-    fn an_imported_animated_gif_plays() {
-        let dir = std::env::temp_dir().join(format!("ec-gif-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("anim.gif");
-        let mut bytes = Vec::new();
-        {
-            let mut enc = gif::Encoder::new(&mut bytes, 4, 4, &[]).unwrap();
-            for rgb in [[255u8, 0, 0], [0, 255, 0], [0, 0, 255]] {
-                let mut f = gif::Frame::from_rgb(4, 4, &rgb.repeat(16));
-                f.delay = 10;
-                enc.write_frame(&f).unwrap();
-            }
-        }
-        std::fs::write(&path, bytes).unwrap();
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "G", "width": 4, "height": 4, "frameRate": 30, "duration": 1})).unwrap();
-        s.execute("file.import", json!({"paths": [path.to_string_lossy()], "addToComp": true})).unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let rgb = |t: f64| {
-            let img = s.render(cid, effectcraft_time::Tick::from_seconds_f64(t), effectcraft_engine::render::RenderOpts::default());
-            let p = img.data[5];
-            [p[0].round(), p[1].round(), p[2].round()]
-        };
-        assert_eq!(rgb(0.05), [1.0, 0.0, 0.0]);
-        assert_eq!(rgb(0.15), [0.0, 1.0, 0.0]);
-        assert_eq!(rgb(0.25), [0.0, 0.0, 1.0]);
-        let _ = std::fs::remove_dir_all(dir);
-    }
-
-    /// The web app's path: outputs go to a sink (downloads), never to the file system.
-    #[test]
-    fn render_queue_exports_to_a_sink() {
-        use std::sync::{Arc, Mutex};
-        let got: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::default();
-        let g = got.clone();
-        let mut s = super::session();
-        s.exporter = Some(Arc::new(super::FileExporter { sink: Some(Arc::new(move |p: &str, d: Vec<u8>| g.lock().unwrap().push((p.to_string(), d)))) }));
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        // Rooted without a drive letter is not absolute on Windows, where the engine joins it to the home drive.
-        let dir = if cfg!(windows) { "C:/no-such-dir-effectcraft-sink-test" } else { "/no-such-dir-effectcraft-sink-test" };
-        s.execute(
-            "renderQueue.add",
-            json!({"format": "gif", "output": format!("{dir}/a.gif"), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.2}),
-        )
-        .unwrap();
-        s.execute(
-            "renderQueue.add",
-            json!({"format": "png", "output": format!("{dir}/seq_[##].png"), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.1}),
-        )
-        .unwrap();
-        s.execute("renderQueue.render", json!({"wait": true})).unwrap();
-        s.poll_render();
-        let mut got = got.lock().unwrap().clone();
-        got.sort_by(|a, b| a.0.cmp(&b.0));
-        let names: Vec<std::path::PathBuf> = got.iter().map(|(p, _)| std::path::PathBuf::from(p)).collect();
-        let expected = [format!("{dir}/a.gif"), format!("{dir}/seq_00.png"), format!("{dir}/seq_01.png"), format!("{dir}/seq_02.png")]
-            .map(|p| std::path::absolute(p).unwrap());
-        assert_eq!(names, expected);
-        assert!(got[0].1.starts_with(b"GIF89a"));
-        assert!(got[1].1.starts_with(b"\x89PNG"));
-        assert!(!std::path::Path::new(dir).exists());
-    }
-
-    #[test]
-    fn render_queue_exports_demo_comp() {
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-rq");
-        let _ = std::fs::remove_dir_all(&dir);
-        let mut s = super::session();
-        s.execute("file.openDemoProject", json!({})).unwrap();
-        let out = dir.join("[compName]_[width]x[height].[fileExtension]");
-        let r = s
-            .execute(
-                "renderQueue.add",
-                json!({"format": "h264", "output": out.to_string_lossy(), "resolution": 0.125, "timeSpan": "custom", "start": 0.0, "end": 0.4}),
-            )
-            .unwrap();
-        let path = r["outputPath"].as_str().unwrap().to_string();
-        assert!(path.ends_with("_240x134.mp4"), "{path}");
-        // A second item: PNG sequence, rendered in the background.
-        s.execute("renderQueue.add", json!({"format": "png", "output": dir.join("seq_[###].png").to_string_lossy(), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.2})).unwrap();
-        let r = s.execute("renderQueue.render", json!({"wait": false})).unwrap();
-        assert_eq!(r["items"].as_array().unwrap().len(), 2);
-        let t0 = std::time::Instant::now();
-        while s.is_rendering() {
-            assert!(t0.elapsed().as_secs() < 300, "render timed out");
-            std::thread::sleep(std::time::Duration::from_millis(20));
-            s.poll_render();
-        }
-        s.poll_render();
-        let list = s.execute("renderQueue.list", json!({})).unwrap();
-        for it in list["items"].as_array().unwrap() {
-            assert_eq!(it["statusLabel"], "Done", "{it}");
-            assert!(it["render_time"].as_f64().is_some());
-            assert!(std::path::Path::new(it["last_output"].as_str().unwrap()).exists(), "{it}");
-        }
-        assert!(std::path::Path::new(&path).metadata().unwrap().len() > 500);
-        assert!(dir.join("seq_000.png").exists() && dir.join("seq_005.png").exists() && !dir.join("seq_006.png").exists());
-        // Rendering again needs a re-queue.
-        assert!(s.execute("renderQueue.render", json!({})).is_err());
-        s.execute("renderQueue.setRender", json!({"index": 1, "render": true})).unwrap();
-        assert_eq!(s.project.render_queue[0].status, effectcraft_engine::project::render_queue::RenderStatus::Queued);
-    }
-
-    /// Value of a property of layer `l` at time 0 (keys + expression).
-    fn value(s: &effectcraft_engine::Session, l: u64, path: &str) -> effectcraft_engine::keyframe::Value {
-        let cid = s.active_comp_id().unwrap();
-        let comp = s.project.comp(cid).unwrap();
-        let layer = comp.layer(effectcraft_engine::project::LayerId(l)).unwrap();
-        let ctx =
-            effectcraft_engine::render::EvalCtx { project: &s.project, comp_id: cid, comp, time: Default::default(), expr: s.expr.as_deref(), footage: None };
-        ctx.value(layer, layer.props.prop(path).unwrap())
-    }
-
-    #[test]
-    fn pick_whip_expressions_evaluate() {
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "C", "width": 200, "height": 200, "frameRate": 30, "duration": 2})).unwrap();
-        let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
-        let b = s.execute("layer.newSolid", json!({"name": "Src", "color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("prop.set", json!({"layer": b, "path": "transform/rotation", "value": 33})).unwrap();
-        s.execute("prop.set", json!({"layer": b, "path": "transform/position", "value": [12, 34]})).unwrap();
-        s.execute("effect.apply", json!({"layer": b, "effect": "Gaussian Blur"})).unwrap();
-        s.execute("prop.set", json!({"layer": b, "path": "effects/#1/blurriness", "value": 21})).unwrap();
-        s.execute("layer.addMask", json!({"layer": b})).unwrap();
-        s.execute("prop.set", json!({"layer": b, "path": "masks/#1/feather", "value": [7, 7]})).unwrap();
-        let link = |s: &mut effectcraft_engine::Session, from: &str, to: &str| {
-            s.execute("prop.pickWhip", json!({"layer": a, "path": from, "target": {"layer": b, "path": to}})).unwrap();
-        };
-        link(&mut s, "transform/opacity", "transform/rotation");
-        assert_eq!(value(&s, a, "transform/opacity").as_f64(), 33.0);
-        link(&mut s, "transform/scale", "transform/rotation");
-        let cid = s.active_comp_id().unwrap();
-        let ep = effectcraft_expr::eval_property(&s.project, cid, effectcraft_engine::project::LayerId(a), "transform/scale", 0.0);
-        assert!(ep.is_ok(), "{ep:?}");
-        assert_eq!(value(&s, a, "transform/scale").as_vec2(), [33.0, 33.0]);
-        link(&mut s, "transform/position", "transform/position");
-        assert_eq!(value(&s, a, "transform/position").as_vec2(), [12.0, 34.0]);
-        link(&mut s, "transform/rotation", "effects/#1/blurriness");
-        assert_eq!(value(&s, a, "transform/rotation").as_f64(), 21.0);
-        link(&mut s, "transform/opacity", "masks/#1/feather");
-        assert_eq!(value(&s, a, "transform/opacity").as_f64(), 7.0);
-        // Separated dimensions: X Position reference.
-        s.execute("prop.separateDimensions", json!({"layer": b})).unwrap();
-        link(&mut s, "transform/rotation", "transform/positionX");
-        assert_eq!(value(&s, a, "transform/rotation").as_f64(), 12.0);
-    }
-
-    /// The expression error bar's list: evaluation errors and syntax errors, with the layer and
-    /// property they belong to.
-    #[test]
-    fn expression_errors_are_collected() {
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
-        let a = s.execute("layer.newSolid", json!({"name": "Box", "color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "50"})).unwrap();
-        assert_eq!(s.execute("expr.errors", json!({})).unwrap()["count"], 0);
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "thisComp.layer(\"Nope\").rotation"})).unwrap();
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "1 +* ("})).unwrap();
-        let r = s.execute("expr.errors", json!({})).unwrap();
-        assert_eq!(r["count"], 2, "{r}");
-        let errs = r["errors"].as_array().unwrap();
-        let rot = errs.iter().find(|e| e["path"] == "transform/rotation").unwrap();
-        assert!(rot["message"].as_str().unwrap().contains("Nope"), "{rot}");
-        assert_eq!(rot["layerIndex"], 1);
-        assert_eq!(rot["layerName"], "Box");
-        assert_eq!(rot["disabled"], false);
-        let op = errs.iter().find(|e| e["path"] == "transform/opacity").unwrap();
-        assert_eq!(op["disabled"], true);
-        assert!(r["text"][0].as_str().unwrap().contains("of layer 1 ('Box') in comp 'C'"), "{r}");
-        // A user-disabled (but valid) expression is not an error.
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "45"})).unwrap();
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "enabled": false})).unwrap();
-        assert_eq!(s.execute("expr.errors", json!({})).unwrap()["count"], 1);
-        // The Expression Language menu is categorised.
-        let m = s.execute("expr.languageMenu", json!({})).unwrap();
-        assert!(m.as_array().unwrap().iter().any(|c| c["category"] == "Footage" && c["items"].as_array().unwrap().iter().any(|i| i["text"] == "sourceData")));
-    }
-
-    /// File ▸ Import of JSON/CSV data files as data footage, read by expressions.
-    #[test]
-    fn imported_data_files_drive_expressions() {
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-data");
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        std::fs::write(dir.join("levels.csv"), "label,value\nlow,10\nhigh,90\n").unwrap();
-        std::fs::write(dir.join("cfg.json"), r#"{"angle": 33}"#).unwrap();
-        std::fs::write(dir.join("broken.json"), "{nope").unwrap();
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
-        let paths: Vec<String> = ["levels.csv", "cfg.json", "broken.json"].iter().map(|n| dir.join(n).to_string_lossy().to_string()).collect();
-        let r = s.execute("file.import", json!({"paths": paths})).unwrap();
-        assert_eq!(r["items"].as_array().unwrap().len(), 2, "{r}");
-        assert_eq!(r["errors"].as_array().unwrap().len(), 1, "{r}");
-        let csv = r["items"][0].as_u64().unwrap();
-        assert_eq!(s.project.item(effectcraft_engine::project::ItemId(csv)).unwrap().type_name(), "Data");
-        assert!(s.execute("layer.addItem", json!({"item": csv})).is_err(), "data files are not layers");
-        let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "footage(\"levels.csv\").sourceData[1].value"})).unwrap();
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "footage(\"cfg.json\").sourceData.angle"})).unwrap();
-        assert_eq!(value(&s, a, "transform/opacity").as_f64(), 90.0);
-        assert_eq!(value(&s, a, "transform/rotation").as_f64(), 33.0);
-    }
-
-    /// sampleImage through the renderer: a box's Fill colour follows the solid under it.
-    #[test]
-    fn sample_image_drives_a_colour() {
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
-        s.execute("layer.newSolid", json!({"name": "Bg", "color": "#00ff00"})).unwrap();
-        let a = s.execute("layer.newSolid", json!({"name": "Fg", "color": "#ffffff", "width": 20, "height": 20})).unwrap()["layer"].as_u64().unwrap();
-        s.execute("effect.apply", json!({"layer": a, "effect": "Fill"})).unwrap();
-        s.execute(
-            "prop.setExpression",
-            json!({"layer": a, "path": "effects/#1/color", "expression": "thisComp.layer(\"Bg\").sampleImage(thisComp.layer(\"Bg\").fromComp(toComp(anchorPoint)))"}),
-        )
-        .unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts::default());
-        let px = img.get(50, 50);
-        assert!(px[1] > 0.99 && px[0] < 0.01, "the box is filled with the sampled green: {px:?}");
-    }
-
-    /// Proxies through the real media and export layers: Render Settings ▸ Proxy Use decides
-    /// whether an export uses the proxy, and Create Proxy renders and attaches one.
-    #[test]
-    fn proxies_in_exports_and_create_proxy() {
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-proxy");
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let p = |n: &str| dir.join(n).to_string_lossy().to_string();
-        let mut s = super::session();
-        // Source and proxy stills, written by the app itself.
-        s.execute("comp.new", json!({"name": "Red", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
-        let red = s.active_comp_id().unwrap();
-        s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
-        s.execute("comp.saveFrameAs", json!({"path": p("red.png")})).unwrap();
-        s.execute("comp.new", json!({"name": "Blue", "width": 8, "height": 8, "frameRate": 10, "duration": 1})).unwrap();
-        s.execute("layer.newSolid", json!({"color": "#0000ff"})).unwrap();
-        s.execute("comp.saveFrameAs", json!({"path": p("blue.png")})).unwrap();
-        let foot = s.execute("file.import", json!({"paths": [p("red.png")]})).unwrap()["items"][0].as_u64().unwrap();
-        s.execute("file.setProxy", json!({"item": foot, "path": p("blue.png")})).unwrap();
-        s.execute("comp.new", json!({"name": "Out", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
-        let out = s.active_comp_id().unwrap();
-        s.execute("layer.addItem", json!({"item": foot})).unwrap();
-        // Export one frame with each Proxy Use.
-        for (name, using) in [("all", "use_all_[#].png"), ("none", "use_none_[#].png")] {
-            s.execute(
-                "renderQueue.add",
-                json!({"comp": out.0, "format": "png", "output": p(using), "timeSpan": "custom", "start": 0.0, "end": 0.1, "proxyUse": name}),
-            )
-            .unwrap();
-        }
-        s.execute("renderQueue.render", json!({"wait": true})).unwrap();
-        s.poll_render();
-        let centre = |s: &mut effectcraft_engine::Session, path: &str| {
-            let id = s.execute("file.import", json!({"paths": [path]})).unwrap()["items"][0].as_u64().unwrap();
-            s.execute("comp.new", json!({"name": "Probe", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
-            s.execute("layer.addItem", json!({"item": id})).unwrap();
-            let c = s.active_comp_id().unwrap();
-            s.render(c, Default::default(), Default::default()).get(8, 8)
-        };
-        let all = centre(&mut s, &p("use_all_0.png"));
-        assert!(all[2] > 0.99 && all[0] < 0.01, "Use All Proxies renders the blue proxy: {all:?}");
-        let none = centre(&mut s, &p("use_none_0.png"));
-        assert!(none[0] > 0.99 && none[2] < 0.01, "Use No Proxies renders the red source: {none:?}");
-        // Create Proxy ▸ Still: rendered at half size and attached to the comp.
-        s.execute("file.createProxy", json!({"kind": "still", "comp": red.0, "path": p("red_proxy_[#####].png")})).unwrap();
-        s.execute("renderQueue.render", json!({"wait": true})).unwrap();
-        s.poll_render();
-        let px = s.project.item(red).unwrap().proxy.clone().expect("Create Proxy attached the rendered still");
-        assert!(px.enabled);
-        assert_eq!((px.footage.width, px.footage.height), (8, 8));
-        assert!(std::path::Path::new(&px.footage.path).exists(), "{}", px.footage.path);
-    }
-
-    /// A script builds a comp, queues it and renders it through the Render Queue.
-    #[test]
-    fn script_renders_through_the_render_queue() {
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-script");
-        let _ = std::fs::remove_dir_all(&dir);
-        let out = dir.join("scripted.gif");
-        let mut s = super::session();
-        let code = format!(
-            r#"
-            var comp = app.project.items.addComp("Scripted", 64, 48, 1, 0.2, 10);
-            var sq = comp.layers.addSolid([1, 0.5, 0], "Square", 16, 16, 1);
-            sq.transform.position.setValueAtTime(0, [8, 24]);
-            sq.transform.position.setValueAtTime(0.1, [56, 24]);
-            var item = app.project.renderQueue.items.add(comp);
-            item.outputModule(1).applyTemplate("GIF");
-            item.outputModule(1).file = new File({});
-            app.project.renderQueue.render();
-            [item.status == RQItemStatus.DONE, item.outputModule(1).file.fsName, app.project.renderQueue.numItems]
-            "#,
-            serde_json::to_string(&out.to_string_lossy()).unwrap()
-        );
-        let r = s.execute("script.run", json!({"code": code})).unwrap();
-        assert_eq!(r["ok"], json!(true), "{r}");
-        assert_eq!(r["result"][0], json!(true), "{r}");
-        assert_eq!(r["result"][2], json!(1));
-        let bytes = std::fs::read(&out).unwrap();
-        assert!(bytes.starts_with(b"GIF89a"));
-    }
-
-    /// importFile, layers.add(footage) and project save/open from a script.
-    #[test]
-    fn script_imports_footage_and_saves() {
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-script-import");
-        let _ = std::fs::remove_dir_all(&dir);
-        std::fs::create_dir_all(&dir).unwrap();
-        let q = |n: &str| serde_json::to_string(&dir.join(n).to_string_lossy()).unwrap();
-        let mut s = super::session();
-        let code = format!(
-            r#"
-            var c = app.project.items.addComp("Src", 32, 32, 1, 1, 10);
-            c.layers.addSolid([0, 1, 0], "G", 32, 32, 1);
-            app.run("comp.saveFrameAs", {{comp: c.id, path: {png}}});
-            var still = app.project.importFile(new ImportOptions(new File({png})));
-            var main = app.project.items.addComp("Main", 64, 64, 1, 1, 10);
-            var l = main.layers.add(still);
-            app.project.save(new File({proj}));
-            [still instanceof FootageItem, still.width, still.mainSource.isStill, l.source.name, app.project.file.name]
-            "#,
-            png = q("frame.png"),
-            proj = q("p.ecproj")
-        );
-        let r = s.execute("script.run", json!({"code": code})).unwrap();
-        assert_eq!(r["ok"], json!(true), "{r}");
-        assert_eq!(r["result"], json!([true, 32, true, "frame.png", "p.ecproj"]), "{r}");
-        let r = s.execute("script.run", json!({"code": format!("app.open(new File({})); app.project.numItems", q("p.ecproj"))})).unwrap();
-        assert_eq!(r["result"], json!(5), "{r}"); // Src, Solids, G, frame.png, Main
-    }
-
-    #[test]
-    fn expression_syntax_errors_disable_the_expression() {
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
-        let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
-        let r = s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "1 +* ("})).unwrap();
-        assert!(r["error"].is_string(), "{r}");
-        let pr = s.active_comp().unwrap().layers[0].props.prop("transform/opacity").unwrap().clone();
-        assert!(!pr.expr.unwrap().enabled);
-        assert_eq!(value(&s, a, "transform/opacity").as_f64(), 100.0);
-        s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "50"})).unwrap();
-        assert_eq!(value(&s, a, "transform/opacity").as_f64(), 50.0);
-    }
-    /// Create Stereo 3D Rig: the eye cameras' expressions follow the master camera and the
-    /// Stereo 3D Controls (and agree with the values the command wrote).
-    #[test]
-    fn stereo_rig_expressions_follow_the_master_camera() {
-        let mut s = super::session();
-        s.execute("comp.new", json!({"name": "Shot", "width": 640, "height": 360, "frameRate": 30, "duration": 2})).unwrap();
-        let src = s.active_comp_id().unwrap();
-        let cam = s.execute("layer.newCamera", json!({"name": "Main", "position": [320, 180, -800], "poi": [320, 180, 0], "zoom": 900})).unwrap()["layer"]
-            .as_u64()
-            .unwrap();
-        let r = s.execute("camera.stereoRig", json!({"sceneDepth": 4})).unwrap();
-        let ctl = r["controls"].as_u64().unwrap();
-        let left = effectcraft_engine::project::ItemId(r["leftComp"].as_u64().unwrap());
-        // The left eye camera's evaluated value (expressions on).
-        let v3 = |s: &effectcraft_engine::Session, path: &str| {
-            let comp = s.project.comp(left).unwrap();
-            let layer = &comp.layers[0];
-            let ctx = effectcraft_engine::render::EvalCtx {
-                project: &s.project,
-                comp_id: left,
-                comp,
-                time: Default::default(),
-                expr: s.expr.as_deref(),
-                footage: None,
-            };
-            ctx.value(layer, layer.props.prop(path).unwrap()).as_vec3()
-        };
-        let close = |a: [f64; 3], b: [f64; 3]| (0..3).all(|i| (a[i] - b[i]).abs() < 1e-6);
-        let d = 0.04 * 640.0;
-        assert!(close(v3(&s, "transform/position"), [320.0 - d / 2.0, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
-        assert!(close(v3(&s, "transform/poi"), [320.0 - d / 2.0, 180.0, 0.0]), "{:?}", v3(&s, "transform/poi"));
-        // Moving the master moves the eyes.
-        s.execute("comp.open", json!({"comp": src.0})).unwrap();
-        s.execute("prop.set", json!({"layer": cam, "path": "transform/position", "value": [300, 180, -800]})).unwrap();
-        s.execute("prop.set", json!({"layer": cam, "path": "transform/poi", "value": [300, 180, 0]})).unwrap();
-        assert!(close(v3(&s, "transform/position"), [300.0 - d / 2.0, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
-        // Controls: Center & Left puts the left eye a full separation left; convergence toes in.
-        s.execute("prop.set", json!({"layer": ctl, "path": "effects/#1/configuration", "value": 2})).unwrap();
-        s.execute("prop.set", json!({"layer": ctl, "path": "effects/#1/convergence", "value": true})).unwrap();
-        assert!(close(v3(&s, "transform/position"), [300.0 - d, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
-        assert!(close(v3(&s, "transform/poi"), [300.0, 180.0, 0.0]), "{:?}", v3(&s, "transform/poi"));
-    }
-}
+mod tests;
diff --git a/crates/host/src/tests.rs b/crates/host/src/tests.rs
new file mode 100644
index 000000000..a73f15937
--- /dev/null
+++ b/crates/host/src/tests.rs
@@ -0,0 +1,544 @@
+use serde_json::json;
+
+#[test]
+fn host_runs_tasks_scheduled_by_panel_handlers() {
+    let mut s = super::session();
+    let result = s.execute("script.run", json!({"code": "var w=new Window('palette','Timer regression'); var b=w.add('button',undefined,'Import'); b.onClick=function(){app.scheduleTask(\"app.project.items.addComp('Scheduled',64,64,1,1,25)\",0,false);};w.show();"})).unwrap();
+    assert_eq!(result["ok"], true, "{result}");
+    s.execute("scriptui.click", json!({"window":"Timer regression","widget":"Import"})).unwrap();
+    assert!(s.project.items.is_empty());
+    let tick = s.execute("script.runTasks", json!({})).unwrap();
+    assert_eq!(tick["ran"], 1, "{tick}");
+    assert_eq!(tick["errors"], json!([]), "{tick}");
+    assert!(s.project.items.values().any(|item| item.name == "Scheduled"));
+    s.execute("scriptui.close", json!({"window":"Timer regression"})).unwrap();
+}
+
+/// Layer ▸ Camera ▸ Link Focus Distance to Point of Interest / to Layer: the expressions
+/// evaluate to the camera's focus on the target.
+#[test]
+fn focus_link_expressions_track_the_target() {
+    use effectcraft_engine::geom::vec3;
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "F", "width": 400, "height": 300, "duration": 2})).unwrap();
+    let t = s.execute("layer.newSolid", json!({"color": "#ffffff", "width": 50, "height": 50})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.setSwitch", json!({"layers": [t], "switch": "threeD", "value": true})).unwrap();
+    s.execute("layer.setTransform", json!({"layer": t, "prop": "position", "value": [260, 120, 400]})).unwrap();
+    let cam = s.execute("layer.newCamera", json!({})).unwrap()["layer"].as_u64().unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let focus = |s: &effectcraft_engine::Session| {
+        let comp = s.project.comp(cid).unwrap();
+        let mut ctx = effectcraft_engine::render::EvalCtx::new(&s.project, cid, comp, s.time());
+        ctx.expr = s.expr.as_deref();
+        let l = comp.layer(effectcraft_engine::project::LayerId(cam)).unwrap();
+        ctx.value(l, l.props.prop("cameraOptions/focusDistance").unwrap()).as_f64()
+    };
+    let depth = |s: &effectcraft_engine::Session| {
+        let comp = s.project.comp(cid).unwrap();
+        let ctx = effectcraft_engine::render::EvalCtx::new(&s.project, cid, comp, s.time());
+        let c = comp.layer(effectcraft_engine::project::LayerId(cam)).unwrap();
+        let tl = comp.layer(effectcraft_engine::project::LayerId(t)).unwrap();
+        let cs = effectcraft_engine::render::three_d::camera::layer_camera(&ctx, c);
+        cs.depth(ctx.world_matrix(tl).apply(vec3(25.0, 25.0, 0.0)))
+    };
+    s.execute("layer.select", json!({"layers": [cam, t]})).unwrap();
+    let set = s.execute("camera.setFocusToLayer", json!({})).unwrap()["focusDistance"].as_f64().unwrap();
+    assert!((set - depth(&s)).abs() < 1e-6 && (focus(&s) - set).abs() < 1e-6);
+    s.execute("camera.linkFocusToLayer", json!({})).unwrap();
+    // Move the target: the linked focus follows.
+    s.execute("layer.setTransform", json!({"layer": t, "prop": "position", "value": [200, 150, 900]})).unwrap();
+    assert!((focus(&s) - depth(&s)).abs() < 1e-3, "{} vs {}", focus(&s), depth(&s));
+    s.execute("camera.linkFocusToPoi", json!({"camera": cam})).unwrap();
+    let poi = {
+        let l = s.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(cam)).unwrap();
+        let p = l.props.prop("transform/position").unwrap().value.as_vec3();
+        let q = l.props.prop("transform/poi").unwrap().value.as_vec3();
+        ((p[0] - q[0]).powi(2) + (p[1] - q[1]).powi(2) + (p[2] - q[2]).powi(2)).sqrt()
+    };
+    assert!((focus(&s) - poi).abs() < 1e-6, "{} vs {poi}", focus(&s));
+}
+
+#[test]
+fn wired_session_renders_demo_with_expressions() {
+    let mut s = super::session();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let lid = s.active_comp().unwrap().layers[1].id.0;
+    s.execute("prop.setExpression", json!({"layer": lid, "path": "transform/rotation", "expression": "time * 90"})).unwrap();
+    let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts { scale: 0.25, ..Default::default() });
+    assert!(img.data.iter().any(|p| p[3] > 0.5));
+}
+
+/// File ▸ Import of glTF/GLB/OBJ models through the media layer, placed as model layers and
+/// drawn by the Advanced 3D renderer.
+#[test]
+fn imported_models_render_in_advanced_3d() {
+    let fx = |n: &str| format!("{}/../model/tests/fixtures/{n}", env!("CARGO_MANIFEST_DIR"));
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "M", "width": 160, "height": 120, "renderer": "advanced3d"})).unwrap();
+    let r = s.execute("file.import", json!({"paths": [fx("cube.obj"), fx("quad.glb"), fx("quad.gltf")]})).unwrap();
+    assert_eq!(r["errors"], json!([]), "{r}");
+    let items: Vec<u64> = r["items"].as_array().unwrap().iter().map(|v| v.as_u64().unwrap()).collect();
+    assert_eq!(items.len(), 3);
+    let cube = s.execute("layer.addItem", json!({"item": items[0]})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": cube, "path": "transform/rotationY", "value": 30})).unwrap();
+    s.execute("prop.set", json!({"layer": cube, "path": "transform/rotationX", "value": 20})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let opts = effectcraft_engine::render::RenderOpts::default();
+    let img = s.render(cid, s.time(), opts);
+    let covered = img.data.iter().filter(|p| p[3] > 0.99).count();
+    assert!(covered > 1000, "the cube covers part of the frame: {covered}");
+    // Red faces (material Red) are visible.
+    assert!(img.data.iter().any(|p| p[3] > 0.99 && p[0] > 0.5 && p[1] < 0.2));
+    // The textured binary glTF quad.
+    for _ in 0..3 {
+        s.execute("edit.undo", json!({})).unwrap();
+    }
+    s.execute("layer.addItem", json!({"item": items[1]})).unwrap();
+    let img = s.render(cid, s.time(), opts);
+    assert!(img.data.iter().filter(|p| p[3] > 0.99).count() > 1000);
+    // Classic 3D doesn't draw models.
+    s.execute("comp.renderer", json!({"renderer": "classic3d"})).unwrap();
+    assert!(s.render(cid, s.time(), opts).data.iter().all(|p| p[3] == 0.0));
+}
+
+/// A binary glTF of a red cube 2 units wide (positions and indices only).
+fn glb_cube() -> Vec<u8> {
+    let mut bin: Vec<u8> = (0..8u32).flat_map(|i| [i & 1, (i >> 1) & 1, (i >> 2) & 1].map(|b| b as f32 * 2.0 - 1.0)).flat_map(f32::to_le_bytes).collect();
+    let faces: [[u16; 4]; 6] = [[0, 2, 3, 1], [4, 5, 7, 6], [0, 1, 5, 4], [2, 6, 7, 3], [0, 4, 6, 2], [1, 3, 7, 5]];
+    bin.extend(faces.iter().flat_map(|f| [f[0], f[1], f[2], f[0], f[2], f[3]]).flat_map(u16::to_le_bytes));
+    let gltf = json!({
+        "asset": {"version": "2.0"},
+        "scene": 0,
+        "scenes": [{"nodes": [0]}],
+        "nodes": [{"mesh": 0}],
+        "meshes": [{"primitives": [{"attributes": {"POSITION": 0}, "indices": 1, "material": 0}]}],
+        "materials": [{"pbrMetallicRoughness": {"baseColorFactor": [1, 0, 0, 1], "metallicFactor": 0, "roughnessFactor": 1}}],
+        "buffers": [{"byteLength": bin.len()}],
+        "bufferViews": [{"buffer": 0, "byteOffset": 0, "byteLength": 96}, {"buffer": 0, "byteOffset": 96, "byteLength": 72}],
+        "accessors": [
+            {"bufferView": 0, "componentType": 5126, "count": 8, "type": "VEC3", "min": [-1, -1, -1], "max": [1, 1, 1]},
+            {"bufferView": 1, "componentType": 5123, "count": 36, "type": "SCALAR"}
+        ]
+    });
+    let mut text = gltf.to_string().into_bytes();
+    text.resize(text.len().div_ceil(4) * 4, b' ');
+    let chunk = |kind: &[u8; 4], data: &[u8]| [&(data.len() as u32).to_le_bytes()[..], kind, data].concat();
+    let body = [chunk(b"JSON", &text), chunk(b"BIN\0", &bin)].concat();
+    [&b"glTF"[..], &2u32.to_le_bytes(), &(12 + body.len() as u32).to_le_bytes(), &body].concat()
+}
+
+/// #264: a model imported into a new composition (Classic 3D by default) was invisible on
+/// every renderer, because only Advanced 3D draws models. Adding it now switches the comp,
+/// and the software renderer (no GPU, as on the reporter's Intel HD Graphics 5500) draws it.
+#[test]
+fn imported_glb_shows_in_a_new_composition() {
+    let path = std::env::temp_dir().join(format!("effectcraft-264-cube-{}.glb", std::process::id()));
+    std::fs::write(&path, glb_cube()).unwrap();
+    let mut s = super::session();
+    assert!(s.accel.is_none(), "renders in software");
+    let r = s.execute("file.import", json!({"paths": [path.to_string_lossy()]})).unwrap();
+    assert_eq!(r["errors"], json!([]), "{r}");
+    s.state.project_selection = vec![effectcraft_project::ItemId(r["items"][0].as_u64().unwrap())];
+    s.execute("file.newCompFromSelection", json!({})).unwrap();
+    let comp = s.active_comp().unwrap();
+    assert_eq!(comp.renderer, effectcraft_project::Renderer::Advanced3D);
+    let layer = comp.layers[0].id.0;
+    s.execute("prop.set", json!({"layer": layer, "path": "transform/rotationY", "value": 30})).unwrap();
+    s.execute("prop.set", json!({"layer": layer, "path": "transform/rotationX", "value": 20})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts { scale: 0.25, ..Default::default() });
+    let red = img.data.iter().filter(|p| p[3] > 0.99 && p[0] > 0.2 && p[1] < 0.05 && p[2] < 0.05).count();
+    let _ = std::fs::remove_file(&path);
+    // Half the comp height wide, seen at an angle: well over 5% of the frame.
+    assert!(red * 20 > img.data.len(), "red cube pixels: {red} of {}", img.data.len());
+}
+
+/// #651: an animated GIF imported from disk plays: the layer shows each frame at its time,
+/// in the viewer's renders and in exports alike.
+#[test]
+fn an_imported_animated_gif_plays() {
+    let dir = std::env::temp_dir().join(format!("ec-gif-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("anim.gif");
+    let mut bytes = Vec::new();
+    {
+        let mut enc = gif::Encoder::new(&mut bytes, 4, 4, &[]).unwrap();
+        for rgb in [[255u8, 0, 0], [0, 255, 0], [0, 0, 255]] {
+            let mut f = gif::Frame::from_rgb(4, 4, &rgb.repeat(16));
+            f.delay = 10;
+            enc.write_frame(&f).unwrap();
+        }
+    }
+    std::fs::write(&path, bytes).unwrap();
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "G", "width": 4, "height": 4, "frameRate": 30, "duration": 1})).unwrap();
+    s.execute("file.import", json!({"paths": [path.to_string_lossy()], "addToComp": true})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let rgb = |t: f64| {
+        let img = s.render(cid, effectcraft_time::Tick::from_seconds_f64(t), effectcraft_engine::render::RenderOpts::default());
+        let p = img.data[5];
+        [p[0].round(), p[1].round(), p[2].round()]
+    };
+    assert_eq!(rgb(0.05), [1.0, 0.0, 0.0]);
+    assert_eq!(rgb(0.15), [0.0, 1.0, 0.0]);
+    assert_eq!(rgb(0.25), [0.0, 0.0, 1.0]);
+    let _ = std::fs::remove_dir_all(dir);
+}
+
+/// The web app's path: outputs go to a sink (downloads), never to the file system.
+#[test]
+fn render_queue_exports_to_a_sink() {
+    use std::sync::{Arc, Mutex};
+    let got: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::default();
+    let g = got.clone();
+    let mut s = super::session();
+    s.exporter = Some(Arc::new(super::FileExporter { sink: Some(Arc::new(move |p: &str, d: Vec<u8>| g.lock().unwrap().push((p.to_string(), d)))) }));
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    // Rooted without a drive letter is not absolute on Windows, where the engine joins it to the home drive.
+    let dir = if cfg!(windows) { "C:/no-such-dir-effectcraft-sink-test" } else { "/no-such-dir-effectcraft-sink-test" };
+    s.execute(
+        "renderQueue.add",
+        json!({"format": "gif", "output": format!("{dir}/a.gif"), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.2}),
+    )
+    .unwrap();
+    s.execute(
+        "renderQueue.add",
+        json!({"format": "png", "output": format!("{dir}/seq_[##].png"), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.1}),
+    )
+    .unwrap();
+    s.execute("renderQueue.render", json!({"wait": true})).unwrap();
+    s.poll_render();
+    let mut got = got.lock().unwrap().clone();
+    got.sort_by(|a, b| a.0.cmp(&b.0));
+    let names: Vec<std::path::PathBuf> = got.iter().map(|(p, _)| std::path::PathBuf::from(p)).collect();
+    let expected = [format!("{dir}/a.gif"), format!("{dir}/seq_00.png"), format!("{dir}/seq_01.png"), format!("{dir}/seq_02.png")]
+        .map(|p| std::path::absolute(p).unwrap());
+    assert_eq!(names, expected);
+    assert!(got[0].1.starts_with(b"GIF89a"));
+    assert!(got[1].1.starts_with(b"\x89PNG"));
+    assert!(!std::path::Path::new(dir).exists());
+}
+
+#[test]
+fn render_queue_exports_demo_comp() {
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-rq");
+    let _ = std::fs::remove_dir_all(&dir);
+    let mut s = super::session();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let out = dir.join("[compName]_[width]x[height].[fileExtension]");
+    let r = s
+        .execute(
+            "renderQueue.add",
+            json!({"format": "h264", "output": out.to_string_lossy(), "resolution": 0.125, "timeSpan": "custom", "start": 0.0, "end": 0.4}),
+        )
+        .unwrap();
+    let path = r["outputPath"].as_str().unwrap().to_string();
+    assert!(path.ends_with("_240x134.mp4"), "{path}");
+    // A second item: PNG sequence, rendered in the background.
+    s.execute(
+        "renderQueue.add",
+        json!({"format": "png", "output": dir.join("seq_[###].png").to_string_lossy(), "resolution": 0.0625, "timeSpan": "custom", "start": 0.0, "end": 0.2}),
+    )
+    .unwrap();
+    let r = s.execute("renderQueue.render", json!({"wait": false})).unwrap();
+    assert_eq!(r["items"].as_array().unwrap().len(), 2);
+    let t0 = std::time::Instant::now();
+    while s.is_rendering() {
+        assert!(t0.elapsed().as_secs() < 300, "render timed out");
+        std::thread::sleep(std::time::Duration::from_millis(20));
+        s.poll_render();
+    }
+    s.poll_render();
+    let list = s.execute("renderQueue.list", json!({})).unwrap();
+    for it in list["items"].as_array().unwrap() {
+        assert_eq!(it["statusLabel"], "Done", "{it}");
+        assert!(it["render_time"].as_f64().is_some());
+        assert!(std::path::Path::new(it["last_output"].as_str().unwrap()).exists(), "{it}");
+    }
+    assert!(std::path::Path::new(&path).metadata().unwrap().len() > 500);
+    assert!(dir.join("seq_000.png").exists() && dir.join("seq_005.png").exists() && !dir.join("seq_006.png").exists());
+    // Rendering again needs a re-queue.
+    assert!(s.execute("renderQueue.render", json!({})).is_err());
+    s.execute("renderQueue.setRender", json!({"index": 1, "render": true})).unwrap();
+    assert_eq!(s.project.render_queue[0].status, effectcraft_engine::project::render_queue::RenderStatus::Queued);
+}
+
+/// Value of a property of layer `l` at time 0 (keys + expression).
+fn value(s: &effectcraft_engine::Session, l: u64, path: &str) -> effectcraft_engine::keyframe::Value {
+    let cid = s.active_comp_id().unwrap();
+    let comp = s.project.comp(cid).unwrap();
+    let layer = comp.layer(effectcraft_engine::project::LayerId(l)).unwrap();
+    let ctx = effectcraft_engine::render::EvalCtx { project: &s.project, comp_id: cid, comp, time: Default::default(), expr: s.expr.as_deref(), footage: None };
+    ctx.value(layer, layer.props.prop(path).unwrap())
+}
+
+#[test]
+fn pick_whip_expressions_evaluate() {
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "C", "width": 200, "height": 200, "frameRate": 30, "duration": 2})).unwrap();
+    let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
+    let b = s.execute("layer.newSolid", json!({"name": "Src", "color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": b, "path": "transform/rotation", "value": 33})).unwrap();
+    s.execute("prop.set", json!({"layer": b, "path": "transform/position", "value": [12, 34]})).unwrap();
+    s.execute("effect.apply", json!({"layer": b, "effect": "Gaussian Blur"})).unwrap();
+    s.execute("prop.set", json!({"layer": b, "path": "effects/#1/blurriness", "value": 21})).unwrap();
+    s.execute("layer.addMask", json!({"layer": b})).unwrap();
+    s.execute("prop.set", json!({"layer": b, "path": "masks/#1/feather", "value": [7, 7]})).unwrap();
+    let link = |s: &mut effectcraft_engine::Session, from: &str, to: &str| {
+        s.execute("prop.pickWhip", json!({"layer": a, "path": from, "target": {"layer": b, "path": to}})).unwrap();
+    };
+    link(&mut s, "transform/opacity", "transform/rotation");
+    assert_eq!(value(&s, a, "transform/opacity").as_f64(), 33.0);
+    link(&mut s, "transform/scale", "transform/rotation");
+    let cid = s.active_comp_id().unwrap();
+    let ep = effectcraft_expr::eval_property(&s.project, cid, effectcraft_engine::project::LayerId(a), "transform/scale", 0.0);
+    assert!(ep.is_ok(), "{ep:?}");
+    assert_eq!(value(&s, a, "transform/scale").as_vec2(), [33.0, 33.0]);
+    link(&mut s, "transform/position", "transform/position");
+    assert_eq!(value(&s, a, "transform/position").as_vec2(), [12.0, 34.0]);
+    link(&mut s, "transform/rotation", "effects/#1/blurriness");
+    assert_eq!(value(&s, a, "transform/rotation").as_f64(), 21.0);
+    link(&mut s, "transform/opacity", "masks/#1/feather");
+    assert_eq!(value(&s, a, "transform/opacity").as_f64(), 7.0);
+    // Separated dimensions: X Position reference.
+    s.execute("prop.separateDimensions", json!({"layer": b})).unwrap();
+    link(&mut s, "transform/rotation", "transform/positionX");
+    assert_eq!(value(&s, a, "transform/rotation").as_f64(), 12.0);
+}
+
+/// The expression error bar's list: evaluation errors and syntax errors, with the layer and
+/// property they belong to.
+#[test]
+fn expression_errors_are_collected() {
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
+    let a = s.execute("layer.newSolid", json!({"name": "Box", "color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "50"})).unwrap();
+    assert_eq!(s.execute("expr.errors", json!({})).unwrap()["count"], 0);
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "thisComp.layer(\"Nope\").rotation"})).unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "1 +* ("})).unwrap();
+    let r = s.execute("expr.errors", json!({})).unwrap();
+    assert_eq!(r["count"], 2, "{r}");
+    let errs = r["errors"].as_array().unwrap();
+    let rot = errs.iter().find(|e| e["path"] == "transform/rotation").unwrap();
+    assert!(rot["message"].as_str().unwrap().contains("Nope"), "{rot}");
+    assert_eq!(rot["layerIndex"], 1);
+    assert_eq!(rot["layerName"], "Box");
+    assert_eq!(rot["disabled"], false);
+    let op = errs.iter().find(|e| e["path"] == "transform/opacity").unwrap();
+    assert_eq!(op["disabled"], true);
+    assert!(r["text"][0].as_str().unwrap().contains("of layer 1 ('Box') in comp 'C'"), "{r}");
+    // A user-disabled (but valid) expression is not an error.
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "45"})).unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "enabled": false})).unwrap();
+    assert_eq!(s.execute("expr.errors", json!({})).unwrap()["count"], 1);
+    // The Expression Language menu is categorised.
+    let m = s.execute("expr.languageMenu", json!({})).unwrap();
+    assert!(m.as_array().unwrap().iter().any(|c| c["category"] == "Footage" && c["items"].as_array().unwrap().iter().any(|i| i["text"] == "sourceData")));
+}
+
+/// File ▸ Import of JSON/CSV data files as data footage, read by expressions.
+#[test]
+fn imported_data_files_drive_expressions() {
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-data");
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    std::fs::write(dir.join("levels.csv"), "label,value\nlow,10\nhigh,90\n").unwrap();
+    std::fs::write(dir.join("cfg.json"), r#"{"angle": 33}"#).unwrap();
+    std::fs::write(dir.join("broken.json"), "{nope").unwrap();
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
+    let paths: Vec<String> = ["levels.csv", "cfg.json", "broken.json"].iter().map(|n| dir.join(n).to_string_lossy().to_string()).collect();
+    let r = s.execute("file.import", json!({"paths": paths})).unwrap();
+    assert_eq!(r["items"].as_array().unwrap().len(), 2, "{r}");
+    assert_eq!(r["errors"].as_array().unwrap().len(), 1, "{r}");
+    let csv = r["items"][0].as_u64().unwrap();
+    assert_eq!(s.project.item(effectcraft_engine::project::ItemId(csv)).unwrap().type_name(), "Data");
+    assert!(s.execute("layer.addItem", json!({"item": csv})).is_err(), "data files are not layers");
+    let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "footage(\"levels.csv\").sourceData[1].value"})).unwrap();
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/rotation", "expression": "footage(\"cfg.json\").sourceData.angle"})).unwrap();
+    assert_eq!(value(&s, a, "transform/opacity").as_f64(), 90.0);
+    assert_eq!(value(&s, a, "transform/rotation").as_f64(), 33.0);
+}
+
+/// sampleImage through the renderer: a box's Fill colour follows the solid under it.
+#[test]
+fn sample_image_drives_a_colour() {
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Bg", "color": "#00ff00"})).unwrap();
+    let a = s.execute("layer.newSolid", json!({"name": "Fg", "color": "#ffffff", "width": 20, "height": 20})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("effect.apply", json!({"layer": a, "effect": "Fill"})).unwrap();
+    s.execute(
+        "prop.setExpression",
+        json!({"layer": a, "path": "effects/#1/color", "expression": "thisComp.layer(\"Bg\").sampleImage(thisComp.layer(\"Bg\").fromComp(toComp(anchorPoint)))"}),
+    )
+    .unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let img = s.render(cid, s.time(), effectcraft_engine::render::RenderOpts::default());
+    let px = img.get(50, 50);
+    assert!(px[1] > 0.99 && px[0] < 0.01, "the box is filled with the sampled green: {px:?}");
+}
+
+/// Proxies through the real media and export layers: Render Settings ▸ Proxy Use decides
+/// whether an export uses the proxy, and Create Proxy renders and attaches one.
+#[test]
+fn proxies_in_exports_and_create_proxy() {
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-proxy");
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let p = |n: &str| dir.join(n).to_string_lossy().to_string();
+    let mut s = super::session();
+    // Source and proxy stills, written by the app itself.
+    s.execute("comp.new", json!({"name": "Red", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
+    let red = s.active_comp_id().unwrap();
+    s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
+    s.execute("comp.saveFrameAs", json!({"path": p("red.png")})).unwrap();
+    s.execute("comp.new", json!({"name": "Blue", "width": 8, "height": 8, "frameRate": 10, "duration": 1})).unwrap();
+    s.execute("layer.newSolid", json!({"color": "#0000ff"})).unwrap();
+    s.execute("comp.saveFrameAs", json!({"path": p("blue.png")})).unwrap();
+    let foot = s.execute("file.import", json!({"paths": [p("red.png")]})).unwrap()["items"][0].as_u64().unwrap();
+    s.execute("file.setProxy", json!({"item": foot, "path": p("blue.png")})).unwrap();
+    s.execute("comp.new", json!({"name": "Out", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
+    let out = s.active_comp_id().unwrap();
+    s.execute("layer.addItem", json!({"item": foot})).unwrap();
+    // Export one frame with each Proxy Use.
+    for (name, using) in [("all", "use_all_[#].png"), ("none", "use_none_[#].png")] {
+        s.execute(
+            "renderQueue.add",
+            json!({"comp": out.0, "format": "png", "output": p(using), "timeSpan": "custom", "start": 0.0, "end": 0.1, "proxyUse": name}),
+        )
+        .unwrap();
+    }
+    s.execute("renderQueue.render", json!({"wait": true})).unwrap();
+    s.poll_render();
+    let centre = |s: &mut effectcraft_engine::Session, path: &str| {
+        let id = s.execute("file.import", json!({"paths": [path]})).unwrap()["items"][0].as_u64().unwrap();
+        s.execute("comp.new", json!({"name": "Probe", "width": 16, "height": 16, "frameRate": 10, "duration": 1})).unwrap();
+        s.execute("layer.addItem", json!({"item": id})).unwrap();
+        let c = s.active_comp_id().unwrap();
+        s.render(c, Default::default(), Default::default()).get(8, 8)
+    };
+    let all = centre(&mut s, &p("use_all_0.png"));
+    assert!(all[2] > 0.99 && all[0] < 0.01, "Use All Proxies renders the blue proxy: {all:?}");
+    let none = centre(&mut s, &p("use_none_0.png"));
+    assert!(none[0] > 0.99 && none[2] < 0.01, "Use No Proxies renders the red source: {none:?}");
+    // Create Proxy ▸ Still: rendered at half size and attached to the comp.
+    s.execute("file.createProxy", json!({"kind": "still", "comp": red.0, "path": p("red_proxy_[#####].png")})).unwrap();
+    s.execute("renderQueue.render", json!({"wait": true})).unwrap();
+    s.poll_render();
+    let px = s.project.item(red).unwrap().proxy.clone().expect("Create Proxy attached the rendered still");
+    assert!(px.enabled);
+    assert_eq!((px.footage.width, px.footage.height), (8, 8));
+    assert!(std::path::Path::new(&px.footage.path).exists(), "{}", px.footage.path);
+}
+
+/// A script builds a comp, queues it and renders it through the Render Queue.
+#[test]
+fn script_renders_through_the_render_queue() {
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-script");
+    let _ = std::fs::remove_dir_all(&dir);
+    let out = dir.join("scripted.gif");
+    let mut s = super::session();
+    let code = format!(
+        r#"
+            var comp = app.project.items.addComp("Scripted", 64, 48, 1, 0.2, 10);
+            var sq = comp.layers.addSolid([1, 0.5, 0], "Square", 16, 16, 1);
+            sq.transform.position.setValueAtTime(0, [8, 24]);
+            sq.transform.position.setValueAtTime(0.1, [56, 24]);
+            var item = app.project.renderQueue.items.add(comp);
+            item.outputModule(1).applyTemplate("GIF");
+            item.outputModule(1).file = new File({});
+            app.project.renderQueue.render();
+            [item.status == RQItemStatus.DONE, item.outputModule(1).file.fsName, app.project.renderQueue.numItems]
+            "#,
+        serde_json::to_string(&out.to_string_lossy()).unwrap()
+    );
+    let r = s.execute("script.run", json!({"code": code})).unwrap();
+    assert_eq!(r["ok"], json!(true), "{r}");
+    assert_eq!(r["result"][0], json!(true), "{r}");
+    assert_eq!(r["result"][2], json!(1));
+    let bytes = std::fs::read(&out).unwrap();
+    assert!(bytes.starts_with(b"GIF89a"));
+}
+
+/// importFile, layers.add(footage) and project save/open from a script.
+#[test]
+fn script_imports_footage_and_saves() {
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out/host-script-import");
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    let q = |n: &str| serde_json::to_string(&dir.join(n).to_string_lossy()).unwrap();
+    let mut s = super::session();
+    let code = format!(
+        r#"
+            var c = app.project.items.addComp("Src", 32, 32, 1, 1, 10);
+            c.layers.addSolid([0, 1, 0], "G", 32, 32, 1);
+            app.run("comp.saveFrameAs", {{comp: c.id, path: {png}}});
+            var still = app.project.importFile(new ImportOptions(new File({png})));
+            var main = app.project.items.addComp("Main", 64, 64, 1, 1, 10);
+            var l = main.layers.add(still);
+            app.project.save(new File({proj}));
+            [still instanceof FootageItem, still.width, still.mainSource.isStill, l.source.name, app.project.file.name]
+            "#,
+        png = q("frame.png"),
+        proj = q("p.ecproj")
+    );
+    let r = s.execute("script.run", json!({"code": code})).unwrap();
+    assert_eq!(r["ok"], json!(true), "{r}");
+    assert_eq!(r["result"], json!([true, 32, true, "frame.png", "p.ecproj"]), "{r}");
+    let r = s.execute("script.run", json!({"code": format!("app.open(new File({})); app.project.numItems", q("p.ecproj"))})).unwrap();
+    assert_eq!(r["result"], json!(5), "{r}"); // Src, Solids, G, frame.png, Main
+}
+
+#[test]
+fn expression_syntax_errors_disable_the_expression() {
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "C", "width": 100, "height": 100, "frameRate": 30, "duration": 2})).unwrap();
+    let a = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
+    let r = s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "1 +* ("})).unwrap();
+    assert!(r["error"].is_string(), "{r}");
+    let pr = s.active_comp().unwrap().layers[0].props.prop("transform/opacity").unwrap().clone();
+    assert!(!pr.expr.unwrap().enabled);
+    assert_eq!(value(&s, a, "transform/opacity").as_f64(), 100.0);
+    s.execute("prop.setExpression", json!({"layer": a, "path": "transform/opacity", "expression": "50"})).unwrap();
+    assert_eq!(value(&s, a, "transform/opacity").as_f64(), 50.0);
+}
+/// Create Stereo 3D Rig: the eye cameras' expressions follow the master camera and the
+/// Stereo 3D Controls (and agree with the values the command wrote).
+#[test]
+fn stereo_rig_expressions_follow_the_master_camera() {
+    let mut s = super::session();
+    s.execute("comp.new", json!({"name": "Shot", "width": 640, "height": 360, "frameRate": 30, "duration": 2})).unwrap();
+    let src = s.active_comp_id().unwrap();
+    let cam = s.execute("layer.newCamera", json!({"name": "Main", "position": [320, 180, -800], "poi": [320, 180, 0], "zoom": 900})).unwrap()["layer"]
+        .as_u64()
+        .unwrap();
+    let r = s.execute("camera.stereoRig", json!({"sceneDepth": 4})).unwrap();
+    let ctl = r["controls"].as_u64().unwrap();
+    let left = effectcraft_engine::project::ItemId(r["leftComp"].as_u64().unwrap());
+    // The left eye camera's evaluated value (expressions on).
+    let v3 = |s: &effectcraft_engine::Session, path: &str| {
+        let comp = s.project.comp(left).unwrap();
+        let layer = &comp.layers[0];
+        let ctx =
+            effectcraft_engine::render::EvalCtx { project: &s.project, comp_id: left, comp, time: Default::default(), expr: s.expr.as_deref(), footage: None };
+        ctx.value(layer, layer.props.prop(path).unwrap()).as_vec3()
+    };
+    let close = |a: [f64; 3], b: [f64; 3]| (0..3).all(|i| (a[i] - b[i]).abs() < 1e-6);
+    let d = 0.04 * 640.0;
+    assert!(close(v3(&s, "transform/position"), [320.0 - d / 2.0, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
+    assert!(close(v3(&s, "transform/poi"), [320.0 - d / 2.0, 180.0, 0.0]), "{:?}", v3(&s, "transform/poi"));
+    // Moving the master moves the eyes.
+    s.execute("comp.open", json!({"comp": src.0})).unwrap();
+    s.execute("prop.set", json!({"layer": cam, "path": "transform/position", "value": [300, 180, -800]})).unwrap();
+    s.execute("prop.set", json!({"layer": cam, "path": "transform/poi", "value": [300, 180, 0]})).unwrap();
+    assert!(close(v3(&s, "transform/position"), [300.0 - d / 2.0, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
+    // Controls: Center & Left puts the left eye a full separation left; convergence toes in.
+    s.execute("prop.set", json!({"layer": ctl, "path": "effects/#1/configuration", "value": 2})).unwrap();
+    s.execute("prop.set", json!({"layer": ctl, "path": "effects/#1/convergence", "value": true})).unwrap();
+    assert!(close(v3(&s, "transform/position"), [300.0 - d, 180.0, -800.0]), "{:?}", v3(&s, "transform/position"));
+    assert!(close(v3(&s, "transform/poi"), [300.0, 180.0, 0.0]), "{:?}", v3(&s, "transform/poi"));
+}
diff --git a/crates/host/tests/background_presets.rs b/crates/host/tests/it/background_presets.rs
similarity index 100%
rename from crates/host/tests/background_presets.rs
rename to crates/host/tests/it/background_presets.rs
diff --git a/crates/host/tests/it/cryptomatte_pick.rs b/crates/host/tests/it/cryptomatte_pick.rs
new file mode 100644
index 000000000..69092ce95
--- /dev/null
+++ b/crates/host/tests/it/cryptomatte_pick.rs
@@ -0,0 +1,127 @@
+//! The Cryptomatte eyedropper on real OpenEXR footage (#473): `effect.pickCryptomatte` reads the
+//! file's Cryptomatte ranks and manifest, edits the Selection, and the rendered matte follows,
+//! including undo.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::time::Tick;
+use effectcraft_raster::channels3d::{crypto_float, crypto_hash};
+use serde_json::json;
+
+const RIGHT: &str = "Right, \"Box\"";
+
+/// An 8 × 4 EXR: white RGBA, and a CryptoObject layer with `Left` in columns before `split` and
+/// the comma-and-quotes name from there, both named in its manifest.
+fn crypto_exr(tag: &str, split: usize) -> String {
+    use exr::prelude::*;
+    let (w, h) = (8usize, 4usize);
+    let ids: Vec<f32> = (0..w * h).map(|i| crypto_float(crypto_hash(if i % w < split { "Left" } else { RIGHT }))).collect();
+    let ch = |n: &str, v: Vec<f32>| AnyChannel::new(n, FlatSamples::F32(v));
+    let one = || vec![1.0f32; w * h];
+    let channels = AnyChannels::sort(
+        vec![ch("R", one()), ch("G", one()), ch("B", one()), ch("A", one()), ch("CryptoObject00.R", ids), ch("CryptoObject00.G", one())].into(),
+    );
+    let mut layer = Layer::new((w, h), LayerAttributes::default(), Encoding::FAST_LOSSLESS, channels);
+    let manifest = json!({"Left": format!("{:08x}", crypto_hash("Left")), RIGHT: format!("{:08x}", crypto_hash(RIGHT))}).to_string();
+    for (k, v) in [("name", "CryptoObject".to_string()), ("manifest", manifest)] {
+        layer.attributes.other.insert(Text::from(format!("cryptomatte/f834d0a/{k}").as_str()), AttributeValue::Text(Text::from(v.as_str())));
+    }
+    // A folder of its own: numbered siblings would import as an image sequence.
+    let dir = std::env::temp_dir().join(format!("ec-crypto-pick-{tag}-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("crypto.exr");
+    Image::from_layer(layer).write().to_file(&path).unwrap();
+    path.to_string_lossy().to_string()
+}
+
+/// A session with the EXR as a layer of a 2 s comp, under a Cryptomatte effect.
+fn footage(tag: &str, split: usize) -> (Session, String) {
+    let path = crypto_exr(tag, split);
+    let mut s = effectcraft_host::session();
+    let r = s.execute("file.import", json!({"paths": [path]})).unwrap();
+    assert_eq!(r["errors"], json!([]), "{r}");
+    s.execute("comp.new", json!({"name": "Crypto", "width": 8, "height": 4, "frameRate": 24, "duration": 2})).unwrap();
+    s.execute("layer.addItem", json!({"item": r["items"][0]})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    (s, path)
+}
+
+/// The matte's alpha over the left and right halves.
+fn matte(s: &Session) -> [f32; 2] {
+    let img = s.render(s.active_comp_id().unwrap(), Tick::ZERO, Default::default());
+    [img.get(1, 1)[3], img.get(6, 2)[3]]
+}
+
+#[test]
+fn picking_on_a_cryptomatte_exr_edits_the_selection_and_the_matte() {
+    let (mut s, path) = footage("edit", 4);
+    s.execute_checked("prop.set", json!({"path": "effects/#1/display", "value": 1})).unwrap();
+    assert_eq!(matte(&s), [0.0, 0.0], "nothing selected");
+    let pick = |s: &mut Session, x: f64, mode: &str| s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": x, "y": 1, "mode": mode})).unwrap();
+
+    assert_eq!(pick(&mut s, 1.0, "replace")["selection"], "Left");
+    assert_eq!(matte(&s), [1.0, 0.0]);
+    let r = pick(&mut s, 6.0, "add");
+    assert_eq!((r["name"].as_str(), r["layer"].as_str()), (Some(RIGHT), Some("CryptoObject")), "{r}");
+    assert_eq!(r["selection"], r#"Left, "Right, \"Box\"""#);
+    assert_eq!(matte(&s), [1.0, 1.0], "the quoted name selects the right half");
+    pick(&mut s, 2.0, "remove");
+    assert_eq!(matte(&s), [0.0, 1.0]);
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(matte(&s), [1.0, 1.0]);
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(matte(&s), [1.0, 0.0]);
+    let _ = std::fs::remove_dir_all(std::path::Path::new(&path).parent().unwrap());
+}
+
+/// At half resolution a preview pixel shows the aux texel at its centre (layer x 3 for preview
+/// pixel 1): `scale` makes the pick read that one, so what is clicked is what lights up.
+#[test]
+fn a_pick_at_preview_resolution_reads_the_pixel_the_preview_shows() {
+    let (mut s, path) = footage("half", 3);
+    s.execute_checked("prop.set", json!({"path": "effects/#1/matteOnly", "value": true})).unwrap();
+    let r = s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 2.5, "y": 1.5, "scale": 0.5})).unwrap();
+    assert_eq!(r["name"], RIGHT, "{r}");
+    let opts = effectcraft_engine::render::RenderOpts { scale: 0.5, ..Default::default() };
+    assert_eq!(s.render(s.active_comp_id().unwrap(), Tick::ZERO, opts).get(1, 0)[3], 1.0);
+    // At full resolution the same point is Left's pixel.
+    let r = s.execute_checked("effect.cryptomatteAt", json!({"effect": 1, "x": 2.5, "y": 1.5})).unwrap();
+    assert_eq!(r["name"], "Left");
+    let _ = std::fs::remove_dir_all(std::path::Path::new(&path).parent().unwrap());
+}
+
+/// A keyframed Selection picked at `time` is edited at that time, not at the current time.
+#[test]
+fn a_keyframed_selection_is_edited_where_it_was_read() {
+    let (mut s, path) = footage("key", 4);
+    for t in [0.0, 1.0] {
+        s.execute_checked("prop.addKey", json!({"path": "effects/#1/selection", "time": t, "value": format!("<{:08x}>", crypto_hash(RIGHT))})).unwrap();
+    }
+    let r = s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 0.5, "y": 1.5, "mode": "add", "time": 1.0})).unwrap();
+    assert_eq!((r["changed"].as_bool(), r["selected"].as_bool()), (Some(true), Some(true)), "{r}");
+    let sel = |s: &mut Session, t: f64| {
+        let r = s.execute("effect.cryptomatteAt", json!({"effect": 1, "x": 0.5, "y": 1.5, "time": t})).unwrap();
+        r["selected"].as_bool()
+    };
+    assert_eq!((sel(&mut s, 0.0), sel(&mut s, 1.0)), (Some(false), Some(true)), "only the key at 1 s gains Left");
+    let _ = std::fs::remove_dir_all(std::path::Path::new(&path).parent().unwrap());
+}
+
+/// A precomp whose 3D layer an expression moves: the pick finds it where the render keys it
+/// (the pick's aux pass runs the session's expressions).
+#[test]
+fn a_pick_on_a_precomp_follows_expressions() {
+    let mut s = effectcraft_host::session();
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 40, "height": 20, "frameRate": 24, "duration": 1})).unwrap()["comp"].clone();
+    let l = s.execute("layer.newSolid", json!({"name": "Ball", "width": 6, "height": 6})).unwrap()["layer"].clone();
+    s.execute("layer.setSwitch", json!({"layers": [l], "switch": "threeD", "value": true})).unwrap();
+    s.execute_checked("prop.setExpression", json!({"layer": l, "path": "transform/position", "expression": "[33, 10, 0]"})).unwrap();
+    s.execute("comp.new", json!({"name": "Outer", "width": 40, "height": 20, "frameRate": 24, "duration": 1})).unwrap();
+    s.execute("layer.addItem", json!({"item": inner})).unwrap();
+    s.execute_checked("effect.apply", json!({"effect": "Cryptomatte"})).unwrap();
+    s.execute_checked("prop.set", json!({"path": "effects/#1/matteOnly", "value": true})).unwrap();
+    let r = s.execute_checked("effect.pickCryptomatte", json!({"effect": 1, "x": 33.5, "y": 10.5})).unwrap();
+    assert_eq!(r["selection"], "Ball", "{r}");
+    let img = s.render(s.active_comp_id().unwrap(), Tick::ZERO, Default::default());
+    assert_eq!((img.get(33, 10)[3], img.get(20, 10)[3]), (1.0, 0.0));
+    assert_eq!(s.execute("effect.cryptomatteAt", json!({"effect": 1, "x": 20.5, "y": 10.5})).unwrap(), serde_json::Value::Null);
+}
diff --git a/crates/host/tests/determinism.rs b/crates/host/tests/it/determinism.rs
similarity index 100%
rename from crates/host/tests/determinism.rs
rename to crates/host/tests/it/determinism.rs
diff --git a/crates/host/tests/exr_layers.rs b/crates/host/tests/it/exr_layers.rs
similarity index 100%
rename from crates/host/tests/exr_layers.rs
rename to crates/host/tests/it/exr_layers.rs
diff --git a/crates/host/tests/footage_reload.rs b/crates/host/tests/it/footage_reload.rs
similarity index 71%
rename from crates/host/tests/footage_reload.rs
rename to crates/host/tests/it/footage_reload.rs
index 6834fc543..faf2b09e3 100644
--- a/crates/host/tests/footage_reload.rs
+++ b/crates/host/tests/it/footage_reload.rs
@@ -213,3 +213,80 @@ fn a_new_project_importing_an_overwritten_file_shows_the_new_pixels() {
     let cid = s.active_comp_id().unwrap();
     assert!(near(pixel(&s, cid, 32, 24), BLUE), "stale pixels from the earlier project: {:?}", pixel(&s, cid, 32, 24));
 }
+
+fn layered_comp(s: &mut Session, path: &str, import_as: &str) -> ItemId {
+    let r = s.execute_checked("file.import", json!({"paths": [path], "importAs": import_as})).unwrap();
+    ItemId(r["comps"][0].as_u64().unwrap())
+}
+
+/// Composition imports create their sources before probing ordinary footage (#1070).
+#[test]
+fn fresh_layered_composition_import_refreshes_its_sources() {
+    for import_as in ["composition", "compositionLayerSizes"] {
+        let path = tmp(&format!("fresh-{import_as}.psd"));
+        let (red, blue) = (flat(RED, false), flat(BLUE, false));
+        assert_eq!(red.len(), blue.len(), "the overwritten file has the same byte size");
+        std::fs::write(&path, red).unwrap();
+        let mut s = effectcraft_host::session();
+        let old_comp = layered_comp(&mut s, &path, import_as);
+        assert!(near(pixel(&s, old_comp, 32, 24), RED));
+        s.execute_checked("file.newProject", json!({})).unwrap();
+        save(&path, &blue);
+        s.drain_events();
+        let comp = layered_comp(&mut s, &path, import_as);
+        assert_eq!(comp, old_comp, "new projects reuse their item ids");
+        assert!(!s.drain_events().contains(&effectcraft_engine::Event::PurgeCaches), "import must retain the RAM preview");
+        assert!(near(pixel(&s, comp, 32, 24), BLUE), "layered import showed {:?}", pixel(&s, comp, 32, 24));
+        std::fs::remove_file(path).unwrap();
+    }
+}
+
+#[test]
+fn layered_reimport_refreshes_existing_layers_and_keeps_unrelated_decoded_files() {
+    let path = tmp("layered-reimport.psd");
+    let other = tmp("layered-unchanged.psd");
+    std::fs::write(&path, flat(RED, false)).unwrap();
+    std::fs::write(&other, flat(GREEN, false)).unwrap();
+    let mut s = effectcraft_host::session();
+    let comp = layered_comp(&mut s, &path, "compositionLayerSizes");
+    let r = s.execute_checked("file.import", json!({"paths": [&other]})).unwrap();
+    let other_item = ItemId(r["items"][0].as_u64().unwrap());
+    let other_footage = footage(&s, other_item);
+    let cached = s.footage.frame(other_item, &other_footage, Tick::ZERO).unwrap();
+    assert!(near(pixel(&s, comp, 32, 24), RED));
+    let before = s.project.clone();
+    let undo = s.history.undo.len();
+    save(&path, &flat(BLUE, false));
+    s.drain_events();
+    layered_comp(&mut s, &path, "compositionLayerSizes");
+    assert!(!s.drain_events().contains(&effectcraft_engine::Event::PurgeCaches), "import must retain the RAM preview");
+    assert!(near(pixel(&s, comp, 32, 24), BLUE), "existing layers see the refreshed source");
+    assert!(std::sync::Arc::ptr_eq(&cached, &s.footage.frame(other_item, &other_footage, Tick::ZERO).unwrap()));
+    assert_eq!(s.history.undo.len(), undo + 1, "composition import stays one undo step");
+    s.undo();
+    assert!(std::sync::Arc::ptr_eq(&s.project, &before));
+    assert!(near(pixel(&s, comp, 32, 24), BLUE), "undo does not undo an external file write");
+    std::fs::remove_file(path).unwrap();
+    std::fs::remove_file(other).unwrap();
+}
+
+#[test]
+fn background_import_refreshes_layered_sources_before_the_probe_job_finishes() {
+    let path = tmp("layered-background.psd");
+    let other = tmp("layered-background.png");
+    std::fs::write(&path, flat(RED, false)).unwrap();
+    image::RgbaImage::from_pixel(64, 48, image::Rgba([0, 255, 0, 255])).save(&other).unwrap();
+    let mut s = effectcraft_host::session();
+    let comp = layered_comp(&mut s, &path, "compositionLayerSizes");
+    assert!(near(pixel(&s, comp, 32, 24), RED));
+    save(&path, &flat(BLUE, false));
+    s.drain_events();
+    let r = s.execute_checked("file.import", json!({"paths": [&path, &other], "importAs": "compositionLayerSizes", "background": true})).unwrap();
+    assert_eq!(r["started"], true, "ordinary footage is probed in a background job");
+    assert!(near(pixel(&s, comp, 32, 24), BLUE), "composition sources are refreshed before the job is applied");
+    s.wait_jobs();
+    assert!(!s.drain_events().contains(&effectcraft_engine::Event::PurgeCaches), "import must retain the RAM preview");
+    assert!(near(pixel(&s, s.active_comp_id().unwrap(), 32, 24), BLUE));
+    std::fs::remove_file(path).unwrap();
+    std::fs::remove_file(other).unwrap();
+}
diff --git a/crates/host/tests/gif_animates.rs b/crates/host/tests/it/gif_animates.rs
similarity index 100%
rename from crates/host/tests/gif_animates.rs
rename to crates/host/tests/it/gif_animates.rs
diff --git a/crates/host/tests/it/main.rs b/crates/host/tests/it/main.rs
new file mode 100644
index 000000000..73fc04841
--- /dev/null
+++ b/crates/host/tests/it/main.rs
@@ -0,0 +1,14 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod background_presets;
+mod cryptomatte_pick;
+mod determinism;
+mod exr_layers;
+mod footage_reload;
+mod gif_animates;
+mod plugins;
+mod relink;
+mod tga_import;
+mod timeline_interop;
+mod vector_import;
+mod webm_metadata;
diff --git a/crates/host/tests/plugins.rs b/crates/host/tests/it/plugins.rs
similarity index 100%
rename from crates/host/tests/plugins.rs
rename to crates/host/tests/it/plugins.rs
diff --git a/crates/host/tests/relink.rs b/crates/host/tests/it/relink.rs
similarity index 100%
rename from crates/host/tests/relink.rs
rename to crates/host/tests/it/relink.rs
diff --git a/crates/host/tests/it/tga_import.rs b/crates/host/tests/it/tga_import.rs
new file mode 100644
index 000000000..5462f4bec
--- /dev/null
+++ b/crates/host/tests/it/tga_import.rs
@@ -0,0 +1,48 @@
+//! Targa import through the same host and commands used by the desktop and CLI.
+
+use effectcraft_engine::render::RenderOpts;
+use effectcraft_project::{FootageKind, ItemId, ItemKind};
+use effectcraft_time::{FrameRate, Tick};
+use serde_json::json;
+
+#[test]
+fn tga_stills_and_numbered_sequences_import_and_render() {
+    let dir = std::env::temp_dir().join(format!("effectcraft-tga-import-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    // A generated 4×4, 24-bit, top-origin TGA. No binary fixtures are retained.
+    let write = |name: &str, bgr: [u8; 3]| {
+        let mut bytes = vec![0; 18];
+        bytes[2] = 2;
+        bytes[12] = 4;
+        bytes[14] = 4;
+        bytes[16] = 24;
+        bytes[17] = 0x20;
+        bytes.extend_from_slice(&bgr.repeat(16));
+        let path = dir.join(name);
+        std::fs::write(&path, bytes).unwrap();
+        path.to_string_lossy().to_string()
+    };
+    let still = write("still.TGA", [0, 0, 255]);
+    let first = write("shot_0001.tga", [0, 0, 255]);
+    write("shot_0002.tga", [255, 0, 0]);
+    for (path, sequence) in [(still, false), (first, true)] {
+        let mut session = effectcraft_host::session();
+        let imported = session.execute_checked("file.import", json!({"paths": [path], "sequence": sequence})).unwrap();
+        assert_eq!(imported["errors"], json!([]), "{imported}");
+        assert_eq!(imported["items"].as_array().unwrap().len(), 1);
+        let item = ItemId(imported["items"][0].as_u64().unwrap());
+        let ItemKind::Footage(footage) = &session.project.item(item).unwrap().kind else { panic!("not footage") };
+        assert_eq!(footage.kind, if sequence { FootageKind::Sequence } else { FootageKind::Still });
+        assert_eq!(footage.sequence.len(), if sequence { 2 } else { 0 });
+        session.execute_checked("comp.new", json!({"name": "TGA", "width": 4, "height": 4, "frameRate": 30, "duration": 1})).unwrap();
+        session.execute_checked("layer.addItem", json!({"item": item.0})).unwrap();
+        let comp = session.active_comp_id().unwrap();
+        let image = session.render(comp, Tick::ZERO, RenderOpts::default());
+        assert_eq!(image.get(2, 2), [1.0, 0.0, 0.0, 1.0]);
+        if sequence {
+            let image = session.render(comp, FrameRate::FPS_30.tick_of(1), RenderOpts::default());
+            assert_eq!(image.get(2, 2), [0.0, 0.0, 1.0, 1.0]);
+        }
+    }
+    std::fs::remove_dir_all(dir).unwrap();
+}
diff --git a/crates/host/tests/timeline_interop.rs b/crates/host/tests/it/timeline_interop.rs
similarity index 100%
rename from crates/host/tests/timeline_interop.rs
rename to crates/host/tests/it/timeline_interop.rs
diff --git a/crates/host/tests/vector_import.rs b/crates/host/tests/it/vector_import.rs
similarity index 99%
rename from crates/host/tests/vector_import.rs
rename to crates/host/tests/it/vector_import.rs
index 49f8d950c..36d83dd1a 100644
--- a/crates/host/tests/vector_import.rs
+++ b/crates/host/tests/it/vector_import.rs
@@ -121,8 +121,8 @@ fn psd_16bit_cmyk_composition_imports() {
     assert!(d < 2.0 / 255.0, "mean diff {d}");
 }
 
-const SVG: &[u8] = include_bytes!("../../svg/tests/fixtures/basic-shapes.svg");
-const SVG2: &[u8] = include_bytes!("../../svg/tests/fixtures/paths-gradients.svg");
+const SVG: &[u8] = include_bytes!("../../../svg/tests/fixtures/basic-shapes.svg");
+const SVG2: &[u8] = include_bytes!("../../../svg/tests/fixtures/paths-gradients.svg");
 
 #[test]
 fn svg_footage_and_shapes_from_vector_layer() {
diff --git a/crates/host/tests/webm_metadata.rs b/crates/host/tests/it/webm_metadata.rs
similarity index 100%
rename from crates/host/tests/webm_metadata.rs
rename to crates/host/tests/it/webm_metadata.rs
diff --git a/crates/keyframe/src/lib.rs b/crates/keyframe/src/lib.rs
index e0ee137ba..f2d94f177 100644
--- a/crates/keyframe/src/lib.rs
+++ b/crates/keyframe/src/lib.rs
@@ -327,7 +327,12 @@ fn auto_spatial(keys: &[Keyframe], i: usize) -> ([f64; 3], [f64; 3]) {
     let a = v3(&keys[i.saturating_sub(1)].value);
     let c = v3(&keys[(i + 1).min(keys.len() - 1)].value);
     let tout = [(c[0] - a[0]) / 6.0, (c[1] - a[1]) / 6.0, (c[2] - a[2]) / 6.0];
-    ([-tout[0], -tout[1], -tout[2]], tout)
+    // A side facing a key at the same position gets no tangent, so the segment between two
+    // identical keys has zero length and the layer holds still (#1675).
+    let p = v3(&keys[i].value);
+    let tin = if i > 0 && a == p { [0.0; 3] } else { [-tout[0], -tout[1], -tout[2]] };
+    let tout = if i + 1 < keys.len() && c == p { [0.0; 3] } else { tout };
+    (tin, tout)
 }
 
 /// Effective spatial tangents of key `i` (auto or stored).
@@ -642,382 +647,4 @@ pub fn easy_ease(k: &mut Keyframe, ease_in: bool, ease_out: bool) {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn s(x: f64) -> Tick {
-        Tick::from_seconds_f64(x)
-    }
-
-    #[test]
-    fn missing_spatial_keys_have_no_tangents_or_length() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0]))];
-        for i in [1, usize::MAX] {
-            assert_eq!(spatial_tangents(&keys, i), ([0.0; 3], [0.0; 3]));
-            assert_eq!(spatial_segment_length(&keys, i), 0.0);
-        }
-        assert_eq!(spatial_tangents(&[], 0), ([0.0; 3], [0.0; 3]));
-        assert_eq!(spatial_segment_length(&[], usize::MAX), 0.0);
-    }
-
-    #[test]
-    fn time_reverse_handles_deserialized_tick_extremes() {
-        // Tick's public serde representation can contain values beyond from_seconds_f64's cap.
-        for (first, last) in [(i64::MIN, i64::MIN + 10), (i64::MAX - 10, i64::MAX), (i64::MIN, i64::MAX)] {
-            let mut keys = vec![Keyframe::new(Tick(first), Value::Scalar(1.0)), Keyframe::new(Tick(last), Value::Scalar(2.0))];
-            time_reverse(&mut keys);
-            assert_eq!(keys[0].time, Tick(first));
-            assert_eq!(keys[0].value, Value::Scalar(2.0));
-            assert_eq!(keys[1].time, Tick(last));
-            assert_eq!(keys[1].value, Value::Scalar(1.0));
-            time_reverse(&mut keys);
-            assert_eq!(keys[0].value, Value::Scalar(1.0));
-        }
-    }
-
-    #[test]
-    fn roving_handles_deserialized_tick_extremes() {
-        let mut keys = vec![
-            Keyframe::new(Tick(i64::MIN), Value::Vec2([0.0, 0.0])),
-            Keyframe::new(Tick(10), Value::Vec2([50.0, 0.0])),
-            Keyframe::new(Tick(i64::MAX), Value::Vec2([100.0, 0.0])),
-        ];
-        for key in &mut keys {
-            key.spatial_auto = false;
-        }
-        keys[1].roving = true;
-        assert!(retime_roving(&mut keys, true));
-        assert_eq!(keys[1].time, Tick::ZERO);
-    }
-
-    #[test]
-    fn replacing_key_preserves_spatial_metadata() {
-        let mut key = Keyframe::new(s(1.0), Value::Vec2([20.0, 30.0]));
-        key.roving = true;
-        key.spatial_continuous = true;
-        let mut keys = vec![key];
-        set_key(&mut keys, Keyframe::new(s(1.0), Value::Vec2([40.0, 50.0])));
-        assert!(keys[0].roving);
-        assert!(keys[0].spatial_continuous);
-        assert_eq!(keys[0].value, Value::Vec2([40.0, 50.0]));
-    }
-
-    #[test]
-    fn temporal_ease_matches_live_ae_with_overlapping_influences() {
-        // Original Rotation probe via AEsync 2.0.4, AE 26.3x87, 2026-10-05.
-        // AE retains each handle's requested influence even when their sum exceeds 100%.
-        for (from, to, out_speed, out_inf, in_speed, in_inf, samples) in [
-            (0.0, 100.0, 0.0, 0.8, 0.0, 0.8, [(0.1, 0.59243939036327), (0.25, 4.76438030608764), (0.4, 18.4284394271562), (0.75, 95.2356196939123)]),
-            (0.0, 100.0, 20.0, 0.8, 80.0, 0.6, [(0.1, 2.25754942621577), (0.25, 6.99841889412931), (0.4, 14.9334636959052), (0.75, 73.8196785378389)]),
-            (100.0, 0.0, -20.0, 0.6, -80.0, 0.8, [(0.1, 97.6395466334594), (0.25, 91.597048571292), (0.4, 74.5367957474338), (0.75, 22.3789127753126)]),
-        ] {
-            let mut a = Keyframe::new(s(0.0), Value::Scalar(from));
-            let mut b = Keyframe::new(s(1.0), Value::Scalar(to));
-            a.out_interp = Interp::Bezier;
-            b.in_interp = Interp::Bezier;
-            a.out_ease = vec![Ease { speed: out_speed, influence: out_inf }];
-            b.in_ease = vec![Ease { speed: in_speed, influence: in_inf }];
-            for (time, expected) in samples {
-                let value = evaluate(&[a.clone(), b.clone()], s(time), false).unwrap().as_f64();
-                assert!((value - expected).abs() < 1e-7, "{time}: {value} != {expected}");
-                let normalized = ease_progress(out_speed / (to - from), out_inf, in_speed / (to - from), in_inf, time);
-                assert!((from + normalized * (to - from) - expected).abs() < 1e-7);
-            }
-        }
-    }
-
-    #[test]
-    fn maximum_influence_resolves_flat_midpoint_time_curve() {
-        for time in [0.5 - 1e-9, 0.5 - 1e-12, 0.5, 0.5 + 1e-12, 0.5 + 1e-9] {
-            // At 100%/100%, x = 0.5 + 4*(u - 0.5)^3 exactly.
-            let u = 0.5 + ((time - 0.5) / 4.0_f64).cbrt();
-            let expected = bez(0.0, 0.0, 1.0, 1.0, u);
-            let actual = ease_progress(0.0, 1.0, 0.0, 1.0, time);
-            assert!((actual - expected).abs() < 1e-10, "{time}: {actual} != {expected}");
-        }
-    }
-
-    /// M13.15: agents set gradients as plain JSON, not only the tagged form `get` returns.
-    #[test]
-    fn gradients_coerce_from_plain_json() {
-        let g = Value::Gradient(Gradient::default());
-        let plain = serde_json::json!({"colors": [[0, [0, 0.5, 1, 1]], [1, "#ffff00"]], "opacities": [[0, 1], [1, 0.5]]});
-        let Some(Value::Gradient(a)) = g.coerce_json(&plain) else { panic!("object form") };
-        assert_eq!(a.colors, vec![(0.0, [0.0, 0.5, 1.0, 1.0]), (1.0, [1.0, 1.0, 0.0, 1.0])]);
-        assert_eq!(a.opacities, vec![(0.0, 1.0), (1.0, 0.5)]);
-        let Some(Value::Gradient(b)) = g.coerce_json(&serde_json::json!(["#ff0000", "#00ff00", "#0000ff"])) else { panic!("list form") };
-        assert_eq!(b.colors.iter().map(|c| c.0).collect::<Vec<_>>(), vec![0.0, 0.5, 1.0]);
-        assert_eq!(b.opacities.len(), 3);
-        // The tagged form (what prop.get returns) still round-trips.
-        assert_eq!(g.coerce_json(&g.to_json()), Some(g.clone()));
-        assert_eq!(g.coerce_json(&serde_json::json!(5)), None);
-    }
-
-    /// #612: the gradient editor samples a new stop from its own track only. `sample` multiplies
-    /// in the opacity stops, so feeding its alpha into a colour stop would apply 50% twice (25%).
-    #[test]
-    fn gradient_tracks_sample_separately() {
-        let g = Gradient { colors: vec![(0.0, [1.0, 0.0, 0.0, 0.8]), (1.0, [0.0, 0.0, 1.0, 0.4])], opacities: vec![(0.0, 0.5), (1.0, 0.5)] };
-        let c = g.color_at(0.5);
-        assert!((c[0] - 0.5).abs() < 1e-6 && (c[2] - 0.5).abs() < 1e-6, "{c:?}");
-        assert!((c[3] - 0.6).abs() < 1e-6, "the colour track's own alpha, without opacity: {c:?}");
-        assert!((g.opacity_at(0.5) - 0.5).abs() < 1e-6);
-        assert!((g.sample(0.5)[3] - 0.3).abs() < 1e-6, "sample still applies opacity once");
-        // A stop added at 50% from the opacity track keeps 50%: sampled again, it is still 50%.
-        let mut with_stop = g.clone();
-        with_stop.opacities.insert(1, (0.5, g.opacity_at(0.5)));
-        assert!((with_stop.opacity_at(0.5) - 0.5).abs() < 1e-6);
-        assert!((with_stop.sample(0.5)[3] - 0.3).abs() < 1e-6, "adding a stop doesn't change the look");
-        // Outside the stops, and with none: the ends hold, and an empty track is opaque white.
-        assert_eq!(g.color_at(-1.0), [1.0, 0.0, 0.0, 0.8]);
-        assert_eq!(g.color_at(2.0), [0.0, 0.0, 1.0, 0.4]);
-        let empty = Gradient { colors: vec![], opacities: vec![] };
-        assert_eq!((empty.color_at(0.3), empty.opacity_at(0.3)), ([1.0; 4], 1.0));
-    }
-
-    /// #612: the editor saves the typed form, so one colour stop (which the plain JSON parser
-    /// rejects) and each stop's RGBA come back exactly.
-    #[test]
-    fn typed_gradient_round_trips_one_stop_and_rgba() {
-        let one = Value::Gradient(Gradient { colors: vec![(0.25, [0.1, 0.2, 0.3, 0.7])], opacities: vec![(0.0, 1.0), (0.6, 0.35)] });
-        let cur = Value::Gradient(Gradient::default());
-        assert_eq!(cur.coerce_json(&one.to_json()), Some(one.clone()));
-        assert_eq!(cur.coerce_json(&serde_json::json!({"colors": [[0.25, [0.1, 0.2, 0.3, 0.7]]]})), None, "plain JSON needs two colours");
-    }
-
-    #[test]
-    fn linear_and_hold() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0))];
-        assert_eq!(evaluate(&keys, s(1.0), false), Some(Value::Scalar(50.0)));
-        assert_eq!(evaluate(&keys, s(-1.0), false), Some(Value::Scalar(0.0)));
-        assert_eq!(evaluate(&keys, s(3.0), false), Some(Value::Scalar(100.0)));
-        let held = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)).hold(), Keyframe::new(s(2.0), Value::Scalar(100.0))];
-        assert_eq!(evaluate(&held, s(1.999), false), Some(Value::Scalar(0.0)));
-    }
-
-    #[test]
-    fn hold_key_keeps_its_incoming_segment_linear() {
-        // Hold on the second key (in and out, as KeyframeInterpolationType.HOLD sets it) holds
-        // what comes after it, not the linear motion into it.
-        let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0)).hold()];
-        assert_eq!(evaluate(&keys, s(0.5), false), Some(Value::Scalar(25.0)));
-        let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])), Keyframe::new(s(2.0), Value::Vec2([100.0, 0.0])).hold()];
-        let p = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
-        assert!((p[0] - 25.0).abs() < 0.01, "{p:?}");
-    }
-
-    #[test]
-    fn easy_ease_is_symmetric_and_slow_at_ends() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)).eased(), Keyframe::new(s(1.0), Value::Scalar(100.0)).eased()];
-        let mid = evaluate(&keys, s(0.5), false).unwrap().as_f64();
-        assert!((mid - 50.0).abs() < 1e-6, "{mid}");
-        let early = evaluate(&keys, s(0.1), false).unwrap().as_f64();
-        assert!(early < 10.0 && early > 0.0, "{early}");
-        let v0 = velocity(&keys, s(0.01), false)[0];
-        let vm = velocity(&keys, s(0.5), false)[0];
-        assert!(v0 < vm);
-    }
-
-    #[test]
-    fn bezier_with_linear_speed_matches_linear() {
-        let mut a = Keyframe::new(s(0.0), Value::Scalar(0.0));
-        let mut b = Keyframe::new(s(2.0), Value::Scalar(100.0));
-        a.out_interp = Interp::Bezier;
-        b.in_interp = Interp::Bezier;
-        a.out_ease = vec![Ease { speed: 50.0, influence: 1.0 / 3.0 }];
-        b.in_ease = vec![Ease { speed: 50.0, influence: 1.0 / 3.0 }];
-        let keys = vec![a, b];
-        for i in 0..=20 {
-            let t = i as f64 * 0.1;
-            let v = evaluate(&keys, s(t), false).unwrap().as_f64();
-            assert!((v - 50.0 * t).abs() < 1e-6, "{t} {v}");
-        }
-    }
-
-    #[test]
-    fn spatial_linear_constant_speed() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])), Keyframe::new(s(1.0), Value::Vec2([300.0, 400.0]))];
-        let p = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
-        assert!((p[0] - 150.0).abs() < 0.5 && (p[1] - 200.0).abs() < 0.5, "{p:?}");
-    }
-
-    /// #456: along a curved spatial path with linear (constant-speed) keys the speed graph is
-    /// flat, not a sawtooth from a piecewise-linear arc-length table.
-    #[test]
-    fn spatial_curved_path_has_smooth_constant_speed() {
-        let mut a = Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0]));
-        let mut b = Keyframe::new(s(2.0), Value::Vec2([400.0, 0.0]));
-        a.spatial_auto = false;
-        b.spatial_auto = false;
-        a.spatial_out = [50.0, -300.0, 0.0];
-        b.spatial_in = [80.0, 250.0, 0.0];
-        let keys = vec![a, b];
-        let len = spatial_segment_length(&keys, 0);
-        let speeds: Vec<f64> = (1..400).map(|i| speed(&keys, s(i as f64 * 0.005), true)).collect();
-        for v in &speeds {
-            assert!((v - len / 2.0).abs() < 1e-3 * len, "speed {v} vs {}", len / 2.0);
-        }
-    }
-
-    #[test]
-    fn spatial_auto_bezier_passes_through_keys() {
-        let keys = vec![
-            Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])),
-            Keyframe::new(s(1.0), Value::Vec2([100.0, 100.0])),
-            Keyframe::new(s(2.0), Value::Vec2([200.0, 0.0])),
-        ];
-        let p = evaluate(&keys, s(1.0), true).unwrap().as_vec2();
-        assert_eq!(p, [100.0, 100.0]);
-        // Curved: the midpoint of the first segment lies off the straight line.
-        let m = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
-        assert!((m[0] - m[1]).abs() > 1.0, "{m:?}");
-    }
-
-    #[test]
-    fn straight_auto_bezier_path_is_exact() {
-        // Auto-Bezier ends now have handles along the line; the chord is still hit exactly.
-        let keys = vec![Keyframe::new(s(0.0), Value::Vec2([40.0, 50.0])), Keyframe::new(s(2.0), Value::Vec2([120.0, 50.0]))];
-        assert_eq!(segment_value(&keys, 0, s(1.0), true), Value::Vec2([80.0, 50.0]));
-    }
-
-    /// #880: a motion path whose arc length overflows (huge coordinates, as the Position field
-    /// accepts) or is NaN evaluates without panicking: scrubbing over it crashed the app.
-    #[test]
-    fn overflowing_or_nan_motion_paths_evaluate() {
-        let paths = [
-            [[-1.7e308, 0.0], [1.7e308, 0.0], [-1.7e308, 5.0]],
-            [[0.0, 0.0], [f64::NAN, 10.0], [20.0, 0.0]],
-            [[f64::INFINITY, 0.0], [0.0, f64::NEG_INFINITY], [20.0, 0.0]],
-        ];
-        for path in paths {
-            let mut keys: Vec<Keyframe> = path.iter().enumerate().map(|(i, &v)| Keyframe::new(s(i as f64 * 2.0), Value::Vec2(v))).collect();
-            for eased in [false, true] {
-                if eased {
-                    keys = keys.into_iter().map(Keyframe::eased).collect();
-                }
-                for f in 0..=40 {
-                    let t = s(f as f64 * 0.1);
-                    assert!(evaluate(&keys, t, true).is_some());
-                    let _ = speed(&keys, t, true);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn spatial_auto_bezier_tangents_follow_after_effects() {
-        // Measured on After Effects 26.3 with original paths (docs/fidelity/README.md): each
-        // auto-Bezier key's out tangent is (next - previous) / 6 and its in tangent the mirror,
-        // whatever the key times. End keys use their one neighbour: (neighbour - key) / 6.
-        let p = [[40.0, 300.0, 0.0], [260.0, 80.0, 20.0], [700.0, 420.0, -40.0], [1100.0, 150.0, 0.0]];
-        let mut keys: Vec<Keyframe> = [0.0, 0.2, 1.5, 1.8].iter().zip(p).map(|(&t, v)| Keyframe::new(s(t), Value::Vec3(v))).collect();
-        let sixth = |a: [f64; 3], b: [f64; 3]| [(b[0] - a[0]) / 6.0, (b[1] - a[1]) / 6.0, (b[2] - a[2]) / 6.0];
-        let neg = |v: [f64; 3]| [-v[0], -v[1], -v[2]];
-        let close = |a: [f64; 3], b: [f64; 3]| a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1e-9);
-        let want = [sixth(p[0], p[1]), sixth(p[0], p[2]), sixth(p[1], p[3]), sixth(p[2], p[3])];
-        for (i, out) in want.into_iter().enumerate() {
-            let (tin, tout) = spatial_tangents(&keys, i);
-            assert!(close(tout, out) && close(tin, neg(out)), "key {i}: {tin:?} {tout:?}");
-        }
-        // Moving a key in time leaves every tangent as it was.
-        keys[1].time = s(1.2);
-        assert!(close(spatial_tangents(&keys, 1).1, sixth(p[0], p[2])));
-        // A key between two coincident neighbours, and a lone key, have none.
-        let still = [[5.0, 5.0], [9.0, 1.0], [5.0, 5.0]].iter().enumerate().map(|(i, &v)| Keyframe::new(s(i as f64), Value::Vec2(v))).collect::<Vec<_>>();
-        assert_eq!(spatial_tangents(&still, 1), ([0.0; 3], [0.0; 3]));
-        assert_eq!(spatial_tangents(&still[..1], 0), ([0.0; 3], [0.0; 3]));
-    }
-
-    #[test]
-    fn set_key_replaces_same_time() {
-        let mut keys = vec![];
-        set_key(&mut keys, Keyframe::new(s(1.0), Value::Scalar(1.0)).eased());
-        set_key(&mut keys, Keyframe::new(s(0.0), Value::Scalar(0.0)));
-        set_key(&mut keys, Keyframe::new(s(1.0), Value::Scalar(5.0)));
-        assert_eq!(keys.len(), 2);
-        assert_eq!(keys[1].value, Value::Scalar(5.0));
-        assert_eq!(keys[1].in_interp, Interp::Bezier);
-    }
-
-    #[test]
-    fn colors_and_paths_interpolate() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Color([0.0, 0.0, 0.0, 1.0])), Keyframe::new(s(1.0), Value::Color([1.0, 0.5, 0.0, 1.0]))];
-        assert_eq!(evaluate(&keys, s(0.5), false).unwrap().as_color(), [0.5, 0.25, 0.0, 1.0]);
-        let a = ShapePath::rect([0.0, 0.0], 10.0, 10.0);
-        let b = ShapePath::rect([0.0, 0.0], 20.0, 20.0);
-        let keys = vec![Keyframe::new(s(0.0), Value::Path(a)), Keyframe::new(s(1.0), Value::Path(b))];
-        let v = evaluate(&keys, s(0.5), false).unwrap();
-        assert_eq!(v.as_path().unwrap().vertices[0], [-7.5, -7.5]);
-    }
-
-    #[test]
-    fn roving_keys_get_constant_speed_times() {
-        let mut keys = vec![
-            Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])),
-            Keyframe::new(s(0.2), Value::Vec2([300.0, 0.0])),
-            Keyframe::new(s(2.0), Value::Vec2([400.0, 0.0])),
-        ];
-        for k in &mut keys {
-            k.spatial_auto = false;
-        }
-        keys[1].roving = true;
-        assert!(retime_roving(&mut keys, true));
-        // 300 of 400 px → 75 % of the 2 s span.
-        assert!((keys[1].time.seconds() - 1.5).abs() < 1e-6, "{}", keys[1].time.seconds());
-        let v0 = speed(&keys, s(0.5), true);
-        let v1 = speed(&keys, s(1.8), true);
-        assert!((v0 - 200.0).abs() < 1.0 && (v1 - 200.0).abs() < 1.0, "{v0} {v1}");
-        // First/last keys can't rove.
-        keys[0].roving = true;
-        retime_roving(&mut keys, true);
-        assert!(!keys[0].roving);
-    }
-
-    #[test]
-    fn roving_keys_never_share_a_time_with_a_fixed_key() {
-        // Zero-length last segment (issue #532) and zero-length first segment.
-        for xs in [[0.0, 40.0, 120.0, 120.0], [0.0, 0.0, 40.0, 120.0]] {
-            let mut keys: Vec<Keyframe> = xs.iter().enumerate().map(|(i, x)| Keyframe::new(s(i as f64), Value::Vec2([*x, 64.0]))).collect();
-            for k in &mut keys {
-                k.spatial_auto = false;
-            }
-            keys[1].roving = true;
-            keys[2].roving = true;
-            retime_roving(&mut keys, true);
-            assert!(keys.windows(2).all(|w| w[0].time < w[1].time), "{xs:?}: {:?}", keys.iter().map(|k| k.time).collect::<Vec<_>>());
-        }
-    }
-
-    #[test]
-    fn side_ease_reports_linear_and_eased_sides() {
-        let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0)).eased()];
-        let out = side_ease(&keys, 0, 0, false, true).unwrap();
-        assert!((out.speed - 50.0).abs() < 1e-9);
-        let inn = side_ease(&keys, 1, 0, false, false).unwrap();
-        assert_eq!(inn, Ease::EASY);
-        assert!(side_ease(&keys, 0, 0, false, false).is_none());
-    }
-
-    #[test]
-    fn time_reverse_mirrors_keys() {
-        let mut keys =
-            vec![Keyframe::new(s(1.0), Value::Scalar(0.0)).eased(), Keyframe::new(s(2.0), Value::Scalar(5.0)), Keyframe::new(s(4.0), Value::Scalar(10.0))];
-        keys[0].out_interp = Interp::Hold;
-        time_reverse(&mut keys);
-        assert_eq!(keys.iter().map(|k| k.time.seconds().round() as i64).collect::<Vec<_>>(), vec![1, 3, 4]);
-        assert_eq!(keys[0].value, Value::Scalar(10.0));
-        assert_eq!(keys[2].in_interp, Interp::Hold);
-    }
-
-    proptest::proptest! {
-        #[test]
-        fn eased_values_stay_in_range(t in 0.0f64..1.0, i0 in 0.01f64..1.0, i1 in 0.01f64..1.0) {
-            let mut a = Keyframe::new(s(0.0), Value::Scalar(0.0)).eased();
-            let mut b = Keyframe::new(s(1.0), Value::Scalar(10.0)).eased();
-            a.out_ease = vec![Ease { speed: 0.0, influence: i0 }];
-            b.in_ease = vec![Ease { speed: 0.0, influence: i1 }];
-            let v = evaluate(&[a, b], s(t), false).unwrap().as_f64();
-            proptest::prop_assert!((-1e-9..=10.0 + 1e-9).contains(&v));
-        }
-    }
-}
+mod tests;
diff --git a/crates/keyframe/src/tests.rs b/crates/keyframe/src/tests.rs
new file mode 100644
index 000000000..0a31cfc19
--- /dev/null
+++ b/crates/keyframe/src/tests.rs
@@ -0,0 +1,397 @@
+use super::*;
+
+fn s(x: f64) -> Tick {
+    Tick::from_seconds_f64(x)
+}
+
+#[test]
+fn missing_spatial_keys_have_no_tangents_or_length() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0]))];
+    for i in [1, usize::MAX] {
+        assert_eq!(spatial_tangents(&keys, i), ([0.0; 3], [0.0; 3]));
+        assert_eq!(spatial_segment_length(&keys, i), 0.0);
+    }
+    assert_eq!(spatial_tangents(&[], 0), ([0.0; 3], [0.0; 3]));
+    assert_eq!(spatial_segment_length(&[], usize::MAX), 0.0);
+}
+
+#[test]
+fn time_reverse_handles_deserialized_tick_extremes() {
+    // Tick's public serde representation can contain values beyond from_seconds_f64's cap.
+    for (first, last) in [(i64::MIN, i64::MIN + 10), (i64::MAX - 10, i64::MAX), (i64::MIN, i64::MAX)] {
+        let mut keys = vec![Keyframe::new(Tick(first), Value::Scalar(1.0)), Keyframe::new(Tick(last), Value::Scalar(2.0))];
+        time_reverse(&mut keys);
+        assert_eq!(keys[0].time, Tick(first));
+        assert_eq!(keys[0].value, Value::Scalar(2.0));
+        assert_eq!(keys[1].time, Tick(last));
+        assert_eq!(keys[1].value, Value::Scalar(1.0));
+        time_reverse(&mut keys);
+        assert_eq!(keys[0].value, Value::Scalar(1.0));
+    }
+}
+
+#[test]
+fn roving_handles_deserialized_tick_extremes() {
+    let mut keys = vec![
+        Keyframe::new(Tick(i64::MIN), Value::Vec2([0.0, 0.0])),
+        Keyframe::new(Tick(10), Value::Vec2([50.0, 0.0])),
+        Keyframe::new(Tick(i64::MAX), Value::Vec2([100.0, 0.0])),
+    ];
+    for key in &mut keys {
+        key.spatial_auto = false;
+    }
+    keys[1].roving = true;
+    assert!(retime_roving(&mut keys, true));
+    assert_eq!(keys[1].time, Tick::ZERO);
+}
+
+#[test]
+fn replacing_key_preserves_spatial_metadata() {
+    let mut key = Keyframe::new(s(1.0), Value::Vec2([20.0, 30.0]));
+    key.roving = true;
+    key.spatial_continuous = true;
+    let mut keys = vec![key];
+    set_key(&mut keys, Keyframe::new(s(1.0), Value::Vec2([40.0, 50.0])));
+    assert!(keys[0].roving);
+    assert!(keys[0].spatial_continuous);
+    assert_eq!(keys[0].value, Value::Vec2([40.0, 50.0]));
+}
+
+#[test]
+fn temporal_ease_matches_live_ae_with_overlapping_influences() {
+    // Original Rotation probe via AEsync 2.0.4, AE 26.3x87, 2026-10-05.
+    // AE retains each handle's requested influence even when their sum exceeds 100%.
+    for (from, to, out_speed, out_inf, in_speed, in_inf, samples) in [
+        (0.0, 100.0, 0.0, 0.8, 0.0, 0.8, [(0.1, 0.59243939036327), (0.25, 4.76438030608764), (0.4, 18.4284394271562), (0.75, 95.2356196939123)]),
+        (0.0, 100.0, 20.0, 0.8, 80.0, 0.6, [(0.1, 2.25754942621577), (0.25, 6.99841889412931), (0.4, 14.9334636959052), (0.75, 73.8196785378389)]),
+        (100.0, 0.0, -20.0, 0.6, -80.0, 0.8, [(0.1, 97.6395466334594), (0.25, 91.597048571292), (0.4, 74.5367957474338), (0.75, 22.3789127753126)]),
+    ] {
+        let mut a = Keyframe::new(s(0.0), Value::Scalar(from));
+        let mut b = Keyframe::new(s(1.0), Value::Scalar(to));
+        a.out_interp = Interp::Bezier;
+        b.in_interp = Interp::Bezier;
+        a.out_ease = vec![Ease { speed: out_speed, influence: out_inf }];
+        b.in_ease = vec![Ease { speed: in_speed, influence: in_inf }];
+        for (time, expected) in samples {
+            let value = evaluate(&[a.clone(), b.clone()], s(time), false).unwrap().as_f64();
+            assert!((value - expected).abs() < 1e-7, "{time}: {value} != {expected}");
+            let normalized = ease_progress(out_speed / (to - from), out_inf, in_speed / (to - from), in_inf, time);
+            assert!((from + normalized * (to - from) - expected).abs() < 1e-7);
+        }
+    }
+}
+
+#[test]
+fn maximum_influence_resolves_flat_midpoint_time_curve() {
+    for time in [0.5 - 1e-9, 0.5 - 1e-12, 0.5, 0.5 + 1e-12, 0.5 + 1e-9] {
+        // At 100%/100%, x = 0.5 + 4*(u - 0.5)^3 exactly.
+        let u = 0.5 + ((time - 0.5) / 4.0_f64).cbrt();
+        let expected = bez(0.0, 0.0, 1.0, 1.0, u);
+        let actual = ease_progress(0.0, 1.0, 0.0, 1.0, time);
+        assert!((actual - expected).abs() < 1e-10, "{time}: {actual} != {expected}");
+    }
+}
+
+/// M13.15: agents set gradients as plain JSON, not only the tagged form `get` returns.
+#[test]
+fn gradients_coerce_from_plain_json() {
+    let g = Value::Gradient(Gradient::default());
+    let plain = serde_json::json!({"colors": [[0, [0, 0.5, 1, 1]], [1, "#ffff00"]], "opacities": [[0, 1], [1, 0.5]]});
+    let Some(Value::Gradient(a)) = g.coerce_json(&plain) else { panic!("object form") };
+    assert_eq!(a.colors, vec![(0.0, [0.0, 0.5, 1.0, 1.0]), (1.0, [1.0, 1.0, 0.0, 1.0])]);
+    assert_eq!(a.opacities, vec![(0.0, 1.0), (1.0, 0.5)]);
+    let Some(Value::Gradient(b)) = g.coerce_json(&serde_json::json!(["#ff0000", "#00ff00", "#0000ff"])) else { panic!("list form") };
+    assert_eq!(b.colors.iter().map(|c| c.0).collect::<Vec<_>>(), vec![0.0, 0.5, 1.0]);
+    assert_eq!(b.opacities.len(), 3);
+    // The tagged form (what prop.get returns) still round-trips.
+    assert_eq!(g.coerce_json(&g.to_json()), Some(g.clone()));
+    assert_eq!(g.coerce_json(&serde_json::json!(5)), None);
+}
+
+/// #612: the gradient editor samples a new stop from its own track only. `sample` multiplies
+/// in the opacity stops, so feeding its alpha into a colour stop would apply 50% twice (25%).
+#[test]
+fn gradient_tracks_sample_separately() {
+    let g = Gradient { colors: vec![(0.0, [1.0, 0.0, 0.0, 0.8]), (1.0, [0.0, 0.0, 1.0, 0.4])], opacities: vec![(0.0, 0.5), (1.0, 0.5)] };
+    let c = g.color_at(0.5);
+    assert!((c[0] - 0.5).abs() < 1e-6 && (c[2] - 0.5).abs() < 1e-6, "{c:?}");
+    assert!((c[3] - 0.6).abs() < 1e-6, "the colour track's own alpha, without opacity: {c:?}");
+    assert!((g.opacity_at(0.5) - 0.5).abs() < 1e-6);
+    assert!((g.sample(0.5)[3] - 0.3).abs() < 1e-6, "sample still applies opacity once");
+    // A stop added at 50% from the opacity track keeps 50%: sampled again, it is still 50%.
+    let mut with_stop = g.clone();
+    with_stop.opacities.insert(1, (0.5, g.opacity_at(0.5)));
+    assert!((with_stop.opacity_at(0.5) - 0.5).abs() < 1e-6);
+    assert!((with_stop.sample(0.5)[3] - 0.3).abs() < 1e-6, "adding a stop doesn't change the look");
+    // Outside the stops, and with none: the ends hold, and an empty track is opaque white.
+    assert_eq!(g.color_at(-1.0), [1.0, 0.0, 0.0, 0.8]);
+    assert_eq!(g.color_at(2.0), [0.0, 0.0, 1.0, 0.4]);
+    let empty = Gradient { colors: vec![], opacities: vec![] };
+    assert_eq!((empty.color_at(0.3), empty.opacity_at(0.3)), ([1.0; 4], 1.0));
+}
+
+/// #612: the editor saves the typed form, so one colour stop (which the plain JSON parser
+/// rejects) and each stop's RGBA come back exactly.
+#[test]
+fn typed_gradient_round_trips_one_stop_and_rgba() {
+    let one = Value::Gradient(Gradient { colors: vec![(0.25, [0.1, 0.2, 0.3, 0.7])], opacities: vec![(0.0, 1.0), (0.6, 0.35)] });
+    let cur = Value::Gradient(Gradient::default());
+    assert_eq!(cur.coerce_json(&one.to_json()), Some(one.clone()));
+    assert_eq!(cur.coerce_json(&serde_json::json!({"colors": [[0.25, [0.1, 0.2, 0.3, 0.7]]]})), None, "plain JSON needs two colours");
+}
+
+#[test]
+fn linear_and_hold() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0))];
+    assert_eq!(evaluate(&keys, s(1.0), false), Some(Value::Scalar(50.0)));
+    assert_eq!(evaluate(&keys, s(-1.0), false), Some(Value::Scalar(0.0)));
+    assert_eq!(evaluate(&keys, s(3.0), false), Some(Value::Scalar(100.0)));
+    let held = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)).hold(), Keyframe::new(s(2.0), Value::Scalar(100.0))];
+    assert_eq!(evaluate(&held, s(1.999), false), Some(Value::Scalar(0.0)));
+}
+
+#[test]
+fn hold_key_keeps_its_incoming_segment_linear() {
+    // Hold on the second key (in and out, as KeyframeInterpolationType.HOLD sets it) holds
+    // what comes after it, not the linear motion into it.
+    let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0)).hold()];
+    assert_eq!(evaluate(&keys, s(0.5), false), Some(Value::Scalar(25.0)));
+    let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])), Keyframe::new(s(2.0), Value::Vec2([100.0, 0.0])).hold()];
+    let p = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
+    assert!((p[0] - 25.0).abs() < 0.01, "{p:?}");
+}
+
+#[test]
+fn easy_ease_is_symmetric_and_slow_at_ends() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)).eased(), Keyframe::new(s(1.0), Value::Scalar(100.0)).eased()];
+    let mid = evaluate(&keys, s(0.5), false).unwrap().as_f64();
+    assert!((mid - 50.0).abs() < 1e-6, "{mid}");
+    let early = evaluate(&keys, s(0.1), false).unwrap().as_f64();
+    assert!(early < 10.0 && early > 0.0, "{early}");
+    let v0 = velocity(&keys, s(0.01), false)[0];
+    let vm = velocity(&keys, s(0.5), false)[0];
+    assert!(v0 < vm);
+}
+
+#[test]
+fn bezier_with_linear_speed_matches_linear() {
+    let mut a = Keyframe::new(s(0.0), Value::Scalar(0.0));
+    let mut b = Keyframe::new(s(2.0), Value::Scalar(100.0));
+    a.out_interp = Interp::Bezier;
+    b.in_interp = Interp::Bezier;
+    a.out_ease = vec![Ease { speed: 50.0, influence: 1.0 / 3.0 }];
+    b.in_ease = vec![Ease { speed: 50.0, influence: 1.0 / 3.0 }];
+    let keys = vec![a, b];
+    for i in 0..=20 {
+        let t = i as f64 * 0.1;
+        let v = evaluate(&keys, s(t), false).unwrap().as_f64();
+        assert!((v - 50.0 * t).abs() < 1e-6, "{t} {v}");
+    }
+}
+
+#[test]
+fn spatial_linear_constant_speed() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])), Keyframe::new(s(1.0), Value::Vec2([300.0, 400.0]))];
+    let p = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
+    assert!((p[0] - 150.0).abs() < 0.5 && (p[1] - 200.0).abs() < 0.5, "{p:?}");
+}
+
+/// #456: along a curved spatial path with linear (constant-speed) keys the speed graph is
+/// flat, not a sawtooth from a piecewise-linear arc-length table.
+#[test]
+fn spatial_curved_path_has_smooth_constant_speed() {
+    let mut a = Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0]));
+    let mut b = Keyframe::new(s(2.0), Value::Vec2([400.0, 0.0]));
+    a.spatial_auto = false;
+    b.spatial_auto = false;
+    a.spatial_out = [50.0, -300.0, 0.0];
+    b.spatial_in = [80.0, 250.0, 0.0];
+    let keys = vec![a, b];
+    let len = spatial_segment_length(&keys, 0);
+    let speeds: Vec<f64> = (1..400).map(|i| speed(&keys, s(i as f64 * 0.005), true)).collect();
+    for v in &speeds {
+        assert!((v - len / 2.0).abs() < 1e-3 * len, "speed {v} vs {}", len / 2.0);
+    }
+}
+
+#[test]
+fn spatial_auto_bezier_passes_through_keys() {
+    let keys = vec![
+        Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])),
+        Keyframe::new(s(1.0), Value::Vec2([100.0, 100.0])),
+        Keyframe::new(s(2.0), Value::Vec2([200.0, 0.0])),
+    ];
+    let p = evaluate(&keys, s(1.0), true).unwrap().as_vec2();
+    assert_eq!(p, [100.0, 100.0]);
+    // Curved: the midpoint of the first segment lies off the straight line.
+    let m = evaluate(&keys, s(0.5), true).unwrap().as_vec2();
+    assert!((m[0] - m[1]).abs() > 1.0, "{m:?}");
+}
+
+#[test]
+fn straight_auto_bezier_path_is_exact() {
+    // Auto-Bezier ends now have handles along the line; the chord is still hit exactly.
+    let keys = vec![Keyframe::new(s(0.0), Value::Vec2([40.0, 50.0])), Keyframe::new(s(2.0), Value::Vec2([120.0, 50.0]))];
+    assert_eq!(segment_value(&keys, 0, s(1.0), true), Value::Vec2([80.0, 50.0]));
+}
+
+/// #880: a motion path whose arc length overflows (huge coordinates, as the Position field
+/// accepts) or is NaN evaluates without panicking: scrubbing over it crashed the app.
+#[test]
+fn overflowing_or_nan_motion_paths_evaluate() {
+    let paths = [
+        [[-1.7e308, 0.0], [1.7e308, 0.0], [-1.7e308, 5.0]],
+        [[0.0, 0.0], [f64::NAN, 10.0], [20.0, 0.0]],
+        [[f64::INFINITY, 0.0], [0.0, f64::NEG_INFINITY], [20.0, 0.0]],
+    ];
+    for path in paths {
+        let mut keys: Vec<Keyframe> = path.iter().enumerate().map(|(i, &v)| Keyframe::new(s(i as f64 * 2.0), Value::Vec2(v))).collect();
+        for eased in [false, true] {
+            if eased {
+                keys = keys.into_iter().map(Keyframe::eased).collect();
+            }
+            for f in 0..=40 {
+                let t = s(f as f64 * 0.1);
+                assert!(evaluate(&keys, t, true).is_some());
+                let _ = speed(&keys, t, true);
+            }
+        }
+    }
+}
+
+#[test]
+fn spatial_auto_bezier_tangents_follow_after_effects() {
+    // Measured on After Effects 26.3 with original paths (docs/fidelity/README.md): each
+    // auto-Bezier key's out tangent is (next - previous) / 6 and its in tangent the mirror,
+    // whatever the key times. End keys use their one neighbour: (neighbour - key) / 6.
+    let p = [[40.0, 300.0, 0.0], [260.0, 80.0, 20.0], [700.0, 420.0, -40.0], [1100.0, 150.0, 0.0]];
+    let mut keys: Vec<Keyframe> = [0.0, 0.2, 1.5, 1.8].iter().zip(p).map(|(&t, v)| Keyframe::new(s(t), Value::Vec3(v))).collect();
+    let sixth = |a: [f64; 3], b: [f64; 3]| [(b[0] - a[0]) / 6.0, (b[1] - a[1]) / 6.0, (b[2] - a[2]) / 6.0];
+    let neg = |v: [f64; 3]| [-v[0], -v[1], -v[2]];
+    let close = |a: [f64; 3], b: [f64; 3]| a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1e-9);
+    let want = [sixth(p[0], p[1]), sixth(p[0], p[2]), sixth(p[1], p[3]), sixth(p[2], p[3])];
+    for (i, out) in want.into_iter().enumerate() {
+        let (tin, tout) = spatial_tangents(&keys, i);
+        assert!(close(tout, out) && close(tin, neg(out)), "key {i}: {tin:?} {tout:?}");
+    }
+    // Moving a key in time leaves every tangent as it was.
+    keys[1].time = s(1.2);
+    assert!(close(spatial_tangents(&keys, 1).1, sixth(p[0], p[2])));
+    // A key between two coincident neighbours, and a lone key, have none.
+    let still = [[5.0, 5.0], [9.0, 1.0], [5.0, 5.0]].iter().enumerate().map(|(i, &v)| Keyframe::new(s(i as f64), Value::Vec2(v))).collect::<Vec<_>>();
+    assert_eq!(spatial_tangents(&still, 1), ([0.0; 3], [0.0; 3]));
+    assert_eq!(spatial_tangents(&still[..1], 0), ([0.0; 3], [0.0; 3]));
+}
+
+#[test]
+fn auto_spatial_holds_between_identical_keys() {
+    let path = [(0.0, [0.0, 540.0]), (0.6, [400.0, 540.0]), (4.4, [400.0, 540.0]), (5.0, [0.0, 540.0])];
+    for eased in [false, true] {
+        let keys: Vec<Keyframe> = path
+            .iter()
+            .map(|&(t, v)| {
+                let k = Keyframe::new(s(t), Value::Vec2(v));
+                if eased { k.eased() } else { k }
+            })
+            .collect();
+        assert_eq!(spatial_tangents(&keys, 1).1, [0.0; 3]);
+        assert_eq!(spatial_tangents(&keys, 2).0, [0.0; 3]);
+        for t in [0.7, 1.0, 2.5, 4.0, 4.3] {
+            let p = evaluate(&keys, s(t), true).unwrap().as_vec3();
+            assert!((p[0] - 400.0).abs() < 1e-6 && (p[1] - 540.0).abs() < 1e-6, "eased={eased} t={t} p={p:?}");
+        }
+    }
+}
+
+#[test]
+fn set_key_replaces_same_time() {
+    let mut keys = vec![];
+    set_key(&mut keys, Keyframe::new(s(1.0), Value::Scalar(1.0)).eased());
+    set_key(&mut keys, Keyframe::new(s(0.0), Value::Scalar(0.0)));
+    set_key(&mut keys, Keyframe::new(s(1.0), Value::Scalar(5.0)));
+    assert_eq!(keys.len(), 2);
+    assert_eq!(keys[1].value, Value::Scalar(5.0));
+    assert_eq!(keys[1].in_interp, Interp::Bezier);
+}
+
+#[test]
+fn colors_and_paths_interpolate() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Color([0.0, 0.0, 0.0, 1.0])), Keyframe::new(s(1.0), Value::Color([1.0, 0.5, 0.0, 1.0]))];
+    assert_eq!(evaluate(&keys, s(0.5), false).unwrap().as_color(), [0.5, 0.25, 0.0, 1.0]);
+    let a = ShapePath::rect([0.0, 0.0], 10.0, 10.0);
+    let b = ShapePath::rect([0.0, 0.0], 20.0, 20.0);
+    let keys = vec![Keyframe::new(s(0.0), Value::Path(a)), Keyframe::new(s(1.0), Value::Path(b))];
+    let v = evaluate(&keys, s(0.5), false).unwrap();
+    assert_eq!(v.as_path().unwrap().vertices[0], [-7.5, -7.5]);
+}
+
+#[test]
+fn roving_keys_get_constant_speed_times() {
+    let mut keys = vec![
+        Keyframe::new(s(0.0), Value::Vec2([0.0, 0.0])),
+        Keyframe::new(s(0.2), Value::Vec2([300.0, 0.0])),
+        Keyframe::new(s(2.0), Value::Vec2([400.0, 0.0])),
+    ];
+    for k in &mut keys {
+        k.spatial_auto = false;
+    }
+    keys[1].roving = true;
+    assert!(retime_roving(&mut keys, true));
+    // 300 of 400 px → 75 % of the 2 s span.
+    assert!((keys[1].time.seconds() - 1.5).abs() < 1e-6, "{}", keys[1].time.seconds());
+    let v0 = speed(&keys, s(0.5), true);
+    let v1 = speed(&keys, s(1.8), true);
+    assert!((v0 - 200.0).abs() < 1.0 && (v1 - 200.0).abs() < 1.0, "{v0} {v1}");
+    // First/last keys can't rove.
+    keys[0].roving = true;
+    retime_roving(&mut keys, true);
+    assert!(!keys[0].roving);
+}
+
+#[test]
+fn roving_keys_never_share_a_time_with_a_fixed_key() {
+    // Zero-length last segment (issue #532) and zero-length first segment.
+    for xs in [[0.0, 40.0, 120.0, 120.0], [0.0, 0.0, 40.0, 120.0]] {
+        let mut keys: Vec<Keyframe> = xs.iter().enumerate().map(|(i, x)| Keyframe::new(s(i as f64), Value::Vec2([*x, 64.0]))).collect();
+        for k in &mut keys {
+            k.spatial_auto = false;
+        }
+        keys[1].roving = true;
+        keys[2].roving = true;
+        retime_roving(&mut keys, true);
+        assert!(keys.windows(2).all(|w| w[0].time < w[1].time), "{xs:?}: {:?}", keys.iter().map(|k| k.time).collect::<Vec<_>>());
+    }
+}
+
+#[test]
+fn side_ease_reports_linear_and_eased_sides() {
+    let keys = vec![Keyframe::new(s(0.0), Value::Scalar(0.0)), Keyframe::new(s(2.0), Value::Scalar(100.0)).eased()];
+    let out = side_ease(&keys, 0, 0, false, true).unwrap();
+    assert!((out.speed - 50.0).abs() < 1e-9);
+    let inn = side_ease(&keys, 1, 0, false, false).unwrap();
+    assert_eq!(inn, Ease::EASY);
+    assert!(side_ease(&keys, 0, 0, false, false).is_none());
+}
+
+#[test]
+fn time_reverse_mirrors_keys() {
+    let mut keys =
+        vec![Keyframe::new(s(1.0), Value::Scalar(0.0)).eased(), Keyframe::new(s(2.0), Value::Scalar(5.0)), Keyframe::new(s(4.0), Value::Scalar(10.0))];
+    keys[0].out_interp = Interp::Hold;
+    time_reverse(&mut keys);
+    assert_eq!(keys.iter().map(|k| k.time.seconds().round() as i64).collect::<Vec<_>>(), vec![1, 3, 4]);
+    assert_eq!(keys[0].value, Value::Scalar(10.0));
+    assert_eq!(keys[2].in_interp, Interp::Hold);
+}
+
+proptest::proptest! {
+    #[test]
+    fn eased_values_stay_in_range(t in 0.0f64..1.0, i0 in 0.01f64..1.0, i1 in 0.01f64..1.0) {
+        let mut a = Keyframe::new(s(0.0), Value::Scalar(0.0)).eased();
+        let mut b = Keyframe::new(s(1.0), Value::Scalar(10.0)).eased();
+        a.out_ease = vec![Ease { speed: 0.0, influence: i0 }];
+        b.in_ease = vec![Ease { speed: 0.0, influence: i1 }];
+        let v = evaluate(&[a, b], s(t), false).unwrap().as_f64();
+        proptest::prop_assert!((-1e-9..=10.0 + 1e-9).contains(&v));
+    }
+}
diff --git a/crates/keyframe/src/value.rs b/crates/keyframe/src/value.rs
index 1dff4477f..6609aed68 100644
--- a/crates/keyframe/src/value.rs
+++ b/crates/keyframe/src/value.rs
@@ -82,7 +82,18 @@ impl ShapePath {
             if i == 0 && f.segment == 0 && !self.closed {
                 return false;
             }
-            if i > 0 && f.segment == i - 1 {
+            if i == 0 && self.closed && segs > 0 {
+                // The old closing segment and segment 0 merge into the new closing one.
+                if f.segment == segs {
+                    f.segment = segs - 1;
+                    f.t *= 0.5;
+                } else if f.segment == 0 {
+                    f.segment = segs - 1;
+                    f.t = 0.5 + f.t * 0.5;
+                } else {
+                    f.segment -= 1;
+                }
+            } else if i > 0 && f.segment == i - 1 {
                 f.t *= 0.5;
             } else if f.segment == i && i > 0 {
                 f.segment = i - 1;
diff --git a/crates/keyframe/tests/feather_remove.rs b/crates/keyframe/tests/feather_remove.rs
new file mode 100644
index 000000000..06836bbf6
--- /dev/null
+++ b/crates/keyframe/tests/feather_remove.rs
@@ -0,0 +1,14 @@
+use effectcraft_keyframe::{FeatherPoint, ShapePath};
+
+#[test]
+fn removing_first_vertex_of_closed_path_merges_closing_segment() {
+    let mut p = ShapePath::rect([0.0, 0.0], 10.0, 10.0);
+    let fp = |segment| FeatherPoint { segment, t: 0.5, radius: 1.0, tension: 0.0 };
+    p.feather = vec![fp(3), fp(0)];
+    p.vertices.remove(0);
+    p.in_tangents.remove(0);
+    p.out_tangents.remove(0);
+    p.feather_after_remove(0);
+    let got: Vec<(usize, f64)> = p.feather.iter().map(|f| (f.segment, f.t)).collect();
+    assert_eq!(got, vec![(2, 0.25), (2, 0.75)]);
+}
diff --git a/crates/lottie/src/import.rs b/crates/lottie/src/import.rs
index 7730017d8..b2eeece49 100644
--- a/crates/lottie/src/import.rs
+++ b/crates/lottie/src/import.rs
@@ -96,9 +96,11 @@ fn external_image(stored: &str, base_dir: &str) -> Result<String, String> {
         let doc = std::path::Path::new(base_dir).join("lottie.json");
         std::path::absolute(&doc).unwrap_or(doc)
     });
-    match craft_docpath::resolve(stored, doc.as_deref()) {
-        Ok(path) if path.is_absolute() => Ok(path.to_string_lossy().into_owned()),
-        Ok(_) => Err(format!("{stored} is relative and the Lottie file's folder is not known")),
+    match craft_docpath::resolve_absolute(stored, doc.as_deref()) {
+        Ok(path) => Ok(path.to_string_lossy().into_owned()),
+        Err(craft_docpath::Refused::Invalid) if doc.is_none() && craft_docpath::resolve(stored, None).is_ok() => {
+            Err(format!("{stored} is relative and the Lottie file's folder is not known"))
+        }
         Err(why) => Err(format!("{stored}: {why}")),
     }
 }
diff --git a/crates/media/src/convert.rs b/crates/media/src/convert.rs
index d483e4b47..9e88ab4dd 100644
--- a/crates/media/src/convert.rs
+++ b/crates/media/src/convert.rs
@@ -103,12 +103,34 @@ pub(crate) fn frame_to_image_in(f: &VideoFrame, op: AlphaOp, mut buf: Vec<Px>) -
         PixelData::Yuv8 { planes, chroma, alpha } => {
             let yuv = Yuv::new(f.color.matrix, f.color.range, 8);
             let amax = 255.0;
-            convert_yuv(&mut img, w, h, *chroma, [&planes[0][..], &planes[1][..], &planes[2][..]], alpha.as_deref().map(|a| &a[..]), amax, &yuv, op);
+            convert_yuv(
+                &mut img,
+                YuvSource {
+                    size: (w, h),
+                    chroma: *chroma,
+                    planes: [&planes[0][..], &planes[1][..], &planes[2][..]],
+                    alpha: alpha.as_deref().map(|a| &a[..]),
+                    amax,
+                },
+                &yuv,
+                op,
+            );
         }
         PixelData::Yuv16 { planes, chroma, bits, alpha } => {
             let yuv = Yuv::new(f.color.matrix, f.color.range, *bits);
             let amax = ((1u32 << *bits) - 1) as f32;
-            convert_yuv(&mut img, w, h, *chroma, [&planes[0][..], &planes[1][..], &planes[2][..]], alpha.as_deref().map(|a| &a[..]), amax, &yuv, op);
+            convert_yuv(
+                &mut img,
+                YuvSource {
+                    size: (w, h),
+                    chroma: *chroma,
+                    planes: [&planes[0][..], &planes[1][..], &planes[2][..]],
+                    alpha: alpha.as_deref().map(|a| &a[..]),
+                    amax,
+                },
+                &yuv,
+                op,
+            );
         }
     }
     img
@@ -280,8 +302,17 @@ fn centred(i: usize, n: usize) -> (usize, usize) {
     (c, o)
 }
 
-#[allow(clippy::too_many_arguments)]
-fn convert_yuv<T: Sample>(img: &mut Image, w: usize, h: usize, chroma: Chroma, planes: [&[T]; 3], alpha: Option<&[T]>, amax: f32, k: &Yuv, op: AlphaOp) {
+/// Borrowed YUV planes and the geometry/range needed to interpret their samples.
+struct YuvSource<'a, T> {
+    size: (usize, usize),
+    chroma: Chroma,
+    planes: [&'a [T]; 3],
+    alpha: Option<&'a [T]>,
+    amax: f32,
+}
+
+fn convert_yuv<T: Sample>(img: &mut Image, source: YuvSource<'_, T>, k: &Yuv, op: AlphaOp) {
+    let YuvSource { size: (w, h), chroma, planes, alpha, amax } = source;
     let (sx, sy) = chroma.shifts();
     let cw = w.div_ceil(1 << sx);
     let ch = h.div_ceil(1 << sy);
diff --git a/crates/media/src/exr_channels.rs b/crates/media/src/exr_channels.rs
index 8c4cb1339..795da99e5 100644
--- a/crates/media/src/exr_channels.rs
+++ b/crates/media/src/exr_channels.rs
@@ -183,7 +183,7 @@ fn picture_layer<'a>(aux: &AuxChannels, layers: &[&'a str]) -> Option<&'a str> {
 /// The picture of a multi-layer OpenEXR file without an unnamed RGB layer (Blender's
 /// `ViewLayer.Combined.R`, the compositor's `Image.R`, Nuke's `beauty.R`, …), which the image
 /// decoder rejects. After Effects shows a file's main RGBA channels and leaves the other layers
-/// to EXtractoR; here that is the beauty pass by name ([`BEAUTY`]), else the first colour layer
+/// to EXtractoR; here that is the beauty pass by name (`BEAUTY`), else the first colour layer
 /// that is not a data pass (never Cryptomatte, depth or normals, #412), else the first channel
 /// as grey. Linear, straight RGBA as the file stores it. `None` when it is not a readable EXR.
 pub fn layered_image(bytes: &[u8]) -> Option<image::DynamicImage> {
diff --git a/crates/media/src/layered.rs b/crates/media/src/layered.rs
index 0a70d1f7f..055c3feb0 100644
--- a/crates/media/src/layered.rs
+++ b/crates/media/src/layered.rs
@@ -36,7 +36,7 @@ pub fn vector_doc(
 }
 
 fn is_pdf_like(path: &str, bytes: &[u8]) -> bool {
-    let ext = std::path::Path::new(path).extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase();
+    let ext = std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_ascii_lowercase();
     effectcraft_pdf::sniff(bytes).is_some() && (effectcraft_pdf::EXTENSIONS.contains(&ext.as_str()) || bytes.starts_with(b"%PDF"))
 }
 
diff --git a/crates/media/src/lib.rs b/crates/media/src/lib.rs
index 04a9d95e3..9b5b491ab 100644
--- a/crates/media/src/lib.rs
+++ b/crates/media/src/lib.rs
@@ -80,7 +80,7 @@ pub fn is_importable(path: &std::path::Path) -> bool {
 }
 
 pub(crate) fn ext_of(path: &std::path::Path) -> String {
-    path.extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase()
+    path.extension().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_ascii_lowercase()
 }
 
 /// The `image` crate format of a still: from its signature, else from its extension (Targa has
diff --git a/crates/media/src/pool.rs b/crates/media/src/pool.rs
index 9a8ec5c28..4820efa35 100644
--- a/crates/media/src/pool.rs
+++ b/crates/media/src/pool.rs
@@ -45,6 +45,9 @@ struct Key {
     matte: [u32; 3],
     /// A movie frame made at this size for a reduced-resolution render ((0, 0): as decoded).
     size: (u32, u32),
+    /// A still at a reduced `size`: the footage's nominal size, which decides whether it is
+    /// resampled (see `Inner::still_at_size`); (0, 0) otherwise.
+    nominal: (u32, u32),
 }
 
 struct Entry {
@@ -385,7 +388,7 @@ impl MediaPool {
     }
 
     /// The conformed-audio file of `path` at `rate` (named by a hash of the path, size and
-    /// modification time, so an edited file conforms again, and of [`CONFORM_VERSION`]).
+    /// modification time, so an edited file conforms again, and of `CONFORM_VERSION`).
     pub fn conformed_path(&self, path: &str, rate: u32) -> Option<std::path::PathBuf> {
         use std::hash::{Hash, Hasher};
         let folder = lock(&self.inner.conform).clone()?;
@@ -559,7 +562,7 @@ impl Inner {
         let loaded = self.read(path).map_err(|e| e.to_string()).and_then(|bytes| {
             // Files the model names are read only when local or on the model's own network share.
             let resolve = |uri: &str| -> Option<Vec<u8>> {
-                let p = craft_docpath::resolve(uri, Some(std::path::Path::new(path))).ok().filter(|p| p.is_absolute())?;
+                let p = craft_docpath::resolve_absolute(uri, Some(std::path::Path::new(path))).ok()?;
                 self.read(&p.to_string_lossy()).ok().map(|b| b.to_vec())
             };
             effectcraft_model::load(path, &bytes, &resolve).map_err(|e| e.to_string())
@@ -678,7 +681,7 @@ impl Inner {
                 FloatCurve::Gamma24 => 2,
             } << 2);
         let matte = if footage.alpha == AlphaMode::Premultiplied { footage.premul_color.map(f32::to_bits) } else { [0; 3] };
-        let key = |path: &str, frame| Key { path: path.into(), frame, interp, matte, size: (0, 0) };
+        let key = |path: &str, frame| Key { path: path.into(), frame, interp, matte, size: (0, 0), nominal: (0, 0) };
         match footage.kind {
             FootageKind::Sequence if !footage.sequence.is_empty() => {
                 let i = Self::frame_index(footage.frame_rate, t, footage.sequence_frames(), footage.loop_count);
@@ -708,16 +711,20 @@ impl Inner {
         }
     }
 
-    /// The frame of `footage` at `t`; a movie's resampled to `size` when it can be made at that
-    /// size directly (see [`FootageSource::frame_at_size`]).
+    /// The frame of `footage` at `t`, resampled to `size` (see [`FootageSource::frame_at_size`]):
+    /// a movie's made at that size directly, a still's resampled once and kept at that size.
     fn frame_at(self: &Arc<Self>, footage: &Footage, t: Tick, playback: bool, size: Option<(u32, u32)>, float: FloatCurve) -> Result<Arc<Image>> {
         if !footage.has_video {
             return Err(MediaError::Unsupported(format!("{}: no video", footage.path)));
         }
         let mut loc = Self::locate(footage, t, float);
         let movie = loc.media_t.is_some();
-        if movie && let Some(size) = size {
+        // A still asked for at its own size is the unsized frame (one decode, one entry).
+        if let Some(size) = size.filter(|s| movie || *s != (footage.width, footage.height)) {
             loc.key.size = size;
+            if !movie {
+                loc.key.nominal = (footage.width, footage.height);
+            }
         }
         let mut c = lock(&self.cache);
         // sequential playback of a movie: read the next frame ahead
@@ -749,7 +756,7 @@ impl Inner {
                 drop(c);
                 return Ok(Arc::new(self.decode(&loc, footage)?));
             }
-            c = self.done.wait(c).unwrap_or_else(|e| e.into_inner());
+            c = self.done.wait(c).unwrap_or_else(std::sync::PoisonError::into_inner);
         }
         self.misses.fetch_add(1, Ordering::Relaxed);
         c.inflight.insert(loc.key.clone());
@@ -773,34 +780,62 @@ impl Inner {
     #[cfg(target_arch = "wasm32")]
     fn prefetch(self: &Arc<Self>, _footage: &Footage, _t: Tick, _size: Option<(u32, u32)>, _float: FloatCurve) {}
 
+    /// A still (image file or sequence frame) at `loc.key.size` when one is set: resampled as the
+    /// renderer would ([`FootageSource::frame_at_size`]), so the pool keeps the reduced frame and a
+    /// reduced-resolution render neither decodes nor resamples a large still again for every frame
+    /// (#1812: 21120-px plates at Quarter). Like the renderer's `footage_buf`, an image decoded
+    /// larger than the footage's nominal size (a smart object's pixels) is resampled too, and one
+    /// decoded smaller is not (the renderer scales the layer instead).
+    fn still_at_size(img: Image, loc: &Loc, footage: &Footage) -> Image {
+        let (w, h) = loc.key.size;
+        let smaller = img.width == 0 || footage.width as f64 / img.width as f64 > 1.0 + 1e-9;
+        if w == 0 || h == 0 || smaller || (w, h) == (img.width, img.height) {
+            return img;
+        }
+        effectcraft_raster::resample(&img, w, h)
+    }
+
     fn decode(&self, loc: &Loc, footage: &Footage) -> Result<Image> {
+        match loc.media_t {
+            None => self.decode_still(loc, footage).map(|img| Self::still_at_size(img, loc, footage)),
+            Some(_) => self.decode_media(loc, footage),
+        }
+    }
+
+    fn decode_still(&self, loc: &Loc, footage: &Footage) -> Result<Image> {
+        let op = AlphaOp::of(footage, loc.float);
+        let path = &loc.key.path;
+        if &**path == PLACEHOLDER {
+            return Ok(colour_bars(footage.width, footage.height));
+        }
+        let bytes = self.read(path)?;
+        if let Some(img) = crate::dpx::decode(path, &bytes)? {
+            return Ok(dynamic_to_image(&img, op));
+        }
+        if let Some(img) = crate::layered::decode(path, &bytes, footage, op)? {
+            return Ok(img);
+        }
+        // (an OpenEXR compression the decoder lacks came out transparent or as a missing
+        // channel error)
+        if path.to_ascii_lowercase().ends_with(".exr")
+            && let Some(why) = crate::exr_channels::unsupported_compression(&bytes)
+        {
+            return Err(MediaError::Decode(format!("{path}: {why}")));
+        }
+        let loaded = crate::probe::load_oriented(&bytes, crate::still_format(path, &bytes));
+        let img = match loaded {
+            Ok(img) => img,
+            // A multi-layer OpenEXR file without an unnamed RGB layer: its colour layer.
+            Err(e) => crate::exr_channels::cached_layered_image(path, bytes).ok_or_else(|| MediaError::Decode(format!("{path}: {e}")))?,
+        };
+        Ok(dynamic_to_image(&img, op))
+    }
+
+    fn decode_media(&self, loc: &Loc, footage: &Footage) -> Result<Image> {
         let op = AlphaOp::of(footage, loc.float);
         let path = &loc.key.path;
         match loc.media_t {
-            None if &**path == PLACEHOLDER => Ok(colour_bars(footage.width, footage.height)),
-            None => {
-                let bytes = self.read(path)?;
-                if let Some(img) = crate::dpx::decode(path, &bytes)? {
-                    return Ok(dynamic_to_image(&img, op));
-                }
-                if let Some(img) = crate::layered::decode(path, &bytes, footage, op)? {
-                    return Ok(img);
-                }
-                // (an OpenEXR compression the decoder lacks came out transparent or as a missing
-                // channel error)
-                if path.to_ascii_lowercase().ends_with(".exr")
-                    && let Some(why) = crate::exr_channels::unsupported_compression(&bytes)
-                {
-                    return Err(MediaError::Decode(format!("{path}: {why}")));
-                }
-                let loaded = crate::probe::load_oriented(&bytes, crate::still_format(path, &bytes));
-                let img = match loaded {
-                    Ok(img) => img,
-                    // A multi-layer OpenEXR file without an unnamed RGB layer: its colour layer.
-                    Err(e) => crate::exr_channels::cached_layered_image(path, bytes).ok_or_else(|| MediaError::Decode(format!("{path}: {e}")))?,
-                };
-                Ok(dynamic_to_image(&img, op))
-            }
+            None => self.decode_still(loc, footage),
             Some(mt) if gif_anim::is_animated(footage) => {
                 let anim = self.gif(path)?;
                 let frame = anim.frame_at(Tick(mt.0)).ok_or_else(|| MediaError::Decode(format!("{path}: no frames")))?;
@@ -937,7 +972,7 @@ fn describe_problem(codec: &str, e: &MediaError) -> String {
 }
 
 fn lock<T>(m: &Mutex<T>) -> std::sync::MutexGuard<'_, T> {
-    m.lock().unwrap_or_else(|e| e.into_inner())
+    m.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
 }
 
 #[cfg(test)]
@@ -1030,6 +1065,48 @@ mod tests {
         let _ = std::fs::remove_dir_all(&dir);
     }
 
+    // Regression test for #382 (#274): resampling footage audio divided by the requested mix
+    // rate, so a rate of 0 panicked (division by zero); the read must come back instead.
+    #[test]
+    fn decoding_audio_at_a_zero_mix_rate_does_not_divide_by_zero() {
+        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-zero-rate");
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        // One second of a 440 Hz tone, 44.1 kHz mono 16-bit PCM: not the 48 kHz mix rate.
+        let native = 44_100u32;
+        let pcm: Vec<u8> =
+            (0..native).flat_map(|n| (((n as f32 * 440.0 * std::f32::consts::TAU / native as f32).sin() * 8000.0) as i16).to_le_bytes()).collect();
+        let mut wav = b"RIFF".to_vec();
+        wav.extend((36 + pcm.len() as u32).to_le_bytes());
+        wav.extend(b"WAVEfmt ");
+        wav.extend(16u32.to_le_bytes());
+        wav.extend([1u16, 1].iter().flat_map(|v| v.to_le_bytes()));
+        wav.extend(native.to_le_bytes());
+        wav.extend((native * 2).to_le_bytes());
+        wav.extend([2u16, 16].iter().flat_map(|v| v.to_le_bytes()));
+        wav.extend(b"data");
+        wav.extend((pcm.len() as u32).to_le_bytes());
+        wav.extend(&pcm);
+        let path = dir.join("tone.wav");
+        std::fs::write(&path, &wav).unwrap();
+        let footage = Footage {
+            path: path.to_string_lossy().into(),
+            kind: FootageKind::Audio,
+            duration: Tick::from_seconds_f64(1.0),
+            has_audio: true,
+            ..Default::default()
+        };
+        let pool = MediaPool::new();
+        // The file really is read, and resampled, at a normal rate...
+        let tone = pool.decode_audio(&footage, Tick::from_seconds_f64(0.1), 1024, 48_000);
+        assert!(tone.iter().any(|v| v.abs() > 0.05), "the tone is audible at 48 kHz");
+        // ...and a mix rate of 0 (which `audio_samples` itself turns away) returns a read of the
+        // requested length instead of dividing by it.
+        let degenerate = pool.try_decode_audio(&footage, Tick::from_seconds_f64(0.1), 64, 0).unwrap();
+        assert_eq!(degenerate.len(), 128);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
     #[test]
     fn frame_index_loops_and_clamps() {
         let r = FrameRate::FPS_30;
@@ -1045,7 +1122,7 @@ mod tests {
     fn lru_respects_budget_and_recycles() {
         let mut c = Lru::default();
         let img = || Arc::new(Image::new(16, 16)); // 4 KiB + overhead
-        let k = |i| Key { path: "a".into(), frame: i, interp: 0, matte: [0; 3], size: (0, 0) };
+        let k = |i| Key { path: "a".into(), frame: i, interp: 0, matte: [0; 3], size: (0, 0), nominal: (0, 0) };
         let budget = 3 * (4096 + 64);
         for i in 0..10 {
             c.insert(k(i), img(), budget);
diff --git a/crates/media/src/probe.rs b/crates/media/src/probe.rs
index bae714c81..6bba682b3 100644
--- a/crates/media/src/probe.rs
+++ b/crates/media/src/probe.rs
@@ -19,18 +19,29 @@ pub fn probe(path: impl AsRef<Path>) -> Result<Footage> {
     // A movie is read in place (its index), not loaded whole.
     if let Some(src) = crate::stream::probe_source(path) {
         let mut f = footage_from_info(&path.to_string_lossy(), src?.info());
-        let turn = crate::stream::movie_header(path).map_or(Orientation::NoTransforms, |h| video_turn(&h));
+        let header = crate::stream::movie_header(path);
+        let turn = header.as_deref().map_or(Orientation::NoTransforms, video_turn);
         turn_footage(&mut f, turn);
+        correct_rate(&mut f, header.as_deref().and_then(video_rate));
         return Ok(f);
     }
     let bytes = std::fs::read(path).map_err(|e| MediaError::Io(format!("{}: {e}", path.display())))?;
     if crate::MODEL_EXTENSIONS.contains(&ext_of(path).as_str()) {
-        let dir = path.parent().map(Path::to_path_buf).unwrap_or_default();
-        return probe_model(&path.to_string_lossy(), &bytes, &|uri| std::fs::read(dir.join(uri)).ok());
+        return probe_model(&path.to_string_lossy(), &bytes, &side_file_reader(path));
     }
     probe_bytes(&path.to_string_lossy(), bytes.into())
 }
 
+/// Reads the files a model file names (buffers, textures, MTL files). Like the pool, it follows only
+/// local files and files on the model's own network share: a URI is a path stored in the model.
+fn side_file_reader(model: &Path) -> impl Fn(&str) -> Option<Vec<u8>> + use<> {
+    let model = std::path::absolute(model).unwrap_or_else(|_| model.to_path_buf());
+    move |uri| {
+        let p = craft_docpath::resolve_absolute(uri, Some(&model)).ok()?;
+        std::fs::read(p).ok()
+    }
+}
+
 /// Probe a 3D model (glTF 2.0 / OBJ / STL / FBX): a [`FootageKind::Model`] item whose duration is its
 /// longest animation. `resolve` reads sibling resources.
 pub fn probe_model(path: &str, bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<Footage> {
@@ -95,12 +106,24 @@ pub fn probe_bytes(path: &str, bytes: Arc<[u8]>) -> Result<Footage> {
     }
     let name = Path::new(path).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| path.to_string());
     let turn = video_turn(&bytes);
+    let rate = video_rate(&bytes);
     let src = filmcraft_codecs::open_bytes(&name, bytes)?;
     let mut f = footage_from_info(path, src.info());
     turn_footage(&mut f, turn);
+    correct_rate(&mut f, rate);
     Ok(f)
 }
 
+/// A movie's frame rate as its frame durations average to ([`video_rate`]), where the reader's
+/// own estimate misreads it.
+fn correct_rate(f: &mut Footage, rate: Option<FrameRate>) {
+    if f.kind == FootageKind::Video
+        && let Some(rate) = rate
+    {
+        f.frame_rate = rate;
+    }
+}
+
 /// The size as displayed: a movie shot with the camera on its side trades width and height.
 fn turn_footage(f: &mut Footage, turn: Orientation) {
     if swaps_sides(turn) {
@@ -254,3 +277,100 @@ pub(crate) fn video_turn(bytes: &[u8]) -> Orientation {
         (false, _, false) => Orientation::Rotate270,
     }
 }
+
+/// The frame rate of an MP4/MOV movie's video track when the reader's own estimate, the median
+/// frame duration, misreads it. Phones and messaging apps store frame times rounded to whole
+/// milliseconds: a 30 fps clip's frames last 33 or 34 ms and a 60 fps clip's 16 or 17 ms, whose
+/// median reads as 30.303 or 58.824 fps. `None` for other containers and for movies the median
+/// reads right.
+fn video_rate(bytes: &[u8]) -> Option<FrameRate> {
+    let file = filmcraft_isobmff::open(bytes).ok()?;
+    let t = file.tracks.iter().find(|t| t.kind == filmcraft_isobmff::TrackKind::Video && !t.samples.is_empty())?;
+    averaged_rate(t.timescale, t.samples.iter().take(240).map(|s| s.duration))
+}
+
+/// The standard rate ([`FrameRate::COMMON`]) within 0.5 % of what the frame durations near their
+/// median average to (`durations` in `1 / timescale` s); `None` when the median duration is a
+/// standard rate already, or when the average is no standard rate (variable or unusual rates keep
+/// the reader's estimate).
+fn averaged_rate(timescale: u32, durations: impl Iterator<Item = u32>) -> Option<FrameRate> {
+    let ts = i128::from(timescale);
+    let mut durs: Vec<u64> = durations.filter(|&d| d > 0).map(u64::from).collect();
+    durs.sort_unstable();
+    let median = *durs.get(durs.len() / 2)?;
+    if FrameRate::COMMON.iter().any(|r| ts * i128::from(r.den) == i128::from(median) * i128::from(r.num)) {
+        return None;
+    }
+    // Durations within a quarter of the median (widened, so extreme durations can't overflow).
+    let (n, sum) = durs.iter().filter(|&&d| d.abs_diff(median).saturating_mul(4) <= median).fold((0u64, 0u64), |(n, s), &d| (n + 1, s.saturating_add(d)));
+    if sum == 0 {
+        return None;
+    }
+    let fps = timescale as f64 * n as f64 / sum as f64;
+    FrameRate::COMMON
+        .into_iter()
+        .map(|r| (r, (fps / r.as_f64() - 1.0).abs()))
+        .filter(|&(_, off)| off <= 0.005)
+        .min_by(|a, b| a.1.total_cmp(&b.1))
+        .map(|(r, _)| r)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Durations (in 1/`timescale` s) of `n` frames at `rate` whose times are rounded to the timescale.
+    fn rounded(rate: FrameRate, timescale: i64, n: i64) -> Vec<u32> {
+        let at = |k: i64| (2 * k * timescale * rate.den + rate.num) / (2 * rate.num);
+        (0..n).map(|k| (at(k + 1) - at(k)) as u32).collect()
+    }
+
+    /// A model's side files are read from beside it; a URI to another computer is not followed.
+    #[test]
+    fn model_side_files_are_not_read_from_other_computers() {
+        let dir = std::env::temp_dir().join(format!("ec-probe-side-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join("buf.bin"), b"abc").unwrap();
+        let read = side_file_reader(&dir.join("model.gltf"));
+        assert_eq!(read("buf.bin"), Some(b"abc".to_vec()));
+        assert_eq!(read(r"\\192.0.2.1\share\buf.bin"), None);
+        assert_eq!(read("file://192.0.2.1/share/buf.bin"), None);
+        assert_eq!(read(r"C:\buf.bin"), None);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn millisecond_rounded_frame_times_average_to_their_rate() {
+        assert_eq!(rounded(FrameRate::FPS_30, 1000, 6), [33, 34, 33, 33, 34, 33]);
+        assert_eq!(averaged_rate(1000, rounded(FrameRate::FPS_30, 1000, 120).into_iter()), Some(FrameRate::FPS_30));
+        assert_eq!(averaged_rate(1000, rounded(FrameRate::FPS_60, 1000, 240).into_iter()), Some(FrameRate::FPS_60));
+        // NTSC rates stay NTSC, not the round rate next to them.
+        for r in [FrameRate::FPS_23_976, FrameRate::FPS_29_97, FrameRate::FPS_59_94] {
+            assert_eq!(averaged_rate(1000, rounded(r, 1000, 240).into_iter()), Some(r), "{r:?}");
+        }
+        // A short clip: its few frames average to the rate as well.
+        assert_eq!(averaged_rate(1000, [33, 34, 33].into_iter()), Some(FrameRate::FPS_30));
+    }
+
+    #[test]
+    fn exact_and_variable_rates_keep_the_readers_estimate() {
+        // A median that is a standard rate already reads right.
+        assert_eq!(averaged_rate(30000, rounded(FrameRate::FPS_29_97, 30000, 240).into_iter()), None);
+        assert_eq!(averaged_rate(90000, [3000; 10].into_iter()), None);
+        assert_eq!(averaged_rate(600, [20, 20, 19, 21, 20].into_iter()), None);
+        // Durations averaging to no standard rate (22.2 fps).
+        assert_eq!(averaged_rate(1000, [40, 45, 50].repeat(20).into_iter()), None);
+        // A truly 30.3 fps clip is not pulled to 30 (1 % off).
+        assert_eq!(averaged_rate(1000, [33; 30].into_iter()), None);
+    }
+
+    #[test]
+    fn degenerate_durations_have_no_rate() {
+        assert_eq!(averaged_rate(1000, std::iter::empty()), None);
+        assert_eq!(averaged_rate(1000, [0, 0, 0].into_iter()), None);
+        assert_eq!(averaged_rate(0, [33, 34, 33].into_iter()), None);
+        assert_eq!(averaged_rate(u32::MAX, [u32::MAX, u32::MAX - 1, 1, 0].into_iter()), None);
+        assert_eq!(averaged_rate(u32::MAX, [u32::MAX; 300].into_iter()), None);
+        assert_eq!(video_rate(b"not a movie"), None);
+    }
+}
diff --git a/crates/media/tests/downmix.rs b/crates/media/tests/it/downmix.rs
similarity index 100%
rename from crates/media/tests/downmix.rs
rename to crates/media/tests/it/downmix.rs
diff --git a/crates/media/tests/exif_orientation.rs b/crates/media/tests/it/exif_orientation.rs
similarity index 100%
rename from crates/media/tests/exif_orientation.rs
rename to crates/media/tests/it/exif_orientation.rs
diff --git a/crates/media/tests/footage.rs b/crates/media/tests/it/footage.rs
similarity index 94%
rename from crates/media/tests/footage.rs
rename to crates/media/tests/it/footage.rs
index 13ca605e2..a2849dc1d 100644
--- a/crates/media/tests/footage.rs
+++ b/crates/media/tests/it/footage.rs
@@ -40,7 +40,11 @@ fn ffmpeg_fixture(name: &str, args: &[&str]) -> Option<PathBuf> {
     let tmp = out.with_file_name(format!("tmp-{}-{:?}.{ext}", std::process::id(), std::thread::current().id()).replace(['(', ')'], ""));
     let st = Command::new("ffmpeg").args(["-hide_banner", "-loglevel", "error", "-y"]).args(args).arg(&tmp).status().expect("run ffmpeg");
     assert!(st.success(), "ffmpeg failed for {name}");
-    std::fs::rename(&tmp, &out).expect("rename");
+    if std::fs::rename(&tmp, &out).is_err() {
+        // Another test made it first; on Windows the rename fails while that test has it open.
+        let _ = std::fs::remove_file(&tmp);
+        assert!(out.exists(), "rename {} to {name} failed", tmp.display());
+    }
     Some(out)
 }
 
@@ -580,6 +584,46 @@ fn sequence_gaps_show_placeholders() {
     let _ = std::fs::remove_dir_all(&dir);
 }
 
+/// #1812: a still asked for at a reduced size comes back as the renderer would resample it, and
+/// is kept at that size: later frames at that size neither decode nor resample it again (a
+/// parallax project's 21120-px plates were decoded and resampled for every frame at Quarter).
+#[test]
+fn stills_at_reduced_sizes_are_resampled_once() {
+    let dir = std::env::temp_dir().join(format!("ec-still-size-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).expect("temp dir");
+    let p = dir.join("plate.png");
+    let px = |x: u32, y: u32| {
+        image::Rgba([(x * 7 % 256) as u8, (y * 13 % 256) as u8, ((x ^ y) % 256) as u8, if (x + y).is_multiple_of(5) { 0 } else { 255 - (x % 128) as u8 }])
+    };
+    image::RgbaImage::from_fn(613, 97, px).save(&p).expect("png");
+    let f = probe(&p).expect("probe");
+    let pool = MediaPool::new();
+    let full = pool.frame(ItemId(1), &f, Tick::ZERO).expect("frame");
+    // At its own size it is the unsized frame: no second decode, no second full-size copy.
+    let misses = pool.stats().misses;
+    let native = pool.frame_at_size(ItemId(1), &f, Tick::ZERO, f.width, f.height).expect("frame");
+    assert!(Arc::ptr_eq(&full, &native), "the native size reuses the unsized frame");
+    assert_eq!(pool.stats().misses, misses);
+    for (w, h) in [(306, 48), (153, 24), (77, 12)] {
+        let sized = pool.frame_at_size(ItemId(1), &f, Tick::ZERO, w, h).expect("frame");
+        assert_eq!(*sized, effectcraft_raster::resample(&full, w, h), "{w}×{h}: the renderer's resample");
+        let misses = pool.stats().misses;
+        let again = pool.frame_at_size(ItemId(1), &f, Tick(3 * TICKS_PER_SECOND), w, h).expect("frame");
+        assert!(Arc::ptr_eq(&sized, &again), "{w}×{h}: kept at that size");
+        assert_eq!(pool.stats().misses, misses, "{w}×{h}: not decoded again");
+    }
+    // Pixels larger than the nominal size (a smart object's) are resampled as the renderer does;
+    // smaller ones are left as they are (the renderer scales the layer up instead).
+    // One pool, one file, one requested size: the two decisions don't share a cache entry.
+    let larger = Footage { width: 306, height: 48, ..f.clone() };
+    let smaller = Footage { width: 1226, height: 194, ..f.clone() };
+    let sized = pool.frame_at_size(ItemId(2), &larger, Tick::ZERO, 153, 24).expect("frame");
+    assert_eq!(*sized, effectcraft_raster::resample(&full, 153, 24));
+    let kept = pool.frame_at_size(ItemId(3), &smaller, Tick::ZERO, 153, 24).expect("frame");
+    assert_eq!(*kept, *full);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
 #[test]
 fn png_with_alpha() {
     let Some(p) = alpha_png() else { return };
@@ -833,7 +877,7 @@ fn flac_audio_of_any_shape_reads_in_device_blocks() {
         }
         // ffmpeg's sine source has an amplitude of 1/8 (mono is duplicated). The fixture carries
         // channels 0 and 1 at full level and the others at half, so a multichannel file sounds as
-        // its stereo downmix (tests/downmix.rs checks that matrix channel by channel).
+        // its stereo downmix (tests/it/downmix.rs checks that matrix channel by channel).
         let gains = effectcraft_media::downmix::stereo_gains(channels as usize, false);
         let side = |s: usize| gains.iter().enumerate().map(|(c, g)| f64::from(g[s]) * if c < 2 { 1.0 } else { 0.5 }).sum::<f64>();
         let want = 0.125 * ((side(0).powi(2) + side(1).powi(2)) / 2.0).sqrt() / 2f64.sqrt();
diff --git a/crates/media/tests/it/main.rs b/crates/media/tests/it/main.rs
new file mode 100644
index 000000000..5f7fb8037
--- /dev/null
+++ b/crates/media/tests/it/main.rs
@@ -0,0 +1,7 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod downmix;
+mod exif_orientation;
+mod footage;
+mod open_in_place;
+mod tga;
diff --git a/crates/media/tests/open_in_place.rs b/crates/media/tests/it/open_in_place.rs
similarity index 100%
rename from crates/media/tests/open_in_place.rs
rename to crates/media/tests/it/open_in_place.rs
diff --git a/crates/media/tests/it/tga.rs b/crates/media/tests/it/tga.rs
new file mode 100644
index 000000000..13a1f7568
--- /dev/null
+++ b/crates/media/tests/it/tga.rs
@@ -0,0 +1,115 @@
+//! Tiny synthetic Targa files exercise import without external fixtures or codecs.
+
+use std::path::Path;
+use std::sync::Arc;
+
+use effectcraft_media::{MediaPool, is_importable, probe_bytes};
+use effectcraft_project::{AlphaMode, Footage, FootageKind};
+use effectcraft_time::Tick;
+
+/// A classic 2×2 TGA without a footer. True-colour pixels are stored BGR(A); RLE
+/// packets repeat each row's colour twice. `pixels` is always in top-down RGBA order.
+fn tga(pixels: [[u8; 4]; 4], alpha: bool, rle: bool, top: bool) -> Vec<u8> {
+    let mut bytes = vec![0; 18];
+    bytes[2] = if rle { 10 } else { 2 };
+    bytes[12] = 2;
+    bytes[14] = 2;
+    bytes[16] = if alpha { 32 } else { 24 };
+    bytes[17] = if top { 0x20 } else { 0 } | if alpha { 8 } else { 0 };
+    let rows = if top { [[0, 1], [2, 3]] } else { [[2, 3], [0, 1]] };
+    for row in rows {
+        if rle {
+            assert_eq!(pixels[row[0]], pixels[row[1]]);
+            bytes.push(0x81); // A two-pixel run.
+        }
+        for &i in row.iter().take(if rle { 1 } else { 2 }) {
+            let [r, g, b, a] = pixels[i];
+            bytes.extend_from_slice(&[b, g, r]);
+            if alpha {
+                bytes.push(a);
+            }
+        }
+    }
+    bytes
+}
+
+#[test]
+fn tga_raw_and_rle_preserve_colours_orientation_and_alpha() {
+    for alpha in [false, true] {
+        for rle in [false, true] {
+            for top in [false, true] {
+                let pixels = if rle {
+                    [[255, 0, 0, 128], [255, 0, 0, 128], [0, 0, 255, 255], [0, 0, 255, 255]]
+                } else {
+                    [[255, 0, 0, 128], [0, 255, 0, 255], [0, 0, 255, 64], [255, 255, 255, 0]]
+                };
+                let path = if top { "/frame.TGA" } else { "/frame.tga" };
+                assert!(is_importable(Path::new(path)));
+                let bytes: Arc<[u8]> = tga(pixels, alpha, rle, top).into();
+                let footage = probe_bytes(path, bytes.clone()).unwrap();
+                assert_eq!(footage.kind, FootageKind::Still);
+                assert_eq!((footage.width, footage.height), (2, 2));
+                assert_eq!(footage.codec, "TGA");
+                assert_eq!(footage.alpha, if alpha { AlphaMode::Straight } else { AlphaMode::Ignore });
+                assert!(footage.has_video && !footage.has_audio);
+                let pool = MediaPool::new();
+                pool.add_bytes(path, bytes);
+                let image = pool.frame_at(&footage, Tick::ZERO).unwrap();
+                for (actual, [r, g, b, a]) in image.data.iter().zip(pixels) {
+                    let a = if alpha { f32::from(a) / 255.0 } else { 1.0 };
+                    let expected = [f32::from(r) / 255.0 * a, f32::from(g) / 255.0 * a, f32::from(b) / 255.0 * a, a];
+                    assert!(actual.iter().zip(expected).all(|(a, b)| (a - b).abs() < 1e-6), "{actual:?} != {expected:?}");
+                }
+            }
+        }
+    }
+}
+
+#[test]
+fn tga_sequence_decodes_each_frame_from_memory() {
+    let pool = MediaPool::new();
+    pool.set_read_ahead(false);
+    let paths = ["/shot_0001.tga", "/shot_0002.tga"];
+    let colours = [[255, 0, 0, 255], [0, 0, 255, 255]];
+    let mut footage = None;
+    for (path, colour) in paths.iter().zip(colours) {
+        let bytes: Arc<[u8]> = tga([colour; 4], false, true, true).into();
+        footage.get_or_insert_with(|| probe_bytes(path, bytes.clone()).unwrap());
+        pool.add_bytes(path, bytes);
+    }
+    let mut footage = Footage { kind: FootageKind::Sequence, sequence: paths.iter().map(|s| s.to_string()).collect(), ..footage.unwrap() };
+    footage.sync_sequence_duration();
+    for (n, expected) in [[1.0, 0.0, 0.0, 1.0], [0.0, 0.0, 1.0, 1.0]].into_iter().enumerate() {
+        let image = pool.frame_at(&footage, footage.frame_rate.tick_of(n as i64)).unwrap();
+        assert_eq!(image.get(0, 0), expected);
+    }
+}
+
+#[test]
+fn malformed_tga_returns_contextual_errors() {
+    for bytes in [vec![], vec![0; 17], vec![0; 18]] {
+        let error = probe_bytes("/broken.tga", bytes.into()).unwrap_err().to_string();
+        assert!(error.contains("/broken.tga"), "{error}");
+    }
+    let mut bytes = tga([[255, 0, 0, 255]; 4], true, false, true);
+    bytes.truncate(19); // Valid metadata, truncated pixel data.
+    let bytes: Arc<[u8]> = bytes.into();
+    let footage = probe_bytes("/truncated.tga", bytes.clone()).unwrap();
+    let pool = MediaPool::new();
+    pool.add_bytes(&footage.path, bytes);
+    let error = pool.frame_at(&footage, Tick::ZERO).unwrap_err().to_string();
+    assert!(error.contains("/truncated.tga"), "{error}");
+}
+
+#[test]
+fn a_recognised_signature_takes_precedence_over_the_tga_extension() {
+    let mut bytes = std::io::Cursor::new(Vec::new());
+    image::DynamicImage::new_rgb8(3, 2).write_to(&mut bytes, image::ImageFormat::Png).unwrap();
+    let bytes: Arc<[u8]> = bytes.into_inner().into();
+    let footage = probe_bytes("/actually-png.tga", bytes.clone()).unwrap();
+    assert_eq!(footage.codec, "PNG");
+    let pool = MediaPool::new();
+    pool.add_bytes(&footage.path, bytes);
+    let image = pool.frame_at(&footage, Tick::ZERO).unwrap();
+    assert_eq!((image.width, image.height), (3, 2));
+}
diff --git a/crates/model/Cargo.toml b/crates/model/Cargo.toml
index 25397921a..33ee26726 100644
--- a/crates/model/Cargo.toml
+++ b/crates/model/Cargo.toml
@@ -15,4 +15,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 image = { workspace = true }
-miniz_oxide = "0.8"
+miniz_oxide = "0.9"
diff --git a/crates/model/src/fbx.rs b/crates/model/src/fbx.rs
index e2b9e1bd0..bca387ff2 100644
--- a/crates/model/src/fbx.rs
+++ b/crates/model/src/fbx.rs
@@ -32,6 +32,57 @@ pub const BINARY_MAGIC: &[u8] = b"Kaydara FBX Binary  \0\x1a\0";
 const MAX_DEPTH: usize = 64;
 /// Largest decoded array accepted (bytes).
 const MAX_ARRAY_BYTES: usize = 1 << 30;
+/// Most memory one import may keep: parsed arrays as stored (8 bytes per element, whatever the
+/// wire type) plus the meshes built from them (#1234).
+const MAX_IMPORT_BYTES: usize = 1 << 31;
+
+/// What is left of an import's memory budget.
+struct Budget(std::cell::Cell<usize>);
+
+impl Budget {
+    fn new(bytes: usize) -> Budget {
+        Budget(std::cell::Cell::new(bytes))
+    }
+    /// Take `bytes` (None: a size that overflowed) from the budget, or fail the import before
+    /// anything that large is allocated.
+    fn take(&self, bytes: Option<usize>, what: &str) -> Result<()> {
+        let left = self.0.get();
+        match bytes.filter(|&b| b <= left) {
+            Some(b) => {
+                self.0.set(left - b);
+                Ok(())
+            }
+            None => Err(perr(format!("FBX: {what} would take the import past its {} MiB memory limit", MAX_IMPORT_BYTES >> 20))),
+        }
+    }
+}
+
+/// Bytes a mesh keeps.
+fn mesh_bytes(m: &Mesh) -> Option<usize> {
+    m.primitives.iter().try_fold(0usize, |acc, p| {
+        let n = p.positions.len().checked_mul(12)?.checked_add(p.normals.len().checked_mul(12)?)?.checked_add(p.uvs.len().checked_mul(8)?)?;
+        let n = n.checked_add(p.tangents.len().checked_mul(16)?)?.checked_add(p.joints.len().checked_mul(8)?)?.checked_add(p.weights.len().checked_mul(16)?)?;
+        acc.checked_add(n)?.checked_add(p.indices.len().checked_mul(4)?)
+    })
+}
+
+/// Bytes the values under `nodes` keep. Used for ASCII files, which hold array elements as
+/// one `Prop` each and are parsed before they can be counted (the text itself bounds them).
+fn value_bytes(nodes: &[FbxNode]) -> Option<usize> {
+    nodes.iter().try_fold(0usize, |acc, n| {
+        let own = n.props.iter().try_fold(0usize, |a, p| {
+            let extra = match p {
+                Prop::Ints(v) => v.len().checked_mul(8)?,
+                Prop::Floats(v) => v.len().checked_mul(8)?,
+                Prop::Str(v) => v.len(),
+                Prop::Bytes(v) => v.len(),
+                Prop::Int(_) | Prop::Float(_) => 0,
+            };
+            a.checked_add(std::mem::size_of::<Prop>())?.checked_add(extra)
+        })?;
+        acc.checked_add(own)?.checked_add(value_bytes(&n.children)?)
+    })
+}
 
 /// One property value of an FBX node.
 #[derive(Clone, Debug, PartialEq)]
@@ -126,7 +177,17 @@ impl FbxNode {
 /// Read an FBX file (binary or ASCII) into its top-level nodes and the file version
 /// (e.g. 7400).
 pub fn read(bytes: &[u8]) -> Result<(u32, Vec<FbxNode>)> {
-    if bytes.starts_with(BINARY_MAGIC) { read_binary(bytes) } else { read_ascii(&String::from_utf8_lossy(bytes)) }
+    read_within(bytes, &Budget::new(MAX_IMPORT_BYTES))
+}
+
+fn read_within(bytes: &[u8], budget: &Budget) -> Result<(u32, Vec<FbxNode>)> {
+    if bytes.starts_with(BINARY_MAGIC) {
+        read_binary(bytes, budget)
+    } else {
+        let (version, nodes) = read_ascii(&String::from_utf8_lossy(bytes))?;
+        budget.take(value_bytes(&nodes), "its values")?;
+        Ok((version, nodes))
+    }
 }
 
 // ---------------------------------------------------------------------------------------------
@@ -136,6 +197,7 @@ struct Bin<'a> {
     d: &'a [u8],
     /// 64-bit record offsets (version 7500 and later).
     wide: bool,
+    budget: &'a Budget,
 }
 
 impl Bin<'_> {
@@ -207,7 +269,7 @@ impl Bin<'_> {
     }
 
     fn prop(&self, pos: &mut usize, pend: usize) -> Result<Prop> {
-        let sub = Bin { d: self.d.get(..pend).ok_or_else(|| perr("FBX: truncated property"))?, wide: self.wide };
+        let sub = Bin { d: self.d.get(..pend).ok_or_else(|| perr("FBX: truncated property"))?, wide: self.wide, budget: self.budget };
         let t = sub.arr::<1>(pos)?[0];
         Ok(match t {
             b'Y' => Prop::Int(i16::from_le_bytes(sub.arr(pos)?) as i64),
@@ -234,6 +296,9 @@ impl Bin<'_> {
                     _ => 1,
                 };
                 let want = len.checked_mul(size).filter(|&n| n <= MAX_ARRAY_BYTES).ok_or_else(|| perr("FBX: array too large"))?;
+                // Elements are kept as f64/i64 (booleans and 32-bit values widen), so the budget
+                // is charged for what is kept, not for the wire bytes.
+                sub.budget.take(len.checked_mul(8), "an array")?;
                 let data = sub.take(pos, clen)?;
                 let raw = match enc {
                     0 => data.to_vec(),
@@ -263,10 +328,10 @@ fn object_name(b: &[u8]) -> String {
     }
 }
 
-fn read_binary(bytes: &[u8]) -> Result<(u32, Vec<FbxNode>)> {
+fn read_binary(bytes: &[u8], budget: &Budget) -> Result<(u32, Vec<FbxNode>)> {
     let mut pos = BINARY_MAGIC.len();
-    let version = Bin { d: bytes, wide: false }.u32(&mut pos)?;
-    let bin = Bin { d: bytes, wide: version >= 7500 };
+    let version = Bin { d: bytes, wide: false, budget }.u32(&mut pos)?;
+    let bin = Bin { d: bytes, wide: version >= 7500, budget };
     let mut nodes = vec![];
     while pos < bytes.len() {
         match bin.record(&mut pos, 0) {
@@ -728,7 +793,13 @@ fn short_name(full: &str) -> &str {
 
 /// Parse an FBX file into a model. `resolve(uri)` reads texture files next to it.
 pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<Model> {
-    let (version, doc) = read(bytes)?;
+    parse_within(bytes, resolve, MAX_IMPORT_BYTES)
+}
+
+/// [`parse`] keeping at most `limit` bytes of arrays and meshes.
+fn parse_within(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>, limit: usize) -> Result<Model> {
+    let budget = Budget::new(limit);
+    let (version, doc) = read_within(bytes, &budget)?;
     if version != 0 && version < 7000 {
         return Err(ModelError::Unsupported(format!("FBX {}.{} (only FBX 7.x files are read)", version / 1000, version % 1000 / 100)));
     }
@@ -835,19 +906,28 @@ pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<
         Some(materials.len() - 1)
     };
 
-    // One mesh per Model with Mesh geometry (material slots are per Model).
+    // One mesh per Model with Mesh geometry (material slots are per Model). Models instancing the
+    // same geometry with the same materials share one mesh rather than each building a copy.
     let mut meshes: Vec<Mesh> = vec![];
+    let mut mesh_of: HashMap<(i64, Vec<usize>), usize> = HashMap::new();
     for &id in &model_ids {
         let Some(&ni) = node_of.get(&id) else { continue };
         let Some(gid) = links.iter().find(|l| l.1 == id && kind(l.0) == Some("Geometry")).map(|l| l.0) else { continue };
         let Some(geom) = by_id.get(&gid) else { continue };
         let mats: Vec<usize> =
             links.iter().filter(|l| l.1 == id && kind(l.0) == Some("Material")).filter_map(|l| material_index(l.0, &mut materials, &mut textures)).collect();
-        let normal_mapped: Vec<bool> = materials.iter().map(|m| m.normal_tex.is_some()).collect();
         let name = nodes.get(ni).map(|n| n.name.clone()).unwrap_or_default();
-        let Some(mesh) = build_mesh(&name, geom, &mats, &|m| normal_mapped.get(m).copied().unwrap_or(false)) else { continue };
-        meshes.push(mesh);
-        let mesh_index = meshes.len() - 1;
+        let mesh_index = match mesh_of.get(&(gid, mats.clone())) {
+            Some(&i) => i,
+            None => {
+                let normal_mapped: Vec<bool> = materials.iter().map(|m| m.normal_tex.is_some()).collect();
+                let Some(mesh) = build_mesh(&name, geom, &mats, &|m| normal_mapped.get(m).copied().unwrap_or(false)) else { continue };
+                budget.take(mesh_bytes(&mesh), &format!("mesh `{name}`"))?;
+                meshes.push(mesh);
+                mesh_of.insert((gid, mats), meshes.len() - 1);
+                meshes.len() - 1
+            }
+        };
         let geo = by_id.get(&id).and_then(|o| geometric(&Props70::of(o)));
         match geo {
             Some(matrix) => {
@@ -871,5 +951,4 @@ pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<
 }
 
 #[cfg(test)]
-#[path = "fbx_tests.rs"]
 mod tests;
diff --git a/crates/model/src/fbx_tests.rs b/crates/model/src/fbx/tests.rs
similarity index 75%
rename from crates/model/src/fbx_tests.rs
rename to crates/model/src/fbx/tests.rs
index 3cd8ba5a1..1ba1978ba 100644
--- a/crates/model/src/fbx_tests.rs
+++ b/crates/model/src/fbx/tests.rs
@@ -325,3 +325,87 @@ fn hostile_fbx_files_fail_cleanly() {
     assert!(matches!(parse(v6.as_bytes(), &|_| None), Err(ModelError::Unsupported(_))));
     assert!(parse(b"Objects: {\n Model: 1, \"Model::Empty\", \"Null\" {\n }\n}\n", &|_| None).is_err());
 }
+
+/// A version-7400 binary FBX holding one top-level node `A` with uncompressed arrays of type
+/// `t` (`b'b'`, `b'i'`, `b'f'`, `b'd'`, `b'l'`) and `len` elements each.
+fn binary_arrays(arrays: &[(u8, usize)]) -> Vec<u8> {
+    let mut props = vec![];
+    for &(t, len) in arrays {
+        let size = match t {
+            b'd' | b'l' => 8,
+            b'f' | b'i' => 4,
+            _ => 1,
+        };
+        props.push(t);
+        props.extend((len as u32).to_le_bytes());
+        props.extend(0u32.to_le_bytes());
+        props.extend(((len * size) as u32).to_le_bytes());
+        props.extend(std::iter::repeat_n(1u8, len * size));
+    }
+    let mut out = BINARY_MAGIC.to_vec();
+    out.extend(7400u32.to_le_bytes());
+    let end = out.len() + 13 + 1 + props.len();
+    out.extend((end as u32).to_le_bytes());
+    out.extend((arrays.len() as u32).to_le_bytes());
+    out.extend((props.len() as u32).to_le_bytes());
+    out.push(1);
+    out.push(b'A');
+    out.extend(props);
+    out
+}
+
+#[test]
+fn fbx_arrays_are_charged_for_the_memory_they_keep() {
+    // A boolean array is one byte per element on the wire but eight once kept as `Prop::Ints`:
+    // the budget counts the eight (#1234).
+    let n = 10_000;
+    let bin = binary_arrays(&[(b'b', n)]);
+    assert!(read_within(&bin, &Budget::new(n * 8)).is_ok());
+    let e = read_within(&bin, &Budget::new(n * 8 - 1)).unwrap_err();
+    assert!(e.to_string().contains("memory limit"), "{e}");
+    // 32-bit floats widen to f64 the same way.
+    assert!(read_within(&binary_arrays(&[(b'f', n)]), &Budget::new(n * 4)).is_err());
+    // Several arrays each within the budget but not together.
+    let bin = binary_arrays(&[(b'i', n), (b'd', n), (b'b', n)]);
+    assert!(read_within(&bin, &Budget::new(n * 24)).is_ok());
+    assert!(read_within(&bin, &Budget::new(n * 20)).is_err());
+    // ASCII values count too.
+    let (_, doc) = read(ASCII.as_bytes()).unwrap();
+    let values = value_bytes(&doc).unwrap();
+    assert!(values > 45 * std::mem::size_of::<Prop>(), "{values}");
+    assert!(parse_within(ASCII.as_bytes(), &|_| None, values - 1).unwrap_err().to_string().contains("memory limit"));
+}
+
+/// [`ASCII`] with two more Models instancing its geometry: `Copy` with the same two materials,
+/// `Red only` with just the first.
+fn instanced_scene() -> String {
+    ASCII
+        .replace(
+            "\tMaterial: 400,",
+            "\tModel: 301, \"Model::Copy\", \"Mesh\" {\n\t}\n\tModel: 302, \"Model::Red only\", \"Mesh\" {\n\t}\n\tMaterial: 400,",
+        )
+        .replace(
+            "\tC: \"OO\",500,300\n",
+            "\tC: \"OO\",500,300\n\tC: \"OO\",301,0\n\tC: \"OO\",100,301\n\tC: \"OO\",400,301\n\tC: \"OO\",500,301\n\tC: \"OO\",302,0\n\tC: \"OO\",100,302\n\tC: \"OO\",400,302\n",
+        )
+}
+
+#[test]
+fn fbx_models_instancing_one_geometry_share_its_mesh() {
+    let m = parse(instanced_scene().as_bytes(), &|_| None).unwrap();
+    let mesh_of = |name: &str| {
+        let n = m.nodes.iter().position(|n| n.name == name).unwrap();
+        // The mesh sits on the node, or on its geometric-offset child.
+        m.nodes[n].mesh.or_else(|| m.nodes[n].children.iter().find_map(|&c| m.nodes[c].mesh)).unwrap()
+    };
+    assert_eq!(mesh_of("Shape"), mesh_of("Copy"), "same geometry and materials: one mesh");
+    assert_ne!(mesh_of("Shape"), mesh_of("Red only"), "different materials: its own mesh");
+    assert_eq!(m.meshes.len(), 2);
+    // A budget with room for one copy of the geometry's mesh, but not three, still imports.
+    let one = parse(ASCII.as_bytes(), &|_| None).unwrap();
+    let mesh = mesh_bytes(&one.meshes[0]).unwrap();
+    let (_, doc) = read(instanced_scene().as_bytes()).unwrap();
+    let values = value_bytes(&doc).unwrap();
+    assert!(parse_within(instanced_scene().as_bytes(), &|_| None, values + 2 * mesh).is_ok());
+    assert!(parse_within(instanced_scene().as_bytes(), &|_| None, values + mesh).is_err());
+}
diff --git a/crates/model/src/gltf.rs b/crates/model/src/gltf.rs
index 20578d4f4..e17d014f6 100644
--- a/crates/model/src/gltf.rs
+++ b/crates/model/src/gltf.rs
@@ -39,13 +39,15 @@ pub fn split_glb(b: &[u8]) -> Result<(&[u8], Option<&[u8]>)> {
     while o + 8 <= total {
         let len = u32_at(o).unwrap_or(0) as usize;
         let ty = u32_at(o + 4).unwrap_or(0);
-        let data = b.get(o + 8..o + 8 + len).ok_or_else(|| perr("GLB chunk runs past the end of the file"))?;
+        let past_end = || perr("GLB chunk runs past the end of the file");
+        let end = (o + 8).checked_add(len).ok_or_else(past_end)?;
+        let data = b.get(o + 8..end).ok_or_else(past_end)?;
         match ty {
             CHUNK_JSON if json.is_none() => json = Some(data),
             CHUNK_BIN if bin.is_none() => bin = Some(data),
             _ => {}
         }
-        o += 8 + len;
+        o = end;
     }
     Ok((json.ok_or_else(|| perr("GLB without a JSON chunk"))?, bin))
 }
@@ -115,8 +117,25 @@ struct Doc<'a> {
 fn arr<'v>(v: &'v Value, k: &str) -> &'v [Value] {
     v.get(k).and_then(Value::as_array).map(Vec::as_slice).unwrap_or(&[])
 }
+/// A non-negative integer field; one too large for `usize` counts as absent (#1235).
 fn idx(v: &Value, k: &str) -> Option<usize> {
-    v.get(k).and_then(Value::as_u64).map(|x| x as usize)
+    v.get(k).and_then(Value::as_u64).and_then(|x| usize::try_from(x).ok())
+}
+/// Node indices in an array field (out-of-range ones are dropped).
+fn indices(v: &Value, k: &str) -> Vec<usize> {
+    arr(v, k).iter().filter_map(Value::as_u64).filter_map(|c| usize::try_from(c).ok()).collect()
+}
+
+/// The most components an accessor without a buffer view (all zeros) may have: nothing in the
+/// file backs its count, so it is capped instead of checked against a buffer (#1235).
+const MAX_ZERO_COMPONENTS: usize = 1 << 24;
+
+/// Where an accessor's elements lie in its buffer: `count` elements of `elem` bytes, `stride`
+/// apart from `base`, all checked to be inside `buf`.
+struct Span<'b> {
+    buf: &'b [u8],
+    base: usize,
+    stride: usize,
 }
 fn num(v: &Value, k: &str, d: f64) -> f64 {
     v.get(k).and_then(Value::as_f64).unwrap_or(d)
@@ -132,6 +151,39 @@ fn nums<const N: usize>(v: &Value, k: &str, d: [f64; N]) -> [f64; N] {
 }
 
 impl Doc<'_> {
+    /// The accessor's element count and total components (`count * n`), checked; and its span in
+    /// the buffer, validated before anything is allocated from the count. `None` for an
+    /// accessor without a buffer view, whose components are all zero.
+    fn layout(&self, acc: &Value, n: usize, csize: usize) -> Result<(usize, usize, Option<Span<'_>>)> {
+        let count = match acc.get("count") {
+            None => 0,
+            Some(c) => c.as_u64().and_then(|c| usize::try_from(c).ok()).ok_or_else(|| perr("accessor count is not a valid size"))?,
+        };
+        let total = count.checked_mul(n).ok_or_else(|| perr("accessor count is too large"))?;
+        let Some(bv) = idx(acc, "bufferView") else {
+            if total > MAX_ZERO_COMPONENTS {
+                return Err(perr(format!("accessor without a bufferView has {total} components (at most {MAX_ZERO_COMPONENTS})")));
+            }
+            return Ok((count, total, None));
+        };
+        let view = arr(self.j, "bufferViews").get(bv).ok_or_else(|| perr(format!("no bufferView {bv}")))?;
+        let buf = self.buffers.get(idx(view, "buffer").unwrap_or(0)).ok_or_else(|| perr("bufferView buffer out of range"))?;
+        let past = || perr("accessor reads past its buffer");
+        let base = idx(view, "byteOffset").unwrap_or(0).checked_add(idx(acc, "byteOffset").unwrap_or(0)).ok_or_else(past)?;
+        let elem = csize * n;
+        let stride = idx(view, "byteStride").filter(|s| *s > 0).unwrap_or(elem);
+        if stride < elem {
+            return Err(perr(format!("bufferView byteStride {stride} is smaller than its {elem}-byte elements")));
+        }
+        if count > 0 {
+            let end = (count - 1).checked_mul(stride).and_then(|o| o.checked_add(base)).and_then(|o| o.checked_add(elem)).ok_or_else(past)?;
+            if end > buf.len() {
+                return Err(past());
+            }
+        }
+        Ok((count, total, Some(Span { buf, base, stride })))
+    }
+
     /// An accessor as `f32` rows of `n` components (normalised integers mapped to 0..1 / -1..1).
     fn floats(&self, a: usize) -> Result<(Vec<f32>, usize)> {
         let acc = arr(self.j, "accessors").get(a).ok_or_else(|| perr(format!("no accessor {a}")))?;
@@ -145,7 +197,6 @@ impl Doc<'_> {
             "MAT4" => 16,
             t => return Err(perr(format!("accessor type `{t}`"))),
         };
-        let count = idx(acc, "count").unwrap_or(0);
         let ct = idx(acc, "componentType").unwrap_or(5126);
         let norm = acc.get("normalized").and_then(Value::as_bool).unwrap_or(false);
         let csize = match ct {
@@ -154,17 +205,13 @@ impl Doc<'_> {
             5125 | 5126 => 4,
             _ => return Err(perr(format!("componentType {ct}"))),
         };
-        let mut out = vec![0.0f32; count * n];
-        let Some(bv) = idx(acc, "bufferView") else {
+        let (count, total, span) = self.layout(acc, n, csize)?;
+        let mut out = vec![0.0f32; total];
+        let Some(Span { buf, base, stride }) = span else {
             // No buffer view: all zeros (sparse substitution is not supported).
             return Ok((out, n));
         };
-        let view = arr(self.j, "bufferViews").get(bv).ok_or_else(|| perr(format!("no bufferView {bv}")))?;
-        let buf = self.buffers.get(idx(view, "buffer").unwrap_or(0)).ok_or_else(|| perr("bufferView buffer out of range"))?;
-        let base = idx(view, "byteOffset").unwrap_or(0) + idx(acc, "byteOffset").unwrap_or(0);
-        let elem = csize * n;
         // Matrices of 1/2-byte components pad columns to 4 bytes; ignored (rare).
-        let stride = idx(view, "byteStride").filter(|s| *s > 0).unwrap_or(elem);
         for i in 0..count {
             for c in 0..n {
                 let o = base + i * stride + c * csize;
@@ -207,18 +254,14 @@ impl Doc<'_> {
             "VEC2" => 2,
             _ => 1,
         };
-        let count = idx(acc, "count").unwrap_or(0);
         let csize = match ct {
             5120 | 5121 => 1,
             5122 | 5123 => 2,
             _ => 4,
         };
-        let Some(bv) = idx(acc, "bufferView") else { return Ok(vec![0; count * n]) };
-        let view = arr(self.j, "bufferViews").get(bv).ok_or_else(|| perr(format!("no bufferView {bv}")))?;
-        let buf = self.buffers.get(idx(view, "buffer").unwrap_or(0)).ok_or_else(|| perr("bufferView buffer out of range"))?;
-        let base = idx(view, "byteOffset").unwrap_or(0) + idx(acc, "byteOffset").unwrap_or(0);
-        let stride = idx(view, "byteStride").filter(|s| *s > 0).unwrap_or(csize * n);
-        let mut out = Vec::with_capacity(count * n);
+        let (count, total, span) = self.layout(acc, n, csize)?;
+        let Some(Span { buf, base, stride }) = span else { return Ok(vec![0; total]) };
+        let mut out = Vec::with_capacity(total);
         for i in 0..count {
             for c in 0..n {
                 let o = base + i * stride + c * csize;
@@ -268,7 +311,7 @@ pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<
             arr(&j, "bufferViews").get(bv).and_then(|v| {
                 let b = d.buffers.get(idx(v, "buffer").unwrap_or(0))?;
                 let o = idx(v, "byteOffset").unwrap_or(0);
-                b.get(o..o + idx(v, "byteLength").unwrap_or(0)).map(<[u8]>::to_vec)
+                b.get(o..o.checked_add(idx(v, "byteLength").unwrap_or(0))?).map(<[u8]>::to_vec)
             })
         } else {
             None
@@ -366,13 +409,13 @@ pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<
             skin: idx(n, "skin"),
             camera: idx(n, "camera"),
             light: n.get("extensions").and_then(|e| e.get("KHR_lights_punctual")).and_then(|e| idx(e, "light")),
-            children: arr(n, "children").iter().filter_map(Value::as_u64).map(|c| c as usize).collect(),
+            children: indices(n, "children"),
         });
     }
 
     let scene = idx(&j, "scene").unwrap_or(0);
     let roots: Vec<usize> = match arr(&j, "scenes").get(scene) {
-        Some(s) => arr(s, "nodes").iter().filter_map(Value::as_u64).map(|c| c as usize).collect(),
+        Some(s) => indices(s, "nodes"),
         None => {
             // No scene: every node that is nobody's child.
             let mut child = vec![false; nodes.len()];
@@ -389,7 +432,7 @@ pub fn parse(bytes: &[u8], resolve: &dyn Fn(&str) -> Option<Vec<u8>>) -> Result<
 
     let mut skins = vec![];
     for s in arr(&j, "skins") {
-        let joints: Vec<usize> = arr(s, "joints").iter().filter_map(Value::as_u64).map(|c| c as usize).collect();
+        let joints: Vec<usize> = indices(s, "joints");
         let inverse_bind = match idx(s, "inverseBindMatrices") {
             Some(a) => {
                 let (f, _) = d.floats(a)?;
diff --git a/crates/model/src/tests.rs b/crates/model/src/tests.rs
index 9206ef83f..7c98c1ae7 100644
--- a/crates/model/src/tests.rs
+++ b/crates/model/src/tests.rs
@@ -492,3 +492,75 @@ fn stl_hostile_input_is_an_error() {
     let m = stl::parse(&binary_stl(b"", &[([1.0, 0.0, 0.0], [[0.0; 3]; 3], 0)])).unwrap();
     assert_eq!(m.meshes[0].primitives[0].normals[0], [1.0, 0.0, 0.0]);
 }
+
+/// A one-triangle glTF whose POSITION is accessor 0, over a buffer of `bytes` zero bytes.
+fn gltf_doc(accessors: &str, views: &str, bytes: usize) -> String {
+    let b64 = "A".repeat(bytes / 3 * 4) + ["", "AA==", "AAA="][bytes % 3];
+    format!(
+        r#"{{"asset": {{"version": "2.0"}}, "scenes": [{{"nodes": [0]}}], "nodes": [{{"mesh": 0}}],
+        "meshes": [{{"primitives": [{{"attributes": {{"POSITION": 0}}}}]}}],
+        "buffers": [{{"byteLength": {bytes}, "uri": "data:application/octet-stream;base64,{b64}"}}],
+        "bufferViews": [{views}], "accessors": [{accessors}]}}"#
+    )
+}
+
+#[test]
+fn gltf_accessor_counts_are_checked_against_the_buffer_before_allocating() {
+    // Untrusted counts, offsets and strides must fail the import, not allocate from the count or
+    // overflow (#1235).
+    let view = r#"{"buffer": 0, "byteLength": 36}"#;
+    let cases = [
+        // A count far beyond the 36-byte buffer.
+        (r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 4000000000}"#, view, "past its buffer"),
+        // count * components overflows.
+        (r#"{"bufferView": 0, "componentType": 5126, "type": "MAT4", "count": 9223372036854775807}"#, view, "too large"),
+        // Offsets that overflow when added.
+        (
+            r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 3, "byteOffset": 16}"#,
+            r#"{"buffer": 0, "byteOffset": 18446744073709551610}"#,
+            "past its buffer",
+        ),
+        // A stride that overflows with the count.
+        (r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 3000000000}"#, r#"{"buffer": 0, "byteStride": 252}"#, "past its buffer"),
+        // A stride smaller than an element would re-read the same bytes for a huge count.
+        (r#"{"bufferView": 0, "componentType": 5126, "type": "MAT4", "count": 30}"#, r#"{"buffer": 0, "byteStride": 1}"#, "smaller than"),
+        // No buffer view: nothing backs the count, so it is capped.
+        (r#"{"componentType": 5126, "type": "VEC3", "count": 1000000000}"#, view, "without a bufferView"),
+    ];
+    let t0 = std::time::Instant::now();
+    for (acc, v, want) in cases {
+        let doc = gltf_doc(acc, v, 36);
+        let e = crate::gltf::parse(doc.as_bytes(), &|_| None).err().unwrap_or_else(|| panic!("{acc} imported"));
+        assert!(e.to_string().contains(want), "{acc}: {e}");
+    }
+    assert!(t0.elapsed() < std::time::Duration::from_secs(10), "{:?}", t0.elapsed());
+}
+
+#[test]
+fn gltf_integer_accessors_are_checked_too() {
+    let doc = gltf_doc(r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 3}"#, r#"{"buffer": 0, "byteLength": 36}"#, 36)
+        .replace(r#""attributes": {"POSITION": 0}"#, r#""attributes": {"POSITION": 0}, "indices": 1"#);
+    for idx in [
+        r#"{"bufferView": 0, "componentType": 5125, "type": "SCALAR", "count": 4000000000}"#,
+        r#"{"componentType": 5125, "type": "SCALAR", "count": 4000000000}"#,
+        r#"{"bufferView": 0, "componentType": 5125, "type": "VEC4", "count": 9223372036854775807}"#,
+    ] {
+        let doc = doc.replace(r#""count": 3}]"#, &format!(r#""count": 3}}, {idx}]"#));
+        assert!(crate::gltf::parse(doc.as_bytes(), &|_| None).is_err(), "{idx}");
+    }
+}
+
+#[test]
+fn gltf_strided_and_buffer_less_accessors_still_import() {
+    // Interleaved positions (stride 24) ending exactly at the buffer's end, and a small all-zero
+    // accessor without a view.
+    let doc = gltf_doc(r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 3}"#, r#"{"buffer": 0, "byteStride": 24}"#, 60);
+    let m = crate::gltf::parse(doc.as_bytes(), &|_| None).unwrap();
+    assert_eq!(m.meshes[0].primitives[0].positions.len(), 3);
+    let doc = gltf_doc(r#"{"componentType": 5126, "type": "VEC3", "count": 6}"#, r#"{"buffer": 0}"#, 3);
+    let m = crate::gltf::parse(doc.as_bytes(), &|_| None).unwrap();
+    assert_eq!(m.meshes[0].primitives[0].positions.len(), 6);
+    // One byte short of the third element is an error.
+    let doc = gltf_doc(r#"{"bufferView": 0, "componentType": 5126, "type": "VEC3", "count": 3}"#, r#"{"buffer": 0, "byteStride": 24}"#, 59);
+    assert!(crate::gltf::parse(doc.as_bytes(), &|_| None).is_err());
+}
diff --git a/crates/opusenc/README.md b/crates/opusenc/README.md
index 999d8a7e9..1ebf6fedb 100644
--- a/crates/opusenc/README.md
+++ b/crates/opusenc/README.md
@@ -130,7 +130,7 @@ weights) and the decoder-side normative arithmetic the encoder must reproduce bi
 allocation; SILK NLSF dequantisation and stabilisation, NLSF → LPC conversion, `log2lin`, the
 fixed-point division/inverse helpers and the LPC analysis filter) are mirrored from FilmCraft's
 first-party, spec-derived `filmcraft-opus` decoder (MIT OR Apache-2.0), which is also the
-round-trip oracle in `tests/` and `crates/export/tests/opus_roundtrip.rs` (ffmpeg is a second,
+round-trip oracle in `tests/` and `crates/export/tests/it/opus_roundtrip.rs` (ffmpeg is a second,
 external oracle when installed). All encoder-side analysis and search (pitch, LPC, NLSF and
 LTP search, noise feedback, rate control, stereo prediction, the decimator) is our own design.
 No third-party encoder or decoder source (libopus or otherwise) was consulted.
diff --git a/crates/opusenc/src/bands.rs b/crates/opusenc/src/bands.rs
index 744de3fe3..cf3c590e8 100644
--- a/crates/opusenc/src/bands.rs
+++ b/crates/opusenc/src/bands.rs
@@ -8,7 +8,8 @@
 
 use crate::range::{BITRES, RangeEncoder, ilog};
 use crate::rate::{Mode, QTHETA_OFFSET, get_pulses};
-use crate::tables::*;
+use crate::tables::EBANDS;
+use crate::{CeltFrame, rate::Allocation};
 
 pub const SPREAD_NORMAL: usize = 2;
 
@@ -55,7 +56,7 @@ fn exp_rotation1_inv(x: &mut [f32], len: usize, stride: usize, c: f32, s: f32) {
     if len <= stride {
         return;
     }
-    if len >= 2 * stride + 1 {
+    if len > 2 * stride {
         for i in 0..=len - 2 * stride - 1 {
             let x1 = x[i];
             let x2 = x[i + stride];
@@ -217,7 +218,7 @@ impl BandEnc<'_, '_> {
             let q = qn as u32;
             let half = q >> 1;
             let ft = (half + 1) * (half + 1);
-            let (fl, fs) = if it <= half { (it * (it + 1) >> 1, it + 1) } else { (ft - ((q + 1 - it) * (q + 2 - it) >> 1), q + 1 - it) };
+            let (fl, fs) = if it <= half { ((it * (it + 1)) >> 1, it + 1) } else { (ft - (((q + 1 - it) * (q + 2 - it)) >> 1), q + 1 - it) };
             self.enc.encode(fl, fl + fs, ft);
             itheta = ((it * 16384) / q) as i32;
         }
@@ -294,26 +295,19 @@ impl BandEnc<'_, '_> {
     }
 }
 
-/// Codes all band shapes (`quant_all_bands`, encoder side, long blocks). `x` holds `c` channels
-/// of `n` normalised MDCT coefficients each.
-#[allow(clippy::too_many_arguments)]
-pub fn quant_all_bands(
-    m: &Mode,
-    start: usize,
-    end: usize,
-    x: &[f32],
-    n_total: usize,
-    c: usize,
-    pulses: &[i32; NB_EBANDS],
-    spread: usize,
-    dual_stereo: bool,
-    intensity: usize,
-    total_bits: i32,
-    mut balance: i32,
-    enc: &mut RangeEncoder,
-    lm: usize,
-    coded_bands: usize,
-) {
+/// Shape-coding controls, independent of the selected band allocation.
+pub struct BandCoding {
+    pub spread: usize,
+    pub total_bits: i32,
+}
+
+/// Codes all band shapes (`quant_all_bands`, encoder side, long blocks). `x` holds
+/// `frame.channels` channels of `n_total` normalised MDCT coefficients each.
+pub fn quant_all_bands(m: &Mode, frame: CeltFrame, x: &[f32], n_total: usize, allocation: &Allocation, coding: BandCoding, enc: &mut RangeEncoder) {
+    let CeltFrame { start, end, channels: c, lm } = frame;
+    let Allocation { pulses, dual_stereo, intensity, coded_bands, balance, .. } = allocation;
+    let (dual_stereo, intensity, coded_bands, mut balance) = (*dual_stereo, *intensity, *coded_bands, *balance);
+    let BandCoding { spread, total_bits } = coding;
     let mm = 1usize << lm;
     debug_assert!(c == 1 || dual_stereo || intensity <= start, "stereo frames are coded as dual stereo");
     let mut ctx = BandEnc { m, enc, i: 0, spread, remaining_bits: 0, pvq_v: Vec::new(), iy: Vec::new(), tmp: Vec::new() };
@@ -362,7 +356,7 @@ mod tests {
             x[i + stride] = c * x2 + s * x1;
             x[i] = c * x1 + ms * x2;
         }
-        if len >= 2 * stride + 1 {
+        if len > 2 * stride {
             for i in (0..=len - 2 * stride - 1).rev() {
                 let x1 = x[i];
                 let x2 = x[i + stride];
diff --git a/crates/opusenc/src/energy.rs b/crates/opusenc/src/energy.rs
index 0057ae33a..1d4b12719 100644
--- a/crates/opusenc/src/energy.rs
+++ b/crates/opusenc/src/energy.rs
@@ -4,9 +4,10 @@
 //! The quantised energies are updated with exactly the decoder's arithmetic so the prediction
 //! state never drifts between encoder and decoder.
 
+use crate::CeltFrame;
 use crate::range::RangeEncoder;
-use crate::rate::MAX_FINE_BITS;
-use crate::tables::*;
+use crate::rate::{Allocation, MAX_FINE_BITS};
+use crate::tables::{BETA_COEF, BETA_INTRA, E_PROB_MODEL, NB_EBANDS, PRED_COEF, SMALL_ENERGY_ICDF};
 
 const LAPLACE_MINP: u32 = 1;
 const LAPLACE_NMIN: u32 = 16;
@@ -56,18 +57,8 @@ pub fn laplace_encode(enc: &mut RangeEncoder, value: i32, mut fs: u32, decay: u3
 /// `quant_coarse_energy` for one prediction mode. `e` holds the target log2 energies (relative
 /// to `E_MEANS`), `old_e` the quantised energies, updated in place. `budget` is the frame size in
 /// bits.
-#[allow(clippy::too_many_arguments)]
-pub fn quant_coarse_energy(
-    start: usize,
-    end: usize,
-    e: &[f32; 2 * NB_EBANDS],
-    old_e: &mut [f32; 2 * NB_EBANDS],
-    intra: bool,
-    enc: &mut RangeEncoder,
-    c: usize,
-    lm: usize,
-    budget: i32,
-) {
+pub fn quant_coarse_energy(frame: CeltFrame, e: &[f32; 2 * NB_EBANDS], old_e: &mut [f32; 2 * NB_EBANDS], intra: bool, enc: &mut RangeEncoder, budget: i32) {
+    let CeltFrame { start, end, channels: c, lm } = frame;
     let prob = &E_PROB_MODEL[lm][intra as usize];
     let (coef, beta) = if intra { (0.0, BETA_INTRA) } else { (PRED_COEF[lm], BETA_COEF[lm]) };
     let mut prev = [0f32; 2];
@@ -111,15 +102,8 @@ pub fn quant_coarse_energy(
 }
 
 /// `quant_fine_energy`: raw bits refining each band's quantised energy.
-pub fn quant_fine_energy(
-    start: usize,
-    end: usize,
-    e: &[f32; 2 * NB_EBANDS],
-    old_e: &mut [f32; 2 * NB_EBANDS],
-    fine_quant: &[i32; NB_EBANDS],
-    enc: &mut RangeEncoder,
-    c: usize,
-) {
+pub fn quant_fine_energy(frame: CeltFrame, e: &[f32; 2 * NB_EBANDS], old_e: &mut [f32; 2 * NB_EBANDS], fine_quant: &[i32; NB_EBANDS], enc: &mut RangeEncoder) {
+    let CeltFrame { start, end, channels: c, .. } = frame;
     for i in start..end {
         let fq = fine_quant[i];
         if fq <= 0 {
@@ -139,18 +123,16 @@ pub fn quant_fine_energy(
 
 /// `quant_energy_finalise`: spends the bits left at the end of the frame on one more bit of
 /// energy resolution per band, in priority order.
-#[allow(clippy::too_many_arguments)]
 pub fn quant_energy_finalise(
-    start: usize,
-    end: usize,
+    frame: CeltFrame,
     e: &[f32; 2 * NB_EBANDS],
     old_e: &mut [f32; 2 * NB_EBANDS],
-    fine_quant: &[i32; NB_EBANDS],
-    fine_priority: &[i32; NB_EBANDS],
+    allocation: &Allocation,
     mut bits_left: i32,
     enc: &mut RangeEncoder,
-    c: usize,
 ) {
+    let CeltFrame { start, end, channels: c, .. } = frame;
+    let Allocation { fine_quant, fine_priority, .. } = allocation;
     for prio in 0..2 {
         let mut i = start;
         while i < end && bits_left >= c as i32 {
diff --git a/crates/opusenc/src/lib.rs b/crates/opusenc/src/lib.rs
index 9cc1f6a51..b4346ebd6 100644
--- a/crates/opusenc/src/lib.rs
+++ b/crates/opusenc/src/lib.rs
@@ -24,8 +24,6 @@
 //! ```
 
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
-// The bit-allocation code mirrors the normative integer arithmetic; keep C-like shift expressions.
-#![allow(clippy::precedence, clippy::int_plus_one)]
 
 mod bands;
 mod energy;
@@ -38,14 +36,23 @@ mod tables;
 
 use std::sync::OnceLock;
 
-use bands::{SPREAD_NORMAL, quant_all_bands};
+use bands::{BandCoding, SPREAD_NORMAL, quant_all_bands};
 use energy::{quant_coarse_energy, quant_energy_finalise, quant_fine_energy};
 use mdct::Mdct;
 use range::{BITRES, RangeEncoder};
-use rate::{Mode as CeltMode, compute_allocation};
+use rate::{AllocationInput, Mode as CeltMode, compute_allocation};
 use resample::Downsampler;
 use silk::SilkEncoder;
-use tables::*;
+use tables::{E_MEANS, EBANDS, NB_EBANDS, OVERLAP, PREEMPH, SPREAD_ICDF, TF_SELECT_TABLE, TRIM_ICDF};
+
+/// Band range, channel count and transform size shared by CELT coding stages.
+#[derive(Clone, Copy)]
+struct CeltFrame {
+    start: usize,
+    end: usize,
+    channels: usize,
+    lm: usize,
+}
 
 /// Samples per channel in one 20 ms frame at 48 kHz.
 const N: usize = 960;
@@ -314,7 +321,7 @@ impl OpusEncoder {
             Mode::Celt => {
                 let (log_e, silence) = self.celt_analysis(pcm);
                 let len = self.frame_bytes;
-                packet.extend_from_slice(&self.encode_celt(RangeEncoder::new(), len, 0, NB_EBANDS, &log_e, silence));
+                packet.extend_from_slice(&self.encode_celt(RangeEncoder::new(), len, 0..NB_EBANDS, &log_e, silence));
             }
             Mode::Silk => {
                 let x = self.silk_input(pcm);
@@ -344,7 +351,7 @@ impl OpusEncoder {
                 }
                 let (log_e, _) = self.celt_analysis(pcm);
                 let end = if self.bandwidth == Bandwidth::SuperWideband { 19 } else { NB_EBANDS };
-                packet.extend_from_slice(&self.encode_celt(enc, len, HYBRID_START_BAND, end, &log_e, false));
+                packet.extend_from_slice(&self.encode_celt(enc, len, HYBRID_START_BAND..end, &log_e, false));
             }
         }
         packet
@@ -406,10 +413,11 @@ impl OpusEncoder {
     /// Codes one CELT frame (RFC 6716 §4.3, in bitstream order) of `len` bytes into `enc`
     /// (which already holds the SILK frame in hybrid mode), coding bands `start..end`, and
     /// finalises the frame.
-    #[allow(clippy::too_many_arguments)]
-    fn encode_celt(&mut self, mut enc: RangeEncoder, len: usize, start: usize, end: usize, log_e: &[f32; 2 * NB_EBANDS], silence: bool) -> Vec<u8> {
+    fn encode_celt(&mut self, mut enc: RangeEncoder, len: usize, bands: std::ops::Range<usize>, log_e: &[f32; 2 * NB_EBANDS], silence: bool) -> Vec<u8> {
         let m = celt_mode();
         let c = self.channels;
+        let frame = CeltFrame { start: bands.start, end: bands.end, channels: c, lm: LM };
+        let CeltFrame { start, end, .. } = frame;
         if c == 1 {
             for i in 0..NB_EBANDS {
                 self.old_band_e[i] = self.old_band_e[i].max(self.old_band_e[NB_EBANDS + i]);
@@ -438,10 +446,10 @@ impl OpusEncoder {
             let mut enc_intra = enc.clone();
             let mut old_intra = self.old_band_e;
             enc_intra.bit_logp(true, 3);
-            quant_coarse_energy(start, end, log_e, &mut old_intra, true, &mut enc_intra, c, LM, total_bits_raw);
+            quant_coarse_energy(frame, log_e, &mut old_intra, true, &mut enc_intra, total_bits_raw);
             enc.bit_logp(false, 3);
             let mut old_inter = self.old_band_e;
-            quant_coarse_energy(start, end, log_e, &mut old_inter, false, &mut enc, c, LM, total_bits_raw);
+            quant_coarse_energy(frame, log_e, &mut old_inter, false, &mut enc, total_bits_raw);
             if enc_intra.tell_frac() < enc.tell_frac() {
                 enc = enc_intra;
                 self.old_band_e = old_intra;
@@ -449,14 +457,14 @@ impl OpusEncoder {
                 self.old_band_e = old_inter;
             }
         } else {
-            quant_coarse_energy(start, end, log_e, &mut self.old_band_e, false, &mut enc, c, LM, total_bits_raw);
+            quant_coarse_energy(frame, log_e, &mut self.old_band_e, false, &mut enc, total_bits_raw);
         }
         // TF resolution: no changes.
         {
             let mut budget = total_bits_raw;
             let mut tell = enc.tell();
             let mut logp = 4;
-            let tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
+            let tf_select_rsv = LM > 0 && tell + logp < budget;
             budget -= tf_select_rsv as i32;
             for _ in start..end {
                 if tell + logp <= budget {
@@ -488,27 +496,11 @@ impl OpusEncoder {
             enc.icdf(alloc_trim as usize, &TRIM_ICDF, 7);
         }
         let bits = (total_bits_raw << BITRES) - enc.tell_frac() - 1;
-        let alloc = compute_allocation(m, start, end, &offsets, &cap, alloc_trim, bits, c, LM, &mut enc);
-        quant_fine_energy(start, end, log_e, &mut self.old_band_e, &alloc.fine_quant, &mut enc, c);
-        quant_all_bands(
-            m,
-            start,
-            end,
-            &self.freq,
-            N,
-            c,
-            &alloc.pulses,
-            SPREAD_NORMAL,
-            alloc.dual_stereo,
-            alloc.intensity,
-            total_bits_raw << BITRES,
-            alloc.balance,
-            &mut enc,
-            LM,
-            alloc.coded_bands,
-        );
+        let alloc = compute_allocation(m, frame, AllocationInput { offsets: &offsets, cap: &cap, trim: alloc_trim, bits }, &mut enc);
+        quant_fine_energy(frame, log_e, &mut self.old_band_e, &alloc.fine_quant, &mut enc);
+        quant_all_bands(m, frame, &self.freq, N, &alloc, BandCoding { spread: SPREAD_NORMAL, total_bits: total_bits_raw << BITRES }, &mut enc);
         let bits_left = total_bits_raw - enc.tell();
-        quant_energy_finalise(start, end, log_e, &mut self.old_band_e, &alloc.fine_quant, &alloc.fine_priority, bits_left, &mut enc, c);
+        quant_energy_finalise(frame, log_e, &mut self.old_band_e, &alloc, bits_left, &mut enc);
         debug_assert!(enc.tell() <= total_bits_raw, "frame overflow: {} > {}", enc.tell(), total_bits_raw);
         if c == 1 {
             let (a, b) = self.old_band_e.split_at_mut(NB_EBANDS);
diff --git a/crates/opusenc/src/rate.rs b/crates/opusenc/src/rate.rs
index a6ae81f5c..ff6ccae95 100644
--- a/crates/opusenc/src/rate.rs
+++ b/crates/opusenc/src/rate.rs
@@ -4,8 +4,9 @@
 //! spec-derived `filmcraft-opus` decoder (first-party, MIT OR Apache-2.0) step by step; the only
 //! difference is that the encoder *writes* the band-skip, intensity and dual-stereo symbols.
 
+use crate::CeltFrame;
 use crate::range::{BITRES, RangeEncoder, ilog};
-use crate::tables::*;
+use crate::tables::{ALLOC, EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS};
 
 const MAX_PSEUDO: i32 = 40;
 const LOG_MAX_PSEUDO: i32 = 6;
@@ -127,7 +128,7 @@ impl Mode {
         let mut cap = [0i32; NB_EBANDS];
         for (i, cp) in cap.iter_mut().enumerate() {
             let n = (EBANDS[i + 1] - EBANDS[i]) << lm;
-            *cp = (self.caps[NB_EBANDS * (2 * lm + c - 1) + i] as i32 + 64) * c as i32 * n >> 2;
+            *cp = ((self.caps[NB_EBANDS * (2 * lm + c - 1) + i] as i32 + 64) * c as i32 * n) >> 2;
         }
         cap
     }
@@ -200,7 +201,7 @@ fn compute_caps(m: &Mode) -> Vec<u8> {
                 let mut n0 = EBANDS[j + 1] - EBANDS[j];
 
                 let max_bits = if n0 << i == 1 {
-                    c * (1 + MAX_FINE_BITS) << BITRES
+                    (c * (1 + MAX_FINE_BITS)) << BITRES
                 } else {
                     let mut lm0 = 0;
                     if n0 > 2 {
@@ -240,7 +241,7 @@ fn compute_caps(m: &Mode) -> Vec<u8> {
                     let num = mb + ndof * offset;
                     let den = (ndof - 1) << BITRES;
                     let qb = ((num + (den >> 1)) / den).min(MAX_FINE_BITS);
-                    mb += c * qb << BITRES;
+                    mb += (c * qb) << BITRES;
                     mb
                 };
                 let w = c * ((EBANDS[j + 1] - EBANDS[j]) << i);
@@ -263,21 +264,19 @@ pub struct Allocation {
     pub fine_priority: [i32; NB_EBANDS],
 }
 
+/// Per-band limits, boosts and available budget for the allocation search.
+pub struct AllocationInput<'a> {
+    pub offsets: &'a [i32; NB_EBANDS],
+    pub cap: &'a [i32; NB_EBANDS],
+    pub trim: i32,
+    pub bits: i32,
+}
+
 /// `clt_compute_allocation`, encoder side. Stereo frames are always coded as dual (L/R) stereo
 /// with no intensity bands, and no band is skipped voluntarily.
-#[allow(clippy::too_many_arguments)]
-pub fn compute_allocation(
-    m: &Mode,
-    start: usize,
-    end: usize,
-    offsets: &[i32; NB_EBANDS],
-    cap: &[i32; NB_EBANDS],
-    alloc_trim: i32,
-    total: i32,
-    c: usize,
-    lm: usize,
-    enc: &mut RangeEncoder,
-) -> Allocation {
+pub fn compute_allocation(m: &Mode, frame: CeltFrame, input: AllocationInput<'_>, enc: &mut RangeEncoder) -> Allocation {
+    let CeltFrame { start, end, channels: c, lm } = frame;
+    let AllocationInput { offsets, cap, trim: alloc_trim, bits: total } = input;
     let ci = c as i32;
     let lmi = lm as i32;
     let mut total = total.max(0);
@@ -302,8 +301,8 @@ pub fn compute_allocation(
     let mut trim_offset = [0i32; NB_EBANDS];
     for j in start..end {
         let w = EBANDS[j + 1] - EBANDS[j];
-        thresh[j] = (ci << BITRES).max((3 * w << lmi << BITRES) >> 4);
-        trim_offset[j] = ci * w * (alloc_trim - 5 - lmi) * (end as i32 - j as i32 - 1) * (1 << (lmi + BITRES as i32)) >> 6;
+        thresh[j] = (ci << BITRES).max(((3 * w) << lmi << BITRES) >> 4);
+        trim_offset[j] = (ci * w * (alloc_trim - 5 - lmi) * (end as i32 - j as i32 - 1) * (1 << (lmi + BITRES as i32))) >> 6;
         if w << lmi == 1 {
             trim_offset[j] -= ci << BITRES;
         }
@@ -317,7 +316,7 @@ pub fn compute_allocation(
         let mid = (lo + hi) >> 1;
         for j in (start..end).rev() {
             let n = EBANDS[j + 1] - EBANDS[j];
-            let mut bitsj = ci * n * (ALLOC[mid as usize][j] as i32) << lmi >> 2;
+            let mut bitsj = (ci * n * (ALLOC[mid as usize][j] as i32)) << lmi >> 2;
             if bitsj > 0 {
                 bitsj = (bitsj + trim_offset[j]).max(0);
             }
@@ -342,8 +341,8 @@ pub fn compute_allocation(
     lo -= 1;
     for j in start..end {
         let n = EBANDS[j + 1] - EBANDS[j];
-        let mut bits1j = ci * n * (ALLOC[lo as usize][j] as i32) << lmi >> 2;
-        let mut bits2j = if hi >= nb_alloc { cap[j] } else { ci * n * (ALLOC[hi as usize][j] as i32) << lmi >> 2 };
+        let mut bits1j = (ci * n * (ALLOC[lo as usize][j] as i32)) << lmi >> 2;
+        let mut bits2j = if hi >= nb_alloc { cap[j] } else { (ci * n * (ALLOC[hi as usize][j] as i32)) << lmi >> 2 };
         if bits1j > 0 {
             bits1j = (bits1j + trim_offset[j]).max(0);
         }
@@ -361,27 +360,27 @@ pub fn compute_allocation(
         bits1[j] = bits1j;
         bits2[j] = bits2j;
     }
-    interp_bits2pulses(m, start, end, skip_start, &bits1, &bits2, &thresh, cap, total, skip_rsv, intensity_rsv, dual_stereo_rsv, c, lm, enc)
+    let interpolation =
+        AllocationInterpolation { skip_start, bits1: &bits1, bits2: &bits2, thresh: &thresh, cap, total, skip_rsv, intensity_rsv, dual_stereo_rsv };
+    interp_bits2pulses(m, frame, interpolation, enc)
 }
 
-#[allow(clippy::too_many_arguments)]
-fn interp_bits2pulses(
-    m: &Mode,
-    start: usize,
-    end: usize,
+/// Bracketing allocation vectors and signalling reserves for the interpolation stage.
+struct AllocationInterpolation<'a> {
     skip_start: usize,
-    bits1: &[i32; NB_EBANDS],
-    bits2: &[i32; NB_EBANDS],
-    thresh: &[i32; NB_EBANDS],
-    cap: &[i32; NB_EBANDS],
-    mut total: i32,
+    bits1: &'a [i32; NB_EBANDS],
+    bits2: &'a [i32; NB_EBANDS],
+    thresh: &'a [i32; NB_EBANDS],
+    cap: &'a [i32; NB_EBANDS],
+    total: i32,
     skip_rsv: i32,
-    mut intensity_rsv: i32,
-    mut dual_stereo_rsv: i32,
-    c: usize,
-    lm: usize,
-    enc: &mut RangeEncoder,
-) -> Allocation {
+    intensity_rsv: i32,
+    dual_stereo_rsv: i32,
+}
+
+fn interp_bits2pulses(m: &Mode, frame: CeltFrame, interpolation: AllocationInterpolation<'_>, enc: &mut RangeEncoder) -> Allocation {
+    let CeltFrame { start, end, channels: c, lm } = frame;
+    let AllocationInterpolation { skip_start, bits1, bits2, thresh, cap, mut total, skip_rsv, mut intensity_rsv, mut dual_stereo_rsv } = interpolation;
     let ci = c as i32;
     let alloc_floor = ci << BITRES;
     let stereo = (c > 1) as i32;
@@ -393,7 +392,7 @@ fn interp_bits2pulses(
         let mut psum = 0;
         let mut done = false;
         for j in (start..end).rev() {
-            let tmp = bits1[j] + (mid * bits2[j] >> ALLOC_STEPS);
+            let tmp = bits1[j] + ((mid * bits2[j]) >> ALLOC_STEPS);
             if tmp >= thresh[j] || done {
                 done = true;
                 psum += tmp.min(cap[j]);
@@ -411,7 +410,7 @@ fn interp_bits2pulses(
     let mut psum = 0;
     let mut done = false;
     for j in (start..end).rev() {
-        let mut tmp = bits1[j] + (lo * bits2[j] >> ALLOC_STEPS);
+        let mut tmp = bits1[j] + ((lo * bits2[j]) >> ALLOC_STEPS);
         if tmp < thresh[j] && !done {
             tmp = if tmp >= alloc_floor { alloc_floor } else { 0 };
         } else {
@@ -500,9 +499,9 @@ fn interp_bits2pulses(
             if n == 2 {
                 offset += (den << BITRES) >> 2;
             }
-            if bits[j] + offset < den * 2 << BITRES {
+            if bits[j] + offset < (den * 2) << BITRES {
                 offset += nclogn >> 2;
-            } else if bits[j] + offset < den * 3 << BITRES {
+            } else if bits[j] + offset < (den * 3) << BITRES {
                 offset += nclogn >> 3;
             }
             let mut eb = (bits[j] + offset + (den << (BITRES - 1))).max(0);
@@ -513,7 +512,7 @@ fn interp_bits2pulses(
             eb = eb.min(MAX_FINE_BITS);
             ebits[j] = eb;
             fine_priority[j] = (eb * (den << BITRES) >= bits[j] + offset) as i32;
-            bits[j] -= ci * eb << BITRES;
+            bits[j] -= (ci * eb) << BITRES;
         } else {
             excess = (bit - (ci << BITRES)).max(0);
             bits[j] = bit - excess;
@@ -523,7 +522,7 @@ fn interp_bits2pulses(
         if excess > 0 {
             let extra_fine = (excess >> (stereo + BITRES as i32)).min(MAX_FINE_BITS - ebits[j]);
             ebits[j] += extra_fine;
-            let extra_bits = extra_fine * ci << BITRES;
+            let extra_bits = (extra_fine * ci) << BITRES;
             fine_priority[j] = (extra_bits >= excess - balance) as i32;
             excess -= extra_bits;
         }
diff --git a/crates/opusenc/src/silk/mod.rs b/crates/opusenc/src/silk.rs
similarity index 98%
rename from crates/opusenc/src/silk/mod.rs
rename to crates/opusenc/src/silk.rs
index c7a4b8692..2678a96a0 100644
--- a/crates/opusenc/src/silk/mod.rs
+++ b/crates/opusenc/src/silk.rs
@@ -16,8 +16,12 @@ mod pulses;
 #[allow(dead_code)]
 pub(crate) mod tables;
 
-use lpc::*;
-use tables::*;
+use lpc::{MAX_LPC_ORDER, div32_varq, inverse32_varq, nlsf2a, rshift_round, sat16, smlawb, smulwb, smulww};
+use tables::{
+    DELTA_GAIN, GAIN_MSB, LTP_FILTER, LTP_PERIODICITY, LTP_SCALE, LTP_TAPS_0, LTP_TAPS_1, LTP_TAPS_2, MID_ONLY, NLSF_EXT, NLSF_INTERP, NLSF_SEL_NBMB,
+    NLSF_SEL_WB, NLSF_STAGE1, NLSF_STAGE2, PITCH_CONTOUR, PITCH_HIGH, PITCH_LOW, STEREO_PRED_JOINT, STEREO_WEIGHTS_Q13, TYPE_ACTIVE, TYPE_INACTIVE, UNIFORM3,
+    UNIFORM4, UNIFORM5, UNIFORM8,
+};
 
 use crate::range::RangeEncoder;
 
diff --git a/crates/opusenc/src/silk/analysis.rs b/crates/opusenc/src/silk/analysis.rs
index de510433e..439331076 100644
--- a/crates/opusenc/src/silk/analysis.rs
+++ b/crates/opusenc/src/silk/analysis.rs
@@ -1,7 +1,7 @@
 //! Encoder-side signal analysis for SILK (own design): windowed autocorrelation LPC, LPC → NLSF
 //! conversion, open-loop pitch search and LTP codebook search.
 
-use super::tables::*;
+use super::tables::{CB_NB_20, CB_WB_20, LTP_FILTER, LTP_PERIODICITY, LTP_TAPS_0, LTP_TAPS_1, LTP_TAPS_2};
 
 /// Short-term prediction coefficients `a` (prediction `x[n] ≈ Σ a[j] x[n-1-j]`) from the
 /// windowed segment `x`, with a Gaussian lag window and white-noise correction.
diff --git a/crates/opusenc/src/silk/lpc.rs b/crates/opusenc/src/silk/lpc.rs
index 7846d2973..e0f8c107e 100644
--- a/crates/opusenc/src/silk/lpc.rs
+++ b/crates/opusenc/src/silk/lpc.rs
@@ -5,7 +5,10 @@
 //! spec-derived `filmcraft-opus` decoder (MIT OR Apache-2.0): the encoder must reconstruct the
 //! quantised NLSFs and LPC coefficients bit-exactly as the decoder does.
 
-use super::tables::*;
+use super::tables::{
+    COS_Q12, LSF_ORDER_NBMB, LSF_ORDER_WB, NLSF_CB_NBMB, NLSF_CB_WB, NLSF_MIN_SPACING_NBMB, NLSF_MIN_SPACING_WB, NLSF_PRED_NBMB, NLSF_PRED_WB, NLSF_PSEL_NBMB,
+    NLSF_PSEL_WB,
+};
 
 pub const MAX_LPC_ORDER: usize = 16;
 
diff --git a/crates/opusenc/src/silk/nlsf.rs b/crates/opusenc/src/silk/nlsf.rs
index 3f1f17ac6..4695152ff 100644
--- a/crates/opusenc/src/silk/nlsf.rs
+++ b/crates/opusenc/src/silk/nlsf.rs
@@ -3,7 +3,9 @@
 //! dequantisation exactly. The search strategy is our own.
 
 use super::lpc::{MAX_LPC_ORDER, nlsf_decode, smlawb, sqrt_approx};
-use super::tables::*;
+use super::tables::{
+    NLSF_CB_NBMB, NLSF_CB_WB, NLSF_EXT, NLSF_PRED_NBMB, NLSF_PRED_WB, NLSF_PSEL_NBMB, NLSF_PSEL_WB, NLSF_SEL_NBMB, NLSF_SEL_WB, NLSF_STAGE1, NLSF_STAGE2,
+};
 
 /// Number of stage-1 candidates refined with stage 2.
 const SURVIVORS: usize = 8;
diff --git a/crates/opusenc/src/silk/pulses.rs b/crates/opusenc/src/silk/pulses.rs
index f8cda15a9..ba22b5ec5 100644
--- a/crates/opusenc/src/silk/pulses.rs
+++ b/crates/opusenc/src/silk/pulses.rs
@@ -2,7 +2,7 @@
 //! with LSB escapes, the recursive shell code, LSBs and signs, written in exactly the order the
 //! decoder reads them.
 
-use super::tables::*;
+use super::tables::{EXC_LSB, EXC_SIGN, PULSE_COUNT, RATE_LEVEL, SHELL_2, SHELL_4, SHELL_8, SHELL_16};
 use crate::range::RangeEncoder;
 
 /// Largest pulse magnitude the quantiser produces (keeps every 16-sample block codable).
diff --git a/crates/opusenc/tests/common/mod.rs b/crates/opusenc/tests/it/common/mod.rs
similarity index 100%
rename from crates/opusenc/tests/common/mod.rs
rename to crates/opusenc/tests/it/common/mod.rs
diff --git a/crates/opusenc/tests/ffmpeg.rs b/crates/opusenc/tests/it/ffmpeg.rs
similarity index 99%
rename from crates/opusenc/tests/ffmpeg.rs
rename to crates/opusenc/tests/it/ffmpeg.rs
index fcbb8c8a7..1294ed348 100644
--- a/crates/opusenc/tests/ffmpeg.rs
+++ b/crates/opusenc/tests/it/ffmpeg.rs
@@ -2,7 +2,7 @@
 //! without errors with both ffmpeg's native `opus` decoder and `libopus`, honour the pre-skip
 //! and end granule, and reproduce the input. Skipped when ffmpeg is not installed.
 
-mod common;
+use crate::common;
 
 use std::process::Command;
 
diff --git a/crates/opusenc/tests/it/main.rs b/crates/opusenc/tests/it/main.rs
new file mode 100644
index 000000000..ba6a7895d
--- /dev/null
+++ b/crates/opusenc/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod common;
+mod ffmpeg;
+mod modes;
diff --git a/crates/opusenc/tests/modes.rs b/crates/opusenc/tests/it/modes.rs
similarity index 99%
rename from crates/opusenc/tests/modes.rs
rename to crates/opusenc/tests/it/modes.rs
index 843cf3d9f..c01f64e69 100644
--- a/crates/opusenc/tests/modes.rs
+++ b/crates/opusenc/tests/it/modes.rs
@@ -2,7 +2,7 @@
 //! mode/bandwidth decodes, waveform quality on speech-like and music-like signals, bitrate
 //! tracking, stereo, the application tables and delay alignment.
 
-mod common;
+use crate::common;
 
 use common::*;
 use effectcraft_opusenc::{Application, Bandwidth, Mode, OpusEncoder};
diff --git a/crates/path/Cargo.toml b/crates/path/Cargo.toml
index 46cf0a832..2e9bc85d9 100644
--- a/crates/path/Cargo.toml
+++ b/crates/path/Cargo.toml
@@ -15,4 +15,4 @@ effectcraft-keyframe = { workspace = true }
 effectcraft-raster = { workspace = true }
 kurbo = { workspace = true }
 tiny-skia = { workspace = true }
-linesweeper = "0.4"
+linesweeper = "0.5"
diff --git a/crates/path/src/boolean.rs b/crates/path/src/boolean.rs
index 5a81b3e19..bcd395566 100644
--- a/crates/path/src/boolean.rs
+++ b/crates/path/src/boolean.rs
@@ -5,7 +5,7 @@
 //! MIT OR Apache-2.0), reworked to take and return kurbo paths directly.
 //!
 //! Inputs are closed implicitly (a filled open path is painted as if closed). The sweep splits
-//! curves at intersections and y-extrema; [`tidy_segments`] re-joins pieces that came from one
+//! curves at intersections and y-extrema; `tidy_segments` re-joins pieces that came from one
 //! input curve (exactly) or one smooth run (by least-squares refit), so results carry roughly as
 //! few vertices as the inputs. Output contours are simple and consistently oriented (holes wind
 //! opposite to their outer contour), so they fill the same under either fill rule.
diff --git a/crates/path/src/lib.rs b/crates/path/src/lib.rs
index 249eb9fdd..c52b3d262 100644
--- a/crates/path/src/lib.rs
+++ b/crates/path/src/lib.rs
@@ -133,7 +133,9 @@ pub fn from_kurbo(path: &BezPath) -> Vec<ShapePath> {
 /// Rectangle path centred at `pos` with corner `roundness` (AE draws clockwise from the top-right).
 pub fn rect(size: [f64; 2], pos: [f64; 2], roundness: f64) -> BezPath {
     let r = kurbo::Rect::from_center_size(Point::new(pos[0], pos[1]), (size[0].abs(), size[1].abs()));
-    let rad = roundness.clamp(0.0, size[0].abs().min(size[1].abs()) / 2.0);
+    let max_rad = size[0].abs().min(size[1].abs()) / 2.0;
+    // `f64::clamp` panics on a NaN bound (both size components NaN): fall back to no roundness.
+    let rad = if max_rad.is_nan() { 0.0 } else { roundness.clamp(0.0, max_rad) };
     if rad > 0.0 { r.to_rounded_rect(rad).to_path(0.1) } else { r.to_path(0.1) }
 }
 
@@ -142,7 +144,20 @@ pub fn ellipse(size: [f64; 2], pos: [f64; 2]) -> BezPath {
 }
 
 /// Polystar: a star (`inner` radius used) or polygon, rotation in degrees, roundness in percent.
-pub fn polystar(star: bool, points: f64, pos: [f64; 2], rotation: f64, inner: f64, outer: f64, inner_round: f64, outer_round: f64) -> BezPath {
+pub struct Polystar {
+    pub star: bool,
+    pub points: f64,
+    pub pos: [f64; 2],
+    pub rotation: f64,
+    pub inner: f64,
+    pub outer: f64,
+    pub inner_round: f64,
+    pub outer_round: f64,
+}
+
+/// Build the path described by the polystar's geometry.
+pub fn polystar(spec: Polystar) -> BezPath {
+    let Polystar { star, points, pos, rotation, inner, outer, inner_round, outer_round } = spec;
     let n = points.max(3.0).round() as usize;
     let verts = if star { n * 2 } else { n };
     let mut path = BezPath::new();
@@ -354,6 +369,11 @@ pub fn transform(paths: &[BezPath], m: &Mat3) -> Vec<BezPath> {
 mod tests {
     use super::*;
 
+    #[test]
+    fn rect_with_nan_size_does_not_panic() {
+        let _ = rect([f64::NAN, f64::NAN], [0.0, 0.0], 5.0);
+    }
+
     #[test]
     fn roundtrip_vertex_model() {
         let sp = ShapePath::ellipse([10.0, 20.0], 40.0, 30.0);
@@ -391,7 +411,7 @@ mod tests {
 
     #[test]
     fn star_has_right_vertex_count() {
-        let p = polystar(true, 5.0, [0.0, 0.0], 0.0, 20.0, 50.0, 0.0, 0.0);
+        let p = polystar(Polystar { star: true, points: 5.0, pos: [0.0, 0.0], rotation: 0.0, inner: 20.0, outer: 50.0, inner_round: 0.0, outer_round: 0.0 });
         let v = from_kurbo(&p);
         assert_eq!(v[0].vertices.len(), 10);
     }
diff --git a/crates/path/src/ops.rs b/crates/path/src/ops.rs
index ec6e18604..3ad94944d 100644
--- a/crates/path/src/ops.rs
+++ b/crates/path/src/ops.rs
@@ -533,12 +533,15 @@ pub struct WiggleParams {
     pub correlation: f64,
     /// Temporal phase in degrees (360° = one wiggle period).
     pub phase_deg: f64,
+    /// Spatial phase in degrees: slides each subpath's pattern of displacements along its points
+    /// (360° = once around the subpath).
+    pub spatial_phase_deg: f64,
     pub seed: f64,
 }
 
 impl Default for WiggleParams {
     fn default() -> Self {
-        WiggleParams { size: 10.0, detail: 10.0, smooth: true, speed: 2.0, correlation: 50.0, phase_deg: 0.0, seed: 0.0 }
+        WiggleParams { size: 10.0, detail: 10.0, smooth: true, speed: 2.0, correlation: 50.0, phase_deg: 0.0, spatial_phase_deg: 0.0, seed: 0.0 }
     }
 }
 
@@ -568,9 +571,16 @@ fn noise(seed: u64, idx: u64, t: f64) -> f64 {
     v.clamp(-1.0, 1.0)
 }
 
+/// Catmull-Rom interpolation between `p1` (f = 0) and `p2` (f = 1).
+fn catmull_rom(p0: f64, p1: f64, p2: f64, p3: f64, f: f64) -> f64 {
+    0.5 * (2.0 * p1 + (-p0 + p2) * f + (2.0 * p0 - 5.0 * p1 + 4.0 * p2 - p3) * f * f + (-p0 + 3.0 * p1 - 3.0 * p2 + p3) * f * f * f)
+}
+
 /// Wiggle Paths: subdivides the paths (`detail` points per segment) and displaces every point by
 /// smooth random noise of up to `size` pixels that evolves over `time_s` seconds at `speed`
-/// wiggles per second. Deterministic for a given seed and time.
+/// wiggles per second. The spatial phase moves each point's own share of the noise along the
+/// subpath, and a fraction of a point is interpolated between its neighbors. Deterministic for a
+/// given seed and time.
 pub fn wiggle(paths: &[BezPath], w: &WiggleParams, time_s: f64) -> Vec<BezPath> {
     if w.size == 0.0 {
         return paths.to_vec();
@@ -580,6 +590,7 @@ pub fn wiggle(paths: &[BezPath], w: &WiggleParams, time_s: f64) -> Vec<BezPath>
     let t = time_s * w.speed + w.phase_deg / 360.0;
     let corr = (w.correlation / 100.0).clamp(0.0, 1.0);
     let shared = Vec2::new(noise(seed, u64::MAX, t), noise(seed, u64::MAX - 1, t));
+    let turns = if w.spatial_phase_deg.is_finite() { (w.spatial_phase_deg / 360.0).rem_euclid(1.0) } else { 0.0 };
     let mut idx: u64 = 0;
     paths
         .iter()
@@ -587,14 +598,28 @@ pub fn wiggle(paths: &[BezPath], w: &WiggleParams, time_s: f64) -> Vec<BezPath>
             let mut out = BezPath::new();
             for sub in subs(p) {
                 let s = resample(&sub, m);
-                let disp: Vec<Vec2> = s
-                    .iter()
-                    .map(|_| {
-                        let own = Vec2::new(noise(seed, idx * 2, t + idx as f64 * 0.37), noise(seed, idx * 2 + 1, t + idx as f64 * 0.61));
-                        idx += 1;
-                        (shared * corr + own * (1.0 - corr)) * w.size
-                    })
-                    .collect();
+                let n = s.len();
+                let first = idx;
+                let own = |j: usize| {
+                    let i = first + j as u64;
+                    Vec2::new(noise(seed, i * 2, t + i as f64 * 0.37), noise(seed, i * 2 + 1, t + i as f64 * 0.61))
+                };
+                let along = |j: usize| {
+                    if turns == 0.0 {
+                        return own(j);
+                    }
+                    let u = (j as f64 + turns * n as f64).rem_euclid(n as f64);
+                    let k = u.floor();
+                    let f = u - k;
+                    let k = k as usize % n;
+                    if f == 0.0 {
+                        return own(k);
+                    }
+                    let (p0, p1, p2, p3) = (own((k + n - 1) % n), own(k), own((k + 1) % n), own((k + 2) % n));
+                    Vec2::new(catmull_rom(p0.x, p1.x, p2.x, p3.x, f).clamp(-1.0, 1.0), catmull_rom(p0.y, p1.y, p2.y, p3.y, f).clamp(-1.0, 1.0))
+                };
+                let disp: Vec<Vec2> = (0..n).map(|j| (shared * corr + along(j) * (1.0 - corr)) * w.size).collect();
+                idx += n as u64;
                 emit(&s, &disp, sub.closed, w.smooth, 1.0 / 3.0, &mut out);
             }
             out
diff --git a/crates/path/src/ops/tests.rs b/crates/path/src/ops/tests.rs
index dbdf213ba..89c009bc4 100644
--- a/crates/path/src/ops/tests.rs
+++ b/crates/path/src/ops/tests.rs
@@ -317,6 +317,38 @@ fn wiggle_full_correlation_translates() {
     assert_eq!(zero[0], s[0]);
 }
 
+/// Spatial Phase moves the pattern of displacements along the path: 360° is once around, and a
+/// whole number of points' worth gives each point the displacement of the point that far ahead.
+#[test]
+fn wiggle_spatial_phase_moves_the_pattern_along_the_path() {
+    let s = [sq(0.0, 0.0, 100.0)];
+    let w = WiggleParams { detail: 3.0, correlation: 0.0, smooth: false, ..Default::default() };
+    // Displacements are proportional to Size: twice the size less once the size.
+    let disp = |w: WiggleParams| -> Vec<Vec2> {
+        let a = on_curve(&wiggle(&s, &w, 0.4)[0]);
+        let b = on_curve(&wiggle(&s, &WiggleParams { size: w.size * 2.0, ..w }, 0.4)[0]);
+        a.iter().zip(&b).map(|(a, b)| *b - *a).take(16).collect()
+    };
+    let d0 = disp(w);
+    let n = d0.len();
+    assert_eq!(n, 16);
+    for k in [1, 5] {
+        let dk = disp(WiggleParams { spatial_phase_deg: 360.0 * k as f64 / n as f64, ..w });
+        for j in 0..n {
+            let e = d0[(j + k) % n];
+            assert!(close(dk[j].x, e.x, 1e-9) && close(dk[j].y, e.y, 1e-9), "{k} ahead, point {j}: {:?} vs {e:?}", dk[j]);
+        }
+    }
+    // Whole turns either way leave the path as it is.
+    let base = wiggle(&s, &w, 0.4);
+    assert_eq!(wiggle(&s, &WiggleParams { spatial_phase_deg: 360.0, ..w }, 0.4), base);
+    assert_eq!(wiggle(&s, &WiggleParams { spatial_phase_deg: -720.0, ..w }, 0.4), base);
+    // Half a point ahead, the displacements change and stay within Size.
+    let half = disp(WiggleParams { spatial_phase_deg: 180.0 / n as f64, ..w });
+    assert!(half.iter().zip(&d0).any(|(h, d)| (*h - *d).hypot() > 1e-3));
+    assert!(half.iter().all(|h| h.x.abs() <= 10.0 + 1e-9 && h.y.abs() <= 10.0 + 1e-9));
+}
+
 // ---------------------------------------------------------------- merge / booleans
 
 fn inclusion_exclusion(a: BezPath, b: BezPath) {
diff --git a/crates/path/src/trace.rs b/crates/path/src/trace.rs
index 429738032..01508bcaf 100644
--- a/crates/path/src/trace.rs
+++ b/crates/path/src/trace.rs
@@ -6,7 +6,7 @@
 //!    with "outside" so every contour closes.
 //! 2. **Douglas–Peucker** simplification of each closed loop to the Tolerance (pixels).
 //! 3. **Bezier fitting**: each simplified span is fitted with one cubic (least squares with fixed
-//!    end tangents, Newton reparameterisation; [`crate::fit`]). The tangent at each vertex is the
+//!    end tangents, Newton reparameterisation; `crate::fit`). The tangent at each vertex is the
 //!    chord direction at Corner Roundness 0 (straight segments, sharp corners) and the smooth
 //!    (Catmull–Rom) direction at 100 %, blended between.
 //!
diff --git a/crates/pdf/Cargo.toml b/crates/pdf/Cargo.toml
index b37dff50f..bf6148569 100644
--- a/crates/pdf/Cargo.toml
+++ b/crates/pdf/Cargo.toml
@@ -14,7 +14,7 @@ craft-pdf.workspace = true
 effectcraft-svg = { workspace = true }
 kurbo = { workspace = true }
 effectcraft-text = { workspace = true }
-miniz_oxide = "0.8"
+miniz_oxide = "0.9"
 # Embedded TrueType / OpenType font programs (MIT OR Apache-2.0).
 skrifa = { workspace = true }
 # DCT (JPEG) images (MIT OR Apache-2.0 OR Zlib; pure Rust).
diff --git a/crates/pdf/README.md b/crates/pdf/README.md
index 1d6bf3c13..20f655611 100644
--- a/crates/pdf/README.md
+++ b/crates/pdf/README.md
@@ -138,15 +138,17 @@ ffmpeg elsewhere) to check the code tables against an independent implementation
 ## Shared parser setup and bounds
 
 The workspace pins `craft-pdf` to `craft-libs` Git revision
-`ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d`, with `default-features = false` and only the explicit `read`
+`92d392cff132eaf53e13afff77f38b5c11b73aa0`, with `default-features = false` and only the explicit `read`
 feature. This excludes the backend's bundled fonts and Adobe CMaps and preserves EffectCraft's
 font and asset policies. The shared parser does not change the supported drawing operators,
 image codecs, continuously rasterized SVG tree, editable shapes, or EPS interpreter.
 This revision removes an unchecked lazy-array read and preserves later values and pages after
 sign-only numeric entries; the app exercises those inputs through its object adapter, public
-page parser and rasterizer on native and WASM targets.
+page parser and rasterizer on native and WASM targets. It also bounds xref, object-stream and
+graphics-state work, reads the full `/W[0]` xref type width, and caps JBIG2 segment references
+and bitmap allocation.
 
-The root Cargo patch pins Hayro-syntax to the same `storytold/craft-libs` revision. `cargo xtask pdf-deps` checks this graph and refuses
+The root Cargo patch pins Hayro-syntax and Hayro-jbig2 to the same `storytold/craft-libs` revision. `cargo xtask pdf-deps` checks this graph and refuses
 an enabled Hayro interpreter, rasterizer or CMap dependency. The shared revision must be
 published before a fresh app checkout can resolve it; no sibling checkout is required.
 
diff --git a/crates/pdf/src/build.rs b/crates/pdf/src/build.rs
index 7023e931c..0b1586f89 100644
--- a/crates/pdf/src/build.rs
+++ b/crates/pdf/src/build.rs
@@ -3,6 +3,10 @@
 
 use effectcraft_svg::{Affine, BezPath, FillRule, Geom, Group, Node, Paint, Shape, Stroke};
 
+/// The most elements a path being built holds: an operator that would add more stops the
+/// PostScript program, or the PDF content stream.
+pub(crate) const MAX_PATH: usize = 1 << 20;
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 enum Kind {
     Plain,
diff --git a/crates/pdf/src/font.rs b/crates/pdf/src/font.rs
index 296878c31..64b0a1c3a 100644
--- a/crates/pdf/src/font.rs
+++ b/crates/pdf/src/font.rs
@@ -89,7 +89,7 @@ impl OutlinePen for Pen {
 
 /// A bundled stand-in for a font that is not embedded, by its PostScript name.
 fn fallback(base: &str) -> &'static [u8] {
-    use effectcraft_text::fonts::*;
+    use effectcraft_text::fonts::{INTER_BOLD, INTER_ITALIC, INTER_REGULAR, INTER_SEMIBOLD, JETBRAINS_MONO_REGULAR, NOTO_SERIF_REGULAR};
     let b = base.to_ascii_lowercase();
     if b.contains("courier") || b.contains("mono") || b.contains("consol") {
         return JETBRAINS_MONO_REGULAR;
@@ -263,8 +263,8 @@ fn parse_cmap(data: &[u8]) -> CMap {
                                 }
                                 Obj::Array(list) => {
                                     for (k, s) in list.iter().enumerate() {
-                                        if let Obj::Str(s) = s {
-                                            m.unicode.insert(lo + k as u32, utf16(s));
+                                        if let (Obj::Str(s), Some(c)) = (s, lo.checked_add(k as u32)) {
+                                            m.unicode.insert(c, utf16(s));
                                         }
                                     }
                                 }
@@ -393,85 +393,10 @@ impl Font {
         }
         // Widths.
         if f.composite {
-            f.default_width = file.get_num(&desc_dict, "DW").unwrap_or(1000.0) / 1000.0;
-            if let Some(w) = file.get(&desc_dict, "W").and_then(Obj::array) {
-                let mut i = 0;
-                while i < w.len() {
-                    let first = file.resolve(&w[i]).num().unwrap_or(0.0) as u32;
-                    match w.get(i + 1).map(|x| file.resolve(x)) {
-                        Some(Obj::Array(list)) => {
-                            for (k, v) in list.iter().enumerate() {
-                                f.cid_widths.insert(first + k as u32, file.resolve(v).num().unwrap_or(0.0) / 1000.0);
-                            }
-                            i += 2;
-                        }
-                        Some(Obj::Num(last)) => {
-                            let wv = w.get(i + 2).and_then(|x| file.resolve(x).num()).unwrap_or(0.0) / 1000.0;
-                            for c in first..=(*last as u32).min(first + 65535) {
-                                f.cid_widths.insert(c, wv);
-                            }
-                            i += 3;
-                        }
-                        _ => break,
-                    }
-                }
-            }
-            // Vertical metrics (§9.7.4.3): /DW2 [vy w1y] and /W2 entries
-            // `c [w1y vx vy …]` or `cfirst clast w1y vx vy`.
-            let dw2 = file.get(&desc_dict, "DW2").map(|x| file.nums(x)).unwrap_or_default();
-            if dw2.len() == 2 {
-                f.dw2 = (dw2[0] / 1000.0, dw2[1] / 1000.0);
-            }
-            if let Some(w) = file.get(&desc_dict, "W2").and_then(Obj::array) {
-                let num = |i: usize| w.get(i).and_then(|x| file.resolve(x).num());
-                let mut i = 0;
-                while i < w.len() {
-                    let Some(first) = num(i) else { break };
-                    let first = first.max(0.0) as u32;
-                    match w.get(i + 1).map(|x| file.resolve(x)) {
-                        Some(Obj::Array(list)) => {
-                            let v: Vec<f64> = list.iter().filter_map(|x| file.resolve(x).num()).collect();
-                            for (k, t) in v.as_chunks::<3>().0.iter().enumerate() {
-                                f.cid_vmetrics.insert(first + k as u32, (t[0] / 1000.0, t[1] / 1000.0, t[2] / 1000.0));
-                            }
-                            i += 2;
-                        }
-                        Some(Obj::Num(last)) => {
-                            let (Some(w1), Some(vx), Some(vy)) = (num(i + 2), num(i + 3), num(i + 4)) else { break };
-                            for c in first..=(last.max(0.0) as u32).min(first + 65535) {
-                                f.cid_vmetrics.insert(c, (w1 / 1000.0, vx / 1000.0, vy / 1000.0));
-                            }
-                            i += 5;
-                        }
-                        _ => break,
-                    }
-                }
-            }
+            f.load_cid_widths(file, &desc_dict);
+            f.load_vertical_metrics(file, &desc_dict);
             f.has_widths = true;
-            // Encoding CMap.
-            match file.get(d, "Encoding") {
-                Some(Obj::Name(n)) => {
-                    f.vertical = n.ends_with("-V");
-                    if !n.starts_with("Identity") {
-                        skipped.push(format!("CMap {n}"));
-                    }
-                }
-                Some(Obj::Stream(sd, raw)) => {
-                    if let Some(data) = decode_stream(file, sd, raw) {
-                        let cm = parse_cmap(&data);
-                        f.vertical = cm.wmode || file.get_num(sd, "WMode") == Some(1.0);
-                        f.codespace = cm.codespace;
-                        f.cid_ranges = cm.cids;
-                    }
-                }
-                _ => {}
-            }
-            match file.get(&desc_dict, "CIDToGIDMap") {
-                Some(Obj::Stream(sd, raw)) => {
-                    f.cid_to_gid = decode_stream(file, sd, raw).map(|b| b.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect());
-                }
-                _ => f.cid_to_gid = None,
-            }
+            f.load_cid_encoding(file, d, &desc_dict, skipped);
         } else {
             f.first_char = file.get_num(d, "FirstChar").unwrap_or(0.0) as u32;
             if let Some(w) = file.get(d, "Widths") {
@@ -482,16 +407,113 @@ impl Font {
                 f.default_width = file.get_num(fd, "MissingWidth").unwrap_or(0.0);
             }
         }
+        f.load_program(file, d, fd.as_ref(), &subtype, skipped);
+        f.load_simple_encoding(file, d);
+        f
+    }
+
+    fn load_cid_widths(&mut self, file: &File, desc_dict: &Dict) {
+        self.default_width = file.get_num(desc_dict, "DW").unwrap_or(1000.0) / 1000.0;
+        if let Some(w) = file.get(desc_dict, "W").and_then(Obj::array) {
+            let mut i = 0;
+            while i < w.len() {
+                let first = file.resolve(&w[i]).num().unwrap_or(0.0) as u32;
+                match w.get(i + 1).map(|x| file.resolve(x)) {
+                    Some(Obj::Array(list)) => {
+                        for (k, v) in list.iter().enumerate() {
+                            if let Some(cid) = first.checked_add(k as u32) {
+                                self.cid_widths.insert(cid, file.resolve(v).num().unwrap_or(0.0) / 1000.0);
+                            }
+                        }
+                        i += 2;
+                    }
+                    Some(Obj::Num(last)) => {
+                        let wv = w.get(i + 2).and_then(|x| file.resolve(x).num()).unwrap_or(0.0) / 1000.0;
+                        for c in first..=(*last as u32).min(first.saturating_add(65535)) {
+                            self.cid_widths.insert(c, wv);
+                        }
+                        i += 3;
+                    }
+                    _ => break,
+                }
+            }
+        }
+    }
+
+    fn load_vertical_metrics(&mut self, file: &File, desc_dict: &Dict) {
+        // Vertical metrics (§9.7.4.3): /DW2 [vy w1y] and /W2 entries
+        // `c [w1y vx vy …]` or `cfirst clast w1y vx vy`.
+        let dw2 = file.get(desc_dict, "DW2").map(|x| file.nums(x)).unwrap_or_default();
+        if dw2.len() == 2 {
+            self.dw2 = (dw2[0] / 1000.0, dw2[1] / 1000.0);
+        }
+        if let Some(w) = file.get(desc_dict, "W2").and_then(Obj::array) {
+            let num = |i: usize| w.get(i).and_then(|x| file.resolve(x).num());
+            let mut i = 0;
+            while i < w.len() {
+                let Some(first) = num(i) else { break };
+                let first = first.max(0.0) as u32;
+                match w.get(i + 1).map(|x| file.resolve(x)) {
+                    Some(Obj::Array(list)) => {
+                        let v: Vec<f64> = list.iter().filter_map(|x| file.resolve(x).num()).collect();
+                        for (k, t) in v.as_chunks::<3>().0.iter().enumerate() {
+                            if let Some(cid) = first.checked_add(k as u32) {
+                                self.cid_vmetrics.insert(cid, (t[0] / 1000.0, t[1] / 1000.0, t[2] / 1000.0));
+                            }
+                        }
+                        i += 2;
+                    }
+                    Some(Obj::Num(last)) => {
+                        let (Some(w1), Some(vx), Some(vy)) = (num(i + 2), num(i + 3), num(i + 4)) else { break };
+                        for c in first..=(last.max(0.0) as u32).min(first.saturating_add(65535)) {
+                            self.cid_vmetrics.insert(c, (w1 / 1000.0, vx / 1000.0, vy / 1000.0));
+                        }
+                        i += 5;
+                    }
+                    _ => break,
+                }
+            }
+        }
+    }
+
+    fn load_cid_encoding(&mut self, file: &File, d: &Dict, desc_dict: &Dict, skipped: &mut Vec<String>) {
+        // Encoding CMap.
+        match file.get(d, "Encoding") {
+            Some(Obj::Name(n)) => {
+                self.vertical = n.ends_with("-V");
+                if !n.starts_with("Identity") {
+                    skipped.push(format!("CMap {n}"));
+                }
+            }
+            Some(Obj::Stream(sd, raw)) => {
+                if let Some(data) = decode_stream(file, sd, raw) {
+                    let cm = parse_cmap(&data);
+                    self.vertical = cm.wmode || file.get_num(sd, "WMode") == Some(1.0);
+                    self.codespace = cm.codespace;
+                    self.cid_ranges = cm.cids;
+                }
+            }
+            _ => {}
+        }
+        match file.get(desc_dict, "CIDToGIDMap") {
+            Some(Obj::Stream(sd, raw)) => {
+                self.cid_to_gid = decode_stream(file, sd, raw).map(|b| b.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect());
+            }
+            _ => self.cid_to_gid = None,
+        }
+    }
+
+    fn load_program(&mut self, file: &File, d: &Dict, fd: Option<&Dict>, subtype: &str, skipped: &mut Vec<String>) {
         // The program.
         let font_file = |key: &str| -> Option<(Dict, Vec<u8>)> {
-            let fd = fd.as_ref()?;
+            let fd = fd?;
             match file.get(fd, key) {
                 Some(Obj::Stream(sd, raw)) => Some((sd.clone(), decode_stream(file, sd, raw)?)),
                 _ => None,
             }
         };
         if subtype == "Type3" {
-            f.matrix = file
+            self.matrix = file
                 .get(d, "FontMatrix")
                 .map(|m| file.nums(m))
                 .filter(|m| m.len() == 6)
@@ -507,76 +529,78 @@ impl Font {
                     }
                 }
             }
-            f.program = Program::Type3 { procs, resources: file.get_dict(d, "Resources").cloned() };
+            self.program = Program::Type3 { procs, resources: file.get_dict(d, "Resources").cloned() };
             // Type 3 widths are in glyph space.
-            let m = f.matrix.as_coeffs()[0];
-            for w in &mut f.widths {
+            let m = self.matrix.as_coeffs()[0];
+            for w in &mut self.widths {
                 *w *= m * 1000.0;
             }
         } else if let Some((_, data)) = font_file("FontFile2") {
-            f.program = Program::TrueType(Arc::new(data));
+            self.program = Program::TrueType(Arc::new(data));
         } else if let Some((sd, data)) = font_file("FontFile3") {
             match file.get(&sd, "Subtype").and_then(Obj::name) {
                 Some("OpenType") => {
                     // An OpenType wrapper: TrueType outlines through skrifa, CFF through ours.
                     let cff = FontRef::new(&data).ok().and_then(|fr| fr.table_data(skrifa::Tag::new(b"CFF ")).map(|t| t.as_bytes().to_vec()));
                     match cff.and_then(|c| Cff::parse(&c)) {
-                        Some(c) => f.program = Program::Cff(Box::new(c)),
-                        None => f.program = Program::TrueType(Arc::new(data)),
+                        Some(c) => self.program = Program::Cff(Box::new(c)),
+                        None => self.program = Program::TrueType(Arc::new(data)),
                     }
                 }
                 _ => match Cff::parse(&data) {
-                    Some(c) => f.program = Program::Cff(Box::new(c)),
+                    Some(c) => self.program = Program::Cff(Box::new(c)),
                     None => skipped.push("font program (CFF)".into()),
                 },
             }
         } else if let Some((_, data)) = font_file("FontFile") {
             match Type1::parse(&data) {
-                Some(t) => f.program = Program::Type1(Box::new(t)),
+                Some(t) => self.program = Program::Type1(Box::new(t)),
                 None => skipped.push("font program (Type 1)".into()),
             }
         } else {
-            f.program = Program::Fallback(fallback(&base_name));
+            self.program = Program::Fallback(fallback(&self.base_name));
         }
-        if let Program::Cff(c) = &f.program {
+        if let Program::Cff(c) = &self.program {
             let m = c.font_matrix;
-            f.matrix = Affine::new(m);
+            self.matrix = Affine::new(m);
         }
-        if let Program::Type1(t) = &f.program
+        if let Program::Type1(t) = &self.program
             && let Some(m) = t.font_matrix
         {
-            f.matrix = Affine::new(m);
+            self.matrix = Affine::new(m);
         }
+    }
+
+    fn load_simple_encoding(&mut self, file: &File, d: &Dict) {
         // Simple-font encoding: base encoding, built-in encoding, Differences.
-        if !f.composite {
+        if !self.composite {
             let enc = file.get(d, "Encoding").map(|e| file.resolve(e));
             let base = match enc {
                 Some(Obj::Name(n)) => Base::from_name(n),
                 Some(Obj::Dict(e)) => file.get(e, "BaseEncoding").and_then(Obj::name).and_then(Base::from_name),
                 _ => None,
             };
-            let builtin: Option<Vec<Option<String>>> = match &f.program {
+            let builtin: Option<Vec<Option<String>>> = match &self.program {
                 Program::Type1(t) if !t.encoding.is_empty() => Some((0..256).map(|c| t.encoding.get(&(c as u8)).cloned()).collect()),
                 _ => None,
             };
-            let fallback_base = if f.symbolic { None } else { Some(Base::Standard) };
+            let fallback_base = if self.symbolic { None } else { Some(Base::Standard) };
             for c in 0..256usize {
-                f.names[c] = match (base, &builtin) {
+                self.names[c] = match (base, &builtin) {
                     (Some(b), _) => b.name(c as u8),
                     (None, Some(bi)) => bi[c].clone(),
-                    (None, None) => match &f.program {
+                    (None, None) => match &self.program {
                         // TrueType symbolic fonts map codes directly; others use Standard.
-                        Program::TrueType(_) if f.symbolic => None,
-                        Program::Fallback(_) if base_name.contains("Symbol") || base_name.contains("Dingbats") => None,
+                        Program::TrueType(_) if self.symbolic => None,
+                        Program::Fallback(_) if self.base_name.contains("Symbol") || self.base_name.contains("Dingbats") => None,
                         _ => fallback_base.or(Some(Base::Standard)).and_then(|b| b.name(c as u8)),
                     },
                 };
             }
             if let Some(Obj::Dict(e)) = enc {
-                differences(file, e, &mut f.names);
+                differences(file, e, &mut self.names);
             }
         }
-        f
     }
 
     /// Split a string into (code, byte length) pairs.
@@ -609,7 +633,7 @@ impl Font {
         if self.cid_ranges.is_empty() {
             return code;
         }
-        self.cid_ranges.iter().find(|(lo, hi, _)| code >= *lo && code <= *hi).map(|(lo, _, c)| c + (code - lo)).unwrap_or(0)
+        self.cid_ranges.iter().find(|(lo, hi, _)| code >= *lo && code <= *hi).and_then(|(lo, _, c)| c.checked_add(code - lo)).unwrap_or(0)
     }
 
     /// Vertical metrics of a code in text space (before the font size): the vertical
diff --git a/crates/pdf/src/image.rs b/crates/pdf/src/image.rs
index 4d55fef8e..7006979c2 100644
--- a/crates/pdf/src/image.rs
+++ b/crates/pdf/src/image.rs
@@ -16,6 +16,7 @@ pub(crate) struct Decoded {
 /// The longest side of a decoded image (larger images are refused rather than exhausting
 /// memory).
 const MAX_SIDE: usize = 16384;
+const MAX_PIXELS: usize = 64 << 20;
 
 fn get<'a>(file: &'a File, d: &'a Dict, long: &str, short: &str) -> Option<&'a Obj> {
     file.get(d, long).or_else(|| file.get(d, short))
@@ -114,6 +115,11 @@ fn jpeg_decode(data: &[u8]) -> Result<(Vec<u8>, usize), String> {
     use zune_jpeg::zune_core::options::DecoderOptions;
     let mut probe = JpegDecoder::new(std::io::Cursor::new(data));
     probe.decode_headers().map_err(|_| "image (JPEG)".to_string())?;
+    // Bound the header-declared size before decode() allocates the output.
+    let (hw, hh) = probe.dimensions().ok_or_else(|| "image (JPEG)".to_string())?;
+    if hw.checked_mul(hh).is_none_or(|p| p > MAX_PIXELS) {
+        return Err("image (JPEG)".to_string());
+    }
     let n = probe.input_colorspace().map(|c| c.num_components()).unwrap_or(3);
     let out = match n {
         1 => ColorSpace::Luma,
@@ -134,8 +140,17 @@ fn jpeg_decode(data: &[u8]) -> Result<(Vec<u8>, usize), String> {
 
 /// Unpack `w`×`h` samples of `n` components at `bpc` bits into 0..=max integers.
 fn unpack(data: &[u8], w: usize, h: usize, n: usize, bpc: usize) -> Vec<u16> {
-    let row_bytes = (w * n * bpc).div_ceil(8);
-    let mut out = Vec::with_capacity(w * h * n);
+    let Some(samples) = w.checked_mul(h).and_then(|p| p.checked_mul(n)).filter(|count| *count <= MAX_PIXELS.saturating_mul(4)) else { return Vec::new() };
+    let Some(row_bits) = w.checked_mul(n).and_then(|v| v.checked_mul(bpc)) else { return Vec::new() };
+    let row_bytes = row_bits.div_ceil(8);
+    let Some(row_len) = row_bytes.checked_mul(h) else { return Vec::new() };
+    if row_len > data.len() {
+        return Vec::new();
+    }
+    let mut out = Vec::new();
+    if out.try_reserve_exact(samples).is_err() {
+        return Vec::new();
+    }
     for y in 0..h {
         let row = data.get(y * row_bytes..((y + 1) * row_bytes).min(data.len())).unwrap_or(&[]);
         for i in 0..w * n {
@@ -157,10 +172,22 @@ fn unpack(data: &[u8], w: usize, h: usize, n: usize, bpc: usize) -> Vec<u16> {
 
 /// Nearest-neighbour resample of a single-channel 8-bit mask to `w`×`h`.
 fn resample(m: &[u8], mw: usize, mh: usize, w: usize, h: usize) -> Vec<u8> {
+    let Some(pixels) = w.checked_mul(h).filter(|p| *p <= MAX_PIXELS) else { return Vec::new() };
+    if mw.checked_mul(mh).is_none_or(|n| n > m.len()) {
+        return Vec::new();
+    }
     if mw == w && mh == h {
-        return m.to_vec();
+        let mut out = Vec::new();
+        if out.try_reserve_exact(pixels).is_err() {
+            return Vec::new();
+        }
+        out.extend_from_slice(&m[..pixels]);
+        return out;
+    }
+    let mut out = Vec::new();
+    if out.try_reserve_exact(pixels).is_err() {
+        return Vec::new();
     }
-    let mut out = Vec::with_capacity(w * h);
     for y in 0..h {
         let sy = (y * mh / h.max(1)).min(mh.saturating_sub(1));
         for x in 0..w {
@@ -176,12 +203,16 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec<u8>, usize, usize
     let Obj::Stream(d, raw) = file.resolve(o) else { return None };
     let w = file.get_num(d, "Width")? as usize;
     let h = file.get_num(d, "Height")? as usize;
-    if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE {
+    if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE || w.checked_mul(h).is_none_or(|p| p > MAX_PIXELS) {
         return None;
     }
     let (data, jpeg_n) = samples(file, d, raw).ok()?;
+    let pixels = w.checked_mul(h)?;
     if jpeg_n.is_some() {
-        return Some((data.into_iter().step_by(jpeg_n.unwrap_or(1)).take(w * h).collect(), w, h));
+        let mut out = Vec::new();
+        out.try_reserve_exact(pixels).ok()?;
+        out.extend(data.into_iter().step_by(jpeg_n.unwrap_or(1)).take(pixels));
+        return Some((out, w, h));
     }
     let bpc = if soft { file.get_num(d, "BitsPerComponent").unwrap_or(8.0) as usize } else { 1 };
     // Like `decode()`: only 1/2/4/8/16-bit depths are supported. Anything else (notably
@@ -192,19 +223,21 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec<u8>, usize, usize
     let max = ((1u32 << bpc) - 1).max(1) as f64;
     let dec = file.get(d, "Decode").map(|x| file.nums(x)).filter(|v| v.len() >= 2);
     let v = unpack(&data, w, h, 1, bpc);
-    let out = v
-        .into_iter()
-        .map(|s| {
-            let t = s as f64 / max;
-            let t = match &dec {
-                Some(dd) => dd[0] + t * (dd[1] - dd[0]),
-                None => t,
-            };
-            // Explicit (stencil) masks: sample 1 masks out with the default Decode.
-            let a = if soft { t } else { 1.0 - t };
-            (a.clamp(0.0, 1.0) * 255.0).round() as u8
-        })
-        .collect();
+    if v.len() != pixels {
+        return None;
+    }
+    let mut out = Vec::new();
+    out.try_reserve_exact(pixels).ok()?;
+    out.extend(v.into_iter().map(|s| {
+        let t = s as f64 / max;
+        let t = match &dec {
+            Some(dd) => dd[0] + t * (dd[1] - dd[0]),
+            None => t,
+        };
+        // Explicit (stencil) masks: sample 1 masks out with the default Decode.
+        let a = if soft { t } else { 1.0 - t };
+        (a.clamp(0.0, 1.0) * 255.0).round() as u8
+    }));
     Some((out, w, h))
 }
 
@@ -212,15 +245,24 @@ fn mask_image(file: &File, o: &Obj, soft: bool) -> Option<(Vec<u8>, usize, usize
 pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill: [f64; 3]) -> Result<Decoded, String> {
     let w = file.get_num(d, "Width").unwrap_or(0.0) as usize;
     let h = file.get_num(d, "Height").unwrap_or(0.0) as usize;
-    if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE || w * h > 64 << 20 {
+    let Some(pixels) = w.checked_mul(h).filter(|p| *p <= MAX_PIXELS) else {
+        return Err("image (size)".into());
+    };
+    if w == 0 || h == 0 || w > MAX_SIDE || h > MAX_SIDE {
         return Err("image (size)".into());
     }
     let stencil = matches!(file.get(d, "ImageMask"), Some(Obj::Bool(true)));
     let (data, jpeg_n) = samples(file, d, raw)?;
     let decode_arr = file.get(d, "Decode").map(|x| file.nums(x)).unwrap_or_default();
-    let mut rgba = vec![0u8; w * h * 4];
+    let rgba_len = pixels.checked_mul(4).ok_or_else(|| "image (size)".to_string())?;
+    let mut rgba = Vec::new();
+    rgba.try_reserve_exact(rgba_len).map_err(|_| "image (allocation)".to_string())?;
+    rgba.resize(rgba_len, 0);
     if stencil {
         let v = unpack(&data, w, h, 1, 1);
+        if v.len() != pixels {
+            return Err("image (sample allocation)".into());
+        }
         let paint_on = if decode_arr.first().copied().unwrap_or(0.0) > 0.5 { 1 } else { 0 };
         let c = fill.map(|x| (x.clamp(0.0, 1.0) * 255.0).round() as u8);
         for (i, s) in v.into_iter().enumerate() {
@@ -243,8 +285,14 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
     if !matches!(bpc, 1 | 2 | 4 | 8 | 16) {
         return Err(format!("image ({bpc} bits per component)"));
     }
+    let Some(sample_count) = pixels.checked_mul(n).filter(|n| *n <= MAX_PIXELS.saturating_mul(4)) else {
+        return Err("image (size)".into());
+    };
     let max = ((1u32 << bpc) - 1) as f64;
     let raw_samples = unpack(&data, w, h, n, bpc);
+    if raw_samples.len() != sample_count {
+        return Err("image (sample allocation)".into());
+    }
     // Decode ranges per component.
     let indexed = matches!(cs, Cs::Indexed { .. });
     let range = |k: usize| -> (f64, f64) {
@@ -262,7 +310,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
         Cs::Indexed { hival, .. } if n == 1 => Some((0..=*hival).map(|i| cs.to_rgb(&[i as f64])).collect()),
         _ => None,
     };
-    for i in 0..w * h {
+    for i in 0..pixels {
         if let Some(pal) = &palette {
             let s = raw_samples[i] as f64 / max;
             let (a, b) = ranges[0];
@@ -288,7 +336,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
         Some(Obj::Array(a)) => {
             let keys: Vec<f64> = a.iter().filter_map(|x| file.resolve(x).num()).collect();
             if keys.len() >= 2 * n {
-                for i in 0..w * h {
+                for i in 0..pixels {
                     if (0..n).all(|k| {
                         let v = raw_samples[i * n + k] as f64;
                         v >= keys[2 * k] && v <= keys[2 * k + 1]
@@ -300,7 +348,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
         }
         Some(m @ Obj::Stream(..)) => {
             if let Some((m, mw, mh)) = mask_image(file, m, false) {
-                for (i, a) in resample(&m, mw, mh, w, h).into_iter().enumerate() {
+                for (i, a) in resample(&m, mw, mh, w, h).into_iter().take(pixels).enumerate() {
                     rgba[i * 4 + 3] = a;
                 }
             }
@@ -310,7 +358,7 @@ pub(crate) fn decode(file: &File, d: &Dict, raw: &[u8], res: Option<&Dict>, fill
     if let Some(sm) = file.get(d, "SMask")
         && let Some((m, mw, mh)) = mask_image(file, sm, true)
     {
-        for (i, a) in resample(&m, mw, mh, w, h).into_iter().enumerate() {
+        for (i, a) in resample(&m, mw, mh, w, h).into_iter().take(pixels).enumerate() {
             rgba[i * 4 + 3] = ((rgba[i * 4 + 3] as u32 * a as u32) / 255) as u8;
         }
     }
diff --git a/crates/pdf/src/lib.rs b/crates/pdf/src/lib.rs
index 7c766559f..567dca9c0 100644
--- a/crates/pdf/src/lib.rs
+++ b/crates/pdf/src/lib.rs
@@ -218,11 +218,3 @@ pub fn layer_doc_with_sizes(doc: &Doc, index: usize, retain: bool) -> (Doc, [f64
 
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_groups;
-#[cfg(test)]
-mod tests_import;
-#[cfg(test)]
-mod tests_reader;
-#[cfg(test)]
-mod tests_shading;
diff --git a/crates/pdf/src/page.rs b/crates/pdf/src/page.rs
index 1d84c0fbb..b7eb70fe0 100644
--- a/crates/pdf/src/page.rs
+++ b/crates/pdf/src/page.rs
@@ -12,7 +12,7 @@ use effectcraft_svg::{
 };
 use kurbo::{Point, Shape as _};
 
-use crate::build::Builder;
+use crate::build::{Builder, MAX_PATH};
 use crate::color::{Cs, Func, color_space, text_string};
 use crate::font::Font;
 use crate::object::{Dict, File, Lexer, Obj, decode_stream};
@@ -281,7 +281,12 @@ impl<'a> Interp<'a> {
                         self.ext_gstate(&g, res, depth);
                     }
                 }
-                // Path construction.
+                // Path construction. Each operator adds at most five elements (`re`), so when fewer
+                // than five more fit within `MAX_PATH`, the operator stops the stream.
+                "m" | "l" | "c" | "v" | "y" | "h" | "re" if self.path.elements().len() > MAX_PATH - 5 => {
+                    self.b.skip("content (path limit)");
+                    return;
+                }
                 "m" => {
                     let p = Point::new(n(0), n(1));
                     self.path.move_to(p);
diff --git a/crates/pdf/src/ps.rs b/crates/pdf/src/ps.rs
index 4401ace91..3d734e46c 100644
--- a/crates/pdf/src/ps.rs
+++ b/crates/pdf/src/ps.rs
@@ -14,298 +14,20 @@ use std::rc::Rc;
 use effectcraft_svg::{Affine, BezPath, Cap, FillRule, Join, Paint, Stroke};
 use kurbo::{PathEl, Point};
 
-use crate::build::Builder;
+use crate::build::{Builder, MAX_PATH};
 use crate::font::Font;
 use crate::object::{ascii85, is_white, parse_num};
 
-type DictRef = Rc<RefCell<HashMap<String, V>>>;
+mod builtin;
+mod eps;
+mod exec;
+mod paths;
+mod scanner;
+mod text;
+mod value;
 
-#[derive(Clone)]
-enum V {
-    Num(f64),
-    Bool(bool),
-    /// An executable name.
-    Name(Rc<str>),
-    /// A literal name (`/name`).
-    Lit(Rc<str>),
-    Str(Rc<RefCell<Vec<u8>>>),
-    Proc(Rc<Vec<V>>),
-    Array(Rc<RefCell<Vec<V>>>),
-    Dict(DictRef),
-    Mark,
-    Null,
-    /// `currentfile`.
-    File,
-}
-
-impl V {
-    fn num(&self) -> Option<f64> {
-        match self {
-            V::Num(n) => Some(*n),
-            _ => None,
-        }
-    }
-    fn key(&self) -> String {
-        match self {
-            V::Name(n) | V::Lit(n) => n.to_string(),
-            V::Str(s) => String::from_utf8_lossy(&s.borrow()).into_owned(),
-            V::Num(n) => format!("{n}"),
-            V::Bool(b) => format!("{b}"),
-            _ => String::new(),
-        }
-    }
-    fn items(&self) -> Option<Vec<V>> {
-        match self {
-            V::Array(a) => Some(a.borrow().clone()),
-            V::Proc(p) => Some(p.as_ref().clone()),
-            _ => None,
-        }
-    }
-}
-
-enum Flow {
-    Exit,
-    Stop,
-    Quit,
-}
-
-#[derive(Clone)]
-struct GState {
-    ctm: Affine,
-    color: [f64; 3],
-    lw: f64,
-    cap: Cap,
-    join: Join,
-    miter: f64,
-    dash: Option<(Vec<f64>, f64)>,
-    path: BezPath,
-    cur: Option<Point>,
-    start: Option<Point>,
-    depth: usize,
-    /// The current font dictionary.
-    font: Option<DictRef>,
-}
-
-/// Source tokenizer (the data source for `currentfile`).
-struct Src<'a> {
-    d: &'a [u8],
-    pos: usize,
-}
-
-impl Src<'_> {
-    fn skip_ws(&mut self) {
-        while self.pos < self.d.len() {
-            let c = self.d[self.pos];
-            if is_white(c) {
-                self.pos += 1;
-            } else if c == b'%' {
-                let s = self.pos;
-                while self.pos < self.d.len() && !matches!(self.d[self.pos], b'\n' | b'\r') {
-                    self.pos += 1;
-                }
-                // DSC: skip embedded binary / data sections.
-                let line = &self.d[s..self.pos];
-                if line.starts_with(b"%%BeginData:") || line.starts_with(b"%%BeginBinary:") || line.starts_with(b"%%BeginPreview") {
-                    let end: &[u8] = if line.starts_with(b"%%BeginData:") {
-                        b"%%EndData"
-                    } else if line.starts_with(b"%%BeginBinary:") {
-                        b"%%EndBinary"
-                    } else {
-                        b"%%EndPreview"
-                    };
-                    match self.d[self.pos..].windows(end.len()).position(|w| w == end) {
-                        Some(p) => self.pos += p,
-                        None => self.pos = self.d.len(),
-                    }
-                }
-            } else {
-                break;
-            }
-        }
-    }
-
-    fn word(&mut self) -> &[u8] {
-        let s = self.pos;
-        while self.pos < self.d.len() {
-            let c = self.d[self.pos];
-            if is_white(c) || matches!(c, b'(' | b')' | b'<' | b'>' | b'[' | b']' | b'{' | b'}' | b'/' | b'%') {
-                break;
-            }
-            self.pos += 1;
-        }
-        &self.d[s..self.pos]
-    }
-
-    /// The next token; `{ … }` comes back as a whole procedure.
-    fn token(&mut self, depth: usize) -> Option<V> {
-        self.skip_ws();
-        let c = *self.d.get(self.pos)?;
-        Some(match c {
-            b'{' => {
-                self.pos += 1;
-                let mut body = vec![];
-                loop {
-                    self.skip_ws();
-                    match self.d.get(self.pos) {
-                        None => break,
-                        Some(b'}') => {
-                            self.pos += 1;
-                            break;
-                        }
-                        _ => {
-                            if depth > 100 {
-                                return None;
-                            }
-                            match self.token(depth + 1) {
-                                Some(t) => body.push(t),
-                                None => break,
-                            }
-                        }
-                    }
-                }
-                V::Proc(Rc::new(body))
-            }
-            b'}' => {
-                self.pos += 1;
-                V::Null
-            }
-            b'/' => {
-                self.pos += 1;
-                let imm = self.d.get(self.pos) == Some(&b'/');
-                if imm {
-                    self.pos += 1;
-                }
-                let w = String::from_utf8_lossy(self.word()).into_owned();
-                // `//name` (immediately evaluated) is treated like a plain name.
-                if imm { V::Name(w.into()) } else { V::Lit(w.into()) }
-            }
-            b'(' => {
-                self.pos += 1;
-                let mut out = vec![];
-                let mut depth = 1;
-                while self.pos < self.d.len() {
-                    let c = self.d[self.pos];
-                    self.pos += 1;
-                    match c {
-                        b'\\' => {
-                            let e = self.d.get(self.pos).copied().unwrap_or(b'\\');
-                            self.pos += 1;
-                            match e {
-                                b'n' => out.push(b'\n'),
-                                b'r' => out.push(b'\r'),
-                                b't' => out.push(b'\t'),
-                                b'0'..=b'7' => {
-                                    let mut v = (e - b'0') as u32;
-                                    for _ in 0..2 {
-                                        match self.d.get(self.pos) {
-                                            Some(d @ b'0'..=b'7') => {
-                                                v = v * 8 + (d - b'0') as u32;
-                                                self.pos += 1;
-                                            }
-                                            _ => break,
-                                        }
-                                    }
-                                    out.push(v as u8);
-                                }
-                                b'\n' | b'\r' => {}
-                                o => out.push(o),
-                            }
-                        }
-                        b'(' => {
-                            depth += 1;
-                            out.push(c);
-                        }
-                        b')' => {
-                            depth -= 1;
-                            if depth == 0 {
-                                break;
-                            }
-                            out.push(c);
-                        }
-                        _ => out.push(c),
-                    }
-                }
-                V::Str(Rc::new(RefCell::new(out)))
-            }
-            b'<' if self.d.get(self.pos + 1) == Some(&b'<') => {
-                self.pos += 2;
-                V::Name("<<".into())
-            }
-            b'>' if self.d.get(self.pos + 1) == Some(&b'>') => {
-                self.pos += 2;
-                V::Name(">>".into())
-            }
-            b'<' if self.d.get(self.pos + 1) == Some(&b'~') => {
-                let s = self.pos;
-                while self.pos + 1 < self.d.len() && !(self.d[self.pos] == b'~' && self.d[self.pos + 1] == b'>') {
-                    self.pos += 1;
-                }
-                self.pos = (self.pos + 2).min(self.d.len());
-                V::Str(Rc::new(RefCell::new(ascii85(&self.d[s..self.pos]))))
-            }
-            b'<' => {
-                self.pos += 1;
-                let mut hex = vec![];
-                while self.pos < self.d.len() && self.d[self.pos] != b'>' {
-                    if self.d[self.pos].is_ascii_hexdigit() {
-                        hex.push(self.d[self.pos]);
-                    }
-                    self.pos += 1;
-                }
-                self.pos += 1;
-                if hex.len() % 2 == 1 {
-                    hex.push(b'0');
-                }
-                let h = |c: u8| (c as char).to_digit(16).unwrap_or(0) as u8;
-                V::Str(Rc::new(RefCell::new(hex.chunks(2).map(|p| (h(p[0]) << 4) | h(p[1])).collect())))
-            }
-            b'[' | b']' => {
-                self.pos += 1;
-                V::Name(if c == b'[' { "[" } else { "]" }.into())
-            }
-            b')' | b'>' => {
-                self.pos += 1;
-                V::Null
-            }
-            _ => {
-                let w = self.word();
-                if w.is_empty() {
-                    self.pos += 1;
-                    return Some(V::Null);
-                }
-                match parse_num(w) {
-                    Some(n) => V::Num(n),
-                    None => {
-                        // Radix numbers (16#FF).
-                        let s = String::from_utf8_lossy(w).into_owned();
-                        match s.split_once('#').and_then(|(r, v)| i64::from_str_radix(v, r.parse::<u32>().ok().filter(|r| (2..=36).contains(r))?).ok()) {
-                            Some(n) => V::Num(n as f64),
-                            None => V::Name(s.into()),
-                        }
-                    }
-                }
-            }
-        })
-    }
-
-    /// Step over inline image data that follows an `image` operator reading `currentfile`.
-    fn skip_image_data(&mut self) {
-        self.skip_ws();
-        if self.d[self.pos..].starts_with(b"<~") || self.d.get(self.pos).is_some_and(|c| (b'!'..=b'u').contains(c) && !c.is_ascii_hexdigit()) {
-            match self.d[self.pos..].windows(2).position(|w| w == b"~>") {
-                Some(p) => self.pos += p + 2,
-                None => self.pos = self.d.len(),
-            }
-            return;
-        }
-        while self.pos < self.d.len() && (self.d[self.pos].is_ascii_hexdigit() || is_white(self.d[self.pos])) {
-            self.pos += 1;
-        }
-        if self.d.get(self.pos) == Some(&b'>') {
-            self.pos += 1;
-        }
-    }
-}
+pub use eps::eps_parts;
+use value::{DictRef, GState, V};
 
 pub(crate) struct Interp {
     pub b: Builder,
@@ -325,1515 +47,3 @@ pub(crate) struct Interp {
     page: [f64; 4],
     pub unknown: Vec<String>,
 }
-
-fn new_dict() -> DictRef {
-    Rc::new(RefCell::new(HashMap::new()))
-}
-
-fn array(v: Vec<V>) -> V {
-    V::Array(Rc::new(RefCell::new(v)))
-}
-
-fn matrix_of(v: &V) -> Option<Affine> {
-    let a: Vec<f64> = v.items()?.iter().filter_map(V::num).collect();
-    (a.len() == 6).then(|| Affine::new([a[0], a[1], a[2], a[3], a[4], a[5]]))
-}
-
-fn matrix_val(m: Affine) -> V {
-    array(m.as_coeffs().iter().map(|c| V::Num(*c)).collect())
-}
-
-/// The angle from `a` counterclockwise to `b` (degrees, 0 to 360), worked out from what is left
-/// of each after whole turns.
-fn ccw_turn(a: f64, b: f64) -> f64 {
-    (b % 360.0 - a % 360.0).rem_euclid(360.0)
-}
-
-/// The most turns one `arc` or `arcn` draws.
-const MAX_ARC_TURNS: f64 = 1024.0;
-
-/// The deepest procedure nesting run (deeper recursion stops the program).
-const MAX_CALL_DEPTH: usize = 256;
-
-impl Interp {
-    pub fn new(page: [f64; 4]) -> Interp {
-        Interp {
-            b: Builder::new(),
-            st: vec![],
-            dicts: vec![new_dict()],
-            gs: GState {
-                ctm: Affine::IDENTITY,
-                color: [0.0; 3],
-                lw: 1.0,
-                cap: Cap::Butt,
-                join: Join::Miter,
-                miter: 10.0,
-                dash: None,
-                path: BezPath::new(),
-                cur: None,
-                start: None,
-                depth: 1,
-                font: None,
-            },
-            saved: vec![],
-            budget: 8_000_000,
-            calls: 0,
-            font_dir: HashMap::new(),
-            embedded: HashMap::new(),
-            font_cache: HashMap::new(),
-            page,
-            unknown: vec![],
-        }
-    }
-
-    pub fn run(&mut self, data: &[u8]) {
-        self.embedded = embedded_fonts(data);
-        let mut src = Src { d: data, pos: 0 };
-        while let Some(t) = src.token(0) {
-            if let Err(Flow::Quit) = self.exec_token(t, &mut src) {
-                break;
-            }
-        }
-    }
-
-    fn pop(&mut self) -> V {
-        self.st.pop().unwrap_or(V::Null)
-    }
-    fn popn(&mut self) -> f64 {
-        self.pop().num().unwrap_or(0.0)
-    }
-    fn push(&mut self, v: V) {
-        if self.st.len() < 100_000 {
-            self.st.push(v);
-        }
-    }
-
-    fn lookup(&self, k: &str) -> Option<V> {
-        self.dicts.iter().rev().find_map(|d| d.borrow().get(k).cloned())
-    }
-
-    /// A token read from the file: procedures are pushed, names executed.
-    fn exec_token(&mut self, t: V, src: &mut Src) -> Result<(), Flow> {
-        match t {
-            V::Name(n) => self.exec_name(&n, src),
-            other => {
-                self.push(other);
-                Ok(())
-            }
-        }
-    }
-
-    /// Execute a value as an object (procedures run).
-    fn exec_obj(&mut self, v: V, src: &mut Src) -> Result<(), Flow> {
-        match v {
-            V::Proc(p) => {
-                if self.calls >= MAX_CALL_DEPTH {
-                    self.b.skip("PostScript (recursion limit)");
-                    return Err(Flow::Quit);
-                }
-                self.calls += 1;
-                let mut r = Ok(());
-                for x in p.iter() {
-                    match x {
-                        V::Name(n) => {
-                            r = self.exec_name(n, src);
-                            if r.is_err() {
-                                break;
-                            }
-                        }
-                        other => self.push(other.clone()),
-                    }
-                }
-                self.calls -= 1;
-                r
-            }
-            V::Name(n) => self.exec_name(&n, src),
-            other => {
-                self.push(other);
-                Ok(())
-            }
-        }
-    }
-
-    fn exec_name(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
-        if self.budget == 0 {
-            self.b.skip("PostScript (operation limit)");
-            return Err(Flow::Quit);
-        }
-        self.budget -= 1;
-        if let Some(v) = self.lookup(n) {
-            return match v {
-                V::Proc(_) => self.exec_obj(v, src),
-                other => {
-                    self.push(other);
-                    Ok(())
-                }
-            };
-        }
-        self.builtin(n, src)
-    }
-
-    fn device_scale(&self) -> f64 {
-        self.gs.ctm.determinant().abs().sqrt()
-    }
-
-    fn user_point(&mut self) -> Point {
-        let y = self.popn();
-        let x = self.popn();
-        Point::new(x, y)
-    }
-
-    fn move_to(&mut self, p: Point) {
-        let q = self.gs.ctm * p;
-        self.gs.path.move_to(q);
-        self.gs.cur = Some(q);
-        self.gs.start = Some(q);
-    }
-    fn line_to(&mut self, p: Point) {
-        let q = self.gs.ctm * p;
-        if self.gs.cur.is_none() {
-            self.gs.path.move_to(q);
-            self.gs.start = Some(q);
-        }
-        self.gs.path.line_to(q);
-        self.gs.cur = Some(q);
-    }
-    fn curve_to(&mut self, a: Point, b: Point, c: Point) {
-        let m = self.gs.ctm;
-        if self.gs.cur.is_none() {
-            self.gs.path.move_to(m * a);
-        }
-        self.gs.path.curve_to(m * a, m * b, m * c);
-        self.gs.cur = Some(m * c);
-    }
-    fn current_user(&self) -> Point {
-        self.gs.ctm.inverse() * self.gs.cur.unwrap_or_default()
-    }
-
-    fn arc(&mut self, neg: bool) {
-        let a2 = self.popn();
-        let a1 = self.popn();
-        let r = self.popn();
-        let c = self.user_point();
-        // `arc` raises `a2` by multiples of 360 until it is at least `a1`, and `arcn` lowers it
-        // until it is at most `a1` (PostScript Language Reference §8.2, `arc` and `arcn`). Those
-        // sweeps, and the first endpoint, are worked out from what is left of each angle after
-        // whole turns.
-        let sweep = if !neg && a2 < a1 {
-            ccw_turn(a1, a2)
-        } else if neg && a2 > a1 {
-            -ccw_turn(a2, a1)
-        } else {
-            a2 - a1
-        };
-        // A sweep of more than `MAX_ARC_TURNS` turns is shortened by whole pairs of turns to
-        // between `MAX_ARC_TURNS - 2` and `MAX_ARC_TURNS` turns, with a skip note. The arc still
-        // ends at `a2`, and an even-odd fill or clip of it covers the same area as the full sweep.
-        let max = MAX_ARC_TURNS * 360.0;
-        let sweep = if sweep.abs() > max {
-            self.b.skip("arc (too many turns)");
-            let s = sweep.signum();
-            s * (max - 720.0 + (s * (a2 % 720.0 - a1 % 720.0)).rem_euclid(720.0))
-        } else {
-            sweep
-        };
-        let (a1, sweep) = ((a1 % 360.0).to_radians(), sweep.to_radians());
-        let start = Point::new(c.x + r * a1.cos(), c.y + r * a1.sin());
-        if self.gs.cur.is_some() {
-            self.line_to(start);
-        } else {
-            self.move_to(start);
-        }
-        let arc = kurbo::Arc::new(c, (r, r), a1, sweep, 0.0);
-        let m = self.gs.ctm;
-        arc.to_cubic_beziers(0.1, |p1, p2, p3| {
-            self.gs.path.curve_to(m * p1, m * p2, m * p3);
-            self.gs.cur = Some(m * p3);
-        });
-    }
-
-    fn paint(&mut self, fill: Option<FillRule>, stroke: bool) {
-        let path = std::mem::take(&mut self.gs.path);
-        self.gs.cur = None;
-        self.gs.start = None;
-        let s = self.device_scale();
-        let st = stroke.then(|| Stroke {
-            paint: Paint::Color(self.gs.color),
-            opacity: 1.0,
-            width: if self.gs.lw <= 0.0 { 1.0 } else { self.gs.lw * s },
-            cap: self.gs.cap,
-            join: self.gs.join,
-            miter: self.gs.miter.max(1.0),
-            dash: self.gs.dash.as_ref().map(|(a, o)| (a.iter().map(|v| v * s).collect(), o * s)),
-        });
-        self.b.fill_stroke(path, Affine::IDENTITY, fill.map(|r| (Paint::Color(self.gs.color), 1.0, r)), st);
-    }
-
-    fn rect_path(&mut self) -> Vec<BezPath> {
-        // x y w h, or an array / string of numbers.
-        let top = self.pop();
-        let nums: Vec<f64> = match &top {
-            V::Array(_) | V::Proc(_) => top.items().unwrap_or_default().iter().filter_map(V::num).collect(),
-            V::Num(h) => {
-                let w = self.popn();
-                let y = self.popn();
-                let x = self.popn();
-                vec![x, y, w, *h]
-            }
-            _ => vec![],
-        };
-        let m = self.gs.ctm;
-        nums.as_chunks::<4>()
-            .0
-            .iter()
-            .map(|r| {
-                let mut p = BezPath::new();
-                p.move_to(m * Point::new(r[0], r[1]));
-                p.line_to(m * Point::new(r[0] + r[2], r[1]));
-                p.line_to(m * Point::new(r[0] + r[2], r[1] + r[3]));
-                p.line_to(m * Point::new(r[0], r[1] + r[3]));
-                p.close_path();
-                p
-            })
-            .collect()
-    }
-
-    fn grestore(&mut self) {
-        if let Some(g) = self.saved.pop() {
-            let d = g.depth;
-            self.gs = g;
-            self.b.close_to(d);
-        }
-    }
-
-    fn builtin(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
-        match n {
-            // Stack.
-            "pop" => {
-                self.pop();
-            }
-            "exch" => {
-                let b = self.pop();
-                let a = self.pop();
-                self.push(b);
-                self.push(a);
-            }
-            "dup" => {
-                let a = self.st.last().cloned().unwrap_or(V::Null);
-                self.push(a);
-            }
-            "copy" => match self.pop() {
-                V::Num(k) => {
-                    let k = (k.max(0.0) as usize).min(self.st.len());
-                    let tail: Vec<V> = self.st[self.st.len() - k..].to_vec();
-                    self.st.extend(tail);
-                }
-                V::Array(dst) => {
-                    let s = self.pop().items().unwrap_or_default();
-                    let mut d = dst.borrow_mut();
-                    for (i, v) in s.into_iter().enumerate() {
-                        if i < d.len() {
-                            d[i] = v;
-                        }
-                    }
-                    drop(d);
-                    self.push(V::Array(dst));
-                }
-                other => self.push(other),
-            },
-            "index" => {
-                let k = self.popn().max(0.0) as usize;
-                let v = if k < self.st.len() { self.st[self.st.len() - 1 - k].clone() } else { V::Null };
-                self.push(v);
-            }
-            "roll" => {
-                let j = self.popn() as i64;
-                let k = (self.popn().max(0.0) as usize).min(self.st.len());
-                if k > 0 {
-                    let s = self.st.len() - k;
-                    let r = j.rem_euclid(k as i64) as usize;
-                    self.st[s..].rotate_right(r);
-                }
-            }
-            "clear" => self.st.clear(),
-            "count" => self.push(V::Num(self.st.len() as f64)),
-            "mark" | "[" | "<<" => self.push(V::Mark),
-            "cleartomark" => {
-                while let Some(v) = self.st.pop() {
-                    if matches!(v, V::Mark) {
-                        break;
-                    }
-                }
-            }
-            "counttomark" => {
-                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
-                self.push(V::Num(k as f64));
-            }
-            "]" => {
-                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
-                let items = self.st.split_off(self.st.len() - k);
-                self.st.pop();
-                self.push(array(items));
-            }
-            ">>" => {
-                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
-                let items = self.st.split_off(self.st.len() - k);
-                self.st.pop();
-                let d = new_dict();
-                for kv in items.as_chunks::<2>().0 {
-                    d.borrow_mut().insert(kv[0].key(), kv[1].clone());
-                }
-                self.push(V::Dict(d));
-            }
-            // Arithmetic.
-            "add" | "sub" | "mul" | "div" | "idiv" | "mod" | "atan" | "exp" | "max" | "min" => {
-                let b = self.popn();
-                let a = self.popn();
-                let v = match n {
-                    "add" => a + b,
-                    "sub" => a - b,
-                    "mul" => a * b,
-                    "div" => {
-                        if b == 0.0 {
-                            0.0
-                        } else {
-                            a / b
-                        }
-                    }
-                    // `checked_*` give 0 both for a zero divisor and for the one overflowing
-                    // case, `i64::MIN / -1` (`/` and `%` panic on it in every build).
-                    "idiv" => (a as i64).checked_div(b as i64).unwrap_or(0) as f64,
-                    "mod" => (a as i64).checked_rem(b as i64).unwrap_or(0) as f64,
-                    "atan" => a.atan2(b).to_degrees().rem_euclid(360.0),
-                    "exp" => a.powf(b),
-                    "max" => a.max(b),
-                    _ => a.min(b),
-                };
-                self.push(V::Num(if v.is_finite() { v } else { 0.0 }));
-            }
-            "neg" | "abs" | "sqrt" | "sin" | "cos" | "ln" | "log" | "cvi" | "cvr" | "round" | "floor" | "ceiling" | "truncate" => {
-                let a = match self.pop() {
-                    V::Str(s) => parse_num(&s.borrow()).unwrap_or(0.0),
-                    v => v.num().unwrap_or(0.0),
-                };
-                let v = match n {
-                    "neg" => -a,
-                    "abs" => a.abs(),
-                    "sqrt" => a.max(0.0).sqrt(),
-                    "sin" => a.to_radians().sin(),
-                    "cos" => a.to_radians().cos(),
-                    "ln" => a.ln(),
-                    "log" => a.log10(),
-                    "cvi" | "truncate" => a.trunc(),
-                    "round" => (a + 0.5).floor(),
-                    "floor" => a.floor(),
-                    "ceiling" => a.ceil(),
-                    _ => a,
-                };
-                self.push(V::Num(if v.is_finite() { v } else { 0.0 }));
-            }
-            // Comparison and logic.
-            "eq" | "ne" => {
-                let b = self.pop();
-                let a = self.pop();
-                let eq = match (&a, &b) {
-                    (V::Num(x), V::Num(y)) => x == y,
-                    (V::Bool(x), V::Bool(y)) => x == y,
-                    (V::Null, V::Null) => true,
-                    (V::Array(x), V::Array(y)) => Rc::ptr_eq(x, y),
-                    (V::Dict(x), V::Dict(y)) => Rc::ptr_eq(x, y),
-                    (x, y) => !x.key().is_empty() && x.key() == y.key(),
-                };
-                self.push(V::Bool(eq == (n == "eq")));
-            }
-            "gt" | "ge" | "lt" | "le" => {
-                let b = self.popn();
-                let a = self.popn();
-                self.push(V::Bool(match n {
-                    "gt" => a > b,
-                    "ge" => a >= b,
-                    "lt" => a < b,
-                    _ => a <= b,
-                }));
-            }
-            "not" => match self.pop() {
-                V::Bool(b) => self.push(V::Bool(!b)),
-                v => self.push(V::Num(!(v.num().unwrap_or(0.0) as i64) as f64)),
-            },
-            "and" | "or" | "xor" => {
-                let b = self.pop();
-                let a = self.pop();
-                match (a, b) {
-                    (V::Bool(x), V::Bool(y)) => self.push(V::Bool(match n {
-                        "and" => x && y,
-                        "or" => x || y,
-                        _ => x ^ y,
-                    })),
-                    (x, y) => {
-                        let (x, y) = (x.num().unwrap_or(0.0) as i64, y.num().unwrap_or(0.0) as i64);
-                        self.push(V::Num(match n {
-                            "and" => x & y,
-                            "or" => x | y,
-                            _ => x ^ y,
-                        } as f64));
-                    }
-                }
-            }
-            "true" => self.push(V::Bool(true)),
-            "false" => self.push(V::Bool(false)),
-            "null" => self.push(V::Null),
-            // Control.
-            "exec" => {
-                let v = self.pop();
-                self.exec_obj(v, src)?;
-            }
-            "if" => {
-                let p = self.pop();
-                if let V::Bool(true) = self.pop() {
-                    self.exec_obj(p, src)?;
-                }
-            }
-            "ifelse" => {
-                let f = self.pop();
-                let t = self.pop();
-                let c = matches!(self.pop(), V::Bool(true));
-                self.exec_obj(if c { t } else { f }, src)?;
-            }
-            "repeat" => {
-                let p = self.pop();
-                let k = self.popn().clamp(0.0, 1e6) as usize;
-                for _ in 0..k {
-                    match self.exec_obj(p.clone(), src) {
-                        Err(Flow::Exit) => break,
-                        r => r?,
-                    }
-                }
-            }
-            "for" => {
-                let p = self.pop();
-                let lim = self.popn();
-                let inc = self.popn();
-                let mut i = self.popn();
-                let mut guard = 0;
-                while inc != 0.0 && ((inc > 0.0 && i <= lim) || (inc < 0.0 && i >= lim)) && guard < 1_000_000 {
-                    self.push(V::Num(i));
-                    match self.exec_obj(p.clone(), src) {
-                        Err(Flow::Exit) => break,
-                        r => r?,
-                    }
-                    i += inc;
-                    guard += 1;
-                }
-            }
-            "loop" => {
-                let p = self.pop();
-                for _ in 0..1_000_000 {
-                    match self.exec_obj(p.clone(), src) {
-                        Err(Flow::Exit) => break,
-                        r => r?,
-                    }
-                }
-            }
-            "forall" => {
-                let p = self.pop();
-                match self.pop() {
-                    V::Dict(d) => {
-                        let items: Vec<(String, V)> = d.borrow().iter().map(|(k, v)| (k.clone(), v.clone())).collect();
-                        for (k, v) in items {
-                            self.push(V::Lit(k.into()));
-                            self.push(v);
-                            match self.exec_obj(p.clone(), src) {
-                                Err(Flow::Exit) => break,
-                                r => r?,
-                            }
-                        }
-                    }
-                    V::Str(s) => {
-                        let bytes = s.borrow().clone();
-                        for c in bytes {
-                            self.push(V::Num(c as f64));
-                            match self.exec_obj(p.clone(), src) {
-                                Err(Flow::Exit) => break,
-                                r => r?,
-                            }
-                        }
-                    }
-                    a => {
-                        for v in a.items().unwrap_or_default() {
-                            self.push(v);
-                            match self.exec_obj(p.clone(), src) {
-                                Err(Flow::Exit) => break,
-                                r => r?,
-                            }
-                        }
-                    }
-                }
-            }
-            "exit" => return Err(Flow::Exit),
-            "stop" => return Err(Flow::Stop),
-            "stopped" => {
-                let p = self.pop();
-                let stopped = match self.exec_obj(p, src) {
-                    Err(Flow::Quit) => return Err(Flow::Quit),
-                    Err(_) => true,
-                    Ok(()) => false,
-                };
-                self.push(V::Bool(stopped));
-            }
-            "quit" => return Err(Flow::Quit),
-            "showpage" | "copypage" => {}
-            // Dictionaries.
-            "def" => {
-                let v = self.pop();
-                let k = self.pop().key();
-                if let Some(d) = self.dicts.last() {
-                    d.borrow_mut().insert(k, v);
-                }
-            }
-            "store" => {
-                let v = self.pop();
-                let k = self.pop().key();
-                let d = self.dicts.iter().rev().find(|d| d.borrow().contains_key(&k)).or(self.dicts.last()).cloned();
-                if let Some(d) = d {
-                    d.borrow_mut().insert(k, v);
-                }
-            }
-            "load" => {
-                let k = self.pop().key();
-                let v = self.lookup(&k).unwrap_or(V::Name(k.into()));
-                self.push(v);
-            }
-            "undef" => {
-                let k = self.pop().key();
-                if let V::Dict(d) = self.pop() {
-                    d.borrow_mut().remove(&k);
-                }
-            }
-            "dict" => {
-                self.pop();
-                self.push(V::Dict(new_dict()));
-            }
-            "begin" => {
-                if let V::Dict(d) = self.pop()
-                    && self.dicts.len() < 64
-                {
-                    self.dicts.push(d);
-                }
-            }
-            "end" => {
-                if self.dicts.len() > 1 {
-                    self.dicts.pop();
-                }
-            }
-            "currentdict" => {
-                let d = self.dicts.last().cloned().unwrap_or_else(new_dict);
-                self.push(V::Dict(d));
-            }
-            "userdict" | "globaldict" | "systemdict" | "statusdict" | "errordict" | "$error" => {
-                let d = self.dicts[0].clone();
-                self.push(V::Dict(d));
-            }
-            "where" => {
-                let k = self.pop().key();
-                match self.dicts.iter().rev().find(|d| d.borrow().contains_key(&k)).cloned() {
-                    Some(d) => {
-                        self.push(V::Dict(d));
-                        self.push(V::Bool(true));
-                    }
-                    None => self.push(V::Bool(false)),
-                }
-            }
-            "known" => {
-                let k = self.pop().key();
-                let v = match self.pop() {
-                    V::Dict(d) => d.borrow().contains_key(&k),
-                    _ => false,
-                };
-                self.push(V::Bool(v));
-            }
-            "countdictstack" => self.push(V::Num(self.dicts.len() as f64)),
-            "cleardictstack" => self.dicts.truncate(1),
-            "findresource" | "findfont" | "findencoding" => {
-                let category = if n == "findresource" { self.pop().key() } else { String::new() };
-                let key = self.pop().key();
-                match (n, category.as_str()) {
-                    ("findfont", _) | (_, "Font") => {
-                        let f = self.find_font(&key);
-                        self.push(V::Dict(f));
-                    }
-                    ("findencoding", _) | (_, "Encoding") => self.push(encoding_array(&key)),
-                    _ => self.push(V::Dict(new_dict())),
-                }
-            }
-            "defineresource" => {
-                let category = self.pop().key();
-                let v = self.pop();
-                let key = self.pop().key();
-                if let (V::Dict(d), "Font") = (&v, category.as_str()) {
-                    self.font_dir.insert(key, d.clone());
-                }
-                self.push(v);
-            }
-            "resourcestatus" => {
-                self.pop();
-                self.pop();
-                self.push(V::Bool(false));
-            }
-            // Arrays and strings.
-            "array" => {
-                let k = self.popn().clamp(0.0, 1e6) as usize;
-                self.push(array(vec![V::Null; k]));
-            }
-            "string" => {
-                let k = self.popn().clamp(0.0, 1e7) as usize;
-                self.push(V::Str(Rc::new(RefCell::new(vec![0; k]))));
-            }
-            "length" => {
-                let l = match self.pop() {
-                    V::Str(s) => s.borrow().len(),
-                    V::Dict(d) => d.borrow().len(),
-                    V::Name(s) | V::Lit(s) => s.len(),
-                    v => v.items().map_or(0, |i| i.len()),
-                };
-                self.push(V::Num(l as f64));
-            }
-            "get" => {
-                let k = self.pop();
-                let v = match self.pop() {
-                    V::Dict(d) => d.borrow().get(&k.key()).cloned().unwrap_or(V::Null),
-                    V::Str(s) => V::Num(s.borrow().get(k.num().unwrap_or(0.0) as usize).copied().unwrap_or(0) as f64),
-                    a => a.items().and_then(|i| i.get(k.num().unwrap_or(0.0) as usize).cloned()).unwrap_or(V::Null),
-                };
-                self.push(v);
-            }
-            "put" => {
-                let v = self.pop();
-                let k = self.pop();
-                match self.pop() {
-                    V::Dict(d) => {
-                        d.borrow_mut().insert(k.key(), v);
-                    }
-                    V::Array(a) => {
-                        let i = k.num().unwrap_or(0.0) as usize;
-                        if let Some(slot) = a.borrow_mut().get_mut(i) {
-                            *slot = v;
-                        }
-                    }
-                    V::Str(s) => {
-                        let i = k.num().unwrap_or(0.0) as usize;
-                        if let Some(slot) = s.borrow_mut().get_mut(i) {
-                            *slot = v.num().unwrap_or(0.0) as u8;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-            "getinterval" => {
-                let c = self.popn().max(0.0) as usize;
-                let i = self.popn().max(0.0) as usize;
-                match self.pop() {
-                    V::Str(s) => {
-                        let b = s.borrow();
-                        let part = b.get(i.min(b.len())..(i + c).min(b.len())).unwrap_or(&[]).to_vec();
-                        drop(b);
-                        self.push(V::Str(Rc::new(RefCell::new(part))));
-                    }
-                    a => {
-                        let items = a.items().unwrap_or_default();
-                        let part = items.get(i.min(items.len())..(i + c).min(items.len())).unwrap_or(&[]).to_vec();
-                        self.push(array(part));
-                    }
-                }
-            }
-            "putinterval" => {
-                self.pop();
-                self.pop();
-                self.pop();
-            }
-            "aload" => {
-                let a = self.pop();
-                for v in a.items().unwrap_or_default() {
-                    self.push(v);
-                }
-                self.push(a);
-            }
-            "astore" => {
-                let a = self.pop();
-                if let V::Array(arr) = &a {
-                    let k = arr.borrow().len().min(self.st.len());
-                    let items = self.st.split_off(self.st.len() - k);
-                    *arr.borrow_mut() = items;
-                }
-                self.push(a);
-            }
-            "cvx" => match self.pop() {
-                V::Array(a) => self.push(V::Proc(Rc::new(a.borrow().clone()))),
-                V::Lit(s) => self.push(V::Name(s)),
-                V::Str(s) => {
-                    // Executable string: tokenize it as a procedure.
-                    let bytes = s.borrow().clone();
-                    let mut sub = Src { d: &bytes, pos: 0 };
-                    let mut body = vec![];
-                    while let Some(t) = sub.token(0) {
-                        body.push(t);
-                    }
-                    self.push(V::Proc(Rc::new(body)));
-                }
-                v => self.push(v),
-            },
-            "cvlit" => match self.pop() {
-                V::Proc(p) => self.push(array(p.as_ref().clone())),
-                V::Name(s) => self.push(V::Lit(s)),
-                v => self.push(v),
-            },
-            "cvn" => {
-                let k = self.pop().key();
-                self.push(V::Lit(k.into()));
-            }
-            "cvs" => {
-                self.pop();
-                let k = self.pop().key();
-                self.push(V::Str(Rc::new(RefCell::new(k.into_bytes()))));
-            }
-            "xcheck" => {
-                let v = self.pop();
-                self.push(V::Bool(matches!(v, V::Proc(_) | V::Name(_))));
-            }
-            "type" => {
-                let t = match self.pop() {
-                    V::Num(_) => "realtype",
-                    V::Bool(_) => "booleantype",
-                    V::Name(_) | V::Lit(_) => "nametype",
-                    V::Str(_) => "stringtype",
-                    V::Proc(_) | V::Array(_) => "arraytype",
-                    V::Dict(_) => "dicttype",
-                    V::Mark => "marktype",
-                    V::Null => "nulltype",
-                    V::File => "filetype",
-                };
-                self.push(V::Name(t.into()));
-            }
-            "bind" | "readonly" | "executeonly" | "noaccess" => {}
-            "languagelevel" => self.push(V::Num(3.0)),
-            "version" | "product" => self.push(V::Str(Rc::new(RefCell::new(b"3010".to_vec())))),
-            "save" => {
-                self.saved.push(self.gs.clone());
-                self.gs.depth = self.b.depth();
-                self.push(V::Null);
-            }
-            "restore" => {
-                self.pop();
-                self.grestore();
-            }
-            "currentfile" => self.push(V::File),
-            "readstring" | "readhexstring" | "readline" => {
-                self.pop();
-                self.pop();
-                self.push(V::Str(Rc::new(RefCell::new(vec![]))));
-                self.push(V::Bool(false));
-            }
-            "flushfile" | "closefile" | "print" | "==" | "=" | "pstack" | "setpagedevice" | "setglobal" | "setpacking" | "setshared" | "setobjectformat"
-            | "setsmoothness" => {
-                if !matches!(n, "pstack") {
-                    self.pop();
-                }
-            }
-            "currentglobal" | "currentpacking" | "currentshared" => self.push(V::Bool(false)),
-            "vmstatus" => {
-                for _ in 0..3 {
-                    self.push(V::Num(0.0));
-                }
-            }
-            // Graphics state.
-            "gsave" => {
-                let mut g = self.gs.clone();
-                g.depth = self.b.depth();
-                self.saved.push(g);
-            }
-            "grestore" => self.grestore(),
-            "grestoreall" => {
-                while !self.saved.is_empty() {
-                    self.grestore();
-                }
-            }
-            "initgraphics" => {
-                self.gs.ctm = Affine::IDENTITY;
-                self.gs.lw = 1.0;
-                self.gs.color = [0.0; 3];
-            }
-            "setlinewidth" => self.gs.lw = self.popn(),
-            "currentlinewidth" => self.push(V::Num(self.gs.lw)),
-            "setlinecap" => self.gs.cap = [Cap::Butt, Cap::Round, Cap::Square][(self.popn().max(0.0) as usize).min(2)],
-            "setlinejoin" => self.gs.join = [Join::Miter, Join::Round, Join::Bevel][(self.popn().max(0.0) as usize).min(2)],
-            "setmiterlimit" => self.gs.miter = self.popn(),
-            "setdash" => {
-                let off = self.popn();
-                let a: Vec<f64> = self.pop().items().unwrap_or_default().iter().filter_map(V::num).collect();
-                self.gs.dash = (!a.is_empty() && a.iter().any(|v| *v > 0.0)).then_some((a, off));
-            }
-            "setflat" | "setstrokeadjust" | "setoverprint" | "setrenderingintent" | "setcolorrendering" | "sethalftone" | "setscreen" | "settransfer" => {
-                self.pop();
-            }
-            "setgray" => {
-                let g = self.popn().clamp(0.0, 1.0);
-                self.gs.color = [g; 3];
-            }
-            "setrgbcolor" => {
-                let b = self.popn();
-                let g = self.popn();
-                let r = self.popn();
-                self.gs.color = [r, g, b].map(|v| v.clamp(0.0, 1.0));
-            }
-            "sethsbcolor" => {
-                let v = self.popn().clamp(0.0, 1.0);
-                let s = self.popn().clamp(0.0, 1.0);
-                let h = self.popn().rem_euclid(1.0) * 6.0;
-                let (i, f) = (h.floor() as i32, h.fract());
-                let (p, q, t) = (v * (1.0 - s), v * (1.0 - s * f), v * (1.0 - s * (1.0 - f)));
-                self.gs.color = match i {
-                    0 => [v, t, p],
-                    1 => [q, v, p],
-                    2 => [p, v, t],
-                    3 => [p, q, v],
-                    4 => [t, p, v],
-                    _ => [v, p, q],
-                };
-            }
-            "setcmykcolor" => {
-                let k = self.popn().clamp(0.0, 1.0);
-                let y = self.popn().clamp(0.0, 1.0);
-                let m = self.popn().clamp(0.0, 1.0);
-                let c = self.popn().clamp(0.0, 1.0);
-                self.gs.color = [(1.0 - c) * (1.0 - k), (1.0 - m) * (1.0 - k), (1.0 - y) * (1.0 - k)];
-            }
-            "setcolorspace" => {
-                self.pop();
-            }
-            "setcolor" => {
-                // Device colour by operand count (patterns are not drawn).
-                let k = self.st.iter().rev().take_while(|v| matches!(v, V::Num(_))).count().min(4);
-                let c: Vec<f64> = self.st.split_off(self.st.len() - k).iter().filter_map(V::num).collect();
-                self.gs.color = match c.len() {
-                    1 => [c[0]; 3],
-                    3 => [c[0], c[1], c[2]],
-                    4 => [(1.0 - c[0]) * (1.0 - c[3]), (1.0 - c[1]) * (1.0 - c[3]), (1.0 - c[2]) * (1.0 - c[3])],
-                    _ => self.gs.color,
-                };
-            }
-            "currentgray" => self.push(V::Num((self.gs.color[0] + self.gs.color[1] + self.gs.color[2]) / 3.0)),
-            "currentrgbcolor" => {
-                for c in self.gs.color {
-                    self.push(V::Num(c));
-                }
-            }
-            // Coordinates.
-            "matrix" => self.push(matrix_val(Affine::IDENTITY)),
-            "identmatrix" | "defaultmatrix" => {
-                self.pop();
-                self.push(matrix_val(Affine::IDENTITY));
-            }
-            "currentmatrix" => {
-                self.pop();
-                self.push(matrix_val(self.gs.ctm));
-            }
-            "setmatrix" => {
-                let m = self.pop();
-                self.gs.ctm = matrix_of(&m).unwrap_or(Affine::IDENTITY);
-            }
-            "concat" => {
-                let m = self.pop();
-                if let Some(m) = matrix_of(&m) {
-                    self.gs.ctm *= m;
-                }
-            }
-            "concatmatrix" => {
-                self.pop();
-                let b = self.pop();
-                let a = self.pop();
-                let (a, b) = (matrix_of(&a).unwrap_or(Affine::IDENTITY), matrix_of(&b).unwrap_or(Affine::IDENTITY));
-                self.push(matrix_val(b * a));
-            }
-            "invertmatrix" => {
-                self.pop();
-                let a = self.pop();
-                self.push(matrix_val(matrix_of(&a).unwrap_or(Affine::IDENTITY).inverse()));
-            }
-            "translate" | "scale" => {
-                let top = self.pop();
-                let (m_out, y) = match top {
-                    V::Array(_) => (Some(top), self.popn()),
-                    v => (None, v.num().unwrap_or(0.0)),
-                };
-                let x = self.popn();
-                let t = if n == "translate" { Affine::translate((x, y)) } else { Affine::scale_non_uniform(x, y) };
-                match m_out {
-                    Some(_) => self.push(matrix_val(t)),
-                    None => self.gs.ctm *= t,
-                }
-            }
-            "rotate" => {
-                let top = self.pop();
-                match top {
-                    V::Array(_) => {
-                        let a = self.popn();
-                        self.push(matrix_val(Affine::rotate(a.to_radians())));
-                    }
-                    v => self.gs.ctm *= Affine::rotate(v.num().unwrap_or(0.0).to_radians()),
-                }
-            }
-            "transform" | "itransform" | "dtransform" | "idtransform" => {
-                let top = self.pop();
-                let (m, y) = match top {
-                    V::Array(_) | V::Proc(_) => (matrix_of(&top).unwrap_or(Affine::IDENTITY), self.popn()),
-                    v => (self.gs.ctm, v.num().unwrap_or(0.0)),
-                };
-                let x = self.popn();
-                let m = if n.starts_with('i') { m.inverse() } else { m };
-                let p = if n.contains('d') {
-                    let c = m.as_coeffs();
-                    Point::new(c[0] * x + c[2] * y, c[1] * x + c[3] * y)
-                } else {
-                    m * Point::new(x, y)
-                };
-                self.push(V::Num(p.x));
-                self.push(V::Num(p.y));
-            }
-            // Paths.
-            "newpath" => {
-                self.gs.path = BezPath::new();
-                self.gs.cur = None;
-                self.gs.start = None;
-            }
-            "moveto" => {
-                let p = self.user_point();
-                self.move_to(p);
-            }
-            "rmoveto" => {
-                let d = self.user_point();
-                let c = self.current_user();
-                self.move_to(Point::new(c.x + d.x, c.y + d.y));
-            }
-            "lineto" => {
-                let p = self.user_point();
-                self.line_to(p);
-            }
-            "rlineto" => {
-                let d = self.user_point();
-                let c = self.current_user();
-                self.line_to(Point::new(c.x + d.x, c.y + d.y));
-            }
-            "curveto" | "rcurveto" => {
-                let p3 = self.user_point();
-                let p2 = self.user_point();
-                let p1 = self.user_point();
-                if n == "rcurveto" {
-                    let c = self.current_user();
-                    let o = |p: Point| Point::new(c.x + p.x, c.y + p.y);
-                    self.curve_to(o(p1), o(p2), o(p3));
-                } else {
-                    self.curve_to(p1, p2, p3);
-                }
-            }
-            "closepath" => {
-                if self.gs.cur.is_some() {
-                    self.gs.path.close_path();
-                    self.gs.cur = self.gs.start;
-                }
-            }
-            "arc" => self.arc(false),
-            "arcn" => self.arc(true),
-            "currentpoint" => {
-                let c = self.current_user();
-                self.push(V::Num(c.x));
-                self.push(V::Num(c.y));
-            }
-            "pathbbox" => {
-                let r = kurbo::Shape::bounding_box(&self.gs.path);
-                let inv = self.gs.ctm.inverse();
-                let (a, b) = (inv * Point::new(r.x0, r.y0), inv * Point::new(r.x1, r.y1));
-                for v in [a.x.min(b.x), a.y.min(b.y), a.x.max(b.x), a.y.max(b.y)] {
-                    self.push(V::Num(v));
-                }
-            }
-            "flattenpath" | "reversepath" | "strokepath" | "initclip" => {}
-            "clippath" => {
-                let p = self.page;
-                self.gs.path = kurbo::Shape::to_path(&kurbo::Rect::new(p[0], p[1], p[2], p[3]), 0.1);
-            }
-            // Painting.
-            "fill" => self.paint(Some(FillRule::NonZero), false),
-            "eofill" => self.paint(Some(FillRule::EvenOdd), false),
-            "stroke" => self.paint(None, true),
-            "clip" | "eoclip" => {
-                let rule = if n == "clip" { FillRule::NonZero } else { FillRule::EvenOdd };
-                let p = self.gs.path.clone();
-                if !p.elements().iter().all(|e| matches!(e, PathEl::MoveTo(_))) {
-                    self.b.clip(p, rule);
-                }
-            }
-            "rectfill" | "rectstroke" | "rectclip" => {
-                let paths = self.rect_path();
-                if n == "rectstroke" && matches!(self.st.last(), Some(V::Array(_))) {
-                    self.pop();
-                }
-                let mut all = BezPath::new();
-                for p in paths {
-                    all.extend(p);
-                }
-                match n {
-                    "rectclip" => self.b.clip(all, FillRule::NonZero),
-                    _ => {
-                        let saved = std::mem::replace(&mut self.gs.path, all);
-                        self.paint(if n == "rectfill" { Some(FillRule::NonZero) } else { None }, n == "rectstroke");
-                        self.gs.path = saved;
-                    }
-                }
-            }
-            "shfill" => {
-                self.pop();
-                self.b.skip("smooth shading (shfill)");
-            }
-            // Text (see `text_op`).
-            "scalefont" | "makefont" | "selectfont" | "setfont" | "show" | "charpath" | "glyphshow" | "rootfont" | "currentfont" | "setcachedevice"
-            | "setcharwidth" | "ashow" | "widthshow" | "awidthshow" | "xshow" | "yshow" | "xyshow" | "kshow" | "cshow" | "stringwidth" | "definefont"
-            | "StandardEncoding" | "ISOLatin1Encoding" | "eexec" | "StartData" | "undefinefont" => self.text_op(n, src)?,
-            // Images: operands popped, inline data skipped.
-            "image" | "imagemask" | "colorimage" => {
-                let mut reads_file = false;
-                let check = |v: &V, rf: &mut bool| {
-                    if matches!(v, V::File) || matches!(v, V::Proc(p) if p.iter().any(|x| matches!(x, V::Name(n) if &**n == "currentfile"))) {
-                        *rf = true;
-                    }
-                };
-                if n == "colorimage" {
-                    let ncomp = self.popn().max(1.0) as usize;
-                    let multi = matches!(self.pop(), V::Bool(true));
-                    for _ in 0..if multi { ncomp.min(4) } else { 1 } {
-                        let v = self.pop();
-                        check(&v, &mut reads_file);
-                    }
-                    for _ in 0..4 {
-                        self.pop();
-                    }
-                } else {
-                    match self.pop() {
-                        V::Dict(d) => {
-                            if let Some(ds) = d.borrow().get("DataSource") {
-                                check(ds, &mut reads_file);
-                            }
-                        }
-                        top => {
-                            check(&top, &mut reads_file);
-                            for _ in 0..4 {
-                                self.pop();
-                            }
-                        }
-                    }
-                }
-                if reads_file {
-                    src.skip_image_data();
-                }
-                self.b.skip("image");
-            }
-            _ => {
-                if self.unknown.len() < 32 && !self.unknown.iter().any(|u| u == n) {
-                    self.unknown.push(n.to_string());
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-/// The PostScript section of an EPS file (DOS EPS binary header handled) and its bounding box
-/// (`%%HiResBoundingBox` preferred).
-pub fn eps_parts(bytes: &[u8]) -> Option<(&[u8], [f64; 4])> {
-    let ps = if bytes.starts_with(&[0xC5, 0xD0, 0xD3, 0xC6]) && bytes.len() >= 12 {
-        let off = u32::from_le_bytes([bytes[4], bytes[5], bytes[6], bytes[7]]) as usize;
-        let len = u32::from_le_bytes([bytes[8], bytes[9], bytes[10], bytes[11]]) as usize;
-        bytes.get(off..off.checked_add(len)?.min(bytes.len()))?
-    } else {
-        bytes
-    };
-    let find_box = |key: &[u8]| -> Option<[f64; 4]> {
-        let mut from = 0;
-        while let Some(p) = ps[from..].windows(key.len()).position(|w| w == key) {
-            let s = from + p + key.len();
-            let e = ps[s..].iter().position(|c| matches!(c, b'\n' | b'\r')).map_or(ps.len(), |q| s + q);
-            let v: Vec<f64> = String::from_utf8_lossy(&ps[s..e]).split_whitespace().filter_map(|t| t.parse().ok()).collect();
-            if v.len() == 4 && v[2] > v[0] && v[3] > v[1] {
-                return Some([v[0], v[1], v[2], v[3]]);
-            }
-            from = s;
-        }
-        None
-    };
-    let bbox = find_box(b"%%HiResBoundingBox:").or_else(|| find_box(b"%%BoundingBox:"))?;
-    Some((ps, bbox))
-}
-
-// ------------------------------------------------------------------ text
-
-/// An encoding array of glyph names (`StandardEncoding`; `ISOLatin1Encoding` and others are
-/// approximated by WinAnsi, which agrees with ISO Latin-1 on the printable codes).
-fn encoding_array(name: &str) -> V {
-    let base = if name == "StandardEncoding" { crate::encoding::Base::Standard } else { crate::encoding::Base::WinAnsi };
-    array((0..256).map(|c| V::Lit(base.name(c as u8).unwrap_or_else(|| ".notdef".into()).into())).collect())
-}
-
-fn find_from(hay: &[u8], needle: &[u8], from: usize) -> Option<usize> {
-    hay.get(from..)?.windows(needle.len()).position(|w| w == needle).map(|p| p + from)
-}
-
-fn rfind_before(hay: &[u8], needle: &[u8], to: usize) -> Option<usize> {
-    hay.get(..to)?.windows(needle.len()).rposition(|w| w == needle)
-}
-
-/// The name after `key` (`/FontName /Name`).
-fn name_after(b: &[u8], key: &[u8]) -> Option<String> {
-    let p = find_from(b, key, 0)? + key.len();
-    let rest = &b[p..];
-    let s = rest.iter().position(|c| *c == b'/')? + 1;
-    let e = rest[s..].iter().position(|c| is_white(*c) || matches!(c, b'/' | b'[' | b'(' | b'{')).map_or(rest.len(), |q| s + q);
-    (e > s).then(|| String::from_utf8_lossy(&rest[s..e]).into_owned())
-}
-
-/// Embedded font programs of an EPS file: Type 1 fonts (`… /FontName /X … currentfile eexec
-/// … cleartomark`, hexadecimal or binary) and CFF font sets (`… <length> StartData <bytes>`).
-fn embedded_fonts(ps: &[u8]) -> HashMap<String, (Rc<Vec<u8>>, bool)> {
-    let mut out = HashMap::new();
-    let mut from = 0;
-    while let Some(ee) = find_from(ps, b"eexec", from) {
-        from = ee + 5;
-        let start = [b"%!PS-AdobeFont".as_slice(), b"%!FontType1"]
-            .iter()
-            .filter_map(|h| rfind_before(ps, h, ee))
-            .max()
-            .or_else(|| rfind_before(ps, b"/FontName", ee).map(|p| p.saturating_sub(512)));
-        let Some(start) = start else { continue };
-        let end = find_from(ps, b"cleartomark", ee).map_or(ps.len(), |p| p + 11);
-        if let Some(name) = name_after(&ps[start..ee], b"/FontName") {
-            out.insert(name, (Rc::new(ps[start..end].to_vec()), false));
-        }
-        from = end;
-    }
-    let mut from = 0;
-    while let Some(sd) = find_from(ps, b"StartData", from) {
-        from = sd + 9;
-        let head = String::from_utf8_lossy(&ps[sd.saturating_sub(64)..sd]).into_owned();
-        let Some(len) = head.split_whitespace().last().and_then(|t| t.parse::<usize>().ok()) else { continue };
-        let s = sd + 10;
-        let Some(data) = ps.get(s..s.saturating_add(len)) else { continue };
-        if let Some(name) = crate::cff::font_name(data) {
-            out.insert(name, (Rc::new(data.to_vec()), true));
-        }
-        from = s + len;
-    }
-    out
-}
-
-fn dict_matrix(d: &DictRef, key: &str) -> Affine {
-    d.borrow().get(key).and_then(matrix_of).unwrap_or(Affine::IDENTITY)
-}
-
-/// A copy of a font dictionary with `m` applied after its matrix (`scalefont`, `makefont`).
-fn transformed(font: &DictRef, m: Affine) -> DictRef {
-    let copy: HashMap<String, V> = font.borrow().clone();
-    let d = Rc::new(RefCell::new(copy));
-    let old = dict_matrix(&d, "__m");
-    d.borrow_mut().insert("__m".into(), matrix_val(m * old));
-    d
-}
-
-impl Interp {
-    /// A font dictionary by name: one `definefont` made, else a new dictionary for an
-    /// embedded program or a bundled stand-in.
-    fn find_font(&mut self, key: &str) -> DictRef {
-        if let Some(d) = self.font_dir.get(key) {
-            return d.clone();
-        }
-        let d = new_dict();
-        {
-            let mut m = d.borrow_mut();
-            m.insert("FontName".into(), V::Lit(key.into()));
-            m.insert("FontType".into(), V::Num(1.0));
-            m.insert("FontMatrix".into(), matrix_val(Affine::scale(0.001)));
-            m.insert("FID".into(), V::Null);
-            m.insert("__base".into(), V::Lit(key.into()));
-            m.insert("__m".into(), matrix_val(Affine::IDENTITY));
-        }
-        self.font_dir.insert(key.to_string(), d.clone());
-        d
-    }
-
-    /// The drawable font of a font dictionary (its base program and encoding) and the matrix
-    /// from text space (font size 1) to user space.
-    fn font_of(&mut self, d: &DictRef) -> Option<(Rc<Font>, Affine)> {
-        if matches!(d.borrow().get("FontType"), Some(V::Num(t)) if *t == 3.0) {
-            // Type 3 fonts (glyph procedures) are not run.
-            self.b.skip("EPS Type 3 font");
-            return None;
-        }
-        let (base, names) = {
-            let m = d.borrow();
-            let base = m.get("__base").or_else(|| m.get("FontName")).map(V::key)?;
-            let names: Option<Vec<Option<String>>> = m.get("Encoding").and_then(V::items).map(|a| {
-                a.iter()
-                    .map(|v| match v {
-                        V::Lit(n) | V::Name(n) if &**n != ".notdef" => Some(n.to_string()),
-                        _ => None,
-                    })
-                    .collect()
-            });
-            (base, names)
-        };
-        let key = match &names {
-            Some(n) => format!("{base}\u{0}{}", n.iter().map(|x| x.as_deref().unwrap_or("")).collect::<Vec<_>>().join(" ")),
-            None => base.clone(),
-        };
-        let font = match self.font_cache.get(&key) {
-            Some(f) => f.clone(),
-            None => {
-                // Not embedded: a bundled stand-in, as for PDF.
-                let prog = self.embedded.get(&base).cloned();
-                let f = Rc::new(Font::standalone(&base, prog.as_ref().map(|(d, cff)| (d.as_slice(), *cff)), names));
-                self.font_cache.insert(key, f.clone());
-                f
-            }
-        };
-        Some((font, dict_matrix(d, "__m")))
-    }
-
-    /// A string's glyph outlines (device space) from the current point, with an extra
-    /// displacement `extra(index, code)` (user space) after each glyph; moves the current
-    /// point.
-    fn text_path(&mut self, bytes: &[u8], mut extra: impl FnMut(usize, u32) -> (f64, f64)) -> Option<(BezPath, String)> {
-        let d = self.gs.font.clone()?;
-        let (font, m) = self.font_of(&d)?;
-        let mut p = self.current_user();
-        let mut path = BezPath::new();
-        let mut text = String::new();
-        let ctm = self.gs.ctm;
-        for (i, &code) in bytes.iter().enumerate() {
-            let code = code as u32;
-            if let Some(g) = font.glyph(code) {
-                path.extend(ctm * Affine::translate(p.to_vec2()) * m * (*g).clone());
-            }
-            text.push_str(&font.unicode(code));
-            let adv = m * Point::new(font.width(code), 0.0) - m * Point::ZERO;
-            let (ex, ey) = extra(i, code);
-            p += adv + kurbo::Vec2::new(ex, ey);
-        }
-        self.move_to(p);
-        Some((path, text))
-    }
-
-    fn fill_text(&mut self, path: BezPath, text: &str) {
-        let label: String = text.chars().filter(|c| !c.is_control()).take(40).collect();
-        let name = if label.trim().is_empty() { "Text".to_string() } else { format!("Text: {}", label.trim()) };
-        self.b.fill_stroke_named(&name, path, Affine::IDENTITY, Some((Paint::Color(self.gs.color), 1.0, FillRule::NonZero)), None);
-    }
-
-    fn pop_string(&mut self) -> Vec<u8> {
-        match self.pop() {
-            V::Str(s) => s.borrow().clone(),
-            _ => vec![],
-        }
-    }
-
-    fn show_with(&mut self, s: &[u8], extra: impl FnMut(usize, u32) -> (f64, f64)) {
-        match self.text_path(s, extra) {
-            Some((path, text)) => self.fill_text(path, &text),
-            None => self.b.skip("text (no font)"),
-        }
-    }
-
-    /// Text and font operators (PostScript Language Reference §5.1, §8.2).
-    fn text_op(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
-        match n {
-            "scalefont" | "makefont" => {
-                let m = if n == "scalefont" {
-                    Affine::scale(self.popn())
-                } else {
-                    let v = self.pop();
-                    matrix_of(&v).unwrap_or(Affine::IDENTITY)
-                };
-                let font = match self.pop() {
-                    V::Dict(d) => d,
-                    _ => self.find_font("Helvetica"),
-                };
-                self.push(V::Dict(transformed(&font, m)));
-            }
-            "selectfont" => {
-                let size = self.pop();
-                let key = self.pop().key();
-                let font = self.find_font(&key);
-                let m = match &size {
-                    V::Num(s) => Affine::scale(*s),
-                    other => matrix_of(other).unwrap_or(Affine::IDENTITY),
-                };
-                self.gs.font = Some(transformed(&font, m));
-            }
-            "setfont" => {
-                if let V::Dict(d) = self.pop() {
-                    self.gs.font = Some(d);
-                }
-            }
-            "currentfont" | "rootfont" => {
-                let d = self.gs.font.clone().unwrap_or_else(new_dict);
-                self.push(V::Dict(d));
-            }
-            "definefont" => {
-                let v = self.pop();
-                let key = self.pop().key();
-                if let V::Dict(d) = &v {
-                    if !d.borrow().contains_key("__base") {
-                        // A font the file defines itself: its embedded program, by name.
-                        d.borrow_mut().insert("__base".into(), V::Lit(key.as_str().into()));
-                        d.borrow_mut().insert("__m".into(), matrix_val(Affine::IDENTITY));
-                    }
-                    self.font_dir.insert(key, d.clone());
-                }
-                self.push(v);
-            }
-            "undefinefont" => {
-                let key = self.pop().key();
-                self.font_dir.remove(&key);
-            }
-            "StandardEncoding" | "ISOLatin1Encoding" => self.push(encoding_array(n)),
-            "show" => {
-                let s = self.pop_string();
-                self.show_with(&s, |_, _| (0.0, 0.0));
-            }
-            "ashow" => {
-                let s = self.pop_string();
-                let ay = self.popn();
-                let ax = self.popn();
-                self.show_with(&s, |_, _| (ax, ay));
-            }
-            "widthshow" => {
-                let s = self.pop_string();
-                let ch = self.popn() as u32;
-                let cy = self.popn();
-                let cx = self.popn();
-                self.show_with(&s, |_, c| if c == ch { (cx, cy) } else { (0.0, 0.0) });
-            }
-            "awidthshow" => {
-                let s = self.pop_string();
-                let ay = self.popn();
-                let ax = self.popn();
-                let ch = self.popn() as u32;
-                let cy = self.popn();
-                let cx = self.popn();
-                self.show_with(&s, |_, c| if c == ch { (cx + ax, cy + ay) } else { (ax, ay) });
-            }
-            "kshow" | "cshow" => {
-                // The procedure between characters is not run.
-                let s = self.pop_string();
-                self.pop();
-                self.show_with(&s, |_, _| (0.0, 0.0));
-            }
-            "xshow" | "yshow" | "xyshow" => {
-                let disp: Vec<f64> = self.pop().items().unwrap_or_default().iter().filter_map(V::num).collect();
-                let s = self.pop_string();
-                self.explicit_show(&s, &disp, n);
-            }
-            "glyphshow" => {
-                let name = self.pop().key();
-                let Some(d) = self.gs.font.clone() else { return Ok(()) };
-                // Drawn through a one-glyph encoding.
-                let mut e: Vec<V> = (0..256).map(|_| V::Lit(".notdef".into())).collect();
-                e[65] = V::Lit(name.as_str().into());
-                let tmp = transformed(&d, Affine::IDENTITY);
-                tmp.borrow_mut().insert("Encoding".into(), array(e));
-                self.gs.font = Some(tmp);
-                self.show_with(b"A", |_, _| (0.0, 0.0));
-                self.gs.font = Some(d);
-            }
-            "charpath" => {
-                self.pop();
-                let s = self.pop_string();
-                let saved = std::mem::take(&mut self.gs.path);
-                let start = self.gs.start;
-                match self.text_path(&s, |_, _| (0.0, 0.0)) {
-                    Some((glyphs, _)) => {
-                        let mut p = saved;
-                        p.extend(glyphs);
-                        if let Some(c) = self.gs.cur {
-                            p.move_to(c);
-                        }
-                        self.gs.path = p;
-                        self.gs.start = start;
-                    }
-                    None => self.gs.path = saved,
-                }
-            }
-            "stringwidth" => {
-                let s = self.pop_string();
-                let (mut w, mut h) = (0.0, 0.0);
-                if let Some(d) = self.gs.font.clone()
-                    && let Some((font, m)) = self.font_of(&d)
-                {
-                    for &c in &s {
-                        let v = m * Point::new(font.width(c as u32), 0.0) - m * Point::ZERO;
-                        w += v.x;
-                        h += v.y;
-                    }
-                }
-                self.push(V::Num(w));
-                self.push(V::Num(h));
-            }
-            "setcachedevice" => {
-                for _ in 0..6 {
-                    self.pop();
-                }
-            }
-            "setcharwidth" => {
-                self.pop();
-                self.pop();
-            }
-            // An embedded Type 1 program's encrypted part (read by `embedded_fonts`).
-            "eexec" => {
-                if matches!(self.pop(), V::File) {
-                    let rest = &src.d[src.pos.min(src.d.len())..];
-                    src.pos += rest.windows(11).position(|w| w == b"cleartomark").map_or(rest.len(), |p| p + 11);
-                }
-            }
-            // A CFF font set's binary data (read by `embedded_fonts`).
-            "StartData" => {
-                let len = self.popn().max(0.0) as usize;
-                self.pop();
-                src.pos = src.pos.saturating_add(1).saturating_add(len).min(src.d.len());
-            }
-            _ => {}
-        }
-        Ok(())
-    }
-
-    /// `xshow` / `yshow` / `xyshow`: glyph displacements from a number array instead of the
-    /// advances.
-    fn explicit_show(&mut self, s: &[u8], disp: &[f64], n: &str) {
-        let step = if n == "xyshow" { 2 } else { 1 };
-        let d: Vec<(f64, f64)> = (0..s.len())
-            .map(|k| {
-                let i = k * step;
-                let v = |j: usize| disp.get(j).copied().unwrap_or(0.0);
-                match n {
-                    "xshow" => (v(i), 0.0),
-                    "yshow" => (0.0, v(i)),
-                    _ => (v(i), v(i + 1)),
-                }
-            })
-            .collect();
-        let Some(fd) = self.gs.font.clone() else {
-            self.b.skip("text (no font)");
-            return;
-        };
-        let Some((font, m)) = self.font_of(&fd) else { return };
-        self.show_with(s, move |k, c| {
-            let adv = m * Point::new(font.width(c), 0.0) - m * Point::ZERO;
-            let (dx, dy) = d.get(k).copied().unwrap_or((0.0, 0.0));
-            (dx - adv.x, dy - adv.y)
-        });
-    }
-}
diff --git a/crates/pdf/src/ps/builtin.rs b/crates/pdf/src/ps/builtin.rs
new file mode 100644
index 000000000..dcafa9417
--- /dev/null
+++ b/crates/pdf/src/ps/builtin.rs
@@ -0,0 +1,1066 @@
+use super::eps::find_from;
+use super::scanner::Src;
+use super::text::encoding_array;
+use super::value::{Flow, V, array, matrix_of, matrix_val, new_dict};
+use super::{Affine, BezPath, Cap, FillRule, Interp, Join, PathEl, Point, Rc, RefCell, parse_num};
+
+impl Interp {
+    pub(super) fn builtin(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
+        // Every handler leaves the stacks untouched when the operator is outside its family.
+        if self.try_stack_op(n)
+            || self.try_arithmetic_op(n)
+            || self.try_logic_op(n)
+            || self.try_control_op(n, src)?
+            || self.try_dictionary_op(n)
+            || self.try_collection_op(n)
+            || self.try_environment_op(n, src)?
+            || self.try_graphics_op(n)?
+            || self.try_coordinate_op(n)
+            || self.try_path_op(n)?
+            || self.try_paint_op(n)?
+        {
+            return Ok(());
+        }
+        match n {
+            // Text (see `text_op`).
+            "scalefont" | "makefont" | "selectfont" | "setfont" | "show" | "charpath" | "glyphshow" | "rootfont" | "currentfont" | "setcachedevice"
+            | "setcharwidth" | "ashow" | "widthshow" | "awidthshow" | "xshow" | "yshow" | "xyshow" | "kshow" | "cshow" | "stringwidth" | "definefont"
+            | "StandardEncoding" | "ISOLatin1Encoding" | "eexec" | "StartData" | "undefinefont" => self.text_op(n, src)?,
+            // Images: operands popped, inline data skipped.
+            "image" | "imagemask" | "colorimage" => {
+                let mut reads_file = false;
+                let check = |v: &V, rf: &mut bool| {
+                    if matches!(v, V::File) || matches!(v, V::Proc(p) if p.iter().any(|x| matches!(x, V::Name(n) if &**n == "currentfile"))) {
+                        *rf = true;
+                    }
+                };
+                if n == "colorimage" {
+                    let ncomp = self.popn().max(1.0) as usize;
+                    let multi = matches!(self.pop(), V::Bool(true));
+                    for _ in 0..if multi { ncomp.min(4) } else { 1 } {
+                        let v = self.pop();
+                        check(&v, &mut reads_file);
+                    }
+                    for _ in 0..4 {
+                        self.pop();
+                    }
+                } else {
+                    match self.pop() {
+                        V::Dict(d) => {
+                            if let Some(ds) = d.borrow().get("DataSource") {
+                                check(ds, &mut reads_file);
+                            }
+                        }
+                        top => {
+                            check(&top, &mut reads_file);
+                            for _ in 0..4 {
+                                self.pop();
+                            }
+                        }
+                    }
+                }
+                if reads_file {
+                    src.skip_image_data();
+                }
+                self.b.skip("image");
+            }
+            _ => {
+                if self.unknown.len() < 32 && !self.unknown.iter().any(|u| u == n) {
+                    self.unknown.push(n.to_string());
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn repeat_proc(&mut self, src: &mut Src) -> Result<(), Flow> {
+        let p = self.pop();
+        let k = self.popn().clamp(0.0, 1e6) as usize;
+        for _ in 0..k {
+            self.spend(1)?;
+            match self.exec_obj(p.clone(), src) {
+                Err(Flow::Exit) => break,
+                r => r?,
+            }
+        }
+
+        Ok(())
+    }
+
+    fn for_proc(&mut self, src: &mut Src) -> Result<(), Flow> {
+        let p = self.pop();
+        let lim = self.popn();
+        let inc = self.popn();
+        let mut i = self.popn();
+        let mut guard = 0;
+        while inc != 0.0 && ((inc > 0.0 && i <= lim) || (inc < 0.0 && i >= lim)) && guard < 1_000_000 {
+            self.spend(1)?;
+            self.push(V::Num(i));
+            match self.exec_obj(p.clone(), src) {
+                Err(Flow::Exit) => break,
+                r => r?,
+            }
+            i += inc;
+            guard += 1;
+        }
+
+        Ok(())
+    }
+
+    fn loop_proc(&mut self, src: &mut Src) -> Result<(), Flow> {
+        let p = self.pop();
+        for _ in 0..1_000_000 {
+            self.spend(1)?;
+            match self.exec_obj(p.clone(), src) {
+                Err(Flow::Exit) => break,
+                r => r?,
+            }
+        }
+
+        Ok(())
+    }
+
+    fn forall_proc(&mut self, src: &mut Src) -> Result<(), Flow> {
+        let p = self.pop();
+        match self.pop() {
+            V::Dict(d) => {
+                let items: Vec<(String, V)> = d.borrow().iter().map(|(k, v)| (k.clone(), v.clone())).collect();
+                for (k, v) in items {
+                    self.spend(1)?;
+                    self.push(V::Lit(k.into()));
+                    self.push(v);
+                    match self.exec_obj(p.clone(), src) {
+                        Err(Flow::Exit) => break,
+                        r => r?,
+                    }
+                }
+            }
+            V::Str(s) => {
+                let bytes = s.borrow().clone();
+                for c in bytes {
+                    self.spend(1)?;
+                    self.push(V::Num(c as f64));
+                    match self.exec_obj(p.clone(), src) {
+                        Err(Flow::Exit) => break,
+                        r => r?,
+                    }
+                }
+            }
+            a => {
+                for v in a.items().unwrap_or_default() {
+                    self.spend(1)?;
+                    self.push(v);
+                    match self.exec_obj(p.clone(), src) {
+                        Err(Flow::Exit) => break,
+                        r => r?,
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    fn try_stack_op(&mut self, n: &str) -> bool {
+        match n {
+            // Stack.
+            "pop" => {
+                self.pop();
+            }
+            "exch" => {
+                let b = self.pop();
+                let a = self.pop();
+                self.push(b);
+                self.push(a);
+            }
+            "dup" => {
+                let a = self.st.last().cloned().unwrap_or(V::Null);
+                self.push(a);
+            }
+            "copy" => {
+                match self.pop() {
+                    V::Num(k) => {
+                        let k = (k.max(0.0) as usize).min(self.st.len());
+                        let tail: Vec<V> = self.st[self.st.len() - k..].to_vec();
+                        self.st.extend(tail);
+                    }
+                    V::Array(dst) => {
+                        let s = self.pop().items().unwrap_or_default();
+                        let mut d = dst.borrow_mut();
+                        for (i, v) in s.into_iter().enumerate() {
+                            if i < d.len() {
+                                d[i] = v;
+                            }
+                        }
+                        drop(d);
+                        self.push(V::Array(dst));
+                    }
+                    other => self.push(other),
+                };
+            }
+            "index" => {
+                let k = self.popn().max(0.0) as usize;
+                let v = if k < self.st.len() { self.st[self.st.len() - 1 - k].clone() } else { V::Null };
+                self.push(v);
+            }
+            "roll" => {
+                let j = self.popn() as i64;
+                let k = (self.popn().max(0.0) as usize).min(self.st.len());
+                if k > 0 {
+                    let s = self.st.len() - k;
+                    let r = j.rem_euclid(k as i64) as usize;
+                    self.st[s..].rotate_right(r);
+                }
+            }
+            "clear" => self.st.clear(),
+            "count" => self.push(V::Num(self.st.len() as f64)),
+            "mark" | "[" | "<<" => self.push(V::Mark),
+            "cleartomark" => {
+                while let Some(v) = self.st.pop() {
+                    if matches!(v, V::Mark) {
+                        break;
+                    }
+                }
+            }
+            "counttomark" => {
+                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
+                self.push(V::Num(k as f64));
+            }
+            "]" => {
+                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
+                let items = self.st.split_off(self.st.len() - k);
+                self.st.pop();
+                self.push(array(items));
+            }
+            ">>" => {
+                let k = self.st.iter().rev().position(|v| matches!(v, V::Mark)).unwrap_or(self.st.len());
+                let items = self.st.split_off(self.st.len() - k);
+                self.st.pop();
+                let d = new_dict();
+                for kv in items.as_chunks::<2>().0 {
+                    d.borrow_mut().insert(kv[0].key(), kv[1].clone());
+                }
+                self.push(V::Dict(d));
+            }
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_arithmetic_op(&mut self, n: &str) -> bool {
+        match n {
+            // Arithmetic.
+            "add" | "sub" | "mul" | "div" | "idiv" | "mod" | "atan" | "exp" | "max" | "min" => {
+                let b = self.popn();
+                let a = self.popn();
+                let v = match n {
+                    "add" => a + b,
+                    "sub" => a - b,
+                    "mul" => a * b,
+                    "div" => {
+                        if b == 0.0 {
+                            0.0
+                        } else {
+                            a / b
+                        }
+                    }
+                    // `checked_*` give 0 both for a zero divisor and for the one overflowing
+                    // case, `i64::MIN / -1` (`/` and `%` panic on it in every build).
+                    "idiv" => (a as i64).checked_div(b as i64).unwrap_or(0) as f64,
+                    "mod" => (a as i64).checked_rem(b as i64).unwrap_or(0) as f64,
+                    "atan" => a.atan2(b).to_degrees().rem_euclid(360.0),
+                    "exp" => a.powf(b),
+                    "max" => a.max(b),
+                    _ => a.min(b),
+                };
+                self.push(V::Num(if v.is_finite() { v } else { 0.0 }));
+            }
+            "neg" | "abs" | "sqrt" | "sin" | "cos" | "ln" | "log" | "cvi" | "cvr" | "round" | "floor" | "ceiling" | "truncate" => {
+                let a = match self.pop() {
+                    V::Str(s) => parse_num(&s.borrow()).unwrap_or(0.0),
+                    v => v.num().unwrap_or(0.0),
+                };
+                let v = match n {
+                    "neg" => -a,
+                    "abs" => a.abs(),
+                    "sqrt" => a.max(0.0).sqrt(),
+                    "sin" => a.to_radians().sin(),
+                    "cos" => a.to_radians().cos(),
+                    "ln" => a.ln(),
+                    "log" => a.log10(),
+                    "cvi" | "truncate" => a.trunc(),
+                    "round" => (a + 0.5).floor(),
+                    "floor" => a.floor(),
+                    "ceiling" => a.ceil(),
+                    _ => a,
+                };
+                self.push(V::Num(if v.is_finite() { v } else { 0.0 }));
+            }
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_logic_op(&mut self, n: &str) -> bool {
+        match n {
+            // Comparison and logic.
+            "eq" | "ne" => {
+                let b = self.pop();
+                let a = self.pop();
+                let eq = match (&a, &b) {
+                    (V::Num(x), V::Num(y)) => x == y,
+                    (V::Bool(x), V::Bool(y)) => x == y,
+                    (V::Null, V::Null) => true,
+                    (V::Array(x), V::Array(y)) => Rc::ptr_eq(x, y),
+                    (V::Dict(x), V::Dict(y)) => Rc::ptr_eq(x, y),
+                    (x, y) => !x.key().is_empty() && x.key() == y.key(),
+                };
+                self.push(V::Bool(eq == (n == "eq")));
+            }
+            "gt" | "ge" | "lt" | "le" => {
+                let b = self.popn();
+                let a = self.popn();
+                self.push(V::Bool(match n {
+                    "gt" => a > b,
+                    "ge" => a >= b,
+                    "lt" => a < b,
+                    _ => a <= b,
+                }));
+            }
+            "not" => match self.pop() {
+                V::Bool(b) => self.push(V::Bool(!b)),
+                v => self.push(V::Num(!(v.num().unwrap_or(0.0) as i64) as f64)),
+            },
+            "and" | "or" | "xor" => {
+                let b = self.pop();
+                let a = self.pop();
+                match (a, b) {
+                    (V::Bool(x), V::Bool(y)) => self.push(V::Bool(match n {
+                        "and" => x && y,
+                        "or" => x || y,
+                        _ => x ^ y,
+                    })),
+                    (x, y) => {
+                        let (x, y) = (x.num().unwrap_or(0.0) as i64, y.num().unwrap_or(0.0) as i64);
+                        self.push(V::Num(match n {
+                            "and" => x & y,
+                            "or" => x | y,
+                            _ => x ^ y,
+                        } as f64));
+                    }
+                }
+            }
+            "true" => self.push(V::Bool(true)),
+            "false" => self.push(V::Bool(false)),
+            "null" => self.push(V::Null),
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_control_op(&mut self, n: &str, src: &mut Src) -> Result<bool, Flow> {
+        match n {
+            // Control.
+            "exec" => {
+                let v = self.pop();
+                self.exec_obj(v, src)?;
+            }
+            "if" => {
+                let p = self.pop();
+                if let V::Bool(true) = self.pop() {
+                    self.exec_obj(p, src)?;
+                }
+            }
+            "ifelse" => {
+                let f = self.pop();
+                let t = self.pop();
+                let c = matches!(self.pop(), V::Bool(true));
+                self.exec_obj(if c { t } else { f }, src)?;
+            }
+            // Each pass of a loop counts against the budget.
+            "repeat" => self.repeat_proc(src)?,
+            "for" => self.for_proc(src)?,
+            "loop" => self.loop_proc(src)?,
+            "forall" => self.forall_proc(src)?,
+            "exit" => return Err(Flow::Exit),
+            "stop" => return Err(Flow::Stop),
+            "stopped" => {
+                let p = self.pop();
+                let stopped = match self.exec_obj(p, src) {
+                    Err(Flow::Quit) => return Err(Flow::Quit),
+                    Err(_) => true,
+                    Ok(()) => false,
+                };
+                self.push(V::Bool(stopped));
+            }
+            "quit" => return Err(Flow::Quit),
+            "showpage" | "copypage" => {}
+            _ => return Ok(false),
+        }
+        Ok(true)
+    }
+
+    fn try_dictionary_op(&mut self, n: &str) -> bool {
+        match n {
+            // Dictionaries.
+            "def" => {
+                let v = self.pop();
+                let k = self.pop().key();
+                if let Some(d) = self.dicts.last() {
+                    d.borrow_mut().insert(k, v);
+                }
+            }
+            "store" => {
+                let v = self.pop();
+                let k = self.pop().key();
+                let d = self.dicts.iter().rev().find(|d| d.borrow().contains_key(&k)).or(self.dicts.last()).cloned();
+                if let Some(d) = d {
+                    d.borrow_mut().insert(k, v);
+                }
+            }
+            "load" => {
+                let k = self.pop().key();
+                let v = self.lookup(&k).unwrap_or(V::Op(k.into()));
+                self.push(v);
+            }
+            "undef" => {
+                let k = self.pop().key();
+                if let V::Dict(d) = self.pop() {
+                    d.borrow_mut().remove(&k);
+                }
+            }
+            "dict" => {
+                self.pop();
+                self.push(V::Dict(new_dict()));
+            }
+            "begin" => {
+                if let V::Dict(d) = self.pop()
+                    && self.dicts.len() < 64
+                {
+                    self.dicts.push(d);
+                }
+            }
+            "end" => {
+                if self.dicts.len() > 1 {
+                    self.dicts.pop();
+                }
+            }
+            "currentdict" => {
+                let d = self.dicts.last().cloned().unwrap_or_else(new_dict);
+                self.push(V::Dict(d));
+            }
+            "userdict" | "globaldict" | "systemdict" | "statusdict" | "errordict" | "$error" => {
+                let d = self.dicts[0].clone();
+                self.push(V::Dict(d));
+            }
+            "where" => {
+                let k = self.pop().key();
+                match self.dicts.iter().rev().find(|d| d.borrow().contains_key(&k)).cloned() {
+                    Some(d) => {
+                        self.push(V::Dict(d));
+                        self.push(V::Bool(true));
+                    }
+                    None => self.push(V::Bool(false)),
+                }
+            }
+            "known" => {
+                let k = self.pop().key();
+                let v = match self.pop() {
+                    V::Dict(d) => d.borrow().contains_key(&k),
+                    _ => false,
+                };
+                self.push(V::Bool(v));
+            }
+            "countdictstack" => self.push(V::Num(self.dicts.len() as f64)),
+            "cleardictstack" => self.dicts.truncate(1),
+            "findresource" | "findfont" | "findencoding" => {
+                let category = if n == "findresource" { self.pop().key() } else { String::new() };
+                let key = self.pop().key();
+                match (n, category.as_str()) {
+                    ("findfont", _) | (_, "Font") => {
+                        let f = self.find_font(&key);
+                        self.push(V::Dict(f));
+                    }
+                    ("findencoding", _) | (_, "Encoding") => self.push(encoding_array(&key)),
+                    _ => self.push(V::Dict(new_dict())),
+                }
+            }
+            "defineresource" => {
+                let category = self.pop().key();
+                let v = self.pop();
+                let key = self.pop().key();
+                if let (V::Dict(d), "Font") = (&v, category.as_str()) {
+                    self.font_dir.insert(key, d.clone());
+                }
+                self.push(v);
+            }
+            "resourcestatus" => {
+                self.pop();
+                self.pop();
+                self.push(V::Bool(false));
+            }
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_collection_op(&mut self, n: &str) -> bool {
+        match n {
+            // Arrays and strings.
+            "array" => {
+                let k = self.popn().clamp(0.0, 1e6) as usize;
+                self.push(array(vec![V::Null; k]));
+            }
+            "string" => {
+                let k = self.popn().clamp(0.0, 1e7) as usize;
+                self.push(V::Str(Rc::new(RefCell::new(vec![0; k]))));
+            }
+            "length" => {
+                let l = match self.pop() {
+                    V::Str(s) => s.borrow().len(),
+                    V::Dict(d) => d.borrow().len(),
+                    V::Name(s) | V::Lit(s) => s.len(),
+                    v => v.items().map_or(0, |i| i.len()),
+                };
+                self.push(V::Num(l as f64));
+            }
+            "get" => {
+                let k = self.pop();
+                let v = match self.pop() {
+                    V::Dict(d) => d.borrow().get(&k.key()).cloned().unwrap_or(V::Null),
+                    V::Str(s) => V::Num(s.borrow().get(k.num().unwrap_or(0.0) as usize).copied().unwrap_or(0) as f64),
+                    a => a.items().and_then(|i| i.get(k.num().unwrap_or(0.0) as usize).cloned()).unwrap_or(V::Null),
+                };
+                self.push(v);
+            }
+            "put" => {
+                let v = self.pop();
+                let k = self.pop();
+                match self.pop() {
+                    V::Dict(d) => {
+                        d.borrow_mut().insert(k.key(), v);
+                    }
+                    V::Array(a) => {
+                        let i = k.num().unwrap_or(0.0) as usize;
+                        if let Some(slot) = a.borrow_mut().get_mut(i) {
+                            *slot = v;
+                        }
+                    }
+                    V::Str(s) => {
+                        let i = k.num().unwrap_or(0.0) as usize;
+                        if let Some(slot) = s.borrow_mut().get_mut(i) {
+                            *slot = v.num().unwrap_or(0.0) as u8;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            "getinterval" => {
+                let c = self.popn().max(0.0) as usize;
+                let i = self.popn().max(0.0) as usize;
+                match self.pop() {
+                    V::Str(s) => {
+                        let b = s.borrow();
+                        let part = b.get(i.min(b.len())..(i + c).min(b.len())).unwrap_or(&[]).to_vec();
+                        drop(b);
+                        self.push(V::Str(Rc::new(RefCell::new(part))));
+                    }
+                    a => {
+                        let items = a.items().unwrap_or_default();
+                        let part = items.get(i.min(items.len())..(i + c).min(items.len())).unwrap_or(&[]).to_vec();
+                        self.push(array(part));
+                    }
+                }
+            }
+            "putinterval" => {
+                self.pop();
+                self.pop();
+                self.pop();
+            }
+            "aload" => {
+                let a = self.pop();
+                for v in a.items().unwrap_or_default() {
+                    self.push(v);
+                }
+                self.push(a);
+            }
+            "astore" => {
+                let a = self.pop();
+                if let V::Array(arr) = &a {
+                    let k = arr.borrow().len().min(self.st.len());
+                    let items = self.st.split_off(self.st.len() - k);
+                    *arr.borrow_mut() = items;
+                }
+                self.push(a);
+            }
+            "cvx" => match self.pop() {
+                V::Array(a) => self.push(V::Proc(Rc::new(a.borrow().clone()))),
+                V::Lit(s) => self.push(V::Name(s)),
+                V::Str(s) => {
+                    // Executable string: tokenize it as a procedure.
+                    let bytes = s.borrow().clone();
+                    let mut sub = Src { d: &bytes, pos: 0 };
+                    let mut body = vec![];
+                    while let Some(t) = sub.token(0) {
+                        body.push(t);
+                    }
+                    self.push(V::Proc(Rc::new(body)));
+                }
+                v => self.push(v),
+            },
+            "cvlit" => match self.pop() {
+                V::Proc(p) => self.push(array(p.as_ref().clone())),
+                V::Name(s) => self.push(V::Lit(s)),
+                v => self.push(v),
+            },
+            "cvn" => {
+                let k = self.pop().key();
+                self.push(V::Lit(k.into()));
+            }
+            "cvs" => {
+                self.pop();
+                let k = self.pop().key();
+                self.push(V::Str(Rc::new(RefCell::new(k.into_bytes()))));
+            }
+            "xcheck" => {
+                let v = self.pop();
+                self.push(V::Bool(matches!(v, V::Proc(_) | V::Name(_) | V::Op(_))));
+            }
+            "type" => {
+                let t = match self.pop() {
+                    V::Num(_) => "realtype",
+                    V::Bool(_) => "booleantype",
+                    V::Name(_) | V::Lit(_) => "nametype",
+                    V::Op(_) => "operatortype",
+                    V::Str(_) => "stringtype",
+                    V::Proc(_) | V::Array(_) => "arraytype",
+                    V::Dict(_) => "dicttype",
+                    V::Mark => "marktype",
+                    V::Null => "nulltype",
+                    V::File => "filetype",
+                };
+                self.push(V::Name(t.into()));
+            }
+            "bind" | "readonly" | "executeonly" | "noaccess" => {}
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_environment_op(&mut self, n: &str, src: &mut Src) -> Result<bool, Flow> {
+        match n {
+            "languagelevel" => self.push(V::Num(3.0)),
+            "version" | "product" => self.push(V::Str(Rc::new(RefCell::new(b"3010".to_vec())))),
+            "save" => {
+                self.spend(self.gs.path.elements().len())?;
+                self.saved.push(self.gs.clone());
+                self.gs.depth = self.b.depth();
+                self.push(V::Null);
+            }
+            "restore" => {
+                self.pop();
+                self.grestore();
+            }
+            "currentfile" => self.push(V::File),
+            "readstring" | "readhexstring" | "readline" => {
+                self.pop();
+                self.pop();
+                self.push(V::Str(Rc::new(RefCell::new(vec![]))));
+                self.push(V::Bool(false));
+            }
+            "flushfile" | "closefile" | "print" | "==" | "=" | "pstack" | "setpagedevice" | "setglobal" | "setpacking" | "setshared" | "setobjectformat"
+            | "setsmoothness" => {
+                if !matches!(n, "pstack") {
+                    self.pop();
+                }
+            }
+            "currentglobal" | "currentpacking" | "currentshared" => self.push(V::Bool(false)),
+            // Operators that return values must push them, or the rest of the program reads a
+            // shifted stack: Illustrator's EPS prolog queries the device this way and then drew
+            // nothing (#955). Values are a plain device's defaults (PostScript Language
+            // Reference, 3rd ed., chapter 8).
+            "currentflat" => self.push(V::Num(1.0)),
+            "currentscreen" => {
+                self.push(V::Num(60.0));
+                self.push(V::Num(45.0));
+                self.push(V::Proc(Rc::new(vec![])));
+            }
+            "currentblackgeneration" | "currentundercolorremoval" | "currenttransfer" => self.push(V::Proc(Rc::new(vec![]))),
+            "currentcolortransfer" => {
+                for _ in 0..4 {
+                    self.push(V::Proc(Rc::new(vec![])));
+                }
+            }
+            "currentpagedevice" | "currenthalftone" | "currentsystemparams" | "currentuserparams" | "currentdevparams" => {
+                if n == "currentdevparams" {
+                    self.pop();
+                }
+                self.push(V::Dict(new_dict()));
+            }
+            "setuserparams" | "setsystemparams" | "setcolortransfer" | "setblackgeneration" | "setundercolorremoval" => {
+                let k = if n == "setcolortransfer" { 4 } else { 1 };
+                for _ in 0..k {
+                    self.pop();
+                }
+            }
+            // `file status` → false; `string status` → false (no such file).
+            "status" => {
+                self.pop();
+                self.push(V::Bool(false));
+            }
+            "dictstack" => {
+                self.pop();
+                let ds: Vec<V> = self.dicts.iter().map(|d| V::Dict(d.clone())).collect();
+                self.push(array(ds));
+            }
+            "maxlength" => {
+                let k = match self.pop() {
+                    V::Dict(d) => d.borrow().len(),
+                    _ => 0,
+                };
+                self.push(V::Num(k.saturating_add(16) as f64));
+            }
+            "internaldict" => {
+                self.pop();
+                let d = self.dicts[0].clone();
+                self.push(V::Dict(d));
+            }
+            "undefineresource" => {
+                self.pop();
+                self.pop();
+            }
+            // `[ … /Name pdfmark`: a Distiller annotation; other interpreters discard it.
+            "pdfmark" => {
+                while let Some(v) = self.st.pop() {
+                    if matches!(v, V::Mark) {
+                        break;
+                    }
+                }
+            }
+            // `source [params] /Name filter`. A SubFileDecode of the current file with a count of
+            // 0 reads to its end-of-data string: skip that data (an embedded XMP packet, which
+            // otherwise ran as PostScript). Other filters read what their source reads.
+            "filter" => {
+                let name = self.pop().key();
+                let mut skipped = false;
+                let source = if name == "SubFileDecode" && !matches!(self.st.last(), Some(V::Dict(_))) {
+                    let eod = match self.pop() {
+                        V::Str(s) => s.borrow().clone(),
+                        _ => vec![],
+                    };
+                    let count = self.popn();
+                    let source = self.pop();
+                    if matches!(source, V::File) && count == 0.0 && !eod.is_empty() {
+                        src.pos = match find_from(src.d, &eod, src.pos) {
+                            Some(p) => p.saturating_add(eod.len()),
+                            None => src.d.len(),
+                        };
+                        skipped = true;
+                    }
+                    source
+                } else {
+                    if matches!(self.st.last(), Some(V::Dict(_))) {
+                        self.pop();
+                    }
+                    self.pop()
+                };
+                // Data already stepped over leaves nothing for `image` to skip.
+                self.push(if skipped { V::Null } else { source });
+            }
+            "vmstatus" => {
+                for _ in 0..3 {
+                    self.push(V::Num(0.0));
+                }
+            }
+            _ => return Ok(false),
+        }
+        Ok(true)
+    }
+
+    fn try_graphics_op(&mut self, n: &str) -> Result<bool, Flow> {
+        match n {
+            // Graphics state.
+            "gsave" => {
+                self.spend(self.gs.path.elements().len())?;
+                let mut g = self.gs.clone();
+                g.depth = self.b.depth();
+                self.saved.push(g);
+            }
+            "grestore" => self.grestore(),
+            "grestoreall" => {
+                while !self.saved.is_empty() {
+                    self.grestore();
+                }
+            }
+            "initgraphics" => {
+                self.gs.ctm = Affine::IDENTITY;
+                self.gs.lw = 1.0;
+                self.gs.color = [0.0; 3];
+            }
+            "setlinewidth" => self.gs.lw = self.popn(),
+            "currentlinewidth" => self.push(V::Num(self.gs.lw)),
+            "setlinecap" => self.gs.cap = [Cap::Butt, Cap::Round, Cap::Square][(self.popn().max(0.0) as usize).min(2)],
+            "setlinejoin" => self.gs.join = [Join::Miter, Join::Round, Join::Bevel][(self.popn().max(0.0) as usize).min(2)],
+            "setmiterlimit" => self.gs.miter = self.popn(),
+            "setdash" => {
+                let off = self.popn();
+                let a: Vec<f64> = self.pop().items().unwrap_or_default().iter().filter_map(V::num).collect();
+                self.gs.dash = (!a.is_empty() && a.iter().any(|v| *v > 0.0)).then_some((a, off));
+            }
+            "setflat" | "setstrokeadjust" | "setoverprint" | "setrenderingintent" | "setcolorrendering" | "sethalftone" | "settransfer" => {
+                self.pop();
+            }
+            // frequency angle proc
+            "setscreen" => {
+                for _ in 0..3 {
+                    self.pop();
+                }
+            }
+            "setgray" => {
+                let g = self.popn().clamp(0.0, 1.0);
+                self.gs.color = [g; 3];
+            }
+            "setrgbcolor" => {
+                let b = self.popn();
+                let g = self.popn();
+                let r = self.popn();
+                self.gs.color = [r, g, b].map(|v| v.clamp(0.0, 1.0));
+            }
+            "sethsbcolor" => {
+                let v = self.popn().clamp(0.0, 1.0);
+                let s = self.popn().clamp(0.0, 1.0);
+                let h = self.popn().rem_euclid(1.0) * 6.0;
+                let (i, f) = (h.floor() as i32, h.fract());
+                let (p, q, t) = (v * (1.0 - s), v * (1.0 - s * f), v * (1.0 - s * (1.0 - f)));
+                self.gs.color = match i {
+                    0 => [v, t, p],
+                    1 => [q, v, p],
+                    2 => [p, v, t],
+                    3 => [p, q, v],
+                    4 => [t, p, v],
+                    _ => [v, p, q],
+                };
+            }
+            "setcmykcolor" => {
+                let k = self.popn().clamp(0.0, 1.0);
+                let y = self.popn().clamp(0.0, 1.0);
+                let m = self.popn().clamp(0.0, 1.0);
+                let c = self.popn().clamp(0.0, 1.0);
+                self.gs.color = [(1.0 - c) * (1.0 - k), (1.0 - m) * (1.0 - k), (1.0 - y) * (1.0 - k)];
+            }
+            "setcolorspace" => {
+                self.pop();
+            }
+            "setcolor" => {
+                // Device colour by operand count (patterns are not drawn).
+                let k = self.st.iter().rev().take_while(|v| matches!(v, V::Num(_))).count().min(4);
+                let c: Vec<f64> = self.st.split_off(self.st.len() - k).iter().filter_map(V::num).collect();
+                self.gs.color = match c.len() {
+                    1 => [c[0]; 3],
+                    3 => [c[0], c[1], c[2]],
+                    4 => [(1.0 - c[0]) * (1.0 - c[3]), (1.0 - c[1]) * (1.0 - c[3]), (1.0 - c[2]) * (1.0 - c[3])],
+                    _ => self.gs.color,
+                };
+            }
+            "currentgray" => self.push(V::Num((self.gs.color[0] + self.gs.color[1] + self.gs.color[2]) / 3.0)),
+            "currentrgbcolor" => {
+                for c in self.gs.color {
+                    self.push(V::Num(c));
+                }
+            }
+            _ => return Ok(false),
+        }
+        Ok(true)
+    }
+
+    fn try_coordinate_op(&mut self, n: &str) -> bool {
+        match n {
+            // Coordinates.
+            "matrix" => self.push(matrix_val(Affine::IDENTITY)),
+            "identmatrix" | "defaultmatrix" => {
+                self.pop();
+                self.push(matrix_val(Affine::IDENTITY));
+            }
+            "currentmatrix" => {
+                self.pop();
+                self.push(matrix_val(self.gs.ctm));
+            }
+            "setmatrix" => {
+                let m = self.pop();
+                self.gs.ctm = matrix_of(&m).unwrap_or(Affine::IDENTITY);
+            }
+            "concat" => {
+                let m = self.pop();
+                if let Some(m) = matrix_of(&m) {
+                    self.gs.ctm *= m;
+                }
+            }
+            "concatmatrix" => {
+                self.pop();
+                let b = self.pop();
+                let a = self.pop();
+                let (a, b) = (matrix_of(&a).unwrap_or(Affine::IDENTITY), matrix_of(&b).unwrap_or(Affine::IDENTITY));
+                self.push(matrix_val(b * a));
+            }
+            "invertmatrix" => {
+                self.pop();
+                let a = self.pop();
+                self.push(matrix_val(matrix_of(&a).unwrap_or(Affine::IDENTITY).inverse()));
+            }
+            "translate" | "scale" => {
+                let top = self.pop();
+                let (m_out, y) = match top {
+                    V::Array(_) => (Some(top), self.popn()),
+                    v => (None, v.num().unwrap_or(0.0)),
+                };
+                let x = self.popn();
+                let t = if n == "translate" { Affine::translate((x, y)) } else { Affine::scale_non_uniform(x, y) };
+                match m_out {
+                    Some(_) => self.push(matrix_val(t)),
+                    None => self.gs.ctm *= t,
+                }
+            }
+            "rotate" => {
+                let top = self.pop();
+                match top {
+                    V::Array(_) => {
+                        let a = self.popn();
+                        self.push(matrix_val(Affine::rotate(a.to_radians())));
+                    }
+                    v => self.gs.ctm *= Affine::rotate(v.num().unwrap_or(0.0).to_radians()),
+                }
+            }
+            "transform" | "itransform" | "dtransform" | "idtransform" => {
+                let top = self.pop();
+                let (m, y) = match top {
+                    V::Array(_) | V::Proc(_) => (matrix_of(&top).unwrap_or(Affine::IDENTITY), self.popn()),
+                    v => (self.gs.ctm, v.num().unwrap_or(0.0)),
+                };
+                let x = self.popn();
+                let m = if n.starts_with('i') { m.inverse() } else { m };
+                let p = if n.contains('d') {
+                    let c = m.as_coeffs();
+                    Point::new(c[0] * x + c[2] * y, c[1] * x + c[3] * y)
+                } else {
+                    m * Point::new(x, y)
+                };
+                self.push(V::Num(p.x));
+                self.push(V::Num(p.y));
+            }
+            _ => return false,
+        }
+        true
+    }
+
+    fn try_path_op(&mut self, n: &str) -> Result<bool, Flow> {
+        match n {
+            // Paths.
+            "newpath" => {
+                self.gs.path = BezPath::new();
+                self.gs.cur = None;
+                self.gs.start = None;
+            }
+            "moveto" => {
+                let p = self.user_point();
+                self.move_to(p)?;
+            }
+            "rmoveto" => {
+                let d = self.user_point();
+                let c = self.current_user();
+                self.move_to(Point::new(c.x + d.x, c.y + d.y))?;
+            }
+            "lineto" => {
+                let p = self.user_point();
+                self.line_to(p)?;
+            }
+            "rlineto" => {
+                let d = self.user_point();
+                let c = self.current_user();
+                self.line_to(Point::new(c.x + d.x, c.y + d.y))?;
+            }
+            "curveto" | "rcurveto" => {
+                let p3 = self.user_point();
+                let p2 = self.user_point();
+                let p1 = self.user_point();
+                if n == "rcurveto" {
+                    let c = self.current_user();
+                    let o = |p: Point| Point::new(c.x + p.x, c.y + p.y);
+                    self.curve_to(o(p1), o(p2), o(p3))?;
+                } else {
+                    self.curve_to(p1, p2, p3)?;
+                }
+            }
+            "closepath" => {
+                if self.gs.cur.is_some() {
+                    self.room(1)?;
+                    self.gs.path.close_path();
+                    self.gs.cur = self.gs.start;
+                }
+            }
+            "arc" => self.arc(false)?,
+            "arcn" => self.arc(true)?,
+            "currentpoint" => {
+                let c = self.current_user();
+                self.push(V::Num(c.x));
+                self.push(V::Num(c.y));
+            }
+            "pathbbox" => {
+                self.spend(self.gs.path.elements().len())?;
+                let r = kurbo::Shape::bounding_box(&self.gs.path);
+                let inv = self.gs.ctm.inverse();
+                let (a, b) = (inv * Point::new(r.x0, r.y0), inv * Point::new(r.x1, r.y1));
+                for v in [a.x.min(b.x), a.y.min(b.y), a.x.max(b.x), a.y.max(b.y)] {
+                    self.push(V::Num(v));
+                }
+            }
+            "flattenpath" | "reversepath" | "strokepath" | "initclip" => {}
+            "clippath" => {
+                let p = self.page;
+                self.gs.path = kurbo::Shape::to_path(&kurbo::Rect::new(p[0], p[1], p[2], p[3]), 0.1);
+            }
+            _ => return Ok(false),
+        }
+        Ok(true)
+    }
+
+    fn try_paint_op(&mut self, n: &str) -> Result<bool, Flow> {
+        match n {
+            // Painting.
+            "fill" => self.paint(Some(FillRule::NonZero), false),
+            "eofill" => self.paint(Some(FillRule::EvenOdd), false),
+            "stroke" => self.paint(None, true),
+            "clip" | "eoclip" => {
+                let rule = if n == "clip" { FillRule::NonZero } else { FillRule::EvenOdd };
+                self.spend(self.gs.path.elements().len())?;
+                let p = self.gs.path.clone();
+                if !p.elements().iter().all(|e| matches!(e, PathEl::MoveTo(_))) {
+                    self.b.clip(p, rule);
+                }
+            }
+            "rectfill" | "rectstroke" | "rectclip" => {
+                let paths = self.rect_path()?;
+                if n == "rectstroke" && matches!(self.st.last(), Some(V::Array(_))) {
+                    self.pop();
+                }
+                let mut all = BezPath::new();
+                for p in paths {
+                    all.extend(p);
+                }
+                match n {
+                    "rectclip" => self.b.clip(all, FillRule::NonZero),
+                    _ => {
+                        let saved = std::mem::replace(&mut self.gs.path, all);
+                        self.paint(if n == "rectfill" { Some(FillRule::NonZero) } else { None }, n == "rectstroke");
+                        self.gs.path = saved;
+                    }
+                }
+            }
+            "shfill" => {
+                self.pop();
+                self.b.skip("smooth shading (shfill)");
+            }
+            _ => return Ok(false),
+        }
+        Ok(true)
+    }
+}
diff --git a/crates/pdf/src/ps/eps.rs b/crates/pdf/src/ps/eps.rs
new file mode 100644
index 000000000..90d60cfbe
--- /dev/null
+++ b/crates/pdf/src/ps/eps.rs
@@ -0,0 +1,79 @@
+use super::{HashMap, Rc, is_white};
+
+/// The PostScript section of an EPS file (DOS EPS binary header handled) and its bounding box
+/// (`%%HiResBoundingBox` preferred).
+pub fn eps_parts(bytes: &[u8]) -> Option<(&[u8], [f64; 4])> {
+    let ps = if bytes.starts_with(&[0xC5, 0xD0, 0xD3, 0xC6]) && bytes.len() >= 12 {
+        let off = u32::from_le_bytes([bytes[4], bytes[5], bytes[6], bytes[7]]) as usize;
+        let len = u32::from_le_bytes([bytes[8], bytes[9], bytes[10], bytes[11]]) as usize;
+        bytes.get(off..off.checked_add(len)?.min(bytes.len()))?
+    } else {
+        bytes
+    };
+    let find_box = |key: &[u8]| -> Option<[f64; 4]> {
+        let mut from = 0;
+        while let Some(p) = ps[from..].windows(key.len()).position(|w| w == key) {
+            let s = from + p + key.len();
+            let e = ps[s..].iter().position(|c| matches!(c, b'\n' | b'\r')).map_or(ps.len(), |q| s + q);
+            let v: Vec<f64> = String::from_utf8_lossy(&ps[s..e]).split_whitespace().filter_map(|t| t.parse().ok()).collect();
+            if v.len() == 4 && v[2] > v[0] && v[3] > v[1] {
+                return Some([v[0], v[1], v[2], v[3]]);
+            }
+            from = s;
+        }
+        None
+    };
+    let bbox = find_box(b"%%HiResBoundingBox:").or_else(|| find_box(b"%%BoundingBox:"))?;
+    Some((ps, bbox))
+}
+
+pub(super) fn find_from(hay: &[u8], needle: &[u8], from: usize) -> Option<usize> {
+    hay.get(from..)?.windows(needle.len()).position(|w| w == needle).map(|p| p + from)
+}
+
+fn rfind_before(hay: &[u8], needle: &[u8], to: usize) -> Option<usize> {
+    hay.get(..to)?.windows(needle.len()).rposition(|w| w == needle)
+}
+
+/// The name after `key` (`/FontName /Name`).
+fn name_after(b: &[u8], key: &[u8]) -> Option<String> {
+    let p = find_from(b, key, 0)? + key.len();
+    let rest = &b[p..];
+    let s = rest.iter().position(|c| *c == b'/')? + 1;
+    let e = rest[s..].iter().position(|c| is_white(*c) || matches!(c, b'/' | b'[' | b'(' | b'{')).map_or(rest.len(), |q| s + q);
+    (e > s).then(|| String::from_utf8_lossy(&rest[s..e]).into_owned())
+}
+
+/// Embedded font programs of an EPS file: Type 1 fonts (`… /FontName /X … currentfile eexec
+/// … cleartomark`, hexadecimal or binary) and CFF font sets (`… <length> StartData <bytes>`).
+pub(super) fn embedded_fonts(ps: &[u8]) -> HashMap<String, (Rc<Vec<u8>>, bool)> {
+    let mut out = HashMap::new();
+    let mut from = 0;
+    while let Some(ee) = find_from(ps, b"eexec", from) {
+        from = ee + 5;
+        let start = [b"%!PS-AdobeFont".as_slice(), b"%!FontType1"]
+            .iter()
+            .filter_map(|h| rfind_before(ps, h, ee))
+            .max()
+            .or_else(|| rfind_before(ps, b"/FontName", ee).map(|p| p.saturating_sub(512)));
+        let Some(start) = start else { continue };
+        let end = find_from(ps, b"cleartomark", ee).map_or(ps.len(), |p| p + 11);
+        if let Some(name) = name_after(&ps[start..ee], b"/FontName") {
+            out.insert(name, (Rc::new(ps[start..end].to_vec()), false));
+        }
+        from = end;
+    }
+    let mut from = 0;
+    while let Some(sd) = find_from(ps, b"StartData", from) {
+        from = sd + 9;
+        let head = String::from_utf8_lossy(&ps[sd.saturating_sub(64)..sd]).into_owned();
+        let Some(len) = head.split_whitespace().last().and_then(|t| t.parse::<usize>().ok()) else { continue };
+        let s = sd + 10;
+        let Some(data) = ps.get(s..s.saturating_add(len)) else { continue };
+        if let Some(name) = crate::cff::font_name(data) {
+            out.insert(name, (Rc::new(data.to_vec()), true));
+        }
+        from = s + len;
+    }
+    out
+}
diff --git a/crates/pdf/src/ps/exec.rs b/crates/pdf/src/ps/exec.rs
new file mode 100644
index 000000000..27697527c
--- /dev/null
+++ b/crates/pdf/src/ps/exec.rs
@@ -0,0 +1,172 @@
+use super::eps::embedded_fonts;
+use super::scanner::Src;
+use super::value::{Flow, GState, V, new_dict};
+use super::{Affine, BezPath, Builder, Cap, HashMap, Interp, Join};
+
+/// The deepest procedure nesting run (deeper recursion stops the program).
+const MAX_CALL_DEPTH: usize = 256;
+
+impl Interp {
+    pub fn new(page: [f64; 4]) -> Interp {
+        Interp {
+            b: Builder::new(),
+            st: vec![],
+            dicts: vec![new_dict()],
+            gs: GState {
+                ctm: Affine::IDENTITY,
+                color: [0.0; 3],
+                lw: 1.0,
+                cap: Cap::Butt,
+                join: Join::Miter,
+                miter: 10.0,
+                dash: None,
+                path: BezPath::new(),
+                cur: None,
+                start: None,
+                depth: 1,
+                font: None,
+            },
+            saved: vec![],
+            budget: 8_000_000,
+            calls: 0,
+            font_dir: HashMap::new(),
+            embedded: HashMap::new(),
+            font_cache: HashMap::new(),
+            page,
+            unknown: vec![],
+        }
+    }
+
+    pub fn run(&mut self, data: &[u8]) {
+        self.embedded = embedded_fonts(data);
+        let mut src = Src { d: data, pos: 0 };
+        while let Some(t) = src.token(0) {
+            if let Err(Flow::Quit) = self.exec_token(t, &mut src) {
+                break;
+            }
+        }
+    }
+
+    pub(super) fn pop(&mut self) -> V {
+        self.st.pop().unwrap_or(V::Null)
+    }
+
+    pub(super) fn popn(&mut self) -> f64 {
+        self.pop().num().unwrap_or(0.0)
+    }
+
+    pub(super) fn push(&mut self, v: V) {
+        if self.st.len() < 100_000 {
+            self.st.push(v);
+        }
+    }
+
+    pub(super) fn lookup(&self, k: &str) -> Option<V> {
+        self.dicts.iter().rev().find_map(|d| d.borrow().get(k).cloned())
+    }
+
+    /// A token read from the file: procedures are pushed, names executed.
+    fn exec_token(&mut self, t: V, src: &mut Src) -> Result<(), Flow> {
+        match t {
+            V::Name(n) => self.exec_name(&n, src),
+            other => {
+                self.push(other);
+                Ok(())
+            }
+        }
+    }
+
+    /// Execute a value as an object (procedures run).
+    pub(super) fn exec_obj(&mut self, v: V, src: &mut Src) -> Result<(), Flow> {
+        match v {
+            V::Proc(p) => {
+                if self.calls >= MAX_CALL_DEPTH {
+                    self.b.skip("PostScript (recursion limit)");
+                    return Err(Flow::Quit);
+                }
+                self.calls += 1;
+                let mut r = Ok(());
+                for x in p.iter() {
+                    match x {
+                        V::Name(n) => {
+                            r = self.exec_name(n, src);
+                            if r.is_err() {
+                                break;
+                            }
+                        }
+                        V::Op(op) => {
+                            r = self.spend(1).and_then(|()| self.builtin(op, src));
+                            if r.is_err() {
+                                break;
+                            }
+                        }
+                        // Other items count against the budget as names do.
+                        other => {
+                            r = self.spend(1);
+                            if r.is_err() {
+                                break;
+                            }
+                            self.push(other.clone());
+                        }
+                    }
+                }
+                self.calls -= 1;
+                r
+            }
+            // An executable name can run another (`exec` of `/exec cvx`), so names count too.
+            V::Name(n) => {
+                if self.calls >= MAX_CALL_DEPTH {
+                    self.b.skip("PostScript (recursion limit)");
+                    return Err(Flow::Quit);
+                }
+                self.calls += 1;
+                let r = self.exec_name(&n, src);
+                self.calls -= 1;
+                r
+            }
+            V::Op(op) => {
+                self.spend(1)?;
+                self.builtin(&op, src)
+            }
+            other => {
+                self.push(other);
+                Ok(())
+            }
+        }
+    }
+
+    fn exec_name(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
+        self.spend(1)?;
+        if let Some(v) = self.lookup(n) {
+            return match v {
+                V::Proc(_) => self.exec_obj(v, src),
+                // An operator stored under another name (`/mo /moveto load def`, as Illustrator's
+                // EPS prolog does for every path operator) runs that operator. It pushed the
+                // operator's name instead, so such files drew nothing (#955).
+                V::Op(op) => self.builtin(&op, src),
+                // An executable name (`/y /x cvx def`) runs what that name is bound to.
+                V::Name(_) => self.exec_obj(v, src),
+                other => {
+                    self.push(other);
+                    Ok(())
+                }
+            };
+        }
+        self.builtin(n, src)
+    }
+
+    /// Count `n` operations against the budget, and stop the program when fewer are left. An
+    /// operator that makes, reads or copies path elements counts each one as an operation.
+    pub(super) fn spend(&mut self, n: usize) -> Result<(), Flow> {
+        match self.budget.checked_sub(n) {
+            Some(left) => {
+                self.budget = left;
+                Ok(())
+            }
+            None => {
+                self.b.skip("PostScript (operation limit)");
+                Err(Flow::Quit)
+            }
+        }
+    }
+}
diff --git a/crates/pdf/src/ps/paths.rs b/crates/pdf/src/ps/paths.rs
new file mode 100644
index 000000000..b1fe07092
--- /dev/null
+++ b/crates/pdf/src/ps/paths.rs
@@ -0,0 +1,187 @@
+use super::value::{Flow, V};
+use super::{Affine, BezPath, FillRule, Interp, MAX_PATH, Paint, PathEl, Point, Stroke};
+
+/// The angle from `a` counterclockwise to `b` (degrees, 0 to 360), worked out from what is left
+/// of each after whole turns.
+fn ccw_turn(a: f64, b: f64) -> f64 {
+    (b % 360.0 - a % 360.0).rem_euclid(360.0)
+}
+
+/// The most turns one `arc` or `arcn` draws.
+const MAX_ARC_TURNS: f64 = 1024.0;
+
+impl Interp {
+    fn device_scale(&self) -> f64 {
+        self.gs.ctm.determinant().abs().sqrt()
+    }
+
+    pub(super) fn user_point(&mut self) -> Point {
+        let y = self.popn();
+        let x = self.popn();
+        Point::new(x, y)
+    }
+
+    /// Stop the program when a path of `len` elements would be longer than [`MAX_PATH`].
+    fn path_fits(&mut self, len: usize) -> Result<(), Flow> {
+        if len <= MAX_PATH {
+            return Ok(());
+        }
+        self.b.skip("PostScript (path limit)");
+        Err(Flow::Quit)
+    }
+
+    /// [`Self::path_fits`] for the current path with `n` more elements.
+    pub(super) fn room(&mut self, n: usize) -> Result<(), Flow> {
+        self.path_fits(self.gs.path.elements().len().saturating_add(n))
+    }
+
+    pub(super) fn move_to(&mut self, p: Point) -> Result<(), Flow> {
+        // A moveto right after a moveto replaces it (PostScript Language Reference §8.2, `moveto`).
+        if matches!(self.gs.path.elements().last(), Some(PathEl::MoveTo(_))) {
+            self.gs.path.pop();
+        }
+        self.room(1)?;
+        let q = self.gs.ctm * p;
+        self.gs.path.move_to(q);
+        self.gs.cur = Some(q);
+        self.gs.start = Some(q);
+        Ok(())
+    }
+
+    pub(super) fn line_to(&mut self, p: Point) -> Result<(), Flow> {
+        self.room(1 + usize::from(self.gs.cur.is_none()))?;
+        let q = self.gs.ctm * p;
+        if self.gs.cur.is_none() {
+            self.gs.path.move_to(q);
+            self.gs.start = Some(q);
+        }
+        self.gs.path.line_to(q);
+        self.gs.cur = Some(q);
+        Ok(())
+    }
+
+    pub(super) fn curve_to(&mut self, a: Point, b: Point, c: Point) -> Result<(), Flow> {
+        self.room(1 + usize::from(self.gs.cur.is_none()))?;
+        let m = self.gs.ctm;
+        if self.gs.cur.is_none() {
+            self.gs.path.move_to(m * a);
+        }
+        self.gs.path.curve_to(m * a, m * b, m * c);
+        self.gs.cur = Some(m * c);
+        Ok(())
+    }
+
+    pub(super) fn current_user(&self) -> Point {
+        self.gs.ctm.inverse() * self.gs.cur.unwrap_or_default()
+    }
+
+    pub(super) fn arc(&mut self, neg: bool) -> Result<(), Flow> {
+        let a2 = self.popn();
+        let a1 = self.popn();
+        let r = self.popn();
+        let c = self.user_point();
+        // `arc` raises `a2` by multiples of 360 until it is at least `a1`, and `arcn` lowers it
+        // until it is at most `a1` (PostScript Language Reference §8.2, `arc` and `arcn`). Those
+        // sweeps, and the first endpoint, are worked out from what is left of each angle after
+        // whole turns.
+        let sweep = if !neg && a2 < a1 {
+            ccw_turn(a1, a2)
+        } else if neg && a2 > a1 {
+            -ccw_turn(a2, a1)
+        } else {
+            a2 - a1
+        };
+        // A sweep of more than `MAX_ARC_TURNS` turns is shortened by whole pairs of turns to
+        // between `MAX_ARC_TURNS - 2` and `MAX_ARC_TURNS` turns, with a skip note. The arc still
+        // ends at `a2`, and an even-odd fill or clip of it covers the same area as the full sweep.
+        let max = MAX_ARC_TURNS * 360.0;
+        let sweep = if sweep.abs() > max {
+            self.b.skip("arc (too many turns)");
+            let s = sweep.signum();
+            s * (max - 720.0 + (s * (a2 % 720.0 - a1 % 720.0)).rem_euclid(720.0))
+        } else {
+            sweep
+        };
+        let (a1, sweep) = ((a1 % 360.0).to_radians(), sweep.to_radians());
+        let start = Point::new(c.x + r * a1.cos(), c.y + r * a1.sin());
+        if self.gs.cur.is_some() {
+            self.line_to(start)?;
+        } else {
+            self.move_to(start)?;
+        }
+        let arc = kurbo::Arc::new(c, (r, r), a1, sweep, 0.0);
+        let m = self.gs.ctm;
+        // kurbo divides an arc into more curves the larger the radius (about 3.7 × 10^49 for a
+        // quarter turn at a radius of 10^300, more than a usize can count), so each one counts
+        // against the budget and the path limit.
+        let mut curves = arc.append_iter(0.1);
+        while let Some(PathEl::CurveTo(p1, p2, p3)) = curves.next() {
+            self.room(1)?;
+            self.spend(1)?;
+            self.gs.path.curve_to(m * p1, m * p2, m * p3);
+            self.gs.cur = Some(m * p3);
+        }
+        Ok(())
+    }
+
+    pub(super) fn paint(&mut self, fill: Option<FillRule>, stroke: bool) {
+        let path = std::mem::take(&mut self.gs.path);
+        self.gs.cur = None;
+        self.gs.start = None;
+        let s = self.device_scale();
+        let st = stroke.then(|| Stroke {
+            paint: Paint::Color(self.gs.color),
+            opacity: 1.0,
+            width: if self.gs.lw <= 0.0 { 1.0 } else { self.gs.lw * s },
+            cap: self.gs.cap,
+            join: self.gs.join,
+            miter: self.gs.miter.max(1.0),
+            dash: self.gs.dash.as_ref().map(|(a, o)| (a.iter().map(|v| v * s).collect(), o * s)),
+        });
+        self.b.fill_stroke(path, Affine::IDENTITY, fill.map(|r| (Paint::Color(self.gs.color), 1.0, r)), st);
+    }
+
+    pub(super) fn rect_path(&mut self) -> Result<Vec<BezPath>, Flow> {
+        // x y w h, or an array / string of numbers.
+        let top = self.pop();
+        let nums: Vec<f64> = match &top {
+            V::Array(_) | V::Proc(_) => {
+                let items = top.items().unwrap_or_default();
+                // An array's rectangles count against the budget, five path elements each.
+                self.spend(items.len() / 4 * 5)?;
+                items.iter().filter_map(V::num).collect()
+            }
+            V::Num(h) => {
+                let w = self.popn();
+                let y = self.popn();
+                let x = self.popn();
+                vec![x, y, w, *h]
+            }
+            _ => vec![],
+        };
+        self.path_fits(nums.len() / 4 * 5)?;
+        let m = self.gs.ctm;
+        Ok(nums
+            .as_chunks::<4>()
+            .0
+            .iter()
+            .map(|r| {
+                let mut p = BezPath::new();
+                p.move_to(m * Point::new(r[0], r[1]));
+                p.line_to(m * Point::new(r[0] + r[2], r[1]));
+                p.line_to(m * Point::new(r[0] + r[2], r[1] + r[3]));
+                p.line_to(m * Point::new(r[0], r[1] + r[3]));
+                p.close_path();
+                p
+            })
+            .collect())
+    }
+
+    pub(super) fn grestore(&mut self) {
+        if let Some(g) = self.saved.pop() {
+            let d = g.depth;
+            self.gs = g;
+            self.b.close_to(d);
+        }
+    }
+}
diff --git a/crates/pdf/src/ps/scanner.rs b/crates/pdf/src/ps/scanner.rs
new file mode 100644
index 000000000..59933e214
--- /dev/null
+++ b/crates/pdf/src/ps/scanner.rs
@@ -0,0 +1,223 @@
+use super::value::V;
+use super::{Rc, RefCell, ascii85, is_white, parse_num};
+
+/// Source tokenizer (the data source for `currentfile`).
+pub(super) struct Src<'a> {
+    pub(super) d: &'a [u8],
+    pub(crate) pos: usize,
+}
+
+impl Src<'_> {
+    fn skip_ws(&mut self) {
+        while self.pos < self.d.len() {
+            let c = self.d[self.pos];
+            if is_white(c) {
+                self.pos += 1;
+            } else if c == b'%' {
+                let s = self.pos;
+                while self.pos < self.d.len() && !matches!(self.d[self.pos], b'\n' | b'\r') {
+                    self.pos += 1;
+                }
+                // DSC: skip embedded binary / data sections.
+                let line = &self.d[s..self.pos];
+                if line.starts_with(b"%%BeginData:") || line.starts_with(b"%%BeginBinary:") || line.starts_with(b"%%BeginPreview") {
+                    let end: &[u8] = if line.starts_with(b"%%BeginData:") {
+                        b"%%EndData"
+                    } else if line.starts_with(b"%%BeginBinary:") {
+                        b"%%EndBinary"
+                    } else {
+                        b"%%EndPreview"
+                    };
+                    match self.d[self.pos..].windows(end.len()).position(|w| w == end) {
+                        Some(p) => self.pos += p,
+                        None => self.pos = self.d.len(),
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+    }
+
+    fn word(&mut self) -> &[u8] {
+        let s = self.pos;
+        while self.pos < self.d.len() {
+            let c = self.d[self.pos];
+            if is_white(c) || matches!(c, b'(' | b')' | b'<' | b'>' | b'[' | b']' | b'{' | b'}' | b'/' | b'%') {
+                break;
+            }
+            self.pos += 1;
+        }
+        &self.d[s..self.pos]
+    }
+
+    /// The next token; `{ … }` comes back as a whole procedure.
+    pub(super) fn token(&mut self, depth: usize) -> Option<V> {
+        self.skip_ws();
+        let c = *self.d.get(self.pos)?;
+        Some(match c {
+            b'{' => {
+                self.pos += 1;
+                let mut body = vec![];
+                loop {
+                    self.skip_ws();
+                    match self.d.get(self.pos) {
+                        None => break,
+                        Some(b'}') => {
+                            self.pos += 1;
+                            break;
+                        }
+                        _ => {
+                            if depth > 100 {
+                                return None;
+                            }
+                            match self.token(depth + 1) {
+                                Some(t) => body.push(t),
+                                None => break,
+                            }
+                        }
+                    }
+                }
+                V::Proc(Rc::new(body))
+            }
+            b'}' => {
+                self.pos += 1;
+                V::Null
+            }
+            b'/' => {
+                self.pos += 1;
+                let imm = self.d.get(self.pos) == Some(&b'/');
+                if imm {
+                    self.pos += 1;
+                }
+                let w = String::from_utf8_lossy(self.word()).into_owned();
+                // `//name` (immediately evaluated) is treated like a plain name.
+                if imm { V::Name(w.into()) } else { V::Lit(w.into()) }
+            }
+            b'(' => {
+                self.pos += 1;
+                let mut out = vec![];
+                let mut depth = 1;
+                while self.pos < self.d.len() {
+                    let c = self.d[self.pos];
+                    self.pos += 1;
+                    match c {
+                        b'\\' => {
+                            let e = self.d.get(self.pos).copied().unwrap_or(b'\\');
+                            self.pos += 1;
+                            match e {
+                                b'n' => out.push(b'\n'),
+                                b'r' => out.push(b'\r'),
+                                b't' => out.push(b'\t'),
+                                b'0'..=b'7' => {
+                                    let mut v = (e - b'0') as u32;
+                                    for _ in 0..2 {
+                                        match self.d.get(self.pos) {
+                                            Some(d @ b'0'..=b'7') => {
+                                                v = v * 8 + (d - b'0') as u32;
+                                                self.pos += 1;
+                                            }
+                                            _ => break,
+                                        }
+                                    }
+                                    out.push(v as u8);
+                                }
+                                b'\n' | b'\r' => {}
+                                o => out.push(o),
+                            }
+                        }
+                        b'(' => {
+                            depth += 1;
+                            out.push(c);
+                        }
+                        b')' => {
+                            depth -= 1;
+                            if depth == 0 {
+                                break;
+                            }
+                            out.push(c);
+                        }
+                        _ => out.push(c),
+                    }
+                }
+                V::Str(Rc::new(RefCell::new(out)))
+            }
+            b'<' if self.d.get(self.pos + 1) == Some(&b'<') => {
+                self.pos += 2;
+                V::Name("<<".into())
+            }
+            b'>' if self.d.get(self.pos + 1) == Some(&b'>') => {
+                self.pos += 2;
+                V::Name(">>".into())
+            }
+            b'<' if self.d.get(self.pos + 1) == Some(&b'~') => {
+                let s = self.pos;
+                while self.pos + 1 < self.d.len() && !(self.d[self.pos] == b'~' && self.d[self.pos + 1] == b'>') {
+                    self.pos += 1;
+                }
+                self.pos = (self.pos + 2).min(self.d.len());
+                V::Str(Rc::new(RefCell::new(ascii85(&self.d[s..self.pos]))))
+            }
+            b'<' => {
+                self.pos += 1;
+                let mut hex = vec![];
+                while self.pos < self.d.len() && self.d[self.pos] != b'>' {
+                    if self.d[self.pos].is_ascii_hexdigit() {
+                        hex.push(self.d[self.pos]);
+                    }
+                    self.pos += 1;
+                }
+                self.pos += 1;
+                if hex.len() % 2 == 1 {
+                    hex.push(b'0');
+                }
+                let h = |c: u8| (c as char).to_digit(16).unwrap_or(0) as u8;
+                V::Str(Rc::new(RefCell::new(hex.chunks(2).map(|p| (h(p[0]) << 4) | h(p[1])).collect())))
+            }
+            b'[' | b']' => {
+                self.pos += 1;
+                V::Name(if c == b'[' { "[" } else { "]" }.into())
+            }
+            b')' | b'>' => {
+                self.pos += 1;
+                V::Null
+            }
+            _ => {
+                let w = self.word();
+                if w.is_empty() {
+                    self.pos += 1;
+                    return Some(V::Null);
+                }
+                match parse_num(w) {
+                    Some(n) => V::Num(n),
+                    None => {
+                        // Radix numbers (16#FF).
+                        let s = String::from_utf8_lossy(w).into_owned();
+                        match s.split_once('#').and_then(|(r, v)| i64::from_str_radix(v, r.parse::<u32>().ok().filter(|r| (2..=36).contains(r))?).ok()) {
+                            Some(n) => V::Num(n as f64),
+                            None => V::Name(s.into()),
+                        }
+                    }
+                }
+            }
+        })
+    }
+
+    /// Step over inline image data that follows an `image` operator reading `currentfile`.
+    pub(super) fn skip_image_data(&mut self) {
+        self.skip_ws();
+        if self.d[self.pos..].starts_with(b"<~") || self.d.get(self.pos).is_some_and(|c| (b'!'..=b'u').contains(c) && !c.is_ascii_hexdigit()) {
+            match self.d[self.pos..].windows(2).position(|w| w == b"~>") {
+                Some(p) => self.pos += p + 2,
+                None => self.pos = self.d.len(),
+            }
+            return;
+        }
+        while self.pos < self.d.len() && (self.d[self.pos].is_ascii_hexdigit() || is_white(self.d[self.pos])) {
+            self.pos += 1;
+        }
+        if self.d.get(self.pos) == Some(&b'>') {
+            self.pos += 1;
+        }
+    }
+}
diff --git a/crates/pdf/src/ps/text.rs b/crates/pdf/src/ps/text.rs
new file mode 100644
index 000000000..b138965bb
--- /dev/null
+++ b/crates/pdf/src/ps/text.rs
@@ -0,0 +1,322 @@
+use super::scanner::Src;
+use super::value::{DictRef, Flow, V, array, matrix_of, matrix_val, new_dict};
+use super::{Affine, BezPath, FillRule, Font, HashMap, Interp, Paint, Point, Rc, RefCell};
+
+// ------------------------------------------------------------------ text
+
+/// An encoding array of glyph names (`StandardEncoding`; `ISOLatin1Encoding` and others are
+/// approximated by WinAnsi, which agrees with ISO Latin-1 on the printable codes).
+pub(super) fn encoding_array(name: &str) -> V {
+    let base = if name == "StandardEncoding" { crate::encoding::Base::Standard } else { crate::encoding::Base::WinAnsi };
+    array((0..256).map(|c| V::Lit(base.name(c as u8).unwrap_or_else(|| ".notdef".into()).into())).collect())
+}
+
+fn dict_matrix(d: &DictRef, key: &str) -> Affine {
+    d.borrow().get(key).and_then(matrix_of).unwrap_or(Affine::IDENTITY)
+}
+
+/// A copy of a font dictionary with `m` applied after its matrix (`scalefont`, `makefont`).
+fn transformed(font: &DictRef, m: Affine) -> DictRef {
+    let copy: HashMap<String, V> = font.borrow().clone();
+    let d = Rc::new(RefCell::new(copy));
+    let old = dict_matrix(&d, "__m");
+    d.borrow_mut().insert("__m".into(), matrix_val(m * old));
+    d
+}
+
+impl Interp {
+    /// A font dictionary by name: one `definefont` made, else a new dictionary for an
+    /// embedded program or a bundled stand-in.
+    pub(super) fn find_font(&mut self, key: &str) -> DictRef {
+        if let Some(d) = self.font_dir.get(key) {
+            return d.clone();
+        }
+        let d = new_dict();
+        {
+            let mut m = d.borrow_mut();
+            m.insert("FontName".into(), V::Lit(key.into()));
+            m.insert("FontType".into(), V::Num(1.0));
+            m.insert("FontMatrix".into(), matrix_val(Affine::scale(0.001)));
+            m.insert("FID".into(), V::Null);
+            m.insert("__base".into(), V::Lit(key.into()));
+            m.insert("__m".into(), matrix_val(Affine::IDENTITY));
+        }
+        self.font_dir.insert(key.to_string(), d.clone());
+        d
+    }
+
+    /// The drawable font of a font dictionary (its base program and encoding) and the matrix
+    /// from text space (font size 1) to user space.
+    fn font_of(&mut self, d: &DictRef) -> Option<(Rc<Font>, Affine)> {
+        if matches!(d.borrow().get("FontType"), Some(V::Num(t)) if *t == 3.0) {
+            // Type 3 fonts (glyph procedures) are not run.
+            self.b.skip("EPS Type 3 font");
+            return None;
+        }
+        let (base, names) = {
+            let m = d.borrow();
+            let base = m.get("__base").or_else(|| m.get("FontName")).map(V::key)?;
+            let names: Option<Vec<Option<String>>> = m.get("Encoding").and_then(V::items).map(|a| {
+                a.iter()
+                    .map(|v| match v {
+                        V::Lit(n) | V::Name(n) if &**n != ".notdef" => Some(n.to_string()),
+                        _ => None,
+                    })
+                    .collect()
+            });
+            (base, names)
+        };
+        let key = match &names {
+            Some(n) => format!("{base}\u{0}{}", n.iter().map(|x| x.as_deref().unwrap_or("")).collect::<Vec<_>>().join(" ")),
+            None => base.clone(),
+        };
+        let font = match self.font_cache.get(&key) {
+            Some(f) => f.clone(),
+            None => {
+                // Not embedded: a bundled stand-in, as for PDF.
+                let prog = self.embedded.get(&base).cloned();
+                let f = Rc::new(Font::standalone(&base, prog.as_ref().map(|(d, cff)| (d.as_slice(), *cff)), names));
+                self.font_cache.insert(key, f.clone());
+                f
+            }
+        };
+        Some((font, dict_matrix(d, "__m")))
+    }
+
+    /// A string's glyph outlines (device space) from the current point, with an extra
+    /// displacement `extra(index, code)` (user space) after each glyph; moves the current
+    /// point.
+    fn text_path(&mut self, bytes: &[u8], mut extra: impl FnMut(usize, u32) -> (f64, f64)) -> Result<Option<(BezPath, String)>, Flow> {
+        let Some(d) = self.gs.font.clone() else { return Ok(None) };
+        let Some((font, m)) = self.font_of(&d) else { return Ok(None) };
+        let mut p = self.current_user();
+        let mut path = BezPath::new();
+        let mut text = String::new();
+        let ctm = self.gs.ctm;
+        for (i, &code) in bytes.iter().enumerate() {
+            let code = code as u32;
+            if let Some(g) = font.glyph(code) {
+                path.extend(ctm * Affine::translate(p.to_vec2()) * m * (*g).clone());
+            }
+            text.push_str(&font.unicode(code));
+            let adv = m * Point::new(font.width(code), 0.0) - m * Point::ZERO;
+            let (ex, ey) = extra(i, code);
+            p += adv + kurbo::Vec2::new(ex, ey);
+        }
+        self.move_to(p)?;
+        Ok(Some((path, text)))
+    }
+
+    fn fill_text(&mut self, path: BezPath, text: &str) {
+        let label: String = text.chars().filter(|c| !c.is_control()).take(40).collect();
+        let name = if label.trim().is_empty() { "Text".to_string() } else { format!("Text: {}", label.trim()) };
+        self.b.fill_stroke_named(&name, path, Affine::IDENTITY, Some((Paint::Color(self.gs.color), 1.0, FillRule::NonZero)), None);
+    }
+
+    fn pop_string(&mut self) -> Vec<u8> {
+        match self.pop() {
+            V::Str(s) => s.borrow().clone(),
+            _ => vec![],
+        }
+    }
+
+    fn show_with(&mut self, s: &[u8], extra: impl FnMut(usize, u32) -> (f64, f64)) -> Result<(), Flow> {
+        match self.text_path(s, extra)? {
+            Some((path, text)) => self.fill_text(path, &text),
+            None => self.b.skip("text (no font)"),
+        }
+        Ok(())
+    }
+
+    /// Text and font operators (PostScript Language Reference §5.1, §8.2).
+    pub(super) fn text_op(&mut self, n: &str, src: &mut Src) -> Result<(), Flow> {
+        match n {
+            "scalefont" | "makefont" => {
+                let m = if n == "scalefont" {
+                    Affine::scale(self.popn())
+                } else {
+                    let v = self.pop();
+                    matrix_of(&v).unwrap_or(Affine::IDENTITY)
+                };
+                let font = match self.pop() {
+                    V::Dict(d) => d,
+                    _ => self.find_font("Helvetica"),
+                };
+                self.push(V::Dict(transformed(&font, m)));
+            }
+            "selectfont" => {
+                let size = self.pop();
+                let key = self.pop().key();
+                let font = self.find_font(&key);
+                let m = match &size {
+                    V::Num(s) => Affine::scale(*s),
+                    other => matrix_of(other).unwrap_or(Affine::IDENTITY),
+                };
+                self.gs.font = Some(transformed(&font, m));
+            }
+            "setfont" => {
+                if let V::Dict(d) = self.pop() {
+                    self.gs.font = Some(d);
+                }
+            }
+            "currentfont" | "rootfont" => {
+                let d = self.gs.font.clone().unwrap_or_else(new_dict);
+                self.push(V::Dict(d));
+            }
+            "definefont" => {
+                let v = self.pop();
+                let key = self.pop().key();
+                if let V::Dict(d) = &v {
+                    if !d.borrow().contains_key("__base") {
+                        // A font the file defines itself: its embedded program, by name.
+                        d.borrow_mut().insert("__base".into(), V::Lit(key.as_str().into()));
+                        d.borrow_mut().insert("__m".into(), matrix_val(Affine::IDENTITY));
+                    }
+                    self.font_dir.insert(key, d.clone());
+                }
+                self.push(v);
+            }
+            "undefinefont" => {
+                let key = self.pop().key();
+                self.font_dir.remove(&key);
+            }
+            "StandardEncoding" | "ISOLatin1Encoding" => self.push(encoding_array(n)),
+            "show" => {
+                let s = self.pop_string();
+                self.show_with(&s, |_, _| (0.0, 0.0))?;
+            }
+            "ashow" => {
+                let s = self.pop_string();
+                let ay = self.popn();
+                let ax = self.popn();
+                self.show_with(&s, |_, _| (ax, ay))?;
+            }
+            "widthshow" => {
+                let s = self.pop_string();
+                let ch = self.popn() as u32;
+                let cy = self.popn();
+                let cx = self.popn();
+                self.show_with(&s, |_, c| if c == ch { (cx, cy) } else { (0.0, 0.0) })?;
+            }
+            "awidthshow" => {
+                let s = self.pop_string();
+                let ay = self.popn();
+                let ax = self.popn();
+                let ch = self.popn() as u32;
+                let cy = self.popn();
+                let cx = self.popn();
+                self.show_with(&s, |_, c| if c == ch { (cx + ax, cy + ay) } else { (ax, ay) })?;
+            }
+            "kshow" | "cshow" => {
+                // The procedure between characters is not run.
+                let s = self.pop_string();
+                self.pop();
+                self.show_with(&s, |_, _| (0.0, 0.0))?;
+            }
+            "xshow" | "yshow" | "xyshow" => {
+                let disp: Vec<f64> = self.pop().items().unwrap_or_default().iter().filter_map(V::num).collect();
+                let s = self.pop_string();
+                self.explicit_show(&s, &disp, n)?;
+            }
+            "glyphshow" => {
+                let name = self.pop().key();
+                let Some(d) = self.gs.font.clone() else { return Ok(()) };
+                // Drawn through a one-glyph encoding.
+                let mut e: Vec<V> = (0..256).map(|_| V::Lit(".notdef".into())).collect();
+                e[65] = V::Lit(name.as_str().into());
+                let tmp = transformed(&d, Affine::IDENTITY);
+                tmp.borrow_mut().insert("Encoding".into(), array(e));
+                self.gs.font = Some(tmp);
+                self.show_with(b"A", |_, _| (0.0, 0.0))?;
+                self.gs.font = Some(d);
+            }
+            "charpath" => {
+                self.pop();
+                let s = self.pop_string();
+                let saved = std::mem::take(&mut self.gs.path);
+                let start = self.gs.start;
+                match self.text_path(&s, |_, _| (0.0, 0.0))? {
+                    Some((glyphs, _)) => {
+                        // The outlines join the path: each element counts against the budget and
+                        // the path limit.
+                        self.gs.path = saved;
+                        self.room(glyphs.elements().len() + 1)?;
+                        self.spend(glyphs.elements().len())?;
+                        self.gs.path.extend(glyphs);
+                        if let Some(c) = self.gs.cur {
+                            self.gs.path.move_to(c);
+                        }
+                        self.gs.start = start;
+                    }
+                    None => self.gs.path = saved,
+                }
+            }
+            "stringwidth" => {
+                let s = self.pop_string();
+                let (mut w, mut h) = (0.0, 0.0);
+                if let Some(d) = self.gs.font.clone()
+                    && let Some((font, m)) = self.font_of(&d)
+                {
+                    for &c in &s {
+                        let v = m * Point::new(font.width(c as u32), 0.0) - m * Point::ZERO;
+                        w += v.x;
+                        h += v.y;
+                    }
+                }
+                self.push(V::Num(w));
+                self.push(V::Num(h));
+            }
+            "setcachedevice" => {
+                for _ in 0..6 {
+                    self.pop();
+                }
+            }
+            "setcharwidth" => {
+                self.pop();
+                self.pop();
+            }
+            // An embedded Type 1 program's encrypted part (read by `embedded_fonts`).
+            "eexec" => {
+                if matches!(self.pop(), V::File) {
+                    let rest = &src.d[src.pos.min(src.d.len())..];
+                    src.pos += rest.windows(11).position(|w| w == b"cleartomark").map_or(rest.len(), |p| p + 11);
+                }
+            }
+            // A CFF font set's binary data (read by `embedded_fonts`).
+            "StartData" => {
+                let len = self.popn().max(0.0) as usize;
+                self.pop();
+                src.pos = src.pos.saturating_add(1).saturating_add(len).min(src.d.len());
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    /// `xshow` / `yshow` / `xyshow`: glyph displacements from a number array instead of the
+    /// advances.
+    fn explicit_show(&mut self, s: &[u8], disp: &[f64], n: &str) -> Result<(), Flow> {
+        let step = if n == "xyshow" { 2 } else { 1 };
+        let d: Vec<(f64, f64)> = (0..s.len())
+            .map(|k| {
+                let i = k * step;
+                let v = |j: usize| disp.get(j).copied().unwrap_or(0.0);
+                match n {
+                    "xshow" => (v(i), 0.0),
+                    "yshow" => (0.0, v(i)),
+                    _ => (v(i), v(i + 1)),
+                }
+            })
+            .collect();
+        let Some(fd) = self.gs.font.clone() else {
+            self.b.skip("text (no font)");
+            return Ok(());
+        };
+        let Some((font, m)) = self.font_of(&fd) else { return Ok(()) };
+        self.show_with(s, move |k, c| {
+            let adv = m * Point::new(font.width(c), 0.0) - m * Point::ZERO;
+            let (dx, dy) = d.get(k).copied().unwrap_or((0.0, 0.0));
+            (dx - adv.x, dy - adv.y)
+        })
+    }
+}
diff --git a/crates/pdf/src/ps/value.rs b/crates/pdf/src/ps/value.rs
new file mode 100644
index 000000000..3cfafed6e
--- /dev/null
+++ b/crates/pdf/src/ps/value.rs
@@ -0,0 +1,88 @@
+use super::{Affine, BezPath, Cap, HashMap, Join, Point, Rc, RefCell};
+
+pub(crate) type DictRef = Rc<RefCell<HashMap<String, V>>>;
+
+#[derive(Clone)]
+pub(crate) enum V {
+    Num(f64),
+    Bool(bool),
+    /// An executable name.
+    Name(Rc<str>),
+    /// A literal name (`/name`).
+    Lit(Rc<str>),
+    /// A built-in operator, as `load` returns it for a name no dictionary defines.
+    Op(Rc<str>),
+    Str(Rc<RefCell<Vec<u8>>>),
+    Proc(Rc<Vec<V>>),
+    Array(Rc<RefCell<Vec<V>>>),
+    Dict(DictRef),
+    Mark,
+    Null,
+    /// `currentfile`.
+    File,
+}
+
+impl V {
+    pub(super) fn num(&self) -> Option<f64> {
+        match self {
+            V::Num(n) => Some(*n),
+            _ => None,
+        }
+    }
+    pub(super) fn key(&self) -> String {
+        match self {
+            V::Name(n) | V::Lit(n) | V::Op(n) => n.to_string(),
+            V::Str(s) => String::from_utf8_lossy(&s.borrow()).into_owned(),
+            V::Num(n) => format!("{n}"),
+            V::Bool(b) => format!("{b}"),
+            _ => String::new(),
+        }
+    }
+    pub(super) fn items(&self) -> Option<Vec<V>> {
+        match self {
+            V::Array(a) => Some(a.borrow().clone()),
+            V::Proc(p) => Some(p.as_ref().clone()),
+            _ => None,
+        }
+    }
+}
+
+pub(super) enum Flow {
+    Exit,
+    Stop,
+    Quit,
+}
+
+#[derive(Clone)]
+pub(super) struct GState {
+    pub(crate) ctm: Affine,
+    pub(crate) color: [f64; 3],
+    pub(crate) lw: f64,
+    pub(crate) cap: Cap,
+    pub(crate) join: Join,
+    pub(crate) miter: f64,
+    pub(crate) dash: Option<(Vec<f64>, f64)>,
+    pub(crate) path: BezPath,
+    pub(crate) cur: Option<Point>,
+    pub(crate) start: Option<Point>,
+    pub(crate) depth: usize,
+    /// The current font dictionary.
+    pub(crate) font: Option<DictRef>,
+}
+
+pub(super) fn new_dict() -> DictRef {
+    Rc::new(RefCell::new(HashMap::new()))
+}
+
+pub(super) fn array(v: Vec<V>) -> V {
+    V::Array(Rc::new(RefCell::new(v)))
+}
+
+pub(super) fn matrix_of(v: &V) -> Option<Affine> {
+    let a: Vec<f64> = v.items()?.iter().filter_map(V::num).collect();
+    (a.len() == 6).then(|| Affine::new([a[0], a[1], a[2], a[3], a[4], a[5]]))
+}
+
+pub(super) fn matrix_val(m: Affine) -> V {
+    array(m.as_coeffs().iter().map(|c| V::Num(*c)).collect())
+}
diff --git a/crates/pdf/src/tests.rs b/crates/pdf/src/tests.rs
index f2eff0466..2d09a7406 100644
--- a/crates/pdf/src/tests.rs
+++ b/crates/pdf/src/tests.rs
@@ -4,6 +4,11 @@ use super::*;
 
 use crate::write::pdf;
 
+mod groups;
+mod import;
+mod reader;
+mod shading;
+
 const CONTENT: &str = "/OC /MC0 BDC\n0 1 0 rg 0 0 200 100 re f\nEMC\n\
 /OC /MC1 BDC\nq 10 10 80 80 re W n\n1 0 0 rg 0 0 50 100 re f\nQ\n\
 /Pattern cs /P0 scn 100 0 100 50 re f\n\
@@ -1090,3 +1095,47 @@ fn retained_layers_preserve_artwork_beyond_the_bounds_depth_limit() {
     assert_eq!(cropped.pixel_size(), (120, 80), "unknown bounds keep the full page");
     assert_eq!(offset, [0.0, 0.0]);
 }
+
+#[test]
+fn cid_width_entries_at_the_top_of_the_cid_range_do_not_overflow() {
+    // A first CID of u32::MAX (larger values saturate to it) used to overflow `first + k` and `first + 65535`:
+    // a panic in debug builds; in release builds the list wrapped round to CID 0 and the range was dropped.
+    let load = |entry: &str| {
+        let type0 = "<< /Type /Font /Subtype /Type0 /BaseFont /X /Encoding /Identity-H /DescendantFonts [13 0 R] >>";
+        let desc = format!("<< /Type /Font /Subtype /CIDFontType2 {entry} >>");
+        let file = object::File::parse(&page_pdf("", "/Font << /F1 10 0 R >>", vec![(10, type0.into(), None), (13, desc, None)])).unwrap();
+        let d = file.objects.get(&(10, 0)).and_then(object::Obj::dict).unwrap();
+        font::Font::load(&file, d, &mut vec![])
+    };
+    let max = u32::MAX;
+    // c [w1 w2 ...]
+    let f = load("/W [4294967295 [500 600 700]]");
+    assert_eq!((f.width(max), f.width(0)), (0.5, 1.0));
+    // cfirst clast w
+    assert_eq!(load("/W [4294967295 4294967295 400]").width(max), 0.4);
+    // c [w1y vx vy ...]
+    let f = load("/W2 [4294967295 [1 2 3 4 5 6]]");
+    assert_eq!((f.vmetrics(max), f.vmetrics(0)), ((0.001, 0.002, 0.003), (-1.0, 0.5, 0.88)));
+    // cfirst clast w1y vx vy
+    assert_eq!(load("/W2 [4294967295 4294967295 1 2 3]").vmetrics(max), (0.001, 0.002, 0.003));
+}
+
+#[test]
+fn cmap_entries_at_the_top_of_the_code_range_do_not_overflow() {
+    // A bfrange array starting at code 0xFFFFFFFF and a cidrange mapping onto CID u32::MAX used to overflow
+    // `lo + k` and `c + (code - lo)`: a panic in debug builds, a wrap round to code / CID 0 in release builds.
+    let to_unicode = "beginbfrange <FFFFFFFF> <FFFFFFFF> [<0041> <0042>] endbfrange";
+    let encoding = "begincodespacerange <0000> <FFFF> endcodespacerange begincidrange <0000> <FFFF> 4294967295 endcidrange";
+    let objs: Objs = vec![
+        (10, "<< /Type /Font /Subtype /Type0 /Encoding 15 0 R /ToUnicode 14 0 R /DescendantFonts [13 0 R] >>".into(), None),
+        (13, "<< /Type /Font /Subtype /CIDFontType2 /W [0 [700 800] 4294967295 [500]] >>".into(), None),
+        (14, "<< >>".into(), Some(to_unicode.as_bytes().to_vec())),
+        (15, "<< /Type /CMap >>".into(), Some(encoding.as_bytes().to_vec())),
+    ];
+    let file = object::File::parse(&page_pdf("", "/Font << /F1 10 0 R >>", objs)).unwrap();
+    let d = file.objects.get(&(10, 0)).and_then(object::Obj::dict).unwrap();
+    let f = font::Font::load(&file, d, &mut vec![]);
+    assert_eq!((f.unicode(0xFFFF_FFFF), f.unicode(0)), ("A".to_string(), String::new()));
+    // Code 0 is CID u32::MAX; code 2 would be past it, so it falls back to CID 0 like an unmapped code.
+    assert_eq!((f.width(0), f.width(2)), (0.5, 0.7));
+}
diff --git a/crates/pdf/src/tests_groups.rs b/crates/pdf/src/tests/groups.rs
similarity index 99%
rename from crates/pdf/src/tests_groups.rs
rename to crates/pdf/src/tests/groups.rs
index ce928139f..14b6a4b09 100644
--- a/crates/pdf/src/tests_groups.rs
+++ b/crates/pdf/src/tests/groups.rs
@@ -1,8 +1,8 @@
 //! M13.12: transparency groups (isolated, knockout, group alpha) and soft masks on a group's
 //! combined result.
 
-use super::*;
 use crate::tests::{page_pdf, render};
+use crate::*;
 
 fn near(a: [f32; 4], b: [f32; 4]) -> bool {
     (0..4).all(|i| (a[i] - b[i]).abs() < 0.02)
diff --git a/crates/pdf/src/tests_import.rs b/crates/pdf/src/tests/import.rs
similarity index 71%
rename from crates/pdf/src/tests_import.rs
rename to crates/pdf/src/tests/import.rs
index 4ea298010..c7dcbee57 100644
--- a/crates/pdf/src/tests_import.rs
+++ b/crates/pdf/src/tests/import.rs
@@ -1,8 +1,8 @@
 //! M13.12: CCITT images in PDF pages, EPS text and parser robustness over truncated and
 //! corrupt inputs (generated fixtures).
 
-use super::*;
 use crate::tests::{coverage, page_pdf, render, shape_names};
+use crate::*;
 
 fn eps(body: &[u8]) -> Doc {
     let mut b = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 200 100\n".to_vec();
@@ -25,6 +25,55 @@ fn ink_x(img: &effectcraft_raster::Image) -> (i64, i64) {
     (x0, x1)
 }
 
+/// #955: EPS files that name their operators (`/mo /moveto load def`, as Illustrator's do),
+/// query the device and embed metadata read through a SubFileDecode filter draw their artwork.
+/// They imported as an empty layer.
+#[test]
+fn eps_with_aliased_operators_device_queries_and_embedded_data_draws() {
+    let square = "1 0 0 setrgbcolor 50 25 mo 150 25 li 150 75 li 50 75 li cp f\n";
+    let aliases = "/mo /moveto load def /li /lineto load def /cp /closepath load def /f /fill load def\n";
+    let doc = eps(format!("{aliases}{square}").as_bytes());
+    assert!(coverage(&render(&doc), 50, 25, 150, 75) > 4900.0, "aliased operators draw the square");
+    // Every operator that returns a value pushes it, so the stack stays aligned.
+    let queries = "mark currentflat currentscreen currentpagedevice currenthalftone currentblackgeneration \
+                   currentundercolorremoval currentcolortransfer currentsystemparams counttomark 13 eq /ok exch def cleartomark\n";
+    let doc = eps(format!("{aliases}{queries}ok {{ {square} }} if\n").as_bytes());
+    assert!(coverage(&render(&doc), 50, 25, 150, 75) > 4900.0, "device queries leave 13 values");
+    // Data up to the end-of-data string isn't run: its unbalanced brace would swallow the rest.
+    let data = "currentfile 0 (%END-OF-DATA) /SubFileDecode filter pop\n<x> { ( not PostScript\n%END-OF-DATA\n";
+    let doc = eps(format!("{aliases}{data}{square}").as_bytes());
+    assert!(coverage(&render(&doc), 50, 25, 150, 75) > 4900.0, "drawing after the embedded data");
+}
+
+#[test]
+fn eps_filter_on_a_string_source_does_not_skip_the_program() {
+    let square = "1 0 0 setrgbcolor 50 25 moveto 150 25 lineto 150 75 lineto 50 75 lineto closepath fill\n";
+    let img = "gsave 1 1 8 [1 0 0 1 0 0] (FF) /ASCIIHexDecode filter image grestore\n";
+    // Images aren't drawn yet, so this parses without `eps`'s nothing-skipped check.
+    let doc = parse(format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 200 100\n{img}{square}").as_bytes()).unwrap();
+    assert_eq!(doc.skipped, ["image"]);
+    assert!(coverage(&render(&doc), 50, 25, 150, 75) > 4900.0, "drawing after an image read from a string");
+}
+
+/// A loaded operator runs that operator even after its name is redefined (the prolog idiom
+/// `/_m /moveto load def /moveto {… _m} def`), and an executable name bound with `cvx` runs what
+/// its name is bound to.
+#[test]
+fn eps_loaded_operators_and_executable_name_aliases() {
+    let saved = "/_m /moveto load def /moveto {_m} def 1 0 0 setrgbcolor 50 25 moveto 150 25 lineto 150 75 lineto 50 75 lineto closepath fill\n";
+    assert!(coverage(&render(&eps(saved.as_bytes())), 50, 25, 150, 75) > 4900.0, "a redefined moveto that calls the saved one");
+    let alias = "/sq {50 25 moveto 150 25 lineto 150 75 lineto 50 75 lineto closepath fill} def /y /sq cvx def 1 0 0 setrgbcolor y\n";
+    assert!(coverage(&render(&eps(alias.as_bytes())), 50, 25, 150, 75) > 4900.0, "an executable name bound to a procedure's name");
+}
+
+/// Each `exec` of the executable name `exec` runs the next one: the chain is cut off at the call
+/// depth instead of overflowing the stack.
+#[test]
+fn eps_exec_of_executable_names_stops_at_the_call_depth() {
+    let doc = parse(b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 200 100\n/exec cvx 99999 {dup} repeat exec\n").unwrap();
+    assert!(doc.skipped.iter().any(|s| s.contains("recursion limit")), "{:?}", doc.skipped);
+}
+
 #[test]
 fn eps_text_with_bundled_fonts_and_show_variants() {
     // Not embedded: drawn with the bundled stand-in, like the same text in a PDF.
@@ -396,6 +445,100 @@ fn arcs_with_huge_angles_end_at_their_second_angle() {
     assert!(img.get(50, 50)[3] > 0.99, "{:?}", img.get(50, 50));
 }
 
+/// Parses `body` after a square through [`eps_soon`]: the square stays, and the program stops at
+/// the operation limit.
+fn runs_out_of_budget(body: &str) {
+    let doc = eps_soon(&format!("0 0 10 10 rectfill {body}"));
+    assert_eq!(doc.flatten().len(), 1, "{body}: {:?}", doc.skipped);
+    assert_eq!(doc.skipped, ["PostScript (operation limit)"], "{body}");
+}
+
+#[test]
+fn paths_made_in_a_loop_run_out_of_the_budget() {
+    // Each curve, rectangle element and glyph outline element an operator makes counts against the
+    // operation budget: `arc` at a radius of 2.2 × 10^18 makes about 6,800 curves a call,
+    // `rectclip` with an array of 2,000 rectangles makes 10,000 elements, and `charpath` makes the
+    // outlines of 1,000 H's.
+    for body in [
+        "{ newpath 0 0 2200000000000000000 0 1440 arc } loop",
+        "/a 8000 array def 0 1 7999 { a exch 0 put } for { gsave a rectclip grestore } loop",
+        "/Helvetica findfont 10 scalefont setfont /s 1000 string def 0 1 999 { s exch 72 put } for \
+         { newpath 0 0 moveto s false charpath } loop",
+    ] {
+        runs_out_of_budget(body);
+    }
+}
+
+#[test]
+fn paths_read_or_copied_in_a_loop_run_out_of_the_budget() {
+    // `pathbbox` reads each element of the current path, and `gsave`, `save` and `clip` copy it:
+    // each element counts against the operation budget. The path has 100,001 elements.
+    let path = "newpath 0 0 moveto 0 1 99999 { pop 1 0 rlineto } for";
+    for body in ["{ pathbbox pop pop pop pop } loop", "{ gsave grestore } loop", "{ save restore } loop", "{ gsave clip grestore } loop"] {
+        runs_out_of_budget(&format!("{path} {body}"));
+    }
+}
+
+#[test]
+fn nested_loops_run_out_of_the_budget() {
+    // Each pass of `loop`, `repeat`, `for` and `forall` counts against the operation budget, and
+    // so does each item of a procedure that is not a name. `clear` empties the operand stack that
+    // the passes fill.
+    let literals = format!("{{ {} clear }} loop", "0 ".repeat(100_000));
+    for body in [
+        "{ {} loop } loop",
+        "{ 1000000 {} repeat } loop",
+        "{ 0 1 999999 {} for clear } loop",
+        "/s 1000000 string def { s {} forall clear } loop",
+        "/a 1000000 array def { a {} forall clear } loop",
+        "/d 1 dict def 0 1 99999 { d exch 0 put } for { d {} forall clear } loop",
+        literals.as_str(),
+    ] {
+        runs_out_of_budget(body);
+    }
+}
+
+#[test]
+fn paths_stop_at_the_path_limit() {
+    // A path holds at most 1,048,576 elements. An operator that would add more stops the program:
+    // the square drawn before it stays, and the square after it is left out.
+    for body in [
+        "newpath 0 0 moveto 1100 { 1000 { 1 0 rlineto } repeat } repeat",
+        "newpath 0 0 moveto 0 0 0 0 0 0 1100 { 1000 { 6 copy rcurveto } repeat } repeat",
+        "newpath 0 0 moveto 1100 { 1000 { closepath } repeat } repeat",
+        // 1,024 turns at a radius of 2 × 10^17: about 1,171,000 curves.
+        "newpath 0 0 200000000000000000 0 368640 arc",
+        // At a radius of 10^300, kurbo divides the arc into more curves than a usize can count.
+        "newpath 0 0 10 300 exp 0 90 arc",
+        // The outlines of 100,000 H's, 13 elements each.
+        "/Helvetica findfont 10 scalefont setfont /s 100000 string def 0 1 99999 { s exch 72 put } for \
+         0 0 moveto s false charpath",
+        // 210,000 rectangles of five elements each.
+        "/a 840000 array def 0 1 839999 { a exch 0 put } for a rectfill",
+    ] {
+        let doc = eps_soon(&format!("0 0 10 10 rectfill {body} 20 20 10 10 rectfill"));
+        assert_eq!(doc.flatten().len(), 1, "{body}: {:?}", doc.skipped);
+        assert_eq!(doc.skipped, ["PostScript (path limit)"], "{body}");
+    }
+    // A `moveto` replaces a `moveto` just before it (PostScript Language Reference §8.2, `moveto`),
+    // and so does the current point that `show` sets, so 550,000 pieces of text placed with
+    // `moveto` and `show` leave a path of one element.
+    let doc = eps_soon("/Helvetica findfont 10 scalefont setfont 550 { 1000 { 0 0 moveto ( ) show } repeat } repeat 0 0 10 10 rectfill");
+    assert!(doc.skipped.is_empty(), "{:?}", doc.skipped);
+    assert_eq!(doc.flatten().len(), 1);
+}
+
+#[test]
+fn pdf_paths_stop_at_the_path_limit() {
+    // A content stream's current path holds at most 1,048,576 elements: `re` (five elements each)
+    // and `h` stop the stream at the limit, and the square painted before it stays.
+    for (op, n) in [("0 0 1 1 re ", 210_000), ("h ", 1_100_000)] {
+        let doc = parse(&page_pdf(&format!("0 0 10 10 re f 0 0 m {} f 20 20 10 10 re f", op.repeat(n)), "", vec![])).unwrap();
+        assert_eq!(doc.flatten().len(), 1, "{op}: {:?}", doc.skipped);
+        assert_eq!(doc.skipped, ["content (path limit)"], "{op}");
+    }
+}
+
 #[test]
 fn closing_an_empty_path_is_a_no_op() {
     // "s", "b" and "b*" closed the path without a current point (kurbo asserts on that).
diff --git a/crates/pdf/src/tests_reader.rs b/crates/pdf/src/tests/reader.rs
similarity index 100%
rename from crates/pdf/src/tests_reader.rs
rename to crates/pdf/src/tests/reader.rs
diff --git a/crates/pdf/src/tests_shading.rs b/crates/pdf/src/tests/shading.rs
similarity index 99%
rename from crates/pdf/src/tests_shading.rs
rename to crates/pdf/src/tests/shading.rs
index 12ca2ff86..8e96193ab 100644
--- a/crates/pdf/src/tests_shading.rs
+++ b/crates/pdf/src/tests/shading.rs
@@ -1,7 +1,7 @@
 //! M13.12: function-based and mesh shadings (generated fixtures).
 
-use super::*;
 use crate::tests::{Objs, page_pdf, render};
+use crate::*;
 
 /// Mesh vertex data: 8-bit flags, 16-bit coordinates (Decode `[0 65535 0 65535 …]`, so raw
 /// values are page units) and 8-bit components.
diff --git a/crates/project/src/build.rs b/crates/project/src/build.rs
index 935c03b0e..b78e3d8c1 100644
--- a/crates/project/src/build.rs
+++ b/crates/project/src/build.rs
@@ -4,7 +4,7 @@ use effectcraft_color::{BlendMode, Label};
 use effectcraft_keyframe::{Gradient, ShapePath, TextDoc, Value};
 use effectcraft_time::Tick;
 
-use crate::props::{GroupKind, MaskMode, ParamUi, PropGroup, Property};
+use crate::props::{GroupKind, MaskMode, Node, ParamUi, PropGroup, Property};
 use crate::{Comp, Layer, LayerId, LayerSource, LightKind, Project, Switches};
 
 /// Id allocator borrowing the project's counter.
@@ -594,6 +594,7 @@ pub fn shape_simple_op(ids: &mut Ids, kind: &str) -> Option<PropGroup> {
             .with(ids.prop("speed", "Wiggles/Second", Value::Scalar(2.0)))
             .with(ids.prop("correlation", "Correlation", Value::Scalar(50.0)).with_ui(ParamUi::Percent))
             .with(ids.prop("phase", "Temporal Phase", Value::Scalar(0.0)).with_ui(ParamUi::Angle))
+            .with(wiggle_spatial_phase(ids))
             .with(ids.prop("seed", "Random Seed", Value::Scalar(0.0))),
         "merge" => indexed(ids.group("merge", "Merge Paths 1")).with(ids.prop("mode", "Mode", Value::Enum(0)).with_ui(popup(&[
             "Merge",
@@ -607,6 +608,32 @@ pub fn shape_simple_op(ids: &mut Ids, kind: &str) -> Option<PropGroup> {
     Some(g)
 }
 
+/// Wiggle Paths' Spatial Phase.
+fn wiggle_spatial_phase(ids: &mut Ids) -> Property {
+    ids.prop("spatialPhase", "Spatial Phase", Value::Scalar(0.0)).with_ui(ParamUi::Angle)
+}
+
+/// Adds the properties that shape path operations have gained since a project was saved (Wiggle
+/// Paths' Spatial Phase), at their defaults, to the operations in `contents` and its nested
+/// groups. Returns whether anything was added. It walks the nested groups with a work list and
+/// does not recurse.
+pub fn upgrade_shape_contents(ids: &mut Ids, contents: &mut PropGroup) -> bool {
+    let mut changed = false;
+    let mut todo = vec![contents];
+    while let Some(group) = todo.pop() {
+        for n in &mut group.children {
+            let Node::Group(g) = n else { continue };
+            if g.match_id == "wiggle" && !g.children.iter().any(|c| c.match_id() == "spatialPhase") {
+                let at = g.children.iter().position(|c| c.match_id() == "phase").map_or(g.children.len(), |i| i + 1);
+                g.children.insert(at, wiggle_spatial_phase(ids).into());
+                changed = true;
+            }
+            todo.push(g);
+        }
+    }
+    changed
+}
+
 // ---------------------------------------------------------------- camera / light / 3D
 
 pub fn camera_options(ids: &mut Ids, zoom: f64) -> PropGroup {
diff --git a/crates/project/src/comp.rs b/crates/project/src/comp.rs
new file mode 100644
index 000000000..5a3c8650e
--- /dev/null
+++ b/crates/project/src/comp.rs
@@ -0,0 +1,427 @@
+use super::item::LayerId;
+use super::layer::{Layer, LayerSource};
+use super::settings::{Marker, yes};
+use super::{Deserialize, FrameRate, Node, PropGroup, Serialize, Tick, Value, essential, styles};
+
+/// 3D renderer of a composition.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Renderer {
+    #[default]
+    Classic3D,
+    Advanced3D,
+}
+
+/// A composition's Resolution (the Composition panel's Resolution/Down Sample Factor popup, View ▸
+/// Resolution): how many of its pixels the viewer renders. Auto follows the magnification.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Resolution {
+    #[default]
+    Auto,
+    Full,
+    Half,
+    Third,
+    Quarter,
+    /// View ▸ Resolution ▸ Custom: render every n-th pixel (2..=40).
+    Custom(u8),
+}
+
+impl Resolution {
+    pub const ALL: [Resolution; 5] = [Resolution::Auto, Resolution::Full, Resolution::Half, Resolution::Third, Resolution::Quarter];
+    pub fn label(self) -> &'static str {
+        match self {
+            Resolution::Auto => "Auto",
+            Resolution::Full => "Full",
+            Resolution::Half => "Half",
+            Resolution::Third => "Third",
+            Resolution::Quarter => "Quarter",
+            Resolution::Custom(_) => "Custom",
+        }
+    }
+    pub fn is_auto(&self) -> bool {
+        *self == Resolution::Auto
+    }
+    /// The down-sample factor (render every n-th pixel); `None` for Auto.
+    pub fn factor(self) -> Option<u8> {
+        match self {
+            Resolution::Auto => None,
+            Resolution::Full => Some(1),
+            Resolution::Half => Some(2),
+            Resolution::Third => Some(3),
+            Resolution::Quarter => Some(4),
+            Resolution::Custom(n) => Some(n),
+        }
+    }
+    /// The resolution that renders every `n`-th pixel (1 = Full … 4 = Quarter; up to 40).
+    pub fn from_factor(n: u64) -> Resolution {
+        match n.clamp(1, 40) {
+            1 => Resolution::Full,
+            2 => Resolution::Half,
+            3 => Resolution::Third,
+            4 => Resolution::Quarter,
+            n => Resolution::Custom(n as u8),
+        }
+    }
+    /// Render scale for a viewer magnification (and display pixel density).
+    pub fn scale(self, zoom: f32, ppp: f32) -> f64 {
+        match self.factor() {
+            Some(n) => 1.0 / f64::from(n.clamp(1, 40)),
+            // As in After Effects, Auto renders the pixels the magnification needs: the coarsest
+            // whole factor that still gives every screen pixel a rendered one (Full above 50 %,
+            // Half down to 33.3 %, Third down to 25 %, Quarter below), never fewer (#417).
+            None => {
+                let n = (1.0 / (zoom * ppp) as f64 + 1e-3).floor();
+                if n >= 1.0 { 1.0 / n.min(4.0) } else { 1.0 }
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Comp {
+    pub width: u32,
+    pub height: u32,
+    pub pixel_aspect: f64,
+    pub frame_rate: FrameRate,
+    pub duration: Tick,
+    /// Start timecode/frame shown for time 0.
+    pub display_start: Tick,
+    pub background: [f32; 3],
+    pub work_area: (Tick, Tick),
+    /// Layer #1 first (top of the stack).
+    pub layers: Vec<Layer>,
+    #[serde(default)]
+    pub markers: Vec<Marker>,
+    pub shutter_angle: f64,
+    pub shutter_phase: f64,
+    /// Samples Per Frame: the minimum motion-blur samples (and the count for 3D layers).
+    pub motion_blur_samples: u32,
+    /// Adaptive Sample Limit (Composition Settings ▸ Advanced): the most samples a 2D layer gets
+    /// when it moves far within the shutter.
+    #[serde(default = "adaptive_limit_default")]
+    pub motion_blur_adaptive_limit: u32,
+    #[serde(default)]
+    pub renderer: Renderer,
+    /// Comp switches (timeline toolbar).
+    #[serde(default)]
+    pub hide_shy: bool,
+    #[serde(default = "yes")]
+    pub enable_motion_blur: bool,
+    #[serde(default = "yes")]
+    pub enable_frame_blending: bool,
+    #[serde(default)]
+    pub draft_3d: bool,
+    /// Composition Settings ▸ Advanced ▸ Preserve frame rate when nested or in render queue:
+    /// nested in another comp, or rendered at another rate, it shows only its own frames.
+    #[serde(default)]
+    pub preserve_frame_rate: bool,
+    /// Composition Settings ▸ Advanced ▸ Preserve resolution when nested: nested in a comp
+    /// previewed at a lower resolution, it still renders at full size.
+    #[serde(default)]
+    pub preserve_resolution: bool,
+    #[serde(default)]
+    pub poster_time: Tick,
+    /// Global Light for layer styles (Layer ▸ Layer Styles ▸ Blending Options).
+    #[serde(default)]
+    pub global_light: styles::GlobalLight,
+    /// Viewer guides (View ▸ Add Guide…), in comp pixels.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub guides: Vec<Guide>,
+    /// Essential Graphics: the controls this comp exposes to instances and templates.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub essential: Option<essential::EssentialGraphics>,
+    /// The Composition panel's Resolution, saved with the project as in After Effects. It changes
+    /// what the viewer renders, not the comp's pixels ([`Comp::same_pixels`]), and stays out of
+    /// the undo history.
+    #[serde(default, skip_serializing_if = "Resolution::is_auto")]
+    pub resolution: Resolution,
+}
+
+/// A viewer guide line: vertical guides sit at an x position, horizontal ones at a y position.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Guide {
+    pub vertical: bool,
+    /// Comp pixels, or percent of the comp's width (vertical) / height (horizontal) when
+    /// [`Guide::percent`] is set.
+    pub position: f64,
+    /// A percentage guide (After Effects 26.5): `position` is a percent of the comp's size, so the
+    /// guide keeps its relative place when the comp is resized. Absent in older projects.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub percent: bool,
+}
+
+impl Guide {
+    /// The comp's extent along this guide's axis, never zero.
+    fn extent(&self, width: u32, height: u32) -> f64 {
+        f64::from(if self.vertical { width } else { height }).max(1.0)
+    }
+
+    /// The guide's position in comp pixels for a comp of this size.
+    pub fn px(&self, width: u32, height: u32) -> f64 {
+        if self.percent { self.position / 100.0 * self.extent(width, height) } else { self.position }
+    }
+
+    /// Place the guide at `px` comp pixels, keeping its unit.
+    pub fn set_px(&mut self, px: f64, width: u32, height: u32) {
+        self.position = if self.percent { px / self.extent(width, height) * 100.0 } else { px };
+    }
+
+    /// Switch between pixels and percent without moving the guide on the comp.
+    pub fn set_percent(&mut self, percent: bool, width: u32, height: u32) {
+        let px = self.px(width, height);
+        self.percent = percent;
+        self.set_px(px, width, height);
+    }
+}
+
+fn adaptive_limit_default() -> u32 {
+    128
+}
+
+impl Comp {
+    pub fn new(width: u32, height: u32, frame_rate: FrameRate, duration: Tick) -> Comp {
+        Comp {
+            width,
+            height,
+            pixel_aspect: 1.0,
+            frame_rate,
+            duration,
+            display_start: Tick::ZERO,
+            background: [0.0, 0.0, 0.0],
+            work_area: (Tick::ZERO, duration),
+            layers: vec![],
+            markers: vec![],
+            shutter_angle: 180.0,
+            shutter_phase: -90.0,
+            motion_blur_samples: 16,
+            motion_blur_adaptive_limit: 128,
+            renderer: Renderer::Classic3D,
+            hide_shy: false,
+            enable_motion_blur: true,
+            enable_frame_blending: true,
+            draft_3d: false,
+            preserve_frame_rate: false,
+            preserve_resolution: false,
+            poster_time: Tick::ZERO,
+            guides: vec![],
+            global_light: styles::GlobalLight::default(),
+            essential: None,
+            resolution: Resolution::Auto,
+        }
+    }
+
+    /// Whether the composition has a frame at its time `t`: nested, it shows nothing before it
+    /// starts or after it ends (a precomp layer trimmed or remapped past it).
+    pub fn covers(&self, t: Tick) -> bool {
+        t >= Tick::ZERO && t < self.duration
+    }
+
+    /// A new, empty composition with this one's settings (frame rate, pixel aspect, background,
+    /// motion blur, frame blending and the 3D renderer), as Pre-compose makes.
+    pub fn nested_like(&self, width: u32, height: u32, duration: Tick) -> Comp {
+        Comp {
+            pixel_aspect: self.pixel_aspect,
+            background: self.background,
+            shutter_angle: self.shutter_angle,
+            shutter_phase: self.shutter_phase,
+            motion_blur_samples: self.motion_blur_samples,
+            motion_blur_adaptive_limit: self.motion_blur_adaptive_limit,
+            renderer: self.renderer,
+            enable_motion_blur: self.enable_motion_blur,
+            enable_frame_blending: self.enable_frame_blending,
+            preserve_frame_rate: self.preserve_frame_rate,
+            preserve_resolution: self.preserve_resolution,
+            ..Comp::new(width, height, self.frame_rate, duration)
+        }
+    }
+
+    pub fn layer(&self, id: LayerId) -> Option<&Layer> {
+        self.layers.iter().find(|l| l.id == id)
+    }
+
+    pub fn layer_mut(&mut self, id: LayerId) -> Option<&mut Layer> {
+        self.layers.iter_mut().find(|l| l.id == id)
+    }
+
+    /// 1-based layer number (#) of a layer.
+    pub fn index_of(&self, id: LayerId) -> Option<usize> {
+        self.layers.iter().position(|l| l.id == id).map(|i| i + 1)
+    }
+
+    pub fn layer_by_name(&self, name: &str) -> Option<&Layer> {
+        self.layers.iter().find(|l| l.name == name)
+    }
+
+    pub fn frame_duration(&self) -> Tick {
+        self.frame_rate.frame_duration()
+    }
+
+    /// Any 3D layer present (camera/lights or a 3D switch).
+    pub fn has_3d(&self) -> bool {
+        self.layers.iter().any(|l| l.switches.three_d || matches!(l.source, LayerSource::Camera | LayerSource::Light { .. }))
+    }
+
+    /// The active camera at `t`: the topmost enabled camera layer active at that time.
+    pub fn active_camera(&self, t: Tick) -> Option<&Layer> {
+        self.layers.iter().find(|l| matches!(l.source, LayerSource::Camera) && l.switches.video && l.is_active_at(t))
+    }
+
+    /// Unique layer name with a numeric suffix (`Shape Layer 2`).
+    pub fn unique_layer_name(&self, base: &str) -> String {
+        if !self.layers.iter().any(|l| l.name == base) {
+            return base.to_string();
+        }
+        let stem = base.trim_end_matches(|c: char| c.is_ascii_digit()).trim_end();
+        (2..).map(|i| format!("{stem} {i}")).find(|n| !self.layers.iter().any(|l| &l.name == n)).unwrap_or_default()
+    }
+}
+
+impl Comp {
+    /// Draws the same pixels as `o`: equal but for its layers' Audio, Lock and Shy switches, Hide
+    /// Shy Layers and the viewer's Resolution.
+    pub fn same_pixels(&self, o: &Comp) -> bool {
+        self.same_settings(o) && self.layers.len() == o.layers.len() && self.layers.iter().zip(&o.layers).all(|(a, b)| a.same_pixels(b))
+    }
+
+    /// [`Self::same_pixels`] but for the layers.
+    fn same_settings(&self, o: &Comp) -> bool {
+        // Every field (no `..`: a new field must be considered here).
+        let Comp {
+            width,
+            height,
+            pixel_aspect,
+            frame_rate,
+            duration,
+            display_start,
+            background,
+            work_area,
+            layers: _,
+            markers,
+            shutter_angle,
+            shutter_phase,
+            motion_blur_samples,
+            motion_blur_adaptive_limit,
+            renderer,
+            hide_shy: _,
+            enable_motion_blur,
+            enable_frame_blending,
+            draft_3d,
+            preserve_frame_rate,
+            preserve_resolution,
+            poster_time,
+            global_light,
+            guides,
+            essential,
+            resolution: _,
+        } = self;
+        *width == o.width
+            && *height == o.height
+            && *pixel_aspect == o.pixel_aspect
+            && *frame_rate == o.frame_rate
+            && *duration == o.duration
+            && *display_start == o.display_start
+            && *background == o.background
+            && *work_area == o.work_area
+            && *markers == o.markers
+            && *shutter_angle == o.shutter_angle
+            && *shutter_phase == o.shutter_phase
+            && *motion_blur_samples == o.motion_blur_samples
+            && *motion_blur_adaptive_limit == o.motion_blur_adaptive_limit
+            && *renderer == o.renderer
+            && *enable_motion_blur == o.enable_motion_blur
+            && *enable_frame_blending == o.enable_frame_blending
+            && *draft_3d == o.draft_3d
+            && *preserve_frame_rate == o.preserve_frame_rate
+            && *preserve_resolution == o.preserve_resolution
+            && *poster_time == o.poster_time
+            && *global_light == o.global_light
+            && *guides == o.guides
+            && *essential == o.essential
+    }
+
+    /// The comp-time span (`in_point..out_point` of every layer changed, added or removed,
+    /// widened by the shutter) outside which `self` draws the same pixels as `o`, so cached
+    /// frames there stay valid (#1641). `None` when the edit can reach any frame: a comp setting,
+    /// a layer reorder, Solo turning on or off, an expression (it reads anything), or a changed
+    /// layer another layer parents to, mattes with or picks in an effect.
+    pub fn changed_span(&self, o: &Comp) -> Option<(Tick, Tick)> {
+        fn reads(g: &PropGroup, changed: &[LayerId]) -> bool {
+            g.children.iter().any(|c| match c {
+                Node::Prop(p) => {
+                    p.expr.is_some()
+                        || std::iter::once(&p.value)
+                            .chain(p.keys.iter().map(|k| &k.value))
+                            .any(|v| matches!(v, Value::Layer(Some(id)) if changed.contains(&LayerId(*id))))
+                }
+                Node::Group(g) => reads(g, changed),
+            })
+        }
+        // Solo hides every other layer at every frame.
+        if !self.same_settings(o) || self.any_solo() != o.any_solo() {
+            return None;
+        }
+        let common = |a: &Comp, b: &Comp| a.layers.iter().map(|l| l.id).filter(|id| b.layer(*id).is_some()).collect::<Vec<_>>();
+        if common(self, o) != common(o, self) {
+            return None;
+        }
+        let mut changed = Vec::new();
+        let mut span: Option<(Tick, Tick)> = None;
+        // Each changed layer comes up from both sides: its old and its new span.
+        for (l, other) in self.layers.iter().map(|l| (l, o.layer(l.id))).chain(o.layers.iter().map(|l| (l, self.layer(l.id)))) {
+            if other.is_some_and(|b| l.same_pixels(b)) {
+                continue;
+            }
+            changed.push(l.id);
+            let (s, e) = (l.in_point.min(l.out_point), l.in_point.max(l.out_point));
+            span = Some(span.map_or((s, e), |(a, b)| (a.min(s), b.max(e))));
+        }
+        let reaches = |l: &Layer| {
+            l.parent.is_some_and(|p| changed.contains(&p)) || l.track_matte.as_ref().is_some_and(|m| changed.contains(&m.layer)) || reads(&l.props, &changed)
+        };
+        if self.layers.iter().chain(&o.layers).any(reaches) {
+            return None;
+        }
+        // A frame at `t` samples cameras, lights and transforms over its shutter,
+        // `t + (phase + angle * 0..=1) / 360` frames, and draws the layers active at `t` itself.
+        let (a, p) = (self.shutter_angle / 360.0, self.shutter_phase / 360.0);
+        let fd = self.frame_duration().seconds();
+        let (before, after) = (Tick::from_seconds_f64(p.max(p + a).max(0.0) * fd), Tick::from_seconds_f64(-p.min(p + a).min(0.0) * fd));
+        span.map(|(s, e)| (s - before, e + after))
+    }
+
+    /// Some layer is soloed: only the soloed layers draw.
+    pub fn any_solo(&self) -> bool {
+        self.layers.iter().any(|l| l.switches.solo && l.source.is_av())
+    }
+
+    /// Draws the same pixels as `o` once plain markers are ignored: they change no pixels. Protected
+    /// time markers with a duration set the timing (Responsive Design), so those still count.
+    pub fn same_pixels_ignoring_markers(&self, o: &Comp) -> bool {
+        let protected =
+            |m: &[Marker]| -> Vec<(Tick, Tick)> { m.iter().filter(|m| m.protected && m.duration > Tick::ZERO).map(|m| (m.time, m.duration)).collect() };
+        if protected(&self.markers) != protected(&o.markers) {
+            return false;
+        }
+        let mut c = self.clone();
+        c.markers = o.markers.clone();
+        for (a, b) in c.layers.iter_mut().zip(&o.layers) {
+            a.markers = b.markers.clone();
+            a.markers_locked = b.markers_locked;
+        }
+        c.same_pixels(o)
+    }
+
+    /// The comp with those switches and the Resolution at their defaults (borrowed when they
+    /// already are), for keys that hash the whole comp.
+    pub fn pixel_form(&self) -> std::borrow::Cow<'_, Comp> {
+        if !self.hide_shy && self.resolution.is_auto() && self.layers.iter().all(|l| l.switches == l.switches.pixels()) {
+            return std::borrow::Cow::Borrowed(self);
+        }
+        let mut c = self.clone();
+        c.hide_shy = false;
+        c.resolution = Resolution::Auto;
+        for l in &mut c.layers {
+            l.switches = l.switches.pixels();
+        }
+        std::borrow::Cow::Owned(c)
+    }
+}
diff --git a/crates/project/src/file_check.rs b/crates/project/src/file_check.rs
new file mode 100644
index 000000000..f1b261c5a
--- /dev/null
+++ b/crates/project/src/file_check.rs
@@ -0,0 +1,329 @@
+//! A cheap check that a project file will read back, without parsing it.
+//!
+//! `serde_json` writes a non-finite float as `null` and refuses to parse nesting deeper than 128
+//! containers, so a project holding either would be saved to a file that can't be opened. Walking
+//! the value once, writing nothing, finds both without building the project again.
+
+use std::fmt;
+
+use serde::ser::{
+    self, Serialize, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple, SerializeTupleStruct, SerializeTupleVariant,
+    Serializer,
+};
+
+/// serde_json refuses to parse the 128th nested array/object (its recursion limit is 128).
+const MAX_DEPTH: u32 = 127;
+
+const NOT_FINITE: &str = "a number that isn't finite (NaN or infinity)";
+const TOO_DEEP: &str = "nesting deeper than 127 levels";
+
+/// Why a value can't be written to a project file.
+#[derive(Debug)]
+pub(crate) struct Unstorable(String);
+
+impl fmt::Display for Unstorable {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(&self.0)
+    }
+}
+
+impl std::error::Error for Unstorable {}
+
+impl ser::Error for Unstorable {
+    fn custom<T: fmt::Display>(msg: T) -> Self {
+        Unstorable(msg.to_string())
+    }
+}
+
+/// Walk `value` as `serde_json` would write it, producing no text and allocating only on error.
+pub(crate) fn check<T: Serialize + ?Sized>(value: &T) -> Result<(), Unstorable> {
+    let mut walker = Walker { depth: 0 };
+    value.serialize(&mut walker)
+}
+
+/// The current nesting depth of the value being walked.
+struct Walker {
+    depth: u32,
+}
+
+impl Walker {
+    /// Enter `levels` nested containers, refusing anything serde_json couldn't parse back.
+    fn enter(&mut self, levels: u32) -> Result<(), Unstorable> {
+        let depth = self.depth.checked_add(levels).ok_or_else(|| Unstorable(TOO_DEEP.into()))?;
+        if depth > MAX_DEPTH {
+            return Err(Unstorable(TOO_DEEP.into()));
+        }
+        self.depth = depth;
+        Ok(())
+    }
+    fn leave(&mut self, levels: u32) {
+        self.depth = self.depth.saturating_sub(levels);
+    }
+}
+
+/// One compound value being walked; leaving it when it ends keeps the depth exact.
+struct Compound<'a> {
+    walker: &'a mut Walker,
+    levels: u32,
+}
+
+impl<'a> Compound<'a> {
+    fn new(walker: &'a mut Walker, levels: u32) -> Result<Self, Unstorable> {
+        walker.enter(levels)?;
+        Ok(Self { walker, levels })
+    }
+    fn value<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        value.serialize(&mut *self.walker)
+    }
+    fn finish(self) -> Result<(), Unstorable> {
+        self.walker.leave(self.levels);
+        Ok(())
+    }
+}
+
+impl SerializeSeq for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_element<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeTuple for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_element<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeTupleStruct for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_field<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeTupleVariant for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_field<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeMap for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_key<T: Serialize + ?Sized>(&mut self, key: &T) -> Result<(), Unstorable> {
+        self.value(key)
+    }
+    fn serialize_value<T: Serialize + ?Sized>(&mut self, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeStruct for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_field<T: Serialize + ?Sized>(&mut self, _key: &'static str, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl SerializeStructVariant for Compound<'_> {
+    type Ok = ();
+    type Error = Unstorable;
+    fn serialize_field<T: Serialize + ?Sized>(&mut self, _key: &'static str, value: &T) -> Result<(), Unstorable> {
+        self.value(value)
+    }
+    fn end(self) -> Result<(), Unstorable> {
+        self.finish()
+    }
+}
+
+impl<'a> Serializer for &'a mut Walker {
+    type Ok = ();
+    type Error = Unstorable;
+    type SerializeSeq = Compound<'a>;
+    type SerializeTuple = Compound<'a>;
+    type SerializeTupleStruct = Compound<'a>;
+    type SerializeTupleVariant = Compound<'a>;
+    type SerializeMap = Compound<'a>;
+    type SerializeStruct = Compound<'a>;
+    type SerializeStructVariant = Compound<'a>;
+
+    fn serialize_bool(self, _v: bool) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_i8(self, _v: i8) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_i16(self, _v: i16) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_i32(self, _v: i32) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_i64(self, _v: i64) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_i128(self, _v: i128) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_u8(self, _v: u8) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_u16(self, _v: u16) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_u32(self, _v: u32) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_u64(self, _v: u64) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_u128(self, _v: u128) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_f32(self, v: f32) -> Result<(), Unstorable> {
+        if v.is_finite() { Ok(()) } else { Err(Unstorable(NOT_FINITE.into())) }
+    }
+    fn serialize_f64(self, v: f64) -> Result<(), Unstorable> {
+        if v.is_finite() { Ok(()) } else { Err(Unstorable(NOT_FINITE.into())) }
+    }
+    fn serialize_char(self, _v: char) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_str(self, _v: &str) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    /// serde_json writes bytes as an array of numbers: one level of nesting.
+    fn serialize_bytes(self, _v: &[u8]) -> Result<(), Unstorable> {
+        Compound::new(self, 1)?.finish()
+    }
+    /// Writes text for a `Display` value; it is a scalar, not a container.
+    fn collect_str<T: fmt::Display + ?Sized>(self, _v: &T) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_none(self) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_some<T: Serialize + ?Sized>(self, value: &T) -> Result<(), Unstorable> {
+        value.serialize(&mut *self)
+    }
+    fn serialize_unit(self) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_unit_struct(self, _name: &'static str) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_unit_variant(self, _name: &'static str, _index: u32, _variant: &'static str) -> Result<(), Unstorable> {
+        Ok(())
+    }
+    fn serialize_newtype_struct<T: Serialize + ?Sized>(self, _name: &'static str, value: &T) -> Result<(), Unstorable> {
+        value.serialize(self)
+    }
+    fn serialize_newtype_variant<T: Serialize + ?Sized>(self, _name: &'static str, _index: u32, _variant: &'static str, value: &T) -> Result<(), Unstorable> {
+        let mut compound = Compound::new(self, 1)?;
+        compound.value(value)?;
+        compound.finish()
+    }
+    fn serialize_seq(self, _len: Option<usize>) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 1)
+    }
+    fn serialize_tuple(self, _len: usize) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 1)
+    }
+    fn serialize_tuple_struct(self, _name: &'static str, _len: usize) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 1)
+    }
+    fn serialize_tuple_variant(self, _name: &'static str, _index: u32, _variant: &'static str, _len: usize) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 2)
+    }
+    fn serialize_map(self, _len: Option<usize>) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 1)
+    }
+    fn serialize_struct(self, _name: &'static str, _len: usize) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 1)
+    }
+    fn serialize_struct_variant(self, _name: &'static str, _index: u32, _variant: &'static str, _len: usize) -> Result<Compound<'a>, Unstorable> {
+        Compound::new(self, 2)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeMap;
+
+    use super::check;
+
+    #[test]
+    fn refuses_non_finite_numbers_anywhere() {
+        assert!(check(&1.5f64).is_ok());
+        assert!(check(&vec![Some(1.0f64), None]).is_ok());
+        assert!(check(&BTreeMap::from([("a".to_string(), 2.0f32)])).is_ok(), "finite floats in a map");
+        assert!(check(&f64::NAN).is_err());
+        assert!(check(&f64::INFINITY).is_err());
+        assert!(check(&vec![Some(f64::NEG_INFINITY)]).is_err(), "inside an option in a list");
+        assert!(check(&BTreeMap::from([("a".to_string(), f32::NAN)])).is_err(), "as a map value");
+    }
+
+    #[test]
+    fn depth_limit_matches_serde_json() {
+        for n in [127, 128] {
+            let mut v = serde_json::Value::Null;
+            for _ in 0..n {
+                v = serde_json::Value::Array(vec![v]);
+            }
+            let text = serde_json::to_string(&v).unwrap();
+            let reads_back = serde_json::from_str::<serde_json::Value>(&text).is_ok();
+            assert_eq!(check(&v).is_ok(), reads_back, "depth {n} agrees with serde_json");
+            assert_eq!(check(&v).is_ok(), n == 127, "depth {n}");
+        }
+    }
+
+    /// `n` nested lists around bytes, which serde_json writes as one more array.
+    struct BytesUnder(u32);
+
+    impl serde::Serialize for BytesUnder {
+        fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+            use serde::ser::SerializeSeq;
+            let Some(inner) = self.0.checked_sub(1) else {
+                return s.serialize_bytes(&[1]);
+            };
+            let mut seq = s.serialize_seq(Some(1))?;
+            seq.serialize_element(&BytesUnder(inner))?;
+            seq.end()
+        }
+    }
+
+    #[test]
+    fn bytes_count_as_one_level() {
+        for n in [126, 127] {
+            let text = serde_json::to_string(&BytesUnder(n)).unwrap();
+            let reads_back = serde_json::from_str::<serde_json::Value>(&text).is_ok();
+            assert_eq!(check(&BytesUnder(n)).is_ok(), reads_back, "depth {n} agrees with serde_json");
+            assert_eq!(check(&BytesUnder(n)).is_ok(), n == 126, "depth {n}");
+        }
+    }
+}
diff --git a/crates/project/src/footage.rs b/crates/project/src/footage.rs
new file mode 100644
index 000000000..391b1e17c
--- /dev/null
+++ b/crates/project/src/footage.rs
@@ -0,0 +1,229 @@
+use super::settings::yes;
+use super::{ColorSpace, Deserialize, FrameRate, Serialize, Tick};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FootageKind {
+    #[default]
+    Video,
+    Still,
+    Sequence,
+    Audio,
+    /// A 3D model (glTF 2.0 / OBJ), placed as a model layer.
+    Model,
+    /// A data file (JSON, CSV, TSV) for data-driven animation: read by expressions through
+    /// `footage(name).sourceData` / `sourceText` / `dataValue`; it has no pixels.
+    Data,
+}
+
+/// Interpret Footage ▸ Fields and Pulldown ▸ Separate Fields.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum FieldOrder {
+    /// Progressive frames.
+    #[default]
+    Off,
+    /// Interlaced, upper (odd) field first: each field becomes a frame at twice the rate.
+    UpperFirst,
+    LowerFirst,
+}
+
+impl FieldOrder {
+    pub fn label(self) -> &'static str {
+        match self {
+            FieldOrder::Off => "Off",
+            FieldOrder::UpperFirst => "Upper Field First",
+            FieldOrder::LowerFirst => "Lower Field First",
+        }
+    }
+    pub fn parse(s: &str) -> Option<FieldOrder> {
+        match s.to_ascii_lowercase().replace([' ', '_', '-'], "").as_str() {
+            "off" | "none" | "progressive" => Some(FieldOrder::Off),
+            "upper" | "upperfirst" | "upperfieldfirst" => Some(FieldOrder::UpperFirst),
+            "lower" | "lowerfirst" | "lowerfieldfirst" => Some(FieldOrder::LowerFirst),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AlphaMode {
+    #[default]
+    Straight,
+    Premultiplied,
+    Ignore,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Footage {
+    pub path: String,
+    pub kind: FootageKind,
+    pub width: u32,
+    pub height: u32,
+    pub pixel_aspect: f64,
+    pub frame_rate: FrameRate,
+    /// Native rate before "Conform to frame rate".
+    #[serde(default)]
+    pub native_rate: Option<FrameRate>,
+    pub duration: Tick,
+    pub has_video: bool,
+    pub has_audio: bool,
+    pub alpha: AlphaMode,
+    #[serde(default)]
+    pub premul_color: [f32; 3],
+    #[serde(default = "one")]
+    pub loop_count: u32,
+    #[serde(default)]
+    pub codec: String,
+    #[serde(default)]
+    pub missing: bool,
+    /// Image sequence files (when kind = Sequence).
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub sequence: Vec<String>,
+    /// Colour profile (from the file's metadata, or Interpret Footage). `None` = sRGB.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub color_profile: Option<ColorSpace>,
+    /// One layer of a layered file (Photoshop) instead of its merged image.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub layer: Option<SourceLayer>,
+    /// Interpret Footage ▸ Fields and Pulldown ▸ Separate Fields.
+    #[serde(default, skip_serializing_if = "is_default")]
+    pub fields: FieldOrder,
+    /// Interpret Footage ▸ Alpha ▸ Invert Alpha.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub invert_alpha: bool,
+    /// Interpret Footage ▸ Color ▸ Interpret As Linear Light: the file's values are linear.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub linear_light: bool,
+    /// Interpret Footage ▸ Color ▸ Preserve RGB: the file's values enter the composition
+    /// unconverted. Float footage (OpenEXR, float TIFF) is not sRGB-encoded on decode, and the
+    /// colour profile, Interpret As Linear Light and the working space don't apply.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub preserve_rgb: bool,
+    /// Data footage ([`FootageKind::Data`]): the file's text (JSON, CSV or TSV), kept in the
+    /// project so expressions read it everywhere (and on the web).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
+    /// PDF / Illustrator footage: the page shown (0-based; File ▸ Import ▸ Page).
+    #[serde(default, skip_serializing_if = "is_default")]
+    pub page: u32,
+    /// Image sequences imported with Force Alphabetical Order: the files play one after another
+    /// and their numbering doesn't count (otherwise a gap in it shows a placeholder, as in After
+    /// Effects; [`sequence`]).
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub alphabetical: bool,
+    /// Interpret Footage ▸ Start Timecode ▸ Override Start: the frame (at the footage's frame
+    /// rate) its timecode shows at its first frame. `None` = Use Source File Timecode (0: file
+    /// timecode isn't read). It only relabels source time, as in After Effects.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub start_timecode: Option<i64>,
+}
+
+fn is_default<T: Default + PartialEq>(v: &T) -> bool {
+    *v == T::default()
+}
+
+impl Default for Footage {
+    fn default() -> Self {
+        Footage {
+            path: String::new(),
+            kind: FootageKind::Still,
+            width: 0,
+            height: 0,
+            pixel_aspect: 1.0,
+            frame_rate: FrameRate::FPS_30,
+            native_rate: None,
+            duration: Tick::ZERO,
+            has_video: false,
+            has_audio: false,
+            alpha: AlphaMode::Straight,
+            premul_color: [0.0; 3],
+            loop_count: 1,
+            codec: String::new(),
+            missing: false,
+            sequence: vec![],
+            color_profile: None,
+            fields: FieldOrder::Off,
+            invert_alpha: false,
+            linear_light: false,
+            preserve_rgb: false,
+            data: None,
+            layer: None,
+            page: 0,
+            alphabetical: false,
+            start_timecode: None,
+        }
+    }
+}
+
+impl Footage {
+    /// Interpret As Linear Light applies (Preserve RGB passes the file's values through).
+    pub fn linear_light_applies(&self) -> bool {
+        self.linear_light && !self.preserve_rgb
+    }
+
+    /// How long the footage plays: its duration times Interpret Footage ▸ Loop.
+    pub fn looped_duration(&self) -> Tick {
+        Tick(self.duration.0.saturating_mul(self.loop_count.max(1) as i64))
+    }
+
+    /// Source time as the footage's timecode: its frame `frame` from Start Timecode
+    /// (`0:00:41:20`), as the Footage panel shows it.
+    pub fn timecode(&self, frame: i64) -> String {
+        effectcraft_time::format_timecode_ae(frame.saturating_add(self.start_timecode.unwrap_or(0)), self.frame_rate, false)
+    }
+
+    /// The data format of data footage: `json`, `csv` or `tsv` (from the file extension).
+    pub fn data_format(&self) -> Option<&'static str> {
+        if self.kind != FootageKind::Data {
+            return None;
+        }
+        let ext = std::path::Path::new(&self.path).extension().and_then(std::ffi::OsStr::to_str).unwrap_or("").to_ascii_lowercase();
+        Some(match ext.as_str() {
+            "csv" => "csv",
+            "tsv" | "tab" => "tsv",
+            _ => "json",
+        })
+    }
+}
+
+/// A proxy: a stand-in file used instead of a footage item or composition (File ▸ Set Proxy /
+/// Create Proxy), when its Use Proxy switch is on and the render's Proxy Use allows it.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Proxy {
+    /// The proxy's footage (path, size, rate…; File ▸ Interpret Footage ▸ Proxy edits it).
+    pub footage: Footage,
+    /// Use Proxy (the Project panel's proxy indicator: filled = in use, hollow = set but off).
+    #[serde(default = "yes")]
+    pub enabled: bool,
+}
+
+/// A layer of a layered still (a Photoshop document, or a PDF / Illustrator / EPS file) used as
+/// footage (File ▸ Import ▸ Composition / Composition – Retain Layer Sizes, or Choose Layer).
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct SourceLayer {
+    /// Layer record index in the file (bottom of the stack = 0).
+    pub index: u32,
+    pub name: String,
+    /// The footage is the layer's own bounds (Retain Layer Sizes) rather than the document size.
+    #[serde(default)]
+    pub layer_size: bool,
+    /// A Photoshop smart object: the unique id of its embedded file (linked layer data), which
+    /// is the footage instead of the layer's pixels.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub embedded: Option<String>,
+    /// A smart object with a perspective quad or a warp: the footage is its embedded file baked
+    /// as placed (warped and pinned to its corners) over the placed bounds in document space.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub placed: bool,
+}
+
+fn one() -> u32 {
+    1
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Solid {
+    pub color: [f32; 3],
+    pub width: u32,
+    pub height: u32,
+    pub pixel_aspect: f64,
+}
diff --git a/crates/project/src/item.rs b/crates/project/src/item.rs
new file mode 100644
index 000000000..3f53bc823
--- /dev/null
+++ b/crates/project/src/item.rs
@@ -0,0 +1,308 @@
+use super::comp::Comp;
+use super::footage::{Footage, FootageKind, Proxy, Solid};
+use super::layer::LayerSource;
+use super::settings::{APP_VERSION, ProjectError, ProjectSettings, SCHEMA_VERSION, SavedView};
+use super::{Arc, BTreeMap, Deserialize, FrameRate, Label, Project, Serialize, Tick, file_check, limits};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct ItemId(pub u64);
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct LayerId(pub u64);
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type")]
+#[allow(clippy::large_enum_variant)]
+pub enum ItemKind {
+    Folder,
+    Comp(Arc<Comp>),
+    Footage(Footage),
+    Solid(Solid),
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Item {
+    pub id: ItemId,
+    pub name: String,
+    pub label: Label,
+    #[serde(default)]
+    pub comment: String,
+    /// Containing folder (None = project root).
+    #[serde(default)]
+    pub parent: Option<ItemId>,
+    pub kind: ItemKind,
+    /// The item's proxy (footage and compositions).
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub proxy: Option<Box<Proxy>>,
+}
+
+impl Item {
+    pub fn type_name(&self) -> &'static str {
+        match &self.kind {
+            ItemKind::Folder => "Folder",
+            ItemKind::Comp(_) => "Composition",
+            ItemKind::Footage(f) => match f.kind {
+                FootageKind::Video => "Video",
+                FootageKind::Still => "Image",
+                FootageKind::Sequence => "Image Sequence",
+                FootageKind::Audio => "Audio",
+                FootageKind::Model => "3D Model",
+                FootageKind::Data => "Data",
+            },
+            ItemKind::Solid(_) => "Solid",
+        }
+    }
+    pub fn as_comp(&self) -> Option<&Comp> {
+        if let ItemKind::Comp(c) = &self.kind { Some(c) } else { None }
+    }
+    pub fn is_folder(&self) -> bool {
+        matches!(self.kind, ItemKind::Folder)
+    }
+    /// (width, height) for visual items.
+    pub fn dimensions(&self) -> Option<(u32, u32)> {
+        match &self.kind {
+            ItemKind::Comp(c) => Some((c.width, c.height)),
+            ItemKind::Footage(f) if f.has_video => Some((f.width, f.height)),
+            ItemKind::Solid(s) => Some((s.width, s.height)),
+            _ => None,
+        }
+    }
+    pub fn duration(&self) -> Option<Tick> {
+        match &self.kind {
+            ItemKind::Comp(c) => Some(c.duration),
+            ItemKind::Footage(f) if f.kind != FootageKind::Still => Some(f.looped_duration()),
+            _ => None,
+        }
+    }
+    pub fn frame_rate(&self) -> Option<FrameRate> {
+        match &self.kind {
+            ItemKind::Comp(c) => Some(c.frame_rate),
+            ItemKind::Footage(f) if f.kind == FootageKind::Video || f.kind == FootageKind::Sequence => Some(f.frame_rate),
+            _ => None,
+        }
+    }
+}
+
+impl Default for Project {
+    fn default() -> Self {
+        Project {
+            schema: SCHEMA_VERSION,
+            settings: ProjectSettings::default(),
+            items: BTreeMap::new(),
+            next_id: 1,
+            render_queue: Vec::new(),
+            render_templates: Default::default(),
+            render_prefs: Default::default(),
+        }
+    }
+}
+
+impl Project {
+    /// Allocate an id (items, layers and property uids share one counter).
+    pub fn alloc(&mut self) -> u64 {
+        let id = self.next_id;
+        self.next_id += 1;
+        id
+    }
+    pub fn item(&self, id: ItemId) -> Option<&Item> {
+        self.items.get(&id)
+    }
+    pub fn item_mut(&mut self, id: ItemId) -> Option<&mut Item> {
+        self.items.get_mut(&id)
+    }
+    pub fn comp(&self, id: ItemId) -> Option<&Comp> {
+        self.items.get(&id)?.as_comp()
+    }
+    /// A shared handle on a comp: a snapshot that costs a reference count, not a deep copy of
+    /// its layers (frontends hold one across a frame instead of cloning the comp).
+    pub fn comp_arc(&self, id: ItemId) -> Option<Arc<Comp>> {
+        match &self.items.get(&id)?.kind {
+            ItemKind::Comp(c) => Some(c.clone()),
+            _ => None,
+        }
+    }
+    /// Mutable comp (copy-on-write).
+    pub fn comp_mut(&mut self, id: ItemId) -> Option<&mut Comp> {
+        match &mut self.items.get_mut(&id)?.kind {
+            ItemKind::Comp(c) => Some(Arc::make_mut(c)),
+            _ => None,
+        }
+    }
+    /// Adds an item; its size, frame rate and the like are brought within [`limits`] first.
+    pub fn add_item(&mut self, name: &str, label: Label, parent: Option<ItemId>, mut kind: ItemKind) -> ItemId {
+        limits::repair_kind(name, &mut kind, &mut vec![]);
+        let id = ItemId(self.alloc());
+        self.items.insert(id, Item { id, name: name.into(), label, comment: String::new(), parent, kind, proxy: None });
+        id
+    }
+    /// Children of a folder (None = root), folders first then by name.
+    pub fn children(&self, folder: Option<ItemId>) -> Vec<&Item> {
+        let mut v: Vec<&Item> = self.items.values().filter(|i| i.parent == folder).collect();
+        v.sort_by(|a, b| b.is_folder().cmp(&a.is_folder()).then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase())));
+        v
+    }
+    pub fn comps(&self) -> impl Iterator<Item = (&ItemId, &Comp)> {
+        self.items.iter().filter_map(|(id, i)| i.as_comp().map(|c| (id, c)))
+    }
+    pub fn find_by_name(&self, name: &str) -> Option<&Item> {
+        self.items.values().find(|i| i.name == name)
+    }
+    /// A numbered name for a copy of `base` that no project item has (Edit ▸ Duplicate): its
+    /// trailing number is dropped and the lowest free one from 2 is added (`Comp 1` → `Comp 2`,
+    /// `Name` → `Name 2`, then `Name 3`). Items for which `ignore` holds don't count.
+    pub fn numbered_item_name(&self, base: &str, ignore: impl Fn(&Item) -> bool) -> String {
+        let stem = base.trim_end_matches(|c: char| c.is_ascii_digit()).trim_end();
+        let taken = |n: &str| self.items.values().any(|i| i.name == n && !ignore(i));
+        (2u64..).map(|k| format!("{stem} {k}")).find(|n| !taken(n)).unwrap_or_default()
+    }
+    /// `base` when no project item has that name, else the next free numbered name as
+    /// [`Project::numbered_item_name`] gives it. Items for which `ignore` holds don't count.
+    pub fn unique_item_name(&self, base: &str, ignore: impl Fn(&Item) -> bool) -> String {
+        if self.items.values().any(|i| i.name == base && !ignore(i)) { self.numbered_item_name(base, ignore) } else { base.to_string() }
+    }
+    pub fn folder_named(&self, name: &str) -> Option<ItemId> {
+        self.items.values().find(|i| i.is_folder() && i.name == name).map(|i| i.id)
+    }
+    /// Find the comp that contains `layer`.
+    pub fn comp_of_layer(&self, layer: LayerId) -> Option<ItemId> {
+        self.comps().find(|(_, c)| c.layer(layer).is_some()).map(|(id, _)| *id)
+    }
+    /// The compositions whose layers use `item` as their source (footage, solid, 3D model or
+    /// precomp), each with how many of its layers do, ordered by comp name then id. Only direct
+    /// layers count, as in After Effects' Project panel ("used 3 times"): a solid inside a precomp
+    /// is used by the precomp, not by the comps that nest it. The total is the sum of the counts.
+    pub fn item_users(&self, item: ItemId) -> Vec<(ItemId, usize)> {
+        let mut users: Vec<(ItemId, String, usize)> = self
+            .items
+            .iter()
+            .filter_map(|(id, it)| {
+                let comp = it.as_comp()?;
+                let n = comp.layers.iter().filter(|l| l.source.item() == Some(item)).count();
+                (n > 0).then(|| (*id, it.name.to_lowercase(), n))
+            })
+            .collect();
+        users.sort_by(|a, b| a.1.cmp(&b.1).then(a.0.cmp(&b.0)));
+        users.into_iter().map(|(id, _, n)| (id, n)).collect()
+    }
+    /// Whether comp `inner` is (transitively) nested inside comp `outer` (to prevent cycles).
+    pub fn comp_contains(&self, outer: ItemId, inner: ItemId) -> bool {
+        // A walk with a stack and a visited set rather than recursion (#1237): a damaged project
+        // may hold a precomp cycle that doesn't pass `inner` (recursion never ended), a long
+        // chain must not use up the call stack, and comps shared by many paths are visited once
+        // (recursion re-walked them for every path).
+        if outer == inner {
+            return true;
+        }
+        let mut seen = std::collections::HashSet::new();
+        let mut stack = vec![outer];
+        while let Some(id) = stack.pop() {
+            if !seen.insert(id) {
+                continue;
+            }
+            let Some(c) = self.comp(id) else { continue };
+            for l in &c.layers {
+                if let LayerSource::Comp { item } = l.source {
+                    if item == inner {
+                        return true;
+                    }
+                    if !seen.contains(&item) {
+                        stack.push(item);
+                    }
+                }
+            }
+        }
+        false
+    }
+    /// Make sure `next_id` exceeds every id in the project (after loading or merging).
+    pub fn fix_next_id(&mut self) {
+        let mut m = self.next_id;
+        for (id, it) in &self.items {
+            // Saturating: a damaged file's ids must not overflow (the import then refuses it).
+            m = m.max(id.0.saturating_add(1));
+            if let ItemKind::Comp(c) = &it.kind {
+                for l in &c.layers {
+                    m = m.max(l.id.0.saturating_add(1)).max(l.props.max_uid().saturating_add(1));
+                }
+            }
+        }
+        self.next_id = m;
+    }
+    /// Whether `other` holds the same content. An allocated id counts (an edit may hand it out
+    /// beyond the project, so it must stay taken). Shared compositions compare by pointer first,
+    /// so after a copy-on-write edit only the comps it touched are compared field by field.
+    pub fn same_content(&self, other: &Project) -> bool {
+        let item_eq = |a: &Item, b: &Item| {
+            let kind = match (&a.kind, &b.kind) {
+                (ItemKind::Comp(x), ItemKind::Comp(y)) => Arc::ptr_eq(x, y) || x == y,
+                (x, y) => x == y,
+            };
+            kind && a.id == b.id && a.name == b.name && a.label == b.label && a.comment == b.comment && a.parent == b.parent && a.proxy == b.proxy
+        };
+        self.schema == other.schema
+            && self.next_id == other.next_id
+            && self.settings == other.settings
+            && self.items.len() == other.items.len()
+            && self.items.iter().zip(&other.items).all(|((ka, a), (kb, b))| ka == kb && item_eq(a, b))
+            && self.render_queue == other.render_queue
+            && self.render_templates == other.render_templates
+            && self.render_prefs == other.render_prefs
+    }
+    /// The project file's text: the project with the version that wrote it (`savedBy`), checked
+    /// to read back, so a save never writes a file that can't be opened. Values JSON can't hold
+    /// (NaN or infinity, written as `null`, and nesting too deep to parse) are refused on every
+    /// save; debug builds also read the text back.
+    pub fn to_file_json(&self) -> Result<String, ProjectError> {
+        self.to_file_json_with_view(&SavedView::default())
+    }
+    /// [`Project::to_file_json`] that also records the open compositions ([`SavedView`]).
+    pub fn to_file_json_with_view(&self, view: &SavedView) -> Result<String, ProjectError> {
+        if self.schema > SCHEMA_VERSION {
+            return Err(ProjectError::Invalid(format!(
+                "the project can't be saved: it holds a value a project file can't store (project schema {} is newer than this version supports ({SCHEMA_VERSION}))",
+                self.schema
+            )));
+        }
+        #[derive(Serialize)]
+        struct File<'a> {
+            #[serde(rename = "savedBy")]
+            saved_by: &'a str,
+            #[serde(flatten)]
+            view: &'a SavedView,
+            #[serde(flatten)]
+            project: &'a Project,
+        }
+        let file = File { saved_by: APP_VERSION, view, project: self };
+        file_check::check(&file)
+            .map_err(|e| ProjectError::Invalid(format!("the project can't be saved: it holds a value a project file can't store ({e})")))?;
+        let text = serde_json::to_string_pretty(&file).map_err(|e| ProjectError::Invalid(format!("the project can't be saved: {e}")))?;
+        #[cfg(debug_assertions)]
+        Project::from_json(&text)
+            .map_err(|e| ProjectError::Invalid(format!("the project can't be saved: it holds a value a project file can't store ({e})")))?;
+        Ok(text)
+    }
+    pub fn to_json(&self) -> String {
+        serde_json::to_string_pretty(self).unwrap_or_default()
+    }
+    /// [`Project::to_json`] without indentation: smaller and faster (auto-saves).
+    pub fn to_json_compact(&self) -> String {
+        serde_json::to_string(self).unwrap_or_default()
+    }
+    pub fn from_json(s: &str) -> Result<Project, ProjectError> {
+        Project::from_json_repaired(s).map(|(p, _)| p)
+    }
+    /// [`Project::from_json`], also returning one line per value that was out of [`limits`] and
+    /// was corrected (a composition of a billion pixels, a zero frame rate…), so a corrupt or
+    /// hostile file still opens, within bounds, and the user can be told what changed.
+    pub fn from_json_repaired(s: &str) -> Result<(Project, Vec<String>), ProjectError> {
+        let mut p: Project = serde_json::from_str(s).map_err(|e| ProjectError::Invalid(e.to_string()))?;
+        if p.schema > SCHEMA_VERSION {
+            return Err(ProjectError::Invalid(format!("project schema {} is newer than this version supports ({SCHEMA_VERSION})", p.schema)));
+        }
+        p.fix_next_id();
+        let mut notes = vec![];
+        for item in p.items.values_mut() {
+            limits::repair_item(item, &mut notes);
+        }
+        Ok((p, notes))
+    }
+}
diff --git a/crates/project/src/layer.rs b/crates/project/src/layer.rs
new file mode 100644
index 000000000..25e2da7c4
--- /dev/null
+++ b/crates/project/src/layer.rs
@@ -0,0 +1,370 @@
+use super::item::{ItemId, LayerId};
+use super::settings::Marker;
+use super::{BlendMode, Deserialize, Label, PropGroup, Serialize, Tick};
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum LightKind {
+    Parallel,
+    Spot,
+    #[default]
+    Point,
+    Ambient,
+    Environment,
+}
+
+impl LightKind {
+    pub const ALL: [LightKind; 5] = [LightKind::Parallel, LightKind::Spot, LightKind::Point, LightKind::Ambient, LightKind::Environment];
+    pub fn label(self) -> &'static str {
+        match self {
+            LightKind::Parallel => "Parallel",
+            LightKind::Spot => "Spot",
+            LightKind::Point => "Point",
+            LightKind::Ambient => "Ambient",
+            LightKind::Environment => "Environment",
+        }
+    }
+}
+
+/// A parametric 3D primitive (Layer ▸ New ▸ Cube/Sphere/Plane/Torus/Cone/Cylinder).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum PrimitiveKind {
+    #[default]
+    Cube,
+    Sphere,
+    Plane,
+    Torus,
+    Cone,
+    Cylinder,
+}
+
+impl PrimitiveKind {
+    pub const ALL: [PrimitiveKind; 6] =
+        [PrimitiveKind::Cube, PrimitiveKind::Sphere, PrimitiveKind::Plane, PrimitiveKind::Torus, PrimitiveKind::Cone, PrimitiveKind::Cylinder];
+    pub fn label(self) -> &'static str {
+        match self {
+            PrimitiveKind::Cube => "Cube",
+            PrimitiveKind::Sphere => "Sphere",
+            PrimitiveKind::Plane => "Plane",
+            PrimitiveKind::Torus => "Torus",
+            PrimitiveKind::Cone => "Cone",
+            PrimitiveKind::Cylinder => "Cylinder",
+        }
+    }
+    pub fn parse(s: &str) -> Option<PrimitiveKind> {
+        PrimitiveKind::ALL.into_iter().find(|k| k.label().eq_ignore_ascii_case(s.trim()))
+    }
+}
+
+/// What a layer shows.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum LayerSource {
+    /// Footage item (video, still, sequence, audio).
+    Footage {
+        item: ItemId,
+    },
+    /// Nested composition (precomp).
+    Comp {
+        item: ItemId,
+    },
+    /// Solid item (solids also back adjustment layers).
+    Solid {
+        item: ItemId,
+    },
+    Text,
+    Shape,
+    Null,
+    Camera,
+    Light {
+        kind: LightKind,
+    },
+    /// An imported 3D model (a footage item of kind [`FootageKind::Model`]; Advanced 3D).
+    Model {
+        item: ItemId,
+    },
+    /// A parametric 3D primitive (Advanced 3D).
+    Primitive {
+        kind: PrimitiveKind,
+    },
+}
+
+impl LayerSource {
+    pub fn item(&self) -> Option<ItemId> {
+        match self {
+            LayerSource::Footage { item } | LayerSource::Comp { item } | LayerSource::Solid { item } | LayerSource::Model { item } => Some(*item),
+            _ => None,
+        }
+    }
+    pub fn type_name(&self) -> &'static str {
+        match self {
+            LayerSource::Footage { .. } => "Footage",
+            LayerSource::Comp { .. } => "Composition",
+            LayerSource::Solid { .. } => "Solid",
+            LayerSource::Text => "Text",
+            LayerSource::Shape => "Shape",
+            LayerSource::Null => "Null",
+            LayerSource::Camera => "Camera",
+            LayerSource::Light { .. } => "Light",
+            LayerSource::Model { .. } => "3D Model",
+            LayerSource::Primitive { .. } => "3D Primitive",
+        }
+    }
+    /// Layers with pixels (cameras, lights and nulls have none).
+    pub fn is_av(&self) -> bool {
+        !matches!(self, LayerSource::Camera | LayerSource::Light { .. } | LayerSource::Null)
+    }
+    /// A 3D model or primitive layer (meshes; drawn by the Advanced 3D renderer).
+    pub fn is_model(&self) -> bool {
+        matches!(self, LayerSource::Model { .. } | LayerSource::Primitive { .. })
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Quality {
+    #[default]
+    Best,
+    Draft,
+    Wireframe,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum Sampling {
+    #[default]
+    Bilinear,
+    Bicubic,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum FrameBlend {
+    #[default]
+    Off,
+    FrameMix,
+    PixelMotion,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Switches {
+    pub video: bool,
+    pub audio: bool,
+    pub solo: bool,
+    pub locked: bool,
+    pub shy: bool,
+    /// Collapse transformations (precomps) / continuously rasterize (vector layers).
+    pub collapse: bool,
+    pub quality: Quality,
+    pub sampling: Sampling,
+    pub effects: bool,
+    pub frame_blend: FrameBlend,
+    pub motion_blur: bool,
+    pub adjustment: bool,
+    pub three_d: bool,
+    pub guide: bool,
+}
+
+impl Default for Switches {
+    fn default() -> Self {
+        Switches {
+            video: true,
+            audio: true,
+            solo: false,
+            locked: false,
+            shy: false,
+            collapse: false,
+            quality: Quality::Best,
+            sampling: Sampling::Bilinear,
+            effects: true,
+            frame_blend: FrameBlend::Off,
+            motion_blur: false,
+            adjustment: false,
+            three_d: false,
+            guide: false,
+        }
+    }
+}
+
+// What a frame's pixels depend on. Caches key on it: the Audio, Lock and Shy switches and Hide
+// Shy Layers don't change pixels, so toggling them keeps cached frames (#103).
+
+impl Switches {
+    /// These switches with Audio, Lock and Shy at their defaults.
+    pub fn pixels(&self) -> Switches {
+        Switches { audio: true, locked: false, shy: false, ..self.clone() }
+    }
+}
+
+impl Layer {
+    /// Draws the same pixels as `o`: equal but for the Audio, Lock and Shy switches.
+    pub fn same_pixels(&self, o: &Layer) -> bool {
+        // Every field (no `..`: a new field must be considered here); the property tree last.
+        let Layer {
+            id,
+            name,
+            source,
+            label,
+            comment,
+            start_time,
+            in_point,
+            out_point,
+            stretch,
+            switches,
+            blend_mode,
+            preserve_transparency,
+            track_matte,
+            parent,
+            markers,
+            markers_locked,
+            auto_orient,
+            environment,
+            environment_background,
+            props,
+        } = self;
+        *id == o.id
+            && *name == o.name
+            && *source == o.source
+            && *label == o.label
+            && *comment == o.comment
+            && *start_time == o.start_time
+            && *in_point == o.in_point
+            && *out_point == o.out_point
+            && *stretch == o.stretch
+            && switches.pixels() == o.switches.pixels()
+            && *blend_mode == o.blend_mode
+            && *preserve_transparency == o.preserve_transparency
+            && *track_matte == o.track_matte
+            && *parent == o.parent
+            && *markers == o.markers
+            && *markers_locked == o.markers_locked
+            && *auto_orient == o.auto_orient
+            && *environment == o.environment
+            && *environment_background == o.environment_background
+            && *props == o.props
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum MatteKind {
+    #[default]
+    Alpha,
+    AlphaInverted,
+    Luma,
+    LumaInverted,
+}
+
+impl MatteKind {
+    pub const ALL: [MatteKind; 4] = [MatteKind::Alpha, MatteKind::AlphaInverted, MatteKind::Luma, MatteKind::LumaInverted];
+    pub fn label(self) -> &'static str {
+        match self {
+            MatteKind::Alpha => "Alpha Matte",
+            MatteKind::AlphaInverted => "Alpha Inverted Matte",
+            MatteKind::Luma => "Luma Matte",
+            MatteKind::LumaInverted => "Luma Inverted Matte",
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+pub struct TrackMatte {
+    pub layer: LayerId,
+    pub kind: MatteKind,
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum AutoOrient {
+    #[default]
+    Off,
+    AlongPath,
+    TowardsCamera,
+    TowardsPointOfInterest,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Layer {
+    pub id: LayerId,
+    pub name: String,
+    pub source: LayerSource,
+    pub label: Label,
+    #[serde(default)]
+    pub comment: String,
+    /// Comp time where the layer's time 0 sits.
+    pub start_time: Tick,
+    /// Visible span in comp time.
+    pub in_point: Tick,
+    pub out_point: Tick,
+    /// Time stretch in percent (100 = normal, negative = reversed).
+    pub stretch: f64,
+    pub switches: Switches,
+    pub blend_mode: BlendMode,
+    #[serde(default)]
+    pub preserve_transparency: bool,
+    #[serde(default)]
+    pub track_matte: Option<TrackMatte>,
+    #[serde(default)]
+    pub parent: Option<LayerId>,
+    #[serde(default)]
+    pub markers: Vec<Marker>,
+    /// Layer ▸ Markers ▸ Lock Markers.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub markers_locked: bool,
+    #[serde(default)]
+    pub auto_orient: AutoOrient,
+    /// Layer ▸ Environment Layer: the layer is the environment (image-based light and
+    /// reflections) of Advanced 3D comps instead of being drawn.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub environment: bool,
+    /// Layer ▸ Light ▸ Create Environment Light Background Layer: the layer's (equirectangular)
+    /// image is drawn as the 3D scene's backdrop, seen through the camera, instead of as a card.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub environment_background: bool,
+    /// The property tree (Masks, Effects, Transform, Text, Contents, Camera/Light options…).
+    pub props: PropGroup,
+}
+
+impl Layer {
+    pub fn is_active_at(&self, t: Tick) -> bool {
+        t >= self.in_point && t < self.out_point
+    }
+
+    /// Layer time for a comp time (stretch-aware).
+    pub fn layer_time(&self, comp_t: Tick) -> Tick {
+        let d = comp_t - self.start_time;
+        if (self.stretch - 100.0).abs() < 1e-9 { d } else { Tick((d.0 as f64 * 100.0 / self.stretch) as i64) }
+    }
+
+    /// Comp time for a layer time.
+    pub fn comp_time(&self, layer_t: Tick) -> Tick {
+        if (self.stretch - 100.0).abs() < 1e-9 { self.start_time + layer_t } else { self.start_time + Tick((layer_t.0 as f64 * self.stretch / 100.0) as i64) }
+    }
+
+    pub fn transform(&self) -> Option<&PropGroup> {
+        self.props.sub("transform")
+    }
+
+    pub fn transform_mut(&mut self) -> Option<&mut PropGroup> {
+        self.props.sub_mut("transform")
+    }
+
+    pub fn effects(&self) -> Option<&PropGroup> {
+        self.props.sub("effects")
+    }
+
+    pub fn masks(&self) -> Option<&PropGroup> {
+        self.props.sub("masks")
+    }
+
+    pub fn is_camera(&self) -> bool {
+        matches!(self.source, LayerSource::Camera)
+    }
+
+    pub fn is_light(&self) -> bool {
+        matches!(self.source, LayerSource::Light { .. })
+    }
+
+    /// The layer participates in 3D (3D switch, or cameras/lights which are always 3D).
+    pub fn is_3d(&self) -> bool {
+        self.switches.three_d || self.is_camera() || self.is_light()
+    }
+
+    pub fn has_video(&self) -> bool {
+        self.source.is_av() && self.switches.video
+    }
+}
diff --git a/crates/project/src/lib.rs b/crates/project/src/lib.rs
index 16d782165..8e1409c37 100644
--- a/crates/project/src/lib.rs
+++ b/crates/project/src/lib.rs
@@ -8,6 +8,7 @@
 
 pub mod build;
 pub mod essential;
+mod file_check;
 pub mod limits;
 pub mod props;
 pub mod render_queue;
@@ -28,1323 +29,20 @@ use serde::{Deserialize, Serialize};
 pub use effectcraft_keyframe as keyframe;
 pub use effectcraft_keyframe::{Keyframe, Value};
 
-/// The project file schema. 2: effects on layers without a source rectangle (shape, text)
-/// measure positions from the top-left of their comp-sized bounds (effect space), not from
-/// the layer's origin; projects from schema 1 are converted when opened (#227).
-pub const SCHEMA_VERSION: u32 = 2;
-
-/// The first schema in which effect positions are in effect space (see [`SCHEMA_VERSION`]).
-pub const SCHEMA_EFFECT_SPACE: u32 = 2;
-
-/// The EffectCraft version, written into project files as `savedBy`.
-pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-/// The EffectCraft version that wrote a project file (its `savedBy`), when it says.
-pub fn saved_by(text: &str) -> Option<String> {
-    #[derive(Deserialize)]
-    struct Meta {
-        #[serde(rename = "savedBy", default)]
-        saved_by: Option<String>,
-    }
-    serde_json::from_str::<Meta>(text).ok()?.saved_by
-}
-
-/// The compositions that were open when a project file was saved (`activeComp` and `openComps`
-/// next to `savedBy`), so it reopens where it was left (#748). Editor state rather than project
-/// content: opening a comp doesn't make the project unsaved, and it isn't part of
-/// [`Project`]. Older files have none; older versions ignore it.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SavedView {
-    /// The comp shown in the viewer and the Timeline.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub active_comp: Option<ItemId>,
-    /// The open comps (Timeline tabs), in tab order.
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub open_comps: Vec<ItemId>,
-}
-
-/// The view a project file was saved with ([`SavedView`]); empty for older files. Values that
-/// aren't ids are ignored (whether an id still names a comp is up to the caller).
-pub fn saved_view(text: &str) -> SavedView {
-    #[derive(Deserialize)]
-    struct Meta {
-        #[serde(rename = "activeComp", default)]
-        active_comp: Option<serde_json::Value>,
-        #[serde(rename = "openComps", default)]
-        open_comps: Option<serde_json::Value>,
-    }
-    let Ok(m) = serde_json::from_str::<Meta>(text) else { return SavedView::default() };
-    SavedView {
-        active_comp: m.active_comp.as_ref().and_then(serde_json::Value::as_u64).map(ItemId),
-        open_comps: m
-            .open_comps
-            .as_ref()
-            .and_then(serde_json::Value::as_array)
-            .map_or_else(Vec::new, |a| a.iter().filter_map(serde_json::Value::as_u64).map(ItemId).collect()),
-    }
-}
-
-/// Whether version `a` (`major.minor.patch`, pre-release suffixes ignored) is newer than `b`.
-pub fn is_newer_version(a: &str, b: &str) -> bool {
-    let parts = |v: &str| -> [u64; 3] {
-        let mut n = v.split(['-', '+']).next().unwrap_or("").split('.').map(|x| x.parse().unwrap_or(0));
-        [n.next().unwrap_or(0), n.next().unwrap_or(0), n.next().unwrap_or(0)]
-    };
-    parts(a) > parts(b)
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct ItemId(pub u64);
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct LayerId(pub u64);
-
-#[derive(Debug, thiserror::Error)]
-pub enum ProjectError {
-    #[error("no item {0:?}")]
-    NoItem(ItemId),
-    #[error("item {0:?} is not a composition")]
-    NotComp(ItemId),
-    #[error("no layer {0:?}")]
-    NoLayer(LayerId),
-    #[error("no property `{0}`")]
-    NoProperty(String),
-    #[error("{0}")]
-    Invalid(String),
-}
-
-/// Project bit depth.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BitDepth {
-    #[default]
-    Bpc8,
-    Bpc16,
-    Bpc32,
-}
-
-impl BitDepth {
-    pub fn label(self) -> &'static str {
-        match self {
-            BitDepth::Bpc8 => "8 bpc",
-            BitDepth::Bpc16 => "16 bpc",
-            BitDepth::Bpc32 => "32 bpc",
-        }
-    }
-    pub fn next(self) -> BitDepth {
-        match self {
-            BitDepth::Bpc8 => BitDepth::Bpc16,
-            BitDepth::Bpc16 => BitDepth::Bpc32,
-            BitDepth::Bpc32 => BitDepth::Bpc8,
-        }
-    }
-    pub fn is_float(self) -> bool {
-        self == BitDepth::Bpc32
-    }
-    /// Quantisation levels per channel of the integer depths (8 bpc: 255; 16 bpc: 32768, After
-    /// Effects' "15 + 1" bit range), `None` for 32 bpc float.
-    pub fn levels(self) -> Option<f32> {
-        match self {
-            BitDepth::Bpc8 => Some(255.0),
-            BitDepth::Bpc16 => Some(32768.0),
-            BitDepth::Bpc32 => None,
-        }
-    }
-    pub fn bits(self) -> u32 {
-        match self {
-            BitDepth::Bpc8 => 8,
-            BitDepth::Bpc16 => 16,
-            BitDepth::Bpc32 => 32,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum TimeDisplayStyle {
-    #[default]
-    Timecode,
-    Frames,
-    /// Feet + Frames, 35 mm film (16 frames per foot).
-    Feet35,
-    /// Feet + Frames, 16 mm film (40 frames per foot).
-    Feet16,
-}
-
-impl TimeDisplayStyle {
-    /// Frames per foot of the Feet + Frames styles.
-    pub fn frames_per_foot(self) -> Option<i64> {
-        match self {
-            TimeDisplayStyle::Feet35 => Some(16),
-            TimeDisplayStyle::Feet16 => Some(40),
-            _ => None,
-        }
-    }
-    pub fn id(self) -> &'static str {
-        match self {
-            TimeDisplayStyle::Timecode => "timecode",
-            TimeDisplayStyle::Frames => "frames",
-            TimeDisplayStyle::Feet35 => "feet35",
-            TimeDisplayStyle::Feet16 => "feet16",
-        }
-    }
-    pub fn parse(s: &str) -> Option<TimeDisplayStyle> {
-        let k: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
-        match k.as_str() {
-            "timecode" => Some(TimeDisplayStyle::Timecode),
-            "frames" => Some(TimeDisplayStyle::Frames),
-            "feet35" | "feetframes" | "feetandframes" | "feet35mm" | "35mm" | "feetframes35mm" => Some(TimeDisplayStyle::Feet35),
-            "feet16" | "feet16mm" | "16mm" | "feetframes16mm" => Some(TimeDisplayStyle::Feet16),
-            _ => None,
-        }
-    }
-}
-
-/// Project Settings ▸ Color ▸ Color Engine.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum ColorEngine {
-    /// Built-in colour management (ICC-style working spaces).
-    #[default]
-    Adobe,
-    /// OCIO managed, with the built-in configuration (ACES working spaces).
-    Ocio,
-}
-
-/// Project Settings ▸ Color ▸ HDR: how over-range (HDR) values reach a standard-dynamic-range
-/// display or output.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum HdrMode {
-    /// Values above 1.0 clip.
-    #[default]
-    Clip,
-    /// Highlights above 80% are companded (an exponential knee) into the remaining range.
-    Compand,
-    /// Extended Reinhard tone mapping of luminance (white at 4.0).
-    ToneMap,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ProjectSettings {
-    pub bit_depth: BitDepth,
-    /// Linearize Working Space: the working space uses linear light (1.0 gamma) for everything
-    /// (sources, effects, blending). Needs a working space.
-    pub linearize: bool,
-    /// Working Space (colour management). `None` = no colour management.
-    #[serde(default)]
-    pub working_space: Option<ColorSpace>,
-    /// Blend Colors Using 1.0 Gamma: layers blend in linear light (sources and effects stay in
-    /// the working space's encoding).
-    #[serde(default)]
-    pub blend_linear: bool,
-    pub time_display: TimeDisplayStyle,
-    /// Frame numbering starts at 0 (or 1).
-    pub frame_start: i64,
-    pub audio_sample_rate: u32,
-    /// Video Rendering and Effects ▸ Use: Mercury GPU Acceleration (`true`, the default; used
-    /// when a GPU adapter exists) or Mercury Software Only (`false`, the CPU compositor).
-    #[serde(default = "yes")]
-    pub gpu_acceleration: bool,
-    /// The project's comment (Metadata panel).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub comment: String,
-    /// Color Engine (Adobe-style built-in or OCIO with ACES working spaces).
-    #[serde(default)]
-    pub color_engine: ColorEngine,
-    /// HDR handling for standard-dynamic-range output (display and renders).
-    #[serde(default)]
-    pub hdr: HdrMode,
-    /// The space the top-level comp is output in (renders and the viewer's source). `None` =
-    /// sRGB; Rec. 2100 PQ / HLG give HDR output.
-    #[serde(default)]
-    pub output_space: Option<ColorSpace>,
-    /// Working Gamma, 2.2 or 2.4 (`app.project.workingGamma`): with no working space, the curve
-    /// Interpret As Linear Light footage is encoded with and Blend Colors Using 1.0 Gamma
-    /// linearizes with: the sRGB curve at 2.2, a pure 2.4 power curve at 2.4. Ignored with a
-    /// working space (as in After Effects).
-    #[serde(default = "gamma_22")]
-    pub working_gamma: f64,
-}
-
-fn gamma_22() -> f64 {
-    2.2
-}
-
-impl ProjectSettings {
-    /// Working Gamma is 2.4 (anything else reads as 2.2).
-    pub fn working_gamma_24(&self) -> bool {
-        (self.working_gamma - 2.4).abs() < 0.05
-    }
-}
-
-impl Default for ProjectSettings {
-    fn default() -> Self {
-        ProjectSettings {
-            bit_depth: BitDepth::Bpc8,
-            linearize: false,
-            working_space: None,
-            blend_linear: false,
-            time_display: TimeDisplayStyle::Timecode,
-            frame_start: 0,
-            audio_sample_rate: 48_000,
-            gpu_acceleration: true,
-            comment: String::new(),
-            color_engine: ColorEngine::Adobe,
-            hdr: HdrMode::Clip,
-            output_space: None,
-            working_gamma: 2.2,
-        }
-    }
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-pub struct Marker {
-    pub time: Tick,
-    #[serde(default)]
-    pub duration: Tick,
-    #[serde(default)]
-    pub comment: String,
-    #[serde(default)]
-    pub label: Label,
-    #[serde(default)]
-    pub chapter: String,
-    #[serde(default)]
-    pub url: String,
-    #[serde(default)]
-    pub protected: bool,
-    /// Web link frame target (`_blank`, a frame name…).
-    #[serde(default, skip_serializing_if = "String::is_empty")]
-    pub frame_target: String,
-    /// Flash/video cue point (Event or Navigation) with name and parameters.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cue_point: Option<CuePoint>,
-}
-
-/// A marker's cue point (Composition/Layer Marker dialog ▸ Cue Point).
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-pub struct CuePoint {
-    pub name: String,
-    /// Navigation (true) or Event cue point.
-    #[serde(default)]
-    pub navigation: bool,
-    /// (name, value) parameter pairs.
-    #[serde(default)]
-    pub params: Vec<(String, String)>,
-}
-
-/// 3D renderer of a composition.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Renderer {
-    #[default]
-    Classic3D,
-    Advanced3D,
-}
-
-/// A composition's Resolution (the Composition panel's Resolution/Down Sample Factor popup, View ▸
-/// Resolution): how many of its pixels the viewer renders. Auto follows the magnification.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Resolution {
-    #[default]
-    Auto,
-    Full,
-    Half,
-    Third,
-    Quarter,
-    /// View ▸ Resolution ▸ Custom: render every n-th pixel (2..=40).
-    Custom(u8),
-}
-
-impl Resolution {
-    pub const ALL: [Resolution; 5] = [Resolution::Auto, Resolution::Full, Resolution::Half, Resolution::Third, Resolution::Quarter];
-    pub fn label(self) -> &'static str {
-        match self {
-            Resolution::Auto => "Auto",
-            Resolution::Full => "Full",
-            Resolution::Half => "Half",
-            Resolution::Third => "Third",
-            Resolution::Quarter => "Quarter",
-            Resolution::Custom(_) => "Custom",
-        }
-    }
-    pub fn is_auto(&self) -> bool {
-        *self == Resolution::Auto
-    }
-    /// The down-sample factor (render every n-th pixel); `None` for Auto.
-    pub fn factor(self) -> Option<u8> {
-        match self {
-            Resolution::Auto => None,
-            Resolution::Full => Some(1),
-            Resolution::Half => Some(2),
-            Resolution::Third => Some(3),
-            Resolution::Quarter => Some(4),
-            Resolution::Custom(n) => Some(n),
-        }
-    }
-    /// The resolution that renders every `n`-th pixel (1 = Full … 4 = Quarter; up to 40).
-    pub fn from_factor(n: u64) -> Resolution {
-        match n.clamp(1, 40) {
-            1 => Resolution::Full,
-            2 => Resolution::Half,
-            3 => Resolution::Third,
-            4 => Resolution::Quarter,
-            n => Resolution::Custom(n as u8),
-        }
-    }
-    /// Render scale for a viewer magnification (and display pixel density).
-    pub fn scale(self, zoom: f32, ppp: f32) -> f64 {
-        match self.factor() {
-            Some(n) => 1.0 / f64::from(n.clamp(1, 40)),
-            // As in After Effects, Auto renders the pixels the magnification needs: the coarsest
-            // whole factor that still gives every screen pixel a rendered one (Full above 50 %,
-            // Half down to 33.3 %, Third down to 25 %, Quarter below), never fewer (#417).
-            None => {
-                let n = (1.0 / (zoom * ppp) as f64 + 1e-3).floor();
-                if n >= 1.0 { 1.0 / n.min(4.0) } else { 1.0 }
-            }
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Comp {
-    pub width: u32,
-    pub height: u32,
-    pub pixel_aspect: f64,
-    pub frame_rate: FrameRate,
-    pub duration: Tick,
-    /// Start timecode/frame shown for time 0.
-    pub display_start: Tick,
-    pub background: [f32; 3],
-    pub work_area: (Tick, Tick),
-    /// Layer #1 first (top of the stack).
-    pub layers: Vec<Layer>,
-    #[serde(default)]
-    pub markers: Vec<Marker>,
-    pub shutter_angle: f64,
-    pub shutter_phase: f64,
-    /// Samples Per Frame: the minimum motion-blur samples (and the count for 3D layers).
-    pub motion_blur_samples: u32,
-    /// Adaptive Sample Limit (Composition Settings ▸ Advanced): the most samples a 2D layer gets
-    /// when it moves far within the shutter.
-    #[serde(default = "adaptive_limit_default")]
-    pub motion_blur_adaptive_limit: u32,
-    #[serde(default)]
-    pub renderer: Renderer,
-    /// Comp switches (timeline toolbar).
-    #[serde(default)]
-    pub hide_shy: bool,
-    #[serde(default = "yes")]
-    pub enable_motion_blur: bool,
-    #[serde(default = "yes")]
-    pub enable_frame_blending: bool,
-    #[serde(default)]
-    pub draft_3d: bool,
-    /// Composition Settings ▸ Advanced ▸ Preserve frame rate when nested or in render queue:
-    /// nested in another comp, or rendered at another rate, it shows only its own frames.
-    #[serde(default)]
-    pub preserve_frame_rate: bool,
-    /// Composition Settings ▸ Advanced ▸ Preserve resolution when nested: nested in a comp
-    /// previewed at a lower resolution, it still renders at full size.
-    #[serde(default)]
-    pub preserve_resolution: bool,
-    #[serde(default)]
-    pub poster_time: Tick,
-    /// Global Light for layer styles (Layer ▸ Layer Styles ▸ Blending Options).
-    #[serde(default)]
-    pub global_light: styles::GlobalLight,
-    /// Viewer guides (View ▸ Add Guide…), in comp pixels.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub guides: Vec<Guide>,
-    /// Essential Graphics: the controls this comp exposes to instances and templates.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub essential: Option<essential::EssentialGraphics>,
-    /// The Composition panel's Resolution, saved with the project as in After Effects. It changes
-    /// what the viewer renders, not the comp's pixels ([`Comp::same_pixels`]), and stays out of
-    /// the undo history.
-    #[serde(default, skip_serializing_if = "Resolution::is_auto")]
-    pub resolution: Resolution,
-}
-
-/// A viewer guide line: vertical guides sit at an x position, horizontal ones at a y position.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Guide {
-    pub vertical: bool,
-    /// Comp pixels, or percent of the comp's width (vertical) / height (horizontal) when
-    /// [`Guide::percent`] is set.
-    pub position: f64,
-    /// A percentage guide (After Effects 26.5): `position` is a percent of the comp's size, so the
-    /// guide keeps its relative place when the comp is resized. Absent in older projects.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub percent: bool,
-}
-
-impl Guide {
-    /// The comp's extent along this guide's axis, never zero.
-    fn extent(&self, width: u32, height: u32) -> f64 {
-        f64::from(if self.vertical { width } else { height }).max(1.0)
-    }
-
-    /// The guide's position in comp pixels for a comp of this size.
-    pub fn px(&self, width: u32, height: u32) -> f64 {
-        if self.percent { self.position / 100.0 * self.extent(width, height) } else { self.position }
-    }
-
-    /// Place the guide at `px` comp pixels, keeping its unit.
-    pub fn set_px(&mut self, px: f64, width: u32, height: u32) {
-        self.position = if self.percent { px / self.extent(width, height) * 100.0 } else { px };
-    }
-
-    /// Switch between pixels and percent without moving the guide on the comp.
-    pub fn set_percent(&mut self, percent: bool, width: u32, height: u32) {
-        let px = self.px(width, height);
-        self.percent = percent;
-        self.set_px(px, width, height);
-    }
-}
-
-fn yes() -> bool {
-    true
-}
-
-fn adaptive_limit_default() -> u32 {
-    128
-}
-
-impl Comp {
-    pub fn new(width: u32, height: u32, frame_rate: FrameRate, duration: Tick) -> Comp {
-        Comp {
-            width,
-            height,
-            pixel_aspect: 1.0,
-            frame_rate,
-            duration,
-            display_start: Tick::ZERO,
-            background: [0.0, 0.0, 0.0],
-            work_area: (Tick::ZERO, duration),
-            layers: vec![],
-            markers: vec![],
-            shutter_angle: 180.0,
-            shutter_phase: -90.0,
-            motion_blur_samples: 16,
-            motion_blur_adaptive_limit: 128,
-            renderer: Renderer::Classic3D,
-            hide_shy: false,
-            enable_motion_blur: true,
-            enable_frame_blending: true,
-            draft_3d: false,
-            preserve_frame_rate: false,
-            preserve_resolution: false,
-            poster_time: Tick::ZERO,
-            guides: vec![],
-            global_light: styles::GlobalLight::default(),
-            essential: None,
-            resolution: Resolution::Auto,
-        }
-    }
-    /// Whether the composition has a frame at its time `t`: nested, it shows nothing before it
-    /// starts or after it ends (a precomp layer trimmed or remapped past it).
-    pub fn covers(&self, t: Tick) -> bool {
-        t >= Tick::ZERO && t < self.duration
-    }
-    /// A new, empty composition with this one's settings (frame rate, pixel aspect, background,
-    /// motion blur, frame blending and the 3D renderer), as Pre-compose makes.
-    pub fn nested_like(&self, width: u32, height: u32, duration: Tick) -> Comp {
-        Comp {
-            pixel_aspect: self.pixel_aspect,
-            background: self.background,
-            shutter_angle: self.shutter_angle,
-            shutter_phase: self.shutter_phase,
-            motion_blur_samples: self.motion_blur_samples,
-            motion_blur_adaptive_limit: self.motion_blur_adaptive_limit,
-            renderer: self.renderer,
-            enable_motion_blur: self.enable_motion_blur,
-            enable_frame_blending: self.enable_frame_blending,
-            preserve_frame_rate: self.preserve_frame_rate,
-            preserve_resolution: self.preserve_resolution,
-            ..Comp::new(width, height, self.frame_rate, duration)
-        }
-    }
-    pub fn layer(&self, id: LayerId) -> Option<&Layer> {
-        self.layers.iter().find(|l| l.id == id)
-    }
-    pub fn layer_mut(&mut self, id: LayerId) -> Option<&mut Layer> {
-        self.layers.iter_mut().find(|l| l.id == id)
-    }
-    /// 1-based layer number (#) of a layer.
-    pub fn index_of(&self, id: LayerId) -> Option<usize> {
-        self.layers.iter().position(|l| l.id == id).map(|i| i + 1)
-    }
-    pub fn layer_by_name(&self, name: &str) -> Option<&Layer> {
-        self.layers.iter().find(|l| l.name == name)
-    }
-    pub fn frame_duration(&self) -> Tick {
-        self.frame_rate.frame_duration()
-    }
-    /// Any 3D layer present (camera/lights or a 3D switch).
-    pub fn has_3d(&self) -> bool {
-        self.layers.iter().any(|l| l.switches.three_d || matches!(l.source, LayerSource::Camera | LayerSource::Light { .. }))
-    }
-    /// The active camera at `t`: the topmost enabled camera layer active at that time.
-    pub fn active_camera(&self, t: Tick) -> Option<&Layer> {
-        self.layers.iter().find(|l| matches!(l.source, LayerSource::Camera) && l.switches.video && l.is_active_at(t))
-    }
-    /// Unique layer name with a numeric suffix (`Shape Layer 2`).
-    pub fn unique_layer_name(&self, base: &str) -> String {
-        if !self.layers.iter().any(|l| l.name == base) {
-            return base.to_string();
-        }
-        let stem = base.trim_end_matches(|c: char| c.is_ascii_digit()).trim_end();
-        (2..).map(|i| format!("{stem} {i}")).find(|n| !self.layers.iter().any(|l| &l.name == n)).unwrap_or_default()
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum LightKind {
-    Parallel,
-    Spot,
-    #[default]
-    Point,
-    Ambient,
-    Environment,
-}
-
-impl LightKind {
-    pub const ALL: [LightKind; 5] = [LightKind::Parallel, LightKind::Spot, LightKind::Point, LightKind::Ambient, LightKind::Environment];
-    pub fn label(self) -> &'static str {
-        match self {
-            LightKind::Parallel => "Parallel",
-            LightKind::Spot => "Spot",
-            LightKind::Point => "Point",
-            LightKind::Ambient => "Ambient",
-            LightKind::Environment => "Environment",
-        }
-    }
-}
-
-/// A parametric 3D primitive (Layer ▸ New ▸ Cube/Sphere/Plane/Torus/Cone/Cylinder).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum PrimitiveKind {
-    #[default]
-    Cube,
-    Sphere,
-    Plane,
-    Torus,
-    Cone,
-    Cylinder,
-}
-
-impl PrimitiveKind {
-    pub const ALL: [PrimitiveKind; 6] =
-        [PrimitiveKind::Cube, PrimitiveKind::Sphere, PrimitiveKind::Plane, PrimitiveKind::Torus, PrimitiveKind::Cone, PrimitiveKind::Cylinder];
-    pub fn label(self) -> &'static str {
-        match self {
-            PrimitiveKind::Cube => "Cube",
-            PrimitiveKind::Sphere => "Sphere",
-            PrimitiveKind::Plane => "Plane",
-            PrimitiveKind::Torus => "Torus",
-            PrimitiveKind::Cone => "Cone",
-            PrimitiveKind::Cylinder => "Cylinder",
-        }
-    }
-    pub fn parse(s: &str) -> Option<PrimitiveKind> {
-        PrimitiveKind::ALL.into_iter().find(|k| k.label().eq_ignore_ascii_case(s.trim()))
-    }
-}
-
-/// What a layer shows.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum LayerSource {
-    /// Footage item (video, still, sequence, audio).
-    Footage {
-        item: ItemId,
-    },
-    /// Nested composition (precomp).
-    Comp {
-        item: ItemId,
-    },
-    /// Solid item (solids also back adjustment layers).
-    Solid {
-        item: ItemId,
-    },
-    Text,
-    Shape,
-    Null,
-    Camera,
-    Light {
-        kind: LightKind,
-    },
-    /// An imported 3D model (a footage item of kind [`FootageKind::Model`]; Advanced 3D).
-    Model {
-        item: ItemId,
-    },
-    /// A parametric 3D primitive (Advanced 3D).
-    Primitive {
-        kind: PrimitiveKind,
-    },
-}
-
-impl LayerSource {
-    pub fn item(&self) -> Option<ItemId> {
-        match self {
-            LayerSource::Footage { item } | LayerSource::Comp { item } | LayerSource::Solid { item } | LayerSource::Model { item } => Some(*item),
-            _ => None,
-        }
-    }
-    pub fn type_name(&self) -> &'static str {
-        match self {
-            LayerSource::Footage { .. } => "Footage",
-            LayerSource::Comp { .. } => "Composition",
-            LayerSource::Solid { .. } => "Solid",
-            LayerSource::Text => "Text",
-            LayerSource::Shape => "Shape",
-            LayerSource::Null => "Null",
-            LayerSource::Camera => "Camera",
-            LayerSource::Light { .. } => "Light",
-            LayerSource::Model { .. } => "3D Model",
-            LayerSource::Primitive { .. } => "3D Primitive",
-        }
-    }
-    /// Layers with pixels (cameras, lights and nulls have none).
-    pub fn is_av(&self) -> bool {
-        !matches!(self, LayerSource::Camera | LayerSource::Light { .. } | LayerSource::Null)
-    }
-    /// A 3D model or primitive layer (meshes; drawn by the Advanced 3D renderer).
-    pub fn is_model(&self) -> bool {
-        matches!(self, LayerSource::Model { .. } | LayerSource::Primitive { .. })
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Quality {
-    #[default]
-    Best,
-    Draft,
-    Wireframe,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Sampling {
-    #[default]
-    Bilinear,
-    Bicubic,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FrameBlend {
-    #[default]
-    Off,
-    FrameMix,
-    PixelMotion,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Switches {
-    pub video: bool,
-    pub audio: bool,
-    pub solo: bool,
-    pub locked: bool,
-    pub shy: bool,
-    /// Collapse transformations (precomps) / continuously rasterize (vector layers).
-    pub collapse: bool,
-    pub quality: Quality,
-    pub sampling: Sampling,
-    pub effects: bool,
-    pub frame_blend: FrameBlend,
-    pub motion_blur: bool,
-    pub adjustment: bool,
-    pub three_d: bool,
-    pub guide: bool,
-}
-
-impl Default for Switches {
-    fn default() -> Self {
-        Switches {
-            video: true,
-            audio: true,
-            solo: false,
-            locked: false,
-            shy: false,
-            collapse: false,
-            quality: Quality::Best,
-            sampling: Sampling::Bilinear,
-            effects: true,
-            frame_blend: FrameBlend::Off,
-            motion_blur: false,
-            adjustment: false,
-            three_d: false,
-            guide: false,
-        }
-    }
-}
-
-// What a frame's pixels depend on. Caches key on it: the Audio, Lock and Shy switches and Hide
-// Shy Layers don't change pixels, so toggling them keeps cached frames (#103).
-
-impl Switches {
-    /// These switches with Audio, Lock and Shy at their defaults.
-    pub fn pixels(&self) -> Switches {
-        Switches { audio: true, locked: false, shy: false, ..self.clone() }
-    }
-}
-
-impl Layer {
-    /// Draws the same pixels as `o`: equal but for the Audio, Lock and Shy switches.
-    pub fn same_pixels(&self, o: &Layer) -> bool {
-        // Every field (no `..`: a new field must be considered here); the property tree last.
-        let Layer {
-            id,
-            name,
-            source,
-            label,
-            comment,
-            start_time,
-            in_point,
-            out_point,
-            stretch,
-            switches,
-            blend_mode,
-            preserve_transparency,
-            track_matte,
-            parent,
-            markers,
-            markers_locked,
-            auto_orient,
-            environment,
-            environment_background,
-            props,
-        } = self;
-        *id == o.id
-            && *name == o.name
-            && *source == o.source
-            && *label == o.label
-            && *comment == o.comment
-            && *start_time == o.start_time
-            && *in_point == o.in_point
-            && *out_point == o.out_point
-            && *stretch == o.stretch
-            && switches.pixels() == o.switches.pixels()
-            && *blend_mode == o.blend_mode
-            && *preserve_transparency == o.preserve_transparency
-            && *track_matte == o.track_matte
-            && *parent == o.parent
-            && *markers == o.markers
-            && *markers_locked == o.markers_locked
-            && *auto_orient == o.auto_orient
-            && *environment == o.environment
-            && *environment_background == o.environment_background
-            && *props == o.props
-    }
-}
-
-impl Comp {
-    /// Draws the same pixels as `o`: equal but for its layers' Audio, Lock and Shy switches, Hide
-    /// Shy Layers and the viewer's Resolution.
-    pub fn same_pixels(&self, o: &Comp) -> bool {
-        // Every field (no `..`: a new field must be considered here); the layers last.
-        let Comp {
-            width,
-            height,
-            pixel_aspect,
-            frame_rate,
-            duration,
-            display_start,
-            background,
-            work_area,
-            layers,
-            markers,
-            shutter_angle,
-            shutter_phase,
-            motion_blur_samples,
-            motion_blur_adaptive_limit,
-            renderer,
-            hide_shy: _,
-            enable_motion_blur,
-            enable_frame_blending,
-            draft_3d,
-            preserve_frame_rate,
-            preserve_resolution,
-            poster_time,
-            global_light,
-            guides,
-            essential,
-            resolution: _,
-        } = self;
-        *width == o.width
-            && *height == o.height
-            && *pixel_aspect == o.pixel_aspect
-            && *frame_rate == o.frame_rate
-            && *duration == o.duration
-            && *display_start == o.display_start
-            && *background == o.background
-            && *work_area == o.work_area
-            && *markers == o.markers
-            && *shutter_angle == o.shutter_angle
-            && *shutter_phase == o.shutter_phase
-            && *motion_blur_samples == o.motion_blur_samples
-            && *motion_blur_adaptive_limit == o.motion_blur_adaptive_limit
-            && *renderer == o.renderer
-            && *enable_motion_blur == o.enable_motion_blur
-            && *enable_frame_blending == o.enable_frame_blending
-            && *draft_3d == o.draft_3d
-            && *preserve_frame_rate == o.preserve_frame_rate
-            && *preserve_resolution == o.preserve_resolution
-            && *poster_time == o.poster_time
-            && *global_light == o.global_light
-            && *guides == o.guides
-            && *essential == o.essential
-            && layers.len() == o.layers.len()
-            && layers.iter().zip(&o.layers).all(|(a, b)| a.same_pixels(b))
-    }
-
-    /// Draws the same pixels as `o` once plain markers are ignored: they change no pixels. Protected
-    /// time markers with a duration set the timing (Responsive Design), so those still count.
-    pub fn same_pixels_ignoring_markers(&self, o: &Comp) -> bool {
-        let protected =
-            |m: &[Marker]| -> Vec<(Tick, Tick)> { m.iter().filter(|m| m.protected && m.duration > Tick::ZERO).map(|m| (m.time, m.duration)).collect() };
-        if protected(&self.markers) != protected(&o.markers) {
-            return false;
-        }
-        let mut c = self.clone();
-        c.markers = o.markers.clone();
-        for (a, b) in c.layers.iter_mut().zip(&o.layers) {
-            a.markers = b.markers.clone();
-            a.markers_locked = b.markers_locked;
-        }
-        c.same_pixels(o)
-    }
-
-    /// The comp with those switches and the Resolution at their defaults (borrowed when they
-    /// already are), for keys that hash the whole comp.
-    pub fn pixel_form(&self) -> std::borrow::Cow<'_, Comp> {
-        if !self.hide_shy && self.resolution.is_auto() && self.layers.iter().all(|l| l.switches == l.switches.pixels()) {
-            return std::borrow::Cow::Borrowed(self);
-        }
-        let mut c = self.clone();
-        c.hide_shy = false;
-        c.resolution = Resolution::Auto;
-        for l in &mut c.layers {
-            l.switches = l.switches.pixels();
-        }
-        std::borrow::Cow::Owned(c)
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum MatteKind {
-    #[default]
-    Alpha,
-    AlphaInverted,
-    Luma,
-    LumaInverted,
-}
-
-impl MatteKind {
-    pub const ALL: [MatteKind; 4] = [MatteKind::Alpha, MatteKind::AlphaInverted, MatteKind::Luma, MatteKind::LumaInverted];
-    pub fn label(self) -> &'static str {
-        match self {
-            MatteKind::Alpha => "Alpha Matte",
-            MatteKind::AlphaInverted => "Alpha Inverted Matte",
-            MatteKind::Luma => "Luma Matte",
-            MatteKind::LumaInverted => "Luma Inverted Matte",
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct TrackMatte {
-    pub layer: LayerId,
-    pub kind: MatteKind,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AutoOrient {
-    #[default]
-    Off,
-    AlongPath,
-    TowardsCamera,
-    TowardsPointOfInterest,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Layer {
-    pub id: LayerId,
-    pub name: String,
-    pub source: LayerSource,
-    pub label: Label,
-    #[serde(default)]
-    pub comment: String,
-    /// Comp time where the layer's time 0 sits.
-    pub start_time: Tick,
-    /// Visible span in comp time.
-    pub in_point: Tick,
-    pub out_point: Tick,
-    /// Time stretch in percent (100 = normal, negative = reversed).
-    pub stretch: f64,
-    pub switches: Switches,
-    pub blend_mode: BlendMode,
-    #[serde(default)]
-    pub preserve_transparency: bool,
-    #[serde(default)]
-    pub track_matte: Option<TrackMatte>,
-    #[serde(default)]
-    pub parent: Option<LayerId>,
-    #[serde(default)]
-    pub markers: Vec<Marker>,
-    /// Layer ▸ Markers ▸ Lock Markers.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub markers_locked: bool,
-    #[serde(default)]
-    pub auto_orient: AutoOrient,
-    /// Layer ▸ Environment Layer: the layer is the environment (image-based light and
-    /// reflections) of Advanced 3D comps instead of being drawn.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub environment: bool,
-    /// Layer ▸ Light ▸ Create Environment Light Background Layer: the layer's (equirectangular)
-    /// image is drawn as the 3D scene's backdrop, seen through the camera, instead of as a card.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub environment_background: bool,
-    /// The property tree (Masks, Effects, Transform, Text, Contents, Camera/Light options…).
-    pub props: PropGroup,
-}
-
-impl Layer {
-    pub fn is_active_at(&self, t: Tick) -> bool {
-        t >= self.in_point && t < self.out_point
-    }
-    /// Layer time for a comp time (stretch-aware).
-    pub fn layer_time(&self, comp_t: Tick) -> Tick {
-        let d = comp_t - self.start_time;
-        if (self.stretch - 100.0).abs() < 1e-9 { d } else { Tick((d.0 as f64 * 100.0 / self.stretch) as i64) }
-    }
-    /// Comp time for a layer time.
-    pub fn comp_time(&self, layer_t: Tick) -> Tick {
-        if (self.stretch - 100.0).abs() < 1e-9 { self.start_time + layer_t } else { self.start_time + Tick((layer_t.0 as f64 * self.stretch / 100.0) as i64) }
-    }
-    pub fn transform(&self) -> Option<&PropGroup> {
-        self.props.sub("transform")
-    }
-    pub fn transform_mut(&mut self) -> Option<&mut PropGroup> {
-        self.props.sub_mut("transform")
-    }
-    pub fn effects(&self) -> Option<&PropGroup> {
-        self.props.sub("effects")
-    }
-    pub fn masks(&self) -> Option<&PropGroup> {
-        self.props.sub("masks")
-    }
-    pub fn is_camera(&self) -> bool {
-        matches!(self.source, LayerSource::Camera)
-    }
-    pub fn is_light(&self) -> bool {
-        matches!(self.source, LayerSource::Light { .. })
-    }
-    /// The layer participates in 3D (3D switch, or cameras/lights which are always 3D).
-    pub fn is_3d(&self) -> bool {
-        self.switches.three_d || self.is_camera() || self.is_light()
-    }
-    pub fn has_video(&self) -> bool {
-        self.source.is_av() && self.switches.video
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum FootageKind {
-    #[default]
-    Video,
-    Still,
-    Sequence,
-    Audio,
-    /// A 3D model (glTF 2.0 / OBJ), placed as a model layer.
-    Model,
-    /// A data file (JSON, CSV, TSV) for data-driven animation: read by expressions through
-    /// `footage(name).sourceData` / `sourceText` / `dataValue`; it has no pixels.
-    Data,
-}
-
-/// Interpret Footage ▸ Fields and Pulldown ▸ Separate Fields.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum FieldOrder {
-    /// Progressive frames.
-    #[default]
-    Off,
-    /// Interlaced, upper (odd) field first: each field becomes a frame at twice the rate.
-    UpperFirst,
-    LowerFirst,
-}
-
-impl FieldOrder {
-    pub fn label(self) -> &'static str {
-        match self {
-            FieldOrder::Off => "Off",
-            FieldOrder::UpperFirst => "Upper Field First",
-            FieldOrder::LowerFirst => "Lower Field First",
-        }
-    }
-    pub fn parse(s: &str) -> Option<FieldOrder> {
-        match s.to_ascii_lowercase().replace([' ', '_', '-'], "").as_str() {
-            "off" | "none" | "progressive" => Some(FieldOrder::Off),
-            "upper" | "upperfirst" | "upperfieldfirst" => Some(FieldOrder::UpperFirst),
-            "lower" | "lowerfirst" | "lowerfieldfirst" => Some(FieldOrder::LowerFirst),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub enum AlphaMode {
-    #[default]
-    Straight,
-    Premultiplied,
-    Ignore,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Footage {
-    pub path: String,
-    pub kind: FootageKind,
-    pub width: u32,
-    pub height: u32,
-    pub pixel_aspect: f64,
-    pub frame_rate: FrameRate,
-    /// Native rate before "Conform to frame rate".
-    #[serde(default)]
-    pub native_rate: Option<FrameRate>,
-    pub duration: Tick,
-    pub has_video: bool,
-    pub has_audio: bool,
-    pub alpha: AlphaMode,
-    #[serde(default)]
-    pub premul_color: [f32; 3],
-    #[serde(default = "one")]
-    pub loop_count: u32,
-    #[serde(default)]
-    pub codec: String,
-    #[serde(default)]
-    pub missing: bool,
-    /// Image sequence files (when kind = Sequence).
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub sequence: Vec<String>,
-    /// Colour profile (from the file's metadata, or Interpret Footage). `None` = sRGB.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub color_profile: Option<ColorSpace>,
-    /// One layer of a layered file (Photoshop) instead of its merged image.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub layer: Option<SourceLayer>,
-    /// Interpret Footage ▸ Fields and Pulldown ▸ Separate Fields.
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub fields: FieldOrder,
-    /// Interpret Footage ▸ Alpha ▸ Invert Alpha.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub invert_alpha: bool,
-    /// Interpret Footage ▸ Color ▸ Interpret As Linear Light: the file's values are linear.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub linear_light: bool,
-    /// Interpret Footage ▸ Color ▸ Preserve RGB: the file's values enter the composition
-    /// unconverted. Float footage (OpenEXR, float TIFF) is not sRGB-encoded on decode, and the
-    /// colour profile, Interpret As Linear Light and the working space don't apply.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub preserve_rgb: bool,
-    /// Data footage ([`FootageKind::Data`]): the file's text (JSON, CSV or TSV), kept in the
-    /// project so expressions read it everywhere (and on the web).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub data: Option<String>,
-    /// PDF / Illustrator footage: the page shown (0-based; File ▸ Import ▸ Page).
-    #[serde(default, skip_serializing_if = "is_default")]
-    pub page: u32,
-    /// Image sequences imported with Force Alphabetical Order: the files play one after another
-    /// and their numbering doesn't count (otherwise a gap in it shows a placeholder, as in After
-    /// Effects; [`sequence`]).
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub alphabetical: bool,
-    /// Interpret Footage ▸ Start Timecode ▸ Override Start: the frame (at the footage's frame
-    /// rate) its timecode shows at its first frame. `None` = Use Source File Timecode (0: file
-    /// timecode isn't read). It only relabels source time, as in After Effects.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub start_timecode: Option<i64>,
-}
-
-fn is_default<T: Default + PartialEq>(v: &T) -> bool {
-    *v == T::default()
-}
-
-impl Default for Footage {
-    fn default() -> Self {
-        Footage {
-            path: String::new(),
-            kind: FootageKind::Still,
-            width: 0,
-            height: 0,
-            pixel_aspect: 1.0,
-            frame_rate: FrameRate::FPS_30,
-            native_rate: None,
-            duration: Tick::ZERO,
-            has_video: false,
-            has_audio: false,
-            alpha: AlphaMode::Straight,
-            premul_color: [0.0; 3],
-            loop_count: 1,
-            codec: String::new(),
-            missing: false,
-            sequence: vec![],
-            color_profile: None,
-            fields: FieldOrder::Off,
-            invert_alpha: false,
-            linear_light: false,
-            preserve_rgb: false,
-            data: None,
-            layer: None,
-            page: 0,
-            alphabetical: false,
-            start_timecode: None,
-        }
-    }
-}
-
-impl Footage {
-    /// Interpret As Linear Light applies (Preserve RGB passes the file's values through).
-    pub fn linear_light_applies(&self) -> bool {
-        self.linear_light && !self.preserve_rgb
-    }
-
-    /// How long the footage plays: its duration times Interpret Footage ▸ Loop.
-    pub fn looped_duration(&self) -> Tick {
-        Tick(self.duration.0.saturating_mul(self.loop_count.max(1) as i64))
-    }
-
-    /// Source time as the footage's timecode: its frame `frame` from Start Timecode
-    /// (`0:00:41:20`), as the Footage panel shows it.
-    pub fn timecode(&self, frame: i64) -> String {
-        effectcraft_time::format_timecode_ae(frame.saturating_add(self.start_timecode.unwrap_or(0)), self.frame_rate, false)
-    }
-
-    /// The data format of data footage: `json`, `csv` or `tsv` (from the file extension).
-    pub fn data_format(&self) -> Option<&'static str> {
-        if self.kind != FootageKind::Data {
-            return None;
-        }
-        let ext = std::path::Path::new(&self.path).extension().and_then(|e| e.to_str()).unwrap_or("").to_ascii_lowercase();
-        Some(match ext.as_str() {
-            "csv" => "csv",
-            "tsv" | "tab" => "tsv",
-            _ => "json",
-        })
-    }
-}
-
-/// A proxy: a stand-in file used instead of a footage item or composition (File ▸ Set Proxy /
-/// Create Proxy), when its Use Proxy switch is on and the render's Proxy Use allows it.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Proxy {
-    /// The proxy's footage (path, size, rate…; File ▸ Interpret Footage ▸ Proxy edits it).
-    pub footage: Footage,
-    /// Use Proxy (the Project panel's proxy indicator: filled = in use, hollow = set but off).
-    #[serde(default = "yes")]
-    pub enabled: bool,
-}
-
-/// A layer of a layered still (a Photoshop document, or a PDF / Illustrator / EPS file) used as
-/// footage (File ▸ Import ▸ Composition / Composition – Retain Layer Sizes, or Choose Layer).
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SourceLayer {
-    /// Layer record index in the file (bottom of the stack = 0).
-    pub index: u32,
-    pub name: String,
-    /// The footage is the layer's own bounds (Retain Layer Sizes) rather than the document size.
-    #[serde(default)]
-    pub layer_size: bool,
-    /// A Photoshop smart object: the unique id of its embedded file (linked layer data), which
-    /// is the footage instead of the layer's pixels.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub embedded: Option<String>,
-    /// A smart object with a perspective quad or a warp: the footage is its embedded file baked
-    /// as placed (warped and pinned to its corners) over the placed bounds in document space.
-    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-    pub placed: bool,
-}
-
-fn one() -> u32 {
-    1
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Solid {
-    pub color: [f32; 3],
-    pub width: u32,
-    pub height: u32,
-    pub pixel_aspect: f64,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "type")]
-#[allow(clippy::large_enum_variant)]
-pub enum ItemKind {
-    Folder,
-    Comp(Arc<Comp>),
-    Footage(Footage),
-    Solid(Solid),
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Item {
-    pub id: ItemId,
-    pub name: String,
-    pub label: Label,
-    #[serde(default)]
-    pub comment: String,
-    /// Containing folder (None = project root).
-    #[serde(default)]
-    pub parent: Option<ItemId>,
-    pub kind: ItemKind,
-    /// The item's proxy (footage and compositions).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub proxy: Option<Box<Proxy>>,
-}
-
-impl Item {
-    pub fn type_name(&self) -> &'static str {
-        match &self.kind {
-            ItemKind::Folder => "Folder",
-            ItemKind::Comp(_) => "Composition",
-            ItemKind::Footage(f) => match f.kind {
-                FootageKind::Video => "Video",
-                FootageKind::Still => "Image",
-                FootageKind::Sequence => "Image Sequence",
-                FootageKind::Audio => "Audio",
-                FootageKind::Model => "3D Model",
-                FootageKind::Data => "Data",
-            },
-            ItemKind::Solid(_) => "Solid",
-        }
-    }
-    pub fn as_comp(&self) -> Option<&Comp> {
-        if let ItemKind::Comp(c) = &self.kind { Some(c) } else { None }
-    }
-    pub fn is_folder(&self) -> bool {
-        matches!(self.kind, ItemKind::Folder)
-    }
-    /// (width, height) for visual items.
-    pub fn dimensions(&self) -> Option<(u32, u32)> {
-        match &self.kind {
-            ItemKind::Comp(c) => Some((c.width, c.height)),
-            ItemKind::Footage(f) if f.has_video => Some((f.width, f.height)),
-            ItemKind::Solid(s) => Some((s.width, s.height)),
-            _ => None,
-        }
-    }
-    pub fn duration(&self) -> Option<Tick> {
-        match &self.kind {
-            ItemKind::Comp(c) => Some(c.duration),
-            ItemKind::Footage(f) if f.kind != FootageKind::Still => Some(f.looped_duration()),
-            _ => None,
-        }
-    }
-    pub fn frame_rate(&self) -> Option<FrameRate> {
-        match &self.kind {
-            ItemKind::Comp(c) => Some(c.frame_rate),
-            ItemKind::Footage(f) if f.kind == FootageKind::Video || f.kind == FootageKind::Sequence => Some(f.frame_rate),
-            _ => None,
-        }
-    }
-}
+mod comp;
+mod footage;
+mod item;
+mod layer;
+mod settings;
+
+pub use comp::{Comp, Guide, Renderer, Resolution};
+pub use footage::{AlphaMode, FieldOrder, Footage, FootageKind, Proxy, Solid, SourceLayer};
+pub use item::{Item, ItemId, ItemKind, LayerId};
+pub use layer::{AutoOrient, FrameBlend, Layer, LayerSource, LightKind, MatteKind, PrimitiveKind, Quality, Sampling, Switches, TrackMatte};
+pub use settings::{
+    APP_VERSION, BitDepth, ColorEngine, CuePoint, HdrMode, Marker, ProjectError, ProjectSettings, SCHEMA_EFFECT_SPACE, SCHEMA_VERSION, SavedView,
+    TimeDisplayStyle, is_newer_version, saved_by, saved_view,
+};
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Project {
@@ -1363,198 +61,5 @@ pub struct Project {
     pub render_prefs: render_queue::RenderQueuePrefs,
 }
 
-impl Default for Project {
-    fn default() -> Self {
-        Project {
-            schema: SCHEMA_VERSION,
-            settings: ProjectSettings::default(),
-            items: BTreeMap::new(),
-            next_id: 1,
-            render_queue: Vec::new(),
-            render_templates: Default::default(),
-            render_prefs: Default::default(),
-        }
-    }
-}
-
-impl Project {
-    /// Allocate an id (items, layers and property uids share one counter).
-    pub fn alloc(&mut self) -> u64 {
-        let id = self.next_id;
-        self.next_id += 1;
-        id
-    }
-    pub fn item(&self, id: ItemId) -> Option<&Item> {
-        self.items.get(&id)
-    }
-    pub fn item_mut(&mut self, id: ItemId) -> Option<&mut Item> {
-        self.items.get_mut(&id)
-    }
-    pub fn comp(&self, id: ItemId) -> Option<&Comp> {
-        self.items.get(&id)?.as_comp()
-    }
-    /// A shared handle on a comp: a snapshot that costs a reference count, not a deep copy of
-    /// its layers (frontends hold one across a frame instead of cloning the comp).
-    pub fn comp_arc(&self, id: ItemId) -> Option<Arc<Comp>> {
-        match &self.items.get(&id)?.kind {
-            ItemKind::Comp(c) => Some(c.clone()),
-            _ => None,
-        }
-    }
-    /// Mutable comp (copy-on-write).
-    pub fn comp_mut(&mut self, id: ItemId) -> Option<&mut Comp> {
-        match &mut self.items.get_mut(&id)?.kind {
-            ItemKind::Comp(c) => Some(Arc::make_mut(c)),
-            _ => None,
-        }
-    }
-    /// Adds an item; its size, frame rate and the like are brought within [`limits`] first.
-    pub fn add_item(&mut self, name: &str, label: Label, parent: Option<ItemId>, mut kind: ItemKind) -> ItemId {
-        limits::repair_kind(name, &mut kind, &mut vec![]);
-        let id = ItemId(self.alloc());
-        self.items.insert(id, Item { id, name: name.into(), label, comment: String::new(), parent, kind, proxy: None });
-        id
-    }
-    /// Children of a folder (None = root), folders first then by name.
-    pub fn children(&self, folder: Option<ItemId>) -> Vec<&Item> {
-        let mut v: Vec<&Item> = self.items.values().filter(|i| i.parent == folder).collect();
-        v.sort_by(|a, b| b.is_folder().cmp(&a.is_folder()).then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase())));
-        v
-    }
-    pub fn comps(&self) -> impl Iterator<Item = (&ItemId, &Comp)> {
-        self.items.iter().filter_map(|(id, i)| i.as_comp().map(|c| (id, c)))
-    }
-    pub fn find_by_name(&self, name: &str) -> Option<&Item> {
-        self.items.values().find(|i| i.name == name)
-    }
-    /// A numbered name for a copy of `base` that no project item has (Edit ▸ Duplicate): its
-    /// trailing number is dropped and the lowest free one from 2 is added (`Comp 1` → `Comp 2`,
-    /// `Name` → `Name 2`, then `Name 3`). Items for which `ignore` holds don't count.
-    pub fn numbered_item_name(&self, base: &str, ignore: impl Fn(&Item) -> bool) -> String {
-        let stem = base.trim_end_matches(|c: char| c.is_ascii_digit()).trim_end();
-        let taken = |n: &str| self.items.values().any(|i| i.name == n && !ignore(i));
-        (2u64..).map(|k| format!("{stem} {k}")).find(|n| !taken(n)).unwrap_or_default()
-    }
-    /// `base` when no project item has that name, else the next free numbered name as
-    /// [`Project::numbered_item_name`] gives it. Items for which `ignore` holds don't count.
-    pub fn unique_item_name(&self, base: &str, ignore: impl Fn(&Item) -> bool) -> String {
-        if self.items.values().any(|i| i.name == base && !ignore(i)) { self.numbered_item_name(base, ignore) } else { base.to_string() }
-    }
-    pub fn folder_named(&self, name: &str) -> Option<ItemId> {
-        self.items.values().find(|i| i.is_folder() && i.name == name).map(|i| i.id)
-    }
-    /// Find the comp that contains `layer`.
-    pub fn comp_of_layer(&self, layer: LayerId) -> Option<ItemId> {
-        self.comps().find(|(_, c)| c.layer(layer).is_some()).map(|(id, _)| *id)
-    }
-    /// The compositions whose layers use `item` as their source (footage, solid, 3D model or
-    /// precomp), each with how many of its layers do, ordered by comp name then id. Only direct
-    /// layers count, as in After Effects' Project panel ("used 3 times"): a solid inside a precomp
-    /// is used by the precomp, not by the comps that nest it. The total is the sum of the counts.
-    pub fn item_users(&self, item: ItemId) -> Vec<(ItemId, usize)> {
-        let mut users: Vec<(ItemId, String, usize)> = self
-            .items
-            .iter()
-            .filter_map(|(id, it)| {
-                let comp = it.as_comp()?;
-                let n = comp.layers.iter().filter(|l| l.source.item() == Some(item)).count();
-                (n > 0).then(|| (*id, it.name.to_lowercase(), n))
-            })
-            .collect();
-        users.sort_by(|a, b| a.1.cmp(&b.1).then(a.0.cmp(&b.0)));
-        users.into_iter().map(|(id, _, n)| (id, n)).collect()
-    }
-    /// Whether comp `inner` is (transitively) nested inside comp `outer` (to prevent cycles).
-    pub fn comp_contains(&self, outer: ItemId, inner: ItemId) -> bool {
-        if outer == inner {
-            return true;
-        }
-        let Some(c) = self.comp(outer) else { return false };
-        c.layers.iter().any(|l| matches!(l.source, LayerSource::Comp { item } if self.comp_contains(item, inner)))
-    }
-    /// Make sure `next_id` exceeds every id in the project (after loading or merging).
-    pub fn fix_next_id(&mut self) {
-        let mut m = self.next_id;
-        for (id, it) in &self.items {
-            // Saturating: a damaged file's ids must not overflow (the import then refuses it).
-            m = m.max(id.0.saturating_add(1));
-            if let ItemKind::Comp(c) = &it.kind {
-                for l in &c.layers {
-                    m = m.max(l.id.0.saturating_add(1)).max(l.props.max_uid().saturating_add(1));
-                }
-            }
-        }
-        self.next_id = m;
-    }
-    /// Whether `other` holds the same content. An allocated id counts (an edit may hand it out
-    /// beyond the project, so it must stay taken). Shared compositions compare by pointer first,
-    /// so after a copy-on-write edit only the comps it touched are compared field by field.
-    pub fn same_content(&self, other: &Project) -> bool {
-        let item_eq = |a: &Item, b: &Item| {
-            let kind = match (&a.kind, &b.kind) {
-                (ItemKind::Comp(x), ItemKind::Comp(y)) => Arc::ptr_eq(x, y) || x == y,
-                (x, y) => x == y,
-            };
-            kind && a.id == b.id && a.name == b.name && a.label == b.label && a.comment == b.comment && a.parent == b.parent && a.proxy == b.proxy
-        };
-        self.schema == other.schema
-            && self.next_id == other.next_id
-            && self.settings == other.settings
-            && self.items.len() == other.items.len()
-            && self.items.iter().zip(&other.items).all(|((ka, a), (kb, b))| ka == kb && item_eq(a, b))
-            && self.render_queue == other.render_queue
-            && self.render_templates == other.render_templates
-            && self.render_prefs == other.render_prefs
-    }
-    /// The project file's text: the project with the version that wrote it (`savedBy`), checked
-    /// to read back, so a save never writes a file that can't be opened (JSON has no NaN or
-    /// infinity: such a value would be written as `null`).
-    pub fn to_file_json(&self) -> Result<String, ProjectError> {
-        self.to_file_json_with_view(&SavedView::default())
-    }
-    /// [`Project::to_file_json`] that also records the open compositions ([`SavedView`]).
-    pub fn to_file_json_with_view(&self, view: &SavedView) -> Result<String, ProjectError> {
-        #[derive(Serialize)]
-        struct File<'a> {
-            #[serde(rename = "savedBy")]
-            saved_by: &'a str,
-            #[serde(flatten)]
-            view: &'a SavedView,
-            #[serde(flatten)]
-            project: &'a Project,
-        }
-        let text = serde_json::to_string_pretty(&File { saved_by: APP_VERSION, view, project: self })
-            .map_err(|e| ProjectError::Invalid(format!("the project can't be saved: {e}")))?;
-        Project::from_json(&text)
-            .map_err(|e| ProjectError::Invalid(format!("the project can't be saved: it holds a value a project file can't store ({e})")))?;
-        Ok(text)
-    }
-    pub fn to_json(&self) -> String {
-        serde_json::to_string_pretty(self).unwrap_or_default()
-    }
-    /// [`Project::to_json`] without indentation: smaller and faster (auto-saves).
-    pub fn to_json_compact(&self) -> String {
-        serde_json::to_string(self).unwrap_or_default()
-    }
-    pub fn from_json(s: &str) -> Result<Project, ProjectError> {
-        Project::from_json_repaired(s).map(|(p, _)| p)
-    }
-    /// [`Project::from_json`], also returning one line per value that was out of [`limits`] and
-    /// was corrected (a composition of a billion pixels, a zero frame rate…), so a corrupt or
-    /// hostile file still opens, within bounds, and the user can be told what changed.
-    pub fn from_json_repaired(s: &str) -> Result<(Project, Vec<String>), ProjectError> {
-        let mut p: Project = serde_json::from_str(s).map_err(|e| ProjectError::Invalid(e.to_string()))?;
-        if p.schema > SCHEMA_VERSION {
-            return Err(ProjectError::Invalid(format!("project schema {} is newer than this version supports ({SCHEMA_VERSION})", p.schema)));
-        }
-        p.fix_next_id();
-        let mut notes = vec![];
-        for item in p.items.values_mut() {
-            limits::repair_item(item, &mut notes);
-        }
-        Ok((p, notes))
-    }
-}
-
 #[cfg(test)]
 mod tests;
diff --git a/crates/project/src/render_templates.rs b/crates/project/src/render_templates.rs
index cf52b000e..cadfab2ad 100644
--- a/crates/project/src/render_templates.rs
+++ b/crates/project/src/render_templates.rs
@@ -8,7 +8,9 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::render_queue::*;
+use crate::render_queue::{
+    AlphaMode, Channels, CurrentOrOff, FieldRender, OutputFormat, OutputModule, ProResProfile, ProxyUse, RenderQuality, RenderSettings, SwitchOverride,
+};
 use effectcraft_time::FrameRate;
 
 /// A default slot (the Defaults section of the Templates dialogs).
@@ -288,6 +290,7 @@ impl RenderTemplates {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::render_queue::{ColorDepth, Crop};
 
     #[test]
     fn builtins_defaults_and_round_trip() {
diff --git a/crates/project/src/settings.rs b/crates/project/src/settings.rs
new file mode 100644
index 000000000..5d3d57204
--- /dev/null
+++ b/crates/project/src/settings.rs
@@ -0,0 +1,314 @@
+use super::item::{ItemId, LayerId};
+use super::{BTreeMap, ColorSpace, Deserialize, Label, Serialize, Tick};
+
+/// The project file schema. 2: effects on layers without a source rectangle (shape, text)
+/// measure positions from the top-left of their comp-sized bounds (effect space), not from
+/// the layer's origin; projects from schema 1 are converted when opened (#227).
+pub const SCHEMA_VERSION: u32 = 2;
+
+/// The first schema in which effect positions are in effect space (see [`SCHEMA_VERSION`]).
+pub const SCHEMA_EFFECT_SPACE: u32 = 2;
+
+/// The EffectCraft version, written into project files as `savedBy`.
+pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+/// The EffectCraft version that wrote a project file (its `savedBy`), when it says.
+pub fn saved_by(text: &str) -> Option<String> {
+    #[derive(Deserialize)]
+    struct Meta {
+        #[serde(rename = "savedBy", default)]
+        saved_by: Option<String>,
+    }
+    serde_json::from_str::<Meta>(text).ok()?.saved_by
+}
+
+/// The compositions that were open when a project file was saved and their current times
+/// (`activeComp`, `openComps` and `compTimes` next to `savedBy`), so it reopens where it was left
+/// (#748, #1714). Editor state rather than project
+/// content: opening a comp doesn't make the project unsaved, and it isn't part of
+/// [`Project`]. Older files have none; older versions ignore it.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SavedView {
+    /// The comp shown in the viewer and the Timeline.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub active_comp: Option<ItemId>,
+    /// The open comps (Timeline tabs), in tab order.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub open_comps: Vec<ItemId>,
+    /// Each comp's current time, so a project reopens on the frame it was saved at rather than
+    /// at 0, where its layers may not have started yet (#1714).
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub comp_times: BTreeMap<ItemId, Tick>,
+}
+
+/// The view a project file was saved with ([`SavedView`]); empty for older files. Values that
+/// aren't ids are ignored (whether an id still names a comp is up to the caller).
+pub fn saved_view(text: &str) -> SavedView {
+    #[derive(Deserialize)]
+    struct Meta {
+        #[serde(rename = "activeComp", default)]
+        active_comp: Option<serde_json::Value>,
+        #[serde(rename = "openComps", default)]
+        open_comps: Option<serde_json::Value>,
+        #[serde(rename = "compTimes", default)]
+        comp_times: Option<serde_json::Value>,
+    }
+    let Ok(m) = serde_json::from_str::<Meta>(text) else { return SavedView::default() };
+    SavedView {
+        active_comp: m.active_comp.as_ref().and_then(serde_json::Value::as_u64).map(ItemId),
+        open_comps: m
+            .open_comps
+            .as_ref()
+            .and_then(serde_json::Value::as_array)
+            .map_or_else(Vec::new, |a| a.iter().filter_map(serde_json::Value::as_u64).map(ItemId).collect()),
+        comp_times: m
+            .comp_times
+            .as_ref()
+            .and_then(serde_json::Value::as_object)
+            .map_or_else(BTreeMap::new, |o| o.iter().filter_map(|(k, v)| Some((ItemId(k.parse().ok()?), Tick(v.as_i64()?)))).collect()),
+    }
+}
+
+/// Whether version `a` (`major.minor.patch`, pre-release suffixes ignored) is newer than `b`.
+pub fn is_newer_version(a: &str, b: &str) -> bool {
+    let parts = |v: &str| -> [u64; 3] {
+        let mut n = v.split(['-', '+']).next().unwrap_or("").split('.').map(|x| x.parse().unwrap_or(0));
+        [n.next().unwrap_or(0), n.next().unwrap_or(0), n.next().unwrap_or(0)]
+    };
+    parts(a) > parts(b)
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ProjectError {
+    #[error("no item {0:?}")]
+    NoItem(ItemId),
+    #[error("item {0:?} is not a composition")]
+    NotComp(ItemId),
+    #[error("no layer {0:?}")]
+    NoLayer(LayerId),
+    #[error("no property `{0}`")]
+    NoProperty(String),
+    #[error("{0}")]
+    Invalid(String),
+}
+
+/// Project bit depth.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum BitDepth {
+    #[default]
+    Bpc8,
+    Bpc16,
+    Bpc32,
+}
+
+impl BitDepth {
+    pub fn label(self) -> &'static str {
+        match self {
+            BitDepth::Bpc8 => "8 bpc",
+            BitDepth::Bpc16 => "16 bpc",
+            BitDepth::Bpc32 => "32 bpc",
+        }
+    }
+    pub fn next(self) -> BitDepth {
+        match self {
+            BitDepth::Bpc8 => BitDepth::Bpc16,
+            BitDepth::Bpc16 => BitDepth::Bpc32,
+            BitDepth::Bpc32 => BitDepth::Bpc8,
+        }
+    }
+    pub fn is_float(self) -> bool {
+        self == BitDepth::Bpc32
+    }
+    /// Quantisation levels per channel of the integer depths (8 bpc: 255; 16 bpc: 32768, After
+    /// Effects' "15 + 1" bit range), `None` for 32 bpc float.
+    pub fn levels(self) -> Option<f32> {
+        match self {
+            BitDepth::Bpc8 => Some(255.0),
+            BitDepth::Bpc16 => Some(32768.0),
+            BitDepth::Bpc32 => None,
+        }
+    }
+    pub fn bits(self) -> u32 {
+        match self {
+            BitDepth::Bpc8 => 8,
+            BitDepth::Bpc16 => 16,
+            BitDepth::Bpc32 => 32,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum TimeDisplayStyle {
+    #[default]
+    Timecode,
+    Frames,
+    /// Feet + Frames, 35 mm film (16 frames per foot).
+    Feet35,
+    /// Feet + Frames, 16 mm film (40 frames per foot).
+    Feet16,
+}
+
+impl TimeDisplayStyle {
+    /// Frames per foot of the Feet + Frames styles.
+    pub fn frames_per_foot(self) -> Option<i64> {
+        match self {
+            TimeDisplayStyle::Feet35 => Some(16),
+            TimeDisplayStyle::Feet16 => Some(40),
+            _ => None,
+        }
+    }
+    pub fn id(self) -> &'static str {
+        match self {
+            TimeDisplayStyle::Timecode => "timecode",
+            TimeDisplayStyle::Frames => "frames",
+            TimeDisplayStyle::Feet35 => "feet35",
+            TimeDisplayStyle::Feet16 => "feet16",
+        }
+    }
+    pub fn parse(s: &str) -> Option<TimeDisplayStyle> {
+        let k: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
+        match k.as_str() {
+            "timecode" => Some(TimeDisplayStyle::Timecode),
+            "frames" => Some(TimeDisplayStyle::Frames),
+            "feet35" | "feetframes" | "feetandframes" | "feet35mm" | "35mm" | "feetframes35mm" => Some(TimeDisplayStyle::Feet35),
+            "feet16" | "feet16mm" | "16mm" | "feetframes16mm" => Some(TimeDisplayStyle::Feet16),
+            _ => None,
+        }
+    }
+}
+
+/// Project Settings ▸ Color ▸ Color Engine.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum ColorEngine {
+    /// Built-in colour management (ICC-style working spaces).
+    #[default]
+    Adobe,
+    /// OCIO managed, with the built-in configuration (ACES working spaces).
+    Ocio,
+}
+
+/// Project Settings ▸ Color ▸ HDR: how over-range (HDR) values reach a standard-dynamic-range
+/// display or output.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub enum HdrMode {
+    /// Values above 1.0 clip.
+    #[default]
+    Clip,
+    /// Highlights above 80% are companded (an exponential knee) into the remaining range.
+    Compand,
+    /// Extended Reinhard tone mapping of luminance (white at 4.0).
+    ToneMap,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct ProjectSettings {
+    pub bit_depth: BitDepth,
+    /// Linearize Working Space: the working space uses linear light (1.0 gamma) for everything
+    /// (sources, effects, blending). Needs a working space.
+    pub linearize: bool,
+    /// Working Space (colour management). `None` = no colour management.
+    #[serde(default)]
+    pub working_space: Option<ColorSpace>,
+    /// Blend Colors Using 1.0 Gamma: layers blend in linear light (sources and effects stay in
+    /// the working space's encoding).
+    #[serde(default)]
+    pub blend_linear: bool,
+    pub time_display: TimeDisplayStyle,
+    /// Frame numbering starts at 0 (or 1).
+    pub frame_start: i64,
+    pub audio_sample_rate: u32,
+    /// Video Rendering and Effects ▸ Use: Mercury GPU Acceleration (`true`, the default; used
+    /// when a GPU adapter exists) or Mercury Software Only (`false`, the CPU compositor).
+    #[serde(default = "yes")]
+    pub gpu_acceleration: bool,
+    /// The project's comment (Metadata panel).
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub comment: String,
+    /// Color Engine (Adobe-style built-in or OCIO with ACES working spaces).
+    #[serde(default)]
+    pub color_engine: ColorEngine,
+    /// HDR handling for standard-dynamic-range output (display and renders).
+    #[serde(default)]
+    pub hdr: HdrMode,
+    /// The space the top-level comp is output in (renders and the viewer's source). `None` =
+    /// sRGB; Rec. 2100 PQ / HLG give HDR output.
+    #[serde(default)]
+    pub output_space: Option<ColorSpace>,
+    /// Working Gamma, 2.2 or 2.4 (`app.project.workingGamma`): with no working space, the curve
+    /// Interpret As Linear Light footage is encoded with and Blend Colors Using 1.0 Gamma
+    /// linearizes with: the sRGB curve at 2.2, a pure 2.4 power curve at 2.4. Ignored with a
+    /// working space (as in After Effects).
+    #[serde(default = "gamma_22")]
+    pub working_gamma: f64,
+}
+
+fn gamma_22() -> f64 {
+    2.2
+}
+
+impl ProjectSettings {
+    /// Working Gamma is 2.4 (anything else reads as 2.2).
+    pub fn working_gamma_24(&self) -> bool {
+        (self.working_gamma - 2.4).abs() < 0.05
+    }
+}
+
+impl Default for ProjectSettings {
+    fn default() -> Self {
+        ProjectSettings {
+            bit_depth: BitDepth::Bpc8,
+            linearize: false,
+            working_space: None,
+            blend_linear: false,
+            time_display: TimeDisplayStyle::Timecode,
+            frame_start: 0,
+            audio_sample_rate: 48_000,
+            gpu_acceleration: true,
+            comment: String::new(),
+            color_engine: ColorEngine::Adobe,
+            hdr: HdrMode::Clip,
+            output_space: None,
+            working_gamma: 2.2,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct Marker {
+    pub time: Tick,
+    #[serde(default)]
+    pub duration: Tick,
+    #[serde(default)]
+    pub comment: String,
+    #[serde(default)]
+    pub label: Label,
+    #[serde(default)]
+    pub chapter: String,
+    #[serde(default)]
+    pub url: String,
+    #[serde(default)]
+    pub protected: bool,
+    /// Web link frame target (`_blank`, a frame name…).
+    #[serde(default, skip_serializing_if = "String::is_empty")]
+    pub frame_target: String,
+    /// Flash/video cue point (Event or Navigation) with name and parameters.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cue_point: Option<CuePoint>,
+}
+
+/// A marker's cue point (Composition/Layer Marker dialog ▸ Cue Point).
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct CuePoint {
+    pub name: String,
+    /// Navigation (true) or Event cue point.
+    #[serde(default)]
+    pub navigation: bool,
+    /// (name, value) parameter pairs.
+    #[serde(default)]
+    pub params: Vec<(String, String)>,
+}
+
+pub(crate) fn yes() -> bool {
+    true
+}
diff --git a/crates/project/src/tests.rs b/crates/project/src/tests.rs
index c19d81ee2..f9ee16167 100644
--- a/crates/project/src/tests.rs
+++ b/crates/project/src/tests.rs
@@ -166,21 +166,50 @@ fn project_files_name_their_version_and_always_read_back() {
     p.comp_mut(cid).unwrap().layers[0].props.prop_mut("transform/opacity").unwrap().value = Value::Scalar(f64::NAN);
     let e = p.to_file_json().unwrap_err().to_string();
     assert!(e.contains("can't be saved"), "{e}");
+    // Infinity too, in either profile: the check doesn't rely on reading the file back.
+    p.comp_mut(cid).unwrap().layers[0].props.prop_mut("transform/opacity").unwrap().value = Value::Scalar(f64::INFINITY);
+    let e = p.to_file_json().unwrap_err().to_string();
+    assert!(e.contains("can't be saved"), "{e}");
     assert!(crate::is_newer_version("0.2.0", "0.1.9") && crate::is_newer_version("1.0.0-rc.1", "0.9.9"));
     assert!(!crate::is_newer_version("0.1.1", "0.1.1") && !crate::is_newer_version("0.1.0", "0.1.1"));
 }
 
+#[test]
+fn project_files_refuse_newer_schemas() {
+    let p = Project { schema: crate::SCHEMA_VERSION + 1, ..Project::default() };
+    let expected = format!(
+        "the project can't be saved: it holds a value a project file can't store (project schema {} is newer than this version supports ({}))",
+        p.schema,
+        crate::SCHEMA_VERSION
+    );
+    assert_eq!(p.to_file_json().unwrap_err().to_string(), expected);
+    assert_eq!(p.to_file_json_with_view(&crate::SavedView::default()).unwrap_err().to_string(), expected);
+}
+
+#[test]
+fn saved_files_reopen_in_pretty_and_compact_form() {
+    let (p, _cid) = project_with_layer();
+    assert_eq!(Project::from_json(&p.to_file_json().unwrap()).unwrap(), p, "the pretty project file");
+    assert_eq!(Project::from_json(&p.to_json_compact()).unwrap(), p, "compact JSON");
+}
+
 #[test]
 fn project_files_remember_the_open_comps() {
     let (p, cid) = project_with_layer();
-    let view = crate::SavedView { active_comp: Some(cid), open_comps: vec![cid] };
+    let view = crate::SavedView { active_comp: Some(cid), open_comps: vec![cid], comp_times: [(cid, effectcraft_time::Tick(4_237_833_600))].into() };
     let text = p.to_file_json_with_view(&view).unwrap();
     assert_eq!(crate::saved_view(&text), view);
     assert_eq!(Project::from_json(&text).unwrap(), p, "the view is not part of the project");
     // Files from before #748 have no view; a garbled one is ignored, not an error.
     assert_eq!(crate::saved_view(&p.to_file_json().unwrap()), crate::SavedView::default());
     let odd = text.replacen(&format!("\"activeComp\": {}", cid.0), "\"activeComp\": \"Main\"", 1);
-    assert_eq!(crate::saved_view(&odd), crate::SavedView { active_comp: None, open_comps: vec![cid] });
+    assert_eq!(crate::saved_view(&odd), crate::SavedView { active_comp: None, ..view.clone() });
+    // Entries that aren't an id and a whole tick count are skipped; the rest are kept.
+    let times = text.replacen("\"compTimes\": {", "\"compTimes\": {\"x\": 1, \"7\": \"a\", \"8\": 1.5, \"9\": -4,", 1);
+    let expect = [(cid, effectcraft_time::Tick(4_237_833_600)), (crate::ItemId(9), effectcraft_time::Tick(-4))].into();
+    assert_eq!(crate::saved_view(&times).comp_times, expect);
+    let not_a_map = text.replacen("\"compTimes\": {", "\"compTimes\": [], \"unused\": {", 1);
+    assert_eq!(crate::saved_view(&not_a_map), crate::SavedView { comp_times: Default::default(), ..view });
 }
 
 /// The Project panel's "used N times": layers in every comp that use the item directly, a precomp
@@ -206,3 +235,90 @@ fn item_users_count_layers_in_every_comp() {
     assert!(p.item_users(unused).is_empty());
     assert!(p.item_users(main).is_empty());
 }
+
+/// A project of `n` empty comps; `links` adds a precomp layer of comp `b` inside comp `a`
+/// (indexes into the returned ids).
+fn comp_graph(n: usize, links: &[(usize, usize)]) -> (Project, Vec<crate::ItemId>) {
+    let mut p = Project::default();
+    let ids: Vec<crate::ItemId> = (0..n)
+        .map(|i| {
+            p.add_item(
+                &format!("C{i}"),
+                effectcraft_color::Label::None,
+                None,
+                ItemKind::Comp(Comp::new(8, 8, FrameRate::FPS_25, Tick::from_seconds_f64(1.0)).into()),
+            )
+        })
+        .collect();
+    for &(a, b) in links {
+        let outer = p.comp(ids[a]).unwrap().clone();
+        let l = build::layer(&mut p, &outer, "pre", LayerSource::Comp { item: ids[b] }, (8, 8), None);
+        let ItemKind::Comp(c) = &mut p.item_mut(ids[a]).unwrap().kind else { panic!("comp") };
+        std::sync::Arc::make_mut(c).layers.push(l);
+    }
+    (p, ids)
+}
+
+#[test]
+fn comp_contains_ends_on_cycles_long_chains_and_shared_precomps() {
+    // A ⇄ B cycle, C unrelated: the walk used to recurse until the stack ran out (#1237).
+    let (p, c) = comp_graph(3, &[(0, 1), (1, 0)]);
+    assert!(!p.comp_contains(c[0], c[2]));
+    assert!(p.comp_contains(c[0], c[1]) && p.comp_contains(c[1], c[0]));
+    // A comp nesting itself.
+    let (p, c) = comp_graph(2, &[(0, 0)]);
+    assert!(!p.comp_contains(c[0], c[1]));
+    assert!(p.comp_contains(c[0], c[0]));
+    // A target reached through a cycle.
+    let (p, c) = comp_graph(3, &[(0, 1), (1, 0), (1, 2)]);
+    assert!(p.comp_contains(c[0], c[2]));
+    assert!(!p.comp_contains(c[2], c[0]));
+    // 40 levels of diamonds: 2^40 paths, each comp visited once.
+    let mut links = vec![];
+    for i in 0..40 {
+        let (top, l, r, bottom) = (i * 3, i * 3 + 1, i * 3 + 2, i * 3 + 3);
+        links.extend([(top, l), (top, r), (l, bottom), (r, bottom)]);
+    }
+    let (p, c) = comp_graph(121, &links);
+    let t0 = std::time::Instant::now();
+    assert!(p.comp_contains(c[0], c[120]));
+    assert!(!p.comp_contains(c[120], c[0]));
+    assert!(t0.elapsed() < std::time::Duration::from_secs(1), "{:?}", t0.elapsed());
+    // A chain 20 000 comps deep (a deep recursion's stack frames).
+    let n = 20_000;
+    let (p, c) = comp_graph(n, &(0..n - 1).map(|i| (i, i + 1)).collect::<Vec<_>>());
+    assert!(p.comp_contains(c[0], c[n - 1]));
+    assert!(!p.comp_contains(c[n - 1], c[0]));
+}
+
+/// A Wiggle Paths 100 000 groups deep gets Spatial Phase on a 2 MiB stack.
+#[test]
+fn upgrading_deeply_nested_shape_groups_fits_a_small_stack() {
+    let n = 100_000;
+    let mut next = 1;
+    let mut contents = build::shape_simple_op(&mut Ids(&mut next), "wiggle").unwrap();
+    contents.children.retain(|c| c.match_id() != "spatialPhase");
+    for _ in 0..n {
+        let uid = Ids(&mut next).alloc();
+        contents = crate::PropGroup::new(uid, "group", "Group 1").with(contents);
+    }
+    let h = std::thread::Builder::new()
+        .stack_size(2 << 20)
+        .spawn(move || {
+            let added = build::upgrade_shape_contents(&mut Ids(&mut next), &mut contents);
+            (added, contents)
+        })
+        .unwrap();
+    let (added, mut g) = h.join().unwrap();
+    assert!(added);
+    // One level at a time: dropping the whole tree would recurse as deep as it is nested.
+    let mut depth = 0;
+    while g.match_id == "group" {
+        let Some(crate::Node::Group(child)) = g.children.pop() else { panic!("a nested group") };
+        g = child;
+        depth += 1;
+    }
+    assert_eq!(depth, n);
+    let ids: Vec<&str> = g.children.iter().map(|c| c.match_id()).collect();
+    assert_eq!(ids, ["size", "detail", "points", "speed", "correlation", "phase", "spatialPhase", "seed"]);
+}
diff --git a/crates/psd/Cargo.toml b/crates/psd/Cargo.toml
index 49dda6a3b..b6849041b 100644
--- a/crates/psd/Cargo.toml
+++ b/crates/psd/Cargo.toml
@@ -10,4 +10,4 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-miniz_oxide = "0.8"
+miniz_oxide = "0.9"
diff --git a/crates/psd/src/counters.rs b/crates/psd/src/counters.rs
new file mode 100644
index 000000000..f5c59b02c
--- /dev/null
+++ b/crates/psd/src/counters.rs
@@ -0,0 +1,19 @@
+use std::cell::Cell;
+use std::thread::LocalKey;
+
+thread_local! {
+    /// Scratch rows allocated by the 32-bit ZIP un-predictor.
+    pub static SCRATCH: Cell<usize> = const { Cell::new(0) };
+    /// `inside the mask rect` evaluations of the layer-mask loop.
+    pub static INSIDE: Cell<usize> = const { Cell::new(0) };
+    /// `square_to_quad` solves.
+    pub static QUAD: Cell<usize> = const { Cell::new(0) };
+}
+
+pub fn bump(c: &'static LocalKey<Cell<usize>>) {
+    c.with(|c| c.set(c.get() + 1));
+}
+/// Read and reset.
+pub fn take(c: &'static LocalKey<Cell<usize>>) -> usize {
+    c.with(|c| c.replace(0))
+}
diff --git a/crates/psd/src/lib.rs b/crates/psd/src/lib.rs
index 5ae32126a..91792a837 100644
--- a/crates/psd/src/lib.rs
+++ b/crates/psd/src/lib.rs
@@ -1,5 +1,5 @@
 //! Photoshop document (PSD / PSB) reader, implemented from Adobe's public *Photoshop File Formats
-//! Specification* (see README.md), and a minimal writer ([`write`]) for fixtures.
+//! Specification* (see README.md), and a minimal writer ([`mod@write`]) for fixtures.
 //!
 //! [`Psd::parse`] reads the structure (header, layer records and their additional information,
 //! the layer tree) without decoding pixels; [`Psd::composite`] decodes the merged image and
@@ -15,411 +15,26 @@ pub mod placed;
 mod read;
 pub mod write;
 
-use std::borrow::Cow;
 use std::sync::Arc;
 
 pub use descriptor::{DValue, Descriptor};
 use read::Reader;
 
-#[derive(Debug, Clone, PartialEq)]
-pub enum Error {
-    NotPsd,
-    Truncated,
-    Unsupported(String),
-    Invalid(String),
-}
+mod limits;
+mod model;
+mod parse;
+mod pixels;
 
-impl std::fmt::Display for Error {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Error::NotPsd => write!(f, "not a Photoshop document"),
-            Error::Truncated => write!(f, "truncated Photoshop document"),
-            Error::Unsupported(s) => write!(f, "unsupported Photoshop feature: {s}"),
-            Error::Invalid(s) => write!(f, "invalid Photoshop document: {s}"),
-        }
-    }
-}
-
-impl std::error::Error for Error {}
-
-pub type Result<T> = std::result::Result<T, Error>;
-
-/// The most pixels one decoded image (the composite, a layer or a mask) may have: 2^28, e.g.
-/// 16 384 × 16 384, 4 GiB as float RGBA. Bounds read from a file are untrusted, so a few bytes
-/// can't make the reader allocate more than that.
-const MAX_DECODE_PIXELS: u64 = 1 << 28;
-
-/// `w × h` as a pixel count, or an error when it exceeds [`MAX_DECODE_PIXELS`].
-fn decode_pixels(w: usize, h: usize) -> Result<usize> {
-    match (w as u64).checked_mul(h as u64) {
-        Some(n) if n <= MAX_DECODE_PIXELS => Ok(n as usize),
-        _ => Err(Error::Unsupported(format!("{w}×{h} pixels is too large to decode"))),
-    }
-}
-
-fn too_large(w: usize, h: usize) -> Error {
-    Error::Unsupported(format!("{w}×{h} pixels is too large to decode"))
-}
-
-/// What one decode (the composite, or one layer) may hold in memory at once: 4 GiB, 1 GiB where
-/// pointers are 32 bits wide (WebAssembly). [`MAX_DECODE_PIXELS`] bounds one image; this bounds
-/// the sum of the buffers a decode keeps alive together.
-#[cfg(target_pointer_width = "32")]
-const DECODE_BUDGET: u64 = 1 << 30;
-#[cfg(not(target_pointer_width = "32"))]
-const DECODE_BUDGET: u64 = 4 << 30;
-
-/// The bytes the buffers of one decode hold right now, against a limit. A decode charges a buffer
-/// before it allocates it (and releases it when it drops it), so a file that would need more
-/// than the limit fails with an error instead of an out-of-memory abort.
-struct Budget {
-    limit: u64,
-    live: u64,
-}
-
-impl Budget {
-    fn new(limit: u64) -> Budget {
-        Budget { limit, live: 0 }
-    }
-
-    fn charge(&mut self, bytes: u64) -> Result<()> {
-        self.check(bytes)?;
-        self.live += bytes;
-        Ok(())
-    }
-
-    /// Whether `bytes` more would still fit, without taking them. A decode checks its whole
-    /// expected peak first, so one that cannot fit fails before it has allocated anything.
-    fn check(&self, bytes: u64) -> Result<()> {
-        match self.live.checked_add(bytes) {
-            Some(total) if total <= self.limit => Ok(()),
-            _ => {
-                const MIB: u64 = 1 << 20;
-                Err(Error::Unsupported(format!(
-                    "decoding needs {} MiB more with {} MiB in use, over the {} MiB memory budget",
-                    bytes / MIB,
-                    self.live / MIB,
-                    self.limit / MIB
-                )))
-            }
-        }
-    }
-
-    fn release(&mut self, bytes: u64) {
-        self.live = self.live.saturating_sub(bytes);
-    }
-
-    /// An empty vector with room for `n` items, charged.
-    fn vec<T>(&mut self, n: usize) -> Result<Vec<T>> {
-        self.charge((n as u64).saturating_mul(std::mem::size_of::<T>() as u64))?;
-        let mut v = Vec::new();
-        v.try_reserve_exact(n).map_err(|_| Error::Unsupported(format!("out of memory for {n} items")))?;
-        Ok(v)
-    }
-
-    /// `n` copies of `value`, charged.
-    fn filled<T: Clone>(&mut self, n: usize, value: T) -> Result<Vec<T>> {
-        let mut v = self.vec::<T>(n)?;
-        v.resize(n, value);
-        Ok(v)
-    }
-}
-
-/// Inflate a zlib stream to at most `limit` bytes.
-fn inflate(src: &[u8], limit: usize) -> Result<Vec<u8>> {
-    miniz_oxide::inflate::decompress_to_vec_zlib_with_limit(src, limit).map_err(|e| Error::Invalid(format!("zip: {e:?}")))
-}
-
-/// Give back what a channel buffer from `Psd::channel_bytes` / `Psd::decode_plane` was charged:
-/// a borrowed one (uncompressed data, or a plane of an inflated stream charged as a whole) was not.
-fn release_bytes(budget: &mut Budget, raw: Cow<'_, [u8]>) {
-    if let Cow::Owned(v) = raw {
-        budget.release(v.len() as u64);
-    }
-}
-
-/// A 32-bit float sample made safe to use: NaN reads as 0, +inf as white (1.0, like the integer
-/// depths' maximum), -inf as 0.
-fn finite_sample(v: f32) -> f32 {
-    if v.is_nan() {
-        0.0
-    } else if v == f32::INFINITY {
-        1.0
-    } else if v == f32::NEG_INFINITY {
-        0.0
-    } else {
-        v
-    }
-}
-
-/// Whether `bytes` start like a Photoshop document.
-pub fn is_psd(bytes: &[u8]) -> bool {
-    bytes.len() >= 6 && &bytes[..4] == b"8BPS" && matches!(u16::from_be_bytes([bytes[4], bytes[5]]), 1 | 2)
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ColorMode {
-    Bitmap,
-    Grayscale,
-    Indexed,
-    Rgb,
-    Cmyk,
-    Multichannel,
-    Duotone,
-    Lab,
-}
-
-impl ColorMode {
-    pub fn from_u16(v: u16) -> Option<ColorMode> {
-        Some(match v {
-            0 => ColorMode::Bitmap,
-            1 => ColorMode::Grayscale,
-            2 => ColorMode::Indexed,
-            3 => ColorMode::Rgb,
-            4 => ColorMode::Cmyk,
-            7 => ColorMode::Multichannel,
-            8 => ColorMode::Duotone,
-            9 => ColorMode::Lab,
-            _ => return None,
-        })
-    }
-    pub fn to_u16(self) -> u16 {
-        match self {
-            ColorMode::Bitmap => 0,
-            ColorMode::Grayscale => 1,
-            ColorMode::Indexed => 2,
-            ColorMode::Rgb => 3,
-            ColorMode::Cmyk => 4,
-            ColorMode::Multichannel => 7,
-            ColorMode::Duotone => 8,
-            ColorMode::Lab => 9,
-        }
-    }
-    /// Number of colour channels (before alpha).
-    pub fn color_channels(self) -> usize {
-        match self {
-            ColorMode::Rgb | ColorMode::Lab => 3,
-            ColorMode::Cmyk => 4,
-            _ => 1,
-        }
-    }
-}
-
-/// A rectangle in document pixels (`right`/`bottom` exclusive).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct Rect {
-    pub top: i32,
-    pub left: i32,
-    pub bottom: i32,
-    pub right: i32,
-}
-
-impl Rect {
-    pub fn new(left: i32, top: i32, width: i32, height: i32) -> Rect {
-        Rect { top, left, bottom: top.saturating_add(height), right: left.saturating_add(width) }
-    }
-    pub fn width(&self) -> u32 {
-        (i64::from(self.right) - i64::from(self.left)).clamp(0, i64::from(u32::MAX)) as u32
-    }
-    pub fn height(&self) -> u32 {
-        (i64::from(self.bottom) - i64::from(self.top)).clamp(0, i64::from(u32::MAX)) as u32
-    }
-    pub fn is_empty(&self) -> bool {
-        self.width() == 0 || self.height() == 0
-    }
-}
-
-/// One channel of a layer: id (0.. colour, -1 transparency, -2 layer mask, -3 real user mask) and
-/// where its data (compression + image data) sits in the file.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ChannelInfo {
-    pub id: i16,
-    pub offset: usize,
-    pub len: usize,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct LayerMask {
-    pub rect: Rect,
-    /// Value outside the mask rectangle (0 or 255).
-    pub default_color: u8,
-    pub disabled: bool,
-    pub inverted: bool,
-}
-
-/// Layer kind from the section divider setting (`lsct`).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum Section {
-    #[default]
-    Layer,
-    OpenFolder,
-    ClosedFolder,
-    /// The hidden "</Layer group>" record that closes a group (below its children).
-    Divider,
-}
-
-/// A type layer (`TySh`).
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct TextInfo {
-    /// Text with `\n` line breaks.
-    pub text: String,
-    /// Affine transform (xx, xy, yx, yy, tx, ty): the text origin sits at (tx, ty).
-    pub transform: [f64; 6],
-    pub style: engine_data::TextStyle,
-    /// Text bounds (left, top, right, bottom) relative to the origin, when stored.
-    pub bounds: Option<[f64; 4]>,
-}
-
-/// Adjustment layers (best effort).
-#[derive(Clone, Debug, PartialEq)]
-pub enum Adjustment {
-    Invert,
-    BrightnessContrast {
-        brightness: f64,
-        contrast: f64,
-        legacy: bool,
-    },
-    HueSaturation {
-        hue: f64,
-        saturation: f64,
-        lightness: f64,
-        colorize: bool,
-    },
-    Levels {
-        in_black: f64,
-        in_white: f64,
-        gamma: f64,
-        out_black: f64,
-        out_white: f64,
-    },
-    Exposure {
-        exposure: f64,
-        offset: f64,
-        gamma: f64,
-    },
-    /// Another adjustment (its tagged-block key, e.g. `curv`, `blnc`).
-    Other(String),
-}
-
-/// A vector mask path: sub-paths of (in tangent, vertex, out tangent) points in document pixels.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct VectorMask {
-    pub inverted: bool,
-    pub disabled: bool,
-    pub subpaths: Vec<SubPath>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct SubPath {
-    pub closed: bool,
-    /// Per knot: [control point preceding, anchor, control point leaving] as (x, y).
-    pub knots: Vec<[[f64; 2]; 3]>,
-}
-
-/// A placed layer (smart object): `SoLd` / `SoLE` (placed layer data) or the older `PlLd`.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct SmartObject {
-    /// Unique id of the linked file ([`Psd::linked`]) the layer shows.
-    pub uuid: String,
-    /// Where the content's corners sit in document pixels: top-left, top-right, bottom-right,
-    /// bottom-left.
-    pub quad: [[f64; 2]; 4],
-    /// The content's size in pixels (`Sz  `), when recorded.
-    pub size: Option<[f64; 2]>,
-    /// The placed layer's warp (`warp`), when it has one ([`placed`]).
-    pub warp: Option<placed::Warp>,
-}
-
-impl SmartObject {
-    /// The quad as an affine placement of a `w`×`h` content rectangle: (centre, scale x, scale
-    /// y, rotation in degrees). Perspective and skew are dropped.
-    pub fn placement(&self, w: f64, h: f64) -> ([f64; 2], f64, f64, f64) {
-        let q = self.quad;
-        let centre = [(q[0][0] + q[1][0] + q[2][0] + q[3][0]) / 4.0, (q[0][1] + q[1][1] + q[2][1] + q[3][1]) / 4.0];
-        let top = [q[1][0] - q[0][0], q[1][1] - q[0][1]];
-        let left = [q[3][0] - q[0][0], q[3][1] - q[0][1]];
-        let sx = top[0].hypot(top[1]) / w.max(1e-9);
-        let sy = left[0].hypot(left[1]) / h.max(1e-9);
-        // Mirrored content (left edge turning the other way) keeps a negative y scale.
-        let cross = top[0] * left[1] - top[1] * left[0];
-        (centre, sx, if cross < 0.0 { -sy } else { sy }, top[1].atan2(top[0]).to_degrees())
-    }
-}
-
-/// A file embedded in (or linked from) the document: linked layer data (`lnk2`, `lnkD`,
-/// `lnk3`, `lnkE`).
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct LinkedFile {
-    pub uuid: String,
-    pub name: String,
-    /// File type code (`8BPS`, `PNGf`, `JPEG`…), may be blank.
-    pub file_type: String,
-    /// Embedded data (absent for externally linked files).
-    pub data: Option<std::ops::Range<usize>>,
-}
-
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct Layer {
-    /// Index in [`Psd::layers`] (file order: bottom of the stack first).
-    pub index: usize,
-    pub name: String,
-    pub id: Option<u32>,
-    pub rect: Rect,
-    /// Blend mode key (`norm`, `mul `, `pass`…).
-    pub blend: [u8; 4],
-    pub opacity: u8,
-    /// Fill opacity (`iOpa`), 255 when absent.
-    pub fill_opacity: u8,
-    /// Clipped to the layer below.
-    pub clipping: bool,
-    pub hidden: bool,
-    pub protect_transparency: bool,
-    pub section: Section,
-    pub channels: Vec<ChannelInfo>,
-    pub mask: Option<LayerMask>,
-    pub text: Option<TextInfo>,
-    pub adjustment: Option<Adjustment>,
-    /// Solid colour fill layer (`SoCo`), RGB 0..1.
-    pub fill: Option<[f64; 3]>,
-    /// Layer effects (`lfx2` descriptor).
-    pub effects: Option<Descriptor>,
-    pub vector_mask: Option<VectorMask>,
-    /// Smart object placement.
-    pub smart_object: Option<SmartObject>,
-    /// Keys of every additional-information block the layer carries.
-    pub keys: Vec<[u8; 4]>,
-}
-
-impl Layer {
-    pub fn is_group(&self) -> bool {
-        matches!(self.section, Section::OpenFolder | Section::ClosedFolder)
-    }
-    pub fn blend_key(&self) -> &str {
-        std::str::from_utf8(&self.blend).unwrap_or("norm")
-    }
-    pub fn has_pixels(&self) -> bool {
-        !self.rect.is_empty() && self.channels.iter().any(|c| c.id >= 0)
-    }
-}
-
-/// How deep groups nest in [`Psd::tree`]; deeper ones are flattened (a hostile file can nest
-/// thousands, and walking or dropping that tree would overflow the stack).
-pub const MAX_GROUP_DEPTH: usize = 64;
-
-/// The layer tree, top of the stack first.
-#[derive(Clone, Debug, PartialEq)]
-pub enum Node {
-    Layer(usize),
-    Group { layer: usize, children: Vec<Node> },
-}
-
-/// Decoded pixels: straight RGBA, row-major.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Pixels {
-    pub width: u32,
-    pub height: u32,
-    pub data: Vec<[f32; 4]>,
-}
+#[cfg(test)]
+use limits::{Budget, decode_pixels};
+pub use limits::{Error, Result};
+pub use model::{
+    Adjustment, ChannelInfo, ColorMode, Layer, LayerMask, LinkedFile, MAX_GROUP_DEPTH, Node, Pixels, Rect, Section, SmartObject, SubPath, TextInfo, VectorMask,
+};
+pub use parse::is_psd;
+pub(crate) use pixels::pack_bits;
+#[cfg(test)]
+use pixels::{lab_to_rgb, srgb_encode, unpack_bits};
 
 /// A parsed Photoshop document.
 #[derive(Clone, Debug)]
@@ -446,1078 +61,11 @@ pub struct Psd {
     merged_offset: usize,
 }
 
-impl Psd {
-    pub fn parse(data: impl Into<Arc<[u8]>>) -> Result<Psd> {
-        let data: Arc<[u8]> = data.into();
-        let mut r = Reader::new(&data);
-        if r.bytes(4).ok() != Some(b"8BPS") {
-            return Err(Error::NotPsd);
-        }
-        let version = r.u16()?;
-        let psb = match version {
-            1 => false,
-            2 => true,
-            _ => return Err(Error::NotPsd),
-        };
-        r.skip(6)?;
-        let channels = r.u16()?;
-        let height = r.u32()?;
-        let width = r.u32()?;
-        let depth = r.u16()?;
-        let mode_v = r.u16()?;
-        let mode = ColorMode::from_u16(mode_v).ok_or_else(|| Error::Unsupported(format!("colour mode {mode_v}")))?;
-        if !matches!(depth, 1 | 8 | 16 | 32) {
-            return Err(Error::Unsupported(format!("{depth}-bit")));
-        }
-        if width == 0 || height == 0 || width > 300_000 || height > 300_000 {
-            return Err(Error::Invalid(format!("size {width}x{height}")));
-        }
-        // Colour mode data.
-        let n = r.u32()? as usize;
-        let palette = r.bytes(n)?.to_vec();
-        // Image resources.
-        let n = r.u32()? as usize;
-        r.skip(n)?;
-        // Layer and mask information.
-        let mut psd = Psd {
-            psb,
-            width,
-            height,
-            channels,
-            depth,
-            mode,
-            layers: vec![],
-            merged_alpha: false,
-            palette,
-            linked: vec![],
-            warnings: vec![],
-            data: data.clone(),
-            merged_offset: 0,
-        };
-        let lm_len = r.length(psb)?;
-        let lm_end = r.pos.checked_add(lm_len).filter(|&e| e <= data.len()).ok_or(Error::Truncated)?;
-        if lm_len > 0 {
-            let li_len = r.length(psb)?;
-            let li_end = r.pos.checked_add(li_len).filter(|&e| e <= lm_end).ok_or(Error::Truncated)?;
-            if li_len > 0
-                && let Err(e) = psd.layer_info(&data, r.pos, li_end)
-            {
-                // A damaged layer section must not discard the document: keep the header and the
-                // merged image, drop the layers and say so. Without a merged image there is
-                // nothing to fall back to, so the original error stands.
-                if lm_end.checked_add(2).is_none_or(|n| n > data.len()) {
-                    return Err(e);
-                }
-                psd.layers.clear();
-                psd.warnings.push(format!("Layers could not be read ({e}); only the flattened image is available"));
-            }
-            r.pos = li_end;
-            if r.pos + 4 <= lm_end {
-                let g = r.u32()? as usize;
-                r.pos = (r.pos + g).min(lm_end);
-            }
-            // Global additional layer information (16/32-bit layer info lives here).
-            while let Some((key, start, end)) = next_block(&data, &mut r.pos, lm_end, psb) {
-                if matches!(&key, b"lnk2" | b"lnkD" | b"lnk3" | b"lnkE") {
-                    psd.linked_files(&data, start, end);
-                }
-                if matches!(&key, b"Lr16" | b"Lr32" | b"Layr") && psd.layers.is_empty() && end > start {
-                    // The block holds the layer info, normally without its length field; accept
-                    // both layouts.
-                    if psd.layer_info(&data, start, end).is_err() || psd.layers.is_empty() {
-                        psd.layers.clear();
-                        let skip = if psb { 8 } else { 4 };
-                        if start + skip < end && psd.layer_info(&data, start + skip, end).is_err() {
-                            psd.layers.clear();
-                        }
-                    }
-                }
-                r.pos = end;
-            }
-        }
-        if !psd.layers.is_empty() {
-            // A 16/32-bit layer block recovered the layers.
-            psd.warnings.clear();
-        }
-        psd.merged_offset = lm_end;
-        Ok(psd)
-    }
-
-    /// The embedded bytes of linked file `uuid`.
-    pub fn linked_data(&self, uuid: &str) -> Option<&[u8]> {
-        let f = self.linked.iter().find(|f| f.uuid == uuid)?;
-        self.data.get(f.data.clone()?)
-    }
-
-    /// Linked layer data records (spec: "Linked Layer"): length, kind (`liFD` embedded data,
-    /// `liFE` external file, `liFA` alias), version, unique id, original file name, type,
-    /// creator, data length, optional descriptors, then the data. A damaged record ends the list.
-    fn linked_files(&mut self, data: &[u8], start: usize, end: usize) {
-        let mut pos = start;
-        while pos + 8 <= end {
-            let mut r = Reader::at(&data[..end], pos);
-            let Ok(len) = r.u64() else { break };
-            let body = r.pos;
-            let Some(rec_end) = body.checked_add(len as usize).filter(|e| *e <= end) else { break };
-            let mut r = Reader::at(&data[..rec_end], body);
-            let rec = (|| -> Result<LinkedFile> {
-                let kind = r.tag()?;
-                let version = r.u32()?;
-                let n = r.u8()? as usize;
-                let uuid = String::from_utf8_lossy(r.bytes(n)?).into_owned();
-                let name = descriptor::read_unicode(&mut r)?;
-                let file_type = String::from_utf8_lossy(&r.tag()?).trim().to_string();
-                let _creator = r.tag()?;
-                let dlen = r.u64()? as usize;
-                if r.u8()? != 0 {
-                    let _v = r.u32()?;
-                    descriptor::read_descriptor(&mut r)?;
-                }
-                let mut out = LinkedFile { uuid, name, file_type, data: None };
-                match &kind {
-                    b"liFD" => {
-                        let s = r.pos;
-                        r.skip(dlen)?;
-                        out.data = Some(s..s + dlen);
-                    }
-                    b"liFE" => {
-                        let _v = r.u32()?;
-                        descriptor::read_descriptor(&mut r)?;
-                        if version > 3 {
-                            r.skip(4 + 4 + 8)?;
-                        }
-                        let _size = r.u64()?;
-                        if version > 2 && r.remaining() >= dlen && dlen > 0 {
-                            let s = r.pos;
-                            out.data = Some(s..s + dlen);
-                        }
-                    }
-                    _ => {}
-                }
-                Ok(out)
-            })();
-            match rec {
-                Ok(f) => self.linked.push(f),
-                Err(_) => break,
-            }
-            pos = rec_end.div_ceil(4) * 4;
-        }
-    }
-
-    fn layer_info(&mut self, data: &[u8], start: usize, end: usize) -> Result<()> {
-        let mut r = Reader::at(&data[..end], start);
-        let count = r.i16()?;
-        self.merged_alpha = count < 0;
-        let n = count.unsigned_abs() as usize;
-        let mut layers = Vec::with_capacity(n);
-        for i in 0..n {
-            layers.push(self.layer_record(&mut r, i)?);
-        }
-        // Channel image data follows in record order.
-        for l in &mut layers {
-            for c in &mut l.channels {
-                c.offset = r.pos;
-                r.skip(c.len)?;
-            }
-        }
-        self.layers = layers;
-        Ok(())
-    }
-
-    fn layer_record(&self, r: &mut Reader, index: usize) -> Result<Layer> {
-        let psb = self.psb;
-        let (top, left, bottom, right) = (r.i32()?, r.i32()?, r.i32()?, r.i32()?);
-        let nch = r.u16()? as usize;
-        if nch > 64 {
-            return Err(Error::Invalid("channel count".into()));
-        }
-        let mut channels = Vec::with_capacity(nch);
-        for _ in 0..nch {
-            let id = r.i16()?;
-            let len = r.length(psb)?;
-            channels.push(ChannelInfo { id, offset: 0, len });
-        }
-        if r.bytes(4)? != b"8BIM" {
-            return Err(Error::Invalid("layer record signature".into()));
-        }
-        let blend = r.tag()?;
-        let opacity = r.u8()?;
-        let clipping = r.u8()? != 0;
-        let flags = r.u8()?;
-        r.skip(1)?;
-        let extra = r.u32()? as usize;
-        let extra_end = r.pos.checked_add(extra).filter(|&e| e <= r.data.len()).ok_or(Error::Truncated)?;
-        let mut l = Layer {
-            index,
-            rect: Rect { top, left, bottom, right },
-            blend,
-            opacity,
-            fill_opacity: 255,
-            clipping,
-            hidden: flags & 2 != 0,
-            protect_transparency: flags & 1 != 0,
-            channels,
-            ..Default::default()
-        };
-        // Layer mask data.
-        let mlen = r.u32()? as usize;
-        let mstart = r.pos;
-        if mlen >= 18 {
-            let rect = Rect { top: r.i32()?, left: r.i32()?, bottom: r.i32()?, right: r.i32()? };
-            let default_color = r.u8()?;
-            let mflags = r.u8()?;
-            l.mask = Some(LayerMask { rect, default_color, disabled: mflags & 2 != 0, inverted: mflags & 4 != 0 });
-        }
-        r.pos = mstart + mlen;
-        // Blending ranges.
-        let blen = r.u32()? as usize;
-        r.skip(blen)?;
-        l.name = r.pascal(4)?;
-        let mut pos = r.pos;
-        let data = r.data;
-        while let Some((key, start, end)) = next_block(data, &mut pos, extra_end, psb) {
-            l.keys.push(key);
-            let block = &data[start..end];
-            // A malformed block only loses that block's information.
-            let _ = self.layer_block(&mut l, &key, block);
-            pos = end;
-        }
-        r.pos = extra_end;
-        Ok(l)
-    }
-
-    fn layer_block(&self, l: &mut Layer, key: &[u8; 4], b: &[u8]) -> Result<()> {
-        let mut r = Reader::new(b);
-        match key {
-            b"luni" => {
-                let name = descriptor::read_unicode(&mut r)?;
-                if !name.is_empty() {
-                    l.name = name;
-                }
-            }
-            b"lyid" => l.id = Some(r.u32()?),
-            b"iOpa" => l.fill_opacity = r.u8()?,
-            b"lsct" | b"lsdk" => {
-                l.section = match r.u32()? {
-                    1 => Section::OpenFolder,
-                    2 => Section::ClosedFolder,
-                    3 => Section::Divider,
-                    _ => Section::Layer,
-                };
-                if b.len() >= 12 && &b[4..8] == b"8BIM" {
-                    l.blend.copy_from_slice(&b[8..12]);
-                }
-            }
-            b"TySh" => {
-                let _ver = r.u16()?;
-                let mut t = [0.0; 6];
-                for v in &mut t {
-                    *v = r.f64()?;
-                }
-                // A transform with NaN/inf is unusable: fall back to the identity.
-                if t.iter().any(|v| !v.is_finite()) {
-                    t = [1.0, 0.0, 0.0, 1.0, 0.0, 0.0];
-                }
-                let _text_ver = r.u16()?;
-                let _desc_ver = r.u32()?;
-                let d = descriptor::read_descriptor(&mut r)?;
-                let text = d.text("Txt ").unwrap_or_default().replace("\r\n", "\n").replace('\r', "\n");
-                let text = text.strip_suffix('\n').map(str::to_string).unwrap_or(text);
-                let style = d.raw("EngineData").map(|e| engine_data::text_style(&engine_data::parse(e))).unwrap_or_default();
-                let bounds =
-                    d.obj("bounds").or_else(|| d.obj("boundingBox")).and_then(|o| Some([o.num("Left")?, o.num("Top ")?, o.num("Rght")?, o.num("Btom")?]));
-                l.text = Some(TextInfo { text, transform: t, style, bounds });
-            }
-            b"lfx2" => {
-                let _ver = r.u32()?;
-                let _dver = r.u32()?;
-                l.effects = Some(descriptor::read_descriptor(&mut r)?);
-            }
-            b"SoCo" => {
-                let _ver = r.u32()?;
-                let d = descriptor::read_descriptor(&mut r)?;
-                l.fill = d.color("Clr ");
-            }
-            b"nvrt" => l.adjustment = Some(Adjustment::Invert),
-            b"brit" => {
-                let brightness = r.i16()? as f64;
-                let contrast = r.i16()? as f64;
-                if l.adjustment.is_none() {
-                    l.adjustment = Some(Adjustment::BrightnessContrast { brightness, contrast, legacy: true });
-                }
-            }
-            b"CgEd" => {
-                let _ver = r.u32()?;
-                let d = descriptor::read_descriptor(&mut r)?;
-                l.adjustment = Some(Adjustment::BrightnessContrast {
-                    brightness: d.num("Brgh").unwrap_or(0.0),
-                    contrast: d.num("Cntr").unwrap_or(0.0),
-                    legacy: d.bool("useLegacy").unwrap_or(false),
-                });
-            }
-            b"hue2" | b"hue " => {
-                let _ver = r.u16()?;
-                let colorize = r.u8()? != 0;
-                r.skip(1)?;
-                let ch = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
-                let m = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
-                let (hue, saturation, lightness) = if colorize { ch } else { m };
-                l.adjustment = Some(Adjustment::HueSaturation { hue, saturation, lightness, colorize });
-            }
-            b"levl" => {
-                let _ver = r.u16()?;
-                let (ib, iw, ob, ow, g) = (r.i16()?, r.i16()?, r.i16()?, r.i16()?, r.i16()?);
-                l.adjustment =
-                    Some(Adjustment::Levels { in_black: ib as f64, in_white: iw as f64, gamma: g as f64 / 100.0, out_black: ob as f64, out_white: ow as f64 });
-            }
-            b"expA" => {
-                let _ver = r.u16()?;
-                let mut finite = |default: f64| -> Result<f64> {
-                    let v = f64::from(r.f32()?);
-                    Ok(if v.is_finite() { v } else { default })
-                };
-                let exposure = finite(0.0)?;
-                let offset = finite(0.0)?;
-                let gamma = finite(1.0)?;
-                l.adjustment = Some(Adjustment::Exposure { exposure, offset, gamma });
-            }
-            b"curv" | b"blnc" | b"post" | b"thrs" | b"selc" | b"mixr" | b"phfl" | b"vibA" | b"blwh" | b"grdm" | b"clrL" if l.adjustment.is_none() => {
-                l.adjustment = Some(Adjustment::Other(String::from_utf8_lossy(key).into_owned()));
-            }
-            b"SoLd" | b"SoLE" => {
-                let _id = r.tag()?;
-                let _ver = r.u32()?;
-                let _dver = r.u32()?;
-                let d = descriptor::read_descriptor(&mut r)?;
-                let uuid = d.text("Idnt").unwrap_or_default().to_string();
-                let t = placed::eight(&d, "Trnf").unwrap_or([0.0; 8]);
-                // The non-affine transform when present (perspective), else the transform.
-                let t = placed::eight(&d, "nonAffineTransform").unwrap_or(t);
-                let size = d.obj("Sz  ").and_then(|s| Some([s.num("Wdth")?, s.num("Hght")?]));
-                let warp = d.obj("warp").and_then(placed::Warp::read);
-                l.smart_object = Some(SmartObject { uuid, quad: placed::quad_from(t), size, warp });
-            }
-            b"PlLd" if l.smart_object.is_none() => {
-                let _id = r.tag()?;
-                let _ver = r.u32()?;
-                let n = r.u8()? as usize;
-                let uuid = String::from_utf8_lossy(r.bytes(n)?).into_owned();
-                let _page = r.u32()?;
-                let _pages = r.u32()?;
-                let _aa = r.u32()?;
-                let _ty = r.u32()?;
-                let mut t = [0.0; 8];
-                for v in &mut t {
-                    *v = r.f64_finite()?;
-                }
-                l.smart_object = Some(SmartObject { uuid, quad: placed::quad_from(t), size: None, warp: None });
-            }
-            b"vmsk" | b"vsms" => {
-                let _ver = r.u32()?;
-                let flags = r.u32()?;
-                l.vector_mask = Some(self.vector_paths(&mut r, flags)?);
-            }
-            _ => {}
-        }
-        Ok(())
-    }
-
-    fn vector_paths(&self, r: &mut Reader, flags: u32) -> Result<VectorMask> {
-        let (w, h) = (self.width as f64, self.height as f64);
-        let mut vm = VectorMask { inverted: flags & 1 != 0, disabled: flags & 4 != 0, subpaths: vec![] };
-        let fixed = |r: &mut Reader| -> Result<f64> { Ok(r.i32()? as f64 / (1 << 24) as f64) };
-        while r.remaining() >= 26 {
-            let sel = r.u16()?;
-            match sel {
-                0 | 3 => {
-                    let _n = r.u16()?;
-                    r.skip(22)?;
-                    vm.subpaths.push(SubPath { closed: sel == 0, knots: vec![] });
-                }
-                1 | 2 | 4 | 5 => {
-                    let mut pts = [[0.0; 2]; 3];
-                    for p in &mut pts {
-                        let y = fixed(r)?;
-                        let x = fixed(r)?;
-                        *p = [x * w, y * h];
-                    }
-                    if let Some(sp) = vm.subpaths.last_mut() {
-                        sp.knots.push(pts);
-                    }
-                }
-                _ => r.skip(24)?,
-            }
-        }
-        vm.subpaths.retain(|s| !s.knots.is_empty());
-        Ok(vm)
-    }
-
-    /// The layer tree, top of the stack first. Groups nest at most [`MAX_GROUP_DEPTH`] deep (see
-    /// [`Psd::tree_report`]).
-    pub fn tree(&self) -> Vec<Node> {
-        self.tree_report().0
-    }
-
-    /// The layer tree plus the number of groups nested deeper than [`MAX_GROUP_DEPTH`]. Those
-    /// are flattened into their deepest allowed ancestor: their children stay, in order, and
-    /// the group record itself becomes a plain [`Node::Layer`], so no layer is lost and the
-    /// tree (and its `Drop`, `Clone` and `PartialEq`) cannot recurse deeper than the limit.
-    pub fn tree_report(&self) -> (Vec<Node>, usize) {
-        let mut stack: Vec<Vec<Node>> = vec![vec![]];
-        // Dividers seen while `MAX_GROUP_DEPTH` groups were already open.
-        let mut flattened_open = 0usize;
-        let mut flattened = 0usize;
-        for l in &self.layers {
-            match l.section {
-                Section::Divider => {
-                    if stack.len() > MAX_GROUP_DEPTH {
-                        flattened_open += 1;
-                    } else {
-                        stack.push(vec![]);
-                    }
-                }
-                Section::OpenFolder | Section::ClosedFolder => {
-                    if flattened_open > 0 {
-                        flattened_open -= 1;
-                        flattened += 1;
-                        if let Some(top) = stack.last_mut() {
-                            top.push(Node::Layer(l.index));
-                        }
-                        continue;
-                    }
-                    let children = if stack.len() > 1 { stack.pop().unwrap_or_default() } else { vec![] };
-                    if let Some(top) = stack.last_mut() {
-                        top.push(Node::Group { layer: l.index, children });
-                    }
-                }
-                Section::Layer => {
-                    if let Some(top) = stack.last_mut() {
-                        top.push(Node::Layer(l.index));
-                    }
-                }
-            }
-        }
-        while stack.len() > 1 {
-            let c = stack.pop().unwrap_or_default();
-            if let Some(top) = stack.last_mut() {
-                top.extend(c);
-            }
-        }
-        // Depth is at most `MAX_GROUP_DEPTH`, so recursion is bounded.
-        fn rev(v: &mut Vec<Node>) {
-            v.reverse();
-            for n in v {
-                if let Node::Group { children, .. } = n {
-                    rev(children);
-                }
-            }
-        }
-        let mut out = stack.pop().unwrap_or_default();
-        rev(&mut out);
-        (out, flattened)
-    }
-
-    fn bytes_per_sample(&self) -> usize {
-        match self.depth {
-            16 => 2,
-            32 => 4,
-            _ => 1,
-        }
-    }
-
-    /// The raw big-endian bytes of one channel of `w`×`h` samples at `offset` (compression field
-    /// first): `row_bytes(w) × h` of them with the compression and the prediction undone.
-    /// Uncompressed data is borrowed from the file, not copied; any other buffer is charged to
-    /// `budget` and the caller releases it (see [`release_bytes`]) once it is dropped.
-    fn channel_bytes(&self, offset: usize, len: usize, w: usize, h: usize, budget: &mut Budget) -> Result<Cow<'_, [u8]>> {
-        let end = offset.checked_add(len).filter(|&e| e <= self.data.len()).ok_or(Error::Truncated)?;
-        let mut r = Reader::at(self.data.get(..end).ok_or(Error::Truncated)?, offset);
-        let comp = r.u16()?;
-        decode_pixels(w, h)?;
-        self.plane_bytes(comp, &mut r, w, h, budget)
-    }
-
-    /// The raw bytes (`row_bytes(w)` × `h`, ZIP prediction undone) of one channel whose pixel data
-    /// follows `r`'s position (after the compression field). Uncompressed data is borrowed, not
-    /// copied; the other buffers are charged to `budget`.
-    fn plane_bytes<'a>(&self, comp: u16, r: &mut Reader<'a>, w: usize, h: usize, budget: &mut Budget) -> Result<Cow<'a, [u8]>> {
-        let rowb = self.row_bytes(w);
-        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
-        Ok(match self.open_planes(comp, r, 1, 1, w, h, budget)? {
-            PlaneStream::Raw => Cow::Borrowed(r.bytes(size)?),
-            PlaneStream::Rle(counts) => Cow::Owned(Self::unpack_plane(&counts, 0, r, rowb, h, budget)?),
-            PlaneStream::Zip(mut v) => {
-                v.resize(size, 0);
-                self.zip_plane(comp, &mut v, 0, w, h)?;
-                Cow::Owned(v)
-            }
-        })
-    }
-
-    /// Prepare the pixel data at `r` (just after the compression field) of `total` planes of
-    /// `w`×`h` samples, of which the first `want` are decoded: the RLE row sizes of every plane,
-    /// or the inflated ZIP data, which holds all planes one after another (charged to `budget`
-    /// before it is inflated).
-    #[allow(clippy::too_many_arguments)]
-    fn open_planes(&self, comp: u16, r: &mut Reader, total: usize, want: usize, w: usize, h: usize, budget: &mut Budget) -> Result<PlaneStream> {
-        let size = self.row_bytes(w).checked_mul(h).ok_or_else(|| too_large(w, h))?;
-        Ok(match comp {
-            0 => PlaneStream::Raw,
-            1 => {
-                let n = total.saturating_mul(h);
-                let mut counts = Vec::with_capacity(n.min(r.remaining() / 2));
-                for _ in 0..n {
-                    counts.push(if self.psb { r.u32()? as usize } else { r.u16()? as usize });
-                }
-                PlaneStream::Rle(counts)
-            }
-            2 | 3 => {
-                let rest = r.bytes(r.remaining())?;
-                // One stream holds every plane: what it may decode to is what they need.
-                let all = size.checked_mul(want).ok_or_else(|| too_large(w, h))?;
-                budget.charge(all as u64)?;
-                PlaneStream::Zip(inflate(rest, all)?)
-            }
-            c => return Err(Error::Unsupported(format!("compression {c}"))),
-        })
-    }
-
-    /// The raw bytes (`row_bytes(w)` × `h`, ZIP prediction undone) of plane `c`: raw and RLE
-    /// planes are read from `r` in order, raw ones borrowed from the file data, ZIP ones from the
-    /// inflated buffer (un-predicted in place; already charged by `open_planes`), RLE ones charged
-    /// to `budget`.
-    #[allow(clippy::too_many_arguments)]
-    fn decode_plane<'x, 'a: 'x>(
-        &self,
-        comp: u16,
-        planes: &'x mut PlaneStream,
-        r: &mut Reader<'a>,
-        c: usize,
-        w: usize,
-        h: usize,
-        budget: &mut Budget,
-    ) -> Result<Cow<'x, [u8]>> {
-        let rowb = self.row_bytes(w);
-        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
-        Ok(match planes {
-            PlaneStream::Raw => Cow::Borrowed(r.bytes(size)?),
-            PlaneStream::Rle(counts) => Cow::Owned(Self::unpack_plane(counts, c, r, rowb, h, budget)?),
-            PlaneStream::Zip(v) => Cow::Borrowed(self.zip_plane(comp, v, c, w, h)?),
-        })
-    }
-
-    /// Unpack the `h` RLE rows of plane `c` (row byte counts `counts`, plane after plane) into a
-    /// buffer charged to `budget`.
-    fn unpack_plane(counts: &[usize], c: usize, r: &mut Reader, rowb: usize, h: usize, budget: &mut Budget) -> Result<Vec<u8>> {
-        let mut out = budget.vec::<u8>(rowb.checked_mul(h).ok_or(Error::Truncated)?)?;
-        for row in 0..h {
-            let n = *counts.get(c * h + row).ok_or(Error::Truncated)?;
-            unpack_bits(r.bytes(n)?, rowb, &mut out)?;
-        }
-        Ok(out)
-    }
-
-    /// Plane `c` of the inflated ZIP data of consecutive planes, un-predicted in place (`comp` 3).
-    fn zip_plane<'v>(&self, comp: u16, v: &'v mut [u8], c: usize, w: usize, h: usize) -> Result<&'v [u8]> {
-        let rowb = self.row_bytes(w);
-        let plane = v.get_mut(c * rowb * h..(c + 1) * rowb * h).ok_or(Error::Truncated)?;
-        if comp == 3 {
-            self.unpredict(plane, w, h);
-        }
-        Ok(plane)
-    }
-
-    /// One channel as `w * h` floats (0..1), charged to `budget` (the caller releases it).
-    fn channel_floats(&self, offset: usize, len: usize, w: usize, h: usize, budget: &mut Budget) -> Result<Vec<f32>> {
-        let raw = self.channel_bytes(offset, len, w, h, budget)?;
-        let mut out = budget.filled(decode_pixels(w, h)?, 0.0f32)?;
-        self.for_each_sample(&raw, w, h, |i, v| {
-            if let Some(o) = out.get_mut(i) {
-                *o = v;
-            }
-        });
-        release_bytes(budget, raw);
-        Ok(out)
-    }
-
-    fn row_bytes(&self, w: usize) -> usize {
-        if self.depth == 1 { w.div_ceil(8) } else { w * self.bytes_per_sample() }
-    }
-
-    fn unpredict(&self, v: &mut [u8], w: usize, h: usize) {
-        match self.depth {
-            16 => {
-                for row in v.chunks_exact_mut(w * 2).take(h) {
-                    let mut prev = 0u16;
-                    for c in row.as_chunks_mut::<2>().0 {
-                        let x = u16::from_be_bytes([c[0], c[1]]).wrapping_add(prev);
-                        c.copy_from_slice(&x.to_be_bytes());
-                        prev = x;
-                    }
-                }
-            }
-            32 => {
-                // One scratch row for the whole plane.
-                let mut planar = vec![0u8; w * 4];
-                #[cfg(test)]
-                counters::bump(&counters::SCRATCH);
-                for row in v.chunks_exact_mut(w * 4).take(h) {
-                    for i in 1..row.len() {
-                        row[i] = row[i].wrapping_add(row[i - 1]);
-                    }
-                    // Bytes are stored plane by plane (all first bytes, then all second bytes…).
-                    planar.copy_from_slice(row);
-                    for x in 0..w {
-                        for b in 0..4 {
-                            row[x * 4 + b] = planar[b * w + x];
-                        }
-                    }
-                }
-            }
-            _ => {
-                for row in v.chunks_exact_mut(w).take(h) {
-                    for i in 1..row.len() {
-                        row[i] = row[i].wrapping_add(row[i - 1]);
-                    }
-                }
-            }
-        }
-    }
-
-    /// Hand every sample of `raw` (`w`×`h`, row-major, in order) to `f` as a float. Samples a short
-    /// `raw` does not have are not reported.
-    fn for_each_sample(&self, raw: &[u8], w: usize, h: usize, mut f: impl FnMut(usize, f32)) {
-        let n = w.saturating_mul(h);
-        match self.depth {
-            1 => {
-                let rowb = w.div_ceil(8);
-                for y in 0..h {
-                    for x in 0..w {
-                        let b = raw.get(y * rowb + x / 8).copied().unwrap_or(0);
-                        // 1 = black.
-                        f(y * w + x, if b & (0x80 >> (x % 8)) != 0 { 0.0 } else { 1.0 });
-                    }
-                }
-            }
-            16 => raw.as_chunks::<2>().0.iter().take(n).enumerate().for_each(|(i, c)| f(i, u16::from_be_bytes([c[0], c[1]]) as f32 / 65535.0)),
-            // NaN reads as 0, +inf as white (1.0, like the integer depths' maximum), -inf as 0.
-            32 => raw.as_chunks::<4>().0.iter().take(n).enumerate().for_each(|(i, c)| f(i, finite_sample(f32::from_be_bytes([c[0], c[1], c[2], c[3]])))),
-            _ => raw.iter().take(n).enumerate().for_each(|(i, &b)| f(i, b as f32 / 255.0)),
-        }
-    }
-
-    /// Convert colour values (the document mode's channels, missing ones 0) to RGB.
-    fn rgb_from(&self, v: [f32; 4]) -> [f32; 3] {
-        let g = |k: usize| v.get(k).copied().unwrap_or(0.0);
-        let rgb = match self.mode {
-            ColorMode::Rgb => [g(0), g(1), g(2)],
-            ColorMode::Cmyk => {
-                // Stored inverted (1 = no ink).
-                let k = g(3);
-                [g(0) * k, g(1) * k, g(2) * k]
-            }
-            ColorMode::Indexed if self.palette.len() >= 768 => {
-                let idx = (g(0) * 255.0).round() as usize & 255;
-                [self.palette[idx] as f32 / 255.0, self.palette[256 + idx] as f32 / 255.0, self.palette[512 + idx] as f32 / 255.0]
-            }
-            ColorMode::Lab => lab_to_rgb(g(0) * 100.0, g(1) * 255.0 - 128.0, g(2) * 255.0 - 128.0),
-            _ => [g(0); 3],
-        };
-        if self.depth == 32 && self.mode != ColorMode::Lab { rgb.map(srgb_encode) } else { rgb }
-    }
-
-    /// Write merged-image channel `c` (raw bytes) into the result: the first three colour channels
-    /// and the alpha channel into their slot of a pixel, the fourth CMYK channel into `black`.
-    fn store_merged_channel(&self, c: usize, raw: &[u8], data: &mut [[f32; 4]], black: &mut Option<Vec<f32>>) {
-        let (w, h, cc) = (self.width as usize, self.height as usize, self.mode.color_channels());
-        if c < cc.min(3) {
-            self.for_each_sample(raw, w, h, |i, v| {
-                if let Some(p) = data.get_mut(i) {
-                    p[c] = v;
-                }
-            });
-        } else if c == 3 && c < cc {
-            if let Some(k) = black {
-                self.for_each_sample(raw, w, h, |i, v| {
-                    if let Some(o) = k.get_mut(i) {
-                        *o = v;
-                    }
-                });
-            }
-        } else if c == cc && self.merged_alpha {
-            self.for_each_sample(raw, w, h, |i, v| {
-                if let Some(p) = data.get_mut(i) {
-                    p[3] = v;
-                }
-            });
-        }
-    }
-
-    /// The merged (flattened) image.
-    pub fn composite(&self) -> Result<Pixels> {
-        self.composite_with_budget(DECODE_BUDGET)
-    }
-
-    /// [`Self::composite`] with at most `limit` bytes live at once. The channels are written
-    /// straight into the result, so the peak is the result (16 bytes a pixel), the CMYK black
-    /// channel, and the one buffer a channel (or, for ZIP, all channels) decodes through.
-    pub(crate) fn composite_with_budget(&self, limit: u64) -> Result<Pixels> {
-        let mut budget = Budget::new(limit);
-        let (w, h) = (self.width as usize, self.height as usize);
-        let n = decode_pixels(w, h)?;
-        let mut r = Reader::at(&self.data, self.merged_offset);
-        let comp = r.u16()?;
-        let nch = self.channels as usize;
-        let cc = self.mode.color_channels();
-        let want = (cc + usize::from(self.merged_alpha)).min(nch);
-        let rowb = self.row_bytes(w);
-        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
-        // The peak: the result, the CMYK black channel and what the channels decode through.
-        let black_bytes = if self.mode == ColorMode::Cmyk && want > 3 { 4 * n as u64 } else { 0 };
-        let transient = if matches!(comp, 2 | 3) { (size as u64).saturating_mul(want as u64) } else { size as u64 };
-        budget.check((16 * n as u64).saturating_add(black_bytes).saturating_add(transient))?;
-        // Opaque black until a channel says otherwise.
-        let mut data = budget.filled(n, [0.0f32, 0.0, 0.0, 1.0])?;
-        let mut black = if self.mode == ColorMode::Cmyk && want > 3 { Some(budget.filled(n, 0.0f32)?) } else { None };
-        let mut stream = self.open_planes(comp, &mut r, nch, want, w, h, &mut budget)?;
-        for c in 0..want {
-            let raw = self.decode_plane(comp, &mut stream, &mut r, c, w, h, &mut budget)?;
-            self.store_merged_channel(c, &raw, &mut data, &mut black);
-            release_bytes(&mut budget, raw);
-        }
-        for (i, p) in data.iter_mut().enumerate() {
-            let k = black.as_ref().and_then(|k| k.get(i)).copied().unwrap_or(0.0);
-            let [r, g, b] = self.rgb_from([p[0], p[1], p[2], k]);
-            *p = [r, g, b, p[3]];
-        }
-        Ok(Pixels { width: w as u32, height: h as u32, data })
-    }
-
-    /// One layer's pixels with its layer mask (and vector-less fill colour) applied to alpha.
-    /// `canvas`: document-sized with the layer in place; otherwise the layer's own bounds.
-    pub fn layer_pixels(&self, index: usize, canvas: bool) -> Result<Pixels> {
-        self.layer_pixels_with_budget(index, canvas, DECODE_BUDGET)
-    }
-
-    /// [`Self::layer_pixels`] with at most `limit` bytes live at once: the result (16 bytes a
-    /// pixel) with the channels written straight into it, the CMYK black channel, the one channel
-    /// being decoded, and the mask.
-    pub(crate) fn layer_pixels_with_budget(&self, index: usize, canvas: bool, limit: u64) -> Result<Pixels> {
-        let mut budget = Budget::new(limit);
-        let l = self.layers.get(index).ok_or_else(|| Error::Invalid(format!("no layer {index}")))?;
-        let doc = Rect { top: 0, left: 0, bottom: self.height as i32, right: self.width as i32 };
-        // Fill layers often have no pixel data: they cover the canvas (or the mask).
-        let fill_rect =
-            if l.fill.is_some() && !l.has_pixels() { l.mask.filter(|m| !m.rect.is_empty() && m.default_color == 0).map_or(doc, |m| m.rect) } else { l.rect };
-        let out_rect = if canvas {
-            doc
-        } else if fill_rect.is_empty() {
-            Rect { top: 0, left: 0, bottom: 1, right: 1 }
-        } else {
-            fill_rect
-        };
-        let (ow, oh) = (out_rect.width() as usize, out_rect.height() as usize);
-        let n = decode_pixels(ow, oh)?;
-        let src = fill_rect;
-        let (sw, sh) = (src.width() as usize, src.height() as usize);
-        // The peak: the result, then either the CMYK black channel with the channel being decoded,
-        // or the mask as floats with its bytes. Checked before anything is allocated.
-        let plane = |w: usize, h: usize| (self.row_bytes(w) as u64).saturating_mul(h as u64);
-        let mut pixels_peak = 0u64;
-        if l.has_pixels() && sw > 0 && sh > 0 {
-            pixels_peak = plane(sw, sh).saturating_add(if self.mode == ColorMode::Cmyk { 4 * n as u64 } else { 0 });
-        }
-        let mut mask_peak = 0u64;
-        if let Some(m) = l.mask.filter(|m| !m.disabled) {
-            let (mw, mh) = (m.rect.width() as usize, m.rect.height() as usize);
-            if mw > 0 && mh > 0 && l.channels.iter().any(|c| c.id == -2) {
-                mask_peak = plane(mw, mh).saturating_add((mw as u64).saturating_mul(mh as u64).saturating_mul(4));
-            }
-        }
-        budget.check((16 * n as u64).saturating_add(pixels_peak.max(mask_peak)))?;
-        let mut out = budget.filled(n, [0.0f32; 4])?;
-        if sw > 0 && sh > 0 {
-            // The source rows / columns that land inside the output (64-bit: file bounds can span
-            // the whole i32 range).
-            let span = |s0: i32, n: usize, o0: i32, on: usize| {
-                let off = i64::from(o0) - i64::from(s0);
-                let lo = off.clamp(0, n as i64);
-                let hi = (off + on as i64).clamp(lo, n as i64);
-                (lo as usize..hi as usize, off)
-            };
-            let (ys, oy) = span(src.top, sh, out_rect.top, oh);
-            let (xs, ox) = span(src.left, sw, out_rect.left, ow);
-            let dest = |y: usize, x: usize| (y as i64 - oy) as usize * ow + (x as i64 - ox) as usize;
-            let fill = l.fill.map(|c| c.map(|v| v as f32));
-            match fill {
-                Some(f) if !l.has_pixels() => {
-                    for y in ys {
-                        for x in xs.clone() {
-                            if let Some(p) = out.get_mut(dest(y, x)) {
-                                *p = [f[0], f[1], f[2], 1.0];
-                            }
-                        }
-                    }
-                }
-                _ => {
-                    // Opaque unless there is an alpha channel.
-                    for y in ys.clone() {
-                        for x in xs.clone() {
-                            if let Some(p) = out.get_mut(dest(y, x)) {
-                                p[3] = 1.0;
-                            }
-                        }
-                    }
-                    let cc = self.mode.color_channels();
-                    let mut black: Option<Vec<f32>> = None;
-                    if l.has_pixels() {
-                        for c in &l.channels {
-                            let slot = match c.id {
-                                -1 => 3,
-                                id if id >= 0 && (id as usize) < cc => id as usize,
-                                _ => continue,
-                            };
-                            let raw = self.channel_bytes(c.offset, c.len, sw, sh, &mut budget)?;
-                            // The fourth CMYK channel is the black plate, not a slot of the result.
-                            let to_black = c.id == 3;
-                            if to_black && black.is_none() {
-                                black = Some(budget.filled(out.len(), 0.0f32)?);
-                            }
-                            // Samples arrive in row-major order of the source.
-                            let (mut sy, mut sx) = (0usize, 0usize);
-                            self.for_each_sample(&raw, sw, sh, |_, v| {
-                                if ys.contains(&sy) && xs.contains(&sx) {
-                                    let d = dest(sy, sx);
-                                    if to_black {
-                                        if let Some(o) = black.as_mut().and_then(|k| k.get_mut(d)) {
-                                            *o = v;
-                                        }
-                                    } else if let Some(p) = out.get_mut(d) {
-                                        p[slot] = v;
-                                    }
-                                }
-                                sx += 1;
-                                if sx == sw {
-                                    sx = 0;
-                                    sy += 1;
-                                }
-                            });
-                            release_bytes(&mut budget, raw);
-                        }
-                    }
-                    for y in ys {
-                        for x in xs.clone() {
-                            let d = dest(y, x);
-                            let k = black.as_ref().and_then(|k| k.get(d)).copied().unwrap_or(0.0);
-                            if let Some(p) = out.get_mut(d) {
-                                let [r, g, b] = self.rgb_from([p[0], p[1], p[2], k]);
-                                *p = [r, g, b, p[3]];
-                            }
-                        }
-                    }
-                    if let Some(k) = black {
-                        budget.release(k.len() as u64 * 4);
-                    }
-                }
-            }
-        }
-        // Layer mask: multiplies alpha (also outside the mask rect, by its default colour).
-        if let Some(m) = l.mask.filter(|m| !m.disabled) {
-            let mc = l.channels.iter().find(|c| c.id == -2);
-            let (mw, mh) = (m.rect.width() as usize, m.rect.height() as usize);
-            let mask = match mc {
-                Some(c) if mw > 0 && mh > 0 => Some(self.channel_floats(c.offset, c.len, mw, mh, &mut budget)?),
-                _ => None,
-            };
-            let def = m.default_color as f32 / 255.0;
-            // The factor outside the mask rect, or everywhere when there is no mask data.
-            let outside = if m.inverted { 1.0 - def } else { def };
-            let scale = |px: &mut [[f32; 4]], v: f32| {
-                if v != 1.0 {
-                    for p in px {
-                        p[3] *= v;
-                    }
-                }
-            };
-            match &mask {
-                None => scale(&mut out, outside),
-                Some(mk) => {
-                    // The columns of the output that fall inside the mask rect (the same for every row).
-                    let lo = (i64::from(m.rect.left) - i64::from(out_rect.left)).clamp(0, ow as i64);
-                    let hi = (i64::from(m.rect.right) - i64::from(out_rect.left)).clamp(lo, ow as i64);
-                    let (lo, hi) = (lo as usize, hi as usize);
-                    for (y, row) in out.chunks_exact_mut(ow.max(1)).take(oh).enumerate() {
-                        let py = i64::from(out_rect.top) + y as i64;
-                        #[cfg(test)]
-                        counters::bump(&counters::INSIDE);
-                        if py < i64::from(m.rect.top) || py >= i64::from(m.rect.bottom) {
-                            scale(row, outside);
-                            continue;
-                        }
-                        let (left, rest) = row.split_at_mut(lo);
-                        let (mid, right) = rest.split_at_mut(hi - lo);
-                        scale(left, outside);
-                        scale(right, outside);
-                        // The mask row under `mid`: its first column is output column `lo`.
-                        let base = (py - i64::from(m.rect.top)) as usize * mw + (i64::from(out_rect.left) + lo as i64 - i64::from(m.rect.left)) as usize;
-                        for (i, p) in mid.iter_mut().enumerate() {
-                            let v = mk.get(base + i).copied().unwrap_or(def);
-                            p[3] *= if m.inverted { 1.0 - v } else { v };
-                        }
-                    }
-                }
-            }
-        }
-        Ok(Pixels { width: ow as u32, height: oh as u32, data: out })
-    }
-}
-
-/// The pixel data of a run of planes, as prepared by `Psd::open_planes`.
-enum PlaneStream {
-    Raw,
-    /// RLE row byte counts of every plane, plane after plane.
-    Rle(Vec<usize>),
-    /// The inflated ZIP data of all planes.
-    Zip(Vec<u8>),
-}
-
-/// The next additional-information block at `*pos` (signature `8BIM`/`8B64`, key, length):
-/// returns (key, data start, data end). Skips up to 3 padding bytes before a signature.
-fn next_block(data: &[u8], pos: &mut usize, end: usize, psb: bool) -> Option<([u8; 4], usize, usize)> {
-    let mut p = *pos;
-    for _ in 0..4 {
-        if p + 12 > end {
-            return None;
-        }
-        if &data[p..p + 4] == b"8BIM" || &data[p..p + 4] == b"8B64" {
-            break;
-        }
-        p += 1;
-    }
-    if p + 12 > end || !(&data[p..p + 4] == b"8BIM" || &data[p..p + 4] == b"8B64") {
-        return None;
-    }
-    let mut key = [0u8; 4];
-    key.copy_from_slice(&data[p + 4..p + 8]);
-    let wide =
-        psb && matches!(&key, b"LMsk" | b"Lr16" | b"Lr32" | b"Layr" | b"Mt16" | b"Mt32" | b"Mtrn" | b"Alph" | b"FMsk" | b"lnk2" | b"FEid" | b"FXid" | b"PxSD");
-    let mut r = Reader::at(&data[..end], p + 8);
-    let len = r.length(wide).ok()?;
-    let start = r.pos;
-    let stop = start.checked_add(len)?;
-    if stop > end {
-        return None;
-    }
-    *pos = stop;
-    Some((key, start, stop))
-}
-
-/// PackBits decoding of one row (appends exactly `row` bytes, zero-padded).
-fn unpack_bits(src: &[u8], row: usize, out: &mut Vec<u8>) -> Result<()> {
-    let start = out.len();
-    let mut i = 0;
-    while i < src.len() && out.len() - start < row {
-        let n = src[i] as i8;
-        i += 1;
-        if n >= 0 {
-            let k = n as usize + 1;
-            let s = src.get(i..i + k).ok_or(Error::Truncated)?;
-            out.extend_from_slice(s);
-            i += k;
-        } else if n != -128 {
-            let k = (1 - n as isize) as usize;
-            let v = *src.get(i).ok_or(Error::Truncated)?;
-            out.extend(std::iter::repeat_n(v, k));
-            i += 1;
-        }
-    }
-    out.resize(start + row, 0);
-    Ok(())
-}
-
-/// PackBits encoding of one row.
-pub(crate) fn pack_bits(src: &[u8]) -> Vec<u8> {
-    let mut out = vec![];
-    let mut i = 0;
-    while i < src.len() {
-        // run of identical bytes
-        let mut run = 1;
-        while i + run < src.len() && src[i + run] == src[i] && run < 128 {
-            run += 1;
-        }
-        if run >= 2 {
-            out.push((1 - run as isize) as i8 as u8);
-            out.push(src[i]);
-            i += run;
-            continue;
-        }
-        // literal run
-        let start = i;
-        let mut n = 0;
-        while i < src.len() && n < 128 {
-            if i + 1 < src.len() && src[i + 1] == src[i] {
-                break;
-            }
-            i += 1;
-            n += 1;
-        }
-        if n == 0 {
-            i += 1;
-            n = 1;
-        }
-        out.push((n - 1) as u8);
-        out.extend_from_slice(&src[start..start + n]);
-    }
-    out
-}
-
-fn srgb_encode(v: f32) -> f32 {
-    if v <= 0.003_130_8 { v * 12.92 } else { 1.055 * v.powf(1.0 / 2.4) - 0.055 }
-}
-
-/// CIE L*a*b* (D50) to sRGB (D65 via the Bradford-adapted matrix), clamped.
-fn lab_to_rgb(l: f32, a: f32, b: f32) -> [f32; 3] {
-    let fy = (l + 16.0) / 116.0;
-    let fx = fy + a / 500.0;
-    let fz = fy - b / 200.0;
-    let f = |t: f32| if t > 6.0 / 29.0 { t * t * t } else { 3.0 * (6.0f32 / 29.0).powi(2) * (t - 4.0 / 29.0) };
-    let (x, y, z) = (0.964_22 * f(fx), f(fy), 0.825_21 * f(fz));
-    // XYZ (D50) → linear sRGB.
-    let r = 3.133_856 * x - 1.616_867 * y - 0.490_615 * z;
-    let g = -0.978_768 * x + 1.916_142 * y + 0.033_454 * z;
-    let bb = 0.071_945 * x - 0.228_991 * y + 1.405_243 * z;
-    [r, g, bb].map(|v| srgb_encode(v.clamp(0.0, 1.0)))
-}
-
 #[cfg(test)]
 mod memory_tests;
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_integration;
-#[cfg(test)]
-mod tests_opt;
 
 /// Test-only call counters (per thread), to prove what the optimised paths avoid doing.
 #[cfg(test)]
-pub(crate) mod counters {
-    use std::cell::Cell;
-    use std::thread::LocalKey;
-
-    thread_local! {
-        /// Scratch rows allocated by the 32-bit ZIP un-predictor.
-        pub static SCRATCH: Cell<usize> = const { Cell::new(0) };
-        /// `inside the mask rect` evaluations of the layer-mask loop.
-        pub static INSIDE: Cell<usize> = const { Cell::new(0) };
-        /// `square_to_quad` solves.
-        pub static QUAD: Cell<usize> = const { Cell::new(0) };
-    }
-
-    pub fn bump(c: &'static LocalKey<Cell<usize>>) {
-        c.with(|c| c.set(c.get() + 1));
-    }
-    /// Read and reset.
-    pub fn take(c: &'static LocalKey<Cell<usize>>) -> usize {
-        c.with(|c| c.replace(0))
-    }
-}
+pub(crate) mod counters;
diff --git a/crates/psd/src/limits.rs b/crates/psd/src/limits.rs
new file mode 100644
index 000000000..c1c23b390
--- /dev/null
+++ b/crates/psd/src/limits.rs
@@ -0,0 +1,133 @@
+use std::borrow::Cow;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Error {
+    NotPsd,
+    Truncated,
+    Unsupported(String),
+    Invalid(String),
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::NotPsd => write!(f, "not a Photoshop document"),
+            Error::Truncated => write!(f, "truncated Photoshop document"),
+            Error::Unsupported(s) => write!(f, "unsupported Photoshop feature: {s}"),
+            Error::Invalid(s) => write!(f, "invalid Photoshop document: {s}"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+/// The most pixels one decoded image (the composite, a layer or a mask) may have: 2^28, e.g.
+/// 16 384 × 16 384, 4 GiB as float RGBA. Bounds read from a file are untrusted, so a few bytes
+/// can't make the reader allocate more than that.
+const MAX_DECODE_PIXELS: u64 = 1 << 28;
+
+/// `w × h` as a pixel count, or an error when it exceeds [`MAX_DECODE_PIXELS`].
+pub(crate) fn decode_pixels(w: usize, h: usize) -> Result<usize> {
+    match (w as u64).checked_mul(h as u64) {
+        Some(n) if n <= MAX_DECODE_PIXELS => Ok(n as usize),
+        _ => Err(Error::Unsupported(format!("{w}×{h} pixels is too large to decode"))),
+    }
+}
+
+pub(crate) fn too_large(w: usize, h: usize) -> Error {
+    Error::Unsupported(format!("{w}×{h} pixels is too large to decode"))
+}
+
+/// What one decode (the composite, or one layer) may hold in memory at once: 4 GiB, 1 GiB where
+/// pointers are 32 bits wide (WebAssembly). [`MAX_DECODE_PIXELS`] bounds one image; this bounds
+/// the sum of the buffers a decode keeps alive together.
+#[cfg(target_pointer_width = "32")]
+pub(crate) const DECODE_BUDGET: u64 = 1 << 30;
+
+#[cfg(not(target_pointer_width = "32"))]
+pub(crate) const DECODE_BUDGET: u64 = 4 << 30;
+
+/// The bytes the buffers of one decode hold right now, against a limit. A decode charges a buffer
+/// before it allocates it (and releases it when it drops it), so a file that would need more
+/// than the limit fails with an error instead of an out-of-memory abort.
+pub(crate) struct Budget {
+    limit: u64,
+    live: u64,
+}
+
+impl Budget {
+    pub(crate) fn new(limit: u64) -> Budget {
+        Budget { limit, live: 0 }
+    }
+
+    pub(crate) fn charge(&mut self, bytes: u64) -> Result<()> {
+        self.check(bytes)?;
+        self.live += bytes;
+        Ok(())
+    }
+
+    /// Whether `bytes` more would still fit, without taking them. A decode checks its whole
+    /// expected peak first, so one that cannot fit fails before it has allocated anything.
+    pub(crate) fn check(&self, bytes: u64) -> Result<()> {
+        match self.live.checked_add(bytes) {
+            Some(total) if total <= self.limit => Ok(()),
+            _ => {
+                const MIB: u64 = 1 << 20;
+                Err(Error::Unsupported(format!(
+                    "decoding needs {} MiB more with {} MiB in use, over the {} MiB memory budget",
+                    bytes / MIB,
+                    self.live / MIB,
+                    self.limit / MIB
+                )))
+            }
+        }
+    }
+
+    pub(crate) fn release(&mut self, bytes: u64) {
+        self.live = self.live.saturating_sub(bytes);
+    }
+
+    /// An empty vector with room for `n` items, charged.
+    pub(crate) fn vec<T>(&mut self, n: usize) -> Result<Vec<T>> {
+        self.charge((n as u64).saturating_mul(std::mem::size_of::<T>() as u64))?;
+        let mut v = Vec::new();
+        v.try_reserve_exact(n).map_err(|_| Error::Unsupported(format!("out of memory for {n} items")))?;
+        Ok(v)
+    }
+
+    /// `n` copies of `value`, charged.
+    pub(crate) fn filled<T: Clone>(&mut self, n: usize, value: T) -> Result<Vec<T>> {
+        let mut v = self.vec::<T>(n)?;
+        v.resize(n, value);
+        Ok(v)
+    }
+}
+
+/// Inflate a zlib stream to at most `limit` bytes.
+pub(crate) fn inflate(src: &[u8], limit: usize) -> Result<Vec<u8>> {
+    miniz_oxide::inflate::decompress_to_vec_zlib_with_limit(src, limit).map_err(|e| Error::Invalid(format!("zip: {e:?}")))
+}
+
+/// Give back what a channel buffer from `Psd::channel_bytes` / `Psd::decode_plane` was charged:
+/// a borrowed one (uncompressed data, or a plane of an inflated stream charged as a whole) was not.
+pub(crate) fn release_bytes(budget: &mut Budget, raw: Cow<'_, [u8]>) {
+    if let Cow::Owned(v) = raw {
+        budget.release(v.len() as u64);
+    }
+}
+
+/// A 32-bit float sample made safe to use: NaN reads as 0, +inf as white (1.0, like the integer
+/// depths' maximum), -inf as 0.
+pub(crate) fn finite_sample(v: f32) -> f32 {
+    if v.is_nan() {
+        0.0
+    } else if v == f32::INFINITY {
+        1.0
+    } else if v == f32::NEG_INFINITY {
+        0.0
+    } else {
+        v
+    }
+}
diff --git a/crates/psd/src/model.rs b/crates/psd/src/model.rs
new file mode 100644
index 000000000..729b9a3c4
--- /dev/null
+++ b/crates/psd/src/model.rs
@@ -0,0 +1,265 @@
+use super::{Descriptor, engine_data, placed};
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ColorMode {
+    Bitmap,
+    Grayscale,
+    Indexed,
+    Rgb,
+    Cmyk,
+    Multichannel,
+    Duotone,
+    Lab,
+}
+
+impl ColorMode {
+    pub fn from_u16(v: u16) -> Option<ColorMode> {
+        Some(match v {
+            0 => ColorMode::Bitmap,
+            1 => ColorMode::Grayscale,
+            2 => ColorMode::Indexed,
+            3 => ColorMode::Rgb,
+            4 => ColorMode::Cmyk,
+            7 => ColorMode::Multichannel,
+            8 => ColorMode::Duotone,
+            9 => ColorMode::Lab,
+            _ => return None,
+        })
+    }
+    pub fn to_u16(self) -> u16 {
+        match self {
+            ColorMode::Bitmap => 0,
+            ColorMode::Grayscale => 1,
+            ColorMode::Indexed => 2,
+            ColorMode::Rgb => 3,
+            ColorMode::Cmyk => 4,
+            ColorMode::Multichannel => 7,
+            ColorMode::Duotone => 8,
+            ColorMode::Lab => 9,
+        }
+    }
+    /// Number of colour channels (before alpha).
+    pub fn color_channels(self) -> usize {
+        match self {
+            ColorMode::Rgb | ColorMode::Lab => 3,
+            ColorMode::Cmyk => 4,
+            _ => 1,
+        }
+    }
+}
+
+/// A rectangle in document pixels (`right`/`bottom` exclusive).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct Rect {
+    pub top: i32,
+    pub left: i32,
+    pub bottom: i32,
+    pub right: i32,
+}
+
+impl Rect {
+    pub fn new(left: i32, top: i32, width: i32, height: i32) -> Rect {
+        Rect { top, left, bottom: top.saturating_add(height), right: left.saturating_add(width) }
+    }
+    pub fn width(&self) -> u32 {
+        (i64::from(self.right) - i64::from(self.left)).clamp(0, i64::from(u32::MAX)) as u32
+    }
+    pub fn height(&self) -> u32 {
+        (i64::from(self.bottom) - i64::from(self.top)).clamp(0, i64::from(u32::MAX)) as u32
+    }
+    pub fn is_empty(&self) -> bool {
+        self.width() == 0 || self.height() == 0
+    }
+}
+
+/// One channel of a layer: id (0.. colour, -1 transparency, -2 layer mask, -3 real user mask) and
+/// where its data (compression + image data) sits in the file.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ChannelInfo {
+    pub id: i16,
+    pub offset: usize,
+    pub len: usize,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct LayerMask {
+    pub rect: Rect,
+    /// Value outside the mask rectangle (0 or 255).
+    pub default_color: u8,
+    pub disabled: bool,
+    pub inverted: bool,
+}
+
+/// Layer kind from the section divider setting (`lsct`).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum Section {
+    #[default]
+    Layer,
+    OpenFolder,
+    ClosedFolder,
+    /// The hidden "</Layer group>" record that closes a group (below its children).
+    Divider,
+}
+
+/// A type layer (`TySh`).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct TextInfo {
+    /// Text with `\n` line breaks.
+    pub text: String,
+    /// Affine transform (xx, xy, yx, yy, tx, ty): the text origin sits at (tx, ty).
+    pub transform: [f64; 6],
+    pub style: engine_data::TextStyle,
+    /// Text bounds (left, top, right, bottom) relative to the origin, when stored.
+    pub bounds: Option<[f64; 4]>,
+}
+
+/// Adjustment layers (best effort).
+#[derive(Clone, Debug, PartialEq)]
+pub enum Adjustment {
+    Invert,
+    BrightnessContrast {
+        brightness: f64,
+        contrast: f64,
+        legacy: bool,
+    },
+    HueSaturation {
+        hue: f64,
+        saturation: f64,
+        lightness: f64,
+        colorize: bool,
+    },
+    Levels {
+        in_black: f64,
+        in_white: f64,
+        gamma: f64,
+        out_black: f64,
+        out_white: f64,
+    },
+    Exposure {
+        exposure: f64,
+        offset: f64,
+        gamma: f64,
+    },
+    /// Another adjustment (its tagged-block key, e.g. `curv`, `blnc`).
+    Other(String),
+}
+
+/// A vector mask path: sub-paths of (in tangent, vertex, out tangent) points in document pixels.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct VectorMask {
+    pub inverted: bool,
+    pub disabled: bool,
+    pub subpaths: Vec<SubPath>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct SubPath {
+    pub closed: bool,
+    /// Per knot: [control point preceding, anchor, control point leaving] as (x, y).
+    pub knots: Vec<[[f64; 2]; 3]>,
+}
+
+/// A placed layer (smart object): `SoLd` / `SoLE` (placed layer data) or the older `PlLd`.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct SmartObject {
+    /// Unique id of the linked file ([`Psd::linked`]) the layer shows.
+    pub uuid: String,
+    /// Where the content's corners sit in document pixels: top-left, top-right, bottom-right,
+    /// bottom-left.
+    pub quad: [[f64; 2]; 4],
+    /// The content's size in pixels (`Sz  `), when recorded.
+    pub size: Option<[f64; 2]>,
+    /// The placed layer's warp (`warp`), when it has one ([`placed`]).
+    pub warp: Option<placed::Warp>,
+}
+
+impl SmartObject {
+    /// The quad as an affine placement of a `w`×`h` content rectangle: (centre, scale x, scale
+    /// y, rotation in degrees). Perspective and skew are dropped.
+    pub fn placement(&self, w: f64, h: f64) -> ([f64; 2], f64, f64, f64) {
+        let q = self.quad;
+        let centre = [(q[0][0] + q[1][0] + q[2][0] + q[3][0]) / 4.0, (q[0][1] + q[1][1] + q[2][1] + q[3][1]) / 4.0];
+        let top = [q[1][0] - q[0][0], q[1][1] - q[0][1]];
+        let left = [q[3][0] - q[0][0], q[3][1] - q[0][1]];
+        let sx = top[0].hypot(top[1]) / w.max(1e-9);
+        let sy = left[0].hypot(left[1]) / h.max(1e-9);
+        // Mirrored content (left edge turning the other way) keeps a negative y scale.
+        let cross = top[0] * left[1] - top[1] * left[0];
+        (centre, sx, if cross < 0.0 { -sy } else { sy }, top[1].atan2(top[0]).to_degrees())
+    }
+}
+
+/// A file embedded in (or linked from) the document: linked layer data (`lnk2`, `lnkD`,
+/// `lnk3`, `lnkE`).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct LinkedFile {
+    pub uuid: String,
+    pub name: String,
+    /// File type code (`8BPS`, `PNGf`, `JPEG`…), may be blank.
+    pub file_type: String,
+    /// Embedded data (absent for externally linked files).
+    pub data: Option<std::ops::Range<usize>>,
+}
+
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct Layer {
+    /// Index in [`Psd::layers`] (file order: bottom of the stack first).
+    pub index: usize,
+    pub name: String,
+    pub id: Option<u32>,
+    pub rect: Rect,
+    /// Blend mode key (`norm`, `mul `, `pass`…).
+    pub blend: [u8; 4],
+    pub opacity: u8,
+    /// Fill opacity (`iOpa`), 255 when absent.
+    pub fill_opacity: u8,
+    /// Clipped to the layer below.
+    pub clipping: bool,
+    pub hidden: bool,
+    pub protect_transparency: bool,
+    pub section: Section,
+    pub channels: Vec<ChannelInfo>,
+    pub mask: Option<LayerMask>,
+    pub text: Option<TextInfo>,
+    pub adjustment: Option<Adjustment>,
+    /// Solid colour fill layer (`SoCo`), RGB 0..1.
+    pub fill: Option<[f64; 3]>,
+    /// Layer effects (`lfx2` descriptor).
+    pub effects: Option<Descriptor>,
+    pub vector_mask: Option<VectorMask>,
+    /// Smart object placement.
+    pub smart_object: Option<SmartObject>,
+    /// Keys of every additional-information block the layer carries.
+    pub keys: Vec<[u8; 4]>,
+}
+
+impl Layer {
+    pub fn is_group(&self) -> bool {
+        matches!(self.section, Section::OpenFolder | Section::ClosedFolder)
+    }
+    pub fn blend_key(&self) -> &str {
+        std::str::from_utf8(&self.blend).unwrap_or("norm")
+    }
+    pub fn has_pixels(&self) -> bool {
+        !self.rect.is_empty() && self.channels.iter().any(|c| c.id >= 0)
+    }
+}
+
+/// How deep groups nest in [`Psd::tree`]; deeper ones are flattened (a hostile file can nest
+/// thousands, and walking or dropping that tree would overflow the stack).
+pub const MAX_GROUP_DEPTH: usize = 64;
+
+/// The layer tree, top of the stack first.
+#[derive(Clone, Debug, PartialEq)]
+pub enum Node {
+    Layer(usize),
+    Group { layer: usize, children: Vec<Node> },
+}
+
+/// Decoded pixels: straight RGBA, row-major.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Pixels {
+    pub width: u32,
+    pub height: u32,
+    pub data: Vec<[f32; 4]>,
+}
diff --git a/crates/psd/src/parse.rs b/crates/psd/src/parse.rs
new file mode 100644
index 000000000..d221b9044
--- /dev/null
+++ b/crates/psd/src/parse.rs
@@ -0,0 +1,514 @@
+use super::limits::{Error, Result};
+use super::model::{
+    Adjustment, ChannelInfo, ColorMode, Layer, LayerMask, LinkedFile, MAX_GROUP_DEPTH, Node, Rect, Section, SmartObject, SubPath, TextInfo, VectorMask,
+};
+use super::{Psd, Reader, descriptor, engine_data, placed};
+use std::sync::Arc;
+
+/// Whether `bytes` start like a Photoshop document.
+pub fn is_psd(bytes: &[u8]) -> bool {
+    bytes.len() >= 6 && &bytes[..4] == b"8BPS" && matches!(u16::from_be_bytes([bytes[4], bytes[5]]), 1 | 2)
+}
+
+impl Psd {
+    pub fn parse(data: impl Into<Arc<[u8]>>) -> Result<Psd> {
+        let data: Arc<[u8]> = data.into();
+        let mut r = Reader::new(&data);
+        if r.bytes(4).ok() != Some(b"8BPS") {
+            return Err(Error::NotPsd);
+        }
+        let version = r.u16()?;
+        let psb = match version {
+            1 => false,
+            2 => true,
+            _ => return Err(Error::NotPsd),
+        };
+        r.skip(6)?;
+        let channels = r.u16()?;
+        let height = r.u32()?;
+        let width = r.u32()?;
+        let depth = r.u16()?;
+        let mode_v = r.u16()?;
+        let mode = ColorMode::from_u16(mode_v).ok_or_else(|| Error::Unsupported(format!("colour mode {mode_v}")))?;
+        if !matches!(depth, 1 | 8 | 16 | 32) {
+            return Err(Error::Unsupported(format!("{depth}-bit")));
+        }
+        if width == 0 || height == 0 || width > 300_000 || height > 300_000 {
+            return Err(Error::Invalid(format!("size {width}x{height}")));
+        }
+        // Colour mode data.
+        let n = r.u32()? as usize;
+        let palette = r.bytes(n)?.to_vec();
+        // Image resources.
+        let n = r.u32()? as usize;
+        r.skip(n)?;
+        // Layer and mask information.
+        let mut psd = Psd {
+            psb,
+            width,
+            height,
+            channels,
+            depth,
+            mode,
+            layers: vec![],
+            merged_alpha: false,
+            palette,
+            linked: vec![],
+            warnings: vec![],
+            data: data.clone(),
+            merged_offset: 0,
+        };
+        let lm_len = r.length(psb)?;
+        let lm_end = r.pos.checked_add(lm_len).filter(|&e| e <= data.len()).ok_or(Error::Truncated)?;
+        if lm_len > 0 {
+            let li_len = r.length(psb)?;
+            let li_end = r.pos.checked_add(li_len).filter(|&e| e <= lm_end).ok_or(Error::Truncated)?;
+            if li_len > 0
+                && let Err(e) = psd.layer_info(&data, r.pos, li_end)
+            {
+                // A damaged layer section must not discard the document: keep the header and the
+                // merged image, drop the layers and say so. Without a merged image there is
+                // nothing to fall back to, so the original error stands.
+                if lm_end.checked_add(2).is_none_or(|n| n > data.len()) {
+                    return Err(e);
+                }
+                psd.layers.clear();
+                psd.warnings.push(format!("Layers could not be read ({e}); only the flattened image is available"));
+            }
+            r.pos = li_end;
+            if r.pos + 4 <= lm_end {
+                let g = r.u32()? as usize;
+                r.pos = (r.pos + g).min(lm_end);
+            }
+            // Global additional layer information (16/32-bit layer info lives here).
+            while let Some((key, start, end)) = next_block(&data, &mut r.pos, lm_end, psb) {
+                if matches!(&key, b"lnk2" | b"lnkD" | b"lnk3" | b"lnkE") {
+                    psd.linked_files(&data, start, end);
+                }
+                if matches!(&key, b"Lr16" | b"Lr32" | b"Layr") && psd.layers.is_empty() && end > start {
+                    // The block holds the layer info, normally without its length field; accept
+                    // both layouts.
+                    if psd.layer_info(&data, start, end).is_err() || psd.layers.is_empty() {
+                        psd.layers.clear();
+                        let skip = if psb { 8 } else { 4 };
+                        if start + skip < end && psd.layer_info(&data, start + skip, end).is_err() {
+                            psd.layers.clear();
+                        }
+                    }
+                }
+                r.pos = end;
+            }
+        }
+        if !psd.layers.is_empty() {
+            // A 16/32-bit layer block recovered the layers.
+            psd.warnings.clear();
+        }
+        psd.merged_offset = lm_end;
+        Ok(psd)
+    }
+
+    /// The embedded bytes of linked file `uuid`.
+    pub fn linked_data(&self, uuid: &str) -> Option<&[u8]> {
+        let f = self.linked.iter().find(|f| f.uuid == uuid)?;
+        self.data.get(f.data.clone()?)
+    }
+
+    /// Linked layer data records (spec: "Linked Layer"): length, kind (`liFD` embedded data,
+    /// `liFE` external file, `liFA` alias), version, unique id, original file name, type,
+    /// creator, data length, optional descriptors, then the data. A damaged record ends the list.
+    fn linked_files(&mut self, data: &[u8], start: usize, end: usize) {
+        let mut pos = start;
+        while pos + 8 <= end {
+            let mut r = Reader::at(&data[..end], pos);
+            let Ok(len) = r.u64() else { break };
+            let body = r.pos;
+            let Some(rec_end) = body.checked_add(len as usize).filter(|e| *e <= end) else { break };
+            let mut r = Reader::at(&data[..rec_end], body);
+            let rec = (|| -> Result<LinkedFile> {
+                let kind = r.tag()?;
+                let version = r.u32()?;
+                let n = r.u8()? as usize;
+                let uuid = String::from_utf8_lossy(r.bytes(n)?).into_owned();
+                let name = descriptor::read_unicode(&mut r)?;
+                let file_type = String::from_utf8_lossy(&r.tag()?).trim().to_string();
+                let _creator = r.tag()?;
+                let dlen = r.u64()? as usize;
+                if r.u8()? != 0 {
+                    let _v = r.u32()?;
+                    descriptor::read_descriptor(&mut r)?;
+                }
+                let mut out = LinkedFile { uuid, name, file_type, data: None };
+                match &kind {
+                    b"liFD" => {
+                        let s = r.pos;
+                        r.skip(dlen)?;
+                        out.data = Some(s..s + dlen);
+                    }
+                    b"liFE" => {
+                        let _v = r.u32()?;
+                        descriptor::read_descriptor(&mut r)?;
+                        if version > 3 {
+                            r.skip(4 + 4 + 8)?;
+                        }
+                        let _size = r.u64()?;
+                        if version > 2 && r.remaining() >= dlen && dlen > 0 {
+                            let s = r.pos;
+                            out.data = Some(s..s + dlen);
+                        }
+                    }
+                    _ => {}
+                }
+                Ok(out)
+            })();
+            match rec {
+                Ok(f) => self.linked.push(f),
+                Err(_) => break,
+            }
+            pos = rec_end.div_ceil(4) * 4;
+        }
+    }
+
+    fn layer_info(&mut self, data: &[u8], start: usize, end: usize) -> Result<()> {
+        let mut r = Reader::at(&data[..end], start);
+        let count = r.i16()?;
+        self.merged_alpha = count < 0;
+        let n = count.unsigned_abs() as usize;
+        let mut layers = Vec::with_capacity(n);
+        for i in 0..n {
+            layers.push(self.layer_record(&mut r, i)?);
+        }
+        // Channel image data follows in record order.
+        for l in &mut layers {
+            for c in &mut l.channels {
+                c.offset = r.pos;
+                r.skip(c.len)?;
+            }
+        }
+        self.layers = layers;
+        Ok(())
+    }
+
+    fn layer_record(&self, r: &mut Reader, index: usize) -> Result<Layer> {
+        let psb = self.psb;
+        let (top, left, bottom, right) = (r.i32()?, r.i32()?, r.i32()?, r.i32()?);
+        let nch = r.u16()? as usize;
+        if nch > 64 {
+            return Err(Error::Invalid("channel count".into()));
+        }
+        let mut channels = Vec::with_capacity(nch);
+        for _ in 0..nch {
+            let id = r.i16()?;
+            let len = r.length(psb)?;
+            channels.push(ChannelInfo { id, offset: 0, len });
+        }
+        if r.bytes(4)? != b"8BIM" {
+            return Err(Error::Invalid("layer record signature".into()));
+        }
+        let blend = r.tag()?;
+        let opacity = r.u8()?;
+        let clipping = r.u8()? != 0;
+        let flags = r.u8()?;
+        r.skip(1)?;
+        let extra = r.u32()? as usize;
+        let extra_end = r.pos.checked_add(extra).filter(|&e| e <= r.data.len()).ok_or(Error::Truncated)?;
+        let mut l = Layer {
+            index,
+            rect: Rect { top, left, bottom, right },
+            blend,
+            opacity,
+            fill_opacity: 255,
+            clipping,
+            hidden: flags & 2 != 0,
+            protect_transparency: flags & 1 != 0,
+            channels,
+            ..Default::default()
+        };
+        // Layer mask data.
+        let mlen = r.u32()? as usize;
+        let mstart = r.pos;
+        if mlen >= 18 {
+            let rect = Rect { top: r.i32()?, left: r.i32()?, bottom: r.i32()?, right: r.i32()? };
+            let default_color = r.u8()?;
+            let mflags = r.u8()?;
+            l.mask = Some(LayerMask { rect, default_color, disabled: mflags & 2 != 0, inverted: mflags & 4 != 0 });
+        }
+        r.pos = mstart + mlen;
+        // Blending ranges.
+        let blen = r.u32()? as usize;
+        r.skip(blen)?;
+        l.name = r.pascal(4)?;
+        let mut pos = r.pos;
+        let data = r.data;
+        while let Some((key, start, end)) = next_block(data, &mut pos, extra_end, psb) {
+            l.keys.push(key);
+            let block = &data[start..end];
+            // A malformed block only loses that block's information.
+            let _ = self.layer_block(&mut l, &key, block);
+            pos = end;
+        }
+        r.pos = extra_end;
+        Ok(l)
+    }
+
+    fn layer_block(&self, l: &mut Layer, key: &[u8; 4], b: &[u8]) -> Result<()> {
+        let mut r = Reader::new(b);
+        match key {
+            b"luni" => {
+                let name = descriptor::read_unicode(&mut r)?;
+                if !name.is_empty() {
+                    l.name = name;
+                }
+            }
+            b"lyid" => l.id = Some(r.u32()?),
+            b"iOpa" => l.fill_opacity = r.u8()?,
+            b"lsct" | b"lsdk" => {
+                l.section = match r.u32()? {
+                    1 => Section::OpenFolder,
+                    2 => Section::ClosedFolder,
+                    3 => Section::Divider,
+                    _ => Section::Layer,
+                };
+                if b.len() >= 12 && &b[4..8] == b"8BIM" {
+                    l.blend.copy_from_slice(&b[8..12]);
+                }
+            }
+            b"TySh" => {
+                let _ver = r.u16()?;
+                let mut t = [0.0; 6];
+                for v in &mut t {
+                    *v = r.f64()?;
+                }
+                // A transform with NaN/inf is unusable: fall back to the identity.
+                if t.iter().any(|v| !v.is_finite()) {
+                    t = [1.0, 0.0, 0.0, 1.0, 0.0, 0.0];
+                }
+                let _text_ver = r.u16()?;
+                let _desc_ver = r.u32()?;
+                let d = descriptor::read_descriptor(&mut r)?;
+                let text = d.text("Txt ").unwrap_or_default().replace("\r\n", "\n").replace('\r', "\n");
+                let text = text.strip_suffix('\n').map(str::to_string).unwrap_or(text);
+                let style = d.raw("EngineData").map(|e| engine_data::text_style(&engine_data::parse(e))).unwrap_or_default();
+                let bounds =
+                    d.obj("bounds").or_else(|| d.obj("boundingBox")).and_then(|o| Some([o.num("Left")?, o.num("Top ")?, o.num("Rght")?, o.num("Btom")?]));
+                l.text = Some(TextInfo { text, transform: t, style, bounds });
+            }
+            b"lfx2" => {
+                let _ver = r.u32()?;
+                let _dver = r.u32()?;
+                l.effects = Some(descriptor::read_descriptor(&mut r)?);
+            }
+            b"SoCo" => {
+                let _ver = r.u32()?;
+                let d = descriptor::read_descriptor(&mut r)?;
+                l.fill = d.color("Clr ");
+            }
+            b"nvrt" => l.adjustment = Some(Adjustment::Invert),
+            b"brit" => {
+                let brightness = r.i16()? as f64;
+                let contrast = r.i16()? as f64;
+                if l.adjustment.is_none() {
+                    l.adjustment = Some(Adjustment::BrightnessContrast { brightness, contrast, legacy: true });
+                }
+            }
+            b"CgEd" => {
+                let _ver = r.u32()?;
+                let d = descriptor::read_descriptor(&mut r)?;
+                l.adjustment = Some(Adjustment::BrightnessContrast {
+                    brightness: d.num("Brgh").unwrap_or(0.0),
+                    contrast: d.num("Cntr").unwrap_or(0.0),
+                    legacy: d.bool("useLegacy").unwrap_or(false),
+                });
+            }
+            b"hue2" | b"hue " => {
+                let _ver = r.u16()?;
+                let colorize = r.u8()? != 0;
+                r.skip(1)?;
+                let ch = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
+                let m = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
+                let (hue, saturation, lightness) = if colorize { ch } else { m };
+                l.adjustment = Some(Adjustment::HueSaturation { hue, saturation, lightness, colorize });
+            }
+            b"levl" => {
+                let _ver = r.u16()?;
+                let (ib, iw, ob, ow, g) = (r.i16()?, r.i16()?, r.i16()?, r.i16()?, r.i16()?);
+                l.adjustment =
+                    Some(Adjustment::Levels { in_black: ib as f64, in_white: iw as f64, gamma: g as f64 / 100.0, out_black: ob as f64, out_white: ow as f64 });
+            }
+            b"expA" => {
+                let _ver = r.u16()?;
+                let mut finite = |default: f64| -> Result<f64> {
+                    let v = f64::from(r.f32()?);
+                    Ok(if v.is_finite() { v } else { default })
+                };
+                let exposure = finite(0.0)?;
+                let offset = finite(0.0)?;
+                let gamma = finite(1.0)?;
+                l.adjustment = Some(Adjustment::Exposure { exposure, offset, gamma });
+            }
+            b"curv" | b"blnc" | b"post" | b"thrs" | b"selc" | b"mixr" | b"phfl" | b"vibA" | b"blwh" | b"grdm" | b"clrL" if l.adjustment.is_none() => {
+                l.adjustment = Some(Adjustment::Other(String::from_utf8_lossy(key).into_owned()));
+            }
+            b"SoLd" | b"SoLE" => {
+                let _id = r.tag()?;
+                let _ver = r.u32()?;
+                let _dver = r.u32()?;
+                let d = descriptor::read_descriptor(&mut r)?;
+                let uuid = d.text("Idnt").unwrap_or_default().to_string();
+                let t = placed::eight(&d, "Trnf").unwrap_or([0.0; 8]);
+                // The non-affine transform when present (perspective), else the transform.
+                let t = placed::eight(&d, "nonAffineTransform").unwrap_or(t);
+                let size = d.obj("Sz  ").and_then(|s| Some([s.num("Wdth")?, s.num("Hght")?]));
+                let warp = d.obj("warp").and_then(placed::Warp::read);
+                l.smart_object = Some(SmartObject { uuid, quad: placed::quad_from(t), size, warp });
+            }
+            b"PlLd" if l.smart_object.is_none() => {
+                let _id = r.tag()?;
+                let _ver = r.u32()?;
+                let n = r.u8()? as usize;
+                let uuid = String::from_utf8_lossy(r.bytes(n)?).into_owned();
+                let _page = r.u32()?;
+                let _pages = r.u32()?;
+                let _aa = r.u32()?;
+                let _ty = r.u32()?;
+                let mut t = [0.0; 8];
+                for v in &mut t {
+                    *v = r.f64_finite()?;
+                }
+                l.smart_object = Some(SmartObject { uuid, quad: placed::quad_from(t), size: None, warp: None });
+            }
+            b"vmsk" | b"vsms" => {
+                let _ver = r.u32()?;
+                let flags = r.u32()?;
+                l.vector_mask = Some(self.vector_paths(&mut r, flags)?);
+            }
+            _ => {}
+        }
+        Ok(())
+    }
+
+    fn vector_paths(&self, r: &mut Reader, flags: u32) -> Result<VectorMask> {
+        let (w, h) = (self.width as f64, self.height as f64);
+        let mut vm = VectorMask { inverted: flags & 1 != 0, disabled: flags & 4 != 0, subpaths: vec![] };
+        let fixed = |r: &mut Reader| -> Result<f64> { Ok(r.i32()? as f64 / (1 << 24) as f64) };
+        while r.remaining() >= 26 {
+            let sel = r.u16()?;
+            match sel {
+                0 | 3 => {
+                    let _n = r.u16()?;
+                    r.skip(22)?;
+                    vm.subpaths.push(SubPath { closed: sel == 0, knots: vec![] });
+                }
+                1 | 2 | 4 | 5 => {
+                    let mut pts = [[0.0; 2]; 3];
+                    for p in &mut pts {
+                        let y = fixed(r)?;
+                        let x = fixed(r)?;
+                        *p = [x * w, y * h];
+                    }
+                    if let Some(sp) = vm.subpaths.last_mut() {
+                        sp.knots.push(pts);
+                    }
+                }
+                _ => r.skip(24)?,
+            }
+        }
+        vm.subpaths.retain(|s| !s.knots.is_empty());
+        Ok(vm)
+    }
+
+    /// The layer tree, top of the stack first. Groups nest at most [`MAX_GROUP_DEPTH`] deep (see
+    /// [`Psd::tree_report`]).
+    pub fn tree(&self) -> Vec<Node> {
+        self.tree_report().0
+    }
+
+    /// The layer tree plus the number of groups nested deeper than [`MAX_GROUP_DEPTH`]. Those
+    /// are flattened into their deepest allowed ancestor: their children stay, in order, and
+    /// the group record itself becomes a plain [`Node::Layer`], so no layer is lost and the
+    /// tree (and its `Drop`, `Clone` and `PartialEq`) cannot recurse deeper than the limit.
+    pub fn tree_report(&self) -> (Vec<Node>, usize) {
+        let mut stack: Vec<Vec<Node>> = vec![vec![]];
+        // Dividers seen while `MAX_GROUP_DEPTH` groups were already open.
+        let mut flattened_open = 0usize;
+        let mut flattened = 0usize;
+        for l in &self.layers {
+            match l.section {
+                Section::Divider => {
+                    if stack.len() > MAX_GROUP_DEPTH {
+                        flattened_open += 1;
+                    } else {
+                        stack.push(vec![]);
+                    }
+                }
+                Section::OpenFolder | Section::ClosedFolder => {
+                    if flattened_open > 0 {
+                        flattened_open -= 1;
+                        flattened += 1;
+                        if let Some(top) = stack.last_mut() {
+                            top.push(Node::Layer(l.index));
+                        }
+                        continue;
+                    }
+                    let children = if stack.len() > 1 { stack.pop().unwrap_or_default() } else { vec![] };
+                    if let Some(top) = stack.last_mut() {
+                        top.push(Node::Group { layer: l.index, children });
+                    }
+                }
+                Section::Layer => {
+                    if let Some(top) = stack.last_mut() {
+                        top.push(Node::Layer(l.index));
+                    }
+                }
+            }
+        }
+        while stack.len() > 1 {
+            let c = stack.pop().unwrap_or_default();
+            if let Some(top) = stack.last_mut() {
+                top.extend(c);
+            }
+        }
+        // Depth is at most `MAX_GROUP_DEPTH`, so recursion is bounded.
+        fn rev(v: &mut Vec<Node>) {
+            v.reverse();
+            for n in v {
+                if let Node::Group { children, .. } = n {
+                    rev(children);
+                }
+            }
+        }
+        let mut out = stack.pop().unwrap_or_default();
+        rev(&mut out);
+        (out, flattened)
+    }
+}
+
+/// The next additional-information block at `*pos` (signature `8BIM`/`8B64`, key, length):
+/// returns (key, data start, data end). Skips up to 3 padding bytes before a signature.
+fn next_block(data: &[u8], pos: &mut usize, end: usize, psb: bool) -> Option<([u8; 4], usize, usize)> {
+    let mut p = *pos;
+    for _ in 0..4 {
+        if p + 12 > end {
+            return None;
+        }
+        if &data[p..p + 4] == b"8BIM" || &data[p..p + 4] == b"8B64" {
+            break;
+        }
+        p += 1;
+    }
+    if p + 12 > end || !(&data[p..p + 4] == b"8BIM" || &data[p..p + 4] == b"8B64") {
+        return None;
+    }
+    let mut key = [0u8; 4];
+    key.copy_from_slice(&data[p + 4..p + 8]);
+    let wide =
+        psb && matches!(&key, b"LMsk" | b"Lr16" | b"Lr32" | b"Layr" | b"Mt16" | b"Mt32" | b"Mtrn" | b"Alph" | b"FMsk" | b"lnk2" | b"FEid" | b"FXid" | b"PxSD");
+    let mut r = Reader::at(&data[..end], p + 8);
+    let len = r.length(wide).ok()?;
+    let start = r.pos;
+    let stop = start.checked_add(len)?;
+    if stop > end {
+        return None;
+    }
+    *pos = stop;
+    Some((key, start, stop))
+}
diff --git a/crates/psd/src/pixels.rs b/crates/psd/src/pixels.rs
new file mode 100644
index 000000000..21a5c8845
--- /dev/null
+++ b/crates/psd/src/pixels.rs
@@ -0,0 +1,554 @@
+#[cfg(test)]
+use super::counters;
+use super::limits::{Budget, DECODE_BUDGET, Error, Result, decode_pixels, finite_sample, inflate, release_bytes, too_large};
+use super::model::{ColorMode, Layer, Pixels, Rect};
+use super::{Psd, Reader};
+use std::borrow::Cow;
+
+impl Psd {
+    fn bytes_per_sample(&self) -> usize {
+        match self.depth {
+            16 => 2,
+            32 => 4,
+            _ => 1,
+        }
+    }
+
+    /// The raw big-endian bytes of one channel of `w`×`h` samples at `offset` (compression field
+    /// first): `row_bytes(w) × h` of them with the compression and the prediction undone.
+    /// Uncompressed data is borrowed from the file, not copied; any other buffer is charged to
+    /// `budget` and the caller releases it (see [`release_bytes`]) once it is dropped.
+    fn channel_bytes(&self, offset: usize, len: usize, w: usize, h: usize, budget: &mut Budget) -> Result<Cow<'_, [u8]>> {
+        let end = offset.checked_add(len).filter(|&e| e <= self.data.len()).ok_or(Error::Truncated)?;
+        let mut r = Reader::at(self.data.get(..end).ok_or(Error::Truncated)?, offset);
+        let comp = r.u16()?;
+        decode_pixels(w, h)?;
+        self.plane_bytes(comp, &mut r, w, h, budget)
+    }
+
+    /// The raw bytes (`row_bytes(w)` × `h`, ZIP prediction undone) of one channel whose pixel data
+    /// follows `r`'s position (after the compression field). Uncompressed data is borrowed, not
+    /// copied; the other buffers are charged to `budget`.
+    pub(crate) fn plane_bytes<'a>(&self, comp: u16, r: &mut Reader<'a>, w: usize, h: usize, budget: &mut Budget) -> Result<Cow<'a, [u8]>> {
+        let rowb = self.row_bytes(w);
+        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
+        Ok(match self.open_planes(comp, r, 1, 1, (w, h), budget)? {
+            PlaneStream::Raw => Cow::Borrowed(r.bytes(size)?),
+            PlaneStream::Rle(counts) => Cow::Owned(Self::unpack_plane(&counts, 0, r, rowb, h, budget)?),
+            PlaneStream::Zip(mut v) => {
+                v.resize(size, 0);
+                self.zip_plane(comp, &mut v, 0, w, h)?;
+                Cow::Owned(v)
+            }
+        })
+    }
+
+    /// Prepare the pixel data at `r` (just after the compression field) of `total` planes of
+    /// `w`×`h` samples, of which the first `want` are decoded: the RLE row sizes of every plane,
+    /// or the inflated ZIP data, which holds all planes one after another (charged to `budget`
+    /// before it is inflated).
+    fn open_planes(&self, comp: u16, r: &mut Reader, total: usize, want: usize, size: (usize, usize), budget: &mut Budget) -> Result<PlaneStream> {
+        let (w, h) = size;
+        let size = self.row_bytes(w).checked_mul(h).ok_or_else(|| too_large(w, h))?;
+        Ok(match comp {
+            0 => PlaneStream::Raw,
+            1 => {
+                let n = total.saturating_mul(h);
+                let mut counts = Vec::with_capacity(n.min(r.remaining() / 2));
+                for _ in 0..n {
+                    counts.push(if self.psb { r.u32()? as usize } else { r.u16()? as usize });
+                }
+                PlaneStream::Rle(counts)
+            }
+            2 | 3 => {
+                let rest = r.bytes(r.remaining())?;
+                // One stream holds every plane: what it may decode to is what they need.
+                let all = size.checked_mul(want).ok_or_else(|| too_large(w, h))?;
+                budget.charge(all as u64)?;
+                PlaneStream::Zip(inflate(rest, all)?)
+            }
+            c => return Err(Error::Unsupported(format!("compression {c}"))),
+        })
+    }
+
+    /// The raw bytes (`row_bytes(w)` × `h`, ZIP prediction undone) of plane `c`: raw and RLE
+    /// planes are read from `r` in order, raw ones borrowed from the file data, ZIP ones from the
+    /// inflated buffer (un-predicted in place; already charged by `open_planes`), RLE ones charged
+    /// to `budget`.
+    fn decode_plane<'x, 'a: 'x>(
+        &self,
+        comp: u16,
+        planes: &'x mut PlaneStream,
+        r: &mut Reader<'a>,
+        c: usize,
+        size: (usize, usize),
+        budget: &mut Budget,
+    ) -> Result<Cow<'x, [u8]>> {
+        let (w, h) = size;
+        let rowb = self.row_bytes(w);
+        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
+        Ok(match planes {
+            PlaneStream::Raw => Cow::Borrowed(r.bytes(size)?),
+            PlaneStream::Rle(counts) => Cow::Owned(Self::unpack_plane(counts, c, r, rowb, h, budget)?),
+            PlaneStream::Zip(v) => Cow::Borrowed(self.zip_plane(comp, v, c, w, h)?),
+        })
+    }
+
+    /// Unpack the `h` RLE rows of plane `c` (row byte counts `counts`, plane after plane) into a
+    /// buffer charged to `budget`.
+    fn unpack_plane(counts: &[usize], c: usize, r: &mut Reader, rowb: usize, h: usize, budget: &mut Budget) -> Result<Vec<u8>> {
+        let mut out = budget.vec::<u8>(rowb.checked_mul(h).ok_or(Error::Truncated)?)?;
+        for row in 0..h {
+            let n = *counts.get(c * h + row).ok_or(Error::Truncated)?;
+            unpack_bits(r.bytes(n)?, rowb, &mut out)?;
+        }
+        Ok(out)
+    }
+
+    /// Plane `c` of the inflated ZIP data of consecutive planes, un-predicted in place (`comp` 3).
+    pub(crate) fn zip_plane<'v>(&self, comp: u16, v: &'v mut [u8], c: usize, w: usize, h: usize) -> Result<&'v [u8]> {
+        let rowb = self.row_bytes(w);
+        let plane = v.get_mut(c * rowb * h..(c + 1) * rowb * h).ok_or(Error::Truncated)?;
+        if comp == 3 {
+            self.unpredict(plane, w, h);
+        }
+        Ok(plane)
+    }
+
+    /// One channel as `w * h` floats (0..1), charged to `budget` (the caller releases it).
+    fn channel_floats(&self, offset: usize, len: usize, w: usize, h: usize, budget: &mut Budget) -> Result<Vec<f32>> {
+        let raw = self.channel_bytes(offset, len, w, h, budget)?;
+        let mut out = budget.filled(decode_pixels(w, h)?, 0.0f32)?;
+        self.for_each_sample(&raw, w, h, |i, v| {
+            if let Some(o) = out.get_mut(i) {
+                *o = v;
+            }
+        });
+        release_bytes(budget, raw);
+        Ok(out)
+    }
+
+    pub(crate) fn row_bytes(&self, w: usize) -> usize {
+        if self.depth == 1 { w.div_ceil(8) } else { w * self.bytes_per_sample() }
+    }
+
+    pub(crate) fn unpredict(&self, v: &mut [u8], w: usize, h: usize) {
+        match self.depth {
+            16 => {
+                for row in v.chunks_exact_mut(w * 2).take(h) {
+                    let mut prev = 0u16;
+                    for c in row.as_chunks_mut::<2>().0 {
+                        let x = u16::from_be_bytes([c[0], c[1]]).wrapping_add(prev);
+                        c.copy_from_slice(&x.to_be_bytes());
+                        prev = x;
+                    }
+                }
+            }
+            32 => {
+                // One scratch row for the whole plane.
+                let mut planar = vec![0u8; w * 4];
+                #[cfg(test)]
+                counters::bump(&counters::SCRATCH);
+                for row in v.chunks_exact_mut(w * 4).take(h) {
+                    for i in 1..row.len() {
+                        row[i] = row[i].wrapping_add(row[i - 1]);
+                    }
+                    // Bytes are stored plane by plane (all first bytes, then all second bytes…).
+                    planar.copy_from_slice(row);
+                    for x in 0..w {
+                        for b in 0..4 {
+                            row[x * 4 + b] = planar[b * w + x];
+                        }
+                    }
+                }
+            }
+            _ => {
+                for row in v.chunks_exact_mut(w).take(h) {
+                    for i in 1..row.len() {
+                        row[i] = row[i].wrapping_add(row[i - 1]);
+                    }
+                }
+            }
+        }
+    }
+
+    /// Hand every sample of `raw` (`w`×`h`, row-major, in order) to `f` as a float. Samples a short
+    /// `raw` does not have are not reported.
+    pub(crate) fn for_each_sample(&self, raw: &[u8], w: usize, h: usize, mut f: impl FnMut(usize, f32)) {
+        let n = w.saturating_mul(h);
+        match self.depth {
+            1 => {
+                let rowb = w.div_ceil(8);
+                for y in 0..h {
+                    for x in 0..w {
+                        let b = raw.get(y * rowb + x / 8).copied().unwrap_or(0);
+                        // 1 = black.
+                        f(y * w + x, if b & (0x80 >> (x % 8)) != 0 { 0.0 } else { 1.0 });
+                    }
+                }
+            }
+            16 => raw.as_chunks::<2>().0.iter().take(n).enumerate().for_each(|(i, c)| f(i, u16::from_be_bytes([c[0], c[1]]) as f32 / 65535.0)),
+            // NaN reads as 0, +inf as white (1.0, like the integer depths' maximum), -inf as 0.
+            32 => raw.as_chunks::<4>().0.iter().take(n).enumerate().for_each(|(i, c)| f(i, finite_sample(f32::from_be_bytes([c[0], c[1], c[2], c[3]])))),
+            _ => raw.iter().take(n).enumerate().for_each(|(i, &b)| f(i, b as f32 / 255.0)),
+        }
+    }
+
+    /// Convert colour values (the document mode's channels, missing ones 0) to RGB.
+    pub(crate) fn rgb_from(&self, v: [f32; 4]) -> [f32; 3] {
+        let g = |k: usize| v.get(k).copied().unwrap_or(0.0);
+        let rgb = match self.mode {
+            ColorMode::Rgb => [g(0), g(1), g(2)],
+            ColorMode::Cmyk => {
+                // Stored inverted (1 = no ink).
+                let k = g(3);
+                [g(0) * k, g(1) * k, g(2) * k]
+            }
+            ColorMode::Indexed if self.palette.len() >= 768 => {
+                let idx = (g(0) * 255.0).round() as usize & 255;
+                [self.palette[idx] as f32 / 255.0, self.palette[256 + idx] as f32 / 255.0, self.palette[512 + idx] as f32 / 255.0]
+            }
+            ColorMode::Lab => lab_to_rgb(g(0) * 100.0, g(1) * 255.0 - 128.0, g(2) * 255.0 - 128.0),
+            _ => [g(0); 3],
+        };
+        if self.depth == 32 && self.mode != ColorMode::Lab { rgb.map(srgb_encode) } else { rgb }
+    }
+
+    /// Write merged-image channel `c` (raw bytes) into the result: the first three colour channels
+    /// and the alpha channel into their slot of a pixel, the fourth CMYK channel into `black`.
+    fn store_merged_channel(&self, c: usize, raw: &[u8], data: &mut [[f32; 4]], black: &mut Option<Vec<f32>>) {
+        let (w, h, cc) = (self.width as usize, self.height as usize, self.mode.color_channels());
+        if c < cc.min(3) {
+            self.for_each_sample(raw, w, h, |i, v| {
+                if let Some(p) = data.get_mut(i) {
+                    p[c] = v;
+                }
+            });
+        } else if c == 3 && c < cc {
+            if let Some(k) = black {
+                self.for_each_sample(raw, w, h, |i, v| {
+                    if let Some(o) = k.get_mut(i) {
+                        *o = v;
+                    }
+                });
+            }
+        } else if c == cc && self.merged_alpha {
+            self.for_each_sample(raw, w, h, |i, v| {
+                if let Some(p) = data.get_mut(i) {
+                    p[3] = v;
+                }
+            });
+        }
+    }
+
+    /// The merged (flattened) image.
+    pub fn composite(&self) -> Result<Pixels> {
+        self.composite_with_budget(DECODE_BUDGET)
+    }
+
+    /// [`Self::composite`] with at most `limit` bytes live at once. The channels are written
+    /// straight into the result, so the peak is the result (16 bytes a pixel), the CMYK black
+    /// channel, and the one buffer a channel (or, for ZIP, all channels) decodes through.
+    pub(crate) fn composite_with_budget(&self, limit: u64) -> Result<Pixels> {
+        let mut budget = Budget::new(limit);
+        let (w, h) = (self.width as usize, self.height as usize);
+        let n = decode_pixels(w, h)?;
+        let mut r = Reader::at(&self.data, self.merged_offset);
+        let comp = r.u16()?;
+        let nch = self.channels as usize;
+        let cc = self.mode.color_channels();
+        let want = (cc + usize::from(self.merged_alpha)).min(nch);
+        let rowb = self.row_bytes(w);
+        let size = rowb.checked_mul(h).ok_or_else(|| too_large(w, h))?;
+        // The peak: the result, the CMYK black channel and what the channels decode through.
+        let black_bytes = if self.mode == ColorMode::Cmyk && want > 3 { 4 * n as u64 } else { 0 };
+        let transient = if matches!(comp, 2 | 3) { (size as u64).saturating_mul(want as u64) } else { size as u64 };
+        budget.check((16 * n as u64).saturating_add(black_bytes).saturating_add(transient))?;
+        // Opaque black until a channel says otherwise.
+        let mut data = budget.filled(n, [0.0f32, 0.0, 0.0, 1.0])?;
+        let mut black = if self.mode == ColorMode::Cmyk && want > 3 { Some(budget.filled(n, 0.0f32)?) } else { None };
+        let mut stream = self.open_planes(comp, &mut r, nch, want, (w, h), &mut budget)?;
+        for c in 0..want {
+            let raw = self.decode_plane(comp, &mut stream, &mut r, c, (w, h), &mut budget)?;
+            self.store_merged_channel(c, &raw, &mut data, &mut black);
+            release_bytes(&mut budget, raw);
+        }
+        for (i, p) in data.iter_mut().enumerate() {
+            let k = black.as_ref().and_then(|k| k.get(i)).copied().unwrap_or(0.0);
+            let [r, g, b] = self.rgb_from([p[0], p[1], p[2], k]);
+            *p = [r, g, b, p[3]];
+        }
+        Ok(Pixels { width: w as u32, height: h as u32, data })
+    }
+
+    /// One layer's pixels with its layer mask (and vector-less fill colour) applied to alpha.
+    /// `canvas`: document-sized with the layer in place; otherwise the layer's own bounds.
+    pub fn layer_pixels(&self, index: usize, canvas: bool) -> Result<Pixels> {
+        self.layer_pixels_with_budget(index, canvas, DECODE_BUDGET)
+    }
+
+    /// [`Self::layer_pixels`] with at most `limit` bytes live at once: the result (16 bytes a
+    /// pixel) with the channels written straight into it, the CMYK black channel, the one channel
+    /// being decoded, and the mask.
+    pub(crate) fn layer_pixels_with_budget(&self, index: usize, canvas: bool, limit: u64) -> Result<Pixels> {
+        let mut budget = Budget::new(limit);
+        let l = self.layers.get(index).ok_or_else(|| Error::Invalid(format!("no layer {index}")))?;
+        let doc = Rect { top: 0, left: 0, bottom: self.height as i32, right: self.width as i32 };
+        // Fill layers often have no pixel data: they cover the canvas (or the mask).
+        let fill_rect =
+            if l.fill.is_some() && !l.has_pixels() { l.mask.filter(|m| !m.rect.is_empty() && m.default_color == 0).map_or(doc, |m| m.rect) } else { l.rect };
+        let out_rect = if canvas {
+            doc
+        } else if fill_rect.is_empty() {
+            Rect { top: 0, left: 0, bottom: 1, right: 1 }
+        } else {
+            fill_rect
+        };
+        let (ow, oh) = (out_rect.width() as usize, out_rect.height() as usize);
+        let n = decode_pixels(ow, oh)?;
+        let src = fill_rect;
+        let (sw, sh) = (src.width() as usize, src.height() as usize);
+        // The peak: the result, then either the CMYK black channel with the channel being decoded,
+        // or the mask as floats with its bytes. Checked before anything is allocated.
+        let plane = |w: usize, h: usize| (self.row_bytes(w) as u64).saturating_mul(h as u64);
+        let mut pixels_peak = 0u64;
+        if l.has_pixels() && sw > 0 && sh > 0 {
+            pixels_peak = plane(sw, sh).saturating_add(if self.mode == ColorMode::Cmyk { 4 * n as u64 } else { 0 });
+        }
+        let mut mask_peak = 0u64;
+        if let Some(m) = l.mask.filter(|m| !m.disabled) {
+            let (mw, mh) = (m.rect.width() as usize, m.rect.height() as usize);
+            if mw > 0 && mh > 0 && l.channels.iter().any(|c| c.id == -2) {
+                mask_peak = plane(mw, mh).saturating_add((mw as u64).saturating_mul(mh as u64).saturating_mul(4));
+            }
+        }
+        budget.check((16 * n as u64).saturating_add(pixels_peak.max(mask_peak)))?;
+        let mut out = budget.filled(n, [0.0f32; 4])?;
+        if sw > 0 && sh > 0 {
+            // The source rows / columns that land inside the output (64-bit: file bounds can span
+            // the whole i32 range).
+            let span = |s0: i32, n: usize, o0: i32, on: usize| {
+                let off = i64::from(o0) - i64::from(s0);
+                let lo = off.clamp(0, n as i64);
+                let hi = (off + on as i64).clamp(lo, n as i64);
+                (lo as usize..hi as usize, off)
+            };
+            let (ys, oy) = span(src.top, sh, out_rect.top, oh);
+            let (xs, ox) = span(src.left, sw, out_rect.left, ow);
+            let dest = |y: usize, x: usize| (y as i64 - oy) as usize * ow + (x as i64 - ox) as usize;
+            let fill = l.fill.map(|c| c.map(|v| v as f32));
+            match fill {
+                Some(f) if !l.has_pixels() => {
+                    for y in ys {
+                        for x in xs.clone() {
+                            if let Some(p) = out.get_mut(dest(y, x)) {
+                                *p = [f[0], f[1], f[2], 1.0];
+                            }
+                        }
+                    }
+                }
+                _ => {
+                    // Opaque unless there is an alpha channel.
+                    for y in ys.clone() {
+                        for x in xs.clone() {
+                            if let Some(p) = out.get_mut(dest(y, x)) {
+                                p[3] = 1.0;
+                            }
+                        }
+                    }
+                    let cc = self.mode.color_channels();
+                    let mut black: Option<Vec<f32>> = None;
+                    if l.has_pixels() {
+                        for c in &l.channels {
+                            let slot = match c.id {
+                                -1 => 3,
+                                id if id >= 0 && (id as usize) < cc => id as usize,
+                                _ => continue,
+                            };
+                            let raw = self.channel_bytes(c.offset, c.len, sw, sh, &mut budget)?;
+                            // The fourth CMYK channel is the black plate, not a slot of the result.
+                            let to_black = c.id == 3;
+                            if to_black && black.is_none() {
+                                black = Some(budget.filled(out.len(), 0.0f32)?);
+                            }
+                            // Samples arrive in row-major order of the source.
+                            let (mut sy, mut sx) = (0usize, 0usize);
+                            self.for_each_sample(&raw, sw, sh, |_, v| {
+                                if ys.contains(&sy) && xs.contains(&sx) {
+                                    let d = dest(sy, sx);
+                                    if to_black {
+                                        if let Some(o) = black.as_mut().and_then(|k| k.get_mut(d)) {
+                                            *o = v;
+                                        }
+                                    } else if let Some(p) = out.get_mut(d) {
+                                        p[slot] = v;
+                                    }
+                                }
+                                sx += 1;
+                                if sx == sw {
+                                    sx = 0;
+                                    sy += 1;
+                                }
+                            });
+                            release_bytes(&mut budget, raw);
+                        }
+                    }
+                    for y in ys {
+                        for x in xs.clone() {
+                            let d = dest(y, x);
+                            let k = black.as_ref().and_then(|k| k.get(d)).copied().unwrap_or(0.0);
+                            if let Some(p) = out.get_mut(d) {
+                                let [r, g, b] = self.rgb_from([p[0], p[1], p[2], k]);
+                                *p = [r, g, b, p[3]];
+                            }
+                        }
+                    }
+                    if let Some(k) = black {
+                        budget.release(k.len() as u64 * 4);
+                    }
+                }
+            }
+        }
+        self.apply_layer_mask(l, out_rect, &mut out, &mut budget)?;
+        Ok(Pixels { width: ow as u32, height: oh as u32, data: out })
+    }
+
+    /// Apply the raster mask to alpha, including its default outside the mask bounds.
+    fn apply_layer_mask(&self, l: &Layer, out_rect: Rect, out: &mut [[f32; 4]], budget: &mut Budget) -> Result<()> {
+        let (ow, oh) = (out_rect.width() as usize, out_rect.height() as usize);
+        // Layer mask: multiplies alpha (also outside the mask rect, by its default colour).
+        if let Some(m) = l.mask.filter(|m| !m.disabled) {
+            let mc = l.channels.iter().find(|c| c.id == -2);
+            let (mw, mh) = (m.rect.width() as usize, m.rect.height() as usize);
+            let mask = match mc {
+                Some(c) if mw > 0 && mh > 0 => Some(self.channel_floats(c.offset, c.len, mw, mh, budget)?),
+                _ => None,
+            };
+            let def = m.default_color as f32 / 255.0;
+            // The factor outside the mask rect, or everywhere when there is no mask data.
+            let outside = if m.inverted { 1.0 - def } else { def };
+            let scale = |px: &mut [[f32; 4]], v: f32| {
+                if v != 1.0 {
+                    for p in px {
+                        p[3] *= v;
+                    }
+                }
+            };
+            match &mask {
+                None => scale(out, outside),
+                Some(mk) => {
+                    // The columns of the output that fall inside the mask rect (the same for every row).
+                    let lo = (i64::from(m.rect.left) - i64::from(out_rect.left)).clamp(0, ow as i64);
+                    let hi = (i64::from(m.rect.right) - i64::from(out_rect.left)).clamp(lo, ow as i64);
+                    let (lo, hi) = (lo as usize, hi as usize);
+                    for (y, row) in out.chunks_exact_mut(ow.max(1)).take(oh).enumerate() {
+                        let py = i64::from(out_rect.top) + y as i64;
+                        #[cfg(test)]
+                        counters::bump(&counters::INSIDE);
+                        if py < i64::from(m.rect.top) || py >= i64::from(m.rect.bottom) {
+                            scale(row, outside);
+                            continue;
+                        }
+                        let (left, rest) = row.split_at_mut(lo);
+                        let (mid, right) = rest.split_at_mut(hi - lo);
+                        scale(left, outside);
+                        scale(right, outside);
+                        // The mask row under `mid`: its first column is output column `lo`.
+                        let base = (py - i64::from(m.rect.top)) as usize * mw + (i64::from(out_rect.left) + lo as i64 - i64::from(m.rect.left)) as usize;
+                        for (i, p) in mid.iter_mut().enumerate() {
+                            let v = mk.get(base + i).copied().unwrap_or(def);
+                            p[3] *= if m.inverted { 1.0 - v } else { v };
+                        }
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+/// The pixel data of a run of planes, as prepared by `Psd::open_planes`.
+enum PlaneStream {
+    Raw,
+    /// RLE row byte counts of every plane, plane after plane.
+    Rle(Vec<usize>),
+    /// The inflated ZIP data of all planes.
+    Zip(Vec<u8>),
+}
+
+/// PackBits decoding of one row (appends exactly `row` bytes, zero-padded).
+pub(crate) fn unpack_bits(src: &[u8], row: usize, out: &mut Vec<u8>) -> Result<()> {
+    let start = out.len();
+    let mut i = 0;
+    while i < src.len() && out.len() - start < row {
+        let n = src[i] as i8;
+        i += 1;
+        if n >= 0 {
+            let k = n as usize + 1;
+            let s = src.get(i..i + k).ok_or(Error::Truncated)?;
+            out.extend_from_slice(s);
+            i += k;
+        } else if n != -128 {
+            let k = (1 - n as isize) as usize;
+            let v = *src.get(i).ok_or(Error::Truncated)?;
+            out.extend(std::iter::repeat_n(v, k));
+            i += 1;
+        }
+    }
+    out.resize(start + row, 0);
+    Ok(())
+}
+
+/// PackBits encoding of one row.
+pub(crate) fn pack_bits(src: &[u8]) -> Vec<u8> {
+    let mut out = vec![];
+    let mut i = 0;
+    while i < src.len() {
+        // run of identical bytes
+        let mut run = 1;
+        while i + run < src.len() && src[i + run] == src[i] && run < 128 {
+            run += 1;
+        }
+        if run >= 2 {
+            out.push((1 - run as isize) as i8 as u8);
+            out.push(src[i]);
+            i += run;
+            continue;
+        }
+        // literal run
+        let start = i;
+        let mut n = 0;
+        while i < src.len() && n < 128 {
+            if i + 1 < src.len() && src[i + 1] == src[i] {
+                break;
+            }
+            i += 1;
+            n += 1;
+        }
+        if n == 0 {
+            i += 1;
+            n = 1;
+        }
+        out.push((n - 1) as u8);
+        out.extend_from_slice(&src[start..start + n]);
+    }
+    out
+}
+
+pub(crate) fn srgb_encode(v: f32) -> f32 {
+    if v <= 0.003_130_8 { v * 12.92 } else { 1.055 * v.powf(1.0 / 2.4) - 0.055 }
+}
+
+/// CIE L*a*b* (D50) to sRGB (D65 via the Bradford-adapted matrix), clamped.
+pub(crate) fn lab_to_rgb(l: f32, a: f32, b: f32) -> [f32; 3] {
+    let fy = (l + 16.0) / 116.0;
+    let fx = fy + a / 500.0;
+    let fz = fy - b / 200.0;
+    let f = |t: f32| if t > 6.0 / 29.0 { t * t * t } else { 3.0 * (6.0f32 / 29.0).powi(2) * (t - 4.0 / 29.0) };
+    let (x, y, z) = (0.964_22 * f(fx), f(fy), 0.825_21 * f(fz));
+    // XYZ (D50) → linear sRGB.
+    let r = 3.133_856 * x - 1.616_867 * y - 0.490_615 * z;
+    let g = -0.978_768 * x + 1.916_142 * y + 0.033_454 * z;
+    let bb = 0.071_945 * x - 0.228_991 * y + 1.405_243 * z;
+    [r, g, bb].map(|v| srgb_encode(v.clamp(0.0, 1.0)))
+}
diff --git a/crates/psd/src/tests.rs b/crates/psd/src/tests.rs
index 60283b229..074976510 100644
--- a/crates/psd/src/tests.rs
+++ b/crates/psd/src/tests.rs
@@ -1,6 +1,9 @@
 use super::write::*;
 use super::*;
 
+mod integration;
+mod opt;
+
 fn gradient(w: u32, h: u32) -> Vec<[f32; 4]> {
     (0..w * h).map(|i| [(i % w) as f32 / (w - 1).max(1) as f32, (i / w) as f32 / (h - 1).max(1) as f32, 0.25, 1.0]).collect()
 }
diff --git a/crates/psd/src/tests_integration.rs b/crates/psd/src/tests/integration.rs
similarity index 98%
rename from crates/psd/src/tests_integration.rs
rename to crates/psd/src/tests/integration.rs
index a2b48b20c..ee40aee16 100644
--- a/crates/psd/src/tests_integration.rs
+++ b/crates/psd/src/tests/integration.rs
@@ -2,9 +2,9 @@
 //! the limit, a NaN text transform), a damaged layer section, and a tiny file claiming a huge
 //! image. Each ends in a clean result or a clean error, on a 2 MiB stack, never a panic.
 
-use super::memory_tests::with_merged;
-use super::write::*;
-use super::*;
+use crate::memory_tests::with_merged;
+use crate::write::*;
+use crate::*;
 
 /// Run `f` on a 2 MiB thread; a panic or stack overflow in it fails the test.
 fn on_small_stack<T: Send + 'static>(f: impl FnOnce() -> T + Send + 'static) -> T {
diff --git a/crates/psd/src/tests_opt.rs b/crates/psd/src/tests/opt.rs
similarity index 99%
rename from crates/psd/src/tests_opt.rs
rename to crates/psd/src/tests/opt.rs
index f129480c1..908026d07 100644
--- a/crates/psd/src/tests_opt.rs
+++ b/crates/psd/src/tests/opt.rs
@@ -1,10 +1,12 @@
 //! The optimised decode / mask / placed-bake paths against the implementations they replaced
 //! (kept below verbatim as references), and counters for the work they no longer do.
 
-use super::counters::{self, INSIDE, QUAD, SCRATCH};
-use super::placed::{Warp, square_to_quad};
-use super::write::*;
-use super::*;
+use std::borrow::Cow;
+
+use crate::counters::{self, INSIDE, QUAD, SCRATCH};
+use crate::placed::{Warp, square_to_quad};
+use crate::write::*;
+use crate::*;
 
 // ------------------------------------------------------------------ the replaced code
 
diff --git a/crates/raster/src/blur.rs b/crates/raster/src/blur.rs
index 1c065d77b..c8689a7b6 100644
--- a/crates/raster/src/blur.rs
+++ b/crates/raster/src/blur.rs
@@ -1,5 +1,5 @@
-//! Blurs: separable box passes (exact running sums) approximating Gaussians, plus directional
-//! and radial (spin/zoom) blurs.
+//! Blurs: separable box passes (exact running sums) approximating Gaussians, a sampled Gaussian
+//! kernel for small sigmas, plus directional and radial (spin/zoom) blurs.
 //!
 //! Box passes run straight on row-major pixels: horizontal passes per row, vertical passes over
 //! blocks of rows with a per-column running sum (no transposes), ping-ponging between two
@@ -157,6 +157,50 @@ pub fn gaussian_blur(img: &Image, sigma_x: f64, sigma_y: f64, repeat: bool) -> I
     box_passes(img, &rx, &ry, repeat)
 }
 
+/// Below this sigma (pixels) three integer-radius box passes are too coarse (sigma under ~0.6 is
+/// a no-op and the result steps between a few shapes), so [`gaussian_blur_exact`] is used instead.
+const EXACT_SIGMA_BELOW: f64 = 3.0;
+
+/// True when a Gaussian of these per-axis sigmas should use [`gaussian_blur_exact`].
+pub fn gaussian_is_exact(sigma_x: f64, sigma_y: f64) -> bool {
+    sigma_x.max(sigma_y) < EXACT_SIGMA_BELOW
+}
+
+/// One separable pass of a sampled Gaussian (radius 3 sigma) along x or y.
+fn gauss_pass(img: &Image, sigma: f64, vertical: bool, repeat: bool) -> Image {
+    // Below 1e-3 the kernel is the identity in f64; tiny sigmas would also make 2σ² underflow to 0 (NaN taps).
+    if sigma.is_nan() || sigma <= 1e-3 || img.is_empty() {
+        return img.clone();
+    }
+    let r = (sigma * 3.0).ceil() as i64;
+    let mut k: Vec<f64> = (-r..=r).map(|i| (-((i * i) as f64) / (2.0 * sigma * sigma)).exp()).collect();
+    let total: f64 = k.iter().sum();
+    k.iter_mut().for_each(|v| *v /= total);
+    let w = img.width as usize;
+    let mut out = Image::new(img.width, img.height);
+    out.rows_mut().for_each(|(y, row)| {
+        for x in 0..w {
+            let mut acc = [0.0f64; 4];
+            for (i, wt) in k.iter().enumerate() {
+                let d = i as i64 - r;
+                let (sx, sy) = if vertical { (x as i64, y as i64 + d) } else { (x as i64 + d, y as i64) };
+                let p = if repeat { img.get_clamped(sx, sy) } else { img.get(sx, sy) };
+                for c in 0..4 {
+                    acc[c] += p[c] as f64 * wt;
+                }
+            }
+            row[x] = acc.map(|v| v as f32);
+        }
+    });
+    out
+}
+
+/// Gaussian blur as a true sampled kernel, continuous in sigma (for small sigmas, see
+/// [`gaussian_is_exact`]).
+pub fn gaussian_blur_exact(img: &Image, sigma_x: f64, sigma_y: f64, repeat: bool) -> Image {
+    gauss_pass(&gauss_pass(img, sigma_x, false, repeat), sigma_y, true, repeat)
+}
+
 /// Motion blur along `angle_deg` (0 = vertical in AE's Directional Blur, measured clockwise from
 /// up) over `length` pixels.
 pub fn directional_blur(img: &Image, angle_deg: f64, length: f64) -> Image {
@@ -203,7 +247,9 @@ pub fn radial_blur(img: &Image, center: (f64, f64), amount: f64, zoom: bool) ->
                     let (s, c) = (t * amount).to_radians().sin_cos();
                     (center.0 + vx * c - vy * s, center.1 + vx * s + vy * c)
                 };
-                let p = img.sample_bilinear(sx, sy);
+                // Samples outside the image repeat its edge: After Effects' Radial Blur keeps a
+                // layer's edges (cases 713, 829) instead of fading them toward transparency.
+                let p = img.sample_bilinear(sx.clamp(0.5, (img.width as f64 - 0.5).max(0.5)), sy.clamp(0.5, (img.height as f64 - 0.5).max(0.5)));
                 for ch in 0..4 {
                     acc[ch] += p[ch];
                 }
@@ -228,6 +274,17 @@ mod tests {
         assert!(b.get(32, 32)[3] < 0.05);
     }
 
+    #[test]
+    fn vanishing_or_nan_sigma_leaves_the_image_unchanged() {
+        let mut img = Image::new(5, 5);
+        img.set(2, 2, [1.0, 0.5, 0.25, 1.0]);
+        for s in [1e-200, f64::MIN_POSITIVE, f64::NAN] {
+            let b = gaussian_blur_exact(&img, s, s, false);
+            assert!(b.data.iter().all(|p| p.iter().all(|v| v.is_finite())), "sigma {s}");
+            assert_eq!(b, img, "sigma {s}");
+        }
+    }
+
     #[test]
     fn flat_image_stays_flat_with_repeat() {
         let img = Image::filled(20, 10, [0.5, 0.5, 0.5, 1.0]);
diff --git a/crates/raster/src/channels3d.rs b/crates/raster/src/channels3d.rs
index b84b64b79..034fb50fd 100644
--- a/crates/raster/src/channels3d.rs
+++ b/crates/raster/src/channels3d.rs
@@ -148,6 +148,31 @@ impl AuxChannels {
         self.crypto_rank_planes(layer).iter().map(|(id, c)| (id[i], c[i])).collect()
     }
 
+    /// The Cryptomatte layer an effect asking for `want` (`CryptoObject`, …) reads: an exact
+    /// match, else one ending in it (`ViewLayer.CryptoObject`), else the first layer.
+    pub fn resolve_crypto_layer(&self, want: &str) -> Option<String> {
+        let layers = self.crypto_layers();
+        layers.iter().find(|l| l.as_str() == want || l.ends_with(want)).or(layers.first()).cloned()
+    }
+
+    /// The ID (its hash, `f32::to_bits`) with the most coverage at aux pixel `i` of Cryptomatte
+    /// layer `layer`, summed over the ranks it appears in. Ties go to the lower rank; IDs with
+    /// no positive coverage don't count. `None` when nothing covers the pixel.
+    pub fn crypto_id_at(&self, layer: &str, i: usize) -> Option<u32> {
+        let mut ids: Vec<(u32, f32)> = vec![];
+        for (id, cov) in self.crypto_rank_planes(layer) {
+            let (Some(id), Some(&c)) = (id.get(i), cov.get(i)) else { continue };
+            if c > 0.0 {
+                match ids.iter_mut().find(|(h, _)| *h == id.to_bits()) {
+                    Some((_, sum)) => *sum += c,
+                    None => ids.push((id.to_bits(), c)),
+                }
+            }
+        }
+        // `min_by` keeps the first of equal elements: a tie goes to the lower rank.
+        ids.into_iter().min_by(|a, b| b.1.total_cmp(&a.1)).map(|(h, _)| h)
+    }
+
     /// Aux pixel index of a layer-space point (nearest; `None` outside).
     #[inline]
     pub fn index_at(&self, lx: f64, ly: f64) -> Option<usize> {
@@ -211,6 +236,28 @@ pub fn crypto_float(hash: u32) -> f32 {
 mod tests {
     use super::*;
 
+    /// The picked ID: most coverage (summed over ranks), ties to the lower rank, nothing when
+    /// no rank covers the pixel; layers resolve as the Cryptomatte effect does.
+    #[test]
+    fn crypto_id_at_takes_the_top_coverage_and_layers_resolve_by_suffix() {
+        let mut a = AuxChannels::new(4, 1, 1.0);
+        let f = |n: &str| crypto_float(crypto_hash(n));
+        let (x, y, z) = (f("x"), f("y"), f("z"));
+        for (c, v) in [("R", [x, x, x, x]), ("G", [0.3, 0.5, 0.0, 0.2]), ("B", [y, y, y, y]), ("A", [0.6, 0.5, 0.0, 0.3])] {
+            a.channels.push((format!("ViewLayer.CryptoObject00.{c}"), v.to_vec()));
+        }
+        for (c, v) in [("R", [z, z, z, x]), ("G", [0.1, 0.0, -1.0, 0.2])] {
+            a.channels.push((format!("ViewLayer.CryptoObject01.{c}"), v.to_vec()));
+        }
+        a.channels.push(("Other00.R".into(), vec![0.0; 4]));
+        let l = a.resolve_crypto_layer("CryptoObject").unwrap();
+        assert_eq!(l, "ViewLayer.CryptoObject");
+        assert_eq!(a.resolve_crypto_layer("CryptoMaterial").as_deref(), Some("Other"), "falls back to the first");
+        let at = |i| a.crypto_id_at(&l, i);
+        assert_eq!([at(0), at(1), at(2), at(3), at(9)], [Some(crypto_hash("y")), Some(crypto_hash("x")), None, Some(crypto_hash("x")), None]);
+        assert_eq!(AuxChannels::new(1, 1, 1.0).resolve_crypto_layer("CryptoObject"), None);
+    }
+
     #[test]
     fn murmur3_reference_values() {
         // Published MurmurHash3_x86_32 test vectors.
diff --git a/crates/raster/src/inpaint.rs b/crates/raster/src/inpaint.rs
index 15bdaa0dd..c64de3375 100644
--- a/crates/raster/src/inpaint.rs
+++ b/crates/raster/src/inpaint.rs
@@ -607,38 +607,44 @@ pub struct FillInput {
     pub references: Vec<(usize, Image)>,
 }
 
-/// Trace pixel (x, y) of frame `t` through `flows` (`step` = +1 forward with `fwd`, −1 backward
-/// with `bwd`) to the nearest frame where it is visible: (sampled colour, frames travelled).
-fn trace(
-    t: usize,
+/// Shared frame and flow data for tracing pixels through a sequence.
+struct TraceContext<'a> {
+    fwd: &'a [Flow],
+    bwd: &'a [Flow],
+    known: &'a (dyn Fn(usize, i64, i64) -> bool + Sync),
+    frames: &'a [&'a Image],
+    max: usize,
+}
+
+/// Starting frame, point, and direction for a flow trace.
+struct TraceStart {
+    frame: usize,
     x: f64,
     y: f64,
     step: i64,
-    fwd: &[Flow],
-    bwd: &[Flow],
-    known: &dyn Fn(usize, i64, i64) -> bool,
-    frames: &[&Image],
-    max: usize,
-) -> Option<([f32; 4], usize)> {
-    let n = frames.len();
-    let (w, h) = (frames[0].width as f64, frames[0].height as f64);
-    let (mut px, mut py) = (x, y);
-    let mut k = t as i64;
-    for d in 1..=max {
-        let v = if step > 0 {
+}
+
+/// Trace a point to the nearest visible frame: (sampled colour, frames travelled).
+fn trace(context: &TraceContext<'_>, start: TraceStart) -> Option<([f32; 4], usize)> {
+    let n = context.frames.len();
+    let (w, h) = (context.frames[0].width as f64, context.frames[0].height as f64);
+    let (mut px, mut py) = (start.x, start.y);
+    let mut k = start.frame as i64;
+    for d in 1..=context.max {
+        let v = if start.step > 0 {
             if k as usize + 1 >= n {
                 return None;
             }
-            fwd[k as usize].at(px, py)
+            context.fwd[k as usize].at(px, py)
         } else {
             if k == 0 {
                 return None;
             }
-            bwd[k as usize - 1].at(px, py)
+            context.bwd[k as usize - 1].at(px, py)
         };
         px += v[0] as f64;
         py += v[1] as f64;
-        k += step;
+        k += start.step;
         if px < 0.0 || py < 0.0 || px >= w || py >= h {
             return None;
         }
@@ -646,9 +652,9 @@ fn trace(
         let (x0, y0) = ((px - 0.5).floor() as i64, (py - 0.5).floor() as i64);
         let ok = [(x0, y0), (x0 + 1, y0), (x0, y0 + 1), (x0 + 1, y0 + 1)]
             .iter()
-            .all(|&(xx, yy)| known(k as usize, xx.clamp(0, w as i64 - 1), yy.clamp(0, h as i64 - 1)));
+            .all(|&(xx, yy)| (context.known)(k as usize, xx.clamp(0, w as i64 - 1), yy.clamp(0, h as i64 - 1)));
         if ok {
-            return Some((frames[k as usize].sample_bilinear_clamped(px, py), d));
+            return Some((context.frames[k as usize].sample_bilinear_clamped(px, py), d));
         }
     }
     None
@@ -697,6 +703,7 @@ pub fn fill_sequence(input: &FillInput, o: &FillOpts, progress: &mut dyn FnMut(u
     // 2. Propagation (and the lighting-correction border ring).
     let refs: Vec<&Image> = frames.iter().collect();
     let known = |k: usize, x: i64, y: i64| !holes[k][y as usize * w + x as usize];
+    let trace_context = TraceContext { fwd: &fwd, bwd: &bwd, known: &known, frames: &refs, max: n };
     let ring_r = 2usize;
     let propagated: Vec<(Image, Vec<bool>)> = (0..n)
         .into_par_iter()
@@ -708,8 +715,8 @@ pub fn fill_sequence(input: &FillInput, o: &FillOpts, progress: &mut dyn FnMut(u
             }
             let sample = |i: usize| -> Option<[f32; 4]> {
                 let (x, y) = ((i % w) as f64 + 0.5, (i / w) as f64 + 0.5);
-                let f = trace(t, x, y, 1, &fwd, &bwd, &known, &refs, n);
-                let b = trace(t, x, y, -1, &fwd, &bwd, &known, &refs, n);
+                let f = trace(&trace_context, TraceStart { frame: t, x, y, step: 1 });
+                let b = trace(&trace_context, TraceStart { frame: t, x, y, step: -1 });
                 match (f, b) {
                     (Some((a, da)), Some((c, dc))) => {
                         let (wa, wc) = (1.0 / da as f32, 1.0 / dc as f32);
diff --git a/crates/raster/src/lib.rs b/crates/raster/src/lib.rs
index f17602829..9f2e4e755 100644
--- a/crates/raster/src/lib.rs
+++ b/crates/raster/src/lib.rs
@@ -12,16 +12,39 @@ pub mod flow;
 pub mod inpaint;
 pub mod scopes;
 pub mod warp;
+pub mod yuv;
 
 use effectcraft_color::{BlendMode, blend_pixel};
 use rayon::prelude::*;
 
-pub use blur::{box_blur, directional_blur, gaussian_blur, radial_blur};
+pub use blur::{box_blur, directional_blur, gaussian_blur, gaussian_blur_exact, gaussian_is_exact, radial_blur};
 pub use channels3d::AuxChannels;
-pub use warp::{Sampling, WarpOpts, accumulate_warp, composite_warp, composite_warp_reference, resample};
+pub use warp::{Sampling, WarpOpts, accumulate_warp, composite_warp, composite_warp_changed, composite_warp_reference, resample};
 
 pub type Px = [f32; 4];
 
+/// Clamp (colour ≤ alpha ≤ 1, NaN → 0) and round half up to `levels` steps (`inv` = 1 / levels):
+/// one pixel of an 8/16 bpc buffer. Values are non-negative after the clamp, so the integer
+/// conversion rounds like `round()` and vectorises.
+#[allow(clippy::manual_clamp)] // max/min map NaN to 0; clamp would keep NaN
+#[inline(always)]
+pub fn quantize_px(p: &mut Px, levels: f32, inv: f32) {
+    let a = round_half_up(p[3].max(0.0).min(1.0) * levels) * inv;
+    let hi = [a, a, a, a];
+    for c in 0..3 {
+        p[c] = round_half_up(p[c].max(0.0).min(hi[c]) * levels) * inv;
+    }
+    p[3] = a;
+}
+
+/// `v` (0..=65 535) rounded half up. The same either way; the fastest on each target: x86-64's
+/// baseline converts to integers in one instruction but has no `floor` (SSE4.1), while in wasm
+/// `floor` is one instruction and converting back from `u32` several (about 1.5× faster there).
+#[inline(always)]
+fn round_half_up(v: f32) -> f32 {
+    if cfg!(target_arch = "wasm32") { (v + 0.5).floor() } else { (v + 0.5) as u32 as f32 }
+}
+
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct Image {
     pub width: u32,
@@ -199,26 +222,33 @@ impl Image {
     }
     /// Straight-alpha 8-bit RGBA (sRGB-encoded values as stored).
     pub fn to_rgba8(&self) -> Vec<u8> {
-        let mut out = vec![0u8; self.data.len() * 4];
-        out.par_chunks_mut(4).zip(self.data.par_iter()).for_each(|(o, p)| {
+        self.map_rgba8(|o, p| {
             let a = p[3].clamp(0.0, 1.0);
             let inv = if a > 0.0 { 1.0 / p[3] } else { 0.0 };
             for c in 0..3 {
                 o[c] = ((p[c] * inv).clamp(0.0, 1.0) * 255.0 + 0.5) as u8;
             }
             o[3] = (a * 255.0 + 0.5) as u8;
-        });
-        out
+        })
     }
     /// Composite over an opaque background colour and return opaque 8-bit RGBA.
     pub fn to_rgba8_over(&self, bg: [f32; 3]) -> Vec<u8> {
-        let mut out = vec![0u8; self.data.len() * 4];
-        out.par_chunks_mut(4).zip(self.data.par_iter()).for_each(|(o, p)| {
+        self.map_rgba8(|o, p| {
             let k = 1.0 - p[3].clamp(0.0, 1.0);
             for c in 0..3 {
                 o[c] = ((p[c] + bg[c] * k).clamp(0.0, 1.0) * 255.0 + 0.5) as u8;
             }
             o[3] = 255;
+        })
+    }
+    /// 8-bit RGBA with each pixel written by `f`, row-parallel.
+    fn map_rgba8(&self, f: impl Fn(&mut [u8; 4], &Px) + Sync) -> Vec<u8> {
+        let mut out = vec![0u8; self.data.len() * 4];
+        let w = self.width.max(1) as usize;
+        out.par_chunks_mut(w * 4).zip(self.data.par_chunks(w)).for_each(|(o, row)| {
+            for (o, p) in o.as_chunks_mut::<4>().0.iter_mut().zip(row) {
+                f(o, p);
+            }
         });
         out
     }
diff --git a/crates/raster/src/warp.rs b/crates/raster/src/warp.rs
index 8b45761e4..9f6de31ce 100644
--- a/crates/raster/src/warp.rs
+++ b/crates/raster/src/warp.rs
@@ -57,7 +57,15 @@ fn half(src: &Image) -> Image {
 /// bilinear without bounds checks, integer-translation copies, inlined Normal blending); it
 /// matches [`composite_warp_reference`] to float rounding.
 pub fn composite_warp(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts) {
-    composite_warp_impl(dst, src, m, opts, true, None);
+    composite_warp_impl(dst, src, m, opts, true, None, None);
+}
+
+/// [`composite_warp`], also returning the destination pixels it changed when it knows them:
+/// `Some([x0, y0, x1, y1])` (half-open, empty when nothing was drawn) on the fast affine path,
+/// `None` otherwise. With `quantize` (an 8/16 bpc destination's levels), the fast path also
+/// quantises each pixel it blends ([`crate::quantize_px`]): exactly when this returns `Some`.
+pub fn composite_warp_changed(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts, quantize: Option<f32>) -> Option<[u32; 4]> {
+    composite_warp_impl(dst, src, m, opts, true, None, quantize)
 }
 
 /// `dst += warp(src) · weight` (plain sum, no blending): motion-blur sub-samples accumulate
@@ -65,7 +73,7 @@ pub fn composite_warp(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts) {
 pub fn accumulate_warp(dst: &mut Image, src: &Image, m: &Mat3, sampling: Sampling, weight: f32) {
     let opts = WarpOpts { sampling, ..Default::default() };
     if m.is_affine() && m.inverse().is_some_and(|i| i.is_affine()) {
-        composite_warp_impl(dst, src, m, &opts, true, Some(weight));
+        composite_warp_impl(dst, src, m, &opts, true, Some(weight), None);
         return;
     }
     let mut tmp = Image::new(dst.width, dst.height);
@@ -79,7 +87,7 @@ pub fn accumulate_warp(dst: &mut Image, src: &Image, m: &Mat3, sampling: Samplin
 
 /// The straightforward per-pixel implementation (reference for the fast path's tests).
 pub fn composite_warp_reference(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts) {
-    composite_warp_impl(dst, src, m, opts, false, None);
+    composite_warp_impl(dst, src, m, opts, false, None, None);
 }
 
 /// Bilinear blend of four taps (same operation order as [`Image::sample_bilinear`]).
@@ -94,9 +102,49 @@ fn bilerp(a: Px, b: Px, c: Px, d: Px, tx: f32, ty: f32) -> Px {
     o
 }
 
-/// Bilinear sample with an unchecked interior fast path.
+/// Side of the square source tiles of [`ClearTiles`].
+const TILE: usize = 16;
+
+/// Which `TILE`×`TILE` source tiles are fully transparent, the one-pixel apron to their right
+/// and below included: the four taps of a bilinear sample whose top-left tap lies in such a
+/// tile all have zero alpha, so the sample is transparent and draws nothing.
+struct ClearTiles {
+    cols: usize,
+    clear: Vec<bool>,
+}
+
+impl ClearTiles {
+    fn new(img: &Image) -> ClearTiles {
+        let (w, h) = (img.width as usize, img.height as usize);
+        let (cols, rows) = (w.div_ceil(TILE), h.div_ceil(TILE));
+        let clear = (0..rows)
+            .into_par_iter()
+            .flat_map_iter(|ty| {
+                let mut row_clear = vec![true; cols];
+                for y in ty * TILE..(ty * TILE + TILE + 1).min(h) {
+                    let row = &img.data[y * w..(y + 1) * w];
+                    for (tx, c) in row_clear.iter_mut().enumerate() {
+                        if *c {
+                            *c = row[tx * TILE..(tx * TILE + TILE + 1).min(w)].iter().all(|p| p[3] == 0.0);
+                        }
+                    }
+                }
+                row_clear
+            })
+            .collect();
+        ClearTiles { cols, clear }
+    }
+
+    #[inline(always)]
+    fn is_clear(&self, x: usize, y: usize) -> bool {
+        self.clear.get((y / TILE) * self.cols + x / TILE).copied().unwrap_or(false)
+    }
+}
+
+/// Bilinear sample with an unchecked interior fast path; `None` when every interior tap is in a
+/// [`ClearTiles`] tile (the sample would have zero alpha).
 #[inline(always)]
-fn sample_bilinear_fast(img: &Image, x: f64, y: f64) -> Px {
+fn sample_bilinear_fast(img: &Image, clear: &ClearTiles, x: f64, y: f64) -> Option<Px> {
     let fx = x - 0.5;
     let fy = y - 0.5;
     let x0 = fx.floor();
@@ -104,14 +152,17 @@ fn sample_bilinear_fast(img: &Image, x: f64, y: f64) -> Px {
     let (xi, yi) = (x0 as i64, y0 as i64);
     let (w, h) = (img.width as i64, img.height as i64);
     if xi >= 0 && yi >= 0 && xi + 1 < w && yi + 1 < h {
+        if clear.is_clear(xi as usize, yi as usize) {
+            return None;
+        }
         let tx = (fx - x0) as f32;
         let ty = (fy - y0) as f32;
         let i = yi as usize * w as usize + xi as usize;
         let row0 = &img.data[i..i + 2];
         let row1 = &img.data[i + w as usize..i + w as usize + 2];
-        return bilerp(row0[0], row0[1], row1[0], row1[1], tx, ty);
+        return Some(bilerp(row0[0], row0[1], row1[0], row1[1], tx, ty));
     }
-    img.sample_bilinear(x, y)
+    Some(img.sample_bilinear(x, y))
 }
 
 /// Index range `[lo, hi)` of `i` in `0..n` for which `p0 + i·s` may lie in `[min, max]`
@@ -127,20 +178,43 @@ fn span(p0: f64, s: f64, min: f64, max: f64, n: usize) -> (usize, usize) {
     if hi <= lo { (0, 0) } else { (lo as usize, hi as usize) }
 }
 
-/// Fast affine rows: `blend(dst, src, x, y)` is only called for visible source pixels.
-#[allow(clippy::too_many_arguments)]
-fn affine_rows(
-    dst: &mut Image,
-    img: &Image,
-    inv: &Mat3,
+/// Columns `[a, b)` of one destination row that a warp changed (`a == b`: none).
+#[derive(Clone, Copy)]
+struct RowSpan {
+    a: usize,
+    b: usize,
+}
+
+impl RowSpan {
+    const NONE: RowSpan = RowSpan { a: usize::MAX, b: 0 };
+    #[inline(always)]
+    fn add(&mut self, x: usize) {
+        self.a = self.a.min(x);
+        self.b = x + 1;
+    }
+}
+
+/// Union of changed pixels as `[x0, y0, x1, y1]` (half-open; `x0 >= x1` when empty).
+fn union(r: [usize; 4], q: [usize; 4]) -> [usize; 4] {
+    match (r[0] < r[2], q[0] < q[2]) {
+        (false, _) => q,
+        (_, false) => r,
+        _ => [r[0].min(q[0]), r[1].min(q[1]), r[2].max(q[2]), r[3].max(q[3])],
+    }
+}
+
+/// Sampling, blending and destination bounds for an affine row operation.
+struct AffineRows {
     sampling: Sampling,
-    op: f32,
-    x0: usize,
-    x1: usize,
-    y0: usize,
-    y1: usize,
-    blend: impl Fn(Px, Px, u32, u32) -> Px + Sync,
-) {
+    opacity: f32,
+    quantize: Option<f32>,
+    bounds: [usize; 4],
+}
+
+/// Blend visible source samples and return the rectangle of changed pixels.
+fn affine_rows(dst: &mut Image, img: &Image, inv: &Mat3, rows: AffineRows, blend: impl Fn(Px, Px, u32, u32) -> Px + Sync) -> [usize; 4] {
+    let AffineRows { sampling, opacity: op, quantize, bounds: [x0, x1, y0, y1] } = rows;
+    let levels = quantize.map(|l| (l, 1.0 / l));
     let w = dst.width as usize;
     let m = inv.0;
     let (iw, ih) = (img.width as f64, img.height as f64);
@@ -148,71 +222,104 @@ fn affine_rows(
     // Pure integer translation: every sample lands on a pixel centre, so all filters return the
     // source pixel itself (bicubic still clamps negatives, as in the reference).
     let int_tx = m[0][0] == 1.0 && m[1][1] == 1.0 && m[0][1] == 0.0 && m[1][0] == 0.0 && m[0][2].fract() == 0.0 && m[1][2].fract() == 0.0;
-    dst.data.par_chunks_mut(w).enumerate().skip(y0).take(y1 - y0).for_each(|(y, row)| {
-        let fy = y as f64 + 0.5;
-        let p0 = vec2(m[0][0] * (x0 as f64 + 0.5) + m[0][1] * fy + m[0][2], m[1][0] * (x0 as f64 + 0.5) + m[1][1] * fy + m[1][2]);
-        let n = x1 - x0;
-        let (ax, bx) = span(p0.x, step.x, -1.0, iw + 1.0, n);
-        let (ay, by) = span(p0.y, step.y, -1.0, ih + 1.0, n);
-        let (lo, hi) = (ax.max(ay), bx.min(by));
-        if lo >= hi {
-            return;
-        }
-        if int_tx {
-            let sy = y as i64 + m[1][2] as i64;
-            if sy < 0 || sy >= img.height as i64 {
-                return;
+    // Bilinear samples skip the transparent parts of the source (most of a thin shape's or a
+    // glow-padded layer's buffer) without reading them.
+    let clear = (sampling == Sampling::Bilinear && !int_tx).then(|| ClearTiles::new(img));
+    let empty = [usize::MAX, usize::MAX, 0, 0];
+    dst.data
+        .par_chunks_mut(w)
+        .enumerate()
+        .skip(y0)
+        .take(y1 - y0)
+        .map(|(y, row)| {
+            let mut changed = RowSpan::NONE;
+            let fy = y as f64 + 0.5;
+            let p0 = vec2(m[0][0] * (x0 as f64 + 0.5) + m[0][1] * fy + m[0][2], m[1][0] * (x0 as f64 + 0.5) + m[1][1] * fy + m[1][2]);
+            let n = x1 - x0;
+            let (ax, bx) = span(p0.x, step.x, -1.0, iw + 1.0, n);
+            let (ay, by) = span(p0.y, step.y, -1.0, ih + 1.0, n);
+            let (lo, hi) = (ax.max(ay), bx.min(by));
+            if lo >= hi {
+                return empty;
             }
-            let dx = m[0][2] as i64;
-            let srow = &img.data[sy as usize * img.width as usize..(sy as usize + 1) * img.width as usize];
-            let xa = (x0 as i64 + lo as i64).max(-dx).max(0) as usize;
-            let xb = ((x0 + hi) as i64).min(img.width as i64 - dx).max(0) as usize;
-            for x in xa..xb.max(xa) {
-                let mut s = srow[(x as i64 + dx) as usize];
-                if sampling == Sampling::Bicubic {
-                    s = [s[0].max(0.0), s[1].max(0.0), s[2].max(0.0), s[3].max(0.0)];
+            if int_tx {
+                let sy = y as i64 + m[1][2] as i64;
+                if sy < 0 || sy >= img.height as i64 {
+                    return empty;
                 }
-                if s[3] <= 0.0 {
-                    continue;
-                }
-                if op < 1.0 {
-                    for c in s.iter_mut() {
-                        *c *= op;
+                let dx = m[0][2] as i64;
+                let srow = &img.data[sy as usize * img.width as usize..(sy as usize + 1) * img.width as usize];
+                let xa = (x0 as i64 + lo as i64).max(-dx).max(0) as usize;
+                let xb = ((x0 + hi) as i64).min(img.width as i64 - dx).max(0) as usize;
+                for x in xa..xb.max(xa) {
+                    let mut s = srow[(x as i64 + dx) as usize];
+                    if sampling == Sampling::Bicubic {
+                        s = [s[0].max(0.0), s[1].max(0.0), s[2].max(0.0), s[3].max(0.0)];
                     }
+                    if s[3] <= 0.0 {
+                        continue;
+                    }
+                    if op < 1.0 {
+                        for c in s.iter_mut() {
+                            *c *= op;
+                        }
+                    }
+                    row[x] = blend(row[x], s, x as u32, y as u32);
+                    if let Some((l, inv)) = levels {
+                        crate::quantize_px(&mut row[x], l, inv);
+                    }
+                    changed.add(x);
                 }
-                row[x] = blend(row[x], s, x as u32, y as u32);
-            }
-            return;
-        }
-        for i in lo..hi {
-            let x = x0 + i;
-            let p = vec2(p0.x + step.x * i as f64, p0.y + step.y * i as f64);
-            if p.x < -1.0 || p.y < -1.0 || p.x > iw + 1.0 || p.y > ih + 1.0 {
-                continue;
-            }
-            let mut s = match sampling {
-                Sampling::Nearest => img.get(p.x.floor() as i64, p.y.floor() as i64),
-                Sampling::Bilinear => sample_bilinear_fast(img, p.x, p.y),
-                Sampling::Bicubic => img.sample_bicubic(p.x, p.y),
-            };
-            if s[3] <= 0.0 {
-                continue;
-            }
-            if op < 1.0 {
-                for c in s.iter_mut() {
-                    *c *= op;
+            } else {
+                for i in lo..hi {
+                    let x = x0 + i;
+                    let p = vec2(p0.x + step.x * i as f64, p0.y + step.y * i as f64);
+                    if p.x < -1.0 || p.y < -1.0 || p.x > iw + 1.0 || p.y > ih + 1.0 {
+                        continue;
+                    }
+                    let mut s = match (sampling, &clear) {
+                        (Sampling::Nearest, _) => img.get(p.x.floor() as i64, p.y.floor() as i64),
+                        (Sampling::Bilinear, Some(clear)) => match sample_bilinear_fast(img, clear, p.x, p.y) {
+                            Some(s) => s,
+                            None => continue,
+                        },
+                        (Sampling::Bilinear, None) => img.sample_bilinear(p.x, p.y),
+                        (Sampling::Bicubic, _) => img.sample_bicubic(p.x, p.y),
+                    };
+                    if s[3] <= 0.0 {
+                        continue;
+                    }
+                    if op < 1.0 {
+                        for c in s.iter_mut() {
+                            *c *= op;
+                        }
+                    }
+                    row[x] = blend(row[x], s, x as u32, y as u32);
+                    if let Some((l, inv)) = levels {
+                        crate::quantize_px(&mut row[x], l, inv);
+                    }
+                    changed.add(x);
                 }
             }
-            row[x] = blend(row[x], s, x as u32, y as u32);
-        }
-    });
+            if changed.a < changed.b { [changed.a, y, changed.b, y + 1] } else { empty }
+        })
+        .reduce(|| empty, union)
 }
 
-fn composite_warp_impl(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts, allow_fast: bool, accumulate: Option<f32>) {
+fn composite_warp_impl(
+    dst: &mut Image,
+    src: &Image,
+    m: &Mat3,
+    opts: &WarpOpts,
+    allow_fast: bool,
+    accumulate: Option<f32>,
+    quantize: Option<f32>,
+) -> Option<[u32; 4]> {
+    const NOTHING: Option<[u32; 4]> = Some([0; 4]);
     if src.is_empty() || dst.is_empty() || opts.opacity <= 0.0 {
-        return;
+        return NOTHING;
     }
-    let Some(inv) = m.inverse() else { return };
+    let Some(inv) = m.inverse() else { return NOTHING };
     // Minification: pick a pre-filtered level so sampling doesn't alias.
     let scale = m.mean_scale();
     let mut level_img;
@@ -239,7 +346,7 @@ fn composite_warp_impl(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts,
         area = area.intersect(&c);
     }
     if area.is_empty() {
-        return;
+        return NOTHING;
     }
     let (x0, x1) = (area.x0.max(0.0) as usize, area.x1.min(dst.width as f64) as usize);
     let (y0, y1) = (area.y0.max(0.0) as usize, area.y1.min(dst.height as f64) as usize);
@@ -247,25 +354,34 @@ fn composite_warp_impl(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts,
     let affine = inv.is_affine();
     let mode = opts.mode;
     let op = opts.opacity;
+    let changed = |r: [usize; 4]| Some(r.map(|v| v.min(u32::MAX as usize) as u32));
     if let Some(k) = accumulate
         && affine
     {
-        affine_rows(dst, img, &inv, opts.sampling, 1.0, x0, x1, y0, y1, |d, s, _, _| [d[0] + s[0] * k, d[1] + s[1] * k, d[2] + s[2] * k, d[3] + s[3] * k]);
-        return;
+        let r = affine_rows(dst, img, &inv, AffineRows { sampling: opts.sampling, opacity: 1.0, quantize: None, bounds: [x0, x1, y0, y1] }, |d, s, _, _| {
+            [d[0] + s[0] * k, d[1] + s[1] * k, d[2] + s[2] * k, d[3] + s[3] * k]
+        });
+        return changed(r);
     }
     if allow_fast && affine && !mode.is_stencil() {
-        match mode {
-            BlendMode::Normal => affine_rows(dst, img, &inv, opts.sampling, op, x0, x1, y0, y1, |d, s, _, _| {
-                let k = 1.0 - s[3];
-                [s[0] + d[0] * k, s[1] + d[1] * k, s[2] + d[2] * k, s[3] + d[3] * k]
-            }),
+        let r = match mode {
+            BlendMode::Normal => {
+                affine_rows(dst, img, &inv, AffineRows { sampling: opts.sampling, opacity: op, quantize, bounds: [x0, x1, y0, y1] }, |d, s, _, _| {
+                    let k = 1.0 - s[3];
+                    [s[0] + d[0] * k, s[1] + d[1] * k, s[2] + d[2] * k, s[3] + d[3] * k]
+                })
+            }
             BlendMode::Dissolve | BlendMode::DancingDissolve => {
                 let seed = opts.seed;
-                affine_rows(dst, img, &inv, opts.sampling, op, x0, x1, y0, y1, |d, s, x, y| blend_pixel(mode, d, s, hash_noise(x, y, seed)))
+                affine_rows(dst, img, &inv, AffineRows { sampling: opts.sampling, opacity: op, quantize, bounds: [x0, x1, y0, y1] }, |d, s, x, y| {
+                    blend_pixel(mode, d, s, hash_noise(x, y, seed))
+                })
             }
-            _ => affine_rows(dst, img, &inv, opts.sampling, op, x0, x1, y0, y1, |d, s, _, _| blend_pixel(mode, d, s, 0.5)),
-        }
-        return;
+            _ => affine_rows(dst, img, &inv, AffineRows { sampling: opts.sampling, opacity: op, quantize, bounds: [x0, x1, y0, y1] }, |d, s, _, _| {
+                blend_pixel(mode, d, s, 0.5)
+            }),
+        };
+        return changed(r);
     }
     dst.data.par_chunks_mut(w).enumerate().skip(y0).take(y1 - y0).for_each(|(y, row)| {
         let fy = y as f64 + 0.5;
@@ -312,6 +428,7 @@ fn composite_warp_impl(dst: &mut Image, src: &Image, m: &Mat3, opts: &WarpOpts,
             }
         }
     }
+    None
 }
 
 /// Resize with bilinear filtering (box pre-filter when shrinking).
@@ -394,6 +511,116 @@ mod tests {
         }
     }
 
+    /// A mostly transparent source: a thin ring with a few stray pixels (one with negative zero alpha).
+    fn sparse_image(w: u32, h: u32) -> Image {
+        let mut img = Image::new(w, h);
+        let (cx, cy, r) = (w as f32 / 2.0, h as f32 / 2.0, w.min(h) as f32 * 0.4);
+        for y in 0..h {
+            for x in 0..w {
+                let d = ((x as f32 + 0.5 - cx).hypot(y as f32 + 0.5 - cy) - r).abs();
+                if d < 1.5 {
+                    let a = 1.0 - d / 1.5;
+                    img.set(x, y, [0.2 * a, 0.6 * a, a, a]);
+                }
+            }
+        }
+        img.set(3, 2, [0.5, 0.5, 0.5, 0.5]);
+        img.set(w - 1, h - 1, [1.0; 4]);
+        img.set(w / 2, 1, [0.0, 0.0, 0.0, -0.0]);
+        img
+    }
+
+    #[test]
+    fn clear_tiles_hold_only_transparent_taps() {
+        let img = sparse_image(150, 97);
+        let clear = ClearTiles::new(&img);
+        let mut skipped = 0;
+        for y in 0..img.height as usize - 1 {
+            for x in 0..img.width as usize - 1 {
+                if clear.is_clear(x, y) {
+                    skipped += 1;
+                    for (dx, dy) in [(0, 0), (1, 0), (0, 1), (1, 1)] {
+                        assert_eq!(img.get(x as i64 + dx, y as i64 + dy)[3], 0.0, "tap ({}, {}) of a clear tile", x as i64 + dx, y as i64 + dy);
+                    }
+                }
+            }
+        }
+        assert!(skipped > 100 * 70, "the ring's empty middle is skipped: {skipped}");
+    }
+
+    /// The changed rectangle holds every pixel a warp changed, and the skipped transparent
+    /// samples leave the result as the reference path draws it.
+    #[test]
+    fn changed_rect_covers_the_changed_pixels() {
+        let src = sparse_image(90, 70);
+        let mats = [
+            Mat3::translate(vec2(7.0, 3.0)),
+            Mat3::translate(vec2(10.25, 4.5)),
+            Mat3::translate(vec2(60.0, 50.0)) * Mat3::rotate_deg(33.0) * Mat3::scale(vec2(0.9, 1.2)) * Mat3::translate(vec2(-45.0, -35.0)),
+            Mat3::translate(vec2(-30.0, -20.0)),
+            Mat3::scale(vec2(0.3, 0.3)),
+        ];
+        for (mi, m) in mats.iter().enumerate() {
+            for mode in [BlendMode::Normal, BlendMode::Add, BlendMode::Dissolve] {
+                let opts = WarpOpts { mode, seed: 3, ..Default::default() };
+                let before = test_image(120, 100, 4);
+                let mut a = before.clone();
+                let r = composite_warp_changed(&mut a, &src, m, &opts, None);
+                let Some([x0, y0, x1, y1]) = r else { panic!("mat {mi}: the fast path tracks what it changed") };
+                for (i, (p, q)) in a.data.iter().zip(&before.data).enumerate() {
+                    let (x, y) = (i as u32 % a.width, i as u32 / a.width);
+                    if p != q {
+                        assert!(x >= x0 && x < x1 && y >= y0 && y < y1, "mat {mi} {mode:?}: ({x}, {y}) changed outside {r:?}");
+                    }
+                }
+                let mut b = before.clone();
+                composite_warp_reference(&mut b, &src, m, &opts);
+                for (i, (p, q)) in a.data.iter().zip(&b.data).enumerate() {
+                    for c in 0..4 {
+                        assert!((p[c] - q[c]).abs() < 1e-4, "mat {mi} {mode:?} px {i}: {p:?} vs {q:?}");
+                    }
+                }
+            }
+        }
+        let mut dst = Image::new(10, 10);
+        assert_eq!(composite_warp_changed(&mut dst, &Image::new(4, 4), &Mat3::IDENTITY, &WarpOpts::default(), None), Some([u32::MAX, u32::MAX, 0, 0]));
+        let stencil = WarpOpts { mode: BlendMode::StencilAlpha, ..Default::default() };
+        assert_eq!(composite_warp_changed(&mut dst, &src, &Mat3::IDENTITY, &stencil, Some(255.0)), None, "stencils change the whole destination");
+    }
+
+    /// Quantising while blending equals blending, then quantising the changed rectangle of an
+    /// already quantised destination (what an 8/16 bpc comp did after every layer), bit for bit.
+    #[test]
+    fn quantize_while_blending_matches_quantizing_after() {
+        let src = sparse_image(90, 70);
+        let mats = [Mat3::translate(vec2(7.0, 3.0)), Mat3::translate(vec2(60.0, 50.0)) * Mat3::rotate_deg(33.0) * Mat3::translate(vec2(-45.0, -35.0))];
+        for m in &mats {
+            for mode in [BlendMode::Normal, BlendMode::Screen, BlendMode::Dissolve] {
+                for (levels, opacity) in [(255.0f32, 1.0), (32_768.0, 0.7)] {
+                    let mut before = test_image(120, 100, 8);
+                    for p in &mut before.data {
+                        crate::quantize_px(p, levels, 1.0 / levels);
+                    }
+                    let opts = WarpOpts { mode, opacity, seed: 5, ..Default::default() };
+                    let mut after = before.clone();
+                    let Some([x0, y0, x1, y1]) = composite_warp_changed(&mut after, &src, m, &opts, None) else { panic!("fast path") };
+                    for y in y0..y1 {
+                        for x in x0..x1 {
+                            let i = after.idx(x, y);
+                            crate::quantize_px(&mut after.data[i], levels, 1.0 / levels);
+                        }
+                    }
+                    let mut fused = before.clone();
+                    let r = composite_warp_changed(&mut fused, &src, m, &opts, Some(levels));
+                    assert_eq!(r, Some([x0, y0, x1, y1]));
+                    for (i, (p, q)) in fused.data.iter().zip(&after.data).enumerate() {
+                        assert_eq!(p.map(f32::to_bits), q.map(f32::to_bits), "{mode:?} {levels} px {i}");
+                    }
+                }
+            }
+        }
+    }
+
     /// Accumulating sub-samples equals warping each into its own image and summing.
     #[test]
     fn accumulate_matches_per_sample_images() {
diff --git a/crates/raster/src/yuv.rs b/crates/raster/src/yuv.rs
new file mode 100644
index 000000000..fdfbc0c0a
--- /dev/null
+++ b/crates/raster/src/yuv.rs
@@ -0,0 +1,60 @@
+//! 8-bit BT.709 limited-range 4:2:0, the H.264 export's input. Shared by the export and by the
+//! GPU compositor's tests, which hold its kernel to this function.
+
+use rayon::prelude::*;
+
+/// `v / 255` for every 8-bit `v` (the same values as dividing).
+pub const UNIT8: [f32; 256] = {
+    let mut t = [0.0; 256];
+    let mut i = 0;
+    while i < 256 {
+        t[i] = i as f32 / 255.0;
+        i += 1;
+    }
+    t
+};
+
+/// `v.round()` for `0 <= v < 2^23`, the range the colour conversions round in: truncation and
+/// the fraction are exact there, so this is `f32::round` without its libm call.
+#[inline(always)]
+pub fn round_pos(v: f32) -> f32 {
+    let t = v as u32 as f32;
+    if v - t >= 0.5 { t + 1.0 } else { t }
+}
+
+/// BT.709 limited-range 8-bit 4:2:0 from RGBA8 (2×2 chroma average; alpha ignored).
+pub fn rgba_to_yuv420(rgba: &[u8], w: usize, h: usize, y: &mut Vec<u8>, u: &mut Vec<u8>, v: &mut Vec<u8>) {
+    let (cw, ch) = (w.div_ceil(2), h.div_ceil(2));
+    y.resize(w * h, 0);
+    u.resize(cw * ch, 0);
+    v.resize(cw * ch, 0);
+    y.par_chunks_mut(w * 2).zip(u.par_chunks_mut(cw).zip(v.par_chunks_mut(cw))).enumerate().for_each(|(cy, (yr, (ur, vr)))| {
+        let mut acc = vec![(0f32, 0f32, 0f32); cw];
+        for (dy, yrow) in yr.chunks_exact_mut(w).enumerate() {
+            let src = &rgba[(cy * 2 + dy) * w * 4..][..w * 4];
+            for (x, (s, yo)) in src.as_chunks::<4>().0.iter().zip(yrow.iter_mut()).enumerate() {
+                let (r, g, b) = (UNIT8[s[0] as usize], UNIT8[s[1] as usize], UNIT8[s[2] as usize]);
+                let l = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+                *yo = round_pos(16.0 + 219.0 * l).clamp(1.0, 254.0) as u8;
+                let a = &mut acc[x / 2];
+                a.0 += (b - l) / 1.8556;
+                a.1 += (r - l) / 1.5748;
+                a.2 += 1.0;
+            }
+        }
+        for (cx, a) in acc.iter().enumerate() {
+            ur[cx] = round_pos(128.0 + 224.0 * a.0 / a.2).clamp(1.0, 254.0) as u8;
+            vr[cx] = round_pos(128.0 + 224.0 * a.1 / a.2).clamp(1.0, 254.0) as u8;
+        }
+    });
+}
+
+/// The H.264 export's planes of `img` over `bg` (opaque): Y, then U and V, as
+/// [`crate::Image::to_rgba8_over`] + [`rgba_to_yuv420`] produce them.
+pub fn yuv420_over(img: &crate::Image, bg: [f32; 3]) -> Vec<u8> {
+    let (mut y, mut u, mut v) = (vec![], vec![], vec![]);
+    rgba_to_yuv420(&img.to_rgba8_over(bg), img.width as usize, img.height as usize, &mut y, &mut u, &mut v);
+    y.extend_from_slice(&u);
+    y.extend_from_slice(&v);
+    y
+}
diff --git a/crates/render/Cargo.toml b/crates/render/Cargo.toml
index db2fa9dd0..efbd1fc19 100644
--- a/crates/render/Cargo.toml
+++ b/crates/render/Cargo.toml
@@ -19,7 +19,7 @@ effectcraft-raster = { workspace = true }
 effectcraft-path = { workspace = true }
 effectcraft-text = { workspace = true }
 effectcraft-effects = { workspace = true }
-lz4_flex = { version = "0.11", default-features = false, features = ["std", "safe-encode", "safe-decode", "checked-decode"] }
+lz4_flex = { version = "0.14", default-features = false, features = ["std", "safe-encode", "safe-decode", "checked-decode"] }
 effectcraft-model = { workspace = true }
 kurbo = { workspace = true }
 rayon = { workspace = true }
diff --git a/crates/render/src/accel.rs b/crates/render/src/accel.rs
new file mode 100644
index 000000000..accc1fc54
--- /dev/null
+++ b/crates/render/src/accel.rs
@@ -0,0 +1,362 @@
+use super::frames::content_bounds;
+use super::fx_host::MAX_FX_DEPTH;
+use super::layers::StyledLayer;
+use super::opts::LayerTiming;
+use super::{
+    Arc, AutoPick, Buf, EffectCtx, EvalCtx, Image, ItemId, ItemKind, Layer, LayerSource, Mat3, MatteKind, Renderer, Tick, cache, color, masks, three_d, vec2,
+};
+
+/// Which compositor renders a frame (Project Settings ▸ Video Rendering and Effects).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum Backend {
+    /// The CPU reference compositor (Mercury Software Only).
+    #[default]
+    Cpu,
+    /// The GPU compositor whenever an [`Accelerator`] is attached, whatever the project says.
+    Gpu,
+    /// The GPU compositor when an [`Accelerator`] is attached and the project's renderer is
+    /// Mercury GPU Acceleration (the viewer's choice); the CPU otherwise.
+    Auto,
+}
+
+impl Backend {
+    pub fn parse(s: &str) -> Option<Backend> {
+        match s.to_ascii_lowercase().as_str() {
+            "cpu" | "software" | "mercury software only" => Some(Backend::Cpu),
+            "gpu" | "mercury gpu acceleration" => Some(Backend::Gpu),
+            "auto" => Some(Backend::Auto),
+            _ => None,
+        }
+    }
+}
+
+/// One effect of a GPU effect chain (see [`Accelerator::effects`]).
+pub struct FxStep<'x> {
+    pub spec: &'static effectcraft_effects::EffectSpec,
+    pub ctx: EffectCtx<'x>,
+}
+
+/// A GPU (or other hardware) backend for the compositor. The CPU [`Renderer`] stays the
+/// reference: an accelerator renders what it supports and returns `None` for the rest, which
+/// then runs on the CPU. Implemented by `effectcraft-gpu`.
+pub trait Accelerator: Send + Sync {
+    /// Adapter / backend name for status readouts ("Apple M2 (Metal)").
+    fn name(&self) -> String;
+    /// Render a top-level comp frame (what [`Renderer::comp_frame`] returns). `None` = not
+    /// handled (the CPU renders it).
+    fn comp_frame(&self, r: &Renderer, comp: ItemId, t: Tick) -> Option<Image>;
+    /// Render a top-level comp frame like [`Self::comp_frame`], composite it over `bg` and
+    /// convert it to the H.264 export's 8-bit BT.709 limited-range 4:2:0 (Y plane, then U and V
+    /// at half size; see `effectcraft_raster::yuv`). Every byte is within one level of the CPU
+    /// conversion of the same frame (a driver's arithmetic may move a value near a rounding
+    /// boundary). `None` = not handled (the caller renders and converts on the CPU).
+    fn comp_frame_yuv420(&self, _r: &Renderer, _comp: ItemId, _t: Tick, _bg: [f32; 3]) -> Option<Vec<u8>> {
+        None
+    }
+    /// The accelerator implements effect `id` with the CPU effect's semantics.
+    fn supports_effect(&self, id: &str) -> bool;
+    /// Run a chain of supported effects on `buf`, clamping and quantising to `levels` after
+    /// every effect when set (8/16 bpc). `None` = not handled.
+    fn effects(&self, chain: &[FxStep], buf: &Buf, levels: Option<f32>) -> Option<Buf>;
+    /// Rasterise and shade an Advanced 3D scene at its raster size (depth buffer, PBR, image
+    /// based light, shadow maps), with the CPU rasteriser's semantics
+    /// ([`three_d::adv::raster::render`]). `None` = not handled (the CPU renders it).
+    fn raster_3d(&self, _scene: &three_d::adv::Scene) -> Option<three_d::adv::Target> {
+        None
+    }
+    /// Render a whole prepared Advanced 3D run (every motion-blur sub-sample rasterised and
+    /// resolved, averaged, depth of field, encoding) with [`three_d::adv::render_prepared`]'s
+    /// semantics. `None` = not handled (the CPU path runs, using [`Self::raster_3d`]).
+    fn render_3d(&self, _run: &three_d::adv::Prepared) -> Option<three_d::adv::Rendered> {
+        None
+    }
+    /// A particle simulation backend (GPU particles) for the stepped particle effects, with
+    /// the CPU simulation's semantics. `None` = they simulate on the CPU.
+    fn particles(&self) -> Option<&dyn effectcraft_effects::psim::ParticleSim> {
+        None
+    }
+    /// Timing history [`Backend::Auto`] uses to send each comp's top-level frames to the
+    /// faster compositor. `None` = Auto always tries the accelerator first.
+    fn auto_pick(&self) -> Option<&AutoPick> {
+        None
+    }
+    /// Whether the accelerator can still render frames. `false` once it has stopped for good
+    /// (its device was lost or retired): every frame it is asked for falls back to the CPU, so
+    /// callers that limit frames in flight for it can stop doing so.
+    fn available(&self) -> bool {
+        true
+    }
+    /// Deferred readbacks: where a GPU readback cannot be waited for (WebGPU in a browser
+    /// worker), a frame renders in *passes*. A readback the accelerator does not have yet is
+    /// started, the step returns a cheap placeholder and the pass is marked missed
+    /// ([`Self::pass_missed`]); the caller waits for the readbacks in flight (asynchronously)
+    /// and renders the frame again, and the steps whose results arrived are served from them.
+    /// The frame is done after a pass with no miss. `frame_begin` forgets the previous frame's
+    /// results, `pass_begin` clears the miss. Synchronous accelerators never miss.
+    fn frame_begin(&self) {}
+    fn pass_begin(&self) {}
+    fn pass_missed(&self) -> bool {
+        false
+    }
+    /// Raised from a pass's first miss to its end (results computed meanwhile may hold
+    /// placeholders): give it to [`LayerCache::set_gate`] so they are not cached.
+    fn miss_gate(&self) -> Option<Arc<std::sync::atomic::AtomicBool>> {
+        None
+    }
+    /// With deferred readbacks: a future that resolves once the readbacks in flight have
+    /// landed (the browser delivers them from its event loop; natively the device is polled
+    /// before it returns, so the future is ready). `None` = nothing to wait for. See
+    /// [`passes::in_passes`].
+    fn settle(&self) -> Option<std::pin::Pin<Box<dyn std::future::Future<Output = ()> + '_>>> {
+        None
+    }
+}
+
+/// Where an effect stack runs (see [`Renderer::run_effects_on`]): a CPU buffer, or an image
+/// resident on an accelerator.
+pub trait FxTarget {
+    /// Run a chain of accelerator-supported effects (quantising after each to the bit depth).
+    /// `false` = not handled: the effects then run one by one through [`FxTarget::cpu`].
+    fn gpu(&mut self, steps: &[FxStep]) -> bool;
+    /// Run one CPU effect: `f` maps the buffer.
+    fn cpu(&mut self, f: &mut dyn FnMut(Buf) -> Buf);
+    /// Grow the buffer to cover its whole layer rectangle (`size` layer pixels from its own
+    /// corner, the `layer_size` handed to effects), as [`effectcraft_effects::Buf::cover`].
+    /// Authored buffers (text, shapes) only span their painted content; this gives the stack
+    /// the room a sized source's buffer already has (#659).
+    fn cover(&mut self, size: [f64; 2]) {
+        self.cpu(&mut |mut buf| {
+            buf.cover(size);
+            buf
+        });
+    }
+}
+
+/// The CPU effect target (GPU chains go through [`Accelerator::effects`]: upload, readback).
+pub(crate) struct CpuFx<'a> {
+    pub(crate) accel: Option<&'a dyn Accelerator>,
+    pub(crate) levels: Option<f32>,
+    pub(crate) buf: Option<Buf>,
+}
+
+impl FxTarget for CpuFx<'_> {
+    fn gpu(&mut self, steps: &[FxStep]) -> bool {
+        let (Some(a), Some(b)) = (self.accel, &self.buf) else { return false };
+        match a.effects(steps, b, self.levels) {
+            Some(out) => {
+                self.buf = Some(out);
+                true
+            }
+            None => false,
+        }
+    }
+    fn cpu(&mut self, f: &mut dyn FnMut(Buf) -> Buf) {
+        if let Some(b) = self.buf.take() {
+            self.buf = Some(f(b));
+        }
+    }
+}
+
+/// Hooks for accelerated compositors (`effectcraft-gpu`): the pieces of the CPU walk they reuse
+/// or fall back to. The CPU compositor itself is [`Renderer::comp_frame_cpu`].
+impl<'a> Renderer<'a> {
+    /// The project's colour pipeline.
+    pub fn pipe(&self) -> color::Pipe {
+        self.pipe
+    }
+
+    /// Nesting depth (0 = the top-level comp).
+    pub fn depth(&self) -> usize {
+        self.depth
+    }
+
+    /// The auxiliary 3D channels of comp `comp_id` at comp time `t` (depth, layer IDs, normals,
+    /// UVs, Cryptomatte; see `three_d::compose::aux_pass`), at the renderer's output scale.
+    pub fn comp_aux(&self, comp_id: ItemId, t: Tick) -> Option<effectcraft_raster::AuxChannels> {
+        let ctx = self.eval_ctx(comp_id, t)?;
+        Some(three_d::compose::aux_pass(self, &ctx))
+    }
+
+    /// The auxiliary channels effects on `layer` read ([`EffectHost::aux`]): its multi-layer
+    /// OpenEXR footage's at the layer's source time (Time Remap included), or a precomp's
+    /// generated 3D channels at its nested time. `None` for other layers.
+    pub fn layer_aux(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<effectcraft_raster::AuxChannels>> {
+        match &layer.source {
+            LayerSource::Footage { item } => {
+                let ItemKind::Footage(f) = &self.project.item(*item)?.kind else { return None };
+                let a = self.footage.aux(*item, f, ctx.source_time(layer))?;
+                // Aux pixels per layer pixel (the layer is the footage at its nominal size). The
+                // planes are only copied when that changes the scale.
+                let scale = a.width as f64 / f.width as f64;
+                if f.width > 0 && a.width > 0 && a.scale != scale {
+                    let mut a = (*a).clone();
+                    a.scale = scale;
+                    return Some(Arc::new(a));
+                }
+                Some(a)
+            }
+            LayerSource::Comp { item } => {
+                if self.depth > MAX_FX_DEPTH || self.project.comp_contains(*item, ctx.comp_id) {
+                    return None;
+                }
+                self.nested().comp_aux(*item, ctx.nested_time(layer)).map(Arc::new)
+            }
+            _ => None,
+        }
+    }
+
+    /// Evaluation context of comp `comp_id` at comp time `t`.
+    pub fn eval_ctx(&self, comp_id: ItemId, t: Tick) -> Option<EvalCtx<'a>> {
+        Some(self.ctx(comp_id, self.project.comp(comp_id)?, t))
+    }
+
+    /// The layers drawn at the context time, bottom to top (solo, guides and visibility
+    /// applied).
+    pub fn visible_layers(&self, ctx: &EvalCtx<'a>) -> Vec<&'a Layer> {
+        let (comp, t) = (ctx.comp, ctx.time);
+        let any_solo = comp.any_solo();
+        comp.layers
+            .iter()
+            .rev()
+            .filter(|l| l.is_active_at(t) && l.has_video() && !l.environment && (!any_solo || l.switches.solo) && (self.opts.guides || !l.switches.guide))
+            .collect()
+    }
+
+    /// Draw a run of consecutive 3D layers into `canvas` (CPU).
+    pub fn draw_3d_run(&self, ctx: &EvalCtx<'a>, run: &[&Layer], canvas: &mut Image) {
+        three_d::compose::draw_run(self, ctx, run, canvas);
+    }
+
+    /// A run of consecutive 3D layers prepared for an accelerator (planes, lights, shadow
+    /// casters; see [`three_d::Run3d`]) at output size `out`. `None` = draw it with
+    /// [`Self::draw_3d_run`] (adjustment or wireframe layers in the run, Advanced 3D).
+    pub fn prepare_3d_run(&self, ctx: &EvalCtx<'a>, run: &[&Layer], out: (u32, u32)) -> Option<three_d::Run3d> {
+        three_d::compose::gpu_run(self, ctx, run, out)
+    }
+
+    /// A run of consecutive 3D layers of an Advanced 3D comp prepared for an accelerator's
+    /// compositor ([`three_d::adv::Prepared`]): rendered as one scene and composited (Normal,
+    /// premultiplied over) onto the canvas. `None` = not an Advanced 3D comp, or a layer needs the
+    /// 2D compositing path (blend mode, track matte, Preserve Transparency): draw it with
+    /// [`Self::draw_3d_run`].
+    pub fn prepare_adv_run<'p>(&'p self, ctx: &'p EvalCtx<'a>, run: &'p [&'p Layer], out: (u32, u32)) -> Option<three_d::adv::Prepared<'p, 'a>> {
+        three_d::adv::prepare_run(self, ctx, run, out)
+    }
+
+    /// A run of consecutive 3D layers of an Advanced 3D comp whose layers need the 2D
+    /// compositing path (blend mode, track matte, Preserve Transparency), split for an
+    /// accelerator's compositor ([`three_d::adv::SplitRun`]). `None` = [`Self::prepare_adv_run`]
+    /// covers it, or it isn't an Advanced 3D run.
+    pub fn split_adv_run<'p>(&'p self, ctx: &'p EvalCtx<'a>, run: &'p [&'p Layer], out: (u32, u32)) -> Option<three_d::adv::SplitRun<'p, 'a>> {
+        three_d::adv::split_run(self, ctx, run, out)
+    }
+
+    /// Whether the comp's 3D layers draw with the Advanced 3D renderer.
+    pub fn is_adv3d(&self, ctx: &EvalCtx) -> bool {
+        three_d::adv::active(self, ctx)
+    }
+
+    /// An Environment Light Background layer ready to draw on an accelerator
+    /// ([`three_d::SkyDraw`]; the CPU draws it in `draw_3d_run`). `None` = nothing to draw.
+    pub fn sky_draw(&self, ctx: &EvalCtx, layer: &Layer) -> Option<three_d::SkyDraw> {
+        three_d::compose::sky_draw(self, ctx, layer)
+    }
+
+    /// The pixels a Wireframe-quality layer sets (white, opaque) on a `size` canvas: its
+    /// bounds' outline, one pixel wide. Empty when the layer has no bounds.
+    pub fn wireframe_pixels(&self, ctx: &EvalCtx, layer: &Layer, size: (u32, u32)) -> Vec<(u32, u32)> {
+        let Some(b) = content_bounds(ctx, layer) else { return vec![] };
+        let s = self.opts.scale;
+        let (l2c, _) = ctx.layer_to_comp(layer);
+        let m = Mat3::scale(vec2(s, s)) * self.outer.map_or(l2c, |o| o * l2c);
+        let c = [(b[0], b[1]), (b[2], b[1]), (b[2], b[3]), (b[0], b[3])].map(|(x, y)| m.apply(vec2(x, y)));
+        let (w, h) = (size.0 as i64, size.1 as i64);
+        let mut out = vec![];
+        for i in 0..4 {
+            let (p, q) = (c[i], c[(i + 1) % 4]);
+            let n = ((q.x - p.x).abs().max((q.y - p.y).abs()) * 2.0).ceil().clamp(1.0, 1.0e5) as usize;
+            for j in 0..=n {
+                let t = j as f64 / n as f64;
+                let (x, y) = ((p.x + (q.x - p.x) * t).floor() as i64, (p.y + (q.y - p.y) * t).floor() as i64);
+                if x >= 0 && y >= 0 && x < w && y < h {
+                    out.push((x as u32, y as u32));
+                }
+            }
+        }
+        out
+    }
+
+    /// Run the layer's effect stack on `target` (an accelerator's resident image): GPU-capable
+    /// runs through [`FxTarget::gpu`], the others through [`FxTarget::cpu`], with the CPU's
+    /// parameters and environment. `adjustment`: the stack runs on the comp below (adjustment
+    /// layers).
+    pub fn run_effects_on(&self, ctx: &EvalCtx, layer: &Layer, adjustment: bool, target: &mut dyn FxTarget) {
+        // `target` is used as it is: the comp below for adjustment layers (the callers).
+        self.run_effect_stack(ctx, layer, crate::pipeline::EffectStack { adjustment, limit: usize::MAX, origin: [0.0; 2] }, None, target);
+    }
+
+    /// [`Renderer::run_effects_on`] for a (non-adjustment) layer's own pixels: `target` holds
+    /// them in effect space (as [`Renderer::layer_input`] hands them out) and the result stays
+    /// there. Returns the effect-space origin in layer coordinates (rebase by its negation).
+    pub fn run_layer_effects_on(&self, ctx: &EvalCtx, layer: &Layer, target: &mut dyn FxTarget) -> [f64; 2] {
+        let origin = ctx.effect_bounds(layer).1;
+        self.run_effect_stack(ctx, layer, crate::pipeline::EffectStack { adjustment: false, limit: usize::MAX, origin }, None, target);
+        origin
+    }
+
+    /// An adjustment layer's footprint (its source with masks applied, layer space): where
+    /// its effects show. `None` = the layer changes nothing.
+    pub fn adjustment_footprint(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
+        // Cached, so an accelerator sees the same buffer (and uploads it once) every frame.
+        let key = self.cache.and_then(|_| cache::footprint_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer)));
+        if let (Some(c), Some(k)) = (self.cache, key)
+            && let Some(b) = c.get(k)
+        {
+            return Some(b);
+        }
+        let mut foot = self.source(ctx, layer)?;
+        let _ = masks::apply(ctx, layer, &mut foot, self.mask_blur(ctx, layer));
+        let foot = Arc::new(foot);
+        // The buffer the cache keeps (another worker's, if it kept one first).
+        let foot = match (self.cache_to_keep(), key) {
+            (Some(c), Some(k)) => c.insert(k, foot),
+            _ => foot,
+        };
+        Some(foot)
+    }
+
+    /// Draw one 2D layer into `canvas` on the CPU (any kind: adjustment, wireframe, styled…).
+    pub fn draw_layer_cpu(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image) {
+        self.draw_layer(ctx, layer, canvas, false);
+    }
+
+    /// Draw a collapsed precomp layer into `canvas` on the CPU.
+    pub fn draw_collapsed_cpu(&self, ctx: &EvalCtx<'a>, layer: &Layer, item: ItemId, canvas: &mut Image) {
+        self.draw_collapsed(ctx, layer, item, canvas, false);
+    }
+
+    /// The layer's finished buffers (styles included) in the blending space.
+    pub fn styled_layer(&self, ctx: &EvalCtx, layer: &Layer) -> Option<StyledLayer> {
+        let mut timing = self.profile.map(|_| LayerTiming { depth: self.depth, layer: layer.name.clone(), ..Default::default() });
+        let t0 = web_time::Instant::now();
+        let st = self.styled(ctx, layer, timing.as_mut()).map(|st| self.styled_to_blend(st));
+        if let (Some(prof), Some(mut timing)) = (self.profile, timing) {
+            timing.process_ms = t0.elapsed().as_secs_f64() * 1e3;
+            if let Ok(mut v) = prof.lock() {
+                v.push(timing);
+            }
+        }
+        st
+    }
+
+    /// Opacity the layer composites with (its Opacity × collapsed precomps' opacity).
+    pub fn layer_opacity(&self, ctx: &EvalCtx, layer: &Layer) -> f32 {
+        ctx.opacity(layer) as f32 * self.opacity_mul
+    }
+
+    /// The layer's track matte layer and kind, if it has a valid one.
+    pub fn track_matte<'c>(&self, ctx: &EvalCtx<'c>, layer: &Layer) -> Option<(&'c Layer, MatteKind)> {
+        layer.track_matte.and_then(|tm| ctx.comp.layer(tm.layer).filter(|m| m.id != layer.id).map(|m| (m, tm.kind)))
+    }
+}
diff --git a/crates/render/src/audio.rs b/crates/render/src/audio.rs
index 68be63fe4..66b54b6d0 100644
--- a/crates/render/src/audio.rs
+++ b/crates/render/src/audio.rs
@@ -25,7 +25,7 @@ const MAX_DEPTH: usize = 16;
 /// interleaved (L R L R …).
 pub fn mix_comp(project: &Project, footage: &dyn FootageSource, expr: Option<&dyn ExprHost>, comp: ItemId, start: Tick, frames: usize, rate: u32) -> Vec<f32> {
     let mut out = vec![0.0f32; frames * 2];
-    mix_into(project, footage, expr, comp, start, rate, &mut out, 1.0, 1.0, 0);
+    mix_into(&AudioSources { project, footage, expr, rate }, comp, start, &mut out, 0);
     out
 }
 
@@ -151,7 +151,7 @@ impl MixEnv<'_> {
                     return out;
                 }
                 let mut sub = vec![0.0f32; src_n * 2];
-                mix_into(self.project, self.footage, self.expr, *item, lt, rate, &mut sub, 1.0, 1.0, self.depth + 1);
+                mix_into(&AudioSources { project: self.project, footage: self.footage, expr: self.expr, rate }, *item, lt, &mut sub, self.depth + 1);
                 sub
             }
             _ => return out,
@@ -206,19 +206,16 @@ impl MixEnv<'_> {
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn mix_into(
-    project: &Project,
-    footage: &dyn FootageSource,
-    expr: Option<&dyn ExprHost>,
-    comp_id: ItemId,
-    start: Tick,
+/// Shared inputs for composition audio mixing, including nested compositions.
+struct AudioSources<'a> {
+    project: &'a Project,
+    footage: &'a dyn FootageSource,
+    expr: Option<&'a dyn ExprHost>,
     rate: u32,
-    out: &mut [f32],
-    gl: f32,
-    gr: f32,
-    depth: usize,
-) {
+}
+
+fn mix_into(sources: &AudioSources<'_>, comp_id: ItemId, start: Tick, out: &mut [f32], depth: usize) {
+    let AudioSources { project, footage, expr, rate } = *sources;
     let Some(comp) = project.comp(comp_id) else { return };
     if depth >= MAX_DEPTH || rate == 0 {
         return;
@@ -239,7 +236,6 @@ fn mix_into(
         }
         let t_a = sample_tick(s0 + a as i64, rate);
         let (ll, lr) = levels(&env, l, t_a);
-        let (ll, lr) = (ll * gl, lr * gr);
         if ll == 0.0 && lr == 0.0 {
             continue;
         }
diff --git a/crates/render/src/cache.rs b/crates/render/src/cache.rs
index bae12d1e3..21f745c0e 100644
--- a/crates/render/src/cache.rs
+++ b/crates/render/src/cache.rs
@@ -22,7 +22,7 @@ use std::hash::{Hash, Hasher};
 use std::sync::{Arc, Mutex};
 
 use effectcraft_effects::Buf;
-use effectcraft_project::{ItemKind, Layer, LayerSource, Node, PropGroup};
+use effectcraft_project::{FootageKind, ItemKind, Layer, LayerSource, Node, PropGroup};
 
 use crate::eval::EvalCtx;
 
@@ -168,15 +168,23 @@ impl LayerCache {
                 // Disk cache: a hit comes back into memory.
                 let (dc, dk) = self.disk_key(key)?;
                 let buf = dc.get_layer(dk)?;
-                self.insert_mem(key, buf.clone());
-                Some(buf)
+                Some(self.insert_mem(key, buf))
             }
         }
     }
 
-    pub fn insert(&self, key: u64, buf: Arc<Buf>) {
+    /// Keep `buf` under `key`, and return the buffer the cache holds for it: the one kept first
+    /// when another render of the same layer got there before (#1812: preview workers starting
+    /// together each rendered every layer; sharing the first buffer, the GPU compositor uploads
+    /// and packs it once instead of once per worker, which ran it out of memory). Renders don't
+    /// wait for each other: on the frame workers' shared thread pool a wait can end up under
+    /// the very work it waits for.
+    pub fn insert(&self, key: u64, buf: Arc<Buf>) -> Arc<Buf> {
         if self.gated() {
-            return;
+            return buf;
+        }
+        if let Some(kept) = self.inner.lock().ok().and_then(|g| g.map.get(&key).map(|e| e.buf.clone())) {
+            return kept;
         }
         let started = self.inner.lock().ok().and_then(|mut g| g.missed_at.remove(&key));
         if let Some((dc, dk)) = self.disk_key(key) {
@@ -185,20 +193,24 @@ impl LayerCache {
                 dc.put_layer(dk, &buf);
             }
         }
-        self.insert_mem(key, buf);
+        self.insert_mem(key, buf)
     }
 
-    fn insert_mem(&self, key: u64, buf: Arc<Buf>) {
+    /// See [`LayerCache::insert`]: the buffer kept under `key` (`buf`, unless one was kept first
+    /// or `buf` is too large to keep).
+    fn insert_mem(&self, key: u64, buf: Arc<Buf>) -> Arc<Buf> {
         let bytes = buf.img.data.len() * std::mem::size_of::<effectcraft_raster::Px>();
-        let Ok(mut g) = self.inner.lock() else { return };
+        let Ok(mut g) = self.inner.lock() else { return buf };
         if bytes > g.budget / 4 {
-            return;
+            return buf;
         }
         g.clock += 1;
         let now = g.clock;
-        if let Some(old) = g.map.insert(key, Entry { buf, bytes, last_use: now }) {
-            g.bytes -= old.bytes;
+        if let Some(e) = g.map.get_mut(&key) {
+            e.last_use = now;
+            return e.buf.clone();
         }
+        g.map.insert(key, Entry { buf: buf.clone(), bytes, last_use: now });
         g.bytes += bytes;
         if g.bytes > g.budget {
             // Evict least-recently used entries down to 3/4 of the budget.
@@ -214,6 +226,7 @@ impl LayerCache {
                 }
             }
         }
+        buf
     }
 
     /// The memory budget in bytes.
@@ -481,7 +494,7 @@ fn hash_values(h: &mut KeyHasher, ctx: &EvalCtx, layer: &Layer, g: &PropGroup) {
 }
 
 /// Cache key for the processed (source → masks → effects) buffer of `layer` at the context
-/// time, or `None` when the layer must not be cached (footage, precomps, cameras, adjustment
+/// time, or `None` when the layer must not be cached (movie footage, precomps, cameras, adjustment
 /// layers…).
 pub fn layer_key(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool) -> Option<u64> {
     // Time effects see property values at other times. Keyframes are part of the hashed
@@ -514,6 +527,34 @@ fn reads_other_times(layer: &Layer) -> bool {
         })
 }
 
+/// A still image (no proxy): its layer is cached like a text or shape layer, so the GPU
+/// compositor uploads it once, not every frame (#1812: four 21120 px plates re-uploaded by every
+/// preview worker ran the GPU out of memory). Movies and sequences stay in the media pool only.
+fn still_footage(ctx: &EvalCtx, item: effectcraft_project::ItemId) -> bool {
+    ctx.project.item(item).is_some_and(|it| it.proxy.is_none() && matches!(&it.kind, ItemKind::Footage(f) if f.kind == FootageKind::Still))
+}
+
+/// Does the layer have an animated mask that motion blur may draw at other times (Layer ▸ Mask ▸
+/// Motion Blur On, or Same As Layer with the layer blurred)?
+fn mask_motion_blur(ctx: &EvalCtx, layer: &Layer, blur: bool) -> bool {
+    use effectcraft_project::{GroupKind, MaskMotionBlur};
+    fn animated(g: &PropGroup) -> bool {
+        g.children.iter().any(|c| match c {
+            Node::Prop(p) => !p.keys.is_empty() || p.has_expression(),
+            Node::Group(sub) => animated(sub),
+        })
+    }
+    ctx.comp.enable_motion_blur
+        && layer.masks().is_some_and(|m| {
+            m.groups().any(|g| match g.kind {
+                GroupKind::Mask { motion_blur, .. } => {
+                    (motion_blur == MaskMotionBlur::On || (motion_blur == MaskMotionBlur::SameAsLayer && blur)) && animated(g)
+                }
+                _ => false,
+            })
+        })
+}
+
 fn has_expression(g: &PropGroup) -> bool {
     g.children.iter().any(|c| match c {
         Node::Prop(p) => p.has_expression(),
@@ -539,7 +580,6 @@ fn key_with(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, f
 
 /// `blur`: the layer is motion blurred in this render (`Renderer::mb_on`). `effects`: key only
 /// the first that many effects (a layer's input, see [`input_key`]).
-#[allow(clippy::too_many_arguments)]
 fn key_any(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, footage: bool, effects: Option<usize>) -> Option<u64> {
     let mut h = KeyHasher(0xcbf2_9ce4_8422_2325);
     ctx.comp.frame_rate.as_f64().to_bits().hash(&mut h);
@@ -552,14 +592,17 @@ fn key_any(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, fo
             hash_debug(&mut h, s);
         }
         LayerSource::Text | LayerSource::Shape => {}
-        LayerSource::Footage { item } if footage => {
+        LayerSource::Footage { item } if footage || still_footage(ctx, *item) => {
             let it = ctx.project.item(*item)?;
             let ItemKind::Footage(f) = &it.kind else { return None };
             hash_debug(&mut h, f);
             // A proxy (and its Use Proxy switch) changes the pixels.
             hash_debug(&mut h, &it.proxy);
             item.hash(&mut h);
-            ctx.source_time(layer).0.hash(&mut h);
+            // A still is the same at every time (unless a proxy, which may be a movie, stands in).
+            if f.kind != FootageKind::Still || it.proxy.is_some() {
+                ctx.source_time(layer).0.hash(&mut h);
+            }
             // Frame blending mixes neighbouring source frames.
             ctx.comp.enable_frame_blending.hash(&mut h);
         }
@@ -625,6 +668,11 @@ fn key_any(ctx: &EvalCtx, layer: &Layer, scale: f64, draft: bool, blur: bool, fo
             effectcraft_effects::paint::cache_key(g, lt).0.hash(&mut h);
         }
     }
+    // Mask motion blur draws animated masks at the shutter's other times too: their values at
+    // this time don't tell two frames apart (a hold before a move).
+    if mask_motion_blur(ctx, layer, blur) {
+        layer.layer_time(ctx.time).0.hash(&mut h);
+    }
     if time_dependent(layer, effects != Some(0)) {
         layer.layer_time(ctx.time).0.hash(&mut h);
         // Effects also see the layer's time mapping.
@@ -668,3 +716,23 @@ pub fn derive(key: u64, i: u64) -> u64 {
     i.hash(&mut h);
     h.finish()
 }
+
+#[cfg(test)]
+mod shared_insert_tests {
+    use std::sync::Arc;
+
+    use super::LayerCache;
+    use effectcraft_effects::Buf;
+    use effectcraft_raster::Image;
+
+    /// Two renders of one layer kept under one key: both use the buffer kept first.
+    #[test]
+    fn the_buffer_kept_first_is_shared() {
+        let cache = LayerCache::default();
+        let buf = || Arc::new(Buf { img: Image::new(4, 4), offset: [0.0; 2], scale: 1.0 });
+        let (a, b) = (buf(), buf());
+        assert!(Arc::ptr_eq(&cache.insert(3, a.clone()), &a));
+        assert!(Arc::ptr_eq(&cache.insert(3, b), &a), "the later render gets the first buffer");
+        assert!(Arc::ptr_eq(&cache.get(3).unwrap(), &a));
+    }
+}
diff --git a/crates/render/src/color.rs b/crates/render/src/color.rs
index abfa791e8..d27526553 100644
--- a/crates/render/src/color.rs
+++ b/crates/render/src/color.rs
@@ -21,7 +21,7 @@
 
 use effectcraft_color::{ColorSpace, Conversion};
 use effectcraft_project::{Footage, HdrMode, ProjectSettings};
-use effectcraft_raster::Image;
+use effectcraft_raster::{Image, quantize_px};
 use rayon::prelude::*;
 
 /// The colour pipeline of a project (see the module docs).
@@ -218,27 +218,6 @@ pub fn quantize(img: &mut Image, levels: f32) {
     quantize_rect(img, PxRect { x0: 0, y0: 0, x1: img.width, y1: img.height }, levels);
 }
 
-/// Clamp (colour ≤ alpha ≤ 1, NaN → 0) and round half up; values are non-negative after the
-/// clamp, so the integer conversion rounds like `round()` and vectorises.
-#[allow(clippy::manual_clamp)] // max/min map NaN to 0; clamp would keep NaN
-#[inline(always)]
-fn quantize_px(p: &mut [f32; 4], levels: f32, inv: f32) {
-    let a = round_half_up(p[3].max(0.0).min(1.0) * levels) * inv;
-    let hi = [a, a, a, a];
-    for c in 0..3 {
-        p[c] = round_half_up(p[c].max(0.0).min(hi[c]) * levels) * inv;
-    }
-    p[3] = a;
-}
-
-/// `v` (0..=65 535) rounded half up. The same either way; the fastest on each target: x86-64's
-/// baseline converts to integers in one instruction but has no `floor` (SSE4.1), while in wasm
-/// `floor` is one instruction and converting back from `u32` several (about 1.5× faster there).
-#[inline(always)]
-fn round_half_up(v: f32) -> f32 {
-    if cfg!(target_arch = "wasm32") { (v + 0.5).floor() } else { (v + 0.5) as u32 as f32 }
-}
-
 /// [`quantize`] restricted to a rectangle (already clamped to the image), row-parallel.
 fn quantize_rect(img: &mut Image, r: PxRect, levels: f32) {
     if r.x0 >= r.x1 || r.y0 >= r.y1 {
@@ -248,7 +227,17 @@ fn quantize_rect(img: &mut Image, r: PxRect, levels: f32) {
     let w = img.width as usize;
     let (x0, x1) = (r.x0 as usize, r.x1 as usize);
     img.data[r.y0 as usize * w..r.y1 as usize * w].par_chunks_mut(w).for_each(|row| {
-        for p in &mut row[x0..x1] {
+        // Runs of all-zero pixels (+0.0 in every channel) quantise to themselves: skip them a
+        // cache line at a time (sparse shape, precomp and glow buffers are mostly empty).
+        let (blocks, rest) = row[x0..x1].as_chunks_mut::<4>();
+        for b in blocks {
+            if b.as_flattened().iter().fold(0, |a, v| a | v.to_bits()) != 0 {
+                for p in b {
+                    quantize_px(p, levels, inv);
+                }
+            }
+        }
+        for p in rest {
             quantize_px(p, levels, inv);
         }
     });
@@ -307,6 +296,39 @@ pub fn output_hdr(img: &mut Image, to_linear: Option<Conversion>, mode: HdrMode,
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+
+    /// Skipping all-zero runs leaves every pixel as quantising it one by one does, bit for bit
+    /// (negative zeros and lone pixels in empty runs included).
+    #[test]
+    fn quantize_skips_only_zero_runs() {
+        let mut img = Image::new(23, 7);
+        for (i, p) in img.data.iter_mut().enumerate() {
+            *p = match i % 11 {
+                0 => [0.3, -0.2, 0.71, 0.9],
+                3 => [-0.0, 0.0, 0.0, 0.0],
+                5 => [0.0, 0.0, 0.0, -0.0],
+                7 => [1.7, 0.4, f32::NAN, 0.5],
+                _ => [0.0; 4],
+            };
+        }
+        for levels in [255.0f32, 32_768.0] {
+            let mut want = img.clone();
+            for p in &mut want.data {
+                quantize_px(p, levels, 1.0 / levels);
+            }
+            for r in [PxRect { x0: 0, y0: 0, x1: 23, y1: 7 }, PxRect { x0: 3, y0: 1, x1: 20, y1: 6 }] {
+                let mut got = img.clone();
+                quantize_rect(&mut got, r, levels);
+                for (i, (g, p)) in got.data.iter().zip(&img.data).enumerate() {
+                    let (x, y) = (i as u32 % 23, i as u32 / 23);
+                    let w = if x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1 { want.data[i] } else { *p };
+                    assert_eq!(g.map(f32::to_bits), w.map(f32::to_bits), "{levels} {r:?} px ({x}, {y})");
+                }
+            }
+        }
+    }
+
     /// Both forms `round_half_up` picks between agree on everything quantising feeds it:
     /// 0..=levels, exact halves included.
     #[test]
diff --git a/crates/render/src/disk_cache.rs b/crates/render/src/disk_cache.rs
index 4140b7923..ca5660a67 100644
--- a/crates/render/src/disk_cache.rs
+++ b/crates/render/src/disk_cache.rs
@@ -12,9 +12,11 @@
 //!   `FrameSeg::to_bytes` (keyed by their content-keyed chain key and scale, so they are
 //!   reused whenever the same frames, settings and prompt come back, also after a restart). Every file ends in a checksum; damaged files read as misses and
 //!   are deleted.
-//! * Size limit with least-recently-used eviction. The in-memory index is rebuilt from the
-//!   folder when the cache opens (file modification times order it), so the cache survives
-//!   restarts; reads refresh a file's time.
+//! * Size limit with least-recently-used eviction, down to 90% of the limit so the eviction scan
+//!   runs once per tenth of the limit written, not on every write. The limit shrinks to keep
+//!   free space on the cache's disk ([`DiskCache::set_disk_space`]). The in-memory index is
+//!   rebuilt from the folder when the cache opens (file modification times order it), so the
+//!   cache survives restarts; reads refresh a file's time.
 //! * Safe concurrent access: writes go to a unique temporary file that is renamed into place
 //!   (atomic on every desktop OS), so readers in this or another process never see a partial
 //!   entry; a missing or damaged file is just a miss. Writes run on a background thread with a
@@ -22,7 +24,7 @@
 
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, Condvar, Mutex};
 
 use effectcraft_effects::Buf;
@@ -75,11 +77,15 @@ pub struct DiskStats {
     pub entries: usize,
     pub bytes: u64,
     pub max_bytes: u64,
+    /// The limit in effect: `max_bytes`, or less when the disk is short of free space.
+    pub limit_bytes: u64,
     pub hits: u64,
     pub misses: u64,
     pub writes: u64,
     pub evictions: u64,
     pub dropped: u64,
+    /// Writes that failed (a full disk, permissions).
+    pub failed: u64,
 }
 
 struct Meta {
@@ -157,15 +163,17 @@ impl DiskIndex {
         v.into_iter().map(|e| e.1).collect()
     }
 
-    /// Remove least recently used entries until the total fits `max` bytes; returns them (the
-    /// caller deletes their files).
+    /// When the total exceeds `max` bytes, remove least recently used entries down to 90% of
+    /// it (so the sort runs once per tenth of `max` written, not on every write); returns them
+    /// (the caller deletes their files).
     pub fn evict(&mut self, max: u64) -> Vec<(Kind, u128)> {
         if self.total <= max {
             return vec![];
         }
+        let target = max - max / 10;
         let mut out = vec![];
         for k in self.lru_order() {
-            if self.total <= max {
+            if self.total <= target {
                 break;
             }
             self.remove(k.0, k.1);
@@ -225,11 +233,16 @@ pub struct DiskCache {
     dir: PathBuf,
     index: Mutex<DiskIndex>,
     max_bytes: AtomicU64,
+    /// The size free disk space allows (`u64::MAX` = unknown), see [`DiskCache::set_disk_space`].
+    disk_cap: AtomicU64,
+    /// Free space is limiting the cache (warned once per episode).
+    space_limited: AtomicBool,
     hits: AtomicU64,
     misses: AtomicU64,
     writes: AtomicU64,
     evictions: AtomicU64,
     dropped: AtomicU64,
+    failed: AtomicU64,
     tmp_counter: AtomicU64,
     queue: Arc<(Mutex<Queue>, Condvar)>,
     /// Layer buffers that took less than this to render are not written (ms).
@@ -298,16 +311,21 @@ impl DiskCache {
             dir,
             index: Mutex::new(DiskIndex::default()),
             max_bytes: AtomicU64::new(max_bytes),
+            disk_cap: AtomicU64::new(u64::MAX),
+            space_limited: AtomicBool::new(false),
             hits: AtomicU64::new(0),
             misses: AtomicU64::new(0),
             writes: AtomicU64::new(0),
             evictions: AtomicU64::new(0),
             dropped: AtomicU64::new(0),
+            failed: AtomicU64::new(0),
             tmp_counter: AtomicU64::new(0),
-            queue: Arc::new((Mutex::new(Queue { jobs: Default::default(), busy: false }), Condvar::new())),
+            queue: Arc::new((Mutex::new(Queue { jobs: Default::default(), busy: cfg!(not(target_arch = "wasm32")) }), Condvar::new())),
             min_layer_ms: AtomicU64::new(30),
         });
         dc.rescan();
+        // Shrinking a large cache deletes many files: the writer thread does it.
+        #[cfg(target_arch = "wasm32")]
         dc.evict();
         #[cfg(not(target_arch = "wasm32"))]
         {
@@ -331,7 +349,7 @@ impl DiskCache {
                 let Ok(files) = std::fs::read_dir(shard.path()) else { continue };
                 for f in files.flatten() {
                     let p = f.path();
-                    let name = p.file_name().and_then(|n| n.to_str()).unwrap_or("");
+                    let name = p.file_name().and_then(std::ffi::OsStr::to_str).unwrap_or("");
                     if name.contains(".tmp") {
                         // A writer that died mid-write; old temporaries are removed.
                         if f.metadata().and_then(|m| m.modified()).is_ok_and(|t| t.elapsed().is_ok_and(|e| e.as_secs() > 600)) {
@@ -371,6 +389,32 @@ impl DiskCache {
         self.evict();
     }
 
+    /// The limit in effect: the setting, or less when the disk is short of free space.
+    pub fn limit_bytes(&self) -> u64 {
+        self.max_bytes().min(self.disk_cap.load(Ordering::Relaxed))
+    }
+
+    /// The cache's disk: `(total, available)` bytes, `None` = unknown. The cache leaves at least
+    /// 2 GB or 5% of the disk free, whichever is more (evicting when it must).
+    pub fn set_disk_space(&self, space: Option<(u64, u64)>) {
+        let cap = match space {
+            // (a disk reported as 0 bytes, such as an automount map, is unknown)
+            Some((total, available)) if total > 0 => {
+                let reserve = (2u64 << 30).max(total / 20);
+                let used = self.index.lock().map(|g| g.total()).unwrap_or_default();
+                // The cache's own files count as free: below the reserve it gives space back.
+                used.saturating_add(available).saturating_sub(reserve)
+            }
+            _ => u64::MAX,
+        };
+        self.disk_cap.store(cap, Ordering::Relaxed);
+        let limited = cap < self.max_bytes();
+        if self.space_limited.swap(limited, Ordering::Relaxed) != limited && limited {
+            log::warn!("disk cache at {}: little free disk space, limiting the cache to {} MB", self.folder().display(), cap >> 20);
+        }
+        self.evict();
+    }
+
     /// Layer buffers faster to render than this are not worth a disk write.
     pub fn set_min_layer_ms(&self, ms: u64) {
         self.min_layer_ms.store(ms, Ordering::Relaxed);
@@ -395,11 +439,13 @@ impl DiskCache {
             entries,
             bytes,
             max_bytes: self.max_bytes(),
+            limit_bytes: self.limit_bytes(),
             hits: self.hits.load(Ordering::Relaxed),
             misses: self.misses.load(Ordering::Relaxed),
             writes: self.writes.load(Ordering::Relaxed),
             evictions: self.evictions.load(Ordering::Relaxed),
             dropped: self.dropped.load(Ordering::Relaxed),
+            failed: self.failed.load(Ordering::Relaxed),
         }
     }
 
@@ -494,30 +540,44 @@ impl DiskCache {
         }
         let path = self.path(kind, key);
         let Some(parent) = path.parent() else { return };
-        if std::fs::create_dir_all(parent).is_err() {
+        if let Err(e) = std::fs::create_dir_all(parent) {
+            self.write_failed(&e);
             return;
         }
         let data = seal(kind, payload);
-        let n = self.tmp_counter.fetch_add(1, Ordering::Relaxed);
-        let tmp = parent.join(format!("{key:032x}.tmp.{}.{n}", std::process::id()));
-        if std::fs::write(&tmp, &data).is_err() {
-            let _ = std::fs::remove_file(&tmp);
+        // An entry that cannot fit would be evicted straight away.
+        if data.len() as u64 > self.limit_bytes() {
             return;
         }
-        if std::fs::rename(&tmp, &path).is_err() {
+        // Make room first, so the cache never exceeds its limit (or the free-space reserve).
+        self.evict_to(self.limit_bytes().saturating_sub(data.len() as u64));
+        let n = self.tmp_counter.fetch_add(1, Ordering::Relaxed);
+        let tmp = parent.join(format!("{key:032x}.tmp.{}.{n}", std::process::id()));
+        if let Err(e) = std::fs::write(&tmp, &data).and_then(|()| std::fs::rename(&tmp, &path)) {
             let _ = std::fs::remove_file(&tmp);
+            self.write_failed(&e);
             return;
         }
         self.writes.fetch_add(1, Ordering::Relaxed);
         if let Ok(mut g) = self.index.lock() {
             g.insert(kind, key, data.len() as u64);
         }
-        self.evict();
+    }
+
+    /// Count a failed write; the first one is logged (a full disk shouldn't go unnoticed).
+    fn write_failed(&self, e: &std::io::Error) {
+        if self.failed.fetch_add(1, Ordering::Relaxed) == 0 {
+            log::warn!("disk cache at {}: a write failed: {e}", self.folder().display());
+        }
     }
 
     /// Remove least recently used entries until the cache fits its limit.
     fn evict(&self) {
-        let max = self.max_bytes();
+        self.evict_to(self.limit_bytes());
+    }
+
+    /// Remove least recently used entries until the cache fits `max` bytes.
+    fn evict_to(&self, max: u64) {
         let victims = match self.index.lock() {
             Ok(mut g) => g.evict(max),
             Err(_) => return,
@@ -586,6 +646,15 @@ impl DiskCache {
 #[cfg(not(target_arch = "wasm32"))]
 fn writer(dc: std::sync::Weak<DiskCache>, q: Arc<(Mutex<Queue>, Condvar)>) {
     let (m, cv) = &*q;
+    // The eviction at open (a lower limit than the folder holds), off the opening thread;
+    // `busy` starts set, so `flush` waits for it.
+    if let Some(cache) = dc.upgrade() {
+        cache.evict();
+    }
+    if let Ok(mut g) = m.lock() {
+        g.busy = false;
+    }
+    cv.notify_all();
     loop {
         let job = {
             let Ok(mut g) = m.lock() else { return };
@@ -779,8 +848,12 @@ fn hash_debug(h: &mut Hash128, v: &impl std::fmt::Debug) {
     h.write(&[0xff]);
 }
 
-/// A file's size and modification time (so edited footage gets new keys).
-fn file_stamp(h: &mut Hash128, path: &str) {
+/// Size and content hash of a path that has no native metadata (the browser file table).
+pub type VirtualFileId<'a> = &'a (dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync);
+
+/// A file's size and modification time (so edited footage gets new keys). When the path has no
+/// native metadata, `virtual_id` supplies a durable size and content hash instead.
+fn file_stamp(h: &mut Hash128, path: &str, virtual_id: Option<VirtualFileId<'_>>) {
     if path.is_empty() {
         return;
     }
@@ -791,26 +864,36 @@ fn file_stamp(h: &mut Hash128, path: &str) {
         {
             h.write_u64(d.as_nanos() as u64);
         }
+        return;
+    }
+    if let Some((len, hash)) = virtual_id.and_then(|id| id(path)) {
+        h.write_u64(len);
+        h.write_u64(hash);
     }
 }
 
-fn footage_stamp(h: &mut Hash128, f: &effectcraft_project::Footage) {
-    file_stamp(h, &f.path);
+fn footage_stamp(h: &mut Hash128, f: &effectcraft_project::Footage, virtual_id: Option<VirtualFileId<'_>>) {
+    file_stamp(h, &f.path, virtual_id);
     for p in &f.sequence {
-        file_stamp(h, p);
+        file_stamp(h, p, virtual_id);
     }
 }
 
 /// Salt for layer cache keys on disk: the renderer version and every footage file's identity
 /// (layer keys name footage items, not file contents).
 pub fn footage_salt(project: &effectcraft_project::Project) -> u64 {
+    footage_salt_with(project, None)
+}
+
+/// [`footage_salt`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.
+pub fn footage_salt_with(project: &effectcraft_project::Project, virtual_id: Option<VirtualFileId<'_>>) -> u64 {
     let mut h = Hash128::default();
     h.write(RENDER_VERSION.as_bytes());
     for (id, it) in &project.items {
         if let effectcraft_project::ItemKind::Footage(f) = &it.kind {
             h.write_u64(id.0);
             hash_debug(&mut h, f);
-            footage_stamp(&mut h, f);
+            footage_stamp(&mut h, f, virtual_id);
         }
     }
     let v = h.finish();
@@ -822,6 +905,11 @@ pub fn footage_salt(project: &effectcraft_project::Project) -> u64 {
 /// files' size and time). With expressions in play (which can read any comp) the whole project
 /// counts. Switches that don't change pixels (Audio, Lock, Shy, Hide Shy Layers) don't count.
 pub fn comp_content_key(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId) -> u128 {
+    comp_content_key_with(project, comp, None)
+}
+
+/// [`comp_content_key`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.
+pub fn comp_content_key_with(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId, virtual_id: Option<VirtualFileId<'_>>) -> u128 {
     use effectcraft_project::{ItemKind, LayerSource};
     let mut h = Hash128::default();
     h.write(RENDER_VERSION.as_bytes());
@@ -855,11 +943,11 @@ pub fn comp_content_key(project: &effectcraft_project::Project, comp: effectcraf
             k => hash_debug(&mut h, k),
         }
         if let ItemKind::Footage(f) = &it.kind {
-            footage_stamp(&mut h, f);
+            footage_stamp(&mut h, f, virtual_id);
         }
         hash_debug(&mut h, &it.proxy);
         if let Some(px) = &it.proxy {
-            footage_stamp(&mut h, &px.footage);
+            footage_stamp(&mut h, &px.footage, virtual_id);
         }
     }
     h.write_u64(comp.0);
@@ -1011,9 +1099,9 @@ mod tests {
         let per = dc.stats().bytes / 6;
         // Touch 0 so it is the most recently used.
         assert!(dc.get_layer(0).is_some());
-        dc.set_max_bytes(per * 3 + per / 2);
+        dc.set_max_bytes(per * 3 + per * 3 / 4);
         let st = dc.stats();
-        assert!(st.bytes <= per * 3 + per / 2, "{st:?}");
+        assert!(st.bytes <= per * 3 + per * 3 / 4, "{st:?}");
         assert_eq!(st.entries, 3);
         assert!(dc.contains(Kind::Layer, 0), "recently used survives");
         assert!(!dc.contains(Kind::Layer, 1) && !dc.contains(Kind::Layer, 2) && !dc.contains(Kind::Layer, 3));
@@ -1023,7 +1111,69 @@ mod tests {
         assert_eq!(files, 3);
         // New writes keep evicting.
         dc.put_layer_now(99, &buf(9, 64, 64));
-        assert!(dc.stats().bytes <= per * 3 + per / 2);
+        assert!(dc.stats().bytes <= per * 3 + per * 3 / 4);
+    }
+
+    #[test]
+    fn eviction_goes_down_to_ninety_percent_in_lru_order() {
+        let mut ix = DiskIndex::default();
+        for k in 0..10u128 {
+            ix.insert(Kind::Layer, k, 100);
+        }
+        assert!(ix.touch(Kind::Layer, 0));
+        // Over 950: down to 855, least recently used first.
+        ix.insert(Kind::Layer, 10, 100);
+        assert_eq!(ix.evict(950), vec![(Kind::Layer, 1), (Kind::Layer, 2), (Kind::Layer, 3)]);
+        assert_eq!(ix.total(), 800);
+        // The slack absorbs the next write without another scan.
+        ix.insert(Kind::Layer, 11, 100);
+        assert!(ix.evict(950).is_empty());
+    }
+
+    #[test]
+    fn free_disk_space_caps_the_limit() {
+        let dir = tmpdir("space");
+        let dc = DiskCache::open(&dir, 1 << 30).unwrap();
+        for k in 0..4u128 {
+            dc.put_layer_now(k, &buf(k as u32, 64, 64));
+        }
+        let used = dc.stats().bytes;
+        // Unknown space: the setting alone.
+        dc.set_disk_space(None);
+        assert_eq!(dc.stats().limit_bytes, 1 << 30);
+        // A disk reported as 0 bytes is unknown.
+        dc.set_disk_space(Some((0, 0)));
+        assert_eq!(dc.stats().limit_bytes, 1 << 30);
+        // 100 GB disk, 5 GB reserved, exactly 5 GB free: the cache may not grow.
+        dc.set_disk_space(Some((100 << 30, 5 << 30)));
+        let st = dc.stats();
+        assert_eq!((st.max_bytes, st.limit_bytes), (1 << 30, used));
+        dc.put_layer_now(9, &buf(9, 64, 64));
+        let st = dc.stats();
+        assert!(st.bytes <= st.limit_bytes && st.bytes <= used - used / 10 && st.evictions > 0, "{st:?}");
+        assert!(dc.contains(Kind::Layer, 9), "the new entry is the most recently used");
+        // Below the reserve the cache gives its space back, and skips writes that can't fit.
+        dc.set_disk_space(Some((100 << 30, 4 << 30)));
+        dc.put_layer_now(10, &buf(10, 64, 64));
+        let st = dc.stats();
+        assert_eq!((st.limit_bytes, st.entries, st.bytes), (0, 0, 0), "{st:?}");
+        // Plenty of space again: back to the setting.
+        dc.set_disk_space(Some((100 << 30, 50 << 30)));
+        assert_eq!(dc.stats().limit_bytes, 1 << 30);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn failed_writes_are_counted() {
+        let dir = tmpdir("failed");
+        let dc = DiskCache::open(&dir, 1 << 30).unwrap();
+        // A file where the layers folder should be: every layer write fails.
+        std::fs::write(dir.join(VERSION).join(Kind::Layer.dir()), b"x").unwrap();
+        dc.put_layer_now(1, &buf(1, 8, 8));
+        dc.put_layer_now(2, &buf(2, 8, 8));
+        let st = dc.stats();
+        assert_eq!((st.failed, st.writes, st.entries), (2, 0, 0));
+        let _ = std::fs::remove_dir_all(&dir);
     }
 
     fn walk(d: &Path) -> usize {
@@ -1082,4 +1232,29 @@ mod tests {
             assert_eq!(b.get_layer(k).unwrap().img, buf(k as u32, 16, 16).img);
         }
     }
+
+    /// A path with no native metadata takes its key from the caller's size and content hash (#1253).
+    #[test]
+    fn virtual_file_bytes_change_content_keys() {
+        use effectcraft_project::build;
+        use effectcraft_project::{Comp, Footage, ItemKind, LayerSource, Project};
+        use effectcraft_time::{FrameRate, Tick};
+
+        let mut p = Project::default();
+        let f = Footage { path: "/virtual.mov".into(), width: 16, height: 9, duration: Tick::from_seconds_f64(1.0), has_video: true, ..Default::default() };
+        let fid = p.add_item("virtual.mov", effectcraft_color::Label::None, None, ItemKind::Footage(f));
+        let mut comp = Comp::new(16, 9, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+        comp.layers = vec![build::layer(&mut p, &comp, "clip", LayerSource::Footage { item: fid }, (16, 9), None)];
+        let cid = p.add_item("C", effectcraft_color::Label::None, None, ItemKind::Comp(comp.into()));
+
+        let id = |mark: u64| move |path: &str| (path == "/virtual.mov").then_some((8, mark));
+        let (one, two) = (id(1), id(2));
+        let a = footage_salt_with(&p, Some(&one));
+        let b = footage_salt_with(&p, Some(&two));
+        let ka = comp_content_key_with(&p, cid, Some(&one));
+        let kb = comp_content_key_with(&p, cid, Some(&two));
+        assert_ne!(a, b, "replaced virtual media must not reuse the salt");
+        assert_ne!(ka, kb, "replaced virtual media must not reuse the frame key");
+        assert_eq!(comp_content_key(&p, cid), comp_content_key_with(&p, cid, None));
+    }
 }
diff --git a/crates/render/src/footage.rs b/crates/render/src/footage.rs
new file mode 100644
index 000000000..04dd706db
--- /dev/null
+++ b/crates/render/src/footage.rs
@@ -0,0 +1,178 @@
+use super::{Arc, AtomicBool, Footage, Image, ItemId, Ordering, Tick};
+
+/// How a [`FootageSource`] hands over float footage (OpenEXR, float TIFF), whose values are
+/// linear light: encoded with a curve, as the compositor takes footage, or as stored. Other
+/// footage is decoded the same way whatever it says. Interpret Footage ▸ Preserve RGB always
+/// reads the values as stored.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
+pub enum FloatCurve {
+    /// The sRGB curve (managed projects, and Working Gamma 2.2).
+    #[default]
+    Srgb,
+    /// A pure 2.4 power curve (no working space, Working Gamma 2.4).
+    Gamma24,
+    /// The linear values as stored (Interpret As Linear Light encodes them afterwards).
+    Linear,
+}
+
+/// Supplies decoded footage frames (implemented by the media layer).
+pub trait FootageSource: Send + Sync {
+    /// The frame of `item` at source time `t`, straight from the file (any size).
+    fn frame(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<Image>>;
+    /// [`FootageSource::frame`] for a render that shows it at `width` × `height`, at most half its
+    /// size: either that frame or, when the source can make it more cheaply than the whole frame
+    /// (movies, see `effectcraft-media`), the frame already resampled to that size as
+    /// [`effectcraft_raster::resample`] would.
+    fn frame_at_size(&self, item: ItemId, footage: &Footage, t: Tick, _width: u32, _height: u32) -> Option<Arc<Image>> {
+        self.frame(item, footage, t)
+    }
+    /// [`FootageSource::frame`] (`size: None`) or [`FootageSource::frame_at_size`] with float
+    /// footage handed over as `float` says ([`FootageSource::frame`] uses [`FloatCurve::Srgb`]).
+    /// Sources without float footage can leave the default, which ignores `float`.
+    fn frame_with(&self, item: ItemId, footage: &Footage, t: Tick, size: Option<(u32, u32)>, float: FloatCurve) -> Option<Arc<Image>> {
+        let _ = float;
+        match size {
+            Some((w, h)) => self.frame_at_size(item, footage, t, w, h),
+            None => self.frame(item, footage, t),
+        }
+    }
+    /// `frames` interleaved stereo sample frames of `item`'s audio from source time `t` at
+    /// `rate` Hz (`None` when unavailable). The first sample is `t.to_units_floor(rate)`;
+    /// a sample boundary uses the earliest representable tick that selects that sample.
+    fn audio(&self, _item: ItemId, _footage: &Footage, _t: Tick, _frames: usize, _rate: u32) -> Option<Vec<f32>> {
+        None
+    }
+    /// Auxiliary 3D channels of `item` at source time `t` (multi-layer OpenEXR: depth, IDs,
+    /// Cryptomatte, any named channel), with `scale` relative to the file's pixels. `None` when
+    /// the footage has none.
+    fn aux(&self, _item: ItemId, _footage: &Footage, _t: Tick) -> Option<Arc<effectcraft_raster::AuxChannels>> {
+        None
+    }
+    /// The parsed 3D model of a [`effectcraft_project::FootageKind::Model`] item (Advanced 3D).
+    fn model(&self, _item: ItemId, _footage: &Footage) -> Option<Arc<effectcraft_model::Model>> {
+        None
+    }
+    /// Set the decoded-frame cache budget in bytes (Settings ▸ Memory & CPU); sources without
+    /// a cache ignore it.
+    fn set_cache_budget(&self, _bytes: usize) {}
+    /// Drop the decoded frames it keeps (Edit ▸ Purge ▸ All Memory / Image Cache Memory): the
+    /// next reads decode again. Sources without a cache ignore it.
+    fn purge(&self) {}
+    /// The file at `path` changed on disk (Reload Footage): drop what it keeps of it (decoded
+    /// frames, open decoders, parsed models), so the next reads see the new contents. Sources
+    /// without a cache ignore it.
+    fn forget(&self, _path: &str) {}
+    /// Settings ▸ Disk ▸ Conformed Audio Folder: where decoded audio is kept between reads
+    /// (`None` = off); sources that don't decode audio ignore it.
+    fn set_conform_folder(&self, _folder: Option<std::path::PathBuf>) {}
+    /// The decoded-frame cache budget in bytes, if the source has a cache.
+    fn cache_budget(&self) -> Option<usize> {
+        None
+    }
+    /// Vector footage (SVG) rasterised at `scale` × its pixel size, for Continuously Rasterize.
+    /// `None` when the footage is not vector or cannot be read.
+    fn vector_frame(&self, _item: ItemId, _footage: &Footage, _scale: f64) -> Option<Arc<Image>> {
+        None
+    }
+    /// Run `f`, which reads frames from this source, as work that can be called off: once
+    /// `cancel` is set, long decodes it starts (a movie seeking back to a keyframe and decoding
+    /// forward) stop early and their frames come back `None`. Sources that can't stop a decode
+    /// just run `f`. See [`CancellableFootage`].
+    fn cancellable(&self, _cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
+        f()
+    }
+    /// Reads through this source have been called off: frames may have come back `None` that
+    /// exist, so what was made from them must not be kept.
+    fn called_off(&self) -> bool {
+        false
+    }
+    /// Why `footage` shows no picture although its file is there: a read of it failed because
+    /// no decoder handles its codec, profile, chroma format or bit depth, or the stream is damaged
+    /// (e.g. "H.264 (High 4:2:2) isn't supported by the built-in decoder: ..."). `None` while it
+    /// decodes, and for sources that don't track failures. Stays set until the file is forgotten.
+    fn problem(&self, _footage: &Footage) -> Option<String> {
+        None
+    }
+}
+
+/// A render's view of a [`FootageSource`] whose frame reads can be called off with `cancel`
+/// (a viewer frame nobody waits for any more, #329). Every read goes through
+/// [`FootageSource::cancellable`] on its own, so reads made for this render on another thread
+/// (a parallel loop) answer to this render's flag, and reads for other renders never do.
+pub struct CancellableFootage<'a> {
+    pub inner: &'a dyn FootageSource,
+    pub cancel: Arc<AtomicBool>,
+}
+
+impl CancellableFootage<'_> {
+    fn read<R>(&self, f: impl FnOnce() -> Option<R>) -> Option<R> {
+        if self.cancel.load(Ordering::Relaxed) {
+            return None;
+        }
+        let (mut f, mut out) = (Some(f), None);
+        self.inner.cancellable(&self.cancel, &mut || out = f.take().and_then(|f| f()));
+        out
+    }
+}
+
+impl FootageSource for CancellableFootage<'_> {
+    fn frame(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<Image>> {
+        self.read(|| self.inner.frame(item, footage, t))
+    }
+    fn frame_at_size(&self, item: ItemId, footage: &Footage, t: Tick, width: u32, height: u32) -> Option<Arc<Image>> {
+        self.read(|| self.inner.frame_at_size(item, footage, t, width, height))
+    }
+    fn audio(&self, item: ItemId, footage: &Footage, t: Tick, frames: usize, rate: u32) -> Option<Vec<f32>> {
+        self.inner.audio(item, footage, t, frames, rate)
+    }
+    fn aux(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<effectcraft_raster::AuxChannels>> {
+        self.inner.aux(item, footage, t)
+    }
+    fn model(&self, item: ItemId, footage: &Footage) -> Option<Arc<effectcraft_model::Model>> {
+        self.inner.model(item, footage)
+    }
+    fn set_cache_budget(&self, bytes: usize) {
+        self.inner.set_cache_budget(bytes)
+    }
+    fn purge(&self) {
+        self.inner.purge()
+    }
+    fn forget(&self, path: &str) {
+        self.inner.forget(path)
+    }
+    fn set_conform_folder(&self, folder: Option<std::path::PathBuf>) {
+        self.inner.set_conform_folder(folder)
+    }
+    fn cache_budget(&self) -> Option<usize> {
+        self.inner.cache_budget()
+    }
+    fn vector_frame(&self, item: ItemId, footage: &Footage, scale: f64) -> Option<Arc<Image>> {
+        self.inner.vector_frame(item, footage, scale)
+    }
+    fn cancellable(&self, cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
+        self.inner.cancellable(cancel, f)
+    }
+    fn called_off(&self) -> bool {
+        self.cancel.load(Ordering::Relaxed) || self.inner.called_off()
+    }
+    fn problem(&self, footage: &Footage) -> Option<String> {
+        self.inner.problem(footage)
+    }
+    fn frame_with(&self, item: ItemId, footage: &Footage, t: Tick, size: Option<(u32, u32)>, float: FloatCurve) -> Option<Arc<Image>> {
+        self.read(|| self.inner.frame_with(item, footage, t, size, float))
+    }
+}
+
+/// Footage that can be rasterised at any scale (SVG).
+pub fn is_vector_footage(f: &Footage) -> bool {
+    matches!(f.codec.as_str(), "SVG" | "PDF" | "AI" | "EPS")
+}
+
+/// No footage available (renders footage layers as transparent).
+pub struct NoFootage;
+
+impl FootageSource for NoFootage {
+    fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
+        None
+    }
+}
diff --git a/crates/render/src/frames.rs b/crates/render/src/frames.rs
new file mode 100644
index 000000000..7dd0fc0de
--- /dev/null
+++ b/crates/render/src/frames.rs
@@ -0,0 +1,144 @@
+use super::footage::NoFootage;
+use super::opts::RenderOpts;
+use super::{EvalCtx, Footage, FrameBlend, FrameRate, Image, ItemId, Layer, LayerSource, Project, Renderer, TICKS_PER_SECOND, Tick, shapes, source_size, text};
+
+/// The layer's frame blending mode, if the comp's Enable Frame Blending switch is on.
+/// One field of an interlaced frame as a full frame: the field's lines (`parity` 0 = even /
+/// upper, 1 = odd / lower) kept, the other lines interpolated from their neighbours.
+pub fn field_frame(img: &Image, parity: usize) -> Image {
+    let (w, h) = (img.width as usize, img.height as usize);
+    let mut out = img.clone();
+    if h < 2 {
+        return out;
+    }
+    for y in 0..h {
+        if y % 2 == parity {
+            continue;
+        }
+        let above = y.checked_sub(1);
+        let below = (y + 1 < h).then_some(y + 1);
+        for x in 0..w {
+            let px = match (above, below) {
+                (Some(a), Some(b)) => {
+                    let (p, q) = (img.data[a * w + x], img.data[b * w + x]);
+                    [(p[0] + q[0]) * 0.5, (p[1] + q[1]) * 0.5, (p[2] + q[2]) * 0.5, (p[3] + q[3]) * 0.5]
+                }
+                (Some(a), None) => img.data[a * w + x],
+                (None, Some(b)) => img.data[b * w + x],
+                (None, None) => img.data[y * w + x],
+            };
+            out.data[y * w + x] = px;
+        }
+    }
+    out
+}
+
+/// Interpret Footage ▸ Invert Alpha and Interpret As Linear Light on decoded (premultiplied)
+/// pixels; linear light is encoded in `space` ([`color::Pipe::linear_footage_space`]).
+pub fn interpret_pixels(img: &Image, f: &Footage, space: effectcraft_color::ColorSpace) -> Image {
+    let linear = f.linear_light_applies();
+    if !f.invert_alpha && !linear {
+        return img.clone();
+    }
+    let mut out = img.clone();
+    for p in out.data.iter_mut() {
+        let a = p[3];
+        let mut c = if a > 1e-6 { [p[0] / a, p[1] / a, p[2] / a] } else { [0.0; 3] };
+        if linear {
+            // The file's values are linear light: encode them like the rest of the footage.
+            c = c.map(|v| space.encode(v));
+        }
+        let a = if f.invert_alpha { 1.0 - a } else { a };
+        *p = [c[0] * a, c[1] * a, c[2] * a, a];
+    }
+    out
+}
+
+pub(crate) fn frame_blend_mode(ctx: &EvalCtx, layer: &Layer) -> FrameBlend {
+    if ctx.comp.enable_frame_blending { layer.switches.frame_blend } else { FrameBlend::Off }
+}
+
+/// Position of source time `t` among frames at `rate`: the frame at or before `t` and the
+/// fraction (0..1) of the way to the next frame. Exact (integer tick arithmetic), so frames that
+/// line up exactly report a fraction of 0.
+pub fn frame_position(t: Tick, rate: FrameRate) -> (i64, f64) {
+    let num = t.0 as i128 * rate.num as i128;
+    let den = TICKS_PER_SECOND as i128 * rate.den as i128;
+    (num.div_euclid(den) as i64, num.rem_euclid(den) as f64 / den as f64)
+}
+
+/// Blend two neighbouring frames `w` of the way from `a` to `b`: a cross-fade (Frame Mix) or a
+/// motion-compensated interpolation (Pixel Motion).
+pub fn blend_frames(mode: FrameBlend, a: &Image, b: &Image, w: f32) -> Image {
+    match mode {
+        FrameBlend::PixelMotion => effectcraft_raster::flow::interpolate(a, b, w),
+        _ => effectcraft_raster::flow::mix(a, b, w),
+    }
+}
+
+/// Convenience: render one frame of a comp with no footage source.
+/// Adaptive motion-blur sample count for a layer whose corners travel `travel` output pixels
+/// during the shutter: one sample per pixel, clamped to Samples Per Frame … Adaptive Sample Limit.
+pub fn adaptive_samples(travel: f64, per_frame: u32, limit: u32) -> usize {
+    let lo = per_frame.clamp(2, 64) as f64;
+    let hi = (limit.clamp(16, 256) as f64).max(lo);
+    travel.ceil().clamp(lo, hi) as usize
+}
+
+/// A region of interest `[x, y, w, h]` lies within a `w`×`h` comp frame.
+pub fn roi_inside(r: [f64; 4], w: u32, h: u32) -> bool {
+    r[0] >= 0.0 && r[1] >= 0.0 && r[0] + r[2] <= w as f64 + 1e-6 && r[1] + r[3] <= h as f64 + 1e-6
+}
+
+/// The Extended Viewer's region of interest: the comp frame grown by `margin` × its size on every
+/// side (`margin` = 1 shows a pasteboard one comp wide around the frame), intersected with the
+/// `visible` comp-space rectangle `[x0, y0, x1, y1]` and snapped outward to whole 16 px steps from the frame edges
+/// so panning re-renders rarely. `None` when the visible area lies inside the frame.
+pub fn extended_region(w: u32, h: u32, visible: [f64; 4], margin: f64) -> Option<[f64; 4]> {
+    let (w, h) = (w as f64, h as f64);
+    let (mx, my) = (w * margin, h * margin);
+    let snap_lo = |v: f64| (v / 16.0).floor() * 16.0;
+    let snap_hi = |v: f64| (v / 16.0).ceil() * 16.0;
+    let x0 = snap_lo(visible[0].max(-mx)).min(0.0);
+    let y0 = snap_lo(visible[1].max(-my)).min(0.0);
+    let x1 = w + snap_hi(visible[2].min(w + mx) - w).max(0.0);
+    let y1 = h + snap_hi(visible[3].min(h + my) - h).max(0.0);
+    if x0 >= 0.0 && y0 >= 0.0 && x1 <= w && y1 <= h {
+        return None;
+    }
+    Some([x0, y0, x1 - x0, y1 - y0])
+}
+
+/// The size of a `width` x `height` comp frame rendered at `scale` (both compositors, and the
+/// frame size Composition Settings shows for a Resolution).
+pub fn frame_size(width: u32, height: u32, scale: f64) -> (u32, u32) {
+    (((width as f64 * scale).round() as u32).max(1), ((height as f64 * scale).round() as u32).max(1))
+}
+
+pub fn render_frame(project: &Project, comp: ItemId, t: Tick, scale: f64) -> Image {
+    Renderer::new(project, &NoFootage, RenderOpts { scale, ..Default::default() }).comp_frame(comp, t)
+}
+
+/// Layer-space bounds `[x0, y0, x1, y1]` of a layer's content at the context time (source size
+/// for solids/footage/precomps, glyph bounds for text, painted bounds for shapes). Used for viewer
+/// handles and hit testing.
+pub fn content_bounds(ctx: &EvalCtx, layer: &effectcraft_project::Layer) -> Option<[f64; 4]> {
+    match &layer.source {
+        LayerSource::Text => {
+            let glyphs = text::glyph_paths(ctx, layer);
+            let paths: Vec<_> = glyphs.into_iter().map(|g| g.0).collect();
+            effectcraft_path::bounds(&paths).map(|r| [r.x0, r.y0, r.x1, r.y1])
+        }
+        LayerSource::Shape => layer.props.sub("contents").and_then(|c| shapes::content_bounds(ctx, layer, c)).map(|r| [r.x0, r.y0, r.x1, r.y1]),
+        LayerSource::Camera | LayerSource::Light { .. } => None,
+        _ => {
+            let (w, h) = source_size(ctx.project, layer);
+            (w > 0 && h > 0).then_some([0.0, 0.0, w as f64, h as f64])
+        }
+    }
+}
+
+/// A mask/shape path as a kurbo path (for drawing overlays).
+pub fn kurbo_path(sp: &effectcraft_keyframe::ShapePath) -> kurbo::BezPath {
+    effectcraft_path::to_kurbo(sp)
+}
diff --git a/crates/render/src/fx_host.rs b/crates/render/src/fx_host.rs
new file mode 100644
index 000000000..8366cf7c0
--- /dev/null
+++ b/crates/render/src/fx_host.rs
@@ -0,0 +1,157 @@
+use super::{Arc, Buf, EffectHost, EvalCtx, ItemKind, Layer, LayerPixels, LayerSource, Params, Renderer, Tick, three_d};
+
+/// Layer parameters and audio for effects (see [`effectcraft_effects::EffectHost`]). What it
+/// hands out is in effect space (see [`effect_bounds`]): the other layer's for its pixels, the
+/// running layer's for its own frames and the comp scene.
+pub(crate) struct FxHost<'r, 'a, 'c> {
+    pub(crate) r: &'r Renderer<'a>,
+    pub(crate) ctx: &'c EvalCtx<'a>,
+    pub(crate) layer: &'c Layer,
+    /// Where the stack's effect space starts in layer coordinates (zero on adjustment layers,
+    /// whose effects run on the comp below).
+    pub(crate) origin: [f64; 2],
+    /// Index of the effect being rendered (bounds `self_at` to effects before it).
+    pub(crate) index: usize,
+    pub(crate) original: Option<&'c Buf>,
+}
+
+impl FxHost<'_, '_, '_> {
+    /// Another layer's pixels for a layer parameter, in its effect space; `layer_space`: `buf`
+    /// is still in layer space (its source or its content).
+    fn pixels(&self, other: &Layer, mut buf: Buf, layer_space: bool) -> LayerPixels {
+        let (size, origin) = self.ctx.effect_bounds(other);
+        if layer_space {
+            buf.rebase(origin);
+        }
+        LayerPixels { buf, size }
+    }
+}
+
+/// The comp's camera and first light relative to `layer`, in its layer pixels (see
+/// [`EffectHost::comp_scene`]): the comp camera's view of the layer (as if 3D at its transform),
+/// brought back into the layer's own pixel grid through the inverse of how the layer itself
+/// composites.
+pub(crate) fn comp_scene(ctx: &EvalCtx, layer: &Layer) -> Option<effectcraft_effects::CompScene> {
+    let world = ctx.world_matrix(layer);
+    let (cam, _, _) = ctx.camera();
+    let p = (cam * world).0;
+    let back = ctx.layer_to_comp(layer).0.inverse()?.0;
+    let rows = [p[0], p[1], p[3]];
+    let camera: [[f64; 4]; 3] = std::array::from_fn(|i| std::array::from_fn(|j| (0..3).map(|k| back[i][k] * rows[k][j]).sum()));
+    let inv = world.inverse();
+    let light = three_d::light::lights_at(ctx).first().and_then(|l| {
+        let inv = inv.as_ref()?;
+        let pos = inv.apply(l.pos);
+        let dir = inv.apply_vec(l.dir);
+        let len = (dir.x * dir.x + dir.y * dir.y + dir.z * dir.z).sqrt().max(1e-12);
+        let kind = match l.kind {
+            effectcraft_project::LightKind::Parallel => 0,
+            effectcraft_project::LightKind::Ambient => 2,
+            _ => 1,
+        };
+        Some(effectcraft_effects::CompLight { pos: [pos.x, pos.y, pos.z], dir: [dir.x / len, dir.y / len, dir.z / len], color: l.color, kind })
+    });
+    let camera_layer = ctx.comp.active_camera(ctx.time).is_some();
+    Some(effectcraft_effects::CompScene { camera: Some(camera), camera_layer, light })
+}
+
+/// Nesting limit for effects that render layers (other layers, other times).
+pub(crate) const MAX_FX_DEPTH: usize = 8;
+
+impl EffectHost for FxHost<'_, '_, '_> {
+    fn original(&self) -> Option<&Buf> {
+        self.original
+    }
+
+    fn particles(&self) -> Option<&dyn effectcraft_effects::psim::ParticleSim> {
+        self.r.active_accel().and_then(|a| a.particles())
+    }
+    fn layer(&self, id: u64, masks_and_effects: bool) -> Option<LayerPixels> {
+        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
+        if (other.id == self.layer.id && masks_and_effects) || self.r.depth > MAX_FX_DEPTH {
+            return None;
+        }
+        let sub = self.r.nested();
+        // The cached layer buffer is shared; effects get their own copy.
+        let buf = if masks_and_effects { (*sub.content_buf(self.ctx, other)?).clone() } else { sub.source(self.ctx, other)? };
+        Some(self.pixels(other, buf, true))
+    }
+
+    fn layer_masks(&self, id: u64) -> Option<LayerPixels> {
+        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
+        if self.r.depth > MAX_FX_DEPTH {
+            return None;
+        }
+        let sub = self.r.nested();
+        let buf = (*sub.layer_input(self.ctx, other, 0)?).clone();
+        Some(self.pixels(other, buf, false))
+    }
+
+    fn audio(&self, id: u64, start: f64, frames: usize, rate: u32) -> Option<Vec<f32>> {
+        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
+        let LayerSource::Footage { item } = &other.source else { return None };
+        let ItemKind::Footage(f) = &self.r.project.item(*item)?.kind else { return None };
+        if !f.has_audio {
+            return None;
+        }
+        let st = other.layer_time(Tick::from_seconds_f64(start));
+        self.r.footage.audio(*item, f, st, frames, rate)
+    }
+
+    fn self_at(&self, layer_time: f64, effects: usize) -> Option<Buf> {
+        if self.r.depth > MAX_FX_DEPTH || self.layer.switches.adjustment {
+            return None;
+        }
+        let n = effects.min(self.index);
+        let t = self.layer.comp_time(Tick::from_seconds_f64(layer_time));
+        let sub = self.r.nested();
+        sub.layer_input(&self.ctx.at(t), self.layer, n).map(|b| (*b).clone())
+    }
+
+    fn aux(&self) -> Option<Arc<effectcraft_raster::AuxChannels>> {
+        self.r.layer_aux(self.ctx, self.layer)
+    }
+
+    fn params_at(&self, layer_time: f64) -> Option<Params> {
+        let g = self.layer.effects()?.groups().nth(self.index)?;
+        let ctx = self.ctx.at(self.layer.comp_time(Tick::from_seconds_f64(layer_time)));
+        Some(effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(self.layer, pr)))
+    }
+
+    fn comp_scene(&self) -> Option<effectcraft_effects::CompScene> {
+        Some(comp_scene(self.ctx, self.layer)?.rebased(self.origin))
+    }
+
+    fn layer_at(&self, id: u64, comp_time: f64, masks_and_effects: bool) -> Option<LayerPixels> {
+        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
+        if (other.id == self.layer.id && masks_and_effects) || !comp_time.is_finite() || self.r.depth > MAX_FX_DEPTH {
+            return None;
+        }
+        let ctx = self.ctx.at(Tick::from_seconds_f64(comp_time));
+        let sub = self.r.nested();
+        Some(if masks_and_effects {
+            self.pixels(other, (*sub.content_buf(&ctx, other)?).clone(), true)
+        } else if other.id == self.layer.id {
+            self.pixels(other, sub.source(&ctx, other)?, true)
+        } else {
+            // Preserve other-layer reads: time effects historically see source + masks.
+            self.pixels(other, (*sub.layer_input(&ctx, other, 0)?).clone(), false)
+        })
+    }
+}
+
+/// The Essential Properties overrides of a precomp layer, evaluated at the context time.
+pub fn essential_overrides(ctx: &EvalCtx, layer: &Layer) -> Vec<effectcraft_project::essential::Override> {
+    use effectcraft_project::essential;
+    let over = essential::overridden(layer);
+    let Some(g) = essential::group(layer).filter(|_| !over.is_empty()) else { return vec![] };
+    let mut out = vec![];
+    g.walk("", &mut |_, p| {
+        if over.contains(&p.uid)
+            && let Some(control) = essential::control_of(&p.match_id)
+        {
+            out.push(essential::Override { control, value: ctx.value(layer, p) });
+        }
+    });
+    out
+}
diff --git a/crates/render/src/layers.rs b/crates/render/src/layers.rs
new file mode 100644
index 000000000..cac2add43
--- /dev/null
+++ b/crates/render/src/layers.rs
@@ -0,0 +1,601 @@
+use super::frames::adaptive_samples;
+use super::opts::{LayerTiming, Through};
+use super::{
+    Arc, BlendMode, Buf, Comp, EvalCtx, Image, IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, Layer, LayerSource, Mat3,
+    MatteKind, ParallelIterator, Quality, Region, Renderer, Sampling, Tick, WarpOpts, cache, color, composite_warp_changed, masks, source_size, styles, vec2,
+};
+
+/// Blend policy for placing a layer, including optional output-depth quantization.
+struct PlacementBlend {
+    mode: BlendMode,
+    opacity: f32,
+    quantize: Option<f32>,
+}
+
+/// A motion-blur shutter: the comp's, or for a collapsed precomp's layers the outermost
+/// containing comp's (they are drawn into its frames).
+#[derive(Clone, Copy)]
+struct Shutter {
+    /// Shutter angle and phase as fractions of a frame.
+    angle: f64,
+    phase: f64,
+    /// Frame duration (seconds).
+    frame: f64,
+    /// Samples Per Frame and Adaptive Sample Limit.
+    samples: u32,
+    limit: u32,
+}
+
+impl Shutter {
+    /// Seconds from the frame time to sub-sample `i` of `n`, spread over the open shutter.
+    fn offset(&self, i: usize, n: usize) -> f64 {
+        let f = if n > 1 { i as f64 / (n - 1) as f64 } else { 0.0 };
+        (self.phase + self.angle * f) * self.frame
+    }
+}
+
+impl<'a> Renderer<'a> {
+    /// The layer with its styles: exterior passes and body (cached per pass).
+    pub(crate) fn styled(&self, ctx: &EvalCtx, layer: &Layer, mut timing: Option<&mut LayerTiming>) -> Option<StyledLayer> {
+        let (content, ckey) = self.content_buf_timed(ctx, layer, timing.as_deref_mut())?;
+        if !styles::active(ctx, layer) {
+            return Some(StyledLayer { passes: vec![], body: content.clone(), content, key: ckey, ckey, plain: true });
+        }
+        let modes = styles::pass_modes(ctx, layer);
+        let key = ckey.map(|k| cache::styles_key(ctx, layer, k));
+        if let (Some(c), Some(k)) = (self.cache, key)
+            && let Some(body) = c.get(k)
+        {
+            let passes: Option<Vec<_>> = modes.iter().enumerate().map(|(i, m)| c.get(cache::derive(k, i as u64 + 1)).map(|b| (b, *m))).collect();
+            if let Some(passes) = passes {
+                return Some(StyledLayer { passes, body, content, key, ckey, plain: false });
+            }
+        }
+        let t0 = web_time::Instant::now();
+        let size = source_size(self.project, layer);
+        let layer_size = if size.0 == 0 { [ctx.comp.width as f64, ctx.comp.height as f64] } else { [size.0 as f64, size.1 as f64] };
+        let st = styles::render(ctx, layer, &content, layer_size);
+        if let Some(t) = timing {
+            t.cached = false;
+            t.effects.push(("layerStyles".into(), t0.elapsed().as_secs_f64() * 1e3));
+        }
+        let mut body = Arc::new(st.body);
+        let mut passes: Vec<_> = st.passes.into_iter().map(|(b, m)| (Arc::new(b), m)).collect();
+        // The buffers the cache keeps (another worker's, if it kept them first).
+        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
+            body = c.insert(k, body);
+            for (i, (b, _)) in passes.iter_mut().enumerate() {
+                *b = c.insert(cache::derive(k, i as u64 + 1), b.clone());
+            }
+        }
+        Some(StyledLayer { passes, body, content, key, ckey, plain: false })
+    }
+
+    /// The styled layer's buffers in the blending space.
+    pub(crate) fn styled_to_blend(&self, st: StyledLayer) -> StyledLayer {
+        if self.pipe.to_blend().is_none() {
+            return st;
+        }
+        let body = self.to_blend(st.body, st.key);
+        let content = if st.plain { body.clone() } else { self.to_blend(st.content, st.ckey) };
+        let passes = st.passes.into_iter().enumerate().map(|(i, (b, m))| (self.to_blend(b, st.key.map(|k| cache::derive(k, i as u64 + 1))), m)).collect();
+        StyledLayer { passes, body, content, ..st }
+    }
+
+    pub(crate) fn sampling(&self, layer: &Layer) -> effectcraft_raster::Sampling {
+        if self.quality(layer) == Quality::Draft {
+            // Draft quality: no interpolation (nearest neighbour), as After Effects' Draft.
+            effectcraft_raster::Sampling::Nearest
+        } else if self.opts.draft {
+            effectcraft_raster::Sampling::Bilinear
+        } else if layer.switches.sampling == Sampling::Bicubic {
+            effectcraft_raster::Sampling::Bicubic
+        } else {
+            effectcraft_raster::Sampling::Bilinear
+        }
+    }
+
+    /// The region of interest of a top-level 2D frame: (x, y) offset of the output in output
+    /// pixels and its size. `None` renders the whole comp (no ROI, or a nested comp).
+    pub(crate) fn roi_offset(&self) -> Option<(f64, f64, u32, u32)> {
+        let r = self.opts.roi.filter(|_| self.top)?;
+        let s = self.opts.scale;
+        if r[2] <= 0.0 || r[3] <= 0.0 {
+            return None;
+        }
+        Some(((r[0] * s).round(), (r[1] * s).round(), ((r[2] * s).round() as u32).max(1), ((r[3] * s).round() as u32).max(1)))
+    }
+
+    /// The region of interest's offset in output pixels for 3D projection (0 without one).
+    pub(crate) fn out_offset(&self) -> (f64, f64) {
+        self.roi_offset().map_or((0.0, 0.0), |(x, y, _, _)| (x, y))
+    }
+
+    /// Scaled comp pixel → output pixel: the region of interest's offset.
+    fn out_matrix(&self) -> Mat3 {
+        match self.roi_offset() {
+            Some((x, y, _, _)) => Mat3::translate(vec2(-x, -y)),
+            None => Mat3::IDENTITY,
+        }
+    }
+
+    /// Buffer pixel → output pixel matrix for the layer at the context time.
+    fn buf_matrix(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> Mat3 {
+        let (l2c, _) = ctx.layer_to_comp(layer);
+        self.place_matrix(self.outer.map_or(l2c, |o| o * l2c), buf)
+    }
+
+    /// Buffer pixel → output pixel matrix for a layer → (top-level) comp matrix.
+    fn place_matrix(&self, l2c: Mat3, buf: &Buf) -> Mat3 {
+        let s = self.opts.scale;
+        self.out_matrix()
+            * Mat3::scale(vec2(s, s))
+            * l2c
+            * Mat3::scale(vec2(1.0 / buf.scale, 1.0 / buf.scale))
+            * Mat3::translate(vec2(-buf.offset[0], -buf.offset[1]))
+    }
+
+    /// The collapsed precomp layers this comp is drawn through, outermost first.
+    fn links(&self) -> impl Iterator<Item = &Through<'a>> {
+        self.through.iter().map_while(Option::as_ref)
+    }
+
+    /// The shutter of a layer's motion blur: its comp's, or for a collapsed precomp's layers the
+    /// outermost containing comp's.
+    fn shutter(&self, ctx: &EvalCtx) -> Shutter {
+        let c: &Comp = match self.links().next() {
+            Some(l) => l.comp,
+            None => ctx.comp,
+        };
+        Shutter {
+            angle: c.shutter_angle / 360.0,
+            phase: c.shutter_phase / 360.0,
+            frame: c.frame_duration().seconds(),
+            samples: c.motion_blur_samples,
+            limit: c.motion_blur_adaptive_limit,
+        }
+    }
+
+    /// Whether a layer moves within the shutter: its own motion blur, or that of a collapsed
+    /// precomp layer it is drawn through.
+    fn blurred(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
+        self.mb_on(ctx, layer) || (!self.through_lost && self.links().any(|l| l.blur))
+    }
+
+    /// The collapsed precomps' matrix (nested comp → the frame's comp) and the nested comp's time
+    /// `dt` seconds into the outermost comp's shutter: each precomp layer moves if it is motion
+    /// blurred, and times map down through each one (stretch, time remapping).
+    fn outer_at(&self, ctx: &EvalCtx, dt: f64) -> (Option<Mat3>, Tick) {
+        let shift = Tick::from_seconds_f64(dt);
+        let mut outer: Option<Mat3> = None;
+        let mut t: Option<Tick> = None;
+        for l in self.links() {
+            let at = EvalCtx { comp_id: l.comp_id, comp: l.comp, time: t.unwrap_or(l.time + shift), ..*ctx };
+            let (m, _) = if l.blur { at.layer_to_comp(l.layer) } else { EvalCtx { time: l.time, ..at }.layer_to_comp(l.layer) };
+            outer = Some(outer.map_or(m, |o| o * m));
+            t = Some(at.nested_time(l.layer));
+        }
+        (outer, t.unwrap_or(ctx.time + shift))
+    }
+
+    /// [`Self::buf_matrix`] for the motion-blur sub-sample `dt` seconds into the shutter: the
+    /// layer moves if it is motion blurred, the collapsed precomps above it if theirs are.
+    fn buf_matrix_at(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, dt: f64) -> Mat3 {
+        if self.through_lost || self.links().next().is_none() {
+            return self.buf_matrix(&ctx.at(ctx.time + Tick::from_seconds_f64(dt)), layer, buf);
+        }
+        let (outer, t) = self.outer_at(ctx, dt);
+        let lctx = if self.mb_on(ctx, layer) { ctx.at(t) } else { *ctx };
+        let (l2c, _) = lctx.layer_to_comp(layer);
+        self.place_matrix(outer.map_or(l2c, |o| o * l2c), buf)
+    }
+
+    /// Shape and text content that animates within the shutter (paths, Trim Paths, text
+    /// animators…) of a motion-blurred layer: the times its source is drawn at and averaged,
+    /// Samples Per Frame of them, as After Effects does for shape layers. `None` when the content
+    /// holds still (compared through its cache key, which leaves the transform out).
+    pub(crate) fn content_times(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Vec<Tick>> {
+        if !matches!(layer.source, LayerSource::Shape | LayerSource::Text) || !self.mb_on(ctx, layer) {
+            return None;
+        }
+        let sh = self.shutter(ctx);
+        if sh.angle <= 0.0 {
+            return None;
+        }
+        let n = if self.opts.draft { 4 } else { (sh.samples as usize).clamp(2, 64) };
+        let times: Vec<Tick> = (0..n).map(|i| self.outer_at(ctx, sh.offset(i, n)).1).collect();
+        let key = |t: Tick| cache::layer_key(&ctx.at(t), layer, 1.0, false, false);
+        let k0 = key(*times.first()?)?;
+        let moves = [times.get(n / 2), times.last()].into_iter().flatten().any(|t| key(*t) != Some(k0));
+        moves.then_some(times)
+    }
+
+    /// The layer's source drawn at each of `times` and averaged (premultiplied) on the union of
+    /// their bounds. Content that also changes its raster scale within the shutter, or would need
+    /// an outsized buffer, is drawn once.
+    pub(crate) fn blurred_source(&self, ctx: &EvalCtx, layer: &Layer, times: &[Tick]) -> Option<Buf> {
+        let bufs: Vec<Buf> = times.iter().filter_map(|t| self.source(&ctx.at(*t), layer)).collect();
+        let scale = bufs.first()?.scale;
+        // Pixel = layer point × scale + offset: with the largest offset every buffer lands at
+        // x + (off - its offset) ≥ 0.
+        let off = [0, 1].map(|i| bufs.iter().map(|b| b.offset[i]).fold(f64::MIN, f64::max));
+        let w = bufs.iter().map(|b| off[0] - b.offset[0] + b.img.width as f64).fold(0.0, f64::max).ceil();
+        let h = bufs.iter().map(|b| off[1] - b.offset[1] + b.img.height as f64).fold(0.0, f64::max).ceil();
+        if bufs.iter().any(|b| (b.scale - scale).abs() > 1e-9) || !(w * h).is_finite() || w * h > (1u64 << 26) as f64 {
+            return self.source(ctx, layer);
+        }
+        let mut acc = Image::new(w as u32, h as u32);
+        let k = 1.0 / bufs.len() as f32;
+        for b in &bufs {
+            let m = Mat3::translate(vec2(off[0] - b.offset[0], off[1] - b.offset[1]));
+            effectcraft_raster::accumulate_warp(&mut acc, &b.img, &m, effectcraft_raster::Sampling::Bilinear, k);
+        }
+        Some(Buf { img: acc, offset: off, scale })
+    }
+
+    /// A processed-layer cache key that also covers content motion blur (the averaged source
+    /// depends on the content at every sub-sample).
+    pub(crate) fn content_key(&self, ctx: &EvalCtx, layer: &Layer, key: Option<u64>) -> Option<u64> {
+        let k = key?;
+        let Some(times) = self.content_times(ctx, layer) else { return Some(k) };
+        times.iter().try_fold(cache::derive(k, 0x6d62_6c72), |d, t| Some(cache::derive(d, cache::layer_key(&ctx.at(*t), layer, 1.0, false, false)?)))
+    }
+
+    /// Whether a layer is motion blurred: the render options, the comp's switch and the layer's
+    /// switch (limited by the precomp layers above when switches affect nested comps). Layer
+    /// motion, mask motion blur, effects that read the shutter and Advanced 3D all ask this.
+    pub(crate) fn mb_on(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
+        self.opts.motion_blur && ctx.comp.enable_motion_blur && self.layer_motion_blur(layer)
+    }
+
+    /// What a layer's mask motion blur may do in this render (see [`masks::MaskBlur`]).
+    pub(crate) fn mask_blur(&self, ctx: &EvalCtx, layer: &Layer) -> masks::MaskBlur {
+        masks::MaskBlur {
+            allowed: self.opts.motion_blur && ctx.comp.enable_motion_blur && self.inherited.is_none_or(|(_, mb)| mb),
+            layer: self.layer_motion_blur(layer),
+            samples: if self.opts.draft { 4 } else { ctx.comp.motion_blur_samples as usize },
+        }
+    }
+
+    /// Motion-blur sub-samples for a layer buffer (1 = no motion blur). As in After Effects, a 2D
+    /// layer gets about one sample per output pixel its corners travel during the shutter,
+    /// at least Samples Per Frame and at most the comp's Adaptive Sample Limit; a layer that
+    /// does not move within the shutter is drawn once.
+    fn mb_samples(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> usize {
+        if !self.blurred(ctx, layer) {
+            return 1;
+        }
+        let travel = self.shutter_travel(ctx, layer, buf);
+        if travel < 1e-3 {
+            return 1;
+        }
+        if self.opts.draft {
+            return 4;
+        }
+        let sh = self.shutter(ctx);
+        adaptive_samples(travel, sh.samples, sh.limit)
+    }
+
+    /// Largest distance (output pixels) a corner of the layer buffer moves during the shutter,
+    /// measured along the path at a few points.
+    fn shutter_travel(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> f64 {
+        let sh = self.shutter(ctx);
+        let (w, h) = (buf.img.width as f64, buf.img.height as f64);
+        let corners = [(0.0, 0.0), (w, 0.0), (0.0, h), (w, h), (w * 0.5, h * 0.5)];
+        const PROBES: usize = 8;
+        let mut prev: Option<Vec<effectcraft_geom::Vec2>> = None;
+        let mut travel = vec![0.0f64; corners.len()];
+        for i in 0..PROBES {
+            let m = self.buf_matrix_at(ctx, layer, buf, sh.offset(i, PROBES));
+            let pts: Vec<_> = corners.iter().map(|&(x, y)| m.apply(vec2(x, y))).collect();
+            if let Some(p) = &prev {
+                for (k, (a, b)) in p.iter().zip(&pts).enumerate() {
+                    travel[k] += (b.x - a.x).hypot(b.y - a.y);
+                }
+            }
+            prev = Some(pts);
+        }
+        travel.into_iter().fold(0.0, f64::max)
+    }
+
+    /// Canvas pixels that compositing `buf` for `layer` can change: the transformed buffer's
+    /// bounds plus the resampling footprint. Stencil/silhouette modes, motion blur and
+    /// perspective fall back to the whole canvas.
+    ///
+    /// A quantised buffer placed pixel-exactly (integer translation, Normal, 100%) over a blank
+    /// canvas leaves exactly its own (quantised) pixels: nothing to re-quantise.
+    fn footprint(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, opacity: f32, blank: bool) -> Region {
+        if layer.blend_mode.is_stencil() || self.mb_samples(ctx, layer, buf) > 1 {
+            return Region::Full;
+        }
+        let m = self.buf_matrix(ctx, layer, buf);
+        if !m.is_affine() {
+            return Region::Full;
+        }
+        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
+        let k = &m.0;
+        let integral = |v: f64| v == v.round();
+        if blank
+            && layer.blend_mode == BlendMode::Normal
+            && opacity == 1.0
+            && !matte
+            && !layer.preserve_transparency
+            && self.pipe.to_blend().is_none()
+            && k[0][0] == 1.0
+            && k[1][1] == 1.0
+            && k[0][1] == 0.0
+            && k[1][0] == 0.0
+            && integral(k[0][2])
+            && integral(k[1][2])
+        {
+            return Region::Empty;
+        }
+        let (w, h) = (buf.img.width as f64, buf.img.height as f64);
+        let c = [(0.0, 0.0), (w, 0.0), (0.0, h), (w, h)].map(|(x, y)| m.apply(vec2(x, y)));
+        let (x0, x1) = (c.iter().map(|p| p.x).fold(f64::INFINITY, f64::min), c.iter().map(|p| p.x).fold(f64::NEG_INFINITY, f64::max));
+        let (y0, y1) = (c.iter().map(|p| p.y).fold(f64::INFINITY, f64::min), c.iter().map(|p| p.y).fold(f64::NEG_INFINITY, f64::max));
+        color::PxRect::covering(x0, y0, x1, y1, 3.0).map_or(Region::Full, Region::Rect)
+    }
+
+    /// How a processed layer buffer lands in the output: one buffer → output matrix, or one per
+    /// motion-blur sub-sample (averaged), with the layer's sampling filter and dissolve seed.
+    pub fn placement(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> Placement {
+        let samples = self.mb_samples(ctx, layer, buf);
+        let (sampling, seed) = (self.sampling(layer), layer.id.0 as u32);
+        if samples <= 1 {
+            return Placement { matrices: vec![self.buf_matrix(ctx, layer, buf)], sampling, seed };
+        }
+        let sh = self.shutter(ctx);
+        let matrices = (0..samples).map(|i| self.buf_matrix_at(ctx, layer, buf, sh.offset(i, samples))).collect();
+        Placement { matrices, sampling, seed }
+    }
+
+    /// Draw a processed layer into `target` (transform, motion blur) with `mode`/`opacity`.
+    pub(crate) fn place(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, target: &mut Image, mode: BlendMode, opacity: f32) {
+        self.place_changed(ctx, layer, buf, target, PlacementBlend { mode, opacity, quantize: None });
+    }
+
+    /// [`Self::place`], returning the target pixels it changed when the warp tracked them (then
+    /// also quantised to `quantize` levels; see [`composite_warp_changed`]).
+    fn place_changed(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, target: &mut Image, blend: PlacementBlend) -> Option<[u32; 4]> {
+        let PlacementBlend { mode, opacity, quantize } = blend;
+        let pl = self.placement(ctx, layer, buf);
+        let opts = WarpOpts { sampling: pl.sampling, opacity, mode, seed: pl.seed, clip: None };
+        if let [m] = pl.matrices.as_slice() {
+            return composite_warp_changed(target, &buf.img, m, &opts, quantize);
+        }
+        // Sub-samples sum straight into one buffer (each warp is row-parallel).
+        let mut acc = Image::new(target.width, target.height);
+        let k = 1.0 / pl.matrices.len() as f32;
+        for m in &pl.matrices {
+            effectcraft_raster::accumulate_warp(&mut acc, &buf.img, m, opts.sampling, k);
+        }
+        target.blend_from(&acc, mode, opacity, pl.seed);
+        None
+    }
+
+    /// Draw a 2D layer into `canvas`; returns the region it may have changed.
+    pub(crate) fn draw_layer(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image, blank: bool) -> Region {
+        let opacity = ctx.opacity(layer) as f32 * self.opacity_mul;
+        if self.quality(layer) == Quality::Wireframe && !layer.switches.adjustment {
+            self.draw_wireframe(ctx, layer, canvas);
+            return Region::Full;
+        }
+        if opacity <= 0.0 && !layer.switches.adjustment {
+            return Region::Empty;
+        }
+        if layer.switches.adjustment {
+            self.draw_adjustment(ctx, layer, canvas, opacity);
+            return Region::Full;
+        }
+        let mut timing = self.profile.map(|_| LayerTiming { depth: self.depth, layer: layer.name.clone(), ..Default::default() });
+        let t0 = web_time::Instant::now();
+        let Some(st) = self.styled(ctx, layer, timing.as_mut()) else { return Region::Empty };
+        let st = self.styled_to_blend(st);
+        let t1 = web_time::Instant::now();
+        let changed = if st.plain {
+            // Pixels the warp tracks are quantised as it blends them (nothing left to do); the
+            // footprint is still needed when it doesn't, or when no pixel needs quantising.
+            let footprint = self.footprint(ctx, layer, &st.body, opacity, blank);
+            let quantize = if footprint == Region::Empty { None } else { self.pipe.levels };
+            match self.composite_layer(ctx, layer, &st.body, canvas, opacity, quantize) {
+                Some(_) if quantize.is_some() => Region::Empty,
+                drawn => narrow(footprint, drawn),
+            }
+        } else {
+            self.composite_styled(ctx, layer, &st, canvas, opacity);
+            Region::Full
+        };
+        if let (Some(prof), Some(mut timing)) = (self.profile, timing) {
+            timing.process_ms = (t1 - t0).as_secs_f64() * 1e3;
+            timing.composite_ms = t1.elapsed().as_secs_f64() * 1e3;
+            if let Ok(mut v) = prof.lock() {
+                v.push(timing);
+            }
+        }
+        changed
+    }
+
+    /// Composite a styled layer: exterior passes with their own modes, then the body with the
+    /// layer's mode; the layer's opacity fades the whole stack. Knockout clears what is below the
+    /// layer's content; switched-off R/G/B channels keep the values below.
+    fn composite_styled(&self, ctx: &EvalCtx, layer: &Layer, st: &StyledLayer, canvas: &mut Image, opacity: f32) {
+        let bl = styles::blending(ctx, layer);
+        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
+        if matte || layer.preserve_transparency {
+            let mut iso = Image::new(canvas.width, canvas.height);
+            for (b, m) in &st.passes {
+                self.place(ctx, layer, b, &mut iso, *m, 1.0);
+            }
+            self.place(ctx, layer, &st.body, &mut iso, BlendMode::Normal, 1.0);
+            self.composite_iso(ctx, layer, iso, canvas, opacity);
+            return;
+        }
+        let mut tmp = canvas.clone();
+        if bl.knockout > 0 {
+            let mut k = Image::new(canvas.width, canvas.height);
+            self.place(ctx, layer, &st.content, &mut k, BlendMode::Normal, 1.0);
+            tmp.data.par_iter_mut().zip(k.data.par_iter()).for_each(|(p, q)| {
+                let keep = 1.0 - q[3].clamp(0.0, 1.0);
+                for c in p.iter_mut() {
+                    *c *= keep;
+                }
+            });
+        }
+        for (b, m) in &st.passes {
+            self.place(ctx, layer, b, &mut tmp, *m, 1.0);
+        }
+        self.place(ctx, layer, &st.body, &mut tmp, layer.blend_mode, 1.0);
+        let ch = bl.channels;
+        canvas.data.par_iter_mut().zip(tmp.data.par_iter()).for_each(|(c, t)| {
+            for i in 0..4 {
+                let v = if i < 3 && !ch[i] { c[i] } else { t[i] };
+                c[i] += (v - c[i]) * opacity;
+            }
+        });
+    }
+
+    /// Composite a plain layer; returns the canvas pixels it changed when they are known (then
+    /// also quantised to `quantize` levels).
+    fn composite_layer(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, canvas: &mut Image, opacity: f32, quantize: Option<f32>) -> Option<[u32; 4]> {
+        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
+        if !matte && !layer.preserve_transparency {
+            return self.place_changed(ctx, layer, buf, canvas, PlacementBlend { mode: layer.blend_mode, opacity, quantize });
+        }
+        // Render in isolation, then matte / preserve transparency, then blend.
+        let mut iso = Image::new(canvas.width, canvas.height);
+        self.place(ctx, layer, buf, &mut iso, BlendMode::Normal, 1.0);
+        self.composite_iso(ctx, layer, iso, canvas, opacity);
+        None
+    }
+
+    /// Apply the track matte / preserve transparency to an isolated layer render, then blend.
+    pub(crate) fn composite_iso(&self, ctx: &EvalCtx, layer: &Layer, iso: Image, canvas: &mut Image, opacity: f32) {
+        self.composite_iso_with(ctx, layer, iso, canvas, opacity, None);
+    }
+
+    /// [`Self::composite_iso`] with the track matte's pixels already drawn (`matte`, e.g. a 3D
+    /// matte seen through the camera); otherwise the matte layer is placed in 2D.
+    pub(crate) fn composite_iso_with(&self, ctx: &EvalCtx, layer: &Layer, mut iso: Image, canvas: &mut Image, opacity: f32, matte_img: Option<Image>) {
+        self.apply_track_matte(ctx, layer, &mut iso, matte_img);
+        if layer.preserve_transparency {
+            iso.data.par_iter_mut().zip(canvas.data.par_iter()).for_each(|(p, q)| {
+                for c in p.iter_mut() {
+                    *c *= q[3];
+                }
+            });
+        }
+        canvas.blend_from(&iso, layer.blend_mode, opacity, layer.id.0 as u32);
+    }
+
+    /// Multiply `img` (comp-sized) by the layer's track matte, if it has one; `matte_img` as in
+    /// [`Self::composite_iso_with`].
+    fn apply_track_matte(&self, ctx: &EvalCtx, layer: &Layer, img: &mut Image, matte_img: Option<Image>) {
+        let matte = layer.track_matte.and_then(|tm| ctx.comp.layer(tm.layer).filter(|m| m.id != layer.id).map(|m| (m, tm.kind)));
+        if let Some((m, kind)) = matte {
+            let mimg = match matte_img {
+                Some(i) if i.width == img.width && i.height == img.height => i,
+                _ => {
+                    let mut mimg = Image::new(img.width, img.height);
+                    if m.is_active_at(ctx.time)
+                        && let Some(mb) = self.layer_buf(ctx, m)
+                    {
+                        let mo = ctx.opacity(m) as f32;
+                        self.place(ctx, m, &mb, &mut mimg, BlendMode::Normal, mo);
+                    }
+                    mimg
+                }
+            };
+            img.data.par_iter_mut().zip(mimg.data.par_iter()).for_each(|(p, q)| {
+                let k = match kind {
+                    MatteKind::Alpha => q[3],
+                    MatteKind::AlphaInverted => 1.0 - q[3],
+                    MatteKind::Luma => effectcraft_color::luminance(q[0], q[1], q[2]),
+                    MatteKind::LumaInverted => 1.0 - effectcraft_color::luminance(q[0], q[1], q[2]),
+                }
+                .clamp(0.0, 1.0);
+                for c in p.iter_mut() {
+                    *c *= k;
+                }
+            });
+        }
+    }
+
+    /// Adjustment layer: effects applied to the comp below, limited to the layer's footprint
+    /// and its track matte.
+    fn draw_adjustment(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image, opacity: f32) {
+        let Some(mut foot) = self.source(ctx, layer) else { return };
+        let _ = masks::apply(ctx, layer, &mut foot, self.mask_blur(ctx, layer));
+        let mut matte = Image::new(canvas.width, canvas.height);
+        self.place(ctx, layer, &foot, &mut matte, BlendMode::Normal, 1.0);
+        self.apply_track_matte(ctx, layer, &mut matte, None);
+        let o = self.roi_offset().map(|(x, y, _, _)| [-x, -y]).unwrap_or([0.0; 2]);
+        let mut below = Buf { img: canvas.clone(), offset: o, scale: self.opts.scale };
+        // Effects run in the working space, not the linear blending space.
+        if let Some(c) = self.pipe.from_blend() {
+            color::convert(&mut below.img, &c);
+        }
+        let mut adjusted = self.apply_effects(ctx, layer, below, true);
+        // An effect that changed the frame (Motion Tile's Output size): back onto the canvas.
+        if let Some((dx, dy)) =
+            effectcraft_effects::adjustment_crop(adjusted.offset, o, (adjusted.img.width, adjusted.img.height), (canvas.width, canvas.height))
+        {
+            adjusted.img = adjusted.img.crop(dx, dy, canvas.width, canvas.height);
+        }
+        if let Some(c) = self.pipe.to_blend() {
+            color::convert(&mut adjusted.img, &c);
+        }
+        if adjusted.img.width != canvas.width || adjusted.img.height != canvas.height {
+            return;
+        }
+        canvas.data.par_iter_mut().zip(adjusted.img.data.par_iter()).zip(matte.data.par_iter()).for_each(|((c, a), m)| {
+            let k = m[3] * opacity;
+            for i in 0..4 {
+                c[i] += (a[i] - c[i]) * k;
+            }
+        });
+    }
+}
+
+/// A layer ready to composite (see [`Renderer::styled_layer`]).
+pub struct StyledLayer {
+    /// Exterior style passes (Drop Shadow, Outer Glow) with their blend modes.
+    pub passes: Vec<(Arc<Buf>, BlendMode)>,
+    pub body: Arc<Buf>,
+    /// Pre-style pixels (knockout shape).
+    pub content: Arc<Buf>,
+    /// Styled cache key (the content key when plain).
+    pub(crate) key: Option<u64>,
+    /// Content cache key.
+    ckey: Option<u64>,
+    /// No layer styles: composite `body` the usual way.
+    pub plain: bool,
+}
+
+/// Where a layer buffer lands (see [`Renderer::placement`]).
+#[derive(Clone, Debug)]
+pub struct Placement {
+    /// Buffer pixel → output pixel; several = motion-blur sub-samples (equal weights).
+    pub matrices: Vec<Mat3>,
+    pub sampling: effectcraft_raster::Sampling,
+    /// Dissolve noise seed.
+    pub seed: u32,
+}
+
+/// The part of `footprint` a warp actually changed (`drawn`, see [`composite_warp_changed`]):
+/// pixels it left alone are still quantised.
+fn narrow(footprint: Region, drawn: Option<[u32; 4]>) -> Region {
+    let Some([x0, y0, x1, y1]) = drawn else { return footprint };
+    if x0 >= x1 || y0 >= y1 {
+        return Region::Empty;
+    }
+    let r = color::PxRect { x0, y0, x1, y1 };
+    match footprint {
+        Region::Empty => Region::Empty,
+        Region::Full => Region::Rect(r),
+        Region::Rect(f) => {
+            let q = color::PxRect { x0: r.x0.max(f.x0), y0: r.y0.max(f.y0), x1: r.x1.min(f.x1), y1: r.y1.min(f.y1) };
+            if q.x0 >= q.x1 || q.y0 >= q.y1 { Region::Empty } else { Region::Rect(q) }
+        }
+    }
+}
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rs
index cfefd02db..0552a44d4 100644
--- a/crates/render/src/lib.rs
+++ b/crates/render/src/lib.rs
@@ -32,556 +32,34 @@ use effectcraft_effects::{Buf, EffectCtx, EffectEnv, EffectHost, LayerPixels, Pa
 use effectcraft_geom::{Mat3, Mat4, vec2};
 use effectcraft_project::{Comp, Footage, FootageKind, FrameBlend, GroupKind, ItemId, ItemKind, Layer, LayerSource, MatteKind, Project, Quality, Sampling};
 pub use effectcraft_raster::Image;
-use effectcraft_raster::{WarpOpts, composite_warp};
+use effectcraft_raster::{WarpOpts, composite_warp_changed};
 use effectcraft_time::{FrameRate, TICKS_PER_SECOND, Tick};
 pub use eval::{EvalCtx, ExprHost, effect_bounds, source_size};
 use rayon::prelude::*;
 
-/// How a [`FootageSource`] hands over float footage (OpenEXR, float TIFF), whose values are
-/// linear light: encoded with a curve, as the compositor takes footage, or as stored. Other
-/// footage is decoded the same way whatever it says. Interpret Footage ▸ Preserve RGB always
-/// reads the values as stored.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
-pub enum FloatCurve {
-    /// The sRGB curve (managed projects, and Working Gamma 2.2).
-    #[default]
-    Srgb,
-    /// A pure 2.4 power curve (no working space, Working Gamma 2.4).
-    Gamma24,
-    /// The linear values as stored (Interpret As Linear Light encodes them afterwards).
-    Linear,
-}
+mod accel;
+mod footage;
+mod frames;
+mod fx_host;
+mod layers;
+mod opts;
+mod pipeline;
 
-/// Supplies decoded footage frames (implemented by the media layer).
-pub trait FootageSource: Send + Sync {
-    /// The frame of `item` at source time `t`, straight from the file (any size).
-    fn frame(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<Image>>;
-    /// [`FootageSource::frame`] for a render that shows it at `width` × `height`, at most half its
-    /// size: either that frame or, when the source can make it more cheaply than the whole frame
-    /// (movies, see `effectcraft-media`), the frame already resampled to that size as
-    /// [`effectcraft_raster::resample`] would.
-    fn frame_at_size(&self, item: ItemId, footage: &Footage, t: Tick, _width: u32, _height: u32) -> Option<Arc<Image>> {
-        self.frame(item, footage, t)
-    }
-    /// [`FootageSource::frame`] (`size: None`) or [`FootageSource::frame_at_size`] with float
-    /// footage handed over as `float` says ([`FootageSource::frame`] uses [`FloatCurve::Srgb`]).
-    /// Sources without float footage can leave the default, which ignores `float`.
-    fn frame_with(&self, item: ItemId, footage: &Footage, t: Tick, size: Option<(u32, u32)>, float: FloatCurve) -> Option<Arc<Image>> {
-        let _ = float;
-        match size {
-            Some((w, h)) => self.frame_at_size(item, footage, t, w, h),
-            None => self.frame(item, footage, t),
-        }
-    }
-    /// `frames` interleaved stereo sample frames of `item`'s audio from source time `t` at
-    /// `rate` Hz (`None` when unavailable). The first sample is `t.to_units_floor(rate)`;
-    /// a sample boundary uses the earliest representable tick that selects that sample.
-    fn audio(&self, _item: ItemId, _footage: &Footage, _t: Tick, _frames: usize, _rate: u32) -> Option<Vec<f32>> {
-        None
-    }
-    /// Auxiliary 3D channels of `item` at source time `t` (multi-layer OpenEXR: depth, IDs,
-    /// Cryptomatte, any named channel), with `scale` relative to the file's pixels. `None` when
-    /// the footage has none.
-    fn aux(&self, _item: ItemId, _footage: &Footage, _t: Tick) -> Option<Arc<effectcraft_raster::AuxChannels>> {
-        None
-    }
-    /// The parsed 3D model of a [`effectcraft_project::FootageKind::Model`] item (Advanced 3D).
-    fn model(&self, _item: ItemId, _footage: &Footage) -> Option<Arc<effectcraft_model::Model>> {
-        None
-    }
-    /// Set the decoded-frame cache budget in bytes (Settings ▸ Memory & CPU); sources without
-    /// a cache ignore it.
-    fn set_cache_budget(&self, _bytes: usize) {}
-    /// Drop the decoded frames it keeps (Edit ▸ Purge ▸ All Memory / Image Cache Memory): the
-    /// next reads decode again. Sources without a cache ignore it.
-    fn purge(&self) {}
-    /// The file at `path` changed on disk (Reload Footage): drop what it keeps of it (decoded
-    /// frames, open decoders, parsed models), so the next reads see the new contents. Sources
-    /// without a cache ignore it.
-    fn forget(&self, _path: &str) {}
-    /// Settings ▸ Disk ▸ Conformed Audio Folder: where decoded audio is kept between reads
-    /// (`None` = off); sources that don't decode audio ignore it.
-    fn set_conform_folder(&self, _folder: Option<std::path::PathBuf>) {}
-    /// The decoded-frame cache budget in bytes, if the source has a cache.
-    fn cache_budget(&self) -> Option<usize> {
-        None
-    }
-    /// Vector footage (SVG) rasterised at `scale` × its pixel size, for Continuously Rasterize.
-    /// `None` when the footage is not vector or cannot be read.
-    fn vector_frame(&self, _item: ItemId, _footage: &Footage, _scale: f64) -> Option<Arc<Image>> {
-        None
-    }
-    /// Run `f`, which reads frames from this source, as work that can be called off: once
-    /// `cancel` is set, long decodes it starts (a movie seeking back to a keyframe and decoding
-    /// forward) stop early and their frames come back `None`. Sources that can't stop a decode
-    /// just run `f`. See [`CancellableFootage`].
-    fn cancellable(&self, _cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
-        f()
-    }
-    /// Reads through this source have been called off: frames may have come back `None` that
-    /// exist, so what was made from them must not be kept.
-    fn called_off(&self) -> bool {
-        false
-    }
-    /// Why `footage` shows no picture although its file is there: a read of it failed because
-    /// no decoder handles its codec, profile, chroma format or bit depth, or the stream is damaged
-    /// (e.g. "H.264 (High 4:2:2) isn't supported by the built-in decoder: ..."). `None` while it
-    /// decodes, and for sources that don't track failures. Stays set until the file is forgotten.
-    fn problem(&self, _footage: &Footage) -> Option<String> {
-        None
-    }
-}
-
-/// A render's view of a [`FootageSource`] whose frame reads can be called off with `cancel`
-/// (a viewer frame nobody waits for any more, #329). Every read goes through
-/// [`FootageSource::cancellable`] on its own, so reads made for this render on another thread
-/// (a parallel loop) answer to this render's flag, and reads for other renders never do.
-pub struct CancellableFootage<'a> {
-    pub inner: &'a dyn FootageSource,
-    pub cancel: Arc<AtomicBool>,
-}
-
-impl CancellableFootage<'_> {
-    fn read<R>(&self, f: impl FnOnce() -> Option<R>) -> Option<R> {
-        if self.cancel.load(Ordering::Relaxed) {
-            return None;
-        }
-        let (mut f, mut out) = (Some(f), None);
-        self.inner.cancellable(&self.cancel, &mut || out = f.take().and_then(|f| f()));
-        out
-    }
-}
-
-impl FootageSource for CancellableFootage<'_> {
-    fn frame(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<Image>> {
-        self.read(|| self.inner.frame(item, footage, t))
-    }
-    fn frame_at_size(&self, item: ItemId, footage: &Footage, t: Tick, width: u32, height: u32) -> Option<Arc<Image>> {
-        self.read(|| self.inner.frame_at_size(item, footage, t, width, height))
-    }
-    fn audio(&self, item: ItemId, footage: &Footage, t: Tick, frames: usize, rate: u32) -> Option<Vec<f32>> {
-        self.inner.audio(item, footage, t, frames, rate)
-    }
-    fn aux(&self, item: ItemId, footage: &Footage, t: Tick) -> Option<Arc<effectcraft_raster::AuxChannels>> {
-        self.inner.aux(item, footage, t)
-    }
-    fn model(&self, item: ItemId, footage: &Footage) -> Option<Arc<effectcraft_model::Model>> {
-        self.inner.model(item, footage)
-    }
-    fn set_cache_budget(&self, bytes: usize) {
-        self.inner.set_cache_budget(bytes)
-    }
-    fn purge(&self) {
-        self.inner.purge()
-    }
-    fn forget(&self, path: &str) {
-        self.inner.forget(path)
-    }
-    fn set_conform_folder(&self, folder: Option<std::path::PathBuf>) {
-        self.inner.set_conform_folder(folder)
-    }
-    fn cache_budget(&self) -> Option<usize> {
-        self.inner.cache_budget()
-    }
-    fn vector_frame(&self, item: ItemId, footage: &Footage, scale: f64) -> Option<Arc<Image>> {
-        self.inner.vector_frame(item, footage, scale)
-    }
-    fn cancellable(&self, cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
-        self.inner.cancellable(cancel, f)
-    }
-    fn called_off(&self) -> bool {
-        self.cancel.load(Ordering::Relaxed) || self.inner.called_off()
-    }
-    fn problem(&self, footage: &Footage) -> Option<String> {
-        self.inner.problem(footage)
-    }
-    fn frame_with(&self, item: ItemId, footage: &Footage, t: Tick, size: Option<(u32, u32)>, float: FloatCurve) -> Option<Arc<Image>> {
-        self.read(|| self.inner.frame_with(item, footage, t, size, float))
-    }
-}
-
-/// Footage that can be rasterised at any scale (SVG).
-pub fn is_vector_footage(f: &Footage) -> bool {
-    matches!(f.codec.as_str(), "SVG" | "PDF" | "AI" | "EPS")
-}
-
-/// Layer parameters and audio for effects (see [`effectcraft_effects::EffectHost`]). What it
-/// hands out is in effect space (see [`effect_bounds`]): the other layer's for its pixels, the
-/// running layer's for its own frames and the comp scene.
-struct FxHost<'r, 'a, 'c> {
-    r: &'r Renderer<'a>,
-    ctx: &'c EvalCtx<'a>,
-    layer: &'c Layer,
-    /// Where the stack's effect space starts in layer coordinates (zero on adjustment layers,
-    /// whose effects run on the comp below).
-    origin: [f64; 2],
-    /// Index of the effect being rendered (bounds `self_at` to effects before it).
-    index: usize,
-    original: Option<&'c Buf>,
-}
-
-impl FxHost<'_, '_, '_> {
-    /// Another layer's pixels for a layer parameter, in its effect space; `layer_space`: `buf`
-    /// is still in layer space (its source or its content).
-    fn pixels(&self, other: &Layer, mut buf: Buf, layer_space: bool) -> LayerPixels {
-        let (size, origin) = self.ctx.effect_bounds(other);
-        if layer_space {
-            buf.rebase(origin);
-        }
-        LayerPixels { buf, size }
-    }
-}
-
-/// The comp's camera and first light relative to `layer`, in its layer pixels (see
-/// [`EffectHost::comp_scene`]): the comp camera's view of the layer (as if 3D at its transform),
-/// brought back into the layer's own pixel grid through the inverse of how the layer itself
-/// composites.
-pub(crate) fn comp_scene(ctx: &EvalCtx, layer: &Layer) -> Option<effectcraft_effects::CompScene> {
-    let world = ctx.world_matrix(layer);
-    let (cam, _, _) = ctx.camera();
-    let p = (cam * world).0;
-    let back = ctx.layer_to_comp(layer).0.inverse()?.0;
-    let rows = [p[0], p[1], p[3]];
-    let camera: [[f64; 4]; 3] = std::array::from_fn(|i| std::array::from_fn(|j| (0..3).map(|k| back[i][k] * rows[k][j]).sum()));
-    let inv = world.inverse();
-    let light = three_d::light::lights_at(ctx).first().and_then(|l| {
-        let inv = inv.as_ref()?;
-        let pos = inv.apply(l.pos);
-        let dir = inv.apply_vec(l.dir);
-        let len = (dir.x * dir.x + dir.y * dir.y + dir.z * dir.z).sqrt().max(1e-12);
-        let kind = match l.kind {
-            effectcraft_project::LightKind::Parallel => 0,
-            effectcraft_project::LightKind::Ambient => 2,
-            _ => 1,
-        };
-        Some(effectcraft_effects::CompLight { pos: [pos.x, pos.y, pos.z], dir: [dir.x / len, dir.y / len, dir.z / len], color: l.color, kind })
-    });
-    let camera_layer = ctx.comp.active_camera(ctx.time).is_some();
-    Some(effectcraft_effects::CompScene { camera: Some(camera), camera_layer, light })
-}
-
-/// Nesting limit for effects that render layers (other layers, other times).
-const MAX_FX_DEPTH: usize = 8;
-
-impl EffectHost for FxHost<'_, '_, '_> {
-    fn original(&self) -> Option<&Buf> {
-        self.original
-    }
-
-    fn particles(&self) -> Option<&dyn effectcraft_effects::psim::ParticleSim> {
-        self.r.active_accel().and_then(|a| a.particles())
-    }
-    fn layer(&self, id: u64, masks_and_effects: bool) -> Option<LayerPixels> {
-        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
-        if (other.id == self.layer.id && masks_and_effects) || self.r.depth > MAX_FX_DEPTH {
-            return None;
-        }
-        let sub = self.r.nested();
-        // The cached layer buffer is shared; effects get their own copy.
-        let buf = if masks_and_effects { (*sub.content_buf(self.ctx, other)?).clone() } else { sub.source(self.ctx, other)? };
-        Some(self.pixels(other, buf, true))
-    }
-
-    fn layer_masks(&self, id: u64) -> Option<LayerPixels> {
-        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
-        if self.r.depth > MAX_FX_DEPTH {
-            return None;
-        }
-        let sub = self.r.nested();
-        let buf = (*sub.layer_input(self.ctx, other, 0)?).clone();
-        Some(self.pixels(other, buf, false))
-    }
-
-    fn audio(&self, id: u64, start: f64, frames: usize, rate: u32) -> Option<Vec<f32>> {
-        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
-        let LayerSource::Footage { item } = &other.source else { return None };
-        let ItemKind::Footage(f) = &self.r.project.item(*item)?.kind else { return None };
-        if !f.has_audio {
-            return None;
-        }
-        let st = other.layer_time(Tick::from_seconds_f64(start));
-        self.r.footage.audio(*item, f, st, frames, rate)
-    }
-
-    fn self_at(&self, layer_time: f64, effects: usize) -> Option<Buf> {
-        if self.r.depth > MAX_FX_DEPTH || self.layer.switches.adjustment {
-            return None;
-        }
-        let n = effects.min(self.index);
-        let t = self.layer.comp_time(Tick::from_seconds_f64(layer_time));
-        let sub = self.r.nested();
-        sub.layer_input(&self.ctx.at(t), self.layer, n).map(|b| (*b).clone())
-    }
-
-    fn aux(&self) -> Option<Arc<effectcraft_raster::AuxChannels>> {
-        match &self.layer.source {
-            LayerSource::Footage { item } => {
-                let ItemKind::Footage(f) = &self.r.project.item(*item)?.kind else { return None };
-                let a = self.r.footage.aux(*item, f, self.ctx.source_time(self.layer))?;
-                // Aux pixels per layer pixel (the layer is the footage at its nominal size).
-                if f.width > 0 && a.width > 0 {
-                    let mut a = (*a).clone();
-                    a.scale = a.width as f64 / f.width as f64;
-                    return Some(Arc::new(a));
-                }
-                Some(a)
-            }
-            LayerSource::Comp { item } => {
-                if self.r.depth > MAX_FX_DEPTH || self.r.project.comp_contains(*item, self.ctx.comp_id) {
-                    return None;
-                }
-                self.r.nested().comp_aux(*item, self.ctx.nested_time(self.layer)).map(Arc::new)
-            }
-            _ => None,
-        }
-    }
-
-    fn params_at(&self, layer_time: f64) -> Option<Params> {
-        let g = self.layer.effects()?.groups().nth(self.index)?;
-        let ctx = self.ctx.at(self.layer.comp_time(Tick::from_seconds_f64(layer_time)));
-        Some(effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(self.layer, pr)))
-    }
-
-    fn comp_scene(&self) -> Option<effectcraft_effects::CompScene> {
-        Some(comp_scene(self.ctx, self.layer)?.rebased(self.origin))
-    }
-
-    fn layer_at(&self, id: u64, comp_time: f64, masks_and_effects: bool) -> Option<LayerPixels> {
-        let other = self.ctx.layer(effectcraft_project::LayerId(id))?;
-        if (other.id == self.layer.id && masks_and_effects) || !comp_time.is_finite() || self.r.depth > MAX_FX_DEPTH {
-            return None;
-        }
-        let ctx = self.ctx.at(Tick::from_seconds_f64(comp_time));
-        let sub = self.r.nested();
-        Some(if masks_and_effects {
-            self.pixels(other, (*sub.content_buf(&ctx, other)?).clone(), true)
-        } else if other.id == self.layer.id {
-            self.pixels(other, sub.source(&ctx, other)?, true)
-        } else {
-            // Preserve other-layer reads: time effects historically see source + masks.
-            self.pixels(other, (*sub.layer_input(&ctx, other, 0)?).clone(), false)
-        })
-    }
-}
-
-/// The Essential Properties overrides of a precomp layer, evaluated at the context time.
-pub fn essential_overrides(ctx: &EvalCtx, layer: &Layer) -> Vec<effectcraft_project::essential::Override> {
-    use effectcraft_project::essential;
-    let over = essential::overridden(layer);
-    let Some(g) = essential::group(layer).filter(|_| !over.is_empty()) else { return vec![] };
-    let mut out = vec![];
-    g.walk("", &mut |_, p| {
-        if over.contains(&p.uid)
-            && let Some(control) = essential::control_of(&p.match_id)
-        {
-            out.push(essential::Override { control, value: ctx.value(layer, p) });
-        }
-    });
-    out
-}
-
-/// No footage available (renders footage layers as transparent).
-pub struct NoFootage;
-impl FootageSource for NoFootage {
-    fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
-        None
-    }
-}
-
-/// Which compositor renders a frame (Project Settings ▸ Video Rendering and Effects).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum Backend {
-    /// The CPU reference compositor (Mercury Software Only).
-    #[default]
-    Cpu,
-    /// The GPU compositor whenever an [`Accelerator`] is attached, whatever the project says.
-    Gpu,
-    /// The GPU compositor when an [`Accelerator`] is attached and the project's renderer is
-    /// Mercury GPU Acceleration (the viewer's choice); the CPU otherwise.
-    Auto,
-}
-
-impl Backend {
-    pub fn parse(s: &str) -> Option<Backend> {
-        match s.to_ascii_lowercase().as_str() {
-            "cpu" | "software" | "mercury software only" => Some(Backend::Cpu),
-            "gpu" | "mercury gpu acceleration" => Some(Backend::Gpu),
-            "auto" => Some(Backend::Auto),
-            _ => None,
-        }
-    }
-}
-
-/// One effect of a GPU effect chain (see [`Accelerator::effects`]).
-pub struct FxStep<'x> {
-    pub spec: &'static effectcraft_effects::EffectSpec,
-    pub ctx: EffectCtx<'x>,
-}
-
-/// A GPU (or other hardware) backend for the compositor. The CPU [`Renderer`] stays the
-/// reference: an accelerator renders what it supports and returns `None` for the rest, which
-/// then runs on the CPU. Implemented by `effectcraft-gpu`.
-pub trait Accelerator: Send + Sync {
-    /// Adapter / backend name for status readouts ("Apple M2 (Metal)").
-    fn name(&self) -> String;
-    /// Render a top-level comp frame (what [`Renderer::comp_frame`] returns). `None` = not
-    /// handled (the CPU renders it).
-    fn comp_frame(&self, r: &Renderer, comp: ItemId, t: Tick) -> Option<Image>;
-    /// The accelerator implements effect `id` with the CPU effect's semantics.
-    fn supports_effect(&self, id: &str) -> bool;
-    /// Run a chain of supported effects on `buf`, clamping and quantising to `levels` after
-    /// every effect when set (8/16 bpc). `None` = not handled.
-    fn effects(&self, chain: &[FxStep], buf: &Buf, levels: Option<f32>) -> Option<Buf>;
-    /// Rasterise and shade an Advanced 3D scene at its raster size (depth buffer, PBR, image
-    /// based light, shadow maps), with the CPU rasteriser's semantics
-    /// ([`three_d::adv::raster::render`]). `None` = not handled (the CPU renders it).
-    fn raster_3d(&self, _scene: &three_d::adv::Scene) -> Option<three_d::adv::Target> {
-        None
-    }
-    /// Render a whole prepared Advanced 3D run (every motion-blur sub-sample rasterised and
-    /// resolved, averaged, depth of field, encoding) with [`three_d::adv::render_prepared`]'s
-    /// semantics. `None` = not handled (the CPU path runs, using [`Self::raster_3d`]).
-    fn render_3d(&self, _run: &three_d::adv::Prepared) -> Option<three_d::adv::Rendered> {
-        None
-    }
-    /// A particle simulation backend (GPU particles) for the stepped particle effects, with
-    /// the CPU simulation's semantics. `None` = they simulate on the CPU.
-    fn particles(&self) -> Option<&dyn effectcraft_effects::psim::ParticleSim> {
-        None
-    }
-    /// Timing history [`Backend::Auto`] uses to send each comp's top-level frames to the
-    /// faster compositor. `None` = Auto always tries the accelerator first.
-    fn auto_pick(&self) -> Option<&AutoPick> {
-        None
-    }
-    /// Whether the accelerator can still render frames. `false` once it has stopped for good
-    /// (its device was lost or retired): every frame it is asked for falls back to the CPU, so
-    /// callers that limit frames in flight for it can stop doing so.
-    fn available(&self) -> bool {
-        true
-    }
-    /// Deferred readbacks: where a GPU readback cannot be waited for (WebGPU in a browser
-    /// worker), a frame renders in *passes*. A readback the accelerator does not have yet is
-    /// started, the step returns a cheap placeholder and the pass is marked missed
-    /// ([`Self::pass_missed`]); the caller waits for the readbacks in flight (asynchronously)
-    /// and renders the frame again, and the steps whose results arrived are served from them.
-    /// The frame is done after a pass with no miss. `frame_begin` forgets the previous frame's
-    /// results, `pass_begin` clears the miss. Synchronous accelerators never miss.
-    fn frame_begin(&self) {}
-    fn pass_begin(&self) {}
-    fn pass_missed(&self) -> bool {
-        false
-    }
-    /// Raised from a pass's first miss to its end (results computed meanwhile may hold
-    /// placeholders): give it to [`LayerCache::set_gate`] so they are not cached.
-    fn miss_gate(&self) -> Option<Arc<std::sync::atomic::AtomicBool>> {
-        None
-    }
-    /// With deferred readbacks: a future that resolves once the readbacks in flight have
-    /// landed (the browser delivers them from its event loop; natively the device is polled
-    /// before it returns, so the future is ready). `None` = nothing to wait for. See
-    /// [`passes::in_passes`].
-    fn settle(&self) -> Option<std::pin::Pin<Box<dyn std::future::Future<Output = ()> + '_>>> {
-        None
-    }
-}
-
-/// Where an effect stack runs (see [`Renderer::run_effects_on`]): a CPU buffer, or an image
-/// resident on an accelerator.
-pub trait FxTarget {
-    /// Run a chain of accelerator-supported effects (quantising after each to the bit depth).
-    /// `false` = not handled: the effects then run one by one through [`FxTarget::cpu`].
-    fn gpu(&mut self, steps: &[FxStep]) -> bool;
-    /// Run one CPU effect: `f` maps the buffer.
-    fn cpu(&mut self, f: &mut dyn FnMut(Buf) -> Buf);
-    /// Grow the buffer to cover its whole layer rectangle (`size` layer pixels from its own
-    /// corner, the `layer_size` handed to effects), as [`effectcraft_effects::Buf::cover`].
-    /// Authored buffers (text, shapes) only span their painted content; this gives the stack
-    /// the room a sized source's buffer already has (#659).
-    fn cover(&mut self, size: [f64; 2]) {
-        self.cpu(&mut |mut buf| {
-            buf.cover(size);
-            buf
-        });
-    }
-}
-
-/// The CPU effect target (GPU chains go through [`Accelerator::effects`]: upload, readback).
-struct CpuFx<'a> {
-    accel: Option<&'a dyn Accelerator>,
-    levels: Option<f32>,
-    buf: Option<Buf>,
-}
-
-impl FxTarget for CpuFx<'_> {
-    fn gpu(&mut self, steps: &[FxStep]) -> bool {
-        let (Some(a), Some(b)) = (self.accel, &self.buf) else { return false };
-        match a.effects(steps, b, self.levels) {
-            Some(out) => {
-                self.buf = Some(out);
-                true
-            }
-            None => false,
-        }
-    }
-    fn cpu(&mut self, f: &mut dyn FnMut(Buf) -> Buf) {
-        if let Some(b) = self.buf.take() {
-            self.buf = Some(f(b));
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, serde::Serialize, serde::Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct RenderOpts {
-    /// Output scale relative to comp pixels (1 = Full, 0.5 = Half…).
-    pub scale: f64,
-    pub motion_blur: bool,
-    /// Render guide layers (viewer only).
-    pub guides: bool,
-    /// Draft quality: fewer motion-blur samples, bilinear only.
-    pub draft: bool,
-    /// 3D view camera override (viewer Front/Top/Custom views); None = the comp's active camera.
-    pub view: Option<three_d::CameraState>,
-    /// CPU or GPU compositor (the GPU needs [`Renderer::accel`]).
-    pub backend: Backend,
-    /// Region of interest `[x, y, w, h]` in comp pixels (viewer only): the top-level frame covers
-    /// just this rectangle, and only its pixels are composited.
-    pub roi: Option<[f64; 4]>,
-    /// Which proxies stand in for footage and compositions (Render Settings ▸ Proxy Use).
-    pub proxy: effectcraft_project::render_queue::ProxyUse,
-    /// Switches Affect Nested Comps (Settings ▸ General): a precomp layer's Quality and Motion
-    /// Blur switches also limit the layers of the nested comp (Draft/Wireframe or motion blur off
-    /// propagate down; they never raise a nested layer's own setting).
-    pub nested_switches: bool,
-    /// Realtime Shadows in Draft (Settings ▸ 3D): draft renders (`draft`) still cast shadows.
-    pub draft_shadows: bool,
-}
-
-impl RenderOpts {
-    /// Whether 3D layers cast shadows in this render.
-    pub fn shadows(&self) -> bool {
-        !self.draft || self.draft_shadows
-    }
-}
-
-impl Default for RenderOpts {
-    fn default() -> Self {
-        RenderOpts {
-            scale: 1.0,
-            motion_blur: true,
-            guides: false,
-            draft: false,
-            view: None,
-            roi: None,
-            backend: Backend::Cpu,
-            nested_switches: true,
-            draft_shadows: true,
-            proxy: effectcraft_project::render_queue::ProxyUse::CurrentSettings,
-        }
-    }
-}
+pub use accel::{Accelerator, Backend, FxStep, FxTarget};
+pub use footage::{CancellableFootage, FloatCurve, FootageSource, NoFootage, is_vector_footage};
+pub use frames::{
+    adaptive_samples, blend_frames, content_bounds, extended_region, field_frame, frame_position, frame_size, interpret_pixels, kurbo_path, render_frame,
+    roi_inside,
+};
+#[cfg(test)]
+use fx_host::FxHost;
+use fx_host::MAX_FX_DEPTH;
+pub(crate) use fx_host::comp_scene;
+pub use fx_host::essential_overrides;
+pub use layers::{Placement, StyledLayer};
+pub(crate) use opts::Collapse3d;
+pub use opts::{LayerTiming, RenderOpts};
+use opts::{MAX_THROUGH, Through};
 
 pub struct Renderer<'a> {
     pub project: &'a Project,
@@ -620,1792 +98,5 @@ pub struct Renderer<'a> {
     through_lost: bool,
 }
 
-/// One collapsed precomp layer a nested comp is drawn through.
-#[derive(Clone, Copy)]
-struct Through<'a> {
-    comp_id: ItemId,
-    comp: &'a Comp,
-    /// The containing comp's time at this frame.
-    time: Tick,
-    layer: &'a Layer,
-    /// The precomp layer is motion blurred: its own motion blurs the nested layers.
-    blur: bool,
-}
-
-/// Collapsed precomps within collapsed precomps that motion blur follows (more than
-/// [`Renderer::collapsed`]'s nesting limit).
-const MAX_THROUGH: usize = 16;
-
-/// A motion-blur shutter: the comp's, or for a collapsed precomp's layers the outermost
-/// containing comp's (they are drawn into its frames).
-#[derive(Clone, Copy)]
-struct Shutter {
-    /// Shutter angle and phase as fractions of a frame.
-    angle: f64,
-    phase: f64,
-    /// Frame duration (seconds).
-    frame: f64,
-    /// Samples Per Frame and Adaptive Sample Limit.
-    samples: u32,
-    limit: u32,
-}
-
-impl Shutter {
-    /// Seconds from the frame time to sub-sample `i` of `n`, spread over the open shutter.
-    fn offset(&self, i: usize, n: usize) -> f64 {
-        let f = if n > 1 { i as f64 / (n - 1) as f64 } else { 0.0 };
-        (self.phase + self.angle * f) * self.frame
-    }
-}
-
-/// How a collapsed precomp's 3D layers are placed in the parent (see `Renderer::collapse_into`).
-#[derive(Clone, Copy)]
-pub(crate) struct Collapse3d<'a> {
-    /// Nested comp world → parent world (the precomp layer's world transform).
-    pub world: Mat4,
-    /// The parent's camera.
-    pub cam: three_d::CameraState,
-    /// The outermost comp's context (its lights light the nested layers).
-    pub parent: EvalCtx<'a>,
-}
-
-/// Time spent on one layer of one frame (milliseconds).
-#[derive(Clone, Debug, Default)]
-pub struct LayerTiming {
-    pub depth: usize,
-    pub layer: String,
-    /// Source + masks + effects (cache lookup only, on a hit).
-    pub process_ms: f64,
-    /// Per effect: (effect id, ms). Empty on a cache hit.
-    pub effects: Vec<(String, f64)>,
-    /// Transform + matte + blend.
-    pub composite_ms: f64,
-    /// The processed buffer came from the layer cache.
-    pub cached: bool,
-}
-
-impl<'a> Renderer<'a> {
-    pub fn new(project: &'a Project, footage: &'a dyn FootageSource, opts: RenderOpts) -> Renderer<'a> {
-        Renderer {
-            project,
-            footage,
-            expr: None,
-            opts,
-            cache: None,
-            profile: None,
-            accel: None,
-            depth: 0,
-            pipe: color::Pipe::of(&project.settings),
-            outer: None,
-            opacity_mul: 1.0,
-            collapse3d: None,
-            inherited: None,
-            defer_dof: false,
-            top: true,
-            through: [None; MAX_THROUGH],
-            through_lost: false,
-        }
-    }
-
-    /// The layer cache to keep this render's buffers in: none once its footage reads were
-    /// called off, as they may have come back empty ([`FootageSource::called_off`], #329).
-    fn cache_to_keep(&self) -> Option<&'a LayerCache> {
-        self.cache.filter(|_| !self.footage.called_off())
-    }
-
-    /// A layer's Quality switch, limited by the precomp layers above it when
-    /// [`RenderOpts::nested_switches`] is on.
-    pub fn quality(&self, layer: &Layer) -> Quality {
-        let rank = |q: Quality| match q {
-            Quality::Best => 0,
-            Quality::Draft => 1,
-            Quality::Wireframe => 2,
-        };
-        match self.inherited {
-            Some((q, _)) if rank(q) > rank(layer.switches.quality) => q,
-            _ => layer.switches.quality,
-        }
-    }
-
-    /// A layer's Motion Blur switch, limited by the precomp layers above it.
-    pub(crate) fn layer_motion_blur(&self, layer: &Layer) -> bool {
-        layer.switches.motion_blur && self.inherited.is_none_or(|(_, mb)| mb)
-    }
-
-    /// The renderer for the nested comp of precomp layer `layer`: its switches pass down when
-    /// [`RenderOpts::nested_switches`] is on.
-    fn nested_through(&self, layer: &Layer) -> Renderer<'a> {
-        let mut sub = self.nested();
-        if self.opts.nested_switches {
-            sub.inherited = Some((self.quality(layer), self.layer_motion_blur(layer)));
-        }
-        sub
-    }
-
-    /// A renderer for nested work (precomps, layers read by effects): one level deeper.
-    fn nested(&self) -> Renderer<'a> {
-        Renderer {
-            depth: self.depth + 1,
-            outer: None,
-            opacity_mul: 1.0,
-            collapse3d: None,
-            defer_dof: false,
-            top: false,
-            through: [None; MAX_THROUGH],
-            through_lost: false,
-            ..*self
-        }
-    }
-
-    /// A precomp layer's nested comp for an accelerator to render resident (no CPU render and
-    /// upload of the nested frame): the renderer one level down, the comp, its time and the
-    /// buffer scale, exactly as [`Self::layer_source`]'s comp branch would render it. `None`
-    /// when that branch does more (composition proxy, Essential Properties overrides, frame
-    /// blending, recursion) or draws nothing (outside the nested comp's span): use the CPU path.
-    pub fn precomp_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<(Renderer<'a>, ItemId, Tick, f64)> {
-        let LayerSource::Comp { item } = layer.source else { return None };
-        if layer.switches.adjustment || self.project.comp_contains(item, ctx.comp_id) {
-            return None;
-        }
-        let nc = self.project.comp(item)?;
-        let lt = ctx.nested_time(layer);
-        if self.content_times(ctx, layer).is_some() {
-            return None;
-        }
-        if !nc.covers(lt) || self.proxy_for(item).is_some() || !essential_overrides(ctx, layer).is_empty() || frame_blend_mode(ctx, layer) != FrameBlend::Off {
-            return None;
-        }
-        let s = self.opts.scale;
-        let bs = if s < 1.0 && nc.preserve_resolution { 1.0 } else { s };
-        let base = self.nested_through(layer);
-        Some((Renderer { opts: RenderOpts { scale: bs, ..base.opts }, ..base }, item, lt, bs))
-    }
-
-    /// The nested comp of a precomp layer whose transformations collapse into this comp: the
-    /// Collapse Transformations switch is on and the layer has no masks, effects or layer
-    /// styles (those force a flattened render of the precomp, as in After Effects).
-    pub fn collapsed(&self, ctx: &EvalCtx, layer: &Layer) -> Option<ItemId> {
-        if !layer.switches.collapse || layer.switches.adjustment || self.depth > 12 {
-            return None;
-        }
-        let LayerSource::Comp { item } = &layer.source else { return None };
-        if self.project.comp_contains(*item, ctx.comp_id) || self.project.comp(*item).is_none() {
-            return None;
-        }
-        if layer.masks().is_some_and(|m| !m.children.is_empty()) {
-            return None;
-        }
-        if layer.switches.effects && layer.effects().is_some_and(|fx| fx.groups().any(|g| g.enabled)) {
-            return None;
-        }
-        if styles::active(ctx, layer) {
-            return None;
-        }
-        // Instance overrides (Essential Properties) need the nested comp rendered on its own.
-        if !effectcraft_project::essential::overridden(layer).is_empty() {
-            return None;
-        }
-        Some(*item)
-    }
-
-    /// A renderer and context that draw a collapsed precomp's layers straight into this comp:
-    /// their transforms are concatenated with the precomp layer's (one resample, no
-    /// rasterisation at the precomp's bounds), their opacity multiplied by `opacity`, and their
-    /// 3D layers use this comp's camera and lights.
-    pub fn collapse_into(&self, ctx: &EvalCtx<'a>, layer: &'a Layer, item: ItemId, opacity: f32) -> Option<(Renderer<'a>, EvalCtx<'a>)> {
-        let nc = self.project.comp(item)?;
-        let t = ctx.nested_time(layer);
-        if !nc.covers(t) {
-            return None;
-        }
-        let nctx = EvalCtx { comp_id: item, comp: nc, time: t, ..*ctx };
-        let (l2c, _) = ctx.layer_to_comp(layer);
-        let outer = Some(self.outer.map_or(l2c, |o| o * l2c));
-        let world = ctx.world_matrix(layer);
-        let c3 = Collapse3d {
-            world: self.collapse3d.map_or(world, |c| c.world * world),
-            cam: three_d::compose::camera_for(self, ctx),
-            parent: self.collapse3d.map_or(*ctx, |c| c.parent),
-        };
-        // Motion blur follows the precomp layer's own motion too.
-        let link = Through { comp_id: ctx.comp_id, comp: ctx.comp, time: ctx.time, layer, blur: self.mb_on(ctx, layer) };
-        let mut through = self.through;
-        let slot = through.iter_mut().find(|t| t.is_none());
-        let through_lost = self.through_lost || slot.is_none();
-        if let Some(slot) = slot {
-            *slot = Some(link);
-        }
-        Some((Renderer { depth: self.depth + 1, outer, opacity_mul: opacity, collapse3d: Some(c3), through, through_lost, ..*self }, nctx))
-    }
-
-    pub(crate) fn opacity_mul(&self) -> f32 {
-        self.opacity_mul
-    }
-
-    /// Draw a collapsed 2D precomp layer: nested layers blend straight into `canvas` with their
-    /// own modes (Normal precomp, no matte); otherwise they are drawn into an isolated buffer
-    /// that then takes the precomp layer's track matte, Preserve Transparency and blend mode.
-    /// Returns the region left to re-quantise (nested layers drawn straight into `canvas`
-    /// quantise their own footprints).
-    fn draw_collapsed(&self, ctx: &EvalCtx<'a>, layer: &Layer, item: ItemId, canvas: &mut Image, blank: bool) -> Region {
-        let opacity = ctx.opacity(layer) as f32 * self.opacity_mul;
-        if opacity <= 0.0 {
-            return Region::Empty;
-        }
-        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
-        if layer.blend_mode == BlendMode::Normal && !matte && !layer.preserve_transparency {
-            if let Some((sub, nctx)) = self.collapse_into(ctx, layer, item, opacity) {
-                sub.draw_comp(&nctx, canvas, blank);
-            }
-            return Region::Empty;
-        }
-        let Some((sub, nctx)) = self.collapse_into(ctx, layer, item, 1.0) else { return Region::Empty };
-        let mut iso = Image::new(canvas.width, canvas.height);
-        sub.draw_comp(&nctx, &mut iso, true);
-        self.composite_iso(ctx, layer, iso, canvas, opacity);
-        Region::Full
-    }
-
-    /// Whether `layer`'s processed buffer (source → masks → effects) is cached and the same as
-    /// one frame earlier: drawing it from the layer cache (an accelerator uploads it once) beats
-    /// re-running its effects every frame.
-    pub fn layer_is_static(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
-        if self.cache.is_none() {
-            return false;
-        }
-        let (scale, draft, blur) = (self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer));
-        let prev = ctx.time - ctx.comp.frame_rate.frame_duration();
-        let now = cache::layer_key(ctx, layer, scale, draft, blur);
-        now.is_some() && now == cache::layer_key(&ctx.at(prev), layer, scale, draft, blur)
-    }
-
-    /// Rasterisation scale of a layer's source: the output scale, or — for text and shape layers,
-    /// which are always continuously rasterised (#390, #751), and Continuously Rasterize vector
-    /// footage — the output scale times the layer's on-screen scale (quarter-octave steps, rounded
-    /// up, so vector content is drawn at its final size and stays sharp when scaled up).
-    pub fn raster_scale(&self, ctx: &EvalCtx, layer: &Layer) -> f64 {
-        let s = self.opts.scale;
-        let continuous = match layer.source {
-            LayerSource::Text | LayerSource::Shape => true,
-            LayerSource::Footage { item } => {
-                layer.switches.collapse && matches!(self.project.item(item).map(|i| &i.kind), Some(ItemKind::Footage(f)) if is_vector_footage(f))
-            }
-            _ => false,
-        };
-        if !continuous {
-            return s;
-        }
-        let (l2c, _) = ctx.layer_to_comp(layer);
-        let m = self.outer.map_or(l2c, |o| o * l2c);
-        let a = layer.transform().map(|tr| ctx.v3(layer, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
-        let p0 = m.apply(vec2(a[0], a[1]));
-        let px = m.apply(vec2(a[0] + 1.0, a[1]));
-        let py = m.apply(vec2(a[0], a[1] + 1.0));
-        let k = ((px.x - p0.x).hypot(px.y - p0.y)).max((py.x - p0.x).hypot(py.y - p0.y));
-        if !k.is_finite() || k <= 1e-6 {
-            return s;
-        }
-        // The step is rounded up past rounding noise only: an unscaled layer whose position isn't
-        // a whole number maps the unit vectors to lengths a hair over 1, which must stay 1 (#390:
-        // rounded up to 2^¼, unscaled text was drawn larger and resampled, softer).
-        let mut k = 2f64.powf((k.log2() * 4.0 - 1e-6).ceil() / 4.0).clamp(1.0 / 16.0, 64.0);
-        // Keep the buffer within about 16 million pixels.
-        if let Some(b) = content_bounds(ctx, layer) {
-            let area = ((b[2] - b[0]) * (b[3] - b[1])).max(1.0) * s * s;
-            k = k.min((16.0e6 / area).sqrt().max(1.0));
-        }
-        s * k
-    }
-
-    /// Draw a Wireframe-quality layer: its bounds as a one-pixel outline.
-    fn draw_wireframe(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image) {
-        for (x, y) in self.wireframe_pixels(ctx, layer, (canvas.width, canvas.height)) {
-            canvas.set(x, y, [1.0, 1.0, 1.0, 1.0]);
-        }
-    }
-
-    fn ctx(&self, comp_id: ItemId, comp: &'a Comp, t: Tick) -> EvalCtx<'a> {
-        EvalCtx { project: self.project, comp_id, comp, time: t, expr: self.expr, footage: Some(self.footage) }
-    }
-
-    /// This renderer with another accelerator (or none): the passes of
-    /// [`passes::in_passes`] render with the accelerator, its CPU fallback without.
-    pub fn with_accel(&self, accel: Option<&'a dyn Accelerator>) -> Renderer<'a> {
-        Renderer { accel, ..*self }
-    }
-
-    /// The accelerator to use for this render, if any (see [`Backend`]).
-    pub fn active_accel(&self) -> Option<&'a dyn Accelerator> {
-        let a = self.accel?;
-        match self.opts.backend {
-            Backend::Cpu => None,
-            Backend::Gpu => Some(a),
-            Backend::Auto => self.project.settings.gpu_acceleration.then_some(a),
-        }
-    }
-
-    /// Render a composition at comp time `t` (transparent background, comp size × scale).
-    /// Top-level frames go to the GPU when [`Self::active_accel`] is set and handles them.
-    pub fn comp_frame(&self, comp_id: ItemId, t: Tick) -> Image {
-        // Classic 3D runs composite on the GPU too (M12.7), so Auto sends 3D comps there as well;
-        // Auto renders each comp on whichever compositor measured faster ([`AutoPick`]).
-        if self.depth == 0
-            && let Some(a) = self.active_accel()
-        {
-            let auto = self.frame_auto(a, comp_id, false);
-            if auto.is_none_or(|(p, key)| p.choose(key)) {
-                let t0 = web_time::Instant::now();
-                if let Some(img) = a.comp_frame(self, comp_id, t) {
-                    if let Some((p, key)) = auto {
-                        p.record(key, true, t0.elapsed().as_secs_f64() * 1e3);
-                    }
-                    return img;
-                }
-                if let Some((p, key)) = auto {
-                    p.declined(key);
-                }
-            }
-            let t0 = web_time::Instant::now();
-            let img = self.comp_frame_cpu(comp_id, t);
-            if let Some((p, key)) = auto {
-                p.record(key, false, t0.elapsed().as_secs_f64() * 1e3);
-            }
-            return img;
-        }
-        self.comp_frame_cpu(comp_id, t)
-    }
-
-    /// The Auto timing history and key for a top-level frame of `comp` (`None` unless the
-    /// backend is [`Backend::Auto`] and the accelerator keeps history).
-    pub fn frame_auto(&self, a: &'a dyn Accelerator, comp: ItemId, display: bool) -> Option<(&'a AutoPick, AutoKey)> {
-        if self.opts.backend != Backend::Auto || self.opts.roi.is_some() {
-            return None;
-        }
-        Some((a.auto_pick()?, AutoKey::new(comp, self.opts.scale, display)))
-    }
-
-    /// [`Self::comp_frame`] on the CPU compositor only.
-    pub fn comp_frame_cpu(&self, comp_id: ItemId, t: Tick) -> Image {
-        let Some(comp) = self.project.comp(comp_id) else { return Image::new(1, 1) };
-        let s = self.opts.scale;
-        let w = ((comp.width as f64 * s).round() as u32).max(1);
-        let h = ((comp.height as f64 * s).round() as u32).max(1);
-        // Region of interest on a comp with 3D layers: render the frame and crop it. A region
-        // reaching past the comp frame (the Extended Viewer) renders Classic 3D natively — the
-        // planes project through the offset camera — and Advanced 3D as the frame, padded.
-        if self.depth == 0
-            && let Some(r) = self.opts.roi
-            && comp.has_3d()
-            && (roi_inside(r, comp.width, comp.height) || comp.renderer == effectcraft_project::Renderer::Advanced3D)
-        {
-            let full = Renderer { opts: RenderOpts { roi: None, ..self.opts }, ..*self }.comp_frame(comp_id, t);
-            let (x0, y0) = ((r[0] * s).round() as i64, (r[1] * s).round() as i64);
-            let (rw, rh) = (((r[2] * s).round() as u32).max(1), ((r[3] * s).round() as u32).max(1));
-            let mut out = Image::new(rw, rh);
-            for y in 0..rh as i64 {
-                let sy = y + y0;
-                if sy < 0 || sy >= full.height as i64 {
-                    continue;
-                }
-                for x in 0..rw as i64 {
-                    let sx = x + x0;
-                    if sx >= 0 && sx < full.width as i64 {
-                        out.data[(y * rw as i64 + x) as usize] = full.data[(sy * full.width as i64 + sx) as usize];
-                    }
-                }
-            }
-            return out;
-        }
-        let (w, h) = match self.roi_offset() {
-            Some((_, _, rw, rh)) => (rw, rh),
-            None => (w, h),
-        };
-        let mut canvas = Image::new(w, h);
-        if self.depth > 16 {
-            return canvas;
-        }
-        let ctx = self.ctx(comp_id, comp, t);
-        self.draw_comp(&ctx, &mut canvas, true);
-        // The canvas is already quantised after every layer; only re-encoding changes it.
-        if let Some(c) = self.pipe.from_blend() {
-            color::convert(&mut canvas, &c);
-            self.pipe.quantize(&mut canvas);
-        }
-        // The top-level comp leaves the working space for the (sRGB) display / output.
-        if self.depth == 0
-            && let Some(c) = self.pipe.output()
-        {
-            color::convert(&mut canvas, &c);
-            self.pipe.quantize(&mut canvas);
-        }
-        if self.depth == 0
-            && let Some((lin, mode, enc)) = self.pipe.output_hdr()
-        {
-            color::output_hdr(&mut canvas, lin, mode, enc);
-            self.pipe.quantize(&mut canvas);
-        }
-        canvas
-    }
-
-    /// Draw a comp's layers (bottom to top) into `canvas` (blending space).
-    /// `blank`: the canvas is fully transparent (lets the first layer skip re-quantising).
-    fn draw_comp(&self, ctx: &EvalCtx<'a>, canvas: &mut Image, mut blank: bool) {
-        // Bottom-to-top, with runs of consecutive 3D layers depth-sorted (farthest first).
-        let visible = self.visible_layers(ctx);
-        let mut i = 0;
-        while i < visible.len() {
-            if visible[i].is_3d() {
-                let mut j = i;
-                while j < visible.len() && visible[j].is_3d() {
-                    j += 1;
-                }
-                three_d::compose::draw_run(self, ctx, &visible[i..j], canvas);
-                i = j;
-                self.pipe.quantize(canvas);
-                blank = false;
-            } else {
-                let changed = match self.collapsed(ctx, visible[i]) {
-                    Some(item) => self.draw_collapsed(ctx, visible[i], item, canvas, blank),
-                    None => self.draw_layer(ctx, visible[i], canvas, blank),
-                };
-                i += 1;
-                // 8/16 bpc: the comp is an integer buffer after every layer (only the pixels the
-                // layer touched need re-quantising).
-                self.pipe.quantize_region(canvas, changed);
-                blank = false;
-            }
-        }
-    }
-
-    /// Evaluate an effect instance's parameters.
-    fn effect_params(&self, ctx: &EvalCtx, layer: &Layer, g: &effectcraft_project::PropGroup) -> Params {
-        // Nested groups (Paint strokes, Puppet meshes and pins) are flattened too.
-        effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(layer, pr))
-    }
-
-    fn apply_effects(&self, ctx: &EvalCtx, layer: &Layer, buf: Buf, adjustment: bool) -> Buf {
-        self.apply_effects_timed(ctx, layer, buf, adjustment, usize::MAX, None)
-    }
-
-    /// Run the first `limit` effects of the layer's stack (by position; disabled ones count) on
-    /// `buf` (layer space, or the comp below for an adjustment layer).
-    fn apply_effects_timed(&self, ctx: &EvalCtx, layer: &Layer, mut buf: Buf, adjustment: bool, limit: usize, timing: Option<&mut Vec<(String, f64)>>) -> Buf {
-        // The comp below an adjustment layer is not in its layer space: it stays as it is.
-        let origin = if adjustment { [0.0; 2] } else { ctx.effect_bounds(layer).1 };
-        buf.rebase(origin);
-        let mut out = self.effect_space_stack(ctx, layer, buf, adjustment, limit, timing, origin);
-        out.rebase([-origin[0], -origin[1]]);
-        out
-    }
-
-    /// [`Renderer::apply_effects_timed`] on a buffer already in effect space (measured from
-    /// `origin`, in layer coordinates); the result stays in effect space.
-    #[allow(clippy::too_many_arguments)]
-    fn effect_space_stack(
-        &self,
-        ctx: &EvalCtx,
-        layer: &Layer,
-        buf: Buf,
-        adjustment: bool,
-        limit: usize,
-        timing: Option<&mut Vec<(String, f64)>>,
-        origin: [f64; 2],
-    ) -> Buf {
-        let mut t = CpuFx { accel: self.active_accel(), levels: self.pipe.levels, buf: Some(buf) };
-        self.run_effect_stack(ctx, layer, adjustment, limit, timing, origin, &mut t);
-        t.buf.unwrap_or_else(|| Buf { img: Image::new(1, 1), offset: [0.0; 2], scale: self.opts.scale })
-    }
-
-    /// Run the layer's video effect stack on `target` (in effect space, measured from `origin`
-    /// in layer coordinates): runs of GPU-capable effects go to [`FxTarget::gpu`] (when an
-    /// accelerator is active and supports them), the rest to [`FxTarget::cpu`] one by one
-    /// (quantised to the bit depth after each).
-    #[allow(clippy::too_many_arguments)]
-    fn run_effect_stack(
-        &self,
-        ctx: &EvalCtx,
-        layer: &Layer,
-        adjustment: bool,
-        limit: usize,
-        mut timing: Option<&mut Vec<(String, f64)>>,
-        origin: [f64; 2],
-        target: &mut dyn FxTarget,
-    ) {
-        if !layer.switches.effects {
-            return;
-        }
-        let Some(fx) = layer.effects() else { return };
-        let lt = layer.layer_time(ctx.time);
-        let layer_size = ctx.effect_bounds(layer).0;
-        // #659: an authored layer's buffer spans only its painted content while the stack works
-        // on the layer's whole region (`layer_size`): give the buffer the room a sized source
-        // already has, so tiling or displacement can place pixels outside the content instead
-        // of losing them at its edge. Only when something will actually run, and not for an
-        // adjustment layer, whose buffer is the comp below and already spans it.
-        if !adjustment
-            && fx.groups().any(|g| g.enabled && matches!(&g.kind, GroupKind::Effect { effect } if effectcraft_effects::find(effect).is_some_and(|s| !effectcraft_effects::audio_fx::is_audio_effect(s.id)))) {
-            target.cover(layer_size);
-        }
-        let mut mask_shapes = masks::shapes(ctx, layer);
-        if origin != [0.0; 2] {
-            for q in mask_shapes.iter_mut().flat_map(|m| m.points.iter_mut()) {
-                *q = [q[0] - origin[0], q[1] - origin[1]];
-            }
-        }
-        // Capture once, before preceding effects can expand or replace the input. An
-        // adjustment stack's original is the comp below, not its solid source.
-        let needs_original =
-            fx.groups().take(limit).any(|g| g.enabled && matches!(&g.kind, GroupKind::Effect { effect } if effect == "ec.channel.cccomposite"));
-        let mut original = None;
-        if needs_original {
-            target.cpu(&mut |buf| {
-                original = Some(buf.clone());
-                buf
-            });
-        }
-        let host = FxHost { r: self, ctx, layer, origin, index: 0, original: original.as_ref() };
-        let env = EffectEnv {
-            masks: &mask_shapes,
-            host: Some(&host),
-            comp_time: ctx.time.seconds(),
-            frame_rate: ctx.comp.frame_rate.as_f64(),
-            effect_index: 0,
-            working_space: self.pipe.space,
-            working_linear: self.pipe.linear,
-            shutter: self.mb_on(ctx, layer).then_some((ctx.comp.shutter_angle, ctx.comp.shutter_phase, ctx.comp.motion_blur_samples)),
-        };
-        // Video effects in stack order (index, group, spec); disabled and audio effects skipped.
-        let stack: Vec<(usize, &effectcraft_project::PropGroup, &'static effectcraft_effects::EffectSpec)> = fx
-            .groups()
-            .enumerate()
-            .take_while(|(i, _)| *i < limit)
-            .filter(|(_, g)| g.enabled)
-            .filter_map(|(i, g)| match &g.kind {
-                GroupKind::Effect { effect } => effectcraft_effects::find(effect).map(|s| (i, g, s)),
-                _ => None,
-            })
-            .filter(|(_, _, s)| !effectcraft_effects::audio_fx::is_audio_effect(s.id))
-            .collect();
-        let accel = self.active_accel();
-        let mut k = 0;
-        while k < stack.len() {
-            let (i, g, spec) = stack[k];
-            // A run of GPU effects goes to the accelerator in one go.
-            if let Some(a) = accel
-                && spec.gpu
-                && a.supports_effect(spec.id)
-            {
-                let run: Vec<_> = stack[k..].iter().take_while(|(_, _, s)| s.gpu && a.supports_effect(s.id)).collect();
-                let params: Vec<Params> = run.iter().map(|(_, g, _)| self.effect_params(ctx, layer, g)).collect();
-                let hosts: Vec<_> = run.iter().map(|(i, _, _)| FxHost { index: *i, ..host }).collect();
-                let steps: Vec<FxStep> = run
-                    .iter()
-                    .zip(&params)
-                    .zip(&hosts)
-                    .map(|(((i, g, s), params), host)| FxStep {
-                        spec: s,
-                        ctx: EffectCtx {
-                            params,
-                            time: lt.seconds(),
-                            layer_size,
-                            seed: g.uid as u32,
-                            adjustment,
-                            env: EffectEnv { host: Some(host), effect_index: *i, ..env },
-                        },
-                    })
-                    .collect();
-                let t0 = web_time::Instant::now();
-                if target.gpu(&steps) {
-                    if let Some(v) = timing.as_deref_mut() {
-                        let ms = t0.elapsed().as_secs_f64() * 1e3 / run.len() as f64;
-                        v.extend(run.iter().map(|(_, _, s)| (format!("{} (gpu)", s.id), ms)));
-                    }
-                    k += run.len();
-                    continue;
-                }
-            }
-            k += 1;
-            let params = self.effect_params(ctx, layer, g);
-            let host = FxHost { index: i, ..host };
-            let env = EffectEnv { host: Some(&host), effect_index: i, ..env };
-            let ectx = EffectCtx { params: &params, time: lt.seconds(), layer_size, seed: g.uid as u32, adjustment, env };
-            let t0 = web_time::Instant::now();
-            target.cpu(&mut |buf| {
-                let mut buf = effectcraft_effects::apply(spec, &ectx, buf);
-                // 8/16 bpc effects write integer pixels.
-                self.pipe.quantize(&mut buf.img);
-                buf
-            });
-            if let Some(v) = timing.as_deref_mut() {
-                v.push((spec.id.to_string(), t0.elapsed().as_secs_f64() * 1e3));
-            }
-        }
-    }
-
-    /// Source pixels of a layer in layer space (before masks/effects).
-    fn source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
-        let s = self.opts.scale;
-        match &layer.source {
-            LayerSource::Solid { item } => {
-                let ItemKind::Solid(sol) = &self.project.item(*item)?.kind else { return None };
-                let w = ((sol.width as f64 * s).ceil() as u32).max(1);
-                let h = ((sol.height as f64 * s).ceil() as u32).max(1);
-                if layer.switches.adjustment {
-                    return Some(Buf { img: Image::filled(w, h, [1.0; 4]), offset: [0.0; 2], scale: s });
-                }
-                let mut c = sol.color;
-                if let Some(conv) = self.pipe.authored_in() {
-                    c = conv.apply(c);
-                }
-                let px = self.pipe.quantize_px([c[0], c[1], c[2], 1.0]);
-                Some(Buf { img: Image::filled(w, h, px), offset: [0.0; 2], scale: s })
-            }
-            LayerSource::Comp { item } => {
-                if self.project.comp_contains(*item, ctx.comp_id) {
-                    return None;
-                }
-                // A composition proxy (a rendered still or movie) stands in for the comp.
-                // Nothing before the nested comp starts or after it ends.
-                let lt = ctx.nested_time(layer);
-                if !self.project.comp(*item).is_some_and(|nc| nc.covers(lt)) {
-                    return None;
-                }
-                if let Some(pf) = self.proxy_for(*item)
-                    && let Some(nc) = self.project.comp(*item)
-                {
-                    let img = self.footage.frame_with(*item, pf, lt, None, self.pipe.float_encoding())?;
-                    return Some(self.footage_buf(&img, pf, nc.width, nc.height));
-                }
-                // Essential Properties overrides render the nested comp with this instance's
-                // values.
-                let ov = essential_overrides(ctx, layer);
-                let tmp = if ov.is_empty() { None } else { effectcraft_project::essential::with_overrides(self.project, *item, &ov) };
-                // Preserve resolution when nested: drawn at full size even when this comp renders
-                // smaller (the buffer's scale places it).
-                let full = s < 1.0 && self.project.comp(*item).is_some_and(|nc| nc.preserve_resolution);
-                let bs = if full { 1.0 } else { s };
-                let base = self.nested_through(layer);
-                let base = Renderer { opts: RenderOpts { scale: bs, ..base.opts }, ..base };
-                let sub = match &tmp {
-                    Some(p) => Renderer { project: p, ..base },
-                    None => base,
-                };
-                // Frame blending between the nested comp's frames (time-stretched/remapped).
-                let mode = frame_blend_mode(ctx, layer);
-                if mode != FrameBlend::Off
-                    && let Some(nc) = self.project.comp(*item)
-                {
-                    let (i, w) = frame_position(lt, nc.frame_rate);
-                    if w > 1e-6 {
-                        let a = sub.comp_frame(*item, nc.frame_rate.tick_of(i));
-                        let b = sub.comp_frame(*item, nc.frame_rate.tick_of(i + 1));
-                        return Some(Buf { img: blend_frames(mode, &a, &b, w as f32), offset: [0.0; 2], scale: bs });
-                    }
-                }
-                Some(Buf { img: sub.comp_frame(*item, lt), offset: [0.0; 2], scale: bs })
-            }
-            LayerSource::Footage { item } => {
-                let it = self.project.item(*item)?;
-                let ItemKind::Footage(f) = &it.kind else { return None };
-                if !f.has_video {
-                    return None;
-                }
-                // Continuously rasterised vector footage: drawn at the on-screen scale.
-                if layer.switches.collapse && is_vector_footage(f) {
-                    let k = self.raster_scale(ctx, layer);
-                    if let Some(img) = self.footage.vector_frame(*item, f, k) {
-                        let mut buf = Buf { img: (*img).clone(), offset: [0.0; 2], scale: k };
-                        if let Some(c) = self.pipe.media_in(f) {
-                            color::convert(&mut buf.img, &c);
-                        }
-                        return Some(buf);
-                    }
-                }
-                let lt = ctx.source_time(layer);
-                // The proxy is decoded instead, at its own size, and fills the footage's frame.
-                let proxy = self.proxy_for(*item);
-                let pf = proxy.unwrap_or(f);
-                let size = self.reduced_size(f.width, f.height).filter(|_| proxy.is_none());
-                let img = self.footage_frame(ctx, layer, *item, pf, lt, size)?;
-                Some(self.footage_buf(&img, pf, f.width, f.height))
-            }
-            LayerSource::Text => Some(self.authored(text::render(ctx, layer, self.raster_scale(ctx, layer)))),
-            LayerSource::Shape => layer.props.sub("contents").map(|c| self.authored(shapes::render(ctx, layer, c, self.raster_scale(ctx, layer)))),
-            _ => None,
-        }
-    }
-
-    /// The proxy footage used for `item` under this render's Proxy Use, if any.
-    pub fn proxy_for(&self, item: ItemId) -> Option<&'a Footage> {
-        let it = self.project.item(item)?;
-        let px = it.proxy.as_deref()?;
-        (self.opts.proxy.uses(matches!(it.kind, ItemKind::Comp(_)), px.enabled) && px.footage.has_video).then_some(&px.footage)
-    }
-
-    /// A decoded frame of `f` as a layer buffer covering `w`×`h` layer pixels (the footage's
-    /// nominal size; proxies are scaled up to it), converted from its colour profile.
-    fn footage_buf(&self, img: &Image, f: &Footage, w: u32, h: u32) -> Buf {
-        let s = self.opts.scale;
-        let k = if img.width > 0 { w.max(1) as f64 / img.width as f64 } else { 1.0 };
-        // Keep native pixels when downsampling is small; resample otherwise.
-        let mut buf = match self.reduced_size(w, h) {
-            // The source resampled it already (`FootageSource::frame_at_size`).
-            Some(size) if (img.width, img.height) == size => Buf { img: img.clone(), offset: [0.0; 2], scale: s },
-            Some((rw, rh)) if k <= 1.0 + 1e-9 => Buf { img: effectcraft_raster::resample(img, rw, rh), offset: [0.0; 2], scale: s },
-            _ => Buf { img: img.clone(), offset: [0.0; 2], scale: 1.0 / k },
-        };
-        if let Some(c) = self.pipe.media_in(f) {
-            color::convert(&mut buf.img, &c);
-        }
-        buf
-    }
-
-    /// The size of `w` × `h` layer pixels in this render when it is reduced enough that footage
-    /// is resampled to it (below 3/4 scale).
-    fn reduced_size(&self, w: u32, h: u32) -> Option<(u32, u32)> {
-        let s = self.opts.scale;
-        (s < 0.75).then(|| (((w as f64 * s).round() as u32).max(1), ((h as f64 * s).round() as u32).max(1)))
-    }
-
-    /// Authored colours into the working space (linear working spaces).
-    fn authored(&self, mut buf: Buf) -> Buf {
-        if let Some(c) = self.pipe.authored_in() {
-            color::convert(&mut buf.img, &c);
-        }
-        buf
-    }
-
-    /// A footage frame at source time `t`, frame-blended between the two nearest source frames
-    /// when the layer's Frame Blending switch (and the comp's Enable Frame Blending) is on and
-    /// `t` falls between frames (footage rate ≠ comp rate, time stretch, time remapping).
-    /// `size`: a plain frame may come resampled to it ([`FootageSource::frame_at_size`]).
-    fn footage_frame(&self, ctx: &EvalCtx, layer: &Layer, item: ItemId, f: &Footage, t: Tick, size: Option<(u32, u32)>) -> Option<Arc<Image>> {
-        // Interpret Footage ▸ Separate Fields: each field is a frame at twice the rate.
-        if f.fields != effectcraft_project::FieldOrder::Off && matches!(f.kind, FootageKind::Video | FootageKind::Sequence) {
-            let field_rate = FrameRate::new(f.frame_rate.num * 2, f.frame_rate.den);
-            let i = field_rate.frame_at(t).max(0);
-            let img = self.footage.frame_with(item, f, f.frame_rate.tick_of(i / 2), None, self.pipe.float_curve(f))?;
-            let dominant_upper = f.fields == effectcraft_project::FieldOrder::UpperFirst;
-            // Upper field = even lines (0, 2, …).
-            let parity = if (i % 2 == 0) == dominant_upper { 0 } else { 1 };
-            return Some(Arc::new(interpret_pixels(&field_frame(&img, parity), f, self.pipe.linear_footage_space(f))));
-        }
-        // Interpretation is per pixel but not linear: it runs on the frame before resampling.
-        let size = size.filter(|_| !(f.invert_alpha || f.linear_light_applies()));
-        let img = self.footage_frame_raw(ctx, layer, item, f, t, size)?;
-        if f.invert_alpha || f.linear_light_applies() { Some(Arc::new(interpret_pixels(&img, f, self.pipe.linear_footage_space(f)))) } else { Some(img) }
-    }
-
-    fn footage_frame_raw(&self, ctx: &EvalCtx, layer: &Layer, item: ItemId, f: &Footage, t: Tick, size: Option<(u32, u32)>) -> Option<Arc<Image>> {
-        let mode = frame_blend_mode(ctx, layer);
-        let float = self.pipe.float_curve(f);
-        if mode != FrameBlend::Off && matches!(f.kind, FootageKind::Video | FootageKind::Sequence) {
-            let (i, w) = frame_position(t, f.frame_rate);
-            if w > 1e-6 {
-                // Blended frames are cached (Pixel Motion is expensive).
-                let key = self.cache.map(|_| {
-                    use std::hash::{Hash, Hasher};
-                    let mut h = std::collections::hash_map::DefaultHasher::new();
-                    (0x00f8_a3e5_u64, item, i, (w as f32).to_bits(), mode as u8, f.frame_rate.num, f.frame_rate.den, &f.path, float).hash(&mut h);
-                    h.finish()
-                });
-                if let (Some(c), Some(k)) = (self.cache, key)
-                    && let Some(b) = c.get(k)
-                {
-                    return Some(Arc::new(b.img.clone()));
-                }
-                let a = self.footage.frame_with(item, f, f.frame_rate.tick_of(i), None, float);
-                let b = self.footage.frame_with(item, f, f.frame_rate.tick_of(i + 1), None, float);
-                if let (Some(a), Some(b)) = (a, b) {
-                    let img = blend_frames(mode, &a, &b, w as f32);
-                    if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-                        c.insert(k, Arc::new(Buf { img: img.clone(), offset: [0.0; 2], scale: 1.0 }));
-                    }
-                    return Some(Arc::new(img));
-                }
-            }
-        }
-        self.footage.frame_with(item, f, t, size, float)
-    }
-
-    /// Source → masks, clamped/quantised to the project depth.
-    fn masked_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
-        let mut buf = match self.content_times(ctx, layer) {
-            Some(times) => self.blurred_source(ctx, layer, &times)?,
-            None => self.source(ctx, layer)?,
-        };
-        // A solid is filled with a quantised colour: only masks can take it off the grid.
-        let solid = matches!(layer.source, LayerSource::Solid { .. });
-        if masks::apply(ctx, layer, &mut buf, self.mask_blur(ctx, layer)) || !solid {
-            self.pipe.quantize(&mut buf.img);
-        }
-        Some(buf)
-    }
-
-    /// Fully processed layer buffer (source → masks → effects → layer styles, flattened).
-    /// Served from the layer cache when the layer's content key matches.
-    pub fn layer_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
-        self.layer_buf_keyed(ctx, layer).map(|(b, _)| b)
-    }
-
-    /// [`Self::layer_buf`] in the blending space (linear with Blend Colors Using 1.0 Gamma).
-    pub fn blend_layer_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
-        let (b, k) = self.layer_buf_keyed(ctx, layer)?;
-        Some(self.to_blend(b, k))
-    }
-
-    /// A buffer converted to the blending space (cached under a key derived from `key`).
-    pub(crate) fn to_blend(&self, b: Arc<Buf>, key: Option<u64>) -> Arc<Buf> {
-        let Some(c) = self.pipe.to_blend() else { return b };
-        let key = key.map(|k| cache::derive(k, 0x1ea7));
-        if let (Some(cache), Some(k)) = (self.cache, key)
-            && let Some(x) = cache.get(k)
-        {
-            return x;
-        }
-        let mut nb = (*b).clone();
-        color::convert(&mut nb.img, &c);
-        let nb = Arc::new(nb);
-        if let (Some(cache), Some(k)) = (self.cache_to_keep(), key) {
-            cache.insert(k, nb.clone());
-        }
-        nb
-    }
-
-    fn layer_buf_keyed(&self, ctx: &EvalCtx, layer: &Layer) -> Option<(Arc<Buf>, Option<u64>)> {
-        let st = self.styled(ctx, layer, None)?;
-        if st.passes.is_empty() {
-            return Some((st.body, st.key));
-        }
-        let key = st.key.map(|k| cache::derive(k, 0xf1a7));
-        if let (Some(c), Some(k)) = (self.cache, key)
-            && let Some(b) = c.get(k)
-        {
-            return Some((b, key));
-        }
-        let flat = Arc::new(styles::Styled { passes: st.passes.iter().map(|(b, m)| ((**b).clone(), *m)).collect(), body: (*st.body).clone() }.flatten());
-        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-            c.insert(k, flat.clone());
-        }
-        Some((flat, key))
-    }
-
-    /// A layer's source pixels at the context time, before masks, effects and the transform
-    /// (what the motion tracker analyses, like After Effects' Layer panel). `None` for layers
-    /// without pixels.
-    pub fn layer_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
-        self.source(ctx, layer)
-    }
-
-    /// Layer pixels after source → masks → effects (no layer styles).
-    pub fn content_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
-        self.content_buf_timed(ctx, layer, None).map(|(b, _)| b)
-    }
-
-    fn content_buf_timed(&self, ctx: &EvalCtx, layer: &Layer, mut timing: Option<&mut LayerTiming>) -> Option<(Arc<Buf>, Option<u64>)> {
-        let key = self.cache.and_then(|_| cache::layer_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer)));
-        let key = self.content_key(ctx, layer, key);
-        if let (Some(c), Some(k)) = (self.cache, key)
-            && let Some(b) = c.get(k)
-        {
-            if let Some(t) = timing.as_deref_mut() {
-                t.cached = true;
-            }
-            return Some((b, key));
-        }
-        let buf = self.masked_source(ctx, layer)?;
-        let buf = Arc::new(self.apply_effects_timed(ctx, layer, buf, false, usize::MAX, timing.map(|t| &mut t.effects)));
-        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-            c.insert(k, buf.clone());
-        }
-        Some((buf, key))
-    }
-
-    /// A layer's input at the context time: source → masks → its first `effects` effects
-    /// (what Time effects read at neighbouring times), in effect space (see [`effect_bounds`]):
-    /// what effect `effects` sees. Served from / stored in the layer cache under its own key,
-    /// so scrubbing reuses frames rendered for earlier output frames.
-    pub fn layer_input(&self, ctx: &EvalCtx, layer: &Layer, effects: usize) -> Option<Arc<Buf>> {
-        let key = self.cache.and_then(|_| cache::input_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer), effects));
-        let key = self.content_key(ctx, layer, key);
-        if let (Some(c), Some(k)) = (self.cache, key)
-            && let Some(b) = c.get(k)
-        {
-            return Some(b);
-        }
-        let mut buf = self.masked_source(ctx, layer)?;
-        let origin = ctx.effect_bounds(layer).1;
-        buf.rebase(origin);
-        if effects > 0 {
-            buf = self.effect_space_stack(ctx, layer, buf, false, effects, None, origin);
-        }
-        let buf = Arc::new(buf);
-        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-            c.insert(k, buf.clone());
-        }
-        Some(buf)
-    }
-
-    /// The layer with its styles: exterior passes and body (cached per pass).
-    fn styled(&self, ctx: &EvalCtx, layer: &Layer, mut timing: Option<&mut LayerTiming>) -> Option<StyledLayer> {
-        let (content, ckey) = self.content_buf_timed(ctx, layer, timing.as_deref_mut())?;
-        if !styles::active(ctx, layer) {
-            return Some(StyledLayer { passes: vec![], body: content.clone(), content, key: ckey, ckey, plain: true });
-        }
-        let modes = styles::pass_modes(ctx, layer);
-        let key = ckey.map(|k| cache::styles_key(ctx, layer, k));
-        if let (Some(c), Some(k)) = (self.cache, key)
-            && let Some(body) = c.get(k)
-        {
-            let passes: Option<Vec<_>> = modes.iter().enumerate().map(|(i, m)| c.get(cache::derive(k, i as u64 + 1)).map(|b| (b, *m))).collect();
-            if let Some(passes) = passes {
-                return Some(StyledLayer { passes, body, content, key, ckey, plain: false });
-            }
-        }
-        let t0 = web_time::Instant::now();
-        let size = source_size(self.project, layer);
-        let layer_size = if size.0 == 0 { [ctx.comp.width as f64, ctx.comp.height as f64] } else { [size.0 as f64, size.1 as f64] };
-        let st = styles::render(ctx, layer, &content, layer_size);
-        if let Some(t) = timing {
-            t.cached = false;
-            t.effects.push(("layerStyles".into(), t0.elapsed().as_secs_f64() * 1e3));
-        }
-        let body = Arc::new(st.body);
-        let passes: Vec<_> = st.passes.into_iter().map(|(b, m)| (Arc::new(b), m)).collect();
-        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-            c.insert(k, body.clone());
-            for (i, (b, _)) in passes.iter().enumerate() {
-                c.insert(cache::derive(k, i as u64 + 1), b.clone());
-            }
-        }
-        Some(StyledLayer { passes, body, content, key, ckey, plain: false })
-    }
-
-    /// The styled layer's buffers in the blending space.
-    fn styled_to_blend(&self, st: StyledLayer) -> StyledLayer {
-        if self.pipe.to_blend().is_none() {
-            return st;
-        }
-        let body = self.to_blend(st.body, st.key);
-        let content = if st.plain { body.clone() } else { self.to_blend(st.content, st.ckey) };
-        let passes = st.passes.into_iter().enumerate().map(|(i, (b, m))| (self.to_blend(b, st.key.map(|k| cache::derive(k, i as u64 + 1))), m)).collect();
-        StyledLayer { passes, body, content, ..st }
-    }
-
-    fn sampling(&self, layer: &Layer) -> effectcraft_raster::Sampling {
-        if self.quality(layer) == Quality::Draft {
-            // Draft quality: no interpolation (nearest neighbour), as After Effects' Draft.
-            effectcraft_raster::Sampling::Nearest
-        } else if self.opts.draft {
-            effectcraft_raster::Sampling::Bilinear
-        } else if layer.switches.sampling == Sampling::Bicubic {
-            effectcraft_raster::Sampling::Bicubic
-        } else {
-            effectcraft_raster::Sampling::Bilinear
-        }
-    }
-
-    /// The region of interest of a top-level 2D frame: (x, y) offset of the output in output
-    /// pixels and its size. `None` renders the whole comp (no ROI, or a nested comp).
-    pub(crate) fn roi_offset(&self) -> Option<(f64, f64, u32, u32)> {
-        let r = self.opts.roi.filter(|_| self.top)?;
-        let s = self.opts.scale;
-        if r[2] <= 0.0 || r[3] <= 0.0 {
-            return None;
-        }
-        Some(((r[0] * s).round(), (r[1] * s).round(), ((r[2] * s).round() as u32).max(1), ((r[3] * s).round() as u32).max(1)))
-    }
-
-    /// The region of interest's offset in output pixels for 3D projection (0 without one).
-    pub(crate) fn out_offset(&self) -> (f64, f64) {
-        self.roi_offset().map_or((0.0, 0.0), |(x, y, _, _)| (x, y))
-    }
-
-    /// Scaled comp pixel → output pixel: the region of interest's offset.
-    fn out_matrix(&self) -> Mat3 {
-        match self.roi_offset() {
-            Some((x, y, _, _)) => Mat3::translate(vec2(-x, -y)),
-            None => Mat3::IDENTITY,
-        }
-    }
-
-    /// Buffer pixel → output pixel matrix for the layer at the context time.
-    fn buf_matrix(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> Mat3 {
-        let (l2c, _) = ctx.layer_to_comp(layer);
-        self.place_matrix(self.outer.map_or(l2c, |o| o * l2c), buf)
-    }
-
-    /// Buffer pixel → output pixel matrix for a layer → (top-level) comp matrix.
-    fn place_matrix(&self, l2c: Mat3, buf: &Buf) -> Mat3 {
-        let s = self.opts.scale;
-        self.out_matrix()
-            * Mat3::scale(vec2(s, s))
-            * l2c
-            * Mat3::scale(vec2(1.0 / buf.scale, 1.0 / buf.scale))
-            * Mat3::translate(vec2(-buf.offset[0], -buf.offset[1]))
-    }
-
-    /// The collapsed precomp layers this comp is drawn through, outermost first.
-    fn links(&self) -> impl Iterator<Item = &Through<'a>> {
-        self.through.iter().map_while(Option::as_ref)
-    }
-
-    /// The shutter of a layer's motion blur: its comp's, or for a collapsed precomp's layers the
-    /// outermost containing comp's.
-    fn shutter(&self, ctx: &EvalCtx) -> Shutter {
-        let c: &Comp = match self.links().next() {
-            Some(l) => l.comp,
-            None => ctx.comp,
-        };
-        Shutter {
-            angle: c.shutter_angle / 360.0,
-            phase: c.shutter_phase / 360.0,
-            frame: c.frame_duration().seconds(),
-            samples: c.motion_blur_samples,
-            limit: c.motion_blur_adaptive_limit,
-        }
-    }
-
-    /// Whether a layer moves within the shutter: its own motion blur, or that of a collapsed
-    /// precomp layer it is drawn through.
-    fn blurred(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
-        self.mb_on(ctx, layer) || (!self.through_lost && self.links().any(|l| l.blur))
-    }
-
-    /// The collapsed precomps' matrix (nested comp → the frame's comp) and the nested comp's time
-    /// `dt` seconds into the outermost comp's shutter: each precomp layer moves if it is motion
-    /// blurred, and times map down through each one (stretch, time remapping).
-    fn outer_at(&self, ctx: &EvalCtx, dt: f64) -> (Option<Mat3>, Tick) {
-        let shift = Tick::from_seconds_f64(dt);
-        let mut outer: Option<Mat3> = None;
-        let mut t: Option<Tick> = None;
-        for l in self.links() {
-            let at = EvalCtx { comp_id: l.comp_id, comp: l.comp, time: t.unwrap_or(l.time + shift), ..*ctx };
-            let (m, _) = if l.blur { at.layer_to_comp(l.layer) } else { EvalCtx { time: l.time, ..at }.layer_to_comp(l.layer) };
-            outer = Some(outer.map_or(m, |o| o * m));
-            t = Some(at.nested_time(l.layer));
-        }
-        (outer, t.unwrap_or(ctx.time + shift))
-    }
-
-    /// [`Self::buf_matrix`] for the motion-blur sub-sample `dt` seconds into the shutter: the
-    /// layer moves if it is motion blurred, the collapsed precomps above it if theirs are.
-    fn buf_matrix_at(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, dt: f64) -> Mat3 {
-        if self.through_lost || self.links().next().is_none() {
-            return self.buf_matrix(&ctx.at(ctx.time + Tick::from_seconds_f64(dt)), layer, buf);
-        }
-        let (outer, t) = self.outer_at(ctx, dt);
-        let lctx = if self.mb_on(ctx, layer) { ctx.at(t) } else { *ctx };
-        let (l2c, _) = lctx.layer_to_comp(layer);
-        self.place_matrix(outer.map_or(l2c, |o| o * l2c), buf)
-    }
-
-    /// Shape and text content that animates within the shutter (paths, Trim Paths, text
-    /// animators…) of a motion-blurred layer: the times its source is drawn at and averaged,
-    /// Samples Per Frame of them, as After Effects does for shape layers. `None` when the content
-    /// holds still (compared through its cache key, which leaves the transform out).
-    fn content_times(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Vec<Tick>> {
-        if !matches!(layer.source, LayerSource::Shape | LayerSource::Text) || !self.mb_on(ctx, layer) {
-            return None;
-        }
-        let sh = self.shutter(ctx);
-        if sh.angle <= 0.0 {
-            return None;
-        }
-        let n = if self.opts.draft { 4 } else { (sh.samples as usize).clamp(2, 64) };
-        let times: Vec<Tick> = (0..n).map(|i| self.outer_at(ctx, sh.offset(i, n)).1).collect();
-        let key = |t: Tick| cache::layer_key(&ctx.at(t), layer, 1.0, false, false);
-        let k0 = key(*times.first()?)?;
-        let moves = [times.get(n / 2), times.last()].into_iter().flatten().any(|t| key(*t) != Some(k0));
-        moves.then_some(times)
-    }
-
-    /// The layer's source drawn at each of `times` and averaged (premultiplied) on the union of
-    /// their bounds. Content that also changes its raster scale within the shutter, or would need
-    /// an outsized buffer, is drawn once.
-    fn blurred_source(&self, ctx: &EvalCtx, layer: &Layer, times: &[Tick]) -> Option<Buf> {
-        let bufs: Vec<Buf> = times.iter().filter_map(|t| self.source(&ctx.at(*t), layer)).collect();
-        let scale = bufs.first()?.scale;
-        // Pixel = layer point × scale + offset: with the largest offset every buffer lands at
-        // x + (off - its offset) ≥ 0.
-        let off = [0, 1].map(|i| bufs.iter().map(|b| b.offset[i]).fold(f64::MIN, f64::max));
-        let w = bufs.iter().map(|b| off[0] - b.offset[0] + b.img.width as f64).fold(0.0, f64::max).ceil();
-        let h = bufs.iter().map(|b| off[1] - b.offset[1] + b.img.height as f64).fold(0.0, f64::max).ceil();
-        if bufs.iter().any(|b| (b.scale - scale).abs() > 1e-9) || !(w * h).is_finite() || w * h > (1u64 << 26) as f64 {
-            return self.source(ctx, layer);
-        }
-        let mut acc = Image::new(w as u32, h as u32);
-        let k = 1.0 / bufs.len() as f32;
-        for b in &bufs {
-            let m = Mat3::translate(vec2(off[0] - b.offset[0], off[1] - b.offset[1]));
-            effectcraft_raster::accumulate_warp(&mut acc, &b.img, &m, effectcraft_raster::Sampling::Bilinear, k);
-        }
-        Some(Buf { img: acc, offset: off, scale })
-    }
-
-    /// A processed-layer cache key that also covers content motion blur (the averaged source
-    /// depends on the content at every sub-sample).
-    fn content_key(&self, ctx: &EvalCtx, layer: &Layer, key: Option<u64>) -> Option<u64> {
-        let k = key?;
-        let Some(times) = self.content_times(ctx, layer) else { return Some(k) };
-        times.iter().try_fold(cache::derive(k, 0x6d62_6c72), |d, t| Some(cache::derive(d, cache::layer_key(&ctx.at(*t), layer, 1.0, false, false)?)))
-    }
-
-    /// Whether a layer is motion blurred: the render options, the comp's switch and the layer's
-    /// switch (limited by the precomp layers above when switches affect nested comps). Layer
-    /// motion, mask motion blur, effects that read the shutter and Advanced 3D all ask this.
-    pub(crate) fn mb_on(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
-        self.opts.motion_blur && ctx.comp.enable_motion_blur && self.layer_motion_blur(layer)
-    }
-
-    /// What a layer's mask motion blur may do in this render (see [`masks::MaskBlur`]).
-    fn mask_blur(&self, ctx: &EvalCtx, layer: &Layer) -> masks::MaskBlur {
-        masks::MaskBlur {
-            allowed: self.opts.motion_blur && ctx.comp.enable_motion_blur && self.inherited.is_none_or(|(_, mb)| mb),
-            layer: self.layer_motion_blur(layer),
-            samples: if self.opts.draft { 4 } else { ctx.comp.motion_blur_samples as usize },
-        }
-    }
-
-    /// Motion-blur sub-samples for a layer buffer (1 = no motion blur). As in After Effects, a 2D
-    /// layer gets about one sample per output pixel its corners travel during the shutter,
-    /// at least Samples Per Frame and at most the comp's Adaptive Sample Limit; a layer that
-    /// does not move within the shutter is drawn once.
-    fn mb_samples(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> usize {
-        if !self.blurred(ctx, layer) {
-            return 1;
-        }
-        let travel = self.shutter_travel(ctx, layer, buf);
-        if travel < 1e-3 {
-            return 1;
-        }
-        if self.opts.draft {
-            return 4;
-        }
-        let sh = self.shutter(ctx);
-        adaptive_samples(travel, sh.samples, sh.limit)
-    }
-
-    /// Largest distance (output pixels) a corner of the layer buffer moves during the shutter,
-    /// measured along the path at a few points.
-    fn shutter_travel(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> f64 {
-        let sh = self.shutter(ctx);
-        let (w, h) = (buf.img.width as f64, buf.img.height as f64);
-        let corners = [(0.0, 0.0), (w, 0.0), (0.0, h), (w, h), (w * 0.5, h * 0.5)];
-        const PROBES: usize = 8;
-        let mut prev: Option<Vec<effectcraft_geom::Vec2>> = None;
-        let mut travel = vec![0.0f64; corners.len()];
-        for i in 0..PROBES {
-            let m = self.buf_matrix_at(ctx, layer, buf, sh.offset(i, PROBES));
-            let pts: Vec<_> = corners.iter().map(|&(x, y)| m.apply(vec2(x, y))).collect();
-            if let Some(p) = &prev {
-                for (k, (a, b)) in p.iter().zip(&pts).enumerate() {
-                    travel[k] += (b.x - a.x).hypot(b.y - a.y);
-                }
-            }
-            prev = Some(pts);
-        }
-        travel.into_iter().fold(0.0, f64::max)
-    }
-
-    /// Canvas pixels that compositing `buf` for `layer` can change: the transformed buffer's
-    /// bounds plus the resampling footprint. Stencil/silhouette modes, motion blur and
-    /// perspective fall back to the whole canvas.
-    ///
-    /// A quantised buffer placed pixel-exactly (integer translation, Normal, 100%) over a blank
-    /// canvas leaves exactly its own (quantised) pixels: nothing to re-quantise.
-    fn footprint(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, opacity: f32, blank: bool) -> Region {
-        if layer.blend_mode.is_stencil() || self.mb_samples(ctx, layer, buf) > 1 {
-            return Region::Full;
-        }
-        let m = self.buf_matrix(ctx, layer, buf);
-        if !m.is_affine() {
-            return Region::Full;
-        }
-        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
-        let k = &m.0;
-        let integral = |v: f64| v == v.round();
-        if blank
-            && layer.blend_mode == BlendMode::Normal
-            && opacity == 1.0
-            && !matte
-            && !layer.preserve_transparency
-            && self.pipe.to_blend().is_none()
-            && k[0][0] == 1.0
-            && k[1][1] == 1.0
-            && k[0][1] == 0.0
-            && k[1][0] == 0.0
-            && integral(k[0][2])
-            && integral(k[1][2])
-        {
-            return Region::Empty;
-        }
-        let (w, h) = (buf.img.width as f64, buf.img.height as f64);
-        let c = [(0.0, 0.0), (w, 0.0), (0.0, h), (w, h)].map(|(x, y)| m.apply(vec2(x, y)));
-        let (x0, x1) = (c.iter().map(|p| p.x).fold(f64::INFINITY, f64::min), c.iter().map(|p| p.x).fold(f64::NEG_INFINITY, f64::max));
-        let (y0, y1) = (c.iter().map(|p| p.y).fold(f64::INFINITY, f64::min), c.iter().map(|p| p.y).fold(f64::NEG_INFINITY, f64::max));
-        color::PxRect::covering(x0, y0, x1, y1, 3.0).map_or(Region::Full, Region::Rect)
-    }
-
-    /// How a processed layer buffer lands in the output: one buffer → output matrix, or one per
-    /// motion-blur sub-sample (averaged), with the layer's sampling filter and dissolve seed.
-    pub fn placement(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf) -> Placement {
-        let samples = self.mb_samples(ctx, layer, buf);
-        let (sampling, seed) = (self.sampling(layer), layer.id.0 as u32);
-        if samples <= 1 {
-            return Placement { matrices: vec![self.buf_matrix(ctx, layer, buf)], sampling, seed };
-        }
-        let sh = self.shutter(ctx);
-        let matrices = (0..samples).map(|i| self.buf_matrix_at(ctx, layer, buf, sh.offset(i, samples))).collect();
-        Placement { matrices, sampling, seed }
-    }
-
-    /// Draw a processed layer into `target` (transform, motion blur) with `mode`/`opacity`.
-    fn place(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, target: &mut Image, mode: BlendMode, opacity: f32) {
-        let pl = self.placement(ctx, layer, buf);
-        let opts = WarpOpts { sampling: pl.sampling, opacity, mode, seed: pl.seed, clip: None };
-        if let [m] = pl.matrices.as_slice() {
-            composite_warp(target, &buf.img, m, &opts);
-            return;
-        }
-        // Sub-samples sum straight into one buffer (each warp is row-parallel).
-        let mut acc = Image::new(target.width, target.height);
-        let k = 1.0 / pl.matrices.len() as f32;
-        for m in &pl.matrices {
-            effectcraft_raster::accumulate_warp(&mut acc, &buf.img, m, opts.sampling, k);
-        }
-        target.blend_from(&acc, mode, opacity, pl.seed);
-    }
-
-    /// Draw a 2D layer into `canvas`; returns the region it may have changed.
-    fn draw_layer(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image, blank: bool) -> Region {
-        let opacity = ctx.opacity(layer) as f32 * self.opacity_mul;
-        if self.quality(layer) == Quality::Wireframe && !layer.switches.adjustment {
-            self.draw_wireframe(ctx, layer, canvas);
-            return Region::Full;
-        }
-        if opacity <= 0.0 && !layer.switches.adjustment {
-            return Region::Empty;
-        }
-        if layer.switches.adjustment {
-            self.draw_adjustment(ctx, layer, canvas, opacity);
-            return Region::Full;
-        }
-        let mut timing = self.profile.map(|_| LayerTiming { depth: self.depth, layer: layer.name.clone(), ..Default::default() });
-        let t0 = web_time::Instant::now();
-        let Some(st) = self.styled(ctx, layer, timing.as_mut()) else { return Region::Empty };
-        let st = self.styled_to_blend(st);
-        let t1 = web_time::Instant::now();
-        let changed = if st.plain {
-            self.composite_layer(ctx, layer, &st.body, canvas, opacity);
-            self.footprint(ctx, layer, &st.body, opacity, blank)
-        } else {
-            self.composite_styled(ctx, layer, &st, canvas, opacity);
-            Region::Full
-        };
-        if let (Some(prof), Some(mut timing)) = (self.profile, timing) {
-            timing.process_ms = (t1 - t0).as_secs_f64() * 1e3;
-            timing.composite_ms = t1.elapsed().as_secs_f64() * 1e3;
-            if let Ok(mut v) = prof.lock() {
-                v.push(timing);
-            }
-        }
-        changed
-    }
-
-    /// Composite a styled layer: exterior passes with their own modes, then the body with the
-    /// layer's mode; the layer's opacity fades the whole stack. Knockout clears what is below the
-    /// layer's content; switched-off R/G/B channels keep the values below.
-    fn composite_styled(&self, ctx: &EvalCtx, layer: &Layer, st: &StyledLayer, canvas: &mut Image, opacity: f32) {
-        let bl = styles::blending(ctx, layer);
-        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
-        if matte || layer.preserve_transparency {
-            let mut iso = Image::new(canvas.width, canvas.height);
-            for (b, m) in &st.passes {
-                self.place(ctx, layer, b, &mut iso, *m, 1.0);
-            }
-            self.place(ctx, layer, &st.body, &mut iso, BlendMode::Normal, 1.0);
-            self.composite_iso(ctx, layer, iso, canvas, opacity);
-            return;
-        }
-        let mut tmp = canvas.clone();
-        if bl.knockout > 0 {
-            let mut k = Image::new(canvas.width, canvas.height);
-            self.place(ctx, layer, &st.content, &mut k, BlendMode::Normal, 1.0);
-            tmp.data.par_iter_mut().zip(k.data.par_iter()).for_each(|(p, q)| {
-                let keep = 1.0 - q[3].clamp(0.0, 1.0);
-                for c in p.iter_mut() {
-                    *c *= keep;
-                }
-            });
-        }
-        for (b, m) in &st.passes {
-            self.place(ctx, layer, b, &mut tmp, *m, 1.0);
-        }
-        self.place(ctx, layer, &st.body, &mut tmp, layer.blend_mode, 1.0);
-        let ch = bl.channels;
-        canvas.data.par_iter_mut().zip(tmp.data.par_iter()).for_each(|(c, t)| {
-            for i in 0..4 {
-                let v = if i < 3 && !ch[i] { c[i] } else { t[i] };
-                c[i] += (v - c[i]) * opacity;
-            }
-        });
-    }
-
-    fn composite_layer(&self, ctx: &EvalCtx, layer: &Layer, buf: &Buf, canvas: &mut Image, opacity: f32) {
-        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
-        if !matte && !layer.preserve_transparency {
-            self.place(ctx, layer, buf, canvas, layer.blend_mode, opacity);
-            return;
-        }
-        // Render in isolation, then matte / preserve transparency, then blend.
-        let mut iso = Image::new(canvas.width, canvas.height);
-        self.place(ctx, layer, buf, &mut iso, BlendMode::Normal, 1.0);
-        self.composite_iso(ctx, layer, iso, canvas, opacity);
-    }
-
-    /// Apply the track matte / preserve transparency to an isolated layer render, then blend.
-    fn composite_iso(&self, ctx: &EvalCtx, layer: &Layer, iso: Image, canvas: &mut Image, opacity: f32) {
-        self.composite_iso_with(ctx, layer, iso, canvas, opacity, None);
-    }
-
-    /// [`Self::composite_iso`] with the track matte's pixels already drawn (`matte`, e.g. a 3D
-    /// matte seen through the camera); otherwise the matte layer is placed in 2D.
-    pub(crate) fn composite_iso_with(&self, ctx: &EvalCtx, layer: &Layer, mut iso: Image, canvas: &mut Image, opacity: f32, matte_img: Option<Image>) {
-        self.apply_track_matte(ctx, layer, &mut iso, matte_img);
-        if layer.preserve_transparency {
-            iso.data.par_iter_mut().zip(canvas.data.par_iter()).for_each(|(p, q)| {
-                for c in p.iter_mut() {
-                    *c *= q[3];
-                }
-            });
-        }
-        canvas.blend_from(&iso, layer.blend_mode, opacity, layer.id.0 as u32);
-    }
-
-    /// Multiply `img` (comp-sized) by the layer's track matte, if it has one; `matte_img` as in
-    /// [`Self::composite_iso_with`].
-    fn apply_track_matte(&self, ctx: &EvalCtx, layer: &Layer, img: &mut Image, matte_img: Option<Image>) {
-        let matte = layer.track_matte.and_then(|tm| ctx.comp.layer(tm.layer).filter(|m| m.id != layer.id).map(|m| (m, tm.kind)));
-        if let Some((m, kind)) = matte {
-            let mimg = match matte_img {
-                Some(i) if i.width == img.width && i.height == img.height => i,
-                _ => {
-                    let mut mimg = Image::new(img.width, img.height);
-                    if m.is_active_at(ctx.time)
-                        && let Some(mb) = self.layer_buf(ctx, m)
-                    {
-                        let mo = ctx.opacity(m) as f32;
-                        self.place(ctx, m, &mb, &mut mimg, BlendMode::Normal, mo);
-                    }
-                    mimg
-                }
-            };
-            img.data.par_iter_mut().zip(mimg.data.par_iter()).for_each(|(p, q)| {
-                let k = match kind {
-                    MatteKind::Alpha => q[3],
-                    MatteKind::AlphaInverted => 1.0 - q[3],
-                    MatteKind::Luma => effectcraft_color::luminance(q[0], q[1], q[2]),
-                    MatteKind::LumaInverted => 1.0 - effectcraft_color::luminance(q[0], q[1], q[2]),
-                }
-                .clamp(0.0, 1.0);
-                for c in p.iter_mut() {
-                    *c *= k;
-                }
-            });
-        }
-    }
-
-    /// Adjustment layer: effects applied to the comp below, limited to the layer's footprint
-    /// and its track matte.
-    fn draw_adjustment(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image, opacity: f32) {
-        let Some(mut foot) = self.source(ctx, layer) else { return };
-        let _ = masks::apply(ctx, layer, &mut foot, self.mask_blur(ctx, layer));
-        let mut matte = Image::new(canvas.width, canvas.height);
-        self.place(ctx, layer, &foot, &mut matte, BlendMode::Normal, 1.0);
-        self.apply_track_matte(ctx, layer, &mut matte, None);
-        let o = self.roi_offset().map(|(x, y, _, _)| [-x, -y]).unwrap_or([0.0; 2]);
-        let mut below = Buf { img: canvas.clone(), offset: o, scale: self.opts.scale };
-        // Effects run in the working space, not the linear blending space.
-        if let Some(c) = self.pipe.from_blend() {
-            color::convert(&mut below.img, &c);
-        }
-        let mut adjusted = self.apply_effects(ctx, layer, below, true);
-        if let Some(c) = self.pipe.to_blend() {
-            color::convert(&mut adjusted.img, &c);
-        }
-        if adjusted.img.width != canvas.width || adjusted.img.height != canvas.height {
-            return;
-        }
-        canvas.data.par_iter_mut().zip(adjusted.img.data.par_iter()).zip(matte.data.par_iter()).for_each(|((c, a), m)| {
-            let k = m[3] * opacity;
-            for i in 0..4 {
-                c[i] += (a[i] - c[i]) * k;
-            }
-        });
-    }
-}
-
-/// A layer ready to composite (see [`Renderer::styled_layer`]).
-pub struct StyledLayer {
-    /// Exterior style passes (Drop Shadow, Outer Glow) with their blend modes.
-    pub passes: Vec<(Arc<Buf>, BlendMode)>,
-    pub body: Arc<Buf>,
-    /// Pre-style pixels (knockout shape).
-    pub content: Arc<Buf>,
-    /// Styled cache key (the content key when plain).
-    key: Option<u64>,
-    /// Content cache key.
-    ckey: Option<u64>,
-    /// No layer styles: composite `body` the usual way.
-    pub plain: bool,
-}
-
-/// Where a layer buffer lands (see [`Renderer::placement`]).
-#[derive(Clone, Debug)]
-pub struct Placement {
-    /// Buffer pixel → output pixel; several = motion-blur sub-samples (equal weights).
-    pub matrices: Vec<Mat3>,
-    pub sampling: effectcraft_raster::Sampling,
-    /// Dissolve noise seed.
-    pub seed: u32,
-}
-
-/// Hooks for accelerated compositors (`effectcraft-gpu`): the pieces of the CPU walk they reuse
-/// or fall back to. The CPU compositor itself is [`Renderer::comp_frame_cpu`].
-impl<'a> Renderer<'a> {
-    /// The project's colour pipeline.
-    pub fn pipe(&self) -> color::Pipe {
-        self.pipe
-    }
-
-    /// Nesting depth (0 = the top-level comp).
-    pub fn depth(&self) -> usize {
-        self.depth
-    }
-
-    /// The auxiliary 3D channels of comp `comp_id` at comp time `t` (depth, layer IDs, normals,
-    /// UVs, Cryptomatte; see `three_d::compose::aux_pass`), at the renderer's output scale.
-    pub fn comp_aux(&self, comp_id: ItemId, t: Tick) -> Option<effectcraft_raster::AuxChannels> {
-        let ctx = self.eval_ctx(comp_id, t)?;
-        Some(three_d::compose::aux_pass(self, &ctx))
-    }
-
-    /// Evaluation context of comp `comp_id` at comp time `t`.
-    pub fn eval_ctx(&self, comp_id: ItemId, t: Tick) -> Option<EvalCtx<'a>> {
-        Some(self.ctx(comp_id, self.project.comp(comp_id)?, t))
-    }
-
-    /// The layers drawn at the context time, bottom to top (solo, guides and visibility
-    /// applied).
-    pub fn visible_layers(&self, ctx: &EvalCtx<'a>) -> Vec<&'a Layer> {
-        let (comp, t) = (ctx.comp, ctx.time);
-        let any_solo = comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
-        comp.layers
-            .iter()
-            .rev()
-            .filter(|l| l.is_active_at(t) && l.has_video() && !l.environment && (!any_solo || l.switches.solo) && (self.opts.guides || !l.switches.guide))
-            .collect()
-    }
-
-    /// Draw a run of consecutive 3D layers into `canvas` (CPU).
-    pub fn draw_3d_run(&self, ctx: &EvalCtx<'a>, run: &[&Layer], canvas: &mut Image) {
-        three_d::compose::draw_run(self, ctx, run, canvas);
-    }
-
-    /// A run of consecutive 3D layers prepared for an accelerator (planes, lights, shadow
-    /// casters; see [`three_d::Run3d`]) at output size `out`. `None` = draw it with
-    /// [`Self::draw_3d_run`] (adjustment or wireframe layers in the run, Advanced 3D).
-    pub fn prepare_3d_run(&self, ctx: &EvalCtx<'a>, run: &[&Layer], out: (u32, u32)) -> Option<three_d::Run3d> {
-        three_d::compose::gpu_run(self, ctx, run, out)
-    }
-
-    /// A run of consecutive 3D layers of an Advanced 3D comp prepared for an accelerator's
-    /// compositor ([`three_d::adv::Prepared`]): rendered as one scene and composited (Normal,
-    /// premultiplied over) onto the canvas. `None` = not an Advanced 3D comp, or a layer needs the
-    /// 2D compositing path (blend mode, track matte, Preserve Transparency): draw it with
-    /// [`Self::draw_3d_run`].
-    pub fn prepare_adv_run<'p>(&'p self, ctx: &'p EvalCtx<'a>, run: &'p [&'p Layer], out: (u32, u32)) -> Option<three_d::adv::Prepared<'p, 'a>> {
-        three_d::adv::prepare_run(self, ctx, run, out)
-    }
-
-    /// A run of consecutive 3D layers of an Advanced 3D comp whose layers need the 2D
-    /// compositing path (blend mode, track matte, Preserve Transparency), split for an
-    /// accelerator's compositor ([`three_d::adv::SplitRun`]). `None` = [`Self::prepare_adv_run`]
-    /// covers it, or it isn't an Advanced 3D run.
-    pub fn split_adv_run<'p>(&'p self, ctx: &'p EvalCtx<'a>, run: &'p [&'p Layer], out: (u32, u32)) -> Option<three_d::adv::SplitRun<'p, 'a>> {
-        three_d::adv::split_run(self, ctx, run, out)
-    }
-
-    /// Whether the comp's 3D layers draw with the Advanced 3D renderer.
-    pub fn is_adv3d(&self, ctx: &EvalCtx) -> bool {
-        three_d::adv::active(self, ctx)
-    }
-
-    /// An Environment Light Background layer ready to draw on an accelerator
-    /// ([`three_d::SkyDraw`]; the CPU draws it in `draw_3d_run`). `None` = nothing to draw.
-    pub fn sky_draw(&self, ctx: &EvalCtx, layer: &Layer) -> Option<three_d::SkyDraw> {
-        three_d::compose::sky_draw(self, ctx, layer)
-    }
-
-    /// The pixels a Wireframe-quality layer sets (white, opaque) on a `size` canvas: its
-    /// bounds' outline, one pixel wide. Empty when the layer has no bounds.
-    pub fn wireframe_pixels(&self, ctx: &EvalCtx, layer: &Layer, size: (u32, u32)) -> Vec<(u32, u32)> {
-        let Some(b) = content_bounds(ctx, layer) else { return vec![] };
-        let s = self.opts.scale;
-        let (l2c, _) = ctx.layer_to_comp(layer);
-        let m = Mat3::scale(vec2(s, s)) * self.outer.map_or(l2c, |o| o * l2c);
-        let c = [(b[0], b[1]), (b[2], b[1]), (b[2], b[3]), (b[0], b[3])].map(|(x, y)| m.apply(vec2(x, y)));
-        let (w, h) = (size.0 as i64, size.1 as i64);
-        let mut out = vec![];
-        for i in 0..4 {
-            let (p, q) = (c[i], c[(i + 1) % 4]);
-            let n = ((q.x - p.x).abs().max((q.y - p.y).abs()) * 2.0).ceil().clamp(1.0, 1.0e5) as usize;
-            for j in 0..=n {
-                let t = j as f64 / n as f64;
-                let (x, y) = ((p.x + (q.x - p.x) * t).floor() as i64, (p.y + (q.y - p.y) * t).floor() as i64);
-                if x >= 0 && y >= 0 && x < w && y < h {
-                    out.push((x as u32, y as u32));
-                }
-            }
-        }
-        out
-    }
-
-    /// Run the layer's effect stack on `target` (an accelerator's resident image): GPU-capable
-    /// runs through [`FxTarget::gpu`], the others through [`FxTarget::cpu`], with the CPU's
-    /// parameters and environment. `adjustment`: the stack runs on the comp below (adjustment
-    /// layers).
-    pub fn run_effects_on(&self, ctx: &EvalCtx, layer: &Layer, adjustment: bool, target: &mut dyn FxTarget) {
-        // `target` is used as it is: the comp below for adjustment layers (the callers).
-        self.run_effect_stack(ctx, layer, adjustment, usize::MAX, None, [0.0; 2], target);
-    }
-
-    /// [`Renderer::run_effects_on`] for a (non-adjustment) layer's own pixels: `target` holds
-    /// them in effect space (as [`Renderer::layer_input`] hands them out) and the result stays
-    /// there. Returns the effect-space origin in layer coordinates (rebase by its negation).
-    pub fn run_layer_effects_on(&self, ctx: &EvalCtx, layer: &Layer, target: &mut dyn FxTarget) -> [f64; 2] {
-        let origin = ctx.effect_bounds(layer).1;
-        self.run_effect_stack(ctx, layer, false, usize::MAX, None, origin, target);
-        origin
-    }
-
-    /// An adjustment layer's footprint (its source with masks applied, layer space): where
-    /// its effects show. `None` = the layer changes nothing.
-    pub fn adjustment_footprint(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
-        // Cached, so an accelerator sees the same buffer (and uploads it once) every frame.
-        let key = self.cache.and_then(|_| cache::footprint_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer)));
-        if let (Some(c), Some(k)) = (self.cache, key)
-            && let Some(b) = c.get(k)
-        {
-            return Some(b);
-        }
-        let mut foot = self.source(ctx, layer)?;
-        let _ = masks::apply(ctx, layer, &mut foot, self.mask_blur(ctx, layer));
-        let foot = Arc::new(foot);
-        if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
-            c.insert(k, foot.clone());
-        }
-        Some(foot)
-    }
-
-    /// Draw one 2D layer into `canvas` on the CPU (any kind: adjustment, wireframe, styled…).
-    pub fn draw_layer_cpu(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image) {
-        self.draw_layer(ctx, layer, canvas, false);
-    }
-
-    /// Draw a collapsed precomp layer into `canvas` on the CPU.
-    pub fn draw_collapsed_cpu(&self, ctx: &EvalCtx<'a>, layer: &Layer, item: ItemId, canvas: &mut Image) {
-        self.draw_collapsed(ctx, layer, item, canvas, false);
-    }
-
-    /// The layer's finished buffers (styles included) in the blending space.
-    pub fn styled_layer(&self, ctx: &EvalCtx, layer: &Layer) -> Option<StyledLayer> {
-        let mut timing = self.profile.map(|_| LayerTiming { depth: self.depth, layer: layer.name.clone(), ..Default::default() });
-        let t0 = web_time::Instant::now();
-        let st = self.styled(ctx, layer, timing.as_mut()).map(|st| self.styled_to_blend(st));
-        if let (Some(prof), Some(mut timing)) = (self.profile, timing) {
-            timing.process_ms = t0.elapsed().as_secs_f64() * 1e3;
-            if let Ok(mut v) = prof.lock() {
-                v.push(timing);
-            }
-        }
-        st
-    }
-
-    /// Opacity the layer composites with (its Opacity × collapsed precomps' opacity).
-    pub fn layer_opacity(&self, ctx: &EvalCtx, layer: &Layer) -> f32 {
-        ctx.opacity(layer) as f32 * self.opacity_mul
-    }
-
-    /// The layer's track matte layer and kind, if it has a valid one.
-    pub fn track_matte<'c>(&self, ctx: &EvalCtx<'c>, layer: &Layer) -> Option<(&'c Layer, MatteKind)> {
-        layer.track_matte.and_then(|tm| ctx.comp.layer(tm.layer).filter(|m| m.id != layer.id).map(|m| (m, tm.kind)))
-    }
-}
-
-/// The layer's frame blending mode, if the comp's Enable Frame Blending switch is on.
-/// One field of an interlaced frame as a full frame: the field's lines (`parity` 0 = even /
-/// upper, 1 = odd / lower) kept, the other lines interpolated from their neighbours.
-pub fn field_frame(img: &Image, parity: usize) -> Image {
-    let (w, h) = (img.width as usize, img.height as usize);
-    let mut out = img.clone();
-    if h < 2 {
-        return out;
-    }
-    for y in 0..h {
-        if y % 2 == parity {
-            continue;
-        }
-        let above = y.checked_sub(1);
-        let below = (y + 1 < h).then_some(y + 1);
-        for x in 0..w {
-            let px = match (above, below) {
-                (Some(a), Some(b)) => {
-                    let (p, q) = (img.data[a * w + x], img.data[b * w + x]);
-                    [(p[0] + q[0]) * 0.5, (p[1] + q[1]) * 0.5, (p[2] + q[2]) * 0.5, (p[3] + q[3]) * 0.5]
-                }
-                (Some(a), None) => img.data[a * w + x],
-                (None, Some(b)) => img.data[b * w + x],
-                (None, None) => img.data[y * w + x],
-            };
-            out.data[y * w + x] = px;
-        }
-    }
-    out
-}
-
-/// Interpret Footage ▸ Invert Alpha and Interpret As Linear Light on decoded (premultiplied)
-/// pixels; linear light is encoded in `space` ([`color::Pipe::linear_footage_space`]).
-pub fn interpret_pixels(img: &Image, f: &Footage, space: effectcraft_color::ColorSpace) -> Image {
-    let linear = f.linear_light_applies();
-    if !f.invert_alpha && !linear {
-        return img.clone();
-    }
-    let mut out = img.clone();
-    for p in out.data.iter_mut() {
-        let a = p[3];
-        let mut c = if a > 1e-6 { [p[0] / a, p[1] / a, p[2] / a] } else { [0.0; 3] };
-        if linear {
-            // The file's values are linear light: encode them like the rest of the footage.
-            c = c.map(|v| space.encode(v));
-        }
-        let a = if f.invert_alpha { 1.0 - a } else { a };
-        *p = [c[0] * a, c[1] * a, c[2] * a, a];
-    }
-    out
-}
-
-fn frame_blend_mode(ctx: &EvalCtx, layer: &Layer) -> FrameBlend {
-    if ctx.comp.enable_frame_blending { layer.switches.frame_blend } else { FrameBlend::Off }
-}
-
-/// Position of source time `t` among frames at `rate`: the frame at or before `t` and the
-/// fraction (0..1) of the way to the next frame. Exact (integer tick arithmetic), so frames that
-/// line up exactly report a fraction of 0.
-pub fn frame_position(t: Tick, rate: FrameRate) -> (i64, f64) {
-    let num = t.0 as i128 * rate.num as i128;
-    let den = TICKS_PER_SECOND as i128 * rate.den as i128;
-    (num.div_euclid(den) as i64, num.rem_euclid(den) as f64 / den as f64)
-}
-
-/// Blend two neighbouring frames `w` of the way from `a` to `b`: a cross-fade (Frame Mix) or a
-/// motion-compensated interpolation (Pixel Motion).
-pub fn blend_frames(mode: FrameBlend, a: &Image, b: &Image, w: f32) -> Image {
-    match mode {
-        FrameBlend::PixelMotion => effectcraft_raster::flow::interpolate(a, b, w),
-        _ => effectcraft_raster::flow::mix(a, b, w),
-    }
-}
-
-/// Convenience: render one frame of a comp with no footage source.
-/// Adaptive motion-blur sample count for a layer whose corners travel `travel` output pixels
-/// during the shutter: one sample per pixel, clamped to Samples Per Frame … Adaptive Sample Limit.
-pub fn adaptive_samples(travel: f64, per_frame: u32, limit: u32) -> usize {
-    let lo = per_frame.clamp(2, 64) as f64;
-    let hi = (limit.clamp(16, 256) as f64).max(lo);
-    travel.ceil().clamp(lo, hi) as usize
-}
-
-/// A region of interest `[x, y, w, h]` lies within a `w`×`h` comp frame.
-pub fn roi_inside(r: [f64; 4], w: u32, h: u32) -> bool {
-    r[0] >= 0.0 && r[1] >= 0.0 && r[0] + r[2] <= w as f64 + 1e-6 && r[1] + r[3] <= h as f64 + 1e-6
-}
-
-/// The Extended Viewer's region of interest: the comp frame grown by `margin` × its size on every
-/// side (`margin` = 1 shows a pasteboard one comp wide around the frame), intersected with the
-/// `visible` comp-space rectangle `[x0, y0, x1, y1]` and snapped outward to whole 16 px steps from the frame edges
-/// so panning re-renders rarely. `None` when the visible area lies inside the frame.
-pub fn extended_region(w: u32, h: u32, visible: [f64; 4], margin: f64) -> Option<[f64; 4]> {
-    let (w, h) = (w as f64, h as f64);
-    let (mx, my) = (w * margin, h * margin);
-    let snap_lo = |v: f64| (v / 16.0).floor() * 16.0;
-    let snap_hi = |v: f64| (v / 16.0).ceil() * 16.0;
-    let x0 = snap_lo(visible[0].max(-mx)).min(0.0);
-    let y0 = snap_lo(visible[1].max(-my)).min(0.0);
-    let x1 = w + snap_hi(visible[2].min(w + mx) - w).max(0.0);
-    let y1 = h + snap_hi(visible[3].min(h + my) - h).max(0.0);
-    if x0 >= 0.0 && y0 >= 0.0 && x1 <= w && y1 <= h {
-        return None;
-    }
-    Some([x0, y0, x1 - x0, y1 - y0])
-}
-
-pub fn render_frame(project: &Project, comp: ItemId, t: Tick, scale: f64) -> Image {
-    Renderer::new(project, &NoFootage, RenderOpts { scale, ..Default::default() }).comp_frame(comp, t)
-}
-
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_auto;
-#[cfg(test)]
-mod tests_remap;
-#[cfg(test)]
-mod tests_roi;
-#[cfg(test)]
-mod tests_styles;
-
-/// Layer-space bounds `[x0, y0, x1, y1]` of a layer's content at the context time (source size
-/// for solids/footage/precomps, glyph bounds for text, painted bounds for shapes). Used for viewer
-/// handles and hit testing.
-pub fn content_bounds(ctx: &EvalCtx, layer: &effectcraft_project::Layer) -> Option<[f64; 4]> {
-    match &layer.source {
-        LayerSource::Text => {
-            let glyphs = text::glyph_paths(ctx, layer);
-            let paths: Vec<_> = glyphs.into_iter().map(|g| g.0).collect();
-            effectcraft_path::bounds(&paths).map(|r| [r.x0, r.y0, r.x1, r.y1])
-        }
-        LayerSource::Shape => layer.props.sub("contents").and_then(|c| shapes::content_bounds(ctx, layer, c)).map(|r| [r.x0, r.y0, r.x1, r.y1]),
-        LayerSource::Camera | LayerSource::Light { .. } => None,
-        _ => {
-            let (w, h) = source_size(ctx.project, layer);
-            (w > 0 && h > 0).then_some([0.0, 0.0, w as f64, h as f64])
-        }
-    }
-}
-
-/// A mask/shape path as a kurbo path (for drawing overlays).
-pub fn kurbo_path(sp: &effectcraft_keyframe::ShapePath) -> kurbo::BezPath {
-    effectcraft_path::to_kurbo(sp)
-}
-#[cfg(test)]
-mod tests_audio_fx;
-#[cfg(test)]
-mod tests_aux;
-#[cfg(test)]
-mod tests_collapse;
-#[cfg(test)]
-mod tests_color;
-#[cfg(test)]
-mod tests_footage_size;
-#[cfg(test)]
-mod tests_frame_blend;
-#[cfg(test)]
-mod tests_mask_blur;
-#[cfg(test)]
-mod tests_nested;
-#[cfg(test)]
-mod tests_paint;
-#[cfg(test)]
-mod tests_time;
diff --git a/crates/render/src/masks.rs b/crates/render/src/masks.rs
index 3f8d7542b..bb91ef71d 100644
--- a/crates/render/src/masks.rs
+++ b/crates/render/src/masks.rs
@@ -3,7 +3,7 @@
 use effectcraft_effects::Buf;
 use effectcraft_geom::{Mat3, vec2};
 use effectcraft_keyframe::Value;
-use effectcraft_path::{FillRule, StrokeStyle};
+use effectcraft_path::{FillRule, Join};
 use effectcraft_project::{FeatherFalloff, GroupKind, Layer, MaskMode, MaskMotionBlur};
 use effectcraft_raster::{Mask, box_blur, gaussian_blur};
 use rayon::prelude::*;
@@ -72,21 +72,15 @@ fn coverage_at(ctx: &EvalCtx, layer: &Layer, g: &effectcraft_project::PropGroup,
     let variable = !sp.feather.is_empty();
     let mut cov = if variable {
         effectcraft_path::feather::variable_feather_coverage(&sp, &m, w, h, exp, linear)
+    } else if exp.abs() > 0.01 {
+        // Expansion offsets the outline itself (round joins). Offset Paths' geometry stays right
+        // when the expansion exceeds a curvature radius, where a fill + stroke blend leaves a
+        // ring around an uncovered middle (growing) or islands (shrinking).
+        let grown = effectcraft_path::offset::offset_path(&path, exp, Join::Round, 4.0);
+        effectcraft_path::fill_coverage(std::slice::from_ref(&grown), &m, w, h, FillRule::NonZero)
     } else {
         effectcraft_path::fill_coverage(std::slice::from_ref(&path), &m, w, h, FillRule::NonZero)
     };
-    if exp.abs() > 0.01 && !variable {
-        let ring = effectcraft_path::stroke_coverage(
-            std::slice::from_ref(&path),
-            &StrokeStyle { width: exp.abs() * 2.0, join: effectcraft_path::Join::Round, ..Default::default() },
-            &m,
-            w,
-            h,
-        );
-        cov.data.par_iter_mut().zip(ring.data.par_iter()).for_each(|(c, r)| {
-            *c = if exp > 0.0 { (*c + r - *c * r).min(1.0) } else { (*c * (1.0 - r)).max(0.0) };
-        });
-    }
     let feather = ctx.v2(layer, g, "feather", [0.0; 2]);
     if feather[0] > 0.0 || feather[1] > 0.0 {
         let img = cov.to_image();
diff --git a/crates/render/src/opts.rs b/crates/render/src/opts.rs
new file mode 100644
index 000000000..c6175bf39
--- /dev/null
+++ b/crates/render/src/opts.rs
@@ -0,0 +1,97 @@
+use super::accel::Backend;
+use super::{Comp, EvalCtx, ItemId, Layer, Mat4, Tick, three_d};
+
+#[derive(Clone, Copy, Debug, serde::Serialize, serde::Deserialize)]
+#[serde(default, rename_all = "camelCase")]
+pub struct RenderOpts {
+    /// Output scale relative to comp pixels (1 = Full, 0.5 = Half…).
+    pub scale: f64,
+    pub motion_blur: bool,
+    /// Render guide layers (viewer only). Only the top-level comp's own guide layers: nested
+    /// comps (precomps, collapsed precomps, comps read by effects) never draw theirs, as in
+    /// After Effects (see `Renderer::nested_opts`).
+    pub guides: bool,
+    /// Draft quality: fewer motion-blur samples, bilinear only.
+    pub draft: bool,
+    /// 3D view camera override (viewer Front/Top/Custom views); None = the comp's active camera.
+    pub view: Option<three_d::CameraState>,
+    /// CPU or GPU compositor (the GPU needs [`Renderer::accel`]).
+    pub backend: Backend,
+    /// Region of interest `[x, y, w, h]` in comp pixels (viewer only): the top-level frame covers
+    /// just this rectangle, and only its pixels are composited.
+    pub roi: Option<[f64; 4]>,
+    /// Which proxies stand in for footage and compositions (Render Settings ▸ Proxy Use).
+    pub proxy: effectcraft_project::render_queue::ProxyUse,
+    /// Switches Affect Nested Comps (Settings ▸ General): a precomp layer's Quality and Motion
+    /// Blur switches also limit the layers of the nested comp (Draft/Wireframe or motion blur off
+    /// propagate down; they never raise a nested layer's own setting).
+    pub nested_switches: bool,
+    /// Realtime Shadows in Draft (Settings ▸ 3D): draft renders (`draft`) still cast shadows.
+    pub draft_shadows: bool,
+}
+
+impl RenderOpts {
+    /// Whether 3D layers cast shadows in this render.
+    pub fn shadows(&self) -> bool {
+        !self.draft || self.draft_shadows
+    }
+}
+
+impl Default for RenderOpts {
+    fn default() -> Self {
+        RenderOpts {
+            scale: 1.0,
+            motion_blur: true,
+            guides: false,
+            draft: false,
+            view: None,
+            roi: None,
+            backend: Backend::Cpu,
+            nested_switches: true,
+            draft_shadows: true,
+            proxy: effectcraft_project::render_queue::ProxyUse::CurrentSettings,
+        }
+    }
+}
+
+/// One collapsed precomp layer a nested comp is drawn through.
+#[derive(Clone, Copy)]
+pub(crate) struct Through<'a> {
+    pub(crate) comp_id: ItemId,
+    pub(crate) comp: &'a Comp,
+    /// The containing comp's time at this frame.
+    pub(crate) time: Tick,
+    pub(crate) layer: &'a Layer,
+    /// The precomp layer is motion blurred: its own motion blurs the nested layers.
+    pub(crate) blur: bool,
+}
+
+/// Collapsed precomps within collapsed precomps that motion blur follows (more than
+/// [`Renderer::collapsed`]'s nesting limit).
+pub(crate) const MAX_THROUGH: usize = 16;
+
+/// How a collapsed precomp's 3D layers are placed in the parent (see `Renderer::collapse_into`).
+#[derive(Clone, Copy)]
+pub(crate) struct Collapse3d<'a> {
+    /// Nested comp world → parent world (the precomp layer's world transform).
+    pub world: Mat4,
+    /// The parent's camera.
+    pub cam: three_d::CameraState,
+    /// The outermost comp's context (its lights light the nested layers).
+    pub parent: EvalCtx<'a>,
+}
+
+/// Time spent on one layer of one frame (milliseconds).
+#[derive(Clone, Debug, Default)]
+pub struct LayerTiming {
+    pub depth: usize,
+    pub layer: String,
+    /// Source + masks + effects (cache lookup only, on a hit).
+    pub process_ms: f64,
+    /// Per effect: (effect id, ms). Empty on a cache hit.
+    pub effects: Vec<(String, f64)>,
+    /// Transform + matte + blend.
+    pub composite_ms: f64,
+    /// The processed buffer came from the layer cache.
+    pub cached: bool,
+}
diff --git a/crates/render/src/pipeline.rs b/crates/render/src/pipeline.rs
new file mode 100644
index 000000000..bc1879369
--- /dev/null
+++ b/crates/render/src/pipeline.rs
@@ -0,0 +1,885 @@
+use super::accel::{Accelerator, Backend, CpuFx, FxStep, FxTarget};
+use super::footage::{FootageSource, is_vector_footage};
+use super::frames::{blend_frames, content_bounds, field_frame, frame_blend_mode, frame_position, frame_size, interpret_pixels, roi_inside};
+use super::fx_host::{FxHost, essential_overrides};
+use super::opts::{Collapse3d, LayerTiming, MAX_THROUGH, RenderOpts, Through};
+use super::{
+    Arc, AutoKey, AutoPick, BlendMode, Buf, Comp, EffectCtx, EffectEnv, EvalCtx, Footage, FootageKind, FrameBlend, FrameRate, GroupKind, Image, ItemId,
+    ItemKind, Layer, LayerCache, LayerSource, Params, Project, Quality, Region, Renderer, Tick, cache, color, masks, shapes, styles, text, three_d, vec2,
+};
+
+/// Coordinate space and stack range shared by CPU and accelerated effect evaluation.
+#[derive(Clone, Copy)]
+pub(crate) struct EffectStack {
+    pub adjustment: bool,
+    pub limit: usize,
+    pub origin: [f64; 2],
+}
+
+impl<'a> Renderer<'a> {
+    pub fn new(project: &'a Project, footage: &'a dyn FootageSource, opts: RenderOpts) -> Renderer<'a> {
+        Renderer {
+            project,
+            footage,
+            expr: None,
+            opts,
+            cache: None,
+            profile: None,
+            accel: None,
+            depth: 0,
+            pipe: color::Pipe::of(&project.settings),
+            outer: None,
+            opacity_mul: 1.0,
+            collapse3d: None,
+            inherited: None,
+            defer_dof: false,
+            top: true,
+            through: [None; MAX_THROUGH],
+            through_lost: false,
+        }
+    }
+
+    /// The layer cache to keep this render's buffers in: none once its footage reads were
+    /// called off, as they may have come back empty ([`FootageSource::called_off`], #329).
+    pub(crate) fn cache_to_keep(&self) -> Option<&'a LayerCache> {
+        self.cache.filter(|_| !self.footage.called_off())
+    }
+
+    /// A layer's Quality switch, limited by the precomp layers above it when
+    /// [`RenderOpts::nested_switches`] is on.
+    pub fn quality(&self, layer: &Layer) -> Quality {
+        let rank = |q: Quality| match q {
+            Quality::Best => 0,
+            Quality::Draft => 1,
+            Quality::Wireframe => 2,
+        };
+        match self.inherited {
+            Some((q, _)) if rank(q) > rank(layer.switches.quality) => q,
+            _ => layer.switches.quality,
+        }
+    }
+
+    /// A layer's Motion Blur switch, limited by the precomp layers above it.
+    pub(crate) fn layer_motion_blur(&self, layer: &Layer) -> bool {
+        layer.switches.motion_blur && self.inherited.is_none_or(|(_, mb)| mb)
+    }
+
+    /// The renderer for the nested comp of precomp layer `layer`: its switches pass down when
+    /// [`RenderOpts::nested_switches`] is on.
+    fn nested_through(&self, layer: &Layer) -> Renderer<'a> {
+        let mut sub = self.nested();
+        if self.opts.nested_switches {
+            sub.inherited = Some((self.quality(layer), self.layer_motion_blur(layer)));
+        }
+        sub
+    }
+
+    /// The render options one level down (precomps, collapsed precomps, comps read by effects):
+    /// guide layers render only in their own comp, never when it is nested.
+    fn nested_opts(&self) -> RenderOpts {
+        RenderOpts { guides: false, ..self.opts }
+    }
+
+    /// A renderer for nested work (precomps, layers read by effects): one level deeper.
+    pub(crate) fn nested(&self) -> Renderer<'a> {
+        Renderer {
+            opts: self.nested_opts(),
+            depth: self.depth + 1,
+            outer: None,
+            opacity_mul: 1.0,
+            collapse3d: None,
+            defer_dof: false,
+            top: false,
+            through: [None; MAX_THROUGH],
+            through_lost: false,
+            ..*self
+        }
+    }
+
+    /// A precomp layer's nested comp for an accelerator to render resident (no CPU render and
+    /// upload of the nested frame): the renderer one level down, the comp, its time and the
+    /// buffer scale, exactly as [`Self::layer_source`]'s comp branch would render it. `None`
+    /// when that branch does more (composition proxy, Essential Properties overrides, frame
+    /// blending, recursion) or draws nothing (outside the nested comp's span): use the CPU path.
+    pub fn precomp_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<(Renderer<'a>, ItemId, Tick, f64)> {
+        let LayerSource::Comp { item } = layer.source else { return None };
+        if layer.switches.adjustment || self.project.comp_contains(item, ctx.comp_id) {
+            return None;
+        }
+        let nc = self.project.comp(item)?;
+        let lt = ctx.nested_time(layer);
+        if self.content_times(ctx, layer).is_some() {
+            return None;
+        }
+        if !nc.covers(lt) || self.proxy_for(item).is_some() || !essential_overrides(ctx, layer).is_empty() || frame_blend_mode(ctx, layer) != FrameBlend::Off {
+            return None;
+        }
+        let s = self.opts.scale;
+        let bs = if s < 1.0 && nc.preserve_resolution { 1.0 } else { s };
+        let base = self.nested_through(layer);
+        Some((Renderer { opts: RenderOpts { scale: bs, ..base.opts }, ..base }, item, lt, bs))
+    }
+
+    /// The nested comp of a precomp layer whose transformations collapse into this comp: the
+    /// Collapse Transformations switch is on and the layer has no masks, effects or layer
+    /// styles (those force a flattened render of the precomp, as in After Effects).
+    pub fn collapsed(&self, ctx: &EvalCtx, layer: &Layer) -> Option<ItemId> {
+        if !layer.switches.collapse || layer.switches.adjustment || self.depth > 12 {
+            return None;
+        }
+        let LayerSource::Comp { item } = &layer.source else { return None };
+        if self.project.comp_contains(*item, ctx.comp_id) || self.project.comp(*item).is_none() {
+            return None;
+        }
+        if layer.masks().is_some_and(|m| !m.children.is_empty()) {
+            return None;
+        }
+        if layer.switches.effects && layer.effects().is_some_and(|fx| fx.groups().any(|g| g.enabled)) {
+            return None;
+        }
+        if styles::active(ctx, layer) {
+            return None;
+        }
+        // Instance overrides (Essential Properties) need the nested comp rendered on its own.
+        if !effectcraft_project::essential::overridden(layer).is_empty() {
+            return None;
+        }
+        Some(*item)
+    }
+
+    /// A renderer and context that draw a collapsed precomp's layers straight into this comp:
+    /// their transforms are concatenated with the precomp layer's (one resample, no
+    /// rasterisation at the precomp's bounds), their opacity multiplied by `opacity`, and their
+    /// 3D layers use this comp's camera and lights.
+    pub fn collapse_into(&self, ctx: &EvalCtx<'a>, layer: &'a Layer, item: ItemId, opacity: f32) -> Option<(Renderer<'a>, EvalCtx<'a>)> {
+        let nc = self.project.comp(item)?;
+        let t = ctx.nested_time(layer);
+        if !nc.covers(t) {
+            return None;
+        }
+        let nctx = EvalCtx { comp_id: item, comp: nc, time: t, ..*ctx };
+        let (l2c, _) = ctx.layer_to_comp(layer);
+        let outer = Some(self.outer.map_or(l2c, |o| o * l2c));
+        let world = ctx.world_matrix(layer);
+        let c3 = Collapse3d {
+            world: self.collapse3d.map_or(world, |c| c.world * world),
+            cam: three_d::compose::camera_for(self, ctx),
+            parent: self.collapse3d.map_or(*ctx, |c| c.parent),
+        };
+        // Motion blur follows the precomp layer's own motion too.
+        let link = Through { comp_id: ctx.comp_id, comp: ctx.comp, time: ctx.time, layer, blur: self.mb_on(ctx, layer) };
+        let mut through = self.through;
+        let slot = through.iter_mut().find(|t| t.is_none());
+        let through_lost = self.through_lost || slot.is_none();
+        if let Some(slot) = slot {
+            *slot = Some(link);
+        }
+        Some((
+            Renderer { opts: self.nested_opts(), depth: self.depth + 1, outer, opacity_mul: opacity, collapse3d: Some(c3), through, through_lost, ..*self },
+            nctx,
+        ))
+    }
+
+    pub(crate) fn opacity_mul(&self) -> f32 {
+        self.opacity_mul
+    }
+
+    /// Draw a collapsed 2D precomp layer: nested layers blend straight into `canvas` with their
+    /// own modes (Normal precomp, no matte); otherwise they are drawn into an isolated buffer
+    /// that then takes the precomp layer's track matte, Preserve Transparency and blend mode.
+    /// Returns the region left to re-quantise (nested layers drawn straight into `canvas`
+    /// quantise their own footprints).
+    pub(crate) fn draw_collapsed(&self, ctx: &EvalCtx<'a>, layer: &Layer, item: ItemId, canvas: &mut Image, blank: bool) -> Region {
+        let opacity = ctx.opacity(layer) as f32 * self.opacity_mul;
+        if opacity <= 0.0 {
+            return Region::Empty;
+        }
+        let matte = layer.track_matte.is_some_and(|tm| tm.layer != layer.id && ctx.comp.layer(tm.layer).is_some());
+        if layer.blend_mode == BlendMode::Normal && !matte && !layer.preserve_transparency {
+            if let Some((sub, nctx)) = self.collapse_into(ctx, layer, item, opacity) {
+                sub.draw_comp(&nctx, canvas, blank);
+            }
+            return Region::Empty;
+        }
+        let Some((sub, nctx)) = self.collapse_into(ctx, layer, item, 1.0) else { return Region::Empty };
+        let mut iso = Image::new(canvas.width, canvas.height);
+        sub.draw_comp(&nctx, &mut iso, true);
+        self.composite_iso(ctx, layer, iso, canvas, opacity);
+        Region::Full
+    }
+
+    /// Whether `layer`'s processed buffer (source → masks → effects) is cached and the same as
+    /// one frame earlier: drawing it from the layer cache (an accelerator uploads it once) beats
+    /// re-running its effects every frame.
+    pub fn layer_is_static(&self, ctx: &EvalCtx, layer: &Layer) -> bool {
+        if self.cache.is_none() {
+            return false;
+        }
+        let (scale, draft, blur) = (self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer));
+        let prev = ctx.time - ctx.comp.frame_rate.frame_duration();
+        let now = cache::layer_key(ctx, layer, scale, draft, blur);
+        now.is_some() && now == cache::layer_key(&ctx.at(prev), layer, scale, draft, blur)
+    }
+
+    /// Rasterisation scale of a layer's source: the output scale, or — for text and shape layers,
+    /// which are always continuously rasterised (#390, #751), and Continuously Rasterize vector
+    /// footage — the output scale times the layer's on-screen scale (quarter-octave steps, rounded
+    /// up, so vector content is drawn at its final size and stays sharp when scaled up).
+    pub fn raster_scale(&self, ctx: &EvalCtx, layer: &Layer) -> f64 {
+        let s = self.opts.scale;
+        let continuous = match layer.source {
+            LayerSource::Text | LayerSource::Shape => true,
+            LayerSource::Footage { item } => {
+                layer.switches.collapse && matches!(self.project.item(item).map(|i| &i.kind), Some(ItemKind::Footage(f)) if is_vector_footage(f))
+            }
+            _ => false,
+        };
+        if !continuous {
+            return s;
+        }
+        let (l2c, _) = ctx.layer_to_comp(layer);
+        let m = self.outer.map_or(l2c, |o| o * l2c);
+        let a = layer.transform().map(|tr| ctx.v3(layer, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
+        let p0 = m.apply(vec2(a[0], a[1]));
+        let px = m.apply(vec2(a[0] + 1.0, a[1]));
+        let py = m.apply(vec2(a[0], a[1] + 1.0));
+        let k = ((px.x - p0.x).hypot(px.y - p0.y)).max((py.x - p0.x).hypot(py.y - p0.y));
+        if !k.is_finite() || k <= 1e-6 {
+            return s;
+        }
+        // The step is rounded up past rounding noise only: an unscaled layer whose position isn't
+        // a whole number maps the unit vectors to lengths a hair over 1, which must stay 1 (#390:
+        // rounded up to 2^¼, unscaled text was drawn larger and resampled, softer).
+        let mut k = 2f64.powf((k.log2() * 4.0 - 1e-6).ceil() / 4.0).clamp(1.0 / 16.0, 64.0);
+        // Keep the buffer within about 16 million pixels.
+        if let Some(b) = content_bounds(ctx, layer) {
+            let area = ((b[2] - b[0]) * (b[3] - b[1])).max(1.0) * s * s;
+            k = k.min((16.0e6 / area).sqrt().max(1.0));
+        }
+        s * k
+    }
+
+    /// Draw a Wireframe-quality layer: its bounds as a one-pixel outline.
+    pub(crate) fn draw_wireframe(&self, ctx: &EvalCtx, layer: &Layer, canvas: &mut Image) {
+        for (x, y) in self.wireframe_pixels(ctx, layer, (canvas.width, canvas.height)) {
+            canvas.set(x, y, [1.0, 1.0, 1.0, 1.0]);
+        }
+    }
+
+    pub(crate) fn ctx(&self, comp_id: ItemId, comp: &'a Comp, t: Tick) -> EvalCtx<'a> {
+        EvalCtx { project: self.project, comp_id, comp, time: t, expr: self.expr, footage: Some(self.footage) }
+    }
+
+    /// This renderer with another accelerator (or none): the passes of
+    /// [`passes::in_passes`] render with the accelerator, its CPU fallback without.
+    pub fn with_accel(&self, accel: Option<&'a dyn Accelerator>) -> Renderer<'a> {
+        Renderer { accel, ..*self }
+    }
+
+    /// The accelerator to use for this render, if any (see [`Backend`]).
+    pub fn active_accel(&self) -> Option<&'a dyn Accelerator> {
+        let a = self.accel?;
+        match self.opts.backend {
+            Backend::Cpu => None,
+            Backend::Gpu => Some(a),
+            Backend::Auto => self.project.settings.gpu_acceleration.then_some(a),
+        }
+    }
+
+    /// Render a composition at comp time `t` (transparent background, comp size × scale).
+    /// Top-level frames go to the GPU when [`Self::active_accel`] is set and handles them.
+    pub fn comp_frame(&self, comp_id: ItemId, t: Tick) -> Image {
+        // Classic 3D runs composite on the GPU too (M12.7), so Auto sends 3D comps there as well;
+        // Auto renders each comp on whichever compositor measured faster ([`AutoPick`]).
+        if self.depth == 0
+            && let Some(a) = self.active_accel()
+        {
+            let auto = self.frame_auto(a, comp_id, false);
+            if auto.is_none_or(|(p, key)| p.choose(key)) {
+                let t0 = web_time::Instant::now();
+                if let Some(img) = a.comp_frame(self, comp_id, t) {
+                    if let Some((p, key)) = auto {
+                        p.record(key, true, t0.elapsed().as_secs_f64() * 1e3);
+                    }
+                    return img;
+                }
+                if let Some((p, key)) = auto {
+                    p.declined(key);
+                }
+            }
+            let t0 = web_time::Instant::now();
+            let img = self.comp_frame_cpu(comp_id, t);
+            if let Some((p, key)) = auto {
+                p.record(key, false, t0.elapsed().as_secs_f64() * 1e3);
+            }
+            return img;
+        }
+        self.comp_frame_cpu(comp_id, t)
+    }
+
+    /// The Auto timing history and key for a top-level frame of `comp` (`None` unless the
+    /// backend is [`Backend::Auto`] and the accelerator keeps history).
+    pub fn frame_auto(&self, a: &'a dyn Accelerator, comp: ItemId, display: bool) -> Option<(&'a AutoPick, AutoKey)> {
+        if self.opts.backend != Backend::Auto || self.opts.roi.is_some() {
+            return None;
+        }
+        Some((a.auto_pick()?, AutoKey::new(comp, self.opts.scale, display)))
+    }
+
+    /// [`Self::comp_frame`] on the CPU compositor only.
+    pub fn comp_frame_cpu(&self, comp_id: ItemId, t: Tick) -> Image {
+        let Some(comp) = self.project.comp(comp_id) else { return Image::new(1, 1) };
+        let s = self.opts.scale;
+        let (w, h) = frame_size(comp.width, comp.height, s);
+        // Region of interest on a comp with 3D layers: render the frame and crop it. A region
+        // reaching past the comp frame (the Extended Viewer) renders Classic 3D natively — the
+        // planes project through the offset camera — and Advanced 3D as the frame, padded.
+        if self.depth == 0
+            && let Some(r) = self.opts.roi
+            && comp.has_3d()
+            && (roi_inside(r, comp.width, comp.height) || comp.renderer == effectcraft_project::Renderer::Advanced3D)
+        {
+            let full = Renderer { opts: RenderOpts { roi: None, ..self.opts }, ..*self }.comp_frame(comp_id, t);
+            let (x0, y0) = ((r[0] * s).round() as i64, (r[1] * s).round() as i64);
+            let (rw, rh) = (((r[2] * s).round() as u32).max(1), ((r[3] * s).round() as u32).max(1));
+            let mut out = Image::new(rw, rh);
+            for y in 0..rh as i64 {
+                let sy = y + y0;
+                if sy < 0 || sy >= full.height as i64 {
+                    continue;
+                }
+                for x in 0..rw as i64 {
+                    let sx = x + x0;
+                    if sx >= 0 && sx < full.width as i64 {
+                        out.data[(y * rw as i64 + x) as usize] = full.data[(sy * full.width as i64 + sx) as usize];
+                    }
+                }
+            }
+            return out;
+        }
+        let (w, h) = match self.roi_offset() {
+            Some((_, _, rw, rh)) => (rw, rh),
+            None => (w, h),
+        };
+        let mut canvas = Image::new(w, h);
+        if self.depth > 16 {
+            return canvas;
+        }
+        let ctx = self.ctx(comp_id, comp, t);
+        self.draw_comp(&ctx, &mut canvas, true);
+        // The canvas is already quantised after every layer; only re-encoding changes it.
+        if let Some(c) = self.pipe.from_blend() {
+            color::convert(&mut canvas, &c);
+            self.pipe.quantize(&mut canvas);
+        }
+        // The top-level comp leaves the working space for the (sRGB) display / output.
+        if self.depth == 0
+            && let Some(c) = self.pipe.output()
+        {
+            color::convert(&mut canvas, &c);
+            self.pipe.quantize(&mut canvas);
+        }
+        if self.depth == 0
+            && let Some((lin, mode, enc)) = self.pipe.output_hdr()
+        {
+            color::output_hdr(&mut canvas, lin, mode, enc);
+            self.pipe.quantize(&mut canvas);
+        }
+        canvas
+    }
+
+    /// Draw a comp's layers (bottom to top) into `canvas` (blending space).
+    /// `blank`: the canvas is fully transparent (lets the first layer skip re-quantising).
+    fn draw_comp(&self, ctx: &EvalCtx<'a>, canvas: &mut Image, mut blank: bool) {
+        // Bottom-to-top, with runs of consecutive 3D layers depth-sorted (farthest first).
+        let visible = self.visible_layers(ctx);
+        let mut i = 0;
+        while i < visible.len() {
+            if visible[i].is_3d() {
+                let mut j = i;
+                while j < visible.len() && visible[j].is_3d() {
+                    j += 1;
+                }
+                three_d::compose::draw_run(self, ctx, &visible[i..j], canvas);
+                i = j;
+                self.pipe.quantize(canvas);
+                blank = false;
+            } else {
+                let changed = match self.collapsed(ctx, visible[i]) {
+                    Some(item) => self.draw_collapsed(ctx, visible[i], item, canvas, blank),
+                    None => self.draw_layer(ctx, visible[i], canvas, blank),
+                };
+                i += 1;
+                // 8/16 bpc: the comp is an integer buffer after every layer (only the pixels the
+                // layer touched need re-quantising).
+                self.pipe.quantize_region(canvas, changed);
+                blank = false;
+            }
+        }
+    }
+
+    /// Evaluate an effect instance's parameters.
+    fn effect_params(&self, ctx: &EvalCtx, layer: &Layer, g: &effectcraft_project::PropGroup) -> Params {
+        // Nested groups (Paint strokes, Puppet meshes and pins) are flattened too.
+        effectcraft_effects::flatten_params(g, &mut |pr| ctx.value(layer, pr))
+    }
+
+    pub(crate) fn apply_effects(&self, ctx: &EvalCtx, layer: &Layer, buf: Buf, adjustment: bool) -> Buf {
+        self.apply_effects_timed(ctx, layer, buf, adjustment, usize::MAX, None)
+    }
+
+    /// Run the first `limit` effects of the layer's stack (by position; disabled ones count) on
+    /// `buf` (layer space, or the comp below for an adjustment layer).
+    fn apply_effects_timed(&self, ctx: &EvalCtx, layer: &Layer, mut buf: Buf, adjustment: bool, limit: usize, timing: Option<&mut Vec<(String, f64)>>) -> Buf {
+        // The comp below an adjustment layer is not in its layer space: it stays as it is.
+        let origin = if adjustment { [0.0; 2] } else { ctx.effect_bounds(layer).1 };
+        buf.rebase(origin);
+        let mut out = self.effect_space_stack(ctx, layer, buf, EffectStack { adjustment, limit, origin }, timing);
+        out.rebase([-origin[0], -origin[1]]);
+        out
+    }
+
+    /// [`Renderer::apply_effects_timed`] on a buffer already in effect space (measured from
+    /// `origin`, in layer coordinates); the result stays in effect space.
+    fn effect_space_stack(&self, ctx: &EvalCtx, layer: &Layer, buf: Buf, stack: EffectStack, timing: Option<&mut Vec<(String, f64)>>) -> Buf {
+        let mut t = CpuFx { accel: self.active_accel(), levels: self.pipe.levels, buf: Some(buf) };
+        self.run_effect_stack(ctx, layer, stack, timing, &mut t);
+        t.buf.unwrap_or_else(|| Buf { img: Image::new(1, 1), offset: [0.0; 2], scale: self.opts.scale })
+    }
+
+    /// Run the layer's video effect stack on `target` (in effect space, measured from `origin`
+    /// in layer coordinates): runs of GPU-capable effects go to [`FxTarget::gpu`] (when an
+    /// accelerator is active and supports them), the rest to [`FxTarget::cpu`] one by one
+    /// (quantised to the bit depth after each).
+    pub(crate) fn run_effect_stack(
+        &self,
+        ctx: &EvalCtx,
+        layer: &Layer,
+        stack: EffectStack,
+        mut timing: Option<&mut Vec<(String, f64)>>,
+        target: &mut dyn FxTarget,
+    ) {
+        let EffectStack { adjustment, limit, origin } = stack;
+        if !layer.switches.effects {
+            return;
+        }
+        let Some(fx) = layer.effects() else { return };
+        let lt = layer.layer_time(ctx.time);
+        let layer_size = ctx.effect_bounds(layer).0;
+        // #659: an authored layer's buffer spans only its painted content while the stack works
+        // on the layer's whole region (`layer_size`): give the buffer the room a sized source
+        // already has, so tiling or displacement can place pixels outside the content instead
+        // of losing them at its edge. Only when something will actually run, and not for an
+        // adjustment layer, whose buffer is the comp below and already spans it.
+        if !adjustment
+            && fx.groups().any(|g| g.enabled && matches!(&g.kind, GroupKind::Effect { effect } if effectcraft_effects::find(effect).is_some_and(|s| !effectcraft_effects::audio_fx::is_audio_effect(s.id)))) {
+            target.cover(layer_size);
+        }
+        let mut mask_shapes = masks::shapes(ctx, layer);
+        if origin != [0.0; 2] {
+            for q in mask_shapes.iter_mut().flat_map(|m| m.points.iter_mut()) {
+                *q = [q[0] - origin[0], q[1] - origin[1]];
+            }
+        }
+        // Capture once, before preceding effects can expand or replace the input. An
+        // adjustment stack's original is the comp below, not its solid source.
+        let needs_original =
+            fx.groups().take(limit).any(|g| g.enabled && matches!(&g.kind, GroupKind::Effect { effect } if effect == "ec.channel.cccomposite"));
+        let mut original = None;
+        if needs_original {
+            target.cpu(&mut |buf| {
+                original = Some(buf.clone());
+                buf
+            });
+        }
+        let host = FxHost { r: self, ctx, layer, origin, index: 0, original: original.as_ref() };
+        let env = EffectEnv {
+            masks: &mask_shapes,
+            host: Some(&host),
+            comp_time: ctx.time.seconds(),
+            frame_rate: ctx.comp.frame_rate.as_f64(),
+            effect_index: 0,
+            working_space: self.pipe.space,
+            working_linear: self.pipe.linear,
+            float_depth: self.pipe.levels.is_none(),
+            shutter: self.mb_on(ctx, layer).then_some((ctx.comp.shutter_angle, ctx.comp.shutter_phase, ctx.comp.motion_blur_samples)),
+        };
+        // Video effects in stack order (index, group, spec); disabled and audio effects skipped.
+        let stack: Vec<(usize, &effectcraft_project::PropGroup, &'static effectcraft_effects::EffectSpec)> = fx
+            .groups()
+            .enumerate()
+            .take_while(|(i, _)| *i < limit)
+            .filter(|(_, g)| g.enabled)
+            .filter_map(|(i, g)| match &g.kind {
+                GroupKind::Effect { effect } => effectcraft_effects::find(effect).map(|s| (i, g, s)),
+                _ => None,
+            })
+            .filter(|(_, _, s)| !effectcraft_effects::audio_fx::is_audio_effect(s.id))
+            .collect();
+        let accel = self.active_accel();
+        let mut k = 0;
+        while k < stack.len() {
+            let (i, g, spec) = stack[k];
+            // A run of GPU effects goes to the accelerator in one go.
+            if let Some(a) = accel
+                && spec.gpu
+                && a.supports_effect(spec.id)
+            {
+                let run: Vec<_> = stack[k..].iter().take_while(|(_, _, s)| s.gpu && a.supports_effect(s.id)).collect();
+                let params: Vec<Params> = run.iter().map(|(_, g, _)| self.effect_params(ctx, layer, g)).collect();
+                let hosts: Vec<_> = run.iter().map(|(i, _, _)| FxHost { index: *i, ..host }).collect();
+                let steps: Vec<FxStep> = run
+                    .iter()
+                    .zip(&params)
+                    .zip(&hosts)
+                    .map(|(((i, g, s), params), host)| FxStep {
+                        spec: s,
+                        ctx: EffectCtx {
+                            params,
+                            time: lt.seconds(),
+                            layer_size,
+                            seed: g.uid as u32,
+                            adjustment,
+                            env: EffectEnv { host: Some(host), effect_index: *i, ..env },
+                        },
+                    })
+                    .collect();
+                let t0 = web_time::Instant::now();
+                if target.gpu(&steps) {
+                    if let Some(v) = timing.as_deref_mut() {
+                        let ms = t0.elapsed().as_secs_f64() * 1e3 / run.len() as f64;
+                        v.extend(run.iter().map(|(_, _, s)| (format!("{} (gpu)", s.id), ms)));
+                    }
+                    k += run.len();
+                    continue;
+                }
+            }
+            k += 1;
+            let params = self.effect_params(ctx, layer, g);
+            let host = FxHost { index: i, ..host };
+            let env = EffectEnv { host: Some(&host), effect_index: i, ..env };
+            let ectx = EffectCtx { params: &params, time: lt.seconds(), layer_size, seed: g.uid as u32, adjustment, env };
+            let t0 = web_time::Instant::now();
+            target.cpu(&mut |buf| {
+                let mut buf = effectcraft_effects::apply(spec, &ectx, buf);
+                // 8/16 bpc effects write integer pixels.
+                self.pipe.quantize(&mut buf.img);
+                buf
+            });
+            if let Some(v) = timing.as_deref_mut() {
+                v.push((spec.id.to_string(), t0.elapsed().as_secs_f64() * 1e3));
+            }
+        }
+    }
+
+    /// Source pixels of a layer in layer space (before masks/effects).
+    pub(crate) fn source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
+        let s = self.opts.scale;
+        match &layer.source {
+            LayerSource::Solid { item } => {
+                let ItemKind::Solid(sol) = &self.project.item(*item)?.kind else { return None };
+                let w = ((sol.width as f64 * s).ceil() as u32).max(1);
+                let h = ((sol.height as f64 * s).ceil() as u32).max(1);
+                if layer.switches.adjustment {
+                    return Some(Buf { img: Image::filled(w, h, [1.0; 4]), offset: [0.0; 2], scale: s });
+                }
+                let mut c = sol.color;
+                if let Some(conv) = self.pipe.authored_in() {
+                    c = conv.apply(c);
+                }
+                let px = self.pipe.quantize_px([c[0], c[1], c[2], 1.0]);
+                Some(Buf { img: Image::filled(w, h, px), offset: [0.0; 2], scale: s })
+            }
+            LayerSource::Comp { item } => {
+                if self.project.comp_contains(*item, ctx.comp_id) {
+                    return None;
+                }
+                // A composition proxy (a rendered still or movie) stands in for the comp.
+                // Nothing before the nested comp starts or after it ends.
+                let lt = ctx.nested_time(layer);
+                if !self.project.comp(*item).is_some_and(|nc| nc.covers(lt)) {
+                    return None;
+                }
+                if let Some(pf) = self.proxy_for(*item)
+                    && let Some(nc) = self.project.comp(*item)
+                {
+                    let img = self.footage.frame_with(*item, pf, lt, None, self.pipe.float_encoding())?;
+                    return Some(self.footage_buf(&img, pf, nc.width, nc.height));
+                }
+                // Essential Properties overrides render the nested comp with this instance's
+                // values.
+                let ov = essential_overrides(ctx, layer);
+                let tmp = if ov.is_empty() { None } else { effectcraft_project::essential::with_overrides(self.project, *item, &ov) };
+                // Preserve resolution when nested: drawn at full size even when this comp renders
+                // smaller (the buffer's scale places it).
+                let full = s < 1.0 && self.project.comp(*item).is_some_and(|nc| nc.preserve_resolution);
+                let bs = if full { 1.0 } else { s };
+                let base = self.nested_through(layer);
+                let base = Renderer { opts: RenderOpts { scale: bs, ..base.opts }, ..base };
+                let sub = match &tmp {
+                    Some(p) => Renderer { project: p, ..base },
+                    None => base,
+                };
+                // Frame blending between the nested comp's frames (time-stretched/remapped).
+                let mode = frame_blend_mode(ctx, layer);
+                if mode != FrameBlend::Off
+                    && let Some(nc) = self.project.comp(*item)
+                {
+                    let (i, w) = frame_position(lt, nc.frame_rate);
+                    if w > 1e-6 {
+                        let a = sub.comp_frame(*item, nc.frame_rate.tick_of(i));
+                        let b = sub.comp_frame(*item, nc.frame_rate.tick_of(i + 1));
+                        return Some(Buf { img: blend_frames(mode, &a, &b, w as f32), offset: [0.0; 2], scale: bs });
+                    }
+                }
+                Some(Buf { img: sub.comp_frame(*item, lt), offset: [0.0; 2], scale: bs })
+            }
+            LayerSource::Footage { item } => {
+                let it = self.project.item(*item)?;
+                let ItemKind::Footage(f) = &it.kind else { return None };
+                if !f.has_video {
+                    return None;
+                }
+                // Continuously rasterised vector footage: drawn at the on-screen scale.
+                if layer.switches.collapse && is_vector_footage(f) {
+                    let k = self.raster_scale(ctx, layer);
+                    if let Some(img) = self.footage.vector_frame(*item, f, k) {
+                        let mut buf = Buf { img: (*img).clone(), offset: [0.0; 2], scale: k };
+                        if let Some(c) = self.pipe.media_in(f) {
+                            color::convert(&mut buf.img, &c);
+                        }
+                        return Some(buf);
+                    }
+                }
+                let lt = ctx.source_time(layer);
+                // The proxy is decoded instead, at its own size, and fills the footage's frame.
+                let proxy = self.proxy_for(*item);
+                let pf = proxy.unwrap_or(f);
+                let size = self.reduced_size(f.width, f.height).filter(|_| proxy.is_none());
+                let img = self.footage_frame(ctx, layer, *item, pf, lt, size)?;
+                Some(self.footage_buf(&img, pf, f.width, f.height))
+            }
+            LayerSource::Text => Some(self.authored(text::render(ctx, layer, self.raster_scale(ctx, layer)))),
+            LayerSource::Shape => layer.props.sub("contents").map(|c| self.authored(shapes::render(ctx, layer, c, self.raster_scale(ctx, layer)))),
+            _ => None,
+        }
+    }
+
+    /// The proxy footage used for `item` under this render's Proxy Use, if any.
+    pub fn proxy_for(&self, item: ItemId) -> Option<&'a Footage> {
+        let it = self.project.item(item)?;
+        let px = it.proxy.as_deref()?;
+        (self.opts.proxy.uses(matches!(it.kind, ItemKind::Comp(_)), px.enabled) && px.footage.has_video).then_some(&px.footage)
+    }
+
+    /// A decoded frame of `f` as a layer buffer covering `w`×`h` layer pixels (the footage's
+    /// nominal size; proxies are scaled up to it), converted from its colour profile.
+    fn footage_buf(&self, img: &Image, f: &Footage, w: u32, h: u32) -> Buf {
+        let s = self.opts.scale;
+        let k = if img.width > 0 { w.max(1) as f64 / img.width as f64 } else { 1.0 };
+        // Keep native pixels when downsampling is small; resample otherwise.
+        let mut buf = match self.reduced_size(w, h) {
+            // The source resampled it already (`FootageSource::frame_at_size`).
+            Some(size) if (img.width, img.height) == size => Buf { img: img.clone(), offset: [0.0; 2], scale: s },
+            Some((rw, rh)) if k <= 1.0 + 1e-9 => Buf { img: effectcraft_raster::resample(img, rw, rh), offset: [0.0; 2], scale: s },
+            _ => Buf { img: img.clone(), offset: [0.0; 2], scale: 1.0 / k },
+        };
+        if let Some(c) = self.pipe.media_in(f) {
+            color::convert(&mut buf.img, &c);
+        }
+        buf
+    }
+
+    /// The size of `w` × `h` layer pixels in this render when it is reduced enough that footage
+    /// is resampled to it (below 3/4 scale).
+    fn reduced_size(&self, w: u32, h: u32) -> Option<(u32, u32)> {
+        let s = self.opts.scale;
+        (s < 0.75).then(|| (((w as f64 * s).round() as u32).max(1), ((h as f64 * s).round() as u32).max(1)))
+    }
+
+    /// Authored colours into the working space (linear working spaces).
+    fn authored(&self, mut buf: Buf) -> Buf {
+        if let Some(c) = self.pipe.authored_in() {
+            color::convert(&mut buf.img, &c);
+        }
+        buf
+    }
+
+    /// A footage frame at source time `t`, frame-blended between the two nearest source frames
+    /// when the layer's Frame Blending switch (and the comp's Enable Frame Blending) is on and
+    /// `t` falls between frames (footage rate ≠ comp rate, time stretch, time remapping).
+    /// `size`: a plain frame may come resampled to it ([`FootageSource::frame_at_size`]).
+    fn footage_frame(&self, ctx: &EvalCtx, layer: &Layer, item: ItemId, f: &Footage, t: Tick, size: Option<(u32, u32)>) -> Option<Arc<Image>> {
+        // Interpret Footage ▸ Separate Fields: each field is a frame at twice the rate.
+        if f.fields != effectcraft_project::FieldOrder::Off && matches!(f.kind, FootageKind::Video | FootageKind::Sequence) {
+            let field_rate = FrameRate::new(f.frame_rate.num * 2, f.frame_rate.den);
+            let i = field_rate.frame_at(t).max(0);
+            let img = self.footage.frame_with(item, f, f.frame_rate.tick_of(i / 2), None, self.pipe.float_curve(f))?;
+            let dominant_upper = f.fields == effectcraft_project::FieldOrder::UpperFirst;
+            // Upper field = even lines (0, 2, …).
+            let parity = if (i % 2 == 0) == dominant_upper { 0 } else { 1 };
+            return Some(Arc::new(interpret_pixels(&field_frame(&img, parity), f, self.pipe.linear_footage_space(f))));
+        }
+        // Interpretation is per pixel but not linear: it runs on the frame before resampling.
+        let size = size.filter(|_| !(f.invert_alpha || f.linear_light_applies()));
+        let img = self.footage_frame_raw(ctx, layer, item, f, t, size)?;
+        if f.invert_alpha || f.linear_light_applies() { Some(Arc::new(interpret_pixels(&img, f, self.pipe.linear_footage_space(f)))) } else { Some(img) }
+    }
+
+    fn footage_frame_raw(&self, ctx: &EvalCtx, layer: &Layer, item: ItemId, f: &Footage, t: Tick, size: Option<(u32, u32)>) -> Option<Arc<Image>> {
+        let mode = frame_blend_mode(ctx, layer);
+        let float = self.pipe.float_curve(f);
+        if mode != FrameBlend::Off && matches!(f.kind, FootageKind::Video | FootageKind::Sequence) {
+            let (i, w) = frame_position(t, f.frame_rate);
+            if w > 1e-6 {
+                // Blended frames are cached (Pixel Motion is expensive).
+                let key = self.cache.map(|_| {
+                    use std::hash::{Hash, Hasher};
+                    let mut h = std::collections::hash_map::DefaultHasher::new();
+                    (0x00f8_a3e5_u64, item, i, (w as f32).to_bits(), mode as u8, f.frame_rate.num, f.frame_rate.den, &f.path, float).hash(&mut h);
+                    h.finish()
+                });
+                if let (Some(c), Some(k)) = (self.cache, key)
+                    && let Some(b) = c.get(k)
+                {
+                    return Some(Arc::new(b.img.clone()));
+                }
+                let a = self.footage.frame_with(item, f, f.frame_rate.tick_of(i), None, float);
+                let b = self.footage.frame_with(item, f, f.frame_rate.tick_of(i + 1), None, float);
+                if let (Some(a), Some(b)) = (a, b) {
+                    let img = blend_frames(mode, &a, &b, w as f32);
+                    if let (Some(c), Some(k)) = (self.cache_to_keep(), key) {
+                        c.insert(k, Arc::new(Buf { img: img.clone(), offset: [0.0; 2], scale: 1.0 }));
+                    }
+                    return Some(Arc::new(img));
+                }
+            }
+        }
+        self.footage.frame_with(item, f, t, size, float)
+    }
+
+    /// Source → masks, clamped/quantised to the project depth.
+    fn masked_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
+        let mut buf = match self.content_times(ctx, layer) {
+            Some(times) => self.blurred_source(ctx, layer, &times)?,
+            None => self.source(ctx, layer)?,
+        };
+        // A solid is filled with a quantised colour: only masks can take it off the grid.
+        let solid = matches!(layer.source, LayerSource::Solid { .. });
+        if masks::apply(ctx, layer, &mut buf, self.mask_blur(ctx, layer)) || !solid {
+            self.pipe.quantize(&mut buf.img);
+        }
+        Some(buf)
+    }
+
+    /// Fully processed layer buffer (source → masks → effects → layer styles, flattened).
+    /// Served from the layer cache when the layer's content key matches.
+    pub fn layer_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
+        self.layer_buf_keyed(ctx, layer).map(|(b, _)| b)
+    }
+
+    /// [`Self::layer_buf`] in the blending space (linear with Blend Colors Using 1.0 Gamma).
+    pub fn blend_layer_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
+        let (b, k) = self.layer_buf_keyed(ctx, layer)?;
+        Some(self.to_blend(b, k))
+    }
+
+    /// A buffer converted to the blending space (cached under a key derived from `key`).
+    pub(crate) fn to_blend(&self, b: Arc<Buf>, key: Option<u64>) -> Arc<Buf> {
+        let Some(c) = self.pipe.to_blend() else { return b };
+        let key = key.map(|k| cache::derive(k, 0x1ea7));
+        if let (Some(cache), Some(k)) = (self.cache, key)
+            && let Some(x) = cache.get(k)
+        {
+            return x;
+        }
+        let mut nb = (*b).clone();
+        color::convert(&mut nb.img, &c);
+        let nb = Arc::new(nb);
+        // The buffer the cache keeps (another worker's, if it kept one first).
+        match (self.cache_to_keep(), key) {
+            (Some(cache), Some(k)) => cache.insert(k, nb),
+            _ => nb,
+        }
+    }
+
+    fn layer_buf_keyed(&self, ctx: &EvalCtx, layer: &Layer) -> Option<(Arc<Buf>, Option<u64>)> {
+        let st = self.styled(ctx, layer, None)?;
+        if st.passes.is_empty() {
+            return Some((st.body, st.key));
+        }
+        let key = st.key.map(|k| cache::derive(k, 0xf1a7));
+        if let (Some(c), Some(k)) = (self.cache, key)
+            && let Some(b) = c.get(k)
+        {
+            return Some((b, key));
+        }
+        let flat = Arc::new(styles::Styled { passes: st.passes.iter().map(|(b, m)| ((**b).clone(), *m)).collect(), body: (*st.body).clone() }.flatten());
+        // The buffer the cache keeps (another worker's, if it kept one first).
+        let flat = match (self.cache_to_keep(), key) {
+            (Some(c), Some(k)) => c.insert(k, flat),
+            _ => flat,
+        };
+        Some((flat, key))
+    }
+
+    /// A layer's source pixels at the context time, before masks, effects and the transform
+    /// (what the motion tracker analyses, like After Effects' Layer panel). `None` for layers
+    /// without pixels.
+    pub fn layer_source(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Buf> {
+        self.source(ctx, layer)
+    }
+
+    /// Layer pixels after source → masks → effects (no layer styles).
+    pub fn content_buf(&self, ctx: &EvalCtx, layer: &Layer) -> Option<Arc<Buf>> {
+        self.content_buf_timed(ctx, layer, None).map(|(b, _)| b)
+    }
+
+    pub(crate) fn content_buf_timed(&self, ctx: &EvalCtx, layer: &Layer, mut timing: Option<&mut LayerTiming>) -> Option<(Arc<Buf>, Option<u64>)> {
+        let key = self.cache.and_then(|_| cache::layer_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer)));
+        let key = self.content_key(ctx, layer, key);
+        if let (Some(c), Some(k)) = (self.cache, key)
+            && let Some(b) = c.get(k)
+        {
+            if let Some(t) = timing.as_deref_mut() {
+                t.cached = true;
+            }
+            return Some((b, key));
+        }
+        let buf = self.masked_source(ctx, layer)?;
+        let buf = Arc::new(self.apply_effects_timed(ctx, layer, buf, false, usize::MAX, timing.map(|t| &mut t.effects)));
+        // The buffer the cache keeps (another worker's, if it kept one first).
+        let buf = match (self.cache_to_keep(), key) {
+            (Some(c), Some(k)) => c.insert(k, buf),
+            _ => buf,
+        };
+        Some((buf, key))
+    }
+
+    /// A layer's input at the context time: source → masks → its first `effects` effects
+    /// (what Time effects read at neighbouring times), in effect space (see [`effect_bounds`]):
+    /// what effect `effects` sees. Served from / stored in the layer cache under its own key,
+    /// so scrubbing reuses frames rendered for earlier output frames.
+    pub fn layer_input(&self, ctx: &EvalCtx, layer: &Layer, effects: usize) -> Option<Arc<Buf>> {
+        let key = self.cache.and_then(|_| cache::input_key(ctx, layer, self.raster_scale(ctx, layer), self.opts.draft, self.mb_on(ctx, layer), effects));
+        let key = self.content_key(ctx, layer, key);
+        if let (Some(c), Some(k)) = (self.cache, key)
+            && let Some(b) = c.get(k)
+        {
+            return Some(b);
+        }
+        let mut buf = self.masked_source(ctx, layer)?;
+        let origin = ctx.effect_bounds(layer).1;
+        buf.rebase(origin);
+        if effects > 0 {
+            buf = self.effect_space_stack(ctx, layer, buf, EffectStack { adjustment: false, limit: effects, origin }, None);
+        }
+        let buf = Arc::new(buf);
+        // The buffer the cache keeps (another worker's, if it kept one first).
+        let buf = match (self.cache_to_keep(), key) {
+            (Some(c), Some(k)) => c.insert(k, buf),
+            _ => buf,
+        };
+        Some(buf)
+    }
+}
diff --git a/crates/render/src/shapes.rs b/crates/render/src/shapes.rs
index bd59ad832..511b32f3e 100644
--- a/crates/render/src/shapes.rs
+++ b/crates/render/src/shapes.rs
@@ -57,6 +57,10 @@ struct Draw {
     blend: BlendMode,
     /// Front / Bevel / Side / Back colours of the paint's extrusion (Advanced 3D).
     surfaces: SurfaceColors,
+    /// Paint item of the contents group this draw was collected in (as opposed to one bubbled up
+    /// from a nested group). Merge Paths drops only these paints above it (#1174); a group's own
+    /// fill or stroke keeps rendering inside the group.
+    local: bool,
 }
 
 /// Straight RGB colours of an extrusion's surfaces, by [`effectcraft_model::extrude::Surface`]
@@ -207,16 +211,16 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
             }
             "star" => {
                 let star = ctx.e(layer, g, "type") == 0;
-                let p = effectcraft_path::polystar(
+                let p = effectcraft_path::polystar(effectcraft_path::Polystar {
                     star,
-                    ctx.f(layer, g, "points", 5.0),
-                    ctx.v2(layer, g, "position", [0.0; 2]),
-                    ctx.f(layer, g, "rotation", 0.0),
-                    ctx.f(layer, g, "innerRadius", 50.0),
-                    ctx.f(layer, g, "outerRadius", 100.0),
-                    ctx.f(layer, g, "innerRoundness", 0.0),
-                    ctx.f(layer, g, "outerRoundness", 0.0),
-                );
+                    points: ctx.f(layer, g, "points", 5.0),
+                    pos: ctx.v2(layer, g, "position", [0.0; 2]),
+                    rotation: ctx.f(layer, g, "rotation", 0.0),
+                    inner: ctx.f(layer, g, "innerRadius", 50.0),
+                    outer: ctx.f(layer, g, "outerRadius", 100.0),
+                    inner_round: ctx.f(layer, g, "innerRoundness", 0.0),
+                    outer_round: ctx.f(layer, g, "outerRoundness", 0.0),
+                });
                 push_shape(ctx, layer, g, p, arena, &mut live);
             }
             "path" => {
@@ -234,6 +238,7 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                     opacity: opacity(g),
                     blend: blend_mode(ctx, layer, g),
                     surfaces: [None; 4],
+                    local: true,
                 });
             }
             "stroke" => {
@@ -247,6 +252,7 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                     opacity: opacity(g),
                     blend: blend_mode(ctx, layer, g),
                     surfaces: [None; 4],
+                    local: true,
                 });
             }
             "gfill" | "gstroke" => {
@@ -270,6 +276,7 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                     opacity: opacity(g),
                     blend: blend_mode(ctx, layer, g),
                     surfaces: [None; 4],
+                    local: true,
                 });
             }
             "trim" => {
@@ -317,6 +324,7 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                     speed: ctx.f(layer, g, "speed", 2.0),
                     correlation: ctx.f(layer, g, "correlation", 50.0),
                     phase_deg: ctx.f(layer, g, "phase", 0.0),
+                    spatial_phase_deg: ctx.f(layer, g, "spatialPhase", 0.0),
                     seed: ctx.f(layer, g, "seed", 0.0),
                 };
                 let t = layer.layer_time(ctx.time).seconds();
@@ -328,8 +336,9 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                 arena.push(ops::merge(&input, mode));
                 live = vec![arena.len() - 1];
                 // As in After Effects, fills and strokes above a Merge Paths in its group are not
-                // rendered: the merged path is painted by the paint items below it.
-                draws.clear();
+                // rendered: the merged path is painted by the paint items below it. Paint inside
+                // groups above the merge still renders — it belongs to those groups (#1174).
+                draws.retain(|d| !d.local);
             }
             "group" => {
                 let Some(inner) = g.sub("contents") else { continue };
@@ -341,6 +350,7 @@ fn collect(ctx: &EvalCtx, layer: &Layer, contents: &PropGroup, arena: &mut Vec<B
                 for mut d in cd {
                     d.xf = m * d.xf;
                     d.opacity *= op;
+                    d.local = false;
                     draws.push(d);
                 }
                 live.extend(cl);
diff --git a/crates/render/src/shapes/tests.rs b/crates/render/src/shapes/tests.rs
index 3946fc9dc..2ca03b4f6 100644
--- a/crates/render/src/shapes/tests.rs
+++ b/crates/render/src/shapes/tests.rs
@@ -76,6 +76,24 @@ fn merge_add_feeds_fill_below_and_drops_paint_above() {
     assert!((coverage(&img) - 80.0 * 40.0).abs() < 20.0, "{}", coverage(&img));
 }
 
+/// #1174: Adding Merge Paths to a shape layer's Contents, after the group that holds the
+/// shape and its paint, erased the render. The merge drops paints above it *in its group* —
+/// not paint that belongs to a group above it.
+#[test]
+fn merge_paths_below_a_group_keeps_the_group_paint() {
+    for mode in [0u32, 1] {
+        let (p, cid) = shape_comp(|ids| {
+            let rect = build::shape_rect(ids, [40.0, 40.0], [0.0, 0.0], 0.0);
+            let fill = build::shape_fill(ids, RED);
+            vec![build::shape_group(ids, "Group 1", vec![rect, fill]), op(ids, "merge", &[("mode", Value::Enum(mode))])]
+        });
+        let img = frame(&p, cid);
+        let c = img.get(100, 50);
+        assert!(c[0] > 0.99 && c[1] < 0.01 && c[3] > 0.99, "mode {mode}: group rectangle must still render, got {c:?}");
+        assert!((coverage(&img) - 40.0 * 40.0).abs() < 20.0, "mode {mode}: {}", coverage(&img));
+    }
+}
+
 #[test]
 fn merge_subtract_and_intersect() {
     let sub = |mode: u32| {
@@ -240,6 +258,24 @@ fn round_corners_clip_corner_pixels() {
     assert!((coverage(&img) - std::f32::consts::PI * 400.0).abs() < 15.0, "{}", coverage(&img));
 }
 
+/// Wiggle Paths' Spatial Phase changes the drawn shape; a whole turn draws it as at 0°.
+#[test]
+fn wiggle_paths_spatial_phase_renders() {
+    let render = |phase: f64| {
+        let (p, cid) = shape_comp(|ids| {
+            vec![
+                build::shape_ellipse(ids, [60.0, 60.0], [0.0, 0.0]),
+                op(ids, "wiggle", &[("size", Value::Scalar(8.0)), ("correlation", Value::Scalar(0.0)), ("spatialPhase", Value::Scalar(phase))]),
+                build::shape_fill(ids, RED),
+            ]
+        });
+        render_frame(&p, cid, Tick::from_seconds_f64(0.5), 1.0).data
+    };
+    let zero = render(0.0);
+    assert!(render(90.0) != zero, "Spatial Phase 90° draws the shape of 0°");
+    assert!(render(360.0) == zero, "Spatial Phase 360° draws another shape than 0°");
+}
+
 #[test]
 fn wiggle_paths_vary_over_time_deterministically() {
     let (p, cid) = shape_comp(|ids| {
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
index 72dd26507..079274499 100644
--- a/crates/render/src/tests.rs
+++ b/crates/render/src/tests.rs
@@ -6,6 +6,24 @@ use effectcraft_time::{FrameRate, Tick};
 
 use crate::render_frame;
 
+mod audio_fx;
+mod auto;
+mod aux_channels;
+mod collapse;
+mod color;
+mod footage_size;
+mod frame_blend;
+mod guides;
+mod mask_blur;
+mod mask_expansion;
+mod motion_tile;
+mod nested;
+mod paint;
+mod remap;
+mod roi;
+mod styles;
+mod time;
+
 fn setup() -> (Project, ItemId, Comp) {
     let mut p = Project::default();
     // Exact float maths; 8/16 bpc quantisation has its own tests (tests_color).
@@ -254,6 +272,22 @@ fn effects_run_in_pipeline() {
     assert!(c[1] > 0.99 && c[0] < 0.01, "{c:?}");
 }
 
+/// After Effects 2026, sRGB working space (not linearised), Tint at its defaults on full-frame
+/// solids: the effect sees the encoded solid colour and weights it Rec. 601.
+#[test]
+fn tint_in_an_srgb_working_space_matches_after_effects_greys() {
+    for (col, want) in [([1.0, 0.0, 0.0], 76.0), ([0.0, 1.0, 0.0], 150.0), ([0.0, 0.0, 1.0], 29.0), ([0.5, 0.5, 0.5], 128.0)] {
+        let (mut p, cid, comp) = setup();
+        p.settings.working_space = Some(effectcraft_color::ColorSpace::Srgb);
+        let mut l = solid(&mut p, &comp, col, 200, 100);
+        add_effect(&mut p, &mut l, "ec.color.tint", [200.0, 100.0], &[]);
+        p.comp_mut(cid).unwrap().layers.push(l);
+        let o = render_frame(&p, cid, Tick::ZERO, 1.0).get(100, 50);
+        let want = want / 255.0;
+        assert!(o[..3].iter().all(|v| (v - want).abs() <= 1.0 / 255.0), "{col:?}: {o:?} vs {want}");
+    }
+}
+
 /// Card Dance's Comp Camera through the default comp camera reproduces a 2D layer in place.
 #[test]
 fn card_dance_comp_camera_matches_the_default_view() {
@@ -1010,3 +1044,32 @@ fn a_selected_layer_reading_the_comp_scene_invalidates_its_owner() {
     let (a, b) = (particles_x(&here), particles_x(&panned));
     assert!(b < a - 20.0, "the blended particles follow the camera: {a} -> {b}");
 }
+
+/// #1812: preview workers that render a layer at once end up with one buffer (the one kept
+/// first), so the GPU compositor uploads and packs it once, not once per worker.
+#[test]
+fn workers_rendering_a_layer_at_once_share_one_buffer() {
+    let (mut p, cid, comp) = setup();
+    let mut l = solid(&mut p, &comp, [0.2, 0.5, 0.8], 1600, 1200);
+    add_effect(&mut p, &mut l, "ec.blur.gaussian", [1600.0, 1200.0], &[("blurriness", Value::Scalar(60.0))]);
+    p.comp_mut(cid).unwrap().layers.push(l);
+    let cache = crate::LayerCache::default();
+    let start = std::sync::Barrier::new(8);
+    let bufs: Vec<_> = std::thread::scope(|s| {
+        let hs: Vec<_> = (0..8)
+            .map(|_| {
+                s.spawn(|| {
+                    let mut r = crate::Renderer::new(&p, &crate::NoFootage, crate::RenderOpts::default());
+                    r.cache = Some(&cache);
+                    let c = p.comp(cid).unwrap();
+                    let ctx = r.eval_ctx(cid, Tick::ZERO).unwrap();
+                    start.wait();
+                    r.layer_buf(&ctx, &c.layers[0]).unwrap()
+                })
+            })
+            .collect();
+        hs.into_iter().map(|h| h.join().unwrap()).collect()
+    });
+    assert!(bufs.iter().all(|b| std::sync::Arc::ptr_eq(b, &bufs[0])), "one shared buffer");
+    assert_eq!(cache.stats().entries, 1);
+}
diff --git a/crates/render/src/tests_audio_fx.rs b/crates/render/src/tests/audio_fx.rs
similarity index 100%
rename from crates/render/src/tests_audio_fx.rs
rename to crates/render/src/tests/audio_fx.rs
diff --git a/crates/render/src/tests_auto.rs b/crates/render/src/tests/auto.rs
similarity index 66%
rename from crates/render/src/tests_auto.rs
rename to crates/render/src/tests/auto.rs
index c34321cea..22f1a6215 100644
--- a/crates/render/src/tests_auto.rs
+++ b/crates/render/src/tests/auto.rs
@@ -9,31 +9,31 @@ use effectcraft_time::{FrameRate, Tick};
 
 use crate::{Accelerator, AutoKey, AutoPick, Backend, NoFootage, RenderOpts, Renderer};
 
-/// An accelerator that takes `delay` per frame (or declines with `handle = false`) and keeps
-/// Auto timing history.
-struct TimedAccel {
-    delay: std::time::Duration,
+/// An accelerator that returns a representative pixel (or declines) and keeps Auto history.
+struct MockAccel {
     handle: bool,
     calls: AtomicUsize,
     pick: AutoPick,
 }
 
-impl TimedAccel {
-    fn new(ms: u64, handle: bool) -> TimedAccel {
-        TimedAccel { delay: std::time::Duration::from_millis(ms), handle, calls: Default::default(), pick: Default::default() }
+impl MockAccel {
+    /// Construct a renderer stand-in without making assumptions about scheduling or speed.
+    fn new(handle: bool) -> MockAccel {
+        MockAccel { handle, calls: Default::default(), pick: Default::default() }
     }
+    /// Number of full-frame requests dispatched to this accelerator.
     fn calls(&self) -> usize {
         self.calls.load(Ordering::SeqCst)
     }
 }
 
-impl Accelerator for TimedAccel {
+impl Accelerator for MockAccel {
     fn name(&self) -> String {
         "timed".into()
     }
+    /// Count dispatched frames and return the same centre pixel as the CPU fixture.
     fn comp_frame(&self, _r: &Renderer, _comp: ItemId, _t: Tick) -> Option<crate::Image> {
         self.calls.fetch_add(1, Ordering::SeqCst);
-        std::thread::sleep(self.delay);
         // The centre of the comp, as the CPU draws it (a red solid).
         self.handle.then(|| {
             let mut img = crate::Image::new(200, 100);
@@ -52,6 +52,7 @@ impl Accelerator for TimedAccel {
     }
 }
 
+/// A small red solid whose centre pixel is shared by the CPU and mock GPU fixtures.
 fn project() -> (Project, ItemId) {
     let mut p = Project::default();
     p.settings.gpu_acceleration = true;
@@ -64,7 +65,7 @@ fn project() -> (Project, ItemId) {
 }
 
 /// Render `n` frames with `backend`; how many the accelerator was asked for.
-fn frames(p: &Project, cid: ItemId, a: &TimedAccel, backend: Backend, n: usize) -> usize {
+fn frames(p: &Project, cid: ItemId, a: &MockAccel, backend: Backend, n: usize) -> usize {
     let before = a.calls();
     for _ in 0..n {
         let mut r = Renderer::new(p, &NoFootage, RenderOpts { backend, ..Default::default() });
@@ -76,50 +77,60 @@ fn frames(p: &Project, cid: ItemId, a: &TimedAccel, backend: Backend, n: usize)
     a.calls() - before
 }
 
+/// Drive the production selector with measured costs supplied by the test, not the OS clock.
+fn measured_frames(pick: &AutoPick, key: AutoKey, cpu_ms: f64, gpu_ms: f64, n: usize) -> usize {
+    (0..n)
+        .filter(|_| {
+            let gpu = pick.choose(key);
+            pick.record(key, gpu, if gpu { gpu_ms } else { cpu_ms });
+            gpu
+        })
+        .count()
+}
+
+/// A slower GPU is periodically re-probed; explicit GPU and Software Only ignore that history.
 #[test]
 fn auto_backend_moves_light_comps_to_the_cpu() {
-    // A light comp on a slow accelerator: after the warm-up (three frames on
-    // each side) Auto renders on the CPU, re-measuring the accelerator now and then.
     let (p, cid) = project();
-    // Several times the CPU's frame time (unoptimised test builds are slow).
-    let t0 = std::time::Instant::now();
-    for _ in 0..3 {
-        Renderer::new(&p, &NoFootage, RenderOpts::default()).comp_frame(cid, Tick::ZERO);
-    }
-    let cpu_ms = t0.elapsed().as_millis() as u64 / 3;
-    let slow = TimedAccel::new((cpu_ms * 5).max(20), true);
+    let slow = MockAccel::new(true);
+    let key = AutoKey::new(cid, 1.0, false);
     let n = 6 + 2 * AutoPick::REPROBE as usize;
-    let asked = frames(&p, cid, &slow, Backend::Auto, n);
+    let asked = measured_frames(&slow.pick, key, 1.0, 20.0, n);
     assert!((3..=5).contains(&asked), "asked the slow accelerator {asked} times in {n} frames");
-    let s = slow.pick.stats(AutoKey::new(cid, 1.0, false)).unwrap();
+    let s = slow.pick.stats(key).unwrap();
     assert!(s.gpu_ms.unwrap() > s.cpu_ms.unwrap(), "{s:?}");
-    // Backend::Gpu ignores the history; Software Only never asks.
+    // Check renderer wiring with known history before a real measurement can change it.
+    assert_eq!(frames(&p, cid, &slow, Backend::Auto, 1), 0);
     assert_eq!(frames(&p, cid, &slow, Backend::Gpu, 3), 3);
     let mut sw = p.clone();
     sw.settings.gpu_acceleration = false;
     assert_eq!(frames(&sw, cid, &slow, Backend::Auto, 3), 0);
 }
 
+/// Faster, tied and slightly noisier GPU costs stay on the GPU except during warm-up/probes.
 #[test]
 fn auto_backend_keeps_fast_accelerators() {
-    // As fast as the CPU (ties stay on the accelerator): every frame but the CPU warm-up and
-    // re-probes.
     let (p, cid) = project();
-    let fast = TimedAccel::new(0, true);
-    let asked = frames(&p, cid, &fast, Backend::Auto, 40);
-    assert!(asked >= 36, "asked {asked} of 40");
+    for gpu_ms in [1.0, 5.0, 5.5] {
+        let fast = MockAccel::new(true);
+        let asked = measured_frames(&fast.pick, AutoKey::new(cid, 1.0, false), 5.0, gpu_ms, 40);
+        assert!(asked >= 36, "asked {asked} of 40 for GPU cost {gpu_ms}");
+        assert_eq!(frames(&p, cid, &fast, Backend::Auto, 1), 1);
+    }
 }
 
+/// A declining accelerator is retried only periodically while the CPU supplies frames.
 #[test]
 fn auto_backend_falls_back_when_the_accelerator_declines() {
     let (p, cid) = project();
-    let declining = TimedAccel::new(0, false);
+    let declining = MockAccel::new(false);
     let n = 2 * AutoPick::REPROBE as usize;
     let asked = frames(&p, cid, &declining, Backend::Auto, n);
     // Asked first, then only on the periodic re-probes.
     assert!((1..=4).contains(&asked), "asked {asked} times in {n} frames");
 }
 
+/// Periodic probes detect a formerly slow GPU becoming faster, without mixing cache keys.
 #[test]
 fn auto_pick_follows_changing_costs() {
     let pick = AutoPick::default();
diff --git a/crates/render/src/tests_aux.rs b/crates/render/src/tests/aux_channels.rs
similarity index 100%
rename from crates/render/src/tests_aux.rs
rename to crates/render/src/tests/aux_channels.rs
diff --git a/crates/render/src/tests_collapse.rs b/crates/render/src/tests/collapse.rs
similarity index 100%
rename from crates/render/src/tests_collapse.rs
rename to crates/render/src/tests/collapse.rs
diff --git a/crates/render/src/tests_color.rs b/crates/render/src/tests/color.rs
similarity index 100%
rename from crates/render/src/tests_color.rs
rename to crates/render/src/tests/color.rs
diff --git a/crates/render/src/tests_footage_size.rs b/crates/render/src/tests/footage_size.rs
similarity index 73%
rename from crates/render/src/tests_footage_size.rs
rename to crates/render/src/tests/footage_size.rs
index 88df726e9..065941d8a 100644
--- a/crates/render/src/tests_footage_size.rs
+++ b/crates/render/src/tests/footage_size.rs
@@ -81,3 +81,28 @@ fn reduced_renders_take_footage_resampled_by_the_source() {
     Renderer::new(&p, &sized, RenderOpts { scale: 0.5, ..Default::default() }).comp_frame(cid, Tick::ZERO);
     assert!(sized.sizes.unwrap().into_inner().unwrap().is_empty());
 }
+
+/// #1812: a still's layer is kept in the layer cache across times (its texture then uploads to
+/// the GPU once, not every frame); a movie's is fetched again at every time.
+#[test]
+fn still_layers_are_cached_across_times_and_movies_are_not() {
+    for (kind, fetches) in [(FootageKind::Still, 1), (FootageKind::Video, 3)] {
+        let (mut p, cid) = project(BitDepth::Bpc8, false);
+        let Some(LayerSource::Footage { item }) = p.comp(cid).map(|c| c.layers[0].source.clone()) else { panic!("footage layer") };
+        if let Some(ItemKind::Footage(f)) = p.item_mut(item).map(|it| &mut it.kind) {
+            f.kind = kind;
+        }
+        let cache = crate::LayerCache::default();
+        let src = Clip { sizes: Some(Mutex::default()) };
+        let opts = RenderOpts { scale: 0.5, ..Default::default() };
+        for t in [0.0, 0.25, 0.5] {
+            let t = Tick::from_seconds_f64(t);
+            let mut r = Renderer::new(&p, &src, opts);
+            r.cache = Some(&cache);
+            let frame = r.comp_frame(cid, t);
+            assert_eq!(frame, Renderer::new(&p, &src, opts).comp_frame(cid, t), "{kind:?} at {t:?}");
+        }
+        // (each uncached render above fetches once more)
+        assert_eq!(src.sizes.unwrap().into_inner().unwrap().len(), fetches + 3, "{kind:?}");
+    }
+}
diff --git a/crates/render/src/tests_frame_blend.rs b/crates/render/src/tests/frame_blend.rs
similarity index 100%
rename from crates/render/src/tests_frame_blend.rs
rename to crates/render/src/tests/frame_blend.rs
diff --git a/crates/render/src/tests/guides.rs b/crates/render/src/tests/guides.rs
new file mode 100644
index 000000000..cb9851250
--- /dev/null
+++ b/crates/render/src/tests/guides.rs
@@ -0,0 +1,108 @@
+//! Guide layers: drawn in their own comp's viewer (`RenderOpts::guides`), never when that comp is
+//! nested in another (precomp, collapsed precomp, 2D or 3D), and never in final renders.
+
+use effectcraft_color::Label;
+use effectcraft_keyframe::Value;
+use effectcraft_project::build;
+use effectcraft_project::{BitDepth, Comp, ItemId, ItemKind, Layer, LayerSource, Project, Solid};
+use effectcraft_time::{FrameRate, Tick};
+
+use crate::{NoFootage, RenderOpts, Renderer};
+
+fn solid(p: &mut Project, comp: &Comp, color: [f32; 3], size: (u32, u32), three_d: bool) -> Layer {
+    let sid = p.add_item("S", Label::Red, None, ItemKind::Solid(Solid { color, width: size.0, height: size.1, pixel_aspect: 1.0 }));
+    let mut l = build::layer(p, comp, "S", LayerSource::Solid { item: sid }, size, None);
+    l.props.prop_mut("transform/position").unwrap().value = Value::Vec3([50.0, 50.0, 0.0]);
+    l.switches.three_d = three_d;
+    l
+}
+
+#[derive(Clone, Copy, Debug)]
+enum Nest {
+    /// A plain precomp layer (the nested comp rendered on its own, then composited).
+    Precomp,
+    /// Collapse Transformations on a 2D precomp layer.
+    Collapsed,
+    /// A collapsed 3D precomp in a Classic 3D comp.
+    Collapsed3d,
+    /// A collapsed 3D precomp in an Advanced 3D comp.
+    CollapsedAdvanced,
+}
+
+/// "Inner": a red 100×100 background with a green 40×40 guide layer in the middle; "Outer": the
+/// same size, holding only Inner nested as `nest`.
+fn scene(nest: Nest) -> (Project, ItemId, ItemId) {
+    let three_d = matches!(nest, Nest::Collapsed3d | Nest::CollapsedAdvanced);
+    let mut p = Project::default();
+    p.settings.bit_depth = BitDepth::Bpc32;
+    let inner = Comp::new(100, 100, FrameRate::FPS_30, Tick::from_seconds_f64(2.0));
+    let mut guide = solid(&mut p, &inner, [0.0, 1.0, 0.0], (40, 40), three_d);
+    guide.switches.guide = true;
+    let bg = solid(&mut p, &inner, [1.0, 0.0, 0.0], (100, 100), three_d);
+    let mut inner = inner;
+    inner.layers = vec![guide, bg];
+    let iid = p.add_item("Inner", Label::Sandstone, None, ItemKind::Comp(inner.into()));
+    let mut outer = Comp::new(100, 100, FrameRate::FPS_30, Tick::from_seconds_f64(2.0));
+    if matches!(nest, Nest::CollapsedAdvanced) {
+        outer.renderer = effectcraft_project::Renderer::Advanced3D;
+    }
+    let mut pre = build::layer(&mut p, &outer, "Inner", LayerSource::Comp { item: iid }, (100, 100), None);
+    pre.switches.collapse = !matches!(nest, Nest::Precomp);
+    pre.switches.three_d = three_d;
+    outer.layers = vec![pre];
+    let oid = p.add_item("Outer", Label::Sandstone, None, ItemKind::Comp(outer.into()));
+    (p, iid, oid)
+}
+
+/// The centre pixel of `comp` rendered with or without guide layers.
+fn centre(p: &Project, comp: ItemId, guides: bool) -> [f32; 4] {
+    Renderer::new(p, &NoFootage, RenderOpts { guides, ..Default::default() }).comp_frame(comp, Tick::ZERO).get(50, 50)
+}
+
+fn is_green(c: [f32; 4]) -> bool {
+    c[1] > 0.9 && c[0] < 0.1
+}
+
+fn is_red(c: [f32; 4]) -> bool {
+    c[0] > 0.9 && c[1] < 0.1
+}
+
+#[test]
+fn guide_layer_renders_in_its_own_comp_with_guides_on() {
+    let (p, inner, _) = scene(Nest::Precomp);
+    let c = centre(&p, inner, true);
+    assert!(is_green(c), "guide layer drawn in its own comp's viewer: {c:?}");
+}
+
+#[test]
+fn final_renders_leave_guide_layers_out_by_default() {
+    assert!(!RenderOpts::default().guides);
+    let (p, inner, _) = scene(Nest::Precomp);
+    let c = centre(&p, inner, false);
+    assert!(is_red(c), "guide layer left out of final renders: {c:?}");
+}
+
+#[test]
+fn guide_layers_of_a_nested_comp_never_render_in_the_parent() {
+    for nest in [Nest::Precomp, Nest::Collapsed, Nest::Collapsed3d, Nest::CollapsedAdvanced] {
+        let (p, inner, outer) = scene(nest);
+        // The nested comp's own viewer still shows them…
+        let own = centre(&p, inner, true);
+        assert!(is_green(own), "{nest:?}: guide layer in its own comp: {own:?}");
+        // …but not the parent's viewer (guides on) nor its final render.
+        for guides in [true, false] {
+            let c = centre(&p, outer, guides);
+            assert!(is_red(c), "{nest:?}, guides {guides}: nested guide layer drawn in the parent: {c:?}");
+        }
+    }
+}
+
+#[test]
+fn a_guide_precomp_layer_of_the_top_comp_follows_the_guides_option() {
+    // The precomp layer itself is a guide layer in the top comp: shown in the viewer, not in
+    // final renders.
+    let (mut p, _, outer) = scene(Nest::Precomp);
+    p.comp_mut(outer).unwrap().layers[0].switches.guide = true;
+    assert!(is_red(centre(&p, outer, true)));
+    assert!(centre(&p, outer, false)[3] < 0.01, "nothing drawn without guides");
+}
diff --git a/crates/render/src/tests_mask_blur.rs b/crates/render/src/tests/mask_blur.rs
similarity index 67%
rename from crates/render/src/tests_mask_blur.rs
rename to crates/render/src/tests/mask_blur.rs
index 12b88bbba..07bc1e95f 100644
--- a/crates/render/src/tests_mask_blur.rs
+++ b/crates/render/src/tests/mask_blur.rs
@@ -41,6 +41,31 @@ fn alpha_at_25(p: &Project, cid: ItemId, motion_blur: bool) -> f32 {
     Renderer::new(p, &NoFootage, RenderOpts { motion_blur, ..Default::default() }).comp_frame(cid, half).get(25, 50)[3]
 }
 
+/// A mask that holds from frame 0 to 2, then moves: frames 1 and 2 have the same mask value, but at
+/// frame 2 the shutter already sees it move. The layer cache must not serve frame 1's layer there.
+#[test]
+fn mask_motion_blur_keys_the_layer_cache_by_time() {
+    let (mut p, cid) = project(true);
+    let rect = |x: f64| Value::Path(ShapePath::rect([x, 50.0], 20.0, 100.0));
+    let l = &mut p.comp_mut(cid).unwrap().layers[0];
+    let Some(Node::Group(m)) = l.props.sub_mut("masks").unwrap().children.first_mut() else { panic!("mask") };
+    m.get_mut("path").unwrap().keys = vec![
+        Keyframe::new(Tick::ZERO, rect(20.0)),
+        Keyframe::new(FrameRate::FPS_30.tick_of(2), rect(20.0)),
+        Keyframe::new(FrameRate::FPS_30.tick_of(3), rect(60.0)),
+    ];
+    let cache = crate::LayerCache::default();
+    let render = |t: Tick, cached: bool| {
+        let mut r = Renderer::new(&p, &NoFootage, RenderOpts { motion_blur: true, ..Default::default() });
+        r.cache = cached.then_some(&cache);
+        r.comp_frame(cid, t)
+    };
+    let (f1, f2) = (FrameRate::FPS_30.tick_of(1), FrameRate::FPS_30.tick_of(2));
+    assert_ne!(render(f1, false), render(f2, false), "the shutter at frame 2 sees the move");
+    render(f1, true);
+    assert_eq!(render(f2, true), render(f2, false));
+}
+
 #[test]
 fn mask_motion_blur_follows_the_render_and_the_comp() {
     let (p, cid) = project(true);
diff --git a/crates/render/src/tests/mask_expansion.rs b/crates/render/src/tests/mask_expansion.rs
new file mode 100644
index 000000000..700c779aa
--- /dev/null
+++ b/crates/render/src/tests/mask_expansion.rs
@@ -0,0 +1,82 @@
+//! Mask Expansion grows or shrinks the mask outline by its distance, however large: past the
+//! shape's curvature radius it must still cover everything within the distance of the path,
+//! never leave a ring around an uncovered middle.
+
+use effectcraft_color::Label;
+use effectcraft_keyframe::{ShapePath, Value};
+use effectcraft_project::build::{self, Ids};
+use effectcraft_project::{Comp, ItemId, ItemKind, LayerSource, MaskMode, Node, Project, Solid};
+use effectcraft_time::{FrameRate, Tick};
+
+use crate::{NoFootage, RenderOpts, Renderer};
+
+const W: u32 = 400;
+const H: u32 = 300;
+
+/// A white 400×300 solid with one mask of `shape` in `mode` expanded by `expansion` pixels.
+fn project(shape: ShapePath, mode: MaskMode, expansion: f64) -> (Project, ItemId) {
+    let mut p = Project::default();
+    let comp = Comp::new(W, H, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+    let sid = p.add_item("S", Label::Red, None, ItemKind::Solid(Solid { color: [1.0; 3], width: W, height: H, pixel_aspect: 1.0 }));
+    let mut l = build::layer(&mut p, &comp, "S", LayerSource::Solid { item: sid }, (W, H), None);
+    let mut next = p.next_id;
+    let mut m = build::mask(&mut Ids(&mut next), "Mask 1", shape, mode, [255, 0, 0]);
+    p.next_id = next;
+    m.get_mut("expansion").unwrap().value = Value::Scalar(expansion);
+    l.props.sub_mut("masks").unwrap().children.push(Node::Group(m));
+    let cid = p.add_item("C", Label::Sandstone, None, ItemKind::Comp(comp.into()));
+    p.comp_mut(cid).unwrap().layers.push(l);
+    (p, cid)
+}
+
+/// Alpha at each of `points` for a Subtract mask on a 40 px circle at the centre (the hole).
+fn hole(expansion: f64, points: &[(i64, i64)]) -> Vec<f32> {
+    let (p, cid) = project(ShapePath::ellipse([200.0, 150.0], 40.0, 40.0), MaskMode::Subtract, expansion);
+    let img = Renderer::new(&p, &NoFootage, RenderOpts::default()).comp_frame(cid, Tick::ZERO);
+    points.iter().map(|&(x, y)| img.get(x, y)[3]).collect()
+}
+
+#[test]
+fn no_expansion_cuts_the_circle() {
+    let a = hole(0.0, &[(200, 150), (215, 150), (225, 150)]);
+    assert!(a[0] < 0.01 && a[1] < 0.01, "inside the 20 px radius is cut: {a:?}");
+    assert!(a[2] > 0.99, "outside it is kept: {a:?}");
+}
+
+#[test]
+fn expansion_past_the_radius_grows_a_solid_hole() {
+    // +60 on a 20 px radius: a solid hole of radius 80. The fill + stroke blend left a ring
+    // from 40 to 80 px with the layer showing at 21–39 px.
+    let a = hole(60.0, &[(200, 150), (230, 150), (200, 120), (275, 150), (285, 150)]);
+    assert!(a[..4].iter().all(|&v| v < 0.01), "everything within 80 px is cut: {a:?}");
+    assert!(a[4] > 0.99, "beyond 80 px is kept: {a:?}");
+}
+
+#[test]
+fn huge_expansion_cuts_the_whole_frame() {
+    // +600 reaches every pixel; the blend left only the 20 px circle cut.
+    let a = hole(600.0, &[(200, 150), (230, 150), (0, 0), (399, 299), (399, 0)]);
+    assert!(a.iter().all(|&v| v < 0.01), "{a:?}");
+}
+
+#[test]
+fn negative_expansion_shrinks_then_removes_the_hole() {
+    let a = hole(-15.0, &[(200, 150), (210, 150)]);
+    assert!(a[0] < 0.01, "a 5 px hole remains: {a:?}");
+    assert!(a[1] > 0.99, "shrunk away from 10 px out: {a:?}");
+    let a = hole(-25.0, &[(200, 150), (190, 150)]);
+    assert!(a.iter().all(|&v| v > 0.99), "shrunk past its radius, nothing is cut: {a:?}");
+}
+
+#[test]
+fn expanded_rect_add_mask_has_round_corners() {
+    // A 100 px square mask (Add) grown by 30: the sides move out 30 px, the corners round off.
+    let (p, cid) = project(ShapePath::rect([200.0, 150.0], 100.0, 100.0), MaskMode::Add, 30.0);
+    let img = Renderer::new(&p, &NoFootage, RenderOpts::default()).comp_frame(cid, Tick::ZERO);
+    assert!(img.get(275, 150)[3] > 0.99, "25 px past the right side is inside");
+    assert!(img.get(285, 150)[3] < 0.01, "35 px past it is outside");
+    // 25 px diagonally out from the corner (250,100) is within 30 px: inside.
+    assert!(img.get(267, 82)[3] > 0.99);
+    // The square's bounding corner (280,70) is 42 px from the corner: a miter would cover it.
+    assert!(img.get(277, 73)[3] < 0.01);
+}
diff --git a/crates/render/src/tests/motion_tile.rs b/crates/render/src/tests/motion_tile.rs
new file mode 100644
index 000000000..7d1645a02
--- /dev/null
+++ b/crates/render/src/tests/motion_tile.rs
@@ -0,0 +1,169 @@
+//! Motion Tile's Output Width / Height on adjustment layers and on full-frame layers, with a
+//! Transform after it that scales the tiled result into view (#1727, #1991).
+
+use effectcraft_color::Label;
+use effectcraft_keyframe::Value;
+use effectcraft_project::build::{self, Ids};
+use effectcraft_project::{Comp, ItemId, ItemKind, Layer, LayerSource, Project, Solid};
+use effectcraft_time::{FrameRate, Tick};
+
+use crate::{Image, render_frame};
+
+const W: u32 = 200;
+const H: u32 = 100;
+
+fn solid(p: &mut Project, comp: &Comp, color: [f32; 3], w: u32, h: u32, pos: [f64; 2]) -> Layer {
+    let sid = p.add_item("Solid", Label::Red, None, ItemKind::Solid(Solid { color, width: w, height: h, pixel_aspect: 1.0 }));
+    let mut l = build::layer(p, comp, "Solid", LayerSource::Solid { item: sid }, (w, h), None);
+    l.props.prop_mut("transform/position").unwrap().value = Value::Vec3([pos[0], pos[1], 0.0]);
+    l
+}
+
+/// A white frame with a red 20×20 square in its top-left corner.
+fn picture(p: &mut Project, comp: &Comp) -> Vec<Layer> {
+    vec![solid(p, comp, [1.0, 0.0, 0.0], 20, 20, [10.0, 10.0]), solid(p, comp, [1.0, 1.0, 1.0], W, H, [100.0, 50.0])]
+}
+
+/// Motion Tile (Output `out` %) then Transform (Scale `scale` %), on `l`.
+fn tile_then_scale(p: &mut Project, l: &mut Layer, out: f64, scale: f64) {
+    let size = [W as f64, H as f64];
+    for (id, vals) in [
+        ("ec.stylize.motiontile", vec![("outputWidth", Value::Scalar(out)), ("outputHeight", Value::Scalar(out))]),
+        ("ec.distort.transform", vec![("scaleHeight", Value::Scalar(scale)), ("scaleWidth", Value::Scalar(scale))]),
+    ] {
+        let spec = effectcraft_effects::find(id).unwrap();
+        let mut next = p.next_id;
+        let mut g = effectcraft_effects::instantiate(spec, &mut Ids(&mut next), spec.name, size);
+        p.next_id = next;
+        for (k, v) in vals {
+            g.prop_mut(k).unwrap().value = v;
+        }
+        l.props.sub_mut("effects").unwrap().children.push(g.into());
+    }
+}
+
+fn comp() -> (Project, ItemId, Comp) {
+    let mut p = Project::default();
+    p.settings.bit_depth = effectcraft_project::BitDepth::Bpc32;
+    let comp = Comp::new(W, H, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+    let cid = p.add_item("Comp", Label::Sandstone, None, ItemKind::Comp(comp.clone().into()));
+    (p, cid, comp)
+}
+
+/// The picture under an adjustment layer carrying the two effects.
+fn adjustment_scene(out: f64, scale: f64) -> (Project, ItemId) {
+    let (mut p, cid, comp) = comp();
+    let mut adj = solid(&mut p, &comp, [1.0, 1.0, 1.0], W, H, [100.0, 50.0]);
+    adj.switches.adjustment = true;
+    tile_then_scale(&mut p, &mut adj, out, scale);
+    let mut layers = vec![adj];
+    layers.extend(picture(&mut p, &comp));
+    p.comp_mut(cid).unwrap().layers = layers;
+    (p, cid)
+}
+
+/// The picture as a full-frame precomp layer carrying the two effects.
+fn layer_scene(out: f64, scale: f64) -> (Project, ItemId) {
+    let (mut p, cid, comp) = comp();
+    let inner = Comp::new(W, H, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+    let iid = p.add_item("Picture", Label::Sandstone, None, ItemKind::Comp(inner.clone().into()));
+    let layers = picture(&mut p, &inner);
+    p.comp_mut(iid).unwrap().layers = layers;
+    let mut pre = build::layer(&mut p, &comp, "Picture", LayerSource::Comp { item: iid }, (W, H), None);
+    tile_then_scale(&mut p, &mut pre, out, scale);
+    p.comp_mut(cid).unwrap().layers.push(pre);
+    (p, cid)
+}
+
+fn is(img: &Image, x: i64, y: i64, want: [f32; 4], what: &str) {
+    let got = img.get(x, y);
+    assert!(got.iter().zip(want).all(|(a, b)| (a - b).abs() < 0.02), "{what}: ({x}, {y}) is {got:?}, want {want:?}");
+}
+
+const RED: [f32; 4] = [1.0, 0.0, 0.0, 1.0];
+const WHITE: [f32; 4] = [1.0; 4];
+const CLEAR: [f32; 4] = [0.0; 4];
+
+/// Output 300 % then Scale 50 % about the frame centre: comp pixel (x, y) shows the tiled frame
+/// at (100 + 2(x − 100), 50 + 2(y − 50)), so the red square repeats every 100 × 50 pixels and
+/// the frame is covered edge to edge, the tiles from beyond the frame included.
+fn assert_tiled(img: &Image, what: &str) {
+    for (x, y) in [(55, 30), (155, 30), (55, 80), (155, 80)] {
+        is(img, x, y, RED, what);
+    }
+    for (x, y) in [(5, 5), (195, 5), (5, 95), (195, 95), (100, 50), (100, 5)] {
+        is(img, x, y, WHITE, what);
+    }
+}
+
+#[test]
+fn adjustment_motion_tile_output_spreads_tiles_past_the_frame() {
+    let (p, cid) = adjustment_scene(300.0, 50.0);
+    assert_tiled(&render_frame(&p, cid, Tick::ZERO, 1.0), "adjustment, Output 300 %");
+}
+
+#[test]
+fn layer_motion_tile_output_spreads_tiles_past_the_frame() {
+    let (p, cid) = layer_scene(300.0, 50.0);
+    assert_tiled(&render_frame(&p, cid, Tick::ZERO, 1.0), "full-frame layer, Output 300 %");
+}
+
+/// Output under 100 % crops: only the centre 50 % of the frame is left, the rest is transparent
+/// (After Effects shows the comp background there).
+#[test]
+fn adjustment_motion_tile_output_under_100_crops_the_frame() {
+    let (p, cid) = adjustment_scene(50.0, 100.0);
+    let img = render_frame(&p, cid, Tick::ZERO, 1.0);
+    is(&img, 100, 50, WHITE, "inside the kept centre");
+    is(&img, 60, 30, WHITE, "inside the kept centre");
+    for (x, y) in [(5, 5), (10, 10), (195, 95), (45, 50), (100, 20)] {
+        is(&img, x, y, CLEAR, "outside the kept centre");
+    }
+}
+
+/// The After Effects 2026 frames in #1727: a 1920×1080 red solid under an adjustment layer with
+/// Motion Tile (Output 910 × 340 %, then 90 × 340 %) and Transform (Scale 12 %, Position 1361, 540).
+/// The tiled frame, 9.1 × 3.4 comps scaled to 12 %, is a 2097 × 441 band centred on (1361, 540):
+/// x 313–1920 (cut by the frame), y 320–760; at 90 % a 207-pixel column, x 1257–1465.
+#[test]
+fn adjustment_motion_tile_matches_the_after_effects_frames() {
+    for (out_w, x0, x1) in [(910.0, 313.0, 1920.0), (90.0, 1257.0, 1465.0)] {
+        let mut p = Project::default();
+        p.settings.bit_depth = effectcraft_project::BitDepth::Bpc32;
+        let comp = Comp::new(1920, 1080, FrameRate::FPS_30, Tick::from_seconds_f64(1.0));
+        let cid = p.add_item("Comp", Label::Sandstone, None, ItemKind::Comp(comp.clone().into()));
+        let red = solid(&mut p, &comp, [1.0, 0.0, 0.0], 1920, 1080, [960.0, 540.0]);
+        let mut adj = solid(&mut p, &comp, [1.0, 1.0, 1.0], 1920, 1080, [960.0, 540.0]);
+        adj.switches.adjustment = true;
+        for (id, vals) in [
+            ("ec.stylize.motiontile", vec![("outputWidth", Value::Scalar(out_w)), ("outputHeight", Value::Scalar(340.0))]),
+            (
+                "ec.distort.transform",
+                vec![("scaleHeight", Value::Scalar(12.0)), ("scaleWidth", Value::Scalar(12.0)), ("position", Value::Vec2([1361.0, 540.0]))],
+            ),
+        ] {
+            let spec = effectcraft_effects::find(id).unwrap();
+            let mut next = p.next_id;
+            let mut g = effectcraft_effects::instantiate(spec, &mut Ids(&mut next), spec.name, [1920.0, 1080.0]);
+            p.next_id = next;
+            for (k, v) in vals {
+                g.prop_mut(k).unwrap().value = v;
+            }
+            adj.props.sub_mut("effects").unwrap().children.push(g.into());
+        }
+        p.comp_mut(cid).unwrap().layers = vec![adj, red];
+        // Quarter resolution: comp pixel (x, y) is output pixel (x / 4, y / 4).
+        let img = render_frame(&p, cid, Tick::ZERO, 0.25);
+        let at = |x: f64, y: f64| img.get((x / 4.0) as i64, (y / 4.0) as i64);
+        let what = format!("Output {out_w} %");
+        for (x, y) in [(x0 + 8.0, 540.0), (x1 - 8.0, 540.0), (1361.0, 328.0), (1361.0, 752.0)] {
+            assert_eq!(at(x, y), RED, "{what}: ({x}, {y}) is red");
+        }
+        for (x, y) in [(x0 - 8.0, 540.0), (1361.0, 312.0), (1361.0, 768.0), (100.0, 100.0)] {
+            assert_eq!(at(x, y), CLEAR, "{what}: ({x}, {y}) is empty");
+        }
+        if x1 < 1920.0 {
+            assert_eq!(at(x1 + 8.0, 540.0), CLEAR, "{what}: right of the column");
+        }
+    }
+}
diff --git a/crates/render/src/tests_nested.rs b/crates/render/src/tests/nested.rs
similarity index 100%
rename from crates/render/src/tests_nested.rs
rename to crates/render/src/tests/nested.rs
diff --git a/crates/render/src/tests_paint.rs b/crates/render/src/tests/paint.rs
similarity index 100%
rename from crates/render/src/tests_paint.rs
rename to crates/render/src/tests/paint.rs
diff --git a/crates/render/src/tests_remap.rs b/crates/render/src/tests/remap.rs
similarity index 100%
rename from crates/render/src/tests_remap.rs
rename to crates/render/src/tests/remap.rs
diff --git a/crates/render/src/tests_roi.rs b/crates/render/src/tests/roi.rs
similarity index 100%
rename from crates/render/src/tests_roi.rs
rename to crates/render/src/tests/roi.rs
diff --git a/crates/render/src/tests_styles.rs b/crates/render/src/tests/styles.rs
similarity index 93%
rename from crates/render/src/tests_styles.rs
rename to crates/render/src/tests/styles.rs
index 147ff1590..b59f009de 100644
--- a/crates/render/src/tests_styles.rs
+++ b/crates/render/src/tests/styles.rs
@@ -475,3 +475,35 @@ fn gradient_glow_uses_gradient() {
     let px = img.straight(121, 50);
     assert!(px[0] > px[2], "near the edge the glow takes the gradient's start colour {px:?}");
 }
+
+/// #1812 (review of #1928): a styled layer rendered by several workers at once shares its body and
+/// style passes, as unstyled layers share their buffer.
+#[test]
+fn workers_styling_a_layer_at_once_share_its_buffers() {
+    let (p, cid) = scene([1.0; 3], None, |p, c, l| {
+        add(p, c, l, "dropShadow");
+        add(p, c, l, "stroke");
+    });
+    let cache = crate::LayerCache::default();
+    let start = std::sync::Barrier::new(8);
+    let styled: Vec<_> = std::thread::scope(|s| {
+        let hs: Vec<_> = (0..8)
+            .map(|_| {
+                s.spawn(|| {
+                    let mut r = Renderer::new(&p, &NoFootage, RenderOpts::default());
+                    r.cache = Some(&cache);
+                    let ctx = r.eval_ctx(cid, Tick::ZERO).unwrap();
+                    start.wait();
+                    r.styled_layer(&ctx, &p.comp(cid).unwrap().layers[0]).unwrap()
+                })
+            })
+            .collect();
+        hs.into_iter().map(|h| h.join().unwrap()).collect()
+    });
+    let first = &styled[0];
+    assert!(!first.passes.is_empty(), "the drop shadow is a pass");
+    for st in &styled {
+        assert!(std::sync::Arc::ptr_eq(&st.body, &first.body), "one body");
+        assert!(st.passes.iter().zip(&first.passes).all(|(a, b)| std::sync::Arc::ptr_eq(&a.0, &b.0)), "one set of passes");
+    }
+}
diff --git a/crates/render/src/tests_time.rs b/crates/render/src/tests/time.rs
similarity index 100%
rename from crates/render/src/tests_time.rs
rename to crates/render/src/tests/time.rs
diff --git a/crates/render/src/text.rs b/crates/render/src/text.rs
index 55dfd630b..e1954b597 100644
--- a/crates/render/src/text.rs
+++ b/crates/render/src/text.rs
@@ -12,7 +12,7 @@ use effectcraft_geom::{Mat3, Mat4, Vec3, vec2, vec3};
 use effectcraft_keyframe::{Justify, TextDoc, Value};
 use effectcraft_path::{BezPath, FillRule, StrokeStyle};
 use effectcraft_project::{Layer, PropGroup};
-use effectcraft_raster::Image;
+use effectcraft_raster::{Image, Mask};
 use effectcraft_text::path_text::{self, PathMeasure};
 use effectcraft_text::selectors::{self, BasedOn, Mode, Range, Shape, Wiggly};
 use effectcraft_text::{CharGlyph, TextLayout, char_glyph_style, layout_doc};
@@ -147,15 +147,6 @@ fn unit_of(based: BasedOn, g: &CharGlyph, lay: &TextLayout) -> (usize, usize) {
     }
 }
 
-fn unit_count(based: BasedOn, lay: &TextLayout) -> usize {
-    match based {
-        BasedOn::Characters => lay.chars,
-        BasedOn::CharactersExcludingSpaces => lay.chars_no_space,
-        BasedOn::Words => lay.words,
-        BasedOn::Lines => lay.lines,
-    }
-}
-
 fn layer_seed(layer: &Layer, seed: f64) -> u64 {
     (seed as i64 as u64) ^ layer.id.0.wrapping_mul(0x9E37_79B9)
 }
@@ -179,6 +170,31 @@ fn range_params(ctx: &EvalCtx, layer: &Layer, sel: &PropGroup, n: usize) -> Rang
     }
 }
 
+/// A Range Selector as the viewer's bars see it (#1011): Based On, whether Units is Index, and
+/// Start / End / Offset as the fractions the renderer uses.
+pub fn range_bars(ctx: &EvalCtx, layer: &Layer, sel: &PropGroup, lay: &TextLayout) -> (BasedOn, bool, Range) {
+    let adv = sel.sub("advanced");
+    let based = BasedOn::from_index(adv.map(|a| ctx.e(layer, a, "basedOn")).unwrap_or(0));
+    let index = adv.is_some_and(|a| ctx.e(layer, a, "units") == 1);
+    (based, index, range_params(ctx, layer, sel, lay.units(based)))
+}
+
+/// The Start / End value that puts a Range Selector bar at fraction `f` of the `n` units, with
+/// Offset `offset` (a fraction): the bar's place less the Offset, within 0..100%, or in whole
+/// units with Units = Index.
+pub fn range_value_of(f: f64, offset: f64, units_index: bool, n: usize) -> f64 {
+    let v = (f - offset).clamp(0.0, 1.0);
+    if units_index { (v * n as f64).round() } else { v * 100.0 }
+}
+
+/// Whether property `uid` of `layer` is a Range Selector's Start, End or Offset while its Units
+/// are Index: the value is then a count of characters (words, lines), not a percentage.
+pub fn in_index_units(layer: &Layer, uid: effectcraft_project::Uid) -> bool {
+    let Some(sel) = layer.props.parent_of(uid).filter(|g| g.match_id == "rangeSelector") else { return false };
+    let is_range_value = sel.props().any(|p| p.uid == uid && matches!(p.match_id.as_str(), "start" | "end" | "offset"));
+    is_range_value && sel.prop("advanced/units").is_some_and(|u| u.value == Value::Enum(1))
+}
+
 /// Selection of every glyph by an animator's selectors, per dimension.
 pub fn animator_selection(ctx: &EvalCtx, layer: &Layer, anim: &PropGroup, lay: &TextLayout) -> Vec<[f64; 3]> {
     let sels: Vec<&PropGroup> = anim.sub("selectors").map(|s| s.groups().filter(|g| g.enabled).collect()).unwrap_or_default();
@@ -199,7 +215,7 @@ pub fn animator_selection(ctx: &EvalCtx, layer: &Layer, anim: &PropGroup, lay: &
         };
         let mode = Mode::from_index(mode);
         let based = BasedOn::from_index(based);
-        let n = unit_count(based, lay);
+        let n = lay.units(based);
         let values: Box<dyn Fn(usize, usize, [f64; 3]) -> [f64; 3]> = match sel.match_id.as_str() {
             "rangeSelector" => {
                 let r = range_params(ctx, layer, sel, n);
@@ -271,11 +287,13 @@ pub fn char_transforms(ctx: &EvalCtx, layer: &Layer, text: &PropGroup, lay: &Tex
         let pos = get("position").map(|v| c3(v, 0.0));
         let anchor = get("anchor").map(|v| c3(v, 0.0));
         let scale = get("scale").map(|v| c3(v, 100.0));
-        let rot = get1("rotation");
-        let rx = get1("rotationX");
-        let ry = get1("rotationY");
-        let skew = get1("skew");
-        let skew_axis = get1("skewAxis");
+        let angles = CharacterAngles {
+            rotation: get1("rotation"),
+            rotation_x: get1("rotationX"),
+            rotation_y: get1("rotationY"),
+            skew: get1("skew"),
+            skew_axis: get1("skewAxis"),
+        };
         let op = get1("opacity");
         let fill = props.get("fillColor").map(|p| ctx.value(layer, p).as_color());
         let stroke = props.get("strokeColor").map(|p| ctx.value(layer, p).as_color());
@@ -322,21 +340,7 @@ pub fn char_transforms(ctx: &EvalCtx, layer: &Layer, text: &PropGroup, lay: &Tex
                     c.scale[d] *= 1.0 + (s[d] / 100.0 - 1.0) * k3[d];
                 }
             }
-            if let Some(r) = rot {
-                c.rotation += r * k;
-            }
-            if let Some(r) = rx {
-                c.rotation_x += r * k;
-            }
-            if let Some(r) = ry {
-                c.rotation_y += r * k;
-            }
-            if let Some(s) = skew {
-                c.skew += s * k;
-            }
-            if let Some(a) = skew_axis {
-                c.skew_axis = a;
-            }
+            angles.apply(c, k);
             if let Some(o) = op {
                 c.opacity *= 1.0 + (o / 100.0 - 1.0) * k;
             }
@@ -365,17 +369,7 @@ pub fn char_transforms(ctx: &EvalCtx, layer: &Layer, text: &PropGroup, lay: &Tex
             if let Some(w) = sw {
                 c.stroke_width += w * k;
             }
-            if let Some(t) = tracking {
-                let t = t * k;
-                match tracking_type {
-                    1 => c.track_before += t,
-                    2 => c.track_after += t,
-                    _ => {
-                        c.track_before += t * 0.5;
-                        c.track_after += t * 0.5;
-                    }
-                }
-            }
+            apply_tracking(c, tracking, tracking_type, k);
             if let Some(a) = line_anchor
                 && k.abs() >= c.line_anchor_k
             {
@@ -416,6 +410,50 @@ pub fn char_transforms(ctx: &EvalCtx, layer: &Layer, text: &PropGroup, lay: &Tex
     out
 }
 
+/// Optional animator orientation properties; an omitted property leaves the glyph unchanged.
+struct CharacterAngles {
+    rotation: Option<f64>,
+    rotation_x: Option<f64>,
+    rotation_y: Option<f64>,
+    skew: Option<f64>,
+    skew_axis: Option<f64>,
+}
+
+impl CharacterAngles {
+    fn apply(&self, c: &mut CharXf, k: f64) {
+        if let Some(r) = self.rotation {
+            c.rotation += r * k;
+        }
+        if let Some(r) = self.rotation_x {
+            c.rotation_x += r * k;
+        }
+        if let Some(r) = self.rotation_y {
+            c.rotation_y += r * k;
+        }
+        if let Some(s) = self.skew {
+            c.skew += s * k;
+        }
+        if let Some(a) = self.skew_axis {
+            c.skew_axis = a;
+        }
+    }
+}
+
+/// Distribute selected tracking before and/or after a glyph according to Tracking Type.
+fn apply_tracking(c: &mut CharXf, tracking: Option<f64>, tracking_type: u32, k: f64) {
+    if let Some(t) = tracking {
+        let t = t * k;
+        match tracking_type {
+            1 => c.track_before += t,
+            2 => c.track_after += t,
+            _ => {
+                c.track_before += t * 0.5;
+                c.track_after += t * 0.5;
+            }
+        }
+    }
+}
+
 /// Character Offset / Character Value substitution (None = unchanged).
 pub fn substitute(ch: char, x: &CharXf) -> Option<char> {
     if ch.is_whitespace() {
@@ -471,6 +509,9 @@ pub struct PlacedGlyph {
     pub fill: [f32; 4],
     pub stroke: [f32; 4],
     pub stroke_width: f64,
+    /// Faux Bold (or synthetic bold for a family without a bold face): how far the outline grows
+    /// on every side, in character space (0 when not bold).
+    pub bold: f64,
     /// The character's style fills it (Character panel fill on).
     pub apply_fill: bool,
     /// Index of the character in the text.
@@ -490,8 +531,30 @@ impl PlacedGlyph {
     pub fn path(&self) -> BezPath {
         effectcraft_path::transform(std::slice::from_ref(&self.local), &self.m2()).remove(0)
     }
+    /// [`Self::bold`] in layer space.
+    fn bold_in_layer(&self) -> f64 {
+        self.bold * self.m2().mean_scale()
+    }
+    /// Whether [`Self::bold`] grows the outline as evenly in layer space as in character space:
+    /// no bold, or a matrix that only rotates and scales uniformly.
+    fn bold_is_even(&self) -> bool {
+        let [[a, b, _], [c, d, _], _] = self.m2().0;
+        let n = a * a + b * b + c * c + d * d;
+        self.bold == 0.0 || ((a * a + c * c - b * b - d * d).abs() <= 1e-9 * n && (a * b + c * d).abs() <= 1e-9 * n)
+    }
 }
 
+/// How far a circle of radius `r` reaches along x and along y once mapped by `m`.
+fn axis_reach(m: &Mat3, r: f64) -> [f64; 2] {
+    let [[a, b, _], [c, d, _], _] = m.0;
+    [r * a.hypot(b), r * c.hypot(d)]
+}
+
+/// How far Faux Bold grows a glyph's outline on every side, as a fraction of its size: Inter
+/// Regular grown by this has about the stems of Inter Bold, so synthetic bold stands in for a
+/// missing bold face.
+const FAUX_BOLD_RADIUS: f64 = 0.03;
+
 /// Laid-out, animated text of a layer at the context time.
 pub struct TextGeom {
     pub doc: TextDoc,
@@ -769,6 +832,7 @@ pub fn text_geom(ctx: &EvalCtx, layer: &Layer) -> Option<TextGeom> {
             fill,
             stroke,
             stroke_width: (base_stroke_w + x.stroke_width).max(0.0),
+            bold: if g.synth_bold { FAUX_BOLD_RADIUS * g.size } else { 0.0 },
             apply_fill: st.apply_fill,
             char_index: g.char_index,
             rest,
@@ -818,17 +882,41 @@ fn passes(geom: &TextGeom) -> Vec<Pass> {
     v
 }
 
+/// Coverage of the outline grown by `d` on every side (shrunk when `d` is negative): the fill
+/// merged with, or cut by, a round stroke `2|d|` wide, which keeps the edges anti-aliased.
+fn grown_coverage(paths: &[BezPath], mm: &Mat3, w: u32, h: u32, d: f64) -> Mask {
+    let mut cov = effectcraft_path::fill_coverage(paths, mm, w, h, FillRule::NonZero);
+    if d.abs() < 1e-9 {
+        return cov;
+    }
+    let st = StrokeStyle { width: 2.0 * d.abs(), join: effectcraft_path::Join::Round, ..Default::default() };
+    let ring = effectcraft_path::stroke_coverage(paths, &st, mm, w, h);
+    for (c, r) in cov.data.iter_mut().zip(&ring.data) {
+        *c = if d > 0.0 { c.max(*r) } else { c.min(1.0 - r) };
+    }
+    cov
+}
+
 /// Rasterize one pass of a glyph — or of a run of glyphs painted alike, as one outline — (paths
 /// mapped into target pixels by `m`) into a premultiplied patch over the target rect, blurred
-/// when the character has Blur.
-fn raster_pass(g: &PlacedGlyph, stroke: bool, paths: &[BezPath], m: &Mat3, rect: [i64; 4], blur_px: [f64; 2]) -> Image {
+/// when the character has Blur. `bold` is the glyph's Faux Bold in the paths' space.
+fn raster_pass(g: &PlacedGlyph, stroke: bool, paths: &[BezPath], m: &Mat3, rect: [i64; 4], blur_px: [f64; 2], bold: f64) -> Image {
     let (w, h) = ((rect[2] - rect[0]) as u32, (rect[3] - rect[1]) as u32);
     let mm = Mat3::translate(vec2(-rect[0] as f64, -rect[1] as f64)) * *m;
-    let cov = if stroke {
+    let cov = if stroke && bold > 0.0 {
+        // The stroke of the bold outline: the band between it grown and shrunk by half the width.
+        let half = g.stroke_width / 2.0;
+        let mut outer = grown_coverage(paths, &mm, w, h, bold + half);
+        let inner = grown_coverage(paths, &mm, w, h, bold - half);
+        for (o, i) in outer.data.iter_mut().zip(&inner.data) {
+            *o = o.min(1.0 - i);
+        }
+        outer
+    } else if stroke {
         let st = StrokeStyle { width: g.stroke_width, join: effectcraft_path::Join::Round, ..Default::default() };
         effectcraft_path::stroke_coverage(paths, &st, &mm, w, h)
     } else {
-        effectcraft_path::fill_coverage(paths, &mm, w, h, FillRule::NonZero)
+        grown_coverage(paths, &mm, w, h, bold)
     };
     let col = if stroke { g.stroke } else { g.fill };
     let op = (g.xf.opacity / 100.0).clamp(0.0, 1.0) as f32;
@@ -884,10 +972,16 @@ fn runs(geom: &TextGeom) -> Vec<(Vec<usize>, bool)> {
         if g.xf.opacity <= 0.0 {
             continue;
         }
+        // A run grows its outline in layer space by one radius, which matches each glyph grown in
+        // its own space only when the bold stays round there.
         if geom.blend == BlendMode::Normal
             && solid_fill(g, stroke)
+            && g.bold_is_even()
             && let Some((run, false)) = out.last_mut()
-            && run.last().is_some_and(|&p| solid_fill(&geom.glyphs[p], false) && geom.glyphs[p].fill == g.fill)
+            && run.last().is_some_and(|&p| {
+                let q = &geom.glyphs[p];
+                solid_fill(q, false) && q.fill == g.fill && q.bold_is_even() && (q.bold_in_layer() - g.bold_in_layer()).abs() < 1e-6
+            })
         {
             run.push(gi);
             continue;
@@ -909,28 +1003,31 @@ fn draw_glyphs(geom: &TextGeom, img: &mut Image, to_px: &Mat3, s: f64, only: Opt
         // One glyph is drawn from its own outline; a run from its glyphs' outlines in layer
         // space, all wound the same way so overlaps add up instead of cancelling (NonZero).
         let local = Cow::Borrowed(std::slice::from_ref(&g.local));
-        let (paths, m): (Cow<[BezPath]>, Mat3) = match (only, run.as_slice()) {
-            (Some(_), _) => (local, *to_px),
-            (None, [_]) => (local, *to_px * g.m2()),
+        let (paths, m, bold): (Cow<[BezPath]>, Mat3, f64) = match (only, run.as_slice()) {
+            (Some(_), _) => (local, *to_px, g.bold),
+            (None, [_]) => (local, *to_px * g.m2(), g.bold),
             (None, _) => {
                 let wound = |p: BezPath| if kurbo::Shape::area(&p) < 0.0 { p.reverse_subpaths() } else { p };
-                (Cow::Owned(run.iter().map(|&gi| wound(geom.glyphs[gi].path())).collect()), *to_px)
+                (Cow::Owned(run.iter().map(|&gi| wound(geom.glyphs[gi].path())).collect()), *to_px, g.bold_in_layer())
             }
         };
         let Some(b) = effectcraft_path::bounds(&paths) else { continue };
         let blur = [g.xf.blur[0] * s, g.xf.blur[1] * s];
-        let pad = g.stroke_width * m.mean_scale() + 2.0 + blur[0].max(blur[1]) * 1.5;
+        // Stroke and bold grow the outline in the paths' space: under a non-uniform `m` they reach
+        // further along one axis than the other.
+        let [px, py] = axis_reach(&m, g.stroke_width + 2.0 * bold);
+        let pad = 2.0 + blur[0].max(blur[1]) * 1.5;
         let r = m.map_rect(&effectcraft_geom::Rect::new(b.x0, b.y0, b.x1, b.y1));
         let rect = [
-            ((r.x0 - pad).floor() as i64).max(0),
-            ((r.y0 - pad).floor() as i64).max(0),
-            ((r.x1 + pad).ceil() as i64).min(w),
-            ((r.y1 + pad).ceil() as i64).min(h),
+            ((r.x0 - px - pad).floor() as i64).max(0),
+            ((r.y0 - py - pad).floor() as i64).max(0),
+            ((r.x1 + px + pad).ceil() as i64).min(w),
+            ((r.y1 + py + pad).ceil() as i64).min(h),
         ];
         if rect[2] <= rect[0] || rect[3] <= rect[1] {
             continue;
         }
-        let patch = raster_pass(g, stroke, &paths, &m, rect, blur);
+        let patch = raster_pass(g, stroke, &paths, &m, rect, blur, bold);
         blit(img, &patch, [rect[0], rect[1]], if only.is_some() { BlendMode::Normal } else { geom.blend });
     }
 }
@@ -942,8 +1039,9 @@ pub fn render(ctx: &EvalCtx, layer: &Layer, s: f64) -> Buf {
     let mut bounds: Option<kurbo::Rect> = None;
     for g in &geom.glyphs {
         if let Some(b) = effectcraft_path::bounds(&[g.path()]) {
+            let [bx, by] = axis_reach(&g.m2(), 2.0 * g.bold);
             let pad = g.stroke_width + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
-            let b = b.inflate(pad, pad);
+            let b = b.inflate(pad + bx, pad + by);
             bounds = Some(bounds.map_or(b, |a| a.union(b)));
         }
     }
@@ -968,7 +1066,7 @@ pub fn per_char_planes(ctx: &EvalCtx, layer: &Layer, s: f64) -> Vec<(Buf, Mat4)>
             continue;
         }
         let Some(b) = effectcraft_path::bounds(std::slice::from_ref(&g.local)) else { continue };
-        let pad = g.stroke_width + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
+        let pad = g.stroke_width + 2.0 * g.bold + 2.0 + g.xf.blur[0].max(g.xf.blur[1]) * 1.5;
         let b = b.inflate(pad, pad);
         let w = ((b.width() * s).ceil() as u32 + 4).clamp(1, 4096);
         let h = ((b.height() * s).ceil() as u32 + 4).clamp(1, 4096);
diff --git a/crates/render/src/text/tests.rs b/crates/render/src/text/tests.rs
index 547c02d42..ea89e37b0 100644
--- a/crates/render/src/text/tests.rs
+++ b/crates/render/src/text/tests.rs
@@ -99,6 +99,24 @@ fn range_based_on_words_and_lines() {
     assert_eq!(s, vec![0.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0], "{s:?}");
 }
 
+/// With Units = Index a Range Selector's Start, End and Offset are character counts, not
+/// percentages (#1814); the selector's other values, and other selectors, are unaffected.
+#[test]
+fn index_units_mark_start_end_and_offset() {
+    let (mut p, _cid, comp) = setup(400, 200);
+    let mut l = text_layer(&mut p, &comp, doc("ABCDEFG", 30.0));
+    animator(&mut p, &mut l, &["opacity"], &["range", "wiggly"]);
+    let uid = |l: &Layer, path: &str| l.props.prop(path).unwrap_or_else(|| panic!("no {path}")).uid;
+    let base = "text/animators/#1/selectors/#1";
+    let range_values = ["start", "end", "offset"].map(|k| uid(&l, &format!("{base}/{k}")));
+    assert!(range_values.iter().all(|u| !in_index_units(&l, *u)), "Percentage, the default");
+    set(&mut l, &format!("{base}/advanced/units"), Value::Enum(1));
+    assert!(range_values.iter().all(|u| in_index_units(&l, *u)));
+    assert!(!in_index_units(&l, uid(&l, &format!("{base}/advanced/amount"))), "Amount stays a percentage");
+    assert!(!in_index_units(&l, uid(&l, "text/animators/#1/properties/opacity")));
+    assert!(!in_index_units(&l, uid(&l, "transform/opacity")));
+}
+
 #[test]
 fn range_start_end_and_offset_are_capped() {
     let (mut p, cid, comp) = setup(400, 200);
@@ -524,6 +542,7 @@ fn touching_glyphs_join_without_a_seam() {
             fill,
             stroke: [0.0; 4],
             stroke_width: 0.0,
+            bold: 0.0,
             apply_fill: true,
             char_index: 0,
             rest: [0.0; 2],
@@ -550,3 +569,75 @@ fn touching_glyphs_join_without_a_seam() {
     let multiply = draw(vec![glyph(4.0, 10.5, white, false), glyph(10.5, 17.0, white, false)], BlendMode::Multiply).get(10, 10);
     assert!(multiply[3] < 0.9, "{multiply:?}");
 }
+
+/// #1676: Faux Bold, and the synthetic bold of a style the family has no face for, are drawn.
+#[test]
+fn faux_bold_and_synthetic_bold_thicken_the_glyphs() {
+    // Total alpha and the alpha bounding box of a rendered word.
+    let ink = |d: TextDoc| {
+        let (mut p, cid, comp) = setup(400, 120);
+        let mut l = text_layer(&mut p, &comp, TextDoc { text: "Hamburg".into(), size: 60.0, ..d });
+        set(&mut l, "transform/position", Value::Vec3([40.0, 85.0, 0.0]));
+        p.comp_mut(cid).unwrap().layers.push(l);
+        let img = crate::render_frame(&p, cid, Tick::ZERO, 1.0);
+        (img.data.iter().map(|px| px[3]).sum::<f32>(), alpha_bbox(&img).unwrap())
+    };
+    let (plain, pb) = ink(TextDoc::default());
+    let (bold, bb) = ink(TextDoc { faux_bold: true, ..Default::default() });
+    assert!(bold > plain * 1.15, "faux bold adds ink: {plain} → {bold}");
+    // 0.03 em = 1.8 px on every side.
+    let grow = (bb[2] - bb[0]) - (pb[2] - pb[0]);
+    assert!((3..=6).contains(&grow), "and widens the word by about 3.6 px: {pb:?} → {bb:?}");
+    // Bundled Inter has no Bold Italic face: the italic face is drawn with synthetic bold.
+    let (italic, _) = ink(TextDoc { style: "Italic".into(), ..Default::default() });
+    let (bold_italic, _) = ink(TextDoc { style: "Bold Italic".into(), ..Default::default() });
+    assert!(bold_italic > italic * 1.15, "Bold Italic is bolder than Italic: {italic} → {bold_italic}");
+    // A stroke follows the bold outline: as wide as before, moved out with it.
+    let stroked = TextDoc { apply_fill: false, apply_stroke: true, stroke: [1.0; 4], stroke_width: 4.0, ..Default::default() };
+    let (ring, rb) = ink(stroked.clone());
+    let (bold_ring, brb) = ink(TextDoc { faux_bold: true, ..stroked });
+    assert!(bold_ring > ring * 0.95 && bold_ring < ring * 1.3, "the stroke keeps its width: {ring} → {bold_ring}");
+    assert!(brb[0] < rb[0] && brb[2] > rb[2], "{rb:?} → {brb:?}");
+}
+
+/// #1676: under a non-uniform character Scale the bold is grown in the character's space, so it
+/// reaches further along the stretched axis; it is neither clipped nor grown evenly in a run.
+#[test]
+fn faux_bold_under_a_non_uniform_scale() {
+    use kurbo::Shape;
+    let glyph = |x0: f64| PlacedGlyph {
+        local: kurbo::Rect::new(x0, 4.0, x0 + 4.0, 16.0).to_path(0.1),
+        m: Mat4::scale(vec3(9.0, 1.0, 1.0)),
+        xf: CharXf::default(),
+        fill: [1.0; 4],
+        stroke: [0.0; 4],
+        stroke_width: 0.0,
+        bold: 2.0,
+        apply_fill: true,
+        char_index: 0,
+        rest: [0.0; 2],
+    };
+    let geom = |glyphs| TextGeom { doc: TextDoc::default(), glyphs, fill_stroke: 0, blend: BlendMode::Normal };
+    assert_eq!(runs(&geom(vec![glyph(2.0), glyph(6.0)])).len(), 2, "bold glyphs stretched unevenly are drawn one by one");
+    // x 6..10 → 54..90, grown by 2 × 9 = 18 → 36..108; y 4..16 grown by 2 → 2..18.
+    let mut img = crate::Image::new(120, 24);
+    draw_glyphs(&geom(vec![glyph(6.0)]), &mut img, &Mat3::IDENTITY, 1.0, None);
+    for (x, y) in [(37, 10), (106, 10), (70, 3)] {
+        assert!(img.get(x, y)[3] > 0.99, "bold ink at ({x}, {y}): {:?}", img.get(x, y));
+    }
+    assert!(img.get(34, 10)[3] < 0.01 && img.get(110, 10)[3] < 0.01 && img.get(70, 0)[3] < 0.01);
+}
+
+/// #1011: what dragging a Range Selector bar to fraction `f` of the text writes.
+#[test]
+fn range_bar_drag_values() {
+    // Percentage: the bar's place less the Offset, within 0..100.
+    assert!((range_value_of(0.5, 0.0, false, 7) - 50.0).abs() < 1e-9);
+    assert!((range_value_of(0.5, 0.25, false, 7) - 25.0).abs() < 1e-9, "Offset 25%: the bar at 50% is Start 25%");
+    assert_eq!(range_value_of(0.1, 0.25, false, 7), 0.0, "never below 0");
+    assert_eq!(range_value_of(1.0, -0.5, false, 7), 100.0, "nor above 100");
+    // Index: whole units, the nearest boundary (3.4 of 7 characters → 3, 3.6 → 4).
+    assert_eq!(range_value_of(3.4 / 7.0, 0.0, true, 7), 3.0);
+    assert_eq!(range_value_of(3.6 / 7.0, 0.0, true, 7), 4.0);
+    assert_eq!(range_value_of(3.6 / 7.0, 2.0 / 7.0, true, 7), 2.0, "less a 2-character Offset");
+}
diff --git a/crates/render/src/three_d/mod.rs b/crates/render/src/three_d.rs
similarity index 93%
rename from crates/render/src/three_d/mod.rs
rename to crates/render/src/three_d.rs
index bccfc3e05..f2cc1c70a 100644
--- a/crates/render/src/three_d/mod.rs
+++ b/crates/render/src/three_d.rs
@@ -2,7 +2,7 @@
 //! compositor for runs of 3D layers.
 //!
 //! The 2D compositor (`Renderer::comp_frame`) walks the layer stack bottom-to-top; each run of
-//! consecutive 3D layers is handed to [`compose::draw_run`] as a group (2D layers break 3D
+//! consecutive 3D layers is handed to `compose::draw_run` as a group (2D layers break 3D
 //! groups, as in After Effects).
 
 pub mod adv;
diff --git a/crates/render/src/three_d/adv/mod.rs b/crates/render/src/three_d/adv.rs
similarity index 100%
rename from crates/render/src/three_d/adv/mod.rs
rename to crates/render/src/three_d/adv.rs
diff --git a/crates/render/src/three_d/adv/raster.rs b/crates/render/src/three_d/adv/raster.rs
index 972a627bb..395057935 100644
--- a/crates/render/src/three_d/adv/raster.rs
+++ b/crates/render/src/three_d/adv/raster.rs
@@ -8,6 +8,9 @@
 //! (already sorted back to front) are then shaded per fragment and blended over, depth-tested
 //! against the opaque surfaces.
 
+use std::cmp::Reverse;
+use std::collections::BinaryHeap;
+
 use rayon::prelude::*;
 
 use super::scene::{Scene, ShadowMap, Vertex};
@@ -422,6 +425,81 @@ fn shadow_raster(s: &Scene, m: &ShadowMap, casters: &[usize]) -> Vec<f32> {
     d
 }
 
+/// Hard cap on the shadow depth texels one render allocates (f32 depth texels).
+/// Quality map sizes derive from the raster resolution, and both the resolution and
+/// the light count come from the project, so without a scene-wide budget an
+/// arbitrarily large comp with arbitrarily many casting lights (point lights cost
+/// six faces) could balloon the allocation. 26 M texels (≈ 104 MB) holds one point
+/// light's full 2048-texel cube (6 × 2048² ≈ 25.2 M) and stays under WebGPU's default
+/// 128 MiB storage-binding limit; adapters with less fall back to the CPU raster.
+pub(crate) const MAX_SHADOW_TEXELS: u64 = 26_000_000;
+
+/// Long side of a quality shadow map: one map texel per output pixel, to a power of
+/// two, clamped to 512..4096 (raster sizes are user data and may be absurd). Draft
+/// (interactive fast-preview) renders keep the flat 512 budget, unchanged.
+pub(crate) fn shadow_map_size(width: u32, height: u32, draft: bool) -> u32 {
+    if draft {
+        return 512;
+    }
+    let side = width.max(height).clamp(512, 4096);
+    let mut size = 512u32;
+    while size < side {
+        size *= 2;
+    }
+    size
+}
+
+/// Per-face size of a point light's cube map: the full map size, since each face spans
+/// 90° and anything smaller is coarser than a spot light's map in the same comp (a
+/// point light low over a floor shows exactly that as stair-steps), capped at 2048 so
+/// one cube fits [`MAX_SHADOW_TEXELS`]. Draft keeps half the map size as before.
+pub(crate) fn shadow_point_face_size(size: u32, draft: bool) -> u32 {
+    if draft { (size / 2).max(1) } else { size.min(2048) }
+}
+
+/// Per-light map sizes (`None` = this light gets no shadow map). `kinds`: 0 = no
+/// shadows (costs nothing), 1 = single map (spot/parallel), 2 = point cube (budgeted
+/// as its six faces). Lights start at their full size; while the scene exceeds
+/// [`MAX_SHADOW_TEXELS`] the largest map above its floor is halved (power-of-two
+/// steps, the earliest light first on ties), and once every light is at its floor the
+/// last lights lose their shadows entirely. Deterministic, and O(n log n) in the
+/// light count: each light is halved at most a handful of times and dropped once.
+pub(crate) fn shadow_sizes(width: u32, height: u32, draft: bool, kinds: &[u32]) -> Vec<Option<u32>> {
+    let base = shadow_map_size(width, height, draft);
+    let faces = |k: u32| -> u64 { if k == 2 { 6 } else { 1 } };
+    let floor = |k: u32| -> u32 { if k == 2 { 128 } else { 512 } };
+    let mut sizes: Vec<u32> = kinds
+        .iter()
+        .map(|&k| match k {
+            0 => 0,
+            2 => shadow_point_face_size(base, draft),
+            _ => base,
+        })
+        .collect();
+    let cost = |z: u32, k: u32| -> u64 { (z as u64) * (z as u64) * faces(k) };
+    let mut total: u64 = sizes.iter().zip(kinds).map(|(&z, &k)| cost(z, k)).sum();
+    // Largest size first, then the lowest index.
+    let mut heap: BinaryHeap<(u32, Reverse<usize>)> =
+        sizes.iter().zip(kinds).enumerate().filter(|(_, (z, k))| **z > floor(**k)).map(|(i, (&z, _))| (z, Reverse(i))).collect();
+    while total > MAX_SHADOW_TEXELS {
+        let Some((z, Reverse(i))) = heap.pop() else { break };
+        let k = kinds[i];
+        total -= cost(z, k) - cost(z / 2, k);
+        sizes[i] = z / 2;
+        if z / 2 > floor(k) {
+            heap.push((z / 2, Reverse(i)));
+        }
+    }
+    for i in (0..sizes.len()).rev() {
+        if total <= MAX_SHADOW_TEXELS {
+            break;
+        }
+        total -= cost(sizes[i], kinds[i]);
+        sizes[i] = 0;
+    }
+    sizes.into_iter().map(|z| (z > 0).then_some(z)).collect()
+}
+
 /// Build the shadow maps of every shadow-casting light (lights marked `shadow == 0`).
 pub(crate) fn shadow_maps(s: &mut Scene, draft: bool) {
     let casters: Vec<usize> = (0..s.indices.len() / 3)
@@ -443,15 +521,37 @@ pub(crate) fn shadow_maps(s: &mut Scene, draft: bool) {
     }
     let centre = [0, 1, 2].map(|k| (lo[k] + hi[k]) * 0.5);
     let radius = ((hi[0] - lo[0]).powi(2) + (hi[1] - lo[1]).powi(2) + (hi[2] - lo[2]).powi(2)).sqrt() * 0.5 + 1.0;
-    let size = if draft { 512 } else { 1024 };
+    // Map sizes come from the raster (a quality map gives ~one texel per output
+    // pixel); the per-light budget keeps the scene allocation bounded because
+    // comp size and light count are user input (point lights cost six faces).
+    let kinds: Vec<u32> = s
+        .lights
+        .iter()
+        .map(|l| {
+            if l.shadow != 0 {
+                0
+            } else if l.kind > 1 {
+                2
+            } else {
+                1
+            }
+        })
+        .collect();
+    let sizes = shadow_sizes(s.width, s.height, draft, &kinds);
     let mut maps: Vec<ShadowMap> = vec![];
     for li in 0..s.lights.len() {
+        let Some(size) = sizes.get(li).copied().flatten() else {
+            s.lights[li].shadow = -1;
+            continue;
+        };
         if s.lights[li].shadow != 0 {
             s.lights[li].shadow = -1;
             continue;
         }
         let l = s.lights[li];
         let first = maps.len() as i32;
+        // Penumbra width in output pixels (the shader turns it into a tap reach at
+        // the receiver); the sampling bias is deliberately independent of it.
         let soft = 1.0 + (l.shadow_diffusion * 0.5).min(24.0);
         let pos = l.pos.map(|v| v as f64);
         let dir = l.dir.map(|v| v as f64);
@@ -468,7 +568,7 @@ pub(crate) fn shadow_maps(s: &mut Scene, draft: bool) {
                 maps.push(ShadowMap { view: basis(pos, dir, hint), focal, ortho: false, size, offset: 0, bias: 1.5, radius: soft });
             }
             _ => {
-                let fs = size / 2;
+                let fs = size;
                 for (f, d) in [
                     ([1.0, 0.0, 0.0], [0.0, 1.0, 0.0]),
                     ([-1.0, 0.0, 0.0], [0.0, 1.0, 0.0]),
diff --git a/crates/render/src/three_d/adv/scene.rs b/crates/render/src/three_d/adv/scene.rs
index 345179331..a97272434 100644
--- a/crates/render/src/three_d/adv/scene.rs
+++ b/crates/render/src/three_d/adv/scene.rs
@@ -62,6 +62,8 @@ pub struct Material {
     pub unlit: bool,
     pub accepts_lights: bool,
     pub receives_shadows: bool,
+    /// "Accepts Shadows: Only": draws just the shadows it receives, as black × their amount.
+    pub shadows_only: bool,
     pub casts_shadows: bool,
     /// Drawn (false for "Casts Shadows: Only").
     pub visible: bool,
@@ -92,6 +94,7 @@ impl Default for Material {
             unlit: false,
             accepts_lights: true,
             receives_shadows: true,
+            shadows_only: false,
             casts_shadows: false,
             visible: true,
             diffuse_k: 1.0,
@@ -104,7 +107,7 @@ impl Default for Material {
 impl Material {
     /// Drawn in the transparent (sorted, blended) pass.
     pub fn transparent(&self) -> bool {
-        self.alpha_mode == 2 || self.opacity < 0.999
+        self.alpha_mode == 2 || self.opacity < 0.999 || self.shadows_only
     }
 }
 
@@ -154,7 +157,8 @@ pub struct ShadowMap {
     pub offset: u32,
     /// Depth bias in texels (scaled by the texel footprint at the receiver).
     pub bias: f32,
-    /// PCF spread (texels).
+    /// Penumbra width (output pixels) requested by Shadow Diffusion; the shader
+    /// converts it to a tap reach via the receiver's texel footprint.
     pub radius: f32,
 }
 
@@ -360,6 +364,7 @@ fn card_material(ctx: &EvalCtx, layer: &Layer) -> Material {
         double_sided: true,
         accepts_lights: c.accepts_lights,
         receives_shadows: c.accepts_shadows != 0,
+        shadows_only: c.accepts_shadows == 2,
         casts_shadows: c.casts_shadows != 0,
         visible: c.casts_shadows != 2,
         diffuse_k: c.diffuse,
@@ -375,9 +380,11 @@ fn model_options(ctx: &EvalCtx, layer: &Layer, lin: bool) -> (Material, Option<m
     let e = |m: &str, d: u32| g.and_then(|g| g.get(m)).map_or(d, |p| ctx.value(layer, p).as_enum());
     let b = |m: &str| g.and_then(|g| g.get(m)).is_none_or(|p| ctx.value(layer, p).as_bool());
     let casts = e("castsShadows", 0);
+    let accepts = e("acceptsShadows", 1);
     let opts = Material {
         accepts_lights: b("acceptsLights"),
-        receives_shadows: e("acceptsShadows", 1) != 0,
+        receives_shadows: accepts != 0,
+        shadows_only: accepts == 2,
         casts_shadows: casts != 0,
         visible: casts != 2,
         ..Material::default()
@@ -873,13 +880,13 @@ fn collapsed_layer<'a>(r: &Renderer<'a>, ctx: &EvalCtx<'a>, layer: &Layer, item:
     let saved = b.outer;
     b.outer = saved * ctx.world_matrix(layer);
     let t = nctx.time;
-    let any_solo = nctx.comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
+    let any_solo = nctx.comp.any_solo();
     for l in nctx.comp.layers.iter().rev() {
         if !l.is_active_at(t)
             || l.is_light()
             || matches!(l.source, LayerSource::Camera)
             || (any_solo && !l.switches.solo)
-            || (!r.opts.guides && l.switches.guide)
+            || (!sub.opts.guides && l.switches.guide)
         {
             continue;
         }
diff --git a/crates/render/src/three_d/adv/shade.rs b/crates/render/src/three_d/adv/shade.rs
index 16d052872..0ebd0b1ac 100644
--- a/crates/render/src/three_d/adv/shade.rs
+++ b/crates/render/src/three_d/adv/shade.rs
@@ -82,9 +82,20 @@ pub fn f_schlick(f0: [f32; 3], v_h: f32) -> [f32; 3] {
     [f0[0] + (1.0 - f0[0]) * k, f0[1] + (1.0 - f0[1]) * k, f0[2] + (1.0 - f0[2]) * k]
 }
 
+/// Surface parameters used by the direct-light BRDF after texture sampling.
+#[derive(Clone, Copy)]
+pub struct BrdfSurface {
+    pub base: [f32; 3],
+    pub metallic: f32,
+    pub roughness: f32,
+    pub specular: f32,
+    pub diffuse: f32,
+}
+
 /// Cook–Torrance BRDF × N·L × π for one light: (diffuse colour factor, specular colour).
 /// Returned as the reflected fraction of the light's irradiance.
-pub fn brdf(base: [f32; 3], metallic: f32, rough: f32, spec_k: f32, diff_k: f32, n: [f32; 3], v: [f32; 3], l: [f32; 3]) -> [f32; 3] {
+pub fn brdf(surface: BrdfSurface, n: [f32; 3], v: [f32; 3], l: [f32; 3]) -> [f32; 3] {
+    let BrdfSurface { base, metallic, roughness: rough, specular: spec_k, diffuse: diff_k } = surface;
     let n_l = dot(n, l);
     if n_l <= 0.0 {
         return [0.0; 3];
@@ -206,36 +217,125 @@ pub fn shadow_coord(m: &ShadowMap, p: [f32; 3]) -> Option<(f32, f32, f32)> {
     }
 }
 
-/// Fraction of light reaching `p` through shadow map `m` (1 = lit), PCF over a 5×5 grid
-/// spread over `radius` texels.
-pub fn shadow_factor(m: &ShadowMap, texels: &[f32], p: [f32; 3], n_l: f32) -> f32 {
+/// Integer tap jitter hash: pure u32 bit math so the WGSL backend computes
+/// bit-identical jitter from the same inputs (a float hash would diverge between
+/// backends and break CPU/GPU parity).
+fn tap_hash(x: i32, y: i32) -> u32 {
+    let mut h = (x as u32).wrapping_mul(0x9E37_79B9) ^ (y as u32).wrapping_mul(0x85EB_CA6B);
+    h ^= h >> 16;
+    h = h.wrapping_mul(0x2545_F491);
+    h ^= h >> 15;
+    h
+}
+
+/// Upper bound of the PCF grid's taps per axis. The grid grows with the reach so taps
+/// stay about one texel apart for moderate penumbrae; the cap bounds the per-fragment
+/// cost of very wide ones (bilinear taps still overlap and the jitter dithers the rest).
+const PCF_MAX_TAPS: i32 = 10;
+
+/// Steepest receiver-plane slope the PCF extrapolates, in texel footprints of depth per
+/// texel (about 89°). Steeper planes are edge-on to the light, where their depth runs
+/// away; they are clamped to this slope.
+const PLANE_SLOPE_MAX: f32 = 64.0;
+
+/// Fraction of light reaching `p` through shadow map `m` (1 = lit). `ng` is the
+/// receiver's geometric (not normal-mapped) normal facing the viewer.
+///
+/// PCF over an N×N tap grid (5 ≤ N ≤ `PCF_MAX_TAPS`) spread over a reach derived
+/// from `radius` (the wanted penumbra in output pixels) divided by the receiver's
+/// texel footprint, each tap jittered by an integer hash of the receiver's
+/// sub-texel cell and the tap index, and each tap comparing against the four
+/// nearest texel centres with bilinear weights. The jitter detaches the tap grid
+/// from the texel axes (axis-aligned binary taps are what stair-step a straight
+/// shadow edge), and keying it below texel size keeps the dither finer than an
+/// output pixel even where one texel covers several. The bilinear compare makes
+/// each tap's contribution vary smoothly inside a texel instead of snapping.
+///
+/// Every texel is compared against the depth the receiver's own plane has at that
+/// texel's centre, not the receiver point's depth: a wide kernel on a surface tilted
+/// towards the light would otherwise see its own nearer depth and shadow itself.
+/// With that, the bias stays at texel scale; a diffusion-scaled bias lifts shadows
+/// off their casters.
+pub fn shadow_factor(m: &ShadowMap, texels: &[f32], p: [f32; 3], ng: [f32; 3], n_l: f32) -> f32 {
     let Some((u, v, z)) = shadow_coord(m, p) else { return 1.0 };
     let size = m.size as i64;
-    // Slope-scaled bias (world units are pixels).
-    // Texel footprint (world units) × PCF reach, steeper for grazing light.
+    // Slope-scaled bias at texel scale (world units are pixels), steeper for
+    // grazing light: it absorbs depth-raster error and the gap between the shading
+    // normal's plane and the faceted surface the map rasterised.
     let texel = if m.ortho { 1.0 / m.focal } else { z.abs() / m.focal };
-    let bias = m.bias * texel * (1.0 + m.radius) * (1.0 + 3.0 * (1.0 - n_l.clamp(0.0, 1.0)));
-    let step = m.radius / 2.0;
+    let bias = m.bias * texel * (1.0 + 3.0 * (1.0 - n_l.clamp(0.0, 1.0)));
+    let at = |xi: i64, yi: i64| -> f32 {
+        if xi < 0 || yi < 0 || xi >= size || yi >= size {
+            return f32::INFINITY; // outside the map: the light was never blocked there (WGSL mirrors this with a large finite depth)
+        }
+        texels.get(m.offset as usize + (yi * size + xi) as usize).copied().unwrap_or(f32::INFINITY)
+    };
+    // The receiver plane in light space as the slope of its depth across the map, in
+    // texel footprints per texel (`tx`, `ty`; depth grows along −t), clamped where the
+    // plane grazes the light. `den0` is the plane normal against the light ray through
+    // the receiver (the depth axis for an orthographic map), negative while it faces it.
+    let w = &m.view;
+    let nv = [0, 1, 2].map(|r| w[r][0] * ng[0] + w[r][1] * ng[1] + w[r][2] * ng[2]);
+    let c = m.size as f32 * 0.5;
+    let den0 = if m.ortho { nv[2] } else { nv[0] * ((u - c) / m.focal) + nv[1] * ((v - c) / m.focal) + nv[2] };
+    let (tx, ty) = if den0 < -1e-6 {
+        ((nv[0] / den0).clamp(-PLANE_SLOPE_MAX, PLANE_SLOPE_MAX), (nv[1] / den0).clamp(-PLANE_SLOPE_MAX, PLANE_SLOPE_MAX))
+    } else {
+        (0.0, 0.0)
+    };
+    // 1 where texel (xi, yi) does not occlude the receiver plane at the texel's centre.
+    // Perspective depth is not linear across the map but its inverse is, so that
+    // compare runs on 1/depth (inv · (texel + bias) ≥ 1) without a division; a plane
+    // whose inverse depth reaches 0 has left the light's side and cannot be occluded.
+    let (iz, iq) = (1.0 / z, 1.0 / (m.focal * z));
+    let open = |xi: i64, yi: i64| -> f32 {
+        let s = at(xi, yi) + bias;
+        let g = tx * (xi as f32 + 0.5 - u) + ty * (yi as f32 + 0.5 - v);
+        let lit = if m.ortho {
+            z - g * texel <= s
+        } else {
+            let inv = iz + g * iq;
+            inv <= 0.0 || inv * s >= 1.0
+        };
+        if lit { 1.0 } else { 0.0 }
+    };
+    // `radius` is the wanted penumbra in output pixels; converting it through the
+    // receiver's texel footprint keeps the penumbra width in output pixels at any
+    // map resolution (and lets perspective penumbra grow with distance from the light).
+    // At least two texels: a hard edge then ramps across two texels, which hides the
+    // texel steps of the binary depth compare where one texel spans several output
+    // pixels (receivers grazing the light); a one-texel ramp leaves a sawtooth.
+    let mut reach = (m.radius / texel).clamp(2.0, 256.0);
+    if !reach.is_finite() {
+        reach = 1.0;
+    }
+    let n = (reach.ceil() as i32 + 1).clamp(5, PCF_MAX_TAPS);
+    let step = reach / (n - 1) as f32;
+    let half = (n - 1) as f32 * 0.5;
+    let (cx, cy) = ((u * 8.0).floor() as i32, (v * 8.0).floor() as i32);
     let mut lit = 0.0;
-    for j in -2..=2 {
-        for i in -2..=2 {
-            let x = (u + i as f32 * step).floor() as i64;
-            let y = (v + j as f32 * step).floor() as i64;
-            if x < 0 || y < 0 || x >= size || y >= size {
-                lit += 1.0;
-                continue;
-            }
-            let d = texels[m.offset as usize + (y * size + x) as usize];
-            if z - bias <= d {
-                lit += 1.0;
-            }
+    for j in 0..n {
+        for i in 0..n {
+            let h = tap_hash(cx.wrapping_add(i.wrapping_mul(7919)), cy.wrapping_add(j.wrapping_mul(7919)));
+            let jx = ((h & 0xFFFF) as f32) * (1.0 / 65536.0) - 0.5;
+            let jy = (((h >> 16) & 0xFFFF) as f32) * (1.0 / 65536.0) - 0.5;
+            let (su, sv) = (u + ((i as f32 - half) + jx) * step, v + ((j as f32 - half) + jy) * step);
+            // Texel (x, y) holds the depth at its centre (x + 0.5, y + 0.5); each of the
+            // four is compared against the receiver plane at that centre.
+            let (tu, tv) = (su - 0.5, sv - 0.5);
+            let (fx, fy) = (tu - tu.floor(), tv - tv.floor());
+            let (x0, y0) = (tu.floor() as i64, tv.floor() as i64);
+            let (h00, h10, h01, h11) = (open(x0, y0), open(x0 + 1, y0), open(x0, y0 + 1), open(x0 + 1, y0 + 1));
+            let a = h00 + (h10 - h00) * fx;
+            let b = h01 + (h11 - h01) * fx;
+            lit += a + (b - a) * fy;
         }
     }
-    lit / 25.0
+    lit / (n * n) as f32
 }
 
 /// The visibility of light `li` at `p` (1 = unshadowed), darkened by Shadow Darkness.
-pub fn light_shadow(s: &Scene, l: &Light, p: [f32; 3], n_l: f32) -> f32 {
+pub fn light_shadow(s: &Scene, l: &Light, p: [f32; 3], ng: [f32; 3], n_l: f32) -> f32 {
     if l.shadow < 0 {
         return 1.0;
     }
@@ -258,10 +358,20 @@ pub fn light_shadow(s: &Scene, l: &Light, p: [f32; 3], n_l: f32) -> f32 {
         s.shadows.get(first)
     };
     let Some(m) = m else { return 1.0 };
-    let f = shadow_factor(m, &s.shadow_texels, p, n_l);
+    let f = shadow_factor(m, &s.shadow_texels, p, ng, n_l);
     1.0 - l.shadow_darkness * (1.0 - f)
 }
 
+/// Unit direction from `p` to light `l`, and the distance (infinite for a parallel light).
+fn to_light(l: &Light, p: [f32; 3]) -> ([f32; 3], f32) {
+    if l.kind == 0 {
+        return (scale(l.dir, -1.0), f32::INFINITY);
+    }
+    let d = sub(l.pos, p);
+    let len = dot(d, d).sqrt();
+    if len < 1e-6 { ([0.0, 0.0, -1.0], 0.0) } else { (scale(d, 1.0 / len), len) }
+}
+
 /// Distance attenuation × spot cone of a light at `p` (AE falloff modes).
 pub fn attenuation(l: &Light, p: [f32; 3], to_l: [f32; 3], dist: f32) -> f32 {
     let mut k = match l.falloff {
@@ -341,6 +451,9 @@ pub fn shade(s: &Scene, f: &Frag) -> Option<[f32; 4]> {
     if let Some(t) = tex(m.tex_emissive) {
         emissive = [emissive[0] * t[0], emissive[1] * t[1], emissive[2] * t[2]];
     }
+    if m.shadows_only {
+        return Some(shadow_only(s, m, f, alpha));
+    }
     if m.unlit || !m.accepts_lights || (s.lights.is_empty() && s.env.is_none() && s.ambient == [0.0; 3]) {
         let c = add(rgb, emissive);
         return Some([c[0] * alpha, c[1] * alpha, c[2] * alpha, alpha]);
@@ -354,6 +467,8 @@ pub fn shade(s: &Scene, f: &Frag) -> Option<[f32; 4]> {
     if !f.front {
         n = scale(n, -1.0);
     }
+    // Shadow lookups follow the geometric surface, not the normal map.
+    let ng = n;
     if let Some(t) = tex(m.tex_normal) {
         let tn = [(t[0] * 2.0 - 1.0) * m.normal_scale, (t[1] * 2.0 - 1.0) * m.normal_scale, t[2] * 2.0 - 1.0];
         let tg = [f.tangent[0], f.tangent[1], f.tangent[2]];
@@ -370,13 +485,7 @@ pub fn shade(s: &Scene, f: &Frag) -> Option<[f32; 4]> {
     let v = if s.ortho { scale(s.cam_fwd, -1.0) } else { norm(sub(s.eye, f.pos)) };
     let mut out = [0.0f32; 3];
     for l in &s.lights {
-        let (to_l, dist) = if l.kind == 0 {
-            (scale(l.dir, -1.0), f32::INFINITY)
-        } else {
-            let d = sub(l.pos, f.pos);
-            let len = dot(d, d).sqrt();
-            if len < 1e-6 { ([0.0, 0.0, -1.0], 0.0) } else { (scale(d, 1.0 / len), len) }
-        };
+        let (to_l, dist) = to_light(l, f.pos);
         let k = attenuation(l, f.pos, to_l, dist);
         if k <= 0.0 {
             continue;
@@ -385,8 +494,8 @@ pub fn shade(s: &Scene, f: &Frag) -> Option<[f32; 4]> {
         if n_l <= 0.0 {
             continue;
         }
-        let sh = if m.receives_shadows { light_shadow(s, l, f.pos, n_l) } else { 1.0 };
-        let b = brdf(rgb, metallic, rough, m.specular_k, m.diffuse_k, n, v, to_l);
+        let sh = if m.receives_shadows { light_shadow(s, l, f.pos, ng, n_l) } else { 1.0 };
+        let b = brdf(BrdfSurface { base: rgb, metallic, roughness: rough, specular: m.specular_k, diffuse: m.diffuse_k }, n, v, to_l);
         for c in 0..3 {
             out[c] += b[c] * l.color[c] * k * sh;
         }
@@ -408,3 +517,25 @@ pub fn shade(s: &Scene, f: &Frag) -> Option<[f32; 4]> {
     let c = add(out, emissive);
     Some([c[0] * alpha, c[1] * alpha, c[2] * alpha, alpha])
 }
+
+/// "Accepts Shadows: Only" (classic `compose::shade_texel`): black at the strongest shadow any
+/// light casts on the fragment, nothing where it is unshadowed or takes no lights.
+fn shadow_only(s: &Scene, m: &Material, f: &Frag, alpha: f32) -> [f32; 4] {
+    if m.unlit || !m.accepts_lights {
+        return [0.0; 4];
+    }
+    let n = if f.front { norm(f.normal) } else { scale(norm(f.normal), -1.0) };
+    let mut amount = 0.0f32;
+    for l in &s.lights {
+        let (to_l, dist) = to_light(l, f.pos);
+        if attenuation(l, f.pos, to_l, dist) <= 0.0 {
+            continue;
+        }
+        let n_l = dot(n, to_l);
+        if n_l <= 0.0 {
+            continue;
+        }
+        amount = amount.max(1.0 - light_shadow(s, l, f.pos, n, n_l));
+    }
+    [0.0, 0.0, 0.0, alpha * amount]
+}
diff --git a/crates/render/src/three_d/adv/tests.rs b/crates/render/src/three_d/adv/tests.rs
index d276a0f06..f9a0f2066 100644
--- a/crates/render/src/three_d/adv/tests.rs
+++ b/crates/render/src/three_d/adv/tests.rs
@@ -16,7 +16,7 @@ fn brdf_matches_cook_torrance_formula() {
     let v = shade::norm([0.3, 0.1, 1.0]);
     let l = shade::norm([-0.4, 0.2, 1.0]);
     let (base, metal, rough) = ([0.8, 0.4, 0.2], 0.3f32, 0.45f32);
-    let got = shade::brdf(base, metal, rough, 1.0, 1.0, n, v, l);
+    let got = shade::brdf(shade::BrdfSurface { base, metallic: metal, roughness: rough, specular: 1.0, diffuse: 1.0 }, n, v, l);
     let h = shade::norm([v[0] + l[0], v[1] + l[1], v[2] + l[2]]);
     let (nv, nl, nh, vh) = (shade::dot(n, v), shade::dot(n, l), shade::dot(n, h), shade::dot(v, h));
     let a2 = (rough * rough).powi(2);
@@ -30,9 +30,9 @@ fn brdf_matches_cook_torrance_formula() {
         assert!((got[c] - expect).abs() < 1e-5, "channel {c}: {} vs {expect}", got[c]);
     }
     // No light from behind the surface.
-    assert_eq!(shade::brdf(base, metal, rough, 1.0, 1.0, n, v, [0.0, 0.0, -1.0]), [0.0; 3]);
+    assert_eq!(shade::brdf(shade::BrdfSurface { base, metallic: metal, roughness: rough, specular: 1.0, diffuse: 1.0 }, n, v, [0.0, 0.0, -1.0]), [0.0; 3]);
     // A white rough dielectric lit head-on reflects about its base colour (π folded in).
-    let w = shade::brdf([1.0; 3], 0.0, 1.0, 1.0, 1.0, n, n, n);
+    let w = shade::brdf(shade::BrdfSurface { base: [1.0; 3], metallic: 0.0, roughness: 1.0, specular: 1.0, diffuse: 1.0 }, n, n, n);
     assert!(w[0] > 0.95 && w[0] < 1.05, "{w:?}");
 }
 
@@ -237,6 +237,73 @@ fn shadows_darken_the_receiver() {
     assert!(img.data[75 * 200 + 100][0] > side[0] * 0.8);
 }
 
+#[test]
+fn accepts_shadows_only_draws_just_the_shadow() {
+    // #1691: a shadow catcher (card or plane primitive, "Accepts Shadows: Only") in front of a
+    // red backdrop card, an invisible sphere casting onto it, a point light behind the camera.
+    let (mut p, cid) = project(200, 150);
+    let red = p.add_item(
+        "R",
+        Default::default(),
+        None,
+        ItemKind::Solid(effectcraft_project::Solid { color: [1.0, 0.0, 0.0], width: 400, height: 400, pixel_aspect: 1.0 }),
+    );
+    add(&mut p, cid, LayerSource::Solid { item: red }, |l| {
+        l.switches.three_d = true;
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 300.0]));
+        set(l, "materialOptions/acceptsShadows", Value::Enum(0));
+    });
+    let white = p.add_item(
+        "W",
+        Default::default(),
+        None,
+        ItemKind::Solid(effectcraft_project::Solid { color: [1.0, 1.0, 1.0], width: 400, height: 400, pixel_aspect: 1.0 }),
+    );
+    add(&mut p, cid, LayerSource::Solid { item: white }, |l| {
+        l.switches.three_d = true;
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 200.0]));
+        set(l, "materialOptions/acceptsShadows", Value::Enum(2));
+    });
+    add(&mut p, cid, LayerSource::Primitive { kind: PrimitiveKind::Sphere }, |l| {
+        set(l, "geometryOptions/radius", Value::Scalar(30.0));
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 50.0]));
+        set(l, "materialOptions/castsShadows", Value::Enum(2));
+    });
+    add(&mut p, cid, LayerSource::Light { kind: LightKind::Point }, |l| {
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, -300.0]));
+        set(l, "lightOptions/castsShadows", Value::Bool(true));
+    });
+    let check = |img: &crate::Image, what: &str| {
+        let (mid, side) = (img.data[75 * 200 + 100], img.data[75 * 200 + 60]);
+        // Unshadowed: the catcher is see-through, the lit red card behind it shows.
+        assert!(side[0] > 0.5 && side[1] < side[0] * 0.25 && side[3] > 0.99, "{what}: side {side:?}");
+        // Shadowed: black over the red card.
+        assert!(mid[0] < 0.02 && mid[3] > 0.99, "{what}: shadow {mid:?} vs side {side:?}");
+    };
+    check(&render(&p, cid), "card");
+    // Nothing behind the catcher: only the shadow is opaque.
+    let solo = |p: &Project| {
+        let mut q = p.clone();
+        q.comp_mut(cid).unwrap().layers.pop();
+        let img = render(&q, cid);
+        let (mid, side) = (img.data[75 * 200 + 100], img.data[75 * 200 + 60]);
+        assert!(side[3] < 1e-3, "unshadowed catcher is transparent: {side:?}");
+        assert!(mid[3] > 0.5 && mid[0] < 1e-3, "shadow is black: {mid:?}");
+    };
+    solo(&p);
+    // The same with a plane primitive as the catcher.
+    let layers = &mut p.comp_mut(cid).unwrap().layers;
+    layers.remove(2);
+    add(&mut p, cid, LayerSource::Primitive { kind: PrimitiveKind::Plane }, |l| {
+        set(l, "geometryOptions/width", Value::Scalar(400.0));
+        set(l, "geometryOptions/height", Value::Scalar(400.0));
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 200.0]));
+        set(l, "materialOptions/acceptsShadows", Value::Enum(2));
+    });
+    check(&render(&p, cid), "plane");
+    solo(&p);
+}
+
 #[test]
 fn cards_and_environment_light() {
     let (mut p, cid) = project(120, 90);
@@ -614,3 +681,369 @@ fn stroke_regions_are_rings() {
     assert_eq!(outlines.len(), 1);
     assert_eq!(outlines[0].holes.len(), 1);
 }
+
+// ---------------------------------------------------------------- shadow quality
+
+use super::raster::{MAX_SHADOW_TEXELS, shadow_map_size, shadow_point_face_size, shadow_sizes};
+use super::scene::ShadowMap;
+
+/// Geometric normal of a receiver squarely facing a `flat_map` light (which looks along +z).
+const FACING: [f32; 3] = [0.0, 0.0, -1.0];
+
+/// Identity-view orthographic map: map coords are world x, y × `focal` offset by
+/// `size/2` (`focal` texels per world unit).
+fn flat_map(size: u32, focal: f32, radius: f32) -> ShadowMap {
+    ShadowMap { view: [[1.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0], [0.0, 0.0, 1.0, 0.0]], focal, ortho: true, size, offset: 0, bias: 1.5, radius }
+}
+
+/// Wall: texel columns ≥ a quarter of the map at depth 10, the rest unoccluded (1000).
+/// Its edge sits at world x = −size / (4·focal).
+fn wall_map(size: u32, focal: f32, radius: f32) -> (ShadowMap, Vec<f32>) {
+    let texels: Vec<f32> = (0..size * size).map(|i| if i % size >= size / 4 { 10.0 } else { 1000.0 }).collect();
+    (flat_map(size, focal, radius), texels)
+}
+
+/// Luma of a render of `cid` with its top layer (a light) set to cast shadows or not,
+/// at the given Shadow Diffusion.
+fn render_light_luma(p: &mut Project, cid: ItemId, casting: bool, diffusion: f64) -> Vec<f32> {
+    let comp = p.comp_mut(cid).unwrap();
+    set(&mut comp.layers[0], "lightOptions/castsShadows", Value::Bool(casting));
+    set(&mut comp.layers[0], "lightOptions/shadowDiffusion", Value::Scalar(diffusion));
+    render(p, cid).data.iter().map(|q| (q[0] + q[1] + q[2]) / 3.0).collect()
+}
+
+#[test]
+fn shadow_map_size_tracks_raster_resolution() {
+    assert_eq!(shadow_map_size(640, 360, false), 1024);
+    assert_eq!(shadow_map_size(1920, 1080, false), 2048);
+    assert_eq!(shadow_map_size(3840, 2160, false), 4096);
+    // Clamped to the pow2 range: small or absurd rasters stay inside 512..4096.
+    assert_eq!(shadow_map_size(64, 64, false), 512);
+    assert_eq!(shadow_map_size(0, 0, false), 512);
+    assert_eq!(shadow_map_size(u32::MAX, u32::MAX, false), 4096);
+    assert_eq!(shadow_map_size(7, 100000, false), 4096);
+    // The fast-preview (draft) budget stays at 512 regardless, so interactivity is
+    // untouched by the quality path's new sizing.
+    assert_eq!(shadow_map_size(3840, 2160, true), 512);
+    assert_eq!(shadow_map_size(0, 0, true), 512);
+}
+
+#[test]
+fn shadow_point_faces_are_capped() {
+    // Cube faces take the full map size up to 2048 (one 2048 cube ≈ 25 M f32 texels).
+    assert_eq!(shadow_point_face_size(4096, false), 2048);
+    assert_eq!(shadow_point_face_size(2048, false), 2048);
+    assert_eq!(shadow_point_face_size(1024, false), 1024);
+    assert_eq!(shadow_point_face_size(512, false), 512);
+    // Draft keeps the historical half-size face.
+    assert_eq!(shadow_point_face_size(512, true), 256);
+}
+
+fn budget_texels(sizes: &[Option<u32>], kinds: &[u32]) -> u64 {
+    sizes.iter().zip(kinds).map(|(s, &k)| s.map(|z| (z as u64) * (z as u64) * if k == 2 { 6 } else { 1 }).unwrap_or(0)).sum()
+}
+
+#[test]
+fn shadow_sizes_stay_within_the_scene_budget() {
+    // Within budget a light gets its full size: one 4K point cube keeps 2048 faces.
+    assert_eq!(shadow_sizes(4096, 2160, false, &[2]), vec![Some(2048)]);
+    // Several cubes overflow: deterministically halved (largest first, earliest light
+    // on ties) until inside: three or four settle at 1024, five push two to 512.
+    assert_eq!(shadow_sizes(4096, 2160, false, &[2; 3]), vec![Some(1024); 3]);
+    assert_eq!(shadow_sizes(4096, 2160, false, &[2; 4]), vec![Some(1024); 4]);
+    let sizes = shadow_sizes(4096, 2160, false, &[2; 5]);
+    assert_eq!(sizes, vec![Some(512), Some(512), Some(1024), Some(1024), Some(1024)]);
+    assert!(budget_texels(&sizes, &[2; 5]) <= MAX_SHADOW_TEXELS);
+    // A hostile light count can never break the cap; sizes only shrink or drop to None.
+    let many = vec![2u32; 1000];
+    let sizes = shadow_sizes(3840, 2160, false, &many);
+    assert_eq!(sizes.len(), 1000);
+    assert!(budget_texels(&sizes, &many) <= MAX_SHADOW_TEXELS);
+    assert!(sizes.iter().flatten().all(|&z| (128..=2048).contains(&z)));
+    // Deterministic: same inputs, same plan.
+    assert_eq!(sizes, shadow_sizes(3840, 2160, false, &many));
+    // Non-point lights and a modest scene keep full quality sizes.
+    assert_eq!(shadow_sizes(1920, 1080, false, &[1; 2]), vec![Some(2048), Some(2048)]);
+    // A light that casts nothing costs nothing: it stays None and leaves its
+    // full-size budget to the lights that do cast.
+    assert_eq!(shadow_sizes(640, 360, false, &[0, 1]), vec![None, Some(1024)]);
+    assert!(shadow_sizes(640, 360, false, &[0; 500]).iter().all(Option::is_none));
+}
+
+#[test]
+fn diffusion_does_not_lift_a_deep_shadow() {
+    // Shadow Diffusion may widen the penumbra but must not scale the depth bias: a
+    // point deep inside a shadow stays fully shadowed at any diffusion.
+    let (m, texels) = wall_map(64, 1.0, 1.0);
+    let deep = [0.0f32, 0.0, 13.5]; // u = 32: ±16 texels of margin around the edge at 16; z − bias 12 > 10
+    let hard = shade::shadow_factor(&m, &texels, deep, FACING, 1.0);
+    assert!(hard < 0.01, "deep shadow at radius 1: {hard}");
+    let wide = shade::shadow_factor(&flat_map(64, 1.0, 25.0), &texels, deep, FACING, 1.0);
+    assert!(wide < 0.01, "deep shadow at radius 25 (bias must not grow with radius): {wide}");
+}
+
+#[test]
+fn pcf_varies_within_a_texel() {
+    // Nearest-texel PCF snaps the edge to texel boundaries: two receivers 1/20 texel
+    // apart get bit-identical factors, which is what stair-steps straight edges.
+    // The filtering must produce coverage that varies within a single texel.
+    let (m, texels) = wall_map(64, 1.0, 2.0);
+    let mut pairs = 0;
+    let mut varying = 0;
+    let mut u = -17.0f32;
+    while u < -15.3 {
+        let a = shade::shadow_factor(&m, &texels, [u, 0.0, 13.5], FACING, 1.0);
+        let b = shade::shadow_factor(&m, &texels, [u + 0.05, 0.0, 13.5], FACING, 1.0);
+        pairs += 1;
+        if (a - b).abs() > 1e-6 {
+            varying += 1;
+        }
+        assert!((0.0..=1.0).contains(&a) && (0.0..=1.0).contains(&b), "{a} {b}");
+        u += 0.05;
+    }
+    assert!(pairs >= 30);
+    assert_eq!(varying, pairs, "coverage varies inside every texel along the edge");
+}
+
+#[test]
+fn wide_diffusion_keeps_shadow_depth_and_contact() {
+    // Scene: camera-facing floor, sphere casting, point light behind the camera and
+    // off to the upper right so most of the shadow lands beside the sphere, not
+    // behind it. Raising Shadow Diffusion must neither wash the shadow out (a
+    // diffusion-scaled bias leaks light into it) nor move where it touches.
+    let (mut p, cid) = project(200, 150);
+    add(&mut p, cid, LayerSource::Primitive { kind: PrimitiveKind::Plane }, |l| {
+        set(l, "geometryOptions/width", Value::Scalar(400.0));
+        set(l, "geometryOptions/height", Value::Scalar(400.0));
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 200.0]));
+        set(l, "materialOptions/baseColor", Value::Color([1.0, 1.0, 1.0, 1.0]));
+    });
+    add(&mut p, cid, LayerSource::Primitive { kind: PrimitiveKind::Sphere }, |l| {
+        set(l, "geometryOptions/radius", Value::Scalar(30.0));
+        set(l, "transform/position", Value::Vec3([100.0, 75.0, 50.0]));
+        set(l, "materialOptions/castsShadows", Value::Enum(1));
+    });
+    add(&mut p, cid, LayerSource::Light { kind: LightKind::Point }, |l| {
+        set(l, "transform/position", Value::Vec3([180.0, 20.0, -300.0]));
+        set(l, "lightOptions/castsShadows", Value::Bool(true));
+    });
+    let noshadow = render_light_luma(&mut p, cid, false, 0.0);
+    let d0 = render_light_luma(&mut p, cid, true, 0.0);
+    let d40 = render_light_luma(&mut p, cid, true, 40.0);
+    // Per-column darkening vs the shadowless render: depth (max darkening) and the
+    // deepest dark row (contact edge). Diffusion may blur the edge but must keep the
+    // shadow dark (no bias leak) and keep it where it touches (no lift).
+    let dep = |img: &[f32], x: usize| -> f32 { (20..140).map(|y| noshadow[y * 200 + x] - img[y * 200 + x]).fold(0.0f32, f32::max) };
+    let cols: Vec<usize> = (30..170).filter(|&x| dep(&d0, x) > 0.1).collect();
+    assert!(cols.len() > 30, "shadow covers many columns: {}", cols.len());
+    // Core depth: the 90th-percentile darkening over the d0 shadow's pixels. A blur
+    // only softens the rim and leaves the core dark; a bias leak lightens all of it.
+    let shadow_px: Vec<usize> = (20..140).flat_map(|y| (30..170).map(move |x| y * 200 + x)).filter(|&i| noshadow[i] - d0[i] > 0.1).collect();
+    let core = |img: &[f32]| -> f32 {
+        let mut v: Vec<f32> = shadow_px.iter().map(|&i| noshadow[i] - img[i]).collect();
+        v.sort_by(f32::total_cmp);
+        v[v.len() * 9 / 10]
+    };
+    let (core0, core40) = (core(&d0), core(&d40));
+    // Width of the shadow across its centre row: a diffusion-scaled bias shrinks the
+    // shadow (light leaks under its edges), while a correct filter keeps the extent
+    // and only softens the boundary (threshold crossings move at most with the
+    // penumbra, not with the bias).
+    let width = |img: &[f32]| -> f32 {
+        (30..130)
+            .map(|y| {
+                let dark: Vec<bool> = (0..200).map(|x| noshadow[y * 200 + x] - img[y * 200 + x] > 0.06).collect();
+                match (dark.iter().position(|&d| d), dark.iter().rposition(|&d| d)) {
+                    (Some(l), Some(r)) if r > l => (r - l) as f32,
+                    _ => 0.0,
+                }
+            })
+            .fold(0.0f32, f32::max)
+    };
+    let (w0, w40) = (width(&d0), width(&d40));
+    let wratio = w40 / w0;
+    assert!(w0 > 20.0, "shadow is wide enough to judge: {w0}");
+    assert!(core40 >= 0.9 * core0, "diffusion 40 keeps the shadow core dark: {core40:.4} vs {core0:.4}");
+    assert!(wratio >= 0.8, "diffusion 40 does not shrink the shadow: width {w40} vs {w0}");
+}
+
+#[test]
+fn penumbra_dithers_along_a_straight_edge() {
+    // Receivers at the same distance from a straight edge, one texel apart along it.
+    // A fixed tap grid gives each the same coverage, so the penumbra repeats texel by
+    // texel (stair-steps and bands); the jitter, keyed below texel size, must vary it.
+    let (m, texels) = wall_map(64, 1.0, 6.0);
+    let distinct = |vs: &[f32]| -> usize {
+        let mut bits: Vec<u32> = vs.iter().map(|v| v.to_bits()).collect();
+        bits.sort_unstable();
+        bits.dedup();
+        bits.len()
+    };
+    let along: Vec<f32> = (0..32).map(|k| shade::shadow_factor(&m, &texels, [-16.0, -16.0 + k as f32, 13.5], FACING, 1.0)).collect();
+    assert!(distinct(&along) >= 16, "coverage along the edge takes {} distinct values", distinct(&along));
+    // And finer than a texel: where one texel spans several output pixels (a grazing
+    // floor), dither keyed per texel would show as texel-sized blocks of grain.
+    let within: Vec<f32> = (0..8).map(|k| shade::shadow_factor(&m, &texels, [-16.0, 0.0625 + k as f32 * 0.125, 13.5], FACING, 1.0)).collect();
+    assert!(distinct(&within) >= 4, "coverage inside one texel takes {} distinct values", distinct(&within));
+}
+
+#[test]
+fn penumbra_width_is_independent_of_map_resolution() {
+    // One wall (edge at world x = −16) in a 64-texel map at 1 texel per world unit and
+    // a 256-texel map at 4. Shadow Diffusion sets the penumbra in output pixels (world
+    // units here), so a finer map must not narrow it.
+    let width = |size: u32, focal: f32| -> f32 {
+        let (m, texels) = wall_map(size, focal, 8.0);
+        let xs: Vec<f32> = (0..400).map(|k| -30.0 + k as f32 * 0.07).collect();
+        let f: Vec<f32> = xs.iter().map(|&x| shade::shadow_factor(&m, &texels, [x, 0.0, 13.5], FACING, 1.0)).collect();
+        let first_below = |t: f32| f.iter().position(|&v| v < t).map_or(f32::NAN, |i| xs[i]);
+        first_below(0.1) - first_below(0.9)
+    };
+    let (w64, w256) = (width(64, 1.0), width(256, 4.0));
+    assert!(w64 > 4.0 && w64 < 12.0, "penumbra spans about the requested 8 units: {w64}");
+    assert!((w256 / w64 - 1.0).abs() < 0.25, "same penumbra at any map resolution: {w64} vs {w256}");
+}
+
+#[test]
+fn tilted_receivers_do_not_shadow_themselves() {
+    // A receiver plane z = 100 + 4x (76° from the light, n·l ≈ 0.24), each texel holding
+    // its depth half a texel off-centre the way a rasteriser can. Wide taps must compare
+    // against the plane rather than the receiver point, and the slope-scaled bias must
+    // absorb the half-texel error, at every diffusion.
+    let (size, g) = (128u32, 4.0f32);
+    let c = size as f32 * 0.5;
+    let texels: Vec<f32> = (0..size * size).map(|i| 100.0 + g * ((i % size) as f32 - c)).collect();
+    let len = (1.0 + g * g).sqrt();
+    let (ng, n_l) = ([g / len, 0.0, -1.0 / len], 1.0 / len);
+    for radius in [1.0f32, 6.0, 25.0] {
+        let m = flat_map(size, 1.0, radius);
+        for k in 0..40 {
+            let x = -20.0 + k as f32 * 0.97;
+            let f = shade::shadow_factor(&m, &texels, [x, 3.3, 100.0 + g * x], ng, n_l);
+            assert!(f > 0.99, "radius {radius}, x {x}: lit tilted receiver shadowed itself ({f})");
+        }
+    }
+}
+
+#[test]
+fn lit_casters_do_not_shadow_themselves() {
+    // A sphere and a turned cube that cast shadows, lit by each light kind: the lit
+    // surface must render as bright as with shadows off at any Shadow Diffusion (a
+    // wide kernel on a surface tilted to the light must not see its own depth).
+    // 640×360: faces then span enough texels that near-grazing ones exercise the
+    // receiver plane's slope limit.
+    for (prim, rot_y) in [(PrimitiveKind::Sphere, 0.0), (PrimitiveKind::Cube, 35.0)] {
+        for kind in [LightKind::Point, LightKind::Spot, LightKind::Parallel] {
+            let (mut p, cid) = project(640, 360);
+            add(&mut p, cid, LayerSource::Primitive { kind: prim }, |l| {
+                set(l, "transform/position", Value::Vec3([320.0, 180.0, 100.0]));
+                if prim == PrimitiveKind::Sphere {
+                    set(l, "geometryOptions/radius", Value::Scalar(120.0));
+                } else {
+                    for k in ["width", "height", "depth"] {
+                        set(l, &format!("geometryOptions/{k}"), Value::Scalar(216.0));
+                    }
+                    set(l, "transform/rotationX", Value::Scalar(-25.0));
+                }
+                set(l, "transform/rotationY", Value::Scalar(rot_y));
+                set(l, "materialOptions/baseColor", Value::Color([1.0, 1.0, 1.0, 1.0]));
+                set(l, "materialOptions/castsShadows", Value::Enum(1));
+            });
+            add(&mut p, cid, LayerSource::Light { kind }, |l| {
+                set(l, "transform/position", Value::Vec3([-280.0, -108.0, -600.0]));
+                if let Some(poi) = l.props.prop_mut("transform/pointOfInterest") {
+                    poi.value = Value::Vec3([320.0, 180.0, 100.0]);
+                }
+            });
+            let noshadow = render_light_luma(&mut p, cid, false, 0.0);
+            let lit: Vec<usize> = (0..noshadow.len()).filter(|&i| noshadow[i] > 0.15).collect();
+            assert!(lit.len() > 10_000, "{prim:?} {kind:?}: lit area {}", lit.len());
+            for diffusion in [0.0, 20.0, 48.0] {
+                let img = render_light_luma(&mut p, cid, true, diffusion);
+                let dark = lit.iter().filter(|&&i| img[i] < 0.9 * noshadow[i]).count() as f32 / lit.len() as f32;
+                assert!(dark <= 0.02, "{prim:?} {kind:?} diffusion {diffusion}: {:.1} % of the lit surface self-shadowed", dark * 100.0);
+            }
+        }
+    }
+}
+
+#[test]
+fn shadow_sizes_match_the_halve_largest_rule_and_scale_to_many_lights() {
+    // The specification `shadow_sizes` implements, step by step: halve the largest map
+    // above its floor (earliest light on ties) until the scene fits, then drop maps
+    // from the last light.
+    let spec = |w: u32, h: u32, draft: bool, kinds: &[u32]| -> Vec<Option<u32>> {
+        let base = shadow_map_size(w, h, draft);
+        let mut sizes: Vec<u32> = kinds
+            .iter()
+            .map(|&k| {
+                if k == 0 {
+                    0
+                } else if k == 2 {
+                    shadow_point_face_size(base, draft)
+                } else {
+                    base
+                }
+            })
+            .collect();
+        let total = |s: &[u32]| -> u64 { s.iter().zip(kinds).map(|(&z, &k)| (z as u64) * (z as u64) * if k == 2 { 6 } else { 1 }).sum() };
+        while total(&sizes) > MAX_SHADOW_TEXELS {
+            let pick = (0..sizes.len()).filter(|&i| sizes[i] > if kinds[i] == 2 { 128 } else { 512 }).max_by_key(|&i| (sizes[i], std::cmp::Reverse(i)));
+            match pick {
+                Some(i) => sizes[i] /= 2,
+                None => match sizes.iter().rposition(|&z| z > 0) {
+                    Some(i) => sizes[i] = 0,
+                    None => break,
+                },
+            }
+        }
+        sizes.into_iter().map(|z| (z > 0).then_some(z)).collect()
+    };
+    let mut seed = 0x2545_F491u32;
+    for case in 0..300 {
+        seed = seed.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
+        let n = (seed >> 8) as usize % 40;
+        let kinds: Vec<u32> = (0..n)
+            .map(|_| {
+                seed = seed.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
+                (seed >> 16) % 3
+            })
+            .collect();
+        let (w, h, draft) = ([640, 1920, 3840, 8000][case % 4], [360, 1080, 2160, 100][case % 4], case % 7 == 0);
+        assert_eq!(shadow_sizes(w, h, draft, &kinds), spec(w, h, draft, &kinds), "case {case}: {kinds:?}");
+    }
+    // A hostile light count stays fast (n log n) and inside the budget.
+    let many = vec![2u32; 100_000];
+    let sizes = shadow_sizes(3840, 2160, false, &many);
+    assert!(budget_texels(&sizes, &many) <= MAX_SHADOW_TEXELS);
+}
+
+#[test]
+fn wide_penumbrae_are_smooth() {
+    // Coverage at a fixed distance across a wide penumbra, sampled along a straight
+    // edge, should be one smooth value plus fine dither. A 5×5 grid stretched over a
+    // 20-texel reach leaves gaps the jitter turns into coarse grain (σ ≈ 0.04, ten
+    // 8-bit levels); the grid grows with the reach to keep it below 0.02.
+    let (m, texels) = wall_map(256, 1.0, 20.0);
+    for off in [-5.0f32, 0.0, 5.0] {
+        let vs: Vec<f32> = (0..200).map(|k| shade::shadow_factor(&m, &texels, [-64.0 + off, -100.0 + k as f32, 13.5], FACING, 1.0)).collect();
+        let mean = vs.iter().sum::<f32>() / vs.len() as f32;
+        let sd = (vs.iter().map(|v| (v - mean).powi(2)).sum::<f32>() / vs.len() as f32).sqrt();
+        assert!(sd < 0.02, "offset {off}: penumbra grain σ = {sd:.4}");
+    }
+}
+
+#[test]
+fn hard_edges_ramp_over_two_texels() {
+    // At Shadow Diffusion 0 the edge still ramps across about two texels (10–90 %):
+    // where one texel spans several output pixels (a floor grazing a point light) a
+    // one-texel ramp leaves the binary compare's texel steps visible as a sawtooth.
+    let (m, texels) = wall_map(64, 1.0, 1.0);
+    for v0 in [0.0f32, 0.3, 7.6] {
+        let xs: Vec<f32> = (0..400).map(|k| -20.0 + k as f32 * 0.02).collect();
+        let f: Vec<f32> = xs.iter().map(|&x| shade::shadow_factor(&m, &texels, [x, v0, 13.5], FACING, 1.0)).collect();
+        let first_below = |t: f32| f.iter().position(|&v| v < t).map_or(f32::NAN, |i| xs[i]);
+        let w = first_below(0.1) - first_below(0.9);
+        assert!((1.7..3.0).contains(&w), "v {v0}: hard edge ramps over {w} texels");
+    }
+}
diff --git a/crates/render/src/three_d/camera.rs b/crates/render/src/three_d/camera.rs
index 5e1f983b2..30873b6a9 100644
--- a/crates/render/src/three_d/camera.rs
+++ b/crates/render/src/three_d/camera.rs
@@ -408,7 +408,7 @@ impl View3D {
         }
     }
     pub fn from_id(s: &str) -> Option<View3D> {
-        let k: String = s.chars().filter(|c| c.is_ascii_alphanumeric()).collect::<String>().to_ascii_lowercase();
+        let k: String = s.chars().filter(char::is_ascii_alphanumeric).collect::<String>().to_ascii_lowercase();
         View3D::ALL.into_iter().find(|v| v.id().eq_ignore_ascii_case(&k) || v.label().replace(' ', "").eq_ignore_ascii_case(&k))
     }
     pub fn is_ortho(self) -> bool {
diff --git a/crates/render/src/three_d/compose.rs b/crates/render/src/three_d/compose.rs
index 831ab3ec4..8e932819a 100644
--- a/crates/render/src/three_d/compose.rs
+++ b/crates/render/src/three_d/compose.rs
@@ -197,7 +197,7 @@ fn mb_samples(r: &Renderer, ctx: &EvalCtx, layer: &Layer) -> usize {
 /// Prepare a layer (buffer, geometry, material). `None` when it shows nothing.
 pub(crate) fn prepare<'a>(r: &Renderer, ctx: &EvalCtx<'a>, layer: &'a Layer, order: usize, out: (u32, u32), in_run: bool) -> Option<Item<'a>> {
     let buf = r.blend_layer_buf(ctx, layer)?;
-    prepare_with(r, ctx, layer, order, out, in_run, buf, Mat4::IDENTITY)
+    prepare_with(r, ctx, layer, order, out, in_run, PlaneInput { buf, local: Mat4::IDENTITY })
 }
 
 /// Prepare a layer as planes: one per character for per-character 3D text, else one.
@@ -205,24 +205,21 @@ pub(crate) fn prepare_all<'a>(r: &Renderer, ctx: &EvalCtx<'a>, layer: &'a Layer,
     if crate::text::per_char_3d(ctx, layer) {
         return crate::text::per_char_planes(ctx, layer, r.opts.scale)
             .into_iter()
-            .filter_map(|(buf, m)| prepare_with(r, ctx, layer, order, out, in_run, r.to_blend(Arc::new(buf), None), m))
+            .filter_map(|(buf, m)| prepare_with(r, ctx, layer, order, out, in_run, PlaneInput { buf: r.to_blend(Arc::new(buf), None), local: m }))
             .collect();
     }
     prepare(r, ctx, layer, order, out, in_run).into_iter().collect()
 }
 
-/// Prepare a plane showing `buf`, whose space maps into the layer through `local`.
-#[allow(clippy::too_many_arguments)]
-fn prepare_with<'a>(
-    r: &Renderer,
-    ctx: &EvalCtx<'a>,
-    layer: &'a Layer,
-    order: usize,
-    out: (u32, u32),
-    in_run: bool,
-    mut buf: Arc<Buf>,
+/// A processed plane and its mapping into the layer's coordinate system.
+struct PlaneInput {
+    buf: Arc<Buf>,
     local: Mat4,
-) -> Option<Item<'a>> {
+}
+
+/// Prepare the plane's geometry, motion samples and material.
+fn prepare_with<'a>(r: &Renderer, ctx: &EvalCtx<'a>, layer: &'a Layer, order: usize, out: (u32, u32), in_run: bool, plane: PlaneInput) -> Option<Item<'a>> {
+    let PlaneInput { mut buf, local } = plane;
     if buf.img.is_empty() {
         return None;
     }
@@ -497,13 +494,13 @@ fn collapsed_items<'a>(
     let op = ctx.opacity(layer) as f32 * r.opacity_mul();
     let Some((sub, nctx)) = r.collapse_into(ctx, layer, item, op) else { return vec![] };
     let t = nctx.time;
-    let any_solo = nctx.comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
+    let any_solo = nctx.comp.any_solo();
     let nested: Vec<&'a Layer> = nctx
         .comp
         .layers
         .iter()
         .rev()
-        .filter(|l| l.is_active_at(t) && l.has_video() && !l.switches.adjustment && (!any_solo || l.switches.solo) && (r.opts.guides || !l.switches.guide))
+        .filter(|l| l.is_active_at(t) && l.has_video() && !l.switches.adjustment && (!any_solo || l.switches.solo) && (sub.opts.guides || !l.switches.guide))
         .collect();
     let mut items = Vec::new();
     for (k, l) in nested.into_iter().enumerate() {
@@ -703,7 +700,7 @@ fn occlusion(c: &Item, p: Vec3, l: &LightState) -> [f32; 3] {
 
 /// A Classic 3D run prepared for an accelerator ([`Renderer::prepare_3d_run`]): every plane
 /// with its geometry, material and buffer, ready for the per-pixel depth sort, lighting and
-/// ray-cast shadows of [`draw_run`] on another device.
+/// ray-cast shadows of `draw_run` on another device.
 #[derive(Clone, Debug)]
 pub struct Run3d {
     /// Drawn planes in stack order, then shadow casters from outside the run (`draw` false).
@@ -971,7 +968,7 @@ pub(crate) fn environment_rotation(ctx: &EvalCtx) -> f32 {
         .to_radians() as f32
 }
 
-/// An Environment Light Background layer ready to draw (see [`draw_sky`]): the layer's
+/// An Environment Light Background layer ready to draw (see `draw_sky`): the layer's
 /// buffer in the blending space, its opacity and the camera's view rays. Also handed to an
 /// accelerator's compositor (`Renderer::sky_draw`).
 #[derive(Clone)]
diff --git a/crates/script/Cargo.toml b/crates/script/Cargo.toml
index 10c635ebc..6d03d1bdc 100644
--- a/crates/script/Cargo.toml
+++ b/crates/script/Cargo.toml
@@ -27,3 +27,6 @@ boa_engine = { workspace = true, features = ["js"] }
 [dev-dependencies]
 effectcraft-expr = { workspace = true }
 effectcraft-psd = { workspace = true }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+socket2 = "0.6"
diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs
index 19904c2af..11d837677 100644
--- a/crates/script/src/lib.rs
+++ b/crates/script/src/lib.rs
@@ -88,27 +88,7 @@ pub fn run_code(s: &mut Session, code: &str, name: &str) -> Outcome {
 
 #[cfg(test)]
 mod tests;
-#[cfg(test)]
-mod tests_callable;
-#[cfg(test)]
-mod tests_ease_presets;
-#[cfg(test)]
-mod tests_include;
-#[cfg(test)]
-mod tests_panels;
-#[cfg(test)]
-mod tests_tasks;
-#[cfg(test)]
-mod tests_ui;
-#[cfg(test)]
-mod tests_ui_more;
 
 // #760: `$.evalFile` and `BridgeTalk`.
-#[cfg(test)]
-mod tests_evalfile;
 // `/browser/…` is the web editor's file table, an absolute path on wasm; on Windows it has no
 // drive, so the script runtime resolves it under the current drive, where the host holds nothing.
-#[cfg(all(test, not(windows)))]
-mod tests_services;
-#[cfg(test)]
-mod tests_ui_mouse;
diff --git a/crates/script/src/matchnames.rs b/crates/script/src/matchnames.rs
index f0bf5f6aa..15c1201ea 100644
--- a/crates/script/src/matchnames.rs
+++ b/crates/script/src/matchnames.rs
@@ -237,6 +237,14 @@ const SHAPE_PROPS: &[(&str, &str, &str)] = &[
     ("twist", "angle", "ADBE Vector Twist Angle"),
     ("twist", "center", "ADBE Vector Twist Center"),
     ("merge", "mode", "ADBE Vector Merge Type"),
+    ("wiggle", "size", "ADBE Vector Roughen Size"),
+    ("wiggle", "detail", "ADBE Vector Roughen Detail"),
+    ("wiggle", "points", "ADBE Vector Roughen Points"),
+    ("wiggle", "speed", "ADBE Vector Temporal Freq"),
+    ("wiggle", "correlation", "ADBE Vector Correlation"),
+    ("wiggle", "phase", "ADBE Vector Temporal Phase"),
+    ("wiggle", "spatialPhase", "ADBE Vector Spatial Phase"),
+    ("wiggle", "seed", "ADBE Vector Random Seed"),
 ];
 
 /// Effects: our effect id → AE match name (the documented ones; the rest keep our id).
@@ -427,7 +435,8 @@ pub fn shape_kind(name: &str) -> Option<&'static str> {
 }
 
 /// Effects whose documented parameter match names are not numbered in display order:
-/// (effect id, param match id, number). Fill lists All Masks second but it is `-0007`.
+/// (effect id, param match id, number). Fill lists All Masks second but it is `-0007`. Params of
+/// these effects that After Effects doesn't have are numbered after the listed ones (#1405).
 const PARAM_NUMBERS: &[(&str, &str, usize)] = &[
     ("ec.generate.fill", "fillMask", 1),
     ("ec.generate.fill", "color", 2),
@@ -436,8 +445,42 @@ const PARAM_NUMBERS: &[(&str, &str, usize)] = &[
     ("ec.generate.fill", "opacity", 5),
     ("ec.generate.fill", "invert", 6),
     ("ec.generate.fill", "allMasks", 7),
+    ("ec.generate.stroke", "path", 1),
+    ("ec.generate.stroke", "color", 2),
+    ("ec.generate.stroke", "brushSize", 3),
+    ("ec.generate.stroke", "brushHardness", 4),
+    ("ec.generate.stroke", "opacity", 5),
+    ("ec.generate.stroke", "spacing", 6),
+    ("ec.generate.stroke", "paintStyle", 7),
+    ("ec.generate.stroke", "start", 8),
+    ("ec.generate.stroke", "end", 9),
+    ("ec.generate.stroke", "allMasks", 10),
+    ("ec.generate.stroke", "strokeSequentially", 11),
+    // -0001 is a hidden parameter and -0003 Channel Range, which we don't have; the per-channel
+    // controls are ours (After Effects edits the selected channel with the Master ones).
+    ("ec.color.huesaturation", "channelControl", 2),
+    ("ec.color.huesaturation", "hue", 4),
+    ("ec.color.huesaturation", "saturation", 5),
+    ("ec.color.huesaturation", "lightness", 6),
+    ("ec.color.huesaturation", "colorize", 7),
+    ("ec.color.huesaturation", "colorizeHue", 8),
+    ("ec.color.huesaturation", "colorizeSaturation", 9),
+    ("ec.color.huesaturation", "colorizeLightness", 10),
 ];
 
+/// The `-NNNN` number of the param `id` at 0-based `pos` among `fx`'s `params`.
+fn param_number(fx: &str, params: &[Node], id: &str, pos: usize) -> usize {
+    let listed = |p: &str| PARAM_NUMBERS.iter().find(|(f, q, _)| *f == fx && *q == p).map(|(_, _, n)| *n);
+    if let Some(n) = listed(id) {
+        return n;
+    }
+    let Some(last) = PARAM_NUMBERS.iter().filter(|(f, _, _)| *f == fx).map(|(_, _, n)| *n).max() else {
+        return pos + 1;
+    };
+    let unlisted_before = params.iter().take(pos).filter(|c| listed(c.match_id()).is_none()).count();
+    last + unlisted_before + 1
+}
+
 /// Match name of the node at the end of `chain` (layer root's children → … → node). `effect`
 /// params are numbered `<effect match name>-0001…` in parameter order, like After Effects.
 pub fn node(chain: &[&Node]) -> String {
@@ -460,11 +503,8 @@ pub fn node(chain: &[&Node]) -> String {
             let fx = parent.and_then(Node::as_group);
             match fx {
                 Some(g) => {
-                    let i = PARAM_NUMBERS
-                        .iter()
-                        .find(|(fx, p, _)| *fx == g.match_id && *p == id)
-                        .map(|(_, _, n)| *n)
-                        .unwrap_or_else(|| g.children.iter().position(|c| c.uid() == last.uid()).unwrap_or(0) + 1);
+                    let pos = g.children.iter().position(|c| c.uid() == last.uid()).unwrap_or(0);
+                    let i = param_number(&g.match_id, &g.children, id, pos);
                     format!("{}-{i:04}", effect(&g.match_id))
                 }
                 None => own(),
diff --git a/crates/script/src/model.rs b/crates/script/src/model.rs
index 8ae2819fc..258a6de2d 100644
--- a/crates/script/src/model.rs
+++ b/crates/script/src/model.rs
@@ -85,6 +85,7 @@ fn project(s: &Session) -> J {
         "workingSpace": p.settings.working_space.map(|w| format!("{w:?}")).unwrap_or_default(),
         "workingGamma": if p.settings.working_gamma_24() { 2.4 } else { 2.2 },
         "timeDisplayFrames": p.settings.time_display == effectcraft_project::TimeDisplayStyle::Frames,
+        "displayStartFrame": p.settings.frame_start,
         "renderQueue": p.render_queue.len(),
         "revision": s.revision,
     })
diff --git a/crates/script/src/prelude.js b/crates/script/src/prelude.js
index 78f77d6f8..a33714314 100644
--- a/crates/script/src/prelude.js
+++ b/crates/script/src/prelude.js
@@ -98,6 +98,8 @@ var ImportAsType = __enum("ImportAsType", ["COMP_CROPPED_LAYERS", "FOOTAGE", "CO
 ImportAsType.COMPOSITION_CROPPED_LAYERS = ImportAsType.COMP_CROPPED_LAYERS;
 ImportAsType.COMPOSITION = ImportAsType.COMP;
 var TimeDisplayType = __enum("TimeDisplayType", ["FRAMES", "TIMECODE"], 2012);
+// After Effects' values (FC_START_0 = 2612), as in docsforadobe/Types-for-Adobe.
+var FramesCountType = __enum("FramesCountType", ["FC_START_0", "FC_START_1", "FC_TIMECODE_CONVERSION"], 2612);
 var LogType = __enum("LogType", ["ERRORS_ONLY", "ERRORS_AND_SETTINGS", "ERRORS_AND_PER_FRAME_INFO"], 3212);
 var KeyframeLabel = __enum("KeyframeLabel", ["NONE"], 0);
 
@@ -187,7 +189,12 @@ BridgeTalk.pump = function () { return false; };
 
 // ------------------------------------------------------------------ File / Folder
 
-function __join(a, b) { return a.replace(/[\/\\]+$/, "") + "/" + b; }
+function __trimPathSeparators(path) {
+  var end = path.length;
+  while (end > 0 && (path.charAt(end - 1) === "/" || path.charAt(end - 1) === "\\")) end--;
+  return path.slice(0, end);
+}
+function __join(a, b) { return __trimPathSeparators(a) + "/" + b; }
 
 function File(path) {
   if (!(this instanceof File)) return new File(path);
@@ -290,9 +297,9 @@ Folder.prototype = {
   get fsName() { return this.__path; },
   get fullName() { return this.__path; },
   get absoluteURI() { return this.__path; },
-  get name() { return this.__path.replace(/[\/\\]+$/, "").split(/[\/\\]/).pop(); },
+  get name() { return __trimPathSeparators(this.__path).split(/[\/\\]/).pop(); },
   get displayName() { return this.name; },
-  get path() { var p = this.__path.replace(/[\/\\]+$/, "").split(/[\/\\]/); p.pop(); return p.join("/"); },
+  get path() { var p = __trimPathSeparators(this.__path).split(/[\/\\]/); p.pop(); return p.join("/"); },
   get parent() { return new Folder(this.path); },
   get exists() { return JSON.parse(__file("isDir", this.__path)) === true; },
   toString: function () { return this.__path; },
@@ -418,7 +425,7 @@ function __callable(o) {
   delete f.length;
   Object.setPrototypeOf(f, Object.getPrototypeOf(o));
   var keys = Object.keys(o);
-  for (var i = 0; i < keys.length; i++) f[keys[i]] = o[keys[i]];
+  for (const elem of keys) f[elem] = o[elem];
   var self = new Proxy(f, {
     get: __attr.get,
     apply: function (t, thisArg, args) { return self.property(args[0]); },
@@ -471,7 +478,7 @@ function MarkerValue(comment, chapter, url, frameTarget, cuePointName, params) {
 }
 MarkerValue.prototype.getParameters = function () {
   var o = {};
-  for (var i = 0; i < this.__params.length; i++) o[this.__params[i][0]] = this.__params[i][1];
+  for (const elem of this.__params) o[elem[0]] = elem[1];
   return o;
 };
 MarkerValue.prototype.setParameters = function (o) {
@@ -511,8 +518,8 @@ TextDocument.prototype = {
   set text(v) { this.__text = String(v); this.__textSet = true; },
   __style: function (k, d) {
     if (k in this.__changed) return this.__changed[k];
-    if (this.__base && this.__base.first && k in this.__base.first) return this.__base.first[k];
-    if (this.__base && this.__base.para && k in this.__base.para) return this.__base.para[k];
+    if (this.__base?.first && k in this.__base.first) return this.__base.first[k];
+    if (this.__base?.para && k in this.__base.para) return this.__base.para[k];
     return d;
   },
   __set: function (k, v) { this.__changed[k] = v; },
@@ -578,14 +585,14 @@ TextDocument.prototype = {
   },
   get tsume() { return this.__style("tsume", 0); },
   set tsume(v) { this.__set("tsume", __num(v)); },
-  get boxText() { return !!(this.__base && this.__base.box_size); },
+  get boxText() { return !!this.__base?.box_size; },
   get pointText() { return !this.boxText; },
-  get boxTextSize() { return this.__base && this.__base.box_size ? this.__base.box_size.slice() : undefined; },
+  get boxTextSize() { return this.__base?.box_size ? this.__base.box_size.slice() : undefined; },
   set boxTextSize(v) {
     var p = this.boxTextPos || [0, 0];
     this.__set("box", [p[0], p[1], v[0], v[1]]);
   },
-  get boxTextPos() { return this.__base && this.__base.box_size ? this.__base.box_pos.slice() : undefined; },
+  get boxTextPos() { return this.__base?.box_size ? this.__base.box_pos.slice() : undefined; },
   get startIndent() { return this.__style("indentLeft", 0); },
   set startIndent(v) { this.__set("indentLeft", __num(v)); },
   get endIndent() { return this.__style("indentRight", 0); },
@@ -663,7 +670,7 @@ PropertyBase.prototype = {
   get isMask() { return !!this.__info().isMask; },
   get selected() {
     var c = __get("item", { id: this.__layer.__comp }).selectedProperties;
-    for (var i = 0; i < c.length; i++) if (c[i][0] === this.__layer.__id && c[i][1] === this.__uid) return true;
+    for (const elem of c) if (elem[0] === this.__layer.__id && elem[1] === this.__uid) return true;
     return false;
   },
   set selected(v) {
@@ -839,7 +846,7 @@ Property.prototype.property = function () { return null; };
     i = __num(i, "keyIndex");
     // Only the key asked for: fetching the whole list made every key call linear (#814).
     var r = i >= 1 && Math.floor(i) === i ? __get("keys", { comp: this.__layer.__comp, layer: this.__layer.__id, uid: this.__uid, index: i - 1 }) : null;
-    if (!r || !r.key) throw __err("keyIndex " + i + " is out of range 1.." + (r ? r.count : this.numKeys));
+    if (!r?.key) throw __err("keyIndex " + i + " is out of range 1.." + (r ? r.count : this.numKeys));
     return r.key;
   };
   // Script value → engine JSON for `prop.set` / `prop.addKey`.
@@ -850,13 +857,13 @@ Property.prototype.property = function () { return null; };
       return __get("textdoc", { comp: this.__layer.__comp, layer: this.__layer.__id, uid: this.__uid, time: time, attrs: td.__attrs() });
     }
     if (t === "SHAPE") {
-      if (!v || !v.vertices) throw __err("value must be a Shape");
+      if (!v?.vertices) throw __err("value must be a Shape");
       var n = v.vertices.length;
-      function fit(a) { var o = []; for (var i = 0; i < n; i++) o.push(a && a[i] ? [a[i][0], a[i][1]] : [0, 0]); return o; }
+      function fit(a) { var o = []; for (var i = 0; i < n; i++) o.push(a?.[i] ? [a[i][0], a[i][1]] : [0, 0]); return o; }
       return { vertices: fit(v.vertices), in_tangents: fit(v.inTangents), out_tangents: fit(v.outTangents), closed: v.closed !== false };
     }
     if (t === "LAYER_INDEX") {
-      var idx = v && v.__id !== undefined ? v.index : __num(v);
+      var idx = v?.__id !== undefined ? v.index : __num(v);
       if (!idx) return null;
       return this.__layer.containingComp.layer(idx).__id;
     }
@@ -868,8 +875,11 @@ Property.prototype.property = function () { return null; };
     }
     if (info.dims > 1) {
       if (!(v instanceof Array)) throw __err("value must be an array of " + info.dims + " numbers");
+      // After Effects rejects an array of the wrong length instead of truncating or broadcasting it
+      // (#1936). Two values for a 3-D property stay legal, as they are in After Effects: z is 0.
+      if (v.length !== info.dims && !(info.dims === 3 && v.length === 2)) throw __err("Array is not of the correct dimension");
       var o = [];
-      for (var d = 0; d < info.dims; d++) o.push(d < v.length ? __num(v[d]) : (d === 2 ? 0 : __num(v[v.length - 1])));
+      for (var d = 0; d < info.dims; d++) o.push(d < v.length ? __num(v[d]) : 0);
       return o;
     }
     if (v instanceof Array) throw __err("value must be a number, not an array");
@@ -1171,7 +1181,7 @@ Layer.prototype = {
   },
   get selectedProperties() {
     var c = this.containingComp.__info().selectedProperties, out = [];
-    for (var i = 0; i < c.length; i++) if (c[i][0] === this.__id) out.push(__propOf(this, __get("node", { comp: this.__comp, layer: this.__id, uid: c[i][1] })));
+    for (const elem of c) if (elem[0] === this.__id) out.push(__propOf(this, __get("node", { comp: this.__comp, layer: this.__id, uid: elem[1] })));
     return out;
   },
   get parent() { var p = this.__info().parent; return p === null ? null : __layer(this.__comp, p); },
@@ -1199,7 +1209,7 @@ Layer.prototype = {
     var before = this.containingComp.__info().layers;
     __call("edit.duplicate", this.__p());
     var after = this.containingComp.__info().layers;
-    for (var i = 0; i < after.length; i++) if (before.indexOf(after[i]) < 0) return __layer(this.__comp, after[i]);
+    for (const elem of after) if (before.indexOf(elem) < 0) return __layer(this.__comp, elem);
     return null;
   },
   copyToComp: function (comp) {
@@ -1300,7 +1310,14 @@ AVLayer.prototype.constructor = AVLayer;
   }
   P.sourcePointToComp = function (p) { return pointIn(this, p, true); };
   P.compPointToSource = function (p) { return pointIn(this, p, false); };
-  P.replaceSource = function () { throw __err("replaceSource is not supported yet"); };
+  // Replace the layer's source item, keeping every layer property (After Effects'
+  // AVLayer.replaceSource). `fixExpressions` is accepted for compatibility: only AV sources are
+  // replaced, so the property tree and the layer's name stay and expressions keep resolving.
+  P.replaceSource = function (newSource, fixExpressions) {
+    if (newSource?.__id === undefined) throw __err("replaceSource needs a project item");
+    __call("layer.replaceSource", { comp: this.__comp, layers: [this.__id], item: newSource.__id, fixExpressions: !!fixExpressions });
+    return null;
+  };
   P.openInViewer = function () { __call("layer.openLayer", this.__p1()); return null; };
 })();
 
@@ -1358,7 +1375,7 @@ LayerCollection.prototype = {
     return layer;
   },
   add: function (item, duration) {
-    if (!item || item.id === undefined) throw __err("add(): expected an item");
+    if (item?.id === undefined) throw __err("add(): expected an item");
     var l = this.__new(__call("layer.addItem", { comp: this.__comp, item: item.id, time: 0 }));
     return this.__dur(l, duration);
   },
@@ -1401,15 +1418,15 @@ LayerCollection.prototype = {
   },
   precompose: function (indices, name, moveAllAttributes) {
     var ids = this.__ids(), sel = [];
-    for (var i = 0; i < indices.length; i++) sel.push(ids[indices[i] - 1]);
+    for (const elem of indices) sel.push(ids[elem - 1]);
     var r = __call("layer.precompose", { comp: this.__comp, layers: sel, name: String(name), mode: moveAllAttributes === false ? "leave" : "move" });
     return __item(r.comp);
   },
   byName: function (name) {
     var ids = this.__ids();
-    for (var i = 0; i < ids.length; i++) {
-      var l = __get("layer", { comp: this.__comp, layer: ids[i] });
-      if (l.name === name) return __layer(this.__comp, ids[i]);
+    for (const elem of ids) {
+      var l = __get("layer", { comp: this.__comp, layer: elem });
+      if (l.name === name) return __layer(this.__comp, elem);
     }
     return null;
   },
@@ -1480,7 +1497,7 @@ Item.prototype = {
   get label() { return this.__info().label; },
   set label(v) { __call("project.setLabel", { items: [this.__id], label: __num(v, "label") }); },
   get parentFolder() { return __item(this.__info().parent); },
-  set parentFolder(f) { __call("project.move", { items: [this.__id], folder: f && f.__id ? f.__id : null }); },
+  set parentFolder(f) { __call("project.move", { items: [this.__id], folder: f?.__id ? f.__id : null }); },
   get selected() { return this.__info().selected; },
   set selected(v) {
     var selection = __get("project").selection;
@@ -1502,8 +1519,11 @@ function AVItem() {}
 AVItem.prototype = Object.create(Item.prototype);
 (function () {
   function def(name, get, set) { Object.defineProperty(AVItem.prototype, name, { get: get, set: set }); }
-  def("width", function () { return this.__info().width; }, function (v) { this.__settings({ width: Math.round(__num(v, "width")) }); });
-  def("height", function () { return this.__info().height; }, function (v) { this.__settings({ height: Math.round(__num(v, "height")) }); });
+  // `anchor: 0` (top left): After Effects' width and height setters resize the frame and leave the
+  // layers at their coordinates. Re-anchoring the old frame in the new one belongs to the
+  // Composition Settings dialog, which is what `comp.settings` defaults to (#1942).
+  def("width", function () { return this.__info().width; }, function (v) { this.__settings({ width: Math.round(__num(v, "width")), anchor: 0 }); });
+  def("height", function () { return this.__info().height; }, function (v) { this.__settings({ height: Math.round(__num(v, "height")), anchor: 0 }); });
   def("pixelAspect", function () { return this.__info().pixelAspect; }, function (v) { this.__settings({ pixelAspect: __num(v) }); });
   def("duration", function () { return this.__info().duration; }, function (v) { this.__settings({ duration: __num(v, "duration") }); });
   def("frameRate", function () { return this.__info().frameRate; }, function (v) { this.__settings({ frameRate: __num(v, "frameRate") }); });
@@ -1511,7 +1531,7 @@ AVItem.prototype = Object.create(Item.prototype);
   def("hasVideo", function () { return this.__info().hasVideo; });
   def("hasAudio", function () { return this.__info().hasAudio; });
   def("footageMissing", function () { return !!this.__info().footageMissing; });
-  def("useProxy", function () { var p = this.__info().proxy; return !!(p && p.enabled); }, function (v) {
+  def("useProxy", function () { var p = this.__info().proxy; return !!p?.enabled; }, function (v) {
     if (!this.__info().proxy) throw __err("\"" + this.name + "\" has no proxy");
     __call("file.useProxy", { item: this.__id, on: !!v });
   });
@@ -1548,9 +1568,9 @@ CompItem.prototype.constructor = CompItem;
   });
   def("activeCamera", function () {
     var ids = this.__info().layers;
-    for (var i = 0; i < ids.length; i++) {
-      var l = __get("layer", { comp: this.__id, layer: ids[i] });
-      if (l.kind === "camera" && l.enabled && l.active) return __layer(this.__id, ids[i]);
+    for (const elem of ids) {
+      var l = __get("layer", { comp: this.__id, layer: elem });
+      if (l.kind === "camera" && l.enabled && l.active) return __layer(this.__id, elem);
     }
     return null;
   });
@@ -1590,7 +1610,7 @@ CompItem.prototype.constructor = CompItem;
       if (a < 1 || a > ids.length || Math.floor(a) !== a) throw __err("layer index " + a + " is out of range 1.." + ids.length);
       return __layer(this.__id, ids[a - 1]);
     }
-    if (a && a.__id !== undefined && typeof b === "number") {
+    if (a?.__id !== undefined && typeof b === "number") {
       var j = a.index + b;
       return j >= 1 && j <= ids.length ? __layer(this.__id, ids[j - 1]) : null;
     }
@@ -1603,9 +1623,9 @@ CompItem.prototype.constructor = CompItem;
   P.__controllers = function () {
     var out = [];
     (function walk(list) {
-      for (var i = 0; i < list.length; i++) {
-        if (list[i].kind === "property" || list[i].kind === "mirror" || list[i].kind === "media") out.push(list[i]);
-        if (list[i].children) walk(list[i].children);
+      for (const elem of list) {
+        if (elem.kind === "property" || elem.kind === "mirror" || elem.kind === "media") out.push(elem);
+        if (elem.children) walk(elem.children);
       }
     })(this.__eg().controls);
     return out;
@@ -1716,7 +1736,7 @@ FolderItem.prototype.constructor = FolderItem;
   Object.defineProperty(P, "numItems", { get: function () { return new ItemCollection(this.__id).length; } });
   Object.defineProperty(P, "parentFolder", {
     get: function () { return this.__id === 0 ? null : __item(this.__info().parent); },
-    set: function (f) { __call("project.move", { items: [this.__id], folder: f && f.__id ? f.__id : null }); },
+    set: function (f) { __call("project.move", { items: [this.__id], folder: f?.__id ? f.__id : null }); },
   });
   P.item = function (i) {
     var v = new ItemCollection(this.__id).__at(__num(i, "index"));
@@ -1760,7 +1780,7 @@ RenderQueueItem.prototype = {
   constructor: RenderQueueItem,
   __info: function () {
     var l = __call("renderQueue.list", {}).items;
-    for (var i = 0; i < l.length; i++) if (l[i].id === this.__id) return l[i];
+    for (const elem of l) if (elem.id === this.__id) return elem;
     throw __err("the render queue item no longer exists");
   },
   get comp() { return __item(this.__info().comp); },
@@ -1796,7 +1816,7 @@ RenderQueueItem.prototype = {
     var before = __call("renderQueue.list", {}).items.map(function (i) { return i.id; });
     __call("renderQueue.duplicate", { item: this.__id });
     var after = __call("renderQueue.list", {}).items;
-    for (var i = 0; i < after.length; i++) if (before.indexOf(after[i].id) < 0) return new RenderQueueItem(after[i].id);
+    for (const elem of after) if (before.indexOf(elem.id) < 0) return new RenderQueueItem(elem.id);
     return null;
   },
   applyTemplate: function () {},
@@ -1883,6 +1903,14 @@ Project.prototype = {
   set workingGamma(v) { __call("file.projectSettings", { workingGamma: __num(v) }); },
   get timeDisplayType() { return this.__info().timeDisplayFrames ? TimeDisplayType.FRAMES : TimeDisplayType.TIMECODE; },
   set timeDisplayType(v) { __call("file.projectSettings", { timeDisplay: v === TimeDisplayType.FRAMES ? "frames" : "timecode" }); },
+  get framesCountType() { return this.__info().displayStartFrame === 1 ? FramesCountType.FC_START_1 : FramesCountType.FC_START_0; },
+  set framesCountType(v) {
+    if (v === FramesCountType.FC_TIMECODE_CONVERSION) throw __err("framesCountType: Timecode Conversion is not supported, use FC_START_0 or FC_START_1");
+    if (v !== FramesCountType.FC_START_0 && v !== FramesCountType.FC_START_1) throw __err("Bad framesCountType value " + v);
+    __call("file.projectSettings", { frameStart: v === FramesCountType.FC_START_1 ? 1 : 0 });
+  },
+  get displayStartFrame() { return this.__info().displayStartFrame; },
+  set displayStartFrame(v) { __call("file.projectSettings", { frameStart: __num(v) }); },
   get expressionEngine() { return "javascript-1.0"; },
   set expressionEngine(v) {},
   item: function (i) {
@@ -1921,9 +1949,9 @@ Project.prototype = {
       }
     }
     var r = __call("file.import", args);
-    if (r.errors && r.errors.length) throw __err(r.errors.join("; "));
+    if (r.errors?.length) throw __err(r.errors.join("; "));
     // Composition imports create several footage items, but callers need the comp.
-    return __item(r.comps && r.comps.length ? r.comps[0] : r.items[0]);
+    return __item(r.comps?.length ? r.comps[0] : r.items[0]);
   },
   importFileWithDialog: function () { return null; },
   importPlaceholder: function (name, w, h, rate, dur) {
diff --git a/crates/script/src/runtime.rs b/crates/script/src/runtime.rs
index 192da5740..608c83d0e 100644
--- a/crates/script/src/runtime.rs
+++ b/crates/script/src/runtime.rs
@@ -710,7 +710,7 @@ pub(crate) fn outcome(output: Vec<String>, result: Result<J, ScriptError>) -> Ou
 /// don't block.
 ///
 /// ExtendScript's `#include` / `#includepath` are inlined first, and errors point at the file
-/// and line they came from ([`crate::include`]).
+/// and line they came from (`crate::include`).
 pub fn run(session: &mut Session, req: &ScriptRequest) -> Outcome {
     let expanded = match crate::include::expand(session, req.code, req.name) {
         Ok(x) => x,
diff --git a/crates/script/src/scriptui.js b/crates/script/src/scriptui.js
index af1e14b5e..4760d058b 100644
--- a/crates/script/src/scriptui.js
+++ b/crates/script/src/scriptui.js
@@ -213,7 +213,7 @@ function __uiResPlain(v) {
   if (v instanceof Array) return v.map(__uiResPlain);
   if (v && typeof v === "object" && v.__object) {
     var o = {};
-    for (var k = 0; k < v.__object.length; k++) o[v.__object[k][0]] = __uiResPlain(v.__object[k][1]);
+    for (const elem of v.__object) o[elem[0]] = __uiResPlain(elem[1]);
     return o;
   }
   return v;
@@ -222,8 +222,8 @@ function __uiResPlain(v) {
 // A resource's own properties and its child elements (in source order).
 function __uiResProps(res) {
   var props = {}, kids = [];
-  for (var k = 0; k < res.list.length; k++) {
-    var e = res.list[k];
+  for (const elem2 of res.list) {
+    var e = elem2;
     if (e[1] && typeof e[1] === "object" && e[1].__element) kids.push([e[0], { type: e[1].__element, list: e[1].list }]);
     else props[e[0]] = __uiResPlain(e[1]);
   }
@@ -239,17 +239,17 @@ function __uiApplyRes(c, res) {
   // Ranges before values, items before selections.
   if (props.minvalue !== undefined) c.minvalue = __num(props.minvalue);
   if (props.maxvalue !== undefined) c.maxvalue = __num(props.maxvalue);
-  if (props.items instanceof Array && c.items) for (var n = 0; n < props.items.length; n++) c.add("item", props.items[n]);
+  if (props.items instanceof Array && c.items) for (const elem of props.items) c.add("item", elem);
   for (var k in props) {
     if (__uiResSkip[k]) continue;
     var v = props[k];
     if (__uiSizes[k] && v instanceof Array) v = __dim(v[0], v[1]);
     c[k] = v;
   }
-  for (var j = 0; j < pk.kids.length; j++) {
-    var child = __uiAddRes(c, pk.kids[j][1]);
-    child.__key = pk.kids[j][0];
-    c[pk.kids[j][0]] = child;
+  for (const elem of pk.kids) {
+    var child = __uiAddRes(c, elem[1]);
+    child.__key = elem[0];
+    c[elem[0]] = child;
   }
   return c;
 }
@@ -268,7 +268,7 @@ Window.alert = function (s) { alert(s); };
 Window.confirm = function (s) { return confirm(s); };
 Window.prompt = function (m, d) { return prompt(m, d); };
 Window.find = function (type, title) {
-  for (var i = 0; i < __uiWins.length; i++) if (__uiWins[i].text === title) return __uiWins[i];
+  for (const elem of __uiWins) if (elem.text === title) return elem;
   return null;
 };
 
@@ -335,7 +335,7 @@ function __uiColor(c) {
   return null;
 }
 function __uiFontSize(f, g) {
-  var x = f && f.size !== undefined ? Number(f.size) : g && g.font && g.font.size !== undefined ? Number(g.font.size) : 12;
+  var x = f?.size !== undefined ? Number(f.size) : g?.font && g.font.size !== undefined ? Number(g.font.size) : 12;
   return x > 0 ? x : 12;
 }
 
@@ -371,11 +371,11 @@ function __uiGraphics() {
       this.__push({ op: "fill", color: brush ? brush.color : null, path: (path || this.currentPath).slice() });
     },
     strokePath: function (pen, path) {
-      this.__push({ op: "stroke", color: pen ? pen.color : null, width: pen && pen.lineWidth !== undefined ? pen.lineWidth : 1, path: (path || this.currentPath).slice() });
+      this.__push({ op: "stroke", color: pen ? pen.color : null, width: pen?.lineWidth !== undefined ? pen.lineWidth : 1, path: (path || this.currentPath).slice() });
     },
     drawString: function (text, pen, x, y, font) {
       var f = font || this.font;
-      this.__push({ op: "text", text: String(text), color: pen ? pen.color : null, x: __num(x || 0), y: __num(y || 0), size: __uiFontSize(f, this), style: String(f && f.style !== undefined ? f.style : "") });
+      this.__push({ op: "text", text: String(text), color: pen ? pen.color : null, x: __num(x || 0), y: __num(y || 0), size: __uiFontSize(f, this), style: String(f?.style !== undefined ? f.style : "") });
     },
     drawOSControl: function () { this.__push({ op: "os" }); },
     drawImage: function (img, x, y, w, h) { this.__push({ op: "image", image: __uiImageJson(img), x: __num(x || 0), y: __num(y || 0), w: w === undefined ? 0 : __num(w), h: h === undefined ? 0 : __num(h) }); },
@@ -384,7 +384,7 @@ function __uiGraphics() {
       var size = __uiFontSize(font, this);
       var lines = String(s).split("\n");
       var cw = size * 0.58, w = 0;
-      for (var i = 0; i < lines.length; i++) w = Math.max(w, Math.ceil(lines[i].length * cw));
+      for (const elem of lines) w = Math.max(w, Math.ceil(elem.length * cw));
       var n = lines.length;
       if (boundaryWidth > 0 && w > boundaryWidth) {
         n = Math.ceil(w / boundaryWidth) + lines.length - 1;
@@ -405,14 +405,14 @@ function __uiRunDraws(win) {
   })(win);
   if (!drawn.length) return;
   __uiLayout(win);
-  for (var k = 0; k < drawn.length; k++) {
-    var c = drawn[k];
+  for (const elem of drawn) {
+    var c = elem;
     c.__draw = [];
     c.graphics.__rec = c.__draw;
     try {
       c.onDraw.call(c, { type: "draw", target: c });
     } catch (e) {
-      try { writeLn("onDraw: " + (e && e.message ? e.message : e)); } catch (e2) {}
+      try { writeLn("onDraw: " + (e?.message ? e.message : e)); } catch (e2) {}
     }
     c.graphics.__rec = null;
   }
@@ -498,7 +498,7 @@ function __uiProto() {
       var arg = t === "image" || t === "iconbutton" ? text : typeof text === "object" && text !== null && !(text instanceof Array) ? "" : text;
       __uiInit(c, t, this.window, this, bounds, arg, props);
       if ((t === "dropdownlist" || t === "listbox") && text instanceof Array) {
-        for (var i = 0; i < text.length; i++) c.add("item", text[i]);
+        for (const elem of text) c.add("item", elem);
         c.text = "";
       }
       if (t === "slider" || t === "scrollbar") {
@@ -521,7 +521,7 @@ function __uiProto() {
       if (t === "checkbox" || t === "radiobutton") c.value = false;
       if (t === "edittext" && c.properties.multiline) c.__multiline = true;
       if (t === "edittext" && c.properties.readonly) c.__readonly = true;
-      if (c.properties && c.properties.name) c.name = c.properties.name;
+      if (c.properties?.name) c.name = c.properties.name;
       this.children.push(c);
       if (t === "tab" && this.type === "tabbedpanel" && this.__sel.length === 0) this.__sel = [this.children.length - 1];
       return c;
@@ -608,21 +608,21 @@ function __uiProto() {
     removeEventListener: function (name, fn, capture) {
       var k = String(name).toLowerCase();
       var m = capture ? this.__capture : this.__listeners;
-      if (m && m[k]) m[k] = m[k].filter(function (f) { return f !== fn; });
+      if (m?.[k]) m[k] = m[k].filter(function (f) { return f !== fn; });
     },
     dispatchEvent: function (e) { this.__fire("on" + String(e.type || e).charAt(0).toUpperCase() + String(e.type || e).slice(1)); },
     __fire: function (name) {
       var r;
       if (typeof this[name] === "function") r = this[name].call(this);
       var l = this.__listeners[name.slice(2).toLowerCase()];
-      if (l) for (var i = 0; i < l.length; i++) l[i].call(this, { type: name.slice(2).toLowerCase(), target: this });
+      if (l) for (const elem of l) elem.call(this, { type: name.slice(2).toLowerCase(), target: this });
       return r;
     },
     __handlers: function () {
       var out = [];
       var names = ["onClick", "onChange", "onChanging", "onDoubleClick", "onClose", "onShow", "onActivate", "onDeactivate", "onResize", "onDraw"];
-      for (var i = 0; i < names.length; i++) {
-        var n = names[i];
+      for (const elem of names) {
+        var n = elem;
         if (typeof this[n] === "function" || (this.__listeners[n.slice(2).toLowerCase()] || []).length) out.push(n);
       }
       return out;
@@ -634,8 +634,8 @@ function __uiProto() {
 (function () {
   var all = ["Window", "Panel", "Group", "Button", "IconButton", "StaticText", "EditText", "Checkbox", "RadioButton", "Slider",
     "Scrollbar", "Progressbar", "DropDownList", "ListBox", "TabbedPanel", "Tab", "ScriptUIImage"];
-  for (var i = 0; i < all.length; i++) {
-    var C = __ecGlobal[all[i]];
+  for (const elem of all) {
+    var C = __ecGlobal[elem];
     var p = __uiProto();
     for (var k in p) C.prototype[k] = p[k];
     Object.defineProperty(C.prototype, "bounds", {
@@ -737,8 +737,8 @@ function __uiMouseListeners(c, type, capture) {
 // The mouse events that reach a listener at `c`: its own, and its containers' (`inherited`).
 function __uiMouseWanted(c, inherited) {
   var out = inherited.slice();
-  for (var i = 0; i < __uiMouseKinds.length; i++) {
-    var t = __uiMouseKinds[i];
+  for (const elem of __uiMouseKinds) {
+    var t = elem;
     if (out.indexOf(t) < 0 && (__uiMouseListeners(c, t, false).length || __uiMouseListeners(c, t, true).length)) out.push(t);
   }
   return out;
@@ -793,7 +793,7 @@ function __uiMouseFire(target, type, v) {
     var l = __uiMouseListeners(c, type, capture);
     e.currentTarget = c;
     e.eventPhase = phase;
-    for (var i = 0; i < l.length; i++) if (typeof l[i] === "function") l[i].call(c, e);
+    for (const elem of l) if (typeof elem === "function") elem.call(c, e);
   };
   var n = path.length - 1;
   for (var i = 0; i < n; i++) {
@@ -832,7 +832,7 @@ function __uiJson(c, inherited) {
     if (m) o.margins = m;
     if (typeof c.spacing === "number") o.spacing = c.spacing;
     var kids = c.children;
-    for (var i = 0; i < kids.length; i++) o.children.push(__uiJson(kids[i], mouse));
+    for (const elem of kids) o.children.push(__uiJson(elem, mouse));
   }
   if (c.alignment !== null && c.alignment !== undefined) o.alignment = __uiAlign(c.alignment);
   if (c.type === "checkbox" || c.type === "radiobutton") o.checked = !!c.value;
@@ -840,7 +840,7 @@ function __uiJson(c, inherited) {
     o.value = Number(c.value) || 0;
     o.min = Number(c.minvalue) || 0;
     o.max = Number(c.maxvalue);
-    if (!(o.max === o.max)) o.max = 100;
+    if (Number.isNaN(o.max)) o.max = 100;
   }
   if (c.items) {
     o.items = c.items.map(function (it) { return String(it.text); });
@@ -859,8 +859,8 @@ function __uiJson(c, inherited) {
 // The open windows of this script, for the host.
 function __uiSnapshot() {
   var out = [];
-  for (var i = 0; i < __uiWins.length; i++) {
-    var w = __uiWins[i];
+  for (const elem of __uiWins) {
+    var w = elem;
     if (w.__shown && !w.__closed) __uiRunDraws(w);
     out.push({ id: w.__wid, kind: w.__kind, title: String(w.text || ""), visible: !!w.__shown && !w.__closed, modal: !!w.__modal, root: __uiJson(w) });
   }
@@ -871,12 +871,12 @@ function __uiSnapshot() {
 
 function __uiOpenCount() {
   var n = 0;
-  for (var i = 0; i < __uiWins.length; i++) if (__uiWins[i].__shown && !__uiWins[i].__closed) n++;
+  for (const elem of __uiWins) if (elem.__shown && !elem.__closed) n++;
   return n;
 }
 
 function __uiWin(id) {
-  for (var i = 0; i < __uiWins.length; i++) if (__uiWins[i].__wid === id) return __uiWins[i];
+  for (const elem of __uiWins) if (elem.__wid === id) return elem;
   return null;
 }
 function __uiFind(c, id) {
@@ -914,7 +914,7 @@ function __uiDispatch(winId, id, kind, valueJson) {
   if (!c || c.enabled === false) return;
   var radio = function () {
     var sib = c.parent ? c.parent.children : [];
-    for (var i = 0; i < sib.length; i++) if (sib[i] !== c && sib[i].type === "radiobutton") sib[i].value = false;
+    for (const elem of sib) if (elem !== c && elem.type === "radiobutton") elem.value = false;
     c.value = true;
   };
   // A mouse click carries the pointer's details ({x, y, button, detail, …keys}).
diff --git a/crates/script/src/socket.rs b/crates/script/src/socket.rs
index 6ac0d41d2..4103f12c1 100644
--- a/crates/script/src/socket.rs
+++ b/crates/script/src/socket.rs
@@ -50,20 +50,32 @@ mod imp {
 mod imp {
     use std::collections::BTreeMap;
     use std::io::{ErrorKind, Read, Write};
-    use std::net::{TcpListener, TcpStream, ToSocketAddrs};
-    use std::sync::Mutex;
+    use std::net::{Shutdown, TcpListener, TcpStream, ToSocketAddrs};
+    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::{Arc, Mutex};
     use std::time::{Duration, Instant};
 
-    use super::*;
+    use super::{J, err, json};
 
     enum Sock {
         Stream { s: TcpStream, buf: Vec<u8>, eof: bool },
         Listener(TcpListener),
     }
 
+    /// One open socket. Reading, writing and polling lock only it, never the whole table, so a
+    /// socket blocked on a slow peer doesn't hold up the others (#1248).
+    struct Entry {
+        sock: Mutex<Sock>,
+        /// A second handle on a stream, so `close` can wake a blocked read.
+        wake: Option<TcpStream>,
+        /// Closed or unusable after a mode error. Writes poll it because Windows sends may not
+        /// be interrupted by shutdown alone; queued operations recheck it after locking.
+        closed: AtomicBool,
+    }
+
     struct Table {
         next: u32,
-        socks: BTreeMap<u32, Sock>,
+        socks: BTreeMap<u32, Arc<Entry>>,
     }
 
     fn table() -> &'static Mutex<Table> {
@@ -72,13 +84,43 @@ mod imp {
     }
 
     fn add(s: Sock) -> u32 {
-        let mut t = table().lock().unwrap_or_else(|e| e.into_inner());
+        let wake = match &s {
+            Sock::Stream { s, .. } => s.try_clone().ok(),
+            Sock::Listener(_) => None,
+        };
+        let entry = Arc::new(Entry { sock: Mutex::new(s), wake, closed: AtomicBool::new(false) });
+        let mut t = table().lock().unwrap_or_else(std::sync::PoisonError::into_inner);
         let id = t.next;
         t.next += 1;
-        t.socks.insert(id, s);
+        t.socks.insert(id, entry);
         id
     }
 
+    /// The socket `id`, if open. The table is locked only for the lookup.
+    fn get(id: u32) -> Option<Arc<Entry>> {
+        table().lock().unwrap_or_else(std::sync::PoisonError::into_inner).socks.get(&id).cloned()
+    }
+
+    /// Forget socket `id`; a call blocked on it fails at once.
+    fn close(id: u32) {
+        let entry = table().lock().unwrap_or_else(std::sync::PoisonError::into_inner).socks.remove(&id);
+        if let Some(entry) = entry {
+            entry.closed.store(true, Ordering::Release);
+            if let Some(w) = &entry.wake {
+                let _ = w.shutdown(Shutdown::Both);
+            }
+        }
+    }
+
+    /// A test-only handle for establishing backpressure before exercising the public operations.
+    #[cfg(test)]
+    pub(super) fn test_stream(id: u32) -> TcpStream {
+        let entry = get(id).unwrap();
+        let sock = entry.sock.lock().unwrap();
+        let Sock::Stream { s, .. } = &*sock else { panic!("expected a stream") };
+        s.try_clone().unwrap()
+    }
+
     fn timeout(p: &J) -> Duration {
         Duration::from_secs_f64(p.get("timeout").and_then(J::as_f64).unwrap_or(10.0).clamp(0.0, 3600.0))
     }
@@ -98,8 +140,9 @@ mod imp {
         if utf8 { String::from_utf8_lossy(b).into_owned() } else { b.iter().map(|&c| c as char).collect() }
     }
 
-    /// Fill a stream's buffer until `done(buf)` or the timeout / end of stream.
-    fn fill(s: &mut TcpStream, buf: &mut Vec<u8>, eof: &mut bool, limit: Duration, done: impl Fn(&[u8]) -> bool) {
+    /// Fill a stream's buffer until `done(buf)` or the timeout / end of stream. Fails only when
+    /// the read deadline can't be set.
+    fn fill(s: &mut TcpStream, buf: &mut Vec<u8>, eof: &mut bool, limit: Duration, done: impl Fn(&[u8]) -> bool) -> std::io::Result<()> {
         let end = Instant::now() + limit;
         let mut chunk = [0u8; 4096];
         while !done(buf) && !*eof {
@@ -107,7 +150,7 @@ mod imp {
             if left.is_zero() {
                 break;
             }
-            let _ = s.set_read_timeout(Some(left.max(Duration::from_millis(1))));
+            s.set_read_timeout(Some(left.max(Duration::from_millis(1))))?;
             match s.read(&mut chunk) {
                 Ok(0) => *eof = true,
                 Ok(n) => buf.extend_from_slice(&chunk[..n]),
@@ -119,9 +162,59 @@ mod imp {
                 Err(_) => *eof = true,
             }
         }
+        Ok(())
     }
 
+    /// A failed mode transition leaves the stream unusable; reject queued operations and wake I/O.
+    fn change_mode(s: &TcpStream, entry: &Entry, nonblocking: bool, mode: &impl Fn(&TcpStream, bool) -> std::io::Result<()>) -> std::io::Result<()> {
+        mode(s, nonblocking).map_err(|e| {
+            entry.closed.store(true, Ordering::Release);
+            let _ = s.shutdown(Shutdown::Both);
+            let action = if nonblocking { "enable nonblocking mode" } else { "restore blocking mode" };
+            std::io::Error::other(format!("socket is unusable: cannot {action}: {e}"))
+        })
+    }
+
+    /// Write with one deadline and an explicit close signal. On Windows, shutdown alone does
+    /// not reliably interrupt a blocking send, so never leave a send blocked inside the OS.
+    /// The caller holds this socket's lock; restore blocking mode or retire the connection.
+    fn write(s: &mut TcpStream, data: &[u8], limit: Duration, entry: &Entry, mode: &impl Fn(&TcpStream, bool) -> std::io::Result<()>) -> std::io::Result<()> {
+        change_mode(s, entry, true, mode)?;
+        let end = Instant::now() + limit;
+        let result = (|| {
+            let mut pending = data;
+            while !pending.is_empty() {
+                if entry.closed.load(Ordering::Acquire) {
+                    return Err(std::io::Error::new(ErrorKind::ConnectionAborted, "the socket was closed"));
+                }
+                let left = end.saturating_duration_since(Instant::now());
+                if left.is_zero() {
+                    return Err(std::io::Error::from(ErrorKind::TimedOut));
+                }
+                match s.write(pending) {
+                    Ok(0) => return Err(std::io::Error::from(ErrorKind::WriteZero)),
+                    Ok(n) => pending = pending.get(n..).ok_or_else(|| std::io::Error::from(ErrorKind::InvalidData))?,
+                    Err(e) if e.kind() == ErrorKind::WouldBlock => std::thread::sleep(left.min(Duration::from_millis(5))),
+                    Err(e) if e.kind() == ErrorKind::Interrupted => continue,
+                    Err(e) => return Err(e),
+                }
+            }
+            Ok(())
+        })();
+        match (result, change_mode(s, entry, false, mode)) {
+            (Err(write), Err(restore)) => Err(std::io::Error::other(format!("{restore}; write also failed: {write}"))),
+            (result, Ok(())) => result,
+            (Ok(()), Err(restore)) => Err(restore),
+        }
+    }
+
+    /// Dispatch an authorized operation without holding the socket table during I/O.
     pub(super) fn run(op: &str, id: u32, p: &J) -> J {
+        run_with_mode(op, id, p, TcpStream::set_nonblocking)
+    }
+
+    /// Dispatch with a mode setter so exceptional OS failures can be injected per operation.
+    pub(super) fn run_with_mode(op: &str, id: u32, p: &J, mode: impl Fn(&TcpStream, bool) -> std::io::Result<()>) -> J {
         let utf8 = p.get("encoding").and_then(J::as_str).is_some_and(|e| e.eq_ignore_ascii_case("utf-8") || e.eq_ignore_ascii_case("utf8"));
         match op {
             "open" => {
@@ -156,43 +249,54 @@ mod imp {
                     Err(e) => err(format!("cannot listen on port {port}: {e}")),
                 }
             }
+            "close" => {
+                close(id);
+                json!({})
+            }
             _ => {
-                let mut t = table().lock().unwrap_or_else(|e| e.into_inner());
-                if op == "close" {
-                    t.socks.remove(&id);
-                    return json!({});
-                }
-                let Some(sock) = t.socks.get_mut(&id) else {
+                let Some(entry) = get(id) else {
                     return match op {
                         "connected" => json!({"value": false}),
                         "eof" => json!({"value": true}),
                         _ => err("the socket is not open"),
                     };
                 };
-                match (op, sock) {
+                let mut sock = entry.sock.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+                // Recheck after locking: close or a failed mode transition may have retired it
+                // while this caller waited with an Arc obtained from the table.
+                if entry.closed.load(Ordering::Acquire) {
+                    return match op {
+                        "connected" => json!({"value": false}),
+                        "eof" => json!({"value": true}),
+                        _ => err("the socket is closed or unusable"),
+                    };
+                }
+                match (op, &mut *sock) {
                     ("poll", Sock::Listener(l)) => match l.accept() {
                         Ok((s, peer)) => {
-                            let _ = s.set_nonblocking(false);
+                            if let Err(e) = s.set_nonblocking(false) {
+                                return err(format!("cannot use the connection from {peer}: {e}"));
+                            }
                             let host = peer.to_string();
-                            let new = Sock::Stream { s, buf: vec![], eof: false };
-                            let nid = t.next;
-                            t.next += 1;
-                            t.socks.insert(nid, new);
-                            json!({"id": nid, "host": host})
+                            json!({"id": add(Sock::Stream { s, buf: vec![], eof: false }), "host": host})
                         }
                         Err(_) => json!({"id": null}),
                     },
                     ("connected", Sock::Stream { s, buf, eof }) => {
                         if !*eof && buf.is_empty() {
                             // Peek without blocking to notice a closed peer.
-                            let _ = s.set_nonblocking(true);
+                            if let Err(e) = change_mode(s, &entry, true, &mode) {
+                                return err(e);
+                            }
                             let mut b = [0u8; 1];
                             match s.peek(&mut b) {
                                 Ok(0) => *eof = true,
                                 Err(e) if e.kind() != ErrorKind::WouldBlock => *eof = true,
                                 _ => {}
                             }
-                            let _ = s.set_nonblocking(false);
+                            if let Err(e) = change_mode(s, &entry, false, &mode) {
+                                return err(e);
+                            }
                         }
                         json!({"value": !(*eof && buf.is_empty())})
                     }
@@ -202,19 +306,25 @@ mod imp {
                         let count = p.get("count").and_then(J::as_i64).unwrap_or(-1);
                         let limit = timeout(p);
                         if count < 0 {
-                            fill(s, buf, eof, limit, |_| false);
+                            if let Err(e) = fill(s, buf, eof, limit, |_| false) {
+                                return err(format!("cannot set the read timeout: {e}"));
+                            }
                             let all = std::mem::take(buf);
                             json!({"data": decode(&all, utf8)})
                         } else {
                             let n = count as usize;
-                            fill(s, buf, eof, limit, |b| b.len() >= n);
+                            if let Err(e) = fill(s, buf, eof, limit, |b| b.len() >= n) {
+                                return err(format!("cannot set the read timeout: {e}"));
+                            }
                             let take = n.min(buf.len());
                             let out: Vec<u8> = buf.drain(..take).collect();
                             json!({"data": decode(&out, utf8)})
                         }
                     }
                     ("readln", Sock::Stream { s, buf, eof }) => {
-                        fill(s, buf, eof, timeout(p), |b| b.contains(&b'\n'));
+                        if let Err(e) = fill(s, buf, eof, timeout(p), |b| b.contains(&b'\n')) {
+                            return err(format!("cannot set the read timeout: {e}"));
+                        }
                         let line: Vec<u8> = match buf.iter().position(|&c| c == b'\n') {
                             Some(i) => {
                                 let mut l: Vec<u8> = buf.drain(..=i).collect();
@@ -229,9 +339,16 @@ mod imp {
                         json!({"data": decode(&line, utf8)})
                     }
                     ("write", Sock::Stream { s, .. }) => {
+                        // A peer that stops reading fills the buffers: give up after `timeout`
+                        // instead of blocking the script for good (#1248).
+                        let limit = timeout(p).max(Duration::from_millis(1));
                         let data = p.get("data").and_then(J::as_str).unwrap_or("");
-                        match s.write_all(&encode(data, utf8)).and_then(|_| s.flush()) {
+                        match write(s, &encode(data, utf8), limit, &entry, &mode) {
                             Ok(()) => json!({"ok": true}),
+                            Err(e) if matches!(e.kind(), ErrorKind::WouldBlock | ErrorKind::TimedOut) => err(format!(
+                                "write timed out after {} s: the other side isn't reading (some of the data may have been sent)",
+                                limit.as_secs_f64()
+                            )),
                             Err(e) => err(e),
                         }
                     }
@@ -242,3 +359,189 @@ mod imp {
         }
     }
 }
+
+#[cfg(test)]
+#[cfg(not(target_arch = "wasm32"))]
+mod tests {
+    use std::io::{ErrorKind, Read, Write};
+    use std::net::{TcpListener, TcpStream};
+    use std::sync::mpsc;
+    use std::time::{Duration, Instant};
+
+    use serde_json::{Value as J, json};
+
+    use super::imp::run;
+
+    /// A loopback peer that accepts one connection and never reads from it; returns its
+    /// `host:port` and the accepted stream's keeper (drop it to let the connection go).
+    fn stalled_peer() -> (String, mpsc::Sender<()>) {
+        let l = TcpListener::bind("127.0.0.1:0").unwrap();
+        socket2::SockRef::from(&l).set_recv_buffer_size(4096).unwrap();
+        let host = l.local_addr().unwrap().to_string();
+        let (stop, wait) = mpsc::channel::<()>();
+        std::thread::spawn(move || {
+            let (_s, _): (TcpStream, _) = l.accept().unwrap();
+            let _ = wait.recv_timeout(Duration::from_secs(120));
+        });
+        (host, stop)
+    }
+
+    /// Open a test connection through the production socket dispatcher.
+    fn open(host: &str) -> u32 {
+        let r = run("open", 0, &json!({"host": host, "timeout": 5}));
+        r["id"].as_u64().unwrap_or_else(|| panic!("open {host}: {r}")) as u32
+    }
+
+    /// Fill bounded socket buffers nonblocking, rather than assuming a 64 MiB write stalls.
+    /// In particular, Windows may accept that entire write with its default send buffering.
+    fn backpressure(id: u32) {
+        let mut stream = super::imp::test_stream(id);
+        socket2::SockRef::from(&stream).set_send_buffer_size(4096).unwrap();
+        stream.set_nonblocking(true).unwrap();
+        let start = Instant::now();
+        let chunk = [b'x'; 4096];
+        let mut sent = 0;
+        loop {
+            assert!(sent < 16 * 1024 * 1024 && start.elapsed() < Duration::from_secs(5), "could not establish backpressure");
+            match stream.write(&chunk) {
+                Ok(0) => panic!("peer closed while establishing backpressure"),
+                Ok(n) => sent += n,
+                Err(e) if e.kind() == ErrorKind::WouldBlock => break,
+                Err(e) if e.kind() == ErrorKind::Interrupted => continue,
+                Err(e) => panic!("establishing backpressure: {e}"),
+            }
+        }
+        stream.set_nonblocking(false).unwrap();
+    }
+
+    /// Run `f` on a thread; its result, or `None` if it takes longer than `limit`.
+    fn within<T: Send + 'static>(limit: Duration, f: impl FnOnce() -> T + Send + 'static) -> Option<T> {
+        let (tx, rx) = mpsc::channel();
+        std::thread::spawn(move || {
+            let _ = tx.send(f());
+        });
+        rx.recv_timeout(limit).ok()
+    }
+
+    /// A bounded write times out even when the peer never drains its receive buffer.
+    #[test]
+    fn a_write_to_a_peer_that_stops_reading_fails_after_the_timeout() {
+        // #1248: it used to block for good.
+        let (host, _keep) = stalled_peer();
+        let id = open(&host);
+        backpressure(id);
+        let data = "x".repeat(64 * 1024);
+        let t0 = Instant::now();
+        let r = within(Duration::from_secs(20), move || run("write", id, &json!({"data": data, "timeout": 1}))).expect("the write gave up");
+        assert!(r["error"].as_str().is_some_and(|e| e.contains("timed out")), "{r}");
+        assert!(t0.elapsed() >= Duration::from_millis(500) && t0.elapsed() < Duration::from_secs(15), "{:?}", t0.elapsed());
+        run("close", id, &J::Null);
+    }
+
+    /// Closing a stalled stream interrupts its writer without blocking another socket.
+    #[test]
+    fn a_blocked_socket_doesnt_hold_up_the_others_and_close_interrupts_it() {
+        let (host_a, _keep_a) = stalled_peer();
+        let (host_b, _keep_b) = stalled_peer();
+        let (a, b) = (open(&host_a), open(&host_b));
+        // A write on A that would wait a minute.
+        backpressure(a);
+        let data = "x".repeat(64 * 1024);
+        let (tx, blocked) = mpsc::channel();
+        std::thread::spawn(move || {
+            let _ = tx.send(run("write", a, &json!({"data": data, "timeout": 60})));
+        });
+        std::thread::sleep(Duration::from_millis(500));
+        assert!(matches!(blocked.try_recv(), Err(mpsc::TryRecvError::Empty)), "A must still be writing before close");
+        // Socket B answers meanwhile (the table isn't locked by A's write).
+        let r = within(Duration::from_secs(3), move || run("connected", b, &json!({}))).expect("socket B answered while A was blocked");
+        assert_eq!(r["value"], true, "{r}");
+        // Closing A returns at once and ends A's write.
+        within(Duration::from_secs(3), move || run("close", a, &J::Null)).expect("close returned while A was blocked");
+        let r = blocked.recv_timeout(Duration::from_secs(5)).expect("A's write ended when A was closed");
+        assert!(r.get("error").is_some(), "{r}");
+        run("close", b, &J::Null);
+    }
+
+    /// Failed mode changes retire the stream; subsequent I/O fails instead of using it.
+    #[test]
+    fn mode_restoration_failure_retires_streams() {
+        for (op, fail_nonblocking) in [("write", false), ("connected", false), ("write", true), ("connected", true)] {
+            let (host, _keep) = stalled_peer();
+            let id = open(&host);
+            let result = super::imp::run_with_mode(op, id, &json!({"data": "hello"}), |s, nonblocking| {
+                if nonblocking == fail_nonblocking { Err(std::io::Error::other("injected mode failure")) } else { s.set_nonblocking(nonblocking) }
+            });
+            assert!(result["error"].as_str().is_some_and(|e| e.contains("injected mode failure")), "{op}: {result}");
+            assert_eq!(run("connected", id, &J::Null)["value"], false, "{op}: broken socket remains connected");
+            assert_eq!(run("eof", id, &J::Null)["value"], true);
+            for operation in ["read", "readln", "write"] {
+                let r = run(operation, id, &json!({"count": 1, "timeout": 0.01, "data": "x"}));
+                assert!(r.get("error").is_some(), "{operation} must reject the unusable stream: {r}");
+            }
+            run("close", id, &J::Null);
+            run("close", id, &J::Null);
+        }
+    }
+
+    /// A preceding write error cannot hide the failure that makes the stream unusable.
+    #[test]
+    fn restoration_failure_preserves_the_write_error_too() {
+        let (host, _keep) = stalled_peer();
+        let id = open(&host);
+        let result = super::imp::run_with_mode("write", id, &json!({"data": "hello"}), |s, nonblocking| {
+            if nonblocking {
+                s.set_nonblocking(true)?;
+                s.shutdown(std::net::Shutdown::Write)
+            } else {
+                Err(std::io::Error::other("injected restore failure"))
+            }
+        });
+        let error = result["error"].as_str().unwrap();
+        assert!(error.contains("injected restore failure") && error.contains("write also failed"), "{error}");
+        assert_eq!(run("connected", id, &J::Null)["value"], false);
+        run("close", id, &J::Null);
+    }
+
+    /// Both outgoing and accepted sockets deliver complete data, then return to blocking reads.
+    #[test]
+    fn writes_deliver_all_data_and_restore_blocking_reads() {
+        for accepted in [false, true] {
+            let (id, mut peer) = if accepted {
+                let listener = run("listen", 0, &json!({"port": 0}));
+                let listener_id = listener["id"].as_u64().unwrap() as u32;
+                let peer = TcpStream::connect(("127.0.0.1", listener["port"].as_u64().unwrap() as u16)).unwrap();
+                let start = Instant::now();
+                let id = loop {
+                    if let Some(id) = run("poll", listener_id, &J::Null)["id"].as_u64() {
+                        break id as u32;
+                    }
+                    assert!(start.elapsed() < Duration::from_secs(5));
+                    std::thread::sleep(Duration::from_millis(1));
+                };
+                run("close", listener_id, &J::Null);
+                (id, peer)
+            } else {
+                let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+                let id = open(&listener.local_addr().unwrap().to_string());
+                (id, listener.accept().unwrap().0)
+            };
+            socket2::SockRef::from(&super::imp::test_stream(id)).set_send_buffer_size(4096).unwrap();
+            peer.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
+            let reader = std::thread::spawn(move || {
+                let mut data = vec![0; 256 * 1024];
+                peer.read_exact(&mut data).unwrap();
+                assert!(data.iter().all(|b| *b == b'x'));
+                // A read on a socket accidentally left nonblocking would return before this.
+                std::thread::sleep(Duration::from_millis(100));
+                peer.write_all(b"ack").unwrap();
+            });
+            let r = within(Duration::from_secs(10), move || run("write", id, &json!({"data": "x".repeat(256 * 1024), "timeout": 5}))).unwrap();
+            assert_eq!(r["ok"], true, "{r}");
+            let r = run("read", id, &json!({"count": 3, "timeout": 2}));
+            assert_eq!(r["data"], "ack", "{r}");
+            run("close", id, &J::Null);
+            reader.join().unwrap();
+        }
+    }
+}
diff --git a/crates/script/src/tests.rs b/crates/script/src/tests.rs
index e384ae1d6..786dec561 100644
--- a/crates/script/src/tests.rs
+++ b/crates/script/src/tests.rs
@@ -10,6 +10,18 @@ use serde_json::{Value, json};
 
 use crate::{Outcome, run_code};
 
+mod callable;
+mod ease_presets;
+mod evalfile;
+mod include;
+mod panels;
+#[cfg(not(windows))]
+mod services;
+mod tasks;
+mod ui;
+mod ui_more;
+mod ui_mouse;
+
 fn session() -> Session {
     let mut s = Session { expr: Some(Arc::new(effectcraft_expr::Expressions)), expr_check: Some(effectcraft_expr::check_syntax), ..Default::default() };
     crate::install(&mut s);
@@ -126,6 +138,65 @@ fn fill_parameters_use_documented_match_names() {
     assert_eq!(o.result, json!("Color|All Masks|ADBE Fill-0007"));
 }
 
+#[test]
+fn stroke_parameters_use_after_effects_match_names() {
+    // #1405: `ADBE Stroke-0002` is Stroke's Color in After Effects, not All Masks.
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"var c = app.project.items.addComp("S", 100, 100, 1, 1, 12); var l = c.layers.addSolid([1,1,1], "S", 100, 100, 1);
+           var fx = l.property("ADBE Effect Parade").addProperty("ADBE Stroke"), out = [];
+           for (var i = 1; i <= 11; i++) out.push(fx.property("ADBE Stroke-" + ("000" + i).slice(-4)).name);
+           out.push(fx.property("Color").matchName); out"#,
+    );
+    assert_eq!(
+        o.result,
+        json!([
+            "Path",
+            "Color",
+            "Brush Size",
+            "Brush Hardness",
+            "Opacity",
+            "Spacing",
+            "Paint Style",
+            "Start",
+            "End",
+            "All Masks",
+            "Stroke Sequentially",
+            "ADBE Stroke-0002"
+        ])
+    );
+}
+
+#[test]
+fn hue_saturation_parameters_use_after_effects_match_names() {
+    // #1405: `ADBE HUE SATURATION-0004` is Master Hue in After Effects. The per-channel controls,
+    // which After Effects doesn't expose, are numbered after its parameters so none takes an AE number.
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"var c = app.project.items.addComp("H", 100, 100, 1, 1, 12); var l = c.layers.addSolid([1,1,1], "S", 100, 100, 1);
+           var fx = l.property("ADBE Effect Parade").addProperty("ADBE HUE SATURATION"), out = [];
+           var n = [2, 4, 5, 6, 7, 8, 9, 10];
+           for (var i = 0; i < n.length; i++) out.push(fx.property("ADBE HUE SATURATION-" + ("000" + n[i]).slice(-4)).name);
+           out.push(fx.property("Red Hue").matchName); out"#,
+    );
+    assert_eq!(
+        o.result,
+        json!([
+            "Channel Control",
+            "Master Hue",
+            "Master Saturation",
+            "Master Lightness",
+            "Colorize",
+            "Colorize Hue",
+            "Colorize Saturation",
+            "Colorize Lightness",
+            "ADBE HUE SATURATION-0011"
+        ])
+    );
+}
+
 #[test]
 fn undo_steps_without_a_group() {
     let mut s = session();
@@ -199,6 +270,44 @@ fn an_undefined_name_mentioned_earlier_reports_its_use_in_the_reading_function()
     assert_eq!(e.line, Some(6), "{e:?}");
 }
 
+/// Scripts reach Wiggle Paths' properties, Spatial Phase included, by their match names.
+#[test]
+fn wiggle_paths_properties_by_match_name() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var c = app.project.items.addComp("W", 200, 200, 1, 2, 30);
+        var sh = c.layers.addShape();
+        var w = sh.property("ADBE Root Vectors Group").addProperty("ADBE Vector Filter - Roughen");
+        w.property("ADBE Vector Spatial Phase").setValue(45);
+        var names = [];
+        for (var i = 1; i <= w.numProperties; i++) names.push(w.property(i).matchName);
+        [w.matchName, w.property("ADBE Vector Spatial Phase").name, names]
+        "#,
+    );
+    assert_eq!(
+        o.result,
+        json!([
+            "ADBE Vector Filter - Roughen",
+            "Spatial Phase",
+            [
+                "ADBE Vector Roughen Size",
+                "ADBE Vector Roughen Detail",
+                "ADBE Vector Roughen Points",
+                "ADBE Vector Temporal Freq",
+                "ADBE Vector Correlation",
+                "ADBE Vector Temporal Phase",
+                "ADBE Vector Spatial Phase",
+                "ADBE Vector Random Seed"
+            ]
+        ])
+    );
+    let (_, c) = comp_named(&s, "W");
+    let sh = c.layers.iter().find(|l| l.props.sub("contents").is_some()).unwrap();
+    assert_eq!(sh.props.prop("contents/wiggle/spatialPhase").unwrap().value, KV::Scalar(45.0));
+}
+
 #[test]
 fn match_names_and_lookups() {
     let mut s = session();
@@ -385,6 +494,38 @@ fn layers_items_and_markers() {
     );
 }
 
+#[test]
+fn folder_paths_trim_trailing_separators() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var paths = ['', '/', '///', 'a/b/', 'a\\b\\/', 'a/b', 'a/\n'];
+        var result = paths.map(function (path) {
+          var folder = new Folder(path);
+          return [folder.name, folder.path, __join(path, 'child')];
+        });
+        // A long run followed by a non-separator used to cause quadratic regex backtracking.
+        var longPath = Array(20001).join('/') + 'x';
+        result.push([new Folder(longPath).name, new Folder(longPath).path.length, __join(longPath, 'child').length]);
+        result
+        "#,
+    );
+    assert_eq!(
+        o.result,
+        json!([
+            ["", "", "/child"],
+            ["", "", "/child"],
+            ["", "", "/child"],
+            ["b", "a", "a/b/child"],
+            ["b", "a", "a\\b/child"],
+            ["b", "a", "a/b/child"],
+            ["\n", "a", "a/\n/child"],
+            ["x", 19999, 20007]
+        ])
+    );
+}
+
 #[test]
 fn security_gate_for_files() {
     let dir = std::env::temp_dir().join(format!("ec-script-gate-{}", std::process::id()));
@@ -552,6 +693,26 @@ fn engine_entry_points() {
     let _ = std::fs::remove_dir_all(&dir);
 }
 
+/// `app.project.framesCountType` / `displayStartFrame`: Project Settings ▸ Frame Count (#1807).
+#[test]
+fn frames_count_type_sets_the_project_frame_count() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        "var p = app.project; var a = [p.framesCountType === FramesCountType.FC_START_0, p.displayStartFrame]; p.framesCountType = FramesCountType.FC_START_1; a.concat([p.framesCountType === FramesCountType.FC_START_1, p.displayStartFrame]).join('|')",
+    );
+    assert_eq!(o.result, json!("true|0|true|1"));
+    // After Effects' enum values, so scripts that store the number keep working.
+    let o = ok(&mut s, "[FramesCountType.FC_START_0, FramesCountType.FC_START_1, FramesCountType.FC_TIMECODE_CONVERSION].join('|')");
+    assert_eq!(o.result, json!("2612|2613|2614"));
+    assert_eq!(s.project.settings.frame_start, 1);
+    ok(&mut s, "app.project.displayStartFrame = 0");
+    assert_eq!(s.project.settings.frame_start, 0);
+    let o = run_code(&mut s, "app.project.framesCountType = FramesCountType.FC_TIMECODE_CONVERSION", "test.jsx");
+    assert!(o.error.is_some_and(|e| e.message.contains("Timecode Conversion")));
+    assert_eq!(s.project.settings.frame_start, 0);
+}
+
 #[test]
 fn console_keeps_variables() {
     let mut s = session();
@@ -904,6 +1065,37 @@ fn footage_proxies_sequences_and_conform_rate() {
     let _ = std::fs::remove_dir_all(&dir);
 }
 
+/// #813: `AVLayer.replaceSource` changes the source item and keeps the layer's name, timing and
+/// properties; a folder is not a source.
+#[test]
+fn av_layer_replace_source_keeps_the_layer() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var main = app.project.items.addComp("Main", 100, 100, 1, 5, 25);
+        var layer = main.layers.addSolid([1, 0, 0], "Old", 100, 100, 1);
+        layer.transform.position.setValue([10, 20]);
+        layer.startTime = 1;
+        var nested = app.project.items.addComp("Nested", 200, 100, 1, 3, 25);
+        layer.replaceSource(nested, false);
+        [layer.source.name, layer.source.width, layer.source.height, layer.source instanceof CompItem,
+         layer.name, layer.transform.position.value[0], layer.startTime, main.numLayers]
+        "#,
+    );
+    assert_eq!(o.result, json!(["Nested", 200, 100, true, "Old", 10, 1, 1]));
+    let bad = run_code(
+        &mut s,
+        r#"
+        var main = app.project.items.addComp("Other", 100, 100, 1, 2, 25);
+        var layer = main.layers.addSolid([1, 0, 0], "Layer", 100, 100, 1);
+        layer.replaceSource(app.project.items.addFolder("F"), false);
+        "#,
+        "replace-source.jsx",
+    );
+    assert!(bad.error.as_ref().is_some_and(|e| e.message.contains("folder")), "{bad:?}");
+}
+
 /// A flat green footage source, so `sampleImage` on a footage layer has known pixels.
 struct Flat;
 impl effectcraft_engine::render::FootageSource for Flat {
@@ -1326,6 +1518,50 @@ fn key_interpolation_and_ease_apply_outside_the_active_comp() {
     assert!(v[3].as_f64().is_some_and(|x| (x - -44.5).abs() > 1.0), "{v}");
 }
 
+/// #1531: a key the user selected in the property's comp stays selected, and only the named key
+/// changes (on the old code the change went to the selected key instead).
+/// The active comp's own key selection is untouched.
+#[test]
+fn a_per_key_method_in_another_comp_changes_only_its_key_and_keeps_both_selections() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var C = app.project.items.addComp('C', 100, 100, 1, 10, 20);
+        var p = C.layers.addNull().transform.rotation;
+        p.setValuesAtTimes([0, 1, 2], [0, 90, 180]);
+        var A = app.project.items.addComp('A', 100, 100, 1, 10, 20);
+        A.openInViewer();
+        var q = A.layers.addNull().transform.opacity;
+        q.setValuesAtTimes([0, 1], [0, 100]);
+        app.run('edit.deselectAll', {});
+        q.setSelectedAtKey(2, true);
+        // the user selected key 3 of C earlier: C remembers it while A is active
+        p.setSelectedAtKey(3, true);
+        p.setInterpolationTypeAtKey(1, KeyframeInterpolationType.HOLD);
+        p.setTemporalEaseAtKey(2, [new KeyframeEase(0, 80)]);
+        var hold = KeyframeInterpolationType.HOLD;
+        var out = [p.keyOutInterpolationType(1) == hold, p.keyOutInterpolationType(3) == hold, p.keyInInterpolationType(3) == hold,
+          p.keyInTemporalEase(2)[0].influence, p.keyInTemporalEase(3)[0].influence,
+          q.keySelected(1), q.keySelected(2)];
+        p.removeKey(1);
+        out.push(p.numKeys, p.keyTime(1), p.keyValue(1), q.keySelected(2), app.project.activeItem.name);
+        // C's remembered selection is live again once C is active: still the user's key (now 2)
+        C.openInViewer();
+        out.push(p.keySelected(1), p.keySelected(2));
+        out;
+        "#,
+    );
+    let v = o.result.as_array().unwrap();
+    let ease = |i: usize| v[i].as_f64().unwrap();
+    assert_eq!(&v[..3], &[json!(true), json!(false), json!(false)], "only key 1 holds: {v:?}");
+    assert!((ease(3) - 80.0).abs() < 1e-6, "key 2 eased: {v:?}");
+    assert!((ease(4) - 80.0).abs() > 1e-6, "key 3 untouched: {v:?}");
+    assert_eq!(&v[5..7], &[json!(false), json!(true)], "A's key selection kept: {v:?}");
+    assert_eq!(&v[7..12], &[json!(2), json!(1), json!(90), json!(true), json!("A")], "key 1 removed, A still active: {v:?}");
+    assert_eq!(&v[12..], &[json!(false), json!(true)], "C's key selection kept, the target key not added: {v:?}");
+}
+
 /// #808: sourcePointToComp and compPointToSource follow the layer's transform.
 #[test]
 fn source_point_conversions_follow_the_layer_transform() {
@@ -1503,3 +1739,68 @@ fn scripted_text_animator_property_is_the_one_asked_for() {
     );
     assert_eq!(o.result, json!(["Tracking Amount", 20, "Tracking Amount", "ADBE Text Tracking Amount", 2]));
 }
+
+/// #1936: an array whose length doesn't match the property's dimension is an error in After
+/// Effects, not a value to truncate or broadcast. Two values for a 3-D property stay legal.
+#[test]
+fn set_value_rejects_an_array_of_the_wrong_dimension() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var c = app.project.items.addComp("Dims", 640, 360, 1, 2, 30);
+        var l = c.layers.addSolid([1, 0, 0], "s", 640, 360, 1);
+        var ramp = l.property("ADBE Effect Parade").addProperty("ADBE Ramp").property("ADBE Ramp-0001");
+        function attempt(f) { try { f(); return "no error"; } catch (e) { return e.message; } }
+        var before = "" + ramp.value;
+        var tooMany = attempt(function () { ramp.setValue([1, 2, 3]); });
+        var tooFew = attempt(function () { ramp.setValue([1]); });
+        var untouched = "" + ramp.value;
+        ramp.setValue([7, 8]);
+        var keyed = attempt(function () { ramp.setValueAtTime(0, [1, 2, 3, 4]); });
+        // A 3-D property still takes two values, as it does in After Effects: z stays 0.
+        l.property("Position").setValue([120, 34]);
+        [tooMany, tooFew, untouched === before, "" + ramp.value, keyed, "" + l.property("Position").value]
+        "#,
+    );
+    assert_eq!(
+        o.result,
+        json!([
+            "Array is not of the correct dimension",
+            "Array is not of the correct dimension",
+            true,
+            "7,8",
+            "Array is not of the correct dimension",
+            "120,34,0"
+        ])
+    );
+    let (_, c) = comp_named(&s, "Dims");
+    assert_eq!(layer(c, "s").props.prop("transform/position").unwrap().value, KV::Vec3([120.0, 34.0, 0.0]));
+}
+
+/// #1942: the scripting width and height setters resize the frame only. Re-anchoring the old frame
+/// in the new one, which moves every unparented layer, belongs to the Composition Settings dialog.
+#[test]
+fn setting_comp_width_and_height_leaves_the_layers_where_they_are() {
+    let mut s = session();
+    let o = ok(
+        &mut s,
+        r#"
+        var c = app.project.items.addComp("w", 400, 200, 1, 1, 25);
+        var l = c.layers.addSolid([1, 1, 1], "s", 50, 50, 1, 1);
+        var pos = l.property("ADBE Transform Group").property("ADBE Position");
+        pos.setValue([100, 100]);
+        var k = c.layers.addSolid([1, 1, 1], "k", 50, 50, 1, 1);
+        var kpos = k.property("ADBE Transform Group").property("ADBE Position");
+        kpos.setValueAtTime(0, [10, 20]);
+        kpos.setValueAtTime(1, [30, 40]);
+        var before = "" + pos.value;
+        c.width = 800;
+        c.height = 400;
+        [before, "" + pos.value, "" + kpos.keyValue(1), "" + kpos.keyValue(2), c.width, c.height]
+        "#,
+    );
+    assert_eq!(o.result, json!(["100,100,0", "100,100,0", "10,20,0", "30,40,0", 800, 400]));
+    let (_, c) = comp_named(&s, "w");
+    assert_eq!(layer(c, "s").props.prop("transform/position").unwrap().value, KV::Vec3([100.0, 100.0, 0.0]));
+}
diff --git a/crates/script/src/tests_callable.rs b/crates/script/src/tests/callable.rs
similarity index 100%
rename from crates/script/src/tests_callable.rs
rename to crates/script/src/tests/callable.rs
diff --git a/crates/script/src/tests/ease_presets.rs b/crates/script/src/tests/ease_presets.rs
new file mode 100644
index 000000000..009cc59c6
--- /dev/null
+++ b/crates/script/src/tests/ease_presets.rs
@@ -0,0 +1,610 @@
+//! The scripting API the bundled Ease Presets ScriptUI panel uses (After Effects parity:
+//! `app.settings` that last between runs, per-key methods that keep the key selection, eases and
+//! spatial tangents reported as they play, `selectedProperties` with keyed properties,
+//! `isInterpolationTypeValid`), and the panel itself (`extensions/scriptui-panels/Ease
+//! Presets.jsx`) easing selected keyframes, keeping user presets and taking over the presets the
+//! core panel of v0.6.0 saved.
+
+use std::sync::Arc;
+
+use effectcraft_engine::Session;
+use effectcraft_engine::commands::scripts::SCRIPT_SETTINGS_FILE;
+use effectcraft_engine::config::{ConfigStore, MemoryConfig};
+use effectcraft_engine::project::{LayerId, Property};
+use effectcraft_keyframe::{Ease, Interp, ease_progress};
+use effectcraft_time::Tick;
+use serde_json::{Value, json};
+
+use crate::run_code;
+
+const PANEL: &str = "Ease Presets.jsx";
+
+fn session(store: &Arc<MemoryConfig>) -> Session {
+    let mut s = Session { expr: Some(Arc::new(effectcraft_expr::Expressions)), ..Default::default() };
+    crate::install(&mut s);
+    s.config = Some(store.clone());
+    s.load_settings();
+    s
+}
+
+/// A comp with one solid; returns its id.
+fn setup(s: &mut Session) -> u64 {
+    s.execute("comp.new", json!({"name": "Ease", "width": 640, "height": 360, "frameRate": 30, "duration": 10})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Box", "color": "#ff0000", "width": 100, "height": 100})).unwrap()["layer"].as_u64().unwrap()
+}
+
+fn animate(s: &mut Session, l: u64, path: &str, keys: &[(f64, Value)]) {
+    for (t, v) in keys {
+        s.execute("prop.addKey", json!({"layer": l, "path": path, "time": t, "value": v})).unwrap();
+    }
+}
+
+fn prop(s: &Session, l: u64, path: &str) -> Property {
+    s.active_comp().unwrap().layer(LayerId(l)).unwrap().props.prop(path).unwrap().clone()
+}
+
+fn close(a: f64, b: f64, tol: f64) -> bool {
+    (a - b).abs() < tol
+}
+
+fn ok(s: &mut Session, code: &str) -> Value {
+    let out = run_code(s, code, "test.jsx");
+    assert!(out.error.is_none(), "{:?}", out.error);
+    out.result
+}
+
+fn at(s: f64) -> Tick {
+    Tick::from_seconds_f64(s)
+}
+
+#[test]
+fn app_settings_last_between_runs() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    ok(&mut s, r#"app.settings.saveSetting("My Tool", "size", 12); app.settings.saveSetting("My Tool", "name", "Box");"#);
+    // A new run (the next launch) reads them back.
+    let mut s = session(&store);
+    let r = ok(
+        &mut s,
+        r#"[app.settings.haveSetting("My Tool", "size"), app.settings.getSetting("My Tool", "size"), app.settings.getSetting("My Tool", "name"), app.settings.haveSetting("My Tool", "nope")]"#,
+    );
+    assert_eq!(r, json!([true, "12", "Box", false]));
+    assert_eq!(s.execute("script.settings.get", json!({"section": "My Tool", "key": "name"})).unwrap(), json!({"have": true, "value": "Box"}));
+    // A corrupt settings file loads as none, never an error.
+    store.write(SCRIPT_SETTINGS_FILE, "{oops").unwrap();
+    let mut s = session(&store);
+    assert_eq!(ok(&mut s, r#"app.settings.haveSetting("My Tool", "size")"#), json!(false));
+    assert!(s.execute("script.settings.save", json!({"section": "x"})).is_err());
+}
+
+#[test]
+fn per_key_methods_keep_the_key_selection_and_report_eases_as_they_play() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (2.0, json!(0))]);
+    let key = |t: f64| json!({"layer": l, "path": "transform/opacity", "time": t});
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    s.execute("keys.select", json!({"keys": [key(0.0), key(2.0)]})).unwrap();
+    let before = s.state.selected_keys.clone();
+    let r = ok(
+        &mut s,
+        r#"var comp = app.project.activeItem, p = comp.layer(1).transform.opacity;
+        // A linear side reports the speed it plays at (33.3 % influence).
+        var lin = p.keyInTemporalEase(3)[0];
+        p.setTemporalEaseAtKey(2, [new KeyframeEase(0, 50)], [new KeyframeEase(0, 75)]);
+        p.setInterpolationTypeAtKey(3, KeyframeInterpolationType.HOLD, KeyframeInterpolationType.HOLD);
+        // Keyed properties are selected properties, as in After Effects.
+        var sel = comp.selectedProperties;
+        [lin.speed, lin.influence, p.selectedKeys, sel.length, sel.length ? sel[0].name : ""]"#,
+    );
+    assert!(close(r[0].as_f64().unwrap(), -100.0, 1e-9) && close(r[1].as_f64().unwrap(), 100.0 / 3.0, 1e-9), "{r}");
+    assert_eq!(r[2], json!([1, 3]), "the selection is the user's");
+    assert_eq!((r[3].clone(), r[4].clone()), (json!(1), json!("Opacity")));
+    assert_eq!(s.state.selected_keys, before);
+    let op = prop(&s, l, "transform/opacity");
+    assert_eq!((op.keys[1].in_ease[0], op.keys[1].out_ease[0]), (Ease { speed: 0.0, influence: 0.5 }, Ease { speed: 0.0, influence: 0.75 }));
+    assert_eq!(op.keys[2].in_interp, Interp::Hold);
+    // removeKey drops the removed key from the selection, keeps the rest.
+    ok(&mut s, "app.project.activeItem.layer(1).transform.opacity.removeKey(3)");
+    assert_eq!(s.state.selected_keys, before[..1]);
+    // Values that don't interpolate only hold.
+    let r = ok(
+        &mut s,
+        r#"var comp = app.project.activeItem, o = comp.layer(1).transform.opacity, t = comp.layers.addText("Hi").text.sourceText;
+        [t.isInterpolationTypeValid(KeyframeInterpolationType.BEZIER), t.isInterpolationTypeValid(KeyframeInterpolationType.HOLD), o.isInterpolationTypeValid(KeyframeInterpolationType.BEZIER)]"#,
+    );
+    assert_eq!(r, json!([false, true, true]));
+}
+
+#[test]
+fn spatial_tangents_are_reported_as_the_path_plays() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (1.0, json!([100, 0, 0])), (2.0, json!([100, 100, 0]))]);
+    let pos = prop(&s, l, "transform/position");
+    let (inn, out) = effectcraft_keyframe::spatial_tangents(&pos.keys, 1);
+    let r = ok(&mut s, "var p = app.project.activeItem.layer(1).transform.position; [p.keyInSpatialTangent(2), p.keyOutSpatialTangent(2)]");
+    for (got, want) in [(&r[0], inn), (&r[1], out)] {
+        for d in 0..2 {
+            assert!(close(got[d].as_f64().unwrap(), want[d], 1e-9), "{r} vs {inn:?} {out:?}");
+        }
+    }
+    assert!(out[0].abs() + out[1].abs() > 1.0, "the middle key's path curves: {out:?}");
+    assert_ne!(pos.keys[1].spatial_out, out, "auto-Bezier: the stored tangent isn't the one that plays");
+}
+
+/// The panel's window and a control's description by name.
+fn open_panel(s: &mut Session) -> u64 {
+    let r = s.execute("window.scriptPanel", json!({"name": PANEL})).unwrap();
+    r["window"].as_u64().unwrap()
+}
+
+fn control(s: &mut Session, win: u64, name: &str) -> Value {
+    fn find(w: &Value, name: &str) -> Option<Value> {
+        if w["name"] == name {
+            return Some(w.clone());
+        }
+        w["children"].as_array()?.iter().find_map(|c| find(c, name))
+    }
+    let w = s.execute("scriptui.get", json!({"window": win})).unwrap();
+    find(&w["root"], name).unwrap_or_else(|| panic!("no control {name}"))
+}
+
+fn set(s: &mut Session, win: u64, widget: &str, value: Value) {
+    s.execute("scriptui.set", json!({"window": win, "widget": widget, "value": value})).unwrap();
+}
+
+fn click(s: &mut Session, win: u64, widget: &str) {
+    s.execute("scriptui.click", json!({"window": win, "widget": widget})).unwrap();
+}
+
+fn status(s: &mut Session, win: u64) -> String {
+    control(s, win, "status")["text"].as_str().unwrap().to_string()
+}
+
+#[test]
+fn the_ease_presets_panel_eases_every_selected_pair_in_one_undo_step() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    animate(&mut s, l, "transform/rotation", &[(0.0, json!(0)), (2.0, json!(90))]);
+    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
+    s.execute("prop.select", json!({"layer": l, "path": "transform/rotation", "add": true})).unwrap();
+    let selected = s.state.selected_keys.clone();
+    let win = open_panel(&mut s);
+    // It is a bundled extension listed with the ScriptUI panels.
+    let list = s.execute("file.scripts.list", json!({})).unwrap();
+    assert!(list.as_array().unwrap().iter().any(|e| e["name"] == PANEL && e["panel"] == true && e["source"] == "extension"));
+    let steps = s.history.undo.len();
+    set(&mut s, win, "presets", json!("Ease In-Out"));
+    // In-Out (the default) on every key: each pair gets the whole curve, as before.
+    assert_eq!(status(&mut s, win), "Eased 5 keyframe(s) (In-Out) with \u{201c}Ease In-Out\u{201d}");
+    assert_eq!(s.history.undo.len(), steps + 1, "one undo step");
+    assert_eq!(s.history.undo.last().map(|(label, _)| label.as_str()), Some("Apply Ease Preset"));
+    assert_eq!(s.state.selected_keys, selected, "the keys stay selected for the next preset");
+    let eased = Ease { speed: 0.0, influence: 0.5 };
+    let op = prop(&s, l, "transform/opacity");
+    assert_eq!((op.keys[0].out_interp, op.keys[0].out_ease[0]), (Interp::Bezier, eased));
+    assert_eq!((op.keys[1].in_ease[0], op.keys[1].out_ease[0]), (eased, eased));
+    assert_eq!((op.keys[2].in_interp, op.keys[2].in_ease[0]), (Interp::Bezier, eased));
+    // The first key's in side and the last key's out side are not part of a pair.
+    assert_eq!((op.keys[0].in_interp, op.keys[2].out_interp), (Interp::Linear, Interp::Linear));
+    // A symmetric curve passes the middle value at mid-time, slow near the keys.
+    assert!(close(op.value_at(at(2.0)).as_f64(), 60.0, 1e-6));
+    let quarter = op.value_at(at(1.5)).as_f64();
+    assert!(close(quarter, 100.0 - 80.0 * ease_progress(0.0, 0.5, 0.0, 0.5, 0.25), 1e-6), "{quarter}");
+    assert_eq!(prop(&s, l, "transform/rotation").keys[1].in_interp, Interp::Bezier);
+    s.execute("edit.undo", json!({})).unwrap();
+    let op = prop(&s, l, "transform/opacity");
+    assert!(op.keys.iter().all(|k| k.in_interp == Interp::Linear && k.out_interp == Interp::Linear));
+    // Nothing selected: nothing changes, and the panel says why.
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    let steps = s.history.undo.len();
+    set(&mut s, win, "presets", json!("Linear"));
+    assert_eq!(status(&mut s, win), "Select keyframes with another keyframe next to it");
+    assert_eq!(s.history.undo.len(), steps);
+}
+
+/// Select only the keys at `keys` (property path, time in seconds).
+fn select_keys(s: &mut Session, l: u64, keys: &[(&str, f64)]) {
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    let keys: Vec<Value> = keys.iter().map(|(path, t)| json!({"layer": l, "path": path, "time": t})).collect();
+    s.execute("keys.select", json!({"keys": keys})).unwrap();
+}
+
+/// Type a curve (Out %, Out speed, In %, In speed), choose the sides to ease and click Apply.
+fn apply_typed(s: &mut Session, win: u64, mode: &str, c: [f64; 4]) {
+    for (name, v) in ["outInfluence", "outSpeed", "inInfluence", "inSpeed"].iter().zip(c) {
+        set(s, win, name, json!(v.to_string()));
+    }
+    set(s, win, "mode", json!(mode));
+    click(s, win, "apply");
+}
+
+fn eased(e: Ease, speed: f64, influence: f64) -> bool {
+    close(e.speed, speed, 1e-9) && close(e.influence, influence, 1e-9)
+}
+
+/// #1329: one selected keyframe eases its incoming side (In), its outgoing side (Out) or both,
+/// each scaled to the segment on that side (+100/s in, −40/s out here), without changing its
+/// neighbours, key times, values or the selection; one undo step restores it.
+#[test]
+fn one_selected_keyframe_eases_its_in_out_or_both_sides() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    let win = open_panel(&mut s);
+    // In-Out is the default.
+    assert_eq!(control(&mut s, win, "mode")["selection"], json!([2]));
+    let before = prop(&s, l, "transform/opacity");
+    for mode in ["In", "Out", "In-Out"] {
+        select_keys(&mut s, l, &[("transform/opacity", 1.0)]);
+        let selected = s.state.selected_keys.clone();
+        let steps = s.history.undo.len();
+        apply_typed(&mut s, win, mode, [30.0, 0.5, 60.0, 2.0]);
+        assert_eq!(status(&mut s, win), format!("Eased 1 keyframe(s) ({mode}) with the curve"));
+        assert_eq!(s.history.undo.len(), steps + 1, "{mode}: one undo step");
+        assert_eq!(s.state.selected_keys, selected, "{mode}: the selection stays");
+        let op = prop(&s, l, "transform/opacity");
+        assert_eq!((&op.keys[0], &op.keys[2]), (&before.keys[0], &before.keys[2]), "{mode}: the neighbours don't change");
+        assert_eq!((op.keys[1].time, op.keys[1].value.as_f64()), (before.keys[1].time, 100.0), "{mode}");
+        let k = &op.keys[1];
+        let (ins, outs) = (mode != "Out", mode != "In");
+        assert_eq!(k.in_interp, if ins { Interp::Bezier } else { Interp::Linear }, "{mode}");
+        assert_eq!(k.out_interp, if outs { Interp::Bezier } else { Interp::Linear }, "{mode}");
+        if ins {
+            assert!(eased(k.in_ease[0], 2.0 * 100.0, 0.6), "{mode}: {:?}", k.in_ease);
+        } else {
+            assert!(close(op.value_at(at(0.5)).as_f64(), 50.0, 1e-6), "{mode}: the in side still plays linearly");
+        }
+        if outs {
+            assert!(eased(k.out_ease[0], 0.5 * -40.0, 0.3), "{mode}: {:?}", k.out_ease);
+        } else {
+            assert!(close(op.value_at(at(2.0)).as_f64(), 60.0, 1e-6), "{mode}: the out side still plays linearly");
+        }
+        s.execute("edit.undo", json!({})).unwrap();
+        assert_eq!(prop(&s, l, "transform/opacity").keys, before.keys, "{mode}: undone");
+    }
+}
+
+/// A side without a neighbouring key isn't eased; when no selected key has one, nothing changes
+/// (no undo step) and the panel says why. Keys that aren't neighbours, and keys of several
+/// properties, each ease on their own.
+#[test]
+fn first_last_and_scattered_keyframes_ease_the_sides_that_have_a_segment() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    animate(&mut s, l, "transform/rotation", &[(0.0, json!(0)), (2.0, json!(90))]);
+    let win = open_panel(&mut s);
+    let before = prop(&s, l, "transform/opacity");
+    let c = [30.0, 0.5, 60.0, 2.0];
+    for (mode, t, why) in [("In", 0.0, "before it"), ("Out", 3.0, "after it")] {
+        select_keys(&mut s, l, &[("transform/opacity", t)]);
+        let steps = s.history.undo.len();
+        apply_typed(&mut s, win, mode, c);
+        assert_eq!(status(&mut s, win), format!("Select keyframes with another keyframe {why}"));
+        assert_eq!(s.history.undo.len(), steps, "{mode}: no undo step");
+        assert_eq!(prop(&s, l, "transform/opacity").keys, before.keys);
+    }
+    // In-Out on the first key eases only its out side.
+    select_keys(&mut s, l, &[("transform/opacity", 0.0)]);
+    apply_typed(&mut s, win, "In-Out", c);
+    let op = prop(&s, l, "transform/opacity");
+    assert_eq!((op.keys[0].in_interp, op.keys[0].out_interp), (Interp::Linear, Interp::Bezier));
+    assert!(eased(op.keys[0].out_ease[0], 0.5 * 100.0, 0.3), "{:?}", op.keys[0].out_ease);
+    assert_eq!(op.keys[1..], before.keys[1..]);
+    s.execute("edit.undo", json!({})).unwrap();
+    // The first and last Opacity keys (not neighbours) and the last Rotation key.
+    select_keys(&mut s, l, &[("transform/opacity", 0.0), ("transform/opacity", 3.0), ("transform/rotation", 2.0)]);
+    let steps = s.history.undo.len();
+    apply_typed(&mut s, win, "In-Out", c);
+    assert_eq!(status(&mut s, win), "Eased 3 keyframe(s) (In-Out) with the curve");
+    assert_eq!(s.history.undo.len(), steps + 1);
+    let op = prop(&s, l, "transform/opacity");
+    assert!(eased(op.keys[0].out_ease[0], 0.5 * 100.0, 0.3), "{:?}", op.keys[0].out_ease);
+    assert!(eased(op.keys[2].in_ease[0], 2.0 * -40.0, 0.6), "{:?}", op.keys[2].in_ease);
+    assert_eq!(op.keys[1], before.keys[1], "the unselected middle key");
+    let rot = prop(&s, l, "transform/rotation");
+    assert!(eased(rot.keys[1].in_ease[0], 2.0 * 45.0, 0.6), "{:?}", rot.keys[1].in_ease);
+    assert_eq!(rot.keys[0].out_interp, Interp::Linear, "the unselected neighbour");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(prop(&s, l, "transform/opacity").keys, before.keys);
+    assert!(prop(&s, l, "transform/rotation").keys.iter().all(|k| k.in_interp == Interp::Linear && k.out_interp == Interp::Linear));
+}
+
+/// A change from the pair-only panel: In-Out on a selected pair also eases the pair's outer sides
+/// that face an unselected key (the selected keys' own sides), and Out on the pair eases only
+/// out sides.
+#[test]
+fn a_selected_pair_eases_the_sides_its_mode_names() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    let win = open_panel(&mut s);
+    let before = prop(&s, l, "transform/opacity");
+    let c = [30.0, 0.5, 60.0, 2.0];
+    select_keys(&mut s, l, &[("transform/opacity", 0.0), ("transform/opacity", 1.0)]);
+    apply_typed(&mut s, win, "In-Out", c);
+    let op = prop(&s, l, "transform/opacity");
+    assert!(eased(op.keys[0].out_ease[0], 50.0, 0.3) && eased(op.keys[1].in_ease[0], 200.0, 0.6));
+    assert!(eased(op.keys[1].out_ease[0], -20.0, 0.3), "the side facing the unselected key: {:?}", op.keys[1].out_ease);
+    assert_eq!(op.keys[2], before.keys[2]);
+    s.execute("edit.undo", json!({})).unwrap();
+    apply_typed(&mut s, win, "Out", c);
+    let op = prop(&s, l, "transform/opacity");
+    assert!(eased(op.keys[0].out_ease[0], 50.0, 0.3) && eased(op.keys[1].out_ease[0], -20.0, 0.3));
+    assert_eq!((op.keys[0].in_interp, op.keys[1].in_interp), (Interp::Linear, Interp::Linear));
+}
+
+/// Easing one side of a key leaves the other playing as it did: a Hold stays a Hold, and an
+/// auto-Bezier side keeps its shape. A preset click uses the chosen sides too.
+#[test]
+fn the_side_not_eased_keeps_playing_hold_and_auto_bezier() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    animate(&mut s, l, "transform/rotation", &[(0.0, json!(0)), (1.0, json!(90)), (3.0, json!(30))]);
+    ok(
+        &mut s,
+        r#"var t = app.project.activeItem.layer(1).transform, K = KeyframeInterpolationType;
+        t.opacity.setInterpolationTypeAtKey(2, K.LINEAR, K.HOLD);
+        t.rotation.setInterpolationTypeAtKey(2, K.BEZIER, K.BEZIER);
+        t.rotation.setTemporalAutoBezierAtKey(2, true);"#,
+    );
+    let rot = prop(&s, l, "transform/rotation");
+    let after: Vec<f64> = [1.5, 2.0, 2.5].iter().map(|t| rot.value_at(at(*t)).as_f64()).collect();
+    let win = open_panel(&mut s);
+    set(&mut s, win, "mode", json!("In"));
+    select_keys(&mut s, l, &[("transform/opacity", 1.0), ("transform/rotation", 1.0)]);
+    set(&mut s, win, "presets", json!("Ease In-Out"));
+    assert_eq!(status(&mut s, win), "Eased 2 keyframe(s) (In) with \u{201c}Ease In-Out\u{201d}");
+    let op = prop(&s, l, "transform/opacity");
+    assert_eq!((op.keys[1].in_interp, op.keys[1].out_interp), (Interp::Bezier, Interp::Hold));
+    assert!(eased(op.keys[1].in_ease[0], 0.0, 0.5), "{:?}", op.keys[1].in_ease);
+    assert_eq!(op.value_at(at(2.0)).as_f64(), 100.0, "still holds");
+    let eased_rot = prop(&s, l, "transform/rotation");
+    assert!(eased(eased_rot.keys[1].in_ease[0], 0.0, 0.5), "{:?}", eased_rot.keys[1].in_ease);
+    for (t, want) in [1.5, 2.0, 2.5].iter().zip(after) {
+        assert!(close(eased_rot.value_at(at(*t)).as_f64(), want, 1e-6), "the auto-Bezier out side at {t}");
+    }
+    assert!(!close(eased_rot.value_at(at(0.25)).as_f64(), rot.value_at(at(0.25)).as_f64(), 1e-3), "the in side changed");
+}
+
+/// Roving keys pass speed straight through (the engine keeps their sides linear), so an ease set
+/// on one wouldn't play: they are skipped and the panel says so, rather than reporting them eased.
+#[test]
+fn roving_keyframes_are_skipped_and_reported() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (1.0, json!([100, 0, 0])), (2.0, json!([200, 0, 0]))]);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
+    ok(&mut s, "app.project.activeItem.layer(1).transform.position.setRovingAtKey(2, true)");
+    let pos = prop(&s, l, "transform/position");
+    assert!(pos.keys[1].roving);
+    let roving_at = pos.keys[1].time.seconds();
+    let win = open_panel(&mut s);
+    // Only the roving key: nothing changes, no undo step.
+    select_keys(&mut s, l, &[("transform/position", roving_at)]);
+    let steps = s.history.undo.len();
+    set(&mut s, win, "presets", json!("Ease In-Out"));
+    assert_eq!(status(&mut s, win), "Nothing eased: skipped 1 roving keyframe(s); turn off Roving to ease them");
+    assert_eq!(s.history.undo.len(), steps);
+    assert_eq!(prop(&s, l, "transform/position").keys, pos.keys);
+    // With an ordinary key: that one is eased, the roving one is counted as skipped.
+    select_keys(&mut s, l, &[("transform/position", roving_at), ("transform/opacity", 1.0)]);
+    set(&mut s, win, "presets", json!("Linear"));
+    set(&mut s, win, "presets", json!("Ease In-Out"));
+    assert_eq!(
+        status(&mut s, win),
+        "Eased 1 keyframe(s) (In-Out) with \u{201c}Ease In-Out\u{201d}; skipped 1 roving keyframe(s); turn off Roving to ease them"
+    );
+    let k = &prop(&s, l, "transform/position").keys[1];
+    assert!(k.roving && k.in_interp == Interp::Linear && k.out_interp == Interp::Linear, "{k:?}");
+    let op = prop(&s, l, "transform/opacity");
+    assert!(eased(op.keys[1].in_ease[0], 0.0, 0.5) && eased(op.keys[1].out_ease[0], 0.0, 0.5));
+}
+
+/// Out alone leaves an auto-Bezier in side playing as it did, and undo and redo restore each state.
+#[test]
+fn out_alone_keeps_the_in_side_playing_through_undo_and_redo() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/rotation", &[(0.0, json!(0)), (1.0, json!(90)), (3.0, json!(30))]);
+    ok(
+        &mut s,
+        r#"var r = app.project.activeItem.layer(1).transform.rotation, K = KeyframeInterpolationType;
+        r.setInterpolationTypeAtKey(2, K.BEZIER, K.BEZIER);
+        r.setTemporalAutoBezierAtKey(2, true);"#,
+    );
+    let before = prop(&s, l, "transform/rotation");
+    let win = open_panel(&mut s);
+    select_keys(&mut s, l, &[("transform/rotation", 1.0)]);
+    apply_typed(&mut s, win, "Out", [60.0, 0.0, 33.0, 1.0]);
+    let after = prop(&s, l, "transform/rotation");
+    assert!(eased(after.keys[1].out_ease[0], 0.0, 0.6), "{:?}", after.keys[1].out_ease);
+    for t in [0.25, 0.5, 0.75] {
+        assert!(close(after.value_at(at(t)).as_f64(), before.value_at(at(t)).as_f64(), 1e-6), "the in side at {t}");
+    }
+    assert!(!close(after.value_at(at(2.0)).as_f64(), before.value_at(at(2.0)).as_f64(), 1e-3), "the out side changed");
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(prop(&s, l, "transform/rotation").keys, before.keys);
+    s.execute("edit.redo", json!({})).unwrap();
+    assert_eq!(prop(&s, l, "transform/rotation").keys, after.keys);
+}
+
+/// On a curved path, a single key's in and out speeds follow the length of the path on each side
+/// (unequal lengths and durations), and the side not eased plays as it did.
+#[test]
+fn a_single_key_on_a_curved_path_eases_along_each_side() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (1.0, json!([100, 0, 0])), (3.0, json!([100, 300, 0]))]);
+    let before = prop(&s, l, "transform/position");
+    let (len_in, len_out) = (effectcraft_keyframe::spatial_segment_length(&before.keys, 0), effectcraft_keyframe::spatial_segment_length(&before.keys, 1));
+    let win = open_panel(&mut s);
+    select_keys(&mut s, l, &[("transform/position", 1.0)]);
+    apply_typed(&mut s, win, "In", [40.0, 1.5, 50.0, 2.0]);
+    let pos = prop(&s, l, "transform/position");
+    let k = &pos.keys[1];
+    // In speed: twice the incoming segment's average (its path length over 1 s).
+    assert!(k.in_ease.iter().all(|e| close(e.speed, 2.0 * len_in, 0.05 * len_in) && close(e.influence, 0.5, 1e-9)), "{:?} vs {len_in}", k.in_ease);
+    // The out side (2 s along a longer path) plays as before.
+    for t in [1.5, 2.0, 2.5] {
+        let (a, b) = (pos.value_at(at(t)).as_vec2(), before.value_at(at(t)).as_vec2());
+        assert!(close(a[0], b[0], 1e-6) && close(a[1], b[1], 1e-6), "out side at {t}: {a:?} vs {b:?}");
+    }
+    // Playback on the in side: arriving at twice the average speed, the last tenth of a second
+    // covers more of the path than a constant speed would (len_in / 10).
+    let (p9, p10) = (pos.value_at(at(0.9)).as_vec2(), pos.value_at(at(1.0)).as_vec2());
+    let step = ((p10[0] - p9[0]).powi(2) + (p10[1] - p9[1]).powi(2)).sqrt();
+    assert!(step > len_in / 10.0 * 1.2, "{step} vs {len_in}");
+    assert!(len_out > len_in, "{len_out} {len_in}");
+}
+
+/// On one key, each side scales to its own segment: per dimension, and along the motion path.
+#[test]
+fn single_keys_scale_each_side_to_its_dimensions_and_motion_path() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    // Scale: +100/−50 per second into the key, 0/+50 per second out of it.
+    animate(&mut s, l, "transform/scale", &[(0.0, json!([100, 100])), (1.0, json!([200, 50])), (3.0, json!([200, 150]))]);
+    // Position on a straight path: 100 px/s into the key, 50 px/s out of it.
+    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (1.0, json!([100, 0, 0])), (3.0, json!([200, 0, 0]))]);
+    let win = open_panel(&mut s);
+    select_keys(&mut s, l, &[("transform/scale", 1.0), ("transform/position", 1.0)]);
+    apply_typed(&mut s, win, "In-Out", [40.0, 1.5, 50.0, 2.0]);
+    assert_eq!(status(&mut s, win), "Eased 2 keyframe(s) (In-Out) with the curve");
+    let k = prop(&s, l, "transform/scale").keys[1].clone();
+    assert!(eased(k.in_ease[0], 200.0, 0.5) && eased(k.in_ease[1], -100.0, 0.5), "{:?}", k.in_ease);
+    assert!(eased(k.out_ease[0], 0.0, 0.4) && eased(k.out_ease[1], 75.0, 0.4), "{:?}", k.out_ease);
+    let k = prop(&s, l, "transform/position").keys[1].clone();
+    assert!(k.in_ease.iter().all(|e| close(e.speed, 200.0, 0.5) && close(e.influence, 0.5, 1e-9)), "{:?}", k.in_ease);
+    assert!(k.out_ease.iter().all(|e| close(e.speed, 75.0, 0.5) && close(e.influence, 0.4, 1e-9)), "{:?}", k.out_ease);
+    let pos = prop(&s, l, "transform/position");
+    assert_eq!(pos.value_at(at(1.0)).as_vec2()[0], 100.0, "the key's value stays");
+}
+
+#[test]
+fn a_typed_curve_scales_to_each_dimension_and_follows_motion_paths() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/scale", &[(0.0, json!([100, 100])), (1.0, json!([200, 50]))]);
+    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (2.0, json!([300, 400, 0]))]);
+    s.execute("prop.select", json!({"layer": l, "path": "transform/scale"})).unwrap();
+    let win = open_panel(&mut s);
+    let typed = |s: &mut Session, c: [f64; 4]| {
+        for (name, v) in ["outInfluence", "outSpeed", "inInfluence", "inSpeed"].iter().zip(c) {
+            set(s, win, name, json!(v.to_string()));
+        }
+        click(s, win, "apply");
+    };
+    typed(&mut s, [60.0, 0.0, 20.0, 2.0]);
+    let sc = prop(&s, l, "transform/scale");
+    // X rises 100/s and Y falls 50/s: the in speed (2× average) is per dimension.
+    assert_eq!(sc.keys[1].in_ease[..2], [Ease { speed: 200.0, influence: 0.2 }, Ease { speed: -100.0, influence: 0.2 }]);
+    let f = ease_progress(0.0, 0.6, 2.0, 0.2, 0.5);
+    let v = sc.value_at(at(0.5)).as_vec2();
+    assert!(close(v[0], 100.0 + 100.0 * f, 1e-6) && close(v[1], 100.0 - 50.0 * f, 1e-6), "{v:?}");
+    // On Position the speed is along the 500 px path.
+    s.execute("prop.select", json!({"layer": l, "path": "transform/position"})).unwrap();
+    typed(&mut s, [25.0, 0.4, 75.0, 0.0]);
+    let pos = prop(&s, l, "transform/position");
+    assert!(pos.keys[0].out_ease.iter().all(|e| close(e.speed, 0.4 * 250.0, 1e-6) && close(e.influence, 0.25, 1e-9)), "{:?}", pos.keys[0].out_ease);
+    let f = ease_progress(0.4, 0.25, 0.0, 0.75, 0.5);
+    let p = pos.value_at(at(1.0)).as_vec2();
+    assert!(close(p[0], 300.0 * f, 0.05) && close(p[1], 400.0 * f, 0.05), "{p:?} {f}");
+    // From Keys reads the applied curve back into the fields.
+    for name in ["outInfluence", "outSpeed", "inInfluence", "inSpeed"] {
+        set(&mut s, win, name, json!("1"));
+    }
+    click(&mut s, win, "fromKeys");
+    let fields: Vec<String> =
+        ["outInfluence", "outSpeed", "inInfluence", "inSpeed"].iter().map(|n| control(&mut s, win, n)["text"].as_str().unwrap().to_string()).collect();
+    assert_eq!(fields, ["25", "0.4", "75", "0"]);
+}
+
+#[test]
+fn user_presets_save_rename_delete_and_persist() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut s = session(&store);
+    let l = setup(&mut s);
+    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100))]);
+    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
+    let win = open_panel(&mut s);
+    set(&mut s, win, "presets", json!("Decelerate"));
+    // Save keeps the curve in the fields under the typed name.
+    set(&mut s, win, "name", json!("  Settle "));
+    click(&mut s, win, "save");
+    assert_eq!(status(&mut s, win), "Saved the ease preset \u{201c}Settle\u{201d}");
+    // Built-in names are refused.
+    set(&mut s, win, "name", json!("linear"));
+    click(&mut s, win, "save");
+    assert!(status(&mut s, win).contains("is a built-in preset"));
+    let items = |s: &mut Session| control(s, win, "presets")["items"].clone();
+    assert_eq!(items(&mut s).as_array().unwrap().last().unwrap(), "Settle");
+    // Rename and Delete act on the selected user preset; built-in presets can't change.
+    set(&mut s, win, "presets", json!("Linear"));
+    set(&mut s, win, "name", json!("Straight"));
+    click(&mut s, win, "rename");
+    assert_eq!(status(&mut s, win), "Select one of your own presets first");
+    set(&mut s, win, "presets", json!("Settle"));
+    set(&mut s, win, "name", json!("Soft Landing"));
+    click(&mut s, win, "rename");
+    let names = items(&mut s);
+    assert!(names.as_array().unwrap().contains(&json!("Soft Landing")) && !names.as_array().unwrap().contains(&json!("Settle")), "{names}");
+    // Kept with app.settings: a new run of the panel (the next launch) lists them.
+    let stored: Value = serde_json::from_str(&store.read(SCRIPT_SETTINGS_FILE).unwrap()).unwrap();
+    let presets: Value = serde_json::from_str(stored["Ease Presets"]["userPresets"].as_str().unwrap()).unwrap();
+    assert_eq!(presets["presets"][0]["name"], "Soft Landing");
+    assert!(close(presets["presets"][0]["curve"]["outSpeed"].as_f64().unwrap(), 1.5, 1e-9), "{presets}");
+    let mut s2 = session(&store);
+    setup(&mut s2);
+    let win2 = open_panel(&mut s2);
+    assert_eq!(control(&mut s2, win2, "presets")["items"].as_array().unwrap().len(), 13);
+    set(&mut s2, win2, "presets", json!("Soft Landing"));
+    click(&mut s2, win2, "delete");
+    assert_eq!(control(&mut s2, win2, "presets")["items"].as_array().unwrap().len(), 12, "the built-in presets");
+}
+
+/// User presets the core Ease Presets panel of v0.6.0 saved (`ease_presets.json`) move to the
+/// panel's settings when settings load, once; unusable entries are skipped by the panel.
+#[test]
+fn presets_saved_by_the_old_core_panel_carry_over() {
+    let store = Arc::new(MemoryConfig::default());
+    let c = json!({"outInfluence": 30, "outSpeed": 0, "inInfluence": 30, "inSpeed": 0});
+    let old = json!({"version": 1, "presets": [
+        {"name": "Snap", "curve": c},
+        {"name": "Linear", "curve": c},
+        {"name": "", "curve": c},
+        {"name": "No curve"},
+        {"name": "snap", "curve": c},
+        {"name": "Bad", "curve": {"outInfluence": "x", "outSpeed": 0, "inInfluence": 30, "inSpeed": 0}}
+    ]});
+    store.write("ease_presets.json", &old.to_string()).unwrap();
+    let mut s = session(&store);
+    setup(&mut s);
+    let win = open_panel(&mut s);
+    let items = control(&mut s, win, "presets")["items"].clone();
+    assert_eq!(items.as_array().unwrap().len(), 13, "{items}");
+    assert_eq!(items[12], "Snap");
+    // Deleting it there is final: the old file doesn't come back.
+    set(&mut s, win, "presets", json!("Snap"));
+    click(&mut s, win, "delete");
+    let mut s = session(&store);
+    setup(&mut s);
+    let win = open_panel(&mut s);
+    assert_eq!(control(&mut s, win, "presets")["items"].as_array().unwrap().len(), 12);
+}
diff --git a/crates/script/src/tests_evalfile.rs b/crates/script/src/tests/evalfile.rs
similarity index 100%
rename from crates/script/src/tests_evalfile.rs
rename to crates/script/src/tests/evalfile.rs
diff --git a/crates/script/src/tests_include.rs b/crates/script/src/tests/include.rs
similarity index 100%
rename from crates/script/src/tests_include.rs
rename to crates/script/src/tests/include.rs
diff --git a/crates/script/src/tests_panels.rs b/crates/script/src/tests/panels.rs
similarity index 100%
rename from crates/script/src/tests_panels.rs
rename to crates/script/src/tests/panels.rs
diff --git a/crates/script/src/tests_services.rs b/crates/script/src/tests/services.rs
similarity index 100%
rename from crates/script/src/tests_services.rs
rename to crates/script/src/tests/services.rs
diff --git a/crates/script/src/tests_tasks.rs b/crates/script/src/tests/tasks.rs
similarity index 100%
rename from crates/script/src/tests_tasks.rs
rename to crates/script/src/tests/tasks.rs
diff --git a/crates/script/src/tests_ui.rs b/crates/script/src/tests/ui.rs
similarity index 100%
rename from crates/script/src/tests_ui.rs
rename to crates/script/src/tests/ui.rs
diff --git a/crates/script/src/tests_ui_more.rs b/crates/script/src/tests/ui_more.rs
similarity index 100%
rename from crates/script/src/tests_ui_more.rs
rename to crates/script/src/tests/ui_more.rs
diff --git a/crates/script/src/tests_ui_mouse.rs b/crates/script/src/tests/ui_mouse.rs
similarity index 100%
rename from crates/script/src/tests_ui_mouse.rs
rename to crates/script/src/tests/ui_mouse.rs
diff --git a/crates/script/src/tests_ease_presets.rs b/crates/script/src/tests_ease_presets.rs
deleted file mode 100644
index c803c27a5..000000000
--- a/crates/script/src/tests_ease_presets.rs
+++ /dev/null
@@ -1,321 +0,0 @@
-//! The scripting API the bundled Ease Presets ScriptUI panel uses (After Effects parity:
-//! `app.settings` that last between runs, per-key methods that keep the key selection, eases and
-//! spatial tangents reported as they play, `selectedProperties` with keyed properties,
-//! `isInterpolationTypeValid`), and the panel itself (`extensions/scriptui-panels/Ease
-//! Presets.jsx`) easing selected keyframes, keeping user presets and taking over the presets the
-//! core panel of v0.6.0 saved.
-
-use std::sync::Arc;
-
-use effectcraft_engine::Session;
-use effectcraft_engine::commands::scripts::SCRIPT_SETTINGS_FILE;
-use effectcraft_engine::config::{ConfigStore, MemoryConfig};
-use effectcraft_engine::project::{LayerId, Property};
-use effectcraft_keyframe::{Ease, Interp, ease_progress};
-use effectcraft_time::Tick;
-use serde_json::{Value, json};
-
-use crate::run_code;
-
-const PANEL: &str = "Ease Presets.jsx";
-
-fn session(store: &Arc<MemoryConfig>) -> Session {
-    let mut s = Session { expr: Some(Arc::new(effectcraft_expr::Expressions)), ..Default::default() };
-    crate::install(&mut s);
-    s.config = Some(store.clone());
-    s.load_settings();
-    s
-}
-
-/// A comp with one solid; returns its id.
-fn setup(s: &mut Session) -> u64 {
-    s.execute("comp.new", json!({"name": "Ease", "width": 640, "height": 360, "frameRate": 30, "duration": 10})).unwrap();
-    s.execute("layer.newSolid", json!({"name": "Box", "color": "#ff0000", "width": 100, "height": 100})).unwrap()["layer"].as_u64().unwrap()
-}
-
-fn animate(s: &mut Session, l: u64, path: &str, keys: &[(f64, Value)]) {
-    for (t, v) in keys {
-        s.execute("prop.addKey", json!({"layer": l, "path": path, "time": t, "value": v})).unwrap();
-    }
-}
-
-fn prop(s: &Session, l: u64, path: &str) -> Property {
-    s.active_comp().unwrap().layer(LayerId(l)).unwrap().props.prop(path).unwrap().clone()
-}
-
-fn close(a: f64, b: f64, tol: f64) -> bool {
-    (a - b).abs() < tol
-}
-
-fn ok(s: &mut Session, code: &str) -> Value {
-    let out = run_code(s, code, "test.jsx");
-    assert!(out.error.is_none(), "{:?}", out.error);
-    out.result
-}
-
-fn at(s: f64) -> Tick {
-    Tick::from_seconds_f64(s)
-}
-
-#[test]
-fn app_settings_last_between_runs() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    ok(&mut s, r#"app.settings.saveSetting("My Tool", "size", 12); app.settings.saveSetting("My Tool", "name", "Box");"#);
-    // A new run (the next launch) reads them back.
-    let mut s = session(&store);
-    let r = ok(
-        &mut s,
-        r#"[app.settings.haveSetting("My Tool", "size"), app.settings.getSetting("My Tool", "size"), app.settings.getSetting("My Tool", "name"), app.settings.haveSetting("My Tool", "nope")]"#,
-    );
-    assert_eq!(r, json!([true, "12", "Box", false]));
-    assert_eq!(s.execute("script.settings.get", json!({"section": "My Tool", "key": "name"})).unwrap(), json!({"have": true, "value": "Box"}));
-    // A corrupt settings file loads as none, never an error.
-    store.write(SCRIPT_SETTINGS_FILE, "{oops").unwrap();
-    let mut s = session(&store);
-    assert_eq!(ok(&mut s, r#"app.settings.haveSetting("My Tool", "size")"#), json!(false));
-    assert!(s.execute("script.settings.save", json!({"section": "x"})).is_err());
-}
-
-#[test]
-fn per_key_methods_keep_the_key_selection_and_report_eases_as_they_play() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    let l = setup(&mut s);
-    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (2.0, json!(0))]);
-    let key = |t: f64| json!({"layer": l, "path": "transform/opacity", "time": t});
-    s.execute("edit.deselectAll", json!({})).unwrap();
-    s.execute("keys.select", json!({"keys": [key(0.0), key(2.0)]})).unwrap();
-    let before = s.state.selected_keys.clone();
-    let r = ok(
-        &mut s,
-        r#"var comp = app.project.activeItem, p = comp.layer(1).transform.opacity;
-        // A linear side reports the speed it plays at (33.3 % influence).
-        var lin = p.keyInTemporalEase(3)[0];
-        p.setTemporalEaseAtKey(2, [new KeyframeEase(0, 50)], [new KeyframeEase(0, 75)]);
-        p.setInterpolationTypeAtKey(3, KeyframeInterpolationType.HOLD, KeyframeInterpolationType.HOLD);
-        // Keyed properties are selected properties, as in After Effects.
-        var sel = comp.selectedProperties;
-        [lin.speed, lin.influence, p.selectedKeys, sel.length, sel.length ? sel[0].name : ""]"#,
-    );
-    assert!(close(r[0].as_f64().unwrap(), -100.0, 1e-9) && close(r[1].as_f64().unwrap(), 100.0 / 3.0, 1e-9), "{r}");
-    assert_eq!(r[2], json!([1, 3]), "the selection is the user's");
-    assert_eq!((r[3].clone(), r[4].clone()), (json!(1), json!("Opacity")));
-    assert_eq!(s.state.selected_keys, before);
-    let op = prop(&s, l, "transform/opacity");
-    assert_eq!((op.keys[1].in_ease[0], op.keys[1].out_ease[0]), (Ease { speed: 0.0, influence: 0.5 }, Ease { speed: 0.0, influence: 0.75 }));
-    assert_eq!(op.keys[2].in_interp, Interp::Hold);
-    // removeKey drops the removed key from the selection, keeps the rest.
-    ok(&mut s, "app.project.activeItem.layer(1).transform.opacity.removeKey(3)");
-    assert_eq!(s.state.selected_keys, before[..1]);
-    // Values that don't interpolate only hold.
-    let r = ok(
-        &mut s,
-        r#"var comp = app.project.activeItem, o = comp.layer(1).transform.opacity, t = comp.layers.addText("Hi").text.sourceText;
-        [t.isInterpolationTypeValid(KeyframeInterpolationType.BEZIER), t.isInterpolationTypeValid(KeyframeInterpolationType.HOLD), o.isInterpolationTypeValid(KeyframeInterpolationType.BEZIER)]"#,
-    );
-    assert_eq!(r, json!([false, true, true]));
-}
-
-#[test]
-fn spatial_tangents_are_reported_as_the_path_plays() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    let l = setup(&mut s);
-    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (1.0, json!([100, 0, 0])), (2.0, json!([100, 100, 0]))]);
-    let pos = prop(&s, l, "transform/position");
-    let (inn, out) = effectcraft_keyframe::spatial_tangents(&pos.keys, 1);
-    let r = ok(&mut s, "var p = app.project.activeItem.layer(1).transform.position; [p.keyInSpatialTangent(2), p.keyOutSpatialTangent(2)]");
-    for (got, want) in [(&r[0], inn), (&r[1], out)] {
-        for d in 0..2 {
-            assert!(close(got[d].as_f64().unwrap(), want[d], 1e-9), "{r} vs {inn:?} {out:?}");
-        }
-    }
-    assert!(out[0].abs() + out[1].abs() > 1.0, "the middle key's path curves: {out:?}");
-    assert_ne!(pos.keys[1].spatial_out, out, "auto-Bezier: the stored tangent isn't the one that plays");
-}
-
-/// The panel's window and a control's description by name.
-fn open_panel(s: &mut Session) -> u64 {
-    let r = s.execute("window.scriptPanel", json!({"name": PANEL})).unwrap();
-    r["window"].as_u64().unwrap()
-}
-
-fn control(s: &mut Session, win: u64, name: &str) -> Value {
-    fn find(w: &Value, name: &str) -> Option<Value> {
-        if w["name"] == name {
-            return Some(w.clone());
-        }
-        w["children"].as_array()?.iter().find_map(|c| find(c, name))
-    }
-    let w = s.execute("scriptui.get", json!({"window": win})).unwrap();
-    find(&w["root"], name).unwrap_or_else(|| panic!("no control {name}"))
-}
-
-fn set(s: &mut Session, win: u64, widget: &str, value: Value) {
-    s.execute("scriptui.set", json!({"window": win, "widget": widget, "value": value})).unwrap();
-}
-
-fn click(s: &mut Session, win: u64, widget: &str) {
-    s.execute("scriptui.click", json!({"window": win, "widget": widget})).unwrap();
-}
-
-fn status(s: &mut Session, win: u64) -> String {
-    control(s, win, "status")["text"].as_str().unwrap().to_string()
-}
-
-#[test]
-fn the_ease_presets_panel_eases_every_selected_pair_in_one_undo_step() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    let l = setup(&mut s);
-    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100)), (3.0, json!(20))]);
-    animate(&mut s, l, "transform/rotation", &[(0.0, json!(0)), (2.0, json!(90))]);
-    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
-    s.execute("prop.select", json!({"layer": l, "path": "transform/rotation", "add": true})).unwrap();
-    let selected = s.state.selected_keys.clone();
-    let win = open_panel(&mut s);
-    // It is a bundled extension listed with the ScriptUI panels.
-    let list = s.execute("file.scripts.list", json!({})).unwrap();
-    assert!(list.as_array().unwrap().iter().any(|e| e["name"] == PANEL && e["panel"] == true && e["source"] == "extension"));
-    let steps = s.history.undo.len();
-    set(&mut s, win, "presets", json!("Ease In-Out"));
-    assert_eq!(status(&mut s, win), "Eased 3 keyframe pair(s) with \u{201c}Ease In-Out\u{201d}");
-    assert_eq!(s.history.undo.len(), steps + 1, "one undo step");
-    assert_eq!(s.history.undo.last().map(|(label, _)| label.as_str()), Some("Apply Ease Preset"));
-    assert_eq!(s.state.selected_keys, selected, "the keys stay selected for the next preset");
-    let eased = Ease { speed: 0.0, influence: 0.5 };
-    let op = prop(&s, l, "transform/opacity");
-    assert_eq!((op.keys[0].out_interp, op.keys[0].out_ease[0]), (Interp::Bezier, eased));
-    assert_eq!((op.keys[1].in_ease[0], op.keys[1].out_ease[0]), (eased, eased));
-    assert_eq!((op.keys[2].in_interp, op.keys[2].in_ease[0]), (Interp::Bezier, eased));
-    // The first key's in side and the last key's out side are not part of a pair.
-    assert_eq!((op.keys[0].in_interp, op.keys[2].out_interp), (Interp::Linear, Interp::Linear));
-    // A symmetric curve passes the middle value at mid-time, slow near the keys.
-    assert!(close(op.value_at(at(2.0)).as_f64(), 60.0, 1e-6));
-    let quarter = op.value_at(at(1.5)).as_f64();
-    assert!(close(quarter, 100.0 - 80.0 * ease_progress(0.0, 0.5, 0.0, 0.5, 0.25), 1e-6), "{quarter}");
-    assert_eq!(prop(&s, l, "transform/rotation").keys[1].in_interp, Interp::Bezier);
-    s.execute("edit.undo", json!({})).unwrap();
-    let op = prop(&s, l, "transform/opacity");
-    assert!(op.keys.iter().all(|k| k.in_interp == Interp::Linear && k.out_interp == Interp::Linear));
-    // Nothing selected: nothing changes, and the panel says why.
-    s.execute("edit.deselectAll", json!({})).unwrap();
-    let steps = s.history.undo.len();
-    set(&mut s, win, "presets", json!("Linear"));
-    assert_eq!(status(&mut s, win), "Select two or more neighbouring keyframes of a property");
-    assert_eq!(s.history.undo.len(), steps);
-}
-
-#[test]
-fn a_typed_curve_scales_to_each_dimension_and_follows_motion_paths() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    let l = setup(&mut s);
-    animate(&mut s, l, "transform/scale", &[(0.0, json!([100, 100])), (1.0, json!([200, 50]))]);
-    animate(&mut s, l, "transform/position", &[(0.0, json!([0, 0, 0])), (2.0, json!([300, 400, 0]))]);
-    s.execute("prop.select", json!({"layer": l, "path": "transform/scale"})).unwrap();
-    let win = open_panel(&mut s);
-    let typed = |s: &mut Session, c: [f64; 4]| {
-        for (name, v) in ["outInfluence", "outSpeed", "inInfluence", "inSpeed"].iter().zip(c) {
-            set(s, win, name, json!(v.to_string()));
-        }
-        click(s, win, "apply");
-    };
-    typed(&mut s, [60.0, 0.0, 20.0, 2.0]);
-    let sc = prop(&s, l, "transform/scale");
-    // X rises 100/s and Y falls 50/s: the in speed (2× average) is per dimension.
-    assert_eq!(sc.keys[1].in_ease[..2], [Ease { speed: 200.0, influence: 0.2 }, Ease { speed: -100.0, influence: 0.2 }]);
-    let f = ease_progress(0.0, 0.6, 2.0, 0.2, 0.5);
-    let v = sc.value_at(at(0.5)).as_vec2();
-    assert!(close(v[0], 100.0 + 100.0 * f, 1e-6) && close(v[1], 100.0 - 50.0 * f, 1e-6), "{v:?}");
-    // On Position the speed is along the 500 px path.
-    s.execute("prop.select", json!({"layer": l, "path": "transform/position"})).unwrap();
-    typed(&mut s, [25.0, 0.4, 75.0, 0.0]);
-    let pos = prop(&s, l, "transform/position");
-    assert!(pos.keys[0].out_ease.iter().all(|e| close(e.speed, 0.4 * 250.0, 1e-6) && close(e.influence, 0.25, 1e-9)), "{:?}", pos.keys[0].out_ease);
-    let f = ease_progress(0.4, 0.25, 0.0, 0.75, 0.5);
-    let p = pos.value_at(at(1.0)).as_vec2();
-    assert!(close(p[0], 300.0 * f, 0.05) && close(p[1], 400.0 * f, 0.05), "{p:?} {f}");
-    // From Keys reads the applied curve back into the fields.
-    for name in ["outInfluence", "outSpeed", "inInfluence", "inSpeed"] {
-        set(&mut s, win, name, json!("1"));
-    }
-    click(&mut s, win, "fromKeys");
-    let fields: Vec<String> =
-        ["outInfluence", "outSpeed", "inInfluence", "inSpeed"].iter().map(|n| control(&mut s, win, n)["text"].as_str().unwrap().to_string()).collect();
-    assert_eq!(fields, ["25", "0.4", "75", "0"]);
-}
-
-#[test]
-fn user_presets_save_rename_delete_and_persist() {
-    let store = Arc::new(MemoryConfig::default());
-    let mut s = session(&store);
-    let l = setup(&mut s);
-    animate(&mut s, l, "transform/opacity", &[(0.0, json!(0)), (1.0, json!(100))]);
-    s.execute("prop.select", json!({"layer": l, "path": "transform/opacity"})).unwrap();
-    let win = open_panel(&mut s);
-    set(&mut s, win, "presets", json!("Decelerate"));
-    // Save keeps the curve in the fields under the typed name.
-    set(&mut s, win, "name", json!("  Settle "));
-    click(&mut s, win, "save");
-    assert_eq!(status(&mut s, win), "Saved the ease preset \u{201c}Settle\u{201d}");
-    // Built-in names are refused.
-    set(&mut s, win, "name", json!("linear"));
-    click(&mut s, win, "save");
-    assert!(status(&mut s, win).contains("is a built-in preset"));
-    let items = |s: &mut Session| control(s, win, "presets")["items"].clone();
-    assert_eq!(items(&mut s).as_array().unwrap().last().unwrap(), "Settle");
-    // Rename and Delete act on the selected user preset; built-in presets can't change.
-    set(&mut s, win, "presets", json!("Linear"));
-    set(&mut s, win, "name", json!("Straight"));
-    click(&mut s, win, "rename");
-    assert_eq!(status(&mut s, win), "Select one of your own presets first");
-    set(&mut s, win, "presets", json!("Settle"));
-    set(&mut s, win, "name", json!("Soft Landing"));
-    click(&mut s, win, "rename");
-    let names = items(&mut s);
-    assert!(names.as_array().unwrap().contains(&json!("Soft Landing")) && !names.as_array().unwrap().contains(&json!("Settle")), "{names}");
-    // Kept with app.settings: a new run of the panel (the next launch) lists them.
-    let stored: Value = serde_json::from_str(&store.read(SCRIPT_SETTINGS_FILE).unwrap()).unwrap();
-    let presets: Value = serde_json::from_str(stored["Ease Presets"]["userPresets"].as_str().unwrap()).unwrap();
-    assert_eq!(presets["presets"][0]["name"], "Soft Landing");
-    assert!(close(presets["presets"][0]["curve"]["outSpeed"].as_f64().unwrap(), 1.5, 1e-9), "{presets}");
-    let mut s2 = session(&store);
-    setup(&mut s2);
-    let win2 = open_panel(&mut s2);
-    assert_eq!(control(&mut s2, win2, "presets")["items"].as_array().unwrap().len(), 13);
-    set(&mut s2, win2, "presets", json!("Soft Landing"));
-    click(&mut s2, win2, "delete");
-    assert_eq!(control(&mut s2, win2, "presets")["items"].as_array().unwrap().len(), 12, "the built-in presets");
-}
-
-/// User presets the core Ease Presets panel of v0.6.0 saved (`ease_presets.json`) move to the
-/// panel's settings when settings load, once; unusable entries are skipped by the panel.
-#[test]
-fn presets_saved_by_the_old_core_panel_carry_over() {
-    let store = Arc::new(MemoryConfig::default());
-    let c = json!({"outInfluence": 30, "outSpeed": 0, "inInfluence": 30, "inSpeed": 0});
-    let old = json!({"version": 1, "presets": [
-        {"name": "Snap", "curve": c},
-        {"name": "Linear", "curve": c},
-        {"name": "", "curve": c},
-        {"name": "No curve"},
-        {"name": "snap", "curve": c},
-        {"name": "Bad", "curve": {"outInfluence": "x", "outSpeed": 0, "inInfluence": 30, "inSpeed": 0}}
-    ]});
-    store.write("ease_presets.json", &old.to_string()).unwrap();
-    let mut s = session(&store);
-    setup(&mut s);
-    let win = open_panel(&mut s);
-    let items = control(&mut s, win, "presets")["items"].clone();
-    assert_eq!(items.as_array().unwrap().len(), 13, "{items}");
-    assert_eq!(items[12], "Snap");
-    // Deleting it there is final: the old file doesn't come back.
-    set(&mut s, win, "presets", json!("Snap"));
-    click(&mut s, win, "delete");
-    let mut s = session(&store);
-    setup(&mut s);
-    let win = open_panel(&mut s);
-    assert_eq!(control(&mut s, win, "presets")["items"].as_array().unwrap().len(), 12);
-}
diff --git a/crates/segment/Cargo.toml b/crates/segment/Cargo.toml
index 98f3d1a14..515635db5 100644
--- a/crates/segment/Cargo.toml
+++ b/crates/segment/Cargo.toml
@@ -10,6 +10,6 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-miniz_oxide = "0.8"
+miniz_oxide = "0.9"
 ndarray = { version = "0.17", default-features = false, features = ["std"] }
 rayon = { workspace = true }
diff --git a/crates/segment/src/lib.rs b/crates/segment/src/lib.rs
index e04b7c336..adeb44881 100644
--- a/crates/segment/src/lib.rs
+++ b/crates/segment/src/lib.rs
@@ -14,8 +14,8 @@
 //!   so official weights load as published.
 //! - [`mobilesam`]: MobileSAM (Apache-2.0) and [`mediapipe`]: MediaPipe Face Landmarker
 //!   (Apache-2.0), in plain Rust ([`nn`] kernels on rayon).
-#![forbid(unsafe_code)]
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::todo, clippy::unreachable)]
+#![forbid(unsafe_code)]
 
 pub mod face;
 pub mod mediapipe;
diff --git a/crates/segment/src/mobilesam.rs b/crates/segment/src/mobilesam.rs
index 22d98ba7c..6599b018a 100644
--- a/crates/segment/src/mobilesam.rs
+++ b/crates/segment/src/mobilesam.rs
@@ -191,7 +191,7 @@ impl Block {
                         v[t * dim + hh * hd..][..hd].copy_from_slice(&s[2 * hd..]);
                     }
                 }
-                nn::attention(&q, &k, &v, n, n, heads, hd, Some(&self.bias))
+                nn::attention(&q, &k, &v, nn::AttentionShape { query_tokens: n, key_tokens: n, heads, head_dim: hd }, Some(&self.bias))
             })
             .collect();
         // Un-window into the real grid, project, residual.
@@ -325,7 +325,7 @@ impl Attn {
     fn forward(&self, q: &[f32], nq: usize, k: &[f32], v: &[f32], nk: usize) -> Vec<f32> {
         let (q, k, v) = (self.q.forward(q, nq), self.k.forward(k, nk), self.v.forward(v, nk));
         let heads = 8;
-        let o = nn::attention(&q, &k, &v, nq, nk, heads, self.q.out / heads, None);
+        let o = nn::attention(&q, &k, &v, nn::AttentionShape { query_tokens: nq, key_tokens: nk, heads, head_dim: self.q.out / heads }, None);
         self.out.forward(&o, nq)
     }
 }
diff --git a/crates/segment/src/nn.rs b/crates/segment/src/nn.rs
index 4cf7a5344..713b392b8 100644
--- a/crates/segment/src/nn.rs
+++ b/crates/segment/src/nn.rs
@@ -334,9 +334,19 @@ pub fn softmax_rows(x: &mut [f32], n: usize) {
     }
 }
 
-/// Multi-head scaled dot-product attention of `nq` queries over `nk` keys/values, each `heads ×
-/// hd` wide (token-major, heads side by side), plus an optional per-head bias `[heads × nq × nk]`.
-pub fn attention(q: &[f32], k: &[f32], v: &[f32], nq: usize, nk: usize, heads: usize, hd: usize, bias: Option<&[f32]>) -> Vec<f32> {
+/// Token counts and channel layout shared by the query, key and value tensors.
+#[derive(Clone, Copy, Debug)]
+pub struct AttentionShape {
+    pub query_tokens: usize,
+    pub key_tokens: usize,
+    pub heads: usize,
+    pub head_dim: usize,
+}
+
+/// Multi-head scaled dot-product attention with token-major tensors, heads side by side,
+/// and an optional per-head bias `[heads × query_tokens × key_tokens]`.
+pub fn attention(q: &[f32], k: &[f32], v: &[f32], shape: AttentionShape, bias: Option<&[f32]>) -> Vec<f32> {
+    let AttentionShape { query_tokens: nq, key_tokens: nk, heads, head_dim: hd } = shape;
     let dim = heads * hd;
     let mut out = vec![0.0f32; nq * dim];
     if q.len() < nq * dim || k.len() < nk * dim || v.len() < nk * dim {
@@ -372,6 +382,37 @@ pub fn attention(q: &[f32], k: &[f32], v: &[f32], nq: usize, nk: usize, heads: u
 mod tests {
     use super::*;
 
+    #[test]
+    fn multi_head_cross_attention_matches_direct_sums() {
+        let shape = AttentionShape { query_tokens: 2, key_tokens: 3, heads: 2, head_dim: 2 };
+        let q = [1.0, -0.5, 0.25, 2.0, -1.0, 0.75, 1.5, -0.25];
+        let k = [0.5, 1.0, -0.5, 0.25, 1.5, -0.25, 0.75, 1.0, -1.0, 0.5, 2.0, -1.5];
+        let v = [1.0, 2.0, 3.0, 4.0, -1.0, 0.5, 1.5, -2.0, 0.25, 0.75, -0.5, 2.5];
+        let bias = [0.0, 0.5, -0.5, 1.0, 0.0, -1.0, -0.25, 0.25, 0.5, 0.0, -0.5, 1.0];
+        for bias in [None, Some(bias.as_slice())] {
+            let actual = attention(&q, &k, &v, shape, bias);
+            for query in 0..shape.query_tokens {
+                for head in 0..shape.heads {
+                    let mut scores: Vec<f32> = (0..shape.key_tokens)
+                        .map(|key| {
+                            let dot: f32 = (0..shape.head_dim).map(|channel| q[query * 4 + head * 2 + channel] * k[key * 4 + head * 2 + channel]).sum();
+                            dot / (shape.head_dim as f32).sqrt() + bias.map_or(0.0, |b| b[(head * 2 + query) * 3 + key])
+                        })
+                        .collect();
+                    let max = scores.iter().copied().fold(f32::NEG_INFINITY, f32::max);
+                    for score in &mut scores {
+                        *score = (*score - max).exp();
+                    }
+                    let total: f32 = scores.iter().sum();
+                    for channel in 0..shape.head_dim {
+                        let expected: f32 = scores.iter().enumerate().map(|(key, score)| score / total * v[key * 4 + head * 2 + channel]).sum();
+                        assert!((actual[query * 4 + head * 2 + channel] - expected).abs() < 1e-6);
+                    }
+                }
+            }
+        }
+    }
+
     #[test]
     fn gemm_matches_naive() {
         let (m, k, n) = (130, 17, 9);
diff --git a/crates/segment/src/pt.rs b/crates/segment/src/pt.rs
index d85ff80ca..35ed57297 100644
--- a/crates/segment/src/pt.rs
+++ b/crates/segment/src/pt.rs
@@ -6,6 +6,15 @@
 
 use std::collections::HashMap;
 
+const MAX_ARCHIVE_BYTES: usize = 1 << 30;
+const MAX_PICKLE_OPS: usize = 4_000_000;
+const MAX_TENSORS: usize = 1_000_000;
+const MAX_TENSOR_ELEMENTS: usize = 1 << 28;
+const MAX_ENTRY_BYTES: usize = 1 << 30;
+const MAX_PICKLE_NODES: usize = 4_000_000;
+const MAX_TOTAL_ELEMENTS: usize = 1 << 29;
+const MAX_TENSOR_DIMS: usize = 64;
+
 /// A tensor read from a checkpoint: its shape and its values as f32 (row-major, contiguous).
 #[derive(Clone, Debug, PartialEq)]
 pub struct Tensor {
@@ -38,6 +47,9 @@ struct Entry {
 
 /// The entries of a zip archive by name.
 fn zip_entries(b: &[u8]) -> Result<HashMap<String, Entry>> {
+    if b.len() > MAX_ARCHIVE_BYTES {
+        return Err("checkpoint exceeds the 1024 MiB archive limit".into());
+    }
     // End of central directory: the last `PK\x05\x06` (a comment may follow it).
     let eocd =
         (0..b.len().saturating_sub(21)).rev().find(|&i| b.get(i..i + 4) == Some(b"PK\x05\x06")).ok_or("not a zip archive (no end of central directory)")?;
@@ -96,6 +108,9 @@ fn read_entry<'a>(b: &'a [u8], e: &Entry) -> Result<std::borrow::Cow<'a, [u8]>>
     match e.method {
         0 => Ok(std::borrow::Cow::Borrowed(raw)),
         8 => {
+            if e.size > MAX_ENTRY_BYTES {
+                return Err("zip entry exceeds the size limit".into());
+            }
             miniz_oxide::inflate::decompress_to_vec_with_limit(raw, e.size.max(1)).map(std::borrow::Cow::Owned).map_err(|e| format!("bad deflate data: {e:?}"))
         }
         m => Err(format!("unsupported zip compression {m}")),
@@ -142,7 +157,58 @@ fn int_list(o: &Obj) -> Option<Vec<usize>> {
     }
 }
 
+/// Nodes in `o`, stopping once the count passes `budget`.
+fn nodes(o: &Obj, budget: usize) -> usize {
+    let kids: Vec<&Obj> = match o {
+        Obj::Tuple(v) | Obj::List(v) => v.iter().collect(),
+        Obj::Dict(v) => v.iter().flat_map(|(k, x)| [k, x]).collect(),
+        _ => return 1,
+    };
+    let mut n = 1;
+    for k in kids {
+        if n > budget {
+            break;
+        }
+        n += nodes(k, budget - n);
+    }
+    n
+}
+
+fn tensor_element_count(name: &str, offset: usize, size: &[usize], stride: &[usize], values_len: usize) -> Result<usize> {
+    if size.len() != stride.len() || size.len() > MAX_TENSOR_DIMS {
+        return Err(format!("{name}: invalid tensor dimensionality"));
+    }
+    let n = size
+        .iter()
+        .try_fold(1usize, |n, &dim| n.checked_mul(dim))
+        .filter(|n| *n <= MAX_TENSOR_ELEMENTS)
+        .ok_or_else(|| format!("{name}: tensor exceeds the element limit"))?;
+    if n == 0 {
+        return Ok(0);
+    }
+    let mut max_at = offset;
+    for (&dim, &step) in size.iter().zip(stride) {
+        max_at = max_at
+            .checked_add((dim - 1).checked_mul(step).ok_or_else(|| format!("{name}: tensor stride overflow"))?)
+            .ok_or_else(|| format!("{name}: tensor offset overflow"))?;
+    }
+    if max_at >= values_len {
+        return Err(format!("{name}: data out of range"));
+    }
+    Ok(n)
+}
+
 /// Run the pickle program and return its result.
+/// A memoized object, charged against the clone budget (memo reuse can otherwise grow trees exponentially).
+fn memo_get(memo: &HashMap<u64, Obj>, k: u64, cloned: &mut usize) -> Result<Obj> {
+    let o = memo.get(&k).ok_or("pickle: bad memo")?;
+    *cloned = cloned.saturating_add(nodes(o, MAX_PICKLE_NODES));
+    if *cloned > MAX_PICKLE_NODES {
+        return Err("pickle exceeds the object limit".into());
+    }
+    Ok(o.clone())
+}
+
 fn unpickle(p: &[u8]) -> Result<Obj> {
     let mut stack: Vec<Obj> = Vec::new();
     let mut memo: HashMap<u64, Obj> = HashMap::new();
@@ -166,7 +232,10 @@ fn unpickle(p: &[u8]) -> Result<Obj> {
         *i += n + 1;
         Ok(s)
     };
+    let mut op_count = 0usize;
+    let mut cloned = 0usize;
     loop {
+        op_count = op_count.checked_add(1).filter(|n| *n <= MAX_PICKLE_OPS).ok_or("pickle exceeds the opcode limit")?;
         let op = *p.get(i).ok_or("truncated pickle")?;
         i += 1;
         match op {
@@ -253,11 +322,11 @@ fn unpickle(p: &[u8]) -> Result<Obj> {
             }
             b'h' => {
                 let k = take(&mut i, 1)?[0] as u64;
-                stack.push(memo.get(&k).cloned().ok_or("pickle: bad memo")?);
+                stack.push(memo_get(&memo, k, &mut cloned)?);
             }
             b'j' => {
                 let s = take(&mut i, 4)?;
-                stack.push(memo.get(&(u32::from_le_bytes([s[0], s[1], s[2], s[3]]) as u64)).cloned().ok_or("pickle: bad memo")?);
+                stack.push(memo_get(&memo, u32::from_le_bytes([s[0], s[1], s[2], s[3]]) as u64, &mut cloned)?);
             }
             b't' => {
                 let items = pop_mark(&mut stack)?;
@@ -290,9 +359,10 @@ fn unpickle(p: &[u8]) -> Result<Obj> {
                 stack.push(match f {
                     Obj::Global(m, n) if m == "torch._utils" && n == "_rebuild_tensor_v2" => {
                         match (args.first(), args.get(1), args.get(2).and_then(int_list), args.get(3).and_then(int_list)) {
-                            (Some(Obj::Storage(dtype, key)), Some(Obj::Int(off)), Some(size), Some(stride)) => {
-                                Obj::Tensor { dtype: dtype.clone(), key: key.clone(), offset: usize::try_from(*off).unwrap_or(0), size, stride }
-                            }
+                            (Some(Obj::Storage(dtype, key)), Some(Obj::Int(off)), Some(size), Some(stride)) => match usize::try_from(*off) {
+                                Ok(offset) => Obj::Tensor { dtype: dtype.clone(), key: key.clone(), offset, size, stride },
+                                Err(_) => Obj::Other,
+                            },
                             _ => Obj::Other,
                         }
                     }
@@ -337,16 +407,24 @@ fn unpickle(p: &[u8]) -> Result<Obj> {
     }
 }
 
-/// Element bytes and conversion of a storage dtype.
-fn to_f32(dtype: &str, bytes: &[u8]) -> Option<Vec<f32>> {
+/// Bytes per element of a float storage dtype.
+fn elem_size(dtype: &str) -> Option<usize> {
     match dtype {
-        "FloatStorage" => Some(bytes.as_chunks::<4>().0.iter().map(|c| f32::from_le_bytes([c[0], c[1], c[2], c[3]])).collect()),
-        "HalfStorage" => Some(bytes.as_chunks::<2>().0.iter().map(|c| half_to_f32(u16::from_le_bytes([c[0], c[1]]))).collect()),
-        "BFloat16Storage" => Some(bytes.as_chunks::<2>().0.iter().map(|c| f32::from_bits((u16::from_le_bytes([c[0], c[1]]) as u32) << 16)).collect()),
+        "FloatStorage" => Some(4),
+        "HalfStorage" | "BFloat16Storage" => Some(2),
         _ => None,
     }
 }
 
+/// Element `i` of a storage (`i` must be below `bytes.len() / elem_size`).
+fn elem_f32(dtype: &str, bytes: &[u8], i: usize) -> f32 {
+    match dtype {
+        "FloatStorage" => f32::from_le_bytes([bytes[4 * i], bytes[4 * i + 1], bytes[4 * i + 2], bytes[4 * i + 3]]),
+        "HalfStorage" => half_to_f32(u16::from_le_bytes([bytes[2 * i], bytes[2 * i + 1]])),
+        _ => f32::from_bits((u16::from_le_bytes([bytes[2 * i], bytes[2 * i + 1]]) as u32) << 16),
+    }
+}
+
 pub(crate) fn half_to_f32(h: u16) -> f32 {
     let (s, e, m) = ((h >> 15) as u32, ((h >> 10) & 0x1f) as u32, (h & 0x3ff) as u32);
     let bits = match (e, m) {
@@ -382,22 +460,42 @@ pub fn read(bytes: &[u8]) -> Result<Weights> {
         Some((_, Obj::Dict(inner))) => inner.clone(),
         _ => dict,
     };
+    if dict.len() > MAX_TENSORS {
+        return Err("checkpoint exceeds the tensor count limit".into());
+    }
     let mut storages: HashMap<String, std::borrow::Cow<[u8]>> = HashMap::new();
     let mut out = Weights::new();
+    let mut total = 0usize;
+    let mut inflated = 0usize;
     for (k, v) in dict {
         let (Obj::Str(name), Obj::Tensor { dtype, key, offset, size, stride }) = (k, v) else { continue };
         if !storages.contains_key(&key) {
             let e = entries.get(&format!("{prefix}data/{key}")).ok_or_else(|| format!("missing storage {key}"))?;
+            if e.method == 8 {
+                inflated = inflated.saturating_add(e.size);
+                if inflated > MAX_ENTRY_BYTES {
+                    return Err("checkpoint exceeds the decompressed storage limit".into());
+                }
+            }
             storages.insert(key.clone(), read_entry(bytes, e)?);
         }
-        let Some(values) = storages.get(&key).and_then(|b| to_f32(&dtype, b)) else { continue };
-        let n: usize = size.iter().product();
-        // Gather (any strides) into a contiguous row-major tensor.
-        let mut data = Vec::with_capacity(n);
+        let (Some(esz), Some(values)) = (elem_size(&dtype), storages.get(&key)) else { continue };
+        // Check hostile stride math before allocating or indexing the backing storage.
+        let n = tensor_element_count(&name, offset, &size, &stride, values.len() / esz)?;
+        total = total.saturating_add(n);
+        if total > MAX_TOTAL_ELEMENTS {
+            return Err("checkpoint exceeds the total element limit".into());
+        }
+        let mut data = Vec::new();
+        data.try_reserve_exact(n).map_err(|_| format!("{name}: tensor allocation failed"))?;
         let mut idx = vec![0usize; size.len()];
         for _ in 0..n {
-            let at = offset + idx.iter().zip(&stride).map(|(i, s)| i * s).sum::<usize>();
-            data.push(*values.get(at).ok_or_else(|| format!("{name}: data out of range"))?);
+            let at = idx
+                .iter()
+                .zip(&stride)
+                .try_fold(offset, |at, (i, s)| i.checked_mul(*s).and_then(|v| at.checked_add(v)))
+                .ok_or_else(|| format!("{name}: tensor offset overflow"))?;
+            data.push(elem_f32(&dtype, values, at));
             for d in (0..idx.len()).rev() {
                 idx[d] += 1;
                 if idx[d] < size[d] {
@@ -490,6 +588,15 @@ mod tests {
         assert!(!w.contains_key("n"), "integer tensors are skipped");
     }
 
+    #[test]
+    fn rejects_tensor_shape_overflow_and_invalid_strides() {
+        assert!(tensor_element_count("bad", 0, &[usize::MAX, 2], &[1, 1], 16).is_err());
+        assert!(tensor_element_count("bad", 0, &[2, 2], &[usize::MAX, 1], 16).is_err());
+        assert!(tensor_element_count("bad", 0, &[2, 2], &[1], 16).is_err());
+        assert!(tensor_element_count("bad", usize::MAX, &[2], &[1], 16).is_err());
+        assert_eq!(tensor_element_count("empty", 0, &[0, usize::MAX], &[0, 0], 0), Ok(0));
+    }
+
     #[test]
     fn damaged_files_are_errors() {
         assert!(read(b"not a zip").is_err());
diff --git a/crates/segment/src/tflite.rs b/crates/segment/src/tflite.rs
index 9cd34c6da..34e85dfab 100644
--- a/crates/segment/src/tflite.rs
+++ b/crates/segment/src/tflite.rs
@@ -763,361 +763,4 @@ fn concat(parts: &[(&[f32], &Vec<usize>)], axis: usize) -> Result<Vec<f32>> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn same_padding_matches_tensorflow() {
-        // TensorFlow pads the extra row after: 128 → 64 with a 3×3 stride-2 window pads 0 before.
-        assert_eq!(same(128, 3, 2), (64, 0));
-        assert_eq!(same(128, 5, 2), (64, 1));
-        assert_eq!(same(16, 3, 1), (16, 1));
-        assert_eq!(same(7, 2, 2), (4, 0));
-        assert_eq!(window(1, 4, 2, 2), Ok((2, 0)));
-        assert!(window(1, 1, 2, 2).is_err());
-    }
-
-    #[test]
-    fn asymmetric_conv_padding() {
-        // A 3×3 stride-2 "same" conv on 4×4: pads nothing before, one after.
-        let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
-        let ones = vec![1.0f32; 9];
-        let c = Conv { wt: ones.clone(), b: vec![0.0], inp: 1, out: 1, ks: 3, stride: 2, pad: 0 };
-        let y = c.forward_sized(&x, 4, 4, 2, 2, [0, 0]);
-        // Top-left window rows 0–2, cols 0–2; the bottom-right one is cut by the edge.
-        assert_eq!(y, vec![45.0, 39.0, 66.0, 50.0]);
-        let d = Depthwise { w: ones, b: vec![0.0], c: 1, ks: 3, stride: 2 };
-        assert_eq!(d.forward_sized(&x, 4, 4, 2, 2, [0, 0]), y);
-    }
-
-    #[test]
-    fn pool_pad_and_concat() {
-        let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
-        assert_eq!(max_pool(&x, [4, 4], 1, [2, 2], [2, 2], [2, 2], [0, 0]), vec![5.0, 7.0, 13.0, 15.0]);
-        // Same padding on 3×3 → 2×2: the last window is cut by the edge.
-        let x3: Vec<f32> = (0..9).map(|v| v as f32).collect();
-        assert_eq!(max_pool(&x3, [3, 3], 1, [2, 2], [2, 2], [2, 2], [0, 0]), vec![4.0, 5.0, 7.0, 8.0]);
-        // Channel padding (residual connections widen the channels with zeros).
-        let p = pad(&[1.0, 2.0, 3.0, 4.0], &[1, 1, 2, 2], &[[0, 0], [0, 0], [0, 0], [0, 1]]).unwrap();
-        assert_eq!(p, vec![1.0, 2.0, 0.0, 3.0, 4.0, 0.0]);
-        let p = pad(&[1.0, 2.0], &[1, 2], &[[0, 0], [1, 0]]).unwrap();
-        assert_eq!(p, vec![0.0, 1.0, 2.0]);
-        let a = [1.0, 2.0, 3.0, 4.0];
-        let b = [5.0, 6.0];
-        let (sa, sb) = (vec![1, 2, 2], vec![1, 1, 2]);
-        assert_eq!(concat(&[(&a, &sa), (&b, &sb)], 1).unwrap(), vec![1.0, 2.0, 3.0, 4.0, 5.0, 6.0]);
-        let (sa, sb) = (vec![2, 2], vec![2, 1]);
-        assert_eq!(concat(&[(&a, &sa), (&b, &sb)], 1).unwrap(), vec![1.0, 2.0, 5.0, 3.0, 4.0, 6.0]);
-    }
-
-    #[test]
-    fn damaged_files_are_errors_not_panics() {
-        assert!(Model::read(b"").is_err());
-        assert!(Model::read(&[0xff; 64]).is_err());
-        // Every prefix and a few corruptions of a hand-made buffer.
-        let mut fb = vec![12, 0, 0, 0, 0, 0, 6, 0, 8, 0, 4, 0, 6, 0, 0, 0, 0, 0, 0, 0];
-        for n in 0..fb.len() {
-            let _ = Model::read(&fb[..n]);
-        }
-        for i in 0..fb.len() {
-            fb[i] ^= 0x5a;
-            let _ = Model::read(&fb);
-        }
-    }
-
-    /// A FlatBuffer value, to build small models in tests.
-    enum V {
-        Int(i32),
-        Byte(u8),
-        Table(Vec<(usize, V)>),
-        Ints(Vec<i32>),
-        Bytes(Vec<u8>),
-        Tables(Vec<V>),
-    }
-
-    fn put_u32(b: &mut [u8], at: usize, v: usize) {
-        b[at..at + 4].copy_from_slice(&(v as u32).to_le_bytes());
-    }
-
-    /// Append `v` (children after their parent, so every offset points forward); where it starts.
-    fn put(b: &mut Vec<u8>, v: &V) -> usize {
-        match v {
-            V::Table(fields) => {
-                let slots = fields.iter().map(|f| f.0 + 1).max().unwrap_or(0);
-                let vt = b.len();
-                let vt_len = 4 + 2 * slots;
-                b.resize(vt + vt_len, 0);
-                let t = b.len();
-                // Every field gets 8 bytes (the reader does not need alignment).
-                let t_len = 4 + 8 * fields.len();
-                b.resize(t + t_len, 0);
-                b[vt..vt + 2].copy_from_slice(&(vt_len as u16).to_le_bytes());
-                b[vt + 2..vt + 4].copy_from_slice(&(t_len as u16).to_le_bytes());
-                b[t..t + 4].copy_from_slice(&((t - vt) as i32).to_le_bytes());
-                for (k, (id, f)) in fields.iter().enumerate() {
-                    let at = t + 4 + 8 * k;
-                    b[vt + 4 + 2 * id..vt + 6 + 2 * id].copy_from_slice(&((at - t) as u16).to_le_bytes());
-                    match f {
-                        V::Int(i) => b[at..at + 4].copy_from_slice(&i.to_le_bytes()),
-                        V::Byte(x) => b[at] = *x,
-                        _ => {
-                            let child = put(b, f);
-                            put_u32(b, at, child - at);
-                        }
-                    }
-                }
-                t
-            }
-            V::Ints(xs) => {
-                let p = b.len();
-                b.extend((xs.len() as u32).to_le_bytes());
-                xs.iter().for_each(|x| b.extend(x.to_le_bytes()));
-                p
-            }
-            V::Bytes(xs) => {
-                let p = b.len();
-                b.extend((xs.len() as u32).to_le_bytes());
-                b.extend(xs);
-                p
-            }
-            V::Tables(ts) => {
-                let p = b.len();
-                b.extend((ts.len() as u32).to_le_bytes());
-                let slots = b.len();
-                b.resize(slots + 4 * ts.len(), 0);
-                for (i, t) in ts.iter().enumerate() {
-                    let child = put(b, t);
-                    put_u32(b, slots + 4 * i, child - (slots + 4 * i));
-                }
-                p
-            }
-            V::Int(_) | V::Byte(_) => b.len(),
-        }
-    }
-
-    /// A tensor: shape, type and its constant data (`Some(k)`: buffer `k` of the model's).
-    type T = (Vec<i32>, u8, Option<usize>);
-    /// An operator: code, inputs, outputs and its options' fields.
-    type O = (i32, Vec<i32>, Vec<i32>, Vec<(usize, V)>);
-
-    /// A `.tflite` file with one graph.
-    fn model(bufs: Vec<Vec<u8>>, tensors: Vec<T>, ops: Vec<O>, inputs: Vec<i32>, outputs: Vec<i32>) -> Vec<u8> {
-        let ts = tensors
-            .into_iter()
-            .enumerate()
-            .map(|(i, (shape, ty, buf))| {
-                let mut f = vec![(0, V::Ints(shape)), (1, V::Byte(ty)), (3, V::Bytes(format!("t{i}").into_bytes()))];
-                if let Some(k) = buf {
-                    f.push((2, V::Int(k as i32 + 1)));
-                }
-                V::Table(f)
-            })
-            .collect();
-        let mut codes = vec![];
-        let os = ops
-            .into_iter()
-            .map(|(code, ins, outs, opts)| {
-                let idx = codes.iter().position(|&c| c == code).unwrap_or_else(|| {
-                    codes.push(code);
-                    codes.len() - 1
-                });
-                V::Table(vec![(0, V::Int(idx as i32)), (1, V::Ints(ins)), (2, V::Ints(outs)), (4, V::Table(opts))])
-            })
-            .collect();
-        let g = V::Table(vec![(0, V::Tables(ts)), (1, V::Ints(inputs)), (2, V::Ints(outputs)), (3, V::Tables(os))]);
-        let buffers = std::iter::once(V::Table(vec![])).chain(bufs.into_iter().map(|d| V::Table(vec![(0, V::Bytes(d))]))).collect();
-        let codes = codes.into_iter().map(|c| V::Table(vec![(3, V::Int(c))])).collect();
-        let root = V::Table(vec![(1, V::Tables(codes)), (2, V::Tables(vec![g])), (4, V::Tables(buffers))]);
-        let mut b = vec![0u8; 4];
-        let r = put(&mut b, &root);
-        put_u32(&mut b, 0, r);
-        b
-    }
-
-    fn f32s(xs: &[f32]) -> Vec<u8> {
-        xs.iter().flat_map(|x| x.to_le_bytes()).collect()
-    }
-
-    /// Conv2DOptions / Pool2DOptions: padding (0 same, 1 valid) and stride.
-    fn window_opts(padding: u8, stride: i32) -> Vec<(usize, V)> {
-        vec![(0, V::Byte(padding)), (1, V::Int(stride)), (2, V::Int(stride))]
-    }
-
-    fn refused(bytes: &[u8], why: &str) {
-        let e = Model::read(bytes).err().unwrap_or_default();
-        assert!(e.contains(why), "refused for `{e}`, expected `{why}`");
-    }
-
-    #[test]
-    fn built_models_load_and_run() {
-        // A 3×3 stride-2 "same" conv on 4×4, then a RELU: as `asymmetric_conv_padding`.
-        let m = model(
-            vec![f32s(&[1.0; 9])],
-            vec![(vec![1, 4, 4, 1], FLOAT32, None), (vec![1, 3, 3, 1], FLOAT32, Some(0)), (vec![1, 2, 2, 1], FLOAT32, None), (vec![1, 2, 2, 1], FLOAT32, None)],
-            vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 2)), (op::RELU, vec![2], vec![3], vec![])],
-            vec![0],
-            vec![3],
-        );
-        let m = Model::read(&m).unwrap();
-        let c = m.cost().unwrap();
-        assert_eq!((c.macs, c.values, c.scratch, c.kernel), (2 * 2 * 9, 8, 2 * 9, 3));
-        // The input, the conv's output and its patch row, alive together.
-        assert_eq!(c.live, 16 + 4 + 2 * 9);
-        let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
-        assert_eq!(m.run(&[&x]).unwrap(), vec![vec![45.0, 39.0, 66.0, 50.0]]);
-    }
-
-    /// #368: an 8 KB model whose CONV_2D needed a 512 GB scratch buffer aborted `run`.
-    #[test]
-    fn convolution_scratch_is_bounded() {
-        let w = 1 << 25;
-        let bomb = model(
-            vec![vec![0; 2 * 64 * 64]],
-            vec![(vec![1, 1, w, 1], FLOAT32, None), (vec![1, 64, 64, 1], FLOAT16, Some(0)), (vec![1, 1, w, 1], FLOAT32, None)],
-            vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
-            vec![0],
-            vec![2],
-        );
-        refused(&bomb, "kernel is too large");
-        // A small kernel over many channels: the patch row is `ow·3·3·cin`.
-        let (w, cin) = (1 << 20, 256);
-        let wide = model(
-            vec![vec![0; 2 * 9 * 256]],
-            vec![(vec![1, 1, w, cin], FLOAT32, None), (vec![1, 3, 3, cin], FLOAT16, Some(0)), (vec![1, 1, w, 1], FLOAT32, None)],
-            vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
-            vec![0],
-            vec![2],
-        );
-        refused(&wide, "working space is too large");
-    }
-
-    #[test]
-    fn kernel_sides_are_bounded() {
-        let k = MAX_KERNEL as i32 + 1;
-        let conv = model(
-            vec![vec![0; 2 * (k * k) as usize]],
-            vec![(vec![1, 40, 40, 1], FLOAT32, None), (vec![1, k, k, 1], FLOAT16, Some(0)), (vec![1, 40, 40, 1], FLOAT32, None)],
-            vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
-            vec![0],
-            vec![2],
-        );
-        refused(&conv, "kernel is too large");
-        let depthwise = model(
-            vec![vec![0; 2 * (k * k) as usize]],
-            vec![(vec![1, 40, 40, 1], FLOAT32, None), (vec![1, k, k, 1], FLOAT16, Some(0)), (vec![1, 40, 40, 1], FLOAT32, None)],
-            vec![(op::DEPTHWISE_CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
-            vec![0],
-            vec![2],
-        );
-        refused(&depthwise, "kernel is too large");
-        // A "same" pool takes any window: a huge one looped for billions of steps per output.
-        let mut opts = window_opts(0, 1);
-        opts.extend([(3, V::Int(i32::MAX)), (4, V::Int(i32::MAX))]);
-        let pool = model(
-            vec![],
-            vec![(vec![1, 8, 8, 1], FLOAT32, None), (vec![1, 8, 8, 1], FLOAT32, None)],
-            vec![(op::MAX_POOL_2D, vec![0], vec![1], opts)],
-            vec![0],
-            vec![1],
-        );
-        refused(&pool, "pooling window is too large");
-    }
-
-    #[test]
-    fn multiply_adds_are_bounded() {
-        // Three 16 → 16 pointwise convolutions over 4096×4096: 3·2³² multiply-adds.
-        let s = vec![1, 4096, 4096, 16];
-        let t = |buf| (s.clone(), FLOAT32, buf);
-        let m = model(
-            vec![vec![0; 2 * 16 * 16]],
-            vec![t(None), (vec![16, 1, 1, 16], FLOAT16, Some(0)), t(None), t(None), t(None)],
-            (0..3).map(|i| (op::CONV_2D, vec![if i == 0 { 0 } else { i + 1 }, 1, -1], vec![i + 2], window_opts(0, 1))).collect(),
-            vec![0],
-            vec![4],
-        );
-        refused(&m, "too many multiply-adds");
-    }
-
-    /// #368: 2000 RELUs over 2²⁵ values loaded fine, and one run took minutes.
-    #[test]
-    fn elementwise_work_is_bounded() {
-        let n = 2000;
-        let m = model(
-            vec![],
-            (0..=n).map(|_| (vec![1, 1 << 25], FLOAT32, None)).collect(),
-            (0..n).map(|i| (op::RELU, vec![i], vec![i + 1], vec![])).collect(),
-            vec![0],
-            vec![n],
-        );
-        refused(&m, "too much work");
-    }
-
-    #[test]
-    fn memory_alive_at_once_is_bounded() {
-        // Five outputs of 2²⁷ values each, all kept, besides the input.
-        let m = model(
-            vec![],
-            (0..6).map(|_| (vec![1, 1 << 27], FLOAT32, None)).collect(),
-            (1..6).map(|i| (op::RELU, vec![0], vec![i], vec![])).collect(),
-            vec![0],
-            (1..6).collect(),
-        );
-        refused(&m, "too much memory");
-    }
-
-    #[test]
-    fn shapes_computed_at_run_time_must_match_the_declared_ones() {
-        // PAD to 2³⁰ × 2³⁰ while declaring a 1×1 output.
-        let pads = vec![0, 1 << 30, 0, 1 << 30].into_iter().flat_map(i32::to_le_bytes).collect();
-        let pad = model(
-            vec![pads],
-            vec![(vec![1, 1], FLOAT32, None), (vec![2, 2], INT32, Some(0)), (vec![1, 1], FLOAT32, None)],
-            vec![(op::PAD, vec![0, 1], vec![2], vec![])],
-            vec![0],
-            vec![2],
-        );
-        refused(&pad, "padding disagrees");
-        // Many large parts concatenated into a small declared output.
-        let concat = model(
-            vec![],
-            vec![(vec![1, 1 << 27], FLOAT32, None), (vec![1, 2], FLOAT32, None)],
-            vec![(op::CONCATENATION, vec![0; 64], vec![1], vec![(0, V::Int(1))])],
-            vec![0],
-            vec![1],
-        );
-        refused(&concat, "parts disagree");
-        // A pool whose output claims more channels than its input has.
-        let pool = model(
-            vec![],
-            vec![(vec![1, 2, 2, 1], FLOAT32, None), (vec![1, 1, 1, 1 << 20], FLOAT32, None)],
-            vec![(op::MAX_POOL_2D, vec![0], vec![1], window_opts(1, 2).into_iter().chain([(3, V::Int(2)), (4, V::Int(2))]).collect())],
-            vec![0],
-            vec![1],
-        );
-        refused(&pool, "changes the channels");
-        // Dimensions may not hide behind a zero.
-        let zero = model(vec![], vec![(vec![0, 1 << 30, 1 << 30], FLOAT32, None)], vec![], vec![0], vec![0]);
-        refused(&zero, "tensor is too large");
-    }
-
-    #[test]
-    fn shared_weights_count_once_per_use() {
-        // One 128 KB buffer decoded for 2100 tensors would be 2100 copies of 2¹⁶ floats.
-        let m = model(vec![vec![0; 2 << 16]], (0..2100).map(|_| (vec![1, 1 << 16], FLOAT16, Some(0))).collect(), vec![], vec![], vec![]);
-        refused(&m, "weights are too large");
-    }
-
-    /// The official face models (`EFFECTCRAFT_FACE_LANDMARKER` = path to `face_landmarker.task`)
-    /// fit every budget with wide headroom.
-    #[test]
-    fn official_face_models_fit_the_budgets() {
-        let Some(path) = std::env::var_os("EFFECTCRAFT_FACE_LANDMARKER") else { return };
-        let bytes = std::fs::read(path).unwrap();
-        for name in [crate::mediapipe::DETECTOR, crate::mediapipe::MESH] {
-            let c = Model::read(&crate::pt::zip_file(&bytes, name).unwrap()).unwrap().cost().unwrap();
-            println!("{name}: {c:?}");
-            assert!(c.macs <= MAX_MACS / 8 && c.values <= MAX_VALUES / 8 && c.live <= MAX_LIVE / 8 && c.scratch <= MAX_SCRATCH / 8, "{name}: {c:?}");
-            assert!(c.kernel <= MAX_KERNEL as u64 / 4, "{name}: {c:?}");
-        }
-    }
-}
+mod tests;
diff --git a/crates/segment/src/tflite/tests.rs b/crates/segment/src/tflite/tests.rs
new file mode 100644
index 000000000..29a781d34
--- /dev/null
+++ b/crates/segment/src/tflite/tests.rs
@@ -0,0 +1,356 @@
+use super::*;
+
+#[test]
+fn same_padding_matches_tensorflow() {
+    // TensorFlow pads the extra row after: 128 → 64 with a 3×3 stride-2 window pads 0 before.
+    assert_eq!(same(128, 3, 2), (64, 0));
+    assert_eq!(same(128, 5, 2), (64, 1));
+    assert_eq!(same(16, 3, 1), (16, 1));
+    assert_eq!(same(7, 2, 2), (4, 0));
+    assert_eq!(window(1, 4, 2, 2), Ok((2, 0)));
+    assert!(window(1, 1, 2, 2).is_err());
+}
+
+#[test]
+fn asymmetric_conv_padding() {
+    // A 3×3 stride-2 "same" conv on 4×4: pads nothing before, one after.
+    let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
+    let ones = vec![1.0f32; 9];
+    let c = Conv { wt: ones.clone(), b: vec![0.0], inp: 1, out: 1, ks: 3, stride: 2, pad: 0 };
+    let y = c.forward_sized(&x, 4, 4, 2, 2, [0, 0]);
+    // Top-left window rows 0–2, cols 0–2; the bottom-right one is cut by the edge.
+    assert_eq!(y, vec![45.0, 39.0, 66.0, 50.0]);
+    let d = Depthwise { w: ones, b: vec![0.0], c: 1, ks: 3, stride: 2 };
+    assert_eq!(d.forward_sized(&x, 4, 4, 2, 2, [0, 0]), y);
+}
+
+#[test]
+fn pool_pad_and_concat() {
+    let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
+    assert_eq!(max_pool(&x, [4, 4], 1, [2, 2], [2, 2], [2, 2], [0, 0]), vec![5.0, 7.0, 13.0, 15.0]);
+    // Same padding on 3×3 → 2×2: the last window is cut by the edge.
+    let x3: Vec<f32> = (0..9).map(|v| v as f32).collect();
+    assert_eq!(max_pool(&x3, [3, 3], 1, [2, 2], [2, 2], [2, 2], [0, 0]), vec![4.0, 5.0, 7.0, 8.0]);
+    // Channel padding (residual connections widen the channels with zeros).
+    let p = pad(&[1.0, 2.0, 3.0, 4.0], &[1, 1, 2, 2], &[[0, 0], [0, 0], [0, 0], [0, 1]]).unwrap();
+    assert_eq!(p, vec![1.0, 2.0, 0.0, 3.0, 4.0, 0.0]);
+    let p = pad(&[1.0, 2.0], &[1, 2], &[[0, 0], [1, 0]]).unwrap();
+    assert_eq!(p, vec![0.0, 1.0, 2.0]);
+    let a = [1.0, 2.0, 3.0, 4.0];
+    let b = [5.0, 6.0];
+    let (sa, sb) = (vec![1, 2, 2], vec![1, 1, 2]);
+    assert_eq!(concat(&[(&a, &sa), (&b, &sb)], 1).unwrap(), vec![1.0, 2.0, 3.0, 4.0, 5.0, 6.0]);
+    let (sa, sb) = (vec![2, 2], vec![2, 1]);
+    assert_eq!(concat(&[(&a, &sa), (&b, &sb)], 1).unwrap(), vec![1.0, 2.0, 5.0, 3.0, 4.0, 6.0]);
+}
+
+#[test]
+fn damaged_files_are_errors_not_panics() {
+    assert!(Model::read(b"").is_err());
+    assert!(Model::read(&[0xff; 64]).is_err());
+    // Every prefix and a few corruptions of a hand-made buffer.
+    let mut fb = vec![12, 0, 0, 0, 0, 0, 6, 0, 8, 0, 4, 0, 6, 0, 0, 0, 0, 0, 0, 0];
+    for n in 0..fb.len() {
+        let _ = Model::read(&fb[..n]);
+    }
+    for i in 0..fb.len() {
+        fb[i] ^= 0x5a;
+        let _ = Model::read(&fb);
+    }
+}
+
+/// A FlatBuffer value, to build small models in tests.
+enum V {
+    Int(i32),
+    Byte(u8),
+    Table(Vec<(usize, V)>),
+    Ints(Vec<i32>),
+    Bytes(Vec<u8>),
+    Tables(Vec<V>),
+}
+
+fn put_u32(b: &mut [u8], at: usize, v: usize) {
+    b[at..at + 4].copy_from_slice(&(v as u32).to_le_bytes());
+}
+
+/// Append `v` (children after their parent, so every offset points forward); where it starts.
+fn put(b: &mut Vec<u8>, v: &V) -> usize {
+    match v {
+        V::Table(fields) => {
+            let slots = fields.iter().map(|f| f.0 + 1).max().unwrap_or(0);
+            let vt = b.len();
+            let vt_len = 4 + 2 * slots;
+            b.resize(vt + vt_len, 0);
+            let t = b.len();
+            // Every field gets 8 bytes (the reader does not need alignment).
+            let t_len = 4 + 8 * fields.len();
+            b.resize(t + t_len, 0);
+            b[vt..vt + 2].copy_from_slice(&(vt_len as u16).to_le_bytes());
+            b[vt + 2..vt + 4].copy_from_slice(&(t_len as u16).to_le_bytes());
+            b[t..t + 4].copy_from_slice(&((t - vt) as i32).to_le_bytes());
+            for (k, (id, f)) in fields.iter().enumerate() {
+                let at = t + 4 + 8 * k;
+                b[vt + 4 + 2 * id..vt + 6 + 2 * id].copy_from_slice(&((at - t) as u16).to_le_bytes());
+                match f {
+                    V::Int(i) => b[at..at + 4].copy_from_slice(&i.to_le_bytes()),
+                    V::Byte(x) => b[at] = *x,
+                    _ => {
+                        let child = put(b, f);
+                        put_u32(b, at, child - at);
+                    }
+                }
+            }
+            t
+        }
+        V::Ints(xs) => {
+            let p = b.len();
+            b.extend((xs.len() as u32).to_le_bytes());
+            xs.iter().for_each(|x| b.extend(x.to_le_bytes()));
+            p
+        }
+        V::Bytes(xs) => {
+            let p = b.len();
+            b.extend((xs.len() as u32).to_le_bytes());
+            b.extend(xs);
+            p
+        }
+        V::Tables(ts) => {
+            let p = b.len();
+            b.extend((ts.len() as u32).to_le_bytes());
+            let slots = b.len();
+            b.resize(slots + 4 * ts.len(), 0);
+            for (i, t) in ts.iter().enumerate() {
+                let child = put(b, t);
+                put_u32(b, slots + 4 * i, child - (slots + 4 * i));
+            }
+            p
+        }
+        V::Int(_) | V::Byte(_) => b.len(),
+    }
+}
+
+/// A tensor: shape, type and its constant data (`Some(k)`: buffer `k` of the model's).
+type T = (Vec<i32>, u8, Option<usize>);
+/// An operator: code, inputs, outputs and its options' fields.
+type O = (i32, Vec<i32>, Vec<i32>, Vec<(usize, V)>);
+
+/// A `.tflite` file with one graph.
+fn model(bufs: Vec<Vec<u8>>, tensors: Vec<T>, ops: Vec<O>, inputs: Vec<i32>, outputs: Vec<i32>) -> Vec<u8> {
+    let ts = tensors
+        .into_iter()
+        .enumerate()
+        .map(|(i, (shape, ty, buf))| {
+            let mut f = vec![(0, V::Ints(shape)), (1, V::Byte(ty)), (3, V::Bytes(format!("t{i}").into_bytes()))];
+            if let Some(k) = buf {
+                f.push((2, V::Int(k as i32 + 1)));
+            }
+            V::Table(f)
+        })
+        .collect();
+    let mut codes = vec![];
+    let os = ops
+        .into_iter()
+        .map(|(code, ins, outs, opts)| {
+            let idx = codes.iter().position(|&c| c == code).unwrap_or_else(|| {
+                codes.push(code);
+                codes.len() - 1
+            });
+            V::Table(vec![(0, V::Int(idx as i32)), (1, V::Ints(ins)), (2, V::Ints(outs)), (4, V::Table(opts))])
+        })
+        .collect();
+    let g = V::Table(vec![(0, V::Tables(ts)), (1, V::Ints(inputs)), (2, V::Ints(outputs)), (3, V::Tables(os))]);
+    let buffers = std::iter::once(V::Table(vec![])).chain(bufs.into_iter().map(|d| V::Table(vec![(0, V::Bytes(d))]))).collect();
+    let codes = codes.into_iter().map(|c| V::Table(vec![(3, V::Int(c))])).collect();
+    let root = V::Table(vec![(1, V::Tables(codes)), (2, V::Tables(vec![g])), (4, V::Tables(buffers))]);
+    let mut b = vec![0u8; 4];
+    let r = put(&mut b, &root);
+    put_u32(&mut b, 0, r);
+    b
+}
+
+fn f32s(xs: &[f32]) -> Vec<u8> {
+    xs.iter().flat_map(|x| x.to_le_bytes()).collect()
+}
+
+/// Conv2DOptions / Pool2DOptions: padding (0 same, 1 valid) and stride.
+fn window_opts(padding: u8, stride: i32) -> Vec<(usize, V)> {
+    vec![(0, V::Byte(padding)), (1, V::Int(stride)), (2, V::Int(stride))]
+}
+
+fn refused(bytes: &[u8], why: &str) {
+    let e = Model::read(bytes).err().unwrap_or_default();
+    assert!(e.contains(why), "refused for `{e}`, expected `{why}`");
+}
+
+#[test]
+fn built_models_load_and_run() {
+    // A 3×3 stride-2 "same" conv on 4×4, then a RELU: as `asymmetric_conv_padding`.
+    let m = model(
+        vec![f32s(&[1.0; 9])],
+        vec![(vec![1, 4, 4, 1], FLOAT32, None), (vec![1, 3, 3, 1], FLOAT32, Some(0)), (vec![1, 2, 2, 1], FLOAT32, None), (vec![1, 2, 2, 1], FLOAT32, None)],
+        vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 2)), (op::RELU, vec![2], vec![3], vec![])],
+        vec![0],
+        vec![3],
+    );
+    let m = Model::read(&m).unwrap();
+    let c = m.cost().unwrap();
+    assert_eq!((c.macs, c.values, c.scratch, c.kernel), (2 * 2 * 9, 8, 2 * 9, 3));
+    // The input, the conv's output and its patch row, alive together.
+    assert_eq!(c.live, 16 + 4 + 2 * 9);
+    let x: Vec<f32> = (0..16).map(|v| v as f32).collect();
+    assert_eq!(m.run(&[&x]).unwrap(), vec![vec![45.0, 39.0, 66.0, 50.0]]);
+}
+
+/// #368: an 8 KB model whose CONV_2D needed a 512 GB scratch buffer aborted `run`.
+#[test]
+fn convolution_scratch_is_bounded() {
+    let w = 1 << 25;
+    let bomb = model(
+        vec![vec![0; 2 * 64 * 64]],
+        vec![(vec![1, 1, w, 1], FLOAT32, None), (vec![1, 64, 64, 1], FLOAT16, Some(0)), (vec![1, 1, w, 1], FLOAT32, None)],
+        vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
+        vec![0],
+        vec![2],
+    );
+    refused(&bomb, "kernel is too large");
+    // A small kernel over many channels: the patch row is `ow·3·3·cin`.
+    let (w, cin) = (1 << 20, 256);
+    let wide = model(
+        vec![vec![0; 2 * 9 * 256]],
+        vec![(vec![1, 1, w, cin], FLOAT32, None), (vec![1, 3, 3, cin], FLOAT16, Some(0)), (vec![1, 1, w, 1], FLOAT32, None)],
+        vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
+        vec![0],
+        vec![2],
+    );
+    refused(&wide, "working space is too large");
+}
+
+#[test]
+fn kernel_sides_are_bounded() {
+    let k = MAX_KERNEL as i32 + 1;
+    let conv = model(
+        vec![vec![0; 2 * (k * k) as usize]],
+        vec![(vec![1, 40, 40, 1], FLOAT32, None), (vec![1, k, k, 1], FLOAT16, Some(0)), (vec![1, 40, 40, 1], FLOAT32, None)],
+        vec![(op::CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
+        vec![0],
+        vec![2],
+    );
+    refused(&conv, "kernel is too large");
+    let depthwise = model(
+        vec![vec![0; 2 * (k * k) as usize]],
+        vec![(vec![1, 40, 40, 1], FLOAT32, None), (vec![1, k, k, 1], FLOAT16, Some(0)), (vec![1, 40, 40, 1], FLOAT32, None)],
+        vec![(op::DEPTHWISE_CONV_2D, vec![0, 1, -1], vec![2], window_opts(0, 1))],
+        vec![0],
+        vec![2],
+    );
+    refused(&depthwise, "kernel is too large");
+    // A "same" pool takes any window: a huge one looped for billions of steps per output.
+    let mut opts = window_opts(0, 1);
+    opts.extend([(3, V::Int(i32::MAX)), (4, V::Int(i32::MAX))]);
+    let pool = model(
+        vec![],
+        vec![(vec![1, 8, 8, 1], FLOAT32, None), (vec![1, 8, 8, 1], FLOAT32, None)],
+        vec![(op::MAX_POOL_2D, vec![0], vec![1], opts)],
+        vec![0],
+        vec![1],
+    );
+    refused(&pool, "pooling window is too large");
+}
+
+#[test]
+fn multiply_adds_are_bounded() {
+    // Three 16 → 16 pointwise convolutions over 4096×4096: 3·2³² multiply-adds.
+    let s = vec![1, 4096, 4096, 16];
+    let t = |buf| (s.clone(), FLOAT32, buf);
+    let m = model(
+        vec![vec![0; 2 * 16 * 16]],
+        vec![t(None), (vec![16, 1, 1, 16], FLOAT16, Some(0)), t(None), t(None), t(None)],
+        (0..3).map(|i| (op::CONV_2D, vec![if i == 0 { 0 } else { i + 1 }, 1, -1], vec![i + 2], window_opts(0, 1))).collect(),
+        vec![0],
+        vec![4],
+    );
+    refused(&m, "too many multiply-adds");
+}
+
+/// #368: 2000 RELUs over 2²⁵ values loaded fine, and one run took minutes.
+#[test]
+fn elementwise_work_is_bounded() {
+    let n = 2000;
+    let m = model(
+        vec![],
+        (0..=n).map(|_| (vec![1, 1 << 25], FLOAT32, None)).collect(),
+        (0..n).map(|i| (op::RELU, vec![i], vec![i + 1], vec![])).collect(),
+        vec![0],
+        vec![n],
+    );
+    refused(&m, "too much work");
+}
+
+#[test]
+fn memory_alive_at_once_is_bounded() {
+    // Five outputs of 2²⁷ values each, all kept, besides the input.
+    let m = model(
+        vec![],
+        (0..6).map(|_| (vec![1, 1 << 27], FLOAT32, None)).collect(),
+        (1..6).map(|i| (op::RELU, vec![0], vec![i], vec![])).collect(),
+        vec![0],
+        (1..6).collect(),
+    );
+    refused(&m, "too much memory");
+}
+
+#[test]
+fn shapes_computed_at_run_time_must_match_the_declared_ones() {
+    // PAD to 2³⁰ × 2³⁰ while declaring a 1×1 output.
+    let pads = vec![0, 1 << 30, 0, 1 << 30].into_iter().flat_map(i32::to_le_bytes).collect();
+    let pad = model(
+        vec![pads],
+        vec![(vec![1, 1], FLOAT32, None), (vec![2, 2], INT32, Some(0)), (vec![1, 1], FLOAT32, None)],
+        vec![(op::PAD, vec![0, 1], vec![2], vec![])],
+        vec![0],
+        vec![2],
+    );
+    refused(&pad, "padding disagrees");
+    // Many large parts concatenated into a small declared output.
+    let concat = model(
+        vec![],
+        vec![(vec![1, 1 << 27], FLOAT32, None), (vec![1, 2], FLOAT32, None)],
+        vec![(op::CONCATENATION, vec![0; 64], vec![1], vec![(0, V::Int(1))])],
+        vec![0],
+        vec![1],
+    );
+    refused(&concat, "parts disagree");
+    // A pool whose output claims more channels than its input has.
+    let pool = model(
+        vec![],
+        vec![(vec![1, 2, 2, 1], FLOAT32, None), (vec![1, 1, 1, 1 << 20], FLOAT32, None)],
+        vec![(op::MAX_POOL_2D, vec![0], vec![1], window_opts(1, 2).into_iter().chain([(3, V::Int(2)), (4, V::Int(2))]).collect())],
+        vec![0],
+        vec![1],
+    );
+    refused(&pool, "changes the channels");
+    // Dimensions may not hide behind a zero.
+    let zero = model(vec![], vec![(vec![0, 1 << 30, 1 << 30], FLOAT32, None)], vec![], vec![0], vec![0]);
+    refused(&zero, "tensor is too large");
+}
+
+#[test]
+fn shared_weights_count_once_per_use() {
+    // One 128 KB buffer decoded for 2100 tensors would be 2100 copies of 2¹⁶ floats.
+    let m = model(vec![vec![0; 2 << 16]], (0..2100).map(|_| (vec![1, 1 << 16], FLOAT16, Some(0))).collect(), vec![], vec![], vec![]);
+    refused(&m, "weights are too large");
+}
+
+/// The official face models (`EFFECTCRAFT_FACE_LANDMARKER` = path to `face_landmarker.task`)
+/// fit every budget with wide headroom.
+#[test]
+fn official_face_models_fit_the_budgets() {
+    let Some(path) = std::env::var_os("EFFECTCRAFT_FACE_LANDMARKER") else { return };
+    let bytes = std::fs::read(path).unwrap();
+    for name in [crate::mediapipe::DETECTOR, crate::mediapipe::MESH] {
+        let c = Model::read(&crate::pt::zip_file(&bytes, name).unwrap()).unwrap().cost().unwrap();
+        println!("{name}: {c:?}");
+        assert!(c.macs <= MAX_MACS / 8 && c.values <= MAX_VALUES / 8 && c.live <= MAX_LIVE / 8 && c.scratch <= MAX_SCRATCH / 8, "{name}: {c:?}");
+        assert!(c.kernel <= MAX_KERNEL as u64 / 4, "{name}: {c:?}");
+    }
+}
diff --git a/crates/svg/src/color.rs b/crates/svg/src/color.rs
index ba4183e75..9ef5faa0a 100644
--- a/crates/svg/src/color.rs
+++ b/crates/svg/src/color.rs
@@ -179,7 +179,11 @@ pub fn parse_color(s: &str) -> Option<[f64; 4]> {
             return None;
         }
         let comp = |t: &str| -> Option<f64> {
-            Some(if let Some(p) = t.strip_suffix('%') { p.trim().parse::<f64>().ok()? / 100.0 } else { t.parse::<f64>().ok()? / 255.0 })
+            Some(if let Some(p) = t.strip_suffix('%') {
+                p.trim().parse::<f64>().ok().filter(|v| v.is_finite())? / 100.0
+            } else {
+                t.parse::<f64>().ok().filter(|v| v.is_finite())? / 255.0
+            })
         };
         let alpha = a.get(3).map_or(Some(1.0), |t| alpha(t))?;
         return Some([comp(a[0])?.clamp(0.0, 1.0), comp(a[1])?.clamp(0.0, 1.0), comp(a[2])?.clamp(0.0, 1.0), alpha]);
@@ -189,9 +193,9 @@ pub fn parse_color(s: &str) -> Option<[f64; 4]> {
         if a.len() < 3 {
             return None;
         }
-        let h = a[0].trim_end_matches("deg").parse::<f64>().ok()?.rem_euclid(360.0) / 360.0;
-        let s = a[1].trim_end_matches('%').parse::<f64>().ok()?.clamp(0.0, 100.0) / 100.0;
-        let l = a[2].trim_end_matches('%').parse::<f64>().ok()?.clamp(0.0, 100.0) / 100.0;
+        let h = a[0].trim_end_matches("deg").parse::<f64>().ok().filter(|v| v.is_finite())?.rem_euclid(360.0) / 360.0;
+        let s = a[1].trim_end_matches('%').parse::<f64>().ok().filter(|v| v.is_finite())?.clamp(0.0, 100.0) / 100.0;
+        let l = a[2].trim_end_matches('%').parse::<f64>().ok().filter(|v| v.is_finite())?.clamp(0.0, 100.0) / 100.0;
         let al = a.get(3).map_or(Some(1.0), |t| alpha(t))?;
         let [r, g, b] = hsl(h, s, l);
         return Some([r, g, b, al]);
@@ -208,7 +212,14 @@ fn split_args(s: &str) -> Vec<&str> {
 }
 
 fn alpha(t: &str) -> Option<f64> {
-    Some(if let Some(p) = t.strip_suffix('%') { p.parse::<f64>().ok()? / 100.0 } else { t.parse::<f64>().ok()? }.clamp(0.0, 1.0))
+    Some(
+        if let Some(p) = t.strip_suffix('%') {
+            p.parse::<f64>().ok().filter(|v| v.is_finite())? / 100.0
+        } else {
+            t.parse::<f64>().ok().filter(|v| v.is_finite())?
+        }
+        .clamp(0.0, 1.0),
+    )
 }
 
 /// CSS HSL → RGB (CSS Color 3 §4.2.4).
@@ -239,6 +250,22 @@ fn hsl(h: f64, s: f64, l: f64) -> [f64; 3] {
 mod tests {
     use super::parse_color;
 
+    #[test]
+    fn non_finite_rejected() {
+        for s in [
+            "rgb(nan,0,0)",
+            "rgb(inf,0,0)",
+            "rgba(0,0,0,nan)",
+            "rgba(0,0,0,inf)",
+            "hsl(nan,100%,50%)",
+            "hsl(120,nan%,50%)",
+            "hsl(120,100%,inf%)",
+            "hsl(120,100%,50%,nan)",
+        ] {
+            assert_eq!(parse_color(s), None, "{s}");
+        }
+    }
+
     #[test]
     fn colors() {
         assert_eq!(parse_color("#f00"), Some([1.0, 0.0, 0.0, 1.0]));
diff --git a/crates/svg/src/lib.rs b/crates/svg/src/lib.rs
index bcffb8004..d2720bb0d 100644
--- a/crates/svg/src/lib.rs
+++ b/crates/svg/src/lib.rs
@@ -392,7 +392,17 @@ enum PaintRef {
     Current,
 }
 
-/// A CSS rule: selector (type, class, id; `*`) with its specificity and declarations.
+/// The most selectors (each entry of a comma list counts) the `<style>` sheets of a document may
+/// hold (#2140).
+const MAX_CSS_SELECTORS: usize = 20_000;
+/// The most declarations the `<style>` sheets of a document may hold, each block counted once.
+const MAX_CSS_DECLARATIONS: usize = 50_000;
+
+/// The most matching work (candidate rules checked plus declarations applied) the elements of a
+/// document may cost, `<use>` copies included: a bound on elements x rules x declarations.
+const MAX_CSS_WORK: usize = 50_000_000;
+
+/// A CSS rule: selector (type, class, id; `*`) with its specificity and declaration block.
 #[derive(Clone, Debug)]
 struct Rule {
     tag: Option<String>,
@@ -400,7 +410,39 @@ struct Rule {
     id: Option<String>,
     specificity: u32,
     order: usize,
-    decls: Vec<(String, String)>,
+    /// Index into [`StyleSheet::blocks`]: every selector of a comma list shares one block.
+    block: usize,
+}
+
+/// The rules of a document's `<style>` sheets, indexed by the part of the selector an element
+/// must have (id, else first class, else type) so an element only checks rules that can match.
+#[derive(Default, Debug)]
+struct StyleSheet {
+    rules: Vec<Rule>,
+    blocks: Vec<Vec<(String, String)>>,
+    /// Declarations over all blocks.
+    decls: usize,
+    by_id: HashMap<String, Vec<usize>>,
+    by_class: HashMap<String, Vec<usize>>,
+    by_tag: HashMap<String, Vec<usize>>,
+    universal: Vec<usize>,
+}
+
+impl StyleSheet {
+    fn index(&mut self) {
+        for (i, r) in self.rules.iter().enumerate() {
+            let bucket = if let Some(id) = &r.id {
+                self.by_id.entry(id.clone()).or_default()
+            } else if let Some(c) = r.classes.first() {
+                self.by_class.entry(c.clone()).or_default()
+            } else if let Some(t) = &r.tag {
+                self.by_tag.entry(t.clone()).or_default()
+            } else {
+                &mut self.universal
+            };
+            bucket.push(i);
+        }
+    }
 }
 
 fn parse_decls(s: &str) -> Vec<(String, String)> {
@@ -428,57 +470,101 @@ fn strip_comments(s: &str) -> String {
     out
 }
 
-fn parse_css(css: &str, rules: &mut Vec<Rule>) {
+/// Splits one simple selector (`tag.class#id`) into its tag, classes and id.
+fn parse_compound(one: &str) -> (Option<String>, Vec<String>, Option<String>) {
+    let mut tag = None;
+    let mut classes = vec![];
+    let mut id = None;
+    let mut cur = String::new();
+    let mut kind = 't';
+    let flush = |kind: char, cur: &mut String, tag: &mut Option<String>, classes: &mut Vec<String>, id: &mut Option<String>| {
+        if !cur.is_empty() {
+            match kind {
+                '.' => classes.push(std::mem::take(cur)),
+                '#' => *id = Some(std::mem::take(cur)),
+                _ => {
+                    if cur != "*" {
+                        *tag = Some(std::mem::take(cur));
+                    }
+                    cur.clear();
+                }
+            }
+        }
+    };
+    for c in one.chars() {
+        if c == '.' || c == '#' {
+            flush(kind, &mut cur, &mut tag, &mut classes, &mut id);
+            kind = c;
+        } else {
+            cur.push(c);
+        }
+    }
+    flush(kind, &mut cur, &mut tag, &mut classes, &mut id);
+    (tag, classes, id)
+}
+
+/// Add the rules of one `<style>` sheet. Errs once the sheets exceed [`MAX_CSS_SELECTORS`] or
+/// [`MAX_CSS_DECLARATIONS`] (#2140).
+fn parse_css(css: &str, sheet: &mut StyleSheet) -> Result<(), Error> {
     let css = strip_comments(css);
     let mut rest = css.as_str();
     while let Some(open) = rest.find('{') {
         let sel = rest[..open].trim();
+        if sel.starts_with('@') {
+            // Skip the whole at-rule block, matching nested braces by depth.
+            let mut depth = 0usize;
+            let mut end = None;
+            for (i, c) in rest[open..].char_indices() {
+                match c {
+                    '{' => depth = depth.saturating_add(1),
+                    '}' => {
+                        depth = depth.saturating_sub(1);
+                        if depth == 0 {
+                            end = Some(open + i + 1);
+                            break;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+            let Some(end) = end else { break };
+            rest = &rest[end..];
+            continue;
+        }
         let Some(close) = rest[open..].find('}') else { break };
         let body = &rest[open + 1..open + close];
         rest = &rest[open + close + 1..];
-        if sel.starts_with('@') {
-            continue;
+        let mut decls = parse_decls(body);
+        sheet.decls = sheet.decls.saturating_add(decls.len());
+        if sheet.decls > MAX_CSS_DECLARATIONS {
+            return Err(Error::Xml(format!("its <style> sheets hold more than {MAX_CSS_DECLARATIONS} declarations")));
         }
-        let decls = parse_decls(body);
+        // Stored with the rule's first accepted selector: a rule of unsupported selectors only
+        // (`a b{}`, repeated) adds no block.
+        let mut block = None;
         for one in sel.split(',') {
             let one = one.trim();
             // Only simple selectors (no combinators / pseudo-classes / attributes).
             if one.is_empty() || one.contains([' ', '>', '+', '~', ':', '[']) {
                 continue;
             }
-            let mut tag = None;
-            let mut classes = vec![];
-            let mut id = None;
-            let mut cur = String::new();
-            let mut kind = 't';
-            let flush = |kind: char, cur: &mut String, tag: &mut Option<String>, classes: &mut Vec<String>, id: &mut Option<String>| {
-                if !cur.is_empty() {
-                    match kind {
-                        '.' => classes.push(std::mem::take(cur)),
-                        '#' => *id = Some(std::mem::take(cur)),
-                        _ => {
-                            if cur != "*" {
-                                *tag = Some(std::mem::take(cur));
-                            }
-                            cur.clear();
-                        }
-                    }
-                }
-            };
-            for c in one.chars() {
-                if c == '.' || c == '#' {
-                    flush(kind, &mut cur, &mut tag, &mut classes, &mut id);
-                    kind = c;
-                } else {
-                    cur.push(c);
-                }
+            if sheet.rules.len() >= MAX_CSS_SELECTORS {
+                return Err(Error::Xml(format!("its <style> sheets hold more than {MAX_CSS_SELECTORS} selectors")));
             }
-            flush(kind, &mut cur, &mut tag, &mut classes, &mut id);
-            let specificity = id.is_some() as u32 * 100 + classes.len() as u32 * 10 + tag.is_some() as u32;
-            let order = rules.len();
-            rules.push(Rule { tag, classes, id, specificity, order, decls: decls.clone() });
+            let block = *block.get_or_insert_with(|| {
+                let i = sheet.blocks.len();
+                sheet.blocks.push(std::mem::take(&mut decls));
+                i
+            });
+            let (tag, classes, id) = parse_compound(one);
+            let specificity = (id.is_some() as u32 * 100)
+                .saturating_add(u32::try_from(classes.len()).unwrap_or(u32::MAX).saturating_mul(10))
+                .saturating_add(tag.is_some() as u32);
+            let order = sheet.rules.len();
+            sheet.rules.push(Rule { tag, classes, id, specificity, order, block });
         }
     }
+    Ok(())
 }
 
 const PROPS: &[&str] = &[
@@ -505,10 +591,18 @@ const PROPS: &[&str] = &[
 
 struct Parser<'a, 'i> {
     ids: HashMap<String, roxmltree::Node<'a, 'i>>,
-    rules: Vec<Rule>,
+    css: StyleSheet,
+    /// CSS matching work done so far; past [`MAX_CSS_WORK`] rules stop applying and the import errs.
+    css_work: std::cell::Cell<usize>,
     vw: f64,
     vh: f64,
     skipped: Vec<String>,
+    /// Elements converted so far, `<use>` copies included, and how many may be (#1236).
+    work: usize,
+    budget: usize,
+    /// The `<use>` targets being expanded, outermost first: a reference back into one is a
+    /// cycle and is skipped.
+    using: Vec<roxmltree::NodeId>,
 }
 
 fn is_svg_ns(n: &roxmltree::Node) -> bool {
@@ -525,24 +619,7 @@ impl<'a, 'i> Parser<'a, 'i> {
                 out.insert(a.name().to_string(), a.value().to_string());
             }
         }
-        let tag = n.tag_name().name();
-        let classes: Vec<&str> = n.attribute("class").map(|c| c.split_whitespace().collect()).unwrap_or_default();
-        let id = n.attribute("id");
-        let mut matching: Vec<&Rule> = self
-            .rules
-            .iter()
-            .filter(|r| {
-                r.tag.as_deref().is_none_or(|t| t == tag)
-                    && r.id.as_deref().is_none_or(|i| Some(i) == id)
-                    && r.classes.iter().all(|c| classes.contains(&c.as_str()))
-            })
-            .collect();
-        matching.sort_by_key(|r| (r.specificity, r.order));
-        for r in matching {
-            for (k, v) in &r.decls {
-                out.insert(k.clone(), v.clone());
-            }
-        }
+        self.apply_rules(n, &mut out);
         if let Some(st) = n.attribute("style") {
             for (k, v) in parse_decls(st) {
                 out.insert(k, v);
@@ -551,6 +628,59 @@ impl<'a, 'i> Parser<'a, 'i> {
         out
     }
 
+    /// Charge `n` units of CSS work; false once the budget is spent.
+    fn charge_css(&self, n: usize) -> bool {
+        let w = self.css_work.get().saturating_add(n);
+        self.css_work.set(w);
+        w <= MAX_CSS_WORK
+    }
+
+    /// Apply the matching `<style>` rules to `out`, by specificity then source order.
+    fn apply_rules(&self, n: roxmltree::Node, out: &mut HashMap<String, String>) {
+        let css = &self.css;
+        if css.rules.is_empty() {
+            return;
+        }
+        // Splitting and sorting the class list is work too: charge its length first.
+        let class = n.attribute("class").unwrap_or_default();
+        if !self.charge_css(class.len()) {
+            return;
+        }
+        let tag = n.tag_name().name();
+        let mut classes: Vec<&str> = class.split_whitespace().collect();
+        classes.sort_unstable();
+        classes.dedup();
+        let id = n.attribute("id");
+        // Each rule sits in exactly one bucket and the classes are distinct: no rule twice.
+        let mut buckets: Vec<&Vec<usize>> = vec![&css.universal];
+        buckets.extend(id.and_then(|i| css.by_id.get(i)));
+        buckets.extend(classes.iter().filter_map(|c| css.by_class.get(*c)));
+        buckets.extend(css.by_tag.get(tag));
+        if !self.charge_css(buckets.iter().map(|b| b.len()).fold(0, usize::saturating_add)) {
+            return;
+        }
+        let candidates = || buckets.iter().flat_map(|b| b.iter()).filter_map(|&i| css.rules.get(i));
+        // A selector like `.z.z.z…` checks each of its classes: charge them too.
+        if !self.charge_css(candidates().map(|r| r.classes.len()).fold(0, usize::saturating_add)) {
+            return;
+        }
+        let mut matching: Vec<&Rule> = candidates()
+            .filter(|r| {
+                r.tag.as_deref().is_none_or(|t| t == tag)
+                    && r.id.as_deref().is_none_or(|i| Some(i) == id)
+                    && r.classes.iter().all(|c| classes.binary_search(&c.as_str()).is_ok())
+            })
+            .collect();
+        matching.sort_by_key(|r| (r.specificity, r.order));
+        let blocks: Vec<&Vec<(String, String)>> = matching.iter().filter_map(|r| css.blocks.get(r.block)).collect();
+        if !self.charge_css(blocks.iter().map(|b| b.len()).fold(0, usize::saturating_add)) {
+            return;
+        }
+        for (k, v) in blocks.into_iter().flatten() {
+            out.insert(k.clone(), v.clone());
+        }
+    }
+
     fn length(&self, s: &str, axis: char, font: f64) -> Option<f64> {
         let s = s.trim();
         let num_end = s.find(|c: char| !(c.is_ascii_digit() || matches!(c, '.' | '-' | '+' | 'e' | 'E'))).unwrap_or(s.len());
@@ -615,7 +745,11 @@ impl<'a, 'i> Parser<'a, 'i> {
         if let Some(c) = d.get("color").and_then(|v| parse_color(v)) {
             st.color = c;
         }
-        if let Some(v) = d.get("font-size").and_then(|v| self.length(v, 'o', st.font_size)) {
+        let font_size = d.get("font-size").and_then(|v| match v.trim().strip_suffix('%') {
+            Some(p) => p.trim().parse::<f64>().ok().map(|p| p / 100.0 * st.font_size),
+            None => self.length(v, 'o', st.font_size),
+        });
+        if let Some(v) = font_size.filter(|v| v.is_finite()) {
             st.font_size = v;
         }
         if let Some(p) = d.get("fill").and_then(|v| self.paint_ref(v)) {
@@ -771,9 +905,12 @@ impl<'a, 'i> Parser<'a, 'i> {
 
     /// Convert an element (and its subtree) into nodes appended to `out`.
     fn node(&mut self, n: roxmltree::Node<'a, 'i>, parent: &Style, out: &mut Vec<Node>, depth: usize) {
-        if depth > 64 || !is_svg_ns(&n) {
+        if depth > 64 || !is_svg_ns(&n) || self.work > self.budget {
             return;
         }
+        // Every element converted counts, each `<use>` copy again: a few references to groups
+        // that reference each other several times can multiply into billions (#1236).
+        self.work += 1;
         let tag = n.tag_name().name();
         match tag {
             "defs" | "title" | "desc" | "metadata" | "style" | "linearGradient" | "radialGradient" | "symbol" | "clipPath" | "mask" | "pattern" | "marker"
@@ -839,9 +976,10 @@ impl<'a, 'i> Parser<'a, 'i> {
             }
             "use" => {
                 let Some(target) = self.href(n) else { return };
-                if target == n || n.ancestors().any(|a| a == target) {
+                if target == n || n.ancestors().any(|a| a == target) || self.using.contains(&target.id()) {
                     return;
                 }
+                self.using.push(target.id());
                 let x = self.attr_len(n, "x", 'x', &st);
                 let y = self.attr_len(n, "y", 'y', &st);
                 transform *= Affine::translate((x, y));
@@ -870,6 +1008,7 @@ impl<'a, 'i> Parser<'a, 'i> {
                 } else {
                     self.node(target, &st, &mut children, depth + 1);
                 }
+                self.using.pop();
                 out.push(Node::Group(Group {
                     name: Self::element_name(n),
                     transform,
@@ -1071,6 +1210,9 @@ pub fn parse_transform(s: &str) -> Affine {
 /// 2 MiB thread's stack (aborting the app) at a few thousand levels; real documents stay far
 /// below this.
 const MAX_XML_DEPTH: usize = 256;
+/// The most elements an import converts, `<use>` copies included, unless the file itself has
+/// more than half as many (#1236).
+const MAX_EXPANDED_ELEMENTS: usize = 500_000;
 
 /// The deepest element nesting of `text` (a quick scan that skips comments, CDATA, processing
 /// instructions, declarations and quoted attribute values).
@@ -1133,18 +1275,31 @@ pub fn parse(bytes: &[u8]) -> Result<Doc, Error> {
         return Err(Error::NotSvg);
     }
     let mut ids = HashMap::new();
-    let mut rules = vec![];
+    let mut css = StyleSheet::default();
     for n in root.descendants().filter(|n| n.is_element()) {
         if let Some(id) = n.attribute("id") {
             ids.entry(id.to_string()).or_insert(n);
         }
         if n.tag_name().name() == "style" {
-            let css: String = n.children().filter_map(|c| c.text()).collect();
-            parse_css(&css, &mut rules);
+            let text: String = n.children().filter_map(|c| c.text()).collect();
+            parse_css(&text, &mut css)?;
         }
     }
+    css.index();
     let vb = viewbox(root);
-    let mut p = Parser { ids, rules, vw: vb.map_or(300.0, |v| v.1), vh: vb.map_or(150.0, |v| v.2), skipped: vec![] };
+    // Room for generous reuse, and always for every element of the file itself.
+    let budget = MAX_EXPANDED_ELEMENTS.max(root.descendants().filter(|n| n.is_element()).count().saturating_mul(2));
+    let mut p = Parser {
+        ids,
+        css,
+        css_work: std::cell::Cell::new(0),
+        vw: vb.map_or(300.0, |v| v.1),
+        vh: vb.map_or(150.0, |v| v.2),
+        skipped: vec![],
+        work: 0,
+        budget,
+        using: vec![],
+    };
     let st = Style::default();
     let pct_or = |name: &str, axis: char, def: f64| -> f64 {
         match root.attribute(name) {
@@ -1180,6 +1335,14 @@ pub fn parse(bytes: &[u8]) -> Result<Doc, Error> {
     for c in root.children() {
         p.node(c, &rst, &mut children, 1);
     }
+    if p.work > p.budget {
+        // Never a silently partial drawing.
+        return Err(Error::Xml(format!("its <use> references expand to more than {} elements", p.budget)));
+    }
+    if p.css_work.get() > MAX_CSS_WORK {
+        // Never a silently unstyled drawing.
+        return Err(Error::Xml(format!("matching its <style> rules takes more than {MAX_CSS_WORK} steps")));
+    }
     let transform = viewbox_transform(root, dw, dh);
     Ok(Doc {
         width: dw,
diff --git a/crates/svg/src/raster.rs b/crates/svg/src/raster.rs
index af59e33db..568b10b25 100644
--- a/crates/svg/src/raster.rs
+++ b/crates/svg/src/raster.rs
@@ -6,7 +6,7 @@ use effectcraft_raster::{Image, Mask};
 use kurbo::{Affine, Point, Shape as _};
 use rayon::prelude::*;
 
-use crate::{BlendMode, Doc, FillRule, Gradient, GradientKind, Group, Node, Paint, Shape, Spread};
+use crate::{BlendMode, Doc, FillRule, Gradient, GradientKind, Group, Node, Paint, Shape, SoftMask, Spread};
 
 fn mat3(a: Affine) -> Mat3 {
     let c = a.as_coeffs();
@@ -20,12 +20,47 @@ pub fn rasterize(doc: &Doc, w: u32, h: u32, scale: f64) -> Image {
 
 /// Rasterise `doc` with `m` mapping document pixels to image pixels.
 pub fn rasterize_with(doc: &Doc, w: u32, h: u32, m: Affine) -> Image {
-    let mut img = Image::new(w, h);
-    draw_group(&doc.root, m, 1.0, &mut img);
+    let mut budget = SurfaceBudget { live_bytes: 0, limit_bytes: MAX_LIVE_SURFACE_BYTES };
+    let Some(mut img) = budget.image(w, h, None) else { return Image::default() };
+    draw_group(&doc.root, m, 1.0, &mut img, &mut budget);
     img
 }
 
-fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
+/// Bound the simultaneously live offscreen image surfaces created by nested groups.
+const MAX_LIVE_SURFACE_BYTES: usize = 512 * 1024 * 1024;
+
+struct SurfaceBudget {
+    live_bytes: usize,
+    limit_bytes: usize,
+}
+
+impl SurfaceBudget {
+    fn image(&mut self, width: u32, height: u32, copy: Option<&Image>) -> Option<Image> {
+        let pixels = (width as usize).checked_mul(height as usize)?;
+        let bytes = pixels.checked_mul(std::mem::size_of::<[f32; 4]>())?;
+        let new_live = self.live_bytes.checked_add(bytes)?;
+        if new_live > self.limit_bytes {
+            return None;
+        }
+        let mut data = Vec::new();
+        data.try_reserve_exact(pixels).ok()?;
+        data.resize(pixels, [0.0; 4]);
+        if let Some(source) = copy {
+            if source.width != width || source.height != height || source.data.len() != pixels {
+                return None;
+            }
+            data.copy_from_slice(&source.data);
+        }
+        self.live_bytes = new_live;
+        Some(Image { width, height, data })
+    }
+
+    fn release(&mut self, image: &Image) {
+        self.live_bytes = self.live_bytes.saturating_sub(image.data.len().saturating_mul(std::mem::size_of::<[f32; 4]>()));
+    }
+}
+
+fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image, budget: &mut SurfaceBudget) {
     let m = m * g.transform;
     let o = opacity * g.opacity;
     if o <= 0.0 {
@@ -38,51 +73,41 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
         || g.knockout;
     if !offscreen {
         for c in &g.children {
-            draw_node(c, m, o, dst);
+            draw_node(c, m, o, dst, budget);
         }
         return;
     }
+    draw_offscreen_group(g, m, o, dst, budget);
+}
+
+/// Draws a group through an offscreen buffer, then composites it onto `dst`.
+fn draw_offscreen_group(g: &Group, m: Affine, o: f64, dst: &mut Image, budget: &mut SurfaceBudget) {
     let only_clip = g.mask.is_none() && g.blend == BlendMode::Normal && o >= 1.0 && !g.knockout;
     // Draw the children on their own (isolated) or over a copy of the backdrop, keep what
     // every clip path covers and the soft mask lets through, then composite with the group's
     // opacity and blend mode.
-    let backdrop = if g.isolated { None } else { Some(dst.clone()) };
-    let mut tmp = match &backdrop {
-        Some(b) => b.clone(),
-        None => Image::new(dst.width, dst.height),
+    let backdrop = if g.isolated { None } else { budget.image(dst.width, dst.height, Some(dst)) };
+    if !g.isolated && backdrop.is_none() {
+        return;
+    }
+    let Some(mut tmp) = budget.image(dst.width, dst.height, backdrop.as_ref()) else {
+        release_backdrop(budget, backdrop.as_ref());
+        return;
     };
-    draw_children(g, m, &mut tmp, backdrop.as_ref());
+    draw_children(g, m, &mut tmp, backdrop.as_ref(), budget);
     if let Some(b) = &backdrop {
         if only_clip {
             // A non-isolated clipping group: the backdrop where the clip excludes the children.
-            let cov = clip_coverage(g, m, dst.width, dst.height);
-            dst.data.par_iter_mut().zip(tmp.data.par_iter()).zip(cov.par_iter()).for_each(|((d, t), c)| {
-                for i in 0..4 {
-                    d[i] = d[i] * (1.0 - c) + t[i] * c;
-                }
-            });
+            clip_onto_backdrop(g, m, dst, &tmp);
+            budget.release(&tmp);
+            release_backdrop(budget, backdrop.as_ref());
+            return;
+        }
+        if !strip_backdrop(g, m, b, &mut tmp, budget) {
+            budget.release(&tmp);
+            release_backdrop(budget, backdrop.as_ref());
             return;
         }
-        // Remove the backdrop's contribution (ISO 32000-1 §11.4.8): with the group's own
-        // alpha αg (its children alone), C = Cn + (Cn − C0)·(α0/αg − α0).
-        let mut solo = Image::new(dst.width, dst.height);
-        draw_children(g, m, &mut solo, None);
-        tmp.data.par_iter_mut().zip(b.data.par_iter()).zip(solo.data.par_iter()).for_each(|((t, b0), s)| {
-            let ag = s[3];
-            if ag <= 0.0 {
-                *t = [0.0; 4];
-                return;
-            }
-            let un = |c: &[f32; 4]| if c[3] > 0.0 { [c[0] / c[3], c[1] / c[3], c[2] / c[3]] } else { [0.0; 3] };
-            let (cn, c0, a0) = (un(t), un(b0), b0[3]);
-            let k = a0 / ag - a0;
-            let mut out = [0.0; 4];
-            for i in 0..3 {
-                out[i] = (cn[i] + (cn[i] - c0[i]) * k).clamp(0.0, 1.0) * ag;
-            }
-            out[3] = ag;
-            *t = out;
-        });
     }
     if !g.clip.is_empty() {
         let cov = clip_coverage(g, m, dst.width, dst.height);
@@ -92,24 +117,12 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
             }
         });
     }
-    if let Some(sm) = &g.mask {
-        let mut mk = Image::new(dst.width, dst.height);
-        draw_group(&sm.content, m, 1.0, &mut mk);
-        let bc = sm.backdrop.map(|v| v as f32);
-        let lum = sm.luminosity;
-        tmp.data.par_iter_mut().zip(mk.data.par_iter()).for_each(|(p, q)| {
-            let k = if lum {
-                // The mask group composited over its backdrop colour, then its luminosity.
-                let c = [0, 1, 2].map(|i| q[i] + bc[i] * (1.0 - q[3]));
-                0.3 * c[0] + 0.59 * c[1] + 0.11 * c[2]
-            } else {
-                q[3]
-            };
-            let k = k.clamp(0.0, 1.0);
-            for v in p.iter_mut() {
-                *v *= k;
-            }
-        });
+    if let Some(sm) = &g.mask
+        && !apply_soft_mask(sm, m, &mut tmp, budget)
+    {
+        budget.release(&tmp);
+        release_backdrop(budget, backdrop.as_ref());
+        return;
     }
     if g.blend == BlendMode::Normal {
         over(dst, &tmp, o as f32);
@@ -123,6 +136,80 @@ fn draw_group(g: &Group, m: Affine, opacity: f64, dst: &mut Image) {
             }
         });
     }
+    budget.release(&tmp);
+    release_backdrop(budget, backdrop.as_ref());
+}
+
+fn release_backdrop(budget: &mut SurfaceBudget, backdrop: Option<&Image>) {
+    if let Some(b) = backdrop {
+        budget.release(b);
+    }
+}
+
+/// A clipping group over a backdrop: the children where the clip covers, the backdrop elsewhere.
+fn clip_onto_backdrop(g: &Group, m: Affine, dst: &mut Image, tmp: &Image) {
+    let cov = clip_coverage(g, m, dst.width, dst.height);
+    dst.data.par_iter_mut().zip(tmp.data.par_iter()).zip(cov.par_iter()).for_each(|((d, t), c)| {
+        for i in 0..4 {
+            d[i] = d[i] * (1.0 - c) + t[i] * c;
+        }
+    });
+}
+
+/// Remove the backdrop's contribution (ISO 32000-1 §11.4.8): with the group's own
+/// alpha αg (its children alone), C = Cn + (Cn − C0)·(α0/αg − α0). Returns false when no
+/// scratch buffer is available.
+fn strip_backdrop(g: &Group, m: Affine, backdrop: &Image, tmp: &mut Image, budget: &mut SurfaceBudget) -> bool {
+    let Some(mut solo) = budget.image(tmp.width, tmp.height, None) else {
+        return false;
+    };
+    draw_children(g, m, &mut solo, None, budget);
+    tmp.data.par_iter_mut().zip(backdrop.data.par_iter()).zip(solo.data.par_iter()).for_each(|((t, b0), s)| {
+        let ag = s[3];
+        if ag <= 0.0 {
+            *t = [0.0; 4];
+            return;
+        }
+        let un = |c: &[f32; 4]| if c[3] > 0.0 { [c[0] / c[3], c[1] / c[3], c[2] / c[3]] } else { [0.0; 3] };
+        let (cn, c0, a0) = (un(t), un(b0), b0[3]);
+        let k = a0 / ag - a0;
+        let mut out = [0.0; 4];
+        for i in 0..3 {
+            out[i] = (cn[i] + (cn[i] - c0[i]) * k).clamp(0.0, 1.0) * ag;
+        }
+        out[3] = ag;
+        *t = out;
+    });
+    budget.release(&solo);
+    drop(solo);
+    true
+}
+
+/// Multiplies the group's pixels by its soft mask. Returns false when no scratch buffer is
+/// available.
+fn apply_soft_mask(sm: &SoftMask, m: Affine, tmp: &mut Image, budget: &mut SurfaceBudget) -> bool {
+    let Some(mut mk) = budget.image(tmp.width, tmp.height, None) else {
+        return false;
+    };
+    draw_group(&sm.content, m, 1.0, &mut mk, budget);
+    let bc = sm.backdrop.map(|v| v as f32);
+    let lum = sm.luminosity;
+    tmp.data.par_iter_mut().zip(mk.data.par_iter()).for_each(|(p, q)| {
+        let k = if lum {
+            // The mask group composited over its backdrop colour, then its luminosity.
+            let c = [0, 1, 2].map(|i| q[i] + bc[i] * (1.0 - q[3]));
+            0.3 * c[0] + 0.59 * c[1] + 0.11 * c[2]
+        } else {
+            q[3]
+        };
+        let k = k.clamp(0.0, 1.0);
+        for v in p.iter_mut() {
+            *v *= k;
+        }
+    });
+    budget.release(&mk);
+    drop(mk);
+    true
 }
 
 /// The product of a group's clip-path coverages.
@@ -142,19 +229,22 @@ fn clip_coverage(g: &Group, m: Affine, w: u32, h: u32) -> Vec<f32> {
 /// Draw a group's children into `dst`. Knockout groups composite each child with the
 /// group's initial backdrop (`backdrop`, or transparent) instead of with the children below:
 /// where the child has shape `f`, `dst = dst·(1 − f) + child + backdrop·(f − αchild)`.
-fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>) {
+fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>, budget: &mut SurfaceBudget) {
     if !g.knockout {
         for c in &g.children {
-            draw_node(c, m, 1.0, dst);
+            draw_node(c, m, 1.0, dst, budget);
         }
         return;
     }
     for c in &g.children {
-        let mut ci = Image::new(dst.width, dst.height);
-        draw_node(c, m, 1.0, &mut ci);
+        let Some(mut ci) = budget.image(dst.width, dst.height, None) else { return };
+        draw_node(c, m, 1.0, &mut ci, budget);
         // Shape: the child drawn fully opaque (constant opacities to 1).
-        let mut si = Image::new(dst.width, dst.height);
-        draw_node(&opaque(c), m, 1.0, &mut si);
+        let Some(mut si) = budget.image(dst.width, dst.height, None) else {
+            budget.release(&ci);
+            return;
+        };
+        draw_node(&opaque(c), m, 1.0, &mut si, budget);
         let zero = [0.0f32; 4];
         dst.data.par_iter_mut().enumerate().for_each(|(i, d)| {
             let (cp, f) = (ci.data[i], si.data[i][3].max(ci.data[i][3]));
@@ -166,6 +256,10 @@ fn draw_children(g: &Group, m: Affine, dst: &mut Image, backdrop: Option<&Image>
                 d[k] = d[k] * (1.0 - f) + cp[k] + b[k] * (f - cp[3]);
             }
         });
+        budget.release(&ci);
+        budget.release(&si);
+        drop(ci);
+        drop(si);
     }
 }
 
@@ -299,14 +393,15 @@ fn set_sat(c: [f32; 3], s: f32) -> [f32; 3] {
     c.map(|v| (v - mn) * s / (mx - mn))
 }
 
-fn draw_node(n: &Node, m: Affine, opacity: f64, dst: &mut Image) {
+fn draw_node(n: &Node, m: Affine, opacity: f64, dst: &mut Image, budget: &mut SurfaceBudget) {
     match n {
-        Node::Group(g) => draw_group(g, m, opacity, dst),
+        Node::Group(g) => draw_group(g, m, opacity, dst, budget),
         Node::Shape(s) => {
             if s.opacity < 1.0 && s.fill.is_some() && s.stroke.is_some() {
-                let mut tmp = Image::new(dst.width, dst.height);
+                let Some(mut tmp) = budget.image(dst.width, dst.height, None) else { return };
                 draw_shape(s, m, 1.0, &mut tmp);
                 over(dst, &tmp, (opacity * s.opacity) as f32);
+                budget.release(&tmp);
             } else {
                 draw_shape(s, m, opacity * s.opacity, dst);
             }
@@ -514,12 +609,12 @@ pub(crate) fn eval_stops(stops: &[(f64, [f64; 4])], t: f64) -> [f32; 4] {
     if t <= first.0 {
         return first.1.map(|v| v as f32);
     }
-    for w in stops.windows(2) {
-        let (a, b) = (w[0], w[1]);
-        if t <= b.0 {
-            let k = if b.0 > a.0 { (t - a.0) / (b.0 - a.0) } else { 1.0 };
-            return [0, 1, 2, 3].map(|i| (a.1[i] + (b.1[i] - a.1[i]) * k) as f32);
-        }
-    }
-    stops.last().map_or([0.0; 4], |s| s.1.map(|v| v as f32))
+    // Find the first upper stop (not the last duplicate): equal-offset segments retain the
+    // reference algorithm's exact-boundary behavior, while nearby values are interpolated from
+    // the preceding stop as before.
+    let upper = stops.partition_point(|stop| stop.0 < t);
+    let Some(b) = stops.get(upper) else { return stops.last().map_or([0.0; 4], |s| s.1.map(|v| v as f32)) };
+    let Some(a) = stops.get(upper.saturating_sub(1)) else { return first.1.map(|v| v as f32) };
+    let k = if b.0 > a.0 { (t - a.0) / (b.0 - a.0) } else { 1.0 };
+    [0, 1, 2, 3].map(|i| (a.1[i] + (b.1[i] - a.1[i]) * k) as f32)
 }
diff --git a/crates/svg/src/tests.rs b/crates/svg/src/tests.rs
index ed1ea873e..31c95e62f 100644
--- a/crates/svg/src/tests.rs
+++ b/crates/svg/src/tests.rs
@@ -11,6 +11,25 @@ fn near(a: [f32; 4], b: [f32; 4], tol: f32) -> bool {
     (0..4).all(|i| (a[i] - b[i]).abs() <= tol)
 }
 
+#[test]
+fn gradient_stop_lookup_handles_duplicate_offsets() {
+    use crate::raster::eval_stops;
+    let stops = [(0.0, [0.0, 0.0, 0.0, 1.0]), (0.5, [1.0, 0.0, 0.0, 1.0]), (0.5, [0.0, 1.0, 0.0, 1.0]), (1.0, [0.0, 0.0, 1.0, 1.0])];
+    assert_eq!(eval_stops(&stops, 0.5), [1.0, 0.0, 0.0, 1.0]);
+    assert!(near(eval_stops(&stops, 0.5001), [0.0, 1.0, 0.0, 1.0], 3e-4));
+    assert_eq!(eval_stops(&stops, 0.75), [0.0, 0.5, 0.5, 1.0]);
+}
+
+#[test]
+fn raster_surface_budget_rejects_oversized_destination_before_allocation() {
+    let doc = parse(br#"<svg xmlns="http://www.w3.org/2000/svg"/>"#).unwrap();
+    // 16,384² RGBA-f32 pixels exceed the bounded destination-surface budget; no giant
+    // allocation should be attempted and the caller receives an empty image.
+    let img = rasterize(&doc, 16_384, 16_384, 1.0);
+    assert!(img.data.is_empty());
+    assert_eq!((img.width, img.height), (0, 0));
+}
+
 #[test]
 fn basic_shapes_structure() {
     let d = parse(BASIC).unwrap();
@@ -217,3 +236,201 @@ fn deep_nesting_errors_instead_of_overflowing_the_stack() {
     assert_eq!(crate::xml_depth(&s), 2);
     assert!(crate::parse(s.as_bytes()).is_ok());
 }
+
+/// How deep `g`'s groups nest, and how many shapes it holds.
+fn depth_and_shapes(g: &Group) -> (usize, usize) {
+    let mut depth = 0;
+    let mut shapes = 0;
+    for c in &g.children {
+        match c {
+            Node::Group(sub) => {
+                let (d, s) = depth_and_shapes(sub);
+                depth = depth.max(d + 1);
+                shapes += s;
+            }
+            Node::Shape(_) => shapes += 1,
+            Node::Image(_) => {}
+        }
+    }
+    (depth, shapes)
+}
+
+#[test]
+fn branching_use_references_stop_at_the_expansion_budget() {
+    // Each group uses the one before twice: 30 levels are 2^30 copies of one rectangle, from a
+    // file of a few kilobytes (#1236).
+    let mut defs = String::from(r#"<g id="g0"><rect width="1" height="1"/></g>"#);
+    for i in 1..=30 {
+        defs += &format!(r##"<g id="g{i}"><use href="#g{p}"/><use href="#g{p}" x="1"/></g>"##, p = i - 1);
+    }
+    let svg = format!(r##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><defs>{defs}</defs><use href="#g30"/></svg>"##);
+    let t0 = std::time::Instant::now();
+    let e = parse(svg.as_bytes()).unwrap_err();
+    assert!(e.to_string().contains("expand to more than"), "{e}");
+    assert!(t0.elapsed() < std::time::Duration::from_secs(10), "{:?}", t0.elapsed());
+    // Below the budget the same pattern imports whole: 2^10 rectangles.
+    let small = svg.replace(r##"<use href="#g30"/></svg>"##, r##"<use href="#g10"/></svg>"##);
+    let doc = parse(small.as_bytes()).unwrap();
+    assert_eq!(depth_and_shapes(&doc.root).1, 1024);
+}
+
+#[test]
+fn mutually_referencing_uses_are_cut_at_the_first_repeat() {
+    // A uses B and B uses A, neither inside the other: once each, not down to the depth limit.
+    let svg = r##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><defs>
+        <g id="a"><rect width="1" height="1"/><use href="#b"/></g>
+        <g id="b"><rect width="2" height="2"/><use href="#a"/></g>
+    </defs><use href="#a"/></svg>"##;
+    let doc = parse(svg.as_bytes()).unwrap();
+    let (depth, shapes) = depth_and_shapes(&doc.root);
+    assert_eq!(shapes, 2, "a's and b's rectangle, once each");
+    assert!(depth <= 6, "{depth}");
+}
+
+#[test]
+fn a_symbol_used_a_thousand_times_still_imports() {
+    let uses: String = (0..1000).map(|i| format!(r##"<use href="#icon" x="{i}"/>"##)).collect();
+    let svg = format!(
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><defs><symbol id="icon"><rect width="1" height="1"/><circle r="1"/><ellipse rx="1" ry="2"/></symbol></defs>{uses}</svg>"##
+    );
+    let doc = parse(svg.as_bytes()).unwrap();
+    assert_eq!(depth_and_shapes(&doc.root).1, 3000);
+}
+
+/// An SVG with one `<style>` sheet and one rectangle per given class list.
+fn styled(css: &str, rects: &[&str]) -> Vec<u8> {
+    let rects: String = rects.iter().map(|attrs| format!(r#"<rect width="1" height="1" {attrs}/>"#)).collect();
+    format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><style>{css}</style>{rects}</svg>"#).into_bytes()
+}
+
+#[test]
+fn comma_selector_lists_share_one_declaration_block() {
+    // Before #2140 every selector of a comma list got its own copy of the declaration block, so
+    // `a,a,a…{…}` stored selectors × declarations strings; one selector past the cap is refused.
+    let sels = vec!["rect"; MAX_CSS_SELECTORS + 1].join(",");
+    let decls: String = (0..10).map(|i| format!("p{i}:v;")).collect();
+    let svg = styled(&format!("{sels}{{fill:red;{decls}}}"), &[""]);
+    let e = parse(&svg).unwrap_err();
+    assert!(e.to_string().contains("selectors"), "{e}");
+}
+
+#[test]
+fn a_style_sheet_with_too_many_declarations_errors() {
+    let decls: String = (0..=MAX_CSS_DECLARATIONS).map(|i| format!("p{i}:v;")).collect();
+    let svg = styled(&format!("rect{{{decls}}}"), &[""]);
+    let e = parse(&svg).unwrap_err();
+    assert!(e.to_string().contains("declarations"), "{e}");
+}
+
+#[test]
+fn selector_lists_keep_the_css_cascade() {
+    let green = Some(Paint::Color([0.0, 1.0, 0.0]));
+    let blue = Some(Paint::Color([0.0, 0.0, 1.0]));
+    let red = Some(Paint::Color([1.0, 0.0, 0.0]));
+    let css = "rect, .b, #c { fill: #00ff00 } .b, .d { fill: #0000ff; stroke: #000000; stroke-width: 3 } rect.e, #c { fill: #ff0000 }";
+    let svg = styled(css, &["", r#"class="b""#, r#"id="c" class="b""#, r#"class="b" style="fill:#00ff00""#, r##"class="e" fill="#0000ff""##, r#"class="d""#]);
+    let doc = parse(&svg).unwrap();
+    let shapes = doc.flatten();
+    let fills: Vec<_> = shapes.iter().map(|s| s.2.fill.clone()).collect();
+    // Type selector; class beats type; id beats class; inline style beats every rule; a later,
+    // more specific rule beats the presentation attribute.
+    assert_eq!(fills, vec![green.clone(), blue.clone(), red.clone(), green, red, blue]);
+    assert!(shapes[0].2.stroke.is_none());
+    // The second list's block reaches both of its selectors.
+    for i in [1, 5] {
+        assert_eq!(shapes[i].2.stroke.as_ref().map(|s| s.width), Some(3.0), "shape {i}");
+    }
+}
+
+#[test]
+fn a_comma_list_stores_its_declarations_once() {
+    let sels = vec!["rect"; 1000].join(",");
+    let decls: String = (0..50).map(|i| format!("p{i}:v;")).collect();
+    let mut sheet = StyleSheet::default();
+    parse_css(&format!("{sels}{{{decls}}}"), &mut sheet).unwrap();
+    assert_eq!(sheet.rules.len(), 1000);
+    assert_eq!(sheet.blocks.len(), 1);
+    assert_eq!(sheet.decls, 50);
+}
+
+#[test]
+fn rules_of_unsupported_selectors_store_no_blocks() {
+    let mut sheet = StyleSheet::default();
+    parse_css(&"a b{}".repeat(100_000), &mut sheet).unwrap();
+    parse_css("a b{fill:red} a>b, rect{fill:blue} c:hover, d{fill:red}", &mut sheet).unwrap();
+    assert_eq!(sheet.rules.len(), 2);
+    assert_eq!(sheet.blocks.len(), 2);
+    assert!(sheet.rules.iter().all(|r| sheet.blocks.get(r.block).is_some_and(|b| b.len() == 1)));
+}
+
+#[test]
+fn huge_class_lists_count_against_the_matching_budget() {
+    // One rule, but a 1 MB class attribute re-split on each of 100 `<use>` copies (#2140).
+    let class = "a ".repeat(500_000);
+    let uses: String = (0..100).map(|i| format!(r##"<use href="#r" x="{i}"/>"##)).collect();
+    let svg = |uses: &str| {
+        format!(
+            r##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><style>.z{{fill:red}}</style><defs><rect id="r" width="1" height="1" class="{class}"/></defs>{uses}</svg>"##
+        )
+    };
+    let e = parse(svg(&uses).as_bytes()).unwrap_err();
+    assert!(e.to_string().contains("<style> rules"), "{e}");
+    let few: String = uses.split_inclusive("/>").take(10).collect();
+    assert!(parse(svg(&few).as_bytes()).is_ok());
+}
+
+#[test]
+fn a_selector_with_many_classes_counts_against_the_matching_budget() {
+    // `.z.z.z…` lands in one class bucket, but each match checks every class it lists.
+    let rule = ".z".repeat(300_000);
+    let uses: String = (0..200).map(|i| format!(r##"<use href="#r" x="{i}"/>"##)).collect();
+    let svg = |uses: &str| {
+        format!(
+            r##"<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><style>{rule}{{fill:red}}</style><defs><rect id="r" width="1" height="1" class="z"/></defs>{uses}</svg>"##
+        )
+    };
+    let e = parse(svg(&uses).as_bytes()).unwrap_err();
+    assert!(e.to_string().contains("<style> rules"), "{e}");
+    let few: String = uses.split_inclusive("/>").take(10).collect();
+    assert!(parse(svg(&few).as_bytes()).is_ok());
+}
+
+#[test]
+fn matching_work_past_the_budget_errors_without_doing_it() {
+    // Within both sheet caps, yet one rectangle would apply 10 000 x 5 001 declarations.
+    let sels = vec!["rect"; 10_000].join(",");
+    let decls: String = (0..5_001).map(|i| format!("p{i}:v;")).collect();
+    let svg = styled(&format!("{sels}{{{decls}}}"), &[""]);
+    let e = parse(&svg).unwrap_err();
+    assert!(e.to_string().contains("<style> rules"), "{e}");
+    // The same sheet styles an element it does not match at no cost.
+    let ok = styled(&format!("{}{{{decls}}}", vec!["circle"; 10_000].join(",")), &[""]);
+    assert!(parse(&ok).is_ok());
+}
+
+#[test]
+fn font_size_percentage_resolves_against_the_parent_font_size() {
+    for (body, expected) in [
+        (r#"<g font-size="200%"><rect width="1em" height="1em"/></g>"#, 32.0),
+        (r#"<g font-size="200%"><rect width="2ex" height="1em"/></g>"#, 32.0),
+        (r#"<g font-size="200%"><g font-size="200%"><rect width="1em" height="1em"/></g></g>"#, 64.0),
+    ] {
+        let svg = format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">{body}</svg>"#);
+        let d = parse(svg.as_bytes()).unwrap();
+        let shapes = d.flatten();
+        assert_eq!(shapes.len(), 1);
+        assert!(matches!(shapes[0].2.geom, Geom::Rect { w, .. } if w == expected), "{body}: {:?}", shapes[0].2.geom);
+    }
+}
+
+#[test]
+fn at_rule_blocks_are_skipped_by_brace_depth() {
+    let mut sheet = StyleSheet::default();
+    parse_css("@media print { .a{fill:#ff0000} .b{fill:#0000ff} } .c{fill:red}", &mut sheet).unwrap();
+    assert_eq!(sheet.rules.len(), 1);
+    assert_eq!(sheet.rules[0].classes, vec!["c".to_string()]);
+    let mut sheet = StyleSheet::default();
+    parse_css("@media x { @supports y { .c{} } .d{} } .e{fill:red}", &mut sheet).unwrap();
+    assert_eq!(sheet.rules.len(), 1);
+    assert_eq!(sheet.rules[0].classes, vec!["e".to_string()]);
+}
diff --git a/crates/text/src/font_dirs.rs b/crates/text/src/font_dirs.rs
index 39714cad7..30694946b 100644
--- a/crates/text/src/font_dirs.rs
+++ b/crates/text/src/font_dirs.rs
@@ -19,6 +19,8 @@ pub(crate) struct FontEnv {
     pub xdg_config_home: Option<PathBuf>,
     /// `FONTCONFIG_FILE`: the main configuration file instead of the standard ones.
     pub fontconfig_file: Option<PathBuf>,
+    /// `FONTCONFIG_PATH`: ordered search folders, before the standard configuration folders.
+    pub fontconfig_path: Option<std::ffi::OsString>,
     /// The main configuration files tried when `FONTCONFIG_FILE` is unset (the first that exists).
     pub fontconfig_roots: Vec<PathBuf>,
     /// Folders scanned if they exist (the usual system folders and the Flatpak host folders).
@@ -34,6 +36,7 @@ impl FontEnv {
             xdg_data_dirs: var("XDG_DATA_DIRS"),
             xdg_config_home: var("XDG_CONFIG_HOME").map(PathBuf::from),
             fontconfig_file: var("FONTCONFIG_FILE").map(PathBuf::from),
+            fontconfig_path: var("FONTCONFIG_PATH"),
             fontconfig_roots: ["/etc/fonts/fonts.conf", "/usr/local/etc/fonts/fonts.conf"].map(PathBuf::from).to_vec(),
             fixed: [
                 "/usr/share/fonts",
@@ -87,10 +90,7 @@ const MAX_FILE_BYTES: u64 = 1 << 20;
 /// The font folders named by the fontconfig configuration.
 pub(crate) fn fontconfig_dirs(env: &FontEnv) -> Vec<PathBuf> {
     let mut st = Reader { env, out: Vec::new(), seen: HashSet::new() };
-    let root = match &env.fontconfig_file {
-        Some(f) => Some(f.clone()),
-        None => env.fontconfig_roots.iter().find(|p| p.is_file()).cloned(),
-    };
+    let root = fontconfig_root(env);
     if let Some(root) = root {
         st.file(&root, 0);
     }
@@ -102,6 +102,40 @@ pub(crate) fn fontconfig_dirs(env: &FontEnv) -> Vec<PathBuf> {
     st.out
 }
 
+/// Select the main file as fontconfig does: absolute names bypass the search path;
+/// relative names (or `fonts.conf`) use FONTCONFIG_PATH, then the standard folders.
+fn fontconfig_root(env: &FontEnv) -> Option<PathBuf> {
+    if let Some(file) = &env.fontconfig_file
+        && file.is_absolute()
+    {
+        return Some(file.clone());
+    }
+    if env.fontconfig_file.is_none() && env.fontconfig_path.is_none() {
+        return env.fontconfig_roots.iter().find(|p| readable_config(p)).cloned();
+    }
+    let file = env.fontconfig_file.as_deref().unwrap_or_else(|| Path::new("fonts.conf"));
+    let mut dirs = Vec::new();
+    if let Some(path) = &env.fontconfig_path {
+        let mut paths = std::env::split_paths(path).peekable();
+        while let Some(mut dir) = paths.next() {
+            // Fontconfig ignores a final empty item; an interior empty item names `/`.
+            if dir.as_os_str().is_empty() {
+                if paths.peek().is_none() {
+                    continue;
+                }
+                dir = PathBuf::from("/");
+            }
+            dirs.push(dir);
+        }
+    }
+    dirs.extend(env.fontconfig_roots.iter().filter_map(|p| p.parent().map(Path::to_path_buf)));
+    dirs.into_iter().map(|dir| dir.join(file)).find(|p| readable_config(p))
+}
+
+fn readable_config(path: &Path) -> bool {
+    path.is_file() && std::fs::File::open(path).is_ok()
+}
+
 struct Reader<'a> {
     env: &'a FontEnv,
     out: Vec<PathBuf>,
@@ -116,7 +150,9 @@ impl Reader<'_> {
             let mut files: Vec<PathBuf> = rd
                 .flatten()
                 .map(|e| e.path())
-                .filter(|p| p.file_name().and_then(|n| n.to_str()).is_some_and(|n| n.ends_with(".conf") && n.starts_with(|c: char| c.is_ascii_digit())))
+                .filter(|p| {
+                    p.file_name().and_then(std::ffi::OsStr::to_str).is_some_and(|n| n.ends_with(".conf") && n.starts_with(|c: char| c.is_ascii_digit()))
+                })
                 .collect();
             files.sort();
             for f in files {
@@ -371,4 +407,109 @@ mod tests {
         assert!(faces.iter().any(|f| f.family == "Noto Serif" && f.origin == "system"), "{:?}", faces.iter().map(|f| &f.family).collect::<Vec<_>>());
         let _ = std::fs::remove_dir_all(&root);
     }
+
+    #[test]
+    fn fontconfig_path_selects_the_first_existing_config_in_search_order() {
+        let root = temp("config-search");
+        let first = root.join("first");
+        let second = root.join("second");
+        write(&first.join("fonts.conf"), "<fontconfig><dir>/first/fonts</dir></fontconfig>");
+        write(&second.join("fonts.conf"), "<fontconfig><dir>/second/fonts</dir></fontconfig>");
+        let mut env = env_in(&root);
+        env.fontconfig_path = Some(std::env::join_paths([root.join("missing"), first.clone(), second.clone()]).unwrap());
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/first/fonts")]);
+        env.fontconfig_path = Some(std::env::join_paths([second, first]).unwrap());
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/second/fonts")]);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[test]
+    fn a_relative_selected_config_uses_the_search_path_and_keeps_relative_includes() {
+        let root = temp("selected-config");
+        let config = root.join("config");
+        write(&config.join("chosen.conf"), "<fontconfig><include>conf.d</include></fontconfig>");
+        write(&config.join("conf.d/10-fonts.conf"), "<fontconfig><dir prefix=\"relative\">../../fonts</dir></fontconfig>");
+        let mut env = env_in(&root);
+        env.fontconfig_path = Some(config.clone().into_os_string());
+        env.fontconfig_file = Some(PathBuf::from("chosen.conf"));
+        assert_eq!(fontconfig_dirs(&env), [config.join("conf.d/../../fonts")]);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[test]
+    fn an_absolute_selected_config_bypasses_the_search_path() {
+        let root = temp("absolute-config");
+        write(&root.join("search/fonts.conf"), "<fontconfig><dir>/wrong/fonts</dir></fontconfig>");
+        write(&root.join("selected.conf"), "<fontconfig><dir>/selected/fonts</dir></fontconfig>");
+        let mut env = env_in(&root);
+        env.fontconfig_path = Some(root.join("search").into_os_string());
+        env.fontconfig_file = Some(root.join("selected.conf"));
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/selected/fonts")]);
+        env.fontconfig_file = Some(root.join("missing.conf"));
+        assert!(fontconfig_dirs(&env).is_empty(), "an explicit missing file does not pick another config");
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[test]
+    fn configuration_search_falls_back_to_standard_folders() {
+        let root = temp("default-config");
+        let config = root.join("etc/fonts");
+        write(&config.join("fonts.conf"), "<fontconfig><dir>/default/fonts</dir></fontconfig>");
+        write(&config.join("selected.conf"), "<fontconfig><dir>/selected/fonts</dir></fontconfig>");
+        let mut env = env_in(&root);
+        env.fontconfig_path = Some(root.join("missing").into_os_string());
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/default/fonts")]);
+        env.fontconfig_file = Some(PathBuf::from("selected.conf"));
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/selected/fonts")]);
+        env.fontconfig_path = None;
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/selected/fonts")]);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn configuration_search_preserves_non_unicode_folder_names() {
+        use std::os::unix::ffi::OsStrExt;
+        let root = temp("non-unicode-config");
+        let config = root.join(std::ffi::OsStr::from_bytes(b"config-\xff"));
+        write(&config.join("fonts.conf"), "<fontconfig><dir>/configured/fonts</dir></fontconfig>");
+        let mut env = env_in(&root);
+        env.fontconfig_path = Some(config.into_os_string());
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/configured/fonts")]);
+        let _ = std::fs::remove_dir_all(&root);
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn configuration_search_skips_unreadable_files() {
+        use std::os::unix::fs::PermissionsExt;
+        struct Cleanup {
+            root: PathBuf,
+            file: PathBuf,
+            permissions: std::fs::Permissions,
+        }
+        impl Drop for Cleanup {
+            fn drop(&mut self) {
+                let _ = std::fs::set_permissions(&self.file, self.permissions.clone());
+                let _ = std::fs::remove_dir_all(&self.root);
+            }
+        }
+        let root = temp("unreadable-config");
+        let first = root.join("first/fonts.conf");
+        let second = root.join("second/fonts.conf");
+        write(&first, "<fontconfig><dir>/unreadable/fonts</dir></fontconfig>");
+        write(&second, "<fontconfig><dir>/readable/fonts</dir></fontconfig>");
+        let _cleanup = Cleanup { root: root.clone(), file: first.clone(), permissions: std::fs::metadata(&first).unwrap().permissions() };
+        std::fs::set_permissions(&first, std::fs::Permissions::from_mode(0o000)).unwrap();
+        if std::fs::File::open(&first).is_ok() {
+            eprintln!("skipped: this process can read mode-000 files");
+            return;
+        }
+        let mut env = env_in(&root);
+        env.fontconfig_roots = vec![first.clone(), second.clone()];
+        env.fontconfig_path = Some(std::env::join_paths([first.parent().unwrap(), second.parent().unwrap()]).unwrap());
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/readable/fonts")]);
+        env.fontconfig_path = None;
+        assert_eq!(fontconfig_dirs(&env), [PathBuf::from("/readable/fonts")]);
+    }
 }
diff --git a/crates/text/src/fonts.rs b/crates/text/src/fonts.rs
index d555954c9..a973335f4 100644
--- a/crates/text/src/fonts.rs
+++ b/crates/text/src/fonts.rs
@@ -15,7 +15,7 @@ use std::sync::{Arc, OnceLock, RwLock};
 use skrifa::instance::{LocationRef, Size};
 use skrifa::{FontRef, MetadataProvider};
 
-use crate::sfnt::{FaceNames, read_faces, read_faces_bytes};
+use crate::sfnt::{FaceNames, NamedInstance, read_faces, read_faces_bytes};
 
 /// Bundled fonts (SIL OFL 1.1; see `assets/fonts/*.attribution` and ATTRIBUTION.md).
 pub static INTER_REGULAR: &[u8] = include_bytes!("../../../assets/fonts/Inter-Regular.ttf");
@@ -60,6 +60,8 @@ pub struct FaceInfo {
     pub postscript: Option<String>,
     /// The face has variation axes (an `fvar` table), read from the table directory at scan time.
     pub variable: bool,
+    /// A variable face's named instances (`Light` … `Black`), read from `fvar` at scan time.
+    pub instances: Vec<NamedInstance>,
 }
 
 /// Something that can list fonts (system folders, a web font picker, a project's font folder…).
@@ -114,7 +116,7 @@ fn walk(dir: &std::path::Path, depth: u32, out: &mut Vec<PathBuf>) {
             if depth < 8 {
                 walk(&p, depth + 1, out);
             }
-        } else if p.extension().and_then(|x| x.to_str()).is_some_and(|x| matches!(x.to_ascii_lowercase().as_str(), "ttf" | "otf" | "ttc" | "otc")) {
+        } else if p.extension().and_then(std::ffi::OsStr::to_str).is_some_and(|x| matches!(x.to_ascii_lowercase().as_str(), "ttf" | "otf" | "ttc" | "otc")) {
             out.push(p);
         }
     }
@@ -152,6 +154,7 @@ fn info_from(n: FaceNames, data: FaceData, origin: &'static str) -> FaceInfo {
         full_name: n.full_name,
         postscript: n.postscript,
         variable: n.variable,
+        instances: n.instances,
     }
 }
 
@@ -289,15 +292,37 @@ impl Face {
 }
 
 struct Db {
+    fallback: Arc<Face>,
     faces: Vec<Arc<Face>>,
     scanned: bool,
 }
 
+/// Keep the compiled-in regular face available independently of discovery results.
+fn bundled_default_face() -> Arc<Face> {
+    let info =
+        read_faces_bytes(INTER_REGULAR).into_iter().next().map(|n| info_from(n, FaceData::Static(INTER_REGULAR), "bundled")).unwrap_or_else(|| FaceInfo {
+            family: DEFAULT_FAMILY.into(),
+            style: "Regular".into(),
+            weight: 400,
+            italic: false,
+            index: 0,
+            data: FaceData::Static(INTER_REGULAR),
+            origin: "bundled",
+            native_family: None,
+            full_name: "Inter Regular".into(),
+            postscript: Some("Inter-Regular".into()),
+            variable: false,
+            instances: Vec::new(),
+        });
+    Arc::new(Face { id: 0, info, bytes: OnceLock::new(), shaper: OnceLock::new() })
+}
+
 fn db() -> &'static RwLock<Db> {
     static DB: OnceLock<RwLock<Db>> = OnceLock::new();
     DB.get_or_init(|| {
-        let mut db = Db { faces: Vec::new(), scanned: false };
-        for b in [INTER_REGULAR, INTER_MEDIUM, INTER_SEMIBOLD, INTER_BOLD, INTER_ITALIC, JETBRAINS_MONO_REGULAR, NOTO_SERIF_REGULAR] {
+        let fallback = bundled_default_face();
+        let mut db = Db { faces: vec![fallback.clone()], fallback, scanned: false };
+        for b in [INTER_MEDIUM, INTER_SEMIBOLD, INTER_BOLD, INTER_ITALIC, JETBRAINS_MONO_REGULAR, NOTO_SERIF_REGULAR] {
             for n in read_faces_bytes(b) {
                 push(&mut db, info_from(n, FaceData::Static(b), "bundled"));
             }
@@ -316,7 +341,7 @@ fn push(db: &mut Db, info: FaceInfo) -> FaceId {
 /// added.
 pub fn add_source(src: &dyn FontSource) -> usize {
     let faces = src.faces();
-    let mut d = db().write().unwrap_or_else(|e| e.into_inner());
+    let mut d = db().write().unwrap_or_else(std::sync::PoisonError::into_inner);
     let mut n = 0;
     for f in faces {
         let dup = d.faces.iter().any(|g| g.info.family.eq_ignore_ascii_case(&f.family) && g.info.style.eq_ignore_ascii_case(&f.style));
@@ -326,7 +351,7 @@ pub fn add_source(src: &dyn FontSource) -> usize {
         }
     }
     // A new face can belong to one of a script's usual families.
-    family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).clear();
+    family_faces_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).clear();
     n
 }
 
@@ -334,9 +359,9 @@ pub fn add_source(src: &dyn FontSource) -> usize {
 pub fn add_font_data(data: Vec<u8>) -> Vec<FaceId> {
     let data = Arc::new(data);
     let names = read_faces_bytes(&data);
-    let mut d = db().write().unwrap_or_else(|e| e.into_inner());
+    let mut d = db().write().unwrap_or_else(std::sync::PoisonError::into_inner);
     let ids = names.into_iter().map(|n| push(&mut d, info_from(n, FaceData::Shared(data.clone()), "user"))).collect();
-    family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).clear();
+    family_faces_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).clear();
     ids
 }
 
@@ -350,21 +375,21 @@ pub fn scan_system() -> usize {
     if system_scanned() {
         return 0;
     }
-    let _scan = SCAN.lock().unwrap_or_else(|e| e.into_inner());
+    let _scan = SCAN.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if system_scanned() {
         return 0;
     }
     let n = if cfg!(target_arch = "wasm32") { 0 } else { add_source(&DirectorySource::system()) };
-    db().write().unwrap_or_else(|e| e.into_inner()).scanned = true;
+    db().write().unwrap_or_else(std::sync::PoisonError::into_inner).scanned = true;
     n
 }
 
 /// Scan the system font folders again, adding fonts installed since the last scan (faces already
 /// known are kept, so font ids stay valid). Returns the number of faces added.
 pub fn rescan_system() -> usize {
-    let _scan = SCAN.lock().unwrap_or_else(|e| e.into_inner());
+    let _scan = SCAN.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     let n = if cfg!(target_arch = "wasm32") { 0 } else { add_source(&DirectorySource::system()) };
-    db().write().unwrap_or_else(|e| e.into_inner()).scanned = true;
+    db().write().unwrap_or_else(std::sync::PoisonError::into_inner).scanned = true;
     n
 }
 
@@ -385,21 +410,18 @@ pub fn scan_system_in_background() {
 }
 
 pub fn system_scanned() -> bool {
-    db().read().unwrap_or_else(|e| e.into_inner()).scanned
+    db().read().unwrap_or_else(std::sync::PoisonError::into_inner).scanned
 }
 
 /// A face by id (panics never: unknown ids give the default face).
 pub fn face(id: FaceId) -> Arc<Face> {
-    let d = db().read().unwrap_or_else(|e| e.into_inner());
-    // The bundled fonts are compiled in and always parse (`tests::bundled_families_and_resolution` checks them), so
-    // the database is never empty.
-    #[allow(clippy::expect_used)]
-    d.faces.get(id).or_else(|| d.faces.first()).cloned().expect("bundled fonts present")
+    let d = db().read().unwrap_or_else(std::sync::PoisonError::into_inner);
+    d.faces.get(id).cloned().unwrap_or_else(|| d.fallback.clone())
 }
 
 /// All faces (bundled first).
 pub fn all_faces() -> Vec<Arc<Face>> {
-    db().read().unwrap_or_else(|e| e.into_inner()).faces.clone()
+    db().read().unwrap_or_else(std::sync::PoisonError::into_inner).faces.clone()
 }
 
 /// Family names in the fonts' own languages: English family → native family (only families
@@ -425,8 +447,14 @@ pub fn families() -> Vec<(String, Vec<String>)> {
     let mut m: std::collections::BTreeMap<String, Vec<(bool, u16, String)>> = Default::default();
     for f in all_faces() {
         let v = m.entry(f.info.family.clone()).or_default();
-        if !v.iter().any(|(_, _, s)| s == &f.info.style) {
-            v.push((f.info.italic, f.info.weight, f.info.style.clone()));
+        // A variable face lists its named instances (`Light` … `Black`) as styles, as After
+        // Effects' font menu does; its own style name is usually one of them.
+        let styles = std::iter::once((f.info.italic, f.info.weight, f.info.style.clone()))
+            .chain(f.info.instances.iter().map(|i| (i.italic(f.info.italic), i.weight(f.info.weight), i.style.clone())));
+        for (italic, weight, style) in styles {
+            if !v.iter().any(|(_, _, s)| s.eq_ignore_ascii_case(&style)) {
+                v.push((italic, weight, style));
+            }
         }
     }
     m.into_iter()
@@ -446,6 +474,26 @@ pub struct Resolved {
     pub synth_italic: bool,
     /// The requested family was not found (shown as missing in the UI).
     pub missing: bool,
+    /// The named instance of a variable face the request asked for (an index into the face's
+    /// [`FaceInfo::instances`]); its axis values are the text's base variations (see
+    /// [`instance_variations`]).
+    pub instance: Option<u16>,
+}
+
+/// The axis values a resolved request implies: the named instance's coordinates (sorted by tag),
+/// or none for a static face or the face's own default.
+pub fn instance_variations(r: &Resolved) -> Vec<(String, f32)> {
+    let Some(i) = r.instance else { return Vec::new() };
+    face(r.face).info.instances.get(i as usize).map(|n| n.coords.clone()).unwrap_or_default()
+}
+
+/// `explicit` axis values over the instance's `base` ones: a tag set explicitly wins, the others
+/// keep the instance's value. Sorted by tag, as `TextDoc` keeps them.
+pub fn merge_variations(base: &[(String, f32)], explicit: &[(String, f32)]) -> Vec<(String, f32)> {
+    let mut out: Vec<(String, f32)> = base.iter().filter(|(t, _)| !explicit.iter().any(|(e, _)| e.trim_end() == t.trim_end())).cloned().collect();
+    out.extend(explicit.iter().cloned());
+    out.sort_by(|a, b| a.0.cmp(&b.0));
+    out
 }
 
 fn style_wants(style: &str) -> (u16, bool) {
@@ -485,27 +533,69 @@ pub fn resolve(family: &str, style: &str) -> Resolved {
             return r;
         }
     }
+    if let Some(r) = resolve_alias(family, style) {
+        return r;
+    }
     // Inter is bundled; face 0 (the first bundled face) is the last resort.
-    let mut r = resolve_in(DEFAULT_FAMILY, style).unwrap_or(Resolved { face: 0, synth_bold: false, synth_italic: false, missing: true });
+    let mut r = resolve_in(DEFAULT_FAMILY, style).unwrap_or(Resolved { face: 0, synth_bold: false, synth_italic: false, missing: true, instance: None });
     r.missing = !family.is_empty() && !family.eq_ignore_ascii_case(DEFAULT_FAMILY);
     r
 }
 
+/// Metric-compatible substitutes for common proprietary families, in order of preference (the
+/// same pairs fontconfig's `30-metric-aliases.conf` uses). Text keeps its widths and line breaks.
+const METRIC_ALIASES: &[(&str, &[&str])] = &[
+    ("Calibri", &["Carlito"]),
+    ("Cambria", &["Caladea"]),
+    ("Arial", &["Liberation Sans", "Arimo"]),
+    ("Helvetica", &["Liberation Sans", "Arimo"]),
+    ("Arial Narrow", &["Liberation Sans Narrow"]),
+    ("Times New Roman", &["Liberation Serif", "Tinos"]),
+    ("Times", &["Liberation Serif", "Tinos"]),
+    ("Courier New", &["Liberation Mono", "Cousine"]),
+    ("Courier", &["Liberation Mono", "Cousine"]),
+];
+
+/// An installed metric-compatible substitute for a missing family. The result stays `missing`,
+/// so Find Missing Fonts still lists the requested name.
+fn resolve_alias(family: &str, style: &str) -> Option<Resolved> {
+    let family = family.trim();
+    let (_, subs) = METRIC_ALIASES.iter().find(|(name, _)| name.eq_ignore_ascii_case(family))?;
+    subs.iter().find_map(|s| resolve_in(s, style)).map(|r| Resolved { missing: true, ..r })
+}
+
 fn resolve_in(family: &str, style: &str) -> Option<Resolved> {
     let faces = all_faces();
     let fam: Vec<&Arc<Face>> = faces.iter().filter(|f| f.info.family.eq_ignore_ascii_case(family)).collect();
     if fam.is_empty() {
         return None;
     }
+    let instance_named = |f: &Face, name: &str| f.info.instances.iter().position(|i| i.style.eq_ignore_ascii_case(name)).and_then(|i| u16::try_from(i).ok());
+    // A face's own style (a variable face's is its default instance) needs no axis values.
     if let Some(f) = fam.iter().find(|f| f.info.style.eq_ignore_ascii_case(style)) {
-        return Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false });
+        return Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false, instance: None });
     }
+    // A named instance of a variable face (`Figtree` `Black`): that face at the instance's axis
+    // values, not the nearest static weight made bold synthetically.
+    if let Some((f, i)) = fam.iter().find_map(|f| Some((f, instance_named(f, style)?))) {
+        return Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false, instance: Some(i) });
+    }
+    // The nearest weight among the faces and the named instances.
     let (w, it) = style_wants(style);
-    let best = fam.iter().min_by_key(|f| {
-        let italic_pen = if f.info.italic == it { 0 } else { 1000 };
-        italic_pen + (f.info.weight as i32 - w as i32).unsigned_abs()
+    let candidates = fam.iter().flat_map(|f| {
+        std::iter::once((f, None, f.info.weight, f.info.italic)).chain(
+            f.info
+                .instances
+                .iter()
+                .enumerate()
+                .filter_map(move |(i, n)| Some((f, Some(u16::try_from(i).ok()?), n.weight(f.info.weight), n.italic(f.info.italic)))),
+        )
+    });
+    let (best, instance, weight, italic) = candidates.min_by_key(|(_, _, weight, italic)| {
+        let italic_pen = if *italic == it { 0 } else { 1000 };
+        italic_pen + (*weight as i32 - w as i32).unsigned_abs()
     })?;
-    Some(Resolved { face: best.id, synth_bold: w >= 600 && best.info.weight <= 500, synth_italic: it && !best.info.italic, missing: false })
+    Some(Resolved { face: best.id, synth_bold: w >= 600 && weight <= 500, synth_italic: it && !italic, missing: false, instance })
 }
 
 /// A face whose full name or PostScript name is `name` (case-insensitive), the way After Effects
@@ -516,11 +606,31 @@ fn resolve_by_name(name: &str) -> Option<Resolved> {
         return None;
     }
     let faces = all_faces();
-    let f = faces
+    let found = |f: &Arc<Face>, instance: Option<usize>| Resolved {
+        face: f.id,
+        synth_bold: false,
+        synth_italic: false,
+        missing: false,
+        instance: instance.and_then(|i| u16::try_from(i).ok()),
+    };
+    if let Some(f) = faces
         .iter()
         .find(|f| f.info.postscript.as_deref().is_some_and(|p| p.eq_ignore_ascii_case(name)))
-        .or_else(|| faces.iter().find(|f| f.info.full_name.eq_ignore_ascii_case(name)))?;
-    Some(Resolved { face: f.id, synth_bold: false, synth_italic: false, missing: false })
+        .or_else(|| faces.iter().find(|f| f.info.full_name.eq_ignore_ascii_case(name)))
+    {
+        // A variable face's own name is its default instance's (`Figtree-Light`).
+        return Some(found(f, None));
+    }
+    // A named instance of a variable face, by its PostScript name (`Figtree-Black`, what After
+    // Effects scripts use) or its full name (`Figtree Black`).
+    faces.iter().find_map(|f| {
+        let i = f
+            .info
+            .instances
+            .iter()
+            .position(|i| i.postscript.eq_ignore_ascii_case(name) || format!("{} {}", f.info.family, i.style).eq_ignore_ascii_case(name))?;
+        Some(found(f, Some(i)))
+    })
 }
 
 /// The writing systems that need a dedicated fallback family: the bundled fonts cover none of
@@ -542,6 +652,8 @@ enum FallbackScript {
     /// Sinhala (one family covers them all on Windows; elsewhere each has its own).
     Indic,
     Thai,
+    /// Georgian: Mkhedruli, Asomtavruli and Nuskhuri, and Mtavruli capitals.
+    Georgian,
     Other,
 }
 
@@ -570,6 +682,7 @@ fn script_of(c: char) -> FallbackScript {
         0x0590..=0x05FF | 0xFB1D..=0xFB4F => FallbackScript::Hebrew,
         0x0900..=0x0DFF | 0xA8E0..=0xA8FF => FallbackScript::Indic,
         0x0E00..=0x0E7F => FallbackScript::Thai,
+        0x10A0..=0x10FF | 0x1C90..=0x1CBF | 0x2D00..=0x2D2F => FallbackScript::Georgian,
         _ => FallbackScript::Other,
     }
 }
@@ -635,6 +748,7 @@ const INDIC_FAMILIES: &[&str] = &[
     "Noto Sans Sinhala",
 ];
 const THAI_FAMILIES: &[&str] = &["Leelawadee UI", "Tahoma", "Thonburi", "Noto Sans Thai", "Noto Sans Thai UI", "Loma", "Garuda"];
+const GEORGIAN_FAMILIES: &[&str] = &["Sylfaen", ".SF Georgian", "SF Georgian", "Noto Sans Georgian", "DejaVu Sans"];
 
 /// The CJK locale the host asked fallbacks to prefer, when it has one (see [`set_cjk_locale`]).
 static REQUESTED_CJK_LOCALE: RwLock<Option<String>> = RwLock::new(None);
@@ -648,28 +762,62 @@ static REQUESTED_CJK_LOCALE: RwLock<Option<String>> = RwLock::new(None);
 pub fn set_cjk_locale(tag: &str) {
     let tag = tag.trim().to_ascii_lowercase();
     let requested = if tag.is_empty() || tag == "c" || tag == "posix" { None } else { Some(tag) };
-    *REQUESTED_CJK_LOCALE.write().unwrap_or_else(|e| e.into_inner()) = requested;
+    *REQUESTED_CJK_LOCALE.write().unwrap_or_else(std::sync::PoisonError::into_inner) = requested;
     // The order of the CJK families follows the language, so a change of language drops the cached
     // fallbacks.
-    fallback_cache().write().unwrap_or_else(|e| e.into_inner()).clear();
-    family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).clear();
+    fallback_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).clear();
+    family_faces_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).clear();
 }
 
 fn requested_cjk_locale() -> Option<String> {
-    REQUESTED_CJK_LOCALE.read().unwrap_or_else(|e| e.into_inner()).clone()
+    REQUESTED_CJK_LOCALE.read().unwrap_or_else(std::sync::PoisonError::into_inner).clone()
 }
 
 /// The CJK locale to use: [`set_cjk_locale`] when the host asked for one, otherwise the locale
 /// environment (`LANG`, `LC_ALL`, `LC_CTYPE`; `EFFECTCRAFT_CJK_LOCALE` overrides them).
 fn active_cjk_locale() -> String {
-    requested_cjk_locale().unwrap_or_else(|| {
-        ["EFFECTCRAFT_CJK_LOCALE", "LC_ALL", "LC_CTYPE", "LANG"]
-            .iter()
-            .filter_map(|k| std::env::var(k).ok())
-            .map(|v| v.trim().to_ascii_lowercase())
-            .find(|v| !v.is_empty() && v != "c" && v != "posix")
-            .unwrap_or_default()
-    })
+    requested_cjk_locale().unwrap_or_else(environment_cjk_locale)
+}
+
+/// Read the environment independently of another UI's process-wide language request.
+fn environment_cjk_locale() -> String {
+    ["EFFECTCRAFT_CJK_LOCALE", "LC_ALL", "LC_CTYPE", "LANG"]
+        .iter()
+        .filter_map(|k| std::env::var(k).ok())
+        .map(|v| v.trim().to_ascii_lowercase())
+        .find(|v| !v.is_empty() && v != "c" && v != "posix")
+        .unwrap_or_default()
+}
+
+/// The four distinct fallback policies, rather than unbounded user-supplied locale cache keys.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+enum CjkLocale {
+    Japanese,
+    Korean,
+    Simplified,
+    Traditional,
+}
+
+impl CjkLocale {
+    fn from_tag(tag: &str) -> Self {
+        let tag = tag.trim().to_ascii_lowercase();
+        if tag.starts_with("zh") {
+            if asks_traditional_chinese(&tag) { Self::Traditional } else { Self::Simplified }
+        } else if tag.starts_with("ko") {
+            Self::Korean
+        } else {
+            Self::Japanese
+        }
+    }
+
+    fn tag(self) -> &'static str {
+        match self {
+            Self::Japanese => "ja",
+            Self::Korean => "ko",
+            Self::Simplified => "zh-hans",
+            Self::Traditional => "zh-hant",
+        }
+    }
 }
 
 /// The CJK language to try first for Han ideographs. Japanese when nothing says otherwise: the
@@ -687,6 +835,7 @@ fn han_order_for(tag: &str) -> [FallbackScript; 3] {
 }
 
 /// The order for the locale in force ([`active_cjk_locale`]).
+#[cfg(test)]
 fn han_order() -> [FallbackScript; 3] {
     han_order_for(&active_cjk_locale())
 }
@@ -705,20 +854,16 @@ fn chinese_families_for(tag: &str) -> &'static [&'static str] {
     if asks_traditional_chinese(tag) { TRADITIONAL_CHINESE_FAMILIES } else { SIMPLIFIED_CHINESE_FAMILIES }
 }
 
-/// [`chinese_families_for`] for the locale in force ([`active_cjk_locale`]).
-fn chinese_families() -> &'static [&'static str] {
-    chinese_families_for(&active_cjk_locale())
-}
-
-fn families_for(s: FallbackScript) -> &'static [&'static str] {
+fn families_for(s: FallbackScript, locale: CjkLocale) -> &'static [&'static str] {
     match s {
         FallbackScript::Japanese => JAPANESE_FAMILIES,
-        FallbackScript::Han => chinese_families(),
+        FallbackScript::Han => chinese_families_for(locale.tag()),
         FallbackScript::Korean => KOREAN_FAMILIES,
         FallbackScript::Arabic => ARABIC_FAMILIES,
         FallbackScript::Hebrew => HEBREW_FAMILIES,
         FallbackScript::Indic => INDIC_FAMILIES,
         FallbackScript::Thai => THAI_FAMILIES,
+        FallbackScript::Georgian => GEORGIAN_FAMILIES,
         FallbackScript::Other => &[],
     }
 }
@@ -790,9 +935,10 @@ fn fallback_cache() -> &'static RwLock<std::collections::HashMap<(u32, FaceId),
     CACHE.get_or_init(Default::default)
 }
 
-/// The results of [`family_faces`], per script and preferred face.
-fn family_faces_cache() -> &'static RwLock<std::collections::HashMap<(FallbackScript, FaceId), Arc<Vec<FaceId>>>> {
-    static CACHE: OnceLock<RwLock<std::collections::HashMap<(FallbackScript, FaceId), Arc<Vec<FaceId>>>>> = OnceLock::new();
+/// The results of [`family_faces`], per script, preferred face and captured language policy.
+/// A lookup that finishes after a language change cannot populate another language's entry.
+fn family_faces_cache() -> &'static RwLock<std::collections::HashMap<(FallbackScript, FaceId, CjkLocale), Arc<Vec<FaceId>>>> {
+    static CACHE: OnceLock<RwLock<std::collections::HashMap<(FallbackScript, FaceId, CjkLocale), Arc<Vec<FaceId>>>>> = OnceLock::new();
     CACHE.get_or_init(Default::default)
 }
 
@@ -802,6 +948,27 @@ fn family_faces_cache() -> &'static RwLock<std::collections::HashMap<(FallbackSc
 /// loaded are tried after that (cheap), and any installed face that covers the character is tried
 /// last. `prefer` is returned when nothing covers it (the glyph renders as the missing-glyph box).
 pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
+    fallback_with_locale(c, prefer, || CjkLocale::from_tag(&active_cjk_locale()))
+}
+
+/// Choose a fallback for an explicit interface language, independent of concurrent global
+/// language changes. Empty, `c` and `posix` use the OS environment rather than the global request.
+pub fn fallback_for_locale(c: char, prefer: FaceId, tag: &str) -> FaceId {
+    let tag = tag.trim();
+    let locale = || {
+        if tag.is_empty() || tag.eq_ignore_ascii_case("c") || tag.eq_ignore_ascii_case("posix") {
+            CjkLocale::from_tag(&environment_cjk_locale())
+        } else {
+            CjkLocale::from_tag(tag)
+        }
+    };
+    fallback_with_locale(c, prefer, locale)
+}
+
+/// Keep a single language snapshot through the family-order lookup and cache insertion. `locale`
+/// is read only for a script with usual families: reading it takes a lock and may consult the
+/// environment, and layout asks for a fallback for every character.
+fn fallback_with_locale(c: char, prefer: FaceId, locale: impl FnOnce() -> CjkLocale) -> FaceId {
     let p = face(prefer);
     if p.has_char(c) || c.is_control() {
         return prefer;
@@ -822,7 +989,7 @@ pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
         if cfg!(not(target_arch = "wasm32")) && !system_scanned() {
             scan_system();
         }
-        if let Some(&id) = family_faces(script, &p).iter().find(|&&id| face(id).has_char(c)) {
+        if let Some(&id) = family_faces(script, &p, locale()).iter().find(|&&id| face(id).has_char(c)) {
             return id;
         }
     }
@@ -833,7 +1000,7 @@ pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
         }
     }
     let key = (c as u32 >> 8, prefer);
-    if let Some(cached) = fallback_cache().read().unwrap_or_else(|e| e.into_inner()).get(&key).copied() {
+    if let Some(cached) = fallback_cache().read().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key).copied() {
         match cached {
             Some(id) if face(id).has_char(c) => return id,
             Some(_) => {}
@@ -844,30 +1011,31 @@ pub fn fallback_for(c: char, prefer: FaceId) -> FaceId {
         scan_system();
     }
     let found = system_fallback(c, &p.info.style);
-    fallback_cache().write().unwrap_or_else(|e| e.into_inner()).insert(key, found);
+    fallback_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).insert(key, found);
     found.unwrap_or(prefer)
 }
 
 /// The script-aware part of [`fallback_for`]: the installed faces of the platform's usual families
 /// for `script`, in the order they are tried, each in the style of `prefer`. For CJK, the other CJK
 /// languages' families follow in the locale's order.
-fn family_faces(script: FallbackScript, prefer: &Face) -> Arc<Vec<FaceId>> {
-    if let Some(faces) = family_faces_cache().read().unwrap_or_else(|e| e.into_inner()).get(&(script, prefer.id)) {
+fn family_faces(script: FallbackScript, prefer: &Face, locale: CjkLocale) -> Arc<Vec<FaceId>> {
+    if let Some(faces) = family_faces_cache().read().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(script, prefer.id, locale)) {
         return faces.clone();
     }
     let order: Vec<FallbackScript> = match script {
         FallbackScript::Other => vec![],
-        FallbackScript::Han => han_order().to_vec(),
+        FallbackScript::Han => han_order_for(locale.tag()).to_vec(),
         s if s.is_cjk() => {
             let mut v = vec![s];
-            v.extend(han_order().iter().copied().filter(|o| *o != s));
+            v.extend(han_order_for(locale.tag()).iter().copied().filter(|o| *o != s));
             v
         }
         s => vec![s],
     };
     let style = &prefer.info.style;
-    let faces: Arc<Vec<FaceId>> = Arc::new(order.into_iter().flat_map(families_for).filter_map(|fam| resolve_in(fam, style)).map(|r| r.face).collect());
-    family_faces_cache().write().unwrap_or_else(|e| e.into_inner()).insert((script, prefer.id), faces.clone());
+    let faces: Arc<Vec<FaceId>> =
+        Arc::new(order.into_iter().flat_map(|s| families_for(s, locale)).filter_map(|fam| resolve_in(fam, style)).map(|r| r.face).collect());
+    family_faces_cache().write().unwrap_or_else(std::sync::PoisonError::into_inner).insert((script, prefer.id, locale), faces.clone());
     faces
 }
 
@@ -881,291 +1049,4 @@ fn system_fallback(c: char, style: &str) -> Option<FaceId> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn extra_font_dirs_come_from_a_path_list() {
-        assert!(extra_dirs(None).is_empty());
-        let v = std::env::join_paths(["/a/fonts", "/b/more"]).unwrap_or_default();
-        assert_eq!(extra_dirs(Some(&v)), vec![PathBuf::from("/a/fonts"), PathBuf::from("/b/more")]);
-        assert!(extra_dirs(Some(std::ffi::OsStr::new(""))).is_empty());
-    }
-
-    #[test]
-    fn bundled_families_and_resolution() {
-        let fams = families();
-        let inter = fams.iter().find(|(f, _)| f == "Inter").expect("Inter");
-        for s in ["Regular", "Medium", "SemiBold", "Bold", "Italic"] {
-            assert!(inter.1.iter().any(|x| x == s), "{s} in {:?}", inter.1);
-        }
-        assert!(fams.iter().any(|(f, _)| f == "Noto Serif"));
-        assert!(fams.iter().any(|(f, _)| f == "JetBrains Mono"));
-        let b = resolve("inter", "bold");
-        assert_eq!(face(b.face).info.style, "Bold");
-        assert!(!b.synth_bold);
-        let faces = all_faces();
-        assert!(faces.iter().any(|f| f.info.family == "Noto Serif" && f.info.style == "Regular" && f.info.origin == "bundled"));
-        // A real installed Bold Italic takes priority. Partial installed families can instead
-        // supply the nearest weight/slant, so neither synthesis flag is fixed by the OS.
-        for family in ["Noto Serif", "Inter"] {
-            let resolved = resolve(family, "Bold Italic");
-            let selected = face(resolved.face);
-            assert!(selected.info.family.eq_ignore_ascii_case(family));
-            assert!(!resolved.missing);
-            let candidates: Vec<_> = faces.iter().filter(|f| f.info.family.eq_ignore_ascii_case(family)).collect();
-            if let Some(exact) = candidates.iter().find(|f| f.info.style.eq_ignore_ascii_case("Bold Italic")) {
-                assert_eq!(resolved.face, exact.id, "real style wins for {family}");
-                assert!(!resolved.synth_bold && !resolved.synth_italic);
-            } else {
-                // Italic mismatch dominates any supported font weight distance.
-                let distance = |f: &Face| u32::from(f.info.weight.abs_diff(700)) + if f.info.italic { 0 } else { 1_000 };
-                let nearest = candidates.iter().map(|f| distance(f)).min().unwrap();
-                assert_eq!(distance(&selected), nearest, "closest available style for {family}");
-                assert_eq!(resolved.synth_bold, selected.info.weight <= 500);
-                assert_eq!(resolved.synth_italic, !selected.info.italic);
-            }
-        }
-    }
-
-    #[test]
-    fn missing_family_falls_back_to_inter() {
-        let r = resolve("No Such Font Family 123", "Regular");
-        assert_eq!(face(r.face).info.family, "Inter");
-        assert!(r.missing);
-    }
-
-    /// Native: the system scan reads name tables only and resolves families installed there.
-    #[test]
-    fn system_scan_finds_fonts() {
-        let t = std::time::Instant::now();
-        scan_system(); // (another test may have triggered the scan already)
-        let n = all_faces().iter().filter(|f| f.info.origin == "system").count();
-        eprintln!("system fonts: {n} faces in {:?}", t.elapsed());
-        assert_eq!(scan_system(), 0, "scans once");
-        if cfg!(target_os = "macos") {
-            assert!(n > 20, "{n}");
-            let r = resolve("Helvetica", "Bold");
-            assert_eq!(face(r.face).info.family, "Helvetica");
-            let l = crate::layout_text("Helvetica", &crate::TextStyle { family: "Helvetica".into(), size: 30.0, ..Default::default() }, &Default::default());
-            assert!(!l.missing_font && l.glyphs.iter().all(|g| g.id != 0));
-        }
-    }
-
-    #[test]
-    fn postscript_and_full_names_resolve() {
-        // Bundled Inter: name id 6 is `Inter-Bold`, name id 4 is `Inter Bold`.
-        let ps = resolve("Inter-Bold", "");
-        assert_eq!(face(ps.face).info.style, "Bold");
-        assert!(!ps.missing && !ps.synth_bold);
-        let full = resolve("inter semibold", "");
-        assert_eq!(face(full.face).info.style, "SemiBold");
-        assert!(!full.missing);
-        // A family name still wins over a name lookup.
-        assert_eq!(face(resolve("Inter", "Bold").face).info.style, "Bold");
-    }
-
-    #[test]
-    fn scripts_are_classified() {
-        assert_eq!(script_of('あ'), FallbackScript::Japanese);
-        assert_eq!(script_of('ｶ'), FallbackScript::Japanese);
-        assert_eq!(script_of('한'), FallbackScript::Korean);
-        assert_eq!(script_of('水'), FallbackScript::Han);
-        assert_eq!(script_of('、'), FallbackScript::Han);
-        assert_eq!(script_of('Ａ'), FallbackScript::Han);
-        assert_eq!(script_of('\u{20000}'), FallbackScript::Han);
-        assert_eq!(script_of('A'), FallbackScript::Other);
-        assert_eq!(script_of('م'), FallbackScript::Arabic);
-        assert_eq!(script_of('\u{fefb}'), FallbackScript::Arabic);
-        assert_eq!(script_of('\u{5d0}'), FallbackScript::Hebrew);
-        assert_eq!(script_of('क'), FallbackScript::Indic);
-        assert_eq!(script_of('த'), FallbackScript::Indic);
-        assert_eq!(script_of('ก'), FallbackScript::Thai);
-        assert_eq!(script_of('\u{feff}'), FallbackScript::Other, "the byte order mark is no Arabic letter");
-    }
-
-    /// Native: Arabic, Hebrew, Indic and Thai text in a Latin-only family falls back to the
-    /// platform's plain text family for its script (#394), not to the first installed face that
-    /// covers it (on Windows a calligraphic Arabic face sorts first). Skipped per script where no
-    /// family from its list is installed.
-    #[test]
-    fn other_scripts_fall_back_to_a_plain_system_family() {
-        scan_system();
-        let inter = resolve("Inter", "Regular").face;
-        for (c, families) in [('م', ARABIC_FAMILIES), ('א', HEBREW_FAMILIES), ('क', INDIC_FAMILIES), ('த', INDIC_FAMILIES), ('ก', THAI_FAMILIES)] {
-            let covering = families.iter().any(|n| resolve_in(n, "Regular").is_some_and(|r| face(r.face).has_char(c)));
-            if !covering {
-                eprintln!("{c}: no family from the list is installed; skipping");
-                continue;
-            }
-            let f = face(fallback_for(c, inter));
-            assert!(f.has_char(c), "{c}: {} lacks it", f.info.family);
-            assert!(families.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
-        }
-    }
-
-    /// Native: Japanese text in a Latin-only family falls back to an installed Japanese family
-    /// (whichever the platform ships) instead of the missing-glyph box, without any layer having
-    /// loaded a CJK font first. Skipped where no family from the list is installed.
-    #[test]
-    fn cjk_falls_back_to_a_system_family() {
-        scan_system();
-        let inter = resolve("Inter", "Bold").face;
-        let installed = JAPANESE_FAMILIES.iter().any(|f| resolve_in(f, "Regular").is_some());
-        if !installed {
-            eprintln!("no Japanese family installed; skipping");
-            return;
-        }
-        for c in ['水', 'あ', 'ア', '。'] {
-            let id = fallback_for(c, inter);
-            let f = face(id);
-            assert!(f.has_char(c), "{c}: {} {} lacks it", f.info.family, f.info.style);
-            assert!(JAPANESE_FAMILIES.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
-        }
-        // The bold cut of the fallback family is chosen for bold text when the family has one.
-        let f = face(fallback_for('水', inter));
-        let (w, _) = style_wants(&f.info.style);
-        let has_bold = all_faces().iter().any(|g| g.info.family == f.info.family && style_wants(&g.info.style).0 >= 600);
-        assert!(!has_bold || w >= 600, "{} {}", f.info.family, f.info.style);
-        // Cached: the second call is a lookup.
-        assert_eq!(fallback_for('水', inter), f.id);
-    }
-
-    /// A minimal TrueType font built in code (no font file in the repo): U+0020 and U+E000 map to
-    /// an empty glyph, U+E001 to a triangle.
-    fn blank_glyph_font() -> Vec<u8> {
-        fn u16s(v: &[u16]) -> Vec<u8> {
-            v.iter().flat_map(|x| x.to_be_bytes()).collect()
-        }
-        let delta_space = 1u16.wrapping_sub(0x20);
-        let cmap4 = {
-            let mut t = u16s(&[4, 0, 0, 6, 4, 1, 2]);
-            t.extend(u16s(&[0x20, 0xE001, 0xFFFF, 0, 0x20, 0xE000, 0xFFFF, delta_space, 0x2001, 1, 0, 0, 0]));
-            let len = t.len() as u16;
-            t[2..4].copy_from_slice(&len.to_be_bytes());
-            t
-        };
-        let mut cmap = u16s(&[0, 1, 3, 1, 0, 12]);
-        cmap.extend(cmap4);
-        // glyph 2: one contour of three on-curve points (100,0) (500,0) (300,600)
-        let mut glyf = u16s(&[1, 100, 0, 500, 600, 2, 0]);
-        glyf.extend([1u8, 1, 1]);
-        glyf.extend(u16s(&[100, 400, (-200i16) as u16, 0, 0, 600]));
-        glyf.push(0);
-        let loca = u16s(&[0, 0, 0, (glyf.len() / 2) as u16]);
-        let mut head = u16s(&[1, 0, 1, 0, 0, 0, 0x5F0F, 0x3CF5, 0, 1000]);
-        head.extend([0u8; 16]);
-        head.extend(u16s(&[100, 0, 500, 600, 0, 8, 2, 0, 0]));
-        let mut hhea = u16s(&[1, 0, 800, (-200i16) as u16, 0, 600, 0, 0, 500, 1, 0, 0]);
-        hhea.extend([0u8; 8]);
-        hhea.extend(u16s(&[0, 3]));
-        let hmtx = u16s(&[600, 0, 600, 0, 600, 0]);
-        let maxp = u16s(&[1, 0, 3, 3, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0]);
-        let strings: Vec<Vec<u8>> = ["Blank Glyph Test", "Regular"].iter().map(|s| s.encode_utf16().flat_map(|u| u.to_be_bytes()).collect()).collect();
-        let mut name = u16s(&[0, 2, 30]);
-        let mut off = 0;
-        for (id, st) in strings.iter().enumerate() {
-            name.extend(u16s(&[3, 1, 0x409, id as u16 + 1, st.len() as u16, off]));
-            off += st.len() as u16;
-        }
-        strings.iter().for_each(|st| name.extend(st));
-        let tables: [(&[u8; 4], Vec<u8>); 8] =
-            [(b"cmap", cmap), (b"glyf", glyf), (b"head", head), (b"hhea", hhea), (b"hmtx", hmtx), (b"loca", loca), (b"maxp", maxp), (b"name", name)];
-        let mut out = u16s(&[1, 0, tables.len() as u16, 128, 3, 0]);
-        let mut offset = 12 + 16 * tables.len();
-        let mut body = vec![];
-        for (tag, data) in &tables {
-            out.extend(*tag);
-            out.extend([0u8; 4]);
-            out.extend((offset as u32).to_be_bytes());
-            out.extend((data.len() as u32).to_be_bytes());
-            let padded = data.len().div_ceil(4) * 4;
-            body.extend(data);
-            body.resize(body.len() + padded - data.len(), 0);
-            offset += padded;
-        }
-        out.extend(body);
-        out
-    }
-
-    /// A face that maps a character to an empty glyph doesn't cover it, so fallback skips it
-    /// (#285); a blank space still counts, and a drawn glyph is found as before.
-    #[test]
-    fn an_empty_glyph_does_not_cover_its_character() {
-        let ids = add_font_data(blank_glyph_font());
-        let &[id] = ids.as_slice() else { panic!("one face expected: {ids:?}") };
-        let f = face(id);
-        assert_eq!(f.info.family, "Blank Glyph Test");
-        assert!(f.glyph('\u{e000}').is_some(), "the cmap maps it");
-        assert!(!f.has_char('\u{e000}'), "but its glyph is empty");
-        assert!(f.has_char('\u{e001}'), "a drawn glyph covers its character");
-        assert!(f.has_char(' '), "a space is blank by nature");
-        let inter = resolve("Inter", "Regular").face;
-        assert_ne!(fallback_for('\u{e000}', inter), id, "fallback never picks the empty glyph");
-        assert_eq!(fallback_for('\u{e001}', inter), id, "fallback finds the drawn one");
-    }
-
-    #[test]
-    fn the_han_order_follows_the_cjk_locale() {
-        // Chinese first for any Chinese tag, whether or not it names a script.
-        for tag in ["zh", "zh-CN", "zh_Hans", "ZH-Hant-TW.UTF-8", "zh_MO"] {
-            assert_eq!(han_order_for(tag)[0], FallbackScript::Han, "{tag}");
-        }
-        assert_eq!(han_order_for("ko-KR"), [FallbackScript::Korean, FallbackScript::Japanese, FallbackScript::Han]);
-        // Japanese, and anything else, keeps the Japanese face first for Han text.
-        for tag in ["ja_JP.UTF-8", "en-US", "de", ""] {
-            assert_eq!(han_order_for(tag), [FallbackScript::Japanese, FallbackScript::Han, FallbackScript::Korean], "{tag}");
-        }
-        // The host's request is what `han_order` reads (the ui test covers the effect on the
-        // registered fallbacks; this only checks that clearing it returns to the environment).
-        assert_eq!(requested_cjk_locale(), None, "tests run without a request");
-        assert_eq!(han_order(), han_order_for(&active_cjk_locale()));
-    }
-
-    #[test]
-    fn the_chinese_family_list_follows_the_script_the_locale_asks_for() {
-        for tag in ["zh", "zh-CN", "zh_Hans", "zh_CN.UTF-8", "zh-SG"] {
-            assert_eq!(chinese_families_for(tag), SIMPLIFIED_CHINESE_FAMILIES, "{tag}");
-        }
-        for tag in ["zh-Hant", "zh-Hant-TW", "zh_TW", "zh-HK", "zh_MO.UTF-8"] {
-            assert_eq!(chinese_families_for(tag), TRADITIONAL_CHINESE_FAMILIES, "{tag}");
-        }
-        // Each list carries its own script's faces and not the other's, which is the point of
-        // splitting them: `PingFang SC` covers the same code points as `PingFang TC`, so the
-        // fallback search would have kept it and drawn Simplified forms in a Traditional interface.
-        assert!(SIMPLIFIED_CHINESE_FAMILIES.iter().any(|f| f.contains("PingFang SC") && !f.contains("Source")));
-        assert!(!SIMPLIFIED_CHINESE_FAMILIES.iter().any(|f| f.contains("TC") || f.contains("JhengHei")));
-        assert!(TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains("PingFang TC")));
-        assert!(!TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains(" SC") || f.contains("YaHei") || f.contains("WenQuanYi")));
-        assert!(TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains("Heiti TC") || f.contains("Hiragino Sans CNS")));
-        // The arm the fallback itself walks: Han hands over the list the locale's script picked.
-        assert_eq!(families_for(FallbackScript::Han), chinese_families_for(&active_cjk_locale()));
-        // Han text is the only thing these lists serve; the Japanese order does not change.
-        assert_eq!(han_order_for("ja_JP.UTF-8")[0], FallbackScript::Japanese);
-    }
-
-    #[test]
-    fn bundled_ui_fonts_cover_the_ukrainian_alphabet() {
-        const ALPHABET: &str = "АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя’«»";
-        for (name, bytes) in
-            [("Inter Regular", INTER_REGULAR), ("Inter Medium", INTER_MEDIUM), ("Inter SemiBold", INTER_SEMIBOLD), ("JetBrains Mono", JETBRAINS_MONO_REGULAR)]
-        {
-            let font = FontRef::new(bytes).unwrap();
-            for c in ALPHABET.chars() {
-                assert!(covers(&font, c), "{name} cannot draw {c}");
-            }
-        }
-    }
-
-    #[test]
-    fn metrics_and_coverage() {
-        let f = face(resolve("Inter", "Regular").face);
-        let m = f.metrics(100.0);
-        assert!(m.ascent > 80.0 && m.ascent < 110.0, "{m:?}");
-        assert!(m.descent > 10.0 && m.descent < 40.0);
-        assert!(m.cap_height > 60.0 && m.cap_height < 80.0);
-        assert!(f.has_char('A') && f.has_char('Ж'));
-        assert!(!f.has_char('\u{5d0}'), "Inter has no Hebrew");
-        assert!(f.has_feature(b"liga") || f.has_feature(b"calt"));
-    }
-}
+mod tests;
diff --git a/crates/text/src/fonts/tests.rs b/crates/text/src/fonts/tests.rs
new file mode 100644
index 000000000..079a001e0
--- /dev/null
+++ b/crates/text/src/fonts/tests.rs
@@ -0,0 +1,480 @@
+use super::*;
+
+/// Concurrent language requests must neither choose another context's font nor reuse its
+/// cached family order. Synthetic fonts in a child process keep this independent of the host
+/// font installation and of other tests that exercise the process-global database/locale.
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn cjk_requests_keep_their_language_and_cache_entries() {
+    const CHILD: &str = "EFFECTCRAFT_TEST_ISOLATED_CJK";
+    if std::env::var_os(CHILD).is_none() {
+        let output = std::process::Command::new(std::env::current_exe().unwrap())
+            .args(["--exact", "fonts::tests::cjk_requests_keep_their_language_and_cache_entries", "--nocapture"])
+            .env(CHILD, "1")
+            .output()
+            .unwrap();
+        assert!(output.status.success(), "{}\n{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
+        return;
+    }
+    let families = [("ja", "Yu Gothic"), ("zh-hans", "Microsoft YaHei"), ("zh-hant", "Microsoft JhengHei"), ("ko", "Malgun Gothic")];
+    let mut expected = Vec::new();
+    {
+        let mut d = db().write().unwrap();
+        d.scanned = true; // This test process uses only bundled and synthetic fonts.
+        for (language, family) in families {
+            let mut data = test_font(family);
+            let table = data[12..12 + 8 * 16].as_chunks::<16>().0.iter().find(|t| &t[..4] == b"cmap").unwrap();
+            let cmap = u32::from_be_bytes(table[8..12].try_into().unwrap()) as usize + 12;
+            // Map 页 to the fixture's triangle glyph instead of its private-use range.
+            // All four fonts cover the probe, so coverage cannot choose the right language.
+            for (offset, value) in [(16, '页' as u16), (24, '页' as u16), (30, 2u16.wrapping_sub('页' as u16))] {
+                data[cmap + offset..cmap + offset + 2].copy_from_slice(&value.to_be_bytes());
+            }
+            let data = Arc::new(data);
+            let names = read_faces_bytes(&data).into_iter().next().unwrap();
+            let id = push(&mut d, info_from(names, FaceData::Shared(data), "test"));
+            expected.push((language, id));
+        }
+    }
+    let base = resolve("Inter", "Regular").face;
+    for &(_, id) in &expected {
+        assert!(face(id).has_char('页'));
+    }
+    // Force the original interleaving: Chinese starts, then Japanese replaces the global
+    // language before Chinese looks up its probe. The explicit request must still win.
+    set_cjk_locale("zh-hans");
+    set_cjk_locale("ja");
+    assert_eq!(fallback_for('页', base), expected[0].1);
+    assert_eq!(fallback_for_locale('页', base, "zh-hans"), expected[1].1);
+    // Do not clear the cache here: different policies must coexist in the same cache.
+    for _ in 0..3 {
+        for &(language, id) in &expected {
+            assert_eq!(fallback_for_locale('页', base, language), id, "{language}");
+        }
+    }
+    let barrier = Arc::new(std::sync::Barrier::new(expected.len()));
+    let threads: Vec<_> = expected
+        .into_iter()
+        .map(|(language, id)| {
+            let barrier = barrier.clone();
+            std::thread::spawn(move || {
+                barrier.wait();
+                for _ in 0..128 {
+                    set_cjk_locale(if language == "ja" { "zh-hans" } else { "ja" });
+                    assert_eq!(fallback_for_locale('页', base, language), id, "{language}");
+                }
+            })
+        })
+        .collect();
+    for thread in threads {
+        thread.join().unwrap();
+    }
+}
+
+#[test]
+fn extra_font_dirs_come_from_a_path_list() {
+    assert!(extra_dirs(None).is_empty());
+    let v = std::env::join_paths(["/a/fonts", "/b/more"]).unwrap_or_default();
+    assert_eq!(extra_dirs(Some(&v)), vec![PathBuf::from("/a/fonts"), PathBuf::from("/b/more")]);
+    assert!(extra_dirs(Some(std::ffi::OsStr::new(""))).is_empty());
+}
+
+#[test]
+fn bundled_families_and_resolution() {
+    let fams = families();
+    let inter = fams.iter().find(|(f, _)| f == "Inter").expect("Inter");
+    for s in ["Regular", "Medium", "SemiBold", "Bold", "Italic"] {
+        assert!(inter.1.iter().any(|x| x == s), "{s} in {:?}", inter.1);
+    }
+    assert!(fams.iter().any(|(f, _)| f == "Noto Serif"));
+    assert!(fams.iter().any(|(f, _)| f == "JetBrains Mono"));
+    let b = resolve("inter", "bold");
+    assert_eq!(face(b.face).info.style, "Bold");
+    assert!(!b.synth_bold);
+    let faces = all_faces();
+    assert!(faces.iter().any(|f| f.info.family == "Noto Serif" && f.info.style == "Regular" && f.info.origin == "bundled"));
+    // A real installed Bold Italic takes priority. Partial installed families can instead
+    // supply the nearest weight/slant, so neither synthesis flag is fixed by the OS.
+    for family in ["Noto Serif", "Inter"] {
+        let resolved = resolve(family, "Bold Italic");
+        let selected = face(resolved.face);
+        assert!(selected.info.family.eq_ignore_ascii_case(family));
+        assert!(!resolved.missing);
+        let candidates: Vec<_> = faces.iter().filter(|f| f.info.family.eq_ignore_ascii_case(family)).collect();
+        if let Some(exact) = candidates.iter().find(|f| f.info.style.eq_ignore_ascii_case("Bold Italic")) {
+            assert_eq!(resolved.face, exact.id, "real style wins for {family}");
+            assert!(!resolved.synth_bold && !resolved.synth_italic);
+        } else {
+            // Italic mismatch dominates any supported font weight distance.
+            let distance = |f: &Face| u32::from(f.info.weight.abs_diff(700)) + if f.info.italic { 0 } else { 1_000 };
+            let nearest = candidates.iter().map(|f| distance(f)).min().unwrap();
+            assert_eq!(distance(&selected), nearest, "closest available style for {family}");
+            assert_eq!(resolved.synth_bold, selected.info.weight <= 500);
+            assert_eq!(resolved.synth_italic, !selected.info.italic);
+        }
+    }
+}
+
+#[test]
+fn missing_family_falls_back_to_inter() {
+    let r = resolve("No Such Font Family 123", "Regular");
+    assert_eq!(face(r.face).info.family, "Inter");
+    assert!(r.missing);
+}
+
+/// Native: the system scan reads name tables only and resolves families installed there.
+#[test]
+fn system_scan_finds_fonts() {
+    let t = std::time::Instant::now();
+    scan_system(); // (another test may have triggered the scan already)
+    let n = all_faces().iter().filter(|f| f.info.origin == "system").count();
+    eprintln!("system fonts: {n} faces in {:?}", t.elapsed());
+    assert_eq!(scan_system(), 0, "scans once");
+    if cfg!(target_os = "macos") {
+        assert!(n > 20, "{n}");
+        let r = resolve("Helvetica", "Bold");
+        assert_eq!(face(r.face).info.family, "Helvetica");
+        let l = crate::layout_text("Helvetica", &crate::TextStyle { family: "Helvetica".into(), size: 30.0, ..Default::default() }, &Default::default());
+        assert!(!l.missing_font && l.glyphs.iter().all(|g| g.id != 0));
+    }
+}
+
+#[test]
+fn postscript_and_full_names_resolve() {
+    // Bundled Inter: name id 6 is `Inter-Bold`, name id 4 is `Inter Bold`.
+    let ps = resolve("Inter-Bold", "");
+    assert_eq!(face(ps.face).info.style, "Bold");
+    assert!(!ps.missing && !ps.synth_bold);
+    let full = resolve("inter semibold", "");
+    assert_eq!(face(full.face).info.style, "SemiBold");
+    assert!(!full.missing);
+    // A family name still wins over a name lookup.
+    assert_eq!(face(resolve("Inter", "Bold").face).info.style, "Bold");
+}
+
+/// #1563: a variable font's named instances are styles of its family. `fontStyle = "Black"`,
+/// the instance's PostScript name (`font = "Figtree-Black"`) and its full name select the
+/// instance's axis values instead of the default instance made bold synthetically, and the
+/// font menus list every instance.
+#[test]
+fn variable_named_instances_resolve_and_list() {
+    const FAMILY: &str = "EffectCraft Instance Test";
+    let instances = [
+        ("Light", 300.0, Some("EffectCraftInstanceTest-Light")),
+        ("Regular", 400.0, Some("EffectCraftInstanceTest-Regular")),
+        ("Black", 900.0, Some("EffectCraftInstanceTest-Black")),
+        ("Extra Bold", 800.0, None),
+    ];
+    assert_eq!(add_font_data(crate::sfnt::test_font::variable(FAMILY, &instances, true)).len(), 1);
+    let wght = |r: &Resolved| instance_variations(r);
+    // By style name.
+    let black = resolve(FAMILY, "Black");
+    assert!(!black.missing && !black.synth_bold && !black.synth_italic, "{black:?}");
+    assert_eq!(wght(&black), vec![("wght".to_string(), 900.0)]);
+    assert_eq!(wght(&resolve(FAMILY, "regular")), vec![("wght".to_string(), 400.0)]);
+    // The face's own style is its default instance: no axis values to set.
+    let light = resolve(FAMILY, "Light");
+    assert_eq!((light.face, light.instance), (black.face, None));
+    // A style the family lacks takes the nearest instance's weight, no synthetic bold.
+    let bold = resolve(FAMILY, "Bold");
+    assert!(!bold.synth_bold, "{bold:?}");
+    assert_eq!(wght(&bold), vec![("wght".to_string(), 800.0)]);
+    // By PostScript name, the font's own and the derived one, and by full name.
+    let ps = resolve("EffectCraftInstanceTest-Black", "Regular");
+    assert!(!ps.missing && ps.face == black.face, "{ps:?}");
+    assert_eq!(wght(&ps), vec![("wght".to_string(), 900.0)]);
+    assert_eq!(wght(&resolve("EffectCraftInstanceTest-ExtraBold", "")), vec![("wght".to_string(), 800.0)]);
+    assert_eq!(wght(&resolve("effectcraft instance test extra bold", "")), vec![("wght".to_string(), 800.0)]);
+    // The font menu lists every instance, in weight order.
+    let fams = families();
+    let styles = &fams.iter().find(|(f, _)| f == FAMILY).unwrap().1;
+    assert_eq!(styles, &["Light", "Regular", "Extra Bold", "Black"]);
+    // Static fonts are untouched.
+    assert_eq!(resolve("Inter", "Bold").instance, None);
+}
+
+/// Axis values set on the text win over the instance's; the others keep the instance's.
+#[test]
+fn explicit_variations_override_the_instance() {
+    let base = vec![("wdth".to_string(), 75.0), ("wght".to_string(), 900.0)];
+    assert_eq!(merge_variations(&base, &[("wght".to_string(), 450.0)]), vec![("wdth".to_string(), 75.0), ("wght".to_string(), 450.0)]);
+    assert_eq!(merge_variations(&base, &[]), base);
+    assert_eq!(merge_variations(&[], &[("opsz".to_string(), 12.0)]), vec![("opsz".to_string(), 12.0)]);
+}
+
+#[test]
+fn scripts_are_classified() {
+    assert_eq!(script_of('あ'), FallbackScript::Japanese);
+    assert_eq!(script_of('ｶ'), FallbackScript::Japanese);
+    assert_eq!(script_of('한'), FallbackScript::Korean);
+    assert_eq!(script_of('水'), FallbackScript::Han);
+    assert_eq!(script_of('、'), FallbackScript::Han);
+    assert_eq!(script_of('Ａ'), FallbackScript::Han);
+    assert_eq!(script_of('\u{20000}'), FallbackScript::Han);
+    assert_eq!(script_of('A'), FallbackScript::Other);
+    assert_eq!(script_of('م'), FallbackScript::Arabic);
+    assert_eq!(script_of('\u{fefb}'), FallbackScript::Arabic);
+    assert_eq!(script_of('\u{5d0}'), FallbackScript::Hebrew);
+    assert_eq!(script_of('क'), FallbackScript::Indic);
+    assert_eq!(script_of('த'), FallbackScript::Indic);
+    assert_eq!(script_of('ก'), FallbackScript::Thai);
+    assert_eq!(script_of('ა'), FallbackScript::Georgian);
+    assert_eq!(script_of('\u{1c90}'), FallbackScript::Georgian, "Mtavruli");
+    assert_eq!(script_of('\u{feff}'), FallbackScript::Other, "the byte order mark is no Arabic letter");
+}
+
+/// Native: Arabic, Hebrew, Indic and Thai text in a Latin-only family falls back to the
+/// platform's plain text family for its script (#394), not to the first installed face that
+/// covers it (on Windows a calligraphic Arabic face sorts first). Skipped per script where no
+/// family from its list is installed.
+#[test]
+fn other_scripts_fall_back_to_a_plain_system_family() {
+    scan_system();
+    let inter = resolve("Inter", "Regular").face;
+    for (c, families) in [('م', ARABIC_FAMILIES), ('א', HEBREW_FAMILIES), ('क', INDIC_FAMILIES), ('த', INDIC_FAMILIES), ('ก', THAI_FAMILIES)] {
+        let covering = families.iter().any(|n| resolve_in(n, "Regular").is_some_and(|r| face(r.face).has_char(c)));
+        if !covering {
+            eprintln!("{c}: no family from the list is installed; skipping");
+            continue;
+        }
+        let f = face(fallback_for(c, inter));
+        assert!(f.has_char(c), "{c}: {} lacks it", f.info.family);
+        assert!(families.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
+    }
+}
+
+/// Native: Mkhedruli in a Latin-only family falls back to a family from the Georgian list,
+/// ahead of faces already loaded and of the scan order. Skipped where no family from the list
+/// is installed.
+#[test]
+fn georgian_falls_back_to_a_georgian_system_family() {
+    scan_system();
+    let c = 'ა';
+    if !GEORGIAN_FAMILIES.iter().any(|n| resolve_in(n, "Regular").is_some_and(|r| face(r.face).has_char(c))) {
+        eprintln!("no Georgian family from the list is installed; skipping");
+        return;
+    }
+    let f = face(fallback_for(c, resolve("Inter", "Regular").face));
+    assert!(f.has_char(c), "{} lacks it", f.info.family);
+    assert!(GEORGIAN_FAMILIES.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
+}
+
+/// Native: Japanese text in a Latin-only family falls back to an installed Japanese family
+/// (whichever the platform ships) instead of the missing-glyph box, without any layer having
+/// loaded a CJK font first. Skipped where no family from the list is installed.
+#[test]
+fn cjk_falls_back_to_a_system_family() {
+    scan_system();
+    let inter = resolve("Inter", "Bold").face;
+    let installed = JAPANESE_FAMILIES.iter().any(|f| resolve_in(f, "Regular").is_some());
+    if !installed {
+        eprintln!("no Japanese family installed; skipping");
+        return;
+    }
+    for c in ['水', 'あ', 'ア', '。'] {
+        let id = fallback_for(c, inter);
+        let f = face(id);
+        assert!(f.has_char(c), "{c}: {} {} lacks it", f.info.family, f.info.style);
+        assert!(JAPANESE_FAMILIES.iter().any(|n| f.info.family.eq_ignore_ascii_case(n)), "{c} → {}", f.info.family);
+    }
+    // The bold cut of the fallback family is chosen for bold text when the family has one.
+    let f = face(fallback_for('水', inter));
+    let (w, _) = style_wants(&f.info.style);
+    let has_bold = all_faces().iter().any(|g| g.info.family == f.info.family && style_wants(&g.info.style).0 >= 600);
+    assert!(!has_bold || w >= 600, "{} {}", f.info.family, f.info.style);
+    // Cached: the second call is a lookup.
+    assert_eq!(fallback_for('水', inter), f.id);
+}
+
+/// A minimal TrueType font built in code (no font file in the repo): U+0020 and U+E000 map to
+/// an empty glyph, U+E001 to a triangle.
+fn blank_glyph_font() -> Vec<u8> {
+    test_font("Blank Glyph Test")
+}
+
+/// The blank-glyph test font under another family name.
+fn test_font(family: &str) -> Vec<u8> {
+    fn u16s(v: &[u16]) -> Vec<u8> {
+        v.iter().flat_map(|x| x.to_be_bytes()).collect()
+    }
+    let delta_space = 1u16.wrapping_sub(0x20);
+    let cmap4 = {
+        let mut t = u16s(&[4, 0, 0, 6, 4, 1, 2]);
+        t.extend(u16s(&[0x20, 0xE001, 0xFFFF, 0, 0x20, 0xE000, 0xFFFF, delta_space, 0x2001, 1, 0, 0, 0]));
+        let len = t.len() as u16;
+        t[2..4].copy_from_slice(&len.to_be_bytes());
+        t
+    };
+    let mut cmap = u16s(&[0, 1, 3, 1, 0, 12]);
+    cmap.extend(cmap4);
+    // glyph 2: one contour of three on-curve points (100,0) (500,0) (300,600)
+    let mut glyf = u16s(&[1, 100, 0, 500, 600, 2, 0]);
+    glyf.extend([1u8, 1, 1]);
+    glyf.extend(u16s(&[100, 400, (-200i16) as u16, 0, 0, 600]));
+    glyf.push(0);
+    let loca = u16s(&[0, 0, 0, (glyf.len() / 2) as u16]);
+    let mut head = u16s(&[1, 0, 1, 0, 0, 0, 0x5F0F, 0x3CF5, 0, 1000]);
+    head.extend([0u8; 16]);
+    head.extend(u16s(&[100, 0, 500, 600, 0, 8, 2, 0, 0]));
+    let mut hhea = u16s(&[1, 0, 800, (-200i16) as u16, 0, 600, 0, 0, 500, 1, 0, 0]);
+    hhea.extend([0u8; 8]);
+    hhea.extend(u16s(&[0, 3]));
+    let hmtx = u16s(&[600, 0, 600, 0, 600, 0]);
+    let maxp = u16s(&[1, 0, 3, 3, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0]);
+    let strings: Vec<Vec<u8>> = [family, "Regular"].iter().map(|s| s.encode_utf16().flat_map(|u| u.to_be_bytes()).collect()).collect();
+    let mut name = u16s(&[0, 2, 30]);
+    let mut off = 0;
+    for (id, st) in strings.iter().enumerate() {
+        name.extend(u16s(&[3, 1, 0x409, id as u16 + 1, st.len() as u16, off]));
+        off += st.len() as u16;
+    }
+    strings.iter().for_each(|st| name.extend(st));
+    let tables: [(&[u8; 4], Vec<u8>); 8] =
+        [(b"cmap", cmap), (b"glyf", glyf), (b"head", head), (b"hhea", hhea), (b"hmtx", hmtx), (b"loca", loca), (b"maxp", maxp), (b"name", name)];
+    let mut out = u16s(&[1, 0, tables.len() as u16, 128, 3, 0]);
+    let mut offset = 12 + 16 * tables.len();
+    let mut body = vec![];
+    for (tag, data) in &tables {
+        out.extend(*tag);
+        out.extend([0u8; 4]);
+        out.extend((offset as u32).to_be_bytes());
+        out.extend((data.len() as u32).to_be_bytes());
+        let padded = data.len().div_ceil(4) * 4;
+        body.extend(data);
+        body.resize(body.len() + padded - data.len(), 0);
+        offset += padded;
+    }
+    out.extend(body);
+    out
+}
+
+/// A face that maps a character to an empty glyph doesn't cover it, so fallback skips it
+/// (#285); a blank space still counts, and a drawn glyph is found as before.
+#[test]
+fn an_empty_glyph_does_not_cover_its_character() {
+    let ids = add_font_data(blank_glyph_font());
+    let &[id] = ids.as_slice() else { panic!("one face expected: {ids:?}") };
+    let f = face(id);
+    assert_eq!(f.info.family, "Blank Glyph Test");
+    assert!(f.glyph('\u{e000}').is_some(), "the cmap maps it");
+    assert!(!f.has_char('\u{e000}'), "but its glyph is empty");
+    assert!(f.has_char('\u{e001}'), "a drawn glyph covers its character");
+    assert!(f.has_char(' '), "a space is blank by nature");
+    let inter = resolve("Inter", "Regular").face;
+    assert_ne!(fallback_for('\u{e000}', inter), id, "fallback never picks the empty glyph");
+    assert_eq!(fallback_for('\u{e001}', inter), id, "fallback finds the drawn one");
+}
+
+/// A Microsoft family that isn't installed renders in its installed metric-compatible
+/// substitute instead of Inter, and still reports itself missing (#1677).
+#[test]
+fn microsoft_families_resolve_to_metric_compatible_substitutes() {
+    add_font_data(test_font("Carlito"));
+    add_font_data(test_font("Caladea"));
+    let calibri = resolve("Calibri", "Regular");
+    assert_eq!(face(calibri.face).info.family, "Carlito");
+    assert!(calibri.missing, "the original name stays missing for Find Missing Fonts");
+    let cambria = resolve("Cambria", "Bold");
+    assert_eq!(face(cambria.face).info.family, "Caladea");
+    assert!(cambria.missing);
+    let unknown = resolve("No Such Family 1677", "Regular");
+    assert_eq!(face(unknown.face).info.family, DEFAULT_FAMILY);
+    assert!(unknown.missing);
+}
+
+#[test]
+fn the_han_order_follows_the_cjk_locale() {
+    // Chinese first for any Chinese tag, whether or not it names a script.
+    for tag in ["zh", "zh-CN", "zh_Hans", "ZH-Hant-TW.UTF-8", "zh_MO"] {
+        assert_eq!(han_order_for(tag)[0], FallbackScript::Han, "{tag}");
+    }
+    assert_eq!(han_order_for("ko-KR"), [FallbackScript::Korean, FallbackScript::Japanese, FallbackScript::Han]);
+    // Japanese, and anything else, keeps the Japanese face first for Han text.
+    for tag in ["ja_JP.UTF-8", "en-US", "de", ""] {
+        assert_eq!(han_order_for(tag), [FallbackScript::Japanese, FallbackScript::Han, FallbackScript::Korean], "{tag}");
+    }
+    // The host's request is what `han_order` reads (the ui test covers the effect on the
+    // registered fallbacks; this only checks that clearing it returns to the environment).
+    assert_eq!(requested_cjk_locale(), None, "tests run without a request");
+    assert_eq!(han_order(), han_order_for(&active_cjk_locale()));
+}
+
+#[test]
+fn the_chinese_family_list_follows_the_script_the_locale_asks_for() {
+    for tag in ["zh", "zh-CN", "zh_Hans", "zh_CN.UTF-8", "zh-SG"] {
+        assert_eq!(chinese_families_for(tag), SIMPLIFIED_CHINESE_FAMILIES, "{tag}");
+    }
+    for tag in ["zh-Hant", "zh-Hant-TW", "zh_TW", "zh-HK", "zh_MO.UTF-8"] {
+        assert_eq!(chinese_families_for(tag), TRADITIONAL_CHINESE_FAMILIES, "{tag}");
+    }
+    // Each list carries its own script's faces and not the other's, which is the point of
+    // splitting them: `PingFang SC` covers the same code points as `PingFang TC`, so the
+    // fallback search would have kept it and drawn Simplified forms in a Traditional interface.
+    assert!(SIMPLIFIED_CHINESE_FAMILIES.iter().any(|f| f.contains("PingFang SC") && !f.contains("Source")));
+    assert!(!SIMPLIFIED_CHINESE_FAMILIES.iter().any(|f| f.contains("TC") || f.contains("JhengHei")));
+    assert!(TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains("PingFang TC")));
+    assert!(!TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains(" SC") || f.contains("YaHei") || f.contains("WenQuanYi")));
+    assert!(TRADITIONAL_CHINESE_FAMILIES.iter().any(|f| f.contains("Heiti TC") || f.contains("Hiragino Sans CNS")));
+    // The arm the fallback itself walks: Han hands over the list the locale's script picked.
+    assert_eq!(families_for(FallbackScript::Han, CjkLocale::from_tag(&active_cjk_locale())), chinese_families_for(&active_cjk_locale()));
+    // Han text is the only thing these lists serve; the Japanese order does not change.
+    assert_eq!(han_order_for("ja_JP.UTF-8")[0], FallbackScript::Japanese);
+}
+
+#[test]
+fn the_rendered_order_keeps_the_print_face_first() {
+    // A composed frame renders with these lists, so they keep the platform's print order: the
+    // interface prefers the platform's UI faces on its own (see `install_script_fallbacks` in
+    // the ui crate), and an existing project must not render differently because a window's
+    // chrome changed.
+    let pos = |list: &[&str], name: &str| list.iter().position(|f| *f == name).unwrap_or(usize::MAX);
+    assert!(
+        pos(JAPANESE_FAMILIES, "Yu Gothic") < pos(JAPANESE_FAMILIES, "Yu Gothic UI"),
+        "the print face must come before its UI sibling: {JAPANESE_FAMILIES:?}"
+    );
+    for name in ["Meiryo UI", "MS UI Gothic"] {
+        assert!(!JAPANESE_FAMILIES.contains(&name), "{name} belongs to the interface order, not this list");
+    }
+    assert_eq!(SIMPLIFIED_CHINESE_FAMILIES[0], "Microsoft YaHei");
+    assert_eq!(TRADITIONAL_CHINESE_FAMILIES[0], "Microsoft JhengHei");
+    for name in ["Microsoft YaHei UI", "Microsoft JhengHei UI", "PMingLiU"] {
+        assert!(
+            !SIMPLIFIED_CHINESE_FAMILIES.contains(&name) && !TRADITIONAL_CHINESE_FAMILIES.contains(&name),
+            "{name} belongs to the interface order, not these lists"
+        );
+    }
+}
+
+#[test]
+fn bundled_ui_fonts_cover_the_ukrainian_alphabet() {
+    const ALPHABET: &str = "АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯабвгґдеєжзиіїйклмнопрстуфхцчшщьюя’«»";
+    for (name, bytes) in
+        [("Inter Regular", INTER_REGULAR), ("Inter Medium", INTER_MEDIUM), ("Inter SemiBold", INTER_SEMIBOLD), ("JetBrains Mono", JETBRAINS_MONO_REGULAR)]
+    {
+        let font = FontRef::new(bytes).unwrap();
+        for c in ALPHABET.chars() {
+            assert!(covers(&font, c), "{name} cannot draw {c}");
+        }
+    }
+}
+
+#[test]
+fn metrics_and_coverage() {
+    let f = face(resolve("Inter", "Regular").face);
+    let m = f.metrics(100.0);
+    assert!(m.ascent > 80.0 && m.ascent < 110.0, "{m:?}");
+    assert!(m.descent > 10.0 && m.descent < 40.0);
+    assert!(m.cap_height > 60.0 && m.cap_height < 80.0);
+    assert!(f.has_char('A') && f.has_char('Ж'));
+    assert!(!f.has_char('\u{5d0}'), "Inter has no Hebrew");
+    assert!(f.has_feature(b"liga") || f.has_feature(b"calt"));
+}
+
+#[test]
+fn unknown_face_id_returns_bundled_default() {
+    let fallback = face(usize::MAX);
+    assert_eq!(fallback.id, 0);
+    assert_eq!(fallback.info.family, DEFAULT_FAMILY);
+    assert!(fallback.font().is_some());
+    assert!(Arc::ptr_eq(&fallback, &face(0)));
+}
diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs
index c15032154..179478517 100644
--- a/crates/text/src/layout.rs
+++ b/crates/text/src/layout.rs
@@ -20,7 +20,7 @@ use unicode_bidi::{BidiInfo, Level};
 
 use effectcraft_keyframe::{OpenType, text_doc::paragraph_ranges};
 
-use crate::fonts::{self, FaceId, Resolved};
+use crate::fonts::{self, FaceId, Resolved, VMetrics};
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
 pub enum Caps {
@@ -399,7 +399,7 @@ enum Form {
 pub fn feature_substitutes(face: FaceId, tag: &[u8; 4], c: char) -> bool {
     static C: OnceLock<Mutex<HashMap<(FaceId, [u8; 4], char), bool>>> = OnceLock::new();
     let cache = C.get_or_init(Default::default);
-    if let Some(v) = cache.lock().unwrap_or_else(|e| e.into_inner()).get(&(face, *tag, c)) {
+    if let Some(v) = cache.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(face, *tag, c)) {
         return *v;
     }
     let f = fonts::face(face);
@@ -419,7 +419,7 @@ pub fn feature_substitutes(face: FaceId, tag: &[u8; 4], c: char) -> bool {
             }
             _ => false,
         };
-    let mut m = cache.lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = cache.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 100_000 {
         m.clear();
     }
@@ -597,53 +597,378 @@ fn run_at(runs: &[(Range<usize>, TextStyle)], b: usize) -> usize {
 }
 
 /// Lay out one paragraph (no newlines) whose text starts at byte `base` of the whole string.
-fn paragraph(text: &str, base: usize, runs: &[(Range<usize>, TextStyle)], primaries: &[Resolved], para: &ParagraphStyle, width: Option<f32>) -> Vec<ParaLine> {
-    let rtl_para = para.rtl == Some(true);
-    let margins_for = |first: bool| -> (f32, f32) {
-        let fi = if first { para.indent_first } else { 0.0 };
-        if rtl_para { (para.indent_end, para.indent_start + fi) } else { (para.indent_start + fi, para.indent_end) }
-    };
-    let avail_for = |first: bool| -> Option<f32> {
-        let (l, r) = margins_for(first);
-        width.map(|w| (w - l - r).max(1.0))
-    };
-    let style_metrics = |si: usize| {
-        let st = &runs[si].1;
-        fonts::face(primaries[si].face).metrics(st.glyph_size())
-    };
-    let eff_align = |last: bool| -> Align {
-        if (last || width.is_none()) && para.align == Align::Justify {
-            if width.is_none() && para.justify_last == Align::Justify { Align::Left } else { para.justify_last }
-        } else {
-            para.align
-        }
-    };
-    if text.is_empty() {
-        let si = run_at(runs, base);
-        let pm = style_metrics(si);
-        return vec![ParaLine {
-            range: base..base,
-            glyphs: vec![],
-            carets: vec![(base, 0.0)],
-            content: 0.0,
-            left_trim: 0.0,
-            hang: (0.0, 0.0),
-            ascent: pm.ascent,
-            descent: pm.descent,
-            advance: runs[si].1.line_advance(),
-            align: eff_align(true),
-            avail: avail_for(true),
-            margins: margins_for(true),
-            underline: None,
-        }];
+/// Margins (left, right) of a paragraph's first or later lines.
+fn margins_for(para: &ParagraphStyle, first: bool) -> (f32, f32) {
+    let fi = if first { para.indent_first } else { 0.0 };
+    if para.rtl == Some(true) { (para.indent_end, para.indent_start + fi) } else { (para.indent_start + fi, para.indent_end) }
+}
+
+/// The width a line may fill (`None` for point text).
+fn avail_for(para: &ParagraphStyle, width: Option<f32>, first: bool) -> Option<f32> {
+    let (l, r) = margins_for(para, first);
+    width.map(|w| (w - l - r).max(1.0))
+}
+
+/// The alignment of a line, justified lines that cannot stretch falling back to `justify_last`.
+fn align_for(para: &ParagraphStyle, width: Option<f32>, last: bool) -> Align {
+    if (last || width.is_none()) && para.align == Align::Justify {
+        if width.is_none() && para.justify_last == Align::Justify { Align::Left } else { para.justify_last }
+    } else {
+        para.align
     }
-    let default_level = para.rtl.map(|r| if r { Level::rtl() } else { Level::ltr() });
-    let bidi = BidiInfo::new(text, default_level);
-    let pinfo = &bidi.paragraphs[0];
-    let base_rtl = pinfo.level.is_rtl();
-    // per char: (byte, char, shaped char, face, rtl, form, run)
-    let chars: Vec<(usize, char, char, FaceId, bool, Form, usize)> = text
-        .char_indices()
+}
+
+fn style_metrics(primaries: &[Resolved], runs: &[(Range<usize>, TextStyle)], si: usize) -> VMetrics {
+    fonts::face(primaries[si].face).metrics(runs[si].1.glyph_size())
+}
+
+/// A char's shaping inputs: (byte, char, shaped char, face, rtl, form, run).
+type CharInfo = (usize, char, char, FaceId, bool, Form, usize);
+
+/// The glyphs of one line in visual order, where its pen ended, the extent of each cluster by
+/// byte, and the underline span.
+struct Placed {
+    glyphs: Vec<Glyph>,
+    pen: f32,
+    extents: HashMap<usize, (f32, f32, bool)>,
+    underline: Option<(f32, f32)>,
+}
+
+/// A paragraph shaped and measured, ready to be broken into lines.
+struct Para<'a> {
+    text: &'a str,
+    base: usize,
+    runs: &'a [(Range<usize>, TextStyle)],
+    primaries: &'a [Resolved],
+    variation_ids: &'a [u32],
+    para: &'a ParagraphStyle,
+    width: Option<f32>,
+    bidi: BidiInfo<'a>,
+    base_rtl: bool,
+    chars: Vec<CharInfo>,
+    items: Vec<Item>,
+    /// Advance of the glyphs at each byte, and prefix sums over it.
+    char_adv: Vec<f32>,
+    prefix_adv: Vec<f64>,
+    previous_non_ws: Vec<usize>,
+}
+
+impl<'a> Para<'a> {
+    fn new(
+        text: &'a str,
+        base: usize,
+        runs: &'a [(Range<usize>, TextStyle)],
+        primaries: &'a [Resolved],
+        variation_ids: &'a [u32],
+        para: &'a ParagraphStyle,
+        width: Option<f32>,
+    ) -> Self {
+        let default_level = para.rtl.map(|r| if r { Level::rtl() } else { Level::ltr() });
+        let bidi = BidiInfo::new(text, default_level);
+        let base_rtl = bidi.paragraphs[0].level.is_rtl();
+        let chars = char_forms(text, base, runs, primaries, &bidi);
+        let items = build_items(text, &chars, runs);
+        // Prefix widths and the preceding non-whitespace boundary make candidate line widths O(1).
+        // Every-line composition evaluates O(n²) candidate breaks; summing each candidate's bytes
+        // or rescanning its trailing whitespace would otherwise add another factor of text length.
+        let mut char_adv = vec![0.0f32; text.len() + 1];
+        for it in &items {
+            for g in &it.glyphs {
+                char_adv[g.cluster.min(text.len())] += g.adv + g.pre;
+            }
+        }
+        let mut prefix_adv = vec![0.0f64; text.len() + 1];
+        for i in 0..text.len() {
+            prefix_adv[i + 1] = prefix_adv[i] + f64::from(char_adv[i]);
+        }
+        let mut previous_non_ws = vec![0usize; text.len() + 1];
+        let mut non_ws_end = 0usize;
+        for (b, c) in text.char_indices() {
+            previous_non_ws[b] = non_ws_end;
+            if !c.is_whitespace() {
+                non_ws_end = b + c.len_utf8();
+            }
+            previous_non_ws[b + c.len_utf8()] = non_ws_end;
+        }
+        Para { text, base, runs, primaries, variation_ids, para, width, bidi, base_rtl, chars, items, char_adv, prefix_adv, previous_non_ws }
+    }
+
+    fn range_w(&self, r: Range<usize>) -> f32 {
+        (self.prefix_adv[r.end] - self.prefix_adv[r.start]) as f32
+    }
+
+    fn trailing_ws(&self, r: &Range<usize>) -> (usize, f32) {
+        let end = self.previous_non_ws[r.end].max(r.start).min(r.end);
+        (end, (self.prefix_adv[r.end] - self.prefix_adv[end]) as f32)
+    }
+
+    /// Hanging punctuation widths (left, right) of a line's content.
+    fn hang_of(&self, r: &Range<usize>, ce: usize) -> (f32, f32) {
+        if !self.para.hanging || self.width.is_none() || r.start >= ce {
+            return (0.0, 0.0);
+        }
+        let first = self.text[r.start..ce].chars().next().filter(|c| is_hanging_open(*c)).map_or(0.0, |_| self.char_adv[r.start]);
+        let last = self.text[r.start..ce].char_indices().next_back().filter(|(_, c)| is_hanging_close(*c)).map_or(0.0, |(b, _)| self.char_adv[r.start + b]);
+        (first, last)
+    }
+
+    fn fits_w(&self, r: &Range<usize>) -> f32 {
+        let (ce, _) = self.trailing_ws(r);
+        let (hl, hr) = self.hang_of(r, ce);
+        self.range_w(r.start..ce) - hl - hr
+    }
+
+    fn line_avail(&self, line: usize) -> f32 {
+        avail_for(self.para, self.width, line == 0).unwrap_or(f32::MAX)
+    }
+
+    /// The byte ranges of the lines, for the wrap width.
+    fn break_ranges(&self) -> Vec<Range<usize>> {
+        if self.width.is_none() {
+            return std::iter::once(0..self.text.len()).collect();
+        }
+        let opps: Vec<usize> = unicode_linebreak::linebreaks(self.text).map(|(p, _)| p).collect();
+        let mut ranges = if self.para.every_line && opps.len() > 1 && opps.len() <= 1500 { self.optimal_breaks(&opps) } else { self.greedy_breaks(opps) };
+        ranges.retain(|r| !r.is_empty());
+        if ranges.is_empty() {
+            ranges.push(0..self.text.len());
+        }
+        ranges
+    }
+
+    /// Minimises the summed squared slack of every line but the last.
+    fn optimal_breaks(&self, opps: &[usize]) -> Vec<Range<usize>> {
+        let nodes: Vec<usize> = std::iter::once(0).chain(opps.iter().copied()).collect();
+        let m = nodes.len();
+        let mut best = vec![(f32::INFINITY, 0usize); m];
+        best[0] = (0.0, 0);
+        for j in 1..m {
+            for i in (0..j).rev() {
+                if !best[i].0.is_finite() {
+                    continue;
+                }
+                let r = nodes[i]..nodes[j];
+                let w = self.fits_w(&r);
+                let maxw = self.line_avail(usize::from(i != 0));
+                let over = w > maxw;
+                if over && i + 1 != j {
+                    break;
+                }
+                let slack = maxw - w;
+                let cost = if over {
+                    1e12 + w
+                } else if j == m - 1 {
+                    0.0
+                } else {
+                    slack * slack
+                };
+                let total = best[i].0 + cost;
+                if total < best[j].0 {
+                    best[j] = (total, i);
+                }
+            }
+        }
+        let mut ranges = Vec::new();
+        let mut j = m - 1;
+        while j > 0 {
+            let i = best[j].1;
+            ranges.push(nodes[i]..nodes[j]);
+            j = i;
+        }
+        ranges.reverse();
+        ranges
+    }
+
+    /// Breaks at each opportunity that still fits, else at the last one that did.
+    fn greedy_breaks(&self, opps: Vec<usize>) -> Vec<Range<usize>> {
+        let mut ranges = Vec::new();
+        let mut start = 0usize;
+        let mut last_ok: Option<usize> = None;
+        for p in opps {
+            loop {
+                let w = self.fits_w(&(start..p));
+                if w <= self.line_avail(ranges.len()) || last_ok.is_none() {
+                    last_ok = Some(p);
+                    break;
+                }
+                let Some(b) = last_ok.take() else { break };
+                ranges.push(start..b);
+                start = b;
+            }
+        }
+        ranges.push(start..self.text.len());
+        ranges
+    }
+
+    /// The line over byte range `r`: the `li`-th of the paragraph, `last` if it is the final one.
+    fn place_line(&self, li: usize, r: Range<usize>, last: bool) -> ParaLine {
+        let align = align_for(self.para, self.width, last);
+        let avail = avail_for(self.para, self.width, li == 0);
+        let (ce, tw) = self.trailing_ws(&r);
+        let hang = self.hang_of(&r, ce);
+        let content = self.range_w(r.start..ce);
+        // justification
+        let mut space_extra = 0.0;
+        if align == Align::Justify
+            && let Some(maxw) = avail
+        {
+            let spaces = self.text[r.start..ce].chars().filter(|c| *c == ' ').count();
+            if spaces > 0 {
+                space_extra = ((maxw - (content - hang.0 - hang.1)) / spaces as f32).max(0.0);
+            }
+        }
+        let placed = self.place_glyphs(&r, space_extra, ce);
+        let carets = self.carets(&r, &placed.extents, placed.pen);
+        let (asc, desc, adv) = self.line_metrics(&r, &placed.glyphs);
+        let content_w = if space_extra > 0.0 { avail.map_or(content, |a| a + hang.0 + hang.1) } else { content };
+        ParaLine {
+            range: self.base + r.start..self.base + r.end,
+            glyphs: placed.glyphs,
+            carets,
+            content: content_w,
+            left_trim: if self.base_rtl { tw } else { 0.0 },
+            hang,
+            ascent: asc,
+            descent: desc,
+            advance: adv,
+            align,
+            avail,
+            margins: margins_for(self.para, li == 0),
+            underline: placed.underline,
+        }
+    }
+
+    fn place_glyphs(&self, r: &Range<usize>, space_extra: f32, ce: usize) -> Placed {
+        let (levels, vruns) = self.bidi.visual_runs(&self.bidi.paragraphs[0], r.clone());
+        let mut pen = 0.0f32;
+        let mut glyphs = Vec::new();
+        let mut extents: HashMap<usize, (f32, f32, bool)> = HashMap::new();
+        let mut underline: Option<(f32, f32)> = None;
+        for run in vruns {
+            let rtl = levels[run.start].is_rtl();
+            // Items are ordered and disjoint: binary-search both ends of the overlapping slice.
+            let run_limit = self.items.partition_point(|item| item.range.start < run.end);
+            let run_first = self.items[..run_limit].partition_point(|item| item.range.end <= run.start);
+            let mut idx: Vec<usize> = (run_first..run_limit).collect();
+            if rtl {
+                idx.reverse();
+            }
+            for k in idx {
+                for g in self.items[k].glyphs.iter().filter(|g| run.contains(&g.cluster)) {
+                    let st = &self.runs[g.run].1;
+                    let x0 = pen;
+                    pen += g.pre;
+                    glyphs.push(Glyph {
+                        face: g.face,
+                        id: g.id,
+                        x: pen + g.dx,
+                        y: -g.dy - g.rise,
+                        size: g.size,
+                        cluster: self.base + g.cluster,
+                        synth_bold: self.primaries[g.run].synth_bold || st.faux_bold,
+                        synth_italic: self.primaries[g.run].synth_italic || st.faux_italic,
+                        h_scale: st.h_scale,
+                        v_scale: st.v_scale,
+                        run: g.run,
+                        variations: self.variation_ids[g.run],
+                    });
+                    pen += g.adv;
+                    if space_extra > 0.0 && self.text[g.cluster..].starts_with(' ') && g.cluster < ce {
+                        pen += space_extra;
+                    }
+                    if st.underline && g.cluster < ce {
+                        let u = underline.get_or_insert((x0, pen));
+                        u.0 = u.0.min(x0);
+                        u.1 = u.1.max(pen);
+                    }
+                    let e = extents.entry(g.cluster).or_insert((x0, pen, self.items[k].rtl));
+                    e.0 = e.0.min(x0);
+                    e.1 = e.1.max(pen);
+                }
+            }
+        }
+        Placed { glyphs, pen, extents, underline }
+    }
+
+    /// Caret stops at each char boundary of the line, and at its end.
+    fn carets(&self, r: &Range<usize>, extents: &HashMap<usize, (f32, f32, bool)>, pen: f32) -> Vec<(usize, f32)> {
+        let mut carets = Vec::new();
+        let mut cluster_starts: Vec<usize> = extents.keys().copied().collect();
+        cluster_starts.sort_unstable();
+        let char_bytes: Vec<usize> = self.text[r.clone()].char_indices().map(|(b, _)| r.start + b).collect();
+        let mut char_index = 0usize;
+        for (ci, &cs) in cluster_starts.iter().enumerate() {
+            let (x0, x1, rtl) = extents[&cs];
+            let next = cluster_starts.get(ci + 1).copied().unwrap_or(r.end);
+            while char_index < char_bytes.len() && char_bytes[char_index] < cs {
+                char_index += 1;
+            }
+            let begin = char_index;
+            while char_index < char_bytes.len() && char_bytes[char_index] < next {
+                char_index += 1;
+            }
+            let count = (char_index - begin).max(1) as f32;
+            for (mi, b) in char_bytes[begin..char_index].iter().enumerate() {
+                let f = mi as f32 / count;
+                let x = if rtl { x1 - (x1 - x0) * f } else { x0 + (x1 - x0) * f };
+                carets.push((self.base + b, x));
+            }
+        }
+        // end of line caret
+        let end_x = match self.chars.iter().rev().find(|c| c.0 < r.end && c.0 >= r.start) {
+            Some(c) => {
+                let cs = cluster_starts.iter().rev().find(|s| **s <= c.0).copied();
+                match cs.and_then(|s| extents.get(&s)) {
+                    Some(&(x0, x1, rtl)) => {
+                        if rtl {
+                            x0
+                        } else {
+                            x1
+                        }
+                    }
+                    None => pen,
+                }
+            }
+            None => 0.0,
+        };
+        carets.push((self.base + r.end, end_x));
+        carets.sort_by_key(|c| c.0);
+        carets.dedup_by_key(|c| c.0);
+        carets
+    }
+
+    /// Ascent, descent and advance of the line: the tallest face and the largest leading on it.
+    fn line_metrics(&self, r: &Range<usize>, glyphs: &[Glyph]) -> (f32, f32, f32) {
+        let (mut asc, mut desc, mut adv) = (0.0f32, 0.0f32, 0.0f32);
+        let char_start = self.chars.partition_point(|c| c.0 < r.start);
+        let char_end = self.chars.partition_point(|c| c.0 < r.end);
+        let mut seen: Vec<usize> = self.chars[char_start..char_end].iter().map(|c| c.6).collect();
+        seen.sort_unstable();
+        seen.dedup();
+        if seen.is_empty() {
+            seen.push(self.chars.first().map_or(0, |c| c.6));
+        }
+        for &si in &seen {
+            let m = style_metrics(self.primaries, self.runs, si);
+            let rise = self.runs[si].1.rise();
+            asc = asc.max(m.ascent + rise.max(0.0));
+            desc = desc.max(m.descent - rise.min(0.0));
+            adv = adv.max(self.runs[si].1.line_advance());
+        }
+        for g in glyphs {
+            if g.face != self.primaries[g.run].face {
+                let m = fonts::face(g.face).metrics(g.size);
+                asc = asc.max(m.ascent);
+                desc = desc.max(m.descent);
+            }
+        }
+        (asc, desc, adv)
+    }
+}
+
+/// Each char with its shaped form, face, direction and run.
+fn char_forms(text: &str, base: usize, runs: &[(Range<usize>, TextStyle)], primaries: &[Resolved], bidi: &BidiInfo) -> Vec<CharInfo> {
+    text.char_indices()
         .map(|(b, c)| {
             let si = run_at(runs, base + b);
             let style = &runs[si].1;
@@ -669,13 +994,15 @@ fn paragraph(text: &str, base: usize, runs: &[(Range<usize>, TextStyle)], primar
             }
             (b, c, sc, face, bidi.levels[b].is_rtl(), form, si)
         })
-        .collect();
-    // items: runs of equal (face, rtl, small, style)
+        .collect()
+}
+
+/// Runs of chars with the same face, direction, form, run and CJK vertical flag, shaped as one.
+fn build_items(text: &str, chars: &[CharInfo], runs: &[(Range<usize>, TextStyle)]) -> Vec<Item> {
+    let key = |c: &CharInfo| (c.3, c.4, c.5, c.6, runs.get(c.6).is_some_and(|run| run.1.vertical) && crate::is_cjk(c.1));
     let mut items: Vec<Item> = Vec::new();
     let mut i = 0;
     while i < chars.len() {
-        let key =
-            |c: &(usize, char, char, FaceId, bool, Form, usize)| (c.3, c.4, c.5, c.6, runs.get(c.6).is_some_and(|run| run.1.vertical) && crate::is_cjk(c.1));
         let k0 = key(&chars[i]);
         let mut j = i + 1;
         while j < chars.len() && key(&chars[j]) == k0 {
@@ -695,271 +1022,99 @@ fn paragraph(text: &str, base: usize, runs: &[(Range<usize>, TextStyle)], primar
         items.push(Item { range: chars[i].0..end, rtl, glyphs });
         i = j;
     }
-    // advance per char byte (cluster start)
-    let mut char_adv = vec![0.0f32; text.len() + 1];
-    for it in &items {
-        for g in &it.glyphs {
-            char_adv[g.cluster.min(text.len())] += g.adv + g.pre;
-        }
+    items
+}
+
+fn paragraph(
+    text: &str,
+    base: usize,
+    runs: &[(Range<usize>, TextStyle)],
+    primaries: &[Resolved],
+    variation_ids: &[u32],
+    para: &ParagraphStyle,
+    width: Option<f32>,
+) -> Vec<ParaLine> {
+    if text.is_empty() {
+        let si = run_at(runs, base);
+        let pm = style_metrics(primaries, runs, si);
+        return vec![ParaLine {
+            range: base..base,
+            glyphs: vec![],
+            carets: vec![(base, 0.0)],
+            content: 0.0,
+            left_trim: 0.0,
+            hang: (0.0, 0.0),
+            ascent: pm.ascent,
+            descent: pm.descent,
+            advance: runs[si].1.line_advance(),
+            align: align_for(para, width, true),
+            avail: avail_for(para, width, true),
+            margins: margins_for(para, true),
+            underline: None,
+        }];
     }
-    let range_w = |r: Range<usize>| -> f32 { char_adv[r].iter().sum() };
-    let trailing_ws = |r: &Range<usize>| -> (usize, f32) {
-        let mut end = r.end;
-        let mut w = 0.0;
-        for (b, c) in text[r.clone()].char_indices().rev() {
-            if !c.is_whitespace() {
-                break;
-            }
-            end = r.start + b;
-            w += char_adv[r.start + b];
-        }
-        (end, w)
-    };
-    // Hanging punctuation widths (left, right) of a line's content.
-    let hang_of = |r: &Range<usize>, ce: usize| -> (f32, f32) {
-        if !para.hanging || width.is_none() || r.start >= ce {
-            return (0.0, 0.0);
-        }
-        let first = text[r.start..ce].chars().next().filter(|c| is_hanging_open(*c)).map_or(0.0, |_| char_adv[r.start]);
-        let last = text[r.start..ce].char_indices().next_back().filter(|(_, c)| is_hanging_close(*c)).map_or(0.0, |(b, _)| char_adv[r.start + b]);
-        (first, last)
-    };
-    let fits_w = |r: &Range<usize>| -> f32 {
-        let (ce, _) = trailing_ws(r);
-        let (hl, hr) = hang_of(r, ce);
-        range_w(r.start..ce) - hl - hr
-    };
-    // line breaking
-    let mut ranges: Vec<Range<usize>> = Vec::new();
-    match width {
-        None => ranges.push(0..text.len()),
-        Some(_) => {
-            let opps: Vec<usize> = unicode_linebreak::linebreaks(text).map(|(p, _)| p).collect();
-            let avail = |line: usize| avail_for(line == 0).unwrap_or(f32::MAX);
-            if para.every_line && opps.len() > 1 && opps.len() <= 1500 {
-                // Minimise the summed squared slack of every line but the last.
-                let nodes: Vec<usize> = std::iter::once(0).chain(opps.iter().copied()).collect();
-                let m = nodes.len();
-                let mut best = vec![(f32::INFINITY, 0usize); m];
-                best[0] = (0.0, 0);
-                for j in 1..m {
-                    for i in (0..j).rev() {
-                        if !best[i].0.is_finite() {
-                            continue;
-                        }
-                        let r = nodes[i]..nodes[j];
-                        let w = fits_w(&r);
-                        let maxw = avail(usize::from(i != 0));
-                        let over = w > maxw;
-                        if over && i + 1 != j {
-                            break;
-                        }
-                        let slack = maxw - w;
-                        let cost = if over {
-                            1e12 + w
-                        } else if j == m - 1 {
-                            0.0
-                        } else {
-                            slack * slack
-                        };
-                        let total = best[i].0 + cost;
-                        if total < best[j].0 {
-                            best[j] = (total, i);
-                        }
-                    }
-                }
-                let mut j = m - 1;
-                while j > 0 {
-                    let i = best[j].1;
-                    ranges.push(nodes[i]..nodes[j]);
-                    j = i;
-                }
-                ranges.reverse();
-            } else {
-                let mut start = 0usize;
-                let mut last_ok: Option<usize> = None;
-                for p in opps {
-                    loop {
-                        let w = fits_w(&(start..p));
-                        if w <= avail(ranges.len()) || last_ok.is_none() {
-                            last_ok = Some(p);
-                            break;
-                        }
-                        let Some(b) = last_ok.take() else { break };
-                        ranges.push(start..b);
-                        start = b;
-                    }
-                }
-                ranges.push(start..text.len());
-            }
-            ranges.retain(|r| !r.is_empty());
-            if ranges.is_empty() {
-                ranges.push(0..text.len());
-            }
-        }
-    }
+    let p = Para::new(text, base, runs, primaries, variation_ids, para, width);
+    let ranges = p.break_ranges();
     let nlines = ranges.len();
-    let mut out = Vec::new();
-    for (li, r) in ranges.into_iter().enumerate() {
-        let last = li + 1 == nlines;
-        let align = eff_align(last);
-        let avail = avail_for(li == 0);
-        let (ce, tw) = trailing_ws(&r);
-        let hang = hang_of(&r, ce);
-        let content = range_w(r.start..ce);
-        // justification
-        let mut space_extra = 0.0;
-        if align == Align::Justify
-            && let Some(maxw) = avail
-        {
-            let spaces = text[r.start..ce].chars().filter(|c| *c == ' ').count();
-            if spaces > 0 {
-                space_extra = ((maxw - (content - hang.0 - hang.1)) / spaces as f32).max(0.0);
-            }
-        }
-        let (levels, vruns) = bidi.visual_runs(pinfo, r.clone());
-        let mut pen = 0.0f32;
-        let mut glyphs = Vec::new();
-        let mut extents: HashMap<usize, (f32, f32, bool)> = HashMap::new();
-        let mut underline: Option<(f32, f32)> = None;
-        for run in vruns {
-            let rtl = levels[run.start].is_rtl();
-            let mut idx: Vec<usize> = (0..items.len()).filter(|&k| items[k].range.start < run.end && items[k].range.end > run.start).collect();
-            if rtl {
-                idx.reverse();
-            }
-            for k in idx {
-                for g in items[k].glyphs.iter().filter(|g| run.contains(&g.cluster)) {
-                    let st = &runs[g.run].1;
-                    let x0 = pen;
-                    pen += g.pre;
-                    glyphs.push(Glyph {
-                        face: g.face,
-                        id: g.id,
-                        x: pen + g.dx,
-                        y: -g.dy - g.rise,
-                        size: g.size,
-                        cluster: base + g.cluster,
-                        synth_bold: primaries[g.run].synth_bold || st.faux_bold,
-                        synth_italic: primaries[g.run].synth_italic || st.faux_italic,
-                        h_scale: st.h_scale,
-                        v_scale: st.v_scale,
-                        run: g.run,
-                        variations: crate::variable::intern(&st.variations),
-                    });
-                    pen += g.adv;
-                    if space_extra > 0.0 && text[g.cluster..].starts_with(' ') && g.cluster < ce {
-                        pen += space_extra;
-                    }
-                    if st.underline && g.cluster < ce {
-                        let u = underline.get_or_insert((x0, pen));
-                        u.0 = u.0.min(x0);
-                        u.1 = u.1.max(pen);
-                    }
-                    let e = extents.entry(g.cluster).or_insert((x0, pen, items[k].rtl));
-                    e.0 = e.0.min(x0);
-                    e.1 = e.1.max(pen);
-                }
-            }
-        }
-        // caret stops for each char boundary in the line
-        let mut carets = Vec::new();
-        let mut cluster_starts: Vec<usize> = extents.keys().copied().collect();
-        cluster_starts.sort_unstable();
-        let char_bytes: Vec<usize> = text[r.clone()].char_indices().map(|(b, _)| r.start + b).collect();
-        for (ci, &cs) in cluster_starts.iter().enumerate() {
-            let (x0, x1, rtl) = extents[&cs];
-            let next = cluster_starts.get(ci + 1).copied().unwrap_or(r.end);
-            let members: Vec<usize> = char_bytes.iter().copied().filter(|b| *b >= cs && *b < next).collect();
-            let n = members.len().max(1) as f32;
-            for (mi, b) in members.iter().enumerate() {
-                let f = mi as f32 / n;
-                let x = if rtl { x1 - (x1 - x0) * f } else { x0 + (x1 - x0) * f };
-                carets.push((base + b, x));
-            }
-        }
-        // end of line caret
-        let end_x = match chars.iter().rev().find(|c| c.0 < r.end && c.0 >= r.start) {
-            Some(c) => {
-                let cs = cluster_starts.iter().rev().find(|s| **s <= c.0).copied();
-                match cs.and_then(|s| extents.get(&s)) {
-                    Some(&(x0, x1, rtl)) => {
-                        if rtl {
-                            x0
-                        } else {
-                            x1
-                        }
-                    }
-                    None => pen,
-                }
-            }
-            None => 0.0,
-        };
-        carets.push((base + r.end, end_x));
-        carets.sort_by_key(|c| c.0);
-        carets.dedup_by_key(|c| c.0);
-        // Line metrics: the tallest face and the largest leading on the line.
-        let (mut asc, mut desc, mut adv) = (0.0f32, 0.0f32, 0.0f32);
-        let mut seen: Vec<usize> = chars.iter().filter(|c| c.0 >= r.start && c.0 < r.end).map(|c| c.6).collect();
-        seen.sort_unstable();
-        seen.dedup();
-        if seen.is_empty() {
-            seen.push(chars.first().map_or(0, |c| c.6));
-        }
-        for &si in &seen {
-            let m = style_metrics(si);
-            let rise = runs[si].1.rise();
-            asc = asc.max(m.ascent + rise.max(0.0));
-            desc = desc.max(m.descent - rise.min(0.0));
-            adv = adv.max(runs[si].1.line_advance());
-        }
-        for g in &glyphs {
-            if g.face != primaries[g.run].face {
-                let m = fonts::face(g.face).metrics(g.size);
-                asc = asc.max(m.ascent);
-                desc = desc.max(m.descent);
-            }
-        }
-        let content_w = if space_extra > 0.0 { avail.map_or(content, |a| a + hang.0 + hang.1) } else { content };
-        out.push(ParaLine {
-            range: base + r.start..base + r.end,
-            glyphs,
-            carets,
-            content: content_w,
-            left_trim: if base_rtl { tw } else { 0.0 },
-            hang,
-            ascent: asc,
-            descent: desc,
-            advance: adv,
-            align,
-            avail,
-            margins: margins_for(li == 0),
-            underline,
-        });
-    }
-    out
+    ranges.into_iter().enumerate().map(|(li, r)| p.place_line(li, r, li + 1 == nlines)).collect()
 }
 
-/// Lay out `text` (paragraphs separated by CR, LF or CRLF) in one style.
 pub fn layout_uncached(text: &str, style: &TextStyle, para: &ParagraphStyle) -> Layout {
     layout_rich_uncached(text, &[(0..text.len(), style.clone())], std::slice::from_ref(para))
 }
 
+/// Maximum input size processed by one layout request. Above this, return an empty layout
+/// retaining the source length, so untrusted text cannot fan out into unbounded shaped data.
+const MAX_LAYOUT_BYTES: usize = 1 << 20;
+
 /// Lay out `text` with character style runs (byte ranges covering the text, in order; at least
 /// one) and paragraph settings (one per CR/LF/CRLF-separated paragraph; the last repeats). The wrap
 /// width is the first paragraph's.
 pub fn layout_rich_uncached(text: &str, runs: &[(Range<usize>, TextStyle)], paras: &[ParagraphStyle]) -> Layout {
+    if text.len() > MAX_LAYOUT_BYTES || runs.len() > MAX_LAYOUT_BYTES || paras.len() > MAX_LAYOUT_BYTES {
+        return Layout { text_len: text.len(), ..Default::default() };
+    }
     let fallback = [(0..text.len(), TextStyle::default())];
     let runs = if runs.is_empty() { &fallback[..] } else { runs };
     let default_para = ParagraphStyle::default();
     let para_at = |i: usize| paras.get(i).or(paras.last()).unwrap_or(&default_para);
     let width = para_at(0).width;
     let primaries: Vec<Resolved> = runs.iter().map(|(_, s)| fonts::resolve(&s.family, &s.style)).collect();
+    // A named instance of a variable font (`Figtree` `Black`, or `Figtree-Black`) sets the base
+    // axis values; axes set explicitly in the style keep theirs.
+    let instanced = primaries.iter().any(|p| p.instance.is_some()).then(|| {
+        runs.iter()
+            .zip(&primaries)
+            .map(|((r, s), p)| {
+                let base = fonts::instance_variations(p);
+                let mut s = s.clone();
+                if !base.is_empty() {
+                    s.variations = fonts::merge_variations(&base, &s.variations);
+                }
+                (r.clone(), s)
+            })
+            .collect::<Vec<_>>()
+    });
+    let runs = instanced.as_deref().unwrap_or(runs);
+    // A location that cannot be interned would outline at the default; shape there too.
+    let cleared = runs.iter().any(|(_, s)| !s.variations.is_empty() && crate::variable::intern(&s.variations) == 0).then(|| {
+        runs.iter()
+            .map(|(r, s)| {
+                let mut s = s.clone();
+                if crate::variable::intern(&s.variations) == 0 {
+                    s.variations.clear();
+                }
+                (r.clone(), s)
+            })
+            .collect::<Vec<_>>()
+    });
+    let runs = cleared.as_deref().unwrap_or(runs);
+    let variation_ids: Vec<u32> = runs.iter().map(|(_, s)| crate::variable::intern(&s.variations)).collect();
     let mut lay = Layout { missing_font: primaries.iter().any(|p| p.missing), text_len: text.len(), ..Default::default() };
     let mut plines: Vec<(usize, ParaLine)> = Vec::new();
     for (pi, span) in paragraph_ranges(text).enumerate() {
         let p = text.get(span.bytes.clone()).unwrap_or_default();
-        plines.extend(paragraph(p, span.bytes.start, runs, &primaries, para_at(pi), width).into_iter().map(|l| (pi, l)));
+        plines.extend(paragraph(p, span.bytes.start, runs, &primaries, &variation_ids, para_at(pi), width).into_iter().map(|l| (pi, l)));
     }
     let mut baseline = 0.0f32;
     for (i, (pi, pl)) in plines.into_iter().enumerate() {
@@ -974,17 +1129,7 @@ pub fn layout_rich_uncached(text: &str, runs: &[(Range<usize>, TextStyle)], para
             }
             baseline += adv;
         }
-        let shown = pl.content - pl.hang.0 - pl.hang.1;
-        let (ml, mr) = pl.margins;
-        let shift = match (pl.avail, pl.align) {
-            (None, Align::Left | Align::Justify) => ml,
-            (None, Align::Center) => -shown / 2.0 + (ml - mr) / 2.0,
-            (None, Align::Right) => -shown - mr,
-            (Some(_), Align::Left | Align::Justify) => ml,
-            (Some(a), Align::Center) => ml + (a - shown) / 2.0,
-            (Some(a), Align::Right) => ml + a - shown,
-        } - pl.left_trim
-            - pl.hang.0;
+        let shift = line_shift(&pl);
         let g0 = lay.glyphs.len();
         lay.glyphs.extend(pl.glyphs.into_iter().map(|mut g| {
             g.x += shift;
@@ -1013,6 +1158,27 @@ pub fn layout_rich_uncached(text: &str, runs: &[(Range<usize>, TextStyle)], para
     for i in 0..lay.lines.len() {
         lay.lines[i].para_end = lay.lines.get(i + 1).is_none_or(|n| n.para != lay.lines[i].para);
     }
+    set_bounds(&mut lay, width);
+    lay
+}
+
+/// Horizontal shift of a line from its paragraph's alignment, margins and hanging punctuation.
+fn line_shift(pl: &ParaLine) -> f32 {
+    let shown = pl.content - pl.hang.0 - pl.hang.1;
+    let (ml, mr) = pl.margins;
+    let shift = match (pl.avail, pl.align) {
+        (None, Align::Left | Align::Justify) => ml,
+        (None, Align::Center) => -shown / 2.0 + (ml - mr) / 2.0,
+        (None, Align::Right) => -shown - mr,
+        (Some(_), Align::Left | Align::Justify) => ml,
+        (Some(a), Align::Center) => ml + (a - shown) / 2.0,
+        (Some(a), Align::Right) => ml + a - shown,
+    };
+    shift - pl.left_trim - pl.hang.0
+}
+
+/// The layout's bounds: the lines' horizontal extent (and the wrap width), and their vertical extent.
+fn set_bounds(lay: &mut Layout, width: Option<f32>) {
     let (mut x0, mut x1) = (f32::MAX, f32::MIN);
     for l in &lay.lines {
         x0 = x0.min(l.x);
@@ -1025,7 +1191,6 @@ pub fn layout_rich_uncached(text: &str, runs: &[(Range<usize>, TextStyle)], para
     if let (Some(first), Some(last)) = (lay.lines.first(), lay.lines.last()) {
         lay.bounds = [x0, first.baseline - first.ascent, x1.max(x0), last.baseline + last.descent];
     }
-    lay
 }
 
 fn cache() -> &'static Mutex<HashMap<u64, (u64, Arc<Layout>)>> {
@@ -1040,6 +1205,9 @@ pub fn layout(text: &str, style: &TextStyle, para: &ParagraphStyle) -> Arc<Layou
 
 /// [`layout_rich_uncached`], cached by text, runs and paragraph settings.
 pub fn layout_rich(text: &str, runs: &[(Range<usize>, TextStyle)], paras: &[ParagraphStyle]) -> Arc<Layout> {
+    if text.len() > MAX_LAYOUT_BYTES || runs.len() > MAX_LAYOUT_BYTES || paras.len() > MAX_LAYOUT_BYTES {
+        return Arc::new(layout_rich_uncached(text, runs, paras));
+    }
     let mut h = std::collections::hash_map::DefaultHasher::new();
     text.hash(&mut h);
     runs.hash(&mut h);
@@ -1047,12 +1215,12 @@ pub fn layout_rich(text: &str, runs: &[(Range<usize>, TextStyle)], paras: &[Para
     let key = h.finish();
     static CLOCK: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
     let now = CLOCK.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-    if let Some(e) = cache().lock().unwrap_or_else(|e| e.into_inner()).get_mut(&key) {
+    if let Some(e) = cache().lock().unwrap_or_else(std::sync::PoisonError::into_inner).get_mut(&key) {
         e.0 = now;
         return e.1.clone();
     }
     let l = Arc::new(layout_rich_uncached(text, runs, paras));
-    let mut c = cache().lock().unwrap_or_else(|e| e.into_inner());
+    let mut c = cache().lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if c.len() >= 512 {
         // evict the oldest quarter
         let mut ages: Vec<u64> = c.values().map(|v| v.0).collect();
@@ -1071,339 +1239,4 @@ pub fn measure(text: &str, style: &TextStyle) -> f32 {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn st(size: f32) -> TextStyle {
-        TextStyle { size, ..Default::default() }
-    }
-
-    fn ids(text: &str, s: &TextStyle) -> Vec<u32> {
-        layout_uncached(text, s, &ParagraphStyle::default()).glyphs.iter().map(|g| g.id).collect()
-    }
-
-    fn ot(f: impl FnOnce(&mut OpenType)) -> TextStyle {
-        let mut s = st(100.0);
-        f(&mut s.opentype);
-        s
-    }
-
-    fn serif() -> TextStyle {
-        TextStyle { family: "Noto Serif".into(), ..st(100.0) }
-    }
-
-    #[test]
-    fn bundled_faces_list_their_features() {
-        let inter = fonts::face(fonts::resolve("Inter", "Regular").face).features();
-        for t in ["ss01", "dlig", "frac", "tnum", "sups", "ordn"] {
-            assert!(inter.iter().any(|f| f == t), "{t} in {inter:?}");
-        }
-        let serif = fonts::face(fonts::resolve("Noto Serif", "Regular").face).features();
-        for t in ["smcp", "c2sc", "onum", "lnum"] {
-            assert!(serif.iter().any(|f| f == t), "{t} in {serif:?}");
-        }
-    }
-
-    #[test]
-    fn opentype_features_substitute_glyphs() {
-        let plain = st(100.0);
-        // Stylistic sets, fractions, ordinals, figure widths and discretionary ligatures.
-        assert_ne!(ids("1234567890", &plain), ids("1234567890", &ot(|o| o.set_stylistic_set(1, true))), "ss01 alternate digits");
-        assert_eq!(ids("1234567890", &plain), ids("1234567890", &ot(|o| o.set_stylistic_set(20, true))), "Inter has no ss20");
-        assert_ne!(ids("1/2", &plain), ids("1/2", &ot(|o| o.fractions = true)), "frac");
-        assert_ne!(ids("1a 2o No", &plain), ids("1a 2o No", &ot(|o| o.ordinals = true)), "ordn");
-        let tab = measure("1111", &ot(|o| o.figure_width = effectcraft_keyframe::FigureWidth::Tabular));
-        let prop = measure("1111", &ot(|o| o.figure_width = effectcraft_keyframe::FigureWidth::Proportional));
-        assert!((tab - prop).abs() > 1.0, "tabular {tab} vs proportional {prop}");
-        // Old-style figures (Noto Serif).
-        let old = TextStyle { opentype: OpenType { figure_style: effectcraft_keyframe::FigureStyle::OldStyle, ..Default::default() }, ..serif() };
-        assert_ne!(ids("123", &serif()), ids("123", &old), "onum");
-        // Contextual alternates are on by default; turning them off can only keep or change glyphs.
-        let no_calt = ot(|o| o.contextual_alternates = false);
-        assert_eq!(ids("Hello", &plain).len(), ids("Hello", &no_calt).len());
-    }
-
-    #[test]
-    fn true_small_caps_and_superscripts_with_faux_fallback() {
-        // Noto Serif has smcp: lowercase letters take their own small-capital glyphs at full size.
-        let sc = TextStyle { caps: Caps::Small, ..serif() };
-        let l = layout_uncached("Ab", &sc, &ParagraphStyle::default());
-        let upper_b = ids("B", &serif())[0];
-        assert_ne!(l.glyphs[1].id, upper_b, "true small cap glyph, not a scaled capital");
-        assert_eq!(l.glyphs[1].size, 100.0);
-        // Inter has no smcp: a capital scaled down.
-        let faux = layout_uncached("Ab", &TextStyle { caps: Caps::Small, ..st(100.0) }, &ParagraphStyle::default());
-        assert_eq!(faux.glyphs[1].id, ids("B", &st(100.0))[0]);
-        assert!((faux.glyphs[1].size - 78.0).abs() < 0.01);
-        // All Small Caps: capitals become small capitals too (c2sc).
-        let all = TextStyle { opentype: OpenType { all_small_caps: true, ..Default::default() }, ..serif() };
-        let a = layout_uncached("AB", &all, &ParagraphStyle::default());
-        assert_ne!(a.glyphs[0].id, ids("A", &serif())[0]);
-        // Superscript: Inter's sups figures at full size on the baseline; letters it lacks are
-        // synthesized (smaller and raised).
-        let sup = TextStyle { script: Script::Super, ..st(100.0) };
-        let s2 = layout_uncached("2", &sup, &ParagraphStyle::default());
-        assert_ne!(s2.glyphs[0].id, ids("2", &st(100.0))[0]);
-        assert_eq!(s2.glyphs[0].size, 100.0);
-        assert_eq!(s2.glyphs[0].y, 0.0);
-        let sq = layout_uncached("q", &sup, &ParagraphStyle::default());
-        if !feature_substitutes(sq.glyphs[0].face, b"sups", 'q') {
-            assert!(sq.glyphs[0].size < 60.0 && sq.glyphs[0].y < -20.0, "{:?}", sq.glyphs[0]);
-        }
-        let sub = layout_uncached("2", &TextStyle { script: Script::Sub, ..st(100.0) }, &ParagraphStyle::default());
-        assert_ne!(sub.glyphs[0].id, s2.glyphs[0].id);
-    }
-
-    #[test]
-    fn kerning_and_ligatures_change_advances() {
-        let kern = measure("AVAVAV", &st(100.0));
-        let nokern = measure("AVAVAV", &TextStyle { kerning: false, ..st(100.0) });
-        assert!(kern < nokern - 5.0, "kerning tightens AV: {kern} vs {nokern}");
-        // tracking adds 1/1000 em per cluster
-        let tracked = measure("AVAVAV", &TextStyle { tracking: 100.0, ..st(100.0) });
-        assert!((tracked - kern - 6.0 * 10.0).abs() < 0.5, "{tracked} {kern}");
-    }
-
-    #[test]
-    fn point_text_alignment() {
-        let l = layout("Hello", &st(50.0), &ParagraphStyle { align: Align::Center, ..Default::default() });
-        let line = &l.lines[0];
-        assert!((line.x + line.width / 2.0).abs() < 0.01);
-        let r = layout("Hello", &st(50.0), &ParagraphStyle { align: Align::Right, ..Default::default() });
-        assert!((r.lines[0].x + r.lines[0].width).abs() < 0.01);
-        assert_eq!(l.glyphs.len(), 5);
-        assert!(l.bounds[1] < -30.0 && l.bounds[3] > 5.0, "{:?}", l.bounds);
-    }
-
-    #[test]
-    fn wraps_area_text_and_justifies() {
-        let p = ParagraphStyle { width: Some(300.0), align: Align::Justify, ..Default::default() };
-        let l = layout("the quick brown fox jumps over the lazy dog again and again", &st(40.0), &p);
-        assert!(l.lines.len() >= 3, "{}", l.lines.len());
-        for line in &l.lines[..l.lines.len() - 1] {
-            assert!((line.width - 300.0).abs() < 0.5, "justified to the box: {}", line.width);
-        }
-        // the lines tile the text
-        assert_eq!(l.lines[0].range.start, 0);
-        for w in l.lines.windows(2) {
-            assert_eq!(w[0].range.end, w[1].range.start);
-            assert!(w[1].baseline > w[0].baseline);
-        }
-        let left = layout("the quick brown fox jumps over the lazy dog", &st(40.0), &ParagraphStyle { width: Some(300.0), ..Default::default() });
-        assert!(left.lines.iter().all(|l| l.width <= 300.0 + 0.01));
-    }
-
-    #[test]
-    fn newlines_make_paragraphs_and_leading_adds() {
-        let l = layout("one\ntwo\n\nfour", &st(30.0), &ParagraphStyle::default());
-        assert_eq!(l.lines.len(), 4);
-        assert_eq!(l.lines[1].range, 4..7);
-        assert_eq!(l.lines[2].range, 8..8);
-        let gap = l.lines[1].baseline - l.lines[0].baseline;
-        let l2 = layout("one\ntwo", &st(30.0), &ParagraphStyle { leading: 10.0, ..Default::default() });
-        assert!((l2.lines[1].baseline - l2.lines[0].baseline - gap - 10.0).abs() < 1e-3);
-    }
-
-    #[test]
-    fn carets_and_hit_testing() {
-        let l = layout("abc\nde", &st(40.0), &ParagraphStyle::default());
-        let (x0, _, li0) = l.caret(0);
-        let (x1, _, _) = l.caret(1);
-        let (x3, _, _) = l.caret(3);
-        assert!(x0.abs() < 1e-3 && x1 > x0 && x3 > x1);
-        assert_eq!(li0, 0);
-        let (_, b4, li4) = l.caret(4);
-        assert_eq!(li4, 1);
-        assert!(b4 > 0.0);
-        assert_eq!(l.hit(x1 + 1.0, 0.0), 1);
-        assert_eq!(l.hit(1000.0, b4), 6);
-        let rects = l.selection_rects(1, 5);
-        assert_eq!(rects.len(), 2);
-    }
-
-    #[test]
-    fn bidi_reorders_rtl_runs() {
-        // Hebrew letters are laid out right-to-left: the first logical letter is rightmost.
-        let l = layout("ab \u{5d0}\u{5d1}\u{5d2} cd", &st(40.0), &ParagraphStyle::default());
-        let x_of = |byte: usize| l.glyphs.iter().find(|g| g.cluster == byte).map(|g| g.x).unwrap();
-        let alef = "ab ".len();
-        let gimel = alef + 4;
-        assert!(x_of(alef) > x_of(gimel), "alef right of gimel");
-        assert!(x_of(0) < x_of(gimel) && x_of(alef) < x_of("ab \u{5d0}\u{5d1}\u{5d2} ".len()));
-    }
-
-    #[test]
-    fn caps_and_small_caps() {
-        let s = st(50.0);
-        let up = measure("HELLO", &s);
-        let all = measure("hello", &TextStyle { caps: Caps::All, ..s.clone() });
-        assert!((up - all).abs() < 0.01);
-        let small = measure("hello", &TextStyle { caps: Caps::Small, ..s.clone() });
-        assert!(small < up * 0.9 && small > up * 0.6, "{small} {up}");
-        let l = layout("Hi", &TextStyle { baseline_shift: 10.0, underline: true, ..s }, &ParagraphStyle::default());
-        assert!((l.glyphs[0].y + 10.0).abs() < 1e-3);
-        assert_eq!(l.underlines.len(), 1);
-    }
-
-    #[test]
-    fn ligature_caret_interpolates() {
-        // Inter has an "fi"-like ligature only via calt in some versions; use "ffi" which most
-        // fonts ligate. Whatever shaping does, every char boundary has a caret.
-        let l = layout("office", &st(40.0), &ParagraphStyle::default());
-        let stops: Vec<usize> = l.lines[0].carets.iter().map(|c| c.0).collect();
-        assert_eq!(stops, vec![0, 1, 2, 3, 4, 5, 6]);
-        let xs: Vec<f32> = l.lines[0].carets.iter().map(|c| c.1).collect();
-        assert!(xs.windows(2).all(|w| w[1] >= w[0]), "{xs:?}");
-    }
-
-    #[test]
-    fn fallback_font_for_missing_glyphs() {
-        // Inter lacks Devanagari/Hebrew; Noto Serif lacks Hebrew too → glyphs still produced (notdef)
-        let l = layout("A\u{3b1}", &TextStyle { family: "Noto Serif".into(), ..st(40.0) }, &ParagraphStyle::default());
-        assert_eq!(l.glyphs.len(), 2);
-        assert!(l.glyphs.iter().all(|g| g.id != 0));
-    }
-
-    #[test]
-    fn empty_text_has_a_caret() {
-        let l = layout("", &st(40.0), &ParagraphStyle::default());
-        assert_eq!(l.lines.len(), 1);
-        assert_eq!(l.caret(0).0, 0.0);
-        assert!(l.bounds[3] > l.bounds[1]);
-    }
-
-    fn rich(text: &str, runs: &[(Range<usize>, TextStyle)], para: ParagraphStyle) -> Layout {
-        layout_rich_uncached(text, runs, &[para])
-    }
-
-    #[test]
-    fn mixed_sizes_share_a_baseline_and_take_the_largest_leading() {
-        let text = "small BIG\nnext";
-        let runs = [(0..6, st(20.0)), (6..9, st(80.0)), (9..text.len(), st(20.0))];
-        let l = rich(text, &runs, ParagraphStyle::default());
-        assert_eq!(l.lines.len(), 2);
-        let y0 = l.glyphs[0].y;
-        assert!(l.glyphs[..9].iter().all(|g| (g.y - y0).abs() < 1e-3), "one baseline per line");
-        assert!(l.glyphs[7].size > l.glyphs[0].size * 3.0);
-        // Line 2's advance is its own leading (20 px text: 24 px); line 1 is as tall as the big run.
-        assert!((l.lines[1].baseline - l.lines[0].baseline - 24.0).abs() < 1e-3, "{}", l.lines[1].baseline);
-        assert!(l.lines[0].ascent > 60.0);
-        // A big run on the second line pushes it down by its 120% leading.
-        let text2 = "aa\nBB";
-        let l2 = rich(text2, &[(0..3, st(20.0)), (3..5, st(80.0))], ParagraphStyle::default());
-        assert!((l2.lines[1].baseline - 96.0).abs() < 1e-3);
-        // Explicit leading wins over auto.
-        let mut fixed = st(20.0);
-        fixed.leading = Some(50.0);
-        let l3 = rich("a\nb", &[(0..3, fixed)], ParagraphStyle::default());
-        assert!((l3.lines[1].baseline - 50.0).abs() < 1e-3);
-    }
-
-    #[test]
-    fn super_subscript_tsume_and_kerning_metrics() {
-        let base = st(100.0);
-        let sup = TextStyle { script: Script::Super, ..base.clone() };
-        let sub = TextStyle { script: Script::Sub, ..base.clone() };
-        // A letter the font has no superior / inferior glyph for: synthesized.
-        let inter = fonts::resolve("Inter", "Regular").face;
-        let c = "qwkzvjxyQWK".chars().find(|&c| !feature_substitutes(inter, b"sups", c) && !feature_substitutes(inter, b"subs", c)).unwrap();
-        let text: String = ['x', c, 'y', c].iter().collect();
-        let l = rich(&text, &[(0..1, base.clone()), (1..2, sup), (2..3, base.clone()), (3..4, sub)], ParagraphStyle::default());
-        let g = &l.glyphs;
-        assert!((g[1].size - 58.3).abs() < 0.1);
-        assert!((g[1].y - (g[0].y - 33.3)).abs() < 0.1, "superscript raised by a third of the size");
-        assert!((g[3].y - (g[2].y + 33.3)).abs() < 0.1, "subscript lowered");
-        // Tsume removes side bearings; full tsume is narrower than none.
-        let w0 = measure("onion", &base);
-        let w1 = measure("onion", &TextStyle { tsume: 1.0, ..base.clone() });
-        assert!(w1 < w0 - 5.0, "{w1} vs {w0}");
-        // Manual kerning: +100/1000 em before each of the 5 later characters of AVAVAV, metrics off.
-        let nokern = measure("AVAVAV", &TextStyle { kerning: false, ..base.clone() });
-        let manual = measure("AVAVAV", &TextStyle { manual_kern: Some(100.0), ..base.clone() });
-        assert!((manual - nokern - 50.0).abs() < 0.5, "{manual} {nokern}");
-        let optical = measure("AVAVAV", &TextStyle { optical: true, ..base.clone() });
-        assert!(optical > 0.0 && (optical - nokern).abs() < 100.0);
-        // Horizontal scale stretches advances.
-        let wide = measure("onion", &TextStyle { h_scale: 2.0, ..base.clone() });
-        assert!((wide - 2.0 * w0).abs() < 0.5);
-        let l = layout("o", &TextStyle { h_scale: 2.0, v_scale: 0.5, ..base }, &ParagraphStyle::default());
-        assert_eq!((l.glyphs[0].h_scale, l.glyphs[0].v_scale), (2.0, 0.5));
-    }
-
-    #[test]
-    fn indents_and_paragraph_spacing() {
-        let s = st(20.0);
-        let text = "first paragraph here\nsecond one";
-        let p0 = ParagraphStyle { width: Some(400.0), indent_start: 30.0, indent_first: 15.0, space_after: 10.0, ..Default::default() };
-        let p1 = ParagraphStyle { width: Some(400.0), indent_end: 50.0, align: Align::Right, space_before: 7.0, ..Default::default() };
-        let l = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p0.clone(), p1]);
-        assert!((l.lines[0].x - 45.0).abs() < 1e-3, "left + first-line indent: {}", l.lines[0].x);
-        assert!((l.lines[1].x + l.lines[1].width - 350.0).abs() < 0.5, "right indent: {}", l.lines[1].x + l.lines[1].width);
-        assert!((l.lines[1].baseline - l.lines[0].baseline - (24.0 + 10.0 + 7.0)).abs() < 1e-3);
-        assert_eq!((l.lines[0].para, l.lines[1].para), (0, 1));
-        assert!(l.lines[0].para_end && l.lines[1].para_end);
-        // Wrapped lines after the first don't get the first-line indent.
-        let long = "word ".repeat(30);
-        let l = layout_rich_uncached(&long, &[(0..long.len(), s.clone())], &[p0]);
-        assert!(l.lines.len() > 2);
-        assert!((l.lines[1].x - 30.0).abs() < 1e-3);
-        assert!(l.lines.iter().all(|ln| ln.x + ln.width <= 400.0 + 0.5));
-        assert!(!l.lines[0].para_end);
-        // Point text: a right-aligned paragraph's end indent moves it left of the origin.
-        let l = layout_rich_uncached("abc", &[(0..3, s)], &[ParagraphStyle { align: Align::Right, indent_end: 12.0, ..Default::default() }]);
-        assert!((l.lines[0].x + l.lines[0].width + 12.0).abs() < 1e-3);
-    }
-
-    #[test]
-    fn justify_last_line_modes_and_every_line_composer() {
-        let text = "the quick brown fox jumps over the lazy dog and keeps running far";
-        let s = st(30.0);
-        let p = |last: Align| ParagraphStyle { width: Some(320.0), align: Align::Justify, justify_last: last, ..Default::default() };
-        let left = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Left)]);
-        let n = left.lines.len();
-        assert!(n >= 3);
-        assert!((left.lines[0].width - 320.0).abs() < 0.5);
-        assert!(left.lines[n - 1].width < 320.0 && left.lines[n - 1].x.abs() < 1e-3);
-        let center = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Center)]);
-        let lc = &center.lines[n - 1];
-        assert!((lc.x - (320.0 - lc.width) / 2.0).abs() < 0.5);
-        let right = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Right)]);
-        let lr = &right.lines[n - 1];
-        assert!((lr.x + lr.width - 320.0).abs() < 0.5);
-        let all = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Justify)]);
-        assert!((all.lines[n - 1].width - 320.0).abs() < 0.5, "justify all stretches the last line");
-        // Every-line composer: never worse (summed squared slack) than greedy breaking.
-        let slack = |l: &Layout| -> f32 { l.lines[..l.lines.len() - 1].iter().map(|ln| (320.0 - ln.width).powi(2)).sum() };
-        let greedy = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[ParagraphStyle { width: Some(320.0), ..Default::default() }]);
-        let every = layout_rich_uncached(text, &[(0..text.len(), s)], &[ParagraphStyle { width: Some(320.0), every_line: true, ..Default::default() }]);
-        assert!(slack(&every) <= slack(&greedy) + 1e-3, "{} vs {}", slack(&every), slack(&greedy));
-        assert!(every.lines.iter().all(|ln| ln.width <= 320.0 + 0.5));
-    }
-
-    #[test]
-    fn hanging_punctuation_overhangs_the_box() {
-        let s = st(40.0);
-        let text = "\"Hi.\"";
-        let p = ParagraphStyle { width: Some(400.0), hanging: true, ..Default::default() };
-        let l = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p]);
-        assert!(l.lines[0].x < -1.0, "opening quote hangs left: {}", l.lines[0].x);
-        let r = layout_rich_uncached(
-            text,
-            &[(0..text.len(), s)],
-            &[ParagraphStyle { width: Some(400.0), hanging: true, align: Align::Right, ..Default::default() }],
-        );
-        assert!(r.lines[0].x + r.lines[0].width > 401.0, "closing quote hangs right");
-    }
-
-    #[test]
-    fn rtl_paragraph_carets_run_right_to_left() {
-        let text = "\u{5d0}\u{5d1}\u{5d2}";
-        let l = layout_rich_uncached(text, &[(0..text.len(), st(40.0))], &[ParagraphStyle { rtl: Some(true), ..Default::default() }]);
-        let xs: Vec<f32> = l.lines[0].carets.iter().map(|c| c.1).collect();
-        assert_eq!(xs.len(), 4);
-        assert!(xs.windows(2).all(|w| w[1] < w[0]), "{xs:?}");
-        // Hit testing returns the logical position nearest the point.
-        assert_eq!(l.hit(xs[1] + 0.5, 0.0), 2);
-        assert_eq!(l.hit(xs[0] + 50.0, 0.0), 0);
-    }
-}
+mod tests;
diff --git a/crates/text/src/layout/tests.rs b/crates/text/src/layout/tests.rs
new file mode 100644
index 000000000..9079a1225
--- /dev/null
+++ b/crates/text/src/layout/tests.rs
@@ -0,0 +1,359 @@
+use super::*;
+
+fn st(size: f32) -> TextStyle {
+    TextStyle { size, ..Default::default() }
+}
+
+fn ids(text: &str, s: &TextStyle) -> Vec<u32> {
+    layout_uncached(text, s, &ParagraphStyle::default()).glyphs.iter().map(|g| g.id).collect()
+}
+
+fn ot(f: impl FnOnce(&mut OpenType)) -> TextStyle {
+    let mut s = st(100.0);
+    f(&mut s.opentype);
+    s
+}
+
+fn serif() -> TextStyle {
+    TextStyle { family: "Noto Serif".into(), ..st(100.0) }
+}
+
+#[test]
+fn bundled_faces_list_their_features() {
+    let inter = fonts::face(fonts::resolve("Inter", "Regular").face).features();
+    for t in ["ss01", "dlig", "frac", "tnum", "sups", "ordn"] {
+        assert!(inter.iter().any(|f| f == t), "{t} in {inter:?}");
+    }
+    let serif = fonts::face(fonts::resolve("Noto Serif", "Regular").face).features();
+    for t in ["smcp", "c2sc", "onum", "lnum"] {
+        assert!(serif.iter().any(|f| f == t), "{t} in {serif:?}");
+    }
+}
+
+#[test]
+fn opentype_features_substitute_glyphs() {
+    let plain = st(100.0);
+    // Stylistic sets, fractions, ordinals, figure widths and discretionary ligatures.
+    assert_ne!(ids("1234567890", &plain), ids("1234567890", &ot(|o| o.set_stylistic_set(1, true))), "ss01 alternate digits");
+    assert_eq!(ids("1234567890", &plain), ids("1234567890", &ot(|o| o.set_stylistic_set(20, true))), "Inter has no ss20");
+    assert_ne!(ids("1/2", &plain), ids("1/2", &ot(|o| o.fractions = true)), "frac");
+    assert_ne!(ids("1a 2o No", &plain), ids("1a 2o No", &ot(|o| o.ordinals = true)), "ordn");
+    let tab = measure("1111", &ot(|o| o.figure_width = effectcraft_keyframe::FigureWidth::Tabular));
+    let prop = measure("1111", &ot(|o| o.figure_width = effectcraft_keyframe::FigureWidth::Proportional));
+    assert!((tab - prop).abs() > 1.0, "tabular {tab} vs proportional {prop}");
+    // Old-style figures (Noto Serif).
+    let old = TextStyle { opentype: OpenType { figure_style: effectcraft_keyframe::FigureStyle::OldStyle, ..Default::default() }, ..serif() };
+    assert_ne!(ids("123", &serif()), ids("123", &old), "onum");
+    // Contextual alternates are on by default; turning them off can only keep or change glyphs.
+    let no_calt = ot(|o| o.contextual_alternates = false);
+    assert_eq!(ids("Hello", &plain).len(), ids("Hello", &no_calt).len());
+}
+
+#[test]
+fn true_small_caps_and_superscripts_with_faux_fallback() {
+    // Noto Serif has smcp: lowercase letters take their own small-capital glyphs at full size.
+    let sc = TextStyle { caps: Caps::Small, ..serif() };
+    let l = layout_uncached("Ab", &sc, &ParagraphStyle::default());
+    let upper_b = ids("B", &serif())[0];
+    assert_ne!(l.glyphs[1].id, upper_b, "true small cap glyph, not a scaled capital");
+    assert_eq!(l.glyphs[1].size, 100.0);
+    // Inter has no smcp: a capital scaled down.
+    let faux = layout_uncached("Ab", &TextStyle { caps: Caps::Small, ..st(100.0) }, &ParagraphStyle::default());
+    assert_eq!(faux.glyphs[1].id, ids("B", &st(100.0))[0]);
+    assert!((faux.glyphs[1].size - 78.0).abs() < 0.01);
+    // All Small Caps: capitals become small capitals too (c2sc).
+    let all = TextStyle { opentype: OpenType { all_small_caps: true, ..Default::default() }, ..serif() };
+    let a = layout_uncached("AB", &all, &ParagraphStyle::default());
+    assert_ne!(a.glyphs[0].id, ids("A", &serif())[0]);
+    // Superscript: Inter's sups figures at full size on the baseline; letters it lacks are
+    // synthesized (smaller and raised).
+    let sup = TextStyle { script: Script::Super, ..st(100.0) };
+    let s2 = layout_uncached("2", &sup, &ParagraphStyle::default());
+    assert_ne!(s2.glyphs[0].id, ids("2", &st(100.0))[0]);
+    assert_eq!(s2.glyphs[0].size, 100.0);
+    assert_eq!(s2.glyphs[0].y, 0.0);
+    let sq = layout_uncached("q", &sup, &ParagraphStyle::default());
+    if !feature_substitutes(sq.glyphs[0].face, b"sups", 'q') {
+        assert!(sq.glyphs[0].size < 60.0 && sq.glyphs[0].y < -20.0, "{:?}", sq.glyphs[0]);
+    }
+    let sub = layout_uncached("2", &TextStyle { script: Script::Sub, ..st(100.0) }, &ParagraphStyle::default());
+    assert_ne!(sub.glyphs[0].id, s2.glyphs[0].id);
+}
+
+#[test]
+fn kerning_and_ligatures_change_advances() {
+    let kern = measure("AVAVAV", &st(100.0));
+    let nokern = measure("AVAVAV", &TextStyle { kerning: false, ..st(100.0) });
+    assert!(kern < nokern - 5.0, "kerning tightens AV: {kern} vs {nokern}");
+    // tracking adds 1/1000 em per cluster
+    let tracked = measure("AVAVAV", &TextStyle { tracking: 100.0, ..st(100.0) });
+    assert!((tracked - kern - 6.0 * 10.0).abs() < 0.5, "{tracked} {kern}");
+}
+
+#[test]
+fn point_text_alignment() {
+    let l = layout("Hello", &st(50.0), &ParagraphStyle { align: Align::Center, ..Default::default() });
+    let line = &l.lines[0];
+    assert!((line.x + line.width / 2.0).abs() < 0.01);
+    let r = layout("Hello", &st(50.0), &ParagraphStyle { align: Align::Right, ..Default::default() });
+    assert!((r.lines[0].x + r.lines[0].width).abs() < 0.01);
+    assert_eq!(l.glyphs.len(), 5);
+    assert!(l.bounds[1] < -30.0 && l.bounds[3] > 5.0, "{:?}", l.bounds);
+}
+
+#[test]
+fn wraps_area_text_and_justifies() {
+    let p = ParagraphStyle { width: Some(300.0), align: Align::Justify, ..Default::default() };
+    let l = layout("the quick brown fox jumps over the lazy dog again and again", &st(40.0), &p);
+    assert!(l.lines.len() >= 3, "{}", l.lines.len());
+    for line in &l.lines[..l.lines.len() - 1] {
+        assert!((line.width - 300.0).abs() < 0.5, "justified to the box: {}", line.width);
+    }
+    // the lines tile the text
+    assert_eq!(l.lines[0].range.start, 0);
+    for w in l.lines.windows(2) {
+        assert_eq!(w[0].range.end, w[1].range.start);
+        assert!(w[1].baseline > w[0].baseline);
+    }
+    let left = layout("the quick brown fox jumps over the lazy dog", &st(40.0), &ParagraphStyle { width: Some(300.0), ..Default::default() });
+    assert!(left.lines.iter().all(|l| l.width <= 300.0 + 0.01));
+}
+
+#[test]
+fn newlines_make_paragraphs_and_leading_adds() {
+    let l = layout("one\ntwo\n\nfour", &st(30.0), &ParagraphStyle::default());
+    assert_eq!(l.lines.len(), 4);
+    assert_eq!(l.lines[1].range, 4..7);
+    assert_eq!(l.lines[2].range, 8..8);
+    let gap = l.lines[1].baseline - l.lines[0].baseline;
+    let l2 = layout("one\ntwo", &st(30.0), &ParagraphStyle { leading: 10.0, ..Default::default() });
+    assert!((l2.lines[1].baseline - l2.lines[0].baseline - gap - 10.0).abs() < 1e-3);
+}
+
+#[test]
+fn carets_and_hit_testing() {
+    let l = layout("abc\nde", &st(40.0), &ParagraphStyle::default());
+    let (x0, _, li0) = l.caret(0);
+    let (x1, _, _) = l.caret(1);
+    let (x3, _, _) = l.caret(3);
+    assert!(x0.abs() < 1e-3 && x1 > x0 && x3 > x1);
+    assert_eq!(li0, 0);
+    let (_, b4, li4) = l.caret(4);
+    assert_eq!(li4, 1);
+    assert!(b4 > 0.0);
+    assert_eq!(l.hit(x1 + 1.0, 0.0), 1);
+    assert_eq!(l.hit(1000.0, b4), 6);
+    let rects = l.selection_rects(1, 5);
+    assert_eq!(rects.len(), 2);
+}
+
+#[test]
+fn bidi_reorders_rtl_runs() {
+    // Hebrew letters are laid out right-to-left: the first logical letter is rightmost.
+    let l = layout("ab \u{5d0}\u{5d1}\u{5d2} cd", &st(40.0), &ParagraphStyle::default());
+    let x_of = |byte: usize| l.glyphs.iter().find(|g| g.cluster == byte).map(|g| g.x).unwrap();
+    let alef = "ab ".len();
+    let gimel = alef + 4;
+    assert!(x_of(alef) > x_of(gimel), "alef right of gimel");
+    assert!(x_of(0) < x_of(gimel) && x_of(alef) < x_of("ab \u{5d0}\u{5d1}\u{5d2} ".len()));
+}
+
+#[test]
+fn caps_and_small_caps() {
+    let s = st(50.0);
+    let up = measure("HELLO", &s);
+    let all = measure("hello", &TextStyle { caps: Caps::All, ..s.clone() });
+    assert!((up - all).abs() < 0.01);
+    let small = measure("hello", &TextStyle { caps: Caps::Small, ..s.clone() });
+    assert!(small < up * 0.9 && small > up * 0.6, "{small} {up}");
+    let l = layout("Hi", &TextStyle { baseline_shift: 10.0, underline: true, ..s }, &ParagraphStyle::default());
+    assert!((l.glyphs[0].y + 10.0).abs() < 1e-3);
+    assert_eq!(l.underlines.len(), 1);
+}
+
+#[test]
+fn ligature_caret_interpolates() {
+    // Inter has an "fi"-like ligature only via calt in some versions; use "ffi" which most
+    // fonts ligate. Whatever shaping does, every char boundary has a caret.
+    let l = layout("office", &st(40.0), &ParagraphStyle::default());
+    let stops: Vec<usize> = l.lines[0].carets.iter().map(|c| c.0).collect();
+    assert_eq!(stops, vec![0, 1, 2, 3, 4, 5, 6]);
+    let xs: Vec<f32> = l.lines[0].carets.iter().map(|c| c.1).collect();
+    assert!(xs.windows(2).all(|w| w[1] >= w[0]), "{xs:?}");
+}
+
+#[test]
+fn fallback_font_for_missing_glyphs() {
+    // Inter lacks Devanagari/Hebrew; Noto Serif lacks Hebrew too → glyphs still produced (notdef)
+    let l = layout("A\u{3b1}", &TextStyle { family: "Noto Serif".into(), ..st(40.0) }, &ParagraphStyle::default());
+    assert_eq!(l.glyphs.len(), 2);
+    assert!(l.glyphs.iter().all(|g| g.id != 0));
+}
+
+#[test]
+fn empty_text_has_a_caret() {
+    let l = layout("", &st(40.0), &ParagraphStyle::default());
+    assert_eq!(l.lines.len(), 1);
+    assert_eq!(l.caret(0).0, 0.0);
+    assert!(l.bounds[3] > l.bounds[1]);
+}
+
+fn rich(text: &str, runs: &[(Range<usize>, TextStyle)], para: ParagraphStyle) -> Layout {
+    layout_rich_uncached(text, runs, &[para])
+}
+
+#[test]
+fn mixed_sizes_share_a_baseline_and_take_the_largest_leading() {
+    let text = "small BIG\nnext";
+    let runs = [(0..6, st(20.0)), (6..9, st(80.0)), (9..text.len(), st(20.0))];
+    let l = rich(text, &runs, ParagraphStyle::default());
+    assert_eq!(l.lines.len(), 2);
+    let y0 = l.glyphs[0].y;
+    assert!(l.glyphs[..9].iter().all(|g| (g.y - y0).abs() < 1e-3), "one baseline per line");
+    assert!(l.glyphs[7].size > l.glyphs[0].size * 3.0);
+    // Line 2's advance is its own leading (20 px text: 24 px); line 1 is as tall as the big run.
+    assert!((l.lines[1].baseline - l.lines[0].baseline - 24.0).abs() < 1e-3, "{}", l.lines[1].baseline);
+    assert!(l.lines[0].ascent > 60.0);
+    // A big run on the second line pushes it down by its 120% leading.
+    let text2 = "aa\nBB";
+    let l2 = rich(text2, &[(0..3, st(20.0)), (3..5, st(80.0))], ParagraphStyle::default());
+    assert!((l2.lines[1].baseline - 96.0).abs() < 1e-3);
+    // Explicit leading wins over auto.
+    let mut fixed = st(20.0);
+    fixed.leading = Some(50.0);
+    let l3 = rich("a\nb", &[(0..3, fixed)], ParagraphStyle::default());
+    assert!((l3.lines[1].baseline - 50.0).abs() < 1e-3);
+}
+
+#[test]
+fn super_subscript_tsume_and_kerning_metrics() {
+    let base = st(100.0);
+    let sup = TextStyle { script: Script::Super, ..base.clone() };
+    let sub = TextStyle { script: Script::Sub, ..base.clone() };
+    // A letter the font has no superior / inferior glyph for: synthesized.
+    let inter = fonts::resolve("Inter", "Regular").face;
+    let c = "qwkzvjxyQWK".chars().find(|&c| !feature_substitutes(inter, b"sups", c) && !feature_substitutes(inter, b"subs", c)).unwrap();
+    let text: String = ['x', c, 'y', c].iter().collect();
+    let l = rich(&text, &[(0..1, base.clone()), (1..2, sup), (2..3, base.clone()), (3..4, sub)], ParagraphStyle::default());
+    let g = &l.glyphs;
+    assert!((g[1].size - 58.3).abs() < 0.1);
+    assert!((g[1].y - (g[0].y - 33.3)).abs() < 0.1, "superscript raised by a third of the size");
+    assert!((g[3].y - (g[2].y + 33.3)).abs() < 0.1, "subscript lowered");
+    // Tsume removes side bearings; full tsume is narrower than none.
+    let w0 = measure("onion", &base);
+    let w1 = measure("onion", &TextStyle { tsume: 1.0, ..base.clone() });
+    assert!(w1 < w0 - 5.0, "{w1} vs {w0}");
+    // Manual kerning: +100/1000 em before each of the 5 later characters of AVAVAV, metrics off.
+    let nokern = measure("AVAVAV", &TextStyle { kerning: false, ..base.clone() });
+    let manual = measure("AVAVAV", &TextStyle { manual_kern: Some(100.0), ..base.clone() });
+    assert!((manual - nokern - 50.0).abs() < 0.5, "{manual} {nokern}");
+    let optical = measure("AVAVAV", &TextStyle { optical: true, ..base.clone() });
+    assert!(optical > 0.0 && (optical - nokern).abs() < 100.0);
+    // Horizontal scale stretches advances.
+    let wide = measure("onion", &TextStyle { h_scale: 2.0, ..base.clone() });
+    assert!((wide - 2.0 * w0).abs() < 0.5);
+    let l = layout("o", &TextStyle { h_scale: 2.0, v_scale: 0.5, ..base }, &ParagraphStyle::default());
+    assert_eq!((l.glyphs[0].h_scale, l.glyphs[0].v_scale), (2.0, 0.5));
+}
+
+#[test]
+fn indents_and_paragraph_spacing() {
+    let s = st(20.0);
+    let text = "first paragraph here\nsecond one";
+    let p0 = ParagraphStyle { width: Some(400.0), indent_start: 30.0, indent_first: 15.0, space_after: 10.0, ..Default::default() };
+    let p1 = ParagraphStyle { width: Some(400.0), indent_end: 50.0, align: Align::Right, space_before: 7.0, ..Default::default() };
+    let l = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p0.clone(), p1]);
+    assert!((l.lines[0].x - 45.0).abs() < 1e-3, "left + first-line indent: {}", l.lines[0].x);
+    assert!((l.lines[1].x + l.lines[1].width - 350.0).abs() < 0.5, "right indent: {}", l.lines[1].x + l.lines[1].width);
+    assert!((l.lines[1].baseline - l.lines[0].baseline - (24.0 + 10.0 + 7.0)).abs() < 1e-3);
+    assert_eq!((l.lines[0].para, l.lines[1].para), (0, 1));
+    assert!(l.lines[0].para_end && l.lines[1].para_end);
+    // Wrapped lines after the first don't get the first-line indent.
+    let long = "word ".repeat(30);
+    let l = layout_rich_uncached(&long, &[(0..long.len(), s.clone())], &[p0]);
+    assert!(l.lines.len() > 2);
+    assert!((l.lines[1].x - 30.0).abs() < 1e-3);
+    assert!(l.lines.iter().all(|ln| ln.x + ln.width <= 400.0 + 0.5));
+    assert!(!l.lines[0].para_end);
+    // Point text: a right-aligned paragraph's end indent moves it left of the origin.
+    let l = layout_rich_uncached("abc", &[(0..3, s)], &[ParagraphStyle { align: Align::Right, indent_end: 12.0, ..Default::default() }]);
+    assert!((l.lines[0].x + l.lines[0].width + 12.0).abs() < 1e-3);
+}
+
+#[test]
+fn justify_last_line_modes_and_every_line_composer() {
+    let text = "the quick brown fox jumps over the lazy dog and keeps running far";
+    let s = st(30.0);
+    let p = |last: Align| ParagraphStyle { width: Some(320.0), align: Align::Justify, justify_last: last, ..Default::default() };
+    let left = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Left)]);
+    let n = left.lines.len();
+    assert!(n >= 3);
+    assert!((left.lines[0].width - 320.0).abs() < 0.5);
+    assert!(left.lines[n - 1].width < 320.0 && left.lines[n - 1].x.abs() < 1e-3);
+    let center = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Center)]);
+    let lc = &center.lines[n - 1];
+    assert!((lc.x - (320.0 - lc.width) / 2.0).abs() < 0.5);
+    let right = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Right)]);
+    let lr = &right.lines[n - 1];
+    assert!((lr.x + lr.width - 320.0).abs() < 0.5);
+    let all = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p(Align::Justify)]);
+    assert!((all.lines[n - 1].width - 320.0).abs() < 0.5, "justify all stretches the last line");
+    // Every-line composer: never worse (summed squared slack) than greedy breaking.
+    let slack = |l: &Layout| -> f32 { l.lines[..l.lines.len() - 1].iter().map(|ln| (320.0 - ln.width).powi(2)).sum() };
+    let greedy = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[ParagraphStyle { width: Some(320.0), ..Default::default() }]);
+    let every = layout_rich_uncached(text, &[(0..text.len(), s)], &[ParagraphStyle { width: Some(320.0), every_line: true, ..Default::default() }]);
+    assert!(slack(&every) <= slack(&greedy) + 1e-3, "{} vs {}", slack(&every), slack(&greedy));
+    assert!(every.lines.iter().all(|ln| ln.width <= 320.0 + 0.5));
+}
+
+#[test]
+fn hanging_punctuation_overhangs_the_box() {
+    let s = st(40.0);
+    let text = "\"Hi.\"";
+    let p = ParagraphStyle { width: Some(400.0), hanging: true, ..Default::default() };
+    let l = layout_rich_uncached(text, &[(0..text.len(), s.clone())], &[p]);
+    assert!(l.lines[0].x < -1.0, "opening quote hangs left: {}", l.lines[0].x);
+    let r =
+        layout_rich_uncached(text, &[(0..text.len(), s)], &[ParagraphStyle { width: Some(400.0), hanging: true, align: Align::Right, ..Default::default() }]);
+    assert!(r.lines[0].x + r.lines[0].width > 401.0, "closing quote hangs right");
+}
+
+#[test]
+fn oversized_layout_requests_are_bounded_without_caching() {
+    let text = "a".repeat(MAX_LAYOUT_BYTES + 1);
+    let layout = layout(&text, &TextStyle::default(), &ParagraphStyle::default());
+    assert_eq!(layout.text_len, text.len());
+    assert!(layout.lines.is_empty() && layout.glyphs.is_empty());
+    assert!(layout_rich_uncached("ok", &[], &[]).lines.len() == 1);
+}
+
+#[test]
+fn rtl_paragraph_carets_run_right_to_left() {
+    let text = "\u{5d0}\u{5d1}\u{5d2}";
+    let l = layout_rich_uncached(text, &[(0..text.len(), st(40.0))], &[ParagraphStyle { rtl: Some(true), ..Default::default() }]);
+    let xs: Vec<f32> = l.lines[0].carets.iter().map(|c| c.1).collect();
+    assert_eq!(xs.len(), 4);
+    assert!(xs.windows(2).all(|w| w[1] < w[0]), "{xs:?}");
+    // Hit testing returns the logical position nearest the point.
+    assert_eq!(l.hit(xs[1] + 0.5, 0.0), 2);
+    assert_eq!(l.hit(xs[0] + 50.0, 0.0), 0);
+}
+
+/// #1563: text set in a named instance (`Black`) is laid out at the instance's axis values,
+/// as if they had been set as variations; axes set on the text itself keep their values.
+#[test]
+fn named_instance_sets_the_base_variations() {
+    const FAMILY: &str = "EffectCraft Layout Instance Test";
+    fonts::add_font_data(crate::sfnt::test_font::variable(FAMILY, &[("Light", 300.0, None), ("Black", 900.0, None)], true));
+    let st =
+        |style: &str, variations: Vec<(String, f32)>| TextStyle { family: FAMILY.into(), style: style.into(), size: 50.0, variations, ..Default::default() };
+    let coords = |l: &Layout| l.glyphs.iter().map(|g| crate::variable::coords(g.variations).to_vec()).collect::<Vec<_>>();
+    let black = layout_uncached("Hi", &st("Black", vec![]), &ParagraphStyle::default());
+    assert!(!black.glyphs.is_empty());
+    assert!(coords(&black).iter().all(|c| c == &[("wght".to_string(), 900.0)]), "{:?}", coords(&black));
+    let set = layout_uncached("Hi", &st("Black", vec![("wght".into(), 500.0)]), &ParagraphStyle::default());
+    assert!(coords(&set).iter().all(|c| c == &[("wght".to_string(), 500.0)]), "{:?}", coords(&set));
+    // A static family keeps no variations.
+    let inter = layout_uncached("Hi", &TextStyle::default(), &ParagraphStyle::default());
+    assert!(inter.glyphs.iter().all(|g| g.variations == 0));
+}
diff --git a/crates/text/src/lib.rs b/crates/text/src/lib.rs
index e8ba9d95c..35e7ecc06 100644
--- a/crates/text/src/lib.rs
+++ b/crates/text/src/lib.rs
@@ -25,6 +25,7 @@ use effectcraft_keyframe::{BaselineOption, CharStyle, Composer, Direction, Justi
 pub use fonts::{FaceId, Resolved, families, resolve};
 use kurbo::{Affine, BezPath, Point};
 pub use layout::{Align, Caps, Glyph, Layout, Line, ParagraphStyle, Script, TextStyle, layout as layout_text, layout_rich, measure};
+use selectors::BasedOn;
 use skrifa::instance::{LocationRef, Size};
 use skrifa::outline::{DrawSettings, OutlinePen};
 use skrifa::{GlyphId, MetadataProvider};
@@ -53,7 +54,7 @@ impl OutlinePen for Pen {
 pub(crate) fn outline_units(face: FaceId, gid: u32) -> Option<Arc<BezPath>> {
     static C: OnceLock<Mutex<HashMap<(FaceId, u32), Option<Arc<BezPath>>>>> = OnceLock::new();
     let c = C.get_or_init(Default::default);
-    if let Some(v) = c.lock().unwrap_or_else(|e| e.into_inner()).get(&(face, gid)) {
+    if let Some(v) = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(face, gid)) {
         return v.clone();
     }
     let f = fonts::face(face);
@@ -63,7 +64,7 @@ pub(crate) fn outline_units(face: FaceId, gid: u32) -> Option<Arc<BezPath>> {
         g.draw(DrawSettings::unhinted(Size::unscaled(), LocationRef::default()), &mut pen).ok()?;
         Some(Arc::new(pen.0))
     });
-    let mut m = c.lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 50_000 {
         m.clear();
     }
@@ -134,6 +135,8 @@ pub struct TextLayout {
     pub to_layer: Affine,
     /// Byte offset of every character, plus the text length.
     pub byte_of_char: Vec<usize>,
+    /// Whether each character is white space (for the selectors' Based On).
+    pub space_of_char: Vec<bool>,
     pub vertical: bool,
 }
 
@@ -262,6 +265,7 @@ pub fn layout_doc(doc: &TextDoc) -> TextLayout {
         }
         in_word = !space;
         word_of_char.push(words.saturating_sub(1));
+        out.space_of_char.push(space);
         nospace_of_char.push(nospace);
         if !space {
             nospace += 1;
@@ -415,6 +419,99 @@ impl TextLayout {
             None => (0, self.chars),
         }
     }
+    /// The number of selector units for Based On `based`.
+    pub fn units(&self, based: BasedOn) -> usize {
+        match based {
+            BasedOn::Characters => self.chars,
+            BasedOn::CharactersExcludingSpaces => self.chars_no_space,
+            BasedOn::Words => self.words,
+            BasedOn::Lines => self.lines,
+        }
+    }
+    /// Characters `a..b` of every selector unit, in order; words and Characters Excluding Spaces
+    /// leave the spaces out.
+    fn unit_spans(&self, based: BasedOn) -> Vec<(usize, usize)> {
+        let sp = |ci: usize| self.space_of_char.get(ci).copied().unwrap_or(false);
+        match based {
+            BasedOn::Characters => (0..self.chars).map(|ci| (ci, ci + 1)).collect(),
+            BasedOn::CharactersExcludingSpaces => (0..self.chars).filter(|&ci| !sp(ci)).map(|ci| (ci, ci + 1)).collect(),
+            BasedOn::Words => {
+                let (mut out, mut start) = (vec![], None);
+                for ci in 0..self.chars {
+                    match (sp(ci), start) {
+                        (false, None) => start = Some(ci),
+                        (true, Some(a)) => {
+                            out.push((a, ci));
+                            start = None;
+                        }
+                        _ => {}
+                    }
+                }
+                out.extend(start.map(|a| (a, self.chars)));
+                out
+            }
+            BasedOn::Lines => self.layout.lines.iter().map(|l| (self.char_of_byte(l.range.start), self.char_of_byte(self.layout.line_end(l)))).collect(),
+        }
+    }
+    /// The carets at the leading and trailing edges of the unit made of characters `a..b`: before
+    /// its first character, and after its last one when that is on the same line, else the line's
+    /// end. Carets rather than glyphs, so the edges also fall inside ligatures and follow
+    /// right-to-left runs.
+    fn unit_edges(&self, (a, b): (usize, usize)) -> Option<(usize, usize)> {
+        let li = self.line_of_char(a);
+        let trail = if self.line_of_char(b) == li { b } else { self.char_of_byte(self.layout.line_end(self.layout.lines.get(li)?)) };
+        Some((a, trail))
+    }
+    /// The caret at `ci` as (top, baseline, bottom) in layer space.
+    fn caret_points(&self, ci: usize) -> [Point; 3] {
+        let (top, bottom) = self.caret(ci);
+        let (x, base, _) = self.layout.caret(self.byte(ci));
+        [top, self.to_layer * Point::new(x as f64, base as f64), bottom]
+    }
+    /// A Range Selector bar at fraction `f` of the units (#1011): a caret-like segment as (top,
+    /// baseline, bottom) in layer space, between unit boundaries in proportion. None for empty or
+    /// vertical text.
+    pub fn range_bar(&self, based: BasedOn, f: f64) -> Option<[Point; 3]> {
+        let n = self.units(based);
+        if self.vertical || n == 0 || !f.is_finite() {
+            return None;
+        }
+        let x = f.clamp(0.0, 1.0) * n as f64;
+        let u = (x.floor() as usize).min(n - 1);
+        let t = x - u as f64;
+        let (a, z) = self.unit_edges(*self.unit_spans(based).get(u)?)?;
+        let (lead, trail) = (self.caret_points(a), self.caret_points(z));
+        Some([0, 1, 2].map(|k| lead[k].lerp(trail[k], t)))
+    }
+    /// The fraction of the units under a layer-space point, the inverse of [`Self::range_bar`]:
+    /// on the line whose baseline is nearest, the nearest place between unit edges.
+    pub fn range_fraction_at(&self, based: BasedOn, p: Point) -> Option<f64> {
+        let n = self.units(based);
+        if self.vertical || n == 0 {
+            return None;
+        }
+        let q = self.to_layer.inverse() * p;
+        let line = self.layout.lines.iter().enumerate().min_by(|a, b| (a.1.baseline as f64 - q.y).abs().total_cmp(&(b.1.baseline as f64 - q.y).abs()))?.0;
+        let spans = self.unit_spans(based);
+        let nearest = |on_line: bool| {
+            let mut best: Option<(f64, f64)> = None;
+            for (u, span) in spans.iter().enumerate() {
+                if on_line && self.line_of_char(span.0) != line {
+                    continue;
+                }
+                let Some((a, z)) = self.unit_edges(*span) else { continue };
+                let (x0, x1) = (self.caret(a).1.x, self.caret(z).1.x);
+                let t = if (x1 - x0).abs() > 1e-9 { ((p.x - x0) / (x1 - x0)).clamp(0.0, 1.0) } else { 0.0 };
+                let d = (x0 + (x1 - x0) * t - p.x).abs();
+                if best.is_none_or(|b| d < b.0) {
+                    best = Some((d, (u as f64 + t) / n as f64));
+                }
+            }
+            best.map(|b| b.1)
+        };
+        // (a line without units, such as an empty one, takes the nearest unit anywhere)
+        nearest(true).or_else(|| nearest(false))
+    }
     /// Selection highlight quads (layer space) for characters `a..b`.
     pub fn selection_quads(&self, a: usize, b: usize) -> Vec<[Point; 4]> {
         self.layout
@@ -634,4 +731,73 @@ mod tests {
         assert!(l.bounds[0] < -100.0 && l.bounds[2] > 100.0, "{:?}", l.bounds);
         assert!((l.bounds[0] + l.bounds[2]).abs() < 20.0);
     }
+
+    // #1011: a Range Selector's bars in the Composition viewer.
+    fn bar_x(l: &TextLayout, based: selectors::BasedOn, f: f64) -> f64 {
+        l.range_bar(based, f).unwrap()[2].x
+    }
+
+    fn doc(text: &str) -> TextLayout {
+        layout_doc(&TextDoc { text: text.into(), size: 40.0, ..Default::default() })
+    }
+
+    #[test]
+    fn range_bars_sit_on_unit_boundaries() {
+        use selectors::BasedOn::*;
+        let l = doc("abcd");
+        for (f, ci) in [(0.0, 0), (0.5, 2), (1.0, 4)] {
+            assert!((bar_x(&l, Characters, f) - l.caret(ci).1.x).abs() < 1e-6, "{f} at caret {ci}");
+        }
+        let mid = (l.caret(0).1.x + l.caret(1).1.x) / 2.0;
+        assert!((bar_x(&l, Characters, 0.125) - mid).abs() < 1e-6, "half way through the first character");
+        // Words and Characters Excluding Spaces skip the space.
+        let l = doc("ab cd");
+        assert!((bar_x(&l, Words, 0.5) - l.caret(3).1.x).abs() < 1e-6, "the second word starts at c");
+        assert!((bar_x(&l, Words, 0.25) - (l.caret(0).1.x + l.caret(2).1.x) / 2.0).abs() < 1e-6, "half of ab, no space");
+        assert!((bar_x(&l, CharactersExcludingSpaces, 0.5) - l.caret(3).1.x).abs() < 1e-6, "c is the third of four");
+        assert!(doc("").range_bar(Characters, 0.0).is_none());
+        let v = layout_doc(&TextDoc { text: "ab".into(), vertical: true, ..Default::default() });
+        assert!(v.range_bar(Characters, 0.0).is_none(), "vertical text has no bars");
+    }
+
+    #[test]
+    fn range_bars_on_the_right_line_ligatures_and_rtl() {
+        use selectors::BasedOn::*;
+        let l = doc("ab\rcd");
+        // 5 characters (the CR counts): 80% is the start of d, on the second line.
+        let [top, base, bottom] = l.range_bar(Characters, 0.8).unwrap();
+        assert_eq!((top, bottom), l.caret(4));
+        assert!(top.y < base.y && base.y < bottom.y && (base.y - bottom.y + l.layout.lines[1].descent as f64).abs() < 1e-6, "the baseline");
+        assert!(bottom.y > l.caret(0).1.y + 10.0, "below the first line");
+        let [top, _, bottom] = l.range_bar(Lines, 0.5).unwrap();
+        assert_eq!((top, bottom), l.caret(3), "the second line starts at c");
+        // Inside a ligature ("ffl") the bars still move character by character.
+        let l = doc("Offline");
+        let xs: Vec<f64> = [1.0, 2.0, 3.0, 4.0].iter().map(|k| bar_x(&l, Characters, k / 7.0)).collect();
+        assert!(xs.windows(2).all(|w| w[1] > w[0]), "{xs:?}");
+        // Right to left: Start is on the right of the first character.
+        let mut r = TextDoc { text: "\u{0645}\u{0631}\u{062D}\u{0628}\u{0627}".into(), size: 40.0, ..Default::default() };
+        r.direction = effectcraft_keyframe::text_doc::Direction::Rtl;
+        let r = layout_doc(&r);
+        assert!(bar_x(&r, Characters, 0.0) > bar_x(&r, Characters, 0.2) && bar_x(&r, Characters, 0.2) > bar_x(&r, Characters, 1.0));
+    }
+
+    #[test]
+    fn range_fraction_at_inverts_range_bar() {
+        use selectors::BasedOn::*;
+        // (Fractions off the CR, a unit with no width whose bar is the line's end.)
+        for (text, based) in [("ab\rcd", Characters), ("one two\rthree", Words), ("Offline", Characters)] {
+            let l = doc(text);
+            for f in [0.1, 0.3, 0.9] {
+                let [top, _, bottom] = l.range_bar(based, f).unwrap();
+                let p = Point::new(bottom.x, (top.y + bottom.y) / 2.0);
+                let back = l.range_fraction_at(based, p).unwrap();
+                assert!((back - f).abs() < 1e-6, "{text}: {f} → {back}");
+            }
+        }
+        // The nearest line by its baseline: far left of the second line is the start of c.
+        let l = doc("ab\rcd");
+        let base = l.caret(3).1.y - l.layout.lines[1].descent as f64;
+        assert!((l.range_fraction_at(Characters, Point::new(-500.0, base)).unwrap() - 0.6).abs() < 1e-6);
+    }
 }
diff --git a/crates/text/src/sfnt.rs b/crates/text/src/sfnt.rs
index ec9763bfa..a5e3907ce 100644
--- a/crates/text/src/sfnt.rs
+++ b/crates/text/src/sfnt.rs
@@ -22,6 +22,38 @@ pub struct FaceNames {
     /// A variable font: it has an `fvar` table with at least one axis (the font menu's
     /// Variable Fonts filter).
     pub variable: bool,
+    /// The named instances of a variable font (`fvar`): `Light`, `Black`, … with their axis
+    /// values, so a style name or an instance's PostScript name selects that design-space position.
+    pub instances: Vec<NamedInstance>,
+}
+
+/// One named instance of a variable font (an `fvar` instance record).
+#[derive(Clone, Debug, PartialEq)]
+pub struct NamedInstance {
+    /// The subfamily name (`Black`, `Bold Italic`).
+    pub style: String,
+    /// The instance's PostScript name (`Figtree-Black`): the one the font names, or else the one
+    /// Adobe Technical Note #5902 derives from the family's PostScript prefix and the style.
+    pub postscript: String,
+    /// Axis values in user units, one per axis, sorted by tag (the order `TextDoc` keeps).
+    pub coords: Vec<(String, f32)>,
+}
+
+impl NamedInstance {
+    /// The instance's weight class: the `wght` coordinate, or `fallback` without a weight axis.
+    pub fn weight(&self, fallback: u16) -> u16 {
+        self.coords.iter().find(|(t, _)| t == "wght").map_or(fallback, |(_, v)| v.round().clamp(1.0, 1000.0) as u16)
+    }
+
+    /// The instance is italic: its name says so, or its `ital` / `slnt` axis is off zero.
+    pub fn italic(&self, fallback: bool) -> bool {
+        let s = self.style.to_ascii_lowercase();
+        let axis = |tag: &str| self.coords.iter().find(|(t, _)| t == tag).map(|(_, v)| *v);
+        if s.contains("italic") || s.contains("oblique") || axis("ital").is_some_and(|v| v >= 0.5) || axis("slnt").is_some_and(|v| v != 0.0) {
+            return true;
+        }
+        fallback && axis("ital").is_none() && axis("slnt").is_none()
+    }
 }
 
 fn be16(b: &[u8], o: usize) -> Option<u16> {
@@ -99,7 +131,69 @@ fn read_face<R: Read + Seek>(r: &mut R, off: u64, index: u32) -> Option<FaceName
     italic |= sl.contains("italic") || sl.contains("oblique");
     // fvar header: version (4), axesArrayOffset (2), reserved (2), axisCount (2).
     let variable = fvar.filter(|(_, l)| *l >= 10).and_then(|(fo, _)| read_at(r, fo, 10)).and_then(|fb| be16(&fb, 8)).is_some_and(|axes| axes > 0);
-    Some(FaceNames { index, family, style, full_name, weight, italic, native_family, postscript, variable })
+    let instances = if variable {
+        let prefix = get(25).map(|p| ps_part(&p)).filter(|p| !p.is_empty()).unwrap_or_else(|| ps_part(&family));
+        fvar.and_then(|(fo, fl)| read_at(r, fo, fl)).map(|fb| named_instances(&fb, &nb, &prefix)).unwrap_or_default()
+    } else {
+        Vec::new()
+    };
+    Some(FaceNames { index, family, style, full_name, weight, italic, native_family, postscript, variable, instances })
+}
+
+/// Most named instances read from one face: real fonts have a few dozen at most, so this only
+/// bounds a hostile `instanceCount`.
+const MAX_INSTANCES: usize = 512;
+
+/// `s` with every character outside `A–Z a–z 0–9` removed (PostScript name parts, Adobe Technical
+/// Note #5902).
+fn ps_part(s: &str) -> String {
+    s.chars().filter(char::is_ascii_alphanumeric).collect()
+}
+
+/// The named instances of an `fvar` table (OpenType `fvar`: a 16-byte header, `axisCount` axis
+/// records of `axisSize` bytes, then `instanceCount` instance records of `instanceSize` bytes:
+/// subfamily name id, flags, one Fixed 16.16 coordinate per axis, and the PostScript name id when
+/// the record has room for it). Records that point outside the table or name no style are skipped.
+fn named_instances(fb: &[u8], nb: &[u8], ps_prefix: &str) -> Vec<NamedInstance> {
+    let (Some(axes_off), Some(axis_count), Some(axis_size), Some(count), Some(size)) = (be16(fb, 4), be16(fb, 8), be16(fb, 10), be16(fb, 12), be16(fb, 14))
+    else {
+        return Vec::new();
+    };
+    let (axes_off, axis_count, axis_size, size) = (axes_off as usize, axis_count as usize, axis_size as usize, size as usize);
+    if axis_count == 0 || axis_size < 20 || size < 4 + 4 * axis_count {
+        return Vec::new();
+    }
+    // Offsets in checked arithmetic: on 32-bit targets (wasm) the products of hostile 16-bit
+    // counts and sizes can overflow `usize`.
+    let at_of = |base: usize, i: usize, stride: usize| i.checked_mul(stride).and_then(|o| o.checked_add(base));
+    let tags: Option<Vec<String>> = (0..axis_count)
+        .map(|a| {
+            let at = at_of(axes_off, a, axis_size)?;
+            fb.get(at..at.checked_add(4)?).map(|t| String::from_utf8_lossy(t).trim_end().to_string())
+        })
+        .collect();
+    let (Some(tags), Some(first)) = (tags, at_of(axes_off, axis_count, axis_size)) else { return Vec::new() };
+    let mut out: Vec<NamedInstance> = Vec::new();
+    for i in 0..(count as usize).min(MAX_INSTANCES) {
+        let Some(rec) = at_of(first, i, size).and_then(|at| fb.get(at..at.checked_add(size)?)) else { break };
+        let Some(style) = be16(rec, 0).and_then(|id| name_string(nb, id)).map(|s| s.trim().to_string()) else { continue };
+        let coords: Option<Vec<(String, f32)>> =
+            tags.iter().enumerate().map(|(a, t)| be32(rec, 4 + 4 * a).map(|v| (t.clone(), v as i32 as f32 / 65536.0))).collect();
+        let Some(mut coords) = coords else { continue };
+        coords.sort_by(|a, b| a.0.cmp(&b.0));
+        let named_ps = (size >= 6 + 4 * axis_count)
+            .then(|| be16(rec, 4 + 4 * axis_count))
+            .flatten()
+            .filter(|&id| id != 0xFFFF)
+            .and_then(|id| name_string(nb, id))
+            .map(|s| s.trim().to_string())
+            .filter(|s| !s.is_empty());
+        let postscript = named_ps.unwrap_or_else(|| format!("{ps_prefix}-{}", ps_part(&style)));
+        if !out.iter().any(|o| o.style.eq_ignore_ascii_case(&style)) {
+            out.push(NamedInstance { style, postscript, coords });
+        }
+    }
+    out
 }
 
 /// A Windows Unicode name-table string by id in a language other than US English.
@@ -107,13 +201,21 @@ fn native_name(b: &[u8], id: u16) -> Option<String> {
     let count = be16(b, 2)? as usize;
     let storage = be16(b, 4)? as usize;
     for i in 0..count {
-        let r = 6 + i * 12;
-        let (plat, enc, lang, nid, len, off) =
-            (be16(b, r)?, be16(b, r + 2)?, be16(b, r + 4)?, be16(b, r + 6)?, be16(b, r + 8)? as usize, be16(b, r + 10)? as usize);
+        let r = 6usize.checked_add(i.checked_mul(12)?)?;
+        let (plat, enc, lang, nid, len, off) = (
+            be16(b, r)?,
+            be16(b, r.checked_add(2)?)?,
+            be16(b, r.checked_add(4)?)?,
+            be16(b, r.checked_add(6)?)?,
+            be16(b, r.checked_add(8)?)? as usize,
+            be16(b, r.checked_add(10)?)? as usize,
+        );
         if nid != id || plat != 3 || !(enc == 1 || enc == 10) || lang == 0x409 {
             continue;
         }
-        let raw = b.get(storage + off..storage + off + len)?;
+        let start = storage.checked_add(off)?;
+        let end = start.checked_add(len)?;
+        let raw = b.get(start..end)?;
         let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
         let s = String::from_utf16_lossy(&u);
         if !s.trim().is_empty() {
@@ -127,32 +229,101 @@ fn native_name(b: &[u8], id: u16) -> Option<String> {
 fn name_string(b: &[u8], id: u16) -> Option<String> {
     let count = be16(b, 2)? as usize;
     let storage = be16(b, 4)? as usize;
-    let mut best: Option<(u8, String)> = None;
+    let mut cands: Vec<(u8, u16, u16, &[u8])> = Vec::new();
     for i in 0..count {
-        let r = 6 + i * 12;
+        let r = 6usize.checked_add(i.checked_mul(12)?)?;
         let (plat, enc, lang, nid, len, off) =
             (be16(b, r)?, be16(b, r + 2)?, be16(b, r + 4)?, be16(b, r + 6)?, be16(b, r + 8)? as usize, be16(b, r + 10)? as usize);
         if nid != id {
             continue;
         }
-        let raw = b.get(storage + off..storage + off + len)?;
-        let (rank, s) = match plat {
+        let start = storage.checked_add(off)?;
+        let end = start.checked_add(len)?;
+        let raw = b.get(start..end)?;
+        let rank = match plat {
             3 if enc == 1 || enc == 10 => {
-                let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
-                (if lang == 0x409 { 0 } else { 1 }, String::from_utf16_lossy(&u))
+                if lang == 0x409 {
+                    0
+                } else {
+                    1
+                }
             }
-            0 => {
-                let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
-                (2, String::from_utf16_lossy(&u))
-            }
-            1 if enc == 0 => (3, raw.iter().map(|&c| if c < 128 { c as char } else { '?' }).collect()),
+            0 => 2,
+            1 if enc == 0 => 3,
             _ => continue,
         };
-        if best.as_ref().is_none_or(|(r0, _)| rank < *r0) {
-            best = Some((rank, s));
+        cands.push((rank, plat, enc, raw));
+    }
+    // Best rank first; a blank record falls through to the next. Decoding is lazy, so aliased
+    // records are not decoded once a usable one is found.
+    cands.sort_by_key(|c| c.0);
+    cands.into_iter().find_map(|(_, plat, enc, raw)| {
+        let s = match (plat, enc) {
+            (3, 1 | 10) | (0, _) => {
+                let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
+                String::from_utf16_lossy(&u)
+            }
+            (1, 0) => raw.iter().map(|&c| if c < 128 { c as char } else { '?' }).collect(),
+            _ => return None,
+        };
+        (!s.trim().is_empty()).then_some(s)
+    })
+}
+
+/// Synthetic font files for tests: just `name` and `fvar`, enough for the scan and the resolver.
+#[cfg(test)]
+pub(crate) mod test_font {
+    fn u16s(v: &[u16]) -> Vec<u8> {
+        v.iter().flat_map(|x| x.to_be_bytes()).collect()
+    }
+
+    /// A variable font of family `family` (name ids 1 and 2, style `Light`), one `wght` axis
+    /// 100..900 (default 300) and the named `instances` (style, `wght`, PostScript name), each
+    /// with its own name ids; `with_ps_ids` gives the instance records room for a PostScript name
+    /// id (names without one get 0xFFFF, "none").
+    pub(crate) fn variable(family: &str, instances: &[(&str, f32, Option<&str>)], with_ps_ids: bool) -> Vec<u8> {
+        let mut strings: Vec<(u16, String)> = vec![(1, family.into()), (2, "Light".into())];
+        let mut recs = Vec::new();
+        for (i, (style, w, ps)) in instances.iter().enumerate() {
+            let sid = 256 + 2 * i as u16;
+            strings.push((sid, (*style).into()));
+            let pid = ps.map(|p| {
+                strings.push((sid + 1, p.into()));
+                sid + 1
+            });
+            let mut r = u16s(&[sid, 0]);
+            r.extend(((w * 65536.0) as i32).to_be_bytes());
+            if with_ps_ids {
+                r.extend(pid.unwrap_or(0xFFFF).to_be_bytes());
+            }
+            recs.push(r);
         }
+        let enc: Vec<(u16, Vec<u8>)> = strings.iter().map(|(id, s)| (*id, s.encode_utf16().flat_map(|u| u.to_be_bytes()).collect())).collect();
+        let mut name = u16s(&[0, enc.len() as u16, 6 + 12 * enc.len() as u16]);
+        let mut off = 0;
+        for (id, st) in &enc {
+            name.extend(u16s(&[3, 1, 0x409, *id, st.len() as u16, off]));
+            off += st.len() as u16;
+        }
+        enc.iter().for_each(|(_, st)| name.extend(st));
+        let isize = if with_ps_ids { 10 } else { 8 };
+        let mut fvar = u16s(&[1, 0, 16, 2, 1, 20, instances.len() as u16, isize]);
+        // wght: min 100, default 300, max 900 (Fixed 16.16), flags 0, axis name id 256.
+        fvar.extend(b"wght".iter().copied().chain(u16s(&[100, 0, 300, 0, 900, 0, 0, 256])));
+        recs.iter().for_each(|r| fvar.extend(r));
+        let tables: [(&[u8; 4], Vec<u8>); 2] = [(b"fvar", fvar), (b"name", name)];
+        let mut out = u16s(&[1, 0, 2, 0, 0, 0]);
+        let mut body: Vec<u8> = vec![];
+        for (tag, data) in &tables {
+            out.extend(*tag);
+            out.extend([0u8; 4]);
+            out.extend(((12 + 32 + body.len()) as u32).to_be_bytes());
+            out.extend((data.len() as u32).to_be_bytes());
+            body.extend(data);
+        }
+        out.extend(body);
+        out
     }
-    best.map(|(_, s)| s).filter(|s| !s.trim().is_empty())
 }
 
 #[cfg(test)]
@@ -217,6 +388,28 @@ mod tests {
     /// The scan marks a face with an `fvar` table that declares axes as variable, reading only
     /// the table directory and the fvar header; a static font, an fvar without axes and a
     /// truncated fvar are not.
+    #[test]
+    fn name_table_offsets_are_checked_and_duplicate_records_do_not_repeat_decode() {
+        let valid = names_font("Name Bounds", None);
+        let mut invalid = valid.clone();
+        // name record storage offset near u16::MAX must be rejected rather than overflowing
+        // when combined with its length (the name table starts at byte 28 in this fixture).
+        invalid[28 + 6 + 10] = 0xFF;
+        invalid[28 + 6 + 11] = 0xFF;
+        assert!(read_faces_bytes(&invalid).is_empty());
+
+        // Repeated aliases for one id retain the same selected name and do not change the face.
+        let mut duplicated = valid;
+        let count = u16::from_be_bytes([duplicated[28 + 2], duplicated[28 + 3]]);
+        let first = duplicated[28 + 6..28 + 18].to_vec();
+        for i in 1..count as usize {
+            duplicated[28 + 6 + i * 12..28 + 18 + i * 12].copy_from_slice(&first);
+        }
+        let faces = read_faces_bytes(&duplicated);
+        assert_eq!(faces.len(), 1);
+        assert_eq!((faces[0].family.as_str(), faces[0].style.as_str()), ("Name Bounds", "Regular"));
+    }
+
     #[test]
     fn detects_variable_faces_from_fvar() {
         let v = read_faces_bytes(&names_font("Var Test", Some(Some(1))));
@@ -225,4 +418,45 @@ mod tests {
         assert!(!read_faces_bytes(&names_font("No Axes", Some(Some(0))))[0].variable);
         assert!(!read_faces_bytes(&names_font("Cut", Some(None)))[0].variable);
     }
+
+    /// #1563: the scan reads a variable font's named instances: the style name, the axis values
+    /// and the PostScript name the font gives it, or the one Adobe Technical Note #5902 derives
+    /// (family prefix, `-`, style without spaces) when it gives none.
+    #[test]
+    fn reads_named_instances_from_fvar() {
+        let f = read_faces_bytes(&test_font::variable(
+            "Fig Test",
+            &[("Light", 300.0, Some("FigTest-Light")), ("Semi Bold", 600.0, None), ("Black", 900.0, Some("FigTest-Black"))],
+            true,
+        ));
+        assert_eq!(f.len(), 1);
+        let i = &f[0].instances;
+        assert_eq!(i.iter().map(|x| x.style.as_str()).collect::<Vec<_>>(), ["Light", "Semi Bold", "Black"], "{i:?}");
+        assert_eq!(i[2].coords, vec![("wght".to_string(), 900.0)]);
+        assert_eq!(i[2].postscript, "FigTest-Black");
+        assert_eq!(i[1].postscript, "FigTest-SemiBold", "derived when the font names none");
+        assert_eq!((i[1].weight(400), i[1].italic(false)), (600, false));
+        // Instance records without the PostScript name id field.
+        let short = read_faces_bytes(&test_font::variable("Fig Test", &[("Black", 900.0, None)], false));
+        assert_eq!(short[0].instances[0].postscript, "FigTest-Black");
+        // A static font has none.
+        assert!(read_faces_bytes(crate::fonts::INTER_BOLD)[0].instances.is_empty());
+    }
+
+    /// Hostile `fvar` counts: records past the end of the table are dropped, never read out of
+    /// bounds, and a huge instance count is bounded.
+    #[test]
+    fn named_instances_survive_truncated_and_hostile_fvar() {
+        let mut data = test_font::variable("Cut Test", &[("Black", 900.0, None)], false);
+        // instanceCount (fvar offset 44 + 12) to 0xFFFF: only the one real record is read.
+        data[44 + 12] = 0xFF;
+        data[44 + 13] = 0xFF;
+        let f = read_faces_bytes(&data);
+        assert_eq!(f.len(), 1);
+        assert!(f[0].instances.len() <= 1, "{:?}", f[0].instances);
+        // An axis array offset past the table: no instances, but the face still scans.
+        data[44 + 4] = 0xFF;
+        let f = read_faces_bytes(&data);
+        assert!(f[0].variable && f[0].instances.is_empty(), "{:?}", f[0]);
+    }
 }
diff --git a/crates/text/src/variable.rs b/crates/text/src/variable.rs
index a673578e7..559343352 100644
--- a/crates/text/src/variable.rs
+++ b/crates/text/src/variable.rs
@@ -4,6 +4,19 @@
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex, OnceLock};
 
+/// Keep process-wide variation storage bounded; id 0 is the safe default location when full.
+const MAX_INTERNED_LOCATIONS: usize = 8192;
+const MAX_AXES_PER_LOCATION: usize = 32;
+const MAX_AXIS_TAG_BYTES: usize = 16;
+
+type CoordKey = Vec<(String, u32)>;
+
+#[derive(Default)]
+struct Table {
+    values: Vec<Arc<Vec<(String, f32)>>>,
+    by_coords: HashMap<CoordKey, u32>,
+}
+
 use kurbo::BezPath;
 use skrifa::instance::{LocationRef, Size};
 use skrifa::outline::DrawSettings;
@@ -14,15 +27,27 @@ use crate::{CharGlyph, Pen};
 
 /// Intern a set of axis values (0 for none), so `Copy` glyphs can carry them.
 pub fn intern(coords: &[(String, f32)]) -> u32 {
-    if coords.is_empty() {
+    if coords.is_empty() || coords.len() > MAX_AXES_PER_LOCATION || coords.iter().any(|(tag, v)| tag.len() > MAX_AXIS_TAG_BYTES || !v.is_finite()) {
         return 0;
     }
-    let mut t = table().lock().unwrap_or_else(|e| e.into_inner());
-    if let Some(i) = t.iter().position(|c| c.as_slice() == coords) {
-        return i as u32 + 1;
+    // Axis order is not significant. Canonicalize it once so equivalent locations share one key.
+    let mut key: CoordKey = coords.iter().map(|(tag, v)| (tag.clone(), if *v == 0.0 { 0 } else { v.to_bits() })).collect();
+    key.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+    if key.windows(2).any(|w| w[0].0 == w[1].0) {
+        return 0;
     }
-    t.push(Arc::new(coords.to_vec()));
-    t.len() as u32
+    let mut t = table().lock().unwrap_or_else(std::sync::PoisonError::into_inner);
+    if let Some(id) = t.by_coords.get(&key) {
+        return *id;
+    }
+    if t.values.len() >= MAX_INTERNED_LOCATIONS {
+        return 0;
+    }
+    let Some(id) = u32::try_from(t.values.len()).ok().and_then(|n| n.checked_add(1)) else { return 0 };
+    let value = Arc::new(key.iter().map(|(tag, bits)| (tag.clone(), f32::from_bits(*bits))).collect());
+    t.values.push(value);
+    t.by_coords.insert(key, id);
+    id
 }
 
 /// The axis values of an interned id (empty for 0).
@@ -30,11 +55,11 @@ pub fn coords(id: u32) -> Arc<Vec<(String, f32)>> {
     if id == 0 {
         return Arc::new(Vec::new());
     }
-    table().lock().unwrap_or_else(|e| e.into_inner()).get(id as usize - 1).cloned().unwrap_or_default()
+    table().lock().unwrap_or_else(std::sync::PoisonError::into_inner).values.get(id as usize - 1).cloned().unwrap_or_default()
 }
 
-fn table() -> &'static Mutex<Vec<Arc<Vec<(String, f32)>>>> {
-    static T: OnceLock<Mutex<Vec<Arc<Vec<(String, f32)>>>>> = OnceLock::new();
+fn table() -> &'static Mutex<Table> {
+    static T: OnceLock<Mutex<Table>> = OnceLock::new();
     T.get_or_init(Default::default)
 }
 
@@ -84,7 +109,7 @@ pub fn outline_units_at(face: FaceId, gid: u32, coords: &[(String, f32)]) -> Opt
     let c = C.get_or_init(Default::default);
     // Quantise to 1/100 of a unit so animation frames reuse outlines.
     let key: Key = (face, gid, coords.iter().map(|(t, v)| (t.clone(), (v * 100.0).round() as i32)).collect());
-    if let Some(v) = c.lock().unwrap_or_else(|e| e.into_inner()).get(&key) {
+    if let Some(v) = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&key) {
         return v.clone();
     }
     let f = fonts::face(face);
@@ -95,7 +120,7 @@ pub fn outline_units_at(face: FaceId, gid: u32, coords: &[(String, f32)]) -> Opt
         g.draw(DrawSettings::unhinted(Size::unscaled(), LocationRef::from(&loc)), &mut pen).ok()?;
         Some(Arc::new(pen.0))
     });
-    let mut m = c.lock().unwrap_or_else(|e| e.into_inner());
+    let mut m = c.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
     if m.len() > 20_000 {
         m.clear();
     }
@@ -154,11 +179,15 @@ pub fn char_advance_delta(g: &CharGlyph, deltas: &[(String, f32)]) -> Option<f64
     Some((varied - own) as f64 * sx)
 }
 
-/// The first installed face with variation axes (system fonts are scanned), for tests and
-/// demos: (face, its axes).
+/// The first installed face with variation axes and Latin glyphs (system fonts are scanned), for
+/// tests and demos: (face, its axes). Faces without an `H` or `A` (the name-and-`fvar`-only
+/// fonts tests add) are skipped.
 pub fn find_variable_face() -> Option<(FaceId, Vec<FontAxis>)> {
     fonts::scan_system();
-    (0..fonts::all_faces().len()).map(|f| (f, font_axes(f))).find(|(_, a)| a.iter().any(|x| x.max > x.min))
+    (0..fonts::all_faces().len())
+        .filter(|&f| fonts::face(f).glyph('H').or_else(|| fonts::face(f).glyph('A')).is_some())
+        .map(|f| (f, font_axes(f)))
+        .find(|(_, a)| a.iter().any(|x| x.max > x.min))
 }
 
 #[cfg(test)]
@@ -193,6 +222,9 @@ mod tests {
         let id = intern(&[("wght".into(), 700.0)]);
         assert_eq!(intern(&[("wght".into(), 700.0)]), id);
         assert_eq!(coords(id).as_slice(), &[("wght".to_string(), 700.0)]);
+        assert_eq!(intern(&[("wdth".into(), 20.0), ("wght".into(), 700.0)]), intern(&[("wght".into(), 700.0), ("wdth".into(), 20.0)]));
+        assert_eq!(intern(&[("wght".into(), f32::NAN)]), 0);
+        assert_eq!(intern(&vec![("wght".into(), 1.0); MAX_AXES_PER_LOCATION + 1]), 0);
         let Some((face, axes)) = find_variable_face() else {
             eprintln!("no variable font installed: skipped");
             return;
diff --git a/crates/text/tests/it/main.rs b/crates/text/tests/it/main.rs
new file mode 100644
index 000000000..c22600d8b
--- /dev/null
+++ b/crates/text/tests/it/main.rs
@@ -0,0 +1,5 @@
+//! The crate's shared integration-test binary (each module is a former `tests/<name>.rs`).
+//! `system_font_menu` is separate: it asserts that no system font scan has run in its process.
+
+mod script_fallback;
+mod vertical_punctuation;
diff --git a/crates/text/tests/script_fallback.rs b/crates/text/tests/it/script_fallback.rs
similarity index 100%
rename from crates/text/tests/script_fallback.rs
rename to crates/text/tests/it/script_fallback.rs
diff --git a/crates/text/tests/vertical_punctuation.rs b/crates/text/tests/it/vertical_punctuation.rs
similarity index 100%
rename from crates/text/tests/vertical_punctuation.rs
rename to crates/text/tests/it/vertical_punctuation.rs
diff --git a/crates/time/src/lib.rs b/crates/time/src/lib.rs
index f56971563..7a64a82bb 100644
--- a/crates/time/src/lib.rs
+++ b/crates/time/src/lib.rs
@@ -381,9 +381,11 @@ pub fn format_time(t: Tick, rate: FrameRate, drop_frame: bool, display: TimeDisp
             format!("{}{}+{:02}", if neg { "-" } else { "" }, a / per_ft, a % per_ft)
         }
         TimeDisplay::AudioSamples => {
-            let secs = t.0.div_euclid(TICKS_PER_SECOND);
-            let rem = Tick(t.0.rem_euclid(TICKS_PER_SECOND)).to_units_floor(sample_rate);
-            format!("{:02}:{:02}:{:02}:{rem:05}", secs / 3600, (secs / 60) % 60, secs % 60)
+            let sign = if t.0 < 0 { "-" } else { "" };
+            let abs = t.0.saturating_abs();
+            let secs = abs.div_euclid(TICKS_PER_SECOND);
+            let rem = Tick(abs.rem_euclid(TICKS_PER_SECOND)).to_units_floor(sample_rate);
+            format!("{sign}{:02}:{:02}:{:02}:{rem:05}", secs / 3600, (secs / 60) % 60, secs % 60)
         }
         TimeDisplay::Seconds => format!("{:.3}", t.seconds()),
     }
@@ -701,6 +703,14 @@ mod tests {
         assert_eq!(format_time(Tick::from_units(48_001, 48_000), r, false, TimeDisplay::AudioSamples, 48000), "00:00:01:00001");
     }
 
+    #[test]
+    fn neg_samples() {
+        let r = FrameRate::FPS_30;
+        let fmt = |s: f64| format_time(Tick::from_seconds_f64(s), r, false, TimeDisplay::AudioSamples, 48000);
+        assert_eq!(fmt(-0.5), "-00:00:00:24000");
+        assert_eq!(fmt(-3700.0), "-01:01:40:00000");
+    }
+
     #[test]
     fn rational_conversions() {
         // 90 kHz MPEG timebase
diff --git a/crates/track/src/camtrack/mod.rs b/crates/track/src/camtrack.rs
similarity index 90%
rename from crates/track/src/camtrack/mod.rs
rename to crates/track/src/camtrack.rs
index e8cd28da8..ea4f89a3f 100644
--- a/crates/track/src/camtrack/mod.rs
+++ b/crates/track/src/camtrack.rs
@@ -67,8 +67,9 @@ pub struct Track2D {
 }
 
 impl Track2D {
+    /// Exclusive end frame, saturated when the track exceeds the frame index range.
     pub fn end(&self) -> u32 {
-        self.start + self.pts.len() as u32
+        u32::try_from(self.pts.len()).ok().and_then(|n| self.start.checked_add(n)).unwrap_or(u32::MAX)
     }
     /// Position on frame `k` when the track covers it.
     pub fn at(&self, k: u32) -> Option<[f64; 2]> {
@@ -483,3 +484,52 @@ pub fn point_color(id: u32) -> [f32; 3] {
     // Bright, slightly desaturated.
     [0.25 + 0.75 * r, 0.25 + 0.75 * g, 0.25 + 0.75 * b]
 }
+
+#[cfg(test)]
+mod validation_tests {
+    use super::*;
+
+    fn tracks() -> CameraTracks {
+        CameraTracks { size: [1920.0, 1080.0], factor: 1.0, frame_duration: 1.0 / 30.0, frames: 3, ..Default::default() }
+    }
+
+    #[test]
+    fn track_end_saturates_instead_of_wrapping() {
+        assert_eq!(Track2D { start: u32::MAX, pts: vec![[0.0; 2]], ..Default::default() }.end(), u32::MAX);
+        assert_eq!(Track2D { start: 3, pts: vec![[0.0; 2]; 2], ..Default::default() }.end(), 5);
+    }
+
+    #[test]
+    fn solve_rejects_large_frame_count_before_allocating() {
+        let t = CameraTracks { frames: u32::MAX, ..tracks() };
+        let error = solve(&t, &SolveSettings::default(), None).unwrap_err();
+        assert!(error.0.contains("frame or track count"));
+    }
+
+    #[test]
+    fn solve_rejects_overflowing_and_out_of_clip_tracks() {
+        for start in [u32::MAX, 2] {
+            let t = CameraTracks { tracks: vec![Track2D { start, pts: vec![[0.0; 2]; 3], ..Default::default() }], ..tracks() };
+            let error = solve(&t, &SolveSettings::default(), None).unwrap_err();
+            assert!(error.0.contains("frame range"));
+        }
+    }
+
+    #[test]
+    fn solve_rejects_non_finite_track_positions() {
+        let t = CameraTracks { tracks: vec![Track2D { pts: vec![[f32::NAN, 0.0]; 3], ..Default::default() }], ..tracks() };
+        let error = solve(&t, &SolveSettings::default(), None).unwrap_err();
+        assert!(error.0.contains("finite"));
+    }
+
+    #[test]
+    fn solve_rejects_invalid_dimensions_timing_and_scale() {
+        for t in [
+            CameraTracks { size: [f64::NAN, 1080.0], ..tracks() },
+            CameraTracks { frame_duration: 0.0, ..tracks() },
+            CameraTracks { factor: f64::INFINITY, ..tracks() },
+        ] {
+            assert!(solve(&t, &SolveSettings::default(), None).is_err());
+        }
+    }
+}
diff --git a/crates/track/src/camtrack/bundle.rs b/crates/track/src/camtrack/bundle.rs
index 077f04b71..e03341d14 100644
--- a/crates/track/src/camtrack/bundle.rs
+++ b/crates/track/src/camtrack/bundle.rs
@@ -10,9 +10,9 @@
 
 use rayon::prelude::*;
 
-use super::Distortion;
 use super::geometry::Pose;
-use super::linalg::*;
+use super::linalg::{M3, V3, add, cholesky_solve, dot, inv3, mm, mtv, mv, rodrigues, scale, skew, sub};
+use super::{Distortion, SolveError};
 
 /// A camera in the adjustment.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -52,6 +52,7 @@ pub struct BaOpts {
     pub fixed: Vec<bool>,
     /// Huber threshold (pixels).
     pub huber: f64,
+    /// Maximum LM iterations (at most 1000).
     pub max_iter: usize,
     /// Adjust the shared radial distortion `(k1, k2)` too.
     pub distortion: bool,
@@ -76,21 +77,89 @@ fn huber(e2: f64, k: f64) -> f64 {
     if e2 <= k * k { e2 } else { 2.0 * k * e2.sqrt() - k * k }
 }
 
-/// Residual (pixels) of one observation, `None` behind the camera.
+// Bound the temporary systems before any input-sized allocation. Includes dense matrices
+// for the main system, trial copies and both Rayon phases, plus per-point/observation data.
+const MAX_BA_BYTES: usize = 256 * 1024 * 1024;
+const MAX_BA_CAMERAS: usize = 4096;
+const MAX_BA_POINTS: usize = 200_000;
+const MAX_BA_OBSERVATIONS: usize = 1_000_000;
+
+fn valid_camera(c: &BaCam) -> bool {
+    c.f.is_finite()
+        && c.f > 0.0
+        && c.pose.r.iter().flatten().chain(&c.pose.c).all(|v| v.is_finite())
+        && [c.dist.k1, c.dist.k2, c.dist.radius].iter().all(|v| v.is_finite())
+}
+
+fn validate(cams: &[BaCam], pts: &[V3], obs: &[BaObs], o: &BaOpts) -> Result<(), SolveError> {
+    if cams.len() > MAX_BA_CAMERAS || pts.len() > MAX_BA_POINTS || obs.len() > MAX_BA_OBSERVATIONS {
+        return Err(SolveError("bundle adjustment input exceeds the supported size".into()));
+    }
+    if !o.huber.is_finite() || o.huber <= 0.0 || o.max_iter > 1000 || matches!(o.focal, FocalMode::PerCamera(k) if !k.is_finite() || k < 0.0) {
+        return Err(SolveError("invalid bundle adjustment options".into()));
+    }
+    if cams.iter().any(|c| !valid_camera(c)) || pts.iter().flatten().any(|v| !v.is_finite()) {
+        return Err(SolveError("bundle adjustment cameras and points must be finite, with positive focal lengths".into()));
+    }
+    for ob in obs {
+        if cams.get(ob.cam as usize).is_none() || pts.get(ob.pt as usize).is_none() {
+            return Err(SolveError("bundle adjustment observation index is out of range".into()));
+        }
+        if ob.uv.iter().any(|v| !v.is_finite()) {
+            return Err(SolveError("bundle adjustment observations must be finite".into()));
+        }
+    }
+    Ok(())
+}
+
+fn matrix_len(n: usize, npts: usize, nobs: usize) -> Result<usize, SolveError> {
+    let threads = rayon::current_num_threads();
+    let build_workers = if n <= 700 && npts > 64 { threads.clamp(1, 16) } else { 0 };
+    let schur_workers = if n <= 1200 && npts >= 64 && threads > 1 { threads.clamp(1, 8) } else { 0 };
+    // The two worker phases do not coexist; allow the larger phase plus main/trial buffers.
+    let copies = 4 + build_workers.max(schur_workers);
+    let len = n.checked_mul(n);
+    let bytes = len
+        .and_then(|v| v.checked_add(n))
+        .and_then(|v| v.checked_mul(size_of::<f64>()))
+        .and_then(|v| v.checked_mul(copies))
+        .and_then(|v| npts.checked_mul(320).and_then(|p| v.checked_add(p)))
+        .and_then(|v| nobs.checked_mul(2 * 9 * size_of::<(usize, V3)>() + size_of::<BaObs>() + 2 * size_of::<u32>()).and_then(|p| v.checked_add(p)));
+    match (len, bytes) {
+        (Some(len), Some(bytes)) if bytes <= MAX_BA_BYTES => Ok(len),
+        _ => Err(SolveError("bundle adjustment exceeds its 256 MiB workspace budget; use fewer cameras or observations".into())),
+    }
+}
+
+/// Residual (pixels), or `None` for an invalid or behind-camera projection.
 pub fn residual(c: &BaCam, x: V3, uv: [f64; 2]) -> Option<[f64; 2]> {
+    if !valid_camera(c) || x.iter().chain(&uv).any(|v| !v.is_finite()) {
+        return None;
+    }
+    project_residual(c, x, uv)
+}
+
+fn project_residual(c: &BaCam, x: V3, uv: [f64; 2]) -> Option<[f64; 2]> {
     let p = c.pose.to_cam(x);
-    if p[2] <= 1e-9 {
+    if p[2] <= 1e-9 || p.iter().any(|v| !v.is_finite()) {
         return None;
     }
     let q = c.dist.distort([c.f * p[0] / p[2], c.f * p[1] / p[2]]);
-    Some([q[0] - uv[0], q[1] - uv[1]])
+    let r = [q[0] - uv[0], q[1] - uv[1]];
+    r.iter().all(|v| v.is_finite()).then_some(r)
 }
 
-/// Total robust cost.
-pub fn cost(cams: &[BaCam], pts: &[V3], obs: &[BaObs], o: &BaOpts) -> f64 {
+/// Total robust cost. Rejects invalid inputs before starting parallel evaluation.
+pub fn cost(cams: &[BaCam], pts: &[V3], obs: &[BaObs], o: &BaOpts) -> Result<f64, SolveError> {
+    validate(cams, pts, obs, o)?;
+    let c = validated_cost(cams, pts, obs, o);
+    if c.is_finite() { Ok(c) } else { Err(SolveError("bundle adjustment cost is not finite".into())) }
+}
+
+fn validated_cost(cams: &[BaCam], pts: &[V3], obs: &[BaObs], o: &BaOpts) -> f64 {
     let c: f64 = obs
         .par_iter()
-        .map(|ob| match residual(&cams[ob.cam as usize], pts[ob.pt as usize], ob.uv) {
+        .map(|ob| match cams.get(ob.cam as usize).zip(pts.get(ob.pt as usize)).and_then(|(c, x)| project_residual(c, *x, ob.uv)) {
             Some(r) => huber(r[0] * r[0] + r[1] * r[1], o.huber),
             None => BEHIND,
         })
@@ -174,16 +243,45 @@ fn cam_jac(l: &Layout, ci: usize, c: &BaCam, xc: V3, a: &[[f64; 3]; 2], p: [f64;
     }
 }
 
+/// Smooth per-camera log focal lengths in the normal equations.
+fn add_focal_prior(cams: &[BaCam], o: &BaOpts, l: &Layout, s_mat: &mut [f64], bc: &mut [f64]) {
+    let n = l.n;
+    // Focal prior.
+    if let FocalMode::PerCamera(k) = o.focal {
+        for i in 0..cams.len().saturating_sub(1) {
+            let r = k * (cams[i].f.ln() - cams[i + 1].f.ln());
+            let (a, b) = (l.fidx[i], l.fidx[i + 1]);
+            let ia = (a != usize::MAX).then_some(a);
+            let ib = (b != usize::MAX).then_some(b);
+            for (idx, g) in [(ia, k), (ib, -k)] {
+                let Some(x) = idx else { continue };
+                bc[x] -= g * r;
+                for (idy, h) in [(ia, k), (ib, -k)] {
+                    if let Some(y) = idy {
+                        s_mat[x * n + y] += g * h;
+                    }
+                }
+            }
+        }
+    }
+}
+
 /// Run Levenberg–Marquardt. `cams` and `pts` are updated in place.
-pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) -> BaReport {
+/// Invalid inputs or workspaces exceeding 256 MiB return an error before mutation.
+pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) -> Result<BaReport, SolveError> {
+    validate(cams, pts, obs, o)?;
     let l = layout(cams.len(), o);
+    let matrix_len = matrix_len(l.n, pts.len(), obs.len())?;
     let npts = pts.len();
     // Observations by point.
     let mut by_pt: Vec<Vec<u32>> = vec![vec![]; npts];
     for (i, ob) in obs.iter().enumerate() {
         by_pt[ob.pt as usize].push(i as u32);
     }
-    let mut cur = cost(cams, pts, obs, o);
+    let mut cur = validated_cost(cams, pts, obs, o);
+    if !cur.is_finite() {
+        return Err(SolveError("bundle adjustment cost is not finite".into()));
+    }
     let initial = cur;
     let t0 = web_time::Instant::now();
     let mut tries = 0usize;
@@ -191,7 +289,7 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
     let mut lambda = 1e-4;
     let mut iters = 0;
     if l.n == 0 && o.fix_points {
-        return BaReport { initial_cost: initial, cost: cur, iterations: 0 };
+        return Ok(BaReport { initial_cost: initial, cost: cur, iterations: 0 });
     }
     let n = l.n;
     let parallel = n <= 700;
@@ -274,12 +372,12 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
             let parts: Vec<(Vec<f64>, Vec<f64>, Vec<PtSys>)> = (0..chunks)
                 .into_par_iter()
                 .map(|t| {
-                    let (mut s, mut b) = (vec![0.0; n * n], vec![0.0; n]);
+                    let (mut s, mut b) = (vec![0.0; matrix_len], vec![0.0; n]);
                     let v = (t * per..((t + 1) * per).min(npts)).map(|j| build_point(j, &mut s, &mut b)).collect();
                     (s, b, v)
                 })
                 .collect();
-            let mut s = vec![0.0; n * n];
+            let mut s = vec![0.0; matrix_len];
             let mut b = vec![0.0; n];
             let mut sys = Vec::with_capacity(npts);
             for (ps, pb, pv) in parts {
@@ -293,29 +391,12 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
             }
             (s, b, sys)
         } else {
-            let mut s = vec![0.0; n * n];
+            let mut s = vec![0.0; matrix_len];
             let mut b = vec![0.0; n];
             let sys = (0..npts).map(|j| build_point(j, &mut s, &mut b)).collect();
             (s, b, sys)
         };
-        // Focal prior.
-        if let FocalMode::PerCamera(k) = o.focal {
-            for i in 0..cams.len().saturating_sub(1) {
-                let r = k * (cams[i].f.ln() - cams[i + 1].f.ln());
-                let (a, b) = (l.fidx[i], l.fidx[i + 1]);
-                let ia = (a != usize::MAX).then_some(a);
-                let ib = (b != usize::MAX).then_some(b);
-                for (idx, g) in [(ia, k), (ib, -k)] {
-                    let Some(x) = idx else { continue };
-                    bc[x] -= g * r;
-                    for (idy, h) in [(ia, k), (ib, -k)] {
-                        if let Some(y) = idy {
-                            s_mat[x * n + y] += g * h;
-                        }
-                    }
-                }
-            }
-        }
+        add_focal_prior(cams, o, &l, &mut s_mat, &mut bc);
         let base_s = s_mat.clone();
         let base_bc = bc.clone();
         let mean_diag = ((0..n).map(|i| base_s[i * n + i]).sum::<f64>() / n.max(1) as f64).max(1e-12);
@@ -370,7 +451,7 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
                     let parts: Vec<(Vec<f64>, Vec<f64>)> = (0..chunks)
                         .into_par_iter()
                         .map(|t| {
-                            let (mut ds, mut dr) = (vec![0.0; n * n], vec![0.0; n]);
+                            let (mut ds, mut dr) = (vec![0.0; matrix_len], vec![0.0; n]);
                             reduce(t * per..((t + 1) * per).min(npts), &mut ds, &mut dr);
                             (ds, dr)
                         })
@@ -424,7 +505,11 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
                     *x = add(*x, mv(vi, b));
                 });
             }
-            let c2 = cost(&nc, &np, obs, o);
+            if nc.iter().any(|c| !valid_camera(c)) || np.iter().flatten().any(|v| !v.is_finite()) {
+                lambda *= 4.0;
+                continue;
+            }
+            let c2 = validated_cost(&nc, &np, obs, o);
             if c2.is_finite() && c2 < cur {
                 cams.copy_from_slice(&nc);
                 pts.copy_from_slice(&np);
@@ -443,7 +528,7 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
                             t0.elapsed().as_secs_f64()
                         );
                     }
-                    return BaReport { initial_cost: initial, cost: cur, iterations: iters };
+                    return Ok(BaReport { initial_cost: initial, cost: cur, iterations: iters });
                 }
                 break;
             }
@@ -456,7 +541,7 @@ pub fn adjust(cams: &mut [BaCam], pts: &mut [V3], obs: &[BaObs], o: &BaOpts) ->
     if dbg {
         eprintln!("ba n={} pts={} obs={} iters={iters} tries={tries} {:.2}s cost {initial:.1} -> {cur:.1}", l.n, npts, obs.len(), t0.elapsed().as_secs_f64());
     }
-    BaReport { initial_cost: initial, cost: cur, iterations: iters }
+    Ok(BaReport { initial_cost: initial, cost: cur, iterations: iters })
 }
 
 #[cfg(test)]
@@ -464,6 +549,75 @@ mod tests {
     use super::*;
     use crate::camtrack::geometry::Rng;
 
+    fn test_camera() -> BaCam {
+        BaCam { pose: Pose::IDENTITY, f: 900.0, dist: Distortion::NONE }
+    }
+
+    #[test]
+    fn cost_rejects_invalid_observation_indices() {
+        for (cam, pt) in [(1, 0), (0, 1)] {
+            let obs = [BaObs { cam, pt, uv: [0.0; 2] }];
+            assert!(cost(&[test_camera()], &[[0.0, 0.0, 5.0]], &obs, &BaOpts::default()).is_err());
+        }
+    }
+
+    #[test]
+    fn adjust_rejects_invalid_observation_without_mutating_inputs() {
+        for (cam, pt) in [(1, 0), (0, 1)] {
+            let mut cams = [test_camera()];
+            let mut pts = [[0.0, 0.0, 5.0]];
+            let before = (cams, pts);
+            let obs = [BaObs { cam, pt, uv: [0.0; 2] }];
+            assert!(adjust(&mut cams, &mut pts, &obs, &BaOpts::default()).is_err());
+            assert_eq!((cams, pts), before);
+        }
+    }
+
+    #[test]
+    fn residual_rejects_non_finite_inputs_and_projection_overflow() {
+        let cam = test_camera();
+        assert!(residual(&cam, [0.0, 0.0, f64::NAN], [0.0; 2]).is_none());
+        assert!(residual(&cam, [0.0, 0.0, 5.0], [f64::INFINITY, 0.0]).is_none());
+        for bad in [
+            BaCam { f: f64::NAN, ..cam },
+            BaCam { dist: Distortion { k1: f64::INFINITY, ..Distortion::NONE }, ..cam },
+            BaCam { pose: Pose { c: [f64::NAN; 3], ..Pose::IDENTITY }, ..cam },
+            BaCam { pose: Pose { r: [[f64::INFINITY; 3]; 3], ..Pose::IDENTITY }, ..cam },
+        ] {
+            assert!(residual(&bad, [0.0, 0.0, 5.0], [0.0; 2]).is_none());
+        }
+        assert!(residual(&cam, [f64::MAX, 0.0, 1.0], [0.0; 2]).is_none());
+    }
+
+    #[test]
+    fn adjustment_rejects_non_finite_points_observations_and_options() {
+        let cam = test_camera();
+        let pts = [[0.0, 0.0, 5.0]];
+        let obs = [BaObs { cam: 0, pt: 0, uv: [0.0; 2] }];
+        assert!(cost(&[cam], &[[f64::NAN, 0.0, 5.0]], &obs, &BaOpts::default()).is_err());
+        assert!(cost(&[cam], &pts, &[BaObs { uv: [f64::NAN; 2], ..obs[0] }], &BaOpts::default()).is_err());
+        for opts in [
+            BaOpts { huber: f64::NAN, ..Default::default() },
+            BaOpts { huber: 0.0, ..Default::default() },
+            BaOpts { focal: FocalMode::PerCamera(f64::INFINITY), ..Default::default() },
+            BaOpts { max_iter: usize::MAX, ..Default::default() },
+        ] {
+            let mut trial_pts = pts;
+            assert!(adjust(&mut [cam], &mut trial_pts, &obs, &opts).is_err());
+        }
+    }
+
+    #[test]
+    fn matrix_workspace_is_checked_and_bounded_before_allocation() {
+        assert!(matrix_len(usize::MAX, 0, 0).is_err());
+        assert!(matrix_len(1, usize::MAX, 0).is_err());
+        assert!(matrix_len(1, 0, usize::MAX).is_err());
+        let mut cams = vec![test_camera(); 1000];
+        assert!(adjust(&mut cams, &mut [], &[], &BaOpts::default()).is_err());
+        assert!(matrix_len(6, 1000, 1000).is_ok());
+        assert!(matrix_len(955, 900, 160 * 900).is_ok());
+    }
+
     #[test]
     fn bundle_adjustment_converges_from_noise() {
         let mut rng = Rng(99);
@@ -493,7 +647,7 @@ mod tests {
         let mut fixed = vec![false; 6];
         fixed[0] = true;
         fixed[1] = true;
-        let rep = adjust(&mut cams, &mut pts, &obs, &BaOpts { fixed, max_iter: 50, ..Default::default() });
+        let rep = adjust(&mut cams, &mut pts, &obs, &BaOpts { fixed, max_iter: 50, ..Default::default() }).unwrap();
         let rms = (rep.cost / obs.len() as f64).sqrt();
         assert!(rms < 1e-4, "{rep:?}");
     }
diff --git a/crates/track/src/camtrack/geometry.rs b/crates/track/src/camtrack/geometry.rs
index 6956ac2b5..cc633a9c6 100644
--- a/crates/track/src/camtrack/geometry.rs
+++ b/crates/track/src/camtrack/geometry.rs
@@ -5,7 +5,10 @@
 //! All image points here are **normalised** (calibrated) coordinates `x = (u − c) / f`.
 //! A camera is `(R, C)` with `X_cam = R (X − C)`.
 
-use super::linalg::*;
+use super::linalg::{
+    I3, M3, V3, add, col, cross, det3, dot, from_cols, madd, mm, mscale, mt, mtv, mv, nearest_rotation, normalize, null_vector, outer, scale, sub, svd3,
+    sym_eigen,
+};
 
 /// A deterministic xorshift generator for RANSAC samples.
 pub struct Rng(pub u64);
@@ -244,6 +247,9 @@ pub fn reproj2(pose: &Pose, x: V3, o: [f64; 2]) -> Option<f64> {
 /// Pick the essential decomposition with the most points in front of both cameras; returns
 /// the second camera (the first is the identity) and that count.
 pub fn select_pose(cands: &[(M3, V3)], x1: &[[f64; 2]], x2: &[[f64; 2]]) -> Option<(Pose, usize)> {
+    if x1.len() != x2.len() || x1.is_empty() || x1.iter().chain(x2).flatten().any(|v| !v.is_finite()) {
+        return None;
+    }
     let mut best: Option<(Pose, usize)> = None;
     for (r, t) in cands {
         let p2 = Pose::from_rt(*r, *t);
@@ -361,6 +367,7 @@ pub fn procrustes(a: &[V3], b: &[V3]) -> Option<M3> {
 
 #[cfg(test)]
 mod tests {
+    use super::super::linalg::{log_rot, norm, rodrigues};
     use super::*;
 
     fn scene() -> (Vec<V3>, Pose) {
@@ -380,6 +387,14 @@ mod tests {
         [c[0] / c[2], c[1] / c[2]]
     }
 
+    #[test]
+    fn pose_selection_rejects_mismatched_or_non_finite_correspondences() {
+        let candidates = [(I3, [0.1, 0.0, 0.0])];
+        assert!(select_pose(&candidates, &[[0.0; 2]], &[]).is_none());
+        assert!(select_pose(&candidates, &[], &[[0.0; 2]]).is_none());
+        assert!(select_pose(&candidates, &[[f64::NAN, 0.0]], &[[0.0; 2]]).is_none());
+    }
+
     #[test]
     fn essential_recovers_relative_pose() {
         let (pts, p2) = scene();
diff --git a/crates/track/src/camtrack/solver.rs b/crates/track/src/camtrack/solver.rs
index a4e2c21e6..8e212127b 100644
--- a/crates/track/src/camtrack/solver.rs
+++ b/crates/track/src/camtrack/solver.rs
@@ -7,7 +7,7 @@ use rayon::prelude::*;
 
 use super::bundle::{self, BaCam, BaObs, BaOpts, FocalMode};
 use super::geometry::{self, Pose};
-use super::linalg::*;
+use super::linalg::{V3, add, log_rot, mm, mt, mtv, mv, norm, normalize, rodrigues, scale, slerp, sub, sym_eigen};
 use super::{CameraSolve, CameraTracks, Distortion, ShotType, SolveMethod, SolveSettings, SolvedFrame, SolvedPoint};
 use crate::fit::{Model, ransac};
 
@@ -42,13 +42,54 @@ struct Data {
     noise_bits: std::sync::atomic::AtomicU64,
 }
 
+// Input budgets apply before building the duplicated per-frame/per-track lookup tables.
+const MAX_SOLVE_FRAMES: usize = 100_000;
+const MAX_SOLVE_TRACKS: usize = 200_000;
+const MAX_SOLVE_OBSERVATIONS: usize = 2_000_000;
+
+fn validate_tracks(t: &CameraTracks) -> Result<(), SolveError> {
+    if t.frames as usize > MAX_SOLVE_FRAMES || t.tracks.len() > MAX_SOLVE_TRACKS {
+        return err("camera tracks exceed the supported frame or track count");
+    }
+    if t.size.iter().any(|v| !v.is_finite() || *v <= 0.0)
+        || !t.factor.is_finite()
+        || t.factor < 0.0
+        || !t.start.is_finite()
+        || !t.frame_duration.is_finite()
+        || t.frame_duration <= 0.0
+    {
+        return err("camera tracks have invalid dimensions, timing or analysis scale");
+    }
+    let mut count = 0usize;
+    for tr in &t.tracks {
+        count = count
+            .checked_add(tr.pts.len())
+            .filter(|n| *n <= MAX_SOLVE_OBSERVATIONS)
+            .ok_or_else(|| SolveError("camera tracks exceed the supported observation count".into()))?;
+        let end = u32::try_from(tr.pts.len()).ok().and_then(|n| tr.start.checked_add(n));
+        if end.is_none_or(|end| end > t.frames) {
+            return err("camera track extends beyond the clip's frame range");
+        }
+        if tr.pts.iter().flatten().any(|v| !v.is_finite()) {
+            return err("camera track positions must be finite");
+        }
+    }
+    Ok(())
+}
+
 impl Data {
-    fn new(t: &CameraTracks, deleted: &[u32]) -> Data {
+    fn new(t: &CameraTracks, deleted: &[u32]) -> Result<Data, SolveError> {
+        validate_tracks(t)?;
+        if deleted.len() > MAX_SOLVE_TRACKS {
+            return err("too many deleted camera track ids");
+        }
         let n = t.frames as usize;
         let c = [t.size[0] * 0.5, t.size[1] * 0.5];
         let del: HashSet<u32> = deleted.iter().copied().collect();
         let mut tracks = vec![];
-        let mut by_frame = vec![vec![]; n];
+        let mut by_frame = Vec::new();
+        by_frame.try_reserve_exact(n).map_err(|_| SolveError("not enough memory for camera track frames".into()))?;
+        by_frame.resize_with(n, Vec::new);
         for tr in t.tracks.iter().filter(|tr| !del.contains(&tr.id) && tr.pts.len() >= 3) {
             let ti = tracks.len() as u32;
             let pts: Vec<[f64; 2]> = tr.pts.iter().map(|p| [p[0] as f64 - c[0], p[1] as f64 - c[1]]).collect();
@@ -60,7 +101,7 @@ impl Data {
             tracks.push((tr.id, tr.start as usize, pts));
         }
         let noise = (0.5 * t.factor).max(0.5);
-        Data { n, w: t.size[0], tracks, by_frame, noise_bits: std::sync::atomic::AtomicU64::new(noise.to_bits()) }
+        Ok(Data { n, w: t.size[0], tracks, by_frame, noise_bits: std::sync::atomic::AtomicU64::new(noise.to_bits()) })
     }
     fn at(&self, ti: u32, k: usize) -> Option<[f64; 2]> {
         let (_, s, p) = &self.tracks[ti as usize];
@@ -174,10 +215,10 @@ impl Recon {
     }
 
     /// Bundle-adjust the cameras of `frames` (the first stays fixed) and their points.
-    fn adjust(&mut self, d: &Data, frames: &[usize], cfg: &Cfg, focal: FocalMode, iters: usize) -> f64 {
+    fn adjust(&mut self, d: &Data, frames: &[usize], cfg: &Cfg, focal: FocalMode, iters: usize) -> Result<f64, SolveError> {
         let (mut cams, mut pts, obs, ids) = self.observations(d, frames);
         if obs.is_empty() {
-            return f64::INFINITY;
+            return Ok(f64::INFINITY);
         }
         let mut fixed = vec![false; cams.len()];
         fixed[0] = true;
@@ -186,14 +227,14 @@ impl Recon {
             &mut pts,
             &obs,
             &BaOpts { focal, fix_points: false, fix_centers: cfg.kind == Kind::Tripod, fixed, huber: d.huber(), max_iter: iters, distortion: cfg.distortion },
-        );
+        )?;
         for (k, c) in frames.iter().zip(&cams) {
             self.cams.insert(*k, *c);
         }
         for (ti, x) in ids.iter().zip(&pts) {
             self.pts.insert(*ti, *x);
         }
-        rep.cost
+        Ok(rep.cost)
     }
 
     /// Mark observations above the inlier threshold as outliers; drop points left with fewer
@@ -302,8 +343,12 @@ impl Recon {
                 break;
             }
             let mut cams = vec![start];
-            bundle::adjust(&mut cams, &mut pts.clone(), &obs, &opts(d.inlier_thr() * 4.0));
-            bundle::adjust(&mut cams, &mut pts.clone(), &obs, &opts(d.huber()));
+            if bundle::adjust(&mut cams, &mut pts.clone(), &obs, &opts(d.inlier_thr() * 4.0)).is_err() {
+                return false;
+            }
+            if bundle::adjust(&mut cams, &mut pts.clone(), &obs, &opts(d.huber())).is_err() {
+                return false;
+            }
             let inl = obs.iter().filter(|o| bundle::residual(&cams[0], pts[o.pt as usize], o.uv).is_some_and(|r| r[0] * r[0] + r[1] * r[1] <= thr2)).count();
             if best.as_ref().is_none_or(|b| inl > b.0) {
                 best = Some((inl, cams[0]));
@@ -317,7 +362,9 @@ impl Recon {
         let keep: Vec<BaObs> =
             obs.iter().filter(|o| bundle::residual(&cam, pts[o.pt as usize], o.uv).is_some_and(|r| r[0] * r[0] + r[1] * r[1] <= thr2)).copied().collect();
         let mut cams = vec![cam];
-        bundle::adjust(&mut cams, &mut pts.clone(), &keep, &opts(d.huber()));
+        if bundle::adjust(&mut cams, &mut pts.clone(), &keep, &opts(d.huber())).is_err() {
+            return false;
+        }
         for o in &obs {
             let ok = bundle::residual(&cams[0], pts[o.pt as usize], o.uv).is_some_and(|r| r[0] * r[0] + r[1] * r[1] <= thr2);
             if !ok {
@@ -471,10 +518,11 @@ fn grow(d: &Data, kfs: &[usize], j: usize, init: &(Pose, HashMap<u32, V3>), f: f
     r.pts = init.1.clone();
     let inner = |r: &mut Recon, frames: &[usize]| {
         let focal = if cfg.per_frame_f && frames.len() > 2 { FocalMode::PerCamera(F_PRIOR) } else { FocalMode::Fixed };
-        r.adjust(d, frames, cfg, focal, 10);
+        r.adjust(d, frames, cfg, focal, 10)?;
         r.reject(d);
+        Ok::<(), SolveError>(())
     };
-    inner(&mut r, &[a, b]);
+    inner(&mut r, &[a, b]).ok()?;
     let order: Vec<usize> = kfs[1..j].iter().chain(&kfs[j + 1..]).copied().collect();
     let mut done = 0;
     for k in order {
@@ -491,11 +539,11 @@ fn grow(d: &Data, kfs: &[usize], j: usize, init: &(Pose, HashMap<u32, V3>), f: f
         done += 1;
         let frames: Vec<usize> = r.cams.keys().copied().collect();
         if done % 3 == 0 || frames.len() <= 6 {
-            inner(&mut r, &frames);
+            inner(&mut r, &frames).ok()?;
         }
     }
     let frames: Vec<usize> = r.cams.keys().copied().collect();
-    inner(&mut r, &frames);
+    inner(&mut r, &frames).ok()?;
     (r.cams.len() >= 2 && r.pts.len() >= 8).then_some(r)
 }
 
@@ -531,10 +579,10 @@ fn grow_tripod(d: &Data, kfs: &[usize], f: f64, cfg: &Cfg, cancel: Option<&Atomi
     r.triangulate(d, Kind::Tripod, 0.0, 20.0);
     let frames: Vec<usize> = r.cams.keys().copied().collect();
     let focal = if cfg.per_frame_f && frames.len() > 2 { FocalMode::PerCamera(F_PRIOR) } else { FocalMode::Fixed };
-    r.adjust(d, &frames, cfg, focal, 15);
+    r.adjust(d, &frames, cfg, focal, 15).ok()?;
     r.reject(d);
     r.triangulate(d, Kind::Tripod, 0.0, 1.0);
-    r.adjust(d, &frames, cfg, focal, 15);
+    r.adjust(d, &frames, cfg, focal, 15).ok()?;
     (r.cams.len() >= 2 && r.pts.len() >= 8).then_some(r)
 }
 
@@ -684,7 +732,7 @@ pub fn solve(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBoo
     for pass in 0..2 {
         let und = (pass > 0).then(|| undistorted(tracks, &dist));
         let c = solve_core(und.as_ref().unwrap_or(tracks), s, cancel)?;
-        let d = Data::new(tracks, &s.deleted);
+        let d = Data::new(tracks, &s.deleted)?;
         d.set_noise(c.d.noise());
         let mut r = c.r;
         for cam in r.cams.values_mut() {
@@ -699,10 +747,10 @@ pub fn solve(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBoo
         // The pinhole solve's outliers include the distorted frame edges: start from all
         // observations (the Huber loss keeps real outliers in check), then reject again.
         r.outliers.clear();
-        r.adjust(&d, &frames, &cfg, c.focal, 30);
+        r.adjust(&d, &frames, &cfg, c.focal, 30)?;
         r.outliers.clear();
         r.reject(&d);
-        r.adjust(&d, &frames, &cfg, c.focal, 30);
+        r.adjust(&d, &frames, &cfg, c.focal, 30)?;
         dist = r.cams[&frames[0]].dist;
         for cam in r.cams.values_mut() {
             cam.dist = dist;
@@ -742,7 +790,7 @@ pub fn solve(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBoo
 }
 
 fn solve_core(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBool>) -> Result<Core, SolveError> {
-    let d = Data::new(tracks, &s.deleted);
+    let d = Data::new(tracks, &s.deleted)?;
     if d.n < 2 {
         return err("the clip must be at least two frames long");
     }
@@ -848,7 +896,7 @@ fn solve_core(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBo
     lap("tripod");
     // Keyframes: adjust with the focal length free, reject, re-triangulate, adjust again.
     let kf_frames: Vec<usize> = r.cams.keys().copied().collect();
-    r.adjust(&d, &kf_frames, &cfg, focal, 40);
+    r.adjust(&d, &kf_frames, &cfg, focal, 40)?;
     r.reject(&d);
     // Re-estimate the tracking noise from the inlier residuals (robustly, from their median:
     // for 2D Gaussian noise of deviation σ the median distance is 1.1774 σ), then tighten the
@@ -876,9 +924,9 @@ fn solve_core(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBo
         r.reject(&d);
     }
     r.triangulate(&d, kind, 1.0, 1.0);
-    r.adjust(&d, &kf_frames, &cfg, focal, 40);
+    r.adjust(&d, &kf_frames, &cfg, focal, 40)?;
     r.reject(&d);
-    r.adjust(&d, &kf_frames, &cfg, focal, 20);
+    r.adjust(&d, &kf_frames, &cfg, focal, 20)?;
     if cancelled() {
         return err("cancelled");
     }
@@ -910,7 +958,7 @@ fn solve_core(tracks: &CameraTracks, s: &SolveSettings, cancel: Option<&AtomicBo
     let all: Vec<usize> = r.cams.keys().copied().collect();
     r.reject(&d);
     if all.len() <= 160 {
-        r.adjust(&d, &all, &cfg, focal, 25);
+        r.adjust(&d, &all, &cfg, focal, 25)?;
         r.reject(&d);
     } else {
         // Points only (cameras fixed) would be cheap but the keyframe solution is already
diff --git a/crates/track/src/face.rs b/crates/track/src/face.rs
index 45c7c4baa..708a05c4f 100644
--- a/crates/track/src/face.rs
+++ b/crates/track/src/face.rs
@@ -186,9 +186,16 @@ fn to_layer(c: [f64; 2], b: f64, roll_deg: f64, q: [f64; 2]) -> [f64; 2] {
 
 /// Layer pixels → face frame.
 fn to_face(c: [f64; 2], b: f64, roll_deg: f64, p: [f64; 2]) -> [f64; 2] {
+    face_mapper(c, b, roll_deg)(p)
+}
+
+/// [`to_face`] with the rotation worked out once, for mapping many points.
+fn face_mapper(c: [f64; 2], b: f64, roll_deg: f64) -> impl Fn([f64; 2]) -> [f64; 2] {
     let (sn, cs) = roll_deg.to_radians().sin_cos();
-    let d = [(p[0] - c[0]) / b, (p[1] - c[1]) / b];
-    [cs * d[0] + sn * d[1], -sn * d[0] + cs * d[1]]
+    move |p| {
+        let d = [(p[0] - c[0]) / b, (p[1] - c[1]) / b];
+        [cs * d[0] + sn * d[1], -sn * d[0] + cs * d[1]]
+    }
 }
 
 /// A synthetic face's landmarks in layer pixels.
@@ -547,6 +554,32 @@ fn fit_from_face(face: &Face, topo: &Topology, offset: [f64; 2]) -> Option<FaceF
     Some(FaceFit { landmarks, detected, outline, center, height: b, roll })
 }
 
+/// Find the first skin pixel in successive rings around the predicted center.
+fn nearest_skin(skin: &[bool], size: (usize, usize), center: (usize, usize), radius: i64) -> Option<(usize, usize)> {
+    let (w, h) = size;
+    let (ci, cj) = center;
+    for r in 0..radius {
+        for dj in -r..=r {
+            for di in -r..=r {
+                if di.abs() != r && dj.abs() != r {
+                    continue;
+                }
+                let (i, j) = (ci as i64 + di, cj as i64 + dj);
+                if i >= 0 && j >= 0 && (i as usize) < w && (j as usize) < h && skin[j as usize * w + i as usize] {
+                    return Some((i as usize, j as usize));
+                }
+            }
+        }
+    }
+    None
+}
+
+struct FaceGeometry {
+    center: [f64; 2],
+    height: f64,
+    roll: f64,
+}
+
 /// A pixel window of a frame in layer coordinates.
 struct Window {
     x0: i64,
@@ -578,6 +611,44 @@ impl Window {
     }
 }
 
+/// Per pixel of a `w × h` window: not skin and inside `poly` (even-odd rule, same comparisons as
+/// [`crate::mask::inside_polygon`] at `layer(i, j)`). A scanline crosses the polygon at the same
+/// edges for every pixel of a row, so the crossings are found once per row and each pixel's
+/// parity follows from how many lie right of it.
+fn non_skin_inside(poly: &[[f64; 2]], skin: &[bool], layer: impl Fn(usize, usize) -> [f64; 2], w: usize, h: usize) -> Vec<bool> {
+    let mut feat = vec![false; w * h];
+    let n = poly.len();
+    if n < 3 {
+        return feat;
+    }
+    let mut xs: Vec<f64> = Vec::with_capacity(n);
+    for j in 0..h {
+        let y = layer(0, j)[1];
+        xs.clear();
+        let mut prev = poly[n - 1];
+        for &cur in poly {
+            let (a, b) = (cur, prev);
+            if (a[1] > y) != (b[1] > y) {
+                xs.push((b[0] - a[0]) * (y - a[1]) / (b[1] - a[1]) + a[0]);
+            }
+            prev = cur;
+        }
+        if xs.is_empty() {
+            continue;
+        }
+        xs.sort_by(f64::total_cmp);
+        let mut left = 0;
+        for i in 0..w {
+            let x = layer(i, j)[0];
+            while left < xs.len() && xs[left] <= x {
+                left += 1;
+            }
+            feat[j * w + i] = (xs.len() - left) % 2 == 1 && !skin[j * w + i];
+        }
+    }
+    feat
+}
+
 fn median(v: &mut [f32]) -> f32 {
     v.sort_by(f32::total_cmp);
     v[v.len() / 2]
@@ -752,6 +823,53 @@ impl FaceTracker {
         Some(fit)
     }
 
+    /// Connected dark features inside the fitted face, in normalized face coordinates.
+    fn feature_blobs(&self, frame: &Frame, win: &Window, skin: &[bool], luma: &[f32], outline: &[[f64; 2]], geometry: FaceGeometry) -> Vec<Blob> {
+        let FaceGeometry { center, height: b, roll } = geometry;
+        let (w, h) = (win.w, win.h);
+        // Non-skin components inside the face outline (shrunk a little: anti-aliased edges).
+        let inner: Vec<[f64; 2]> = outline.iter().map(|p| [center[0] + 0.9 * (p[0] - center[0]), center[1] + 0.9 * (p[1] - center[1])]).collect();
+        let feat = non_skin_inside(&inner, skin, |i, j| win.layer(frame, i, j), w, h);
+        let min_area = (0.0006 * b * b).max(2.0) as usize;
+        let mut seen = vec![false; w * h];
+        let mut blobs: Vec<Blob> = vec![];
+        let skin_luma = self.skin.med[0] as f64;
+        let to_face = face_mapper(center, b, roll);
+        for j0 in 0..h {
+            for i0 in 0..w {
+                if !feat[j0 * w + i0] || seen[j0 * w + i0] {
+                    continue;
+                }
+                let mut st = vec![(i0, j0)];
+                seen[j0 * w + i0] = true;
+                let mut pts = vec![];
+                while let Some((i, j)) = st.pop() {
+                    let q = to_face(win.layer(frame, i, j));
+                    pts.push((q, skin_luma - luma[j * w + i] as f64));
+                    for dj in -1i64..=1 {
+                        for di in -1i64..=1 {
+                            let (a, c) = (i as i64 + di, j as i64 + dj);
+                            if a < 0 || c < 0 || a as usize >= w || c as usize >= h {
+                                continue;
+                            }
+                            let (a, c) = (a as usize, c as usize);
+                            if feat[c * w + a] && !seen[c * w + a] {
+                                seen[c * w + a] = true;
+                                st.push((a, c));
+                            }
+                        }
+                    }
+                }
+                if pts.len() >= min_area {
+                    let n = pts.len() as f64;
+                    let centroid = [pts.iter().map(|p| p.0[0]).sum::<f64>() / n, pts.iter().map(|p| p.0[1]).sum::<f64>() / n];
+                    blobs.push(Blob { pts, centroid });
+                }
+            }
+        }
+        blobs
+    }
+
     fn fit(&self, frame: &Frame) -> Option<FaceFit> {
         let pv = &self.prev;
         let b0 = pv.height;
@@ -769,22 +887,7 @@ impl FaceTracker {
         }
         // Seed: the skin pixel nearest the predicted centre.
         let (ci, cj) = win.cell(frame, pv.center)?;
-        let mut seed = None;
-        'search: for r in 0..(0.6 * b0).ceil() as i64 {
-            for dj in -r..=r {
-                for di in -r..=r {
-                    if di.abs() != r && dj.abs() != r {
-                        continue;
-                    }
-                    let (i, j) = (ci as i64 + di, cj as i64 + dj);
-                    if i >= 0 && j >= 0 && (i as usize) < w && (j as usize) < h && skin[j as usize * w + i as usize] {
-                        seed = Some((i as usize, j as usize));
-                        break 'search;
-                    }
-                }
-            }
-        }
-        let (si, sj) = seed?;
+        let (si, sj) = nearest_skin(&skin, (w, h), (ci, cj), (0.6 * b0).ceil() as i64)?;
         // Flood fill (4-connected).
         let mut comp = vec![false; w * h];
         let mut stack = vec![(si, sj)];
@@ -855,52 +958,7 @@ impl FaceTracker {
             roll += 180.0;
         }
         let b = major;
-        // Non-skin components inside the face outline (shrunk a little: anti-aliased edges).
-        let inner: Vec<[f64; 2]> = outline.iter().map(|p| [center[0] + 0.9 * (p[0] - center[0]), center[1] + 0.9 * (p[1] - center[1])]).collect();
-        let mut feat = vec![false; w * h];
-        for j in 0..h {
-            for i in 0..w {
-                if !skin[j * w + i] && crate::mask::inside_polygon(&inner, win.layer(frame, i, j)) {
-                    feat[j * w + i] = true;
-                }
-            }
-        }
-        let min_area = (0.0006 * b * b).max(2.0) as usize;
-        let mut seen = vec![false; w * h];
-        let mut blobs: Vec<Blob> = vec![];
-        let skin_luma = self.skin.med[0] as f64;
-        for j0 in 0..h {
-            for i0 in 0..w {
-                if !feat[j0 * w + i0] || seen[j0 * w + i0] {
-                    continue;
-                }
-                let mut st = vec![(i0, j0)];
-                seen[j0 * w + i0] = true;
-                let mut pts = vec![];
-                while let Some((i, j)) = st.pop() {
-                    let q = to_face(center, b, roll, win.layer(frame, i, j));
-                    pts.push((q, skin_luma - luma[j * w + i] as f64));
-                    for dj in -1i64..=1 {
-                        for di in -1i64..=1 {
-                            let (a, c) = (i as i64 + di, j as i64 + dj);
-                            if a < 0 || c < 0 || a as usize >= w || c as usize >= h {
-                                continue;
-                            }
-                            let (a, c) = (a as usize, c as usize);
-                            if feat[c * w + a] && !seen[c * w + a] {
-                                seen[c * w + a] = true;
-                                st.push((a, c));
-                            }
-                        }
-                    }
-                }
-                if pts.len() >= min_area {
-                    let n = pts.len() as f64;
-                    let centroid = [pts.iter().map(|p| p.0[0]).sum::<f64>() / n, pts.iter().map(|p| p.0[1]).sum::<f64>() / n];
-                    blobs.push(Blob { pts, centroid });
-                }
-            }
-        }
+        let blobs = self.feature_blobs(frame, &win, &skin, &luma, &outline, FaceGeometry { center, height: b, roll });
         // Match components to features near their expected positions.
         let ex = &self.expect;
         let mean_of = |ids: &[usize]| {
@@ -1174,6 +1232,35 @@ mod tests {
         assert!(err < 0.06 * 50.0, "max error {err}");
     }
 
+    #[test]
+    fn row_crossings_match_the_point_in_polygon_test() {
+        let (w, h) = (97, 83);
+        let off = [13.0, 7.0];
+        let layer = |i: usize, j: usize| [(20 + i) as f64 + 0.5 - off[0] + 0.25, (11 + j) as f64 + 0.5 - off[1]];
+        let star: Vec<[f64; 2]> = (0..48)
+            .map(|k| {
+                let a = k as f64 / 48.0 * std::f64::consts::TAU;
+                let r = 30.0 + 9.0 * (5.0 * a).sin() + 3.0 * (k % 3) as f64;
+                [50.0 + a.cos() * r, 40.0 + a.sin() * r * 1.3]
+            })
+            .collect();
+        // Vertices on pixel-centre rows and columns exercise the tie cases.
+        let tied: Vec<[f64; 2]> = vec![[10.0, 5.0], [70.0, 5.0], [70.0, 60.5], [40.0, 30.5], [10.0, 60.5], [10.0, 5.0]];
+        for poly in [star, tied, vec![[1.0, 1.0], [5.0, 5.0]]] {
+            let skin: Vec<bool> = (0..w * h).map(|i| (i * 7 + i / w) % 5 == 0).collect();
+            let got = non_skin_inside(&poly, &skin, layer, w, h);
+            let mut inside = 0;
+            for j in 0..h {
+                for i in 0..w {
+                    let want = !skin[j * w + i] && crate::mask::inside_polygon(&poly, layer(i, j));
+                    assert_eq!(got[j * w + i], want, "({i}, {j})");
+                    inside += want as usize;
+                }
+            }
+            assert!(inside > 0 || poly.len() < 3);
+        }
+    }
+
     #[test]
     fn tracks_a_moving_rotating_synthetic_face() {
         let (w, h) = (320, 240);
diff --git a/crates/track/src/roto/mod.rs b/crates/track/src/roto.rs
similarity index 91%
rename from crates/track/src/roto/mod.rs
rename to crates/track/src/roto.rs
index 4efb43359..0948d3fe0 100644
--- a/crates/track/src/roto/mod.rs
+++ b/crates/track/src/roto.rs
@@ -224,13 +224,19 @@ pub struct FrameSeg {
 
 impl FrameSeg {
     pub fn empty(w: usize, h: usize) -> FrameSeg {
-        FrameSeg { w, h, matte: vec![0; w * h], refine: vec![0; w * h], ..Default::default() }
+        let Some(n) = w.checked_mul(h).filter(|n| *n <= rle::MAX_PLANE_BYTES) else {
+            return FrameSeg::default();
+        };
+        FrameSeg { w, h, matte: vec![0; n], refine: vec![0; n], ..Default::default() }
     }
     pub fn area(&self) -> usize {
         self.matte.iter().filter(|v| **v != 0).count()
     }
     /// Centroid of the matte (pixels), if any.
     pub fn centroid(&self) -> Option<[f64; 2]> {
+        if self.w == 0 || self.w.checked_mul(self.h)? > self.matte.len() {
+            return None;
+        }
         let (mut sx, mut sy, mut n) = (0.0, 0.0, 0.0);
         for (i, v) in self.matte.iter().enumerate() {
             if *v != 0 {
@@ -246,8 +252,18 @@ impl FrameSeg {
     /// Worker to the page): `ECSG`, width, height (u32 LE), the colour models as JSON (length
     /// prefixed), then the matte and the Refine Edge band run-length encoded (u16 LE run, byte).
     pub fn to_bytes(&self) -> Vec<u8> {
+        let Some(pixels) = self.w.checked_mul(self.h).filter(|n| *n <= rle::MAX_PLANE_BYTES) else {
+            return Vec::new();
+        };
+        if self.matte.len() != pixels || self.refine.len() != pixels || self.w > u32::MAX as usize || self.h > u32::MAX as usize {
+            return Vec::new();
+        }
         let models = serde_json::to_vec(&(&self.fg, &self.bg)).unwrap_or_default();
-        let mut out = Vec::with_capacity(16 + models.len() + 64);
+        let Some(header_len) = 16usize.checked_add(models.len()) else { return Vec::new() };
+        let mut out = Vec::new();
+        if out.try_reserve(header_len.saturating_add(64)).is_err() {
+            return Vec::new();
+        }
         out.extend_from_slice(b"ECSG");
         out.extend_from_slice(&(self.w as u32).to_le_bytes());
         out.extend_from_slice(&(self.h as u32).to_le_bytes());
@@ -261,6 +277,9 @@ impl FrameSeg {
                 while i + n < plane.len() && plane[i + n] == v && n < u16::MAX as usize {
                     n += 1;
                 }
+                if out.try_reserve(3).is_err() {
+                    return Vec::new();
+                }
                 out.extend_from_slice(&(n as u16).to_le_bytes());
                 out.push(v);
                 i += n;
@@ -277,23 +296,40 @@ impl FrameSeg {
         let u = |i: usize| u32::from_le_bytes([b[i], b[i + 1], b[i + 2], b[i + 3]]) as usize;
         let (w, h, ml) = (u(4), u(8), u(12));
         let n = w.checked_mul(h)?;
-        let models = b.get(16..16 + ml)?;
+        if n > rle::MAX_PLANE_BYTES || w == 0 || h == 0 {
+            return None;
+        }
+        let models_end = 16usize.checked_add(ml)?;
+        let models = b.get(16..models_end)?;
         let (fg, bg): (Gmm, Gmm) = serde_json::from_slice(models).ok()?;
-        let mut rest = &b[16 + ml..];
+        let mut rest = b.get(models_end..)?;
+        // Each run covers at most u16::MAX pixels; refuse before reserving a plane the input can't fill.
+        if rest.len() < n.div_ceil(usize::from(u16::MAX)).saturating_mul(6) {
+            return None;
+        }
         let mut plane = || -> Option<Vec<u8>> {
-            let mut v = Vec::with_capacity(n);
+            let mut v = Vec::new();
+            v.try_reserve_exact(n).ok()?;
             while v.len() < n {
                 if rest.len() < 3 {
                     return None;
                 }
-                let run = u16::from_le_bytes([rest[0], rest[1]]) as usize;
-                v.resize(v.len() + run, rest[2]);
-                rest = &rest[3..];
+                let run = u16::from_le_bytes([*rest.first()?, *rest.get(1)?]) as usize;
+                let next = v.len().checked_add(run)?;
+                if run == 0 || next > n {
+                    return None;
+                }
+                let value = *rest.get(2)?;
+                v.resize(next, value);
+                rest = rest.get(3..)?;
             }
             (v.len() == n).then_some(v)
         };
         let matte = plane()?;
         let refine = plane()?;
+        if !rest.is_empty() {
+            return None;
+        }
         Some(FrameSeg { w, h, matte, refine, fg, bg })
     }
 }
@@ -371,7 +407,9 @@ fn beta(img: &[[f32; 3]], free: &[bool], w: usize, h: usize) -> f64 {
 
 /// One min-cut over the `free` pixels; others keep `labels`. `prior`: P(foreground) per pixel
 /// and how much it weighs against the colour models.
-fn cut(img: &[[f32; 3]], w: usize, h: usize, labels: &mut [u8], free: &[bool], hard: &[u8], fg: &Gmm, bg: &Gmm, prior: Option<(&[f32], f64)>) {
+fn cut(img: &[[f32; 3]], size: (usize, usize), labels: &mut [u8], free: &[bool], hard: &[u8], models: (&Gmm, &Gmm), prior: Option<(&[f32], f64)>) {
+    let (w, h) = size;
+    let (fg, bg) = models;
     let mut idx = vec![u32::MAX; w * h];
     let mut nodes = vec![];
     for i in 0..w * h {
@@ -586,6 +624,36 @@ pub struct Prior {
     pub weight: f64,
 }
 
+/// Fit foreground/background colour models from strokes and the propagated matte.
+fn initial_models(rgb: &[[f32; 3]], hard: &[u8], fgs: &[bool], strokes: &[&Stroke], prior: Option<&Prior>, opts: &SegOpts, size: (usize, usize)) -> (Gmm, Gmm) {
+    let (w, h) = size;
+    // Initial colour models: the strokes (and the propagated matte).
+    match prior {
+        Some(p) => {
+            let fgc = samples(rgb, |i| (hard[i] == HARD_FG) || (hard[i] == 0 && p.soft[i] >= 0.5));
+            let bgc = samples(rgb, |i| (hard[i] == HARD_BG) || (hard[i] == 0 && p.soft[i] < 0.5));
+            let f = Gmm::fit(&fgc, COMPONENTS, MAX_SAMPLES);
+            let b = Gmm::fit(&bgc, COMPONENTS, MAX_SAMPLES);
+            (if f.is_empty() { p.fg.clone() } else { f }, if b.is_empty() { p.bg.clone() } else { b })
+        }
+        None => {
+            let fgc = samples(rgb, |i| hard[i] == HARD_FG);
+            let mut bgc = samples(rgb, |i| hard[i] == HARD_BG);
+            if bgc.is_empty() {
+                // No background strokes: what is far from the foreground strokes.
+                let d = matting::distance(fgs, w, h);
+                let r = strokes.iter().filter(|s| s.kind == StrokeKind::Fg).map(|s| s.radius).fold(1.0, f64::max) * opts.scale;
+                let far = (4.0 * r).max(0.25 * w.max(h) as f64) as f32;
+                bgc = samples(rgb, |i| d[i] > far);
+                if bgc.is_empty() {
+                    bgc = samples(rgb, |i| hard[i] != HARD_FG);
+                }
+            }
+            (Gmm::fit(&fgc, COMPONENTS, MAX_SAMPLES), Gmm::fit(&bgc, COMPONENTS, MAX_SAMPLES))
+        }
+    }
+}
+
 /// Segment a frame from its strokes (and a propagated prior): GrabCut iterations on a reduced
 /// copy, then a full-resolution cut in a band around the boundary.
 pub fn segment(img: &Image, strokes: &[&Stroke], prior: Option<&Prior>, opts: &SegOpts, refine_radius: f64) -> FrameSeg {
@@ -613,31 +681,7 @@ pub fn segment(img: &Image, strokes: &[&Stroke], prior: Option<&Prior>, opts: &S
     let soft_prior: Option<Vec<f32>> =
         prior.map(|p| if p.weight > PRIOR { p.soft.clone() } else { matting::gauss(&p.soft, w, h, (opts.search_radius * opts.scale / 4.0).max(1.0)) });
     let pw = prior.map_or(PRIOR, |p| p.weight);
-    // Initial colour models: the strokes (and the propagated matte).
-    let (fg0, bg0) = match prior {
-        Some(p) => {
-            let fgc = samples(&rgb, |i| (hard[i] == HARD_FG) || (hard[i] == 0 && p.soft[i] >= 0.5));
-            let bgc = samples(&rgb, |i| (hard[i] == HARD_BG) || (hard[i] == 0 && p.soft[i] < 0.5));
-            let f = Gmm::fit(&fgc, COMPONENTS, MAX_SAMPLES);
-            let b = Gmm::fit(&bgc, COMPONENTS, MAX_SAMPLES);
-            (if f.is_empty() { p.fg.clone() } else { f }, if b.is_empty() { p.bg.clone() } else { b })
-        }
-        None => {
-            let fgc = samples(&rgb, |i| hard[i] == HARD_FG);
-            let mut bgc = samples(&rgb, |i| hard[i] == HARD_BG);
-            if bgc.is_empty() {
-                // No background strokes: what is far from the foreground strokes.
-                let d = matting::distance(&fgs, w, h);
-                let r = strokes.iter().filter(|s| s.kind == StrokeKind::Fg).map(|s| s.radius).fold(1.0, f64::max) * opts.scale;
-                let far = (4.0 * r).max(0.25 * w.max(h) as f64) as f32;
-                bgc = samples(&rgb, |i| d[i] > far);
-                if bgc.is_empty() {
-                    bgc = samples(&rgb, |i| hard[i] != HARD_FG);
-                }
-            }
-            (Gmm::fit(&fgc, COMPONENTS, MAX_SAMPLES), Gmm::fit(&bgc, COMPONENTS, MAX_SAMPLES))
-        }
-    };
+    let (fg0, bg0) = initial_models(&rgb, &hard, &fgs, strokes, prior, opts, (w, h));
     let iters = if opts.best { 4 } else { 3 };
     let work = if opts.best { 960 } else { 480 };
     let f = w.max(h).div_ceil(work).max(1);
@@ -685,7 +729,7 @@ pub fn segment(img: &Image, strokes: &[&Stroke], prior: Option<&Prior>, opts: &S
         };
         let free = vec![true; cw * ch];
         for it in 0..iters {
-            cut(&crgb, cw, ch, &mut cl, &free, &chard, &fgm, &bgm, cprior.as_deref().map(|c| (c, pw)));
+            cut(&crgb, (cw, ch), &mut cl, &free, &chard, (&fgm, &bgm), cprior.as_deref().map(|c| (c, pw)));
             if it + 1 < iters {
                 let (a, b) = fit_models(&crgb, &cl);
                 if !a.is_empty() && !b.is_empty() {
@@ -707,11 +751,11 @@ pub fn segment(img: &Image, strokes: &[&Stroke], prior: Option<&Prior>, opts: &S
         let sd = matting::signed_distance(&labels, w, h);
         let band = f as f32 + 1.5;
         let free: Vec<bool> = sd.iter().map(|d| d.abs() <= band).collect();
-        cut(&rgb, w, h, &mut labels, &free, &hard, &fgm, &bgm, soft_prior.as_deref().map(|c| (c, pw)));
+        cut(&rgb, (w, h), &mut labels, &free, &hard, (&fgm, &bgm), soft_prior.as_deref().map(|c| (c, pw)));
     } else {
         let free = vec![true; w * h];
         for it in 0..iters {
-            cut(&rgb, w, h, &mut labels, &free, &hard, &fgm, &bgm, soft_prior.as_deref().map(|c| (c, pw)));
+            cut(&rgb, (w, h), &mut labels, &free, &hard, (&fgm, &bgm), soft_prior.as_deref().map(|c| (c, pw)));
             if it + 1 < iters {
                 let (a, b) = fit_models(&rgb, &labels);
                 if !a.is_empty() && !b.is_empty() {
@@ -807,7 +851,7 @@ pub fn propagate(prev_img: &Image, prev: &FrameSeg, next_img: &Image, strokes: &
     let hard = vec![0u8; w * h];
     let soft = matting::gauss(&prior.soft, w, h, (r as f64 / 4.0).max(1.0));
     let (fg, bg) = if prev.fg.is_empty() || prev.bg.is_empty() { fit_models(&rgb, &labels) } else { (prev.fg.clone(), prev.bg.clone()) };
-    cut(&rgb, w, h, &mut labels, &free, &hard, &fg, &bg, Some((&soft, PRIOR)));
+    cut(&rgb, (w, h), &mut labels, &free, &hard, (&fg, &bg), Some((&soft, PRIOR)));
     let seeds = core_of(&prior.soft, w, h, r as f64);
     clean(&mut labels, &seeds, &vec![false; w * h], w, h);
     finish(next_img, &rgb, labels, strokes, Some(&prior.refine), opts, refine_radius)
diff --git a/crates/track/src/roto/matting.rs b/crates/track/src/roto/matting.rs
index 439d9c43e..cb22b680a 100644
--- a/crates/track/src/roto/matting.rs
+++ b/crates/track/src/roto/matting.rs
@@ -200,7 +200,8 @@ pub fn guided_filter(img: &[[f32; 3]], p: &[f32], w: usize, h: usize, r: usize,
 /// (K. He, J. Sun and X. Tang, "Fast Matting Using Large Kernel Matting Laplacian Matrices",
 /// CVPR 2010): `(L·x)ᵢ = Σ_{k∋i} (xᵢ − a_kᵀIᵢ − b_k)` with `(a_k, b_k)` the ridge-regression
 /// fit of `x` to the colours in window k.
-pub fn closed_form(img: &[[f32; 3]], init: &[f32], known: &[bool], w: usize, h: usize, r: usize, eps: f32, iters: usize) -> Vec<f32> {
+pub fn closed_form(img: &[[f32; 3]], init: &[f32], known: &[bool], size: (usize, usize), r: usize, eps: f32, iters: usize) -> Vec<f32> {
+    let (w, h) = size;
     let n = w * h;
     if n == 0 || known.iter().all(|k| *k) {
         return init.to_vec();
diff --git a/crates/track/src/roto/refine.rs b/crates/track/src/roto/refine.rs
index 2a498e286..71f9261b2 100644
--- a/crates/track/src/roto/refine.rs
+++ b/crates/track/src/roto/refine.rs
@@ -123,7 +123,7 @@ pub fn matte_alpha(
             q[j] = if band[j] { q[j].clamp(0.0, 1.0) } else { cp[j] };
         }
         if p.higher_quality {
-            q = matting::closed_form(&cimg, &q, &outside, cw, ch, 1, 1e-5 * (1.0 + p.smooth.max(0.0)) as f32, 50);
+            q = matting::closed_form(&cimg, &q, &outside, (cw, ch), 1, 1e-5 * (1.0 + p.smooth.max(0.0)) as f32, 50);
         }
         // Refine Edge Matte adjustments.
         if p.smooth > 1.0 {
@@ -177,7 +177,8 @@ pub fn matte_alpha(
 /// Decontaminate edge colours of `rgb` in place for the matte `alpha` (see
 /// [`matting::decontaminate`]); returns the decontamination map. `band`: the Refine Edge band
 /// (pixels where decontamination always applies).
-pub fn decontaminate(rgb: &mut [[f32; 3]], alpha: &[f32], band: &[u8], w: usize, h: usize, p: &MatteParams, band_radius: f64, scale: f64) -> Vec<f32> {
+pub fn decontaminate(rgb: &mut [[f32; 3]], alpha: &[f32], band: &[u8], size: (usize, usize), p: &MatteParams, band_radius: f64, scale: f64) -> Vec<f32> {
+    let (w, h) = size;
     if !p.decontaminate {
         return vec![0.0; w * h];
     }
diff --git a/crates/track/src/roto/rle.rs b/crates/track/src/roto/rle.rs
index 308b2689a..914bcad83 100644
--- a/crates/track/src/roto/rle.rs
+++ b/crates/track/src/roto/rle.rs
@@ -17,6 +17,10 @@ pub fn base64_encode(data: &[u8]) -> String {
 }
 
 pub fn base64_decode(s: &str) -> Option<Vec<u8>> {
+    base64_decode_bounded(s, usize::MAX)
+}
+
+fn base64_decode_bounded(s: &str, max_bytes: usize) -> Option<Vec<u8>> {
     let val = |c: u8| -> Option<u32> {
         Some(match c {
             b'A'..=b'Z' => (c - b'A') as u32,
@@ -27,13 +31,25 @@ pub fn base64_decode(s: &str) -> Option<Vec<u8>> {
             _ => return None,
         })
     };
-    let bytes: Vec<u8> = s.bytes().filter(|c| !c.is_ascii_whitespace()).collect();
-    if !bytes.len().is_multiple_of(4) {
+    let significant = s.bytes().filter(|c| !c.is_ascii_whitespace()).count();
+    let max_encoded = max_bytes.checked_add(2).and_then(|n| n.checked_div(3)).and_then(|n| n.checked_mul(4)).unwrap_or(usize::MAX);
+    if !significant.is_multiple_of(4) || significant > max_encoded {
         return None;
     }
-    let mut out = Vec::with_capacity(bytes.len() / 4 * 3);
+    let mut bytes = Vec::new();
+    bytes.try_reserve_exact(significant).ok()?;
+    bytes.extend(s.bytes().filter(|c| !c.is_ascii_whitespace()));
+    let decoded_len = bytes.len().checked_div(4)?.checked_mul(3)?;
+    if decoded_len > max_bytes.saturating_add(2) {
+        return None;
+    }
+    let mut out = Vec::new();
+    out.try_reserve_exact(decoded_len.min(max_bytes)).ok()?;
     for c in bytes.chunks(4) {
         let pad = c.iter().rev().take_while(|b| **b == b'=').count();
+        if pad > 2 || c[..4 - pad].contains(&b'=') {
+            return None;
+        }
         let mut n = 0u32;
         for (i, b) in c.iter().enumerate() {
             n |= if *b == b'=' { 0 } else { val(*b)? } << (18 - 6 * i);
@@ -96,36 +112,66 @@ pub fn encode(values: &[u8]) -> String {
     base64_encode(&out)
 }
 
-/// Decode [`encode`]'s output (None when malformed).
-pub fn decode(s: &str) -> Option<Vec<u8>> {
-    let data = base64_decode(s)?;
-    let mut pos = 0;
-    let n = get(&data, &mut pos)? as usize;
-    if n > 1 << 30 {
+/// Decode [`encode`]'s output (None when malformed or larger than the caller's validated plane).
+pub fn decode_bounded(s: &str, max_len: usize) -> Option<Vec<u8>> {
+    let encoded_limit = max_len.saturating_mul(16).saturating_add(128);
+    if s.len() > encoded_limit {
         return None;
     }
-    let mut out = Vec::with_capacity(n);
+    // An alternating byte plane takes at most one value byte and a ten-byte varint per
+    // pixel, plus the declared-length varint.
+    let decoded_limit = max_len.saturating_mul(11).saturating_add(10);
+    let data = base64_decode_bounded(s, decoded_limit)?;
+    let mut pos = 0;
+    let n = usize::try_from(get(&data, &mut pos)?).ok()?;
+    if n > max_len {
+        return None;
+    }
+    let mut out = Vec::new();
+    out.try_reserve_exact(n).ok()?;
     while out.len() < n {
         let v = *data.get(pos)?;
         pos += 1;
-        let run = get(&data, &mut pos)? as usize;
-        if out.len() + run > n {
+        let run = usize::try_from(get(&data, &mut pos)?).ok()?;
+        let next = out.len().checked_add(run)?;
+        if run == 0 || next > n {
             return None;
         }
-        out.resize(out.len() + run, v);
+        out.resize(next, v);
     }
     Some(out)
 }
 
+/// Decode [`encode`]'s output, capped at the standard matte-plane limit.
+pub fn decode(s: &str) -> Option<Vec<u8>> {
+    decode_bounded(s, MAX_PLANE_BYTES)
+}
+
+/// Maximum frozen matte plane size (256 MiB at one byte per pixel).
+pub const MAX_PLANE_BYTES: usize = 256 * 1024 * 1024;
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn refuses_oversized_and_zero_runs_before_expansion() {
+        let mut declared = Vec::new();
+        put(&mut declared, 1024);
+        declared.extend_from_slice(&[255, 0x80, 0x08]); // 1024-byte run
+        assert!(decode_bounded(&base64_encode(&declared), 16).is_none());
+        let mut zero_run = Vec::new();
+        put(&mut zero_run, 1);
+        zero_run.extend_from_slice(&[0, 0]);
+        assert!(decode_bounded(&base64_encode(&zero_run), 16).is_none());
+        assert!(decode_bounded(&"A".repeat(100_000), 16).is_none());
+    }
+
     #[test]
     fn round_trips() {
         for n in [0usize, 1, 2, 3, 4, 5, 100, 1000] {
             let v: Vec<u8> = (0..n).map(|i| ((i / 7) % 3) as u8 * 100).collect();
-            assert_eq!(decode(&encode(&v)).unwrap(), v);
+            assert_eq!(decode(&encode(&v)).unwrap(), v, "RLE n={n}");
             let raw: Vec<u8> = (0..n).map(|i| (i * 31) as u8).collect();
             assert_eq!(base64_decode(&base64_encode(&raw)).unwrap(), raw);
         }
diff --git a/crates/track/src/roto/tests.rs b/crates/track/src/roto/tests.rs
index 65d1743f9..92c7bec04 100644
--- a/crates/track/src/roto/tests.rs
+++ b/crates/track/src/roto/tests.rs
@@ -95,6 +95,21 @@ fn strokes_segment_the_base_frame() {
     assert!(bytes.len() < seg.w * seg.h / 4, "{} bytes", bytes.len());
     assert!(FrameSeg::from_bytes(&bytes[..bytes.len() - 1]).is_none());
     assert!(FrameSeg::from_bytes(b"nope").is_none());
+
+    // Untrusted plane dimensions and run lengths are rejected before allocation/resize.
+    let mut hostile = b"ECSG".to_vec();
+    hostile.extend_from_slice(&u32::MAX.to_le_bytes());
+    hostile.extend_from_slice(&u32::MAX.to_le_bytes());
+    hostile.extend_from_slice(&0u32.to_le_bytes());
+    assert!(FrameSeg::from_bytes(&hostile).is_none());
+    let mut overrun = bytes.clone();
+    let plane_at = 16 + u32::from_le_bytes(bytes[12..16].try_into().unwrap()) as usize;
+    overrun[plane_at..plane_at + 2].copy_from_slice(&u16::MAX.to_le_bytes());
+    assert!(FrameSeg::from_bytes(&overrun).is_none());
+    let mut trailing = bytes.clone();
+    trailing.push(0);
+    assert!(FrameSeg::from_bytes(&trailing).is_none());
+    assert_eq!(FrameSeg::empty(usize::MAX, 2), FrameSeg::default());
 }
 
 #[test]
@@ -231,7 +246,7 @@ fn refine_edge_recovers_a_soft_edge_and_decontaminates() {
     assert!(frac as f64 > 0.6 * n as f64, "{frac}/{n} fractional");
     // Decontamination: edge pixels' colour is the foreground's, not a blue blend.
     let mut col = rgb.clone();
-    let map = decontaminate(&mut col, &a, &seg.refine, W as usize, H as usize, &p, 9.0, 1.0);
+    let map = decontaminate(&mut col, &a, &seg.refine, (W as usize, H as usize), &p, 9.0, 1.0);
     let (mut blue_before, mut blue_after, mut m) = (0.0f64, 0.0f64, 0usize);
     for i in 0..a.len() {
         if a[i] > 0.2 && a[i] < 0.8 {
diff --git a/crates/ui-egui/Cargo.toml b/crates/ui-egui/Cargo.toml
index be02fef5e..b1e281627 100644
--- a/crates/ui-egui/Cargo.toml
+++ b/crates/ui-egui/Cargo.toml
@@ -11,6 +11,7 @@ workspace = true
 
 [dependencies]
 craft-ui = { workspace = true }
+craft-quit = { workspace = true, features = ["egui"] }
 effectcraft-time = { workspace = true }
 effectcraft-geom = { workspace = true }
 effectcraft-color = { workspace = true }
@@ -22,21 +23,28 @@ effectcraft-render = { workspace = true }
 effectcraft-engine = { workspace = true }
 effectcraft-gpu = { workspace = true }
 egui = { workspace = true }
-eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit"] }
+eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "clipboard"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }
+chrono = { workspace = true }
 rayon = { workspace = true }
 web-time = { workspace = true }
 kurbo = { workspace = true }
 image = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+# Floating panels open in OS windows of their own on desktop; the web keeps them in the page.
+craft-ui = { workspace = true, features = ["native-windows"] }
+craft-update = { workspace = true }
 sys-locale = { workspace = true }
 
 [dev-dependencies]
+# Fonts for kittest: the workspace `egui` features are what test roots resolve, but stating them
+# here documents the requirement (kittest's own dev-dependencies do not propagate to consumers).
+egui = { workspace = true, features = ["default_fonts", "monochrome_emoji_fonts"] }
 egui_kittest = { workspace = true, features = ["eframe", "wgpu"] }
-pollster = "0.4"
+pollster = "1"
 effectcraft-host = { workspace = true }
 exr = { workspace = true }
 
diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs
new file mode 100644
index 000000000..115c5f33a
--- /dev/null
+++ b/crates/ui-egui/src/app.rs
@@ -0,0 +1,168 @@
+use super::clock::AppClock;
+use super::hooks::Hooks;
+use super::state::{FrameWindow, PlaybackPass, ShotTarget};
+use super::*;
+
+mod clipboard;
+mod files;
+mod frame;
+mod gpu;
+mod input;
+mod playback;
+mod prefetch;
+mod prefs;
+mod screenshot;
+mod viewer_frames;
+mod window;
+
+#[cfg(test)]
+pub(crate) use screenshot::{MAX_PENDING_SHOTS, SCREENSHOT_SETTLE_PASSES, SCREENSHOT_SETTLE_S, SCREENSHOT_TIMEOUT_S};
+
+impl EffectcraftApp {
+    /// Build the app around `session`.
+    /// Loads and applies the workspaces saved in the session's config directory (a failed load is reported in
+    /// `ui.status`), initializes the default UI, playback and render state, and registers the frontend's commands as
+    /// shortcutable `UiCommand`s on the session.
+    pub fn new(session: Session) -> Self {
+        let mut ui = UiState::default();
+        let workspace_store = workspace_state::WorkspaceStore::load(session.config.as_deref(), &mut ui);
+        EffectcraftApp {
+            session,
+            ui,
+            workspace_store,
+            tokens: Tokens::for_kind(Default::default()),
+            auto: Default::default(),
+            frames: Frames::default(),
+            playback: Playback::default(),
+            dialog: None,
+            hooks: Hooks::default(),
+            fps: 60.0,
+            clock: AppClock::default(),
+            now: 0.0,
+            last_time: 0.0,
+            styled: false,
+            fonts_ready: false,
+            styled_language: "",
+            focused: true,
+            input_active: false,
+            last_pointer_down: false,
+            draw_geom: None,
+            geometry_epoch: 0,
+            ime_tracker: egui::ImeContextTracker::new(),
+            ui_pass_seq: 0,
+            want_paint: false,
+            synthetic_in_flight: false,
+            synthetic_in_flight_events: vec![],
+            last_viewer_scale: None,
+            control_rx: None,
+            deferred: vec![],
+            synthetic: vec![],
+            forwarded: ForwardedInput::default(),
+            input_waiters: vec![],
+            job_waiters: vec![],
+            pending_screenshots: vec![],
+            shot_bytes: 0,
+            last_activity: (0.0, 0),
+            last_edit: (0.0, 0),
+            toast: None,
+            viewer_tex: None,
+            passive_tex: std::collections::HashMap::new(),
+            viewer_native: None,
+            viewer_shown: None,
+            viewer_image: None,
+            viewer_readback: Default::default(),
+            wgpu: None,
+            gpu: None,
+            gpu_checked: false,
+            gpu_failures: None,
+            gpu_failure_applied: None,
+            device_lost_close: None,
+            dialog_answers: std::sync::mpsc::channel(),
+            file_dialogs: FileDialogsUp::default(),
+            command_inbox: None,
+            pointer_comp: None,
+            dialog_state: Default::default(),
+            integrated_titlebar: false,
+            audio: None,
+            scrub: None,
+            meter: Default::default(),
+            expression_diagnostics: Default::default(),
+            waveforms: Default::default(),
+            last_reveal: None,
+            applied_prefs: None,
+            recovery: None,
+            dock_rects: vec![],
+            native_viewports: vec![],
+            unpublished_viewports: vec![],
+            pending_panel_raise: None,
+            home_thumbs: Default::default(),
+            home_thumb_saved: None,
+            window_title: String::new(),
+            template_thumbs: Default::default(),
+            template_list: None,
+            updates_rt: updates_ui::Runtime::default(),
+        }
+        .with_ui_commands()
+    }
+
+    /// Offer the frontend's commands (tools, timeline navigation…) for keyboard shortcuts.
+    fn with_ui_commands(mut self) -> Self {
+        let cmds = menus::UI_COMMANDS
+            .iter()
+            .map(|c| effectcraft_engine::shortcuts::UiCommand { id: c.id.into(), label: c.label.into(), shortcut: c.shortcut.map(str::to_string) })
+            .collect();
+        self.session.set_ui_commands(cmds);
+        self
+    }
+
+    pub fn with_control(mut self, rx: Receiver<ControlRequest>) -> Self {
+        self.control_rx = Some(rx);
+        self
+    }
+}
+
+impl eframe::App for EffectcraftApp {
+    fn on_exit(&mut self) {
+        self.save_workspace_state();
+        // Clean exit: no crash recovery next launch (unless the graphics device was lost with
+        // unsaved changes, which are in the auto-save it offers).
+        if self.device_lost_close != Some(true) {
+            self.session.end_recovery();
+        }
+    }
+
+    /// Feed pending synthetic input into `raw_input` only once fonts are ready (so a non-drawing pass never consumes
+    /// a batch), then prepare pointer wrapping; ending a numeric scrub clears the history merge key so the next edit
+    /// starts a new undo step.
+    fn raw_input_hook(&mut self, ctx: &egui::Context, raw_input: &mut egui::RawInput) {
+        raw_input.events.append(&mut self.forwarded.events);
+        raw_input.dropped_files.append(&mut self.forwarded.files);
+        let injected = self.synthetic_in_flight || !self.synthetic.is_empty();
+        // Only a pass that can draw may receive synthetic input: `Context::run_ui` applies
+        // everything the hook feeds to its input state, so a pass that cannot draw (fonts still
+        // installing) would consume a batch it could not put back — putting it back would apply
+        // the click/key state twice. The queue waits here for the first pass that draws.
+        if self.fonts_ready {
+            self.feed_synthetic(raw_input);
+        }
+        if pointer_wrap::prepare_input(ctx, raw_input, injected) {
+            self.session.history.merge_key = None;
+        }
+    }
+
+    /// The logic-only tick: run `tick`, close the IME pass with `finish_ime_logic` and, last, hand a close to the
+    /// platform quit (`panels::unsaved::quit_on_close`). It does not read pass-time
+    /// input state (events, pointer and time are stale here), only the viewport information eframe refreshed.
+    fn logic(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+        // Never `ctx.input(|i| i.time)` here: `Context::run_logic` leaves events, pointer state and
+        // time at the previous full pass's values (only the viewport information is refreshed).
+        self.tick(ctx, frame);
+        self.finish_ime_logic(ctx);
+        crate::panels::unsaved::quit_on_close(ctx);
+    }
+
+    /// Draw one UI pass through `draw`.
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+        self.draw(ui, frame);
+    }
+}
diff --git a/crates/ui-egui/src/app/clipboard.rs b/crates/ui-egui/src/app/clipboard.rs
new file mode 100644
index 000000000..23b5080e0
--- /dev/null
+++ b/crates/ui-egui/src/app/clipboard.rs
@@ -0,0 +1,63 @@
+#[cfg(test)]
+use super::*;
+
+/// Put `width` × `height` straight-alpha RGBA8 pixels on the system clipboard (Composition ▸ Copy
+/// Frame to Clipboard). The pixel count is checked first: egui's image constructor panics on a
+/// size that doesn't match its buffer.
+pub(super) fn copy_image(ctx: &egui::Context, width: u32, height: u32, rgba: &[u8]) -> Result<(), String> {
+    let (w, h) = (width as usize, height as usize);
+    if w == 0 || h == 0 || w.checked_mul(h).and_then(|n| n.checked_mul(4)) != Some(rgba.len()) {
+        return Err(format!("cannot copy a malformed {width}×{height} image to the clipboard"));
+    }
+    ctx.copy_image(egui::ColorImage::from_rgba_unmultiplied([w, h], rgba));
+    Ok(())
+}
+
+#[cfg(test)]
+mod copy_frame_tests {
+    use super::*;
+
+    fn copied(output: &egui::FullOutput) -> Vec<&egui::ColorImage> {
+        output
+            .platform_output
+            .commands
+            .iter()
+            .filter_map(|c| match c {
+                egui::OutputCommand::CopyImage(image) => Some(image),
+                _ => None,
+            })
+            .collect()
+    }
+
+    /// Composition ▸ Copy Frame to Clipboard puts the rendered frame on the system clipboard.
+    #[test]
+    fn copy_frame_puts_the_frame_on_the_clipboard() {
+        let mut session = Session::default();
+        session.execute("comp.new", json!({"name": "Copy", "width": 8, "height": 6, "duration": 1})).unwrap();
+        session.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
+        let mut app = EffectcraftApp::new(session);
+        let ctx = egui::Context::default();
+        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+            crate::menus::invoke(&mut app, ui.ctx(), "comp.copyFrame", json!({})).unwrap();
+            app.handle_events(ui.ctx());
+        });
+        output.textures_delta.clear();
+        let images = copied(&output);
+        assert_eq!(images.len(), 1);
+        assert_eq!(images[0].size, [8, 6]);
+        assert!(images[0].pixels.iter().all(|p| *p == egui::Color32::from_rgb(255, 0, 0)));
+    }
+
+    /// A malformed image never reaches egui's panicking constructor.
+    #[test]
+    fn a_malformed_image_is_an_error_not_a_crash() {
+        let ctx = egui::Context::default();
+        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+            assert!(copy_image(ui.ctx(), 4, 4, &[0; 10]).is_err());
+            assert!(copy_image(ui.ctx(), 0, 4, &[]).is_err());
+            assert!(copy_image(ui.ctx(), u32::MAX, u32::MAX, &[0; 4]).is_err());
+        });
+        output.textures_delta.clear();
+        assert!(copied(&output).is_empty());
+    }
+}
diff --git a/crates/ui-egui/src/app/files.rs b/crates/ui-egui/src/app/files.rs
new file mode 100644
index 000000000..b1beab972
--- /dev/null
+++ b/crates/ui-egui/src/app/files.rs
@@ -0,0 +1,11 @@
+use super::{Dialog, EffectcraftApp};
+
+impl EffectcraftApp {
+    /// Show the crash-recovery dialog for a previous run that didn't exit cleanly.
+    pub fn offer_recovery(&mut self, r: effectcraft_engine::autosave::Recovery) {
+        if r.autosave.is_some() {
+            self.recovery = Some(r);
+            self.dialog = Some(Dialog::Recovery);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/frame.rs b/crates/ui-egui/src/app/frame.rs
new file mode 100644
index 000000000..d41e0a9d0
--- /dev/null
+++ b/crates/ui-egui/src/app/frame.rs
@@ -0,0 +1,553 @@
+use super::clipboard::copy_image;
+use super::window::fit_window;
+use super::*;
+
+impl EffectcraftApp {
+    /// Completed, non-discarded UI passes since launch.
+    pub fn ui_passes(&self) -> u64 {
+        self.ui_pass_seq
+    }
+
+    // ---------------------------------------------------------------- control channel
+
+    pub(crate) fn raise_for_control(&mut self, ctx: &egui::Context) {
+        ctx.request_repaint();
+    }
+
+    /// Handle the control channel for this tick: drain queued requests plus previously deferred ones, run each
+    /// through `control::handle`, answer `Done` immediately, retry `Retry` until its three-second deadline, hold
+    /// input/job/screenshot replies until their event happens and finish job waiters. Retry timeouts and refused
+    /// screenshots are answered as `{"ok": false, "error": ...}`; the receiver is kept for the next tick.
+    fn drain_control(&mut self, ctx: &egui::Context, now: f64) {
+        let Some(rx) = self.control_rx.take() else { return };
+        let mut reqs: Vec<(ControlRequest, f64)> = std::mem::take(&mut self.deferred);
+        while let Ok(req) = rx.try_recv() {
+            reqs.push((req, now + 3.0));
+        }
+        for (req, deadline) in reqs {
+            let reply = req.reply.clone();
+            match control::handle(self, ctx, &req, now) {
+                control::Outcome::Done(v) => {
+                    let _ = reply.send(v);
+                }
+                control::Outcome::Retry(msg) => {
+                    if now < deadline {
+                        self.deferred.push((req, deadline));
+                        ctx.request_repaint();
+                    } else {
+                        let _ = reply.send(json!({"ok": false, "error": msg}));
+                    }
+                }
+                control::Outcome::AfterInput => {
+                    self.input_waiters.push(reply);
+                    // The reply waits for a real UI pass: a hidden window must run one.
+                    self.want_paint = true;
+                }
+                control::Outcome::AwaitJobs(w) => {
+                    self.job_waiters.push((w, reply));
+                    ctx.request_repaint();
+                }
+                control::Outcome::Screenshot { path, target } => {
+                    // A covered or minimized window presents no frames (macOS skips its redraws), so
+                    // a screenshot would never arrive and nothing would tick its timeout. The
+                    // hidden-window capture path (a pending screenshot forces a pass in 0.37) needs
+                    // a native platform run before this gate is removed; the web build never paints
+                    // a hidden tab.
+                    if ctx.input(|i| i.viewport().occluded == Some(true) || i.viewport().minimized == Some(true)) {
+                        let _ = reply.send(json!({"ok": false, "error": "window is covered or minimized: call ui.focus first (render.frame renders comp pixels without the window)"}));
+                        continue;
+                    }
+                    self.admit_screenshot(ctx, path, target, reply);
+                }
+            }
+        }
+        self.control_rx = Some(rx);
+        self.finish_job_waiters(ctx);
+    }
+
+    /// Reply to the control requests whose offloaded jobs ended.
+    fn finish_job_waiters(&mut self, ctx: &egui::Context) {
+        if self.job_waiters.is_empty() {
+            return;
+        }
+        self.session.poll_render();
+        self.session.poll_offload();
+        let waiters = std::mem::take(&mut self.job_waiters);
+        for (w, reply) in waiters {
+            if w.pending(self) {
+                self.job_waiters.push((w, reply));
+            } else {
+                let v = w.finish(self);
+                let _ = reply.send(v);
+            }
+        }
+        if !self.job_waiters.is_empty() {
+            ctx.request_repaint_after(std::time::Duration::from_millis(50));
+        }
+    }
+
+    // ---------------------------------------------------------------- frame
+
+    /// Apply the engine events drained this tick: open a comp, show a toast, open a URL, run a frontend command,
+    /// purge frame caches or copy an image; command and clipboard failures go to `app.ui.status`.
+    pub(super) fn handle_events(&mut self, ctx: &egui::Context) {
+        for ev in self.session.drain_events() {
+            match ev {
+                effectcraft_engine::Event::OpenComp(c) => {
+                    panels::viewers::on_open_comp(self, c);
+                    self.ui.timeline.pps = None;
+                }
+                effectcraft_engine::Event::Toast { message, .. } => self.toast = Some((message, self.now)),
+                effectcraft_engine::Event::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),
+                // Frames are keyed by content: an edit keeps those of comps it doesn't touch.
+                effectcraft_engine::Event::ProjectChanged { .. } => {}
+                effectcraft_engine::Event::Frontend { command, params } => {
+                    if let Err(e) = crate::menus::frontend(self, ctx, &command, params) {
+                        self.ui.status = e;
+                    }
+                }
+                effectcraft_engine::Event::PurgeCaches => self.frames.clear(),
+                effectcraft_engine::Event::CopyImage { width, height, rgba } => {
+                    if let Err(e) = copy_image(ctx, width, height, &rgba) {
+                        self.ui.status = e;
+                    }
+                }
+            }
+        }
+    }
+
+    /// The app's only non-paint entry: one tick of background work.
+    ///
+    /// This runs for every eframe logic callback, including the logic-only ticks of a hidden
+    /// window (which never reach [`Self::draw`]). It must therefore do no input handling, no
+    /// layout and no presentation: engine/job queues, autosave, playback, audio, the control
+    /// channel, screenshots and the close guard. Everything here is idempotent for a pass that
+    /// `Context::request_discard` replays.
+    pub fn tick(&mut self, ctx: &egui::Context, frame: &eframe::Frame) {
+        self.now = self.clock.now();
+        // The compositor exists before the first paint and while hidden (device-loss handling
+        // must run there too).
+        self.init_gpu(frame);
+        self.apply_gpu_failure(ctx);
+        if self.gpu_failure_applied == Some(true) {
+            self.close_after_device_loss(ctx);
+            return;
+        }
+        // Focus comes from the fresh viewport copy; a full pass's `InputState::focused` is only a
+        // fallback (a logic-only tick leaves it at the previous pass's value).
+        let focused = ctx.input(|i| i.viewport().focused.or(Some(i.focused)));
+        self.focused = focused.unwrap_or(self.focused);
+        // The interface language's fallback fonts are installed in `draw` (fonts need a pass), but
+        // commands handled here use the right catalog already.
+        let language = crate::i18n::language(self);
+        crate::i18n::set_current(language);
+        if self.styled_language != language {
+            self.want_paint = true;
+        }
+        // Frames and worker completions wake the app even while it is hidden.
+        self.frames.set_context(ctx);
+        updates_ui::tick(self, ctx);
+        if self.session.render_job.is_some() {
+            self.session.poll_render();
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        if self.session.track_job.is_some() {
+            self.session.poll_track();
+            ctx.request_repaint_after(std::time::Duration::from_millis(50));
+        }
+        if self.session.mask_job.is_some() {
+            self.session.poll_mask_track();
+            ctx.request_repaint_after(std::time::Duration::from_millis(50));
+        }
+        // Background tasks (Content-Aware Fill, Scene Edit Detection, imports).
+        if !self.session.tasks.is_empty() {
+            self.session.poll_jobs();
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        // Analyses running in a worker (the web app).
+        if !self.session.offloaded.is_empty() {
+            self.session.poll_offload();
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        // Warp Stabilizer: finish analyses and start queued (re-)analyses in the background.
+        if self.session.warp_job.is_some() || !self.session.warp_pending.is_empty() {
+            self.session.poll_warp(true);
+            self.session.poll_roto(true);
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        // Roto Brush propagation and Object Matte tracking / Freeze: finish jobs (a Freeze writes
+        // its mattes) and start queued ones in the background.
+        if self.session.roto_job.is_some() || !self.session.roto_pending.is_empty() {
+            self.session.poll_roto(true);
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        // 3D Camera Tracker: likewise (tracking, then solving).
+        if self.session.camera_job.is_some() || !self.session.camera_pending.is_empty() {
+            self.session.poll_camera(true);
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+        self.run_script_tasks(ctx);
+        self.run_dialog_answers();
+        self.handle_events(ctx);
+        if let Some(rx) = self.command_inbox.take() {
+            while let Ok(id) = rx.try_recv() {
+                if let Err(e) = menus::invoke(self, ctx, &id, json!({})) {
+                    self.ui.status = e;
+                }
+            }
+            self.command_inbox = Some(rx);
+        }
+        // A close request (the window's button, Quit, `app.quit`) must be answered while hidden.
+        // An answered file dialog can change the project, so the answers above run first. The host
+        // calls `panels::unsaved::quit_on_close` last in its `logic`.
+        panels::unsaved::on_close_requested(self, ctx);
+        let title = panels::unsaved::window_title(self);
+        if title != self.window_title {
+            ctx.send_viewport_cmd(egui::ViewportCommand::Title(title.clone()));
+            self.window_title = title;
+        }
+        self.tick_autosave(ctx);
+        self.tick_workspace_autosave(ctx);
+        let now = self.now;
+        prefs_live::tick(self, ctx, now);
+        // Playback advances without a paint (its frames and the audio clock are background work).
+        // Idle prefetch keeps its old condition: it only runs once a viewer has drawn.
+        if (self.playback.playing || self.last_viewer_scale.is_some())
+            && let Some(cid) = self.session.active_comp_id()
+        {
+            let (scale, active) = (self.last_viewer_scale.unwrap_or(1.0), self.input_active);
+            self.advance_playback(ctx, scale, now, active, cid);
+        }
+        self.drain_control(ctx, now);
+        // Screenshot completion, deadlines and issuance are app-side work: the callback only
+        // stores pixels and wakes this viewport.
+        self.tick_screenshots(ctx);
+        // Time-based FPS readout over UI passes (a hidden logic-only tick is not a frame).
+        let dt = (now - self.last_time) as f32;
+        if dt > 0.0 && dt < 2.0 {
+            self.fps = self.fps * 0.9 + (1.0 / dt).min(480.0) * 0.1;
+        }
+        self.last_time = now;
+        // A hidden window paints when work needs a UI pass: queued input and waits, a settled
+        // screenshot, or playback into a child viewport.
+        let focused = self.focused;
+        let child_viewports = !self.ui.dock.layout.floating.is_empty() || prefs_live::video_preview_active(self, focused);
+        let paint = self.want_paint
+            || !self.synthetic.is_empty()
+            || !self.input_waiters.is_empty()
+            || self.pending_screenshots.iter().any(|s| s.slot.is_none())
+            || (self.playback.playing && child_viewports);
+        if paint {
+            self.request_hidden_paint(ctx);
+        }
+    }
+
+    /// Ask the host for a UI pass even when the window is minimized or occluded.
+    ///
+    /// Native eframe honours `RequestPaintWhileHidden`; the shared web backend does not carry it
+    /// yet (a browser does not paint a hidden tab), so the web build only requests a normal
+    /// repaint and hidden web screenshots/input remain unqualified.
+    fn request_hidden_paint(&mut self, ctx: &egui::Context) {
+        self.want_paint = false;
+        #[cfg(not(target_arch = "wasm32"))]
+        ctx.send_viewport_cmd(egui::ViewportCommand::RequestPaintWhileHidden);
+        ctx.request_repaint();
+    }
+
+    /// Install the theme and fonts for the current language. Fonts need a real pass: the pass
+    /// that installs them draws nothing, and the next pass draws with them (the two-pass warm-up
+    /// the app has always had). Never call this from a logic-only tick.
+    fn ui_setup(&mut self, ctx: &egui::Context) {
+        panels::viewer_text::install_hooks(ctx);
+        let language = crate::i18n::language(self);
+        crate::i18n::set_current(language);
+        if (!self.styled || self.styled_language != language) && self.synthetic_in_flight {
+            // The install needs a pass that draws nothing, but this pass has already applied a
+            // synthetic batch: defer the theme/font install by one pass instead of dropping the
+            // input (feeds are only put into a pass that can draw).
+            ctx.request_repaint();
+            return;
+        }
+        if !self.styled || self.styled_language != language {
+            theme::install(ctx, &self.tokens, language);
+            self.styled_language = language;
+            if !self.styled {
+                fit_window(ctx);
+                self.styled = true;
+            }
+            self.fonts_ready = false;
+            ctx.request_repaint();
+        } else if !self.fonts_ready {
+            // The pass after the install draws: egui has the new font definitions by now.
+            self.fonts_ready = true;
+            ctx.request_repaint();
+        }
+    }
+
+    /// One UI pass: setup, input-driven shortcuts, layout and painting. Called from
+    /// `eframe::App::ui` and by tests with the root `Ui`.
+    pub fn draw(&mut self, ui: &mut egui::Ui, frame: &eframe::Frame) {
+        panels::viewer_text::begin_ui(ui.ctx());
+        self.draw_inner(ui, frame);
+        // All exits, including fonts/device loss, observe this pass's real custom availability.
+        panels::viewer_text::finish_ime(self, ui);
+    }
+
+    /// Context creators install these hooks before the first full pass.
+    pub fn install_ime_reset_hooks(ctx: &egui::Context) {
+        panels::viewer_text::install_hooks(ctx);
+    }
+
+    /// Host wrappers call this after their last logic mutation, without replaying UI events.
+    pub fn finish_ime_logic(&self, ctx: &egui::Context) {
+        panels::viewer_text::finish_logic(self, ctx);
+    }
+
+    /// One UI pass after the IME begin hook: close on an applied GPU failure, run `ui_setup`, skip drawing until
+    /// fonts are ready, draw the frame, finish pointer wrapping, pump queued wasm frames, record input activity,
+    /// publish the completed pass's geometry and pass sequence, acknowledge applied synthetic input and answer
+    /// `AfterInput` replies only after a non-discarded pass. Requests repaints while frames are in flight.
+    fn draw_inner(&mut self, ui: &mut egui::Ui, frame: &eframe::Frame) {
+        let ctx = ui.ctx().clone();
+        if self.gpu_failure_applied == Some(true) {
+            self.close_after_device_loss(&ctx);
+            return;
+        }
+        self.ui_setup(&ctx);
+        if !self.fonts_ready {
+            // A pass that installs fonts draws nothing. No synthetic batch is in flight here (the
+            // hook feeds input only to a ready app), and events egui already applied are never
+            // fed again: that would double the pointer/key state of one click.
+            ctx.request_repaint();
+            return;
+        }
+        self.frame(ui);
+        #[cfg(not(target_arch = "wasm32"))]
+        pointer_wrap::finish_native(&ctx, frame);
+        // wasm32: no frame threads; render queued frames now, between UI frames.
+        if cfg!(target_arch = "wasm32") && self.frames.pump(std::time::Duration::from_millis(if self.playback.playing { 24 } else { 40 })) {
+            ctx.request_repaint();
+        }
+        // Input belongs to this known UI phase: record it for the next tick.
+        let active = ctx.input(|i| !i.events.is_empty() || i.pointer.any_down() || i.pointer.is_moving());
+        self.input_active = active;
+        self.last_pointer_down = ctx.input(|i| i.pointer.any_down());
+        // Geometry of a completed pass (a discarded pass is laid out again; only the final one
+        // describes the surface the next capture will see). Window position is irrelevant.
+        if !ctx.will_discard() {
+            let rect = ctx.content_rect();
+            let ppp = ctx.pixels_per_point();
+            let changed = self.draw_geom.is_none_or(|g| g.rect.size() != rect.size() || g.ppp != ppp);
+            if changed {
+                self.geometry_epoch = self.geometry_epoch.wrapping_add(1);
+            }
+            self.draw_geom = Some(DrawGeometry { rect, ppp, epoch: self.geometry_epoch });
+            self.ui_pass_seq = self.ui_pass_seq.saturating_add(1);
+        }
+        // A batch is acknowledged once a UI pass applied it, even if layout was later discarded.
+        self.mark_synthetic_applied();
+        // `AfterInput` replies wait for the final (non-discarded) pass that applied the last
+        // synthetic event: a hidden request is answered only after its forced pass, and a pass
+        // egui throws away cannot produce an early success reply.
+        if !ctx.will_discard() && self.synthetic.is_empty() {
+            for w in self.input_waiters.drain(..) {
+                let _ = w.send(json!({"ok": true, "result": null}));
+            }
+        } else if !self.input_waiters.is_empty() {
+            self.want_paint = true;
+            ctx.request_repaint();
+        }
+        if self.frames.inflight() > 0 {
+            ctx.request_repaint_after(std::time::Duration::from_millis(30));
+        }
+    }
+
+    /// The panels, menus, dialogs and overlays of one pass.
+    fn frame(&mut self, ui: &mut egui::Ui) {
+        let ctx = ui.ctx().clone();
+        // Only a viewer that draws in *this* pass records a scale: a closed viewer, the Home
+        // screen or another comp must stop idle prefetch at a stale scale.
+        self.last_viewer_scale = None;
+        self.apply_prefs(&ctx);
+        // Video Preview is a second viewport: only a real pass can update it.
+        prefs_live::frame(self, &ctx);
+        self.auto.begin_frame();
+        let tab_had_widget_focus = ctx.egui_wants_keyboard_input();
+        menus::handle_shortcuts(self, &ctx);
+        if !ctx.input(|i| i.pointer.primary_down()) {
+            self.ui.viewer.property_interacting = false;
+        }
+        let t = self.tokens;
+        let full = ui.max_rect();
+        if self.dialog.is_some() {
+            ui.disable();
+        }
+        ui.painter().rect_filled(full, 0.0, t.app_bg);
+        let mut top = full.min.y;
+        if self.ui.show_menu_bar {
+            let mb = egui::Rect::from_min_size(full.min, egui::vec2(full.width(), 24.0));
+            let mut child = ui.new_child(egui::UiBuilder::new().max_rect(mb));
+            child.painter().rect_filled(mb, 0.0, t.header_bg);
+            menus::menu_bar(self, &mut child);
+            top = mb.max.y;
+        }
+        let header_h = 40.0;
+        let header = egui::Rect::from_min_size(egui::pos2(full.min.x, top), egui::vec2(full.width(), header_h));
+        header::show(self, ui, header);
+        let body = egui::Rect::from_min_max(egui::pos2(full.min.x + 4.0, header.max.y + 2.0), egui::pos2(full.max.x - 4.0, full.max.y - 4.0));
+        self.dock_area(ui, body);
+        #[cfg(not(target_arch = "wasm32"))]
+        prefs_live::dropped_files(self, ui, full);
+        if !tab_had_widget_focus {
+            menus::handle_tab_shortcut(self, &ctx);
+        }
+        panels::precomp::mini_flowchart(self, &ctx);
+        panels::home::capture_thumbnail(self);
+        panels::dialogs::show(self, &ctx);
+        updates_ui::show(self, &ctx);
+        panels::scriptui_view::sync_panels(self);
+        panels::scriptui_view::show_windows(self, &ctx);
+        panels::learn::coach(self, &ctx);
+        let lift = panels::media_panels::import_card(self, ui, full);
+        self.draw_toast(ui, full, lift);
+    }
+
+    /// Workspace-layout auto-save: a background write that also runs while hidden, once the
+    /// pointer has lifted.
+    fn tick_workspace_autosave(&mut self, ctx: &egui::Context) {
+        if self.session.config.is_none() || !self.workspace_store.has_changes(&self.ui) || self.last_pointer_down {
+            return;
+        }
+        if self.workspace_store.due(self.now) {
+            self.save_workspace_state();
+        }
+        if self.workspace_store.has_changes(&self.ui) {
+            ctx.request_repaint_after(std::time::Duration::from_secs(1));
+        }
+    }
+
+    pub(super) fn save_workspace_state(&mut self) {
+        if let Err(error) = self.workspace_store.save(self.session.config.as_deref(), &self.ui) {
+            if self.workspace_store.error.as_ref() != Some(&error) {
+                log::warn!("{error}");
+                self.ui.status = error.clone();
+            }
+            self.workspace_store.error = Some(error);
+        }
+    }
+
+    /// The status message or the latest toast, bottom left (`lift` points higher while the
+    /// Importing card is there).
+    fn draw_toast(&mut self, ui: &mut egui::Ui, full: egui::Rect, lift: f32) {
+        let now = self.now;
+        let msg = if !self.ui.status.is_empty() {
+            Some(self.ui.status.clone())
+        } else {
+            self.toast.as_ref().filter(|(_, at)| now - at < 4.0).map(|(m, _)| m.clone())
+        };
+        if let Some(m) = msg {
+            let t = &self.tokens;
+            let galley = ui.painter().layout_no_wrap(m.clone(), Tokens::ui(12.0), t.text);
+            let r = egui::Rect::from_min_size(egui::pos2(full.min.x + 16.0, full.max.y - 44.0 - lift), galley.size() + egui::vec2(24.0, 14.0));
+            ui.painter().rect_filled(r, 6.0, t.panel_bg);
+            ui.painter().rect_stroke(r, 6.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+            ui.painter().galley(r.min + egui::vec2(12.0, 7.0), galley, t.text);
+            self.auto.add("toast", r, &m);
+            let resp = ui.interact(r, egui::Id::unique("toast"), egui::Sense::click());
+            if resp.clicked() {
+                self.ui.status.clear();
+                self.toast = None;
+            }
+            ui.ctx().request_repaint_after(std::time::Duration::from_millis(500));
+            if !self.ui.status.is_empty() {
+                let since: f64 = ui.data(|d| d.get_temp(egui::Id::unique("status-since")).unwrap_or(now));
+                ui.data_mut(|d| d.insert_temp(egui::Id::unique("status-since"), since));
+                if now - since > 5.0 {
+                    self.ui.status.clear();
+                    ui.data_mut(|d| d.remove::<f64>(egui::Id::unique("status-since")));
+                }
+            }
+        }
+    }
+}
+
+impl EffectcraftApp {
+    /// Scripts' `app.scheduleTask` tasks that are due (repeating ones keep a ScriptUI panel
+    /// fresh): errors as a toast, the last line printed in the status bar, and a repaint when
+    /// the next one is due.
+    fn run_script_tasks(&mut self, ctx: &egui::Context) {
+        if self.session.script_ui.task_hosts.is_empty() {
+            return;
+        }
+        let previous_comp = self.session.active_comp_id();
+        let Some(r) = effectcraft_engine::scriptui::ScriptUi::run_tasks(&mut self.session) else { return };
+        if self.session.active_comp_id().is_some() && self.session.active_comp_id() != previous_comp {
+            self.ui.start_screen = false;
+        }
+        if let Some(msg) = r["errors"].as_array().and_then(|e| e.first()).and_then(|e| e["message"].as_str()) {
+            self.toast = Some((format!("Scheduled script task: {msg}"), self.now));
+        } else if let Some(line) = r["output"].as_array().and_then(|o| o.last()).and_then(|l| l.as_str()) {
+            self.ui.status = line.to_string();
+        }
+        if let Some(next) = r["next"].as_u64() {
+            ctx.request_repaint_after(std::time::Duration::from_millis(next));
+        }
+    }
+
+    /// Auto-save a dirty project when the interval has passed (Settings ▸ Project ▸ Auto-Save).
+    fn tick_autosave(&mut self, ctx: &egui::Context) {
+        // Monotonic app time: a wall-clock jump must not skip or repeat an auto-save.
+        let now = self.now;
+        if let Some(Err(e)) = self.session.autosave_tick(now) {
+            self.ui.status = e.to_string();
+        }
+        if self.session.prefs.auto_save.enabled {
+            ctx.request_repaint_after(std::time::Duration::from_secs(30));
+        }
+        // File ▸ Watch Folder: look for new projects every 10 seconds.
+        if self.session.state.watch_folder.is_some() {
+            let key = egui::Id::unique("watchFolder.lastPoll");
+            let last: f64 = ctx.data(|d| d.get_temp(key)).unwrap_or(0.0);
+            if now - last >= 10.0 {
+                ctx.data_mut(|d| d.insert_temp(key, now));
+                match self.session.execute("file.watchFolder.poll", serde_json::json!({})) {
+                    Ok(r) => {
+                        if let Some(n) = r["rendered"].as_array().map(Vec::len).filter(|n| *n > 0) {
+                            self.ui.status = format!("Watch Folder: rendered {n} project(s)");
+                        }
+                    }
+                    Err(e) => self.ui.status = e.to_string(),
+                }
+            }
+            ctx.request_repaint_after(std::time::Duration::from_secs(10));
+        }
+        self.tick_footage_reload(ctx, now);
+    }
+
+    /// Settings ▸ Import ▸ Reload Footage Changed on Disk: every two seconds, and as soon as the
+    /// window comes back to the front (after saving in another app), stamp the footage files on a
+    /// worker thread and reload the ones that changed.
+    fn tick_footage_reload(&mut self, ctx: &egui::Context, now: f64) {
+        use effectcraft_engine::footage_reload;
+        if let Some(Err(e)) = footage_reload::poll_scan(&mut self.session) {
+            self.ui.status = e.to_string();
+        }
+        let (last_key, focus_key) = (egui::Id::unique("footageReload.lastScan"), egui::Id::unique("footageReload.focused"));
+        let focused = self.focused;
+        let was_focused: bool = ctx.data(|d| d.get_temp(focus_key)).unwrap_or(focused);
+        ctx.data_mut(|d| d.insert_temp(focus_key, focused));
+        if self.session.prefs.import.auto_reload_footage == "off" || self.session.project.items.is_empty() {
+            return;
+        }
+        let last: f64 = ctx.data(|d| d.get_temp(last_key)).unwrap_or(0.0);
+        if now - last >= 2.0 || (focused && !was_focused) {
+            ctx.data_mut(|d| d.insert_temp(last_key, now));
+            footage_reload::start_scan(&mut self.session);
+        }
+        if self.session.footage_scan.is_some() {
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        } else {
+            ctx.request_repaint_after(std::time::Duration::from_secs(2));
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/gpu.rs b/crates/ui-egui/src/app/gpu.rs
new file mode 100644
index 000000000..9febfa413
--- /dev/null
+++ b/crates/ui-egui/src/app/gpu.rs
@@ -0,0 +1,222 @@
+use super::{Arc, EffectcraftApp, RenderSource, gpu_failure, menus, panels};
+
+impl EffectcraftApp {
+    pub fn render_source(&self) -> RenderSource {
+        RenderSource {
+            project: self.session.project.clone(),
+            footage: self.session.footage.clone(),
+            expr: self.session.expr.clone(),
+            layer_cache: self.session.layer_cache.clone(),
+            gpu: self.gpu.clone(),
+            gpu_display: self.gpu_display(),
+            disk: self.session.disk_cache.clone(),
+        }
+    }
+
+    /// Keep GPU-composited viewer frames on the GPU (drawn from their texture). The browser can't
+    /// read frames back (its thread can't wait for the GPU), so there the viewer shows GPU frames
+    /// directly whenever it draws them plainly (RGB, no exposure, no region of interest); the
+    /// desktop reads them back (see [`frames::RenderSource::gpu_display`]).
+    fn gpu_display(&self) -> bool {
+        let v = &self.session.state.viewer;
+        cfg!(target_arch = "wasm32")
+            && v.channel == effectcraft_engine::viewer::Channel::Rgb
+            && v.exposure == 0.0
+            && self.session.state.region_of_interest.is_none()
+            && self.ui.viewer.extended.is_none()
+    }
+
+    /// The UI draws its panels and handles input such as dropped files. Until the fonts are
+    /// installed (the first frames) it draws nothing, and that input goes unhandled.
+    pub fn is_ready(&self) -> bool {
+        self.fonts_ready
+    }
+
+    /// Provide the executable/embedding host's device notifications. The host installs the
+    /// handlers once; this frontend never replaces handlers on a borrowed device.
+    pub fn set_gpu_failure_bridge(&mut self, bridge: gpu_failure::GpuFailureBridge) {
+        if let Some(gpu) = &self.gpu {
+            bridge.forward_to(gpu.context().device_failure_notifier());
+        }
+        self.gpu_failures = Some(bridge);
+    }
+
+    pub(super) fn apply_gpu_failure(&mut self, ctx: &egui::Context) {
+        let Some(bridge) = &self.gpu_failures else { return };
+        // Readback deadlines can retire the compositor without a host device notification.
+        if let Some(gpu) = &self.gpu
+            && let Err(reason) = gpu.context().check_health()
+        {
+            bridge.report(&reason, false);
+        }
+        let Some(failure) = bridge.failure() else { return };
+        if self.gpu_failure_applied == Some(failure.presentation_lost) {
+            return;
+        }
+        self.gpu_failure_applied = Some(failure.presentation_lost);
+        self.gpu_checked = true;
+        self.frames.retire_gpu();
+        self.session.accel = None;
+        self.session.accel_note = Some(format!("GPU preview retired: {}", failure.reason));
+        self.session.layer_cache.clear();
+        self.gpu = None;
+        if let Some(rs) = &self.wgpu {
+            let mut renderer = rs.renderer.write();
+            if let Some((id, _, _)) = &self.viewer_native {
+                renderer.free_texture(id);
+            }
+            for (_, texture) in self.passive_tex.values() {
+                if let panels::viewers::PassiveTexture::Gpu(id, _) = texture {
+                    renderer.free_texture(id);
+                }
+            }
+        }
+        self.viewer_native = None;
+        self.passive_tex.retain(|_, (_, texture)| matches!(texture, panels::viewers::PassiveTexture::Cpu(_)));
+        self.viewer_shown = self.viewer_tex.as_ref().map(|(texture, key, _)| (texture.id(), *key));
+        self.viewer_image = None;
+        // Old completion closures retain only their detached slot, not the replacement.
+        self.viewer_readback = Default::default();
+        self.wgpu = None;
+        self.ui.status = if failure.presentation_lost {
+            "Graphics device lost. The project is still open; presentation requires restarting the application.".into()
+        } else {
+            "Shared GPU preview disabled; CPU compositing remains available.".into()
+        };
+        log::warn!("GPU preview retired: {}", failure.reason);
+        ctx.request_repaint();
+    }
+
+    /// After the graphics device is lost, eframe's renderer cannot draw again: any mesh makes
+    /// egui-wgpu panic on the main thread when it cannot stage its index buffer (#591). Draw
+    /// nothing from then on, auto-save a project with unsaved changes (keeping the crash
+    /// recovery marker, so the next launch offers it) and close the window.
+    pub(super) fn close_after_device_loss(&mut self, ctx: &egui::Context) {
+        if self.device_lost_close.is_some() {
+            return;
+        }
+        let keep_recovery = self.session.is_dirty();
+        let saved = keep_recovery.then(|| match self.session.autosave_now().and_then(|path| self.session.autosave_wait().map(|()| path)) {
+            Ok(path) => {
+                log::warn!("graphics device lost: auto-saved {path}; the next launch offers to recover it");
+                Ok(path)
+            }
+            Err(e) => {
+                log::error!("graphics device lost: {e}");
+                Err(e.to_string())
+            }
+        });
+        self.device_lost_close = Some(keep_recovery);
+        log::warn!("graphics device lost: closing the window");
+        if let Some(tell) = &self.hooks.device_lost {
+            tell(saved);
+        }
+        ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+    }
+
+    /// Run the commands whose non-blocking file dialogs have been answered.
+    pub(crate) fn run_dialog_answers(&mut self) {
+        while let Ok(answer) = self.dialog_answers.1.try_recv() {
+            self.file_dialogs.answered();
+            menus::dialog_answered(self, answer);
+        }
+    }
+
+    /// Set up the GPU compositor on egui-wgpu's device (once). Without an adapter that runs
+    /// compute shaders (WebGL2, software GL) everything stays on the CPU.
+    pub(crate) fn init_gpu(&mut self, frame: &eframe::Frame) {
+        if self.gpu_checked {
+            return;
+        }
+        self.gpu_checked = true;
+        if self.gpu_failures.as_ref().is_some_and(|bridge| bridge.failure().is_some()) {
+            return;
+        }
+        let Some(rs) = frame.wgpu_render_state() else { return };
+        // Help ▸ System Compatibility Report names the adapter and backend the window got.
+        let info = rs.adapter.get_info();
+        self.session.window_adapter = Some(format!(
+            "{} ({:?}, {:?}{})",
+            info.name,
+            info.backend,
+            info.device_type,
+            if info.driver.is_empty() { String::new() } else { format!(", {} {}", info.driver, info.driver_info) }
+        ));
+        // Backend validation can panic on shader compilation even when device creation
+        // succeeded. Keep the document and the egui renderer, and use CPU compositing.
+        let gpu = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| effectcraft_gpu::Gpu::new(&rs.adapter, rs.device.clone(), rs.queue.clone())));
+        match gpu {
+            Ok(Ok(g)) => {
+                if let Some(bridge) = &self.gpu_failures {
+                    bridge.forward_to(g.context().device_failure_notifier());
+                    if bridge.failure().is_some() {
+                        return;
+                    }
+                }
+                log::info!("GPU compositor: {}", effectcraft_engine::render::Accelerator::name(&g));
+                self.session.accel = Some(Arc::new(g.clone()));
+                self.gpu = Some(g);
+                self.wgpu = Some(rs.clone());
+            }
+            Ok(Err(e)) => {
+                log::info!("GPU compositor unavailable: {e}");
+                self.session.accel_note = Some(format!("GPU compositor unavailable: {e}"));
+            }
+            Err(e) => {
+                let reason = e.downcast_ref::<String>().map(String::as_str).or_else(|| e.downcast_ref::<&str>().copied()).unwrap_or("backend panicked");
+                log::warn!("GPU compositor setup failed; using CPU compositing: {reason}");
+                self.session.accel_note = Some(format!("GPU compositor setup failed: {reason}"));
+            }
+        }
+    }
+
+    /// The viewer shows a frame composited on the GPU (drawn from its wgpu texture).
+    pub fn viewer_on_gpu(&self) -> bool {
+        matches!((&self.viewer_shown, &self.viewer_native), (Some(s), Some(n)) if s.1 == n.1)
+    }
+
+    /// The GPU compositor's adapter, when the viewer has one.
+    pub fn gpu_adapter(&self) -> Option<String> {
+        self.gpu.as_ref().map(effectcraft_engine::render::Accelerator::name)
+    }
+}
+
+#[cfg(test)]
+mod gpu_failure_tests {
+    use super::*;
+    use crate::{FrameKey, ItemId, RenderOpts, Session, Tick, json};
+
+    #[test]
+    fn host_failure_preserves_document_undo_and_cpu_pixels_and_detaches_late_readbacks() {
+        let mut session = Session::default();
+        let comp = ItemId(session.execute("comp.new", json!({"name": "Recovery", "width": 4, "height": 4, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+        session.execute("layer.newSolid", json!({"comp": comp.0, "color": "#ff0000"})).unwrap();
+        let before = session.render(comp, Tick::ZERO, RenderOpts::default());
+        let project = session.project.clone();
+        let revision = session.revision;
+        let prefs = serde_json::to_value(&session.prefs).unwrap();
+        let mut app = EffectcraftApp::new(session);
+        let ctx = egui::Context::default();
+        let bridge = gpu_failure::GpuFailureBridge::new(&ctx);
+        app.set_gpu_failure_bridge(bridge.clone());
+        let late_slot = app.viewer_readback.1.clone();
+        let key = FrameKey { revision, content: 1, comp: comp.0, frame: 0, scale: 1000, view: 0, opts: 0 };
+        app.viewer_readback.0 = Some(key);
+        bridge.report("synthetic host device failure", true);
+        app.apply_gpu_failure(&ctx);
+        assert!(Arc::ptr_eq(&project, &app.session.project));
+        assert_eq!(app.session.revision, revision);
+        assert_eq!(serde_json::to_value(&app.session.prefs).unwrap(), prefs);
+        assert!(app.gpu_checked, "failed device cannot be initialized again next frame");
+        assert!(app.session.accel.is_none());
+        assert!(app.ui.status.contains("presentation requires restarting"));
+        assert_eq!(app.session.render(comp, Tick::ZERO, RenderOpts::default()).data, before.data);
+        *late_slot.lock().unwrap() = Some((key, Arc::new(egui::ColorImage::new([1, 1], vec![egui::Color32::RED]))));
+        assert!(app.viewer_readback.0.is_none());
+        assert!(app.viewer_readback.1.lock().unwrap().is_none(), "a late completion cannot refill the replacement slot");
+        app.session.execute("edit.undo", json!({})).unwrap();
+        assert!(app.session.project.comp(comp).unwrap().layers.is_empty());
+        app.session.execute("edit.redo", json!({})).unwrap();
+        assert_eq!(app.session.render(comp, Tick::ZERO, RenderOpts::default()).data, before.data);
+    }
+}
diff --git a/crates/ui-egui/src/app/input.rs b/crates/ui-egui/src/app/input.rs
new file mode 100644
index 000000000..18a30c254
--- /dev/null
+++ b/crates/ui-egui/src/app/input.rs
@@ -0,0 +1,60 @@
+use super::*;
+
+impl EffectcraftApp {
+    /// Feed this frame's share of the queued synthetic input (control channel `ui.click`,
+    /// `ui.drag`…) into `raw_input`. Pointer events go one per frame so egui sees press → moves
+    /// → release as a real gesture.
+    ///
+    /// Only one batch is ever moved out at a time, even when the host prepares several hidden
+    /// logic-only iterations before the forced UI pass: eframe keeps the last prepared raw input
+    /// and would otherwise apply a whole drag or click as one burst. A batch is released by the
+    /// first UI pass that applies it ([`Self::mark_synthetic_applied`]). Callers must not feed a
+    /// pass that cannot draw (fonts still installing): egui applies what it receives, so putting
+    /// an applied batch back would apply its pointer/key state twice.
+    pub fn feed_synthetic(&mut self, raw_input: &mut egui::RawInput) {
+        if self.synthetic_in_flight || self.synthetic.is_empty() {
+            return;
+        }
+        // Pointer events go one per frame so egui sees press → moves → release as a real drag.
+        let pointer = |e: &egui::Event| matches!(e, egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } | egui::Event::MouseWheel { .. });
+        let n = if pointer(&self.synthetic[0]) {
+            1
+        } else {
+            self.synthetic
+                .iter()
+                .position(|e| pointer(e) || matches!(e, egui::Event::Key { pressed: false, .. }))
+                .map_or(self.synthetic.len(), |i| if pointer(&self.synthetic[i]) { i.max(1) } else { i + 1 })
+        };
+        let batch: Vec<egui::Event> = self.synthetic.drain(..n).collect();
+        raw_input.events.extend(batch.iter().cloned());
+        self.synthetic_in_flight_events.extend(batch);
+        self.synthetic_in_flight = true;
+    }
+
+    /// Clear the single-pending-batch guard: a UI pass has applied the injected batch.
+    ///
+    /// [`EffectcraftApp::draw`] calls this itself; harnesses that feed synthetic input
+    /// themselves (the headless kittest tests) call it after each pass they ran.
+    pub fn mark_synthetic_applied(&mut self) {
+        self.synthetic_in_flight_events.clear();
+        self.synthetic_in_flight = false;
+    }
+
+    /// The events of the injected batch that no UI pass has applied yet.
+    pub fn pending_synthetic_events(&self) -> &[egui::Event] {
+        &self.synthetic_in_flight_events
+    }
+
+    /// Whether a synthetic batch is waiting for its UI pass.
+    pub fn synthetic_in_flight(&self) -> bool {
+        self.synthetic_in_flight
+    }
+}
+
+impl EffectcraftApp {
+    /// Take the pending synthetic input (from `ui.click`, `ui.key`, …). Hosts that don't call
+    /// [`eframe::App::raw_input_hook`] (the headless test harness) feed these in themselves.
+    pub fn take_synthetic_input(&mut self) -> Vec<egui::Event> {
+        std::mem::take(&mut self.synthetic)
+    }
+}
diff --git a/crates/ui-egui/src/app/playback.rs b/crates/ui-egui/src/app/playback.rs
new file mode 100644
index 000000000..912a196f8
--- /dev/null
+++ b/crates/ui-egui/src/app/playback.rs
@@ -0,0 +1,186 @@
+use super::*;
+
+impl EffectcraftApp {
+    // ---------------------------------------------------------------- playback
+
+    pub fn play(&mut self, now: f64) {
+        let sc = self.session.prefs.preview.current;
+        self.play_with(now, sc);
+    }
+
+    /// Start the preview of a Preview panel shortcut (its range, play-from, rate, skip,
+    /// resolution, loop, caching, full screen and include options).
+    pub fn play_with(&mut self, now: f64, sc: effectcraft_engine::preview::PreviewShortcut) {
+        let Some(c) = self.session.active_comp_arc() else { return };
+        let preset = self.session.prefs.preview.get(sc).clone();
+        let plan = effectcraft_engine::preview::plan(&preset, &c, self.session.time());
+        let fr = c.frame_rate;
+        if plan.video {
+            self.session.set_time(fr.tick_of(plan.first));
+        }
+        let restore_max = preset.full_screen.then_some(self.ui.maximized);
+        let viewer = panels::viewers::active_panel(self);
+        if preset.full_screen && self.ui.dock.is_docked(viewer) {
+            self.ui.maximized = Some(viewer);
+        }
+        self.playback = Playback {
+            playing: true,
+            start_wall: now,
+            start_time: fr.tick_of(plan.first),
+            start_frame: plan.first,
+            shown: 0,
+            waiting: false,
+            fps: plan.fps,
+            shortcut: sc,
+            plan: Some(plan),
+            caching: plan.cache_first && plan.video,
+            res: preset.resolution.factor(preset.custom_resolution),
+            overlays: preset.include_overlays,
+            layer_controls: preset.include_layer_controls,
+            restore_max,
+            audio_frame: (!plan.video).then_some(plan.first),
+            audio_held: false,
+            shown_at: Default::default(),
+        };
+        if !self.playback.caching {
+            if plan.video {
+                self.playback.audio_held = self.audio_plays();
+            } else {
+                self.start_audio(fr.tick_of(plan.first));
+            }
+        }
+    }
+
+    /// The preview includes audio at the comp's frame rate and the comp has something audible.
+    fn audio_plays(&self) -> bool {
+        let (Some(pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return false };
+        let Some(c) = self.session.project.comp(cid) else { return false };
+        // A preview at another frame rate plays slower or faster than real time: silent.
+        pl.audio && (pl.fps - c.frame_rate.as_f64()).abs() <= 0.01 && effectcraft_engine::render::audio::comp_has_audio(&self.session.project, cid)
+    }
+
+    /// Start audio preview from comp time `t` when [`Self::audio_plays`] and an output device
+    /// opens.
+    pub(super) fn start_audio(&mut self, t: Tick) {
+        self.audio = None;
+        self.meter.clipped = [false; 2];
+        let (Some(pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return };
+        let Some(c) = self.session.project.comp_arc(cid).filter(|_| self.audio_plays()) else { return };
+        let out = audio::AudioOutput::from_prefs(&self.session.prefs);
+        let Some(dev) = self.hooks.audio_device.as_ref().and_then(|f| f(&out)) else { return };
+        let mix = self.session.prefs.audio.preview_sample_rate;
+        let fr = c.frame_rate;
+        match audio::AudioPlayback::start(dev, self.render_source(), cid, t, fr.tick_of(pl.start), fr.tick_of(pl.end + 1), pl.looping, mix) {
+            Ok(a) => self.audio = Some(a),
+            Err(e) => log::warn!("audio preview: {e}"),
+        }
+    }
+
+    /// Audio scrubbing: play the frame of `comp` at `t` (see [`audio::AudioScrub`]), opening the
+    /// output on first use. Silent comps and missing devices do nothing.
+    pub fn scrub_audio(&mut self, comp: ItemId, t: Tick, now: f64) {
+        if self.playback.playing || !effectcraft_engine::render::audio::comp_has_audio(&self.session.project, comp) {
+            return;
+        }
+        if self.scrub.is_none() {
+            let out = audio::AudioOutput::from_prefs(&self.session.prefs);
+            let Some(dev) = self.hooks.audio_device.as_ref().and_then(|f| f(&out)) else { return };
+            match audio::AudioScrub::open(dev, now) {
+                Ok(s) => self.scrub = Some(s),
+                Err(e) => {
+                    log::warn!("audio scrubbing: {e}");
+                    return;
+                }
+            }
+        }
+        let src = self.render_source();
+        let mix = self.session.prefs.audio.preview_sample_rate;
+        if let Some(s) = &mut self.scrub {
+            s.play(&src, comp, t, mix, now);
+        }
+    }
+
+    pub fn stop(&mut self) {
+        let was = std::mem::replace(&mut self.playback.playing, false);
+        self.audio = None;
+        self.playback.caching = false;
+        if !was {
+            return;
+        }
+        if let Some(m) = self.playback.restore_max.take() {
+            self.ui.maximized = m;
+        }
+        let Some(pl) = self.playback.plan else { return };
+        let move_time = self.session.prefs.preview.get(self.playback.shortcut).move_time_to_preview_time;
+        if !move_time {
+            self.session.set_time(pl.origin);
+        } else if let Some(f) = self.playback.audio_frame
+            && let Some(c) = self.session.active_comp()
+        {
+            let t = c.frame_rate.tick_of(f);
+            self.session.set_time(t);
+        }
+    }
+
+    pub fn toggle_play(&mut self, now: f64) {
+        let sc = self.session.prefs.preview.current;
+        self.toggle_play_with(now, sc);
+    }
+
+    /// A preview shortcut pressed: start its preview, or stop the running one. While Cache
+    /// Before Playback is still rendering, "If caching, play cached frames" plays what is
+    /// cached so far instead of stopping.
+    pub fn toggle_play_with(&mut self, now: f64, sc: effectcraft_engine::preview::PreviewShortcut) {
+        if !self.playback.playing {
+            self.play_with(now, sc);
+            return;
+        }
+        if self.playback.caching && self.session.prefs.preview.get(self.playback.shortcut).play_cached_frames && self.play_cached(now) {
+            return;
+        }
+        self.stop();
+    }
+
+    /// Cut the caching preview down to the frames cached from its first frame on and play them.
+    fn play_cached(&mut self, now: f64) -> bool {
+        let (Some(mut pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return false };
+        let scale = self.viewer_shown.as_ref().map(|(_, k)| k.scale as f64 / 1000.0).unwrap_or(1.0);
+        let series = self.frame_series(cid, scale);
+        let mut last = None;
+        let mut f = pl.first;
+        while f <= pl.end && self.frames.is_cached(&FrameKey { frame: f, ..series }) {
+            last = Some(f);
+            f += pl.step;
+        }
+        let Some(last) = last else { return false };
+        pl.end = last;
+        pl.start = pl.first;
+        self.playback.plan = Some(pl);
+        self.playback.caching = false;
+        self.playback.start_wall = now;
+        self.playback.start_frame = pl.first;
+        let t = self.session.active_comp().map(|c| c.frame_rate.tick_of(pl.first)).unwrap_or_default();
+        self.start_audio(t);
+        true
+    }
+
+    /// A preview plays with Video off in the Preview panel (audio only): the current time stays
+    /// put, so the viewer and Timeline say so instead of looking stuck (#1118). The frame under
+    /// the audible sample, when one is known.
+    pub fn video_preview_off(&self) -> Option<Option<i64>> {
+        let p = self.playback.plan.filter(|_| self.playback.playing)?;
+        (!p.video).then_some(self.playback.audio_frame)
+    }
+
+    /// The viewer shows grids, guides and safe margins (hidden while a preview without
+    /// Include Overlays plays).
+    pub fn overlays_visible(&self) -> bool {
+        !self.playback.playing || self.playback.overlays
+    }
+
+    /// The viewer shows layer handles and paths (View ▸ Show Layer Controls, and Include Layer
+    /// Controls while a preview plays).
+    pub fn layer_controls_visible(&self) -> bool {
+        self.ui.viewer.show_layer_controls && (!self.playback.playing || self.playback.layer_controls)
+    }
+}
diff --git a/crates/ui-egui/src/app/prefetch.rs b/crates/ui-egui/src/app/prefetch.rs
new file mode 100644
index 000000000..1fdf0aad1
--- /dev/null
+++ b/crates/ui-egui/src/app/prefetch.rs
@@ -0,0 +1,381 @@
+use super::{EffectcraftApp, FrameKey, FrameWindow, ItemId, PlaybackPass, audio, frames};
+
+/// Seconds without a project change before paused prefetch resumes (see
+/// [`EffectcraftApp::editing`]).
+const EDIT_QUIET: f64 = 0.3;
+
+impl EffectcraftApp {
+    /// RAM preview: advance at the preview's frame rate when frames are cached; otherwise hold
+    /// and keep rendering ahead (the green cache bar fills, then playback runs in real time).
+    pub(super) fn advance_playback(&mut self, ctx: &egui::Context, scale: f64, now: f64, input_active: bool, cid: ItemId) {
+        let Some(c) = self.session.project.comp_arc(cid) else { return };
+        let fr = c.frame_rate;
+        let plan = self.playback.plan.filter(|_| self.playback.playing);
+        let (wa, wb) = match plan {
+            Some(p) => (p.start, p.end),
+            None => (fr.frame_at(c.work_area.0), fr.frame_at(c.work_area.1 - c.frame_duration())),
+        };
+        let looping = plan.is_none_or(|p| p.looping);
+        let video = plan.is_none_or(|p| p.video);
+        // Prefetch ahead.
+        let cur = fr.frame_at(self.session.time());
+        let ahead = self.prefetch_ahead(ctx, now);
+        let queued = self.frames.inflight();
+        let series = self.frame_series(cid, scale);
+        // The preview's position orders prefetch and eviction (#595).
+        let playhead = plan.filter(|p| p.video).map(|p| frames::Playhead { series, cur, start: p.start, end: p.end, step: p.step, looping: p.looping });
+        self.frames.set_playhead(playhead);
+        let pass = PlaybackPass {
+            ctx,
+            comp: &c,
+            cid,
+            scale,
+            now,
+            frame_rate: fr,
+            series,
+            plan,
+            window: FrameWindow { first: wa, last: wb },
+            cur,
+            video,
+            looping,
+            ahead,
+            queued,
+        };
+        if self.cache_preview(&pass) {
+            return;
+        }
+        let step = plan.map_or(1, |p| p.step);
+        let fit_ahead = self.frames_that_fit(&c, scale) - 1;
+        self.prefetch_playback(&pass, fit_ahead);
+        self.pump_meters(ctx, now);
+        if !self.playback.playing {
+            self.cache_when_idle(ctx, &c, &series, now, input_active, (wa, wb));
+            return;
+        }
+        let fit = self.frames_that_fit(&c, scale);
+        self.start_held_audio(&pass, fit);
+        if self.advance_audio_clock(&pass, step) {
+            return;
+        }
+        self.advance_frame_clock(&pass, step);
+    }
+
+    /// While paused (scrubbing, editing) the viewer's frame comes first: prefetch only a few
+    /// frames, only once it is done, and not while edits keep coming (a layer dragged in the
+    /// viewer): those frames would be stale at the next step and would hold the CPU and GPU
+    /// the next viewer frame needs.
+    fn prefetch_ahead(&mut self, ctx: &egui::Context, now: f64) -> i64 {
+        if self.playback.playing {
+            (self.frames_parallelism() * 2).max(4) as i64
+        } else if self.frames.urgent_pending() {
+            0
+        } else if let Some(wait) = self.editing(now) {
+            ctx.request_repaint_after(std::time::Duration::from_secs_f64(wait));
+            0
+        } else {
+            // Keep workers available for a newly edited viewer frame. Running obsolete
+            // background renders cannot be preempted by the priority queue.
+            self.frames_parallelism().saturating_sub(1).min(2) as i64
+        }
+    }
+
+    /// Cache Before Playback: the range in play order, then start the clock. A range larger than
+    /// the RAM preview budget is cut to the frames that fit (caching more would evict the first
+    /// ones and never finish). Returns true when this pass handled the preview.
+    fn cache_preview(&mut self, pass: &PlaybackPass<'_>) -> bool {
+        let PlaybackPass { ctx, comp, cid, scale, now, frame_rate: fr, series, plan, ahead, mut queued, .. } = *pass;
+        if !self.playback.caching {
+            return false;
+        }
+        let Some(p) = plan else { return false };
+        let mut all = true;
+        let n = (p.end - p.start) / p.step + 1;
+        let fit = self.frames_that_fit(comp, scale);
+        if n > fit {
+            let mut cut = p;
+            (cut.start, cut.end) = (p.first, (p.first + (fit - 1) * p.step).min(p.end));
+            self.playback.plan = Some(cut);
+            self.toast = Some((format!("Preview cut to {fit} of {n} frames: no more fit in the RAM preview (Settings ▸ Memory & CPU)"), now));
+            ctx.request_repaint();
+            return true;
+        }
+        let order: Vec<i64> = (0..n).filter_map(|k| p.frame_after(p.first, k)).collect();
+        for f in order {
+            if self.frames.is_cached(&FrameKey { frame: f, ..series }) {
+                continue;
+            }
+            all = false;
+            if queued < ahead as usize {
+                self.request_frame(cid, f, scale);
+                queued += 1;
+            }
+        }
+        self.playback.waiting = !all;
+        if all {
+            self.playback.caching = false;
+            self.playback.start_wall = now;
+            self.playback.start_frame = p.first;
+            self.session.set_time(fr.tick_of(p.first));
+            self.start_audio(fr.tick_of(p.first));
+        }
+        ctx.request_repaint();
+        true
+    }
+
+    /// Never further ahead than the RAM preview holds: those frames would evict the ones the
+    /// preview shows first, or be evicted before it gets there (#595). The window starts at the
+    /// first uncached frame ahead: after a loop or a restart the frames just ahead are cached,
+    /// and a window from the playhead left the workers idle until it came near the end of the
+    /// cached run. It stays ahead × 3 frames wide: workers spread over the whole preview render
+    /// frames with different layers at once (on the GPU, an atlas each: #1812).
+    fn prefetch_playback(&self, pass: &PlaybackPass<'_>, fit_ahead: i64) {
+        let PlaybackPass { cid, scale, plan, cur, ahead, series, mut queued, video, .. } = *pass;
+        let FrameWindow { first: wa, last: wb } = pass.window;
+        let frame = |k: i64| match plan {
+            Some(p) => p.frame_after(cur, k),
+            None => {
+                let f = cur + k;
+                Some(if f > wb { wa + (f - wb - 1).rem_euclid((wb - wa + 1).max(1)) } else { f })
+            }
+        };
+        let cached = self.frames.cached_frames(&series);
+        let uncached = |f: i64| cached.binary_search(&f).is_err();
+        let first = match plan.filter(|_| self.playback.playing) {
+            Some(p) => (0..fit_ahead.min((p.end - p.start) / p.step.max(1) + 1))
+                .map_while(|k| frame(k).map(|f| (k, f)))
+                .find(|&(_, f)| uncached(f))
+                .map_or(0, |(k, _)| k),
+            None => 0,
+        };
+        for k in first..(first + ahead * 3).min(fit_ahead) {
+            if queued >= ahead as usize || !video {
+                break;
+            }
+            let Some(f) = frame(k) else { break };
+            if uncached(f) {
+                self.request_frame(cid, f, scale);
+                queued += 1;
+            }
+        }
+    }
+
+    /// Advance the audio or scrub output and feed its latest peaks to the level meter; an idle scrub is closed after
+    /// one second. With no source but an active meter, drive the meter to silence and request a repaint.
+    fn pump_meters(&mut self, ctx: &egui::Context, now: f64) {
+        if let Some(a) = &mut self.audio {
+            a.pump();
+            self.meter.update(a.feed.take_peaks(), now);
+        } else if let Some(s) = &mut self.scrub {
+            // Scrubbing: the meters follow the snippets; an idle second closes the output.
+            s.pump();
+            self.meter.update(s.feed.take_peaks(), now);
+            if now - s.last_used > 1.0 {
+                self.scrub = None;
+            }
+            ctx.request_repaint_after(std::time::Duration::from_millis(50));
+        } else if self.meter.active() {
+            self.meter.update([0.0; 2], now);
+            ctx.request_repaint();
+        }
+    }
+
+    /// Held sound starts once the frames ahead are cached (see `Playback::audio_held`): the
+    /// prefetch window when the silent preview keeps real time, else the rest of the preview.
+    fn start_held_audio(&mut self, pass: &PlaybackPass<'_>, fit: i64) {
+        let PlaybackPass { now, plan, series, cur, ahead, frame_rate: fr, .. } = *pass;
+        if !self.playback.audio_held {
+            return;
+        }
+        let Some(p) = plan else { return };
+        if (self.playback.keeps_up(now) && self.cached_ahead(&p, &series, cur, ahead.min(fit))) || self.cached_ahead(&p, &series, cur, fit) {
+            self.playback.audio_held = false;
+            self.playback.start_wall = now;
+            self.playback.start_frame = cur;
+            self.start_audio(fr.tick_of(cur));
+        }
+    }
+
+    /// Audio clock drives playback: show the frame under the audible sample. Returns true when
+    /// the audio path handled this pass (including stopping at the end).
+    fn advance_audio_clock(&mut self, pass: &PlaybackPass<'_>, step: i64) -> bool {
+        let PlaybackPass { ctx, now, series, video, frame_rate: fr, cur, .. } = *pass;
+        let FrameWindow { first: wa, last: wb } = pass.window;
+        let Some(a) = &self.audio else { return false };
+        if a.finished() {
+            if video {
+                self.session.set_time(fr.tick_of(wb));
+            } else {
+                self.playback.audio_frame = Some(wb);
+            }
+            self.stop();
+            return true;
+        }
+        let snap = |f: i64| wa + (f - wa).div_euclid(step) * step;
+        let target = snap(audio::frame_of_sample(a.clock(), a.rate, fr).clamp(wa, wb));
+        if !video {
+            self.playback.audio_frame = Some(target);
+        } else if self.frames.is_cached(&FrameKey { frame: target, ..series }) {
+            self.playback.waiting = false;
+            if target != cur {
+                self.session.set_time(fr.tick_of(target));
+                self.playback.frame_shown(now);
+            }
+        } else {
+            // Rendering can't keep up: rather than skip frames, the sound stops and every
+            // frame shows as it renders until the frames ahead are cached again.
+            self.audio = None;
+            self.playback.audio_held = true;
+            self.playback.waiting = true;
+            // The rate measured before the stall no longer says it keeps up.
+            self.playback.shown_at.clear();
+            self.playback.start_wall = now;
+            self.playback.start_frame = cur;
+        }
+        ctx.request_repaint();
+        true
+    }
+
+    /// The wall clock advances the preview when no audio device drives it, and shows the target
+    /// frame (or holds when it is not cached yet).
+    fn advance_frame_clock(&mut self, pass: &PlaybackPass<'_>, step: i64) {
+        let PlaybackPass { ctx, now, plan, video, looping, frame_rate: fr, cur, series, .. } = *pass;
+        let FrameWindow { first: wa, last: wb } = pass.window;
+        let elapsed = now - self.playback.start_wall;
+        // The plan carries the rate the preview was started with (and `play_with` copies it to
+        // `Playback::fps`). Deriving the frame from the plan keeps a logic-only tick correct even
+        // when a host/test supplies only the plan; a stale duplicate cannot hold playback open.
+        let fps = plan.map_or(self.playback.fps, |p| p.fps);
+        let n = ((elapsed * fps) / step as f64).floor() as i64;
+        let target = match plan {
+            Some(p) => p.frame_after(self.playback.start_frame, n),
+            None => {
+                let t = self.playback.start_frame + n;
+                if t <= wb {
+                    Some(t)
+                } else if looping {
+                    Some(wa + (t - wa).rem_euclid((wb - wa + 1).max(1)))
+                } else {
+                    None
+                }
+            }
+        };
+        let Some(target) = target else {
+            if video {
+                self.session.set_time(fr.tick_of(wb));
+            } else {
+                self.playback.audio_frame = Some(wb);
+            }
+            self.stop();
+            return;
+        };
+        if !video {
+            // Audio-only preview without an audio device: the clock runs, the time stays.
+            self.playback.audio_frame = Some(target);
+            ctx.request_repaint();
+            return;
+        }
+        if self.frames.is_cached(&FrameKey { frame: target, ..series }) {
+            self.playback.waiting = false;
+            if target != cur {
+                self.session.set_time(fr.tick_of(target));
+                self.playback.frame_shown(now);
+            }
+        } else {
+            // Not cached yet: hold the clock at the current frame (cache first, then play).
+            self.playback.waiting = true;
+            let next = plan.and_then(|p| p.frame_after(cur, 1)).unwrap_or(if cur + 1 > wb { wa } else { cur + 1 });
+            if self.frames.is_cached(&FrameKey { frame: next, ..series }) {
+                self.session.set_time(fr.tick_of(next));
+            }
+            self.playback.start_wall = now;
+            self.playback.start_frame = fr.frame_at(self.session.time());
+        }
+        ctx.request_repaint();
+    }
+
+    /// While the project keeps changing (an edit within [`EDIT_QUIET`] seconds), how long until
+    /// it counts as settled.
+    fn editing(&mut self, now: f64) -> Option<f64> {
+        if self.last_edit.1 != self.session.revision {
+            self.last_edit = (now, self.session.revision);
+        }
+        let left = EDIT_QUIET - (now - self.last_edit.0);
+        (left > 0.0).then_some(left)
+    }
+
+    /// Composition ▸ Preview ▸ Cache Frames When Idle: after a second without input or edits,
+    /// render the work area's frames (from the current time on, then from its start) in the
+    /// background, a few at a time, until it is cached or the RAM preview budget is full.
+    fn cache_when_idle(
+        &mut self,
+        ctx: &egui::Context,
+        comp: &effectcraft_engine::project::Comp,
+        series: &FrameKey,
+        now: f64,
+        input_active: bool,
+        (wa, wb): (i64, i64),
+    ) {
+        let active = input_active;
+        if active || self.last_activity.1 != self.session.revision {
+            self.last_activity = (now, self.session.revision);
+        }
+        if !self.ui.cache_when_idle || self.frames.urgent_pending() {
+            return;
+        }
+        let quiet = now - self.last_activity.0;
+        if quiet < 1.0 {
+            ctx.request_repaint_after(std::time::Duration::from_secs_f64(1.0 - quiet));
+            return;
+        }
+        // An empty work area has nothing to cache.
+        let n = wb - wa + 1;
+        if n < 1 {
+            return;
+        }
+        let cur = comp.frame_rate.frame_at(self.session.time()).clamp(wa, wb);
+        let fit = self.frames_that_fit(comp, series.scale as f64 / 1000.0).min(n);
+        let slots = (self.frames_parallelism() / 2).max(1);
+        let mut queued = self.frames.inflight();
+        let scale = series.scale as f64 / 1000.0;
+        let mut pending = false;
+        for k in 0..fit {
+            let f = wa + (cur - wa + k).rem_euclid(n);
+            if self.frames.is_cached(&FrameKey { frame: f, ..*series }) {
+                continue;
+            }
+            pending = true;
+            if queued >= slots {
+                break;
+            }
+            self.request_frame(ItemId(series.comp), f, scale);
+            queued += 1;
+        }
+        if pending {
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+        }
+    }
+
+    /// How many viewer frames of `comp` at `scale` the RAM preview budget holds (90 % of it,
+    /// at least one).
+    /// The frames of `plan` from `cur` to its end, or as many as fit in the RAM preview, are
+    /// cached: sound can play from `cur` in real time.
+    fn cached_ahead(&self, plan: &effectcraft_engine::preview::PreviewPlan, series: &FrameKey, cur: i64, fit: i64) -> bool {
+        let cached = self.frames.cached_frames(series);
+        (0..fit).map_while(|k| plan.frame_after(cur, k)).take_while(|f| *f >= cur).all(|f| cached.binary_search(&f).is_ok())
+    }
+
+    fn frames_that_fit(&self, comp: &effectcraft_engine::project::Comp, scale: f64) -> i64 {
+        let side = |n: u32| (n as f64 * scale).ceil().max(1.0);
+        let frame = side(comp.width) * side(comp.height) * 4.0;
+        ((self.frames.budget() as f64 * 0.9 / frame) as i64).max(1)
+    }
+
+    fn frames_parallelism(&self) -> usize {
+        if cfg!(target_arch = "wasm32") {
+            // frame workers render one frame each; without them frames render one at a time
+            // on the UI thread (`Frames::pump`)
+            return self.frames.remote_slots().max(1);
+        }
+        self.frames.parallelism()
+    }
+}
diff --git a/crates/ui-egui/src/app/prefs.rs b/crates/ui-egui/src/app/prefs.rs
new file mode 100644
index 000000000..6fc424e01
--- /dev/null
+++ b/crates/ui-egui/src/app/prefs.rs
@@ -0,0 +1,166 @@
+use super::{EffectcraftApp, Tokens, json, theme};
+
+impl EffectcraftApp {
+    /// Apply changed settings: theme and brightness, label colours, tool tips, preview caches.
+    pub fn apply_prefs(&mut self, ctx: &egui::Context) {
+        // Sync with System re-applies when the system appearance changes (the host wakes the UI;
+        // nothing polls).
+        let system = if self.session.prefs.appearance.appearance_mode == "auto" { self.system_light(ctx) } else { None };
+        if self.applied_prefs == Some((self.session.prefs_revision, system)) {
+            return;
+        }
+        self.applied_prefs = Some((self.session.prefs_revision, system));
+        let p = &self.session.prefs;
+        self.ui.theme = theme::ThemeKind::from_name(p.appearance.resolved_theme(system)).unwrap_or_default();
+        self.tokens = Tokens::from_prefs(p, self.ui.theme);
+        theme::apply_visuals(ctx, &self.tokens);
+        ctx.set_theme(theme::theme_preference(&p.appearance.appearance_mode, self.ui.theme.is_light()));
+        let tips = p.general.show_tool_tips;
+        ctx.all_styles_mut(|s| s.interaction.tooltip_delay = if tips { 0.5 } else { f32::INFINITY });
+        // Settings ▸ Appearance ▸ UI Scale (#284). egui's own Ctrl+= / Ctrl+- / Ctrl+0 zoom stays
+        // off: Ctrl+0 is Window ▸ Project, and the scale is a setting.
+        ctx.options_mut(|o| o.zoom_with_keyboard = false);
+        ctx.set_zoom_factor(p.appearance.ui_scale as f32 / 100.0);
+        self.ui.cache_when_idle = p.previews.cache_frames_when_idle;
+        self.ui.viewer.fast_preview = p.previews.fast_previews;
+        self.frames.set_budget(p.cache_budgets(self.session.sys_memory).preview);
+    }
+
+    /// Change settings from the UI (applied next frame and saved).
+    pub fn set_pref(&mut self, key: &str, value: serde_json::Value) -> Result<(), String> {
+        self.session.prefs.set(key, value)?;
+        self.session.prefs_changed();
+        self.session.save_prefs();
+        Ok(())
+    }
+
+    /// Show theme `k`: the appearance mode becomes its family's (Dark or Light), and `k` that
+    /// family's theme.
+    pub fn set_theme(&mut self, ctx: &egui::Context, k: theme::ThemeKind) {
+        if let Err(e) = self.set_pref("appearance.theme", json!(k.name())) {
+            self.ui.status = e;
+        }
+        self.apply_prefs(ctx);
+    }
+
+    /// The system appearance: light (`Some(true)`), dark, or unknown. The host's answer (the Linux
+    /// desktop portal) wins over egui's, which Wayland compositors often leave empty.
+    pub fn system_light(&self, ctx: &egui::Context) -> Option<bool> {
+        self.hooks.system_theme.as_ref().and_then(|read| read(ctx)).or_else(|| ctx.system_theme()).map(|t| t == egui::Theme::Light)
+    }
+
+    /// The Tools bar's appearance button (`view.theme.toggle`): Sync with System, then Light, then
+    /// Dark, then Sync with System again. The light and dark theme choices are kept.
+    pub fn cycle_appearance(&mut self, ctx: &egui::Context) {
+        let next = match self.session.prefs.appearance.appearance_mode.as_str() {
+            "auto" => "light",
+            "light" => "dark",
+            _ => "auto",
+        };
+        if let Err(e) = self.set_pref("appearance.appearanceMode", json!(next)) {
+            self.ui.status = e;
+        }
+        self.apply_prefs(ctx);
+    }
+}
+
+#[cfg(test)]
+mod appearance_tests {
+    use super::*;
+    use crate::menus;
+    use crate::theme::ThemeKind;
+
+    fn app() -> EffectcraftApp {
+        EffectcraftApp::new(effectcraft_engine::Session::default())
+    }
+
+    /// The Tools bar's appearance button: Sync with System, Light, Dark, then Sync with System
+    /// again, showing the saved theme of each family without losing either choice.
+    #[test]
+    fn appearance_button_cycles_modes_without_losing_theme_choices() {
+        let ctx = egui::Context::default();
+        let mut app = app();
+        app.hooks.system_theme = Some(Box::new(|_| Some(egui::Theme::Dark)));
+        app.set_pref("appearance.darkTheme", json!("darker")).unwrap();
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Darker);
+        for (mode, shown) in [("auto", ThemeKind::Darker), ("light", ThemeKind::Light), ("dark", ThemeKind::Darker), ("auto", ThemeKind::Darker)] {
+            menus::invoke(&mut app, &ctx, "view.theme.toggle", json!({})).unwrap();
+            assert_eq!(app.session.prefs.appearance.appearance_mode, mode);
+            assert_eq!(app.ui.theme, shown, "{mode}");
+            assert_eq!(app.tokens.kind, shown);
+            assert_eq!(app.session.prefs.appearance.dark_theme, "darker");
+            assert_eq!(app.session.prefs.appearance.light_theme, "light");
+        }
+    }
+
+    /// Sync with System follows the host's answer (the Linux portal) when it changes, and falls
+    /// back to Dark when nothing reports a system appearance.
+    #[test]
+    fn auto_follows_a_stubbed_system_theme() {
+        use std::sync::{Arc, Mutex};
+        let ctx = egui::Context::default();
+        let mut app = app();
+        let system = Arc::new(Mutex::new(Some(egui::Theme::Light)));
+        let read = Arc::clone(&system);
+        app.hooks.system_theme = Some(Box::new(move |_| *read.lock().unwrap_or_else(std::sync::PoisonError::into_inner)));
+        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Light);
+        *system.lock().unwrap() = Some(egui::Theme::Dark);
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Dark, "a system change applies without a settings change");
+        *system.lock().unwrap() = None;
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Dark);
+        // A fixed mode ignores the system.
+        *system.lock().unwrap() = Some(egui::Theme::Light);
+        app.set_pref("appearance.appearanceMode", json!("dark")).unwrap();
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Dark);
+    }
+
+    /// Sync with System leaves egui's theme preference at System, so egui never gives the native
+    /// window an appearance of its own (on macOS that stops system appearance changes reaching
+    /// the app, #642); egui's light and dark styles both carry the resolved theme. Fixed modes
+    /// pin the window to their family.
+    #[test]
+    fn auto_mode_leaves_the_native_window_following_the_system() {
+        let ctx = egui::Context::default();
+        let mut app = app();
+        app.hooks.system_theme = Some(Box::new(|_| Some(egui::Theme::Light)));
+        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
+        app.apply_prefs(&ctx);
+        assert_eq!(app.ui.theme, ThemeKind::Light);
+        assert_eq!(ctx.options(|o| o.theme_preference), egui::ThemePreference::System);
+        for theme in [egui::Theme::Light, egui::Theme::Dark] {
+            assert_eq!(ctx.style_of(theme).visuals.panel_fill, app.tokens.panel_bg, "{theme:?}");
+        }
+        // egui asks the window to follow the system, never to take Light or Dark.
+        let mut out = ctx.run_ui(egui::RawInput::default(), |_| {});
+        out.textures_delta.clear();
+        let cmds = out.viewport_output.values().flat_map(|v| v.commands.iter()).collect::<Vec<_>>();
+        assert!(!cmds.iter().any(|c| matches!(c, egui::ViewportCommand::SetTheme(t) if t != &egui::SystemTheme::SystemDefault)), "{cmds:?}");
+        for (mode, pref) in [("light", egui::ThemePreference::Light), ("dark", egui::ThemePreference::Dark)] {
+            app.set_pref("appearance.appearanceMode", json!(mode)).unwrap();
+            app.apply_prefs(&ctx);
+            assert_eq!(ctx.options(|o| o.theme_preference), pref, "{mode}");
+            assert_eq!(ctx.global_style().visuals.panel_fill, app.tokens.panel_bg, "{mode}");
+        }
+    }
+
+    /// Picking a theme (`view.theme.*`, `ui.set {theme}`) fixes the mode to its family.
+    #[test]
+    fn picking_a_theme_fixes_its_mode() {
+        let ctx = egui::Context::default();
+        let mut app = app();
+        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
+        menus::invoke(&mut app, &ctx, "view.theme.light", json!({})).unwrap();
+        assert_eq!(app.session.prefs.appearance.appearance_mode, "light");
+        assert_eq!(app.ui.theme, ThemeKind::Light);
+        menus::invoke(&mut app, &ctx, "view.theme.darker", json!({})).unwrap();
+        assert_eq!(app.session.prefs.appearance.appearance_mode, "dark");
+        assert_eq!(app.session.prefs.appearance.dark_theme, "darker");
+        assert_eq!(app.ui.theme, ThemeKind::Darker);
+    }
+}
diff --git a/crates/ui-egui/src/app/screenshot.rs b/crates/ui-egui/src/app/screenshot.rs
new file mode 100644
index 000000000..a80a76bd6
--- /dev/null
+++ b/crates/ui-egui/src/app/screenshot.rs
@@ -0,0 +1,330 @@
+use super::{DrawGeometry, EffectcraftApp, PendingShot, Sender, ShotTarget, control, json};
+
+/// How long a screenshot request waits for a frame, from admission (app clock seconds).
+pub(crate) const SCREENSHOT_TIMEOUT_S: f64 = 8.0;
+
+/// Seconds between a screenshot's admission and the earliest capture: the UI settles first.
+pub(crate) const SCREENSHOT_SETTLE_S: f64 = 0.35;
+
+/// Final (non-discarded) UI passes a screenshot waits for after admission before it is issued.
+pub(crate) const SCREENSHOT_SETTLE_PASSES: u64 = 3;
+
+/// Geometry changes a queued screenshot may retry before it reports an error.
+const SCREENSHOT_MAX_RETRIES: u32 = 4;
+
+/// Outstanding screenshot requests (queued or waiting for their pixels).
+pub(crate) const MAX_PENDING_SHOTS: usize = 4;
+
+/// One capture's pixels: 128 MiB.
+const MAX_SHOT_BYTES: usize = 128 * 1024 * 1024;
+
+/// Every pending capture's reserved pixels together: 256 MiB.
+const MAX_SHOT_TOTAL_BYTES: usize = 256 * 1024 * 1024;
+
+/// Whether a captured image's dimensions match `rect` at `ppp`.
+///
+/// The surface may be smaller than requested when the adapter-limit fit (fork E2) applies, but a
+/// different aspect ratio means the pixels came from another layout than the one issued.
+fn shot_image_matches(image: &egui::ColorImage, rect: egui::Rect, ppp: f32) -> bool {
+    let [w, h] = image.size;
+    if w == 0 || h == 0 || !ppp.is_finite() || ppp <= 0.0 {
+        return false;
+    }
+    let ew = (rect.width() as f64 * ppp as f64).max(1.0);
+    let eh = (rect.height() as f64 * ppp as f64).max(1.0);
+    let want = ew / eh;
+    let got = w as f64 / h as f64;
+    (got - want).abs() <= 0.02 * want.max(1.0)
+}
+
+impl EffectcraftApp {
+    /// The geometry of the last completed UI pass, if one ran.
+    pub fn draw_geometry(&self) -> Option<DrawGeometry> {
+        self.draw_geom
+    }
+
+    // ---------------------------------------------------------------- screenshots
+
+    /// The root surface geometry a screenshot is admitted against.
+    ///
+    /// The last completed pass's geometry is authoritative. Before any pass, only the viewport's
+    /// `inner_rect` (the client surface a capture returns) is accepted: `outer_rect` also covers
+    /// the title bar and window frame, so a capture issued against it would be cropped and
+    /// validated against a different rectangle than the callback delivers. A request that arrives
+    /// before the geometry is known is refused with an actionable error, and the pass that would
+    /// establish it is requested.
+    fn current_geometry(&self, ctx: &egui::Context) -> Option<DrawGeometry> {
+        if let Some(g) = self.draw_geom {
+            return Some(g);
+        }
+        let rect = ctx.input(|i| i.viewport().inner_rect)?;
+        (rect.width() > 0.0 && rect.height() > 0.0).then_some(DrawGeometry { rect, ppp: ctx.pixels_per_point(), epoch: self.geometry_epoch })
+    }
+
+    /// The point rectangle a request captures: its crop, clamped to the window, or all of it.
+    fn shot_target_rect(geom: &DrawGeometry, crop: Option<[f32; 4]>) -> Option<egui::Rect> {
+        let r = match crop {
+            Some([x, y, w, h]) if [x, y, w, h].iter().all(|v| v.is_finite()) => {
+                egui::Rect::from_min_size(geom.rect.min + egui::vec2(x, y), egui::vec2(w.max(0.0), h.max(0.0))).intersect(geom.rect)
+            }
+            Some(_) => return None,
+            None => geom.rect,
+        };
+        (r.width() > 0.0 && r.height() > 0.0).then_some(r)
+    }
+
+    /// The screen-point crop `target` names right now (a panel's or element's current rectangle),
+    /// or an actionable error when it is not on screen. Resolved at issuance, never stored from
+    /// admission: the UI may move while it settles.
+    fn shot_crop(&self, target: &ShotTarget, geom: &DrawGeometry) -> Result<Option<egui::Rect>, String> {
+        let crop = match target {
+            ShotTarget::Window => None,
+            ShotTarget::Rect(r) => Some(*r),
+            ShotTarget::Panel(p) => {
+                let id = format!("panel.{}", p.id());
+                let found = self.auto.find(&id).ok_or_else(|| format!("the {} panel is not on screen", p.title()))?;
+                Some(found.rect)
+            }
+            ShotTarget::Id(id) => Some(self.auto.find(id).ok_or_else(|| format!("no element `{id}` is on screen"))?.rect),
+        };
+        Self::shot_target_rect(geom, crop).map(Some).ok_or_else(|| "the screenshot area is empty or not a finite rectangle".to_string())
+    }
+
+    /// `target` as a crop relative to `geom`'s origin: what the image's own pixels are cut with.
+    fn shot_relative_crop(&self, target: &ShotTarget, geom: &DrawGeometry) -> Result<Option<[f32; 4]>, String> {
+        let Some(r) = self.shot_crop(target, geom)? else { return Ok(None) };
+        Ok(Some([r.min.x - geom.rect.min.x, r.min.y - geom.rect.min.y, r.width(), r.height()]))
+    }
+
+    /// Pixel bytes `rect` takes at `ppp`, checked (`width * height * 4`).
+    fn shot_pixel_bytes(rect: egui::Rect, ppp: f32) -> Option<usize> {
+        if !ppp.is_finite() || ppp <= 0.0 {
+            return None;
+        }
+        let w = (rect.width() as f64 * ppp as f64).ceil().max(1.0) as usize;
+        let h = (rect.height() as f64 * ppp as f64).ceil().max(1.0) as usize;
+        w.checked_mul(h)?.checked_mul(4)
+    }
+
+    /// Reserve and queue one `ui.screenshot`, or reply with an actionable error.
+    pub(crate) fn admit_screenshot(&mut self, ctx: &egui::Context, path: Option<String>, target: ShotTarget, reply: Sender<serde_json::Value>) {
+        let Some(geom) = self.current_geometry(ctx) else {
+            let _ = reply.send(
+                json!({"ok": false, "error": "the window geometry is not known yet (it is recorded by a completed UI pass; retry after the next frame)"}),
+            );
+            // Ask for the pass that records it.
+            self.want_paint = true;
+            ctx.request_repaint();
+            return;
+        };
+        if self.pending_screenshots.len() >= MAX_PENDING_SHOTS {
+            let _ = reply.send(json!({"ok": false, "error": format!("too many screenshots are pending (at most {MAX_PENDING_SHOTS})")}));
+            return;
+        }
+        if let Err(e) = self.shot_crop(&target, &geom) {
+            let _ = reply.send(json!({"ok": false, "error": e}));
+            return;
+        }
+        // The capture is always the whole surface (the crop is applied when the PNG is written),
+        // so the reservation and the per-image bound follow the surface's actual dimensions.
+        let Some(bytes) = Self::shot_pixel_bytes(geom.rect, geom.ppp) else {
+            let _ = reply.send(json!({"ok": false, "error": "the screenshot area is too large to reserve"}));
+            return;
+        };
+        if bytes > MAX_SHOT_BYTES {
+            let _ = reply
+                .send(json!({"ok": false, "error": format!("the screenshot would need about {bytes} bytes, over the {MAX_SHOT_BYTES}-byte per-image limit")}));
+            return;
+        }
+        if self.shot_bytes.checked_add(bytes).is_none_or(|n| n > MAX_SHOT_TOTAL_BYTES) {
+            let _ = reply.send(json!({"ok": false, "error": format!("the screenshot would exceed the {MAX_SHOT_TOTAL_BYTES}-byte pending-image budget")}));
+            return;
+        }
+        self.shot_bytes += bytes;
+        self.pending_screenshots.push(PendingShot {
+            path,
+            target,
+            crop: None,
+            reply,
+            deadline: self.now + SCREENSHOT_TIMEOUT_S,
+            settle_at: self.now + SCREENSHOT_SETTLE_S,
+            admitted: geom,
+            admitted_pass: self.ui_pass_seq,
+            issued: None,
+            slot: None,
+            reserved_bytes: bytes,
+            attempts: 0,
+        });
+        // A queued capture needs a settled UI pass before it can be issued.
+        self.want_paint = true;
+    }
+
+    /// Re-reserve request `i` against `geom` after a surface change; false when it no longer fits.
+    fn refresh_shot_reservation(&mut self, i: usize, geom: &DrawGeometry) -> bool {
+        let Some(bytes) = Self::shot_pixel_bytes(geom.rect, geom.ppp) else { return false };
+        if bytes > MAX_SHOT_BYTES {
+            return false;
+        }
+        let released = self.shot_bytes.saturating_sub(self.pending_screenshots[i].reserved_bytes);
+        if released.checked_add(bytes).is_none_or(|n| n > MAX_SHOT_TOTAL_BYTES) {
+            return false;
+        }
+        self.shot_bytes = released + bytes;
+        self.pending_screenshots[i].reserved_bytes = bytes;
+        true
+    }
+
+    /// Reply with an error to request `i` and release its reservation.
+    fn fail_shot(&mut self, i: usize, message: impl Into<String>) {
+        let shot = self.pending_screenshots.remove(i);
+        self.shot_bytes = self.shot_bytes.saturating_sub(shot.reserved_bytes);
+        let _ = shot.reply.send(json!({"ok": false, "error": message.into()}));
+    }
+
+    /// Collect completed captures, enforce timeouts and issue every settled request.
+    ///
+    /// Runs from [`Self::tick`] only: the callback stores pixels in its slot and wakes the
+    /// viewport, and everything that can write a file or reply happens here, on the app thread.
+    pub(super) fn tick_screenshots(&mut self, ctx: &egui::Context) {
+        let Some(geom) = self.current_geometry(ctx) else { return };
+        self.drain_completed_screenshots(geom);
+        self.timeout_screenshots();
+        self.issue_screenshots(ctx, geom);
+        // 4. Wake up for the earliest deadline even when no further pass is otherwise needed: an
+        //    issued capture whose callback never arrives (hidden window, display asleep, renderer
+        //    failure) would otherwise never reach its timeout. This is a timer, not a paint
+        //    request: the issued screenshot command already forces the frame it needs.
+        if let Some(next) = self.pending_screenshots.iter().map(|s| s.deadline).reduce(f64::min) {
+            let wait = (next - self.now).max(0.001);
+            ctx.request_repaint_after(std::time::Duration::from_secs_f64(wait));
+        }
+    }
+
+    /// 1. Drain completed slots. A completion whose surface epoch changed since issuance is
+    ///    discarded even if the geometry changed back: it was cropped with another frame's
+    ///    pixels-per-point.
+    fn drain_completed_screenshots(&mut self, geom: DrawGeometry) {
+        let mut i = 0;
+        while i < self.pending_screenshots.len() {
+            let taken = self.pending_screenshots.get(i).and_then(|s| s.slot.as_ref()).and_then(craft_ui::capture::CaptureSlot::take);
+            let Some(result) = taken else {
+                i += 1;
+                continue;
+            };
+            let issued = self.pending_screenshots[i].issued;
+            match result {
+                Ok(image) => {
+                    if issued.is_none_or(|g| g.epoch != geom.epoch) {
+                        self.pending_screenshots[i].slot = None;
+                        self.pending_screenshots[i].issued = None;
+                        if self.pending_screenshots[i].attempts >= SCREENSHOT_MAX_RETRIES {
+                            self.fail_shot(i, "the window resized while the screenshot was being taken");
+                        } else if !self.refresh_shot_reservation(i, &geom) {
+                            self.fail_shot(i, "the resized window is too large to capture within the screenshot budget");
+                        } else {
+                            let settle_at = self.now + SCREENSHOT_SETTLE_S;
+                            let passes = self.ui_pass_seq;
+                            let s = &mut self.pending_screenshots[i];
+                            s.attempts += 1;
+                            s.admitted = geom;
+                            s.admitted_pass = passes;
+                            s.settle_at = settle_at;
+                            i += 1;
+                        }
+                        continue;
+                    }
+                    let Some(issued) = issued else {
+                        i += 1;
+                        continue;
+                    };
+                    if !shot_image_matches(&image, issued.rect, issued.ppp) {
+                        self.fail_shot(i, "the screenshot's pixels do not match the window it was taken from");
+                        continue;
+                    }
+                    // The returned image can be smaller than requested (the E2 adapter-limit fit),
+                    // so the crop uses the image's own scale, never the issued ppp.
+                    let [iw, ih] = image.size;
+                    let (sx, sy) = (iw as f64 / issued.rect.width() as f64, ih as f64 / issued.rect.height() as f64);
+                    if !(sx.is_finite() && sx > 0.0 && sy.is_finite() && sy > 0.0) {
+                        self.fail_shot(i, "the screenshot's size does not describe the window it was taken from");
+                        continue;
+                    }
+                    let shot = self.pending_screenshots.remove(i);
+                    self.shot_bytes = self.shot_bytes.saturating_sub(shot.reserved_bytes);
+                    let r = control::save_screenshot(&image, shot.path.as_deref(), shot.crop, [sx, sy]);
+                    let _ = shot.reply.send(r);
+                }
+                Err(e) => {
+                    self.fail_shot(i, e.to_string());
+                }
+            }
+        }
+    }
+
+    /// 2. Timeouts: a late callback finds its slot cancelled and writes nothing.
+    fn timeout_screenshots(&mut self) {
+        let mut i = 0;
+        while i < self.pending_screenshots.len() {
+            if self.now > self.pending_screenshots[i].deadline {
+                self.fail_shot(i, "no frame was presented (window hidden or display asleep)");
+            } else {
+                i += 1;
+            }
+        }
+    }
+
+    /// 3. Issue settled requests. The command itself requests the paint; a request still
+    ///    waiting for its passes needs `want_paint` so a hidden window keeps painting.
+    fn issue_screenshots(&mut self, ctx: &egui::Context, geom: DrawGeometry) {
+        let mut i = 0;
+        while i < self.pending_screenshots.len() {
+            if self.pending_screenshots[i].slot.is_some() {
+                i += 1;
+                continue;
+            }
+            if geom.epoch != self.pending_screenshots[i].admitted.epoch {
+                if self.pending_screenshots[i].attempts >= SCREENSHOT_MAX_RETRIES {
+                    self.fail_shot(i, "the window kept resizing before the screenshot could be taken");
+                    continue;
+                }
+                if !self.refresh_shot_reservation(i, &geom) {
+                    self.fail_shot(i, "the resized window is too large to capture within the screenshot budget");
+                    continue;
+                }
+                let (now, passes) = (self.now, self.ui_pass_seq);
+                let s = &mut self.pending_screenshots[i];
+                s.attempts += 1;
+                s.admitted = geom;
+                s.admitted_pass = passes;
+                s.settle_at = now + SCREENSHOT_SETTLE_S;
+                self.want_paint = true;
+                i += 1;
+                continue;
+            }
+            let settled = self.ui_pass_seq >= self.pending_screenshots[i].admitted_pass.saturating_add(SCREENSHOT_SETTLE_PASSES)
+                && self.now >= self.pending_screenshots[i].settle_at;
+            if !settled {
+                self.want_paint = true;
+                i += 1;
+                continue;
+            }
+            // Resolve the crop now, against the settled UI: an element that moved since admission
+            // is captured where it is, and its rectangle is relative to this issued surface.
+            let target = self.pending_screenshots[i].target.clone();
+            let crop = match self.shot_relative_crop(&target, &geom) {
+                Ok(c) => c,
+                Err(e) => {
+                    self.fail_shot(i, e);
+                    continue;
+                }
+            };
+            let (slot, callback) = craft_ui::capture::CaptureSlot::new(ctx, egui::ViewportId::ROOT, MAX_SHOT_BYTES);
+            ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(callback));
+            let s = &mut self.pending_screenshots[i];
+            s.slot = Some(slot);
+            s.issued = Some(geom);
+            s.crop = crop;
+            i += 1;
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/viewer_frames.rs b/crates/ui-egui/src/app/viewer_frames.rs
new file mode 100644
index 000000000..3c8632cea
--- /dev/null
+++ b/crates/ui-egui/src/app/viewer_frames.rs
@@ -0,0 +1,166 @@
+use super::*;
+
+impl EffectcraftApp {
+    /// The size of the viewer frame's texture (CPU frames; fitted to the GPU's texture limit).
+    pub fn viewer_texture_size(&self) -> Option<[usize; 2]> {
+        self.viewer_tex.as_ref().map(|(t, _, _)| t.size())
+    }
+
+    /// The viewer's current pixels as 8-bit premultiplied RGBA, reading a GPU frame back the
+    /// first time something asks for it.
+    ///
+    /// The browser can't wait for the GPU: there the first call starts an asynchronous readback
+    /// and returns `None`; a later call (the next frame) has the pixels.
+    pub fn viewer_pixels(&mut self) -> Option<Arc<egui::ColorImage>> {
+        let to_image = |bytes: Vec<u8>, w: u32, h: u32| {
+            let px = bytes.as_chunks::<4>().0.iter().map(|c| egui::Color32::from_rgba_premultiplied(c[0], c[1], c[2], c[3])).collect();
+            Arc::new(egui::ColorImage::new([w as usize, h as usize], px))
+        };
+        if self.viewer_image.is_none()
+            && let (Some((_, key, f)), Some(g)) = (&self.viewer_native, &self.gpu)
+            && self.viewer_shown.as_ref().map(|s| s.1) == Some(*key)
+        {
+            if cfg!(target_arch = "wasm32") {
+                let ready = self.viewer_readback.1.lock().ok().and_then(|mut r| r.take_if(|r| r.0 == *key));
+                if let Some((_, img)) = ready {
+                    self.viewer_image = Some(img);
+                } else if self.viewer_readback.0 != Some(*key) {
+                    self.viewer_readback.0 = Some(*key);
+                    let (slot, k, (w, h)) = (self.viewer_readback.1.clone(), *key, (f.width, f.height));
+                    let ctx = self.frames.context();
+                    g.read_display_async(f, move |bytes| {
+                        if let (Some(b), Ok(mut s)) = (bytes, slot.lock()) {
+                            *s = Some((k, to_image(b, w, h)));
+                        }
+                        if let Some(c) = ctx {
+                            c.request_repaint();
+                        }
+                    });
+                }
+            } else if let Some(bytes) = g.read_display(f) {
+                self.viewer_image = Some(to_image(bytes, f.width, f.height));
+            }
+        }
+        self.viewer_image.clone()
+    }
+
+    /// The viewer's Resolution: the active composition's (saved with the project).
+    pub fn viewer_res(&self) -> state::Resolution {
+        self.session.active_comp().map(|c| c.resolution).unwrap_or_default()
+    }
+
+    /// The render scale used by the viewer right now.
+    pub fn viewer_scale(&self, zoom: f32, ppp: f32) -> f64 {
+        // The preview's Resolution (when not Auto) while it plays.
+        if self.playback.playing
+            && let Some(f) = self.playback.res
+        {
+            return state::Resolution::from_factor(f.into()).scale(zoom, ppp);
+        }
+        // Auto follows the zoom alike while playing and paused, so frames cached while scrubbing
+        // play back, and frames cached by a preview stay on screen when it stops.
+        let res = self.viewer_res();
+        let full = res.scale(zoom, ppp);
+        // Fast Previews ▸ Adaptive Resolution / Fast Draft: lower resolution while dragging.
+        let (_, k) = self.session.state.viewer.fast_previews.render(self.ui.viewer.interacting || self.ui.viewer.property_interacting);
+        if k < 1.0 && res.is_auto() {
+            return full.min((full * 0.5).max(self.session.prefs.adaptive_limit()));
+        }
+        full
+    }
+
+    /// The cache key of viewer frame `frame` of `comp` at `scale` (see [`Self::frame_series`]).
+    pub fn frame_key(&self, comp: ItemId, frame: i64, scale: f64) -> FrameKey {
+        FrameKey { frame, ..self.frame_series(comp, scale) }
+    }
+
+    /// The key of frame 0 of `comp`'s viewer frames at `scale` (the content, view and render
+    /// options are the same for every frame: loops compute this once).
+    pub fn frame_series(&self, comp: ItemId, scale: f64) -> FrameKey {
+        FrameKey {
+            revision: self.session.revision,
+            content: self.frames.content_of(&self.session.project, self.session.revision, comp),
+            comp: comp.0,
+            frame: 0,
+            scale: (scale * 1000.0).round() as u32,
+            view: self.view_hash(comp),
+            opts: frames::opts_hash(&self.frame_opts(comp, scale)),
+        }
+    }
+
+    /// The frame series the viewer of `comp` shows now (its scale, view and options, for the
+    /// comp's current content): what the cache bars count.
+    pub fn shown_series(&self, comp: ItemId) -> FrameKey {
+        let scale = self.viewer_shown.as_ref().filter(|(_, k)| k.comp == comp.0).map_or(1000, |(_, k)| k.scale);
+        self.frame_series(comp, scale as f64 / 1000.0)
+    }
+
+    /// Hash of the comp viewer's 3D view camera (0 for the active camera view).
+    pub fn view_hash(&self, comp: ItemId) -> u64 {
+        use std::hash::{Hash, Hasher};
+        let mut h = std::collections::hash_map::DefaultHasher::new();
+        // The region of interest changes what is rendered too.
+        let roi = self.viewer_region(comp);
+        if let Some(r) = roi {
+            r.map(f64::to_bits).hash(&mut h);
+        }
+        let Some(cam) = self.session.view_camera(comp) else { return if roi.is_some() { h.finish() | 1 } else { 0 } };
+        for row in cam.view.0 {
+            for v in row {
+                v.to_bits().hash(&mut h);
+            }
+        }
+        cam.zoom.to_bits().hash(&mut h);
+        cam.ortho.hash(&mut h);
+        h.finish() | 1
+    }
+
+    /// The comp-space region viewer frames of `comp` cover: the region of interest, else the
+    /// Extended Viewer's area (frame plus pasteboard), else `None` (the whole frame).
+    pub fn viewer_region(&self, comp: ItemId) -> Option<[f64; 4]> {
+        if self.session.active_comp_id() != Some(comp) {
+            return None;
+        }
+        self.session.state.region_of_interest.or(self.ui.viewer.extended)
+    }
+
+    /// Request a prefetch frame render (no-op if cached/in flight).
+    pub fn request_frame(&self, comp: ItemId, frame: i64, scale: f64) {
+        self.request_frame_with(comp, frame, scale, false);
+    }
+
+    /// Request the frame on screen: rendered before any queued prefetch.
+    pub fn request_frame_urgent(&self, comp: ItemId, frame: i64, scale: f64) {
+        self.request_frame_with(comp, frame, scale, true);
+    }
+
+    /// Render options of viewer frames of `comp` at `scale`.
+    pub fn frame_opts(&self, comp: ItemId, scale: f64) -> RenderOpts {
+        let (draft, _) = self.session.state.viewer.fast_previews.render(self.ui.viewer.interacting || self.ui.viewer.property_interacting);
+        let roi = self.viewer_region(comp);
+        RenderOpts {
+            scale,
+            motion_blur: true,
+            guides: true,
+            draft: self.ui.viewer.fast_preview || draft,
+            view: self.session.view_camera(comp),
+            roi,
+            backend: effectcraft_engine::render::Backend::Auto,
+            nested_switches: self.session.prefs.general.switches_affect_nested_comps,
+            draft_shadows: self.session.prefs.three_d.realtime_shadows,
+            proxy: Default::default(),
+        }
+    }
+
+    fn request_frame_with(&self, comp: ItemId, frame: i64, scale: f64, urgent: bool) {
+        let Some(c) = self.session.project.comp(comp) else { return };
+        let key = self.frame_key(comp, frame, scale);
+        let t = c.frame_rate.tick_of(frame);
+        let opts = self.frame_opts(comp, scale);
+        if urgent {
+            self.frames.request_urgent(&self.render_source(), key, comp, t, opts);
+        } else {
+            self.frames.request(&self.render_source(), key, comp, t, opts);
+        }
+    }
+}
diff --git a/crates/ui-egui/src/app/window.rs b/crates/ui-egui/src/app/window.rs
new file mode 100644
index 000000000..10a53f1d2
--- /dev/null
+++ b/crates/ui-egui/src/app/window.rs
@@ -0,0 +1,155 @@
+use super::*;
+
+impl EffectcraftApp {
+    /// Keep the saved workspaces for the next session (see [`EffectcraftApp::new`]): After
+    /// Effects' saved workspaces last until they are deleted (#320). `Err` when they weren't
+    /// written (#696): the change applies for this session and a later save retries it, but until
+    /// then a restart brings back what is on disk.
+    pub(crate) fn store_saved_workspaces(&mut self) -> Result<(), String> {
+        let Err(error) = self.workspace_store.save_now(self.session.config.as_deref(), &self.ui) else { return Ok(()) };
+        let message = format!("Workspace changes couldn't be saved and may be lost after a restart: {error}");
+        log::warn!("{message}");
+        self.ui.status = message.clone();
+        // The raw error, so the background retry doesn't report the same failure again.
+        self.workspace_store.error = Some(error);
+        Err(message)
+    }
+
+    pub fn set_workspace(&mut self, name: &str) {
+        // Learn: the Home screen's Learn tab (tutorials) in the Composition panel. Leaving it for
+        // another workspace closes the Home screen again: it stayed over every workspace until a
+        // project was created (#272).
+        if name == "Learn" {
+            self.ui.start_screen = true;
+            self.ui.home_learn = true;
+            self.ui.home_templates = false;
+        } else if self.ui.workspace == "Learn" {
+            self.ui.start_screen = false;
+            self.ui.home_learn = false;
+        }
+        self.ui.workspace = name.to_string();
+        self.ui.dock = self.ui.saved_workspaces.get(name).cloned().unwrap_or_else(|| dock::Workspace::new(dock::workspace(name)));
+        self.ui.maximized = None;
+    }
+
+    /// Built-in workspaces followed by the saved ones (Window ▸ Workspace ▸ Save as New Workspace).
+    pub fn workspace_names(&self) -> Vec<String> {
+        let mut v: Vec<String> = dock::WORKSPACES.iter().map(|s| s.to_string()).collect();
+        v.extend(self.saved_workspace_names());
+        v
+    }
+
+    /// The workspaces the user saved under a new name (built-ins whose changes were saved are
+    /// not repeated), in name order.
+    pub fn saved_workspace_names(&self) -> Vec<String> {
+        self.ui.saved_workspaces.keys().filter(|k| !dock::WORKSPACES.contains(&k.as_str())).cloned().collect()
+    }
+
+    /// The open Gradient Editor's draft (`panels::gradient_editor`): what OK would set.
+    pub fn gradient_draft(&self) -> &panels::gradient_editor::Draft {
+        &self.dialog_state.gradient
+    }
+
+    /// The open Gradient Editor's draft, to edit (tests and automation; the editor's own fields
+    /// do the same).
+    pub fn gradient_draft_mut(&mut self) -> &mut panels::gradient_editor::Draft {
+        &mut self.dialog_state.gradient
+    }
+
+    /// Show panel `p` (opening it in its usual place if it is closed), bring it to the front and
+    /// give it the focus: Window ▸ `<panel>`.
+    pub fn show_panel(&mut self, p: PanelKind) {
+        if !self.ui.dock.is_floating(p) && self.ui.maximized.is_some_and(|m| m != p) {
+            self.ui.maximized = None;
+        }
+        self.raise_panel(p);
+        self.ui.focused = p;
+    }
+
+    /// Bring panel `p` to the front of its group, opening it if it is closed, without moving the
+    /// focus (a comp opening brings up its viewer, an effect applied brings up Effect Controls).
+    /// A closed panel goes back where it was; one never laid out goes to its usual place: the
+    /// Composition panel in the centre with the Layer panel and other viewers (with none of
+    /// those left, above the Timeline), Layer and the viewers beside the Composition panel, and
+    /// so on.
+    pub fn raise_panel(&mut self, p: PanelKind) {
+        if !self.ui.dock.is_open(p) {
+            let docked = |q: &PanelKind| self.ui.dock.is_docked(*q);
+            let near = match p {
+                PanelKind::Composition => self
+                    .ui
+                    .dock
+                    .panels()
+                    .into_iter()
+                    .find(|q| matches!(q, PanelKind::Layer | PanelKind::Viewer(_) | PanelKind::Flowchart | PanelKind::Footage) && docked(q)),
+                PanelKind::Layer | PanelKind::Flowchart | PanelKind::Viewer(_) => Some(PanelKind::Composition),
+                PanelKind::RenderQueue => Some(PanelKind::Timeline),
+                PanelKind::EffectControls | PanelKind::History => Some(PanelKind::Project),
+                _ => Some(PanelKind::EffectsPresets),
+            }
+            .filter(|q| self.ui.dock.is_open(*q));
+            let mut workspace = self.ui.dock.clone();
+            let known = workspace.hidden.iter().any(|(q, _)| *q == p);
+            let opened = if p == PanelKind::Composition && near.is_none() && !known && self.ui.dock.is_docked(PanelKind::Timeline) {
+                workspace
+                    .apply(
+                        craft_ui::docking::Action::OpenAt {
+                            panel: p,
+                            anchor: PanelKind::Timeline,
+                            placement: craft_ui::docking::Placement::Split(craft_ui::docking::Zone::Top),
+                        },
+                        dock::permissions,
+                    )
+                    .map(|_| ())
+            } else if known {
+                workspace.set_visible(p, true, near, dock::permissions)
+            } else {
+                workspace.apply(craft_ui::docking::Action::Open { panel: p, anchor: near }, dock::permissions).map(|_| ())
+            };
+            match opened {
+                Ok(()) => self.ui.dock = workspace,
+                Err(e) => {
+                    self.ui.status = format!("can't open {}: {e}", p.title());
+                    return;
+                }
+            }
+        }
+        let _ = self.ui.dock.apply(craft_ui::docking::Action::Activate { panel: p }, dock::permissions);
+        if self.ui.dock.is_floating(p) {
+            self.pending_panel_raise = Some(p);
+        }
+    }
+}
+
+/// Maximize a first window that doesn't fit the screen, which fits it to the space beside the
+/// taskbar or dock. The 1680 × 1020 window on a smaller screen is only shrunk to the monitor's
+/// size, so with its title bar it ran under the taskbar and cut menus off at the bottom of the
+/// screen (#269).
+pub(super) fn fit_window(ctx: &egui::Context) {
+    let (monitor, window) = ctx.input(|i| (i.viewport().monitor_size, i.viewport().outer_rect.or(i.viewport().inner_rect)));
+    if let (Some(monitor), Some(window)) = (monitor, window)
+        && overflows_screen(window.size(), monitor)
+    {
+        ctx.send_viewport_cmd(egui::ViewportCommand::Maximized(true));
+    }
+}
+
+/// Whether a window `size` leaves no room on a `monitor` for a taskbar or dock (points).
+fn overflows_screen(size: egui::Vec2, monitor: egui::Vec2) -> bool {
+    const TASKBAR: f32 = 64.0;
+    size.x > monitor.x || size.y > monitor.y - TASKBAR
+}
+
+#[cfg(test)]
+mod fit_window_tests {
+    use super::overflows_screen;
+    use egui::vec2;
+
+    #[test]
+    fn a_window_taller_than_the_screen_beside_its_taskbar_overflows() {
+        // The default window on a 1366 × 768 laptop (shrunk to the monitor) and on 1080p.
+        assert!(overflows_screen(vec2(1366.0, 799.0), vec2(1366.0, 768.0)));
+        assert!(overflows_screen(vec2(1680.0, 1051.0), vec2(1920.0, 1080.0)));
+        assert!(!overflows_screen(vec2(1680.0, 1051.0), vec2(2560.0, 1440.0)));
+    }
+}
diff --git a/crates/ui-egui/src/clock.rs b/crates/ui-egui/src/clock.rs
new file mode 100644
index 000000000..184c8421c
--- /dev/null
+++ b/crates/ui-egui/src/clock.rs
@@ -0,0 +1,71 @@
+use super::*;
+
+/// The application's monotonic clock, in seconds.
+///
+/// Neither `ctx.input(|i| i.time)` nor `RawInput::time` is valid in a logic-only tick:
+/// `Context::run_logic` copies only the viewport information, so both are the previous full
+/// pass's values. Playback, auto-save, screenshot deadlines and the control channel measure time
+/// with this clock instead. Native and web use the same [`web_time::Instant`] source; tests
+/// inject [`AppClock::manual`] and advance it.
+#[derive(Clone, Debug)]
+pub struct AppClock {
+    origin: web_time::Instant,
+    manual: Option<f64>,
+}
+
+impl AppClock {
+    /// The host's monotonic clock.
+    pub fn real() -> Self {
+        Self { origin: web_time::Instant::now(), manual: None }
+    }
+
+    /// A clock tests advance explicitly with [`AppClock::advance`].
+    pub fn manual() -> Self {
+        Self { origin: web_time::Instant::now(), manual: Some(0.0) }
+    }
+
+    /// Seconds since the clock started (monotonic on native and in the browser).
+    pub fn now(&self) -> f64 {
+        match self.manual {
+            Some(t) => t,
+            None => self.origin.elapsed().as_secs_f64(),
+        }
+    }
+
+    /// Move a manual clock forward; a real clock ignores this.
+    pub fn advance(&mut self, seconds: f64) {
+        if let Some(t) = &mut self.manual {
+            *t = (*t + seconds.max(0.0)).max(0.0);
+        }
+    }
+
+    /// Whether the clock is test-driven.
+    pub fn is_manual(&self) -> bool {
+        self.manual.is_some()
+    }
+}
+
+impl Default for AppClock {
+    /// The real monotonic clock (`Self::real()`).
+    fn default() -> Self {
+        Self::real()
+    }
+}
+
+impl EffectcraftApp {
+    /// The app clock's value at the last tick.
+    pub fn now(&self) -> f64 {
+        self.now
+    }
+
+    /// The clock itself (tests advance a manual clock).
+    pub fn clock_mut(&mut self) -> &mut AppClock {
+        &mut self.clock
+    }
+
+    /// Use a test-driven clock from now on.
+    pub fn use_manual_clock(&mut self) {
+        self.clock = AppClock::manual();
+        self.now = 0.0;
+    }
+}
diff --git a/crates/ui-egui/src/color_picker.rs b/crates/ui-egui/src/color_picker.rs
index efaae6d7f..acc01cc65 100644
--- a/crates/ui-egui/src/color_picker.rs
+++ b/crates/ui-egui/src/color_picker.rs
@@ -16,7 +16,7 @@ use crate::widgets::{open_popup, popup_is_open, pressed_outside, select_all};
 /// user picks a colour.
 pub fn srgb_color_button(ui: &mut Ui, c: &mut [f32; 3]) -> Response {
     let (rect, mut resp) = ui.allocate_exact_size(ui.spacing().interact_size, Sense::click());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::ColorButton, ui.is_enabled(), srgb_hex(*c)));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ColorWell, ui.is_enabled(), srgb_hex(*c)));
     let stroke = if resp.hovered() { ui.visuals().widgets.hovered.fg_stroke } else { ui.visuals().widgets.inactive.bg_stroke };
     ui.painter().rect_filled(rect, 2.0, srgb32(*c));
     ui.painter().rect_stroke(rect, 2.0, stroke, StrokeKind::Inside);
@@ -77,8 +77,10 @@ pub fn color_popup(ui: &mut Ui, id: egui::Id, pos: egui::Pos2, c: &mut [f32; 3])
     out.changed
 }
 
+/// The `egui::Id` of the pass number in which a colour picker last stayed open, which
+/// [`open_recently`] uses to keep Escape for the picker rather than the dialog under it.
 fn open_pass_id() -> egui::Id {
-    egui::Id::new("color-picker-open-pass")
+    egui::Id::unique("color-picker-open-pass")
 }
 
 /// A colour picker is open: it was drawn, and stayed open, in this pass or the last one (so one
@@ -175,6 +177,12 @@ impl Pick {
 const SQUARE: f32 = 200.0;
 const SLIDER_W: f32 = 16.0;
 
+/// The colour picker popup's contents: saturation/value square, channel slider, number fields for
+/// H/S/B and R/G/B, a hex field and an original-colour swatch, plus OK and Cancel. `*c` is updated
+/// as the UI changes and `original` is what Cancel (or the swatch) restores. The chosen channel
+/// and the HSV/RGB pair are remembered in egui temp data so reopening keeps the hue when
+/// saturation or value reaches zero. Returns what the picker did this frame; it never runs a
+/// command itself.
 fn color_picker(ui: &mut Ui, id: egui::Id, c: &mut [f32; 3], original: [f32; 3]) -> Outcome {
     let state_id = id.with("pick");
     let mut pick = match ui.data(|d| d.get_temp::<([f32; 3], [f32; 3])>(state_id)) {
@@ -183,7 +191,7 @@ fn color_picker(ui: &mut Ui, id: egui::Id, c: &mut [f32; 3], original: [f32; 3])
         None => Pick { hsv: rgb_to_hsv(*c), rgb: *c },
     };
     // The slider's channel is remembered between pickers, as After Effects does.
-    let chan_id = egui::Id::new("color-picker-channel");
+    let chan_id = egui::Id::unique("color-picker-channel");
     let mut chan = ui.data(|d| d.get_temp::<usize>(chan_id)).and_then(|i| CHANS.get(i).map(|c| c.0)).unwrap_or(Chan::H);
     let before = pick;
     let mut out = Outcome::default();
@@ -268,7 +276,7 @@ const CHANS: [(Chan, &str); 6] = [(Chan::H, "H"), (Chan::S, "S"), (Chan::V, "B")
 /// Drag or click on the square to set its two channels.
 fn square(ui: &mut Ui, chan: Chan, pick: &mut Pick) {
     let (rect, resp) = ui.allocate_exact_size(vec2(SQUARE, SQUARE), Sense::click_and_drag());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Slider, true, "Color field"));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Slider, true, "Color field"));
     let (x, y) = chan.square();
     if let Some(p) = resp.interact_pointer_pos().filter(|_| resp.is_pointer_button_down_on()) {
         *pick = pick.at(chan, (p.x - rect.min.x) / rect.width(), 1.0 - (p.y - rect.min.y) / rect.height());
@@ -297,7 +305,7 @@ fn square(ui: &mut Ui, chan: Chan, pick: &mut Pick) {
 /// Drag or click on the slider to set `chan`; arrows on both sides mark its value.
 fn slider(ui: &mut Ui, chan: Chan, pick: &mut Pick) {
     let (outer, resp) = ui.allocate_exact_size(vec2(SLIDER_W + 12.0, SQUARE), Sense::click_and_drag());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Slider, true, "Color slider"));
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Slider, true, "Color slider"));
     let bar = Rect::from_center_size(outer.center(), vec2(SLIDER_W, SQUARE));
     if let Some(p) = resp.interact_pointer_pos().filter(|_| resp.is_pointer_button_down_on()) {
         *pick = pick.set(chan, 1.0 - (p.y - bar.min.y) / bar.height());
@@ -332,10 +340,10 @@ fn slider(ui: &mut Ui, chan: Chan, pick: &mut Pick) {
 fn swatches(ui: &mut Ui, new: [f32; 3], original: [f32; 3]) -> bool {
     let (rect, _) = ui.allocate_exact_size(vec2(64.0, 64.0), Sense::hover());
     let (top, bottom) = rect.split_top_bottom_at_fraction(0.5);
-    let new_resp = ui.interact(top, ui.id().with("new-swatch"), Sense::hover());
-    new_resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, "New color"));
-    let old = ui.interact(bottom, ui.id().with("original-swatch"), Sense::click()).on_hover_text(tr("Original color: click to go back to it"));
-    old.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Original color"));
+    let new_resp = ui.interact(top, ui.scope_id().with("new-swatch"), Sense::hover());
+    new_resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Unknown, true, "New color"));
+    let old = ui.interact(bottom, ui.scope_id().with("original-swatch"), Sense::click()).on_hover_text(tr("Original color: click to go back to it"));
+    old.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Original color"));
     ui.painter().rect_filled(top, 0.0, srgb32(new));
     ui.painter().rect_filled(bottom, 0.0, srgb32(original));
     ui.painter().rect_stroke(rect, 0.0, ui.visuals().widgets.inactive.bg_stroke, StrokeKind::Outside);
diff --git a/crates/ui-egui/src/control.rs b/crates/ui-egui/src/control.rs
index 15493ad79..e535cc723 100644
--- a/crates/ui-egui/src/control.rs
+++ b/crates/ui-egui/src/control.rs
@@ -15,7 +15,7 @@
 //! - `ui.viewer.locate {x, y}`: screen point of a comp pixel; `ui.viewer.hit {x, y}`: comp pixel at a screen point
 //! - `ui.timeline.locate {layer, time?}`: screen point of a layer bar (at a comp time)
 //! - `ui.playback {action: play|stop|toggle}`
-//! - `ui.screenshot {path?, panel?, id?}`: PNG of the window (or one panel / element)
+//! - `ui.screenshot {path?, panel?, id?}`: PNG of the window (or one panel / element, resolved when the capture is issued)
 //! - `render.frame {comp?, time?, max_side?, path?, base64?}`: PNG of a comp frame rendered by the session
 //! - `ui.resize {width, height}` / `ui.focus` / `app.quit {force?}` (a modified project asks to save first unless `force`)
 //!
@@ -39,6 +39,8 @@ pub struct ControlRequest {
 }
 
 impl ControlRequest {
+    /// Creates a request for `method` with `params`, returning it with the channel that will
+    /// receive the UI thread's reply.
     pub fn new(method: impl Into<String>, params: Value) -> (Self, std::sync::mpsc::Receiver<Value>) {
         let (tx, rx) = std::sync::mpsc::channel();
         (Self { method: method.into(), params, reply: tx }, rx)
@@ -53,7 +55,8 @@ pub enum Outcome {
     AfterInput,
     Screenshot {
         path: Option<String>,
-        crop: Option<[f32; 4]>,
+        /// The panel/element identity to capture, resolved again when the capture is issued.
+        target: crate::ShotTarget,
     },
     /// Reply once background jobs end (a `wait: true` command whose job runs in a worker).
     AwaitJobs(JobWaiter),
@@ -169,304 +172,491 @@ fn point(app: &EffectcraftApp, p: &Value) -> Result<egui::Pos2, String> {
     Ok(egui::pos2(x as f32, y as f32))
 }
 
-pub fn handle(app: &mut EffectcraftApp, ctx: &egui::Context, req: &ControlRequest) -> Outcome {
+/// Dispatches one control request on the UI thread. Replies are `{"ok": true, "result": …}`
+/// or `{"ok": false, "error": …}`; an unknown method is an error. Some methods answer with
+/// [`Outcome::Retry`], [`Outcome::AfterInput`], [`Outcome::Screenshot`] or
+/// [`Outcome::AwaitJobs`] instead of replying in this call.
+pub fn handle(app: &mut EffectcraftApp, ctx: &egui::Context, req: &ControlRequest, now: f64) -> Outcome {
     let p = &req.params;
-    let s = |k: &str| p.get(k).and_then(Value::as_str);
     match req.method.as_str() {
-        "engine.execute" | "ui.menu.invoke" => {
-            let Some(id) = s("command").or(s("id")) else { return err("missing `command`") };
-            let params = p.get("params").cloned().filter(|v| !v.is_null()).unwrap_or(json!({}));
-            // `engine.execute` runs engine commands exactly as headless (never opens a dialog, e.g.
-            // `comp.new {}` creates a default comp); UI-only ids (`tool.*`, `view.*`, `window.*`,
-            // `playback.*` …) and `ui.menu.invoke` go through the menu dispatcher like a click.
-            let r = if req.method == "engine.execute" && effectcraft_engine::find_command(id).is_some() {
-                execute_engine(app, id, params)
-            } else {
-                crate::menus::invoke(app, ctx, id, params).map(ok)
-            };
-            match r {
-                Ok(o) => o,
-                Err(e) => {
-                    app.ui.status = e.clone();
-                    err(e)
-                }
-            }
-        }
-        "engine.commands" => match app.session.execute("command.list", json!({"filter": p.get("filter"), "enabledOnly": p.get("enabledOnly")})) {
-            Ok(v) => ok(v),
-            Err(e) => err(e),
-        },
+        "engine.execute" | "ui.menu.invoke" => execute_command(app, ctx, &req.method, p),
+        "engine.commands" => engine_commands(app, p),
         "ui.menu.list" => ok(serde_json::to_value(crate::menus::menu_items(app)).unwrap_or_default()),
         "ui.inspect" => ok(inspect(app, ctx)),
-        "ui.elements" => {
-            let prefix = s("prefix").unwrap_or("");
-            ok(serde_json::to_value(app.auto.query(prefix)).unwrap_or_default())
-        }
-        "ui.set" => {
-            if let Some(t) = s("tool") {
-                match Tool::from_name(t) {
-                    Some(t) => app.ui.tool = t,
-                    None => return err(format!("unknown tool `{t}`")),
-                }
-            }
-            if let Some(w) = s("workspace") {
-                match crate::dock::WORKSPACES.iter().find(|x| x.eq_ignore_ascii_case(w)) {
-                    Some(w) => app.set_workspace(w),
-                    None => return err(format!("unknown workspace `{w}`")),
-                }
-            }
-            if let Some(th) = s("theme") {
-                match crate::theme::ThemeKind::from_name(th) {
-                    Some(k) => app.set_theme(ctx, k),
-                    None => return err("unknown theme (dark, darker, light)"),
-                }
-            }
-            if let Some(f) = s("focused").and_then(PanelKind::from_name) {
-                app.ui.focused = f;
-            }
-            if let Some(v) = p.get("viewer") {
-                if let Some(z) = v.get("zoom") {
-                    app.ui.viewer.zoom = z.as_f64().map(|z| z as f32);
-                }
-                // The active comp's Resolution (`view.res.*`), saved with the project.
-                if let Some(r) = v.get("res").and_then(Value::as_str) {
-                    let Some(res) = Resolution::ALL.into_iter().find(|x| x.label().eq_ignore_ascii_case(r)) else {
-                        return err(format!("unknown resolution `{r}` (auto, full, half, third, quarter)"));
-                    };
-                    if let Some(cid) = app.session.active_comp_id()
-                        && let Err(e) = app.session.set_resolution(cid, res)
-                    {
-                        return err(e);
-                    }
-                }
-                if let Some(Value::Array(a)) = v.get("pan") {
-                    app.ui.viewer.pan = [a.first().and_then(Value::as_f64).unwrap_or(0.0) as f32, a.get(1).and_then(Value::as_f64).unwrap_or(0.0) as f32];
-                }
-                for (k, slot) in [
-                    ("grid", &mut app.ui.viewer.grid),
-                    ("rulers", &mut app.ui.viewer.rulers),
-                    ("safeMargins", &mut app.ui.viewer.safe_margins),
-                    ("transparencyGrid", &mut app.ui.viewer.transparency_grid),
-                ] {
-                    if let Some(b) = v.get(k).and_then(Value::as_bool) {
-                        *slot = b;
-                    }
-                }
-            }
-            if let Some(tl) = p.get("timeline") {
-                if let Some(v) = tl.get("pps") {
-                    app.ui.timeline.pps = v.as_f64();
-                }
-                if let Some(v) = tl.get("start").and_then(Value::as_f64) {
-                    app.ui.timeline.start = v;
-                }
-                if let Some(v) = tl.get("graphEditor").and_then(Value::as_bool) {
-                    app.ui.timeline.graph_editor = v;
-                }
-                if let Some(v) = tl.get("showModes").and_then(Value::as_bool) {
-                    app.ui.timeline.show_modes = v;
-                }
-                if let Some(Value::Array(a)) = tl.get("openLayers") {
-                    app.ui.timeline.open_layers = a.iter().filter_map(Value::as_u64).collect();
-                }
-                if let Some(Value::Array(a)) = tl.get("openGroups") {
-                    app.ui.timeline.open_groups = a.iter().filter_map(Value::as_u64).collect();
-                }
-            }
-            if let Some(b) = p.get("menuBar").and_then(Value::as_bool) {
-                app.ui.show_menu_bar = b;
-            }
-            // Project panel optional columns, e.g. ["type", "duration", "path", "comment"].
-            if let Some(Value::Array(a)) = p.get("projectColumns") {
-                let mut cols = vec![];
-                for k in a.iter().filter_map(Value::as_str) {
-                    crate::panels::project::set_column(&mut cols, k, true);
-                }
-                app.ui.project_columns = cols;
-            }
-            // Wiggler / Smoother / Motion Sketch settings (fields of `AnimToolsState`).
-            if let Some(Value::Object(m)) = p.get("animTools") {
-                let mut cur = serde_json::to_value(&app.ui.anim_tools).unwrap_or_default();
-                for (k, v) in m {
-                    cur[k] = v.clone();
-                }
-                match serde_json::from_value(cur) {
-                    Ok(v) => app.ui.anim_tools = v,
-                    Err(e) => return err(format!("animTools: {e}")),
-                }
-            }
-            if let Some(b) = p.get("home").and_then(Value::as_bool) {
-                app.ui.start_screen = b;
-            }
-            // Home screen tab: "home", "templates" or "learn".
-            if let Some(tab) = p.get("homeTab").and_then(Value::as_str) {
-                app.ui.home_learn = tab == "learn";
-                app.ui.home_templates = tab == "templates";
-            }
-            ok(Value::Null)
-        }
-        "ui.panel.show" | "ui.panel.close" => {
-            let Some(panel) = s("panel").and_then(PanelKind::from_name) else { return err("unknown `panel`") };
-            if req.method == "ui.panel.show" {
-                app.show_panel(panel);
-            } else {
-                app.ui.dock.close(panel);
-            }
-            ok(Value::Null)
-        }
-        "ui.click" | "ui.move" => {
-            let pos = match point(app, p) {
-                Ok(p) => p,
-                Err(e) if e.starts_with(RETRY) => return Outcome::Retry(e.trim_start_matches(RETRY).to_string()),
-                Err(e) => return err(e),
-            };
-            let m = modifiers(p);
-            // egui keeps the modifiers from `ModifiersChanged` (not the ones on a pointer event)
-            // and the synthetic events arrive one per frame: hold them for the whole gesture.
-            app.synthetic.push(egui::Event::ModifiersChanged(m));
-            app.synthetic.push(egui::Event::PointerMoved(pos));
-            if req.method == "ui.click" {
-                let button = match s("button") {
-                    Some("right") => egui::PointerButton::Secondary,
-                    Some("middle") => egui::PointerButton::Middle,
-                    _ => egui::PointerButton::Primary,
-                };
-                let count = p.get("count").and_then(Value::as_u64).unwrap_or(1);
-                for _ in 0..count {
-                    app.synthetic.push(egui::Event::PointerButton { pos, button, pressed: true, modifiers: m });
-                    app.synthetic.push(egui::Event::PointerButton { pos, button, pressed: false, modifiers: m });
-                }
-            }
-            app.synthetic.push(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
-            Outcome::AfterInput
-        }
-        "ui.drag" => {
-            let (Some(from), Some(to)) = (p.get("from"), p.get("to")) else { return err("need `from` and `to`") };
-            let (a, b) = match (point(app, from), point(app, to)) {
-                (Ok(a), Ok(b)) => (a, b),
-                (Err(e), _) | (_, Err(e)) if e.starts_with(RETRY) => return Outcome::Retry(e.trim_start_matches(RETRY).to_string()),
-                (Err(e), _) | (_, Err(e)) => return err(e),
-            };
-            let steps = p.get("steps").and_then(Value::as_u64).unwrap_or(12).max(2);
-            let m = modifiers(p);
-            app.synthetic.push(egui::Event::ModifiersChanged(m));
-            app.synthetic.push(egui::Event::PointerMoved(a));
-            app.synthetic.push(egui::Event::PointerButton { pos: a, button: egui::PointerButton::Primary, pressed: true, modifiers: m });
-            for i in 1..=steps {
-                let f = i as f32 / steps as f32;
-                app.synthetic.push(egui::Event::PointerMoved(a + (b - a) * f));
-            }
-            app.synthetic.push(egui::Event::PointerButton { pos: b, button: egui::PointerButton::Primary, pressed: false, modifiers: m });
-            app.synthetic.push(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
-            Outcome::AfterInput
-        }
-        "ui.scroll" => {
-            let pos = match point(app, p) {
-                Ok(p) => p,
-                Err(e) => return err(e),
-            };
-            let dx = p.get("dx").and_then(Value::as_f64).unwrap_or(0.0) as f32;
-            let dy = p.get("dy").and_then(Value::as_f64).unwrap_or(0.0) as f32;
-            app.synthetic.push(egui::Event::PointerMoved(pos));
-            app.synthetic.push(egui::Event::MouseWheel {
-                unit: egui::MouseWheelUnit::Point,
-                delta: egui::vec2(dx, dy),
-                modifiers: modifiers(p),
-                phase: egui::TouchPhase::Move,
-            });
-            app.synthetic.push(egui::Event::PointerButton {
-                pos: egui::pos2(-100.0, -100.0),
-                button: egui::PointerButton::Extra1,
-                pressed: false,
-                modifiers: Default::default(),
-            });
-            Outcome::AfterInput
-        }
-        "ui.key" => {
-            let Some(name) = s("key") else { return err("missing `key`") };
-            let Some((mut m, key)) = crate::menus::parse_shortcut(name) else { return err(format!("unknown key `{name}`")) };
-            let extra = modifiers(p);
-            m |= extra;
-            let physical_key = name.starts_with("Physical+").then_some(key);
-            app.synthetic.push(egui::Event::Key { key, physical_key, pressed: true, repeat: false, modifiers: m });
-            app.synthetic.push(egui::Event::Key { key, physical_key, pressed: false, repeat: false, modifiers: m });
-            Outcome::AfterInput
-        }
-        "ui.type" => {
-            let Some(text) = s("text") else { return err("missing `text`") };
-            app.synthetic.push(egui::Event::Text(text.to_string()));
-            app.synthetic.push(egui::Event::Key { key: egui::Key::F35, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() });
-            Outcome::AfterInput
-        }
-        "ui.viewer.locate" => {
-            let (Some(x), Some(y)) = (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) else {
-                return err("need `x`, `y` (comp pixels)");
-            };
-            match crate::panels::viewer::comp_to_screen(ctx, [x as f32, y as f32]) {
-                Some(pt) => ok(json!({"x": pt.x, "y": pt.y})),
-                None => Outcome::Retry("the composition viewer is not visible".into()),
-            }
-        }
-        "ui.viewer.hit" => {
-            let pos = match point(app, p) {
-                Ok(p) => p,
-                Err(e) => return err(e),
-            };
-            match crate::panels::viewer::screen_to_comp(ctx, pos) {
-                Some(c) => ok(json!({"x": c[0], "y": c[1]})),
-                None => err("the composition viewer is not visible"),
-            }
-        }
-        "ui.timeline.locate" => {
-            let Some(l) = p.get("layer").and_then(Value::as_u64) else { return err("need `layer` (id)") };
-            match crate::panels::timeline::locate(app, l, p.get("time").and_then(Value::as_f64)) {
-                Some((x, y)) => ok(json!({"x": x, "y": y})),
-                None => Outcome::Retry("layer not visible in the timeline".into()),
-            }
-        }
-        "ui.playback" => {
-            let now = ctx.input(|i| i.time);
-            match s("action").unwrap_or("toggle") {
-                "play" => app.play(now),
-                "stop" => app.stop(),
-                "status" => {}
-                _ => app.toggle_play(now),
-            }
-            ok(
-                json!({"playing": app.playback.playing, "time": app.session.time().seconds(), "audio": app.audio.is_some(), "levelsDb": app.meter.level_db, "peaksDb": app.meter.peak_db}),
-            )
-        }
-        "ui.screenshot" => {
-            let crop = s("panel").and_then(PanelKind::from_name).and_then(|pk| app.auto.find(&format!("panel.{}", pk.id())).map(|e| e.rect));
-            let crop = crop.or_else(|| s("id").and_then(|id| app.auto.find(id).map(|e| e.rect)));
-            // Bring the window on screen so a frame is presented, without taking keyboard focus.
-            app.raise_for_control(ctx);
-            Outcome::Screenshot { path: s("path").map(str::to_string), crop }
-        }
+        "ui.elements" => elements(app, p),
+        "ui.set" => set_ui(app, ctx, p),
+        "ui.panel.show" | "ui.panel.close" => panel(app, &req.method, p),
+        "ui.click" | "ui.move" => click_or_move(app, &req.method, p),
+        "ui.drag" => drag(app, p),
+        "ui.scroll" => scroll(app, p),
+        "ui.key" => key(app, p),
+        "ui.type" => type_text(app, p),
+        "ui.viewer.locate" => viewer_locate(ctx, p),
+        "ui.viewer.hit" => viewer_hit(app, ctx, p),
+        "ui.timeline.locate" => timeline_locate(app, p),
+        "ui.playback" => playback(app, p, now),
+        "ui.screenshot" => screenshot(app, ctx, p),
         "render.frame" => render_frame(app, p),
-        "ui.resize" => {
-            let w = p.get("width").and_then(Value::as_f64).unwrap_or(1600.0) as f32;
-            let h = p.get("height").and_then(Value::as_f64).unwrap_or(1000.0) as f32;
-            ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(egui::vec2(w, h)));
-            ok(Value::Null)
-        }
-        "ui.focus" => {
-            // Explicit request: activate the app and take keyboard focus.
-            ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
-            ok(Value::Null)
-        }
-        "app.quit" => {
-            // A modified project asks to save first unless `force: true`.
-            if p.get("force").and_then(Value::as_bool).unwrap_or(false) {
-                app.dialog_state.unsaved.quitting = true;
-            }
-            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-            ok(Value::Null)
-        }
+        "ui.resize" => resize(ctx, p),
+        "ui.focus" => focus(ctx),
+        "app.quit" => quit(app, ctx, p),
         m => err(format!("unknown method `{m}`")),
     }
 }
 
+/// Runs `engine.execute` or `ui.menu.invoke`. `engine.execute` with a known engine command id
+/// goes through [`execute_engine`] (so a `wait: true` job can be offloaded); every other id,
+/// and every `ui.menu.invoke`, goes through the menu dispatcher. A failure is copied to the
+/// status line.
+fn execute_command(app: &mut EffectcraftApp, ctx: &egui::Context, method: &str, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    let Some(id) = s("command").or(s("id")) else { return err("missing `command`") };
+    let params = p.get("params").cloned().filter(|v| !v.is_null()).unwrap_or(json!({}));
+    // `engine.execute` runs engine commands exactly as headless (never opens a dialog, e.g.
+    // `comp.new {}` creates a default comp); UI-only ids (`tool.*`, `view.*`, `window.*`,
+    // `playback.*` …) and `ui.menu.invoke` go through the menu dispatcher like a click.
+    let r = if method == "engine.execute" && effectcraft_engine::find_command(id).is_some() {
+        execute_engine(app, id, params)
+    } else {
+        crate::menus::invoke(app, ctx, id, params).map(ok)
+    };
+    match r {
+        Ok(o) => o,
+        Err(e) => {
+            app.ui.status = e.clone();
+            err(e)
+        }
+    }
+}
+
+/// Replies with `command.list`'s result, forwarding `filter` and `enabledOnly`.
+fn engine_commands(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    match app.session.execute("command.list", json!({"filter": p.get("filter"), "enabledOnly": p.get("enabledOnly")})) {
+        Ok(v) => ok(v),
+        Err(e) => err(e),
+    }
+}
+
+/// Replies with the automation elements whose id starts with `prefix` (all when empty), as
+/// `{id, label, rect}` records.
+fn elements(app: &EffectcraftApp, p: &Value) -> Outcome {
+    let prefix = p.get("prefix").and_then(Value::as_str).unwrap_or("");
+    ok(serde_json::to_value(app.auto.query(prefix)).unwrap_or_default())
+}
+
+/// Explicit request: activate the app and take keyboard focus.
+fn focus(ctx: &egui::Context) -> Outcome {
+    ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
+    ok(Value::Null)
+}
+
+/// Applies `ui.set` in order: tool, workspace, theme, focused panel, viewer settings, then the
+/// layout fields ([`set_ui_layout`]). An unknown tool, workspace or theme name, or an invalid
+/// viewer value, replies with an error after the earlier fields were already applied.
+fn set_ui(app: &mut EffectcraftApp, ctx: &egui::Context, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    if let Some(t) = s("tool") {
+        match Tool::from_name(t) {
+            Some(t) => app.ui.tool = t,
+            None => return err(format!("unknown tool `{t}`")),
+        }
+    }
+    if let Some(w) = s("workspace") {
+        match crate::dock::WORKSPACES.iter().find(|x| x.eq_ignore_ascii_case(w)) {
+            Some(w) => app.set_workspace(w),
+            None => return err(format!("unknown workspace `{w}`")),
+        }
+    }
+    if let Some(th) = s("theme") {
+        match crate::theme::ThemeKind::from_name(th) {
+            Some(k) => app.set_theme(ctx, k),
+            None => return err("unknown theme (dark, darker, light)"),
+        }
+    }
+    if let Some(f) = s("focused").and_then(PanelKind::from_name) {
+        app.ui.focused = f;
+    }
+    if let Some(v) = p.get("viewer")
+        && let Err(e) = apply_viewer(app, v)
+    {
+        return err(e);
+    }
+    set_ui_layout(app, p)
+}
+
+/// The remaining `ui.set` fields, applied in the same order after the viewer settings.
+fn set_ui_layout(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    if let Some(tl) = p.get("timeline") {
+        apply_timeline(app, tl);
+    }
+    if let Some(b) = p.get("menuBar").and_then(Value::as_bool) {
+        app.ui.show_menu_bar = b;
+    }
+    // Project panel optional columns, e.g. ["type", "duration", "path", "comment"].
+    if let Some(Value::Array(a)) = p.get("projectColumns") {
+        apply_project_columns(app, a);
+    }
+    // Wiggler / Smoother / Motion Sketch settings (fields of `AnimToolsState`).
+    if let Some(Value::Object(m)) = p.get("animTools")
+        && let Err(e) = apply_anim_tools(app, m)
+    {
+        return err(e);
+    }
+    if let Some(b) = p.get("home").and_then(Value::as_bool) {
+        app.ui.start_screen = b;
+    }
+    // Home screen tab: "home", "templates" or "learn".
+    if let Some(tab) = p.get("homeTab").and_then(Value::as_str) {
+        app.ui.home_learn = tab == "learn";
+        app.ui.home_templates = tab == "templates";
+    }
+    ok(Value::Null)
+}
+
+/// Applies viewer `zoom`, the active comp's `res` (stored in the project), `pan` and the
+/// `grid`, `rulers`, `safeMargins` and `transparencyGrid` toggles. An unknown resolution name
+/// is an error; a resolution change without an active comp is ignored.
+fn apply_viewer(app: &mut EffectcraftApp, v: &Value) -> Result<(), String> {
+    if let Some(z) = v.get("zoom") {
+        app.ui.viewer.zoom = z.as_f64().map(|z| z as f32);
+    }
+    // The active comp's Resolution (`view.res.*`), saved with the project.
+    if let Some(r) = v.get("res").and_then(Value::as_str) {
+        let Some(res) = Resolution::ALL.into_iter().find(|x| x.label().eq_ignore_ascii_case(r)) else {
+            return Err(format!("unknown resolution `{r}` (auto, full, half, third, quarter)"));
+        };
+        if let Some(cid) = app.session.active_comp_id()
+            && let Err(e) = app.session.set_resolution(cid, res)
+        {
+            return Err(e.to_string());
+        }
+    }
+    if let Some(Value::Array(a)) = v.get("pan") {
+        app.ui.viewer.pan = [a.first().and_then(Value::as_f64).unwrap_or(0.0) as f32, a.get(1).and_then(Value::as_f64).unwrap_or(0.0) as f32];
+    }
+    for (k, slot) in [
+        ("grid", &mut app.ui.viewer.grid),
+        ("rulers", &mut app.ui.viewer.rulers),
+        ("safeMargins", &mut app.ui.viewer.safe_margins),
+        ("transparencyGrid", &mut app.ui.viewer.transparency_grid),
+    ] {
+        if let Some(b) = v.get(k).and_then(Value::as_bool) {
+            *slot = b;
+        }
+    }
+    Ok(())
+}
+
+/// Applies timeline `pps`, `start`, `graphEditor`, `showModes`, `openLayers` and `openGroups`
+/// to the UI state, leaving absent fields unchanged.
+fn apply_timeline(app: &mut EffectcraftApp, tl: &Value) {
+    if let Some(v) = tl.get("pps") {
+        app.ui.timeline.pps = v.as_f64();
+    }
+    if let Some(v) = tl.get("start").and_then(Value::as_f64) {
+        app.ui.timeline.start = v;
+    }
+    if let Some(v) = tl.get("graphEditor").and_then(Value::as_bool) {
+        app.ui.timeline.graph_editor = v;
+    }
+    if let Some(v) = tl.get("showModes").and_then(Value::as_bool) {
+        app.ui.timeline.show_modes = v;
+    }
+    if let Some(Value::Array(a)) = tl.get("openLayers") {
+        app.ui.timeline.open_layers = a.iter().filter_map(Value::as_u64).collect();
+    }
+    if let Some(Value::Array(a)) = tl.get("openGroups") {
+        app.ui.timeline.open_groups = a.iter().filter_map(Value::as_u64).collect();
+    }
+}
+
+/// Replaces the Project panel's optional columns with the names in `a`, in the canonical
+/// `COLUMNS` order; unknown names are kept, sorted after the known ones.
+fn apply_project_columns(app: &mut EffectcraftApp, a: &[Value]) {
+    let mut cols = vec![];
+    for k in a.iter().filter_map(Value::as_str) {
+        crate::panels::project::set_column(&mut cols, k, true);
+    }
+    app.ui.project_columns = cols;
+}
+
+/// Merges `m` over the current Wiggler/Smoother/Motion Sketch settings by round-tripping them
+/// through JSON. A value of the wrong type is an error and leaves the settings unchanged.
+fn apply_anim_tools(app: &mut EffectcraftApp, m: &serde_json::Map<String, Value>) -> Result<(), String> {
+    let mut cur = serde_json::to_value(&app.ui.anim_tools).unwrap_or_default();
+    for (k, v) in m {
+        cur[k] = v.clone();
+    }
+    match serde_json::from_value(cur) {
+        Ok(v) => {
+            app.ui.anim_tools = v;
+            Ok(())
+        }
+        Err(e) => Err(format!("animTools: {e}")),
+    }
+}
+
+/// Shows (`ui.panel.show`) or closes (`ui.panel.close`) the named panel; an unknown panel name
+/// is an error.
+fn panel(app: &mut EffectcraftApp, method: &str, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    let Some(panel) = s("panel").and_then(PanelKind::from_name) else { return err("unknown `panel`") };
+    if method == "ui.panel.show" {
+        app.show_panel(panel);
+    } else {
+        app.close_panel(panel);
+    }
+    ok(Value::Null)
+}
+
+/// The number of synthetic events a gesture queues: `2 * count + 3` for `ui.click` (`count`
+/// 1..=512), or 3 for `ui.move`. An out-of-range `count` or an overflow is an error.
+fn click_gesture_events(method: &str, p: &Value) -> Result<usize, String> {
+    if method != "ui.click" {
+        return Ok(3);
+    }
+    const MAX_CLICK_COUNT: u64 = 512;
+    let count = p.get("count").and_then(Value::as_u64).unwrap_or(1);
+    if count == 0 || count > MAX_CLICK_COUNT {
+        return Err(format!("`count` must be between 1 and {MAX_CLICK_COUNT}"));
+    }
+    usize::try_from(count).ok().and_then(|n| n.checked_mul(2)).and_then(|n| n.checked_add(3)).ok_or_else(|| "click event count overflow".to_string())
+}
+
+/// Queues a click or a plain move at `{id}`'s centre (`fx`/`fy` within its rect, default 0.5)
+/// or at `{x, y}`, holding the request's modifiers across the whole gesture. An element that is
+/// not on screen returns [`Outcome::Retry`]; the gesture is size-checked against the 4096-event
+/// queue limit before anything is pushed. Replies [`Outcome::AfterInput`].
+fn click_or_move(app: &mut EffectcraftApp, method: &str, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    let pos = match point(app, p) {
+        Ok(p) => p,
+        Err(e) if e.starts_with(RETRY) => return Outcome::Retry(e.trim_start_matches(RETRY).to_string()),
+        Err(e) => return err(e),
+    };
+    let m = modifiers(p);
+    // Validate the complete gesture before mutating the queue; the loopback control
+    // channel is externally reachable and must not amplify tiny requests into huge work.
+    const MAX_PENDING_EVENTS: usize = 4096;
+    let pending = app.synthetic.len();
+    let gesture_events = match click_gesture_events(method, p) {
+        Ok(events) => events,
+        Err(e) => return err(e),
+    };
+    if pending.checked_add(gesture_events).is_none_or(|n| n > MAX_PENDING_EVENTS) {
+        return err("synthetic input queue is full");
+    }
+    // egui keeps the modifiers from `ModifiersChanged` (not the ones on a pointer event)
+    // and the synthetic events arrive one per frame: hold them for the whole gesture.
+    app.synthetic.push(egui::Event::ModifiersChanged(m));
+    app.synthetic.push(egui::Event::PointerMoved(pos));
+    if method == "ui.click" {
+        let button = match s("button") {
+            Some("right") => egui::PointerButton::Secondary,
+            Some("middle") => egui::PointerButton::Middle,
+            _ => egui::PointerButton::Primary,
+        };
+        let count = p.get("count").and_then(Value::as_u64).unwrap_or(1);
+        for _ in 0..count {
+            app.synthetic.push(egui::Event::PointerButton { pos, button, pressed: true, modifiers: m });
+            app.synthetic.push(egui::Event::PointerButton { pos, button, pressed: false, modifiers: m });
+        }
+    }
+    app.synthetic.push(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
+    Outcome::AfterInput
+}
+
+/// Queues a primary-button drag from `from` to `to` over `steps` interpolated moves (default
+/// 12, at least 2, at most 2048), with the request's modifiers. Both endpoints are resolved
+/// first (an unseen element returns [`Outcome::Retry`]) and the event count is checked against
+/// the 4096-event queue limit. Replies [`Outcome::AfterInput`].
+fn drag(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    let (Some(from), Some(to)) = (p.get("from"), p.get("to")) else { return err("need `from` and `to`") };
+    let (a, b) = match (point(app, from), point(app, to)) {
+        (Ok(a), Ok(b)) => (a, b),
+        (Err(e), _) | (_, Err(e)) if e.starts_with(RETRY) => return Outcome::Retry(e.trim_start_matches(RETRY).to_string()),
+        (Err(e), _) | (_, Err(e)) => return err(e),
+    };
+    let steps = p.get("steps").and_then(Value::as_u64).unwrap_or(12).max(2);
+    const MAX_PENDING_EVENTS: usize = 4096;
+    const MAX_DRAG_STEPS: u64 = 2048;
+    if steps > MAX_DRAG_STEPS {
+        return err(format!("`steps` must be at most {MAX_DRAG_STEPS}"));
+    }
+    let Some(gesture_events) = usize::try_from(steps).ok().and_then(|n| n.checked_add(5)) else { return err("drag event count overflow") };
+    if app.synthetic.len().checked_add(gesture_events).is_none_or(|n| n > MAX_PENDING_EVENTS) {
+        return err("synthetic input queue is full");
+    }
+    let m = modifiers(p);
+    app.synthetic.push(egui::Event::ModifiersChanged(m));
+    app.synthetic.push(egui::Event::PointerMoved(a));
+    app.synthetic.push(egui::Event::PointerButton { pos: a, button: egui::PointerButton::Primary, pressed: true, modifiers: m });
+    for i in 1..=steps {
+        let f = i as f32 / steps as f32;
+        app.synthetic.push(egui::Event::PointerMoved(a + (b - a) * f));
+    }
+    app.synthetic.push(egui::Event::PointerButton { pos: b, button: egui::PointerButton::Primary, pressed: false, modifiers: m });
+    app.synthetic.push(egui::Event::ModifiersChanged(egui::Modifiers::NONE));
+    Outcome::AfterInput
+}
+
+/// Queues a move to the target point, a wheel event of `dx`, `dy` points with the request's
+/// modifiers, and a released Extra1 button. Replies [`Outcome::AfterInput`].
+fn scroll(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    let pos = match point(app, p) {
+        Ok(p) => p,
+        Err(e) => return err(e),
+    };
+    let dx = p.get("dx").and_then(Value::as_f64).unwrap_or(0.0) as f32;
+    let dy = p.get("dy").and_then(Value::as_f64).unwrap_or(0.0) as f32;
+    app.synthetic.push(egui::Event::PointerMoved(pos));
+    app.synthetic.push(egui::Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: egui::vec2(dx, dy),
+        modifiers: modifiers(p),
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
+    app.synthetic.push(egui::Event::PointerButton {
+        pos: egui::pos2(-100.0, -100.0),
+        button: egui::PointerButton::Extra1,
+        pressed: false,
+        modifiers: Default::default(),
+    });
+    Outcome::AfterInput
+}
+
+/// Queues a press and release of `key`, whose name may carry a shortcut (`Cmd+Shift+Z`); the
+/// separate `modifiers` flags are added. A `Physical+` prefix makes the key positional. An
+/// unknown key name is an error.
+fn key(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    let Some(name) = s("key") else { return err("missing `key`") };
+    let Some((mut m, key)) = crate::menus::parse_shortcut(name) else { return err(format!("unknown key `{name}`")) };
+    let extra = modifiers(p);
+    m |= extra;
+    let physical_key = name.starts_with("Physical+").then_some(key);
+    app.synthetic.push(egui::Event::Key { key, physical_key, pressed: true, repeat: false, modifiers: m });
+    app.synthetic.push(egui::Event::Key { key, physical_key, pressed: false, repeat: false, modifiers: m });
+    Outcome::AfterInput
+}
+
+/// Queues a text event with `text`, followed by a released F35 key. Missing `text` is an
+/// error.
+fn type_text(app: &mut EffectcraftApp, p: &Value) -> Outcome {
+    let Some(text) = p.get("text").and_then(Value::as_str) else { return err("missing `text`") };
+    app.synthetic.push(egui::Event::Text(text.to_string()));
+    app.synthetic.push(egui::Event::Key { key: egui::Key::F35, physical_key: None, pressed: false, repeat: false, modifiers: Default::default() });
+    Outcome::AfterInput
+}
+
+/// Converts comp pixel `x`, `y` to a screen point with the viewer's current transform, or
+/// returns [`Outcome::Retry`] while the viewer is not visible.
+fn viewer_locate(ctx: &egui::Context, p: &Value) -> Outcome {
+    let (Some(x), Some(y)) = (p.get("x").and_then(Value::as_f64), p.get("y").and_then(Value::as_f64)) else {
+        return err("need `x`, `y` (comp pixels)");
+    };
+    match crate::panels::viewer::comp_to_screen(ctx, [x as f32, y as f32]) {
+        Some(pt) => ok(json!({"x": pt.x, "y": pt.y})),
+        None => Outcome::Retry("the composition viewer is not visible".into()),
+    }
+}
+
+/// Converts a point (`{id}`, or `{x, y}`) to comp pixels; replies with an error when the
+/// viewer is not visible.
+fn viewer_hit(app: &mut EffectcraftApp, ctx: &egui::Context, p: &Value) -> Outcome {
+    let pos = match point(app, p) {
+        Ok(p) => p,
+        Err(e) => return err(e),
+    };
+    match crate::panels::viewer::screen_to_comp(ctx, pos) {
+        Some(c) => ok(json!({"x": c[0], "y": c[1]})),
+        None => err("the composition viewer is not visible"),
+    }
+}
+
+/// Returns the screen point at `time` seconds on the ruler row of layer `layer`'s bar;
+/// without a numeric `time`, returns the bar's centre. Returns [`Outcome::Retry`] when the bar
+/// is unavailable, or a numeric `time` is supplied but the ruler is unavailable or malformed.
+fn timeline_locate(app: &EffectcraftApp, p: &Value) -> Outcome {
+    let Some(l) = p.get("layer").and_then(Value::as_u64) else { return err("need `layer` (id)") };
+    match crate::panels::timeline::locate(app, l, p.get("time").and_then(Value::as_f64)) {
+        Some((x, y)) => ok(json!({"x": x, "y": y})),
+        None => Outcome::Retry("layer not visible in the timeline".into()),
+    }
+}
+
+/// Applies `action` (`play`, `stop`, `status`, else toggle) at `now` and replies with the
+/// playing state, current time in seconds, whether audio is present and the meter's level and
+/// peak in dB.
+fn playback(app: &mut EffectcraftApp, p: &Value, now: f64) -> Outcome {
+    let action = p.get("action").and_then(Value::as_str).unwrap_or("toggle");
+    match action {
+        "play" => app.play(now),
+        "stop" => app.stop(),
+        "status" => {}
+        _ => app.toggle_play(now),
+    }
+    ok(
+        json!({"playing": app.playback.playing, "time": app.session.time().seconds(), "audio": app.audio.is_some(), "levelsDb": app.meter.level_db, "peaksDb": app.meter.peak_db}),
+    )
+}
+
+/// Resolves the capture target — a named panel, an element id, or the whole window — and
+/// returns [`Outcome::Retry`] while a requested panel or element is not registered, so a
+/// missing target is never silently captured as the window. Requests a repaint without raising
+/// or focusing the window and returns [`Outcome::Screenshot`]; the target is resolved again
+/// when the capture is issued.
+fn screenshot(app: &mut EffectcraftApp, ctx: &egui::Context, p: &Value) -> Outcome {
+    let s = |k: &str| p.get(k).and_then(Value::as_str);
+    // The panel/element is an identity, not a rectangle: it is resolved when the capture
+    // is issued (after the UI settles), so a panel that moves meanwhile is not cropped
+    // with its old rectangle.
+    let target = match s("panel") {
+        Some(name) => match PanelKind::from_name(name) {
+            Some(pk) => crate::ShotTarget::Panel(pk),
+            None => return err(format!("unknown panel `{name}`")),
+        },
+        None => s("id").map_or(crate::ShotTarget::Window, |id| crate::ShotTarget::Id(id.to_string())),
+    };
+    // Asking for one element and silently capturing the whole window would hide a missing
+    // panel: wait for it like any other not-yet-laid-out control.
+    let missing = match &target {
+        crate::ShotTarget::Panel(pk) => app.auto.find(&format!("panel.{}", pk.id())).is_none(),
+        crate::ShotTarget::Id(id) => app.auto.find(id).is_none(),
+        crate::ShotTarget::Window | crate::ShotTarget::Rect(_) => false,
+    };
+    if missing {
+        return Outcome::Retry(match &target {
+            crate::ShotTarget::Panel(pk) => format!("the {} panel is not on screen", pk.title()),
+            crate::ShotTarget::Id(id) => format!("no element `{id}` is on screen"),
+            crate::ShotTarget::Window | crate::ShotTarget::Rect(_) => "the element is not on screen".into(),
+        });
+    }
+    // Request a repaint without raising the window or taking keyboard focus.
+    app.raise_for_control(ctx);
+    Outcome::Screenshot { path: s("path").map(str::to_string), target }
+}
+
+/// Asks the viewport for an inner size of `width`×`height` pixels (default 1600×1000).
+fn resize(ctx: &egui::Context, p: &Value) -> Outcome {
+    let w = p.get("width").and_then(Value::as_f64).unwrap_or(1600.0) as f32;
+    let h = p.get("height").and_then(Value::as_f64).unwrap_or(1000.0) as f32;
+    ctx.send_viewport_cmd(egui::ViewportCommand::InnerSize(egui::vec2(w, h)));
+    ok(Value::Null)
+}
+
+/// Sends the viewport close request. `force: true` marks the unsaved-changes state as
+/// quitting, so a modified project closes without the save prompt.
+fn quit(app: &mut EffectcraftApp, ctx: &egui::Context, p: &Value) -> Outcome {
+    // A modified project asks to save first unless `force: true`.
+    if p.get("force").and_then(Value::as_bool).unwrap_or(false) {
+        app.dialog_state.unsaved.quitting = true;
+    }
+    ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+    ok(Value::Null)
+}
+
 /// `render.frame {comp?, time?, max_side?, path?, base64?}`: render a comp frame through the session
 /// (independent of the viewer zoom/resolution) and return it as PNG, written to `path` (default a
 /// temp file) or inline as base64 when `base64: true`.
@@ -525,8 +715,13 @@ pub fn base64(data: &[u8]) -> String {
     s
 }
 
+/// Builds the `ui.inspect` reply: window size and pixels per point, fps, UI state with the
+/// active comp's viewer resolution, playback and time, active comp, selected layer/key counts,
+/// registered element count, keyboard focus (egui id, rect, automation ids and rect
+/// candidates), fresh window focus, workspace storage error, open dialog and last frame time.
 pub fn inspect(app: &EffectcraftApp, ctx: &egui::Context) -> Value {
-    let size = ctx.content_rect().size();
+    // A logic-only tick refreshes the viewport information but not `InputState`'s screen rect.
+    let size = ctx.input(|i| i.viewport().inner_rect).map_or_else(|| ctx.content_rect().size(), |r| r.size());
     let keyboard_focus = ctx.memory(|m| m.focused()).map(|id| {
         let response = ctx.read_response(id);
         let rect = response.as_ref().map(|r| [r.rect.min.x, r.rect.min.y, r.rect.width(), r.rect.height()]);
@@ -559,7 +754,9 @@ pub fn inspect(app: &EffectcraftApp, ctx: &egui::Context) -> Value {
         "selectedKeys": app.session.state.selected_keys.len(),
         "elements": app.auto.previous.len(),
         "keyboardFocus": keyboard_focus,
-        "windowFocused": ctx.input(|i| i.focused),
+        // Fresh viewport focus only: in a logic-only tick `InputState::focused` still holds the
+        // previous full pass's value, and the app field is that same fresh value.
+        "windowFocused": ctx.input(|i| i.viewport().focused).unwrap_or(app.focused),
         "workspaceStorageError": app.workspace_store.error,
         "dialog": app.dialog.map(|d| format!("{d:?}")),
         "renderMs": app.frames.last_ms.lock().map(|v| *v).unwrap_or(0.0),
@@ -567,21 +764,37 @@ pub fn inspect(app: &EffectcraftApp, ctx: &egui::Context) -> Value {
 }
 
 /// Save a screenshot (optionally cropped to a rect in points) as PNG; returns the reply JSON.
-pub fn save_screenshot(ctx: &egui::Context, image: &egui::ColorImage, path: Option<&str>, crop: Option<[f32; 4]>) -> Value {
-    let ppp = ctx.pixels_per_point();
+///
+/// `crop` is relative to the image's own origin (the issued surface's top-left corner), and
+/// `scale` is the returned image's pixels per point in x and y, derived from the image size and
+/// the issued rect. The image can be smaller than requested when the adapter-limit fit (E2)
+/// applies, so its own scale — never the issued or current pixels-per-point — cuts the crop:
+/// any other scale reads a shifted or rescaled region.
+pub fn save_screenshot(image: &egui::ColorImage, path: Option<&str>, crop: Option<[f32; 4]>, scale: [f64; 2]) -> Value {
     let [w, h] = image.size;
+    let [sx, sy] = scale;
+    if w == 0 || h == 0 || !sx.is_finite() || sx <= 0.0 || !sy.is_finite() || sy <= 0.0 {
+        return json!({"ok": false, "error": "the screenshot has no pixels to save"});
+    }
+    if image.pixels.len() != w.saturating_mul(h) {
+        return json!({"ok": false, "error": "the screenshot's pixels do not match its dimensions"});
+    }
+    let px = |v: f64, s: f64| (v * s).max(0.0) as usize;
     let (x0, y0, cw, ch) = match crop {
-        Some([x, y, cw, ch]) => {
-            let x0 = ((x * ppp) as usize).min(w);
-            let y0 = ((y * ppp) as usize).min(h);
-            (x0, y0, ((cw * ppp) as usize).min(w - x0), ((ch * ppp) as usize).min(h - y0))
+        Some([x, y, cw, ch]) if [x, y, cw, ch].iter().all(|v| v.is_finite()) => {
+            let x0 = px(x as f64, sx).min(w);
+            let y0 = px(y as f64, sy).min(h);
+            (x0, y0, px(cw as f64, sx).min(w - x0), px(ch as f64, sy).min(h - y0))
         }
+        Some(_) => return json!({"ok": false, "error": "the screenshot crop is not a finite rectangle"}),
         None => (0, 0, w, h),
     };
-    let mut rgba = Vec::with_capacity(cw * ch * 4);
+    let mut rgba = Vec::with_capacity(cw.saturating_mul(ch).saturating_mul(4));
     for y in y0..y0 + ch {
         for x in x0..x0 + cw {
-            let c = image.pixels[y * w + x];
+            let Some(c) = image.pixels.get(y * w + x) else {
+                return json!({"ok": false, "error": "the screenshot's pixels do not match its dimensions"});
+            };
             rgba.extend_from_slice(&[c.r(), c.g(), c.b(), 255]);
         }
     }
diff --git a/crates/ui-egui/src/credits.rs b/crates/ui-egui/src/credits.rs
index 77357e876..6704017b9 100644
--- a/crates/ui-egui/src/credits.rs
+++ b/crates/ui-egui/src/credits.rs
@@ -241,7 +241,7 @@ impl Default for View {
 /// About ▸ Contributors: a name toggle, a sort, and the list as a grab bag or a table. Every
 /// control registers an automation id under `about.credits.`.
 pub fn contributors_ui(ui: &mut egui::Ui, auto: &mut Registry) {
-    let id = egui::Id::new("credits_view");
+    let id = egui::Id::unique("credits_view");
     let mut v = ui.data_mut(|d| d.get_temp::<View>(id)).unwrap_or_default();
     ui.horizontal_wrapped(|ui| {
         ui.label(tr("Show"));
@@ -254,7 +254,7 @@ pub fn contributors_ui(ui: &mut egui::Ui, auto: &mut Registry) {
         }
         ui.separator();
         ui.label(tr("Sort"));
-        let combo = egui::ComboBox::from_id_salt("credits_sort").selected_text(v.key.label().0).show_ui(ui, |ui| {
+        let combo = craft_ui::ComboBox::from_id_salt("credits_sort").selected_text(v.key.label().0).show_ui(ui, |ui| {
             for k in SortKey::ALL {
                 let r = ui.selectable_label(v.key == k, k.label().0);
                 auto.add(&format!("about.credits.sort.{}", k.id()), r.rect, k.label().0);
diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs
index ae66eaebe..054aa3598 100644
--- a/crates/ui-egui/src/dock.rs
+++ b/crates/ui-egui/src/dock.rs
@@ -1,11 +1,14 @@
-//! Docking: a tree of splits and tab groups. Panels are rounded frames separated by
-//! thin gutters; each group has a tab strip (active tab bright, with a panel menu "≡"); the focused
-//! panel gets a blue outline. Gutters drag to resize; workspaces are serialized trees.
+//! EffectCraft's panels and built-in workspaces in craft-ui's shared docking model
+//! ([`craft_ui::docking`]): splits, tab groups, After Effects' stacked panels and floating
+//! windows. craft-ui owns the layout model, its validation and every transaction; EffectCraft
+//! owns the panel ids, the built-in workspaces and the decorations of its tabs (the comp tabs of
+//! the Timeline, label swatches and viewer locks).
 
 use egui::{Align2, Rect, Sense, Stroke, pos2, vec2};
 use serde::{Deserialize, Serialize};
 
-use craft_ui::layout::{ResizeHandle, ResizeHandleStyle, SplitAxis, SplitSize as SharedSplitSize, split_rect};
+pub use craft_ui::docking::{Floating, Node, PanelState, Permissions, StackEntry};
+pub use craft_ui::layout::{SplitAxis, SplitSize};
 
 use crate::icons::{self, Icon};
 use crate::theme::Tokens;
@@ -161,117 +164,39 @@ impl PanelKind {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub enum SplitSize {
-    Ratio(f32),
-    /// First child has a fixed size in points.
-    FixedA(f32),
-    /// Second child has a fixed size in points.
-    FixedB(f32),
+/// The docked tree plus floating windows.
+pub type Layout = craft_ui::docking::Layout<PanelKind>;
+/// What a workspace saves: the layout, closed panels with where each goes back, and the lock.
+pub type Workspace = craft_ui::docking::Workspace<PanelKind>;
+
+/// What may happen to a panel. Every panel moves, floats and closes, as in After Effects
+/// (the Composition panel too: Window ▸ Composition reopens it); the last docked group staying
+/// docked is checked per transaction ([`crate::dock_ui`]).
+pub fn permissions(_panel: &PanelKind) -> Permissions {
+    Permissions::default()
 }
 
-impl SplitSize {
-    fn shared(self) -> SharedSplitSize {
-        match self {
-            Self::Ratio(value) => SharedSplitSize::Ratio(value),
-            Self::FixedA(value) => SharedSplitSize::FixedFirst(value),
-            Self::FixedB(value) => SharedSplitSize::FixedSecond(value),
-        }
-    }
+/// A tab group.
+pub fn tabs(p: &[PanelKind], active: usize) -> Node<PanelKind> {
+    Node::Tabs { panels: p.to_vec(), active }
+}
+/// Stacked panels: (panel, open, height). Open entries share the stack's height in proportion to
+/// their heights; an entry without one counts as craft-ui's `DockStyle::min_pane` (40).
+pub fn stack(e: &[(PanelKind, bool, Option<f32>)]) -> Node<PanelKind> {
+    Node::Stack { entries: e.iter().map(|&(panel, open, height)| StackEntry { panel, open, height }).collect() }
+}
+/// Two frames side by side.
+pub fn hsplit(size: SplitSize, a: Node<PanelKind>, b: Node<PanelKind>) -> Node<PanelKind> {
+    Node::Split { axis: SplitAxis::Horizontal, size, first: Box::new(a), second: Box::new(b) }
+}
+/// Two frames one above the other.
+pub fn vsplit(size: SplitSize, a: Node<PanelKind>, b: Node<PanelKind>) -> Node<PanelKind> {
+    Node::Split { axis: SplitAxis::Vertical, size, first: Box::new(a), second: Box::new(b) }
 }
 
-/// One frame in a [`DockNode::Stack`]: a header with one tab per panel (a panel dropped onto a
-/// stacked panel joins its frame as a tab, as in After Effects).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(from = "StackEntryRepr")]
-pub struct StackEntry {
-    pub panels: Vec<PanelKind>,
-    /// The shown tab.
-    pub active: usize,
-    pub open: bool,
-    /// Content height when open (set by dragging the gaps); `None` = share the remaining height.
-    pub height: Option<f32>,
-}
-
-/// A saved [`StackEntry`]: workspaces saved before stacked frames held tabs name one `panel`.
-#[derive(Deserialize)]
-struct StackEntryRepr {
-    #[serde(default)]
-    panel: Option<PanelKind>,
-    #[serde(default)]
-    panels: Vec<PanelKind>,
-    #[serde(default)]
-    active: usize,
-    open: bool,
-    #[serde(default)]
-    height: Option<f32>,
-}
-
-impl From<StackEntryRepr> for StackEntry {
-    fn from(r: StackEntryRepr) -> StackEntry {
-        let mut panels = r.panels;
-        if let Some(p) = r.panel
-            && !panels.contains(&p)
-        {
-            panels.insert(0, p);
-        }
-        let active = r.active.min(panels.len().saturating_sub(1));
-        StackEntry { panels, active, open: r.open, height: r.height }
-    }
-}
-
-impl StackEntry {
-    /// A frame showing just `panel`.
-    pub fn new(panel: PanelKind, open: bool, height: Option<f32>) -> StackEntry {
-        StackEntry { panels: vec![panel], active: 0, open, height }
-    }
-    pub fn contains(&self, p: PanelKind) -> bool {
-        self.panels.contains(&p)
-    }
-    /// The frame's shown panel.
-    pub fn shown(&self) -> Option<PanelKind> {
-        self.panels.get(self.active).or(self.panels.first()).copied()
-    }
-    /// Show `p` (one of its tabs).
-    fn show(&mut self, p: PanelKind) {
-        if let Some(i) = self.panels.iter().position(|x| *x == p) {
-            self.active = i;
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum DockNode {
-    /// `vertical`: children stacked top/bottom; else side by side.
-    Split {
-        vertical: bool,
-        size: SplitSize,
-        a: Box<DockNode>,
-        b: Box<DockNode>,
-    },
-    Tabs {
-        panels: Vec<PanelKind>,
-        active: usize,
-    },
-    /// After Effects' stacked panels (e.g. the Default workspace's right column): each panel has
-    /// a header row; clicking it expands or collapses the panel in place, and dragging the gap
-    /// between two open panels resizes them.
-    Stack {
-        entries: Vec<StackEntry>,
-    },
-}
-
-fn tabs(p: &[PanelKind], active: usize) -> DockNode {
-    DockNode::Tabs { panels: p.to_vec(), active }
-}
-fn stack(e: &[(PanelKind, bool, Option<f32>)]) -> DockNode {
-    DockNode::Stack { entries: e.iter().map(|&(panel, open, height)| StackEntry::new(panel, open, height)).collect() }
-}
-fn hsplit(size: SplitSize, a: DockNode, b: DockNode) -> DockNode {
-    DockNode::Split { vertical: false, size, a: Box::new(a), b: Box::new(b) }
-}
-fn vsplit(size: SplitSize, a: DockNode, b: DockNode) -> DockNode {
-    DockNode::Split { vertical: true, size, a: Box::new(a), b: Box::new(b) }
+/// A workspace of just `root`, with no floating windows.
+pub fn docked(root: Node<PanelKind>) -> Workspace {
+    Workspace::new(Layout { root: Some(root), floating: Vec::new() })
 }
 
 /// The built-in workspaces: After Effects 2026's (Window ▸ Workspace), less Libraries (an Adobe
@@ -296,24 +221,36 @@ pub const WORKSPACES: &[&str] = &[
     "Undocked Panels",
 ];
 
-/// The floating panels a workspace starts with (Undocked Panels), in points for a window of
-/// about 1680×1020 (they are kept inside the window when drawn).
-pub fn workspace_floating(name: &str) -> Vec<Floating> {
+/// The floating windows a workspace starts with (Undocked Panels), in points for a window of
+/// about 1680×1020 (craft-ui keeps them inside the window when drawn). Each window has a fixed
+/// id, so a built-in layout built again is the same set of windows.
+fn workspace_floating(name: &str) -> Vec<Floating<PanelKind>> {
     use PanelKind::*;
-    let f = |panels: &[PanelKind], rect: [f32; 4]| Floating { panels: panels.to_vec(), active: 0, rect };
+    let f = |id: u64, panels: &[PanelKind], rect: [f32; 4]| Floating::single(panels.to_vec(), 0, rect).with_id(id);
     match name {
         "Undocked Panels" => vec![
-            f(&[Project, EffectControls], [24.0, 110.0, 320.0, 420.0]),
-            f(&[Preview, Info, Audio], [1330.0, 110.0, 320.0, 300.0]),
-            f(&[EffectsPresets, Properties, Character, Paragraph], [1330.0, 430.0, 320.0, 360.0]),
-            f(&[Timeline, RenderQueue], [24.0, 640.0, 1280.0, 340.0]),
+            f(1, &[Project, EffectControls], [24.0, 110.0, 320.0, 420.0]),
+            f(2, &[Preview, Info, Audio], [1330.0, 110.0, 320.0, 300.0]),
+            f(3, &[EffectsPresets, Properties, Character, Paragraph], [1330.0, 430.0, 320.0, 360.0]),
+            f(4, &[Timeline, RenderQueue], [24.0, 640.0, 1280.0, 340.0]),
         ],
         _ => vec![],
     }
 }
 
-/// The default layout of a named workspace.
-pub fn workspace(name: &str) -> DockNode {
+/// The height of a frame's tab strip ([`Tokens::tab_h`]).
+pub const TAB_STRIP: f32 = 30.0;
+/// The height of Default's Preview frame: its tab strip over a 46-point body that fits the
+/// playback controls.
+pub const PREVIEW_FRAME: f32 = TAB_STRIP + 46.0;
+
+/// The built-in layout of a named workspace (an unknown name gets Default's).
+pub fn workspace(name: &str) -> Layout {
+    Layout { root: Some(workspace_root(name)), floating: workspace_floating(name) }
+}
+
+/// The docked tree of a named workspace.
+fn workspace_root(name: &str) -> Node<PanelKind> {
     use PanelKind::*;
     use SplitSize::*;
     let right = |p: &[PanelKind], q: &[PanelKind]| vsplit(Ratio(0.45), tabs(p, 0), tabs(q, 0));
@@ -321,45 +258,45 @@ pub fn workspace(name: &str) -> DockNode {
         "Animation" => vsplit(
             Ratio(0.55),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls], 1),
-                hsplit(FixedB(300.0), tabs(&[Composition, Layer], 0), right(&[Info, Preview, Audio], &[EffectsPresets, Smoother, Wiggler, MotionSketch])),
+                hsplit(FixedSecond(300.0), tabs(&[Composition, Layer], 0), right(&[Info, Preview, Audio], &[EffectsPresets, Smoother, Wiggler, MotionSketch])),
             ),
             tabs(&[Timeline, RenderQueue], 0),
         ),
         "Effects" => vsplit(
             Ratio(0.58),
             hsplit(
-                FixedA(340.0),
+                FixedFirst(340.0),
                 tabs(&[EffectControls, Project], 0),
-                hsplit(FixedB(300.0), tabs(&[Composition, Layer], 0), right(&[Info, Preview], &[EffectsPresets])),
+                hsplit(FixedSecond(300.0), tabs(&[Composition, Layer], 0), right(&[Info, Preview], &[EffectsPresets])),
             ),
             tabs(&[Timeline, RenderQueue], 0),
         ),
         "Motion Tracking" => vsplit(
             Ratio(0.6),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls], 0),
-                hsplit(FixedB(300.0), tabs(&[Layer, Composition], 0), right(&[Info, Preview], &[Tracker])),
+                hsplit(FixedSecond(300.0), tabs(&[Layer, Composition], 0), right(&[Info, Preview], &[Tracker])),
             ),
             tabs(&[Timeline], 0),
         ),
         "Paint" => vsplit(
             Ratio(0.6),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls], 0),
-                hsplit(FixedB(300.0), tabs(&[Layer, Composition], 0), right(&[Paint, Info], &[Brushes, Preview])),
+                hsplit(FixedSecond(300.0), tabs(&[Layer, Composition], 0), right(&[Paint, Info], &[Brushes, Preview])),
             ),
             tabs(&[Timeline], 0),
         ),
         "Text" => vsplit(
             Ratio(0.58),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls], 0),
-                hsplit(FixedB(300.0), tabs(&[Composition], 0), right(&[Character, Paragraph], &[Align, Preview, EffectsPresets])),
+                hsplit(FixedSecond(300.0), tabs(&[Composition], 0), right(&[Character, Paragraph], &[Align, Preview, EffectsPresets])),
             ),
             tabs(&[Timeline], 0),
         ),
@@ -367,31 +304,35 @@ pub fn workspace(name: &str) -> DockNode {
         // Review: a large viewer with the markers and the project beside it.
         "Review" => vsplit(
             Ratio(0.66),
-            hsplit(FixedA(280.0), tabs(&[Project, Markers], 0), hsplit(FixedB(260.0), tabs(&[Composition, Layer], 0), right(&[Preview, Info], &[Audio]))),
+            hsplit(
+                FixedFirst(280.0),
+                tabs(&[Project, Markers], 0),
+                hsplit(FixedSecond(260.0), tabs(&[Composition, Layer], 0), right(&[Preview, Info], &[Audio])),
+            ),
             tabs(&[Timeline, RenderQueue], 0),
         ),
         // Essential Graphics: the Properties panel (After Effects' successor to the Essential
         // Graphics panel) full height on the right, type panels beside the viewer.
         "Essential Graphics" => hsplit(
-            FixedB(320.0),
+            FixedSecond(320.0),
             vsplit(
                 Ratio(0.58),
                 hsplit(
-                    FixedA(280.0),
+                    FixedFirst(280.0),
                     tabs(&[Project, EffectControls], 0),
-                    hsplit(FixedB(260.0), tabs(&[Composition, Layer], 0), right(&[Character, Paragraph], &[Align, Preview])),
+                    hsplit(FixedSecond(260.0), tabs(&[Composition, Layer], 0), right(&[Character, Paragraph], &[Align, Preview])),
                 ),
                 tabs(&[Timeline], 0),
             ),
-            stack(&[(Properties, true, None), (EffectsPresets, false, None)]),
+            tabs(&[Properties, EffectsPresets], 0),
         ),
         // Color: wide Effect Controls for grading effects, Info for colour readouts.
         "Color" => vsplit(
             Ratio(0.6),
             hsplit(
-                FixedA(360.0),
+                FixedFirst(360.0),
                 tabs(&[EffectControls, Project], 0),
-                hsplit(FixedB(340.0), tabs(&[Composition, Layer], 0), right(&[LumetriScopes, Info, Preview], &[EffectsPresets])),
+                hsplit(FixedSecond(340.0), tabs(&[Composition, Layer], 0), right(&[LumetriScopes, Info, Preview], &[EffectsPresets])),
             ),
             tabs(&[Timeline], 0),
         ),
@@ -401,19 +342,19 @@ pub fn workspace(name: &str) -> DockNode {
         "Small Screen" => vsplit(
             Ratio(0.55),
             hsplit(
-                FixedA(240.0),
+                FixedFirst(240.0),
                 tabs(&[Project, EffectControls], 0),
-                hsplit(FixedB(240.0), tabs(&[Composition], 0), tabs(&[Info, Preview, EffectsPresets], 1)),
+                hsplit(FixedSecond(240.0), tabs(&[Composition], 0), tabs(&[Info, Preview, EffectsPresets], 1)),
             ),
             tabs(&[Timeline], 0),
         ),
         "All Panels" => vsplit(
             Ratio(0.55),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls, Flowchart, History, MediaBrowser, Metadata], 0),
                 hsplit(
-                    FixedB(300.0),
+                    FixedSecond(300.0),
                     tabs(&[Composition, Layer, Footage], 0),
                     right(
                         &[Info, Preview, Audio, Align, Character, Paragraph, LumetriScopes],
@@ -439,475 +380,130 @@ pub fn workspace(name: &str) -> DockNode {
         "Standard" => vsplit(
             Ratio(0.56),
             hsplit(
-                FixedA(300.0),
+                FixedFirst(300.0),
                 tabs(&[Project, EffectControls], 0),
-                hsplit(FixedB(290.0), tabs(&[Composition, Layer], 0), right(&[Info, Audio], &[Preview, EffectsPresets])),
+                hsplit(FixedSecond(290.0), tabs(&[Composition, Layer], 0), right(&[Info, Audio], &[Preview, EffectsPresets])),
             ),
             tabs(&[Timeline, RenderQueue], 0),
         ),
         // Default (as in After Effects): Project/Effect Controls | Composition over the Timeline,
-        // and a full-height right column with Preview above the Properties panel.
+        // and a full-height right column: a short Preview frame above the Properties frame.
         _ => hsplit(
-            FixedB(300.0),
-            vsplit(Ratio(0.56), hsplit(FixedA(300.0), tabs(&[Project, EffectControls], 0), tabs(&[Composition, Layer], 0)), tabs(&[Timeline, RenderQueue], 0)),
-            stack(&[(Preview, true, Some(46.0)), (Properties, true, None), (Align, false, None), (Audio, false, None), (EffectsPresets, false, None)]),
+            FixedSecond(300.0),
+            vsplit(
+                Ratio(0.56),
+                hsplit(FixedFirst(300.0), tabs(&[Project, EffectControls], 0), tabs(&[Composition, Layer], 0)),
+                tabs(&[Timeline, RenderQueue], 0),
+            ),
+            vsplit(FixedFirst(PREVIEW_FRAME), tabs(&[Preview], 0), tabs(&[Properties, Align, Audio, EffectsPresets], 0)),
         ),
     }
 }
 
-impl DockNode {
-    /// Every panel in the tree.
-    pub fn panels(&self, out: &mut Vec<PanelKind>) {
-        match self {
-            DockNode::Split { a, b, .. } => {
-                a.panels(out);
-                b.panels(out);
-            }
-            DockNode::Tabs { panels, .. } => out.extend(panels.iter().copied()),
-            DockNode::Stack { entries } => out.extend(entries.iter().flat_map(|e| e.panels.iter().copied())),
-        }
-    }
-    pub fn contains(&self, p: PanelKind) -> bool {
-        let mut v = Vec::new();
-        self.panels(&mut v);
-        v.contains(&p)
-    }
-    /// The tabs of the group `p` is in, in order.
-    pub fn group_of(&self, p: PanelKind) -> Option<&[PanelKind]> {
-        match self {
-            DockNode::Split { a, b, .. } => a.group_of(p).or_else(|| b.group_of(p)),
-            DockNode::Tabs { panels, .. } => panels.contains(&p).then_some(panels.as_slice()),
-            DockNode::Stack { entries } => entries.iter().find(|e| e.contains(p)).map(|e| e.panels.as_slice()),
-        }
-    }
-    /// Make `p` the active tab of its group. Returns false if not present.
-    pub fn activate(&mut self, p: PanelKind) -> bool {
-        if !crate::dock_shared::valid_tree(self) {
-            return false;
-        }
-        match self {
-            DockNode::Split { a, b, .. } => a.activate(p) || b.activate(p),
-            DockNode::Tabs { panels, active } => {
-                if let Some(i) = panels.iter().position(|x| *x == p) {
-                    *active = i;
-                    true
-                } else {
-                    false
-                }
-            }
-            DockNode::Stack { entries } => match entries.iter_mut().find(|e| e.contains(p)) {
-                Some(e) => {
-                    e.show(p);
-                    e.open = true;
-                    true
-                }
-                None => false,
-            },
-        }
-    }
-    /// Expand or collapse a stacked panel's frame (showing `p`). Returns false if `p` is not in
-    /// a stack.
-    pub fn toggle_stacked(&mut self, p: PanelKind) -> bool {
-        if !crate::dock_shared::valid_tree(self) {
-            return false;
-        }
-        match self {
-            DockNode::Split { a, b, .. } => a.toggle_stacked(p) || b.toggle_stacked(p),
-            DockNode::Tabs { .. } => false,
-            DockNode::Stack { entries } => match entries.iter_mut().find(|e| e.contains(p)) {
-                Some(e) => {
-                    e.show(p);
-                    e.open = !e.open;
-                    true
-                }
-                None => false,
-            },
-        }
-    }
+/// Queries on a workspace that EffectCraft's menus, commands and panels ask.
+pub trait WorkspaceExt {
+    /// `p` is in the docked tree.
+    fn is_docked(&self, p: PanelKind) -> bool;
+    /// `p` is in a floating window.
+    fn is_floating(&self, p: PanelKind) -> bool;
+    /// `p` is open, docked or floating.
+    fn is_open(&self, p: PanelKind) -> bool;
+    /// `p` shows: the front tab of its group, an open stacked panel, not in a minimized window.
+    fn is_visible(&self, p: PanelKind) -> bool;
+    /// The panels of the tab group holding `p` (a stacked panel is a group of its own).
+    fn group_of(&self, p: PanelKind) -> Vec<PanelKind>;
+    /// Every open panel, docked first.
+    fn panels(&self) -> Vec<PanelKind>;
+}
 
-    pub fn is_visible(&self, p: PanelKind) -> bool {
-        match self {
-            DockNode::Split { a, b, .. } => a.is_visible(p) || b.is_visible(p),
-            DockNode::Tabs { panels, active } => panels.get(*active) == Some(&p),
-            DockNode::Stack { entries } => entries.iter().any(|e| e.open && e.shown() == Some(p)),
+pub(crate) fn node_panels(node: &Node<PanelKind>, out: &mut Vec<PanelKind>) {
+    match node {
+        Node::Split { first, second, .. } => {
+            node_panels(first, out);
+            node_panels(second, out);
         }
-    }
-    /// Close a panel (remove its tab; empty groups collapse their split).
-    pub fn close(&mut self, p: PanelKind) {
-        if !crate::dock_shared::valid_for_close(self) {
-            return;
-        }
-        if let DockNode::Split { a, b, .. } = self {
-            a.close(p);
-            b.close(p);
-            let empty = |n: &DockNode| match n {
-                DockNode::Tabs { panels, .. } => panels.is_empty(),
-                DockNode::Stack { entries } => entries.is_empty(),
-                DockNode::Split { .. } => false,
-            };
-            if empty(a) {
-                *self = (**b).clone();
-            } else if empty(b) {
-                *self = (**a).clone();
-            }
-        } else if let DockNode::Tabs { panels, active } = self {
-            let shown = panels.get(*active).copied();
-            panels.retain(|x| *x != p);
-            *active = shown.and_then(|shown| panels.iter().position(|x| *x == shown)).unwrap_or((*active).min(panels.len().saturating_sub(1)));
-        } else if let DockNode::Stack { entries } = self {
-            for e in entries.iter_mut() {
-                let shown = e.shown();
-                e.panels.retain(|x| *x != p);
-                e.active = shown.and_then(|shown| e.panels.iter().position(|x| *x == shown)).unwrap_or(e.active.min(e.panels.len().saturating_sub(1)));
-            }
-            entries.retain(|e| !e.panels.is_empty());
-        }
-    }
-    /// Add a panel as a tab next to `near` (or into the first group).
-    pub fn open_near(&mut self, p: PanelKind, near: PanelKind) {
-        if !crate::dock_shared::valid_tree(self) {
-            return;
-        }
-        if self.contains(p) {
-            self.activate(p);
-            return;
-        }
-        fn add(n: &mut DockNode, p: PanelKind, near: PanelKind) -> bool {
-            match n {
-                DockNode::Split { a, b, .. } => add(a, p, near) || add(b, p, near),
-                DockNode::Tabs { panels, active } => {
-                    if panels.contains(&near) {
-                        panels.push(p);
-                        *active = panels.len() - 1;
-                        true
-                    } else {
-                        false
-                    }
-                }
-                DockNode::Stack { entries } => match entries.iter().position(|e| e.contains(near)) {
-                    Some(i) => {
-                        entries.insert(i + 1, StackEntry::new(p, true, None));
-                        true
-                    }
-                    None => false,
-                },
+        Node::Tabs { panels, .. } => out.extend(panels.iter().copied()),
+        Node::Stack { entries } => out.extend(entries.iter().map(|e| e.panel)),
+        Node::Dock { columns, .. } => {
+            for group in columns.iter().flat_map(|c| c.groups.iter()) {
+                out.extend(group.panels.iter().copied());
             }
         }
-        fn add_first(n: &mut DockNode, p: PanelKind) -> bool {
-            match n {
-                DockNode::Split { a, b, .. } => add_first(a, p) || add_first(b, p),
-                DockNode::Tabs { panels, active } if !panels.is_empty() => {
-                    panels.push(p);
-                    *active = panels.len() - 1;
-                    true
-                }
-                DockNode::Stack { entries } if !entries.is_empty() => {
-                    entries.push(StackEntry::new(p, true, None));
-                    true
-                }
-                _ => false,
-            }
-        }
-        if self.panel_count() == 0 {
-            // Every panel was closed: there is no anchor, so the panel becomes the whole dock.
-            *self = tabs(&[p], 0);
-        } else if !add(self, p, near) && !add(self, p, PanelKind::EffectsPresets) && !add(self, p, PanelKind::Project) {
-            // None of the anchors is docked (e.g. Minimal with Timeline closed): use the first group.
-            add_first(self, p);
-        }
+        _ => {}
     }
 }
 
-/// Where a dragged panel tab lands on a group: as a tab (center) or split off to one side.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum Zone {
-    Center,
-    Left,
-    Right,
-    Top,
-    Bottom,
+fn node_group(node: &Node<PanelKind>, p: PanelKind) -> Option<Vec<PanelKind>> {
+    match node {
+        Node::Split { first, second, .. } => node_group(first, p).or_else(|| node_group(second, p)),
+        Node::Tabs { panels, .. } => panels.contains(&p).then(|| panels.clone()),
+        Node::Stack { entries } => entries.iter().any(|e| e.panel == p).then(|| vec![p]),
+        Node::Dock { columns, .. } => columns.iter().flat_map(|c| c.groups.iter()).find(|g| g.panels.contains(&p)).map(|g| g.panels.clone()),
+        _ => None,
+    }
 }
 
-impl Zone {
-    pub(crate) fn shared(self) -> craft_ui::docking::Zone {
-        match self {
-            Self::Center => craft_ui::docking::Zone::Center,
-            Self::Left => craft_ui::docking::Zone::Left,
-            Self::Right => craft_ui::docking::Zone::Right,
-            Self::Top => craft_ui::docking::Zone::Top,
-            Self::Bottom => craft_ui::docking::Zone::Bottom,
+impl WorkspaceExt for Workspace {
+    fn is_docked(&self, p: PanelKind) -> bool {
+        self.layout.root.as_ref().is_some_and(|root| node_group(root, p).is_some())
+    }
+    fn is_floating(&self, p: PanelKind) -> bool {
+        self.layout.floating.iter().any(|w| w.contains(&p))
+    }
+    fn is_open(&self, p: PanelKind) -> bool {
+        self.layout.contains(&p)
+    }
+    fn is_visible(&self, p: PanelKind) -> bool {
+        self.layout.panel_state(&p) == PanelState::Front
+    }
+    fn group_of(&self, p: PanelKind) -> Vec<PanelKind> {
+        self.layout.root.iter().chain(self.layout.floating.iter().map(|w| &w.root)).find_map(|node| node_group(node, p)).unwrap_or_default()
+    }
+    fn panels(&self) -> Vec<PanelKind> {
+        let mut out = Vec::new();
+        for node in self.layout.root.iter().chain(self.layout.floating.iter().map(|w| &w.root)) {
+            node_panels(node, &mut out);
+        }
+        out
+    }
+}
+
+/// Every panel a workspace names: open, or closed with a recorded place.
+pub fn referenced_panels(workspace: &Workspace) -> Vec<PanelKind> {
+    let mut out = workspace.panels();
+    out.extend(workspace.hidden.iter().map(|(p, _)| *p));
+    if let Some(saved) = &workspace.saved {
+        for node in saved.root.iter().chain(saved.floating.iter().map(|w| &w.root)) {
+            node_panels(node, &mut out);
         }
     }
-
-    pub fn from_name(s: &str) -> Option<Zone> {
-        Some(match s.to_ascii_lowercase().as_str() {
-            "center" | "tab" => Zone::Center,
-            "left" => Zone::Left,
-            "right" => Zone::Right,
-            "top" => Zone::Top,
-            "bottom" => Zone::Bottom,
-            _ => return None,
-        })
-    }
+    out
 }
 
-/// The drop zone for a pointer at `pos` over a group `rect` (with a `tab_h` tab strip): the tab
-/// strip and the middle of the group are Center; within a quarter of the size from an edge,
-/// the nearest edge.
-pub fn drop_zone(rect: Rect, tab_h: f32, pos: egui::Pos2) -> Zone {
-    match craft_ui::docking::drop_zone(rect, tab_h, pos) {
-        Some(craft_ui::docking::Zone::Left) => Zone::Left,
-        Some(craft_ui::docking::Zone::Right) => Zone::Right,
-        Some(craft_ui::docking::Zone::Top) => Zone::Top,
-        Some(craft_ui::docking::Zone::Bottom) => Zone::Bottom,
-        _ => Zone::Center,
-    }
-}
-
-/// The shared preview region, or an empty rectangle for invalid geometry.
-pub fn zone_rect(rect: Rect, zone: Zone) -> Rect {
-    craft_ui::docking::zone_rect(rect, zone.shared()).unwrap_or(Rect::NOTHING)
-}
-
-/// A panel group floating over the dock (undocked).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Floating {
-    pub panels: Vec<PanelKind>,
-    pub active: usize,
-    /// [x, y, w, h] in points.
-    pub rect: [f32; 4],
-}
-
-/// A floating group moved out of the main window into its own native window (which can sit on
-/// another monitor): the group holding `panel` shows there.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub struct PanelWindow {
-    pub panel: PanelKind,
-    /// The window's [x, y] outer position and [w, h] inner size, in desktop points.
-    pub rect: [f32; 4],
-}
-
-/// The smallest and largest native panel window, in points.
-pub const PANEL_WINDOW_MIN: [f32; 2] = [160.0, 100.0];
-pub const PANEL_WINDOW_MAX: f32 = 16_384.0;
-/// The farthest a native panel window may sit from the desktop origin, in points.
-pub const PANEL_WINDOW_MAX_POS: f32 = 100_000.0;
-
-impl PanelWindow {
-    /// The rect made safe to hand to the windowing system: finite, with a size within
-    /// [`PANEL_WINDOW_MIN`]..=[`PANEL_WINDOW_MAX`] and a position within
-    /// ±[`PANEL_WINDOW_MAX_POS`] (hostile workspace files and bad monitor reports included).
-    pub fn sanitized(rect: [f32; 4]) -> [f32; 4] {
-        let finite = |v: f32, fallback: f32| if v.is_finite() { v } else { fallback };
-        let [x, y, w, h] = rect;
-        [
-            finite(x, 0.0).clamp(-PANEL_WINDOW_MAX_POS, PANEL_WINDOW_MAX_POS),
-            finite(y, 0.0).clamp(-PANEL_WINDOW_MAX_POS, PANEL_WINDOW_MAX_POS),
-            finite(w, 420.0).clamp(PANEL_WINDOW_MIN[0], PANEL_WINDOW_MAX),
-            finite(h, 320.0).clamp(PANEL_WINDOW_MIN[1], PANEL_WINDOW_MAX),
-        ]
-    }
-}
-
-impl DockNode {
-    /// Insert panel `p` relative to the group that holds `anchor`: as a tab next to it
-    /// (Center) or in a new group split off to one side. In a stack, the group is `anchor`'s
-    /// frame: Center adds a tab to that frame and Top / Bottom add a frame above or below it
-    /// (#302); Left / Right split the column. `p` is removed from its old place first. Returns
-    /// false (tree unchanged) if `anchor` isn't docked or is `p` itself alone.
-    pub fn dock_panel(&mut self, p: PanelKind, anchor: PanelKind, zone: Zone) -> bool {
-        if !crate::dock_shared::valid_tree(self) || p == anchor || !self.contains(anchor) {
-            return false;
+/// The automation id of the gap below stacked panel `p`: `dock.gutter.<path>s<i>`, with the
+/// stack's split path (`a`/`b` per level) and the entry's index.
+pub fn stack_gutter_id(layout: &Layout, p: PanelKind) -> Option<String> {
+    fn rec(node: &Node<PanelKind>, p: PanelKind, path: &mut String, depth: usize) -> Option<String> {
+        if depth > craft_ui::docking::MAX_DEPTH {
+            return None;
         }
-        let before = self.clone();
-        self.close(p);
-        fn rec(n: &mut DockNode, p: PanelKind, anchor: PanelKind, zone: Zone) -> bool {
-            let here = match n {
-                DockNode::Split { a, b, .. } => return rec(a, p, anchor, zone) || rec(b, p, anchor, zone),
-                DockNode::Tabs { panels, .. } => panels.contains(&anchor),
-                DockNode::Stack { entries } => entries.iter().any(|e| e.contains(anchor)),
-            };
-            if !here {
-                return false;
+        match node {
+            Node::Split { first, second, .. } => {
+                path.push('a');
+                if let Some(id) = rec(first, p, path, depth + 1) {
+                    return Some(id);
+                }
+                path.pop();
+                path.push('b');
+                let found = rec(second, p, path, depth + 1);
+                path.pop();
+                found
             }
-            match (zone, &mut *n) {
-                (Zone::Center, DockNode::Tabs { panels, active }) => {
-                    let i = panels.iter().position(|x| *x == anchor).map_or(panels.len(), |i| i + 1);
-                    panels.insert(i, p);
-                    *active = i;
-                }
-                (Zone::Center, DockNode::Stack { entries }) => {
-                    let Some(e) = entries.iter_mut().find(|e| e.contains(anchor)) else { return false };
-                    let i = e.panels.iter().position(|x| *x == anchor).map_or(e.panels.len(), |i| i + 1);
-                    e.panels.insert(i, p);
-                    e.active = i;
-                    e.open = true;
-                }
-                (Zone::Top | Zone::Bottom, DockNode::Stack { entries }) => {
-                    let Some(i) = entries.iter().position(|e| e.contains(anchor)) else { return false };
-                    let at = if zone == Zone::Top { i } else { i + 1 };
-                    entries.insert(at, StackEntry::new(p, true, None));
-                }
-                (z, node) => {
-                    let new = tabs(&[p], 0);
-                    let old = std::mem::replace(node, tabs(&[], 0));
-                    let vertical = matches!(z, Zone::Top | Zone::Bottom);
-                    let (a, b) = if matches!(z, Zone::Left | Zone::Top) { (new, old) } else { (old, new) };
-                    *node = DockNode::Split { vertical, size: SplitSize::Ratio(0.5), a: Box::new(a), b: Box::new(b) };
-                }
-            }
-            true
-        }
-        if rec(self, p, anchor, zone) {
-            true
-        } else {
-            *self = before;
-            false
-        }
-    }
-
-    /// Move panel `p` into the group that holds `anchor` as a tab before `before` (one of that
-    /// group's panels) or last, and show it. False (tree unchanged) if `anchor` isn't docked.
-    pub fn insert_tab(&mut self, p: PanelKind, anchor: PanelKind, before: Option<PanelKind>) -> bool {
-        if !crate::dock_shared::valid_tree(self) {
-            return false;
-        }
-        if p == anchor || !self.contains(anchor) {
-            return false;
-        }
-        let saved = self.clone();
-        self.close(p);
-        fn rec(n: &mut DockNode, p: PanelKind, anchor: PanelKind, before: Option<PanelKind>) -> bool {
-            match n {
-                DockNode::Split { a, b, .. } => rec(a, p, anchor, before) || rec(b, p, anchor, before),
-                DockNode::Tabs { panels, active } if panels.contains(&anchor) => {
-                    let i = before.and_then(|b| panels.iter().position(|x| *x == b)).unwrap_or(panels.len());
-                    panels.insert(i, p);
-                    *active = i;
-                    true
-                }
-                DockNode::Stack { entries } => {
-                    // A tab of the anchor's frame.
-                    let Some(e) = entries.iter_mut().find(|e| e.contains(anchor)) else { return false };
-                    let i = before.and_then(|b| e.panels.iter().position(|x| *x == b)).unwrap_or(e.panels.len());
-                    e.panels.insert(i, p);
-                    e.active = i;
-                    e.open = true;
-                    true
-                }
-                _ => false,
-            }
-        }
-        if rec(self, p, anchor, before) {
-            true
-        } else {
-            *self = saved;
-            false
-        }
-    }
-
-    /// Path of the group containing `p` (as in [`Group::path`]; stacks add `sN`).
-    pub fn path_of(&self, p: PanelKind) -> Option<String> {
-        fn rec(n: &DockNode, p: PanelKind, path: &str) -> Option<String> {
-            match n {
-                DockNode::Split { a, b, .. } => rec(a, p, &format!("{path}a")).or_else(|| rec(b, p, &format!("{path}b"))),
-                DockNode::Tabs { panels, .. } => panels.contains(&p).then(|| path.to_string()),
-                DockNode::Stack { entries } => entries.iter().position(|e| e.contains(p)).map(|i| format!("{path}s{i}")),
-            }
-        }
-        rec(self, p, "")
-    }
-
-    /// Number of panels in the tree.
-    pub fn panel_count(&self) -> usize {
-        let mut v = vec![];
-        self.panels(&mut v);
-        v.len()
-    }
-}
-
-/// A full layout: the docked tree plus floating panels (what a workspace saves).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Layout {
-    pub root: DockNode,
-    #[serde(default)]
-    pub floating: Vec<Floating>,
-}
-
-impl Layout {
-    /// Apply a shared transaction without replacing the persisted app schema.
-    pub fn apply(&mut self, action: craft_ui::docking::Action<PanelKind>) -> Result<(), String> {
-        crate::dock_shared::encode(&self.root, &self.floating)?.validate().map_err(|error| error.to_string())?;
-        let moving_to_float = match &action {
-            craft_ui::docking::Action::Float { panel, .. } => Some(*panel),
-            craft_ui::docking::Action::Move { panel, anchor, .. } if self.floating.iter().any(|group| group.panels.contains(anchor)) => Some(*panel),
+            Node::Stack { entries } => entries.iter().position(|e| e.panel == p).map(|i| format!("dock.gutter.{path}s{i}")),
             _ => None,
-        };
-        if moving_to_float.is_some_and(|panel| self.root.contains(panel) && self.root.panel_count() <= 1) {
-            return Err("the last docked panel must remain in the workspace".into());
         }
-        crate::dock_shared::apply(self, action)
     }
-
-    /// Undock an existing panel; the final docked panel stays in the workspace.
-    pub fn float(&mut self, p: PanelKind, rect: [f32; 4]) -> bool {
-        self.apply(craft_ui::docking::Action::Float { panel: p, rect }).is_ok()
-    }
-
-    /// Close an existing floating panel and collapse its empty group.
-    pub fn unfloat(&mut self, p: PanelKind) -> bool {
-        crate::dock_shared::unfloat(self, p)
-    }
-
-    /// Move or reorder a docked/floating tab through the shared transaction.
-    pub fn insert_tab(&mut self, p: PanelKind, anchor: PanelKind, before: Option<PanelKind>) -> bool {
-        if !crate::dock_shared::valid_tree(&self.root) {
-            return false;
-        }
-        self.apply(craft_ui::docking::Action::Move { panel: p, anchor, placement: craft_ui::docking::Placement::Tab { before } }).is_ok()
-    }
-
-    /// Dock a panel beside an anchor; floating destinations accept tabs only.
-    pub fn dock(&mut self, p: PanelKind, anchor: PanelKind, zone: Zone) -> bool {
-        if !crate::dock_shared::valid_tree(&self.root) {
-            return false;
-        }
-        self.apply(craft_ui::docking::Action::Move { panel: p, anchor, placement: craft_ui::docking::Placement::Split(zone.shared()) }).is_ok()
-    }
-
-    pub fn contains(&self, p: PanelKind) -> bool {
-        self.root.contains(p) || self.floating.iter().any(|group| group.panels.contains(&p))
-    }
-}
-
-/// One laid-out tab group.
-pub struct Group {
-    pub path: String,
-    pub rect: Rect,
-    pub content: Rect,
-    pub panels: Vec<PanelKind>,
-    pub active: usize,
-    /// In a [`DockNode::Stack`]: whether the panel is expanded.
-    pub stacked: Option<bool>,
-}
-
-/// Actions produced by interacting with the dock chrome.
-#[derive(Debug, Clone, PartialEq)]
-pub enum DockAction {
-    Activate(PanelKind),
-    /// Expand/collapse a stacked panel.
-    ToggleStacked(PanelKind),
-    Focus(PanelKind),
-    Close(PanelKind),
-    PanelMenu(PanelKind, egui::Pos2),
-    /// A tab started being dragged (re-dock or undock).
-    BeginDrag(PanelKind),
-    /// The tab's lock was toggled (Composition / Timeline viewer lock).
-    ToggleLock(PanelKind),
-    /// A document tab of a panel was clicked (the Timeline's tab of comp `id`).
-    ActivateDoc(PanelKind, u64),
-    /// A document tab's close button (or middle click): close that document (comp `id`).
-    CloseDoc(PanelKind, u64),
+    rec(layout.root.as_ref()?, p, &mut String::new(), 0)
 }
 
 /// One document a panel shows as a tab of its own (the Timeline: one tab per open comp, as in
@@ -916,447 +512,165 @@ pub enum DockAction {
 pub struct DocTab {
     pub id: u64,
     pub title: String,
-    pub deco: Option<TabDeco>,
+    /// The comp's label colour.
+    pub swatch: egui::Color32,
     /// The document the panel shows now.
     pub active: bool,
 }
 
-/// What a group's tabs show: labels, the comp swatch / close / lock decorations and the panels
-/// that show one tab per document.
-pub struct TabInfo<'a> {
-    pub title: &'a dyn Fn(PanelKind) -> String,
-    pub decos: &'a [(PanelKind, TabDeco)],
-    pub docs: &'a [(PanelKind, Vec<DocTab>)],
+/// What the Timeline's comp tabs did this frame.
+#[derive(Debug, Clone, PartialEq)]
+pub enum DocAction {
+    /// Show comp `id`.
+    Activate(u64),
+    /// Close comp `id`'s Timeline (its ×, or a middle click).
+    Close(u64),
 }
 
-/// What drawing a group's chrome produced: actions and where each panel's tabs are (a panel with
-/// document tabs spans all of them; tabs hidden behind the overflow chevron are left out).
-#[derive(Default)]
-pub struct Chrome {
-    pub actions: Vec<DockAction>,
-    pub tabs: Vec<(PanelKind, Rect)>,
+/// Room around a tab's label, as craft-ui gives its dock tabs.
+const TAB_PADDING: f32 = 24.0;
+/// Width of the » button that lists the comp tabs with no room in the strip.
+const DOC_OVERFLOW: f32 = 22.0;
+/// Room for the × after the shown comp's name.
+const DOC_CLOSE: f32 = 16.0;
+
+/// A comp tab's text: the label swatch, then the name, as the panel tabs with a swatch show it.
+fn doc_job(doc: &DocTab, font: &egui::FontId, color: egui::Color32) -> egui::text::LayoutJob {
+    let mut job = egui::text::LayoutJob::default();
+    job.append("\u{25a0} ", 0.0, egui::TextFormat::simple(font.clone(), doc.swatch));
+    job.append(&doc.title, 0.0, egui::TextFormat::simple(font.clone(), color));
+    job
 }
 
-/// After Effects-style extras on a tab that shows a composition (Composition, Timeline): a close
-/// button (×), the item's label colour as a small square and the viewer lock.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct TabDeco {
-    pub swatch: egui::Color32,
-    pub locked: bool,
-    /// Close button and lock (Composition, Timeline); Effect Controls shows just the swatch.
-    pub viewer: bool,
+/// The width of one line of `job` at the fonts' current size.
+fn text_width(ctx: &egui::Context, job: egui::text::LayoutJob) -> f32 {
+    ctx.fonts_mut(|f| f.layout_job(job)).size().x
 }
 
-/// Lay out the tree into group rects (with `gap` gutters) and handle gutter dragging.
-pub fn layout(ui: &mut egui::Ui, node: &mut DockNode, rect: Rect, t: &Tokens, path: &str, out: &mut Vec<Group>, reg: &mut crate::automation::Registry) {
-    let mut actions = Vec::new();
-    layout_with_actions(ui, node, rect, t, path, out, reg, &mut actions);
-    for action in actions {
-        crate::dock_shared::apply_tree(node, action);
-    }
+/// Whether comp tab `doc` carries the ×: the comp the Timeline shows, while it is the group's
+/// shown panel.
+fn has_close(doc: &DocTab, selected: bool) -> bool {
+    selected && doc.active
 }
 
-/// Lay out chrome while returning mutations for the application's UI command route.
-pub fn layout_with_actions(
+/// The width each comp tab asks for in the Timeline group's tab row.
+pub fn doc_widths(ctx: &egui::Context, docs: &[DocTab], selected: bool, font: &egui::FontId) -> Vec<f32> {
+    docs.iter().map(|d| text_width(ctx, doc_job(d, font, egui::Color32::WHITE)) + TAB_PADDING + if has_close(d, selected) { DOC_CLOSE } else { 0.0 }).collect()
+}
+
+/// Draw the Timeline's comp tabs into `strip`, the part of the Timeline group's tab row after its
+/// panel tabs. Each is a tab like the panel tabs: the comp's label swatch and name, and × on the
+/// shown comp while the Timeline is the group's shown panel (`selected`). Tabs that do not fit go
+/// to a » menu at the end; the shown comp's tab always stays in the row. Shift+, and Shift+. step
+/// through every open comp. Automation: `panel.tab.Timeline.<comp>`, `panel.tab.Timeline.close`
+/// for the shown comp's ×, `panel.tab.Timeline.more` for », and `panel.tab.Timeline.more.<comp>`
+/// for its items.
+pub fn doc_tabs(
     ui: &mut egui::Ui,
-    node: &mut DockNode,
-    rect: Rect,
-    t: &Tokens,
-    path: &str,
-    out: &mut Vec<Group>,
+    strip: Rect,
+    docs: &[DocTab],
+    selected: bool,
+    style: &craft_ui::docking::DockStyle,
     reg: &mut crate::automation::Registry,
-    actions: &mut Vec<craft_ui::docking::Action<PanelKind>>,
-) {
-    layout_inner(ui, node, rect, t, path, &[], out, reg, actions);
-}
-
-fn layout_inner(
-    ui: &mut egui::Ui,
-    node: &mut DockNode,
-    rect: Rect,
-    t: &Tokens,
-    path: &str,
-    tree_path: &[bool],
-    out: &mut Vec<Group>,
-    reg: &mut crate::automation::Registry,
-    actions: &mut Vec<craft_ui::docking::Action<PanelKind>>,
-) {
-    match node {
-        DockNode::Tabs { panels, active } => {
-            let tab_h = if panels.len() == 1 && panels[0].compact() { 8.0 } else { t.tab_h };
-            let content = Rect::from_min_max(pos2(rect.min.x, rect.min.y + tab_h), rect.max);
-            out.push(Group { path: path.to_string(), rect, content, panels: panels.clone(), active: *active, stacked: None });
-        }
-        DockNode::Stack { entries } => {
-            // A header for every entry; the open panels' bodies share the rest.
-            let head = t.tab_h;
-            let g = t.gap;
-            let n = entries.len() as f32;
-            let avail = rect.height() - n * head - (n - 1.0).max(0.0) * g;
-            let bodies = stack_bodies(entries, avail);
-            let mut y = rect.min.y;
-            let mut drag = None;
-            for (i, e) in entries.iter().enumerate() {
-                let body = bodies.get(i).copied().unwrap_or(0.0);
-                let r = Rect::from_min_max(pos2(rect.min.x, y), pos2(rect.max.x, (y + head + body).min(rect.max.y)));
-                let content = Rect::from_min_max(pos2(r.min.x, r.min.y + head), r.max);
-                let group = format!("{path}s{i}");
-                // The gap below a panel resizes the open panels on either side of it.
-                let above = entries.get(..=i).and_then(|s| s.iter().rposition(|x| x.open));
-                let below = entries.get(i + 1..).and_then(|s| s.iter().position(|x| x.open)).map(|k| i + 1 + k);
-                if let (Some(above), Some(below)) = (above, below) {
-                    let gap = Rect::from_min_max(pos2(rect.min.x, r.max.y), pos2(rect.max.x, r.max.y + g));
-                    if let Some(d) = gutter(ui, gap, true, &group, t, reg) {
-                        drag = Some((above, below, d));
-                    }
-                }
-                out.push(Group { path: group, rect: r, content, panels: e.panels.clone(), active: e.active, stacked: Some(e.open) });
-                y = r.max.y + g;
-            }
-            if let Some((above, below, d)) = drag {
-                let mut proposed = entries.clone();
-                resize_stacked(&mut proposed, &bodies, above, below, d);
-                for (before, after) in entries.iter().zip(proposed) {
-                    if before.height != after.height
-                        && let Some(panel) = after.shown()
-                    {
-                        actions.push(craft_ui::docking::Action::ResizeStack { panel, height: after.height });
-                    }
-                }
-            }
-        }
-        DockNode::Split { vertical, size, a, b } => {
-            let axis = if *vertical { SplitAxis::Vertical } else { SplitAxis::Horizontal };
-            let Some(split) = split_rect(rect, axis, size.shared(), t.gap, 20.0) else { return };
-            let response = resize_handle(split.divider, *vertical, path, t).value(split.first_size(), 0.0..=split.available()).show(ui);
-            reg.add(&format!("dock.gutter.{path}"), response.response.rect, "gutter");
-            if response.delta != 0.0
-                && let Some(resized) = split.resized(size.shared(), response.delta, 40.0)
-            {
-                actions.push(craft_ui::docking::Action::ResizeSplit { path: tree_path.to_vec(), size: resized });
-            }
-            let mut first_path = tree_path.to_vec();
-            first_path.push(false);
-            let mut second_path = tree_path.to_vec();
-            second_path.push(true);
-            layout_inner(ui, a, split.first, t, &format!("{path}a"), &first_path, out, reg, actions);
-            layout_inner(ui, b, split.second, t, &format!("{path}b"), &second_path, out, reg, actions);
-        }
-    }
-}
-
-/// A gap between dock areas that drags to resize them (`vertical`: up and down), with a slightly
-/// larger hit area than the gap. Returns the drag this frame.
-fn gutter(ui: &mut egui::Ui, gap: Rect, vertical: bool, path: &str, t: &Tokens, reg: &mut crate::automation::Registry) -> Option<f32> {
-    let response = resize_handle(gap, vertical, path, t).show(ui);
-    reg.add(&format!("dock.gutter.{path}"), response.response.rect, "gutter");
-    (response.delta != 0.0).then_some(response.delta)
-}
-
-fn resize_handle(gap: Rect, vertical: bool, path: &str, t: &Tokens) -> ResizeHandle<'static> {
-    let axis = if vertical { SplitAxis::Vertical } else { SplitAxis::Horizontal };
-    let style = ResizeHandleStyle { hovered: t.focus.gamma_multiply(0.4), dragged: t.focus.gamma_multiply(0.9), focused: t.focus };
-    let label = if vertical { crate::i18n::tr("Height:") } else { crate::i18n::tr("Width:") };
-    ResizeHandle::new(egui::Id::new(("dock-gutter", path.to_string())), axis, gap, label, style)
-}
-
-/// The least body height of an open stacked panel (when the stack has room for it).
-const STACK_MIN: f32 = 40.0;
-
-/// An open stacked panel without a height of its own: it shares the room the others leave.
-fn flexible(e: &StackEntry) -> bool {
-    e.open && !e.height.is_some_and(f32::is_finite)
-}
-
-/// The body heights of a stack's panels in `avail` points (headers and gaps taken out). Open
-/// panels with a height keep it and the others share the rest; when no panel takes the rest, or
-/// there is too little room, the heights grow or shrink in proportion (down to [`STACK_MIN`]) so
-/// the open panels fill the stack.
-fn stack_bodies(entries: &[StackEntry], avail: f32) -> Vec<f32> {
-    let avail = if avail.is_finite() { avail.max(0.0) } else { 0.0 };
-    let open = entries.iter().filter(|e| e.open).count();
-    let min = STACK_MIN.min(avail / open.max(1) as f32);
-    let fixed: Vec<f32> = entries.iter().filter(|e| e.open && !flexible(e)).filter_map(|e| e.height).map(|h| h.max(min)).collect();
-    let flex = open.saturating_sub(fixed.len());
-    let k = fixed.len() as f32;
-    // What the panels with a height may take, and how much of it lies above their minimum.
-    let room = avail - flex as f32 * min;
-    let sum: f32 = fixed.iter().sum();
-    let (excess, target) = (sum - k * min, (room - k * min).max(0.0));
-    let fit = flex == 0 || sum > room;
-    let size = |h: f32| match (fit, excess > 0.0) {
-        (false, _) => h,
-        (true, true) => min + (h - min) / excess * target,
-        (true, false) => min + target / k.max(1.0),
-    };
-    let used: f32 = fixed.iter().map(|&h| size(h)).sum();
-    let share = (avail - used).max(0.0) / flex.max(1) as f32;
-    entries
-        .iter()
-        .map(|e| match (e.open, flexible(e)) {
-            (false, _) => 0.0,
-            (true, true) => share,
-            (true, false) => size(e.height.unwrap_or(min).max(min)),
-        })
-        .collect()
-}
-
-/// `v` held to `lo..=hi`, never panicking: when the room is too small for both minimums
-/// (`hi < lo`), `lo` wins; a non-finite `v` gives `lo`.
-#[cfg(test)]
-fn clamp_ordered(v: f32, lo: f32, hi: f32) -> f32 {
-    let lo = if lo.is_finite() { lo } else { 0.0 };
-    let hi = if hi.is_finite() { hi.max(lo) } else { lo };
-    if v.is_finite() { v.max(lo).min(hi) } else { lo }
-}
-
-/// The size of a split's first side in `avail` points (both sides keep 20 pt when there is room).
-/// `f32::clamp` panics when its bounds cross, which a split shorter than 40 pt did (#306).
-#[cfg(test)]
-fn split_first(size: SplitSize, avail: f32) -> f32 {
-    let avail = if avail.is_finite() { avail.max(0.0) } else { 0.0 };
-    let first = match size {
-        SplitSize::Ratio(r) => avail * r,
-        SplitSize::FixedA(px) => px.min(avail - 20.0),
-        SplitSize::FixedB(px) => avail - px.min(avail - 20.0),
-    };
-    let lo = 20.0_f32.min(avail);
-    clamp_ordered(first, lo, avail - 20.0).min(avail)
-}
-
-/// Drag the gap between the open stacked panels `above` and `below` (laid out at `bodies`) by
-/// `d` points: one grows as much as the other shrinks, neither below [`STACK_MIN`]. The new sizes
-/// become the panels' heights, except that the last panel without one keeps sharing the rest
-/// (so the stack still fills its column when the window is resized).
-fn resize_stacked(entries: &mut [StackEntry], bodies: &[f32], above: usize, below: usize, d: f32) {
-    let (Some(&a), Some(&b)) = (bodies.get(above), bodies.get(below)) else { return };
-    let pair = a + b;
-    let lo = STACK_MIN.min(pair / 2.0);
-    let na = (a + d).max(lo).min(pair - lo);
-    for (i, h) in [(above, na), (below, pair - na)] {
-        let last_flexible = entries.iter().filter(|e| flexible(e)).count() == 1;
-        if let Some(e) = entries.get_mut(i)
-            && !(last_flexible && flexible(e))
-        {
-            e.height = Some(h);
-        }
-    }
-}
-
-/// Draw a group's frame + tab strip: one tab per panel, or per document for panels that show
-/// several (the Timeline's comps). Tab labels may name the comp or layer they show (After
-/// Effects style).
-pub fn draw_group_chrome(ui: &mut egui::Ui, g: &Group, t: &Tokens, reg: &mut crate::automation::Registry, info: &TabInfo) -> Chrome {
-    struct Entry {
-        panel: PanelKind,
-        doc: Option<u64>,
-        label: String,
-        deco: Option<TabDeco>,
-        /// The group's shown tab.
-        active: bool,
-        /// The document its panel shows (even behind another tab).
-        shown_doc: bool,
-    }
-    let mut out = Chrome::default();
-    let painter = ui.painter().clone();
-    painter.rect_filled(g.rect, t.radius, t.panel_bg);
-    let active_panel = g.panels.get(g.active).copied();
-    let compact = g.panels.len() == 1 && g.panels[0].compact();
-    if compact {
-        // grip dots
-        let c = pos2(g.rect.center().x, g.rect.min.y + 4.0);
-        for dx in [-4.0, 0.0, 4.0] {
-            painter.circle_filled(c + vec2(dx, 0.0), 1.0, t.text_faint);
-        }
-    } else {
-        let mut entries: Vec<Entry> = vec![];
-        for (pi, p) in g.panels.iter().enumerate() {
-            let shown = pi == g.active;
-            match info.docs.iter().find(|(k, d)| k == p && !d.is_empty()) {
-                Some((_, docs)) => entries.extend(docs.iter().map(|d| Entry {
-                    panel: *p,
-                    doc: Some(d.id),
-                    label: d.title.clone(),
-                    deco: d.deco,
-                    active: shown && d.active,
-                    shown_doc: d.active,
-                })),
-                None => entries.push(Entry {
-                    panel: *p,
-                    doc: None,
-                    label: (info.title)(*p),
-                    deco: info.decos.iter().find(|(k, _)| k == p).map(|(_, d)| *d),
-                    active: shown,
-                    shown_doc: false,
-                }),
-            }
-        }
-        let ai = entries.iter().position(|e| e.active).unwrap_or(0);
-        let strip = Rect::from_min_size(g.rect.min, vec2(g.rect.width(), t.tab_h));
-        if t.gradients {
-            // Settings ▸ Appearance ▸ Use Gradients.
-            crate::theme::gradient_rect(&painter, strip.shrink2(vec2(t.radius, 0.0)), t.grad_top(t.panel_bg), t.panel_bg);
-        }
-        let activate = |e: &Entry| match e.doc {
-            Some(id) => DockAction::ActivateDoc(e.panel, id),
-            None => DockAction::Activate(e.panel),
+) -> Vec<DocAction> {
+    let mut out = Vec::new();
+    let timeline = PanelKind::Timeline.id();
+    let widths = doc_widths(ui.ctx(), docs, selected, &style.font);
+    let active = docs.iter().position(|d| d.active).unwrap_or(0);
+    let fit = craft_ui::tabs::fit_whole(&widths, active, strip.width(), DOC_OVERFLOW);
+    let clip = strip.intersect(ui.clip_rect());
+    let mid = strip.center().y;
+    let mut x = strip.min.x;
+    for (index, width) in &fit.shown {
+        let Some(doc) = docs.get(*index) else { continue };
+        let tab = Rect::from_min_size(pos2(x, strip.min.y), vec2(*width, strip.height()));
+        x += width;
+        let on = selected && doc.active;
+        let color = if on { style.text } else { style.inactive_text };
+        let close = has_close(doc, selected);
+        let mut job = doc_job(doc, &style.font, color);
+        job.wrap = egui::text::TextWrapping {
+            max_width: (tab.width() - TAB_PADDING - if close { DOC_CLOSE } else { 0.0 }).max(0.0),
+            max_rows: 1,
+            break_anywhere: true,
+            overflow_character: Some('\u{2026}'),
         };
-        let close = |e: &Entry| match e.doc {
-            Some(id) => DockAction::CloseDoc(e.panel, id),
-            None => DockAction::Close(e.panel),
-        };
-        let mut x = strip.min.x + 12.0;
-        let text_y = strip.min.y + 16.0;
-        for (k, e) in entries.iter().enumerate() {
-            let p = &e.panel;
-            // A collapsed stacked panel's header is plain text (no underline or panel menu).
-            let is_active = k == ai && g.stacked != Some(false);
-            let galley = painter.layout_no_wrap(e.label.clone(), Tokens::ui(12.0), if is_active { t.tab_text_active } else { t.tab_text });
-            let menu_w = if is_active { 20.0 } else { 0.0 };
-            // The lock belongs to the panel: on its shown document's tab only.
-            let lock = e.deco.is_some_and(|d| d.viewer) && (e.doc.is_none() || is_active);
-            // × (active tab only), swatch and lock before the label.
-            let deco_w = match e.deco {
-                Some(d) if d.viewer => (if is_active { 16.0 } else { 0.0 }) + 14.0 + if lock { 16.0 } else { 0.0 },
-                Some(_) => 14.0,
-                None => 0.0,
-            };
-            let w = galley.size().x + 16.0 + menu_w + deco_w;
-            if x + w > strip.max.x - 20.0 && k > ai {
-                let r = Rect::from_min_size(pos2(strip.max.x - 22.0, strip.min.y + 6.0), vec2(18.0, 20.0));
-                let resp = ui.interact(r, egui::Id::new(("tab-overflow", g.path.clone())), Sense::click());
-                icons::paint(&painter, r.shrink(4.0).translate(vec2(-2.0, 0.0)), Icon::ChevronRight, t.tab_text);
-                icons::paint(&painter, r.shrink(4.0).translate(vec2(2.0, 0.0)), Icon::ChevronRight, t.tab_text);
-                crate::widgets::focus_outline(ui, &resp, t);
-                reg.add_response(&format!("panel.overflow.{}", g.path), &resp, "More tabs");
-                if resp.clicked()
-                    && let Some(next) = entries.get((ai + 1) % entries.len())
-                {
-                    out.actions.push(activate(next));
-                }
-                break;
+        let galley = ui.fonts_mut(|f| f.layout_job(job));
+        let label_end = tab.min.x + TAB_PADDING * 0.5 + galley.size().x;
+        let resp = craft_ui::tabs::Tab::new(egui::Id::unique(("comp-tab", doc.id)), &doc.title, on).focus_stroke(Stroke::new(1.0, style.accent)).show_at(
+            ui,
+            tab,
+            |ui, response| {
+                let painter = ui.painter().with_clip_rect(tab.intersect(clip));
+                painter.rect_filled(tab, 0.0, if on || response.hovered() { style.active_background } else { style.tab_background });
+                painter.galley(pos2(tab.min.x + TAB_PADDING * 0.5, mid - galley.size().y * 0.5), galley.clone(), color);
+            },
+        );
+        let resp = if galley.elided { resp.on_hover_text(&doc.title) } else { resp };
+        reg.add_response(&format!("panel.tab.{timeline}.{}", doc.id), &resp, &doc.title);
+        if close {
+            let cr = Rect::from_center_size(pos2(label_end + DOC_CLOSE / 2.0, mid), vec2(10.0, 10.0));
+            let hit = ui.interact(cr.expand(2.0), egui::Id::unique(("comp-tab-close", doc.id)), Sense::click());
+            hit.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, hit.enabled(), "Close"));
+            let cc = if hit.hovered() { style.text } else { style.inactive_text };
+            let k = 3.5;
+            let painter = ui.painter().with_clip_rect(tab.intersect(clip));
+            painter.line_segment([cr.center() + vec2(-k, -k), cr.center() + vec2(k, k)], Stroke::new(1.2, cc));
+            painter.line_segment([cr.center() + vec2(-k, k), cr.center() + vec2(k, -k)], Stroke::new(1.2, cc));
+            reg.add_response(&format!("panel.tab.{timeline}.close"), &hit, "Close");
+            if hit.clicked() {
+                out.push(DocAction::Close(doc.id));
             }
-            let tab = Rect::from_min_size(pos2(x, strip.min.y), vec2(w, t.tab_h));
-            match out.tabs.iter_mut().find(|(q, _)| q == p) {
-                Some((_, r)) => *r = r.union(tab),
-                None => out.tabs.push((*p, tab)),
-            }
-            let resp = ui.interact(tab, egui::Id::new(("tab", g.path.clone(), k)), Sense::click_and_drag());
-            if resp.drag_started() {
-                out.actions.push(DockAction::BeginDrag(*p));
-            }
-            // A document tab also answers to the panel's id while it is the shown one.
-            let auto_id = match e.doc {
-                Some(id) => format!("panel.tab.{}.{id}", p.id()),
-                None => format!("panel.tab.{}", p.id()),
-            };
-            reg.add_response(&auto_id, &resp, &e.label);
-            if e.shown_doc {
-                reg.add_response(&format!("panel.tab.{}", p.id()), &resp, &e.label);
-            }
-            let mut label_x = tab.min.x + 8.0;
-            if let Some(d) = e.deco {
-                let mut dx = tab.min.x + 6.0;
-                if is_active && d.viewer {
-                    let cr = Rect::from_center_size(pos2(dx + 5.0, text_y), vec2(10.0, 10.0));
-                    let cresp = ui.interact(cr.expand(2.0), egui::Id::new(("tab-close", g.path.clone(), k)), Sense::click());
-                    let cc = if cresp.hovered() { t.tab_text_active } else { t.tab_text };
-                    let kk = 3.5;
-                    painter.line_segment([cr.center() + vec2(-kk, -kk), cr.center() + vec2(kk, kk)], Stroke::new(1.2, cc));
-                    painter.line_segment([cr.center() + vec2(-kk, kk), cr.center() + vec2(kk, -kk)], Stroke::new(1.2, cc));
-                    reg.add_response(&format!("panel.tab.{}.close", p.id()), &cresp, "Close");
-                    crate::widgets::focus_outline(ui, &cresp, t);
-                    if cresp.clicked() {
-                        out.actions.push(close(e));
-                    }
-                    dx += 16.0;
-                }
-                let sw = Rect::from_center_size(pos2(dx + 5.0, text_y), vec2(9.0, 9.0));
-                painter.rect_filled(sw, 1.0, d.swatch);
-                dx += 14.0;
-                label_x = dx;
-                if lock {
-                    let lr = Rect::from_center_size(pos2(dx + 6.0, text_y), vec2(12.0, 12.0));
-                    let lresp = ui.interact(lr.expand(2.0), egui::Id::new(("tab-lock", g.path.clone(), k)), Sense::click());
-                    let lc = if d.locked {
-                        t.tab_text_active
-                    } else if lresp.hovered() {
-                        t.tab_text
-                    } else {
-                        t.text_faint
-                    };
-                    icons::paint(&painter, lr, Icon::Lock, lc);
-                    reg.add_response(&format!("panel.tab.{}.lock", p.id()), &lresp, if d.locked { "Unlock" } else { "Lock" });
-                    crate::widgets::focus_outline(ui, &lresp, t);
-                    if lresp.clicked() {
-                        out.actions.push(DockAction::ToggleLock(*p));
-                    }
-                    label_x = dx + 16.0;
-                }
-            }
-            let label_w = galley.size().x;
-            let col = if is_active || resp.hovered() { t.tab_text_active } else { t.tab_text };
-            painter.galley_with_override_text_color(pos2(label_x, text_y - galley.size().y / 2.0), galley, col);
-            if is_active {
-                let mr = Rect::from_center_size(pos2(label_x + label_w + 12.0, text_y), vec2(12.0, 10.0));
-                let mresp = ui.interact(mr.expand(3.0), egui::Id::new(("tab-menu", g.path.clone())), Sense::click());
-                reg.add_response(&format!("panel.menu.{}", p.id()), &mresp, "panel menu");
-                let mc = if mresp.hovered() { t.tab_text_active } else { t.tab_text };
-                for dy in [-3.5, 0.0, 3.5] {
-                    painter.line_segment([pos2(mr.min.x, mr.center().y + dy), pos2(mr.max.x, mr.center().y + dy)], Stroke::new(1.5, mc));
-                }
-                let uy = strip.min.y + 23.0;
-                painter.line_segment([pos2(label_x, uy), pos2(mr.max.x, uy)], Stroke::new(1.0, t.tab_text_active));
-                crate::widgets::focus_outline(ui, &mresp, t);
-                if mresp.clicked() {
-                    out.actions.push(DockAction::PanelMenu(*p, mr.left_bottom()));
-                }
-            }
-            crate::widgets::focus_outline(ui, &resp, t);
-            if resp.clicked() {
-                // A stacked frame's shown tab expands / collapses it; another tab shows that
-                // panel (expanding the frame).
-                if g.stacked.is_some() && (k == ai || entries.len() == 1) {
-                    out.actions.push(DockAction::ToggleStacked(*p));
-                } else {
-                    out.actions.push(activate(e));
-                }
-                out.actions.push(DockAction::Focus(*p));
-            }
-            if resp.middle_clicked() {
-                out.actions.push(close(e));
-            }
-            x += w + 8.0;
         }
-        // A stacked panel's whole header bar expands/collapses it, not just its name (as in After
-        // Effects): the frame with its shown tab.
-        if g.stacked.is_some()
-            && let Some(e) = entries.get(ai).or(entries.first())
-        {
-            let rest = Rect::from_min_max(pos2((x - 8.0).max(strip.min.x), strip.min.y), strip.max);
-            if rest.width() > 0.0 {
-                let resp = ui.interact(rest, egui::Id::new(("tab-rest", g.path.clone())), Sense::click());
-                reg.add(&format!("panel.header.{}", e.panel.id()), rest, &e.label);
-                if resp.clicked() {
-                    out.actions.push(DockAction::ToggleStacked(e.panel));
-                    out.actions.push(DockAction::Focus(e.panel));
-                }
-            }
+        if resp.clicked() {
+            out.push(DocAction::Activate(doc.id));
+        }
+        if resp.middle_clicked() {
+            out.push(DocAction::Close(doc.id));
         }
     }
-    // clicking anywhere in the panel focuses it; a press on another of its tabs waits for that
-    // tab's click, which focuses the panel actually chosen (a text edit stays open in Character)
-    let at = ui.input(|i| i.pointer.interact_pos());
-    if let Some(p) = active_panel
-        && ui.rect_contains_pointer(g.rect)
-        && ui.input(|i| i.pointer.any_pressed())
-        && !out.tabs.iter().any(|(q, r)| *q != p && at.is_some_and(|a| r.contains(a)))
-    {
-        out.actions.push(DockAction::Focus(p));
+    if !fit.overflow.is_empty() && fit.overflow_width > 0.0 {
+        let more = Rect::from_min_size(pos2(x, strip.min.y), vec2(fit.overflow_width, strip.height()));
+        let resp = ui.interact(more, egui::Id::unique("comp-tabs-more"), Sense::click());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, resp.enabled(), "More compositions"));
+        reg.add_response(&format!("panel.tab.{timeline}.more"), &resp, "More compositions");
+        let color = if resp.hovered() { style.text } else { style.inactive_text };
+        ui.painter().with_clip_rect(more.intersect(clip)).text(more.center(), Align2::CENTER_CENTER, "\u{bb}", style.font.clone(), color);
+        egui::Popup::menu(&resp).show(|ui| {
+            egui::ScrollArea::vertical().max_height(360.0).show(ui, |ui| {
+                for index in &fit.overflow {
+                    let Some(doc) = docs.get(*index) else { continue };
+                    let item = ui.button(doc_job(doc, &style.font, style.text));
+                    item.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, item.enabled(), &doc.title));
+                    reg.add_response(&format!("panel.tab.{timeline}.more.{}", doc.id), &item, &doc.title);
+                    if item.clicked() {
+                        out.push(DocAction::Activate(doc.id));
+                        ui.close();
+                    }
+                }
+            });
+        });
     }
     out
 }
 
+/// A viewer lock button (Composition viewers and the Timeline keep their comp while locked).
+/// Returns true when clicked. Automation: `panel.tab.<panel>.lock`.
+pub fn lock_button(ui: &mut egui::Ui, rect: Rect, panel: PanelKind, locked: bool, t: &Tokens, reg: &mut crate::automation::Registry) -> bool {
+    let resp = ui.interact(rect, egui::Id::unique(("tab-lock", panel.id())), Sense::click());
+    let color = if locked {
+        t.tab_text_active
+    } else if resp.hovered() {
+        t.tab_text
+    } else {
+        t.text_faint
+    };
+    icons::paint(ui.painter(), rect.shrink(2.0), Icon::Lock, color);
+    reg.add_response(&format!("panel.tab.{}.lock", panel.id()), &resp, if locked { "Unlock" } else { "Lock" });
+    crate::widgets::focus_outline(ui, &resp, t);
+    resp.clicked()
+}
+
 /// Placeholder body for panels that are not implemented yet.
 pub fn placeholder(ui: &mut egui::Ui, rect: Rect, t: &Tokens, text: &str) {
     ui.painter().text(rect.center(), Align2::CENTER_CENTER, text, Tokens::ui(12.0), t.text_faint);
@@ -1365,438 +679,91 @@ pub fn placeholder(ui: &mut egui::Ui, rect: Rect, t: &Tokens, text: &str) {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use PanelKind::*;
+    use craft_ui::docking::{Action, Placement, Zone};
+
+    fn apply(w: &mut Workspace, action: Action<PanelKind>) {
+        w.apply(action, permissions).unwrap();
+    }
 
-    /// The original split clamp panicked whenever 0 < available < 40. Run the actual dock
-    /// layout without the app's last-resort panic guard so that regression cannot be hidden.
     #[test]
-    fn tiny_split_layouts_stay_inside_their_parent() {
-        let ctx = egui::Context::default();
-        let tokens = Tokens::for_kind(crate::theme::ThemeKind::Dark);
-        for extent in [20.0, 0.0, 1.0, 5.0, 15.0, 35.0, 39.9, 40.0, 80.0] {
-            for vertical in [false, true] {
-                for size in [SplitSize::Ratio(0.5), SplitSize::FixedA(300.0), SplitSize::FixedB(300.0)] {
-                    let rect = Rect::from_min_size(egui::Pos2::ZERO, egui::Vec2::splat(extent));
-                    let mut node =
-                        DockNode::Split { vertical, size, a: Box::new(tabs(&[PanelKind::Project], 0)), b: Box::new(tabs(&[PanelKind::Composition], 0)) };
-                    let mut groups = vec![];
-                    let mut registry = crate::automation::Registry::default();
-                    let mut output = ctx.run_ui(egui::RawInput::default(), |ui| layout(ui, &mut node, rect, &tokens, "", &mut groups, &mut registry));
-                    output.textures_delta.clear();
-                    assert_eq!(groups.len(), 2);
-                    for group in groups {
-                        assert!(rect.contains_rect(group.rect), "{extent}, {vertical}: {:?}", group.rect);
-                        assert!(group.rect.width() >= 0.0 && group.rect.height() >= 0.0);
-                    }
-                }
+    fn after_effects_workspaces_exist_with_their_core_panels() {
+        for name in WORKSPACES {
+            let w = Workspace::new(workspace(name));
+            w.validate().unwrap_or_else(|e| panic!("{name}: {e}"));
+            assert!(w.is_docked(Composition), "{name}");
+            if *name != "Undocked Panels" {
+                assert!(w.is_docked(Timeline), "{name}");
             }
         }
-    }
-
-    #[test]
-    fn open_near_in_an_empty_dock_makes_the_panel_the_dock() {
-        for p in [PanelKind::Composition, PanelKind::Timeline, PanelKind::Project] {
-            let mut d = tabs(&[], 0);
-            d.open_near(p, PanelKind::EffectsPresets);
-            assert!(d.is_visible(p));
-            assert_eq!(d.panel_count(), 1);
+        let all = Workspace::new(workspace("All Panels"));
+        for p in PanelKind::ALL.iter().filter(|p| !matches!(p, ScriptConsole | EssentialGraphics | MaskInterpolation)) {
+            assert!(all.is_open(*p), "All Panels lacks {p:?}");
         }
-    }
-
-    #[test]
-    fn open_near_without_any_anchor_uses_the_first_group() {
-        let mut d = tabs(&[PanelKind::Composition], 0);
-        d.open_near(PanelKind::Timeline, PanelKind::EffectsPresets);
-        assert!(d.is_visible(PanelKind::Timeline));
-        assert_eq!(d.panel_count(), 2);
-    }
-
-    #[test]
-    fn stacked_panels_toggle_open_close() {
-        use PanelKind::*;
-        let mut d = stack(&[(Preview, true, Some(46.0)), (Properties, true, None), (Align, false, None)]);
-        assert!(d.is_visible(Properties) && !d.is_visible(Align));
-        assert!(d.toggle_stacked(Align));
-        assert!(d.is_visible(Align));
-        assert!(d.toggle_stacked(Align) && !d.is_visible(Align));
-        // Showing a collapsed panel expands it; opening a new panel near one inserts after it.
-        assert!(d.activate(Align) && d.is_visible(Align));
-        d.open_near(Info, Properties);
-        let mut v = vec![];
-        d.panels(&mut v);
-        assert_eq!(v, [Preview, Properties, Info, Align]);
-        d.close(Preview);
-        assert!(!d.contains(Preview));
-        assert!(!d.toggle_stacked(Timeline));
-    }
-
-    fn entry(panel: PanelKind, open: bool, height: Option<f32>) -> StackEntry {
-        StackEntry::new(panel, open, height)
-    }
-
-    fn close_to(a: &[f32], b: &[f32]) -> bool {
-        a.len() == b.len() && a.iter().zip(b).all(|(x, y)| (x - y).abs() < 1e-3)
-    }
-
-    #[test]
-    fn stacked_panels_fill_their_column() {
-        use PanelKind::*;
-        // A panel with a height keeps it; the open ones without share the rest.
-        let s = [entry(Preview, true, Some(100.0)), entry(Properties, true, None), entry(Align, false, None), entry(Audio, true, None)];
-        assert!(close_to(&stack_bodies(&s, 500.0), &[100.0, 200.0, 0.0, 200.0]));
-        // Too little room: the heights shrink so the others keep their minimum.
-        let s = [entry(Preview, true, Some(500.0)), entry(Properties, true, None)];
-        assert!(close_to(&stack_bodies(&s, 300.0), &[260.0, STACK_MIN]));
-        // Nothing to take the rest: the heights grow in proportion (above the minimum) to fill.
-        let s = [entry(Preview, true, Some(100.0)), entry(Properties, true, Some(300.0)), entry(Align, false, Some(80.0))];
-        assert!(close_to(&stack_bodies(&s, 600.0), &[137.5, 462.5, 0.0]));
-        let s = [entry(Preview, true, Some(46.0)), entry(Properties, false, None)];
-        assert!(close_to(&stack_bodies(&s, 600.0), &[600.0, 0.0]));
-        // Hostile sizes never make a body negative or non-finite.
-        for avail in [-50.0, 0.0, 10.0, f32::NAN, f32::INFINITY] {
-            for h in [None, Some(-5.0), Some(f32::NAN), Some(f32::INFINITY), Some(1e30), Some(f32::MAX)] {
-                let s = [entry(Preview, true, h), entry(Properties, true, Some(60.0)), entry(Align, false, h)];
-                let b = stack_bodies(&s, avail);
-                assert!(b.iter().all(|x| x.is_finite() && *x >= 0.0), "{avail} {h:?}: {b:?}");
+        // No built-in workspace uses accordions: right columns are frames split vertically.
+        fn no_stack(node: &Node<PanelKind>) -> bool {
+            match node {
+                Node::Split { first, second, .. } => no_stack(first) && no_stack(second),
+                Node::Stack { .. } => false,
+                _ => true,
             }
         }
-        assert!(stack_bodies(&[], 100.0).is_empty());
-    }
-
-    #[test]
-    fn dragging_a_stack_gap_trades_height_between_its_neighbours() {
-        use PanelKind::*;
-        let mut s = vec![entry(Preview, true, Some(46.0)), entry(Properties, true, None), entry(Align, false, None)];
-        let bodies = stack_bodies(&s, 800.0);
-        resize_stacked(&mut s, &bodies, 0, 1, 100.0);
-        // Preview keeps its new height; Properties, the only panel without one, takes the rest.
-        assert_eq!(s[0].height, Some(146.0));
-        assert_eq!(s[1].height, None);
-        assert!(close_to(&stack_bodies(&s, 800.0), &[146.0, 654.0, 0.0]));
-        // Neither side goes below the minimum.
-        for (d, want) in [(-1000.0, STACK_MIN), (1000.0, 800.0 - STACK_MIN)] {
-            let bodies = stack_bodies(&s, 800.0);
-            resize_stacked(&mut s, &bodies, 0, 1, d);
-            assert!(close_to(&stack_bodies(&s, 800.0)[..1], &[want]), "{d}");
-        }
-        // Two sharing panels: the upper one gets a height, the lower one keeps sharing.
-        let mut s = vec![entry(Preview, true, None), entry(Align, false, None), entry(Properties, true, None)];
-        let bodies = stack_bodies(&s, 400.0);
-        resize_stacked(&mut s, &bodies, 0, 2, 50.0);
-        assert_eq!((s[0].height, s[2].height), (Some(250.0), None));
-        assert!(close_to(&stack_bodies(&s, 400.0), &[250.0, 0.0, 150.0]));
-        // Out-of-range indices change nothing.
-        let before = s.clone();
-        resize_stacked(&mut s, &bodies, 0, 9, 50.0);
-        assert_eq!(s, before);
-    }
-
-    #[test]
-    fn default_workspace_has_ae_right_column_stack() {
-        let d = workspace("Default");
-        assert!(d.is_visible(PanelKind::Properties) && d.is_visible(PanelKind::Preview));
-        assert!(d.contains(PanelKind::EffectsPresets) && !d.is_visible(PanelKind::EffectsPresets));
-    }
-
-    #[test]
-    fn workspaces_contain_core_panels() {
-        for w in WORKSPACES {
-            let d = workspace(w);
-            let floating: Vec<PanelKind> = workspace_floating(w).into_iter().flat_map(|f| f.panels).collect();
-            assert!(d.contains(PanelKind::Timeline) || floating.contains(&PanelKind::Timeline), "{w}");
-            assert!(d.contains(PanelKind::Composition) || d.contains(PanelKind::Layer), "{w}");
-            // A panel is in one place only.
-            let mut all = vec![];
-            d.panels(&mut all);
-            all.extend(floating);
-            let n = all.len();
-            all.sort_by_key(|p| p.id());
-            all.dedup();
-            assert_eq!(all.len(), n, "{w} has a panel twice");
+        for name in WORKSPACES {
+            let layout = workspace(name);
+            assert!(layout.root.iter().chain(layout.floating.iter().map(|f| &f.root)).all(no_stack), "{name}");
         }
     }
 
     #[test]
-    fn after_effects_workspaces_exist() {
-        // Window ▸ Workspace in After Effects 2026, less Libraries (an Adobe service).
-        for w in [
-            "Default",
-            "Review",
-            "Learn",
-            "Small Screen",
-            "Standard",
-            "All Panels",
-            "Animation",
-            "Essential Graphics",
-            "Color",
-            "Effects",
-            "Minimal",
-            "Motion Tracking",
-            "Paint",
-            "Text",
-            "Undocked Panels",
-        ] {
-            assert!(WORKSPACES.contains(&w), "{w}");
-        }
-        assert!(!WORKSPACES.contains(&"Libraries"));
-        // Layouts differ from Default (except Learn, which is Default plus the Home screen).
-        let def = workspace("Default");
-        for w in WORKSPACES.iter().filter(|w| !matches!(**w, "Default" | "Learn")) {
-            assert_ne!(workspace(w), def, "{w} falls back to Default");
-        }
-        assert!(workspace("Essential Graphics").contains(PanelKind::Properties));
-        assert!(workspace("Color").contains(PanelKind::EffectControls));
-        assert!(!workspace_floating("Undocked Panels").is_empty());
-        // Every built-in workspace is in Window ▸ Workspace.
-        let menu: Vec<String> = effectcraft_engine::menus::entries()
-            .into_iter()
-            .filter(|(_, e)| e.command == "window.workspace")
-            .filter_map(|(_, e)| e.params.get("name").and_then(|v| v.as_str()).map(str::to_string))
-            .collect();
-        for w in WORKSPACES {
-            assert!(menu.iter().any(|m| m == w), "{w} missing from Window > Workspace");
-        }
-    }
-
-    #[test]
-    fn short_splits_lay_out_without_panicking() {
-        // #306: a split 0 < avail < 40 pt tall made `f32::clamp` panic (its bounds crossed).
-        for avail in [0.0, 5.0, 19.0, 20.0, 30.0, 39.0, 40.0, 41.0, -10.0, f32::NAN, f32::INFINITY] {
-            for size in [SplitSize::Ratio(0.5), SplitSize::Ratio(f32::NAN), SplitSize::FixedA(300.0), SplitSize::FixedB(300.0), SplitSize::FixedA(-5.0)] {
-                let f = split_first(size, avail);
-                assert!(f.is_finite() && f >= 0.0, "{size:?} {avail}: {f}");
-                if avail.is_finite() && avail > 0.0 {
-                    assert!(f <= avail, "{size:?} {avail}: {f}");
-                }
-            }
-        }
-        assert_eq!(split_first(SplitSize::FixedA(300.0), 30.0), 20.0);
-        assert_eq!(split_first(SplitSize::Ratio(0.5), 200.0), 100.0);
-        assert_eq!(clamp_ordered(5.0, 40.0, -4.0), 40.0);
-        // Every workspace, laid out in rects too short and too narrow for its minimums.
-        let ctx = egui::Context::default();
-        let t = Tokens::for_kind(crate::theme::ThemeKind::Dark);
-        for w in WORKSPACES {
-            for (wd, ht) in [(30.0, 30.0), (800.0, 36.0), (800.0, 45.0), (36.0, 600.0), (1.0, 1.0), (0.0, 0.0)] {
-                let mut node = workspace(w);
-                let mut frame = ctx.run_ui(egui::RawInput::default(), |ui| {
-                    let mut out = vec![];
-                    let mut reg = crate::automation::Registry::default();
-                    layout(ui, &mut node, Rect::from_min_size(pos2(0.0, 0.0), vec2(wd, ht)), &t, "", &mut out, &mut reg);
-                    assert!(!out.is_empty(), "{w}");
-                });
-                frame.textures_delta.clear();
-            }
-        }
-    }
-
-    #[test]
-    fn drop_zone_math() {
-        let r = Rect::from_min_size(pos2(100.0, 100.0), vec2(400.0, 300.0));
-        let tab = 28.0;
-        assert_eq!(drop_zone(r, tab, pos2(300.0, 110.0)), Zone::Center, "tab strip");
-        assert_eq!(drop_zone(r, tab, r.center()), Zone::Center);
-        assert_eq!(drop_zone(r, tab, pos2(120.0, 250.0)), Zone::Left);
-        assert_eq!(drop_zone(r, tab, pos2(490.0, 250.0)), Zone::Right);
-        assert_eq!(drop_zone(r, tab, pos2(300.0, 140.0)), Zone::Top);
-        assert_eq!(drop_zone(r, tab, pos2(300.0, 390.0)), Zone::Bottom);
-        // Corners go to the nearer edge.
-        assert_eq!(drop_zone(r, tab, pos2(105.0, 395.0)), Zone::Left);
-        assert_eq!(zone_rect(r, Zone::Right), Rect::from_min_max(pos2(300.0, 100.0), r.max));
-        assert_eq!(zone_rect(r, Zone::Top).height(), 150.0);
-        assert_eq!(zone_rect(r, Zone::Center), r);
-    }
-
-    #[test]
-    fn dock_panel_splits_and_inserts_tabs() {
-        use PanelKind::*;
-        let mut d = workspace("Standard");
-        let n = d.panel_count();
-        // Tab next to an anchor.
-        assert!(d.dock_panel(Info, Timeline, Zone::Center));
-        assert_eq!(d.panel_count(), n);
-        let p = d.path_of(Timeline).unwrap();
-        assert_eq!(d.path_of(Info).unwrap(), p);
-        assert!(d.is_visible(Info));
-        // Split to the right of the Composition group: a new single-tab group beside it.
-        assert!(d.dock_panel(Info, Composition, Zone::Right));
-        let comp_path = d.path_of(Composition).unwrap();
-        let info_path = d.path_of(Info).unwrap();
-        assert_eq!(comp_path.len(), info_path.len());
-        assert!(comp_path.ends_with('a') && info_path.ends_with('b'));
-        assert!(d.is_visible(Info));
-        // Top: the new group comes first in a vertical split.
-        assert!(d.dock_panel(Audio, Timeline, Zone::Top));
-        assert!(d.path_of(Audio).unwrap().ends_with('a'));
-        // Dropping a panel on itself or an undocked anchor changes nothing.
-        let before = d.clone();
-        assert!(!d.dock_panel(Audio, Audio, Zone::Left));
-        assert!(!d.dock_panel(Audio, Tracker, Zone::Left));
-        assert_eq!(d, before);
-        // Into a stack: a tab of the anchor's frame (#302).
-        let mut s = workspace("Default");
-        let props = s.path_of(Properties).unwrap();
-        assert!(s.dock_panel(Tracker, Properties, Zone::Center));
-        assert_eq!(s.path_of(Tracker), Some(props.clone()));
-        assert!(s.is_visible(Tracker) && !s.is_visible(Properties));
-        assert!(s.activate(Properties) && s.is_visible(Properties));
-        // Top / Bottom: a frame of its own above / below the anchor's, not a split column.
-        assert!(s.dock_panel(Info, Properties, Zone::Bottom));
-        let below = s.path_of(Info).unwrap();
-        assert_ne!(below, props);
-        assert_eq!(s.path_of(Properties), Some(props.clone()));
-        assert!(s.dock_panel(Info, Properties, Zone::Top));
-        assert_eq!(s.path_of(Info), Some(props.clone()), "above Properties: its frame's index");
-        // Closing a tab keeps the frame; closing the frame's last tab removes it.
-        s.close(Tracker);
-        assert!(s.contains(Properties) && !s.contains(Tracker));
-        // A tab dragged onto a stacked frame's tab strip joins that frame.
-        let mut t = workspace("Default");
-        assert!(t.insert_tab(Info, Preview, None));
-        assert_eq!(t.path_of(Info), t.path_of(Preview));
-        // Moving the only panel of a group collapses its split.
-        let mut m = hsplit(SplitSize::Ratio(0.5), tabs(&[Project], 0), tabs(&[Composition], 0));
-        assert!(m.dock_panel(Project, Composition, Zone::Center));
-        assert_eq!(m, tabs(&[Composition, Project], 1));
-    }
-
-    /// #302: workspaces saved when each stacked frame held one `panel` still load.
-    #[test]
-    fn old_stack_entries_load() {
-        let e: StackEntry = serde_json::from_str(r#"{"panel":"Preview","open":true,"height":46.0}"#).unwrap();
-        assert_eq!(e, StackEntry::new(PanelKind::Preview, true, Some(46.0)));
-        let s = serde_json::to_string(&workspace("Default")).unwrap();
-        assert_eq!(serde_json::from_str::<DockNode>(&s).unwrap(), workspace("Default"));
-    }
-
-    #[test]
-    fn floating_layout_round_trips() {
-        use PanelKind::*;
-        let mut l = Layout { root: workspace("Standard"), floating: vec![] };
-        assert!(l.float(Info, [200.0, 150.0, 320.0, 240.0]));
-        assert!(!l.root.contains(Info) && l.contains(Info));
-        // Tab another panel into the floating group, then dock it back.
-        assert!(l.dock(Audio, Info, Zone::Center));
-        assert_eq!(l.floating[0].panels, [Info, Audio]);
-        assert!(!l.dock(Audio, Info, Zone::Left), "floating groups only take tabs");
-        assert!(l.dock(Info, Timeline, Zone::Bottom));
-        assert_eq!(l.floating[0].panels, [Audio]);
-        assert!(l.root.contains(Info));
-        let s = serde_json::to_string(&l).unwrap();
-        let back: Layout = serde_json::from_str(&s).unwrap();
-        assert_eq!(back, l);
-        // A workspace saved before floating panels existed still loads.
-        let old: Layout = serde_json::from_str(&format!("{{\"root\": {}}}", serde_json::to_string(&l.root).unwrap())).unwrap();
-        assert!(old.floating.is_empty());
-        // The last docked panel can't float.
-        let mut one = Layout { root: tabs(&[Timeline], 0), floating: vec![] };
-        assert!(!one.float(Timeline, [0.0; 4]));
-        assert!(l.unfloat(Audio) && l.floating.is_empty());
-    }
-
-    #[test]
-    fn close_and_open() {
-        let mut d = workspace("Default");
-        d.close(PanelKind::Paragraph);
-        assert!(!d.contains(PanelKind::Paragraph));
-        d.open_near(PanelKind::Tracker, PanelKind::EffectsPresets);
-        assert!(d.is_visible(PanelKind::Tracker));
-        let s = serde_json::to_string(&d).unwrap();
-        let back: DockNode = serde_json::from_str(&s).unwrap();
-        assert_eq!(back, d);
-        assert_eq!(PanelKind::from_name("effects & presets"), Some(PanelKind::EffectsPresets));
-    }
-
-    /// Ported from #630 (Ni-zav): the reporter's reproduction on the Minimal workspace.
-    #[test]
-    fn window_panels_reopen_after_last_panel_is_closed() {
-        use PanelKind::*;
-        for reopen in [Composition, Timeline, Project] {
-            let mut d = workspace("Minimal");
-            d.close(Composition);
-            d.close(Timeline);
-            assert_eq!(d.panel_count(), 0);
-            d.open_near(reopen, EffectsPresets);
-            assert_eq!(d.panel_count(), 1);
-            assert!(d.is_visible(reopen), "{reopen:?} must be visible");
-        }
-        let mut d = tabs(&[Audio], 0);
-        d.open_near(History, Project);
-        assert_eq!(d, tabs(&[Audio, History], 1));
-        let mut d = workspace("Minimal");
-        d.open_near(EffectsPresets, Timeline);
-        assert_eq!(d.path_of(EffectsPresets), d.path_of(Timeline));
-    }
-
-    #[test]
-    fn closing_earlier_inactive_tab_keeps_the_shown_panel() {
-        use PanelKind::*;
-        let mut d = tabs(&[Properties, Align, EffectsPresets], 1);
-        d.close(Properties);
-        assert!(d.is_visible(Align), "closing an inactive tab keeps the shown panel");
-        assert!(!d.is_visible(EffectsPresets));
-        assert_eq!(d.panel_count(), 2);
-    }
-
-    #[test]
-    fn closing_active_tab_keeps_existing_neighbor_choice() {
-        use PanelKind::*;
-        for (active, closed, shown) in [(0, Properties, Align), (1, Align, EffectsPresets), (2, EffectsPresets, Align)] {
-            let mut d = tabs(&[Properties, Align, EffectsPresets], active);
-            d.close(closed);
-            assert!(d.is_visible(shown), "active {active}: {closed:?} -> {shown:?}");
-        }
-    }
-
-    #[test]
-    fn close_normalizes_invalid_active_and_collapses_empty_splits() {
-        use PanelKind::*;
-        let mut d = tabs(&[Properties, Align, EffectsPresets], usize::MAX);
-        d.close(History);
-        assert!(d.is_visible(EffectsPresets));
-        d.close(Properties);
-        assert!(d.is_visible(EffectsPresets));
-        d.close(EffectsPresets);
-        assert!(d.is_visible(Align));
-        d.close(Align);
-        assert_eq!(d, tabs(&[], 0));
-        let mut d = DockNode::Split { vertical: true, size: SplitSize::Ratio(0.5), a: Box::new(tabs(&[Properties], 0)), b: Box::new(tabs(&[Align], 0)) };
-        d.close(Properties);
-        assert_eq!(d, tabs(&[Align], 0));
-        d.close(Align);
-        assert_eq!(d, tabs(&[], 0));
-    }
-
-    #[test]
-    fn removing_earlier_inactive_floating_tab_keeps_the_shown_panel() {
-        use PanelKind::*;
-        let mut layout = Layout {
-            root: tabs(&[Composition], 0),
-            floating: vec![Floating { panels: vec![Properties, Align, EffectsPresets], active: 1, rect: [0.0, 0.0, 300.0, 200.0] }],
+    fn default_right_column_is_a_short_preview_frame_over_the_properties_frame() {
+        let default = workspace("Default");
+        let Some(Node::Split { second, size: SplitSize::FixedSecond(300.0), .. }) = &default.root else { panic!("{default:?}") };
+        let Node::Split { axis: SplitAxis::Vertical, size: SplitSize::FixedFirst(PREVIEW_FRAME), first, second } = second.as_ref() else {
+            panic!("{second:?}")
         };
-        assert!(layout.unfloat(Properties));
-        let f = &layout.floating[0];
-        assert_eq!(f.panels.get(f.active), Some(&Align));
-        assert!(layout.root.is_visible(Composition));
+        assert_eq!(**first, tabs(&[Preview], 0));
+        assert_eq!(**second, tabs(&[Properties, Align, Audio, EffectsPresets], 0));
+        let mut w = Workspace::new(default);
+        assert!(w.is_visible(Preview) && w.is_visible(Properties) && !w.is_visible(Align));
+        // The Properties frame takes tabs; the Preview frame stays a frame of its own.
+        apply(&mut w, Action::Move { panel: Project, anchor: Properties, placement: Placement::Tab { before: None } });
+        assert_eq!(w.group_of(Project), vec![Properties, Align, Audio, EffectsPresets, Project]);
+        assert_eq!(w.group_of(Preview), vec![Preview]);
     }
 
     #[test]
-    fn floating_removal_keeps_active_neighbor_and_handles_invalid_index() {
-        use PanelKind::*;
-        for (active, closed, shown) in
-            [(0, Properties, Align), (1, Align, EffectsPresets), (2, EffectsPresets, Align), (usize::MAX, Properties, EffectsPresets)]
-        {
-            let mut layout = Layout {
-                root: tabs(&[Composition], 0),
-                floating: vec![Floating { panels: vec![Properties, Align, EffectsPresets], active, rect: [0.0, 0.0, 300.0, 200.0] }],
-            };
-            assert!(layout.unfloat(closed));
-            let f = &layout.floating[0];
-            assert_eq!(f.panels.get(f.active), Some(&shown));
-            for p in [Properties, Align, EffectsPresets] {
-                layout.unfloat(p);
-            }
-            assert!(layout.floating.is_empty());
-            assert!(!layout.unfloat(History));
-        }
+    fn panels_split_off_and_join_tab_groups() {
+        let mut w = docked(hsplit(SplitSize::FixedFirst(300.0), tabs(&[Project, EffectControls], 0), tabs(&[Composition, Layer], 0)));
+        apply(&mut w, Action::Move { panel: EffectControls, anchor: Composition, placement: Placement::Split(Zone::Right) });
+        assert_eq!(w.group_of(EffectControls), vec![EffectControls]);
+        assert_eq!(w.group_of(Project), vec![Project]);
+        apply(&mut w, Action::Move { panel: EffectControls, anchor: Composition, placement: Placement::Tab { before: Some(Layer) } });
+        assert_eq!(w.group_of(Composition), vec![Composition, EffectControls, Layer]);
+        assert!(w.is_visible(EffectControls));
+        // A rejected move (onto itself, onto a closed panel) changes nothing.
+        let before = w.clone();
+        assert!(w.apply(Action::Move { panel: Project, anchor: Info, placement: Placement::Split(Zone::Left) }, permissions).is_err());
+        assert_eq!(w, before);
+    }
+
+    #[test]
+    fn closed_panels_reopen_where_they_were_docked_or_floating() {
+        let mut w = Workspace::new(workspace("Standard"));
+        apply(&mut w, Action::Close { panel: Info });
+        assert!(!w.is_open(Info));
+        w.set_visible(Info, true, None, permissions).unwrap();
+        assert_eq!(w.group_of(Info), vec![Info, Audio]);
+        apply(&mut w, Action::Float { panel: Audio, rect: [40.0, 50.0, 300.0, 200.0] });
+        apply(&mut w, Action::Close { panel: Audio });
+        w.set_visible(Audio, true, None, permissions).unwrap();
+        assert!(w.is_floating(Audio));
+        // Closing an earlier, inactive tab keeps the shown panel.
+        let mut w = docked(tabs(&[Properties, Align, EffectsPresets], 2));
+        apply(&mut w, Action::Close { panel: Properties });
+        assert!(w.is_visible(EffectsPresets));
+        // A panel never laid out opens beside its anchor.
+        apply(&mut w, Action::Open { panel: History, anchor: Some(Align) });
+        assert_eq!(w.group_of(History), vec![Align, EffectsPresets, History]);
+        assert_eq!(referenced_panels(&w).iter().filter(|p| **p == Properties).count(), 1, "the closed panel is still known");
     }
 }
diff --git a/crates/ui-egui/src/dock_shared.rs b/crates/ui-egui/src/dock_shared.rs
deleted file mode 100644
index 4f090e219..000000000
--- a/crates/ui-egui/src/dock_shared.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-//! Convert the persisted workspace schema to shared docking transactions.
-
-use craft_ui::docking::{Action, Floating as SharedFloating, Layout as SharedLayout, Node, Placement, StackEntry as SharedStackEntry};
-use craft_ui::layout::{SplitAxis, SplitSize as SharedSplitSize};
-
-use crate::dock::{DockNode, Floating, Layout, PanelKind, SplitSize, StackEntry};
-
-const MAX_DEPTH: usize = 32;
-const MAX_NODES: usize = 4096;
-const MAX_PANELS: usize = 128;
-
-fn encode_node(node: &DockNode, depth: usize, count: &mut usize) -> Result<Node<PanelKind>, String> {
-    *count = count.saturating_add(1);
-    if depth > MAX_DEPTH || *count > MAX_NODES {
-        return Err("workspace dock tree exceeds supported limits".into());
-    }
-    Ok(match node {
-        DockNode::Tabs { panels, active } => {
-            if panels.len() > MAX_PANELS {
-                return Err("too many workspace tabs".into());
-            }
-            Node::Tabs { panels: panels.clone(), active: *active }
-        }
-        DockNode::Stack { entries } => {
-            if entries.len() > MAX_PANELS {
-                return Err("too many workspace stack entries".into());
-            }
-            if entries.iter().any(|entry| entry.panels.is_empty() || entry.active >= entry.panels.len() || entry.panels.len() > MAX_PANELS) {
-                return Err("invalid stacked tab selection".into());
-            }
-            Node::Stack {
-                entries: entries
-                    .iter()
-                    .flat_map(|entry| entry.panels.iter().map(move |panel| SharedStackEntry { panel: *panel, open: entry.open, height: entry.height }))
-                    .collect(),
-            }
-        }
-        DockNode::Split { vertical, size, a, b } => Node::Split {
-            axis: if *vertical { SplitAxis::Vertical } else { SplitAxis::Horizontal },
-            size: match *size {
-                SplitSize::Ratio(value) => SharedSplitSize::Ratio(value),
-                SplitSize::FixedA(value) => SharedSplitSize::FixedFirst(value),
-                SplitSize::FixedB(value) => SharedSplitSize::FixedSecond(value),
-            },
-            first: Box::new(encode_node(a, depth.saturating_add(1), count)?),
-            second: Box::new(encode_node(b, depth.saturating_add(1), count)?),
-        },
-    })
-}
-
-fn decode_node(node: Node<PanelKind>) -> DockNode {
-    match node {
-        Node::Tabs { panels, active } => DockNode::Tabs { panels, active },
-        Node::Stack { entries } => {
-            DockNode::Stack { entries: entries.into_iter().map(|entry| StackEntry::new(entry.panel, entry.open, entry.height)).collect() }
-        }
-        Node::Split { axis, size, first, second } => DockNode::Split {
-            vertical: axis == SplitAxis::Vertical,
-            size: match size {
-                SharedSplitSize::Ratio(value) => SplitSize::Ratio(value),
-                SharedSplitSize::FixedFirst(value) => SplitSize::FixedA(value),
-                SharedSplitSize::FixedSecond(value) => SplitSize::FixedB(value),
-            },
-            a: Box::new(decode_node(*first)),
-            b: Box::new(decode_node(*second)),
-        },
-    }
-}
-
-pub(crate) fn encode(root: &DockNode, floating: &[Floating]) -> Result<SharedLayout<PanelKind>, String> {
-    if floating.len() > MAX_PANELS || floating.iter().any(|group| group.panels.len() > MAX_PANELS) {
-        return Err("too many floating workspace panels".into());
-    }
-    let root = if matches!(root, DockNode::Tabs { panels, active: 0 } if panels.is_empty()) { None } else { Some(encode_node(root, 0, &mut 0)?) };
-    Ok(SharedLayout {
-        root,
-        floating: floating.iter().map(|group| SharedFloating { panels: group.panels.clone(), active: group.active, rect: group.rect }).collect(),
-    })
-}
-
-pub(crate) fn decode(layout: SharedLayout<PanelKind>) -> Layout {
-    Layout {
-        root: layout.root.map(decode_node).unwrap_or_else(|| DockNode::Tabs { panels: vec![], active: 0 }),
-        floating: layout.floating.into_iter().map(|group| Floating { panels: group.panels, active: group.active, rect: group.rect }).collect(),
-    }
-}
-
-/// Restore app-owned accordion tab frames after shared validation/transactions.
-/// The shared model represents individual stack panels; grouping stays in the persisted app schema.
-fn restore_frames(node: &mut DockNode, original: &DockNode) {
-    fn collect(node: &DockNode, out: &mut Vec<StackEntry>) {
-        match node {
-            DockNode::Split { a, b, .. } => {
-                collect(a, out);
-                collect(b, out);
-            }
-            DockNode::Stack { entries } => out.extend(entries.iter().cloned()),
-            DockNode::Tabs { .. } => {}
-        }
-    }
-    fn restore(node: &mut DockNode, frames: &[StackEntry]) {
-        match node {
-            DockNode::Split { a, b, .. } => {
-                restore(a, frames);
-                restore(b, frames);
-            }
-            DockNode::Stack { entries } => {
-                let mut result: Vec<StackEntry> = Vec::new();
-                for entry in std::mem::take(entries) {
-                    let Some(panel) = entry.shown() else { continue };
-                    let old = frames.iter().find(|frame| frame.contains(panel));
-                    if let Some(last) = result.last_mut()
-                        && old.is_some_and(|frame| last.panels.iter().all(|p| frame.contains(*p)))
-                    {
-                        last.panels.push(panel);
-                        if old.and_then(StackEntry::shown) == Some(panel) {
-                            last.active = last.panels.len().saturating_sub(1);
-                        }
-                    } else {
-                        result.push(entry);
-                    }
-                }
-                for entry in &mut result {
-                    if let Some(old) = frames.iter().find(|frame| entry.panels.iter().all(|panel| frame.contains(*panel))) {
-                        entry.active = old
-                            .shown()
-                            .and_then(|shown| entry.panels.iter().position(|panel| *panel == shown))
-                            .unwrap_or(old.active.min(entry.panels.len().saturating_sub(1)));
-                    }
-                }
-                *entries = result;
-            }
-            DockNode::Tabs { .. } => {}
-        }
-    }
-    let mut frames = Vec::new();
-    collect(original, &mut frames);
-    restore(node, &frames);
-}
-
-pub(crate) fn apply(layout: &mut Layout, action: Action<PanelKind>) -> Result<(), String> {
-    let mut shared = encode(&layout.root, &layout.floating)?;
-    // Validate the same shared command first. Native stack insertion then retains tabs inside
-    // their accordion frame, including the existing before/after insertion policy.
-    shared.apply(action.clone()).map_err(|error| error.to_string())?;
-    let mut proposed = decode(shared);
-    restore_frames(&mut proposed.root, &layout.root);
-    match action {
-        Action::Move { panel, anchor, placement } | Action::OpenAt { panel, anchor, placement } if layout.root.contains(anchor) => {
-            fn stacked(node: &DockNode, p: PanelKind) -> bool {
-                match node {
-                    DockNode::Split { a, b, .. } => stacked(a, p) || stacked(b, p),
-                    DockNode::Stack { entries } => entries.iter().any(|e| e.contains(p)),
-                    _ => false,
-                }
-            }
-            if stacked(&layout.root, anchor) {
-                let mut native = layout.clone();
-                native.unfloat(panel);
-                let applied = match placement {
-                    Placement::Tab { before } => native.root.insert_tab(panel, anchor, before),
-                    Placement::Split(zone) => native.root.dock_panel(
-                        panel,
-                        anchor,
-                        match zone {
-                            craft_ui::docking::Zone::Left => crate::dock::Zone::Left,
-                            craft_ui::docking::Zone::Right => crate::dock::Zone::Right,
-                            craft_ui::docking::Zone::Top => crate::dock::Zone::Top,
-                            craft_ui::docking::Zone::Bottom => crate::dock::Zone::Bottom,
-                            craft_ui::docking::Zone::Center => crate::dock::Zone::Center,
-                        },
-                    ),
-                };
-                if !applied {
-                    return Err("stacked panel move failed".into());
-                }
-                proposed = native;
-            }
-        }
-        Action::Activate { panel } => {
-            proposed.root.activate(panel);
-        }
-        Action::SetStackOpen { panel, open } => {
-            fn set(node: &mut DockNode, p: PanelKind, open: bool) {
-                match node {
-                    DockNode::Split { a, b, .. } => {
-                        set(a, p, open);
-                        set(b, p, open);
-                    }
-                    DockNode::Stack { entries } => {
-                        if let Some(e) = entries.iter_mut().find(|e| e.contains(p)) {
-                            e.open = open;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-            set(&mut proposed.root, panel, open);
-        }
-        Action::ResizeStack { panel, height } => {
-            fn set(node: &mut DockNode, p: PanelKind, h: Option<f32>) {
-                match node {
-                    DockNode::Split { a, b, .. } => {
-                        set(a, p, h);
-                        set(b, p, h);
-                    }
-                    DockNode::Stack { entries } => {
-                        if let Some(e) = entries.iter_mut().find(|e| e.contains(p)) {
-                            e.height = h;
-                        }
-                    }
-                    _ => {}
-                }
-            }
-            set(&mut proposed.root, panel, height);
-        }
-        _ => {}
-    }
-    encode(&proposed.root, &proposed.floating)?.validate().map_err(|error| error.to_string())?;
-    *layout = proposed;
-    Ok(())
-}
-
-pub(crate) fn apply_tree(root: &mut DockNode, action: Action<PanelKind>) -> bool {
-    if !valid_tree(root) {
-        return false;
-    }
-    let mut layout = Layout { root: root.clone(), floating: vec![] };
-    if apply(&mut layout, action).is_err() {
-        return false;
-    }
-    *root = layout.root;
-    true
-}
-
-pub(crate) fn valid_tree(root: &DockNode) -> bool {
-    encode(root, &[]).is_ok_and(|shared| shared.validate().is_ok())
-}
-
-pub(crate) fn valid_for_close(root: &DockNode) -> bool {
-    fn normalize(node: &mut Node<PanelKind>) {
-        match node {
-            Node::Tabs { panels, active } => *active = (*active).min(panels.len().saturating_sub(1)),
-            Node::Split { first, second, .. } => {
-                normalize(first);
-                normalize(second);
-            }
-            Node::Stack { .. } => {}
-        }
-    }
-    let Ok(mut shared) = encode(root, &[]) else { return false };
-    if let Some(root) = &mut shared.root {
-        normalize(root);
-    }
-    shared.validate().is_ok()
-}
-
-pub(crate) fn unfloat(layout: &mut Layout, panel: PanelKind) -> bool {
-    let Ok(mut shared) = encode(&layout.root, &layout.floating) else { return false };
-    let mut found = false;
-    for group in &mut shared.floating {
-        if group.panels.contains(&panel) {
-            group.active = group.active.min(group.panels.len().saturating_sub(1));
-            found = true;
-        }
-    }
-    if !found || shared.apply(Action::Close { panel }).is_err() {
-        return false;
-    }
-    let mut proposed = decode(shared);
-    restore_frames(&mut proposed.root, &layout.root);
-    *layout = proposed;
-    true
-}
-
-#[cfg(test)]
-mod stacked_frame_tests {
-    use super::*;
-    use crate::dock::Zone;
-    #[test]
-    fn stacked_tabs_survive_shared_resize_activate_float_and_close() {
-        let mut root = crate::dock::workspace("Default");
-        assert!(root.dock_panel(PanelKind::Info, PanelKind::Properties, Zone::Center));
-        fn group(node: &DockNode) -> Option<&StackEntry> {
-            match node {
-                DockNode::Split { a, b, .. } => group(a).or_else(|| group(b)),
-                DockNode::Stack { entries } => entries.iter().find(|e| e.contains(PanelKind::Properties)),
-                _ => None,
-            }
-        }
-        let before = group(&root).unwrap().clone();
-        assert!(before.contains(PanelKind::Info));
-        let mut layout = Layout { root, floating: vec![] };
-        layout.apply(Action::ResizeSplit { path: vec![], size: SharedSplitSize::Ratio(0.6) }).unwrap();
-        assert_eq!(group(&layout.root).unwrap(), &before);
-        layout.apply(Action::Activate { panel: PanelKind::Properties }).unwrap();
-        assert_eq!(group(&layout.root).unwrap().shown(), Some(PanelKind::Properties));
-        let original_frame = group(&layout.root).unwrap().clone();
-        layout.apply(Action::OpenAt { panel: PanelKind::History, anchor: PanelKind::Properties, placement: Placement::Tab { before: None } }).unwrap();
-        let opened = group(&layout.root).unwrap();
-        assert!(opened.contains(PanelKind::History));
-        assert!(opened.contains(PanelKind::Info));
-        assert_eq!(opened.shown(), Some(PanelKind::History));
-        assert_eq!(opened.height, original_frame.height);
-        layout.apply(Action::Close { panel: PanelKind::History }).unwrap();
-        layout.apply(Action::Float { panel: PanelKind::Info, rect: [20.0, 20.0, 300.0, 300.0] }).unwrap();
-        assert_eq!(group(&layout.root).unwrap().panels, vec![PanelKind::Properties]);
-        layout.apply(Action::Close { panel: PanelKind::Info }).unwrap();
-        assert!(layout.floating.is_empty());
-        assert_eq!(group(&layout.root).unwrap().panels, vec![PanelKind::Properties]);
-    }
-}
diff --git a/crates/ui-egui/src/dock_ui.rs b/crates/ui-egui/src/dock_ui.rs
index a92d376e9..30710392a 100644
--- a/crates/ui-egui/src/dock_ui.rs
+++ b/crates/ui-egui/src/dock_ui.rs
@@ -1,25 +1,310 @@
-//! The dock area: lays out the docked tree (or the maximized panel), draws each group's chrome
-//! and body, floating (undocked) panel groups over it, and tab drag-and-drop: drag a tab onto a
-//! group to tab it there (center) or split it off to a side (After Effects' drop zones, with a
-//! highlight of where it will land); hold Cmd/Ctrl when releasing, or drop outside every group,
-//! to float it. `` ` `` maximizes the panel under the pointer. A floating group can also move
-//! out of the main window into its own native window ([`EffectcraftApp::set_panel_window`]),
-//! which can sit on another monitor.
+//! EffectCraft's panels in craft-ui's shared docking. craft-ui draws the frames, tab strips,
+//! stacked panels, floating windows, dividers and drop previews and owns the gestures (drag a tab
+//! onto a group to tab it there or split it off to a side; hold Cmd/Ctrl at the release, or drop
+//! outside every group, to float it). EffectCraft draws the panel bodies, the ≡ panel menu, the
+//! Timeline's comp tabs and the viewer locks in each group header, and runs every layout change
+//! through its command path (`window.dockAction`), so pointer, menu and control-channel changes
+//! share one route.
 
-use egui::{Color32, Rect, Sense, Stroke, StrokeKind, pos2, vec2};
+use crate::state::UiState;
+use craft_ui::docking::{
+    Action, Divider, DockArea, DockCommand, DockContent, DockError, DockEvent, DockStyle, FloatSpace, Floating, Hit, Node, ResizeEdge, UiDock,
+};
+use egui::{Rect, Sense, Stroke, StrokeKind, pos2, vec2};
+use serde_json::{Value, json};
 
-use crate::dock::{self, DockAction, DockNode, Group, Layout, PanelKind, PanelWindow};
+use crate::dock::{self, DocAction, DocTab, PanelKind, Workspace, WorkspaceExt as _};
+use crate::icons::{self, Icon};
+use crate::theme::Tokens;
 use crate::{EffectcraftApp, panels};
-use craft_ui::docking::{Action, DropTarget, resolve_drop};
 
-fn drag_id() -> egui::Id {
-    egui::Id::new("dock-tab-drag")
+/// The dock area's egui id; `DockArea::hit_rects` and `float_space` read by it.
+pub fn area_id() -> egui::Id {
+    egui::Id::unique("effectcraft-docking")
+}
+
+/// Width of the ≡ panel menu button at the end of each tab strip.
+const MENU_W: f32 = 26.0;
+/// Width of the viewer lock before it.
+const LOCK_W: f32 = 18.0;
+
+/// The smallest and largest native panel window, in points.
+pub const PANEL_WINDOW_MIN: [f32; 2] = [160.0, 100.0];
+pub const PANEL_WINDOW_MAX: f32 = 16_384.0;
+/// The farthest a native panel window may sit from the desktop origin, in points.
+pub const PANEL_WINDOW_MAX_POS: f32 = 100_000.0;
+
+/// A native panel window's desktop rect made safe to hand to the windowing system: finite, with
+/// a size within [`PANEL_WINDOW_MIN`]..=[`PANEL_WINDOW_MAX`] and a position within
+/// ±[`PANEL_WINDOW_MAX_POS`] (hostile workspace files and bad monitor reports included).
+pub fn sanitized_window_rect(rect: [f32; 4]) -> [f32; 4] {
+    let finite = |v: f32, fallback: f32| if v.is_finite() { v } else { fallback };
+    let [x, y, w, h] = rect;
+    [
+        finite(x, 0.0).clamp(-PANEL_WINDOW_MAX_POS, PANEL_WINDOW_MAX_POS),
+        finite(y, 0.0).clamp(-PANEL_WINDOW_MAX_POS, PANEL_WINDOW_MAX_POS),
+        finite(w, 420.0).clamp(PANEL_WINDOW_MIN[0], PANEL_WINDOW_MAX),
+        finite(h, 320.0).clamp(PANEL_WINDOW_MIN[1], PANEL_WINDOW_MAX),
+    ]
+}
+
+/// How long to wait for the main window to report its frame before migrated native windows
+/// keep their places as they are, in seconds.
+const FRAME_REPORT_WAIT: f64 = 2.0;
+
+/// Moves the native rects of [`UiState::native_outer`]'s windows from the OS window's outer
+/// position to its content position, by the main window's frame offset (`inner` less `outer`,
+/// the main window's desktop rects): the earlier version's windows had the same OS title bar.
+/// Without a report by [`FRAME_REPORT_WAIT`] (a backend without window positions), the places
+/// stay as they are.
+pub(crate) fn native_outer_to_content(ui: &mut UiState, outer: Option<Rect>, inner: Option<Rect>, now: f64) {
+    let offset = match (outer, inner) {
+        (Some(outer), Some(inner)) if outer.min.is_finite() && inner.min.is_finite() => inner.min - outer.min,
+        _ if now < FRAME_REPORT_WAIT => return,
+        _ => egui::Vec2::ZERO,
+    };
+    let ids = std::mem::take(&mut ui.native_outer);
+    for window in ui.dock.layout.floating.iter_mut().filter(|w| ids.contains(&w.id)) {
+        if let Some([x, y, w, h]) = window.native {
+            window.native = Some(sanitized_window_rect([x + offset.x, y + offset.y, w, h]));
+        }
+    }
+}
+
+/// A new floating group's default rect near the centre of `screen`.
+pub fn default_float_rect(screen: Rect) -> [f32; 4] {
+    let c = screen.center();
+    [c.x - 210.0, c.y - 160.0, 420.0, 320.0]
+}
+
+/// A panel named by its title or id ("Effect Controls", "EffectControls") or its serialized
+/// form (`{"Viewer": 2}`).
+fn panel_param(value: &Value) -> Result<PanelKind, String> {
+    match value.as_str() {
+        Some(name) => PanelKind::from_name(name).ok_or(format!("unknown panel `{name}`")),
+        None => serde_json::from_value::<PanelKind>(value.clone()).map_err(|_| "unknown `panel`".to_string()),
+    }
+}
+
+/// The docking commands: `window.dockAction {action}`, craft-ui's `window.panel.*` commands,
+/// `ui.dock` and `ui.dock.reset`. `None` for any other id.
+pub(crate) fn route(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: &Value) -> Option<Result<Value, String>> {
+    match id {
+        "window.dockAction" => Some((|| {
+            let value = params.get("action").cloned().ok_or("missing docking action")?;
+            let action: Action<PanelKind> = serde_json::from_value(value).map_err(|error| format!("invalid docking action: {error}"))?;
+            if matches!(&action, Action::Open { .. } | Action::OpenAt { .. }) {
+                return Err("use the panel open commands to preserve viewer and ScriptUI lifecycle callbacks".into());
+            }
+            app.apply_dock(action)?;
+            Ok(Value::Null)
+        })()),
+        "ui.dock.reset" => {
+            let name = app.ui.workspace.clone();
+            app.set_workspace(&name);
+            Some(Ok(json!({"docking": app.ui.dock})))
+        }
+        "ui.dock" => Some((|| {
+            let mut tagged = if params.is_object() { params.clone() } else { json!({}) };
+            if let Some(fields) = tagged.as_object_mut() {
+                fields.insert("command".into(), json!("ui.dock"));
+            }
+            let command: DockCommand<PanelKind> = serde_json::from_value(tagged).map_err(|error| format!("invalid ui.dock params: {error}"))?;
+            app.run_dock_command(ctx, command)?;
+            Ok(json!({"docking": app.ui.dock}))
+        })()),
+        _ if id.starts_with("window.panel.") && DockCommand::<PanelKind>::IDS.contains(&id) => Some((|| {
+            let mut tagged = if params.is_object() { params.clone() } else { json!({}) };
+            if let Some(fields) = tagged.as_object_mut() {
+                fields.insert("command".into(), json!(id));
+                // EffectCraft's panel names ("Effect Controls") as well as craft-ui's ids.
+                for key in ["panel", "anchor", "before"] {
+                    if let Some(name) = fields.get(key).and_then(Value::as_str) {
+                        let panel = PanelKind::from_name(name).ok_or(format!("unknown panel `{name}`"))?;
+                        fields.insert(key.into(), json!(panel));
+                    }
+                }
+            }
+            let command: DockCommand<PanelKind> = serde_json::from_value(tagged).map_err(|error| format!("invalid docking command: {error}"))?;
+            app.run_dock_command(ctx, command)?;
+            Ok(Value::Null)
+        })()),
+        "window.panelWindow" => Some((|| {
+            let panel = panel_param(params.get("panel").ok_or("panelWindow: need `panel`")?).map_err(|e| format!("panelWindow: {e}"))?;
+            let window = match params.get("window") {
+                None | Some(Value::Null) => None,
+                Some(value) => Some(value.as_bool().ok_or("panelWindow: `window` must be true or false")?),
+            };
+            let window = app.set_panel_window(ctx, panel, window)?;
+            Ok(json!({"window": window}))
+        })()),
+        _ => None,
+    }
 }
 
 impl EffectcraftApp {
+    /// A layout action from the dock area or a menu, through the command path the control
+    /// channel uses.
     pub(crate) fn dock_command(&mut self, ctx: &egui::Context, action: Action<PanelKind>) -> Result<(), String> {
         let value = serde_json::to_value(action).map_err(|error| error.to_string())?;
-        crate::menus::invoke(self, ctx, "window.dockAction", serde_json::json!({"action": value})).map(|_| ())
+        crate::menus::invoke(self, ctx, "window.dockAction", json!({"action": value})).map(|_| ())
+    }
+
+    /// Run a craft-ui docking command on the current workspace, all or nothing. Named
+    /// workspaces and Reset are EffectCraft's own (`window.workspace`, `window.resetWorkspace`).
+    pub(crate) fn run_dock_command(&mut self, ctx: &egui::Context, command: DockCommand<PanelKind>) -> Result<(), String> {
+        if command.is_app_owned() {
+            if matches!(command, DockCommand::ResetWorkspace {}) {
+                let name = self.ui.workspace.clone();
+                self.set_workspace(&name);
+                return Ok(());
+            }
+            return Err("use the window.workspace commands for named workspaces".into());
+        }
+        // A closed panel opens through EffectCraft's own path, which puts it in its usual place
+        // and runs the viewer and ScriptUI lifecycles.
+        let shown = match &command {
+            DockCommand::Activate { panel } | DockCommand::UiDock(UiDock::Operation(craft_ui::docking::DockOperation::Open { panel })) => Some(*panel),
+            DockCommand::UiDock(UiDock::Operation(craft_ui::docking::DockOperation::Activate { panel })) => Some(*panel),
+            _ => None,
+        };
+        if let Some(panel) = shown.filter(|panel| !self.ui.dock.is_open(*panel)) {
+            self.show_panel(panel);
+            return Ok(());
+        }
+        let space = craft_ui::docking::float_space(ctx, area_id()).unwrap_or_else(|| FloatSpace::new(ctx.content_rect()));
+        match command.to_actions(&self.ui.dock, false, &space) {
+            Ok(actions) => self.apply_dock_all(actions),
+            // Showing a hidden panel at an edge, and Lock, change more than the layout.
+            Err(DockError::NotAllowed) => {
+                let mut workspace = self.ui.dock.clone();
+                let closed = command.apply(&mut workspace, false, &space, dock::permissions).map_err(|error| error.to_string())?;
+                self.commit_workspace(workspace, &closed, true);
+                Ok(())
+            }
+            Err(error) => Err(error.to_string()),
+        }
+    }
+
+    pub fn apply_dock(&mut self, action: Action<PanelKind>) -> Result<(), String> {
+        self.apply_dock_all(vec![action])
+    }
+
+    /// Apply `actions` all or none. No move or float may empty the docked tree, so a floating
+    /// panel always has somewhere to dock back to; closing the last docked panel stays allowed.
+    pub(crate) fn apply_dock_all(&mut self, actions: Vec<Action<PanelKind>>) -> Result<(), String> {
+        let mut workspace = self.ui.dock.clone();
+        let mut relocating = false;
+        let mut closed = Vec::new();
+        for action in actions {
+            relocating |= matches!(
+                &action,
+                Action::Move { .. }
+                    | Action::Float { .. }
+                    | Action::MoveGroup { .. }
+                    | Action::MoveWindow { .. }
+                    | Action::MovePanel { .. }
+                    | Action::MoveColumn { .. }
+            );
+            let closing = matches!(&action, Action::Close { .. } | Action::CloseGroup { .. } | Action::CloseWindow { .. } | Action::CloseOthers { .. });
+            let docked = workspace.layout.root.is_some();
+            closed.extend(workspace.apply(action, dock::permissions).map_err(|error| error.to_string())?);
+            if !closing && docked && workspace.layout.root.is_none() {
+                return Err("the last docked panel must remain in the workspace".into());
+            }
+        }
+        self.commit_workspace(workspace, &closed, relocating);
+        Ok(())
+    }
+
+    /// Take a changed workspace and release the state of the panels it closed: a ScriptUI
+    /// panel's script window closes (its onClose runs), a viewer forgets its comp.
+    fn commit_workspace(&mut self, workspace: Workspace, closed: &[PanelKind], relocating: bool) {
+        self.ui.dock = workspace;
+        for &p in closed {
+            if let PanelKind::ScriptPanel(id) = p
+                && self.session.script_ui.window(id).is_some()
+                && let Err(e) = self.session.execute("scriptui.close", json!({"window": id}))
+            {
+                self.ui.status = e.to_string();
+            }
+            panels::viewers::on_close(self, p);
+        }
+        if relocating || self.ui.maximized.is_some_and(|m| !self.ui.dock.is_docked(m)) {
+            self.ui.maximized = None;
+        }
+    }
+
+    /// Close a panel wherever it is (docked or floating). A rejected close changes nothing.
+    pub fn close_panel(&mut self, p: PanelKind) {
+        if self.ui.dock.is_open(p) {
+            let _ = self.apply_dock(Action::Close { panel: p });
+        }
+    }
+
+    /// Toggle the maximized panel (`p`, or none). Only a docked frame maximizes.
+    pub fn toggle_maximize(&mut self, p: PanelKind) {
+        self.ui.maximized = if self.ui.maximized == Some(p) || !self.ui.dock.is_docked(p) { None } else { Some(p) };
+    }
+
+    /// The panel whose body is under `pos` (from the last frame), else the focused one.
+    pub fn panel_at(&self, pos: Option<egui::Pos2>) -> PanelKind {
+        pos.and_then(|p| self.dock_rects.iter().rev().find(|(_, r)| r.contains(p)).map(|(k, _)| *k)).unwrap_or(self.ui.focused)
+    }
+
+    /// Whether panel `p` is in a floating window with a desktop place: its own OS window on
+    /// desktop (craft-ui `native-windows`); on the web and in embedded viewports the window
+    /// stays in the page and the place is kept for a desktop session.
+    pub fn in_panel_window(&self, p: PanelKind) -> bool {
+        self.ui.dock.layout.floating.iter().any(|w| w.contains(&p) && w.native.is_some())
+    }
+
+    /// Move panel `p` into a floating window of its own, which on desktop is an OS window that
+    /// can go on another monitor, or back into the main window (`window` false), where it joins
+    /// the first docked group. `None` toggles. A docked panel is undocked first, and its window
+    /// opens over the panel's place in the main window. Returns whether `p` is now in a window
+    /// of its own.
+    pub fn set_panel_window(&mut self, ctx: &egui::Context, p: PanelKind, window: Option<bool>) -> Result<bool, String> {
+        let current = self.in_panel_window(p);
+        let window = window.unwrap_or(!current);
+        if window == current {
+            return Ok(current);
+        }
+        if !window {
+            // On desktop every floating window is an OS window, so the way back is docking.
+            let anchor = self.ui.dock.layout.root.as_ref().and_then(|root| {
+                let mut panels = Vec::new();
+                dock::node_panels(root, &mut panels);
+                panels.into_iter().find(|panel| *panel != p)
+            });
+            let actions = match anchor {
+                Some(anchor) => vec![Action::Move { panel: p, anchor, placement: craft_ui::docking::Placement::Tab { before: None } }],
+                // Nothing is docked: the panel becomes the docked layout.
+                None => vec![Action::Close { panel: p }, Action::Open { panel: p, anchor: None }],
+            };
+            let mut workspace = self.ui.dock.clone();
+            // One transaction, so the panel is never reported closed and keeps its state.
+            let closed = workspace.apply_all(actions, dock::permissions).map_err(|_| format!("can't dock {}", p.title()))?;
+            self.commit_workspace(workspace, &closed, true);
+            return Ok(false);
+        }
+        if !self.ui.dock.is_floating(p) {
+            if !self.ui.dock.is_docked(p) {
+                return Err(format!("{} is not open", p.title()));
+            }
+            let rect = default_float_rect(ctx.input_for(egui::ViewportId::ROOT, |i| i.content_rect()));
+            self.apply_dock(Action::Float { panel: p, rect }).map_err(|_| format!("can't undock {}", p.title()))?;
+        }
+        let Some([x, y, w, h]) = self.ui.dock.layout.floating.iter().find(|f| f.contains(&p)).map(|f| f.rect) else {
+            return Err(format!("can't undock {}", p.title()));
+        };
+        let origin = ctx.input_for(egui::ViewportId::ROOT, |i| i.viewport().inner_rect.map(|r| r.min)).unwrap_or(pos2(0.0, 0.0));
+        let rect = sanitized_window_rect([origin.x + x, origin.y + y, w, h]);
+        self.apply_dock(Action::SetNative { panel: p, rect: Some(rect) })?;
+        if self.ui.maximized == Some(p) {
+            self.ui.maximized = None;
+        }
+        Ok(true)
     }
 
     /// Tab labels that name what the panel shows, as After Effects does: "Composition Intro",
@@ -41,126 +326,54 @@ impl EffectcraftApp {
         }
         let Some(comp) = self.session.active_comp() else { return out };
         if let Some(l) = self.session.state.selected_layers.first().and_then(|id| comp.layer(*id)) {
-            out.push((PanelKind::EffectControls, format!("Effect Controls {}", l.name)));
-            out.push((PanelKind::Properties, format!("Properties: {}", l.name)));
+            out.push((PanelKind::EffectControls, format!("{} {}", crate::i18n::command_label("window.panel", "Effect Controls"), l.name)));
+            out.push((PanelKind::Properties, format!("{}: {}", crate::i18n::command_label("window.panel", "Properties"), l.name)));
         }
         out
     }
 
     /// A comp's label colour as a tab swatch (faint without a label).
-    fn comp_swatch(&self, cid: effectcraft_engine::project::ItemId) -> Color32 {
+    fn comp_swatch(&self, cid: effectcraft_engine::project::ItemId) -> egui::Color32 {
         match self.session.project.item(cid).map(|i| i.label) {
             Some(l) if l != effectcraft_engine::color::Label::None => self.tokens.label(l),
             _ => self.tokens.text_faint,
         }
     }
 
-    /// The Timeline's tabs: one per open comp, as in After Effects (opening a precomp adds a tab
-    /// next to its parent's instead of replacing it).
-    fn tab_docs(&self) -> Vec<(PanelKind, Vec<dock::DocTab>)> {
+    /// The Timeline's comp tabs: one per open comp, as in After Effects (opening a precomp adds a
+    /// tab next to its parent's instead of replacing it).
+    fn tab_docs(&self) -> Vec<DocTab> {
         let st = &self.session.state;
-        let locked = self.ui.locked_tabs.contains(&PanelKind::Timeline.id());
-        let docs = st
-            .open_comps
+        st.open_comps
             .iter()
             .filter_map(|id| {
                 let it = self.session.project.item(*id).filter(|i| i.as_comp().is_some())?;
-                let deco = dock::TabDeco { swatch: self.comp_swatch(*id), locked, viewer: true };
-                Some(dock::DocTab { id: id.0, title: it.name.clone(), deco: Some(deco), active: st.active_comp == Some(*id) })
+                Some(DocTab { id: id.0, title: it.name.clone(), swatch: self.comp_swatch(*id), active: st.active_comp == Some(*id) })
             })
-            .collect();
-        vec![(PanelKind::Timeline, docs)]
+            .collect()
     }
 
-    /// The Composition and Timeline tabs' close button, label-colour swatch and viewer lock.
-    fn tab_decos(&self) -> Vec<(PanelKind, dock::TabDeco)> {
-        let Some(cid) = self.session.active_comp_id() else { return vec![] };
-        let swatch = self.comp_swatch(cid);
-        let mut v: Vec<(PanelKind, dock::TabDeco)> =
-            vec![(PanelKind::Timeline, dock::TabDeco { swatch, locked: self.ui.locked_tabs.contains(&PanelKind::Timeline.id()), viewer: true })];
-        // Every Composition viewer: its comp's swatch and its own lock.
+    /// The label-colour swatch before a tab's name: each Composition viewer's comp, and Effect
+    /// Controls' (and with Use Label Color for Related Tabs, Properties') selected layer.
+    fn tab_swatches(&self) -> Vec<(PanelKind, egui::Color32)> {
+        let mut v = Vec::new();
         for id in std::iter::once(0).chain(self.ui.viewers.keys().copied().filter(|v| *v != 0)) {
-            let p = panels::viewers::panel(id);
             let swatch = panels::viewers::comp_of(self, id).map_or(self.tokens.text_faint, |c| self.comp_swatch(c));
-            v.push((p, dock::TabDeco { swatch, locked: self.ui.locked_tabs.contains(&p.id()), viewer: true }));
+            v.push((panels::viewers::panel(id), swatch));
         }
-        // Effect Controls carries the selected layer's label colour.
         if let Some(l) = self.session.active_comp().and_then(|c| self.session.state.selected_layers.first().and_then(|id| c.layer(*id)))
             && l.label != effectcraft_engine::color::Label::None
         {
-            v.push((PanelKind::EffectControls, dock::TabDeco { swatch: self.tokens.label(l.label), locked: false, viewer: false }));
+            v.push((PanelKind::EffectControls, self.tokens.label(l.label)));
+            if self.session.prefs.appearance.use_label_color_for_tabs {
+                v.push((PanelKind::Properties, self.tokens.label(l.label)));
+            }
         }
         v
     }
 
-    /// Settings ▸ Appearance ▸ Use Label Color for Related Tabs: the Composition and Timeline
-    /// tabs carry their comp's label colour, Effect Controls and Properties the layer's.
-    fn label_tab_marks(&self, ui: &egui::Ui) {
-        if !self.session.prefs.appearance.use_label_color_for_tabs {
-            return;
-        }
-        let Some(cid) = self.session.active_comp_id() else { return };
-        let comp_label = self.session.project.item(cid).map(|i| i.label);
-        let layer_label = self.session.active_comp().and_then(|c| self.session.state.selected_layers.first().and_then(|l| c.layer(*l))).map(|l| l.label);
-        // (the Composition, Timeline and Effect Controls tabs carry their swatch already)
-        let _ = comp_label;
-        for (p, label) in [(PanelKind::Properties, layer_label)] {
-            let (Some(label), Some(e)) = (label, self.auto.find(&format!("panel.tab.{}", p.id()))) else { continue };
-            if label == effectcraft_engine::color::Label::None {
-                continue;
-            }
-            let r = Rect::from_min_size(pos2(e.rect[0] + 2.0, e.rect[1] + 9.0), vec2(4.0, (e.rect[3] - 16.0).max(6.0)));
-            ui.painter().rect_filled(r, 1.0, self.tokens.label(label));
-        }
-    }
-
-    /// Edit the full layout (docked tree + floating groups) with a [`Layout`] operation.
-    pub fn edit_layout(&mut self, f: impl FnOnce(&mut Layout) -> bool) -> bool {
-        let Ok(shared) = crate::dock_shared::encode(&self.ui.dock, &self.ui.floating) else { return false };
-        if shared.validate().is_err() {
-            return false;
-        }
-        let mut l = Layout { root: self.ui.dock.clone(), floating: self.ui.floating.clone() };
-        if !f(&mut l) {
-            return false;
-        }
-        self.ui.dock = l.root;
-        self.ui.floating = l.floating;
-        if self.ui.maximized.is_some_and(|m| !self.ui.dock.contains(m)) {
-            self.ui.maximized = None;
-        }
-        true
-    }
-
-    /// Close a panel wherever it is (docked or floating).
-    pub fn close_panel(&mut self, p: PanelKind) {
-        // Commit the layout first: rejected closes must not release viewer or script state.
-        if !self.edit_layout(|layout| layout.apply(Action::Close { panel: p }).is_ok()) {
-            return;
-        }
-        // Closing a ScriptUI panel closes its script window (its script's onClose runs).
-        if let PanelKind::ScriptPanel(id) = p
-            && self.session.script_ui.window(id).is_some()
-            && let Err(e) = self.session.execute("scriptui.close", serde_json::json!({"window": id}))
-        {
-            self.ui.status = e.to_string();
-        }
-        panels::viewers::on_close(self, p);
-        if self.ui.maximized == Some(p) {
-            self.ui.maximized = None;
-        }
-    }
-
-    /// Toggle the maximized panel (`p`, or none).
-    pub fn toggle_maximize(&mut self, p: PanelKind) {
-        self.ui.maximized = if self.ui.maximized == Some(p) || !self.ui.dock.contains(p) { None } else { Some(p) };
-    }
-
-    /// The docked panel whose group is under `pos` (from the last frame), else the focused one.
-    pub fn panel_at(&self, pos: Option<egui::Pos2>) -> PanelKind {
-        pos.and_then(|p| self.dock_rects.iter().rev().find(|(_, r)| r.contains(p)).map(|(k, _)| *k)).unwrap_or(self.ui.focused)
-    }
-
+    /// Draw panel `p`'s body in `rect`: register its automation region, put the Composition Navigator above an active
+    /// viewer when a nested-comp flow exists, then call the panel's `show` and (for a viewer) the sketch overlay.
     fn panel_body(&mut self, ui: &mut egui::Ui, p: PanelKind, rect: Rect) {
         self.auto.add(&format!("panel.{}", p.id()), rect, p.title());
         let mut content = rect.shrink(1.0);
@@ -183,9 +396,34 @@ impl EffectcraftApp {
         }
     }
 
+    /// A press in a panel (its body, tab or group header) focuses it; another Composition viewer
+    /// also becomes the active one.
+    fn focus_panel(&mut self, ctx: &egui::Context, p: PanelKind) {
+        self.ui.focused = p;
+        panels::viewer_text::panel_clicked(self, ctx, p);
+        if let Some(id) = panels::viewers::id_of(p) {
+            panels::viewers::activate(self, ctx, id);
+        }
+    }
+
+    /// Whether floating panels' OS windows take no input: a dialog of the app's own or a
+    /// command's OS file dialog is up. egui's `Modal` blocks only the window it is in.
+    pub(crate) fn floats_blocked(&mut self, ctx: &egui::Context) -> bool {
+        let (focused, now) = ctx.input(|i| (i.focused || i.raw.viewports.values().any(|v| v.focused == Some(true)), i.time));
+        let file_dialog = self.file_dialogs.up(focused, now);
+        self.dialog.is_some() || panels::dialogs::modal_open(ctx) || file_dialog
+    }
+
+    /// Draw the Home screen or workspace in `body`. Shared craft-ui docking owns the dock tree,
+    /// group chrome, tab dragging and floating native windows; this adapter draws panel bodies,
+    /// applies the returned events/actions and shows the panel menu.
     pub(crate) fn dock_area(&mut self, ui: &mut egui::Ui, body: Rect) {
         let t = self.tokens;
         let ctx = ui.ctx().clone();
+        if !self.ui.native_outer.is_empty() {
+            let (outer, inner, now) = ctx.input_for(egui::ViewportId::ROOT, |i| (i.viewport().outer_rect, i.viewport().inner_rect, i.time));
+            native_outer_to_content(&mut self.ui, outer, inner, now);
+        }
         if self.ui.start_screen {
             // Home covers the whole workspace, as in After Effects (the panels wait behind it).
             let mut child = ui.new_child(egui::UiBuilder::new().max_rect(body).id_salt("home"));
@@ -193,454 +431,422 @@ impl EffectcraftApp {
             panels::home::show(self, &mut child, body);
             return;
         }
-        // The maximized panel fills the area; the tree is kept as it is.
-        let maximized = self.ui.maximized.filter(|m| self.ui.dock.contains(*m));
-        let mut dock = match maximized {
-            Some(m) => DockNode::Tabs { panels: vec![m], active: 0 },
-            None => std::mem::replace(&mut self.ui.dock, DockNode::Tabs { panels: vec![], active: 0 }),
-        };
-        let mut groups = Vec::new();
-        let mut layout_actions = Vec::new();
-        dock::layout_with_actions(ui, &mut dock, body, &t, "", &mut groups, &mut self.auto, &mut layout_actions);
-        let mut actions = Vec::new();
-        let titles = self.tab_titles();
-        let decos = self.tab_decos();
+        let style = dock_style(ui, &t);
+        let maximized = self.ui.maximized.filter(|m| self.ui.dock.is_docked(*m));
+        let mut area = DockArea::new(area_id()).float_bounds(body).maximized(maximized).locked(self.ui.dock.locked).input_blocked(self.floats_blocked(&ctx));
+        if let Some(panel) = self.pending_panel_raise.take() {
+            area = area.raise_panel(panel);
+        }
+        let layout = self.ui.dock.layout.clone();
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(body).id_salt("effectcraft-dock-area"));
+        child.set_clip_rect(body.intersect(ui.clip_rect()));
         let docs = self.tab_docs();
-        let title = |p: PanelKind| titles.iter().find(|(k, _)| *k == p).map(|(_, s)| s.clone()).unwrap_or_else(|| p.title().to_string());
-        let info = dock::TabInfo { title: &title, decos: &decos, docs: &docs };
-        // Where each group's tabs are (tab drags show where a tab will land between them).
-        let mut tab_rects: Vec<(String, Vec<(PanelKind, Rect)>)> = vec![];
-        for g in &groups {
-            let c = dock::draw_group_chrome(ui, g, &t, &mut self.auto, &info);
-            actions.extend(c.actions);
-            tab_rects.push((g.path.clone(), c.tabs));
+        let ime = NativeIme::new(&layout.floating, &self.unpublished_viewports);
+        let mut content = EffectContent {
+            titles: self.tab_titles(),
+            swatches: self.tab_swatches(),
+            docs,
+            ctx: ctx.clone(),
+            style: style.clone(),
+            app: self,
+            tokens: t,
+            doc_actions: Vec::new(),
+            locks: Vec::new(),
+            menu: None,
+            bodies: Vec::new(),
+            ime,
+        };
+        let mut output = area.show_content(&mut child, &layout, &style, &mut content);
+        let EffectContent { doc_actions, locks, menu, bodies, ime, .. } = content;
+        self.dock_rects = bodies;
+        self.unpublished_viewports = ime.unpublished();
+        // A window that closed or docked takes its composition with it.
+        let previous = std::mem::replace(&mut self.native_viewports, ime.begun());
+        let gone: Vec<_> = previous.into_iter().filter(|v| !self.native_viewports.contains(v)).collect();
+        for viewport in gone {
+            panels::viewer_text::end_viewport(self, &ctx, viewport);
         }
-        self.label_tab_marks(ui);
-        if maximized.is_none() {
-            self.ui.dock = dock;
+        self.forward_window_input(&ctx, std::mem::take(&mut output.forwarded_events), std::mem::take(&mut output.window_files));
+        if let Some(panel) = output.focused {
+            self.focus_panel(&ctx, panel);
         }
-        self.dock_rects = groups.iter().filter_map(|g| Some((*g.panels.get(g.active)?, g.rect))).collect();
-        for g in &groups {
-            let Some(p) = g.panels.get(g.active).copied() else { continue };
-            if g.content.height() < 2.0 {
-                continue; // a collapsed stacked panel: header only
-            }
-            self.panel_body(ui, p, g.content);
+        if let Some(error) = output.error {
+            self.ui.status = error.to_string();
         }
-        for g in &groups {
-            if g.panels.get(g.active) == Some(&self.ui.focused) {
-                ui.painter().rect_stroke(g.rect, 0.0, Stroke::new(1.0, t.focus), StrokeKind::Inside);
+        for event in output.events {
+            if let DockEvent::ToggleMaximize { panel } = event {
+                self.toggle_maximize(panel);
             }
         }
-        // Floating groups over the dock.
-        let mut float_groups: Vec<Group> = vec![];
-        let layers = ctx.memory(|memory| memory.layer_ids().collect::<Vec<_>>());
-        let mut floating_order: Vec<_> = (0..self.ui.floating.len()).collect();
-        floating_order.sort_by_key(|index| {
-            self.ui
-                .floating
-                .get(*index)
-                .and_then(|group| group.panels.first())
-                .and_then(|panel| {
-                    let id = egui::Id::new(("floating-panel", panel.id()));
-                    layers.iter().position(|layer| layer.id == id)
-                })
-                .unwrap_or(usize::MAX)
-        });
-        // A native window is kept only for a panel that still floats.
-        let ui_state = &mut self.ui;
-        ui_state.panel_windows.retain(|w| ui_state.floating.iter().any(|group| group.panels.contains(&w.panel)));
-        for i in floating_order {
-            // Groups in their own native window take no tab drops from the main window.
-            if let Some(window) = self.ui.floating.get(i).and_then(|group| self.panel_window_of(&group.panels)) {
-                self.panel_window(&ctx, i, window, &info, &mut actions);
-                continue;
-            }
-            if let Some((g, tabs)) = self.floating_window(&ctx, i, &info, &mut actions) {
-                tab_rects.push((g.path.clone(), tabs));
-                float_groups.push(g);
+        for action in output.actions {
+            if let Err(error) = self.dock_command(&ctx, action) {
+                self.ui.status = error;
             }
         }
-        for action in layout_actions {
-            let _ = self.dock_command(&ctx, action);
+        for p in locks {
+            if !self.ui.locked_tabs.remove(&p.id()) {
+                self.ui.locked_tabs.insert(p.id().to_string());
+            }
         }
-        for a in actions {
-            match a {
-                DockAction::Activate(p) => {
-                    let _ = self.dock_command(&ctx, Action::Activate { panel: p });
-                }
-                DockAction::ToggleStacked(p) => {
-                    let _ = self.dock_command(&ctx, Action::SetStackOpen { panel: p, open: !self.ui.dock.is_visible(p) });
-                }
-                DockAction::Focus(p) => {
-                    self.ui.focused = p;
-                    panels::viewer_text::panel_clicked(self, &ctx, p);
-                    // A click in (or on the tab of) another Composition viewer makes it active.
-                    if let Some(id) = panels::viewers::id_of(p) {
-                        panels::viewers::activate(self, &ctx, id);
-                    }
-                }
-                DockAction::Close(p) => {
-                    let _ = self.dock_command(&ctx, Action::Close { panel: p });
-                }
-                DockAction::PanelMenu(p, pos) => {
-                    ctx.data_mut(|d| d.insert_temp(egui::Id::new("panel-menu"), (p, pos)));
-                }
-                DockAction::BeginDrag(p) => ctx.data_mut(|d| {
-                    d.insert_temp(drag_id(), p);
-                }),
-                DockAction::ToggleLock(p) => {
-                    if !self.ui.locked_tabs.remove(&p.id()) {
-                        self.ui.locked_tabs.insert(p.id().to_string());
-                    }
-                }
+        for action in doc_actions {
+            let result = match action {
                 // The Timeline's comp tabs: show that comp / close its Timeline.
-                DockAction::ActivateDoc(p, id) => {
-                    let _ = self.dock_command(&ctx, Action::Activate { panel: p });
-                    if self.session.state.active_comp.map(|c| c.0) != Some(id) {
-                        let _ = crate::menus::invoke(self, &ctx, "comp.open", serde_json::json!({"comp": id}));
+                DocAction::Activate(id) => {
+                    let _ = self.apply_dock(Action::Activate { panel: PanelKind::Timeline });
+                    self.focus_panel(&ctx, PanelKind::Timeline);
+                    if self.session.state.active_comp.map(|c| c.0) == Some(id) {
+                        Ok(Value::Null)
+                    } else {
+                        crate::menus::invoke(self, &ctx, "comp.open", json!({"comp": id}))
                     }
                 }
-                DockAction::CloseDoc(_, id) => {
-                    let _ = crate::menus::invoke(self, &ctx, "comp.close", serde_json::json!({"comp": id}));
-                }
+                DocAction::Close(id) => crate::menus::invoke(self, &ctx, "comp.close", json!({"comp": id})),
+            };
+            if let Err(error) = result {
+                self.ui.status = error;
             }
         }
-        self.tab_drag(&ctx, &groups, &float_groups, &tab_rects);
+        if let Some((panel, pos)) = menu {
+            ctx.data_mut(|d| d.insert_temp(egui::Id::unique("panel-menu"), (panel, pos)));
+        }
+        let hits = DockArea::<PanelKind>::hit_rects(&ctx, area_id());
+        self.register_dock_hits(&hits);
         panels::panel_menu_popup(self, ui);
     }
 
-    /// One floating group: a window with a tab strip (drag the empty strip to move it, the
-    /// corner to resize it) and the active panel's body.
-    fn floating_window(
-        &mut self,
-        ctx: &egui::Context,
-        i: usize,
-        info: &dock::TabInfo,
-        actions: &mut Vec<DockAction>,
-    ) -> Option<(Group, Vec<(PanelKind, Rect)>)> {
-        let t = self.tokens;
-        let f = self.ui.floating.get(i)?.clone();
-        let screen = ctx.content_rect();
-        let mut rect = Rect::from_min_size(pos2(f.rect[0], f.rect[1]), vec2(f.rect[2].max(160.0), f.rect[3].max(100.0)));
-        // Keep the strip reachable.
-        rect = rect.translate(vec2(
-            (screen.min.x - rect.min.x).max(0.0) + (screen.max.x - 40.0 - rect.min.x).min(0.0),
-            (screen.min.y - rect.min.y).max(0.0) + (screen.max.y - 30.0 - rect.min.y).min(0.0),
-        ));
-        let id = egui::Id::new(("floating-panel", f.panels.first().map(|p| p.id()).unwrap_or_default()));
-        let mut group = None;
-        // Not constrained to the window: the group is drawn where its rect says (the clamp above
-        // keeps its strip reachable), so it follows the pointer past the window's edges.
-        egui::Area::new(id).order(egui::Order::Middle).fixed_pos(rect.min).constrain(false).interactable(true).show(ctx, |ui| {
-            let (r, _) = ui.allocate_exact_size(rect.size(), Sense::hover());
-            ui.painter().rect_filled(r.expand(1.0), t.radius, Color32::from_black_alpha(90));
-            let strip = Rect::from_min_size(r.min, vec2(r.width(), t.tab_h));
-            // Move by the strip (tabs, registered later, take precedence over it).
-            // (`id.with("move")` is the id of the `Area`'s own background widget.)
-            let mv = ui.interact(strip, id.with("strip"), Sense::drag());
-            self.auto.add(&format!("panel.float.{i}.move"), strip, "Move floating panel");
-            let mut nr = r;
-            if mv.dragged() {
-                nr = nr.translate(mv.drag_delta());
-            }
-            let g = Group {
-                path: format!("f{i}"),
-                rect: r,
-                content: Rect::from_min_max(pos2(r.min.x, r.min.y + t.tab_h), r.max),
-                panels: f.panels.clone(),
-                active: f.active.min(f.panels.len().saturating_sub(1)),
-                stacked: None,
+    /// Keys and dropped files that reach a floating panel's own OS window go to the main
+    /// window's next frame ([`crate::EffectcraftApp::raw_input_hook`]), so its shortcuts and
+    /// file import handle them. Text is not forwarded, and nothing is while a text field in
+    /// the main window has the keyboard.
+    fn forward_window_input(&mut self, ctx: &egui::Context, events: Vec<egui::Event>, files: Vec<craft_ui::docking::WindowFiles<PanelKind>>) {
+        let typing = ctx.egui_wants_keyboard_input();
+        let events = events.into_iter().filter(|event| !typing && !matches!(event, egui::Event::Text(_) | egui::Event::Ime(_)));
+        self.forwarded.events.extend(events);
+        self.forwarded.files.extend(files.into_iter().flat_map(|window| window.dropped));
+        if !self.forwarded.events.is_empty() || !self.forwarded.files.is_empty() {
+            ctx.request_repaint();
+        }
+    }
+
+    /// Automation ids for craft-ui's gesture sources: `panel.tab.<Panel>`, `panel.drag.<Panel>`
+    /// (the group's drag bar), `panel.border.<Panel>` (the top border above its tabs),
+    /// `panel.tabs.more.<Panel>`, `panel.header.<Panel>` (a stacked panel's open/close button),
+    /// `panel.float.<n>.move`, `.close`, `.resize` (bottom-right
+    /// corner) and `.resize.<Edge>`, `dock.gutter.<path>` (`a`/`b` per split level; a stack's gap
+    /// below entry `i` adds `s<i>`), `dock.corner.<outer>.<inner>` where two dividers meet, and
+    /// the same inside floating window `n` as `panel.float.<n>.gutter.…` and `.corner.…`.
+    fn register_dock_hits(&mut self, hits: &[(Hit<PanelKind>, Rect)]) {
+        let window = |panel: &PanelKind| self.ui.dock.layout.floating.iter().position(|window| window.contains(panel));
+        // Tabs are labelled as drawn: "Composition Intro", not "Composition".
+        let titles = self.tab_titles();
+        let title = |panel: &PanelKind| titles.iter().find(|(p, _)| p == panel).map_or_else(|| panel.title().to_string(), |(_, t)| t.clone());
+        let mut found = Vec::new();
+        for (hit, rect) in hits {
+            let entry = match hit {
+                Hit::Tab(panel) => (format!("panel.tab.{}", panel.id()), title(panel)),
+                Hit::DragBar(panel) => (format!("panel.drag.{}", panel.id()), "Move panel group".into()),
+                Hit::Border(panel) => (format!("panel.border.{}", panel.id()), "Move panel group".into()),
+                Hit::Overflow(panel) => (format!("panel.tabs.more.{}", panel.id()), "More tabs".into()),
+                Hit::StackToggle(panel) => (format!("panel.header.{}", panel.id()), title(panel)),
+                Hit::Title(panel) => match window(panel) {
+                    Some(index) => (format!("panel.float.{index}.move"), "Move floating panel".into()),
+                    None => continue,
+                },
+                Hit::Close(panel) => match window(panel) {
+                    Some(index) => (format!("panel.float.{index}.close"), "Close floating panel".into()),
+                    None => continue,
+                },
+                Hit::Resize(panel, edge) => match window(panel) {
+                    Some(index) if *edge == ResizeEdge::BottomRight => (format!("panel.float.{index}.resize"), "Resize floating panel".into()),
+                    Some(index) => (format!("panel.float.{index}.resize.{edge:?}"), "Resize floating panel".into()),
+                    None => continue,
+                },
+                Hit::Divider(Divider::Split(path)) => (format!("dock.gutter.{}", path_id(path)), "gutter".into()),
+                Hit::Divider(Divider::Stack(panel)) => match dock::stack_gutter_id(&self.ui.dock.layout, *panel) {
+                    Some(id) => (id, "gutter".into()),
+                    None => continue,
+                },
+                Hit::Divider(Divider::Intersection(outer, inner)) => (format!("dock.corner.{}.{}", path_id(outer), path_id(inner)), "gutter corner".into()),
+                Hit::Divider(Divider::WindowSplit(panel, path)) => match window(panel) {
+                    Some(index) => (format!("panel.float.{index}.gutter.{}", path_id(path)), "gutter".into()),
+                    None => continue,
+                },
+                Hit::Divider(Divider::WindowIntersection(panel, outer, inner)) => match window(panel) {
+                    Some(index) => (format!("panel.float.{index}.corner.{}.{}", path_id(outer), path_id(inner)), "gutter corner".into()),
+                    None => continue,
+                },
+                _ => continue,
             };
-            let c = dock::draw_group_chrome(ui, &g, &t, &mut self.auto, info);
-            actions.extend(c.actions);
-            if let Some(p) = g.panels.get(g.active).copied() {
-                self.panel_body(ui, p, g.content);
-            }
-            ui.painter().rect_stroke(r, t.radius, Stroke::new(1.0, t.field_border), StrokeKind::Outside);
-            if g.panels.get(g.active) == Some(&self.ui.focused) {
-                ui.painter().rect_stroke(r, t.radius, Stroke::new(1.0, t.focus), StrokeKind::Inside);
-            }
-            // Resize from the corner.
-            let grip = Rect::from_min_max(r.max - vec2(14.0, 14.0), r.max);
-            let rs = ui.interact(grip, id.with("resize"), Sense::click_and_drag());
-            rs.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, rs.enabled(), crate::i18n::tr("Resize floating panel")));
-            self.auto.add_response(&format!("panel.float.{i}.resize"), &rs, "Resize floating panel");
-            for k in 0..3 {
-                let o = 4.0 + k as f32 * 4.0;
-                ui.painter().line_segment([pos2(r.max.x - o, r.max.y - 2.0), pos2(r.max.x - 2.0, r.max.y - o)], Stroke::new(1.0, t.text_faint));
-            }
-            if rs.hovered() || rs.dragged() {
-                ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeNwSe);
-            }
-            let delta = floating_resize_delta(ui, &rs);
-            if rs.has_focus() {
-                ui.painter().rect_stroke(grip, 2.0, Stroke::new(1.5, t.focus), StrokeKind::Inside);
-            }
-            if delta != egui::Vec2::ZERO {
-                nr = Rect::from_min_size(nr.min, (nr.size() + delta).max(vec2(160.0, 100.0)));
-            }
-            if nr != r
-                && let Some(panel) = f.panels.first().copied()
-            {
-                let _ = self.dock_command(ctx, Action::MoveFloating { panel, rect: [nr.min.x, nr.min.y, nr.width(), nr.height()] });
-            }
-            group = Some((g, c.tabs));
-        });
-        group
-    }
-
-    /// The native window a floating group (its `panels`) shows in, if any.
-    pub(crate) fn panel_window_of(&self, panels: &[PanelKind]) -> Option<PanelWindow> {
-        self.ui.panel_windows.iter().find(|w| panels.contains(&w.panel)).copied()
-    }
-
-    /// Whether panel `p` shows in its own native window.
-    pub fn in_panel_window(&self, p: PanelKind) -> bool {
-        self.ui.floating.iter().any(|group| group.panels.contains(&p) && self.panel_window_of(&group.panels).is_some())
-    }
-
-    /// The viewport panel `p` is drawn in: its native window's, or the main window's (also when
-    /// the platform embeds viewports, as the browser build does).
-    pub(crate) fn panel_viewport(&self, ctx: &egui::Context, p: PanelKind) -> egui::ViewportId {
-        if ctx.embed_viewports() {
-            return egui::ViewportId::ROOT;
+            found.push((entry, *rect, DockArea::hit_id(area_id(), hit)));
         }
-        self.ui
-            .floating
+        // The widget id lets keyboard focus on a divider or grip map to its element.
+        for ((id, label), rect, widget) in found {
+            self.auto.add(&id, rect, &label);
+            if let Some(element) = self.auto.elements.last_mut() {
+                element.response_id = Some(widget);
+            }
+        }
+    }
+}
+
+/// A split path as `a`/`b` per level (first/second child).
+fn path_id(path: &[bool]) -> String {
+    path.iter().map(|second| if *second { 'b' } else { 'a' }).collect()
+}
+
+/// After Effects' window is all frames: drops on all four window edges, Ctrl/Cmd-drag undocks,
+/// a release over no target floats, and a floating window's title bar only moves it.
+fn dock_style(ui: &egui::Ui, t: &Tokens) -> DockStyle {
+    let mut style = DockStyle::from_ui(ui);
+    style.side_edge_zones = true;
+    style.new_dock_zones = false;
+    style.maximize_item = true;
+    style.close_others_item = true;
+    style.command_press_floats = true;
+    style.float_on_empty_drop = true;
+    style.title_bar_docks = false;
+    style.float_hint = true;
+    style.wheel_selects_tabs = true;
+    style.middle_click_closes_tabs = true;
+    style.float_label = "Undock Panel".into();
+    style.float_group_label = "Undock Frame".into();
+    style.close_group_label = "Close Frame".into();
+    style.tab_height = t.tab_h;
+    style.gap = t.gap;
+    style.background = t.panel_bg;
+    style.tab_background = t.panel_bg;
+    style.active_background = t.panel_bg;
+    style.floating_background = t.panel_bg;
+    style.text = t.tab_text_active;
+    style.inactive_text = t.tab_text;
+    style.accent = t.focus;
+    style.font = Tokens::ui(12.0);
+    style
+}
+
+/// Panels with a viewer lock: the Composition viewers and the Timeline keep their comp while
+/// locked.
+fn has_lock(panel: PanelKind) -> bool {
+    matches!(panel, PanelKind::Composition | PanelKind::Viewer(_) | PanelKind::Timeline)
+}
+
+/// EffectCraft's side of the dock area for one frame.
+struct EffectContent<'a> {
+    app: &'a mut EffectcraftApp,
+    tokens: Tokens,
+    titles: Vec<(PanelKind, String)>,
+    swatches: Vec<(PanelKind, egui::Color32)>,
+    docs: Vec<DocTab>,
+    /// Measures the comp tabs for their width in the tab row.
+    ctx: egui::Context,
+    style: DockStyle,
+    doc_actions: Vec<DocAction>,
+    /// Viewer locks clicked.
+    locks: Vec<PanelKind>,
+    /// The ≡ button clicked: its panel and where its menu opens.
+    menu: Option<(PanelKind, egui::Pos2)>,
+    /// Where each panel body was drawn, in drawing order (floating windows last).
+    bodies: Vec<(PanelKind, Rect)>,
+    /// Where each native window's IME descriptor is set up and published.
+    ime: NativeIme,
+}
+
+/// Which body of a native floating window publishes its IME descriptor.
+///
+/// Each OS window is an egui pass of its own. `viewer_text::finish_ime` publishes what the pass's
+/// text editor recorded, and with nothing recorded it clears the composition and the preedit. A
+/// window with another group before the Viewer that published after every body would clear the
+/// preedit before the Viewer drew, and the Viewer's publication would then be a new context that
+/// interrupts the composition, every pass. So a window publishes after the body in which its
+/// editor has recorded its geometry and after its last body.
+pub(crate) struct NativeIme {
+    /// The bodies each native window draws this pass, as its layout says.
+    expected: Vec<(egui::ViewportId, usize)>,
+    /// The bodies each native window has drawn so far, in the order the windows began.
+    drawn: Vec<(egui::ViewportId, usize)>,
+    /// Windows that published this pass.
+    published: Vec<egui::ViewportId>,
+}
+
+impl NativeIme {
+    /// `unpublished` are the windows that drew last pass but never published: the layout's count
+    /// was too high for them, so they publish after every body this pass.
+    pub(crate) fn new(floating: &[Floating<PanelKind>], unpublished: &[egui::ViewportId]) -> Self {
+        let expected = floating
             .iter()
-            .find(|group| group.panels.contains(&p))
-            .and_then(|group| self.panel_window_of(&group.panels))
-            .map_or(egui::ViewportId::ROOT, |w| panel_window_id(w.panel))
-    }
-
-    /// Move panel `p` (and the floating group it is in) into its own native window, which can be
-    /// placed on another monitor, or back into the main window (`window` false; it floats there
-    /// where it was before). `None` toggles. A docked panel is undocked first. The window opens
-    /// over the place the panel had in the main window. Returns whether `p` is now in a window.
-    pub fn set_panel_window(&mut self, ctx: &egui::Context, p: PanelKind, window: Option<bool>) -> Result<bool, String> {
-        let group_of = |app: &Self| app.ui.floating.iter().find(|group| group.panels.contains(&p)).map(|group| (group.panels.clone(), group.rect));
-        let current = self.in_panel_window(p);
-        let window = window.unwrap_or(!current);
-        if window == current {
-            return Ok(current);
-        }
-        if !window {
-            if let Some((panels, _)) = group_of(self) {
-                self.ui.panel_windows.retain(|w| !panels.contains(&w.panel));
-            }
-            return Ok(false);
-        }
-        if group_of(self).is_none() {
-            if !self.ui.dock.contains(p) {
-                return Err(format!("{} is not open", p.title()));
-            }
-            let rect = default_float_rect(ctx.input_for(egui::ViewportId::ROOT, |i| i.content_rect()));
-            if !self.edit_layout(|layout| layout.float(p, rect)) {
-                return Err(format!("can't undock {}", p.title()));
-            }
-        }
-        let Some((_, [x, y, w, h])) = group_of(self) else { return Err(format!("can't undock {}", p.title())) };
-        // Over the panel's place in the main window (its content's position on the desktop).
-        let origin = ctx.input_for(egui::ViewportId::ROOT, |i| i.viewport().inner_rect.map(|r| r.min)).unwrap_or(pos2(0.0, 0.0));
-        let rect = PanelWindow::sanitized([origin.x + x, origin.y + y, w, h]);
-        ctx.data_mut(|d| d.remove::<[f32; 4]>(panel_window_spawn_id(p)));
-        self.ui.panel_windows.push(PanelWindow { panel: p, rect });
-        if self.ui.maximized == Some(p) {
-            self.ui.maximized = None;
-        }
-        Ok(true)
-    }
-
-    /// One floating group in its own native window: the group's tab strip and active panel fill
-    /// the window. Closing the window brings the group back into the main window.
-    fn panel_window(&mut self, ctx: &egui::Context, i: usize, window: PanelWindow, info: &dock::TabInfo, actions: &mut Vec<DockAction>) {
-        let t = self.tokens;
-        let Some(f) = self.ui.floating.get(i).cloned() else { return };
-        let active = f.active.min(f.panels.len().saturating_sub(1));
-        let Some(shown) = f.panels.get(active).copied() else { return };
-        // The window opens at its saved place; after that the window system owns its position and
-        // size (handing them back every frame would fight the user dragging it).
-        let spawn_id = panel_window_spawn_id(window.panel);
-        let spawn = ctx.data_mut(|d| *d.get_temp_mut_or_insert_with(spawn_id, || PanelWindow::sanitized(window.rect)));
-        let builder = egui::ViewportBuilder::default()
-            .with_title((info.title)(shown))
-            .with_position([spawn[0], spawn[1]])
-            .with_inner_size([spawn[2], spawn[3]])
-            .with_min_inner_size(dock::PANEL_WINDOW_MIN);
-        let mut closed = false;
-        let mut placed = None;
-        ctx.show_viewport_immediate(panel_window_id(window.panel), builder, |ui, class| {
-            let native = matches!(class, egui::ViewportClass::Immediate | egui::ViewportClass::Deferred);
-            egui::CentralPanel::default().frame(egui::Frame::NONE.fill(t.panel_bg)).show(ui, |ui| {
-                let r = ui.max_rect();
-                let g = Group {
-                    path: format!("w{i}"),
-                    rect: r,
-                    content: Rect::from_min_max(pos2(r.min.x, (r.min.y + t.tab_h).min(r.max.y)), r.max),
-                    panels: f.panels.clone(),
-                    active,
-                    stacked: None,
-                };
-                let c = dock::draw_group_chrome(ui, &g, &t, &mut self.auto, info);
-                // Tabs can't be dragged between native windows yet.
-                actions.extend(c.actions.into_iter().filter(|a| !matches!(a, DockAction::BeginDrag(_))));
-                self.panel_body(ui, shown, g.content);
-                if shown == self.ui.focused {
-                    ui.painter().rect_stroke(r, 0.0, Stroke::new(1.0, t.focus), StrokeKind::Inside);
-                }
-                if native {
-                    panels::panel_menu_popup(self, ui);
-                }
-            });
-            // An embedded window (no native windows on this platform) reads the main window's
-            // input: its close request and place aren't this window's.
-            if native {
-                closed = ui.input(|i| i.viewport().close_requested());
-                placed = ui.input(|i| {
-                    let v = i.viewport();
-                    let inner = v.inner_rect?;
-                    let min = v.outer_rect.map_or(pos2(window.rect[0], window.rect[1]), |outer| outer.min);
-                    Some([min.x, min.y, inner.width(), inner.height()])
-                });
-            }
-        });
-        if closed {
-            self.ui.panel_windows.retain(|w| !f.panels.contains(&w.panel));
-            ctx.data_mut(|d| d.remove::<[f32; 4]>(spawn_id));
-            return;
-        }
-        // Remember where the window is, so the workspace reopens it there.
-        if let Some(rect) = placed.map(PanelWindow::sanitized)
-            && rect != window.rect
-            && let Some(w) = self.ui.panel_windows.iter_mut().find(|w| w.panel == window.panel)
-        {
-            w.rect = rect;
-        }
-    }
-
-    /// A tab being dragged. Over a tab strip (or the middle of a group) it shows where the tab
-    /// will land: an insertion mark between two tabs (a drop there reorders a group's own tabs
-    /// too); near a group's edge, the half it will split off. On release it lands there (or
-    /// floats with Cmd/Ctrl or outside every group).
-    fn tab_drag(&mut self, ctx: &egui::Context, groups: &[Group], floats: &[Group], tab_rects: &[(String, Vec<(PanelKind, Rect)>)]) {
-        let Some(p) = ctx.data(|d| d.get_temp::<PanelKind>(drag_id())) else { return };
-        let t = self.tokens;
-        let canceled =
-            ctx.input(|input| input.key_pressed(egui::Key::Escape) || !input.focused || (!input.pointer.primary_down() && !input.pointer.primary_released()));
-        if canceled || (!self.ui.dock.contains(p) && !self.ui.floating.iter().any(|group| group.panels.contains(&p))) {
-            ctx.data_mut(|data| data.remove::<PanelKind>(drag_id()));
-            return;
-        }
-        let Some(pos) = ctx.pointer_latest_pos() else { return };
-        // The shared resolver receives groups in paint order; a floating group occludes the dock.
-        let targets: Vec<_> = groups
-            .iter()
-            .map(|g| (g, false))
-            .chain(floats.iter().map(|g| (g, true)))
-            .filter_map(|(g, floating)| {
-                Some(DropTarget {
-                    anchor: *g.panels.get(g.active)?,
-                    rect: g.rect,
-                    tab_strip: Some(Rect::from_min_max(g.rect.min, pos2(g.rect.max.x, g.content.min.y))),
-                    tabs: {
-                        let mut tabs = tab_rects.iter().find(|(path, _)| *path == g.path).map(|(_, tabs)| tabs.clone()).unwrap_or_default();
-                        for panel in &g.panels {
-                            if !tabs.iter().any(|(candidate, _)| candidate == panel) {
-                                tabs.push((*panel, Rect::NOTHING));
-                            }
-                        }
-                        tabs
-                    },
-                    allow_splits: !floating,
-                    accepts_tabs: true,
-                })
+            .filter_map(|window| {
+                let viewport = window_viewport(window.id)?;
+                let count = if unpublished.contains(&viewport) { 0 } else { window_bodies(window) };
+                Some((viewport, count))
             })
             .collect();
-        let over_group = targets.iter().any(|target| target.rect.contains(pos));
-        let float_drop = ctx.input(|i| i.modifiers.command);
-        let plan = (!float_drop).then(|| resolve_drop(&p, pos, &targets)).flatten();
-        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("dock-drop")));
-        if let Some(proposal) = &plan {
-            let preview = proposal.preview.shrink(2.0);
-            painter.rect_filled(preview, t.radius, t.focus.gamma_multiply(0.18));
-            painter.rect_stroke(preview, t.radius, Stroke::new(2.0, t.focus), StrokeKind::Inside);
-            if let Some(mark) = proposal.insertion {
-                insertion_mark(&painter, mark.center().x, mark, t.focus);
+        Self { expected, drawn: Vec::new(), published: Vec::new() }
+    }
+
+    /// Count a body of `viewport` that starts drawing. True for the window's first body: its
+    /// pass sets up the IME before it.
+    pub(crate) fn begin_body(&mut self, viewport: egui::ViewportId) -> bool {
+        match self.drawn.iter_mut().find(|(v, _)| *v == viewport) {
+            Some((_, n)) => {
+                *n = n.saturating_add(1);
+                false
             }
-        }
-        // Ghost of the dragged tab.
-        let g = painter.layout_no_wrap(p.title().to_string(), crate::theme::Tokens::ui(12.0), Color32::WHITE);
-        let gr = Rect::from_min_size(pos + vec2(12.0, 10.0), g.size() + vec2(16.0, 8.0));
-        painter.rect_filled(gr, 4.0, t.focus.gamma_multiply(0.85));
-        painter.galley(gr.min + vec2(8.0, 4.0), g, Color32::WHITE);
-        ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
-        ctx.request_repaint();
-        if ctx.input(|i| i.pointer.primary_released()) {
-            ctx.data_mut(|d| d.remove::<PanelKind>(drag_id()));
-            let ok = match plan {
-                Some(proposal) => self.dock_command(ctx, Action::Move { panel: p, anchor: proposal.anchor, placement: proposal.placement }).is_ok(),
-                None if float_drop || !over_group => {
-                    let r = [pos.x - 40.0, pos.y - 12.0, 420.0, 320.0];
-                    self.dock_command(ctx, Action::Float { panel: p, rect: r }).is_ok()
-                }
-                None => false,
-            };
-            if ok {
-                self.ui.focused = p;
-                self.show_panel(p);
+            None => {
+                self.drawn.push((viewport, 1));
+                true
             }
         }
     }
-}
 
-/// The insertion mark of a tab drag: a bar between two tabs at `x`, with caps.
-fn insertion_mark(painter: &egui::Painter, x: f32, strip: Rect, col: Color32) {
-    let (y0, y1) = (strip.min.y + 3.0, strip.max.y - 2.0);
-    painter.line_segment([pos2(x, y0), pos2(x, y1)], Stroke::new(2.5, col));
-    for (y, d) in [(y0, 1.0), (y1, -1.0)] {
-        painter.add(egui::Shape::convex_polygon(vec![pos2(x - 4.5, y), pos2(x + 4.5, y), pos2(x, y + 5.0 * d)], col, Stroke::NONE));
+    /// Whether the body of `viewport` that just drew publishes the IME descriptor: once the
+    /// window's editor has `recorded` its geometry this pass, and after the window's last body.
+    /// A window the layout does not name publishes after every body.
+    pub(crate) fn publishes(&mut self, viewport: egui::ViewportId, recorded: bool) -> bool {
+        let drawn = self.drawn.iter().find(|(v, _)| *v == viewport).map_or(0, |(_, n)| *n);
+        let expected = self.expected.iter().find(|(v, _)| *v == viewport).map_or(0, |(_, n)| *n);
+        let publishes = recorded || drawn >= expected;
+        if publishes && !self.published.contains(&viewport) {
+            self.published.push(viewport);
+        }
+        publishes
+    }
+
+    /// The native windows whose pass began.
+    pub(crate) fn begun(&self) -> Vec<egui::ViewportId> {
+        self.drawn.iter().map(|(v, _)| *v).collect()
+    }
+
+    /// The native windows that drew bodies but did not publish.
+    pub(crate) fn unpublished(&self) -> Vec<egui::ViewportId> {
+        self.drawn.iter().map(|(v, _)| *v).filter(|v| !self.published.contains(v)).collect()
     }
 }
 
-/// The native window of the floating group whose window entry names `panel`.
-pub fn panel_window_id(panel: PanelKind) -> egui::ViewportId {
-    egui::ViewportId::from_hash_of(("effectcraft-panel-window", panel.id()))
+/// The OS window craft-ui opens for the floating window `id`.
+#[cfg(not(target_arch = "wasm32"))]
+fn window_viewport(id: u64) -> Option<egui::ViewportId> {
+    Some(DockArea::<PanelKind>::window_viewport(area_id(), id))
 }
 
-/// Where a native panel window was told to open (kept for as long as it stays open).
-fn panel_window_spawn_id(panel: PanelKind) -> egui::Id {
-    egui::Id::new(("panel-window-spawn", panel.id()))
+/// The web keeps floating windows in the page.
+#[cfg(target_arch = "wasm32")]
+fn window_viewport(_id: u64) -> Option<egui::ViewportId> {
+    None
 }
 
-/// A new floating group's default rect near the centre of `screen`.
-pub fn default_float_rect(screen: Rect) -> [f32; 4] {
-    let c = screen.center();
-    [c.x - 210.0, c.y - 160.0, 420.0, 320.0]
-}
-
-/// A corner is a two-axis resize control; focused arrows belong to it and Tab moves on.
-fn floating_resize_delta(ui: &mut egui::Ui, response: &egui::Response) -> egui::Vec2 {
-    if response.drag_started() {
-        response.request_focus();
+/// The panel bodies craft-ui draws in a floating window: the active panel of each group and each
+/// open stack entry. A minimized window shows its bar only.
+fn window_bodies(window: &Floating<PanelKind>) -> usize {
+    if window.minimized {
+        return 0;
     }
-    let mut delta = if response.dragged() { response.drag_delta() } else { egui::Vec2::ZERO };
-    if response.has_focus() {
-        ui.memory_mut(|memory| {
-            memory.set_focus_lock_filter(response.id, egui::EventFilter { horizontal_arrows: true, vertical_arrows: true, ..Default::default() })
-        });
-        ui.input_mut(|input| {
-            for (key, amount) in [
-                (egui::Key::ArrowLeft, vec2(-8.0, 0.0)),
-                (egui::Key::ArrowRight, vec2(8.0, 0.0)),
-                (egui::Key::ArrowUp, vec2(0.0, -8.0)),
-                (egui::Key::ArrowDown, vec2(0.0, 8.0)),
-            ] {
-                if input.consume_key(egui::Modifiers::NONE, key) {
-                    delta += amount;
-                }
+    let mut count = 0usize;
+    let mut nodes = vec![&window.root];
+    while let Some(node) = nodes.pop() {
+        match node {
+            Node::Split { first, second, .. } => nodes.extend([&**first, &**second]),
+            Node::Tabs { panels, active } => count = count.saturating_add(usize::from(panels.get(*active).is_some())),
+            Node::Stack { entries } => count = count.saturating_add(entries.iter().filter(|e| e.open).count()),
+            _ => {}
+        }
+    }
+    count
+}
+
+impl EffectContent<'_> {
+    fn header_width(&self, active: PanelKind, strip_width: f32) -> f32 {
+        let lock = if has_lock(active) { LOCK_W } else { 0.0 };
+        (lock + MENU_W).min(strip_width * 2.0 / 3.0).max(MENU_W)
+    }
+
+    /// Whether the group of `panels` shows comp tabs: it holds the Timeline and comps are open.
+    fn has_doc_tabs(&self, panels: &[PanelKind]) -> bool {
+        panels.contains(&PanelKind::Timeline) && !self.docs.is_empty()
+    }
+}
+
+impl DockContent<PanelKind> for EffectContent<'_> {
+    fn body(&mut self, ui: &mut egui::Ui, panel: &PanelKind) {
+        let t = self.tokens;
+        let rect = ui.max_rect();
+        self.bodies.push((*panel, rect));
+        // A floating panel's OS window is a pass of its own: its text IME descriptor is set up
+        // before its first body and published after its bodies (the main window does both in
+        // `draw`).
+        let viewport = ui.ctx().viewport_id();
+        let native = viewport != egui::ViewportId::ROOT && !ui.ctx().embed_viewports();
+        if native && self.ime.begin_body(viewport) {
+            panels::viewer_text::begin_ui(ui.ctx());
+        }
+        self.app.panel_body(ui, *panel, rect);
+        if native && self.ime.publishes(viewport, panels::viewer_text::ime_recorded(ui.ctx())) {
+            panels::viewer_text::finish_ime(self.app, ui);
+        }
+        // The body fills its frame; allocating it lets a floated panel keep its full size.
+        ui.allocate_rect(rect, Sense::hover());
+        // Painted after the body so child backgrounds cannot hide the focus outline.
+        if self.app.ui.focused == *panel {
+            ui.painter().rect_stroke(rect, 0.0, Stroke::new(1.0, t.focus), StrokeKind::Inside);
+        }
+    }
+
+    fn logical_label(&self, panel: &PanelKind) -> String {
+        crate::i18n::command_label("window.panel", panel.title()).to_string()
+    }
+
+    /// The tab names what the panel shows ("Composition Intro"), after the label swatch of its
+    /// comp or layer. With comps open, the Timeline's own tab is just "Timeline"; each comp has a
+    /// tab of its own after the group's panel tabs.
+    fn label(&mut self, _ui: &egui::Ui, panel: &PanelKind, logical: &str, font: &egui::FontId, color: egui::Color32) -> egui::WidgetText {
+        let title = self.titles.iter().find(|(p, _)| p == panel).map_or(logical, |(_, s)| s.as_str());
+        let Some((_, swatch)) = self.swatches.iter().find(|(p, _)| p == panel) else { return title.into() };
+        let mut job = egui::text::LayoutJob::default();
+        job.append("■ ", 0.0, egui::TextFormat::simple(font.clone(), *swatch));
+        job.append(title, 0.0, egui::TextFormat::simple(font.clone(), color));
+        job.into()
+    }
+
+    fn group_header_width(&self, _panels: &[PanelKind], active: &PanelKind, _floating: bool, strip_width: f32) -> f32 {
+        self.header_width(*active, strip_width)
+    }
+
+    /// The viewer lock and the ≡ panel menu of the shown panel.
+    fn group_header(&mut self, ui: &mut egui::Ui, _panels: &[PanelKind], active: &PanelKind, _floating: bool) {
+        let t = self.tokens;
+        let header = ui.max_rect();
+        let menu = Rect::from_min_max(pos2((header.max.x - MENU_W).max(header.min.x), header.min.y), header.max);
+        if has_lock(*active) {
+            let lock = Rect::from_center_size(pos2(menu.min.x - LOCK_W / 2.0, header.center().y), vec2(14.0, 14.0));
+            let locked = self.app.ui.locked_tabs.contains(&active.id());
+            if dock::lock_button(ui, lock, *active, locked, &t, &mut self.app.auto) {
+                self.locks.push(*active);
             }
-        });
+        }
+        let rect = Rect::from_center_size(menu.center(), vec2(18.0, 18.0));
+        let response = ui.interact(rect, egui::Id::unique(("panel-menu-button", active.id())), Sense::click());
+        response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, response.enabled(), "panel menu"));
+        self.app.auto.add_response(&format!("panel.menu.{}", active.id()), &response, "panel menu");
+        let color = if response.hovered() { t.tab_text_active } else { t.tab_text };
+        icons::paint(ui.painter(), Rect::from_center_size(rect.center(), vec2(16.0, 16.0)), Icon::Hamburger, color);
+        crate::widgets::focus_outline(ui, &response, &t);
+        if response.clicked() {
+            self.app.ui.focused = *active;
+            self.menu = Some((*active, rect.left_bottom()));
+        }
+    }
+
+    fn group_extra_tabs_width(&self, panels: &[PanelKind], active: &PanelKind, _floating: bool) -> f32 {
+        if !self.has_doc_tabs(panels) {
+            return 0.0;
+        }
+        dock::doc_widths(&self.ctx, &self.docs, *active == PanelKind::Timeline, &self.style.font).iter().sum()
+    }
+
+    /// The Timeline's comp tabs, after its group's panel tabs whichever panel is shown.
+    fn group_extra_tabs(&mut self, ui: &mut egui::Ui, panels: &[PanelKind], active: &PanelKind, _floating: bool) {
+        if self.has_doc_tabs(panels) {
+            let selected = *active == PanelKind::Timeline;
+            self.doc_actions.extend(dock::doc_tabs(ui, ui.max_rect(), &self.docs, selected, &self.style, &mut self.app.auto));
+        }
     }
-    if response.enabled() { delta } else { egui::Vec2::ZERO }
 }
diff --git a/crates/ui-egui/src/frames.rs b/crates/ui-egui/src/frames.rs
index 059bc3a03..a7023a494 100644
--- a/crates/ui-egui/src/frames.rs
+++ b/crates/ui-egui/src/frames.rs
@@ -24,7 +24,7 @@
 //! them (Info panel, eyedroppers, histograms).
 
 use std::collections::{BTreeSet, HashMap, HashSet, VecDeque};
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 
 use effectcraft_engine::project::{Comp, ItemId, ItemKind, LayerSource, Node, Project, PropGroup};
@@ -152,6 +152,8 @@ struct Cache {
     gpu_budget: usize,
     /// The playing preview, if any: evictions spare the frames it shows next.
     playhead: Option<Playhead>,
+    /// Scale of the frame on screen (the newest urgent request): frames of other scales go first.
+    scale: Option<u32>,
 }
 
 impl Cache {
@@ -173,8 +175,14 @@ impl Cache {
     /// recently shown of the frames it doesn't reach, then the one it reaches last. Plain LRU
     /// evicted the frames just ahead of the playhead first (rendered a while ago, not shown yet)
     /// to keep the ones just shown, so a preview longer than the cache played into a gap that
-    /// prefetch kept refilling while it evicted the next frames (#595).
+    /// prefetch kept refilling while it evicted the next frames (#595). Frames of another scale
+    /// than the one on screen go first (a zoom or resolution change).
     fn victim(&self) -> Option<usize> {
+        if let Some(s) = self.scale
+            && let Some(i) = self.order.iter().position(|k| k.scale != s)
+        {
+            return Some(i);
+        }
         let Some(p) = &self.playhead else { return (!self.order.is_empty()).then_some(0) };
         let mut farthest: Option<(i64, usize)> = None;
         for (i, k) in self.order.iter().enumerate() {
@@ -186,10 +194,13 @@ impl Cache {
         }
         farthest.map(|(_, i)| i)
     }
-    /// Video memory: drop the oldest GPU frames past their own budget.
+    /// Video memory: drop the oldest GPU frames past their own budget, frames of another scale
+    /// than the one on screen first (a zoom or resolution change).
     fn evict_gpu(&mut self) {
         while self.gpu_bytes > self.gpu_budget {
-            let Some(i) = self.order.iter().position(|k| self.map.get(k).is_some_and(FrameImage::is_gpu)) else { break };
+            let is_gpu = |k: &FrameKey| self.map.get(k).is_some_and(FrameImage::is_gpu);
+            let other_scale = self.order.iter().position(|k| Some(k.scale) != self.scale && is_gpu(k));
+            let Some(i) = other_scale.or_else(|| self.order.iter().position(is_gpu)) else { break };
             if let Some(old) = self.order.remove(i) {
                 self.remove(&old);
             }
@@ -227,6 +238,19 @@ impl Cache {
         }
         self.order.retain(|k| !gone.contains(&k.content));
     }
+    /// Move the frames of identity `from` that `keep` accepts to identity `to` (in place in the
+    /// eviction order), unless `to` already has them.
+    fn carry(&mut self, from: u64, to: u64, keep: impl Fn(i64) -> bool) {
+        for k in self.order.iter_mut().filter(|k| k.content == from && keep(k.frame)) {
+            let moved = FrameKey { content: to, ..*k };
+            if !self.map.contains_key(&moved)
+                && let Some(img) = self.map.remove(k)
+            {
+                self.map.insert(moved, img);
+                *k = moved;
+            }
+        }
+    }
     fn evict_to_budget(&mut self) {
         while self.bytes > self.budget {
             let Some(old) = self.victim().and_then(|i| self.order.remove(i)) else { break };
@@ -258,8 +282,10 @@ pub struct RenderSource {
 /// ([`Frames::identity`]).
 type Identity = (u64, Option<Arc<Project>>);
 
-/// Content keys of (project revision, comp), computed once per revision.
-type ContentKeys = Arc<Mutex<HashMap<(u64, u64), u128>>>;
+/// Content keys of (project revision, comp, virtual-file generation). The generation is one
+/// counter bumped when a browser file is replaced, so a lookup stays a map read. Hashing the
+/// new bytes happens only when that generation misses.
+type ContentKeys = Arc<Mutex<HashMap<(u64, u64, u64), u128>>>;
 
 #[cfg(not(target_arch = "wasm32"))]
 #[derive(Default)]
@@ -268,16 +294,16 @@ struct ContentKeyJobs {
     pending: VecDeque<(Arc<Project>, u64, u64)>,
 }
 
-fn content_key(keys: &ContentKeys, project: &Project, revision: u64, comp: u64) -> u128 {
-    if let Some(k) = keys.lock().ok().and_then(|m| m.get(&(revision, comp)).copied()) {
+fn content_key(keys: &ContentKeys, project: &Project, revision: u64, comp: u64, epoch: u64, virtual_id: Option<disk_cache::VirtualFileId<'_>>) -> u128 {
+    if let Some(k) = keys.lock().ok().and_then(|m| m.get(&(revision, comp, epoch)).copied()) {
         return k;
     }
-    let k = disk_cache::comp_content_key(project, ItemId(comp));
+    let k = disk_cache::comp_content_key_with(project, ItemId(comp), virtual_id);
     if let Ok(mut m) = keys.lock() {
         if m.len() > 256 {
             m.clear();
         }
-        m.insert((revision, comp), k);
+        m.insert((revision, comp, epoch), k);
     }
     k
 }
@@ -288,7 +314,7 @@ fn content_key(keys: &ContentKeys, project: &Project, revision: u64, comp: u64)
 /// hands out), and by value the project settings and the footage, solids and proxies it uses.
 /// With expressions in its comps (which can read anything) every item counts.
 pub fn comp_content(project: &Project, comp: ItemId) -> u64 {
-    comp_content_with(project, comp, |_, c| Arc::as_ptr(c))
+    comp_content_with(project, comp, project, |_, c| c)
 }
 
 /// Whether two versions of a comp draw the same pixels. Markers only count when an expression
@@ -308,8 +334,9 @@ fn project_has_expressions(project: &Project) -> bool {
     project.items.values().any(|i| matches!(&i.kind, ItemKind::Comp(c) if c.layers.iter().any(|l| has_expression(&l.props))))
 }
 
-/// [`comp_content`] with each comp's address given by `addr`.
-fn comp_content_with(project: &Project, comp: ItemId, addr: impl Fn(ItemId, &Arc<Comp>) -> *const Comp) -> u64 {
+/// [`comp_content`] with each comp's version selected for both its sources and its address.
+/// Sources removed by undo are read from `base`.
+fn comp_content_with<'a>(project: &'a Project, comp: ItemId, base: &'a Project, version: impl Fn(ItemId, &'a Arc<Comp>) -> &'a Arc<Comp>) -> u64 {
     use std::hash::{Hash, Hasher};
     fn has_expression(g: &PropGroup) -> bool {
         g.children.iter().any(|c| match c {
@@ -319,6 +346,7 @@ fn comp_content_with(project: &Project, comp: ItemId, addr: impl Fn(ItemId, &Arc
     }
     let mut h = std::collections::hash_map::DefaultHasher::new();
     format!("{:?}", project.settings).hash(&mut h);
+    let item = |id| project.item(id).or_else(|| base.item(id));
     let mut seen = BTreeSet::new();
     let mut stack = vec![comp];
     let mut expressions = false;
@@ -326,7 +354,8 @@ fn comp_content_with(project: &Project, comp: ItemId, addr: impl Fn(ItemId, &Arc
         if !seen.insert(id) {
             continue;
         }
-        let Some(ItemKind::Comp(c)) = project.item(id).map(|i| &i.kind) else { continue };
+        let Some(ItemKind::Comp(c)) = item(id).map(|i| &i.kind) else { continue };
+        let c = version(id, c);
         for l in &c.layers {
             if let LayerSource::Comp { item } | LayerSource::Footage { item } | LayerSource::Solid { item } = l.source {
                 stack.push(item);
@@ -336,14 +365,14 @@ fn comp_content_with(project: &Project, comp: ItemId, addr: impl Fn(ItemId, &Arc
     }
     let ids: Vec<ItemId> = if expressions { project.items.keys().copied().collect() } else { seen.into_iter().collect() };
     for id in ids {
-        let Some(it) = project.item(id) else { continue };
+        let Some(it) = item(id) else { continue };
         id.0.hash(&mut h);
         if expressions {
             // (`comp("Name")`, `footage("Name")`)
             it.name.hash(&mut h);
         }
         match &it.kind {
-            ItemKind::Comp(c) => (addr(id, c) as usize).hash(&mut h),
+            ItemKind::Comp(c) => (Arc::as_ptr(version(id, c)) as usize).hash(&mut h),
             k => format!("{k:?}").hash(&mut h),
         }
         format!("{:?}", it.proxy).hash(&mut h);
@@ -363,8 +392,15 @@ pub fn opts_hash(o: &RenderOpts) -> u64 {
 }
 
 /// Disk key of a viewer frame (render options included: region of interest, draft…).
-fn frame_disk_key(keys: &ContentKeys, project: &Project, key: &FrameKey, opts_hash: u64) -> u128 {
-    let content = content_key(keys, project, key.revision, key.comp);
+fn frame_disk_key(
+    keys: &ContentKeys,
+    project: &Project,
+    key: &FrameKey,
+    opts_hash: u64,
+    epoch: u64,
+    virtual_id: Option<disk_cache::VirtualFileId<'_>>,
+) -> u128 {
+    let content = content_key(keys, project, key.revision, key.comp, epoch, virtual_id);
     disk_cache::frame_key(content, key.frame, key.scale, key.view ^ opts_hash)
 }
 
@@ -441,6 +477,10 @@ pub struct Frames {
     /// Render time of the last viewer (urgent) frame in ms, for the Info panel / perf readout.
     pub last_ms: Arc<Mutex<f64>>,
     content_keys: ContentKeys,
+    /// Bumped when a virtual file is replaced. Lookups key on it instead of statting footage.
+    virtual_epoch: Arc<AtomicU64>,
+    /// Size and content hash for paths with no native metadata. Called only on a cache miss.
+    virtual_id: Option<Arc<dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync>>,
     #[cfg(not(target_arch = "wasm32"))]
     content_key_jobs: Arc<Mutex<ContentKeyJobs>>,
     gpu_retired: Arc<AtomicBool>,
@@ -462,7 +502,7 @@ impl Default for Frames {
         #[cfg(not(target_arch = "wasm32"))]
         let threads = std::thread::available_parallelism().map(|n| n.get()).unwrap_or(4).clamp(2, 16);
         Frames {
-            cache: Arc::new(Mutex::new(Cache { map: HashMap::new(), order: VecDeque::new(), bytes: 0, gpu_bytes: 0, budget: 3 << 30, gpu_budget: GPU_BUDGET, playhead: None })),
+            cache: Arc::new(Mutex::new(Cache { map: HashMap::new(), order: VecDeque::new(), bytes: 0, gpu_bytes: 0, budget: 3 << 30, gpu_budget: GPU_BUDGET, playhead: None, scale: None })),
             inflight: Arc::new(Mutex::new(HashSet::new())),
             queue: Arc::new(Mutex::new(Queue::default())),
             #[cfg(not(target_arch = "wasm32"))]
@@ -477,6 +517,8 @@ impl Default for Frames {
             ctx: None,
             last_ms: Arc::new(Mutex::new(0.0)),
             content_keys: Arc::default(),
+            virtual_epoch: Arc::new(AtomicU64::new(0)),
+            virtual_id: None,
             #[cfg(not(target_arch = "wasm32"))]
             content_key_jobs: Arc::default(),
             gpu_retired: Arc::default(),
@@ -724,13 +766,28 @@ impl Frames {
         let markers_count = project_has_expressions(project);
         if let Some((base_id, base)) = bases.get(&comp.0)
             && *base_id != plain
-            && comp_content_with(project, comp, |id, c| match base.item(id).map(|i| &i.kind) {
-                Some(ItemKind::Comp(b)) if Arc::ptr_eq(b, c) || same_pixels(b, c, markers_count) => Arc::as_ptr(b),
-                _ => Arc::as_ptr(c),
+            && comp_content_with(project, comp, project, |id, c| match base.item(id).map(|i| &i.kind) {
+                Some(ItemKind::Comp(b)) if Arc::ptr_eq(b, c) || same_pixels(b, c, markers_count) => b,
+                _ => c,
             }) == *base_id
         {
             return (*base_id, Some(base.clone()));
         }
+        // Only layers of this comp changed: its frames outside their span (and a frame either
+        // side for rounding) keep drawing the same pixels, so a cut or trim recaches only the
+        // layers it touched (#1641).
+        if let Some((base_id, base)) = bases.get(&comp.0)
+            && let (Some(old), Some(new)) = (base.comp(comp), project.comp(comp))
+            && comp_content_with(project, comp, base, |id, c| match base.item(id).map(|i| &i.kind) {
+                Some(ItemKind::Comp(b)) if id == comp || Arc::ptr_eq(b, c) || same_pixels(b, c, markers_count) => b,
+                _ => c,
+            }) == *base_id
+            && let Some((s, e)) = new.changed_span(old)
+            && let Ok(mut cache) = self.cache.lock()
+        {
+            let (first, last) = (new.frame_rate.frame_at(s).saturating_sub(1), new.frame_rate.frame_at(e).saturating_add(1));
+            cache.carry(*base_id, plain, |f| f < first || f > last);
+        }
         if bases.len() > MAX_KEEPERS {
             bases.clear();
         }
@@ -758,7 +815,12 @@ impl Frames {
     /// Frames of the series of `base` in the disk cache but not in RAM — the blue cache bar.
     /// `opts` are the viewer's render options (part of the disk key). Native queries return
     /// no blue frames until the content key is ready; hashing never blocks timeline painting.
-    pub fn disk_frames(&self, src: &RenderSource, base: &FrameKey, frames: i64, opts: &RenderOpts) -> Vec<i64> {
+    pub fn disk_frames(&self, src: &RenderSource, base: &FrameKey, range: std::ops::Range<i64>, opts: &RenderOpts) -> Vec<i64> {
+        let start = range.start.clamp(0, 100_000);
+        let end = range.end.clamp(0, 100_000);
+        if start >= end {
+            return vec![];
+        }
         let remote = self.remote.as_ref().filter(|r| r.disk());
         let contains = |k: u128| match (&src.disk, remote) {
             (Some(dc), _) => dc.contains(disk_cache::Kind::Frame, k),
@@ -768,9 +830,10 @@ impl Frames {
         if src.disk.is_none() && remote.is_none() {
             return vec![];
         }
+        let epoch = self.virtual_epoch.load(Ordering::Relaxed);
         #[cfg(not(target_arch = "wasm32"))]
         let content = {
-            let known = self.content_keys.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(base.revision, base.comp)).copied();
+            let known = self.content_keys.lock().unwrap_or_else(std::sync::PoisonError::into_inner).get(&(base.revision, base.comp, epoch)).copied();
             let Some(content) = known else {
                 self.request_content_key(src.project.clone(), base.revision, base.comp);
                 return vec![];
@@ -778,13 +841,10 @@ impl Frames {
             content
         };
         #[cfg(target_arch = "wasm32")]
-        let content = content_key(&self.content_keys, &src.project, base.revision, base.comp);
+        let content = content_key(&self.content_keys, &src.project, base.revision, base.comp, epoch, self.virtual_id.as_deref());
         let ram: HashSet<i64> = self.cached_frames(base).into_iter().collect();
         let oh = opts_hash(opts);
-        (0..frames.clamp(0, 100_000))
-            .filter(|f| !ram.contains(f))
-            .filter(|f| contains(disk_cache::frame_key(content, *f, base.scale, base.view ^ oh)))
-            .collect()
+        (start..end).filter(|f| !ram.contains(f)).filter(|f| contains(disk_cache::frame_key(content, *f, base.scale, base.view ^ oh))).collect()
     }
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -803,6 +863,7 @@ impl Frames {
         jobs.running = true;
         drop(jobs);
         let (jobs, keys, ctx) = (self.content_key_jobs.clone(), self.content_keys.clone(), self.ctx.clone());
+        let (epoch, id) = (self.virtual_epoch.clone(), self.virtual_id.clone());
         let work = move || loop {
             let next = {
                 let mut jobs = jobs.lock().unwrap_or_else(std::sync::PoisonError::into_inner);
@@ -813,7 +874,9 @@ impl Frames {
                 next
             };
             let Some((project, revision, comp)) = next else { return };
-            if std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| content_key(&keys, &project, revision, comp))).is_err() {
+            let epoch = epoch.load(Ordering::Relaxed);
+            let id = id.clone();
+            if std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| content_key(&keys, &project, revision, comp, epoch, id.as_deref()))).is_err() {
                 log::error!("could not compute a preview disk-cache key; the cache indicator will retry");
             }
             if let Some(ctx) = &ctx {
@@ -893,7 +956,19 @@ impl Frames {
     }
 
     fn request_with(&self, src: &RenderSource, key: FrameKey, comp: ItemId, t: Tick, opts: RenderOpts, urgent: bool) {
-        if self.is_cached(&key) {
+        // The frame on screen sets the scale evictions keep: a prefetch or a passive viewer at
+        // another zoom must not evict the active viewer's frames.
+        let cached = self
+            .cache
+            .lock()
+            .map(|mut c| {
+                if urgent {
+                    c.scale = Some(key.scale);
+                }
+                c.map.contains_key(&key)
+            })
+            .unwrap_or(false);
+        if cached {
             return;
         }
         let Ok(mut q) = self.queue.lock() else { return };
@@ -964,10 +1039,22 @@ impl Frames {
             ctx: self.ctx.clone(),
             last: self.last_ms.clone(),
             content_keys: self.content_keys.clone(),
+            virtual_epoch: self.virtual_epoch.clone(),
+            virtual_id: self.virtual_id.clone(),
             gpu_retired: self.gpu_retired.clone(),
         }
     }
 
+    /// Browser file table: `epoch` bumps on each replacement, and `id` is the size and content
+    /// hash used when a content key is rebuilt. Neither runs on a cache hit.
+    pub fn set_virtual_media(&mut self, epoch: Arc<AtomicU64>, id: Arc<dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync>) {
+        self.virtual_epoch = epoch;
+        self.virtual_id = Some(id);
+        if let Ok(mut keys) = self.content_keys.lock() {
+            keys.clear();
+        }
+    }
+
     /// Render frames with `remote` from now on (`None`: on this thread again).
     pub fn set_remote(&mut self, remote: Option<Arc<dyn RemoteFrames>>) {
         self.remote = remote;
@@ -1036,7 +1123,8 @@ impl Frames {
             let fw = self.worker();
             let busy = self.remote_busy.clone();
             let t0 = web_time::Instant::now();
-            let disk_key = remote.disk().then(|| frame_disk_key(&w.content_keys, &job.src.project, &key, opts_hash(&job.opts)));
+            let epoch = w.virtual_epoch.load(Ordering::Relaxed);
+            let disk_key = remote.disk().then(|| frame_disk_key(&w.content_keys, &job.src.project, &key, opts_hash(&job.opts), epoch, w.virtual_id.as_deref()));
             let rj = RemoteJob { project: job.src.project.clone(), revision: key.revision, comp: job.comp, t: job.t, opts: job.opts, disk_key };
             remote.start(
                 rj,
@@ -1093,6 +1181,8 @@ struct Worker {
     ctx: Option<egui::Context>,
     last: Arc<Mutex<f64>>,
     content_keys: ContentKeys,
+    virtual_epoch: Arc<AtomicU64>,
+    virtual_id: Option<Arc<dyn Fn(&str) -> Option<(u64, u64)> + Send + Sync>>,
     gpu_retired: Arc<AtomicBool>,
 }
 
@@ -1147,7 +1237,12 @@ impl Worker {
             job
         };
         let t0 = web_time::Instant::now();
-        let disk = job.src.disk.as_ref().map(|dc| (dc.clone(), frame_disk_key(content_keys, &job.src.project, &job.key, opts_hash(&job.opts))));
+        let epoch = self.virtual_epoch.load(Ordering::Relaxed);
+        let disk = job
+            .src
+            .disk
+            .as_ref()
+            .map(|dc| (dc.clone(), frame_disk_key(content_keys, &job.src.project, &job.key, opts_hash(&job.opts), epoch, self.virtual_id.as_deref())));
         let from_disk = disk.as_ref().and_then(|(dc, k)| dc.get_frame(*k));
         let disk_hit = from_disk.is_some();
         let ci = match from_disk {
@@ -1372,652 +1467,4 @@ impl Queue {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[cfg(not(target_arch = "wasm32"))]
-    #[test]
-    fn disk_indicator_does_not_hash_on_ui_thread_and_coalesces_edits() {
-        use std::sync::mpsc;
-        use std::time::{Duration, Instant};
-        struct Disk(u128);
-        impl RemoteFrames for Disk {
-            fn slots(&self) -> usize {
-                1
-            }
-            fn disk(&self) -> bool {
-                true
-            }
-            fn disk_contains(&self, key: u128) -> bool {
-                self.0 == key
-            }
-            fn start(&self, _: RemoteJob, done: RemoteDone) {
-                done(Err("test has no renderer".into()));
-            }
-        }
-        let mut s = effectcraft_engine::Session::default();
-        s.execute("comp.new", serde_json::json!({"width":32,"height":18,"duration":1})).unwrap();
-        let cid = s.active_comp_id().unwrap();
-        let opts = RenderOpts::default();
-        let stored = disk_cache::frame_key(disk_cache::comp_content_key(&s.project, cid), 2, 1000, opts_hash(&opts));
-        let mut frames = Frames { pool: Some(rayon::ThreadPoolBuilder::new().num_threads(1).build().unwrap()), ..Default::default() };
-        frames.set_remote(Some(Arc::new(Disk(stored))));
-        let (entered, started) = mpsc::channel();
-        let (release, wait) = mpsc::channel();
-        frames.pool.as_ref().unwrap().spawn(move || {
-            entered.send(()).unwrap();
-            wait.recv_timeout(Duration::from_secs(5)).unwrap();
-        });
-        started.recv_timeout(Duration::from_secs(3)).unwrap();
-        let src = RenderSource {
-            project: s.project.clone(),
-            footage: s.footage.clone(),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        let mut base = key(1, 0, 0);
-        base.comp = cid.0;
-        for revision in 1..50 {
-            base.revision = revision;
-            assert!(frames.disk_frames(&src, &base, 30, &opts).is_empty());
-        }
-        assert!(frames.content_keys.lock().unwrap().is_empty(), "painting computed a content hash while the worker was blocked");
-        assert_eq!(frames.content_key_jobs.lock().unwrap().pending.len(), 1);
-        release.send(()).unwrap();
-        let until = Instant::now() + Duration::from_secs(3);
-        while !frames.content_keys.lock().unwrap().contains_key(&(base.revision, base.comp)) {
-            assert!(Instant::now() < until);
-            std::thread::sleep(Duration::from_millis(1));
-        }
-        assert_eq!(frames.disk_frames(&src, &base, 30, &opts), vec![2], "the blue indicator must return once its key is ready");
-        assert_eq!(frames.content_keys.lock().unwrap().len(), 1, "superseded revisions were hashed");
-    }
-
-    /// Frames larger than the texture limit are averaged down by a whole factor (#201: an
-    /// 11000×2200 comp at Full resolution against an 8192 limit).
-    #[test]
-    fn frames_over_the_texture_limit_are_averaged_down() {
-        assert_eq!(fitted_size([11000, 2200], 8192), [5500, 1100]);
-        assert_eq!(fitted_size([8192, 100], 8192), [8192, 100]);
-        assert_eq!(fitted_size([30000, 30000], 16384), [15000, 15000]);
-        assert_eq!(fitted_size([0, 0], 0), [0, 0]);
-        // 5×2 (three columns of white, then black) into 2 px: 3×2 blocks (the last one 2×2).
-        let w = egui::Color32::WHITE;
-        let b = egui::Color32::from_rgba_premultiplied(0, 0, 0, 255);
-        let img = egui::ColorImage::new([5, 2], vec![w, w, w, b, b, w, w, w, b, b]);
-        let out = fit_texture(img.clone(), 2);
-        assert_eq!(out.size, [2, 1]);
-        assert_eq!(out.pixels, vec![w, b]);
-        assert_eq!(fit_texture(img.clone(), 5).pixels, img.pixels);
-        let mixed = fit_texture(egui::ColorImage::new([2, 1], vec![w, b]), 1);
-        assert_eq!(mixed.pixels, vec![egui::Color32::from_rgba_premultiplied(128, 128, 128, 255)]);
-    }
-
-    #[test]
-    fn retirement_reaches_existing_workers_and_keeps_cpu_frames_and_completion_live() {
-        let frames = Frames::default();
-        let worker = frames.worker();
-        let first = key(1, 0, 0);
-        insert(&frames, first);
-        frames.retire_gpu();
-        assert!(worker.gpu_retired.load(Ordering::Acquire), "already queued workers share retirement");
-        assert!(frames.is_cached(&first), "healthy materialized CPU frames survive");
-        let next = key(1, 1, 0);
-        frames.inflight.lock().unwrap().insert(next);
-        frames.queue.lock().unwrap().running.insert(next);
-        worker.finish_key(next, false, img(), web_time::Instant::now());
-        assert!(frames.is_cached(&next), "CPU retry can still publish");
-        assert_eq!(frames.inflight(), 0);
-        assert!(frames.queue.lock().unwrap().running.is_empty());
-    }
-
-    fn key(content: u64, frame: i64, opts: u64) -> FrameKey {
-        FrameKey { revision: content, content, comp: 1, frame, scale: 1000, view: 0, opts }
-    }
-
-    fn img() -> FrameImage {
-        FrameImage::Cpu(Arc::new(egui::ColorImage::new([2, 2], vec![egui::Color32::BLACK; 4])))
-    }
-
-    fn insert(f: &Frames, k: FrameKey) {
-        f.cache.lock().unwrap().insert(k, img());
-    }
-
-    /// A frame whose render panics (a GPU out of memory used to, on every frame thread) is
-    /// released, not left "in progress" forever, so the viewer can ask for it again (#106).
-    #[test]
-    fn a_frame_whose_render_panics_is_released() {
-        use effectcraft_engine::Session;
-        use effectcraft_engine::project::{Footage, FootageKind};
-        use effectcraft_engine::render::Image;
-        use serde_json::json;
-        use std::sync::atomic::{AtomicUsize, Ordering};
-        #[derive(Default)]
-        struct Explodes(AtomicUsize);
-        impl FootageSource for Explodes {
-            fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
-                self.0.fetch_add(1, Ordering::SeqCst);
-                panic!("a decoder bug");
-            }
-        }
-        let mut s = Session::default();
-        let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        let clip = Footage { kind: FootageKind::Still, width: 8, height: 8, has_video: true, ..Default::default() };
-        let item = Arc::make_mut(&mut s.project).add_item("clip.png", Default::default(), None, ItemKind::Footage(clip));
-        s.execute("layer.addItem", json!({"item": item.0})).unwrap();
-        let footage = Arc::new(Explodes::default());
-        let src = RenderSource {
-            project: s.project.clone(),
-            footage: footage.clone(),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        let f = Frames::default();
-        let key = FrameKey { revision: s.revision, content: f.content_of(&s.project, s.revision, cid), ..key(0, 0, 0) };
-        let key = FrameKey { comp: cid.0, ..key };
-        f.request(&src, key, cid, Tick::ZERO, RenderOpts::default());
-        for _ in 0..1000 {
-            if f.inflight() == 0 {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        assert!(footage.0.load(Ordering::SeqCst) > 0, "the render reached the footage");
-        assert_eq!(f.inflight(), 0, "released");
-        assert!(!f.is_cached(&key));
-    }
-
-    /// #647: a pool thread waiting inside a render (on a parallel loop) never starts another
-    /// frame render on top of it. Dragging a layer queues a frame every UI frame; renders used to
-    /// nest on every thread, each holding its buffers, until memory ran out.
-    #[test]
-    fn a_waiting_render_never_starts_another_on_its_thread() {
-        use effectcraft_engine::Session;
-        use effectcraft_engine::project::{Footage, FootageKind};
-        use effectcraft_engine::render::Image;
-        use effectcraft_engine::time::FrameRate;
-        use serde_json::json;
-        use std::cell::Cell;
-        use std::sync::atomic::AtomicUsize;
-        thread_local! {
-            static DEPTH: Cell<usize> = const { Cell::new(0) };
-        }
-        /// A decoder that works in parallel, as the renderer does: its thread joins the loop and
-        /// may wait for the parts other threads took.
-        #[derive(Default)]
-        struct Parallel {
-            calls: AtomicUsize,
-            deepest: AtomicUsize,
-        }
-        impl FootageSource for Parallel {
-            fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
-                let d = DEPTH.get() + 1;
-                DEPTH.set(d);
-                self.deepest.fetch_max(d, Ordering::SeqCst);
-                self.calls.fetch_add(1, Ordering::SeqCst);
-                (0..64).into_par_iter().for_each(|_| std::thread::sleep(std::time::Duration::from_millis(1)));
-                DEPTH.set(d - 1);
-                Some(Arc::new(Image::new(4, 4)))
-            }
-        }
-        let mut s = Session::default();
-        let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 10})).unwrap()["comp"].as_u64().unwrap());
-        let clip = Footage {
-            kind: FootageKind::Video,
-            width: 4,
-            height: 4,
-            has_video: true,
-            frame_rate: FrameRate::FPS_30,
-            duration: Tick::from_seconds_f64(10.0),
-            ..Default::default()
-        };
-        let item = Arc::make_mut(&mut s.project).add_item("clip.mov", Default::default(), None, ItemKind::Footage(clip));
-        s.execute("layer.addItem", json!({"item": item.0})).unwrap();
-        let footage = Arc::new(Parallel::default());
-        let src = RenderSource {
-            project: s.project.clone(),
-            footage: footage.clone(),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        let f = Frames::default();
-        let content = f.content_of(&s.project, s.revision, cid);
-        let frames = 60;
-        for frame in 0..frames {
-            let key = FrameKey { revision: s.revision, content, comp: cid.0, frame, scale: 1000, view: 0, opts: 0 };
-            f.request(&src, key, cid, FrameRate::FPS_30.tick_of(frame), RenderOpts::default());
-        }
-        for _ in 0..4000 {
-            if f.inflight() == 0 {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        assert_eq!(f.inflight(), 0, "every queued frame rendered");
-        assert!(footage.calls.load(Ordering::SeqCst) >= frames as usize);
-        assert_eq!(footage.deepest.load(Ordering::SeqCst), 1, "renders nested on a waiting thread");
-    }
-
-    /// #329: scrubbing a long movie, the viewer frame of every step the pointer passed started
-    /// rendering and seeked the movie's decoder in turn; the frame under the pointer waited for
-    /// all of them. A newer viewer frame of another time calls off the one rendering, which is
-    /// not cached (its footage may be missing).
-    #[test]
-    fn a_newer_viewer_frame_calls_off_the_one_rendering() {
-        use effectcraft_engine::Session;
-        use effectcraft_engine::project::{Footage, FootageKind};
-        use effectcraft_engine::render::Image;
-        use effectcraft_engine::time::FrameRate;
-        use serde_json::json;
-        use std::cell::RefCell;
-        thread_local! {
-            static CANCEL: RefCell<Option<Arc<AtomicBool>>> = const { RefCell::new(None) };
-        }
-        /// A movie whose first frames take a long seek, which a called-off read gives up.
-        #[derive(Default)]
-        struct Seeking {
-            seeking: AtomicBool,
-            called_off: AtomicBool,
-        }
-        impl FootageSource for Seeking {
-            fn cancellable(&self, cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
-                let prev = CANCEL.replace(Some(cancel.clone()));
-                f();
-                CANCEL.set(prev);
-            }
-            fn frame(&self, _: ItemId, _: &Footage, t: Tick) -> Option<Arc<Image>> {
-                if t < Tick::from_seconds_f64(0.25) {
-                    self.seeking.store(true, Ordering::SeqCst);
-                    for _ in 0..1000 {
-                        if CANCEL.with_borrow(|c| c.as_ref().is_some_and(|c| c.load(Ordering::SeqCst))) {
-                            self.called_off.store(true, Ordering::SeqCst);
-                            return None;
-                        }
-                        std::thread::sleep(std::time::Duration::from_millis(5));
-                    }
-                }
-                Some(Arc::new(Image::new(4, 4)))
-            }
-        }
-        let mut s = Session::default();
-        let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 10})).unwrap()["comp"].as_u64().unwrap());
-        let clip = Footage {
-            kind: FootageKind::Video,
-            width: 4,
-            height: 4,
-            has_video: true,
-            frame_rate: FrameRate::FPS_30,
-            duration: Tick::from_seconds_f64(10.0),
-            ..Default::default()
-        };
-        let item = Arc::make_mut(&mut s.project).add_item("clip.mov", Default::default(), None, ItemKind::Footage(clip));
-        s.execute("layer.addItem", json!({"item": item.0})).unwrap();
-        let footage = Arc::new(Seeking::default());
-        let src = RenderSource {
-            project: s.project.clone(),
-            footage: footage.clone(),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        let f = Frames::default();
-        let content = f.content_of(&s.project, s.revision, cid);
-        let key = |frame| FrameKey { revision: s.revision, content, comp: cid.0, frame, scale: 1000, view: 0, opts: 0 };
-        f.request_urgent(&src, key(0), cid, Tick::ZERO, RenderOpts::default());
-        for _ in 0..1000 {
-            if footage.seeking.load(Ordering::SeqCst) {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(2));
-        }
-        assert!(footage.seeking.load(Ordering::SeqCst), "the first frame's render reached the footage");
-        f.request_urgent(&src, key(150), cid, FrameRate::FPS_30.tick_of(150), RenderOpts::default());
-        for _ in 0..1000 {
-            if f.inflight() == 0 {
-                break;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        assert!(footage.called_off.load(Ordering::SeqCst), "the superseded frame's seek ran on");
-        assert!(f.is_cached(&key(150)), "the newest frame rendered");
-        assert!(!f.is_cached(&key(0)), "a called-off frame is not cached");
-        assert_eq!(f.inflight(), 0, "released");
-    }
-
-    /// #284: scrubbing asks for a viewer frame at every step; a newer one drops the comp's viewer
-    /// frames still waiting (they would all render first), but not prefetch frames or another
-    /// comp's viewer frame.
-    #[test]
-    fn a_newer_viewer_frame_drops_the_ones_still_waiting() {
-        /// Starts nothing, so every request stays queued.
-        struct Idle;
-        impl RemoteFrames for Idle {
-            fn slots(&self) -> usize {
-                0
-            }
-            fn start(&self, _: RemoteJob, _: RemoteDone) {}
-        }
-        let mut f = Frames::default();
-        f.set_remote(Some(Arc::new(Idle)));
-        let src = RenderSource {
-            project: Arc::default(),
-            footage: Arc::new(effectcraft_engine::render::NoFootage),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        let request = |k: FrameKey, urgent: bool| f.request_with(&src, k, ItemId(k.comp), Tick::ZERO, RenderOpts::default(), urgent);
-        let other = FrameKey { comp: 2, ..key(1, 0, 0) };
-        request(other, true);
-        request(key(1, 20, 0), false);
-        for frame in 0..10 {
-            request(key(1, frame, 0), true);
-        }
-        let mut queued: Vec<(u64, i64, bool)> = f.queue.lock().unwrap().jobs.iter().map(|j| (j.key.comp, j.key.frame, j.urgent)).collect();
-        queued.sort();
-        assert_eq!(queued, [(1, 9, true), (1, 20, false), (2, 0, false)]);
-        assert_eq!(f.inflight(), 3, "dropped frames aren't in flight: the viewer can ask again");
-    }
-
-    /// Each time the GPU runs out of memory, half as many GPU frames are kept, down to a floor.
-    #[test]
-    fn running_out_of_video_memory_halves_the_gpu_frame_budget() {
-        let f = Frames::default();
-        let mut c = f.cache.lock().unwrap();
-        assert_eq!(c.gpu_budget, GPU_BUDGET);
-        c.gpu_out_of_memory();
-        assert_eq!(c.gpu_budget, GPU_BUDGET / 2);
-        for _ in 0..20 {
-            c.gpu_out_of_memory();
-        }
-        assert_eq!(c.gpu_budget, MIN_GPU_BUDGET);
-    }
-
-    #[test]
-    fn least_recently_shown_frames_go_first() {
-        let f = Frames::default();
-        f.set_budget(3 * 16);
-        for i in 0..3 {
-            insert(&f, key(1, i, 0));
-        }
-        // Frame 0 is shown again, so frame 1 is now the oldest.
-        assert!(f.get(&key(1, 0, 0)).is_some());
-        insert(&f, key(1, 3, 0));
-        assert!(f.is_cached(&key(1, 0, 0)) && !f.is_cached(&key(1, 1, 0)));
-        assert!(f.is_cached(&key(1, 2, 0)) && f.is_cached(&key(1, 3, 0)));
-    }
-
-    fn playhead(cur: i64, looping: bool) -> Playhead {
-        Playhead { series: key(1, 0, 0), cur, start: 0, end: 99, step: 1, looping }
-    }
-
-    /// #595: a playing preview's cache is full. The frames just ahead of the playhead were
-    /// rendered before the ones just shown, so plain LRU evicted them first and the preview
-    /// played into a gap. Frames the preview no longer reaches go first, then the ones it
-    /// reaches last.
-    #[test]
-    fn a_full_cache_keeps_the_frames_just_ahead_of_the_playhead() {
-        let f = Frames::default();
-        f.set_budget(4 * 16);
-        // Prefetch rendered 11..=13, then 10 was shown (the most recently used).
-        for i in [11, 12, 13, 10] {
-            insert(&f, key(1, i, 0));
-        }
-        let cached = |f: &Frames| f.cached_frames(&key(1, 0, 0));
-        f.set_playhead(Some(playhead(10, false)));
-        // The next frame rendered is the one the preview reaches last: the frames just ahead stay.
-        insert(&f, key(1, 14, 0));
-        assert_eq!(cached(&f), [10, 11, 12, 13]);
-        // Without looping, a frame behind the playhead goes before any frame ahead of it.
-        f.set_playhead(Some(playhead(12, false)));
-        insert(&f, key(1, 14, 0));
-        assert_eq!(cached(&f), [10, 12, 13, 14]);
-        // Looping, the frame just behind is the one reached last.
-        f.set_playhead(Some(playhead(13, true)));
-        insert(&f, key(1, 0, 0));
-        assert_eq!(cached(&f), [0, 10, 13, 14]);
-        // Stopped: least recently shown first again.
-        f.set_playhead(None);
-        insert(&f, key(1, 50, 0));
-        assert!(!f.is_cached(&key(1, 13, 0)) && f.is_cached(&key(1, 50, 0)));
-    }
-
-    /// #595: prefetch renders the frames the preview reaches first, whatever order they were
-    /// asked for in (a frame evicted and asked for again waited behind every frame further
-    /// ahead); queued frames the preview no longer reaches are dropped and not left in flight.
-    #[test]
-    fn prefetch_renders_the_frames_the_playhead_reaches_first() {
-        struct Idle;
-        impl RemoteFrames for Idle {
-            fn slots(&self) -> usize {
-                0
-            }
-            fn start(&self, _: RemoteJob, _: RemoteDone) {}
-        }
-        let mut f = Frames::default();
-        f.set_remote(Some(Arc::new(Idle)));
-        let src = RenderSource {
-            project: Arc::default(),
-            footage: Arc::new(effectcraft_engine::render::NoFootage),
-            expr: None,
-            layer_cache: Arc::default(),
-            gpu: None,
-            gpu_display: false,
-            disk: None,
-        };
-        for frame in [40, 30, 20, 5, 12, 11] {
-            f.request(&src, key(1, frame, 0), ItemId(1), Tick::ZERO, RenderOpts::default());
-        }
-        f.request(&src, FrameKey { comp: 2, ..key(1, 1, 0) }, ItemId(2), Tick::ZERO, RenderOpts::default());
-        f.set_playhead(Some(playhead(10, false)));
-        let mut order = vec![];
-        loop {
-            let mut q = f.queue.lock().unwrap();
-            let Some(i) = q.best() else { break };
-            let j = q.jobs.swap_remove(i);
-            order.push((j.key.comp, j.key.frame));
-        }
-        assert_eq!(order, [(1, 11), (1, 12), (1, 20), (1, 30), (1, 40), (2, 1)]);
-        assert_eq!(f.inflight(), 6, "frame 5, behind the playhead, is no longer in flight");
-    }
-
-    #[test]
-    fn frames_are_keyed_by_content_and_series_are_kept_apart() {
-        let f = Frames::default();
-        insert(&f, key(1, 0, 0));
-        insert(&f, key(2, 0, 0));
-        insert(&f, key(2, 1, 7));
-        // Other content or render options (Draft, shadows…) are another series.
-        assert_eq!(f.cached_frames(&key(2, 0, 0)), vec![0]);
-        assert_eq!(f.cached_frames(&key(2, 0, 7)), vec![1]);
-        // A later revision with the same content finds the frame (an edit elsewhere, an undo).
-        assert!(f.is_cached(&FrameKey { revision: 99, ..key(1, 0, 0) }));
-        assert!(!f.is_cached(&key(3, 0, 0)));
-    }
-
-    #[test]
-    fn live_edits_present_the_newest_completed_revision_without_going_backwards() {
-        let f = Frames::default();
-        let shown = key(1, 0, 0);
-        let newest = key(3, 0, 0);
-        let wanted = key(5, 0, 0);
-        insert(&f, shown);
-        insert(&f, newest);
-        insert(&f, key(2, 0, 0)); // Older worker finishes after the newer one.
-        let displayed = f.get_for_viewer(&wanted, Some(&shown)).unwrap().0;
-        assert_eq!(displayed, newest);
-        assert!(f.get_for_viewer(&wanted, Some(&displayed)).is_none(), "never replay an older completion");
-        insert(&f, wanted);
-        assert_eq!(f.get_for_viewer(&wanted, Some(&displayed)).unwrap().0, wanted, "settle on the exact final edit");
-        // Undo reuses the content of an earlier revision immediately.
-        let undo = FrameKey { revision: 6, ..shown };
-        let reused = f.get_for_viewer(&undo, Some(&wanted)).unwrap().0;
-        assert_eq!(reused.content, shown.content);
-        assert_eq!(reused.revision, undo.revision);
-    }
-
-    #[test]
-    fn live_edits_do_not_substitute_other_times_views_or_render_settings() {
-        let f = Frames::default();
-        let shown = key(1, 0, 0);
-        let wanted = key(3, 0, 0);
-        let done = key(2, 0, 0);
-        for mismatch in [
-            FrameKey { comp: 9, ..done },
-            FrameKey { frame: 1, ..done },
-            FrameKey { scale: 500, ..done },
-            FrameKey { view: 1, ..done },
-            FrameKey { opts: 1, ..done },
-            FrameKey { revision: 4, ..done },
-        ] {
-            f.clear();
-            insert(&f, mismatch);
-            assert!(f.get_for_viewer(&wanted, Some(&shown)).is_none(), "wrong candidate: {mismatch:?}");
-        }
-        f.clear();
-        insert(&f, done);
-        assert!(f.get_for_viewer(&wanted, None).is_none(), "no stale content on opening a viewer");
-        assert!(f.get_for_viewer(&wanted, Some(&FrameKey { comp: 9, ..shown })).is_none());
-        assert!(f.get_for_viewer(&wanted, Some(&FrameKey { frame: 1, ..shown })).is_none());
-        assert!(f.get_for_viewer(&wanted, Some(&FrameKey { view: 1, ..shown })).is_none());
-    }
-
-    #[test]
-    fn an_edit_keeps_the_frames_of_comps_it_does_not_touch() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        let b = ItemId(s.execute("comp.new", json!({"name": "B", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        let f = Frames::default();
-        let at = |s: &Session, c: ItemId| f.content_of(&s.project, s.revision, c);
-        let (a0, b0) = (at(&s, a), at(&s, b));
-        // Edit B: A's content (and frames) stay, B's change.
-        s.execute("layer.newSolid", json!({"comp": b.0, "color": "#ff0000"})).unwrap();
-        assert_eq!(at(&s, a), a0);
-        assert_ne!(at(&s, b), b0);
-        // Undo: B is back to the content its old frames were rendered for.
-        s.execute("edit.undo", json!({})).unwrap();
-        assert_eq!(at(&s, b), b0);
-    }
-
-    #[test]
-    fn a_long_drag_keeps_a_bounded_number_of_states() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        let f = Frames::default();
-        let mut last = None;
-        for i in 0..200 {
-            s.execute("comp.settings", json!({"width": 8 + i, "merge": "drag"})).unwrap();
-            let k = FrameKey { content: f.content_of(&s.project, s.revision, a), ..key(0, 0, 0) };
-            insert(&f, k);
-            last = Some(k);
-        }
-        // The snapshots and the frames kept stay bounded (a dropped identity's frames go with it,
-        // so a later state that reuses its addresses can't be shown an old frame).
-        assert!(f.keepers.lock().unwrap().1.len() <= MAX_KEEPERS);
-        assert!(f.cache.lock().unwrap().map.len() <= MAX_KEEPERS);
-        assert!(f.is_cached(&last.unwrap()), "the current state's frame stays");
-    }
-
-    #[test]
-    fn an_identity_keeps_its_comps_so_an_edit_in_place_still_changes_it() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        // A project nothing else holds (no undo history): make_mut would edit the comp in place,
-        // at the same address, if the identity hadn't kept a snapshot holding it.
-        let mut p = Arc::new((*s.project).clone());
-        drop(s);
-        let f = Frames::default();
-        let before = f.content_of(&p, 1, a);
-        let comp = Arc::make_mut(&mut p).comp_mut(a).unwrap();
-        comp.width = 16;
-        assert_ne!(f.content_of(&p, 2, a), before);
-    }
-
-    /// Audio, Lock and Shy (and Hide Shy Layers) don't change pixels: toggling them, in the comp
-    /// or a comp it nests, keeps its frames, also when toggled back (#103).
-    #[test]
-    fn audio_lock_and_shy_switches_keep_the_frames() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
-        let inner = ItemId(id(s.execute("comp.new", json!({"name": "Inner", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
-        let solid = id(s.execute("layer.newSolid", json!({"comp": inner.0, "color": "#ff0000"})).unwrap(), "layer");
-        let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
-        let nested = id(s.execute("layer.addItem", json!({"comp": outer.0, "item": inner.0})).unwrap(), "layer");
-        let f = Frames::default();
-        let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
-        let o0 = at(&s);
-        let switch = |s: &mut Session, comp: ItemId, layer: u64, sw: &str, v: bool| {
-            s.execute("layer.setSwitch", json!({"comp": comp.0, "layers": [layer], "switch": sw, "value": v})).unwrap();
-        };
-        for (comp, layer, sw) in [(outer, nested, "audio"), (outer, nested, "lock"), (outer, nested, "shy"), (inner, solid, "audio"), (inner, solid, "shy")] {
-            // Audio off; Lock and Shy on.
-            switch(&mut s, comp, layer, sw, sw != "audio");
-            assert_eq!(at(&s), o0, "{sw} on in {comp:?}");
-        }
-        s.execute("comp.setSwitch", json!({"comp": outer.0, "switch": "hideShy", "value": true})).unwrap();
-        assert_eq!(at(&s), o0, "Hide Shy Layers");
-        switch(&mut s, outer, nested, "audio", true);
-        switch(&mut s, outer, nested, "lock", false);
-        assert_eq!(at(&s), o0, "toggled back");
-        // Switches that change pixels still do.
-        switch(&mut s, inner, solid, "video", false);
-        let o1 = at(&s);
-        assert_ne!(o1, o0, "Video");
-        switch(&mut s, outer, nested, "audio", false);
-        assert_eq!(at(&s), o1, "a mute after a real edit keeps that edit's frames");
-        switch(&mut s, inner, solid, "video", true);
-        assert_ne!(at(&s), o1);
-    }
-
-    #[test]
-    fn markers_keep_the_frames() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
-        let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
-        let solid = id(s.execute("layer.newSolid", json!({"comp": outer.0, "color": "#ff0000"})).unwrap(), "layer");
-        let f = Frames::default();
-        let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
-        let o0 = at(&s);
-        s.execute("layer.addMarker", json!({"comp": outer.0, "layers": [solid], "time": 0.5, "comment": "beat"})).unwrap();
-        assert_eq!(at(&s), o0, "a marker changes no pixels, so it keeps the frames");
-    }
-
-    #[test]
-    fn markers_count_when_an_expression_can_read_them() {
-        use effectcraft_engine::Session;
-        use serde_json::json;
-        let mut s = Session::default();
-        let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
-        let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
-        let solid = id(s.execute("layer.newSolid", json!({"comp": outer.0, "color": "#ff0000"})).unwrap(), "layer");
-        s.execute("prop.setExpression", json!({"comp": outer.0, "layer": solid, "path": "transform/opacity", "expression": "1"})).unwrap();
-        let f = Frames::default();
-        let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
-        let o0 = at(&s);
-        s.execute("layer.addMarker", json!({"comp": outer.0, "layers": [solid], "time": 0.5, "comment": "beat"})).unwrap();
-        assert_ne!(at(&s), o0, "an expression can read the marker, so the frames change");
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/frames/tests.rs b/crates/ui-egui/src/frames/tests.rs
new file mode 100644
index 000000000..6da1dc269
--- /dev/null
+++ b/crates/ui-egui/src/frames/tests.rs
@@ -0,0 +1,927 @@
+use super::*;
+
+struct ProbeDisk {
+    keys: Mutex<HashSet<u128>>,
+    probes: std::sync::atomic::AtomicUsize,
+}
+
+impl RemoteFrames for ProbeDisk {
+    fn slots(&self) -> usize {
+        0
+    }
+
+    fn disk(&self) -> bool {
+        true
+    }
+
+    fn disk_contains(&self, key: u128) -> bool {
+        self.probes.fetch_add(1, Ordering::Relaxed);
+        self.keys.lock().unwrap().contains(&key)
+    }
+
+    fn start(&self, _: RemoteJob, _: RemoteDone) {}
+}
+
+fn disk_fixture(stored_frames: &[i64]) -> (Frames, RenderSource, FrameKey, RenderOpts, Arc<ProbeDisk>, u128) {
+    let mut session = effectcraft_engine::Session::default();
+    session.execute("comp.new", serde_json::json!({"width": 32, "height": 18, "duration": 1})).unwrap();
+    let comp = session.active_comp_id().unwrap();
+    let opts = RenderOpts::default();
+    let content = 1234;
+    let mut base = key(1, 0, opts_hash(&opts));
+    base.revision = 7;
+    base.comp = comp.0;
+    let disk = Arc::new(ProbeDisk { keys: Mutex::new(HashSet::new()), probes: 0.into() });
+    disk.keys.lock().unwrap().extend(stored_frames.iter().map(|frame| disk_cache::frame_key(content, *frame, base.scale, base.view ^ opts_hash(&opts))));
+    let mut frames = Frames::default();
+    frames.set_remote(Some(disk.clone()));
+    frames.content_keys.lock().unwrap().insert((base.revision, base.comp, 0), content);
+    let source = RenderSource {
+        project: session.project.clone(),
+        footage: session.footage.clone(),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    (frames, source, base, opts, disk, content)
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn disk_indicator_does_not_hash_on_ui_thread_and_coalesces_edits() {
+    use std::sync::mpsc;
+    use std::time::{Duration, Instant};
+    struct Disk(u128);
+    impl RemoteFrames for Disk {
+        fn slots(&self) -> usize {
+            1
+        }
+        fn disk(&self) -> bool {
+            true
+        }
+        fn disk_contains(&self, key: u128) -> bool {
+            self.0 == key
+        }
+        fn start(&self, _: RemoteJob, done: RemoteDone) {
+            done(Err("test has no renderer".into()));
+        }
+    }
+    let mut s = effectcraft_engine::Session::default();
+    s.execute("comp.new", serde_json::json!({"width":32,"height":18,"duration":1})).unwrap();
+    let cid = s.active_comp_id().unwrap();
+    let opts = RenderOpts::default();
+    let stored = disk_cache::frame_key(disk_cache::comp_content_key(&s.project, cid), 2, 1000, opts_hash(&opts));
+    let mut frames = Frames { pool: Some(rayon::ThreadPoolBuilder::new().num_threads(1).build().unwrap()), ..Default::default() };
+    frames.set_remote(Some(Arc::new(Disk(stored))));
+    let (entered, started) = mpsc::channel();
+    let (release, wait) = mpsc::channel();
+    frames.pool.as_ref().unwrap().spawn(move || {
+        entered.send(()).unwrap();
+        wait.recv_timeout(Duration::from_secs(5)).unwrap();
+    });
+    started.recv_timeout(Duration::from_secs(3)).unwrap();
+    let src = RenderSource {
+        project: s.project.clone(),
+        footage: s.footage.clone(),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    let mut base = key(1, 0, 0);
+    base.comp = cid.0;
+    for revision in 1..50 {
+        base.revision = revision;
+        assert!(frames.disk_frames(&src, &base, 0..30, &opts).is_empty());
+    }
+    assert!(frames.content_keys.lock().unwrap().is_empty(), "painting computed a content hash while the worker was blocked");
+    assert_eq!(frames.content_key_jobs.lock().unwrap().pending.len(), 1);
+    release.send(()).unwrap();
+    let until = Instant::now() + Duration::from_secs(3);
+    while !frames.content_keys.lock().unwrap().contains_key(&(base.revision, base.comp, 0)) {
+        assert!(Instant::now() < until);
+        std::thread::sleep(Duration::from_millis(1));
+    }
+    assert_eq!(frames.disk_frames(&src, &base, 0..30, &opts), vec![2], "the blue indicator must return once its key is ready");
+    assert_eq!(frames.content_keys.lock().unwrap().len(), 1, "superseded revisions were hashed");
+}
+
+#[test]
+fn disk_indicator_range_tracks_live_membership() {
+    let (frames, src, base, opts, disk, _) = disk_fixture(&[10, 12]);
+    assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 12]);
+    assert_eq!(disk.probes.load(Ordering::Relaxed), 3);
+
+    disk.keys.lock().unwrap().insert(disk_cache::frame_key(1234, 11, base.scale, base.view ^ opts_hash(&opts)));
+    assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 11, 12]);
+
+    insert(&frames, FrameKey { frame: 11, ..base });
+    disk.probes.store(0, Ordering::Relaxed);
+    assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10, 12]);
+    assert_eq!(disk.probes.load(Ordering::Relaxed), 2);
+
+    disk.keys.lock().unwrap().remove(&disk_cache::frame_key(1234, 12, base.scale, base.view ^ opts_hash(&opts)));
+    assert_eq!(frames.disk_frames(&src, &base, 10..13, &opts), vec![10]);
+
+    let mut revised = base;
+    revised.revision += 1;
+    frames.content_keys.lock().unwrap().insert((revised.revision, revised.comp, 0), 5678);
+    assert!(frames.disk_frames(&src, &revised, 10..13, &opts).is_empty());
+
+    let changed = FrameKey { scale: base.scale + 1, ..base };
+    assert!(frames.disk_frames(&src, &changed, 10..13, &opts).is_empty());
+    let changed = FrameKey { view: base.view + 1, ..base };
+    assert!(frames.disk_frames(&src, &changed, 10..13, &opts).is_empty());
+    assert!(frames.disk_frames(&src, &base, 10..13, &RenderOpts { draft: true, ..opts }).is_empty());
+}
+
+#[test]
+fn disk_indicator_range_is_bounded() {
+    let (frames, src, base, opts, disk, _) = disk_fixture(&[0, 1, 99_999]);
+    assert_eq!(frames.disk_frames(&src, &base, -5..2, &opts), vec![0, 1]);
+    assert_eq!(disk.probes.load(Ordering::Relaxed), 2);
+    disk.probes.store(0, Ordering::Relaxed);
+    assert_eq!(frames.disk_frames(&src, &base, 99_999..i64::MAX, &opts), vec![99_999]);
+    assert_eq!(disk.probes.load(Ordering::Relaxed), 1);
+    disk.probes.store(0, Ordering::Relaxed);
+    assert!(frames.disk_frames(&src, &base, 2..2, &opts).is_empty());
+    // Written as a struct literal: `3..2` trips clippy::reversed_empty_ranges.
+    let reversed = std::ops::Range { start: 3, end: 2 };
+    assert!(frames.disk_frames(&src, &base, reversed, &opts).is_empty());
+    assert_eq!(disk.probes.load(Ordering::Relaxed), 0);
+}
+
+/// Frames larger than the texture limit are averaged down by a whole factor (#201: an
+/// 11000×2200 comp at Full resolution against an 8192 limit).
+#[test]
+fn frames_over_the_texture_limit_are_averaged_down() {
+    assert_eq!(fitted_size([11000, 2200], 8192), [5500, 1100]);
+    assert_eq!(fitted_size([8192, 100], 8192), [8192, 100]);
+    assert_eq!(fitted_size([30000, 30000], 16384), [15000, 15000]);
+    assert_eq!(fitted_size([0, 0], 0), [0, 0]);
+    // 5×2 (three columns of white, then black) into 2 px: 3×2 blocks (the last one 2×2).
+    let w = egui::Color32::WHITE;
+    let b = egui::Color32::from_rgba_premultiplied(0, 0, 0, 255);
+    let img = egui::ColorImage::new([5, 2], vec![w, w, w, b, b, w, w, w, b, b]);
+    let out = fit_texture(img.clone(), 2);
+    assert_eq!(out.size, [2, 1]);
+    assert_eq!(out.pixels, vec![w, b]);
+    assert_eq!(fit_texture(img.clone(), 5).pixels, img.pixels);
+    let mixed = fit_texture(egui::ColorImage::new([2, 1], vec![w, b]), 1);
+    assert_eq!(mixed.pixels, vec![egui::Color32::from_rgba_premultiplied(128, 128, 128, 255)]);
+}
+
+#[test]
+fn retirement_reaches_existing_workers_and_keeps_cpu_frames_and_completion_live() {
+    let frames = Frames::default();
+    let worker = frames.worker();
+    let first = key(1, 0, 0);
+    insert(&frames, first);
+    frames.retire_gpu();
+    assert!(worker.gpu_retired.load(Ordering::Acquire), "already queued workers share retirement");
+    assert!(frames.is_cached(&first), "healthy materialized CPU frames survive");
+    let next = key(1, 1, 0);
+    frames.inflight.lock().unwrap().insert(next);
+    frames.queue.lock().unwrap().running.insert(next);
+    worker.finish_key(next, false, img(), web_time::Instant::now());
+    assert!(frames.is_cached(&next), "CPU retry can still publish");
+    assert_eq!(frames.inflight(), 0);
+    assert!(frames.queue.lock().unwrap().running.is_empty());
+}
+
+fn key(content: u64, frame: i64, opts: u64) -> FrameKey {
+    FrameKey { revision: content, content, comp: 1, frame, scale: 1000, view: 0, opts }
+}
+
+fn img() -> FrameImage {
+    FrameImage::Cpu(Arc::new(egui::ColorImage::new([2, 2], vec![egui::Color32::BLACK; 4])))
+}
+
+fn insert(f: &Frames, k: FrameKey) {
+    f.cache.lock().unwrap().insert(k, img());
+}
+
+/// A frame whose render panics (a GPU out of memory used to, on every frame thread) is
+/// released, not left "in progress" forever, so the viewer can ask for it again (#106).
+#[test]
+fn a_frame_whose_render_panics_is_released() {
+    use effectcraft_engine::Session;
+    use effectcraft_engine::project::{Footage, FootageKind};
+    use effectcraft_engine::render::Image;
+    use serde_json::json;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    #[derive(Default)]
+    struct Explodes(AtomicUsize);
+    impl FootageSource for Explodes {
+        fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
+            self.0.fetch_add(1, Ordering::SeqCst);
+            panic!("a decoder bug");
+        }
+    }
+    let mut s = Session::default();
+    let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    let clip = Footage { kind: FootageKind::Still, width: 8, height: 8, has_video: true, ..Default::default() };
+    let item = Arc::make_mut(&mut s.project).add_item("clip.png", Default::default(), None, ItemKind::Footage(clip));
+    s.execute("layer.addItem", json!({"item": item.0})).unwrap();
+    let footage = Arc::new(Explodes::default());
+    let src = RenderSource {
+        project: s.project.clone(),
+        footage: footage.clone(),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    let f = Frames::default();
+    let key = FrameKey { revision: s.revision, content: f.content_of(&s.project, s.revision, cid), ..key(0, 0, 0) };
+    let key = FrameKey { comp: cid.0, ..key };
+    f.request(&src, key, cid, Tick::ZERO, RenderOpts::default());
+    for _ in 0..1000 {
+        if f.inflight() == 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(5));
+    }
+    assert!(footage.0.load(Ordering::SeqCst) > 0, "the render reached the footage");
+    assert_eq!(f.inflight(), 0, "released");
+    assert!(!f.is_cached(&key));
+}
+
+/// #647: a pool thread waiting inside a render (on a parallel loop) never starts another
+/// frame render on top of it. Dragging a layer queues a frame every UI frame; renders used to
+/// nest on every thread, each holding its buffers, until memory ran out.
+#[test]
+fn a_waiting_render_never_starts_another_on_its_thread() {
+    use effectcraft_engine::Session;
+    use effectcraft_engine::project::{Footage, FootageKind};
+    use effectcraft_engine::render::Image;
+    use effectcraft_engine::time::FrameRate;
+    use serde_json::json;
+    use std::cell::Cell;
+    use std::sync::atomic::AtomicUsize;
+    thread_local! {
+        static DEPTH: Cell<usize> = const { Cell::new(0) };
+    }
+    /// A decoder that works in parallel, as the renderer does: its thread joins the loop and
+    /// may wait for the parts other threads took.
+    #[derive(Default)]
+    struct Parallel {
+        calls: AtomicUsize,
+        deepest: AtomicUsize,
+    }
+    impl FootageSource for Parallel {
+        fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option<Arc<Image>> {
+            let d = DEPTH.get() + 1;
+            DEPTH.set(d);
+            self.deepest.fetch_max(d, Ordering::SeqCst);
+            self.calls.fetch_add(1, Ordering::SeqCst);
+            (0..64).into_par_iter().for_each(|_| std::thread::sleep(std::time::Duration::from_millis(1)));
+            DEPTH.set(d - 1);
+            Some(Arc::new(Image::new(4, 4)))
+        }
+    }
+    let mut s = Session::default();
+    let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 10})).unwrap()["comp"].as_u64().unwrap());
+    let clip = Footage {
+        kind: FootageKind::Video,
+        width: 4,
+        height: 4,
+        has_video: true,
+        frame_rate: FrameRate::FPS_30,
+        duration: Tick::from_seconds_f64(10.0),
+        ..Default::default()
+    };
+    let item = Arc::make_mut(&mut s.project).add_item("clip.mov", Default::default(), None, ItemKind::Footage(clip));
+    s.execute("layer.addItem", json!({"item": item.0})).unwrap();
+    let footage = Arc::new(Parallel::default());
+    let src = RenderSource {
+        project: s.project.clone(),
+        footage: footage.clone(),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    let f = Frames::default();
+    let content = f.content_of(&s.project, s.revision, cid);
+    let frames = 60;
+    for frame in 0..frames {
+        let key = FrameKey { revision: s.revision, content, comp: cid.0, frame, scale: 1000, view: 0, opts: 0 };
+        f.request(&src, key, cid, FrameRate::FPS_30.tick_of(frame), RenderOpts::default());
+    }
+    for _ in 0..4000 {
+        if f.inflight() == 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(5));
+    }
+    assert_eq!(f.inflight(), 0, "every queued frame rendered");
+    assert!(footage.calls.load(Ordering::SeqCst) >= frames as usize);
+    assert_eq!(footage.deepest.load(Ordering::SeqCst), 1, "renders nested on a waiting thread");
+}
+
+/// #329: scrubbing a long movie, the viewer frame of every step the pointer passed started
+/// rendering and seeked the movie's decoder in turn; the frame under the pointer waited for
+/// all of them. A newer viewer frame of another time calls off the one rendering, which is
+/// not cached (its footage may be missing).
+#[test]
+fn a_newer_viewer_frame_calls_off_the_one_rendering() {
+    use effectcraft_engine::Session;
+    use effectcraft_engine::project::{Footage, FootageKind};
+    use effectcraft_engine::render::Image;
+    use effectcraft_engine::time::FrameRate;
+    use serde_json::json;
+    use std::cell::RefCell;
+    thread_local! {
+        static CANCEL: RefCell<Option<Arc<AtomicBool>>> = const { RefCell::new(None) };
+    }
+    /// A movie whose first frames take a long seek, which a called-off read gives up.
+    #[derive(Default)]
+    struct Seeking {
+        seeking: AtomicBool,
+        called_off: AtomicBool,
+    }
+    impl FootageSource for Seeking {
+        fn cancellable(&self, cancel: &Arc<AtomicBool>, f: &mut dyn FnMut()) {
+            let prev = CANCEL.replace(Some(cancel.clone()));
+            f();
+            CANCEL.set(prev);
+        }
+        fn frame(&self, _: ItemId, _: &Footage, t: Tick) -> Option<Arc<Image>> {
+            if t < Tick::from_seconds_f64(0.25) {
+                self.seeking.store(true, Ordering::SeqCst);
+                for _ in 0..1000 {
+                    if CANCEL.with_borrow(|c| c.as_ref().is_some_and(|c| c.load(Ordering::SeqCst))) {
+                        self.called_off.store(true, Ordering::SeqCst);
+                        return None;
+                    }
+                    std::thread::sleep(std::time::Duration::from_millis(5));
+                }
+            }
+            Some(Arc::new(Image::new(4, 4)))
+        }
+    }
+    let mut s = Session::default();
+    let cid = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 10})).unwrap()["comp"].as_u64().unwrap());
+    let clip = Footage {
+        kind: FootageKind::Video,
+        width: 4,
+        height: 4,
+        has_video: true,
+        frame_rate: FrameRate::FPS_30,
+        duration: Tick::from_seconds_f64(10.0),
+        ..Default::default()
+    };
+    let item = Arc::make_mut(&mut s.project).add_item("clip.mov", Default::default(), None, ItemKind::Footage(clip));
+    s.execute("layer.addItem", json!({"item": item.0})).unwrap();
+    let footage = Arc::new(Seeking::default());
+    let src = RenderSource {
+        project: s.project.clone(),
+        footage: footage.clone(),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    let f = Frames::default();
+    let content = f.content_of(&s.project, s.revision, cid);
+    let key = |frame| FrameKey { revision: s.revision, content, comp: cid.0, frame, scale: 1000, view: 0, opts: 0 };
+    f.request_urgent(&src, key(0), cid, Tick::ZERO, RenderOpts::default());
+    for _ in 0..1000 {
+        if footage.seeking.load(Ordering::SeqCst) {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(2));
+    }
+    assert!(footage.seeking.load(Ordering::SeqCst), "the first frame's render reached the footage");
+    f.request_urgent(&src, key(150), cid, FrameRate::FPS_30.tick_of(150), RenderOpts::default());
+    for _ in 0..1000 {
+        if f.inflight() == 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(5));
+    }
+    assert!(footage.called_off.load(Ordering::SeqCst), "the superseded frame's seek ran on");
+    assert!(f.is_cached(&key(150)), "the newest frame rendered");
+    assert!(!f.is_cached(&key(0)), "a called-off frame is not cached");
+    assert_eq!(f.inflight(), 0, "released");
+}
+
+/// #284: scrubbing asks for a viewer frame at every step; a newer one drops the comp's viewer
+/// frames still waiting (they would all render first), but not prefetch frames or another
+/// comp's viewer frame.
+#[test]
+fn a_newer_viewer_frame_drops_the_ones_still_waiting() {
+    /// Starts nothing, so every request stays queued.
+    struct Idle;
+    impl RemoteFrames for Idle {
+        fn slots(&self) -> usize {
+            0
+        }
+        fn start(&self, _: RemoteJob, _: RemoteDone) {}
+    }
+    let mut f = Frames::default();
+    f.set_remote(Some(Arc::new(Idle)));
+    let src = RenderSource {
+        project: Arc::default(),
+        footage: Arc::new(effectcraft_engine::render::NoFootage),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    };
+    let request = |k: FrameKey, urgent: bool| f.request_with(&src, k, ItemId(k.comp), Tick::ZERO, RenderOpts::default(), urgent);
+    let other = FrameKey { comp: 2, ..key(1, 0, 0) };
+    request(other, true);
+    request(key(1, 20, 0), false);
+    for frame in 0..10 {
+        request(key(1, frame, 0), true);
+    }
+    let mut queued: Vec<(u64, i64, bool)> = f.queue.lock().unwrap().jobs.iter().map(|j| (j.key.comp, j.key.frame, j.urgent)).collect();
+    queued.sort();
+    assert_eq!(queued, [(1, 9, true), (1, 20, false), (2, 0, false)]);
+    assert_eq!(f.inflight(), 3, "dropped frames aren't in flight: the viewer can ask again");
+}
+
+/// Each time the GPU runs out of memory, half as many GPU frames are kept, down to a floor.
+#[test]
+fn running_out_of_video_memory_halves_the_gpu_frame_budget() {
+    let f = Frames::default();
+    let mut c = f.cache.lock().unwrap();
+    assert_eq!(c.gpu_budget, GPU_BUDGET);
+    c.gpu_out_of_memory();
+    assert_eq!(c.gpu_budget, GPU_BUDGET / 2);
+    for _ in 0..20 {
+        c.gpu_out_of_memory();
+    }
+    assert_eq!(c.gpu_budget, MIN_GPU_BUDGET);
+}
+
+#[test]
+fn least_recently_shown_frames_go_first() {
+    let f = Frames::default();
+    f.set_budget(3 * 16);
+    for i in 0..3 {
+        insert(&f, key(1, i, 0));
+    }
+    // Frame 0 is shown again, so frame 1 is now the oldest.
+    assert!(f.get(&key(1, 0, 0)).is_some());
+    insert(&f, key(1, 3, 0));
+    assert!(f.is_cached(&key(1, 0, 0)) && !f.is_cached(&key(1, 1, 0)));
+    assert!(f.is_cached(&key(1, 2, 0)) && f.is_cached(&key(1, 3, 0)));
+}
+
+fn playhead(cur: i64, looping: bool) -> Playhead {
+    Playhead { series: key(1, 0, 0), cur, start: 0, end: 99, step: 1, looping }
+}
+
+/// #595: a playing preview's cache is full. The frames just ahead of the playhead were
+/// rendered before the ones just shown, so plain LRU evicted them first and the preview
+/// played into a gap. Frames the preview no longer reaches go first, then the ones it
+/// reaches last.
+#[test]
+fn a_full_cache_keeps_the_frames_just_ahead_of_the_playhead() {
+    let f = Frames::default();
+    f.set_budget(4 * 16);
+    // Prefetch rendered 11..=13, then 10 was shown (the most recently used).
+    for i in [11, 12, 13, 10] {
+        insert(&f, key(1, i, 0));
+    }
+    let cached = |f: &Frames| f.cached_frames(&key(1, 0, 0));
+    f.set_playhead(Some(playhead(10, false)));
+    // The next frame rendered is the one the preview reaches last: the frames just ahead stay.
+    insert(&f, key(1, 14, 0));
+    assert_eq!(cached(&f), [10, 11, 12, 13]);
+    // Without looping, a frame behind the playhead goes before any frame ahead of it.
+    f.set_playhead(Some(playhead(12, false)));
+    insert(&f, key(1, 14, 0));
+    assert_eq!(cached(&f), [10, 12, 13, 14]);
+    // Looping, the frame just behind is the one reached last.
+    f.set_playhead(Some(playhead(13, true)));
+    insert(&f, key(1, 0, 0));
+    assert_eq!(cached(&f), [0, 10, 13, 14]);
+    // Stopped: least recently shown first again.
+    f.set_playhead(None);
+    insert(&f, key(1, 50, 0));
+    assert!(!f.is_cached(&key(1, 13, 0)) && f.is_cached(&key(1, 50, 0)));
+}
+
+/// A frame source that queues jobs and never renders them: the tests check the queue.
+struct Idle;
+impl RemoteFrames for Idle {
+    fn slots(&self) -> usize {
+        0
+    }
+    fn start(&self, _: RemoteJob, _: RemoteDone) {}
+}
+
+fn idle_source() -> RenderSource {
+    RenderSource {
+        project: Arc::default(),
+        footage: Arc::new(effectcraft_engine::render::NoFootage),
+        expr: None,
+        layer_cache: Arc::default(),
+        gpu: None,
+        gpu_display: false,
+        disk: None,
+    }
+}
+
+/// #595: prefetch renders the frames the preview reaches first, whatever order they were
+/// asked for in (a frame evicted and asked for again waited behind every frame further
+/// ahead); queued frames the preview no longer reaches are dropped and not left in flight.
+#[test]
+fn prefetch_renders_the_frames_the_playhead_reaches_first() {
+    let mut f = Frames::default();
+    f.set_remote(Some(Arc::new(Idle)));
+    let src = idle_source();
+    for frame in [40, 30, 20, 5, 12, 11] {
+        f.request(&src, key(1, frame, 0), ItemId(1), Tick::ZERO, RenderOpts::default());
+    }
+    f.request(&src, FrameKey { comp: 2, ..key(1, 1, 0) }, ItemId(2), Tick::ZERO, RenderOpts::default());
+    f.set_playhead(Some(playhead(10, false)));
+    let mut order = vec![];
+    loop {
+        let mut q = f.queue.lock().unwrap();
+        let Some(i) = q.best() else { break };
+        let j = q.jobs.swap_remove(i);
+        order.push((j.key.comp, j.key.frame));
+    }
+    assert_eq!(order, [(1, 11), (1, 12), (1, 20), (1, 30), (1, 40), (2, 1)]);
+    assert_eq!(f.inflight(), 6, "frame 5, behind the playhead, is no longer in flight");
+}
+
+/// The cache is full. A zoom (or preview-resolution) change left the frames of the old
+/// size to the plain least-recently-shown order, so the frames of the zoom the viewer is back
+/// at went before the ones of the abandoned zoom. The other size's frames go first, then the
+/// order is as before.
+#[test]
+fn a_size_change_evicts_frames_of_other_sizes_first() {
+    let mut f = Frames::default();
+    f.set_remote(Some(Arc::new(Idle)));
+    f.set_budget(4 * 16);
+    let at = |frame, scale| FrameKey { scale, ..key(1, frame, 0) };
+    // 100% (frames 0..=1) is cached, then 50% (2..=3): the 100% frames are the oldest.
+    for (frame, scale) in [(0, 1000), (1, 1000), (2, 500), (3, 500)] {
+        insert(&f, at(frame, scale));
+    }
+    // A passive viewer at 50% asks for a frame: that doesn't change which size is kept.
+    f.request(&idle_source(), at(9, 500), ItemId(1), Tick::ZERO, RenderOpts::default());
+    // Back at 100%: the viewer asks for frame 4.
+    f.request_urgent(&idle_source(), at(4, 1000), ItemId(1), Tick::ZERO, RenderOpts::default());
+    f.request(&idle_source(), at(10, 500), ItemId(1), Tick::ZERO, RenderOpts::default());
+    insert(&f, at(4, 1000));
+    assert!(
+        f.is_cached(&at(0, 1000)) && f.is_cached(&at(1, 1000)) && !f.is_cached(&at(2, 500)) && f.is_cached(&at(3, 500)),
+        "the first frame of the old size goes, not the cached ones of the current size"
+    );
+    insert(&f, at(5, 1000));
+    assert!(!f.is_cached(&at(3, 500)), "then the last frame of the old size");
+    assert_eq!(f.cached_frames(&at(0, 1000)), [0, 1, 4, 5]);
+    // No other size left: least recently shown first again.
+    insert(&f, at(6, 1000));
+    assert_eq!(f.cached_frames(&at(0, 1000)), [1, 4, 5, 6]);
+}
+
+#[test]
+fn frames_are_keyed_by_content_and_series_are_kept_apart() {
+    let f = Frames::default();
+    insert(&f, key(1, 0, 0));
+    insert(&f, key(2, 0, 0));
+    insert(&f, key(2, 1, 7));
+    // Other content or render options (Draft, shadows…) are another series.
+    assert_eq!(f.cached_frames(&key(2, 0, 0)), vec![0]);
+    assert_eq!(f.cached_frames(&key(2, 0, 7)), vec![1]);
+    // A later revision with the same content finds the frame (an edit elsewhere, an undo).
+    assert!(f.is_cached(&FrameKey { revision: 99, ..key(1, 0, 0) }));
+    assert!(!f.is_cached(&key(3, 0, 0)));
+}
+
+#[test]
+fn live_edits_present_the_newest_completed_revision_without_going_backwards() {
+    let f = Frames::default();
+    let shown = key(1, 0, 0);
+    let newest = key(3, 0, 0);
+    let wanted = key(5, 0, 0);
+    insert(&f, shown);
+    insert(&f, newest);
+    insert(&f, key(2, 0, 0)); // Older worker finishes after the newer one.
+    let displayed = f.get_for_viewer(&wanted, Some(&shown)).unwrap().0;
+    assert_eq!(displayed, newest);
+    assert!(f.get_for_viewer(&wanted, Some(&displayed)).is_none(), "never replay an older completion");
+    insert(&f, wanted);
+    assert_eq!(f.get_for_viewer(&wanted, Some(&displayed)).unwrap().0, wanted, "settle on the exact final edit");
+    // Undo reuses the content of an earlier revision immediately.
+    let undo = FrameKey { revision: 6, ..shown };
+    let reused = f.get_for_viewer(&undo, Some(&wanted)).unwrap().0;
+    assert_eq!(reused.content, shown.content);
+    assert_eq!(reused.revision, undo.revision);
+}
+
+#[test]
+fn live_edits_do_not_substitute_other_times_views_or_render_settings() {
+    let f = Frames::default();
+    let shown = key(1, 0, 0);
+    let wanted = key(3, 0, 0);
+    let done = key(2, 0, 0);
+    for mismatch in [
+        FrameKey { comp: 9, ..done },
+        FrameKey { frame: 1, ..done },
+        FrameKey { scale: 500, ..done },
+        FrameKey { view: 1, ..done },
+        FrameKey { opts: 1, ..done },
+        FrameKey { revision: 4, ..done },
+    ] {
+        f.clear();
+        insert(&f, mismatch);
+        assert!(f.get_for_viewer(&wanted, Some(&shown)).is_none(), "wrong candidate: {mismatch:?}");
+    }
+    f.clear();
+    insert(&f, done);
+    assert!(f.get_for_viewer(&wanted, None).is_none(), "no stale content on opening a viewer");
+    assert!(f.get_for_viewer(&wanted, Some(&FrameKey { comp: 9, ..shown })).is_none());
+    assert!(f.get_for_viewer(&wanted, Some(&FrameKey { frame: 1, ..shown })).is_none());
+    assert!(f.get_for_viewer(&wanted, Some(&FrameKey { view: 1, ..shown })).is_none());
+}
+
+#[test]
+fn an_edit_keeps_the_frames_of_comps_it_does_not_touch() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    let b = ItemId(s.execute("comp.new", json!({"name": "B", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    let f = Frames::default();
+    let at = |s: &Session, c: ItemId| f.content_of(&s.project, s.revision, c);
+    let (a0, b0) = (at(&s, a), at(&s, b));
+    // Edit B: A's content (and frames) stay, B's change.
+    s.execute("layer.newSolid", json!({"comp": b.0, "color": "#ff0000"})).unwrap();
+    assert_eq!(at(&s, a), a0);
+    assert_ne!(at(&s, b), b0);
+    // Undo: B is back to the content its old frames were rendered for.
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(at(&s, b), b0);
+}
+
+#[test]
+fn a_long_drag_keeps_a_bounded_number_of_states() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    let f = Frames::default();
+    let mut last = None;
+    for i in 0..200 {
+        s.execute("comp.settings", json!({"width": 8 + i, "merge": "drag"})).unwrap();
+        let k = FrameKey { content: f.content_of(&s.project, s.revision, a), ..key(0, 0, 0) };
+        insert(&f, k);
+        last = Some(k);
+    }
+    // The snapshots and the frames kept stay bounded (a dropped identity's frames go with it,
+    // so a later state that reuses its addresses can't be shown an old frame).
+    assert!(f.keepers.lock().unwrap().1.len() <= MAX_KEEPERS);
+    assert!(f.cache.lock().unwrap().map.len() <= MAX_KEEPERS);
+    assert!(f.is_cached(&last.unwrap()), "the current state's frame stays");
+}
+
+#[test]
+fn an_identity_keeps_its_comps_so_an_edit_in_place_still_changes_it() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let a = ItemId(s.execute("comp.new", json!({"name": "A", "width": 8, "height": 8, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    // A project nothing else holds (no undo history): make_mut would edit the comp in place,
+    // at the same address, if the identity hadn't kept a snapshot holding it.
+    let mut p = Arc::new((*s.project).clone());
+    drop(s);
+    let f = Frames::default();
+    let before = f.content_of(&p, 1, a);
+    let comp = Arc::make_mut(&mut p).comp_mut(a).unwrap();
+    comp.width = 16;
+    assert_ne!(f.content_of(&p, 2, a), before);
+}
+
+/// Audio, Lock and Shy (and Hide Shy Layers) don't change pixels: toggling them, in the comp
+/// or a comp it nests, keeps its frames, also when toggled back (#103).
+#[test]
+fn audio_lock_and_shy_switches_keep_the_frames() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
+    let inner = ItemId(id(s.execute("comp.new", json!({"name": "Inner", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
+    let solid = id(s.execute("layer.newSolid", json!({"comp": inner.0, "color": "#ff0000"})).unwrap(), "layer");
+    let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
+    let nested = id(s.execute("layer.addItem", json!({"comp": outer.0, "item": inner.0})).unwrap(), "layer");
+    let f = Frames::default();
+    let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
+    let o0 = at(&s);
+    let switch = |s: &mut Session, comp: ItemId, layer: u64, sw: &str, v: bool| {
+        s.execute("layer.setSwitch", json!({"comp": comp.0, "layers": [layer], "switch": sw, "value": v})).unwrap();
+    };
+    for (comp, layer, sw) in [(outer, nested, "audio"), (outer, nested, "lock"), (outer, nested, "shy"), (inner, solid, "audio"), (inner, solid, "shy")] {
+        // Audio off; Lock and Shy on.
+        switch(&mut s, comp, layer, sw, sw != "audio");
+        assert_eq!(at(&s), o0, "{sw} on in {comp:?}");
+    }
+    s.execute("comp.setSwitch", json!({"comp": outer.0, "switch": "hideShy", "value": true})).unwrap();
+    assert_eq!(at(&s), o0, "Hide Shy Layers");
+    switch(&mut s, outer, nested, "audio", true);
+    switch(&mut s, outer, nested, "lock", false);
+    assert_eq!(at(&s), o0, "toggled back");
+    // Switches that change pixels still do.
+    switch(&mut s, inner, solid, "video", false);
+    let o1 = at(&s);
+    assert_ne!(o1, o0, "Video");
+    switch(&mut s, outer, nested, "audio", false);
+    assert_eq!(at(&s), o1, "a mute after a real edit keeps that edit's frames");
+    switch(&mut s, inner, solid, "video", true);
+    assert_ne!(at(&s), o1);
+}
+
+/// A cut or trim recaches only the frames of the layers it touched (#1641), and none are
+/// kept when the change reaches other layers (here a child of the trimmed layer).
+#[test]
+fn an_edit_keeps_the_frames_outside_the_layers_it_changed() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
+    let comp = ItemId(id(s.execute("comp.new", json!({"name": "Edit", "width": 8, "height": 8, "duration": 10})).unwrap(), "comp"));
+    let a = id(s.execute("layer.newSolid", json!({"comp": comp.0, "color": "#ff0000"})).unwrap(), "layer");
+    let b = id(s.execute("layer.newSolid", json!({"comp": comp.0, "color": "#00ff00"})).unwrap(), "layer");
+    s.execute("layer.timing", json!({"layers": [a], "in": 0, "out": 4})).unwrap();
+    s.execute("layer.timing", json!({"layers": [b], "in": 4, "out": 10})).unwrap();
+    let (fr, out) = s.project.comp(comp).map(|c| (c.frame_rate, c.layers.iter().find(|l| l.id.0 == a).unwrap().out_point)).unwrap();
+    let frames: Vec<i64> = (0..fr.frame_at(Tick::from_seconds_f64(10.0))).collect();
+    let f = Frames::default();
+    let cache_all = |s: &Session| {
+        let c = f.content_of(&s.project, s.revision, comp);
+        frames.iter().for_each(|&n| insert(&f, key(c, n, 0)));
+        c
+    };
+    let cached = |c: u64| frames.iter().filter(|&&n| f.is_cached(&key(c, n, 0))).copied().collect::<Vec<_>>();
+    let before = cache_all(&s);
+    s.execute("time.set", json!({"time": 2.0})).unwrap();
+    s.execute("edit.splitLayer", json!({"layers": [a]})).unwrap();
+    let after = f.content_of(&s.project, s.revision, comp);
+    assert_ne!(after, before);
+    let kept: Vec<i64> = (fr.frame_at(out) + 2..frames.len() as i64).collect();
+    assert_eq!(cached(after), kept, "the cut layer's frames (and one either side) render again; the rest stay");
+
+    s.execute("layer.setParent", json!({"layers": [b], "parent": a})).unwrap();
+    let parented = cache_all(&s);
+    s.execute("layer.timing", json!({"layers": [a], "out": 1})).unwrap();
+    assert_eq!(cached(f.content_of(&s.project, s.revision, comp)), Vec::<i64>::new(), "the trimmed layer's child moves everywhere");
+    assert_eq!(cached(parented).len(), frames.len(), "the earlier frames stay for undo");
+}
+
+/// Every frame an edit keeps renders as a fresh render of the edited project does: Solo
+/// hides the other layers at every frame, and a camera reaches the frames whose shutter
+/// samples it (#1641 review).
+#[test]
+fn the_frames_an_edit_keeps_match_a_fresh_render() {
+    use effectcraft_engine::Session;
+    use effectcraft_engine::render::NoFootage;
+    use serde_json::json;
+    // Cache every frame of `comp`, run `edit`, check the frames kept against fresh renders.
+    fn kept(s: &mut Session, comp: ItemId, edit: serde_json::Value) -> Vec<i64> {
+        let (fr, n) = s.project.comp(comp).map(|c| (c.frame_rate, c.frame_rate.frame_at(c.duration))).unwrap();
+        let f = Frames::default();
+        let before = f.content_of(&s.project, s.revision, comp);
+        (0..n).for_each(|i| insert(&f, key(before, i, 0)));
+        let old = s.project.clone();
+        s.execute(edit["cmd"].as_str().unwrap(), edit["params"].clone()).unwrap();
+        let after = f.content_of(&s.project, s.revision, comp);
+        let kept: Vec<i64> = (0..n).filter(|&i| f.is_cached(&key(after, i, 0))).collect();
+        let render = |p, i| Renderer::new(p, &NoFootage, RenderOpts::default()).comp_frame(comp, fr.tick_of(i));
+        for &i in &kept {
+            assert_eq!(render(&old, i), render(&s.project, i), "kept frame {i} draws other pixels now");
+        }
+        kept
+    }
+    let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
+    let mut s = Session::default();
+
+    // Solo on a 2–3 s layer hides the 10 s underlay everywhere; turning it off shows it again.
+    let comp = ItemId(id(s.execute("comp.new", json!({"name": "Solo", "width": 8, "height": 8, "duration": 10})).unwrap(), "comp"));
+    s.execute("layer.newSolid", json!({"comp": comp.0, "color": "#ff0000"})).unwrap();
+    let short = id(s.execute("layer.newSolid", json!({"comp": comp.0, "color": "#00ff00"})).unwrap(), "layer");
+    s.execute("layer.timing", json!({"layers": [short], "in": 2, "out": 3})).unwrap();
+    let solo = |on: bool| json!({"cmd": "layer.setSwitch", "params": {"layers": [short], "switch": "solo", "value": on}});
+    assert_eq!(kept(&mut s, comp, solo(true)), Vec::<i64>::new());
+    assert_eq!(kept(&mut s, comp, solo(false)), Vec::<i64>::new());
+
+    // A 2–3 s camera over a 4 s motion-blurred 3D layer, shutter 720° at phase 360°: a frame
+    // samples 1 to 3 frames ahead, so moving the camera reaches the 3 frames before it.
+    let comp = ItemId(id(
+        s.execute("comp.new", json!({"name": "Cam", "width": 16, "height": 16, "duration": 4, "frameRate": 30, "shutterAngle": 720, "shutterPhase": 360}))
+            .unwrap(),
+        "comp",
+    ));
+    let plane = id(s.execute("layer.newSolid", json!({"comp": comp.0, "color": "#ff0000"})).unwrap(), "layer");
+    for sw in ["threeD", "motionBlur"] {
+        s.execute("layer.setSwitch", json!({"layers": [plane], "switch": sw, "value": true})).unwrap();
+    }
+    let cam = id(s.execute("layer.newCamera", json!({"comp": comp.0})).unwrap(), "layer");
+    s.execute("layer.timing", json!({"layers": [cam], "in": 2, "out": 3})).unwrap();
+    let moved = kept(&mut s, comp, json!({"cmd": "prop.set", "params": {"comp": comp.0, "layer": cam, "path": "transform/position", "value": [40, 8, -30]}}));
+    assert!(moved.contains(&0) && moved.contains(&100), "frames far from the camera stay: {moved:?}");
+    assert!(!(56..=91).any(|f| moved.contains(&f)), "frames whose shutter samples the camera render again: {moved:?}");
+}
+
+#[test]
+fn short_solid_additions_and_removals_keep_unaffected_frames() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let comp = ItemId(s.execute("comp.new", json!({"width": 8, "height": 8, "frameRate": 30, "duration": 20})).unwrap()["comp"].as_u64().unwrap());
+    s.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
+    let f = Frames::default();
+    let cache_all = |s: &Session| {
+        let content = f.content_of(&s.project, s.revision, comp);
+        (0..600).for_each(|n| insert(&f, key(content, n, 0)));
+    };
+    let cached = |s: &Session| f.cached_frames(&key(f.content_of(&s.project, s.revision, comp), 0, 0));
+    // 2–3 s, a quarter frame of the default shutter and a frame of rounding either side.
+    let kept: Vec<i64> = (0..=57).chain(92..600).collect();
+    cache_all(&s);
+    let solid = s.execute("layer.newSolid", json!({"color": "#00ff00"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.timing", json!({"layers": [solid], "in": 2, "out": 3})).unwrap();
+    assert_eq!(cached(&s), kept, "adding a source invalidates only frames 58..=91");
+    cache_all(&s);
+    s.execute("edit.undo", json!({})).unwrap();
+    s.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(cached(&s), (0..600).collect::<Vec<_>>(), "undoing the addition restores every frame");
+    s.execute("edit.redo", json!({})).unwrap();
+    s.execute("edit.redo", json!({})).unwrap();
+    assert_eq!(cached(&s), (0..600).collect::<Vec<_>>(), "redoing the addition restores every frame");
+    s.execute("edit.clear", json!({"layers": [solid]})).unwrap();
+    assert_eq!(cached(&s), kept, "removing its layer invalidates the same span");
+}
+
+#[test]
+fn adding_a_source_does_not_hide_changes_to_existing_dependencies() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    for (command, params) in [
+        ("layer.settings", json!({"comp": "Outer", "layer": "Underlay", "color": "#0000ff"})),
+        ("prop.set", json!({"comp": "Inner", "layer": "Inner solid", "path": "transform/opacity", "value": 40})),
+    ] {
+        let mut s = Session::default();
+        let comp = ItemId(
+            s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "frameRate": 30, "duration": 20})).unwrap()["comp"].as_u64().unwrap(),
+        );
+        s.execute("layer.newSolid", json!({"name": "Underlay", "color": "#ff0000"})).unwrap();
+        s.execute("comp.new", json!({"name": "Inner", "width": 8, "height": 8, "duration": 20})).unwrap();
+        s.execute("layer.newSolid", json!({"name": "Inner solid", "color": "#00ff00"})).unwrap();
+        s.execute("comp.open", json!({"comp": "Outer"})).unwrap();
+        s.execute("layer.addItem", json!({"item": "Inner"})).unwrap();
+        let f = Frames::default();
+        let before = f.content_of(&s.project, s.revision, comp);
+        (0..600).for_each(|n| insert(&f, key(before, n, 0)));
+        s.execute(command, params).unwrap();
+        let solid = s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap()["layer"].as_u64().unwrap();
+        s.execute("layer.timing", json!({"layers": [solid], "in": 2, "out": 3})).unwrap();
+        let after = f.content_of(&s.project, s.revision, comp);
+        assert!(f.cached_frames(&key(after, 0, 0)).is_empty(), "{command} changes pixels outside the added layer");
+    }
+}
+
+#[test]
+fn markers_keep_the_frames() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
+    let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
+    let solid = id(s.execute("layer.newSolid", json!({"comp": outer.0, "color": "#ff0000"})).unwrap(), "layer");
+    let f = Frames::default();
+    let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
+    let o0 = at(&s);
+    s.execute("layer.addMarker", json!({"comp": outer.0, "layers": [solid], "time": 0.5, "comment": "beat"})).unwrap();
+    assert_eq!(at(&s), o0, "a marker changes no pixels, so it keeps the frames");
+}
+
+#[test]
+fn markers_count_when_an_expression_can_read_them() {
+    use effectcraft_engine::Session;
+    use serde_json::json;
+    let mut s = Session::default();
+    let id = |v: serde_json::Value, k: &str| v[k].as_u64().unwrap();
+    let outer = ItemId(id(s.execute("comp.new", json!({"name": "Outer", "width": 8, "height": 8, "duration": 1})).unwrap(), "comp"));
+    let solid = id(s.execute("layer.newSolid", json!({"comp": outer.0, "color": "#ff0000"})).unwrap(), "layer");
+    s.execute("prop.setExpression", json!({"comp": outer.0, "layer": solid, "path": "transform/opacity", "expression": "1"})).unwrap();
+    let f = Frames::default();
+    let at = |s: &Session| f.content_of(&s.project, s.revision, outer);
+    let o0 = at(&s);
+    s.execute("layer.addMarker", json!({"comp": outer.0, "layers": [solid], "time": 0.5, "comment": "beat"})).unwrap();
+    assert_ne!(at(&s), o0, "an expression can read the marker, so the frames change");
+}
diff --git a/crates/ui-egui/src/header.rs b/crates/ui-egui/src/header.rs
index fb381cfd3..3eee89453 100644
--- a/crates/ui-egui/src/header.rs
+++ b/crates/ui-egui/src/header.rs
@@ -15,18 +15,30 @@ use effectcraft_engine::commands::shape_tool::{PaintKind, ToolPaint};
 use effectcraft_engine::project::{LayerId, LayerSource, PropGroup};
 use effectcraft_engine::viewer as vw;
 
+/// Draws the Tools bar into `rect`: brand (About), Home, the tool slots with their fly-out
+/// menus and press-and-hold picks, options for the active tool (shape paint, puppet, roto),
+/// Snapping, then Discord, GitHub, website, appearance and workspace controls. Clicks apply
+/// tool, dialog, theme and workspace changes to `app` or run their commands.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().clone();
     p.rect_filled(rect, 0.0, t.header_bg);
     p.line_segment([rect.left_bottom(), rect.right_bottom()], Stroke::new(1.0, t.app_bg));
     let cy = rect.center().y;
-    let mut x = rect.min.x + if app.integrated_titlebar && !app.ui.show_menu_bar { 80.0 } else { 10.0 };
+    let x = rect.min.x + if app.integrated_titlebar && !app.ui.show_menu_bar { 80.0 } else { 10.0 };
+    let x = brand_and_home(app, ui, &p, x, cy);
+    let x = tool_slots(app, ui, &p, x, cy);
+    let x = tool_options_bar(app, ui, &p, x + 10.0, cy);
+    let x = snapping_toggle(app, ui, &p, x, cy);
+    right_side(app, ui, &p, rect, x, cy);
+}
 
-    // Brand mark.
+/// The brand mark (About) and the Home button; returns the x after them.
+fn brand_and_home(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, mut x: f32, cy: f32) -> f32 {
+    let t = app.tokens;
     let brand = Rect::from_min_size(pos2(x, cy - 12.0), vec2(24.0, 24.0));
-    paint_logo(&p, brand);
-    let bresp = ui.interact(brand, egui::Id::new("brand"), Sense::click());
+    paint_logo(p, brand);
+    let bresp = ui.interact(brand, egui::Id::unique("brand"), Sense::click());
     app.auto.add_response("header.about", &bresp, "About EffectCraft");
     widgets::focus_outline(ui, &bresp, &t);
     if bresp.on_hover_text(tr("About EffectCraft")).clicked() {
@@ -34,87 +46,27 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     x += 32.0;
 
-    // Home.
     let home = Rect::from_min_size(pos2(x, cy - 13.0), vec2(26.0, 26.0));
-    let home_response = widgets::icon_button(ui, home, Icon::Home, app.ui.start_screen, &t, egui::Id::new("tool-home")).on_hover_text(tr("Home"));
+    let home_response = widgets::icon_button(ui, home, Icon::Home, app.ui.start_screen, &t, egui::Id::unique("tool-home")).on_hover_text(tr("Home"));
     app.auto.add_response("header.home", &home_response, "Home");
     if home_response.clicked() {
         app.ui.start_screen = !app.ui.start_screen;
     }
     x += 30.0;
     p.line_segment([pos2(x, cy - 10.0), pos2(x, cy + 10.0)], Stroke::new(1.0, t.separator));
-    x += 6.0;
+    x + 6.0
+}
 
-    // Tool slots (with group separators after camera tools and pan-behind).
-    let held_id = egui::Id::new("tool-slot-held");
+/// The tool slots (with group separators after camera tools and pan-behind); returns the x after them.
+fn tool_slots(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, mut x: f32, cy: f32) -> f32 {
+    let t = app.tokens;
+    let held_id = egui::Id::unique("tool-slot-held");
     if ui.input(|i| i.pointer.any_pressed()) {
         ui.data_mut(|d| d.remove::<egui::Id>(held_id));
     }
     for (si, slot) in Tool::SLOTS.iter().enumerate() {
-        let cur = app.ui.slot_tools.get(si).copied().unwrap_or(slot[0]);
         let r = Rect::from_min_size(pos2(x, cy - 13.0), vec2(26.0, 26.0));
-        let active = slot.contains(&app.ui.tool);
-        let id = egui::Id::new(("tool-slot", si));
-        let resp = widgets::icon_button(ui, r, cur.icon(), active, &t, id);
-        if slot.len() > 1 {
-            // Flyout corner triangle.
-            p.add(egui::Shape::convex_polygon(
-                vec![pos2(r.max.x - 2.0, r.max.y - 6.0), pos2(r.max.x - 2.0, r.max.y - 2.0), pos2(r.max.x - 6.0, r.max.y - 2.0)],
-                if active { Color32::WHITE } else { t.text_dim },
-                Stroke::NONE,
-            ));
-        }
-        app.auto.add_response(&format!("tools.{cur:?}"), &resp, cur.label());
-        let tip = match cur.shortcut() {
-            Some(s) => format!("{} ({})", cur.label(), crate::menus::shortcut_text(s)),
-            None => cur.label().to_string(),
-        };
-        let resp = resp.on_hover_text(tip);
-        let held = ui.data(|d| d.get_temp::<egui::Id>(held_id)) == Some(id);
-        if resp.clicked() && !held {
-            app.ui.tool = cur;
-        }
-        // Ctrl+double-click Pan Behind: Center Anchor Point in Layer Content.
-        if cur == Tool::PanBehind
-            && resp.double_clicked()
-            && ui.input(|i| i.modifiers.command)
-            && let Err(e) = crate::menus::invoke(app, ui.ctx(), "layer.centerAnchor", json!({}))
-        {
-            app.ui.status = e;
-        }
-        if slot.len() > 1 {
-            let held_for = resp.is_pointer_button_down_on().then(|| ui.input(|i| i.pointer.press_start_time().map(|s| i.time - s))).flatten();
-            if let Some(seconds) = held_for
-                && seconds < 0.35
-            {
-                ui.ctx().request_repaint_after(std::time::Duration::from_secs_f64(0.35 - seconds));
-            }
-            let long_press = held_for.is_some_and(|seconds| seconds >= 0.35) && !held;
-            let command = if resp.secondary_clicked() || long_press {
-                if long_press {
-                    ui.data_mut(|d| d.insert_temp(held_id, id));
-                }
-                Some(egui::SetOpenCommand::Bool(true))
-            } else if resp.clicked() && !held {
-                Some(egui::SetOpenCommand::Bool(false))
-            } else {
-                None
-            };
-            let close_behavior = if held && resp.clicked() { egui::PopupCloseBehavior::IgnoreClicks } else { egui::PopupCloseBehavior::CloseOnClickOutside };
-            egui::Popup::menu(&resp).style(crate::widgets::menu_style).open_memory(command).close_behavior(close_behavior).show(|ui| {
-                for tool in slot.iter() {
-                    let row = ui.selectable_label(app.ui.tool == *tool, tool.label());
-                    app.auto.add(&format!("tools.select.{tool:?}"), row.rect, tool.label());
-                    if row.clicked() {
-                        app.ui.tool = *tool;
-                        if let Some(saved) = app.ui.slot_tools.get_mut(si) {
-                            *saved = *tool;
-                        }
-                        ui.close();
-                    }
-                }
-            });
-        }
+        tool_slot(app, ui, p, si, slot, r, held_id);
         x += 28.0;
         if matches!(si, 2 | 5 | 7 | 10 | 13) {
             x += 4.0;
@@ -122,17 +74,96 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             x += 6.0;
         }
     }
+    x
+}
 
-    // Tool options.
-    x += 10.0;
-    // Selected shape layers: the options show their paint and edit it (as in After Effects).
-    let shape_layers: Vec<u64> = app
-        .session
+/// One tool slot button in `r`: select on click, Ctrl+double-click Pan Behind, and the fly-out.
+fn tool_slot(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, si: usize, slot: &[Tool], r: Rect, held_id: egui::Id) {
+    let t = app.tokens;
+    let cur = app.ui.slot_tools.get(si).copied().unwrap_or(slot[0]);
+    let active = slot.contains(&app.ui.tool);
+    let id = egui::Id::unique(("tool-slot", si));
+    let resp = widgets::icon_button(ui, r, cur.icon(), active, &t, id);
+    if slot.len() > 1 {
+        // Flyout corner triangle.
+        p.add(egui::Shape::convex_polygon(
+            vec![pos2(r.max.x - 2.0, r.max.y - 6.0), pos2(r.max.x - 2.0, r.max.y - 2.0), pos2(r.max.x - 6.0, r.max.y - 2.0)],
+            if active { Color32::WHITE } else { t.text_dim },
+            Stroke::NONE,
+        ));
+    }
+    app.auto.add_response(&format!("tools.{cur:?}"), &resp, cur.label());
+    let tip = match cur.shortcut() {
+        Some(s) => format!("{} ({})", cur.label(), crate::menus::shortcut_text(s)),
+        None => cur.label().to_string(),
+    };
+    let resp = resp.on_hover_text(tip);
+    let held = ui.data(|d| d.get_temp::<egui::Id>(held_id)) == Some(id);
+    if resp.clicked() && !held {
+        app.ui.tool = cur;
+    }
+    // Ctrl+double-click Pan Behind: Center Anchor Point in Layer Content.
+    if cur == Tool::PanBehind
+        && resp.double_clicked()
+        && ui.input(|i| i.modifiers.command)
+        && let Err(e) = crate::menus::invoke(app, ui.ctx(), "layer.centerAnchor", json!({}))
+    {
+        app.ui.status = e;
+    }
+    if slot.len() > 1 {
+        slot_flyout(app, ui, si, slot, &resp, held_id);
+    }
+}
+
+/// The fly-out menu of a multi-tool slot: right-click or press-and-hold opens it.
+fn slot_flyout(app: &mut EffectcraftApp, ui: &mut egui::Ui, si: usize, slot: &[Tool], resp: &egui::Response, held_id: egui::Id) {
+    let id = resp.id;
+    let held = ui.data(|d| d.get_temp::<egui::Id>(held_id)) == Some(id);
+    let held_for = resp.is_pointer_button_down_on().then(|| ui.input(|i| i.pointer.press_start_time().map(|s| i.time - s))).flatten();
+    if let Some(seconds) = held_for
+        && seconds < 0.35
+    {
+        ui.ctx().request_repaint_after(std::time::Duration::from_secs_f64(0.35 - seconds));
+    }
+    let long_press = held_for.is_some_and(|seconds| seconds >= 0.35) && !held;
+    let command = if resp.secondary_clicked() || long_press {
+        if long_press {
+            ui.data_mut(|d| d.insert_temp(held_id, id));
+        }
+        Some(egui::SetOpenCommand::Bool(true))
+    } else if resp.clicked() && !held {
+        Some(egui::SetOpenCommand::Bool(false))
+    } else {
+        None
+    };
+    let close_behavior = if held && resp.clicked() { egui::PopupCloseBehavior::IgnoreClicks } else { egui::PopupCloseBehavior::CloseOnClickOutside };
+    egui::Popup::menu(resp).style(crate::widgets::menu_style).open_memory(command).close_behavior(close_behavior).show(|ui| {
+        for tool in slot.iter() {
+            let row = ui.selectable_label(app.ui.tool == *tool, tool.label());
+            app.auto.add(&format!("tools.select.{tool:?}"), row.rect, tool.label());
+            if row.clicked() {
+                app.ui.tool = *tool;
+                if let Some(saved) = app.ui.slot_tools.get_mut(si) {
+                    *saved = *tool;
+                }
+                ui.close();
+            }
+        }
+    });
+}
+
+/// The ids of the selected shape layers: the options show their paint and edit it.
+fn selected_shape_layers(app: &EffectcraftApp) -> Vec<u64> {
+    app.session
         .active_comp()
         .map(|c| {
             app.session.state.selected_layers.iter().filter(|id| c.layer(**id).is_some_and(|l| matches!(l.source, LayerSource::Shape))).map(|id| id.0).collect()
         })
-        .unwrap_or_default();
+        .unwrap_or_default()
+}
+
+/// Mirrors the first selected shape layer's paint into the shape tool (as in After Effects).
+fn sync_layer_paint(app: &mut EffectcraftApp, shape_layers: &[u64]) {
     let layer_paint = shape_layers.first().and_then(|id| app.session.active_comp()?.layer(LayerId(*id))).map(|l| {
         let lt = l.layer_time(app.session.time());
         (effectcraft_engine::commands::shape_stroke::first_paint(l, lt), effectcraft_engine::commands::shape_stroke::first_paint_kinds(l, lt))
@@ -150,6 +181,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         tool.stroke_width = width.unwrap_or(0.0);
     }
+}
+
+/// Options for the active tool (shape creation, fill and stroke, puppet, roto); returns the x after them.
+fn tool_options_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, mut x: f32, cy: f32) -> f32 {
+    // Selected shape layers: the options show their paint and edit it (as in After Effects).
+    let shape_layers = selected_shape_layers(app);
+    sync_layer_paint(app, &shape_layers);
     // One undo step per picker session or width drag: end the merge once both are done.
     let picking = ["fill", "stroke"].iter().any(|k| widgets::popup_is_open(ui, picker_id(k)));
     if !picking && !ui.input(|i| i.pointer.any_down()) && app.session.history.merge_key.as_deref().is_some_and(|k| k.starts_with("tool-")) {
@@ -163,35 +201,56 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     // Fill and Stroke, hidden while the tools draw masks.
     let masking = drawing && !shape_layers.is_empty() && app.session.state.shape_tool.creates_mask;
     if (drawing || !shape_layers.is_empty()) && !masking {
-        x = fill_stroke_options(app, ui, &p, &shape_layers, x, cy);
+        x = fill_stroke_options(app, ui, p, &shape_layers, x, cy);
     }
     if app.ui.tool.puppet_kind().is_some() {
-        x = puppet_options(app, ui, &p, x, cy);
+        x = puppet_options(app, ui, p, x, cy);
     }
     if app.ui.tool.roto_kind(false).is_some() {
-        x = roto_options(app, ui, &p, x, cy);
+        x = roto_options(app, ui, p, x, cy);
     }
+    x
+}
+
+/// The Snapping checkbox, its label and options menu; returns the x where it started.
+fn snapping_toggle(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, x: f32, cy: f32) -> f32 {
+    let t = app.tokens;
     let snap = Rect::from_min_size(pos2(x, cy - 10.0), vec2(20.0, 20.0));
     // The engine owns snapping (View ▸ Snapping); the checkbox mirrors it.
     app.ui.snapping = app.session.state.snapping;
-    if widgets::checkbox(ui, snap, app.ui.snapping, &t, egui::Id::new("snapping")).clicked() {
+    if widgets::checkbox(ui, snap, app.ui.snapping, &t, egui::Id::unique("snapping")).clicked() {
         let _ = app.session.execute("view.snapping", serde_json::json!({}));
         app.ui.snapping = app.session.state.snapping;
     }
     app.auto.add("header.snapping", snap, "Snapping");
     let label = p.text(pos2(snap.max.x + 4.0, cy), Align2::LEFT_CENTER, tr("Snapping"), Tokens::ui(12.0), t.text_dim);
     snapping_options(app, ui, Rect::from_min_size(pos2(label.max.x + 2.0, cy - 9.0), vec2(18.0, 18.0)));
+    x
+}
 
-    // Right side: community buttons, workspaces.
-    let mut rx = rect.max.x - 10.0;
+/// Right side: community buttons, appearance and workspaces; `left` is where the tools end.
+fn right_side(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rect: Rect, left: f32, cy: f32) {
+    let t = app.tokens;
+    let rx = community_buttons(app, ui, p, rect.max.x - 10.0, cy);
+    let mut rx = appearance_button(app, ui, rx, cy);
+    rx -= 10.0;
+    p.line_segment([pos2(rx, cy - 10.0), pos2(rx, cy + 10.0)], Stroke::new(1.0, t.separator));
+    rx -= 10.0;
+    let rx = workspace_menu(app, ui, p, rx, cy);
+    workspace_tabs(app, ui, p, rx, left, cy);
+}
+
+/// The Discord pill and the GitHub and website buttons, right to left from `rx`; returns the new `rx`.
+fn community_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, mut rx: f32, cy: f32) -> f32 {
+    let t = app.tokens;
     // The pill fits its label (icon, gap, text) with even padding: it was a fixed 104 px with the
     // text at its left, which left a wide gap on the right (#581).
     let label = p.layout_no_wrap(tr("Discord").to_string(), Tokens::semibold(12.0), Color32::WHITE);
     let discord = Rect::from_min_max(pos2(rx - (10.0 + 14.0 + 6.0 + label.size().x + 12.0), cy - 13.0), pos2(rx, cy + 13.0));
-    let dresp = ui.interact(discord, egui::Id::new("hdr-discord"), Sense::click());
+    let dresp = ui.interact(discord, egui::Id::unique("hdr-discord"), Sense::click());
     let dc = Color32::from_rgb(0x58, 0x65, 0xf2);
     p.rect_filled(discord, 13.0, if dresp.hovered() { dc.gamma_multiply(1.2) } else { dc });
-    icons::paint(&p, Rect::from_center_size(pos2(discord.min.x + 17.0, cy), vec2(14.0, 14.0)), Icon::Chat, Color32::WHITE);
+    icons::paint(p, Rect::from_center_size(pos2(discord.min.x + 17.0, cy), vec2(14.0, 14.0)), Icon::Chat, Color32::WHITE);
     p.galley(pos2(discord.min.x + 30.0, cy - label.size().y / 2.0), label, Color32::WHITE);
     app.auto.add("header.discord", discord, "Join the ArtCraft Discord");
     if dresp.on_hover_text(tr("Join the ArtCraft community on Discord")).clicked() {
@@ -202,13 +261,19 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         [("hdr-github", Icon::Code, "EffectCraft on GitHub", "help.github"), ("hdr-web", Icon::Globe, "EffectCraft on getartcraft.com", "help.appPage")]
     {
         let r = Rect::from_min_max(pos2(rx - 26.0, cy - 13.0), pos2(rx, cy + 13.0));
-        if widgets::icon_button(ui, r, icon, false, &t, egui::Id::new(id)).on_hover_text(tip).clicked() {
+        if widgets::icon_button(ui, r, icon, false, &t, egui::Id::unique(id)).on_hover_text(tip).clicked() {
             let _ = app.session.execute(cmd, json!({}));
         }
         app.auto.add(&format!("header.{}", &id[4..]), r, tip);
         rx = r.min.x - 4.0;
     }
-    // Appearance: Sync with System, Light, Dark (a monitor, sun or moon), one click to the next.
+    rx
+}
+
+/// Appearance: Sync with System, Light, Dark (a monitor, sun or moon), one click to the next;
+/// returns the new `rx`.
+fn appearance_button(app: &mut EffectcraftApp, ui: &mut egui::Ui, rx: f32, cy: f32) -> f32 {
+    let t = app.tokens;
     let (icon, mode) = match app.session.prefs.appearance.appearance_mode.as_str() {
         "auto" => (Icon::Monitor, tr("Sync with System")),
         "light" => (Icon::Sun, tr("Light")),
@@ -216,72 +281,80 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     };
     let tip = tr_args("Appearance Mode: {}", &[&mode]);
     let r = Rect::from_min_max(pos2(rx - 26.0, cy - 13.0), pos2(rx, cy + 13.0));
-    let response = widgets::icon_button(ui, r, icon, false, &t, egui::Id::new("hdr-appearance")).on_hover_text(&tip);
+    let response = widgets::icon_button(ui, r, icon, false, &t, egui::Id::unique("hdr-appearance")).on_hover_text(&tip);
     if response.clicked() {
         app.cycle_appearance(ui.ctx());
     }
-    response.context_menu(|ui| {
-        let settings = ui.button(tr("Appearance Settings…"));
-        app.auto.add("header.appearanceSettings", settings.rect, "Appearance Settings…");
-        if settings.clicked() {
-            crate::panels::settings::open(app, "appearance");
-            ui.close();
-        }
-        let favorites = app.session.prefs.appearance.favorite_themes.clone();
-        for options in [effectcraft_engine::prefs::LIGHT_THEMES, effectcraft_engine::prefs::DARK_THEMES] {
-            let group: Vec<_> = options.iter().filter(|(_, id)| favorites.iter().any(|saved| saved == id)).collect();
-            if !group.is_empty() {
-                ui.separator();
-            }
-            for (label, id) in group {
-                let r = ui.selectable_label(app.ui.theme.name() == *id, tr(label));
-                app.auto.add(&format!("header.favoriteTheme.{id}"), r.rect, label);
-                if r.clicked() {
-                    if let Some(kind) = crate::theme::ThemeKind::from_name(id) {
-                        app.set_theme(ui.ctx(), kind);
-                    }
-                    ui.close();
-                }
-            }
-        }
-    });
+    response.context_menu(|ui| appearance_menu(app, ui));
     app.auto.add("header.appearance", r, &tip);
-    rx = r.min.x - 4.0;
-    rx -= 10.0;
-    p.line_segment([pos2(rx, cy - 10.0), pos2(rx, cy + 10.0)], Stroke::new(1.0, t.separator));
-    rx -= 10.0;
-    // Workspace tabs (right to left), with a » menu of all.
+    r.min.x - 4.0
+}
+
+/// The appearance button's context menu: settings and the favorite themes.
+fn appearance_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
+    let settings = ui.button(tr("Appearance Settings…"));
+    app.auto.add("header.appearanceSettings", settings.rect, "Appearance Settings…");
+    if settings.clicked() {
+        crate::panels::settings::open(app, "appearance");
+        ui.close();
+    }
+    let favorites = app.session.prefs.appearance.favorite_themes.clone();
+    for options in [effectcraft_engine::prefs::LIGHT_THEMES, effectcraft_engine::prefs::DARK_THEMES] {
+        let group: Vec<_> = options.iter().filter(|(_, id)| favorites.iter().any(|saved| saved == id)).collect();
+        if !group.is_empty() {
+            ui.separator();
+        }
+        for (label, id) in group {
+            let r = ui.selectable_label(app.ui.theme.name() == *id, tr(label));
+            app.auto.add(&format!("header.favoriteTheme.{id}"), r.rect, label);
+            if r.clicked() {
+                if let Some(kind) = crate::theme::ThemeKind::from_name(id) {
+                    app.set_theme(ui.ctx(), kind);
+                }
+                ui.close();
+            }
+        }
+    }
+}
+
+/// The » button with the menu of all workspaces; returns the new `rx`.
+fn workspace_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rx: f32, cy: f32) -> f32 {
+    let t = app.tokens;
     let more = Rect::from_min_max(pos2(rx - 20.0, cy - 11.0), pos2(rx, cy + 11.0));
-    let mresp = ui.interact(more, egui::Id::new("ws-more"), Sense::click());
+    let mresp = ui.interact(more, egui::Id::unique("ws-more"), Sense::click());
     p.text(more.center(), Align2::CENTER_CENTER, "»", Tokens::ui(15.0), if mresp.hovered() { t.text } else { t.text_dim });
     app.auto.add("header.workspaces", more, "Workspaces");
     crate::widgets::context_menu(&mresp, |ui| ws_menu(app, ui));
     if mresp.clicked() {
-        widgets::open_popup(ui, egui::Id::new("ws-pop"));
+        widgets::open_popup(ui, egui::Id::unique("ws-pop"));
     }
-    let names: Vec<String> = crate::dock::WORKSPACES.iter().map(|s| s.to_string()).collect();
+    let names: Vec<String> = crate::dock::WORKSPACES.iter().map(|s| crate::i18n::command_label("window.workspace", s).to_string()).collect();
     if let Some(i) = widgets::popup_menu(
         ui,
-        egui::Id::new("ws-pop"),
+        egui::Id::unique("ws-pop"),
         more.left_bottom() - vec2(140.0, 0.0),
         &names,
         crate::dock::WORKSPACES.iter().position(|w| *w == app.ui.workspace),
     ) {
         app.set_workspace(crate::dock::WORKSPACES[i]);
     }
-    rx = more.min.x - 6.0;
-    // After Effects 2026's workspace bar order (right to left here): Default, Review, Learn,
-    // Small Screen, Standard.
+    more.min.x - 6.0
+}
+
+/// Workspace tabs, right to left from `rx`, stopping 120 px right of `left`.
+/// After Effects 2026's order (right to left here): Default, Review, Learn, Small Screen, Standard.
+fn workspace_tabs(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, mut rx: f32, left: f32, cy: f32) {
+    let t = app.tokens;
     let shown = ["Standard", "Small Screen", "Learn", "Review", "Default"];
     for name in shown {
-        let g = p.layout_no_wrap(name.to_string(), Tokens::ui(12.0), t.text);
+        let g = p.layout_no_wrap(crate::i18n::command_label("window.workspace", name).to_string(), Tokens::ui(12.0), t.text);
         let w = g.size().x + 16.0;
         let r = Rect::from_min_max(pos2(rx - w, cy - 13.0), pos2(rx, cy + 13.0));
-        if r.min.x < x + 120.0 {
+        if r.min.x < left + 120.0 {
             break;
         }
         let active = app.ui.workspace == name;
-        let resp = ui.interact(r, egui::Id::new(("ws", name)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("ws", name)), Sense::click());
         let col = if active {
             t.hot_text
         } else if resp.hovered() {
@@ -305,8 +378,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
 /// Features in Collapsed Compositions and Text Layers (`view.snappingOptions`).
 fn snapping_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect) {
     let t = app.tokens;
-    let pop = egui::Id::new("snap-options");
-    if widgets::icon_button(ui, r, Icon::ChevronDown, false, &t, egui::Id::new("snap-options-button")).on_hover_text(tr("Snapping options")).clicked() {
+    let pop = egui::Id::unique("snap-options");
+    if widgets::icon_button(ui, r, Icon::ChevronDown, false, &t, egui::Id::unique("snap-options-button")).on_hover_text(tr("Snapping options")).clicked() {
         widgets::open_popup(ui, pop);
     }
     app.auto.add("header.snappingOptions", r, "Snapping options");
@@ -349,7 +422,7 @@ fn gradient_colors(app: &EffectcraftApp, layers: &[u64], paint: &str) -> Option<
 
 /// The colour picker of the Fill or Stroke swatch.
 fn picker_id(key: &str) -> egui::Id {
-    egui::Id::new(("tool-pick", key))
+    egui::Id::unique(("tool-pick", key))
 }
 
 /// Tool Creates Shape / Tool Creates Mask: with a shape layer selected, whether the shape tools
@@ -359,7 +432,7 @@ fn creates_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, mut x: f32, cy:
     for (mask, icon, tip, key) in [(false, Icon::ShapeLayer, "Tool Creates Shape", "createsShape"), (true, Icon::MaskVis, "Tool Creates Mask", "createsMask")] {
         let r = Rect::from_min_size(pos2(x, cy - 13.0), vec2(26.0, 26.0));
         let on = app.session.state.shape_tool.creates_mask == mask;
-        if widgets::icon_button(ui, r, icon, on, &t, egui::Id::new(("tool-creates", key))).on_hover_text(tip).clicked() {
+        if widgets::icon_button(ui, r, icon, on, &t, egui::Id::unique(("tool-creates", key))).on_hover_text(tip).clicked() {
             tool_options(app, json!({"createsMask": mask}));
         }
         app.auto.add(&format!("header.{key}"), r, tip);
@@ -388,14 +461,14 @@ fn fill_stroke_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Pa
         let options = format!("{title} Options");
         let g = p.layout_no_wrap(format!("{title}:"), Tokens::ui(12.0), t.text_dim);
         let wr = Rect::from_min_size(pos2(x, cy - g.size().y / 2.0), g.size());
-        let wresp = ui.interact(wr, egui::Id::new(("tool-paint-word", key)), Sense::click()).on_hover_text(&options);
+        let wresp = ui.interact(wr, egui::Id::unique(("tool-paint-word", key)), Sense::click()).on_hover_text(&options);
         let col = if wresp.hovered() { t.text } else { t.text_dim };
         if wresp.hovered() {
             p.line_segment([pos2(wr.min.x, wr.max.y), pos2(wr.max.x - 3.0, wr.max.y)], Stroke::new(1.0, col));
         }
         p.galley_with_override_text_color(wr.min, g, col);
         app.auto.add(&format!("header.{key}Options"), wr, &options);
-        let opts = egui::Id::new(("tool-paint-options", key));
+        let opts = egui::Id::unique(("tool-paint-options", key));
         if wresp.clicked() {
             widgets::open_popup(ui, opts);
         }
@@ -403,7 +476,7 @@ fn fill_stroke_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Pa
         // the Gradient Editor (the selected shape layer's Gradient Fill / Gradient Stroke), and
         // opens the options otherwise; Alt-click steps through the kinds (as in After Effects).
         let sr = Rect::from_min_size(pos2(wr.max.x + 6.0, cy - 8.0), vec2(20.0, 16.0));
-        let sresp = ui.interact(sr, egui::Id::new(("tool-paint-swatch", key)), Sense::click()).on_hover_text(format!("{title}: {}", tp.kind.label()));
+        let sresp = ui.interact(sr, egui::Id::unique(("tool-paint-swatch", key)), Sense::click()).on_hover_text(format!("{title}: {}", tp.kind.label()));
         paint_swatch(p, sr, &tp, sresp.hovered(), &t);
         app.auto.add(&format!("header.{key}"), sr, &format!("{title} Color"));
         if sresp.clicked() {
@@ -435,7 +508,14 @@ fn fill_stroke_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Pa
         x = sr.max.x + 12.0;
     }
     let width = app.session.state.shape_tool.stroke_width;
-    let (r, v, _) = widgets::hot_number_at(ui, pos2(x - 6.0, cy - 9.0), egui::Id::new("tool-stroke-w"), width, 0.2, (0.0, 1000.0), 0, " px", &t);
+    let (r, v, _) = widgets::hot_number_at(
+        ui,
+        pos2(x - 6.0, cy - 9.0),
+        egui::Id::unique("tool-stroke-w"),
+        width,
+        &widgets::HotSpec { speed: 0.2, range: (0.0, 1000.0), decimals: 0, suffix: " px" },
+        &t,
+    );
     if let Some(v) = v {
         tool_options(app, json!({"strokeWidth": v}));
         paint(app, "strokeWidth", json!(v));
@@ -466,7 +546,7 @@ fn paint_kind(app: &mut EffectcraftApp, shape_layers: &[u64], key: &str, kind: P
 /// Fill Options / Stroke Options: None, Solid Color, Linear Gradient or Radial Gradient, and the
 /// blend mode and opacity new shapes get (After Effects' dialogs, applied as they change).
 fn paint_options_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui, shape_layers: &[u64], key: &str, title: &str, pos: egui::Pos2) {
-    let id = egui::Id::new(("tool-paint-options", key));
+    let id = egui::Id::unique(("tool-paint-options", key));
     if !widgets::popup_is_open(ui, id) {
         return;
     }
@@ -502,7 +582,14 @@ fn paint_options_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui, shape_layers
             }
             app.auto.add(&format!("header.{key}Options.blend"), blend_rect, "Blend Mode");
             p.text(row(98.0), Align2::LEFT_CENTER, tr("Opacity:"), Tokens::ui(12.0), t.text_dim);
-            let (or, v, _) = widgets::hot_number_at(ui, row(89.0) + vec2(84.0, 0.0), id.with("opacity"), tp.opacity, 0.5, (0.0, 100.0), 0, "%", &t);
+            let (or, v, _) = widgets::hot_number_at(
+                ui,
+                row(89.0) + vec2(84.0, 0.0),
+                id.with("opacity"),
+                tp.opacity,
+                &widgets::HotSpec { speed: 0.5, range: (0.0, 100.0), decimals: 0, suffix: "%" },
+                &t,
+            );
             app.auto.add(&format!("header.{key}Options.opacity"), or, "Opacity");
             if let Some(v) = v {
                 let k_opacity = format!("{key}Opacity");
@@ -573,7 +660,14 @@ fn roto_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
     let label = tr("Diameter:");
     let lr = p.text(pos2(x, cy), Align2::LEFT_CENTER, label, Tokens::ui(12.0), t.text_dim);
     x = lr.max.x + 6.0;
-    let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("roto-opt", key)), v, 0.5, (1.0, 5000.0), 0, " px", &t);
+    let (r, nv, _) = widgets::hot_number_at(
+        ui,
+        pos2(x, cy - 9.0),
+        egui::Id::unique(("roto-opt", key)),
+        v,
+        &widgets::HotSpec { speed: 0.5, range: (1.0, 5000.0), decimals: 0, suffix: " px" },
+        &t,
+    );
     app.auto.add("header.roto.diameter", r, label);
     if let Some(nv) = nv
         && let Err(e) = app.session.execute("roto.options", json!({key: nv}))
@@ -591,7 +685,7 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
     p.text(pos2(x, cy), Align2::LEFT_CENTER, tr("Mesh:"), Tokens::ui(12.0), t.text_dim);
     x += 40.0;
     let show = Rect::from_min_size(pos2(x, cy - 10.0), vec2(20.0, 20.0));
-    if widgets::checkbox(ui, show, o.show_mesh, &t, egui::Id::new("puppet-show-mesh")).clicked() {
+    if widgets::checkbox(ui, show, o.show_mesh, &t, egui::Id::unique("puppet-show-mesh")).clicked() {
         let _ = app.session.execute("puppet.mesh", json!({"showMesh": !o.show_mesh}));
     }
     app.auto.add("header.puppet.showMesh", show, "Show mesh");
@@ -600,7 +694,14 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
     for (label, key, v, range) in [("Expansion:", "expansion", o.expansion, (-100.0, 200.0)), ("Density:", "density", o.density, (0.0, 100.0))] {
         p.text(pos2(x, cy), Align2::LEFT_CENTER, label, Tokens::ui(12.0), t.text_dim);
         x += if key == "expansion" { 64.0 } else { 52.0 };
-        let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("puppet-opt", key)), v, 0.2, range, 0, "", &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x, cy - 9.0),
+            egui::Id::unique(("puppet-opt", key)),
+            v,
+            &widgets::HotSpec { speed: 0.2, range, decimals: 0, suffix: "" },
+            &t,
+        );
         app.auto.add(&format!("header.puppet.{key}"), r, label);
         if let Some(nv) = nv {
             let _ = app.session.execute("puppet.mesh", json!({key: nv, "merge": format!("puppet-opt-{key}")}));
@@ -611,7 +712,7 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
     let label = "Record Options...";
     let w = 104.0;
     let r = Rect::from_min_size(pos2(x, cy - 10.0), vec2(w, 20.0));
-    let resp = ui.interact(r, egui::Id::new("puppet-record-options"), egui::Sense::click()).on_hover_text(tr("⌘/Ctrl-drag a pin to record its motion"));
+    let resp = ui.interact(r, egui::Id::unique("puppet-record-options"), egui::Sense::click()).on_hover_text(tr("⌘/Ctrl-drag a pin to record its motion"));
     p.rect_stroke(r, 3.0, egui::Stroke::new(1.0, if resp.hovered() { t.accent } else { t.field_border }), egui::StrokeKind::Inside);
     p.text(r.center(), Align2::CENTER_CENTER, label, Tokens::ui(11.5), t.text);
     app.auto.add("header.puppet.recordOptions", r, label);
@@ -625,7 +726,7 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
     let label = "Follow-Through...";
     let r = Rect::from_min_size(pos2(r.max.x + 8.0, cy - 10.0), vec2(w, 20.0));
     let resp = ui
-        .interact(r, egui::Id::new("puppet-follow"), egui::Sense::click())
+        .interact(r, egui::Id::unique("puppet-follow"), egui::Sense::click())
         .on_hover_text(tr("Select the leader pin, then Shift-click the pins that should trail it (hair, cloth, tails)"));
     p.rect_stroke(r, 3.0, egui::Stroke::new(1.0, if resp.hovered() { t.accent } else { t.field_border }), egui::StrokeKind::Inside);
     p.text(r.center(), Align2::CENTER_CENTER, label, Tokens::ui(11.5), t.text);
@@ -639,9 +740,15 @@ fn puppet_options(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
     r.max.x + 16.0
 }
 
+/// A workspace's drawn name: built-ins read the menu bar's Window ▸ Workspace row; names the user
+/// saved stay verbatim, even when one matches a catalog source such as "Composition".
+fn workspace_label(name: &str) -> &str {
+    if crate::dock::WORKSPACES.contains(&name) { crate::i18n::command_label("window.workspace", name) } else { name }
+}
+
 fn ws_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
     for w in app.workspace_names() {
-        if ui.selectable_label(app.ui.workspace == w, &w).clicked() {
+        if ui.selectable_label(app.ui.workspace == w, workspace_label(&w)).clicked() {
             app.set_workspace(&w);
             ui.close();
         }
@@ -662,7 +769,7 @@ static ARTCRAFT_MARK: &[u8] = include_bytes!("../../../docs/brand/artcraft-mark.
 /// 24 px Tools bar to the About dialog). Nothing is drawn if it can't be decoded.
 pub fn paint_logo(p: &egui::Painter, r: Rect) {
     let ctx = p.ctx();
-    let id = egui::Id::new("artcraft-mark");
+    let id = egui::Id::unique("artcraft-mark");
     let tex = ctx.data(|d| d.get_temp::<Option<egui::TextureHandle>>(id)).unwrap_or_else(|| {
         let tex = image::load_from_memory_with_format(ARTCRAFT_MARK, image::ImageFormat::Png).ok().map(|img| {
             let img = img.to_rgba8();
@@ -692,6 +799,15 @@ mod tests {
         out.textures_delta.clear();
     }
 
+    #[test]
+    fn saved_workspace_names_stay_verbatim() {
+        crate::i18n::set_current("zh-hans");
+        assert_ne!(workspace_label("Default"), "Default");
+        assert_ne!(crate::i18n::tr("Composition"), "Composition");
+        assert_eq!(workspace_label("Composition"), "Composition");
+        crate::i18n::set_current("en");
+    }
+
     #[test]
     fn long_press_type_keeps_the_tool_until_vertical_is_selected() {
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
diff --git a/crates/ui-egui/src/hooks.rs b/crates/ui-egui/src/hooks.rs
new file mode 100644
index 000000000..8d7dcb704
--- /dev/null
+++ b/crates/ui-egui/src/hooks.rs
@@ -0,0 +1,83 @@
+use super::*;
+
+/// The desktop's light or dark appearance where egui cannot see it (Wayland compositors that send
+/// winit no theme). `None` = the host does not know.
+pub type SystemThemeFn = Box<dyn Fn(&egui::Context) -> Option<egui::Theme>>;
+
+/// A file dialog a host shows without blocking the frame ([`Hooks::file_dialog_async`]).
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum FileDialog {
+    /// Files to open or import with these extensions; several when `many`.
+    Open { exts: Vec<String>, many: bool },
+    /// An EffectCraft project to open.
+    OpenProject,
+    /// A folder.
+    Folder,
+    /// Where to save `default` (a file name or path) with extension `ext` (empty: no filter);
+    /// `project`: the project save dialog, given the file name.
+    Save { default: String, ext: String, project: bool },
+}
+
+impl FileDialog {
+    /// The save dialog for `default`, as [`Hooks::save_dialog`] picks it.
+    pub fn save(default: &str) -> Self {
+        let ext = std::path::Path::new(default).extension().map(|e| e.to_string_lossy().to_string()).unwrap_or_default();
+        Self::Save { default: default.to_string(), project: ext.eq_ignore_ascii_case("ecproj"), ext }
+    }
+}
+
+/// Called with the paths a [`FileDialog`] picked (empty: cancelled), from any thread.
+pub type DialogDone = Box<dyn FnOnce(Vec<String>) + Send>;
+
+/// Host hooks provided by the native app (file pickers etc.).
+#[derive(Default)]
+pub struct Hooks {
+    /// The system appearance for Settings ▸ Appearance ▸ Sync with System (the desktop app reads
+    /// the Linux desktop portal); without it, what egui reports.
+    pub system_theme: Option<SystemThemeFn>,
+    pub pick_files: Option<Box<dyn Fn(&[&str]) -> Vec<String>>>,
+    pub pick_save: Option<Box<dyn Fn(&str) -> Option<String>>>,
+    pub pick_open_project: Option<Box<dyn Fn() -> Option<String>>>,
+    /// Opens the audio output for preview playback (the desktop app uses cpal).
+    pub audio_device: Option<audio::AudioDeviceFactory>,
+    /// Lists audio output devices (Settings ▸ Audio).
+    pub audio_devices: Option<Box<dyn Fn() -> Vec<String>>>,
+    /// Picks a folder (Settings paths).
+    pub pick_folder: Option<Box<dyn Fn() -> Option<String>>>,
+    /// Save dialog for other file kinds: (default name or path, extension; empty: no filter). A
+    /// default path opens the dialog in its folder.
+    pub pick_save_file: Option<Box<dyn Fn(&str, &str) -> Option<String>>>,
+    /// The system clipboard's text (native menu Edit ▸ Paste into a text field).
+    pub clipboard_text: Option<Box<dyn Fn() -> Option<String>>>,
+    /// Application actions the OS performs (`app.hide`, `app.hideOthers`, `app.showAll` on
+    /// macOS). Returns false when the host doesn't handle the id.
+    pub app_action: Option<Box<dyn Fn(&str) -> bool>>,
+    /// Shows a command's file dialog without blocking the frame and calls `done` with the
+    /// answer (the host then asks for a repaint). Used in place of the blocking pickers above for
+    /// the commands' dialogs (File ▸ Import, Open, Save As…) where blocking the frame is unsafe or
+    /// leaves the window unresponsive: on macOS a nested modal event loop there aborted the app on
+    /// a drag over the window (#511), and on Linux a blocking desktop-portal dialog never pumps
+    /// events, so the compositor marks the window as not responding (#1275).
+    pub file_dialog_async: Option<Box<dyn Fn(FileDialog, DialogDone)>>,
+    /// Tells the user the graphics device was lost and the window is closing, once. `saved` is
+    /// the auto-save of unsaved changes (`None`: nothing was unsaved), its path or why it failed.
+    pub device_lost: Option<Box<dyn Fn(Option<Result<String, String>>)>>,
+}
+
+impl Hooks {
+    /// The host's save dialog for `default` (a file name or path), offering its extension: the
+    /// project dialog for project files, else [`Hooks::pick_save_file`]. The project dialog is
+    /// the fallback for hosts without that (the web, whose dialog only names the file): on macOS
+    /// a dialog filtered to projects appends `.ecproj` to any other name (#293). `None` when the
+    /// host has no save dialog; `Some(None)` when it was cancelled.
+    pub fn save_dialog(&self, default: &str) -> Option<Option<String>> {
+        let path = std::path::Path::new(default);
+        let ext = path.extension().map(|e| e.to_string_lossy().to_string()).unwrap_or_default();
+        match (&self.pick_save_file, &self.pick_save) {
+            (Some(pick), _) if !ext.eq_ignore_ascii_case("ecproj") => Some(pick(default, &ext)),
+            (_, Some(pick)) => Some(pick(&path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default())),
+            (Some(pick), None) => Some(pick(default, &ext)),
+            (None, None) => None,
+        }
+    }
+}
diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index 81343f9f8..611a226ee 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -10,10 +10,12 @@ pub(crate) mod effects;
 /// Translations for the panels, tooltips and dialogs below the menu bar (see the module docs).
 mod ui;
 use effectcraft_engine::menus::{MenuEntry, MenuNode};
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) use ui::catalog_characters;
 pub(crate) use ui::{set_current, tr, tr_args};
 
 /// Every language with a catalog, in the order Settings ▸ General ▸ Language lists them.
-const CATALOG_CODES: [&str; 10] = ["ja", "zh-hans", "zh-hant", "uk", "es", "pt-br", "ru", "fr", "de", "cs"];
+const CATALOG_CODES: [&str; 11] = ["cs", "de", "es", "fr", "pt-br", "ru", "uk", "ka", "ja", "zh-hans", "zh-hant"];
 
 /// The active interface language: the stored preference when it names a catalog, otherwise `en`
 /// (English is the source of every label and needs no lookup).
@@ -64,22 +66,64 @@ pub(crate) fn czech(app: &EffectcraftApp) -> bool {
     language(app) == "cs"
 }
 
+/// The UI is in Georgian.
+pub(crate) fn georgian(app: &EffectcraftApp) -> bool {
+    language(app) == "ka"
+}
+
 /// Settings ▸ General ▸ Language ▸ Match System: the operating system's interface language
 /// where EffectCraft has it, else English (#229), as After Effects installs in the system's
-/// language. The browser build stays in English because it has no system-locale probe.
+/// language. The browser build follows the locales its page passes in ([`set_system_locales`]).
 fn system_language() -> &'static str {
     #[cfg(not(target_arch = "wasm32"))]
     {
         static LANGUAGE: std::sync::OnceLock<&'static str> = std::sync::OnceLock::new();
         LANGUAGE.get_or_init(|| supported(sys_locale::get_locale().as_deref()))
     }
-    // No system locale in the browser build: English.
     #[cfg(target_arch = "wasm32")]
-    supported(None)
+    {
+        let (requested, browser) = SYSTEM_LOCALES.get().map(|(r, b)| (r.as_deref(), b.as_slice())).unwrap_or_default();
+        first_supported(requested, browser, web_draws)
+    }
+}
+
+/// The page's `?lang=`, then the browser's preferred languages, most preferred first
+/// (`navigator.languages`), for Match System in the web build.
+static SYSTEM_LOCALES: std::sync::OnceLock<(Option<String>, Vec<String>)> = std::sync::OnceLock::new();
+
+/// Tell Match System the language the page asks for (`?lang=`) and the browser's preferred
+/// languages (the web build has no locale probe of its own). Set before the first frame; only
+/// the first call counts.
+pub fn set_system_locales(requested: Option<String>, browser: Vec<String>) {
+    let _ = SYSTEM_LOCALES.set((requested, browser));
+}
+
+/// `requested` when EffectCraft has a catalog for it, else the first of `browser` it has a
+/// catalog for and `drawable` accepts (English counts), else English: someone who prefers Dutch,
+/// then Czech, gets Czech.
+#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+fn first_supported(requested: Option<&str>, browser: &[String], drawable: impl Fn(&str) -> bool) -> &'static str {
+    let english = |t: &str| t.split(['-', '_']).next().is_some_and(|p| p.eq_ignore_ascii_case("en"));
+    requested
+        .map(|t| (t, true))
+        .into_iter()
+        .chain(browser.iter().map(|t| (t.as_str(), false)))
+        .map(|(t, asked)| (t, asked, supported(Some(t))))
+        .find(|(t, asked, code)| (*code != "en" && (*asked || drawable(code))) || english(t))
+        .map_or("en", |(_, _, code)| code)
+}
+
+/// Whether the web build can draw `language`'s interface. It installs no system fonts and its
+/// bundled faces have no CJK or Georgian glyphs, so Match System skips those browser languages
+/// rather than draw boxes; `?lang=` and a language chosen in Settings still select them.
+#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
+fn web_draws(language: &str) -> bool {
+    !matches!(language, "ja" | "zh-hans" | "zh-hant" | "ka")
 }
 
 /// The language EffectCraft shows for a BCP 47 locale (`ja-JP` → `ja`, `zh-Hans-CN` → `zh-hans`,
-/// `zh-TW` → `zh-hant`, `uk-UA` → `uk`, `es-ES` → `es`, `pt-BR` → `pt-br`, `cs-CZ` → `cs`).
+/// `zh-TW` → `zh-hant`, `uk-UA` → `uk`, `es-ES` → `es`, `pt-BR` → `pt-br`, `cs-CZ` → `cs`,
+/// `ka-GE` → `ka`).
 fn supported(locale: Option<&str>) -> &'static str {
     let Some(locale) = locale else { return "en" };
     let mut parts = locale.split(['-', '_']);
@@ -90,6 +134,7 @@ fn supported(locale: Option<&str>) -> &'static str {
         "uk" => "uk",
         "es" => "es",
         "cs" => "cs",
+        "ka" => "ka",
         // The only Portuguese catalog: Brazil's, also for Portugal rather than English.
         "pt" => "pt-br",
         "zh" => {
@@ -125,19 +170,49 @@ pub(crate) fn label<'a>(app: &EffectcraftApp, command: &str, source: &'a str) ->
             _ => {}
         }
     }
-    match language {
-        "ja" => lookup(JAPANESE, command, source),
-        "zh-hans" => lookup(SIMPLIFIED_CHINESE, command, source),
-        "zh-hant" => lookup(TRADITIONAL_CHINESE, command, source),
-        "uk" => lookup(UKRAINIAN, command, source),
-        "es" => lookup(SPANISH, command, source),
-        "pt-br" => lookup(PORTUGUESE, command, source),
-        "ru" => lookup(RUSSIAN, command, source),
-        "fr" => lookup(FRENCH, command, source),
-        "de" => lookup(GERMAN, command, source),
-        "cs" => lookup(CZECH, command, source),
-        _ => source,
+    if language == "ka" && matches!(command, "file.revealInFinder" | "layer.revealInFinder") {
+        match source {
+            "Reveal in Explorer" => return "Explorer-ში ჩვენება",
+            "Reveal in File Manager" => return "ფაილების მენეჯერში ჩვენება",
+            _ => {}
+        }
     }
+    menu_catalog(language).map_or(source, |catalog| lookup(catalog, command, source))
+}
+
+/// The menu catalog for `language`; `None` for English.
+fn menu_catalog(language: &str) -> Option<&'static [(&'static str, &'static str, &'static str)]> {
+    Some(match language {
+        "ja" => JAPANESE,
+        "zh-hans" => SIMPLIFIED_CHINESE,
+        "zh-hant" => TRADITIONAL_CHINESE,
+        "uk" => UKRAINIAN,
+        "es" => SPANISH,
+        "pt-br" => PORTUGUESE,
+        "ru" => RUSSIAN,
+        "fr" => FRENCH,
+        "de" => GERMAN,
+        "cs" => CZECH,
+        "ka" => GEORGIAN,
+        _ => return None,
+    })
+}
+
+/// A command's label drawn outside the menu bar (the dock's tab titles, the workspace bar), in the
+/// language the panels draw in: the menu bar's row for (`command`, `source`), else the panel
+/// catalog's row for `source`, else `source`. `…` also finds a menu bar row written `...`.
+pub(crate) fn command_label<'a>(command: &str, source: &'a str) -> &'a str {
+    let dotted = source.strip_suffix('…').map(|stem| format!("{stem}..."));
+    let row = |key: &str| menu_catalog(ui::current())?.iter().find(|(id, en, _)| *id == command && *en == key).map(|(_, _, translated)| *translated);
+    row(source).or_else(|| row(dotted.as_deref()?)).unwrap_or_else(|| tr(source))
+}
+
+/// A Settings page's title as the menu bar's Settings submenu draws it, without the ellipsis; the
+/// panel catalog's row for pages that have no menu row. The panel catalog's "Type" is the kind
+/// (Camera Settings, the Project panel's column), while the Type page is about text.
+pub(crate) fn settings_page_title(title: &str) -> &str {
+    let menu = menu_catalog(ui::current()).and_then(|c| c.iter().find(|(id, en, _)| *id == "app.settings" && en.strip_suffix("...") == Some(title)));
+    menu.and_then(|(_, _, translated)| translated.strip_suffix("...")).unwrap_or_else(|| tr(title))
 }
 
 /// `source` looked up in `catalog` by (command, English label); the source itself when the pair is
@@ -146,6 +221,26 @@ fn lookup<'a>(catalog: &[(&str, &str, &'a str)], command: &str, source: &'a str)
     catalog.iter().find(|(id, en, _)| *id == command && *en == source).map(|(_, _, translated)| *translated).unwrap_or(source)
 }
 
+/// The text a context menu draws for an item that runs `command` with `params` (#1308).
+///
+/// The Timeline's and the Composition panel's context menus repeat menu-bar commands, so they read
+/// the menu bar's row for the same command, and an `effect.apply` item draws the effect's name as
+/// the Effect menu does. The menu tree writes the ellipsis as `...` where the context menus write
+/// `…`. A label with no menu row (Delete, which the menu bar calls Clear) goes through the panel
+/// catalog. Only the drawn text is translated: the automation label stays the English `source`.
+pub(crate) fn context_item(command: &str, params: &serde_json::Value, source: &str) -> String {
+    if command == "effect.apply"
+        && let Some(id) = params.get("effect").and_then(|v| v.as_str())
+    {
+        return effects::name(id, source);
+    }
+    let ascii = source.strip_suffix('…').map(|s| format!("{s}..."));
+    let key = ascii.as_deref().unwrap_or(source);
+    menu_catalog(ui::current())
+        .and_then(|catalog| catalog.iter().find(|(id, en, _)| *id == command && *en == key))
+        .map_or_else(|| tr(source).to_string(), |(_, _, translated)| (*translated).to_string())
+}
+
 pub(crate) fn entry(app: &EffectcraftApp, e: &MenuEntry, shown: String) -> String {
     // The generated Effect menu's entries label themselves with the effect's registry name; the
     // catalog replaces it with the interface language's (#821). The entry keeps its command and
@@ -166,6 +261,8 @@ pub(crate) fn entry(app: &EffectcraftApp, e: &MenuEntry, shown: String) -> Strin
         "es" => ("Deshacer", "No se puede deshacer", "Rehacer", "No se puede rehacer"),
         "pt-br" => ("Desfazer", "Não há nada para desfazer", "Refazer", "Não há nada para refazer"),
         "cs" => ("Zpět", "Není co vrátit", "Znovu", "Není co zopakovat"),
+        // A colon before the history's (untranslated) action name: "დაბრუნება: Comp1".
+        "ka" => ("დაბრუნება:", "დაბრუნება შეუძლებელია", "ხელახლა შესრულება:", "ხელახლა შესრულება შეუძლებელია"),
         _ => return shown,
     };
     match e.command.as_str() {
@@ -275,6 +372,17 @@ pub(crate) fn submenu(app: &EffectcraftApp, source: &str, shown: String) -> Stri
                 return format!("Atribuir atalho à visualização 3D “{name}”");
             }
         }
+        "ka" => {
+            if source == "Assign Shortcut to Workspace" {
+                if let Some(name) = shown.strip_prefix("Assign Shortcut to “").and_then(|s| s.strip_suffix("” Workspace")) {
+                    return format!("მალსახმობის მინიჭება სამუშაო სივრცისთვის „{name}“");
+                }
+            } else if source == "Assign Shortcut to 3D View"
+                && let Some(name) = shown.strip_prefix("Assign Shortcut to “").and_then(|s| s.strip_suffix('”'))
+            {
+                return format!("მალსახმობის მინიჭება 3D ხედისთვის „{name}“");
+            }
+        }
         _ => {}
     }
     label(app, "", &shown).into()
@@ -361,6 +469,7 @@ const SIMPLIFIED_CHINESE: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "安装脚本文件..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "安装 ScriptUI 面板..."),
     ("file.runScript", "Run Script File...", "运行脚本文件..."),
+    ("", "Recent Script Files", "最近的脚本文件"),
     ("", "Create Proxy", "创建代理"),
     ("file.createProxy", "Still...", "静止图像..."),
     ("file.createProxy", "Movie...", "影片..."),
@@ -480,6 +589,7 @@ const SIMPLIFIED_CHINESE: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "形状图层"),
     ("layer.newAdjustment", "Adjustment Layer", "调整图层"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "内容识别填充图层..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D 基本体..."),
     ("layer.new3dPrimitive", "Cube", "立方体"),
     ("layer.new3dPrimitive", "Sphere", "球体"),
     ("layer.new3dPrimitive", "Plane", "平面"),
@@ -995,6 +1105,7 @@ const TRADITIONAL_CHINESE: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "安裝指令碼檔案..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "安裝 ScriptUI 面板..."),
     ("file.runScript", "Run Script File...", "執行指令碼檔案..."),
+    ("", "Recent Script Files", "最近使用的指令碼檔案"),
     ("", "Create Proxy", "建立代理"),
     ("file.createProxy", "Still...", "靜態影像..."),
     ("file.createProxy", "Movie...", "影片..."),
@@ -1114,6 +1225,7 @@ const TRADITIONAL_CHINESE: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "形狀圖層"),
     ("layer.newAdjustment", "Adjustment Layer", "調整圖層"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "內容感知填滿圖層..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D 基本體..."),
     ("layer.new3dPrimitive", "Cube", "立方體"),
     ("layer.new3dPrimitive", "Sphere", "球體"),
     ("layer.new3dPrimitive", "Plane", "平面"),
@@ -1626,6 +1738,7 @@ const JAPANESE: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "スクリプトファイルをインストール..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "ScriptUIパネルをインストール..."),
     ("file.runScript", "Run Script File...", "スクリプトファイルを実行..."),
+    ("", "Recent Script Files", "最近使用したスクリプトファイル"),
     ("", "Create Proxy", "プロキシを作成"),
     ("file.createProxy", "Still...", "静止画..."),
     ("file.createProxy", "Movie...", "ムービー..."),
@@ -1745,6 +1858,7 @@ const JAPANESE: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "シェイプレイヤー"),
     ("layer.newAdjustment", "Adjustment Layer", "調整レイヤー"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "コンテンツに応じた塗りつぶしレイヤー..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D プリミティブ..."),
     ("layer.new3dPrimitive", "Cube", "立方体"),
     ("layer.new3dPrimitive", "Sphere", "球体"),
     ("layer.new3dPrimitive", "Plane", "平面"),
@@ -2260,6 +2374,7 @@ const UKRAINIAN: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Встановити файл скрипту..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Встановити панель ScriptUI..."),
     ("file.runScript", "Run Script File...", "Виконати файл скрипту..."),
+    ("", "Recent Script Files", "Нещодавні файли скриптів"),
     ("", "Create Proxy", "Створити проксі"),
     ("file.createProxy", "Still...", "Зображення..."),
     ("file.createProxy", "Movie...", "Відео..."),
@@ -2379,6 +2494,7 @@ const UKRAINIAN: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Шар фігури"),
     ("layer.newAdjustment", "Adjustment Layer", "Коригувальний шар"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Шар заливки з урахуванням вмісту..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D-примітив..."),
     ("layer.new3dPrimitive", "Cube", "Куб"),
     ("layer.new3dPrimitive", "Sphere", "Сфера"),
     ("layer.new3dPrimitive", "Plane", "Площина"),
@@ -2895,6 +3011,7 @@ const SPANISH: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Instalar archivo de script..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Instalar panel de ScriptUI..."),
     ("file.runScript", "Run Script File...", "Ejecutar archivo de script..."),
+    ("", "Recent Script Files", "Archivos de script recientes"),
     ("", "Create Proxy", "Crear proxy"),
     ("file.createProxy", "Still...", "Imagen fija..."),
     ("file.createProxy", "Movie...", "Película..."),
@@ -3014,6 +3131,7 @@ const SPANISH: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Capa de forma"),
     ("layer.newAdjustment", "Adjustment Layer", "Capa de ajuste"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Capa de relleno según el contenido..."),
+    ("layer.newPrimitive", "3D Primitive...", "Primitiva 3D..."),
     ("layer.new3dPrimitive", "Cube", "Cubo"),
     ("layer.new3dPrimitive", "Sphere", "Esfera"),
     ("layer.new3dPrimitive", "Plane", "Plano"),
@@ -3528,6 +3646,7 @@ const PORTUGUESE: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Instalar arquivo de script..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Instalar painel ScriptUI..."),
     ("file.runScript", "Run Script File...", "Executar arquivo de script..."),
+    ("", "Recent Script Files", "Arquivos de script recentes"),
     ("", "Create Proxy", "Criar proxy"),
     ("file.createProxy", "Still...", "Imagem fixa..."),
     ("file.createProxy", "Movie...", "Filme..."),
@@ -3647,6 +3766,7 @@ const PORTUGUESE: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Camada de forma"),
     ("layer.newAdjustment", "Adjustment Layer", "Camada de ajuste"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Camada de preenchimento sensível ao conteúdo..."),
+    ("layer.newPrimitive", "3D Primitive...", "Primitiva 3D..."),
     ("layer.new3dPrimitive", "Cube", "Cubo"),
     ("layer.new3dPrimitive", "Sphere", "Esfera"),
     ("layer.new3dPrimitive", "Plane", "Plano"),
@@ -4169,6 +4289,7 @@ const RUSSIAN: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Установить файл скрипта..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Установить панель ScriptUI..."),
     ("file.runScript", "Run Script File...", "Выполнить файл скрипта..."),
+    ("", "Recent Script Files", "Недавние файлы скриптов"),
     ("", "Create Proxy", "Создать суррогат"),
     ("file.createProxy", "Still...", "Стоп-кадр..."),
     ("file.createProxy", "Movie...", "Видео..."),
@@ -4287,6 +4408,7 @@ const RUSSIAN: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Слой-фигура"),
     ("layer.newAdjustment", "Adjustment Layer", "Корректирующий слой"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Слой заливки с учетом содержимого..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D-примитив..."),
     ("layer.new3dPrimitive", "Cube", "Куб"),
     ("layer.new3dPrimitive", "Sphere", "Сфера"),
     ("layer.new3dPrimitive", "Plane", "Плоскость"),
@@ -4802,6 +4924,7 @@ const FRENCH: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Installer un fichier de script..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Installer un panneau ScriptUI..."),
     ("file.runScript", "Run Script File...", "Exécuter un fichier de script..."),
+    ("", "Recent Script Files", "Fichiers de script récents"),
     ("", "Create Proxy", "Créer un proxy"),
     ("file.createProxy", "Still...", "Image fixe..."),
     ("file.createProxy", "Movie...", "Vidéo..."),
@@ -4920,6 +5043,7 @@ const FRENCH: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Calque de forme"),
     ("layer.newAdjustment", "Adjustment Layer", "Calque de réglage"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Calque de remplissage d’après le contenu..."),
+    ("layer.newPrimitive", "3D Primitive...", "Primitive 3D..."),
     ("layer.new3dPrimitive", "Cube", "Cube"),
     ("layer.new3dPrimitive", "Sphere", "Sphère"),
     ("layer.new3dPrimitive", "Plane", "Plan"),
@@ -5435,6 +5559,7 @@ const GERMAN: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Skriptdatei installieren..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "ScriptUI-Bedienfeld installieren..."),
     ("file.runScript", "Run Script File...", "Skriptdatei ausführen..."),
+    ("", "Recent Script Files", "Zuletzt verwendete Skriptdateien"),
     ("", "Create Proxy", "Proxy erstellen"),
     ("file.createProxy", "Still...", "Standbild..."),
     ("file.createProxy", "Movie...", "Film..."),
@@ -5553,6 +5678,7 @@ const GERMAN: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Formebene"),
     ("layer.newAdjustment", "Adjustment Layer", "Einstellungsebene"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Ebene für inhaltsbasierte Füllung..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D-Grundkörper..."),
     ("layer.new3dPrimitive", "Cube", "Würfel"),
     ("layer.new3dPrimitive", "Sphere", "Kugel"),
     ("layer.new3dPrimitive", "Plane", "Fläche"),
@@ -6068,6 +6194,7 @@ const CZECH: &[(&str, &str, &str)] = &[
     ("file.installScript", "Install Script File...", "Nainstalovat soubor skriptu..."),
     ("file.installScriptUIPanel", "Install ScriptUI Panel...", "Nainstalovat panel ScriptUI..."),
     ("file.runScript", "Run Script File...", "Spustit soubor skriptu..."),
+    ("", "Recent Script Files", "Nedávné soubory skriptů"),
     ("", "Create Proxy", "Vytvořit zástupný soubor"),
     ("file.createProxy", "Still...", "Statický snímek..."),
     ("file.createProxy", "Movie...", "Video..."),
@@ -6187,6 +6314,7 @@ const CZECH: &[(&str, &str, &str)] = &[
     ("layer.newShape", "Shape Layer", "Vrstva tvaru"),
     ("layer.newAdjustment", "Adjustment Layer", "Vrstva úprav"),
     ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "Vrstva výplně podle obsahu..."),
+    ("layer.newPrimitive", "3D Primitive...", "3D primitivum..."),
     ("layer.new3dPrimitive", "Cube", "Krychle"),
     ("layer.new3dPrimitive", "Sphere", "Koule"),
     ("layer.new3dPrimitive", "Plane", "Rovina"),
@@ -6617,6 +6745,642 @@ const CZECH: &[(&str, &str, &str)] = &[
     ("file.openDemoProject", "Open Demo Project", "Otevřít ukázkový projekt"),
 ];
 
+/// Georgian (ka): the same (command, English label) keys as `JAPANESE`, one entry per fixed menu row.
+/// Original translations written from the meaning of the English labels, sharing the terminology of
+/// the other Craft apps' Georgian catalogs (შრე, საკვანძო კადრი, კომპოზიცია, ნიღაბი); commands are
+/// verbal nouns (შენახვა, გახსნა) and Georgian has no capital letters.
+const GEORGIAN: &[(&str, &str, &str)] = &[
+    ("", "EffectCraft", "EffectCraft"),
+    ("app.about", "About EffectCraft...", "EffectCraft-ის შესახებ..."),
+    ("", "Settings...", "პარამეტრები..."),
+    ("app.settings", "General...", "ზოგადი..."),
+    ("app.settings", "Startup & Repair...", "გაშვება და აღდგენა..."),
+    ("app.settings", "Project...", "პროექტი..."),
+    ("app.settings", "Composition...", "კომპოზიცია..."),
+    ("app.settings", "Previews...", "წინასწარი ნახვა..."),
+    ("app.settings", "Appearance...", "იერსახე..."),
+    ("app.settings", "Grids & Guides...", "ბადე და დამხმარე ხაზები..."),
+    ("app.settings", "Labels...", "იარლიყები..."),
+    ("app.settings", "Type...", "ტექსტი..."),
+    ("app.settings", "Import...", "იმპორტი..."),
+    ("app.settings", "Export...", "ექსპორტი..."),
+    ("app.settings", "Audio...", "აუდიო..."),
+    ("app.settings", "Disk...", "დისკი..."),
+    ("app.settings", "Memory & CPU...", "მეხსიერება და CPU..."),
+    ("app.settings", "Video...", "ვიდეო..."),
+    ("app.settings", "3D...", "3D..."),
+    ("app.settings", "Scripting & Expressions...", "სკრიპტები და ექსპრესიები..."),
+    ("app.hide", "Hide EffectCraft", "EffectCraft-ის დამალვა"),
+    ("app.hideOthers", "Hide Others", "სხვების დამალვა"),
+    ("app.showAll", "Show All", "ყველას ჩვენება"),
+    ("app.quit", "Quit EffectCraft", "EffectCraft-იდან გასვლა"),
+    ("", "File", "ფაილი"),
+    ("", "New", "ახალი"),
+    ("file.newProject", "New Project", "ახალი პროექტი"),
+    ("file.newFromTemplate", "New Project from Template...", "ახალი პროექტი შაბლონიდან..."),
+    ("project.newFolder", "New Folder", "ახალი საქაღალდე"),
+    ("file.open", "Open Project...", "პროექტის გახსნა..."),
+    ("", "Open Recent", "ბოლოს გახსნილი ფაილების გახსნა"),
+    ("file.clearRecent", "Clear Recent Projects", "ბოლო პროექტების სიის გასუფთავება"),
+    ("file.close", "Close", "დახურვა"),
+    ("file.closeProject", "Close Project", "პროექტის დახურვა"),
+    ("file.save", "Save", "შენახვა"),
+    ("", "Save As", "შენახვა როგორც"),
+    ("file.saveAs", "Save As...", "შენახვა როგორც..."),
+    ("file.saveCopy", "Save a Copy...", "ასლის შენახვა..."),
+    ("file.saveCopyAsXml", "Save a Copy As XML...", "ასლის შენახვა XML-ად..."),
+    ("templates.saveAs", "Save as Template...", "შაბლონად შენახვა..."),
+    ("file.incrementAndSave", "Increment and Save", "ვერსიის გაზრდით შენახვა"),
+    ("file.revert", "Revert", "წინა ვერსიაზე დაბრუნება"),
+    ("", "Import", "იმპორტი"),
+    ("file.import", "File...", "ფაილი..."),
+    ("file.importMultiple", "Multiple Files...", "რამდენიმე ფაილი..."),
+    ("file.importTimeline", "Adobe Premiere Pro Project...", "Adobe Premiere Pro-ს პროექტი..."),
+    ("file.importProject", "EffectCraft Project...", "EffectCraft-ის პროექტი..."),
+    ("file.importPlaceholder", "Placeholder...", "ჩანაცვლების ობიექტი..."),
+    ("file.importSolid", "Solid...", "სოლიდი..."),
+    ("file.importLottie", "Lottie...", "Lottie..."),
+    ("file.importVanishingPoint", "Vanishing Point (.vpe)...", "Vanishing Point (.vpe)..."),
+    ("essential.importTemplate", "Essential Graphics Template...", "ძირითადი გრაფიკის შაბლონი..."),
+    ("", "Import Recent Footage", "ბოლო ვიდეომასალის იმპორტი"),
+    ("file.clearRecentFootage", "Clear Recent Footage", "ბოლო ვიდეომასალის სიის გასუფთავება"),
+    ("", "Export", "ექსპორტი"),
+    ("renderQueue.add", "Add to Render Queue", "რენდერის რიგში დამატება"),
+    ("file.exportTimeline", "Adobe Premiere Pro Project...", "Adobe Premiere Pro-ს პროექტი..."),
+    ("file.exportLottie", "Lottie JSON...", "Lottie JSON..."),
+    ("essential.exportTemplate", "Essential Graphics Template...", "ძირითადი გრაფიკის შაბლონი..."),
+    ("app.find", "Find", "ძებნა"),
+    ("layer.addItem", "Add Footage to Comp", "ვიდეომასალის კომპოზიციაში დამატება"),
+    ("file.newCompFromSelection", "New Comp from Selection...", "ახალი კომპოზიცია მონიშნულიდან..."),
+    ("", "Dependencies", "დამოკიდებულებები"),
+    ("file.collectFiles", "Collect Files...", "ფაილების შეგროვება..."),
+    ("file.consolidateFootage", "Consolidate All Footage", "მთელი ვიდეომასალის კონსოლიდაცია"),
+    ("file.removeUnusedFootage", "Remove Unused Footage", "გამოუყენებელი ვიდეომასალის წაშლა"),
+    ("file.reduceProject", "Reduce Project", "პროექტის შემცირება"),
+    ("file.findMissing", "Find Missing Effects", "დაკარგული ეფექტების ძებნა"),
+    ("file.findMissing", "Find Missing Fonts", "დაკარგული შრიფტების ძებნა"),
+    ("file.findMissing", "Find Missing Footage", "დაკარგული ვიდეომასალის ძებნა"),
+    ("file.relinkFootage", "Relink Missing Footage...", "დაკარგული ვიდეომასალის ხელახლა დაკავშირება..."),
+    ("file.watchFolder", "Watch Folder...", "საქაღალდეზე თვალყურის დევნება..."),
+    ("", "Scripts", "სკრიპტები"),
+    ("file.installScript", "Install Script File...", "სკრიპტის ფაილის დაყენება..."),
+    ("file.installScriptUIPanel", "Install ScriptUI Panel...", "ScriptUI პანელის დაყენება..."),
+    ("file.runScript", "Run Script File...", "სკრიპტის ფაილის გაშვება..."),
+    ("", "Recent Script Files", "ბოლო სკრიპტის ფაილები"),
+    ("", "Create Proxy", "პროქსის შექმნა"),
+    ("file.createProxy", "Still...", "სტატიკური კადრი..."),
+    ("file.createProxy", "Movie...", "ვიდეო..."),
+    ("", "Set Proxy", "პროქსის მინიჭება"),
+    ("file.setProxy", "File...", "ფაილი..."),
+    ("file.setProxyNone", "None", "არცერთი"),
+    ("", "Interpret Footage", "ვიდეომასალის ინტერპრეტაცია"),
+    ("file.interpretFootage", "Main...", "ძირითადი..."),
+    ("file.interpretProxy", "Proxy...", "პროქსი..."),
+    ("file.rememberInterpretation", "Remember Interpretation", "ინტერპრეტაციის დამახსოვრება"),
+    ("file.applyInterpretation", "Apply Interpretation", "ინტერპრეტაციის გამოყენება"),
+    ("", "Replace Footage", "ვიდეომასალის ჩანაცვლება"),
+    ("file.replaceFootage", "File...", "ფაილი..."),
+    ("file.replaceWithPlaceholder", "Placeholder...", "ჩანაცვლების ობიექტი..."),
+    ("file.replaceWithSolid", "Solid...", "სოლიდი..."),
+    ("file.replaceWithLayeredComp", "With Layered Comp", "შრეებიანი კომპოზიციით"),
+    ("file.reloadFootage", "Reload Footage", "ვიდეომასალის ხელახლა ჩატვირთვა"),
+    ("file.revealInFinder", "Reveal in Finder", "Finder-ში ჩვენება"),
+    ("file.projectSettings", "Project Settings...", "პროექტის პარამეტრები..."),
+    ("app.quit", "Exit", "გასვლა"),
+    ("", "Edit", "რედაქტირება"),
+    ("edit.undo", "Undo", "დაბრუნება"),
+    ("edit.redo", "Redo", "ხელახლა შესრულება"),
+    ("", "History", "ისტორია"),
+    ("app.commandPalette", "Quick Apply...", "სწრაფი გამოყენება..."),
+    ("edit.cut", "Cut", "ამოჭრა"),
+    ("edit.copy", "Copy", "კოპირება"),
+    ("edit.copyWithPropertyLinks", "Copy with Property Links", "კოპირება თვისებების ბმულებით"),
+    ("edit.copyWithRelativePropertyLinks", "Copy with Relative Property Links", "კოპირება თვისებების ფარდობითი ბმულებით"),
+    ("edit.copyExpressionOnly", "Copy Expression Only", "მხოლოდ ექსპრესიის კოპირება"),
+    ("edit.paste", "Paste", "ჩასმა"),
+    ("edit.pasteReversedKeyframes", "Paste Reversed Keyframes", "საკვანძო კადრების შებრუნებული ჩასმა"),
+    ("edit.pasteTextMatchFormatting", "Paste Text and Match Formatting", "ტექსტის ჩასმა ფორმატის შეთანხმებით"),
+    ("edit.pasteTextFormattingOnly", "Paste Text Formatting Only", "მხოლოდ ტექსტის ფორმატის ჩასმა"),
+    ("edit.clear", "Clear", "გასუფთავება"),
+    ("edit.duplicate", "Duplicate", "დუბლირება"),
+    ("edit.splitLayer", "Split Layer", "შრის დაყოფა"),
+    ("edit.liftWorkArea", "Lift Work Area", "სამუშაო არის აწევა"),
+    ("edit.extractWorkArea", "Extract Work Area", "სამუშაო არის ამოღება"),
+    ("edit.selectAll", "Select All", "ყველაფრის მონიშვნა"),
+    ("edit.deselectAll", "Deselect All", "ყველა მონიშვნის მოხსნა"),
+    ("", "Label", "იარლიყი"),
+    ("edit.selectLabelGroup", "Select Label Group", "იარლიყის ჯგუფის მონიშვნა"),
+    ("edit.label", "None", "არცერთი"),
+    ("edit.label", "Red", "წითელი"),
+    ("edit.label", "Yellow", "ყვითელი"),
+    ("edit.label", "Aqua", "ზღვისფერი"),
+    ("edit.label", "Pink", "ვარდისფერი"),
+    ("edit.label", "Lavender", "ლავანდისფერი"),
+    ("edit.label", "Peach", "ატმისფერი"),
+    ("edit.label", "Sea Foam", "ზღვის ქაფი"),
+    ("edit.label", "Blue", "ლურჯი"),
+    ("edit.label", "Green", "მწვანე"),
+    ("edit.label", "Purple", "იისფერი"),
+    ("edit.label", "Orange", "ნარინჯისფერი"),
+    ("edit.label", "Brown", "ყავისფერი"),
+    ("edit.label", "Fuchsia", "ფუქსია"),
+    ("edit.label", "Cyan", "ცისფერი"),
+    ("edit.label", "Sandstone", "ქვიშაქვა"),
+    ("edit.label", "Dark Green", "მუქი მწვანე"),
+    ("app.settings", "Edit Label Colors...", "იარლიყის ფერების რედაქტირება..."),
+    ("", "Select Keyframe Label Group", "საკვანძო კადრების იარლიყის ჯგუფის მონიშვნა"),
+    ("keys.selectLabelGroup", "On Selected Layers", "მონიშნულ შრეებზე"),
+    ("keys.selectLabelGroup", "On All Layers", "ყველა შრეზე"),
+    ("keys.selectLabelGroup", "Visible Keyframes on Selected Layers", "ხილული საკვანძო კადრები მონიშნულ შრეებზე"),
+    ("keys.selectLabelGroup", "Visible Keyframes on All Layers", "ხილული საკვანძო კადრები ყველა შრეზე"),
+    ("", "Purge", "გაწმენდა"),
+    ("edit.purge", "All Cache...", "მთელი ქეში..."),
+    ("edit.purge", "All Memory & Disk Cache...", "მთელი მეხსიერება და დისკის ქეში..."),
+    ("edit.purge", "All Memory", "მთელი მეხსიერება"),
+    ("edit.purge", "All Disk Cache...", "მთელი დისკის ქეში..."),
+    ("edit.purge", "All 3D Cache...", "მთელი 3D ქეში..."),
+    ("edit.purgeUndo", "Undo", "დაბრუნების ისტორია"),
+    ("edit.purge", "Image Cache Memory", "გამოსახულების ქეშის მეხსიერება"),
+    ("edit.purge", "Snapshot", "მომენტალური ასლი"),
+    ("edit.editOriginal", "Edit Original...", "ორიგინალის რედაქტირება..."),
+    ("", "Templates", "შაბლონები"),
+    ("app.templates", "Render Settings...", "რენდერის პარამეტრები..."),
+    ("app.templates", "Output Module...", "გამოტანის მოდული..."),
+    ("app.keyboardShortcuts", "Keyboard Shortcuts", "კლავიატურის მალსახმობები"),
+    ("", "Preferences", "პარამეტრები"),
+    ("", "Composition", "კომპოზიცია"),
+    ("comp.new", "New Composition...", "ახალი კომპოზიცია..."),
+    ("comp.settings", "Composition Settings...", "კომპოზიციის პარამეტრები..."),
+    ("comp.setPosterTime", "Set Poster Time", "პოსტერის დროის დაყენება"),
+    ("comp.trimToWorkArea", "Trim Comp to Work Area", "კომპოზიციის მოკვეთა სამუშაო არემდე"),
+    ("comp.cropToRegionOfInterest", "Crop Comp to Region of Interest", "კომპოზიციის ჩამოჭრა ინტერესის არემდე"),
+    ("comp.cropToLayerBounds", "Crop Comp to Selected Layer(s) Bounds", "კომპოზიციის ჩამოჭრა მონიშნული შრ(ეებ)ის საზღვრებამდე"),
+    ("render.addOutputModule", "Add Output Module", "გამოტანის მოდულის დამატება"),
+    ("", "Preview", "წინასწარი ნახვა"),
+    ("playback.toggle", "Play Current Preview", "მიმდინარე წინასწარი ნახვის დაკვრა"),
+    ("playback.cacheWhenIdle", "Cache Frames When Idle", "კადრების ქეშირება უქმობისას"),
+    ("playback.audio", "Audio", "აუდიო"),
+    ("", "Save Frame As", "კადრის შენახვა როგორც"),
+    ("comp.saveFrameAs", "File...", "ფაილი..."),
+    ("comp.saveFrameAsPsd", "Photoshop Layers...", "Photoshop-ის შრეები..."),
+    ("comp.saveFrameAsExr", "ProEXR...", "ProEXR..."),
+    ("comp.copyFrame", "Copy Frame to Clipboard", "კადრის კოპირება გაცვლის ბუფერში"),
+    ("render.preRender", "Pre-render...", "წინასწარი რენდერი..."),
+    ("render.saveCurrentPreview", "Save Current Preview...", "მიმდინარე წინასწარი ნახვის შენახვა..."),
+    ("comp.openInEssentialGraphics", "Open in Essential Graphics", "ძირითად გრაფიკაში გახსნა"),
+    ("", "Responsive Design — Time", "რესპონსიული დიზაინი — დრო"),
+    ("comp.responsiveTime", "Create Intro", "შესავლის შექმნა"),
+    ("comp.responsiveTime", "Create Outro", "დასასრულის შექმნა"),
+    ("comp.responsiveTime", "Create Protected Region from Work Area", "დაცული არის შექმნა სამუშაო არიდან"),
+    ("comp.flowchart", "Composition Flowchart", "კომპოზიციის ბლოკ-სქემა"),
+    ("comp.miniFlowchart", "Composition Mini-Flowchart", "კომპოზიციის მინი-ბლოკ-სქემა"),
+    ("", "VR", "VR"),
+    ("comp.vr.createEnvironment", "Create VR Environment...", "VR გარემოს შექმნა..."),
+    ("comp.vr.extractCubemap", "Extract Cubemap...", "კუბური რუკის ამოღება..."),
+    ("", "Layer", "შრე"),
+    ("layer.newText", "Text", "ტექსტი"),
+    ("layer.newSolid", "Solid...", "სოლიდი..."),
+    ("layer.newLight", "Light...", "სინათლე..."),
+    ("layer.newCamera", "Camera...", "კამერა..."),
+    ("layer.newNull", "Null Object", "ნულოვანი ობიექტი"),
+    ("layer.newShape", "Shape Layer", "ფიგურის შრე"),
+    ("layer.newAdjustment", "Adjustment Layer", "კორექციის შრე"),
+    ("layer.newContentAwareFill", "Content-Aware Fill Layer...", "შიგთავსის გათვალისწინებით შევსების შრე..."),
+    ("layer.new3dPrimitive", "Cube", "კუბი"),
+    ("layer.new3dPrimitive", "Sphere", "სფერო"),
+    ("layer.new3dPrimitive", "Plane", "სიბრტყე"),
+    ("layer.new3dPrimitive", "Torus", "ტორი"),
+    ("layer.new3dPrimitive", "Cone", "კონუსი"),
+    ("layer.new3dPrimitive", "Cylinder", "ცილინდრი"),
+    ("layer.settings", "Layer Settings...", "შრის პარამეტრები..."),
+    ("layer.openLayer", "Open Layer", "შრის გახსნა"),
+    ("layer.openSource", "Open Layer Source", "შრის წყაროს გახსნა"),
+    ("layer.revealInFinder", "Reveal in Finder", "Finder-ში ჩვენება"),
+    ("", "Mask", "ნიღაბი"),
+    ("layer.addMask", "New Mask", "ახალი ნიღაბი"),
+    ("layer.mask.shape", "Mask Shape...", "ნიღბის ფორმა..."),
+    ("layer.mask.set", "Mask Feather...", "ნიღბის კიდეების შერბილება..."),
+    ("layer.mask.set", "Mask Opacity...", "ნიღბის გაუმჭვირვალობა..."),
+    ("layer.mask.set", "Mask Expansion...", "ნიღბის გაფართოება..."),
+    ("layer.mask.reset", "Reset Mask", "ნიღბის ჩამოყრა"),
+    ("layer.mask.remove", "Remove Mask", "ნიღბის წაშლა"),
+    ("layer.mask.removeAll", "Remove All Masks", "ყველა ნიღბის წაშლა"),
+    ("track.mask", "Track Mask", "ნიღბის ტრეკინგი"),
+    ("", "Mode", "რეჟიმი"),
+    ("layer.mask.mode", "None", "არცერთი"),
+    ("layer.mask.mode", "Add", "დამატება"),
+    ("layer.mask.mode", "Subtract", "გამოკლება"),
+    ("layer.mask.mode", "Intersect", "გადაკვეთა"),
+    ("layer.mask.mode", "Lighten", "გაღიავება"),
+    ("layer.mask.mode", "Darken", "ჩამუქება"),
+    ("layer.mask.mode", "Difference", "სხვაობა"),
+    ("layer.mask.invert", "Inverted", "შებრუნებული"),
+    ("layer.mask.lock", "Locked", "ჩაკეტილი"),
+    ("", "Motion Blur", "მოძრაობის გაბუნდოვნება"),
+    ("layer.mask.motionBlur", "Same As Layer", "შრის მსგავსად"),
+    ("layer.mask.motionBlur", "On", "ჩართული"),
+    ("layer.mask.motionBlur", "Off", "გამორთული"),
+    ("", "Feather Falloff", "კიდეების შერბილების მილევა"),
+    ("layer.mask.featherFalloff", "Smooth", "გლუვი"),
+    ("layer.mask.featherFalloff", "Linear", "წრფივი"),
+    ("layer.mask.unlockAll", "Unlock All Masks", "ყველა ნიღბის განბლოკვა"),
+    ("layer.mask.lockOthers", "Lock Other Masks", "სხვა ნიღბების ჩაკეტვა"),
+    ("layer.mask.hideLocked", "Hide Locked Masks", "ჩაკეტილი ნიღბების დამალვა"),
+    ("", "Mask and Shape Path", "ნიღაბი და ფიგურის ტრაექტორია"),
+    ("path.rotoBezier", "RotoBezier", "RotoBezier"),
+    ("mask.setClosed", "Closed", "შეკრული"),
+    ("path.convertToBezier", "Convert To Bezier Path", "ბეზიეს ტრაექტორიად გარდაქმნა"),
+    ("path.setFirstVertex", "Set First Vertex", "პირველი წვეროს დაყენება"),
+    ("path.freeTransform", "Free Transform Points", "წერტილების თავისუფალი გარდაქმნა"),
+    ("", "Quality", "ხარისხი"),
+    ("layer.quality", "Best", "საუკეთესო"),
+    ("layer.quality", "Draft", "მონახაზი"),
+    ("layer.quality", "Wireframe", "კარკასი"),
+    ("layer.sampling", "Bilinear", "ბიწრფივი"),
+    ("layer.sampling", "Bicubic", "ბიკუბური"),
+    ("", "Switches", "გადამრთველები"),
+    ("layer.hideOtherVideo", "Hide Other Video", "სხვა ვიდეოს დამალვა"),
+    ("layer.showAllVideo", "Show All Video", "მთელი ვიდეოს ჩვენება"),
+    ("layer.unlockAll", "Unlock All Layers", "ყველა შრის განბლოკვა"),
+    ("layer.expressions", "Enable Expressions", "ექსპრესიების ჩართვა"),
+    ("layer.expressions", "Disable Expressions", "ექსპრესიების გამორთვა"),
+    ("layer.setSwitch", "Shy", "მორცხვი"),
+    ("layer.setSwitch", "Lock", "ჩაკეტვა"),
+    ("layer.setSwitch", "Audio", "აუდიო"),
+    ("layer.setSwitch", "Video", "ვიდეო"),
+    ("layer.setSwitch", "Solo", "სოლო"),
+    ("layer.setSwitch", "Effect", "ეფექტი"),
+    ("layer.setSwitch", "Collapse", "ჩაკეცვა"),
+    ("layer.setSwitch", "Motion Blur", "მოძრაობის გაბუნდოვნება"),
+    ("layer.setSwitch", "Adjustment Layer", "კორექციის შრე"),
+    ("", "Transform", "გარდაქმნა"),
+    ("layer.transform", "Reset", "ჩამოყრა"),
+    ("layer.setTransform", "Anchor Point...", "საყრდენი წერტილი..."),
+    ("layer.setTransform", "Position...", "პოზიცია..."),
+    ("layer.setTransform", "Scale...", "მასშტაბი..."),
+    ("layer.setTransform", "Orientation...", "ორიენტაცია..."),
+    ("layer.setTransform", "Rotation...", "შემობრუნება..."),
+    ("layer.setTransform", "Opacity...", "გაუმჭვირვალობა..."),
+    ("layer.transform", "Flip Horizontal", "ჰორიზონტალურად არეკვლა"),
+    ("layer.transform", "Flip Vertical", "ვერტიკალურად არეკვლა"),
+    ("layer.transform", "Center In View", "ხედის ცენტრში მოთავსება"),
+    ("layer.centerAnchor", "Center Anchor Point in Layer Content", "საყრდენი წერტილის შრის შიგთავსის ცენტრში მოთავსება"),
+    ("layer.transform", "Fit to Comp", "კომპოზიციაში ჩატევა"),
+    ("layer.transform", "Fit to Comp Width", "კომპოზიციის სიგანეში ჩატევა"),
+    ("layer.transform", "Fit to Comp Height", "კომპოზიციის სიმაღლეში ჩატევა"),
+    ("layer.autoOrient", "Auto-Orient...", "ავტოორიენტაცია..."),
+    ("", "Time", "დრო"),
+    ("layer.enableTimeRemap", "Enable Time Remapping", "დროის გადანაწილების ჩართვა"),
+    ("layer.timeReverse", "Time-Reverse Layer", "შრის დროში შებრუნება"),
+    ("layer.timeStretch", "Time Stretch...", "დროში გაწელვა..."),
+    ("layer.freezeFrame", "Freeze Frame", "კადრის გაყინვა"),
+    ("layer.freezeOnLastFrame", "Freeze On Last Frame", "ბოლო კადრზე გაყინვა"),
+    ("layer.alignVideoToData", "Align Video to Data", "ვიდეოს მონაცემებთან სწორება"),
+    ("", "Frame Blending", "კადრების შერევა"),
+    ("layer.frameBlending", "Off", "გამორთული"),
+    ("layer.frameBlending", "Frame Mix", "კადრების ნაზავი"),
+    ("layer.frameBlending", "Pixel Motion", "პიქსელების მოძრაობა"),
+    ("layer.setSwitch", "3D Layer", "3D შრე"),
+    ("layer.setSwitch", "Guide Layer", "დამხმარე შრე"),
+    ("layer.environment", "Environment Layer", "გარემოს შრე"),
+    ("", "Markers", "მარკერები"),
+    ("layer.addMarker", "Add Marker", "მარკერის დამატება"),
+    ("layer.updateMarkersFromSource", "Update Markers From Source", "მარკერების განახლება წყაროდან"),
+    ("layer.markersLock", "Lock Markers", "მარკერების ჩაკეტვა"),
+    ("layer.deleteAllMarkers", "Delete All Markers", "ყველა მარკერის წაშლა"),
+    ("layer.setSwitch", "Preserve Transparency", "გამჭვირვალობის შენარჩუნება"),
+    ("", "Blending Mode", "შერევის რეჟიმი"),
+    ("layer.setBlendMode", "Normal", "ჩვეულებრივი"),
+    ("layer.setBlendMode", "Dissolve", "გაფანტვა"),
+    ("layer.setBlendMode", "Dancing Dissolve", "მოცეკვავე გაფანტვა"),
+    ("layer.setBlendMode", "Darken", "ჩამუქება"),
+    ("layer.setBlendMode", "Multiply", "გამრავლება"),
+    ("layer.setBlendMode", "Color Burn", "ფერით ჩამუქება"),
+    ("layer.setBlendMode", "Classic Color Burn", "კლასიკური ფერით ჩამუქება"),
+    ("layer.setBlendMode", "Linear Burn", "წრფივი ჩამუქება"),
+    ("layer.setBlendMode", "Darker Color", "უფრო მუქი ფერი"),
+    ("layer.setBlendMode", "Add", "დამატება"),
+    ("layer.setBlendMode", "Lighten", "გაღიავება"),
+    ("layer.setBlendMode", "Screen", "ეკრანი"),
+    ("layer.setBlendMode", "Color Dodge", "ფერით გაღიავება"),
+    ("layer.setBlendMode", "Classic Color Dodge", "კლასიკური ფერით გაღიავება"),
+    ("layer.setBlendMode", "Linear Dodge", "წრფივი გაღიავება"),
+    ("layer.setBlendMode", "Lighter Color", "უფრო ღია ფერი"),
+    ("layer.setBlendMode", "Overlay", "გადაფარვა"),
+    ("layer.setBlendMode", "Soft Light", "რბილი სინათლე"),
+    ("layer.setBlendMode", "Hard Light", "მკვეთრი სინათლე"),
+    ("layer.setBlendMode", "Linear Light", "წრფივი სინათლე"),
+    ("layer.setBlendMode", "Vivid Light", "კაშკაშა სინათლე"),
+    ("layer.setBlendMode", "Pin Light", "წერტილოვანი სინათლე"),
+    ("layer.setBlendMode", "Hard Mix", "მკვეთრი შერევა"),
+    ("layer.setBlendMode", "Difference", "სხვაობა"),
+    ("layer.setBlendMode", "Classic Difference", "კლასიკური სხვაობა"),
+    ("layer.setBlendMode", "Exclusion", "გამორიცხვა"),
+    ("layer.setBlendMode", "Subtract", "გამოკლება"),
+    ("layer.setBlendMode", "Divide", "გაყოფა"),
+    ("layer.setBlendMode", "Hue", "ფერის ტონი"),
+    ("layer.setBlendMode", "Saturation", "გაჯერება"),
+    ("layer.setBlendMode", "Color", "ფერი"),
+    ("layer.setBlendMode", "Luminosity", "ნათება"),
+    ("layer.setBlendMode", "Stencil Alpha", "ალფა-ტრაფარეტი"),
+    ("layer.setBlendMode", "Stencil Luma", "ლუმა-ტრაფარეტი"),
+    ("layer.setBlendMode", "Silhouette Alpha", "ალფა-სილუეტი"),
+    ("layer.setBlendMode", "Silhouette Luma", "ლუმა-სილუეტი"),
+    ("layer.setBlendMode", "Alpha Add", "ალფას დამატება"),
+    ("layer.setBlendMode", "Luminescent Premul", "მანათობელი წინასწარ გამრავლებული"),
+    ("layer.setBlendMode", "Next Blending Mode", "შემდეგი შერევის რეჟიმი"),
+    ("layer.setBlendMode", "Previous Blending Mode", "წინა შერევის რეჟიმი"),
+    ("", "Track Matte", "ტრეკ-მატი"),
+    ("layer.trackMatte", "No Track Matte", "ტრეკ-მატის გარეშე"),
+    ("layer.trackMatte", "Alpha Matte", "ალფა-მატი"),
+    ("layer.trackMatte", "Alpha Inverted Matte", "შებრუნებული ალფა-მატი"),
+    ("layer.trackMatte", "Luma Matte", "ლუმა-მატი"),
+    ("layer.trackMatte", "Luma Inverted Matte", "შებრუნებული ლუმა-მატი"),
+    ("layer.trackMatte", "Matte with Layer Above", "მატი ზედა შრით"),
+    ("layer.trackMatte", "Matte with Layer Below", "მატი ქვედა შრით"),
+    ("", "Layer Styles", "შრის სტილები"),
+    ("layer.style.options", "Layer Style Options...", "შრის სტილის პარამეტრები..."),
+    ("layer.style.convertToEditable", "Convert to Editable Styles", "რედაქტირებად სტილებად გარდაქმნა"),
+    ("layer.style.showAll", "Show All", "ყველას ჩვენება"),
+    ("layer.style.removeAll", "Remove All", "ყველას წაშლა"),
+    ("layer.style.dropShadow", "Drop Shadow", "ჩრდილი"),
+    ("layer.style.innerShadow", "Inner Shadow", "შიდა ჩრდილი"),
+    ("layer.style.outerGlow", "Outer Glow", "გარე ნათება"),
+    ("layer.style.innerGlow", "Inner Glow", "შიდა ნათება"),
+    ("layer.style.bevelEmboss", "Bevel and Emboss", "ფასკა და რელიეფი"),
+    ("layer.style.satin", "Satin", "ატლასი"),
+    ("layer.style.colorOverlay", "Color Overlay", "ფერის გადაფარვა"),
+    ("layer.style.gradientOverlay", "Gradient Overlay", "გრადიენტის გადაფარვა"),
+    ("layer.style.stroke", "Stroke", "კონტური"),
+    ("path.groupShapes", "Group Shapes", "ფიგურების დაჯგუფება"),
+    ("path.ungroupShapes", "Ungroup Shapes", "ფიგურების დაჯგუფების მოხსნა"),
+    ("", "Arrange", "დალაგება"),
+    ("layer.arrange", "Bring Layer to Front", "შრის წინა პლანზე გადმოტანა"),
+    ("layer.arrange", "Bring Layer Forward", "შრის წინ გადმოტანა"),
+    ("layer.arrange", "Send Layer Backward", "შრის უკან გადატანა"),
+    ("layer.arrange", "Send Layer to Back", "შრის უკანა პლანზე გადატანა"),
+    ("", "Reveal", "ჩვენება"),
+    ("layer.revealSource", "Reveal Layer Source in Project", "შრის წყაროს ჩვენება პროექტში"),
+    ("comp.flowchart", "Reveal Layer in Project Flowchart", "შრის ჩვენება პროექტის ბლოკ-სქემაში"),
+    ("comp.revealInProject", "Reveal Composition in Project", "კომპოზიციის ჩვენება პროექტში"),
+    ("layer.revealExpressionErrors", "Reveal Expression Errors", "ექსპრესიის შეცდომების ჩვენება"),
+    ("", "Create", "შექმნა"),
+    ("layer.create", "Convert to Editable Text", "რედაქტირებად ტექსტად გარდაქმნა"),
+    ("layer.create", "Create Shapes from Text", "ფიგურების შექმნა ტექსტიდან"),
+    ("layer.create", "Create Masks from Text", "ნიღბების შექმნა ტექსტიდან"),
+    ("layer.create", "Create Shapes from Vector Layer", "ფიგურების შექმნა ვექტორული შრიდან"),
+    ("layer.create", "Create Keyframes from Data", "საკვანძო კადრების შექმნა მონაცემებიდან"),
+    ("layer.create", "Null Controllers for Positional Points", "ნულოვანი მართვის ობიექტები პოზიციის წერტილებისთვის"),
+    ("layer.create", "Null Controllers for Path Points", "ნულოვანი მართვის ობიექტები ტრაექტორიის წერტილებისთვის"),
+    ("layer.create", "Nulls Following Path Points", "ტრაექტორიის წერტილებს მიმყოლი ნულოვანი ობიექტები"),
+    ("layer.create", "Null Tracing Along Path", "ტრაექტორიის გასწვრივ მოძრავი ნულოვანი ობიექტი"),
+    ("layer.create", "Create 3D Layer Instance", "3D შრის ეგზემპლარის შექმნა"),
+    ("", "Camera", "კამერა"),
+    ("camera.fromView", "Create Camera from 3D View", "კამერის შექმნა 3D ხედიდან"),
+    ("camera.stereoRig", "Create Stereo 3D Rig", "სტერეო 3D სისტემის შექმნა"),
+    ("camera.orbitNull", "Create Orbit Null", "ორბიტის ნულოვანი ობიექტის შექმნა"),
+    ("camera.fromModel", "Create Cameras from 3D Model", "კამერების შექმნა 3D მოდელიდან"),
+    ("camera.linkFocusToPoi", "Link Focus Distance to Point of Interest", "ფოკუსური მანძილის მიბმა ინტერესის წერტილზე"),
+    ("camera.linkFocusToLayer", "Link Focus Distance to Layer", "ფოკუსური მანძილის მიბმა შრეზე"),
+    ("camera.setFocusToLayer", "Set Focus Distance to Layer", "ფოკუსური მანძილის დაყენება შრეზე"),
+    ("layer.cameraSettings", "Camera Settings...", "კამერის პარამეტრები..."),
+    ("view.reset3DView", "Reset 3D View", "3D ხედის ჩამოყრა"),
+    ("", "Light", "სინათლე"),
+    ("light.fromModel", "Create Lights from 3D Model", "სინათლის წყაროების შექმნა 3D მოდელიდან"),
+    ("light.controlWithCamera", "Control Light with Camera", "სინათლის მართვა კამერით"),
+    ("light.environmentBackground", "Create Environment Light Background Layer", "გარემოს სინათლის ფონური შრის შექმნა"),
+    ("", "Material", "მასალა"),
+    ("material.revealSource", "Reveal Material Source in Project", "მასალის წყაროს ჩვენება პროექტში"),
+    ("material.reset", "Reset Material", "მასალის ჩამოყრა"),
+    ("material.duplicateAssign", "Duplicate and Assign Material", "მასალის დუბლირება და მინიჭება"),
+    ("layer.autoTrace", "Auto-trace...", "ავტომატური ვექტორიზაცია..."),
+    ("layer.precompose", "Pre-compose...", "კომპოზიციაში მოთავსება..."),
+    ("layer.sceneEditDetection", "Scene Edit Detection...", "სცენების ჭრილების ამოცნობა..."),
+    ("", "Effect", "ეფექტი"),
+    ("window.panel", "Effect Controls", "ეფექტის მართვა"),
+    ("effect.applyLast", "Last Effect", "ბოლო ეფექტი"),
+    ("effect.removeAll", "Remove All", "ყველას წაშლა"),
+    ("effect.manage", "Manage Effects...", "ეფექტების მართვა..."),
+    ("effect.plugins.load", "Load Effect Plug-in...", "ეფექტის პლაგინის ჩატვირთვა..."),
+    ("", "Animation", "ანიმაცია"),
+    ("anim.savePreset", "Save Animation Preset...", "ანიმაციის პრესეტის შენახვა..."),
+    ("anim.applyPreset", "Apply Animation Preset...", "ანიმაციის პრესეტის გამოყენება..."),
+    ("", "Recent Animation Presets", "ბოლო ანიმაციის პრესეტები"),
+    ("anim.clearRecentPresets", "Clear Recent Presets", "ბოლო პრესეტების სიის გასუფთავება"),
+    ("anim.browsePresets", "Browse Presets...", "პრესეტების დათვალიერება..."),
+    ("", "Text Animation Presets", "ტექსტის ანიმაციის პრესეტები"),
+    ("layer.applyTextPreset", "Typewriter", "საბეჭდი მანქანა"),
+    ("layer.applyTextPreset", "Fade Up Characters", "ასოების ამოსვლა გამოჩენით"),
+    ("layer.applyTextPreset", "Bounce In Words", "სიტყვების ხტუნვით შემოსვლა"),
+    ("layer.applyTextPreset", "Tracking In", "ასოების შეკუმშვით შემოსვლა"),
+    ("layer.applyTextPreset", "Scramble", "არევა"),
+    ("layer.applyTextPreset", "Blur In", "გამოჩენა გაბუნდოვნებიდან"),
+    ("layer.applyTextPreset", "Jitter", "კანკალი"),
+    ("layer.applyTextPreset", "Drop In Lines", "სტრიქონების ჩამოვარდნა"),
+    ("anim.addKeyframe", "Add Keyframe", "საკვანძო კადრის დამატება"),
+    ("keys.toggleHold", "Toggle Hold Keyframe", "ფიქსირებული საკვანძო კადრის გადართვა"),
+    ("keys.interpolation", "Keyframe Interpolation...", "საკვანძო კადრის ინტერპოლაცია..."),
+    ("keys.velocity", "Keyframe Velocity...", "საკვანძო კადრის სიჩქარე..."),
+    ("", "Keyframe Assistant", "საკვანძო კადრების ასისტენტი"),
+    ("keys.audioToKeyframes", "Convert Audio to Keyframes", "აუდიოს საკვანძო კადრებად გარდაქმნა"),
+    ("prop.convertExpressionToKeyframes", "Convert Expression to Keyframes", "ექსპრესიის საკვანძო კადრებად გარდაქმნა"),
+    ("keys.easyEase", "Easy Ease", "რბილი შენელება"),
+    ("keys.easyEaseIn", "Easy Ease In", "რბილი შენელება შესვლისას"),
+    ("keys.easyEaseOut", "Easy Ease Out", "რბილი შენელება გამოსვლისას"),
+    ("keys.exponentialScale", "Exponential Scale", "ექსპონენციალური მასშტაბი"),
+    ("keys.rpfCameraImport", "RPF Camera Import", "RPF კამერის იმპორტი"),
+    ("layer.sequence", "Sequence Layers...", "შრეების თანმიმდევრობით განლაგება..."),
+    ("keys.timeReverse", "Time-Reverse Keyframes", "საკვანძო კადრების დროში შებრუნება"),
+    ("", "Animate Text", "ტექსტის ანიმირება"),
+    ("layer.enablePerChar3D", "Enable Per-character 3D", "თითოეული ასოს 3D-ს ჩართვა"),
+    ("layer.addTextAnimator", "Anchor Point", "საყრდენი წერტილი"),
+    ("layer.addTextAnimator", "Position", "პოზიცია"),
+    ("layer.addTextAnimator", "Scale", "მასშტაბი"),
+    ("layer.addTextAnimator", "Skew", "დახრა"),
+    ("layer.addTextAnimator", "Rotation", "შემობრუნება"),
+    ("layer.addTextAnimator", "Opacity", "გაუმჭვირვალობა"),
+    ("layer.addTextAnimator", "All Transform Properties", "გარდაქმნის ყველა თვისება"),
+    ("", "Fill Color", "შევსების ფერი"),
+    ("layer.addTextAnimator", "RGB", "RGB"),
+    ("layer.addTextAnimator", "Hue", "ფერის ტონი"),
+    ("layer.addTextAnimator", "Saturation", "გაჯერება"),
+    ("layer.addTextAnimator", "Brightness", "სიკაშკაშე"),
+    ("", "Stroke Color", "კონტურის ფერი"),
+    ("layer.addTextAnimator", "Stroke Width", "კონტურის სისქე"),
+    ("", "Front", "წინა მხარე"),
+    ("", "Bevel", "წაკვეთა"),
+    ("", "Side", "გვერდითი მხარე"),
+    ("", "Back", "უკანა მხარე"),
+    ("layer.addTextAnimator", "Color", "ფერი"),
+    ("layer.addTextAnimator", "Tracking", "ასოთაშორისი ინტერვალი"),
+    ("layer.addTextAnimator", "Line Anchor", "სტრიქონის საყრდენი"),
+    ("layer.addTextAnimator", "Line Spacing", "სტრიქონთა დაშორება"),
+    ("layer.addTextAnimator", "Character Offset", "ასოს წანაცვლება"),
+    ("layer.addTextAnimator", "Character Value", "ასოს მნიშვნელობა"),
+    ("layer.addTextAnimator", "Blur", "გაბუნდოვნება"),
+    ("text.animatorFontAxes", "Variable Font Axes", "ცვლადი შრიფტის ღერძები"),
+    ("", "Add Text Selector", "ტექსტის სელექტორის დამატება"),
+    ("text.addSelector", "Range", "დიაპაზონი"),
+    ("text.addSelector", "Wiggly", "რხევითი"),
+    ("text.addSelector", "Expression", "ექსპრესია"),
+    ("text.removeAllAnimators", "Remove All Text Animators", "ტექსტის ყველა ანიმატორის წაშლა"),
+    ("prop.setExpression", "Add Expression", "ექსპრესიის დამატება"),
+    ("essential.addProperty", "Add Property to Essential Graphics", "თვისების დამატება ძირითად გრაფიკაში"),
+    ("prop.separateDimensions", "Separate Dimensions", "განზომილებების გაყოფა"),
+    ("track.camera", "Track Camera", "კამერის ტრეკინგი"),
+    ("track.warpStabilizer", "Warp Stabilizer VFX", "Warp Stabilizer VFX"),
+    ("track.motion", "Track Motion", "მოძრაობის ტრეკინგი"),
+    ("track.stabilize", "Stabilize Motion", "მოძრაობის სტაბილიზაცია"),
+    ("track.property", "Track this Property", "ამ თვისების ტრეკინგი"),
+    ("anim.reveal", "Reveal Properties with Keyframes", "საკვანძო კადრების მქონე თვისებების ჩვენება"),
+    ("anim.reveal", "Reveal Properties with Animation", "ანიმაციის მქონე თვისებების ჩვენება"),
+    ("anim.reveal", "Reveal All Modified Properties", "ყველა შეცვლილი თვისების ჩვენება"),
+    ("", "View", "ხედი"),
+    ("view.newViewer", "New Viewer", "ახალი დამთვალიერებელი"),
+    ("view.splitLockedViewer", "Split with New Locked Viewer", "დაყოფა ახალი ჩაკეტილი დამთვალიერებელით"),
+    ("view.zoomIn", "Zoom In", "გადიდება"),
+    ("view.zoomOut", "Zoom Out", "დაპატარავება"),
+    ("", "Resolution", "გარჩევადობა"),
+    ("view.res.full", "Full", "სრული"),
+    ("view.res.half", "Half", "ნახევარი"),
+    ("view.res.third", "Third", "მესამედი"),
+    ("view.res.quarter", "Quarter", "მეოთხედი"),
+    ("view.res.custom", "Custom...", "მორგებული..."),
+    ("view.displayColorManagement", "Use Display Color Management", "ეკრანის ფერთა მართვის გამოყენება"),
+    ("", "Simulate Output", "გამოტანის იმიტაცია"),
+    ("view.simulateOutput", "No Output Simulation", "გამოტანის იმიტაციის გარეშე"),
+    ("view.simulateOutput", "HDTV (Rec. 709)", "HDTV (Rec. 709)"),
+    ("view.simulateOutput", "SDTV NTSC", "SDTV NTSC"),
+    ("view.simulateOutput", "SDTV PAL", "SDTV PAL"),
+    ("view.simulateOutput", "Legacy Macintosh RGB (Gamma 1.8)", "ძველი Macintosh RGB (გამა 1.8)"),
+    ("view.simulateOutput", "Internet Standard RGB (sRGB)", "ინტერნეტის სტანდარტული RGB (sRGB)"),
+    ("view.simulateOutput", "UHDTV (Rec. 2020)", "UHDTV (Rec. 2020)"),
+    ("view.simulateOutput", "Display P3", "Display P3"),
+    ("view.simulateOutput", "Linear (1.0 Gamma)", "წრფივი (გამა 1.0)"),
+    ("view.customRgb", "My Custom RGB...", "ჩემი მორგებული RGB..."),
+    ("view.simulateOutput", "Custom...", "მორგებული..."),
+    ("view.rulers", "Show Rulers", "სახაზავების ჩვენება"),
+    ("", "Panel Background Color", "პანელის ფონის ფერი"),
+    ("view.panelBackground", "Black", "შავი"),
+    ("view.panelBackground", "Dark Gray", "მუქი ნაცრისფერი"),
+    ("view.panelBackground", "Medium Gray (Default)", "საშუალო ნაცრისფერი (ნაგულისხმევი)"),
+    ("view.panelBackground", "Light Gray", "ღია ნაცრისფერი"),
+    ("view.panelBackground", "White", "თეთრი"),
+    ("view.panelBackground", "Custom", "მორგებული"),
+    ("view.panelBackground", "Select Custom Background Color...", "მორგებული ფონის ფერის არჩევა..."),
+    ("view.guides", "Show Guides", "დამხმარე ხაზების ჩვენება"),
+    ("view.snapToGuides", "Snap to Guides", "დამხმარე ხაზებზე მიბმა"),
+    ("view.lockGuides", "Lock Guides", "დამხმარე ხაზების ჩაკეტვა"),
+    ("view.addGuide", "Add Guide...", "დამხმარე ხაზის დამატება..."),
+    ("view.addPercentGuide", "Add Percentage Guide...", "პროცენტული დამხმარე ხაზის დამატება..."),
+    ("view.convertGuides", "Convert Guides to Percentage", "დამხმარე ხაზების პროცენტულად გარდაქმნა"),
+    ("view.convertGuides", "Convert Guides to Pixels", "დამხმარე ხაზების პიქსელებად გარდაქმნა"),
+    ("view.clearGuides", "Clear Guides", "დამხმარე ხაზების გასუფთავება"),
+    ("view.importGuides", "Import Guides...", "დამხმარე ხაზების იმპორტი..."),
+    ("view.exportGuides", "Export Guides...", "დამხმარე ხაზების ექსპორტი..."),
+    ("view.grid", "Show Grid", "ბადის ჩვენება"),
+    ("view.snapToGrid", "Snap to Grid", "ბადეზე მიბმა"),
+    ("view.snapping", "Snapping", "მიბმა"),
+    ("view.options", "View Options...", "ხედის პარამეტრები..."),
+    ("view.layerControls", "Show Layer Controls", "შრის მართვის ელემენტების ჩვენება"),
+    ("", "Switch View Layout", "ხედების განლაგების გადართვა"),
+    ("view.layout", "1 View", "1 ხედი"),
+    ("view.layout", "2 Views", "2 ხედი"),
+    ("view.layout", "4 Views", "4 ხედი"),
+    ("view.shareViewOptions", "Share View Options", "ხედის პარამეტრების გაზიარება"),
+    ("", "Switch 3D View", "3D ხედის გადართვა"),
+    ("view.3d.activeCamera", "Active Camera", "აქტიური კამერა"),
+    ("view.3d.default", "Default", "ნაგულისხმევი"),
+    ("view.3d.front", "Front", "წინიდან"),
+    ("view.3d.left", "Left", "მარცხნიდან"),
+    ("view.3d.top", "Top", "ზემოდან"),
+    ("view.3d.back", "Back", "უკნიდან"),
+    ("view.3d.right", "Right", "მარჯვნიდან"),
+    ("view.3d.bottom", "Bottom", "ქვემოდან"),
+    ("view.3d.custom1", "Custom View 1", "მორგებული ხედი 1"),
+    ("view.3d.custom2", "Custom View 2", "მორგებული ხედი 2"),
+    ("view.3d.custom3", "Custom View 3", "მორგებული ხედი 3"),
+    ("", "Assign Shortcut to 3D View", "მალსახმობის მინიჭება 3D ხედისთვის"),
+    ("view.3d.last", "Switch to Last 3D View", "ბოლო 3D ხედზე გადართვა"),
+    ("view.lookAtSelected", "Look at Selected Layers", "მონიშნული შრეების დათვალიერება"),
+    ("view.lookAtAll", "Look at All Layers", "ყველა შრის დათვალიერება"),
+    ("time.set", "Go to Time...", "დროზე გადასვლა..."),
+    ("view.fullScreen", "Enter Full Screen", "სრულეკრანიან რეჟიმში გადასვლა"),
+    ("", "Window", "ფანჯარა"),
+    ("", "Workspace", "სამუშაო სივრცე"),
+    ("window.workspace", "Default", "ნაგულისხმევი"),
+    ("window.workspace", "Review", "განხილვა"),
+    ("window.workspace", "Learn", "სწავლა"),
+    ("window.workspace", "Small Screen", "პატარა ეკრანი"),
+    ("window.workspace", "Standard", "სტანდარტული"),
+    ("window.workspace", "All Panels", "ყველა პანელი"),
+    ("window.workspace", "Animation", "ანიმაცია"),
+    ("window.workspace", "Color", "ფერი"),
+    ("window.workspace", "Effects", "ეფექტები"),
+    ("window.workspace", "Essential Graphics", "ძირითადი გრაფიკა"),
+    ("window.workspace", "Minimal", "მინიმალური"),
+    ("window.workspace", "Motion Tracking", "მოძრაობის ტრეკინგი"),
+    ("window.workspace", "Paint", "ხატვა"),
+    ("window.workspace", "Text", "ტექსტი"),
+    ("window.workspace", "Undocked Panels", "მოხსნილი პანელები"),
+    ("window.resetWorkspace", "Reset to Saved Layout", "შენახულ განლაგებაზე დაბრუნება"),
+    ("window.saveWorkspace", "Save Changes to this Workspace", "ამ სამუშაო სივრცეში ცვლილებების შენახვა"),
+    ("window.saveWorkspaceAs", "Save as New Workspace...", "ახალ სამუშაო სივრცედ შენახვა..."),
+    ("window.editWorkspaces", "Edit Workspaces...", "სამუშაო სივრცეების რედაქტირება..."),
+    ("", "Assign Shortcut to Workspace", "მალსახმობის მინიჭება სამუშაო სივრცისთვის"),
+    ("window.panel", "Align", "სწორება"),
+    ("window.panel", "Audio", "აუდიო"),
+    ("window.panel", "Brushes", "ფუნჯები"),
+    ("window.panel", "Character", "სიმბოლო"),
+    ("window.panel", "Content-Aware Fill", "შიგთავსის გათვალისწინებით შევსება"),
+    ("window.panel", "Effects & Presets", "ეფექტები და პრესეტები"),
+    ("window.panel", "Essential Graphics", "ძირითადი გრაფიკა"),
+    ("window.panel", "Info", "ინფორმაცია"),
+    ("help.inAppTutorials", "Learn", "სწავლა"),
+    ("window.panel", "Lumetri Scopes", "Lumetri Scopes"),
+    ("window.panel", "Mask Interpolation", "ნიღბის ინტერპოლაცია"),
+    ("window.panel", "Media Browser", "მედიის ბრაუზერი"),
+    ("window.panel", "Metadata", "მეტამონაცემები"),
+    ("window.panel", "Motion Sketch", "მოძრაობის ესკიზი"),
+    ("window.panel", "Paint", "ხატვა"),
+    ("window.panel", "Paragraph", "აბზაცი"),
+    ("window.panel", "Preview", "წინასწარი ნახვა"),
+    ("window.panel", "Progress", "პროგრესი"),
+    ("window.panel", "Properties", "თვისებები"),
+    ("window.panel", "Script Console", "სკრიპტის კონსოლი"),
+    ("window.panel", "Smoother", "დამგლუვებელი"),
+    ("window.panel", "Tools", "ხელსაწყოები"),
+    ("window.panel", "Tracker", "ტრეკერი"),
+    ("window.panel", "Wiggler", "რხევის გენერატორი"),
+    ("window.panel", "Composition", "კომპოზიცია"),
+    ("window.panel", "Flowchart", "ბლოკ-სქემა"),
+    ("window.panel", "Footage", "ვიდეომასალა"),
+    ("window.panel", "Layer", "შრე"),
+    ("window.panel", "Project", "პროექტი"),
+    ("window.panel", "Render Queue", "რენდერის რიგი"),
+    ("window.panel", "Timeline", "დროის ხაზი"),
+    ("window.panel", "Create Nulls From Paths", "ნულოვანი ობიექტების შექმნა ტრაექტორიებიდან"),
+    ("window.panel", "VR Comp Editor", "VR კომპოზიციის რედაქტორი"),
+    ("", "Help", "დახმარება"),
+    ("help.docs", "EffectCraft Help...", "EffectCraft-ის დახმარება..."),
+    ("help.docs", "Scripting Help...", "სკრიპტების დახმარება..."),
+    ("help.docs", "Expression Reference...", "ექსპრესიების ცნობარი..."),
+    ("help.docs", "Effect Reference...", "ეფექტების ცნობარი..."),
+    ("anim.browsePresets", "Animation Presets...", "ანიმაციის პრესეტები..."),
+    ("app.keyboardShortcuts", "Keyboard Shortcuts...", "კლავიატურის მალსახმობები..."),
+    ("help.inAppTutorials", "In-App Tutorials...", "აპის შიგნით გაკვეთილები..."),
+    ("help.onlineTutorials", "Online Tutorials...", "ონლაინ გაკვეთილები..."),
+    ("help.systemReport", "System Compatibility Report...", "სისტემის თავსებადობის ანგარიში..."),
+    ("help.enableLogging", "Enable Logging", "ჟურნალის ჩართვა"),
+    ("help.revealLogFile", "Reveal Logging File", "ჟურნალის ფაილის ჩვენება"),
+    ("help.discord", "Join the ArtCraft Discord...", "შემოუერთდით ArtCraft-ის Discord-ს..."),
+    ("help.reportIssue", "Provide Feedback...", "გამოხმაურების გაგზავნა..."),
+    ("help.website", "ArtCraft Website", "ArtCraft-ის ვებსაიტი"),
+    ("help.appPage", "EffectCraft Home Page", "EffectCraft-ის საწყისი გვერდი"),
+    ("help.github", "EffectCraft on GitHub", "EffectCraft GitHub-ზე"),
+    ("file.openDemoProject", "Open Demo Project", "სადემონსტრაციო პროექტის გახსნა"),
+];
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -6624,138 +7388,53 @@ mod tests {
     use serde_json::json;
     use std::collections::BTreeSet;
 
+    /// Labels drawn outside the menu bar take the menu bar's row for their command (with `…` for
+    /// `...`), else the panel catalog's row, else stay as they are.
     #[test]
-    fn czech_translates_menus_without_changing_bindings_or_user_names() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
-        app.session.prefs.push_recent("File.ecproj");
-        let en = crate::native_menu::build(&app);
-        let state = crate::native_menu::state_key(&app);
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
-        let cs = crate::native_menu::build(&app);
-        assert_eq!(language(&app), "cs");
-        assert!(czech(&app));
-        assert_eq!(code("cs"), "cs");
-        assert_ne!(state, crate::native_menu::state_key(&app));
-        let bindings = |menu: &crate::native_menu::NativeMenu| {
-            menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::<Vec<_>>()
-        };
-        assert_eq!(bindings(&en), bindings(&cs));
-        assert!(cs.items().iter().any(|i| i.command == "comp.new" && i.label == "Nová kompozice..."));
-        assert!(cs.items().iter().any(|i| i.command == "layer.newText" && i.label == "Text"));
-        assert!(cs.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "Snadné zpomalení"));
-        assert!(cs.items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
-        for (source, translated) in [
-            ("File", "Soubor"),
-            ("Edit", "Úpravy"),
-            ("Composition", "Kompozice"),
-            ("Layer", "Vrstva"),
-            ("Effect", "Efekt"),
-            ("Animation", "Animace"),
-            ("View", "Zobrazení"),
-            ("Window", "Okno"),
-            ("Help", "Nápověda"),
-        ] {
-            assert_eq!(label(&app, "", source), translated);
-        }
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        let panel =
-            MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel": "layer"}), shortcut: None, alt_shortcuts: vec![] };
-        assert_eq!(entry(&app, &panel, "Layer: File Čeština".into()), "Vrstva: File Čeština");
-        assert_eq!(
-            submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “File Čeština” Workspace".into()),
-            "Přiřadit zkratku pracovnímu prostoru „File Čeština“"
-        );
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Přiřadit zkratku 3D zobrazení „Top“");
-        assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to Workspace".into()), "Přiřadit zkratku pracovnímu prostoru");
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
-        assert_eq!(crate::native_menu::build(&app), en);
+    fn command_label_reads_the_menu_row_then_the_panel_row() {
+        set_current("zh-hans");
+        assert_eq!(command_label("window.panel", "Project"), lookup(SIMPLIFIED_CHINESE, "window.panel", "Project"));
+        let (command, en, translated) = SIMPLIFIED_CHINESE.iter().find(|(c, en, _)| !c.is_empty() && en.ends_with("...")).expect("a menu row ending in ...");
+        assert_eq!(command_label(command, &format!("{}…", en.trim_end_matches("..."))), *translated);
+        assert_eq!(command_label("no.such.command", "Cancel"), tr("Cancel"));
+        assert_eq!(command_label("window.panel", "Comp 1"), "Comp 1");
+        set_current("en");
+        assert_eq!(command_label("window.panel", "Project"), "Project");
     }
 
     #[test]
-    fn czech_undo_redo_keeps_history_labels_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
-        let undo = MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
-        let redo = MenuEntry { label: "Redo".into(), command: "edit.redo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
-        assert_eq!(entry(&app, &undo, "Can't Undo".into()), "Není co vrátit");
-        assert_eq!(entry(&app, &redo, "Can't Redo".into()), "Není co zopakovat");
-        app.session.history.undo.push(("File Čeština".into(), app.session.project.clone()));
-        app.session.history.redo.push(("Text Čeština".into(), app.session.project.clone()));
-        assert_eq!(entry(&app, &undo, "Undo File Čeština".into()), "Zpět File Čeština");
-        assert_eq!(entry(&app, &redo, "Redo Text Čeština".into()), "Znovu Text Čeština");
+    fn settings_page_titles_read_the_menu_row() {
+        set_current("zh-hans");
+        let menu_row = lookup(SIMPLIFIED_CHINESE, "app.settings", "Type...");
+        assert_eq!(settings_page_title("Type"), menu_row.trim_end_matches("..."));
+        assert_ne!(settings_page_title("Type"), tr("Type"), "the page is about text, the panel row is the kind");
+        assert_eq!(settings_page_title("Roto Brush"), tr("Roto Brush"));
+        set_current("en");
+        assert_eq!(settings_page_title("Type"), "Type");
     }
 
     #[test]
-    fn german_reveal_labels_follow_the_platform_file_manager() {
-        // As `czech_…` and `ukrainian_…` do. Asserted through `label`, not `entry`: `entry`
-        // returns the English for German, Russian and French, which have catalogues but are
-        // not wired into the menus (see the undo/redo match in `entry` and `supported`).
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "de"})).unwrap();
-        for command in ["file.revealInFinder", "layer.revealInFinder"] {
-            for (source, translated) in [
-                ("Reveal in Finder", "Im Finder anzeigen"),
-                ("Reveal in Explorer", "Im Explorer anzeigen"),
-                ("Reveal in File Manager", "Im Dateimanager anzeigen"),
-            ] {
-                assert_eq!(label(&app, command, source), translated, "{command} / {source}");
-                // Another command keeps a label that merely looks like one of these.
-                assert_eq!(label(&app, "file.openRecent", source), source);
-            }
-            assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4", "a user's filename is never looked up");
-        }
+    fn match_system_takes_the_first_browser_language_with_a_catalog() {
+        let tags = |t: &[&str]| t.iter().map(|s| s.to_string()).collect::<Vec<_>>();
+        let any = |_: &str| true;
+        assert_eq!(super::first_supported(None, &tags(&["cs-CZ", "cs", "en"]), any), "cs");
+        assert_eq!(super::first_supported(None, &tags(&["nl-NL", "cs"]), any), "cs");
+        assert_eq!(super::first_supported(None, &tags(&["en-US", "cs"]), any), "en");
+        assert_eq!(super::first_supported(None, &tags(&["nl-NL"]), any), "en");
+        assert_eq!(super::first_supported(None, &tags(&[]), any), "en");
+        assert_eq!(super::first_supported(Some("uk"), &tags(&["cs"]), any), "uk");
+        assert_eq!(super::first_supported(Some("nl"), &tags(&["cs"]), any), "cs");
     }
 
+    /// The web build installs no CJK or Georgian font: Match System passes over those browser
+    /// languages, while `?lang=` still selects them.
     #[test]
-    fn german_menu_labels_name_what_their_command_does() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "de"})).unwrap();
-        // "Ebenenreihenfolge umkehren" reads as reversing the stacking order, not time, and
-        // "Formate" are formats, not layer styles (#1443).
-        assert_eq!(label(&app, "layer.timeReverse", "Time-Reverse Layer"), "Ebene zeitlich umkehren");
-        assert_eq!(label(&app, "keys.timeReverse", "Time-Reverse Keyframes"), "Keyframes zeitlich umkehren");
-        assert_eq!(label(&app, "layer.style.convertToEditable", "Convert to Editable Styles"), "In bearbeitbare Stile umwandeln");
-    }
-
-    #[test]
-    fn german_uses_one_word_per_term() {
-        let german: Vec<&str> = GERMAN.iter().map(|(_, _, de)| *de).collect();
-        let with = |needle: &str| german.iter().filter(|de| de.contains(needle)).copied().collect::<Vec<_>>();
-        // "Expression" is "Ausdruck", not the English word.
-        assert!(with("Expression").is_empty(), "{:?}", with("Expression"));
-        // "Track" as a verb is "verfolgen", not "tracken".
-        assert!(with("tracken").is_empty(), "{:?}", with("tracken"));
-        // "Reveal <somewhere>" is "anzeigen". ("einblenden" stays right for "Show All",
-        // "Fade from Blur" and the like, so only the Reveal entries are checked.)
-        let reveal: Vec<&str> =
-            GERMAN.iter().filter(|(_, en, _)| en.starts_with("Reveal")).map(|(_, _, de)| *de).filter(|de| !de.to_lowercase().contains("anzeigen")).collect();
-        assert!(reveal.is_empty(), "{reveal:?}");
-        // One spelling of "to the front".
-        let vorn: Vec<&str> = german.iter().filter(|de| de.ends_with("nach vorn")).copied().collect();
-        assert!(vorn.is_empty(), "{vorn:?}");
-        // The terms those entries joined are still the majority ones.
-        assert!(with("verfolgen").len() >= 4, "{:?}", with("verfolgen"));
-        assert!(with("anzeigen").len() >= 12, "{}", with("anzeigen").len());
-    }
-
-    #[test]
-    fn czech_reveal_labels_follow_the_platform_file_manager() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "cs"})).unwrap();
-        for command in ["file.revealInFinder", "layer.revealInFinder"] {
-            for (source, translated) in [
-                ("Reveal in Finder", "Zobrazit ve Finderu"),
-                ("Reveal in Explorer", "Zobrazit v Průzkumníku"),
-                ("Reveal in File Manager", "Zobrazit ve správci souborů"),
-            ] {
-                let e = MenuEntry { label: source.into(), command: command.into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
-                assert_eq!(label(&app, command, source), translated);
-                assert_eq!(entry(&app, &e, source.into()), translated);
-                assert_eq!(label(&app, "file.openRecent", source), source);
-            }
-            assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4");
-        }
+    fn web_match_system_skips_languages_without_a_font() {
+        let tags = |t: &[&str]| t.iter().map(|s| s.to_string()).collect::<Vec<_>>();
+        assert_eq!(super::first_supported(None, &tags(&["ja-JP", "zh-CN", "zh-TW", "ka-GE", "cs"]), super::web_draws), "cs");
+        assert_eq!(super::first_supported(None, &tags(&["ka"]), super::web_draws), "en");
+        assert_eq!(super::first_supported(Some("ka"), &tags(&["cs"]), super::web_draws), "ka");
+        assert_eq!(super::first_supported(Some("ja"), &tags(&[]), super::web_draws), "ja");
     }
 
     fn keys(nodes: &[MenuNode], out: &mut BTreeSet<(String, String)>) {
@@ -6773,88 +7452,69 @@ mod tests {
         }
     }
 
+    /// The fixed menu entries `code` has no row for. `@effects` is the generated plug-in catalog,
+    /// whose effect names come from the effect catalog instead.
+    fn missing_menu_entries(code: &str) -> Vec<String> {
+        let catalog = menu_catalog(code).unwrap_or_default();
+        // A label the tree repeats (one command in two menus) counts once.
+        let mut missing = Vec::new();
+        let mut seen = BTreeSet::new();
+        for line in TREE.lines() {
+            let line = line.trim().trim_start_matches("[mac] ").trim_start_matches("[!mac] ");
+            if line.is_empty() || line == "---" || line.starts_with('@') {
+                continue;
+            }
+            let mut parts = line.split(" | ");
+            let Some(en) = parts.next() else { continue };
+            let command = parts.next().and_then(|p| p.split_whitespace().next()).unwrap_or("");
+            if !catalog.iter().any(|(id, source, _)| *id == command && *source == en) && seen.insert((command, en)) {
+                missing.push(en.to_string());
+            }
+        }
+        missing
+    }
+
+    /// Lists, per language, the interface strings with no translation, which show in English. It
+    /// always passes: a missing translation never blocks a change. `cargo xtask ci` runs it.
     #[test]
-    fn every_translation_key_exists_in_the_actual_menu_tree() {
+    fn missing_translations_report() {
+        const SHOWN: usize = 12;
+        println!("Missing translations (shown in English):");
+        let mut total = 0;
+        for code in CATALOG_CODES {
+            let catalogs = [("menus", missing_menu_entries(code)), ("panels", ui::missing(code)), ("effects", effects::missing(code))];
+            let count: usize = catalogs.iter().map(|(_, missing)| missing.len()).sum();
+            total += count;
+            println!("{code}: {count}");
+            for (catalog, missing) in &catalogs {
+                if missing.is_empty() {
+                    continue;
+                }
+                let shown: Vec<&String> = missing.iter().take(SHOWN).collect();
+                let more = missing.len().saturating_sub(SHOWN);
+                let more = if more > 0 { format!(" … and {more} more") } else { String::new() };
+                println!("  {catalog} ({}): {shown:?}{more}", missing.len());
+            }
+        }
+        println!("total: {total}");
+    }
+
+    #[test]
+    fn menu_catalogs_have_no_stale_or_duplicate_rows() {
         let mut actual = BTreeSet::new();
         for mac in [false, true] {
             keys(&parse(TREE, mac).unwrap(), &mut actual);
         }
-        let mut japanese_keys = BTreeSet::new();
-        let mut chinese_keys = BTreeSet::new();
-        let mut traditional_keys = BTreeSet::new();
-        let mut ukrainian_keys = BTreeSet::new();
-        let mut spanish_keys = BTreeSet::new();
-        let mut portuguese_keys = BTreeSet::new();
-        let mut russian_keys = BTreeSet::new();
-        let mut french_keys = BTreeSet::new();
-        let mut german_keys = BTreeSet::new();
-        let mut czech_keys = BTreeSet::new();
-        for (catalog, unique) in [
-            (JAPANESE, &mut japanese_keys),
-            (SIMPLIFIED_CHINESE, &mut chinese_keys),
-            (TRADITIONAL_CHINESE, &mut traditional_keys),
-            (UKRAINIAN, &mut ukrainian_keys),
-            (SPANISH, &mut spanish_keys),
-            (PORTUGUESE, &mut portuguese_keys),
-            (RUSSIAN, &mut russian_keys),
-            (FRENCH, &mut french_keys),
-            (GERMAN, &mut german_keys),
-            (CZECH, &mut czech_keys),
-        ] {
+        for code in CATALOG_CODES {
+            let catalog = menu_catalog(code).unwrap();
+            let mut unique = BTreeSet::new();
             for (command, en, translated) in catalog {
                 let key = (command.to_string(), en.to_string());
-                assert!(actual.contains(&key), "stale translation: {key:?}");
-                assert!(unique.insert(key), "duplicate translation: {command} / {en}");
-                assert!(!translated.is_empty());
-            }
-            // All fixed TREE entries are covered; @effects is a generated plug-in catalog,
-            // whose product/effect names are intentionally left as registered.
-            for line in TREE.lines() {
-                let line = line.trim().trim_start_matches("[mac] ").trim_start_matches("[!mac] ");
-                if line.is_empty() || line == "---" || line.starts_with('@') {
-                    continue;
-                }
-                let mut parts = line.split(" | ");
-                let en = parts.next().unwrap();
-                let command = parts.next().and_then(|p| p.split_whitespace().next()).unwrap_or("");
-                assert!(unique.contains(&(command.into(), en.into())), "untranslated fixed entry: {line}");
+                assert!(actual.contains(&key), "{code}: stale translation: {key:?}");
+                assert!(unique.insert(key), "{code}: duplicate translation: {command} / {en}");
+                assert!(!translated.is_empty(), "{code}: empty translation: {command} / {en}");
             }
         }
-        // Every translated language covers exactly the same entries.
-        assert_eq!(japanese_keys, chinese_keys, "the languages must translate the same entries");
-        assert_eq!(chinese_keys, traditional_keys, "the languages must translate the same entries");
-        assert_eq!(traditional_keys, spanish_keys, "the languages must translate the same entries");
-        assert_eq!(spanish_keys, portuguese_keys, "the languages must translate the same entries");
-        assert_eq!(japanese_keys, ukrainian_keys, "the languages must translate the same entries");
-        assert_eq!(ukrainian_keys, russian_keys, "the languages must translate the same entries");
-        assert_eq!(russian_keys, french_keys, "the languages must translate the same entries");
-        assert_eq!(french_keys, german_keys, "the languages must translate the same entries");
-        assert_eq!(japanese_keys, czech_keys, "the languages must translate the same entries");
-    }
-
-    /// Exercise each engine spelling on every host: a macOS-only run must still catch a
-    /// Windows/Linux catalog miss, while filenames and unrelated commands stay untouched.
-    #[test]
-    fn ukrainian_reveal_labels_follow_the_platform_file_manager() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "uk"})).unwrap();
-        for command in ["file.revealInFinder", "layer.revealInFinder"] {
-            for (source, translated) in [
-                ("Reveal in Finder", "Показати у Finder"),
-                ("Reveal in Explorer", "Показати у Провіднику"),
-                ("Reveal in File Manager", "Показати у файловому менеджері"),
-            ] {
-                let e =
-                    MenuEntry { label: source.into(), command: command.into(), params: json!({"item": "My file.mp4"}), shortcut: None, alt_shortcuts: vec![] };
-                assert_eq!(label(&app, command, source), translated);
-                assert_eq!(entry(&app, &e, source.into()), translated);
-                assert_eq!(label(&app, "file.openRecent", source), source);
-            }
-            assert_eq!(label(&app, command, "My file.mp4"), "My file.mp4");
-        }
-        app.session.execute("prefs.set", json!({"key": "general.language", "value": "en"})).unwrap();
-        assert_eq!(label(&app, "file.revealInFinder", "Reveal in Explorer"), "Reveal in Explorer");
-        assert_eq!(label(&app, "layer.revealInFinder", "Reveal in File Manager"), "Reveal in File Manager");
     }
 
     #[test]
@@ -6870,18 +7530,8 @@ mod tests {
             menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::<Vec<_>>()
         };
         assert_eq!(bindings(&en), bindings(&ja));
+        assert!(ja.items().iter().any(|i| i.command == "comp.new" && i.label == label(&app, "comp.new", "New Composition...")));
         assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
-                "Layer: File".into()
-            ),
-            "レイヤー: File"
-        );
-        assert!(ja.items().iter().any(|i| i.command == "comp.new" && i.label == "新規コンポジション..."));
-        assert!(ja.items().iter().any(|i| i.command == "layer.newText" && i.label == "テキスト"));
-        assert!(ja.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "イージーイーズ"));
         app.session.prefs.push_recent("/tmp/File.ecproj");
         assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
         app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
@@ -6916,6 +7566,9 @@ mod tests {
             (Some("cs-CZ"), "cs"),
             (Some("cs_CZ.UTF-8"), "cs"),
             (Some("CS_cz.UTF-8"), "cs"),
+            (Some("ka"), "ka"),
+            (Some("ka-GE"), "ka"),
+            (Some("ka_GE.UTF-8"), "ka"),
             (Some("en-US"), "en"),
             (Some("jv-ID"), "en"),
             (Some("de-DE"), "en"),
@@ -6949,9 +7602,15 @@ mod tests {
 
     #[test]
     fn every_translated_entry_keeps_the_english_shape() {
-        for (code, catalog) in
-            [("zh-hans", SIMPLIFIED_CHINESE), ("zh-hant", TRADITIONAL_CHINESE), ("uk", UKRAINIAN), ("es", SPANISH), ("pt-br", PORTUGUESE), ("cs", CZECH)]
-        {
+        for (code, catalog) in [
+            ("zh-hans", SIMPLIFIED_CHINESE),
+            ("zh-hant", TRADITIONAL_CHINESE),
+            ("uk", UKRAINIAN),
+            ("es", SPANISH),
+            ("pt-br", PORTUGUESE),
+            ("cs", CZECH),
+            ("ka", GEORGIAN),
+        ] {
             for (command, en, translated) in catalog {
                 assert_eq!(en.contains("..."), translated.contains("..."), "{code} {command} / {en}: {translated}");
                 let brackets = |s: &str| s.chars().filter(|c| *c == '(' || *c == ')').count();
@@ -6961,145 +7620,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn zh_hans_translates_labels_computed_titles_and_keeps_names_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"zh-hans"})).unwrap();
-        assert_eq!(language(&app), "zh-hans");
-        assert!(simplified(&app));
-        assert!(!traditional(&app));
-        assert!(!japanese(&app));
-        // Fixed menu rows come from the catalog.
-        assert_eq!(label(&app, "", "Composition"), "合成");
-        assert_eq!(label(&app, "", "Effect"), "效果");
-        assert_eq!(label(&app, "comp.new", "New Composition..."), "新建合成...");
-        assert_eq!(label(&app, "layer.newText", "Text"), "文本");
-        // Untranslated keys and dynamic labels stay verbatim.
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
-                "Undo Comp1".into()
-            ),
-            "无可撤销的操作"
-        );
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
-                "Layer: File".into()
-            ),
-            "图层: File"
-        );
-        // The submenu titles that name the current workspace / view.
-        assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()), "为工作区“Default”指定快捷键");
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "为 3D 视图“Top”指定快捷键");
-        // The menu tree carries the same commands and shortcuts with the Chinese labels.
-        let zh = crate::native_menu::build(&app);
-        assert!(zh.items().iter().any(|i| i.command == "comp.new" && i.label == "新建合成..."));
-        assert!(zh.items().iter().any(|i| i.command == "layer.newText" && i.label == "文本"));
-        assert!(zh.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "缓动"));
-        // A dynamic filename is never translated.
-        app.session.prefs.push_recent("/tmp/File.ecproj");
-        assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
-    }
-
-    #[test]
-    fn zh_hant_translates_labels_computed_titles_and_keeps_names_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"zh-hant"})).unwrap();
-        assert_eq!(language(&app), "zh-hant");
-        assert!(traditional(&app));
-        assert!(!simplified(&app));
-        assert!(!japanese(&app));
-        // Fixed menu rows come from the catalog.
-        assert_eq!(label(&app, "", "Composition"), "合成");
-        assert_eq!(label(&app, "", "Effect"), "效果");
-        assert_eq!(label(&app, "comp.new", "New Composition..."), "新增合成...");
-        assert_eq!(label(&app, "layer.newText", "Text"), "文字");
-        // Untranslated keys and dynamic labels stay verbatim.
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
-                "Undo Comp1".into()
-            ),
-            "沒有可復原的操作"
-        );
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
-                "Layer: File".into()
-            ),
-            "圖層: File"
-        );
-        // The submenu titles that name the current workspace / view.
-        assert_eq!(submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()), "為工作區“Default”指定快速鍵");
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "為 3D 檢視“Top”指定快速鍵");
-        // The menu tree carries the same commands and shortcuts with the Traditional labels.
-        let zh = crate::native_menu::build(&app);
-        assert!(zh.items().iter().any(|i| i.command == "comp.new" && i.label == "新增合成..."));
-        assert!(zh.items().iter().any(|i| i.command == "layer.newText" && i.label == "文字"));
-        assert!(zh.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "緩動"));
-        // A dynamic filename is never translated.
-        app.session.prefs.push_recent("/tmp/File.ecproj");
-        assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
-    }
-
-    #[test]
-    fn ukrainian_translates_menus_without_changing_bindings_or_user_names() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
-        app.session.prefs.push_recent("/tmp/File.ecproj");
-        let en = crate::native_menu::build(&app);
-        let state = crate::native_menu::state_key(&app);
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"uk"})).unwrap();
-        let uk = crate::native_menu::build(&app);
-        assert_eq!(language(&app), "uk");
-        assert!(ukrainian(&app));
-        assert_ne!(state, crate::native_menu::state_key(&app));
-        let bindings = |menu: &crate::native_menu::NativeMenu| {
-            menu.items().into_iter().map(|i| (i.id.clone(), i.command.clone(), i.params.clone(), i.shortcut.clone(), i.enabled, i.checked)).collect::<Vec<_>>()
-        };
-        assert_eq!(bindings(&en), bindings(&uk));
-        assert!(uk.items().iter().any(|i| i.command == "comp.new" && i.label == "Нова композиція..."));
-        assert!(uk.items().iter().any(|i| i.command == "layer.newText" && i.label == "Текст"));
-        assert!(uk.items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
-        assert_eq!(label(&app, "", "File"), "Файл");
-        assert_eq!(label(&app, "", "Light"), "Світло");
-        assert_eq!(label(&app, "view.panelBackground", "Black"), "Чорний");
-        assert_eq!(label(&app, "layer.addTextAnimator", "Tracking"), "Міжлітерний інтервал");
-        assert_eq!(label(&app, "edit.purgeUndo", "Undo"), "Історія скасувань");
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        let panel =
-            MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] };
-        assert_eq!(entry(&app, &panel, "Layer: File".into()), "Шар: File");
-        assert_eq!(
-            submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “File Україна” Workspace".into()),
-            "Призначити скорочення для робочого простору «File Україна»"
-        );
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Призначити скорочення для вигляду 3D «Top»");
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();
-        assert_eq!(crate::native_menu::build(&app), en);
-    }
-
-    #[test]
-    fn ukrainian_undo_redo_keeps_history_labels_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"uk"})).unwrap();
-        let undo = MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
-        let redo = MenuEntry { label: "Redo".into(), command: "edit.redo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] };
-        assert_eq!(entry(&app, &undo, "Can't Undo".into()), "Немає дій для скасування");
-        assert_eq!(entry(&app, &redo, "Can't Redo".into()), "Немає дій для повторення");
-        app.session.history.undo.push(("File Україна".into(), app.session.project.clone()));
-        app.session.history.redo.push(("Text Україна".into(), app.session.project.clone()));
-        assert_eq!(entry(&app, &undo, "Undo File Україна".into()), "Скасувати File Україна");
-        assert_eq!(entry(&app, &redo, "Redo Text Україна".into()), "Повторити Text Україна");
-    }
-
     #[test]
     fn ukrainian_catalog_matches_the_settings_registry() {
         let codes: Vec<_> = effectcraft_engine::prefs::LANGUAGES.iter().map(|(_, code)| *code).filter(|code| !matches!(*code, "system" | "en")).collect();
@@ -7109,92 +7629,6 @@ mod tests {
         assert_eq!(code("unknown"), "en");
     }
 
-    #[test]
-    fn es_translates_labels_computed_titles_and_keeps_names_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"es"})).unwrap();
-        assert_eq!(language(&app), "es");
-        assert!(spanish(&app));
-        assert!(!traditional(&app));
-        assert!(!simplified(&app));
-        assert!(!japanese(&app));
-        // Fixed menu rows come from the catalog.
-        assert_eq!(label(&app, "", "Composition"), "Composición");
-        assert_eq!(label(&app, "", "Effect"), "Efecto");
-        assert_eq!(label(&app, "comp.new", "New Composition..."), "Nueva composición...");
-        assert_eq!(label(&app, "layer.newText", "Text"), "Texto");
-        assert_eq!(label(&app, "layer.setBlendMode", "Color Burn"), "Subexposición de color");
-        // Untranslated keys and dynamic labels stay verbatim.
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
-                "Undo Comp1".into()
-            ),
-            "No se puede deshacer"
-        );
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
-                "Layer: File".into()
-            ),
-            "Capa: File"
-        );
-        // The submenu titles that name the current workspace / view.
-        assert_eq!(
-            submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()),
-            "Asignar método abreviado al espacio de trabajo “Default”"
-        );
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Asignar método abreviado a la vista 3D “Top”");
-        // The menu tree carries the same commands and shortcuts with the Spanish labels.
-        let es = crate::native_menu::build(&app);
-        assert!(es.items().iter().any(|i| i.command == "comp.new" && i.label == "Nueva composición..."));
-        assert!(es.items().iter().any(|i| i.command == "layer.newText" && i.label == "Texto"));
-        assert!(es.items().iter().any(|i| i.command == "keys.easyEase" && i.label == "Suavizado"));
-        // A dynamic filename is never translated.
-        app.session.prefs.push_recent("/tmp/File.ecproj");
-        assert!(crate::native_menu::build(&app).items().iter().any(|i| i.command == "file.openRecent" && i.label == "File.ecproj"));
-    }
-
-    #[test]
-    fn pt_br_translates_labels_computed_titles_and_keeps_names_verbatim() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("prefs.set", json!({"key":"general.language", "value":"pt-br"})).unwrap();
-        assert_eq!(language(&app), "pt-br");
-        assert!(!japanese(&app));
-        // Fixed menu rows come from the catalog.
-        assert_eq!(label(&app, "", "Composition"), "Composição");
-        assert_eq!(label(&app, "", "Effect"), "Efeito");
-        assert_eq!(label(&app, "comp.new", "New Composition..."), "Nova composição...");
-        assert_eq!(label(&app, "layer.newText", "Text"), "Texto");
-        // Untranslated keys and dynamic labels stay verbatim.
-        assert_eq!(label(&app, "unknown.command", "Text"), "Text");
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Undo".into(), command: "edit.undo".into(), params: json!({}), shortcut: None, alt_shortcuts: vec![] },
-                "Undo Comp1".into()
-            ),
-            "Não há nada para desfazer"
-        );
-        assert_eq!(
-            entry(
-                &app,
-                &MenuEntry { label: "Layer".into(), command: "window.panel".into(), params: json!({"panel":"layer"}), shortcut: None, alt_shortcuts: vec![] },
-                "Layer: File".into()
-            ),
-            "Camada: File"
-        );
-        // The submenu titles that name the current workspace / view.
-        assert_eq!(
-            submenu(&app, "Assign Shortcut to Workspace", "Assign Shortcut to “Default” Workspace".into()),
-            "Atribuir atalho à área de trabalho “Default”"
-        );
-        assert_eq!(submenu(&app, "Assign Shortcut to 3D View", "Assign Shortcut to “Top”".into()), "Atribuir atalho à visualização 3D “Top”");
-    }
-
     #[test]
     fn general_settings_exposes_the_language_automation_id() {
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
diff --git a/crates/ui-egui/src/i18n/effects.rs b/crates/ui-egui/src/i18n/effects.rs
index 5c6d09ba5..162300f9c 100644
--- a/crates/ui-egui/src/i18n/effects.rs
+++ b/crates/ui-egui/src/i18n/effects.rs
@@ -14,15 +14,15 @@
 //!   the id is stable, so a translation never becomes an orphan.
 //!
 //! Each row repeats the registry's English name so that a rename upstream fails
-//! [`tests::every_effect_has_a_row`] instead of silently pointing a translation at another
-//! effect.
+//! `tests::every_row_names_a_registry_effect` instead of silently pointing a translation at
+//! another effect. An effect with no row draws the registry's English name; the
+//! `missing_translations_report` test (run by `cargo xtask ci`) lists those per language.
 //!
 //! A language decides for itself which names stay English: After Effects' Japanese interface
 //! leaves the `CC` series, the `VR` set and the `OCIO` set in English, while its Simplified
 //! Chinese one translates them (the `CC` names come from Adobe's Chinese *documentation*, which
 //! names 68 of the 69). Repeating the English name is therefore a language-level choice, not a
-//! missing row: [`tests::only_the_brand_names_stay_in_english`] pins *Simplified Chinese's* five
-//! brand names and is deliberately not shared by the other languages.
+//! missing row.
 //!
 //! The Simplified Chinese names come from the installed After Effects 2026 (26.5.0.89)
 //! Simplified Chinese interface, its 21 category folder names included; `Cryptomatte`,
@@ -70,12 +70,14 @@ fn catalog(language: &str) -> Option<&'static Catalog> {
     static SIMPLIFIED: Catalog = Catalog { rows: SIMPLIFIED_CHINESE, categories: SIMPLIFIED_CHINESE_CATEGORIES, index: OnceLock::new() };
     static TRADITIONAL: Catalog = Catalog { rows: TRADITIONAL_CHINESE, categories: TRADITIONAL_CHINESE_CATEGORIES, index: OnceLock::new() };
     static JAPANESE: Catalog = Catalog { rows: JAPANESE_EFFECTS, categories: JAPANESE_CATEGORIES, index: OnceLock::new() };
+    static GEORGIAN_CATALOG: Catalog = Catalog { rows: GEORGIAN, categories: GEORGIAN_CATEGORIES, index: OnceLock::new() };
     match language {
         "zh-hans" => Some(&SIMPLIFIED),
         "zh-hant" => Some(&TRADITIONAL),
         // Japanese: the slot the Japanese data point on #821 asked for, so both languages share
         // this one catalog instead of inventing a second mechanism.
         "ja" => Some(&JAPANESE),
+        "ka" => Some(&GEORGIAN_CATALOG),
         _ => None,
     }
 }
@@ -118,6 +120,19 @@ pub(crate) fn matches(id: &str, english: &str, query: &str) -> bool {
         || catalog(current()).and_then(|c| c.row(id)).is_some_and(|(_, translated)| translated.to_lowercase().contains(query))
 }
 
+/// The registry's effect names and categories `language` has no row for, for the missing-strings
+/// report.
+#[cfg(test)]
+pub(super) fn missing(language: &str) -> Vec<String> {
+    let table = catalog(language);
+    let effects = effectcraft_engine::effects::registry().iter().filter(|spec| table.and_then(|c| c.row(spec.id)).is_none()).map(|spec| spec.name.to_string());
+    let categories = effectcraft_engine::effects::categories()
+        .into_iter()
+        .filter(|source| table.and_then(|c| c.category(source)).is_none())
+        .map(|source| format!("{source} (category)"));
+    effects.chain(categories).collect()
+}
+
 /// Simplified Chinese (`zh-hans`): one row per effect in the registry.
 const SIMPLIFIED_CHINESE: &[Row] = &[
     ("ec.3d.channelextract", "3D Channel Extract", "3D 通道提取"),
@@ -490,6 +505,346 @@ const JAPANESE_CATEGORIES: &[(&str, &str)] = &[
     ("Utility", "ユーティリティ"),
 ];
 
+/// Georgian (`ka`): one row per effect, ids from [`SIMPLIFIED_CHINESE`]. Written from the meaning
+/// of the English names, with the terms the Georgian menus and panels use (FilmCraft's Georgian
+/// for the effects the two apps share). The `CC` series and the brand names (`Cryptomatte`,
+/// `EXtractoR`, `IDentifier`, `Key Light`, `Unmult`, `Lumetri Color`) stay in English, as
+/// Adobe's Japanese interface keeps the `CC` series; `VR` and `OCIO` keep their prefix.
+const GEORGIAN: &[Row] = &[
+    ("ec.3d.channelextract", "3D Channel Extract", "3D არხის ამოღება"),
+    ("ec.3d.cryptomatte", "Cryptomatte", "Cryptomatte"),
+    ("ec.3d.depthmatte", "Depth Matte", "სიღრმის მატი"),
+    ("ec.3d.depthoffield", "Depth of Field", "ველის სიღრმე"),
+    ("ec.3d.extractor", "EXtractoR", "EXtractoR"),
+    ("ec.3d.fog3d", "Fog 3D", "3D ნისლი"),
+    ("ec.3d.identifier", "IDentifier", "IDentifier"),
+    ("ec.3d.idmatte", "ID Matte", "ID მატი"),
+    ("ec.audio.backwards", "Backwards", "უკუღმა"),
+    ("ec.audio.basstreble", "Bass & Treble", "ბასი და ტრებლი"),
+    ("ec.audio.compressor", "Compressor", "კომპრესორი"),
+    ("ec.audio.delay", "Delay", "დაყოვნება"),
+    ("ec.audio.distortion", "Distortion", "დამახინჯება"),
+    ("ec.audio.flangechorus", "Flange & Chorus", "ფლენჯერი და ქორუსი"),
+    ("ec.audio.gate", "Gate", "გეიტი"),
+    ("ec.audio.highlowpass", "High-Low Pass", "მაღალი/დაბალი სიხშირეების ფილტრი"),
+    ("ec.audio.modulator", "Modulator", "მოდულატორი"),
+    ("ec.audio.parametriceq", "Parametric EQ", "პარამეტრული ეკვალაიზერი"),
+    ("ec.audio.reverb", "Reverb", "რევერბი"),
+    ("ec.audio.stereomixer", "Stereo Mixer", "სტერეომიქშერი"),
+    ("ec.audio.tone", "Tone", "ტონი"),
+    ("ec.blur.bilateral", "Bilateral Blur", "ბილატერალური გაბუნდოვნება"),
+    ("ec.blur.cameralens", "Camera Lens Blur", "კამერის ობიექტივის გაბუნდოვნება"),
+    ("ec.blur.camerashakedeblur", "Camera-Shake Deblur", "კამერის რყევით გაბუნდოვნების მოცილება"),
+    ("ec.blur.cccross", "CC Cross Blur", "CC Cross Blur"),
+    ("ec.blur.ccradial", "CC Radial Blur", "CC Radial Blur"),
+    ("ec.blur.ccradialfast", "CC Radial Fast Blur", "CC Radial Fast Blur"),
+    ("ec.blur.ccvector", "CC Vector Blur", "CC Vector Blur"),
+    ("ec.blur.channel", "Channel Blur", "არხის გაბუნდოვნება"),
+    ("ec.blur.compound", "Compound Blur", "შედგენილი გაბუნდოვნება"),
+    ("ec.blur.directional", "Directional Blur", "მიმართული გაბუნდოვნება"),
+    ("ec.blur.fastbox", "Fast Box Blur", "სწრაფი ბლოკური გაბუნდოვნება"),
+    ("ec.blur.gaussian", "Gaussian Blur", "გაუსის გაბუნდოვნება"),
+    ("ec.blur.radial", "Radial Blur", "რადიალური გაბუნდოვნება"),
+    ("ec.blur.reduceflicker", "Reduce Interlace Flicker", "ნახევარკადრული ციმციმის შემცირება"),
+    ("ec.blur.sharpen", "Sharpen", "სიმკვეთრე"),
+    ("ec.blur.smart", "Smart Blur", "ჭკვიანი გაბუნდოვნება"),
+    ("ec.blur.unsharp", "Unsharp Mask", "არამკვეთრი ნიღაბი"),
+    ("ec.channel.arithmetic", "Arithmetic", "არითმეტიკა"),
+    ("ec.channel.blend", "Blend", "შერევა"),
+    ("ec.channel.calculations", "Calculations", "გამოთვლები"),
+    ("ec.channel.cccomposite", "CC Composite", "CC Composite"),
+    ("ec.channel.combiner", "Channel Combiner", "არხების გამაერთიანებელი"),
+    ("ec.channel.compoundarithmetic", "Compound Arithmetic", "შედგენილი არითმეტიკა"),
+    ("ec.channel.invert", "Invert", "ინვერსია"),
+    ("ec.channel.minimax", "Minimax", "მინიმაქსი"),
+    ("ec.channel.removecolormatting", "Remove Color Matting", "ფერადი მატინგის მოცილება"),
+    ("ec.channel.setchannels", "Set Channels", "არხების დაყენება"),
+    ("ec.channel.setmatte", "Set Matte", "მატის დაყენება"),
+    ("ec.channel.shiftchannels", "Shift Channels", "არხების გადანაცვლება"),
+    ("ec.channel.solidcomposite", "Solid Composite", "სოლიდთან კომპოზიტი"),
+    ("ec.color.autocolor", "Auto Color", "ავტოფერი"),
+    ("ec.color.autocontrast", "Auto Contrast", "ავტოკონტრასტი"),
+    ("ec.color.autolevels", "Auto Levels", "ავტოდონეები"),
+    ("ec.color.blackwhite", "Black & White", "შავ-თეთრი"),
+    ("ec.color.brightnesscontrast", "Brightness & Contrast", "სიკაშკაშე და კონტრასტი"),
+    ("ec.color.broadcast", "Broadcast Colors", "სამაუწყებლო ფერები"),
+    ("ec.color.cccolorneutralizer", "CC Color Neutralizer", "CC Color Neutralizer"),
+    ("ec.color.cccoloroffset", "CC Color Offset", "CC Color Offset"),
+    ("ec.color.cckernel", "CC Kernel", "CC Kernel"),
+    ("ec.color.cctoner", "CC Toner", "CC Toner"),
+    ("ec.color.changecolor", "Change Color", "ფერის შეცვლა"),
+    ("ec.color.changetocolor", "Change to Color", "ფერად შეცვლა"),
+    ("ec.color.channelmixer", "Channel Mixer", "არხების მიქშერი"),
+    ("ec.color.colorama", "Colorama", "კოლორამა"),
+    ("ec.color.colorbalance", "Color Balance", "ფერთა ბალანსი"),
+    ("ec.color.colorbalancehls", "Color Balance (HLS)", "ფერთა ბალანსი (HLS)"),
+    ("ec.color.colorlink", "Color Link", "ფერის ბმა"),
+    ("ec.color.colorstabilizer", "Color Stabilizer", "ფერის სტაბილიზატორი"),
+    ("ec.color.curves", "Curves", "მრუდები"),
+    ("ec.color.equalize", "Equalize", "გათანაბრება"),
+    ("ec.color.exposure", "Exposure", "ექსპოზიცია"),
+    ("ec.color.gammapedestalgain", "Gamma/Pedestal/Gain", "გამა/საფეხური/გაძლიერება"),
+    ("ec.color.huesaturation", "Hue/Saturation", "ფერის ტონი/გაჯერება"),
+    ("ec.color.leavecolor", "Leave Color", "ფერის დატოვება"),
+    ("ec.color.levels", "Levels", "დონეები"),
+    ("ec.color.levelsic", "Levels (Individual Controls)", "დონეები (ცალკეული მართვა)"),
+    ("ec.color.lumetri", "Lumetri Color", "Lumetri Color"),
+    ("ec.color.ociocdl", "OCIO CDL Transform", "OCIO CDL გარდაქმნა"),
+    ("ec.color.ociocolorspace", "OCIO Color Space Transform", "OCIO ფერთა სივრცის გარდაქმნა"),
+    ("ec.color.ociodisplay", "OCIO Display Transform", "OCIO ეკრანის გარდაქმნა"),
+    ("ec.color.ociofile", "OCIO File Transform", "OCIO ფაილის გარდაქმნა"),
+    ("ec.color.ociolook", "OCIO Look Transform", "OCIO ვიზუალური სტილის გარდაქმნა"),
+    ("ec.color.photofilter", "Photo Filter", "ფოტოფილტრი"),
+    ("ec.color.psarbitrarymap", "PS Arbitrary Map", "PS ნებისმიერი რუკა"),
+    ("ec.color.selectivecolor", "Selective Color", "შერჩევითი ფერი"),
+    ("ec.color.shadowhighlight", "Shadow/Highlight", "ჩრდილები/ღია ტონები"),
+    ("ec.color.tint", "Tint", "ტონირება"),
+    ("ec.color.tritone", "Tritone", "სამტონიანი"),
+    ("ec.color.vibrance", "Vibrance", "სიხალასე"),
+    ("ec.color.videolimiter", "Video Limiter", "ვიდეოლიმიტერი"),
+    ("ec.control.angle", "Angle Control", "კუთხის მართვა"),
+    ("ec.control.checkbox", "Checkbox Control", "მოსანიშნი ველის მართვა"),
+    ("ec.control.color", "Color Control", "ფერის მართვა"),
+    ("ec.control.dropdown", "Dropdown Menu Control", "ჩამოსაშლელი მენიუს მართვა"),
+    ("ec.control.layer", "Layer Control", "შრის მართვა"),
+    ("ec.control.point", "Point Control", "წერტილის მართვა"),
+    ("ec.control.point3d", "3D Point Control", "3D წერტილის მართვა"),
+    ("ec.control.slider", "Slider Control", "სლაიდერის მართვა"),
+    ("ec.control.stereo3d", "Stereo 3D Controls", "სტერეო 3D მართვა"),
+    ("ec.distort.bezierwarp", "Bezier Warp", "ბეზიეს დეფორმაცია"),
+    ("ec.distort.bulge", "Bulge", "გამობერილობა"),
+    ("ec.distort.ccbender", "CC Bender", "CC Bender"),
+    ("ec.distort.ccbendit", "CC Bend It", "CC Bend It"),
+    ("ec.distort.ccblobbylize", "CC Blobbylize", "CC Blobbylize"),
+    ("ec.distort.ccflomotion", "CC Flo Motion", "CC Flo Motion"),
+    ("ec.distort.ccgriddler", "CC Griddler", "CC Griddler"),
+    ("ec.distort.cclens", "CC Lens", "CC Lens"),
+    ("ec.distort.ccpageturn", "CC Page Turn", "CC Page Turn"),
+    ("ec.distort.ccpowerpin", "CC Power Pin", "CC Power Pin"),
+    ("ec.distort.ccripplepulse", "CC Ripple Pulse", "CC Ripple Pulse"),
+    ("ec.distort.ccslant", "CC Slant", "CC Slant"),
+    ("ec.distort.ccsmear", "CC Smear", "CC Smear"),
+    ("ec.distort.ccsplit", "CC Split", "CC Split"),
+    ("ec.distort.ccsplit2", "CC Split 2", "CC Split 2"),
+    ("ec.distort.cctiler", "CC Tiler", "CC Tiler"),
+    ("ec.distort.cornerpin", "Corner Pin", "კუთხეების მიმაგრება"),
+    ("ec.distort.displacementmap", "Displacement Map", "წანაცვლების რუკა"),
+    ("ec.distort.liquify", "Liquify", "გათხევადება"),
+    ("ec.distort.magnify", "Magnify", "გადიდება"),
+    ("ec.distort.meshwarp", "Mesh Warp", "ბადისებრი დეფორმაცია"),
+    ("ec.distort.mirror", "Mirror", "სარკე"),
+    ("ec.distort.offset", "Offset", "წანაცვლება"),
+    ("ec.distort.opticscompensation", "Optics Compensation", "ოპტიკის კომპენსაცია"),
+    ("ec.distort.polar", "Polar Coordinates", "პოლარული კოორდინატები"),
+    ("ec.distort.puppet", "Puppet", "მარიონეტი"),
+    ("ec.distort.reshape", "Reshape", "ფორმის შეცვლა"),
+    ("ec.distort.ripple", "Ripple", "ტალღა"),
+    ("ec.distort.rollingshutterrepair", "Rolling Shutter Repair", "მცოცავი ჩამკეტის გასწორება"),
+    ("ec.distort.smear", "Smear", "გადღაბნა"),
+    ("ec.distort.spherize", "Spherize", "სფერიზება"),
+    ("ec.distort.transform", "Transform", "გარდაქმნა"),
+    ("ec.distort.turbulentdisplace", "Turbulent Displace", "ტურბულენტური წანაცვლება"),
+    ("ec.distort.twirl", "Twirl", "გრიგალი"),
+    ("ec.distort.twirllegacy", "Twirl (Legacy)", "გრიგალი (მოძველებული)"),
+    ("ec.distort.upscale", "Detail-preserving Upscale", "გადიდება დეტალების შენარჩუნებით"),
+    ("ec.distort.warp", "Warp", "დეფორმაცია"),
+    ("ec.distort.warpstabilizer", "Warp Stabilizer", "დეფორმაციის სტაბილიზატორი"),
+    ("ec.distort.wavewarp", "Wave Warp", "ტალღური დეფორმაცია"),
+    ("ec.generate.advancedlightning", "Advanced Lightning", "გაფართოებული ელვა"),
+    ("ec.generate.audiospectrum", "Audio Spectrum", "აუდიოს სპექტრი"),
+    ("ec.generate.audiowaveform", "Audio Waveform", "აუდიოს ტალღის ფორმა"),
+    ("ec.generate.beam", "Beam", "სხივი"),
+    ("ec.generate.ccgluegun", "CC Glue Gun", "CC Glue Gun"),
+    ("ec.generate.cclightburst", "CC Light Burst 2.5", "CC Light Burst 2.5"),
+    ("ec.generate.cclightrays", "CC Light Rays", "CC Light Rays"),
+    ("ec.generate.cclightsweep", "CC Light Sweep", "CC Light Sweep"),
+    ("ec.generate.ccthreads", "CC Threads", "CC Threads"),
+    ("ec.generate.cellpattern", "Cell Pattern", "უჯრედების პატერნი"),
+    ("ec.generate.checkerboard", "Checkerboard", "ჭადრაკის დაფა"),
+    ("ec.generate.circle", "Circle", "წრე"),
+    ("ec.generate.ellipse", "Ellipse", "ელიფსი"),
+    ("ec.generate.eyedropperfill", "Eyedropper Fill", "პიპეტით შევსება"),
+    ("ec.generate.fill", "Fill", "შევსება"),
+    ("ec.generate.fourcolor", "4-Color Gradient", "4-ფერიანი გრადიენტი"),
+    ("ec.generate.fractal", "Fractal", "ფრაქტალი"),
+    ("ec.generate.gradientramp", "Gradient Ramp", "გრადიენტული გადასვლა"),
+    ("ec.generate.grid", "Grid", "ბადე"),
+    ("ec.generate.lensflare", "Lens Flare", "ობიექტივის ანარეკლი"),
+    ("ec.generate.paintbucket", "Paint Bucket", "საღებავის ვედრო"),
+    ("ec.generate.radiowaves", "Radio Waves", "რადიოტალღები"),
+    ("ec.generate.scribble", "Scribble", "ჯღაბნა"),
+    ("ec.generate.stroke", "Stroke", "კონტური"),
+    ("ec.generate.vegas", "Vegas", "ვეგასი"),
+    ("ec.generate.writeon", "Write-on", "თანდათანობითი წერა"),
+    ("ec.key.advancedspill", "Advanced Spill Suppressor", "ფერის გადაღვრის გაფართოებული ჩამხშობი"),
+    ("ec.key.ccsimplewireremoval", "CC Simple Wire Removal", "CC Simple Wire Removal"),
+    ("ec.key.colordifference", "Color Difference Key", "ფერთა სხვაობის გასაღები"),
+    ("ec.key.colorkey", "Color Key", "ფერის გასაღები"),
+    ("ec.key.colorrange", "Color Range", "ფერების დიაპაზონი"),
+    ("ec.key.differencematte", "Difference Matte", "სხვაობის მატი"),
+    ("ec.key.extract", "Extract", "ამოღება"),
+    ("ec.key.innerouter", "Inner/Outer Key", "შიდა/გარე გასაღები"),
+    ("ec.key.keycleaner", "Key Cleaner", "გასაღების გამწმენდი"),
+    ("ec.key.linearcolor", "Linear Color Key", "წრფივი ფერის გასაღები"),
+    ("ec.key.luma", "Luma Key", "სიკაშკაშის გასაღები"),
+    ("ec.key.screen", "Screen Key", "ეკრანის გასაღები"),
+    ("ec.key.spill", "Spill Suppressor", "ფერის გადაღვრის ჩამხშობი"),
+    ("ec.key.unmult", "Unmult", "Unmult"),
+    ("ec.keying.keylight", "Key Light", "Key Light"),
+    ("ec.matte.mattechoker", "Matte Choker", "მატის შემკუმშველი"),
+    ("ec.matte.objectmatte", "Object Matte", "ობიექტის მატი"),
+    ("ec.matte.refinehard", "Refine Hard Matte", "მკვეთრი მატის დახვეწა"),
+    ("ec.matte.refinesoft", "Refine Soft Matte", "რბილი მატის დახვეწა"),
+    ("ec.matte.rotobrush", "Roto Brush & Refine Edge", "როტო-ფუნჯი და კიდის დახვეწა"),
+    ("ec.matte.simplechoker", "Simple Choker", "მარტივი შემკუმშველი"),
+    ("ec.noise.addgrain", "Add Grain", "მარცვლოვნების დამატება"),
+    ("ec.noise.curlnoise", "Curl Noise", "გრიგალური ხმაური"),
+    ("ec.noise.dustscratches", "Dust & Scratches", "მტვერი და ნაკაწრები"),
+    ("ec.noise.fractal", "Fractal Noise", "ფრაქტალური ხმაური"),
+    ("ec.noise.matchgrain", "Match Grain", "მარცვლოვნების მისადაგება"),
+    ("ec.noise.median", "Median", "მედიანა"),
+    ("ec.noise.medianlegacy", "Median (Legacy)", "მედიანა (მოძველებული)"),
+    ("ec.noise.noise", "Noise", "ხმაური"),
+    ("ec.noise.noisealpha", "Noise Alpha", "ალფა-ხმაური"),
+    ("ec.noise.noisehls", "Noise HLS", "HLS ხმაური"),
+    ("ec.noise.noisehlsauto", "Noise HLS Auto", "HLS ხმაური (ავტომატური)"),
+    ("ec.noise.removegrain", "Remove Grain", "მარცვლოვნების მოცილება"),
+    ("ec.noise.turbulent", "Turbulent Noise", "ტურბულენტური ხმაური"),
+    ("ec.obsolete.basic3d", "Basic 3D", "საბაზო 3D"),
+    ("ec.obsolete.basictext", "Basic Text", "საბაზო ტექსტი"),
+    ("ec.obsolete.gaussianlegacy", "Gaussian Blur (Legacy)", "გაუსის გაბუნდოვნება (მოძველებული)"),
+    ("ec.obsolete.lightning", "Lightning", "ელვა"),
+    ("ec.obsolete.mochashape", "Mocha shape", "Mocha-ს ფიგურა"),
+    ("ec.obsolete.pathtext", "Path Text", "ტექსტი ტრაექტორიაზე"),
+    ("ec.paint.paint", "Paint", "ხატვა"),
+    ("ec.perspective.3dglasses", "3D Glasses", "3D სათვალე"),
+    ("ec.perspective.bevelalpha", "Bevel Alpha", "ალფას ფასკა"),
+    ("ec.perspective.beveledges", "Bevel Edges", "კიდეების ფასკა"),
+    ("ec.perspective.cameratracker", "3D Camera Tracker", "3D კამერის ტრეკერი"),
+    ("ec.perspective.cccylinder", "CC Cylinder", "CC Cylinder"),
+    ("ec.perspective.ccenvironment", "CC Environment", "CC Environment"),
+    ("ec.perspective.ccsphere", "CC Sphere", "CC Sphere"),
+    ("ec.perspective.ccspotlight", "CC Spotlight", "CC Spotlight"),
+    ("ec.perspective.dropshadow", "Drop Shadow", "ჩრდილი"),
+    ("ec.perspective.radialshadow", "Radial Shadow", "რადიალური ჩრდილი"),
+    ("ec.sim.carddance", "Card Dance", "მოცეკვავე ბარათები"),
+    ("ec.sim.caustics", "Caustics", "კაუსტიკა"),
+    ("ec.sim.ccballaction", "CC Ball Action", "CC Ball Action"),
+    ("ec.sim.ccbubbles", "CC Bubbles", "CC Bubbles"),
+    ("ec.sim.ccdrizzle", "CC Drizzle", "CC Drizzle"),
+    ("ec.sim.cchair", "CC Hair", "CC Hair"),
+    ("ec.sim.ccmrmercury", "CC Mr. Mercury", "CC Mr. Mercury"),
+    ("ec.sim.ccparticlesystems2", "CC Particle Systems II", "CC Particle Systems II"),
+    ("ec.sim.ccparticleworld", "CC Particle World", "CC Particle World"),
+    ("ec.sim.ccpixelpolly", "CC Pixel Polly", "CC Pixel Polly"),
+    ("ec.sim.ccrainfall", "CC Rainfall", "CC Rainfall"),
+    ("ec.sim.ccscatterize", "CC Scatterize", "CC Scatterize"),
+    ("ec.sim.ccsnowfall", "CC Snowfall", "CC Snowfall"),
+    ("ec.sim.ccstarburst", "CC Star Burst", "CC Star Burst"),
+    ("ec.sim.foam", "Foam", "ქაფი"),
+    ("ec.sim.particleplayground", "Particle Playground", "ნაწილაკების სიმულაცია"),
+    ("ec.sim.shatter", "Shatter", "დამსხვრევა"),
+    ("ec.sim.waveworld", "Wave World", "ტალღების სამყარო"),
+    ("ec.stylize.brushstrokes", "Brush Strokes", "ფუნჯის შტრიხები"),
+    ("ec.stylize.cartoon", "Cartoon", "მულტფილმის სტილი"),
+    ("ec.stylize.ccblockload", "CC Block Load", "CC Block Load"),
+    ("ec.stylize.ccburnfilm", "CC Burn Film", "CC Burn Film"),
+    ("ec.stylize.ccglass", "CC Glass", "CC Glass"),
+    ("ec.stylize.cchextile", "CC HexTile", "CC HexTile"),
+    ("ec.stylize.cckaleida", "CC Kaleida", "CC Kaleida"),
+    ("ec.stylize.ccmrsmoothie", "CC Mr. Smoothie", "CC Mr. Smoothie"),
+    ("ec.stylize.ccplastic", "CC Plastic", "CC Plastic"),
+    ("ec.stylize.ccrepetile", "CC RepeTile", "CC RepeTile"),
+    ("ec.stylize.ccthreshold", "CC Threshold", "CC Threshold"),
+    ("ec.stylize.ccthresholdrgb", "CC Threshold RGB", "CC Threshold RGB"),
+    ("ec.stylize.ccvignette", "CC Vignette", "CC Vignette"),
+    ("ec.stylize.coloremboss", "Color Emboss", "ფერადი რელიეფი"),
+    ("ec.stylize.emboss", "Emboss", "რელიეფი"),
+    ("ec.stylize.findedges", "Find Edges", "კიდეების პოვნა"),
+    ("ec.stylize.glow", "Glow", "ნათება"),
+    ("ec.stylize.mosaic", "Mosaic", "მოზაიკა"),
+    ("ec.stylize.motiontile", "Motion Tile", "მოძრავი ფილები"),
+    ("ec.stylize.posterize", "Posterize", "პოსტერიზაცია"),
+    ("ec.stylize.roughenedges", "Roughen Edges", "კიდეების დაუხეშება"),
+    ("ec.stylize.scatter", "Scatter", "გაბნევა"),
+    ("ec.stylize.strobe", "Strobe Light", "სტრობოსკოპი"),
+    ("ec.stylize.texturize", "Texturize", "ტექსტურირება"),
+    ("ec.stylize.threshold", "Threshold", "ზღვარი"),
+    ("ec.text.numbers", "Numbers", "რიცხვები"),
+    ("ec.text.timecode", "Timecode", "თაიმკოდი"),
+    ("ec.time.ccforcemotionblur", "CC Force Motion Blur", "CC Force Motion Blur"),
+    ("ec.time.ccwidetime", "CC Wide Time", "CC Wide Time"),
+    ("ec.time.echo", "Echo", "ექო"),
+    ("ec.time.pixelmotionblur", "Pixel Motion Blur", "პიქსელების მოძრაობის გაბუნდოვნება"),
+    ("ec.time.posterizetime", "Posterize Time", "დროის პოსტერიზაცია"),
+    ("ec.time.timedifference", "Time Difference", "დროითი სხვაობა"),
+    ("ec.time.timedisplacement", "Time Displacement", "დროითი წანაცვლება"),
+    ("ec.time.timewarp", "Timewarp", "Timewarp"),
+    ("ec.transition.blockdissolve", "Block Dissolve", "ბლოკური გადადნობა"),
+    ("ec.transition.cardwipe", "Card Wipe", "ბარათებით წმენდა"),
+    ("ec.transition.ccglasswipe", "CC Glass Wipe", "CC Glass Wipe"),
+    ("ec.transition.ccgridwipe", "CC Grid Wipe", "CC Grid Wipe"),
+    ("ec.transition.ccimagewipe", "CC Image Wipe", "CC Image Wipe"),
+    ("ec.transition.ccjaws", "CC Jaws", "CC Jaws"),
+    ("ec.transition.cclightwipe", "CC Light Wipe", "CC Light Wipe"),
+    ("ec.transition.cclinesweep", "CC Line Sweep", "CC Line Sweep"),
+    ("ec.transition.ccradialscalewipe", "CC Radial ScaleWipe", "CC Radial ScaleWipe"),
+    ("ec.transition.ccscalewipe", "CC Scale Wipe", "CC Scale Wipe"),
+    ("ec.transition.cctwister", "CC Twister", "CC Twister"),
+    ("ec.transition.ccwarpomatic", "CC WarpoMatic", "CC WarpoMatic"),
+    ("ec.transition.gradientwipe", "Gradient Wipe", "გრადიენტული წმენდა"),
+    ("ec.transition.iriswipe", "Iris Wipe", "დიაფრაგმული წმენდა"),
+    ("ec.transition.linearwipe", "Linear Wipe", "წრფივი წმენდა"),
+    ("ec.transition.radialwipe", "Radial Wipe", "რადიალური წმენდა"),
+    ("ec.transition.venetian", "Venetian Blinds", "ჟალუზი"),
+    ("ec.utility.applylut", "Apply Color LUT", "ფერის LUT-ის გამოყენება"),
+    ("ec.utility.ccoverbrights", "CC Overbrights", "CC Overbrights"),
+    ("ec.utility.cineon", "Cineon Converter", "Cineon-ის გარდამქმნელი"),
+    ("ec.utility.colorprofileconverter", "Color Profile Converter", "ფერის პროფილის გარდამქმნელი"),
+    ("ec.utility.facemeasurements", "Face Measurements", "სახის გაზომვები"),
+    ("ec.utility.facetrackpoints", "Face Track Points", "სახის ტრეკინგის წერტილები"),
+    ("ec.utility.growbounds", "Grow Bounds", "საზღვრების გაზრდა"),
+    ("ec.utility.hdrcompander", "HDR Compander", "HDR კომპანდერი"),
+    ("ec.utility.hdrcompression", "HDR Highlight Compression", "HDR ღია ტონების შეკუმშვა"),
+    ("ec.vr.blur", "VR Blur", "VR გაბუნდოვნება"),
+    ("ec.vr.chromaticaberrations", "VR Chromatic Aberrations", "VR ქრომატული აბერაციები"),
+    ("ec.vr.colorgradients", "VR Color Gradients", "VR ფერადი გრადიენტები"),
+    ("ec.vr.converter", "VR Converter", "VR გარდამქმნელი"),
+    ("ec.vr.denoise", "VR De-Noise", "VR ხმაურის მოცილება"),
+    ("ec.vr.digitalglitch", "VR Digital Glitch", "VR ციფრული ხარვეზი"),
+    ("ec.vr.fractalnoise", "VR Fractal Noise", "VR ფრაქტალური ხმაური"),
+    ("ec.vr.glow", "VR Glow", "VR ნათება"),
+    ("ec.vr.planetosphere", "VR Plane to Sphere", "VR სიბრტყიდან სფეროზე"),
+    ("ec.vr.rotatesphere", "VR Rotate Sphere", "VR სფეროს შემობრუნება"),
+    ("ec.vr.sharpen", "VR Sharpen", "VR სიმკვეთრე"),
+    ("ec.vr.spheretoplane", "VR Sphere to Plane", "VR სფეროდან სიბრტყეზე"),
+];
+
+/// Georgian (`ka`) category labels, keyed by the registry's English category.
+const GEORGIAN_CATEGORIES: &[(&str, &str)] = &[
+    ("3D Channel", "3D არხი"),
+    ("Audio", "აუდიო"),
+    ("Blur & Sharpen", "გაბუნდოვნება და სიმკვეთრე"),
+    ("Channel", "არხი"),
+    ("Color Correction", "ფერის კორექცია"),
+    ("Distort", "დამახინჯება"),
+    ("Expression Controls", "ექსპრესიის მართვა"),
+    ("Generate", "გენერაცია"),
+    ("Immersive Video", "იმერსიული ვიდეო"),
+    ("Keying", "კეიინგი"),
+    ("Matte", "მატი"),
+    ("Noise & Grain", "ხმაური და მარცვლოვნება"),
+    ("Obsolete", "მოძველებული"),
+    ("Paint", "ხატვა"),
+    ("Perspective", "პერსპექტივა"),
+    ("Simulation", "სიმულაცია"),
+    ("Stylize", "სტილიზაცია"),
+    ("Text", "ტექსტი"),
+    ("Time", "დრო"),
+    ("Transition", "გადასვლა"),
+    ("Utility", "დამხმარე"),
+];
+
 /// The 21 category folder names the generated Effect menu and Effects & Presets draw, in
 /// Simplified Chinese. Read from the installed After Effects 2026 (26.5.0.89) Simplified Chinese
 /// interface (the checklist's `07-类别` sheet); two of them are the interface's own wording where
@@ -524,19 +879,17 @@ mod tests {
     use crate::i18n::set_current;
     use effectcraft_engine::effects;
 
-    /// Every effect in the registry has a row, and that row still carries the registry's English
-    /// name. A new effect, a rename or a removal fails here rather than drawing an English name
-    /// in a Chinese interface, or attaching a translation to a different effect.
+    /// Every row names an effect in the registry and still carries its English name, so a rename
+    /// or a removal fails here rather than attaching a translation to a different effect.
     #[test]
-    fn every_effect_has_a_row() {
+    fn every_row_names_a_registry_effect() {
         let registry = effects::registry();
-        assert_eq!(SIMPLIFIED_CHINESE.len(), registry.len(), "the catalog has {} rows for {} effects", SIMPLIFIED_CHINESE.len(), registry.len());
-        for spec in registry {
-            let Some((_, english, translated)) = SIMPLIFIED_CHINESE.iter().find(|(id, _, _)| *id == spec.id) else {
-                panic!("no catalog row for {} ({})", spec.id, spec.name);
+        for (id, english, translated) in SIMPLIFIED_CHINESE {
+            let Some(spec) = registry.iter().find(|spec| spec.id == *id) else {
+                panic!("{id} ({english}) is not an effect in the registry");
             };
-            assert_eq!(*english, spec.name, "{}: the catalog says {english:?}, the registry {:?}", spec.id, spec.name);
-            assert!(!translated.is_empty(), "{}: empty translation", spec.id);
+            assert_eq!(*english, spec.name, "{id}: the catalog says {english:?}, the registry {:?}", spec.name);
+            assert!(!translated.is_empty(), "{id}: empty translation");
         }
     }
 
@@ -550,24 +903,12 @@ mod tests {
         assert_eq!(listed, ids.len(), "an effect id is listed twice");
     }
 
-    /// The five names Adobe's Simplified Chinese interface leaves in English as brand names, and
-    /// the only zh-hans rows that may repeat their English name. Deliberately not shared: another
-    /// language keeps different names in English (Japanese leaves the whole `CC`, `VR` and `OCIO`
-    /// sets in English), so this is zh-hans's own choice, not an invariant of the tables.
-    #[test]
-    fn only_the_brand_names_stay_in_english() {
-        const BRANDS: [&str; 5] = ["ec.3d.cryptomatte", "ec.3d.extractor", "ec.3d.identifier", "ec.keying.keylight", "ec.key.unmult"];
-        for (id, english, translated) in SIMPLIFIED_CHINESE {
-            assert_eq!(english == translated, BRANDS.contains(id), "{id}: {english:?} is drawn as {translated:?}");
-        }
-    }
-
     /// The languages that have no rows yet, with the table a translator fills in for each. A new
     /// language is added here and to [`catalog`]; the test then guards its rows as they arrive.
     const PENDING: &[(&str, &[Row])] = &[("zh-hant", TRADITIONAL_CHINESE)];
 
     /// The languages whose tables are being filled in: guarded like [`PENDING`] row by row.
-    const PARTIAL: &[(&str, &[Row])] = &[("ja", JAPANESE_EFFECTS)];
+    const PARTIAL: &[(&str, &[Row])] = &[("ja", JAPANESE_EFFECTS), ("ka", GEORGIAN)];
 
     /// A pending language may lag Simplified Chinese but may not invent ids or disagree about
     /// which effect an id names: a translator fills these tables row by row. While they are
@@ -591,16 +932,14 @@ mod tests {
         }
     }
 
-    /// Every category the registry and its plug-ins report has a Simplified Chinese row, and
-    /// every row of every language names a category that exists — else the generated Effect menu
-    /// and Effects & Presets would draw a label no folder has.
+    /// Every category row of every language names a category that exists, else the generated
+    /// Effect menu and Effects & Presets would carry a label no folder has.
     #[test]
-    fn every_category_has_a_row() {
+    fn every_category_row_names_a_category() {
         let categories = effects::categories();
-        for category in &categories {
-            assert!(SIMPLIFIED_CHINESE_CATEGORIES.iter().any(|(english, _)| english == category), "no catalog row for category {category}");
-        }
-        for (language, rows) in [("zh-hans", SIMPLIFIED_CHINESE_CATEGORIES), ("zh-hant", TRADITIONAL_CHINESE_CATEGORIES), ("ja", JAPANESE_CATEGORIES)] {
+        for (language, rows) in
+            [("zh-hans", SIMPLIFIED_CHINESE_CATEGORIES), ("zh-hant", TRADITIONAL_CHINESE_CATEGORIES), ("ja", JAPANESE_CATEGORIES), ("ka", GEORGIAN_CATEGORIES)]
+        {
             for (english, translated) in rows {
                 assert!(categories.contains(english), "{language} lists {english}, which is not a category");
                 assert!(!translated.is_empty(), "empty {language} translation for {english}");
@@ -613,48 +952,38 @@ mod tests {
     #[test]
     fn group_names_keep_the_instance_index_and_user_renames() {
         set_current("zh-hans");
-        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur"), "高斯模糊");
-        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "高斯模糊 2");
-        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 12"), "高斯模糊 12");
+        let translated = name("ec.blur.gaussian", "Gaussian Blur");
+        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur"), translated);
+        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), format!("{translated} 2"));
+        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 12"), format!("{translated} 12"));
         assert_eq!(group("ec.blur.gaussian", "My Blur"), "My Blur", "a rename is not a row");
         assert_eq!(group("ec.blur.gaussian", "Gaussian Blur X"), "Gaussian Blur X");
         assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2x"), "Gaussian Blur 2x");
-        assert_eq!(group("ec.blur.gaussian", "高斯模糊"), "高斯模糊", "an already translated name stays");
+        assert_eq!(group("ec.blur.gaussian", &translated), translated, "an already translated name stays");
         set_current("en");
     }
 
-    /// English, and a language with no catalog or no row for this effect, draws the registry's
-    /// name rather than an empty label.
-    ///
-    /// The pending languages are also checked to still be row-less and to have an arm in
-    /// [`catalog`]: an arm with no table would leave a translator's rows dead, and the day a
-    /// pending language gets rows this fails so its slot moves out of [`PENDING`], where the
-    /// coverage for it lives.
+    /// English, and a language with no catalog or no row for an effect, draws the registry's
+    /// name rather than an empty label; a language with a row draws the row. Every table in
+    /// [`PENDING`] and [`PARTIAL`] has an arm in [`catalog`]: an arm-less table's rows would be dead.
     #[test]
     fn languages_without_rows_draw_the_registry_name() {
+        for (language, _) in PENDING.iter().chain(PARTIAL) {
+            assert!(catalog(language).is_some(), "{language} has a table but no arm in `catalog`: its rows would be dead");
+        }
+        let tables = PENDING.iter().chain(PARTIAL).copied().chain([("zh-hans", SIMPLIFIED_CHINESE)]);
+        for (language, rows) in [("en", &[][..]), ("uk", &[][..]), ("cs", &[][..])].into_iter().chain(tables) {
+            set_current(language);
+            let expected = rows.iter().find(|(id, _, _)| *id == "ec.blur.gaussian").map_or("Gaussian Blur", |(_, _, translated)| *translated);
+            assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), expected, "{language}");
+            assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), format!("{expected} 2"), "{language}");
+            assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery", "{language}");
+            assert_eq!(category("Not A Category"), "Not A Category", "{language}");
+        }
         for language in ["en", "uk", "cs"] {
             set_current(language);
-            assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "Gaussian Blur", "{language}");
-            assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "Gaussian Blur 2", "{language}");
             assert_eq!(category("Blur & Sharpen"), "Blur & Sharpen", "{language}");
         }
-        for (language, rows) in PENDING {
-            assert!(catalog(language).is_some(), "{language} has a table but no arm in `catalog`: its rows would be dead");
-            assert!(rows.is_empty(), "{language} has rows now: move it out of PENDING and cover it here");
-            set_current(language);
-            assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "Gaussian Blur", "{language}");
-            assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "Gaussian Blur 2", "{language}");
-            assert_eq!(category("Blur & Sharpen"), "Blur & Sharpen", "{language}");
-        }
-        set_current("zh-hans");
-        assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "高斯模糊");
-        assert_eq!(group("ec.blur.gaussian", "Gaussian Blur 2"), "高斯模糊 2");
-        assert_eq!(category("Blur & Sharpen"), "模糊和锐化");
-        assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery");
-        assert_eq!(category("Not A Category"), "Not A Category");
-        set_current("ja");
-        assert_eq!(name("ec.blur.gaussian", "Gaussian Blur"), "ブラー（ガウス）");
-        assert_eq!(name("ec.unknown.effect", "Mystery"), "Mystery", "a row a partial table lacks draws the registry name");
         set_current("en");
     }
 
@@ -665,38 +994,10 @@ mod tests {
         set_current("zh-hans");
         assert!(matches("ec.blur.gaussian", "Gaussian Blur", "blur"));
         assert!(matches("ec.blur.gaussian", "Gaussian Blur", "gaussian"));
-        assert!(matches("ec.blur.gaussian", "Gaussian Blur", "高斯"));
+        assert!(matches("ec.blur.gaussian", "Gaussian Blur", &name("ec.blur.gaussian", "Gaussian Blur").to_lowercase()));
         assert!(!matches("ec.blur.gaussian", "Gaussian Blur", "sharpen"));
         set_current("en");
         assert!(matches("ec.blur.gaussian", "Gaussian Blur", "blur"));
         assert!(!matches("ec.blur.gaussian", "Gaussian Blur", "高斯"));
     }
-
-    /// The drawing sites ask this catalog instead of the registry's English name (#821). Like the
-    /// panel catalog's literal scan this is a heuristic: it pins the expressions that used to draw
-    /// the English name, so a revert fails here.
-    #[test]
-    fn the_drawing_sites_ask_the_catalog() {
-        /// A file that must ask the catalog.
-        const ASKS: &[(&str, &str, &str)] = &[
-            ("i18n.rs", include_str!("../i18n.rs"), "effects::name("),
-            ("i18n.rs", include_str!("../i18n.rs"), "effects::category("),
-            ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "effects::name("),
-            ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "effects::category("),
-            ("panels/effect_controls.rs", include_str!("../panels/effect_controls.rs"), "effects::group("),
-            ("panels/timeline.rs", include_str!("../panels/timeline.rs"), "effects::group("),
-        ];
-        /// An expression that drew the registry's English name and must be gone.
-        const RAW: &[(&str, &str, &str)] = &[
-            ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs"), "pos2(r.min.x + 56.0 + indent, r.center().y), e.name, query, &t)"),
-            ("panels/effect_controls.rs", include_str!("../panels/effect_controls.rs"), "Align2::LEFT_CENTER, &g.name,"),
-            ("panels/timeline.rs", include_str!("../panels/timeline.rs"), "Align2::LEFT_CENTER, name,"),
-        ];
-        for (path, source, call) in ASKS {
-            assert!(source.contains(call), "{path} does not ask the effect-name catalog (`{call}`)");
-        }
-        for (path, source, raw) in RAW {
-            assert!(!source.contains(raw), "{path} draws the registry's English name again: `{raw}`");
-        }
-    }
 }
diff --git a/crates/ui-egui/src/i18n/ui.rs b/crates/ui-egui/src/i18n/ui.rs
index 9831092da..46493296b 100644
--- a/crates/ui-egui/src/i18n/ui.rs
+++ b/crates/ui-egui/src/i18n/ui.rs
@@ -6,12 +6,15 @@
 //! inventing an id, and a missing row falls back to English instead of to an empty label.
 //!
 //! The language in force is set once per frame, from the same resolved language the fonts are
-//! installed for ([`super::language`], [`set_current`]), so a panel does not have to thread it
+//! installed for (`crate::i18n::language`, [`set_current`]), so a panel does not have to thread it
 //! through every function. It is thread-local: the render threads never draw interface text.
 //!
 //! A row that carries values keeps one `{}` per value and is read with [`tr_args`]; the tests below
 //! refuse a row whose placeholder count differs from its English source, so a translation can never
 //! drop a value, and `tr_args` itself cannot panic.
+//!
+//! A language may lack rows: the English source shows instead, and the `missing_translations_report`
+//! test (run by `cargo xtask ci`) lists what each language lacks.
 
 use std::cell::Cell;
 use std::collections::HashMap;
@@ -19,7 +22,7 @@ use std::fmt::Display;
 use std::sync::OnceLock;
 
 thread_local! {
-    /// The resolved interface language ("en", "ja", "zh-hans", "zh-hant", "uk", "pt-br", "cs", "es"); "en" until the first
+    /// The resolved interface language ("en", "ja", "zh-hans", "zh-hant", "uk", "pt-br", "cs", "es", "ka"); "en" until the first
     /// frame sets it.
     static CURRENT: Cell<&'static str> = const { Cell::new("en") };
 }
@@ -37,6 +40,20 @@ pub(crate) fn current() -> &'static str {
 
 type Index = HashMap<&'static str, &'static str>;
 
+/// Every language with panel rows, for the tests and the missing-strings report.
+#[cfg(test)]
+const ROWS: &[(&str, &[(&str, &str)])] = &[
+    ("ja", JAPANESE),
+    ("zh-hans", SIMPLIFIED_CHINESE),
+    ("zh-hant", TRADITIONAL_CHINESE),
+    ("uk", UKRAINIAN),
+    ("pt-br", PORTUGUESE),
+    ("cs", CZECH),
+    ("es", SPANISH),
+    ("ka", GEORGIAN),
+    ("ka", GEORGIAN_PANELS),
+];
+
 /// The catalog for `language`, indexed by English source (built on first use: panels translate
 /// hundreds of strings a frame); `None` for English and any language that has no rows yet.
 fn catalog(language: &str) -> Option<&'static Index> {
@@ -47,6 +64,7 @@ fn catalog(language: &str) -> Option<&'static Index> {
     static PT_BR: OnceLock<Index> = OnceLock::new();
     static CS: OnceLock<Index> = OnceLock::new();
     static ES: OnceLock<Index> = OnceLock::new();
+    static KA: OnceLock<Index> = OnceLock::new();
     let (index, rows) = match language {
         "ja" => (&JA, JAPANESE),
         "zh-hans" => (&HANS, SIMPLIFIED_CHINESE),
@@ -55,11 +73,69 @@ fn catalog(language: &str) -> Option<&'static Index> {
         "pt-br" => (&PT_BR, PORTUGUESE),
         "cs" => (&CS, CZECH),
         "es" => (&ES, SPANISH),
+        // Georgian also reads its own rows for text the other catalogs don't have yet.
+        "ka" => return Some(KA.get_or_init(|| GEORGIAN.iter().chain(GEORGIAN_PANELS).copied().collect())),
         _ => return None,
     };
     Some(index.get_or_init(|| rows.iter().copied().collect()))
 }
 
+/// The panel strings `language` has no row for, for the missing-strings report: every English
+/// source any catalog lists, in catalog order, then the literals the converted panels pass to `tr`
+/// or `tr_args` that no catalog lists yet.
+#[cfg(test)]
+pub(super) fn missing(language: &str) -> Vec<String> {
+    let table = catalog(language);
+    let rows = ROWS.iter().flat_map(|(_, rows)| rows.iter().map(|(en, _)| en.to_string()));
+    let literals = tests::CONVERTED.iter().flat_map(|(_, src)| tr_literals(src));
+    let mut seen = std::collections::HashSet::new();
+    rows.chain(literals).filter(|en| !table.is_some_and(|c| c.contains_key(en.as_str())) && seen.insert(en.clone())).collect()
+}
+
+/// The string literals `src` passes to `tr(` and `tr_args(`.
+#[cfg(test)]
+fn tr_literals(src: &str) -> Vec<String> {
+    let mut out = Vec::new();
+    for call in ["tr(\"", "tr_args(\""] {
+        for (at, _) in src.match_indices(call) {
+            // `str("` or `attr("` is another call.
+            if src[..at].chars().next_back().is_some_and(|c| c.is_alphanumeric() || c == '_') {
+                continue;
+            }
+            out.extend(string_literal(&src[at + call.len()..]));
+        }
+    }
+    out
+}
+
+/// The text of the string literal `rest` starts inside (just after its opening quote), with the
+/// common escapes resolved; `None` for an escape this doesn't resolve.
+#[cfg(test)]
+fn string_literal(rest: &str) -> Option<String> {
+    let mut out = String::new();
+    let mut chars = rest.chars();
+    while let Some(c) = chars.next() {
+        match c {
+            '"' => return Some(out),
+            '\\' => match chars.next()? {
+                'n' => out.push('\n'),
+                't' => out.push('\t'),
+                c @ ('\\' | '"' | '\'') => out.push(c),
+                _ => return None,
+            },
+            c => out.push(c),
+        }
+    }
+    None
+}
+
+/// Characters required by the fixed panel catalog, for system-font coverage selection.
+/// Sorted and deduplicated so fallback registration is deterministic.
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn catalog_characters(language: &str) -> Vec<char> {
+    catalog(language).into_iter().flat_map(|c| c.values()).flat_map(|s| s.chars()).collect::<std::collections::BTreeSet<_>>().into_iter().collect()
+}
+
 /// Translate one interface string: the current language's row for `text`, or `text` itself.
 pub(crate) fn tr(text: &str) -> &str {
     catalog(current()).and_then(|c| c.get(text)).copied().unwrap_or(text)
@@ -85,7 +161,7 @@ pub(crate) fn tr_args(text: &str, args: &[&dyn Display]) -> String {
     out
 }
 
-/// Japanese: the same rows, in the same order, as the Chinese catalogs below (the tests keep the two in step).
+/// Japanese: the same rows, in the same order, as the Chinese catalogs below.
 const JAPANESE: &[(&str, &str)] = &[
     ("Appearance Settings…", "外観設定…"),
     ("Add to favorites", "お気に入りに追加"),
@@ -221,11 +297,16 @@ const JAPANESE: &[(&str, &str)] = &[
     ("Drag to slip the source", "ドラッグしてソースをスリップ"),
     ("Drop Frame", "ドロップフレーム"),
     ("Duplicate", "複製"),
+    ("Copy", "コピー"),
+    ("Paste", "ペースト"),
+    ("Edit Value…", "値を編集…"),
+    ("Remove Expression", "エクスプレッションを削除"),
     ("Duration:", "デュレーション:"),
     ("Edit Gradient…", "グラデーションを編集…"),
     ("Edit Target: {}", "編集対象：{}"),
     ("Edit in the Timeline", "タイムラインで編集"),
     ("EffectCraft didn't quit normally last time.", "EffectCraftは前回正常に終了しませんでした。"),
+    ("Effects", "エフェクト"),
     ("Effects & Presets options", "エフェクト＆プリセットのオプション"),
     ("Copy Presets Folder Path", "プリセットフォルダーのパスをコピー"),
     ("Copy Source Path", "ソースパスをコピー"),
@@ -254,15 +335,17 @@ const JAPANESE: &[(&str, &str)] = &[
     ("Follow Feature Rotation and Scale", "特徴の回転とスケールに追従"),
     ("Footage: {}", "フッテージ：{}"),
     ("Format: {}", "形式：{}"),
-    ("Frame Aspect Ratio: {}", "フレームアスペクト比：{}"),
+    ("Frame Aspect Ratio: {}", "フレーム縦横比：{}"),
     ("Frame Blending: {}", "フレームブレンド：{}"),
     ("Frame Rate:", "フレームレート:"),
+    ("Resolution:", "解像度:"),
     ("Frame Render Time  {}ms", "フレームのレンダリング時間  {}ms"),
     ("Frame Target:", "フレームターゲット:"),
     ("Freeze", "フリーズ"),
     ("Grab bag", "いろいろ"),
     ("Gradient Editor", "グラデーションエディター"),
     ("Grid", "グリッド"),
+    ("Guide Layer", "ガイドレイヤー"),
     ("Guide Layers: {}", "ガイドレイヤー：{}"),
     ("Guides", "ガイド"),
     ("Height:", "高さ:"),
@@ -288,7 +371,6 @@ const JAPANESE: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "最新の自動保存：{}"),
     ("Layer", "レイヤー"),
     ("Layer controls", "レイヤーコントロール"),
-    ("Layer {}", "レイヤー{}"),
     ("Layer:", "レイヤー:"),
     ("Layer: {}", "レイヤー：{}"),
     ("Layer Styles", "レイヤースタイル"),
@@ -302,7 +384,7 @@ const JAPANESE: &[(&str, &str)] = &[
     ("Lighter", "明るく"),
     ("Link Selected Property", "選択したプロパティをリンク"),
     ("Location:", "位置:"),
-    ("Lock Aspect Ratio to {}", "アスペクト比を{}に固定"),
+    ("Lock Aspect Ratio to {}", "縦横比を {} に固定"),
     ("Lock to Zoom", "ズームにロック"),
     ("Locked: {} — {}", "ロック済み：{} — {}"),
     ("Log:", "ログ:"),
@@ -385,7 +467,7 @@ const JAPANESE: &[(&str, &str)] = &[
     ("Overlay", "オーバーレイ"),
     ("Parameter Name:", "パラメーター名:"),
     ("Parent pick whip: drag onto a layer", "親ピックウィップ：レイヤー上にドラッグ"),
-    ("Pixel Aspect Ratio:", "ピクセルアスペクト比:"),
+    ("Pixel Aspect Ratio:", "ピクセル縦横比:"),
     ("Playing on Video Preview", "ビデオプレビューで再生中"),
     ("Post-Render Action: {}", "レンダリング後の処理：{}"),
     ("Preserve frame rate when nested or in render queue", "ネスト時またはレンダーキュー内でフレームレートを保持"),
@@ -633,6 +715,189 @@ const JAPANESE: &[(&str, &str)] = &[
     ("After Effects project", "After Effectsプロジェクト"),
     ("Lottie animation", "Lottieアニメーション"),
     ("Project", "プロジェクト"),
+    ("General", "一般"),
+    ("Language", "言語"),
+    ("Levels of Undo", "取り消しレベル"),
+    ("Path Point and Handle Size", "パスポイントとハンドルサイズ"),
+    ("Recent Projects Shown", "最近使用したプロジェクトの表示数"),
+    ("Options", "オプション"),
+    ("Show Tool Tips", "ツールヒントを表示"),
+    ("Create Layers at Composition Start Time", "レイヤーをコンポジションの開始時間に作成"),
+    ("Switches Affect Nested Comps", "ネストしたコンポジションにスイッチを適用"),
+    ("Default Spatial Interpolation to Linear", "初期設定の空間補間法にリニアを使用"),
+    ("Preserve Constant Vertex and Feather Point Count when Editing Masks", "マスク編集時に一定の頂点数とぼかしポイント数を保持"),
+    ("Synchronize Time of All Related Items", "すべての関連アイテムの時間を同期"),
+    ("Expression Pick Whip Writes Compact English", "ピックウィップによる簡潔な英語でのエクスプレッションの記述"),
+    ("Create Split Layers Above Original Layer", "元のレイヤーの上に分割したレイヤーを作成"),
+    ("Use System Color Picker", "システムのカラーピッカーを使用"),
+    (
+        "EffectCraft always uses its own colour picker (the same on every platform and the web).",
+        "EffectCraftは常に独自のカラーピッカーを使用します（すべてのプラットフォームとWeb版で同じです）。",
+    ),
+    ("Startup & Repair", "起動と修復"),
+    ("Show Home Screen When Launching", "起動時にホーム画面を表示"),
+    ("Show Home Screen When Opening a Project", "プロジェクトを開くときにホーム画面を表示"),
+    ("Offer to Open the Latest Auto-Save After a Crash", "クラッシュ後に最新の自動保存を開くか確認する"),
+    ("Window Graphics", "ウィンドウグラフィックス"),
+    ("Automatic", "自動"),
+    (
+        "Window Graphics applies from the next launch. When the graphics driver stops EffectCraft as its window opens, the next launch switches to OpenGL.",
+        "ウィンドウグラフィックスは次回の起動から適用されます。ウィンドウを開くときにグラフィックスドライバーがEffectCraftを停止させた場合、次回の起動ではOpenGLに切り替わります。",
+    ),
+    ("Repair", "修復"),
+    ("Reset Settings", "設定をリセット"),
+    ("Reset Keyboard Shortcuts", "キーボードショートカットをリセット"),
+    ("Empty Disk Cache", "ディスクキャッシュを空にする"),
+    ("New Project Loads Template", "新規プロジェクト読み込みテンプレート"),
+    ("Template Project", "テンプレートプロジェクト"),
+    ("Auto-Save", "自動保存"),
+    ("Automatically Save Projects", "プロジェクトを自動保存"),
+    ("Save Every", "保存の間隔"),
+    ("Minutes", "分"),
+    ("Maximum Project Versions", "プロジェクトバージョンの最大数"),
+    ("Auto-Save Location", "自動保存の場所"),
+    ("Next to Project", "プロジェクトの横"),
+    ("Custom Location", "ユーザー定義の場所"),
+    ("Save When Starting Render Queue", "レンダーキューの開始時に保存"),
+    ("Save Now", "今すぐ保存"),
+    ("Motion Path", "モーションパス"),
+    ("All Keyframes", "すべてのキーフレーム"),
+    ("No Motion Path", "モーションパスなし"),
+    ("No More Than (Seconds)", "次の秒数以下"),
+    ("No More Than (Keyframes)", "次のキーフレーム以下"),
+    ("Seconds", "秒"),
+    ("Keyframes", "キーフレーム"),
+    ("Display", "表示"),
+    ("Show Rendering Progress in Info Panel and Flowchart", "情報パネルとフローチャートにレンダリングの進行状況を表示"),
+    ("Hardware Accelerate Composition, Layer and Footage Panels", "ハードウェアによるコンポジション、レイヤー、フッテージパネルの高速化"),
+    ("Panels are always drawn by the GPU (wgpu).", "パネルは常にGPU（wgpu）で描画されます。"),
+    ("Previews", "プレビュー"),
+    ("Adaptive Resolution Limit", "適応解像度の上限"),
+    ("Show Internal Wireframes", "内部ワイヤーフレームを表示"),
+    ("Cache Frames When Idle", "アイドル時にフレームをキャッシュ"),
+    ("Viewer Zoom Quality", "ズームの画質"),
+    ("Faster", "高速"),
+    ("More Accurate", "精度を優先"),
+    ("Display Color Space", "表示色空間"),
+    ("GPU Information...", "GPU 情報..."),
+    ("Appearance", "外観"),
+    ("Brightness", "明るさ"),
+    ("UI Scale", "UI スケール"),
+    ("Labels and Colors", "ラベルとカラー"),
+    ("Use Label Color for Layer Handles and Paths", "レイヤーハンドルとパスにラベルカラーを使用"),
+    ("Use Label Color for Related Tabs", "ラベルカラーを関連するタブに使用"),
+    ("Cycle Mask Colors", "新規マスクに別のカラーを使用"),
+    ("Use Gradients", "グラデーションを使用"),
+    ("Menu Bar", "メニューバー"),
+    ("Grids & Guides", "グリッド＆ガイド"),
+    ("Gridline Every", "グリッドの間隔"),
+    ("Subdivisions", "分割数"),
+    ("Style", "スタイル"),
+    ("Lines", "線"),
+    ("Dashed Lines", "破線"),
+    ("Dots", "ドット"),
+    ("Horizontal", "水平方向"),
+    ("Vertical", "垂直方向"),
+    ("Safe Margins", "セーフマージン"),
+    ("Action-safe", "アクションセーフ"),
+    ("Title-safe", "タイトルセーフ"),
+    ("Labels", "ラベル"),
+    ("Text Engine", "テキストエンジン"),
+    ("Latin", "ラテン"),
+    ("South Asian and Middle Eastern", "南アジアおよび中東"),
+    ("Show Font Preview", "フォントのプレビューを表示"),
+    ("Number of Recent Fonts to Display", "最近使用したフォントの表示数"),
+    ("Show Font Names in English", "フォント名を英語で表示"),
+    ("Still Footage", "静止画フッテージ"),
+    ("Length of Composition", "コンポジションの長さ"),
+    ("Duration (Seconds)", "デュレーション（秒）"),
+    ("Still Duration", "静止画のデュレーション"),
+    ("Sequence Footage", "シーケンスフッテージ"),
+    ("Report Missing Frames", "不明なフレームをレポート"),
+    ("Automatically Reload Footage", "フッテージの自動再読み込み"),
+    ("Off", "オフ"),
+    ("Non-Sequence Footage", "非シーケンスフッテージ"),
+    ("All Footage", "すべてのフッテージ"),
+    ("Ask User", "ユーザーに確認"),
+    ("Guess", "推測"),
+    ("Ignore", "無視"),
+    ("Straight", "そのまま"),
+    ("Premultiplied", "プリマルチプライ"),
+    ("Default Drag Import As", "複数アイテムのドラッグ読み込みの初期設定"),
+    ("Footage", "フッテージ"),
+    ("Composition - Retain Layer Sizes", "コンポジション - レイヤーサイズを保持"),
+    ("Export", "書き出し"),
+    ("Default Output Folder", "既定の出力フォルダー"),
+    ("Segment Sequences", "シーケンスをセグメント化"),
+    ("Files per Segment", "セグメントあたりのファイル数"),
+    ("files", "ファイル"),
+    ("Segment Movie Files", "ムービーファイルをセグメント化"),
+    ("Segment Size", "セグメントサイズ"),
+    ("Append Bit Depth to File Name", "ファイル名にビット深度を追加"),
+    ("Audio", "オーディオ"),
+    ("Audio Hardware", "オーディオハードウェア"),
+    ("Preview Sample Rate", "サンプルレート"),
+    ("Audio Output Mapping", "オーディオ出力マッピング"),
+    ("Left", "左"),
+    ("Right", "右"),
+    ("channel", "チャンネル"),
+    ("Disk", "ディスク"),
+    ("Disk Cache", "ディスクキャッシュ"),
+    ("Enable Disk Cache", "ディスクキャッシュを有効にする"),
+    ("Maximum Disk Cache Size", "最大ディスクキャッシュサイズ"),
+    ("Disk Cache Folder", "ディスクキャッシュフォルダー"),
+    ("Media Cache", "メディアキャッシュ"),
+    ("Database and Cache Folder", "データベースとキャッシュのフォルダー"),
+    ("Conformed Audio Folder", "適合オーディオフォルダー"),
+    ("Memory & CPU", "メモリと CPU"),
+    ("RAM Reserved for Other Applications", "他のアプリケーション用に確保する RAM"),
+    ("Cache Budgets", "キャッシュの割り当て"),
+    ("Layer Cache", "レイヤーキャッシュ"),
+    ("Footage Frame Cache", "フッテージフレームキャッシュ"),
+    ("Preview (RAM) Cache", "プレビュー（RAM）キャッシュ"),
+    ("Reduce Cache Size When System Is Low on Memory", "システムのメモリが不足しているときにキャッシュサイズを減らす"),
+    ("Video", "ビデオ"),
+    ("Enable Video Preview Output", "ビデオプレビュー出力を有効にする"),
+    ("Video Device", "ビデオデバイス"),
+    ("Floating Window", "フローティングウィンドウ"),
+    ("Full Screen", "全画面"),
+    ("Video Output During Playback", "再生中のビデオ出力"),
+    ("Mirror on Computer Monitor", "コンピューターモニターにミラーリング"),
+    ("Disable Video Output When in Background", "バックグラウンド動作時のビデオ出力を無効にする"),
+    ("Default 3D Renderer", "既定の 3D レンダラー"),
+    ("Show 3D Reference Axes", "3D参照軸を表示"),
+    ("Extended Viewer", "拡張ビューアー"),
+    ("Realtime Shadows in Draft", "ドラフトのリアルタイムシャドウ"),
+    ("Scripting & Expressions", "スクリプトとエクスプレッション"),
+    ("Application Scripting", "アプリケーションのスクリプト"),
+    ("Allow Scripts to Write Files and Access Network", "スクリプトによるファイルへの書き込みとネットワークへのアクセスを許可"),
+    ("Warn User When Executing Files", "ファイルの実行時にカーソルに警告"),
+    ("Enable JavaScript Debugger", "JavaScript デバッガーを使用"),
+    ("Expressions Editor", "エクスプレッションエディター"),
+    ("Font Size", "フォントサイズ"),
+    ("Syntax Highlighting", "構文のハイライト"),
+    ("Line Numbers", "行番号を表示"),
+    ("Auto-complete", "オートコンプリート"),
+    ("Bracket Matching", "対応する括弧をハイライト"),
+    ("Word Wrap", "折り返し"),
+    ("Show Expression Error Banner", "式のエラーがある場合に警告バナーを表示"),
+    (
+        "Expressions use the JavaScript engine. Script errors report their file and line in the Script Console; there is no step debugger.",
+        "エクスプレッションはJavaScriptエンジンを使用します。スクリプトのエラーはファイルと行をスクリプトコンソールに報告します。ステップ実行デバッガーはありません。",
+    ),
+    ("Roto Brush", "ロトブラシ"),
+    ("Segmentation Model", "セグメンテーションモデル"),
+    (
+        "Roto Brush 2.0 and 3.0 use the model chosen here (Version 1.0 always uses the classic engine). Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+        "ロトブラシ2.0と3.0はここで選んだモデルを使用します（バージョン1.0は常に従来のエンジンを使用します）。モデルはオープンソースで、要求したときだけダウンロードされ、公開されているSHA-256と照合されます。",
+    ),
+    ("Face Tracking", "フェイストラッキング"),
+    ("Face Model", "フェイスモデル"),
+    (
+        "Face tracking in the Tracker panel (Outline Only and Detailed Features) uses the model chosen here. Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+        "トラッカーパネルのフェイストラッキング（輪郭のみと詳細機能）はここで選んだモデルを使用します。モデルはオープンソースで、要求したときだけダウンロードされ、公開されているSHA-256と照合されます。",
+    ),
+    ("Match System", "システムに合わせる"),
     ("Total Offset", "合計オフセット"),
     ("Per Layer", "レイヤーごと"),
     ("Track", "トラック"),
@@ -767,11 +1032,16 @@ const SIMPLIFIED_CHINESE: &[(&str, &str)] = &[
     ("Drag to slip the source", "拖动可滑移源"),
     ("Drop Frame", "丢帧"),
     ("Duplicate", "重复"),
+    ("Copy", "复制"),
+    ("Paste", "粘贴"),
+    ("Edit Value…", "编辑值…"),
+    ("Remove Expression", "移除表达式"),
     ("Duration:", "持续时间："),
     ("Edit Gradient…", "编辑渐变…"),
     ("Edit Target: {}", "编辑目标：{}"),
     ("Edit in the Timeline", "在时间轴中编辑"),
     ("EffectCraft didn't quit normally last time.", "EffectCraft 上次未正常退出。"),
+    ("Effects", "效果"),
     ("Effects & Presets options", "效果和预设选项"),
     ("Copy Presets Folder Path", "复制预设文件夹路径"),
     ("Copy Source Path", "复制源路径"),
@@ -803,12 +1073,14 @@ const SIMPLIFIED_CHINESE: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "帧长宽比：{}"),
     ("Frame Blending: {}", "帧混合：{}"),
     ("Frame Rate:", "帧速率："),
+    ("Resolution:", "分辨率："),
     ("Frame Render Time  {}ms", "帧渲染时间  {} 毫秒"),
     ("Frame Target:", "帧目标："),
     ("Freeze", "冻结"),
     ("Grab bag", "列表"),
     ("Gradient Editor", "渐变编辑器"),
     ("Grid", "网格"),
+    ("Guide Layer", "参考线图层"),
     ("Guide Layers: {}", "参考图层：{}"),
     ("Guides", "参考线"),
     ("Height:", "高度："),
@@ -834,7 +1106,6 @@ const SIMPLIFIED_CHINESE: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "最新的自动保存：{}"),
     ("Layer", "图层"),
     ("Layer controls", "图层控制"),
-    ("Layer {}", "图层 {}"),
     ("Layer:", "图层："),
     ("Layer: {}", "图层：{}"),
     ("Layer Styles", "图层样式"),
@@ -1059,7 +1330,7 @@ const SIMPLIFIED_CHINESE: &[(&str, &str)] = &[
     ("Transparency grid", "透明网格"),
     ("Tutorial complete", "教程完成"),
     ("Two-Node Camera", "双节点摄像机"),
-    ("Type", "文字"),
+    ("Type", "类型"),
     ("Type a command or effect…", "输入命令或效果…"),
     ("URL:", "URL："),
     ("Undock Panel", "取消停靠面板"),
@@ -1501,11 +1772,16 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
     ("Drag to slip the source", "拖曳可滑移源"),
     ("Drop Frame", "丟格"),
     ("Duplicate", "重複"),
+    ("Copy", "拷貝"),
+    ("Paste", "貼上"),
+    ("Edit Value…", "編輯值…"),
+    ("Remove Expression", "移除運算式"),
     ("Duration:", "持續時間："),
     ("Edit Gradient…", "編輯漸變…"),
     ("Edit Target: {}", "編輯目標：{}"),
     ("Edit in the Timeline", "在時間軸中編輯"),
     ("EffectCraft didn't quit normally last time.", "EffectCraft 上次未正常結束。"),
+    ("Effects", "效果"),
     ("Effects & Presets options", "效果和預設集選項"),
     ("Copy Presets Folder Path", "複製預設集資料夾路徑"),
     ("Copy Source Path", "複製來源路徑"),
@@ -1537,12 +1813,14 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "影格長寬比：{}"),
     ("Frame Blending: {}", "影格混合：{}"),
     ("Frame Rate:", "影格速率："),
+    ("Resolution:", "解析度："),
     ("Frame Render Time  {}ms", "影格算圖時間  {} 毫秒"),
     ("Frame Target:", "幀目標："),
     ("Freeze", "凍結"),
     ("Grab bag", "清單"),
     ("Gradient Editor", "漸變編輯器"),
     ("Grid", "格點"),
+    ("Guide Layer", "參考圖層"),
     ("Guide Layers: {}", "參考圖層：{}"),
     ("Guides", "參考線"),
     ("Height:", "高度："),
@@ -1568,7 +1846,6 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "最新的自動儲存：{}"),
     ("Layer", "圖層"),
     ("Layer controls", "圖層控制"),
-    ("Layer {}", "圖層 {}"),
     ("Layer:", "圖層："),
     ("Layer: {}", "圖層：{}"),
     ("Layer Styles", "圖層樣式"),
@@ -1793,7 +2070,7 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
     ("Transparency grid", "透明格點"),
     ("Tutorial complete", "教學完成"),
     ("Two-Node Camera", "雙節點攝影機"),
-    ("Type", "文字"),
+    ("Type", "類型"),
     ("Type a command or effect…", "輸入命令或效果…"),
     ("URL:", "URL："),
     ("Undock Panel", "取消停靠面板"),
@@ -1826,59 +2103,10 @@ const TRADITIONAL_CHINESE: &[(&str, &str)] = &[
     ("⌘/Ctrl-drag a pin to record its motion", "⌘/Ctrl 拖曳釘選點可記錄其運動"),
     ("▣ {}", "▣ {}"),
     ("⚠ {} is used by:", "⚠ {} 已被以下專案使用："),
-    // The same rows as the Simplified catalog (the tests require both lists to match). The
-    // Traditional wording is the translator's call and is left as the English source for now.
-    ("3D Reference Axes", "3D Reference Axes"),
-    ("Affect all layers that use this solid", "Affect all layers that use this solid"),
-    ("Choose grid and guide options", "Choose grid and guide options"),
-    ("Colorize", "Colorize"),
-    ("Custom", "Custom"),
-    ("Custom...", "Custom..."),
-    ("Fit", "Fit"),
-    ("Fit up to 100%", "Fit up to 100%"),
-    ("Full", "Full"),
-    ("Half", "Half"),
-    ("Only this layer uses this solid.", "Only this layer uses this solid."),
-    ("Proportional Grid", "Proportional Grid"),
-    ("Quarter", "Quarter"),
-    ("Region of Interest", "Region of Interest"),
-    ("Reset Exposure", "Reset Exposure"),
-    ("Show Channel and Color Management Settings", "Show Channel and Color Management Settings"),
-    ("Show Snapshot (hold)", "Show Snapshot (hold)"),
-    ("Take Snapshot", "Take Snapshot"),
-    ("Third", "Third"),
-    ("Toggle Mask and Shape Path Visibility", "Toggle Mask and Shape Path Visibility"),
-    ("Toggle Transparency Grid", "Toggle Transparency Grid"),
-    ("16 bits per channel", "16 bits per channel"),
-    ("32 bits per channel (float)", "32 bits per channel (float)"),
-    ("8 bits per channel", "8 bits per channel"),
-    ("Adaptive Resolution", "Adaptive Resolution"),
-    ("Adobe-style built-in", "Adobe-style built-in"),
     ("Blue", "藍色"),
-    ("Current Settings", "Current Settings"),
-    ("Disable Per-character 3D", "Disable Per-character 3D"),
-    ("Draft", "Draft"),
-    ("Enable Per-character 3D", "Enable Per-character 3D"),
-    ("Fast Draft", "Fast Draft"),
-    ("Fast Previews (Draft 3D, Faster Effects)", "Fast Previews (Draft 3D, Faster Effects)"),
     ("Green", "綠色"),
-    ("Import Image Sequence", "Import Image Sequence"),
-    ("Import PDF / Illustrator File", "Import PDF / Illustrator File"),
-    ("Import Photoshop File", "Import Photoshop File"),
-    ("Interpret Unlabeled Alpha As", "Interpret Unlabeled Alpha As"),
     ("Join the ArtCraft Discord", "加入 ArtCraft Discord"),
-    ("Mercury GPU Acceleration ({})", "Mercury GPU Acceleration ({})"),
-    ("Mercury Software Only", "Mercury Software Only"),
-    ("OCIO (built-in ACES config)", "OCIO (built-in ACES config)"),
-    ("Off (Final Quality)", "Off (Final Quality)"),
-    ("OpenGL (compatibility)", "OpenGL (compatibility)"),
-    ("Opus Bitrate: {} kbps", "Opus Bitrate: {} kbps"),
-    ("RGB Straight", "RGB Straight"),
     ("Red", "紅色"),
-    ("Tone map", "Tone map"),
-    ("Use In-Window Menu Bar on macOS", "Use In-Window Menu Bar on macOS"),
-    ("Wireframe", "Wireframe"),
-    ("sRGB IEC61966-2.1 (default)", "sRGB IEC61966-2.1 (default)"),
     // The Home screen (#574).
     ("New Project", "新增專案"),
     ("Open Project…", "開啟專案…"),
@@ -2238,11 +2466,16 @@ const UKRAINIAN: &[(&str, &str)] = &[
     ("Drag to slip the source", "Перетягніть, щоб зсунути матеріал у межах шару"),
     ("Drop Frame", "Пропуск номерів"),
     ("Duplicate", "Дублювати"),
+    ("Copy", "Копіювати"),
+    ("Paste", "Вставити"),
+    ("Edit Value…", "Редагувати значення…"),
+    ("Remove Expression", "Вилучити вираз"),
     ("Duration:", "Тривалість:"),
     ("Edit Gradient…", "Редагувати градієнт…"),
     ("Edit Target: {}", "Ціль редагування: {}"),
     ("Edit in the Timeline", "Редагувати на шкалі часу"),
     ("EffectCraft didn't quit normally last time.", "Минулого разу EffectCraft завершив роботу некоректно."),
+    ("Effects", "Ефекти"),
     ("Effects & Presets options", "Параметри ефектів і наборів"),
     ("Copy Presets Folder Path", "Копіювати шлях до папки наборів"),
     ("Copy Source Path", "Копіювати шлях до джерела"),
@@ -2274,12 +2507,14 @@ const UKRAINIAN: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "Пропорції кадру: {}"),
     ("Frame Blending: {}", "Змішування кадрів: {}"),
     ("Frame Rate:", "Частота кадрів:"),
+    ("Resolution:", "Роздільність:"),
     ("Frame Render Time  {}ms", "Час рендерингу кадру  {} мс"),
     ("Frame Target:", "Цільовий фрейм:"),
     ("Freeze", "Заморозити"),
     ("Grab bag", "Список"),
     ("Gradient Editor", "Редактор градієнта"),
     ("Grid", "Сітка"),
+    ("Guide Layer", "Допоміжний шар"),
     ("Guide Layers: {}", "Допоміжні шари: {}"),
     ("Guides", "Напрямні"),
     ("Height:", "Висота:"),
@@ -2305,7 +2540,6 @@ const UKRAINIAN: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "Останнє автозбереження: {}"),
     ("Layer", "Шар"),
     ("Layer controls", "Керування шарами"),
-    ("Layer {}", "Шар {}"),
     ("Layer:", "Шар:"),
     ("Layer: {}", "Шар: {}"),
     ("Layer Styles", "Стилі шару"),
@@ -2792,11 +3026,16 @@ const PORTUGUESE: &[(&str, &str)] = &[
     ("Drag to slip the source", "Arraste para deslizar a origem"),
     ("Drop Frame", "Drop frame"),
     ("Duplicate", "Duplicar"),
+    ("Copy", "Copiar"),
+    ("Paste", "Colar"),
+    ("Edit Value…", "Editar valor…"),
+    ("Remove Expression", "Remover expressão"),
     ("Duration:", "Duração:"),
     ("Edit Gradient…", "Editar gradiente…"),
     ("Edit Target: {}", "Editar destino: {}"),
     ("Edit in the Timeline", "Editar na linha do tempo"),
     ("EffectCraft didn't quit normally last time.", "O EffectCraft não foi encerrado normalmente da última vez."),
+    ("Effects", "Efeitos"),
     ("Effects & Presets options", "Opções de Efeitos e predefinições"),
     ("Copy Presets Folder Path", "Copiar caminho da pasta de predefinições"),
     ("Copy Source Path", "Copiar caminho da origem"),
@@ -2828,10 +3067,12 @@ const PORTUGUESE: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "Proporção do quadro: {}"),
     ("Frame Blending: {}", "Mesclagem de quadros: {}"),
     ("Frame Rate:", "Taxa de quadros:"),
+    ("Resolution:", "Resolução:"),
     ("Frame Render Time  {}ms", "Tempo de renderização do quadro  {}ms"),
     ("Frame Target:", "Destino do quadro:"),
     ("Grab bag", "Lista"),
     ("Grid", "Grade"),
+    ("Guide Layer", "Camada de guia"),
     ("Guide Layers: {}", "Camadas de guia: {}"),
     ("Guides", "Guias"),
     ("Height:", "Altura:"),
@@ -2857,7 +3098,6 @@ const PORTUGUESE: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "Último salvamento automático: {}"),
     ("Layer", "Camada"),
     ("Layer controls", "Controles da camada"),
-    ("Layer {}", "Camada {}"),
     ("Layer:", "Camada:"),
     ("Layer: {}", "Camada: {}"),
     ("Layer Styles", "Estilos de camada"),
@@ -3244,11 +3484,16 @@ const CZECH: &[(&str, &str)] = &[
     ("Drag to slip the source", "Tažením posunete zdroj v čase"),
     ("Drop Frame", "Vynechávat čísla snímků"),
     ("Duplicate", "Duplikovat"),
+    ("Copy", "Kopírovat"),
+    ("Paste", "Vložit"),
+    ("Edit Value…", "Upravit hodnotu…"),
+    ("Remove Expression", "Odstranit výraz"),
     ("Duration:", "Délka trvání:"),
     ("Edit Gradient…", "Upravit přechod…"),
     ("Edit Target: {}", "Upravit cíl: {}"),
     ("Edit in the Timeline", "Upravit na časové ose"),
     ("EffectCraft didn't quit normally last time.", "EffectCraft nebyl při posledním použití ukončen běžným způsobem."),
+    ("Effects", "Efekty"),
     ("Effects & Presets options", "Možnosti efektů a přednastavení"),
     ("Copy Presets Folder Path", "Kopírovat cestu ke složce přednastavení"),
     ("Copy Source Path", "Kopírovat cestu ke zdroji"),
@@ -3280,11 +3525,13 @@ const CZECH: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "Poměr stran snímku: {}"),
     ("Frame Blending: {}", "Prolnutí snímků: {}"),
     ("Frame Rate:", "Snímková frekvence:"),
+    ("Resolution:", "Rozlišení:"),
     ("Frame Render Time  {}ms", "Čas vykreslení snímku  {}ms"),
     ("Frame Target:", "Cílový rámec:"),
     ("Freeze", "Zmrazit"),
     ("Grab bag", "Mozaika"),
     ("Grid", "Mřížka"),
+    ("Guide Layer", "Pomocná vrstva"),
     ("Guide Layers: {}", "Pomocné vrstvy: {}"),
     ("Guides", "Vodítka"),
     ("Height:", "Výška:"),
@@ -3310,7 +3557,6 @@ const CZECH: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "Nejnovější automatická záloha: {}"),
     ("Layer", "Vrstva"),
     ("Layer controls", "Ovládací prvky vrstvy"),
-    ("Layer {}", "Vrstva {}"),
     ("Layer:", "Vrstva:"),
     ("Layer: {}", "Vrstva: {}"),
     ("Layer Styles", "Styly vrstvy"),
@@ -3803,11 +4049,16 @@ const SPANISH: &[(&str, &str)] = &[
     ("Drag to slip the source", "Arrastra para deslizar el origen"),
     ("Drop Frame", "Drop frame"),
     ("Duplicate", "Duplicar"),
+    ("Copy", "Copiar"),
+    ("Paste", "Pegar"),
+    ("Edit Value…", "Editar valor…"),
+    ("Remove Expression", "Quitar expresión"),
     ("Duration:", "Duración:"),
     ("Edit Gradient…", "Editar degradado…"),
     ("Edit Target: {}", "Destino de la edición: {}"),
     ("Edit in the Timeline", "Editar en la cronología"),
     ("EffectCraft didn't quit normally last time.", "EffectCraft no se cerró normalmente la última vez."),
+    ("Effects", "Efectos"),
     ("Effects & Presets options", "Opciones de Efectos y ajustes preestablecidos"),
     ("Effects: {}", "Efectos: {}"),
     ("Empty folder", "Carpeta vacía"),
@@ -3837,6 +4088,7 @@ const SPANISH: &[(&str, &str)] = &[
     ("Frame Aspect Ratio: {}", "Relación de aspecto del fotograma: {}"),
     ("Frame Blending: {}", "Fusión de fotogramas: {}"),
     ("Frame Rate:", "Velocidad de fotogramas:"),
+    ("Resolution:", "Resolución:"),
     ("Frame Render Time  {}ms", "Tiempo de procesamiento del fotograma  {}ms"),
     ("Frame Target:", "Marco de destino:"),
     ("Freeze", "Congelar"),
@@ -3868,7 +4120,6 @@ const SPANISH: &[(&str, &str)] = &[
     ("Latest auto-save: {}", "Último guardado automático: {}"),
     ("Layer", "Capa"),
     ("Layer controls", "Controles de capa"),
-    ("Layer {}", "Capa {}"),
     ("Layer:", "Capa:"),
     ("Layer: {}", "Capa: {}"),
     ("Layer Styles", "Estilos de capa"),
@@ -4214,17 +4465,981 @@ const SPANISH: &[(&str, &str)] = &[
     ("Project", "Proyecto"),
 ];
 
+/// Georgian (ka): every row of the Chinese catalogs, in the same order (the tests keep them in step).
+const GEORGIAN: &[(&str, &str)] = &[
+    ("Appearance Settings…", "იერსახის პარამეტრები…"),
+    ("Add to favorites", "რჩეულებში დამატება"),
+    ("Remove from favorites", "რჩეულებიდან ამოშლა"),
+    ("   OK   ", "   OK   "),
+    ("  Delete  ", "  წაშლა  "),
+    (" Open Auto-Save ", " ავტოშენახვის გახსნა "),
+    ("(missing)", "(აკლია)"),
+    ("360 View Orientation", "360° ხედის ორიენტაცია"),
+    ("3:2 Pulldown: {}", "3:2 Pulldown: {}"),
+    (
+        "A clean-room, open-source compositor for motion graphics and visual effects: native on macOS, Windows and Linux, and in the browser. Part of the ArtCraft family of creative apps.",
+        "სუფთა ოთახის მეთოდით შექმნილი, ღია კოდის კომპოზიტორი მოძრავი გრაფიკისა და ვიზუალური ეფექტებისთვის: ნატიურად მუშაობს macOS-ზე, Windows-სა და Linux-ზე, ასევე ბრაუზერში. ArtCraft-ის შემოქმედებითი აპების ოჯახის ნაწილი.",
+    ),
+    ("About EffectCraft", "EffectCraft-ის შესახებ"),
+    ("About...", "პროგრამის შესახებ..."),
+    ("Active", "აქტიური"),
+    ("Active Camera", "აქტიური კამერა"),
+    ("Alpha", "ალფა"),
+    ("Adapt Feature On Every Frame", "მახასიათებლის განახლება ყოველ კადრზე"),
+    ("Adaptive Sample Limit:", "ადაპტური ნიმუშების ზღვარი:"),
+    ("Add Animator", "ანიმატორის დამატება"),
+    ("Add Comment", "კომენტარის დამატება"),
+    ("Add Formatting", "ფორმატირების დამატება"),
+    ("Add Group", "ჯგუფის დამატება"),
+    ("Add Mirror", "სარკის დამატება"),
+    ("Add Selected As", "მონიშნულის დამატება როგორც"),
+    ("Add a comment", "კომენტარის დამატება"),
+    ("Add a shape, fill, stroke or path operation", "ფიგურის, შევსების, კონტურის ან ტრაექტორიის ოპერაციის დამატება"),
+    ("Add to Composition", "კომპოზიციაში დამატება"),
+    ("Add to Favorites", "რჩეულებში დამატება"),
+    ("Add:", "დამატება:"),
+    ("Adjust Exposure (stops)", "ექსპოზიციის კორექცია (საფეხურები)"),
+    ("Adjust composition duration to the time span of the selected layers", "კომპოზიციის ხანგრძლივობის მორგება მონიშნული შრეების დროის შუალედზე"),
+    ("Advanced 3D", "გაფართოებული 3D"),
+    ("Align Layers to:", "შრეების სწორება:"),
+    ("All six face cameras turn together; the scene is not changed.", "სახეების ექვსივე კამერა ერთად ბრუნავს; სცენა არ იცვლება."),
+    ("Anchor:", "მიმაგრება:"),
+    ("Aperture", "დიაფრაგმა"),
+    ("Appearance Mode", "იერსახის რეჟიმი"),
+    ("Appearance Mode: {}", "იერსახის რეჟიმი: {}"),
+    ("Apply Dimensions:", "განზომილებების გამოყენება:"),
+    ("Apply Motion To:", "მოძრაობის გამოყენება:"),
+    ("Arrange", "დალაგება"),
+    ("Assign", "მინიჭება"),
+    ("Auto", "ავტომატური"),
+    ("Auto-saves", "ავტოშენახვები"),
+    ("Back", "უკან"),
+    ("Background Color:", "ფონის ფერი:"),
+    ("Blend Mode:", "შერევის რეჟიმი:"),
+    ("Blending Mode", "შერევის რეჟიმი"),
+    ("Blur", "გაბუნდოვნება"),
+    ("Blur Level", "გაბუნდოვნების დონე"),
+    ("Boundary", "საზღვარი"),
+    ("Browser Storage", "ბრაუზერის მეხსიერება"),
+    ("Browse…", "არჩევა…"),
+    ("Brush Dynamics", "ფუნჯის დინამიკა"),
+    ("Caching frames…", "კადრების ქეშირება…"),
+    ("Cancel", "გაუქმება"),
+    ("Casts Shadows", "ჩრდილს აგდებს"),
+    ("Change Renderer…", "რენდერერის შეცვლა…"),
+    ("Changing a shortcut creates a custom preset; the default stays as it is.", "მალსახმობის შეცვლა ქმნის მორგებულ პრესეტს; ნაგულისხმევი უცვლელი რჩება."),
+    ("Channel", "არხი"),
+    ("Channel:", "არხი:"),
+    ("Chapter:", "თავი:"),
+    ("Choose...", "არჩევა..."),
+    ("Classic 3D", "კლასიკური 3D"),
+    ("Clear", "გასუფთავება"),
+    ("Clear list", "სიის გასუფთავება"),
+    ("Click a key to see its commands.", "დაწკაპეთ კლავიშზე მისი ბრძანებების სანახავად."),
+    (
+        "Click above the bar to add an opacity stop, below it to add a color stop.",
+        "დაწკაპეთ ზოლის ზემოთ გაუმჭვირვალობის გადასვლის წერტილის დასამატებლად, ქვემოთ — ფერის გადასვლის წერტილის დასამატებლად.",
+    ),
+    ("Click adds a point (½ height = no change)", "დაწკაპუნება ამატებს წერტილს (½ სიმაღლე = ცვლილების გარეშე)"),
+    ("Click adds a point; drag one off to remove", "დაწკაპუნება ამატებს წერტილს; მის მოსაშორებლად გადაათრიეთ გარეთ"),
+    ("Click to make this viewer active", "დაწკაპეთ ამ დამთვალიერებელის გასააქტიურებლად"),
+    ("Click to reveal the expression in the timeline", "დაწკაპეთ ექსპრესიის დროის ხაზზე საჩვენებლად"),
+    ("Click to show the active composition here", "დაწკაპეთ აქტიური კომპოზიციის აქ საჩვენებლად"),
+    ("Click, then click in the Composition panel", "დაწკაპეთ, შემდეგ კი დაწკაპეთ კომპოზიციის პანელში"),
+    ("Clone Options", "კლონირების პარამეტრები"),
+    ("Clone Source Overlay:", "კლონირების წყაროს გადაფარვა:"),
+    ("Close", "დახურვა"),
+    ("Close Panel", "პანელის დახურვა"),
+    ("Close tutorial", "გაკვეთილის დახურვა"),
+    ("Color", "ფერი"),
+    ("Color Depth: {}", "ფერის სიღრმე: {}"),
+    ("Color:", "ფერი:"),
+    ("Colour map", "ფერების რუკა"),
+    ("Columns", "სვეტები"),
+    ("Comment:", "კომენტარი:"),
+    ("Community", "საზოგადოება"),
+    ("Composition", "კომპოზიცია"),
+    ("Composition Mini-Flowchart", "კომპოზიციის მინი-ბლოკ-სქემა"),
+    ("Composition Name:", "კომპოზიციის სახელი:"),
+    ("Composition Settings ▸ 3D Renderer", "კომპოზიციის პარამეტრები ▸ 3D რენდერერი"),
+    ("Composition Settings…", "კომპოზიციის პარამეტრები…"),
+    ("Composition marker bin: drag a marker to the time ruler", "კომპოზიციის მარკერების ბინი: გადაათრიეთ მარკერი დროის სახაზავზე"),
+    ("Cone Angle", "კონუსის კუთხე"),
+    ("Cone Feather", "კონუსის კიდეების შერბილება"),
+    ("Constrain Proportions", "პროპორციების შენარჩუნება"),
+    ("Continuous (Lock Outgoing to Incoming)", "უწყვეტი (გამავალის მიბმა შემავალზე)"),
+    ("Cue Point", "მინიშნების წერტილი"),
+    ("Current Render", "მიმდინარე რენდერი"),
+    ("Dark", "ბნელი"),
+    ("Dark Theme", "ბნელი თემა"),
+    ("Darker", "უფრო მუქი"),
+    ("Default Output:", "ნაგულისხმევი გამოტანა:"),
+    ("Default: {}", "ნაგულისხმევი: {}"),
+    ("Defaults", "ნაგულისხმევი"),
+    ("Delete", "წაშლა"),
+    ("Delete Selected Points", "მონიშნული წერტილების წაშლა"),
+    ("Delete selected project items", "პროექტის მონიშნული ელემენტების წაშლა"),
+    ("Delete this template", "ამ შაბლონის წაშლა"),
+    ("Depth of Field", "ველის სიღრმე"),
+    ("Discord", "Discord"),
+    ("Distribute Layers:", "შრეების განაწილება:"),
+    ("Don't Recover", "არ აღადგინო"),
+    ("Don't Save", "არ შეინახო"),
+    ("Double-click a layer to open it in the Layer panel", "ორჯერ დაწკაპეთ შრეზე მის შრის პანელში გასახსნელად"),
+    ("Double-click footage in the Project panel to open it here", "ორჯერ დაწკაპეთ ვიდეომასალაზე პროექტის პანელში მის აქ გასახსნელად"),
+    ("Double-click to edit the comment", "ორჯერ დაწკაპეთ კომენტარის რედაქტირებისთვის"),
+    ("Download", "ჩამოტვირთვა"),
+    (
+        "Drag properties here from the timeline,\nor use Animation > Add Property to Essential Graphics.",
+        "გადმოათრიეთ თვისებები დროის ხაზიდან,\nან გამოიყენეთ ანიმაცია > თვისების დამატება ძირითად გრაფიკაში.",
+    ),
+    ("Drag to change", "გადაათრიეთ შესაცვლელად"),
+    ("Drag to create a guide", "გადაათრიეთ დამხმარე ხაზის შესაქმნელად"),
+    ("Drag to slip the source", "გადაათრიეთ წყაროს გადასაწევად"),
+    ("Drop Frame", "კადრების გამოტოვებით"),
+    ("Duplicate", "დუბლირება"),
+    ("Copy", "კოპირება"),
+    ("Paste", "ჩასმა"),
+    ("Edit Value…", "მნიშვნელობის რედაქტირება…"),
+    ("Remove Expression", "ექსპრესიის მოცილება"),
+    ("Duration:", "ხანგრძლივობა:"),
+    ("Edit Gradient…", "გრადიენტის რედაქტირება…"),
+    ("Edit Target: {}", "რედაქტირების სამიზნე: {}"),
+    ("Edit in the Timeline", "რედაქტირება დროის ხაზზე"),
+    ("EffectCraft didn't quit normally last time.", "EffectCraft ბოლოს ნორმალურად არ დახურულა."),
+    ("Effects", "ეფექტები"),
+    ("Effects & Presets options", "ეფექტებისა და პრესეტების პარამეტრები"),
+    ("Copy Presets Folder Path", "პრესეტების საქაღალდის მისამართის კოპირება"),
+    ("Copy Source Path", "წყაროს მისამართის კოპირება"),
+    ("Effects: {}", "ეფექტები: {}"),
+    ("Empty folder", "ცარიელი საქაღალდე"),
+    ("Enable Depth of Field", "ველის სიღრმის ჩართვა"),
+    ("Enable Expression", "ექსპრესიის ჩართვა"),
+    ("Enhance", "გაუმჯობესება"),
+    ("Essential Properties — {}", "ძირითადი თვისებები — {}"),
+    ("Event", "მოვლენა"),
+    ("Export Template…", "შაბლონის ექსპორტი…"),
+    ("Export...", "ექსპორტი..."),
+    ("Expression Language Menu", "ექსპრესიების ენის მენიუ"),
+    ("Expression pick whip: drag onto a property", "ექსპრესიის ბმის სპირალი: გადაათრიეთ თვისებაზე"),
+    ("Expression:", "ექსპრესია:"),
+    ("Eyedropper: click, then click in the Composition panel", "პიპეტი: დაწკაპეთ, შემდეგ კი დაწკაპეთ კომპოზიციის პანელში"),
+    ("Falloff", "მილევა"),
+    ("Falloff Distance", "მილევის მანძილი"),
+    ("Favorites", "რჩეულები"),
+    ("Field Render: {}", "ნახევარკადრების რენდერი: {}"),
+    ("Figures", "ციფრები"),
+    ("Fill Target", "შევსების სამიზნე"),
+    ("Finished", "დასრულდა"),
+    ("Flowchart: {}", "ბლოკ-სქემა: {}"),
+    ("Focus Distance", "ფოკუსური მანძილი"),
+    ("Follow Feature Rotation and Scale", "მახასიათებლის შემობრუნებისა და მასშტაბის მიდევნება"),
+    ("Footage: {}", "ვიდეომასალა: {}"),
+    ("Format: {}", "ფორმატი: {}"),
+    ("Frame Aspect Ratio: {}", "კადრის თანაფარდობა: {}"),
+    ("Frame Blending: {}", "კადრების შერევა: {}"),
+    ("Frame Rate:", "კადრების სიხშირე:"),
+    ("Frame Render Time  {}ms", "კადრის რენდერის დრო  {}ms"),
+    ("Frame Target:", "კადრის სამიზნე:"),
+    ("Freeze", "გაყინვა"),
+    ("Grab bag", "სხვადასხვა"),
+    ("Gradient Editor", "გრადიენტის რედაქტორი"),
+    ("Grid", "ბადე"),
+    ("Guide Layer", "დამხმარე შრე"),
+    ("Guide Layers: {}", "დამხმარე შრეები: {}"),
+    ("Guides", "დამხმარე ხაზები"),
+    ("Height:", "სიმაღლე:"),
+    ("Hide This", "ამის დამალვა"),
+    ("Histogram", "ჰისტოგრამა"),
+    ("Hold In Place", "ადგილზე დაფიქსირება"),
+    ("Home", "საწყისი ეკრანი"),
+    ("If Confidence is Below", "თუ სანდოობა ნაკლებია"),
+    ("Import", "იმპორტი"),
+    ("Import and Add to Composition", "იმპორტი და კომპოზიციაში დამატება"),
+    ("Import...", "იმპორტი..."),
+    ("Imported media", "იმპორტირებული მედია"),
+    ("Influence:", "გავლენა:"),
+    ("Install from File…", "ფაილიდან დაყენება…"),
+    ("Intensity", "ინტენსივობა"),
+    ("Inverted", "შებრუნებული"),
+    ("Join the ArtCraft community on Discord", "შემოუერთდით ArtCraft-ის საზოგადოებას Discord-ზე"),
+    ("Key: {}", "გასაღები: {}"),
+    ("LEARN", "სწავლა"),
+    ("Label", "იარლიყი"),
+    ("Label Colors and Names:", "იარლიყების ფერები და სახელები:"),
+    ("Label:", "იარლიყი:"),
+    ("Latest auto-save: {}", "ბოლო ავტოშენახვა: {}"),
+    ("Layer", "შრე"),
+    ("Layer controls", "შრის მართვის ელემენტები"),
+    ("Layer:", "შრე:"),
+    ("Layer: {}", "შრე: {}"),
+    ("Layer Styles", "შრის სტილები"),
+    ("Learn", "სწავლა"),
+    ("Leave all attributes in \"{}\"", "ყველა ატრიბუტის დატოვება „{}“-ში"),
+    ("Licence: {}", "ლიცენზია: {}"),
+    ("Ligatures", "ლიგატურები"),
+    ("Light", "ღია"),
+    ("Light Theme", "ღია თემა"),
+    ("Light Type", "სინათლის ტიპი"),
+    ("Lighter", "უფრო ღია"),
+    ("Link Selected Property", "მონიშნული თვისების დაკავშირება"),
+    ("Location:", "პოზიცია:"),
+    ("Lock Aspect Ratio to {}", "თანაფარდობის ჩაკეტვა: {}"),
+    ("Lock to Zoom", "მასშტაბზე მიბმა"),
+    ("Locked: {} — {}", "ჩაკეტილი: {} — {}"),
+    ("Log:", "ჟურნალი:"),
+    ("Loop (Trace Path)", "მარყუჟი (ტრაექტორიის გავლა)"),
+    ("MIT OR Apache-2.0 • Fonts: Inter, JetBrains Mono (OFL)", "MIT OR Apache-2.0 • შრიფტები: Inter, JetBrains Mono (OFL)"),
+    ("Magnification ratio popup", "გადიდების კოეფიციენტის მენიუ"),
+    ("Make Comp Size", "კომპოზიციის ზომაზე მორგება"),
+    ("Markers", "მარკერები"),
+    ("Masks", "ნიღბები"),
+    ("Maximize Panel", "პანელის გაშლა"),
+    ("Media Replacement", "მედიის ჩანაცვლება"),
+    ("Mesh:", "ბადე:"),
+    ("Diameter:", "დიამეტრი:"),
+    ("Method Used: {}    Average Error: {} pixels", "გამოყენებული მეთოდი: {}    საშუალო ცდომილება: {} პიქსელი"),
+    ("Models folder: {}", "მოდელების საქაღალდე: {}"),
+    ("Modifiers:", "მოდიფიკატორები:"),
+    ("More", "მეტი"),
+    ("More ArtCraft apps", "ArtCraft-ის სხვა აპლიკაციები"),
+    ("More tutorials", "მეტი გაკვეთილი"),
+    ("Motion Blur", "მოძრაობის გაბუნდოვნება"),
+    ("Motion Blur: {}", "მოძრაობის გაბუნდოვნება: {}"),
+    ("Motion Sketch: drag to record", "მოძრაობის ესკიზი: გადაათრიეთ ჩასაწერად"),
+    ("Move Down", "ჩამოწევა"),
+    ("Move Up", "აწევა"),
+    ("Move to Project Root", "პროექტის ძირში გადატანა"),
+    ("Name", "სახელი"),
+    ("Name:", "სახელი:"),
+    ("Navigation", "ნავიგაცია"),
+    ("New", "ახალი"),
+    ("New Comp from Selection", "ახალი კომპოზიცია მონიშნულიდან"),
+    ("Replace with Precomposition", "ჩადგმული კომპოზიციით ჩანაცვლება"),
+    ("New Duration:", "ახალი ხანგრძლივობა:"),
+    ("New composition name:", "ახალი კომპოზიციის სახელი:"),
+    ("New from Render Queue item:", "ახალი რენდერის რიგის ელემენტიდან:"),
+    ("New from Template", "შაბლონიდან შექმნა"),
+    ("Next", "შემდეგი"),
+    ("Nice work. Pick another tutorial on the Home screen's Learn tab.", "ყოჩაღ. აირჩიეთ სხვა გაკვეთილი საწყისი ეკრანის „სწავლის“ ჩანართზე."),
+    (
+        "No VR environments yet. Create one with Composition ▸ VR ▸ Create VR Environment…",
+        "VR გარემო ჯერ არ არის. შექმენით: კომპოზიცია ▸ VR ▸ VR გარემოს შექმნა…",
+    ),
+    ("No audio layer selected", "აუდიოშრე არ არის მონიშნული"),
+    ("No background jobs running", "ფონური ამოცანები არ მიმდინარეობს"),
+    ("No composition markers", "კომპოზიციის მარკერები არ არის"),
+    ("No contributor data was built into this copy.", "ამ ასლში მონაწილეების მონაცემები არ არის ჩაშენებული."),
+    (
+        "No device list from this host; the system default output is used.",
+        "ამ ჰოსტიდან მოწყობილობების სია მიუწვდომელია; გამოიყენება სისტემის ნაგულისხმევი გამოტანა.",
+    ),
+    ("No layer selected", "შრე არ არის მონიშნული"),
+    ("No matching effects or presets", "შესაბამისი ეფექტები ან პრესეტები არ მოიძებნა"),
+    ("No matching fonts", "შესაბამისი შრიფტები არ მოიძებნა"),
+    ("Variable fonts only", "მხოლოდ ცვლადი შრიფტები"),
+    ("No model credits were built into this copy.", "ამ ასლში მოდელების მონაცემები არ არის ჩაშენებული."),
+    ("No nested compositions", "ჩადგმული კომპოზიციები არ არის"),
+    ("No shortcut", "მალსახმობის გარეშე"),
+    ("No unlocked layer selected", "განბლოკილი შრე არ არის მონიშნული"),
+    ("No video", "ვიდეოს გარეშე"),
+    ("None", "არცერთი"),
+    ("Not applied: tick it in the list to add it.", "არ არის გამოყენებული: დასამატებლად მონიშნეთ სიაში."),
+    ("Not assigned", "არ არის მინიჭებული"),
+    ("Note: Shadows are only cast from layers with Cast Shadows enabled.", "შენიშვნა: ჩრდილს აგდებს მხოლოდ ის შრე, რომელსაც ჩართული აქვს „ჩრდილს აგდებს“."),
+    ("Notify", "შეტყობინება"),
+    ("OK", "OK"),
+    ("Offset:", "წანაცვლება:"),
+    ("On ({}) stop:", "ჩართვისას ({}) გაჩერება:"),
+    ("One-Node Camera", "ერთკვანძიანი კამერა"),
+    ("Opacity:", "გაუმჭვირვალობა:"),
+    ("Open Composition", "კომპოზიციის გახსნა"),
+    ("used once", "გამოყენებულია ერთხელ"),
+    ("used {} times", "გამოყენებულია {}-ჯერ"),
+    ("Compositions that use this item", "კომპოზიციები, რომლებიც ამ ელემენტს იყენებს"),
+    ("Open Last Saved Project", "ბოლოს შენახული პროექტის გახსნა"),
+    ("Open New Composition", "ახალი კომპოზიციის გახსნა"),
+    ("Open Output", "გამოტანის გახსნა"),
+    ("Open a composition to build Essential Graphics", "გახსენით კომპოზიცია ძირითადი გრაფიკის ასაგებად"),
+    ("Open a composition to see its scopes", "გახსენით კომპოზიცია მისი სკოპების სანახავად"),
+    ("Open a composition to track motion.", "გახსენით კომპოზიცია მოძრაობის ტრეკინგისთვის."),
+    ("Opus Tuning: {}", "Opus-ის მორგება: {}"),
+    ("Original Duration:", "საწყისი ხანგრძლივობა:"),
+    ("Output Cycle: {}", "გამოტანის ციკლი: {}"),
+    ("Output To:", "გამოტანის ადგილი:"),
+    ("Overlay", "გადაფარვა"),
+    ("Parameter Name:", "პარამეტრის სახელი:"),
+    ("Parent pick whip: drag onto a layer", "მშობლის ბმის სპირალი: გადაათრიეთ შრეზე"),
+    ("Pixel Aspect Ratio:", "პიქსელის გვერდების თანაფარდობა:"),
+    ("Playing on Video Preview", "იკვრება ვიდეოს წინასწარ ნახვაზე"),
+    ("Post-Render Action: {}", "რენდერის შემდგომი მოქმედება: {}"),
+    ("Preserve frame rate when nested or in render queue", "კადრების სიხშირის შენარჩუნება ჩადგმისას ან რენდერის რიგში"),
+    ("Preserve resolution when nested", "გარჩევადობის შენარჩუნება ჩადგმისას"),
+    ("Preset", "პრესეტი"),
+    ("Preset:", "პრესეტი:"),
+    ("Presets", "პრესეტები"),
+    ("Previous", "წინა"),
+    ("Primary:", "ძირითადი:"),
+    ("Process Before Match", "დამუშავება შეთანხმებამდე"),
+    ("Profile: {}", "პროფილი: {}"),
+    (
+        "Project color depth: click to cycle 8/16/32 bpc, Alt-click for Project Settings",
+        "პროექტის ფერის სიღრმე: დაწკაპეთ 8/16/32 bpc-ის გადასართავად, Alt-დაწკაპუნება — პროექტის პარამეტრები",
+    ),
+    ("Project: {}", "პროექტი: {}"),
+    ("Projects", "პროექტები"),
+    ("Property pick whip: drag onto a property", "თვისების ბმის სპირალი: გადაათრიეთ თვისებაზე"),
+    ("Protected Region", "დაცული არე"),
+    ("Proxy Use: {}", "პროქსის გამოყენება: {}"),
+    ("Push All to Comp", "ყველაფრის კომპოზიციაში გადატანა"),
+    ("RGB", "RGB"),
+    ("Radius", "რადიუსი"),
+    ("Rate Control: {}", "სიჩქარის კონტროლი: {}"),
+    ("Recent", "ბოლოდროინდელი"),
+    ("Recording", "ჩაწერა"),
+    ("Remove", "წაშლა"),
+    ("Rename", "სახელის შეცვლა"),
+    ("Render: {} ms  •  UI {} fps{}", "რენდერი: {} ms  •  UI {} fps{}"),
+    ("Renderer:", "რენდერერი:"),
+    ("Request Persistent Storage", "მუდმივი მეხსიერების მოთხოვნა"),
+    ("Reset", "ჩამოყრა"),
+    ("Reset Labels", "იარლიყების ჩამოყრა"),
+    ("Reset Preset", "პრესეტის ჩამოყრა"),
+    ("Reset to Default", "ნაგულისხმევზე დაბრუნება"),
+    ("Reset to Saved Layout", "შენახულ განლაგებაზე დაბრუნება"),
+    ("Resolution/Down Sample Factor Popup", "გარჩევადობის/დისკრეტიზაციის კოეფიციენტის მენიუ"),
+    ("Restore Panel Size", "პანელის ზომის აღდგენა"),
+    ("Reverse the order", "რიგის შებრუნება"),
+    ("Revert All", "ყველაფრის დაბრუნება"),
+    ("Roman Hanging Punctuation", "ლათინური გამოწეული პუნქტუაცია"),
+    ("Roving:", "მცურავი:"),
+    ("Ruler zero point (drag to move, double-click to reset)", "სახაზავის ნულოვანი წერტილი (გადაათრიეთ გადასაადგილებლად, ორჯერ დაწკაპეთ ჩამოსაყრელად)"),
+    ("Rulers", "სახაზავები"),
+    ("Run", "გაშვება"),
+    ("Sample Format: {}", "ნიმუშის ფორმატი: {}"),
+    ("Samples Per Frame:", "ნიმუშები კადრზე:"),
+    ("Save from #{}", "შენახვა #{}-დან"),
+    ("Saved {}", "შენახულია {}"),
+    ("Script… (⌘/Ctrl+Enter runs)", "სკრიპტი… (⌘/Ctrl+Enter უშვებს)"),
+    ("Search commands or shortcuts", "ბრძანებების ან მალსახმობების ძიება"),
+    ("Select", "მონიშვნა"),
+    ("Select a command to change its shortcut.", "მონიშნეთ ბრძანება მისი მალსახმობის შესაცვლელად."),
+    ("Select a layer to see its effects", "მონიშნეთ შრე მისი ეფექტების სანახავად"),
+    ("Select a layer to see its properties", "მონიშნეთ შრე მისი თვისებების სანახავად"),
+    ("({}) Selected Objects", "({}) მონიშნული ობიექტი"),
+    (
+        "Select a layer with a mask or shape path (or the path property), or Puppet pins.",
+        "მონიშნეთ ნიღბიანი ან ფიგურის ტრაექტორიის მქონე შრე (ან ტრაექტორიის თვისება), ან მარიონეტის სამაგრები.",
+    ),
+    ("Select a text layer", "მონიშნეთ ტექსტური შრე"),
+    ("Select an item in the Project panel", "მონიშნეთ ელემენტი პროექტის პანელში"),
+    ("Select animated properties to show them in the Graph Editor", "მონიშნეთ ანიმირებული თვისებები გრაფიკების რედაქტორში საჩვენებლად"),
+    (
+        "Select the leader pin, then Shift-click the pins that should trail it (hair, cloth, tails)",
+        "მონიშნეთ წამყვანი სამაგრი, შემდეგ Shift-დაწკაპუნებით მონიშნეთ მიმყოლი სამაგრები (თმა, ქსოვილი, კუდები)",
+    ),
+    ("Set Ground Plane and Origin", "მიწის სიბრტყისა და სათავის დაყენება"),
+    ("Set Paint Colors to Black and White (D)", "ხატვის ფერების შავ-თეთრზე დაყენება (D)"),
+    ("Settings", "პარამეტრები"),
+    ("Settings Name:", "პარამეტრების სახელი:"),
+    ("Shadow Darkness", "ჩრდილის სიმუქე"),
+    ("Shadow Diffusion", "ჩრდილის გაბნევა"),
+    ("Shadows", "ჩრდილები"),
+    ("Shape…", "ფორმა…"),
+    ("Show", "ჩვენება"),
+    ("Show Layer Name", "შრის სახელის ჩვენება"),
+    ("Show Source Name", "წყაროს სახელის ჩვენება"),
+    ("Show me", "მაჩვენე"),
+    ("Show:", "ჩვენება:"),
+    ("Shutter Angle:", "ობტურატორის კუთხე:"),
+    ("Shutter Phase:", "ობტურატორის ფაზა:"),
+    ("Size", "ზომა"),
+    ("Skip", "გამოტოვება"),
+    ("Snapping", "მიბმა"),
+    ("Snapping options", "მიბმის პარამეტრები"),
+    ("Snapshot", "მომენტალური ასლი"),
+    ("Solo Supported Properties", "მხარდაჭერილი თვისებების სოლო"),
+    ("Solo Switches: {}", "სოლოს გადამრთველები: {}"),
+    ("Sort", "სორტირება"),
+    ("Spacing:", "ინტერვალი:"),
+    ("Spatial Interpolation:", "სივრცითი ინტერპოლაცია:"),
+    ("Speed:", "სიჩქარე:"),
+    ("Start Timecode:", "საწყისი თაიმკოდი:"),
+    ("Start: {}   Duration: {}", "დასაწყისი: {}   ხანგრძლივობა: {}"),
+    ("Step {} of {}: {}", "ნაბიჯი {} / {}: {}"),
+    ("Stop", "შეწყვეტა"),
+    ("Stop {} at {}°", "გადასვლის წერტილი {} — {}°"),
+    ("Stored in: {}", "შენახულია: {}"),
+    ("Stretch", "გაწელვა"),
+    ("Stretch Factor:", "გაწელვის კოეფიციენტი:"),
+    ("Stylistic Sets", "სტილისტური ნაკრებები"),
+    ("Subpixel Positioning", "სუბპიქსელური პოზიციონირება"),
+    ("Swap Colors", "ფერების გაცვლა"),
+    ("Swap Paint Colors (X)", "ხატვის ფერების გაცვლა (X)"),
+    ("Sync with System", "სისტემასთან სინქრონიზაცია"),
+    ("System Default", "სისტემის ნაგულისხმევი"),
+    ("Table", "ცხრილი"),
+    ("Template name", "შაბლონის სახელი"),
+    ("Template: {}\n{}", "შაბლონი: {}\n{}"),
+    ("Temporal Interpolation:", "დროითი ინტერპოლაცია:"),
+    ("The Media Browser is not available here (use File ▸ Import)", "მედიის ბრაუზერი აქ მიუწვდომელია (გამოიყენეთ ფაილი ▸ იმპორტი)"),
+    ("The OpenEXR layer shown in red, green, blue and alpha", "OpenEXR შრე წითლად, მწვანედ, ლურჯად და ალფად"),
+    ("The render queue is empty.", "რენდერის რიგი ცარიელია."),
+    (
+        "These adjacent keyframes cannot interpolate because their stop counts differ.",
+        "ამ მეზობელ საკვანძო კადრებს შორის ინტერპოლაცია შეუძლებელია, რადგან მათ გრადიენტის გადასვლის წერტილების განსხვავებული რაოდენობა აქვთ.",
+    ),
+    ("This ScriptUI panel has closed", "ეს ScriptUI პანელი დაიხურა"),
+    ("This change will create a new solid for this layer.", "ეს ცვლილება ამ შრისთვის ახალ სოლიდს შექმნის."),
+    ("Time", "დრო"),
+    ("Time Stretch…", "დროში გაწელვა…"),
+    ("Time:", "დრო:"),
+    ("Time: {}", "დრო: {}"),
+    ("Title/Action Safe", "სათაურისა და მოქმედების უსაფრთხო არე"),
+    ("Title/action safe", "სათაურისა და მოქმედების უსაფრთხო არე"),
+    ("Toggle Switches / Modes", "გადამრთველების / რეჟიმების გადართვა"),
+    ("Track Name:", "ტრეკის სახელი:"),
+    (
+        "Trained models are available in the desktop app; the browser uses the classic engine.",
+        "გაწვრთნილი მოდელები ხელმისაწვდომია დესკტოპის აპში; ბრაუზერი კლასიკურ ძრავს იყენებს.",
+    ),
+    ("Transform", "გარდაქმნა"),
+    ("Transparency grid", "გამჭვირვალობის ბადე"),
+    ("Tutorial complete", "გაკვეთილი დასრულდა"),
+    ("Two-Node Camera", "ორკვანძიანი კამერა"),
+    ("Type", "ტიპი"),
+    ("Type a command or effect…", "აკრიფეთ ბრძანება ან ეფექტი…"),
+    ("URL:", "URL:"),
+    ("Undock Panel", "პანელის მოხსნა"),
+    ("Move Panel to New Window", "პანელის ახალ ფანჯარაში გადატანა"),
+    ("Move Panel to Main Window", "პანელის მთავარ ფანჯარაში გადატანა"),
+    ("Unfreeze", "გაყინვის მოხსნა"),
+    ("Unlink {}", "{}-ის კავშირის გაწყვეტა"),
+    (
+        "Use this option to place the currently selected layers together into a new intermediate composition.",
+        "გამოიყენეთ ეს ვარიანტი მონიშნული შრეების ერთად ახალ შუალედურ კომპოზიციაში მოსათავსებლად.",
+    ),
+    ("VR Environments", "VR გარემოები"),
+    ("Value:", "მნიშვნელობა:"),
+    ("Variable Font Axes", "ცვლადი შრიფტის ღერძები"),
+    ("Video Codec: {}", "ვიდეო კოდეკი: {}"),
+    ("View:", "ხედი:"),
+    ("Welcome to EffectCraft", "მოგესალმებათ EffectCraft"),
+    ("Width:", "სიგანე:"),
+    ("You can undo this.", "ამის დაბრუნება შეგიძლიათ."),
+    ("You can't undo this.", "ამის დაბრუნება შეუძლებელია."),
+    ("Your changes will be lost if you don't save them.", "თუ ცვლილებებს არ შეინახავთ, ისინი დაიკარგება."),
+    ("Zoom", "მასშტაბი"),
+    ("built-in", "ჩაშენებული"),
+    ("frames per second", "კადრი წამში"),
+    ("template name", "შაბლონის სახელი"),
+    ("{} contributors · {} commits", "მონაწილე: {} · კომიტი: {}"),
+    ("{} x {}, {}MB per 8bpc frame", "{} x {}, {}MB 8bpc კადრზე"),
+    ("{} — coming soon", "{} — მალე"),
+    ("{} — double-click to open, {}-click to reveal", "{} — ორჯერ დაწკაპეთ გასახსნელად, {}-დაწკაპუნება საჩვენებლად"),
+    ("⌘/Ctrl-drag a pin to record its motion", "⌘/Ctrl-ით გადაათრიეთ სამაგრი მისი მოძრაობის ჩასაწერად"),
+    ("▣ {}", "▣ {}"),
+    ("⚠ {} is used by:", "⚠ {} გამოიყენება:"),
+    ("3D Reference Axes", "3D საორიენტაციო ღერძები"),
+    ("Affect all layers that use this solid", "ზემოქმედება ყველა შრეზე, რომელიც ამ სოლიდს იყენებს"),
+    ("Choose grid and guide options", "ბადისა და დამხმარე ხაზების პარამეტრების არჩევა"),
+    ("Colorize", "გაფერადება"),
+    ("Custom", "მორგებული"),
+    ("Custom...", "მორგებული..."),
+    ("Fit", "ჩატევა"),
+    ("Fit up to 100%", "ჩატევა 100%-მდე"),
+    ("Full", "სრული"),
+    ("Half", "ნახევარი"),
+    ("Only this layer uses this solid.", "ამ სოლიდს მხოლოდ ეს შრე იყენებს."),
+    ("Proportional Grid", "პროპორციული ბადე"),
+    ("Quarter", "მეოთხედი"),
+    ("Region of Interest", "ინტერესის არე"),
+    ("Reset Exposure", "ექსპოზიციის ჩამოყრა"),
+    ("Show Channel and Color Management Settings", "არხისა და ფერთა მართვის პარამეტრების ჩვენება"),
+    ("Show Snapshot (hold)", "მომენტალური ასლის ჩვენება (დაჭერით)"),
+    ("Take Snapshot", "მომენტალური ასლის გადაღება"),
+    ("Third", "მესამედი"),
+    ("Toggle Mask and Shape Path Visibility", "ნიღბისა და ფიგურის ტრაექტორიის ხილვადობის გადართვა"),
+    ("Toggle Transparency Grid", "გამჭვირვალობის ბადის გადართვა"),
+    ("16 bits per channel", "16 ბიტი არხზე"),
+    ("32 bits per channel (float)", "32 ბიტი არხზე (მცურავი)"),
+    ("8 bits per channel", "8 ბიტი არხზე"),
+    ("Adaptive Resolution", "ადაპტური გარჩევადობა"),
+    ("Adobe-style built-in", "ჩაშენებული, Adobe-ს სტილის"),
+    ("Blue", "ლურჯი"),
+    ("Current Settings", "მიმდინარე პარამეტრები"),
+    ("Disable Per-character 3D", "თითოეული ასოს 3D-ს გამორთვა"),
+    ("Draft", "მონახაზი"),
+    ("Enable Per-character 3D", "თითოეული ასოს 3D-ს ჩართვა"),
+    ("Fast Draft", "სწრაფი მონახაზი"),
+    ("Fast Previews (Draft 3D, Faster Effects)", "სწრაფი წინასწარი ნახვა (3D მონახაზი, უფრო სწრაფი ეფექტები)"),
+    ("Green", "მწვანე"),
+    ("Import Image Sequence", "გამოსახულებების თანმიმდევრობის იმპორტი"),
+    ("Import PDF / Illustrator File", "PDF / Illustrator ფაილის იმპორტი"),
+    ("Import Photoshop File", "Photoshop ფაილის იმპორტი"),
+    ("Interpret Unlabeled Alpha As", "არამონიშნული ალფას ინტერპრეტაცია როგორც"),
+    ("Join the ArtCraft Discord", "შემოუერთდით ArtCraft-ის Discord-ს"),
+    ("Mercury GPU Acceleration ({})", "Mercury GPU აჩქარება ({})"),
+    ("Mercury Software Only", "მხოლოდ Mercury Software"),
+    ("OCIO (built-in ACES config)", "OCIO (ჩაშენებული ACES კონფიგურაცია)"),
+    ("Off (Final Quality)", "გამორთული (საბოლოო ხარისხი)"),
+    ("OpenGL (compatibility)", "OpenGL (თავსებადობა)"),
+    ("Opus Bitrate: {} kbps", "Opus-ის ბიტრეიტი: {} kbps"),
+    ("RGB Straight", "RGB Straight"),
+    ("Red", "წითელი"),
+    ("Tone map", "ტონური რუკა"),
+    ("Use In-Window Menu Bar on macOS", "ფანჯრის შიდა მენიუს ზოლის გამოყენება macOS-ზე"),
+    ("Wireframe", "კარკასი"),
+    ("sRGB IEC61966-2.1 (default)", "sRGB IEC61966-2.1 (ნაგულისხმევი)"),
+    ("New Project", "ახალი პროექტი"),
+    ("Open Project…", "პროექტის გახსნა…"),
+    ("Templates", "შაბლონები"),
+    ("EffectCraft home page", "EffectCraft-ის საწყისი გვერდი"),
+    ("EffectCraft on GitHub", "EffectCraft GitHub-ზე"),
+    ("Motion graphics and visual effects · version {}", "მოძრავი გრაფიკა და ვიზუალური ეფექტები · ვერსია {}"),
+    ("New Composition", "ახალი კომპოზიცია"),
+    ("Open Demo Project", "სადემონსტრაციო პროექტის გახსნა"),
+    ("Import Footage…", "ვიდეომასალის იმპორტი…"),
+    ("Filter recent files", "ბოლო ფაილების გაფილტვრა"),
+    ("NAME", "სახელი"),
+    ("OPENED", "გახსნილია"),
+    ("SIZE", "ზომა"),
+    ("KIND", "სახეობა"),
+    ("Your recent files will show here", "ბოლოდროინდელი ფაილები აქ გამოჩნდება"),
+    ("Create a new project, or open the demo project to look around.", "შექმენით ახალი პროექტი, ან გახსენით სადემონსტრაციო პროექტი გასაცნობად."),
+    ("No recent files match the filter", "ფილტრს ბოლოდროინდელი ფაილები არ შეესაბამება"),
+    ("Try another name or folder.", "სცადეთ სხვა სახელი ან საქაღალდე."),
+    ("Just now", "ახლახან"),
+    ("Yesterday", "გუშინ"),
+    ("{} minute ago", "{} წუთის წინ"),
+    ("{} minutes ago", "{} წუთის წინ"),
+    ("{} hour ago", "{} საათის წინ"),
+    ("{} hours ago", "{} საათის წინ"),
+    ("{} day ago", "{} დღის წინ"),
+    ("{} days ago", "{} დღის წინ"),
+    ("EffectCraft project", "EffectCraft-ის პროექტი"),
+    ("After Effects project", "After Effects-ის პროექტი"),
+    ("Lottie animation", "Lottie ანიმაცია"),
+    ("Project", "პროექტი"),
+    ("General", "ზოგადი"),
+    ("Language", "ენა"),
+    ("Levels of Undo", "დაბრუნების დონეები"),
+    ("Path Point and Handle Size", "ტრაექტორიის წერტილისა და სახელურის ზომა"),
+    ("Recent Projects Shown", "ნაჩვენები ბოლო პროექტები"),
+    ("Options", "პარამეტრები"),
+    ("Show Tool Tips", "მინიშნებების ჩვენება"),
+    ("Create Layers at Composition Start Time", "შრეების შექმნა კომპოზიციის დაწყების დროზე"),
+    ("Switches Affect Nested Comps", "გადამრთველები მოქმედებს ჩადგმულ კომპოზიციებზე"),
+    ("Default Spatial Interpolation to Linear", "ნაგულისხმევი სივრცითი ინტერპოლაცია: წრფივი"),
+    (
+        "Preserve Constant Vertex and Feather Point Count when Editing Masks",
+        "ნიღბების რედაქტირებისას წვეროებისა და შერბილების წერტილების რაოდენობის შენარჩუნება",
+    ),
+    ("Synchronize Time of All Related Items", "ყველა დაკავშირებული ელემენტის დროის სინქრონიზაცია"),
+    ("Expression Pick Whip Writes Compact English", "ექსპრესიის ბმის სპირალი წერს კომპაქტურ ინგლისურს"),
+    ("Create Split Layers Above Original Layer", "დაყოფილი შრეების შექმნა საწყისი შრის ზემოთ"),
+    ("Use System Color Picker", "სისტემის ფერის ამომრჩევის გამოყენება"),
+    (
+        "EffectCraft always uses its own colour picker (the same on every platform and the web).",
+        "EffectCraft ყოველთვის საკუთარ ფერის ამომრჩევს იყენებს (ერთნაირს ყველა პლატფორმაზე და ვებში).",
+    ),
+    ("Startup & Repair", "გაშვება და აღდგენა"),
+    ("Show Home Screen When Launching", "საწყისი ეკრანის ჩვენება გაშვებისას"),
+    ("Show Home Screen When Opening a Project", "საწყისი ეკრანის ჩვენება პროექტის გახსნისას"),
+    ("Offer to Open the Latest Auto-Save After a Crash", "ავარიის შემდეგ ბოლო ავტოშენახვის გახსნის შეთავაზება"),
+    ("Window Graphics", "ფანჯრის გრაფიკა"),
+    ("Automatic", "ავტომატური"),
+    (
+        "Window Graphics applies from the next launch. When the graphics driver stops EffectCraft as its window opens, the next launch switches to OpenGL.",
+        "ფანჯრის გრაფიკა მოქმედებს შემდეგი გაშვებიდან. თუ გრაფიკის დრაივერი EffectCraft-ს ფანჯრის გახსნისას აჩერებს, შემდეგი გაშვება OpenGL-ზე გადაერთვება.",
+    ),
+    ("Repair", "აღდგენა"),
+    ("Reset Settings", "პარამეტრების ჩამოყრა"),
+    ("Reset Keyboard Shortcuts", "კლავიატურის მალსახმობების ჩამოყრა"),
+    ("Empty Disk Cache", "დისკის ქეშის გასუფთავება"),
+    ("New Project Loads Template", "ახალი პროექტი შაბლონს ტვირთავს"),
+    ("Template Project", "შაბლონი პროექტი"),
+    ("Auto-Save", "ავტოშენახვა"),
+    ("Automatically Save Projects", "პროექტების ავტომატური შენახვა"),
+    ("Save Every", "შენახვა ყოველ"),
+    ("Minutes", "წუთში"),
+    ("Maximum Project Versions", "პროექტის ვერსიების მაქსიმალური რაოდენობა"),
+    ("Auto-Save Location", "ავტოშენახვის მდებარეობა"),
+    ("Next to Project", "პროექტის გვერდით"),
+    ("Custom Location", "სხვა მდებარეობა"),
+    ("Save When Starting Render Queue", "შენახვა რენდერის რიგის დაწყებისას"),
+    ("Save Now", "ახლავე შენახვა"),
+    ("Motion Path", "მოძრაობის ტრაექტორია"),
+    ("All Keyframes", "ყველა საკვანძო კადრი"),
+    ("No Motion Path", "მოძრაობის ტრაექტორიის გარეშე"),
+    ("No More Than (Seconds)", "არაუმეტეს (წამი)"),
+    ("No More Than (Keyframes)", "არაუმეტეს (საკვანძო კადრი)"),
+    ("Seconds", "წამი"),
+    ("Keyframes", "საკვანძო კადრები"),
+    ("Display", "ეკრანი"),
+    ("Show Rendering Progress in Info Panel and Flowchart", "რენდერის პროგრესის ჩვენება ინფორმაციის პანელსა და ბლოკ-სქემაში"),
+    ("Hardware Accelerate Composition, Layer and Footage Panels", "კომპოზიციის, შრისა და ვიდეომასალის პანელების აპარატული აჩქარება"),
+    ("Panels are always drawn by the GPU (wgpu).", "პანელებს ყოველთვის GPU ხატავს (wgpu)."),
+    ("Previews", "წინასწარი ნახვა"),
+    ("Adaptive Resolution Limit", "ადაპტური გარჩევადობის ზღვარი"),
+    ("Show Internal Wireframes", "შიდა კარკასების ჩვენება"),
+    ("Cache Frames When Idle", "კადრების ქეშირება უქმობისას"),
+    ("Viewer Zoom Quality", "დამთვალიერებლის მასშტაბირების ხარისხი"),
+    ("Faster", "უფრო სწრაფი"),
+    ("More Accurate", "უფრო ზუსტი"),
+    ("Display Color Space", "ეკრანის ფერთა სივრცე"),
+    ("GPU Information...", "ინფორმაცია GPU-ს შესახებ..."),
+    ("Appearance", "იერსახე"),
+    ("Brightness", "სიკაშკაშე"),
+    ("UI Scale", "ინტერფეისის მასშტაბი"),
+    ("Labels and Colors", "იარლიყები და ფერები"),
+    ("Use Label Color for Layer Handles and Paths", "იარლიყის ფერის გამოყენება შრის სახელურებისა და ტრაექტორიებისთვის"),
+    ("Use Label Color for Related Tabs", "იარლიყის ფერის გამოყენება დაკავშირებული ჩანართებისთვის"),
+    ("Cycle Mask Colors", "ნიღბის ფერების მონაცვლეობა"),
+    ("Use Gradients", "გრადიენტების გამოყენება"),
+    ("Menu Bar", "მენიუს ზოლი"),
+    ("Grids & Guides", "ბადე და დამხმარე ხაზები"),
+    ("Gridline Every", "ბადის ხაზი ყოველ"),
+    ("Subdivisions", "ქვედანაყოფები"),
+    ("Style", "სტილი"),
+    ("Lines", "ხაზები"),
+    ("Dashed Lines", "წყვეტილი ხაზები"),
+    ("Dots", "წერტილები"),
+    ("Horizontal", "ჰორიზონტალური"),
+    ("Vertical", "ვერტიკალური"),
+    ("Safe Margins", "უსაფრთხო ზღვრები"),
+    ("Action-safe", "მოქმედების უსაფრთხო არე"),
+    ("Title-safe", "ტიტრების უსაფრთხო არე"),
+    ("Labels", "იარლიყები"),
+    ("Text Engine", "ტექსტის ძრავა"),
+    ("Latin", "ლათინური"),
+    ("South Asian and Middle Eastern", "სამხრეთაზიური და ახლო აღმოსავლური"),
+    ("Show Font Preview", "შრიფტის წინასწარი ნახვის ჩვენება"),
+    ("Number of Recent Fonts to Display", "საჩვენებელი ბოლო შრიფტების რაოდენობა"),
+    ("Show Font Names in English", "შრიფტების სახელების ინგლისურად ჩვენება"),
+    ("Still Footage", "უძრავი ვიდეომასალა"),
+    ("Length of Composition", "კომპოზიციის სიგრძე"),
+    ("Duration (Seconds)", "ხანგრძლივობა (წამი)"),
+    ("Still Duration", "უძრავი კადრის ხანგრძლივობა"),
+    ("Sequence Footage", "სეკვენციური ვიდეომასალა"),
+    ("Report Missing Frames", "გამოტოვებული კადრების შეტყობინება"),
+    ("Automatically Reload Footage", "ვიდეომასალის ავტომატური ხელახლა ჩატვირთვა"),
+    ("Off", "გამორთული"),
+    ("Non-Sequence Footage", "არასეკვენციური ვიდეომასალა"),
+    ("All Footage", "მთელი ვიდეომასალა"),
+    ("Ask User", "მომხმარებლისთვის კითხვა"),
+    ("Guess", "ვარაუდი"),
+    ("Ignore", "უგულებელყოფა"),
+    ("Straight", "პირდაპირი"),
+    ("Premultiplied", "წინასწარ გამრავლებული"),
+    ("Default Drag Import As", "გადათრევით იმპორტი ნაგულისხმევად როგორც"),
+    ("Footage", "ვიდეომასალა"),
+    ("Composition - Retain Layer Sizes", "კომპოზიცია - შრეების ზომების შენარჩუნებით"),
+    ("Export", "ექსპორტი"),
+    ("Default Output Folder", "ნაგულისხმევი გამოტანის საქაღალდე"),
+    ("Segment Sequences", "სეკვენციების სეგმენტებად დაყოფა"),
+    ("Files per Segment", "ფაილი სეგმენტში"),
+    ("files", "ფაილი"),
+    ("Segment Movie Files", "ვიდეოფაილების სეგმენტებად დაყოფა"),
+    ("Segment Size", "სეგმენტის ზომა"),
+    ("Append Bit Depth to File Name", "ბიტური სიღრმის ფაილის სახელზე დამატება"),
+    ("Audio", "აუდიო"),
+    ("Audio Hardware", "აუდიოაპარატურა"),
+    ("Preview Sample Rate", "წინასწარი ნახვის დისკრეტიზაციის სიხშირე"),
+    ("Audio Output Mapping", "აუდიოს გამოტანის ასახვა"),
+    ("Left", "მარცხენა"),
+    ("Right", "მარჯვენა"),
+    ("channel", "არხი"),
+    ("Disk", "დისკი"),
+    ("Disk Cache", "დისკის ქეში"),
+    ("Enable Disk Cache", "დისკის ქეშის ჩართვა"),
+    ("Maximum Disk Cache Size", "დისკის ქეშის მაქსიმალური ზომა"),
+    ("Disk Cache Folder", "დისკის ქეშის საქაღალდე"),
+    ("Media Cache", "მედიაქეში"),
+    ("Database and Cache Folder", "მონაცემთა ბაზისა და ქეშის საქაღალდე"),
+    ("Conformed Audio Folder", "მისადაგებული აუდიოს საქაღალდე"),
+    ("Memory & CPU", "მეხსიერება და CPU"),
+    ("RAM Reserved for Other Applications", "სხვა აპლიკაციებისთვის დაჯავშნული RAM"),
+    ("Cache Budgets", "ქეშის ლიმიტები"),
+    ("Layer Cache", "შრეების ქეში"),
+    ("Footage Frame Cache", "ვიდეომასალის კადრების ქეში"),
+    ("Preview (RAM) Cache", "წინასწარი ნახვის (RAM) ქეში"),
+    ("Reduce Cache Size When System Is Low on Memory", "ქეშის ზომის შემცირება, როცა სისტემას მეხსიერება აკლია"),
+    ("Video", "ვიდეო"),
+    ("Enable Video Preview Output", "ვიდეოს წინასწარი ნახვის გამოტანის ჩართვა"),
+    ("Video Device", "ვიდეომოწყობილობა"),
+    ("Floating Window", "მცურავი ფანჯარა"),
+    ("Full Screen", "მთელ ეკრანზე"),
+    ("Video Output During Playback", "ვიდეოს გამოტანა დაკვრისას"),
+    ("Mirror on Computer Monitor", "დუბლირება კომპიუტერის მონიტორზე"),
+    ("Disable Video Output When in Background", "ვიდეოს გამოტანის გამორთვა ფონურ რეჟიმში"),
+    ("Default 3D Renderer", "ნაგულისხმევი 3D რენდერერი"),
+    ("Show 3D Reference Axes", "3D საორიენტაციო ღერძების ჩვენება"),
+    ("Extended Viewer", "გაფართოებული დამთვალიერებელი"),
+    ("Realtime Shadows in Draft", "რეალურ დროში ჩრდილები მონახაზში"),
+    ("Scripting & Expressions", "სკრიპტები და ექსპრესიები"),
+    ("Application Scripting", "აპლიკაციის სკრიპტები"),
+    ("Allow Scripts to Write Files and Access Network", "სკრიპტებისთვის ფაილების ჩაწერისა და ქსელთან წვდომის დაშვება"),
+    ("Warn User When Executing Files", "მომხმარებლის გაფრთხილება ფაილების გაშვებისას"),
+    ("Enable JavaScript Debugger", "JavaScript-ის გამმართველის ჩართვა"),
+    ("Expressions Editor", "ექსპრესიების რედაქტორი"),
+    ("Font Size", "შრიფტის ზომა"),
+    ("Syntax Highlighting", "სინტაქსის გამოკვეთა"),
+    ("Line Numbers", "სტრიქონების ნომრები"),
+    ("Auto-complete", "ავტოდასრულება"),
+    ("Bracket Matching", "ფრჩხილების დაწყვილება"),
+    ("Word Wrap", "სიტყვების გადატანა"),
+    ("Show Expression Error Banner", "ექსპრესიის შეცდომის ზოლის ჩვენება"),
+    (
+        "Expressions use the JavaScript engine. Script errors report their file and line in the Script Console; there is no step debugger.",
+        "ექსპრესიები JavaScript-ის ძრავას იყენებს. სკრიპტის შეცდომები ფაილსა და სტრიქონს სკრიპტის კონსოლში აჩვენებს; ნაბიჯ-ნაბიჯ გამმართველი არ არის.",
+    ),
+    ("Roto Brush", "როტო-ფუნჯი"),
+    ("Segmentation Model", "სეგმენტაციის მოდელი"),
+    (
+        "Roto Brush 2.0 and 3.0 use the model chosen here (Version 1.0 always uses the classic engine). Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+        "როტო-ფუნჯი 2.0 და 3.0 აქ არჩეულ მოდელს იყენებს (ვერსია 1.0 ყოველთვის კლასიკურ ძრავას იყენებს). მოდელები ღია კოდისაა, ჩამოიტვირთება მხოლოდ თქვენი მოთხოვნით და მოწმდება გამოქვეყნებული SHA-256-ით.",
+    ),
+    ("Face Tracking", "სახის ტრეკინგი"),
+    ("Face Model", "სახის მოდელი"),
+    (
+        "Face tracking in the Tracker panel (Outline Only and Detailed Features) uses the model chosen here. Models are open source, downloaded only when you ask, and checked against their published SHA-256.",
+        "ტრეკერის პანელში სახის ტრეკინგი (მხოლოდ კონტური და დეტალური ნიშნები) აქ არჩეულ მოდელს იყენებს. მოდელები ღია კოდისაა, ჩამოიტვირთება მხოლოდ თქვენი მოთხოვნით და მოწმდება გამოქვეყნებული SHA-256-ით.",
+    ),
+    ("Match System", "სისტემის მიხედვით"),
+    ("Default", "ნაგულისხმევი"),
+    ("Stored, but not used by EffectCraft yet", "შენახულია, მაგრამ EffectCraft ჯერ არ იყენებს"),
+    ("Total Offset", "ჯამური წანაცვლება"),
+    ("Per Layer", "შრიდან შრემდე"),
+    ("Track", "ტრეკინგი"),
+];
+
+/// Georgian rows for interface text no other catalog has yet: strings the panels already send
+/// through [`tr`] (form fields and titles, drop messages, screen-reader names) and the labels of
+/// the Timeline's context menus. Kept apart from [`GEORGIAN`] so that table can keep listing
+/// exactly the Chinese catalogs' sources; the tests hold these to the same rules.
+const GEORGIAN_PANELS: &[(&str, &str)] = &[
+    ("Search project", "პროექტში ძიება"),
+    ("Select an item to see its details", "მონიშნეთ ელემენტი მისი დეტალების სანახავად"),
+    ("Media Duration", "მედიის ხანგრძლივობა"),
+    ("Frame Rate", "კადრების სიხშირე"),
+    ("File Path", "ფაილის მისამართი"),
+    ("Comment", "კომენტარი"),
+    ("A/V Features", "A/V ფუნქციები"),
+    ("Keys", "საკვანძო კადრები"),
+    ("Layer Name", "შრის სახელი"),
+    ("Source Name", "წყაროს სახელი"),
+    ("Switches", "გადამრთველები"),
+    ("Modes", "რეჟიმები"),
+    ("Track Matte", "ტრეკ-მატი"),
+    ("Parent & Link", "მშობელი და ბმა"),
+    ("In", "შესვლა"),
+    ("Out", "გამოსვლა"),
+    ("Duration", "ხანგრძლივობა"),
+    ("Original color: click to go back to it", "საწყისი ფერი: დაწკაპეთ მასზე დასაბრუნებლად"),
+    ("Resize floating panel", "მცურავი პანელის ზომის შეცვლა"),
+    ("Render every n-th pixel", "ყოველი n-ური პიქსელის რენდერი"),
+    ("Color (#rrggbb)", "ფერი (#rrggbb)"),
+    ("Workspace", "სამუშაო სივრცე"),
+    ("Rename to", "ახალი სახელი"),
+    ("Open", "გახსნა"),
+    ("Custom Resolution", "მორგებული გარჩევადობა"),
+    ("Panel Background Color", "პანელის ფონის ფერი"),
+    ("New Workspace", "ახალი სამუშაო სივრცე"),
+    ("Edit Workspaces", "სამუშაო სივრცეების რედაქტირება"),
+    ("A script wants to open a file", "სკრიპტს ფაილის გახსნა სურს"),
+    ("Drop file to import", "ჩააგდეთ ფაილი იმპორტისთვის"),
+    ("Drop {} files to import", "ჩააგდეთ ფაილები იმპორტისთვის: {}"),
+    (
+        "Skipped {} dropped file(s) without a local path. Use File ▸ Import ▸ File…",
+        "გამოტოვებულია ჩაგდებული ფაილი ლოკალური მისამართის გარეშე: {}. გამოიყენეთ ფაილი ▸ იმპორტი ▸ ფაილი…",
+    ),
+    ("Only one project can be opened per drop; skipped {} more", "ერთ ჩაგდებაზე მხოლოდ ერთი პროექტი იხსნება; გამოტოვებულია კიდევ: {}"),
+    ("Cannot open dropped project {}: {}", "ჩაგდებული პროექტის გახსნა შეუძლებელია, {}: {}"),
+    ("Cannot import dropped files: {}", "ჩაგდებული ფაილების იმპორტი შეუძლებელია: {}"),
+    ("A built-in preset has this name", "ამ სახელით ჩაშენებული პრესეტი არსებობს"),
+    ("Replaces your preset with this name", "ჩაანაცვლებს თქვენს პრესეტს ამ სახელით"),
+    ("Save Preset…", "პრესეტის შენახვა…"),
+    ("Delete Preset", "პრესეტის წაშლა"),
+    ("Null Settings", "ნულოვანი ობიექტის პარამეტრები"),
+    ("Click to sample text {}", "დაწკაპეთ ტექსტის ნიმუშის ასაღებად {}"),
+    ("Force alphabetical order", "ანბანური რიგის იძულება"),
+    ("Frame rate (fps)", "კადრების სიხშირე (fps)"),
+    (
+        "Change the frame rate, alpha and start frame later with File ▸ Interpret Footage.",
+        "კადრების სიხშირე, ალფა და საწყისი კადრი მოგვიანებით შეცვალეთ: ფაილი ▸ ვიდეომასალის ინტერპრეტაცია.",
+    ),
+    ("Import Kind", "იმპორტის სახე"),
+    ("Page", "გვერდი"),
+    ("Delay (s)", "დაყოვნება (წმ)"),
+    ("Amount (%)", "რაოდენობა (%)"),
+    ("Cascade (farther pins trail longer)", "კასკადი (შორეული სამაგრები უფრო დიდხანს ჩამორჩება)"),
+    ("Speed (%)", "სიჩქარე (%)"),
+    ("Smoothing", "დაგლუვება"),
+    ("Use Draft Deformation", "მონახაზის დეფორმაციის გამოყენება"),
+    ("Show Mesh", "ბადის ჩვენება"),
+    ("Scale X (%)", "მასშტაბი X (%)"),
+    ("Scale Y (%)", "მასშტაბი Y (%)"),
+    ("Rotation (degrees)", "შემობრუნება (გრადუსი)"),
+    ("Move X", "გადაადგილება X"),
+    ("Move Y", "გადაადგილება Y"),
+    ("Top", "ზემოდან"),
+    ("Width", "სიგანე"),
+    ("Height", "სიმაღლე"),
+    ("Shape", "ფიგურა"),
+    ("Mode", "რეჟიმი"),
+    ("Frame", "კადრი"),
+    ("Orientation", "ორიენტაცია"),
+    ("Position (pixels)", "პოზიცია (პიქსელი)"),
+    ("Position (percent of the composition)", "პოზიცია (კომპოზიციის პროცენტი)"),
+    ("Create", "შექმნა"),
+    ("Use Dimensions From", "ზომების აღება"),
+    ("Still Duration (seconds)", "უძრავი კადრის ხანგრძლივობა (წამი)"),
+    ("Add to Render Queue", "რენდერის რიგში დამატება"),
+    ("Sequence Layers", "შრეების თანმიმდევრობით განლაგება"),
+    ("Overlap", "გადაფარვა"),
+    ("Duration (seconds)", "ხანგრძლივობა (წამი)"),
+    ("Transition", "გადასვლა"),
+    ("Matte color (premultiplied)", "მატის ფერი (წინასწარ გამრავლებული)"),
+    ("Invert Alpha", "ალფას ინვერსია"),
+    ("Assume this frame rate", "ამ კადრების სიხშირის გამოყენება"),
+    ("Separate Fields", "ნახევარკადრების გაყოფა"),
+    ("Pixel Aspect Ratio", "პიქსელის გვერდების თანაფარდობა"),
+    ("Loop (times)", "ციკლი (ჯერ)"),
+    ("Assign Profile", "პროფილის მინიჭება"),
+    ("Preserve RGB", "RGB-ის შენარჩუნება"),
+    ("Interpret As Linear Light", "წრფივ სინათლედ ინტერპრეტაცია"),
+    ("Start Timecode", "საწყისი თაიმკოდი"),
+    ("Override Start", "დასაწყისის ხელით მითითება"),
+    ("Depth", "სიღრმე"),
+    ("Time display style", "დროის ჩვენების სტილი"),
+    ("Color engine", "ფერთა ძრავა"),
+    ("Working space", "სამუშაო სივრცე"),
+    ("Working gamma", "სამუშაო გამა"),
+    ("Linearize working space", "სამუშაო სივრცის წრფივად გარდაქმნა"),
+    ("Blend colors using 1.0 gamma", "ფერების შერევა 1.0 გამით"),
+    ("HDR on SDR displays and outputs", "HDR SDR ეკრანებსა და გამოტანებზე"),
+    ("Output color space", "გამოტანის ფერთა სივრცე"),
+    ("Video rendering and effects", "ვიდეოს რენდერი და ეფექტები"),
+    ("Time Span", "დროის მონაკვეთი"),
+    ("Invert", "ინვერსია"),
+    ("Blur (pixels before auto-trace)", "გაბუნდოვნება (პიქსელი, ვექტორიზაციამდე)"),
+    ("Tolerance (pixels)", "დაშვება (პიქსელი)"),
+    ("Threshold (%)", "ზღვარი (%)"),
+    ("Minimum Area (pixels)", "მინიმალური ფართობი (პიქსელი)"),
+    ("Corner Roundness (%)", "კუთხეების მომრგვალება (%)"),
+    ("Apply To New Layer", "ახალ შრეზე გამოყენება"),
+    ("Action", "მოქმედება"),
+    ("Sensitivity threshold (0–1, lower finds more)", "მგრძნობელობის ზღვარი (0–1, ნაკლები მეტს პოულობს)"),
+    ("Data", "მონაცემები"),
+    ("Time field (empty: automatic)", "დროის ველი (ცარიელი: ავტომატური)"),
+    ("Video start (ISO date-time, hh:mm:ss, timecode; empty: file date)", "ვიდეოს დასაწყისი (ISO თარიღი-დრო, hh:mm:ss, თაიმკოდი; ცარიელი: ფაილის თარიღი)"),
+    ("First sample at (comp seconds)", "პირველი ნიმუში (კომპოზიციის წამი)"),
+    (
+        "Writes Final Cut Pro XML (.xml), which Premiere Pro opens with File ▸ Import. Native .prproj files are not written.",
+        "იწერს Final Cut Pro XML-ს (.xml), რომელსაც Premiere Pro ხსნის ბრძანებით File ▸ Import. მშობლიური .prproj ფაილები არ იწერება.",
+    ),
+    ("File", "ფაილი"),
+    ("Format", "ფორმატი"),
+    ("Pre-render (ProRes 4444)", "წინასწარი რენდერი (ProRes 4444)"),
+    ("Precomps", "ჩადგმული კომპოზიციები"),
+    ("Frame rate", "კადრების სიხშირე"),
+    ("Description", "აღწერა"),
+    ("Category", "კატეგორია"),
+    ("Embed footage files", "ვიდეომასალის ფაილების ჩაშენება"),
+    ("Embed up to (MB)", "ჩაშენება მაქსიმუმ (MB)"),
+    ("Use the sRGB curve (ignore Gamma)", "sRGB მრუდის გამოყენება (გამის უგულებელყოფა)"),
+    ("ICC profile (replaces the numbers)", "ICC პროფილი (ცვლის რიცხვებს)"),
+    ("Rectangle", "მართკუთხედი"),
+    ("Ellipse", "ელიფსი"),
+    ("Orient Along Path", "ორიენტაცია ტრაექტორიის გასწვრივ"),
+    ("Orient Towards Camera", "ორიენტაცია კამერისკენ"),
+    ("Orient Towards Point of Interest", "ორიენტაცია ინტერესის წერტილისკენ"),
+    ("Single Composition", "ერთი კომპოზიცია"),
+    ("Multiple Compositions", "რამდენიმე კომპოზიცია"),
+    ("Dissolve Front Layer", "წინა შრის გადადნობა"),
+    ("Cross Dissolve Front and Back Layers", "წინა და უკანა შრეების ჯვარედინი გადადნობა"),
+    ("Interpret Straight - Unmatted", "პირდაპირად ინტერპრეტაცია - მატის გარეშე"),
+    ("Interpret Premultiplied - Matted With Color", "წინასწარ გამრავლებულად ინტერპრეტაცია - ფერით მატირებული"),
+    ("Upper Field First", "ჯერ ზედა ნახევარკადრი"),
+    ("Lower Field First", "ჯერ ქვედა ნახევარკადრი"),
+    ("Embedded / sRGB", "ჩაშენებული / sRGB"),
+    ("Use Source File Timecode", "წყარო ფაილის თაიმკოდის გამოყენება"),
+    ("Timecode", "თაიმკოდი"),
+    ("Frames", "კადრები"),
+    ("Feet + Frames (35mm)", "ფუტი + კადრი (35 მმ)"),
+    ("Feet + Frames (16mm)", "ფუტი + კადრი (16 მმ)"),
+    ("Clip", "მოჭრა"),
+    ("Compand", "კომპანდირება"),
+    ("Current Frame", "მიმდინარე კადრი"),
+    ("Work Area", "სამუშაო არე"),
+    ("Luminance", "სიკაშკაშე"),
+    ("Create Markers", "მარკერების შექმნა"),
+    ("Split Layers", "შრეების დაყოფა"),
+    ("Split and Precompose", "დაყოფა და კომპოზიციაში მოთავსება"),
+    ("CMX 3600 EDL (.edl, V1 only)", "CMX 3600 EDL (.edl, მხოლოდ V1)"),
+    ("OMF (.omf, audio)", "OMF (.omf, აუდიო)"),
+    ("Layers Premiere can't show (text, shapes, effects…)", "შრეები, რომლებსაც Premiere ვერ აჩვენებს (ტექსტი, ფიგურები, ეფექტები…)"),
+    ("All layers", "ყველა შრე"),
+    ("None (leave them out)", "არცერთი (გამოტოვება)"),
+    ("Nested sequences", "ჩადგმული სეკვენციები"),
+    ("Pre-render", "წინასწარი რენდერი"),
+    ("Puppet Follow-Through", "მარიონეტის ინერციული მოძრაობა"),
+    ("Puppet Record Options", "მარიონეტის ჩაწერის პარამეტრები"),
+    ("Free Transform Points", "წერტილების თავისუფალი გარდაქმნა"),
+    ("Mask Shape", "ნიღბის ფორმა"),
+    ("Auto-Orientation", "ავტოორიენტაცია"),
+    ("Go to Time", "დროზე გადასვლა"),
+    ("Add Guide", "დამხმარე ხაზის დამატება"),
+    ("Add Percentage Guide", "პროცენტული დამხმარე ხაზის დამატება"),
+    ("New Composition from Selection", "ახალი კომპოზიცია მონიშნულიდან"),
+    ("Project Settings", "პროექტის პარამეტრები"),
+    ("Auto-trace", "ავტომატური ვექტორიზაცია"),
+    ("Scene Edit Detection", "სცენების ჭრილების ამოცნობა"),
+    ("Align Video to Data", "ვიდეოს მონაცემებთან სწორება"),
+    ("Export Adobe Premiere Pro Project", "Adobe Premiere Pro-ს პროექტის ექსპორტი"),
+    ("New Placeholder", "ახალი ჩანაცვლების ობიექტი"),
+    ("Solid Settings", "სოლიდის პარამეტრები"),
+    ("Save as Template", "შაბლონად შენახვა"),
+    ("My Custom RGB", "ჩემი მორგებული RGB"),
+    ("Mercury GPU Acceleration (no GPU: software)", "Mercury GPU აჩქარება (GPU არ არის: პროგრამული)"),
+    ("Sort by {}, {}", "დალაგება: {}, {}"),
+    ("Sort by {}", "დალაგება: {}"),
+    ("Label of {}: {}", "{}-ის იარლიყი: {}"),
+    ("Comment of {}: {}", "{}-ის კომენტარი: {}"),
+    ("Project color depth: {}", "პროექტის ფერის სიღრმე: {}"),
+    ("Start (s)", "დასაწყისი (წმ)"),
+    ("Duration (s)", "ხანგრძლივობა (წმ)"),
+    ("Frames per second", "კადრი წამში"),
+    ("Bottom", "ქვემოდან"),
+    ("Bitrate (kbps)", "ბიტრეიტი (kbps)"),
+    ("Frames between key frames (0 = every 2 s)", "კადრები საკვანძო კადრებს შორის (0 = ყოველ 2 წმ-ში)"),
+    ("Click in the Composition panel to sample text {}", "დაწკაპეთ კომპოზიციის პანელში ტექსტის ნიმუშის ასაღებად {}"),
+    ("Video preview off: audio only", "ვიდეოს წინასწარი ნახვა გამორთულია: მხოლოდ აუდიო"),
+    ("Open in Essential Graphics", "ძირითად გრაფიკაში გახსნა"),
+    ("Video preview is off (Preview panel): audio only", "ვიდეოს წინასწარი ნახვა გამორთულია (წინასწარი ნახვის პანელი): მხოლოდ აუდიო"),
+    ("Solid…", "სოლიდი…"),
+];
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     /// The interface text that has moved into this catalog. Add a panel here when you convert it;
-    /// the tests below then keep it translated.
-    const CONVERTED: &[(&str, &str)] = &[
+    /// `every_row_is_used_by_a_converted_panel` then looks for its rows' English sources in it.
+    pub(super) const CONVERTED: &[(&str, &str)] = &[
         ("color_picker.rs", include_str!("../color_picker.rs")),
         ("credits.rs", include_str!("../credits.rs")),
+        ("dock.rs", include_str!("../dock.rs")),
+        ("dock_ui.rs", include_str!("../dock_ui.rs")),
         ("header.rs", include_str!("../header.rs")),
-        ("menus.rs", include_str!("../menus.rs")),
+        ("menus/bar.rs", include_str!("../menus/bar.rs")),
+        ("menus/commands.rs", include_str!("../menus/commands.rs")),
+        ("menus/entries.rs", include_str!("../menus/entries.rs")),
+        ("menus/frontend.rs", include_str!("../menus/frontend.rs")),
+        ("menus/invoke.rs", include_str!("../menus/invoke.rs")),
+        ("menus/shortcuts.rs", include_str!("../menus/shortcuts.rs")),
+        ("prefs_live.rs", include_str!("../prefs_live.rs")),
         ("widgets.rs", include_str!("../widgets.rs")),
         ("panels/anim_tools.rs", include_str!("../panels/anim_tools.rs")),
         ("panels/camera_tracker_ui.rs", include_str!("../panels/camera_tracker_ui.rs")),
@@ -4234,7 +5449,11 @@ mod tests {
         ("panels/gradient_editor.rs", include_str!("../panels/gradient_editor.rs")),
         ("panels/dialogs.rs", include_str!("../panels/dialogs.rs")),
         ("panels/dialogs_3d.rs", include_str!("../panels/dialogs_3d.rs")),
-        ("panels/effect_controls.rs", include_str!("../panels/effect_controls.rs")),
+        ("panels/effect_controls/common.rs", include_str!("../panels/effect_controls/common.rs")),
+        ("panels/effect_controls/editors.rs", include_str!("../panels/effect_controls/editors.rs")),
+        ("panels/effect_controls/panel.rs", include_str!("../panels/effect_controls/panel.rs")),
+        ("panels/effect_controls/rows.rs", include_str!("../panels/effect_controls/rows.rs")),
+        ("panels/effect_controls/viewer.rs", include_str!("../panels/effect_controls/viewer.rs")),
         ("panels/effects_presets.rs", include_str!("../panels/effects_presets.rs")),
         ("panels/essential.rs", include_str!("../panels/essential.rs")),
         ("panels/expr_bar.rs", include_str!("../panels/expr_bar.rs")),
@@ -4252,7 +5471,7 @@ mod tests {
         ("panels/markers_ui.rs", include_str!("../panels/markers_ui.rs")),
         ("panels/media_panels.rs", include_str!("../panels/media_panels.rs")),
         ("panels/misc.rs", include_str!("../panels/misc.rs")),
-        ("panels/mod.rs", include_str!("../panels/mod.rs")),
+        ("panels.rs", include_str!("../panels.rs")),
         ("panels/paint_panels.rs", include_str!("../panels/paint_panels.rs")),
         ("panels/path_vr_panels.rs", include_str!("../panels/path_vr_panels.rs")),
         ("panels/precomp.rs", include_str!("../panels/precomp.rs")),
@@ -4272,89 +5491,46 @@ mod tests {
         ("panels/tracker.rs", include_str!("../panels/tracker.rs")),
         ("panels/unsaved.rs", include_str!("../panels/unsaved.rs")),
         ("panels/viewer.rs", include_str!("../panels/viewer.rs")),
+        ("panels/viewer/frame.rs", include_str!("../panels/viewer/frame.rs")),
+        ("panels/viewer/geometry.rs", include_str!("../panels/viewer/geometry.rs")),
+        ("panels/viewer/gesture.rs", include_str!("../panels/viewer/gesture.rs")),
+        ("panels/viewer/shapes.rs", include_str!("../panels/viewer/shapes.rs")),
+        ("panels/viewer/tools.rs", include_str!("../panels/viewer/tools.rs")),
+        ("panels/viewer/view.rs", include_str!("../panels/viewer/view.rs")),
         ("panels/viewer_tools.rs", include_str!("../panels/viewer_tools.rs")),
         ("panels/viewers.rs", include_str!("../panels/viewers.rs")),
         // Text the interface draws but does not own: the settings pages and the viewer's channel
         // and Fast Previews lists come from the engine as data, so their source strings live here.
-        // Both files pass the literal scan below unchanged (they hold no drawn literals).
-        ("engine settings pages", include_str!("../../../engine/src/prefs.rs")),
+        ("engine settings pages", include_str!("../../../engine/src/settings/prefs/dialog.rs")),
+        ("engine settings choices", include_str!("../../../engine/src/settings/prefs/choices.rs")),
         ("engine viewer channels", include_str!("../../../engine/src/viewer.rs")),
-        ("engine viewer commands", include_str!("../../../engine/src/commands/viewer_cmds.rs")),
+        ("engine viewer commands", include_str!("../../../engine/src/cmd/viewer_cmds.rs")),
     ];
 
-    /// Call shapes that hand a string literal straight to the user.
-    const CALLS: &[&str] = &[
-        ".label(\"",
-        ".button(\"",
-        ".small(\"",
-        ".strong(\"",
-        ".heading(\"",
-        ".monospace(\"",
-        ".on_hover_text(\"",
-        ".on_disabled_hover_text(\"",
-        ".hint_text(\"",
-        ".text(\"",
-        ".prefix(\"",
-        ".suffix(\"",
-        "RichText::new(\"",
-        "Label::new(\"",
-        "Button::new(\"",
-        "Window::new(\"",
-        "CollapsingHeader::new(\"",
-    ];
-
-    /// Literals that stay as they are: a unit or a separator reads the same in every language.
-    const UNITS: &[&str] = &[" px", "%", "·", "s", "ms", "°", "fps", " bpc", " mm", " s", " %", " pixels"];
-
     fn catalogs() -> Vec<(&'static str, &'static str)> {
-        JAPANESE
-            .iter()
-            .copied()
-            .chain(SIMPLIFIED_CHINESE.iter().copied())
-            .chain(TRADITIONAL_CHINESE.iter().copied())
-            .chain(UKRAINIAN.iter().copied())
-            .chain(PORTUGUESE.iter().copied())
-            .chain(CZECH.iter().copied())
-            .chain(SPANISH.iter().copied())
-            .collect()
+        ROWS.iter().flat_map(|(_, rows)| rows.iter().copied()).collect()
     }
 
-    #[test]
-    fn czech_panels_translate_and_keep_project_content_and_argument_order() {
-        set_current("cs");
-        assert_eq!(tr("Composition Name:"), "Název kompozice:");
-        assert_eq!(tr("Cancel"), "Zrušit");
-        assert_eq!(tr("my layer.mp4"), "my layer.mp4");
-        assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Použití zástupných souborů: Best");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Krok 1 z 3: Colour");
-        assert_eq!(tr_args("Template: {}\n{}", &[&"Title", &"My description"]), "Šablona: Title\nMy description");
-        assert_eq!(tr_args("Leave all attributes in \"{}\"", &[&"File Čeština"]), "Ponechat všechny atributy v „File Čeština“");
-        assert_eq!(
-            tr_args("{} — double-click to open, {}-click to reveal", &[&"File.ecproj", &"Alt"]),
-            "File.ecproj — dvojklikem otevřete, kliknutím s Alt zobrazíte umístění"
-        );
-        assert_eq!(tr_args("Proxy Use: {}", &[]), "Použití zástupných souborů: ");
-        set_current("en");
-        assert_eq!(tr("Composition Name:"), "Composition Name:");
+    /// `en`'s row in `rows`, else `en`: what `tr` should return without pinning one wording.
+    fn row(rows: &[(&'static str, &'static str)], en: &'static str) -> &'static str {
+        rows.iter().find(|(source, _)| *source == en).map_or(en, |(_, translated)| *translated)
     }
 
     /// A row that translates nothing, repeats a source string, or changes the number of values the
     /// English source carries is a bug in the catalog itself.
     #[test]
     fn catalogs_are_unique_and_keep_the_english_shape() {
-        let hans: Vec<&str> = SIMPLIFIED_CHINESE.iter().map(|(en, _)| *en).collect();
-        let hant: Vec<&str> = TRADITIONAL_CHINESE.iter().map(|(en, _)| *en).collect();
-        assert_eq!(hans, hant, "the two Chinese catalogs list different source strings");
-        // Japanese, Ukrainian and Czech may lag the Chinese catalogs: a missing row falls back to English.
-        for (name, cat) in [("Japanese", JAPANESE), ("Ukrainian", UKRAINIAN), ("Brazilian Portuguese", PORTUGUESE), ("Czech", CZECH), ("Spanish", SPANISH)] {
-            let extra: Vec<&str> = cat.iter().map(|(en, _)| *en).filter(|en| !hans.contains(en)).collect();
-            assert!(extra.is_empty(), "the {name} catalog lists source strings the Chinese ones don't: {extra:?}");
+        // Grouped by language: a source listed in two tables of one language is still a repeat.
+        let mut by_code: std::collections::BTreeMap<&str, Vec<&str>> = std::collections::BTreeMap::new();
+        for (code, rows) in ROWS {
+            by_code.entry(code).or_default().extend(rows.iter().map(|(en, _)| *en));
+        }
+        for (code, mut sources) in by_code {
+            sources.sort_unstable();
+            let listed = sources.len();
+            sources.dedup();
+            assert_eq!(listed, sources.len(), "{code}: a source string is listed twice");
         }
-        let mut sorted = hans.clone();
-        sorted.sort_unstable();
-        let listed = sorted.len();
-        sorted.dedup();
-        assert_eq!(listed, sorted.len(), "a source string is listed twice");
         for (en, translated) in catalogs() {
             assert!(!en.is_empty() && !translated.is_empty(), "empty row for {en:?}");
             assert!(en.contains("{}") || !en.contains('{'), "{en:?} has a placeholder but no `{{}}`");
@@ -4371,78 +5547,38 @@ mod tests {
         set_current("xx"); // a language without rows
         assert_eq!(tr("Composition Name:"), "Composition Name:");
         set_current("zh-hans");
-        assert_eq!(tr("Composition Name:"), "合成名称：");
+        assert_eq!(tr("Composition Name:"), row(SIMPLIFIED_CHINESE, "Composition Name:"));
         assert_eq!(tr("my layer.mp4"), "my layer.mp4");
         set_current("en");
     }
 
-    /// The same language preference used for the menus reaches panels immediately, and formatted
-    /// text keeps the caller's values intact even when they contain non-Ukrainian words.
+    /// Georgian also reads its own table, for text the other catalogs don't have yet.
     #[test]
-    fn ukrainian_panels_translate_and_keep_project_content() {
-        set_current("uk");
-        assert_eq!(tr("Composition Name:"), "Назва композиції:");
-        assert_eq!(tr("Cancel"), "Скасувати");
-        assert_eq!(tr("my layer.mp4"), "my layer.mp4");
-        assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Використання проксі: Best");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Крок 1 з 3: Colour");
-        assert_eq!(tr_args("Template: {}\n{}", &[&"Title", &"My description"]), "Шаблон: Title\nMy description");
+    fn georgian_reads_its_own_panel_rows() {
+        set_current("ka");
+        for (source, _) in GEORGIAN_PANELS.iter().take(3) {
+            assert_eq!(tr(source), row(GEORGIAN_PANELS, source));
+        }
         set_current("en");
-        assert_eq!(tr("Composition Name:"), "Composition Name:");
-    }
-
-    /// Brazilian Portuguese panels translate, fill values in order and keep project content.
-    #[test]
-    fn brazilian_portuguese_panels_translate_and_keep_project_content() {
-        set_current("pt-br");
-        assert_eq!(tr("Composition Name:"), "Nome da composição:");
-        assert_eq!(tr("Cancel"), "Cancelar");
-        assert_eq!(tr("my layer.mp4"), "my layer.mp4");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Etapa 1 de 3: Colour");
-        assert_eq!(tr("   OK   "), "   OK   ");
-        set_current("en");
-        assert_eq!(tr("Cancel"), "Cancel");
-    }
-
-    /// Spanish panels translate, fill values in order and keep project content.
-    #[test]
-    fn spanish_panels_translate_and_keep_project_content() {
-        set_current("es");
-        assert_eq!(tr("Composition Name:"), "Nombre de la composición:");
-        assert_eq!(tr("Cancel"), "Cancelar");
-        assert_eq!(tr("my layer.mp4"), "my layer.mp4");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Paso 1 de 3: Colour");
-        set_current("en");
-        assert_eq!(tr("Cancel"), "Cancel");
     }
 
     /// Values fill the placeholders in order, and a missing value is dropped instead of panicking.
     #[test]
     fn tr_args_fills_values_in_order() {
         set_current("zh-hans");
-        assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "代理使用：Best");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "第 1 步，共 3 步：Colour");
-        assert_eq!(tr_args("Proxy Use: {}", &[]), "代理使用：");
+        let template = row(SIMPLIFIED_CHINESE, "Proxy Use: {}");
+        assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), template.replacen("{}", "Best", 1));
+        assert_eq!(tr_args("Proxy Use: {}", &[]), template.replacen("{}", "", 1));
         set_current("en");
+        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "Step 1 of 3: Colour");
         assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "Proxy Use: Best");
+        assert_eq!(tr_args("Proxy Use: {}", &[]), "Proxy Use: ");
     }
 
-    /// Japanese reads its own rows: values fill the placeholders in order, and a name that is not a
-    /// row (a layer or file name) stays verbatim.
-    #[test]
-    fn japanese_rows_translate_the_panels() {
-        set_current("ja");
-        assert_eq!(tr("Composition Name:"), "コンポジション名:");
-        assert_eq!(tr("my layer.mp4"), "my layer.mp4");
-        assert_eq!(tr_args("Proxy Use: {}", &[&"Best"]), "プロキシの使用：Best");
-        assert_eq!(tr_args("Step {} of {}: {}", &[&1, &3, &"Colour"]), "ステップ1/3：Colour");
-        set_current("en");
-    }
-
-    /// Every row is asked for by a converted panel: a leftover row means the panel went back to its
-    /// English literal. A string a helper draws for the panel (a toolbar tooltip, a popup item, a
-    /// checkbox label) is looked up inside that helper, so its English source only appears as a
-    /// literal there - `helper_labels_are_translated` keeps those helpers honest.
+    /// Every row is asked for by a converted panel: a leftover row is stale, because the panel's
+    /// English source changed or went away. A string a helper draws for the panel (a toolbar
+    /// tooltip, a popup item, a checkbox label) is looked up inside that helper, so its English
+    /// source only appears as a literal there.
     #[test]
     fn every_row_is_used_by_a_converted_panel() {
         for (en, _) in catalogs() {
@@ -4455,84 +5591,4 @@ mod tests {
             );
         }
     }
-
-    /// A label that a helper takes as an argument is drawn by the helper, so the helper has to ask
-    /// the catalog: `Checkbox::new` and `RadioButton::new` are not among the scanned call shapes
-    /// (the label is their second argument), which let the solid dialog's checkbox ship in English.
-    #[test]
-    fn helper_labels_are_translated() {
-        for (path, source) in CONVERTED {
-            for marker in ["Checkbox::new(", "RadioButton::new("] {
-                let mut from = 0;
-                while let Some(at) = source[from..].find(marker) {
-                    let at = from + at;
-                    let rest = &source[at + marker.len()..];
-                    let line = &rest[..rest.find('\n').unwrap_or(rest.len())];
-                    if let Some(q) = line.find('"') {
-                        let before = line[..q].trim_end();
-                        assert!(before.ends_with("tr("), "{path}: the `{marker}` label `{}` is not in the catalog", &line[q..]);
-                    }
-                    from = at + marker.len();
-                }
-            }
-        }
-    }
-
-    /// The Settings pages come from the engine as data, so the literal scan above cannot see them:
-    /// every title, section, label, choice, button, note and unit they draw needs a Chinese row
-    /// (#1178). Language names are written in their own language, and a few labels read the same
-    /// everywhere.
-    #[test]
-    fn settings_pages_are_translated() {
-        use effectcraft_engine::prefs::{Item, Kind, LANGUAGES, pages};
-        const VERBATIM: &[&str] = &["", "3D", "1/2", "1/4", "1/8", "sRGB", "Display P3", "px", "s", "%", "MB", "GB", "Hz", "pt"];
-        let mut drawn = Vec::new();
-        for page in pages() {
-            drawn.push(page.title);
-            for item in page.items {
-                match item {
-                    Item::Section(text) | Item::Note(text) | Item::Button { label: text, .. } => drawn.push(text),
-                    Item::Setting { label, kind, .. } => {
-                        drawn.push(label);
-                        match kind {
-                            Kind::Int(_, _, unit) | Kind::Float(_, _, unit) => drawn.push(unit),
-                            Kind::Choice(options) => drawn.extend(options.iter().map(|(l, _)| *l)),
-                            _ => {}
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-        drawn.push("Stored, but not used by EffectCraft yet");
-        let languages: Vec<&str> = LANGUAGES.iter().map(|(l, _)| *l).filter(|l| *l != "Match System").collect();
-        let hans: HashMap<&str, &str> = SIMPLIFIED_CHINESE.iter().copied().collect();
-        let mut missing: Vec<&str> = drawn.into_iter().filter(|en| !VERBATIM.contains(en) && !languages.contains(en) && !hans.contains_key(en)).collect();
-        missing.sort_unstable();
-        missing.dedup();
-        assert!(missing.is_empty(), "Settings text with no Simplified Chinese row: {missing:?}");
-    }
-
-    /// A newly hard-coded interface string fails here instead of shipping in English to every
-    /// language. It is a heuristic - it looks at the call shapes the panels use - and it ignores
-    /// one-character literals, which are punctuation or a key name rather than a sentence.
-    #[test]
-    fn converted_panels_have_no_unwrapped_literals() {
-        for (path, source) in CONVERTED {
-            for (n, line) in source.lines().enumerate() {
-                let code = line.split("//").next().unwrap_or(line);
-                for call in CALLS {
-                    let Some(at) = code.find(call) else { continue };
-                    let rest = &code[at + call.len()..];
-                    let Some(end) = rest.find('"') else { continue };
-                    let literal = &rest[..end];
-                    assert!(
-                        literal.chars().count() < 2 || UNITS.contains(&literal),
-                        "{path}:{}: interface text `{literal}` in `{call}` is not in the catalog",
-                        n + 1
-                    );
-                }
-            }
-        }
-    }
 }
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 105a075e7..fcbfd49bf 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -14,7 +14,6 @@ pub mod color_picker;
 pub mod control;
 pub mod credits;
 pub mod dock;
-mod dock_shared;
 pub mod dock_ui;
 mod expression_diagnostics;
 pub mod frames;
@@ -30,6 +29,7 @@ mod pointer_wrap;
 pub mod prefs_live;
 pub mod state;
 pub mod theme;
+pub mod updates_ui;
 pub mod widgets;
 mod workspace_state;
 
@@ -37,7 +37,7 @@ use std::sync::Arc;
 use std::sync::mpsc::{Receiver, Sender};
 
 pub use control::ControlRequest;
-use dock::PanelKind;
+use dock::{PanelKind, WorkspaceExt as _};
 use effectcraft_engine::Session;
 use effectcraft_engine::project::ItemId;
 use effectcraft_engine::render::RenderOpts;
@@ -47,10 +47,54 @@ use serde_json::json;
 use state::UiState;
 use theme::Tokens;
 
-const SCREENSHOT_TIMEOUT_S: f64 = 4.0;
-/// Seconds without a project change before paused prefetch resumes (see
-/// [`EffectcraftApp::editing`]).
-const EDIT_QUIET: f64 = 0.3;
+mod app;
+mod clock;
+mod hooks;
+
+#[cfg(test)]
+use app::{MAX_PENDING_SHOTS, SCREENSHOT_SETTLE_PASSES, SCREENSHOT_SETTLE_S, SCREENSHOT_TIMEOUT_S};
+pub use clock::AppClock;
+pub use hooks::{DialogDone, FileDialog, Hooks, SystemThemeFn};
+pub use state::ShotTarget;
+
+/// The root surface geometry of the last completed (non-discarded) UI pass.
+///
+/// The window position is deliberately excluded: moving the window does not change the pixels
+/// a screenshot captures. Size and scale-factor changes advance [`Self::epoch`].
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct DrawGeometry {
+    pub rect: egui::Rect,
+    pub ppp: f32,
+    /// Bumped whenever `rect.size()` or `ppp` differs from the previous recorded pass.
+    pub epoch: u64,
+}
+
+/// One `ui.screenshot` request: its reply, its admission reservation and its completion slot.
+struct PendingShot {
+    path: Option<String>,
+    /// What to capture; resolved afresh at every issuance.
+    target: ShotTarget,
+    /// The crop resolved at issuance, **relative to the issued rect's origin** (the image's
+    /// origin); `None` captures the whole surface.
+    crop: Option<[f32; 4]>,
+    reply: Sender<serde_json::Value>,
+    /// App-clock instant after which the request fails instead of waiting.
+    deadline: f64,
+    /// App-clock instant before which the UI must have settled.
+    settle_at: f64,
+    /// Root geometry and geometry epoch the reservation was admitted against.
+    admitted: DrawGeometry,
+    /// Final UI passes completed when the request was admitted.
+    admitted_pass: u64,
+    /// The geometry epoch bound to the issued capture command, if it was issued.
+    issued: Option<DrawGeometry>,
+    /// The shared completion slot; dropping it cancels a late callback.
+    slot: Option<craft_ui::capture::CaptureSlot>,
+    /// Bytes reserved against [`EffectcraftApp::shot_bytes`].
+    reserved_bytes: usize,
+    /// Geometry retries used.
+    attempts: u32,
+}
 
 /// Modal dialogs.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -72,6 +116,7 @@ pub enum Dialog {
     ViewOptions,
     CameraSettings,
     LightSettings,
+    NewPrimitive,
     KeyVelocity,
     KeyInterpolation,
     TimeStretch,
@@ -101,35 +146,6 @@ pub enum Dialog {
     DeleteTemplate,
 }
 
-/// The desktop's light or dark appearance where egui cannot see it (Wayland compositors that send
-/// winit no theme). `None` = the host does not know.
-pub type SystemThemeFn = Box<dyn Fn(&egui::Context) -> Option<egui::Theme>>;
-
-/// A file dialog a host shows without blocking the frame ([`Hooks::file_dialog_async`]).
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum FileDialog {
-    /// Files to open or import with these extensions; several when `many`.
-    Open { exts: Vec<String>, many: bool },
-    /// An EffectCraft project to open.
-    OpenProject,
-    /// A folder.
-    Folder,
-    /// Where to save `default` (a file name or path) with extension `ext` (empty: no filter);
-    /// `project`: the project save dialog, given the file name.
-    Save { default: String, ext: String, project: bool },
-}
-
-impl FileDialog {
-    /// The save dialog for `default`, as [`Hooks::save_dialog`] picks it.
-    pub fn save(default: &str) -> Self {
-        let ext = std::path::Path::new(default).extension().map(|e| e.to_string_lossy().to_string()).unwrap_or_default();
-        Self::Save { default: default.to_string(), project: ext.eq_ignore_ascii_case("ecproj"), ext }
-    }
-}
-
-/// Called with the paths a [`FileDialog`] picked (empty: cancelled), from any thread.
-pub type DialogDone = Box<dyn FnOnce(Vec<String>) + Send>;
-
 /// A non-blocking file dialog's answer for the command that asked (`menus::dialog_answered`).
 pub(crate) struct DialogAnswer {
     pub command: String,
@@ -138,57 +154,6 @@ pub(crate) struct DialogAnswer {
     pub paths: Vec<String>,
 }
 
-/// Host hooks provided by the native app (file pickers etc.).
-#[derive(Default)]
-pub struct Hooks {
-    /// The system appearance for Settings ▸ Appearance ▸ Sync with System (the desktop app reads
-    /// the Linux desktop portal); without it, what egui reports.
-    pub system_theme: Option<SystemThemeFn>,
-    pub pick_files: Option<Box<dyn Fn(&[&str]) -> Vec<String>>>,
-    pub pick_save: Option<Box<dyn Fn(&str) -> Option<String>>>,
-    pub pick_open_project: Option<Box<dyn Fn() -> Option<String>>>,
-    /// Opens the audio output for preview playback (the desktop app uses cpal).
-    pub audio_device: Option<audio::AudioDeviceFactory>,
-    /// Lists audio output devices (Settings ▸ Audio).
-    pub audio_devices: Option<Box<dyn Fn() -> Vec<String>>>,
-    /// Picks a folder (Settings paths).
-    pub pick_folder: Option<Box<dyn Fn() -> Option<String>>>,
-    /// Save dialog for other file kinds: (default name or path, extension; empty: no filter). A
-    /// default path opens the dialog in its folder.
-    pub pick_save_file: Option<Box<dyn Fn(&str, &str) -> Option<String>>>,
-    /// The system clipboard's text (native menu Edit ▸ Paste into a text field).
-    pub clipboard_text: Option<Box<dyn Fn() -> Option<String>>>,
-    /// Application actions the OS performs (`app.hide`, `app.hideOthers`, `app.showAll` on
-    /// macOS). Returns false when the host doesn't handle the id.
-    pub app_action: Option<Box<dyn Fn(&str) -> bool>>,
-    /// Shows a command's file dialog without blocking the frame and calls `done` with the
-    /// answer (the host then asks for a repaint). Used in place of the blocking pickers above for
-    /// the commands' dialogs (File ▸ Import, Open, Save As…) where a modal dialog's nested event
-    /// loop inside a frame is unsafe: on macOS a drag over the window then aborted the app (#511).
-    pub file_dialog_async: Option<Box<dyn Fn(FileDialog, DialogDone)>>,
-    /// Tells the user the graphics device was lost and the window is closing, once. `saved` is
-    /// the auto-save of unsaved changes (`None`: nothing was unsaved), its path or why it failed.
-    pub device_lost: Option<Box<dyn Fn(Option<Result<String, String>>)>>,
-}
-
-impl Hooks {
-    /// The host's save dialog for `default` (a file name or path), offering its extension: the
-    /// project dialog for project files, else [`Hooks::pick_save_file`]. The project dialog is
-    /// the fallback for hosts without that (the web, whose dialog only names the file): on macOS
-    /// a dialog filtered to projects appends `.ecproj` to any other name (#293). `None` when the
-    /// host has no save dialog; `Some(None)` when it was cancelled.
-    pub fn save_dialog(&self, default: &str) -> Option<Option<String>> {
-        let path = std::path::Path::new(default);
-        let ext = path.extension().map(|e| e.to_string_lossy().to_string()).unwrap_or_default();
-        match (&self.pick_save_file, &self.pick_save) {
-            (Some(pick), _) if !ext.eq_ignore_ascii_case("ecproj") => Some(pick(default, &ext)),
-            (_, Some(pick)) => Some(pick(&path.file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_default())),
-            (Some(pick), None) => Some(pick(default, &ext)),
-            (None, None) => None,
-        }
-    }
-}
-
 #[derive(Default)]
 pub struct Playback {
     pub playing: bool,
@@ -268,21 +233,47 @@ pub struct EffectcraftApp {
     pub dialog: Option<Dialog>,
     pub hooks: Hooks,
     pub fps: f32,
+    /// The app clock and the value it had at the last [`EffectcraftApp::tick`].
+    clock: AppClock,
+    now: f64,
     last_time: f64,
     styled: bool,
     fonts_ready: bool,
     /// The interface language the fonts were installed for; `""` until the first frame.
     styled_language: &'static str,
+    /// The root viewport's focus, from the viewport information a logic tick refreshes.
+    focused: bool,
+    /// Whether the last UI pass saw events or a moving/held pointer.
+    input_active: bool,
+    /// The pointer was down in the last UI pass (workspace auto-save waits for it to lift).
+    last_pointer_down: bool,
+    /// Geometry of the last completed, non-discarded UI pass.
+    draw_geom: Option<DrawGeometry>,
+    /// Bumped when the root surface size or pixels-per-point changes.
+    geometry_epoch: u64,
+    /// Per-viewport IME owner, generation and change-cause state for the on-canvas text editor.
+    pub(crate) ime_tracker: egui::ImeContextTracker,
+    /// Completed, non-discarded UI passes since launch.
+    ui_pass_seq: u64,
+    /// A hidden window must run a UI pass (queued input, screenshots, playback children, …).
+    want_paint: bool,
+    /// The synthetic batch moved into raw input has not been applied by a UI pass yet.
+    synthetic_in_flight: bool,
+    /// The events of that batch while egui applies them (never fed to a second pass).
+    synthetic_in_flight_events: Vec<egui::Event>,
+    /// The viewer scale the last UI pass drew at: playback prefetches without a viewer pass.
+    last_viewer_scale: Option<f64>,
     pub(crate) control_rx: Option<Receiver<ControlRequest>>,
     pub(crate) deferred: Vec<(ControlRequest, f64)>,
     pub(crate) synthetic: Vec<egui::Event>,
+    /// Input from floating panels' own OS windows for the main window's next frame.
+    pub(crate) forwarded: ForwardedInput,
     pub(crate) input_waiters: Vec<Sender<serde_json::Value>>,
     /// Control requests waiting for an offloaded job (`wait: true` in the browser).
     pub(crate) job_waiters: Vec<(control::JobWaiter, Sender<serde_json::Value>)>,
-    queued_screenshots: Vec<(u64, f64, u32)>,
-    pending_screenshots: Vec<(u64, Option<String>, Option<[f32; 4]>, Sender<serde_json::Value>, f64)>,
-    next_token: u64,
-    pub(crate) last_ui_time: f64,
+    pending_screenshots: Vec<PendingShot>,
+    /// Pixels reserved by queued and in-flight screenshot requests.
+    shot_bytes: usize,
     /// When the user last did something (input or an edit): Cache Frames When Idle waits for
     /// a second of quiet. (time, project revision then)
     last_activity: (f64, u64),
@@ -315,6 +306,8 @@ pub struct EffectcraftApp {
     device_lost_close: Option<bool>,
     /// Answers of file dialogs shown without blocking ([`Hooks::file_dialog_async`]).
     pub(crate) dialog_answers: (Sender<DialogAnswer>, Receiver<DialogAnswer>),
+    /// Those dialogs that are up, for blocking floating panels' OS windows meanwhile.
+    pub(crate) file_dialogs: FileDialogsUp,
     /// Commands from the native menu bar.
     pub command_inbox: Option<Receiver<String>>,
     /// Pointer position in comp pixels (Info panel).
@@ -325,6 +318,7 @@ pub struct EffectcraftApp {
     pub audio: Option<audio::AudioPlayback>,
     /// Audio scrubbing's open output (Ctrl/Cmd-drag the current time, `playback.scrubAudio`).
     pub scrub: Option<audio::AudioScrub>,
+    pub(crate) updates_rt: updates_ui::Runtime,
     /// Audio panel VU meters.
     pub meter: audio::Meter,
     /// Waveform peak summaries per footage item (see `panels::waveform`).
@@ -340,6 +334,13 @@ pub struct EffectcraftApp {
     /// Docked groups laid out last frame: (active panel, group rect) — `~` maximizes the one
     /// under the pointer.
     pub(crate) dock_rects: Vec<(PanelKind, egui::Rect)>,
+    /// The floating panels' OS windows that drew a panel last frame; one that is gone releases
+    /// its IME state.
+    pub(crate) native_viewports: Vec<egui::ViewportId>,
+    /// The native windows that drew a panel last frame without publishing their IME descriptor.
+    pub(crate) unpublished_viewports: Vec<egui::ViewportId>,
+    /// A floating panel shown by a command: its window comes to the front next frame.
+    pub(crate) pending_panel_raise: Option<PanelKind>,
     /// Home screen: recent-project thumbnail textures by path (None = no thumbnail).
     pub(crate) home_thumbs: std::collections::HashMap<String, Option<egui::TextureHandle>>,
     /// The (project path, saved revision) whose thumbnail was stored last.
@@ -355,1818 +356,69 @@ pub struct EffectcraftApp {
 /// The saved workspaces in the settings store ([`effectcraft_engine::config::ConfigStore`]).
 pub const WORKSPACES_FILE: &str = "workspaces.json";
 
-#[derive(serde::Serialize, serde::Deserialize)]
-struct SavedWorkspaces {
-    #[serde(default)]
-    workspaces: std::collections::BTreeMap<String, dock::DockNode>,
-    #[serde(default)]
-    floating: std::collections::BTreeMap<String, Vec<dock::Floating>>,
+/// Non-blocking file dialogs ([`Hooks::file_dialog_async`]) that are up. While one is, the dock
+/// area blocks floating panels' OS windows, as it does for a modal dialog; otherwise craft-ui
+/// takes the app for inactive while the dialog has the keyboard, and hides floating palettes.
+///
+/// A dialog can end without answering: on macOS a sheet whose window goes away ends without its
+/// completion handler. A dialog is taken for gone, so floating windows never stay blocked, once
+/// one of the app's windows has the keyboard again after none had it, or when one has kept it
+/// for [`FileDialogsUp::UNSEEN`] since the dialog was asked for, so the dialog never showed.
+#[derive(Default)]
+pub(crate) struct FileDialogsUp {
+    count: usize,
+    /// When the oldest dialog up was first checked ([`FileDialogsUp::up`]).
+    since: Option<f64>,
+    /// None of the app's windows had the keyboard since then.
+    left: bool,
 }
 
-impl EffectcraftApp {
-    pub fn new(session: Session) -> Self {
-        let mut ui = UiState::default();
-        let workspace_store = workspace_state::WorkspaceStore::load(session.config.as_deref(), &mut ui);
-        EffectcraftApp {
-            session,
-            ui,
-            workspace_store,
-            tokens: Tokens::for_kind(Default::default()),
-            auto: Default::default(),
-            frames: Frames::default(),
-            playback: Playback::default(),
-            dialog: None,
-            hooks: Hooks::default(),
-            fps: 60.0,
-            last_time: 0.0,
-            styled: false,
-            fonts_ready: false,
-            styled_language: "",
-            control_rx: None,
-            deferred: vec![],
-            synthetic: vec![],
-            input_waiters: vec![],
-            job_waiters: vec![],
-            queued_screenshots: vec![],
-            pending_screenshots: vec![],
-            next_token: 1,
-            last_ui_time: 0.0,
-            last_activity: (0.0, 0),
-            last_edit: (0.0, 0),
-            toast: None,
-            viewer_tex: None,
-            passive_tex: std::collections::HashMap::new(),
-            viewer_native: None,
-            viewer_shown: None,
-            viewer_image: None,
-            viewer_readback: Default::default(),
-            wgpu: None,
-            gpu: None,
-            gpu_checked: false,
-            gpu_failures: None,
-            gpu_failure_applied: None,
-            device_lost_close: None,
-            dialog_answers: std::sync::mpsc::channel(),
-            command_inbox: None,
-            pointer_comp: None,
-            dialog_state: Default::default(),
-            integrated_titlebar: false,
-            audio: None,
-            scrub: None,
-            meter: Default::default(),
-            expression_diagnostics: Default::default(),
-            waveforms: Default::default(),
-            last_reveal: None,
-            applied_prefs: None,
-            recovery: None,
-            dock_rects: vec![],
-            home_thumbs: Default::default(),
-            home_thumb_saved: None,
-            window_title: String::new(),
-            template_thumbs: Default::default(),
-            template_list: None,
-        }
-        .with_ui_commands()
-    }
-
-    /// Keep the saved workspaces for the next session (see [`EffectcraftApp::new`]): After
-    /// Effects' saved workspaces last until they are deleted (#320). `Err` when they weren't
-    /// written (#696): the change applies for this session and a later save retries it, but until
-    /// then a restart brings back what is on disk.
-    pub(crate) fn store_saved_workspaces(&mut self) -> Result<(), String> {
-        let Err(error) = self.workspace_store.save_now(self.session.config.as_deref(), &self.ui) else { return Ok(()) };
-        let message = format!("Workspace changes couldn't be saved and may be lost after a restart: {error}");
-        log::warn!("{message}");
-        self.ui.status = message.clone();
-        // The raw error, so the background retry doesn't report the same failure again.
-        self.workspace_store.error = Some(error);
-        Err(message)
-    }
-
-    /// Offer the frontend's commands (tools, timeline navigation…) for keyboard shortcuts.
-    fn with_ui_commands(mut self) -> Self {
-        let cmds = menus::UI_COMMANDS
-            .iter()
-            .map(|c| effectcraft_engine::shortcuts::UiCommand { id: c.id.into(), label: c.label.into(), shortcut: c.shortcut.map(str::to_string) })
-            .collect();
-        self.session.set_ui_commands(cmds);
-        self
-    }
-
-    /// Show the crash-recovery dialog for a previous run that didn't exit cleanly.
-    pub fn offer_recovery(&mut self, r: effectcraft_engine::autosave::Recovery) {
-        if r.autosave.is_some() {
-            self.recovery = Some(r);
-            self.dialog = Some(Dialog::Recovery);
-        }
-    }
-
-    /// Apply changed settings: theme and brightness, label colours, tool tips, preview caches.
-    pub fn apply_prefs(&mut self, ctx: &egui::Context) {
-        // Sync with System re-applies when the system appearance changes (the host wakes the UI;
-        // nothing polls).
-        let system = if self.session.prefs.appearance.appearance_mode == "auto" { self.system_light(ctx) } else { None };
-        if self.applied_prefs == Some((self.session.prefs_revision, system)) {
-            return;
-        }
-        self.applied_prefs = Some((self.session.prefs_revision, system));
-        let p = &self.session.prefs;
-        self.ui.theme = theme::ThemeKind::from_name(p.appearance.resolved_theme(system)).unwrap_or_default();
-        self.tokens = Tokens::from_prefs(p, self.ui.theme);
-        theme::apply_visuals(ctx, &self.tokens);
-        ctx.set_theme(theme::theme_preference(&p.appearance.appearance_mode, self.ui.theme.is_light()));
-        let tips = p.general.show_tool_tips;
-        ctx.all_styles_mut(|s| s.interaction.tooltip_delay = if tips { 0.5 } else { f32::INFINITY });
-        // Settings ▸ Appearance ▸ UI Scale (#284). egui's own Ctrl+= / Ctrl+- / Ctrl+0 zoom stays
-        // off: Ctrl+0 is Window ▸ Project, and the scale is a setting.
-        ctx.options_mut(|o| o.zoom_with_keyboard = false);
-        ctx.set_zoom_factor(p.appearance.ui_scale as f32 / 100.0);
-        self.ui.cache_when_idle = p.previews.cache_frames_when_idle;
-        self.ui.viewer.fast_preview = p.previews.fast_previews;
-        self.frames.set_budget(p.cache_budgets(self.session.sys_memory).preview);
-    }
-
-    /// Change settings from the UI (applied next frame and saved).
-    pub fn set_pref(&mut self, key: &str, value: serde_json::Value) -> Result<(), String> {
-        self.session.prefs.set(key, value)?;
-        self.session.prefs_changed();
-        self.session.save_prefs();
-        Ok(())
-    }
-
-    pub fn with_control(mut self, rx: Receiver<ControlRequest>) -> Self {
-        self.control_rx = Some(rx);
-        self
-    }
-
-    /// Show theme `k`: the appearance mode becomes its family's (Dark or Light), and `k` that
-    /// family's theme.
-    pub fn set_theme(&mut self, ctx: &egui::Context, k: theme::ThemeKind) {
-        if let Err(e) = self.set_pref("appearance.theme", json!(k.name())) {
-            self.ui.status = e;
-        }
-        self.apply_prefs(ctx);
-    }
-
-    /// The system appearance: light (`Some(true)`), dark, or unknown. The host's answer (the Linux
-    /// desktop portal) wins over egui's, which Wayland compositors often leave empty.
-    pub fn system_light(&self, ctx: &egui::Context) -> Option<bool> {
-        self.hooks.system_theme.as_ref().and_then(|read| read(ctx)).or_else(|| ctx.system_theme()).map(|t| t == egui::Theme::Light)
-    }
-
-    /// The Tools bar's appearance button (`view.theme.toggle`): Sync with System, then Light, then
-    /// Dark, then Sync with System again. The light and dark theme choices are kept.
-    pub fn cycle_appearance(&mut self, ctx: &egui::Context) {
-        let next = match self.session.prefs.appearance.appearance_mode.as_str() {
-            "auto" => "light",
-            "light" => "dark",
-            _ => "auto",
-        };
-        if let Err(e) = self.set_pref("appearance.appearanceMode", json!(next)) {
-            self.ui.status = e;
-        }
-        self.apply_prefs(ctx);
-    }
-
-    pub fn set_workspace(&mut self, name: &str) {
-        // Learn: the Home screen's Learn tab (tutorials) in the Composition panel. Leaving it for
-        // another workspace closes the Home screen again: it stayed over every workspace until a
-        // project was created (#272).
-        if name == "Learn" {
-            self.ui.start_screen = true;
-            self.ui.home_learn = true;
-            self.ui.home_templates = false;
-        } else if self.ui.workspace == "Learn" {
-            self.ui.start_screen = false;
-            self.ui.home_learn = false;
-        }
-        self.ui.workspace = name.to_string();
-        self.ui.dock = self.ui.saved_workspaces.get(name).cloned().unwrap_or_else(|| dock::workspace(name));
-        self.ui.floating = self.ui.saved_floating.get(name).cloned().unwrap_or_else(|| dock::workspace_floating(name));
-        self.ui.maximized = None;
-    }
-
-    /// Built-in workspaces followed by the saved ones (Window ▸ Workspace ▸ Save as New Workspace).
-    pub fn workspace_names(&self) -> Vec<String> {
-        let mut v: Vec<String> = dock::WORKSPACES.iter().map(|s| s.to_string()).collect();
-        v.extend(self.saved_workspace_names());
-        v
-    }
-
-    /// The workspaces the user saved under a new name (built-ins whose changes were saved are
-    /// not repeated), in name order.
-    pub fn saved_workspace_names(&self) -> Vec<String> {
-        self.ui.saved_workspaces.keys().filter(|k| !dock::WORKSPACES.contains(&k.as_str())).cloned().collect()
-    }
-
-    /// The open Gradient Editor's draft (`panels::gradient_editor`): what OK would set.
-    pub fn gradient_draft(&self) -> &panels::gradient_editor::Draft {
-        &self.dialog_state.gradient
-    }
-
-    /// The open Gradient Editor's draft, to edit (tests and automation; the editor's own fields
-    /// do the same).
-    pub fn gradient_draft_mut(&mut self) -> &mut panels::gradient_editor::Draft {
-        &mut self.dialog_state.gradient
-    }
-
-    /// Feed this frame's share of the queued synthetic input (control channel `ui.click`,
-    /// `ui.drag`…) into `raw_input`. Pointer events go one per frame so egui sees press → moves
-    /// → release as a real gesture.
-    pub fn feed_synthetic(&mut self, raw_input: &mut egui::RawInput) {
-        if !self.synthetic.is_empty() {
-            // Pointer events go one per frame so egui sees press → moves → release as a real drag.
-            let pointer = |e: &egui::Event| matches!(e, egui::Event::PointerMoved(_) | egui::Event::PointerButton { .. } | egui::Event::MouseWheel { .. });
-            let n = if pointer(&self.synthetic[0]) {
-                1
-            } else {
-                self.synthetic
-                    .iter()
-                    .position(|e| pointer(e) || matches!(e, egui::Event::Key { pressed: false, .. }))
-                    .map_or(self.synthetic.len(), |i| if pointer(&self.synthetic[i]) { i.max(1) } else { i + 1 })
-            };
-            raw_input.events.extend(self.synthetic.drain(..n));
-        }
-    }
-
-    /// Show panel `p` (opening it in its usual place if it is closed), bring it to the front and
-    /// give it the focus: Window ▸ <panel>.
-    pub fn show_panel(&mut self, p: PanelKind) {
-        if !self.ui.floating.iter().any(|f| f.panels.contains(&p)) && self.ui.maximized.is_some_and(|m| m != p) {
-            self.ui.maximized = None;
-        }
-        self.raise_panel(p);
-        self.ui.focused = p;
-    }
-
-    /// Bring panel `p` to the front of its group, opening it in its usual place if it is closed,
-    /// without moving the focus (a comp opening brings up its viewer, an effect applied brings up
-    /// Effect Controls).
-    pub fn raise_panel(&mut self, p: PanelKind) {
-        if self.ui.floating.iter().any(|group| group.panels.contains(&p)) {
-            self.edit_layout(|layout| layout.apply(craft_ui::docking::Action::Activate { panel: p }).is_ok());
-            return;
-        }
-        if !self.ui.dock.contains(p) {
-            // The Composition panel lives in the centre, with the Layer panel and other viewers;
-            // with none of those left, above the Timeline.
-            let centre = |d: &dock::DockNode| {
-                let mut v = Vec::new();
-                d.panels(&mut v);
-                v.into_iter().find(|q| matches!(q, PanelKind::Layer | PanelKind::Viewer(_) | PanelKind::Flowchart | PanelKind::Footage))
-            };
-            let near = match p {
-                PanelKind::Composition => match centre(&self.ui.dock) {
-                    Some(q) => q,
-                    None if self.ui.dock.dock_panel(p, PanelKind::Timeline, dock::Zone::Top) => {
-                        self.ui.dock.activate(p);
-                        return;
-                    }
-                    None => PanelKind::EffectsPresets,
-                },
-                PanelKind::Layer | PanelKind::Flowchart | PanelKind::Viewer(_) => PanelKind::Composition,
-                PanelKind::RenderQueue => PanelKind::Timeline,
-                PanelKind::EffectControls | PanelKind::History => PanelKind::Project,
-                _ => PanelKind::EffectsPresets,
-            };
-            self.ui.dock.open_near(p, near);
-        }
-        self.ui.dock.activate(p);
-    }
-
-    pub fn render_source(&self) -> RenderSource {
-        RenderSource {
-            project: self.session.project.clone(),
-            footage: self.session.footage.clone(),
-            expr: self.session.expr.clone(),
-            layer_cache: self.session.layer_cache.clone(),
-            gpu: self.gpu.clone(),
-            gpu_display: self.gpu_display(),
-            disk: self.session.disk_cache.clone(),
-        }
-    }
-
-    /// Keep GPU-composited viewer frames on the GPU (drawn from their texture). The browser can't
-    /// read frames back (its thread can't wait for the GPU), so there the viewer shows GPU frames
-    /// directly whenever it draws them plainly (RGB, no exposure, no region of interest); the
-    /// desktop reads them back (see [`frames::RenderSource::gpu_display`]).
-    fn gpu_display(&self) -> bool {
-        let v = &self.session.state.viewer;
-        cfg!(target_arch = "wasm32")
-            && v.channel == effectcraft_engine::viewer::Channel::Rgb
-            && v.exposure == 0.0
-            && self.session.state.region_of_interest.is_none()
-            && self.ui.viewer.extended.is_none()
-    }
-
-    /// The UI draws its panels and handles input such as dropped files. Until the fonts are
-    /// installed (the first frames) it draws nothing, and that input goes unhandled.
-    pub fn is_ready(&self) -> bool {
-        self.fonts_ready
-    }
-
-    /// Provide the executable/embedding host's device notifications. The host installs the
-    /// handlers once; this frontend never replaces handlers on a borrowed device.
-    pub fn set_gpu_failure_bridge(&mut self, bridge: gpu_failure::GpuFailureBridge) {
-        if let Some(gpu) = &self.gpu {
-            bridge.forward_to(gpu.context().device_failure_notifier());
-        }
-        self.gpu_failures = Some(bridge);
-    }
-
-    fn apply_gpu_failure(&mut self, ctx: &egui::Context) {
-        let Some(bridge) = &self.gpu_failures else { return };
-        // Readback deadlines can retire the compositor without a host device notification.
-        if let Some(gpu) = &self.gpu
-            && let Err(reason) = gpu.context().check_health()
-        {
-            bridge.report(&reason, false);
-        }
-        let Some(failure) = bridge.failure() else { return };
-        if self.gpu_failure_applied == Some(failure.presentation_lost) {
-            return;
-        }
-        self.gpu_failure_applied = Some(failure.presentation_lost);
-        self.gpu_checked = true;
-        self.frames.retire_gpu();
-        self.session.accel = None;
-        self.session.accel_note = Some(format!("GPU preview retired: {}", failure.reason));
-        self.session.layer_cache.clear();
-        self.gpu = None;
-        if let Some(rs) = &self.wgpu {
-            let mut renderer = rs.renderer.write();
-            if let Some((id, _, _)) = &self.viewer_native {
-                renderer.free_texture(id);
-            }
-            for (_, texture) in self.passive_tex.values() {
-                if let panels::viewers::PassiveTexture::Gpu(id, _) = texture {
-                    renderer.free_texture(id);
-                }
-            }
-        }
-        self.viewer_native = None;
-        self.passive_tex.retain(|_, (_, texture)| matches!(texture, panels::viewers::PassiveTexture::Cpu(_)));
-        self.viewer_shown = self.viewer_tex.as_ref().map(|(texture, key, _)| (texture.id(), *key));
-        self.viewer_image = None;
-        // Old completion closures retain only their detached slot, not the replacement.
-        self.viewer_readback = Default::default();
-        self.wgpu = None;
-        self.ui.status = if failure.presentation_lost {
-            "Graphics device lost. The project is still open; presentation requires restarting the application.".into()
-        } else {
-            "Shared GPU preview disabled; CPU compositing remains available.".into()
-        };
-        log::warn!("GPU preview retired: {}", failure.reason);
-        ctx.request_repaint();
-    }
-
-    /// After the graphics device is lost, eframe's renderer cannot draw again: any mesh makes
-    /// egui-wgpu panic on the main thread when it cannot stage its index buffer (#591). Draw
-    /// nothing from then on, auto-save a project with unsaved changes (keeping the crash
-    /// recovery marker, so the next launch offers it) and close the window.
-    fn close_after_device_loss(&mut self, ctx: &egui::Context) {
-        if self.device_lost_close.is_some() {
-            return;
-        }
-        let keep_recovery = self.session.is_dirty();
-        let saved = keep_recovery.then(|| match self.session.autosave_now().and_then(|path| self.session.autosave_wait().map(|()| path)) {
-            Ok(path) => {
-                log::warn!("graphics device lost: auto-saved {path}; the next launch offers to recover it");
-                Ok(path)
-            }
-            Err(e) => {
-                log::error!("graphics device lost: {e}");
-                Err(e.to_string())
-            }
-        });
-        self.device_lost_close = Some(keep_recovery);
-        log::warn!("graphics device lost: closing the window");
-        if let Some(tell) = &self.hooks.device_lost {
-            tell(saved);
-        }
-        ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-    }
-
-    /// Run the commands whose non-blocking file dialogs have been answered.
-    pub(crate) fn run_dialog_answers(&mut self) {
-        while let Ok(answer) = self.dialog_answers.1.try_recv() {
-            menus::dialog_answered(self, answer);
-        }
-    }
-
-    /// Set up the GPU compositor on egui-wgpu's device (once). Without an adapter that runs
-    /// compute shaders (WebGL2, software GL) everything stays on the CPU.
-    pub(crate) fn init_gpu(&mut self, frame: &eframe::Frame) {
-        if self.gpu_checked {
-            return;
-        }
-        self.gpu_checked = true;
-        if self.gpu_failures.as_ref().is_some_and(|bridge| bridge.failure().is_some()) {
-            return;
-        }
-        let Some(rs) = frame.wgpu_render_state() else { return };
-        // Help ▸ System Compatibility Report names the adapter and backend the window got.
-        let info = rs.adapter.get_info();
-        self.session.window_adapter = Some(format!(
-            "{} ({:?}, {:?}{})",
-            info.name,
-            info.backend,
-            info.device_type,
-            if info.driver.is_empty() { String::new() } else { format!(", {} {}", info.driver, info.driver_info) }
-        ));
-        // Backend validation can panic on shader compilation even when device creation
-        // succeeded. Keep the document and the egui renderer, and use CPU compositing.
-        let gpu = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| effectcraft_gpu::Gpu::new(&rs.adapter, rs.device.clone(), rs.queue.clone())));
-        match gpu {
-            Ok(Ok(g)) => {
-                if let Some(bridge) = &self.gpu_failures {
-                    bridge.forward_to(g.context().device_failure_notifier());
-                    if bridge.failure().is_some() {
-                        return;
-                    }
-                }
-                log::info!("GPU compositor: {}", effectcraft_engine::render::Accelerator::name(&g));
-                self.session.accel = Some(Arc::new(g.clone()));
-                self.gpu = Some(g);
-                self.wgpu = Some(rs.clone());
-            }
-            Ok(Err(e)) => {
-                log::info!("GPU compositor unavailable: {e}");
-                self.session.accel_note = Some(format!("GPU compositor unavailable: {e}"));
-            }
-            Err(e) => {
-                let reason = e.downcast_ref::<String>().map(String::as_str).or_else(|| e.downcast_ref::<&str>().copied()).unwrap_or("backend panicked");
-                log::warn!("GPU compositor setup failed; using CPU compositing: {reason}");
-                self.session.accel_note = Some(format!("GPU compositor setup failed: {reason}"));
-            }
-        }
-    }
-
-    /// The viewer shows a frame composited on the GPU (drawn from its wgpu texture).
-    pub fn viewer_on_gpu(&self) -> bool {
-        matches!((&self.viewer_shown, &self.viewer_native), (Some(s), Some(n)) if s.1 == n.1)
-    }
-
-    /// The GPU compositor's adapter, when the viewer has one.
-    pub fn gpu_adapter(&self) -> Option<String> {
-        self.gpu.as_ref().map(effectcraft_engine::render::Accelerator::name)
-    }
-
-    /// The size of the viewer frame's texture (CPU frames; fitted to the GPU's texture limit).
-    pub fn viewer_texture_size(&self) -> Option<[usize; 2]> {
-        self.viewer_tex.as_ref().map(|(t, _, _)| t.size())
-    }
-
-    /// The viewer's current pixels as 8-bit premultiplied RGBA, reading a GPU frame back the
-    /// first time something asks for it.
-    ///
-    /// The browser can't wait for the GPU: there the first call starts an asynchronous readback
-    /// and returns `None`; a later call (the next frame) has the pixels.
-    pub fn viewer_pixels(&mut self) -> Option<Arc<egui::ColorImage>> {
-        let to_image = |bytes: Vec<u8>, w: u32, h: u32| {
-            let px = bytes.as_chunks::<4>().0.iter().map(|c| egui::Color32::from_rgba_premultiplied(c[0], c[1], c[2], c[3])).collect();
-            Arc::new(egui::ColorImage::new([w as usize, h as usize], px))
-        };
-        if self.viewer_image.is_none()
-            && let (Some((_, key, f)), Some(g)) = (&self.viewer_native, &self.gpu)
-            && self.viewer_shown.as_ref().map(|s| s.1) == Some(*key)
-        {
-            if cfg!(target_arch = "wasm32") {
-                let ready = self.viewer_readback.1.lock().ok().and_then(|mut r| r.take_if(|r| r.0 == *key));
-                if let Some((_, img)) = ready {
-                    self.viewer_image = Some(img);
-                } else if self.viewer_readback.0 != Some(*key) {
-                    self.viewer_readback.0 = Some(*key);
-                    let (slot, k, (w, h)) = (self.viewer_readback.1.clone(), *key, (f.width, f.height));
-                    let ctx = self.frames.context();
-                    g.read_display_async(f, move |bytes| {
-                        if let (Some(b), Ok(mut s)) = (bytes, slot.lock()) {
-                            *s = Some((k, to_image(b, w, h)));
-                        }
-                        if let Some(c) = ctx {
-                            c.request_repaint();
-                        }
-                    });
-                }
-            } else if let Some(bytes) = g.read_display(f) {
-                self.viewer_image = Some(to_image(bytes, f.width, f.height));
-            }
-        }
-        self.viewer_image.clone()
-    }
-
-    /// The viewer's Resolution: the active composition's (saved with the project).
-    pub fn viewer_res(&self) -> state::Resolution {
-        self.session.active_comp().map(|c| c.resolution).unwrap_or_default()
-    }
-
-    /// The render scale used by the viewer right now.
-    pub fn viewer_scale(&self, zoom: f32, ppp: f32) -> f64 {
-        // The preview's Resolution (when not Auto) while it plays.
-        if self.playback.playing
-            && let Some(f) = self.playback.res
-        {
-            return state::Resolution::from_factor(f.into()).scale(zoom, ppp);
-        }
-        // Auto follows the zoom alike while playing and paused, so frames cached while scrubbing
-        // play back, and frames cached by a preview stay on screen when it stops.
-        let res = self.viewer_res();
-        let full = res.scale(zoom, ppp);
-        // Fast Previews ▸ Adaptive Resolution / Fast Draft: lower resolution while dragging.
-        let (_, k) = self.session.state.viewer.fast_previews.render(self.ui.viewer.interacting || self.ui.viewer.property_interacting);
-        if k < 1.0 && res.is_auto() {
-            return full.min((full * 0.5).max(self.session.prefs.adaptive_limit()));
-        }
-        full
-    }
-
-    /// The cache key of viewer frame `frame` of `comp` at `scale` (see [`Self::frame_series`]).
-    pub fn frame_key(&self, comp: ItemId, frame: i64, scale: f64) -> FrameKey {
-        FrameKey { frame, ..self.frame_series(comp, scale) }
-    }
-
-    /// The key of frame 0 of `comp`'s viewer frames at `scale` (the content, view and render
-    /// options are the same for every frame: loops compute this once).
-    pub fn frame_series(&self, comp: ItemId, scale: f64) -> FrameKey {
-        FrameKey {
-            revision: self.session.revision,
-            content: self.frames.content_of(&self.session.project, self.session.revision, comp),
-            comp: comp.0,
-            frame: 0,
-            scale: (scale * 1000.0).round() as u32,
-            view: self.view_hash(comp),
-            opts: frames::opts_hash(&self.frame_opts(comp, scale)),
-        }
-    }
-
-    /// The frame series the viewer of `comp` shows now (its scale, view and options, for the
-    /// comp's current content): what the cache bars count.
-    pub fn shown_series(&self, comp: ItemId) -> FrameKey {
-        let scale = self.viewer_shown.as_ref().filter(|(_, k)| k.comp == comp.0).map_or(1000, |(_, k)| k.scale);
-        self.frame_series(comp, scale as f64 / 1000.0)
-    }
-
-    /// Hash of the comp viewer's 3D view camera (0 for the active camera view).
-    pub fn view_hash(&self, comp: ItemId) -> u64 {
-        use std::hash::{Hash, Hasher};
-        let mut h = std::collections::hash_map::DefaultHasher::new();
-        // The region of interest changes what is rendered too.
-        let roi = self.viewer_region(comp);
-        if let Some(r) = roi {
-            r.map(f64::to_bits).hash(&mut h);
-        }
-        let Some(cam) = self.session.view_camera(comp) else { return if roi.is_some() { h.finish() | 1 } else { 0 } };
-        for row in cam.view.0 {
-            for v in row {
-                v.to_bits().hash(&mut h);
-            }
-        }
-        cam.zoom.to_bits().hash(&mut h);
-        cam.ortho.hash(&mut h);
-        h.finish() | 1
-    }
-
-    /// The comp-space region viewer frames of `comp` cover: the region of interest, else the
-    /// Extended Viewer's area (frame plus pasteboard), else `None` (the whole frame).
-    pub fn viewer_region(&self, comp: ItemId) -> Option<[f64; 4]> {
-        if self.session.active_comp_id() != Some(comp) {
-            return None;
-        }
-        self.session.state.region_of_interest.or(self.ui.viewer.extended)
-    }
-
-    /// Request a prefetch frame render (no-op if cached/in flight).
-    pub fn request_frame(&self, comp: ItemId, frame: i64, scale: f64) {
-        self.request_frame_with(comp, frame, scale, false);
-    }
-
-    /// Request the frame on screen: rendered before any queued prefetch.
-    pub fn request_frame_urgent(&self, comp: ItemId, frame: i64, scale: f64) {
-        self.request_frame_with(comp, frame, scale, true);
-    }
-
-    /// Render options of viewer frames of `comp` at `scale`.
-    pub fn frame_opts(&self, comp: ItemId, scale: f64) -> RenderOpts {
-        let (draft, _) = self.session.state.viewer.fast_previews.render(self.ui.viewer.interacting || self.ui.viewer.property_interacting);
-        let roi = self.viewer_region(comp);
-        RenderOpts {
-            scale,
-            motion_blur: true,
-            guides: true,
-            draft: self.ui.viewer.fast_preview || draft,
-            view: self.session.view_camera(comp),
-            roi,
-            backend: effectcraft_engine::render::Backend::Auto,
-            nested_switches: self.session.prefs.general.switches_affect_nested_comps,
-            draft_shadows: self.session.prefs.three_d.realtime_shadows,
-            proxy: Default::default(),
-        }
-    }
-
-    fn request_frame_with(&self, comp: ItemId, frame: i64, scale: f64, urgent: bool) {
-        let Some(c) = self.session.project.comp(comp) else { return };
-        let key = self.frame_key(comp, frame, scale);
-        let t = c.frame_rate.tick_of(frame);
-        let opts = self.frame_opts(comp, scale);
-        if urgent {
-            self.frames.request_urgent(&self.render_source(), key, comp, t, opts);
-        } else {
-            self.frames.request(&self.render_source(), key, comp, t, opts);
-        }
-    }
-
-    // ---------------------------------------------------------------- playback
-
-    pub fn play(&mut self, now: f64) {
-        let sc = self.session.prefs.preview.current;
-        self.play_with(now, sc);
-    }
-
-    /// Start the preview of a Preview panel shortcut (its range, play-from, rate, skip,
-    /// resolution, loop, caching, full screen and include options).
-    pub fn play_with(&mut self, now: f64, sc: effectcraft_engine::preview::PreviewShortcut) {
-        let Some(c) = self.session.active_comp_arc() else { return };
-        let preset = self.session.prefs.preview.get(sc).clone();
-        let plan = effectcraft_engine::preview::plan(&preset, &c, self.session.time());
-        let fr = c.frame_rate;
-        if plan.video {
-            self.session.set_time(fr.tick_of(plan.first));
-        }
-        let restore_max = preset.full_screen.then_some(self.ui.maximized);
-        let viewer = panels::viewers::active_panel(self);
-        if preset.full_screen && self.ui.dock.contains(viewer) {
-            self.ui.maximized = Some(viewer);
-        }
-        self.playback = Playback {
-            playing: true,
-            start_wall: now,
-            start_time: fr.tick_of(plan.first),
-            start_frame: plan.first,
-            shown: 0,
-            waiting: false,
-            fps: plan.fps,
-            shortcut: sc,
-            plan: Some(plan),
-            caching: plan.cache_first && plan.video,
-            res: preset.resolution.factor(preset.custom_resolution),
-            overlays: preset.include_overlays,
-            layer_controls: preset.include_layer_controls,
-            restore_max,
-            audio_frame: (!plan.video).then_some(plan.first),
-            audio_held: false,
-            shown_at: Default::default(),
-        };
-        if !self.playback.caching {
-            if plan.video {
-                self.playback.audio_held = self.audio_plays();
-            } else {
-                self.start_audio(fr.tick_of(plan.first));
-            }
-        }
-    }
-
-    /// The preview includes audio at the comp's frame rate and the comp has something audible.
-    fn audio_plays(&self) -> bool {
-        let (Some(pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return false };
-        let Some(c) = self.session.project.comp(cid) else { return false };
-        // A preview at another frame rate plays slower or faster than real time: silent.
-        pl.audio && (pl.fps - c.frame_rate.as_f64()).abs() <= 0.01 && effectcraft_engine::render::audio::comp_has_audio(&self.session.project, cid)
-    }
-
-    /// Start audio preview from comp time `t` when [`Self::audio_plays`] and an output device
-    /// opens.
-    fn start_audio(&mut self, t: Tick) {
-        self.audio = None;
-        self.meter.clipped = [false; 2];
-        let (Some(pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return };
-        let Some(c) = self.session.project.comp_arc(cid).filter(|_| self.audio_plays()) else { return };
-        let out = audio::AudioOutput::from_prefs(&self.session.prefs);
-        let Some(dev) = self.hooks.audio_device.as_ref().and_then(|f| f(&out)) else { return };
-        let mix = self.session.prefs.audio.preview_sample_rate;
-        let fr = c.frame_rate;
-        match audio::AudioPlayback::start(dev, self.render_source(), cid, t, fr.tick_of(pl.start), fr.tick_of(pl.end + 1), pl.looping, mix) {
-            Ok(a) => self.audio = Some(a),
-            Err(e) => log::warn!("audio preview: {e}"),
-        }
-    }
-
-    /// Audio scrubbing: play the frame of `comp` at `t` (see [`audio::AudioScrub`]), opening the
-    /// output on first use. Silent comps and missing devices do nothing.
-    pub fn scrub_audio(&mut self, comp: ItemId, t: Tick, now: f64) {
-        if self.playback.playing || !effectcraft_engine::render::audio::comp_has_audio(&self.session.project, comp) {
-            return;
-        }
-        if self.scrub.is_none() {
-            let out = audio::AudioOutput::from_prefs(&self.session.prefs);
-            let Some(dev) = self.hooks.audio_device.as_ref().and_then(|f| f(&out)) else { return };
-            match audio::AudioScrub::open(dev, now) {
-                Ok(s) => self.scrub = Some(s),
-                Err(e) => {
-                    log::warn!("audio scrubbing: {e}");
-                    return;
-                }
-            }
-        }
-        let src = self.render_source();
-        let mix = self.session.prefs.audio.preview_sample_rate;
-        if let Some(s) = &mut self.scrub {
-            s.play(&src, comp, t, mix, now);
-        }
-    }
-
-    pub fn stop(&mut self) {
-        let was = std::mem::replace(&mut self.playback.playing, false);
-        self.audio = None;
-        self.playback.caching = false;
-        if !was {
-            return;
-        }
-        if let Some(m) = self.playback.restore_max.take() {
-            self.ui.maximized = m;
-        }
-        let Some(pl) = self.playback.plan else { return };
-        let move_time = self.session.prefs.preview.get(self.playback.shortcut).move_time_to_preview_time;
-        if !move_time {
-            self.session.set_time(pl.origin);
-        } else if let Some(f) = self.playback.audio_frame
-            && let Some(c) = self.session.active_comp()
-        {
-            let t = c.frame_rate.tick_of(f);
-            self.session.set_time(t);
-        }
-    }
+impl FileDialogsUp {
+    /// Seconds a dialog has to take the keyboard from the app's windows. The desktop portal can
+    /// take a moment to show the first dialog on Linux.
+    const UNSEEN: f64 = 2.0;
 
-    pub fn toggle_play(&mut self, now: f64) {
-        let sc = self.session.prefs.preview.current;
-        self.toggle_play_with(now, sc);
-    }
-
-    /// A preview shortcut pressed: start its preview, or stop the running one. While Cache
-    /// Before Playback is still rendering, "If caching, play cached frames" plays what is
-    /// cached so far instead of stopping.
-    pub fn toggle_play_with(&mut self, now: f64, sc: effectcraft_engine::preview::PreviewShortcut) {
-        if !self.playback.playing {
-            self.play_with(now, sc);
-            return;
+    pub(crate) fn opened(&mut self) {
+        if self.count == 0 {
+            *self = Self::default();
         }
-        if self.playback.caching && self.session.prefs.preview.get(self.playback.shortcut).play_cached_frames && self.play_cached(now) {
-            return;
-        }
-        self.stop();
-    }
-
-    /// Cut the caching preview down to the frames cached from its first frame on and play them.
-    fn play_cached(&mut self, now: f64) -> bool {
-        let (Some(mut pl), Some(cid)) = (self.playback.plan, self.session.active_comp_id()) else { return false };
-        let scale = self.viewer_shown.as_ref().map(|(_, k)| k.scale as f64 / 1000.0).unwrap_or(1.0);
-        let series = self.frame_series(cid, scale);
-        let mut last = None;
-        let mut f = pl.first;
-        while f <= pl.end && self.frames.is_cached(&FrameKey { frame: f, ..series }) {
-            last = Some(f);
-            f += pl.step;
-        }
-        let Some(last) = last else { return false };
-        pl.end = last;
-        pl.start = pl.first;
-        self.playback.plan = Some(pl);
-        self.playback.caching = false;
-        self.playback.start_wall = now;
-        self.playback.start_frame = pl.first;
-        let t = self.session.active_comp().map(|c| c.frame_rate.tick_of(pl.first)).unwrap_or_default();
-        self.start_audio(t);
-        true
-    }
-
-    /// A preview plays with Video off in the Preview panel (audio only): the current time stays
-    /// put, so the viewer and Timeline say so instead of looking stuck (#1118). The frame under
-    /// the audible sample, when one is known.
-    pub fn video_preview_off(&self) -> Option<Option<i64>> {
-        let p = self.playback.plan.filter(|_| self.playback.playing)?;
-        (!p.video).then_some(self.playback.audio_frame)
-    }
-
-    /// The viewer shows grids, guides and safe margins (hidden while a preview without
-    /// Include Overlays plays).
-    pub fn overlays_visible(&self) -> bool {
-        !self.playback.playing || self.playback.overlays
+        self.count = self.count.saturating_add(1);
     }
 
-    /// The viewer shows layer handles and paths (View ▸ Show Layer Controls, and Include Layer
-    /// Controls while a preview plays).
-    pub fn layer_controls_visible(&self) -> bool {
-        self.ui.viewer.show_layer_controls && (!self.playback.playing || self.playback.layer_controls)
+    pub(crate) fn answered(&mut self) {
+        self.count = self.count.saturating_sub(1);
     }
 
-    /// RAM preview: advance at the preview's frame rate when frames are cached; otherwise hold
-    /// and keep rendering ahead (the green cache bar fills, then playback runs in real time).
-    fn advance_playback(&mut self, ctx: &egui::Context, scale: f64) {
-        let Some(cid) = self.session.active_comp_id() else { return };
-        let Some(c) = self.session.project.comp_arc(cid) else { return };
-        let now = ctx.input(|i| i.time);
-        let fr = c.frame_rate;
-        let plan = self.playback.plan.filter(|_| self.playback.playing);
-        let (wa, wb) = match plan {
-            Some(p) => (p.start, p.end),
-            None => (fr.frame_at(c.work_area.0), fr.frame_at(c.work_area.1 - c.frame_duration())),
-        };
-        let looping = plan.is_none_or(|p| p.looping);
-        let video = plan.is_none_or(|p| p.video);
-        // Prefetch ahead.
-        let cur = fr.frame_at(self.session.time());
-        // While paused (scrubbing, editing) the viewer's frame comes first: prefetch only a few
-        // frames, only once it is done, and not while edits keep coming (a layer dragged in the
-        // viewer): those frames would be stale at the next step and would hold the CPU and GPU
-        // the next viewer frame needs.
-        let ahead = if self.playback.playing {
-            (self.frames_parallelism() * 2).max(4) as i64
-        } else if self.frames.urgent_pending() {
-            0
-        } else if let Some(wait) = self.editing(now) {
-            ctx.request_repaint_after(std::time::Duration::from_secs_f64(wait));
-            0
-        } else {
-            // Keep workers available for a newly edited viewer frame. Running obsolete
-            // background renders cannot be preempted by the priority queue.
-            self.frames_parallelism().saturating_sub(1).min(2) as i64
-        };
-        let mut queued = self.frames.inflight();
-        let series = self.frame_series(cid, scale);
-        // The preview's position orders prefetch and eviction (#595).
-        let playhead = plan.filter(|p| p.video).map(|p| frames::Playhead { series, cur, start: p.start, end: p.end, step: p.step, looping: p.looping });
-        self.frames.set_playhead(playhead);
-        if self.playback.caching
-            && let Some(p) = plan
-        {
-            // Cache Before Playback: the range in play order, then start the clock. A range
-            // larger than the RAM preview budget is cut to the frames that fit (caching more
-            // would evict the first ones and never finish).
-            let mut all = true;
-            let n = (p.end - p.start) / p.step + 1;
-            let fit = self.frames_that_fit(&c, scale);
-            if n > fit {
-                let mut cut = p;
-                (cut.start, cut.end) = (p.first, (p.first + (fit - 1) * p.step).min(p.end));
-                self.playback.plan = Some(cut);
-                self.toast = Some((format!("Preview cut to {fit} of {n} frames: no more fit in the RAM preview (Settings ▸ Memory & CPU)"), now));
-                ctx.request_repaint();
-                return;
-            }
-            let order: Vec<i64> = (0..n).filter_map(|k| p.frame_after(p.first, k)).collect();
-            for f in order {
-                if self.frames.is_cached(&FrameKey { frame: f, ..series }) {
-                    continue;
-                }
-                all = false;
-                if queued < ahead as usize {
-                    self.request_frame(cid, f, scale);
-                    queued += 1;
-                }
-            }
-            self.playback.waiting = !all;
-            if all {
-                self.playback.caching = false;
-                self.playback.start_wall = now;
-                self.playback.start_frame = p.first;
-                self.session.set_time(fr.tick_of(p.first));
-                self.start_audio(fr.tick_of(p.first));
-            }
-            ctx.request_repaint();
-            return;
-        }
-        let step = plan.map_or(1, |p| p.step);
-        // Never further ahead than the RAM preview holds: those frames would evict the ones the
-        // preview shows first, or be evicted before it gets there (#595).
-        let window = (ahead * 3).min(self.frames_that_fit(&c, scale) - 1);
-        for k in 0..window {
-            if queued >= ahead as usize || !video {
-                break;
-            }
-            let f = match plan {
-                Some(p) => match p.frame_after(cur, k) {
-                    Some(f) => f,
-                    None => break,
-                },
-                None => {
-                    let mut f = cur + k;
-                    if f > wb {
-                        f = wa + (f - wb - 1).rem_euclid((wb - wa + 1).max(1));
-                    }
-                    f
-                }
-            };
-            if !self.frames.is_cached(&FrameKey { frame: f, ..series }) {
-                self.request_frame(cid, f, scale);
-                queued += 1;
-            }
-        }
-        if let Some(a) = &mut self.audio {
-            a.pump();
-            self.meter.update(a.feed.take_peaks(), now);
-        } else if let Some(s) = &mut self.scrub {
-            // Scrubbing: the meters follow the snippets; an idle second closes the output.
-            s.pump();
-            self.meter.update(s.feed.take_peaks(), now);
-            if now - s.last_used > 1.0 {
-                self.scrub = None;
-            }
-            ctx.request_repaint_after(std::time::Duration::from_millis(50));
-        } else if self.meter.active() {
-            self.meter.update([0.0; 2], now);
-            ctx.request_repaint();
-        }
-        if !self.playback.playing {
-            self.cache_when_idle(ctx, &c, &series, now, (wa, wb));
-            return;
-        }
-        let snap = |f: i64| wa + (f - wa).div_euclid(step) * step;
-        // Held sound starts once the frames ahead are cached (see `Playback::audio_held`): the
-        // prefetch window when the silent preview keeps real time, else the rest of the preview.
-        let fit = self.frames_that_fit(&c, scale);
-        if self.playback.audio_held
-            && let Some(p) = plan
-            && ((self.playback.keeps_up(now) && self.cached_ahead(&p, &series, cur, ahead.min(fit))) || self.cached_ahead(&p, &series, cur, fit))
-        {
-            self.playback.audio_held = false;
-            self.playback.start_wall = now;
-            self.playback.start_frame = cur;
-            self.start_audio(fr.tick_of(cur));
-        }
-        // Audio clock drives playback: show the frame under the audible sample.
-        if let Some(a) = &self.audio {
-            if a.finished() {
-                if video {
-                    self.session.set_time(fr.tick_of(wb));
-                } else {
-                    self.playback.audio_frame = Some(wb);
-                }
-                self.stop();
-                return;
-            }
-            let target = snap(audio::frame_of_sample(a.clock(), a.rate, fr).clamp(wa, wb));
-            if !video {
-                self.playback.audio_frame = Some(target);
-            } else if self.frames.is_cached(&FrameKey { frame: target, ..series }) {
-                self.playback.waiting = false;
-                if target != cur {
-                    self.session.set_time(fr.tick_of(target));
-                    self.playback.frame_shown(now);
-                }
-            } else {
-                // Rendering can't keep up: rather than skip frames, the sound stops and every
-                // frame shows as it renders until the frames ahead are cached again.
-                self.audio = None;
-                self.playback.audio_held = true;
-                self.playback.waiting = true;
-                // The rate measured before the stall no longer says it keeps up.
-                self.playback.shown_at.clear();
-                self.playback.start_wall = now;
-                self.playback.start_frame = cur;
-            }
-            ctx.request_repaint();
-            return;
-        }
-        let elapsed = now - self.playback.start_wall;
-        let n = ((elapsed * self.playback.fps) / step as f64).floor() as i64;
-        let target = match plan {
-            Some(p) => p.frame_after(self.playback.start_frame, n),
-            None => {
-                let t = self.playback.start_frame + n;
-                if t <= wb {
-                    Some(t)
-                } else if looping {
-                    Some(wa + (t - wa).rem_euclid((wb - wa + 1).max(1)))
-                } else {
-                    None
-                }
-            }
-        };
-        let Some(target) = target else {
-            if video {
-                self.session.set_time(fr.tick_of(wb));
-            } else {
-                self.playback.audio_frame = Some(wb);
-            }
-            self.stop();
-            return;
-        };
-        if !video {
-            // Audio-only preview without an audio device: the clock runs, the time stays.
-            self.playback.audio_frame = Some(target);
-            ctx.request_repaint();
-            return;
-        }
-        if self.frames.is_cached(&FrameKey { frame: target, ..series }) {
-            self.playback.waiting = false;
-            if target != cur {
-                self.session.set_time(fr.tick_of(target));
-                self.playback.frame_shown(now);
-            }
-        } else {
-            // Not cached yet: hold the clock at the current frame (cache first, then play).
-            self.playback.waiting = true;
-            let next = plan.and_then(|p| p.frame_after(cur, 1)).unwrap_or(if cur + 1 > wb { wa } else { cur + 1 });
-            if self.frames.is_cached(&FrameKey { frame: next, ..series }) {
-                self.session.set_time(fr.tick_of(next));
-            }
-            self.playback.start_wall = now;
-            self.playback.start_frame = fr.frame_at(self.session.time());
-        }
-        ctx.request_repaint();
-    }
-
-    /// While the project keeps changing (an edit within [`EDIT_QUIET`] seconds), how long until
-    /// it counts as settled.
-    fn editing(&mut self, now: f64) -> Option<f64> {
-        if self.last_edit.1 != self.session.revision {
-            self.last_edit = (now, self.session.revision);
-        }
-        let left = EDIT_QUIET - (now - self.last_edit.0);
-        (left > 0.0).then_some(left)
-    }
-
-    /// Composition ▸ Preview ▸ Cache Frames When Idle: after a second without input or edits,
-    /// render the work area's frames (from the current time on, then from its start) in the
-    /// background, a few at a time, until it is cached or the RAM preview budget is full.
-    fn cache_when_idle(&mut self, ctx: &egui::Context, comp: &effectcraft_engine::project::Comp, series: &FrameKey, now: f64, (wa, wb): (i64, i64)) {
-        let active = ctx.input(|i| !i.events.is_empty() || i.pointer.any_down() || i.pointer.is_moving());
-        if active || self.last_activity.1 != self.session.revision {
-            self.last_activity = (now, self.session.revision);
-        }
-        if !self.ui.cache_when_idle || self.frames.urgent_pending() {
-            return;
-        }
-        let quiet = now - self.last_activity.0;
-        if quiet < 1.0 {
-            ctx.request_repaint_after(std::time::Duration::from_secs_f64(1.0 - quiet));
-            return;
-        }
-        // An empty work area has nothing to cache.
-        let n = wb - wa + 1;
-        if n < 1 {
-            return;
-        }
-        let cur = comp.frame_rate.frame_at(self.session.time()).clamp(wa, wb);
-        let fit = self.frames_that_fit(comp, series.scale as f64 / 1000.0).min(n);
-        let slots = (self.frames_parallelism() / 2).max(1);
-        let mut queued = self.frames.inflight();
-        let scale = series.scale as f64 / 1000.0;
-        let mut pending = false;
-        for k in 0..fit {
-            let f = wa + (cur - wa + k).rem_euclid(n);
-            if self.frames.is_cached(&FrameKey { frame: f, ..*series }) {
-                continue;
-            }
-            pending = true;
-            if queued >= slots {
-                break;
-            }
-            self.request_frame(ItemId(series.comp), f, scale);
-            queued += 1;
+    /// Whether a dialog is up at `now`, `focused`: whether one of the app's windows has the
+    /// keyboard.
+    pub(crate) fn up(&mut self, focused: bool, now: f64) -> bool {
+        if self.count == 0 {
+            return false;
         }
-        if pending {
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-    }
-
-    /// How many viewer frames of `comp` at `scale` the RAM preview budget holds (90 % of it,
-    /// at least one).
-    /// The frames of `plan` from `cur` to its end, or as many as fit in the RAM preview, are
-    /// cached: sound can play from `cur` in real time.
-    fn cached_ahead(&self, plan: &effectcraft_engine::preview::PreviewPlan, series: &FrameKey, cur: i64, fit: i64) -> bool {
-        let cached = self.frames.cached_frames(series);
-        (0..fit).map_while(|k| plan.frame_after(cur, k)).take_while(|f| *f >= cur).all(|f| cached.binary_search(&f).is_ok())
-    }
-
-    fn frames_that_fit(&self, comp: &effectcraft_engine::project::Comp, scale: f64) -> i64 {
-        let side = |n: u32| (n as f64 * scale).ceil().max(1.0);
-        let frame = side(comp.width) * side(comp.height) * 4.0;
-        ((self.frames.budget() as f64 * 0.9 / frame) as i64).max(1)
-    }
-
-    fn frames_parallelism(&self) -> usize {
-        if cfg!(target_arch = "wasm32") {
-            // frame workers render one frame each; without them frames render one at a time
-            // on the UI thread (`Frames::pump`)
-            return self.frames.remote_slots().max(1);
-        }
-        self.frames.parallelism()
-    }
-
-    // ---------------------------------------------------------------- control channel
-
-    pub(crate) fn raise_for_control(&mut self, ctx: &egui::Context) {
-        ctx.request_repaint();
-    }
-
-    fn drain_control(&mut self, ctx: &egui::Context) {
-        let Some(rx) = self.control_rx.take() else { return };
-        let now = ctx.input(|i| i.time);
-        let mut reqs: Vec<(ControlRequest, f64)> = std::mem::take(&mut self.deferred);
-        while let Ok(req) = rx.try_recv() {
-            reqs.push((req, now + 3.0));
-        }
-        for (req, deadline) in reqs {
-            let reply = req.reply.clone();
-            match control::handle(self, ctx, &req) {
-                control::Outcome::Done(v) => {
-                    let _ = reply.send(v);
-                }
-                control::Outcome::Retry(msg) => {
-                    if now < deadline {
-                        self.deferred.push((req, deadline));
-                        ctx.request_repaint();
-                    } else {
-                        let _ = reply.send(json!({"ok": false, "error": msg}));
-                    }
-                }
-                control::Outcome::AfterInput => self.input_waiters.push(reply),
-                control::Outcome::AwaitJobs(w) => {
-                    self.job_waiters.push((w, reply));
-                    ctx.request_repaint();
-                }
-                control::Outcome::Screenshot { path, crop } => {
-                    // A covered or minimized window presents no frames (macOS skips its redraws), so
-                    // a screenshot would never arrive and nothing would tick its timeout.
-                    if ctx.input(|i| i.viewport().occluded == Some(true) || i.viewport().minimized == Some(true)) {
-                        let _ = reply.send(json!({"ok": false, "error": "window is covered or minimized: call ui.focus first (render.frame renders comp pixels without the window)"}));
-                        continue;
-                    }
-                    let token = self.next_token;
-                    self.next_token += 1;
-                    let settle = now + 0.35;
-                    self.queued_screenshots.push((token, settle, 0));
-                    self.pending_screenshots.push((token, path, crop, reply, settle + SCREENSHOT_TIMEOUT_S));
-                }
-            }
-        }
-        self.control_rx = Some(rx);
-        self.finish_job_waiters(ctx);
-    }
-
-    /// Reply to the control requests whose offloaded jobs ended.
-    fn finish_job_waiters(&mut self, ctx: &egui::Context) {
-        if self.job_waiters.is_empty() {
-            return;
-        }
-        self.session.poll_render();
-        self.session.poll_offload();
-        let waiters = std::mem::take(&mut self.job_waiters);
-        for (w, reply) in waiters {
-            if w.pending(self) {
-                self.job_waiters.push((w, reply));
-            } else {
-                let v = w.finish(self);
-                let _ = reply.send(v);
-            }
-        }
-        if !self.job_waiters.is_empty() {
-            ctx.request_repaint_after(std::time::Duration::from_millis(50));
-        }
-    }
-
-    fn issue_screenshots(&mut self, ctx: &egui::Context) {
-        let now = ctx.input(|i| i.time);
-        let mut any = false;
-        let busy = self.frames.inflight() > 0;
-        self.queued_screenshots.retain_mut(|(token, at, frames)| {
-            *frames += 1;
-            any = true;
-            // Wait for the viewer's frame to finish rendering (bounded by the timeout below).
-            if now >= *at && *frames >= 3 && (!busy || now > *at + 2.5) {
-                ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(egui::UserData::new(*token)));
-                false
-            } else {
-                true
-            }
-        });
-        self.pending_screenshots.retain(|(.., reply, deadline)| {
-            if now > *deadline {
-                let _ = reply.send(json!({"ok": false, "error": "no frame was presented (window hidden or display asleep)"}));
-                false
-            } else {
-                true
-            }
-        });
-        if any {
-            ctx.request_repaint();
-        } else if !self.pending_screenshots.is_empty() {
-            ctx.request_repaint_after(std::time::Duration::from_millis(16));
-        }
-    }
-
-    fn collect_screenshots(&mut self, ctx: &egui::Context) {
-        if self.pending_screenshots.is_empty() {
-            return;
-        }
-        let events: Vec<_> = ctx.input(|i| {
-            i.raw
-                .events
-                .iter()
-                .filter_map(|e| match e {
-                    egui::Event::Screenshot { user_data, image, .. } => {
-                        let token = user_data.data.as_ref().and_then(|d| d.downcast_ref::<u64>()).copied()?;
-                        Some((token, image.clone()))
-                    }
-                    _ => None,
-                })
-                .collect()
-        });
-        for (token, image) in events {
-            if let Some(i) = self.pending_screenshots.iter().position(|(t, ..)| *t == token) {
-                let (_, path, crop, reply, _) = self.pending_screenshots.remove(i);
-                let r = control::save_screenshot(ctx, &image, path.as_deref(), crop);
-                let _ = reply.send(r);
-            }
-        }
-    }
-
-    // ---------------------------------------------------------------- frame
-
-    fn handle_events(&mut self, ctx: &egui::Context) {
-        for ev in self.session.drain_events() {
-            match ev {
-                effectcraft_engine::Event::OpenComp(c) => {
-                    panels::viewers::on_open_comp(self, c);
-                    self.ui.timeline.pps = None;
-                }
-                effectcraft_engine::Event::Toast { message, .. } => self.toast = Some((message, ctx.input(|i| i.time))),
-                effectcraft_engine::Event::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),
-                // Frames are keyed by content: an edit keeps those of comps it doesn't touch.
-                effectcraft_engine::Event::ProjectChanged { .. } => {}
-                effectcraft_engine::Event::Frontend { command, params } => {
-                    if let Err(e) = crate::menus::frontend(self, ctx, &command, params) {
-                        self.ui.status = e;
-                    }
-                }
-                effectcraft_engine::Event::PurgeCaches => self.frames.clear(),
-                effectcraft_engine::Event::CopyImage { width, height, rgba } => {
-                    if let Err(e) = copy_image(ctx, width, height, &rgba) {
-                        self.ui.status = e;
-                    }
-                }
-            }
-        }
-    }
-
-    fn frame(&mut self, ui: &mut egui::Ui) {
-        let ctx = ui.ctx().clone();
-        self.apply_gpu_failure(&ctx);
-        self.run_dialog_answers();
-        self.auto.begin_frame();
-        self.frames.set_context(&ctx);
-        if self.session.render_job.is_some() {
-            self.session.poll_render();
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        if self.session.track_job.is_some() {
-            self.session.poll_track();
-            ctx.request_repaint_after(std::time::Duration::from_millis(50));
-        }
-        if self.session.mask_job.is_some() {
-            self.session.poll_mask_track();
-            ctx.request_repaint_after(std::time::Duration::from_millis(50));
-        }
-        // Background tasks (Content-Aware Fill, Scene Edit Detection, imports).
-        if !self.session.tasks.is_empty() {
-            self.session.poll_jobs();
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        // Analyses running in a worker (the web app).
-        if !self.session.offloaded.is_empty() {
-            self.session.poll_offload();
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        // Warp Stabilizer: finish analyses and start queued (re-)analyses in the background.
-        if self.session.warp_job.is_some() || !self.session.warp_pending.is_empty() {
-            self.session.poll_warp(true);
-            self.session.poll_roto(true);
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        // Roto Brush propagation and Object Matte tracking / Freeze: finish jobs (a Freeze writes
-        // its mattes) and start queued ones in the background.
-        if self.session.roto_job.is_some() || !self.session.roto_pending.is_empty() {
-            self.session.poll_roto(true);
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        // 3D Camera Tracker: likewise (tracking, then solving).
-        if self.session.camera_job.is_some() || !self.session.camera_pending.is_empty() {
-            self.session.poll_camera(true);
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        }
-        self.run_script_tasks(&ctx);
-        self.apply_prefs(&ctx);
-        self.handle_events(&ctx);
-        panels::unsaved::on_close_requested(self, &ctx);
-        let title = panels::unsaved::window_title(self);
-        if title != self.window_title {
-            ctx.send_viewport_cmd(egui::ViewportCommand::Title(title.clone()));
-            self.window_title = title;
-        }
-        self.tick_autosave(&ctx);
-        prefs_live::frame(self, &ctx);
-        if let Some(rx) = self.command_inbox.take() {
-            while let Ok(id) = rx.try_recv() {
-                if let Err(e) = menus::invoke(self, &ctx, &id, json!({})) {
-                    self.ui.status = e;
-                }
-            }
-            self.command_inbox = Some(rx);
-        }
-        let tab_had_widget_focus = ctx.egui_wants_keyboard_input();
-        menus::handle_shortcuts(self, &ctx);
-        if !ctx.input(|i| i.pointer.primary_down()) {
-            self.ui.viewer.property_interacting = false;
-        }
-        let t = self.tokens;
-        let full = ui.max_rect();
-        if self.dialog.is_some() {
-            ui.disable();
-        }
-        ui.painter().rect_filled(full, 0.0, t.app_bg);
-        let mut top = full.min.y;
-        if self.ui.show_menu_bar {
-            let mb = egui::Rect::from_min_size(full.min, egui::vec2(full.width(), 24.0));
-            let mut child = ui.new_child(egui::UiBuilder::new().max_rect(mb));
-            child.painter().rect_filled(mb, 0.0, t.header_bg);
-            menus::menu_bar(self, &mut child);
-            top = mb.max.y;
-        }
-        let header_h = 40.0;
-        let header = egui::Rect::from_min_size(egui::pos2(full.min.x, top), egui::vec2(full.width(), header_h));
-        header::show(self, ui, header);
-        let body = egui::Rect::from_min_max(egui::pos2(full.min.x + 4.0, header.max.y + 2.0), egui::pos2(full.max.x - 4.0, full.max.y - 4.0));
-        self.dock_area(ui, body);
-        #[cfg(not(target_arch = "wasm32"))]
-        prefs_live::dropped_files(self, ui, full);
-        if !tab_had_widget_focus {
-            menus::handle_tab_shortcut(self, &ctx);
-        }
-        panels::precomp::mini_flowchart(self, &ctx);
-        panels::home::capture_thumbnail(self);
-        panels::dialogs::show(self, &ctx);
-        panels::scriptui_view::sync_panels(self);
-        panels::scriptui_view::show_windows(self, &ctx);
-        panels::learn::coach(self, &ctx);
-        let lift = panels::media_panels::import_card(self, ui, full);
-        self.draw_toast(ui, full, lift);
-        if self.session.config.is_some() && self.workspace_store.has_changes(&self.ui) && !ctx.input(|i| i.pointer.any_down()) {
-            if self.workspace_store.due(ctx.input(|i| i.time)) {
-                self.save_workspace_state();
-            }
-            if self.workspace_store.has_changes(&self.ui) {
-                ctx.request_repaint_after(std::time::Duration::from_secs(1));
-            }
-        }
-    }
-
-    fn save_workspace_state(&mut self) {
-        if let Err(error) = self.workspace_store.save(self.session.config.as_deref(), &self.ui) {
-            if self.workspace_store.error.as_ref() != Some(&error) {
-                log::warn!("{error}");
-                self.ui.status = error.clone();
-            }
-            self.workspace_store.error = Some(error);
-        }
-    }
-
-    /// The status message or the latest toast, bottom left (`lift` points higher while the
-    /// Importing card is there).
-    fn draw_toast(&mut self, ui: &mut egui::Ui, full: egui::Rect, lift: f32) {
-        let now = ui.input(|i| i.time);
-        let msg = if !self.ui.status.is_empty() {
-            Some(self.ui.status.clone())
-        } else {
-            self.toast.as_ref().filter(|(_, at)| now - at < 4.0).map(|(m, _)| m.clone())
-        };
-        if let Some(m) = msg {
-            let t = &self.tokens;
-            let galley = ui.painter().layout_no_wrap(m.clone(), Tokens::ui(12.0), t.text);
-            let r = egui::Rect::from_min_size(egui::pos2(full.min.x + 16.0, full.max.y - 44.0 - lift), galley.size() + egui::vec2(24.0, 14.0));
-            ui.painter().rect_filled(r, 6.0, t.panel_bg);
-            ui.painter().rect_stroke(r, 6.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
-            ui.painter().galley(r.min + egui::vec2(12.0, 7.0), galley, t.text);
-            self.auto.add("toast", r, &m);
-            let resp = ui.interact(r, egui::Id::new("toast"), egui::Sense::click());
-            if resp.clicked() {
-                self.ui.status.clear();
-                self.toast = None;
-            }
-            ui.ctx().request_repaint_after(std::time::Duration::from_millis(500));
-            if !self.ui.status.is_empty() {
-                let since: f64 = ui.data(|d| d.get_temp(egui::Id::new("status-since")).unwrap_or(now));
-                ui.data_mut(|d| d.insert_temp(egui::Id::new("status-since"), since));
-                if now - since > 5.0 {
-                    self.ui.status.clear();
-                    ui.data_mut(|d| d.remove::<f64>(egui::Id::new("status-since")));
-                }
-            }
+        let since = *self.since.get_or_insert(now);
+        if !focused {
+            self.left = true;
+        } else if self.left || now - since >= Self::UNSEEN {
+            *self = Self::default();
         }
+        self.count > 0
     }
 }
 
-impl EffectcraftApp {
-    /// Scripts' `app.scheduleTask` tasks that are due (repeating ones keep a ScriptUI panel
-    /// fresh): errors as a toast, the last line printed in the status bar, and a repaint when
-    /// the next one is due.
-    fn run_script_tasks(&mut self, ctx: &egui::Context) {
-        if self.session.script_ui.task_hosts.is_empty() {
-            return;
-        }
-        let Some(r) = effectcraft_engine::scriptui::ScriptUi::run_tasks(&mut self.session) else { return };
-        if let Some(msg) = r["errors"].as_array().and_then(|e| e.first()).and_then(|e| e["message"].as_str()) {
-            self.toast = Some((format!("Scheduled script task: {msg}"), ctx.input(|i| i.time)));
-        } else if let Some(line) = r["output"].as_array().and_then(|o| o.last()).and_then(|l| l.as_str()) {
-            self.ui.status = line.to_string();
-        }
-        if let Some(next) = r["next"].as_u64() {
-            ctx.request_repaint_after(std::time::Duration::from_millis(next));
-        }
-    }
-
-    /// Auto-save a dirty project when the interval has passed (Settings ▸ Project ▸ Auto-Save).
-    fn tick_autosave(&mut self, ctx: &egui::Context) {
-        let now = web_time::SystemTime::now().duration_since(web_time::UNIX_EPOCH).map(|d| d.as_secs_f64()).unwrap_or(0.0);
-        if let Some(Err(e)) = self.session.autosave_tick(now) {
-            self.ui.status = e.to_string();
-        }
-        if self.session.prefs.auto_save.enabled {
-            ctx.request_repaint_after(std::time::Duration::from_secs(30));
-        }
-        // File ▸ Watch Folder: look for new projects every 10 seconds.
-        if self.session.state.watch_folder.is_some() {
-            let key = egui::Id::new("watchFolder.lastPoll");
-            let last: f64 = ctx.data(|d| d.get_temp(key)).unwrap_or(0.0);
-            if now - last >= 10.0 {
-                ctx.data_mut(|d| d.insert_temp(key, now));
-                match self.session.execute("file.watchFolder.poll", serde_json::json!({})) {
-                    Ok(r) => {
-                        if let Some(n) = r["rendered"].as_array().map(Vec::len).filter(|n| *n > 0) {
-                            self.ui.status = format!("Watch Folder: rendered {n} project(s)");
-                        }
-                    }
-                    Err(e) => self.ui.status = e.to_string(),
-                }
-            }
-            ctx.request_repaint_after(std::time::Duration::from_secs(10));
-        }
-        self.tick_footage_reload(ctx, now);
-    }
-
-    /// Settings ▸ Import ▸ Reload Footage Changed on Disk: every two seconds, and as soon as the
-    /// window comes back to the front (after saving in another app), stamp the footage files on a
-    /// worker thread and reload the ones that changed.
-    fn tick_footage_reload(&mut self, ctx: &egui::Context, now: f64) {
-        use effectcraft_engine::footage_reload;
-        if let Some(Err(e)) = footage_reload::poll_scan(&mut self.session) {
-            self.ui.status = e.to_string();
-        }
-        let (last_key, focus_key) = (egui::Id::new("footageReload.lastScan"), egui::Id::new("footageReload.focused"));
-        let focused = ctx.input(|i| i.focused);
-        let was_focused: bool = ctx.data(|d| d.get_temp(focus_key)).unwrap_or(focused);
-        ctx.data_mut(|d| d.insert_temp(focus_key, focused));
-        if self.session.prefs.import.auto_reload_footage == "off" || self.session.project.items.is_empty() {
-            return;
-        }
-        let last: f64 = ctx.data(|d| d.get_temp(last_key)).unwrap_or(0.0);
-        if now - last >= 2.0 || (focused && !was_focused) {
-            ctx.data_mut(|d| d.insert_temp(last_key, now));
-            footage_reload::start_scan(&mut self.session);
-        }
-        if self.session.footage_scan.is_some() {
-            ctx.request_repaint_after(std::time::Duration::from_millis(100));
-        } else {
-            ctx.request_repaint_after(std::time::Duration::from_secs(2));
-        }
-    }
-
-    /// Take the pending synthetic input (from `ui.click`, `ui.key`, …). Hosts that don't call
-    /// [`eframe::App::raw_input_hook`] (the headless test harness) feed these in themselves.
-    pub fn take_synthetic_input(&mut self) -> Vec<egui::Event> {
-        std::mem::take(&mut self.synthetic)
-    }
+/// Keys and dropped files from floating panels' OS windows (craft-ui `DockOutput`).
+#[derive(Default)]
+pub(crate) struct ForwardedInput {
+    pub(crate) events: Vec<egui::Event>,
+    pub(crate) files: Vec<egui::DroppedFileHandle>,
 }
 
-impl eframe::App for EffectcraftApp {
-    fn on_exit(&mut self) {
-        self.save_workspace_state();
-        // Clean exit: no crash recovery next launch (unless the graphics device was lost with
-        // unsaved changes, which are in the auto-save it offers).
-        if self.device_lost_close != Some(true) {
-            self.session.end_recovery();
-        }
-    }
-
-    fn raw_input_hook(&mut self, ctx: &egui::Context, raw_input: &mut egui::RawInput) {
-        let injected = !self.synthetic.is_empty();
-        self.feed_synthetic(raw_input);
-        if pointer_wrap::prepare_input(ctx, raw_input, injected) {
-            self.session.history.merge_key = None;
-        }
-    }
-
-    fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        self.apply_gpu_failure(ctx);
-        // The CJK fallback fonts depend on the interface language, so they follow a change of
-        // Settings ▸ General ▸ Language instead of only the first frame.
-        let language = crate::i18n::language(self);
-        crate::i18n::set_current(language);
-        if !self.styled || self.styled_language != language {
-            theme::install(ctx, &self.tokens, language);
-            self.styled_language = language;
-            if !self.styled {
-                fit_window(ctx);
-                self.styled = true;
-            }
-            ctx.request_repaint();
-        } else {
-            self.fonts_ready = true;
-        }
-        let now = ctx.input(|i| i.time);
-        let dt = (now - self.last_time) as f32;
-        if dt > 0.0 {
-            self.fps = self.fps * 0.9 + (1.0 / dt).min(480.0) * 0.1;
-        }
-        self.last_time = now;
-        self.drain_control(ctx);
-        if !self.synthetic.is_empty() {
-            ctx.request_repaint();
-        } else if !self.input_waiters.is_empty() {
-            for w in self.input_waiters.drain(..) {
-                let _ = w.send(json!({"ok": true, "result": null}));
-            }
-        }
-        self.issue_screenshots(ctx);
-        self.collect_screenshots(ctx);
-    }
-
-    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
-        if self.gpu_failure_applied == Some(true) {
-            self.close_after_device_loss(ui.ctx());
-            return;
-        }
-        self.init_gpu(frame);
-        if !self.fonts_ready {
-            ui.ctx().request_repaint();
-            return;
-        }
-        self.frame(ui);
-        let ctx = ui.ctx().clone();
-        #[cfg(not(target_arch = "wasm32"))]
-        pointer_wrap::finish_native(&ctx, frame);
-        // wasm32: no frame threads; render queued frames now, between UI frames.
-        if cfg!(target_arch = "wasm32") && self.frames.pump(std::time::Duration::from_millis(if self.playback.playing { 24 } else { 40 })) {
-            ctx.request_repaint();
-        }
-        self.last_ui_time = ctx.input(|i| i.time);
-        if !self.synthetic.is_empty() {
-            ctx.request_repaint();
-        } else if !self.input_waiters.is_empty() {
-            ctx.request_repaint();
-            for w in self.input_waiters.drain(..) {
-                let _ = w.send(json!({"ok": true, "result": null}));
-            }
-        }
-        if self.frames.inflight() > 0 {
-            ctx.request_repaint_after(std::time::Duration::from_millis(30));
-        }
-    }
-}
-
-/// Advance playback with the viewer's scale (called by the viewer panel each frame).
-pub(crate) fn tick_playback(app: &mut EffectcraftApp, ctx: &egui::Context, scale: f64) {
-    app.advance_playback(ctx, scale);
-}
-
-/// Put `width` × `height` straight-alpha RGBA8 pixels on the system clipboard (Composition ▸ Copy
-/// Frame to Clipboard). The pixel count is checked first: egui's image constructor panics on a
-/// size that doesn't match its buffer.
-fn copy_image(ctx: &egui::Context, width: u32, height: u32, rgba: &[u8]) -> Result<(), String> {
-    let (w, h) = (width as usize, height as usize);
-    if w == 0 || h == 0 || w.checked_mul(h).and_then(|n| n.checked_mul(4)) != Some(rgba.len()) {
-        return Err(format!("cannot copy a malformed {width}×{height} image to the clipboard"));
-    }
-    ctx.copy_image(egui::ColorImage::from_rgba_unmultiplied([w, h], rgba));
-    Ok(())
-}
-
-/// Maximize a first window that doesn't fit the screen, which fits it to the space beside the
-/// taskbar or dock. The 1680 × 1020 window on a smaller screen is only shrunk to the monitor's
-/// size, so with its title bar it ran under the taskbar and cut menus off at the bottom of the
-/// screen (#269).
-fn fit_window(ctx: &egui::Context) {
-    let (monitor, window) = ctx.input(|i| (i.viewport().monitor_size, i.viewport().outer_rect.or(i.viewport().inner_rect)));
-    if let (Some(monitor), Some(window)) = (monitor, window)
-        && overflows_screen(window.size(), monitor)
-    {
-        ctx.send_viewport_cmd(egui::ViewportCommand::Maximized(true));
-    }
-}
-
-/// Whether a window `size` leaves no room on a `monitor` for a taskbar or dock (points).
-fn overflows_screen(size: egui::Vec2, monitor: egui::Vec2) -> bool {
-    const TASKBAR: f32 = 64.0;
-    size.x > monitor.x || size.y > monitor.y - TASKBAR
+/// Record the scale the viewer drew at (called by the viewer panel each pass).
+///
+/// Playback itself advances in [`EffectcraftApp::tick`], so it keeps running while the window is
+/// hidden; using the last drawn scale keeps prefetch keys consistent with the visible viewer.
+pub(crate) fn note_viewer_scale(app: &mut EffectcraftApp, scale: f64) {
+    app.last_viewer_scale = Some(scale);
 }
 
 #[cfg(test)]
-mod fit_window_tests {
-    use super::overflows_screen;
-    use egui::vec2;
-
-    #[test]
-    fn a_window_taller_than_the_screen_beside_its_taskbar_overflows() {
-        // The default window on a 1366 × 768 laptop (shrunk to the monitor) and on 1080p.
-        assert!(overflows_screen(vec2(1366.0, 799.0), vec2(1366.0, 768.0)));
-        assert!(overflows_screen(vec2(1680.0, 1051.0), vec2(1920.0, 1080.0)));
-        assert!(!overflows_screen(vec2(1680.0, 1051.0), vec2(2560.0, 1440.0)));
-    }
-}
-
-#[cfg(test)]
-mod copy_frame_tests {
-    use super::*;
-
-    fn copied(output: &egui::FullOutput) -> Vec<&egui::ColorImage> {
-        output
-            .platform_output
-            .commands
-            .iter()
-            .filter_map(|c| match c {
-                egui::OutputCommand::CopyImage(image) => Some(image),
-                _ => None,
-            })
-            .collect()
-    }
-
-    /// Composition ▸ Copy Frame to Clipboard puts the rendered frame on the system clipboard.
-    #[test]
-    fn copy_frame_puts_the_frame_on_the_clipboard() {
-        let mut session = Session::default();
-        session.execute("comp.new", json!({"name": "Copy", "width": 8, "height": 6, "duration": 1})).unwrap();
-        session.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
-        let mut app = EffectcraftApp::new(session);
-        let ctx = egui::Context::default();
-        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
-            crate::menus::invoke(&mut app, ui.ctx(), "comp.copyFrame", json!({})).unwrap();
-            app.handle_events(ui.ctx());
-        });
-        output.textures_delta.clear();
-        let images = copied(&output);
-        assert_eq!(images.len(), 1);
-        assert_eq!(images[0].size, [8, 6]);
-        assert!(images[0].pixels.iter().all(|p| *p == egui::Color32::from_rgb(255, 0, 0)));
-    }
-
-    /// A malformed image never reaches egui's panicking constructor.
-    #[test]
-    fn a_malformed_image_is_an_error_not_a_crash() {
-        let ctx = egui::Context::default();
-        let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
-            assert!(copy_image(ui.ctx(), 4, 4, &[0; 10]).is_err());
-            assert!(copy_image(ui.ctx(), 0, 4, &[]).is_err());
-            assert!(copy_image(ui.ctx(), u32::MAX, u32::MAX, &[0; 4]).is_err());
-        });
-        output.textures_delta.clear();
-        assert!(copied(&output).is_empty());
-    }
-}
-
-#[cfg(test)]
-mod gpu_failure_tests {
-    use super::*;
-
-    #[test]
-    fn host_failure_preserves_document_undo_and_cpu_pixels_and_detaches_late_readbacks() {
-        let mut session = Session::default();
-        let comp = ItemId(session.execute("comp.new", json!({"name": "Recovery", "width": 4, "height": 4, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
-        session.execute("layer.newSolid", json!({"comp": comp.0, "color": "#ff0000"})).unwrap();
-        let before = session.render(comp, Tick::ZERO, RenderOpts::default());
-        let project = session.project.clone();
-        let revision = session.revision;
-        let prefs = serde_json::to_value(&session.prefs).unwrap();
-        let mut app = EffectcraftApp::new(session);
-        let ctx = egui::Context::default();
-        let bridge = gpu_failure::GpuFailureBridge::new(&ctx);
-        app.set_gpu_failure_bridge(bridge.clone());
-        let late_slot = app.viewer_readback.1.clone();
-        let key = FrameKey { revision, content: 1, comp: comp.0, frame: 0, scale: 1000, view: 0, opts: 0 };
-        app.viewer_readback.0 = Some(key);
-        bridge.report("synthetic host device failure", true);
-        app.apply_gpu_failure(&ctx);
-        assert!(Arc::ptr_eq(&project, &app.session.project));
-        assert_eq!(app.session.revision, revision);
-        assert_eq!(serde_json::to_value(&app.session.prefs).unwrap(), prefs);
-        assert!(app.gpu_checked, "failed device cannot be initialized again next frame");
-        assert!(app.session.accel.is_none());
-        assert!(app.ui.status.contains("presentation requires restarting"));
-        assert_eq!(app.session.render(comp, Tick::ZERO, RenderOpts::default()).data, before.data);
-        *late_slot.lock().unwrap() = Some((key, Arc::new(egui::ColorImage::new([1, 1], vec![egui::Color32::RED]))));
-        assert!(app.viewer_readback.0.is_none());
-        assert!(app.viewer_readback.1.lock().unwrap().is_none(), "a late completion cannot refill the replacement slot");
-        app.session.execute("edit.undo", json!({})).unwrap();
-        assert!(app.session.project.comp(comp).unwrap().layers.is_empty());
-        app.session.execute("edit.redo", json!({})).unwrap();
-        assert_eq!(app.session.render(comp, Tick::ZERO, RenderOpts::default()).data, before.data);
-    }
-}
-
-#[cfg(test)]
-mod appearance_tests {
-    use super::*;
-    use crate::theme::ThemeKind;
-
-    fn app() -> EffectcraftApp {
-        EffectcraftApp::new(effectcraft_engine::Session::default())
-    }
-
-    /// The Tools bar's appearance button: Sync with System, Light, Dark, then Sync with System
-    /// again, showing the saved theme of each family without losing either choice.
-    #[test]
-    fn appearance_button_cycles_modes_without_losing_theme_choices() {
-        let ctx = egui::Context::default();
-        let mut app = app();
-        app.hooks.system_theme = Some(Box::new(|_| Some(egui::Theme::Dark)));
-        app.set_pref("appearance.darkTheme", json!("darker")).unwrap();
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Darker);
-        for (mode, shown) in [("auto", ThemeKind::Darker), ("light", ThemeKind::Light), ("dark", ThemeKind::Darker), ("auto", ThemeKind::Darker)] {
-            menus::invoke(&mut app, &ctx, "view.theme.toggle", json!({})).unwrap();
-            assert_eq!(app.session.prefs.appearance.appearance_mode, mode);
-            assert_eq!(app.ui.theme, shown, "{mode}");
-            assert_eq!(app.tokens.kind, shown);
-            assert_eq!(app.session.prefs.appearance.dark_theme, "darker");
-            assert_eq!(app.session.prefs.appearance.light_theme, "light");
-        }
-    }
-
-    /// Sync with System follows the host's answer (the Linux portal) when it changes, and falls
-    /// back to Dark when nothing reports a system appearance.
-    #[test]
-    fn auto_follows_a_stubbed_system_theme() {
-        use std::sync::{Arc, Mutex};
-        let ctx = egui::Context::default();
-        let mut app = app();
-        let system = Arc::new(Mutex::new(Some(egui::Theme::Light)));
-        let read = Arc::clone(&system);
-        app.hooks.system_theme = Some(Box::new(move |_| *read.lock().unwrap_or_else(std::sync::PoisonError::into_inner)));
-        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Light);
-        *system.lock().unwrap() = Some(egui::Theme::Dark);
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Dark, "a system change applies without a settings change");
-        *system.lock().unwrap() = None;
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Dark);
-        // A fixed mode ignores the system.
-        *system.lock().unwrap() = Some(egui::Theme::Light);
-        app.set_pref("appearance.appearanceMode", json!("dark")).unwrap();
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Dark);
-    }
-
-    /// Sync with System leaves egui's theme preference at System, so egui never gives the native
-    /// window an appearance of its own (on macOS that stops system appearance changes reaching
-    /// the app, #642); egui's light and dark styles both carry the resolved theme. Fixed modes
-    /// pin the window to their family.
-    #[test]
-    fn auto_mode_leaves_the_native_window_following_the_system() {
-        let ctx = egui::Context::default();
-        let mut app = app();
-        app.hooks.system_theme = Some(Box::new(|_| Some(egui::Theme::Light)));
-        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
-        app.apply_prefs(&ctx);
-        assert_eq!(app.ui.theme, ThemeKind::Light);
-        assert_eq!(ctx.options(|o| o.theme_preference), egui::ThemePreference::System);
-        for theme in [egui::Theme::Light, egui::Theme::Dark] {
-            assert_eq!(ctx.style_of(theme).visuals.panel_fill, app.tokens.panel_bg, "{theme:?}");
-        }
-        // egui asks the window to follow the system, never to take Light or Dark.
-        let mut out = ctx.run_ui(egui::RawInput::default(), |_| {});
-        out.textures_delta.clear();
-        let cmds = out.viewport_output.values().flat_map(|v| v.commands.iter()).collect::<Vec<_>>();
-        assert!(!cmds.iter().any(|c| matches!(c, egui::ViewportCommand::SetTheme(t) if t != &egui::SystemTheme::SystemDefault)), "{cmds:?}");
-        for (mode, pref) in [("light", egui::ThemePreference::Light), ("dark", egui::ThemePreference::Dark)] {
-            app.set_pref("appearance.appearanceMode", json!(mode)).unwrap();
-            app.apply_prefs(&ctx);
-            assert_eq!(ctx.options(|o| o.theme_preference), pref, "{mode}");
-            assert_eq!(ctx.global_style().visuals.panel_fill, app.tokens.panel_bg, "{mode}");
-        }
-    }
-
-    /// Picking a theme (`view.theme.*`, `ui.set {theme}`) fixes the mode to its family.
-    #[test]
-    fn picking_a_theme_fixes_its_mode() {
-        let ctx = egui::Context::default();
-        let mut app = app();
-        app.set_pref("appearance.appearanceMode", json!("auto")).unwrap();
-        menus::invoke(&mut app, &ctx, "view.theme.light", json!({})).unwrap();
-        assert_eq!(app.session.prefs.appearance.appearance_mode, "light");
-        assert_eq!(app.ui.theme, ThemeKind::Light);
-        menus::invoke(&mut app, &ctx, "view.theme.darker", json!({})).unwrap();
-        assert_eq!(app.session.prefs.appearance.appearance_mode, "dark");
-        assert_eq!(app.session.prefs.appearance.dark_theme, "darker");
-        assert_eq!(app.ui.theme, ThemeKind::Darker);
-    }
-}
+mod lifecycle_tests;
diff --git a/crates/ui-egui/src/lifecycle_tests.rs b/crates/ui-egui/src/lifecycle_tests.rs
new file mode 100644
index 000000000..6c9eb85d2
--- /dev/null
+++ b/crates/ui-egui/src/lifecycle_tests.rs
@@ -0,0 +1,509 @@
+//! The logic-only / UI-pass split: queue work in `tick`, input, layout and setup in `draw`.
+//!
+//! The driver mirrors eframe's order for a hidden window: `raw_input_hook` prepares the raw
+//! input, a logic-only iteration runs `tick`, and a forced pass runs `draw` with the same
+//! prepared input. Nothing may depend on `current_pass_index`, which is zero in both.
+
+use super::*;
+use effectcraft_engine::config::{ConfigStore, MemoryConfig};
+
+fn app_with_comp() -> EffectcraftApp {
+    let mut session = Session::default();
+    session.execute("comp.new", json!({"name": "Lifecycle", "width": 64, "height": 36, "duration": 1})).unwrap();
+    session.execute("layer.newSolid", json!({"color": "#ff0000"})).unwrap();
+    let mut app = EffectcraftApp::new(session);
+    app.ui.start_screen = false;
+    app.ui.show_menu_bar = false;
+    app.use_manual_clock();
+    app
+}
+
+fn raw(size: egui::Vec2) -> egui::RawInput {
+    egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, size)), ..Default::default() }
+}
+
+fn tick_with(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame, raw: &egui::RawInput) -> egui::LogicOutput {
+    ctx.run_logic(raw, |ctx| app.tick(ctx, frame))
+}
+
+fn hidden_tick(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame) {
+    let _ = tick_with(app, ctx, frame, &raw(egui::vec2(800.0, 480.0)));
+}
+
+/// One host iteration that ends in a UI pass (the forced hidden pass, or a visible frame).
+fn pass(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame, raw: &mut egui::RawInput) -> egui::FullOutput {
+    eframe::App::raw_input_hook(app, ctx, raw);
+    let mut out = ctx.run_ui(raw.take(), |ui| app.draw(ui, frame));
+    out.textures_delta.clear();
+    out
+}
+
+fn ready(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame) -> DrawGeometry {
+    // The first pass installs the fonts, the second draws with them.
+    for _ in 0..3 {
+        let mut raw = raw(egui::vec2(800.0, 480.0));
+        pass(app, ctx, frame, &mut raw);
+    }
+    assert!(app.is_ready(), "fonts are ready after the warm-up passes");
+    app.draw_geometry().expect("a completed pass records its geometry")
+}
+
+fn send(app: &mut EffectcraftApp, method: &str, params: serde_json::Value) -> std::sync::mpsc::Receiver<serde_json::Value> {
+    let (request, reply) = ControlRequest::new(method, params);
+    let (tx, rx) = std::sync::mpsc::channel();
+    tx.send(request).unwrap();
+    app.control_rx = Some(rx);
+    reply
+}
+
+#[test]
+fn a_logic_only_tick_installs_no_fonts_and_records_no_geometry() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(!app.is_ready(), "fonts need a real pass, not a logic-only tick");
+    assert!(app.draw_geometry().is_none(), "a logic-only tick is not a frame");
+    assert_eq!(app.ui_passes(), 0);
+}
+
+#[test]
+fn a_control_command_that_needs_no_ui_completes_without_a_pass() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    let reply = send(&mut app, "engine.execute", json!({"command": "comp.new", "params": {"name": "Queued", "width": 32, "height": 18, "duration": 1}}));
+    hidden_tick(&mut app, &ctx, &frame);
+    let value = reply.try_recv().expect("a command that needs no UI is answered by the tick");
+    assert_eq!(value["ok"], true, "{value}");
+    assert_eq!(app.ui_passes(), 0);
+}
+
+#[test]
+fn a_pass_that_cannot_draw_receives_no_synthetic_input() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    assert!(!app.is_ready(), "a fresh app installs its fonts in its first pass");
+    let reply = send(&mut app, "ui.click", json!({"x": 40, "y": 40}));
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(reply.try_recv().is_err(), "a click is not answered before its UI pass");
+    // The font-install pass cannot draw. It must not receive the click: `run_ui` applies what
+    // the hook feeds, and a batch cannot be put back without applying its pointer state twice.
+    let mut setup = raw(egui::vec2(800.0, 480.0));
+    eframe::App::raw_input_hook(&mut app, &ctx, &mut setup);
+    assert!(setup.events.is_empty(), "a pass that cannot draw gets no synthetic input");
+    assert_eq!(app.synthetic.len(), 5, "the whole gesture still waits for a drawing pass");
+    assert!(app.pending_synthetic_events().is_empty());
+    let mut setup_pass = ctx.run_ui(setup.take(), |ui| app.draw(ui, &frame));
+    setup_pass.textures_delta.clear();
+    assert!(!app.is_ready(), "the pass that installs the fonts draws nothing");
+    // Once fonts are ready the click reaches the UI exactly once, one event per pass.
+    let mut passes = 0;
+    while reply.try_recv().is_err() {
+        passes += 1;
+        assert!(passes < 40, "the click must be applied within a few passes");
+        let mut raw = raw(egui::vec2(800.0, 480.0));
+        pass(&mut app, &ctx, &frame, &mut raw);
+    }
+    assert!(reply.try_recv().is_err(), "the reply is sent once");
+    assert!(app.pending_synthetic_events().is_empty());
+    assert!(app.synthetic.is_empty(), "every event was applied once");
+}
+
+#[test]
+fn one_pending_synthetic_batch_is_never_duplicated_while_hidden() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let reply = send(&mut app, "ui.click", json!({"x": 40, "y": 40}));
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(reply.try_recv().is_err(), "a click is not answered before its UI pass");
+    // Several hidden host iterations: eframe keeps the first prepared input; only its one
+    // event may reach the raw input, and a later hook must not add another.
+    let mut first = raw(egui::vec2(800.0, 480.0));
+    eframe::App::raw_input_hook(&mut app, &ctx, &mut first);
+    assert_eq!(first.events.len(), 1, "the first event of the gesture is fed");
+    let mut second = raw(egui::vec2(800.0, 480.0));
+    eframe::App::raw_input_hook(&mut app, &ctx, &mut second);
+    assert!(second.events.is_empty(), "an unapplied batch blocks the next event");
+    assert_eq!(app.pending_synthetic_events().len(), 1);
+    // The pass that applies the batch acknowledges it once; it is never fed again.
+    pass(&mut app, &ctx, &frame, &mut first);
+    assert!(app.pending_synthetic_events().is_empty());
+    // Drive real passes until the gesture is applied: exactly one reply, no lost events.
+    let mut passes = 0;
+    while reply.try_recv().is_err() {
+        passes += 1;
+        assert!(passes < 40, "the click must be applied within a few passes");
+        let mut raw = raw(egui::vec2(800.0, 480.0));
+        pass(&mut app, &ctx, &frame, &mut raw);
+    }
+    assert!(app.pending_synthetic_events().is_empty());
+    assert!(app.synthetic.is_empty());
+    assert!(reply.try_recv().is_err(), "the reply is sent once");
+}
+
+#[test]
+fn geometry_epoch_tracks_size_and_scale_but_not_window_position() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    let first = ready(&mut app, &ctx, &frame);
+    let mut moved = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::pos2(120.0, 80.0), first.rect.size())), ..Default::default() };
+    pass(&mut app, &ctx, &frame, &mut moved);
+    assert_eq!(app.draw_geometry().unwrap().epoch, first.epoch, "moving the window does not change a capture");
+    let mut resized = raw(egui::vec2(1024.0, 640.0));
+    pass(&mut app, &ctx, &frame, &mut resized);
+    let after_resize = app.draw_geometry().unwrap();
+    assert!(after_resize.epoch > first.epoch, "a resize advances the epoch");
+    let mut back = raw(egui::vec2(800.0, 480.0));
+    pass(&mut app, &ctx, &frame, &mut back);
+    assert!(app.draw_geometry().unwrap().epoch > after_resize.epoch, "changing back is another change, not the old epoch");
+}
+
+#[test]
+fn only_a_viewer_that_draws_records_a_prefetch_scale() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    assert!(app.last_viewer_scale.is_some(), "the visible viewer recorded the scale it drew at");
+    // The Home screen draws no viewer: the old comp's scale must not keep idle prefetch alive.
+    app.ui.start_screen = true;
+    let mut input = raw(egui::vec2(800.0, 480.0));
+    pass(&mut app, &ctx, &frame, &mut input);
+    assert!(app.last_viewer_scale.is_none(), "no viewer drew, so there is no scale to prefetch at");
+    // Back to the comp: the next pass records it again.
+    app.ui.start_screen = false;
+    let mut input = raw(egui::vec2(800.0, 480.0));
+    pass(&mut app, &ctx, &frame, &mut input);
+    assert!(app.last_viewer_scale.is_some());
+}
+
+#[test]
+fn playback_advances_on_a_logic_only_tick() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    app.playback.playing = true;
+    app.playback.plan = Some(effectcraft_engine::preview::PreviewPlan {
+        start: 1,
+        end: 1,
+        first: 1,
+        step: 1,
+        fps: 24.0,
+        looping: false,
+        cache_first: false,
+        video: false,
+        audio: false,
+        origin: Tick::ZERO,
+    });
+    app.playback.start_wall = 0.0;
+    app.playback.start_frame = 1;
+    app.clock_mut().advance(1.0);
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(!app.playback.playing, "a one-frame preview ends without any UI pass");
+    assert_eq!(app.playback.audio_frame, Some(1), "the audio-only playhead reached the plan's end");
+    assert_eq!(app.ui_passes(), 0);
+}
+
+#[test]
+fn workspace_layout_autosave_writes_on_a_hidden_tick() {
+    let store = Arc::new(MemoryConfig::default());
+    let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
+    app.ui.start_screen = false;
+    app.use_manual_clock();
+    app.ui.focused = PanelKind::Timeline;
+    app.clock_mut().advance(2.0);
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(store.read(WORKSPACES_FILE).is_some(), "the layout is saved while the window is hidden");
+    assert_eq!(app.ui_passes(), 0);
+}
+
+#[test]
+fn the_close_guard_answers_a_close_request_without_a_pass() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    assert!(app.session.is_dirty(), "creating a comp and a layer leaves unsaved changes");
+    let mut raw = raw(egui::vec2(800.0, 480.0));
+    raw.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo { events: vec![egui::ViewportEvent::Close], ..Default::default() });
+    let out = tick_with(&mut app, &ctx, &frame, &raw);
+    assert!(app.dialog.is_some(), "a hidden close request opens the unsaved-changes prompt");
+    let cancel = out.viewport_commands.values().flatten().any(|c| matches!(c, egui::ViewportCommand::CancelClose));
+    assert!(cancel, "the window stays open while the prompt is asking");
+    assert_eq!(app.ui_passes(), 0);
+}
+
+// ---------------------------------------------------------------- screenshots
+
+fn screenshot_request(app: &mut EffectcraftApp, ctx: &egui::Context, path: Option<&str>, target: ShotTarget) -> std::sync::mpsc::Receiver<serde_json::Value> {
+    let (tx, rx) = std::sync::mpsc::channel();
+    app.admit_screenshot(ctx, path.map(str::to_string), target, tx);
+    rx
+}
+
+fn shot_callbacks(out: &egui::LogicOutput) -> Vec<egui::ScreenshotCallback> {
+    out.viewport_commands
+        .values()
+        .flatten()
+        .filter_map(|c| match c {
+            egui::ViewportCommand::Screenshot(cb) => Some(cb.clone()),
+            _ => None,
+        })
+        .collect()
+}
+
+/// Three settled passes and the settle delay, then the tick that issues the capture.
+fn issue_shot(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame) -> egui::ScreenshotCallback {
+    issue_shot_at(app, ctx, frame, egui::vec2(800.0, 480.0))
+}
+
+fn issue_shot_at(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame, size: egui::Vec2) -> egui::ScreenshotCallback {
+    for _ in 0..SCREENSHOT_SETTLE_PASSES {
+        let mut raw = raw(size);
+        pass(app, ctx, frame, &mut raw);
+    }
+    app.clock_mut().advance(SCREENSHOT_SETTLE_S + 0.01);
+    let out = tick_with(app, ctx, frame, &raw(size));
+    let cbs = shot_callbacks(&out);
+    assert_eq!(cbs.len(), 1, "one settled screenshot is issued once");
+    cbs.into_iter().next().unwrap()
+}
+
+fn image(width: usize, height: usize) -> Arc<egui::ColorImage> {
+    Arc::new(egui::ColorImage::new([width, height], vec![egui::Color32::from_rgb(10, 20, 30); width.checked_mul(height).unwrap()]))
+}
+
+#[test]
+fn a_screenshot_is_issued_only_after_settled_passes_and_writes_from_the_tick() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let path = std::env::temp_dir().join(format!("effectcraft-shot-{}-ok.png", std::process::id()));
+    let _ = std::fs::remove_file(&path);
+    let reply = screenshot_request(&mut app, &ctx, path.to_str(), ShotTarget::Window);
+    // Not settled: a tick issues nothing and asks for passes instead.
+    let out = tick_with(&mut app, &ctx, &frame, &raw(egui::vec2(800.0, 480.0)));
+    assert!(shot_callbacks(&out).is_empty(), "no capture before the UI settles");
+    assert_eq!(out.viewport_commands.values().flatten().filter(|c| matches!(c, egui::ViewportCommand::RequestPaintWhileHidden)).count(), 1);
+    let cb = issue_shot(&mut app, &ctx, &frame);
+    assert!(reply.try_recv().is_err(), "the callback must not write or reply itself");
+    cb.complete(image(800, 480));
+    hidden_tick(&mut app, &ctx, &frame);
+    let value = reply.try_recv().expect("the tick drains the completed slot and replies");
+    assert_eq!(value["ok"], true, "{value}");
+    assert!(path.exists(), "{value}");
+    assert_eq!(value["result"]["width"], 800);
+    assert_eq!(value["result"]["height"], 480);
+    assert_eq!(app.shot_bytes, 0, "the reservation is released");
+    let _ = std::fs::remove_file(&path);
+}
+
+#[test]
+fn a_resize_between_issue_and_completion_rejects_the_pixels_and_retries() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let path = std::env::temp_dir().join(format!("effectcraft-shot-{}-retry.png", std::process::id()));
+    let _ = std::fs::remove_file(&path);
+    let reply = screenshot_request(&mut app, &ctx, path.to_str(), ShotTarget::Window);
+    let first = issue_shot(&mut app, &ctx, &frame);
+    let size = egui::vec2(1024.0, 640.0);
+    let mut resized = raw(size);
+    pass(&mut app, &ctx, &frame, &mut resized);
+    first.complete(image(800, 480));
+    let _ = tick_with(&mut app, &ctx, &frame, &raw(size));
+    assert!(reply.try_recv().is_err(), "pixels from the old surface epoch are discarded");
+    assert!(!path.exists(), "a stale image is never written");
+    // The retry is issued against the new geometry and the new image is accepted.
+    let second = issue_shot_at(&mut app, &ctx, &frame, size);
+    second.complete(image(1024, 640));
+    let _ = tick_with(&mut app, &ctx, &frame, &raw(size));
+    let value = reply.try_recv().expect("the retried capture replies");
+    assert_eq!(value["ok"], true, "{value}");
+    assert_eq!(value["result"]["width"], 1024);
+    let _ = std::fs::remove_file(&path);
+}
+
+#[test]
+fn screenshot_admission_bounds_requests_and_a_timeout_releases_its_reservation() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let mut replies = Vec::new();
+    for _ in 0..MAX_PENDING_SHOTS {
+        replies.push(screenshot_request(&mut app, &ctx, None, ShotTarget::Rect([0.0, 0.0, 4.0, 4.0])));
+    }
+    let refused = screenshot_request(&mut app, &ctx, None, ShotTarget::Rect([0.0, 0.0, 4.0, 4.0]));
+    let value = refused.try_recv().expect("the fifth request is refused immediately");
+    assert_eq!(value["ok"], false, "{value}");
+    // Every queued request times out on a hidden window that presents no frame; each one
+    // releases its reservation exactly once.
+    app.clock_mut().advance(SCREENSHOT_TIMEOUT_S + 1.0);
+    hidden_tick(&mut app, &ctx, &frame);
+    for reply in replies {
+        let value = reply.try_recv().expect("a timed-out request gets an actionable reply");
+        assert_eq!(value["ok"], false, "{value}");
+        assert!(value["error"].as_str().is_some_and(|e| e.contains("no frame")), "{value}");
+    }
+    assert_eq!(app.shot_bytes, 0);
+    assert!(app.pending_screenshots.is_empty());
+}
+
+#[test]
+fn a_late_callback_after_cancellation_writes_nothing_and_replies_once() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let path = std::env::temp_dir().join(format!("effectcraft-shot-{}-late.png", std::process::id()));
+    let _ = std::fs::remove_file(&path);
+    let reply = screenshot_request(&mut app, &ctx, path.to_str(), ShotTarget::Window);
+    let late = issue_shot(&mut app, &ctx, &frame);
+    app.clock_mut().advance(SCREENSHOT_TIMEOUT_S + 1.0);
+    hidden_tick(&mut app, &ctx, &frame);
+    let timeout = reply.try_recv().expect("the request times out");
+    assert_eq!(timeout["ok"], false, "{timeout}");
+    late.complete(image(800, 480));
+    hidden_tick(&mut app, &ctx, &frame);
+    assert!(reply.try_recv().is_err(), "a late completion sends no second reply");
+    assert!(!path.exists(), "a late completion writes no file");
+    assert_eq!(app.shot_bytes, 0);
+}
+
+/// Every repaint delay requested on `ctx` (what a host uses to wake the app).
+fn wake_requests(ctx: &egui::Context) -> Arc<std::sync::Mutex<Vec<std::time::Duration>>> {
+    let wakes: Arc<std::sync::Mutex<Vec<std::time::Duration>>> = Arc::default();
+    let record = Arc::clone(&wakes);
+    ctx.set_repaint_observer(move |i| record.lock().unwrap_or_else(std::sync::PoisonError::into_inner).push(i.delay));
+    wakes
+}
+
+#[test]
+fn an_issued_capture_schedules_a_wake_up_for_its_deadline() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    ready(&mut app, &ctx, &frame);
+    let reply = screenshot_request(&mut app, &ctx, None, ShotTarget::Window);
+    for _ in 0..SCREENSHOT_SETTLE_PASSES {
+        let mut raw = raw(egui::vec2(800.0, 480.0));
+        pass(&mut app, &ctx, &frame, &mut raw);
+    }
+    app.clock_mut().advance(SCREENSHOT_SETTLE_S + 0.01);
+    // Record the repaint requests of the tick that issues the capture only.
+    let wakes = wake_requests(&ctx);
+    let out = tick_with(&mut app, &ctx, &frame, &raw(egui::vec2(800.0, 480.0)));
+    assert_eq!(shot_callbacks(&out).len(), 1, "the settled capture is issued once");
+    let delays = wakes.lock().unwrap_or_else(std::sync::PoisonError::into_inner).clone();
+    // The deadline is 8 s after admission; the capture was issued ~0.31 s in, so the app must
+    // ask for a wake-up close to that timeout, not only for the next paint.
+    let deadline_wake = delays.iter().any(|d| d.as_secs_f64() > 7.0 && d.as_secs_f64() <= SCREENSHOT_TIMEOUT_S);
+    assert!(deadline_wake, "an issued capture asks the host to wake for its timeout: {delays:?}");
+    // The callback never arrives (a hidden window or a display asleep). The host wakes at the
+    // requested delay; without this wake-up the timeout below could never be evaluated.
+    app.clock_mut().advance(SCREENSHOT_TIMEOUT_S + 1.0);
+    hidden_tick(&mut app, &ctx, &frame);
+    let value = reply.try_recv().expect("the deadline wake-up produces the timeout reply");
+    assert_eq!(value["ok"], false, "{value}");
+    assert!(value["error"].as_str().is_some_and(|e| e.contains("no frame")), "{value}");
+    assert_eq!(app.shot_bytes, 0);
+    assert!(app.pending_screenshots.is_empty());
+}
+
+#[test]
+fn a_downscaled_capture_is_cropped_with_the_images_own_scale() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    let geom = ready(&mut app, &ctx, &frame);
+    assert_eq!((geom.rect.width(), geom.rect.height(), geom.ppp), (800.0, 480.0, 1.0));
+    // The adapter-limit fit (E2) returned half the requested pixels. Left red, right blue.
+    let fitted =
+        Arc::new(egui::ColorImage::new([400, 240], (0..400 * 240).map(|i| if i % 400 < 200 { egui::Color32::RED } else { egui::Color32::BLUE }).collect()));
+    let dir = std::env::temp_dir();
+    for (name, crop, want) in [("left", [0.0, 0.0, 400.0, 240.0], egui::Color32::RED), ("right", [400.0, 0.0, 400.0, 240.0], egui::Color32::BLUE)] {
+        let path = dir.join(format!("effectcraft-shot-{}-scale-{name}.png", std::process::id()));
+        let _ = std::fs::remove_file(&path);
+        let reply = screenshot_request(&mut app, &ctx, path.to_str(), ShotTarget::Rect(crop));
+        let cb = issue_shot(&mut app, &ctx, &frame);
+        cb.complete(Arc::clone(&fitted));
+        hidden_tick(&mut app, &ctx, &frame);
+        let value = reply.try_recv().expect("the downscaled capture replies");
+        assert_eq!(value["ok"], true, "{value}");
+        assert_eq!(value["result"]["width"], 200, "{value}");
+        assert_eq!(value["result"]["height"], 120, "{value}");
+        let png = std::fs::read(&path).expect("the PNG is written");
+        let decoded = image::load_from_memory(&png).expect("our PNG decodes").to_rgba8();
+        assert_eq!((decoded.width(), decoded.height()), (200, 120), "{value}");
+        let px = decoded.get_pixel(100, 60).0;
+        assert!(px[0] == want.r() && px[1] == want.g() && px[2] == want.b(), "{name}: {px:?} is not from its half of the fitted image");
+        let _ = std::fs::remove_file(&path);
+    }
+}
+
+#[test]
+fn a_capture_before_any_pass_never_uses_the_window_frame_rect() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    // Only the outer (title bar included) rectangle is known: it is not the captured surface.
+    let outer = egui::Rect::from_min_size(egui::pos2(0.0, -30.0), egui::vec2(800.0, 510.0));
+    let mut raw = egui::RawInput::default();
+    raw.viewports.insert(egui::ViewportId::ROOT, egui::ViewportInfo { outer_rect: Some(outer), ..Default::default() });
+    let _ = tick_with(&mut app, &ctx, &frame, &raw);
+    let (tx, reply) = std::sync::mpsc::channel();
+    app.admit_screenshot(&ctx, None, ShotTarget::Window, tx);
+    let value = reply.try_recv().expect("the request is answered now");
+    assert_eq!(value["ok"], false, "{value}");
+    assert!(value["error"].as_str().is_some_and(|e| e.contains("geometry is not known")), "{value}");
+    assert!(app.pending_screenshots.is_empty(), "nothing was reserved against the wrong rectangle");
+    assert_eq!(app.shot_bytes, 0);
+    assert!(app.want_paint, "the pass that records the geometry is requested");
+}
+
+#[test]
+fn an_element_that_moves_while_the_ui_settles_is_captured_where_it_is() {
+    let ctx = egui::Context::default();
+    let frame = eframe::Frame::_new_kittest();
+    let mut app = app_with_comp();
+    let geom = ready(&mut app, &ctx, &frame);
+    // Any registered panel: the crop follows this element's rectangle.
+    let panel = app.auto.previous.iter().chain(app.auto.elements.iter()).find(|e| e.id.starts_with("panel.")).map(|e| e.id.clone());
+    let panel = panel.expect("a dock panel is on screen after a completed pass");
+    let reply = screenshot_request(&mut app, &ctx, None, ShotTarget::Id(panel.clone()));
+    for _ in 0..SCREENSHOT_SETTLE_PASSES {
+        let mut raw = raw(egui::vec2(800.0, 480.0));
+        pass(&mut app, &ctx, &frame, &mut raw);
+    }
+    // The panel moves after its last draw: the crop must follow it, not the admission rect.
+    let moved = [40.0, 30.0, 300.0, 200.0];
+    for list in [&mut app.auto.previous, &mut app.auto.elements] {
+        if let Some(e) = list.iter_mut().find(|e| e.id == panel) {
+            e.rect = moved;
+        }
+    }
+    app.clock_mut().advance(SCREENSHOT_SETTLE_S + 0.01);
+    let out = tick_with(&mut app, &ctx, &frame, &raw(egui::vec2(800.0, 480.0)));
+    assert_eq!(shot_callbacks(&out).len(), 1, "the settled capture is issued once");
+    let crop = app.pending_screenshots.first().and_then(|s| s.crop).expect("the element crop is resolved at issuance");
+    assert!((crop[0] - (moved[0] - geom.rect.min.x)).abs() < 0.01, "{crop:?}");
+    assert!((crop[1] - (moved[1] - geom.rect.min.y)).abs() < 0.01, "{crop:?}");
+    assert!((crop[2] - moved[2]).abs() < 0.01 && (crop[3] - moved[3]).abs() < 0.01, "{crop:?}");
+    // Let it complete and reply, so the request does not outlive the test.
+    if let Some(cb) = shot_callbacks(&out).into_iter().next() {
+        cb.complete(image(800, 480));
+    }
+    hidden_tick(&mut app, &ctx, &frame);
+    let value = reply.try_recv().expect("the capture replies");
+    assert_eq!(value["ok"], true, "{value}");
+    assert_eq!((value["result"]["width"].as_u64(), value["result"]["height"].as_u64()), (Some(300), Some(200)), "{value}");
+}
diff --git a/crates/ui-egui/src/menu_keys.rs b/crates/ui-egui/src/menu_keys.rs
index 397385309..49d07301c 100644
--- a/crates/ui-egui/src/menu_keys.rs
+++ b/crates/ui-egui/src/menu_keys.rs
@@ -10,7 +10,7 @@
 //! shortcuts and the panels don't see them (Space must not start a preview).
 
 use egui::containers::menu::{MenuState, SubMenu, find_menu_root};
-use egui::{Context, Event, Id, Key, Modifiers, Popup, Pos2, Response, Ui};
+use egui::{Context, Event, Id, Key, Modifiers, Popup, Pos2, Rect, Response, Ui};
 
 /// An entry of an open menu as drawn this frame.
 #[derive(Clone, Copy)]
@@ -39,6 +39,12 @@ pub struct Nav {
     tops: Vec<(Id, Id)>,
     /// Open menus by depth: the top-level menu, then each open submenu.
     levels: Vec<Level>,
+    /// The titles and open menus drawn this frame: a press outside them is an outside press,
+    /// which closes the menu (native behaviour; the press itself still reaches what's under it).
+    rects: Vec<Rect>,
+    /// A title press opened (or kept) the menu this frame: releasing the button over an entry
+    /// chooses it (After Effects' press-and-browse).
+    browsing: bool,
 }
 
 /// What to highlight once a menu opened from the keyboard has been drawn: the first entry of the
@@ -54,17 +60,26 @@ struct KeyOpened {
     pointer: Option<Pos2>,
 }
 
+/// The temp-data id of the [`FirstEntry`] depth to highlight after a keyboard-opened menu is
+/// first drawn.
 fn pending_id() -> Id {
-    Id::new("menu-keys-first")
+    Id::unique("menu-keys-first")
 }
+
+/// The temp-data id of the [`KeyOpened`] record: submenus opened from the keyboard and the
+/// pointer position they were opened at.
 fn opened_id() -> Id {
-    Id::new("menu-keys-opened")
+    Id::unique("menu-keys-opened")
 }
+
+/// The temp-data id of the flag saying the menu bar currently holds the keyboard.
 fn active_id() -> Id {
-    Id::new("menu-keys-active")
+    Id::unique("menu-keys-active")
 }
+
+/// The temp-data id of the `(armed, held)` Alt-key state used to detect an Alt tap.
 fn alt_id() -> Id {
-    Id::new("menu-keys-alt")
+    Id::unique("menu-keys-alt")
 }
 
 impl Nav {
@@ -73,6 +88,37 @@ impl Nav {
         self.tops.push((button.id, Popup::default_response_id(button)));
     }
 
+    /// The rect `rect` (a menu title or an open menu) holds, so a press there doesn't close.
+    pub fn cover(&mut self, rect: Rect) {
+        self.rects.push(rect);
+    }
+
+    /// Whether `pos` is inside a title or menu drawn this frame.
+    pub fn covers(&self, pos: Pos2) -> bool {
+        self.rects.iter().any(|r| r.contains(pos))
+    }
+
+    /// A title press is in progress (its button still held): see [`Nav::browsing`].
+    pub fn set_browsing(&mut self) {
+        self.browsing = true;
+    }
+
+    /// Whether the menu bar is mid press-and-browse (a title was pressed this pointer-down and
+    /// hasn't been released yet): releasing over an entry then chooses it.
+    pub fn browsing(&self) -> bool {
+        self.browsing
+    }
+
+    /// The popup of the open top-level menu (only one can be open), if any.
+    pub fn open_popup(&self, ctx: &Context) -> Option<Id> {
+        self.tops.iter().find(|(_, p)| Popup::is_id_open(ctx, *p)).map(|(_, p)| *p)
+    }
+
+    /// The position in the bar of the open top-level menu, if any.
+    pub fn open_index(&self, ctx: &Context) -> Option<usize> {
+        self.tops.iter().position(|(_, p)| Popup::is_id_open(ctx, *p))
+    }
+
     /// An entry drawn at `depth` (0: a top-level menu) in the menu `ui`. Hovering an entry moves
     /// the keyboard highlight to it, and a highlighted entry scrolls into view.
     pub fn entry(&mut self, ui: &Ui, depth: usize, r: &Response, submenu: bool) {
@@ -81,7 +127,7 @@ impl Nav {
         }
         let Some(level) = self.levels.get_mut(depth) else { return };
         if level.menu.is_none() {
-            level.menu = Some(find_menu_root(ui).id);
+            level.menu = Some(find_menu_root(ui).scope_id);
             level.sizing = ui.is_sizing_pass();
         }
         level.rows.push(Row { id: r.id, enabled: r.enabled(), submenu });
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index 26a7b66f6..cb28b0bcd 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -8,10 +8,31 @@
 use serde_json::{Value, json};
 
 use crate::EffectcraftApp;
-use crate::dock::PanelKind;
+use crate::dock::{PanelKind, WorkspaceExt as _};
 use crate::state::{Resolution, Tool};
 use effectcraft_engine::menus::{MenuEntry, MenuNode};
 
+mod bar;
+mod commands;
+mod entries;
+mod frontend;
+mod invoke;
+mod shortcuts;
+
+pub use bar::menu_bar;
+pub(crate) use bar::{dyn_ctx, entry_for, menu_contents, submenu_at};
+pub use commands::UI_COMMANDS;
+pub use entries::{MenuItem, menu_items, menus};
+pub(crate) use entries::{entry_checked, entry_enabled, entry_label, entry_shortcut, menu_choice, panel_shown};
+pub use frontend::frontend;
+#[cfg(test)]
+use frontend::zoom_step;
+pub(crate) use frontend::{dialog_answered, run_engine};
+pub use invoke::{invoke, panel_command_id, reveal};
+#[cfg(test)]
+use shortcuts::modifiers_at_start;
+pub use shortcuts::{Binding, bindings, chord_matches, forwardable_during_text_edit, handle_shortcuts, handle_tab_shortcut, parse_shortcut, shortcut_text};
+
 pub struct UiCommand {
     pub id: &'static str,
     pub label: &'static str,
@@ -19,2502 +40,5 @@ pub struct UiCommand {
     pub shortcut: Option<&'static str>,
 }
 
-macro_rules! uic {
-    ($id:literal, $label:literal, [$($m:literal),*], $sc:expr) => {
-        UiCommand { id: $id, label: $label, menu: &[$($m),*], shortcut: $sc }
-    };
-}
-
-/// UI-only commands (not in the AE menus; shortcuts and the command palette).
-pub const UI_COMMANDS: &[UiCommand] = &[
-    uic!("window.dockAction", "Docking Action", [], None),
-    uic!("playback.ramPreview", "Preview (Numpad 0)", [], Some("Num0")),
-    uic!("playback.preview.shiftSpacebar", "Preview (Shift+Spacebar)", [], Some("Shift+Space")),
-    uic!("playback.preview.shiftNumpad0", "Preview (Shift+Numpad 0)", [], Some("Shift+Num0")),
-    uic!("playback.preview.altNumpad0", "Preview (Alt+Numpad 0)", [], Some("Alt+Num0")),
-    uic!("playback.stop", "Stop", [], None),
-    uic!("view.fit", "Fit", [], Some("Shift+/")),
-    uic!("view.actualSize", "100%", [], Some("/")),
-    uic!("view.fitUpTo100", "Fit up to 100%", [], Some("Alt+/")),
-    uic!("view.nextItem", "Next Composition in Viewer", [], Some("Shift+.")),
-    uic!("view.previousItem", "Previous Composition in Viewer", [], Some("Shift+,")),
-    uic!("viewer.nudge.up", "Move Selected Layers Up 1 Pixel at Current Magnification", [], Some("ArrowUp")),
-    uic!("viewer.nudge.down", "Move Selected Layers Down 1 Pixel at Current Magnification", [], Some("ArrowDown")),
-    uic!("viewer.nudge.left", "Move Selected Layers Left 1 Pixel at Current Magnification", [], Some("ArrowLeft")),
-    uic!("viewer.nudge.right", "Move Selected Layers Right 1 Pixel at Current Magnification", [], Some("ArrowRight")),
-    uic!("viewer.nudge.up10", "Move Selected Layers Up 10 Pixels at Current Magnification", [], Some("Shift+ArrowUp")),
-    uic!("viewer.nudge.down10", "Move Selected Layers Down 10 Pixels at Current Magnification", [], Some("Shift+ArrowDown")),
-    uic!("viewer.nudge.left10", "Move Selected Layers Left 10 Pixels at Current Magnification", [], Some("Shift+ArrowLeft")),
-    uic!("viewer.nudge.right10", "Move Selected Layers Right 10 Pixels at Current Magnification", [], Some("Shift+ArrowRight")),
-    uic!("view.safeMargins", "Title/Action Safe", [], Some("'")),
-    uic!("view.transparencyGrid", "Transparency Grid", [], None),
-    uic!("view.fastPreviews", "Fast Previews", [], None),
-    uic!("view.theme.toggle", "Next Appearance Mode", [], None),
-    uic!("view.theme.dark", "Theme: Dark", [], None),
-    uic!("view.theme.darker", "Theme: Darker", [], None),
-    uic!("view.theme.light", "Theme: Light", [], None),
-    uic!("timeline.zoomIn", "Zoom In Time", [], Some("=")),
-    uic!("timeline.zoomOut", "Zoom Out Time", [], Some("-")),
-    uic!("timeline.zoomFit", "Zoom to Fit Comp", [], Some("Shift+;")),
-    uic!("timeline.scrollToTime", "Scroll to Current Time", [], Some("D")),
-    uic!("timeline.scrollToLayer", "Scroll Topmost Selected Layer to Top", [], Some("X")),
-    uic!("timeline.parentColumn", "Show/Hide Parent Column", [], Some("Shift+F4")),
-    uic!("timeline.zoomFrameToggle", "Zoom In to Frame Level / Out to the Whole Comp", [], Some(";")),
-    uic!("timeline.graphEditor", "Graph Editor", [], Some("Shift+F3")),
-    uic!("timeline.switchesModes", "Toggle Switches / Modes", [], Some("F4")),
-    uic!("timeline.workAreaBegin", "Set Work Area Begin", [], Some("B")),
-    uic!("timeline.workAreaEnd", "Set Work Area End", [], Some("N")),
-    uic!("timeline.moveInToTime", "Move Layer In Point to Current Time", [], Some("[")),
-    uic!("timeline.moveOutToTime", "Move Layer Out Point to Current Time", [], Some("]")),
-    uic!("timeline.trimInToTime", "Trim Layer In Point to Current Time", [], Some("Alt+[")),
-    uic!("timeline.trimOutToTime", "Trim Layer Out Point to Current Time", [], Some("Alt+]")),
-    uic!("timeline.reveal.position", "Reveal Position", [], Some("P")),
-    uic!("timeline.reveal.scale", "Reveal Scale", [], Some("S")),
-    uic!("timeline.reveal.rotation", "Reveal Rotation", [], Some("R")),
-    uic!("timeline.reveal.opacity", "Reveal Opacity", [], Some("T")),
-    uic!("timeline.reveal.anchor", "Reveal Anchor Point", [], Some("A")),
-    uic!("timeline.reveal.effects", "Reveal Effects", [], Some("E")),
-    uic!("timeline.reveal.masks", "Reveal Masks", [], Some("M")),
-    uic!("timeline.reveal.feather", "Reveal Mask Feather", [], Some("F")),
-    uic!("timeline.reveal.levels", "Reveal Audio Levels (press twice: Waveform)", [], Some("L")),
-    uic!("timeline.reveal.timeRemap", "Reveal Time Remap", [], None),
-    uic!("timeline.reveal.expressions", "Reveal Expressions", [], None),
-    uic!("timeline.reveal.maskOpacity", "Reveal Mask Opacity", [], None),
-    uic!("timeline.reveal.maskPath", "Reveal Mask Path", [], None),
-    uic!("timeline.reveal.material", "Reveal Material Options", [], None),
-    uic!("timeline.reveal.paint", "Reveal Paint, Roto Brush and Puppet", [], None),
-    uic!("timeline.reveal.selected", "Reveal Selected Properties", [], None),
-    uic!("timeline.reveal.missingEffects", "Reveal Missing Effects", [], None),
-    uic!("timeline.reveal.waveform", "Reveal Audio Waveform", [], None),
-    uic!("timeline.revealAdd.position", "Add Position to Revealed Properties", [], Some("Shift+P")),
-    uic!("timeline.revealAdd.scale", "Add Scale to Revealed Properties", [], Some("Shift+S")),
-    uic!("timeline.revealAdd.rotation", "Add Rotation to Revealed Properties", [], Some("Shift+R")),
-    uic!("timeline.revealAdd.opacity", "Add Opacity to Revealed Properties", [], Some("Shift+T")),
-    uic!("timeline.revealAdd.anchor", "Add Anchor Point to Revealed Properties", [], Some("Shift+A")),
-    uic!("timeline.revealAdd.effects", "Add Effects to Revealed Properties", [], Some("Shift+E")),
-    uic!("timeline.revealAdd.masks", "Add Masks to Revealed Properties", [], Some("Shift+M")),
-    uic!("timeline.revealAdd.feather", "Add Mask Feather to Revealed Properties", [], Some("Shift+F")),
-    uic!("timeline.revealAdd.levels", "Add Audio Levels to Revealed Properties", [], Some("Shift+L")),
-    uic!("timeline.revealAdd.animated", "Add Animated Properties to Revealed Properties", [], Some("Shift+U")),
-    uic!("timeline.column", "Show/Hide Timeline Column", [], None),
-    uic!("timeline.sourceName", "Source Name / Layer Name", [], None),
-    uic!("timeline.search", "Search Timeline", [], None),
-    uic!("flowchart.options", "Flowchart Options", [], None),
-    uic!("flowchart.graph", "Flowchart Graph", [], None),
-    uic!("timeline.collapseAll", "Collapse All", [], None),
-    uic!("timeline.twirlSelected", "Twirl Selected Layers Open / Closed", [], Some("Cmd+`")),
-    uic!("timeline.keyAt.anchor", "Add or Remove Anchor Point Keyframe", [], Some("Alt+Shift+A")),
-    uic!("timeline.keyAt.position", "Add or Remove Position Keyframe", [], Some("Alt+Shift+P")),
-    uic!("timeline.keyAt.scale", "Add or Remove Scale Keyframe", [], Some("Alt+Shift+S")),
-    uic!("timeline.keyAt.rotation", "Add or Remove Rotation Keyframe", [], Some("Alt+Shift+R")),
-    uic!("timeline.keyAt.opacity", "Add or Remove Opacity Keyframe", [], Some("Alt+Shift+T")),
-    uic!("tool.selection", "Selection Tool", [], Some("V")),
-    uic!("tool.hand", "Hand Tool", [], Some("H")),
-    uic!("tool.zoom", "Zoom Tool", [], Some("Z")),
-    uic!("tool.orbit", "Orbit Tool", [], Some("1")),
-    uic!("tool.panCamera", "Pan Camera Tool", [], Some("2")),
-    uic!("tool.dolly", "Dolly Tool", [], Some("3")),
-    uic!("tool.camera", "Camera Tools", [], Some("C")),
-    uic!("tool.rotate", "Rotation Tool", [], Some("W")),
-    uic!("tool.panBehind", "Pan Behind Tool", [], Some("Y")),
-    uic!("tool.shape", "Shape Tools", [], Some("Q")),
-    uic!("tool.pen", "Pen Tool", [], Some("G")),
-    uic!("tool.type", "Type Tools", [], Some("Cmd+T")),
-    uic!("tool.brush", "Brush Tools", [], Some("Cmd+B")),
-    uic!("tool.rotoBrush", "Roto Brush & Refine Edge Tools", [], Some("Alt+W")),
-    uic!("tool.puppet", "Puppet Tools", [], Some("Cmd+P")),
-    uic!("app.newComp", "New Composition...", [], None),
-    uic!("app.compSettings", "Composition Settings...", [], None),
-    uic!("app.solidSettings", "New Solid...", [], None),
-    uic!("app.home", "Home", [], None),
-    uic!("markers.dialog", "Marker Settings...", [], None),
-    uic!("window.maximizePanel", "Maximize Panel Under Pointer", [], Some("`")),
-    uic!("window.maximizeApp", "Maximize or Restore Application Window", [], Some("Cmd+\\")),
-    uic!("window.toggleCompTimeline", "Switch Between Composition and Timeline Panel", [], Some("\\")),
-    uic!("window.nextPanel", "Next Panel in Frame", [], Some("Alt+Shift+.")),
-    uic!("window.previousPanel", "Previous Panel in Frame", [], Some("Alt+Shift+,")),
-    uic!("window.closeAll", "Close Panel or All Viewers", [], Some("Cmd+Shift+W")),
-    uic!("window.dockPanel", "Dock Panel", [], None),
-    uic!("window.floatPanel", "Undock Panel", [], None),
-    uic!("window.closePanel", "Close Panel", [], None),
-    uic!("window.panelWindow", "Move Panel to New Window", [], None),
-];
-
-pub fn panel_command_id(p: PanelKind) -> String {
-    format!("window.panel.{}", p.id())
-}
-
-/// The reveal shortcuts (P, S, R, T, A, E, M, F, L…). `add` (Shift+key) adds the property to
-/// (or removes it from) those already revealed instead of replacing them.
-pub fn reveal(app: &mut EffectcraftApp, kind: &str, now: f64, add: bool) {
-    // The double-press shortcuts: the same key again within 0.6 s reveals its second set (LL
-    // Waveform, TT Mask Opacity, MM all mask properties, EE Expressions, RR Time Remap, AA
-    // Material Options, PP paint / Roto Brush / Puppet, SS selected properties, FF missing
-    // effects). A single M shows Mask Path.
-    let double = |k: &str| -> Option<&'static str> {
-        Some(match k {
-            "levels" => "waveform",
-            "opacity" => "maskOpacity",
-            "masks" => "masks",
-            "effects" => "expressions",
-            "rotation" => "timeRemap",
-            "anchor" => "material",
-            "position" => "paint",
-            "scale" => "selected",
-            "feather" => "missingEffects",
-            _ => return None,
-        })
-    };
-    let pressed = kind;
-    // (With Shift a second press removes the property again instead.)
-    let again = !add && matches!(app.last_reveal.take(), Some((k, t)) if k == pressed && now - t < 0.6);
-    app.last_reveal = Some((if again { String::new() } else { pressed.to_string() }, now));
-    let kind = match (again, double(pressed)) {
-        (true, Some(d)) => {
-            // The second press replaces what the first one revealed.
-            let first = if pressed == "masks" { "maskPath" } else { pressed };
-            app.ui.timeline.reveal.retain(|k| k != first);
-            d
-        }
-        _ if pressed == "masks" => "maskPath",
-        _ => pressed,
-    };
-    let targets = reveal_targets(app);
-    let tl = &mut app.ui.timeline;
-    let present = tl.reveal.iter().any(|k| k == kind);
-    let mut kinds = tl.reveal.clone();
-    if add {
-        if present {
-            kinds.retain(|k| k != kind);
-        } else {
-            kinds.retain(|k| k != "props" || !tl.reveal_props.is_empty());
-            kinds.push(kind.to_string());
-        }
-    } else if present && kinds.len() == 1 {
-        kinds.clear();
-    } else {
-        kinds = vec![kind.to_string()];
-    }
-    tl.apply_reveal(&targets, kinds.clone());
-    crate::panels::timeline::open_revealed(app, &targets, &kinds);
-}
-
-/// Show Time Remap on the layers of a `layer.enableTimeRemap` (`layers` by id, else the
-/// selected ones) that have it now.
-fn reveal_time_remap(app: &mut EffectcraftApp, params: &Value) {
-    let asked: Vec<u64> = match params.get("layers").and_then(Value::as_array) {
-        Some(a) => a.iter().filter_map(Value::as_u64).collect(),
-        None => app.session.state.selected_layers.iter().map(|l| l.0).collect(),
-    };
-    let Some(comp) = app.session.active_comp() else { return };
-    let layers: Vec<u64> = comp.layers.iter().filter(|l| asked.contains(&l.id.0) && l.props.get("timeRemap").is_some()).map(|l| l.id.0).collect();
-    if !layers.is_empty() {
-        app.ui.timeline.apply_reveal(&layers, vec!["timeRemap".into()]);
-    }
-}
-
-/// After Alt+Shift+P (A, S, R, T) the Timeline shows the property on each layer it keyed, as in
-/// After Effects: added to what a reveal shortcut shows, else with the layer's Transform twirled
-/// open, else alone like P.
-fn reveal_keyed(app: &mut EffectcraftApp, keyed: &Value, kind: &str) {
-    let layers: std::collections::BTreeSet<u64> = keyed.as_array().into_iter().flatten().filter_map(|k| k.get("layer").and_then(Value::as_u64)).collect();
-    let Some(comp) = app.session.active_comp() else { return };
-    let tl = &mut app.ui.timeline;
-    for id in layers {
-        let shown = tl.layer_reveal.get(&id).filter(|k| !k.is_empty()).cloned();
-        match shown {
-            Some(mut kinds) => {
-                if !kinds.iter().any(|k| k == kind) {
-                    kinds.push(kind.to_string());
-                    tl.layer_reveal.insert(id, kinds);
-                }
-            }
-            None if tl.open_layers.contains(&id) => {
-                if let Some(tr) = comp.layer(effectcraft_engine::project::LayerId(id)).and_then(|l| l.transform()) {
-                    tl.open_groups.insert(tr.uid);
-                }
-            }
-            None => {
-                tl.open_layers.insert(id);
-                tl.layer_reveal.insert(id, vec![kind.to_string()]);
-            }
-        }
-    }
-}
-
-/// The layers a reveal shortcut acts on: the selected ones, else every layer of the active comp.
-fn reveal_targets(app: &EffectcraftApp) -> Vec<u64> {
-    if app.session.state.selected_layers.is_empty() {
-        app.session.active_comp().map(|c| c.layers.iter().map(|l| l.id.0).collect()).unwrap_or_default()
-    } else {
-        app.session.state.selected_layers.iter().map(|l| l.0).collect()
-    }
-}
-
-/// The arrow keys nudge the selected layers 1 pixel at the viewer's magnification (`up`,
-/// `down`, `left`, `right`), 10 with Shift (`up10`…), as After Effects does, so zoomed in
-/// they move by fractions of a comp pixel. From any panel except Project (which owns the
-/// arrow keys for its own keyboard navigation, #961); not while typing, with a dialog or
-/// menu open, or with mask points selected.
-fn nudge(app: &mut EffectcraftApp, ctx: &egui::Context, dir: &str) -> Result<Value, String> {
-    let (side, n) = match dir.strip_suffix("10") {
-        Some(side) => (side, 10.0),
-        None => (dir, 1.0),
-    };
-    let (x, y) = match side {
-        "up" => (0.0, -n),
-        "down" => (0.0, n),
-        "left" => (-n, 0.0),
-        "right" => (n, 0.0),
-        _ => return Err(format!("unknown nudge `{dir}`")),
-    };
-    let st = &app.session.state;
-    if app.ui.focused == PanelKind::Project || st.selected_layers.is_empty() || st.text_edit.is_some() || !st.selected_vertices.is_empty() {
-        return Ok(Value::Null);
-    }
-    // Screen pixels per comp pixel.
-    let zoom = (app.ui.viewer.zoom.unwrap_or_else(|| crate::panels::viewer::last_fit(ctx)) * ctx.pixels_per_point()) as f64;
-    let k = if zoom.is_finite() && zoom > 1e-6 { 1.0 / zoom } else { 1.0 };
-    run_engine(app, ctx, "layer.nudge", json!({"x": x * k, "y": y * k}))
-}
-
-fn no_params(p: &Value) -> bool {
-    p.as_object().is_none_or(|m| m.is_empty())
-}
-
-/// `{"comp": id}` and nothing else: Composition Settings opens on that comp instead of
-/// applying no settings to it.
-fn only_comp(p: &Value) -> Option<effectcraft_engine::project::ItemId> {
-    let m = p.as_object().filter(|m| m.len() == 1)?;
-    m.get("comp")?.as_u64().map(effectcraft_engine::project::ItemId)
-}
-
-/// Execute a UI or engine command by id.
-pub fn invoke(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: Value) -> Result<Value, String> {
-    if matches!(id, "effects.copyPresetsFolderPath" | "mediaBrowser.copySourcePath") {
-        return frontend(app, ctx, id, params);
-    }
-    // Layer ▸ New ▸ Text (menu, shortcut, context menus) puts an insertion point in the centre of
-    // the comp, as After Effects does, so typing goes into Source Text rather than running
-    // shortcuts (#866). `engine.execute` keeps the headless default.
-    if id == "layer.newText" && no_params(&params) {
-        return run_engine(app, ctx, id, json!({"text": "", "edit": true}));
-    }
-    if no_params(&params) && app.ui.focused == PanelKind::Project {
-        match id {
-            "edit.duplicate" => return run_engine(app, ctx, "project.duplicate", json!({})),
-            "edit.selectAll" => {
-                let items: Vec<u64> = crate::panels::project::visible_rows(app)
-                    .into_iter()
-                    .filter(|(id, _)| app.ui.project_search.is_empty() || app.session.project.item(*id).is_some_and(|it| !it.is_folder()))
-                    .map(|(id, _)| id.0)
-                    .collect();
-                return run_engine(app, ctx, "project.select", json!({"items":items}));
-            }
-            "edit.deselectAll" => return run_engine(app, ctx, "project.select", json!({"items":[]})),
-            "edit.cut" | "edit.copy" | "edit.paste" | "edit.copyWithPropertyLinks" | "edit.copyWithRelativePropertyLinks" | "edit.copyExpressionOnly" => {
-                return Err("Project clipboard actions are not supported yet".into());
-            }
-            _ => {}
-        }
-    }
-    // Edit ▸ Paste with SVG markup on the system clipboard pastes it as a shape layer (After
-    // Effects 26.3). Copying in the app replaces the system clipboard with a note naming what
-    // was copied, so SVG there was copied after anything copied in the app.
-    if id == "edit.paste" && no_params(&params) && app.session.state.text_edit.is_none() {
-        let text = ctx.data_mut(|d| d.remove_temp::<String>(system_paste_id())).or_else(|| app.hooks.clipboard_text.as_ref().and_then(|f| f()));
-        if let Some(svg) = text.filter(|t| effectcraft_engine::vector::is_svg_text(t)) {
-            return run_engine(app, ctx, "edit.pasteSvg", json!({"svg": svg}));
-        }
-    }
-    // Clear follows panel focus, including the Edit menu and keyboard shortcut.
-    if id == "edit.clear" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::Project {
-        // Through `invoke`, so deleting items that compositions use still asks first (M3.16).
-        return invoke(app, ctx, "project.delete", json!({}));
-    }
-    if id == "edit.clear" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::RenderQueue {
-        let selected = ctx.data(|d| d.get_temp::<(Vec<u64>, Option<u64>)>(egui::Id::new("rq-ui"))).and_then(|(_, id)| id);
-        return match selected {
-            Some(item) => run_engine(app, ctx, "renderQueue.remove", json!({"item": item})),
-            None => Err("select a Render Queue item first".into()),
-        };
-    }
-    // Shift+Delete deletes the Project panel's selection without asking; it does nothing in the
-    // other panels.
-    if id == "project.deleteWithoutConfirmation" {
-        if app.ui.focused != PanelKind::Project {
-            return Ok(Value::Null);
-        }
-        return crate::panels::delete_items::delete_confirmed(app, ctx, json!({}));
-    }
-    let now = ctx.input(|i| i.time);
-    // Closing a modified project asks to save it first; the command runs once answered.
-    if crate::panels::unsaved::guard(app, id, &params) {
-        return Ok(json!({"dialog": "unsavedChanges"}));
-    }
-    // Deleting Project items that compositions use asks first, as in After Effects.
-    if crate::panels::delete_items::guard(app, id, &params) {
-        return Ok(json!({"dialog": "deleteItems"}));
-    }
-    // J / K and Select All Keyframes act on what the Timeline shows (its revealed properties).
-    if matches!(id, "time.nextKey" | "time.previousKey" | "keys.selectAll")
-        && ["visible", "layers", "layer", "prop"].iter().all(|k| params.get(*k).is_none())
-        && let Some(c) = app.session.active_comp_arc()
-    {
-        let mut p = if params.is_object() { params.clone() } else { json!({}) };
-        p["visible"] = json!(crate::panels::timeline::visible_props(app, &c));
-        return run_engine(app, ctx, id, p);
-    }
-    // New Camera/Light and Camera/Light Settings without parameters open their dialogs.
-    if crate::panels::dialogs_3d::route(app, id, &params)? {
-        return Ok(Value::Null);
-    }
-    // Layer Settings on a solid, adjustment layer or null opens its settings dialog.
-    if crate::panels::dialogs::route_layer_settings(app, id, &params)? {
-        return Ok(Value::Null);
-    }
-    // Layer ▸ Layer Styles ▸ <style> from the menu adds the style and opens the dialog on it.
-    if crate::panels::layer_styles_dialog::route(app, id, &params)? {
-        return Ok(Value::Null);
-    }
-    // Legacy per-panel / per-workspace ids (`window.panel.Project`, `window.workspace.default`).
-    if let Some(rest) = id.strip_prefix("window.panel.") {
-        return frontend(app, ctx, "window.panel", json!({"panel": rest}));
-    }
-    if let Some(ws) = id.strip_prefix("window.workspace.") {
-        if ws == "reset" {
-            return frontend(app, ctx, "window.resetWorkspace", json!({}));
-        }
-        return frontend(app, ctx, "window.workspace", json!({"name": ws}));
-    }
-    if let Some(t) = id.strip_prefix("tool.") {
-        // C cycles through the camera tools.
-        if t == "camera" {
-            let tools = [Tool::Orbit, Tool::PanCamera, Tool::Dolly];
-            let next = match tools.iter().position(|x| *x == app.ui.tool) {
-                Some(i) => tools[(i + 1) % tools.len()],
-                None => Tool::Orbit,
-            };
-            app.ui.tool = next;
-            return Ok(json!({"tool": next}));
-        }
-        // Slot shortcuts cycle through the slot's tools.
-        let slot = match t {
-            "shape" => Some(8),
-            "pen" => Some(9),
-            "type" => Some(10),
-            "brush" => Some(11),
-            "rotoBrush" => Some(14),
-            "puppet" => Some(15),
-            _ => None,
-        };
-        if let Some(si) = slot {
-            let tools: Vec<Tool> = match si {
-                11 => vec![Tool::Brush, Tool::Clone, Tool::Eraser],
-                _ => crate::state::Tool::SLOTS[si].to_vec(),
-            };
-            let cur = tools.iter().position(|x| *x == app.ui.tool);
-            let next = match cur {
-                Some(i) => tools[(i + 1) % tools.len()],
-                None => app.ui.slot_tools.get(si).copied().filter(|x| tools.contains(x)).unwrap_or(tools[0]),
-            };
-            app.ui.tool = next;
-            if si < app.ui.slot_tools.len() && si != 11 {
-                app.ui.slot_tools[si] = next;
-            }
-            return Ok(json!({"tool": next}));
-        }
-        let tool = Tool::from_name(t).ok_or_else(|| format!("unknown tool `{t}`"))?;
-        app.ui.tool = tool;
-        return Ok(json!({"tool": tool}));
-    }
-    if let Some(dir) = id.strip_prefix("viewer.nudge.") {
-        return nudge(app, ctx, dir);
-    }
-    if let Some(k) = id.strip_prefix("timeline.reveal.") {
-        if k == "animated" {
-            return run_engine(app, ctx, "anim.reveal", json!({"kind": "keyframes"}));
-        }
-        reveal(app, k, now, false);
-        return Ok(Value::Null);
-    }
-    if let Some(k) = id.strip_prefix("timeline.keyAt.") {
-        let r = run_engine(app, ctx, "keys.toggleTransform", json!({"prop": k}))?;
-        reveal_keyed(app, &r, k);
-        return Ok(r);
-    }
-    if let Some(k) = id.strip_prefix("timeline.revealAdd.") {
-        reveal(app, k, now, true);
-        return Ok(json!({"revealed": app.ui.timeline.reveal}));
-    }
-    // U reveals keyframed properties; UU (pressed twice quickly) all modified properties; U
-    // again later hides them.
-    if id == "anim.reveal" && params.get("kind").and_then(Value::as_str) == Some("keyframes") {
-        let last = app.last_reveal.take();
-        app.last_reveal = Some(("keyframes".into(), now));
-        match last {
-            Some((k, t)) if k == "keyframes" && now - t < 0.6 => {
-                return run_engine(app, ctx, "anim.reveal", json!({"kind": "modified"}));
-            }
-            Some((k, _)) if k == "keyframes" && app.ui.timeline.reveal == ["props"] => {
-                let targets = reveal_targets(app);
-                app.ui.timeline.apply_reveal(&targets, vec![]);
-                return Ok(json!({"revealed": 0}));
-            }
-            _ => {}
-        }
-    }
-    if id == "window.dockAction" {
-        let value = params.get("action").cloned().ok_or("missing docking action")?;
-        let action: craft_ui::docking::Action<PanelKind> = serde_json::from_value(value).map_err(|error| format!("invalid docking action: {error}"))?;
-        if matches!(&action, craft_ui::docking::Action::Open { .. } | craft_ui::docking::Action::OpenAt { .. }) {
-            return Err("use the panel open commands to preserve viewer and ScriptUI lifecycle callbacks".into());
-        }
-        if let craft_ui::docking::Action::Close { panel } = &action {
-            let mut layout = crate::dock_shared::encode(&app.ui.dock, &app.ui.floating)?;
-            layout.apply(action.clone()).map_err(|error| error.to_string())?;
-            app.close_panel(*panel);
-            return Ok(Value::Null);
-        }
-        let mut error = None;
-        if !app.edit_layout(|layout| match layout.apply(action) {
-            Ok(()) => true,
-            Err(reason) => {
-                error = Some(reason);
-                false
-            }
-        }) {
-            return Err(error.unwrap_or_else(|| "invalid docking layout".into()));
-        }
-        return Ok(Value::Null);
-    }
-    // Multiple monitors: {panel, window?: bool} moves a panel into its own native window (or
-    // back into the main window; no `window` toggles).
-    if id == "window.panelWindow" {
-        // A panel name ("Info", "Effect Controls") or its serialized form ({"Viewer": 2}).
-        let value = params.get("panel").ok_or("panelWindow: need `panel`")?;
-        let panel = match value.as_str() {
-            Some(name) => PanelKind::from_name(name).ok_or(format!("unknown panel `{name}`"))?,
-            None => serde_json::from_value::<PanelKind>(value.clone()).map_err(|_| "panelWindow: unknown `panel`".to_string())?,
-        };
-        let window = match params.get("window") {
-            None | Some(Value::Null) => None,
-            Some(value) => Some(value.as_bool().ok_or("panelWindow: `window` must be true or false")?),
-        };
-        let window = app.set_panel_window(ctx, panel, window)?;
-        return Ok(json!({"window": window}));
-    }
-    // A UI-only command (not in the engine's menus), so `frontend` gets it from here.
-    if id == "window.maximizeApp" {
-        return frontend(app, ctx, id, params);
-    }
-    // Docking: {panel, anchor, zone: center|left|right|top|bottom}, {panel, rect?}, {panel?}.
-    if let Some(op) = id.strip_prefix("window.").filter(|o| matches!(*o, "maximizePanel" | "dockPanel" | "floatPanel" | "closePanel")) {
-        let panel_of = |k: &str| params.get(k).and_then(Value::as_str).map(|s| PanelKind::from_name(s).ok_or(format!("unknown panel `{s}`")));
-        match op {
-            "maximizePanel" => {
-                let p = match panel_of("panel") {
-                    Some(p) => p?,
-                    None => app.panel_at(ctx.pointer_hover_pos()),
-                };
-                app.toggle_maximize(p);
-                return Ok(json!({"maximized": app.ui.maximized}));
-            }
-            "closePanel" => {
-                let p = panel_of("panel").ok_or("closePanel: need `panel`")??;
-                app.close_panel(p);
-                return Ok(Value::Null);
-            }
-            "floatPanel" => {
-                let p = panel_of("panel").ok_or("floatPanel: need `panel`")??;
-                let r = match params.get("rect") {
-                    Some(value) => serde_json::from_value::<[f32; 4]>(value.clone()).map_err(|_| "rect must contain four finite numbers")?,
-                    None => crate::dock_ui::default_float_rect(ctx.content_rect()),
-                };
-                if !app.edit_layout(|l| l.float(p, r)) {
-                    return Err(format!("can't undock {}", p.title()));
-                }
-                return Ok(Value::Null);
-            }
-            _ => {
-                let p = panel_of("panel").ok_or("dockPanel: need `panel`")??;
-                let anchor = panel_of("anchor").ok_or("dockPanel: need `anchor` (a docked panel)")??;
-                let zone = params
-                    .get("zone")
-                    .and_then(Value::as_str)
-                    .map_or(Some(crate::dock::Zone::Center), crate::dock::Zone::from_name)
-                    .ok_or("zone: center|left|right|top|bottom")?;
-                if !app.edit_layout(|l| l.dock(p, anchor, zone)) {
-                    return Err(format!("can't dock {} at {} ({zone:?})", p.title(), anchor.title()));
-                }
-                app.show_panel(p);
-                return Ok(Value::Null);
-            }
-        }
-    }
-    if id == "markers.dialog" {
-        // The Composition/Layer Marker dialog (double-click a marker): {layer?, index}.
-        let index = params.get("index").and_then(Value::as_u64).ok_or("markers.dialog: need `index`")? as usize;
-        let layer = params.get("layer").and_then(Value::as_u64);
-        crate::panels::markers_ui::open_dialog(app, crate::panels::markers_ui::MarkerRef { layer, index })?;
-        return Ok(json!({"dialog": id}));
-    }
-
-    if id == "view.theme.toggle" {
-        app.cycle_appearance(ctx);
-        return Ok(json!({"appearanceMode": app.session.prefs.appearance.appearance_mode}));
-    }
-    if let Some(th) = id.strip_prefix("view.theme.") {
-        let k = crate::theme::ThemeKind::from_name(th).ok_or("unknown theme")?;
-        app.set_theme(ctx, k);
-        return Ok(Value::Null);
-    }
-    let timing = |app: &mut EffectcraftApp, op: &str| app.session.execute("layer.timing", json!({"op": op})).map_err(|e| e.to_string());
-    match id {
-        "playback.ramPreview" => {
-            app.toggle_play_with(now, effectcraft_engine::preview::PreviewShortcut::Numpad0);
-            return Ok(json!({"playing": app.playback.playing}));
-        }
-        "playback.preview.shiftSpacebar" | "playback.preview.shiftNumpad0" | "playback.preview.altNumpad0" => {
-            let sc = effectcraft_engine::preview::PreviewShortcut::parse(id.trim_start_matches("playback.preview.")).ok_or("unknown preview shortcut")?;
-            app.toggle_play_with(now, sc);
-            return Ok(json!({"playing": app.playback.playing}));
-        }
-        "playback.stop" => {
-            app.stop();
-            return Ok(Value::Null);
-        }
-        // The focused Layer panel has its own magnification; otherwise the Composition viewer.
-        "view.fit" if app.ui.focused == PanelKind::Layer => {
-            app.ui.layer_zoom = None;
-            app.ui.layer_pan = [0.0, 0.0];
-            return Ok(Value::Null);
-        }
-        "view.fit" => {
-            app.ui.viewer.zoom = None;
-            app.ui.viewer.fit_up_to_100 = false;
-            app.ui.viewer.pan = [0.0, 0.0];
-            return Ok(Value::Null);
-        }
-        "timeline.scrollToTime" => app.ui.timeline.scroll_to = Some(crate::state::ScrollTo::Time),
-        "timeline.scrollToLayer" => app.ui.timeline.scroll_to = Some(crate::state::ScrollTo::Layer),
-        "timeline.parentColumn" => {
-            let on = !crate::panels::timeline::column_visible(&app.ui.timeline, "parent");
-            crate::panels::timeline::set_column(&mut app.ui.timeline, "parent", on)?;
-            return Ok(json!({"parent": on}));
-        }
-        "view.fitUpTo100" => {
-            app.ui.viewer.zoom = None;
-            app.ui.viewer.fit_up_to_100 = true;
-            app.ui.viewer.pan = [0.0, 0.0];
-            return Ok(Value::Null);
-        }
-        // Shift+, / Shift+.: the previous / next open composition (the viewer's tabs).
-        "view.nextItem" | "view.previousItem" => {
-            let open = app.session.state.open_comps.clone();
-            let Some(i) = app.session.state.active_comp.and_then(|c| open.iter().position(|o| *o == c)) else { return Ok(Value::Null) };
-            let step = if id == "view.nextItem" { 1 } else { open.len().saturating_sub(1) };
-            let Some(next) = open.get((i + step) % open.len().max(1)).copied().filter(|n| Some(*n) != app.session.state.active_comp) else {
-                return Ok(Value::Null);
-            };
-            return run_engine(app, ctx, "comp.open", json!({"comp": next.0}));
-        }
-        // \\: between the Composition viewer and the Timeline.
-        "window.toggleCompTimeline" => {
-            let to = if app.ui.focused == PanelKind::Timeline { crate::panels::viewers::active_panel(app) } else { PanelKind::Timeline };
-            app.show_panel(to);
-            return Ok(json!({"focused": to.id()}));
-        }
-        // Alt+Shift+, / Alt+Shift+.: the previous / next tab of the focused panel's group.
-        "window.nextPanel" | "window.previousPanel" => {
-            let focused = app.ui.focused;
-            let group: Vec<PanelKind> = match app.ui.floating.iter().find(|f| f.panels.contains(&focused)) {
-                Some(f) => f.panels.clone(),
-                None => app.ui.dock.group_of(focused).map(<[PanelKind]>::to_vec).unwrap_or_default(),
-            };
-            let Some(i) = group.iter().position(|p| *p == focused) else { return Ok(Value::Null) };
-            let step = if id == "window.nextPanel" { 1 } else { group.len().saturating_sub(1) };
-            if let Some(next) = group.get((i + step) % group.len().max(1)).copied() {
-                app.show_panel(next);
-            }
-            return Ok(json!({"focused": app.ui.focused.id()}));
-        }
-        // Ctrl+Shift+W: with a viewer or the Timeline active, every open composition closes;
-        // any other panel closes itself.
-        "window.closeAll" => {
-            let focused = app.ui.focused;
-            if matches!(focused, PanelKind::Composition | PanelKind::Timeline | PanelKind::Viewer(_)) {
-                for c in app.session.state.open_comps.clone() {
-                    run_engine(app, ctx, "comp.close", json!({"comp": c.0}))?;
-                }
-            } else {
-                app.close_panel(focused);
-            }
-            return Ok(Value::Null);
-        }
-        "view.actualSize" if app.ui.focused == PanelKind::Layer => {
-            app.ui.layer_zoom = Some(1.0 / ctx.pixels_per_point());
-            app.ui.layer_pan = [0.0, 0.0];
-            return Ok(Value::Null);
-        }
-        "view.actualSize" => {
-            app.ui.viewer.zoom = Some(1.0 / ctx.pixels_per_point());
-            app.ui.viewer.pan = [0.0, 0.0];
-            return Ok(Value::Null);
-        }
-        "view.safeMargins" => app.ui.viewer.safe_margins = !app.ui.viewer.safe_margins,
-        "view.transparencyGrid" => app.ui.viewer.transparency_grid = !app.ui.viewer.transparency_grid,
-        "view.fastPreviews" => {
-            // With a mode: Fast Previews ▸ Off / Adaptive Resolution / Draft / Fast Draft /
-            // Wireframe; without: toggle Draft quality (Settings ▸ Previews).
-            if params.get("mode").is_some() {
-                return run_engine(app, ctx, "view.fastPreviewMode", params);
-            }
-            let on = !app.ui.viewer.fast_preview;
-            app.set_pref("previews.fastPreviews", json!(on))?;
-            app.ui.viewer.fast_preview = on;
-        }
-        "timeline.zoomIn" | "timeline.zoomOut" => {
-            let k = if id == "timeline.zoomIn" { crate::panels::timeline::ZOOM_STEP } else { 1.0 / crate::panels::timeline::ZOOM_STEP };
-            crate::panels::timeline::zoom(app, ctx, k);
-            return Ok(Value::Null);
-        }
-        "timeline.zoomFit" => crate::panels::timeline::toggle_fit_zoom(app, ctx),
-        "timeline.zoomFrameToggle" => crate::panels::timeline::toggle_frame_zoom(app, ctx),
-        "timeline.column" => {
-            let col = params.get("column").and_then(Value::as_str).ok_or("timeline.column: need `column`")?;
-            let on = params.get("visible").and_then(Value::as_bool).unwrap_or(!crate::panels::timeline::column_visible(&app.ui.timeline, col));
-            crate::panels::timeline::set_column(&mut app.ui.timeline, col, on)?;
-            let shown: Vec<&str> =
-                crate::panels::timeline::COLUMNS.iter().map(|c| c.0).filter(|c| crate::panels::timeline::column_visible(&app.ui.timeline, c)).collect();
-            return Ok(json!({"columns": shown}));
-        }
-        "timeline.sourceName" => {
-            let tl = &mut app.ui.timeline;
-            tl.source_name = params.get("value").and_then(Value::as_bool).unwrap_or(!tl.source_name);
-            return Ok(json!({"sourceName": tl.source_name}));
-        }
-        "flowchart.options" | "flowchart.graph" => return crate::panels::flowchart::command(app, id, &params),
-        "timeline.search" => {
-            app.ui.timeline.search = params.get("query").and_then(Value::as_str).unwrap_or_default().to_string();
-            app.show_panel(PanelKind::Timeline);
-        }
-        "timeline.graphEditor" => app.ui.timeline.graph_editor = !app.ui.timeline.graph_editor,
-        "timeline.switchesModes" => app.ui.timeline.show_modes = !app.ui.timeline.show_modes,
-        "timeline.collapseAll" => {
-            app.ui.timeline.open_layers.clear();
-            app.ui.timeline.open_groups.clear();
-            app.ui.timeline.reveal.clear();
-            app.ui.timeline.layer_reveal.clear();
-        }
-        // Ctrl+`: twirl the selected layers open (all closed ones) or closed (all open). From a
-        // reveal shortcut's view it opens their full property trees.
-        "timeline.twirlSelected" => {
-            let sel: Vec<u64> = app.session.state.selected_layers.iter().map(|l| l.0).collect();
-            let tl = &mut app.ui.timeline;
-            let revealing = sel.iter().any(|l| tl.layer_reveal.contains_key(l));
-            tl.reveal.clear();
-            for l in &sel {
-                tl.layer_reveal.remove(l);
-            }
-            if !revealing && sel.iter().all(|l| tl.open_layers.contains(l)) {
-                for l in &sel {
-                    tl.open_layers.remove(l);
-                }
-            } else {
-                tl.open_layers.extend(sel);
-            }
-        }
-        "timeline.workAreaBegin" => return app.session.execute("comp.workArea", json!({"set": "begin"})).map_err(|e| e.to_string()),
-        "timeline.workAreaEnd" => return app.session.execute("comp.workArea", json!({"set": "end"})).map_err(|e| e.to_string()),
-        "timeline.moveInToTime" => return timing(app, "moveInToTime"),
-        "timeline.moveOutToTime" => return timing(app, "moveOutToTime"),
-        "timeline.trimInToTime" => return timing(app, "trimInToTime"),
-        "timeline.trimOutToTime" => return timing(app, "trimOutToTime"),
-        "app.home" => app.ui.start_screen = !app.ui.start_screen,
-        "app.newComp" | "comp.new" if no_params(&params) => crate::panels::dialogs::open_new_comp(app),
-        "app.compSettings" | "comp.settings" if no_params(&params) => crate::panels::dialogs::open_comp_settings(app)?,
-        "app.compSettings" | "comp.settings" if only_comp(&params).is_some() => {
-            crate::panels::dialogs::open_comp_settings_for(app, only_comp(&params).ok_or("missing `comp`")?)?
-        }
-        "app.solidSettings" | "layer.newSolid" if no_params(&params) => crate::panels::dialogs::open_new_solid(app)?,
-        "keys.velocity" if no_params(&params) => crate::panels::key_dialogs::open_velocity(app)?,
-        "keys.interpolation" if no_params(&params) => crate::panels::key_dialogs::open_interpolation(app)?,
-        "layer.timeStretch" if no_params(&params) => crate::panels::key_dialogs::open_time_stretch(app)?,
-        _ => {
-            if id == "renderQueue.render" && params.get("wait").is_none() {
-                // The UI renders in the background; the panel shows progress.
-                let mut p = params.clone();
-                if let Some(m) = p.as_object_mut() {
-                    m.insert("wait".into(), json!(false));
-                } else {
-                    p = json!({"wait": false});
-                }
-                app.show_panel(PanelKind::RenderQueue);
-                return app.session.execute(id, p).map_err(|e| e.to_string());
-            }
-            if id == "renderQueue.add" {
-                let r = app.session.execute(id, params).map_err(|e| e.to_string());
-                match &r {
-                    Ok(_) => app.show_panel(PanelKind::RenderQueue),
-                    Err(e) => app.ui.status = e.clone(),
-                }
-                return r;
-            }
-            if let Some(r) = file_dialog(app, id, &params) {
-                return r;
-            }
-            if id == "layer.precompose" && params.get("name").is_none() {
-                crate::panels::precomp::open(app, &params)?;
-                return Ok(json!({"dialog": id}));
-            }
-            if crate::panels::dialogs::open_form(app, id, &params) {
-                return Ok(json!({"dialog": id}));
-            }
-            if id == "renderQueue.render" && params.get("wait").is_none() {
-                // The UI renders in the background; the panel shows progress.
-                let mut p = params.clone();
-                if let Some(m) = p.as_object_mut() {
-                    m.insert("wait".into(), json!(false));
-                } else {
-                    p = json!({"wait": false});
-                }
-                app.show_panel(PanelKind::RenderQueue);
-                return app.session.execute(id, p).map_err(|e| e.to_string());
-            }
-            if id == "renderQueue.add" {
-                let r = app.session.execute(id, params).map_err(|e| e.to_string());
-                match &r {
-                    Ok(_) => app.show_panel(PanelKind::RenderQueue),
-                    Err(e) => app.ui.status = e.clone(),
-                }
-                return r;
-            }
-            // An effect added to a layer (Effect menu, Last Effect, dropped on a layer) brings
-            // up Effect Controls on that layer, as in After Effects.
-            if matches!(id, "effect.apply" | "effect.applyLast") {
-                let r = run_engine(app, ctx, id, params.clone());
-                if let Ok(applied) = &r {
-                    crate::panels::effect_controls::reveal_applied(app, &params);
-                    crate::panels::effect_controls::choose_files_after_apply(app, applied);
-                }
-                return r;
-            }
-            // Enabling time remapping twirls its layers open on Time Remap and its two keys.
-            if id == "layer.enableTimeRemap" {
-                let r = run_engine(app, ctx, id, params.clone());
-                if r.as_ref().is_ok_and(|on| on.as_bool() == Some(true)) {
-                    reveal_time_remap(app, &params);
-                }
-                return r;
-            }
-            if id == "layer.rename" && params.get("name").is_none() {
-                crate::panels::timeline::begin_rename(app, ctx);
-                return Ok(Value::Null);
-            }
-            return run_engine(app, ctx, id, params);
-        }
-    }
-    Ok(Value::Null)
-}
-
-/// Run an engine command and perform the frontend events it emitted right away.
-/// Commands that fill the internal clipboard.
-const COPY_COMMANDS: &[&str] =
-    &["edit.copy", "edit.cut", "edit.copyWithPropertyLinks", "edit.copyWithRelativePropertyLinks", "edit.copyExpressionOnly", "keys.copy", "effect.copy"];
-
-/// A line for the system clipboard naming what EffectCraft copied. The system clipboard must
-/// hold something: with nothing on it, the windowing layer sends no paste event for Ctrl+V.
-fn clipboard_note(s: &effectcraft_engine::Session) -> String {
-    let st = &s.state;
-    let n = |n: usize, one: &str, many: &str| format!("EffectCraft: {n} {}", if n == 1 { one } else { many });
-    if st.clip_is_keys && !st.key_clipboard.is_empty() {
-        n(st.key_clipboard.iter().map(|c| c.keys.len()).sum(), "keyframe", "keyframes")
-    } else if !st.effect_clipboard.is_empty() {
-        n(st.effect_clipboard.len(), "effect", "effects")
-    } else if !st.contents_clipboard.is_empty() {
-        n(st.contents_clipboard.len(), "shape item", "shape items")
-    } else if st.link_clipboard.is_some() {
-        "EffectCraft: property links".into()
-    } else {
-        n(st.clipboard.len(), "layer", "layers")
-    }
-}
-
-pub(crate) fn run_engine(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: Value) -> Result<Value, String> {
-    // Events already queued belong to earlier invocations (`engine.execute` defers them).
-    let queued = app.session.events.len();
-    let mut r = app.session.execute(id, params).map_err(|e| e.to_string());
-    if let Err(e) = &r {
-        app.ui.status = e.clone();
-    } else if COPY_COMMANDS.contains(&id) && app.session.state.text_edit.is_none() {
-        ctx.copy_text(clipboard_note(&app.session));
-    }
-    let events = app.session.drain_events();
-    for (index, ev) in events.into_iter().enumerate() {
-        match ev {
-            effectcraft_engine::Event::Frontend { command, params } => {
-                if let Err(e) = frontend(app, ctx, &command, params) {
-                    app.ui.status = e.clone();
-                    // A frontend-only command's own failure is the command's result (#696: a
-                    // workspace save that didn't reach disk reported success). An earlier
-                    // invocation's failure only sets the status.
-                    if index >= queued && command == id && r.is_ok() {
-                        r = Err(e);
-                    }
-                }
-            }
-            other => app.session.events.push(other),
-        }
-    }
-    r
-}
-
-fn toggle(slot: &mut bool, p: &Value) -> Value {
-    *slot = p.get("value").and_then(Value::as_bool).unwrap_or(!*slot);
-    json!(*slot)
-}
-
-/// Perform a frontend command (from `Event::Frontend`).
-pub fn frontend(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, p: Value) -> Result<Value, String> {
-    let now = ctx.input(|i| i.time);
-    let v = &mut app.ui.viewer;
-    Ok(match id {
-        "mediaBrowser.copySourcePath" => {
-            let path = p.get("path").and_then(Value::as_str).filter(|path| !path.is_empty()).ok_or("A source path is required")?;
-            ctx.copy_text(path.to_string());
-            json!({"path": path})
-        }
-        "effects.copyPresetsFolderPath" => {
-            if cfg!(target_arch = "wasm32") {
-                return Err("The web app has no local presets folder".into());
-            }
-            let path = crate::panels::effects_presets::presets_dir().filter(|path| !path.as_os_str().is_empty()).ok_or("No presets folder is configured")?;
-            let path = std::path::absolute(path).map_err(|e| format!("Cannot resolve the presets folder path: {e}"))?;
-            let path = path.to_str().ok_or("The presets folder path is not valid UTF-8")?;
-            ctx.copy_text(path.to_string());
-            json!({"path": path})
-        }
-        "app.about" => {
-            app.dialog = Some(crate::Dialog::About);
-            Value::Null
-        }
-        // Window ▸ <ScriptUI panel>: dock (or bring forward) the panel the script built.
-        // Audio scrubbing: one frame of audio at `time` (default the current time).
-        "playback.scrubAudio" => {
-            let cid = app.session.active_comp_id().ok_or("no composition")?;
-            let t = p.get("time").and_then(Value::as_f64).map_or(app.session.time(), effectcraft_engine::time::Tick::from_seconds_f64);
-            app.scrub_audio(cid, t, now);
-            json!({"playing": app.scrub.is_some()})
-        }
-        // View ▸ New Viewer.
-        "view.newViewer" => json!({"viewer": crate::panels::viewers::new_viewer(app)}),
-        // Run by id (control channel, MCP): the Project panel's selection, whatever has focus.
-        "project.deleteWithoutConfirmation" => crate::panels::delete_items::delete_confirmed(app, ctx, json!({}))?,
-        // A gradient property's "Edit Gradient…" (the Timeline's value): the Gradient Editor.
-        "prop.editGradient" => crate::panels::gradient_editor::open(app, &p)?,
-        "window.scriptPanel" => {
-            let id = p.get("window").and_then(Value::as_u64).ok_or("no ScriptUI panel window")? as u32;
-            app.show_panel(PanelKind::ScriptPanel(id));
-            json!({"window": id})
-        }
-        "layer.style.options" => {
-            crate::panels::layer_styles_dialog::open(app, &p)?;
-            Value::Null
-        }
-        "app.settings" => {
-            let page = p.get("page").and_then(Value::as_str).unwrap_or("general");
-            crate::panels::settings::open(app, effectcraft_engine::prefs::page_id(page).unwrap_or("general"));
-            Value::Null
-        }
-        "app.gpuInfo" => {
-            crate::panels::dialogs::info(
-                app,
-                "GPU Information",
-                &format!(
-                    "{}Layer cache: {} MB  •  Preview cache: {} MB.",
-                    effectcraft_engine::sysinfo::gpu_summary(&app.session),
-                    app.session.layer_cache.budget() >> 20,
-                    app.frames.budget() >> 20
-                ),
-            );
-            Value::Null
-        }
-        "app.hide" | "app.hideOthers" | "app.showAll" => {
-            // The desktop app asks macOS (NSApplication hide / hideOtherApplications /
-            // unhideAllApplications); elsewhere Hide minimizes and the others don't apply.
-            if app.hooks.app_action.as_ref().is_some_and(|f| f(id)) {
-                return Ok(Value::Null);
-            }
-            match id {
-                "app.hide" => ctx.send_viewport_cmd(egui::ViewportCommand::Minimized(true)),
-                _ => return Err(format!("`{id}` is only available on macOS")),
-            }
-            Value::Null
-        }
-        "app.quit" => {
-            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
-            Value::Null
-        }
-        "app.commandPalette" => {
-            app.dialog_state.palette_query = p.get("query").and_then(Value::as_str).unwrap_or_default().to_string();
-            app.dialog_state.palette_sel = 0;
-            app.dialog = Some(crate::Dialog::CommandPalette);
-            Value::Null
-        }
-        "app.keyboardShortcuts" => {
-            crate::panels::shortcut_editor::open(app);
-            Value::Null
-        }
-        "app.templates" => {
-            let kind = p.get("kind").and_then(Value::as_str).unwrap_or("renderSettings");
-            crate::panels::rq_templates::open(app, ctx, kind);
-            Value::Null
-        }
-        "renderQueue.notify" => {
-            // Render finished with Notify on: a toast, the dock/taskbar attention request, and the
-            // host's system sound (the desktop app handles `renderQueue.notify`).
-            let msg = p.get("message").and_then(Value::as_str).unwrap_or("Render finished").to_string();
-            app.toast = Some((msg, now));
-            ctx.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(egui::UserAttentionType::Informational));
-            if let Some(f) = app.hooks.app_action.as_ref() {
-                f("renderQueue.notify");
-            }
-            Value::Null
-        }
-        "app.find" => {
-            if let Some(q) = p.get("query").and_then(Value::as_str) {
-                app.ui.project_search = q.to_string();
-            }
-            app.show_panel(PanelKind::Project);
-            Value::Null
-        }
-        "playback.toggle" => {
-            // The play button and Spacebar: `{shortcut?}` picks which Preview panel shortcut's
-            // options to play with (default Spacebar).
-            let sc = match p.get("shortcut").and_then(Value::as_str) {
-                Some(k) => effectcraft_engine::preview::PreviewShortcut::parse(k).ok_or_else(|| format!("unknown preview shortcut `{k}`"))?,
-                None => effectcraft_engine::preview::PreviewShortcut::Spacebar,
-            };
-            app.toggle_play_with(now, sc);
-            json!({"playing": app.playback.playing, "shortcut": sc.id()})
-        }
-        "playback.cacheWhenIdle" => {
-            let r = toggle(&mut app.ui.cache_when_idle, &p);
-            app.set_pref("previews.cacheFramesWhenIdle", r.clone())?;
-            r
-        }
-        "playback.audio" => {
-            // Include Audio of the shortcut shown in the Preview panel.
-            let mut on = app.session.prefs.preview.active().include_audio;
-            let r = toggle(&mut on, &p);
-            app.session.execute("playback.settings.set", json!({"includeAudio": on})).map_err(|e| e.to_string())?;
-            if !on {
-                app.audio = None;
-            }
-            r
-        }
-        // Zoom In / Zoom Out act on the focused viewer: the Layer panel when it has focus, else
-        // the Composition viewer.
-        "view.zoomIn" | "view.zoomOut" if app.ui.focused == PanelKind::Layer => {
-            let cur = app.ui.layer_zoom.unwrap_or_else(|| crate::panels::layer_panel::last_fit(ctx));
-            // The Layer panel zooms in points (pixels-per-point 1).
-            let next = zoom_step(cur, 1.0, id == "view.zoomIn");
-            app.ui.layer_zoom = Some(next);
-            json!({"zoom": next, "panel": "layer"})
-        }
-        "view.zoomIn" | "view.zoomOut" => {
-            let ppp = ctx.pixels_per_point();
-            let cur = v.zoom.unwrap_or_else(|| crate::panels::viewer::last_fit(ctx));
-            let next = zoom_step(cur, ppp, id == "view.zoomIn");
-            v.zoom = Some(next);
-            json!({"zoom": next})
-        }
-        // View ▸ Resolution ▸ Custom without a factor (the engine sets the comp's resolution).
-        "view.res.custom" => {
-            let cur = match app.viewer_res() {
-                Resolution::Custom(n) => f64::from(n),
-                _ => 2.0,
-            };
-            crate::panels::dialogs::form(
-                app,
-                "Custom Resolution",
-                "view.res.custom",
-                json!({}),
-                vec![crate::panels::dialogs::Field::num("factor", "Render every n-th pixel", cur)],
-            );
-            Value::Null
-        }
-        "view.rulers" => toggle(&mut v.rulers, &p),
-        "view.guides" => toggle(&mut v.guides, &p),
-        "view.snapToGuides" => toggle(&mut v.snap_guides, &p),
-        "view.lockGuides" => toggle(&mut v.lock_guides, &p),
-        "view.grid" => toggle(&mut v.grid, &p),
-        "view.snapToGrid" => toggle(&mut v.snap_grid, &p),
-        "view.layerControls" => toggle(&mut v.show_layer_controls, &p),
-        "view.options" => {
-            app.dialog = Some(crate::Dialog::ViewOptions);
-            Value::Null
-        }
-        "view.panelBackground" => {
-            if p.get("pick").and_then(Value::as_bool) == Some(true) {
-                let [r, g, b] = v.custom_pasteboard;
-                crate::panels::dialogs::form(
-                    app,
-                    "Panel Background Color",
-                    "view.panelBackground",
-                    json!({}),
-                    vec![crate::panels::dialogs::Field::text("color", "Color (#rrggbb)", &format!("#{r:02x}{g:02x}{b:02x}"))],
-                );
-                return Ok(Value::Null);
-            }
-            let c = p.get("color").and_then(Value::as_str).unwrap_or("mediumGray");
-            v.pasteboard = match c {
-                "black" => Some([0, 0, 0]),
-                "darkGray" => Some([0x2a, 0x2a, 0x2a]),
-                "mediumGray" => None,
-                "lightGray" => Some([0xb4, 0xb4, 0xb4]),
-                "white" => Some([0xff, 0xff, 0xff]),
-                "custom" => Some(v.custom_pasteboard),
-                hex => {
-                    let c = effectcraft_engine::color::Rgba::from_hex(hex).ok_or_else(|| format!("unknown colour `{hex}`"))?;
-                    let rgb = [(c.r * 255.0).round() as u8, (c.g * 255.0).round() as u8, (c.b * 255.0).round() as u8];
-                    v.custom_pasteboard = rgb;
-                    Some(rgb)
-                }
-            };
-            Value::Null
-        }
-        // Ctrl+\ / Cmd+\, as in After Effects (#336): `{maximized}`, the window's new state.
-        "window.maximizeApp" => {
-            let maximized = !ctx.input(|i| i.viewport().maximized.unwrap_or(false));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Maximized(maximized));
-            json!({"maximized": maximized})
-        }
-        "view.fullScreen" => {
-            let full = ctx.input(|i| i.viewport().fullscreen.unwrap_or(false));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!full));
-            json!(!full)
-        }
-        "window.panel" => {
-            let name = p.get("panel").and_then(Value::as_str).unwrap_or_default();
-            if name.eq_ignore_ascii_case("tools") {
-                app.ui.status = "The Tools panel is the toolbar in the header".into();
-                return Ok(Value::Null);
-            }
-            let panel = PanelKind::from_name(name).ok_or_else(|| format!("unknown panel `{name}`"))?;
-            app.show_panel(panel);
-            Value::Null
-        }
-        "window.workspace" => {
-            let want = p.get("name").and_then(Value::as_str).unwrap_or("Default").to_ascii_lowercase().replace(' ', "");
-            let name = app
-                .workspace_names()
-                .into_iter()
-                .find(|w| w.to_ascii_lowercase().replace(' ', "") == want)
-                .ok_or_else(|| format!("unknown workspace `{want}`"))?;
-            app.set_workspace(&name);
-            json!({"workspace": name})
-        }
-        "window.resetWorkspace" => {
-            let name = app.ui.workspace.clone();
-            app.set_workspace(&name);
-            Value::Null
-        }
-        "window.saveWorkspace" => {
-            let name = app.ui.workspace.clone();
-            app.ui.saved_workspaces.insert(name.clone(), app.ui.dock.clone());
-            app.ui.saved_floating.insert(name.clone(), app.ui.floating.clone());
-            app.store_saved_workspaces()?;
-            json!({"workspace": name})
-        }
-        "window.saveWorkspaceAs" => {
-            let Some(name) = p.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()).map(str::to_string) else {
-                crate::panels::dialogs::form(
-                    app,
-                    "New Workspace",
-                    "window.saveWorkspaceAs",
-                    json!({}),
-                    vec![crate::panels::dialogs::Field::text("name", "Name", "Untitled Workspace")],
-                );
-                return Ok(Value::Null);
-            };
-            app.ui.saved_workspaces.insert(name.clone(), app.ui.dock.clone());
-            app.ui.saved_floating.insert(name.clone(), app.ui.floating.clone());
-            app.ui.workspace = name.clone();
-            app.store_saved_workspaces()?;
-            json!({"workspace": name})
-        }
-        "window.editWorkspaces" => {
-            let Some(name) = p.get("name").and_then(Value::as_str).map(str::to_string) else {
-                let cur = app.ui.workspace.clone();
-                crate::panels::dialogs::form(
-                    app,
-                    "Edit Workspaces",
-                    "window.editWorkspaces",
-                    json!({}),
-                    vec![
-                        crate::panels::dialogs::Field::text("name", "Workspace", &cur),
-                        crate::panels::dialogs::Field::text("rename", "Rename to", &cur),
-                        crate::panels::dialogs::Field::bool("delete", "Delete", false),
-                    ],
-                );
-                return Ok(Value::Null);
-            };
-            let builtin = crate::dock::WORKSPACES.contains(&name.as_str());
-            if p.get("delete").and_then(Value::as_bool) == Some(true) {
-                app.ui.saved_floating.remove(&name);
-                if app.ui.saved_workspaces.remove(&name).is_none() && !builtin {
-                    return Err(format!("no workspace `{name}`"));
-                }
-                // Leave the deleted workspace first: a current workspace needs a definition.
-                if app.ui.workspace == name {
-                    app.set_workspace("Default");
-                }
-                app.store_saved_workspaces()?;
-                return Ok(json!({"deleted": name}));
-            }
-            if let Some(new) = p.get("rename").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty() && *n != name) {
-                if builtin {
-                    return Err(format!("`{name}` is a built-in workspace: save it as a new workspace instead"));
-                }
-                let dock = app.ui.saved_workspaces.remove(&name).ok_or_else(|| format!("no workspace `{name}`"))?;
-                app.ui.saved_workspaces.insert(new.to_string(), dock);
-                if let Some(f) = app.ui.saved_floating.remove(&name) {
-                    app.ui.saved_floating.insert(new.to_string(), f);
-                }
-                if app.ui.workspace == name {
-                    app.ui.workspace = new.to_string();
-                }
-                app.store_saved_workspaces()?;
-                return Ok(json!({"renamed": new}));
-            }
-            json!({"workspaces": app.workspace_names()})
-        }
-        "view.lookAt" => {
-            let r: Vec<f64> = p.get("rect").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_f64).collect()).unwrap_or_default();
-            if r.len() == 4 {
-                let map: Option<crate::panels::viewer::ViewerMap> = ctx.data(|d| d.get_temp(egui::Id::new("viewer-map")));
-                if let Some(m) = map {
-                    let (rw, rh) = (((r[2] - r[0]) as f32).max(1.0), ((r[3] - r[1]) as f32).max(1.0));
-                    let zoom = ((m.area.width() - 40.0) / rw).min((m.area.height() - 40.0) / rh).clamp(0.015, 32.0);
-                    let rc = [(r[0] + r[2]) as f32 / 2.0, (r[1] + r[3]) as f32 / 2.0];
-                    let v = &mut app.ui.viewer;
-                    v.zoom = Some(zoom);
-                    v.pan = [m.comp[0] * zoom / 2.0 - rc[0] * zoom, m.comp[1] * zoom / 2.0 - rc[1] * zoom];
-                }
-            }
-            Value::Null
-        }
-        "comp.flowchart" => {
-            // Chart the active comp; Layer ▸ Reveal ▸ Reveal Layer in Project Flowchart shows
-            // layers and selects the layer's node.
-            app.ui.flowchart.root = app.session.active_comp_id().map(|c| c.0);
-            if let (Some(c), Some(l)) = (app.session.active_comp_id(), app.session.state.selected_layers.first()) {
-                app.ui.flowchart.layers = true;
-                app.ui.flowchart.selected = Some(format!("layer:{}:{}", c.0, l.0));
-            }
-            app.show_panel(PanelKind::Flowchart);
-            Value::Null
-        }
-        "comp.miniFlowchart" => {
-            let at = ctx.input(|i| i.pointer.hover_pos()).unwrap_or_else(|| ctx.content_rect().center());
-            app.ui.mini_flowchart = Some([at.x, at.y]);
-            Value::Null
-        }
-        "track.editTargetDialog" => {
-            crate::panels::tracker::open_target(app)?;
-            Value::Null
-        }
-        "track.optionsDialog" => {
-            crate::panels::tracker::open_options(app)?;
-            Value::Null
-        }
-        "layer.openLayer" => {
-            let id = p.get("layer").and_then(Value::as_u64).or_else(|| app.session.state.selected_layers.first().map(|l| l.0));
-            // Another layer opens at Fit.
-            if id != app.ui.layer_panel {
-                app.ui.layer_zoom = None;
-                app.ui.layer_pan = [0.0, 0.0];
-            }
-            app.ui.layer_panel = id;
-            app.ui.layer_view = None;
-            app.show_panel(PanelKind::Layer);
-            Value::Null
-        }
-        "app.confirmExecute" => {
-            // Settings ▸ Scripting ▸ Warn User When Executing Files.
-            let path = p.get("path").and_then(Value::as_str).unwrap_or_default().to_string();
-            crate::panels::forms::form(
-                app,
-                "A script wants to open a file",
-                "file.executeFile",
-                json!({"path": path, "confirmed": true}),
-                vec![crate::panels::forms::Field::text("path", "Open", &path)],
-            );
-            Value::Null
-        }
-        "app.showReport" => {
-            let title = p.get("title").and_then(Value::as_str).unwrap_or("Report").to_string();
-            let text = p.get("text").and_then(Value::as_str).unwrap_or_default().to_string();
-            crate::panels::dialogs::info(app, &title, &text);
-            Value::Null
-        }
-        "window.assignWorkspaceShortcut" => {
-            let mut q = p.clone();
-            q["workspace"] = json!(app.ui.workspace);
-            return run_engine(app, ctx, "window.assignWorkspaceShortcut", q);
-        }
-        "file.interpretFootage" => {
-            // Import ▸ Interpret Unlabeled Alpha As: Ask User.
-            if let Some(i) = p.get("item").and_then(Value::as_u64) {
-                app.session.state.project_selection = vec![effectcraft_engine::project::ItemId(i)];
-            }
-            crate::panels::dialogs::open_form(app, "file.interpretFootage", &json!({}));
-            Value::Null
-        }
-        // Help ▸ In-App Tutorials: the Home screen's Learn tab.
-        "help.inAppTutorials" => {
-            app.ui.start_screen = true;
-            app.ui.home_learn = true;
-            app.ui.home_templates = false;
-            Value::Null
-        }
-        // File ▸ New ▸ New Project from Template…: the Home screen's Templates tab.
-        "file.newFromTemplate" => {
-            app.ui.start_screen = true;
-            app.ui.home_learn = false;
-            app.ui.home_templates = true;
-            Value::Null
-        }
-        "effect.manage" | "anim.browsePresets" => {
-            app.show_panel(PanelKind::EffectsPresets);
-            Value::Null
-        }
-        "timeline.revealProps" => {
-            let props = p.get("props").and_then(Value::as_array).cloned().unwrap_or_default();
-            let uids = |k: &str| -> Vec<u64> { props.iter().filter_map(|x| x.get(k).and_then(Value::as_u64)).collect() };
-            let (found, with_props) = (uids("prop"), uids("layer"));
-            // The layers it looked at (`layers`), else those it found something on. Layers that
-            // have nothing to show close; the others' reveals stay.
-            let targets: Vec<u64> = match p.get("layers").and_then(Value::as_array) {
-                Some(l) => l.iter().filter_map(Value::as_u64).collect(),
-                None => with_props.clone(),
-            };
-            // The targets' earlier picks go (U after UU shows the keyframed ones only).
-            let comp = app.session.active_comp_arc();
-            let theirs = |u: u64| {
-                comp.as_ref().is_some_and(|c| {
-                    targets
-                        .iter()
-                        .filter_map(|l| c.layer(effectcraft_engine::project::LayerId(*l)))
-                        .any(|l| l.props.find(u).is_some() || l.props.find_group(u).is_some())
-                })
-            };
-            let tl = &mut app.ui.timeline;
-            tl.reveal_props.retain(|u| !theirs(*u));
-            tl.reveal_props.extend(found.iter().copied());
-            let (shown, hidden): (Vec<u64>, Vec<u64>) = targets.into_iter().partition(|l| with_props.contains(l));
-            tl.apply_reveal(&hidden, vec![]);
-            if !shown.is_empty() {
-                tl.apply_reveal(&shown, vec!["props".into()]);
-            }
-            // Properties inside effects (puppet pins…) show under their effect, twirled open.
-            for (layer, prop) in props.iter().filter_map(|x| Some((x.get("layer")?.as_u64()?, x.get("prop")?.as_u64()?))) {
-                crate::panels::timeline::open_effect_paths(app, layer, &[prop]);
-            }
-            json!({"revealed": found.len()})
-        }
-        _ => return Err(format!("`{id}` is not a frontend command")),
-    })
-}
-
-/// Commands that need a file or folder path: ask the host's file dialog when `params` lacks one.
-fn file_dialog(app: &mut EffectcraftApp, id: &str, params: &Value) -> Option<Result<Value, String>> {
-    enum Ask {
-        Folder,
-        Import,
-        OpenProject,
-        Save(&'static str),
-        Open(&'static [&'static str]),
-    }
-    let (key, ask) = match id {
-        "file.import" | "file.importMultiple" => ("paths", Ask::Import),
-        "file.open" => ("path", Ask::OpenProject),
-        "file.save" if app.session.path.is_none() => ("path", Ask::Save("Untitled Project.ecproj")),
-        "file.saveAs" | "file.saveCopy" => ("path", Ask::Save("Untitled Project.ecproj")),
-        "comp.saveFrameAs" => ("path", Ask::Save("Frame.png")),
-        "comp.saveFrameAsPsd" => ("path", Ask::Save("Frame.psd")),
-        "comp.saveFrameAsExr" => ("path", Ask::Save("Frame.exr")),
-        "file.watchFolder" if params.get("stop").is_none() => ("folder", Ask::Save("Watch Folder")),
-        "anim.savePreset" => ("path", Ask::Save("Preset.ecpreset")),
-        "anim.applyPreset" => ("path", Ask::Open(&["ecpreset", "json"])),
-        "view.exportGuides" => ("path", Ask::Save("Guides.json")),
-        "view.importGuides" => ("path", Ask::Open(&["json"])),
-        "file.exportLottie" => ("path", Ask::Save("Animation.json")),
-        "file.importLottie" => ("path", Ask::Open(&["json", "lottie"])),
-        "file.importProject" => ("path", Ask::Open(&["ecproj", "ecprojx"])),
-        "file.importTimeline" => ("path", Ask::Open(&["xml", "fcpxml", "otio", "edl", "aaf", "omf"])),
-        "render.saveCurrentPreview" => ("path", Ask::Save("Preview.mp4")),
-        "file.runScript" if params.get("name").is_none() => ("path", Ask::Open(&["jsx", "js", "jsonl", "json", "txt"])),
-        "file.installScript" | "file.installScriptUIPanel" => ("path", Ask::Open(&["jsx", "js"])),
-        "effect.plugins.load" if params.get("folder").is_none() => ("path", Ask::Open(&["wasm", "wat"])),
-        "file.replaceFootage" => ("path", Ask::Import),
-        "file.relinkFootage" => ("folder", Ask::Folder),
-        "file.collectFiles" => ("folder", Ask::Save("Collected Files")),
-        "file.saveCopyAsXml" => ("path", Ask::Save("Untitled Project.ecprojx")),
-        "keys.rpfCameraImport" => ("path", Ask::Open(&["json", "csv", "txt"])),
-        "essential.exportTemplate" => ("path", Ask::Save("Template.ectemplate")),
-        "essential.importTemplate" => ("path", Ask::Open(&["ectemplate"])),
-        "file.setProxy" => ("path", Ask::Open(&["mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr"])),
-        _ => return None,
-    };
-    if params.get(key).is_some()
-        || params.get("path").is_some()
-        || params.get("paths").is_some()
-        || params.get("steps").is_some()
-        || params.get("preset").is_some()
-    {
-        return None;
-    }
-    const MEDIA: &[&str] = &[
-        "mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr", "dpx", "cin", "wav", "aif", "aiff", "mp3",
-        "flac", "ogg", "opus", "svg", "pdf", "ai", "eps", "psd", "psb", "tga", "hdr", "gltf", "glb", "obj", "stl", "fbx", "json", "csv", "tsv",
-    ];
-    // A host whose modal dialogs would run a nested event loop inside this frame (macOS: a
-    // drag over the window then re-entered winit's event handler and aborted, #511) shows the
-    // dialog without blocking; the command continues when the answer arrives.
-    if let Some(spawn) = app.hooks.file_dialog_async.as_ref() {
-        let request = match ask {
-            Ask::Folder => crate::FileDialog::Folder,
-            Ask::Import => crate::FileDialog::Open { exts: MEDIA.iter().map(|e| e.to_string()).collect(), many: key == "paths" },
-            Ask::OpenProject => crate::FileDialog::OpenProject,
-            Ask::Open(exts) => crate::FileDialog::Open { exts: exts.iter().map(|e| e.to_string()).collect(), many: false },
-            Ask::Save(default) => crate::FileDialog::save(default),
-        };
-        let tx = app.dialog_answers.0.clone();
-        let answer = crate::DialogAnswer { command: id.to_string(), key, params: params.clone(), paths: Vec::new() };
-        spawn(
-            request,
-            Box::new(move |paths| {
-                let _ = tx.send(crate::DialogAnswer { paths, ..answer });
-            }),
-        );
-        return Some(Ok(json!({"dialog": id})));
-    }
-    let picked: Option<Value> = match ask {
-        Ask::Folder => {
-            let Some(f) = app.hooks.pick_folder.as_ref() else { return Some(Err("no folder dialog available (pass `folder`)".into())) };
-            f().map(Value::from)
-        }
-        Ask::Import => {
-            let Some(f) = app.hooks.pick_files.as_ref() else { return Some(Err("no file dialog available (pass `paths`)".into())) };
-            picked_value(key, f(MEDIA))
-        }
-        Ask::OpenProject => {
-            let Some(f) = app.hooks.pick_open_project.as_ref() else { return Some(Err("no file dialog available (pass `path`)".into())) };
-            f().map(|s| json!(s))
-        }
-        Ask::Open(exts) => {
-            let Some(f) = app.hooks.pick_files.as_ref() else { return Some(Err("no file dialog available (pass `path`)".into())) };
-            f(exts).first().map(|s| json!(s))
-        }
-        Ask::Save(default) => {
-            let Some(picked) = app.hooks.save_dialog(default) else { return Some(Err("no file dialog available (pass `path`)".into())) };
-            picked.map(|s| json!(s))
-        }
-    };
-    let Some(v) = picked else { return Some(Ok(Value::Null)) };
-    Some(run_with_picked(app, id, key, params, v))
-}
-
-/// The dialog's answer as the command's `key` parameter (`None`: cancelled).
-fn picked_value(key: &str, paths: Vec<String>) -> Option<Value> {
-    match (paths.is_empty(), key) {
-        (true, _) => None,
-        (false, "paths") => Some(json!(paths)),
-        (false, _) => paths.into_iter().next().map(Value::from),
-    }
-}
-
-/// A file dialog shown without blocking ([`crate::Hooks::file_dialog_async`]) answered: run its
-/// command with the picked path (nothing when it was cancelled).
-pub(crate) fn dialog_answered(app: &mut EffectcraftApp, answer: crate::DialogAnswer) {
-    let Some(v) = picked_value(answer.key, answer.paths) else { return };
-    if let Err(e) = run_with_picked(app, &answer.command, answer.key, &answer.params, v) {
-        app.ui.status = e;
-    }
-}
-
-/// Run command `id` with the path picked for it in parameter `key`.
-fn run_with_picked(app: &mut EffectcraftApp, id: &str, key: &str, params: &Value, v: Value) -> Result<Value, String> {
-    let mut p = params.as_object().cloned().unwrap_or_default();
-    p.insert(key.to_string(), v);
-    // Picked files import in the background, with the Importing card showing progress (#270).
-    if matches!(id, "file.import" | "file.importMultiple") {
-        p.insert("background".into(), Value::Bool(true));
-    }
-    // Photoshop files ask how to import them first; numbered stills whether to import them as an
-    // image sequence.
-    let picked = Value::Object(p.clone());
-    if id == "file.import" && crate::panels::dialogs::open_form(app, id, &picked)
-        || matches!(id, "file.import" | "file.importMultiple") && crate::panels::forms::open_import_sequence(app, &picked)
-    {
-        return Ok(json!({"dialog": id}));
-    }
-    // Save (untitled) becomes Save As.
-    let id = if id == "file.save" { "file.saveAs" } else { id };
-    let r = app.session.execute(id, Value::Object(p)).map_err(|e| e.to_string());
-    if let Err(e) = &r {
-        app.ui.status = e.clone();
-    }
-    r
-}
-
-/// A menu entry for display / `ui.menu.list`.
-#[derive(Clone, Debug, serde::Serialize)]
-pub struct MenuItem {
-    pub id: String,
-    pub label: String,
-    pub path: Vec<String>,
-    pub shortcut: Option<String>,
-    pub enabled: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub checked: Option<bool>,
-    /// Parameters bound to the entry (e.g. the effect for Effect menu items).
-    #[serde(skip_serializing_if = "Value::is_null")]
-    pub params: Value,
-}
-
-/// Top-level menus in order.
-pub fn menus() -> Vec<&'static str> {
-    effectcraft_engine::menus::top_level()
-}
-
-pub(crate) fn entry_label(app: &EffectcraftApp, e: &MenuEntry) -> String {
-    let shown = match e.command.as_str() {
-        "edit.undo" => app.session.history.undo.last().map(|u| format!("Undo {}", u.0)).unwrap_or_else(|| "Can't Undo".into()),
-        "edit.redo" => app.session.history.redo.last().map(|u| format!("Redo {}", u.0)).unwrap_or_else(|| "Can't Redo".into()),
-        // Window ▸ Layer: the layer open in the Layer panel.
-        "window.panel" if e.params.get("panel").and_then(Value::as_str) == Some("layer") => {
-            let name = app
-                .ui
-                .layer_panel
-                .and_then(|id| app.session.active_comp().and_then(|c| c.layer(effectcraft_engine::project::LayerId(id))))
-                .map(|l| l.name.clone());
-            format!("Layer: {}", name.unwrap_or_else(|| "(none)".into()))
-        }
-        _ => effectcraft_engine::menus::entry_label(&app.session, e),
-    };
-    crate::i18n::entry(app, e, shown)
-}
-
-/// The entry's shortcut in the active keyboard shortcut preset.
-pub(crate) fn entry_shortcut(app: &EffectcraftApp, e: &MenuEntry) -> Option<String> {
-    app.session.shortcuts().shortcut_of(&e.command, &e.params).map(str::to_string)
-}
-
-/// Whether panel `p` is on screen: the front tab of a floating window, or of a docked group
-/// (an open frame in a stack) that a maximized panel does not cover.
-pub(crate) fn panel_shown(app: &EffectcraftApp, p: PanelKind) -> bool {
-    if app.ui.floating.iter().any(|f| f.panels.get(f.active) == Some(&p)) {
-        return true;
-    }
-    match app.ui.maximized.filter(|m| app.ui.dock.contains(*m)) {
-        Some(m) => m == p,
-        None => app.ui.dock.is_visible(p),
-    }
-}
-
-/// The command a menu entry runs when chosen from a menu: Window ▸ <panel> closes a panel whose
-/// entry is checked, as in After Effects (#1630). Shortcuts and agents calling `window.panel`
-/// still only show the panel.
-pub(crate) fn menu_choice(app: &EffectcraftApp, id: String, params: Value) -> (String, Value) {
-    if id == "window.panel"
-        && let Some(p) = params.get("panel").and_then(Value::as_str).and_then(PanelKind::from_name)
-        && panel_shown(app, p)
-    {
-        return ("window.closePanel".into(), params);
-    }
-    (id, params)
-}
-
-/// Check-mark state of frontend toggles (engine state is answered by the engine).
-pub(crate) fn entry_checked(app: &EffectcraftApp, e: &MenuEntry) -> Option<bool> {
-    let v = &app.ui.viewer;
-    let pstr = |k: &str| e.params.get(k).and_then(Value::as_str);
-    match e.command.as_str() {
-        "view.rulers" => Some(v.rulers),
-        "view.guides" => Some(v.guides),
-        "view.snapToGuides" => Some(v.snap_guides),
-        "view.lockGuides" => Some(v.lock_guides),
-        "view.grid" => Some(v.grid),
-        "view.snapToGrid" => Some(v.snap_grid),
-        "view.layerControls" => Some(v.show_layer_controls),
-        "playback.cacheWhenIdle" => Some(app.ui.cache_when_idle),
-        "playback.audio" => Some(app.session.prefs.preview.active().include_audio),
-        "window.workspace" => Some(pstr("name").is_some_and(|n| n == app.ui.workspace)),
-        // The Tools panel is the header toolbar: always on screen.
-        "window.panel" => Some(pstr("panel").is_some_and(|n| n.eq_ignore_ascii_case("tools") || PanelKind::from_name(n).is_some_and(|p| panel_shown(app, p)))),
-        "view.panelBackground" if e.params.get("pick").is_none() => {
-            let cur = match v.pasteboard {
-                None => "mediumGray",
-                Some([0, 0, 0]) => "black",
-                Some([0x2a, 0x2a, 0x2a]) => "darkGray",
-                Some([0xb4, 0xb4, 0xb4]) => "lightGray",
-                Some([0xff, 0xff, 0xff]) => "white",
-                Some(_) => "custom",
-            };
-            Some(pstr("color") == Some(cur))
-        }
-        _ => effectcraft_engine::menus::checked(&app.session, &e.command, &e.params),
-    }
-}
-
-pub(crate) fn entry_enabled(app: &EffectcraftApp, e: &MenuEntry) -> bool {
-    if app.ui.focused == PanelKind::Project {
-        match e.command.as_str() {
-            "edit.duplicate" => {
-                return !app.session.state.project_selection.is_empty()
-                    && app.session.state.project_selection.iter().all(|id| app.session.project.item(*id).is_some_and(|i| !i.is_folder()));
-            }
-            "edit.selectAll" => return !app.session.project.items.is_empty(),
-            "edit.deselectAll" => return !app.session.state.project_selection.is_empty(),
-            "edit.cut" | "edit.copy" | "edit.paste" | "edit.copyWithPropertyLinks" | "edit.copyWithRelativePropertyLinks" | "edit.copyExpressionOnly" => {
-                return false;
-            }
-            _ => {}
-        }
-    }
-    if e.command == "edit.clear" && app.ui.focused == PanelKind::Project {
-        return app.session.is_enabled("project.delete");
-    }
-    if e.command == "edit.clear" && app.ui.focused == PanelKind::RenderQueue {
-        return !app.session.is_rendering() && !app.session.project.render_queue.is_empty();
-    }
-    if e.command == "window.panel" {
-        return true;
-    }
-    app.session.is_enabled(&e.command)
-}
-
-/// Every menu entry, flattened with its submenu path.
-pub fn menu_items(app: &EffectcraftApp) -> Vec<MenuItem> {
-    effectcraft_engine::menus::entries()
-        .into_iter()
-        .map(|(path, e)| MenuItem {
-            id: e.command.clone(),
-            label: entry_label(app, e),
-            path,
-            shortcut: entry_shortcut(app, e),
-            enabled: entry_enabled(app, e),
-            checked: entry_checked(app, e),
-            params: e.params.clone(),
-        })
-        .collect()
-}
-
-/// Shortcut text in this OS's notation (`⇧⌘K` on macOS, `Ctrl+Shift+K` elsewhere).
-pub fn shortcut_text(s: &str) -> String {
-    if cfg!(target_os = "macos") {
-        let mut out = String::new();
-        let parts: Vec<&str> = match s.strip_suffix("++") {
-            Some(head) => vec![head, "+"],
-            None => s.split('+').collect(),
-        };
-        let (mods, key) = parts.split_at(parts.len().saturating_sub(1));
-        for m in mods {
-            out.push_str(match *m {
-                "Ctrl" => "⌃",
-                "Alt" => "⌥",
-                "Shift" => "⇧",
-                "Cmd" => "⌘",
-                x => x,
-            });
-        }
-        out.push_str(match key.first().copied().unwrap_or("") {
-            "Space" => "Space",
-            "Escape" => "Esc",
-            "Home" => "↖",
-            k => k,
-        });
-        out
-    } else {
-        s.replace("Cmd", "Ctrl")
-    }
-}
-
-/// Parse "Cmd+Shift+K" into modifiers + key.
-pub fn parse_shortcut(s: &str) -> Option<(egui::Modifiers, egui::Key)> {
-    let mut m = egui::Modifiers::NONE;
-    let mut key = None;
-    // The plus key itself is written `+` or `Cmd++`.
-    let (head, plus) = match s.strip_suffix("++") {
-        Some(h) => (h, true),
-        None if s == "+" => ("", true),
-        None => (s, false),
-    };
-    let mut parts: Vec<&str> = if head.is_empty() { vec![] } else { head.split('+').collect() };
-    if plus {
-        parts.push("+");
-    }
-    for p in parts {
-        match p {
-            "Cmd" => {
-                m.command = true;
-                m.mac_cmd = cfg!(target_os = "macos");
-                if !cfg!(target_os = "macos") {
-                    m.ctrl = true;
-                }
-            }
-            "Physical" => {}
-            "Shift" => m.shift = true,
-            "Alt" => m.alt = true,
-            "Ctrl" => m.ctrl = true,
-            k => {
-                key = match k {
-                    ";" => Some(egui::Key::Semicolon),
-                    "'" => Some(egui::Key::Quote),
-                    "," => Some(egui::Key::Comma),
-                    "." => Some(egui::Key::Period),
-                    "/" => Some(egui::Key::Slash),
-                    "\\" => Some(egui::Key::Backslash),
-                    "=" => Some(egui::Key::Equals),
-                    "-" => Some(egui::Key::Minus),
-                    "`" => Some(egui::Key::Backtick),
-                    "[" => Some(egui::Key::OpenBracket),
-                    "]" => Some(egui::Key::CloseBracket),
-                    "Num0" => Some(egui::Key::Num0),
-                    "Num*" => None,
-                    _ => egui::Key::from_name(k),
-                }
-            }
-        }
-    }
-    key.map(|k| (m, k))
-}
-
-/// The key some keyboards report for a shifted punctuation key (`Shift+=` arrives as `+`).
-fn shifted_alias(k: egui::Key) -> Option<egui::Key> {
-    use egui::Key::*;
-    Some(match k {
-        Equals => Plus,
-        Semicolon => Colon,
-        OpenBracket => OpenCurlyBracket,
-        CloseBracket => CloseCurlyBracket,
-        Slash => Questionmark,
-        Backslash => Pipe,
-        _ => return None,
-    })
-}
-
-/// A key binding: modifiers, key, command id and bound params.
-pub type Binding = (egui::Modifiers, egui::Key, String, Value);
-
-/// All bindings of the active keyboard shortcut preset, most modifiers first.
-pub fn bindings(session: &effectcraft_engine::Session) -> Vec<Binding> {
-    let mut v: Vec<Binding> = Vec::new();
-    for (sc, b) in session.shortcuts().bindings() {
-        if sc.starts_with("Physical+") {
-            continue;
-        }
-        // Off macOS `Cmd` is Ctrl, so a custom Ctrl+Cmd shortcut would
-        // steal the plain Cmd one: such macOS-only shortcuts aren't bound there.
-        if !cfg!(target_os = "macos") && sc.split('+').any(|p| p == "Ctrl") && sc.split('+').any(|p| p == "Cmd") {
-            continue;
-        }
-        if let Some((m, k)) = parse_shortcut(sc) {
-            if m.shift
-                && let Some(alias) = shifted_alias(k)
-            {
-                v.push((m, alias, b.command.clone(), b.params.clone()));
-            }
-            v.push((m, k, b.command.clone(), b.params.clone()));
-        }
-    }
-    v.sort_by_key(|(m, ..)| std::cmp::Reverse(m.command as u8 + m.shift as u8 + m.alt as u8 + m.ctrl as u8));
-    v
-}
-
-fn mods_match(want: egui::Modifiers, got: egui::Modifiers) -> bool {
-    want.command == got.command && want.shift == got.shift && want.alt == got.alt && (want.ctrl == got.ctrl || got.command && cfg!(not(target_os = "macos")))
-}
-
-/// Set (egui temp data) from a plain Spacebar press until its release while a tap would still
-/// run the Spacebar shortcut.
-/// The system clipboard's text of this frame's paste event, for the Edit ▸ Paste it runs.
-fn system_paste_id() -> egui::Id {
-    egui::Id::new("menus-system-paste")
-}
-
-fn space_tap_id() -> egui::Id {
-    egui::Id::new("spacebar-tap")
-}
-
-/// The modifiers held when this frame's input began: the state the last pass ended with, if it
-/// ran this (egui keeps only the state after the frame's events). Records this pass's state.
-fn modifiers_at_start(ctx: &egui::Context) -> Option<egui::Modifiers> {
-    let id = egui::Id::new("shortcut-modifiers");
-    let pass = ctx.cumulative_pass_nr();
-    let now = ctx.input(|i| i.modifiers);
-    ctx.data_mut(|d| {
-        let last = d.get_temp::<(u64, egui::Modifiers, Option<egui::Modifiers>)>(id);
-        if let Some((p, _, start)) = last
-            && p == pass
-        {
-            return start;
-        }
-        let start = last.and_then(|(p, m, _)| (p.checked_add(1) == Some(pass)).then_some(m));
-        d.insert_temp(id, (pass, now, start));
-        start
-    })
-}
-
-/// Only Shift held (Shift+Delete, not Ctrl/Alt+Shift+Delete).
-fn only_shift(m: egui::Modifiers) -> bool {
-    m.shift && !m.alt && !m.ctrl && !m.command && !m.mac_cmd
-}
-
-/// Dispatch keyboard shortcuts (skipped while typing in a text field).
-pub fn handle_shortcuts(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    handle_shortcuts_impl(app, ctx, false);
-}
-
-/// Tab can acquire widget focus while the current frame is drawn. Dispatch its application
-/// binding only afterward, and only when no widget owned focus before or after layout.
-pub fn handle_tab_shortcut(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    if ctx.input(|i| i.key_pressed(egui::Key::Tab)) {
-        handle_shortcuts_impl(app, ctx, true);
-    }
-}
-
-fn handle_shortcuts_impl(app: &mut EffectcraftApp, ctx: &egui::Context, tab_only: bool) {
-    let start = modifiers_at_start(ctx);
-    // Dialog cancellation owns Escape even when a text field has keyboard focus.
-    if !tab_only && app.dialog.is_some() && ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
-        // A popup or colour picker takes Escape first (the picker goes back to its original colour).
-        if crate::panels::shortcut_editor::recording(app)
-            || crate::panels::shortcut_editor::confirming(app)
-            || egui::Popup::is_any_open(ctx)
-            || crate::color_picker::open_recently(ctx)
-        {
-            return;
-        }
-        ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape));
-        if app.dialog == Some(crate::Dialog::LayerStyles) {
-            crate::panels::layer_styles_dialog::finish(app, false);
-        } else if app.dialog == Some(crate::Dialog::Info) {
-            crate::panels::forms::close_info(app);
-        } else {
-            if app.dialog == Some(crate::Dialog::Settings)
-                && let Some(p) = app.dialog_state.prefs_snapshot.take()
-            {
-                app.session.prefs = p;
-                app.session.prefs_changed();
-            }
-            if app.dialog == Some(crate::Dialog::UnsavedChanges) {
-                app.dialog_state.unsaved.command = None;
-            }
-            app.dialog = None;
-        }
-        return;
-    }
-    // A mouse button down while Spacebar is held belongs to the Hand tool: its release won't
-    // preview.
-    if ctx.input(|i| i.pointer.any_down()) || ctx.egui_wants_keyboard_input() {
-        ctx.data_mut(|d| d.remove::<bool>(space_tap_id()));
-    }
-    // While a menu or popup list is open, keys go to it, not to the app (Space must not start a
-    // preview behind the menu, #279).
-    if ctx.egui_wants_keyboard_input() || crate::widgets::any_menu_open(ctx) {
-        return;
-    }
-    // Text editing in the viewer takes the clipboard events itself.
-    let clipboard = app.session.state.text_edit.is_none();
-    let project = app.ui.focused == PanelKind::Project;
-    // The paste event's text: Edit ▸ Paste pastes SVG markup as a shape layer.
-    let pasted =
-        if clipboard { ctx.input(|i| i.events.iter().rev().find_map(|e| if let egui::Event::Paste(t) = e { Some(t.clone()) } else { None })) } else { None };
-    let mut events: Vec<(egui::Key, egui::Modifiers, bool, Option<egui::Key>)> = ctx.input(|i| {
-        // The windowing layer turns Ctrl+C / Ctrl+X / Ctrl+V into clipboard events instead of
-        // key presses: map them back to the keys (with the modifiers held) so Edit ▸ Copy, Cut,
-        // Paste and their variants (Ctrl+Alt+C…) run. Clipboard events carry no modifiers and
-        // `i.modifiers` is the state after all of the frame's events, so each is read with the
-        // modifiers where it is in the stream: walk the events from the frame's starting state.
-        // `None` when that isn't known.
-        let changed = i.events.iter().any(|e| matches!(e, egui::Event::ModifiersChanged(_) | egui::Event::WindowFocused(false)));
-        let mut at = if changed { start } else { Some(i.modifiers) };
-        let held = |at: Option<egui::Modifiers>| at.filter(|m| m.command).unwrap_or(egui::Modifiers::COMMAND);
-        let mut out = Vec::new();
-        for e in &i.events {
-            match e {
-                egui::Event::ModifiersChanged(m) => at = Some(*m),
-                // egui forgets the modifiers held when the window loses focus.
-                egui::Event::WindowFocused(false) => at = Some(egui::Modifiers::NONE),
-                egui::Event::Key { key, physical_key, pressed: true, modifiers, repeat, .. }
-                    if !*repeat
-                        || matches!(
-                            key,
-                            egui::Key::PageUp | egui::Key::PageDown | egui::Key::ArrowLeft | egui::Key::ArrowRight | egui::Key::ArrowUp | egui::Key::ArrowDown
-                        ) =>
-                {
-                    out.push((*key, *modifiers, true, *physical_key));
-                }
-                egui::Event::Key { key: egui::Key::Space, pressed: false, .. } => out.push((egui::Key::Space, egui::Modifiers::NONE, false, None)),
-                egui::Event::Copy if clipboard => out.push((egui::Key::C, held(at), true, None)),
-                // On Windows, Shift+Delete is the old Cut key and arrives as Cut too. The Project
-                // panel has no clipboard: there a Cut with only Shift held is Shift+Delete (Delete
-                // Project Items Without Confirmation). Never when the modifiers aren't known.
-                egui::Event::Cut if clipboard && project && at.is_some_and(only_shift) => {
-                    out.push((egui::Key::Delete, egui::Modifiers::SHIFT, true, None));
-                }
-                egui::Event::Cut if clipboard => out.push((egui::Key::X, held(at), true, None)),
-                egui::Event::Paste(_) if clipboard => out.push((egui::Key::V, held(at), true, None)),
-                _ => {}
-            }
-        }
-        out
-    });
-    events.retain(|(key, _, _, _)| (*key == egui::Key::Tab) == tab_only);
-    // Numpad * (or `*` typed with Shift+8): Add Marker (#275). egui has no key for it, so it
-    // comes as text.
-    if !tab_only && clipboard && app.dialog.is_none() && ctx.input(|i| i.events.iter().any(|e| matches!(e, egui::Event::Text(t) if t == "*"))) {
-        let bound = app.session.shortcuts().bindings().into_iter().find(|(k, _)| *k == "Num*").map(|(_, b)| (b.command.clone(), b.params.clone()));
-        // As in After Effects, it marks the selected layers; only with none selected does it add
-        // a composition marker (#976).
-        let bound = bound.map(|(id, params)| {
-            if id == "comp.addMarker" && !app.session.state.selected_layers.is_empty() { ("layer.addMarker".to_owned(), params) } else { (id, params) }
-        });
-        if let Some((id, params)) = bound
-            && let Err(e) = invoke(app, ctx, &id, if params.is_null() { json!({}) } else { params })
-        {
-            app.ui.status = e;
-        }
-    }
-    if events.is_empty() {
-        return;
-    }
-    let binds = bindings(&app.session);
-    for (key, mods, pressed, physical_key) in events {
-        // Plain Spacebar runs its shortcut (Play Current Preview) on the release: held, it is
-        // the Hand tool (After Effects), and a drag with it must not start or stop playback.
-        if key == egui::Key::Space && (!pressed || !mods.any()) {
-            if pressed {
-                if app.dialog.is_none() {
-                    ctx.data_mut(|d| d.insert_temp(space_tap_id(), true));
-                }
-                continue;
-            }
-            if !ctx.data_mut(|d| d.remove_temp::<bool>(space_tap_id())).unwrap_or(false) {
-                continue;
-            }
-        }
-        // Escape closes dialogs.
-        if key == egui::Key::Escape && app.dialog.is_some() {
-            // Escape while recording a shortcut cancels the recording, not the editor; so does
-            // Escape in its Delete Preset prompt.
-            if crate::panels::shortcut_editor::recording(app) || crate::panels::shortcut_editor::confirming(app) {
-                continue;
-            }
-            if app.dialog == Some(crate::Dialog::Info) {
-                crate::panels::forms::close_info(app);
-                continue;
-            }
-            // Escape in Settings is Cancel: restore the settings from when it opened.
-            if app.dialog == Some(crate::Dialog::Settings)
-                && let Some(p) = app.dialog_state.prefs_snapshot.take()
-            {
-                app.session.prefs = p;
-                app.session.prefs_changed();
-            }
-            app.dialog = None;
-            continue;
-        }
-        if app.dialog.is_some() {
-            continue;
-        }
-        // Enter in the Project panel renames the selected item (handled by the panel).
-        if key == egui::Key::Enter && !mods.any() && app.ui.focused == PanelKind::Project {
-            continue;
-        }
-        // The Project panel has its own selection; a previously selected Timeline layer
-        // must not be deleted while the Project panel has focus.
-        if matches!(key, egui::Key::Delete | egui::Key::Backspace) && !mods.any() {
-            if matches!(app.ui.focused, PanelKind::Composition | PanelKind::Viewer(_)) && !app.session.state.camera_points.is_empty() {
-                if let Err(e) = run_engine(app, ctx, "camera.deletePoints", json!({})) {
-                    app.ui.status = e;
-                }
-                ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, key));
-                continue;
-            }
-            // The queue panel consumes the event after its selection state is drawn.
-            if app.ui.focused == PanelKind::RenderQueue {
-                continue;
-            }
-            let _ = invoke(app, ctx, "edit.clear", json!({}));
-            continue;
-        }
-        // Explicit physical bindings distinguish keys that a layout reports with the same
-        // logical name (for example AZERTY's minus and right parenthesis).
-        let physical = physical_key.and_then(|key| {
-            app.session.shortcuts().bindings().into_iter().find_map(|(sc, b)| {
-                let (m, k) = parse_shortcut(sc.strip_prefix("Physical+")?)?;
-                (k == key && mods_match(m, mods)).then(|| (b.command.clone(), b.params.clone()))
-            })
-        });
-        if let Some((id, params)) = physical {
-            if let Err(e) = invoke(app, ctx, &id, if params.is_null() { json!({}) } else { params }) {
-                app.ui.status = e;
-            }
-            continue;
-        }
-        if let Some((_, _, id, params)) = binds.iter().filter(|(m, k, ..)| *k == key && mods_match(*m, mods)).min_by_key(|(_, _, id, params)| {
-            // The focused panel wins over an application command sharing its chord.
-            let key = effectcraft_engine::shortcuts::binding_key(id, params);
-            app.session.shortcuts().find(&key).is_none_or(|b| b.scope != app.ui.focused.id())
-        }) {
-            let (id, params) = (id.clone(), if params.is_null() { json!({}) } else { params.clone() });
-            if id == "edit.paste"
-                && let Some(t) = &pasted
-            {
-                ctx.data_mut(|d| d.insert_temp(system_paste_id(), t.clone()));
-            }
-            if let Err(e) = invoke(app, ctx, &id, params) {
-                app.ui.status = e;
-            }
-            ctx.data_mut(|d| d.remove_temp::<String>(system_paste_id()));
-        }
-    }
-}
-
-/// Draw the in-window menu bar (the engine's AE menu tree).
-pub fn menu_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
-    let ctx = ui.ctx().clone();
-    let mut clicked: Option<(String, Value)> = None;
-    let mut nav = crate::menu_keys::Nav::default();
-    ui.horizontal_centered(|ui| {
-        ui.add_space(6.0);
-        egui::MenuBar::new().config(egui::containers::menu::MenuConfig::new().style(crate::widgets::menu_style)).ui(ui, |ui| {
-            for node in effectcraft_engine::menus::menu_bar() {
-                if let MenuNode::Submenu { label, children } = node {
-                    let r = ui.menu_button(crate::i18n::label(app, "", label), |ui| {
-                        ui.set_min_width(if label == "Effect" { 200.0 } else { 280.0 });
-                        crate::widgets::menu_scroll(ui, |ui| menu_nodes(app, ui, children, &mut clicked, &mut nav, 0));
-                    });
-                    nav.top(&r.response);
-                    app.auto.add(&format!("menu.{label}"), r.response.rect, label);
-                }
-            }
-        });
-    });
-    crate::menu_keys::handle(&ctx, &nav);
-    if let Some((id, params)) = clicked.map(|(id, params)| menu_choice(app, id, params))
-        && let Err(e) = invoke(app, &ctx, &id, if params.is_null() { json!({}) } else { params })
-    {
-        app.ui.status = e;
-    }
-}
-
-/// The entries of top-level menu `name` (the Effect menu is the Effect Controls panel's context
-/// menu); returns the chosen command and its params.
-pub(crate) fn menu_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, name: &str) -> Option<(String, Value)> {
-    let mut clicked = None;
-    if let Some(MenuNode::Submenu { children, .. }) =
-        effectcraft_engine::menus::menu_bar().iter().find(|n| matches!(n, MenuNode::Submenu { label, .. } if label == name))
-    {
-        menu_nodes(app, ui, children, &mut clicked, &mut crate::menu_keys::Nav::default(), 0);
-    }
-    clicked.map(|(id, params)| (id, if params.is_null() { json!({}) } else { params }))
-}
-
-/// The entries `nodes` of a menu `depth` submenus deep, registered with `nav` for the keyboard.
-fn menu_nodes(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    nodes: &[MenuNode],
-    clicked: &mut Option<(String, Value)>,
-    nav: &mut crate::menu_keys::Nav,
-    depth: usize,
-) {
-    for n in nodes {
-        match n {
-            MenuNode::Separator => {
-                ui.separator();
-            }
-            MenuNode::Dynamic { name } => {
-                // Recent projects / footage / presets, undo history, shortcut slots, viewers,
-                // saved workspaces.
-                let ws = app.ui.workspace.clone();
-                let saved = app.saved_workspace_names();
-                let (entries, empty) = effectcraft_engine::menus::dynamic(&app.session, name, &dyn_ctx(&ws, &saved));
-                if entries.is_empty()
-                    && let Some(e) = empty
-                {
-                    ui.add_enabled(false, egui::Button::new((gutter(false), e)));
-                }
-                for (i, e) in entries.iter().enumerate() {
-                    let tip = match name.as_str() {
-                        "recentProjects" => app.session.prefs.recent_projects.get(i).cloned(),
-                        "recentFootage" => app.session.prefs.recent_footage.get(i).cloned(),
-                        "recentPresets" => app.session.prefs.recent_presets.get(i).cloned(),
-                        _ => None,
-                    };
-                    let r = ui.add_enabled(entry_enabled(app, e), egui::Button::new((gutter(entry_checked(app, e) == Some(true)), e.label.as_str())));
-                    let r = match &tip {
-                        Some(t) => r.on_hover_text(t),
-                        None => r,
-                    };
-                    app.auto.add(&format!("menu.{name}.{i}"), r.rect, &e.label);
-                    nav.entry(ui, depth, &r, false);
-                    if r.clicked() {
-                        *clicked = Some((e.command.clone(), e.params.clone()));
-                        ui.close();
-                    }
-                }
-            }
-            MenuNode::Submenu { label, children } => {
-                let ws = app.ui.workspace.clone();
-                // The generated Effect menu's category submenus draw the catalog's name (#821);
-                // every other submenu goes through the menu catalog.
-                let shown = crate::i18n::effect_category(children, label)
-                    .unwrap_or_else(|| crate::i18n::submenu(app, label, effectcraft_engine::menus::submenu_label(&app.session, label, &dyn_ctx(&ws, &[]))));
-                let r = ui.menu_button((gutter(false), shown.as_str()), |ui| {
-                    ui.set_min_width(if children.len() > 30 { 200.0 } else { 240.0 });
-                    crate::widgets::menu_scroll(ui, |ui| menu_nodes(app, ui, children, clicked, nav, depth + 1));
-                });
-                nav.entry(ui, depth, &r.response, true);
-                if r.inner.is_some() {
-                    nav.opened(depth, &r.response);
-                }
-            }
-            MenuNode::Item(e) => {
-                let r = menu_entry(app, ui, e);
-                nav.entry(ui, depth, &r, false);
-                if r.clicked() {
-                    *clicked = Some((e.command.clone(), e.params.clone()));
-                    ui.close();
-                }
-            }
-        }
-    }
-}
-
-/// The menu bar's submenu at `path` (`["File", "Interpret Footage"]`) in a panel's context menu,
-/// with the menu bar's labels, shortcuts and enabled state; a chosen entry goes to `clicked`.
-pub(crate) fn submenu_at(app: &mut EffectcraftApp, ui: &mut egui::Ui, path: &[&str], clicked: &mut Option<(String, Value)>) {
-    let mut nodes = effectcraft_engine::menus::menu_bar();
-    let mut found = None;
-    for label in path {
-        let Some(n) = nodes.iter().find(|n| matches!(n, MenuNode::Submenu { label: l, .. } if l == label)) else { return };
-        if let MenuNode::Submenu { children, .. } = n {
-            nodes = children;
-        }
-        found = Some(n);
-    }
-    if let Some(n) = found {
-        menu_nodes(app, ui, std::slice::from_ref(n), clicked, &mut crate::menu_keys::Nav::default(), 0);
-    }
-    if let Some((_, p)) = clicked.as_mut()
-        && p.is_null()
-    {
-        *p = json!({});
-    }
-}
-
-/// The menu bar's entry for `command` in a panel's context menu (see [`submenu_at`]).
-pub(crate) fn entry_for(app: &EffectcraftApp, ui: &mut egui::Ui, command: &str, clicked: &mut Option<(String, Value)>) {
-    if let Some((_, e)) = effectcraft_engine::menus::entries().into_iter().find(|(_, e)| e.command == command)
-        && menu_entry(app, ui, e).clicked()
-    {
-        *clicked = Some((e.command.clone(), e.params_or_empty()));
-        ui.close();
-    }
-}
-
-/// Frontend state for dynamic menus (the current workspace and the saved ones).
-pub(crate) fn dyn_ctx<'a>(workspace: &'a str, saved_workspaces: &'a [String]) -> effectcraft_engine::menus::DynCtx<'a> {
-    effectcraft_engine::menus::DynCtx { workspace: Some(workspace), saved_workspaces }
-}
-
-/// The check-mark column every menu row reserves (like macOS / After Effects menus).
-fn gutter(checked: bool) -> egui::Atom<'static> {
-    use egui::AtomExt;
-    (if checked { "✔" } else { "" }).atom_size(egui::vec2(14.0, 14.0))
-}
-
-fn menu_entry(app: &EffectcraftApp, ui: &mut egui::Ui, e: &MenuEntry) -> egui::Response {
-    let (label, check, enabled) = (entry_label(app, e), gutter(entry_checked(app, e) == Some(true)), entry_enabled(app, e));
-    // Edit ▸ Label's entries show the label's colour before its name.
-    if e.command == "edit.label"
-        && let Some(l) = e.params.get("label").and_then(Value::as_str).and_then(effectcraft_engine::color::Label::from_name)
-    {
-        let out = ui.add_enabled_ui(enabled, |ui| egui::Button::new((check, crate::widgets::label_swatch(), label)).atom_ui(ui)).inner;
-        crate::widgets::paint_label_swatch(ui, &out, l, &app.tokens);
-        return out.response;
-    }
-    let mut b = egui::Button::new((check, label));
-    if let Some(s) = entry_shortcut(app, e) {
-        b = b.shortcut_text(shortcut_text(&s));
-    }
-    ui.add_enabled(enabled, b)
-}
-
-/// View ▸ Zoom In / Zoom Out: the next standard magnification (as a share of screen pixels, so
-/// 100 % is one comp pixel per screen pixel at any display scaling) above or below `cur`, which is
-/// in points per comp pixel like the result (#882).
-fn zoom_step(cur: f32, ppp: f32, zoom_in: bool) -> f32 {
-    const STEPS: [f32; 16] = [0.015, 0.03, 0.0625, 0.125, 0.25, 0.333, 0.5, 0.66, 1.0, 1.5, 2.0, 3.0, 4.0, 8.0, 16.0, 32.0];
-    let ppp = if ppp.is_finite() && ppp > 0.0 { ppp } else { 1.0 };
-    let shown = cur * ppp;
-    let next = if zoom_in {
-        STEPS.iter().copied().find(|s| *s > shown + 1e-3).unwrap_or(32.0)
-    } else {
-        STEPS.iter().rev().copied().find(|s| *s < shown - 1e-3).unwrap_or(0.015)
-    };
-    next / ppp
-}
-
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// #882: at 125 % / 150 % display scaling Zoom In reaches 100 % (one comp pixel per screen
-    /// pixel), not 100 % in points (125 % / 150 % on screen).
-    #[test]
-    fn zoom_steps_land_on_whole_screen_magnifications() {
-        for ppp in [1.0f32, 1.25, 1.5, 2.0] {
-            let at_100 = zoom_step(0.7 / ppp, ppp, true);
-            assert!((at_100 * ppp - 1.0).abs() < 1e-6, "ppp {ppp}: {}", at_100 * ppp);
-            assert!((zoom_step(at_100, ppp, true) * ppp - 1.5).abs() < 1e-6);
-            assert!((zoom_step(at_100, ppp, false) * ppp - 0.66).abs() < 1e-6);
-        }
-        assert!(zoom_step(1.0, 0.0, true).is_finite());
-    }
-
-    #[test]
-    fn shortcut_passes_share_frame_start_modifiers() {
-        let ctx = egui::Context::default();
-        let mut starts = Vec::new();
-        let mut output = ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(egui::Modifiers::SHIFT)], ..Default::default() }, |ui| {
-            let ctx = ui.ctx();
-            starts.push(modifiers_at_start(ctx));
-            starts.push(modifiers_at_start(ctx));
-        });
-        output.textures_delta.clear();
-        assert_eq!(starts, vec![None, None]);
-        starts.clear();
-        let mut output = ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(egui::Modifiers::NONE)], ..Default::default() }, |ui| {
-            let ctx = ui.ctx();
-            starts.push(modifiers_at_start(ctx));
-            starts.push(modifiers_at_start(ctx));
-        });
-        output.textures_delta.clear();
-        assert_eq!(starts, vec![Some(egui::Modifiers::SHIFT), Some(egui::Modifiers::SHIFT)]);
-    }
-
-    #[test]
-    fn every_ui_shortcut_parses() {
-        for c in UI_COMMANDS {
-            if let Some(sc) = c.shortcut {
-                assert!(parse_shortcut(sc).is_some() || sc == "Num*", "{sc}");
-            }
-        }
-        for (_, e) in effectcraft_engine::menus::entries() {
-            if let Some(sc) = &e.shortcut {
-                assert!(parse_shortcut(sc).is_some() || sc == "Num*", "{} ({sc})", e.label);
-            }
-        }
-    }
-
-    #[test]
-    fn full_screen_default_is_platform_specific() {
-        let app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let full_screen = app.session.shortcuts().shortcut_of("view.fullScreen", &Value::Null);
-        if cfg!(target_os = "macos") {
-            assert_eq!(full_screen, Some("Ctrl+Cmd+F"));
-        } else {
-            assert_eq!(full_screen, None);
-            assert_eq!(app.session.shortcuts().shortcut_of("window.maximizeApp", &Value::Null), Some("Cmd+\\"));
-        }
-    }
-
-    #[test]
-    fn ui_and_menu_shortcuts_do_not_collide() {
-        let app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let mut seen: std::collections::BTreeMap<(String, String), (String, String)> = Default::default();
-        for (m, k, id, params) in bindings(&app.session) {
-            let key = (format!("{m:?}"), format!("{k:?}"));
-            let target = (id.clone(), params.to_string());
-            if let Some(prev) = seen.get(&key) {
-                assert_eq!(prev, &target, "{key:?} bound to {prev:?} and {target:?}");
-            } else {
-                seen.insert(key, target);
-            }
-        }
-    }
-
-    /// #336: Ctrl+\ (Cmd+\ on macOS) maximizes the application window, and again restores
-    /// it, as in After Effects.
-    #[test]
-    fn ctrl_backslash_maximizes_or_restores_the_window() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let (m, k) = parse_shortcut("Cmd+\\").unwrap();
-        assert!(m.command && k == egui::Key::Backslash, "{m:?} {k:?}");
-        assert!(bindings(&app.session).iter().any(|b| (b.0, b.1) == (m, k) && b.2 == "window.maximizeApp"));
-        let ctx = egui::Context::default();
-        let run = |app: &mut EffectcraftApp, maximized: bool| {
-            let input = egui::RawInput {
-                viewports: std::iter::once((egui::ViewportId::ROOT, egui::ViewportInfo { maximized: Some(maximized), ..Default::default() })).collect(),
-                ..Default::default()
-            };
-            let mut r = Value::Null;
-            let mut out = ctx.run_ui(input, |ui| r = invoke(app, ui.ctx(), "window.maximizeApp", json!({})).unwrap());
-            out.textures_delta.clear();
-            let cmds = out.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default();
-            (r, cmds)
-        };
-        let (r, cmds) = run(&mut app, false);
-        assert_eq!(r, json!({"maximized": true}));
-        assert!(cmds.contains(&egui::ViewportCommand::Maximized(true)), "{cmds:?}");
-        let (r, cmds) = run(&mut app, true);
-        assert_eq!(r, json!({"maximized": false}));
-        assert!(cmds.contains(&egui::ViewportCommand::Maximized(false)), "{cmds:?}");
-    }
-
-    /// The default keys of the keyboard-only commands parse and reach them.
-    #[test]
-    fn keyboard_only_commands_are_bound() {
-        let app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        for (id, keys) in [
-            ("time.workAreaStart", "Shift+Home"),
-            ("time.workAreaEnd", "Shift+End"),
-            ("time.previousInOut", "Cmd+Alt+Shift+ArrowLeft"),
-            ("time.nextInOut", "Cmd+Alt+Shift+ArrowRight"),
-            ("comp.workAreaToSelection", "Cmd+Alt+B"),
-            ("comp.activateRecent", "Shift+Escape"),
-            ("keys.deselectAll", "Shift+F2"),
-            ("keys.deselectAll", "Cmd+Alt+Shift+A"),
-            ("layer.extendSelectionNext", "Cmd+Shift+ArrowDown"),
-            ("layer.moveInToStart", "Alt+Home"),
-            ("layer.moveEarlier", "Alt+PageUp"),
-            ("layer.moveLater10", "Alt+Shift+PageDown"),
-            ("layer.stretchInToTime", "Cmd+Shift+,"),
-            ("layer.stretchOutToTime", "Cmd+Alt+,"),
-            ("layer.mask.selectNext", "Alt+`"),
-            ("layer.mask.selectPrevious", "Alt+Shift+`"),
-            ("layer.castsShadows", "Alt+Shift+C"),
-            ("timeline.scrollToTime", "D"),
-            ("timeline.scrollToLayer", "X"),
-            ("timeline.parentColumn", "Shift+F4"),
-            ("view.fitUpTo100", "Alt+/"),
-            ("view.nextItem", "Shift+."),
-            ("view.previousItem", "Shift+,"),
-            ("window.toggleCompTimeline", "\\"),
-            ("window.nextPanel", "Alt+Shift+."),
-            ("window.previousPanel", "Alt+Shift+,"),
-            ("window.closeAll", "Cmd+Shift+W"),
-            ("tool.camera", "C"),
-        ] {
-            assert!(bindings(&app.session).into_iter().any(|x| x.2 == id && Some((x.0, x.1)) == parse_shortcut(keys)), "{id} on {keys}");
-        }
-    }
-
-    #[test]
-    fn timeline_keys_scroll_and_toggle_the_parent_column() {
-        let ctx = egui::Context::default();
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
-        // D and X leave a scroll for the Timeline to do when it is drawn.
-        run(&mut app, "timeline.scrollToTime");
-        assert_eq!(app.ui.timeline.scroll_to, Some(crate::state::ScrollTo::Time));
-        run(&mut app, "timeline.scrollToLayer");
-        assert_eq!(app.ui.timeline.scroll_to, Some(crate::state::ScrollTo::Layer));
-        // Shift+F4 shows and hides the Parent column.
-        let parent = crate::panels::timeline::column_visible(&app.ui.timeline, "parent");
-        run(&mut app, "timeline.parentColumn");
-        assert_eq!(crate::panels::timeline::column_visible(&app.ui.timeline, "parent"), !parent);
-        run(&mut app, "timeline.parentColumn");
-        assert_eq!(crate::panels::timeline::column_visible(&app.ui.timeline, "parent"), parent);
-    }
-
-    #[test]
-    fn viewer_keys_fit_and_step_through_open_comps() {
-        let ctx = egui::Context::default();
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
-        let new = |app: &mut EffectcraftApp, name: &str| app.session.execute("comp.new", json!({"name": name, "duration": 4})).unwrap()["comp"].as_u64();
-        let active = |app: &EffectcraftApp| app.session.state.active_comp.map(|c| c.0);
-        // With one composition open there is nothing to step to.
-        let a = new(&mut app, "A");
-        run(&mut app, "view.nextItem");
-        assert_eq!(active(&app), a);
-        // Shift+, / Shift+.: through the open compositions, wrapping.
-        let b = new(&mut app, "B");
-        assert_eq!(active(&app), b);
-        run(&mut app, "view.nextItem");
-        assert_eq!(active(&app), a);
-        run(&mut app, "view.previousItem");
-        assert_eq!(active(&app), b);
-        // Alt+/ fits the viewer without magnifying past 100 %; Shift+/ fits fully again.
-        app.ui.viewer.zoom = Some(3.0);
-        run(&mut app, "view.fitUpTo100");
-        assert!(app.ui.viewer.zoom.is_none() && app.ui.viewer.fit_up_to_100);
-        run(&mut app, "view.fit");
-        assert!(!app.ui.viewer.fit_up_to_100);
-    }
-
-    #[test]
-    fn panel_keys_switch_cycle_and_close() {
-        let ctx = egui::Context::default();
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
-        for name in ["A", "B"] {
-            app.session.execute("comp.new", json!({"name": name, "duration": 4})).unwrap();
-        }
-        // \\ switches between the Timeline and the Composition viewer.
-        app.ui.focused = PanelKind::Timeline;
-        run(&mut app, "window.toggleCompTimeline");
-        assert_eq!(app.ui.focused, PanelKind::Composition);
-        run(&mut app, "window.toggleCompTimeline");
-        assert_eq!(app.ui.focused, PanelKind::Timeline);
-        // Alt+Shift+. / Alt+Shift+,: the tabs of the focused panel's group, wrapping.
-        let group = app.ui.dock.group_of(PanelKind::Timeline).unwrap().to_vec();
-        assert!(group.len() > 1, "{group:?}");
-        run(&mut app, "window.nextPanel");
-        assert_eq!(app.ui.focused, group[(group.iter().position(|p| *p == PanelKind::Timeline).unwrap() + 1) % group.len()]);
-        run(&mut app, "window.previousPanel");
-        assert_eq!(app.ui.focused, PanelKind::Timeline);
-        // Ctrl+Shift+W with the Timeline active closes every composition.
-        run(&mut app, "window.closeAll");
-        assert!(app.session.state.open_comps.is_empty());
-        // With another panel active it closes that panel.
-        app.show_panel(PanelKind::Project);
-        run(&mut app, "window.closeAll");
-        assert!(!app.ui.dock.contains(PanelKind::Project));
-    }
-
-    #[test]
-    fn c_cycles_the_camera_tools() {
-        let ctx = egui::Context::default();
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.ui.tool = Tool::Selection;
-        let mut seen = vec![];
-        for _ in 0..4 {
-            invoke(&mut app, &ctx, "tool.camera", json!({})).unwrap();
-            seen.push(app.ui.tool);
-        }
-        assert_eq!(seen, [Tool::Orbit, Tool::PanCamera, Tool::Dolly, Tool::Orbit]);
-    }
-
-    #[test]
-    fn dispatch_uses_the_active_custom_preset() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        let find = |app: &EffectcraftApp, id: &str| bindings(&app.session).into_iter().filter(|b| b.2 == id).map(|b| (b.0, b.1)).collect::<Vec<_>>();
-        let (m, k) = parse_shortcut("Cmd+Alt+Shift+Y").unwrap();
-        assert!(find(&app, "layer.newNull").contains(&(m, k)));
-        // A UI command rebound in a custom preset.
-        app.session.execute("shortcuts.set", json!({"command": "tool.hand", "keys": "Ctrl+Alt+H"})).unwrap();
-        assert_eq!(app.session.keymaps.active, "Custom");
-        let (m2, k2) = parse_shortcut("Ctrl+Alt+H").unwrap();
-        assert_eq!(find(&app, "tool.hand"), vec![(m2, k2)]);
-        app.session.execute("shortcuts.set", json!({"command": "layer.newNull", "keys": "F6"})).unwrap();
-        assert_eq!(find(&app, "layer.newNull"), vec![(egui::Modifiers::NONE, egui::Key::F6)]);
-        // The menus show the preset's shortcut.
-        let item = menu_items(&app).into_iter().find(|i| i.id == "layer.newNull").unwrap();
-        assert_eq!(item.shortcut.as_deref(), Some("F6"));
-        // Back to the default preset.
-        app.session.execute("shortcuts.preset", json!({"op": "select", "name": effectcraft_engine::shortcuts::DEFAULT_PRESET})).unwrap();
-        assert!(find(&app, "layer.newNull").contains(&(m, k)));
-    }
-
-    #[test]
-    fn renamed_label_shows_in_the_label_menu() {
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.set_pref("labels.1.name", json!("Sunflower")).unwrap();
-        let labels: Vec<String> = menu_items(&app).into_iter().filter(|i| i.id == "edit.label").map(|i| i.label).collect();
-        assert!(labels.contains(&"Sunflower".to_string()), "{labels:?}");
-        assert!(!labels.contains(&"Yellow".to_string()));
-    }
-
-    /// Saving anything but a project asks the save dialog for that file's extension (#293): the
-    /// project dialog, filtered to `.ecproj`, made macOS append `.ecproj` (`Frame.png.ecproj`).
-    /// Hosts with only the project dialog (the web) still get it, given the file name.
-    #[test]
-    fn save_dialogs_offer_the_file_extension() {
-        use std::cell::RefCell;
-        use std::rc::Rc;
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("comp.new", json!({"name": "A", "width": 64, "height": 36, "frameRate": 30, "duration": 1})).unwrap();
-        let ctx = egui::Context::default();
-        let asked: Rc<RefCell<Vec<String>>> = Rc::default();
-        let (a, b) = (asked.clone(), asked.clone());
-        app.hooks.pick_save = Some(Box::new(move |name: &str| {
-            a.borrow_mut().push(format!("project {name}"));
-            None
-        }));
-        app.hooks.pick_save_file = Some(Box::new(move |name: &str, ext: &str| {
-            b.borrow_mut().push(format!("file {name} [{ext}]"));
-            None
-        }));
-        for id in ["comp.saveFrameAs", "render.saveCurrentPreview", "file.exportLottie", "file.saveCopyAsXml", "file.collectFiles", "file.saveAs"] {
-            invoke(&mut app, &ctx, id, json!({})).unwrap();
-        }
-        assert_eq!(
-            *asked.borrow(),
-            [
-                "file Frame.png [png]",
-                "file Preview.mp4 [mp4]",
-                "file Animation.json [json]",
-                "file Untitled Project.ecprojx [ecprojx]",
-                "file Collected Files []",
-                "project Untitled Project.ecproj",
-            ]
-        );
-        // Without the other dialog, the project one names any file.
-        app.hooks.pick_save_file = None;
-        asked.borrow_mut().clear();
-        invoke(&mut app, &ctx, "comp.saveFrameAs", json!({})).unwrap();
-        assert_eq!(*asked.borrow(), ["project Frame.png"]);
-    }
-
-    /// #511: with a host's non-blocking dialogs, a command's file dialog opens without running
-    /// a nested event loop inside the frame (a drag over the window then aborted the app on
-    /// macOS); the command runs on a later frame with the answer, and a cancelled one not at all.
-    #[test]
-    fn file_dialogs_can_answer_on_a_later_frame() {
-        use std::sync::{Arc, Mutex};
-        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
-        app.session.execute("comp.new", json!({"name": "A", "width": 64, "height": 36, "frameRate": 30, "duration": 1})).unwrap();
-        let ctx = egui::Context::default();
-        app.hooks.pick_save = Some(Box::new(|_: &str| panic!("the blocking dialog is not used")));
-        let pending: Arc<Mutex<Vec<(crate::FileDialog, crate::DialogDone)>>> = Arc::default();
-        let queue = pending.clone();
-        app.hooks.file_dialog_async = Some(Box::new(move |dialog, done| queue.lock().unwrap().push((dialog, done))));
-        assert_eq!(invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap(), json!({"dialog": "file.saveAs"}));
-        let (dialog, done) = pending.lock().unwrap().pop().expect("a dialog was shown");
-        assert_eq!(dialog, crate::FileDialog::Save { default: "Untitled Project.ecproj".into(), ext: "ecproj".into(), project: true });
-        assert!(app.session.path.is_none(), "nothing saved until the dialog answers");
-        let dir = std::env::temp_dir().join(format!("ec-dialog-answer-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let path = dir.join("Answered.ecproj");
-        // Answered from another thread, as the host's dialog does.
-        std::thread::spawn(move || done(vec![path.to_string_lossy().to_string()])).join().unwrap();
-        app.run_dialog_answers();
-        assert_eq!(app.session.path.as_deref(), Some(dir.join("Answered.ecproj").to_string_lossy().as_ref()));
-        assert!(dir.join("Answered.ecproj").is_file());
-        // Cancelled: nothing runs.
-        invoke(&mut app, &ctx, "comp.saveFrameAs", json!({})).unwrap();
-        let (dialog, done) = pending.lock().unwrap().pop().expect("a dialog was shown");
-        assert_eq!(dialog, crate::FileDialog::Save { default: "Frame.png".into(), ext: "png".into(), project: false });
-        done(Vec::new());
-        app.run_dialog_answers();
-        assert!(!dir.join("Frame.png").exists());
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn menu_items_cover_the_tree() {
-        assert_eq!(menus().last(), Some(&"Help"));
-        assert!(effectcraft_engine::menus::entries().len() > 500);
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/menus/bar.rs b/crates/ui-egui/src/menus/bar.rs
new file mode 100644
index 000000000..0610233de
--- /dev/null
+++ b/crates/ui-egui/src/menus/bar.rs
@@ -0,0 +1,290 @@
+use super::entries::{entry_checked, entry_enabled, entry_label, entry_shortcut, menu_choice};
+use super::invoke::invoke;
+use super::shortcuts::shortcut_text;
+use super::{EffectcraftApp, MenuEntry, MenuNode, Value, json};
+
+/// The id under which [`menu_bar`] remembers which of its menus was open at the end of the last
+/// frame (its title's open look, and the hover that switches between the titles).
+fn open_menu_id() -> egui::Id {
+    egui::Id::unique("menu-bar-open")
+}
+
+/// The id under which [`menu_bar`] remembers a title press still in progress (press-and-browse).
+fn browse_menu_id() -> egui::Id {
+    egui::Id::unique("menu-bar-browse")
+}
+
+/// Draw the in-window menu bar (the engine's AE menu tree).
+///
+/// The titles open on the press, not the release (native menu bars): while one is held the menus
+/// can be browsed by moving onto them, and releasing over an entry chooses it. Hovering another
+/// title switches the open menu to it, and the open one closes on a press outside it or when the
+/// window loses focus. The pointer leaving the window — onto the OS title bar, directly above the
+/// bar — closes nothing, however long: the platform forwards none of the title bar's clicks to
+/// egui (only the cursor leaving), so there is no click to close on and a graze must not drop the
+/// menu. The closing press itself still reaches the widget under it, as a click does in After
+/// Effects.
+pub fn menu_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
+    let ctx = ui.ctx().clone();
+    let mut clicked: Option<(String, Value)> = None;
+    let mut nav = crate::menu_keys::Nav::default();
+    // The open menu as of the last frame: the titles are drawn before this frame can open or
+    // close anything, and what happened last frame is what they must react to.
+    let open_prev: Option<usize> = ctx.data(|d| d.get_temp(open_menu_id())).flatten();
+    if ctx.data(|d| d.get_temp(browse_menu_id())).unwrap_or(false) {
+        nav.set_browsing();
+    }
+    let mut drawn = 0;
+    ui.horizontal_centered(|ui| {
+        ui.add_space(6.0);
+        egui::MenuBar::new().config(egui::containers::menu::MenuConfig::new().style(crate::widgets::menu_style)).ui(ui, |ui| {
+            for node in effectcraft_engine::menus::menu_bar() {
+                let MenuNode::Submenu { label, children } = node else { continue };
+                // The open title takes the open button's look while its menu is up (as in AE).
+                let inactive = ui.style().visuals.widgets.inactive;
+                if open_prev == Some(drawn) {
+                    ui.style_mut().visuals.widgets.inactive = ui.style().visuals.widgets.open;
+                }
+                let mut response = ui.add(egui::Button::new(crate::i18n::label(app, "", label)));
+                ui.style_mut().visuals.widgets.inactive = inactive;
+                // A press on a title opens its menu at once (a second press on the open one closes
+                // it), and while it is held the menus below are browsable. The keyboard and the
+                // accessibility activation report `clicked` without the primary button (the press
+                // then happened somewhere else), and toggle the menu. Hovering another title
+                // switches to it once the pointer has moved: merely resting there must not take a
+                // keyboard-driven menu over.
+                let moved = ctx.input(|i| i.pointer.delta() != egui::Vec2::ZERO);
+                // With the button down elsewhere nothing is hovered, so the title under the
+                // pointer takes the highlight by hand: the hover-switch to it shows, one frame
+                // later like egui's own hover (the open title keeps its open look).
+                if moved && response.contains_pointer() && open_prev.is_some_and(|p| p != drawn) {
+                    response = response.highlight();
+                }
+                let pressed = ctx.input(|i| i.pointer.button_pressed(egui::PointerButton::Primary)) && response.hovered();
+                let cmd = if pressed {
+                    nav.set_browsing();
+                    Some(egui::SetOpenCommand::Bool(open_prev != Some(drawn)))
+                } else if response.clicked() && !response.clicked_by(egui::PointerButton::Primary) {
+                    Some(egui::SetOpenCommand::Toggle)
+                } else if moved && response.enabled() && response.contains_pointer() && open_prev.is_some_and(|p| p != drawn) {
+                    Some(egui::SetOpenCommand::Bool(true))
+                } else {
+                    None
+                };
+                let inner = egui::Popup::menu(&response)
+                    .close_behavior(egui::PopupCloseBehavior::IgnoreClicks)
+                    .style(crate::widgets::menu_style)
+                    .open_memory(cmd)
+                    .show(|ui| {
+                        ui.set_min_width(if label == "Effect" { 200.0 } else { 280.0 });
+                        let browsing = nav.browsing();
+                        crate::widgets::menu_scroll(ui, browsing, |ui| menu_nodes(app, ui, children, &mut clicked, &mut nav, 0));
+                    });
+                nav.top(&response);
+                // The titles and the open menus: a press inside them is not an outside press.
+                nav.cover(response.rect);
+                if let Some(inner) = &inner {
+                    nav.cover(inner.response.rect);
+                }
+                app.auto.add(&format!("menu.{label}"), response.rect, label);
+                drawn += 1;
+            }
+        });
+    });
+    crate::menu_keys::handle(&ctx, &nav);
+    // egui leaves the closing to us (`IgnoreClicks`), so the menus close here: at once on a press
+    // outside them (the press itself still reaches the widget below) and when the window loses
+    // focus. The pointer leaving the window closes nothing: moving onto the OS title bar fires
+    // the cursor-left event and the platform forwards none of its clicks to egui, so there is no
+    // click to close on — and a graze or a stay must not drop the menu, as in native apps.
+    if let Some(top) = nav.open_popup(&ctx) {
+        let focus_lost = ctx.input(|i| i.events.iter().any(|e| matches!(e, egui::Event::WindowFocused(false))));
+        let outside_press = ctx.input(|i| i.pointer.any_pressed() && i.pointer.interact_pos().is_some_and(|p| !nav.covers(p)));
+        if focus_lost || outside_press {
+            egui::Popup::close_id(&ctx, top);
+        }
+    }
+    if let Some((id, params)) = clicked.map(|(id, params)| menu_choice(app, id, params))
+        && let Err(e) = invoke(app, &ctx, &id, if params.is_null() { json!({}) } else { params })
+    {
+        app.ui.status = e;
+    }
+    // What the next frame starts from: the open title, and a title press still in progress.
+    let open = nav.open_index(&ctx);
+    let browsing = open.is_some() && nav.browsing() && ctx.input(|i| i.pointer.primary_down());
+    ctx.data_mut(|d| {
+        d.insert_temp(open_menu_id(), open);
+        d.insert_temp(browse_menu_id(), browsing);
+    });
+}
+
+/// The entries of top-level menu `name` (the Effect menu is the Effect Controls panel's context
+/// menu); returns the chosen command and its params.
+pub(crate) fn menu_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, name: &str) -> Option<(String, Value)> {
+    let mut clicked = None;
+    if let Some(MenuNode::Submenu { children, .. }) =
+        effectcraft_engine::menus::menu_bar().iter().find(|n| matches!(n, MenuNode::Submenu { label, .. } if label == name))
+    {
+        menu_nodes(app, ui, children, &mut clicked, &mut crate::menu_keys::Nav::default(), 0);
+    }
+    clicked.map(|(id, params)| (id, if params.is_null() { json!({}) } else { params }))
+}
+
+/// The entries `nodes` of a menu `depth` submenus deep, registered with `nav` for the keyboard.
+fn menu_nodes(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    nodes: &[MenuNode],
+    clicked: &mut Option<(String, Value)>,
+    nav: &mut crate::menu_keys::Nav,
+    depth: usize,
+) {
+    for n in nodes {
+        match n {
+            MenuNode::Separator => {
+                ui.separator();
+            }
+            MenuNode::Dynamic { name } => {
+                // Recent projects / footage / presets, undo history, shortcut slots, viewers,
+                // saved workspaces.
+                let ws = app.ui.workspace.clone();
+                let saved = app.saved_workspace_names();
+                let (entries, empty) = effectcraft_engine::menus::dynamic(&app.session, name, &dyn_ctx(&ws, &saved));
+                if entries.is_empty()
+                    && let Some(e) = empty
+                {
+                    ui.add_enabled(false, egui::Button::new((gutter(false), e)));
+                }
+                for (i, e) in entries.iter().enumerate() {
+                    let tip = match name.as_str() {
+                        "recentProjects" => app.session.prefs.recent_projects.get(i).cloned(),
+                        "recentFootage" => app.session.prefs.recent_footage.get(i).cloned(),
+                        "recentPresets" => app.session.prefs.recent_presets.get(i).cloned(),
+                        "recentScripts" => app.session.prefs.recent_scripts.get(i).map(|r| r.text().to_string()),
+                        _ => None,
+                    };
+                    let r = ui.add_enabled(entry_enabled(app, e), egui::Button::new((gutter(entry_checked(app, e) == Some(true)), e.label.as_str())));
+                    let r = match &tip {
+                        Some(t) => r.on_hover_text(t),
+                        None => r,
+                    };
+                    let r = browse_hover(nav, r);
+                    app.auto.add(&format!("menu.{name}.{i}"), r.rect, &e.label);
+                    nav.entry(ui, depth, &r, false);
+                    if r.clicked() || browse_pick(nav, ui, &r) {
+                        *clicked = Some((e.command.clone(), e.params.clone()));
+                        ui.close();
+                    }
+                }
+            }
+            MenuNode::Submenu { label, children } => {
+                let ws = app.ui.workspace.clone();
+                // The generated Effect menu's category submenus draw the catalog's name (#821);
+                // every other submenu goes through the menu catalog.
+                let shown = crate::i18n::effect_category(children, label)
+                    .unwrap_or_else(|| crate::i18n::submenu(app, label, effectcraft_engine::menus::submenu_label(&app.session, label, &dyn_ctx(&ws, &[]))));
+                let browsing = nav.browsing();
+                let egui::InnerResponse { inner, response } = ui.menu_button((gutter(false), shown.as_str()), |ui| {
+                    ui.set_min_width(if children.len() > 30 { 200.0 } else { 240.0 });
+                    crate::widgets::menu_scroll(ui, browsing, |ui| menu_nodes(app, ui, children, clicked, nav, depth + 1));
+                });
+                let response = browse_hover(nav, response);
+                nav.entry(ui, depth, &response, true);
+                if inner.is_some() {
+                    // `ui.menu_button` drops the popup's own response on the floor: read it back,
+                    // so that a press inside this submenu doesn't count as an outside press.
+                    let sub = egui::containers::menu::SubMenu::id_from_widget_id(response.id);
+                    if let Some(resp) = ui.ctx().read_response(sub) {
+                        nav.cover(resp.rect);
+                    }
+                    nav.opened(depth, &response);
+                }
+            }
+            MenuNode::Item(e) => {
+                let r = browse_hover(nav, menu_entry(app, ui, e));
+                nav.entry(ui, depth, &r, false);
+                if r.clicked() || browse_pick(nav, ui, &r) {
+                    *clicked = Some((e.command.clone(), e.params.clone()));
+                    ui.close();
+                }
+            }
+        }
+    }
+}
+
+/// The row `r` highlighted while the bar is mid press-and-browse: with a button down egui reports
+/// nothing as hovered — which would leave browsing with no hover feedback at all — so the row
+/// under the pointer takes the highlight by hand. It reads as the hover look one frame later,
+/// exactly egui's own hover latency; disabled rows ignore it (`Noninteractive`), as in native
+/// menus. Context menus use their own [`crate::menu_keys::Nav`], where the bar never browses.
+fn browse_hover(nav: &crate::menu_keys::Nav, r: egui::Response) -> egui::Response {
+    if nav.browsing() && r.contains_pointer() { r.highlight() } else { r }
+}
+
+/// Whether a press-and-browse (a menu-bar title still held down) releases over entry `r`, which
+/// then chooses it like a click does. egui reports neither for it: the release is far from the
+/// press, so there is no click, and nothing but the pressed widget is hovered while a button is
+/// down, so the row has to be tested by the pointer being over it.
+fn browse_pick(nav: &crate::menu_keys::Nav, ui: &egui::Ui, r: &egui::Response) -> bool {
+    nav.browsing() && r.enabled() && r.contains_pointer() && ui.input(|i| i.pointer.button_released(egui::PointerButton::Primary))
+}
+
+/// The menu bar's submenu at `path` (`["File", "Interpret Footage"]`) in a panel's context menu,
+/// with the menu bar's labels, shortcuts and enabled state; a chosen entry goes to `clicked`.
+pub(crate) fn submenu_at(app: &mut EffectcraftApp, ui: &mut egui::Ui, path: &[&str], clicked: &mut Option<(String, Value)>) {
+    let mut nodes = effectcraft_engine::menus::menu_bar();
+    let mut found = None;
+    for label in path {
+        let Some(n) = nodes.iter().find(|n| matches!(n, MenuNode::Submenu { label: l, .. } if l == label)) else { return };
+        if let MenuNode::Submenu { children, .. } = n {
+            nodes = children;
+        }
+        found = Some(n);
+    }
+    if let Some(n) = found {
+        menu_nodes(app, ui, std::slice::from_ref(n), clicked, &mut crate::menu_keys::Nav::default(), 0);
+    }
+    if let Some((_, p)) = clicked.as_mut()
+        && p.is_null()
+    {
+        *p = json!({});
+    }
+}
+
+/// The menu bar's entry for `command` in a panel's context menu (see [`submenu_at`]).
+pub(crate) fn entry_for(app: &EffectcraftApp, ui: &mut egui::Ui, command: &str, clicked: &mut Option<(String, Value)>) {
+    if let Some((_, e)) = effectcraft_engine::menus::entries().into_iter().find(|(_, e)| e.command == command)
+        && menu_entry(app, ui, e).clicked()
+    {
+        *clicked = Some((e.command.clone(), e.params_or_empty()));
+        ui.close();
+    }
+}
+
+/// Frontend state for dynamic menus (the current workspace and the saved ones).
+pub(crate) fn dyn_ctx<'a>(workspace: &'a str, saved_workspaces: &'a [String]) -> effectcraft_engine::menus::DynCtx<'a> {
+    effectcraft_engine::menus::DynCtx { workspace: Some(workspace), saved_workspaces }
+}
+
+/// The check-mark column every menu row reserves (like macOS / After Effects menus).
+fn gutter(checked: bool) -> egui::Atom<'static> {
+    use egui::AtomExt;
+    (if checked { "✔" } else { "" }).atom_size(egui::vec2(14.0, 14.0))
+}
+
+fn menu_entry(app: &EffectcraftApp, ui: &mut egui::Ui, e: &MenuEntry) -> egui::Response {
+    let (label, check, enabled) = (entry_label(app, e), gutter(entry_checked(app, e) == Some(true)), entry_enabled(app, e));
+    // Edit ▸ Label's entries show the label's colour before its name.
+    if e.command == "edit.label"
+        && let Some(l) = e.params.get("label").and_then(Value::as_str).and_then(effectcraft_engine::color::Label::from_name)
+    {
+        let out = ui.add_enabled_ui(enabled, |ui| egui::Button::new((check, crate::widgets::label_swatch(), label)).atom_ui(ui)).inner;
+        crate::widgets::paint_label_swatch(ui, &out, l, &app.tokens);
+        return out.response;
+    }
+    let mut b = egui::Button::new((check, label));
+    if let Some(s) = entry_shortcut(app, e) {
+        b = b.shortcut_text(shortcut_text(&s));
+    }
+    ui.add_enabled(enabled, b)
+}
diff --git a/crates/ui-egui/src/menus/commands.rs b/crates/ui-egui/src/menus/commands.rs
new file mode 100644
index 000000000..c162bbd3a
--- /dev/null
+++ b/crates/ui-egui/src/menus/commands.rs
@@ -0,0 +1,122 @@
+use super::UiCommand;
+
+macro_rules! uic {
+    ($id:literal, $label:literal, [$($m:literal),*], $sc:expr) => {
+        UiCommand { id: $id, label: $label, menu: &[$($m),*], shortcut: $sc }
+    };
+}
+
+/// UI-only commands (not in the AE menus; shortcuts and the command palette).
+pub const UI_COMMANDS: &[UiCommand] = &[
+    uic!("window.dockAction", "Docking Action", [], None),
+    uic!("playback.ramPreview", "Preview (Numpad 0)", [], Some("Num0")),
+    uic!("playback.preview.shiftSpacebar", "Preview (Shift+Spacebar)", [], Some("Shift+Space")),
+    uic!("playback.preview.shiftNumpad0", "Preview (Shift+Numpad 0)", [], Some("Shift+Num0")),
+    uic!("playback.preview.altNumpad0", "Preview (Alt+Numpad 0)", [], Some("Alt+Num0")),
+    uic!("playback.stop", "Stop", [], None),
+    uic!("view.fit", "Fit", [], Some("Shift+/")),
+    uic!("view.actualSize", "100%", [], Some("/")),
+    uic!("view.fitUpTo100", "Fit up to 100%", [], Some("Alt+/")),
+    uic!("view.nextItem", "Next Composition in Viewer", [], Some("Shift+.")),
+    uic!("view.previousItem", "Previous Composition in Viewer", [], Some("Shift+,")),
+    uic!("viewer.nudge.up", "Move Selected Layers Up 1 Pixel at Current Magnification", [], Some("ArrowUp")),
+    uic!("viewer.nudge.down", "Move Selected Layers Down 1 Pixel at Current Magnification", [], Some("ArrowDown")),
+    uic!("viewer.nudge.left", "Move Selected Layers Left 1 Pixel at Current Magnification", [], Some("ArrowLeft")),
+    uic!("viewer.nudge.right", "Move Selected Layers Right 1 Pixel at Current Magnification", [], Some("ArrowRight")),
+    uic!("viewer.nudge.up10", "Move Selected Layers Up 10 Pixels at Current Magnification", [], Some("Shift+ArrowUp")),
+    uic!("viewer.nudge.down10", "Move Selected Layers Down 10 Pixels at Current Magnification", [], Some("Shift+ArrowDown")),
+    uic!("viewer.nudge.left10", "Move Selected Layers Left 10 Pixels at Current Magnification", [], Some("Shift+ArrowLeft")),
+    uic!("viewer.nudge.right10", "Move Selected Layers Right 10 Pixels at Current Magnification", [], Some("Shift+ArrowRight")),
+    uic!("view.safeMargins", "Title/Action Safe", [], Some("'")),
+    uic!("view.transparencyGrid", "Transparency Grid", [], None),
+    uic!("view.fastPreviews", "Fast Previews", [], None),
+    uic!("view.theme.toggle", "Next Appearance Mode", [], None),
+    uic!("view.theme.dark", "Theme: Dark", [], None),
+    uic!("view.theme.darker", "Theme: Darker", [], None),
+    uic!("view.theme.light", "Theme: Light", [], None),
+    uic!("timeline.zoomIn", "Zoom In Time", [], Some("=")),
+    uic!("timeline.zoomOut", "Zoom Out Time", [], Some("-")),
+    uic!("timeline.zoomFit", "Zoom to Fit Comp", [], Some("Shift+;")),
+    uic!("timeline.scrollToTime", "Scroll to Current Time", [], Some("D")),
+    uic!("timeline.scrollToLayer", "Scroll Topmost Selected Layer to Top", [], Some("X")),
+    uic!("timeline.parentColumn", "Show/Hide Parent Column", [], Some("Shift+F4")),
+    uic!("timeline.zoomFrameToggle", "Zoom In to Frame Level / Out to the Whole Comp", [], Some(";")),
+    uic!("timeline.graphEditor", "Graph Editor", [], Some("Shift+F3")),
+    uic!("timeline.switchesModes", "Toggle Switches / Modes", [], Some("F4")),
+    uic!("timeline.workAreaBegin", "Set Work Area Begin", [], Some("B")),
+    uic!("timeline.workAreaEnd", "Set Work Area End", [], Some("N")),
+    uic!("timeline.moveInToTime", "Move Layer In Point to Current Time", [], Some("[")),
+    uic!("timeline.moveOutToTime", "Move Layer Out Point to Current Time", [], Some("]")),
+    uic!("timeline.trimInToTime", "Trim Layer In Point to Current Time", [], Some("Alt+[")),
+    uic!("timeline.trimOutToTime", "Trim Layer Out Point to Current Time", [], Some("Alt+]")),
+    uic!("timeline.reveal.position", "Reveal Position", [], Some("P")),
+    uic!("timeline.reveal.scale", "Reveal Scale", [], Some("S")),
+    uic!("timeline.reveal.rotation", "Reveal Rotation", [], Some("R")),
+    uic!("timeline.reveal.opacity", "Reveal Opacity", [], Some("T")),
+    uic!("timeline.reveal.anchor", "Reveal Anchor Point", [], Some("A")),
+    uic!("timeline.reveal.effects", "Reveal Effects", [], Some("E")),
+    uic!("timeline.reveal.masks", "Reveal Masks", [], Some("M")),
+    uic!("timeline.reveal.feather", "Reveal Mask Feather", [], Some("F")),
+    uic!("timeline.reveal.levels", "Reveal Audio Levels (press twice: Waveform)", [], Some("L")),
+    uic!("timeline.reveal.timeRemap", "Reveal Time Remap", [], None),
+    uic!("timeline.reveal.expressions", "Reveal Expressions", [], None),
+    uic!("timeline.reveal.maskOpacity", "Reveal Mask Opacity", [], None),
+    uic!("timeline.reveal.maskPath", "Reveal Mask Path", [], None),
+    uic!("timeline.reveal.material", "Reveal Material Options", [], None),
+    uic!("timeline.reveal.paint", "Reveal Paint, Roto Brush and Puppet", [], None),
+    uic!("timeline.reveal.selected", "Reveal Selected Properties", [], None),
+    uic!("timeline.reveal.missingEffects", "Reveal Missing Effects", [], None),
+    uic!("timeline.reveal.waveform", "Reveal Audio Waveform", [], None),
+    uic!("timeline.revealAdd.position", "Add Position to Revealed Properties", [], Some("Shift+P")),
+    uic!("timeline.revealAdd.scale", "Add Scale to Revealed Properties", [], Some("Shift+S")),
+    uic!("timeline.revealAdd.rotation", "Add Rotation to Revealed Properties", [], Some("Shift+R")),
+    uic!("timeline.revealAdd.opacity", "Add Opacity to Revealed Properties", [], Some("Shift+T")),
+    uic!("timeline.revealAdd.anchor", "Add Anchor Point to Revealed Properties", [], Some("Shift+A")),
+    uic!("timeline.revealAdd.effects", "Add Effects to Revealed Properties", [], Some("Shift+E")),
+    uic!("timeline.revealAdd.masks", "Add Masks to Revealed Properties", [], Some("Shift+M")),
+    uic!("timeline.revealAdd.feather", "Add Mask Feather to Revealed Properties", [], Some("Shift+F")),
+    uic!("timeline.revealAdd.levels", "Add Audio Levels to Revealed Properties", [], Some("Shift+L")),
+    uic!("timeline.revealAdd.animated", "Add Animated Properties to Revealed Properties", [], Some("Shift+U")),
+    uic!("timeline.column", "Show/Hide Timeline Column", [], None),
+    uic!("timeline.sourceName", "Source Name / Layer Name", [], None),
+    uic!("timeline.search", "Search Timeline", [], None),
+    uic!("flowchart.options", "Flowchart Options", [], None),
+    uic!("flowchart.graph", "Flowchart Graph", [], None),
+    uic!("timeline.collapseAll", "Collapse All", [], None),
+    uic!("timeline.twirlSelected", "Twirl Selected Layers Open / Closed", [], Some("Cmd+`")),
+    uic!("timeline.keyAt.anchor", "Add or Remove Anchor Point Keyframe", [], Some("Alt+Shift+A")),
+    uic!("timeline.keyAt.position", "Add or Remove Position Keyframe", [], Some("Alt+Shift+P")),
+    uic!("timeline.keyAt.scale", "Add or Remove Scale Keyframe", [], Some("Alt+Shift+S")),
+    uic!("timeline.keyAt.rotation", "Add or Remove Rotation Keyframe", [], Some("Alt+Shift+R")),
+    uic!("timeline.keyAt.opacity", "Add or Remove Opacity Keyframe", [], Some("Alt+Shift+T")),
+    uic!("tool.selection", "Selection Tool", [], Some("V")),
+    uic!("tool.hand", "Hand Tool", [], Some("H")),
+    uic!("tool.zoom", "Zoom Tool", [], Some("Z")),
+    uic!("tool.orbit", "Orbit Tool", [], Some("1")),
+    uic!("tool.panCamera", "Pan Camera Tool", [], Some("2")),
+    uic!("tool.dolly", "Dolly Tool", [], Some("3")),
+    uic!("tool.camera", "Camera Tools", [], Some("C")),
+    uic!("tool.rotate", "Rotation Tool", [], Some("W")),
+    uic!("tool.panBehind", "Pan Behind Tool", [], Some("Y")),
+    uic!("tool.shape", "Shape Tools", [], Some("Q")),
+    uic!("tool.pen", "Pen Tool", [], Some("G")),
+    uic!("tool.type", "Type Tools", [], Some("Cmd+T")),
+    uic!("tool.brush", "Brush Tools", [], Some("Cmd+B")),
+    uic!("tool.rotoBrush", "Roto Brush & Refine Edge Tools", [], Some("Alt+W")),
+    uic!("tool.puppet", "Puppet Tools", [], Some("Cmd+P")),
+    uic!("app.newComp", "New Composition...", [], None),
+    uic!("app.compSettings", "Composition Settings...", [], None),
+    uic!("app.solidSettings", "New Solid...", [], None),
+    uic!("app.home", "Home", [], None),
+    uic!("markers.dialog", "Marker Settings...", [], None),
+    uic!("window.maximizePanel", "Maximize Panel Under Pointer", [], Some("`")),
+    uic!("window.maximizeApp", "Maximize or Restore Application Window", [], Some("Cmd+\\")),
+    uic!("window.toggleCompTimeline", "Switch Between Composition and Timeline Panel", [], Some("\\")),
+    uic!("window.nextPanel", "Next Panel in Frame", [], Some("Alt+Shift+.")),
+    uic!("window.previousPanel", "Previous Panel in Frame", [], Some("Alt+Shift+,")),
+    uic!("window.closeAll", "Close Panel or All Viewers", [], Some("Cmd+Shift+W")),
+    uic!("window.dockPanel", "Dock Panel", [], None),
+    uic!("window.floatPanel", "Undock Panel", [], None),
+    uic!("window.closePanel", "Close Panel", [], None),
+    uic!("window.panelWindow", "Move Panel to New Window", [], None),
+];
diff --git a/crates/ui-egui/src/menus/entries.rs b/crates/ui-egui/src/menus/entries.rs
new file mode 100644
index 000000000..8fee44a72
--- /dev/null
+++ b/crates/ui-egui/src/menus/entries.rs
@@ -0,0 +1,147 @@
+use super::*;
+
+/// A menu entry for display / `ui.menu.list`.
+#[derive(Clone, Debug, serde::Serialize)]
+pub struct MenuItem {
+    pub id: String,
+    pub label: String,
+    pub path: Vec<String>,
+    pub shortcut: Option<String>,
+    pub enabled: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub checked: Option<bool>,
+    /// Parameters bound to the entry (e.g. the effect for Effect menu items).
+    #[serde(skip_serializing_if = "Value::is_null")]
+    pub params: Value,
+}
+
+/// Top-level menus in order.
+pub fn menus() -> Vec<&'static str> {
+    effectcraft_engine::menus::top_level()
+}
+
+pub(crate) fn entry_label(app: &EffectcraftApp, e: &MenuEntry) -> String {
+    let shown = match e.command.as_str() {
+        "edit.undo" => app.session.history.undo.last().map(|u| format!("Undo {}", u.0)).unwrap_or_else(|| "Can't Undo".into()),
+        "edit.redo" => app.session.history.redo.last().map(|u| format!("Redo {}", u.0)).unwrap_or_else(|| "Can't Redo".into()),
+        // Window ▸ Layer: the layer open in the Layer panel.
+        "window.panel" if e.params.get("panel").and_then(Value::as_str) == Some("layer") => {
+            let name = app
+                .ui
+                .layer_panel
+                .and_then(|id| app.session.active_comp().and_then(|c| c.layer(effectcraft_engine::project::LayerId(id))))
+                .map(|l| l.name.clone());
+            format!("Layer: {}", name.unwrap_or_else(|| "(none)".into()))
+        }
+        _ => effectcraft_engine::menus::entry_label(&app.session, e),
+    };
+    crate::i18n::entry(app, e, shown)
+}
+
+/// The entry's shortcut in the active keyboard shortcut preset.
+pub(crate) fn entry_shortcut(app: &EffectcraftApp, e: &MenuEntry) -> Option<String> {
+    app.session.shortcuts().shortcut_of(&e.command, &e.params).map(str::to_string)
+}
+
+/// Whether panel `p` is on screen: the front tab of a floating window, or of a docked group
+/// (an open frame in a stack) that a maximized panel does not cover.
+pub(crate) fn panel_shown(app: &EffectcraftApp, p: PanelKind) -> bool {
+    if app.ui.dock.is_floating(p) {
+        return app.ui.dock.is_visible(p);
+    }
+    match app.ui.maximized.filter(|m| app.ui.dock.is_docked(*m)) {
+        Some(m) => m == p,
+        None => app.ui.dock.is_visible(p),
+    }
+}
+
+/// The command a menu entry runs when chosen from a menu: Window ▸ `<panel>` closes a panel whose
+/// entry is checked, as in After Effects (#1630). Shortcuts and agents calling `window.panel`
+/// still only show the panel.
+pub(crate) fn menu_choice(app: &EffectcraftApp, id: String, params: Value) -> (String, Value) {
+    if id == "window.panel"
+        && let Some(p) = params.get("panel").and_then(Value::as_str).and_then(PanelKind::from_name)
+        && panel_shown(app, p)
+    {
+        return ("window.closePanel".into(), params);
+    }
+    (id, params)
+}
+
+/// Check-mark state of frontend toggles (engine state is answered by the engine).
+pub(crate) fn entry_checked(app: &EffectcraftApp, e: &MenuEntry) -> Option<bool> {
+    let v = &app.ui.viewer;
+    let pstr = |k: &str| e.params.get(k).and_then(Value::as_str);
+    match e.command.as_str() {
+        "view.rulers" => Some(v.rulers),
+        "view.guides" => Some(v.guides),
+        "view.snapToGuides" => Some(v.snap_guides),
+        "view.lockGuides" => Some(v.lock_guides),
+        "view.grid" => Some(v.grid),
+        "view.snapToGrid" => Some(v.snap_grid),
+        "view.layerControls" => Some(v.show_layer_controls),
+        "playback.cacheWhenIdle" => Some(app.ui.cache_when_idle),
+        "playback.audio" => Some(app.session.prefs.preview.active().include_audio),
+        "window.workspace" => Some(pstr("name").is_some_and(|n| n == app.ui.workspace)),
+        // The Tools panel is the header toolbar: always on screen.
+        "window.panel" => Some(pstr("panel").is_some_and(|n| n.eq_ignore_ascii_case("tools") || PanelKind::from_name(n).is_some_and(|p| panel_shown(app, p)))),
+        "view.panelBackground" if e.params.get("pick").is_none() => {
+            let cur = match v.pasteboard {
+                None => "mediumGray",
+                Some([0, 0, 0]) => "black",
+                Some([0x2a, 0x2a, 0x2a]) => "darkGray",
+                Some([0xb4, 0xb4, 0xb4]) => "lightGray",
+                Some([0xff, 0xff, 0xff]) => "white",
+                Some(_) => "custom",
+            };
+            Some(pstr("color") == Some(cur))
+        }
+        _ => effectcraft_engine::menus::checked(&app.session, &e.command, &e.params),
+    }
+}
+
+pub(crate) fn entry_enabled(app: &EffectcraftApp, e: &MenuEntry) -> bool {
+    // The Project-panel enabled rules mirror the invoke redirects, so they stand down for the
+    // same reason (see the redirect block): while a text edit is open the menu items must be
+    // enabled by what their routed command can do, or the menu grays out commands that work.
+    if app.ui.focused == PanelKind::Project && app.session.state.text_edit.is_none() {
+        match e.command.as_str() {
+            "edit.duplicate" => {
+                return !app.session.state.project_selection.is_empty()
+                    && app.session.state.project_selection.iter().all(|id| app.session.project.item(*id).is_some_and(|i| !i.is_folder()));
+            }
+            "edit.selectAll" => return !app.session.project.items.is_empty(),
+            "edit.deselectAll" => return !app.session.state.project_selection.is_empty(),
+            "edit.cut" | "edit.copy" | "edit.paste" | "edit.copyWithPropertyLinks" | "edit.copyWithRelativePropertyLinks" | "edit.copyExpressionOnly" => {
+                return false;
+            }
+            _ => {}
+        }
+    }
+    if e.command == "edit.clear" && app.ui.focused == PanelKind::Project {
+        return app.session.is_enabled("project.delete");
+    }
+    if e.command == "edit.clear" && app.ui.focused == PanelKind::RenderQueue {
+        return !app.session.is_rendering() && !app.session.project.render_queue.is_empty();
+    }
+    if e.command == "window.panel" {
+        return true;
+    }
+    app.session.is_enabled(&e.command)
+}
+
+/// Every menu entry, flattened with its submenu path.
+pub fn menu_items(app: &EffectcraftApp) -> Vec<MenuItem> {
+    effectcraft_engine::menus::entries()
+        .into_iter()
+        .map(|(path, e)| MenuItem {
+            id: e.command.clone(),
+            label: entry_label(app, e),
+            path,
+            shortcut: entry_shortcut(app, e),
+            enabled: entry_enabled(app, e),
+            checked: entry_checked(app, e),
+            params: e.params.clone(),
+        })
+        .collect()
+}
diff --git a/crates/ui-egui/src/menus/frontend.rs b/crates/ui-egui/src/menus/frontend.rs
new file mode 100644
index 000000000..047c576a5
--- /dev/null
+++ b/crates/ui-egui/src/menus/frontend.rs
@@ -0,0 +1,684 @@
+use super::{EffectcraftApp, PanelKind, Resolution, Value, json};
+
+/// Run an engine command and perform the frontend events it emitted right away.
+/// Commands that fill the internal clipboard.
+const COPY_COMMANDS: &[&str] =
+    &["edit.copy", "edit.cut", "edit.copyWithPropertyLinks", "edit.copyWithRelativePropertyLinks", "edit.copyExpressionOnly", "keys.copy", "effect.copy"];
+
+/// A line for the system clipboard naming what EffectCraft copied. The system clipboard must
+/// hold something: with nothing on it, the windowing layer sends no paste event for Ctrl+V.
+fn clipboard_note(s: &effectcraft_engine::Session) -> String {
+    let st = &s.state;
+    let n = |n: usize, one: &str, many: &str| format!("EffectCraft: {n} {}", if n == 1 { one } else { many });
+    if st.clip_is_keys && !st.key_clipboard.is_empty() {
+        n(st.key_clipboard.iter().map(|c| c.keys.len()).sum(), "keyframe", "keyframes")
+    } else if !st.effect_clipboard.is_empty() {
+        n(st.effect_clipboard.len(), "effect", "effects")
+    } else if !st.contents_clipboard.is_empty() {
+        n(st.contents_clipboard.len(), "shape item", "shape items")
+    } else if st.link_clipboard.is_some() {
+        "EffectCraft: property links".into()
+    } else {
+        n(st.clipboard.len(), "layer", "layers")
+    }
+}
+
+pub(crate) fn run_engine(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: Value) -> Result<Value, String> {
+    // Events already queued belong to earlier invocations (`engine.execute` defers them).
+    let queued = app.session.events.len();
+    let mut r = app.session.execute(id, params).map_err(|e| e.to_string());
+    if let Err(e) = &r {
+        app.ui.status = e.clone();
+    } else if COPY_COMMANDS.contains(&id) && app.session.state.text_edit.is_none() {
+        ctx.copy_text(clipboard_note(&app.session));
+    }
+    let events = app.session.drain_events();
+    for (index, ev) in events.into_iter().enumerate() {
+        match ev {
+            effectcraft_engine::Event::Frontend { command, params } => {
+                if let Err(e) = frontend(app, ctx, &command, params) {
+                    app.ui.status = e.clone();
+                    // A frontend-only command's own failure is the command's result (#696: a
+                    // workspace save that didn't reach disk reported success). An earlier
+                    // invocation's failure only sets the status.
+                    if index >= queued && command == id && r.is_ok() {
+                        r = Err(e);
+                    }
+                }
+            }
+            other => app.session.events.push(other),
+        }
+    }
+    r
+}
+
+fn toggle(slot: &mut bool, p: &Value) -> Value {
+    *slot = p.get("value").and_then(Value::as_bool).unwrap_or(!*slot);
+    json!(*slot)
+}
+
+/// Perform a frontend command (from `Event::Frontend`).
+pub fn frontend(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, p: Value) -> Result<Value, String> {
+    let now = app.now();
+    let v = &mut app.ui.viewer;
+    Ok(match id {
+        "mediaBrowser.copySourcePath" => {
+            let path = p.get("path").and_then(Value::as_str).filter(|path| !path.is_empty()).ok_or("A source path is required")?;
+            ctx.copy_text(path.to_string());
+            json!({"path": path})
+        }
+        "effects.copyPresetsFolderPath" => {
+            if cfg!(target_arch = "wasm32") {
+                return Err("The web app has no local presets folder".into());
+            }
+            let path = crate::panels::effects_presets::presets_dir().filter(|path| !path.as_os_str().is_empty()).ok_or("No presets folder is configured")?;
+            let path = std::path::absolute(path).map_err(|e| format!("Cannot resolve the presets folder path: {e}"))?;
+            let path = path.to_str().ok_or("The presets folder path is not valid UTF-8")?;
+            ctx.copy_text(path.to_string());
+            json!({"path": path})
+        }
+        "app.checkForUpdates" | "help.checkForUpdates" => {
+            crate::updates_ui::check(app);
+            Value::Null
+        }
+        "app.about" => {
+            app.dialog = Some(crate::Dialog::About);
+            Value::Null
+        }
+        // Window ▸ <ScriptUI panel>: dock (or bring forward) the panel the script built.
+        // Audio scrubbing: one frame of audio at `time` (default the current time).
+        "playback.scrubAudio" => {
+            let cid = app.session.active_comp_id().ok_or("no composition")?;
+            let t = p.get("time").and_then(Value::as_f64).map_or(app.session.time(), effectcraft_engine::time::Tick::from_seconds_f64);
+            app.scrub_audio(cid, t, now);
+            json!({"playing": app.scrub.is_some()})
+        }
+        // View ▸ New Viewer.
+        "view.newViewer" => json!({"viewer": crate::panels::viewers::new_viewer(app)}),
+        // Reveal Layer Source / Reveal Composition: show the Project panel on the item, opening
+        // its folders and clearing the search so the row is visible.
+        "project.reveal" => {
+            let ids: Vec<effectcraft_engine::project::ItemId> = p
+                .get("items")
+                .and_then(Value::as_array)
+                .map(|items| items.iter().filter_map(Value::as_u64).map(effectcraft_engine::project::ItemId).collect())
+                .or_else(|| p.get("item").and_then(Value::as_u64).map(|item| vec![effectcraft_engine::project::ItemId(item)]))
+                .unwrap_or_default();
+            crate::panels::project::reveal(app, ctx, &ids);
+            json!({"items": ids.iter().map(|item| item.0).collect::<Vec<_>>()})
+        }
+        // Run by id (control channel, MCP): the Project panel's selection, whatever has focus.
+        "project.deleteWithoutConfirmation" => crate::panels::delete_items::delete_confirmed(app, ctx, json!({}))?,
+        // A gradient property's "Edit Gradient…" (the Timeline's value): the Gradient Editor.
+        "prop.editGradient" => crate::panels::gradient_editor::open(app, &p)?,
+        "window.scriptPanel" => {
+            let id = p.get("window").and_then(Value::as_u64).ok_or("no ScriptUI panel window")? as u32;
+            app.show_panel(PanelKind::ScriptPanel(id));
+            json!({"window": id})
+        }
+        "layer.style.options" => {
+            crate::panels::layer_styles_dialog::open(app, &p)?;
+            Value::Null
+        }
+        "app.settings" => {
+            let page = p.get("page").and_then(Value::as_str).unwrap_or("general");
+            crate::panels::settings::open(app, effectcraft_engine::prefs::page_id(page).unwrap_or("general"));
+            Value::Null
+        }
+        "app.gpuInfo" => {
+            crate::panels::dialogs::info(
+                app,
+                "GPU Information",
+                &format!(
+                    "{}Layer cache: {} MB  •  Preview cache: {} MB.",
+                    effectcraft_engine::sysinfo::gpu_summary(&app.session),
+                    app.session.layer_cache.budget() >> 20,
+                    app.frames.budget() >> 20
+                ),
+            );
+            Value::Null
+        }
+        "app.hide" | "app.hideOthers" | "app.showAll" => {
+            // The desktop app asks macOS (NSApplication hide / hideOtherApplications /
+            // unhideAllApplications); elsewhere Hide minimizes and the others don't apply.
+            if app.hooks.app_action.as_ref().is_some_and(|f| f(id)) {
+                return Ok(Value::Null);
+            }
+            match id {
+                "app.hide" => ctx.send_viewport_cmd(egui::ViewportCommand::Minimized(true)),
+                _ => return Err(format!("`{id}` is only available on macOS")),
+            }
+            Value::Null
+        }
+        "app.quit" => {
+            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
+            Value::Null
+        }
+        "app.commandPalette" => {
+            app.dialog_state.palette_query = p.get("query").and_then(Value::as_str).unwrap_or_default().to_string();
+            app.dialog_state.palette_sel = 0;
+            app.dialog = Some(crate::Dialog::CommandPalette);
+            Value::Null
+        }
+        "app.keyboardShortcuts" => {
+            crate::panels::shortcut_editor::open(app);
+            Value::Null
+        }
+        "app.templates" => {
+            let kind = p.get("kind").and_then(Value::as_str).unwrap_or("renderSettings");
+            crate::panels::rq_templates::open(app, ctx, kind);
+            Value::Null
+        }
+        "renderQueue.notify" => {
+            // Render finished with Notify on: a toast, the dock/taskbar attention request, and the
+            // host's system sound (the desktop app handles `renderQueue.notify`).
+            let msg = p.get("message").and_then(Value::as_str).unwrap_or("Render finished").to_string();
+            app.toast = Some((msg, now));
+            ctx.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(egui::UserAttentionType::Informational));
+            if let Some(f) = app.hooks.app_action.as_ref() {
+                f("renderQueue.notify");
+            }
+            Value::Null
+        }
+        "app.find" => {
+            if let Some(q) = p.get("query").and_then(Value::as_str) {
+                app.ui.project_search = q.to_string();
+            }
+            app.show_panel(PanelKind::Project);
+            Value::Null
+        }
+        "playback.toggle" => {
+            // The play button and Spacebar: `{shortcut?}` picks which Preview panel shortcut's
+            // options to play with (default Spacebar).
+            let sc = match p.get("shortcut").and_then(Value::as_str) {
+                Some(k) => effectcraft_engine::preview::PreviewShortcut::parse(k).ok_or_else(|| format!("unknown preview shortcut `{k}`"))?,
+                None => effectcraft_engine::preview::PreviewShortcut::Spacebar,
+            };
+            app.toggle_play_with(now, sc);
+            json!({"playing": app.playback.playing, "shortcut": sc.id()})
+        }
+        "playback.cacheWhenIdle" => {
+            let r = toggle(&mut app.ui.cache_when_idle, &p);
+            app.set_pref("previews.cacheFramesWhenIdle", r.clone())?;
+            r
+        }
+        "playback.audio" => {
+            // Include Audio of the shortcut shown in the Preview panel.
+            let mut on = app.session.prefs.preview.active().include_audio;
+            let r = toggle(&mut on, &p);
+            app.session.execute("playback.settings.set", json!({"includeAudio": on})).map_err(|e| e.to_string())?;
+            if !on {
+                app.audio = None;
+            }
+            r
+        }
+        // Zoom In / Zoom Out act on the focused viewer: the Layer panel when it has focus, else
+        // the Composition viewer.
+        "view.zoomIn" | "view.zoomOut" if app.ui.focused == PanelKind::Layer => {
+            let cur = app.ui.layer_zoom.unwrap_or_else(|| crate::panels::layer_panel::last_fit(ctx));
+            // The Layer panel zooms in points (pixels-per-point 1).
+            let next = zoom_step(cur, 1.0, id == "view.zoomIn");
+            app.ui.layer_zoom = Some(next);
+            json!({"zoom": next, "panel": "layer"})
+        }
+        "view.zoomIn" | "view.zoomOut" => {
+            let ppp = ctx.pixels_per_point();
+            let cur = v.zoom.unwrap_or_else(|| crate::panels::viewer::last_fit(ctx));
+            let next = zoom_step(cur, ppp, id == "view.zoomIn");
+            v.zoom = Some(next);
+            json!({"zoom": next})
+        }
+        // View ▸ Resolution ▸ Custom without a factor (the engine sets the comp's resolution).
+        "view.res.custom" => {
+            let cur = match app.viewer_res() {
+                Resolution::Custom(n) => f64::from(n),
+                _ => 2.0,
+            };
+            crate::panels::dialogs::form(
+                app,
+                "Custom Resolution",
+                "view.res.custom",
+                json!({}),
+                vec![crate::panels::dialogs::Field::num("factor", "Render every n-th pixel", cur)],
+            );
+            Value::Null
+        }
+        "view.rulers" => toggle(&mut v.rulers, &p),
+        "view.guides" => toggle(&mut v.guides, &p),
+        "view.snapToGuides" => toggle(&mut v.snap_guides, &p),
+        "view.lockGuides" => toggle(&mut v.lock_guides, &p),
+        "view.grid" => toggle(&mut v.grid, &p),
+        "view.snapToGrid" => toggle(&mut v.snap_grid, &p),
+        "view.layerControls" => toggle(&mut v.show_layer_controls, &p),
+        "view.options" => {
+            app.dialog = Some(crate::Dialog::ViewOptions);
+            Value::Null
+        }
+        "view.panelBackground" => {
+            if p.get("pick").and_then(Value::as_bool) == Some(true) {
+                let [r, g, b] = v.custom_pasteboard;
+                crate::panels::dialogs::form(
+                    app,
+                    "Panel Background Color",
+                    "view.panelBackground",
+                    json!({}),
+                    vec![crate::panels::dialogs::Field::text("color", "Color (#rrggbb)", &format!("#{r:02x}{g:02x}{b:02x}"))],
+                );
+                return Ok(Value::Null);
+            }
+            let c = p.get("color").and_then(Value::as_str).unwrap_or("mediumGray");
+            v.pasteboard = match c {
+                "black" => Some([0, 0, 0]),
+                "darkGray" => Some([0x2a, 0x2a, 0x2a]),
+                "mediumGray" => None,
+                "lightGray" => Some([0xb4, 0xb4, 0xb4]),
+                "white" => Some([0xff, 0xff, 0xff]),
+                "custom" => Some(v.custom_pasteboard),
+                hex => {
+                    let c = effectcraft_engine::color::Rgba::from_hex(hex).ok_or_else(|| format!("unknown colour `{hex}`"))?;
+                    let rgb = [(c.r * 255.0).round() as u8, (c.g * 255.0).round() as u8, (c.b * 255.0).round() as u8];
+                    v.custom_pasteboard = rgb;
+                    Some(rgb)
+                }
+            };
+            Value::Null
+        }
+        // Ctrl+\ / Cmd+\, as in After Effects (#336): `{maximized}`, the window's new state.
+        "window.maximizeApp" => {
+            let maximized = !ctx.input(|i| i.viewport().maximized.unwrap_or(false));
+            ctx.send_viewport_cmd(egui::ViewportCommand::Maximized(maximized));
+            json!({"maximized": maximized})
+        }
+        "view.fullScreen" => {
+            let full = ctx.input(|i| i.viewport().fullscreen.unwrap_or(false));
+            ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!full));
+            json!(!full)
+        }
+        "window.panel" => {
+            let name = p.get("panel").and_then(Value::as_str).unwrap_or_default();
+            if name.eq_ignore_ascii_case("tools") {
+                app.ui.status = "The Tools panel is the toolbar in the header".into();
+                return Ok(Value::Null);
+            }
+            let panel = PanelKind::from_name(name).ok_or_else(|| format!("unknown panel `{name}`"))?;
+            app.show_panel(panel);
+            Value::Null
+        }
+        "window.workspace" => {
+            let want = p.get("name").and_then(Value::as_str).unwrap_or("Default").to_ascii_lowercase().replace(' ', "");
+            let name = app
+                .workspace_names()
+                .into_iter()
+                .find(|w| w.to_ascii_lowercase().replace(' ', "") == want)
+                .ok_or_else(|| format!("unknown workspace `{want}`"))?;
+            app.set_workspace(&name);
+            json!({"workspace": name})
+        }
+        "window.resetWorkspace" => {
+            let name = app.ui.workspace.clone();
+            app.set_workspace(&name);
+            Value::Null
+        }
+        "window.saveWorkspace" => {
+            let name = app.ui.workspace.clone();
+            app.ui.saved_workspaces.insert(name.clone(), app.ui.dock.clone());
+            app.store_saved_workspaces()?;
+            json!({"workspace": name})
+        }
+        "window.saveWorkspaceAs" => {
+            let Some(name) = p.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()).map(str::to_string) else {
+                crate::panels::dialogs::form(
+                    app,
+                    "New Workspace",
+                    "window.saveWorkspaceAs",
+                    json!({}),
+                    vec![crate::panels::dialogs::Field::text("name", "Name", "Untitled Workspace")],
+                );
+                return Ok(Value::Null);
+            };
+            app.ui.saved_workspaces.insert(name.clone(), app.ui.dock.clone());
+            app.ui.workspace = name.clone();
+            app.store_saved_workspaces()?;
+            json!({"workspace": name})
+        }
+        "window.editWorkspaces" => {
+            let Some(name) = p.get("name").and_then(Value::as_str).map(str::to_string) else {
+                let cur = app.ui.workspace.clone();
+                crate::panels::dialogs::form(
+                    app,
+                    "Edit Workspaces",
+                    "window.editWorkspaces",
+                    json!({}),
+                    vec![
+                        crate::panels::dialogs::Field::text("name", "Workspace", &cur),
+                        crate::panels::dialogs::Field::text("rename", "Rename to", &cur),
+                        crate::panels::dialogs::Field::bool("delete", "Delete", false),
+                    ],
+                );
+                return Ok(Value::Null);
+            };
+            let builtin = crate::dock::WORKSPACES.contains(&name.as_str());
+            if p.get("delete").and_then(Value::as_bool) == Some(true) {
+                if app.ui.saved_workspaces.remove(&name).is_none() && !builtin {
+                    return Err(format!("no workspace `{name}`"));
+                }
+                // Leave the deleted workspace first: a current workspace needs a definition.
+                if app.ui.workspace == name {
+                    app.set_workspace("Default");
+                }
+                app.store_saved_workspaces()?;
+                return Ok(json!({"deleted": name}));
+            }
+            if let Some(new) = p.get("rename").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty() && *n != name) {
+                if builtin {
+                    return Err(format!("`{name}` is a built-in workspace: save it as a new workspace instead"));
+                }
+                let dock = app.ui.saved_workspaces.remove(&name).ok_or_else(|| format!("no workspace `{name}`"))?;
+                app.ui.saved_workspaces.insert(new.to_string(), dock);
+                if app.ui.workspace == name {
+                    app.ui.workspace = new.to_string();
+                }
+                app.store_saved_workspaces()?;
+                return Ok(json!({"renamed": new}));
+            }
+            json!({"workspaces": app.workspace_names()})
+        }
+        "view.lookAt" => {
+            let r: Vec<f64> = p.get("rect").and_then(Value::as_array).map(|a| a.iter().filter_map(Value::as_f64).collect()).unwrap_or_default();
+            if r.len() == 4 {
+                let map: Option<crate::panels::viewer::ViewerMap> = ctx.data(|d| d.get_temp(egui::Id::unique("viewer-map")));
+                if let Some(m) = map {
+                    let (rw, rh) = (((r[2] - r[0]) as f32).max(1.0), ((r[3] - r[1]) as f32).max(1.0));
+                    let zoom = ((m.area.width() - 40.0) / rw).min((m.area.height() - 40.0) / rh).clamp(0.015, 32.0);
+                    let rc = [(r[0] + r[2]) as f32 / 2.0, (r[1] + r[3]) as f32 / 2.0];
+                    let v = &mut app.ui.viewer;
+                    v.zoom = Some(zoom);
+                    v.pan = [m.comp[0] * zoom / 2.0 - rc[0] * zoom, m.comp[1] * zoom / 2.0 - rc[1] * zoom];
+                }
+            }
+            Value::Null
+        }
+        "comp.flowchart" => {
+            // Chart the active comp; Layer ▸ Reveal ▸ Reveal Layer in Project Flowchart shows
+            // layers and selects the layer's node.
+            app.ui.flowchart.root = app.session.active_comp_id().map(|c| c.0);
+            if let (Some(c), Some(l)) = (app.session.active_comp_id(), app.session.state.selected_layers.first()) {
+                app.ui.flowchart.layers = true;
+                app.ui.flowchart.selected = Some(format!("layer:{}:{}", c.0, l.0));
+            }
+            app.show_panel(PanelKind::Flowchart);
+            Value::Null
+        }
+        "comp.miniFlowchart" => {
+            let at = ctx.input(|i| i.pointer.hover_pos()).unwrap_or_else(|| ctx.content_rect().center());
+            app.ui.mini_flowchart = Some([at.x, at.y]);
+            Value::Null
+        }
+        "track.editTargetDialog" => {
+            crate::panels::tracker::open_target(app)?;
+            Value::Null
+        }
+        "track.optionsDialog" => {
+            crate::panels::tracker::open_options(app)?;
+            Value::Null
+        }
+        "layer.openLayer" => {
+            let id = p.get("layer").and_then(Value::as_u64).or_else(|| app.session.state.selected_layers.first().map(|l| l.0));
+            // Another layer opens at Fit.
+            if id != app.ui.layer_panel {
+                app.ui.layer_zoom = None;
+                app.ui.layer_pan = [0.0, 0.0];
+            }
+            app.ui.layer_panel = id;
+            app.ui.layer_view = None;
+            app.show_panel(PanelKind::Layer);
+            Value::Null
+        }
+        "app.confirmExecute" => {
+            // Settings ▸ Scripting ▸ Warn User When Executing Files.
+            let path = p.get("path").and_then(Value::as_str).unwrap_or_default().to_string();
+            crate::panels::forms::form(
+                app,
+                "A script wants to open a file",
+                "file.executeFile",
+                json!({"path": path, "confirmed": true}),
+                vec![crate::panels::forms::Field::text("path", "Open", &path)],
+            );
+            Value::Null
+        }
+        "app.showReport" => {
+            let title = p.get("title").and_then(Value::as_str).unwrap_or("Report").to_string();
+            let text = p.get("text").and_then(Value::as_str).unwrap_or_default().to_string();
+            crate::panels::dialogs::info(app, &title, &text);
+            Value::Null
+        }
+        "window.assignWorkspaceShortcut" => {
+            let mut q = p.clone();
+            q["workspace"] = json!(app.ui.workspace);
+            return run_engine(app, ctx, "window.assignWorkspaceShortcut", q);
+        }
+        "file.interpretFootage" => {
+            // Import ▸ Interpret Unlabeled Alpha As: Ask User.
+            if let Some(i) = p.get("item").and_then(Value::as_u64) {
+                app.session.state.project_selection = vec![effectcraft_engine::project::ItemId(i)];
+            }
+            crate::panels::dialogs::open_form(app, "file.interpretFootage", &json!({}));
+            Value::Null
+        }
+        // Help ▸ In-App Tutorials: the Home screen's Learn tab.
+        "help.inAppTutorials" => {
+            app.ui.start_screen = true;
+            app.ui.home_learn = true;
+            app.ui.home_templates = false;
+            Value::Null
+        }
+        // File ▸ New ▸ New Project from Template…: the Home screen's Templates tab.
+        "file.newFromTemplate" => {
+            app.ui.start_screen = true;
+            app.ui.home_learn = false;
+            app.ui.home_templates = true;
+            Value::Null
+        }
+        "effect.manage" | "anim.browsePresets" => {
+            app.show_panel(PanelKind::EffectsPresets);
+            Value::Null
+        }
+        "timeline.revealProps" => {
+            let props = p.get("props").and_then(Value::as_array).cloned().unwrap_or_default();
+            let uids = |k: &str| -> Vec<u64> { props.iter().filter_map(|x| x.get(k).and_then(Value::as_u64)).collect() };
+            let (found, with_props) = (uids("prop"), uids("layer"));
+            // The layers it looked at (`layers`), else those it found something on. Layers that
+            // have nothing to show close; the others' reveals stay.
+            let targets: Vec<u64> = match p.get("layers").and_then(Value::as_array) {
+                Some(l) => l.iter().filter_map(Value::as_u64).collect(),
+                None => with_props.clone(),
+            };
+            // The targets' earlier picks go (U after UU shows the keyframed ones only).
+            let comp = app.session.active_comp_arc();
+            let theirs = |u: u64| {
+                comp.as_ref().is_some_and(|c| {
+                    targets
+                        .iter()
+                        .filter_map(|l| c.layer(effectcraft_engine::project::LayerId(*l)))
+                        .any(|l| l.props.find(u).is_some() || l.props.find_group(u).is_some())
+                })
+            };
+            let tl = &mut app.ui.timeline;
+            tl.reveal_props.retain(|u| !theirs(*u));
+            tl.reveal_props.extend(found.iter().copied());
+            let (shown, hidden): (Vec<u64>, Vec<u64>) = targets.into_iter().partition(|l| with_props.contains(l));
+            tl.apply_reveal(&hidden, vec![]);
+            if !shown.is_empty() {
+                tl.apply_reveal(&shown, vec!["props".into()]);
+            }
+            // Properties inside effects (puppet pins…) show under their effect, twirled open.
+            for (layer, prop) in props.iter().filter_map(|x| Some((x.get("layer")?.as_u64()?, x.get("prop")?.as_u64()?))) {
+                crate::panels::timeline::open_effect_paths(app, layer, &[prop]);
+            }
+            json!({"revealed": found.len()})
+        }
+        _ => return Err(format!("`{id}` is not a frontend command")),
+    })
+}
+
+/// Commands that need a file or folder path: ask the host's file dialog when `params` lacks one.
+pub(super) fn file_dialog(app: &mut EffectcraftApp, id: &str, params: &Value) -> Option<Result<Value, String>> {
+    enum Ask {
+        Folder,
+        Import,
+        OpenProject,
+        Save(&'static str),
+        Open(&'static [&'static str]),
+    }
+    let (key, ask) = match id {
+        "file.import" | "file.importMultiple" => ("paths", Ask::Import),
+        "file.open" => ("path", Ask::OpenProject),
+        "file.save" if app.session.path.is_none() => ("path", Ask::Save("Untitled Project.ecproj")),
+        "file.saveAs" | "file.saveCopy" => ("path", Ask::Save("Untitled Project.ecproj")),
+        "comp.saveFrameAs" => ("path", Ask::Save("Frame.png")),
+        "comp.saveFrameAsPsd" => ("path", Ask::Save("Frame.psd")),
+        "comp.saveFrameAsExr" => ("path", Ask::Save("Frame.exr")),
+        "file.watchFolder" if params.get("stop").is_none() => ("folder", Ask::Save("Watch Folder")),
+        "anim.savePreset" => ("path", Ask::Save("Preset.ecpreset")),
+        "anim.applyPreset" => ("path", Ask::Open(&["ecpreset", "json"])),
+        "view.exportGuides" => ("path", Ask::Save("Guides.json")),
+        "view.importGuides" => ("path", Ask::Open(&["json"])),
+        "file.exportLottie" => ("path", Ask::Save("Animation.json")),
+        "file.importLottie" => ("path", Ask::Open(&["json", "lottie"])),
+        "file.importProject" => ("path", Ask::Open(&["ecproj", "ecprojx"])),
+        "file.importTimeline" => ("path", Ask::Open(&["xml", "fcpxml", "otio", "edl", "aaf", "omf"])),
+        "render.saveCurrentPreview" => ("path", Ask::Save("Preview.mp4")),
+        "file.runScript" if params.get("name").is_none() && params.get("recent").is_none() => ("path", Ask::Open(&["jsx", "js", "jsonl", "json", "txt"])),
+        "file.installScript" | "file.installScriptUIPanel" => ("path", Ask::Open(&["jsx", "js"])),
+        "effect.plugins.load" if params.get("folder").is_none() => ("path", Ask::Open(&["wasm", "wat"])),
+        "file.replaceFootage" => ("path", Ask::Import),
+        "file.relinkFootage" => ("folder", Ask::Folder),
+        "file.collectFiles" => ("folder", Ask::Save("Collected Files")),
+        "file.saveCopyAsXml" => ("path", Ask::Save("Untitled Project.ecprojx")),
+        "keys.rpfCameraImport" => ("path", Ask::Open(&["json", "csv", "txt"])),
+        "essential.exportTemplate" => ("path", Ask::Save("Template.ectemplate")),
+        "essential.importTemplate" => ("path", Ask::Open(&["ectemplate"])),
+        "file.setProxy" => {
+            ("path", Ask::Open(&["mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "tga", "exr"]))
+        }
+        _ => return None,
+    };
+    if params.get(key).is_some()
+        || params.get("path").is_some()
+        || params.get("paths").is_some()
+        || params.get("steps").is_some()
+        || params.get("preset").is_some()
+    {
+        return None;
+    }
+    const MEDIA: &[&str] = &[
+        "mp4", "mov", "m4v", "mkv", "webm", "mxf", "png", "jpg", "jpeg", "gif", "webp", "tif", "tiff", "bmp", "exr", "dpx", "cin", "wav", "aif", "aiff", "mp3",
+        "flac", "ogg", "opus", "svg", "pdf", "ai", "eps", "psd", "psb", "tga", "hdr", "gltf", "glb", "obj", "stl", "fbx", "json", "csv", "tsv",
+    ];
+    // A host whose blocking dialogs are unsafe inside this frame shows the dialog without
+    // blocking — macOS: the nested event loop re-entered winit's handler on a drag over the
+    // window and aborted the app (#511); Linux: the desktop portal's answer never gets pumped,
+    // so the compositor marks the window as not responding (#1275) — and the command continues
+    // when the answer arrives.
+    if let Some(spawn) = app.hooks.file_dialog_async.as_ref() {
+        let request = match ask {
+            Ask::Folder => crate::FileDialog::Folder,
+            Ask::Import => crate::FileDialog::Open { exts: MEDIA.iter().map(|e| e.to_string()).collect(), many: key == "paths" },
+            Ask::OpenProject => crate::FileDialog::OpenProject,
+            Ask::Open(exts) => crate::FileDialog::Open { exts: exts.iter().map(|e| e.to_string()).collect(), many: false },
+            Ask::Save(default) => crate::FileDialog::save(default),
+        };
+        let tx = app.dialog_answers.0.clone();
+        let answer = crate::DialogAnswer { command: id.to_string(), key, params: params.clone(), paths: Vec::new() };
+        app.file_dialogs.opened();
+        spawn(
+            request,
+            Box::new(move |paths| {
+                let _ = tx.send(crate::DialogAnswer { paths, ..answer });
+            }),
+        );
+        return Some(Ok(json!({"dialog": id})));
+    }
+    let picked: Option<Value> = match ask {
+        Ask::Folder => {
+            let Some(f) = app.hooks.pick_folder.as_ref() else { return Some(Err("no folder dialog available (pass `folder`)".into())) };
+            f().map(Value::from)
+        }
+        Ask::Import => {
+            let Some(f) = app.hooks.pick_files.as_ref() else { return Some(Err("no file dialog available (pass `paths`)".into())) };
+            picked_value(key, f(MEDIA))
+        }
+        Ask::OpenProject => {
+            let Some(f) = app.hooks.pick_open_project.as_ref() else { return Some(Err("no file dialog available (pass `path`)".into())) };
+            f().map(|s| json!(s))
+        }
+        Ask::Open(exts) => {
+            let Some(f) = app.hooks.pick_files.as_ref() else { return Some(Err("no file dialog available (pass `path`)".into())) };
+            f(exts).first().map(|s| json!(s))
+        }
+        Ask::Save(default) => {
+            let Some(picked) = app.hooks.save_dialog(default) else { return Some(Err("no file dialog available (pass `path`)".into())) };
+            picked.map(|s| json!(s))
+        }
+    };
+    let Some(v) = picked else { return Some(Ok(Value::Null)) };
+    Some(run_with_picked(app, id, key, params, v))
+}
+
+/// The dialog's answer as the command's `key` parameter (`None`: cancelled).
+fn picked_value(key: &str, paths: Vec<String>) -> Option<Value> {
+    match (paths.is_empty(), key) {
+        (true, _) => None,
+        (false, "paths") => Some(json!(paths)),
+        (false, _) => paths.into_iter().next().map(Value::from),
+    }
+}
+
+/// A file dialog shown without blocking ([`crate::Hooks::file_dialog_async`]) answered: run its
+/// command with the picked path (nothing when it was cancelled).
+pub(crate) fn dialog_answered(app: &mut EffectcraftApp, answer: crate::DialogAnswer) {
+    let Some(v) = picked_value(answer.key, answer.paths) else { return };
+    if let Err(e) = run_with_picked(app, &answer.command, answer.key, &answer.params, v) {
+        app.ui.status = e;
+    }
+}
+
+/// Run command `id` with the path picked for it in parameter `key`.
+fn run_with_picked(app: &mut EffectcraftApp, id: &str, key: &str, params: &Value, v: Value) -> Result<Value, String> {
+    let mut p = params.as_object().cloned().unwrap_or_default();
+    p.insert(key.to_string(), v);
+    // Picked files import in the background, with the Importing card showing progress (#270).
+    if matches!(id, "file.import" | "file.importMultiple") {
+        p.insert("background".into(), Value::Bool(true));
+    }
+    // Photoshop files ask how to import them first; numbered stills whether to import them as an
+    // image sequence.
+    let picked = Value::Object(p.clone());
+    if id == "file.import" && crate::panels::dialogs::open_form(app, id, &picked)
+        || matches!(id, "file.import" | "file.importMultiple") && crate::panels::forms::open_import_sequence(app, &picked)
+    {
+        return Ok(json!({"dialog": id}));
+    }
+    // Save (untitled) becomes Save As.
+    let id = if id == "file.save" { "file.saveAs" } else { id };
+    let r = app.session.execute(id, Value::Object(p)).map_err(|e| e.to_string());
+    if let Err(e) = &r {
+        app.ui.status = e.clone();
+    }
+    r
+}
+
+/// View ▸ Zoom In / Zoom Out: the next standard magnification (as a share of screen pixels, so
+/// 100 % is one comp pixel per screen pixel at any display scaling) above or below `cur`, which is
+/// in points per comp pixel like the result (#882).
+pub(super) fn zoom_step(cur: f32, ppp: f32, zoom_in: bool) -> f32 {
+    const STEPS: [f32; 16] = [0.015, 0.03, 0.0625, 0.125, 0.25, 0.333, 0.5, 0.66, 1.0, 1.5, 2.0, 3.0, 4.0, 8.0, 16.0, 32.0];
+    let ppp = if ppp.is_finite() && ppp > 0.0 { ppp } else { 1.0 };
+    let shown = cur * ppp;
+    let next = if zoom_in {
+        STEPS.iter().copied().find(|s| *s > shown + 1e-3).unwrap_or(32.0)
+    } else {
+        STEPS.iter().rev().copied().find(|s| *s < shown - 1e-3).unwrap_or(0.015)
+    };
+    next / ppp
+}
diff --git a/crates/ui-egui/src/menus/invoke.rs b/crates/ui-egui/src/menus/invoke.rs
new file mode 100644
index 000000000..b266623f3
--- /dev/null
+++ b/crates/ui-egui/src/menus/invoke.rs
@@ -0,0 +1,692 @@
+use super::frontend::{file_dialog, frontend, run_engine};
+use super::shortcuts::system_paste_id;
+use super::*;
+
+pub fn panel_command_id(p: PanelKind) -> String {
+    format!("window.panel.{}", p.id())
+}
+
+/// The reveal shortcuts (P, S, R, T, A, E, M, F, L…). `add` (Shift+key) adds the property to
+/// (or removes it from) those already revealed instead of replacing them.
+pub fn reveal(app: &mut EffectcraftApp, kind: &str, now: f64, add: bool) {
+    // The double-press shortcuts: the same key again within 0.6 s reveals its second set (LL
+    // Waveform, TT Mask Opacity, MM all mask properties, EE Expressions, RR Time Remap, AA
+    // Material Options, PP paint / Roto Brush / Puppet, SS selected properties, FF missing
+    // effects). A single M shows Mask Path.
+    let double = |k: &str| -> Option<&'static str> {
+        Some(match k {
+            "levels" => "waveform",
+            "opacity" => "maskOpacity",
+            "masks" => "masks",
+            "effects" => "expressions",
+            "rotation" => "timeRemap",
+            "anchor" => "material",
+            "position" => "paint",
+            "scale" => "selected",
+            "feather" => "missingEffects",
+            _ => return None,
+        })
+    };
+    let pressed = kind;
+    // (With Shift a second press removes the property again instead.)
+    let again = !add && matches!(app.last_reveal.take(), Some((k, t)) if k == pressed && now - t < 0.6);
+    app.last_reveal = Some((if again { String::new() } else { pressed.to_string() }, now));
+    let kind = match (again, double(pressed)) {
+        (true, Some(d)) => {
+            // The second press replaces what the first one revealed.
+            let first = if pressed == "masks" { "maskPath" } else { pressed };
+            app.ui.timeline.reveal.retain(|k| k != first);
+            d
+        }
+        _ if pressed == "masks" => "maskPath",
+        _ => pressed,
+    };
+    let targets = reveal_targets(app);
+    let tl = &mut app.ui.timeline;
+    let present = tl.reveal.iter().any(|k| k == kind);
+    let mut kinds = tl.reveal.clone();
+    if add {
+        if present {
+            kinds.retain(|k| k != kind);
+        } else {
+            kinds.retain(|k| k != "props" || !tl.reveal_props.is_empty());
+            kinds.push(kind.to_string());
+        }
+    } else if present && kinds.len() == 1 {
+        kinds.clear();
+    } else {
+        kinds = vec![kind.to_string()];
+    }
+    tl.apply_reveal(&targets, kinds.clone());
+    crate::panels::timeline::open_revealed(app, &targets, &kinds);
+}
+
+/// Show Time Remap on the layers of a `layer.enableTimeRemap` (`layers` by id, else the
+/// selected ones) that have it now.
+fn reveal_time_remap(app: &mut EffectcraftApp, params: &Value) {
+    let asked: Vec<u64> = match params.get("layers").and_then(Value::as_array) {
+        Some(a) => a.iter().filter_map(Value::as_u64).collect(),
+        None => app.session.state.selected_layers.iter().map(|l| l.0).collect(),
+    };
+    let Some(comp) = app.session.active_comp() else { return };
+    let layers: Vec<u64> = comp.layers.iter().filter(|l| asked.contains(&l.id.0) && l.props.get("timeRemap").is_some()).map(|l| l.id.0).collect();
+    if !layers.is_empty() {
+        app.ui.timeline.apply_reveal(&layers, vec!["timeRemap".into()]);
+    }
+}
+
+/// After Alt+Shift+P (A, S, R, T) the Timeline shows the property on each layer it keyed, as in
+/// After Effects: added to what a reveal shortcut shows, else with the layer's Transform twirled
+/// open, else alone like P.
+fn reveal_keyed(app: &mut EffectcraftApp, keyed: &Value, kind: &str) {
+    let layers: std::collections::BTreeSet<u64> = keyed.as_array().into_iter().flatten().filter_map(|k| k.get("layer").and_then(Value::as_u64)).collect();
+    let Some(comp) = app.session.active_comp() else { return };
+    let tl = &mut app.ui.timeline;
+    for id in layers {
+        let shown = tl.layer_reveal.get(&id).filter(|k| !k.is_empty()).cloned();
+        match shown {
+            Some(mut kinds) => {
+                if !kinds.iter().any(|k| k == kind) {
+                    kinds.push(kind.to_string());
+                    tl.layer_reveal.insert(id, kinds);
+                }
+            }
+            None if tl.open_layers.contains(&id) => {
+                if let Some(tr) = comp.layer(effectcraft_engine::project::LayerId(id)).and_then(|l| l.transform()) {
+                    tl.open_groups.insert(tr.uid);
+                }
+            }
+            None => {
+                tl.open_layers.insert(id);
+                tl.layer_reveal.insert(id, vec![kind.to_string()]);
+            }
+        }
+    }
+}
+
+/// The layers a reveal shortcut acts on: the selected ones, else every layer of the active comp.
+fn reveal_targets(app: &EffectcraftApp) -> Vec<u64> {
+    if app.session.state.selected_layers.is_empty() {
+        app.session.active_comp().map(|c| c.layers.iter().map(|l| l.id.0).collect()).unwrap_or_default()
+    } else {
+        app.session.state.selected_layers.iter().map(|l| l.0).collect()
+    }
+}
+
+/// The arrow keys nudge the selected layers 1 pixel at the viewer's magnification (`up`,
+/// `down`, `left`, `right`), 10 with Shift (`up10`…), as After Effects does, so zoomed in
+/// they move by fractions of a comp pixel. From any panel except Project (which owns the
+/// arrow keys for its own keyboard navigation, #961); not while typing, with a dialog or
+/// menu open. With mask points selected the arrows move the points instead (#1288).
+fn nudge(app: &mut EffectcraftApp, ctx: &egui::Context, dir: &str) -> Result<Value, String> {
+    let (side, n) = match dir.strip_suffix("10") {
+        Some(side) => (side, 10.0),
+        None => (dir, 1.0),
+    };
+    let (x, y) = match side {
+        "up" => (0.0, -n),
+        "down" => (0.0, n),
+        "left" => (-n, 0.0),
+        "right" => (n, 0.0),
+        _ => return Err(format!("unknown nudge `{dir}`")),
+    };
+    let st = &app.session.state;
+    if app.ui.focused == PanelKind::Project || (st.selected_layers.is_empty() && st.selected_vertices.is_empty()) || st.text_edit.is_some() {
+        return Ok(Value::Null);
+    }
+    // Screen pixels per comp pixel.
+    let zoom = (app.ui.viewer.zoom.unwrap_or_else(|| crate::panels::viewer::last_fit(ctx)) * ctx.pixels_per_point()) as f64;
+    let k = if zoom.is_finite() && zoom > 1e-6 { 1.0 / zoom } else { 1.0 };
+    if let Some(layer) = st.selected_vertices.first().map(|v| v.layer) {
+        let d = vertex_delta(app, layer, [x * k, y * k]);
+        return run_engine(app, ctx, "mask.moveVertices", json!({"delta": d}));
+    }
+    run_engine(app, ctx, "layer.nudge", json!({"x": x * k, "y": y * k}))
+}
+
+/// A comp-space step `d` in the layer space of `layer`, where mask points live. Like a drag of
+/// the points in the viewer, every selected point takes the first one's layer space.
+fn vertex_delta(app: &EffectcraftApp, layer: effectcraft_engine::project::LayerId, d: [f64; 2]) -> [f64; 2] {
+    use effectcraft_engine::geom::vec2;
+    let s = &app.session;
+    let (Some(cid), Some(comp)) = (s.active_comp_id(), s.active_comp()) else { return d };
+    let Some(l) = comp.layer(layer) else { return d };
+    let ectx = effectcraft_engine::render::EvalCtx { project: &s.project, comp_id: cid, comp, time: s.time(), expr: s.expr.as_deref(), footage: None };
+    let (l2c, _) = crate::panels::viewer::l2c(&ectx, l);
+    l2c.inverse().map_or(d, |inv| {
+        let v = inv.apply_vec(vec2(d[0], d[1]));
+        [v.x, v.y]
+    })
+}
+
+fn no_params(p: &Value) -> bool {
+    p.as_object().is_none_or(|m| m.is_empty())
+}
+
+/// `{"comp": id}` and nothing else: Composition Settings opens on that comp instead of
+/// applying no settings to it.
+fn only_comp(p: &Value) -> Option<effectcraft_engine::project::ItemId> {
+    let m = p.as_object().filter(|m| m.len() == 1)?;
+    m.get("comp")?.as_u64().map(effectcraft_engine::project::ItemId)
+}
+
+/// Execute a UI or engine command by id.
+pub fn invoke(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str, params: Value) -> Result<Value, String> {
+    if matches!(id, "effects.copyPresetsFolderPath" | "mediaBrowser.copySourcePath") {
+        return frontend(app, ctx, id, params);
+    }
+    // Layer ▸ New ▸ Text (menu, shortcut, context menus) puts an insertion point in the centre of
+    // the comp, as After Effects does, so typing goes into Source Text rather than running
+    // shortcuts (#866). `engine.execute` keeps the headless default.
+    if id == "layer.newText" && no_params(&params) {
+        return run_engine(app, ctx, id, json!({"text": "", "edit": true}));
+    }
+    // A new folder (File ▸ New, its shortcut, the Project panel's button and context menu) opens
+    // with its name ready to type, as in After Effects (#1658). The command selects it.
+    // `engine.execute` keeps the headless default.
+    if id == "project.newFolder" && no_params(&params) {
+        let r = run_engine(app, ctx, id, params);
+        if r.is_ok() {
+            app.show_panel(PanelKind::Project);
+            crate::panels::project::begin_rename(app, ctx);
+        }
+        return r;
+    }
+    // The Project-panel focus redirects apply only while no text edit is open: creating a text
+    // layer leaves focus on Project while the insertion point lives in the comp, so during an
+    // edit these commands address the text context — redirected, Deselect All would clear a
+    // project selection the user is not looking at and silently swallow the edit's own end.
+    if no_params(&params) && app.ui.focused == PanelKind::Project && app.session.state.text_edit.is_none() {
+        match id {
+            "edit.duplicate" => return run_engine(app, ctx, "project.duplicate", json!({})),
+            "edit.selectAll" => {
+                let items: Vec<u64> = crate::panels::project::visible_rows(app)
+                    .into_iter()
+                    .filter(|(id, _)| app.ui.project_search.is_empty() || app.session.project.item(*id).is_some_and(|it| !it.is_folder()))
+                    .map(|(id, _)| id.0)
+                    .collect();
+                return run_engine(app, ctx, "project.select", json!({"items":items}));
+            }
+            "edit.deselectAll" => return run_engine(app, ctx, "project.select", json!({"items":[]})),
+            "edit.cut" | "edit.copy" | "edit.paste" | "edit.copyWithPropertyLinks" | "edit.copyWithRelativePropertyLinks" | "edit.copyExpressionOnly" => {
+                return Err("Project clipboard actions are not supported yet".into());
+            }
+            _ => {}
+        }
+    }
+    // Edit ▸ Paste with SVG markup on the system clipboard pastes it as a shape layer (After
+    // Effects 26.3). Copying in the app replaces the system clipboard with a note naming what
+    // was copied, so SVG there was copied after anything copied in the app.
+    if id == "edit.paste" && no_params(&params) && app.session.state.text_edit.is_none() {
+        let text = ctx.data_mut(|d| d.remove_temp::<String>(system_paste_id())).or_else(|| app.hooks.clipboard_text.as_ref().and_then(|f| f()));
+        if let Some(svg) = text.filter(|t| effectcraft_engine::vector::is_svg_text(t)) {
+            return run_engine(app, ctx, "edit.pasteSvg", json!({"svg": svg}));
+        }
+    }
+    // Clear follows panel focus, including the Edit menu and keyboard shortcut.
+    if id == "edit.clear" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::Project {
+        // Through `invoke`, so deleting items that compositions use still asks first (M3.16).
+        return invoke(app, ctx, "project.delete", json!({}));
+    }
+    if id == "edit.clear" && params.as_object().is_some_and(|p| p.is_empty()) && app.ui.focused == PanelKind::RenderQueue {
+        let selected = ctx.data(|d| d.get_temp::<(Vec<u64>, Option<u64>)>(egui::Id::unique("rq-ui"))).and_then(|(_, id)| id);
+        return match selected {
+            Some(item) => run_engine(app, ctx, "renderQueue.remove", json!({"item": item})),
+            None => Err("select a Render Queue item first".into()),
+        };
+    }
+    // Shift+Delete deletes the Project panel's selection without asking; it does nothing in the
+    // other panels.
+    if id == "project.deleteWithoutConfirmation" {
+        if app.ui.focused != PanelKind::Project {
+            return Ok(Value::Null);
+        }
+        return crate::panels::delete_items::delete_confirmed(app, ctx, json!({}));
+    }
+    let now = app.now();
+    // Closing a modified project asks to save it first; the command runs once answered.
+    if crate::panels::unsaved::guard(app, id, &params) {
+        return Ok(json!({"dialog": "unsavedChanges"}));
+    }
+    // Deleting Project items that compositions use asks first, as in After Effects.
+    if crate::panels::delete_items::guard(app, id, &params) {
+        return Ok(json!({"dialog": "deleteItems"}));
+    }
+    // J / K and Select All Keyframes act on what the Timeline shows (its revealed properties).
+    if matches!(id, "time.nextKey" | "time.previousKey" | "keys.selectAll")
+        && ["visible", "layers", "layer", "prop"].iter().all(|k| params.get(*k).is_none())
+        && let Some(c) = app.session.active_comp_arc()
+    {
+        let mut p = if params.is_object() { params.clone() } else { json!({}) };
+        p["visible"] = json!(crate::panels::timeline::visible_props(app, &c));
+        return run_engine(app, ctx, id, p);
+    }
+    // New Camera/Light and Camera/Light Settings without parameters open their dialogs.
+    if crate::panels::dialogs_3d::route(app, id, &params)? {
+        return Ok(Value::Null);
+    }
+    // New 3D Primitive without parameters opens its dialog.
+    if crate::panels::primitive_dialog::route(app, id, &params)? {
+        return Ok(Value::Null);
+    }
+    // Layer Settings on a solid, adjustment layer or null opens its settings dialog.
+    if crate::panels::dialogs::route_layer_settings(app, id, &params)? {
+        return Ok(Value::Null);
+    }
+    // Layer ▸ Layer Styles ▸ <style> from the menu adds the style and opens the dialog on it.
+    if crate::panels::layer_styles_dialog::route(app, id, &params)? {
+        return Ok(Value::Null);
+    }
+    // Shared docking: `window.dockAction`, craft-ui's `window.panel.*` commands, `ui.dock`,
+    // `ui.dock.reset` and `window.panelWindow`.
+    if let Some(result) = crate::dock_ui::route(app, ctx, id, &params) {
+        return result;
+    }
+    // Legacy per-panel / per-workspace ids (`window.panel.Project`, `window.workspace.default`).
+    if let Some(rest) = id.strip_prefix("window.panel.") {
+        return frontend(app, ctx, "window.panel", json!({"panel": rest}));
+    }
+    if let Some(ws) = id.strip_prefix("window.workspace.") {
+        if ws == "reset" {
+            return frontend(app, ctx, "window.resetWorkspace", json!({}));
+        }
+        return frontend(app, ctx, "window.workspace", json!({"name": ws}));
+    }
+    if let Some(t) = id.strip_prefix("tool.") {
+        // C cycles through the camera tools.
+        if t == "camera" {
+            let tools = [Tool::Orbit, Tool::PanCamera, Tool::Dolly];
+            let next = match tools.iter().position(|x| *x == app.ui.tool) {
+                Some(i) => tools[(i + 1) % tools.len()],
+                None => Tool::Orbit,
+            };
+            app.ui.tool = next;
+            return Ok(json!({"tool": next}));
+        }
+        // Slot shortcuts cycle through the slot's tools.
+        let slot = match t {
+            "shape" => Some(8),
+            "pen" => Some(9),
+            "type" => Some(10),
+            "brush" => Some(11),
+            "rotoBrush" => Some(14),
+            "puppet" => Some(15),
+            _ => None,
+        };
+        if let Some(si) = slot {
+            let tools: Vec<Tool> = match si {
+                11 => vec![Tool::Brush, Tool::Clone, Tool::Eraser],
+                _ => crate::state::Tool::SLOTS[si].to_vec(),
+            };
+            let cur = tools.iter().position(|x| *x == app.ui.tool);
+            let next = match cur {
+                Some(i) => tools[(i + 1) % tools.len()],
+                None => app.ui.slot_tools.get(si).copied().filter(|x| tools.contains(x)).unwrap_or(tools[0]),
+            };
+            app.ui.tool = next;
+            if si < app.ui.slot_tools.len() && si != 11 {
+                app.ui.slot_tools[si] = next;
+            }
+            return Ok(json!({"tool": next}));
+        }
+        let tool = Tool::from_name(t).ok_or_else(|| format!("unknown tool `{t}`"))?;
+        app.ui.tool = tool;
+        return Ok(json!({"tool": tool}));
+    }
+    if let Some(dir) = id.strip_prefix("viewer.nudge.") {
+        return nudge(app, ctx, dir);
+    }
+    if let Some(k) = id.strip_prefix("timeline.reveal.") {
+        if k == "animated" {
+            return run_engine(app, ctx, "anim.reveal", json!({"kind": "keyframes"}));
+        }
+        reveal(app, k, now, false);
+        return Ok(Value::Null);
+    }
+    if let Some(k) = id.strip_prefix("timeline.keyAt.") {
+        let r = run_engine(app, ctx, "keys.toggleTransform", json!({"prop": k}))?;
+        reveal_keyed(app, &r, k);
+        return Ok(r);
+    }
+    if let Some(k) = id.strip_prefix("timeline.revealAdd.") {
+        reveal(app, k, now, true);
+        return Ok(json!({"revealed": app.ui.timeline.reveal}));
+    }
+    // U reveals keyframed properties; UU (pressed twice quickly) all modified properties; U
+    // again later hides them.
+    if id == "anim.reveal" && params.get("kind").and_then(Value::as_str) == Some("keyframes") {
+        let last = app.last_reveal.take();
+        app.last_reveal = Some(("keyframes".into(), now));
+        match last {
+            Some((k, t)) if k == "keyframes" && now - t < 0.6 => {
+                return run_engine(app, ctx, "anim.reveal", json!({"kind": "modified"}));
+            }
+            Some((k, _)) if k == "keyframes" && app.ui.timeline.reveal == ["props"] => {
+                let targets = reveal_targets(app);
+                app.ui.timeline.apply_reveal(&targets, vec![]);
+                return Ok(json!({"revealed": 0}));
+            }
+            _ => {}
+        }
+    }
+    // A UI-only command (not in the engine's menus), so `frontend` gets it from here.
+    if id == "window.maximizeApp" {
+        return frontend(app, ctx, id, params);
+    }
+    // Docking: {panel, anchor, zone: center|left|right|top|bottom}, {panel, rect?}, {panel?}.
+    if let Some(op) = id.strip_prefix("window.").filter(|o| matches!(*o, "maximizePanel" | "dockPanel" | "floatPanel" | "closePanel")) {
+        let panel_of = |k: &str| params.get(k).and_then(Value::as_str).map(|s| PanelKind::from_name(s).ok_or(format!("unknown panel `{s}`")));
+        match op {
+            "maximizePanel" => {
+                let p = match panel_of("panel") {
+                    Some(p) => p?,
+                    None => app.panel_at(ctx.pointer_hover_pos()),
+                };
+                app.toggle_maximize(p);
+                return Ok(json!({"maximized": app.ui.maximized}));
+            }
+            "closePanel" => {
+                let p = panel_of("panel").ok_or("closePanel: need `panel`")??;
+                if app.ui.dock.is_open(p) {
+                    app.apply_dock(craft_ui::docking::Action::Close { panel: p })?;
+                }
+                return Ok(Value::Null);
+            }
+            "floatPanel" => {
+                let p = panel_of("panel").ok_or("floatPanel: need `panel`")??;
+                let r = match params.get("rect") {
+                    Some(value) => serde_json::from_value::<[f32; 4]>(value.clone()).map_err(|_| "rect must contain four finite numbers")?,
+                    None => crate::dock_ui::default_float_rect(ctx.content_rect()),
+                };
+                app.apply_dock(craft_ui::docking::Action::Float { panel: p, rect: r }).map_err(|e| format!("can't undock {}: {e}", p.title()))?;
+                return Ok(Value::Null);
+            }
+            _ => {
+                // craft-ui's `window.panel.dock`: zones center/tab, left/right/top/bottom (a split
+                // beside the anchor), above/below; without an anchor a side zone docks along that
+                // edge of the whole workspace.
+                let p = panel_of("panel").ok_or("dockPanel: need `panel`")??;
+                let mut command = json!({"command": "window.panel.dock", "panel": p});
+                if let Some(anchor) = panel_of("anchor") {
+                    command["anchor"] = json!(anchor?);
+                    command["zone"] = json!("center");
+                }
+                if let Some(zone) = params.get("zone") {
+                    let zone = zone.as_str().ok_or("zone: center|tab|left|right|top|bottom|above|below")?.to_ascii_lowercase();
+                    if command.get("anchor").is_some() || zone != "center" {
+                        command["zone"] = json!(zone);
+                    }
+                }
+                if let Some(before) = panel_of("before") {
+                    command["before"] = json!(before?);
+                }
+                let command: craft_ui::docking::DockCommand<PanelKind> =
+                    serde_json::from_value(command).map_err(|e| format!("dockPanel: zone: center|tab|left|right|top|bottom|above|below ({e})"))?;
+                app.run_dock_command(ctx, command).map_err(|e| format!("can't dock {}: {e}", p.title()))?;
+                app.show_panel(p);
+                return Ok(Value::Null);
+            }
+        }
+    }
+    if id == "markers.dialog" {
+        // The Composition/Layer Marker dialog (double-click a marker): {layer?, index}.
+        let index = params.get("index").and_then(Value::as_u64).ok_or("markers.dialog: need `index`")? as usize;
+        let layer = params.get("layer").and_then(Value::as_u64);
+        crate::panels::markers_ui::open_dialog(app, crate::panels::markers_ui::MarkerRef { layer, index })?;
+        return Ok(json!({"dialog": id}));
+    }
+
+    if id == "view.theme.toggle" {
+        app.cycle_appearance(ctx);
+        return Ok(json!({"appearanceMode": app.session.prefs.appearance.appearance_mode}));
+    }
+    if let Some(th) = id.strip_prefix("view.theme.") {
+        let k = crate::theme::ThemeKind::from_name(th).ok_or("unknown theme")?;
+        app.set_theme(ctx, k);
+        return Ok(Value::Null);
+    }
+    let timing = |app: &mut EffectcraftApp, op: &str| app.session.execute("layer.timing", json!({"op": op})).map_err(|e| e.to_string());
+    match id {
+        "playback.ramPreview" => {
+            app.toggle_play_with(now, effectcraft_engine::preview::PreviewShortcut::Numpad0);
+            return Ok(json!({"playing": app.playback.playing}));
+        }
+        "playback.preview.shiftSpacebar" | "playback.preview.shiftNumpad0" | "playback.preview.altNumpad0" => {
+            let sc = effectcraft_engine::preview::PreviewShortcut::parse(id.trim_start_matches("playback.preview.")).ok_or("unknown preview shortcut")?;
+            app.toggle_play_with(now, sc);
+            return Ok(json!({"playing": app.playback.playing}));
+        }
+        "playback.stop" => {
+            app.stop();
+            return Ok(Value::Null);
+        }
+        // The focused Layer panel has its own magnification; otherwise the Composition viewer.
+        "view.fit" if app.ui.focused == PanelKind::Layer => {
+            app.ui.layer_zoom = None;
+            app.ui.layer_pan = [0.0, 0.0];
+            return Ok(Value::Null);
+        }
+        "view.fit" => {
+            app.ui.viewer.zoom = None;
+            app.ui.viewer.fit_up_to_100 = false;
+            app.ui.viewer.pan = [0.0, 0.0];
+            return Ok(Value::Null);
+        }
+        "timeline.scrollToTime" => app.ui.timeline.scroll_to = Some(crate::state::ScrollTo::Time),
+        "timeline.scrollToLayer" => app.ui.timeline.scroll_to = Some(crate::state::ScrollTo::Layer),
+        "timeline.parentColumn" => {
+            let on = !crate::panels::timeline::column_visible(&app.ui.timeline, "parent");
+            crate::panels::timeline::set_column(&mut app.ui.timeline, "parent", on)?;
+            return Ok(json!({"parent": on}));
+        }
+        "view.fitUpTo100" => {
+            app.ui.viewer.zoom = None;
+            app.ui.viewer.fit_up_to_100 = true;
+            app.ui.viewer.pan = [0.0, 0.0];
+            return Ok(Value::Null);
+        }
+        // Shift+, / Shift+.: the previous / next open composition (the viewer's tabs).
+        "view.nextItem" | "view.previousItem" => {
+            let open = app.session.state.open_comps.clone();
+            let Some(i) = app.session.state.active_comp.and_then(|c| open.iter().position(|o| *o == c)) else { return Ok(Value::Null) };
+            let step = if id == "view.nextItem" { 1 } else { open.len().saturating_sub(1) };
+            let Some(next) = open.get((i + step) % open.len().max(1)).copied().filter(|n| Some(*n) != app.session.state.active_comp) else {
+                return Ok(Value::Null);
+            };
+            return run_engine(app, ctx, "comp.open", json!({"comp": next.0}));
+        }
+        // \\: between the Composition viewer and the Timeline.
+        "window.toggleCompTimeline" => {
+            let to = if app.ui.focused == PanelKind::Timeline { crate::panels::viewers::active_panel(app) } else { PanelKind::Timeline };
+            app.show_panel(to);
+            return Ok(json!({"focused": to.id()}));
+        }
+        // Alt+Shift+, / Alt+Shift+.: the previous / next tab of the focused panel's group.
+        "window.nextPanel" | "window.previousPanel" => {
+            let focused = app.ui.focused;
+            let group = app.ui.dock.group_of(focused);
+            let Some(i) = group.iter().position(|p| *p == focused) else { return Ok(Value::Null) };
+            let step = if id == "window.nextPanel" { 1 } else { group.len().saturating_sub(1) };
+            if let Some(next) = group.get((i + step) % group.len().max(1)).copied() {
+                app.show_panel(next);
+            }
+            return Ok(json!({"focused": app.ui.focused.id()}));
+        }
+        // Ctrl+Shift+W: with a viewer or the Timeline active, every open composition closes;
+        // any other panel closes itself.
+        "window.closeAll" => {
+            let focused = app.ui.focused;
+            if matches!(focused, PanelKind::Composition | PanelKind::Timeline | PanelKind::Viewer(_)) {
+                for c in app.session.state.open_comps.clone() {
+                    run_engine(app, ctx, "comp.close", json!({"comp": c.0}))?;
+                }
+            } else {
+                app.close_panel(focused);
+            }
+            return Ok(Value::Null);
+        }
+        "view.actualSize" if app.ui.focused == PanelKind::Layer => {
+            app.ui.layer_zoom = Some(1.0 / ctx.pixels_per_point());
+            app.ui.layer_pan = [0.0, 0.0];
+            return Ok(Value::Null);
+        }
+        "view.actualSize" => {
+            app.ui.viewer.zoom = Some(1.0 / ctx.pixels_per_point());
+            app.ui.viewer.pan = [0.0, 0.0];
+            return Ok(Value::Null);
+        }
+        "view.safeMargins" => app.ui.viewer.safe_margins = !app.ui.viewer.safe_margins,
+        "view.transparencyGrid" => app.ui.viewer.transparency_grid = !app.ui.viewer.transparency_grid,
+        "view.fastPreviews" => {
+            // With a mode: Fast Previews ▸ Off / Adaptive Resolution / Draft / Fast Draft /
+            // Wireframe; without: toggle Draft quality (Settings ▸ Previews).
+            if params.get("mode").is_some() {
+                return run_engine(app, ctx, "view.fastPreviewMode", params);
+            }
+            let on = !app.ui.viewer.fast_preview;
+            app.set_pref("previews.fastPreviews", json!(on))?;
+            app.ui.viewer.fast_preview = on;
+        }
+        "timeline.zoomIn" | "timeline.zoomOut" => {
+            let k = if id == "timeline.zoomIn" { crate::panels::timeline::ZOOM_STEP } else { 1.0 / crate::panels::timeline::ZOOM_STEP };
+            crate::panels::timeline::zoom(app, ctx, k);
+            return Ok(Value::Null);
+        }
+        "timeline.zoomFit" => crate::panels::timeline::toggle_fit_zoom(app, ctx),
+        "timeline.zoomFrameToggle" => crate::panels::timeline::toggle_frame_zoom(app, ctx),
+        "timeline.column" => {
+            let col = params.get("column").and_then(Value::as_str).ok_or("timeline.column: need `column`")?;
+            let on = params.get("visible").and_then(Value::as_bool).unwrap_or(!crate::panels::timeline::column_visible(&app.ui.timeline, col));
+            crate::panels::timeline::set_column(&mut app.ui.timeline, col, on)?;
+            let shown: Vec<&str> =
+                crate::panels::timeline::COLUMNS.iter().map(|c| c.0).filter(|c| crate::panels::timeline::column_visible(&app.ui.timeline, c)).collect();
+            return Ok(json!({"columns": shown}));
+        }
+        "timeline.sourceName" => {
+            let tl = &mut app.ui.timeline;
+            tl.source_name = params.get("value").and_then(Value::as_bool).unwrap_or(!tl.source_name);
+            return Ok(json!({"sourceName": tl.source_name}));
+        }
+        "flowchart.options" | "flowchart.graph" => return crate::panels::flowchart::command(app, id, &params),
+        "timeline.search" => {
+            app.ui.timeline.search = params.get("query").and_then(Value::as_str).unwrap_or_default().to_string();
+            app.show_panel(PanelKind::Timeline);
+        }
+        "timeline.graphEditor" => app.ui.timeline.graph_editor = !app.ui.timeline.graph_editor,
+        "timeline.switchesModes" => app.ui.timeline.show_modes = !app.ui.timeline.show_modes,
+        "timeline.collapseAll" => {
+            app.ui.timeline.open_layers.clear();
+            app.ui.timeline.open_groups.clear();
+            app.ui.timeline.reveal.clear();
+            app.ui.timeline.layer_reveal.clear();
+        }
+        // Ctrl+`: twirl the selected layers open (all closed ones) or closed (all open). From a
+        // reveal shortcut's view it opens their full property trees.
+        "timeline.twirlSelected" => {
+            let sel: Vec<u64> = app.session.state.selected_layers.iter().map(|l| l.0).collect();
+            let tl = &mut app.ui.timeline;
+            let revealing = sel.iter().any(|l| tl.layer_reveal.contains_key(l));
+            tl.reveal.clear();
+            for l in &sel {
+                tl.layer_reveal.remove(l);
+            }
+            if !revealing && sel.iter().all(|l| tl.open_layers.contains(l)) {
+                for l in &sel {
+                    tl.open_layers.remove(l);
+                }
+            } else {
+                tl.open_layers.extend(sel);
+            }
+        }
+        "timeline.workAreaBegin" => return app.session.execute("comp.workArea", json!({"set": "begin"})).map_err(|e| e.to_string()),
+        "timeline.workAreaEnd" => return app.session.execute("comp.workArea", json!({"set": "end"})).map_err(|e| e.to_string()),
+        "timeline.moveInToTime" => return timing(app, "moveInToTime"),
+        "timeline.moveOutToTime" => return timing(app, "moveOutToTime"),
+        "timeline.trimInToTime" => return timing(app, "trimInToTime"),
+        "timeline.trimOutToTime" => return timing(app, "trimOutToTime"),
+        "app.home" => app.ui.start_screen = !app.ui.start_screen,
+        "app.newComp" | "comp.new" if no_params(&params) => crate::panels::dialogs::open_new_comp(app),
+        "app.compSettings" | "comp.settings" if no_params(&params) => crate::panels::dialogs::open_comp_settings(app)?,
+        "app.compSettings" | "comp.settings" if only_comp(&params).is_some() => {
+            crate::panels::dialogs::open_comp_settings_for(app, only_comp(&params).ok_or("missing `comp`")?)?
+        }
+        "app.solidSettings" | "layer.newSolid" if no_params(&params) => crate::panels::dialogs::open_new_solid(app)?,
+        "keys.velocity" if no_params(&params) => crate::panels::key_dialogs::open_velocity(app)?,
+        "keys.interpolation" if no_params(&params) => crate::panels::key_dialogs::open_interpolation(app)?,
+        "layer.timeStretch" if no_params(&params) => crate::panels::key_dialogs::open_time_stretch(app)?,
+        _ => {
+            if id == "renderQueue.render" && params.get("wait").is_none() {
+                // The UI renders in the background; the panel shows progress.
+                let mut p = params.clone();
+                if let Some(m) = p.as_object_mut() {
+                    m.insert("wait".into(), json!(false));
+                } else {
+                    p = json!({"wait": false});
+                }
+                app.show_panel(PanelKind::RenderQueue);
+                return app.session.execute(id, p).map_err(|e| e.to_string());
+            }
+            if id == "renderQueue.add" {
+                let r = app.session.execute(id, params).map_err(|e| e.to_string());
+                match &r {
+                    Ok(_) => app.show_panel(PanelKind::RenderQueue),
+                    Err(e) => app.ui.status = e.clone(),
+                }
+                return r;
+            }
+            if let Some(r) = file_dialog(app, id, &params) {
+                return r;
+            }
+            if id == "layer.precompose" && params.get("name").is_none() {
+                crate::panels::precomp::open(app, &params)?;
+                return Ok(json!({"dialog": id}));
+            }
+            if crate::panels::dialogs::open_form(app, id, &params) {
+                return Ok(json!({"dialog": id}));
+            }
+            if id == "renderQueue.render" && params.get("wait").is_none() {
+                // The UI renders in the background; the panel shows progress.
+                let mut p = params.clone();
+                if let Some(m) = p.as_object_mut() {
+                    m.insert("wait".into(), json!(false));
+                } else {
+                    p = json!({"wait": false});
+                }
+                app.show_panel(PanelKind::RenderQueue);
+                return app.session.execute(id, p).map_err(|e| e.to_string());
+            }
+            if id == "renderQueue.add" {
+                let r = app.session.execute(id, params).map_err(|e| e.to_string());
+                match &r {
+                    Ok(_) => app.show_panel(PanelKind::RenderQueue),
+                    Err(e) => app.ui.status = e.clone(),
+                }
+                return r;
+            }
+            // An effect added to a layer (Effect menu, Last Effect, dropped on a layer) brings
+            // up Effect Controls on that layer, as in After Effects.
+            if matches!(id, "effect.apply" | "effect.applyLast") {
+                let r = run_engine(app, ctx, id, params.clone());
+                if let Ok(applied) = &r {
+                    crate::panels::effect_controls::reveal_applied(app, &params);
+                    crate::panels::effect_controls::choose_files_after_apply(app, applied);
+                }
+                return r;
+            }
+            // Enabling time remapping twirls its layers open on Time Remap and its two keys.
+            if id == "layer.enableTimeRemap" {
+                let r = run_engine(app, ctx, id, params.clone());
+                if r.as_ref().is_ok_and(|on| on.as_bool() == Some(true)) {
+                    reveal_time_remap(app, &params);
+                }
+                return r;
+            }
+            if id == "layer.rename" && params.get("name").is_none() {
+                crate::panels::timeline::begin_rename(app, ctx);
+                return Ok(Value::Null);
+            }
+            return run_engine(app, ctx, id, params);
+        }
+    }
+    Ok(Value::Null)
+}
diff --git a/crates/ui-egui/src/menus/shortcuts.rs b/crates/ui-egui/src/menus/shortcuts.rs
new file mode 100644
index 000000000..b9990786c
--- /dev/null
+++ b/crates/ui-egui/src/menus/shortcuts.rs
@@ -0,0 +1,418 @@
+use super::frontend::run_engine;
+use super::invoke::invoke;
+use super::{EffectcraftApp, PanelKind, Value, json};
+
+/// Shortcut text in this OS's notation (`⇧⌘K` on macOS, `Ctrl+Shift+K` elsewhere).
+pub fn shortcut_text(s: &str) -> String {
+    if cfg!(target_os = "macos") {
+        let mut out = String::new();
+        let parts: Vec<&str> = match s.strip_suffix("++") {
+            Some(head) => vec![head, "+"],
+            None => s.split('+').collect(),
+        };
+        let (mods, key) = parts.split_at(parts.len().saturating_sub(1));
+        for m in mods {
+            out.push_str(match *m {
+                "Ctrl" => "⌃",
+                "Alt" => "⌥",
+                "Shift" => "⇧",
+                "Cmd" => "⌘",
+                x => x,
+            });
+        }
+        out.push_str(match key.first().copied().unwrap_or("") {
+            "Space" => "Space",
+            "Escape" => "Esc",
+            "Home" => "↖",
+            k => k,
+        });
+        out
+    } else {
+        s.replace("Cmd", "Ctrl")
+    }
+}
+
+/// Parse "Cmd+Shift+K" into modifiers + key.
+pub fn parse_shortcut(s: &str) -> Option<(egui::Modifiers, egui::Key)> {
+    let mut m = egui::Modifiers::NONE;
+    let mut key = None;
+    // The plus key itself is written `+` or `Cmd++`.
+    let (head, plus) = match s.strip_suffix("++") {
+        Some(h) => (h, true),
+        None if s == "+" => ("", true),
+        None => (s, false),
+    };
+    let mut parts: Vec<&str> = if head.is_empty() { vec![] } else { head.split('+').collect() };
+    if plus {
+        parts.push("+");
+    }
+    for p in parts {
+        match p {
+            "Cmd" => {
+                m.command = true;
+                m.mac_cmd = cfg!(target_os = "macos");
+                if !cfg!(target_os = "macos") {
+                    m.ctrl = true;
+                }
+            }
+            "Physical" => {}
+            "Shift" => m.shift = true,
+            "Alt" => m.alt = true,
+            "Ctrl" => m.ctrl = true,
+            k => {
+                key = match k {
+                    ";" => Some(egui::Key::Semicolon),
+                    "'" => Some(egui::Key::Quote),
+                    "," => Some(egui::Key::Comma),
+                    "." => Some(egui::Key::Period),
+                    "/" => Some(egui::Key::Slash),
+                    "\\" => Some(egui::Key::Backslash),
+                    "=" => Some(egui::Key::Equals),
+                    "-" => Some(egui::Key::Minus),
+                    "`" => Some(egui::Key::Backtick),
+                    "[" => Some(egui::Key::OpenBracket),
+                    "]" => Some(egui::Key::CloseBracket),
+                    "Num0" => Some(egui::Key::Num0),
+                    "Num*" => None,
+                    _ => egui::Key::from_name(k),
+                }
+            }
+        }
+    }
+    key.map(|k| (m, k))
+}
+
+/// The key some keyboards report for a shifted punctuation key (`Shift+=` arrives as `+`).
+fn shifted_alias(k: egui::Key) -> Option<egui::Key> {
+    use egui::Key::*;
+    Some(match k {
+        Equals => Plus,
+        Semicolon => Colon,
+        OpenBracket => OpenCurlyBracket,
+        CloseBracket => CloseCurlyBracket,
+        Slash => Questionmark,
+        Backslash => Pipe,
+        _ => return None,
+    })
+}
+
+/// A key binding: modifiers, key, command id and bound params.
+pub type Binding = (egui::Modifiers, egui::Key, String, Value);
+
+/// All bindings of the active keyboard shortcut preset, most modifiers first.
+pub fn bindings(session: &effectcraft_engine::Session) -> Vec<Binding> {
+    let mut v: Vec<Binding> = Vec::new();
+    for (sc, b) in session.shortcuts().bindings() {
+        if sc.starts_with("Physical+") {
+            continue;
+        }
+        // Off macOS `Cmd` is Ctrl, so a custom Ctrl+Cmd shortcut would
+        // steal the plain Cmd one: such macOS-only shortcuts aren't bound there.
+        if !cfg!(target_os = "macos") && sc.split('+').any(|p| p == "Ctrl") && sc.split('+').any(|p| p == "Cmd") {
+            continue;
+        }
+        if let Some((m, k)) = parse_shortcut(sc) {
+            if m.shift
+                && let Some(alias) = shifted_alias(k)
+            {
+                v.push((m, alias, b.command.clone(), b.params.clone()));
+            }
+            v.push((m, k, b.command.clone(), b.params.clone()));
+        }
+    }
+    v.sort_by_key(|(m, ..)| std::cmp::Reverse(m.command as u8 + m.shift as u8 + m.alt as u8 + m.ctrl as u8));
+    v
+}
+
+fn mods_match(want: egui::Modifiers, got: egui::Modifiers) -> bool {
+    want.command == got.command && want.shift == got.shift && want.alt == got.alt && (want.ctrl == got.ctrl || got.command && cfg!(not(target_os = "macos")))
+}
+
+/// Whether the `key`+`mods` chord is the current binding of `command` in the active preset
+/// (so callers that must match a shortcut themselves — like the viewer's text editor, which
+/// holds the keyboard while the shortcut dispatcher is skipped — follow rebinds).
+/// `Physical+`-only bindings never match here, exactly as for the app-wide dispatcher.
+pub fn chord_matches(session: &effectcraft_engine::Session, command: &str, key: egui::Key, mods: egui::Modifiers) -> bool {
+    bindings(session).into_iter().any(|(m, k, id, _)| id == command && k == key && mods_match(m, mods))
+}
+
+/// Whether a Deselect All chord matched by [`chord_matches`] may run while a text editor holds
+/// the keyboard. Chords carrying Cmd/Ctrl/Alt are command chords (the editor treats them as
+/// such for undo and the rest), and function keys never type, so those forward from the editor;
+/// a chord that could instead produce a character — a bare or Shift-only letter, digit or
+/// punctuation key, as from a pathological bare-letter rebinding — stays with the editor so
+/// typing keeps working, the same invariant the app-wide dispatcher honors by skipping
+/// focused text fields.
+pub fn forwardable_during_text_edit(mods: egui::Modifiers, key: egui::Key) -> bool {
+    mods.command || mods.ctrl || mods.alt || (egui::Key::F1..=egui::Key::F35).contains(&key)
+}
+
+/// Set (egui temp data) from a plain Spacebar press until its release while a tap would still
+/// run the Spacebar shortcut.
+/// The system clipboard's text of this frame's paste event, for the Edit ▸ Paste it runs.
+pub(super) fn system_paste_id() -> egui::Id {
+    egui::Id::unique("menus-system-paste")
+}
+
+/// The temp-data id of the flag set by a plain Space press and taken on its release, so a tap
+/// runs the Space shortcut while holding Space stays the Hand tool.
+fn space_tap_id() -> egui::Id {
+    egui::Id::unique("spacebar-tap")
+}
+
+/// The modifiers held when this frame's input began: the state the last pass ended with, if it
+/// ran this (egui keeps only the state after the frame's events). Records this pass's state.
+pub(super) fn modifiers_at_start(ctx: &egui::Context) -> Option<egui::Modifiers> {
+    let id = egui::Id::unique("shortcut-modifiers");
+    let pass = ctx.cumulative_pass_nr();
+    let now = ctx.input(|i| i.modifiers);
+    ctx.data_mut(|d| {
+        let last = d.get_temp::<(u64, egui::Modifiers, Option<egui::Modifiers>)>(id);
+        if let Some((p, _, start)) = last
+            && p == pass
+        {
+            return start;
+        }
+        let start = last.and_then(|(p, m, _)| (p.checked_add(1) == Some(pass)).then_some(m));
+        d.insert_temp(id, (pass, now, start));
+        start
+    })
+}
+
+/// Only Shift held (Shift+Delete, not Ctrl/Alt+Shift+Delete).
+fn only_shift(m: egui::Modifiers) -> bool {
+    m.shift && !m.alt && !m.ctrl && !m.command && !m.mac_cmd
+}
+
+/// Dispatch keyboard shortcuts (skipped while typing in a text field).
+pub fn handle_shortcuts(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    handle_shortcuts_impl(app, ctx, false);
+}
+
+/// Tab can acquire widget focus while the current frame is drawn. Dispatch its application
+/// binding only afterward, and only when no widget owned focus before or after layout.
+pub fn handle_tab_shortcut(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    if ctx.input(|i| i.key_pressed(egui::Key::Tab)) {
+        handle_shortcuts_impl(app, ctx, true);
+    }
+}
+
+/// Escape with a dialog open: close the popup/picker first, else cancel the dialog.
+fn escape_dialog(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    // A popup or colour picker takes Escape first (the picker goes back to its original colour).
+    if crate::panels::shortcut_editor::recording(app)
+        || crate::panels::shortcut_editor::confirming(app)
+        || egui::Popup::is_any_open(ctx)
+        || crate::color_picker::open_recently(ctx)
+    {
+        return;
+    }
+    ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Escape));
+    if app.dialog == Some(crate::Dialog::LayerStyles) {
+        crate::panels::layer_styles_dialog::finish(app, false);
+    } else if app.dialog == Some(crate::Dialog::Info) {
+        crate::panels::forms::close_info(app);
+    } else {
+        if app.dialog == Some(crate::Dialog::Settings)
+            && let Some(p) = app.dialog_state.prefs_snapshot.take()
+        {
+            app.session.prefs = p;
+            app.session.prefs_changed();
+        }
+        if app.dialog == Some(crate::Dialog::UnsavedChanges) {
+            app.dialog_state.unsaved.command = None;
+        }
+        app.dialog = None;
+    }
+}
+
+type KeyEvent = (egui::Key, egui::Modifiers, bool, Option<egui::Key>);
+
+/// The frame's key presses, with clipboard events mapped back to Ctrl+C / X / V.
+fn collect_key_events(ctx: &egui::Context, start: Option<egui::Modifiers>, clipboard: bool, project: bool) -> Vec<KeyEvent> {
+    ctx.input(|i| {
+        // The windowing layer turns Ctrl+C / Ctrl+X / Ctrl+V into clipboard events instead of
+        // key presses: map them back to the keys (with the modifiers held) so Edit ▸ Copy, Cut,
+        // Paste and their variants (Ctrl+Alt+C…) run. Clipboard events carry no modifiers and
+        // `i.modifiers` is the state after all of the frame's events, so each is read with the
+        // modifiers where it is in the stream: walk the events from the frame's starting state.
+        // `None` when that isn't known.
+        let changed = i.events.iter().any(|e| matches!(e, egui::Event::ModifiersChanged(_) | egui::Event::WindowFocused(false)));
+        let mut at = if changed { start } else { Some(i.modifiers) };
+        let held = |at: Option<egui::Modifiers>| at.filter(|m| m.command).unwrap_or(egui::Modifiers::COMMAND);
+        let mut out = Vec::new();
+        for e in &i.events {
+            match e {
+                egui::Event::ModifiersChanged(m) => at = Some(*m),
+                // egui forgets the modifiers held when the window loses focus.
+                egui::Event::WindowFocused(false) => at = Some(egui::Modifiers::NONE),
+                egui::Event::Key { key, physical_key, pressed: true, modifiers, repeat, .. }
+                    if !*repeat
+                        || matches!(
+                            key,
+                            egui::Key::PageUp | egui::Key::PageDown | egui::Key::ArrowLeft | egui::Key::ArrowRight | egui::Key::ArrowUp | egui::Key::ArrowDown
+                        ) =>
+                {
+                    out.push((*key, *modifiers, true, *physical_key));
+                }
+                egui::Event::Key { key: egui::Key::Space, pressed: false, .. } => out.push((egui::Key::Space, egui::Modifiers::NONE, false, None)),
+                egui::Event::Copy if clipboard => out.push((egui::Key::C, held(at), true, None)),
+                // On Windows, Shift+Delete is the old Cut key and arrives as Cut too. The Project
+                // panel has no clipboard: there a Cut with only Shift held is Shift+Delete (Delete
+                // Project Items Without Confirmation). Never when the modifiers aren't known.
+                egui::Event::Cut if clipboard && project && at.is_some_and(only_shift) => {
+                    out.push((egui::Key::Delete, egui::Modifiers::SHIFT, true, None));
+                }
+                egui::Event::Cut if clipboard => out.push((egui::Key::X, held(at), true, None)),
+                egui::Event::Paste(_) if clipboard => out.push((egui::Key::V, held(at), true, None)),
+                _ => {}
+            }
+        }
+        out
+    })
+}
+
+/// Numpad * (or `*` typed with Shift+8): Add Marker (#275). egui has no key for it, so it
+/// comes as text.
+fn numpad_star_marker(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    if !ctx.input(|i| i.events.iter().any(|e| matches!(e, egui::Event::Text(t) if t == "*"))) {
+        return;
+    }
+    let bound = app.session.shortcuts().bindings().into_iter().find(|(k, _)| *k == "Num*").map(|(_, b)| (b.command.clone(), b.params.clone()));
+    // As in After Effects, it marks the selected layers; only with none selected does it add
+    // a composition marker (#976).
+    let bound =
+        bound.map(
+            |(id, params)| {
+                if id == "comp.addMarker" && !app.session.state.selected_layers.is_empty() { ("layer.addMarker".to_owned(), params) } else { (id, params) }
+            },
+        );
+    if let Some((id, params)) = bound
+        && let Err(e) = invoke(app, ctx, &id, if params.is_null() { json!({}) } else { params })
+    {
+        app.ui.status = e;
+    }
+}
+
+fn handle_shortcuts_impl(app: &mut EffectcraftApp, ctx: &egui::Context, tab_only: bool) {
+    let start = modifiers_at_start(ctx);
+    if !tab_only && app.dialog.is_some() && ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
+        escape_dialog(app, ctx);
+        return;
+    }
+    // A mouse button down while Spacebar is held belongs to the Hand tool: its release won't
+    // preview.
+    if ctx.input(|i| i.pointer.any_down()) || ctx.egui_wants_keyboard_input() {
+        ctx.data_mut(|d| d.remove::<bool>(space_tap_id()));
+    }
+    // While a menu or popup list is open, keys go to it, not to the app (Space must not start a
+    // preview behind the menu, #279).
+    if ctx.egui_wants_keyboard_input() || crate::widgets::any_menu_open(ctx) {
+        return;
+    }
+    // Text editing in the viewer takes the clipboard events itself.
+    let clipboard = app.session.state.text_edit.is_none();
+    let project = app.ui.focused == PanelKind::Project;
+    // The paste event's text: Edit ▸ Paste pastes SVG markup as a shape layer.
+    let pasted =
+        if clipboard { ctx.input(|i| i.events.iter().rev().find_map(|e| if let egui::Event::Paste(t) = e { Some(t.clone()) } else { None })) } else { None };
+    let mut events = collect_key_events(ctx, start, clipboard, project);
+    events.retain(|(key, _, _, _)| (*key == egui::Key::Tab) == tab_only);
+    if !tab_only && clipboard && app.dialog.is_none() {
+        numpad_star_marker(app, ctx);
+    }
+    if events.is_empty() {
+        return;
+    }
+    let binds = bindings(&app.session);
+    for (key, mods, pressed, physical_key) in events {
+        // Plain Spacebar runs its shortcut (Play Current Preview) on the release: held, it is
+        // the Hand tool (After Effects), and a drag with it must not start or stop playback.
+        if key == egui::Key::Space && (!pressed || !mods.any()) {
+            if pressed {
+                if app.dialog.is_none() {
+                    ctx.data_mut(|d| d.insert_temp(space_tap_id(), true));
+                }
+                continue;
+            }
+            if !ctx.data_mut(|d| d.remove_temp::<bool>(space_tap_id())).unwrap_or(false) {
+                continue;
+            }
+        }
+        // Escape closes dialogs.
+        if key == egui::Key::Escape && app.dialog.is_some() {
+            // Escape while recording a shortcut cancels the recording, not the editor; so does
+            // Escape in its Delete Preset prompt.
+            if crate::panels::shortcut_editor::recording(app) || crate::panels::shortcut_editor::confirming(app) {
+                continue;
+            }
+            if app.dialog == Some(crate::Dialog::Info) {
+                crate::panels::forms::close_info(app);
+                continue;
+            }
+            // Escape in Settings is Cancel: restore the settings from when it opened.
+            if app.dialog == Some(crate::Dialog::Settings)
+                && let Some(p) = app.dialog_state.prefs_snapshot.take()
+            {
+                app.session.prefs = p;
+                app.session.prefs_changed();
+            }
+            app.dialog = None;
+            continue;
+        }
+        if app.dialog.is_some() {
+            continue;
+        }
+        // Enter in the Project panel renames the selected item (handled by the panel).
+        if key == egui::Key::Enter && !mods.any() && app.ui.focused == PanelKind::Project {
+            continue;
+        }
+        // The Project panel has its own selection; a previously selected Timeline layer
+        // must not be deleted while the Project panel has focus.
+        if matches!(key, egui::Key::Delete | egui::Key::Backspace) && !mods.any() {
+            if matches!(app.ui.focused, PanelKind::Composition | PanelKind::Viewer(_)) && !app.session.state.camera_points.is_empty() {
+                if let Err(e) = run_engine(app, ctx, "camera.deletePoints", json!({})) {
+                    app.ui.status = e;
+                }
+                ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, key));
+                continue;
+            }
+            // The queue panel consumes the event after its selection state is drawn.
+            if app.ui.focused == PanelKind::RenderQueue {
+                continue;
+            }
+            let _ = invoke(app, ctx, "edit.clear", json!({}));
+            continue;
+        }
+        // Explicit physical bindings distinguish keys that a layout reports with the same
+        // logical name (for example AZERTY's minus and right parenthesis).
+        let physical = physical_key.and_then(|key| {
+            app.session.shortcuts().bindings().into_iter().find_map(|(sc, b)| {
+                let (m, k) = parse_shortcut(sc.strip_prefix("Physical+")?)?;
+                (k == key && mods_match(m, mods)).then(|| (b.command.clone(), b.params.clone()))
+            })
+        });
+        if let Some((id, params)) = physical {
+            if let Err(e) = invoke(app, ctx, &id, if params.is_null() { json!({}) } else { params }) {
+                app.ui.status = e;
+            }
+            continue;
+        }
+        if let Some((_, _, id, params)) = binds.iter().filter(|(m, k, ..)| *k == key && mods_match(*m, mods)).min_by_key(|(_, _, id, params)| {
+            // The focused panel wins over an application command sharing its chord.
+            let key = effectcraft_engine::shortcuts::binding_key(id, params);
+            app.session.shortcuts().find(&key).is_none_or(|b| b.scope != app.ui.focused.id())
+        }) {
+            let (id, params) = (id.clone(), if params.is_null() { json!({}) } else { params.clone() });
+            if id == "edit.paste"
+                && let Some(t) = &pasted
+            {
+                ctx.data_mut(|d| d.insert_temp(system_paste_id(), t.clone()));
+            }
+            if let Err(e) = invoke(app, ctx, &id, params) {
+                app.ui.status = e;
+            }
+            ctx.data_mut(|d| d.remove_temp::<String>(system_paste_id()));
+        }
+    }
+}
diff --git a/crates/ui-egui/src/menus/tests.rs b/crates/ui-egui/src/menus/tests.rs
new file mode 100644
index 000000000..ed2fcf6ca
--- /dev/null
+++ b/crates/ui-egui/src/menus/tests.rs
@@ -0,0 +1,425 @@
+use super::*;
+
+/// #882: at 125 % / 150 % display scaling Zoom In reaches 100 % (one comp pixel per screen
+/// pixel), not 100 % in points (125 % / 150 % on screen).
+#[test]
+fn zoom_steps_land_on_whole_screen_magnifications() {
+    for ppp in [1.0f32, 1.25, 1.5, 2.0] {
+        let at_100 = zoom_step(0.7 / ppp, ppp, true);
+        assert!((at_100 * ppp - 1.0).abs() < 1e-6, "ppp {ppp}: {}", at_100 * ppp);
+        assert!((zoom_step(at_100, ppp, true) * ppp - 1.5).abs() < 1e-6);
+        assert!((zoom_step(at_100, ppp, false) * ppp - 0.66).abs() < 1e-6);
+    }
+    assert!(zoom_step(1.0, 0.0, true).is_finite());
+}
+
+#[test]
+fn shortcut_passes_share_frame_start_modifiers() {
+    let ctx = egui::Context::default();
+    let mut starts = Vec::new();
+    let mut output = ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(egui::Modifiers::SHIFT)], ..Default::default() }, |ui| {
+        let ctx = ui.ctx();
+        starts.push(modifiers_at_start(ctx));
+        starts.push(modifiers_at_start(ctx));
+    });
+    output.textures_delta.clear();
+    assert_eq!(starts, vec![None, None]);
+    starts.clear();
+    let mut output = ctx.run_ui(egui::RawInput { events: vec![egui::Event::ModifiersChanged(egui::Modifiers::NONE)], ..Default::default() }, |ui| {
+        let ctx = ui.ctx();
+        starts.push(modifiers_at_start(ctx));
+        starts.push(modifiers_at_start(ctx));
+    });
+    output.textures_delta.clear();
+    assert_eq!(starts, vec![Some(egui::Modifiers::SHIFT), Some(egui::Modifiers::SHIFT)]);
+}
+
+#[test]
+fn every_ui_shortcut_parses() {
+    for c in UI_COMMANDS {
+        if let Some(sc) = c.shortcut {
+            assert!(parse_shortcut(sc).is_some() || sc == "Num*", "{sc}");
+        }
+    }
+    for (_, e) in effectcraft_engine::menus::entries() {
+        if let Some(sc) = &e.shortcut {
+            assert!(parse_shortcut(sc).is_some() || sc == "Num*", "{} ({sc})", e.label);
+        }
+    }
+}
+
+#[test]
+fn full_screen_default_is_platform_specific() {
+    let app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let full_screen = app.session.shortcuts().shortcut_of("view.fullScreen", &Value::Null);
+    if cfg!(target_os = "macos") {
+        assert_eq!(full_screen, Some("Ctrl+Cmd+F"));
+    } else {
+        assert_eq!(full_screen, None);
+        assert_eq!(app.session.shortcuts().shortcut_of("window.maximizeApp", &Value::Null), Some("Cmd+\\"));
+    }
+}
+
+#[test]
+fn ui_and_menu_shortcuts_do_not_collide() {
+    let app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let mut seen: std::collections::BTreeMap<(String, String), (String, String)> = Default::default();
+    for (m, k, id, params) in bindings(&app.session) {
+        let key = (format!("{m:?}"), format!("{k:?}"));
+        let target = (id.clone(), params.to_string());
+        if let Some(prev) = seen.get(&key) {
+            assert_eq!(prev, &target, "{key:?} bound to {prev:?} and {target:?}");
+        } else {
+            seen.insert(key, target);
+        }
+    }
+}
+
+/// #336: Ctrl+\ (Cmd+\ on macOS) maximizes the application window, and again restores
+/// it, as in After Effects.
+#[test]
+fn ctrl_backslash_maximizes_or_restores_the_window() {
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let (m, k) = parse_shortcut("Cmd+\\").unwrap();
+    assert!(m.command && k == egui::Key::Backslash, "{m:?} {k:?}");
+    assert!(bindings(&app.session).iter().any(|b| (b.0, b.1) == (m, k) && b.2 == "window.maximizeApp"));
+    let ctx = egui::Context::default();
+    let run = |app: &mut EffectcraftApp, maximized: bool| {
+        let input = egui::RawInput {
+            viewports: std::iter::once((egui::ViewportId::ROOT, egui::ViewportInfo { maximized: Some(maximized), ..Default::default() })).collect(),
+            ..Default::default()
+        };
+        let mut r = Value::Null;
+        let mut out = ctx.run_ui(input, |ui| r = invoke(app, ui.ctx(), "window.maximizeApp", json!({})).unwrap());
+        out.textures_delta.clear();
+        let cmds = out.viewport_output.get(&egui::ViewportId::ROOT).map(|v| v.commands.clone()).unwrap_or_default();
+        (r, cmds)
+    };
+    let (r, cmds) = run(&mut app, false);
+    assert_eq!(r, json!({"maximized": true}));
+    assert!(cmds.contains(&egui::ViewportCommand::Maximized(true)), "{cmds:?}");
+    let (r, cmds) = run(&mut app, true);
+    assert_eq!(r, json!({"maximized": false}));
+    assert!(cmds.contains(&egui::ViewportCommand::Maximized(false)), "{cmds:?}");
+}
+
+/// The default keys of the keyboard-only commands parse and reach them.
+#[test]
+fn keyboard_only_commands_are_bound() {
+    let app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    for (id, keys) in [
+        ("time.workAreaStart", "Shift+Home"),
+        ("time.workAreaEnd", "Shift+End"),
+        ("time.previousInOut", "Cmd+Alt+Shift+ArrowLeft"),
+        ("time.nextInOut", "Cmd+Alt+Shift+ArrowRight"),
+        ("comp.workAreaToSelection", "Cmd+Alt+B"),
+        ("comp.activateRecent", "Shift+Escape"),
+        ("keys.deselectAll", "Shift+F2"),
+        ("keys.deselectAll", "Cmd+Alt+Shift+A"),
+        ("layer.extendSelectionNext", "Cmd+Shift+ArrowDown"),
+        ("layer.moveInToStart", "Alt+Home"),
+        ("layer.moveEarlier", "Alt+PageUp"),
+        ("layer.moveLater10", "Alt+Shift+PageDown"),
+        ("layer.stretchInToTime", "Cmd+Shift+,"),
+        ("layer.stretchOutToTime", "Cmd+Alt+,"),
+        ("layer.mask.selectNext", "Alt+`"),
+        ("layer.mask.selectPrevious", "Alt+Shift+`"),
+        ("layer.castsShadows", "Alt+Shift+C"),
+        ("timeline.scrollToTime", "D"),
+        ("timeline.scrollToLayer", "X"),
+        ("timeline.parentColumn", "Shift+F4"),
+        ("view.fitUpTo100", "Alt+/"),
+        ("view.nextItem", "Shift+."),
+        ("view.previousItem", "Shift+,"),
+        ("window.toggleCompTimeline", "\\"),
+        ("window.nextPanel", "Alt+Shift+."),
+        ("window.previousPanel", "Alt+Shift+,"),
+        ("window.closeAll", "Cmd+Shift+W"),
+        ("tool.camera", "C"),
+    ] {
+        assert!(bindings(&app.session).into_iter().any(|x| x.2 == id && Some((x.0, x.1)) == parse_shortcut(keys)), "{id} on {keys}");
+    }
+}
+
+#[test]
+fn timeline_keys_scroll_and_toggle_the_parent_column() {
+    let ctx = egui::Context::default();
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
+    // D and X leave a scroll for the Timeline to do when it is drawn.
+    run(&mut app, "timeline.scrollToTime");
+    assert_eq!(app.ui.timeline.scroll_to, Some(crate::state::ScrollTo::Time));
+    run(&mut app, "timeline.scrollToLayer");
+    assert_eq!(app.ui.timeline.scroll_to, Some(crate::state::ScrollTo::Layer));
+    // Shift+F4 shows and hides the Parent column.
+    let parent = crate::panels::timeline::column_visible(&app.ui.timeline, "parent");
+    run(&mut app, "timeline.parentColumn");
+    assert_eq!(crate::panels::timeline::column_visible(&app.ui.timeline, "parent"), !parent);
+    run(&mut app, "timeline.parentColumn");
+    assert_eq!(crate::panels::timeline::column_visible(&app.ui.timeline, "parent"), parent);
+}
+
+#[test]
+fn viewer_keys_fit_and_step_through_open_comps() {
+    let ctx = egui::Context::default();
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
+    let new = |app: &mut EffectcraftApp, name: &str| app.session.execute("comp.new", json!({"name": name, "duration": 4})).unwrap()["comp"].as_u64();
+    let active = |app: &EffectcraftApp| app.session.state.active_comp.map(|c| c.0);
+    // With one composition open there is nothing to step to.
+    let a = new(&mut app, "A");
+    run(&mut app, "view.nextItem");
+    assert_eq!(active(&app), a);
+    // Shift+, / Shift+.: through the open compositions, wrapping.
+    let b = new(&mut app, "B");
+    assert_eq!(active(&app), b);
+    run(&mut app, "view.nextItem");
+    assert_eq!(active(&app), a);
+    run(&mut app, "view.previousItem");
+    assert_eq!(active(&app), b);
+    // Alt+/ fits the viewer without magnifying past 100 %; Shift+/ fits fully again.
+    app.ui.viewer.zoom = Some(3.0);
+    run(&mut app, "view.fitUpTo100");
+    assert!(app.ui.viewer.zoom.is_none() && app.ui.viewer.fit_up_to_100);
+    run(&mut app, "view.fit");
+    assert!(!app.ui.viewer.fit_up_to_100);
+}
+
+#[test]
+fn panel_keys_switch_cycle_and_close() {
+    let ctx = egui::Context::default();
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let run = |app: &mut EffectcraftApp, id: &str| invoke(app, &ctx, id, json!({})).unwrap();
+    for name in ["A", "B"] {
+        app.session.execute("comp.new", json!({"name": name, "duration": 4})).unwrap();
+    }
+    // \\ switches between the Timeline and the Composition viewer.
+    app.ui.focused = PanelKind::Timeline;
+    run(&mut app, "window.toggleCompTimeline");
+    assert_eq!(app.ui.focused, PanelKind::Composition);
+    run(&mut app, "window.toggleCompTimeline");
+    assert_eq!(app.ui.focused, PanelKind::Timeline);
+    // Alt+Shift+. / Alt+Shift+,: the tabs of the focused panel's group, wrapping.
+    let group = app.ui.dock.group_of(PanelKind::Timeline);
+    assert!(group.len() > 1, "{group:?}");
+    run(&mut app, "window.nextPanel");
+    assert_eq!(app.ui.focused, group[(group.iter().position(|p| *p == PanelKind::Timeline).unwrap() + 1) % group.len()]);
+    run(&mut app, "window.previousPanel");
+    assert_eq!(app.ui.focused, PanelKind::Timeline);
+    // Ctrl+Shift+W with the Timeline active closes every composition.
+    run(&mut app, "window.closeAll");
+    assert!(app.session.state.open_comps.is_empty());
+    // With another panel active it closes that panel.
+    app.show_panel(PanelKind::Project);
+    run(&mut app, "window.closeAll");
+    assert!(!app.ui.dock.is_open(PanelKind::Project));
+}
+
+#[test]
+fn c_cycles_the_camera_tools() {
+    let ctx = egui::Context::default();
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    app.ui.tool = Tool::Selection;
+    let mut seen = vec![];
+    for _ in 0..4 {
+        invoke(&mut app, &ctx, "tool.camera", json!({})).unwrap();
+        seen.push(app.ui.tool);
+    }
+    assert_eq!(seen, [Tool::Orbit, Tool::PanCamera, Tool::Dolly, Tool::Orbit]);
+}
+
+#[test]
+fn dispatch_uses_the_active_custom_preset() {
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let find = |app: &EffectcraftApp, id: &str| bindings(&app.session).into_iter().filter(|b| b.2 == id).map(|b| (b.0, b.1)).collect::<Vec<_>>();
+    let (m, k) = parse_shortcut("Cmd+Alt+Shift+Y").unwrap();
+    assert!(find(&app, "layer.newNull").contains(&(m, k)));
+    // A UI command rebound in a custom preset.
+    app.session.execute("shortcuts.set", json!({"command": "tool.hand", "keys": "Ctrl+Alt+H"})).unwrap();
+    assert_eq!(app.session.keymaps.active, "Custom");
+    let (m2, k2) = parse_shortcut("Ctrl+Alt+H").unwrap();
+    assert_eq!(find(&app, "tool.hand"), vec![(m2, k2)]);
+    app.session.execute("shortcuts.set", json!({"command": "layer.newNull", "keys": "F6"})).unwrap();
+    assert_eq!(find(&app, "layer.newNull"), vec![(egui::Modifiers::NONE, egui::Key::F6)]);
+    // The menus show the preset's shortcut.
+    let item = menu_items(&app).into_iter().find(|i| i.id == "layer.newNull").unwrap();
+    assert_eq!(item.shortcut.as_deref(), Some("F6"));
+    // Back to the default preset.
+    app.session.execute("shortcuts.preset", json!({"op": "select", "name": effectcraft_engine::shortcuts::DEFAULT_PRESET})).unwrap();
+    assert!(find(&app, "layer.newNull").contains(&(m, k)));
+}
+
+#[test]
+fn renamed_label_shows_in_the_label_menu() {
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    app.set_pref("labels.1.name", json!("Sunflower")).unwrap();
+    let labels: Vec<String> = menu_items(&app).into_iter().filter(|i| i.id == "edit.label").map(|i| i.label).collect();
+    assert!(labels.contains(&"Sunflower".to_string()), "{labels:?}");
+    assert!(!labels.contains(&"Yellow".to_string()));
+}
+
+/// Saving anything but a project asks the save dialog for that file's extension (#293): the
+/// project dialog, filtered to `.ecproj`, made macOS append `.ecproj` (`Frame.png.ecproj`).
+/// Hosts with only the project dialog (the web) still get it, given the file name.
+#[test]
+fn save_dialogs_offer_the_file_extension() {
+    use std::cell::RefCell;
+    use std::rc::Rc;
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    app.session.execute("comp.new", json!({"name": "A", "width": 64, "height": 36, "frameRate": 30, "duration": 1})).unwrap();
+    let ctx = egui::Context::default();
+    let asked: Rc<RefCell<Vec<String>>> = Rc::default();
+    let (a, b) = (asked.clone(), asked.clone());
+    app.hooks.pick_save = Some(Box::new(move |name: &str| {
+        a.borrow_mut().push(format!("project {name}"));
+        None
+    }));
+    app.hooks.pick_save_file = Some(Box::new(move |name: &str, ext: &str| {
+        b.borrow_mut().push(format!("file {name} [{ext}]"));
+        None
+    }));
+    for id in ["comp.saveFrameAs", "render.saveCurrentPreview", "file.exportLottie", "file.saveCopyAsXml", "file.collectFiles", "file.saveAs"] {
+        invoke(&mut app, &ctx, id, json!({})).unwrap();
+    }
+    assert_eq!(
+        *asked.borrow(),
+        [
+            "file Frame.png [png]",
+            "file Preview.mp4 [mp4]",
+            "file Animation.json [json]",
+            "file Untitled Project.ecprojx [ecprojx]",
+            "file Collected Files []",
+            "project Untitled Project.ecproj",
+        ]
+    );
+    // Without the other dialog, the project one names any file.
+    app.hooks.pick_save_file = None;
+    asked.borrow_mut().clear();
+    invoke(&mut app, &ctx, "comp.saveFrameAs", json!({})).unwrap();
+    assert_eq!(*asked.borrow(), ["project Frame.png"]);
+}
+
+/// File ▸ Scripts ▸ Recent Script Files and its key run a script again without a file dialog.
+#[test]
+fn recent_script_files_run_without_a_dialog() {
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let ctx = egui::Context::default();
+    let dir = std::env::temp_dir().join(format!("ec-recent-script-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let script = dir.join("New Comp.jsonl");
+    std::fs::write(&script, r#"{"command": "comp.new", "params": {"name": "From Script", "width": 64, "height": 36, "frameRate": 30, "duration": 1}}"#)
+        .unwrap();
+    app.session.execute("file.runScript", json!({"path": script.to_string_lossy()})).unwrap();
+    let (m, k, id, params) =
+        bindings(&app.session).into_iter().find(|b| b.2 == "file.runScript" && b.3 == json!({"recent": 0})).expect("the most recent script has a key");
+    assert_eq!((m, k), parse_shortcut("Cmd+Alt+Shift+D").unwrap());
+    assert_eq!(invoke(&mut app, &ctx, &id, params).unwrap()["steps"], 1);
+    assert_eq!(app.session.project.items.values().filter(|i| i.name.starts_with("From Script")).count(), 2);
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// #511: with a host's non-blocking dialogs, a command's file dialog opens without running
+/// a nested event loop inside the frame (a drag over the window then aborted the app on
+/// macOS); the command runs on a later frame with the answer, and a cancelled one not at all.
+#[test]
+fn file_dialogs_can_answer_on_a_later_frame() {
+    use std::sync::{Arc, Mutex};
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    app.session.execute("comp.new", json!({"name": "A", "width": 64, "height": 36, "frameRate": 30, "duration": 1})).unwrap();
+    let ctx = egui::Context::default();
+    app.hooks.pick_save = Some(Box::new(|_: &str| panic!("the blocking dialog is not used")));
+    let pending: Arc<Mutex<Vec<(crate::FileDialog, crate::DialogDone)>>> = Arc::default();
+    let queue = pending.clone();
+    app.hooks.file_dialog_async = Some(Box::new(move |dialog, done| queue.lock().unwrap().push((dialog, done))));
+    assert_eq!(invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap(), json!({"dialog": "file.saveAs"}));
+    let (dialog, done) = pending.lock().unwrap().pop().expect("a dialog was shown");
+    assert_eq!(dialog, crate::FileDialog::Save { default: "Untitled Project.ecproj".into(), ext: "ecproj".into(), project: true });
+    assert!(app.session.path.is_none(), "nothing saved until the dialog answers");
+    let dir = std::env::temp_dir().join(format!("ec-dialog-answer-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let path = dir.join("Answered.ecproj");
+    // Answered from another thread, as the host's dialog does.
+    std::thread::spawn(move || done(vec![path.to_string_lossy().to_string()])).join().unwrap();
+    app.run_dialog_answers();
+    assert_eq!(app.session.path.as_deref(), Some(dir.join("Answered.ecproj").to_string_lossy().as_ref()));
+    assert!(dir.join("Answered.ecproj").is_file());
+    // Cancelled: nothing runs.
+    invoke(&mut app, &ctx, "comp.saveFrameAs", json!({})).unwrap();
+    let (dialog, done) = pending.lock().unwrap().pop().expect("a dialog was shown");
+    assert_eq!(dialog, crate::FileDialog::Save { default: "Frame.png".into(), ext: "png".into(), project: false });
+    done(Vec::new());
+    app.run_dialog_answers();
+    assert!(!dir.join("Frame.png").exists());
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
+/// While a command's OS file dialog is up, floating panels' OS windows are blocked, as for
+/// a modal dialog; a dialog that ends, answered or not, unblocks them, and Save As opens a
+/// dialog again. A macOS sheet can end without answering (its window went away): once one of
+/// the app's windows has the keyboard again, or keeps it as if no dialog showed, floating
+/// windows are not left blocked.
+#[test]
+fn file_dialogs_block_floating_windows_only_while_up() {
+    use std::sync::{Arc, Mutex};
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let ctx = egui::Context::default();
+    let pending: Arc<Mutex<Vec<crate::DialogDone>>> = Arc::default();
+    let queue = pending.clone();
+    app.hooks.file_dialog_async = Some(Box::new(move |_dialog, done| queue.lock().unwrap().push(done)));
+    let blocked = |app: &mut EffectcraftApp, focused: bool, time: f64| {
+        let input = egui::RawInput { focused, time: Some(time), ..Default::default() };
+        let mut out = false;
+        ctx.run_ui(input, |ui| out = app.floats_blocked(ui.ctx())).textures_delta.clear();
+        out
+    };
+    assert!(!blocked(&mut app, true, 0.0));
+    // Cancelled.
+    invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap();
+    assert!(blocked(&mut app, true, 0.1), "blocked while the dialog takes the keyboard");
+    assert!(blocked(&mut app, false, 0.2));
+    let done = pending.lock().unwrap().pop().expect("a dialog was shown");
+    done(Vec::new());
+    app.run_dialog_answers();
+    assert!(!blocked(&mut app, false, 0.3));
+    // Save As asks again; the sheet ends without answering.
+    invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap();
+    assert_eq!(pending.lock().unwrap().len(), 1, "Save As opens a dialog again");
+    assert!(blocked(&mut app, true, 1.0));
+    assert!(blocked(&mut app, false, 1.1));
+    assert!(blocked(&mut app, false, 9.0), "a dialog may stay up for long");
+    assert!(!blocked(&mut app, true, 9.1), "an app window has the keyboard again");
+    // A dialog that never takes the keyboard.
+    invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap();
+    assert!(blocked(&mut app, true, 10.0));
+    assert!(blocked(&mut app, true, 11.0));
+    assert!(!blocked(&mut app, true, 12.5));
+    // Answers of dialogs taken for gone arrive late: nothing stays blocked.
+    for done in pending.lock().unwrap().drain(..) {
+        done(Vec::new());
+    }
+    app.run_dialog_answers();
+    assert!(!blocked(&mut app, false, 13.0));
+    invoke(&mut app, &ctx, "file.saveAs", json!({})).unwrap();
+    assert!(blocked(&mut app, false, 13.1), "a later dialog blocks again");
+}
+
+#[test]
+fn tga_is_available_in_import_replace_and_proxy_dialogs() {
+    use std::sync::{Arc, Mutex};
+    let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+    let ctx = egui::Context::default();
+    let pending = Arc::new(Mutex::new(Vec::new()));
+    let queue = pending.clone();
+    app.hooks.file_dialog_async = Some(Box::new(move |dialog, _done| queue.lock().unwrap().push(dialog)));
+    for command in ["file.import", "file.importMultiple", "file.replaceFootage", "file.setProxy"] {
+        assert_eq!(invoke(&mut app, &ctx, command, json!({})).unwrap(), json!({"dialog": command}));
+        let crate::FileDialog::Open { exts, .. } = pending.lock().unwrap().pop().unwrap() else { panic!("not an open dialog") };
+        assert!(exts.iter().any(|ext| ext == "tga"), "{command}: {exts:?}");
+    }
+}
+
+#[test]
+fn menu_items_cover_the_tree() {
+    assert_eq!(menus().last(), Some(&"Help"));
+    assert!(effectcraft_engine::menus::entries().len() > 500);
+}
diff --git a/crates/ui-egui/src/native_menu.rs b/crates/ui-egui/src/native_menu.rs
index ad30ded58..fac8f0d53 100644
--- a/crates/ui-egui/src/native_menu.rs
+++ b/crates/ui-egui/src/native_menu.rs
@@ -126,6 +126,27 @@ impl NativeMenu {
     }
 }
 
+/// The native menu spec as the menu bar shows it now: [`build`], with the Edit items a text field
+/// takes ([`edits_text`]) enabled while one has the keyboard ([`text_field_window`]). Paste
+/// otherwise follows the project clipboard and would be greyed out with nothing copied there,
+/// while the field can paste.
+pub fn build_now(app: &EffectcraftApp, ctx: &egui::Context) -> NativeMenu {
+    fn enable(nodes: &mut [NativeNode]) {
+        for node in nodes {
+            match node {
+                NativeNode::Item(item) if edits_text(&item.command) => item.enabled = true,
+                NativeNode::Submenu { children, .. } => enable(children),
+                _ => {}
+            }
+        }
+    }
+    let mut menu = build(app);
+    if text_field_window(ctx).is_some() {
+        enable(&mut menu.menus);
+    }
+    menu
+}
+
 /// Build the native menu spec for the app's current state.
 pub fn build(app: &EffectcraftApp) -> NativeMenu {
     fn rec(app: &EffectcraftApp, nodes: &[MenuNode], path: &str, out: &mut Vec<NativeNode>) {
@@ -206,6 +227,8 @@ pub fn build(app: &EffectcraftApp) -> NativeMenu {
                                     "Serviços"
                                 } else if crate::i18n::czech(app) {
                                     "Služby"
+                                } else if crate::i18n::georgian(app) {
+                                    "სერვისები"
                                 } else {
                                     "Services"
                                 }
@@ -317,6 +340,7 @@ pub fn state_key(app: &EffectcraftApp) -> u64 {
     s.journal.last().map(|j| &j.0).hash(&mut h);
     s.prefs.recent_projects.hash(&mut h);
     (&s.prefs.recent_footage, &s.prefs.recent_presets).hash(&mut h);
+    s.prefs.recent_scripts.hash(&mut h);
     s.history.undo.iter().for_each(|(l, _)| l.hash(&mut h));
     s.state.open_comps.hash(&mut h);
     s.active_comp_id().and_then(|c| s.state.views3d.get(&c)).map(|v| format!("{:?}", v.current)).hash(&mut h);
@@ -330,9 +354,23 @@ pub fn state_key(app: &EffectcraftApp) -> u64 {
     h.finish()
 }
 
-/// Commands that act on a focused text field instead (Edit menu while typing): the egui event to
-/// send in their place.
-fn text_field_event(command: &str, clipboard: Option<String>) -> Option<Vec<egui::Event>> {
+/// The window whose text field has the keyboard: a floating panel's own OS window, or the main
+/// window, where any widget that holds the keyboard counts (the Viewer's text editor is not an
+/// egui text field).
+pub fn text_field_window(ctx: &egui::Context) -> Option<egui::ViewportId> {
+    craft_ui::docking::typing_window(ctx).or_else(|| ctx.egui_wants_keyboard_input().then_some(egui::ViewportId::ROOT))
+}
+
+/// Whether a focused text field takes the menu command `command` ([`activate`]): the native menu
+/// keeps such items enabled while one has the keyboard, whatever the project allows.
+pub fn edits_text(command: &str) -> bool {
+    text_field_event(command).is_some()
+}
+
+/// Commands that act on a focused text field instead (Edit menu while typing): the egui events
+/// to send in their place. Paste is a Cmd+V press, which the field's window turns into a request
+/// for the clipboard text.
+fn text_field_event(command: &str) -> Option<Vec<egui::Event>> {
     let key = |k: egui::Key, shift: bool| egui::Event::Key {
         key: k,
         physical_key: None,
@@ -343,7 +381,7 @@ fn text_field_event(command: &str, clipboard: Option<String>) -> Option<Vec<egui
     Some(match command {
         "edit.copy" => vec![egui::Event::Copy],
         "edit.cut" => vec![egui::Event::Cut],
-        "edit.paste" => vec![egui::Event::Paste(clipboard?)],
+        "edit.paste" => vec![key(egui::Key::V, false)],
         "edit.selectAll" => vec![key(egui::Key::A, false)],
         "edit.undo" => vec![key(egui::Key::Z, false)],
         "edit.redo" => vec![key(egui::Key::Z, true)],
@@ -351,8 +389,43 @@ fn text_field_event(command: &str, clipboard: Option<String>) -> Option<Vec<egui
     })
 }
 
+/// Hand a text field's Edit command to the window `window` whose field has the keyboard. The
+/// main window gets the clipboard text itself and the events through the synthetic queue; a
+/// floating panel's OS window gets each key pressed and released, and asks for the clipboard
+/// text on Cmd+V (`craft_ui::docking::send_keys`).
+fn send_to_text_field(app: &mut EffectcraftApp, ctx: &egui::Context, window: egui::ViewportId, events: Vec<egui::Event>) {
+    if window == egui::ViewportId::ROOT {
+        for event in events {
+            match event {
+                egui::Event::Key { key: egui::Key::V, .. } => {
+                    if let Some(text) = app.hooks.clipboard_text.as_ref().and_then(|f| f()) {
+                        app.synthetic.push(egui::Event::Paste(text));
+                    }
+                }
+                event => app.synthetic.push(event),
+            }
+        }
+        ctx.request_repaint();
+        return;
+    }
+    let events = events
+        .into_iter()
+        .flat_map(|event| {
+            let release = match &event {
+                egui::Event::Key { key, physical_key, modifiers, .. } => {
+                    Some(egui::Event::Key { key: *key, physical_key: *physical_key, pressed: false, repeat: false, modifiers: *modifiers })
+                }
+                _ => None,
+            };
+            std::iter::once(event).chain(release)
+        })
+        .collect();
+    craft_ui::docking::send_keys(ctx, window, events);
+}
+
 /// Run a native menu item (by id) the way the in-window menu bar does. While a text field has
-/// the keyboard, Edit ▸ Cut/Copy/Paste/Select All/Undo/Redo edit the text instead.
+/// the keyboard ([`text_field_window`]), Edit ▸ Cut/Copy/Paste/Select All/Undo/Redo edit the
+/// text instead.
 pub fn activate(app: &mut EffectcraftApp, ctx: &egui::Context, menu: &NativeMenu, id: &str) -> Result<Value, String> {
     let item = menu.find(id).ok_or_else(|| format!("no native menu item `{id}`"))?;
     let (command, params) = (item.command.clone(), item.params.clone());
@@ -367,13 +440,12 @@ pub fn activate(app: &mut EffectcraftApp, ctx: &egui::Context, menu: &NativeMenu
         ctx.request_repaint();
         return Ok(Value::Null);
     }
-    if ctx.egui_wants_keyboard_input() {
-        let clip = if command == "edit.paste" { app.hooks.clipboard_text.as_ref().and_then(|f| f()) } else { None };
-        if let Some(events) = text_field_event(&command, clip) {
-            app.synthetic.extend(events);
-            ctx.request_repaint();
-            return Ok(Value::Null);
-        }
+    // The menu bar takes the Edit menu's key equivalents before any window sees them: while a
+    // text field has the keyboard, in the main window or a floating panel's own window, the
+    // field gets the key and the project command does not run.
+    if let (Some(window), Some(events)) = (text_field_window(ctx), text_field_event(&command)) {
+        send_to_text_field(app, ctx, window, events);
+        return Ok(Value::Null);
     }
     let params = if params.is_null() { json!({}) } else { params };
     let (command, params) = crate::menus::menu_choice(app, command, params);
@@ -490,6 +562,27 @@ mod tests {
         assert_eq!(translated, ["Služby", "Skrýt EffectCraft", "Skrýt ostatní", "Zobrazit vše"]);
     }
 
+    #[test]
+    fn georgian_translates_macos_predefined_items() {
+        if !cfg!(target_os = "macos") {
+            return;
+        }
+        let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
+        app.session.execute("prefs.set", json!({"key": "general.language", "value": "ka"})).unwrap();
+        fn labels(nodes: &[NativeNode], out: &mut Vec<String>) {
+            for node in nodes {
+                match node {
+                    NativeNode::Predefined { label, .. } => out.push(label.clone()),
+                    NativeNode::Submenu { children, .. } => labels(children, out),
+                    _ => {}
+                }
+            }
+        }
+        let mut translated = vec![];
+        labels(&build(&app).menus, &mut translated);
+        assert_eq!(translated, ["სერვისები", "EffectCraft-ის დამალვა", "სხვების დამალვა", "ყველას ჩვენება"]);
+    }
+
     #[test]
     fn hide_items_are_predefined_on_macos() {
         let spec = build(&app());
@@ -582,7 +675,7 @@ mod tests {
         assert_ne!(state_key(&app), k0);
         // A tab behind another one, a closed panel and panels under a maximized one are not shown.
         assert_eq!((checked(&app, "renderQueue"), checked(&app, "timeline")), (Some(true), Some(false)));
-        app.ui.dock.close(PanelKind::RenderQueue);
+        app.close_panel(PanelKind::RenderQueue);
         assert_eq!((checked(&app, "renderQueue"), checked(&app, "timeline")), (Some(false), Some(true)));
         app.ui.maximized = Some(PanelKind::Timeline);
         assert_eq!((checked(&app, "timeline"), checked(&app, "project")), (Some(true), Some(false)));
@@ -625,9 +718,9 @@ mod tests {
             activate(app, &ctx, &spec, &id).unwrap();
         };
         choose(&mut app);
-        assert!(app.ui.dock.contains(PanelKind::Align));
+        assert!(crate::dock::WorkspaceExt::is_open(&app.ui.dock, PanelKind::Align));
         choose(&mut app);
-        assert!(!app.ui.dock.contains(PanelKind::Align));
+        assert!(!crate::dock::WorkspaceExt::is_open(&app.ui.dock, PanelKind::Align));
     }
 
     #[test]
@@ -640,8 +733,7 @@ mod tests {
         activate(&mut app, &ctx, &spec, &id).unwrap();
         assert_eq!(app.session.active_comp().unwrap().layers.len(), n + 1);
         assert!(activate(&mut app, &ctx, &spec, "m.999").is_err());
-        assert!(text_field_event("edit.copy", None).is_some());
-        assert!(text_field_event("edit.paste", None).is_none());
-        assert!(text_field_event("layer.newNull", None).is_none());
+        assert!(edits_text("edit.copy") && edits_text("edit.paste"));
+        assert!(!edits_text("layer.newNull"));
     }
 }
diff --git a/crates/ui-egui/src/panels/mod.rs b/crates/ui-egui/src/panels.rs
similarity index 77%
rename from crates/ui-egui/src/panels/mod.rs
rename to crates/ui-egui/src/panels.rs
index 1b6ef8c33..9a8fd2a54 100644
--- a/crates/ui-egui/src/panels/mod.rs
+++ b/crates/ui-egui/src/panels.rs
@@ -35,6 +35,7 @@ pub mod paint_panels;
 pub mod panel_kit;
 pub mod path_vr_panels;
 pub mod precomp;
+pub mod primitive_dialog;
 pub mod project;
 pub mod properties;
 pub mod puppet_tool;
@@ -48,6 +49,7 @@ pub mod settings;
 pub mod shortcut_editor;
 pub mod templates;
 pub mod text_panels;
+pub mod text_range_handles;
 pub mod timeline;
 pub mod tracker;
 pub mod unsaved;
@@ -75,12 +77,49 @@ pub enum DragPayload {
     Item(u64),
     /// An effect id from Effects & Presets.
     Effect(String),
+    /// An animation preset from Effects & Presets, with its display name for the drag ghost.
+    Preset { preset: PresetRef, name: String },
     /// A property dragged from the timeline (to the Essential Graphics panel).
     Property { layer: u64, prop: u64 },
     /// Files from the Media Browser (import; into the timeline: import and add).
     Files(Vec<String>),
 }
 
+/// An animation preset in Effects & Presets.
+#[derive(Clone, Debug, PartialEq)]
+pub enum PresetRef {
+    /// A text animation preset id (`layer.applyTextPreset`).
+    Text(String),
+    /// A built-in animation preset id, e.g. a transition (`anim.applyBuiltinPreset`).
+    Builtin(String),
+    /// A user `.ecpreset` file path (`anim.applyPreset`).
+    File(String),
+}
+
+impl PresetRef {
+    /// The command and params that apply the preset to the selected layers.
+    pub fn command(&self) -> (&'static str, serde_json::Value) {
+        match self {
+            PresetRef::Text(id) => ("layer.applyTextPreset", serde_json::json!({"preset": id})),
+            PresetRef::Builtin(id) => ("anim.applyBuiltinPreset", serde_json::json!({"preset": id})),
+            PresetRef::File(path) => ("anim.applyPreset", serde_json::json!({"path": path})),
+        }
+    }
+
+    /// The command and params that apply the preset to `layer` (a drop target).
+    pub fn apply_to(&self, layer: u64) -> (&'static str, serde_json::Value) {
+        let (id, mut params) = self.command();
+        if let Some(obj) = params.as_object_mut() {
+            // `layer.applyTextPreset` takes one `layer`; the animation preset commands take `layers`.
+            match self {
+                PresetRef::Text(_) => obj.insert("layer".into(), serde_json::json!(layer)),
+                PresetRef::Builtin(_) | PresetRef::File(_) => obj.insert("layers".into(), serde_json::json!([layer])),
+            };
+        }
+        (id, params)
+    }
+}
+
 /// Layers carried by a Project item drag. Dragging a selected item uses the
 /// complete selection, while dragging an unselected item uses only that item.
 /// Folders and data files are not composition layers.
@@ -113,6 +152,11 @@ pub fn timecode(session: &Session, comp: &Comp, t: Tick) -> String {
     effectcraft_engine::commands::time::display_time(session, comp, t)
 }
 
+/// A length (a Duration) formatted per project settings, with no start offset.
+pub fn duration(session: &Session, comp: &Comp, len: Tick) -> String {
+    effectcraft_engine::commands::time::display_duration(session, comp, len)
+}
+
 /// Ctrl/Cmd-click on a current-time display toggles the project's Time Display Style between
 /// Timecode and Frames, as in After Effects (through Project Settings: one undo step).
 pub(crate) fn toggle_time_display(app: &mut EffectcraftApp, resp: &egui::Response) {
@@ -174,12 +218,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: PanelKind, rect: Rec
 
 /// The ≡ panel menu (opened from a tab).
 pub fn panel_menu_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
-    let id = egui::Id::new("panel-menu");
+    let id = egui::Id::unique("panel-menu");
     let Some((panel, pos)) = ui.ctx().data(|d| d.get_temp::<(PanelKind, egui::Pos2)>(id)) else { return };
-    // The menu opens in the window that shows the panel (a panel can have its own window).
-    if app.panel_viewport(ui.ctx(), panel) != ui.ctx().viewport_id() {
-        return;
-    }
     let mut close = false;
     let area = egui::Area::new(id.with("area")).order(egui::Order::Foreground).fixed_pos(pos).show(ui.ctx(), |ui| {
         egui::Frame::popup(ui.style()).show(ui, |ui| {
@@ -188,13 +228,14 @@ pub fn panel_menu_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
                 let _ = app.dock_command(ui.ctx(), craft_ui::docking::Action::Close { panel });
                 close = true;
             }
-            let floating = app.ui.floating.iter().any(|f| f.panels.contains(&panel));
+            let floating = crate::dock::WorkspaceExt::is_floating(&app.ui.dock, panel);
             if !floating && ui.button(tr("Undock Panel")).clicked() {
                 let r = crate::dock_ui::default_float_rect(ui.ctx().content_rect());
                 let _ = app.dock_command(ui.ctx(), craft_ui::docking::Action::Float { panel, rect: r });
                 close = true;
             }
-            // Multiple monitors: a native window of its own, which can go on another screen.
+            // Multiple monitors: an OS window of its own, which can go on another screen. Where
+            // egui embeds viewports (the web), floating windows stay in the page.
             if !ui.ctx().embed_viewports() {
                 let windowed = app.in_panel_window(panel);
                 if ui.button(if windowed { tr("Move Panel to Main Window") } else { tr("Move Panel to New Window") }).clicked() {
@@ -249,3 +290,18 @@ pub fn panel_menu_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
         ui.ctx().data_mut(|d| d.remove::<(PanelKind, egui::Pos2)>(id));
     }
 }
+
+#[cfg(test)]
+mod preset_drop_tests {
+    use super::PresetRef;
+    use serde_json::json;
+
+    #[test]
+    fn preset_drops_target_the_layer_with_each_commands_param() {
+        assert_eq!(PresetRef::Text("typewriter".into()).apply_to(7), ("layer.applyTextPreset", json!({"preset": "typewriter", "layer": 7})));
+        assert_eq!(PresetRef::Builtin("fadeIn".into()).apply_to(7), ("anim.applyBuiltinPreset", json!({"preset": "fadeIn", "layers": [7]})));
+        assert_eq!(PresetRef::File("/p/a.ecpreset".into()).apply_to(7), ("anim.applyPreset", json!({"path": "/p/a.ecpreset", "layers": [7]})));
+        // Double-click applies to the selection: no layer given.
+        assert_eq!(PresetRef::Text("typewriter".into()).command(), ("layer.applyTextPreset", json!({"preset": "typewriter"})));
+    }
+}
diff --git a/crates/ui-egui/src/panels/anim_tools.rs b/crates/ui-egui/src/panels/anim_tools.rs
index 15a4f4f89..b07da8567 100644
--- a/crates/ui-egui/src/panels/anim_tools.rs
+++ b/crates/ui-egui/src/panels/anim_tools.rs
@@ -22,7 +22,7 @@ fn label(p: &egui::Painter, x: f32, y: f32, s: &str, t: &Tokens) {
 /// A dropdown with options; returns the new index when changed.
 fn choice(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, auto: &str, options: &[&str], cur: usize) -> Option<usize> {
     let t = app.tokens;
-    let id = egui::Id::new(("animtool-dd", auto));
+    let id = egui::Id::unique(("animtool-dd", auto));
     if widgets::dropdown(ui, r, options.get(cur).copied().unwrap_or(""), &t, id).clicked() {
         widgets::open_popup(ui, id);
     }
@@ -31,17 +31,21 @@ fn choice(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, auto: &str, opti
     widgets::popup_menu(ui, id, r.left_bottom(), &opts, Some(cur)).filter(|i| *i != cur)
 }
 
-fn number(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, auto: &str, v: f64, speed: f64, range: (f64, f64), dec: usize, suffix: &str) -> f64 {
+/// A drag-to-change number field for an anim-tool setting: `v` clamped to `range`, `speed` points
+/// per pixel, `dec` decimals and a `suffix`; returns the new value, or `v` when it did not change.
+fn number(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, auto: &str, v: f64, spec: widgets::HotSpec) -> f64 {
     let t = app.tokens;
-    let (r, nv, _) = widgets::hot_number_at(ui, at, egui::Id::new(("animtool-n", auto)), v, speed, range, dec, suffix, &t);
+    let (r, nv, _) = widgets::hot_number_at(ui, at, egui::Id::unique(("animtool-n", auto)), v, &spec, &t);
     app.auto.add(auto, r, &format!("{v}"));
     nv.unwrap_or(v)
 }
 
+/// A checkbox at `at` with its `text` label drawn to its right; returns the state to store, i.e.
+/// `!on` when it was clicked and `on` otherwise.
 fn checkbox(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, auto: &str, text: &str, on: bool) -> bool {
     let t = app.tokens;
     let r = Rect::from_min_size(at, vec2(16.0, 16.0));
-    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::new(("animtool-cb", auto))).clicked();
+    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::unique(("animtool-cb", auto))).clicked();
     ui.painter().text(pos2(r.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, text, Tokens::ui(12.0), t.text);
     app.auto.add(auto, r, text);
     if clicked { !on } else { on }
@@ -101,15 +105,29 @@ pub fn wiggler(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     y += ROW + 4.0;
     label(&p, x0, y, "Frequency:", &t);
-    st.wiggle_frequency = number(app, ui, pos2(xv, y), "wiggler.frequency", st.wiggle_frequency, 0.1, (0.1, 100.0), 1, " per second");
+    st.wiggle_frequency = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "wiggler.frequency",
+        st.wiggle_frequency,
+        widgets::HotSpec { speed: 0.1, range: (0.1, 100.0), decimals: 1, suffix: " per second" },
+    );
     y += ROW;
     label(&p, x0, y, "Magnitude:", &t);
-    st.wiggle_magnitude = number(app, ui, pos2(xv, y), "wiggler.magnitude", st.wiggle_magnitude, 0.5, (0.0, 100_000.0), 1, "");
+    st.wiggle_magnitude = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "wiggler.magnitude",
+        st.wiggle_magnitude,
+        widgets::HotSpec { speed: 0.5, range: (0.0, 100_000.0), decimals: 1, suffix: "" },
+    );
     y += ROW + 8.0;
     app.ui.anim_tools = st.clone();
     let b = Rect::from_min_size(pos2(rect.max.x - 92.0, y), vec2(80.0, 24.0));
     let enabled = app.session.state.selected_keys.len() >= 2;
-    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::new("wg-apply")).clicked() {
+    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::unique("wg-apply")).clicked() {
         let params = json!({
             "apply": if st.wiggle_spatial { "spatial" } else { "temporal" },
             "noise": if st.wiggle_smooth { "smooth" } else { "jagged" },
@@ -145,12 +163,19 @@ pub fn smoother(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     p.text(pos2(xv, y + 9.0), Align2::LEFT_CENTER, txt, Tokens::ui(12.0), t.text);
     y += ROW;
     label(&p, x0, y, "Tolerance:", &t);
-    let tol = number(app, ui, pos2(xv, y), "smoother.tolerance", app.ui.anim_tools.smooth_tolerance, 0.05, (0.0, 10_000.0), 2, "");
+    let tol = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "smoother.tolerance",
+        app.ui.anim_tools.smooth_tolerance,
+        widgets::HotSpec { speed: 0.05, range: (0.0, 10_000.0), decimals: 2, suffix: "" },
+    );
     app.ui.anim_tools.smooth_tolerance = tol;
     y += ROW + 8.0;
     let b = Rect::from_min_size(pos2(rect.max.x - 92.0, y), vec2(80.0, 24.0));
     let enabled = app.session.state.selected_keys.len() >= 3;
-    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::new("sm-apply")).clicked() {
+    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::unique("sm-apply")).clicked() {
         apply(app, "keys.smooth", json!({"tolerance": tol}));
     }
     app.auto.add("smoother.apply", b, "Apply");
@@ -166,10 +191,24 @@ pub fn motion_sketch(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let mut y = rect.min.y + 10.0;
     let mut st = app.ui.anim_tools.clone();
     label(&p, x0, y, "Capture speed at:", &t);
-    st.sketch_speed = number(app, ui, pos2(xv, y), "motionSketch.captureSpeed", st.sketch_speed, 1.0, (1.0, 10_000.0), 0, " %");
+    st.sketch_speed = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "motionSketch.captureSpeed",
+        st.sketch_speed,
+        widgets::HotSpec { speed: 1.0, range: (1.0, 10_000.0), decimals: 0, suffix: " %" },
+    );
     y += ROW;
     label(&p, x0, y, "Smoothing:", &t);
-    st.sketch_smoothing = number(app, ui, pos2(xv, y), "motionSketch.smoothing", st.sketch_smoothing, 0.1, (0.0, 100.0), 1, "");
+    st.sketch_smoothing = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "motionSketch.smoothing",
+        st.sketch_smoothing,
+        widgets::HotSpec { speed: 0.1, range: (0.0, 100.0), decimals: 1, suffix: "" },
+    );
     y += ROW + 2.0;
     p.text(pos2(x0, y + 8.0), Align2::LEFT_CENTER, tr("Show:"), Tokens::ui(12.0), t.text_dim);
     y += ROW - 6.0;
@@ -184,13 +223,19 @@ pub fn motion_sketch(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let fr = c.frame_rate;
     let (s, e) = (app.session.time(), c.work_area.1);
     let tc = |x| crate::panels::timecode(&app.session, c, x);
-    p.text(pos2(x0, y + 8.0), Align2::LEFT_CENTER, tr_args("Start: {}   Duration: {}", &[&(tc(s)), &(tc(e - s))]), Tokens::ui(11.0), t.text_faint);
+    p.text(
+        pos2(x0, y + 8.0),
+        Align2::LEFT_CENTER,
+        tr_args("Start: {}   Duration: {}", &[&(tc(s)), &crate::panels::duration(&app.session, c, e - s)]),
+        Tokens::ui(11.0),
+        t.text_faint,
+    );
     let _ = fr;
     y += ROW;
     let b = Rect::from_min_size(pos2(x0, y), vec2(120.0, 24.0));
     let armed = st.sketch_armed;
     let has_layer = !app.session.state.selected_layers.is_empty();
-    if widgets::text_button(ui, b, if armed { "Cancel Capture" } else { "Start Capture" }, has_layer && !armed, &t, egui::Id::new("ms-start")).clicked() {
+    if widgets::text_button(ui, b, if armed { "Cancel Capture" } else { "Start Capture" }, has_layer && !armed, &t, egui::Id::unique("ms-start")).clicked() {
         if !has_layer {
             app.ui.status = "Select a layer to sketch its motion".into();
         } else {
@@ -212,8 +257,10 @@ struct Capture {
     points: Vec<[f64; 3]>,
 }
 
+/// The `egui::Id` of the Motion Sketch capture in progress ([`Capture`]): its start time and the
+/// recorded points.
 fn capture_id() -> egui::Id {
-    egui::Id::new("motion-sketch-capture")
+    egui::Id::unique("motion-sketch-capture")
 }
 
 /// The Motion Sketch overlay on the Composition viewer (`area`): while armed, a press starts
@@ -224,9 +271,9 @@ pub fn sketch_overlay(app: &mut EffectcraftApp, ui: &mut egui::Ui) {
         return;
     }
     let ctx = ui.ctx().clone();
-    let Some(map) = ctx.data(|d| d.get_temp::<crate::panels::viewer::ViewerMap>(egui::Id::new("viewer-map"))) else { return };
+    let Some(map) = ctx.data(|d| d.get_temp::<crate::panels::viewer::ViewerMap>(egui::Id::unique("viewer-map"))) else { return };
     let area = map.area;
-    let resp = ui.interact(area, egui::Id::new("motion-sketch-overlay"), Sense::drag());
+    let resp = ui.interact(area, egui::Id::unique("motion-sketch-overlay"), Sense::drag());
     app.auto.add("motionSketch.overlay", area, "Motion Sketch capture area");
     let now = ctx.input(|i| i.time);
     let painter = ui.painter().with_clip_rect(area);
@@ -316,7 +363,14 @@ pub fn mask_interpolation(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rec
         changes.insert("keyframeRate".into(), if i == 0 { json!("auto") } else { json!(fps) });
     }
     if let Some(r) = o.keyframe_rate {
-        let nr = number(app, ui, pos2(xv + 78.0, y), "maskInterp.rate", r, 0.5, (0.1, 1000.0), 1, " per second");
+        let nr = number(
+            app,
+            ui,
+            pos2(xv + 78.0, y),
+            "maskInterp.rate",
+            r,
+            widgets::HotSpec { speed: 0.5, range: (0.1, 1000.0), decimals: 1, suffix: " per second" },
+        );
         if (nr - r).abs() > 1e-9 {
             changes.insert("keyframeRate".into(), json!(nr));
         }
@@ -334,13 +388,20 @@ pub fn mask_interpolation(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rec
     check(app, y, "linearVertexPaths", "Use \"Linear\" Vertex Paths", o.linear_vertex_paths);
     y += ROW;
     label(&p, x0, y, "Bending Resistance:", &t);
-    let br = number(app, ui, pos2(xv, y), "maskInterp.bendingResistance", o.bending_resistance, 0.5, (0.0, 100.0), 0, "");
+    let br = number(
+        app,
+        ui,
+        pos2(xv, y),
+        "maskInterp.bendingResistance",
+        o.bending_resistance,
+        widgets::HotSpec { speed: 0.5, range: (0.0, 100.0), decimals: 0, suffix: "" },
+    );
     if (br - o.bending_resistance).abs() > 1e-9 {
         changes.insert("bendingResistance".into(), json!(br));
     }
     y += ROW;
     label(&p, x0, y, "Quality:", &t);
-    let q = number(app, ui, pos2(xv, y), "maskInterp.quality", o.quality, 0.5, (0.0, 100.0), 0, "");
+    let q = number(app, ui, pos2(xv, y), "maskInterp.quality", o.quality, widgets::HotSpec { speed: 0.5, range: (0.0, 100.0), decimals: 0, suffix: "" });
     if (q - o.quality).abs() > 1e-9 {
         changes.insert("quality".into(), json!(q));
     }
@@ -351,7 +412,8 @@ pub fn mask_interpolation(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rec
     }
     y += ROW;
     if let Some(v) = o.add_vertices {
-        let nv = number(app, ui, pos2(x0 + 22.0, y), "maskInterp.addVertices", v, 0.2, (0.1, 2000.0), 1, "");
+        let nv =
+            number(app, ui, pos2(x0 + 22.0, y), "maskInterp.addVertices", v, widgets::HotSpec { speed: 0.2, range: (0.1, 2000.0), decimals: 1, suffix: "" });
         if (nv - v).abs() > 1e-9 {
             changes.insert("addVertices".into(), json!(nv));
         }
@@ -392,7 +454,7 @@ pub fn mask_interpolation(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rec
     }
     let b = Rect::from_min_size(pos2(rect.max.x - 92.0, y), vec2(80.0, 24.0));
     let enabled = app.session.state.selected_keys.len() >= 2;
-    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::new("mi-apply")).clicked() {
+    if widgets::text_button(ui, b, "Apply", enabled, &t, egui::Id::unique("mi-apply")).clicked() {
         match app.session.execute("mask.interpolate", json!({})) {
             Ok(r) => app.ui.status = format!("Mask Interpolation: {} keyframes added ({} vertices)", r["keys"], r["vertices"]),
             Err(e) => app.ui.status = e.to_string(),
diff --git a/crates/ui-egui/src/panels/camera_tracker_ui.rs b/crates/ui-egui/src/panels/camera_tracker_ui.rs
index 2bccfae07..bca98ea4b 100644
--- a/crates/ui-egui/src/panels/camera_tracker_ui.rs
+++ b/crates/ui-egui/src/panels/camera_tracker_ui.rs
@@ -217,11 +217,11 @@ pub fn viewer_hook(
     // Interaction over the image.
     // While Space (Hand tool) is held the overlay only hovers, so the viewer underneath gets the pan drag.
     let sense = if super::space_hand(&ctx) { Sense::hover() } else { Sense::click_and_drag() };
-    let resp = ui.interact(map.area, egui::Id::new("viewer-camera-tracker"), sense);
+    let resp = ui.interact(map.area, egui::Id::unique("viewer-camera-tracker"), sense);
     app.auto.add("viewer.cameraTracker", map.area, "3D Camera Tracker points");
     // The overlay is on top of the viewer, so a middle-button drag lands here: pan the viewer like the Hand tool.
     if resp.dragged_by(egui::PointerButton::Middle) {
-        let pid = egui::Id::new("viewer-camera-tracker-pan");
+        let pid = egui::Id::unique("viewer-camera-tracker-pan");
         if resp.drag_started() {
             let start_pan = app.ui.viewer.pan;
             ui.data_mut(|d| d.insert_temp(pid, start_pan));
@@ -237,7 +237,7 @@ pub fn viewer_hook(
     let hover = resp.hover_pos();
     let point_at = |p: Pos2| hits.iter().filter(|h| h.1.distance(p) <= h.2 + 3.0).min_by(|x, y| x.1.distance(p).total_cmp(&y.1.distance(p))).map(|h| h.0);
     let tri = hover.filter(|p| point_at(*p).is_none()).and_then(|p| triangle_at(&hits, p));
-    let mid = egui::Id::new("viewer-camera-tracker-marquee");
+    let mid = egui::Id::unique("viewer-camera-tracker-marquee");
     let marquee: Option<Pos2> = ui.data(|d| d.get_temp(mid));
     // Hover target / the selection's target.
     if marquee.is_none() {
@@ -284,7 +284,7 @@ pub fn viewer_hook(
         }
     }
     // Right-click: the points under the cursor (selection, else the hovered triangle).
-    let cid = egui::Id::new("viewer-camera-tracker-menu-points");
+    let cid = egui::Id::unique("viewer-camera-tracker-menu-points");
     if resp.secondary_clicked() {
         let pts: Vec<u32> = if !selected.is_empty() {
             selected.clone()
@@ -413,12 +413,12 @@ pub fn editor(
     let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
     let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
     let b3 = Rect::from_min_size(pos2(b2.max.x + 8.0, b1.min.y), vec2(110.0, 22.0));
-    if widgets::text_button(ui, b1, "Analyze", false, &t, egui::Id::new(("ct-analyze", g.uid))).clicked() && !busy {
+    if widgets::text_button(ui, b1, "Analyze", false, &t, egui::Id::unique(("ct-analyze", g.uid))).clicked() && !busy {
         actions.push(("camera.analyze".into(), me.clone()));
     }
     app.auto.add(&format!("effectControls.cameraTracker.{}.analyze", g.uid), b1, "Analyze");
     if running {
-        if widgets::text_button(ui, b2, "Cancel", false, &t, egui::Id::new(("ct-cancel", g.uid))).clicked() {
+        if widgets::text_button(ui, b2, "Cancel", false, &t, egui::Id::unique(("ct-cancel", g.uid))).clicked() {
             actions.push(("camera.cancel".into(), json!({})));
         }
         app.auto.add(&format!("effectControls.cameraTracker.{}.cancel", g.uid), b2, "Cancel");
@@ -426,7 +426,7 @@ pub fn editor(
     let params = effectcraft_engine::camera_track::static_params(g);
     let solve = ct::solve(&params);
     if solve.is_some() {
-        if widgets::text_button(ui, b3, "Create Camera", false, &t, egui::Id::new(("ct-camera", g.uid))).clicked() {
+        if widgets::text_button(ui, b3, "Create Camera", false, &t, egui::Id::unique(("ct-camera", g.uid))).clicked() {
             actions.push(("camera.create".into(), me.clone()));
         }
         app.auto.add(&format!("effectControls.cameraTracker.{}.createCamera", g.uid), b3, "Create Camera");
diff --git a/crates/ui-egui/src/panels/comp_settings.rs b/crates/ui-egui/src/panels/comp_settings.rs
index 2cd19df5d..3f7cda26d 100644
--- a/crates/ui-egui/src/panels/comp_settings.rs
+++ b/crates/ui-egui/src/panels/comp_settings.rs
@@ -5,6 +5,7 @@
 use crate::i18n::{tr, tr_args};
 use crate::icons::Icon;
 use effectcraft_engine::prefs::CompPreset;
+use effectcraft_engine::project::Resolution;
 use effectcraft_engine::time::{FrameRate, format_timecode_frames, parse_timecode};
 use egui::{Color32, vec2};
 use serde_json::json;
@@ -94,6 +95,9 @@ pub struct CompDraft {
     pub preserve_frame_rate: bool,
     pub preserve_resolution: bool,
     pub advanced_3d: bool,
+    /// The comp's Resolution (the Composition panel's popup): saved with the project but no undo
+    /// step, so OK sets it apart from `comp.new` / `comp.settings`.
+    pub resolution: Resolution,
     pub tab: Tab,
     /// Timecode text being edited (start, duration).
     pub start_tc: Option<String>,
@@ -122,6 +126,7 @@ impl Default for CompDraft {
             preserve_frame_rate: false,
             preserve_resolution: false,
             advanced_3d: false,
+            resolution: Resolution::Auto,
             tab: Tab::Basic,
             start_tc: None,
             dur_tc: None,
@@ -176,8 +181,10 @@ fn timecode_field(ui: &mut egui::Ui, buf: &mut Option<String>, secs: &mut f64, r
     r
 }
 
+/// The temp-data id of the one-shot flag that makes the Save Preset name field take focus when
+/// it is next drawn.
 fn name_focus_id() -> egui::Id {
-    egui::Id::new("comp-preset-name-focus")
+    egui::Id::unique("comp-preset-name-focus")
 }
 
 /// Save Preset's Choose Name prompt (drawn in its own modal over the dialog while
@@ -279,7 +286,7 @@ pub fn show(
                     .or_else(|| PRESETS.iter().find(|(_, w, h, par, f)| matches(d, *w, *h, *par, *f)).map(|p| p.0))
                     .unwrap_or("Custom");
                 ui.horizontal(|ui| {
-                    let r = egui::ComboBox::from_id_salt("comp-preset").width(300.0).selected_text(current).show_ui(ui, |ui| {
+                    let r = craft_ui::ComboBox::from_id_salt("comp-preset").width(300.0).selected_text(current).show_ui(ui, |ui| {
                         // Your own presets first, then the built-in ones.
                         for q in custom {
                             if ui.selectable_label(q.name == current, &q.name).clicked() {
@@ -297,7 +304,7 @@ pub fn show(
                     });
                     auto.add("dialog.comp.preset", r.response.rect, "Preset");
                     let (save_r, _) = ui.allocate_exact_size(vec2(20.0, 20.0), egui::Sense::hover());
-                    let save = crate::widgets::icon_button(ui, save_r, Icon::Plus, d.preset_name.is_some(), t, egui::Id::new("comp-preset-save"))
+                    let save = crate::widgets::icon_button(ui, save_r, Icon::Plus, d.preset_name.is_some(), t, egui::Id::unique("comp-preset-save"))
                         .on_hover_text(tr("Save Preset…"));
                     auto.add("dialog.comp.presetSave", save_r, "Save Preset");
                     if save.clicked() {
@@ -306,7 +313,7 @@ pub fn show(
                     }
                     if let Some(q) = own {
                         let (del_r, _) = ui.allocate_exact_size(vec2(20.0, 20.0), egui::Sense::hover());
-                        let del = crate::widgets::icon_button(ui, del_r, Icon::Trash, false, t, egui::Id::new("comp-preset-delete"))
+                        let del = crate::widgets::icon_button(ui, del_r, Icon::Trash, false, t, egui::Id::unique("comp-preset-delete"))
                             .on_hover_text(tr("Delete Preset"));
                         auto.add("dialog.comp.presetDelete", del_r, "Delete Preset");
                         if del.clicked() {
@@ -343,7 +350,7 @@ pub fn show(
                         .find(|(_, v)| (v - d.pixel_aspect).abs() < 1e-3)
                         .map(|p| p.0.to_string())
                         .unwrap_or_else(|| format!("{:.2}", d.pixel_aspect));
-                    let r = egui::ComboBox::from_id_salt("comp-par").width(220.0).selected_text(cur).show_ui(ui, |ui| {
+                    let r = craft_ui::ComboBox::from_id_salt("comp-par").width(220.0).selected_text(cur).show_ui(ui, |ui| {
                         for (name, v) in PIXEL_ASPECTS {
                             if ui.selectable_label((v - d.pixel_aspect).abs() < 1e-3, *name).clicked() {
                                 d.pixel_aspect = *v;
@@ -362,7 +369,7 @@ pub fn show(
                     // Any rate can be typed; the list holds the common ones.
                     let r = ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut d.fps).range(1.0..=999.0).speed(0.01).max_decimals(3)));
                     auto.add("dialog.comp.frameRate", r.rect, "Frame Rate");
-                    let r = egui::ComboBox::from_id_salt("comp-fps").width(18.0).selected_text("").show_ui(ui, |ui| {
+                    let r = craft_ui::ComboBox::from_id_salt("comp-fps").width(18.0).selected_text("").show_ui(ui, |ui| {
                         for f in FRAME_RATES {
                             if ui.selectable_label((d.fps - f).abs() < 1e-3, format!("{f}")).clicked() {
                                 d.fps = *f;
@@ -376,9 +383,30 @@ pub fn show(
                     }
                 });
                 ui.end_row();
-                ui.label("");
-                let mb = d.width as f64 * d.height as f64 * 4.0 / (1024.0 * 1024.0);
-                ui.label(egui::RichText::new(tr_args("{} x {}, {}MB per 8bpc frame", &[&d.width, &d.height, &format!("{mb:.1}")])).color(Color32::GRAY));
+                // As in After Effects, the Resolution menu (the Composition panel's popup) with
+                // the frame it renders beside it.
+                ui.label(tr("Resolution:"));
+                ui.horizontal(|ui| {
+                    let r = craft_ui::ComboBox::from_id_salt("comp-resolution").width(90.0).selected_text(tr(d.resolution.label())).show_ui(ui, |ui| {
+                        for res in Resolution::ALL {
+                            ui.selectable_value(&mut d.resolution, res, tr(res.label()));
+                        }
+                        let custom = matches!(d.resolution, Resolution::Custom(_));
+                        if ui.selectable_label(custom, tr("Custom")).clicked() && !custom {
+                            d.resolution = Resolution::Custom(5);
+                        }
+                    });
+                    auto.add("dialog.comp.resolution", r.response.rect, "Resolution");
+                    if let Resolution::Custom(n) = d.resolution {
+                        let mut n = n;
+                        let r = ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut n).range(2..=40)));
+                        auto.add("dialog.comp.resolutionFactor", r.rect, "Custom Resolution");
+                        d.resolution = Resolution::Custom(n);
+                    }
+                    let (w, h) = frame_at(d.width, d.height, d.resolution);
+                    let mb = w as f64 * h as f64 * 4.0 / (1024.0 * 1024.0);
+                    ui.label(egui::RichText::new(tr_args("{} x {}, {}MB per 8bpc frame", &[&w, &h, &format!("{mb:.1}")])).color(Color32::GRAY));
+                });
                 ui.end_row();
                 ui.label(tr("Start Timecode:"));
                 let r = ui.horizontal(|ui| timecode_field(ui, &mut d.start_tc, &mut d.start, rate, i64::MIN / 4)).inner;
@@ -446,7 +474,7 @@ pub fn show(
         Tab::Renderer => {
             ui.horizontal(|ui| {
                 ui.label(tr("Renderer:"));
-                let r = egui::ComboBox::from_id_salt("comp-renderer").selected_text(tr(if d.advanced_3d { "Advanced 3D" } else { "Classic 3D" })).show_ui(
+                let r = craft_ui::ComboBox::from_id_salt("comp-renderer").selected_text(tr(if d.advanced_3d { "Advanced 3D" } else { "Classic 3D" })).show_ui(
                     ui,
                     |ui| {
                         ui.selectable_value(&mut d.advanced_3d, false, tr("Classic 3D"));
@@ -486,10 +514,26 @@ pub fn params(d: &CompDraft) -> serde_json::Value {
     })
 }
 
+/// The frame size the comp renders at `res` (Auto follows the magnification, so the dialog shows
+/// the full frame for it).
+pub fn frame_at(w: u32, h: u32, res: Resolution) -> (u32, u32) {
+    effectcraft_render::frame_size(w, h, 1.0 / f64::from(res.factor().unwrap_or(1).max(1)))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn frame_size_follows_the_resolution() {
+        // The renderer's size, which rounds: 1081 / 3 = 360.33 and 1920 / 7 = 274.3.
+        assert_eq!(frame_at(1920, 1081, Resolution::Third), (640, 360));
+        assert_eq!(frame_at(1920, 1080, Resolution::Custom(7)), (274, 154));
+        assert_eq!(frame_at(1920, 1081, Resolution::Half), (960, 541));
+        assert_eq!(frame_at(1920, 1080, Resolution::Full), (1920, 1080));
+        assert_eq!(frame_at(1920, 1080, Resolution::Auto), (1920, 1080));
+    }
+
     #[test]
     fn aspect_labels_match_ae() {
         assert_eq!(aspect_label(1920.0, 1080.0), "16:9 (1.78)");
diff --git a/crates/ui-egui/src/panels/dialogs.rs b/crates/ui-egui/src/panels/dialogs.rs
index d773fc433..7c89ad32d 100644
--- a/crates/ui-egui/src/panels/dialogs.rs
+++ b/crates/ui-egui/src/panels/dialogs.rs
@@ -47,6 +47,7 @@ pub struct DialogState {
     pub info: (String, String),
     pub camera: super::dialogs_3d::CameraDraft,
     pub light: super::dialogs_3d::LightDraft,
+    pub primitive: super::primitive_dialog::PrimitiveDraft,
     pub velocity: super::key_dialogs::VelocityDraft,
     pub interp: super::key_dialogs::InterpDraft,
     pub stretch: super::key_dialogs::StretchDraft,
@@ -102,6 +103,7 @@ pub fn open_comp_settings_for(app: &mut EffectcraftApp, cid: ItemId) -> Result<(
         preserve_frame_rate: c.preserve_frame_rate,
         preserve_resolution: c.preserve_resolution,
         advanced_3d: c.renderer == effectcraft_engine::project::Renderer::Advanced3D,
+        resolution: c.resolution,
         ..Default::default()
     };
     app.dialog_state.editing_existing = true;
@@ -168,6 +170,18 @@ pub(crate) fn modal_space(ctx: &egui::Context) -> egui::Vec2 {
     (ctx.content_rect().size() - vec2(48.0, 48.0)).max(vec2(120.0, 80.0))
 }
 
+fn modal_pass_id() -> egui::Id {
+    egui::Id::unique("effectcraft-modal-pass")
+}
+
+/// Whether a modal dialog showed in this pass or the one before: egui's `Modal` blocks input
+/// only in its own window, so floating panels in OS windows of their own are blocked by the
+/// dock area while this holds. Dialogs draw after the dock, so the previous pass counts.
+pub(crate) fn modal_open(ctx: &egui::Context) -> bool {
+    let shown = ctx.data(|d| d.get_temp::<u64>(modal_pass_id()));
+    shown.is_some_and(|pass| pass.saturating_add(1) >= ctx.cumulative_pass_nr_for(egui::ViewportId::ROOT))
+}
+
 pub(crate) fn modal(ctx: &egui::Context, title: &str, size: egui::Vec2, t: &Tokens, body: impl FnOnce(&mut egui::Ui)) {
     modal_with_scroll(ctx, title, size, t, false, body);
 }
@@ -188,8 +202,10 @@ fn modal_with_scroll(ctx: &egui::Context, title: &str, size: egui::Vec2, t: &Tok
 /// only its content: `body` gets the height left under the title, with `size` kept within the
 /// window.
 pub(crate) fn modal_fit(ctx: &egui::Context, title: &str, size: egui::Vec2, t: &Tokens, body: impl FnOnce(&mut egui::Ui, f32)) {
+    let pass = ctx.cumulative_pass_nr_for(egui::ViewportId::ROOT);
+    ctx.data_mut(|d| d.insert_temp(modal_pass_id(), pass));
     let size = size.min(modal_space(ctx));
-    let id = egui::Id::new(("modal", title));
+    let id = egui::Id::unique(("modal", title));
     // Dragging the title row moves the dialog off what it edits. The offset is kept within the
     // window, so dragging back never has to undo a part the dialog could not follow.
     let offset_id = id.with("offset");
@@ -248,6 +264,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context) {
         Dialog::ViewOptions => super::forms::show_view_options(app, ctx, &t),
         Dialog::CameraSettings => super::dialogs_3d::camera(app, ctx, &t),
         Dialog::LightSettings => super::dialogs_3d::light(app, ctx, &t),
+        Dialog::NewPrimitive => super::primitive_dialog::dialog(app, ctx, &t),
         Dialog::KeyVelocity => super::key_dialogs::velocity(app, ctx, &t),
         Dialog::KeyInterpolation => super::key_dialogs::interpolation(app, ctx, &t),
         Dialog::TimeStretch => super::key_dialogs::time_stretch(app, ctx, &t),
@@ -270,10 +287,14 @@ const ABOUT_TABS: [(&str, &str); 3] = [("About", "about"), ("Contributors", "con
 /// Height of the Contributors / Models tab bodies (they scroll inside it).
 const CREDITS_HEIGHT: f32 = 380.0;
 
+/// The About dialog: tabs for the name/version/blurb, the contributors and the models (the last
+/// two scroll in a fixed-height body), the licence and bundled-font line, and Close. The tab is
+/// kept in egui temp data. A command the About body asked for is run once the modal has been
+/// built; Close clears `app.dialog`.
 fn about(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
     let mut close = false;
     let mut cmd: Option<&str> = None;
-    let tab_id = egui::Id::new("about_tab");
+    let tab_id = egui::Id::unique("about_tab");
     modal(ctx, "About EffectCraft", vec2(680.0, 520.0), t, |ui| {
         let mut tab = ui.data_mut(|d| d.get_temp::<usize>(tab_id)).unwrap_or(0);
         ui.horizontal(|ui| {
@@ -408,6 +429,11 @@ fn comp_settings(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens, exis
                 m.insert("comp".into(), json!(cid.0));
             }
             let r = if existing { app.session.execute("comp.settings", params) } else { app.session.execute("comp.new", params) };
+            let cid = if existing { app.dialog_state.editing_comp.map(|c| c.0) } else { r.as_ref().ok().and_then(|v| v["comp"].as_u64()) };
+            let r = match cid {
+                Some(cid) if r.is_ok() => set_resolution(app, cid, app.dialog_state.comp.resolution).and(r),
+                _ => r,
+            };
             if !existing && r.is_ok() {
                 app.dialog_state.last_new_comp = Some(app.dialog_state.comp.clone());
             }
@@ -420,6 +446,15 @@ fn comp_settings(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens, exis
     }
 }
 
+/// The Resolution chosen in Composition Settings, set as the Composition panel's popup sets it:
+/// saved with the project but no undo step, so it stays out of `comp.new` / `comp.settings`.
+fn set_resolution(app: &mut EffectcraftApp, cid: u64, r: effectcraft_engine::project::Resolution) -> effectcraft_engine::Result<Value> {
+    match r.factor() {
+        None => app.session.execute("view.res.auto", json!({"comp": cid})),
+        Some(n) => app.session.execute("view.res.custom", json!({"comp": cid, "factor": n})),
+    }
+}
+
 /// One frame of the open dialog with `key` pressed.
 #[cfg(test)]
 pub(crate) fn press_key(app: &mut EffectcraftApp, ctx: &egui::Context, key: egui::Key, modifiers: egui::Modifiers) {
@@ -462,7 +497,7 @@ fn solid(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         (ds.solid_name.clone(), ds.solid_color, ds.solid_size, ds.solid_pixel_aspect, ds.solid_affect_all);
     let (editing, shared) = (ds.solid_layer, ds.solid_shared);
     let comp_size = app.session.active_comp().map(|c| (c.width, c.height)).unwrap_or((1920, 1080));
-    let lock_id = egui::Id::new("solid-lock-aspect");
+    let lock_id = egui::Id::unique("solid-lock-aspect");
     let mut lock = ctx.data(|m| m.get_temp::<bool>(lock_id)).unwrap_or(true);
     let auto = &mut app.auto;
     modal(ctx, "Solid Settings", vec2(480.0, if editing.is_some() { 430.0 } else { 390.0 }), t, |ui| {
@@ -501,7 +536,7 @@ fn solid(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                 .find(|(_, v)| (v - par).abs() < 1e-3)
                 .map(|p| p.0.to_string())
                 .unwrap_or_else(|| format!("{par:.2}"));
-            let r = egui::ComboBox::from_id_salt("solid-par").width(240.0).selected_text(cur).show_ui(ui, |ui| {
+            let r = craft_ui::ComboBox::from_id_salt("solid-par").width(240.0).selected_text(cur).show_ui(ui, |ui| {
                 for (label, v) in super::comp_settings::PIXEL_ASPECTS {
                     if ui.selectable_label((v - par).abs() < 1e-3, *label).clicked() {
                         par = *v;
@@ -613,6 +648,8 @@ fn palette(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         .collect();
     modal(ctx, "Command Palette", vec2(560.0, 470.0), t, |ui| {
         let r = ui.add(egui::TextEdit::singleline(&mut q).hint_text(tr("Type a command or effect…")).desired_width(f32::INFINITY).font(Tokens::ui(14.0)));
+        // A placeholder disappears once typing starts; keep the field named for assistive input.
+        ctx.accesskit_node_builder(r.id, |node| node.set_label(tr("Type a command or effect…")));
         // Take the keyboard when the palette opens (and if anything else takes it away), but not
         // while the field already has it: egui's `request_focus` interrupts the IME composition,
         // and asking on every frame cancelled the pinyin being typed, so no Chinese could be
@@ -670,6 +707,29 @@ fn palette(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
 mod tests {
     use super::*;
 
+    #[test]
+    fn modal_open_holds_from_a_shown_dialog_until_the_pass_after_it_closes() {
+        let (app, ctx) = app();
+        let t = app.tokens;
+        // Asked as the dock asks it: during the pass, before the dialogs draw.
+        let pass = |show: bool| {
+            let mut open = false;
+            let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
+                open = modal_open(ui.ctx());
+                if show {
+                    modal(ui.ctx(), "Test", vec2(200.0, 100.0), &t, |_| {});
+                }
+            });
+            output.textures_delta.clear();
+            open
+        };
+        assert!(!pass(false));
+        assert!(!pass(true), "the first pass of a dialog finds none shown yet");
+        assert!(pass(true));
+        assert!(pass(false), "the pass after the last one shown still counts");
+        assert!(!pass(false));
+    }
+
     fn app() -> (EffectcraftApp, egui::Context) {
         let ctx = egui::Context::default();
         let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());
@@ -731,7 +791,7 @@ mod tests {
         assert_eq!(app.dialog_state.palette_query, "nihao");
         // Something else taking the keyboard takes it away for a frame; the field claims it back
         // (a request is what gets the keys back, and there is no composition to interrupt then).
-        ctx.memory_mut(|m| m.request_focus(egui::Id::new("elsewhere")));
+        ctx.memory_mut(|m| m.request_focus(egui::Id::unique("elsewhere")));
         assert!(frame_with(&mut app, &ctx, vec![]).platform_output.ime.is_none(), "the field lost the keyboard");
         assert!(frame_with(&mut app, &ctx, vec![]).platform_output.ime.is_some(), "and takes it back");
     }
@@ -827,6 +887,59 @@ mod tests {
         assert_eq!(selected(&ctx), Some(0..app.dialog_state.solid_name.chars().count()));
     }
 
+    /// One frame of Composition Settings (or New Composition) with Enter pressed: OK.
+    fn press_ok(app: &mut EffectcraftApp, ctx: &egui::Context, existing: bool) {
+        let t = app.tokens;
+        let mut out = ctx.run_ui(Default::default(), |ui| {
+            app.auto.begin_frame();
+            ui.input_mut(|i| {
+                i.events.push(egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() })
+            });
+            comp_settings(app, ui.ctx(), &t, existing);
+        });
+        out.textures_delta.clear();
+        assert!(app.dialog.is_none(), "OK closed the dialog");
+    }
+
+    /// The Resolution menu sets the comp's Resolution on OK. As from the Composition panel's popup
+    /// it is no undo step: the settings are one step, and undoing them keeps the Resolution.
+    #[test]
+    fn composition_settings_resolution_applies_on_ok_outside_the_undo_history() {
+        use effectcraft_engine::project::Resolution;
+        let (mut app, ctx) = app();
+        let cid = app.session.active_comp_id().unwrap();
+        app.session.execute("view.res.third", json!({})).unwrap();
+        open_comp_settings(&mut app).unwrap();
+        assert_eq!(app.dialog_state.comp.resolution, Resolution::Third, "the dialog opens on the comp's Resolution");
+        frame(&mut app, &ctx);
+        assert!(app.auto.find("dialog.comp.resolution").is_some());
+        let steps = app.session.history.undo.len();
+        (app.dialog_state.comp.resolution, app.dialog_state.comp.width) = (Resolution::Half, 700);
+        app.dialog_state.comp.lock_aspect = false;
+        press_ok(&mut app, &ctx, true);
+        let c = app.session.project.comp(cid).unwrap();
+        assert_eq!((c.width, c.resolution), (700, Resolution::Half));
+        assert_eq!(app.session.history.undo.len(), steps + 1, "Composition Settings is one undo step");
+        app.session.execute("edit.undo", json!({})).unwrap();
+        let c = app.session.project.comp(cid).unwrap();
+        assert_eq!((c.width, c.resolution), (640, Resolution::Half), "undo keeps the Resolution");
+        // Only the Resolution changed: still set, and no extra step.
+        open_comp_settings(&mut app).unwrap();
+        app.dialog_state.comp.resolution = Resolution::Custom(6);
+        let steps = app.session.history.undo.len();
+        press_ok(&mut app, &ctx, true);
+        assert_eq!(app.session.project.comp(cid).unwrap().resolution, Resolution::Custom(6));
+        assert_eq!(app.session.history.undo.len(), steps, "no undo step");
+        // New Composition makes its comp at the menu's Resolution; the comp the viewer showed keeps its own.
+        open_new_comp(&mut app);
+        app.dialog_state.comp.resolution = Resolution::Quarter;
+        press_ok(&mut app, &ctx, false);
+        let new = app.session.active_comp_id().unwrap();
+        assert_ne!(new, cid);
+        assert_eq!(app.session.project.comp(new).unwrap().resolution, Resolution::Quarter);
+        assert_eq!(app.session.project.comp(cid).unwrap().resolution, Resolution::Custom(6));
+    }
+
     #[test]
     fn composition_settings_register_every_control_and_new_comp_remembers() {
         let (mut app, ctx) = app();
diff --git a/crates/ui-egui/src/panels/dialogs_3d.rs b/crates/ui-egui/src/panels/dialogs_3d.rs
index a1a67bc60..0a4636b87 100644
--- a/crates/ui-egui/src/panels/dialogs_3d.rs
+++ b/crates/ui-egui/src/panels/dialogs_3d.rs
@@ -29,7 +29,7 @@ pub struct CameraDraft {
 pub struct LightDraft {
     pub layer: Option<u64>,
     pub name: String,
-    pub kind: usize,
+    pub kind: LightKind,
     pub color: [f32; 3],
     pub intensity: f64,
     pub cone_angle: f64,
@@ -42,9 +42,14 @@ pub struct LightDraft {
     pub shadow_diffusion: f64,
 }
 
-const KINDS: [LightKind; 4] = [LightKind::Parallel, LightKind::Spot, LightKind::Point, LightKind::Ambient];
 const FALLOFFS: [&str; 3] = ["None", "Smooth", "Inverse Square Clamped"];
 
+/// Whether a light type has Falloff and Shadows options. Ambient and Environment lights come
+/// from no one place, so they have neither.
+fn falls_off(kind: LightKind) -> bool {
+    !matches!(kind, LightKind::Ambient | LightKind::Environment)
+}
+
 fn comp_w(app: &EffectcraftApp) -> f64 {
     app.session.active_comp().map(|c| c.width as f64).unwrap_or(1920.0)
 }
@@ -105,7 +110,7 @@ pub fn open_light(app: &mut EffectcraftApp, layer: Option<u64>) -> Result<(), St
             LightDraft {
                 layer: Some(l.id.0),
                 name: l.name.clone(),
-                kind: KINDS.iter().position(|k| *k == kind).unwrap_or(1),
+                kind,
                 color: [c[0], c[1], c[2]],
                 intensity: f("intensity", 100.0),
                 cone_angle: f("coneAngle", 90.0),
@@ -123,7 +128,7 @@ pub fn open_light(app: &mut EffectcraftApp, layer: Option<u64>) -> Result<(), St
             LightDraft {
                 layer: None,
                 name: format!("Light {n}"),
-                kind: 1,
+                kind: LightKind::Spot,
                 color: [1.0, 1.0, 1.0],
                 intensity: 100.0,
                 cone_angle: 90.0,
@@ -167,7 +172,7 @@ pub fn camera(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
     super::dialogs::modal(ctx, "Camera Settings", vec2(520.0, 420.0), t, |ui| {
         egui::Grid::new("cam-grid").num_columns(2).spacing([14.0, 9.0]).show(ui, |ui| {
             ui.label(tr("Type"));
-            egui::ComboBox::from_id_salt("cam-type").selected_text(if d.two_node { "Two-Node Camera" } else { "One-Node Camera" }).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("cam-type").selected_text(if d.two_node { "Two-Node Camera" } else { "One-Node Camera" }).show_ui(ui, |ui| {
                 ui.selectable_value(&mut d.two_node, true, tr("Two-Node Camera"));
                 ui.selectable_value(&mut d.two_node, false, tr("One-Node Camera"));
             });
@@ -179,7 +184,7 @@ pub fn camera(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             ui.label(tr("Preset"));
             let focal = focal_for_zoom(w, d.zoom);
             let cur = PRESETS.iter().find(|(_, f)| (f - focal).abs() < 1e-6).map(|(n, _)| *n).unwrap_or("Custom");
-            egui::ComboBox::from_id_salt("cam-preset").selected_text(cur).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt("cam-preset").selected_text(cur).show_ui(ui, |ui| {
                 for (n, f) in PRESETS {
                     if ui.selectable_label(cur == n, n).clicked() {
                         d.zoom = zoom_for_focal(w, f);
@@ -263,11 +268,13 @@ pub fn light(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             crate::widgets::focus_on_open(ui.ctx(), &r, &d.name);
             ui.end_row();
             ui.label(tr("Light Type"));
-            egui::ComboBox::from_id_salt("light-type").selected_text(KINDS[d.kind.min(3)].label()).show_ui(ui, |ui| {
-                for (i, k) in KINDS.iter().enumerate() {
-                    ui.selectable_value(&mut d.kind, i, k.label());
+            let combo = craft_ui::ComboBox::from_id_salt("light-type").selected_text(tr(d.kind.label())).show_ui(ui, |ui| {
+                for (i, k) in LightKind::ALL.into_iter().enumerate() {
+                    let item = ui.selectable_value(&mut d.kind, k, tr(k.label()));
+                    app.auto.add(&format!("dialog.light.typeItem.{i}"), item.rect, k.label());
                 }
             });
+            app.auto.add_response("dialog.light.type", &combo.response, "Light Type");
             ui.end_row();
             ui.label(tr("Color"));
             crate::widgets::srgb_color_button(ui, &mut d.color);
@@ -275,8 +282,7 @@ pub fn light(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             ui.label(tr("Intensity"));
             ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut d.intensity).range(-10000.0..=10000.0).suffix(" %")));
             ui.end_row();
-            let kind = KINDS[d.kind.min(3)];
-            if kind == LightKind::Spot {
+            if d.kind == LightKind::Spot {
                 ui.label(tr("Cone Angle"));
                 ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut d.cone_angle).range(0.0..=180.0).suffix("°")));
                 ui.end_row();
@@ -284,9 +290,9 @@ pub fn light(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                 ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut d.cone_feather).range(0.0..=100.0).suffix(" %")));
                 ui.end_row();
             }
-            if kind != LightKind::Ambient {
+            if falls_off(d.kind) {
                 ui.label(tr("Falloff"));
-                egui::ComboBox::from_id_salt("light-falloff").selected_text(FALLOFFS[d.falloff.min(2)]).show_ui(ui, |ui| {
+                craft_ui::ComboBox::from_id_salt("light-falloff").selected_text(FALLOFFS[d.falloff.min(2)]).show_ui(ui, |ui| {
                     for (i, f) in FALLOFFS.iter().enumerate() {
                         ui.selectable_value(&mut d.falloff, i, *f);
                     }
@@ -312,15 +318,17 @@ pub fn light(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             }
         });
         ui.add_space(14.0);
-        ui.label(egui::RichText::new(tr("Note: Shadows are only cast from layers with Cast Shadows enabled.")).font(Tokens::ui(11.0)).color(t.text_dim));
-        ui.add_space(8.0);
+        if falls_off(d.kind) {
+            ui.label(egui::RichText::new(tr("Note: Shadows are only cast from layers with Cast Shadows enabled.")).font(Tokens::ui(11.0)).color(t.text_dim));
+            ui.add_space(8.0);
+        }
         rects = buttons(ui, t, &mut ok, &mut close);
     });
     app.auto.add("dialog.light.ok", rects.0, "OK");
     app.auto.add("dialog.light.cancel", rects.1, "Cancel");
     app.dialog_state.light = d.clone();
     if ok || super::dialogs::ui_enter(ctx) {
-        let kind = KINDS[d.kind.min(3)];
+        let kind = d.kind;
         let mut p = json!({
             "name": d.name,
             "kind": kind.label(),
@@ -331,7 +339,7 @@ pub fn light(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             p["coneAngle"] = json!(d.cone_angle);
             p["coneFeather"] = json!(d.cone_feather);
         }
-        if kind != LightKind::Ambient {
+        if falls_off(kind) {
             p["falloff"] = json!(d.falloff);
             p["radius"] = json!(d.radius);
             p["falloffDistance"] = json!(d.falloff_distance);
diff --git a/crates/ui-egui/src/panels/effect_controls.rs b/crates/ui-egui/src/panels/effect_controls.rs
index bad1db39f..d9706f147 100644
--- a/crates/ui-egui/src/panels/effect_controls.rs
+++ b/crates/ui-egui/src/panels/effect_controls.rs
@@ -28,1635 +28,14 @@ use crate::state::FxPick;
 use crate::theme::Tokens;
 use crate::{EffectcraftApp, widgets};
 
-type Actions = Vec<(String, serde_json::Value)>;
+mod common;
+mod editors;
+mod panel;
+mod rows;
+mod viewer;
 
-const ROW: f32 = 20.0;
-const DIAL_ROW: f32 = 64.0;
-// The effect title starts at 44 pt. Each level's names sit one tree step farther in;
-// reserve the same icon gutter for properties and groups so sibling names align.
-const PARAM_NAME_X: f32 = 58.0;
-const TREE_INDENT: f32 = 14.0;
-
-/// Selecting any descendant activates its owning effect without replacing the property
-/// selection used by keyframe editing, copy and delete.
-fn effect_active(g: &PropGroup, layer: effectcraft_engine::project::LayerId, selected: &[(effectcraft_engine::project::LayerId, u64)]) -> bool {
-    fn contains(g: &PropGroup, uid: u64, depth: usize) -> bool {
-        if g.uid == uid {
-            return true;
-        }
-        if depth >= 16 {
-            return false;
-        }
-        g.children.iter().any(|n| n.uid() == uid || matches!(n, Node::Group(child) if contains(child, uid, depth + 1)))
-    }
-    selected.iter().any(|(l, uid)| *l == layer && contains(g, *uid, 0))
-}
-
-fn selected_layer(app: &EffectcraftApp) -> Option<Layer> {
-    let comp = app.session.active_comp()?;
-    let id = app.session.state.selected_layers.first()?;
-    comp.layer(*id).cloned()
-}
-
-/// An effect was just applied (`effect.apply` / `effect.applyLast` with `params`): Effect
-/// Controls comes up (opened if closed, brought to the front, the focus left where it is) on the
-/// layer the effect went to, with the new effect selected, as in After Effects.
-pub fn reveal_applied(app: &mut EffectcraftApp, params: &serde_json::Value) {
-    // `effect.apply` selects the new effect on (the last of) the layers it went to.
-    let target = app.session.state.selected_props.last().map(|(l, _)| *l);
-    if let Some(l) = target
-        && !app.session.state.selected_layers.contains(&l)
-        && params.get("comp").is_none()
-        && app.session.active_comp().is_some_and(|c| c.layer(l).is_some())
-    {
-        // Show that layer (dropped on an unselected one), keeping the new effect selected.
-        let props = app.session.state.selected_props.clone();
-        match app.session.execute("layer.select", json!({"layers": [l.0]})) {
-            Ok(_) => app.session.state.selected_props = props,
-            Err(e) => app.ui.status = e.to_string(),
-        }
-    }
-    app.raise_panel(crate::dock::PanelKind::EffectControls);
-}
-
-/// After Effects asks for an effect's file as it applies it (Apply Color LUT opens the file
-/// dialog for its LUT). For the instances `effect.apply` made (`applied`, its result), open the
-/// file dialog for their first empty file parameter and set the file on each; cancelling
-/// leaves the effect without one. Does nothing without a file dialog (tests, agents).
-pub fn choose_files_after_apply(app: &mut EffectcraftApp, applied: &serde_json::Value) {
-    let Some(pick) = app.hooks.pick_files.as_ref() else { return };
-    let Some(comp) = app.session.active_comp() else { return };
-    let uids: Vec<u64> = applied.get("effects").and_then(|v| v.as_array()).map(|a| a.iter().filter_map(|v| v.as_u64()).collect()).unwrap_or_default();
-    let mut targets = vec![];
-    let mut filters: Vec<String> = vec![];
-    for uid in uids {
-        for l in &comp.layers {
-            let Some(g) = l.props.find_group(uid) else { continue };
-            let mut found = None;
-            g.walk("", &mut |_, pr| {
-                if found.is_none()
-                    && let ParamUi::File { filters } = &pr.ui
-                    && matches!(&pr.value, Value::Str(s) if s.trim().is_empty())
-                {
-                    found = Some((pr.uid, filters.clone()));
-                }
-            });
-            if let Some((prop, f)) = found {
-                targets.push((l.id.0, prop));
-                filters = f;
-            }
-        }
-    }
-    if targets.is_empty() {
-        return;
-    }
-    let exts: Vec<&str> = filters.iter().map(String::as_str).collect();
-    let Some(path) = pick(&exts).into_iter().next() else { return };
-    for (layer, prop) in targets {
-        if let Err(e) = app.session.execute("prop.set", json!({"layer": layer, "prop": prop, "value": path})) {
-            app.ui.status = e.to_string();
-        }
-    }
-}
-
-/// An undo-merge key for one gesture on `id`: a new key each time a drag starts, so separate
-/// drags are separate undo steps while one drag is one step.
-pub(crate) fn gesture_key(ui: &egui::Ui, id: egui::Id, started: bool) -> String {
-    let kid = id.with("gesture");
-    let n: u64 = if started {
-        let n = ui.data(|d| d.get_temp::<u64>(kid)).unwrap_or(0) + 1;
-        ui.data_mut(|d| d.insert_temp(kid, n));
-        n
-    } else {
-        ui.data(|d| d.get_temp::<u64>(kid)).unwrap_or(0)
-    };
-    format!("{id:?}-{n}")
-}
-
-fn triangle(p: &egui::Painter, c: egui::Pos2, left: bool, col: Color32) {
-    let (dx, h) = (if left { -3.5 } else { 3.5 }, 4.0);
-    p.add(egui::Shape::convex_polygon(vec![pos2(c.x + dx, c.y), pos2(c.x - dx, c.y - h), pos2(c.x - dx, c.y + h)], col, Stroke::NONE));
-}
-
-/// ◀ ◆ ▶ at the right end of an animated parameter's row.
-fn key_navigator(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    prop: &Property,
-    ectx: &EvalCtx,
-    r: Rect,
-    actions: &mut Actions,
-) {
-    let t = app.tokens;
-    let cy = r.center().y;
-    let uid = prop.uid;
-    let half = ectx.comp.frame_duration().0 / 2;
-    let on_key = prop.keys.iter().any(|k| (layer.comp_time(k.time).0 - ectx.time.0).abs() <= half);
-    for (what, dx) in [("prev", -44.0), ("key", -32.0), ("next", -20.0)] {
-        let cr = Rect::from_center_size(pos2(r.max.x + dx, cy), vec2(12.0, 16.0));
-        let resp = ui.interact(cr, egui::Id::new(("ec-nav", uid, what)), Sense::click());
-        let col = if resp.hovered() { t.text } else { t.text_dim };
-        match what {
-            "prev" => triangle(p, cr.center(), true, col),
-            "next" => triangle(p, cr.center(), false, col),
-            _ => {
-                let kr = Rect::from_center_size(cr.center(), vec2(10.0, 10.0));
-                if on_key {
-                    icons::paint(p, kr, Icon::Keyframe, t.keyframe);
-                } else {
-                    let c = kr.center();
-                    let d = 4.5;
-                    p.add(egui::Shape::closed_line(
-                        vec![pos2(c.x, c.y - d), pos2(c.x + d, c.y), pos2(c.x, c.y + d), pos2(c.x - d, c.y)],
-                        Stroke::new(1.0, col),
-                    ));
-                }
-            }
-        }
-        app.auto.add(&format!("effectControls.prop.{uid}.{what}Key"), cr, &prop.name);
-        if resp.clicked() {
-            match what {
-                "prev" => actions.push(("time.go".into(), json!({"to": "prevKey", "prop": uid}))),
-                "next" => actions.push(("time.go".into(), json!({"to": "nextKey", "prop": uid}))),
-                _ => actions.push(("prop.toggleKey".into(), json!({"layer": layer.id.0, "prop": uid, "selected": true}))),
-            }
-        }
-    }
-}
-
-/// Toggle a viewer pick (crosshair / eyedropper) for a parameter (also the Timeline's colour
-/// eyedroppers).
-pub(crate) fn toggle_pick(app: &mut EffectcraftApp, kind: &str, layer: &Layer, prop: &Property) {
-    let pick = FxPick { kind: kind.into(), layer: layer.id.0, prop: prop.uid, name: prop.name.clone() };
-    if app.ui.fx_pick.as_ref() == Some(&pick) {
-        app.ui.fx_pick = None;
-    } else {
-        app.ui.fx_pick = Some(pick);
-        app.ui.text_color_pick = None;
-        app.ui.status = if kind == "point" {
-            format!("Click in the Composition panel to set {}", prop.name)
-        } else {
-            format!("Click in the Composition panel to sample {}", prop.name)
-        };
-    }
-}
-
-/// One property row: stopwatch, name, value control (and the keyframe navigator). Returns the
-/// value fields of a vector, one per dimension, for the pick whip.
-#[allow(clippy::too_many_arguments)]
-fn prop_row(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    group: &PropGroup,
-    prop: &Property,
-    ectx: &EvalCtx,
-    r: Rect,
-    indent: f32,
-    actions: &mut Actions,
-) -> Vec<Rect> {
-    let t = app.tokens;
-    let mut dims = vec![];
-    let cy = r.center().y;
-    let uid = prop.uid;
-    if ui.input(|i| i.pointer.primary_pressed()) && ui.rect_contains_pointer(r) {
-        let add = ui.input(|i| i.modifiers.shift || i.modifiers.command);
-        actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": add})));
-    }
-    let swr = Rect::from_center_size(pos2(r.min.x + indent, cy), vec2(14.0, 14.0));
-    if !prop.static_only && !matches!(prop.ui, ParamUi::Hidden) {
-        let resp = ui.interact(swr, egui::Id::new(("ec-sw", uid)), Sense::click());
-        icons::paint(
-            p,
-            swr,
-            Icon::Stopwatch,
-            if prop.is_animated() {
-                t.hot_text
-            } else if resp.hovered() {
-                t.text
-            } else {
-                t.text_dim
-            },
-        );
-        app.auto.add(&format!("effectControls.prop.{uid}.stopwatch"), swr, &prop.name);
-        if resp.clicked() {
-            actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "selected": true})));
-        }
-    }
-    if prop.is_animated() {
-        key_navigator(app, ui, p, layer, prop, ectx, r, actions);
-    }
-    let value = ectx.value(layer, prop);
-    // Keep a shared value column while names and their icons follow the group hierarchy.
-    // Extremely deep groups still leave a little name space before their value.
-    let vx = (r.min.x + r.width() * 0.48).max(r.min.x + PARAM_NAME_X + 124.0).max(swr.max.x + 40.0);
-    // A vector's values end before the keyframe navigator: in a narrow panel they move left over
-    // the name (cut short) instead of running under the navigator (#271).
-    let vx = match &value {
-        Value::Vec2(_) | Value::Vec3(_) => {
-            let point = if matches!(prop.ui, ParamUi::Point | ParamUi::Point3) { 22.0 } else { 0.0 };
-            let fields: f32 = value
-                .components()
-                .iter()
-                .take(shown_dims(layer, prop, &value))
-                .map(|v| p.layout_no_wrap(format!("{v:.1}"), Tokens::ui(12.0), t.hot_text).size().x + 12.0)
-                .sum();
-            let right = r.max.x - if prop.is_animated() { 52.0 } else { 8.0 };
-            vx.min(right - point - fields + 8.0).max(swr.max.x + 60.0)
-        }
-        _ => vx,
-    };
-    let name_clip = Rect::from_min_max(pos2(swr.max.x + 6.0, r.min.y), pos2(vx - 6.0, r.max.y));
-    app.auto.add(&format!("effectControls.prop.{uid}.name"), name_clip, &prop.name);
-    p.with_clip_rect(name_clip.intersect(p.clip_rect())).text(pos2(swr.max.x + 6.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(12.0), t.text);
-    ui.interact(name_clip, egui::Id::new(("ec-prop-name", uid)), Sense::click());
-    app.auto.add(&format!("effectControls.prop.{uid}.name"), name_clip, &prop.name);
-    let merge = format!("ec-{uid}");
-    // With several layers selected the edit applies to the same effect property of each (#491).
-    let scrub = ui.ctx().dragged_id().is_some() && ui.input(|i| i.pointer.is_decidedly_dragging());
-    let set = |actions: &mut Actions, v: serde_json::Value| {
-        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": v, "merge": merge, "selected": true, "offset": scrub})))
-    };
-    let twirl_open = |app: &mut EffectcraftApp, ui: &mut egui::Ui| {
-        let open = app.ui.fx_slider_open.contains(&uid);
-        let tw = Rect::from_center_size(pos2(swr.min.x - 9.0, cy), vec2(10.0, 10.0));
-        if widgets::twirl(ui, tw, open, egui::Id::new(("ec-stw", uid)), &t).clicked() {
-            if open {
-                app.ui.fx_slider_open.remove(&uid);
-            } else {
-                app.ui.fx_slider_open.insert(uid);
-            }
-        }
-        app.auto.add(&format!("effectControls.prop.{uid}.twirl"), tw, &prop.name);
-    };
-    match &value {
-        Value::Scalar(v) if matches!(prop.ui, ParamUi::Mask) => {
-            // A mask of this layer ("Path" popup).
-            let mut opts = vec!["None".to_string()];
-            if let Some(m) = layer.masks() {
-                opts.extend(m.groups().map(|g| g.name.clone()));
-            }
-            let i = v.round().max(0.0) as usize;
-            let label = opts.get(i).cloned().unwrap_or_else(|| format!("Mask {i}"));
-            let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 56.0).clamp(80.0, 200.0), 18.0));
-            let pop = egui::Id::new(("ec-mpop", uid));
-            if widgets::dropdown(ui, dr, &label, &t, egui::Id::new(("ec-m", uid))).clicked() {
-                widgets::open_popup(ui, pop);
-            }
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
-            if let Some(ni) = widgets::popup_menu(ui, pop, dr.left_bottom(), &opts, Some(i)) {
-                set(actions, json!(ni as f64));
-            }
-        }
-        Value::Scalar(v) if matches!(prop.ui, ParamUi::Angle) => {
-            let (rr, dr, nv) = fw::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::new(("ec-v", uid)), *v, 1, &t);
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), rr.union(dr), &fw::format_angle(*v, 1));
-            app.auto.add(&format!("effectControls.prop.{uid}.revolutions"), rr, &prop.name);
-            if let Some(nv) = nv {
-                set(actions, json!(nv));
-            }
-            twirl_open(app, ui);
-        }
-        Value::Scalar(v) => {
-            let (min, max, dec) = match &prop.ui {
-                ParamUi::Slider { min, max, decimals, .. } => (*min, *max, *decimals as usize),
-                _ => (-1e9, 1e9, 1),
-            };
-            let suffix = match prop.ui {
-                ParamUi::Percent => "%",
-                _ => "",
-            };
-            let speed = match &prop.ui {
-                ParamUi::Slider { slider_min, slider_max, .. } => ((slider_max - slider_min) / 300.0).clamp(0.001, 50.0),
-                _ => 0.5,
-            };
-            let (vr, nv, _) = widgets::hot_number_at(
-                ui,
-                pos2(vx, cy - 9.0),
-                egui::Id::new(("ec-v", uid)),
-                *v,
-                speed,
-                (min, max),
-                dec.max(if dec == 0 { 0 } else { 1 }),
-                suffix,
-                &t,
-            );
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), vr, &prop.name);
-            if let Some(nv) = nv {
-                set(actions, json!(nv));
-            }
-            // AE hides a slider param's slider until its twirl is opened (see `slider_row`).
-            if matches!(prop.ui, ParamUi::Slider { .. }) {
-                twirl_open(app, ui);
-            }
-        }
-        Value::Vec2(_) | Value::Vec3(_) => {
-            let c = value.components();
-            let n = shown_dims(layer, prop, &value);
-            let mut x = vx;
-            if matches!(prop.ui, ParamUi::Point | ParamUi::Point3) {
-                let cr = Rect::from_center_size(pos2(x + 8.0, cy), vec2(18.0, 18.0));
-                let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "point");
-                if fw::crosshair_button(ui, cr, active, egui::Id::new(("ec-xh", uid)), &t)
-                    .on_hover_text(crate::i18n::tr("Click, then click in the Composition panel"))
-                    .clicked()
-                {
-                    toggle_pick(app, "point", layer, prop);
-                }
-                app.auto.add(&format!("effectControls.prop.{uid}.crosshair"), cr, &prop.name);
-                x += 22.0;
-            }
-            for d in 0..n.min(c.len()) {
-                let (vr, nv, _) = widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("ec-v", uid, d)), c[d], 1.0, (-1e9, 1e9), 1, "", &t);
-                app.auto.add(&format!("effectControls.prop.{uid}.value.{d}"), vr, &prop.name);
-                dims.push(vr);
-                if let Some(nv) = nv {
-                    let mut nc = c.clone();
-                    nc[d] = nv;
-                    set(actions, json!(nc));
-                }
-                x = vr.max.x + 8.0;
-            }
-        }
-        Value::Color(c) => {
-            let sr = Rect::from_min_size(pos2(vx, cy - 8.0), vec2(30.0, 16.0));
-            let pop = egui::Id::new(("ec-cpop", uid));
-            if widgets::swatch(ui, sr, [c[0] as f32, c[1] as f32, c[2] as f32, 1.0], egui::Id::new(("ec-c", uid)), &t).clicked() {
-                widgets::open_popup(ui, pop);
-            }
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), sr, &prop.name);
-            let er = Rect::from_center_size(pos2(sr.max.x + 14.0, cy), vec2(18.0, 18.0));
-            let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "color");
-            if fw::eyedropper_button(ui, er, active, egui::Id::new(("ec-eye", uid)), &t)
-                .on_hover_text(crate::i18n::tr("Eyedropper: click, then click in the Composition panel"))
-                .clicked()
-            {
-                toggle_pick(app, "color", layer, prop);
-            }
-            app.auto.add(&format!("effectControls.prop.{uid}.eyedropper"), er, &prop.name);
-            let mut rgb = [c[0] as f32, c[1] as f32, c[2] as f32];
-            if crate::widgets::color_popup(ui, pop, sr.left_bottom(), &mut rgb) {
-                set(actions, json!([rgb[0], rgb[1], rgb[2], 1.0]));
-            }
-        }
-        Value::Bool(b) => {
-            let cr = Rect::from_min_size(pos2(vx, cy - 8.0), vec2(16.0, 16.0));
-            if widgets::checkbox(ui, cr, *b, &t, egui::Id::new(("ec-b", uid))).clicked() {
-                set(actions, json!(!b));
-            }
-            p.text(pos2(cr.max.x + 6.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(12.0), t.text_dim);
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), cr, &prop.name);
-        }
-        Value::Enum(i) => {
-            if let ParamUi::Popup { options } = &prop.ui {
-                let widest = options.iter().map(|o| p.layout_no_wrap(o.clone(), Tokens::ui(11.5), t.text).size().x).fold(0.0, f32::max);
-                let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((widest + 30.0).clamp(80.0, (r.max.x - vx - 56.0).max(80.0)), 18.0));
-                let pop = egui::Id::new(("ec-epop", uid));
-                if widgets::dropdown(ui, dr, options.get(*i as usize).map(String::as_str).unwrap_or(""), &t, egui::Id::new(("ec-e", uid))).clicked() {
-                    widgets::open_popup(ui, pop);
-                }
-                app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
-                if let Some(ni) = widgets::popup_menu(ui, pop, dr.left_bottom(), options, Some(*i as usize)) {
-                    set(actions, json!(ni));
-                }
-            }
-        }
-        Value::Layer(l) => {
-            let comp = app.session.active_comp_arc();
-            if let Some(comp) = comp {
-                let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2(((r.max.x - vx) * 0.55).clamp(90.0, 170.0), 18.0));
-                let idx_of = |id: u64| comp.layers.iter().position(|x| x.id.0 == id);
-                let name = l.and_then(|id| idx_of(id).map(|i| format!("{}. {}", i + 1, comp.layers[i].name))).unwrap_or_else(|| "None".into());
-                let pop = egui::Id::new(("ec-lpop", uid));
-                if widgets::dropdown(ui, dr, &name, &t, egui::Id::new(("ec-l", uid))).clicked() {
-                    widgets::open_popup(ui, pop);
-                }
-                app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
-                let mut opts = vec!["None".to_string()];
-                opts.extend(comp.layers.iter().enumerate().map(|(i, l)| format!("{}. {}", i + 1, l.name)));
-                let cur = l.and_then(idx_of).map(|i| i + 1).unwrap_or(0);
-                if let Some(i) = widgets::popup_menu(ui, pop, dr.left_bottom(), &opts, Some(cur)) {
-                    set(actions, if i == 0 { serde_json::Value::Null } else { json!(comp.layers[i - 1].id.0) });
-                }
-                // Source / Masks / Effects & Masks (the hidden companion parameter).
-                if let Some(src) = group.get(&effectcraft_engine::effects::layer_source_id(&prop.match_id)) {
-                    let si = src.value.as_enum() as usize;
-                    let opts: Vec<String> = effectcraft_engine::effects::LAYER_SOURCE_OPTIONS.iter().map(|s| s.to_string()).collect();
-                    let sr = Rect::from_min_size(pos2(dr.max.x + 6.0, cy - 9.0), vec2(((r.max.x - dr.max.x) - 64.0).clamp(70.0, 120.0), 18.0));
-                    let spop = egui::Id::new(("ec-lspop", uid));
-                    if widgets::dropdown(ui, sr, opts.get(si).map(String::as_str).unwrap_or(""), &t, egui::Id::new(("ec-ls", uid))).clicked() {
-                        widgets::open_popup(ui, spop);
-                    }
-                    app.auto.add(&format!("effectControls.prop.{uid}.source"), sr, &src.name);
-                    if let Some(ni) = widgets::popup_menu(ui, spop, sr.left_bottom(), &opts, Some(si)) {
-                        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": src.uid, "value": ni})));
-                    }
-                }
-            }
-        }
-        // EXtractoR's red / green / blue / alpha: a popup of the footage's OpenEXR channels (#295).
-        Value::Str(s) if super::fx_editors::is_extractor_channel(group, prop) => {
-            let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 56.0).clamp(80.0, 200.0), 18.0));
-            super::fx_editors::channel_popup(app, ui, layer, prop, s, dr, actions);
-        }
-        // A file parameter (Apply Color LUT's LUT, an OCIO config): its file name and Choose…,
-        // as in After Effects.
-        Value::Str(s) if matches!(prop.ui, ParamUi::File { .. }) => {
-            let bw = 70.0;
-            let br = Rect::from_min_size(pos2(vx, cy - 9.0), vec2(bw, 18.0));
-            if widgets::text_button(ui, br, crate::i18n::tr("Choose..."), false, &t, egui::Id::new(("ec-file", uid))).clicked() {
-                let filters: Vec<&str> = match &prop.ui {
-                    ParamUi::File { filters } => filters.iter().map(String::as_str).collect(),
-                    _ => vec![],
-                };
-                match app.hooks.pick_files.as_ref() {
-                    Some(pick) => {
-                        if let Some(path) = pick(&filters).into_iter().next() {
-                            actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": path})));
-                        }
-                    }
-                    None => app.ui.status = "no file dialog available: set the path with prop.set".into(),
-                }
-            }
-            app.auto.add(&format!("effectControls.prop.{uid}.choose"), br, &prop.name);
-            let shown = if s.trim().is_empty() {
-                crate::i18n::tr("None").to_string()
-            } else if s.contains('\n') {
-                prop.name.clone()
-            } else {
-                effectcraft_engine::sequence::file_name(s)
-            };
-            let nr = Rect::from_min_max(pos2(br.max.x + 8.0, r.min.y), pos2(r.max.x - 8.0, r.max.y));
-            let np = p.with_clip_rect(nr.intersect(p.clip_rect()));
-            np.text(pos2(nr.min.x, cy), Align2::LEFT_CENTER, &shown, Tokens::ui(12.0), if s.trim().is_empty() { t.text_dim } else { t.text });
-            let hover = ui.interact(nr, egui::Id::new(("ec-file-name", uid)), Sense::hover());
-            if !s.trim().is_empty() && !s.contains('\n') {
-                hover.on_hover_text(s.as_str());
-            }
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), nr, &shown);
-        }
-        // A text parameter (Cryptomatte's Selection, Colorama's Output Cycle, config names):
-        // typed in a field, set when it loses the focus (Esc keeps the old text).
-        Value::Str(s) if matches!(prop.ui, ParamUi::Text) => {
-            let fr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 12.0).clamp(80.0, 320.0), 18.0));
-            let bid = egui::Id::new(("ec-text", uid));
-            let mut buf: String = ui.data(|d| d.get_temp(bid)).unwrap_or_else(|| s.clone());
-            let resp = widgets::text_field(ui, fr, &mut buf, "", &t);
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), fr, &prop.name);
-            if resp.lost_focus() {
-                if buf != *s && !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-                    actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": buf})));
-                }
-                ui.data_mut(|d| d.remove::<String>(bid));
-            } else if resp.has_focus() {
-                ui.data_mut(|d| d.insert_temp(bid, buf));
-            }
-        }
-        Value::Gradient(g) => {
-            let gr = Rect::from_min_size(pos2(vx, cy - 7.0), vec2((r.max.x - vx - 56.0).clamp(60.0, 180.0), 14.0));
-            let n = 48;
-            for k in 0..n {
-                let f = k as f64 / (n - 1) as f64;
-                let c = gradient_at(g, f);
-                let x0 = gr.min.x + gr.width() * k as f32 / n as f32;
-                let x1 = gr.min.x + gr.width() * (k + 1) as f32 / n as f32;
-                p.rect_filled(Rect::from_min_max(pos2(x0, gr.min.y), pos2(x1, gr.max.y)), 0.0, c);
-            }
-            p.rect_stroke(gr, 2.0, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
-            app.auto.add(&format!("effectControls.prop.{uid}.value"), gr, &prop.name);
-        }
-        _ => {}
-    }
-    dims
-}
-
-/// How many of a vector parameter's values show (a 3D point's Z only on a 3D layer).
-fn shown_dims(layer: &Layer, prop: &Property, value: &Value) -> usize {
-    let n = value.components().len();
-    if prop.shown_dims > 0 && !(layer.is_3d() && n == 3) { prop.shown_dims as usize } else { n }
-}
-
-/// Colour of a gradient at `f` (colour stops only).
-fn gradient_at(g: &effectcraft_engine::keyframe::Gradient, f: f64) -> Color32 {
-    let stops = &g.colors;
-    let c = if stops.is_empty() {
-        [0.0, 0.0, 0.0, 1.0]
-    } else if f <= stops[0].0 {
-        stops[0].1
-    } else if f >= stops[stops.len() - 1].0 {
-        stops[stops.len() - 1].1
-    } else {
-        let i = stops.iter().position(|s| s.0 > f).unwrap_or(stops.len() - 1).max(1);
-        let (a, b) = (stops[i - 1], stops[i]);
-        let k = ((f - a.0) / (b.0 - a.0).max(1e-9)) as f32;
-        [0, 1, 2, 3].map(|j| a.1[j] + (b.1[j] - a.1[j]) * k)
-    };
-    Color32::from_rgb((c[0].clamp(0.0, 1.0) * 255.0) as u8, (c[1].clamp(0.0, 1.0) * 255.0) as u8, (c[2].clamp(0.0, 1.0) * 255.0) as u8)
-}
-
-/// The twirled-open slider under a slider param: track, knob and the slider range's ends.
-#[allow(clippy::too_many_arguments)]
-fn slider_row(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    prop: &Property,
-    ectx: &EvalCtx,
-    r: Rect,
-    x0: f32,
-    actions: &mut Actions,
-) {
-    let t = app.tokens;
-    let ParamUi::Slider { slider_min, slider_max, decimals, .. } = prop.ui else { return };
-    let Value::Scalar(v) = ectx.value(layer, prop) else { return };
-    let uid = prop.uid;
-    let tr = Rect::from_min_max(pos2(r.min.x + x0, r.min.y + 8.0), pos2(r.max.x - 16.0, r.min.y + 12.0));
-    if tr.width() < 40.0 {
-        return;
-    }
-    p.rect_filled(tr, 2.0, t.field_bg);
-    let f = ((v - slider_min) / (slider_max - slider_min)).clamp(0.0, 1.0) as f32;
-    p.rect_filled(Rect::from_min_max(tr.min, pos2(tr.min.x + tr.width() * f, tr.max.y)), 2.0, t.accent.gamma_multiply(0.7));
-    p.circle_filled(pos2(tr.min.x + tr.width() * f, tr.center().y), 5.0, t.text);
-    let dec = decimals as usize;
-    p.text(pos2(tr.min.x, tr.max.y + 4.0), Align2::LEFT_TOP, format!("{slider_min:.dec$}"), Tokens::ui(10.5), t.text_dim);
-    p.text(pos2(tr.max.x, tr.max.y + 4.0), Align2::RIGHT_TOP, format!("{slider_max:.dec$}"), Tokens::ui(10.5), t.text_dim);
-    let sresp = ui.interact(tr.expand2(vec2(4.0, 6.0)), egui::Id::new(("ec-slider", uid)), Sense::click_and_drag());
-    app.auto.add(&format!("effectControls.prop.{uid}.slider"), tr, &prop.name);
-    if (sresp.dragged() || sresp.clicked())
-        && let Some(pt) = sresp.interact_pointer_pos()
-    {
-        let f = ((pt.x - tr.min.x) / tr.width()).clamp(0.0, 1.0) as f64;
-        actions.push((
-            "prop.set".into(),
-            json!({"layer": layer.id.0, "prop": uid, "value": slider_min + (slider_max - slider_min) * f, "merge": format!("ec-{uid}")}),
-        ));
-    }
-}
-
-/// The twirled-open angle dial under an angle param.
-#[allow(clippy::too_many_arguments)]
-fn dial_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, layer: &Layer, prop: &Property, ectx: &EvalCtx, r: Rect, x0: f32, actions: &mut Actions) {
-    let t = app.tokens;
-    let Value::Scalar(v) = ectx.value(layer, prop) else { return };
-    let uid = prop.uid;
-    let d = (r.height() - 12.0).min(52.0);
-    let dr = Rect::from_min_size(pos2(r.min.x + x0 + 40.0, r.min.y + 6.0), vec2(d, d));
-    let id = egui::Id::new(("ec-dial", uid));
-    let (resp, nv) = fw::angle_dial(ui, dr, v, id, &t);
-    app.auto.add(&format!("effectControls.prop.{uid}.dial"), dr, &prop.name);
-    if let Some(nv) = nv {
-        let key = gesture_key(ui, id, resp.drag_started() || resp.clicked());
-        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": nv, "merge": key})));
-    }
-}
-
-/// The effect instance a row belongs to, for conditional visibility
-/// ([`effectcraft_engine::effects::catalog::param_shown`]): effect id, the instance's root
-/// group and the spec-id path of the group being drawn (`""` or `cameraPosition/`).
-struct FxScope<'a> {
-    effect: &'a str,
-    root: &'a PropGroup,
-    path: String,
-}
-
-impl<'a> FxScope<'a> {
-    fn sub(&self, m: &str) -> FxScope<'a> {
-        FxScope { effect: self.effect, root: self.root, path: format!("{}{m}/", self.path) }
-    }
-    /// Whether child `m` of the current group is shown.
-    fn shown(&self, layer: &Layer, ectx: &EvalCtx, m: &str) -> bool {
-        let root = self.root;
-        let value = |id: &str| -> Option<Value> {
-            let mut g = root;
-            let mut parts = id.split('/').peekable();
-            while let Some(part) = parts.next() {
-                if parts.peek().is_none() {
-                    return g.get(part).map(|p| ectx.value(layer, p));
-                }
-                g = g.sub(part)?;
-            }
-            None
-        };
-        effectcraft_engine::effects::catalog::param_shown(self.effect, &format!("{}{m}", self.path), &value)
-    }
-}
-
-/// Twirl `g` closed (it was `open`) or open; with `all` (Alt/Cmd-click) every group under it follows.
-fn toggle_closed(app: &mut EffectcraftApp, g: &PropGroup, open: bool, all: bool) {
-    fn walk(g: &PropGroup, out: &mut Vec<u64>) {
-        for sg in g.groups() {
-            out.push(sg.uid);
-            walk(sg, out);
-        }
-    }
-    let mut uids = vec![g.uid];
-    if all {
-        walk(g, &mut uids);
-    }
-    for u in uids {
-        if open {
-            app.ui.fx_closed.insert(u);
-        } else {
-            app.ui.fx_closed.remove(&u);
-        }
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-fn group_rows(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    g: &PropGroup,
-    ectx: &EvalCtx,
-    rect: Rect,
-    y: &mut f32,
-    depth: usize,
-    fx: &FxScope,
-    actions: &mut Actions,
-) {
-    let t = app.tokens;
-    for c in &g.children {
-        let r = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), ROW));
-        match c {
-            Node::Prop(pr) => {
-                if matches!(pr.ui, ParamUi::Hidden) || pr.three_d_only && !layer.is_3d() || !fx.shown(layer, ectx, &pr.match_id) {
-                    continue;
-                }
-                *y += ROW;
-                let indent = PARAM_NAME_X - 13.0 + TREE_INDENT * depth as f32;
-                let visible = !(r.max.y < rect.min.y || r.min.y > rect.max.y);
-                if visible {
-                    app.auto.add(&format!("effectControls.row.{}", pr.uid), r, &pr.name);
-                    let dims = prop_row(app, ui, p, layer, g, pr, ectx, r, indent, actions);
-                    // A Timeline pick whip can be dropped here (After Effects).
-                    super::timeline::whip_target(ui.ctx(), r.intersect(rect), layer.id.0, pr.uid, dims);
-                }
-                if app.ui.fx_slider_open.contains(&pr.uid) {
-                    if matches!(pr.ui, ParamUi::Angle) {
-                        let sr = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), DIAL_ROW));
-                        *y += DIAL_ROW;
-                        if sr.max.y >= rect.min.y && sr.min.y <= rect.max.y {
-                            dial_row(app, ui, layer, pr, ectx, sr, indent + 22.0, actions);
-                        }
-                    } else if matches!(pr.ui, ParamUi::Slider { .. }) {
-                        let sr = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), 34.0));
-                        *y += 34.0;
-                        if sr.max.y >= rect.min.y && sr.min.y <= rect.max.y {
-                            slider_row(app, ui, p, layer, pr, ectx, sr, indent + 22.0, actions);
-                        }
-                    }
-                }
-            }
-            Node::Group(sg) => {
-                // Paint strokes live in the Timeline only (AE's Paint shows Paint on Transparent).
-                if effectcraft_engine::effects::paint::is_paint(g) || !fx.shown(layer, ectx, &sg.match_id) {
-                    continue;
-                }
-                *y += ROW;
-                let open = !app.ui.fx_closed.contains(&sg.uid);
-                let tw = Rect::from_center_size(pos2(r.min.x + PARAM_NAME_X - 12.0 + TREE_INDENT * depth as f32, r.center().y), vec2(12.0, 12.0));
-                if r.max.y >= rect.min.y && r.min.y <= rect.max.y {
-                    app.auto.add(&format!("effectControls.row.{}", sg.uid), r, &sg.name);
-                    app.auto.add(&format!("effectControls.group.{}.twirl", sg.uid), tw, &sg.name);
-                    if widgets::twirl(ui, tw, open, egui::Id::new(("ec-g", sg.uid)), &t).clicked() {
-                        toggle_closed(app, sg, open, ui.input(|i| i.modifiers.alt || i.modifiers.command));
-                    }
-                    let name = p.text(pos2(tw.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, &sg.name, Tokens::ui(12.0), t.text);
-                    app.auto.add(&format!("effectControls.group.{}.name", sg.uid), name, &sg.name);
-                }
-                if open {
-                    let sub = fx.sub(&sg.match_id);
-                    // A visual editor for the group's hidden parameters (Lumetri curves, …).
-                    let eh = super::fx_editors::inline_height(fx.effect, &sub.path, rect.width());
-                    if eh > 0.0 {
-                        let er = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), eh));
-                        *y += eh;
-                        if er.max.y >= rect.min.y && er.min.y <= rect.max.y {
-                            super::fx_editors::inline_editor(app, ui, p, layer, fx.root, sg, fx.effect, &sub.path, ectx, er, actions);
-                        }
-                    }
-                    group_rows(app, ui, p, layer, sg, ectx, rect, y, depth + 1, &sub, actions);
-                }
-            }
-        }
-    }
-}
-
-/// Warp Stabilizer's Analyze / Cancel buttons and analysis status.
-fn warp_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, r: Rect, actions: &mut Actions) {
-    let t = app.tokens;
-    let running = app.session.warp_target().is_some_and(|(_, l, u)| l == layer.id && u == g.uid) && app.session.is_warp_analyzing();
-    let busy = app.session.is_warp_analyzing();
-    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
-    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
-    if widgets::text_button(ui, b1, "Analyze", false, &t, egui::Id::new(("warp-analyze", g.uid))).clicked() && !busy {
-        actions.push(("warp.analyze".into(), json!({"layer": layer.id.0, "effect": g.uid})));
-    }
-    app.auto.add(&format!("effectControls.warp.{}.analyze", g.uid), b1, "Analyze");
-    if running {
-        if widgets::text_button(ui, b2, "Cancel", false, &t, egui::Id::new(("warp-cancel", g.uid))).clicked() {
-            actions.push(("warp.cancel".into(), json!({})));
-        }
-        app.auto.add(&format!("effectControls.warp.{}.cancel", g.uid), b2, "Cancel");
-    }
-    let analysed = matches!(g.get(effectcraft_engine::effects::warp_stab::ANALYSIS).map(|p| &p.value), Some(Value::Str(s)) if !s.is_empty());
-    let status = match app.session.warp_progress() {
-        Some(pr) if running => pr.banner(),
-        _ if analysed => "Analysis complete".to_string(),
-        _ if app.session.warp_pending.iter().any(|(_, l, u)| *l == layer.id && *u == g.uid) => "Waiting to analyze".to_string(),
-        _ => "Not analyzed: click Analyze".to_string(),
-    };
-    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, status, Tokens::ui(11.5), t.text_dim);
-}
-
-/// Roto Brush & Refine Edge: Freeze / Unfreeze and Propagate buttons and the segmentation status.
-fn roto_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, r: Rect, actions: &mut Actions) {
-    use effectcraft_engine::effects::roto as fx;
-    let t = app.tokens;
-    let params = effectcraft_engine::effects::flatten_params(g, &mut |pr| pr.value.clone());
-    let frozen = fx::is_frozen(&params);
-    let d = fx::data(&params);
-    let running = app.session.roto_target().is_some_and(|(_, l, u, _)| l == layer.id && u == g.uid) && app.session.is_roto_running();
-    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
-    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
-    let label = if frozen { "Unfreeze" } else { "Freeze" };
-    if widgets::text_button(ui, b1, label, frozen, &t, egui::Id::new(("roto-freeze-ec", g.uid))).clicked() && !running {
-        let id = if frozen { "roto.unfreeze" } else { "roto.freeze" };
-        actions.push((id.into(), json!({"layer": layer.id.0, "effect": g.uid})));
-    }
-    app.auto.add(&format!("effectControls.roto.{}.freeze", g.uid), b1, label);
-    let (l2, id2) = if running { ("Stop", "roto.cancel") } else { ("Propagate", "roto.propagate") };
-    if widgets::text_button(ui, b2, l2, false, &t, egui::Id::new(("roto-prop-ec", g.uid))).clicked() && !frozen {
-        actions.push((id2.into(), json!({"layer": layer.id.0, "effect": g.uid})));
-    }
-    app.auto.add(&format!("effectControls.roto.{}.propagate", g.uid), b2, l2);
-    let status = match (app.session.roto_progress(), d.base) {
-        (Some(pr), _) if running => pr.banner(),
-        (_, None) => "No strokes: paint with the Roto Brush tool (Alt+W) in the Layer panel".to_string(),
-        (_, Some(b)) => format!("Base frame {b}, span {}–{}{}", d.span[0], d.span[1], if frozen { " (frozen)" } else { "" }),
-    };
-    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, status, Tokens::ui(11.5), t.text_dim);
-}
-
-/// Object Matte: Freeze / Unfreeze and Track / Stop buttons (the background job that computes
-/// the matte over the tracked frames) and its status.
-fn object_matte_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, r: Rect, actions: &mut Actions) {
-    use effectcraft_engine::effects::object_matte as om;
-    let t = app.tokens;
-    let params = effectcraft_engine::effects::flatten_params(g, &mut |pr| pr.value.clone());
-    let frozen = om::is_frozen(&params);
-    let mine = app.session.roto_target().is_some_and(|(_, l, u, _)| l == layer.id && u == g.uid);
-    let running = mine && app.session.is_roto_running();
-    let busy = app.session.is_roto_running();
-    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
-    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
-    let label = if frozen { "Unfreeze" } else { "Freeze" };
-    if widgets::text_button(ui, b1, crate::i18n::tr(label), frozen, &t, egui::Id::new(("om-freeze-ec", g.uid))).clicked() && !busy {
-        let id = if frozen { "objectMatte.unfreeze" } else { "objectMatte.freeze" };
-        actions.push((id.into(), json!({"layer": layer.id.0, "effect": g.uid})));
-    }
-    app.auto.add(&format!("effectControls.objectMatte.{}.freeze", g.uid), b1, label);
-    let (l2, id2) = if running { ("Stop", "roto.cancel") } else { ("Track", "objectMatte.propagate") };
-    if widgets::text_button(ui, b2, crate::i18n::tr(l2), false, &t, egui::Id::new(("om-track-ec", g.uid))).clicked() && !frozen && (running || !busy) {
-        actions.push((id2.into(), json!({"layer": layer.id.0, "effect": g.uid})));
-    }
-    app.auto.add(&format!("effectControls.objectMatte.{}.track", g.uid), b2, l2);
-    let base = om::reference_frame(&params);
-    let status = match app.session.roto_progress() {
-        Some(pr) if running => pr.banner(),
-        _ if frozen => format!("Frozen from reference frame {base}"),
-        _ if app.session.roto_pending.iter().any(|(_, l, u)| *l == layer.id && *u == g.uid) => "Waiting to track".to_string(),
-        _ => format!("Reference frame {base}: Track computes the matte ahead of playback"),
-    };
-    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, &status, Tokens::ui(11.5), t.text_dim);
-    app.auto.add(
-        &format!("effectControls.objectMatte.{}.status", g.uid),
-        Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 30.0), vec2(r.width() - 24.0, 16.0)),
-        &status,
-    );
-}
-
-// ---------------------------------------------------------------------------------------------
-// Curves / Levels editors
-
-/// Height of the custom editor shown under an effect's header (0 when none).
-fn editor_height(effect: &str, g: &PropGroup, width: f32) -> f32 {
-    match effect {
-        super::fx_editors::GLOW | super::fx_editors::RESHAPE | super::fx_editors::EXTRACTOR => super::fx_editors::header_height(effect, g, width),
-        "ec.color.curves" => 34.0 + curves_size(width) + 26.0,
-        effectcraft_engine::effects::warp_stab::ID => 50.0,
-        effectcraft_engine::effects::camera_tracker::ID => super::camera_tracker_ui::EDITOR_HEIGHT,
-        effectcraft_engine::effects::roto::ID | effectcraft_engine::effects::object_matte::ID => 50.0,
-        "ec.color.levels" | "ec.color.levelsic" => 34.0 + 80.0 + 58.0,
-        "ec.color.autolevels" | "ec.color.autocontrast" | "ec.color.autocolor" => 24.0 + 80.0 + 12.0,
-        _ => 0.0,
-    }
-}
-
-fn curves_size(width: f32) -> f32 {
-    (width - 72.0).clamp(120.0, 256.0)
-}
-
-/// Cached histogram of the displayed frame (recomputed when the frame changes).
-fn frame_histogram(app: &mut EffectcraftApp, ctx: &egui::Context) -> Option<std::sync::Arc<[[u32; 256]; 5]>> {
-    let img = app.viewer_pixels()?;
-    let key = std::sync::Arc::as_ptr(&img) as usize;
-    let id = egui::Id::new("ec-histogram");
-    if let Some((k, h)) = ctx.data(|d| d.get_temp::<(usize, std::sync::Arc<[[u32; 256]; 5]>)>(id))
-        && k == key
-    {
-        return Some(h);
-    }
-    let h = std::sync::Arc::new(fw::histogram(&img));
-    ctx.data_mut(|d| d.insert_temp(id, (key, h.clone())));
-    Some(h)
-}
-
-fn channel_color(ch: usize) -> Color32 {
-    match ch {
-        1 => Color32::from_rgb(0xe0, 0x50, 0x50),
-        2 => Color32::from_rgb(0x50, 0xc8, 0x60),
-        3 => Color32::from_rgb(0x50, 0x80, 0xf0),
-        4 => Color32::from_gray(0x90),
-        _ => Color32::from_gray(0xb8),
-    }
-}
-
-/// A "Channel: [RGB ▾]" popup; returns the chosen channel.
-#[allow(clippy::too_many_arguments)]
-fn channel_popup(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    x: f32,
-    cy: f32,
-    cur: usize,
-    names: &[&str],
-    id: egui::Id,
-    auto: &str,
-) -> Option<usize> {
-    let t = app.tokens;
-    p.text(pos2(x, cy), Align2::LEFT_CENTER, crate::i18n::tr("Channel:"), Tokens::ui(12.0), t.text_dim);
-    let dr = Rect::from_min_size(pos2(x + 58.0, cy - 9.0), vec2(80.0, 18.0));
-    let pop = id.with("pop");
-    if widgets::dropdown(ui, dr, names.get(cur).copied().unwrap_or(""), &t, id).clicked() {
-        widgets::open_popup(ui, pop);
-    }
-    app.auto.add(auto, dr, "Channel");
-    let opts: Vec<String> = names.iter().map(|s| s.to_string()).collect();
-    widgets::popup_menu(ui, pop, dr.left_bottom(), &opts, Some(cur))
-}
-
-/// Curves: channel popup, Bezier/pencil mode, Reset, and the graph bound to the channel's
-/// hidden point-list parameter.
-#[allow(clippy::too_many_arguments)]
-fn curves_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, ectx: &EvalCtx, r: Rect, actions: &mut Actions) {
-    let t = app.tokens;
-    let euid = g.uid;
-    // The channel lives in the effect's hidden Channel parameter (UI state for instances
-    // saved before it existed).
-    let chan_prop = g.get("channel");
-    let ch = match chan_prop {
-        Some(pr) => ectx.value(layer, pr).as_enum() as usize,
-        None => app.ui.fx_curve_channel.get(&euid).copied().unwrap_or(0),
-    }
-    .min(4);
-    let x0 = r.min.x + 30.0;
-    let cy = r.min.y + 17.0;
-    let names: [&str; 5] = [crate::i18n::tr("RGB"), crate::i18n::tr("Red"), crate::i18n::tr("Green"), crate::i18n::tr("Blue"), crate::i18n::tr("Alpha")];
-    if let Some(n) = channel_popup(app, ui, p, x0, cy, ch, &names, egui::Id::new(("ec-cch", euid)), &format!("effectControls.effect.{euid}.curves.channel")) {
-        match chan_prop {
-            Some(pr) => actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": n}))),
-            None => {
-                app.ui.fx_curve_channel.insert(euid, n);
-            }
-        }
-    }
-    let pencil = app.ui.fx_curve_pencil.contains(&euid);
-    let mr = Rect::from_min_size(pos2(x0 + 146.0, cy - 9.0), vec2(56.0, 18.0));
-    if widgets::dropdown(ui, mr, if pencil { "Pencil" } else { "Bezier" }, &t, egui::Id::new(("ec-cmode", euid))).clicked() {
-        if pencil {
-            app.ui.fx_curve_pencil.remove(&euid);
-        } else {
-            app.ui.fx_curve_pencil.insert(euid);
-        }
-    }
-    app.auto.add(&format!("effectControls.effect.{euid}.curves.mode"), mr, "Curve mode");
-    let Some(prop) = g.get(fw::CURVE_CHANNELS[ch].0) else { return };
-    let cur = match ectx.value(layer, prop) {
-        Value::Str(s) => fw::CurvePoints::parse(&s),
-        _ => fw::CurvePoints::identity(),
-    };
-    let rr = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 9.0), vec2(44.0, 18.0));
-    let rresp = ui.interact(rr, egui::Id::new(("ec-creset", euid)), Sense::click());
-    p.text(rr.center(), Align2::CENTER_CENTER, crate::i18n::tr("Reset"), Tokens::ui(11.5), if rresp.hovered() { t.hot_text } else { t.text_dim });
-    app.auto.add(&format!("effectControls.effect.{euid}.curves.reset"), rr, "Reset curve");
-    if rresp.clicked() {
-        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": prop.uid, "value": fw::CurvePoints::identity().format()})));
-    }
-    let size = curves_size(r.width());
-    let gr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 38.0), vec2(size, size));
-    // Input/output gradients along the axes.
-    let col = channel_color(ch);
-    p.rect_filled(Rect::from_min_max(pos2(gr.min.x, gr.max.y + 3.0), pos2(gr.max.x, gr.max.y + 8.0)), 0.0, col.gamma_multiply(0.5));
-    let id = egui::Id::new(("ec-curves", euid, ch));
-    let (resp, edit) = fw::curves_graph(ui, gr, &cur, ch, pencil, id, &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.curves.graph"), gr, "Curves");
-    let started = resp.drag_started() || resp.clicked();
-    if let Some(np) = edit.changed {
-        let key = gesture_key(ui, id, started);
-        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": prop.uid, "value": np.format(), "merge": key})));
-    }
-    p.text(
-        pos2(gr.min.x, gr.max.y + 18.0),
-        Align2::LEFT_CENTER,
-        if pencil { "Drag to draw the curve" } else { "Click adds a point; drag one off to remove" },
-        Tokens::ui(10.5),
-        t.text_faint,
-    );
-}
-
-/// Levels parameter ids for a channel: input black, input white, gamma, output black, output white.
-fn levels_ids(effect: &str, ch: usize) -> [String; 5] {
-    if effect == "ec.color.levels" {
-        return effectcraft_engine::effects::levels_channel_ids(ch);
-    }
-    // Levels (Individual Controls) nests each channel's controls in its twirl-down group.
-    let pre = fw::LEVELS_CHANNELS[ch.min(4)].0;
-    ["InBlack", "InWhite", "Gamma", "OutBlack", "OutWhite"].map(|s| format!("{pre}/{pre}{s}"))
-}
-
-/// Levels: (channel popup,) histogram, input black/gamma/white triangles, output bar with
-/// black/white triangles.
-#[allow(clippy::too_many_arguments)]
-fn levels_editor(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    g: &PropGroup,
-    effect: &str,
-    ectx: &EvalCtx,
-    r: Rect,
-    actions: &mut Actions,
-) {
-    let t = app.tokens;
-    let euid = g.uid;
-    let x0 = r.min.x + 30.0;
-    let cy = r.min.y + 17.0;
-    // Levels keeps its channel in the Channel parameter; Levels (Individual Controls) shows
-    // every channel and the popup only picks the histogram.
-    let ch = if effect == "ec.color.levelsic" {
-        app.ui.fx_levels_channel.get(&euid).copied().unwrap_or(0).min(4)
-    } else {
-        g.get("channel").map(|pr| ectx.value(layer, pr).as_enum() as usize).unwrap_or(0).min(4)
-    };
-    if effect == "ec.color.levelsic" {
-        let names: [&str; 5] = [crate::i18n::tr("RGB"), crate::i18n::tr("Red"), crate::i18n::tr("Green"), crate::i18n::tr("Blue"), crate::i18n::tr("Alpha")];
-        if let Some(n) = channel_popup(app, ui, p, x0, cy, ch, &names, egui::Id::new(("ec-lch", euid)), &format!("effectControls.effect.{euid}.levels.channel"))
-        {
-            app.ui.fx_levels_channel.insert(euid, n);
-        }
-    } else {
-        p.text(pos2(x0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Histogram"), Tokens::ui(12.0), t.text_dim);
-    }
-    let w = (r.width() - 72.0).clamp(120.0, 256.0);
-    let hr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 34.0), vec2(w, 80.0));
-    match frame_histogram(app, ui.ctx()) {
-        // Channel 0 (RGB) shows luminance; the others their own channel.
-        Some(h) => fw::draw_histogram(p, hr, &h[ch], channel_color(ch)),
-        None => {
-            p.rect_filled(hr, 0.0, Color32::from_rgb(0x1c, 0x1c, 0x1c));
-        }
-    }
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.histogram"), hr, "Histogram");
-    let ids = levels_ids(effect, ch);
-    let val = |id: &str| g.prop(id).map(|pr| ectx.value(layer, pr).as_f64()).unwrap_or(0.0);
-    let (ib, iw, gm, ob, ow) = (val(&ids[0]), val(&ids[1]), val(&ids[2]), val(&ids[3]), val(&ids[4]));
-    let mut set = |ui: &egui::Ui, id: &str, v: f64, started: bool| {
-        if let Some(pr) = g.prop(id) {
-            let key = gesture_key(ui, egui::Id::new(("ec-lv", euid, id)), started);
-            actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": v, "merge": key})));
-        }
-    };
-    let track = Rect::from_min_size(pos2(hr.min.x, hr.max.y + 1.0), vec2(w, 10.0));
-    let started = |ui: &egui::Ui| ui.input(|i| i.pointer.any_pressed());
-    let (r0, nv) = fw::level_handle(ui, track, ib, Color32::BLACK, egui::Id::new(("ec-lib", euid, ch)), &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.inBlack"), r0, "Input Black");
-    if let Some(v) = nv {
-        set(ui, &ids[0], v.min(iw - 0.005), started(ui));
-    }
-    let gx = fw::gamma_handle(ib, iw, gm);
-    let (r1, nv) = fw::level_handle(ui, track, gx, Color32::from_gray(128), egui::Id::new(("ec-lg", euid, ch)), &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.gamma"), r1, "Gamma");
-    if let Some(v) = nv {
-        set(ui, &ids[2], (fw::gamma_from_handle(ib, iw, v) * 100.0).round() / 100.0, started(ui));
-    }
-    let (r2, nv) = fw::level_handle(ui, track, iw, Color32::WHITE, egui::Id::new(("ec-liw", euid, ch)), &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.inWhite"), r2, "Input White");
-    if let Some(v) = nv {
-        set(ui, &ids[1], v.max(ib + 0.005), started(ui));
-    }
-    // Output: a black→white bar with its two triangles.
-    let bar = Rect::from_min_size(pos2(hr.min.x, track.max.y + 10.0), vec2(w, 9.0));
-    let n = 32;
-    for k in 0..n {
-        let v = (k as f32 / (n - 1) as f32 * 255.0) as u8;
-        let x0 = bar.min.x + bar.width() * k as f32 / n as f32;
-        let x1 = bar.min.x + bar.width() * (k + 1) as f32 / n as f32;
-        p.rect_filled(Rect::from_min_max(pos2(x0, bar.min.y), pos2(x1, bar.max.y)), 0.0, Color32::from_gray(v));
-    }
-    let otrack = Rect::from_min_size(pos2(bar.min.x, bar.max.y + 1.0), vec2(w, 10.0));
-    let (r3, nv) = fw::level_handle(ui, otrack, ob, Color32::BLACK, egui::Id::new(("ec-lob", euid, ch)), &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.outBlack"), r3, "Output Black");
-    if let Some(v) = nv {
-        set(ui, &ids[3], v, started(ui));
-    }
-    let (r4, nv) = fw::level_handle(ui, otrack, ow, Color32::WHITE, egui::Id::new(("ec-low", euid, ch)), &t);
-    app.auto.add(&format!("effectControls.effect.{euid}.levels.outWhite"), r4, "Output White");
-    if let Some(v) = nv {
-        set(ui, &ids[4], v, started(ui));
-    }
-}
-
-/// Auto Levels / Auto Contrast / Auto Color: the histogram they work from.
-fn histogram_only(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, g: &PropGroup, r: Rect) {
-    let t = app.tokens;
-    let x0 = r.min.x + 30.0;
-    p.text(pos2(x0, r.min.y + 12.0), Align2::LEFT_CENTER, crate::i18n::tr("Histogram"), Tokens::ui(12.0), t.text_dim);
-    let w = (r.width() - 72.0).clamp(120.0, 256.0);
-    let hr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 24.0), vec2(w, 80.0));
-    match frame_histogram(app, ui.ctx()) {
-        Some(h) => {
-            fw::draw_histogram(p, hr, &h[1], channel_color(1).gamma_multiply(0.6));
-            fw::draw_histogram_overlay(p, hr, &h[2], channel_color(2).gamma_multiply(0.6));
-            fw::draw_histogram_overlay(p, hr, &h[3], channel_color(3).gamma_multiply(0.6));
-        }
-        None => {
-            p.rect_filled(hr, 0.0, Color32::from_rgb(0x1c, 0x1c, 0x1c));
-        }
-    }
-    app.auto.add(&format!("effectControls.effect.{}.histogram", g.uid), hr, "Histogram");
-}
-
-// ---------------------------------------------------------------------------------------------
-
-/// Open the rename field on effect `uid` (Enter with the effect selected), name selected.
-pub fn start_rename(ctx: &egui::Context, uid: u64, name: &str) {
-    let id = egui::Id::new(("ec-rename", uid));
-    ctx.data_mut(|d| d.insert_temp(id, name.to_string()));
-    ctx.data_mut(|d| d.insert_temp(id.with("select"), true));
-    ctx.memory_mut(|m| m.request_focus(id.with("field")));
-}
-
-pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
-    let t = app.tokens;
-    let p = ui.painter().with_clip_rect(rect);
-    let ctx = ui.ctx().clone();
-    let Some(layer) = selected_layer(app) else {
-        p.text(rect.center(), Align2::CENTER_CENTER, crate::i18n::tr("Select a layer to see its effects"), Tokens::ui(12.0), t.text_faint);
-        return;
-    };
-    let Some(cid) = app.session.active_comp_id() else { return };
-    let comp = app.session.project.comp_arc(cid).unwrap_or_else(|| effectcraft_engine::project::Comp::new(1, 1, Default::default(), Default::default()).into());
-    let comp_name = app.session.project.item(cid).map(|i| i.name.clone()).unwrap_or_default();
-    let snap_project = app.session.project.clone();
-    let snap_expr = app.session.expr.clone();
-    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time: app.session.time(), expr: snap_expr.as_deref(), footage: None };
-    let hdr = Rect::from_min_size(rect.min, vec2(rect.width(), 24.0));
-    p.text(pos2(hdr.min.x + 10.0, hdr.center().y), Align2::LEFT_CENTER, format!("{} • {}", comp_name, layer.name), Tokens::ui(11.5), t.text_dim);
-    p.line_segment([hdr.left_bottom(), hdr.right_bottom()], Stroke::new(1.0, t.separator));
-    let body = Rect::from_min_max(pos2(rect.min.x, hdr.max.y), rect.max);
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("ec-scroll"), body);
-    let mut y = body.min.y + 4.0 - scroll.offset;
-    let mut actions: Actions = vec![];
-    let bp = p.with_clip_rect(body);
-    // Rows scroll under the header: clip their widgets (and hit tests) to the body.
-    let panel_clip = ui.clip_rect();
-    ui.set_clip_rect(body.intersect(panel_clip));
-    let fx: Vec<PropGroup> = layer.effects().map(|f| f.groups().cloned().collect()).unwrap_or_default();
-    if fx.is_empty() {
-        bp.text(
-            pos2(body.center().x, body.min.y + 40.0),
-            Align2::CENTER_CENTER,
-            "No effects. Drag one from Effects & Presets.",
-            Tokens::ui(12.0),
-            t.text_faint,
-        );
-    }
-    // Clicking empty space deselects the effects.
-    let bg = ui.interact(body, egui::Id::new("ec-bg"), Sense::click());
-    if bg.clicked() {
-        app.session.state.selected_props.retain(|(l, u)| !(*l == layer.id && fx.iter().any(|g| effect_active(g, layer.id, &[(*l, *u)]))));
-    }
-    let has_clip = !app.session.state.effect_clipboard.is_empty();
-    let drag_id = egui::Id::new("ec-drag-effect");
-    let dragging: Option<u64> = ctx.data(|d| d.get_temp(drag_id));
-    // Header tops, for drag-to-reorder.
-    let mut tops: Vec<(u64, f32)> = vec![];
-    for (fi, g) in fx.iter().enumerate() {
-        let GroupKind::Effect { effect } = &g.kind else { continue };
-        // The header draws the effect's name in the interface language; the automation labels
-        // below keep the property tree's name, which is the registry's English name (#821).
-        let shown = crate::i18n::effects::group(effect, &g.name);
-        let r = Rect::from_min_size(pos2(body.min.x, y), vec2(body.width(), ROW + 2.0));
-        tops.push((g.uid, r.min.y));
-        y += ROW + 2.0;
-        let open = !app.ui.fx_closed.contains(&g.uid);
-        let selected = app.session.state.selected_props.iter().any(|(l, u)| *l == layer.id && *u == g.uid);
-        let active = effect_active(g, layer.id, &app.session.state.selected_props);
-        bp.rect_filled(r, 0.0, if active { t.fx_header_active } else { t.fx_header });
-        // The effect's colour label (26.5): a bar on the header's left edge.
-        if let Some(lab) = g.label.filter(|l| *l != effectcraft_engine::color::Label::None) {
-            let [lr, lg, lb] = app.session.prefs.label_rgb(lab);
-            bp.rect_filled(Rect::from_min_size(r.min, vec2(4.0, r.height())), 0.0, Color32::from_rgb(lr, lg, lb));
-            app.auto.add(
-                &format!("effectControls.effect.{}.label", g.uid),
-                Rect::from_min_size(r.min, vec2(4.0, r.height())),
-                &app.session.prefs.label_name(lab),
-            );
-        }
-        let fxr = Rect::from_center_size(pos2(r.min.x + 14.0, r.center().y), vec2(16.0, 16.0));
-        if widgets::icon_toggle(ui, fxr, Icon::Fx, g.enabled, &t, egui::Id::new(("ec-fx", g.uid)), Sense::click()).clicked() {
-            actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": g.uid})));
-        }
-        app.auto.add(&format!("effectControls.effect.{}.fx", g.uid), fxr, &g.name);
-        let tw = Rect::from_center_size(pos2(r.min.x + 32.0, r.center().y), vec2(12.0, 12.0));
-        if widgets::twirl(ui, tw, open, egui::Id::new(("ec-tw", g.uid)), &t).clicked() {
-            toggle_closed(app, g, open, ui.input(|i| i.modifiers.alt || i.modifiers.command));
-        }
-        app.auto.add(&format!("effectControls.effect.{}.twirl", g.uid), tw, &g.name);
-        let rename_id = egui::Id::new(("ec-rename", g.uid));
-        let editing: Option<String> = ctx.data(|d| d.get_temp(rename_id));
-        let reset = Rect::from_min_size(pos2(r.max.x - 96.0, r.center().y - 9.0), vec2(40.0, 18.0));
-        if let Some(mut value) = editing.as_ref().cloned() {
-            let name_rect = Rect::from_min_max(pos2(tw.max.x + 6.0, r.min.y + 2.0), pos2(reset.min.x - 6.0, r.max.y - 2.0));
-            let response = ui.put(name_rect, egui::TextEdit::singleline(&mut value).id(rename_id.with("field")).font(Tokens::semibold(12.0)));
-            // Focus the field the frame it first exists: focusing an id not yet on screen leaves
-            // the accessibility tree with a focus it doesn't contain.
-            if ctx.data_mut(|d| d.remove_temp::<bool>(rename_id.with("start"))).is_some() {
-                crate::widgets::select_all(&ctx, response.id, &value);
-                response.request_focus();
-            }
-            app.auto.add(&format!("effectControls.effect.{}.nameEdit", g.uid), name_rect, "Effect name");
-            if ctx.data_mut(|d| d.remove_temp::<bool>(rename_id.with("select"))).unwrap_or(false) {
-                widgets::select_all(&ctx, response.id, &value);
-            }
-            // Escape cancels. egui drops the field's focus on Escape in the same frame, so the
-            // key is checked on the focus being lost as well as held.
-            let escape = (response.has_focus() || response.lost_focus()) && ui.input(|i| i.key_pressed(egui::Key::Escape));
-            let commit = response.lost_focus() || (response.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)));
-            if escape || commit {
-                ctx.data_mut(|d| d.remove::<String>(rename_id));
-                // The field opens with the drawn name, so committing it unchanged is not a rename.
-                if !escape && !value.trim().is_empty() && value != shown {
-                    actions.push(("prop.renameGroup".into(), json!({"layer": layer.id.0, "prop": g.uid, "name": value})));
-                }
-            } else {
-                ctx.data_mut(|d| d.insert_temp(rename_id, value));
-            }
-        } else {
-            let name = bp.text(pos2(tw.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, &shown, Tokens::semibold(12.0), t.text);
-            app.auto.add(&format!("effectControls.effect.{}.name", g.uid), name, &g.name);
-        }
-        let rresp = ui.interact(reset, egui::Id::new(("ec-reset", g.uid)), Sense::click());
-        bp.text(reset.center(), Align2::CENTER_CENTER, crate::i18n::tr("Reset"), Tokens::ui(11.5), if rresp.hovered() { t.hot_text } else { t.text_dim });
-        app.auto.add(&format!("effectControls.effect.{}.reset", g.uid), reset, "Reset");
-        if rresp.clicked() {
-            actions.push(("effect.reset".into(), json!({"layer": layer.id.0, "effect": g.uid})));
-        }
-        // About…: the effect's name and category (AE's About dialog).
-        let about = Rect::from_min_size(pos2(r.max.x - 50.0, r.center().y - 9.0), vec2(44.0, 18.0));
-        let aresp = ui.interact(about, egui::Id::new(("ec-about", g.uid)), Sense::click());
-        bp.text(about.center(), Align2::CENTER_CENTER, crate::i18n::tr("About..."), Tokens::ui(11.5), if aresp.hovered() { t.hot_text } else { t.text_dim });
-        app.auto.add(&format!("effectControls.effect.{}.about", g.uid), about, "About");
-        let apop = egui::Id::new(("ec-about-pop", g.uid));
-        if aresp.clicked() {
-            widgets::open_popup(ui, apop);
-        }
-        if let Some(spec) = effectcraft_engine::effects::find(effect) {
-            let lines = vec![
-                crate::i18n::effects::name(spec.id, spec.name),
-                format!("Category: {}", crate::i18n::effects::category(spec.category)),
-                "EffectCraft built-in effect (MIT OR Apache-2.0)".to_string(),
-            ];
-            let _ = widgets::popup_menu(ui, apop, about.left_bottom(), &lines, None);
-        }
-        let hresp = ui.interact(
-            Rect::from_min_max(pos2(tw.max.x, r.min.y), pos2(reset.min.x - 4.0, r.max.y)),
-            egui::Id::new(("ec-hdr", g.uid)),
-            if editing.is_some() { Sense::hover() } else { Sense::click_and_drag() },
-        );
-        if hresp.double_clicked() {
-            ctx.data_mut(|d| d.insert_temp(rename_id, shown.clone()));
-            ctx.data_mut(|d| d.insert_temp(rename_id.with("start"), true));
-        }
-        hresp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, active, &shown));
-        app.auto.add(&format!("effectControls.effect.{}", g.uid), r, &g.name);
-        if hresp.clicked() || hresp.drag_started() || hresp.secondary_clicked() {
-            let add = ui.input(|i| i.modifiers.shift || i.modifiers.command);
-            if add && hresp.clicked() {
-                if selected {
-                    app.session.state.selected_props.retain(|(l, u)| !(*l == layer.id && *u == g.uid));
-                } else {
-                    app.session.state.selected_props.push((layer.id, g.uid));
-                }
-            } else if !selected || hresp.clicked() {
-                app.session.state.selected_props = vec![(layer.id, g.uid)];
-            }
-        }
-        if hresp.drag_started() {
-            ctx.data_mut(|d| d.insert_temp(drag_id, g.uid));
-        }
-        crate::widgets::context_menu(&hresp, |ui| {
-            let lid = layer.id.0;
-            let mut picked_label: Option<usize> = None;
-            let mut item = |ui: &mut egui::Ui, label: &str, enabled: bool, cmd: &str, params: serde_json::Value| {
-                if ui.add_enabled(enabled, egui::Button::new(label)).clicked() {
-                    actions.push((cmd.into(), params));
-                    ui.close();
-                }
-            };
-            item(ui, "Copy", true, "effect.copy", json!({"layer": lid, "effect": g.uid}));
-            item(ui, "Paste", has_clip, "effect.paste", json!({"layers": [lid]}));
-            item(ui, "Duplicate", true, "effect.duplicate", json!({"layer": lid, "effect": g.uid}));
-            if ui.button(crate::i18n::tr("Rename")).clicked() {
-                ctx.data_mut(|d| d.insert_temp(rename_id, shown.clone()));
-                ctx.data_mut(|d| d.insert_temp(rename_id.with("start"), true));
-                ui.close();
-            }
-            ui.separator();
-            ui.menu_button(crate::i18n::tr("Label"), |ui| {
-                let cur = g.label.unwrap_or(effectcraft_engine::color::Label::None);
-                for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {
-                    if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), l == cur, &t).clicked() {
-                        picked_label = Some(i);
-                        ui.close();
-                    }
-                }
-            });
-            item(ui, "Reset", true, "effect.reset", json!({"layer": lid, "effect": g.uid}));
-            item(ui, "Remove", true, "effect.remove", json!({"layer": lid, "effect": g.uid}));
-            ui.separator();
-            item(ui, "Move Up", fi > 0, "effect.reorder", json!({"layer": lid, "effect": g.uid, "index": fi.max(1)}));
-            item(ui, "Move Down", fi + 1 < fx.len(), "effect.reorder", json!({"layer": lid, "effect": g.uid, "index": fi + 2}));
-            if let Some(i) = picked_label {
-                actions.push(("effect.setLabel".into(), json!({"layer": lid, "effect": g.uid, "label": i})));
-            }
-        });
-        // What the effect can't render as asked (an OCIO config it can't read, transforms it
-        // passes through), under its name.
-        if let Some(w) = effectcraft_engine::effects::warning(g, &mut |pr| ectx.value(&layer, pr)) {
-            let galley = bp.layout(format!("⚠ {w}"), Tokens::ui(11.0), t.warning, (body.width() - 20.0).max(60.0));
-            let wr = Rect::from_min_size(pos2(body.min.x + 10.0, y + 3.0), galley.size());
-            bp.galley(wr.min, galley, t.warning);
-            app.auto.add(&format!("effectControls.effect.{}.warning", g.uid), wr, &w);
-            y += wr.height() + 6.0;
-        }
-        if open {
-            let eh = editor_height(effect, g, body.width());
-            if eh > 0.0 {
-                let er = Rect::from_min_size(pos2(body.min.x, y), vec2(body.width(), eh));
-                y += eh;
-                if er.max.y >= body.min.y && er.min.y <= body.max.y {
-                    // Curves, Levels and other custom editors do not use prop_row.
-                    // Clicking their controls must activate the owner as well.
-                    if ui.input(|i| i.pointer.primary_pressed()) && ui.rect_contains_pointer(er) {
-                        actions.push(("prop.select".into(), json!({"layer":layer.id.0,"prop":g.uid})));
-                    }
-                    match effect.as_str() {
-                        "ec.color.curves" => curves_editor(app, ui, &bp, &layer, g, &ectx, er, &mut actions),
-                        effectcraft_engine::effects::warp_stab::ID => warp_editor(app, ui, &bp, &layer, g, er, &mut actions),
-                        effectcraft_engine::effects::camera_tracker::ID => super::camera_tracker_ui::editor(app, ui, &bp, &layer, g, er, &mut actions),
-                        effectcraft_engine::effects::roto::ID => roto_editor(app, ui, &bp, &layer, g, er, &mut actions),
-                        effectcraft_engine::effects::object_matte::ID => object_matte_editor(app, ui, &bp, &layer, g, er, &mut actions),
-                        "ec.color.levels" | "ec.color.levelsic" => levels_editor(app, ui, &bp, &layer, g, effect, &ectx, er, &mut actions),
-                        super::fx_editors::GLOW | super::fx_editors::RESHAPE | super::fx_editors::EXTRACTOR => {
-                            super::fx_editors::header_editor(app, ui, &bp, &layer, g, effect, &ectx, er, &mut actions)
-                        }
-                        _ => histogram_only(app, ui, &bp, g, er),
-                    }
-                }
-            }
-            let scope = FxScope { effect: effect.as_str(), root: g, path: String::new() };
-            group_rows(app, ui, &bp, &layer, g, &ectx, body, &mut y, 0, &scope, &mut actions);
-            if effect == "ec.color.tint" {
-                let r = Rect::from_min_size(pos2(body.min.x + PARAM_NAME_X, y + 2.0), vec2(120.0, ROW));
-                let label = crate::i18n::tr("Swap Colors");
-                let resp = widgets::text_button(ui, r, label, false, &t, egui::Id::new(("ec-tint-swap", g.uid)));
-                app.auto.add_response(&format!("effectControls.effect.{}.swapColors", g.uid), &resp, label);
-                if resp.clicked() {
-                    actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": g.uid})));
-                    actions.push(("effect.swapTintColors".into(), json!({"layer": layer.id.0, "effect": g.uid})));
-                }
-                y += ROW + 4.0;
-            }
-        }
-        y += 4.0;
-    }
-    // Drag an effect header to reorder: insertion line between headers.
-    if let Some(du) = dragging {
-        if let Some(pos) = ctx.pointer_interact_pos() {
-            let slot = tops.iter().position(|(_, ty)| pos.y < *ty + (ROW + 2.0) / 2.0).unwrap_or(tops.len());
-            let ly = tops.get(slot).map(|(_, ty)| *ty).unwrap_or(y - 4.0);
-            bp.line_segment([pos2(body.min.x + 4.0, ly), pos2(body.max.x - 4.0, ly)], Stroke::new(2.0, t.accent));
-            if ctx.input(|i| i.pointer.any_released()) {
-                if let Some(from) = tops.iter().position(|(u, _)| *u == du) {
-                    let to = if slot > from { slot - 1 } else { slot };
-                    if to != from {
-                        actions.push(("effect.reorder".into(), json!({"layer": layer.id.0, "effect": du, "index": to + 1})));
-                    }
-                }
-                ctx.data_mut(|d| d.remove::<u64>(drag_id));
-            }
-        }
-        if !ctx.input(|i| i.pointer.any_down()) {
-            ctx.data_mut(|d| d.remove::<u64>(drag_id));
-        }
-    }
-    // Right-click anywhere a control has no menu of its own: the Effect menu, which applies to
-    // the selected layers (After Effects). Drawn after the rows, whose menus open first.
-    let menu_id = bg.id.with("effect-menu");
-    let open = ui.input(|i| i.pointer.secondary_clicked())
-        && ui.rect_contains_pointer(body)
-        && (!egui::Popup::is_any_open(&ctx) || egui::Popup::is_id_open(&ctx, menu_id));
-    egui::Popup::context_menu(&bg).style(crate::widgets::menu_style).id(menu_id).open_memory(open.then_some(egui::SetOpenCommand::Bool(true))).show(|ui| {
-        ui.set_min_width(200.0);
-        actions.extend(crate::menus::menu_contents(app, ui, "Effect"));
-    });
-    ui.set_clip_rect(panel_clip);
-    let content_h = y + scroll.offset - body.min.y;
-    scroll.end(ui, &mut app.auto, "effectControls.scroll", content_h, &t);
-    // Drop effects here.
-    if let Some(payload) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx)
-        && ui.rect_contains_pointer(rect)
-        && let crate::panels::DragPayload::Effect(e) = payload.as_ref()
-    {
-        p.rect_stroke(rect, 0.0, Stroke::new(2.0, t.accent), egui::StrokeKind::Inside);
-        if ctx.input(|i| i.pointer.any_released()) {
-            actions.push(("effect.apply".into(), json!({"effect": e, "layers": [layer.id.0]})));
-            egui::DragAndDrop::clear_payload(&ctx);
-        }
-    }
-    if ui.input(|i| i.pointer.primary_down()) && actions.iter().any(|(id, _)| id == "prop.set") {
-        app.ui.viewer.property_interacting = true;
-        ctx.request_repaint();
-    }
-    for (id, params) in actions {
-        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
-            app.ui.status = e;
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------------------------
-// Viewer hook
-
-/// Collect point controls through visible parameter groups. Hidden optional slots do not
-/// leave stray viewport handles. The depth cap also bounds malformed project trees.
-fn visible_points<'a>(g: &'a PropGroup, scope: &FxScope<'_>, layer: &Layer, ectx: &EvalCtx, depth: usize, out: &mut Vec<&'a Property>) {
-    if depth > 16 {
-        return;
-    }
-    for node in &g.children {
-        match node {
-            Node::Prop(p) if matches!(p.ui, ParamUi::Point) && scope.shown(layer, ectx, &p.match_id) => out.push(p),
-            Node::Group(child) if child.enabled && scope.shown(layer, ectx, &child.match_id) => {
-                visible_points(child, &scope.sub(&child.match_id), layer, ectx, depth + 1, out)
-            }
-            _ => {}
-        }
-    }
-}
-
-/// Effect Controls' part of the Composition viewer, called by the viewer after its own
-/// interaction (so these controls sit on top):
-///
-/// - while a crosshair pick is armed, its handle previews the cursor position without editing
-///   the property; the next click sets the point in layer space, and Esc cancels;
-/// - an eyedropper pick samples the frame's colour on click;
-/// - otherwise, the point parameters of the selected effects are drawn as draggable ⊕ controls.
-///
-/// `l2c` is the viewer's layer→comp matrix (it knows the 3D view).
-pub fn viewer_hook(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    painter: &egui::Painter,
-    map: &super::viewer::ViewerMap,
-    ectx: &EvalCtx,
-    l2c: &dyn Fn(&EvalCtx, &Layer) -> Mat3,
-) {
-    let t = app.tokens;
-    let ctx = ui.ctx().clone();
-    let mut actions: Actions = vec![];
-    let mut point_preview = None;
-    if let Some(pick) = app.ui.fx_pick.clone() {
-        let Some(layer) = ectx.comp.layer(effectcraft_engine::project::LayerId(pick.layer)).cloned() else {
-            app.ui.fx_pick = None;
-            return;
-        };
-        // Keyers pick from their input (the shown frame is already keyed): `effect.pickColor`.
-        let keyer = (pick.kind == "color")
-            .then(|| layer.effects()?.groups().find(|g| g.find(pick.prop).is_some()))
-            .flatten()
-            .filter(|g| effectcraft_engine::effects::find(&g.match_id).is_some_and(|s| s.category == "Keying"))
-            .map(|g| g.uid);
-        if pick.kind == "color" && keyer.is_none() {
-            // GPU frames: read the shown frame back for sampling.
-            app.viewer_pixels();
-        }
-        let resp = ui.interact(map.area, egui::Id::new("viewer-fx-pick"), Sense::click());
-        app.auto.add("viewer.fxPick", map.area, &pick.name);
-        let hint = if pick.kind == "point" { format!("Click to set {}", pick.name) } else { format!("Click to sample {}", pick.name) };
-        let chip = Rect::from_min_size(map.area.min + vec2(10.0, 10.0), vec2(220.0, 22.0));
-        painter.rect_filled(chip, 11.0, Color32::from_black_alpha(180));
-        painter.text(chip.center(), Align2::CENTER_CENTER, hint, Tokens::ui(11.5), t.text);
-        if let Some(hp) = resp.hover_pos() {
-            ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
-            let c = map.to_comp(hp);
-            app.pointer_comp = Some([c[0] as f32, c[1] as f32]);
-            if pick.kind == "point" && fw::comp_to_layer(&l2c(ectx, &layer), c).is_some() {
-                point_preview = Some(hp);
-            }
-            if pick.kind == "color"
-                && keyer.is_none()
-                && let Some(img) = &app.viewer_image
-                && let Some(s) = fw::sample_frame(img, super::viewer_tools::shown_region(&ctx, map.comp), c)
-            {
-                let sw = Rect::from_min_size(hp + vec2(14.0, 14.0), vec2(26.0, 18.0));
-                painter.rect_filled(sw, 2.0, Color32::from_rgb((s[0] * 255.0) as u8, (s[1] * 255.0) as u8, (s[2] * 255.0) as u8));
-                painter.rect_stroke(sw, 2.0, Stroke::new(1.0, Color32::WHITE), egui::StrokeKind::Outside);
-            }
-        }
-        // No frame to sample yet (it is still rendering, or its readback is pending): the click
-        // leaves the eyedropper armed instead of using it up without a colour.
-        let unsampled = pick.kind == "color" && keyer.is_none() && app.viewer_image.is_none();
-        if resp.clicked()
-            && !unsampled
-            && let Some(pos) = resp.interact_pointer_pos()
-        {
-            let c = map.to_comp(pos);
-            // Effect points and the keyer's input are in effect space.
-            let m = super::viewer::from_effect_space(ectx, &layer, l2c(ectx, &layer));
-            if pick.kind == "point" {
-                if let Some(lp) = fw::comp_to_layer(&m, c) {
-                    actions.push(("prop.set".into(), json!({"layer": pick.layer, "prop": pick.prop, "value": [lp[0], lp[1]]})));
-                }
-            } else if let Some(fx) = keyer {
-                // Ctrl/Cmd+click averages the 5 × 5 pixels around the point.
-                if let Some(lp) = fw::comp_to_layer(&m, c) {
-                    let average = ui.input(|i| i.modifiers.command);
-                    actions.push((
-                        "effect.pickColor".into(),
-                        json!({"layer": pick.layer, "effect": fx, "prop": pick.prop, "x": lp[0], "y": lp[1], "average": average}),
-                    ));
-                }
-            } else if let Some(img) = &app.viewer_image
-                && let Some(s) = fw::sample_frame(img, super::viewer_tools::shown_region(&ctx, map.comp), c)
-            {
-                actions.push(("prop.set".into(), json!({"layer": pick.layer, "prop": pick.prop, "value": [s[0], s[1], s[2], 1.0]})));
-            }
-            app.ui.fx_pick = None;
-            app.ui.status.clear();
-        }
-        if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-            app.ui.fx_pick = None;
-            app.ui.status.clear();
-        }
-    }
-    if let Some(pick) = app.ui.text_color_pick.clone() {
-        if ectx.comp.layer(effectcraft_engine::project::LayerId(pick.layer)).is_none() {
-            app.ui.text_color_pick = None;
-            app.ui.status.clear();
-        } else {
-            app.viewer_pixels();
-            let resp = ui.interact(map.area, egui::Id::new("viewer-text-color-pick"), Sense::click());
-            app.auto.add("viewer.textColorPick", map.area, &pick.field);
-            let chip = Rect::from_min_size(map.area.min + vec2(10.0, 10.0), vec2(220.0, 22.0));
-            painter.rect_filled(chip, 11.0, Color32::from_black_alpha(180));
-            painter.text(chip.center(), Align2::CENTER_CENTER, crate::i18n::tr_args("Click to sample text {}", &[&pick.field]), Tokens::ui(11.5), t.text);
-            if let Some(pos) = resp.hover_pos() {
-                ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
-                let c = map.to_comp(pos);
-                app.pointer_comp = Some([c[0] as f32, c[1] as f32]);
-                if let Some(img) = &app.viewer_image
-                    && let Some(s) = fw::sample_frame(img, super::viewer_tools::shown_region(&ctx, map.comp), c)
-                {
-                    let sw = Rect::from_min_size(pos + vec2(14.0, 14.0), vec2(26.0, 18.0));
-                    painter.rect_filled(sw, 2.0, Color32::from_rgb((s[0] * 255.0) as u8, (s[1] * 255.0) as u8, (s[2] * 255.0) as u8));
-                    painter.rect_stroke(sw, 2.0, Stroke::new(1.0, Color32::WHITE), egui::StrokeKind::Outside);
-                }
-            }
-            if resp.clicked()
-                && let Some(pos) = resp.interact_pointer_pos()
-                && let Some(img) = &app.viewer_image
-                && let Some(s) = fw::sample_frame(img, super::viewer_tools::shown_region(&ctx, map.comp), map.to_comp(pos))
-            {
-                let mut params = json!({"layer": pick.layer});
-                params[&pick.field] = json!([s[0], s[1], s[2]]);
-                if let Some(range) = pick.range {
-                    params["range"] = json!(range);
-                }
-                actions.push(("layer.setText".into(), params));
-                app.ui.text_color_pick = None;
-                app.ui.status.clear();
-            }
-            if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-                app.ui.text_color_pick = None;
-                app.ui.status.clear();
-            }
-        }
-    }
-    let picking = app.ui.fx_pick.is_some() || app.ui.text_color_pick.is_some();
-    let point_pick = app.ui.fx_pick.clone().filter(|p| p.kind == "point");
-    if app.ui.viewer.show_layer_controls || point_pick.is_some() {
-        // ⊕ controls for the point parameters of the selected effects.
-        let mut sel = app.session.state.selected_props.clone();
-        if let Some(pick) = &point_pick {
-            sel.push((effectcraft_engine::project::LayerId(pick.layer), pick.prop));
-        }
-        let selected = app.session.state.selected_layers.clone();
-        for layer in ectx
-            .comp
-            .layers
-            .iter()
-            .filter(|l| (selected.contains(&l.id) || point_pick.as_ref().is_some_and(|p| p.layer == l.id.0)) && l.is_active_at(ectx.time))
-        {
-            let Some(fx) = layer.effects() else { continue };
-            let m = l2c(ectx, layer);
-            // Masks are in layer space, effect points in effect space.
-            let fm = super::viewer::from_effect_space(ectx, layer, m);
-            let picked_prop = point_pick.as_ref().filter(|p| p.layer == layer.id.0).map(|p| p.prop);
-            for g in fx.groups().filter(|g| g.enabled && effect_active(g, layer.id, &sel)) {
-                // Puppet owns its pin handles and hit testing. Generic crosshairs would
-                // overlap the pins and steal their selection/rotation/scale gestures.
-                if matches!(&g.kind, GroupKind::Effect { effect } if effect == effectcraft_engine::effects::puppet::ID) {
-                    continue;
-                }
-                if !picking && app.ui.viewer.show_layer_controls && matches!(&g.kind, GroupKind::Effect { effect } if effect == super::fx_editors::RESHAPE) {
-                    super::fx_editors::reshape_overlay(app, ui, painter, map, ectx, layer, g, &m, &mut actions);
-                }
-                if !picking && app.ui.viewer.show_layer_controls && matches!(&g.kind, GroupKind::Effect { effect } if effect == super::fx_editors::MESH_WARP) {
-                    super::fx_editors::mesh_warp_overlay(app, ui, painter, map, ectx, layer, g, &fm, &mut actions);
-                }
-                let scope = FxScope { effect: &g.match_id, root: g, path: String::new() };
-                let mut pts = Vec::new();
-                visible_points(g, &scope, layer, ectx, 0, &mut pts);
-                // An explicit pick stays visible even when View > Show Layer Controls is off.
-                if !app.ui.viewer.show_layer_controls {
-                    pts.retain(|pr| picked_prop == Some(pr.uid));
-                }
-                let screen: Vec<egui::Pos2> = pts
-                    .iter()
-                    .map(|pr| {
-                        if picked_prop == Some(pr.uid)
-                            && let Some(pos) = point_preview
-                        {
-                            return pos;
-                        }
-                        let v = ectx.value(layer, pr).as_vec2();
-                        map.to_screen(fw::layer_to_comp(&fm, v))
-                    })
-                    .collect();
-                // Gradient Ramp and friends: a guide between start and end points.
-                if screen.len() == 2 && matches!(&g.kind, GroupKind::Effect { effect } if effect.contains("gradient") || effect.contains("ramp")) {
-                    painter.line_segment([screen[0], screen[1]], Stroke::new(1.0, Color32::from_white_alpha(110)));
-                }
-                for (pr, s) in pts.iter().zip(screen) {
-                    let hr = Rect::from_center_size(s, vec2(16.0, 16.0));
-                    let id = egui::Id::new(("viewer-fx-pt", pr.uid));
-                    // The picker owns the click. Preview handles must not steal it or start a drag.
-                    let resp = (!picking).then(|| ui.interact(hr, id, Sense::drag()));
-                    let col = if picked_prop == Some(pr.uid) || resp.as_ref().is_some_and(|r| r.hovered() || r.dragged()) { t.accent } else { Color32::WHITE };
-                    fw::draw_crosshair(painter, s + vec2(1.0, 1.0), 5.0, Color32::from_black_alpha(160));
-                    fw::draw_crosshair(painter, s, 5.0, col);
-                    app.auto.add(&format!("viewer.effectPoint.{}", pr.uid), hr, &pr.name);
-                    let Some(resp) = resp else { continue };
-                    if resp.hovered() {
-                        ctx.set_cursor_icon(egui::CursorIcon::Move);
-                        resp.clone().on_hover_text(format!("{}: {}", crate::i18n::effects::group(&g.match_id, &g.name), pr.name));
-                    }
-                    if resp.dragged()
-                        && let Some(pos) = resp.interact_pointer_pos()
-                        && let Some(lp) = fw::comp_to_layer(&fm, map.to_comp(pos))
-                    {
-                        let key = gesture_key(ui, id, resp.drag_started());
-                        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": [lp[0], lp[1]], "merge": key})));
-                    }
-                }
-            }
-        }
-    }
-    for (id, params) in actions {
-        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
-            app.ui.status = e;
-        }
-    }
-}
+pub(crate) use common::gesture_key;
+pub use common::{choose_files_after_apply, reveal_applied};
+pub use panel::{show, start_rename};
+pub(crate) use rows::toggle_pick;
+pub use viewer::viewer_hook;
diff --git a/crates/ui-egui/src/panels/effect_controls/common.rs b/crates/ui-egui/src/panels/effect_controls/common.rs
new file mode 100644
index 000000000..ab46a07ac
--- /dev/null
+++ b/crates/ui-egui/src/panels/effect_controls/common.rs
@@ -0,0 +1,109 @@
+use super::{EffectcraftApp, Layer, Node, ParamUi, PropGroup, Value, json};
+
+pub(super) type Actions = Vec<(String, serde_json::Value)>;
+
+pub(super) const ROW: f32 = 20.0;
+
+pub(super) const DIAL_ROW: f32 = 64.0;
+
+// The effect title starts at 44 pt. Each level's names sit one tree step farther in;
+// reserve the same icon gutter for properties and groups so sibling names align.
+pub(super) const PARAM_NAME_X: f32 = 58.0;
+
+pub(super) const TREE_INDENT: f32 = 14.0;
+
+/// Selecting any descendant activates its owning effect without replacing the property
+/// selection used by keyframe editing, copy and delete.
+pub(super) fn effect_active(g: &PropGroup, layer: effectcraft_engine::project::LayerId, selected: &[(effectcraft_engine::project::LayerId, u64)]) -> bool {
+    fn contains(g: &PropGroup, uid: u64, depth: usize) -> bool {
+        if g.uid == uid {
+            return true;
+        }
+        if depth >= 16 {
+            return false;
+        }
+        g.children.iter().any(|n| n.uid() == uid || matches!(n, Node::Group(child) if contains(child, uid, depth + 1)))
+    }
+    selected.iter().any(|(l, uid)| *l == layer && contains(g, *uid, 0))
+}
+
+pub(super) fn selected_layer(app: &EffectcraftApp) -> Option<Layer> {
+    let comp = app.session.active_comp()?;
+    let id = app.session.state.selected_layers.first()?;
+    comp.layer(*id).cloned()
+}
+
+/// An effect was just applied (`effect.apply` / `effect.applyLast` with `params`): Effect
+/// Controls comes up (opened if closed, brought to the front, the focus left where it is) on the
+/// layer the effect went to, with the new effect selected, as in After Effects.
+pub fn reveal_applied(app: &mut EffectcraftApp, params: &serde_json::Value) {
+    // `effect.apply` selects the new effect on (the last of) the layers it went to.
+    let target = app.session.state.selected_props.last().map(|(l, _)| *l);
+    if let Some(l) = target
+        && !app.session.state.selected_layers.contains(&l)
+        && params.get("comp").is_none()
+        && app.session.active_comp().is_some_and(|c| c.layer(l).is_some())
+    {
+        // Show that layer (dropped on an unselected one), keeping the new effect selected.
+        let props = app.session.state.selected_props.clone();
+        match app.session.execute("layer.select", json!({"layers": [l.0]})) {
+            Ok(_) => app.session.state.selected_props = props,
+            Err(e) => app.ui.status = e.to_string(),
+        }
+    }
+    app.raise_panel(crate::dock::PanelKind::EffectControls);
+}
+
+/// After Effects asks for an effect's file as it applies it (Apply Color LUT opens the file
+/// dialog for its LUT). For the instances `effect.apply` made (`applied`, its result), open the
+/// file dialog for their first empty file parameter and set the file on each; cancelling
+/// leaves the effect without one. Does nothing without a file dialog (tests, agents).
+pub fn choose_files_after_apply(app: &mut EffectcraftApp, applied: &serde_json::Value) {
+    let Some(pick) = app.hooks.pick_files.as_ref() else { return };
+    let Some(comp) = app.session.active_comp() else { return };
+    let uids: Vec<u64> = applied.get("effects").and_then(|v| v.as_array()).map(|a| a.iter().filter_map(|v| v.as_u64()).collect()).unwrap_or_default();
+    let mut targets = vec![];
+    let mut filters: Vec<String> = vec![];
+    for uid in uids {
+        for l in &comp.layers {
+            let Some(g) = l.props.find_group(uid) else { continue };
+            let mut found = None;
+            g.walk("", &mut |_, pr| {
+                if found.is_none()
+                    && let ParamUi::File { filters } = &pr.ui
+                    && matches!(&pr.value, Value::Str(s) if s.trim().is_empty())
+                {
+                    found = Some((pr.uid, filters.clone()));
+                }
+            });
+            if let Some((prop, f)) = found {
+                targets.push((l.id.0, prop));
+                filters = f;
+            }
+        }
+    }
+    if targets.is_empty() {
+        return;
+    }
+    let exts: Vec<&str> = filters.iter().map(String::as_str).collect();
+    let Some(path) = pick(&exts).into_iter().next() else { return };
+    for (layer, prop) in targets {
+        if let Err(e) = app.session.execute("prop.set", json!({"layer": layer, "prop": prop, "value": path})) {
+            app.ui.status = e.to_string();
+        }
+    }
+}
+
+/// An undo-merge key for one gesture on `id`: a new key each time a drag starts, so separate
+/// drags are separate undo steps while one drag is one step.
+pub(crate) fn gesture_key(ui: &egui::Ui, id: egui::Id, started: bool) -> String {
+    let kid = id.with("gesture");
+    let n: u64 = if started {
+        let n = ui.data(|d| d.get_temp::<u64>(kid)).unwrap_or(0) + 1;
+        ui.data_mut(|d| d.insert_temp(kid, n));
+        n
+    } else {
+        ui.data(|d| d.get_temp::<u64>(kid)).unwrap_or(0)
+    };
+    format!("{id:?}-{n}")
+}
diff --git a/crates/ui-egui/src/panels/effect_controls/editors.rs b/crates/ui-egui/src/panels/effect_controls/editors.rs
new file mode 100644
index 000000000..c95c90c07
--- /dev/null
+++ b/crates/ui-egui/src/panels/effect_controls/editors.rs
@@ -0,0 +1,380 @@
+use super::common::{Actions, gesture_key};
+use super::{Align2, Color32, EffectcraftApp, EvalCtx, Layer, PropGroup, Rect, Sense, Tokens, Value, fw, json, pos2, vec2, widgets};
+
+/// Warp Stabilizer's Analyze / Cancel buttons and analysis status.
+pub(super) fn warp_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, r: Rect, actions: &mut Actions) {
+    let t = app.tokens;
+    let running = app.session.warp_target().is_some_and(|(_, l, u)| l == layer.id && u == g.uid) && app.session.is_warp_analyzing();
+    let busy = app.session.is_warp_analyzing();
+    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
+    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
+    if widgets::text_button(ui, b1, "Analyze", false, &t, egui::Id::unique(("warp-analyze", g.uid))).clicked() && !busy {
+        actions.push(("warp.analyze".into(), json!({"layer": layer.id.0, "effect": g.uid})));
+    }
+    app.auto.add(&format!("effectControls.warp.{}.analyze", g.uid), b1, "Analyze");
+    if running {
+        if widgets::text_button(ui, b2, "Cancel", false, &t, egui::Id::unique(("warp-cancel", g.uid))).clicked() {
+            actions.push(("warp.cancel".into(), json!({})));
+        }
+        app.auto.add(&format!("effectControls.warp.{}.cancel", g.uid), b2, "Cancel");
+    }
+    let analysed = matches!(g.get(effectcraft_engine::effects::warp_stab::ANALYSIS).map(|p| &p.value), Some(Value::Str(s)) if !s.is_empty());
+    let status = match app.session.warp_progress() {
+        Some(pr) if running => pr.banner(),
+        _ if analysed => "Analysis complete".to_string(),
+        _ if app.session.warp_pending.iter().any(|(_, l, u)| *l == layer.id && *u == g.uid) => "Waiting to analyze".to_string(),
+        _ => "Not analyzed: click Analyze".to_string(),
+    };
+    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, status, Tokens::ui(11.5), t.text_dim);
+}
+
+/// Roto Brush & Refine Edge: Freeze / Unfreeze and Propagate buttons and the segmentation status.
+pub(super) fn roto_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, r: Rect, actions: &mut Actions) {
+    use effectcraft_engine::effects::roto as fx;
+    let t = app.tokens;
+    let params = effectcraft_engine::effects::flatten_params(g, &mut |pr| pr.value.clone());
+    let frozen = fx::is_frozen(&params);
+    let d = fx::data(&params);
+    let running = app.session.roto_target().is_some_and(|(_, l, u, _)| l == layer.id && u == g.uid) && app.session.is_roto_running();
+    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
+    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
+    let label = if frozen { "Unfreeze" } else { "Freeze" };
+    if widgets::text_button(ui, b1, label, frozen, &t, egui::Id::unique(("roto-freeze-ec", g.uid))).clicked() && !running {
+        let id = if frozen { "roto.unfreeze" } else { "roto.freeze" };
+        actions.push((id.into(), json!({"layer": layer.id.0, "effect": g.uid})));
+    }
+    app.auto.add(&format!("effectControls.roto.{}.freeze", g.uid), b1, label);
+    let (l2, id2) = if running { ("Stop", "roto.cancel") } else { ("Propagate", "roto.propagate") };
+    if widgets::text_button(ui, b2, l2, false, &t, egui::Id::unique(("roto-prop-ec", g.uid))).clicked() && !frozen {
+        actions.push((id2.into(), json!({"layer": layer.id.0, "effect": g.uid})));
+    }
+    app.auto.add(&format!("effectControls.roto.{}.propagate", g.uid), b2, l2);
+    let status = match (app.session.roto_progress(), d.base) {
+        (Some(pr), _) if running => pr.banner(),
+        (_, None) => "No strokes: paint with the Roto Brush tool (Alt+W) in the Layer panel".to_string(),
+        (_, Some(b)) => format!("Base frame {b}, span {}–{}{}", d.span[0], d.span[1], if frozen { " (frozen)" } else { "" }),
+    };
+    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, status, Tokens::ui(11.5), t.text_dim);
+}
+
+/// Object Matte: Freeze / Unfreeze and Track / Stop buttons (the background job that computes
+/// the matte over the tracked frames) and its status.
+pub(super) fn object_matte_editor(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    g: &PropGroup,
+    r: Rect,
+    actions: &mut Actions,
+) {
+    use effectcraft_engine::effects::object_matte as om;
+    let t = app.tokens;
+    let params = effectcraft_engine::effects::flatten_params(g, &mut |pr| pr.value.clone());
+    let frozen = om::is_frozen(&params);
+    let mine = app.session.roto_target().is_some_and(|(_, l, u, _)| l == layer.id && u == g.uid);
+    let running = mine && app.session.is_roto_running();
+    let busy = app.session.is_roto_running();
+    let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
+    let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(84.0, 22.0));
+    let label = if frozen { "Unfreeze" } else { "Freeze" };
+    if widgets::text_button(ui, b1, crate::i18n::tr(label), frozen, &t, egui::Id::unique(("om-freeze-ec", g.uid))).clicked() && !busy {
+        let id = if frozen { "objectMatte.unfreeze" } else { "objectMatte.freeze" };
+        actions.push((id.into(), json!({"layer": layer.id.0, "effect": g.uid})));
+    }
+    app.auto.add(&format!("effectControls.objectMatte.{}.freeze", g.uid), b1, label);
+    let (l2, id2) = if running { ("Stop", "roto.cancel") } else { ("Track", "objectMatte.propagate") };
+    if widgets::text_button(ui, b2, crate::i18n::tr(l2), false, &t, egui::Id::unique(("om-track-ec", g.uid))).clicked() && !frozen && (running || !busy) {
+        actions.push((id2.into(), json!({"layer": layer.id.0, "effect": g.uid})));
+    }
+    app.auto.add(&format!("effectControls.objectMatte.{}.track", g.uid), b2, l2);
+    let base = om::reference_frame(&params);
+    let status = match app.session.roto_progress() {
+        Some(pr) if running => pr.banner(),
+        _ if frozen => format!("Frozen from reference frame {base}"),
+        _ if app.session.roto_pending.iter().any(|(_, l, u)| *l == layer.id && *u == g.uid) => "Waiting to track".to_string(),
+        _ => format!("Reference frame {base}: Track computes the matte ahead of playback"),
+    };
+    p.text(pos2(r.min.x + 24.0, r.min.y + 38.0), Align2::LEFT_CENTER, &status, Tokens::ui(11.5), t.text_dim);
+    app.auto.add(
+        &format!("effectControls.objectMatte.{}.status", g.uid),
+        Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 30.0), vec2(r.width() - 24.0, 16.0)),
+        &status,
+    );
+}
+
+// ---------------------------------------------------------------------------------------------
+// Curves / Levels editors
+
+/// Height of the custom editor shown under an effect's header (0 when none).
+pub(super) fn editor_height(effect: &str, g: &PropGroup, width: f32) -> f32 {
+    match effect {
+        crate::panels::fx_editors::GLOW | crate::panels::fx_editors::RESHAPE | crate::panels::fx_editors::EXTRACTOR => {
+            crate::panels::fx_editors::header_height(effect, g, width)
+        }
+        "ec.color.curves" => 34.0 + curves_size(width) + 26.0,
+        effectcraft_engine::effects::warp_stab::ID => 50.0,
+        effectcraft_engine::effects::camera_tracker::ID => crate::panels::camera_tracker_ui::EDITOR_HEIGHT,
+        effectcraft_engine::effects::roto::ID | effectcraft_engine::effects::object_matte::ID => 50.0,
+        "ec.color.levels" | "ec.color.levelsic" => 34.0 + 80.0 + 58.0,
+        "ec.color.autolevels" | "ec.color.autocontrast" | "ec.color.autocolor" => 24.0 + 80.0 + 12.0,
+        _ => 0.0,
+    }
+}
+
+fn curves_size(width: f32) -> f32 {
+    (width - 72.0).clamp(120.0, 256.0)
+}
+
+/// Cached histogram of the displayed frame (recomputed when the frame changes).
+fn frame_histogram(app: &mut EffectcraftApp, ctx: &egui::Context) -> Option<std::sync::Arc<[[u32; 256]; 5]>> {
+    let img = app.viewer_pixels()?;
+    let key = std::sync::Arc::as_ptr(&img) as usize;
+    let id = egui::Id::unique("ec-histogram");
+    if let Some((k, h)) = ctx.data(|d| d.get_temp::<(usize, std::sync::Arc<[[u32; 256]; 5]>)>(id))
+        && k == key
+    {
+        return Some(h);
+    }
+    let h = std::sync::Arc::new(fw::histogram(&img));
+    ctx.data_mut(|d| d.insert_temp(id, (key, h.clone())));
+    Some(h)
+}
+
+fn channel_color(ch: usize) -> Color32 {
+    match ch {
+        1 => Color32::from_rgb(0xe0, 0x50, 0x50),
+        2 => Color32::from_rgb(0x50, 0xc8, 0x60),
+        3 => Color32::from_rgb(0x50, 0x80, 0xf0),
+        4 => Color32::from_gray(0x90),
+        _ => Color32::from_gray(0xb8),
+    }
+}
+
+/// A "Channel: [RGB ▾]" popup; returns the chosen channel.
+#[allow(clippy::too_many_arguments)]
+fn channel_popup(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    x: f32,
+    cy: f32,
+    cur: usize,
+    names: &[&str],
+    id: egui::Id,
+    auto: &str,
+) -> Option<usize> {
+    let t = app.tokens;
+    p.text(pos2(x, cy), Align2::LEFT_CENTER, crate::i18n::tr("Channel:"), Tokens::ui(12.0), t.text_dim);
+    let dr = Rect::from_min_size(pos2(x + 58.0, cy - 9.0), vec2(80.0, 18.0));
+    let pop = id.with("pop");
+    if widgets::dropdown(ui, dr, names.get(cur).copied().unwrap_or(""), &t, id).clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    app.auto.add(auto, dr, "Channel");
+    let opts: Vec<String> = names.iter().map(|s| s.to_string()).collect();
+    widgets::popup_menu(ui, pop, dr.left_bottom(), &opts, Some(cur))
+}
+
+/// Curves: channel popup, Bezier/pencil mode, Reset, and the graph bound to the channel's
+/// hidden point-list parameter.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn curves_editor(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    g: &PropGroup,
+    ectx: &EvalCtx,
+    r: Rect,
+    actions: &mut Actions,
+) {
+    let t = app.tokens;
+    let euid = g.uid;
+    // The channel lives in the effect's hidden Channel parameter (UI state for instances
+    // saved before it existed).
+    let chan_prop = g.get("channel");
+    let ch = match chan_prop {
+        Some(pr) => ectx.value(layer, pr).as_enum() as usize,
+        None => app.ui.fx_curve_channel.get(&euid).copied().unwrap_or(0),
+    }
+    .min(4);
+    let x0 = r.min.x + 30.0;
+    let cy = r.min.y + 17.0;
+    let names: [&str; 5] = [crate::i18n::tr("RGB"), crate::i18n::tr("Red"), crate::i18n::tr("Green"), crate::i18n::tr("Blue"), crate::i18n::tr("Alpha")];
+    if let Some(n) = channel_popup(app, ui, p, x0, cy, ch, &names, egui::Id::unique(("ec-cch", euid)), &format!("effectControls.effect.{euid}.curves.channel"))
+    {
+        match chan_prop {
+            Some(pr) => actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": n}))),
+            None => {
+                app.ui.fx_curve_channel.insert(euid, n);
+            }
+        }
+    }
+    let pencil = app.ui.fx_curve_pencil.contains(&euid);
+    let mr = Rect::from_min_size(pos2(x0 + 146.0, cy - 9.0), vec2(56.0, 18.0));
+    if widgets::dropdown(ui, mr, if pencil { "Pencil" } else { "Bezier" }, &t, egui::Id::unique(("ec-cmode", euid))).clicked() {
+        if pencil {
+            app.ui.fx_curve_pencil.remove(&euid);
+        } else {
+            app.ui.fx_curve_pencil.insert(euid);
+        }
+    }
+    app.auto.add(&format!("effectControls.effect.{euid}.curves.mode"), mr, "Curve mode");
+    let Some(prop) = g.get(fw::CURVE_CHANNELS[ch].0) else { return };
+    let cur = match ectx.value(layer, prop) {
+        Value::Str(s) => fw::CurvePoints::parse(&s),
+        _ => fw::CurvePoints::identity(),
+    };
+    let rr = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 9.0), vec2(44.0, 18.0));
+    let rresp = ui.interact(rr, egui::Id::unique(("ec-creset", euid)), Sense::click());
+    p.text(rr.center(), Align2::CENTER_CENTER, crate::i18n::tr("Reset"), Tokens::ui(11.5), if rresp.hovered() { t.hot_text } else { t.text_dim });
+    app.auto.add(&format!("effectControls.effect.{euid}.curves.reset"), rr, "Reset curve");
+    if rresp.clicked() {
+        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": prop.uid, "value": fw::CurvePoints::identity().format()})));
+    }
+    let size = curves_size(r.width());
+    let gr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 38.0), vec2(size, size));
+    // Input/output gradients along the axes.
+    let col = channel_color(ch);
+    p.rect_filled(Rect::from_min_max(pos2(gr.min.x, gr.max.y + 3.0), pos2(gr.max.x, gr.max.y + 8.0)), 0.0, col.gamma_multiply(0.5));
+    let id = egui::Id::unique(("ec-curves", euid, ch));
+    let (resp, edit) = fw::curves_graph(ui, gr, &cur, ch, fw::CurveMode { pencil, natural: true }, id, &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.curves.graph"), gr, "Curves");
+    let started = resp.drag_started() || resp.clicked();
+    if let Some(np) = edit.changed {
+        let key = gesture_key(ui, id, started);
+        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": prop.uid, "value": np.format(), "merge": key})));
+    }
+    p.text(
+        pos2(gr.min.x, gr.max.y + 18.0),
+        Align2::LEFT_CENTER,
+        if pencil { "Drag to draw the curve" } else { "Click adds a point; drag one off to remove" },
+        Tokens::ui(10.5),
+        t.text_faint,
+    );
+}
+
+/// Levels parameter ids for a channel: input black, input white, gamma, output black, output white.
+fn levels_ids(effect: &str, ch: usize) -> [String; 5] {
+    if effect == "ec.color.levels" {
+        return effectcraft_engine::effects::levels_channel_ids(ch);
+    }
+    // Levels (Individual Controls) nests each channel's controls in its twirl-down group.
+    let pre = fw::LEVELS_CHANNELS[ch.min(4)].0;
+    ["InBlack", "InWhite", "Gamma", "OutBlack", "OutWhite"].map(|s| format!("{pre}/{pre}{s}"))
+}
+
+/// Levels: (channel popup,) histogram, input black/gamma/white triangles, output bar with
+/// black/white triangles.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn levels_editor(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    g: &PropGroup,
+    effect: &str,
+    ectx: &EvalCtx,
+    r: Rect,
+    actions: &mut Actions,
+) {
+    let t = app.tokens;
+    let euid = g.uid;
+    let x0 = r.min.x + 30.0;
+    let cy = r.min.y + 17.0;
+    // Levels keeps its channel in the Channel parameter; Levels (Individual Controls) shows
+    // every channel and the popup only picks the histogram.
+    let ch = if effect == "ec.color.levelsic" {
+        app.ui.fx_levels_channel.get(&euid).copied().unwrap_or(0).min(4)
+    } else {
+        g.get("channel").map(|pr| ectx.value(layer, pr).as_enum() as usize).unwrap_or(0).min(4)
+    };
+    if effect == "ec.color.levelsic" {
+        let names: [&str; 5] = [crate::i18n::tr("RGB"), crate::i18n::tr("Red"), crate::i18n::tr("Green"), crate::i18n::tr("Blue"), crate::i18n::tr("Alpha")];
+        if let Some(n) =
+            channel_popup(app, ui, p, x0, cy, ch, &names, egui::Id::unique(("ec-lch", euid)), &format!("effectControls.effect.{euid}.levels.channel"))
+        {
+            app.ui.fx_levels_channel.insert(euid, n);
+        }
+    } else {
+        p.text(pos2(x0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Histogram"), Tokens::ui(12.0), t.text_dim);
+    }
+    let w = (r.width() - 72.0).clamp(120.0, 256.0);
+    let hr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 34.0), vec2(w, 80.0));
+    match frame_histogram(app, ui.ctx()) {
+        // Channel 0 (RGB) shows luminance; the others their own channel.
+        Some(h) => fw::draw_histogram(p, hr, &h[ch], channel_color(ch)),
+        None => {
+            p.rect_filled(hr, 0.0, Color32::from_rgb(0x1c, 0x1c, 0x1c));
+        }
+    }
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.histogram"), hr, "Histogram");
+    let ids = levels_ids(effect, ch);
+    let val = |id: &str| g.prop(id).map(|pr| ectx.value(layer, pr).as_f64()).unwrap_or(0.0);
+    let (ib, iw, gm, ob, ow) = (val(&ids[0]), val(&ids[1]), val(&ids[2]), val(&ids[3]), val(&ids[4]));
+    let mut set = |ui: &egui::Ui, id: &str, v: f64, started: bool| {
+        if let Some(pr) = g.prop(id) {
+            let key = gesture_key(ui, egui::Id::unique(("ec-lv", euid, id)), started);
+            actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": v, "merge": key})));
+        }
+    };
+    let track = Rect::from_min_size(pos2(hr.min.x, hr.max.y + 1.0), vec2(w, 10.0));
+    let started = |ui: &egui::Ui| ui.input(|i| i.pointer.any_pressed());
+    let (r0, nv) = fw::level_handle(ui, track, ib, Color32::BLACK, egui::Id::unique(("ec-lib", euid, ch)), &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.inBlack"), r0, "Input Black");
+    if let Some(v) = nv {
+        set(ui, &ids[0], v.min(iw - 0.005), started(ui));
+    }
+    let gx = fw::gamma_handle(ib, iw, gm);
+    let (r1, nv) = fw::level_handle(ui, track, gx, Color32::from_gray(128), egui::Id::unique(("ec-lg", euid, ch)), &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.gamma"), r1, "Gamma");
+    if let Some(v) = nv {
+        set(ui, &ids[2], (fw::gamma_from_handle(ib, iw, v) * 100.0).round() / 100.0, started(ui));
+    }
+    let (r2, nv) = fw::level_handle(ui, track, iw, Color32::WHITE, egui::Id::unique(("ec-liw", euid, ch)), &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.inWhite"), r2, "Input White");
+    if let Some(v) = nv {
+        set(ui, &ids[1], v.max(ib + 0.005), started(ui));
+    }
+    // Output: a black→white bar with its two triangles.
+    let bar = Rect::from_min_size(pos2(hr.min.x, track.max.y + 10.0), vec2(w, 9.0));
+    let n = 32;
+    for k in 0..n {
+        let v = (k as f32 / (n - 1) as f32 * 255.0) as u8;
+        let x0 = bar.min.x + bar.width() * k as f32 / n as f32;
+        let x1 = bar.min.x + bar.width() * (k + 1) as f32 / n as f32;
+        p.rect_filled(Rect::from_min_max(pos2(x0, bar.min.y), pos2(x1, bar.max.y)), 0.0, Color32::from_gray(v));
+    }
+    let otrack = Rect::from_min_size(pos2(bar.min.x, bar.max.y + 1.0), vec2(w, 10.0));
+    let (r3, nv) = fw::level_handle(ui, otrack, ob, Color32::BLACK, egui::Id::unique(("ec-lob", euid, ch)), &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.outBlack"), r3, "Output Black");
+    if let Some(v) = nv {
+        set(ui, &ids[3], v, started(ui));
+    }
+    let (r4, nv) = fw::level_handle(ui, otrack, ow, Color32::WHITE, egui::Id::unique(("ec-low", euid, ch)), &t);
+    app.auto.add(&format!("effectControls.effect.{euid}.levels.outWhite"), r4, "Output White");
+    if let Some(v) = nv {
+        set(ui, &ids[4], v, started(ui));
+    }
+}
+
+/// Auto Levels / Auto Contrast / Auto Color: the histogram they work from.
+pub(super) fn histogram_only(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, g: &PropGroup, r: Rect) {
+    let t = app.tokens;
+    let x0 = r.min.x + 30.0;
+    p.text(pos2(x0, r.min.y + 12.0), Align2::LEFT_CENTER, crate::i18n::tr("Histogram"), Tokens::ui(12.0), t.text_dim);
+    let w = (r.width() - 72.0).clamp(120.0, 256.0);
+    let hr = Rect::from_min_size(pos2(x0 + 8.0, r.min.y + 24.0), vec2(w, 80.0));
+    match frame_histogram(app, ui.ctx()) {
+        Some(h) => {
+            fw::draw_histogram(p, hr, &h[1], channel_color(1).gamma_multiply(0.6));
+            fw::draw_histogram_overlay(p, hr, &h[2], channel_color(2).gamma_multiply(0.6));
+            fw::draw_histogram_overlay(p, hr, &h[3], channel_color(3).gamma_multiply(0.6));
+        }
+        None => {
+            p.rect_filled(hr, 0.0, Color32::from_rgb(0x1c, 0x1c, 0x1c));
+        }
+    }
+    app.auto.add(&format!("effectControls.effect.{}.histogram", g.uid), hr, "Histogram");
+}
diff --git a/crates/ui-egui/src/panels/effect_controls/panel.rs b/crates/ui-egui/src/panels/effect_controls/panel.rs
new file mode 100644
index 000000000..39cdee76c
--- /dev/null
+++ b/crates/ui-egui/src/panels/effect_controls/panel.rs
@@ -0,0 +1,377 @@
+use super::common::{Actions, PARAM_NAME_X, ROW, effect_active, selected_layer};
+use super::editors::{curves_editor, editor_height, histogram_only, levels_editor, object_matte_editor, roto_editor, warp_editor};
+use super::rows::{FxScope, group_rows, toggle_closed};
+use super::{Align2, Color32, EffectcraftApp, EvalCtx, GroupKind, Icon, Layer, PropGroup, Rect, Sense, Stroke, Tokens, json, pos2, vec2, widgets};
+
+// ---------------------------------------------------------------------------------------------
+
+/// Open the rename field on effect `uid` (Enter with the effect selected), name selected.
+pub fn start_rename(ctx: &egui::Context, uid: u64, name: &str) {
+    let id = egui::Id::unique(("ec-rename", uid));
+    ctx.data_mut(|d| d.insert_temp(id, name.to_string()));
+    ctx.data_mut(|d| d.insert_temp(id.with("select"), true));
+    ctx.memory_mut(|m| m.request_focus(id.with("field")));
+}
+
+/// Where an effect header's parts sit, for its rename field.
+struct EffectHdr<'a> {
+    g: &'a PropGroup,
+    shown: &'a str,
+    r: Rect,
+    tw: Rect,
+    reset: Rect,
+    rename_id: egui::Id,
+    layer_id: u64,
+}
+
+/// The effect header's name field while renaming: Enter or blur commits, Escape cancels.
+fn rename_field(app: &mut EffectcraftApp, ui: &mut egui::Ui, h: &EffectHdr, mut value: String, actions: &mut Actions) {
+    let EffectHdr { g, shown, r, tw, reset, rename_id, layer_id } = *h;
+    let ctx = ui.ctx().clone();
+    let name_rect = Rect::from_min_max(pos2(tw.max.x + 6.0, r.min.y + 2.0), pos2(reset.min.x - 6.0, r.max.y - 2.0));
+    let response = ui.put(name_rect, egui::TextEdit::singleline(&mut value).id(rename_id.with("field")).font(Tokens::semibold(12.0)));
+    // Focus the field the frame it first exists: focusing an id not yet on screen leaves
+    // the accessibility tree with a focus it doesn't contain.
+    if ctx.data_mut(|d| d.remove_temp::<bool>(rename_id.with("start"))).is_some() {
+        crate::widgets::select_all(&ctx, response.id, &value);
+        response.request_focus();
+    }
+    app.auto.add(&format!("effectControls.effect.{}.nameEdit", g.uid), name_rect, "Effect name");
+    if ctx.data_mut(|d| d.remove_temp::<bool>(rename_id.with("select"))).unwrap_or(false) {
+        widgets::select_all(&ctx, response.id, &value);
+    }
+    // Escape cancels. egui drops the field's focus on Escape in the same frame, so the
+    // key is checked on the focus being lost as well as held.
+    let escape = (response.has_focus() || response.lost_focus()) && ui.input(|i| i.key_pressed(egui::Key::Escape));
+    let commit = response.lost_focus() || (response.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)));
+    if escape || commit {
+        ctx.data_mut(|d| d.remove::<String>(rename_id));
+        // The field opens with the drawn name, so committing it unchanged is not a rename.
+        if !escape && !value.trim().is_empty() && value != shown {
+            actions.push(("prop.renameGroup".into(), json!({"layer": layer_id, "prop": g.uid, "name": value})));
+        }
+    } else {
+        ctx.data_mut(|d| d.insert_temp(rename_id, value));
+    }
+}
+
+struct EditorCx<'a> {
+    bp: &'a egui::Painter,
+    layer: &'a Layer,
+    ectx: &'a EvalCtx<'a>,
+}
+
+/// An effect's custom editor (curves, levels, roto...), or the histogram-only fallback.
+fn effect_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &EditorCx, g: &PropGroup, er: Rect, actions: &mut Actions) {
+    let GroupKind::Effect { effect } = &g.kind else { return };
+    match effect.as_str() {
+        "ec.color.curves" => curves_editor(app, ui, cx.bp, cx.layer, g, cx.ectx, er, actions),
+        effectcraft_engine::effects::warp_stab::ID => warp_editor(app, ui, cx.bp, cx.layer, g, er, actions),
+        effectcraft_engine::effects::camera_tracker::ID => crate::panels::camera_tracker_ui::editor(app, ui, cx.bp, cx.layer, g, er, actions),
+        effectcraft_engine::effects::roto::ID => roto_editor(app, ui, cx.bp, cx.layer, g, er, actions),
+        effectcraft_engine::effects::object_matte::ID => object_matte_editor(app, ui, cx.bp, cx.layer, g, er, actions),
+        "ec.color.levels" | "ec.color.levelsic" => levels_editor(app, ui, cx.bp, cx.layer, g, effect, cx.ectx, er, actions),
+        crate::panels::fx_editors::GLOW | crate::panels::fx_editors::RESHAPE | crate::panels::fx_editors::EXTRACTOR => {
+            crate::panels::fx_editors::header_editor(app, ui, cx.bp, cx.layer, g, effect, cx.ectx, er, actions)
+        }
+        _ => histogram_only(app, ui, cx.bp, g, er),
+    }
+}
+
+struct ReorderDrag<'a> {
+    tops: &'a [(u64, f32)],
+    y: f32,
+    du: u64,
+    drag_id: egui::Id,
+    layer_id: u64,
+}
+
+/// Drag an effect header to reorder: the insertion line between headers, and the drop.
+fn reorder_drag(ctx: &egui::Context, bp: &egui::Painter, body: Rect, t: &Tokens, st: &ReorderDrag, actions: &mut Actions) {
+    let ReorderDrag { tops, y, du, drag_id, layer_id } = *st;
+    if let Some(pos) = ctx.pointer_interact_pos() {
+        let slot = tops.iter().position(|(_, ty)| pos.y < *ty + (ROW + 2.0) / 2.0).unwrap_or(tops.len());
+        let ly = tops.get(slot).map(|(_, ty)| *ty).unwrap_or(y - 4.0);
+        bp.line_segment([pos2(body.min.x + 4.0, ly), pos2(body.max.x - 4.0, ly)], Stroke::new(2.0, t.accent));
+        if ctx.input(|i| i.pointer.any_released()) {
+            if let Some(from) = tops.iter().position(|(u, _)| *u == du) {
+                let to = if slot > from { slot - 1 } else { slot };
+                if to != from {
+                    actions.push(("effect.reorder".into(), json!({"layer": layer_id, "effect": du, "index": to + 1})));
+                }
+            }
+            ctx.data_mut(|d| d.remove::<u64>(drag_id));
+        }
+    }
+    if !ctx.input(|i| i.pointer.any_down()) {
+        ctx.data_mut(|d| d.remove::<u64>(drag_id));
+    }
+}
+
+/// Drop effects and animation presets here.
+fn drop_payload(ui: &egui::Ui, rect: Rect, p: &egui::Painter, t: &Tokens, layer_id: u64, actions: &mut Actions) {
+    let ctx = ui.ctx().clone();
+    if let Some(payload) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx)
+        && ui.rect_contains_pointer(rect)
+        && let Some((id, params)) = match payload.as_ref() {
+            crate::panels::DragPayload::Effect(e) => Some(("effect.apply", json!({"effect": e, "layers": [layer_id]}))),
+            crate::panels::DragPayload::Preset { preset, .. } => Some(preset.apply_to(layer_id)),
+            _ => None,
+        }
+    {
+        p.rect_stroke(rect, 0.0, Stroke::new(2.0, t.accent), egui::StrokeKind::Inside);
+        if ctx.input(|i| i.pointer.any_released()) {
+            actions.push((id.into(), params));
+            egui::DragAndDrop::clear_payload(&ctx);
+        }
+    }
+}
+
+fn about_button(app: &mut EffectcraftApp, ui: &mut egui::Ui, bp: &egui::Painter, t: &Tokens, effect: &str, g: &PropGroup, r: Rect) {
+    // About…: the effect's name and category (AE's About dialog).
+    let about = Rect::from_min_size(pos2(r.max.x - 50.0, r.center().y - 9.0), vec2(44.0, 18.0));
+    let aresp = ui.interact(about, egui::Id::unique(("ec-about", g.uid)), Sense::click());
+    bp.text(about.center(), Align2::CENTER_CENTER, crate::i18n::tr("About..."), Tokens::ui(11.5), if aresp.hovered() { t.hot_text } else { t.text_dim });
+    app.auto.add(&format!("effectControls.effect.{}.about", g.uid), about, "About");
+    let apop = egui::Id::unique(("ec-about-pop", g.uid));
+    if aresp.clicked() {
+        widgets::open_popup(ui, apop);
+    }
+    if let Some(spec) = effectcraft_engine::effects::find(effect) {
+        let lines = vec![
+            crate::i18n::effects::name(spec.id, spec.name),
+            format!("Category: {}", crate::i18n::effects::category(spec.category)),
+            "EffectCraft built-in effect (MIT OR Apache-2.0)".to_string(),
+        ];
+        let _ = widgets::popup_menu(ui, apop, about.left_bottom(), &lines, None);
+    }
+}
+
+/// The Effect Controls panel for the selected layer: a header with the comp and layer names, then
+/// one header per effect (Fx toggle, twirl, rename, Reset, About, label bar, reorder drag and its
+/// right-click menu) followed by that effect's custom editor and its property rows. Dragging
+/// effects or presets onto the panel applies them; a right-click on empty space opens the Effect
+/// menu. The rows read from a snapshot of the project, and every edit is queued and run through
+/// [`crate::menus::invoke`], with failures reported in `app.ui.status`.
+pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let p = ui.painter().with_clip_rect(rect);
+    let ctx = ui.ctx().clone();
+    let Some(layer) = selected_layer(app) else {
+        p.text(rect.center(), Align2::CENTER_CENTER, crate::i18n::tr("Select a layer to see its effects"), Tokens::ui(12.0), t.text_faint);
+        return;
+    };
+    let Some(cid) = app.session.active_comp_id() else { return };
+    let comp = app.session.project.comp_arc(cid).unwrap_or_else(|| effectcraft_engine::project::Comp::new(1, 1, Default::default(), Default::default()).into());
+    let comp_name = app.session.project.item(cid).map(|i| i.name.clone()).unwrap_or_default();
+    let snap_project = app.session.project.clone();
+    let snap_expr = app.session.expr.clone();
+    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time: app.session.time(), expr: snap_expr.as_deref(), footage: None };
+    let hdr = Rect::from_min_size(rect.min, vec2(rect.width(), 24.0));
+    p.text(pos2(hdr.min.x + 10.0, hdr.center().y), Align2::LEFT_CENTER, format!("{} • {}", comp_name, layer.name), Tokens::ui(11.5), t.text_dim);
+    p.line_segment([hdr.left_bottom(), hdr.right_bottom()], Stroke::new(1.0, t.separator));
+    let body = Rect::from_min_max(pos2(rect.min.x, hdr.max.y), rect.max);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("ec-scroll"), body);
+    let mut y = body.min.y + 4.0 - scroll.offset;
+    let mut actions: Actions = vec![];
+    let bp = p.with_clip_rect(body);
+    // Rows scroll under the header: clip their widgets (and hit tests) to the body.
+    let panel_clip = ui.clip_rect();
+    ui.set_clip_rect(body.intersect(panel_clip));
+    let fx: Vec<PropGroup> = layer.effects().map(|f| f.groups().cloned().collect()).unwrap_or_default();
+    if fx.is_empty() {
+        bp.text(
+            pos2(body.center().x, body.min.y + 40.0),
+            Align2::CENTER_CENTER,
+            "No effects. Drag one from Effects & Presets.",
+            Tokens::ui(12.0),
+            t.text_faint,
+        );
+    }
+    // Clicking empty space deselects the effects.
+    let bg = ui.interact(body, egui::Id::unique("ec-bg"), Sense::click());
+    if bg.clicked() {
+        app.session.state.selected_props.retain(|(l, u)| !(*l == layer.id && fx.iter().any(|g| effect_active(g, layer.id, &[(*l, *u)]))));
+    }
+    let has_clip = !app.session.state.effect_clipboard.is_empty();
+    let drag_id = egui::Id::unique("ec-drag-effect");
+    let dragging: Option<u64> = ctx.data(|d| d.get_temp(drag_id));
+    // Header tops, for drag-to-reorder.
+    let mut tops: Vec<(u64, f32)> = vec![];
+    for (fi, g) in fx.iter().enumerate() {
+        let GroupKind::Effect { effect } = &g.kind else { continue };
+        // The header draws the effect's name in the interface language; the automation labels
+        // below keep the property tree's name, which is the registry's English name (#821).
+        let shown = crate::i18n::effects::group(effect, &g.name);
+        let r = Rect::from_min_size(pos2(body.min.x, y), vec2(body.width(), ROW + 2.0));
+        tops.push((g.uid, r.min.y));
+        y += ROW + 2.0;
+        let open = !app.ui.fx_closed.contains(&g.uid);
+        let selected = app.session.state.selected_props.iter().any(|(l, u)| *l == layer.id && *u == g.uid);
+        let active = effect_active(g, layer.id, &app.session.state.selected_props);
+        bp.rect_filled(r, 0.0, if active { t.fx_header_active } else { t.fx_header });
+        // The effect's colour label (26.5): a bar on the header's left edge.
+        if let Some(lab) = g.label.filter(|l| *l != effectcraft_engine::color::Label::None) {
+            let [lr, lg, lb] = app.session.prefs.label_rgb(lab);
+            bp.rect_filled(Rect::from_min_size(r.min, vec2(4.0, r.height())), 0.0, Color32::from_rgb(lr, lg, lb));
+            app.auto.add(
+                &format!("effectControls.effect.{}.label", g.uid),
+                Rect::from_min_size(r.min, vec2(4.0, r.height())),
+                &app.session.prefs.label_name(lab),
+            );
+        }
+        let fxr = Rect::from_center_size(pos2(r.min.x + 14.0, r.center().y), vec2(16.0, 16.0));
+        if widgets::icon_toggle(ui, fxr, Icon::Fx, g.enabled, &t, egui::Id::unique(("ec-fx", g.uid)), Sense::click()).clicked() {
+            actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": g.uid})));
+        }
+        app.auto.add(&format!("effectControls.effect.{}.fx", g.uid), fxr, &g.name);
+        let tw = Rect::from_center_size(pos2(r.min.x + 32.0, r.center().y), vec2(12.0, 12.0));
+        if widgets::twirl(ui, tw, open, egui::Id::unique(("ec-tw", g.uid)), &t).clicked() {
+            toggle_closed(app, g, open, ui.input(|i| i.modifiers.alt || i.modifiers.command));
+        }
+        app.auto.add(&format!("effectControls.effect.{}.twirl", g.uid), tw, &g.name);
+        let rename_id = egui::Id::unique(("ec-rename", g.uid));
+        let editing: Option<String> = ctx.data(|d| d.get_temp(rename_id));
+        let reset = Rect::from_min_size(pos2(r.max.x - 96.0, r.center().y - 9.0), vec2(40.0, 18.0));
+        let hdr_cx = EffectHdr { g, shown: &shown, r, tw, reset, rename_id, layer_id: layer.id.0 };
+        if let Some(value) = editing.as_ref().cloned() {
+            rename_field(app, ui, &hdr_cx, value, &mut actions);
+        } else {
+            let name = bp.text(pos2(tw.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, &shown, Tokens::semibold(12.0), t.text);
+            app.auto.add(&format!("effectControls.effect.{}.name", g.uid), name, &g.name);
+        }
+        let rresp = ui.interact(reset, egui::Id::unique(("ec-reset", g.uid)), Sense::click());
+        bp.text(reset.center(), Align2::CENTER_CENTER, crate::i18n::tr("Reset"), Tokens::ui(11.5), if rresp.hovered() { t.hot_text } else { t.text_dim });
+        app.auto.add(&format!("effectControls.effect.{}.reset", g.uid), reset, "Reset");
+        if rresp.clicked() {
+            actions.push(("effect.reset".into(), json!({"layer": layer.id.0, "effect": g.uid})));
+        }
+        about_button(app, ui, &bp, &t, effect, g, r);
+        let hresp = ui.interact(
+            Rect::from_min_max(pos2(tw.max.x, r.min.y), pos2(reset.min.x - 4.0, r.max.y)),
+            egui::Id::unique(("ec-hdr", g.uid)),
+            if editing.is_some() { Sense::hover() } else { Sense::click_and_drag() },
+        );
+        if hresp.double_clicked() {
+            ctx.data_mut(|d| d.insert_temp(rename_id, shown.clone()));
+            ctx.data_mut(|d| d.insert_temp(rename_id.with("start"), true));
+        }
+        hresp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, true, active, &shown));
+        app.auto.add(&format!("effectControls.effect.{}", g.uid), r, &g.name);
+        if hresp.clicked() || hresp.drag_started() || hresp.secondary_clicked() {
+            let add = ui.input(|i| i.modifiers.shift || i.modifiers.command);
+            if add && hresp.clicked() {
+                if selected {
+                    app.session.state.selected_props.retain(|(l, u)| !(*l == layer.id && *u == g.uid));
+                } else {
+                    app.session.state.selected_props.push((layer.id, g.uid));
+                }
+            } else if !selected || hresp.clicked() {
+                app.session.state.selected_props = vec![(layer.id, g.uid)];
+            }
+        }
+        if hresp.drag_started() {
+            ctx.data_mut(|d| d.insert_temp(drag_id, g.uid));
+        }
+        crate::widgets::context_menu(&hresp, |ui| {
+            let lid = layer.id.0;
+            let mut picked_label: Option<usize> = None;
+            let mut item = |ui: &mut egui::Ui, label: &str, enabled: bool, cmd: &str, params: serde_json::Value| {
+                if ui.add_enabled(enabled, egui::Button::new(crate::i18n::context_item(cmd, &params, label))).clicked() {
+                    actions.push((cmd.into(), params));
+                    ui.close();
+                }
+            };
+            item(ui, "Copy", true, "effect.copy", json!({"layer": lid, "effect": g.uid}));
+            item(ui, "Paste", has_clip, "effect.paste", json!({"layers": [lid]}));
+            item(ui, "Duplicate", true, "effect.duplicate", json!({"layer": lid, "effect": g.uid}));
+            if ui.button(crate::i18n::tr("Rename")).clicked() {
+                ctx.data_mut(|d| d.insert_temp(rename_id, shown.clone()));
+                ctx.data_mut(|d| d.insert_temp(rename_id.with("start"), true));
+                ui.close();
+            }
+            ui.separator();
+            ui.menu_button(crate::i18n::tr("Label"), |ui| {
+                let cur = g.label.unwrap_or(effectcraft_engine::color::Label::None);
+                for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {
+                    if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), l == cur, &t).clicked() {
+                        picked_label = Some(i);
+                        ui.close();
+                    }
+                }
+            });
+            item(ui, "Reset", true, "effect.reset", json!({"layer": lid, "effect": g.uid}));
+            item(ui, "Remove", true, "effect.remove", json!({"layer": lid, "effect": g.uid}));
+            ui.separator();
+            item(ui, "Move Up", fi > 0, "effect.reorder", json!({"layer": lid, "effect": g.uid, "index": fi.max(1)}));
+            item(ui, "Move Down", fi + 1 < fx.len(), "effect.reorder", json!({"layer": lid, "effect": g.uid, "index": fi + 2}));
+            if let Some(i) = picked_label {
+                actions.push(("effect.setLabel".into(), json!({"layer": lid, "effect": g.uid, "label": i})));
+            }
+        });
+        // What the effect can't render as asked (an OCIO config it can't read, transforms it
+        // passes through), under its name.
+        if let Some(w) = effectcraft_engine::effects::warning(g, &mut |pr| ectx.value(&layer, pr)) {
+            let galley = bp.layout(format!("⚠ {w}"), Tokens::ui(11.0), t.warning, (body.width() - 20.0).max(60.0));
+            let wr = Rect::from_min_size(pos2(body.min.x + 10.0, y + 3.0), galley.size());
+            bp.galley(wr.min, galley, t.warning);
+            app.auto.add(&format!("effectControls.effect.{}.warning", g.uid), wr, &w);
+            y += wr.height() + 6.0;
+        }
+        if open {
+            let eh = editor_height(effect, g, body.width());
+            if eh > 0.0 {
+                let er = Rect::from_min_size(pos2(body.min.x, y), vec2(body.width(), eh));
+                y += eh;
+                if er.max.y >= body.min.y && er.min.y <= body.max.y {
+                    // Curves, Levels and other custom editors do not use prop_row.
+                    // Clicking their controls must activate the owner as well.
+                    if ui.input(|i| i.pointer.primary_pressed()) && ui.rect_contains_pointer(er) {
+                        actions.push(("prop.select".into(), json!({"layer":layer.id.0,"prop":g.uid})));
+                    }
+                    effect_editor(app, ui, &EditorCx { bp: &bp, layer: &layer, ectx: &ectx }, g, er, &mut actions);
+                }
+            }
+            let scope = FxScope { effect: effect.as_str(), root: g, path: String::new() };
+            group_rows(app, ui, &bp, &layer, g, &ectx, body, &mut y, 0, &scope, &mut actions);
+            if effect == "ec.color.tint" {
+                let r = Rect::from_min_size(pos2(body.min.x + PARAM_NAME_X, y + 2.0), vec2(120.0, ROW));
+                let label = crate::i18n::tr("Swap Colors");
+                let resp = widgets::text_button(ui, r, label, false, &t, egui::Id::unique(("ec-tint-swap", g.uid)));
+                app.auto.add_response(&format!("effectControls.effect.{}.swapColors", g.uid), &resp, label);
+                if resp.clicked() {
+                    actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": g.uid})));
+                    actions.push(("effect.swapTintColors".into(), json!({"layer": layer.id.0, "effect": g.uid})));
+                }
+                y += ROW + 4.0;
+            }
+        }
+        y += 4.0;
+    }
+    if let Some(du) = dragging {
+        reorder_drag(&ctx, &bp, body, &t, &ReorderDrag { tops: &tops, y, du, drag_id, layer_id: layer.id.0 }, &mut actions);
+    }
+    // Right-click anywhere a control has no menu of its own: the Effect menu, which applies to
+    // the selected layers (After Effects). Drawn after the rows, whose menus open first.
+    let menu_id = bg.id.with("effect-menu");
+    let open = ui.input(|i| i.pointer.secondary_clicked())
+        && ui.rect_contains_pointer(body)
+        && (!egui::Popup::is_any_open(&ctx) || egui::Popup::is_id_open(&ctx, menu_id));
+    egui::Popup::context_menu(&bg).style(crate::widgets::menu_style).id(menu_id).open_memory(open.then_some(egui::SetOpenCommand::Bool(true))).show(|ui| {
+        ui.set_min_width(200.0);
+        actions.extend(crate::menus::menu_contents(app, ui, "Effect"));
+    });
+    ui.set_clip_rect(panel_clip);
+    let content_h = y + scroll.offset - body.min.y;
+    scroll.end(ui, &mut app.auto, "effectControls.scroll", content_h, &t);
+    drop_payload(ui, rect, &p, &t, layer.id.0, &mut actions);
+    if ui.input(|i| i.pointer.primary_down()) && actions.iter().any(|(id, _)| id == "prop.set") {
+        app.ui.viewer.property_interacting = true;
+        ctx.request_repaint();
+    }
+    for (id, params) in actions {
+        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
+            app.ui.status = e;
+        }
+    }
+}
diff --git a/crates/ui-egui/src/panels/effect_controls/rows.rs b/crates/ui-egui/src/panels/effect_controls/rows.rs
new file mode 100644
index 000000000..05fea44c9
--- /dev/null
+++ b/crates/ui-egui/src/panels/effect_controls/rows.rs
@@ -0,0 +1,726 @@
+use super::common::{Actions, DIAL_ROW, PARAM_NAME_X, ROW, TREE_INDENT, gesture_key};
+use super::{
+    Align2, Color32, EffectcraftApp, EvalCtx, FxPick, Icon, Layer, Node, ParamUi, PropGroup, Property, Rect, Sense, Stroke, Tokens, Value, fw, icons, json,
+    pos2, vec2, widgets,
+};
+
+fn triangle(p: &egui::Painter, c: egui::Pos2, left: bool, col: Color32) {
+    let (dx, h) = (if left { -3.5 } else { 3.5 }, 4.0);
+    p.add(egui::Shape::convex_polygon(vec![pos2(c.x + dx, c.y), pos2(c.x - dx, c.y - h), pos2(c.x - dx, c.y + h)], col, Stroke::NONE));
+}
+
+/// The layer and whether the time is on a key, for the key navigator.
+#[derive(Clone, Copy)]
+struct KeyNav {
+    layer_id: u64,
+    on_key: bool,
+}
+
+/// ◀ ◆ ▶ at the right end of an animated parameter's row.
+fn key_navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, nav: KeyNav, prop: &Property, r: Rect, actions: &mut Actions) {
+    let KeyNav { layer_id, on_key } = nav;
+    let t = app.tokens;
+    let cy = r.center().y;
+    let uid = prop.uid;
+    for (what, dx) in [("prev", -44.0), ("key", -32.0), ("next", -20.0)] {
+        let cr = Rect::from_center_size(pos2(r.max.x + dx, cy), vec2(12.0, 16.0));
+        let resp = ui.interact(cr, egui::Id::unique(("ec-nav", uid, what)), Sense::click());
+        let col = if resp.hovered() { t.text } else { t.text_dim };
+        match what {
+            "prev" => triangle(p, cr.center(), true, col),
+            "next" => triangle(p, cr.center(), false, col),
+            _ => {
+                let kr = Rect::from_center_size(cr.center(), vec2(10.0, 10.0));
+                if on_key {
+                    icons::paint(p, kr, Icon::Keyframe, t.keyframe);
+                } else {
+                    let c = kr.center();
+                    let d = 4.5;
+                    p.add(egui::Shape::closed_line(
+                        vec![pos2(c.x, c.y - d), pos2(c.x + d, c.y), pos2(c.x, c.y + d), pos2(c.x - d, c.y)],
+                        Stroke::new(1.0, col),
+                    ));
+                }
+            }
+        }
+        app.auto.add(&format!("effectControls.prop.{uid}.{what}Key"), cr, &prop.name);
+        if resp.clicked() {
+            match what {
+                "prev" => actions.push(("time.go".into(), json!({"to": "prevKey", "prop": uid}))),
+                "next" => actions.push(("time.go".into(), json!({"to": "nextKey", "prop": uid}))),
+                _ => actions.push(("prop.toggleKey".into(), json!({"layer": layer_id, "prop": uid, "selected": true}))),
+            }
+        }
+    }
+}
+
+/// Toggle a viewer pick (crosshair / eyedropper) for a parameter (also the Timeline's colour
+/// eyedroppers).
+pub(crate) fn toggle_pick(app: &mut EffectcraftApp, kind: &str, layer: &Layer, prop: &Property) {
+    let pick = FxPick { kind: kind.into(), layer: layer.id.0, prop: prop.uid, name: prop.name.clone() };
+    if app.ui.fx_pick.as_ref() == Some(&pick) {
+        app.ui.fx_pick = None;
+    } else {
+        app.ui.fx_pick = Some(pick);
+        app.ui.text_color_pick = None;
+        app.ui.status = if kind == "point" {
+            format!("Click in the Composition panel to set {}", prop.name)
+        } else {
+            format!("Click in the Composition panel to sample {}", prop.name)
+        };
+    }
+}
+
+/// What the value controls of one property row share.
+#[derive(Clone, Copy)]
+struct PropCx<'a> {
+    p: &'a egui::Painter,
+    layer: &'a Layer,
+    group: &'a PropGroup,
+    prop: &'a Property,
+    r: Rect,
+    vx: f32,
+    cy: f32,
+    swr: Rect,
+    t: Tokens,
+    uid: u64,
+    scrub: bool,
+}
+
+impl PropCx<'_> {
+    fn set(&self, actions: &mut Actions, v: serde_json::Value) {
+        let (layer, uid, merge, scrub) = (self.layer, self.uid, format!("ec-{}", self.uid), self.scrub);
+        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": v, "merge": merge, "selected": true, "offset": scrub})))
+    }
+
+    fn twirl_open(&self, app: &mut EffectcraftApp, ui: &mut egui::Ui) {
+        let PropCx { swr, cy, uid, prop, t, .. } = self;
+        let (cy, uid) = (*cy, *uid);
+        let open = app.ui.fx_slider_open.contains(&uid);
+        let tw = Rect::from_center_size(pos2(swr.min.x - 9.0, cy), vec2(10.0, 10.0));
+        if widgets::twirl(ui, tw, open, egui::Id::unique(("ec-stw", uid)), t).clicked() {
+            if open {
+                app.ui.fx_slider_open.remove(&uid);
+            } else {
+                app.ui.fx_slider_open.insert(uid);
+            }
+        }
+        app.auto.add(&format!("effectControls.prop.{uid}.twirl"), tw, &prop.name);
+    }
+}
+
+/// One property row: stopwatch, name, value control (and the keyframe navigator). Returns the
+/// value fields of a vector, one per dimension, for the pick whip.
+#[allow(clippy::too_many_arguments)]
+fn prop_row(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    group: &PropGroup,
+    prop: &Property,
+    ectx: &EvalCtx,
+    r: Rect,
+    indent: f32,
+    actions: &mut Actions,
+) -> Vec<Rect> {
+    let t = app.tokens;
+    let mut dims = vec![];
+    let cy = r.center().y;
+    let uid = prop.uid;
+    if ui.input(|i| i.pointer.primary_pressed()) && ui.rect_contains_pointer(r) {
+        let add = ui.input(|i| i.modifiers.shift || i.modifiers.command);
+        actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": add})));
+    }
+    let swr = Rect::from_center_size(pos2(r.min.x + indent, cy), vec2(14.0, 14.0));
+    if !prop.static_only && !matches!(prop.ui, ParamUi::Hidden) {
+        let resp = ui.interact(swr, egui::Id::unique(("ec-sw", uid)), Sense::click());
+        icons::paint(
+            p,
+            swr,
+            Icon::Stopwatch,
+            if prop.is_animated() {
+                t.hot_text
+            } else if resp.hovered() {
+                t.text
+            } else {
+                t.text_dim
+            },
+        );
+        app.auto.add(&format!("effectControls.prop.{uid}.stopwatch"), swr, &prop.name);
+        if resp.clicked() {
+            actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "selected": true})));
+        }
+    }
+    if prop.is_animated() {
+        let half = ectx.comp.frame_duration().0 / 2;
+        let on_key = prop.keys.iter().any(|k| (layer.comp_time(k.time).0 - ectx.time.0).abs() <= half);
+        key_navigator(app, ui, p, KeyNav { layer_id: layer.id.0, on_key }, prop, r, actions);
+    }
+    let value = ectx.value(layer, prop);
+    // Keep a shared value column while names and their icons follow the group hierarchy.
+    // Extremely deep groups still leave a little name space before their value.
+    let vx = (r.min.x + r.width() * 0.48).max(r.min.x + PARAM_NAME_X + 124.0).max(swr.max.x + 40.0);
+    // A vector's values end before the keyframe navigator: in a narrow panel they move left over
+    // the name (cut short) instead of running under the navigator (#271).
+    let vx = match &value {
+        Value::Vec2(_) | Value::Vec3(_) => {
+            let point = if matches!(prop.ui, ParamUi::Point | ParamUi::Point3) { 22.0 } else { 0.0 };
+            let fields: f32 = value
+                .components()
+                .iter()
+                .take(shown_dims(layer, prop, &value))
+                .map(|v| p.layout_no_wrap(format!("{v:.1}"), Tokens::ui(12.0), t.hot_text).size().x + 12.0)
+                .sum();
+            let right = r.max.x - if prop.is_animated() { 52.0 } else { 8.0 };
+            vx.min(right - point - fields + 8.0).max(swr.max.x + 60.0)
+        }
+        _ => vx,
+    };
+    let name_clip = Rect::from_min_max(pos2(swr.max.x + 6.0, r.min.y), pos2(vx - 6.0, r.max.y));
+    app.auto.add(&format!("effectControls.prop.{uid}.name"), name_clip, &prop.name);
+    p.with_clip_rect(name_clip.intersect(p.clip_rect())).text(pos2(swr.max.x + 6.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(12.0), t.text);
+    let name_response = ui.interact(name_clip, egui::Id::unique(("ec-prop-name", uid)), Sense::click());
+    if name_response.double_clicked() {
+        app.ui.timeline.search.clear();
+        app.ui.timeline.scroll_to = Some(crate::state::ScrollTo::Property(uid));
+        if let Err(e) = crate::menus::frontend(app, ui.ctx(), "timeline.revealProps", json!({"props": [{"layer": layer.id.0, "prop": uid}]})) {
+            app.ui.status = e;
+        }
+        app.show_panel(crate::dock::PanelKind::Timeline);
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.name"), name_clip, &prop.name);
+    // With several layers selected the edit applies to the same effect property of each (#491).
+    let scrub = ui.ctx().dragged_id().is_some() && ui.input(|i| i.pointer.is_decidedly_dragging());
+    let cx = PropCx { p, layer, group, prop, r, vx, cy, swr, t, uid, scrub };
+    match &value {
+        Value::Scalar(_) if matches!(prop.ui, ParamUi::Mask) => value_mask(app, ui, &cx, &value, actions),
+        Value::Scalar(_) if matches!(prop.ui, ParamUi::Angle) => value_angle(app, ui, &cx, &value, actions),
+        Value::Scalar(_) => value_scalar(app, ui, &cx, &value, actions),
+        Value::Vec2(_) | Value::Vec3(_) => dims = value_vector(app, ui, &cx, &value, actions),
+        Value::Color(_) => value_color(app, ui, &cx, &value, actions),
+        Value::Bool(_) => value_toggle(app, ui, &cx, &value, actions),
+        Value::Enum(_) => value_popup(app, ui, &cx, &value, actions),
+        Value::Layer(_) => value_layer_ref(app, ui, &cx, &value, actions),
+        // EXtractoR's red / green / blue / alpha: a popup of the footage's OpenEXR channels (#295).
+        Value::Str(_) if crate::panels::fx_editors::is_extractor_channel(group, prop) => value_extractor(app, ui, &cx, &value, actions),
+        // A file parameter (Apply Color LUT's LUT, an OCIO config): its file name and Choose…,
+        // as in After Effects.
+        Value::Str(_) if matches!(prop.ui, ParamUi::File { .. }) => value_file(app, ui, &cx, &value, actions),
+        // A text parameter (Cryptomatte's Selection, Colorama's Output Cycle, config names):
+        // typed in a field, set when it loses the focus (Esc keeps the old text).
+        Value::Str(_) if matches!(prop.ui, ParamUi::Text) => value_text(app, ui, &cx, &value, actions),
+        Value::Gradient(_) => value_gradient(app, &cx, &value),
+        _ => {}
+    }
+    dims
+}
+
+fn value_mask(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Scalar(v) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, layer, prop, .. } = *cx;
+    // A mask of this layer ("Path" popup).
+    let mut opts = vec!["None".to_string()];
+    if let Some(m) = layer.masks() {
+        opts.extend(m.groups().map(|g| g.name.clone()));
+    }
+    let i = v.round().max(0.0) as usize;
+    let label = opts.get(i).cloned().unwrap_or_else(|| format!("Mask {i}"));
+    let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 56.0).clamp(80.0, 200.0), 18.0));
+    let pop = egui::Id::unique(("ec-mpop", uid));
+    if widgets::dropdown(ui, dr, &label, &t, egui::Id::unique(("ec-m", uid))).clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
+    if let Some(ni) = widgets::popup_menu(ui, pop, dr.left_bottom(), &opts, Some(i)) {
+        cx.set(actions, json!(ni as f64));
+    }
+}
+
+fn value_angle(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Scalar(v) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, prop, .. } = *cx;
+    let (rr, dr, nv) = fw::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("ec-v", uid)), *v, 1, &t);
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), rr.union(dr), &fw::format_angle(*v, 1));
+    app.auto.add(&format!("effectControls.prop.{uid}.revolutions"), rr, &prop.name);
+    if let Some(nv) = nv {
+        cx.set(actions, json!(nv));
+    }
+    cx.twirl_open(app, ui);
+}
+
+fn value_scalar(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Scalar(v) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, prop, .. } = *cx;
+    let (min, max, dec) = match &prop.ui {
+        ParamUi::Slider { min, max, decimals, .. } => (*min, *max, *decimals as usize),
+        _ => (-1e9, 1e9, 1),
+    };
+    let suffix = match prop.ui {
+        ParamUi::Percent => "%",
+        _ => "",
+    };
+    let speed = widgets::slider_scrub_speed(&prop.ui);
+    let (vr, nv, _) = widgets::hot_number_at(
+        ui,
+        pos2(vx, cy - 9.0),
+        egui::Id::unique(("ec-v", uid)),
+        *v,
+        &widgets::HotSpec { speed, range: (min, max), decimals: dec.max(if dec == 0 { 0 } else { 1 }), suffix },
+        &t,
+    );
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), vr, &prop.name);
+    if let Some(nv) = nv {
+        cx.set(actions, json!(nv));
+    }
+    // AE hides a slider param's slider until its twirl is opened (see `slider_row`).
+    if matches!(prop.ui, ParamUi::Slider { .. }) {
+        cx.twirl_open(app, ui);
+    }
+}
+
+fn value_vector(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) -> Vec<Rect> {
+    let mut dims = vec![];
+    let PropCx { t, uid, cy, vx, layer, prop, .. } = *cx;
+    let c = value.components();
+    let n = shown_dims(layer, prop, value);
+    let mut x = vx;
+    if matches!(prop.ui, ParamUi::Point | ParamUi::Point3) {
+        let cr = Rect::from_center_size(pos2(x + 8.0, cy), vec2(18.0, 18.0));
+        let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "point");
+        if fw::crosshair_button(ui, cr, active, egui::Id::unique(("ec-xh", uid)), &t)
+            .on_hover_text(crate::i18n::tr("Click, then click in the Composition panel"))
+            .clicked()
+        {
+            toggle_pick(app, "point", layer, prop);
+        }
+        app.auto.add(&format!("effectControls.prop.{uid}.crosshair"), cr, &prop.name);
+        x += 22.0;
+    }
+    for d in 0..n.min(c.len()) {
+        let (vr, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x, cy - 9.0),
+            egui::Id::unique(("ec-v", uid, d)),
+            c[d],
+            &widgets::HotSpec { speed: 1.0, range: (-1e9, 1e9), decimals: 1, suffix: "" },
+            &t,
+        );
+        app.auto.add(&format!("effectControls.prop.{uid}.value.{d}"), vr, &prop.name);
+        dims.push(vr);
+        if let Some(nv) = nv {
+            let mut nc = c.clone();
+            nc[d] = nv;
+            cx.set(actions, json!(nc));
+            // Typed into this component only: other selected layers keep the rest of
+            // their own value (#1434).
+            if let Some((_, a)) = actions.last_mut() {
+                a["dims"] = json!([d]);
+            }
+        }
+        x = vr.max.x + 8.0;
+    }
+    dims
+}
+
+fn value_color(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Color(c) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, layer, prop, .. } = *cx;
+    let sr = Rect::from_min_size(pos2(vx, cy - 8.0), vec2(30.0, 16.0));
+    let pop = egui::Id::unique(("ec-cpop", uid));
+    if widgets::swatch(ui, sr, [c[0] as f32, c[1] as f32, c[2] as f32, 1.0], egui::Id::unique(("ec-c", uid)), &t).clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), sr, &prop.name);
+    let er = Rect::from_center_size(pos2(sr.max.x + 14.0, cy), vec2(18.0, 18.0));
+    let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "color");
+    if fw::eyedropper_button(ui, er, active, egui::Id::unique(("ec-eye", uid)), &t)
+        .on_hover_text(crate::i18n::tr("Eyedropper: click, then click in the Composition panel"))
+        .clicked()
+    {
+        toggle_pick(app, "color", layer, prop);
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.eyedropper"), er, &prop.name);
+    let mut rgb = [c[0] as f32, c[1] as f32, c[2] as f32];
+    if crate::widgets::color_popup(ui, pop, sr.left_bottom(), &mut rgb) {
+        cx.set(actions, json!([rgb[0], rgb[1], rgb[2], 1.0]));
+    }
+}
+
+fn value_toggle(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Bool(b) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, p, prop, .. } = *cx;
+    let cr = Rect::from_min_size(pos2(vx, cy - 8.0), vec2(16.0, 16.0));
+    if widgets::checkbox(ui, cr, *b, &t, egui::Id::unique(("ec-b", uid))).clicked() {
+        cx.set(actions, json!(!b));
+    }
+    p.text(pos2(cr.max.x + 6.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(12.0), t.text_dim);
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), cr, &prop.name);
+}
+
+fn value_popup(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Enum(i) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, p, prop, .. } = *cx;
+    if let ParamUi::Popup { options } = &prop.ui {
+        let widest = options.iter().map(|o| p.layout_no_wrap(o.clone(), Tokens::ui(11.5), t.text).size().x).fold(0.0, f32::max);
+        let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((widest + 30.0).clamp(80.0, (r.max.x - vx - 56.0).max(80.0)), 18.0));
+        let pop = egui::Id::unique(("ec-epop", uid));
+        if widgets::dropdown(ui, dr, options.get(*i as usize).map(String::as_str).unwrap_or(""), &t, egui::Id::unique(("ec-e", uid))).clicked() {
+            widgets::open_popup(ui, pop);
+        }
+        app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
+        if let Some(ni) = widgets::popup_menu(ui, pop, dr.left_bottom(), options, Some(*i as usize)) {
+            cx.set(actions, json!(ni));
+        }
+    }
+}
+
+fn value_layer_ref(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Layer(l) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, layer, prop, group, .. } = *cx;
+    let comp = app.session.active_comp_arc();
+    if let Some(comp) = comp {
+        let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2(((r.max.x - vx) * 0.55).clamp(90.0, 170.0), 18.0));
+        if let Some(chosen) = widgets::layer_picker(ui, dr, &comp.layers, *l, &t, egui::Id::unique(("ec-l", uid))) {
+            cx.set(actions, chosen.map(|id| json!(id)).unwrap_or(serde_json::Value::Null));
+        }
+        app.auto.add(&format!("effectControls.prop.{uid}.value"), dr, &prop.name);
+        // Source / Masks / Effects & Masks (the hidden companion parameter).
+        if let Some(src) = group.get(&effectcraft_engine::effects::layer_source_id(&prop.match_id)) {
+            let si = src.value.as_enum() as usize;
+            let opts: Vec<String> = effectcraft_engine::effects::LAYER_SOURCE_OPTIONS.iter().map(|s| s.to_string()).collect();
+            let sr = Rect::from_min_size(pos2(dr.max.x + 6.0, cy - 9.0), vec2(((r.max.x - dr.max.x) - 64.0).clamp(70.0, 120.0), 18.0));
+            let spop = egui::Id::unique(("ec-lspop", uid));
+            if widgets::dropdown(ui, sr, opts.get(si).map(String::as_str).unwrap_or(""), &t, egui::Id::unique(("ec-ls", uid))).clicked() {
+                widgets::open_popup(ui, spop);
+            }
+            app.auto.add(&format!("effectControls.prop.{uid}.source"), sr, &src.name);
+            if let Some(ni) = widgets::popup_menu(ui, spop, sr.left_bottom(), &opts, Some(si)) {
+                actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": src.uid, "value": ni})));
+            }
+        }
+    }
+}
+
+fn value_extractor(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Str(s) = value else {
+        return;
+    };
+    let PropCx { cy, vx, r, layer, prop, .. } = *cx;
+    let dr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 56.0).clamp(80.0, 200.0), 18.0));
+    crate::panels::fx_editors::channel_popup(app, ui, layer, prop, s, dr, actions);
+}
+
+fn value_file(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Str(s) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, p, layer, prop, .. } = *cx;
+    let bw = 70.0;
+    let br = Rect::from_min_size(pos2(vx, cy - 9.0), vec2(bw, 18.0));
+    if widgets::text_button(ui, br, crate::i18n::tr("Choose..."), false, &t, egui::Id::unique(("ec-file", uid))).clicked() {
+        let filters: Vec<&str> = match &prop.ui {
+            ParamUi::File { filters } => filters.iter().map(String::as_str).collect(),
+            _ => vec![],
+        };
+        match app.hooks.pick_files.as_ref() {
+            Some(pick) => {
+                if let Some(path) = pick(&filters).into_iter().next() {
+                    actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": path})));
+                }
+            }
+            None => app.ui.status = "no file dialog available: set the path with prop.set".into(),
+        }
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.choose"), br, &prop.name);
+    let shown = if s.trim().is_empty() {
+        crate::i18n::tr("None").to_string()
+    } else if s.contains('\n') {
+        prop.name.clone()
+    } else {
+        effectcraft_engine::sequence::file_name(s)
+    };
+    let nr = Rect::from_min_max(pos2(br.max.x + 8.0, r.min.y), pos2(r.max.x - 8.0, r.max.y));
+    let np = p.with_clip_rect(nr.intersect(p.clip_rect()));
+    np.text(pos2(nr.min.x, cy), Align2::LEFT_CENTER, &shown, Tokens::ui(12.0), if s.trim().is_empty() { t.text_dim } else { t.text });
+    let hover = ui.interact(nr, egui::Id::unique(("ec-file-name", uid)), Sense::hover());
+    if !s.trim().is_empty() && !s.contains('\n') {
+        hover.on_hover_text(s);
+    }
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), nr, &shown);
+}
+
+fn value_text(app: &mut EffectcraftApp, ui: &mut egui::Ui, cx: &PropCx, value: &Value, actions: &mut Actions) {
+    let Value::Str(s) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, layer, prop, .. } = *cx;
+    let fr = Rect::from_min_size(pos2(vx, cy - 9.0), vec2((r.max.x - vx - 12.0).clamp(80.0, 320.0), 18.0));
+    let bid = egui::Id::unique(("ec-text", uid));
+    let mut buf: String = ui.data(|d| d.get_temp(bid)).unwrap_or_else(|| s.to_owned());
+    let resp = widgets::text_field(ui, fr, &mut buf, "", &t);
+    // The field has no visible hint: give the screen reader the parameter's name.
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TextInput, ui.is_enabled(), &prop.name));
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), fr, &prop.name);
+    if resp.lost_focus() {
+        if buf != *s && !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+            actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": buf})));
+        }
+        ui.data_mut(|d| d.remove::<String>(bid));
+    } else if resp.has_focus() {
+        ui.data_mut(|d| d.insert_temp(bid, buf));
+    }
+}
+
+fn value_gradient(app: &mut EffectcraftApp, cx: &PropCx, value: &Value) {
+    let Value::Gradient(g) = value else {
+        return;
+    };
+    let PropCx { t, uid, cy, vx, r, p, prop, .. } = *cx;
+    let gr = Rect::from_min_size(pos2(vx, cy - 7.0), vec2((r.max.x - vx - 56.0).clamp(60.0, 180.0), 14.0));
+    let n = 48;
+    for k in 0..n {
+        let f = k as f64 / (n - 1) as f64;
+        let c = gradient_at(g, f);
+        let x0 = gr.min.x + gr.width() * k as f32 / n as f32;
+        let x1 = gr.min.x + gr.width() * (k + 1) as f32 / n as f32;
+        p.rect_filled(Rect::from_min_max(pos2(x0, gr.min.y), pos2(x1, gr.max.y)), 0.0, c);
+    }
+    p.rect_stroke(gr, 2.0, Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
+    app.auto.add(&format!("effectControls.prop.{uid}.value"), gr, &prop.name);
+}
+
+/// How many of a vector parameter's values show (a 3D point's Z only on a 3D layer).
+fn shown_dims(layer: &Layer, prop: &Property, value: &Value) -> usize {
+    let n = value.components().len();
+    if prop.shown_dims > 0 && !(layer.is_3d() && n == 3) { prop.shown_dims as usize } else { n }
+}
+
+/// Colour of a gradient at `f` (colour stops only).
+fn gradient_at(g: &effectcraft_engine::keyframe::Gradient, f: f64) -> Color32 {
+    let stops = &g.colors;
+    let c = if stops.is_empty() {
+        [0.0, 0.0, 0.0, 1.0]
+    } else if f <= stops[0].0 {
+        stops[0].1
+    } else if f >= stops[stops.len() - 1].0 {
+        stops[stops.len() - 1].1
+    } else {
+        let i = stops.iter().position(|s| s.0 > f).unwrap_or(stops.len() - 1).max(1);
+        let (a, b) = (stops[i - 1], stops[i]);
+        let k = ((f - a.0) / (b.0 - a.0).max(1e-9)) as f32;
+        [0, 1, 2, 3].map(|j| a.1[j] + (b.1[j] - a.1[j]) * k)
+    };
+    Color32::from_rgb((c[0].clamp(0.0, 1.0) * 255.0) as u8, (c[1].clamp(0.0, 1.0) * 255.0) as u8, (c[2].clamp(0.0, 1.0) * 255.0) as u8)
+}
+
+/// The twirled-open slider under a slider param: track, knob and the slider range's ends.
+#[allow(clippy::too_many_arguments)]
+fn slider_row(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    prop: &Property,
+    ectx: &EvalCtx,
+    r: Rect,
+    x0: f32,
+    actions: &mut Actions,
+) {
+    let t = app.tokens;
+    let ParamUi::Slider { slider_min, slider_max, decimals, .. } = prop.ui else { return };
+    let Value::Scalar(v) = ectx.value(layer, prop) else { return };
+    let uid = prop.uid;
+    let tr = Rect::from_min_max(pos2(r.min.x + x0, r.min.y + 8.0), pos2(r.max.x - 16.0, r.min.y + 12.0));
+    if tr.width() < 40.0 {
+        return;
+    }
+    p.rect_filled(tr, 2.0, t.field_bg);
+    let f = ((v - slider_min) / (slider_max - slider_min)).clamp(0.0, 1.0) as f32;
+    p.rect_filled(Rect::from_min_max(tr.min, pos2(tr.min.x + tr.width() * f, tr.max.y)), 2.0, t.accent.gamma_multiply(0.7));
+    p.circle_filled(pos2(tr.min.x + tr.width() * f, tr.center().y), 5.0, t.text);
+    let dec = decimals as usize;
+    p.text(pos2(tr.min.x, tr.max.y + 4.0), Align2::LEFT_TOP, format!("{slider_min:.dec$}"), Tokens::ui(10.5), t.text_dim);
+    p.text(pos2(tr.max.x, tr.max.y + 4.0), Align2::RIGHT_TOP, format!("{slider_max:.dec$}"), Tokens::ui(10.5), t.text_dim);
+    let sresp = ui.interact(tr.expand2(vec2(4.0, 6.0)), egui::Id::unique(("ec-slider", uid)), Sense::click_and_drag());
+    app.auto.add(&format!("effectControls.prop.{uid}.slider"), tr, &prop.name);
+    if (sresp.dragged() || sresp.clicked())
+        && let Some(pt) = sresp.interact_pointer_pos()
+    {
+        let f = ((pt.x - tr.min.x) / tr.width()).clamp(0.0, 1.0) as f64;
+        actions.push((
+            "prop.set".into(),
+            json!({"layer": layer.id.0, "prop": uid, "value": slider_min + (slider_max - slider_min) * f, "merge": format!("ec-{uid}")}),
+        ));
+    }
+}
+
+/// The twirled-open angle dial under an angle param.
+#[allow(clippy::too_many_arguments)]
+fn dial_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, layer: &Layer, prop: &Property, ectx: &EvalCtx, r: Rect, x0: f32, actions: &mut Actions) {
+    let t = app.tokens;
+    let Value::Scalar(v) = ectx.value(layer, prop) else { return };
+    let uid = prop.uid;
+    let d = (r.height() - 12.0).min(52.0);
+    let dr = Rect::from_min_size(pos2(r.min.x + x0 + 40.0, r.min.y + 6.0), vec2(d, d));
+    let id = egui::Id::unique(("ec-dial", uid));
+    let (resp, nv) = fw::angle_dial(ui, dr, v, id, &t);
+    app.auto.add(&format!("effectControls.prop.{uid}.dial"), dr, &prop.name);
+    if let Some(nv) = nv {
+        let key = gesture_key(ui, id, resp.drag_started() || resp.clicked());
+        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": uid, "value": nv, "merge": key})));
+    }
+}
+
+/// The effect instance a row belongs to, for conditional visibility
+/// ([`effectcraft_engine::effects::catalog::param_shown`]): effect id, the instance's root
+/// group and the spec-id path of the group being drawn (`""` or `cameraPosition/`).
+pub(super) struct FxScope<'a> {
+    pub(super) effect: &'a str,
+    pub(super) root: &'a PropGroup,
+    pub(super) path: String,
+}
+
+impl<'a> FxScope<'a> {
+    pub(super) fn sub(&self, m: &str) -> FxScope<'a> {
+        FxScope { effect: self.effect, root: self.root, path: format!("{}{m}/", self.path) }
+    }
+    /// Whether child `m` of the current group is shown.
+    pub(super) fn shown(&self, layer: &Layer, ectx: &EvalCtx, m: &str) -> bool {
+        let root = self.root;
+        let value = |id: &str| -> Option<Value> {
+            let mut g = root;
+            let mut parts = id.split('/').peekable();
+            while let Some(part) = parts.next() {
+                if parts.peek().is_none() {
+                    return g.get(part).map(|p| ectx.value(layer, p));
+                }
+                g = g.sub(part)?;
+            }
+            None
+        };
+        effectcraft_engine::effects::catalog::param_shown(self.effect, &format!("{}{m}", self.path), &value)
+    }
+}
+
+/// Twirl `g` closed (it was `open`) or open; with `all` (Alt/Cmd-click) every group under it follows.
+pub(super) fn toggle_closed(app: &mut EffectcraftApp, g: &PropGroup, open: bool, all: bool) {
+    fn walk(g: &PropGroup, out: &mut Vec<u64>) {
+        for sg in g.groups() {
+            out.push(sg.uid);
+            walk(sg, out);
+        }
+    }
+    let mut uids = vec![g.uid];
+    if all {
+        walk(g, &mut uids);
+    }
+    for u in uids {
+        if open {
+            app.ui.fx_closed.insert(u);
+        } else {
+            app.ui.fx_closed.remove(&u);
+        }
+    }
+}
+
+/// Lays out one property group's rows below `*y` (which it advances), recursing into open
+/// subgroups: one row per visible property with its controls, plus the dial or slider row when its
+/// slider is open, and an inline editor for groups that have one. Rows scrolled out of `rect` are
+/// skipped without being drawn or registered, though their height is still counted. Pick-whip
+/// drops are registered for each visible property; edits go on `actions`.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn group_rows(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    p: &egui::Painter,
+    layer: &Layer,
+    g: &PropGroup,
+    ectx: &EvalCtx,
+    rect: Rect,
+    y: &mut f32,
+    depth: usize,
+    fx: &FxScope,
+    actions: &mut Actions,
+) {
+    let t = app.tokens;
+    for c in &g.children {
+        let r = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), ROW));
+        match c {
+            Node::Prop(pr) => {
+                if matches!(pr.ui, ParamUi::Hidden) || pr.three_d_only && !layer.is_3d() || !fx.shown(layer, ectx, &pr.match_id) {
+                    continue;
+                }
+                *y += ROW;
+                let indent = PARAM_NAME_X - 13.0 + TREE_INDENT * depth as f32;
+                let visible = !(r.max.y < rect.min.y || r.min.y > rect.max.y);
+                if visible {
+                    app.auto.add(&format!("effectControls.row.{}", pr.uid), r, &pr.name);
+                    let dims = prop_row(app, ui, p, layer, g, pr, ectx, r, indent, actions);
+                    // A Timeline pick whip can be dropped here (After Effects).
+                    crate::panels::timeline::whip_target(ui.ctx(), r.intersect(rect), layer.id.0, pr.uid, dims);
+                }
+                if app.ui.fx_slider_open.contains(&pr.uid) {
+                    if matches!(pr.ui, ParamUi::Angle) {
+                        let sr = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), DIAL_ROW));
+                        *y += DIAL_ROW;
+                        if sr.max.y >= rect.min.y && sr.min.y <= rect.max.y {
+                            dial_row(app, ui, layer, pr, ectx, sr, indent + 22.0, actions);
+                        }
+                    } else if matches!(pr.ui, ParamUi::Slider { .. }) {
+                        let sr = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), 34.0));
+                        *y += 34.0;
+                        if sr.max.y >= rect.min.y && sr.min.y <= rect.max.y {
+                            slider_row(app, ui, p, layer, pr, ectx, sr, indent + 22.0, actions);
+                        }
+                    }
+                }
+            }
+            Node::Group(sg) => {
+                // Paint strokes live in the Timeline only (AE's Paint shows Paint on Transparent).
+                if effectcraft_engine::effects::paint::is_paint(g) || !fx.shown(layer, ectx, &sg.match_id) {
+                    continue;
+                }
+                *y += ROW;
+                let open = !app.ui.fx_closed.contains(&sg.uid);
+                let tw = Rect::from_center_size(pos2(r.min.x + PARAM_NAME_X - 12.0 + TREE_INDENT * depth as f32, r.center().y), vec2(12.0, 12.0));
+                if r.max.y >= rect.min.y && r.min.y <= rect.max.y {
+                    app.auto.add(&format!("effectControls.row.{}", sg.uid), r, &sg.name);
+                    app.auto.add(&format!("effectControls.group.{}.twirl", sg.uid), tw, &sg.name);
+                    if widgets::twirl(ui, tw, open, egui::Id::unique(("ec-g", sg.uid)), &t).clicked() {
+                        toggle_closed(app, sg, open, ui.input(|i| i.modifiers.alt || i.modifiers.command));
+                    }
+                    let name = p.text(pos2(tw.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, &sg.name, Tokens::ui(12.0), t.text);
+                    app.auto.add(&format!("effectControls.group.{}.name", sg.uid), name, &sg.name);
+                }
+                if open {
+                    let sub = fx.sub(&sg.match_id);
+                    // A visual editor for the group's hidden parameters (Lumetri curves, …).
+                    let eh = crate::panels::fx_editors::inline_height(fx.effect, &sub.path, rect.width());
+                    if eh > 0.0 {
+                        let er = Rect::from_min_size(pos2(rect.min.x, *y), vec2(rect.width(), eh));
+                        *y += eh;
+                        if er.max.y >= rect.min.y && er.min.y <= rect.max.y {
+                            crate::panels::fx_editors::inline_editor(app, ui, p, layer, fx.root, sg, fx.effect, &sub.path, ectx, er, actions);
+                        }
+                    }
+                    group_rows(app, ui, p, layer, sg, ectx, rect, y, depth + 1, &sub, actions);
+                }
+            }
+        }
+    }
+}
diff --git a/crates/ui-egui/src/panels/effect_controls/viewer.rs b/crates/ui-egui/src/panels/effect_controls/viewer.rs
new file mode 100644
index 000000000..b11b63a35
--- /dev/null
+++ b/crates/ui-egui/src/panels/effect_controls/viewer.rs
@@ -0,0 +1,295 @@
+use std::ops::ControlFlow;
+
+use super::common::{Actions, effect_active, gesture_key};
+use super::rows::FxScope;
+use super::{
+    Align2, Color32, EffectcraftApp, EvalCtx, GroupKind, Layer, Mat3, Node, ParamUi, PropGroup, Property, Rect, Sense, Stroke, Tokens, fw, json, vec2,
+};
+
+// ---------------------------------------------------------------------------------------------
+// Viewer hook
+
+/// Collect point controls through visible parameter groups. Hidden optional slots do not
+/// leave stray viewport handles. The depth cap also bounds malformed project trees.
+fn visible_points<'a>(g: &'a PropGroup, scope: &FxScope<'_>, layer: &Layer, ectx: &EvalCtx, depth: usize, out: &mut Vec<&'a Property>) {
+    if depth > 16 {
+        return;
+    }
+    for node in &g.children {
+        match node {
+            Node::Prop(p) if matches!(p.ui, ParamUi::Point) && scope.shown(layer, ectx, &p.match_id) => out.push(p),
+            Node::Group(child) if child.enabled && scope.shown(layer, ectx, &child.match_id) => {
+                visible_points(child, &scope.sub(&child.match_id), layer, ectx, depth + 1, out)
+            }
+            _ => {}
+        }
+    }
+}
+
+/// An armed crosshair / eyedropper pick: the hint chip, the cursor preview, and the click that
+/// sets or samples. `Break` when the picked layer is gone; `Continue` carries the point preview.
+fn fx_pick_session(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    painter: &egui::Painter,
+    map: &crate::panels::viewer::ViewerMap,
+    ectx: &EvalCtx,
+    l2c: &dyn Fn(&EvalCtx, &Layer) -> Mat3,
+    actions: &mut Actions,
+) -> ControlFlow<(), Option<egui::Pos2>> {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let mut point_preview = None;
+    let Some(pick) = app.ui.fx_pick.clone() else {
+        return ControlFlow::Continue(None);
+    };
+    let Some(layer) = ectx.comp.layer(effectcraft_engine::project::LayerId(pick.layer)).cloned() else {
+        app.ui.fx_pick = None;
+        return ControlFlow::Break(());
+    };
+    // Keyers pick from their input (the shown frame is already keyed): `effect.pickColor`.
+    let keyer = (pick.kind == "color")
+        .then(|| layer.effects()?.groups().find(|g| g.find(pick.prop).is_some()))
+        .flatten()
+        .filter(|g| effectcraft_engine::effects::find(&g.match_id).is_some_and(|s| s.category == "Keying"))
+        .map(|g| g.uid);
+    if pick.kind == "color" && keyer.is_none() {
+        // GPU frames: read the shown frame back for sampling.
+        app.viewer_pixels();
+    }
+    let resp = ui.interact(map.area, egui::Id::unique("viewer-fx-pick"), Sense::click());
+    app.auto.add("viewer.fxPick", map.area, &pick.name);
+    let hint = if pick.kind == "point" { format!("Click to set {}", pick.name) } else { format!("Click to sample {}", pick.name) };
+    let chip = Rect::from_min_size(map.area.min + vec2(10.0, 10.0), vec2(220.0, 22.0));
+    painter.rect_filled(chip, 11.0, Color32::from_black_alpha(180));
+    painter.text(chip.center(), Align2::CENTER_CENTER, hint, Tokens::ui(11.5), t.text);
+    if let Some(hp) = resp.hover_pos() {
+        ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
+        let c = map.to_comp(hp);
+        app.pointer_comp = Some([c[0] as f32, c[1] as f32]);
+        if pick.kind == "point" && fw::comp_to_layer(&l2c(ectx, &layer), c).is_some() {
+            point_preview = Some(hp);
+        }
+        if pick.kind == "color"
+            && keyer.is_none()
+            && let Some(img) = &app.viewer_image
+            && let Some(s) = fw::sample_frame(img, crate::panels::viewer_tools::shown_region(&ctx, map.comp), c)
+        {
+            let sw = Rect::from_min_size(hp + vec2(14.0, 14.0), vec2(26.0, 18.0));
+            painter.rect_filled(sw, 2.0, Color32::from_rgb((s[0] * 255.0) as u8, (s[1] * 255.0) as u8, (s[2] * 255.0) as u8));
+            painter.rect_stroke(sw, 2.0, Stroke::new(1.0, Color32::WHITE), egui::StrokeKind::Outside);
+        }
+    }
+    // No frame to sample yet (it is still rendering, or its readback is pending): the click
+    // leaves the eyedropper armed instead of using it up without a colour.
+    let unsampled = pick.kind == "color" && keyer.is_none() && app.viewer_image.is_none();
+    if resp.clicked()
+        && !unsampled
+        && let Some(pos) = resp.interact_pointer_pos()
+    {
+        let c = map.to_comp(pos);
+        // Effect points and the keyer's input are in effect space.
+        let m = crate::panels::viewer::from_effect_space(ectx, &layer, l2c(ectx, &layer));
+        if pick.kind == "point" {
+            if let Some(lp) = fw::comp_to_layer(&m, c) {
+                actions.push(("prop.set".into(), json!({"layer": pick.layer, "prop": pick.prop, "value": [lp[0], lp[1]]})));
+            }
+        } else if let Some(fx) = keyer {
+            // Ctrl/Cmd+click averages the 5 × 5 pixels around the point.
+            if let Some(lp) = fw::comp_to_layer(&m, c) {
+                let average = ui.input(|i| i.modifiers.command);
+                actions.push((
+                    "effect.pickColor".into(),
+                    json!({"layer": pick.layer, "effect": fx, "prop": pick.prop, "x": lp[0], "y": lp[1], "average": average}),
+                ));
+            }
+        } else if let Some(img) = &app.viewer_image
+            && let Some(s) = fw::sample_frame(img, crate::panels::viewer_tools::shown_region(&ctx, map.comp), c)
+        {
+            actions.push(("prop.set".into(), json!({"layer": pick.layer, "prop": pick.prop, "value": [s[0], s[1], s[2], 1.0]})));
+        }
+        app.ui.fx_pick = None;
+        app.ui.status.clear();
+    }
+    if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+        app.ui.fx_pick = None;
+        app.ui.status.clear();
+    }
+
+    ControlFlow::Continue(point_preview)
+}
+
+/// An armed text-colour pick: sample the shown frame on click, Esc cancels.
+fn text_color_pick(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    painter: &egui::Painter,
+    map: &crate::panels::viewer::ViewerMap,
+    ectx: &EvalCtx,
+    actions: &mut Actions,
+) {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let Some(pick) = app.ui.text_color_pick.clone() else {
+        return;
+    };
+    if ectx.comp.layer(effectcraft_engine::project::LayerId(pick.layer)).is_none() {
+        app.ui.text_color_pick = None;
+        app.ui.status.clear();
+    } else {
+        app.viewer_pixels();
+        let resp = ui.interact(map.area, egui::Id::unique("viewer-text-color-pick"), Sense::click());
+        app.auto.add("viewer.textColorPick", map.area, &pick.field);
+        let chip = Rect::from_min_size(map.area.min + vec2(10.0, 10.0), vec2(220.0, 22.0));
+        painter.rect_filled(chip, 11.0, Color32::from_black_alpha(180));
+        painter.text(chip.center(), Align2::CENTER_CENTER, crate::i18n::tr_args("Click to sample text {}", &[&pick.field]), Tokens::ui(11.5), t.text);
+        if let Some(pos) = resp.hover_pos() {
+            ctx.set_cursor_icon(egui::CursorIcon::Crosshair);
+            let c = map.to_comp(pos);
+            app.pointer_comp = Some([c[0] as f32, c[1] as f32]);
+            if let Some(img) = &app.viewer_image
+                && let Some(s) = fw::sample_frame(img, crate::panels::viewer_tools::shown_region(&ctx, map.comp), c)
+            {
+                let sw = Rect::from_min_size(pos + vec2(14.0, 14.0), vec2(26.0, 18.0));
+                painter.rect_filled(sw, 2.0, Color32::from_rgb((s[0] * 255.0) as u8, (s[1] * 255.0) as u8, (s[2] * 255.0) as u8));
+                painter.rect_stroke(sw, 2.0, Stroke::new(1.0, Color32::WHITE), egui::StrokeKind::Outside);
+            }
+        }
+        if resp.clicked()
+            && let Some(pos) = resp.interact_pointer_pos()
+            && let Some(img) = &app.viewer_image
+            && let Some(s) = fw::sample_frame(img, crate::panels::viewer_tools::shown_region(&ctx, map.comp), map.to_comp(pos))
+        {
+            let mut params = json!({"layer": pick.layer});
+            params[&pick.field] = json!([s[0], s[1], s[2]]);
+            if let Some(range) = pick.range {
+                params["range"] = json!(range);
+            }
+            actions.push(("layer.setText".into(), params));
+            app.ui.text_color_pick = None;
+            app.ui.status.clear();
+        }
+        if ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+            app.ui.text_color_pick = None;
+            app.ui.status.clear();
+        }
+    }
+}
+
+/// Effect Controls' part of the Composition viewer, called by the viewer after its own
+/// interaction (so these controls sit on top):
+///
+/// - while a crosshair pick is armed, its handle previews the cursor position without editing
+///   the property; the next click sets the point in layer space, and Esc cancels;
+/// - an eyedropper pick samples the frame's colour on click;
+/// - otherwise, the point parameters of the selected effects are drawn as draggable ⊕ controls.
+///
+/// `l2c` is the viewer's layer→comp matrix (it knows the 3D view).
+pub fn viewer_hook(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    painter: &egui::Painter,
+    map: &crate::panels::viewer::ViewerMap,
+    ectx: &EvalCtx,
+    l2c: &dyn Fn(&EvalCtx, &Layer) -> Mat3,
+) {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let mut actions: Actions = vec![];
+    let point_preview = match fx_pick_session(app, ui, painter, map, ectx, l2c, &mut actions) {
+        ControlFlow::Break(()) => return,
+        ControlFlow::Continue(p) => p,
+    };
+    text_color_pick(app, ui, painter, map, ectx, &mut actions);
+    let picking = app.ui.fx_pick.is_some() || app.ui.text_color_pick.is_some();
+    let point_pick = app.ui.fx_pick.clone().filter(|p| p.kind == "point");
+    if app.ui.viewer.show_layer_controls || point_pick.is_some() {
+        // ⊕ controls for the point parameters of the selected effects.
+        let mut sel = app.session.state.selected_props.clone();
+        if let Some(pick) = &point_pick {
+            sel.push((effectcraft_engine::project::LayerId(pick.layer), pick.prop));
+        }
+        let selected = app.session.state.selected_layers.clone();
+        for layer in ectx
+            .comp
+            .layers
+            .iter()
+            .filter(|l| (selected.contains(&l.id) || point_pick.as_ref().is_some_and(|p| p.layer == l.id.0)) && l.is_active_at(ectx.time))
+        {
+            let Some(fx) = layer.effects() else { continue };
+            let m = l2c(ectx, layer);
+            // Masks are in layer space, effect points in effect space.
+            let fm = crate::panels::viewer::from_effect_space(ectx, layer, m);
+            let picked_prop = point_pick.as_ref().filter(|p| p.layer == layer.id.0).map(|p| p.prop);
+            for g in fx.groups().filter(|g| g.enabled && effect_active(g, layer.id, &sel)) {
+                // Puppet owns its pin handles and hit testing. Generic crosshairs would
+                // overlap the pins and steal their selection/rotation/scale gestures.
+                if matches!(&g.kind, GroupKind::Effect { effect } if effect == effectcraft_engine::effects::puppet::ID) {
+                    continue;
+                }
+                if !picking
+                    && app.ui.viewer.show_layer_controls
+                    && matches!(&g.kind, GroupKind::Effect { effect } if effect == crate::panels::fx_editors::RESHAPE)
+                {
+                    crate::panels::fx_editors::reshape_overlay(app, ui, painter, map, ectx, layer, g, &m, &mut actions);
+                }
+                if !picking
+                    && app.ui.viewer.show_layer_controls
+                    && matches!(&g.kind, GroupKind::Effect { effect } if effect == crate::panels::fx_editors::MESH_WARP)
+                {
+                    crate::panels::fx_editors::mesh_warp_overlay(app, ui, painter, map, ectx, layer, g, &fm, &mut actions);
+                }
+                let scope = FxScope { effect: &g.match_id, root: g, path: String::new() };
+                let mut pts = Vec::new();
+                visible_points(g, &scope, layer, ectx, 0, &mut pts);
+                // An explicit pick stays visible even when View > Show Layer Controls is off.
+                if !app.ui.viewer.show_layer_controls {
+                    pts.retain(|pr| picked_prop == Some(pr.uid));
+                }
+                let screen: Vec<egui::Pos2> = pts
+                    .iter()
+                    .map(|pr| {
+                        if picked_prop == Some(pr.uid)
+                            && let Some(pos) = point_preview
+                        {
+                            return pos;
+                        }
+                        let v = ectx.value(layer, pr).as_vec2();
+                        map.to_screen(fw::layer_to_comp(&fm, v))
+                    })
+                    .collect();
+                // Gradient Ramp and friends: a guide between start and end points.
+                if screen.len() == 2 && matches!(&g.kind, GroupKind::Effect { effect } if effect.contains("gradient") || effect.contains("ramp")) {
+                    painter.line_segment([screen[0], screen[1]], Stroke::new(1.0, Color32::from_white_alpha(110)));
+                }
+                for (pr, s) in pts.iter().zip(screen) {
+                    let hr = Rect::from_center_size(s, vec2(16.0, 16.0));
+                    let id = egui::Id::unique(("viewer-fx-pt", pr.uid));
+                    // The picker owns the click. Preview handles must not steal it or start a drag.
+                    let resp = (!picking).then(|| ui.interact(hr, id, Sense::drag()));
+                    let col = if picked_prop == Some(pr.uid) || resp.as_ref().is_some_and(|r| r.hovered() || r.dragged()) { t.accent } else { Color32::WHITE };
+                    fw::draw_crosshair(painter, s + vec2(1.0, 1.0), 5.0, Color32::from_black_alpha(160));
+                    fw::draw_crosshair(painter, s, 5.0, col);
+                    app.auto.add(&format!("viewer.effectPoint.{}", pr.uid), hr, &pr.name);
+                    let Some(resp) = resp else { continue };
+                    if resp.hovered() {
+                        ctx.set_cursor_icon(egui::CursorIcon::Move);
+                        resp.clone().on_hover_text(format!("{}: {}", crate::i18n::effects::group(&g.match_id, &g.name), pr.name));
+                    }
+                    if resp.dragged()
+                        && let Some(pos) = resp.interact_pointer_pos()
+                        && let Some(lp) = fw::comp_to_layer(&fm, map.to_comp(pos))
+                    {
+                        let key = gesture_key(ui, id, resp.drag_started());
+                        actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": [lp[0], lp[1]], "merge": key})));
+                    }
+                }
+            }
+        }
+    }
+    for (id, params) in actions {
+        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
+            app.ui.status = e;
+        }
+    }
+}
diff --git a/crates/ui-egui/src/panels/effects_presets.rs b/crates/ui-egui/src/panels/effects_presets.rs
index 8eecfd091..380d1d869 100644
--- a/crates/ui-egui/src/panels/effects_presets.rs
+++ b/crates/ui-egui/src/panels/effects_presets.rs
@@ -2,8 +2,8 @@
 //! filters, animation presets on/off, categories or alphabetical, refresh), Favorites (star an
 //! effect), Recently Used, "* Animation Presets" (EffectCraft's own text animation and transition
 //! presets and the user's `.ecpreset` files) and the effect categories. Double-click applies to the
-//! selected layers; dragging an effect onto a layer (timeline, viewer, Effect Controls) applies
-//! it there.
+//! selected layers; dragging an effect or an animation preset onto a layer (timeline, viewer,
+//! Effect Controls) applies it there.
 
 use crate::i18n::tr;
 use egui::{Align2, Color32, Rect, Sense, Stroke, pos2, vec2};
@@ -11,7 +11,7 @@ use serde_json::json;
 use std::sync::Arc;
 
 use crate::icons::{self, Icon};
-use crate::panels::DragPayload;
+use crate::panels::{DragPayload, PresetRef};
 use crate::theme::Tokens;
 use crate::{EffectcraftApp, widgets};
 
@@ -108,10 +108,8 @@ fn highlighted(p: &egui::Painter, pos: egui::Pos2, name: &str, query: &str, t: &
 
 enum Apply {
     Effect(String),
-    TextPreset(String),
-    /// A built-in animation preset (Transitions…) by id.
-    Builtin(String),
-    PresetFile(String),
+    /// A text, built-in (Transitions…) or user file animation preset.
+    Preset(PresetRef),
 }
 
 /// A folder row; returns whether it is open.
@@ -135,7 +133,7 @@ fn folder_row(
     if r.max.y < list.min.y || r.min.y > list.max.y {
         return open;
     }
-    let resp = ui.interact(r.intersect(list), egui::Id::new(("fxcat", key)), Sense::click());
+    let resp = ui.interact(r.intersect(list), egui::Id::unique(("fxcat", key)), Sense::click());
     if resp.hovered() {
         lp.rect_filled(r, 0.0, t.hover);
     }
@@ -181,7 +179,7 @@ fn effect_row(
         return;
     }
     let star = Rect::from_center_size(pos2(r.max.x - 38.0, r.center().y), vec2(16.0, 16.0));
-    let resp = ui.interact(r.intersect(list), egui::Id::new((auto_prefix, e.id)), Sense::click_and_drag());
+    let resp = ui.interact(r.intersect(list), egui::Id::unique((auto_prefix, e.id)), Sense::click_and_drag());
     if resp.hovered() {
         lp.rect_filled(r, 0.0, t.hover);
     }
@@ -195,19 +193,17 @@ fn effect_row(
     }
     app.auto.add(&format!("{auto_prefix}.{}", e.id), r, e.name);
     // Favourite star (always shown when starred, else on hover).
-    let fav = app.ui.effects_favorites.contains(e.id);
-    let sresp = ui.interact(star.intersect(list), egui::Id::new((auto_prefix, e.id, "star")), Sense::click());
+    let fav = app.session.prefs.is_effect_favorite(e.id);
+    let sresp = ui.interact(star.intersect(list), egui::Id::unique((auto_prefix, e.id, "star")), Sense::click());
     if fav || resp.hovered() || sresp.hovered() {
         let gold = Color32::from_rgb(0xe8, 0xc0, 0x40);
         filled_star(lp, star.center(), 6.0, fav.then_some(gold), if fav || sresp.hovered() { gold } else { t.text_faint });
     }
     app.auto.add(&format!("{auto_prefix}.{}.star", e.id), star, if fav { "Remove from Favorites" } else { "Add to Favorites" });
     if sresp.clicked() {
-        if fav {
-            app.ui.effects_favorites.remove(e.id);
-        } else {
-            app.ui.effects_favorites.insert(e.id.to_string());
-        }
+        // Kept in the settings, so the stars are there next time (#1692).
+        app.session.prefs.toggle_effect_favorite(e.id);
+        app.session.save_prefs();
         return;
     }
     if resp.double_clicked() {
@@ -218,7 +214,7 @@ fn effect_row(
     }
 }
 
-/// A preset row (no drag; double-click applies).
+/// A preset row: double-click applies to the selected layers; drag it onto a layer to apply it there.
 #[allow(clippy::too_many_arguments)]
 fn preset_row(
     app: &mut EffectcraftApp,
@@ -229,7 +225,7 @@ fn preset_row(
     name: &str,
     auto_id: &str,
     query: &str,
-    on_apply: impl FnOnce() -> Apply,
+    preset: PresetRef,
     apply: &mut Option<Apply>,
 ) {
     let t = app.tokens;
@@ -238,21 +234,24 @@ fn preset_row(
     if r.max.y < list.min.y || r.min.y > list.max.y {
         return;
     }
-    let resp = ui.interact(r.intersect(list), egui::Id::new(("fxpreset", auto_id)), Sense::click());
+    let resp = ui.interact(r.intersect(list), egui::Id::unique(("fxpreset", auto_id)), Sense::click_and_drag());
     if resp.hovered() {
         lp.rect_filled(r, 0.0, t.hover);
     }
     icons::paint(lp, Rect::from_center_size(pos2(r.min.x + 58.0, r.center().y), vec2(12.0, 12.0)), Icon::Keyframe, t.text_dim);
     highlighted(lp, pos2(r.min.x + 70.0, r.center().y), name, query, &t);
     app.auto.add(auto_id, r, name);
+    if resp.drag_started() {
+        egui::DragAndDrop::set_payload(ui.ctx(), DragPayload::Preset { preset: preset.clone(), name: name.to_string() });
+    }
     if resp.double_clicked() {
-        *apply = Some(on_apply());
+        *apply = Some(Apply::Preset(preset));
     }
 }
 
 /// User preset files, rescanned every few seconds (and on Refresh List).
 fn user_presets(ctx: &egui::Context, force: bool, scan: impl FnOnce() -> Vec<PresetFile>) -> Arc<Vec<PresetFile>> {
-    let id = egui::Id::new("fx-user-presets");
+    let id = egui::Id::unique("fx-user-presets");
     let now = ctx.input(|i| i.time);
     if !force
         && let Some((at, v)) = ctx.data(|d| d.get_temp::<(f64, Arc<Vec<PresetFile>>)>(id))
@@ -265,25 +264,13 @@ fn user_presets(ctx: &egui::Context, force: bool, scan: impl FnOnce() -> Vec<Pre
     v
 }
 
-pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
-    let t = app.tokens;
-    let ctx = ui.ctx().clone();
-    let p = ui.painter().clone();
-    // Track the last applied effect (menus, drag and drop, the control channel) as recently used.
-    if let Some(last) = app.session.state.last_effect.clone()
-        && app.ui.effects_recent.first() != Some(&last)
-    {
-        push_recent(&mut app.ui.effects_recent, &last);
-    }
-    let sr = Rect::from_min_size(rect.min + vec2(8.0, 8.0), vec2(rect.width() - 44.0, 24.0));
-    let mut q = app.ui.effects_search.clone();
-    widgets::search_field(ui, sr, &mut q, "Search effects and presets", &t);
-    app.ui.effects_search = q.clone();
-    app.auto.add("effects.search", sr, "Search");
+/// The "Effects & Presets options" hamburger menu beside the search field; returns whether
+/// "Refresh List" was picked.
+fn contents_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, ctx: &egui::Context, rect: Rect, sr: Rect, t: &Tokens) -> bool {
     // Contents menu.
     let mr = Rect::from_center_size(pos2(rect.max.x - 18.0, sr.center().y), vec2(22.0, 22.0));
-    let mpop = egui::Id::new("fx-contents-menu");
-    if widgets::icon_button(ui, mr, Icon::Hamburger, false, &t, egui::Id::new("fx-menu")).on_hover_text(tr("Effects & Presets options")).clicked() {
+    let mpop = egui::Id::unique("fx-contents-menu");
+    if widgets::icon_button(ui, mr, Icon::Hamburger, false, t, egui::Id::unique("fx-menu")).on_hover_text(tr("Effects & Presets options")).clicked() {
         widgets::open_popup(ui, mpop);
     }
     app.auto.add("effects.menu", mr, "Effects & Presets options");
@@ -333,7 +320,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let v = &mut app.ui.effects_view;
         match i {
             i if menu.get(i) == Some(&copy_label) => {
-                if let Err(e) = crate::menus::invoke(app, &ctx, "effects.copyPresetsFolderPath", json!({})) {
+                if let Err(e) = crate::menus::invoke(app, ctx, "effects.copyPresetsFolderPath", json!({})) {
                     app.ui.status = e;
                 }
             }
@@ -348,10 +335,36 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             _ => {}
         }
     }
+    force_scan
+}
+
+/// The Effects & Presets panel: search, a contents menu (colour-depth and GPU filters, whether
+/// presets show, categories or one alphabetical list, refresh and clear of the recently used
+/// list), then Favourites, Recently Used, Animation Presets and the effects by category or
+/// alphabetically, filtered by the query. Picking an effect or preset applies it to the selection
+/// (`effect.apply` or the preset's own command); applying an effect also records it as recently
+/// used and opens Effect Controls. Without a selected layer it only reports that in
+/// `app.ui.status`.
+pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let p = ui.painter().clone();
+    // Track the last applied effect (menus, drag and drop, the control channel) as recently used.
+    if let Some(last) = app.session.state.last_effect.clone()
+        && app.ui.effects_recent.first() != Some(&last)
+    {
+        push_recent(&mut app.ui.effects_recent, &last);
+    }
+    let sr = Rect::from_min_size(rect.min + vec2(8.0, 8.0), vec2(rect.width() - 44.0, 24.0));
+    let mut q = app.ui.effects_search.clone();
+    widgets::search_field(ui, sr, &mut q, "Search effects and presets", &t);
+    app.ui.effects_search = q.clone();
+    app.auto.add("effects.search", sr, "Search");
+    let force_scan = contents_menu(app, ui, &ctx, rect, sr, &t);
     let view = app.ui.effects_view.clone();
     let list = Rect::from_min_max(pos2(rect.min.x, sr.max.y + 6.0), rect.max);
     let lp = p.with_clip_rect(list);
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("fx-scroll"), list);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("fx-scroll"), list);
     let query = q.trim().to_lowercase();
     let searching = !query.is_empty();
     let mut y = list.min.y - scroll.offset;
@@ -364,7 +377,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let lookup = |id: &str| reg.iter().find(|e| e.id == id);
 
     // Favorites and Recently Used.
-    let favs: Vec<_> = app.ui.effects_favorites.iter().filter_map(|id| lookup(id)).filter(|e| keep(e)).collect();
+    let favs: Vec<_> = app.session.prefs.effects_favorites.iter().filter_map(|id| lookup(id)).filter(|e| keep(e)).collect();
     if !favs.is_empty() && folder_row(app, ui, &lp, list, &mut y, "favorites", "Favorites", 0.0, searching, Some(Icon::Star)) {
         let mut favs = favs;
         favs.sort_by_key(|e| e.name);
@@ -397,7 +410,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         if any && folder_row(app, ui, &lp, list, &mut y, "presets", "* Animation Presets", 0.0, searching, None) {
             if !text.is_empty() && folder_row(app, ui, &lp, list, &mut y, "presets/Text", "Text", 14.0, searching, None) {
                 for (id, name) in text {
-                    preset_row(app, ui, &lp, list, &mut y, &name, &format!("effects.preset.text.{id}"), &query, || Apply::TextPreset(id.clone()), &mut apply);
+                    preset_row(app, ui, &lp, list, &mut y, &name, &format!("effects.preset.text.{id}"), &query, PresetRef::Text(id.clone()), &mut apply);
                 }
             }
             for cat in &categories {
@@ -405,7 +418,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     continue;
                 }
                 for (id, name, _) in builtin.iter().filter(|(_, _, c)| c == cat) {
-                    preset_row(app, ui, &lp, list, &mut y, name, &format!("effects.preset.builtin.{id}"), &query, || Apply::Builtin(id.clone()), &mut apply);
+                    preset_row(app, ui, &lp, list, &mut y, name, &format!("effects.preset.builtin.{id}"), &query, PresetRef::Builtin(id.clone()), &mut apply);
                 }
             }
             if !files.is_empty() && folder_row(app, ui, &lp, list, &mut y, "presets/User", "User Presets", 14.0, searching, None) {
@@ -419,7 +432,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                         &f.name,
                         &format!("effects.preset.file.{}", f.name),
                         &query,
-                        || Apply::PresetFile(f.path.clone()),
+                        PresetRef::File(f.path.clone()),
                         &mut apply,
                     );
                 }
@@ -457,11 +470,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     let content = y + scroll.offset - list.min.y;
     scroll.end(ui, &mut app.auto, "effects.scroll", content, &t);
-    if let Some(DragPayload::Effect(id)) = egui::DragAndDrop::payload::<DragPayload>(&ctx).as_deref()
-        && let Some(pos) = ctx.pointer_hover_pos()
+    if let Some(name) = egui::DragAndDrop::payload::<DragPayload>(&ctx).and_then(|p| match p.as_ref() {
+        DragPayload::Effect(id) => Some(effectcraft_engine::effects::find(id).map(|e| crate::i18n::effects::name(e.id, e.name)).unwrap_or_default()),
+        DragPayload::Preset { name, .. } => Some(name.clone()),
+        _ => None,
+    }) && let Some(pos) = ctx.pointer_hover_pos()
     {
-        let name = effectcraft_engine::effects::find(id).map(|e| crate::i18n::effects::name(e.id, e.name)).unwrap_or_default();
-        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("dnd-fx")));
+        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("dnd-fx")));
         let g = painter.layout_no_wrap(name, Tokens::ui(12.0), t.text);
         let r = Rect::from_min_size(pos + vec2(12.0, 8.0), g.size() + vec2(16.0, 8.0));
         painter.rect_filled(r, 4.0, Color32::from_rgba_premultiplied(40, 40, 40, 230));
@@ -475,9 +490,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     let (cmd, params) = match &apply {
         Apply::Effect(id) => ("effect.apply", json!({"effect": id})),
-        Apply::TextPreset(id) => ("layer.applyTextPreset", json!({"preset": id})),
-        Apply::Builtin(id) => ("anim.applyBuiltinPreset", json!({"preset": id})),
-        Apply::PresetFile(path) => ("anim.applyPreset", json!({"path": path})),
+        Apply::Preset(preset) => preset.command(),
     };
     match app.session.execute(cmd, params) {
         Err(e) => app.ui.status = e.to_string(),
@@ -583,7 +596,7 @@ mod tests {
         for _ in 0..5 {
             let start = std::time::Instant::now();
             for _ in 0..1000 {
-                let (_, shared) = ctx.data(|d| d.get_temp::<(f64, Arc<Vec<PresetFile>>)>(egui::Id::new("fx-user-presets"))).unwrap();
+                let (_, shared) = ctx.data(|d| d.get_temp::<(f64, Arc<Vec<PresetFile>>)>(egui::Id::unique("fx-user-presets"))).unwrap();
                 std::hint::black_box((*shared).clone());
             }
             before.push(start.elapsed());
diff --git a/crates/ui-egui/src/panels/essential.rs b/crates/ui-egui/src/panels/essential.rs
index 2e99c7d39..a08b96b62 100644
--- a/crates/ui-egui/src/panels/essential.rs
+++ b/crates/ui-egui/src/panels/essential.rs
@@ -56,6 +56,11 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 }
 
+/// The Essential Graphics panel's contents for the Primary (else active) comp: its name and Solo
+/// toggle, the template name, the controls list with its drop target for Timeline properties, the
+/// Add Formatting / Add Selected As / Media Replacement / Export Template buttons and the selected
+/// instance's properties. Returns the `essential.*` commands to run directly and the ones that go
+/// through the menu/frontend layer; with no comp it shows a hint and returns empty lists.
 fn body(app: &mut EffectcraftApp, ui: &mut egui::Ui) -> (Actions, Actions) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -71,7 +76,7 @@ fn body(app: &mut EffectcraftApp, ui: &mut egui::Ui) -> (Actions, Actions) {
     // ---- Primary + Solo.
     ui.horizontal(|ui| {
         ui.label(RichText::new(tr("Primary:")).color(t.text_dim));
-        let r = egui::ComboBox::from_id_salt("eg-primary").selected_text(&comp_name).width(150.0).show_ui(ui, |ui| {
+        let r = craft_ui::ComboBox::from_id_salt("eg-primary").selected_text(&comp_name).width(150.0).show_ui(ui, |ui| {
             for (id, _) in project.comps() {
                 let name = project.item(*id).map(|i| i.name.clone()).unwrap_or_default();
                 if ui.selectable_label(*id == cid, name).clicked() {
@@ -79,6 +84,10 @@ fn body(app: &mut EffectcraftApp, ui: &mut egui::Ui) -> (Actions, Actions) {
                 }
             }
         });
+        // The label beside the combo names it for a screen reader; the selected comp alone
+        // doesn't say what the dropdown chooses. Keep the visible label and value together.
+        let primary_name = format!("{} {}", tr("Primary:"), comp_name);
+        r.response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, ui.is_enabled(), &primary_name));
         app.auto.add("essential.primary", r.response.rect, &comp_name);
     });
     let solo = app.session.state.essential_solo;
@@ -90,7 +99,7 @@ fn body(app: &mut EffectcraftApp, ui: &mut egui::Ui) -> (Actions, Actions) {
     // ---- Name.
     let eg = project.comp(cid).and_then(|c| c.essential.clone()).unwrap_or_default();
     let shown_name = if eg.name.is_empty() { comp_name.clone() } else { eg.name.clone() };
-    let name_id = egui::Id::new("eg-name-buf");
+    let name_id = egui::Id::unique("eg-name-buf");
     let mut name: String = ctx.data(|d| d.get_temp(name_id)).unwrap_or_else(|| shown_name.clone());
     let r = ui.add(egui::TextEdit::singleline(&mut name).hint_text(tr("Template name")).desired_width(f32::INFINITY));
     app.auto.add("essential.name", r.rect, &shown_name);
@@ -291,7 +300,7 @@ fn link_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, cid: ItemId, c: &EgCon
 
 /// A control's name; double-click to rename (comments: edit the text).
 fn name_label(app: &mut EffectcraftApp, ui: &mut egui::Ui, cid: ItemId, c: &EgControl, text: RichText, actions: &mut Actions) {
-    let edit_id = egui::Id::new(("eg-rename", c.id));
+    let edit_id = egui::Id::unique(("eg-rename", c.id));
     let editing: Option<String> = ui.ctx().data(|d| d.get_temp(edit_id));
     match editing {
         Some(mut buf) => {
@@ -329,7 +338,7 @@ fn value_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, auto: &str, ty: Opt
                 KV::Str(s) => s.clone(),
                 _ => String::new(),
             };
-            let id = egui::Id::new(("eg-text", auto));
+            let id = egui::Id::unique(("eg-text", auto));
             let mut buf: String = ui.ctx().data(|d| d.get_temp(id)).unwrap_or_else(|| cur.clone());
             let r = ui.add(egui::TextEdit::singleline(&mut buf).desired_width(140.0));
             if r.has_focus() {
@@ -365,7 +374,7 @@ fn value_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, auto: &str, ty: Opt
                 _ => vec![],
             };
             let cur = v.as_enum() as usize;
-            let r = egui::ComboBox::from_id_salt(("eg-dd", auto)).selected_text(opts.get(cur).cloned().unwrap_or_default()).show_ui(ui, |ui| {
+            let r = craft_ui::ComboBox::from_id_salt(("eg-dd", auto)).selected_text(opts.get(cur).cloned().unwrap_or_default()).show_ui(ui, |ui| {
                 for (i, o) in opts.iter().enumerate() {
                     if ui.selectable_label(i == cur, o).clicked() {
                         out = Some(json!(i));
@@ -428,7 +437,7 @@ fn value_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, auto: &str, ty: Opt
             let fams = effectcraft_engine::text::fonts::families();
             let mut d = (**doc).clone();
             let mut changed = false;
-            let r1 = egui::ComboBox::from_id_salt(("eg-font", auto)).selected_text(&d.font).width(110.0).show_ui(ui, |ui| {
+            let r1 = craft_ui::ComboBox::from_id_salt(("eg-font", auto)).selected_text(&d.font).width(110.0).show_ui(ui, |ui| {
                 for (f, _) in &fams {
                     if ui.selectable_label(*f == d.font, f).clicked() {
                         d.font = f.clone();
@@ -437,7 +446,7 @@ fn value_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, auto: &str, ty: Opt
                 }
             });
             let styles: Vec<String> = fams.iter().find(|(f, _)| *f == d.font).map(|(_, st)| st.clone()).unwrap_or_default();
-            let r2 = egui::ComboBox::from_id_salt(("eg-style", auto)).selected_text(&d.style).width(70.0).show_ui(ui, |ui| {
+            let r2 = craft_ui::ComboBox::from_id_salt(("eg-style", auto)).selected_text(&d.style).width(70.0).show_ui(ui, |ui| {
                 for st in &styles {
                     if ui.selectable_label(*st == d.style, st).clicked() {
                         d.style = st.clone();
@@ -523,7 +532,7 @@ fn instance(app: &mut EffectcraftApp, ui: &mut egui::Ui, actions: &mut Actions)
                         .filter(|i| matches!(&i.kind, ItemKind::Footage(f) if f.has_video))
                         .map(|i| (i.id, i.name.clone()))
                         .collect();
-                    let r = egui::ComboBox::from_id_salt(("eg-media", layer.id.0, c.id)).selected_text(cur_name).show_ui(ui, |ui| {
+                    let r = craft_ui::ComboBox::from_id_salt(("eg-media", layer.id.0, c.id)).selected_text(cur_name).show_ui(ui, |ui| {
                         for (id, name) in &items {
                             if ui.selectable_label(*id == cur, name).clicked() {
                                 actions.push(("essential.set".into(), json!({"layer": layer.id.0, "control": c.id, "item": id.0})));
diff --git a/crates/ui-egui/src/panels/expr_bar.rs b/crates/ui-egui/src/panels/expr_bar.rs
index 4f6d1c747..ce098efa0 100644
--- a/crates/ui-egui/src/panels/expr_bar.rs
+++ b/crates/ui-egui/src/panels/expr_bar.rs
@@ -23,8 +23,10 @@ struct Cache {
     current: usize,
 }
 
+/// The `egui::Id` under which the error bar's cache for composition `cid` is kept: this pass's
+/// failing expressions and which one is shown.
 fn cache_id(cid: ItemId) -> egui::Id {
-    egui::Id::new(("expr-error-bar", cid.0))
+    egui::Id::unique(("expr-error-bar", cid.0))
 }
 
 /// Both layout and painting read the same completed diagnostics; neither evaluates expressions.
@@ -46,6 +48,11 @@ pub fn height(app: &mut EffectcraftApp, ctx: &egui::Context, cid: ItemId) -> f32
     if errors(app, ctx, cid).errors.is_empty() { 0.0 } else { HEIGHT }
 }
 
+/// Draws the expression error strip for composition `cid` in `rect`: a warning, the shown error's
+/// description and ◀ n/m ▶ buttons to step through the failing expressions. Clicking the message
+/// selects that layer and property, reveals it in the Timeline and opens its expression. Does
+/// nothing when every expression evaluates. Stepping and clicking only change UI state (the
+/// cached index, selection and Timeline state), never the document.
 pub fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, cid: ItemId) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -64,7 +71,7 @@ pub fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, cid: ItemId
     let count = Rect::from_center_size(pos2(rect.max.x - 44.0, rect.center().y), vec2(40.0, 16.0));
     let prev = Rect::from_center_size(pos2(rect.max.x - 74.0, rect.center().y), vec2(16.0, 16.0));
     for (r, label, auto, d) in [(prev, "◀", "viewer.exprErrors.prev", n - 1), (next, "▶", "viewer.exprErrors.next", 1)] {
-        let resp = ui.interact(r, egui::Id::new(("expr-bar", auto)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("expr-bar", auto)), Sense::click());
         p.text(r.center(), Align2::CENTER_CENTER, label, Tokens::ui(11.0), if resp.hovered() { Color32::WHITE } else { t.text });
         app.auto.add(auto, r, label);
         if resp.clicked() {
@@ -76,7 +83,7 @@ pub fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, cid: ItemId
     let comp_name = app.session.project.item(cid).map(|it| it.name.clone()).unwrap_or_default();
     let Some(e) = c.errors.get(i).cloned() else { return };
     let msg_rect = Rect::from_min_max(pos2(rect.min.x + 26.0, rect.min.y), pos2(prev.min.x - 6.0, rect.max.y));
-    let resp = ui.interact(msg_rect, egui::Id::new("expr-bar-msg"), Sense::click()).on_hover_text(tr("Click to reveal the expression in the timeline"));
+    let resp = ui.interact(msg_rect, egui::Id::unique("expr-bar-msg"), Sense::click()).on_hover_text(tr("Click to reveal the expression in the timeline"));
     p.with_clip_rect(msg_rect).text(
         pos2(msg_rect.min.x, rect.center().y),
         Align2::LEFT_CENTER,
diff --git a/crates/ui-egui/src/panels/expr_editor.rs b/crates/ui-egui/src/panels/expr_editor.rs
index f342d5636..157288b94 100644
--- a/crates/ui-egui/src/panels/expr_editor.rs
+++ b/crates/ui-egui/src/panels/expr_editor.rs
@@ -331,8 +331,16 @@ fn layout(text: &str, font: FontId, base: Color32, sx: &Syntax, p: &Scripting, b
     job
 }
 
+/// The scripting preferences, text colour and row count an [`editor`] is drawn with.
+pub struct EditorOpts<'a> {
+    pub prefs: &'a Scripting,
+    pub color: Color32,
+    pub rows: usize,
+}
+
 /// The editor: returns the response; `buf` is edited in place.
-pub fn editor(ui: &mut egui::Ui, id: egui::Id, buf: &mut String, rect: Rect, p: &Scripting, color: Color32, rows: usize, t: &Tokens) -> egui::Response {
+pub fn editor(ui: &mut egui::Ui, id: egui::Id, buf: &mut String, rect: Rect, opts: EditorOpts, t: &Tokens) -> egui::Response {
+    let EditorOpts { prefs: p, color, rows } = opts;
     let size = (p.editor_font_size.clamp(8, 40) as f32) * 0.9;
     let font = Tokens::mono(size);
     // Line numbers in a gutter on the left.
diff --git a/crates/ui-egui/src/panels/flowchart.rs b/crates/ui-egui/src/panels/flowchart.rs
index f59d35982..c7019492f 100644
--- a/crates/ui-egui/src/panels/flowchart.rs
+++ b/crates/ui-egui/src/panels/flowchart.rs
@@ -270,7 +270,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let w = 18.0 + label.len() as f32 * 6.6;
         let r = Rect::from_min_size(pos2(x - w, bar.min.y + 5.0), vec2(w, 20.0));
         x -= w + 6.0;
-        if widgets::text_button(ui, r, label, on, &t, egui::Id::new(("flow-opt", key))).clicked() {
+        if widgets::text_button(ui, r, label, on, &t, egui::Id::unique(("flow-opt", key))).clicked() {
             let v = if key == "direction" { json!({"direction": if o.vertical { "lr" } else { "tb" }}) } else { json!({key: !on}) };
             cmds.push(("flowchart.options".into(), v));
         }
@@ -282,7 +282,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let g = build(&app.session.project, rid, &o);
     let pos = layout(&g, o.vertical);
     let origin = body.min + vec2(24.0 + o.pan[0], 24.0 + o.pan[1]);
-    let bg = ui.interact(body, egui::Id::new("flow-bg"), Sense::click_and_drag());
+    let bg = ui.interact(body, egui::Id::unique("flow-bg"), Sense::click_and_drag());
     if bg.dragged() {
         let d = bg.drag_delta();
         app.ui.flowchart.pan[0] += d.x;
@@ -322,7 +322,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         let (icon, fill) = kind_style(n.kind);
         let selected = o.selected.as_deref() == Some(n.id.as_str());
-        let resp = ui.interact(r.intersect(body), egui::Id::new(("flow-node", &n.id)), Sense::click());
+        let resp = ui.interact(r.intersect(body), egui::Id::unique(("flow-node", &n.id)), Sense::click());
         let fill = if resp.hovered() { fill.gamma_multiply(1.25) } else { fill };
         gp.rect_filled(r, 5.0, fill);
         gp.rect_stroke(
diff --git a/crates/ui-egui/src/panels/footage_panel.rs b/crates/ui-egui/src/panels/footage_panel.rs
index a9e7cefb2..64c2ced12 100644
--- a/crates/ui-egui/src/panels/footage_panel.rs
+++ b/crates/ui-egui/src/panels/footage_panel.rs
@@ -1,7 +1,8 @@
 //! The Footage panel (double-click footage in the Project panel): the source on its own time
 //! ruler, play / pause, In and Out marks, and the Edit Target buttons — Overlay Edit and Ripple
 //! Insert Edit — that cut the marked range into the active composition at its current time.
-//! Everything runs `footage.*` commands (state in `EditorState::footage_panel`).
+//! Time, marks and edits run `footage.*` commands (state in `EditorState::footage_panel`);
+//! the Play/Pause flag is local egui state.
 
 use crate::i18n::{tr, tr_args};
 use effectcraft_engine::project::{FootageKind, ItemKind};
@@ -13,6 +14,11 @@ use super::panel_kit as kit;
 use crate::EffectcraftApp;
 use crate::theme::Tokens;
 
+/// The Footage panel for the item opened into it: the frame at the panel's current time (cached
+/// per item, time and session revision), a ruler with the in/out span and CTI that scrubs on click
+/// or drag, Play/Pause, set In/Out, and Ripple Insert / Overlay Edit into the active comp. A solid
+/// shows its colour, footage without video says so, and an empty panel explains how to open one.
+/// Time changes run `footage.*` commands; the panel's Play/Pause flag is local egui state.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -58,7 +64,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         && f.has_video
     {
         let key = (view.item.0, view.time.0, app.session.revision);
-        let tid = egui::Id::new("footage-panel-tex");
+        let tid = egui::Id::unique("footage-panel-tex");
         let cached: Option<((u64, i64, u64), egui::TextureHandle, [u32; 2])> = ctx.data(|d| d.get_temp(tid));
         let tex = match cached {
             Some((k, tex, size)) if k == key => Some((tex, size)),
@@ -97,7 +103,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     p.rect_filled(Rect::from_min_max(pos2(x_of(a), ruler.max.y - 4.0), pos2(x_of(b), ruler.max.y)), 0.0, t.work_area);
     let cx = x_of(view.time);
     p.line_segment([pos2(cx, ruler.min.y), pos2(cx, ruler.max.y)], Stroke::new(1.5, t.cti));
-    let resp = ui.interact(ruler, egui::Id::new("footage-ruler"), Sense::click_and_drag());
+    let resp = ui.interact(ruler, egui::Id::unique("footage-ruler"), Sense::click_and_drag());
     app.auto.add("footage.ruler", ruler, "Time ruler");
     if (resp.clicked() || resp.dragged())
         && let Some(pt) = resp.interact_pointer_pos()
@@ -106,7 +112,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         kit::exec(app, "footage.setTime", json!({"time": s}));
     }
     // Playback.
-    let play_id = egui::Id::new("footage-playing");
+    let play_id = egui::Id::unique("footage-playing");
     let playing: bool = ctx.data(|d| d.get_temp(play_id).unwrap_or(false));
     if playing {
         let dt = ctx.input(|i| i.stable_dt).min(0.1) as f64;
diff --git a/crates/ui-egui/src/panels/forms.rs b/crates/ui-egui/src/panels/forms.rs
index 185c10336..e121d5d02 100644
--- a/crates/ui-egui/src/panels/forms.rs
+++ b/crates/ui-egui/src/panels/forms.rs
@@ -152,7 +152,7 @@ fn is_pdf(p: &Value) -> bool {
 }
 
 /// File ▸ Import ▸ File… picked numbered stills that import as image sequences: ask, as After
-/// Effects' "<format> Sequence" checkbox in its Import dialog does (rfd's native dialog can't
+/// Effects' `<format> Sequence` checkbox in its Import dialog does (rfd's native dialog can't
 /// carry a checkbox), with Force Alphabetical Order and the frame rate. `p`: the import's
 /// parameters. Returns whether the dialog opened. The checkbox starts off, as in After Effects:
 /// unticked, the picked files import as stills. Dropped files and agents' `file.import` don't
@@ -206,6 +206,280 @@ fn value_fields(name: &str, v: &effectcraft_engine::keyframe::Value) -> Option<V
     })
 }
 
+/// The New Composition from Selection dialog's title and fields.
+fn new_comp_from_selection_form(s: &effectcraft_engine::Session) -> (String, Vec<Field>) {
+    let names: Vec<(String, Value)> =
+        s.state.project_selection.iter().enumerate().filter_map(|(i, id)| s.project.item(*id).map(|it| (it.name.clone(), json!(i)))).collect();
+    let names: Vec<(&str, Value)> = names.iter().map(|(n, v)| (n.as_str(), v.clone())).collect();
+    let still = if s.prefs.import.still_footage == "seconds" { s.prefs.import.still_seconds } else { 10.0 };
+    (
+        "New Composition from Selection".into(),
+        vec![
+            Field::choice("single", "Create", &[("Single Composition", json!(true)), ("Multiple Compositions", json!(false))], 0),
+            Field::choice("dimensionsFrom", "Use Dimensions From", &names, 0),
+            Field::num("duration", "Still Duration (seconds)", still),
+            Field::bool("addToRenderQueue", "Add to Render Queue", false),
+            Field::bool("sequence", "Sequence Layers", false),
+            Field::bool("overlap", "Overlap", false),
+            Field::num("overlapDuration", "Duration (seconds)", 1.0),
+            Field::choice(
+                "transition",
+                "Transition",
+                &[("Off", json!("off")), ("Dissolve Front Layer", json!("dissolveFront")), ("Cross Dissolve Front and Back Layers", json!("crossDissolve"))],
+                0,
+            ),
+        ],
+    )
+}
+
+/// The Interpret Footage dialog for the selected footage (or its proxy), if there is one.
+fn interpret_footage_form(s: &effectcraft_engine::Session, proxy: bool) -> Option<(String, Vec<Field>)> {
+    let f = s.state.project_selection.first().and_then(|i| s.project.item(*i)).and_then(|it| match (&it.kind, &it.proxy) {
+        (_, Some(px)) if proxy => Some(px.footage.clone()),
+        (effectcraft_engine::project::ItemKind::Footage(f), _) if !proxy => Some(f.clone()),
+        _ => None,
+    });
+    let f = f?;
+    let hex = |c: [f32; 3]| format!("#{:02x}{:02x}{:02x}", (c[0] * 255.0).round() as u8, (c[1] * 255.0).round() as u8, (c[2] * 255.0).round() as u8);
+    let mut fields = vec![
+        // Main Options ▸ Alpha.
+        Field::choice(
+            "alpha",
+            "Alpha",
+            &[
+                ("Interpret Straight - Unmatted", json!("straight")),
+                ("Interpret Premultiplied - Matted With Color", json!("premultiplied")),
+                ("Ignore", json!("ignore")),
+                ("Guess", json!("guess")),
+            ],
+            f.alpha as usize,
+        ),
+        Field::text("matteColor", "Matte color (premultiplied)", &hex(f.premul_color)),
+        Field::bool("invertAlpha", "Invert Alpha", f.invert_alpha),
+        // Main Options ▸ Frame Rate, Fields and Pulldown, Other Options.
+        Field::num("frameRate", "Assume this frame rate", f.frame_rate.as_f64()),
+        Field::choice(
+            "fields",
+            "Separate Fields",
+            &[("Off", json!("off")), ("Upper Field First", json!("upper")), ("Lower Field First", json!("lower"))],
+            f.fields as usize,
+        ),
+        Field::num("pixelAspect", "Pixel Aspect Ratio", f.pixel_aspect),
+        Field::num("loop", "Loop (times)", f.loop_count as f64),
+        // Color.
+        Field::choice(
+            "colorProfile",
+            "Assign Profile",
+            &[
+                ("Embedded / sRGB", json!("auto")),
+                ("sRGB IEC61966-2.1", json!("srgb")),
+                ("HDTV (Rec. 709)", json!("rec709")),
+                ("Rec. 2020", json!("rec2020")),
+                ("Display P3", json!("p3")),
+                ("ACEScg", json!("acescg")),
+                ("ACES2065-1", json!("aces2065")),
+                ("Rec. 2100 PQ", json!("rec2100pq")),
+                ("Rec. 2100 HLG", json!("rec2100hlg")),
+            ],
+            f.color_profile.map_or(0, |c| 1 + effectcraft_engine::project::ColorSpace::ALL.iter().position(|x| *x == c).unwrap_or(0)),
+        ),
+        Field::bool("preserveRgb", "Preserve RGB", f.preserve_rgb),
+        Field::bool("linearLight", "Interpret As Linear Light", f.linear_light),
+    ];
+    // After Frame Rate: an image sequence's frames (missing ones show colour bars, as in
+    // After Effects), then Start Timecode.
+    let mut timing = Vec::new();
+    if f.kind == effectcraft_engine::project::FootageKind::Sequence {
+        let gaps = match effectcraft_engine::sequence::missing_report(&f.sequence) {
+            _ if f.alphabetical => "files in alphabetical order".into(),
+            Some(gaps) => format!("{gaps} shown as color bars"),
+            None => "no missing frames".into(),
+        };
+        timing.push(Field::note("sequenceInfo", &format!("Image sequence: {} files, {} frames; {gaps}.", f.sequence.len(), f.sequence_frames())));
+    }
+    if f.kind != effectcraft_engine::project::FootageKind::Still {
+        timing.push(Field::choice(
+            "overrideStart",
+            "Start Timecode",
+            &[("Use Source File Timecode", json!(false)), ("Override Start", json!(true))],
+            usize::from(f.start_timecode.is_some()),
+        ));
+        timing.push(Field::text("startTimecode", "Override Start", &f.timecode(0)));
+    }
+    let at = fields.iter().position(|x| x.key == "frameRate").map_or(fields.len(), |i| i + 1);
+    fields.splice(at..at, timing);
+    Some((if proxy { "Interpret Footage: Proxy".into() } else { "Interpret Footage".into() }, fields))
+}
+
+/// The Project Settings dialog's title and fields.
+fn project_settings_form(s: &effectcraft_engine::Session) -> (String, Vec<Field>) {
+    let st = &s.project.settings;
+    // The catalogue row is `Mercury GPU Acceleration ({})`, so the value goes through
+    // tr_args: wrapping the assembled string in tr() would look up the backend's name.
+    let gpu_label = match &s.accel {
+        Some(a) => tr_args("Mercury GPU Acceleration ({})", &[&a.name()]),
+        None => tr("Mercury GPU Acceleration (no GPU: software)").to_string(),
+    };
+    let depth = match st.bit_depth.label() {
+        l if l.starts_with("16") => 1,
+        l if l.starts_with("32") => 2,
+        _ => 0,
+    };
+    (
+        "Project Settings".into(),
+        vec![
+            Field::choice(
+                "bitDepth",
+                "Depth",
+                &[("8 bits per channel", json!(8)), ("16 bits per channel", json!(16)), ("32 bits per channel (float)", json!(32))],
+                depth,
+            ),
+            Field::choice(
+                "timeDisplay",
+                "Time display style",
+                &[
+                    ("Timecode", json!("timecode")),
+                    ("Frames", json!("frames")),
+                    ("Feet + Frames (35mm)", json!("feet35")),
+                    ("Feet + Frames (16mm)", json!("feet16")),
+                ],
+                {
+                    use effectcraft_engine::project::TimeDisplayStyle as T;
+                    match st.time_display {
+                        T::Timecode => 0,
+                        T::Frames => 1,
+                        T::Feet35 => 2,
+                        T::Feet16 => 3,
+                    }
+                },
+            ),
+            // Time Display Style ▸ Frames ▸ Frame Count (also numbers Feet + Frames).
+            Field::choice("frameStart", "Frame count", &[("Start at 0", json!(0)), ("Start at 1", json!(1))], usize::from(st.frame_start == 1)),
+            Field::choice(
+                "colorEngine",
+                "Color engine",
+                &[("Adobe-style built-in", json!("adobe")), ("OCIO (built-in ACES config)", json!("ocio"))],
+                usize::from(st.color_engine == effectcraft_engine::project::ColorEngine::Ocio),
+            ),
+            Field::choice(
+                "workingSpace",
+                "Working space",
+                &[
+                    ("None", json!("none")),
+                    ("sRGB IEC61966-2.1", json!("srgb")),
+                    ("HDTV (Rec. 709)", json!("rec709")),
+                    ("Rec. 2020", json!("rec2020")),
+                    ("Display P3", json!("p3")),
+                    ("ACEScg", json!("acescg")),
+                    ("ACES2065-1", json!("aces2065")),
+                ],
+                st.working_space.map_or(0, |c| 1 + effectcraft_engine::project::ColorSpace::WORKING.iter().position(|x| *x == c).unwrap_or(0)),
+            ),
+            // With Working Space None (After Effects' Working Gamma, 2.2 or 2.4).
+            Field::choice("workingGamma", "Working gamma", &[("2.2", json!(2.2)), ("2.4", json!(2.4))], usize::from(st.working_gamma_24())),
+            Field::bool("linearize", "Linearize working space", st.linearize),
+            Field::bool("blendLinear", "Blend colors using 1.0 gamma", st.blend_linear),
+            Field::choice(
+                "hdr",
+                "HDR on SDR displays and outputs",
+                &[("Clip", json!("clip")), ("Compand", json!("compand")), ("Tone map", json!("toneMap"))],
+                st.hdr as usize,
+            ),
+            Field::choice(
+                "outputSpace",
+                "Output color space",
+                &[
+                    ("sRGB IEC61966-2.1 (default)", json!("default")),
+                    ("HDTV (Rec. 709)", json!("rec709")),
+                    ("Rec. 2020", json!("rec2020")),
+                    ("Display P3", json!("p3")),
+                    ("Rec. 2100 PQ (HDR)", json!("rec2100pq")),
+                    ("Rec. 2100 HLG (HDR)", json!("rec2100hlg")),
+                ],
+                {
+                    use effectcraft_engine::project::ColorSpace as C;
+                    match st.output_space {
+                        Some(C::Rec709) => 1,
+                        Some(C::Rec2020) => 2,
+                        Some(C::DisplayP3) => 3,
+                        Some(C::Rec2100Pq) => 4,
+                        Some(C::Rec2100Hlg) => 5,
+                        _ => 0,
+                    }
+                },
+            ),
+            // Video Rendering and Effects ▸ Use.
+            Field::choice(
+                "renderer",
+                "Video rendering and effects",
+                &[(gpu_label.as_str(), json!("gpu")), ("Mercury Software Only", json!("software"))],
+                usize::from(!st.gpu_acceleration),
+            ),
+        ],
+    )
+}
+
+/// The Export Adobe Premiere Pro Project dialog's title and fields.
+fn export_timeline_form(s: &effectcraft_engine::Session) -> (String, Vec<Field>) {
+    let name = s.active_comp_id().and_then(|c| s.project.item(c)).map(|i| i.name.clone()).unwrap_or_else(|| "Composition".into());
+    let dir = s.path.as_deref().and_then(|p| std::path::Path::new(p).parent()).map(|d| d.to_path_buf()).unwrap_or_default();
+    let path = dir.join(format!("{name}.xml")).to_string_lossy().to_string();
+    (
+        "Export Adobe Premiere Pro Project".into(),
+        vec![
+            Field::note("note", "Writes Final Cut Pro XML (.xml), which Premiere Pro opens with File ▸ Import. Native .prproj files are not written."),
+            Field::save_path("path", "File", &path),
+            Field::choice(
+                "format",
+                "Format",
+                &[
+                    ("Final Cut Pro XML (.xml) – Premiere Pro", json!("xml")),
+                    ("FCPXML (.fcpxml)", json!("fcpxml")),
+                    ("OpenTimelineIO (.otio)", json!("otio")),
+                    ("CMX 3600 EDL (.edl, V1 only)", json!("edl")),
+                    ("AAF (.aaf)", json!("aaf")),
+                    ("OMF (.omf, audio)", json!("omf")),
+                ],
+                0,
+            ),
+            Field::choice(
+                "prerender",
+                "Pre-render (ProRes 4444)",
+                &[
+                    ("Layers Premiere can't show (text, shapes, effects…)", json!("unsupported")),
+                    ("All layers", json!("all")),
+                    ("None (leave them out)", json!("none")),
+                ],
+                0,
+            ),
+            Field::choice("precomps", "Precomps", &[("Nested sequences", json!("nest")), ("Pre-render", json!("prerender"))], 0),
+        ],
+    )
+}
+
+/// The Layer ▸ Transform value dialog for the property named by `p` (default Position).
+fn transform_form(p: &Value, layer: Option<&effectcraft_engine::project::Layer>, lt: effectcraft_engine::time::Tick) -> (String, Vec<Field>) {
+    let prop = p.get("prop").and_then(Value::as_str).unwrap_or("position");
+    let cur = layer.and_then(|l| l.transform()).and_then(|tr| tr.get(if prop == "anchorPoint" { "anchor" } else { prop })).map(|pr| pr.value_at(lt));
+    let v = cur.map(|c| c.as_vec3()).unwrap_or([0.0; 3]);
+    let three = layer.is_some_and(|l| l.is_3d());
+    let title = match prop {
+        "anchor" => "Anchor Point",
+        "position" => "Position",
+        "scale" => "Scale",
+        "orientation" => "Orientation",
+        "rotation" => "Rotation",
+        _ => "Opacity",
+    };
+    let fields = match prop {
+        "rotation" | "opacity" => vec![Field::num("value", if prop == "rotation" { "Degrees" } else { "Opacity (%)" }, v[0])],
+        "orientation" => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1]), Field::num("value[2]", "Z", v[2])],
+        _ if three => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1]), Field::num("value[2]", "Z", v[2])],
+        _ => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1])],
+    };
+    (title.into(), fields)
+}
+
 /// If `id` is a dialog command invoked without its parameters, open its form and return true.
 pub fn open_form(app: &mut EffectcraftApp, id: &str, p: &Value) -> bool {
     let s = &app.session;
@@ -281,27 +555,7 @@ pub fn open_form(app: &mut EffectcraftApp, id: &str, p: &Value) -> bool {
             let Some(fields) = value_fields(&pr.name, &pr.value_at(l.layer_time(t))) else { return false };
             (pr.name.clone(), fields)
         }
-        "layer.setTransform" if !has(p, &["value"]) => {
-            let prop = p.get("prop").and_then(Value::as_str).unwrap_or("position");
-            let cur = layer.and_then(|l| l.transform()).and_then(|tr| tr.get(if prop == "anchorPoint" { "anchor" } else { prop })).map(|pr| pr.value_at(lt));
-            let v = cur.map(|c| c.as_vec3()).unwrap_or([0.0; 3]);
-            let three = layer.is_some_and(|l| l.is_3d());
-            let title = match prop {
-                "anchor" => "Anchor Point",
-                "position" => "Position",
-                "scale" => "Scale",
-                "orientation" => "Orientation",
-                "rotation" => "Rotation",
-                _ => "Opacity",
-            };
-            let fields = match prop {
-                "rotation" | "opacity" => vec![Field::num("value", if prop == "rotation" { "Degrees" } else { "Opacity (%)" }, v[0])],
-                "orientation" => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1]), Field::num("value[2]", "Z", v[2])],
-                _ if three => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1]), Field::num("value[2]", "Z", v[2])],
-                _ => vec![Field::num("value[0]", "X", v[0]), Field::num("value[1]", "Y", v[1])],
-            };
-            (title.into(), fields)
-        }
+        "layer.setTransform" if !has(p, &["value"]) => transform_form(p, layer, lt),
         "path.freeTransform" if !has(p, &["scale", "rotation", "offset"]) => (
             "Free Transform Points".into(),
             vec![
@@ -377,32 +631,7 @@ pub fn open_form(app: &mut EffectcraftApp, id: &str, p: &Value) -> bool {
         "file.newCompFromSelection"
             if s.state.project_selection.len() > 1 && !has(p, &["single", "dimensionsFrom", "duration", "sequence", "addToRenderQueue"]) =>
         {
-            let names: Vec<(String, Value)> =
-                s.state.project_selection.iter().enumerate().filter_map(|(i, id)| s.project.item(*id).map(|it| (it.name.clone(), json!(i)))).collect();
-            let names: Vec<(&str, Value)> = names.iter().map(|(n, v)| (n.as_str(), v.clone())).collect();
-            let still = if s.prefs.import.still_footage == "seconds" { s.prefs.import.still_seconds } else { 10.0 };
-            (
-                "New Composition from Selection".into(),
-                vec![
-                    Field::choice("single", "Create", &[("Single Composition", json!(true)), ("Multiple Compositions", json!(false))], 0),
-                    Field::choice("dimensionsFrom", "Use Dimensions From", &names, 0),
-                    Field::num("duration", "Still Duration (seconds)", still),
-                    Field::bool("addToRenderQueue", "Add to Render Queue", false),
-                    Field::bool("sequence", "Sequence Layers", false),
-                    Field::bool("overlap", "Overlap", false),
-                    Field::num("overlapDuration", "Duration (seconds)", 1.0),
-                    Field::choice(
-                        "transition",
-                        "Transition",
-                        &[
-                            ("Off", json!("off")),
-                            ("Dissolve Front Layer", json!("dissolveFront")),
-                            ("Cross Dissolve Front and Back Layers", json!("crossDissolve")),
-                        ],
-                        0,
-                    ),
-                ],
-            )
+            new_comp_from_selection_form(s)
         }
         "layer.sequence" if !has(p, &["overlap"]) => (
             "Sequence Layers".into(),
@@ -425,186 +654,10 @@ pub fn open_form(app: &mut EffectcraftApp, id: &str, p: &Value) -> bool {
             if !has(p, &["frameRate", "alpha", "loop", "pixelAspect", "colorProfile", "fields", "invertAlpha", "matteColor", "linearLight", "startFrame"]) =>
         {
             let proxy = id == "file.interpretProxy";
-            let f = s.state.project_selection.first().and_then(|i| s.project.item(*i)).and_then(|it| match (&it.kind, &it.proxy) {
-                (_, Some(px)) if proxy => Some(px.footage.clone()),
-                (effectcraft_engine::project::ItemKind::Footage(f), _) if !proxy => Some(f.clone()),
-                _ => None,
-            });
-            let Some(f) = f else { return false };
-            let hex = |c: [f32; 3]| format!("#{:02x}{:02x}{:02x}", (c[0] * 255.0).round() as u8, (c[1] * 255.0).round() as u8, (c[2] * 255.0).round() as u8);
-            let mut fields = vec![
-                // Main Options ▸ Alpha.
-                Field::choice(
-                    "alpha",
-                    "Alpha",
-                    &[
-                        ("Interpret Straight - Unmatted", json!("straight")),
-                        ("Interpret Premultiplied - Matted With Color", json!("premultiplied")),
-                        ("Ignore", json!("ignore")),
-                        ("Guess", json!("guess")),
-                    ],
-                    f.alpha as usize,
-                ),
-                Field::text("matteColor", "Matte color (premultiplied)", &hex(f.premul_color)),
-                Field::bool("invertAlpha", "Invert Alpha", f.invert_alpha),
-                // Main Options ▸ Frame Rate, Fields and Pulldown, Other Options.
-                Field::num("frameRate", "Assume this frame rate", f.frame_rate.as_f64()),
-                Field::choice(
-                    "fields",
-                    "Separate Fields",
-                    &[("Off", json!("off")), ("Upper Field First", json!("upper")), ("Lower Field First", json!("lower"))],
-                    f.fields as usize,
-                ),
-                Field::num("pixelAspect", "Pixel Aspect Ratio", f.pixel_aspect),
-                Field::num("loop", "Loop (times)", f.loop_count as f64),
-                // Color.
-                Field::choice(
-                    "colorProfile",
-                    "Assign Profile",
-                    &[
-                        ("Embedded / sRGB", json!("auto")),
-                        ("sRGB IEC61966-2.1", json!("srgb")),
-                        ("HDTV (Rec. 709)", json!("rec709")),
-                        ("Rec. 2020", json!("rec2020")),
-                        ("Display P3", json!("p3")),
-                        ("ACEScg", json!("acescg")),
-                        ("ACES2065-1", json!("aces2065")),
-                        ("Rec. 2100 PQ", json!("rec2100pq")),
-                        ("Rec. 2100 HLG", json!("rec2100hlg")),
-                    ],
-                    f.color_profile.map_or(0, |c| 1 + effectcraft_engine::project::ColorSpace::ALL.iter().position(|x| *x == c).unwrap_or(0)),
-                ),
-                Field::bool("preserveRgb", "Preserve RGB", f.preserve_rgb),
-                Field::bool("linearLight", "Interpret As Linear Light", f.linear_light),
-            ];
-            // After Frame Rate: an image sequence's frames (missing ones show colour bars, as in
-            // After Effects), then Start Timecode.
-            let mut timing = Vec::new();
-            if f.kind == effectcraft_engine::project::FootageKind::Sequence {
-                let gaps = match effectcraft_engine::sequence::missing_report(&f.sequence) {
-                    _ if f.alphabetical => "files in alphabetical order".into(),
-                    Some(gaps) => format!("{gaps} shown as color bars"),
-                    None => "no missing frames".into(),
-                };
-                timing.push(Field::note("sequenceInfo", &format!("Image sequence: {} files, {} frames; {gaps}.", f.sequence.len(), f.sequence_frames())));
-            }
-            if f.kind != effectcraft_engine::project::FootageKind::Still {
-                timing.push(Field::choice(
-                    "overrideStart",
-                    "Start Timecode",
-                    &[("Use Source File Timecode", json!(false)), ("Override Start", json!(true))],
-                    usize::from(f.start_timecode.is_some()),
-                ));
-                timing.push(Field::text("startTimecode", "Override Start", &f.timecode(0)));
-            }
-            let at = fields.iter().position(|x| x.key == "frameRate").map_or(fields.len(), |i| i + 1);
-            fields.splice(at..at, timing);
-            (if proxy { "Interpret Footage: Proxy".into() } else { "Interpret Footage".into() }, fields)
-        }
-        "file.projectSettings" if p.as_object().is_none_or(|m| m.is_empty()) => {
-            let st = &s.project.settings;
-            // The catalogue row is `Mercury GPU Acceleration ({})`, so the value goes through
-            // tr_args: wrapping the assembled string in tr() would look up the backend's name.
-            let gpu_label = match &s.accel {
-                Some(a) => tr_args("Mercury GPU Acceleration ({})", &[&a.name()]),
-                None => tr("Mercury GPU Acceleration (no GPU: software)").to_string(),
-            };
-            let depth = match st.bit_depth.label() {
-                l if l.starts_with("16") => 1,
-                l if l.starts_with("32") => 2,
-                _ => 0,
-            };
-            (
-                "Project Settings".into(),
-                vec![
-                    Field::choice(
-                        "bitDepth",
-                        "Depth",
-                        &[("8 bits per channel", json!(8)), ("16 bits per channel", json!(16)), ("32 bits per channel (float)", json!(32))],
-                        depth,
-                    ),
-                    Field::choice(
-                        "timeDisplay",
-                        "Time display style",
-                        &[
-                            ("Timecode", json!("timecode")),
-                            ("Frames", json!("frames")),
-                            ("Feet + Frames (35mm)", json!("feet35")),
-                            ("Feet + Frames (16mm)", json!("feet16")),
-                        ],
-                        {
-                            use effectcraft_engine::project::TimeDisplayStyle as T;
-                            match st.time_display {
-                                T::Timecode => 0,
-                                T::Frames => 1,
-                                T::Feet35 => 2,
-                                T::Feet16 => 3,
-                            }
-                        },
-                    ),
-                    Field::choice(
-                        "colorEngine",
-                        "Color engine",
-                        &[("Adobe-style built-in", json!("adobe")), ("OCIO (built-in ACES config)", json!("ocio"))],
-                        usize::from(st.color_engine == effectcraft_engine::project::ColorEngine::Ocio),
-                    ),
-                    Field::choice(
-                        "workingSpace",
-                        "Working space",
-                        &[
-                            ("None", json!("none")),
-                            ("sRGB IEC61966-2.1", json!("srgb")),
-                            ("HDTV (Rec. 709)", json!("rec709")),
-                            ("Rec. 2020", json!("rec2020")),
-                            ("Display P3", json!("p3")),
-                            ("ACEScg", json!("acescg")),
-                            ("ACES2065-1", json!("aces2065")),
-                        ],
-                        st.working_space.map_or(0, |c| 1 + effectcraft_engine::project::ColorSpace::WORKING.iter().position(|x| *x == c).unwrap_or(0)),
-                    ),
-                    // With Working Space None (After Effects' Working Gamma, 2.2 or 2.4).
-                    Field::choice("workingGamma", "Working gamma", &[("2.2", json!(2.2)), ("2.4", json!(2.4))], usize::from(st.working_gamma_24())),
-                    Field::bool("linearize", "Linearize working space", st.linearize),
-                    Field::bool("blendLinear", "Blend colors using 1.0 gamma", st.blend_linear),
-                    Field::choice(
-                        "hdr",
-                        "HDR on SDR displays and outputs",
-                        &[("Clip", json!("clip")), ("Compand", json!("compand")), ("Tone map", json!("toneMap"))],
-                        st.hdr as usize,
-                    ),
-                    Field::choice(
-                        "outputSpace",
-                        "Output color space",
-                        &[
-                            ("sRGB IEC61966-2.1 (default)", json!("default")),
-                            ("HDTV (Rec. 709)", json!("rec709")),
-                            ("Rec. 2020", json!("rec2020")),
-                            ("Display P3", json!("p3")),
-                            ("Rec. 2100 PQ (HDR)", json!("rec2100pq")),
-                            ("Rec. 2100 HLG (HDR)", json!("rec2100hlg")),
-                        ],
-                        {
-                            use effectcraft_engine::project::ColorSpace as C;
-                            match st.output_space {
-                                Some(C::Rec709) => 1,
-                                Some(C::Rec2020) => 2,
-                                Some(C::DisplayP3) => 3,
-                                Some(C::Rec2100Pq) => 4,
-                                Some(C::Rec2100Hlg) => 5,
-                                _ => 0,
-                            }
-                        },
-                    ),
-                    // Video Rendering and Effects ▸ Use.
-                    Field::choice(
-                        "renderer",
-                        "Video rendering and effects",
-                        &[(gpu_label.as_str(), json!("gpu")), ("Mercury Software Only", json!("software"))],
-                        usize::from(!st.gpu_acceleration),
-                    ),
-                ],
-            )
+            let Some(form) = interpret_footage_form(s, proxy) else { return false };
+            form
         }
+        "file.projectSettings" if p.as_object().is_none_or(|m| m.is_empty()) => project_settings_form(s),
         "layer.autoTrace" if !has(p, &["channel", "timeSpan", "threshold"]) => (
             "Auto-trace".into(),
             vec![
@@ -660,42 +713,7 @@ pub fn open_form(app: &mut EffectcraftApp, id: &str, p: &Value) -> bool {
             )
         }
         // File ▸ Export ▸ Adobe Premiere Pro Project…: Final Cut Pro XML (or FCPXML / OTIO / EDL).
-        "file.exportTimeline" if !has(p, &["path"]) => {
-            let name = s.active_comp_id().and_then(|c| s.project.item(c)).map(|i| i.name.clone()).unwrap_or_else(|| "Composition".into());
-            let dir = s.path.as_deref().and_then(|p| std::path::Path::new(p).parent()).map(|d| d.to_path_buf()).unwrap_or_default();
-            let path = dir.join(format!("{name}.xml")).to_string_lossy().to_string();
-            (
-                "Export Adobe Premiere Pro Project".into(),
-                vec![
-                    Field::note("note", "Writes Final Cut Pro XML (.xml), which Premiere Pro opens with File ▸ Import. Native .prproj files are not written."),
-                    Field::save_path("path", "File", &path),
-                    Field::choice(
-                        "format",
-                        "Format",
-                        &[
-                            ("Final Cut Pro XML (.xml) – Premiere Pro", json!("xml")),
-                            ("FCPXML (.fcpxml)", json!("fcpxml")),
-                            ("OpenTimelineIO (.otio)", json!("otio")),
-                            ("CMX 3600 EDL (.edl, V1 only)", json!("edl")),
-                            ("AAF (.aaf)", json!("aaf")),
-                            ("OMF (.omf, audio)", json!("omf")),
-                        ],
-                        0,
-                    ),
-                    Field::choice(
-                        "prerender",
-                        "Pre-render (ProRes 4444)",
-                        &[
-                            ("Layers Premiere can't show (text, shapes, effects…)", json!("unsupported")),
-                            ("All layers", json!("all")),
-                            ("None (leave them out)", json!("none")),
-                        ],
-                        0,
-                    ),
-                    Field::choice("precomps", "Precomps", &[("Nested sequences", json!("nest")), ("Pre-render", json!("prerender"))], 0),
-                ],
-            )
-        }
+        "file.exportTimeline" if !has(p, &["path"]) => export_timeline_form(s),
         "file.importPlaceholder" | "file.replaceWithPlaceholder" if p.as_object().is_none_or(|m| m.is_empty()) => (
             "New Placeholder".into(),
             vec![
@@ -828,7 +846,7 @@ fn form_grid(ui: &mut egui::Ui, f: &mut Form, regs: &mut Vec<(String, egui::Rect
                     let cur = options.get(*sel).map(|o| o.0.clone()).unwrap_or_default();
                     // The column keeps its width: a long choice (a GPU adapter's name) ends in an
                     // ellipsis instead of widening the form past the dialog (#978).
-                    egui::ComboBox::from_id_salt(("form", fl.key.as_str()))
+                    craft_ui::ComboBox::from_id_salt(("form", fl.key.as_str()))
                         .selected_text(tr(&cur))
                         .width(240.0)
                         .truncate()
diff --git a/crates/ui-egui/src/panels/fx_editors.rs b/crates/ui-egui/src/panels/fx_editors.rs
index 1ae74caa2..4ed96797a 100644
--- a/crates/ui-egui/src/panels/fx_editors.rs
+++ b/crates/ui-egui/src/panels/fx_editors.rs
@@ -66,24 +66,14 @@ fn register_points(app: &mut EffectcraftApp, prefix: &str, gr: Rect, pts: &[[f32
 }
 
 /// Small coloured tabs (`names[i]`, swatch `cols[i]`); returns the clicked one.
-fn tabs(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    x0: f32,
-    cy: f32,
-    cur: usize,
-    names: &[&str],
-    cols: &[Color32],
-    id: &str,
-) -> Option<usize> {
+fn tabs(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, at: Pos2, cur: usize, (names, cols): (&[&str], &[Color32]), id: &str) -> Option<usize> {
     let t = app.tokens;
-    let mut x = x0;
+    let (mut x, cy) = (at.x, at.y);
     let mut out = None;
     for (i, name) in names.iter().enumerate() {
         let w = if cols.is_empty() { 16.0 + name.chars().count() as f32 * 6.2 } else { 20.0 };
         let r = Rect::from_min_size(pos2(x, cy - 9.0), vec2(w, 18.0));
-        let resp = ui.interact(r, egui::Id::new((id, i)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique((id, i)), Sense::click());
         let sel = i == cur;
         if sel {
             p.rect_filled(r, 3.0, t.row_selected);
@@ -111,9 +101,11 @@ fn tabs(
     out
 }
 
+/// A small "Reset" link centred in `r`, registered under the automation id `id`; returns whether
+/// it was clicked.
 fn reset_link(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, r: Rect, id: &str) -> bool {
     let t = app.tokens;
-    let resp = ui.interact(r, egui::Id::new(id), Sense::click());
+    let resp = ui.interact(r, egui::Id::unique(id), Sense::click());
     p.text(r.center(), Align2::CENTER_CENTER, tr("Reset"), Tokens::ui(11.5), if resp.hovered() { t.hot_text } else { t.text_dim });
     app.auto.add(id, r, "Reset");
     resp.clicked()
@@ -162,6 +154,10 @@ pub fn inline_editor(
 
 const RGB_CURVES: [(&str, &str); 4] = [("master", "Master"), ("red", "Red"), ("green", "Green"), ("blue", "Blue")];
 
+/// The Lumetri RGB Curves editor for effect group `g`: channel tabs (Master, Red, Green, Blue),
+/// the selected channel's curve graph with its Reset, and the point positions registered for
+/// automation. A curve edit or Reset is queued on `actions` as a `prop.set` of that channel's
+/// curve string; the visible channel is remembered in `app.ui.fx_curve_channel` per group.
 #[allow(clippy::too_many_arguments)]
 fn rgb_curves(
     app: &mut EffectcraftApp,
@@ -182,7 +178,7 @@ fn rgb_curves(
     let cy = r.min.y + 15.0;
     let cols = [Color32::from_gray(0xe8), Color32::from_rgb(0xf0, 0x50, 0x50), Color32::from_rgb(0x50, 0xd0, 0x60), Color32::from_rgb(0x50, 0x80, 0xff)];
     let names: Vec<&str> = RGB_CURVES.iter().map(|c| c.1).collect();
-    if let Some(n) = tabs(app, ui, p, x0, cy, ch, &names, &cols, &format!("{prefix}.channel")) {
+    if let Some(n) = tabs(app, ui, p, pos2(x0, cy), ch, (&names, &cols), &format!("{prefix}.channel")) {
         app.ui.fx_curve_channel.insert(g.uid, n);
     }
     let id = RGB_CURVES[ch].0;
@@ -192,8 +188,8 @@ fn rgb_curves(
         set_str(actions, layer, g, id, fw::CurvePoints::identity().format(), None);
     }
     let gr = Rect::from_min_size(pos2(x0, r.min.y + 30.0), vec2(size, size));
-    let gid = egui::Id::new(("lumetri-rgb", euid, ch));
-    let (resp, edit) = fw::curves_graph(ui, gr, &cur, ch, false, gid, &t);
+    let gid = egui::Id::unique(("lumetri-rgb", euid, ch));
+    let (resp, edit) = fw::curves_graph(ui, gr, &cur, ch, fw::CurveMode { pencil: false, natural: false }, gid, &t);
     app.auto.add(&format!("{prefix}.graph"), gr, "RGB Curves");
     register_points(app, &prefix, gr, &cur.0);
     let key = gesture_key(ui, gid, resp.drag_started() || resp.clicked());
@@ -269,6 +265,11 @@ fn hue_color(h: f32) -> Color32 {
     Color32::from(c)
 }
 
+/// The Lumetri Hue/Saturation Curves editor for effect group `g`: tabs for the Hue vs Sat,
+/// Hue vs Hue, Hue vs Luma, Luma vs Sat and Sat vs Sat curves, drawn as a neutral-relative offset
+/// curve over the axis' colour band, with point drag/add/remove gestures and a Reset. Changes are
+/// queued on `actions` as a `prop.set` of the selected curve's point list; the visible tab is kept
+/// in `app.ui.fx_curve_channel` per group.
 #[allow(clippy::too_many_arguments)]
 fn huesat_curves(
     app: &mut EffectcraftApp,
@@ -288,7 +289,7 @@ fn huesat_curves(
     let x0 = r.min.x + 38.0;
     let cy = r.min.y + 15.0;
     let names: Vec<&str> = HUESAT.iter().map(|c| c.1).collect();
-    if let Some(n) = tabs(app, ui, p, x0, cy, k, &names, &[], &format!("{prefix}.curve")) {
+    if let Some(n) = tabs(app, ui, p, pos2(x0, cy), k, (&names, &[]), &format!("{prefix}.curve")) {
         app.ui.fx_curve_channel.insert(g.uid, n);
     }
     let (id, name, axis, periodic) = HUESAT[k];
@@ -321,7 +322,7 @@ fn huesat_curves(
         })
         .collect();
     p.add(egui::Shape::line(line, Stroke::new(1.5, Color32::from_gray(0xe8))));
-    let gid = egui::Id::new(("lumetri-hs", euid, k));
+    let gid = egui::Id::unique(("lumetri-hs", euid, k));
     let resp = ui.interact(gr.expand(6.0), gid, Sense::click_and_drag());
     app.auto.add(&format!("{prefix}.graph"), gr, name);
     let drag_id = gid.with("drag");
@@ -441,6 +442,12 @@ fn wheel_point(c: Pos2, radius: f32, phase: f32) -> Pos2 {
     pos2(c.x + radius * a.sin(), c.y - radius * a.cos())
 }
 
+/// Colorama's Output Cycle wheel for effect group `g`: the palette drawn as a ring with its stops.
+/// Clicking the ring adds a stop with the colour there, dragging moves one, and Alt-clicking or
+/// dragging one off removes it while another stop remains; the selected stop's colour can be
+/// edited below. A change queues
+/// the rewritten palette on `actions`, and for a preset palette also switches the effect to the
+/// custom palette in the same undo step.
 #[allow(clippy::too_many_arguments)]
 fn colorama_wheel(
     app: &mut EffectcraftApp,
@@ -476,7 +483,7 @@ fn colorama_wheel(
     }
     p.circle_stroke(c, outer, Stroke::new(1.0, Color32::from_black_alpha(160)));
     p.circle_stroke(c, inner, Stroke::new(1.0, Color32::from_black_alpha(160)));
-    let wid = egui::Id::new(("colorama-wheel", euid));
+    let wid = egui::Id::unique(("colorama-wheel", euid));
     let ring = Rect::from_center_size(c, vec2(outer * 2.0 + 40.0, outer * 2.0 + 40.0));
     let resp = ui.interact(ring, wid, Sense::click_and_drag());
     app.auto.add(&format!("{prefix}.wheel"), ring, "Output Cycle");
@@ -657,6 +664,10 @@ pub fn join_map(m: &[fw::CurvePoints; 3]) -> String {
     m.iter().map(|c| c.format()).collect::<Vec<_>>().join(" | ")
 }
 
+/// Glow's Colour Map for effect group `g`: a strip showing the gradient the glow uses (A/B colours,
+/// or the arbitrary map sampled through the loop settings). In arbitrary-map mode it also draws the
+/// RGB curve tabs and the selected channel's graph with a Reset; edits queue a `prop.set` of
+/// `arbitraryMap` on `actions`.
 #[allow(clippy::too_many_arguments)]
 fn glow_map(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, layer: &Layer, g: &PropGroup, ectx: &EvalCtx, r: Rect, actions: &mut Actions) {
     let t = app.tokens;
@@ -703,7 +714,7 @@ fn glow_map(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, laye
     }
     let ch = app.ui.fx_curve_channel.get(&euid).copied().unwrap_or(0).min(2);
     let cols = [Color32::from_rgb(0xf0, 0x50, 0x50), Color32::from_rgb(0x50, 0xd0, 0x60), Color32::from_rgb(0x50, 0x80, 0xff)];
-    if let Some(n) = tabs(app, ui, p, x0, r.min.y + 15.0, ch, &["Red", "Green", "Blue"], &cols, &format!("{prefix}.channel")) {
+    if let Some(n) = tabs(app, ui, p, pos2(x0, r.min.y + 15.0), ch, (&["Red", "Green", "Blue"], &cols), &format!("{prefix}.channel")) {
         app.ui.fx_curve_channel.insert(euid, n);
     }
     if reset_link(app, ui, p, Rect::from_min_size(pos2(x0 + size - 44.0, r.min.y + 6.0), vec2(44.0, 18.0)), &format!("{prefix}.reset")) {
@@ -712,8 +723,8 @@ fn glow_map(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, laye
         set_str(actions, layer, g, "arbitraryMap", join_map(&m), None);
     }
     let gr = Rect::from_min_size(pos2(x0, r.min.y + 30.0), vec2(size, size));
-    let gid = egui::Id::new(("glow-map", euid, ch));
-    let (resp, edit) = fw::curves_graph(ui, gr, &map[ch], ch + 1, false, gid, &t);
+    let gid = egui::Id::unique(("glow-map", euid, ch));
+    let (resp, edit) = fw::curves_graph(ui, gr, &map[ch], ch + 1, fw::CurveMode { pencil: false, natural: false }, gid, &t);
     app.auto.add(&format!("{prefix}.graph"), gr, "Arbitrary Map");
     register_points(app, &prefix, gr, &map[ch].0);
     let key = gesture_key(ui, gid, resp.drag_started() || resp.clicked());
@@ -769,6 +780,10 @@ pub fn add_pair(v: &[(f64, f64)]) -> (f64, f64) {
     ((a.0 + ds * 0.5).rem_euclid(1.0), (a.1 + gap * 0.5).rem_euclid(1.0))
 }
 
+/// Reshape's correspondence buttons: Add Point appends a pair at the widest destination-fraction
+/// gap (or `(0, 0)` for an empty list), Remove Point drops the last stored pair, and Clear removes
+/// all pairs. A status line says whether points are automatic. Each change
+/// queues a `prop.set` of the `correspondencePoints` string on `actions`.
 #[allow(clippy::too_many_arguments)]
 fn reshape_buttons(
     app: &mut EffectcraftApp,
@@ -786,19 +801,19 @@ fn reshape_buttons(
     let b1 = Rect::from_min_size(pos2(r.min.x + 24.0, r.min.y + 4.0), vec2(84.0, 22.0));
     let b2 = Rect::from_min_size(pos2(b1.max.x + 8.0, b1.min.y), vec2(96.0, 22.0));
     let b3 = Rect::from_min_size(pos2(b2.max.x + 8.0, b1.min.y), vec2(56.0, 22.0));
-    if widgets::text_button(ui, b1, "Add Point", false, &t, egui::Id::new(("reshape-add", euid))).clicked() {
+    if widgets::text_button(ui, b1, "Add Point", false, &t, egui::Id::unique(("reshape-add", euid))).clicked() {
         let mut v = pairs.clone();
         v.push(add_pair(&pairs));
         set_str(actions, layer, g, "correspondencePoints", format_pairs(&v), None);
     }
     app.auto.add(&format!("effectControls.effect.{euid}.reshape.add"), b1, "Add Point");
-    if widgets::text_button(ui, b2, "Remove Point", false, &t, egui::Id::new(("reshape-remove", euid))).clicked() && !pairs.is_empty() {
+    if widgets::text_button(ui, b2, "Remove Point", false, &t, egui::Id::unique(("reshape-remove", euid))).clicked() && !pairs.is_empty() {
         let mut v = pairs.clone();
         v.pop();
         set_str(actions, layer, g, "correspondencePoints", format_pairs(&v), None);
     }
     app.auto.add(&format!("effectControls.effect.{euid}.reshape.remove"), b2, "Remove Point");
-    if widgets::text_button(ui, b3, "Clear", false, &t, egui::Id::new(("reshape-clear", euid))).clicked() && !pairs.is_empty() {
+    if widgets::text_button(ui, b3, "Clear", false, &t, egui::Id::unique(("reshape-clear", euid))).clicked() && !pairs.is_empty() {
         set_str(actions, layer, g, "correspondencePoints", String::new(), None);
     }
     app.auto.add(&format!("effectControls.effect.{euid}.reshape.clear"), b3, "Clear");
@@ -857,8 +872,8 @@ fn extractor_layers(
     p.text(pos2(r.min.x + 37.0, r.center().y), Align2::LEFT_CENTER, tr("Layer"), Tokens::ui(12.0), t.text);
     let vx = (r.min.x + r.width() * 0.48).max(r.min.x + 161.0);
     let dr = Rect::from_min_size(pos2(vx, r.center().y - 9.0), vec2((r.max.x - vx - 56.0).clamp(80.0, 200.0), 18.0));
-    let pop = egui::Id::new(("extractor-layers", euid));
-    if widgets::dropdown(ui, dr, &label, &t, egui::Id::new(("extractor-layer", euid)))
+    let pop = egui::Id::unique(("extractor-layers", euid));
+    if widgets::dropdown(ui, dr, &label, &t, egui::Id::unique(("extractor-layer", euid)))
         .on_hover_text(tr("The OpenEXR layer shown in red, green, blue and alpha"))
         .clicked()
     {
@@ -899,8 +914,8 @@ pub fn channel_popup(
     let t = app.tokens;
     let uid = prop.uid;
     let label = if cur.trim().is_empty() { NO_CHANNEL } else { cur };
-    let pop = egui::Id::new(("ec-chpop", uid));
-    if widgets::dropdown(ui, r, label, &t, egui::Id::new(("ec-ch", uid))).clicked() {
+    let pop = egui::Id::unique(("ec-chpop", uid));
+    if widgets::dropdown(ui, r, label, &t, egui::Id::unique(("ec-ch", uid))).clicked() {
         widgets::open_popup(ui, pop);
     }
     app.auto.add(&format!("effectControls.prop.{uid}.value"), r, &prop.name);
@@ -992,7 +1007,7 @@ pub fn reshape_overlay(
         painter.line_segment([ps, pd], Stroke::new(1.0, Color32::from_white_alpha(150)));
         for (end, s, col) in [(0usize, ps, ys), (1, pd, cs)] {
             let hr = Rect::from_center_size(s, vec2(12.0, 12.0));
-            let id = egui::Id::new(("reshape-pt", g.uid, i, end));
+            let id = egui::Id::unique(("reshape-pt", g.uid, i, end));
             let resp = ui.interact(hr, id, Sense::drag());
             let hot = resp.hovered() || resp.dragged();
             painter.rect_filled(Rect::from_center_size(s, vec2(7.0, 7.0)), 0.0, if hot { Color32::WHITE } else { col });
@@ -1086,7 +1101,7 @@ pub fn mesh_warp_overlay(
     let accent = app.tokens.accent;
     for (k, s) in screen.iter().enumerate() {
         let hr = Rect::from_center_size(*s, vec2(10.0, 10.0));
-        let id = egui::Id::new(("mesh-warp-vertex", g.uid, k));
+        let id = egui::Id::unique(("mesh-warp-vertex", g.uid, k));
         let resp = ui.interact(hr, id, Sense::drag());
         let hot = resp.hovered() || resp.dragged();
         let dot = Rect::from_center_size(*s, vec2(5.0, 5.0));
diff --git a/crates/ui-egui/src/panels/fx_widgets.rs b/crates/ui-egui/src/panels/fx_widgets.rs
index ca49c3fd0..b23000d27 100644
--- a/crates/ui-egui/src/panels/fx_widgets.rs
+++ b/crates/ui-egui/src/panels/fx_widgets.rs
@@ -59,7 +59,8 @@ pub fn angle_field(ui: &mut egui::Ui, at: Pos2, id: egui::Id, v: f64, decimals:
     let (rev, deg) = split_angle(v);
     let (rr, new_rev, _) = widgets::hot_int_at(ui, at, id.with("rev"), rev, 0.1, "x", t);
     let sign = ui.painter().text(pos2(rr.max.x - 2.0, rr.center().y), Align2::LEFT_CENTER, if deg < 0.0 { "-" } else { "+" }, Tokens::ui(12.0), t.hot_text);
-    let (dr, new_deg, _) = widgets::hot_number_at(ui, pos2(sign.max.x - 2.0, at.y), id, deg.abs(), 0.5, (-1e9, 1e9), decimals, "°", t);
+    let (dr, new_deg, _) =
+        widgets::hot_number_at(ui, pos2(sign.max.x - 2.0, at.y), id, deg.abs(), &widgets::HotSpec { speed: 0.5, range: (-1e9, 1e9), decimals, suffix: "°" }, t);
     let dragging = new_deg.is_some() && ui.ctx().is_being_dragged(id);
     let out = match (new_rev, new_deg) {
         (Some(r), _) => Some(r as f64 * 360.0 + deg),
@@ -291,7 +292,8 @@ impl CurvePoints {
     pub fn hit(&self, x: f32, y: f32, r: f32) -> Option<usize> {
         self.0.iter().enumerate().map(|(i, p)| (i, (p[0] - x).hypot(p[1] - y))).filter(|(_, d)| *d <= r).min_by(|a, b| a.1.total_cmp(&b.1)).map(|(i, _)| i)
     }
-    /// The curve the effect renders (the same monotone spline), evaluated at `x`.
+    /// The monotone spline (`Curve::parse`) through the points, evaluated at `x`: the curve
+    /// Lumetri's RGB curves and Glow's arbitrary map render.
     pub fn eval(&self, x: f32) -> f32 {
         effectcraft_engine::effects::Curve::parse(&self.format()).map(|c| c.eval(x)).unwrap_or(x)
     }
@@ -324,13 +326,56 @@ pub struct CurveEdit {
     pub done: bool,
 }
 
+/// How the Curves graph takes input: `pencil` draws freehand, `natural` picks the natural spline.
+#[derive(Clone, Copy)]
+pub struct CurveMode {
+    pub pencil: bool,
+    pub natural: bool,
+}
+
 /// The Curves graph: grid, identity diagonal, the curve, its points. Click adds a point, drag
 /// moves one, dragging a point off the graph (or Alt-clicking it) removes it. In pencil mode a
-/// drag draws the curve freehand.
-pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: usize, pencil: bool, id: egui::Id, t: &Tokens) -> (egui::Response, CurveEdit) {
+/// drag draws the curve freehand. `mode.natural` draws the natural spline the Curves effect
+/// renders (`Curve::parse_natural`) instead of the monotone one.
+pub fn curves_graph(
+    ui: &mut egui::Ui,
+    rect: Rect,
+    pts: &CurvePoints,
+    channel: usize,
+    mode: CurveMode,
+    id: egui::Id,
+    t: &Tokens,
+) -> (egui::Response, CurveEdit) {
     let resp = ui.interact(rect.expand(6.0), id, Sense::click_and_drag());
     let p = ui.painter().with_clip_rect(rect.expand(8.0));
     p.rect_filled(rect, 0.0, Color32::from_rgb(0x1c, 0x1c, 0x1c));
+    draw_curve_grid(&p, rect, t);
+    let col = curve_channel_color(channel);
+    let spline =
+        if mode.natural { effectcraft_engine::effects::Curve::parse_natural(&pts.format()) } else { effectcraft_engine::effects::Curve::parse(&pts.format()) };
+    let eval = |x: f32| spline.as_ref().map(|c| c.eval(x)).unwrap_or(x);
+    let line: Vec<Pos2> = (0..=96)
+        .map(|i| {
+            let x = i as f32 / 96.0;
+            curve_to_screen(rect, x, eval(x).clamp(0.0, 1.0))
+        })
+        .collect();
+    p.add(egui::Shape::line(line, Stroke::new(1.5, col)));
+    let drag_id = id.with("drag");
+    let dragging: Option<usize> = ui.data(|d| d.get_temp(drag_id));
+    draw_curve_points(&p, rect, pts, col, dragging);
+    if mode.pencil {
+        let edit = curve_pencil(ui, &resp, rect, id, &eval);
+        return (resp, edit);
+    }
+    let mut edit = CurveEdit::default();
+    curve_drag(ui, &resp, rect, pts, drag_id, dragging, &mut edit);
+    let alt = ui.input(|i| i.modifiers.alt);
+    curve_click(&resp, rect, pts, alt, &mut edit);
+    (resp, edit)
+}
+
+fn draw_curve_grid(p: &egui::Painter, rect: Rect, t: &Tokens) {
     for k in 1..4 {
         let f = k as f32 / 4.0;
         let x = rect.min.x + rect.width() * f;
@@ -340,28 +385,29 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u
     }
     p.line_segment([rect.left_bottom(), rect.right_top()], Stroke::new(1.0, Color32::from_white_alpha(40)));
     p.rect_stroke(rect, 0.0, Stroke::new(1.0, t.field_border), StrokeKind::Outside);
-    let col = match channel {
+}
+
+fn curve_channel_color(channel: usize) -> Color32 {
+    match channel {
         1 => Color32::from_rgb(0xf0, 0x60, 0x60),
         2 => Color32::from_rgb(0x60, 0xe0, 0x70),
         3 => Color32::from_rgb(0x60, 0x90, 0xff),
         4 => Color32::from_gray(0xb0),
         _ => Color32::from_gray(0xe8),
-    };
-    let to_s = |x: f32, y: f32| pos2(rect.min.x + x * rect.width(), rect.max.y - y * rect.height());
-    let to_g = |s: Pos2| [((s.x - rect.min.x) / rect.width()), ((rect.max.y - s.y) / rect.height())];
-    let spline = effectcraft_engine::effects::Curve::parse(&pts.format());
-    let line: Vec<Pos2> = (0..=96)
-        .map(|i| {
-            let x = i as f32 / 96.0;
-            to_s(x, spline.as_ref().map(|c| c.eval(x)).unwrap_or(x).clamp(0.0, 1.0))
-        })
-        .collect();
-    p.add(egui::Shape::line(line, Stroke::new(1.5, col)));
-    let drag_id = id.with("drag");
-    let pencil_id = id.with("pencil");
-    let dragging: Option<usize> = ui.data(|d| d.get_temp(drag_id));
+    }
+}
+
+fn curve_to_screen(rect: Rect, x: f32, y: f32) -> Pos2 {
+    pos2(rect.min.x + x * rect.width(), rect.max.y - y * rect.height())
+}
+
+fn screen_to_curve(rect: Rect, s: Pos2) -> [f32; 2] {
+    [((s.x - rect.min.x) / rect.width()), ((rect.max.y - s.y) / rect.height())]
+}
+
+fn draw_curve_points(p: &egui::Painter, rect: Rect, pts: &CurvePoints, col: Color32, dragging: Option<usize>) {
     for (i, q) in pts.0.iter().enumerate() {
-        let s = to_s(q[0], q[1]);
+        let s = curve_to_screen(rect, q[0], q[1]);
         let r = Rect::from_center_size(s, vec2(7.0, 7.0));
         if dragging == Some(i) {
             p.rect_filled(r, 0.0, col);
@@ -370,33 +416,41 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u
             p.rect_stroke(r, 0.0, Stroke::new(1.2, col), StrokeKind::Inside);
         }
     }
+}
+
+/// Pencil mode: a drag overwrites the sampled curve under the pointer.
+fn curve_pencil(ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, id: egui::Id, eval: &dyn Fn(f32) -> f32) -> CurveEdit {
+    let pencil_id = id.with("pencil");
+    let seed = || (0..=64).map(|i| eval(i as f32 / 64.0)).collect::<Vec<f32>>();
     let mut edit = CurveEdit::default();
-    let hit_r = 7.0 / rect.width();
-    let alt = ui.input(|i| i.modifiers.alt);
-    if pencil {
-        if resp.drag_started() {
-            ui.data_mut(|d| d.insert_temp(pencil_id, (0..=64).map(|i| pts.eval(i as f32 / 64.0)).collect::<Vec<f32>>()));
-        }
-        if (resp.dragged() || resp.clicked())
-            && let Some(pt) = resp.interact_pointer_pos()
-        {
-            let mut samples: Vec<f32> = ui.data(|d| d.get_temp(pencil_id)).unwrap_or_else(|| (0..=64).map(|i| pts.eval(i as f32 / 64.0)).collect());
-            let g = to_g(pt);
-            let i = (g[0].clamp(0.0, 1.0) * 64.0).round() as usize;
-            samples[i.min(64)] = g[1].clamp(0.0, 1.0);
-            ui.data_mut(|d| d.insert_temp(pencil_id, samples.clone()));
-            edit.changed = Some(CurvePoints::from_samples(&samples));
-        }
-        if resp.drag_stopped() {
-            ui.data_mut(|d| d.remove::<Vec<f32>>(pencil_id));
-            edit.done = true;
-        }
-        return (resp, edit);
+    if resp.drag_started() {
+        ui.data_mut(|d| d.insert_temp(pencil_id, seed()));
     }
+    if (resp.dragged() || resp.clicked())
+        && let Some(pt) = resp.interact_pointer_pos()
+    {
+        let mut samples: Vec<f32> = ui.data(|d| d.get_temp(pencil_id)).unwrap_or_else(seed);
+        let g = screen_to_curve(rect, pt);
+        let i = (g[0].clamp(0.0, 1.0) * 64.0).round() as usize;
+        samples[i.min(64)] = g[1].clamp(0.0, 1.0);
+        ui.data_mut(|d| d.insert_temp(pencil_id, samples.clone()));
+        edit.changed = Some(CurvePoints::from_samples(&samples));
+    }
+    if resp.drag_stopped() {
+        ui.data_mut(|d| d.remove::<Vec<f32>>(pencil_id));
+        edit.done = true;
+    }
+    edit
+}
+
+/// Drag a point to move it, or drag from empty space to insert one; dropping a point well off
+/// the graph removes it.
+fn curve_drag(ui: &mut egui::Ui, resp: &egui::Response, rect: Rect, pts: &CurvePoints, drag_id: egui::Id, dragging: Option<usize>, edit: &mut CurveEdit) {
+    let hit_r = 7.0 / rect.width();
     if resp.drag_started()
         && let Some(pt) = ui.input(|i| i.pointer.press_origin())
     {
-        let g = to_g(pt);
+        let g = screen_to_curve(rect, pt);
         let i = match pts.hit(g[0], g[1], hit_r) {
             Some(i) => i,
             None => {
@@ -410,7 +464,7 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u
     } else if resp.dragged()
         && let (Some(i), Some(pt)) = (dragging, resp.interact_pointer_pos())
     {
-        let g = to_g(pt);
+        let g = screen_to_curve(rect, pt);
         let mut np = pts.clone();
         np.move_point(i, g[0], g[1]);
         if np != *pts {
@@ -429,10 +483,15 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u
         ui.data_mut(|d| d.remove::<usize>(drag_id));
         edit.done = true;
     }
+}
+
+/// A click adds a point on empty space; Alt-clicking a point removes it.
+fn curve_click(resp: &egui::Response, rect: Rect, pts: &CurvePoints, alt: bool, edit: &mut CurveEdit) {
     if resp.clicked()
         && let Some(pt) = resp.interact_pointer_pos()
     {
-        let g = to_g(pt);
+        let g = screen_to_curve(rect, pt);
+        let hit_r = 7.0 / rect.width();
         let mut np = pts.clone();
         match pts.hit(g[0], g[1], hit_r) {
             Some(i) if alt => {
@@ -448,7 +507,6 @@ pub fn curves_graph(ui: &mut egui::Ui, rect: Rect, pts: &CurvePoints, channel: u
         }
         edit.done = true;
     }
-    (resp, edit)
 }
 
 // ---------------------------------------------------------------------------------------------
diff --git a/crates/ui-egui/src/panels/gradient_editor.rs b/crates/ui-egui/src/panels/gradient_editor.rs
index bb6923025..fe10f4ddb 100644
--- a/crates/ui-egui/src/panels/gradient_editor.rs
+++ b/crates/ui-egui/src/panels/gradient_editor.rs
@@ -246,6 +246,12 @@ fn to_color32(c: [f32; 4]) -> Color32 {
     Color32::from_rgba_unmultiplied(b(c[0]), b(c[1]), b(c[2]), b(c[3]))
 }
 
+/// The Gradient Editor dialog for the gradient in `app.dialog_state.gradient`: a stop track for
+/// the opacity and colour tracks over a checkerboard preview, the selected stop's location,
+/// opacity or colour and a Delete button (when its track has more than one stop), the
+/// mismatched-stop-count warning, and OK/Cancel. Dragging moves stops, Delete/Backspace removes the
+/// selected one unless a widget wants keyboard input. OK runs the commit path; Cancel closes the dialog and drops the
+/// draft. With no gradient target it closes the dialog.
 pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
     if app.dialog_state.gradient.target.is_none() {
         app.dialog = None;
@@ -291,7 +297,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
 
         // Clicking a row's empty space adds a stop there.
         for (track, rowr, id) in [(Track::Opacity, opacity_row, "dialog.gradient.addOpacity"), (Track::Color, color_row, "dialog.gradient.addColor")] {
-            let r = ui.interact(rowr, egui::Id::new(("gradient-add", id)), Sense::click());
+            let r = ui.interact(rowr, egui::Id::unique(("gradient-add", id)), Sense::click());
             app.auto.add(id, rowr, id);
             if r.clicked()
                 && let Some(p) = r.interact_pointer_pos()
@@ -323,7 +329,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                     Stroke::new(if selected { 2.0 } else { 1.0 }, if selected { t.accent } else { t.field_border }),
                     StrokeKind::Outside,
                 );
-                let resp = ui.interact(r.expand(2.0), egui::Id::new(("gradient-stop", track == Track::Color, id)), Sense::click_and_drag());
+                let resp = ui.interact(r.expand(2.0), egui::Id::unique(("gradient-stop", track == Track::Color, id)), Sense::click_and_drag());
                 let name = match track {
                     Track::Opacity => format!("dialog.gradient.opacityStop.{i}"),
                     Track::Color => format!("dialog.gradient.colorStop.{i}"),
diff --git a/crates/ui-egui/src/panels/gradient_handles.rs b/crates/ui-egui/src/panels/gradient_handles.rs
index bfe87a47b..bc0ec4d82 100644
--- a/crates/ui-egui/src/panels/gradient_handles.rs
+++ b/crates/ui-egui/src/panels/gradient_handles.rs
@@ -32,7 +32,7 @@ fn gradient_paints<'a>(g: &'a PropGroup, depth: usize, out: &mut Vec<&'a PropGro
 }
 
 /// `g` or something inside it is selected on `layer`.
-fn selected_in(g: &PropGroup, layer: LayerId, selected: &[(LayerId, u64)]) -> bool {
+pub(crate) fn selected_in(g: &PropGroup, layer: LayerId, selected: &[(LayerId, u64)]) -> bool {
     fn contains(g: &PropGroup, uid: u64, depth: usize) -> bool {
         g.uid == uid || (depth < 16 && g.children.iter().any(|n| n.uid() == uid || matches!(n, Node::Group(c) if contains(c, uid, depth + 1))))
     }
@@ -76,7 +76,7 @@ pub fn viewer_hook(
             }
             for (pr, s) in pts.iter().zip(screen) {
                 let hr = Rect::from_center_size(s, vec2(16.0, 16.0));
-                let id = egui::Id::new(("viewer-gradient-pt", pr.uid));
+                let id = egui::Id::unique(("viewer-gradient-pt", pr.uid));
                 let resp = ui.interact(hr, id, Sense::drag());
                 let col = if resp.hovered() || resp.dragged() { t.accent } else { Color32::WHITE };
                 fw::draw_crosshair(painter, s + vec2(1.0, 1.0), 5.0, Color32::from_black_alpha(160));
diff --git a/crates/ui-egui/src/panels/graph.rs b/crates/ui-egui/src/panels/graph.rs
index 0b372c0a0..24df22616 100644
--- a/crates/ui-egui/src/panels/graph.rs
+++ b/crates/ui-egui/src/panels/graph.rs
@@ -189,8 +189,11 @@ const MORE_POPUP: &str = "graph-more";
 impl ButtonBar {
     const MORE_W: f32 = 24.0;
 
+    /// A bar starting 8 points into `bar`, stopping short of its right end by the "»" button's
+    /// width. It takes the id picked from the "»" menu in the previous frame, so the button whose
+    /// id that was reports a click on the frame after the pick.
     fn new(ctx: &egui::Context, bar: Rect) -> Self {
-        let chosen = ctx.data_mut(|d| d.remove_temp::<String>(egui::Id::new(MORE_POPUP).with("chosen")));
+        let chosen = ctx.data_mut(|d| d.remove_temp::<String>(egui::Id::unique(MORE_POPUP).with("chosen")));
         ButtonBar { x: bar.min.x + 8.0, limit: bar.max.x - 8.0 - Self::MORE_W - 4.0, hidden: Vec::new(), chosen }
     }
 
@@ -201,7 +204,7 @@ impl ButtonBar {
         }
         let t = app.tokens;
         let r = Rect::from_min_size(pos2(bar.max.x - 8.0 - Self::MORE_W, bar.center().y - 9.0), vec2(Self::MORE_W, 18.0));
-        let pid = egui::Id::new(MORE_POPUP);
+        let pid = egui::Id::unique(MORE_POPUP);
         let resp = ui.interact(r, pid.with("button"), Sense::click()).on_hover_text(crate::i18n::tr("More"));
         p.rect_filled(r, 3.0, if resp.hovered() { t.hover } else { Color32::from_rgb(0x2c, 0x2c, 0x2c) });
         p.text(r.center(), Align2::CENTER_CENTER, "»", Tokens::ui(12.0), t.text);
@@ -233,17 +236,20 @@ impl ButtonBar {
     }
 }
 
-fn text_button(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    bar: &mut ButtonBar,
-    y: f32,
-    label: &str,
+/// One text button of the Graph Editor's button bar at the bar's current `x`, in the toolbar row
+/// at `y`: draws it, registers it for automation and advances the bar. Once a button does not fit
+/// (or a previous one overflowed), the button goes to the "»" menu instead and only the id the
+/// menu picked reports a click. Returns whether this button was chosen.
+/// One bar button for [`text_button`]: label, lit state, automation id and tooltip.
+struct BarBtn<'a> {
+    label: &'a str,
     on: bool,
-    id: &str,
-    tip: &str,
-) -> bool {
+    id: &'a str,
+    tip: &'a str,
+}
+
+fn text_button(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, bar: &mut ButtonBar, y: f32, btn: BarBtn) -> bool {
+    let BarBtn { label, on, id, tip } = btn;
     let t = app.tokens;
     let w = p.layout_no_wrap(label.to_string(), Tokens::ui(11.0), t.text).size().x + 14.0;
     // Once one button overflows, the rest follow it into the menu (they keep their order).
@@ -252,7 +258,7 @@ fn text_button(
         return bar.chosen.as_deref() == Some(id);
     }
     let r = Rect::from_min_size(pos2(bar.x, y - 9.0), vec2(w, 18.0));
-    let resp = ui.interact(r, egui::Id::new(("graph-btn", id)), Sense::click()).on_hover_text(tip);
+    let resp = ui.interact(r, egui::Id::unique(("graph-btn", id)), Sense::click()).on_hover_text(tip);
     p.rect_filled(
         r,
         3.0,
@@ -270,35 +276,44 @@ fn text_button(
     resp.clicked()
 }
 
-/// Draw the Graph Editor into `area` (the right side of the Timeline) and queue edits.
-pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, comp: &Comp, ectx: &EvalCtx, tm: TMap, area: Rect, actions: &mut Actions) {
-    let t = app.tokens;
-    let ctx = ui.ctx().clone();
-    let footer_h = 28.0;
-    let plot = Rect::from_min_max(area.min + vec2(0.0, 6.0), pos2(area.max.x, area.max.y - footer_h));
-    let bar = Rect::from_min_max(pos2(area.min.x, area.max.y - footer_h), area.max);
-    // Background first so keys and handles (added later) sit on top for hit-testing.
-    let bg = ui.interact(plot, egui::Id::new("graph-bg"), Sense::click_and_drag());
-    p.rect_filled(area, 0.0, Color32::from_rgb(0x1d, 0x1d, 0x1d));
-    app.auto.add("timeline.graph", plot, &app.ui.timeline.graph_mode.clone());
-    let speed = speed_graph(app, comp);
-    let cs = curves(app, comp, ectx, tm, plot, speed);
-    // Just opened, or the graph type changed (value and speed have different units): frame the
-    // graphs (Fit Selection to View, else Fit All Graphs to View).
-    let was_speed_id = egui::Id::new("graph-was-speed");
-    let type_changed = ctx.data(|d| d.get_temp::<bool>(was_speed_id)).is_some_and(|was| was != speed);
-    ctx.data_mut(|d| d.insert_temp(was_speed_id, speed));
-    if ctx.data_mut(|d| d.remove_temp::<bool>(fit_pending_id())).unwrap_or(false) || type_changed {
-        if cs.iter().any(|c| c.keys.iter().any(|k| k.sel)) {
-            fit_selection(app, &cs, tm, plot, speed);
-        } else {
-            fit_all(app);
+/// What the Graph Editor draws: the composition, its evaluation context and the time mapping.
+#[derive(Clone, Copy)]
+pub(crate) struct GraphView<'a> {
+    pub comp: &'a Comp,
+    pub ectx: &'a EvalCtx<'a>,
+    pub tm: TMap,
+}
+
+/// Show Reference Graph: the other graph type, faint, scaled to the plot.
+fn reference_graph(app: &EffectcraftApp, view: GraphView, plot: Rect, speed: bool, pc: &egui::Painter) {
+    let GraphView { comp, ectx, tm } = view;
+    let other = curves(app, comp, ectx, tm, plot, !speed);
+    let (mut rlo, mut rhi) = (f64::INFINITY, f64::NEG_INFINITY);
+    for c in &other {
+        for (_, v) in &c.pts {
+            rlo = rlo.min(*v);
+            rhi = rhi.max(*v);
         }
     }
+    if rlo.is_finite() {
+        let span = (rhi - rlo).max(1e-9);
+        let lines: Vec<(Color32, Vec<Pos2>)> = other
+            .iter()
+            .map(|c| {
+                (
+                    c.color,
+                    c.pts.iter().map(|(ct, v)| pos2(tm.x(*ct), plot.max.y - ((v - rlo) / span) as f32 * plot.height() * 0.9 - plot.height() * 0.05)).collect(),
+                )
+            })
+            .collect();
+        super::graph_tools::reference_graph(pc, plot, &lines);
+    }
+}
 
-    // Vertical range: auto-zoom to the curves + handles, or the stored manual range.
+/// The value range that fits every curve point and key handle (with a margin).
+fn auto_range(cs: &[Curve], speed: bool) -> (f64, f64) {
     let (mut lo, mut hi) = (f64::INFINITY, f64::NEG_INFINITY);
-    for c in &cs {
+    for c in cs {
         for (_, v) in &c.pts {
             lo = lo.min(*v);
             hi = hi.max(*v);
@@ -320,9 +335,80 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
         hi = lo + 1.0;
     }
     let pad = (hi - lo) * 0.08;
-    let auto = (lo - pad, hi + pad);
+    (lo - pad, hi + pad)
+}
+
+/// Background: a click deselects keys, a drag box-selects the keys inside it.
+fn box_select(ui: &egui::Ui, pc: &egui::Painter, bg: &egui::Response, key_screens: &[(serde_json::Value, Pos2)], accent: Color32, actions: &mut Actions) {
+    let ctx = ui.ctx().clone();
+    if bg.clicked() {
+        actions.push(("keys.select".into(), json!({"keys": []})));
+    }
+    if bg.dragged()
+        && let (Some(o), Some(cur)) = (ctx.input(|i| i.pointer.press_origin()), bg.interact_pointer_pos())
+    {
+        let br = Rect::from_two_pos(o, cur);
+        pc.rect_filled(br, 0.0, accent.gamma_multiply(0.12));
+        pc.rect_stroke(br, 0.0, Stroke::new(1.0, accent), StrokeKind::Middle);
+        ctx.data_mut(|d| d.insert_temp(egui::Id::unique("graph-box"), br));
+    }
+    if bg.drag_stopped()
+        && let Some(br) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::unique("graph-box")))
+    {
+        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::unique("graph-box")));
+        let keys: Vec<serde_json::Value> = key_screens.iter().filter(|(_, sp)| br.contains(*sp)).map(|(k, _)| k.clone()).collect();
+        actions.push(("keys.select".into(), json!({"keys": keys, "add": ui.input(|i| i.modifiers.shift)})));
+    }
+}
+
+/// Wheel over the graph with Ctrl zooms the value axis `(lo, hi)` (turns auto-zoom off).
+fn wheel_zoom(app: &mut EffectcraftApp, ui: &egui::Ui, plot: Rect, (lo, hi): (f64, f64)) {
+    if ui.rect_contains_pointer(plot) {
+        let (dy, zoom) = ui.input(|i| (i.smooth_scroll_delta.y, i.modifiers.ctrl || i.modifiers.command));
+        if zoom && dy.abs() > 0.0 {
+            let k = (-dy as f64 / 200.0).exp();
+            let mid = (lo + hi) / 2.0;
+            app.ui.timeline.graph_auto_zoom = false;
+            app.ui.timeline.graph_range = Some((mid - (mid - lo) * k, mid + (hi - mid) * k));
+        }
+    }
+}
+
+/// Just opened, or the graph type changed (value and speed have different units): frame the
+/// graphs (Fit Selection to View, else Fit All Graphs to View).
+fn fit_on_open(app: &mut EffectcraftApp, ctx: &egui::Context, cs: &[Curve], tm: TMap, plot: Rect, speed: bool) {
+    let was_speed_id = egui::Id::unique("graph-was-speed");
+    let type_changed = ctx.data(|d| d.get_temp::<bool>(was_speed_id)).is_some_and(|was| was != speed);
+    ctx.data_mut(|d| d.insert_temp(was_speed_id, speed));
+    if ctx.data_mut(|d| d.remove_temp::<bool>(fit_pending_id())).unwrap_or(false) || type_changed {
+        if cs.iter().any(|c| c.keys.iter().any(|k| k.sel)) {
+            fit_selection(app, cs, tm, plot, speed);
+        } else {
+            fit_all(app);
+        }
+    }
+}
+
+/// Draw the Graph Editor into `area` (the right side of the Timeline) and queue edits.
+pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, view: GraphView, area: Rect, actions: &mut Actions) {
+    let GraphView { comp, ectx, tm } = view;
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let footer_h = 28.0;
+    let plot = Rect::from_min_max(area.min + vec2(0.0, 6.0), pos2(area.max.x, area.max.y - footer_h));
+    let bar = Rect::from_min_max(pos2(area.min.x, area.max.y - footer_h), area.max);
+    // Background first so keys and handles (added later) sit on top for hit-testing.
+    let bg = ui.interact(plot, egui::Id::unique("graph-bg"), Sense::click_and_drag());
+    p.rect_filled(area, 0.0, Color32::from_rgb(0x1d, 0x1d, 0x1d));
+    app.auto.add("timeline.graph", plot, &app.ui.timeline.graph_mode.clone());
+    let speed = speed_graph(app, comp);
+    let cs = curves(app, comp, ectx, tm, plot, speed);
+    fit_on_open(app, &ctx, &cs, tm, plot, speed);
+
+    // Vertical range: auto-zoom to the curves + handles, or the stored manual range.
+    let auto = auto_range(&cs, speed);
     // While a key or handle is being dragged the scale stays put (no feedback loop).
-    let drag_id = egui::Id::new("graph-dragging");
+    let drag_id = egui::Id::unique("graph-dragging");
     let dragging = ctx.data(|d| d.get_temp::<bool>(drag_id)).unwrap_or(false) && ctx.input(|i| i.pointer.any_down());
     let (lo, hi) = if app.ui.timeline.graph_auto_zoom && !dragging { auto } else { app.ui.timeline.graph_range.unwrap_or(auto) };
     if app.ui.timeline.graph_auto_zoom && !dragging {
@@ -351,32 +437,8 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
         );
     }
 
-    // Show Reference Graph: the other graph type, faint, scaled to the plot.
     if app.ui.timeline.graph_reference && !cs.is_empty() {
-        let other = curves(app, comp, ectx, tm, plot, !speed);
-        let (mut rlo, mut rhi) = (f64::INFINITY, f64::NEG_INFINITY);
-        for c in &other {
-            for (_, v) in &c.pts {
-                rlo = rlo.min(*v);
-                rhi = rhi.max(*v);
-            }
-        }
-        if rlo.is_finite() {
-            let span = (rhi - rlo).max(1e-9);
-            let lines: Vec<(Color32, Vec<Pos2>)> = other
-                .iter()
-                .map(|c| {
-                    (
-                        c.color,
-                        c.pts
-                            .iter()
-                            .map(|(ct, v)| pos2(tm.x(*ct), plot.max.y - ((v - rlo) / span) as f32 * plot.height() * 0.9 - plot.height() * 0.05))
-                            .collect(),
-                    )
-                })
-                .collect();
-            super::graph_tools::reference_graph(&pc, plot, &lines);
-        }
+        reference_graph(app, view, plot, speed, &pc);
     }
     // Curves.
     for c in &cs {
@@ -398,7 +460,7 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
             let kp = pos2(tm.x(k.t), ymap(k.v));
             // In the speed graph an end key rises with the handle being dragged; skipping it once it
             // leaves the plot would drop the handle's widget and end the drag at the top edge.
-            let handle_dragged = || ["in", "out"].iter().any(|side| ctx.is_being_dragged(egui::Id::new(("ghandle", uid, d, k.idx, *side))));
+            let handle_dragged = || ["in", "out"].iter().any(|side| ctx.is_being_dragged(egui::Id::unique(("ghandle", uid, d, k.idx, *side))));
             if !plot.expand(6.0).contains(kp) && !handle_dragged() {
                 continue;
             }
@@ -411,7 +473,7 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
                 pc.circle_filled(hp, 3.5, Color32::from_rgb(0xd8, 0xd8, 0x60));
                 let side = if h.out { "out" } else { "in" };
                 let hr = Rect::from_center_size(hp, vec2(10.0, 10.0));
-                let hresp = ui.interact(hr, egui::Id::new(("ghandle", uid, d, k.idx, side)), Sense::drag());
+                let hresp = ui.interact(hr, egui::Id::unique(("ghandle", uid, d, k.idx, side)), Sense::drag());
                 app.auto.add(&format!("timeline.graph.handle.{uid}.{d}.{}.{side}", k.idx), hr, "Bezier handle");
                 // The same side's handles of every selected key move with it, by as much as the
                 // pointer moved (After Effects), in one undo step.
@@ -464,7 +526,7 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
             pc.rect_filled(Rect::from_center_size(kp, vec2(7.0, 7.0)), 0.0, col);
             pc.rect_stroke(Rect::from_center_size(kp, vec2(7.0, 7.0)), 0.0, Stroke::new(1.0, c.color), StrokeKind::Outside);
             let kr = Rect::from_center_size(kp, vec2(11.0, 11.0));
-            let kresp = ui.interact(kr, egui::Id::new(("gkey", uid, d, k.idx)), Sense::click_and_drag());
+            let kresp = ui.interact(kr, egui::Id::unique(("gkey", uid, d, k.idx)), Sense::click_and_drag());
             app.auto.add(&format!("timeline.graph.key.{uid}.{d}.{}", k.idx), kr, &c.prop.name);
             let mods = ui.input(|i| i.modifiers);
             let key = &c.prop.keys[k.idx];
@@ -516,37 +578,19 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
 
     super::graph_tools::transform_box(app, ui, &pc, &sel_keys, tm, &ymap, &vmap, speed, true, actions);
 
-    // Background: click deselects keys, drag box-selects.
-    if bg.clicked() {
-        actions.push(("keys.select".into(), json!({"keys": []})));
-    }
-    if bg.dragged()
-        && let (Some(o), Some(cur)) = (ctx.input(|i| i.pointer.press_origin()), bg.interact_pointer_pos())
-    {
-        let br = Rect::from_two_pos(o, cur);
-        pc.rect_filled(br, 0.0, t.accent.gamma_multiply(0.12));
-        pc.rect_stroke(br, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Middle);
-        ctx.data_mut(|d| d.insert_temp(egui::Id::new("graph-box"), br));
-    }
-    if bg.drag_stopped()
-        && let Some(br) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::new("graph-box")))
-    {
-        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::new("graph-box")));
-        let keys: Vec<serde_json::Value> = key_screens.iter().filter(|(_, sp)| br.contains(*sp)).map(|(k, _)| k.clone()).collect();
-        actions.push(("keys.select".into(), json!({"keys": keys, "add": ui.input(|i| i.modifiers.shift)})));
-    }
-    // Wheel over the graph with Alt/Ctrl zooms the value axis (turns auto-zoom off).
-    if ui.rect_contains_pointer(plot) {
-        let (dy, zoom) = ui.input(|i| (i.smooth_scroll_delta.y, i.modifiers.ctrl || i.modifiers.command));
-        if zoom && dy.abs() > 0.0 {
-            let k = (-dy as f64 / 200.0).exp();
-            let mid = (lo + hi) / 2.0;
-            app.ui.timeline.graph_auto_zoom = false;
-            app.ui.timeline.graph_range = Some((mid - (mid - lo) * k, mid + (hi - mid) * k));
-        }
+    box_select(ui, &pc, &bg, &key_screens, t.accent, actions);
+    wheel_zoom(app, ui, plot, (lo, hi));
+    if button_bar(app, ui, p, comp, bar, speed, actions) {
+        fit_selection(app, &cs, tm, plot, speed);
     }
+}
 
-    // Button bar.
+/// The footer button bar: graph type, display toggles, fit, snap and keyframe interpolation.
+/// Returns whether Fit Selection was pressed.
+fn button_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, comp: &Comp, bar: Rect, speed: bool, actions: &mut Actions) -> bool {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let mut fit_sel = false;
     p.rect_filled(bar, 0.0, t.panel_bg);
     p.line_segment([bar.left_top(), bar.right_top()], Stroke::new(1.0, t.separator));
     let y = bar.center().y;
@@ -559,48 +603,71 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
         p,
         &mut buttons,
         y,
-        "Auto",
-        auto_type,
-        "autoSelectGraphType",
-        "Auto-Select Graph Type (speed graph for spatial properties, else value graph)",
+        BarBtn {
+            label: "Auto",
+            on: auto_type,
+            id: "autoSelectGraphType",
+            tip: "Auto-Select Graph Type (speed graph for spatial properties, else value graph)",
+        },
     ) {
         app.ui.timeline.graph_mode = if auto_type { if speed { "speed" } else { "value" } } else { "auto" }.into();
     }
     // Choosing a graph type turns Auto-Select off, as in After Effects.
-    if text_button(app, ui, p, &mut buttons, y, "Value", !speed, "valueGraph", "Edit Value Graph") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Value", on: !speed, id: "valueGraph", tip: "Edit Value Graph" }) {
         app.ui.timeline.graph_mode = "value".into();
     }
-    if text_button(app, ui, p, &mut buttons, y, "Speed", speed, "speedGraph", "Edit Speed Graph") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Speed", on: speed, id: "speedGraph", tip: "Edit Speed Graph" }) {
         app.ui.timeline.graph_mode = "speed".into();
     }
     buttons.x += 6.0;
-    if text_button(app, ui, p, &mut buttons, y, "Selected", show_sel, "showSelected", "Show Selected Properties (else all animated properties)") {
+    if text_button(
+        app,
+        ui,
+        p,
+        &mut buttons,
+        y,
+        BarBtn { label: "Selected", on: show_sel, id: "showSelected", tip: "Show Selected Properties (else all animated properties)" },
+    ) {
         app.ui.timeline.graph_show_selected = !show_sel;
     }
-    if text_button(app, ui, p, &mut buttons, y, "Auto-zoom", auto_on, "autoZoom", "Auto-zoom graph height") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Auto-zoom", on: auto_on, id: "autoZoom", tip: "Auto-zoom graph height" }) {
         app.ui.timeline.graph_auto_zoom = !auto_on;
     }
-    if text_button(app, ui, p, &mut buttons, y, "Fit", false, "fit", "Fit all graphs to view") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Fit", on: false, id: "fit", tip: "Fit all graphs to view" }) {
         fit_all(app);
     }
-    if text_button(app, ui, p, &mut buttons, y, "Fit Selection", false, "fitSelection", "Fit selection to view") {
-        fit_selection(app, &cs, tm, plot, speed);
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Fit Selection", on: false, id: "fitSelection", tip: "Fit selection to view" }) {
+        fit_sel = true;
     }
     buttons.x += 6.0;
     let (snap, reference, tbox) = (app.ui.timeline.graph_snap, app.ui.timeline.graph_reference, app.ui.timeline.graph_transform_box);
-    if text_button(app, ui, p, &mut buttons, y, "Snap", snap, "snap", "Snap (key drags snap to the current time and other keys)") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Snap", on: snap, id: "snap", tip: "Snap (key drags snap to the current time and other keys)" })
+    {
         app.ui.timeline.graph_snap = !snap;
     }
-    if text_button(app, ui, p, &mut buttons, y, "Reference", reference, "reference", "Show Reference Graph") {
+    if text_button(app, ui, p, &mut buttons, y, BarBtn { label: "Reference", on: reference, id: "reference", tip: "Show Reference Graph" }) {
         app.ui.timeline.graph_reference = !reference;
     }
-    if text_button(app, ui, p, &mut buttons, y, "Transform Box", tbox, "transformBox", "Show Transform Box when multiple keys are selected") {
+    if text_button(
+        app,
+        ui,
+        p,
+        &mut buttons,
+        y,
+        BarBtn { label: "Transform Box", on: tbox, id: "transformBox", tip: "Show Transform Box when multiple keys are selected" },
+    ) {
         app.ui.timeline.graph_transform_box = !tbox;
     }
     buttons.x += 6.0;
     let pos_sel = app.session.state.selected_props.iter().find_map(|(l, u)| super::timeline::is_position(comp.layer(*l)?, *u).then_some(l.0));
-    if text_button(app, ui, p, &mut buttons, y, "Separate Dimensions", false, "separateDimensions", "Separate Dimensions (Position)")
-        && let Some(l) = pos_sel.or(app.session.state.selected_layers.first().map(|l| l.0))
+    if text_button(
+        app,
+        ui,
+        p,
+        &mut buttons,
+        y,
+        BarBtn { label: "Separate Dimensions", on: false, id: "separateDimensions", tip: "Separate Dimensions (Position)" },
+    ) && let Some(l) = pos_sel.or(app.session.state.selected_layers.first().map(|l| l.0))
     {
         actions.push(("prop.separateDimensions".into(), json!({"layer": l})));
     }
@@ -614,11 +681,12 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
         ("Ease Out", "keys.easyEaseOut", json!({}), "Easy Ease Out (Ctrl+Shift+F9)"),
     ] {
         let id = cmd.trim_start_matches("keys.").to_string() + label.split_whitespace().next().unwrap_or("");
-        if text_button(app, ui, p, &mut buttons, y, label, false, &id, tip) {
+        if text_button(app, ui, p, &mut buttons, y, BarBtn { label, on: false, id: &id, tip }) {
             actions.push((cmd.into(), params));
         }
     }
     buttons.more(app, ui, p, bar);
+    fit_sel
 }
 
 /// Fit All Graphs to View: the whole comp in time, auto-zoomed values.
@@ -627,15 +695,17 @@ fn fit_all(app: &mut EffectcraftApp) {
     app.ui.timeline.pps = None;
 }
 
+/// The `egui::Id` of the one-shot flag [`track_open`] sets when the Graph Editor is switched on,
+/// so [`show`] frames all graphs on its next pass, once the plot rectangle is known.
 fn fit_pending_id() -> egui::Id {
-    egui::Id::new("graph-fit-pending")
+    egui::Id::unique("graph-fit-pending")
 }
 
 /// Called every Timeline frame with whether the Graph Editor is on: switching it on (header
 /// button, menu, Shift+F3 or the control channel) frames the graphs on its first frame, when the
 /// plot rect is known, as After Effects does.
 pub(crate) fn track_open(ctx: &egui::Context, on: bool) {
-    let was_id = egui::Id::new("graph-editor-was-on");
+    let was_id = egui::Id::unique("graph-editor-was-on");
     let was = ctx.data(|d| d.get_temp::<bool>(was_id)).unwrap_or(false);
     ctx.data_mut(|d| {
         d.insert_temp(was_id, on);
@@ -739,8 +809,10 @@ struct KeyGrab {
     t: f64,
 }
 
+/// The `egui::Id` of the key drag in progress ([`KeyGrab`]): where the button went down and the
+/// grabbed key's comp time when it did.
 fn key_grab_id() -> egui::Id {
-    egui::Id::new("graph-key-grab")
+    egui::Id::unique("graph-key-grab")
 }
 
 /// A Bezier handle moving with a handle drag: its key, side and dimension, the key's place
@@ -786,8 +858,10 @@ impl HandleGrab {
 /// A handle drag: where the button went down, and the handles that move.
 type HandleDrag = (Pos2, Vec<HandleGrab>);
 
+/// The `egui::Id` of the Bezier handle drag in progress ([`HandleDrag`]): the press position and
+/// the handles the drag moves.
 fn handle_drag_id() -> egui::Id {
-    egui::Id::new("graph-handle-drag")
+    egui::Id::unique("graph-handle-drag")
 }
 
 /// Which axes a drag may move on (time, value): both, or with Shift only the one the pointer moved more along.
diff --git a/crates/ui-egui/src/panels/graph_tools.rs b/crates/ui-egui/src/panels/graph_tools.rs
index a13a5396f..7950d4a66 100644
--- a/crates/ui-egui/src/panels/graph_tools.rs
+++ b/crates/ui-egui/src/panels/graph_tools.rs
@@ -34,8 +34,9 @@ struct BoxDrag {
     last: [f64; 2],
 }
 
+/// The `egui::Id` of the transform-box drag in progress ([`BoxDrag`]).
 fn box_id() -> egui::Id {
-    egui::Id::new("graph-transform-box")
+    egui::Id::unique("graph-transform-box")
 }
 
 /// Bounds of the selected keys: (t0, v0, t1, v1).
@@ -80,7 +81,7 @@ pub(crate) fn transform_box(
     let value_ok = !speed && keys.iter().all(|k| k.editable);
     let col = Color32::from_rgb(0xd8, 0xd8, 0xd8);
     let ctx = ui.ctx().clone();
-    let drag_id = egui::Id::new("graph-dragging");
+    let drag_id = egui::Id::unique("graph-dragging");
     let hp = handle_points(r);
     let data = |q: Pos2| [tm.t(q.x), vmap(q.y)];
     // Which data point each handle sits on, and its opposite.
@@ -100,7 +101,7 @@ pub(crate) fn transform_box(
     let mut resp_any: Option<egui::Response> = None;
     if !handles {
         p.rect_stroke(r, 0.0, Stroke::new(1.0, col.gamma_multiply(0.7)), StrokeKind::Middle);
-        let resp = ui.interact(r, egui::Id::new("graph-box-inside"), Sense::drag());
+        let resp = ui.interact(r, egui::Id::unique("graph-box-inside"), Sense::drag());
         app.auto.add("timeline.graph.transformBox", r, "Transform box");
         if resp.drag_started()
             && let Some(o) = ui.input(|i| i.pointer.press_origin())
@@ -117,7 +118,7 @@ pub(crate) fn transform_box(
             let hr = Rect::from_center_size(*h, vec2(7.0, 7.0));
             p.rect_filled(hr, 0.0, Color32::from_gray(0x20));
             p.rect_stroke(hr, 0.0, Stroke::new(1.0, col), StrokeKind::Middle);
-            let resp = ui.interact(hr.expand(2.0), egui::Id::new(("graph-box-handle", i)), Sense::drag());
+            let resp = ui.interact(hr.expand(2.0), egui::Id::unique(("graph-box-handle", i)), Sense::drag());
             app.auto.add(&format!("timeline.graph.transformBox.{i}"), hr, "Transform box handle");
             if resp.drag_started() {
                 let opp = [2, 3, 0, 1, 6, 7, 4, 5][i];
@@ -254,8 +255,9 @@ struct AltScale {
     span: Option<f64>,
 }
 
+/// The `egui::Id` of the Timeline Alt-drag group scale in progress ([`AltScale`]).
 fn alt_id() -> egui::Id {
-    egui::Id::new("timeline-alt-scale")
+    egui::Id::unique("timeline-alt-scale")
 }
 
 /// Selected keys' comp-time range.
diff --git a/crates/ui-egui/src/panels/home.rs b/crates/ui-egui/src/panels/home.rs
index 46bbb44fc..3b735e47e 100644
--- a/crates/ui-egui/src/panels/home.rs
+++ b/crates/ui-egui/src/panels/home.rs
@@ -67,21 +67,32 @@ pub fn recent_entries(prefs: &effectcraft_engine::prefs::Prefs) -> Vec<RecentEnt
         .collect()
 }
 
-/// `YYYY-MM-DD HH:MM` (UTC) from Unix seconds.
+/// Unix seconds → (proleptic Gregorian year, the same wall-clock instant moved into chrono's range
+/// by whole 400-year cycles). The Gregorian calendar repeats every 400 years (146_097 days), so
+/// month, day and time of day come from chrono and only the year is carried, which keeps every
+/// `i64` exact instead of collapsing out-of-range years to the epoch.
+fn utc_parts(secs: i64) -> (i64, chrono::NaiveDateTime) {
+    use chrono::Datelike;
+    let (days, sod) = (secs.div_euclid(86_400), secs.rem_euclid(86_400));
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(if y < 0 { i64::MIN } else { i64::MAX }), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
+}
+
+/// Unix seconds → `YYYY-MM-DD HH:MM` (UTC). Years far outside chrono's own range are preserved
+/// (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
 pub fn format_utc(secs: i64) -> String {
-    let days = secs.div_euclid(86_400);
-    let rem = secs.rem_euclid(86_400);
-    // Civil date from days since 1970-01-01 (Howard Hinnant's algorithm).
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z - era * 146_097;
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = yoe + era * 400 + i64::from(m <= 2);
-    format!("{y:04}-{m:02}-{d:02} {:02}:{:02}", rem / 3600, (rem % 3600) / 60)
+    let (y, t) = utc_parts(secs);
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", t.format("%m-%d %H:%M"))
 }
 
 /// How long ago `then` was, as the Home screen's Opened column shows it ("3 hours ago", then the
@@ -95,7 +106,8 @@ pub fn format_ago(now: i64, then: i64) -> String {
         3_600..86_400 => plural(d / 3_600, "{} hour ago", "{} hours ago"),
         86_400..172_800 => tr("Yesterday").to_string(),
         172_800..604_800 => plural(d / 86_400, "{} day ago", "{} days ago"),
-        _ => format_utc(then).get(..10).unwrap_or_default().to_string(),
+        // The date part: up to the space, not a fixed 10 bytes, so a year past 9999 stays whole.
+        _ => format_utc(then).split(' ').next().unwrap_or_default().to_string(),
     }
 }
 
@@ -115,7 +127,7 @@ pub fn format_size(bytes: u64) -> String {
 
 /// The Kind column: what a recent file is, by its extension, in the interface language.
 fn kind_of(path: &str) -> &'static str {
-    tr(match std::path::Path::new(path).extension().and_then(|e| e.to_str()).map(str::to_ascii_lowercase).as_deref() {
+    tr(match std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).map(str::to_ascii_lowercase).as_deref() {
         Some("ecproj") => "EffectCraft project",
         Some("aep" | "aepx") => "After Effects project",
         Some("json" | "lottie") => "Lottie animation",
@@ -154,12 +166,13 @@ pub fn encode_thumb(img: &egui::ColorImage) -> String {
     out
 }
 
+/// Decode a stored hex thumbnail, rejecting malformed or non-ASCII text.
 pub fn decode_thumb(text: &str) -> Option<egui::ColorImage> {
     let t = text.trim();
-    if t.len() != THUMB_W * THUMB_H * 6 {
+    if t.len() != THUMB_W * THUMB_H * 6 || !t.is_ascii() {
         return None;
     }
-    let b: Vec<u8> = (0..t.len()).step_by(2).map(|i| u8::from_str_radix(&t[i..i + 2], 16)).collect::<Result<_, _>>().ok()?;
+    let b: Vec<u8> = (0..t.len()).step_by(2).map(|i| u8::from_str_radix(t.get(i..i + 2)?, 16).ok()).collect::<Option<_>>()?;
     let px = b.as_chunks::<3>().0.iter().map(|c| Color32::from_rgb(c[0], c[1], c[2])).collect();
     Some(egui::ColorImage::new([THUMB_W, THUMB_H], px))
 }
@@ -238,7 +251,7 @@ fn rail_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rail:
     let mut y = rail.min.y + 20.0;
     for (label, id, primary) in [("New Project", "file.newProject", true), ("Open Project…", "file.open", false)] {
         let r = Rect::from_min_size(pos2(x0, y), vec2(w, 34.0));
-        if widgets::text_button(ui, r, tr(label), primary, &t, egui::Id::new(("home", id))).clicked() {
+        if widgets::text_button(ui, r, tr(label), primary, &t, egui::Id::unique(("home", id))).clicked() {
             actions.push((id, json!({})));
         }
         app.auto.add(&format!("home.{id}"), r, label);
@@ -255,7 +268,7 @@ fn rail_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rail:
     };
     for (k, (label, icon)) in [("Home", Icon::Home), ("Templates", Icon::Grid), ("Learn", Icon::Sparkle)].into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(rail.min.x + 8.0, y), vec2(rail.width() - 16.0, 34.0));
-        let resp = ui.interact(r, egui::Id::new(("home-tab", label)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("home-tab", label)), Sense::click());
         let on = page == k;
         if on || resp.hovered() {
             p.rect_filled(r, 6.0, if on { t.row_selected } else { t.hover });
@@ -286,7 +299,7 @@ fn rail_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rail:
     cy += 22.0;
     for (icon, label, cmd) in links {
         let r = Rect::from_min_size(pos2(x0, cy), vec2(w, 26.0));
-        let resp = ui.interact(r, egui::Id::new(("home-link", cmd)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("home-link", cmd)), Sense::click());
         let discord = cmd == "help.discord";
         if discord {
             p.rect_filled(r, 13.0, Color32::from_rgb(0x58, 0x65, 0xf2));
@@ -307,7 +320,7 @@ fn rail_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, rail:
     let sw = (w - 6.0) / 2.0;
     for (i, (name, slug)) in sib.iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + (i % 2) as f32 * (sw + 6.0), cy + (i / 2) as f32 * 26.0), vec2(sw, 22.0));
-        let resp = ui.interact(r, egui::Id::new(("sib", *slug)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("sib", *slug)), Sense::click());
         p.rect_filled(r, 11.0, if resp.hovered() { t.hover } else { t.field_bg });
         p.text(r.center(), Align2::CENTER_CENTER, *name, Tokens::ui(11.0), t.text);
         app.auto.add(&format!("home.sibling.{slug}"), r, name);
@@ -350,7 +363,7 @@ fn home_page(
     let tw = ((w - gap * 3.0) / 4.0).clamp(120.0, 220.0);
     for (k, (label, id, icon)) in tiles.into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + k as f32 * (tw + gap), y), vec2(tw, 64.0));
-        let resp = ui.interact(r, egui::Id::new(("home-tile", id)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("home-tile", id)), Sense::click());
         p.rect_filled(r, 8.0, if resp.hovered() { t.hover } else { t.panel_bg });
         p.rect_stroke(r, 8.0, Stroke::new(1.0, if resp.hovered() { t.accent } else { t.separator }), StrokeKind::Inside);
         let ir = Rect::from_center_size(pos2(r.min.x + 30.0, r.center().y), vec2(32.0, 32.0));
@@ -372,7 +385,7 @@ fn home_page(
     // Recent: heading, filter, clear.
     p.text(pos2(x0, y + 12.0), Align2::LEFT_CENTER, tr("Recent"), Tokens::semibold(17.0), t.tab_text_active);
     let entries = recent_entries(&app.session.prefs);
-    let fid = egui::Id::new("home-filter");
+    let fid = egui::Id::unique("home-filter");
     let mut filter: String = ctx.data(|d| d.get_temp(fid)).unwrap_or_default();
     let fr = Rect::from_min_size(pos2(x0 + w - 240.0, y), vec2(240.0, 26.0));
     widgets::search_field(ui, fr, &mut filter, tr("Filter recent files"), &t);
@@ -380,7 +393,7 @@ fn home_page(
     ctx.data_mut(|d| d.insert_temp(fid, filter.clone()));
     if !entries.is_empty() {
         let cr = Rect::from_min_size(pos2(fr.min.x - 96.0, y + 3.0), vec2(84.0, 20.0));
-        let resp = ui.interact(cr, egui::Id::new("home-clear-recent"), Sense::click());
+        let resp = ui.interact(cr, egui::Id::unique("home-clear-recent"), Sense::click());
         p.text(cr.right_center(), Align2::RIGHT_CENTER, tr("Clear list"), Tokens::ui(11.5), if resp.hovered() { t.text } else { t.text_faint });
         app.auto.add("home.clearRecent", cr, "Clear Recent Projects");
         if resp.clicked() {
@@ -417,7 +430,7 @@ fn home_page(
         if r.min.y > area.max.y {
             break;
         }
-        let resp = ui.interact(r, egui::Id::new(("home-recent", e.index)), Sense::click()).on_hover_text(&e.path);
+        let resp = ui.interact(r, egui::Id::unique(("home-recent", e.index)), Sense::click()).on_hover_text(&e.path);
         if resp.hovered() {
             p.rect_filled(r, 6.0, t.hover);
         }
@@ -484,6 +497,12 @@ fn run_actions(app: &mut EffectcraftApp, ctx: &egui::Context, actions: Vec<(&str
 mod tests {
     use super::*;
 
+    #[test]
+    fn non_ascii_thumbnail_is_rejected_without_panicking() {
+        let malformed = format!("aé{}", "0".repeat(THUMB_W * THUMB_H * 6 - 3));
+        assert!(decode_thumb(&malformed).is_none());
+    }
+
     #[test]
     fn recent_list_comes_from_settings() {
         let mut prefs = effectcraft_engine::prefs::Prefs::default();
@@ -510,6 +529,12 @@ mod tests {
         assert_eq!(format_utc(0), "1970-01-01 00:00");
         assert_eq!(format_utc(1_790_000_000), "2026-09-21 14:13");
         assert_eq!(format_utc(951_782_400), "2000-02-29 00:00");
+        // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+        // them), including negatives and the i64 extremes, rather than collapsing to the epoch.
+        assert_eq!(format_utc(10_000_000_000_000), "318857-05-20 17:46");
+        assert_eq!(format_utc(-10_000_000_000_000), "-314918-08-13 06:13");
+        assert_eq!(format_utc(i64::MAX), "292277026596-12-04 15:30");
+        assert_eq!(format_utc(i64::MIN), "-292277022657-01-27 08:29");
         let img = egui::ColorImage::new([200, 100], vec![Color32::from_rgb(10, 200, 30); 200 * 100]);
         let text = encode_thumb(&img);
         let back = decode_thumb(&text).unwrap();
@@ -533,20 +558,20 @@ mod tests {
         assert_eq!(format_ago(now, now + 100), "Just now");
         assert_eq!((format_size(900), format_size(13_000), format_size(3_500_000)), ("900 B".into(), "13 KB".into(), "3.3 MB".into()));
         assert_eq!((kind_of("/a/B.ecproj"), kind_of("c.AEP"), kind_of("x")), ("EffectCraft project", "After Effects project", "Project"));
+        // After a week it is the date, whole even for a five-digit year.
+        assert_eq!(format_ago(i64::MAX, 253_402_300_800), "10000-01-01");
     }
 
     /// The Home screen's own text goes through the interface catalog (#574): the Opened and Kind
-    /// columns read in Chinese, and English stays English.
+    /// columns read in the interface language, and English stays English.
     #[test]
     fn home_text_follows_the_interface_language() {
         let now = 1_790_000_000;
         crate::i18n::set_current("zh-hans");
-        let zh = (format_ago(now, now - 5), format_ago(now, now - 3 * 3_600), format_ago(now, now - 90_000), kind_of("/a/B.ecproj"));
-        crate::i18n::set_current("zh-hant");
-        let tw = (format_ago(now, now - 60), kind_of("x"));
+        let shown = (format_ago(now, now - 5), format_ago(now, now - 3 * 3_600), format_ago(now, now - 90_000), kind_of("/a/B.ecproj"));
+        let catalog = (tr("Just now").to_string(), tr_args("{} hours ago", &[&3]), tr("Yesterday").to_string(), tr("EffectCraft project"));
         crate::i18n::set_current("en");
-        assert_eq!(zh, ("刚刚".into(), "3 小时前".into(), "昨天".into(), "EffectCraft 项目"));
-        assert_eq!(tw, ("1 分鐘前".into(), "專案"));
+        assert_eq!(shown, catalog);
         assert_eq!(tr("Filter recent files"), "Filter recent files");
     }
 
diff --git a/crates/ui-egui/src/panels/info.rs b/crates/ui-egui/src/panels/info.rs
index 581e43344..86a1e6444 100644
--- a/crates/ui-egui/src/panels/info.rs
+++ b/crates/ui-egui/src/panels/info.rs
@@ -6,11 +6,16 @@ use egui::{Align2, Color32, Rect, pos2, vec2};
 use crate::theme::Tokens;
 use crate::{EffectcraftApp, widgets};
 
+/// The Info panel: the colour and alpha under the pointer (sampled from the shown viewer frame,
+/// read back for GPU frames) with its position and a swatch, then the selected layers, the current
+/// time, the duration/In/Out of a single selected layer, the achieved preview frame rate, the
+/// render time and queue state (when the preference asks for it) and the selected keyframe's
+/// property, time and value. Read-only: it draws and scrolls but changes no document state.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
     let x0 = rect.min.x + 12.0;
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("info-scroll"), rect);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("info-scroll"), rect);
     let mut y = rect.min.y + 14.0 - scroll.offset;
     if app.pointer_comp.is_some() {
         // GPU frames: read the shown frame back for sampling.
diff --git a/crates/ui-egui/src/panels/key_dialogs.rs b/crates/ui-egui/src/panels/key_dialogs.rs
index 73f76aaaa..22e31c468 100644
--- a/crates/ui-egui/src/panels/key_dialogs.rs
+++ b/crates/ui-egui/src/panels/key_dialogs.rs
@@ -125,8 +125,16 @@ fn buttons(ui: &mut egui::Ui, app: &mut EffectcraftApp, t: &Tokens, prefix: &str
     (ok, cancel)
 }
 
-fn drag(ui: &mut egui::Ui, app: &mut EffectcraftApp, id: &str, v: &mut f64, speed: f64, range: std::ops::RangeInclusive<f64>, suffix: &str, enabled: bool) {
-    let r = ui.add_enabled(enabled, crate::widgets::drag_value(egui::DragValue::new(v).speed(speed).range(range).max_decimals(2).suffix(suffix)));
+/// Drag speed, clamp range and suffix of a [`drag`] field.
+struct DragSpec<'a> {
+    speed: f64,
+    range: std::ops::RangeInclusive<f64>,
+    suffix: &'a str,
+}
+
+fn drag(ui: &mut egui::Ui, app: &mut EffectcraftApp, id: &str, v: &mut f64, spec: DragSpec, enabled: bool) {
+    let r =
+        ui.add_enabled(enabled, crate::widgets::drag_value(egui::DragValue::new(v).speed(spec.speed).range(spec.range).max_decimals(2).suffix(spec.suffix)));
     app.auto.add(id, r.rect, id);
 }
 
@@ -147,13 +155,13 @@ pub fn velocity(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                     ui.horizontal(|ui| {
                         ui.label(tr("Speed:"));
                         let v = if out { &mut d.out_speed[dim] } else { &mut d.in_speed[dim] };
-                        drag(ui, app, &format!("dialog.velocity.{side}Speed.{dim}"), v, 1.0, -1e7..=1e7, "", enabled);
+                        drag(ui, app, &format!("dialog.velocity.{side}Speed.{dim}"), v, DragSpec { speed: 1.0, range: -1e7..=1e7, suffix: "" }, enabled);
                         ui.label(egui::RichText::new(&d.units).color(t.text_dim));
                     });
                     ui.horizontal(|ui| {
                         ui.label(tr("Influence:"));
                         let v = if out { &mut d.out_inf[dim] } else { &mut d.in_inf[dim] };
-                        drag(ui, app, &format!("dialog.velocity.{side}Influence.{dim}"), v, 0.2, 0.1..=100.0, " %", enabled);
+                        drag(ui, app, &format!("dialog.velocity.{side}Influence.{dim}"), v, DragSpec { speed: 0.2, range: 0.1..=100.0, suffix: " %" }, enabled);
                     });
                     ui.end_row();
                 }
@@ -191,7 +199,7 @@ pub fn velocity(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
 fn combo(ui: &mut egui::Ui, app: &mut EffectcraftApp, id: &str, sel: &mut usize, opts: &[&str], enabled: bool) {
     ui.add_enabled_ui(enabled, |ui| {
         // The options are the English source strings; the automation id and label stay English.
-        let r = egui::ComboBox::from_id_salt(id).width(200.0).selected_text(tr(opts[*sel])).show_ui(ui, |ui| {
+        let r = craft_ui::ComboBox::from_id_salt(id).width(200.0).selected_text(tr(opts[*sel])).show_ui(ui, |ui| {
             for (i, o) in opts.iter().enumerate() {
                 ui.selectable_value(sel, i, tr(o));
             }
@@ -254,14 +262,14 @@ pub fn time_stretch(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             ui.end_row();
             ui.label(tr("Stretch Factor:"));
             let before = d.percent;
-            drag(ui, app, "dialog.timeStretch.percent", &mut d.percent, 0.5, -10000.0..=10000.0, " %", true);
+            drag(ui, app, "dialog.timeStretch.percent", &mut d.percent, DragSpec { speed: 0.5, range: -10000.0..=10000.0, suffix: " %" }, true);
             if (before - d.percent).abs() > 1e-9 && d.orig_percent.abs() > 1e-9 {
                 d.duration = d.orig_duration * d.percent.abs() / d.orig_percent.abs();
             }
             ui.end_row();
             ui.label(tr("New Duration:"));
             let before = d.duration;
-            drag(ui, app, "dialog.timeStretch.duration", &mut d.duration, 0.05, 0.01..=100000.0, " s", true);
+            drag(ui, app, "dialog.timeStretch.duration", &mut d.duration, DragSpec { speed: 0.05, range: 0.01..=100000.0, suffix: " s" }, true);
             if (before - d.duration).abs() > 1e-9 && d.orig_duration > 1e-9 {
                 d.percent = d.orig_percent.signum() * d.orig_percent.abs() * d.duration / d.orig_duration;
             }
diff --git a/crates/ui-egui/src/panels/layer_panel.rs b/crates/ui-egui/src/panels/layer_panel.rs
index e5d8e4e0d..5fb4d703c 100644
--- a/crates/ui-egui/src/panels/layer_panel.rs
+++ b/crates/ui-egui/src/panels/layer_panel.rs
@@ -40,12 +40,16 @@ struct Tex {
     rect: [f64; 4],
 }
 
+/// The `egui::Id` of the cached render of the layer shown in this panel ([`Tex`]), with the key
+/// the image was made from.
 fn tex_id() -> egui::Id {
-    egui::Id::new("layer-panel-tex")
+    egui::Id::unique("layer-panel-tex")
 }
 
+/// The `egui::Id` under which the panel's last Fit magnification is kept, so View ▸ Zoom In/Out
+/// can start from it (see [`last_fit`]).
 fn fit_id() -> egui::Id {
-    egui::Id::new("layer-panel-fit")
+    egui::Id::unique("layer-panel-fit")
 }
 
 /// The Layer panel's last Fit magnification (points per layer pixel), for View ▸ Zoom In / Zoom
@@ -83,6 +87,148 @@ fn default_view(layer: &Layer, tool: Tool) -> usize {
     }
 }
 
+/// The layer's rendered view `view` at `scale`, cached in egui's temp data per revision, layer,
+/// time, view and scale (the layer cache makes repeats cheap).
+fn render_tex(
+    app: &EffectcraftApp,
+    ctx: &egui::Context,
+    cid: effectcraft_engine::project::ItemId,
+    comp: &effectcraft_engine::project::Comp,
+    layer: &Layer,
+    view: usize,
+    scale: f64,
+) -> Option<Tex> {
+    let time = app.session.time();
+    let key = (app.session.revision, layer.id.0, time.0, view, (scale * 1000.0) as u32);
+    let cached: Option<Tex> = ctx.data(|d| d.get_temp(tex_id()));
+    match cached {
+        Some(c) if c.key == key => Some(c),
+        _ => {
+            let ectx = EvalCtx { project: &app.session.project, comp_id: cid, comp, time, expr: app.session.expr.as_deref(), footage: None };
+            let mut r = Renderer::new(&app.session.project, &*app.session.footage, RenderOpts { scale, ..Default::default() });
+            r.expr = app.session.expr.as_deref();
+            r.cache = Some(&app.session.layer_cache);
+            r.layer_input(&ectx, layer, view).map(|buf| {
+                let img = crate::frames::to_color_image(&buf.img);
+                let x0 = -buf.offset[0] / buf.scale;
+                let y0 = -buf.offset[1] / buf.scale;
+                let rect = [x0, y0, x0 + buf.img.width as f64 / buf.scale, y0 + buf.img.height as f64 / buf.scale];
+                let tex = crate::frames::load_fitted(ctx, "layer-panel", img, egui::TextureOptions::LINEAR);
+                let c = Tex { key, tex, rect };
+                ctx.data_mut(|d| d.insert_temp(tex_id(), c.clone()));
+                c
+            })
+        }
+    }
+}
+
+/// What [`paint_stroke`] needs about the brush and the layer <-> screen mapping.
+#[derive(Clone, Copy)]
+struct StrokeCtx<'a> {
+    layer: u64,
+    kind: &'a str,
+    zoom: f64,
+    did: egui::Id,
+    diameter: f64,
+    color: [f64; 4],
+    to_layer: &'a dyn Fn(Pos2) -> [f64; 2],
+    to_screen: &'a dyn Fn([f64; 2]) -> Pos2,
+}
+
+/// Records a paint stroke's layer-space points while dragging, previews it, and runs
+/// `paint.stroke` on release (or on a click).
+fn paint_stroke(app: &mut EffectcraftApp, ui: &egui::Ui, painter: &egui::Painter, resp: &egui::Response, sc: &StrokeCtx) {
+    let StrokeCtx { layer, kind, zoom, did, diameter, color, to_layer, to_screen } = *sc;
+    let ctx = ui.ctx().clone();
+    let now = ui.input(|i| i.time);
+    if resp.drag_started()
+        && let Some(pos) = ui.input(|i| i.pointer.press_origin()).or(resp.interact_pointer_pos())
+    {
+        ctx.data_mut(|d| d.insert_temp(did, Drag { layer, points: vec![to_layer(pos)], started: now }));
+    }
+    if let Some(mut d) = ctx.data(|d| d.get_temp::<Drag>(did)) {
+        if let Some(pos) = resp.interact_pointer_pos() {
+            let lp = to_layer(pos);
+            let last = d.points.last().copied().unwrap_or(lp);
+            if (lp[0] - last[0]).hypot(lp[1] - last[1]) * zoom >= 1.0 {
+                d.points.push(lp);
+                ctx.data_mut(|dd| dd.insert_temp(did, d.clone()));
+            }
+        }
+        // Live preview of the stroke.
+        let col = if kind == "eraser" {
+            Color32::from_white_alpha(140)
+        } else {
+            Color32::from_rgba_unmultiplied((color[0] * 255.0) as u8, (color[1] * 255.0) as u8, (color[2] * 255.0) as u8, 200)
+        };
+        let width = ((diameter * zoom) as f32).max(1.0);
+        let pts: Vec<Pos2> = d.points.iter().map(|q| to_screen(*q)).collect();
+        if pts.len() == 1 {
+            painter.circle_filled(pts[0], width / 2.0, col);
+        } else {
+            painter.add(egui::Shape::line(pts, Stroke::new(width, col)));
+        }
+        if resp.drag_stopped() {
+            ctx.data_mut(|dd| dd.remove::<Drag>(did));
+            let pts: Vec<[f64; 2]> = d.points.clone();
+            let r = app.session.execute("paint.stroke", json!({"layer": d.layer, "kind": kind, "points": pts, "duration": (now - d.started).max(0.0)}));
+            if let Err(e) = r {
+                app.ui.status = e.to_string();
+            }
+        }
+    }
+    if resp.clicked()
+        && let Some(pos) = resp.interact_pointer_pos()
+    {
+        let r = app.session.execute("paint.stroke", json!({"layer": layer, "kind": kind, "points": [to_layer(pos)], "duration": 0.0}));
+        if let Err(e) = r {
+            app.ui.status = e.to_string();
+        }
+    }
+}
+
+/// The bottom bar: the magnification menu and the View menu over `names` (Masks, then the
+/// effects). Returns where the View dropdown ends.
+fn bottom_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, bar: Rect, names: &[String], view: usize, (zoom, fit): (f64, f32)) -> f32 {
+    let t = app.tokens;
+    p.rect_filled(bar, 0.0, t.panel_bg);
+    let mr = Rect::from_min_size(pos2(bar.min.x + 8.0, bar.center().y - 10.0), vec2(80.0, 20.0));
+    if let Some((z, up)) = super::viewer_tools::magnification_menu(
+        app,
+        ui,
+        mr,
+        "layer-mag",
+        "layerPanel.magnification",
+        "layerMagnification",
+        zoom as f32,
+        app.ui.layer_zoom,
+        false,
+    ) {
+        // The Layer panel keeps no fit mode: Fit up to 100% is the fit, at most 100 %.
+        app.ui.layer_zoom = if up { Some(fit.min(1.0 / ui.ctx().pixels_per_point())) } else { z };
+        app.ui.layer_pan = [0.0, 0.0];
+    }
+    let vx = mr.max.x + 10.0;
+    p.text(pos2(vx, bar.center().y), Align2::LEFT_CENTER, tr("View:"), Tokens::ui(12.0), t.text_dim);
+    let vr = Rect::from_min_size(pos2(vx + 36.0, bar.center().y - 10.0), vec2(150.0, 20.0));
+    let pop = egui::Id::unique("layer-view-pop");
+    if widgets::dropdown(ui, vr, &names[view.min(names.len() - 1)], &t, egui::Id::unique("layer-view")).clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    app.auto.add("layerPanel.view", vr, "View");
+    if let Some(i) = widgets::popup_menu(ui, pop, vr.left_bottom(), names, Some(view)) {
+        app.ui.layer_view = Some(i);
+    }
+    vr.max.x
+}
+
+/// The Layer panel: one layer in its own space with its masks and effects up to the View menu's
+/// choice, rendered synchronously at a zoom/pan the panel keeps (the last Fit magnification is
+/// published for the View menu). Wheel or pinch zooms about the pointer, the Hand tool or
+/// Space-drag pans, and the Zoom tool clicks zoom. The paint tools record a stroke's layer-space
+/// points while dragging and run `paint.stroke` on release (or on a click); Alt-click with the
+/// Clone Stamp sets its source. With a Roto Brush effect it hands the canvas to
+/// [`super::roto_tool`]. Without a current layer it shows how to open one.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -119,44 +265,17 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     };
     let origin = area.center() + pan - vec2((lw * zoom / 2.0) as f32, (lh * zoom / 2.0) as f32);
 
-    // Bottom bar: magnification and View menus.
-    p.rect_filled(bar, 0.0, t.panel_bg);
-    let mr = Rect::from_min_size(pos2(bar.min.x + 8.0, bar.center().y - 10.0), vec2(80.0, 20.0));
-    if let Some((z, up)) = super::viewer_tools::magnification_menu(
-        app,
-        ui,
-        mr,
-        "layer-mag",
-        "layerPanel.magnification",
-        "layerMagnification",
-        zoom as f32,
-        app.ui.layer_zoom,
-        false,
-    ) {
-        // The Layer panel keeps no fit mode: Fit up to 100% is the fit, at most 100 %.
-        app.ui.layer_zoom = if up { Some(fit.min(1.0 / ui.ctx().pixels_per_point())) } else { z };
-        app.ui.layer_pan = [0.0, 0.0];
-    }
-    let vx = mr.max.x + 10.0;
-    p.text(pos2(vx, bar.center().y), Align2::LEFT_CENTER, tr("View:"), Tokens::ui(12.0), t.text_dim);
     let mut names = vec!["Masks".to_string()];
     if let Some(fx) = layer.effects() {
         names.extend(fx.groups().map(|g| g.name.clone()));
     }
-    let vr = Rect::from_min_size(pos2(vx + 36.0, bar.center().y - 10.0), vec2(150.0, 20.0));
-    let pop = egui::Id::new("layer-view-pop");
-    if widgets::dropdown(ui, vr, &names[view.min(names.len() - 1)], &t, egui::Id::new("layer-view")).clicked() {
-        widgets::open_popup(ui, pop);
-    }
-    app.auto.add("layerPanel.view", vr, "View");
-    if let Some(i) = widgets::popup_menu(ui, pop, vr.left_bottom(), &names, Some(view)) {
-        app.ui.layer_view = Some(i);
-    }
+    let vr_right = bottom_bar(app, ui, &p, bar, &names, view, (zoom, fit));
+
     let tc = super::timecode(&app.session, &comp, time);
     p.text(pos2(bar.max.x - 10.0, bar.center().y), Align2::RIGHT_CENTER, tc, Tokens::mono(12.0), t.timecode);
     // Roto Brush: view / Freeze buttons and the segmentation span bar.
     if roto.is_some() {
-        super::roto_tool::bar_buttons(app, ui, &p, bar, vr.max.x + 12.0, &layer);
+        super::roto_tool::bar_buttons(app, ui, &p, bar, vr_right + 12.0, &layer);
         let sb = Rect::from_min_max(pos2(rect.min.x, canvas_bottom), pos2(rect.max.x, bar.min.y));
         super::roto_tool::span_bar(app, ui, &p, sb, &comp, &layer);
     }
@@ -179,27 +298,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     } else {
         0.25
     };
-    let key = (app.session.revision, layer.id.0, time.0, view, (scale * 1000.0) as u32);
-    let cached: Option<Tex> = ctx.data(|d| d.get_temp(tex_id()));
-    let tex = match cached {
-        Some(c) if c.key == key => Some(c),
-        _ => {
-            let ectx = EvalCtx { project: &app.session.project, comp_id: cid, comp: &comp, time, expr: app.session.expr.as_deref(), footage: None };
-            let mut r = Renderer::new(&app.session.project, &*app.session.footage, RenderOpts { scale, ..Default::default() });
-            r.expr = app.session.expr.as_deref();
-            r.cache = Some(&app.session.layer_cache);
-            r.layer_input(&ectx, &layer, view).map(|buf| {
-                let img = crate::frames::to_color_image(&buf.img);
-                let x0 = -buf.offset[0] / buf.scale;
-                let y0 = -buf.offset[1] / buf.scale;
-                let rect = [x0, y0, x0 + buf.img.width as f64 / buf.scale, y0 + buf.img.height as f64 / buf.scale];
-                let tex = crate::frames::load_fitted(&ctx, "layer-panel", img, egui::TextureOptions::LINEAR);
-                let c = Tex { key, tex, rect };
-                ctx.data_mut(|d| d.insert_temp(tex_id(), c.clone()));
-                c
-            })
-        }
-    };
+    let tex = render_tex(app, &ctx, cid, &comp, &layer, view, scale);
     if let Some(tx) = &tex {
         let r = Rect::from_min_max(to_screen([tx.rect[0], tx.rect[1]]), to_screen([tx.rect[2], tx.rect[3]]));
         painter.image(tx.tex.id(), r, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
@@ -233,7 +332,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     let space = super::space_hand(&ctx);
     if space || matches!(app.ui.tool, Tool::Hand | Tool::Zoom) {
-        let resp = ui.interact(area, egui::Id::new("layer-panel-nav"), Sense::click_and_drag());
+        let resp = ui.interact(area, egui::Id::unique("layer-panel-nav"), Sense::click_and_drag());
         let alt = ui.input(|i| i.modifiers.alt);
         if resp.hovered() {
             ctx.set_cursor_icon(match app.ui.tool {
@@ -260,14 +359,14 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     // Interaction: Roto Brush / Refine Edge.
     if app.ui.tool.roto_kind(false).is_some() {
-        super::roto_tool::interact(app, ui, &painter, area, &layer, zoom, &to_screen, &to_layer);
+        super::roto_tool::interact(app, ui, &painter, area, &layer, zoom, super::roto_tool::LayerXform { to_screen: &to_screen, to_layer: &to_layer });
         return;
     }
     // Interaction: paint tools.
-    let resp = ui.interact(area, egui::Id::new("layer-panel-interact"), Sense::click_and_drag());
+    let resp = ui.interact(area, egui::Id::unique("layer-panel-interact"), Sense::click_and_drag());
     let kind = app.ui.tool.paint_kind();
     let o = app.session.state.paint.clone();
-    let did = egui::Id::new("layer-panel-drag");
+    let did = egui::Id::unique("layer-panel-drag");
     if let Some(hp) = resp.hover_pos() {
         let lp = to_layer(hp);
         app.pointer_comp = Some([lp[0] as f32, lp[1] as f32]);
@@ -303,7 +402,6 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         painter.line_segment([s - vec2(0.0, 6.0), s + vec2(0.0, 6.0)], Stroke::new(1.0, Color32::WHITE));
     }
     let mods = ui.input(|i| i.modifiers);
-    let now = ui.input(|i| i.time);
     // Alt/Option-click with the Clone Stamp sets the source.
     if app.ui.tool == Tool::Clone
         && mods.alt
@@ -317,49 +415,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     if let Some(kind) = kind
         && !mods.alt
     {
-        if resp.drag_started()
-            && let Some(pos) = ui.input(|i| i.pointer.press_origin()).or(resp.interact_pointer_pos())
-        {
-            ctx.data_mut(|d| d.insert_temp(did, Drag { layer: layer.id.0, points: vec![to_layer(pos)], started: now }));
-        }
-        if let Some(mut d) = ctx.data(|d| d.get_temp::<Drag>(did)) {
-            if let Some(pos) = resp.interact_pointer_pos() {
-                let lp = to_layer(pos);
-                let last = d.points.last().copied().unwrap_or(lp);
-                if (lp[0] - last[0]).hypot(lp[1] - last[1]) * zoom >= 1.0 {
-                    d.points.push(lp);
-                    ctx.data_mut(|dd| dd.insert_temp(did, d.clone()));
-                }
-            }
-            // Live preview of the stroke.
-            let col = if kind == "eraser" {
-                Color32::from_white_alpha(140)
-            } else {
-                Color32::from_rgba_unmultiplied((o.color[0] * 255.0) as u8, (o.color[1] * 255.0) as u8, (o.color[2] * 255.0) as u8, 200)
-            };
-            let width = ((o.diameter * zoom) as f32).max(1.0);
-            let pts: Vec<Pos2> = d.points.iter().map(|q| to_screen(*q)).collect();
-            if pts.len() == 1 {
-                painter.circle_filled(pts[0], width / 2.0, col);
-            } else {
-                painter.add(egui::Shape::line(pts, Stroke::new(width, col)));
-            }
-            if resp.drag_stopped() {
-                ctx.data_mut(|dd| dd.remove::<Drag>(did));
-                let pts: Vec<[f64; 2]> = d.points.clone();
-                let r = app.session.execute("paint.stroke", json!({"layer": d.layer, "kind": kind, "points": pts, "duration": (now - d.started).max(0.0)}));
-                if let Err(e) = r {
-                    app.ui.status = e.to_string();
-                }
-            }
-        }
-        if resp.clicked()
-            && let Some(pos) = resp.interact_pointer_pos()
-        {
-            let r = app.session.execute("paint.stroke", json!({"layer": layer.id.0, "kind": kind, "points": [to_layer(pos)], "duration": 0.0}));
-            if let Err(e) = r {
-                app.ui.status = e.to_string();
-            }
-        }
+        let stroke = StrokeCtx { layer: layer.id.0, kind, zoom, did, diameter: o.diameter, color: o.color, to_layer: &to_layer, to_screen: &to_screen };
+        paint_stroke(app, ui, &painter, &resp, &stroke);
     }
 }
diff --git a/crates/ui-egui/src/panels/layer_styles_dialog.rs b/crates/ui-egui/src/panels/layer_styles_dialog.rs
index c0b03f77e..14507b868 100644
--- a/crates/ui-egui/src/panels/layer_styles_dialog.rs
+++ b/crates/ui-egui/src/panels/layer_styles_dialog.rs
@@ -5,6 +5,7 @@
 //! edits made in the dialog back, OK keeps them (one undo step per control drag).
 
 use crate::i18n::tr;
+use effectcraft_engine::commands::text_edit::active_editor_snapshot;
 use effectcraft_engine::keyframe::Value as KV;
 use effectcraft_engine::project::styles::{BLENDING, STYLES};
 use effectcraft_engine::project::{Layer, LayerId, ParamUi, Property};
@@ -60,7 +61,7 @@ pub fn open(app: &mut EffectcraftApp, params: &Value) -> Result<(), String> {
     Ok(())
 }
 
-/// Menu routing: choosing one of the Layer ▸ Layer Styles ▸ <style> items (no parameters) adds
+/// Menu routing: choosing one of the Layer ▸ Layer Styles ▸ `<style>` items (no parameters) adds
 /// the style as usual and opens the dialog on it.
 pub fn route(app: &mut EffectcraftApp, id: &str, params: &Value) -> Result<bool, String> {
     let Some(style) = id.strip_prefix("layer.style.").filter(|s| STYLES.iter().any(|x| x.0 == *s)) else { return Ok(false) };
@@ -90,7 +91,7 @@ fn control(ui: &mut egui::Ui, p: &Property, v: &KV) -> Option<Value> {
         }
         (KV::Enum(i), ParamUi::Popup { options }) => {
             let mut sel = *i as usize;
-            egui::ComboBox::from_id_salt(("ls-popup", p.uid)).selected_text(options.get(sel).cloned().unwrap_or_default()).show_ui(ui, |ui| {
+            craft_ui::ComboBox::from_id_salt(("ls-popup", p.uid)).selected_text(options.get(sel).cloned().unwrap_or_default()).show_ui(ui, |ui| {
                 for (k, o) in options.iter().enumerate() {
                     ui.selectable_value(&mut sel, k, o);
                 }
@@ -258,13 +259,85 @@ pub fn finish(app: &mut EffectcraftApp, ok: bool) {
         && !ok
     {
         let changed = !std::sync::Arc::ptr_eq(&app.session.project, &checkpoint.project);
-        app.session.project = checkpoint.project;
-        app.session.history = checkpoint.history;
-        app.session.sanitize_state();
         if changed {
+            // Snapshot only when Cancel has something to restore: opening and cancelling without
+            // edits must not copy the whole TextDoc.
+            let edited = active_editor_snapshot(&app.session);
+            app.session.project = checkpoint.project;
+            app.session.history = checkpoint.history;
+            app.session.sanitize_after_replacement(edited.as_ref());
             app.session.bump();
+        } else {
+            // No edit was committed, so nothing can have become invalid. In particular, do not
+            // call sanitize_state here: its text-edit cleanup clones the whole TextDoc.
+            app.session.history = checkpoint.history;
         }
     }
     app.session.history.merge_key = None;
     app.dialog = None;
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use effectcraft_engine::Session;
+    use effectcraft_engine::commands::text_edit::layer_doc;
+    use effectcraft_engine::project::LayerId;
+    use effectcraft_engine::project::styles::BLENDING;
+    use serde_json::json;
+
+    fn editing_app() -> (EffectcraftApp, u64) {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Styles", "width": 320, "height": 180, "duration": 1})).unwrap();
+        let lid = s.execute("layer.newText", json!({"text": "abcdef"})).unwrap()["layer"].as_u64().unwrap();
+        s.execute("text.edit", json!({"layer": lid, "caret": 3})).unwrap();
+        (EffectcraftApp::new(s), lid)
+    }
+
+    fn editor_state(app: &EffectcraftApp) -> Option<(LayerId, u64, usize, usize)> {
+        app.session.state.text_edit.as_ref().map(|e| (e.layer, e.session, e.anchor, e.caret))
+    }
+
+    #[test]
+    fn cancel_keeps_an_open_text_editor_when_the_dialog_did_not_change_its_text() {
+        let (mut app, lid) = editing_app();
+        open(&mut app, &json!({"layer": lid, "style": BLENDING})).unwrap();
+        // A live preview edit changes the project but not the edited Source Text.
+        app.session.execute("prop.set", json!({"layer": lid, "path": "transform/opacity", "value": 40})).unwrap();
+        let before = editor_state(&app);
+        assert!(before.is_some());
+
+        finish(&mut app, false);
+        assert_eq!(editor_state(&app), before, "Cancel keeps an editor whose document it did not replace");
+    }
+
+    #[test]
+    fn cancel_without_a_dialog_edit_keeps_the_open_editor_and_its_document_untouched() {
+        let (mut app, lid) = editing_app();
+        open(&mut app, &json!({"layer": lid, "style": BLENDING})).unwrap();
+        let before = editor_state(&app);
+        let project = app.session.project.clone();
+        let undo = app.session.history.undo.len();
+        assert!(before.is_some());
+
+        finish(&mut app, false);
+        assert!(std::sync::Arc::ptr_eq(&app.session.project, &project), "a no-op Cancel restores the same project");
+        assert_eq!(app.session.history.undo.len(), undo, "and the same undo history");
+        assert_eq!(editor_state(&app), before, "and leaves the open editor untouched");
+    }
+
+    #[test]
+    fn cancel_replaces_an_open_text_editor_when_the_preview_changed_its_text() {
+        let (mut app, lid) = editing_app();
+        open(&mut app, &json!({"layer": lid, "style": BLENDING})).unwrap();
+        app.session.execute("layer.setText", json!({"layer": lid, "text": "ab"})).unwrap();
+        let preview = editor_state(&app).expect("still editing");
+        assert_eq!(layer_doc(&app.session, LayerId(lid)).unwrap().text, "ab");
+
+        finish(&mut app, false);
+        let restored = editor_state(&app).expect("the editor survives the rollback");
+        assert_eq!(layer_doc(&app.session, LayerId(lid)).unwrap().text, "abcdef", "Cancel restores the pre-dialog text");
+        assert_ne!(restored.1, preview.1, "the restored editor starts a new epoch");
+        assert_eq!((restored.2, restored.3), (2, 2), "the caret stays in the restored document");
+    }
+}
diff --git a/crates/ui-egui/src/panels/learn.rs b/crates/ui-egui/src/panels/learn.rs
index b613791fd..a3c4a85f6 100644
--- a/crates/ui-egui/src/panels/learn.rs
+++ b/crates/ui-egui/src/panels/learn.rs
@@ -31,7 +31,7 @@ pub fn home_tab(app: &mut EffectcraftApp, ui: &mut egui::Ui, area: Rect) {
         if r.min.y > area.max.y {
             break;
         }
-        let resp = ui.interact(r, egui::Id::new(("learn-card", &tut.id)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("learn-card", &tut.id)), Sense::click());
         p.rect_filled(r, 8.0, if resp.hovered() { Color32::from_rgb(0x2c, 0x2e, 0x37) } else { Color32::from_rgb(0x24, 0x26, 0x2e) });
         // A small original badge: the step count in a circle.
         let badge = Rect::from_min_size(pos2(r.min.x + 16.0, r.min.y + 16.0), vec2(44.0, 44.0));
@@ -50,7 +50,7 @@ pub fn home_tab(app: &mut EffectcraftApp, ui: &mut egui::Ui, area: Rect) {
         p.galley(pos2(tx, r.min.y + 84.0), g, t.text_faint);
         let br = Rect::from_min_size(pos2(r.max.x - 104.0, r.min.y + 16.0), vec2(88.0, 28.0));
         let label = if running.as_deref() == Some(tut.id.as_str()) { "Resume" } else { "Start" };
-        let clicked = widgets::text_button(ui, br, label, true, &t, egui::Id::new(("learn-start", &tut.id))).clicked();
+        let clicked = widgets::text_button(ui, br, label, true, &t, egui::Id::unique(("learn-start", &tut.id))).clicked();
         app.auto.add(&format!("home.learn.{}", tut.id), r, &tut.title);
         app.auto.add(&format!("home.learn.{}.start", tut.id), br, label);
         if clicked || resp.clicked() {
@@ -92,7 +92,7 @@ pub fn coach(app: &mut EffectcraftApp, ctx: &egui::Context) {
     {
         let time = ctx.input(|i| i.time);
         let pulse = (0.5 + 0.5 * (time * 4.0).sin()) as f32;
-        let p = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("learn-highlight")));
+        let p = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("learn-highlight")));
         let hr = r.expand(3.0 + 2.0 * pulse);
         p.rect_stroke(hr, 5.0, Stroke::new(2.0, t.accent.gamma_multiply(0.6 + 0.4 * pulse)), StrokeKind::Outside);
         app.auto.add("learn.highlight", hr, tp);
@@ -100,7 +100,7 @@ pub fn coach(app: &mut EffectcraftApp, ctx: &egui::Context) {
     }
     let w = 340.0;
     let mut action: Option<&str> = None;
-    let area = egui::Area::new(egui::Id::new("learn-coach"))
+    let area = egui::Area::new(egui::Id::unique("learn-coach"))
         .order(egui::Order::Foreground)
         .fixed_pos(pos2(screen.max.x - w - 20.0, screen.max.y - 250.0))
         .show(ctx, |ui| {
diff --git a/crates/ui-egui/src/panels/markers_ui.rs b/crates/ui-egui/src/panels/markers_ui.rs
index 2fff7e1c8..14e774f67 100644
--- a/crates/ui-egui/src/panels/markers_ui.rs
+++ b/crates/ui-egui/src/panels/markers_ui.rs
@@ -197,7 +197,7 @@ pub fn dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             ui.label(tr("Label:"));
             let labels = effectcraft_engine::color::Label::ALL;
             let cur = labels.get(d.label).copied().unwrap_or_default();
-            let r = egui::ComboBox::from_id_salt("dialog.marker.label").selected_text(app.session.prefs.label_name(cur)).show_ui(ui, |ui| {
+            let r = craft_ui::ComboBox::from_id_salt("dialog.marker.label").selected_text(app.session.prefs.label_name(cur)).show_ui(ui, |ui| {
                 for (i, l) in labels.into_iter().enumerate() {
                     if crate::widgets::label_entry(ui, l, &app.session.prefs.label_name(l), d.label == i, &app.tokens).clicked() {
                         d.label = i;
@@ -243,8 +243,10 @@ pub fn dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
 
 // ---------------------------------------------------------------- timeline drawing + gestures
 
+/// The `egui::Id` of a marker drag in progress: the dragged marker's layer and index (updated as
+/// the marker moves) and whether Alt was held when the drag started.
 fn drag_state_id() -> egui::Id {
-    egui::Id::new("marker-drag")
+    egui::Id::unique("marker-drag")
 }
 
 /// Snap `t` (comp seconds) to the CTI, the work area and other marker times within 8 px.
@@ -301,7 +303,7 @@ fn marker(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, comp:
         p.text(pos2(x + 7.0, y0 + h / 2.0), Align2::LEFT_CENTER, m.comment.lines().next().unwrap_or_default(), Tokens::ui(10.0), t.text);
     }
     let hit = Rect::from_min_max(pos2(x - 5.0, y0 - 1.0), pos2(x + 5.0, y1));
-    let id = egui::Id::new(("marker", r.layer, r.index));
+    let id = egui::Id::unique(("marker", r.layer, r.index));
     let resp = ui.interact(hit, id, Sense::click_and_drag());
     app.auto.add(&r.auto_id(), hit, if m.comment.is_empty() { "marker" } else { &m.comment });
     let tip = if m.comment.is_empty() { "Marker".to_string() } else { m.comment.clone() };
@@ -391,7 +393,7 @@ pub(crate) fn comp_markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, comp: &C
 /// one undo step. Dropped back on the bin or outside the time graph's width, nothing is added.
 pub(crate) fn marker_bin(app: &mut EffectcraftApp, ui: &mut egui::Ui, comp: &Comp, tm: TMap, bin: Rect, strip: Rect) {
     let t = app.tokens;
-    let resp = ui.interact(bin, egui::Id::new("marker-bin"), Sense::drag()).on_hover_text(tr("Composition marker bin: drag a marker to the time ruler"));
+    let resp = ui.interact(bin, egui::Id::unique("marker-bin"), Sense::drag()).on_hover_text(tr("Composition marker bin: drag a marker to the time ruler"));
     app.auto.add("timeline.markerBin", bin, "Composition marker bin");
     let hot = resp.hovered() || resp.dragged();
     if hot {
@@ -436,7 +438,7 @@ fn nested_markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
         return;
     }
     // Where they land, once per revision (with time remapping that samples the layer's frames).
-    let (key, rev) = (egui::Id::new(("nested-markers", cid.0, layer.id.0)), app.session.revision);
+    let (key, rev) = (egui::Id::unique(("nested-markers", cid.0, layer.id.0)), app.session.revision);
     let cached = ui.ctx().data(|d| d.get_temp::<(u64, Vec<(Tick, usize)>)>(key)).filter(|(r, _)| *r == rev);
     let at = cached.map(|(_, v)| v).unwrap_or_else(|| {
         let v: Vec<(Tick, usize)> =
@@ -457,7 +459,7 @@ fn nested_markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter
         }
         let hit = Rect::from_min_max(pos2(x - 5.0, y0 - 1.0), pos2(x + 5.0, r.max.y - 3.0));
         let tip = if m.comment.is_empty() { format!("Marker in {name}") } else { format!("{} (marker in {name})", m.comment) };
-        let resp = ui.interact(hit, egui::Id::new(("nested-marker", layer.id.0, i)), Sense::click()).on_hover_text(&tip);
+        let resp = ui.interact(hit, egui::Id::unique(("nested-marker", layer.id.0, i)), Sense::click()).on_hover_text(&tip);
         app.auto.add(&format!("timeline.layer.{}.nestedMarker.{i}", layer.id.0), hit, &tip);
         if resp.double_clicked() {
             let opened =
diff --git a/crates/ui-egui/src/panels/media_panels.rs b/crates/ui-egui/src/panels/media_panels.rs
index cd32cb7f2..ffe2cc1f7 100644
--- a/crates/ui-egui/src/panels/media_panels.rs
+++ b/crates/ui-egui/src/panels/media_panels.rs
@@ -29,7 +29,7 @@ type Listing = (f64, Arc<Result<Vec<mb::Entry>, String>>);
 
 /// Thumbnail of a file (cached per path; `None` while not decoded or not decodable).
 fn thumbnail(app: &EffectcraftApp, ctx: &egui::Context, path: &str, budget: &mut u32) -> Thumb {
-    let id = egui::Id::new(("mb-thumb", path));
+    let id = egui::Id::unique(("mb-thumb", path));
     if let Some(t) = ctx.data(|d| d.get_temp::<Thumb>(id)) {
         return t;
     }
@@ -63,6 +63,33 @@ fn thumbnail(app: &EffectcraftApp, ctx: &egui::Context, path: &str, budget: &mut
     thumb
 }
 
+/// The Favorites column: one clickable row per place, the current folder `dir` highlighted.
+fn places_column(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, side: Rect, places: &[(String, String)], dir: &str) {
+    let t = app.tokens;
+    let mut fy = side.min.y + 22.0;
+    for (i, (name, path)) in places.iter().enumerate() {
+        let r = Rect::from_min_size(pos2(side.min.x, fy), vec2(side.width(), 20.0));
+        let resp = ui.interact(r, egui::Id::unique(("mb-fav", i)), Sense::click());
+        if path == dir {
+            p.rect_filled(r, 0.0, t.row_selected);
+        } else if resp.hovered() {
+            p.rect_filled(r, 0.0, t.hover);
+        }
+        p.text(pos2(r.min.x + 14.0, r.center().y), Align2::LEFT_CENTER, name, Tokens::ui(12.0), t.text);
+        app.auto.add(&format!("mediaBrowser.place.{i}"), r, name);
+        if resp.clicked() {
+            kit::exec(app, "mediaBrowser.go", json!({"path": path}));
+        }
+        fy += 20.0;
+    }
+}
+
+/// The Media Browser panel: a toolbar (up, home, favourite, "Media only" filter and the browser's
+/// own actions), the current path, the favourite places and a tile grid of the folder's entries
+/// with thumbnails for images and videos. Double-click opens a folder or imports a file; files
+/// drag out as [`DragPayload::Files`] and a context menu copies paths, imports (optionally into the
+/// comp) or adds a favourite. The listing is cached per folder and filter for a second, and every
+/// change runs a `mediaBrowser.*` command.
 pub fn media_browser(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -76,7 +103,7 @@ pub fn media_browser(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let st = app.session.state.media_browser.clone();
     let dir = st.folder.clone().unwrap_or_else(|| b.home());
     // Listing cached per folder for a second.
-    let lid = egui::Id::new(("mb-list", dir.clone(), st.importable_only));
+    let lid = egui::Id::unique(("mb-list", dir.clone(), st.importable_only));
     let now = ctx.input(|i| i.time);
     let listing: Option<Listing> = ctx.data(|d| d.get_temp(lid));
     let entries = match listing {
@@ -130,26 +157,11 @@ pub fn media_browser(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let side = Rect::from_min_max(pos2(rect.min.x, rect.min.y + 54.0), pos2(rect.min.x + 160.0_f32.min(rect.width() * 0.3), rect.max.y));
     p.line_segment([side.right_top(), side.right_bottom()], Stroke::new(1.0, t.separator));
     p.text(pos2(side.min.x + 10.0, side.min.y + 10.0), Align2::LEFT_CENTER, tr("Favorites"), Tokens::semibold(11.5), t.text_dim);
-    let mut fy = side.min.y + 22.0;
     let mut places: Vec<(String, String)> = b.places();
     places.extend(
         st.favorites.iter().map(|f| (std::path::Path::new(f).file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| f.clone()), f.clone())),
     );
-    for (i, (name, path)) in places.iter().enumerate() {
-        let r = Rect::from_min_size(pos2(side.min.x, fy), vec2(side.width(), 20.0));
-        let resp = ui.interact(r, egui::Id::new(("mb-fav", i)), Sense::click());
-        if *path == dir {
-            p.rect_filled(r, 0.0, t.row_selected);
-        } else if resp.hovered() {
-            p.rect_filled(r, 0.0, t.hover);
-        }
-        p.text(pos2(r.min.x + 14.0, r.center().y), Align2::LEFT_CENTER, name, Tokens::ui(12.0), t.text);
-        app.auto.add(&format!("mediaBrowser.place.{i}"), r, name);
-        if resp.clicked() {
-            kit::exec(app, "mediaBrowser.go", json!({"path": path}));
-        }
-        fy += 20.0;
-    }
+    places_column(app, ui, &p, side, &places, &dir);
     // Files.
     let list = Rect::from_min_max(pos2(side.max.x + 1.0, side.min.y), rect.max);
     let entries = match entries.as_ref() {
@@ -162,7 +174,7 @@ pub fn media_browser(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let tile = vec2(140.0, 112.0);
     let cols = ((list.width() - 8.0) / tile.x).floor().max(1.0) as usize;
     let mut budget = 2u32;
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("mb-scroll"), list);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("mb-scroll"), list);
     let lp = p.with_clip_rect(list);
     let mut actions: Vec<(&str, Value)> = vec![];
     for (i, e) in entries.iter().enumerate() {
@@ -173,7 +185,7 @@ pub fn media_browser(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         if !r.intersects(list) {
             continue;
         }
-        let resp = ui.interact(r.intersect(list), egui::Id::new(("mb-entry", &e.path)), Sense::click_and_drag());
+        let resp = ui.interact(r.intersect(list), egui::Id::unique(("mb-entry", &e.path)), Sense::click_and_drag());
         app.auto.add(&format!("mediaBrowser.entry.{}", e.name), r, &e.name);
         lp.rect_filled(r, 4.0, if resp.hovered() { t.hover } else { t.row });
         let thumb = Rect::from_min_max(r.min + vec2(6.0, 6.0), pos2(r.max.x - 6.0, r.max.y - 26.0));
@@ -264,7 +276,7 @@ fn rows_of(v: &Value) -> Vec<(String, String)> {
 
 /// An editable comment field; returns the edited text when it changes.
 fn comment_field(ui: &mut egui::Ui, r: Rect, id: &str, text: &str) -> Option<String> {
-    let key = egui::Id::new(("meta-comment", id));
+    let key = egui::Id::unique(("meta-comment", id));
     let mut buf: String = ui.data(|d| d.get_temp(key)).unwrap_or_else(|| text.to_string());
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(r));
     let resp = child.add(egui::TextEdit::multiline(&mut buf).desired_width(r.width()).desired_rows(2).hint_text(tr("Add a comment")));
@@ -438,8 +450,8 @@ mod tests {
                 kind: Some("video"),
             })
             .collect();
-        let old_id = egui::Id::new("old-list");
-        let new_id = egui::Id::new("new-list");
+        let old_id = egui::Id::unique("old-list");
+        let new_id = egui::Id::unique("new-list");
         ctx.data_mut(|d| {
             d.insert_temp(old_id, (0.0, Ok::<_, String>(entries.clone())));
             d.insert_temp(new_id, (0.0, Arc::new(Ok::<_, String>(entries))));
diff --git a/crates/ui-egui/src/panels/misc.rs b/crates/ui-egui/src/panels/misc.rs
index cd0ab6897..dfa9a42e0 100644
--- a/crates/ui-egui/src/panels/misc.rs
+++ b/crates/ui-egui/src/panels/misc.rs
@@ -24,7 +24,7 @@ pub fn preview(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let p = ui.painter().with_clip_rect(rect);
     // The panel scrolls when it is shorter than its controls (the default workspace shows just
     // the transport row, as in After Effects).
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("preview-scroll"), rect);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("preview-scroll"), rect);
     let panel_clip = ui.clip_rect();
     ui.set_clip_rect(rect.intersect(panel_clip));
     let y = rect.min.y + 12.0 - scroll.offset;
@@ -42,7 +42,7 @@ pub fn preview(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     for (icon, cmd, tip) in buttons {
         let r = Rect::from_min_size(pos2(x, y), vec2(bw, 28.0));
         let icon = if cmd == "playback.toggle" && app.playback.playing { Icon::Pause } else { icon };
-        if widgets::icon_button(ui, r, icon, cmd == "playback.toggle" && app.playback.playing, &t, egui::Id::new(("pv", cmd))).on_hover_text(tip).clicked() {
+        if widgets::icon_button(ui, r, icon, cmd == "playback.toggle" && app.playback.playing, &t, egui::Id::unique(("pv", cmd))).on_hover_text(tip).clicked() {
             // The play button plays with the options of the shortcut shown below.
             let params = if cmd == "playback.toggle" { json!({"shortcut": current.id()}) } else { json!({}) };
             let _ = crate::menus::invoke(app, &ctx, cmd, params);
@@ -117,7 +117,14 @@ pub fn preview(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         for (k, (key, text, v)) in [("preRoll", "Pre-roll", o.pre_roll), ("postRoll", "Post-roll", o.post_roll)].into_iter().enumerate() {
             let lx = xv + k as f32 * 100.0;
             p.text(pos2(lx, yy), Align2::LEFT_CENTER, text, Tokens::ui(11.5), t.text_dim);
-            let (r, nv, _) = widgets::hot_number_at(ui, pos2(lx + 52.0, yy - 9.0), egui::Id::new(("pv-roll", key)), v, 0.05, (0.0, 600.0), 1, "s", &t);
+            let (r, nv, _) = widgets::hot_number_at(
+                ui,
+                pos2(lx + 52.0, yy - 9.0),
+                egui::Id::unique(("pv-roll", key)),
+                v,
+                &widgets::HotSpec { speed: 0.05, range: (0.0, 600.0), decimals: 1, suffix: "s" },
+                &t,
+            );
             app.auto.add(&format!("preview.{key}"), r, text);
             if let Some(nv) = nv {
                 changes.push(json!({"shortcut": current.id(), key: nv}));
@@ -160,7 +167,14 @@ pub fn preview(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     let sx = xv + 106.0;
     p.text(pos2(sx, yy), Align2::LEFT_CENTER, tr("Skip"), Tokens::ui(12.0), t.text_dim);
-    let (r, nv, _) = widgets::hot_number_at(ui, pos2(sx + 30.0, yy - 9.0), egui::Id::new("pv-skip"), o.skip as f64, 0.1, (0.0, 99.0), 0, "", &t);
+    let (r, nv, _) = widgets::hot_number_at(
+        ui,
+        pos2(sx + 30.0, yy - 9.0),
+        egui::Id::unique("pv-skip"),
+        o.skip as f64,
+        &widgets::HotSpec { speed: 0.1, range: (0.0, 99.0), decimals: 0, suffix: "" },
+        &t,
+    );
     app.auto.add("preview.skip", r, "Skip");
     if let Some(nv) = nv {
         changes.push(json!({"shortcut": current.id(), "skip": nv.round() as u32}));
@@ -181,8 +195,14 @@ pub fn preview(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         changes.push(json!({"shortcut": current.id(), "resolution": res_ids[i]}));
     }
     if o.resolution == PreviewResolution::Custom {
-        let (r, nv, _) =
-            widgets::hot_number_at(ui, pos2(xv + 106.0, yy - 9.0), egui::Id::new("pv-custom-res"), o.custom_resolution as f64, 0.1, (1.0, 40.0), 0, "", &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(xv + 106.0, yy - 9.0),
+            egui::Id::unique("pv-custom-res"),
+            o.custom_resolution as f64,
+            &widgets::HotSpec { speed: 0.1, range: (1.0, 40.0), decimals: 0, suffix: "" },
+            &t,
+        );
         app.auto.add("preview.customResolution", r, "Custom Resolution");
         if let Some(nv) = nv {
             changes.push(json!({"shortcut": current.id(), "customResolution": nv.round() as u32}));
@@ -240,7 +260,7 @@ fn fmt_rate(r: f64) -> String {
 fn check_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, at: egui::Pos2, key: &str, text: &str, on: bool) -> bool {
     let t = app.tokens;
     let r = Rect::from_min_size(pos2(at.x, at.y - 8.0), vec2(16.0, 16.0));
-    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::new(("pv-check", key))).clicked();
+    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::unique(("pv-check", key))).clicked();
     p.text(pos2(r.max.x + 5.0, at.y), Align2::LEFT_CENTER, text, Tokens::ui(12.0), t.text);
     app.auto.add(&format!("preview.{key}"), r, text);
     clicked
@@ -250,7 +270,7 @@ fn check_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, at:
 /// returns the chosen index.
 fn dropdown_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, key: &str, text: &str, items: &[String], current: Option<usize>) -> Option<usize> {
     let t = app.tokens;
-    let pid = egui::Id::new(("pv-pop", key));
+    let pid = egui::Id::unique(("pv-pop", key));
     if widgets::dropdown(ui, r, text, &t, pid.with("btn")).clicked() {
         let open: bool = ui.data(|d| d.get_temp(pid.with("open")).unwrap_or(false));
         ui.data_mut(|d| d.insert_temp(pid.with("open"), !open));
@@ -318,7 +338,7 @@ pub fn audio(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let clip = Rect::from_min_max(pos2(bar.min.x, top - 14.0), pos2(bar.max.x, top - 4.0));
         p.rect_filled(clip, 1.0, if m.clipped[c] { red } else { t.field_bg });
         let id = if c == 0 { "audio.clipLeft" } else { "audio.clipRight" };
-        if ui.interact(clip, egui::Id::new(id), Sense::click()).clicked() {
+        if ui.interact(clip, egui::Id::unique(id), Sense::click()).clicked() {
             app.meter.clipped[c] = false;
         }
         app.auto.add(id, clip, if c == 0 { "Left clip indicator" } else { "Right clip indicator" });
@@ -362,6 +382,10 @@ pub fn audio(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 }
 
+/// The History panel: every state of the session's branching history, indented under the state it
+/// grew from, with the current state highlighted and future/abandoned branches dimmed. Only the
+/// rows in view are drawn; the current state is scrolled into view when it changes. Clicking a
+/// state runs `edit.history.goto`, reporting a failure in `app.ui.status`.
 pub fn history(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -370,7 +394,7 @@ pub fn history(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let nodes = app.session.history_tree();
     let row_h = 22.0;
     let cur = nodes.iter().position(|n| n.current).unwrap_or(0);
-    let scroll_id = egui::Id::new("history-scroll");
+    let scroll_id = egui::Id::unique("history-scroll");
     let mut scroll = widgets::PanelScroll::begin(ui, scroll_id, rect);
     // The current state scrolls into view when it changes (undo, redo, a new step).
     if ui.data(|d| d.get_temp::<usize>(scroll_id.with("current"))) != Some(cur) {
@@ -390,7 +414,7 @@ pub fn history(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     for n in nodes.iter().skip(first).take(visible) {
         let r = Rect::from_min_size(pos2(rect.min.x, y), vec2(rect.width(), row_h));
         y += row_h;
-        let resp = ui.interact(r, egui::Id::new(("hist", n.id.as_str())), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("hist", n.id.as_str())), Sense::click());
         if n.current {
             p.rect_filled(r, 0.0, t.row_selected);
         } else if resp.hovered() {
@@ -419,11 +443,14 @@ pub fn history(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 }
 
+/// The Markers panel: the active comp's markers in time order, each with its timecode and comment;
+/// clicking a row moves the current time to that marker. Shows a hint when the comp has none and
+/// draws nothing without an active comp.
 pub fn markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
     let Some(c) = app.session.active_comp_arc() else { return };
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("markers-scroll"), rect);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("markers-scroll"), rect);
     let mut y = rect.min.y + 8.0 - scroll.offset;
     if c.markers.is_empty() {
         p.text(rect.center(), Align2::CENTER_CENTER, tr("No composition markers"), Tokens::ui(12.0), t.text_faint);
@@ -437,7 +464,7 @@ pub fn markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let tc = crate::panels::timecode(&app.session, &c, m.time);
         p.text(pos2(r.min.x + 12.0, r.center().y), Align2::LEFT_CENTER, tc, Tokens::mono(11.5), t.timecode);
         p.text(pos2(r.min.x + 120.0, r.center().y), Align2::LEFT_CENTER, &m.comment, Tokens::ui(12.0), t.text);
-        if ui.interact(r, egui::Id::new(("mk", m.time.0)), Sense::click()).clicked() {
+        if ui.interact(r, egui::Id::unique(("mk", m.time.0)), Sense::click()).clicked() {
             app.session.set_time(m.time);
         }
     }
diff --git a/crates/ui-egui/src/panels/paint_panels.rs b/crates/ui-egui/src/panels/paint_panels.rs
index 675bc1e16..c867eb63a 100644
--- a/crates/ui-egui/src/panels/paint_panels.rs
+++ b/crates/ui-egui/src/panels/paint_panels.rs
@@ -36,11 +36,21 @@ fn number(
     let t = app.tokens;
     p.text(pos2(x, y + 9.0), Align2::LEFT_CENTER, label, Tokens::ui(11.5), if enabled { t.text_dim } else { t.text_faint });
     let lw = p.layout_no_wrap(label.to_string(), Tokens::ui(11.5), t.text).size().x;
-    let (r, nv, _) = widgets::hot_number_at(ui, pos2(x + lw + 6.0, y), egui::Id::new(("paint-num", key)), v, 0.5, range, 0, suffix, &t);
+    let (r, nv, _) = widgets::hot_number_at(
+        ui,
+        pos2(x + lw + 6.0, y),
+        egui::Id::unique(("paint-num", key)),
+        v,
+        &widgets::HotSpec { speed: 0.5, range, decimals: 0, suffix },
+        &t,
+    );
     app.auto.add(key, r, label);
     nv.filter(|_| enabled)
 }
 
+/// A label at `x`, `y` and, to its right, a dropdown over `options` with `cur` selected. The
+/// dropdown only opens while `enabled`; otherwise only its label is dimmed. Returns the index
+/// picked from the open menu, if any.
 #[allow(clippy::too_many_arguments)]
 fn popup_row(
     app: &mut EffectcraftApp,
@@ -58,18 +68,74 @@ fn popup_row(
     let t = app.tokens;
     p.text(pos2(x, y + 10.0), Align2::LEFT_CENTER, label, Tokens::ui(11.5), if enabled { t.text_dim } else { t.text_faint });
     let r = Rect::from_min_size(pos2(x + 70.0, y), vec2((w - 70.0).max(60.0), 20.0));
-    let pop = egui::Id::new(("paint-pop", key));
-    if widgets::dropdown(ui, r, options.get(cur).map(String::as_str).unwrap_or(""), &t, egui::Id::new(("paint-dd", key))).clicked() && enabled {
+    let pop = egui::Id::unique(("paint-pop", key));
+    if widgets::dropdown(ui, r, options.get(cur).map(String::as_str).unwrap_or(""), &t, egui::Id::unique(("paint-dd", key))).clicked() && enabled {
         widgets::open_popup(ui, pop);
     }
     app.auto.add(key, r, label);
     widgets::popup_menu(ui, pop, r.left_bottom(), options, Some(cur))
 }
 
+/// The RGB components of an RGBA paint colour as `f32`, for the swatches and the colour picker.
 fn rgb(c: [f64; 4]) -> [f32; 3] {
     [c[0] as f32, c[1] as f32, c[2] as f32]
 }
 
+/// The swap-colours icon: one arrow right above one arrow left.
+fn paint_swap_icon(p: &egui::Painter, rect: Rect, color: Color32) {
+    let stroke = Stroke::new(1.0, color);
+    let (left, right) = (rect.left() + 2.0, rect.right() - 2.0);
+    let (top, bottom) = (rect.top() + 3.0, rect.bottom() - 3.0);
+    p.arrow(pos2(left, top), vec2(right - left, 0.0), stroke);
+    p.arrow(pos2(right, bottom), vec2(left - right, 0.0), stroke);
+}
+
+/// The foreground-over-background swatches (each opens a colour popup) with Swap and Reset.
+fn colour_swatches(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, x0: f32, y: f32, color: [f64; 4], background: [f64; 4]) {
+    let t = app.tokens;
+    let fg = Rect::from_min_size(pos2(x0, y), vec2(26.0, 20.0));
+    let bg = Rect::from_min_size(pos2(x0 + 14.0, y + 10.0), vec2(26.0, 20.0));
+    widgets::swatch(ui, bg, [background[0] as f32, background[1] as f32, background[2] as f32, 1.0], egui::Id::unique("paint-bg"), &t);
+    let bresp = ui.interact(Rect::from_min_max(pos2(fg.max.x, bg.min.y), bg.max), egui::Id::unique("paint-bg-hit"), Sense::click());
+    if bresp.clicked() {
+        widgets::open_popup(ui, egui::Id::unique("paint-bg-pop"));
+    }
+    if widgets::swatch(ui, fg, [color[0] as f32, color[1] as f32, color[2] as f32, 1.0], egui::Id::unique("paint-fg"), &t).clicked() {
+        widgets::open_popup(ui, egui::Id::unique("paint-fg-pop"));
+    }
+    app.auto.add("paint.color", fg, "Foreground color");
+    app.auto.add("paint.background", bg, "Background color");
+    let mut fc = rgb(color);
+    if crate::widgets::color_popup(ui, egui::Id::unique("paint-fg-pop"), fg.left_bottom(), &mut fc) {
+        set(app, json!({"color": [fc[0], fc[1], fc[2], 1.0]}));
+    }
+    let mut bc = rgb(background);
+    if crate::widgets::color_popup(ui, egui::Id::unique("paint-bg-pop"), bg.left_bottom(), &mut bc) {
+        set(app, json!({"background": [bc[0], bc[1], bc[2], 1.0]}));
+    }
+    let swap = Rect::from_min_size(pos2(x0 + 46.0, y), vec2(18.0, 14.0));
+    let sresp = ui.interact(swap, egui::Id::unique("paint-swap"), Sense::click());
+    // Two arrows (foreground over background): drawn, so the icon does not depend on a font
+    // carrying U+21C4 (the bundled fonts do not).
+    paint_swap_icon(p, swap, if sresp.hovered() { t.text } else { t.text_dim });
+    app.auto.add("paint.swapColors", swap, "Swap colors");
+    if sresp.on_hover_text(tr("Swap Paint Colors (X)")).clicked() {
+        set(app, json!({"color": background, "background": color}));
+    }
+    let reset = Rect::from_min_size(pos2(x0 + 46.0, y + 18.0), vec2(18.0, 14.0));
+    let rresp = ui.interact(reset, egui::Id::unique("paint-reset-colors"), Sense::click());
+    p.rect_filled(Rect::from_min_size(reset.min + vec2(4.0, 3.0), vec2(7.0, 6.0)), 0.0, Color32::WHITE);
+    p.rect_stroke(Rect::from_min_size(reset.min + vec2(8.0, 6.0), vec2(7.0, 6.0)), 0.0, Stroke::new(1.0, t.text_dim), StrokeKind::Inside);
+    app.auto.add("paint.resetColors", reset, "Default colors");
+    if rresp.on_hover_text(tr("Set Paint Colors to Black and White (D)")).clicked() {
+        set(app, json!({"color": [1.0, 1.0, 1.0, 1.0], "background": [0.0, 0.0, 0.0, 1.0]}));
+    }
+}
+
+/// The Paint panel: opacity and flow, foreground/background colours with swap and reset, mode,
+/// channels, duration, erase mode and the Clone Stamp options. Every change is sent as a
+/// `paint.options` command. Mode and Channels are disabled for the Eraser; Erase is enabled
+/// only for it. The Clone Options heading is dimmed for other tools, but its controls stay enabled.
 pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -89,41 +155,7 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     y += 28.0;
     // Colour swatches (foreground over background) with swap / reset.
-    let fg = Rect::from_min_size(pos2(x0, y), vec2(26.0, 20.0));
-    let bg = Rect::from_min_size(pos2(x0 + 14.0, y + 10.0), vec2(26.0, 20.0));
-    widgets::swatch(ui, bg, [o.background[0] as f32, o.background[1] as f32, o.background[2] as f32, 1.0], egui::Id::new("paint-bg"), &t);
-    let bresp = ui.interact(Rect::from_min_max(pos2(fg.max.x, bg.min.y), bg.max), egui::Id::new("paint-bg-hit"), Sense::click());
-    if bresp.clicked() {
-        widgets::open_popup(ui, egui::Id::new("paint-bg-pop"));
-    }
-    if widgets::swatch(ui, fg, [o.color[0] as f32, o.color[1] as f32, o.color[2] as f32, 1.0], egui::Id::new("paint-fg"), &t).clicked() {
-        widgets::open_popup(ui, egui::Id::new("paint-fg-pop"));
-    }
-    app.auto.add("paint.color", fg, "Foreground color");
-    app.auto.add("paint.background", bg, "Background color");
-    let mut fc = rgb(o.color);
-    if crate::widgets::color_popup(ui, egui::Id::new("paint-fg-pop"), fg.left_bottom(), &mut fc) {
-        set(app, json!({"color": [fc[0], fc[1], fc[2], 1.0]}));
-    }
-    let mut bc = rgb(o.background);
-    if crate::widgets::color_popup(ui, egui::Id::new("paint-bg-pop"), bg.left_bottom(), &mut bc) {
-        set(app, json!({"background": [bc[0], bc[1], bc[2], 1.0]}));
-    }
-    let swap = Rect::from_min_size(pos2(x0 + 46.0, y), vec2(18.0, 14.0));
-    let sresp = ui.interact(swap, egui::Id::new("paint-swap"), Sense::click());
-    p.text(swap.center(), Align2::CENTER_CENTER, "⇄", Tokens::ui(12.0), if sresp.hovered() { t.text } else { t.text_dim });
-    app.auto.add("paint.swapColors", swap, "Swap colors");
-    if sresp.on_hover_text(tr("Swap Paint Colors (X)")).clicked() {
-        set(app, json!({"color": o.background, "background": o.color}));
-    }
-    let reset = Rect::from_min_size(pos2(x0 + 46.0, y + 18.0), vec2(18.0, 14.0));
-    let rresp = ui.interact(reset, egui::Id::new("paint-reset-colors"), Sense::click());
-    p.rect_filled(Rect::from_min_size(reset.min + vec2(4.0, 3.0), vec2(7.0, 6.0)), 0.0, Color32::WHITE);
-    p.rect_stroke(Rect::from_min_size(reset.min + vec2(8.0, 6.0), vec2(7.0, 6.0)), 0.0, Stroke::new(1.0, t.text_dim), StrokeKind::Inside);
-    app.auto.add("paint.resetColors", reset, "Default colors");
-    if rresp.on_hover_text(tr("Set Paint Colors to Black and White (D)")).clicked() {
-        set(app, json!({"color": [1.0, 1.0, 1.0, 1.0], "background": [0.0, 0.0, 0.0, 1.0]}));
-    }
+    colour_swatches(app, ui, &p, x0, y, o.color, o.background);
     y += 40.0;
 
     // Mode / Channels / Duration.
@@ -146,12 +178,9 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let (r, nv, _) = widgets::hot_number_at(
             ui,
             pos2(x0 + w - 52.0, y + 1.0),
-            egui::Id::new("paint-custom-frames"),
+            egui::Id::unique("paint-custom-frames"),
             o.custom_frames as f64,
-            0.2,
-            (1.0, 10000.0),
-            0,
-            " f",
+            &widgets::HotSpec { speed: 0.2, range: (1.0, 10000.0), decimals: 0, suffix: " f" },
             &t,
         );
         app.auto.add("paint.customFrames", r, "Custom duration (frames)");
@@ -174,7 +203,7 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     p.text(pos2(x0, y + 10.0), Align2::LEFT_CENTER, tr("Preset:"), Tokens::ui(11.5), t.text_dim);
     for i in 1..=5u32 {
         let r = Rect::from_min_size(pos2(x0 + 56.0 + (i - 1) as f32 * 26.0, y), vec2(22.0, 20.0));
-        let resp = ui.interact(r, egui::Id::new(("clone-preset", i)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("clone-preset", i)), Sense::click());
         let on = o.clone_preset == i;
         p.rect_filled(
             r,
@@ -210,7 +239,7 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             .enumerate()
     {
         let r = Rect::from_min_size(pos2(x0 + i as f32 * (w / 2.0), y), vec2(18.0, 20.0));
-        if widgets::checkbox(ui, r, on, &t, egui::Id::new(key)).clicked() {
+        if widgets::checkbox(ui, r, on, &t, egui::Id::unique(key)).clicked() {
             set(app, json!({k: !on}));
         }
         p.text(pos2(r.max.x + 4.0, r.center().y), Align2::LEFT_CENTER, label, Tokens::ui(11.5), t.text_dim);
@@ -220,7 +249,14 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let off = o.clone_offset.unwrap_or([0.0, 0.0]);
     p.text(pos2(x0, y + 9.0), Align2::LEFT_CENTER, tr("Offset:"), Tokens::ui(11.5), t.text_dim);
     for (d, v) in off.iter().enumerate() {
-        let (r, nv, _) = widgets::hot_number_at(ui, pos2(x0 + 56.0 + d as f32 * 64.0, y), egui::Id::new(("clone-off", d)), *v, 1.0, (-1e5, 1e5), 0, "", &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x0 + 56.0 + d as f32 * 64.0, y),
+            egui::Id::unique(("clone-off", d)),
+            *v,
+            &widgets::HotSpec { speed: 1.0, range: (-1e5, 1e5), decimals: 0, suffix: "" },
+            &t,
+        );
         app.auto.add(&format!("paint.cloneOffset.{d}"), r, "Clone offset");
         if let Some(nv) = nv {
             let mut no = off;
@@ -237,7 +273,7 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     y += 26.0;
     let r = Rect::from_min_size(pos2(x0, y), vec2(18.0, 20.0));
-    if widgets::checkbox(ui, r, o.show_overlay, &t, egui::Id::new("paint.showOverlay")).clicked() {
+    if widgets::checkbox(ui, r, o.show_overlay, &t, egui::Id::unique("paint.showOverlay")).clicked() {
         set(app, json!({"showOverlay": !o.show_overlay}));
     }
     app.auto.add("paint.showOverlay", r, "Clone Source Overlay");
@@ -246,7 +282,7 @@ pub fn paint(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         set(app, json!({"overlayOpacity": nv}));
     }
     let dr = Rect::from_min_size(pos2(x0 + w - 18.0, y), vec2(18.0, 20.0));
-    if widgets::checkbox(ui, dr, o.overlay_difference, &t, egui::Id::new("paint.overlayDifference")).clicked() {
+    if widgets::checkbox(ui, dr, o.overlay_difference, &t, egui::Id::unique("paint.overlayDifference")).clicked() {
         set(app, json!({"overlayDifference": !o.overlay_difference}));
     }
     app.auto.add("paint.overlayDifference", dr, "Difference mode overlay");
@@ -275,6 +311,9 @@ fn tip_preview(p: &egui::Painter, r: Rect, diameter: f64, angle: f64, roundness:
     }
 }
 
+/// The Brushes panel: a grid of built-in brush presets (each runs `paint.brushPreset`), a tip
+/// preview, diameter/angle/roundness/hardness/spacing fields and the size/opacity/flow pressure
+/// options. Values are sent as `paint.options` commands and failures land in `app.ui.status`.
 pub fn brushes(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -287,7 +326,7 @@ pub fn brushes(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let cols = ((w / cell).floor() as usize).max(1);
     for (i, tip) in BRUSH_PRESETS.iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + (i % cols) as f32 * cell, y + (i / cols) as f32 * cell), vec2(cell - 2.0, cell - 2.0));
-        let resp = ui.interact(r, egui::Id::new(("brush-preset", i)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("brush-preset", i)), Sense::click());
         let on = o.preset == Some(i);
         p.rect_filled(
             r,
@@ -332,7 +371,14 @@ pub fn brushes(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     // Spacing (checkbox in AE turns spacing on; we always space dabs, so it shows the value).
     p.text(pos2(x0, y + 9.0), Align2::LEFT_CENTER, tr("Spacing:"), Tokens::ui(11.5), t.text_dim);
     let _ = r;
-    let (sr, nv, _) = widgets::hot_number_at(ui, pos2(x0 + 58.0, y), egui::Id::new("brushes-spacing"), o.spacing, 0.5, (1.0, 1000.0), 0, " %", &t);
+    let (sr, nv, _) = widgets::hot_number_at(
+        ui,
+        pos2(x0 + 58.0, y),
+        egui::Id::unique("brushes-spacing"),
+        o.spacing,
+        &widgets::HotSpec { speed: 0.5, range: (1.0, 1000.0), decimals: 0, suffix: " %" },
+        &t,
+    );
     app.auto.add("brushes.spacing", sr, "Spacing");
     if let Some(nv) = nv {
         set(app, json!({"spacing": nv}));
diff --git a/crates/ui-egui/src/panels/panel_kit.rs b/crates/ui-egui/src/panels/panel_kit.rs
index cbf28c8ac..501ddf64f 100644
--- a/crates/ui-egui/src/panels/panel_kit.rs
+++ b/crates/ui-egui/src/panels/panel_kit.rs
@@ -9,7 +9,7 @@ use crate::{EffectcraftApp, widgets};
 /// A dropdown; returns the newly chosen index.
 pub fn dropdown(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, auto: &str, options: &[&str], cur: usize) -> Option<usize> {
     let t = app.tokens;
-    let id = egui::Id::new(("kit-dd", auto));
+    let id = egui::Id::unique(("kit-dd", auto));
     let text = options.get(cur).copied().unwrap_or("");
     if widgets::dropdown(ui, r, text, &t, id).clicked() {
         widgets::open_popup(ui, id);
@@ -23,7 +23,7 @@ pub fn dropdown(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, auto: &str
 pub fn checkbox(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, auto: &str, text: &str, on: bool) -> bool {
     let t = app.tokens;
     let r = Rect::from_min_size(at, vec2(16.0, 16.0));
-    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::new(("kit-cb", auto))).clicked();
+    let clicked = widgets::checkbox(ui, r, on, &t, egui::Id::unique(("kit-cb", auto))).clicked();
     ui.painter().text(pos2(r.max.x + 6.0, r.center().y), Align2::LEFT_CENTER, text, Tokens::ui(12.0), t.text);
     let full = Rect::from_min_size(at, vec2(22.0 + text.len() as f32 * 6.5, 16.0));
     app.auto.add(auto, full, text);
@@ -33,7 +33,7 @@ pub fn checkbox(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, aut
 /// A text button; true when clicked.
 pub fn button(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, auto: &str, text: &str, primary: bool) -> bool {
     let t = app.tokens;
-    let clicked = widgets::text_button(ui, r, text, primary, &t, egui::Id::new(("kit-btn", auto))).clicked();
+    let clicked = widgets::text_button(ui, r, text, primary, &t, egui::Id::unique(("kit-btn", auto))).clicked();
     app.auto.add(auto, r, text);
     clicked
 }
@@ -47,7 +47,7 @@ pub fn label(ui: &egui::Ui, at: egui::Pos2, text: &str, t: &Tokens) {
 #[allow(clippy::too_many_arguments)]
 pub fn number(app: &mut EffectcraftApp, ui: &mut egui::Ui, at: egui::Pos2, auto: &str, v: f64, speed: f64, range: (f64, f64), dec: usize, suffix: &str) -> f64 {
     let t = app.tokens;
-    let (r, nv, _) = widgets::hot_number_at(ui, at, egui::Id::new(("kit-n", auto)), v, speed, range, dec, suffix, &t);
+    let (r, nv, _) = widgets::hot_number_at(ui, at, egui::Id::unique(("kit-n", auto)), v, &widgets::HotSpec { speed, range, decimals: dec, suffix }, &t);
     app.auto.add(auto, r, &format!("{v}"));
     nv.unwrap_or(v)
 }
diff --git a/crates/ui-egui/src/panels/path_vr_panels.rs b/crates/ui-egui/src/panels/path_vr_panels.rs
index 9dba0dd59..680d9f5a0 100644
--- a/crates/ui-egui/src/panels/path_vr_panels.rs
+++ b/crates/ui-egui/src/panels/path_vr_panels.rs
@@ -36,7 +36,7 @@ pub fn create_nulls(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
     let mut ui = area(ui, rect);
-    let loop_id = egui::Id::new("createNulls.loop");
+    let loop_id = egui::Id::unique("createNulls.loop");
     let mut looping: bool = ui.data(|d| d.get_temp(loop_id)).unwrap_or(false);
     let ready = app.session.is_enabled("paths.nullsFollowPoints") && !app.session.state.selected_layers.is_empty();
     ui.label(RichText::new(tr("Select a layer with a mask or shape path (or the path property), or Puppet pins.")).color(t.text_dim).small());
@@ -70,7 +70,7 @@ pub fn vr_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         ui.label(RichText::new(tr("No VR environments yet. Create one with Composition ▸ VR ▸ Create VR Environment…")).color(t.text_faint));
         return;
     }
-    let sel_id = egui::Id::new("vrEditor.selected");
+    let sel_id = egui::Id::unique("vrEditor.selected");
     let active = app.session.state.active_comp.map(|c| c.0);
     let mut sel: u64 = ui.data(|d| d.get_temp(sel_id)).unwrap_or(0);
     // Default: the active comp's environment, else the first.
diff --git a/crates/ui-egui/src/panels/precomp.rs b/crates/ui-egui/src/panels/precomp.rs
index 8a40c56e9..7c1750d5e 100644
--- a/crates/ui-egui/src/panels/precomp.rs
+++ b/crates/ui-egui/src/panels/precomp.rs
@@ -209,7 +209,7 @@ pub fn navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         };
         let g = p.layout_no_wrap(label.clone(), Tokens::ui(11.5), col);
         let r = Rect::from_min_size(pos2(x, rect.min.y + 2.0), vec2(g.size().x + 12.0, rect.height() - 4.0));
-        let resp = ui.interact(r, egui::Id::new(("comp-nav", id.0)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("comp-nav", id.0)), Sense::click());
         if active {
             p.rect_filled(r, 3.0, t.row_selected);
         } else if resp.hovered() {
@@ -223,7 +223,7 @@ pub fn navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         x = r.max.x + 2.0;
     }
     let fr = Rect::from_min_size(pos2(rect.max.x - 26.0, rect.min.y + 2.0), vec2(22.0, rect.height() - 4.0));
-    if crate::widgets::icon_button(ui, fr, crate::icons::Icon::Flowchart, false, &t, egui::Id::new("comp-nav-flow"))
+    if crate::widgets::icon_button(ui, fr, crate::icons::Icon::Flowchart, false, &t, egui::Id::unique("comp-nav-flow"))
         .on_hover_text(tr("Composition Mini-Flowchart"))
         .clicked()
     {
@@ -248,64 +248,65 @@ pub fn mini_flowchart(app: &mut EffectcraftApp, ctx: &egui::Context) {
     let downs = downstream(&proj, cid);
     let mut open = None;
     let mut close = false;
-    let area = egui::Area::new(egui::Id::new("mini-flowchart")).order(egui::Order::Foreground).constrain(true).fixed_pos(pos2(at[0], at[1])).show(ctx, |ui| {
-        egui::Frame::popup(ui.style()).fill(t.panel_bg).inner_margin(egui::Margin::same(10)).show(ui, |ui| {
-            let col_w = 160.0;
-            let rows = ups.len().max(downs.len()).max(1) as f32;
-            let h = rows * 26.0 + 8.0;
-            let (rect, _) = ui.allocate_exact_size(vec2(col_w * 3.0 + 60.0, h), Sense::hover());
-            let p = ui.painter().clone();
-            let node = |ui: &mut egui::Ui, app: &mut EffectcraftApp, r: Rect, id: ItemId, active: bool| {
-                let resp = ui.interact(r, egui::Id::new(("mfc", id.0)), Sense::click());
-                p.rect_filled(
-                    r,
-                    4.0,
-                    if active {
-                        t.accent
-                    } else if resp.hovered() {
-                        t.hover
-                    } else {
-                        t.field_bg
-                    },
-                );
-                p.text(r.center(), Align2::CENTER_CENTER, name(&proj, id), Tokens::ui(11.5), if active { Color32::WHITE } else { t.text });
-                app.auto.add(&format!("flowchart.mini.{}", id.0), r, &name(&proj, id));
-                resp.clicked()
-            };
-            let mid = Rect::from_center_size(rect.center(), vec2(col_w, 22.0));
-            if node(ui, app, mid, cid, true) {
-                close = true;
-            }
-            let col = |i: usize, n: usize, x: f32| {
-                let y0 = rect.center().y - (n as f32 * 26.0) / 2.0 + 13.0;
-                Rect::from_center_size(pos2(x, y0 + i as f32 * 26.0), vec2(col_w, 22.0))
-            };
-            let arrow = |a: egui::Pos2, b: egui::Pos2| {
-                p.line_segment([a, b], Stroke::new(1.2, t.text_dim));
-                let d = (b - a).normalized();
-                let n = vec2(-d.y, d.x);
-                p.add(egui::Shape::convex_polygon(vec![b, b - d * 7.0 + n * 3.5, b - d * 7.0 - n * 3.5], t.text_dim, Stroke::NONE));
-            };
-            for (i, u) in ups.iter().enumerate() {
-                let r = col(i, ups.len(), rect.min.x + col_w / 2.0);
-                // Upstream comps contain the active one: arrow from the nested comp up into them.
-                arrow(mid.left_center(), r.right_center());
-                if node(ui, app, r, *u, false) {
-                    open = Some(*u);
+    let area =
+        egui::Area::new(egui::Id::unique("mini-flowchart")).order(egui::Order::Foreground).constrain(true).fixed_pos(pos2(at[0], at[1])).show(ctx, |ui| {
+            egui::Frame::popup(ui.style()).fill(t.panel_bg).inner_margin(egui::Margin::same(10)).show(ui, |ui| {
+                let col_w = 160.0;
+                let rows = ups.len().max(downs.len()).max(1) as f32;
+                let h = rows * 26.0 + 8.0;
+                let (rect, _) = ui.allocate_exact_size(vec2(col_w * 3.0 + 60.0, h), Sense::hover());
+                let p = ui.painter().clone();
+                let node = |ui: &mut egui::Ui, app: &mut EffectcraftApp, r: Rect, id: ItemId, active: bool| {
+                    let resp = ui.interact(r, egui::Id::unique(("mfc", id.0)), Sense::click());
+                    p.rect_filled(
+                        r,
+                        4.0,
+                        if active {
+                            t.accent
+                        } else if resp.hovered() {
+                            t.hover
+                        } else {
+                            t.field_bg
+                        },
+                    );
+                    p.text(r.center(), Align2::CENTER_CENTER, name(&proj, id), Tokens::ui(11.5), if active { Color32::WHITE } else { t.text });
+                    app.auto.add(&format!("flowchart.mini.{}", id.0), r, &name(&proj, id));
+                    resp.clicked()
+                };
+                let mid = Rect::from_center_size(rect.center(), vec2(col_w, 22.0));
+                if node(ui, app, mid, cid, true) {
+                    close = true;
                 }
-            }
-            for (i, d) in downs.iter().enumerate() {
-                let r = col(i, downs.len(), rect.max.x - col_w / 2.0);
-                arrow(r.left_center(), mid.right_center());
-                if node(ui, app, r, *d, false) {
-                    open = Some(*d);
+                let col = |i: usize, n: usize, x: f32| {
+                    let y0 = rect.center().y - (n as f32 * 26.0) / 2.0 + 13.0;
+                    Rect::from_center_size(pos2(x, y0 + i as f32 * 26.0), vec2(col_w, 22.0))
+                };
+                let arrow = |a: egui::Pos2, b: egui::Pos2| {
+                    p.line_segment([a, b], Stroke::new(1.2, t.text_dim));
+                    let d = (b - a).normalized();
+                    let n = vec2(-d.y, d.x);
+                    p.add(egui::Shape::convex_polygon(vec![b, b - d * 7.0 + n * 3.5, b - d * 7.0 - n * 3.5], t.text_dim, Stroke::NONE));
+                };
+                for (i, u) in ups.iter().enumerate() {
+                    let r = col(i, ups.len(), rect.min.x + col_w / 2.0);
+                    // Upstream comps contain the active one: arrow from the nested comp up into them.
+                    arrow(mid.left_center(), r.right_center());
+                    if node(ui, app, r, *u, false) {
+                        open = Some(*u);
+                    }
                 }
-            }
-            if ups.is_empty() && downs.is_empty() {
-                p.text(pos2(rect.center().x, rect.max.y - 4.0), Align2::CENTER_BOTTOM, tr("No nested compositions"), Tokens::ui(10.5), t.text_faint);
-            }
+                for (i, d) in downs.iter().enumerate() {
+                    let r = col(i, downs.len(), rect.max.x - col_w / 2.0);
+                    arrow(r.left_center(), mid.right_center());
+                    if node(ui, app, r, *d, false) {
+                        open = Some(*d);
+                    }
+                }
+                if ups.is_empty() && downs.is_empty() {
+                    p.text(pos2(rect.center().x, rect.max.y - 4.0), Align2::CENTER_BOTTOM, tr("No nested compositions"), Tokens::ui(10.5), t.text_faint);
+                }
+            });
         });
-    });
     let outside = crate::widgets::pressed_outside(ctx, &area.response);
     if let Some(id) = open {
         app.session.open_comp(id);
diff --git a/crates/ui-egui/src/panels/primitive_dialog.rs b/crates/ui-egui/src/panels/primitive_dialog.rs
new file mode 100644
index 000000000..3711c6a80
--- /dev/null
+++ b/crates/ui-egui/src/panels/primitive_dialog.rs
@@ -0,0 +1,125 @@
+//! New 3D Primitive dialog (Layer ▸ New ▸ 3D Primitive…): the primitive's type, name and
+//! dimensions. OK runs `layer.newPrimitive`, which switches a Classic 3D comp to Advanced 3D;
+//! the layer's Geometry Options edit it afterwards.
+
+use std::collections::BTreeMap;
+
+use crate::i18n::tr;
+use effectcraft_engine::project::build::{Ids, primitive_geometry_options};
+use effectcraft_engine::project::{ItemId, ParamUi, PrimitiveKind, Property};
+use egui::{Color32, vec2};
+use serde_json::{Value, json};
+
+use crate::theme::Tokens;
+use crate::{Dialog, EffectcraftApp};
+
+#[derive(Clone, Debug, Default)]
+pub struct PrimitiveDraft {
+    pub kind: PrimitiveKind,
+    pub name: String,
+    /// Whether the name was typed; until then it follows the type.
+    pub named: bool,
+    /// Dimensions typed, by Geometry Options match id, kept when the type changes (a sphere's
+    /// radius carries over to a cone); the rest are the type's defaults.
+    pub dims: BTreeMap<String, f64>,
+    /// The project (its epoch) and comp the dialog was opened for.
+    pub target: Option<(u64, ItemId)>,
+}
+
+fn target(app: &EffectcraftApp) -> Option<(u64, ItemId)> {
+    Some((app.session.script_ui.project_epoch, app.session.active_comp_id()?))
+}
+
+/// The dimensions a primitive type has: its Geometry Options as the engine builds them.
+fn dimensions(kind: PrimitiveKind) -> Vec<Property> {
+    let mut next = 0;
+    primitive_geometry_options(&mut Ids(&mut next), kind).props().cloned().collect()
+}
+
+/// Open the dialog for a new primitive in the active comp.
+pub fn open(app: &mut EffectcraftApp) -> Result<(), String> {
+    let target = Some(target(app).ok_or("no composition is open")?);
+    let kind = PrimitiveKind::Cube;
+    app.dialog_state.primitive = PrimitiveDraft { kind, name: kind.label().to_string(), named: false, dims: BTreeMap::new(), target };
+    app.dialog = Some(Dialog::NewPrimitive);
+    Ok(())
+}
+
+pub fn dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
+    let mut d = app.dialog_state.primitive.clone();
+    // A project opened or another comp made active since (by a script or the control channel):
+    // the primitive would land somewhere the dialog was not opened for.
+    if target(app) != d.target {
+        app.ui.status = "New 3D Primitive closed: the composition changed".into();
+        app.dialog = None;
+        return;
+    }
+    let (mut ok, mut close) = (false, false);
+    super::dialogs::modal(ctx, "New 3D Primitive", vec2(420.0, 300.0), t, |ui| {
+        egui::Grid::new("primitive-grid").num_columns(2).spacing([14.0, 9.0]).show(ui, |ui| {
+            ui.label(tr("Type"));
+            let combo = craft_ui::ComboBox::from_id_salt("primitive-type").selected_text(tr(d.kind.label())).show_ui(ui, |ui| {
+                for (i, k) in PrimitiveKind::ALL.into_iter().enumerate() {
+                    let item = ui.selectable_value(&mut d.kind, k, tr(k.label()));
+                    app.auto.add(&format!("dialog.primitive.typeItem.{i}"), item.rect, k.label());
+                }
+            });
+            app.auto.add_response("dialog.primitive.type", &combo.response, "Type");
+            if !d.named {
+                d.name = d.kind.label().to_string();
+            }
+            ui.end_row();
+            ui.label(tr("Name"));
+            let r = ui.add(egui::TextEdit::singleline(&mut d.name).desired_width(220.0));
+            d.named |= r.changed();
+            app.auto.add_response("dialog.primitive.name", &r, "Name");
+            ui.end_row();
+            for p in dimensions(d.kind) {
+                let ParamUi::Slider { min, max, decimals, .. } = p.ui else { continue };
+                let mut v = d.dims.get(&p.match_id).copied().unwrap_or(p.value.as_f64());
+                ui.label(tr(&p.name));
+                // Counts (segments, rings) are whole numbers; sizes are pixels.
+                let suffix = if decimals == 0 { "" } else { " px" };
+                let r = ui.add(crate::widgets::drag_value(egui::DragValue::new(&mut v).range(min..=max).max_decimals(decimals as usize).suffix(suffix)));
+                app.auto.add_response(&format!("dialog.primitive.{}", p.match_id), &r, &p.name);
+                if r.changed() {
+                    d.dims.insert(p.match_id, v);
+                }
+                ui.end_row();
+            }
+        });
+        ui.add_space(14.0);
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+            let b = ui.add(egui::Button::new(egui::RichText::new(tr("   OK   ")).color(Color32::WHITE)).fill(t.accent));
+            app.auto.add("dialog.primitive.ok", b.rect, "OK");
+            ok |= b.clicked();
+            let c = ui.button(tr("Cancel"));
+            app.auto.add("dialog.primitive.cancel", c.rect, "Cancel");
+            close |= c.clicked();
+        });
+    });
+    app.dialog_state.primitive = d.clone();
+    if ok || super::dialogs::ui_enter(ctx) {
+        let mut p = json!({"kind": d.kind.label().to_ascii_lowercase(), "name": d.name});
+        for dim in dimensions(d.kind) {
+            if let Some(v) = d.dims.get(&dim.match_id) {
+                p[dim.match_id.as_str()] = json!(v);
+            }
+        }
+        if let Err(e) = app.session.execute("layer.newPrimitive", p) {
+            app.ui.status = e.to_string();
+        }
+        close = true;
+    }
+    if close {
+        app.dialog = None;
+    }
+}
+
+/// Menu routing: New 3D Primitive without parameters opens the dialog. Returns true when it did.
+pub fn route(app: &mut EffectcraftApp, id: &str, params: &Value) -> Result<bool, String> {
+    if id != "layer.newPrimitive" || !params.as_object().is_none_or(|m| m.is_empty()) {
+        return Ok(false);
+    }
+    open(app).map(|_| true)
+}
diff --git a/crates/ui-egui/src/panels/project.rs b/crates/ui-egui/src/panels/project.rs
index c4e9894c4..1944f333f 100644
--- a/crates/ui-egui/src/panels/project.rs
+++ b/crates/ui-egui/src/panels/project.rs
@@ -126,8 +126,8 @@ type PendingThumb = (u64, Arc<Mutex<Option<Option<(u32, u32, Vec<u8>)>>>>);
 /// Rendered on a background thread (inline on wasm32): until the new one lands the previous
 /// thumbnail stays up, so selecting a big comp or editing it never stalls the panel.
 fn thumbnail(app: &EffectcraftApp, ctx: &egui::Context, it: &Item) -> Option<egui::TextureHandle> {
-    let key = egui::Id::new(("proj-thumb", it.id.0));
-    let pkey = egui::Id::new(("proj-thumb-pending", it.id.0));
+    let key = egui::Id::unique(("proj-thumb", it.id.0));
+    let pkey = egui::Id::unique(("proj-thumb-pending", it.id.0));
     let rev = app.session.revision;
     let cached: Option<(u64, egui::TextureHandle)> = ctx.data(|d| d.get_temp(key));
     let mut tex = cached.as_ref().map(|(_, t)| t.clone());
@@ -191,8 +191,10 @@ fn fit(r: Rect, w: f32, h: f32) -> Rect {
 
 /// An inline text edit in progress: (item, field `name`|`comment`, text).
 type Editing = (u64, String, String);
+/// The `egui::Id` of the Project panel's inline edit in progress ([`Editing`]): the item, which
+/// field (`name` or `comment`) and the text being typed.
 fn edit_id() -> egui::Id {
-    egui::Id::new("proj-inline-edit")
+    egui::Id::unique("proj-inline-edit")
 }
 
 /// Start renaming the selected item (Enter in the Project panel).
@@ -206,22 +208,27 @@ pub fn begin_rename(app: &EffectcraftApp, ctx: &egui::Context) {
 
 /// Where a Shift-extended selection starts (the last item clicked or moved to without Shift).
 fn anchor_id() -> egui::Id {
-    egui::Id::new("project-selection-anchor")
+    egui::Id::unique("project-selection-anchor")
 }
 
 /// The item the arrow keys move from: the last item clicked or moved to.
 fn cursor_id() -> egui::Id {
-    egui::Id::new("project-selection-cursor")
+    egui::Id::unique("project-selection-cursor")
 }
 
 /// An item row's widget: its click / drag area, keyboard focus and accessibility node.
 fn row_id(item: ItemId) -> egui::Id {
-    egui::Id::new(("pitem", item.0))
+    egui::Id::unique(("pitem", item.0))
 }
 
 /// The last row drawn with keyboard focus (egui drops the focus of a row scrolled out of view).
 fn focused_row_id() -> egui::Id {
-    egui::Id::new("project-focused-row")
+    egui::Id::unique("project-focused-row")
+}
+
+/// The item whose selection the panel last scrolled into view.
+fn selection_seen_id() -> egui::Id {
+    egui::Id::unique("proj-sel-seen")
 }
 
 /// The focused widget is one of the panel's rows, or nothing has keyboard focus: the panel's keys
@@ -347,12 +354,36 @@ pub(crate) fn visible_rows(app: &EffectcraftApp) -> Vec<(ItemId, usize)> {
     rows
 }
 
-pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+/// Bring `items` into view: clear the panel's search, open every folder holding them, select
+/// them, and show and focus the Project panel. Used by Reveal Layer Source in Project and
+/// Reveal Composition in Project, so the item is visible even in a large, filtered project.
+pub(crate) fn reveal(app: &mut EffectcraftApp, ctx: &egui::Context, items: &[ItemId]) {
+    let items: Vec<ItemId> = items.iter().copied().filter(|item| app.session.project.item(*item).is_some()).collect();
+    if items.is_empty() {
+        return;
+    }
+    for item in &items {
+        let mut parent = app.session.project.item(*item).and_then(|item| item.parent);
+        let mut depth = 0;
+        while let Some(folder) = parent {
+            app.ui.project_open_folders.insert(folder.0);
+            parent = app.session.project.item(folder).and_then(|item| item.parent);
+            depth += 1;
+            if depth > 256 {
+                break;
+            }
+        }
+    }
+    app.ui.project_search.clear();
+    app.session.state.project_selection = items;
+    // Force the panel's selection scroll on its next draw, even when the item was already selected.
+    ctx.data_mut(|d| d.remove_temp::<Option<u64>>(selection_seen_id()));
+    app.show_panel(crate::dock::PanelKind::Project);
+}
+
+/// The selected item's thumbnail and details (with the comps that use it), or a hint.
+fn details_header(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, ctx: &egui::Context, head: Rect) {
     let t = app.tokens;
-    let p = ui.painter().clone();
-    let ctx = ui.ctx().clone();
-    // Preview header.
-    let head = Rect::from_min_size(rect.min, vec2(rect.width(), 74.0));
     let sel = app.session.state.project_selection.first().copied();
     if let Some(it) = sel.and_then(|i| app.session.project.item(i)).cloned() {
         let thumb = Rect::from_min_size(head.min + vec2(10.0, 10.0), vec2(96.0, 54.0));
@@ -361,12 +392,12 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             ItemKind::Solid(s) => {
                 p.rect_filled(thumb.shrink(4.0), 2.0, Color32::from_rgb((s.color[0] * 255.0) as u8, (s.color[1] * 255.0) as u8, (s.color[2] * 255.0) as u8));
             }
-            _ => match thumbnail(app, &ctx, &it) {
+            _ => match thumbnail(app, ctx, &it) {
                 Some(tex) => {
                     let [w, h] = tex.size();
                     p.image(tex.id(), fit(thumb, w as f32, h as f32), Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
                 }
-                None => icons::paint(&p, Rect::from_center_size(thumb.center(), vec2(24.0, 24.0)), item_icon(&it), t.text_dim),
+                None => icons::paint(p, Rect::from_center_size(thumb.center(), vec2(24.0, 24.0)), item_icon(&it), t.text_dim),
             },
         }
         app.auto.add("project.thumbnail", thumb, &it.name);
@@ -379,7 +410,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let count = users.iter().fold(0usize, |n, (_, k)| n.saturating_add(*k));
         let name_y = thumb.min.y + 6.0;
         if count == 0 {
-            let r = widgets::text_fit(&p, pos2(tx, name_y), Align2::LEFT_CENTER, &it.name, Tokens::semibold(12.0), max_w, t.text);
+            let r = widgets::text_fit(p, pos2(tx, name_y), Align2::LEFT_CENTER, &it.name, Tokens::semibold(12.0), max_w, t.text);
             app.auto.add("project.details.name", r, &it.name);
         } else {
             let used = if count == 1 { crate::i18n::tr("used once").to_owned() } else { crate::i18n::tr_args("used {} times", &[&count]) };
@@ -388,17 +419,17 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             let arrow_w = 14.0;
             // The name gives way first, but keeps at least half the room; the count is cut after it.
             let name_max = (max_w - arrow_w - used_w).max(max_w * 0.5);
-            let r = widgets::text_fit(&p, pos2(tx, name_y), Align2::LEFT_CENTER, &it.name, Tokens::semibold(12.0), name_max, t.text);
+            let r = widgets::text_fit(p, pos2(tx, name_y), Align2::LEFT_CENTER, &it.name, Tokens::semibold(12.0), name_max, t.text);
             app.auto.add("project.details.name", r, &it.name);
             let ar = Rect::from_min_size(pos2(r.max.x + 1.0, name_y - 7.0), vec2(arrow_w, 14.0));
             let tip = crate::i18n::tr("Compositions that use this item");
-            let aresp = ui.interact(ar, egui::Id::new("proj-used-in"), Sense::click()).on_hover_text(tip);
-            icons::paint(&p, Rect::from_center_size(ar.center(), vec2(9.0, 9.0)), Icon::ChevronDown, if aresp.hovered() { t.text } else { t.text_dim });
+            let aresp = ui.interact(ar, egui::Id::unique("proj-used-in"), Sense::click()).on_hover_text(tip);
+            icons::paint(p, Rect::from_center_size(ar.center(), vec2(9.0, 9.0)), Icon::ChevronDown, if aresp.hovered() { t.text } else { t.text_dim });
             app.auto.add("project.details.usedIn", ar, tip);
             // The comma sits right after the arrow (its glyph ends short of the hit area).
             let ux = ar.max.x - 3.0;
             let room = (head.max.x - 10.0 - ux).max(0.0);
-            let ur = widgets::text_fit(&p, pos2(ux, name_y), Align2::LEFT_CENTER, &used, Tokens::ui(11.0), room, t.text_dim);
+            let ur = widgets::text_fit(p, pos2(ux, name_y), Align2::LEFT_CENTER, &used, Tokens::ui(11.0), room, t.text_dim);
             app.auto.add("project.details.used", ur, &used);
             let names: Vec<(u64, String, usize)> =
                 users.iter().map(|(cid, n)| (cid.0, app.session.project.item(*cid).map(|c| c.name.clone()).unwrap_or_default(), *n)).collect();
@@ -415,7 +446,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 }
             });
             if let Some(cid) = open
-                && let Err(e) = crate::menus::invoke(app, &ctx, "comp.open", json!({"comp": cid}))
+                && let Err(e) = crate::menus::invoke(app, ctx, "comp.open", json!({"comp": cid}))
             {
                 app.ui.status = e;
             }
@@ -432,23 +463,37 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             lines.push(f.codec.clone());
         }
         for (i, l) in lines.iter().enumerate() {
-            let r = widgets::text_fit(&p, pos2(tx, thumb.min.y + 22.0 + 13.0 * i as f32), Align2::LEFT_CENTER, l, Tokens::ui(11.0), max_w, t.text_dim);
+            let r = widgets::text_fit(p, pos2(tx, thumb.min.y + 22.0 + 13.0 * i as f32), Align2::LEFT_CENTER, l, Tokens::ui(11.0), max_w, t.text_dim);
             app.auto.add(&format!("project.details.{i}"), r, l);
         }
     } else {
         let hint = "Select an item to see its details";
-        let r = widgets::text_fit(&p, head.center(), Align2::CENTER_CENTER, hint, Tokens::ui(11.0), head.width() - 20.0, t.text_faint);
+        let r = widgets::text_fit(p, head.center(), Align2::CENTER_CENTER, crate::i18n::tr(hint), Tokens::ui(11.0), head.width() - 20.0, t.text_faint);
         app.auto.add("project.details.hint", r, hint);
     }
-    // Search.
-    let sr = Rect::from_min_size(pos2(rect.min.x + 8.0, head.max.y + 2.0), vec2(rect.width() - 16.0, 22.0));
-    let mut q = app.ui.project_search.clone();
-    widgets::search_field(ui, sr, &mut q, "Search project", &t);
-    app.ui.project_search = q;
-    app.auto.add("project.search", sr, "Search");
-    // Column header: Name, Label, then the visible optional columns.
-    let hdr = Rect::from_min_size(pos2(rect.min.x, sr.max.y + 6.0), vec2(rect.width(), 20.0));
-    p.line_segment([hdr.left_bottom(), hdr.right_bottom()], Stroke::new(1.0, t.separator));
+}
+
+/// Column positions: Name and Label, then the visible optional columns (scrolled by `hscroll`).
+struct Columns {
+    cols: Vec<(&'static str, &'static str, f32, f32)>,
+    name_w: f32,
+    label_x: f32,
+    opt_x0: f32,
+    /// How far the optional columns overflow the panel.
+    overflow: f32,
+    hscroll: f32,
+    /// Where the last column ends.
+    end_x: f32,
+}
+
+impl Columns {
+    /// `r` cut off under the frozen Name and Label columns.
+    fn opt_clip(&self, r: Rect) -> Rect {
+        Rect::from_min_max(pos2(r.min.x.max(self.opt_x0 - 4.0), r.min.y), r.max)
+    }
+}
+
+fn layout_columns(app: &mut EffectcraftApp, rect: Rect) -> Columns {
     let name_w = (rect.width() * 0.40).clamp(120.0, 260.0);
     let label_x = rect.min.x + name_w + 14.0;
     let mut cols: Vec<(&'static str, &'static str, f32, f32)> = vec![("name", "Name", rect.min.x + 26.0, name_w - 26.0), ("label", "", label_x - 8.0, 18.0)];
@@ -466,16 +511,29 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             x += w + 4.0;
         }
     }
-    let opt_clip = |r: Rect| Rect::from_min_max(pos2(r.min.x.max(opt_x0 - 4.0), r.min.y), r.max);
+    Columns { cols, name_w, label_x, opt_x0, overflow, hscroll, end_x: x }
+}
+
+/// The column header row: sort labels with the sort arrow, and the Columns menu.
+fn draw_header(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, hdr: Rect, cl: &Columns) {
+    let t = app.tokens;
+    let Columns { cols, label_x, end_x, .. } = cl;
+    let (label_x, end_x) = (*label_x, *end_x);
     let hp = p.with_clip_rect(hdr);
-    for (key, label, x, w) in &cols {
+    for (key, label, x, w) in cols {
         let hr = Rect::from_min_size(pos2(x - 4.0, hdr.min.y), vec2(*w, hdr.height()));
-        let hr = if matches!(*key, "name" | "label") { hr } else { opt_clip(hr) };
+        let hr = if matches!(*key, "name" | "label") { hr } else { cl.opt_clip(hr) };
         if hr.width() <= 0.0 {
             continue;
         }
-        let resp = ui.interact(hr.intersect(hdr), egui::Id::new(("proj-sort", *key)), Sense::click());
-        hp.with_clip_rect(hr).text(pos2(*x, hdr.center().y), Align2::LEFT_CENTER, *label, Tokens::ui(11.0), if resp.hovered() { t.text } else { t.text_dim });
+        let resp = ui.interact(hr.intersect(hdr), egui::Id::unique(("proj-sort", *key)), Sense::click());
+        hp.with_clip_rect(hr).text(
+            pos2(*x, hdr.center().y),
+            Align2::LEFT_CENTER,
+            crate::i18n::tr(label),
+            Tokens::ui(11.0),
+            if resp.hovered() { t.text } else { t.text_dim },
+        );
         if *key == "label" {
             icons::paint(&hp, Rect::from_center_size(pos2(label_x, hdr.center().y), vec2(10.0, 10.0)), Icon::Keyframe, t.text_dim);
         }
@@ -496,7 +554,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 Some(o) => crate::i18n::tr_args("Sort by {}, {}", &[&column, &o]),
                 None => crate::i18n::tr_args("Sort by {}", &[&column]),
             };
-            egui::WidgetInfo::labeled(egui::WidgetType::Button, true, name)
+            egui::WidgetInfo::labeled(egui::Role::Button, true, name)
         });
         if resp.clicked() {
             if app.ui.project_sort == *key {
@@ -508,433 +566,202 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         column_menu(app, &resp);
     }
-    let hresp = ui.interact(Rect::from_min_max(pos2(x, hdr.min.y), hdr.max), egui::Id::new("proj-hdr-rest"), Sense::CLICK);
+    let hresp = ui.interact(Rect::from_min_max(pos2(end_x, hdr.min.y), hdr.max), egui::Id::unique("proj-hdr-rest"), Sense::CLICK);
     column_menu(app, &hresp);
     app.auto.add("project.columns", hdr, "Columns (right-click to show or hide)");
-    // Rows.
-    let footer_h = 28.0;
-    let list = Rect::from_min_max(pos2(rect.min.x, hdr.max.y), pos2(rect.max.x, rect.max.y - footer_h));
-    let lp = p.with_clip_rect(list);
-    // The list's empty area (under the rows and the scroll bar, which take their own clicks):
-    // a click deselects, a drag draws a selection box, a double-click imports, as in After
-    // Effects (File ▸ Import ▸ File...).
-    // Not a Tab stop: the keyboard reaches the rows, and nothing else here takes a key.
-    let empty = ui.interact(list, egui::Id::new("proj-empty"), Sense::CLICK | Sense::DRAG);
-    app.auto.add("project.empty", list, "Double-click to import files; drag to select items; right-click for project actions");
-    if overflow > 0.0 && ui.rect_contains_pointer(list) {
-        let (dx, dy, shift) = ui.input(|i| (i.smooth_scroll_delta.x, i.smooth_scroll_delta.y, i.modifiers.shift));
-        let d = if dx.abs() > 0.0 {
-            dx
-        } else if shift {
-            dy
-        } else {
-            0.0
-        };
-        app.ui.project_hscroll = (app.ui.project_hscroll - d).clamp(0.0, overflow);
+}
+
+/// An item row's context menu: Composition Settings, Delete, Rename, Duplicate, labels and the
+/// footage commands.
+fn item_menu(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    ctx: &egui::Context,
+    it: &effectcraft_engine::project::Item,
+    id: ItemId,
+    selected: bool,
+    actions: &mut Vec<(String, serde_json::Value)>,
+) {
+    let t = app.tokens;
+    let footage = matches!(it.kind, ItemKind::Footage(_));
+    // First on a comp, as in After Effects; for this comp, not the viewer's (#1058).
+    if matches!(it.kind, ItemKind::Comp(_)) && ui.button(crate::i18n::tr("Composition Settings…")).clicked() {
+        actions.push(("comp.settings".into(), json!({"comp": id.0})));
+        ui.close();
     }
-    let moved = keyboard_nav(app, &ctx);
-    let rows = visible_rows(app);
-    // Enter renames the selected item (Project panel focused, not typing).
-    if app.ui.focused == crate::dock::PanelKind::Project
-        && app.dialog.is_none()
-        && keys_reach_rows(app, &ctx)
-        && ctx.data(|d| d.get_temp::<Editing>(edit_id())).is_none()
-        && ctx.input(|i| i.key_pressed(egui::Key::Enter))
-    {
-        begin_rename(app, &ctx);
+    if ui.button(crate::i18n::tr("Delete")).clicked() {
+        actions.push(("project.delete".into(), json!({"items": targets(app, id, selected)})));
+        ui.close();
     }
-    let editing: Option<Editing> = ctx.data(|d| d.get_temp(edit_id()));
-    let dragging = egui::DragAndDrop::payload::<DragPayload>(&ctx).and_then(|p| match *p {
-        DragPayload::Item(i) => Some(i),
-        _ => None,
+    if matches!(it.kind, ItemKind::Comp(_)) && ui.button(crate::i18n::tr("Open Composition")).clicked() {
+        actions.push(("comp.open".into(), json!({"comp": id.0})));
+        ui.close();
+    }
+    if ui.button(crate::i18n::tr("Rename")).clicked() {
+        ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (id.0, "name".into(), it.name.clone())));
+        ui.close();
+    }
+    let duplicate_items = targets(app, id, selected);
+    // Like Edit > Duplicate: folders disable the whole operation, including mixed selections.
+    let can_duplicate = !duplicate_items.is_empty() && duplicate_items.iter().all(|id| app.session.project.item(ItemId(*id)).is_some_and(|i| !i.is_folder()));
+    let mut duplicate = egui::Button::new(crate::i18n::tr("Duplicate"));
+    if let Some(shortcut) = app.session.shortcuts().shortcut_of("edit.duplicate", &serde_json::Value::Null) {
+        duplicate = duplicate.shortcut_text(crate::menus::shortcut_text(shortcut));
+    }
+    let response = ui.add_enabled(can_duplicate, duplicate);
+    app.auto.add("project.context.duplicate", response.rect, "Duplicate");
+    if response.clicked() {
+        actions.push(("project.duplicate".into(), json!({"items": duplicate_items})));
+        ui.close();
+    }
+    if it.parent.is_some() && ui.button(crate::i18n::tr("Move to Project Root")).clicked() {
+        actions.push(("project.move".into(), json!({"items": targets(app, id, selected), "folder": null})));
+        ui.close();
+    }
+    if !it.is_folder() && ui.button(crate::i18n::tr("Add to Composition")).clicked() {
+        actions.push(("layer.addItem".into(), json!({"item": id.0})));
+        ui.close();
+    }
+    // File ▸ New Comp from Selection on the selection (the right-clicked row joins it
+    // above): several items ask how in its dialog, as in After Effects (#360).
+    if ui.button(crate::i18n::tr("New Comp from Selection")).clicked() {
+        actions.push(("file.newCompFromSelection".into(), json!({})));
+        ui.close();
+    }
+    // File ▸ Replace Footage ▸ With Precomposition: every layer using the item uses a
+    // new composition holding it instead. The label says how many layers that changes.
+    let uses: usize = app.session.project.item_users(id).iter().map(|(_, n)| n).sum();
+    let label = match uses {
+        0 => crate::i18n::tr("Replace with Precomposition").to_owned(),
+        1 => format!("{} ({})", crate::i18n::tr("Replace with Precomposition"), crate::i18n::tr("used once")),
+        n => format!("{} ({})", crate::i18n::tr("Replace with Precomposition"), crate::i18n::tr_args("used {} times", &[&n])),
+    };
+    if (footage || matches!(it.kind, ItemKind::Solid(_))) && ui.button(label).clicked() {
+        actions.push(("file.replaceWithPrecomp".into(), json!({"item": id.0})));
+        ui.close();
+    }
+    ui.separator();
+    ui.menu_button(crate::i18n::tr("Label"), |ui| {
+        for l in Label::ALL {
+            if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), l == it.label, &t).clicked() {
+                actions.push(("project.setLabel".into(), json!({"items": targets(app, id, selected), "label": label_index(l)})));
+                ui.close();
+            }
+        }
     });
-    let hover_y = ctx.pointer_hover_pos().filter(|p| list.contains(*p)).map(|p| p.y);
-    let mut drop_row: Option<ItemId> = None;
-    let mut actions: Vec<(String, serde_json::Value)> = vec![];
-    // Vertical scrolling: only the rows in view are drawn (and registered), so a project with
-    // thousands of items costs what one screenful does.
-    let content_h = rows.len() as f32 * ROW_H;
-    let max_scroll = (content_h - list.height() + ROW_H).max(0.0);
-    if ui.rect_contains_pointer(list) {
-        let (dy, shift) = ui.input(|i| (i.smooth_scroll_delta.y, i.modifiers.shift));
-        if !shift && dy != 0.0 {
-            app.ui.project_scroll -= dy;
-        }
+    // Footage: the File menu's footage commands (Interpret Footage, Replace Footage…).
+    if footage {
+        let mut chosen = None;
+        crate::menus::submenu_at(app, ui, &["File", "Interpret Footage"], &mut chosen);
+        crate::menus::submenu_at(app, ui, &["File", "Replace Footage"], &mut chosen);
+        crate::menus::entry_for(app, ui, "file.reloadFootage", &mut chosen);
+        crate::menus::entry_for(app, ui, "file.revealInFinder", &mut chosen);
+        actions.extend(chosen);
     }
-    // A selection made elsewhere (a command, an agent, the viewer) scrolls into view.
-    let sel_key = egui::Id::new("proj-sel-seen");
-    let sel_now = app.session.state.project_selection.last().map(|i| i.0);
-    if ctx.data(|d| d.get_temp::<Option<u64>>(sel_key)) != Some(sel_now) {
-        ctx.data_mut(|d| d.insert_temp(sel_key, sel_now));
-        if let Some(row) = sel_now.and_then(|s| rows.iter().position(|(id, _)| id.0 == s)) {
-            let top = row as f32 * ROW_H;
-            if top < app.ui.project_scroll {
-                app.ui.project_scroll = top;
-            } else if top + ROW_H > app.ui.project_scroll + list.height() {
-                app.ui.project_scroll = top + ROW_H - list.height();
-            }
-        }
+}
+
+/// The inline rename / comment field over `cell` when it is item `id`'s `field` being edited;
+/// returns whether it took the cell.
+fn cell_edit(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    actions: &mut Vec<(String, serde_json::Value)>,
+    editing: &Option<Editing>,
+    id: u64,
+    field: &str,
+    cell: Rect,
+) -> bool {
+    let ctx = ui.ctx().clone();
+    let Some((eid, ef, mut buf)) = editing.clone().filter(|(e, f, _)| *e == id && f == field) else { return false };
+    let mut child = ui.new_child(egui::UiBuilder::new().max_rect(cell));
+    // The field keeps Tab (egui would move the keyboard to the next widget, where Enter no
+    // longer renames, #881): Tab commits like Enter and gives the keyboard back to the panel.
+    let filter = egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, ..Default::default() };
+    let resp = child.add(egui::TextEdit::singleline(&mut buf).desired_width(cell.width()).font(Tokens::ui(12.0)).event_filter(filter));
+    app.auto.add(&format!("project.item.{}.{field}Edit", id), cell, field);
+    let tab = resp.has_focus() && ctx.input(|i| i.key_pressed(egui::Key::Tab));
+    if tab {
+        resp.surrender_focus();
     }
-    // The arrow keys' item scrolls into view (Shift+Up extends upward, past the selection's end).
-    if let Some(row) = moved.and_then(|m| rows.iter().position(|(id, _)| *id == m)) {
-        let top = row as f32 * ROW_H;
-        // Not `clamp`: a panel shorter than a row would make its bounds cross. The row's top wins.
-        app.ui.project_scroll = app.ui.project_scroll.max(top + ROW_H - list.height()).min(top);
-    }
-    app.ui.project_scroll = app.ui.project_scroll.clamp(0.0, max_scroll);
-    let scroll = app.ui.project_scroll;
-    let first = ((scroll / ROW_H).floor() as usize).min(rows.len());
-    let mut y = list.min.y - (scroll - first as f32 * ROW_H);
-    let project = app.session.project.clone();
-    for (i, (id, depth)) in rows.iter().enumerate().skip(first) {
-        let Some(it) = project.item(*id) else { continue };
-        let r = Rect::from_min_size(pos2(list.min.x, y), vec2(list.width(), ROW_H));
-        y += ROW_H;
-        if r.min.y > list.max.y {
-            break;
-        }
-        if hover_y.is_some_and(|hy| hy >= r.min.y && hy < r.max.y) {
-            drop_row = Some(*id);
-        }
-        let selected = app.session.state.project_selection.contains(id);
-        lp.rect_filled(
-            r,
-            0.0,
-            // Flat rows like After Effects' Project panel (no stripes).
-            if selected { t.row_selected } else { t.row },
-        );
-        // The row's click / drag area goes first, so the twirl, proxy, label and comment widgets
-        // on top of it take their own clicks.
-        let mut resp = ui.interact(r.intersect(list), row_id(*id), Sense::click_and_drag());
-        app.auto.add(&format!("project.item.{}", id.0), r, &it.name);
-        // For screen readers: a tree item named by the item and its type, with its selection,
-        // depth and (a folder) open state. One Tab stop per row; the panel's keys then apply.
-        let open = it.is_folder().then(|| app.ui.project_open_folders.contains(&id.0) || !app.ui.project_search.is_empty());
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Other, true, format!("{}, {}", it.name, crate::i18n::tr(it.type_name()))));
-        ctx.accesskit_node_builder(resp.id, |n| {
-            n.set_role(egui::accesskit::Role::TreeItem);
-            n.set_selected(selected);
-            n.set_level(depth.saturating_add(1));
-            if let Some(open) = open {
-                n.set_expanded(open);
-            }
-        });
-        if resp.has_focus() {
-            ctx.data_mut(|d| d.insert_temp(focused_row_id(), *id));
-        }
-        if resp.gained_focus() {
-            app.ui.focused = crate::dock::PanelKind::Project;
-        }
-        let _ = i;
-        let x0 = r.min.x + 8.0 + 14.0 * *depth as f32;
-        if it.is_folder() {
-            let open = app.ui.project_open_folders.contains(&id.0);
-            let tw = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(12.0, 12.0));
-            let tresp = widgets::twirl(ui, tw, open, egui::Id::new(("pf", id.0)), &t);
-            tresp.widget_info(|| {
-                let name = crate::i18n::tr_args(if open { "Close folder {}" } else { "Open folder {}" }, &[&it.name]);
-                egui::WidgetInfo::labeled(egui::WidgetType::Button, true, name)
-            });
-            if tresp.clicked() {
-                // Alt/Cmd-click twirls every folder inside it too.
-                let mut ids = vec![*id];
-                if ui.input(|i| i.modifiers.alt || i.modifiers.command) {
-                    let mut at = 0;
-                    while let Some(f) = ids.get(at).copied() {
-                        ids.extend(app.session.project.children(Some(f)).into_iter().filter(|c| c.is_folder()).map(|c| c.id));
-                        at += 1;
-                    }
-                }
-                for f in ids {
-                    if open {
-                        app.ui.project_open_folders.remove(&f.0);
-                    } else {
-                        app.ui.project_open_folders.insert(f.0);
-                    }
-                }
-            }
-            app.auto.add(&format!("project.item.{}.twirl", id.0), tw, &it.name);
-        }
-        icons::paint(&lp, Rect::from_center_size(pos2(x0 + 18.0, r.center().y), vec2(14.0, 14.0)), item_icon(it), t.text_dim);
-        // Proxy indicator: filled = the proxy is used, hollow = set but off. Click to switch.
-        if let Some(px) = it.proxy.as_ref() {
-            let pr = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(9.0, 9.0));
-            if px.enabled {
-                lp.rect_filled(pr, 1.0, t.text);
+    if resp.lost_focus() || tab {
+        ctx.data_mut(|d| d.remove::<Editing>(edit_id()));
+        if !ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
+            let (cmd, params) = if ef == "name" {
+                ("project.rename", json!({"item": eid, "name": buf}))
             } else {
-                lp.rect_stroke(pr, 1.0, Stroke::new(1.0, t.text), egui::StrokeKind::Inside);
-            }
-            let presp = ui.interact(pr.expand(2.0).intersect(list), egui::Id::new(("pproxy", id.0)), Sense::click()).on_hover_text(format!(
-                "Proxy: {} ({})",
-                px.footage.path,
-                if px.enabled { "in use" } else { "off" }
-            ));
-            app.auto.add(&format!("project.item.{}.proxy", id.0), pr, if px.enabled { "Proxy in use" } else { "Proxy off" });
-            presp.widget_info(|| {
-                let name = crate::i18n::tr_args(if px.enabled { "Proxy of {}: in use" } else { "Proxy of {}: off" }, &[&it.name]);
-                egui::WidgetInfo::labeled(egui::WidgetType::Button, true, name)
-            });
-            if presp.clicked() {
-                actions.push(("file.useProxy".into(), json!({"item": id.0})));
-            }
-        }
-        // Footage that can't be decoded (no decoder for its codec / profile): a warning marker
-        // at the end of the name cell, the reason on hover.
-        let problem = match &it.kind {
-            ItemKind::Footage(f) => app.session.footage.problem(f),
-            _ => None,
-        };
-        let name_clip =
-            Rect::from_min_max(pos2(x0 + 30.0, r.min.y), pos2(r.min.x + name_w + 4.0 - if problem.is_some() { 16.0 } else { 0.0 }, r.max.y)).intersect(list);
-        if let Some(why) = &problem {
-            let m = Rect::from_center_size(pos2(r.min.x + name_w - 8.0, r.center().y), vec2(13.0, 12.0));
-            lp.add(egui::Shape::convex_polygon(vec![m.center_top(), m.right_bottom(), m.left_bottom()], t.warning, Stroke::NONE));
-            lp.text(m.center() + vec2(0.0, 1.5), Align2::CENTER_CENTER, "!", Tokens::semibold(9.0), Color32::BLACK);
-            ui.interact(m.expand(2.0).intersect(list), egui::Id::new(("pproblem", id.0)), Sense::hover()).on_hover_text(why.as_str());
-            app.auto.add(&format!("project.item.{}.problem", id.0), m, why);
-        }
-        let name_rect = Rect::from_min_max(pos2(x0 + 28.0, r.min.y + 2.0), pos2(r.min.x + name_w + 2.0, r.max.y - 2.0));
-        // Inline edits (rename / comment).
-        let cell_edit = |app: &mut EffectcraftApp, ui: &mut egui::Ui, actions: &mut Vec<(String, serde_json::Value)>, field: &str, cell: Rect| -> bool {
-            let Some((eid, ef, mut buf)) = editing.clone().filter(|(e, f, _)| *e == id.0 && f == field) else { return false };
-            let mut child = ui.new_child(egui::UiBuilder::new().max_rect(cell));
-            // The field keeps Tab (egui would move the keyboard to the next widget, where Enter no
-            // longer renames, #881): Tab commits like Enter and gives the keyboard back to the panel.
-            let filter = egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, ..Default::default() };
-            let resp = child.add(egui::TextEdit::singleline(&mut buf).desired_width(cell.width()).font(Tokens::ui(12.0)).event_filter(filter));
-            app.auto.add(&format!("project.item.{}.{field}Edit", id.0), cell, field);
-            let tab = resp.has_focus() && ctx.input(|i| i.key_pressed(egui::Key::Tab));
-            if tab {
-                resp.surrender_focus();
-            }
-            if resp.lost_focus() || tab {
-                ctx.data_mut(|d| d.remove::<Editing>(edit_id()));
-                if !ctx.input(|i| i.key_pressed(egui::Key::Escape)) {
-                    let (cmd, params) = if ef == "name" {
-                        ("project.rename", json!({"item": eid, "name": buf}))
-                    } else {
-                        ("project.setComment", json!({"items": [eid], "comment": buf}))
-                    };
-                    actions.push((cmd.into(), params));
-                }
-            } else {
-                widgets::keep_focus(&ctx, &resp, &buf);
-                ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (eid, ef, buf)));
-            }
-            true
-        };
-        if !cell_edit(app, ui, &mut actions, "name", name_rect) {
-            // The selected item's name sits in a light cell with dark text.
-            if selected {
-                let g = lp.layout_no_wrap(it.name.clone(), Tokens::ui(12.0), Color32::BLACK);
-                let cell = Rect::from_min_max(pos2(x0 + 27.0, r.min.y + 1.0), pos2((x0 + 33.0 + g.size().x).min(name_clip.max.x), r.max.y - 1.0));
-                lp.with_clip_rect(name_clip.expand2(vec2(3.0, 0.0))).rect_filled(cell, 0.0, Color32::from_rgb(0xa6, 0xa6, 0xa6));
-            }
-            // Long names end in "…" before the label column instead of being cut mid-glyph.
-            widgets::text_fit(
-                &lp.with_clip_rect(name_clip),
-                pos2(x0 + 30.0, r.center().y),
-                Align2::LEFT_CENTER,
-                &it.name,
-                Tokens::ui(12.0),
-                name_clip.max.x - (x0 + 30.0) - 2.0,
-                if selected { Color32::from_gray(0x16) } else { t.text },
-            );
-        }
-        // Label swatch: click for the label colour menu.
-        let sw = Rect::from_center_size(pos2(label_x, r.center().y), vec2(10.0, 10.0));
-        lp.rect_filled(sw, 2.0, t.label(it.label));
-        let sresp = ui.interact(sw.expand(3.0).intersect(list), egui::Id::new(("plabel", id.0)), Sense::click());
-        app.auto.add(&format!("project.item.{}.label", id.0), sw, it.label.name());
-        sresp.widget_info(|| {
-            let name = crate::i18n::tr_args("Label of {}: {}", &[&it.name, &app.session.prefs.label_name(it.label)]);
-            egui::WidgetInfo::labeled(egui::WidgetType::Button, true, name)
-        });
-        let pop = egui::Id::new(("plabel-pop", id.0));
-        if sresp.clicked() || sresp.secondary_clicked() {
-            widgets::open_popup(ui, pop);
-        }
-        if let Some(l) = widgets::label_popup(ui, pop, sw.left_bottom(), it.label, |l| app.session.prefs.label_name(l), &t) {
-            actions.push(("project.setLabel".into(), json!({"items": targets(app, *id, selected), "label": label_index(l)})));
-        }
-        // Optional columns.
-        for (key, _, cx, w) in cols.iter().skip(2) {
-            let cell = opt_clip(Rect::from_min_size(pos2(*cx, r.min.y), vec2(*w, r.height())).intersect(list));
-            if cell.width() <= 0.0 {
-                continue;
-            }
-            let cp = lp.with_clip_rect(cell);
-            let txt = match *key {
-                "type" => it.type_name().to_string(),
-                "size" => file_size(it).map(fmt_size).unwrap_or_default(),
-                "duration" => it.duration().map(|d| fmt_dur(d.seconds(), it.frame_rate().map(|r| r.as_f64()).unwrap_or(30.0))).unwrap_or_default(),
-                "fps" => it.frame_rate().map(|f| format!("{:.2}", f.as_f64())).unwrap_or_default(),
-                "path" => file_path(it).to_string(),
-                "comment" => {
-                    let cr = Rect::from_min_size(pos2(*cx - 2.0, r.min.y + 2.0), vec2(*w, r.height() - 4.0));
-                    if cell_edit(app, ui, &mut actions, "comment", cr) {
-                        continue;
-                    }
-                    let cresp = ui.interact(cell, egui::Id::new(("pcomment", id.0)), Sense::CLICK);
-                    app.auto.add(&format!("project.item.{}.comment", id.0), cell, &it.comment);
-                    cresp.widget_info(|| {
-                        egui::WidgetInfo::labeled(egui::WidgetType::Other, true, crate::i18n::tr_args("Comment of {}: {}", &[&it.name, &it.comment]))
-                    });
-                    if cresp.double_clicked() {
-                        ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (id.0, "comment".into(), it.comment.clone())));
-                    } else {
-                        // Other clicks select the row and open its context menu.
-                        resp = resp.union(cresp);
-                    }
-                    it.comment.clone()
-                }
-                _ => String::new(),
+                ("project.setComment", json!({"items": [eid], "comment": buf}))
             };
-            let align = if *key == "fps" { Align2::RIGHT_CENTER } else { Align2::LEFT_CENTER };
-            let tx = if *key == "fps" { cx + w - 6.0 } else { *cx };
-            cp.text(pos2(tx, r.center().y), align, txt, Tokens::ui(11.5), t.text_dim);
+            actions.push((cmd.into(), params));
         }
-        if dragging.is_some_and(|d| d != id.0) && drop_row == Some(*id) && it.is_folder() {
-            lp.rect_stroke(r.shrink(1.0), 2.0, Stroke::new(1.5, t.accent), egui::StrokeKind::Inside);
-        }
-        // The row with keyboard focus (Tab, or the arrow keys after it) shows a focus ring.
-        if ctx.memory(|m| m.has_focus(row_id(*id))) {
-            lp.rect_stroke(r.shrink(0.5), 0.0, Stroke::new(1.0, t.accent), egui::StrokeKind::Inside);
-        }
-        // Part of the row: not a second Tab stop.
-        let nresp = ui.interact(name_clip, egui::Id::new(("pname", id.0)), Sense::CLICK | Sense::DRAG);
-        app.auto.add(&format!("project.item.{}.name", id.0), name_clip, &it.name);
-        let resp = resp.union(nresp);
-        if resp.clicked() {
-            let m = ui.input(|i| i.modifiers);
-            let anchor_key = anchor_id();
-            ctx.data_mut(|d| d.insert_temp(cursor_id(), *id));
-            let anchor = ctx.data(|d| d.get_temp::<ItemId>(anchor_key)).or_else(|| app.session.state.project_selection.first().copied());
-            if m.shift
-                && let Some(a) = anchor.and_then(|a| rows.iter().position(|(i, _)| *i == a))
-            {
-                let b = rows.iter().position(|(i, _)| i == id).unwrap_or(a);
-                app.session.state.project_selection = rows.get(a.min(b)..=a.max(b)).unwrap_or_default().iter().map(|(i, _)| *i).collect();
-            } else if m.command {
-                if app.session.state.project_selection.contains(id) {
-                    app.session.state.project_selection.retain(|i| i != id);
-                } else {
-                    app.session.state.project_selection.push(*id);
-                }
-                ctx.data_mut(|d| d.insert_temp(anchor_key, *id));
-            } else {
-                app.session.state.project_selection = vec![*id];
-                ctx.data_mut(|d| d.insert_temp(anchor_key, *id));
-            }
-        }
-        // Double-click opens the item, as in After Effects (a comp gets its own Timeline tab and
-        // the viewer); Enter or the context menu renames.
-        if resp.double_clicked() {
-            match &it.kind {
-                ItemKind::Comp(_) => actions.push(("comp.open".into(), json!({"comp": id.0}))),
-                ItemKind::Folder if !app.ui.project_open_folders.remove(&id.0) => {
-                    app.ui.project_open_folders.insert(id.0);
-                }
-                // Footage (not data) and solids open in the Footage panel.
-                ItemKind::Footage(f) if f.kind != effectcraft_engine::project::FootageKind::Data => {
-                    actions.push(("footage.open".into(), json!({"item": id.0})))
-                }
-                ItemKind::Solid(_) => actions.push(("footage.open".into(), json!({"item": id.0}))),
-                _ => {}
-            }
-        }
-        if resp.drag_started() {
-            egui::DragAndDrop::set_payload(&ctx, DragPayload::Item(id.0));
-        }
-        // Right-clicking an item selects it (After Effects): the menu's File commands act on the
-        // selection.
-        if resp.secondary_clicked() && !selected {
-            app.session.state.project_selection = vec![*id];
-        }
-        let footage = matches!(it.kind, ItemKind::Footage(_));
-        crate::widgets::context_menu(&resp, |ui| {
-            // First on a comp, as in After Effects; for this comp, not the viewer's (#1058).
-            if matches!(it.kind, ItemKind::Comp(_)) && ui.button(crate::i18n::tr("Composition Settings…")).clicked() {
-                actions.push(("comp.settings".into(), json!({"comp": id.0})));
-                ui.close();
-            }
-            if ui.button(crate::i18n::tr("Delete")).clicked() {
-                actions.push(("project.delete".into(), json!({"items": targets(app, *id, selected)})));
-                ui.close();
-            }
-            if matches!(it.kind, ItemKind::Comp(_)) && ui.button(crate::i18n::tr("Open Composition")).clicked() {
-                actions.push(("comp.open".into(), json!({"comp": id.0})));
-                ui.close();
-            }
-            if ui.button(crate::i18n::tr("Rename")).clicked() {
-                ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (id.0, "name".into(), it.name.clone())));
-                ui.close();
-            }
-            if it.parent.is_some() && ui.button(crate::i18n::tr("Move to Project Root")).clicked() {
-                actions.push(("project.move".into(), json!({"items": targets(app, *id, selected), "folder": null})));
-                ui.close();
-            }
-            if !it.is_folder() && ui.button(crate::i18n::tr("Add to Composition")).clicked() {
-                actions.push(("layer.addItem".into(), json!({"item": id.0})));
-                ui.close();
-            }
-            // File ▸ New Comp from Selection on the selection (the right-clicked row joins it
-            // above): several items ask how in its dialog, as in After Effects (#360).
-            if ui.button(crate::i18n::tr("New Comp from Selection")).clicked() {
-                actions.push(("file.newCompFromSelection".into(), json!({})));
-                ui.close();
-            }
-            // File ▸ Replace Footage ▸ With Precomposition: every layer using the item uses a
-            // new composition holding it instead. The label says how many layers that changes.
-            let uses: usize = app.session.project.item_users(*id).iter().map(|(_, n)| n).sum();
-            let label = match uses {
-                0 => crate::i18n::tr("Replace with Precomposition").to_owned(),
-                1 => format!("{} ({})", crate::i18n::tr("Replace with Precomposition"), crate::i18n::tr("used once")),
-                n => format!("{} ({})", crate::i18n::tr("Replace with Precomposition"), crate::i18n::tr_args("used {} times", &[&n])),
-            };
-            if (footage || matches!(it.kind, ItemKind::Solid(_))) && ui.button(label).clicked() {
-                actions.push(("file.replaceWithPrecomp".into(), json!({"item": id.0})));
-                ui.close();
-            }
-            ui.separator();
-            ui.menu_button(crate::i18n::tr("Label"), |ui| {
-                for l in Label::ALL {
-                    if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), l == it.label, &t).clicked() {
-                        actions.push(("project.setLabel".into(), json!({"items": targets(app, *id, selected), "label": label_index(l)})));
-                        ui.close();
-                    }
-                }
-            });
-            // Footage: the File menu's footage commands (Interpret Footage, Replace Footage…).
-            if footage {
-                let mut chosen = None;
-                crate::menus::submenu_at(app, ui, &["File", "Interpret Footage"], &mut chosen);
-                crate::menus::submenu_at(app, ui, &["File", "Replace Footage"], &mut chosen);
-                crate::menus::entry_for(app, ui, "file.reloadFootage", &mut chosen);
-                crate::menus::entry_for(app, ui, "file.revealInFinder", &mut chosen);
-                actions.extend(chosen);
-            }
-        });
+    } else {
+        widgets::keep_focus(&ctx, &resp, &buf);
+        ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (eid, ef, buf)));
     }
-    // The scroll bars, over the rows (which would take their presses otherwise).
-    if overflow > 0.0 {
-        let track = Rect::from_min_max(pos2(opt_x0, list.max.y - 5.0), pos2(rect.max.x - 4.0, list.max.y - 1.0));
-        app.ui.project_hscroll = widgets::scroll_bar(ui, &mut app.auto, "project.hscroll", track, hscroll, overflow, &t);
+    true
+}
+
+/// A click on item `id`'s row: plain selects it, Shift extends from the anchor and Cmd toggles.
+fn select_click(app: &mut EffectcraftApp, ui: &egui::Ui, ctx: &egui::Context, id: ItemId, rows: &[(ItemId, usize)]) {
+    let m = ui.input(|i| i.modifiers);
+    let anchor_key = anchor_id();
+    ctx.data_mut(|d| d.insert_temp(cursor_id(), id));
+    let anchor = ctx.data(|d| d.get_temp::<ItemId>(anchor_key)).or_else(|| app.session.state.project_selection.first().copied());
+    if m.shift
+        && let Some(a) = anchor.and_then(|a| rows.iter().position(|(i, _)| *i == a))
+    {
+        let b = rows.iter().position(|(i, _)| *i == id).unwrap_or(a);
+        app.session.state.project_selection = rows.get(a.min(b)..=a.max(b)).unwrap_or_default().iter().map(|(i, _)| *i).collect();
+    } else if m.command {
+        if app.session.state.project_selection.contains(&id) {
+            app.session.state.project_selection.retain(|i| *i != id);
+        } else {
+            app.session.state.project_selection.push(id);
+        }
+        ctx.data_mut(|d| d.insert_temp(anchor_key, id));
+    } else {
+        app.session.state.project_selection = vec![id];
+        ctx.data_mut(|d| d.insert_temp(anchor_key, id));
     }
-    if max_scroll > 0.0 {
-        let track = Rect::from_min_max(pos2(rect.max.x - 6.0, list.min.y + 1.0), pos2(rect.max.x - 2.0, list.max.y - 7.0));
-        app.ui.project_scroll = widgets::scroll_bar(ui, &mut app.auto, "project.vscroll", track, scroll, max_scroll, &t);
+}
+
+/// Double-click opens the item, as in After Effects: a comp in its Timeline and the viewer, a
+/// folder toggles, footage (not data) and solids open in the Footage panel.
+fn open_item(app: &mut EffectcraftApp, it: &effectcraft_engine::project::Item, id: ItemId, actions: &mut Vec<(String, serde_json::Value)>) {
+    match &it.kind {
+        ItemKind::Comp(_) => actions.push(("comp.open".into(), json!({"comp": id.0}))),
+        ItemKind::Folder if !app.ui.project_open_folders.remove(&id.0) => {
+            app.ui.project_open_folders.insert(id.0);
+        }
+        // Footage (not data) and solids open in the Footage panel.
+        ItemKind::Footage(f) if f.kind != effectcraft_engine::project::FootageKind::Data => actions.push(("footage.open".into(), json!({"item": id.0}))),
+        ItemKind::Solid(_) => actions.push(("footage.open".into(), json!({"item": id.0}))),
+        _ => {}
     }
+}
+
+/// What the pointer is doing over the list: the item being dragged, the row under it, whether it
+/// is over the list at all.
+struct DropState {
+    dragging: Option<u64>,
+    row: Option<ItemId>,
+    hovering: bool,
+}
+
+/// Dragging an item or files over the list: drop outlines, moving items into folders, importing
+/// files and the drag ghost.
+fn drop_targets(app: &mut EffectcraftApp, ctx: &egui::Context, lp: &egui::Painter, list: Rect, ds: DropState, actions: &mut Vec<(String, serde_json::Value)>) {
+    let t = app.tokens;
+    let DropState { dragging, row, hovering } = ds;
     // Dropping a dragged item on the list: into the folder under the pointer (or the folder of
     // the item under it), or the project root below the rows.
     if let Some(iid) = dragging
-        && hover_y.is_some()
+        && hovering
     {
-        if drop_row.is_none() {
+        if row.is_none() {
             lp.rect_stroke(list.shrink(1.0), 0.0, Stroke::new(1.0, t.accent.gamma_multiply(0.6)), egui::StrokeKind::Inside);
         }
-        if ctx.input(|i| i.pointer.any_released()) && drop_row != Some(ItemId(iid)) {
-            let folder = drop_folder(&app.session.project, drop_row);
+        if ctx.input(|i| i.pointer.any_released()) && row != Some(ItemId(iid)) {
+            let folder = drop_folder(&app.session.project, row);
             let cur = app.session.project.item(ItemId(iid)).and_then(|i| i.parent);
             if folder != cur {
                 let moving: Vec<u64> = if app.session.state.project_selection.contains(&ItemId(iid)) {
@@ -947,32 +774,36 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     app.ui.project_open_folders.insert(f.0);
                 }
             }
-            egui::DragAndDrop::clear_payload(&ctx);
+            egui::DragAndDrop::clear_payload(ctx);
         }
     }
     // Files dragged from the Media Browser: import.
-    if let Some(DragPayload::Files(paths)) = egui::DragAndDrop::payload::<DragPayload>(&ctx).as_deref()
-        && hover_y.is_some()
+    if let Some(DragPayload::Files(paths)) = egui::DragAndDrop::payload::<DragPayload>(ctx).as_deref()
+        && hovering
     {
         lp.rect_stroke(list.shrink(1.0), 0.0, Stroke::new(1.0, t.accent.gamma_multiply(0.6)), egui::StrokeKind::Inside);
         if ctx.input(|i| i.pointer.any_released()) {
             actions.push(("mediaBrowser.import".into(), json!({"paths": paths})));
-            egui::DragAndDrop::clear_payload(&ctx);
+            egui::DragAndDrop::clear_payload(ctx);
         }
     }
     // Drag ghost.
-    if let Some(DragPayload::Item(iid)) = egui::DragAndDrop::payload::<DragPayload>(&ctx).as_deref()
+    if let Some(DragPayload::Item(iid)) = egui::DragAndDrop::payload::<DragPayload>(ctx).as_deref()
         && let Some(pos) = ctx.pointer_hover_pos()
         && let Some(it) = app.session.project.item(ItemId(*iid))
     {
-        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("dnd-ghost")));
+        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("dnd-ghost")));
         let g = painter.layout_no_wrap(it.name.clone(), Tokens::ui(12.0), t.text);
         let r = Rect::from_min_size(pos + vec2(12.0, 8.0), g.size() + vec2(16.0, 8.0));
         painter.rect_filled(r, 4.0, Color32::from_rgba_premultiplied(40, 40, 40, 230));
         painter.galley(r.min + vec2(8.0, 4.0), g, t.text);
     }
-    // Footer.
-    let foot = Rect::from_min_max(pos2(rect.min.x, rect.max.y - footer_h), rect.max);
+}
+
+/// The footer: Interpret Footage, New Folder, New Composition, the colour depth and the trash.
+fn footer(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, foot: Rect, actions: &mut Vec<(String, serde_json::Value)>) {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
     p.line_segment([foot.left_top(), foot.right_top()], Stroke::new(1.0, t.separator));
     let mut x = foot.min.x + 8.0;
     for (icon, id, tip) in [
@@ -981,9 +812,9 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         (Icon::NewComp, "newComp", "Create a new Composition"),
     ] {
         let r = Rect::from_min_size(pos2(x, foot.min.y + 3.0), vec2(22.0, 22.0));
-        let resp = widgets::icon_button(ui, r, icon, false, &t, egui::Id::new(("pfoot", id))).on_hover_text(tip);
+        let resp = widgets::icon_button(ui, r, icon, false, &t, egui::Id::unique(("pfoot", id))).on_hover_text(tip);
         app.auto.add(&format!("project.{id}"), r, tip);
-        resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr(tip)));
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr(tip)));
         if resp.clicked() {
             let footage =
                 app.session.state.project_selection.first().and_then(|i| app.session.project.item(*i)).is_some_and(|i| matches!(i.kind, ItemKind::Footage(_)));
@@ -1013,10 +844,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     let depth = app.session.project.settings.bit_depth.label();
     let dr = Rect::from_min_size(pos2(x + 4.0, foot.min.y + 5.0), vec2(48.0, 18.0));
-    let dresp = ui.interact(dr, egui::Id::new("bpc"), Sense::click());
+    let dresp = ui.interact(dr, egui::Id::unique("bpc"), Sense::click());
     p.text(dr.center(), Align2::CENTER_CENTER, depth, Tokens::ui(11.5), if dresp.hovered() { t.text } else { t.text_dim });
     app.auto.add("project.bitDepth", dr, depth);
-    dresp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr_args("Project color depth: {}", &[&depth])));
+    dresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr_args("Project color depth: {}", &[&depth])));
     // Click cycles 8/16/32 bpc; Alt-click opens Project Settings (as in After Effects).
     if dresp.clicked() {
         if ui.input(|i| i.modifiers.alt) {
@@ -1027,33 +858,113 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     dresp.on_hover_text(crate::i18n::tr("Project color depth: click to cycle 8/16/32 bpc, Alt-click for Project Settings"));
     let tr = Rect::from_min_size(pos2(foot.max.x - 30.0, foot.min.y + 3.0), vec2(22.0, 22.0));
-    let trash = widgets::icon_button(ui, tr, Icon::Trash, false, &t, egui::Id::new("ptrash")).on_hover_text(crate::i18n::tr("Delete selected project items"));
-    trash.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, crate::i18n::tr("Delete selected project items")));
+    let trash =
+        widgets::icon_button(ui, tr, Icon::Trash, false, &t, egui::Id::unique("ptrash")).on_hover_text(crate::i18n::tr("Delete selected project items"));
+    trash.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, crate::i18n::tr("Delete selected project items")));
     if trash.clicked() && !app.session.state.project_selection.is_empty() {
         actions.push(("project.delete".into(), json!({})));
     }
     app.auto.add("project.delete", tr, "Delete");
-    if empty.double_clicked() {
-        actions.push(("file.import".into(), json!({})));
-    }
-    crate::widgets::context_menu(&empty, |ui| {
-        for (key, label, command) in
-            [("newComp", "New Composition…", "comp.new"), ("newFolder", "New Folder", "project.newFolder"), ("import", "Import File…", "file.import")]
-        {
-            let response = ui.button(label);
-            app.auto.add(&format!("project.context.{key}"), response.rect, label);
-            if response.clicked() {
-                actions.push((command.into(), json!({})));
-                ui.close();
-            }
+}
+
+/// The optional columns of a row (type, size, duration, fps, path, comment). Returns the comment
+/// cell's response so its clicks select the row and open its context menu.
+fn optional_cells(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    g: &RowGeom,
+    it: &effectcraft_engine::project::Item,
+    cl: &Columns,
+    editing: &Option<Editing>,
+    actions: &mut Vec<(String, serde_json::Value)>,
+) -> Option<egui::Response> {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let RowGeom { lp, list, r, .. } = *g;
+    let mut extra = None;
+    for (key, _, cx, w) in cl.cols.iter().skip(2) {
+        let cell = cl.opt_clip(Rect::from_min_size(pos2(*cx, r.min.y), vec2(*w, r.height())).intersect(list));
+        if cell.width() <= 0.0 {
+            continue;
         }
-    });
-    // Selection box over the rows it touches (#203); Shift or Cmd/Ctrl adds to the selection.
-    let adding = ui.input(|i| i.modifiers.shift || i.modifiers.command);
+        let cp = lp.with_clip_rect(cell);
+        let txt = match *key {
+            "type" => it.type_name().to_string(),
+            "size" => file_size(it).map(fmt_size).unwrap_or_default(),
+            "duration" => it.duration().map(|d| fmt_dur(d.seconds(), it.frame_rate().map(|r| r.as_f64()).unwrap_or(30.0))).unwrap_or_default(),
+            "fps" => it.frame_rate().map(|f| format!("{:.2}", f.as_f64())).unwrap_or_default(),
+            "path" => file_path(it).to_string(),
+            "comment" => {
+                let cr = Rect::from_min_size(pos2(*cx - 2.0, r.min.y + 2.0), vec2(*w, r.height() - 4.0));
+                if cell_edit(app, ui, actions, editing, it.id.0, "comment", cr) {
+                    continue;
+                }
+                let cresp = ui.interact(cell, egui::Id::unique(("pcomment", it.id.0)), Sense::CLICK);
+                app.auto.add(&format!("project.item.{}.comment", it.id.0), cell, &it.comment);
+                cresp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Unknown, true, crate::i18n::tr_args("Comment of {}: {}", &[&it.name, &it.comment])));
+                if cresp.double_clicked() {
+                    ctx.data_mut(|d| d.insert_temp::<Editing>(edit_id(), (it.id.0, "comment".into(), it.comment.clone())));
+                } else {
+                    // Other clicks select the row and open its context menu.
+                    extra = Some(cresp);
+                }
+                it.comment.clone()
+            }
+            _ => String::new(),
+        };
+        let align = if *key == "fps" { Align2::RIGHT_CENTER } else { Align2::LEFT_CENTER };
+        let tx = if *key == "fps" { cx + w - 6.0 } else { *cx };
+        cp.text(pos2(tx, r.center().y), align, txt, Tokens::ui(11.5), t.text_dim);
+    }
+    extra
+}
+
+/// Shift+wheel / trackpad over the list scrolls the optional columns sideways.
+fn hscroll_wheel(app: &mut EffectcraftApp, ui: &egui::Ui, list: Rect, overflow: f32) {
+    if overflow > 0.0 && ui.rect_contains_pointer(list) {
+        let (dx, dy, shift) = ui.input(|i| (i.smooth_scroll_delta.x, i.smooth_scroll_delta.y, i.modifiers.shift));
+        let d = if dx.abs() > 0.0 {
+            dx
+        } else if shift {
+            dy
+        } else {
+            0.0
+        };
+        app.ui.project_hscroll = (app.ui.project_hscroll - d).clamp(0.0, overflow);
+    }
+}
+
+/// Enter renames the selected item (Project panel focused, not typing).
+fn enter_renames(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    if app.ui.focused == crate::dock::PanelKind::Project
+        && app.dialog.is_none()
+        && keys_reach_rows(app, ctx)
+        && ctx.data(|d| d.get_temp::<Editing>(edit_id())).is_none()
+        && ctx.input(|i| i.key_pressed(egui::Key::Enter))
+    {
+        begin_rename(app, ctx);
+    }
+}
+
+/// The warning marker at the end of the name cell for footage that can't be decoded.
+fn problem_marker(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &RowGeom, name_w: f32, id: ItemId, why: &str) {
+    let t = app.tokens;
+    let RowGeom { lp, list, r, .. } = *g;
+    let m = Rect::from_center_size(pos2(r.min.x + name_w - 8.0, r.center().y), vec2(13.0, 12.0));
+    lp.add(egui::Shape::convex_polygon(vec![m.center_top(), m.right_bottom(), m.left_bottom()], t.warning, Stroke::NONE));
+    lp.text(m.center() + vec2(0.0, 1.5), Align2::CENTER_CENTER, "!", Tokens::semibold(9.0), Color32::BLACK);
+    ui.interact(m.expand(2.0).intersect(list), egui::Id::unique(("pproblem", id.0)), Sense::hover()).on_hover_text(why);
+    app.auto.add(&format!("project.item.{}.problem", id.0), m, why);
+}
+
+/// Selection box over the rows it touches (#203); Shift or Cmd/Ctrl adds to the selection.
+fn marquee_select(app: &mut EffectcraftApp, ctx: &egui::Context, lp: &egui::Painter, list: Rect, empty: &egui::Response, rows: &[(ItemId, usize)]) {
+    let t = app.tokens;
+    let adding = ctx.input(|i| i.modifiers.shift || i.modifiers.command);
     if empty.clicked() && !adding {
         app.session.state.project_selection.clear();
     }
-    let box_id = egui::Id::new("proj-marquee");
+    let box_id = egui::Id::unique("proj-marquee");
     if let (Some(start), Some(end)) = (ctx.input(|i| i.pointer.press_origin()), empty.interact_pointer_pos())
         && empty.dragged()
     {
@@ -1083,6 +994,333 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
+}
+
+/// Where a row is drawn: its clipped painter, the list, the row rectangle and the indented x.
+#[derive(Clone, Copy)]
+struct RowGeom<'a> {
+    lp: &'a egui::Painter,
+    list: Rect,
+    r: Rect,
+    x0: f32,
+}
+
+/// Vertical scrolling: only the rows in view are drawn (and registered), so a project with
+/// thousands of items costs what one screenful does. Returns the scroll offset and its maximum.
+fn update_scroll(app: &mut EffectcraftApp, ui: &egui::Ui, ctx: &egui::Context, list: Rect, rows: &[(ItemId, usize)], moved: Option<ItemId>) -> (f32, f32) {
+    let content_h = rows.len() as f32 * ROW_H;
+    let max_scroll = (content_h - list.height() + ROW_H).max(0.0);
+    if ui.rect_contains_pointer(list) {
+        let (dy, shift) = ui.input(|i| (i.smooth_scroll_delta.y, i.modifiers.shift));
+        if !shift && dy != 0.0 {
+            app.ui.project_scroll -= dy;
+        }
+    }
+    // A selection made elsewhere (a command, an agent, the viewer) scrolls into view.
+    let sel_key = selection_seen_id();
+    let sel_now = app.session.state.project_selection.last().map(|i| i.0);
+    if ctx.data(|d| d.get_temp::<Option<u64>>(sel_key)) != Some(sel_now) {
+        ctx.data_mut(|d| d.insert_temp(sel_key, sel_now));
+        if let Some(row) = sel_now.and_then(|s| rows.iter().position(|(id, _)| id.0 == s)) {
+            let top = row as f32 * ROW_H;
+            if top < app.ui.project_scroll {
+                app.ui.project_scroll = top;
+            } else if top + ROW_H > app.ui.project_scroll + list.height() {
+                app.ui.project_scroll = top + ROW_H - list.height();
+            }
+        }
+    }
+    // The arrow keys' item scrolls into view (Shift+Up extends upward, past the selection's end).
+    if let Some(row) = moved.and_then(|m| rows.iter().position(|(id, _)| *id == m)) {
+        let top = row as f32 * ROW_H;
+        // Not `clamp`: a panel shorter than a row would make its bounds cross. The row's top wins.
+        app.ui.project_scroll = app.ui.project_scroll.max(top + ROW_H - list.height()).min(top);
+    }
+    app.ui.project_scroll = app.ui.project_scroll.clamp(0.0, max_scroll);
+    (app.ui.project_scroll, max_scroll)
+}
+
+/// The folder's open / close twirl (Alt / Cmd-click twirls every folder inside it too).
+fn folder_twirl(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &RowGeom, it: &effectcraft_engine::project::Item) {
+    let t = app.tokens;
+    let RowGeom { r, x0, .. } = *g;
+    let open = app.ui.project_open_folders.contains(&it.id.0);
+    let tw = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(12.0, 12.0));
+    let tresp = widgets::twirl(ui, tw, open, egui::Id::unique(("pf", it.id.0)), &t);
+    tresp.widget_info(|| {
+        let name = crate::i18n::tr_args(if open { "Close folder {}" } else { "Open folder {}" }, &[&it.name]);
+        egui::WidgetInfo::labeled(egui::Role::Button, true, name)
+    });
+    if tresp.clicked() {
+        // Alt/Cmd-click twirls every folder inside it too.
+        let mut ids = vec![it.id];
+        if ui.input(|i| i.modifiers.alt || i.modifiers.command) {
+            let mut at = 0;
+            while let Some(f) = ids.get(at).copied() {
+                ids.extend(app.session.project.children(Some(f)).into_iter().filter(|c| c.is_folder()).map(|c| c.id));
+                at += 1;
+            }
+        }
+        for f in ids {
+            if open {
+                app.ui.project_open_folders.remove(&f.0);
+            } else {
+                app.ui.project_open_folders.insert(f.0);
+            }
+        }
+    }
+    app.auto.add(&format!("project.item.{}.twirl", it.id.0), tw, &it.name);
+}
+
+/// Proxy indicator: filled = the proxy is used, hollow = set but off. Click to switch.
+fn proxy_indicator(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    g: &RowGeom,
+    it: &effectcraft_engine::project::Item,
+    actions: &mut Vec<(String, serde_json::Value)>,
+) {
+    let t = app.tokens;
+    let RowGeom { lp, list, r, x0 } = *g;
+    if let Some(px) = it.proxy.as_ref() {
+        let pr = Rect::from_center_size(pos2(x0 + 4.0, r.center().y), vec2(9.0, 9.0));
+        if px.enabled {
+            lp.rect_filled(pr, 1.0, t.text);
+        } else {
+            lp.rect_stroke(pr, 1.0, Stroke::new(1.0, t.text), egui::StrokeKind::Inside);
+        }
+        let presp = ui.interact(pr.expand(2.0).intersect(list), egui::Id::unique(("pproxy", it.id.0)), Sense::click()).on_hover_text(format!(
+            "Proxy: {} ({})",
+            px.footage.path,
+            if px.enabled { "in use" } else { "off" }
+        ));
+        app.auto.add(&format!("project.item.{}.proxy", it.id.0), pr, if px.enabled { "Proxy in use" } else { "Proxy off" });
+        presp.widget_info(|| {
+            let name = crate::i18n::tr_args(if px.enabled { "Proxy of {}: in use" } else { "Proxy of {}: off" }, &[&it.name]);
+            egui::WidgetInfo::labeled(egui::Role::Button, true, name)
+        });
+        if presp.clicked() {
+            actions.push(("file.useProxy".into(), json!({"item": it.id.0})));
+        }
+    }
+}
+
+/// The label swatch: click for the label colour menu.
+fn label_swatch(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    g: &RowGeom,
+    it: &effectcraft_engine::project::Item,
+    label_x: f32,
+    selected: bool,
+    actions: &mut Vec<(String, serde_json::Value)>,
+) {
+    let t = app.tokens;
+    let RowGeom { lp, list, r, .. } = *g;
+    let sw = Rect::from_center_size(pos2(label_x, r.center().y), vec2(10.0, 10.0));
+    lp.rect_filled(sw, 2.0, t.label(it.label));
+    let sresp = ui.interact(sw.expand(3.0).intersect(list), egui::Id::unique(("plabel", it.id.0)), Sense::click());
+    app.auto.add(&format!("project.item.{}.label", it.id.0), sw, it.label.name());
+    sresp.widget_info(|| {
+        let name = crate::i18n::tr_args("Label of {}: {}", &[&it.name, &app.session.prefs.label_name(it.label)]);
+        egui::WidgetInfo::labeled(egui::Role::Button, true, name)
+    });
+    let pop = egui::Id::unique(("plabel-pop", it.id.0));
+    if sresp.clicked() || sresp.secondary_clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    if let Some(l) = widgets::label_popup(ui, pop, sw.left_bottom(), it.label, |l| app.session.prefs.label_name(l), &t) {
+        actions.push(("project.setLabel".into(), json!({"items": targets(app, it.id, selected), "label": label_index(l)})));
+    }
+}
+
+/// The Project panel: the selected item's thumbnail and details (with the comps that use it), the
+/// search field, sortable column headers, and the item rows (folders, comps, footage and solids)
+/// with selection, Shift/Cmd ranges, keyboard navigation, inline rename, drag-and-drop move,
+/// marquee selection and context menus. Only the rows in view are drawn. File commands are queued
+/// and run through [`crate::menus::invoke`] at the end, with failures shown in `app.ui.status`.
+pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let p = ui.painter().clone();
+    let ctx = ui.ctx().clone();
+    // Preview header.
+    let head = Rect::from_min_size(rect.min, vec2(rect.width(), 74.0));
+    details_header(app, ui, &p, &ctx, head);
+    // Search.
+    let sr = Rect::from_min_size(pos2(rect.min.x + 8.0, head.max.y + 2.0), vec2(rect.width() - 16.0, 22.0));
+    let mut q = app.ui.project_search.clone();
+    widgets::search_field(ui, sr, &mut q, crate::i18n::tr("Search project"), &t);
+    app.ui.project_search = q;
+    app.auto.add("project.search", sr, "Search");
+    // Column header: Name, Label, then the visible optional columns.
+    let hdr = Rect::from_min_size(pos2(rect.min.x, sr.max.y + 6.0), vec2(rect.width(), 20.0));
+    p.line_segment([hdr.left_bottom(), hdr.right_bottom()], Stroke::new(1.0, t.separator));
+    let cl = layout_columns(app, rect);
+    let (name_w, label_x, opt_x0, overflow, hscroll) = (cl.name_w, cl.label_x, cl.opt_x0, cl.overflow, cl.hscroll);
+    draw_header(app, ui, &p, hdr, &cl);
+    // Rows.
+    let footer_h = 28.0;
+    let list = Rect::from_min_max(pos2(rect.min.x, hdr.max.y), pos2(rect.max.x, rect.max.y - footer_h));
+    let lp = p.with_clip_rect(list);
+    // The list's empty area (under the rows and the scroll bar, which take their own clicks):
+    // a click deselects, a drag draws a selection box, a double-click imports, as in After
+    // Effects (File ▸ Import ▸ File...).
+    // Not a Tab stop: the keyboard reaches the rows, and nothing else here takes a key.
+    let empty = ui.interact(list, egui::Id::unique("proj-empty"), Sense::CLICK | Sense::DRAG);
+    app.auto.add("project.empty", list, "Double-click to import files; drag to select items; right-click for project actions");
+    hscroll_wheel(app, ui, list, overflow);
+    let moved = keyboard_nav(app, &ctx);
+    let rows = visible_rows(app);
+    enter_renames(app, &ctx);
+    let editing: Option<Editing> = ctx.data(|d| d.get_temp(edit_id()));
+    let dragging = egui::DragAndDrop::payload::<DragPayload>(&ctx).and_then(|p| match *p {
+        DragPayload::Item(i) => Some(i),
+        _ => None,
+    });
+    let hover_y = ctx.pointer_hover_pos().filter(|p| list.contains(*p)).map(|p| p.y);
+    let mut drop_row: Option<ItemId> = None;
+    let mut actions: Vec<(String, serde_json::Value)> = vec![];
+    let (scroll, max_scroll) = update_scroll(app, ui, &ctx, list, &rows, moved);
+    let first = ((scroll / ROW_H).floor() as usize).min(rows.len());
+    let mut y = list.min.y - (scroll - first as f32 * ROW_H);
+    let project = app.session.project.clone();
+    for (i, (id, depth)) in rows.iter().enumerate().skip(first) {
+        let Some(it) = project.item(*id) else { continue };
+        let r = Rect::from_min_size(pos2(list.min.x, y), vec2(list.width(), ROW_H));
+        y += ROW_H;
+        if r.min.y > list.max.y {
+            break;
+        }
+        if hover_y.is_some_and(|hy| hy >= r.min.y && hy < r.max.y) {
+            drop_row = Some(*id);
+        }
+        let selected = app.session.state.project_selection.contains(id);
+        lp.rect_filled(
+            r,
+            0.0,
+            // Flat rows like After Effects' Project panel (no stripes).
+            if selected { t.row_selected } else { t.row },
+        );
+        // The row's click / drag area goes first, so the twirl, proxy, label and comment widgets
+        // on top of it take their own clicks.
+        let mut resp = ui.interact(r.intersect(list), row_id(*id), Sense::click_and_drag());
+        app.auto.add(&format!("project.item.{}", id.0), r, &it.name);
+        // For screen readers: a tree item named by the item and its type, with its selection,
+        // depth and (a folder) open state. One Tab stop per row; the panel's keys then apply.
+        let open = it.is_folder().then(|| app.ui.project_open_folders.contains(&id.0) || !app.ui.project_search.is_empty());
+        resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::TreeItem, true, format!("{}, {}", it.name, crate::i18n::tr(it.type_name()))));
+        ctx.accesskit_node_builder(resp.id, |n| {
+            n.set_selected(selected);
+            n.set_level(depth.saturating_add(1));
+            if let Some(open) = open {
+                n.set_expanded(open);
+            }
+        });
+        if resp.has_focus() {
+            ctx.data_mut(|d| d.insert_temp(focused_row_id(), *id));
+        }
+        if resp.gained_focus() {
+            app.ui.focused = crate::dock::PanelKind::Project;
+        }
+        let _ = i;
+        let x0 = r.min.x + 8.0 + 14.0 * *depth as f32;
+        let g = RowGeom { lp: &lp, list, r, x0 };
+        if it.is_folder() {
+            folder_twirl(app, ui, &g, it);
+        }
+        icons::paint(&lp, Rect::from_center_size(pos2(x0 + 18.0, r.center().y), vec2(14.0, 14.0)), item_icon(it), t.text_dim);
+        proxy_indicator(app, ui, &g, it, &mut actions);
+        // Footage that can't be decoded (no decoder for its codec / profile): a warning marker
+        // at the end of the name cell, the reason on hover.
+        let problem = match &it.kind {
+            ItemKind::Footage(f) => app.session.footage.problem(f),
+            _ => None,
+        };
+        let name_clip =
+            Rect::from_min_max(pos2(x0 + 30.0, r.min.y), pos2(r.min.x + name_w + 4.0 - if problem.is_some() { 16.0 } else { 0.0 }, r.max.y)).intersect(list);
+        if let Some(why) = &problem {
+            problem_marker(app, ui, &g, name_w, it.id, why);
+        }
+        let name_rect = Rect::from_min_max(pos2(x0 + 28.0, r.min.y + 2.0), pos2(r.min.x + name_w + 2.0, r.max.y - 2.0));
+        if !cell_edit(app, ui, &mut actions, &editing, id.0, "name", name_rect) {
+            // The selected item's name sits in a light cell with dark text.
+            if selected {
+                let g = lp.layout_no_wrap(it.name.clone(), Tokens::ui(12.0), Color32::BLACK);
+                let cell = Rect::from_min_max(pos2(x0 + 27.0, r.min.y + 1.0), pos2((x0 + 33.0 + g.size().x).min(name_clip.max.x), r.max.y - 1.0));
+                lp.with_clip_rect(name_clip.expand2(vec2(3.0, 0.0))).rect_filled(cell, 0.0, Color32::from_rgb(0xa6, 0xa6, 0xa6));
+            }
+            // Long names end in "…" before the label column instead of being cut mid-glyph.
+            widgets::text_fit(
+                &lp.with_clip_rect(name_clip),
+                pos2(x0 + 30.0, r.center().y),
+                Align2::LEFT_CENTER,
+                &it.name,
+                Tokens::ui(12.0),
+                name_clip.max.x - (x0 + 30.0) - 2.0,
+                if selected { Color32::from_gray(0x16) } else { t.text },
+            );
+        }
+        label_swatch(app, ui, &g, it, label_x, selected, &mut actions);
+        if let Some(extra) = optional_cells(app, ui, &g, it, &cl, &editing, &mut actions) {
+            resp = resp.union(extra);
+        }
+        if dragging.is_some_and(|d| d != id.0) && drop_row == Some(*id) && it.is_folder() {
+            lp.rect_stroke(r.shrink(1.0), 2.0, Stroke::new(1.5, t.accent), egui::StrokeKind::Inside);
+        }
+        // The row with keyboard focus (Tab, or the arrow keys after it) shows a focus ring.
+        if ctx.memory(|m| m.has_focus(row_id(*id))) {
+            lp.rect_stroke(r.shrink(0.5), 0.0, Stroke::new(1.0, t.accent), egui::StrokeKind::Inside);
+        }
+        // Part of the row: not a second Tab stop.
+        let nresp = ui.interact(name_clip, egui::Id::unique(("pname", id.0)), Sense::CLICK | Sense::DRAG);
+        app.auto.add(&format!("project.item.{}.name", id.0), name_clip, &it.name);
+        let resp = resp.union(nresp);
+        if resp.clicked() {
+            select_click(app, ui, &ctx, *id, &rows);
+        }
+        // Double-click opens the item, as in After Effects (a comp gets its own Timeline tab and
+        // the viewer); Enter or the context menu renames.
+        if resp.double_clicked() {
+            open_item(app, it, *id, &mut actions);
+        }
+        if resp.drag_started() {
+            egui::DragAndDrop::set_payload(&ctx, DragPayload::Item(id.0));
+        }
+        // Right-clicking an item selects it (After Effects): the menu's File commands act on the
+        // selection.
+        if resp.secondary_clicked() && !selected {
+            app.session.state.project_selection = vec![*id];
+        }
+        crate::widgets::context_menu(&resp, |ui| item_menu(app, ui, &ctx, it, *id, selected, &mut actions));
+    }
+    // The scroll bars, over the rows (which would take their presses otherwise).
+    if overflow > 0.0 {
+        let track = Rect::from_min_max(pos2(opt_x0, list.max.y - 5.0), pos2(rect.max.x - 4.0, list.max.y - 1.0));
+        app.ui.project_hscroll = widgets::scroll_bar(ui, &mut app.auto, "project.hscroll", track, hscroll, overflow, &t);
+    }
+    if max_scroll > 0.0 {
+        let track = Rect::from_min_max(pos2(rect.max.x - 6.0, list.min.y + 1.0), pos2(rect.max.x - 2.0, list.max.y - 7.0));
+        app.ui.project_scroll = widgets::scroll_bar(ui, &mut app.auto, "project.vscroll", track, scroll, max_scroll, &t);
+    }
+    drop_targets(app, &ctx, &lp, list, DropState { dragging, row: drop_row, hovering: hover_y.is_some() }, &mut actions);
+    let foot = Rect::from_min_max(pos2(rect.min.x, rect.max.y - footer_h), rect.max);
+    footer(app, ui, &p, foot, &mut actions);
+    if empty.double_clicked() {
+        actions.push(("file.import".into(), json!({})));
+    }
+    crate::widgets::context_menu(&empty, |ui| {
+        for (key, label, command) in
+            [("newComp", "New Composition…", "comp.new"), ("newFolder", "New Folder", "project.newFolder"), ("import", "Import File…", "file.import")]
+        {
+            let response = ui.button(label);
+            app.auto.add(&format!("project.context.{key}"), response.rect, label);
+            if response.clicked() {
+                actions.push((command.into(), json!({})));
+                ui.close();
+            }
+        }
+    });
+    marquee_select(app, &ctx, &lp, list, &empty, &rows);
     for (id, params) in actions {
         if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
             app.ui.status = e;
@@ -1106,7 +1344,7 @@ fn column_menu(app: &mut EffectcraftApp, resp: &egui::Response) {
         ui.label(egui::RichText::new(crate::i18n::tr("Columns")).weak());
         for (key, label, _) in COLUMNS {
             let mut on = app.ui.project_columns.iter().any(|c| c == key);
-            if ui.checkbox(&mut on, label).changed() {
+            if ui.checkbox(&mut on, crate::i18n::tr(label)).changed() {
                 set_column(&mut app.ui.project_columns, key, on);
             }
         }
diff --git a/crates/ui-egui/src/panels/properties.rs b/crates/ui-egui/src/panels/properties.rs
index 84d8d4085..c35108937 100644
--- a/crates/ui-egui/src/panels/properties.rs
+++ b/crates/ui-egui/src/panels/properties.rs
@@ -51,6 +51,12 @@ fn decimals(v: f64) -> usize {
     if (v - v.round()).abs() < 1e-6 { 0 } else { 1 }
 }
 
+/// The Properties panel for the first selected layer: "N Selected Objects" when several are
+/// selected, the Layer Transform section (with Reset) and, for a text layer, the text, paragraph
+/// and Text Animation sections that edit the range being edited in the viewer. Rows are evaluated
+/// against a snapshot of the project; every row edit is queued and run through
+/// [`crate::menus::invoke`] at the end (range-scoped for `layer.setText`), with failures reported
+/// in `app.ui.status`. Without a selected layer it shows a hint.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -67,7 +73,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let ectx = EvalCtx { project: &project, comp_id: cid, comp: &comp, time: now, expr: expr.as_deref(), footage: None };
     let x0 = rect.min.x + PAD;
     let w = rect.width() - 2.0 * PAD;
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("props-scroll"), rect);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("props-scroll"), rect);
     let top = rect.min.y + 8.0 - scroll.offset;
     let mut y = top;
     let mut actions: Actions = vec![];
@@ -85,9 +91,9 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
 
     // ---------------------------------------------------------------- Layer Transform
     if let Some(tr) = layer.transform().cloned() {
-        section_header(app, ui, &p, x0, w, y, "Layer Transform", "properties.transform");
+        section_header(app, &p, x0, w, y, "Layer Transform", "properties.transform");
         let rr = Rect::from_min_size(pos2(x0 + w - 40.0, y), vec2(40.0, ROW_H));
-        let resp = ui.interact(rr, egui::Id::new("props-reset"), Sense::click());
+        let resp = ui.interact(rr, egui::Id::unique("props-reset"), Sense::click());
         p.text(rr.right_center(), Align2::RIGHT_CENTER, crate::i18n::tr("Reset"), Tokens::ui(12.0), if resp.hovered() { t.accent_hover } else { t.accent });
         app.auto.add("properties.transform.reset", rr, "Reset Transform");
         if resp.clicked() {
@@ -118,15 +124,17 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         divider(&p, x0, w, y - 4.0, &t);
         y = paragraph_section(app, ui, &p, &layer, &doc, x0, w, y + 4.0, &mut actions);
         divider(&p, x0, w, y - 4.0, &t);
-        section_header(app, ui, &p, x0, w, y + 4.0, "Text Animation", "properties.textAnimation");
+        section_header(app, &p, x0, w, y + 4.0, "Text Animation", "properties.textAnimation");
         y += ROW_H + 10.0;
-        let br = Rect::from_min_size(pos2(x0, y), vec2(116.0, 24.0));
-        let resp = ui.interact(br, egui::Id::new("props-add-animator"), Sense::click());
+        // Both buttons grow with their (translated) labels; English keeps its 116 / 84 px.
+        let text_w = |s: &str| p.layout_no_wrap(s.to_string(), Tokens::ui(12.0), t.text).size().x;
+        let br = Rect::from_min_size(pos2(x0, y), vec2(116f32.max(text_w(crate::i18n::tr("Add Animator")) + 36.0), 24.0));
+        let resp = ui.interact(br, egui::Id::unique("props-add-animator"), Sense::click());
         p.rect_stroke(br, 4.0, Stroke::new(1.0, if resp.hovered() { t.text_dim } else { t.field_border }), egui::StrokeKind::Inside);
         icons::paint(&p, Rect::from_center_size(pos2(br.min.x + 14.0, br.center().y), vec2(10.0, 10.0)), Icon::Plus, t.text);
         p.text(pos2(br.min.x + 26.0, br.center().y), Align2::LEFT_CENTER, crate::i18n::tr("Add Animator"), Tokens::ui(12.0), t.text);
         app.auto.add("properties.addAnimator", br, "Add Animator");
-        let pop = egui::Id::new("props-add-animator-pop");
+        let pop = egui::Id::unique("props-add-animator-pop");
         if resp.clicked() {
             widgets::open_popup(ui, pop);
         }
@@ -142,12 +150,12 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
         // Our own presets (original work, see presets/text_animators.json).
-        let pr = Rect::from_min_size(pos2(br.max.x + 8.0, y), vec2(84.0, 24.0));
-        let presp = ui.interact(pr, egui::Id::new("props-text-presets"), Sense::click());
+        let pr = Rect::from_min_size(pos2(br.max.x + 8.0, y), vec2(84f32.max(text_w(crate::i18n::tr("Presets")) + 16.0), 24.0));
+        let presp = ui.interact(pr, egui::Id::unique("props-text-presets"), Sense::click());
         p.rect_stroke(pr, 4.0, Stroke::new(1.0, if presp.hovered() { t.text_dim } else { t.field_border }), egui::StrokeKind::Inside);
         p.text(pr.center(), Align2::CENTER_CENTER, crate::i18n::tr("Presets"), Tokens::ui(12.0), t.text);
         app.auto.add("properties.textPresets", pr, "Text Animation Presets");
-        let ppop = egui::Id::new("props-text-presets-pop");
+        let ppop = egui::Id::unique("props-text-presets-pop");
         if presp.clicked() {
             widgets::open_popup(ui, ppop);
         }
@@ -172,11 +180,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 }
 
-fn section_header(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, x0: f32, w: f32, y: f32, title: &str, auto: &str) {
+fn section_header(app: &mut EffectcraftApp, p: &egui::Painter, x0: f32, w: f32, y: f32, title: &str, auto: &str) {
     let t = app.tokens;
     p.text(pos2(x0, y + ROW_H / 2.0), Align2::LEFT_CENTER, title, Tokens::semibold(12.0), t.text);
     let r = Rect::from_min_size(pos2(x0, y), vec2(w, ROW_H));
-    let _ = ui;
     app.auto.add(auto, r, title);
 }
 
@@ -205,7 +212,7 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
         let cells = [("prev", r.min.x + 4.0), ("key", r.min.x + 16.0), ("next", r.min.x + 28.0)];
         for (what, cx) in cells {
             let cr = Rect::from_center_size(pos2(cx, cy), vec2(12.0, 16.0));
-            let resp = ui.interact(cr, egui::Id::new(("props-nav", uid, what)), Sense::click());
+            let resp = ui.interact(cr, egui::Id::unique(("props-nav", uid, what)), Sense::click());
             let col = if resp.hovered() { t.text } else { t.text_dim };
             match what {
                 "prev" => triangle(p, cr.center(), true, col),
@@ -235,7 +242,7 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
         }
     } else {
         let swr = Rect::from_center_size(pos2(r.min.x + 16.0, cy), vec2(14.0, 14.0));
-        let resp = ui.interact(swr, egui::Id::new(("props-sw", uid)), Sense::click());
+        let resp = ui.interact(swr, egui::Id::unique(("props-sw", uid)), Sense::click());
         icons::paint(p, swr, Icon::Stopwatch, if resp.hovered() { t.text } else { t.text_dim });
         app.auto.add(&format!("{base}.stopwatch"), swr, &pr.name);
         if resp.clicked() {
@@ -245,7 +252,7 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
     p.text(pos2(r.min.x + 42.0, cy), Align2::LEFT_CENTER, &pr.name, Tokens::ui(12.0), t.text);
     let vx = r.min.x + (r.width() * 0.5).max(130.0);
     let label = Rect::from_min_max(pos2(r.min.x + 42.0, r.min.y), pos2(vx - 20.0, r.max.y));
-    let resp = ui.interact(label, egui::Id::new(("props-label", uid)), Sense::click());
+    let resp = ui.interact(label, egui::Id::unique(("props-label", uid)), Sense::click());
     app.auto.add(&format!("{base}.label"), label, &pr.name);
     if resp.double_clicked() {
         app.ui.timeline.search.clear();
@@ -269,7 +276,7 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
     match &value {
         Value::Scalar(v) if pr.name == "Rotation" || pr.name.ends_with(" Rotation") => {
             let (_, deg) = super::fx_widgets::split_angle(*v);
-            let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::new(("props-v", uid)), *v, decimals(deg), &t);
+            let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(vx, cy - 9.0), egui::Id::unique(("props-v", uid)), *v, decimals(deg), &t);
             app.auto.add(&format!("{base}.value"), dr, &pr.name);
             app.auto.add(&format!("{base}.revolutions"), rr, &pr.name);
             if let Some(nv) = nv {
@@ -278,7 +285,14 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
         }
         Value::Scalar(v) => {
             let range = if pr.name == "Opacity" { (0.0, 100.0) } else { (-1e9, 1e9) };
-            let (vr, nv, _) = widgets::hot_number_at(ui, pos2(vx, cy - 9.0), egui::Id::new(("props-v", uid)), *v, 0.5, range, decimals(*v), suffix, &t);
+            let (vr, nv, _) = widgets::hot_number_at(
+                ui,
+                pos2(vx, cy - 9.0),
+                egui::Id::unique(("props-v", uid)),
+                *v,
+                &widgets::HotSpec { speed: 0.5, range, decimals: decimals(*v), suffix },
+                &t,
+            );
             app.auto.add(&format!("{base}.value"), vr, &pr.name);
             if let Some(nv) = nv {
                 set(actions, json!(nv));
@@ -295,7 +309,7 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
             if linkable {
                 // Constrain Proportions toggle, left of the values.
                 let lr = Rect::from_center_size(pos2(x - 12.0, cy), vec2(12.0, 12.0));
-                let resp = ui.interact(lr, egui::Id::new(("props-link", uid)), Sense::click()).on_hover_text(tr("Constrain Proportions"));
+                let resp = ui.interact(lr, egui::Id::unique(("props-link", uid)), Sense::click()).on_hover_text(tr("Constrain Proportions"));
                 icons::paint(p, lr, Icon::Link, if linked { t.accent } else { t.text_faint });
                 app.auto.add(&format!("{base}.constrain"), lr, "Constrain Proportions");
                 if resp.clicked() && !app.ui.timeline.unlinked.remove(&uid) {
@@ -303,8 +317,14 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
                 }
             }
             for d in 0..n.min(c.len()) {
-                let (vr, nv, _) =
-                    widgets::hot_number_at(ui, pos2(x, cy - 9.0), egui::Id::new(("props-v", uid, d)), c[d], 1.0, (-1e9, 1e9), decimals(c[d]), suffix, &t);
+                let (vr, nv, _) = widgets::hot_number_at(
+                    ui,
+                    pos2(x, cy - 9.0),
+                    egui::Id::unique(("props-v", uid, d)),
+                    c[d],
+                    &widgets::HotSpec { speed: 1.0, range: (-1e9, 1e9), decimals: decimals(c[d]), suffix },
+                    &t,
+                );
                 app.auto.add(&format!("{base}.value.{d}"), vr, &pr.name);
                 if let Some(nv) = nv {
                     let mut nc = c.clone();
@@ -317,6 +337,11 @@ fn transform_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
                         }
                     }
                     set(actions, json!(nc));
+                    // Typed into these components only: other selected layers keep the rest of
+                    // their own value (#1434).
+                    if let Some((_, a)) = actions.last_mut() {
+                        a["dims"] = json!((from..from + shown).collect::<Vec<_>>());
+                    }
                 }
                 x = vr.max.x + 10.0;
             }
@@ -345,18 +370,18 @@ fn text_section(
         v["layer"] = json!(lid);
         actions.push(("layer.setText".into(), v));
     };
-    section_header(app, ui, p, x0, w, y, "Text", "properties.text");
+    section_header(app, p, x0, w, y, "Text", "properties.text");
     y += ROW_H + 4.0;
     // Font family and style.
     let fr = Rect::from_min_size(pos2(x0, y), vec2(w, 22.0));
-    let pop = egui::Id::new("props-font-pop");
+    let pop = egui::Id::unique("props-font-pop");
     if let Some(f) = super::text_panels::font_picker(app, ui, pop, fr, &doc.font, "properties.text.font", true) {
         set(actions, json!({"font": f}));
     }
     y += 28.0;
     let sr = Rect::from_min_size(pos2(x0, y), vec2(w, 22.0));
-    let spop = egui::Id::new("props-style-pop");
-    if widgets::dropdown(ui, sr, &doc.style, &t, egui::Id::new("props-style")).clicked() {
+    let spop = egui::Id::unique("props-style-pop");
+    if widgets::dropdown(ui, sr, &doc.style, &t, egui::Id::unique("props-style")).clicked() {
         widgets::open_popup(ui, spop);
     }
     app.auto.add("properties.text.style", sr, "Font style");
@@ -370,7 +395,14 @@ fn text_section(
     let col2 = x0 + w / 2.0;
     let field = |app: &mut EffectcraftApp, ui: &mut egui::Ui, x: f32, y: f32, glyph: &str, key: &str, v: f64, range: (f64, f64), suffix: &str| {
         p.text(pos2(x, y + 9.0), Align2::LEFT_CENTER, glyph, Tokens::semibold(11.0), t.text_dim);
-        let (r, nv, _) = widgets::hot_number_at(ui, pos2(x + 26.0, y), egui::Id::new(("props-text", key)), v, 0.5, range, decimals(v), suffix, &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x + 26.0, y),
+            egui::Id::unique(("props-text", key)),
+            v,
+            &widgets::HotSpec { speed: 0.5, range, decimals: decimals(v), suffix },
+            &t,
+        );
         app.auto.add(&format!("properties.text.{key}"), r, key);
         nv
     };
@@ -387,7 +419,7 @@ fn text_section(
             // Auto Leading: click to switch to an explicit value (120% of the size).
             p.text(pos2(col2, y + 9.0), Align2::LEFT_CENTER, "A", Tokens::semibold(11.0), t.text_dim);
             let r = Rect::from_min_size(pos2(col2 + 26.0, y), vec2(40.0, 18.0));
-            let resp = ui.interact(r, egui::Id::new("props-leading-auto"), Sense::click());
+            let resp = ui.interact(r, egui::Id::unique("props-leading-auto"), Sense::click());
             p.text(
                 pos2(r.min.x + 2.0, r.center().y),
                 Align2::LEFT_CENTER,
@@ -413,14 +445,14 @@ fn text_section(
     for (i, (key, label, on, c)) in [("fill", "Fill", doc.apply_fill, doc.fill), ("stroke", "Stroke", doc.apply_stroke, doc.stroke)].into_iter().enumerate() {
         let ry = y + i as f32 * 24.0;
         let cr = Rect::from_min_size(pos2(x0, ry + 2.0), vec2(14.0, 14.0));
-        if widgets::checkbox(ui, cr, on, &t, egui::Id::new(("props-apply", key))).clicked() {
+        if widgets::checkbox(ui, cr, on, &t, egui::Id::unique(("props-apply", key))).clicked() {
             let k = if key == "fill" { "applyFill" } else { "applyStroke" };
             set(actions, json!({k: !on}));
         }
         app.auto.add(&format!("properties.text.{key}.enabled"), cr, label);
         let sw = Rect::from_min_size(pos2(x0 + 24.0, ry + 1.0), vec2(16.0, 16.0));
-        let pop = egui::Id::new(("props-color-pop", key));
-        if widgets::swatch(ui, sw, c, egui::Id::new(("props-color", key)), &t).clicked() {
+        let pop = egui::Id::unique(("props-color-pop", key));
+        if widgets::swatch(ui, sw, c, egui::Id::unique(("props-color", key)), &t).clicked() {
             widgets::open_popup(ui, pop);
         }
         app.auto.add(&format!("properties.text.{key}"), sw, label);
@@ -449,12 +481,12 @@ fn paragraph_section(
     actions: &mut Actions,
 ) -> f32 {
     let t = app.tokens;
-    section_header(app, ui, p, x0, w, y, "Paragraph", "properties.paragraph");
+    section_header(app, p, x0, w, y, "Paragraph", "properties.paragraph");
     y += ROW_H + 4.0;
     for (i, (j, key)) in ALIGNS.into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + i as f32 * 26.0, y), vec2(22.0, 22.0));
         let on = doc.justify == j;
-        let resp = ui.interact(r, egui::Id::new(("props-para", key)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("props-para", key)), Sense::click());
         p.rect_filled(
             r,
             3.0,
@@ -509,7 +541,7 @@ fn paint_align_glyph(p: &egui::Painter, r: Rect, j: Justify, c: Color32) {
 fn more_button(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, x0: f32, y: f32, id: &str, auto: &str, panel: PanelKind) -> f32 {
     let t = app.tokens;
     let r = Rect::from_min_size(pos2(x0, y), vec2(64.0, 22.0));
-    let resp = ui.interact(r, egui::Id::new(id), Sense::click());
+    let resp = ui.interact(r, egui::Id::unique(id), Sense::click());
     p.rect_filled(r, 4.0, if resp.hovered() { t.hover } else { t.field_bg });
     p.text(pos2(r.min.x + 8.0, r.center().y), Align2::LEFT_CENTER, "···", Tokens::semibold(12.0), t.text);
     p.text(pos2(r.min.x + 26.0, r.center().y), Align2::LEFT_CENTER, crate::i18n::tr("More"), Tokens::ui(12.0), t.text);
diff --git a/crates/ui-egui/src/panels/puppet_tool.rs b/crates/ui-egui/src/panels/puppet_tool.rs
index 8299f3a34..968fafaf2 100644
--- a/crates/ui-egui/src/panels/puppet_tool.rs
+++ b/crates/ui-egui/src/panels/puppet_tool.rs
@@ -70,7 +70,7 @@ struct Cached {
 pub fn overlay(app: &EffectcraftApp, ctx: &egui::Context, cid: ItemId, layer: &Layer, t: Tick) -> Option<Overlay> {
     let fx = layer.effects()?.groups().find(|g| puppet::is_puppet(g))?;
     let key = (app.session.revision, cid.0, layer.id.0, t.0);
-    let id = egui::Id::new(("puppet-overlay", layer.id.0));
+    let id = egui::Id::unique(("puppet-overlay", layer.id.0));
     if let Some(c) = ctx.data(|d| d.get_temp::<Cached>(id))
         && c.key == key
     {
diff --git a/crates/ui-egui/src/panels/render_queue.rs b/crates/ui-egui/src/panels/render_queue.rs
index e07efe69e..5e39a30c2 100644
--- a/crates/ui-egui/src/panels/render_queue.rs
+++ b/crates/ui-egui/src/panels/render_queue.rs
@@ -35,21 +35,33 @@ pub fn hms(secs: f64) -> String {
     format!("{}:{:02}:{:02}", s / 3600, s / 60 % 60, s % 60)
 }
 
-/// Unix seconds → `YYYY-MM-DD hh:mm:ss` (UTC).
+/// Unix seconds → (proleptic Gregorian year, the same wall-clock instant moved into chrono's range
+/// by whole 400-year cycles). The Gregorian calendar repeats every 400 years (146_097 days), so
+/// month, day and time of day come from chrono and only the year is carried, which keeps every
+/// input exact instead of collapsing out-of-range years to the epoch. `unix` is `u64`, so `days`
+/// always fits an `i64`.
+fn utc_parts(unix: u64) -> (i64, chrono::NaiveDateTime) {
+    use chrono::Datelike;
+    let (days, sod) = ((unix / 86_400) as i64, (unix % 86_400) as i64);
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    // `rest + 719_163` (1970-01-01 is CE day 719_163) is always a valid CE day, and `sod` < 86_400.
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+    match (date, time) {
+        (Some(d), Some(t)) => {
+            let y = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(y).unwrap_or(i64::MAX), d.and_time(t))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()), // unreachable
+    }
+}
+
+/// Unix seconds → `YYYY-MM-DD hh:mm:ss` (UTC). Years far outside chrono's own range are preserved
+/// (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
 pub fn utc_stamp(unix: u64) -> String {
-    let days = (unix / 86_400) as i64;
-    let rem = unix % 86_400;
-    // Civil-from-days (proleptic Gregorian).
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z - era * 146_097;
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = yoe + era * 400 + i64::from(m <= 2);
-    format!("{y:04}-{m:02}-{d:02} {:02}:{:02}:{:02}", rem / 3600, rem / 60 % 60, rem % 60)
+    let (y, t) = utc_parts(unix);
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", t.format("%m-%d %H:%M:%S"))
 }
 
 fn status_color(t: &Tokens, s: &RenderStatus) -> Color32 {
@@ -403,15 +415,21 @@ fn pick_output(app: &EffectcraftApp, it: &RenderQueueItem) -> Option<Option<Stri
     app.hooks.save_dialog(&app.session.resolve_output(it).unwrap_or_default())
 }
 
-pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+/// A `renderQueue.*` command queued while drawing, run after the frame.
+type Action = (&'static str, Value);
+
+/// What the panel's sections read: the queue, the running render (if any) and the formats.
+#[derive(Clone, Copy)]
+struct RqView<'a> {
+    queue: &'a [RenderQueueItem],
+    progress: Option<&'a effectcraft_engine::render_queue::JobState>,
+    rendering: bool,
+    available: &'a [OutputFormat],
+}
+
+/// Comps dragged from the Project over the panel: an outline while hovering, queued on release.
+fn queue_drop(app: &EffectcraftApp, ui: &egui::Ui, rect: Rect, p: &egui::Painter, rendering: bool, actions: &mut Vec<Action>) {
     let t = app.tokens;
-    let p = ui.painter().with_clip_rect(rect);
-    let queue: Vec<RenderQueueItem> = app.session.project.render_queue.clone();
-    let progress = app.session.render_progress();
-    let rendering = app.session.is_rendering();
-    let available = app.session.exporter.as_ref().map(|e| e.formats()).unwrap_or_default();
-    let mut actions: Vec<(&'static str, Value)> = Vec::new();
-    app.auto.add("renderQueue.drop", rect, "Drop compositions to queue");
     if !rendering
         && let Some(crate::panels::DragPayload::Item(id)) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(ui.ctx()).as_deref()
         && app.session.project.comp(effectcraft_engine::project::ItemId(*id)).is_some()
@@ -431,14 +449,14 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             p.rect_stroke(rect.shrink(2.0), 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
         }
     }
-    let mut forms: Vec<(RenderQueueItem, String)> = Vec::new();
-    let state_id = egui::Id::new("rq-ui");
-    let (mut open, mut selected): (Vec<u64>, Option<u64>) = ui.data(|d| d.get_temp(state_id).unwrap_or_default());
+}
 
-    // ---------------------------------------------------------- Current Render strip
-    let top = Rect::from_min_size(rect.min, vec2(rect.width(), TOP_H));
-    p.rect_filled(top, 0.0, t.tl_ruler_bg);
-    let x0 = rect.min.x + 12.0;
+/// The Current Render strip inside `top`: title, elapsed / remaining time, Render, Stop, Notify
+/// and the progress bar.
+fn current_render_strip(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, top: Rect, rq: &RqView, actions: &mut Vec<Action>) {
+    let t = app.tokens;
+    let RqView { queue, progress, rendering, available } = *rq;
+    let x0 = top.min.x + 12.0;
     p.text(pos2(x0, top.min.y + 16.0), Align2::LEFT_CENTER, tr("Current Render"), Tokens::semibold(12.5), t.text);
     let cur_item = progress.as_ref().and_then(|p| p.current).and_then(|id| queue.iter().find(|i| i.id == id));
     let cur_name = cur_item.and_then(|i| app.session.project.item(i.comp)).map(|i| i.name.clone());
@@ -456,20 +474,20 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let render_b = Rect::from_min_size(pos2(top.max.x - 12.0 - bw, top.min.y + 34.0), vec2(bw, 26.0));
     let stop_b = Rect::from_min_size(pos2(render_b.min.x - 8.0 - bw, render_b.min.y), vec2(bw, 26.0));
     let can_render = !rendering && queue.iter().any(RenderQueueItem::is_queued) && !available.is_empty();
-    if widgets::text_button(ui, render_b, "Render", can_render, &t, egui::Id::new("rq-render")).clicked() && can_render {
+    if widgets::text_button(ui, render_b, "Render", can_render, &t, egui::Id::unique("rq-render")).clicked() && can_render {
         actions.push(("renderQueue.render", json!({"wait": false})));
     }
     app.auto.add("renderQueue.render", render_b, "Render");
     // Notify (sound + notification when the queue finishes).
     let notify = app.session.project.render_prefs.notify;
     let nb = Rect::from_min_size(pos2(render_b.min.x - 8.0 - 2.0 * bw - 8.0, render_b.min.y + 4.0), vec2(18.0, 18.0));
-    if widgets::checkbox(ui, nb, notify, &t, egui::Id::new("rq-notify")).clicked() {
+    if widgets::checkbox(ui, nb, notify, &t, egui::Id::unique("rq-notify")).clicked() {
         actions.push(("renderQueue.setNotify", json!({"notify": !notify})));
     }
     p.text(pos2(nb.max.x + 5.0, nb.center().y), Align2::LEFT_CENTER, tr("Notify"), Tokens::ui(11.5), t.text_dim);
     app.auto.add("renderQueue.notify", nb, if notify { "Notify: on" } else { "Notify: off" });
     if rendering {
-        if widgets::text_button(ui, stop_b, "Stop", false, &t, egui::Id::new("rq-stop")).clicked() {
+        if widgets::text_button(ui, stop_b, "Stop", false, &t, egui::Id::unique("rq-stop")).clicked() {
             actions.push(("renderQueue.stop", json!({})));
         }
         app.auto.add("renderQueue.stop", stop_b, "Stop");
@@ -498,6 +516,194 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     };
     p.text(pos2(bar.min.x + 8.0, bar.center().y), Align2::LEFT_CENTER, bar_text, Tokens::ui(11.5), t.text);
     app.auto.add("renderQueue.progress", bar, &format!("{:.0}%", frac * 100.0));
+}
+
+/// The footer: the message line and the totals.
+fn footer(p: &egui::Painter, rect: Rect, rq: &RqView, t: &Tokens) {
+    let RqView { queue, progress, rendering, .. } = *rq;
+    let foot = Rect::from_min_max(pos2(rect.min.x, rect.max.y - FOOT_H), rect.max);
+    p.rect_filled(foot, 0.0, t.tl_ruler_bg);
+    p.line_segment([foot.left_top(), foot.right_top()], Stroke::new(1.0, t.separator));
+    let msg = match &progress {
+        Some(pr) if rendering => format!("Message: Rendering {} of {}", (pr.items_done + 1).min(pr.items_total), pr.items_total),
+        _ => {
+            let done = queue.iter().filter(|i| i.status == RenderStatus::Done).count();
+            format!("Message: {done} of {} done", queue.len())
+        }
+    };
+    p.text(pos2(foot.min.x + 12.0, foot.center().y), Align2::LEFT_CENTER, msg, Tokens::ui(11.0), t.text_dim);
+    let started = queue.iter().filter(|i| i.started.is_some()).count();
+    let total: f64 = queue.iter().filter_map(|i| i.render_time).sum();
+    p.text(
+        pos2(foot.max.x - 12.0, foot.center().y),
+        Align2::RIGHT_CENTER,
+        format!("Renders Started: {started}     Total Time Elapsed: {}", hms(progress.as_ref().filter(|_| rendering).map(|p| p.elapsed).unwrap_or(total))),
+        Tokens::ui(11.0),
+        t.text_dim,
+    );
+}
+
+/// An item row's context menu: Duplicate, Remove and Move Up / Down (row `k` of `len`).
+fn row_menu(ui: &mut egui::Ui, actions: &mut Vec<Action>, item_id: u64, k: usize, len: usize) {
+    if ui.button(tr("Duplicate")).clicked() {
+        actions.push(("renderQueue.duplicate", json!({"item": item_id})));
+        ui.close();
+    }
+    if ui.button(tr("Remove")).clicked() {
+        actions.push(("renderQueue.remove", json!({"item": item_id})));
+        ui.close();
+    }
+    if k > 0 && ui.button(tr("Move Up")).clicked() {
+        actions.push(("renderQueue.move", json!({"item": item_id, "to": k})));
+        ui.close();
+    }
+    if k + 1 < len && ui.button(tr("Move Down")).clicked() {
+        actions.push(("renderQueue.move", json!({"item": item_id, "to": k + 2})));
+        ui.close();
+    }
+}
+
+/// Log: Errors Only / Plus Settings / Plus Per Frame Info.
+fn log_dropdown(app: &mut EffectcraftApp, ui: &mut egui::Ui, row: &ItemRow, it: &RenderQueueItem, actions: &mut Vec<Action>) {
+    let ItemRow { lp, r, n, rendering, .. } = *row;
+    let t = app.tokens;
+    let aid = |s: &str| format!("renderQueue.item.{n}.{s}");
+    let ld = Rect::from_min_size(pos2(r.max.x - 190.0, r.min.y + 3.0), vec2(150.0, ROW_H - 6.0));
+    lp.text(pos2(ld.min.x - 6.0, r.center().y), Align2::RIGHT_CENTER, tr("Log:"), Tokens::ui(11.5), t.text_dim);
+    let lid = egui::Id::unique(("rq-log", it.id));
+    if widgets::dropdown(ui, ld, it.log.label(), &t, lid).clicked() && !rendering {
+        widgets::open_popup(ui, lid);
+    }
+    let llabels: Vec<String> = RenderLog::ALL.iter().map(|l| mark(it.log == *l, l.label())).collect();
+    if let Some(i) = widgets::popup_menu(ui, lid, ld.left_bottom(), &llabels, None) {
+        actions.push(("renderQueue.setLog", json!({"item": it.id, "log": RenderLog::ALL[i].label()})));
+    }
+    app.auto.add(&aid("log"), ld, it.log.label());
+}
+
+/// Where an item row's expanded line is drawn.
+#[derive(Clone, Copy)]
+struct ItemRow<'a> {
+    lp: &'a egui::Painter,
+    list: Rect,
+    r: Rect,
+    /// The item's 1-based position in the queue.
+    n: usize,
+    rendering: bool,
+}
+
+/// The expanded "Output To" line: the template menu, and the file name (click to choose it or
+/// edit the template in place).
+fn output_to(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    row: &ItemRow,
+    it: &RenderQueueItem,
+    dd_right: f32,
+    editing: &mut Option<(u64, String)>,
+    actions: &mut Vec<Action>,
+) {
+    let ItemRow { lp, list, r, n, rendering } = *row;
+    let t = app.tokens;
+    let aid = |s: &str| format!("renderQueue.item.{n}.{s}");
+    let ox = dd_right + 14.0;
+    lp.text(pos2(ox, r.center().y), Align2::LEFT_CENTER, tr("Output To:"), Tokens::ui(11.5), t.text_dim);
+    let odd = Rect::from_min_size(pos2(ox + 62.0, r.min.y + 3.0), vec2(22.0, ROW_H - 6.0));
+    let oid = egui::Id::unique(("rq-out", it.id));
+    if widgets::dropdown(ui, odd, "", &t, oid).clicked() && !rendering {
+        widgets::open_popup(ui, oid);
+    }
+    app.auto.add(&aid("outputTo"), odd, "Output To");
+    let omenu = output_to_menu(it);
+    let olabels: Vec<String> = omenu.iter().map(|(l, _)| l.clone()).collect();
+    if let Some(i) = widgets::popup_menu(ui, oid, odd.left_bottom(), &olabels, None) {
+        if omenu[i].1.get("choose").is_some() {
+            match pick_output(app, it) {
+                Some(Some(path)) => actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": path}))),
+                Some(None) => {}
+                None => *editing = Some((it.id, it.output.output.clone())),
+            }
+        } else {
+            let mut params = omenu[i].1.clone();
+            params["item"] = json!(it.id);
+            actions.push(("renderQueue.setOutput", params));
+        }
+    }
+    let path_rect = Rect::from_min_max(pos2(odd.max.x + 6.0, r.min.y + 2.0), pos2(r.max.x - 8.0, r.max.y - 2.0));
+    if editing.as_ref().is_some_and(|(id, _)| *id == it.id) {
+        let mut buf = editing.as_ref().map(|(_, b)| b.clone()).unwrap_or_default();
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(path_rect));
+        let resp = child.add(egui::TextEdit::singleline(&mut buf).desired_width(path_rect.width()).font(Tokens::ui(11.5)));
+        if resp.lost_focus() {
+            if ui.input(|i| i.key_pressed(egui::Key::Enter)) && !buf.trim().is_empty() {
+                actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": buf.trim()})));
+            }
+            *editing = None;
+        } else {
+            widgets::keep_focus(ui.ctx(), &resp, &buf);
+            *editing = Some((it.id, buf));
+        }
+    } else {
+        let shown = app.session.resolve_output(it).unwrap_or_else(|| "Not yet specified".into());
+        let resp = ui.interact(path_rect, egui::Id::unique(("rq-path", it.id)), Sense::click());
+        let col = if resp.hovered() { t.accent_hover } else { t.hot_text };
+        lp.with_clip_rect(path_rect.intersect(list)).text(pos2(path_rect.min.x, r.center().y), Align2::LEFT_CENTER, &shown, Tokens::ui(11.5), col);
+        // Clicking the file name opens the save dialog (Output Movie To); Alt-click, or a
+        // host without one, edits the name template in place.
+        let dialog = app.hooks.pick_save_file.is_some();
+        if resp.clicked() && !rendering {
+            let picked = if ui.input(|i| i.modifiers.alt) { None } else { pick_output(app, it) };
+            match picked {
+                Some(Some(path)) => actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": path}))),
+                Some(None) => {}
+                None => *editing = Some((it.id, it.output.output.clone())),
+            }
+        }
+        let how = if dialog { "Click to choose where to save; Alt-click to edit the template" } else { "Click to edit" };
+        resp.on_hover_text(tr_args("Template: {}\n{}", &[&it.output.output, &how]));
+        app.auto.add(&aid("outputPath"), path_rect, &shown);
+    }
+}
+
+/// Delete removes the selected item when the panel has focus (`allowed`: not editing a path and
+/// not rendering).
+fn delete_selected(app: &EffectcraftApp, ui: &egui::Ui, allowed: bool, selected: &mut Option<u64>, actions: &mut Vec<Action>) {
+    if app.ui.focused == crate::dock::PanelKind::RenderQueue
+        && allowed
+        && let Some(id) = *selected
+        && app.dialog.is_none()
+        && ui.input(|i| i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace))
+        && !ui.ctx().egui_wants_keyboard_input()
+    {
+        actions.push(("renderQueue.remove", json!({"item": id})));
+        *selected = None;
+    }
+}
+
+/// The Render Queue panel: the Current Render strip (elapsed and remaining time, Render/Stop and
+/// Notify, plus the progress bar), the column header, the queued items with their output template,
+/// status and timings, and the footer totals. Comps dragged from the Project are queued on
+/// release. The open items and the selected item are kept in egui temp data; output-template forms
+/// open through a small form, and every change runs a `renderQueue.*` command.
+pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let p = ui.painter().with_clip_rect(rect);
+    let queue: Vec<RenderQueueItem> = app.session.project.render_queue.clone();
+    let progress = app.session.render_progress();
+    let rendering = app.session.is_rendering();
+    let available = app.session.exporter.as_ref().map(|e| e.formats()).unwrap_or_default();
+    let mut actions: Vec<Action> = Vec::new();
+    let rq = RqView { queue: &queue, progress: progress.as_ref(), rendering, available: &available };
+    app.auto.add("renderQueue.drop", rect, "Drop compositions to queue");
+    queue_drop(app, ui, rect, &p, rendering, &mut actions);
+    let mut forms: Vec<(RenderQueueItem, String)> = Vec::new();
+    let state_id = egui::Id::unique("rq-ui");
+    let (mut open, mut selected): (Vec<u64>, Option<u64>) = ui.data(|d| d.get_temp(state_id).unwrap_or_default());
+
+    // ---------------------------------------------------------- Current Render strip
+    let top = Rect::from_min_size(rect.min, vec2(rect.width(), TOP_H));
+    p.rect_filled(top, 0.0, t.tl_ruler_bg);
+    current_render_strip(app, ui, &p, top, &rq, &mut actions);
 
     // ---------------------------------------------------------- column header
     let head = Rect::from_min_size(pos2(rect.min.x, top.max.y), vec2(rect.width(), HEAD_H));
@@ -526,7 +732,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     // ---------------------------------------------------------- items
     let list = Rect::from_min_max(pos2(rect.min.x, head.max.y), pos2(rect.max.x, rect.max.y - FOOT_H));
     let lp = p.with_clip_rect(list);
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("rq-scroll"), list);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("rq-scroll"), list);
     // Items scroll under the header and footer: clip their widgets (and hit tests) to the list.
     let panel_clip = ui.clip_rect();
     ui.set_clip_rect(list.intersect(panel_clip));
@@ -534,7 +740,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     if queue.is_empty() {
         lp.text(pos2(list.center().x, list.min.y + 30.0), Align2::CENTER_CENTER, tr("The render queue is empty."), Tokens::ui(12.0), t.text_faint);
     }
-    let editing_id = egui::Id::new("rq-edit-output");
+    let editing_id = egui::Id::unique("rq-edit-output");
     let mut editing: Option<(u64, String)> = ui.data(|d| d.get_temp(editing_id));
     for (k, it) in queue.iter().enumerate() {
         let n = k + 1;
@@ -553,34 +759,16 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 t.row_alt
             },
         );
-        let row_resp = ui.interact(row, egui::Id::new(("rq-row", it.id)), Sense::click());
+        let row_resp = ui.interact(row, egui::Id::unique(("rq-row", it.id)), Sense::click());
         if row_resp.clicked() {
             selected = Some(it.id);
             app.ui.focused = crate::dock::PanelKind::RenderQueue;
         }
-        let item_id = it.id;
-        crate::widgets::context_menu(&row_resp, |ui| {
-            if ui.button(tr("Duplicate")).clicked() {
-                actions.push(("renderQueue.duplicate", json!({"item": item_id})));
-                ui.close();
-            }
-            if ui.button(tr("Remove")).clicked() {
-                actions.push(("renderQueue.remove", json!({"item": item_id})));
-                ui.close();
-            }
-            if k > 0 && ui.button(tr("Move Up")).clicked() {
-                actions.push(("renderQueue.move", json!({"item": item_id, "to": n - 1})));
-                ui.close();
-            }
-            if n < queue.len() && ui.button(tr("Move Down")).clicked() {
-                actions.push(("renderQueue.move", json!({"item": item_id, "to": n + 1})));
-                ui.close();
-            }
-        });
+        crate::widgets::context_menu(&row_resp, |ui| row_menu(ui, &mut actions, it.id, k, queue.len()));
         app.auto.add(&aid("row"), row, &format!("#{n}"));
         let is_open = open.contains(&it.id);
         let tw = Rect::from_center_size(pos2(cx_twirl + 8.0, row.center().y), vec2(14.0, 14.0));
-        if widgets::twirl(ui, tw, is_open, egui::Id::new(("rq-twirl", it.id)), &t).clicked() {
+        if widgets::twirl(ui, tw, is_open, egui::Id::unique(("rq-twirl", it.id)), &t).clicked() {
             if is_open {
                 open.retain(|i| *i != it.id);
             } else {
@@ -589,7 +777,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         app.auto.add(&aid("twirl"), tw, "Twirl");
         let cb = Rect::from_center_size(pos2(cx_render + 20.0, row.center().y), vec2(18.0, 18.0));
-        if widgets::checkbox(ui, cb, it.render, &t, egui::Id::new(("rq-cb", it.id))).clicked() && !rendering {
+        if widgets::checkbox(ui, cb, it.render, &t, egui::Id::unique(("rq-cb", it.id))).clicked() && !rendering {
             actions.push(("renderQueue.setRender", json!({"item": it.id, "render": !it.render})));
         }
         app.auto.add(&aid("render"), cb, if it.render { "Render: on" } else { "Render: off" });
@@ -607,7 +795,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let st_rect = Rect::from_min_size(pos2(cx_status, row.min.y), vec2(w_status, ROW_H));
         lp.text(pos2(cx_status + 2.0, row.center().y), Align2::LEFT_CENTER, &status, Tokens::ui(12.0), status_color(&t, &it.status));
         if let RenderStatus::Failed(e) = &it.status {
-            ui.interact(st_rect, egui::Id::new(("rq-st", it.id)), Sense::hover()).on_hover_text(e);
+            ui.interact(st_rect, egui::Id::unique(("rq-st", it.id)), Sense::hover()).on_hover_text(e);
         }
         app.auto.add(&aid("status"), st_rect, &status);
         if let Some(s) = it.started {
@@ -639,7 +827,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             };
             lp.text(pos2(cx_num - 6.0, r.center().y), Align2::LEFT_CENTER, label, Tokens::ui(11.5), t.text_dim);
             let dd = Rect::from_min_size(pos2(ix + 70.0, r.min.y + 3.0), vec2(220.0, ROW_H - 6.0));
-            let did = egui::Id::new(("rq-dd", it.id, sub));
+            let did = egui::Id::unique(("rq-dd", it.id, sub));
             let shown: String = if summary.chars().count() > 31 { summary.chars().take(30).chain(std::iter::once('…')).collect() } else { summary.clone() };
             if widgets::dropdown(ui, dd, &shown, &t, did).clicked() && !rendering {
                 widgets::open_popup(ui, did);
@@ -669,78 +857,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     );
                     lp.text(pos2(dd.max.x + 14.0, r.center().y), Align2::LEFT_CENTER, info, Tokens::ui(11.0), t.text_faint);
                 }
-                // Log: Errors Only / Plus Settings / Plus Per Frame Info.
-                let ld = Rect::from_min_size(pos2(r.max.x - 190.0, r.min.y + 3.0), vec2(150.0, ROW_H - 6.0));
-                lp.text(pos2(ld.min.x - 6.0, r.center().y), Align2::RIGHT_CENTER, tr("Log:"), Tokens::ui(11.5), t.text_dim);
-                let lid = egui::Id::new(("rq-log", it.id));
-                if widgets::dropdown(ui, ld, it.log.label(), &t, lid).clicked() && !rendering {
-                    widgets::open_popup(ui, lid);
-                }
-                let llabels: Vec<String> = RenderLog::ALL.iter().map(|l| mark(it.log == *l, l.label())).collect();
-                if let Some(i) = widgets::popup_menu(ui, lid, ld.left_bottom(), &llabels, None) {
-                    actions.push(("renderQueue.setLog", json!({"item": it.id, "log": RenderLog::ALL[i].label()})));
-                }
-                app.auto.add(&aid("log"), ld, it.log.label());
+                log_dropdown(app, ui, &ItemRow { lp: &lp, list, r, n, rendering }, it, &mut actions);
                 continue;
             }
-            // Output To.
-            let ox = dd.max.x + 14.0;
-            lp.text(pos2(ox, r.center().y), Align2::LEFT_CENTER, tr("Output To:"), Tokens::ui(11.5), t.text_dim);
-            let odd = Rect::from_min_size(pos2(ox + 62.0, r.min.y + 3.0), vec2(22.0, ROW_H - 6.0));
-            let oid = egui::Id::new(("rq-out", it.id));
-            if widgets::dropdown(ui, odd, "", &t, oid).clicked() && !rendering {
-                widgets::open_popup(ui, oid);
-            }
-            app.auto.add(&aid("outputTo"), odd, "Output To");
-            let omenu = output_to_menu(it);
-            let olabels: Vec<String> = omenu.iter().map(|(l, _)| l.clone()).collect();
-            if let Some(i) = widgets::popup_menu(ui, oid, odd.left_bottom(), &olabels, None) {
-                if omenu[i].1.get("choose").is_some() {
-                    match pick_output(app, it) {
-                        Some(Some(path)) => actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": path}))),
-                        Some(None) => {}
-                        None => editing = Some((it.id, it.output.output.clone())),
-                    }
-                } else {
-                    let mut params = omenu[i].1.clone();
-                    params["item"] = json!(it.id);
-                    actions.push(("renderQueue.setOutput", params));
-                }
-            }
-            let path_rect = Rect::from_min_max(pos2(odd.max.x + 6.0, r.min.y + 2.0), pos2(r.max.x - 8.0, r.max.y - 2.0));
-            if editing.as_ref().is_some_and(|(id, _)| *id == it.id) {
-                let mut buf = editing.as_ref().map(|(_, b)| b.clone()).unwrap_or_default();
-                let mut child = ui.new_child(egui::UiBuilder::new().max_rect(path_rect));
-                let resp = child.add(egui::TextEdit::singleline(&mut buf).desired_width(path_rect.width()).font(Tokens::ui(11.5)));
-                if resp.lost_focus() {
-                    if ui.input(|i| i.key_pressed(egui::Key::Enter)) && !buf.trim().is_empty() {
-                        actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": buf.trim()})));
-                    }
-                    editing = None;
-                } else {
-                    widgets::keep_focus(ui.ctx(), &resp, &buf);
-                    editing = Some((it.id, buf));
-                }
-            } else {
-                let shown = app.session.resolve_output(it).unwrap_or_else(|| "Not yet specified".into());
-                let resp = ui.interact(path_rect, egui::Id::new(("rq-path", it.id)), Sense::click());
-                let col = if resp.hovered() { t.accent_hover } else { t.hot_text };
-                lp.with_clip_rect(path_rect.intersect(list)).text(pos2(path_rect.min.x, r.center().y), Align2::LEFT_CENTER, &shown, Tokens::ui(11.5), col);
-                // Clicking the file name opens the save dialog (Output Movie To); Alt-click, or a
-                // host without one, edits the name template in place.
-                let dialog = app.hooks.pick_save_file.is_some();
-                if resp.clicked() && !rendering {
-                    let picked = if ui.input(|i| i.modifiers.alt) { None } else { pick_output(app, it) };
-                    match picked {
-                        Some(Some(path)) => actions.push(("renderQueue.setOutput", json!({"item": it.id, "path": path}))),
-                        Some(None) => {}
-                        None => editing = Some((it.id, it.output.output.clone())),
-                    }
-                }
-                let how = if dialog { "Click to choose where to save; Alt-click to edit the template" } else { "Click to edit" };
-                resp.on_hover_text(tr_args("Template: {}\n{}", &[&it.output.output, &how]));
-                app.auto.add(&aid("outputPath"), path_rect, &shown);
-            }
+            output_to(app, ui, &ItemRow { lp: &lp, list, r, n, rendering }, it, dd.max.x, &mut editing, &mut actions);
         }
     }
     ui.set_clip_rect(panel_clip);
@@ -753,40 +873,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         None => d.remove::<(u64, String)>(editing_id),
     });
 
-    // Delete removes the selected item when the panel has focus.
-    if app.ui.focused == crate::dock::PanelKind::RenderQueue
-        && editing.is_none()
-        && !rendering
-        && let Some(id) = selected
-        && app.dialog.is_none()
-        && ui.input(|i| i.key_pressed(egui::Key::Delete) || i.key_pressed(egui::Key::Backspace))
-        && !ui.ctx().egui_wants_keyboard_input()
-    {
-        actions.push(("renderQueue.remove", json!({"item": id})));
-        selected = None;
-    }
+    delete_selected(app, ui, editing.is_none() && !rendering, &mut selected, &mut actions);
 
     // ---------------------------------------------------------- footer
-    let foot = Rect::from_min_max(pos2(rect.min.x, rect.max.y - FOOT_H), rect.max);
-    p.rect_filled(foot, 0.0, t.tl_ruler_bg);
-    p.line_segment([foot.left_top(), foot.right_top()], Stroke::new(1.0, t.separator));
-    let msg = match &progress {
-        Some(pr) if rendering => format!("Message: Rendering {} of {}", (pr.items_done + 1).min(pr.items_total), pr.items_total),
-        _ => {
-            let done = queue.iter().filter(|i| i.status == RenderStatus::Done).count();
-            format!("Message: {done} of {} done", queue.len())
-        }
-    };
-    p.text(pos2(foot.min.x + 12.0, foot.center().y), Align2::LEFT_CENTER, msg, Tokens::ui(11.0), t.text_dim);
-    let started = queue.iter().filter(|i| i.started.is_some()).count();
-    let total: f64 = queue.iter().filter_map(|i| i.render_time).sum();
-    p.text(
-        pos2(foot.max.x - 12.0, foot.center().y),
-        Align2::RIGHT_CENTER,
-        format!("Renders Started: {started}     Total Time Elapsed: {}", hms(progress.as_ref().filter(|_| rendering).map(|p| p.elapsed).unwrap_or(total))),
-        Tokens::ui(11.0),
-        t.text_dim,
-    );
+    footer(&p, rect, &rq, &t);
 
     open.retain(|id| queue.iter().any(|i| i.id == *id));
     ui.data_mut(|d| d.insert_temp(state_id, (open, selected)));
@@ -807,6 +897,10 @@ mod tests {
     fn stamps() {
         assert_eq!(super::utc_stamp(0), "1970-01-01 00:00:00");
         assert_eq!(super::utc_stamp(1_700_000_000), "2023-11-14 22:13:20");
+        // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+        // them) rather than collapsing to the epoch.
+        assert_eq!(super::utc_stamp(10_000_000_000_000), "318857-05-20 17:46:40");
+        assert_eq!(super::utc_stamp(u64::MAX), "584554051223-11-09 07:00:15");
         assert_eq!(super::hms(3725.4), "1:02:05");
     }
 }
diff --git a/crates/ui-egui/src/panels/roto_tool.rs b/crates/ui-egui/src/panels/roto_tool.rs
index fbd7119c8..0d9eefe45 100644
--- a/crates/ui-egui/src/panels/roto_tool.rs
+++ b/crates/ui-egui/src/panels/roto_tool.rs
@@ -64,7 +64,7 @@ pub fn draw_overlay(
         (scale * 1000.0) as u32,
         format!("{}{:?}{:?}{}", o.view, o.overlay_color, o.boundary_color, o.overlay_opacity),
     );
-    let id = egui::Id::new("roto-overlay");
+    let id = egui::Id::unique("roto-overlay");
     let cached: Option<Overlay> = ctx.data(|d| d.get_temp(id));
     let ov = match cached {
         Some(c) if c.key == key => Some(c),
@@ -135,21 +135,19 @@ pub fn draw_overlay(
     }
 }
 
+/// The layer <-> screen mappings [`interact`] works with.
+pub struct LayerXform<'a> {
+    pub to_screen: &'a dyn Fn([f64; 2]) -> Pos2,
+    pub to_layer: &'a dyn Fn(Pos2) -> [f64; 2],
+}
+
 /// Pointer handling for the Roto Brush / Refine Edge tools. Returns true when it handled input.
-pub fn interact(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    painter: &egui::Painter,
-    area: Rect,
-    layer: &Layer,
-    zoom: f64,
-    to_screen: &dyn Fn([f64; 2]) -> Pos2,
-    to_layer: &dyn Fn(Pos2) -> [f64; 2],
-) -> bool {
+pub fn interact(app: &mut EffectcraftApp, ui: &mut egui::Ui, painter: &egui::Painter, area: Rect, layer: &Layer, zoom: f64, xf: LayerXform) -> bool {
+    let LayerXform { to_screen, to_layer } = xf;
     let ctx = ui.ctx().clone();
     let mods = ui.input(|i| i.modifiers);
     let Some(kind) = app.ui.tool.roto_kind(mods.alt) else { return false };
-    let resp = ui.interact(area, egui::Id::new("layer-panel-roto"), Sense::click_and_drag());
+    let resp = ui.interact(area, egui::Id::unique("layer-panel-roto"), Sense::click_and_drag());
     let o = app.session.state.roto.clone();
     let refine = kind.starts_with("refine");
     let dia = if refine { o.refine_diameter } else { o.diameter };
@@ -170,7 +168,7 @@ pub fn interact(
     }
     // ⌘/Ctrl-drag resizes the brush (After Effects): the circle stays at the press point and its
     // edge follows the pointer. No stroke is painted.
-    let rid = egui::Id::new("layer-panel-roto-resize");
+    let rid = egui::Id::unique("layer-panel-roto-resize");
     if resp.drag_started()
         && mods.command
         && let Some(pos) = ui.input(|i| i.pointer.press_origin()).or(resp.interact_pointer_pos())
@@ -194,7 +192,7 @@ pub fn interact(
         }
         return true;
     }
-    let did = egui::Id::new("layer-panel-roto-drag");
+    let did = egui::Id::unique("layer-panel-roto-drag");
     if resp.drag_started()
         && let Some(pos) = ui.input(|i| i.pointer.press_origin()).or(resp.interact_pointer_pos())
     {
@@ -277,8 +275,8 @@ pub fn span_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter,
     p.line_segment([pos2(cx, r.min.y), pos2(cx, r.max.y)], Stroke::new(1.0, t.timecode));
     p.rect_stroke(track, 2.0, Stroke::new(1.0, Color32::from_black_alpha(140)), StrokeKind::Outside);
     app.auto.add("layerPanel.rotoSpan", track, "Segmentation span");
-    let resp = ui.interact(track, egui::Id::new("roto-span-bar"), Sense::click_and_drag());
-    let hid = egui::Id::new("roto-span-handle");
+    let resp = ui.interact(track, egui::Id::unique("roto-span-bar"), Sense::click_and_drag());
+    let hid = egui::Id::unique("roto-span-handle");
     if resp.drag_started()
         && let (Some(pos), Some(_)) = (resp.interact_pointer_pos(), d.base)
     {
@@ -322,7 +320,7 @@ pub fn bar_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
     for (id, label) in [("alpha", tr("Alpha")), ("alphaBoundary", tr("Boundary")), ("alphaOverlay", tr("Overlay"))] {
         let r = Rect::from_min_size(pos2(x, bar.center().y - 10.0), vec2(66.0, 20.0));
         let on = view == id;
-        if widgets::text_button(ui, r, label, on, &t, egui::Id::new(("roto-view", id))).clicked() {
+        if widgets::text_button(ui, r, label, on, &t, egui::Id::unique(("roto-view", id))).clicked() {
             let v = if on { "none" } else { id };
             let _ = app.session.execute("roto.options", json!({"view": v}));
         }
@@ -337,7 +335,7 @@ pub fn bar_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
     x += 8.0;
     let r = Rect::from_min_size(pos2(x, bar.center().y - 10.0), vec2(74.0, 20.0));
     let label = if frozen { tr("Unfreeze") } else { tr("Freeze") };
-    if widgets::text_button(ui, r, label, frozen, &t, egui::Id::new(("roto-freeze", uid))).clicked() {
+    if widgets::text_button(ui, r, label, frozen, &t, egui::Id::unique(("roto-freeze", uid))).clicked() {
         let id = if frozen { "roto.unfreeze" } else { "roto.freeze" };
         if let Err(e) = app.session.execute(id, json!({"layer": layer.id.0, "effect": uid})) {
             app.ui.status = e.to_string();
@@ -347,7 +345,7 @@ pub fn bar_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painte
     x += 80.0;
     if running {
         let r = Rect::from_min_size(pos2(x, bar.center().y - 10.0), vec2(60.0, 20.0));
-        if widgets::text_button(ui, r, tr("Stop"), false, &t, egui::Id::new("roto-stop")).clicked() {
+        if widgets::text_button(ui, r, tr("Stop"), false, &t, egui::Id::unique("roto-stop")).clicked() {
             let _ = app.session.execute("roto.cancel", json!({}));
         }
         app.auto.add("layerPanel.roto.stop", r, "Stop");
diff --git a/crates/ui-egui/src/panels/rq_templates.rs b/crates/ui-egui/src/panels/rq_templates.rs
index f03771133..753dea50d 100644
--- a/crates/ui-egui/src/panels/rq_templates.rs
+++ b/crates/ui-egui/src/panels/rq_templates.rs
@@ -21,8 +21,10 @@ struct State {
     new_name: String,
 }
 
+/// The `egui::Id` of the render-settings / output-module template dialog's state ([`State`]):
+/// which kind it edits, the selected template and the name being typed.
 fn state_id() -> egui::Id {
-    egui::Id::new("rq-templates-dialog")
+    egui::Id::unique("rq-templates-dialog")
 }
 
 /// Open the dialog for `kind` (`renderSettings` | `outputModule`).
@@ -58,7 +60,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                 ui.label(slot.label());
                 let cur = templates.default_name(k, slot);
                 let mut pick = cur.clone();
-                let r = egui::ComboBox::from_id_salt(("tpl-def", slot.label())).selected_text(&cur).width(300.0).show_ui(ui, |ui| {
+                let r = craft_ui::ComboBox::from_id_salt(("tpl-def", slot.label())).selected_text(&cur).width(300.0).show_ui(ui, |ui| {
                     for n in &list {
                         ui.selectable_value(&mut pick, n.clone(), n);
                     }
@@ -75,7 +77,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         ui.label(egui::RichText::new(tr("Settings")).font(Tokens::semibold(12.5)).color(t.text));
         ui.horizontal(|ui| {
             ui.label(tr("Settings Name:"));
-            let r = egui::ComboBox::from_id_salt("tpl-select").selected_text(&st.selected).width(300.0).show_ui(ui, |ui| {
+            let r = craft_ui::ComboBox::from_id_salt("tpl-select").selected_text(&st.selected).width(300.0).show_ui(ui, |ui| {
                 for n in &list {
                     ui.selectable_value(&mut st.selected, n.clone(), n);
                 }
diff --git a/crates/ui-egui/src/panels/scopes_panel.rs b/crates/ui-egui/src/panels/scopes_panel.rs
index 6665164e2..726639598 100644
--- a/crates/ui-egui/src/panels/scopes_panel.rs
+++ b/crates/ui-egui/src/panels/scopes_panel.rs
@@ -38,6 +38,10 @@ struct Cached {
     tex: Option<egui::TextureHandle>,
 }
 
+/// The Scopes panel: the scope kind, colour standard, 8-bit/Float scale and Clamp Signal controls,
+/// then the chosen scope for the active comp's frame at the current time, cached per revision,
+/// comp, time, settings and plot size (drawn as a texture, or bars for the histogram) over its
+/// graticule. The controls update `app.ui.scopes`; the scope itself is only computed and drawn.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -97,7 +101,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let time = app.session.time();
     let key = (app.session.revision, cid.0, time.0, format!("{}{}{}{}{}x{}", st.scope, st.standard, st.float, st.clamp, o.width, o.height), 0);
     let ctx = ui.ctx().clone();
-    let id = egui::Id::new("scopes-cache");
+    let id = egui::Id::unique("scopes-cache");
     let cached: Option<Cached> = ctx.data(|d| d.get_temp(id));
     let cached = match cached {
         Some(c) if c.key == key => c,
diff --git a/crates/ui-egui/src/panels/script_console.rs b/crates/ui-egui/src/panels/script_console.rs
index 97c30c4c4..affd46317 100644
--- a/crates/ui-egui/src/panels/script_console.rs
+++ b/crates/ui-egui/src/panels/script_console.rs
@@ -74,6 +74,9 @@ pub fn run(app: &mut EffectcraftApp, ctx: &egui::Context) {
     con.input.clear();
 }
 
+/// The Script Console panel: the output log (newest lines at the bottom, coloured by kind), the
+/// multi-line script input and Run/Clear. Run — the button or ⌘/Ctrl+Enter while typing — hands the
+/// input to the script runner; Clear only empties the log. The input text and log are UI state.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let input_h = 86.0;
@@ -110,7 +113,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let mut run_now = false;
     let mut child = ui.new_child(egui::UiBuilder::new().max_rect(in_rect));
     let te = egui::TextEdit::multiline(&mut app.ui.script_console.input)
-        .id(egui::Id::new("script-console-input"))
+        .id(egui::Id::unique("script-console-input"))
         .font(Tokens::mono(12.0))
         .desired_width(in_rect.width())
         .desired_rows(4)
@@ -124,10 +127,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let bar = Rect::from_min_size(pos2(rect.min.x, rect.max.y - bar_h), vec2(rect.width(), bar_h));
     let run_r = Rect::from_min_size(pos2(bar.max.x - 64.0, bar.min.y + 2.0), vec2(56.0, 20.0));
     let clear_r = Rect::from_min_size(pos2(bar.max.x - 128.0, bar.min.y + 2.0), vec2(56.0, 20.0));
-    let run_resp = ui.interact(run_r, egui::Id::new("script-console-run"), Sense::click());
+    let run_resp = ui.interact(run_r, egui::Id::unique("script-console-run"), Sense::click());
     p.rect_filled(run_r, 3.0, if run_resp.hovered() { t.accent_hover } else { t.accent });
     p.text(run_r.center(), Align2::CENTER_CENTER, tr("Run"), Tokens::ui(12.0), egui::Color32::WHITE);
-    let clear_resp = ui.interact(clear_r, egui::Id::new("script-console-clear"), Sense::click());
+    let clear_resp = ui.interact(clear_r, egui::Id::unique("script-console-clear"), Sense::click());
     p.rect_stroke(clear_r, 3.0, egui::Stroke::new(1.0, t.field_border), egui::StrokeKind::Inside);
     p.text(clear_r.center(), Align2::CENTER_CENTER, tr("Clear"), Tokens::ui(12.0), t.text);
     app.auto.add("scriptConsole.run", run_r, "Run");
diff --git a/crates/ui-egui/src/panels/scriptui_view.rs b/crates/ui-egui/src/panels/scriptui_view.rs
index f0a3975fc..242626272 100644
--- a/crates/ui-egui/src/panels/scriptui_view.rs
+++ b/crates/ui-egui/src/panels/scriptui_view.rs
@@ -15,7 +15,7 @@ use egui::{Align2, Color32, Rect, Sense, Stroke, StrokeKind, UiBuilder, pos2, ve
 use serde_json::{Value, json};
 
 use crate::EffectcraftApp;
-use crate::dock::PanelKind;
+use crate::dock::{PanelKind, WorkspaceExt as _};
 use crate::theme::Tokens;
 
 enum Act {
@@ -51,7 +51,7 @@ fn draw_children(app: &mut EffectcraftApp, ui: &mut egui::Ui, origin: egui::Pos2
             let tw = (tab.text.chars().count() as f32 * 7.0 + 20.0).max(48.0);
             let hr = Rect::from_min_size(pos2(x, r.min.y), vec2(tw, 22.0));
             let active = i == w.active_tab;
-            let resp = ui.interact(hr, egui::Id::new(("sui-tab", win, tab.id)), Sense::click());
+            let resp = ui.interact(hr, egui::Id::unique(("sui-tab", win, tab.id)), Sense::click());
             ui.painter().rect_filled(
                 hr,
                 3.0,
@@ -81,12 +81,17 @@ fn draw_children(app: &mut EffectcraftApp, ui: &mut egui::Ui, origin: egui::Pos2
     }
 }
 
+/// Draws ScriptUI widget `w` of window `win` at its bounds offset by `origin`, registering it for
+/// automation, and recurses into containers. Widgets with an `onDraw` handler are painted by the
+/// script (replacing the default look, or on top of it when it called `drawOSControl()`) while
+/// buttons, checkboxes and radios still take clicks. Edits and clicks are appended to `acts` for
+/// [`perform`]; while a field or slider is in use its live value lives in egui temp data.
 fn draw_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, origin: egui::Pos2, win: u32, w: &Widget, acts: &mut Vec<Act>) {
     let t = app.tokens;
     let services = app.session.services.clone();
     let rect = rect_of(origin, w.bounds);
     register(app, win, w, rect);
-    let id = egui::Id::new(("sui", win, w.id));
+    let id = egui::Id::unique(("sui", win, w.id));
     let tip = |r: egui::Response| if w.help_tip.is_empty() { r } else { r.on_hover_text(&w.help_tip) };
     // onDraw: the script paints the control. Without drawOSControl() its paint replaces the
     // default look (buttons and toggles still respond to clicks); with it, it goes on top.
@@ -209,7 +214,7 @@ fn draw_widget(app: &mut EffectcraftApp, ui: &mut egui::Ui, origin: egui::Pos2,
             let mut pick: Option<usize> = None;
             ui.add_enabled_ui(w.enabled, |ui| {
                 ui.scope_builder(UiBuilder::new().max_rect(rect), |ui| {
-                    egui::ComboBox::from_id_salt(id).selected_text(cur).width(rect.width() - 8.0).show_ui(ui, |ui| {
+                    craft_ui::ComboBox::from_id_salt(id).selected_text(cur).width(rect.width() - 8.0).show_ui(ui, |ui| {
                         for (i, it) in w.items.iter().enumerate() {
                             if it == "-" {
                                 ui.separator();
@@ -316,7 +321,7 @@ fn paint_draw(ui: &egui::Ui, rect: Rect, ops: &[DrawOp], t: &Tokens, services: &
 /// A ScriptUIImage as a texture (decoded once and kept; `None` when it can't be read or
 /// decoded).
 fn image_texture(ctx: &egui::Context, img: &ImageRef, services: &dyn Services) -> Option<egui::TextureHandle> {
-    let id = egui::Id::new(("scriptui-image", img));
+    let id = egui::Id::unique(("scriptui-image", img));
     if let Some(cached) = ctx.data(|d| d.get_temp::<Option<egui::TextureHandle>>(id)) {
         return cached;
     }
@@ -382,7 +387,7 @@ fn wants_mouse(w: &Widget, depth: usize) -> bool {
 /// same control; it replaces the plain click the control reported, so a checkbox toggles once).
 /// Only events a listener wants are sent; none while `active` is false (a modal dialog is up).
 fn mouse_events(ui: &egui::Ui, origin: egui::Pos2, area: Rect, win: u32, root: &Widget, active: bool, acts: &mut Vec<Act>) {
-    let id = egui::Id::new(("sui-mouse", win));
+    let id = egui::Id::unique(("sui-mouse", win));
     if !wants_mouse(root, 0) {
         ui.data_mut(|d| d.remove::<MouseTrack>(id));
         return;
@@ -471,6 +476,9 @@ fn snug(r: Rect, text: &str) -> Rect {
     Rect::from_min_size(r.min, vec2(w, r.height()))
 }
 
+/// Runs the actions collected while drawing a ScriptUI window as `scriptui.*` commands, in order.
+/// A reply carrying an `error` becomes a toast with the script's message; otherwise a non-empty
+/// `output` becomes the status line (its last line). Command failures also go to `app.ui.status`.
 fn perform(app: &mut EffectcraftApp, ctx: &egui::Context, acts: Vec<Act>) {
     for a in acts {
         let (cmd, p) = match a {
@@ -490,7 +498,7 @@ fn perform(app: &mut EffectcraftApp, ctx: &egui::Context, acts: Vec<Act>) {
             Ok(r) => {
                 if let Some(e) = r.get("error").filter(|e| !e.is_null()) {
                     let msg = e["message"].as_str().unwrap_or("script error").to_string();
-                    app.toast = Some((msg, ctx.input(|i| i.time)));
+                    app.toast = Some((msg, app.now()));
                 } else if let Some(o) = r["output"].as_str().filter(|o| !o.is_empty()) {
                     app.ui.status = o.lines().last().unwrap_or_default().to_string();
                 }
@@ -512,7 +520,7 @@ pub fn show_windows(app: &mut EffectcraftApp, ctx: &egui::Context) {
     let blocked = windows.iter().any(|w| w.modal);
     if blocked {
         // A modal dialog blocks the app behind it, as in After Effects.
-        let r = egui::Area::new(egui::Id::new("scriptui-modal-block")).order(egui::Order::Middle).fixed_pos(screen.min).show(ctx, |ui| {
+        let r = egui::Area::new(egui::Id::unique("scriptui-modal-block")).order(egui::Order::Middle).fixed_pos(screen.min).show(ctx, |ui| {
             ui.allocate_exact_size(screen.size(), Sense::click_and_drag());
             ui.painter().rect_filled(screen, 0.0, Color32::from_black_alpha(90));
         });
@@ -523,7 +531,7 @@ pub fn show_windows(app: &mut EffectcraftApp, ctx: &egui::Context) {
         let mut open = true;
         let order = if w.modal { egui::Order::Foreground } else { egui::Order::Middle };
         let resp = egui::Window::new(if w.title.is_empty() { &w.script } else { &w.title })
-            .id(egui::Id::new(("scriptui-window", w.id)))
+            .id(egui::Id::unique(("scriptui-window", w.id)))
             .order(order)
             .collapsible(false)
             .resizable(false)
@@ -546,7 +554,7 @@ pub fn show_windows(app: &mut EffectcraftApp, ctx: &egui::Context) {
     perform(app, ctx, acts);
 }
 
-/// A dockable ScriptUI panel's content (Window ▸ <panel>.jsx).
+/// A dockable ScriptUI panel's content (Window ▸ `<panel>.jsx`).
 pub fn panel(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, id: u32) {
     let t = app.tokens;
     let Some(mut w) = app.session.script_ui.window(id).cloned() else {
@@ -579,12 +587,7 @@ pub fn panel_title(app: &EffectcraftApp, id: u32) -> Option<String> {
 /// Close the dock panels whose script window has gone (the script closed it, or a saved
 /// workspace from an earlier run).
 pub fn sync_panels(app: &mut EffectcraftApp) {
-    let mut all = vec![];
-    app.ui.dock.panels(&mut all);
-    for f in &app.ui.floating {
-        all.extend(f.panels.iter().copied());
-    }
-    for p in all {
+    for p in app.ui.dock.panels() {
         if let PanelKind::ScriptPanel(id) = p
             && app.session.script_ui.window(id).is_none()
         {
diff --git a/crates/ui-egui/src/panels/settings.rs b/crates/ui-egui/src/panels/settings.rs
index 28a7c0142..692f48236 100644
--- a/crates/ui-egui/src/panels/settings.rs
+++ b/crates/ui-egui/src/panels/settings.rs
@@ -78,7 +78,7 @@ fn page_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, page: &Page, cur: &Value
                 ui.horizontal(|ui| {
                     ui.add_sized(vec2(label_w, 18.0), egui::Label::new(tr("Default Output:")));
                     let shown = if sel.is_empty() { tr("System Default").to_string() } else { sel.clone() };
-                    let r = egui::ComboBox::from_id_salt(("settings", key)).selected_text(shown).width(260.0).show_ui(ui, |ui| {
+                    let r = craft_ui::ComboBox::from_id_salt(("settings", key)).selected_text(shown).width(260.0).show_ui(ui, |ui| {
                         if ui.selectable_label(sel.is_empty(), tr("System Default")).clicked() {
                             acts.push(Act::Set(key.into(), json!("")));
                         }
@@ -157,7 +157,7 @@ fn page_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, page: &Page, cur: &Value
                                 Kind::Choice(opts) => {
                                     let curv = v.as_str().map_or_else(|| v.to_string(), str::to_string);
                                     let shown = opts.iter().find(|o| o.1 == curv).map(|o| o.0).unwrap_or(curv.as_str()).to_string();
-                                    egui::ComboBox::from_id_salt(("settings", key))
+                                    craft_ui::ComboBox::from_id_salt(("settings", key))
                                         .selected_text(tr(&shown))
                                         .width(220.0)
                                         .show_ui(ui, |ui| {
@@ -302,19 +302,20 @@ fn theme_preview(ui: &mut egui::Ui, kind: ThemeKind, width: f32) {
     painter.line_segment([pos2(cti, graph.top()), pos2(cti, graph.bottom())], egui::Stroke::new(1.0, p.cti));
 }
 
+/// What [`theme_card`] shows: the setting `key`, the translated `title`, whether the family is
+/// `active`, the `cur`rent theme and the `options` (value, label) to pick from.
+struct ThemeFamily<'a> {
+    key: &'a str,
+    title: &'a str,
+    active: bool,
+    cur: &'a str,
+    options: &'a [(&'a str, &'a str)],
+}
+
 /// One theme family's card: its (translated) name, Active when the appearance shows it now, a preview of the
 /// chosen theme and a radio button per theme.
-fn theme_card(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    t: &Tokens,
-    key: &str,
-    title: &str,
-    active: bool,
-    cur: &str,
-    options: &[(&str, &str)],
-    acts: &mut Vec<Act>,
-) {
+fn theme_card(app: &mut EffectcraftApp, ui: &mut egui::Ui, t: &Tokens, fam: ThemeFamily, acts: &mut Vec<Act>) {
+    let ThemeFamily { key, title, active, cur, options } = fam;
     egui::Frame::new()
         .fill(t.field_bg)
         .stroke(egui::Stroke::new(1.0, if active { t.accent } else { t.field_border }))
@@ -346,7 +347,7 @@ fn theme_card(
                         let favorite = favorites.iter().any(|id| id == value);
                         let tip = tr(if favorite { "Remove from favorites" } else { "Add to favorites" });
                         let r = ui.add_visible(favorite || hovered, egui::Button::new("").min_size(vec2(24.0, 24.0)).frame(false)).on_hover_text(tip);
-                        r.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, format!("{}: {}", tip, tr(label))));
+                        r.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, format!("{}: {}", tip, tr(label))));
                         reg(app, &format!("settings.appearance.favoriteThemes.{value}"), &r, tip);
                         if favorite || hovered {
                             crate::icons::paint(
@@ -378,7 +379,7 @@ fn appearance_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, cur: &Value, t: &T
     ui.horizontal(|ui| {
         ui.add_sized(vec2(250.0, 18.0), egui::Label::new(format!("{}:", tr("Appearance Mode"))).truncate());
         let shown = APPEARANCE_MODES.iter().find(|(_, v)| *v == mode).map_or(mode.as_str(), |(l, _)| *l);
-        let r = egui::ComboBox::from_id_salt(("settings", "appearance.appearanceMode"))
+        let r = craft_ui::ComboBox::from_id_salt(("settings", "appearance.appearanceMode"))
             .selected_text(tr(shown))
             .width(220.0)
             .show_ui(ui, |ui| {
@@ -396,8 +397,20 @@ fn appearance_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, cur: &Value, t: &T
     let light_active = mode == "light" || (mode == "auto" && system_light == Some(true));
     ui.columns(2, |cols| {
         let [l, d] = cols else { return };
-        theme_card(app, l, t, "appearance.lightTheme", tr("Light Theme"), light_active, &light, LIGHT_THEMES, acts);
-        theme_card(app, d, t, "appearance.darkTheme", tr("Dark Theme"), !light_active, &dark, DARK_THEMES, acts);
+        theme_card(
+            app,
+            l,
+            t,
+            ThemeFamily { key: "appearance.lightTheme", title: tr("Light Theme"), active: light_active, cur: &light, options: LIGHT_THEMES },
+            acts,
+        );
+        theme_card(
+            app,
+            d,
+            t,
+            ThemeFamily { key: "appearance.darkTheme", title: tr("Dark Theme"), active: !light_active, cur: &dark, options: DARK_THEMES },
+            acts,
+        );
     });
     ui.add_space(6.0);
 }
@@ -589,6 +602,7 @@ fn browser_storage_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, t: &Tokens, a
     ui.ctx().request_repaint_after(std::time::Duration::from_secs(1));
 }
 
+/// Draw the editable label colors and names in Settings.
 fn labels_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, cur: &Value, acts: &mut Vec<Act>) {
     ui.label(tr("Label Colors and Names:"));
     ui.add_space(4.0);
@@ -622,6 +636,7 @@ fn labels_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, cur: &Value, acts: &mu
     }
 }
 
+/// Draw the Settings dialog, including its translated page list and the selected page's controls.
 pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
     let all = pages();
     let mut page = app.dialog_state.settings_page.clone();
@@ -661,28 +676,35 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         {
             let ui = &mut body;
             // Page list (left, like After Effects).
+            let widest_page = all
+                .iter()
+                .map(|p| ui.painter().layout_no_wrap(crate::i18n::settings_page_title(p.title).to_owned(), Tokens::ui(12.5), t.text).size().x)
+                .fold(0.0_f32, f32::max);
+            let page_width = (widest_page + 20.0).max(176.0).min((ui.available_width() * 0.42).min(300.0));
             ui.vertical(|ui| {
-                ui.set_width(180.0);
+                ui.set_width(page_width + 4.0);
                 egui::ScrollArea::vertical().id_salt("settings-pages").max_height(body_h).auto_shrink([false, false]).show(ui, |ui| {
                     // The rows touch, so the pointer never falls between two of them.
                     ui.spacing_mut().item_spacing.y = 0.0;
                     for p in &all {
-                        let (r, resp) = ui.allocate_exact_size(vec2(176.0, 24.0), egui::Sense::click());
+                        let (r, resp) = ui.allocate_exact_size(vec2(page_width, 24.0), egui::Sense::click());
                         let sel = page == p.id;
                         if sel {
                             ui.painter().rect_filled(r, 3.0, t.accent);
                         } else if resp.hovered() {
                             ui.painter().rect_filled(r, 3.0, t.hover);
                         }
-                        ui.painter().text(
+                        crate::widgets::text_fit(
+                            ui.painter(),
                             r.left_center() + vec2(10.0, 0.0),
                             egui::Align2::LEFT_CENTER,
-                            tr(p.title),
+                            crate::i18n::settings_page_title(p.title),
                             Tokens::ui(12.5),
+                            (page_width - 20.0).max(0.0),
                             if sel { Color32::WHITE } else { t.text },
                         );
                         app.auto.add(&format!("settings.page.{}", p.id), r, p.title);
-                        if resp.clicked() {
+                        if resp.on_hover_text(crate::i18n::settings_page_title(p.title)).clicked() {
                             page = p.id.to_string();
                         }
                     }
@@ -694,7 +716,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
                 // dialog scrolled sideways a little (#284).
                 ui.set_width(ui.available_width());
                 let p = &all[idx];
-                ui.label(RichText::new(tr(p.title)).font(Tokens::semibold(14.0)).color(t.tab_text_active));
+                ui.label(RichText::new(crate::i18n::settings_page_title(p.title)).font(Tokens::semibold(14.0)).color(t.tab_text_active));
                 ui.add_space(6.0);
                 egui::ScrollArea::vertical().max_height((body_h - 30.0).max(0.0)).auto_shrink([false, false]).show(ui, |ui| {
                     page_ui(app, ui, p, &cur, t, &mut acts);
diff --git a/crates/ui-egui/src/panels/shortcut_editor.rs b/crates/ui-egui/src/panels/shortcut_editor.rs
index 440ca6394..2721c6750 100644
--- a/crates/ui-egui/src/panels/shortcut_editor.rs
+++ b/crates/ui-egui/src/panels/shortcut_editor.rs
@@ -200,6 +200,12 @@ const SIDE_KEYS: &[(&str, &str, f32, f32)] = &[
     ("→", "ArrowRight", 2.0, 5.0),
 ];
 
+/// The Keyboard Shortcuts dialog: while a shortcut field listens it records the next key
+/// combination (dropping those key events so the field does not type them), the preset bar switches
+/// keymaps, the drawn keyboard lists what the selected key runs, and the command list and editor
+/// remove, assign and reset bindings, warning about conflicts. Enter is OK unless a rename field, a
+/// preset menu or the delete confirmation is open. The collected `shortcuts.*` commands are run
+/// with the session when the frame ends; OK closes the dialog.
 pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
     let mut st = std::mem::take(&mut app.dialog_state.shortcuts);
     let mut run: Vec<(String, Value)> = vec![];
@@ -258,7 +264,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         // ---- preset bar
         ui.horizontal(|ui| {
             ui.label(tr("Preset:"));
-            let r = egui::ComboBox::from_id_salt("sc-preset").selected_text(&active).width(220.0).show_ui(ui, |ui| {
+            let r = craft_ui::ComboBox::from_id_salt("sc-preset").selected_text(&active).width(220.0).show_ui(ui, |ui| {
                 for n in &presets {
                     if ui.selectable_label(*n == active, n).clicked() {
                         run.push(("shortcuts.preset".into(), json!({"op": "select", "name": n})));
@@ -377,7 +383,7 @@ pub fn show(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
             }
             let id = format!("shortcuts.key.{}", name.trim_start_matches('#'));
             app.auto.add(&id, r, label);
-            let resp = ui.interact(r, egui::Id::new(("sc-key", name, r.min.x as i32)), Sense::click());
+            let resp = ui.interact(r, egui::Id::unique(("sc-key", name, r.min.x as i32)), Sense::click());
             if resp.clicked() {
                 if let Some(i) = mod_idx {
                     st.mods[i] = !st.mods[i];
diff --git a/crates/ui-egui/src/panels/templates.rs b/crates/ui-egui/src/panels/templates.rs
index ec65ee6d7..ff8778a15 100644
--- a/crates/ui-egui/src/panels/templates.rs
+++ b/crates/ui-egui/src/panels/templates.rs
@@ -69,7 +69,7 @@ pub fn home_tab(app: &mut EffectcraftApp, ui: &mut egui::Ui, area: Rect) {
     // Save the open project as a user template.
     let can_save = app.session.project.comps().next().is_some();
     let sr = Rect::from_min_size(pos2(area.max.x - 210.0, y - 4.0), vec2(210.0, 28.0));
-    let save = widgets::text_button(ui, sr, "Save Current as Template…", false, &t, egui::Id::new("home-templates-save")).clicked();
+    let save = widgets::text_button(ui, sr, "Save Current as Template…", false, &t, egui::Id::unique("home-templates-save")).clicked();
     app.auto.add("home.templates.saveCurrent", sr, "Save Current as Template…");
     if save {
         if can_save {
@@ -101,7 +101,7 @@ pub fn home_tab(app: &mut EffectcraftApp, ui: &mut egui::Ui, area: Rect) {
             let (cx, cy) = (full.min.x + (i % cols) as f32 * (card_w + gap), full.min.y + (i / cols) as f32 * (card_h + gap));
             let r = Rect::from_min_size(pos2(cx, cy), vec2(card_w, card_h));
             let visible = r.intersects(ui.clip_rect());
-            let resp = ui.interact(r, egui::Id::new(("template-card", &tpl.id)), Sense::click()).on_hover_text(&tpl.description);
+            let resp = ui.interact(r, egui::Id::unique(("template-card", &tpl.id)), Sense::click()).on_hover_text(&tpl.description);
             p.rect_filled(r, 8.0, if resp.hovered() { Color32::from_rgb(0x2c, 0x2e, 0x37) } else { Color32::from_rgb(0x24, 0x26, 0x2e) });
             let tr = Rect::from_min_size(r.min, vec2(card_w, thumb_h));
             let tex = if visible { thumb(app, &ctx, &tpl.id, &mut budget) } else { None };
@@ -137,7 +137,7 @@ pub fn home_tab(app: &mut EffectcraftApp, ui: &mut egui::Ui, area: Rect) {
             let mut del_hit = false;
             if !tpl.builtin {
                 let dr = Rect::from_min_size(pos2(tr.max.x - 30.0, tr.min.y + 6.0), vec2(24.0, 24.0));
-                let dresp = ui.interact(dr, egui::Id::new(("template-del", &tpl.id)), Sense::click()).on_hover_text(crate::i18n::tr("Delete this template"));
+                let dresp = ui.interact(dr, egui::Id::unique(("template-del", &tpl.id)), Sense::click()).on_hover_text(crate::i18n::tr("Delete this template"));
                 if resp.hovered() || dresp.hovered() {
                     p.circle_filled(dr.center(), 12.0, if dresp.hovered() { Color32::from_rgb(0xc0, 0x3a, 0x3a) } else { Color32::from_black_alpha(170) });
                     icons::paint(&p, dr.shrink(6.0), Icon::Close, Color32::WHITE);
diff --git a/crates/ui-egui/src/panels/text_panels.rs b/crates/ui-egui/src/panels/text_panels.rs
index ae2294f1f..8a8e604e2 100644
--- a/crates/ui-egui/src/panels/text_panels.rs
+++ b/crates/ui-egui/src/panels/text_panels.rs
@@ -61,9 +61,13 @@ pub fn text_target(app: &EffectcraftApp) -> Option<TextTarget> {
     effectcraft_engine::render::text::source_text(&ectx, layer).map(|d| TextTarget { layer: layer.id.0, doc: d, range: None })
 }
 
-fn toggle(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, r: Rect, id: &str, label: &str, on: bool, bold: bool) -> bool {
+/// A small toggle button at `r` showing `label` (semibold 13 when `bold`, else 12), filled with
+/// the accent while `on`; returns whether it was clicked. It only reports the click: the caller
+/// decides the new state.
+fn toggle(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, r: Rect, id: &str, look: (&str, bool, bool)) -> bool {
+    let (label, on, bold) = look;
     let t = app.tokens;
-    let resp = ui.interact(r, egui::Id::new(("text-toggle", id)), Sense::click());
+    let resp = ui.interact(r, egui::Id::unique(("text-toggle", id)), Sense::click());
     p.rect_filled(
         r,
         3.0,
@@ -81,39 +85,19 @@ fn toggle(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, r: Rec
     resp.clicked()
 }
 
-pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+/// Position of the numeric grid (`x0`, top `y`, width `w`) and whether edits are collected.
+#[derive(Clone, Copy)]
+struct Grid {
+    x0: f32,
+    y: f32,
+    w: f32,
+    enabled: bool,
+}
+
+/// Numeric fields in AE's two-column grid (Kerning is a popup, at row 1 left).
+fn numeric_fields(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, g: Grid, doc: &TextDoc, actions: &mut Vec<serde_json::Value>) {
     let t = app.tokens;
-    let p = ui.painter().with_clip_rect(rect);
-    let ctx = ui.ctx().clone();
-    let target = text_target(app);
-    let enabled = target.is_some();
-    let doc = target.as_ref().map(|t| t.doc.clone()).unwrap_or_default();
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("character-scroll"), rect);
-    let top = rect.min.y + 10.0 - scroll.offset;
-    let mut y = top;
-    let x0 = rect.min.x + 10.0;
-    let w = rect.width() - 20.0;
-    let mut actions: Vec<serde_json::Value> = vec![];
-    // Font family + style.
-    let fr = Rect::from_min_size(pos2(x0, y), vec2(w, 22.0));
-    let pop = egui::Id::new("char-font-pop");
-    if let Some(f) = font_picker(app, ui, pop, fr, &doc.font, "character.font", enabled) {
-        actions.push(json!({"font": f}));
-    }
-    y += 28.0;
-    let sr = Rect::from_min_size(pos2(x0, y), vec2(w - 84.0, 22.0));
-    let spop = egui::Id::new("char-style-pop");
-    if widgets::dropdown(ui, sr, &doc.style, &t, egui::Id::new("char-style")).clicked() && enabled {
-        widgets::open_popup(ui, spop);
-    }
-    app.auto.add("character.style", sr, "Font style");
-    // The family's own styles.
-    let styles: Vec<String> = if widgets::popup_is_open(ui, spop) { effectcraft_engine::font_styles(&doc.font) } else { vec![] };
-    if let Some(st) = widgets::popup_menu(ui, spop, sr.left_bottom(), &styles, styles.iter().position(|s| *s == doc.style)).and_then(|i| styles.get(i)) {
-        actions.push(json!({"style": st}));
-    }
-    y += 34.0;
-    // Numeric fields in AE's two-column grid (Kerning is a popup, at row 1 right).
+    let Grid { x0, y, w, enabled } = g;
     let fields: [(&str, &str, f64, (f64, f64), &str); 10] = [
         ("size", "T", doc.size, (1.0, 2000.0), " px"),
         ("leading", "A", doc.leading.unwrap_or(doc.size * 1.2), (0.0, 5000.0), " px"),
@@ -135,7 +119,14 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let fx = x0 + col as f32 * (w / 2.0);
         let fy = y + row as f32 * 28.0;
         p.text(pos2(fx, fy + 9.0), Align2::LEFT_CENTER, glyph, Tokens::semibold(11.0), t.text_dim);
-        let (r, nv, _) = widgets::hot_number_at(ui, pos2(fx + 26.0, fy), egui::Id::new(("char", key)), v, 0.5, range, 0, suffix, &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(fx + 26.0, fy),
+            egui::Id::unique(("char", key)),
+            v,
+            &widgets::HotSpec { speed: 0.5, range, decimals: 0, suffix },
+            &t,
+        );
         app.auto.add(&format!("character.{key}"), r, key);
         if let Some(nv) = nv
             && enabled
@@ -143,58 +134,108 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             actions.push(json!({key: nv, "merge": format!("char-{key}")}));
         }
     }
-    // Kerning: Metrics / Optical / a manual value (row 1, left).
-    {
-        let fy = y + 28.0;
-        p.text(pos2(x0, fy + 9.0), Align2::LEFT_CENTER, "V/A", Tokens::semibold(11.0), t.text_dim);
-        let label = match doc.kerning {
-            Kerning::Metrics => "Metrics".to_string(),
-            Kerning::Optical => "Optical".to_string(),
-            Kerning::Manual(v) => format!("{v:.0}"),
+}
+
+/// Kerning: Metrics / Optical / a manual value (grid row 1, left).
+fn kerning_field(app: &mut EffectcraftApp, ui: &mut egui::Ui, p: &egui::Painter, g: Grid, doc: &TextDoc, actions: &mut Vec<serde_json::Value>) {
+    let t = app.tokens;
+    let Grid { x0, y, w, enabled } = g;
+    let fy = y + 28.0;
+    p.text(pos2(x0, fy + 9.0), Align2::LEFT_CENTER, "V/A", Tokens::semibold(11.0), t.text_dim);
+    let label = match doc.kerning {
+        Kerning::Metrics => "Metrics".to_string(),
+        Kerning::Optical => "Optical".to_string(),
+        Kerning::Manual(v) => format!("{v:.0}"),
+    };
+    let kr = Rect::from_min_size(pos2(x0 + 26.0, fy), vec2((w / 2.0 - 32.0).max(50.0), 20.0));
+    let kpop = egui::Id::unique("char-kerning-pop");
+    if widgets::dropdown(ui, kr, &label, &t, egui::Id::unique("char-kerning")).clicked() && enabled {
+        widgets::open_popup(ui, kpop);
+    }
+    app.auto.add("character.kerning", kr, "Kerning");
+    let opts: Vec<String> = ["Metrics", "Optical", "0", "-50", "-25", "-10", "10", "25", "50", "100"].iter().map(|s| s.to_string()).collect();
+    if let Some(i) = widgets::popup_menu(ui, kpop, kr.left_bottom(), &opts, None) {
+        let v = match i {
+            0 => json!("metrics"),
+            1 => json!("optical"),
+            _ => json!(opts[i].parse::<f64>().unwrap_or(0.0)),
         };
-        let kr = Rect::from_min_size(pos2(x0 + 26.0, fy), vec2((w / 2.0 - 32.0).max(50.0), 20.0));
-        let kpop = egui::Id::new("char-kerning-pop");
-        if widgets::dropdown(ui, kr, &label, &t, egui::Id::new("char-kerning")).clicked() && enabled {
-            widgets::open_popup(ui, kpop);
-        }
-        app.auto.add("character.kerning", kr, "Kerning");
-        let opts: Vec<String> = ["Metrics", "Optical", "0", "-50", "-25", "-10", "10", "25", "50", "100"].iter().map(|s| s.to_string()).collect();
-        if let Some(i) = widgets::popup_menu(ui, kpop, kr.left_bottom(), &opts, None) {
-            let v = match i {
-                0 => json!("metrics"),
-                1 => json!("optical"),
-                _ => json!(opts[i].parse::<f64>().unwrap_or(0.0)),
-            };
-            actions.push(json!({"kerning": v}));
-        }
+        actions.push(json!({"kerning": v}));
     }
-    // Stroke Over Fill / Fill Over Stroke (row 2, right).
-    {
-        let fx = x0 + w / 2.0;
-        let fy = y + 2.0 * 28.0;
-        let dr = Rect::from_min_size(pos2(fx, fy), vec2(w / 2.0, 20.0));
-        let labels = vec!["Fill Over Stroke".to_string(), "Stroke Over Fill".to_string()];
-        let pop = egui::Id::new("char-stroke-order-pop");
-        if widgets::dropdown(ui, dr, &labels[doc.stroke_over_fill as usize], &t, egui::Id::new("char-stroke-order")).clicked() && enabled {
-            widgets::open_popup(ui, pop);
-        }
-        app.auto.add("character.strokeOverFill", dr, "Stroke order");
-        if let Some(i) = widgets::popup_menu(ui, pop, dr.left_bottom(), &labels, Some(doc.stroke_over_fill as usize)) {
-            actions.push(json!({"strokeOverFill": i == 1}));
-        }
+}
+
+/// Stroke Over Fill / Fill Over Stroke (grid row 2, right).
+fn stroke_order_field(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: Grid, doc: &TextDoc, actions: &mut Vec<serde_json::Value>) {
+    let t = app.tokens;
+    let Grid { x0, y, w, enabled } = g;
+    let fx = x0 + w / 2.0;
+    let fy = y + 2.0 * 28.0;
+    let dr = Rect::from_min_size(pos2(fx, fy), vec2(w / 2.0, 20.0));
+    let labels = vec!["Fill Over Stroke".to_string(), "Stroke Over Fill".to_string()];
+    let pop = egui::Id::unique("char-stroke-order-pop");
+    if widgets::dropdown(ui, dr, &labels[doc.stroke_over_fill as usize], &t, egui::Id::unique("char-stroke-order")).clicked() && enabled {
+        widgets::open_popup(ui, pop);
     }
+    app.auto.add("character.strokeOverFill", dr, "Stroke order");
+    if let Some(i) = widgets::popup_menu(ui, pop, dr.left_bottom(), &labels, Some(doc.stroke_over_fill as usize)) {
+        actions.push(json!({"strokeOverFill": i == 1}));
+    }
+}
+
+/// The Character panel for the text being edited (or the selected text layer): font family and
+/// style, size, leading, tracking, stroke, scale, baseline shift and other numeric fields, kerning,
+/// fill/stroke colours with eyedroppers, style toggles, OpenType features and variable-font axes.
+/// Without a text target the panel is inert — no edit is collected and it asks for a text layer.
+/// Edits are collected and, when a target exists, sent as `layer.setText` commands scoped to the
+/// edited range; failures show in `app.ui.status`.
+pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let p = ui.painter().with_clip_rect(rect);
+    let ctx = ui.ctx().clone();
+    let target = text_target(app);
+    let enabled = target.is_some();
+    let doc = target.as_ref().map(|t| t.doc.clone()).unwrap_or_default();
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("character-scroll"), rect);
+    let top = rect.min.y + 10.0 - scroll.offset;
+    let mut y = top;
+    let x0 = rect.min.x + 10.0;
+    let w = rect.width() - 20.0;
+    let mut actions: Vec<serde_json::Value> = vec![];
+    // Font family + style.
+    let fr = Rect::from_min_size(pos2(x0, y), vec2(w, 22.0));
+    let pop = egui::Id::unique("char-font-pop");
+    if let Some(f) = font_picker(app, ui, pop, fr, &doc.font, "character.font", enabled) {
+        actions.push(json!({"font": f}));
+    }
+    y += 28.0;
+    let sr = Rect::from_min_size(pos2(x0, y), vec2(w - 84.0, 22.0));
+    let spop = egui::Id::unique("char-style-pop");
+    if widgets::dropdown(ui, sr, &doc.style, &t, egui::Id::unique("char-style")).clicked() && enabled {
+        widgets::open_popup(ui, spop);
+    }
+    app.auto.add("character.style", sr, "Font style");
+    // The family's own styles.
+    let styles: Vec<String> = if widgets::popup_is_open(ui, spop) { effectcraft_engine::font_styles(&doc.font) } else { vec![] };
+    if let Some(st) = widgets::popup_menu(ui, spop, sr.left_bottom(), &styles, styles.iter().position(|s| *s == doc.style)).and_then(|i| styles.get(i)) {
+        actions.push(json!({"style": st}));
+    }
+    y += 34.0;
+    let grid = Grid { x0, y, w, enabled };
+    numeric_fields(app, ui, &p, grid, &doc, &mut actions);
+    kerning_field(app, ui, &p, grid, &doc, &mut actions);
+    stroke_order_field(app, ui, grid, &doc, &mut actions);
     y += 5.0 * 28.0 + 8.0;
     // Fill / stroke swatches with their enable boxes.
     for (i, (key, label, on, c)) in [("fill", "Fill", doc.apply_fill, doc.fill), ("stroke", "Stroke", doc.apply_stroke, doc.stroke)].into_iter().enumerate() {
         let fx = x0 + i as f32 * (w / 2.0);
         let cr = Rect::from_min_size(pos2(fx, y + 3.0), vec2(14.0, 14.0));
-        if widgets::checkbox(ui, cr, on, &t, egui::Id::new(("char-apply", key))).clicked() && enabled {
+        if widgets::checkbox(ui, cr, on, &t, egui::Id::unique(("char-apply", key))).clicked() && enabled {
             actions.push(json!({if key == "fill" { "applyFill" } else { "applyStroke" }: !on}));
         }
         app.auto.add(&format!("character.{key}.enabled"), cr, label);
         let fs = Rect::from_min_size(pos2(fx + 20.0, y), vec2(26.0, 20.0));
-        let pop = egui::Id::new(("char-color-pop", key));
-        if widgets::swatch(ui, fs, c, egui::Id::new(("char-color", key)), &t).clicked() && enabled {
+        let pop = egui::Id::unique(("char-color-pop", key));
+        if widgets::swatch(ui, fs, c, egui::Id::unique(("char-color", key)), &t).clicked() && enabled {
             widgets::open_popup(ui, pop);
         }
         app.auto.add(&format!("character.{key}"), fs, label);
@@ -204,7 +245,7 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         let er = Rect::from_min_size(pos2(fs.max.x + 4.0, y + 1.0), vec2(18.0, 18.0));
         let active = app.ui.text_color_pick.as_ref().is_some_and(|pick| pick.layer == target.as_ref().map_or(0, |tt| tt.layer) && pick.field == key);
-        let eye = super::fx_widgets::eyedropper_button(ui, er, active, egui::Id::new(("char-eye", key)), &t);
+        let eye = super::fx_widgets::eyedropper_button(ui, er, active, egui::Id::unique(("char-eye", key)), &t);
         app.auto.add(&format!("character.{key}.eyedropper"), er, &format!("{label} eyedropper"));
         if eye.clicked() {
             if active {
@@ -233,24 +274,24 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let bw = ((w - 5.0 * 4.0) / 6.0).clamp(22.0, 30.0);
     for (i, (key, label, on, bold)) in toggles.into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + i as f32 * (bw + 4.0), y), vec2(bw, 24.0));
-        if toggle(app, ui, &p, r, &format!("character.{key}"), label, on, bold) && enabled {
+        if toggle(app, ui, &p, r, &format!("character.{key}"), (label, on, bold)) && enabled {
             actions.push(json!({key: !on}));
         }
     }
     y += 32.0;
     // Ligatures.
     let lr = Rect::from_min_size(pos2(x0, y), vec2(14.0, 14.0));
-    if widgets::checkbox(ui, lr, doc.ligatures, &t, egui::Id::new("char-ligatures")).clicked() && enabled {
+    if widgets::checkbox(ui, lr, doc.ligatures, &t, egui::Id::unique("char-ligatures")).clicked() && enabled {
         actions.push(json!({"ligatures": !doc.ligatures}));
     }
     app.auto.add("character.ligatures", lr, "Ligatures");
     p.text(pos2(x0 + 20.0, y + 7.0), Align2::LEFT_CENTER, tr("Ligatures"), Tokens::ui(11.5), t.text_dim);
     // OpenType: a popup with the font's layout features (like the Character panel's OpenType menu).
     let or = Rect::from_min_size(pos2(sr.max.x + 6.0, sr.min.y), vec2(78.0, 22.0));
-    let opop = egui::Id::new("char-opentype-pop");
+    let opop = egui::Id::unique("char-opentype-pop");
     let n_on = doc.opentype.feature_settings().len();
     let olabel = if n_on > 0 { format!("OT ({n_on})") } else { "OpenType".to_string() };
-    if widgets::dropdown(ui, or, &olabel, &t, egui::Id::new("char-opentype")).clicked() && enabled {
+    if widgets::dropdown(ui, or, &olabel, &t, egui::Id::unique("char-opentype")).clicked() && enabled {
         widgets::open_popup(ui, opop);
     }
     app.auto.add("character.opentype", or, "OpenType");
@@ -264,7 +305,7 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 .enumerate()
         {
             let cr = Rect::from_min_size(pos2(x0 + i as f32 * 120.0, y), vec2(14.0, 14.0));
-            if widgets::checkbox(ui, cr, on, &t, egui::Id::new(("char-vert", key))).clicked() && enabled {
+            if widgets::checkbox(ui, cr, on, &t, egui::Id::unique(("char-vert", key))).clicked() && enabled {
                 actions.push(json!({key: !on}));
             }
             app.auto.add(&format!("character.{key}"), cr, label);
@@ -272,8 +313,11 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
     }
     // Variable Font Axes: one value per axis of a variable font (`character.axis.<tag>`).
-    let face = effectcraft_engine::text::resolve(&doc.font, &doc.style).face;
+    let resolved = effectcraft_engine::text::resolve(&doc.font, &doc.style);
+    let face = resolved.face;
     let axes = effectcraft_engine::text::variable::font_axes(face);
+    // A named instance (`Black`) sets the axes the text doesn't set itself.
+    let instance = effectcraft_engine::text::fonts::instance_variations(&resolved);
     if !axes.is_empty() {
         y += 26.0;
         p.text(pos2(x0, y + 7.0), Align2::LEFT_CENTER, tr("Variable Font Axes"), Tokens::semibold(11.0), t.text_dim);
@@ -282,10 +326,16 @@ pub fn character(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             let fx = x0 + col as f32 * (w / 2.0);
             let fy = y + 20.0 + row as f32 * 24.0;
             let tag = a.tag.trim_end().to_string();
-            let v = doc.variations.iter().find(|(t2, _)| t2.trim_end() == tag).map(|(_, v)| *v).unwrap_or(a.default);
+            let v = doc.variations.iter().chain(&instance).find(|(t2, _)| t2.trim_end() == tag).map(|(_, v)| *v).unwrap_or(a.default);
             p.text(pos2(fx, fy + 9.0), Align2::LEFT_CENTER, &tag, Tokens::semibold(10.5), t.text_dim);
-            let (r, nv, _) =
-                widgets::hot_number_at(ui, pos2(fx + 34.0, fy), egui::Id::new(("char-axis", &tag)), v as f64, 1.0, (a.min as f64, a.max as f64), 0, "", &t);
+            let (r, nv, _) = widgets::hot_number_at(
+                ui,
+                pos2(fx + 34.0, fy),
+                egui::Id::unique(("char-axis", &tag)),
+                v as f64,
+                &widgets::HotSpec { speed: 1.0, range: (a.min as f64, a.max as f64), decimals: 0, suffix: "" },
+                &t,
+            );
             app.auto.add(&format!("character.axis.{tag}"), r, &a.name);
             if let Some(nv) = nv
                 && enabled
@@ -449,6 +499,10 @@ pub fn paint_justify_glyph(p: &egui::Painter, r: Rect, j: Justify, c: egui::Colo
     }
 }
 
+/// The Paragraph panel: alignment, left/right/first-line indents, space before and after,
+/// paragraph direction (when the text engine allows it), the composer, and Roman hanging
+/// punctuation. Edits are queued and sent as `layer.setText` for the edited range when a text
+/// target exists; failures show in `app.ui.status`.
 pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let p = ui.painter().with_clip_rect(rect);
@@ -458,7 +512,7 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let doc = target.as_ref().map(|t| t.doc.clone()).unwrap_or_default();
     let x0 = rect.min.x + 10.0;
     let w = rect.width() - 20.0;
-    let scroll = widgets::PanelScroll::begin(ui, egui::Id::new("paragraph-scroll"), rect);
+    let scroll = widgets::PanelScroll::begin(ui, egui::Id::unique("paragraph-scroll"), rect);
     let top = rect.min.y + 10.0 - scroll.offset;
     let mut y = top;
     let mut actions: Vec<serde_json::Value> = vec![];
@@ -466,7 +520,7 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     for (i, (j, key)) in ALIGNS.into_iter().enumerate() {
         let r = Rect::from_min_size(pos2(x0 + i as f32 * (bw + 3.0), y), vec2(bw, 24.0));
         let on = doc.justify == j;
-        let resp = ui.interact(r, egui::Id::new(("para", key)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("para", key)), Sense::click());
         p.rect_filled(
             r,
             3.0,
@@ -501,7 +555,14 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let fx = x0 + (i % 2) as f32 * (w / 2.0);
         let fy = y + (i / 2) as f32 * 28.0;
         p.text(pos2(fx, fy + 9.0), Align2::LEFT_CENTER, glyph, Tokens::semibold(11.0), t.text_dim);
-        let (r, nv, _) = widgets::hot_number_at(ui, pos2(fx + 26.0, fy), egui::Id::new(("para-f", key)), v, 0.5, (-5000.0, 5000.0), 0, " px", &t);
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(fx + 26.0, fy),
+            egui::Id::unique(("para-f", key)),
+            v,
+            &widgets::HotSpec { speed: 0.5, range: (-5000.0, 5000.0), decimals: 0, suffix: " px" },
+            &t,
+        );
         app.auto.add(&format!("paragraph.{key}"), r, key);
         if let Some(nv) = nv
             && enabled
@@ -518,8 +579,8 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     if world_ready || rtl {
         let dr = Rect::from_min_size(pos2(x0, y), vec2(w / 2.0 - 4.0, 22.0));
         let dirs = vec!["Left-to-Right Text".to_string(), "Right-to-Left Text".to_string()];
-        let dpop = egui::Id::new("para-direction-pop");
-        if widgets::dropdown(ui, dr, &dirs[rtl as usize], &t, egui::Id::new("para-direction")).clicked() && enabled {
+        let dpop = egui::Id::unique("para-direction-pop");
+        if widgets::dropdown(ui, dr, &dirs[rtl as usize], &t, egui::Id::unique("para-direction")).clicked() && enabled {
             widgets::open_popup(ui, dpop);
         }
         app.auto.add("paragraph.direction", dr, "Text direction");
@@ -533,9 +594,9 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     } else {
         vec!["Every-line Composer".to_string(), "Single-line Composer".to_string()]
     };
-    let cpop = egui::Id::new("para-composer-pop");
+    let cpop = egui::Id::unique("para-composer-pop");
     let single = doc.composer == Composer::SingleLine;
-    if widgets::dropdown(ui, cr, &comps[single as usize], &t, egui::Id::new("para-composer")).clicked() && enabled {
+    if widgets::dropdown(ui, cr, &comps[single as usize], &t, egui::Id::unique("para-composer")).clicked() && enabled {
         widgets::open_popup(ui, cpop);
     }
     app.auto.add("paragraph.composer", cr, "Composer");
@@ -544,7 +605,7 @@ pub fn paragraph(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
     y += 30.0;
     let hr = Rect::from_min_size(pos2(x0, y), vec2(14.0, 14.0));
-    if widgets::checkbox(ui, hr, doc.hanging_punctuation, &t, egui::Id::new("para-hanging")).clicked() && enabled {
+    if widgets::checkbox(ui, hr, doc.hanging_punctuation, &t, egui::Id::unique("para-hanging")).clicked() && enabled {
         actions.push(json!({"hangingPunctuation": !doc.hanging_punctuation}));
     }
     app.auto.add("paragraph.hangingPunctuation", hr, "Roman Hanging Punctuation");
@@ -607,7 +668,10 @@ pub(super) fn font_picker(app: &mut EffectcraftApp, ui: &mut egui::Ui, id: egui:
         search.request_focus();
     }
     ui.memory_mut(|m| m.set_focus_lock_filter(search_id, egui::EventFilter { vertical_arrows: true, escape: true, ..Default::default() }));
-    if widgets::icon_button(ui, arrow, crate::icons::Icon::ChevronDown, false, &t, id.with("arrow")).clicked() {
+    if widgets::icon_button(ui, arrow, crate::icons::Icon::ChevronDown, false, &t, id.with("arrow"))
+        .on_hover_text(crate::i18n::tr("Close font search"))
+        .clicked()
+    {
         ui.data_mut(|d| {
             d.insert_temp(id.with("open"), false);
             d.remove::<FontSearch>(state_id);
@@ -616,130 +680,131 @@ pub(super) fn font_picker(app: &mut EffectcraftApp, ui: &mut egui::Ui, id: egui:
         return None;
     }
     app.auto.add(&format!("{auto}.toggle"), arrow, "Close font list");
-    let mut chosen = None;
-    let screen = ui.ctx().content_rect();
-    let below = screen.bottom() - rect.bottom() - 16.0;
-    let above = below < 100.0 && rect.top() - screen.top() > below;
-    let max_height = (if above { rect.top() - screen.top() - 16.0 } else { below }).clamp(28.0, 380.0);
-    let anchor = if above { rect.left_top() } else { rect.left_bottom() };
-    let pivot = if above { Align2::LEFT_BOTTOM } else { Align2::LEFT_TOP };
     widgets::note_open_popup_list(ui.ctx());
-    let area = egui::Area::new(id.with("area")).order(egui::Order::Foreground).pivot(pivot).fixed_pos(anchor).show(ui.ctx(), |ui| {
-        egui::Frame::popup(ui.style()).show(ui, |ui| {
-            ui.set_width(rect.width().max(180.0));
-            // Filter row: a checkbox that keeps only the variable fonts.
-            let filter_h = 22.0;
-            let row = ui.add_sized([ui.available_width(), filter_h], egui::Button::selectable(false, ""));
-            let box_rect = Rect::from_min_size(row.rect.min, vec2(18.0, filter_h));
-            let label_rect = Rect::from_min_max(pos2(box_rect.max.x + 2.0, row.rect.min.y), row.rect.max);
-            let boxed = widgets::checkbox(ui, box_rect, only_variable, &t, id.with("variable-check"));
-            ui.painter().text(label_rect.left_center(), Align2::LEFT_CENTER, tr("Variable fonts only"), Tokens::ui(11.5), t.text);
-            app.auto.add(&format!("{auto}.variable"), row.rect, "Variable fonts only");
-            let toggled = row.clicked() || boxed.clicked();
-            if toggled {
-                only_variable = !only_variable;
-                ui.data_mut(|d| d.insert_temp(variable_id, only_variable));
-                // Typing goes on into the search field.
-                ui.memory_mut(|m| m.request_focus(search_id));
+    let changed = search.changed();
+    let mut open = true;
+    // The search lives in the field; the menu's header is the filter row, its list the fonts.
+    let menu = craft_ui::combo::Menu::new(ui, &search)
+        .open(&mut open)
+        .height(380.0)
+        .close_behavior(egui::PopupCloseBehavior::CloseOnClickOutside)
+        .style(egui::style::StyleModifier::default());
+    let app_ref = &mut *app;
+    let header = |ui: &mut egui::Ui| {
+        ui.set_width(rect.width().max(180.0));
+        // Filter row: a checkbox that keeps only the variable fonts.
+        let filter_h = 22.0;
+        let row = ui.add_sized([ui.available_width(), filter_h], egui::Button::selectable(false, ""));
+        let box_rect = Rect::from_min_size(row.rect.min, vec2(18.0, filter_h));
+        let label_rect = Rect::from_min_max(pos2(box_rect.max.x + 2.0, row.rect.min.y), row.rect.max);
+        let boxed = widgets::checkbox(ui, box_rect, only_variable, &t, id.with("variable-check"));
+        ui.painter().text(label_rect.left_center(), Align2::LEFT_CENTER, tr("Variable fonts only"), Tokens::ui(11.5), t.text);
+        app_ref.auto.add(&format!("{auto}.variable"), row.rect, "Variable fonts only");
+        let toggled = row.clicked() || boxed.clicked();
+        if toggled {
+            only_variable = !only_variable;
+            ui.data_mut(|d| d.insert_temp(variable_id, only_variable));
+            // Typing goes on into the search field.
+            ui.memory_mut(|m| m.request_focus(search_id));
+        }
+        let query = state.query.trim().to_lowercase();
+        let mut seen = std::collections::HashSet::new();
+        let filtered: Vec<_> = rows
+            .iter()
+            .filter(|r| {
+                !r.family.is_empty()
+                    && (!only_variable || r.variable)
+                    && (query.is_empty() || ((r.family.to_lowercase().contains(&query) || r.display.to_lowercase().contains(&query)) && seen.insert(&r.family)))
+            })
+            .collect();
+        if fresh {
+            state.selected = filtered.iter().position(|r| r.family == current).unwrap_or(0);
+        }
+        if changed || toggled {
+            state.selected = 0;
+        }
+        let last = filtered.len().saturating_sub(1);
+        state.selected = state.selected.min(last);
+        if down {
+            state.selected = state.selected.saturating_add(1).min(last);
+        }
+        if up {
+            state.selected = state.selected.saturating_sub(1);
+        }
+        let entered = if enter { filtered.get(state.selected).map(|r| r.family.clone()) } else { None };
+        (app_ref, filtered, query.is_empty(), state.selected, changed || toggled, entered)
+    };
+    let list = |ui: &mut egui::Ui,
+                (app, filtered, all, selected, restart, entered): (
+        &mut EffectcraftApp,
+        Vec<&effectcraft_engine::FontRow>,
+        bool,
+        usize,
+        bool,
+        Option<String>,
+    )| {
+        if restart {
+            ui.scroll_to_cursor(Some(egui::Align::TOP));
+        }
+        let mut chosen = entered;
+        if filtered.is_empty() {
+            let r = ui.label(tr("No matching fonts"));
+            app.auto.add(&format!("{auto}.empty"), r.rect, "No matching fonts");
+        }
+        let mut was_recent = false;
+        for (index, r) in filtered.iter().enumerate() {
+            if all && was_recent && !r.recent {
+                ui.separator();
             }
-            let query = state.query.trim().to_lowercase();
-            let mut seen = std::collections::HashSet::new();
-            let filtered: Vec<_> = rows
-                .iter()
-                .filter(|r| {
-                    !r.family.is_empty()
-                        && (!only_variable || r.variable)
-                        && (query.is_empty()
-                            || ((r.family.to_lowercase().contains(&query) || r.display.to_lowercase().contains(&query)) && seen.insert(&r.family)))
-                })
-                .collect();
-            if fresh {
-                state.selected = filtered.iter().position(|r| r.family == current).unwrap_or(0);
+            was_recent = r.recent;
+            let row_width = ui.available_width();
+            let label_width = if preview { (row_width - 100.0).max(40.0) } else { row_width };
+            let resp = ui.add_sized([row_width, 24.0], egui::Button::selectable(index == selected, ""));
+            resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, ui.is_enabled(), index == selected, &r.display));
+            let label_rect = Rect::from_min_size(resp.rect.min + vec2(5.0, 0.0), vec2(label_width - 5.0, resp.rect.height()));
+            ui.painter().with_clip_rect(label_rect.intersect(ui.clip_rect())).text(
+                label_rect.left_center(),
+                Align2::LEFT_CENTER,
+                &r.display,
+                Tokens::ui(12.0),
+                t.text,
+            );
+            if ui.is_rect_visible(resp.rect) {
+                app.auto.add(&format!("{auto}.option.{}", r.family), resp.rect, &r.display);
             }
-            if search.changed() || toggled {
-                state.selected = 0;
+            if index == selected && (fresh || up || down) {
+                resp.scroll_to_me(None);
             }
-            let last = filtered.len().saturating_sub(1);
-            state.selected = state.selected.min(last);
-            if down {
-                state.selected = state.selected.saturating_add(1).min(last);
-            }
-            if up {
-                state.selected = state.selected.saturating_sub(1);
-            }
-            if enter {
-                chosen = filtered.get(state.selected).map(|r| r.family.clone());
-            }
-            // Give the result list its actual height even when the previous query had
-            // only one row. A cached tiny Area must not collapse a reopened long list.
-            let filter_room = filter_h + ui.spacing().item_spacing.y;
-            let height = (filtered.len() as f32 * (24.0 + ui.spacing().item_spacing.y) + 16.0).clamp(28.0, (max_height - filter_room).max(28.0));
-            // A minimum, from below the filter row (a maximum would move the cursor back up).
-            ui.set_min_height(height);
-            let mut scroll = egui::ScrollArea::vertical().id_salt(id.with("results")).max_height(height).min_scrolled_height(height);
-            if search.changed() || toggled {
-                scroll = scroll.vertical_scroll_offset(0.0);
-            }
-            scroll.show(ui, |ui| {
-                if filtered.is_empty() {
-                    let r = ui.label(tr("No matching fonts"));
-                    app.auto.add(&format!("{auto}.empty"), r.rect, "No matching fonts");
+            if preview && ui.is_rect_visible(resp.rect) {
+                let key = egui::Id::unique(("font-preview", &r.family));
+                let lines: std::sync::Arc<Vec<Vec<[f32; 2]>>> = match ui.data(|d| d.get_temp(key)) {
+                    Some(l) => l,
+                    None => {
+                        let l = std::sync::Arc::new(effectcraft_engine::font_preview(&r.family, 14.0));
+                        ui.data_mut(|d| d.insert_temp(key, l.clone()));
+                        l
+                    }
+                };
+                // Scaled and placed to fit the row's preview column, and clipped to the row (#577).
+                let room = Rect::from_min_max(pos2(resp.rect.max.x - 95.0, resp.rect.min.y + 1.0), pos2(resp.rect.max.x - 6.0, resp.rect.max.y - 1.0));
+                if let Some((k, o)) = fit_preview(&lines, room, resp.rect.center().y + 5.0) {
+                    let painter = ui.painter().with_clip_rect(resp.rect.intersect(ui.clip_rect()));
+                    for poly in lines.iter() {
+                        let pts: Vec<egui::Pos2> =
+                            poly.iter().filter(|p| p[0].is_finite() && p[1].is_finite()).map(|p| (o + vec2(p[0], p[1]) * k).to_pos2()).collect();
+                        painter.add(egui::Shape::line(pts, egui::Stroke::new(1.0, t.text_dim)));
+                    }
                 }
-                let mut was_recent = false;
-                for (index, r) in filtered.iter().enumerate() {
-                    if query.is_empty() && was_recent && !r.recent {
-                        ui.separator();
-                    }
-                    was_recent = r.recent;
-                    let row_width = ui.available_width();
-                    let label_width = if preview { (row_width - 100.0).max(40.0) } else { row_width };
-                    let resp = ui.add_sized([row_width, 24.0], egui::Button::selectable(index == state.selected, ""));
-                    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, ui.is_enabled(), index == state.selected, &r.display));
-                    let label_rect = Rect::from_min_size(resp.rect.min + vec2(5.0, 0.0), vec2(label_width - 5.0, resp.rect.height()));
-                    ui.painter().with_clip_rect(label_rect.intersect(ui.clip_rect())).text(
-                        label_rect.left_center(),
-                        Align2::LEFT_CENTER,
-                        &r.display,
-                        Tokens::ui(12.0),
-                        t.text,
-                    );
-                    if ui.is_rect_visible(resp.rect) {
-                        app.auto.add(&format!("{auto}.option.{}", r.family), resp.rect, &r.display);
-                    }
-                    if index == state.selected && (fresh || up || down) {
-                        resp.scroll_to_me(None);
-                    }
-                    if preview && ui.is_rect_visible(resp.rect) {
-                        let key = egui::Id::new(("font-preview", &r.family));
-                        let lines: std::sync::Arc<Vec<Vec<[f32; 2]>>> = match ui.data(|d| d.get_temp(key)) {
-                            Some(l) => l,
-                            None => {
-                                let l = std::sync::Arc::new(effectcraft_engine::font_preview(&r.family, 14.0));
-                                ui.data_mut(|d| d.insert_temp(key, l.clone()));
-                                l
-                            }
-                        };
-                        // Scaled and placed to fit the row's preview column, and clipped to the row (#577).
-                        let room = Rect::from_min_max(pos2(resp.rect.max.x - 95.0, resp.rect.min.y + 1.0), pos2(resp.rect.max.x - 6.0, resp.rect.max.y - 1.0));
-                        if let Some((k, o)) = fit_preview(&lines, room, resp.rect.center().y + 5.0) {
-                            let painter = ui.painter().with_clip_rect(resp.rect.intersect(ui.clip_rect()));
-                            for poly in lines.iter() {
-                                let pts: Vec<egui::Pos2> =
-                                    poly.iter().filter(|p| p[0].is_finite() && p[1].is_finite()).map(|p| (o + vec2(p[0], p[1]) * k).to_pos2()).collect();
-                                painter.add(egui::Shape::line(pts, egui::Stroke::new(1.0, t.text_dim)));
-                            }
-                        }
-                    }
-                    if resp.clicked() {
-                        chosen = Some(r.family.clone());
-                    }
-                    resp.on_hover_text(&r.display);
-                }
-            });
-        });
-    });
-    let outside = widgets::pressed_outside(ui.ctx(), &area.response) && !ui.input(|i| i.pointer.interact_pos().is_some_and(|p| rect.contains(p)));
-    if chosen.is_some() || outside || escape {
+            }
+            if resp.clicked() {
+                chosen = Some(r.family.clone());
+            }
+            resp.on_hover_text(&r.display);
+        }
+        chosen
+    };
+    let chosen = menu.show_ui_with_header(header, list).flatten();
+    if chosen.is_some() || !open || escape {
         ui.data_mut(|d| {
             d.insert_temp(id.with("open"), false);
             d.remove::<FontSearch>(state_id);
@@ -762,7 +827,7 @@ pub fn align(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     p.text(pos2(x0, y + 10.0), Align2::LEFT_CENTER, tr("Align Layers to:"), Tokens::ui(11.5), t.text_dim);
     let dr = Rect::from_min_size(pos2(x0 + 100.0, y), vec2(110.0, 20.0));
     let to_sel = app.ui.align_to_selection;
-    let pid = egui::Id::new("align-to-pop");
+    let pid = egui::Id::unique("align-to-pop");
     if widgets::dropdown(ui, dr, if to_sel { "Selection" } else { "Composition" }, &t, pid.with("btn")).clicked() {
         widgets::open_popup(ui, pid);
     }
@@ -782,7 +847,7 @@ pub fn align(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         for (i, op) in ops.iter().enumerate() {
             let r = Rect::from_min_size(pos2(x0 + i as f32 * 34.0 + if i >= 3 { 12.0 } else { 0.0 }, y), vec2(30.0, 28.0));
-            let resp = ui.interact(r, egui::Id::new((kind, *op)), Sense::click());
+            let resp = ui.interact(r, egui::Id::unique((kind, *op)), Sense::click());
             p.rect_filled(r, 3.0, if resp.hovered() { t.hover } else { t.field_bg });
             align_glyph(&p, r, op, row == 1, &t);
             let tip = align_tip(kind, op);
diff --git a/crates/ui-egui/src/panels/text_range_handles.rs b/crates/ui-egui/src/panels/text_range_handles.rs
new file mode 100644
index 000000000..6ab7ee2b8
--- /dev/null
+++ b/crates/ui-egui/src/panels/text_range_handles.rs
@@ -0,0 +1,154 @@
+//! A text layer's Range Selector Start and End in the Composition viewer (#1011). With the
+//! selector, its animator or a property in the animator selected, each enabled Range Selector of
+//! the animator shows two bars on the text, at Start + Offset and End + Offset (where the
+//! renderer applies the range), as in After Effects. With the Selection tool a drag sets Start or
+//! End with `prop.set`, leaving Offset alone: one undo step per drag, and on an animated
+//! property a keyframe at the current time. A bar whose place falls outside the text (a negative
+//! Offset, say) is pinned to its end, and dragging it writes the value for where it's dropped.
+//!
+//! The bars follow the static layout on purpose: an animator that moves the characters (a
+//! fly-in, say) would otherwise carry them out of reach. Vertical text and text on a path have
+//! none.
+//!
+//! Automation ids: `viewer.textRange.<uid>` (the Start / End property's uid).
+
+use effectcraft_engine::geom::Mat3;
+use effectcraft_engine::project::{Layer, LayerSource, PropGroup};
+use effectcraft_engine::render::EvalCtx;
+use effectcraft_engine::render::text::{range_bars, range_value_of, source_text};
+use effectcraft_engine::text::kurbo::Point;
+use effectcraft_engine::text::layout_doc;
+use egui::{Color32, Pos2, Rect, Sense, Stroke, Vec2};
+use serde_json::json;
+
+use super::fx_widgets as fw;
+use super::gradient_handles::selected_in;
+use crate::EffectcraftApp;
+use crate::state::Tool;
+
+/// Draw the selected Range Selectors' bars and, with the Selection tool, drag them. `l2c` is the
+/// viewer's layer→comp matrix. Called after the viewer's own gestures, so a bar takes the press
+/// before the layer would move.
+pub fn viewer_hook(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    painter: &egui::Painter,
+    map: &super::viewer::ViewerMap,
+    ectx: &EvalCtx,
+    l2c: &dyn Fn(&EvalCtx, &Layer) -> Mat3,
+) {
+    if !app.ui.viewer.show_layer_controls {
+        return;
+    }
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    let interactive = app.ui.tool == Tool::Selection;
+    let selected_props = app.session.state.selected_props.clone();
+    let selected_layers = app.session.state.selected_layers.clone();
+    let editing = app.session.state.text_edit.as_ref().map(|e| e.layer);
+    let mut actions: Vec<(String, serde_json::Value)> = vec![];
+    for layer in ectx
+        .comp
+        .layers
+        .iter()
+        .filter(|l| selected_layers.contains(&l.id) && l.is_active_at(ectx.time) && matches!(l.source, LayerSource::Text) && editing != Some(l.id))
+    {
+        let Some(text) = layer.props.sub("text") else { continue };
+        if text.sub("pathOptions").is_some_and(|po| ectx.e(layer, po, "path") != 0) {
+            continue;
+        }
+        let sels: Vec<&PropGroup> = text
+            .sub("animators")
+            .into_iter()
+            .flat_map(|a| a.groups())
+            .filter(|a| a.enabled && selected_in(a, layer.id, &selected_props))
+            .filter_map(|a| a.sub("selectors"))
+            .flat_map(|s| s.groups())
+            .filter(|s| s.enabled && s.match_id == "rangeSelector")
+            .collect();
+        if sels.is_empty() {
+            continue;
+        }
+        let Some(doc) = source_text(ectx, layer) else { continue };
+        let lay = layout_doc(&doc);
+        let m = l2c(ectx, layer);
+        // The layer's bounding-box handles, registered earlier this frame: the viewer grabs one
+        // within 9 px of a press, so a bar leaves it the pointer there (Start at 0% of two-line
+        // text meets the left side's handle) and takes it in the rest of its zone.
+        let prefix = format!("viewer.handle.{}.", layer.id.0);
+        let box_handles: Vec<Pos2> = app
+            .auto
+            .elements
+            .iter()
+            .filter(|e| e.id.starts_with(&prefix))
+            .map(|e| Pos2::new(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0))
+            .collect();
+        let to_screen = |p: Point| map.to_screen(fw::layer_to_comp(&m, [p.x, p.y]));
+        for sel in sels {
+            let (based, index, r) = range_bars(ectx, layer, sel, &lay);
+            let n = lay.units(based);
+            let bars: Vec<_> = [("start", r.start), ("end", r.end)]
+                .into_iter()
+                .filter_map(|(k, f)| Some((sel.get(k)?, lay.range_bar(based, (f + r.offset).clamp(0.0, 1.0))?)))
+                .collect();
+            let [(_, [_, b0, _]), (_, [_, b1, _])] = bars[..] else { continue };
+            // Along the baseline on screen (the layer may be rotated or flipped).
+            let along = (to_screen(Point::new(b0.x + 1.0, b0.y)) - to_screen(b0)).normalized();
+            let first = (to_screen(b1) - to_screen(b0)).dot(along) >= 0.0;
+            for (k, (pr, [top, base, bottom])) in bars.iter().enumerate() {
+                let (st, sp, sb) = (to_screen(*top), to_screen(*base), to_screen(*bottom));
+                let up = (st - sb).normalized();
+                // The bar further along the line points back, the other forward: into the range.
+                let inward = if (k == 0) == first { along } else { -along };
+                // The triangle stands on the baseline, clear of the box's side handles (half way
+                // up the box) and its bottom ones (at the descenders).
+                let tri = [sp, sp + up * 8.0, sp + up * 4.0 + inward * 6.0];
+                // A short grab zone around the triangle, so the line above doesn't steal the
+                // layer's scale handles.
+                let hr = Rect::from_two_pos(sp, sp + up * 8.0 + inward * 6.0).expand(3.0);
+                let id = egui::Id::unique(("viewer-text-range", pr.uid));
+                let on_box_handle = ctx.pointer_latest_pos().is_some_and(|p| box_handles.iter().any(|c| c.distance(p) < 9.0));
+                let free = ctx.is_being_dragged(id) || !on_box_handle;
+                let resp = (interactive && free).then(|| ui.interact(hr, id, Sense::drag()));
+                if interactive {
+                    app.auto.add(&format!("viewer.textRange.{}", pr.uid), hr, &pr.name);
+                }
+                let hot = resp.as_ref().is_some_and(|r| r.hovered() || r.dragged());
+                let col = if hot { t.accent } else { Color32::WHITE };
+                draw_bar(painter, st, sb, &tri, Vec2::new(1.0, 1.0), Color32::from_black_alpha(160));
+                draw_bar(painter, st, sb, &tri, Vec2::ZERO, col);
+                let Some(resp) = resp else { continue };
+                if resp.hovered() {
+                    ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+                    resp.clone().on_hover_text(format!("{}: {}", sel.name, pr.name));
+                }
+                // Keep the grab point's distance from the bar, so the bar doesn't jump to the pointer.
+                let grab = id.with("grab");
+                if resp.drag_started()
+                    && let Some(pos) = ctx.input(|i| i.pointer.press_origin())
+                {
+                    ctx.data_mut(|d| d.insert_temp(grab, pos - sp));
+                }
+                if resp.dragged()
+                    && let Some(pos) = resp.interact_pointer_pos()
+                    && let Some(lp) = fw::comp_to_layer(&m, map.to_comp(pos - ctx.data(|d| d.get_temp::<Vec2>(grab)).unwrap_or_default()))
+                    && let Some(f) = lay.range_fraction_at(based, Point::new(lp[0], lp[1]))
+                {
+                    let key = super::effect_controls::gesture_key(ui, id, resp.drag_started());
+                    let value = range_value_of(f, r.offset, index, n);
+                    actions.push(("prop.set".into(), json!({"layer": layer.id.0, "prop": pr.uid, "value": value, "merge": key})));
+                }
+            }
+        }
+    }
+    for (id, params) in actions {
+        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
+            app.ui.status = e;
+        }
+    }
+}
+
+fn draw_bar(painter: &egui::Painter, top: Pos2, bottom: Pos2, tri: &[Pos2; 3], d: Vec2, col: Color32) {
+    painter.line_segment([top + d, bottom + d], Stroke::new(1.5, col));
+    painter.add(egui::Shape::convex_polygon(tri.iter().map(|p| *p + d).collect(), col, Stroke::NONE));
+}
diff --git a/crates/ui-egui/src/panels/timeline.rs b/crates/ui-egui/src/panels/timeline.rs
index aff4ef2c8..a45d8e708 100644
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@ -8,11 +8,14 @@
 
 use effectcraft_engine::color::BlendMode;
 use effectcraft_engine::keyframe::{Interp, Value};
-use effectcraft_engine::project::{Comp, GroupKind, ItemId, Layer, LayerId, LayerSource, MatteKind, Node, ParamUi, PropGroup, Property};
+use effectcraft_engine::project::{
+    Comp, FootageKind, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, MatteKind, Node, ParamUi, Project, PropGroup, Property,
+};
 use effectcraft_engine::render::EvalCtx;
 use effectcraft_engine::time::Tick;
 use egui::{Align2, Color32, Pos2, Rect, Sense, Stroke, StrokeKind, pos2, vec2};
 use serde_json::json;
+use std::sync::Arc;
 
 use crate::i18n::tr;
 use crate::icons::{self, Icon};
@@ -121,7 +124,7 @@ const EXPR_MAX_LINES: usize = 100;
 
 /// The text of the expression being edited (while its editor has the keyboard).
 fn expr_buf_id(prop: u64) -> egui::Id {
-    egui::Id::new(("expr-buf", prop))
+    egui::Id::unique(("expr-buf", prop))
 }
 
 /// Insert an expression editor row after every property that has an expression: as many lines
@@ -161,24 +164,31 @@ const WHIP_PARENT: u8 = 0;
 const WHIP_EXPR: u8 = 1;
 const WHIP_PROP: u8 = 2;
 
+/// The `egui::Id` under which a pick-whip drag in progress ([`PickWhip`]) is kept during the
+/// drag.
 fn pick_whip_id() -> egui::Id {
-    egui::Id::new("tl-pickwhip")
+    egui::Id::unique("tl-pickwhip")
+}
+
+/// The automation id, label and hover hint of a pick whip.
+struct WhipText<'a> {
+    auto: &'a str,
+    label: &'a str,
+    hint: &'a str,
 }
 
 /// A pick whip at `rect`: dragging it starts a pick whip of `kind` from `layer`'s `prop` (0 for
 /// the layer's own), drawn and dropped at the end of [`show`].
-#[allow(clippy::too_many_arguments)]
 fn pick_whip(
     app: &mut EffectcraftApp,
     ui: &egui::Ui,
     p: &egui::Painter,
     rect: Rect,
     (kind, layer, prop): (u8, u64, u64),
-    auto: &str,
-    label: &str,
-    hint: &str,
+    text: WhipText<'_>,
 ) -> egui::Response {
-    let resp = ui.interact(rect, egui::Id::new(("pick-whip", kind, layer, prop)), Sense::drag()).on_hover_text(hint);
+    let WhipText { auto, label, hint } = text;
+    let resp = ui.interact(rect, egui::Id::unique(("pick-whip", kind, layer, prop)), Sense::drag()).on_hover_text(hint);
     icons::paint(p, rect.shrink(1.0), Icon::PickWhip, if resp.hovered() || resp.dragged() { app.tokens.text } else { app.tokens.text_dim });
     app.auto.add(auto, rect, label);
     if resp.drag_started() {
@@ -192,8 +202,10 @@ fn pick_whip(
 /// (row, layer, prop uid, its value fields per dimension), and the pass they were shown in.
 type WhipTargets = (u64, Vec<(Rect, u64, u64, Vec<Rect>)>);
 
+/// The `egui::Id` of the drop targets other panels register for a pick-whip drag
+/// ([`whip_target`]); [`show`] clears it when the whip is released or dropped.
 fn whip_targets_id() -> egui::Id {
-    egui::Id::new("tl-pickwhip-targets")
+    egui::Id::unique("tl-pickwhip-targets")
 }
 
 /// While a pick whip is being dragged, `layer`'s property `prop` shown at `row` in another panel
@@ -261,14 +273,33 @@ fn centered_on(span: f64, duration: f64, cti: f64) -> f64 {
 /// it (characters): the pick whip's reference goes in there.
 type WhipInto = (String, [usize; 2]);
 
+/// The `egui::Id` under which the expression text captured by an expression pick whip
+/// ([`WhipInto`]) is held for property `prop` until that editor is drawn again.
 fn whip_into_id(prop: u64) -> egui::Id {
-    egui::Id::new(("tl-pickwhip-into", prop))
+    egui::Id::unique(("tl-pickwhip-into", prop))
 }
 
-/// After a pick whip into the expression being edited: its editor takes the focus back, the
-/// cursor this many characters before the end (just after the reference).
-fn expr_refocus_id(prop: u64) -> egui::Id {
-    egui::Id::new(("tl-expr-refocus", prop))
+/// An expression editor to take the keyboard when it is next drawn: its property, the text to
+/// select as counts of characters before the end (so it fits the expression as it will be then)
+/// and the pass it was asked for in. After a pick whip into the expression being edited, the
+/// cursor goes just after the reference; after an Alt-click on a stopwatch adds an expression,
+/// its whole text is selected, so typing replaces it.
+#[derive(Clone, Copy, Debug)]
+struct ExprFocus {
+    prop: u64,
+    select: [usize; 2],
+    pass: u64,
+}
+
+/// The `egui::Id` of the pending [`ExprFocus`]: which expression editor takes the keyboard on
+/// its next draw, and what to select in it.
+fn expr_focus_id() -> egui::Id {
+    egui::Id::unique("tl-expr-focus")
+}
+
+fn focus_expression(ctx: &egui::Context, prop: u64, select: [usize; 2]) {
+    let pass = ctx.cumulative_pass_nr();
+    ctx.data_mut(|d| d.insert_temp(expr_focus_id(), ExprFocus { prop, select, pass }));
 }
 
 #[derive(Clone, Debug)]
@@ -515,6 +546,19 @@ impl TMap {
     }
 }
 
+fn disk_bar_range(tm: &TMap, clip: Rect, fd: f64, frames: i64) -> std::ops::Range<i64> {
+    if clip.width() <= 0.0 || clip.height() <= 0.0 || !fd.is_finite() || fd <= 0.0 || !tm.pps.is_finite() || tm.pps <= 0.0 {
+        return 0..0;
+    }
+    let start = tm.t(clip.min.x) / fd;
+    let end = tm.t(clip.max.x) / fd;
+    if !start.is_finite() || !end.is_finite() {
+        return 0..0;
+    }
+    let limit = frames.clamp(0, 100_000) as f64;
+    (start.clamp(0.0, limit).floor() as i64)..(end.clamp(0.0, limit).ceil() as i64)
+}
+
 /// A Timeline ruler tick label for comp frame `fno`: seconds:frames (`00:15f`, AE) or, when
 /// the project's Time Display Style is Frames, the frame number the current-time display shows
 /// (`00015`, counted from Start Numbering Frames At) (#710).
@@ -530,8 +574,10 @@ fn ruler_label(fno: i64, fps_i: i64, settings: &effectcraft_engine::project::Pro
     }
 }
 
+/// The `egui::Id` under which [`show`] records this frame's time mapping as `(x0, start, pps)`,
+/// i.e. the [`TMap`] fields it lays the ruler and graph out with.
 fn tl_map_id() -> egui::Id {
-    egui::Id::new("timeline-map")
+    egui::Id::unique("timeline-map")
 }
 
 /// The column right of the time graph: the composition marker bin over the layers' scroll bar.
@@ -564,7 +610,7 @@ pub(crate) fn set_zoom(tl: &mut crate::state::TimelineState, comp: &Comp, pps: f
 
 /// `;`: from the whole comp, zoom in to frame level around the CTI; otherwise show the whole comp.
 pub fn toggle_frame_zoom(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::new("timeline-graph-area"))) else { return };
+    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::unique("timeline-graph-area"))) else { return };
     let Some(comp) = app.session.active_comp_arc() else { return };
     let fit = fit_pps(w, &comp);
     if app.ui.timeline.pps.is_some_and(|p| p > fit) {
@@ -585,14 +631,14 @@ pub fn toggle_fit_zoom(app: &mut EffectcraftApp, ctx: &egui::Context) {
         return;
     }
     let Some((start, pps)) = tl.before_fit.take() else { return };
-    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::new("timeline-graph-area"))) else { return };
+    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::unique("timeline-graph-area"))) else { return };
     let Some(comp) = app.session.active_comp_arc() else { return };
     set_zoom(&mut app.ui.timeline, &comp, pps, fit_pps(w, &comp), start, 0.0);
 }
 
 /// Zoom the time ruler around the CTI.
 pub fn zoom(app: &mut EffectcraftApp, ctx: &egui::Context, k: f64) {
-    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::new("timeline-graph-area"))) else { return };
+    let Some((_, w)) = ctx.data(|d| d.get_temp::<(f32, f32)>(egui::Id::unique("timeline-graph-area"))) else { return };
     let Some(comp) = app.session.active_comp_arc() else { return };
     let fit = fit_pps(w, &comp);
     let pps = app.ui.timeline.pps.unwrap_or(fit);
@@ -673,18 +719,20 @@ fn double_click_action(layer: &Layer) -> Option<(String, serde_json::Value)> {
 /// Open the rename field on layer `id`; it takes the keyboard focus on its first frame only.
 fn start_rename(ctx: &egui::Context, id: u64, name: &str) {
     ctx.data_mut(|d| {
-        d.insert_temp(egui::Id::new("tl-rename"), (id, name.to_string()));
+        d.insert_temp(egui::Id::unique("tl-rename"), (id, name.to_string()));
         d.insert_temp(rename_focus_id(), true);
     });
 }
 
 /// The Timeline's open group rename field: (layer, group uid, text).
 fn group_rename_id() -> egui::Id {
-    egui::Id::new("tl-group-rename")
+    egui::Id::unique("tl-group-rename")
 }
 
+/// The `egui::Id` of the one-shot flag that makes the open layer rename field take the keyboard
+/// on its first frame (see [`start_rename`]).
 fn rename_focus_id() -> egui::Id {
-    egui::Id::new("tl-rename-focus")
+    egui::Id::unique("tl-rename-focus")
 }
 
 fn group_visible(g: &PropGroup, layer: &Layer) -> bool {
@@ -747,15 +795,22 @@ fn display_name(app: &EffectcraftApp, l: &Layer) -> String {
 /// layer whose names contain `q` (lowercase), each with its enclosing groups. A matching group
 /// brings its whole contents.
 fn search_rows(l: &Layer, q: &str) -> Vec<Row> {
+    /// The row for a group in search results: depth, its effect's enabled flag, and the eye
+    /// switch for layer-style groups (not Blending Options).
     fn group_row(l: &Layer, g: &PropGroup, depth: usize, parent: &PropGroup) -> Row {
         let fx = matches!(g.kind, GroupKind::Effect { .. }).then_some(g.enabled);
         let eye =
             (parent.match_id == effectcraft_engine::project::styles::GROUP && g.match_id != effectcraft_engine::project::styles::BLENDING).then_some(g.enabled);
         Row { layer: l.id, depth, kind: RowKind::Group { uid: g.uid, name: g.name.clone(), open: true, has_children: !g.children.is_empty(), fx, eye } }
     }
+    /// Every visible child of `g` at `depth`, groups recursed into whole — a matching group
+    /// brings its contents. A shape group's inner Contents is elided (as in AE): no row, and
+    /// its items list at the same depth as the group itself.
     fn all(l: &Layer, g: &PropGroup, depth: usize, out: &mut Vec<Row>) {
         for c in &g.children {
             match c {
+                // A shape group's inner Contents is elided (as in AE): no row, items at the same depth.
+                Node::Group(sg) if g.match_id == "group" && sg.match_id == "contents" => all(l, sg, depth, out),
                 Node::Group(sg) => {
                     out.push(group_row(l, sg, depth, g));
                     all(l, sg, depth + 1, out);
@@ -765,9 +820,14 @@ fn search_rows(l: &Layer, q: &str) -> Vec<Row> {
             }
         }
     }
+    /// The children of `g` that match `q`: a name-matching group brings its whole contents
+    /// (`all`); otherwise the search recurses and keeps only subtrees with hits. A shape
+    /// group's inner Contents is searched through without a row of its own (as in AE).
     fn rec(l: &Layer, g: &PropGroup, depth: usize, q: &str, out: &mut Vec<Row>) {
         for c in &g.children {
             match c {
+                // A shape group's inner Contents is elided (as in AE): search through it, no row.
+                Node::Group(sg) if g.match_id == "group" && sg.match_id == "contents" => rec(l, sg, depth, q, out),
                 Node::Group(sg) if depth > 1 || group_visible(sg, l) => {
                     // An effect group also matches the name the row draws, so a search finds
                     // `高斯模糊` in a Chinese interface and `Gaussian Blur` in an English one.
@@ -1171,6 +1231,10 @@ fn collect_props(g: &PropGroup, out: &mut Vec<u64>, f: &dyn Fn(&Property) -> boo
     }
 }
 
+/// The rows for the children of `g` at `depth`: groups recurse into when their twirl-down is
+/// in `open`, text animators list their selectors and properties directly (as in AE), and a
+/// shape group's inner Contents (AE's elided `ADBE Vectors Group`) is skipped so its items
+/// list directly under the group.
 fn push_group(rows: &mut Vec<Row>, l: &Layer, g: &PropGroup, depth: usize, open: &std::collections::BTreeSet<u64>) {
     for c in &g.children {
         match c {
@@ -1178,6 +1242,11 @@ fn push_group(rows: &mut Vec<Row>, l: &Layer, g: &PropGroup, depth: usize, open:
             Node::Group(sg) if g.match_id == "animator" && matches!(sg.match_id.as_str(), "selectors" | "properties") => {
                 push_group(rows, l, sg, depth, open);
             }
+            // A shape group's inner Contents (AE's elided `ADBE Vectors Group`): the group's items
+            // (path, fill/stroke, Transform) list directly under it, with no "Contents" row.
+            Node::Group(sg) if g.match_id == "group" && sg.match_id == "contents" => {
+                push_group(rows, l, sg, depth, open);
+            }
             Node::Group(sg) => {
                 let o = open.contains(&sg.uid);
                 let fx = matches!(sg.kind, GroupKind::Effect { .. }).then_some(sg.enabled);
@@ -1225,7 +1294,7 @@ fn layer_icon(l: &Layer, project: &effectcraft_engine::project::Project) -> Icon
 
 /// Layers being dragged to a new place in the stack (timeline rows).
 fn layer_drag_id() -> egui::Id {
-    egui::Id::new("tl-layer-drag")
+    egui::Id::unique("tl-layer-drag")
 }
 
 /// A keyframe drag in progress: where the pointer started, the grabbed key's comp time
@@ -1239,8 +1308,10 @@ struct KeyDrag {
     quick: Option<usize>,
 }
 
+/// The `egui::Id` of the keyframe drag in progress ([`KeyDrag`]): its start, the grabbed key's
+/// time and how far the selection has moved so far.
 fn key_drag_id() -> egui::Id {
-    egui::Id::new("tl-key-drag")
+    egui::Id::unique("tl-key-drag")
 }
 
 /// A Quick Offset drag of selected layer bars (Ctrl/Cmd+Alt, #1012): the bar it started on, where
@@ -1253,8 +1324,9 @@ struct QuickBar {
     applied: i64,
 }
 
+/// The `egui::Id` of a Quick Offset drag of layer bars in progress ([`QuickBar`]).
 fn quick_bar_id() -> egui::Id {
-    egui::Id::new("tl-quick-bar")
+    egui::Id::unique("tl-quick-bar")
 }
 
 /// How many layers a Quick Offset of `layers` staggers (#1012): the unlocked ones, each once, if
@@ -1277,7 +1349,7 @@ fn quick_offset_note(frames: i64, layers: usize) -> String {
 
 /// A Timeline drag's readout by the pointer (After Effects shows it in the Info panel).
 fn drag_tip(ctx: &egui::Context, t: &Tokens, ptr: Pos2, note: String) {
-    let fg = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("tl-key-drag-tip")));
+    let fg = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("tl-key-drag-tip")));
     let g = fg.layout_no_wrap(note, Tokens::ui(11.5), t.text);
     let r = Rect::from_min_size(ptr + vec2(14.0, 14.0), g.size() + vec2(10.0, 6.0));
     fg.rect_filled(r, 3.0, t.panel_bg);
@@ -1294,8 +1366,10 @@ struct SwitchDrag {
     merge: String,
 }
 
+/// The `egui::Id` of the switch press-and-drag in progress ([`SwitchDrag`]): the switch, the
+/// state the press gave it and the undo step the drag folds into.
 fn switch_drag_id() -> egui::Id {
-    egui::Id::new("tl-switch-drag")
+    egui::Id::unique("tl-switch-drag")
 }
 
 /// The press-and-drag gesture of the Timeline's switches and stopwatches (`switch`, on `row`,
@@ -1314,12 +1388,42 @@ fn switch_gesture(ui: &egui::Ui, resp: &egui::Response, row: Rect, switch: &'sta
     (a.min(b) < row.max.y && a.max(b) >= row.min.y).then_some((d.value, d.merge))
 }
 
-/// A layer's switch (A/V Features and Switches columns) in `row`, with the
-/// [`switch_gesture`].
-#[allow(clippy::too_many_arguments)]
-fn layer_switch(
-    ui: &mut egui::Ui,
-    t: &Tokens,
+/// The layers an edit made on `layer`'s row applies to (a switch, its label, its blending mode):
+/// the selection when the row is selected, else that layer alone, as in After Effects.
+fn edited_layers(layer: LayerId, selected: &[LayerId]) -> Vec<u64> {
+    if selected.contains(&layer) { selected.iter().map(|l| l.0).collect() } else { vec![layer.0] }
+}
+
+/// Whether the Timeline shows switch `name`'s cell on `layer`'s row (A/V Features and Switches
+/// columns): a layer that has no such cell isn't one a click gives the switch to either.
+fn switch_applies(layer: &Layer, name: &str, project: &Project) -> bool {
+    match name {
+        "video" | "lock" | "shy" => true,
+        "audio" => layer.props.sub("audio").is_some(),
+        "solo" | "quality" | "motionBlur" | "adjustment" => layer.source.is_av(),
+        "collapse" => collapse_applies(layer, project),
+        "fx" => layer.effects().is_some_and(|f| !f.children.is_empty()),
+        "frameBlend" => matches!(layer.source, LayerSource::Footage { .. } | LayerSource::Comp { .. }),
+        "threeD" => layer.source.is_av() || matches!(layer.source, LayerSource::Null),
+        _ => true,
+    }
+}
+
+/// The layers a click on the `name` switch of `layer`'s row acts on: [`edited_layers`] without
+/// the layers the switch doesn't apply to.
+fn switch_targets(comp: &Comp, project: &Project, selected: &[LayerId], layer: u64, name: &str) -> Vec<u64> {
+    edited_layers(LayerId(layer), selected).into_iter().filter(|l| comp.layer(LayerId(*l)).is_some_and(|l| switch_applies(l, name, project))).collect()
+}
+
+/// The layers a Modes column edit on `layer`'s row (its blending mode, Preserve Transparency)
+/// acts on: [`edited_layers`] that have video.
+fn mode_targets(comp: &Comp, layer: LayerId, selected: &[LayerId]) -> Vec<u64> {
+    edited_layers(layer, selected).into_iter().filter(|l| comp.layer(LayerId(*l)).is_some_and(|l| l.source.is_av())).collect()
+}
+
+/// Where and what a layer switch is: its cell, icon, state and the switch it sets.
+#[derive(Clone, Copy)]
+struct SwitchSpec {
     row: Rect,
     br: Rect,
     icon: Icon,
@@ -1328,25 +1432,45 @@ fn layer_switch(
     layer: u64,
     name: &'static str,
     others: bool,
+}
+
+/// A layer's switch (A/V Features and Switches columns) in `row`, with the
+/// [`switch_gesture`].
+fn layer_switch(
+    ui: &mut egui::Ui,
+    t: &Tokens,
+    spec: &SwitchSpec,
+    comp: &Comp,
+    project: &Project,
+    selected: &[LayerId],
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
+    let SwitchSpec { row, br, icon, on, id, layer, name, others } = *spec;
     let resp = widgets::icon_toggle(ui, br, icon, on, t, id, Sense::click_and_drag());
     // Alt-click on an A/V feature sets the layer apart: the other layers go off (or locked),
-    // and come back on the next Alt-click.
+    // and come back on the next Alt-click. With several layers selected, the whole selection is
+    // set apart.
     if others && resp.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_pressed() && i.modifiers.alt) {
-        actions.push(("layer.setSwitch".into(), json!({"layers": [layer], "switch": name, "others": true})));
+        let layers = edited_layers(LayerId(layer), selected);
+        actions.push(("layer.setSwitch".into(), json!({"layers": layers, "switch": name, "others": true})));
         return;
     }
+    // A press on a selected layer's switch gives the switch to every selected layer, as in After
+    // Effects; the targets are picked when the press happens, never while the row is drawn.
     if let Some((value, merge)) = switch_gesture(ui, &resp, row, name, on) {
-        actions.push(("layer.setSwitch".into(), json!({"layers": [layer], "switch": name, "value": value, "merge": merge})));
+        let layers = switch_targets(comp, project, selected, layer, name);
+        actions.push(("layer.setSwitch".into(), json!({"layers": layers, "switch": name, "value": value, "merge": merge})));
     } else if resp.clicked() && !resp.clicked_by(egui::PointerButton::Primary) {
         // Keyboard or accessibility activation (a pointer press was handled above).
-        actions.push(("layer.setSwitch".into(), json!({"layers": [layer], "switch": name})));
+        let layers = switch_targets(comp, project, selected, layer, name);
+        actions.push(("layer.setSwitch".into(), json!({"layers": layers, "switch": name, "value": !on})));
     }
 }
 
+/// The `egui::Id` under which composition `comp` remembers the layer the last click selected, so
+/// a following Shift-click can select the range from there ([`shift_range`]).
 fn anchor_id(comp: ItemId) -> egui::Id {
-    egui::Id::new(("timeline-selection-anchor", comp.0))
+    egui::Id::unique(("timeline-selection-anchor", comp.0))
 }
 
 /// Remember `layer` as where the next Shift-click selection starts.
@@ -1378,50 +1502,134 @@ fn insertion(layer_rows: &[(Rect, LayerId)], py: f32, top: f32) -> (Option<usize
     (at, y)
 }
 
+/// The `egui::Id` of the flag the row drag's release sets, telling the same frame's reorder
+/// drawing code to apply the drop.
 fn layer_drop_id() -> egui::Id {
-    egui::Id::new("tl-layer-drop")
+    egui::Id::unique("tl-layer-drop")
 }
 
-pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+/// Whether a Project item can replace a layer's source (the same set `layer.replaceSource`
+/// accepts): compositions, footage and solids; not folders, data files or 3D models.
+fn replaceable_item(it: &effectcraft_engine::project::Item) -> bool {
+    match &it.kind {
+        ItemKind::Comp(_) | ItemKind::Solid(_) => true,
+        ItemKind::Footage(f) => !matches!(f.kind, FootageKind::Data | FootageKind::Model),
+        ItemKind::Folder => false,
+    }
+}
+
+/// The Alt/Option-drag target: the layer under the pointer can take this item as its source, and
+/// the item wouldn't put the composition inside itself.
+fn replace_source_target(app: &EffectcraftApp, cid: ItemId, item: ItemId, lid: LayerId, comp: &Comp) -> bool {
+    app.session.project.item(item).is_some_and(replaceable_item)
+        && !app.session.project.comp_contains(item, cid)
+        && comp
+            .layer(lid)
+            .is_some_and(|l| !l.switches.locked && matches!(l.source, LayerSource::Footage { .. } | LayerSource::Comp { .. } | LayerSource::Solid { .. }))
+}
+
+/// The frame's layout and state shared by the Timeline's drawing steps.
+struct Tl {
+    t: Tokens,
+    cid: ItemId,
+    time: Tick,
+    fr: effectcraft_engine::time::FrameRate,
+    rect: Rect,
+    header_h: f32,
+    colhdr_h: f32,
+    footer_h: f32,
+    vis: Vis,
+    left_w: f32,
+    overflow: f32,
+    oscroll: f32,
+    cw: Cols,
+    graph_x0: f32,
+    graph_x1: f32,
+    fit_pps: f64,
+    pps: f64,
+    scroll_to: Option<crate::state::ScrollTo>,
+    tm: TMap,
+    top: f32,
+    rows_rect: Rect,
+    ruler: Rect,
+    bin: Rect,
+    tc_rect: Rect,
+    wa_row: Rect,
+    fd: f64,
+    rh: f32,
+    max_scroll: f32,
+    ctx: egui::Context,
+    comp: Arc<Comp>,
+    p: egui::Painter,
+    rows: Arc<Vec<Row>>,
+    actions: Vec<(String, serde_json::Value)>,
+}
+
+/// [`Tl`] plus what the layer rows and the interactions after them share.
+struct Rw {
+    tl: Tl,
+    lp: egui::Painter,
+    gp: egui::Painter,
+    graph_on: bool,
+    full_clip: Rect,
+    left_clip: Rect,
+    right_clip: Rect,
+    empty_rect: Rect,
+    outline_rect: Rect,
+    empty: egui::Response,
+    outline_empty: egui::Response,
+    selected: Vec<LayerId>,
+    sel_keys: Vec<effectcraft_engine::KeyRef>,
+    ui_actions: Vec<UiAct>,
+    hit_rows: Vec<(Rect, Row)>,
+    dim_hits: Vec<(u64, Vec<Rect>)>,
+}
+
+/// One visible row: what the per-kind drawing steps need to know about it.
+struct RowCtx<'a> {
+    row: &'a Row,
+    layer: &'a Layer,
+    r: Rect,
+    left: Rect,
+    cy: f32,
+    is_sel: bool,
+    ri: usize,
+    indent: f32,
+}
+
+/// The responses of a layer bar's body and its two trim edges.
+struct BarResps {
+    body: egui::Response,
+    lin: egui::Response,
+    lout: egui::Response,
+}
+
+/// An expression row's property, expression and editor ids.
+#[derive(Clone, Copy)]
+struct ExprRow<'a> {
+    prop: &'a Property,
+    ex: &'a effectcraft_engine::project::Expression,
+    buf_id: egui::Id,
+    edit_id: egui::Id,
+}
+
+/// A keyframe marker's hit result.
+struct KeyHit<'a> {
+    k: &'a effectcraft_engine::keyframe::Keyframe,
+    ct: Tick,
+    ks: bool,
+    kresp: egui::Response,
+    mods: egui::Modifiers,
+    this_key: serde_json::Value,
+}
+
+/// Computes this frame's layout: zoom, scroll and the panel's regions.
+fn layout(app: &mut EffectcraftApp, ui: &egui::Ui, rect: Rect, cid: ItemId, comp: &Arc<Comp>) -> Tl {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
-    let Some(cid) = app.session.active_comp_id() else {
-        ui.painter().text(rect.center(), Align2::CENTER_CENTER, "(no composition)", Tokens::ui(12.0), t.text_faint);
-        // Dropping footage into an empty Timeline should create its first composition,
-        // just like dropping onto the Project panel's New Composition button (#649).
-        if let Some(crate::panels::DragPayload::Item(dragged)) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx).as_deref()
-            && ui.rect_contains_pointer(rect)
-        {
-            let items: Vec<ItemId> = crate::panels::project_drop_items(app, *dragged)
-                .into_iter()
-                .map(ItemId)
-                .filter(|id| {
-                    app.session.project.item(*id).is_some_and(|item| match &item.kind {
-                        effectcraft_engine::project::ItemKind::Footage(footage) => footage.kind != effectcraft_engine::project::FootageKind::Data,
-                        effectcraft_engine::project::ItemKind::Solid(_) | effectcraft_engine::project::ItemKind::Comp(_) => true,
-                        _ => false,
-                    })
-                })
-                .collect();
-            if !items.is_empty() {
-                ui.painter().rect_stroke(rect.shrink(2.0), 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
-                app.auto.add("timeline.newCompDrop", rect, "Drop footage to create a composition");
-                if ctx.input(|i| i.pointer.any_released()) {
-                    app.session.state.project_selection = items;
-                    if let Err(e) = crate::menus::invoke(app, &ctx, "file.newCompFromSelection", json!({})) {
-                        app.ui.status = e;
-                    }
-                    egui::DragAndDrop::clear_payload(&ctx);
-                }
-            }
-        }
-        return;
-    };
-    let Some(comp) = app.session.project.comp_arc(cid) else { return };
     let p = ui.painter().clone();
     let time = app.session.time();
     let fr = comp.frame_rate;
-
     // Geometry.
     let header_h = 48.0;
     let ruler_h = 34.0;
@@ -1438,8 +1646,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let cw = cols(rect.min.x - oscroll, left_w + overflow, vis);
     let graph_x0 = rect.min.x + left_w + 1.0;
     let graph_x1 = rect.max.x - GUTTER_W;
-    ctx.data_mut(|d| d.insert_temp(egui::Id::new("timeline-graph-area"), (graph_x0, graph_x1 - graph_x0)));
-    let fit_pps = fit_pps(graph_x1 - graph_x0, &comp);
+    ctx.data_mut(|d| d.insert_temp(egui::Id::unique("timeline-graph-area"), (graph_x0, graph_x1 - graph_x0)));
+    let fit_pps = fit_pps(graph_x1 - graph_x0, comp);
     let pps = app.ui.timeline.pps.unwrap_or(fit_pps);
     if app.ui.timeline.pps.is_none() {
         app.ui.timeline.start = 0.0;
@@ -1463,490 +1671,94 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let top = rect.min.y;
     let rows_top = top + header_h + colhdr_h;
     let rows_rect = Rect::from_min_max(pos2(rect.min.x, rows_top), pos2(rect.max.x, rect.max.y - footer_h));
-    let graph_rect = Rect::from_min_max(pos2(graph_x0, top + header_h - ruler_h + colhdr_h), pos2(rect.max.x, rect.max.y - footer_h));
     p.rect_filled(Rect::from_min_max(pos2(graph_x0, top), rect.max), 0.0, t.tl_bg);
     p.line_segment([pos2(graph_x0 - 1.0, top), pos2(graph_x0 - 1.0, rect.max.y)], Stroke::new(1.0, t.app_bg));
 
-    let mut actions: Vec<(String, serde_json::Value)> = Vec::new();
-    if !ui.input(|i| i.pointer.primary_down()) {
-        ctx.data_mut(|d| d.remove::<SwitchDrag>(switch_drag_id()));
-    }
-    // ---- header (left): time display, search, switches.
-    let tc = crate::panels::timecode(&app.session, &comp, time);
-    let tc_rect = Rect::from_min_size(pos2(rect.min.x + 12.0, top + 6.0), vec2(150.0, 24.0));
-    let tc_resp = ui.interact(tc_rect, egui::Id::new("tl-timecode"), Sense::click_and_drag());
-    p.text(tc_rect.left_center(), Align2::LEFT_CENTER, &tc, Tokens::semibold(16.0), t.timecode);
-    // Under it the other style (frames under timecode, timecode under frames) and the rate.
-    let settings = &app.session.project.settings;
-    let other = if settings.time_display == effectcraft_engine::project::TimeDisplayStyle::Timecode {
-        format!("{:05}", fr.frame_at(time) + settings.frame_start)
-    } else {
-        effectcraft_engine::time::format_timecode_ae(fr.frame_at(time + comp.display_start), fr, false)
-    };
-    // Audio-only preview (Video off in the Preview panel): the current time stays put, so that
-    // line says why and where the sound is instead (#1118).
-    if let Some(af) = app.video_preview_off() {
-        let at = af.map(|f| format!(" · {}", effectcraft_engine::time::format_timecode_ae(f + fr.frame_at(comp.display_start), fr, false))).unwrap_or_default();
-        let msg = format!("{}{at}", crate::i18n::tr("Video preview off: audio only"));
-        p.text(pos2(tc_rect.min.x, tc_rect.max.y + 8.0), Align2::LEFT_CENTER, msg, Tokens::ui(10.5), t.cache_green);
-    } else {
-        p.text(pos2(tc_rect.min.x, tc_rect.max.y + 8.0), Align2::LEFT_CENTER, format!("{other} ({:.2} fps)", fr.as_f64()), Tokens::ui(10.5), t.text_faint);
-    }
-    app.auto.add("timeline.timecode", tc_rect, &tc);
-    super::toggle_time_display(app, &tc_resp);
-    if tc_resp.dragged() {
-        let d = tc_resp.drag_delta().x as f64;
-        let f = fr.frame_at(time) + (d * 0.5).round() as i64;
-        let _ = app.session.execute("time.set", json!({"frame": f.max(0)}));
-    }
-    if tc_resp.double_clicked() {
-        ctx.data_mut(|d| d.insert_temp(egui::Id::new("tl-tc-edit"), tc.clone()));
-    }
-    if let Some(mut buf) = ctx.data(|d| d.get_temp::<String>(egui::Id::new("tl-tc-edit"))) {
-        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(tc_rect));
-        let r = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::semibold(16.0)).desired_width(150.0));
-        if r.lost_focus() {
-            if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-                let _ = app.session.execute("time.set", json!({"timecode": buf}));
-            }
-            ctx.data_mut(|d| d.remove::<String>(egui::Id::new("tl-tc-edit")));
-        } else {
-            widgets::keep_focus(&ctx, &r, &buf);
-            ctx.data_mut(|d| d.insert_temp(egui::Id::new("tl-tc-edit"), buf));
-        }
-    }
-    let sr = Rect::from_min_size(pos2(tc_rect.max.x + 14.0, top + 12.0), vec2((left_w - 420.0).clamp(120.0, 220.0), 22.0));
-    let mut search = app.ui.timeline.search.clone();
-    widgets::search_field(ui, sr, &mut search, "Search", &t);
-    app.ui.timeline.search = search;
-    app.auto.add("timeline.search", sr, "Search");
-    let mut bx = rect.min.x + left_w - 10.0;
-    for (icon, on, id, tip) in [
-        (Icon::Graph, app.ui.timeline.graph_editor, "graph", "Graph Editor"),
-        (Icon::MotionBlur, comp.enable_motion_blur, "motionBlur", "Enables Motion Blur for all layers with the Motion Blur switch set"),
-        (Icon::FrameBlend, comp.enable_frame_blending, "frameBlending", "Enables Frame Blending for all layers with the Frame Blend switch set"),
-        (Icon::Shy, comp.hide_shy, "hideShy", "Hides all layers for which the Shy switch is set"),
-        (Icon::Draft3D, comp.draft_3d, "draft3d", "Draft 3D"),
-        (Icon::Flowchart, false, "flowchart", "Composition Mini-Flowchart"),
-    ] {
-        let r = Rect::from_min_size(pos2(bx - 24.0, top + 11.0), vec2(24.0, 24.0));
-        let resp = widgets::icon_button(ui, r, icon, on, &t, egui::Id::new(("tl-sw", id))).on_hover_text(tip);
-        app.auto.add(&format!("timeline.switch.{id}"), r, tip);
-        if resp.clicked() {
-            match id {
-                "graph" => app.ui.timeline.graph_editor = !app.ui.timeline.graph_editor,
-                "flowchart" => app.show_panel(crate::dock::PanelKind::Flowchart),
-                _ => {
-                    let _ = app.session.execute("comp.setSwitch", json!({"switch": id}));
-                }
-            }
-        }
-        bx -= 28.0;
-    }
-
-    // ---- ruler (right).
     let ruler = Rect::from_min_max(pos2(graph_x0, top + header_h - ruler_h), pos2(rect.max.x, top + header_h));
     // The composition marker bin, at the right end of the ruler above the layers' scroll bar.
     let bin = Rect::from_min_max(pos2(graph_x1 + 2.0, ruler.max.y - 16.0), pos2(rect.max.x - 2.0, ruler.max.y - 2.0));
-    let nav = Rect::from_min_max(pos2(graph_x0 + 6.0, top + 6.0), pos2(graph_x1, top + 14.0));
-    // Time navigator: the visible span as a grey bar with blue end handles (as in After
-    // Effects), over a dark track.
-    p.rect_filled(nav, 1.0, t.field_bg);
-    let vis0 = (tm.start / comp.duration.seconds()) as f32;
-    let vis1 = (tm.t(graph_x1) / comp.duration.seconds()) as f32;
-    let nav_vis =
-        Rect::from_min_max(pos2(nav.min.x + nav.width() * vis0.clamp(0.0, 1.0), nav.min.y), pos2(nav.min.x + nav.width() * vis1.clamp(0.0, 1.0), nav.max.y));
-    p.rect_filled(nav_vis, 0.0, t.tl_nav_bar);
-    for x in [nav_vis.min.x, nav_vis.max.x] {
-        p.rect_filled(Rect::from_min_max(pos2(x - 3.0, nav.min.y - 1.0), pos2(x + 3.0, nav.max.y + 1.0)), 3.0, t.accent);
-    }
-    // The middle scrolls at the current zoom; each end is a handle that moves that side of the
-    // visible span (pulled in: zoomed in; stretched to the whole track: the whole comp).
-    let nresp = ui.interact(nav, egui::Id::new("tl-nav"), Sense::drag());
-    app.auto.add("timeline.navigator", nav, "Time navigator");
-    if nresp.dragged() {
-        let d = nresp.drag_delta().x as f64 / nav.width() as f64 * comp.duration.seconds();
-        app.ui.timeline.start = (app.ui.timeline.start + d).clamp(0.0, comp.duration.seconds());
-        if app.ui.timeline.pps.is_none() {
-            app.ui.timeline.pps = Some(pps);
-        }
-    }
-    let span_px = (graph_x1 - tm.x0) as f64;
-    let (t0, t1) = (tm.start, tm.t(graph_x1));
-    for (end, x) in [("start", nav_vis.min.x), ("end", nav_vis.max.x)] {
-        let hr = Rect::from_center_size(pos2(x, nav.center().y), vec2(10.0, nav.height() + 6.0));
-        let hresp = ui.interact(hr, egui::Id::new(("tl-nav", end)), Sense::drag());
-        app.auto.add(&format!("timeline.navigator.{end}"), hr, if end == "start" { "Time navigator start" } else { "Time navigator end" });
-        if hresp.hovered() || hresp.dragged() {
-            ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
-        }
-        if let Some(px) = hresp.interact_pointer_pos().filter(|_| hresp.dragged()) {
-            let t = ((px.x - nav.min.x) / nav.width()) as f64 * comp.duration.seconds();
-            // The other end stays; the span is at least what the most zoomed-in ruler shows.
-            let min_span = span_px / MAX_PPS;
-            let (keep_t, keep_px, span) = if end == "start" { (t1, span_px, t1 - t.min(t1 - min_span)) } else { (t0, 0.0, t.max(t0 + min_span) - t0) };
-            set_zoom(&mut app.ui.timeline, &comp, span_px / span.max(min_span), fit_pps, keep_t, keep_px);
-        }
-    }
-    p.rect_filled(ruler, 0.0, t.tl_ruler_bg);
-    app.auto.add("timeline.ruler", ruler, &format!("{},{}", tm.start, tm.pps));
-    // Work area bar: below the ruler, beside the column headers (After Effects' layout), with
-    // blue begin / end handles; the cache bar runs under it. Dragging the bar moves the work
-    // area, the handles move its ends; Shift snaps (#252).
+    let tc_rect = Rect::from_min_size(pos2(rect.min.x + 12.0, top + 6.0), vec2(150.0, 24.0));
     let wa_row = Rect::from_min_max(pos2(graph_x0, top + header_h), pos2(rect.max.x, top + header_h + colhdr_h));
-    let (wa0, wa1) = (comp.work_area.0.seconds(), comp.work_area.1.seconds());
-    let wa = Rect::from_min_max(pos2(tm.x(wa0), wa_row.min.y + 3.0), pos2(tm.x(wa1), wa_row.max.y - 6.0));
-    p.with_clip_rect(wa_row).rect_filled(wa, 0.0, t.tl_work_area_bar);
-    let shift = ui.input(|i| i.modifiers.shift);
-    let bar = wa.intersect(wa_row);
-    let bresp = ui.interact(bar, egui::Id::new("wa-bar"), Sense::click_and_drag());
-    app.auto.add("timeline.workArea.bar", bar, "Work area");
-    // Right-click: the work area's commands (After Effects).
-    crate::widgets::context_menu(&bresp, |ui| {
-        let mut chosen = None;
-        for id in ["comp.trimToWorkArea", "edit.liftWorkArea", "edit.extractWorkArea"] {
-            crate::menus::entry_for(app, ui, id, &mut chosen);
-        }
-        actions.extend(chosen);
-    });
-    let bar_start = egui::Id::new("wa-bar-start");
-    if bresp.drag_started() {
-        ctx.data_mut(|d| d.insert_temp(bar_start, wa0));
-    }
-    if bresp.dragged()
-        && let (Some(a0), Some(d)) = (ctx.data(|d| d.get_temp::<f64>(bar_start)), bresp.total_drag_delta())
-    {
-        let len = wa1 - wa0;
-        let mut a = a0 + d.x as f64 / pps.max(1e-6);
-        if shift {
-            a += work_area_snap(app, &comp, &[a, a + len], pps);
-        }
-        let a = fr.snap_nearest(Tick::from_seconds_f64(a.clamp(0.0, (comp.duration.seconds() - len).max(0.0)))).seconds();
-        let _ = app.session.execute("comp.workArea", json!({"start": a, "end": a + len, "merge": "wa-drag"}));
-    }
-    for (hx, set) in [(wa.min.x, "begin"), (wa.max.x, "end")] {
-        let hr = Rect::from_center_size(pos2(hx, wa.center().y), vec2(8.0, 14.0));
-        let handle = if set == "begin" {
-            Rect::from_min_max(pos2(hx - 1.0, wa.min.y), pos2(hx + 4.0, wa.max.y))
-        } else {
-            Rect::from_min_max(pos2(hx - 4.0, wa.min.y), pos2(hx + 1.0, wa.max.y))
-        };
-        p.rect_filled(handle, 2.0, t.accent);
-        let resp = ui.interact(hr, egui::Id::new(("wa", set)), Sense::drag());
-        app.auto.add(&format!("timeline.workArea.{set}"), hr, set);
-        if resp.dragged()
-            && let Some(pt) = resp.interact_pointer_pos()
-        {
-            let mut secs = tm.t(pt.x).max(0.0);
-            if shift {
-                secs += work_area_snap(app, &comp, &[secs], pps);
-            }
-            let secs = fr.snap_nearest(Tick::from_seconds_f64(secs)).seconds();
-            let key = if set == "begin" { "start" } else { "end" };
-            let _ = app.session.execute("comp.workArea", json!({key: secs, "merge": "wa-drag"}));
-        }
-    }
-    // Cache bar (green: cached frames of what the viewer shows: its resolution, view and options).
-    let series = app.shown_series(cid);
-    let cached = app.frames.cached_frames(&series);
     let fd = comp.frame_duration().seconds();
-    let cy0 = wa_row.max.y - 4.0;
-    let mut run: Option<(i64, i64)> = None;
-    let draw_run = |a: i64, b: i64| {
-        let x0 = tm.x(a as f64 * fd);
-        let x1 = tm.x((b + 1) as f64 * fd);
-        p.rect_filled(Rect::from_min_max(pos2(x0, cy0), pos2(x1, cy0 + 2.5)), 0.0, t.cache_green);
-    };
-    for f in cached {
-        run = match run {
-            Some((a, b)) if f == b + 1 => Some((a, f)),
-            Some((a, b)) => {
-                draw_run(a, b);
-                Some((f, f))
-            }
-            None => Some((f, f)),
-        };
-    }
-    if let Some((a, b)) = run {
-        draw_run(a, b);
-    }
-    // Disk-cached frames not in RAM (blue), like After Effects.
-    if app.session.disk_cache.is_some() || app.frames.remote_disk() {
-        let frames = comp.frame_rate.frame_at(comp.duration);
-        let opts = app.frame_opts(cid, series.scale as f64 / 1000.0);
-        let disk = app.frames.disk_frames(&app.render_source(), &series, frames, &opts);
-        let draw_blue = |a: i64, b: i64| {
-            let x0 = tm.x(a as f64 * fd);
-            let x1 = tm.x((b + 1) as f64 * fd);
-            p.rect_filled(Rect::from_min_max(pos2(x0, cy0), pos2(x1, cy0 + 2.5)), 0.0, t.cache_blue);
-        };
-        let mut run: Option<(i64, i64)> = None;
-        for f in disk {
-            run = match run {
-                Some((a, b)) if f == b + 1 => Some((a, f)),
-                Some((a, b)) => {
-                    draw_blue(a, b);
-                    Some((f, f))
-                }
-                None => Some((f, f)),
-            };
-        }
-        if let Some((a, b)) = run {
-            draw_blue(a, b);
-        }
-    }
-    // Ticks + labels.
-    // Label spacing in whole frames (AE: `00:15f`-style seconds:frames labels).
-    let fps_i = fr.as_f64().round().max(1.0) as i64;
-    let half = (fps_i / 2).max(1);
-    let label_frames = [1, 2, 5, 10, half, fps_i, 2 * fps_i, 5 * fps_i, 10 * fps_i, 30 * fps_i, 60 * fps_i]
-        .into_iter()
-        .find(|f| *f as f64 * fd * pps >= 52.0)
-        .unwrap_or(60 * fps_i);
-    let secs_per_label = label_frames as f64 * fd;
-    let first = (tm.start / secs_per_label).floor() * secs_per_label;
-    let mut s = first;
-    let pr = p.with_clip_rect(Rect::from_min_max(pos2(graph_x0, ruler.min.y), pos2(bin.min.x, ruler.max.y)));
-    while s <= tm.t(graph_x1) + secs_per_label {
-        let x = tm.x(s);
-        pr.line_segment([pos2(x, ruler.max.y - 10.0), pos2(x, ruler.max.y)], Stroke::new(1.0, t.tl_ruler_tick));
-        let fno = (s / fd).round() as i64;
-        let label = ruler_label(fno, fps_i, &app.session.project.settings);
-        // A label that would run under the marker bin is left out rather than cut to a stray digit.
-        let g = pr.layout_no_wrap(label, Tokens::ui(10.0), t.tl_ruler_text);
-        if x + 3.0 + g.size().x <= bin.min.x {
-            pr.galley(pos2(x + 3.0, ruler.max.y - 16.0 - g.size().y / 2.0), g, t.tl_ruler_text);
-        }
-        for k in 1..5 {
-            let xx = tm.x(s + secs_per_label * k as f64 / 5.0);
-            pr.line_segment([pos2(xx, ruler.max.y - 4.0), pos2(xx, ruler.max.y)], Stroke::new(1.0, t.tl_ruler_tick.gamma_multiply(0.6)));
-        }
-        s += secs_per_label;
-    }
-    // Scrub in the ruler: the current time jumps to the pointer as soon as the button goes down
-    // (After Effects), then follows it.
-    let rresp =
-        ui.interact(Rect::from_min_max(pos2(graph_x0, ruler.min.y + 12.0), pos2(bin.min.x, ruler.max.y)), egui::Id::new("tl-ruler"), Sense::click_and_drag());
-    if ((rresp.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_down())) || rresp.clicked())
-        && let Some(pt) = rresp.interact_pointer_pos()
-    {
-        let mut x = pt.x;
-        // Zoomed in, a scrub held past either end of the ruler scrolls the timeline that way
-        // (faster the further), with the CTI at the edge (After Effects).
-        let mut tm = tm;
-        if rresp.dragged() && app.ui.timeline.pps.is_some() {
-            let speed = edge_scroll_speed_x(tm.x0, graph_x1, x);
-            if speed != 0.0 {
-                let dt = f64::from(ui.input(|i| i.stable_dt).clamp(0.0, 0.1));
-                let span = f64::from(graph_x1 - tm.x0) / pps;
-                let cur = app.ui.timeline.start;
-                let hi = (comp.duration.seconds() - span).max(0.0).max(cur);
-                app.ui.timeline.start = (cur + f64::from(speed) * dt / pps).clamp(0.0, hi);
-                tm.start = app.ui.timeline.start;
-                ui.ctx().request_repaint();
-            }
-            x = x.clamp(tm.x0, graph_x1);
-        }
-        let mut secs = tm.t(x).max(0.0);
-        // Shift-drag: snap to keyframes, in/out points, markers and the work area (8 px).
-        if ui.input(|i| i.modifiers.shift) {
-            let cands = snap_candidates(&comp, &build_rows(app, &comp));
-            secs = snap_time(&cands, secs, 8.0 / pps.max(1e-6));
-        }
-        let tt = Tick::from_seconds_f64(secs);
-        app.session.set_time(tt);
-        app.stop();
-        // Dragged past either edge of the ruler (over the layer outline, say), the view scrolls so
-        // the current time indicator stays in sight (After Effects).
-        if app.ui.timeline.pps.is_some() {
-            let now = app.session.time().seconds();
-            let span = tm.t(bin.min.x) - tm.start;
-            if now < tm.start {
-                app.ui.timeline.start = now.max(0.0);
-            } else if now > tm.start + span {
-                app.ui.timeline.start = (now - span).max(0.0);
-            }
-        }
-        // Ctrl/Cmd-drag scrubs the audio too (After Effects).
-        if rresp.dragged()
-            && ui.input(|i| i.modifiers.command)
-            && let Some(cid) = app.session.active_comp_id()
-        {
-            let now = ui.input(|i| i.time);
-            let t = app.session.time();
-            app.scrub_audio(cid, t, now);
-        }
+    Tl {
+        t,
+        cid,
+        time,
+        fr,
+        rect,
+        header_h,
+        colhdr_h,
+        footer_h,
+        vis,
+        left_w,
+        overflow,
+        oscroll,
+        cw,
+        graph_x0,
+        graph_x1,
+        fit_pps,
+        pps,
+        scroll_to,
+        tm,
+        top,
+        rows_rect,
+        ruler,
+        bin,
+        tc_rect,
+        wa_row,
+        fd,
+        rh: t.row_h,
+        max_scroll: 0.0,
+        ctx,
+        comp: comp.clone(),
+        p,
+        rows: Arc::new(Vec::new()),
+        actions: Vec::new(),
     }
+}
 
-    // ---- column headers (right-click: show/hide columns; click the name header: Source/Layer Name).
-    let ch = Rect::from_min_max(pos2(rect.min.x, top + header_h), pos2(rect.max.x, top + header_h + colhdr_h));
-    p.rect_filled(Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y)), 0.0, t.panel_bg);
-    p.line_segment([pos2(rect.min.x, ch.max.y), pos2(rect.max.x, ch.max.y)], Stroke::new(1.0, t.separator));
-    let hy = ch.center().y;
-    // Column headers scroll with the outline and never spill into the time ruler.
-    let hp = p.with_clip_rect(Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y)));
-    let hic = |icon: Icon, x: f32| icons::paint(&hp, Rect::from_center_size(pos2(x, hy), vec2(12.0, 12.0)), icon, t.text_dim);
-    let htext = |x: f32, s: &str| hp.text(pos2(x, hy), Align2::LEFT_CENTER, s, Tokens::ui(11.0), t.text_dim);
-    if vis.av {
-        hic(Icon::Eye, cw.av + 10.0);
-        hic(Icon::Speaker, cw.av + 28.0);
-        hic(Icon::Solo, cw.av + 46.0);
-        hic(Icon::Lock, cw.av + 64.0);
-    }
-    if vis.keys {
-        htext(cw.keys + 6.0, "Keys");
-    }
-    if vis.label {
-        icons::paint(&hp, Rect::from_center_size(pos2(cw.label + 10.0, hy), vec2(10.0, 10.0)), Icon::Keyframe, t.text_dim);
-    }
-    if vis.num {
-        htext(cw.num + 6.0, "#");
-    }
-    let name_hdr = if app.ui.timeline.source_name { "Source Name" } else { "Layer Name" };
-    htext(cw.name + 22.0, name_hdr);
-    if vis.comment {
-        htext(cw.comment + 6.0, "Comment");
-    }
-    if vis.switches {
-        for (i, icon) in
-            [Icon::Shy, Icon::Collapse, Icon::Quality, Icon::Fx, Icon::FrameBlend, Icon::MotionBlur, Icon::Adjustment, Icon::Cube].into_iter().enumerate()
-        {
-            hic(icon, cw.switches + SW * i as f32 + SW / 2.0);
-        }
-    }
-    if vis.modes {
-        htext(cw.mode + 4.0, "Mode");
-        htext(cw.mode + 74.0, "T");
-        htext(cw.trkmat + 4.0, "Track Matte");
-    }
-    if vis.parent {
-        icons::paint(&hp, Rect::from_center_size(pos2(cw.parent + 10.0, hy), vec2(12.0, 12.0)), Icon::PickWhip, t.text_dim);
-        htext(cw.parent + 20.0, "Parent & Link");
-    }
-    for (on, x, s) in [(vis.in_, cw.in_, "In"), (vis.out, cw.out, "Out"), (vis.duration, cw.duration, "Duration"), (vis.stretch, cw.stretch, "Stretch")] {
-        if on {
-            htext(x + 6.0, s);
-        }
-    }
-    let hdr_rect = Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y));
-    let hresp = ui.interact(hdr_rect, egui::Id::new("tl-colhdr"), Sense::click());
-    app.auto.add("timeline.header", hdr_rect, "Columns (right-click)");
-    for (id, label) in COLUMNS {
-        if let Some(x0) = match id {
-            "av" => vis.av.then_some((cw.av, AV_W)),
-            "keys" => vis.keys.then_some((cw.keys, KEYS_W)),
-            "label" => vis.label.then_some((cw.label, LABEL_W)),
-            "num" => vis.num.then_some((cw.num, NUM_W)),
-            "name" => Some((cw.name, cw.name_end - cw.name)),
-            "comment" => vis.comment.then_some((cw.comment, COMMENT_W)),
-            "switches" => vis.switches.then_some((cw.switches, SW * 8.0 + 6.0)),
-            "modes" => vis.modes.then_some((cw.mode, MODES_W)),
-            "parent" => vis.parent.then_some((cw.parent, PARENT_W)),
-            "in" => vis.in_.then_some((cw.in_, TIME_W)),
-            "out" => vis.out.then_some((cw.out, TIME_W)),
-            "duration" => vis.duration.then_some((cw.duration, TIME_W)),
-            _ => vis.stretch.then_some((cw.stretch, STRETCH_W)),
-        } {
-            app.auto.add(&format!("timeline.header.{id}"), Rect::from_min_size(pos2(x0.0, ch.min.y), vec2(x0.1, colhdr_h)), label);
-        }
-    }
-    if hresp.clicked()
-        && let Some(pt) = hresp.interact_pointer_pos()
-        && column_at(&cw, pt.x) == Some("name")
+/// Without an active composition: a hint, and dropping footage creates the first composition.
+fn empty_timeline(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let ctx = ui.ctx().clone();
+    ui.painter().text(rect.center(), Align2::CENTER_CENTER, "(no composition)", Tokens::ui(12.0), t.text_faint);
+    // Dropping footage into an empty Timeline should create its first composition,
+    // just like dropping onto the Project panel's New Composition button (#649).
+    if let Some(crate::panels::DragPayload::Item(dragged)) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx).as_deref()
+        && ui.rect_contains_pointer(rect)
     {
-        app.ui.timeline.source_name = !app.ui.timeline.source_name;
-    }
-    if hresp.secondary_clicked() {
-        let under = hresp.interact_pointer_pos().and_then(|pt| column_at(&cw, pt.x));
-        ctx.data_mut(|d| d.insert_temp(egui::Id::new("tl-colhdr-under"), under.unwrap_or("")));
-    }
-    crate::widgets::context_menu(&hresp, |ui| {
-        let under: &str = ctx.data(|d| d.get_temp(egui::Id::new("tl-colhdr-under"))).unwrap_or("");
-        if !under.is_empty() && under != "name" && ui.button(crate::i18n::tr("Hide This")).clicked() {
-            actions.push(("timeline.column".into(), json!({"column": under, "visible": false})));
-            ui.close();
-        }
-        ui.menu_button(crate::i18n::tr("Columns"), |ui| {
-            for (id, label) in COLUMNS {
-                let label = if id == "name" { if app.ui.timeline.source_name { "Source Name" } else { "Layer Name" } } else { label };
-                let on = column_visible(&app.ui.timeline, id);
-                if ui.add_enabled(id != "name", egui::Button::new(label).selected(on)).clicked() {
-                    actions.push(("timeline.column".into(), json!({"column": id, "visible": !on})));
-                    ui.close();
+        let items: Vec<ItemId> = crate::panels::project_drop_items(app, *dragged)
+            .into_iter()
+            .map(ItemId)
+            .filter(|id| {
+                app.session.project.item(*id).is_some_and(|item| match &item.kind {
+                    effectcraft_engine::project::ItemKind::Footage(footage) => footage.kind != effectcraft_engine::project::FootageKind::Data,
+                    effectcraft_engine::project::ItemKind::Solid(_) | effectcraft_engine::project::ItemKind::Comp(_) => true,
+                    _ => false,
+                })
+            })
+            .collect();
+        if !items.is_empty() {
+            ui.painter().rect_stroke(rect.shrink(2.0), 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
+            app.auto.add("timeline.newCompDrop", rect, "Drop footage to create a composition");
+            if ctx.input(|i| i.pointer.any_released()) {
+                app.session.state.project_selection = items;
+                if let Err(e) = crate::menus::invoke(app, &ctx, "file.newCompFromSelection", json!({})) {
+                    app.ui.status = e;
                 }
+                egui::DragAndDrop::clear_payload(&ctx);
             }
-        });
-        if ui.button(if app.ui.timeline.source_name { crate::i18n::tr("Show Layer Name") } else { crate::i18n::tr("Show Source Name") }).clicked() {
-            actions.push(("timeline.sourceName".into(), json!({})));
-            ui.close();
         }
-    });
-    let _ = cw.end;
+    }
+}
 
-    // ---- rows.
-    let rows = with_expr_rows(build_rows(app, &comp), &comp, &app.ui.timeline, &ctx);
-    let rh = t.row_h;
-    let total_h: f32 = rows.iter().map(|r| row_height(r, rh)).sum();
-    let max_scroll = (total_h - rows_rect.height() + rh).max(0.0);
-    if scroll_to == Some(crate::state::ScrollTo::Layer) {
-        // The topmost selected layer, in stack order.
-        let sel = &app.session.state.selected_layers;
-        let top = comp.layers.iter().find(|l| sel.contains(&l.id)).map(|l| l.id);
-        if let Some(i) = rows.iter().position(|r| matches!(r.kind, RowKind::Layer) && Some(r.layer) == top) {
-            app.ui.timeline.scroll_y = rows.iter().take(i).map(|r| row_height(r, rh)).sum();
-        }
-    } else if let Some(crate::state::ScrollTo::Property(uid)) = scroll_to
-        && let Some(i) = rows.iter().position(|r| matches!(r.kind, RowKind::Prop { uid: p } if p == uid))
-    {
-        app.ui.timeline.scroll_y = rows.iter().take(i).map(|r| row_height(r, rh)).sum();
-    }
-    if ui.rect_contains_pointer(rows_rect) {
-        let (dy, dx, zoom) = ui.input(|i| (i.smooth_scroll_delta.y, i.smooth_scroll_delta.x, i.modifiers.alt));
-        // Ctrl/Cmd+wheel and a trackpad pinch reach egui as a zoom factor rather than a scroll
-        // (#428); like Alt+wheel they zoom time.
-        let pinch = ui.input(|i| i.zoom_delta()) as f64;
-        let at_x = ui.input(|i| i.pointer.hover_pos()).map(|p| p.x).unwrap_or(graph_x0);
-        if (pinch - 1.0).abs() > 1e-4 {
-            set_zoom(&mut app.ui.timeline, &comp, tm.pps * pinch, fit_pps, tm.t(at_x), (at_x - tm.x0) as f64);
-        } else if zoom && dy.abs() > 0.0 {
-            // Alt+wheel zooms around the pointer, out until the whole comp shows.
-            set_zoom(&mut app.ui.timeline, &comp, tm.pps * (dy as f64 / 200.0).exp(), fit_pps, tm.t(at_x), (at_x - tm.x0) as f64);
-        } else {
-            let over_outline = ui.input(|i| i.pointer.hover_pos()).is_some_and(|p| p.x < graph_x0);
-            let shift = ui.input(|i| i.modifiers.shift);
-            if over_outline && overflow > 0.0 && (dx.abs() > 0.0 || (shift && dy.abs() > 0.0)) {
-                let d = if dx.abs() > 0.0 { dx } else { dy };
-                app.ui.timeline.outline_scroll = (app.ui.timeline.outline_scroll - d).clamp(0.0, overflow);
-            } else {
-                app.ui.timeline.scroll_y = (app.ui.timeline.scroll_y - dy).clamp(0.0, max_scroll);
-            }
-            if dx.abs() > 0.0 && app.ui.timeline.pps.is_some() && !over_outline {
-                app.ui.timeline.start = (app.ui.timeline.start - dx as f64 / pps).max(0.0);
-            }
-        }
-    }
-    // A pick whip held near the top or bottom of the layers (or past it) scrolls them, as in
-    // After Effects.
-    if ctx.data(|d| d.get_temp::<PickWhip>(pick_whip_id())).is_some()
-        && let Some(ptr) = ctx.input(|i| i.pointer.latest_pos()).filter(|p| rect.x_range().contains(p.x))
-    {
-        let speed = edge_scroll_speed(rows_rect, ptr.y, rh);
-        if speed != 0.0 {
-            app.ui.timeline.scroll_y += speed * ctx.input(|i| i.stable_dt).min(0.1);
-            ctx.request_repaint();
-        }
-    }
-    app.ui.timeline.scroll_y = app.ui.timeline.scroll_y.clamp(0.0, max_scroll);
-    let snap_project = app.session.project.clone();
-    let snap_expr = app.session.expr.clone();
-    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time, expr: snap_expr.as_deref(), footage: None };
-    let lp = p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(rows_rect.min, pos2(graph_x0 - 1.0, rows_rect.max.y))));
-    let gp = p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max)));
-    let mut y = rows_rect.min.y - app.ui.timeline.scroll_y;
-    let selected = app.session.state.selected_layers.clone();
-    let sel_keys = app.session.state.selected_keys.clone();
-    let mut ui_actions: Vec<UiAct> = Vec::new();
-    let idx_of = |id: LayerId| comp.index_of(id).unwrap_or(0);
+/// Starts the rows pass: the clipped painters and the background responses.
+fn begin_rows(app: &mut EffectcraftApp, ui: &mut egui::Ui, tl: Tl) -> Rw {
+    let rows_rect = tl.rows_rect;
+    let graph_x0 = tl.graph_x0;
+    let rect = tl.rect;
+    let lp = tl.p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(rows_rect.min, pos2(graph_x0 - 1.0, rows_rect.max.y))));
+    let gp = tl.p.with_clip_rect(rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max)));
     let graph_on = app.ui.timeline.graph_editor;
     super::graph::track_open(ui.ctx(), graph_on);
     let full_clip = ui.clip_rect();
@@ -1954,1458 +1766,95 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let right_clip = full_clip.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));
     // Registered before the rows so keys, bars and editors on top of it get the pointer first.
     let empty_rect = if graph_on { Rect::NOTHING } else { Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max) };
-    let empty = ui.interact(empty_rect, egui::Id::new("tl-graph-bg"), Sense::click_and_drag());
+    let empty = ui.interact(empty_rect, egui::Id::unique("tl-graph-bg"), Sense::click_and_drag());
     let outline_rect = Rect::from_min_max(rows_rect.min, pos2(graph_x0 - 1.0, rows_rect.max.y));
-    let outline_empty = ui.interact(outline_rect, egui::Id::new("tl-layer-bg"), Sense::click_and_drag());
+    let outline_empty = ui.interact(outline_rect, egui::Id::unique("tl-layer-bg"), Sense::click_and_drag());
     app.auto.add("timeline.layerMarquee", outline_rect, "Drag empty outline to select layers");
-    let mut hit_rows: Vec<(Rect, Row)> = vec![];
-    // The value fields of multi-dimension properties (per dimension), for the pick whip.
-    let mut dim_hits: Vec<(u64, Vec<Rect>)> = vec![];
-    // Rows stripe by their index among the rows that are not expression editors, so adding or
-    // removing an expression leaves every other row's stripe alone; an editor takes the index
-    // (and so the stripe) of its property's row, the one just above.
-    let mut striped = 0usize;
-    for row in rows.iter() {
-        let ri = if matches!(row.kind, RowKind::Expr { .. }) {
-            striped.saturating_sub(1)
-        } else {
-            striped += 1;
-            striped - 1
-        };
-        // Outline widgets never spill into the time graph (narrow timelines).
-        ui.set_clip_rect(left_clip);
-        let hh = row_height(row, rh);
-        let r = Rect::from_min_size(pos2(rect.min.x, y), vec2(rect.width(), hh));
-        y += hh;
-        if r.max.y < rows_rect.min.y || r.min.y > rows_rect.max.y {
-            continue;
-        }
-        hit_rows.push((r, row.clone()));
-        let Some(layer) = comp.layer(row.layer) else { continue };
-        let is_sel = selected.contains(&layer.id);
-        let left = Rect::from_min_max(r.min, pos2(graph_x0 - 1.0, r.max.y));
-        let cy = r.min.y + rh / 2.0;
-        match &row.kind {
-            RowKind::Layer => {
-                // After Effects draws layer rows as one flat tone separated by dark hairlines
-                // (outline and time graph alike), not as alternating stripes.
-                let _ = ri;
-                lp.rect_filled(left, 0.0, if is_sel { t.row_selected } else { t.row_alt });
-                gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, if is_sel { t.tl_graph_selected } else { t.tl_bg });
-                lp.line_segment([pos2(rect.min.x, r.max.y - 0.5), pos2(graph_x0, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));
-                gp.line_segment([pos2(graph_x0, r.max.y - 0.5), pos2(r.max.x, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));
-                // A/V features.
-                let sw = &layer.switches;
-                // Every layer has the Video switch (the eye), nulls, cameras and lights included,
-                // as in After Effects: it hides a null's outline in the viewer and turns a camera or
-                // light off.
-                let av_items: [(Icon, bool, &str, bool); 4] = [
-                    (Icon::Eye, sw.video, "video", true),
-                    (Icon::Speaker, sw.audio, "audio", layer.props.sub("audio").is_some()),
-                    (Icon::Solo, sw.solo, "solo", layer.source.is_av()),
-                    (Icon::Lock, sw.locked, "lock", true),
-                ];
-                for (i, (icon, on, name, applicable)) in av_items.into_iter().enumerate() {
-                    let br = Rect::from_center_size(pos2(cw.av + 10.0 + 18.0 * i as f32, cy), vec2(15.0, 15.0));
-                    if !applicable || !vis.av {
-                        continue;
-                    }
-                    lp.rect_filled(br.shrink(0.5), 1.0, t.switch_well);
-                    layer_switch(ui, &t, r, br, icon, on, egui::Id::new(("av", layer.id.0, i)), layer.id.0, name, true, &mut actions);
-                    app.auto.add(&format!("timeline.layer.{}.{name}", layer.id.0), br, name);
-                }
-                // Label swatch.
-                if vis.label {
-                    let lr = Rect::from_center_size(pos2(cw.label + 10.0, cy), vec2(12.0, 12.0));
-                    lp.rect_filled(lr, 2.0, t.label(layer.label));
-                    let lresp = ui.interact(lr, egui::Id::new(("label", layer.id.0)), Sense::click());
-                    app.auto.add(&format!("timeline.layer.{}.label", layer.id.0), lr, layer.label.name());
-                    // Click (or right-click) the swatch for the label menu (After Effects).
-                    let pop = egui::Id::new(("label-pop", layer.id.0));
-                    if lresp.clicked() || lresp.secondary_clicked() {
-                        widgets::open_popup(ui, pop);
-                    }
-                    if let Some(lab) = widgets::label_popup(ui, pop, lr.left_bottom(), layer.label, |l| app.session.prefs.label_name(l), &t) {
-                        actions.push(("edit.label".into(), json!({"layers": [layer.id.0], "label": lab.name()})));
-                    }
-                }
-                if vis.num {
-                    lp.text(pos2(cw.num + 13.0, cy), Align2::CENTER_CENTER, format!("{}", idx_of(layer.id)), Tokens::ui(11.5), t.text_dim);
-                }
-                layer_cells(app, ui, &lp, &cw, &comp, layer, r, cy, &mut actions);
-                // Row click → select; double-click → rename; drag → reorder. Registered before the
-                // twirl and the name field so those sit on top and get their clicks.
-                let row_x0 = if vis.num { cw.num } else { cw.name + 16.0 };
-                let row_resp = ui.interact(
-                    Rect::from_min_max(pos2(row_x0, r.min.y), pos2(cw.name_end, r.max.y)),
-                    egui::Id::new(("row", layer.id.0)),
-                    Sense::click_and_drag(),
-                );
-                // Twirl + icon + name.
-                let tw = Rect::from_center_size(pos2(cw.name + 8.0, cy), vec2(14.0, 14.0));
-                let open = app.ui.timeline.open_layers.contains(&layer.id.0);
-                if widgets::twirl(ui, tw, open, egui::Id::new(("twirl", layer.id.0)), &t).clicked() {
-                    ui_actions.push(UiAct::ToggleLayer(layer.id.0, ui.input(|i| i.modifiers.alt || i.modifiers.command)));
-                }
-                app.auto.add(&format!("timeline.layer.{}.twirl", layer.id.0), tw, "twirl");
-                icons::paint(&lp, Rect::from_center_size(pos2(cw.name + 24.0, cy), vec2(13.0, 13.0)), layer_icon(layer, &app.session.project), t.text_dim);
-                let name_rect = Rect::from_min_max(pos2(cw.name + 34.0, r.min.y), pos2(cw.name_end - 4.0, r.max.y));
-                let rename_id = egui::Id::new("tl-rename");
-                let renaming: Option<(u64, String)> = ctx.data(|d| d.get_temp(rename_id));
-                if let Some((rl, mut buf)) = renaming.filter(|(rl, _)| *rl == layer.id.0) {
-                    let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect.shrink2(vec2(0.0, 2.0))));
-                    let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(name_rect.width()));
-                    app.auto.add(&format!("timeline.layer.{rl}.nameEdit"), er.rect, &buf);
-                    if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {
-                        // Just started: focus the field with the whole name selected.
-                        er.request_focus();
-                        widgets::select_all(&ctx, er.id, &buf);
-                    }
-                    if er.lost_focus() {
-                        if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
-                            actions.push(("layer.rename".into(), json!({"layer": rl, "name": buf})));
-                        }
-                        ctx.data_mut(|d| d.remove::<(u64, String)>(rename_id));
-                    } else {
-                        ctx.data_mut(|d| d.insert_temp(rename_id, (rl, buf)));
-                    }
-                } else {
-                    // The selected layer's name sits in a light cell with dark text.
-                    let name_col = if is_sel { Color32::from_gray(0x16) } else { t.text };
-                    if is_sel {
-                        let g = lp.layout_no_wrap(display_name(app, layer), Tokens::ui(12.0), name_col);
-                        let cell = Rect::from_min_max(
-                            pos2(name_rect.min.x - 3.0, r.min.y + 1.0),
-                            pos2((name_rect.min.x + g.size().x + 4.0).max(cw.name_end - 4.0).min(cw.name_end - 2.0), r.max.y - 1.0),
-                        );
-                        lp.rect_filled(cell, 0.0, SELECTED_NAME_BG);
-                    }
-                    let lpn = lp.with_clip_rect(name_rect.intersect(lp.clip_rect()));
-                    lpn.text(pos2(name_rect.min.x, cy), Align2::LEFT_CENTER, display_name(app, layer), Tokens::ui(12.0), name_col);
-                }
-                // Locked layers can't be selected or moved (unlock them with the lock switch).
-                let locked = layer.switches.locked;
-                if row_resp.drag_started() && !locked {
-                    // The selected layers move together; an unselected row moves alone.
-                    let moving: Vec<u64> =
-                        if is_sel { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };
-                    ctx.data_mut(|d| d.insert_temp(layer_drag_id(), moving));
-                }
-                if row_resp.drag_stopped() {
-                    ctx.data_mut(|d| d.insert_temp(layer_drop_id(), true));
-                }
-                app.auto.add(&format!("timeline.layer.{}.row", layer.id.0), left, &layer.name);
-                if row_resp.clicked() && !locked {
-                    let m = ui.input(|i| i.modifiers);
-                    if let Some(layers) = m.shift.then(|| shift_range(&ctx, cid, &comp, &rows, &selected, layer.id)).flatten() {
-                        actions.push(("layer.select".into(), json!({"layers": layers})));
-                    } else {
-                        actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "toggle": m.command})));
-                        set_anchor(&ctx, cid, layer.id);
-                    }
-                }
-                if row_resp.double_clicked() {
-                    match double_click_action(layer) {
-                        Some(a) => actions.push(a),
-                        None => start_rename(&ctx, layer.id.0, &layer.name),
-                    }
-                }
-                layer_context_menu(&row_resp, &comp, layer, &selected, LayerMenuCaps::of(&app.session.project, layer), &mut actions);
-                // Switches.
-                let sws: [(Icon, bool, &str, bool); 8] = [
-                    (Icon::Shy, sw.shy, "shy", true),
-                    (Icon::Collapse, sw.collapse, "collapse", collapse_applies(layer, &app.session.project)),
-                    (Icon::Quality, sw.quality == effectcraft_engine::project::Quality::Best, "quality", layer.source.is_av()),
-                    (Icon::Fx, sw.effects, "fx", layer.effects().is_some_and(|f| !f.children.is_empty())),
-                    (
-                        Icon::FrameBlend,
-                        sw.frame_blend != effectcraft_engine::project::FrameBlend::Off,
-                        "frameBlend",
-                        matches!(layer.source, LayerSource::Footage { .. } | LayerSource::Comp { .. }),
-                    ),
-                    (Icon::MotionBlur, sw.motion_blur, "motionBlur", layer.source.is_av()),
-                    (Icon::Adjustment, sw.adjustment, "adjustment", layer.source.is_av()),
-                    (Icon::Cube, layer.is_3d(), "threeD", layer.source.is_av() || matches!(layer.source, LayerSource::Null)),
-                ];
-                for (i, (icon, on, name, applicable)) in sws.into_iter().enumerate() {
-                    if !applicable || !vis.switches {
-                        continue;
-                    }
-                    let br = Rect::from_center_size(pos2(cw.switches + SW * i as f32 + SW / 2.0, cy), vec2(16.0, 16.0));
-                    lp.rect_filled(br.shrink(1.0), 1.0, t.switch_well);
-                    layer_switch(ui, &t, r, br, icon, on, egui::Id::new(("sw", layer.id.0, i)), layer.id.0, name, false, &mut actions);
-                    app.auto.add(&format!("timeline.layer.{}.switch.{name}", layer.id.0), br, name);
-                }
-                // Modes.
-                if app.ui.timeline.show_modes && layer.source.is_av() {
-                    let mr = Rect::from_min_size(pos2(cw.mode + 2.0, cy - 9.0), vec2(80.0, 18.0));
-                    let mresp = widgets::dropdown(ui, mr, layer.blend_mode.label(), &t, egui::Id::new(("mode", layer.id.0)));
-                    app.auto.add(&format!("timeline.layer.{}.mode", layer.id.0), mr, "Mode");
-                    let pop = egui::Id::new(("mode-pop", layer.id.0));
-                    if mresp.clicked() {
-                        widgets::open_popup(ui, pop);
-                    }
-                    let opts: Vec<String> = BlendMode::ALL
-                        .iter()
-                        .flat_map(|m| if m.ends_group() { vec![m.label().to_string(), "-".to_string()] } else { vec![m.label().to_string()] })
-                        .collect();
-                    if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, opts.iter().position(|o| o == layer.blend_mode.label())) {
-                        actions.push(("layer.setBlendMode".into(), json!({"layers": [layer.id.0], "mode": opts[i]})));
-                    }
-                    let tr = Rect::from_center_size(pos2(cw.mode + 76.0 + 6.0, cy), vec2(14.0, 14.0));
-                    if widgets::checkbox(ui, tr, layer.preserve_transparency, &t, egui::Id::new(("pt", layer.id.0))).clicked() {
-                        actions.push(("layer.setSwitch".into(), json!({"layers": [layer.id.0], "switch": "preserveTransparency"})));
-                    }
-                    // Track matte: layer picker + kind.
-                    let mr = Rect::from_min_size(pos2(cw.trkmat + 2.0, cy - 9.0), vec2(104.0, 18.0));
-                    let label = match layer.track_matte {
-                        Some(m) => comp.layer(m.layer).map(|l| format!("{} {}", idx_of(l.id), l.name)).unwrap_or("None".into()),
-                        None => "No Track Matte".into(),
-                    };
-                    // The cell is too narrow for the mode as well: it is in the tooltip and ticked in the menu.
-                    let tip = layer.track_matte.map(|m| format!("{label} · {}", crate::i18n::tr(m.kind.label())));
-                    let tresp = widgets::dropdown_tip(ui, mr, &label, tip.as_deref(), &t, egui::Id::new(("trkmat", layer.id.0)));
-                    app.auto.add(&format!("timeline.layer.{}.trackMatte", layer.id.0), mr, "Track Matte");
-                    let pop = egui::Id::new(("trk-pop", layer.id.0));
-                    if tresp.clicked() {
-                        widgets::open_popup(ui, pop);
-                    }
-                    // The menu lists every layer: built only while it is open (per visible row
-                    // it made a big comp's timeline quadratic).
-                    let mut opts = vec!["No Track Matte".to_string(), "-".to_string()];
-                    let mut candidates: Vec<&Layer> = vec![];
-                    if widgets::popup_is_open(ui, pop) {
-                        for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id && l.source.is_av()) {
-                            opts.push(format!("{}. {}", i + 1, l.name));
-                            candidates.push(l);
-                        }
-                        opts.push("-".into());
-                        for k in MatteKind::ALL {
-                            opts.push(k.label().into());
-                        }
-                    }
-                    let current = layer.track_matte.and_then(|m| opts.iter().position(|o| o == m.kind.label()));
-                    if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, current) {
-                        let ids: Vec<LayerId> = candidates.iter().map(|l| l.id).collect();
-                        if let Some(a) = opts.get(i).and_then(|o| track_matte_pick(layer, &ids, i, o)) {
-                            actions.push(a);
-                        }
-                    }
-                    if layer.track_matte.is_some() {
-                        let kr = Rect::from_center_size(pos2(mr.max.x - 26.0, cy), vec2(10.0, 10.0));
-                        let _ = kr;
-                    }
-                }
-                // Parent.
-                if vis.parent {
-                    pick_whip(
-                        app,
-                        ui,
-                        &lp,
-                        Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),
-                        (WHIP_PARENT, layer.id.0, 0),
-                        &format!("timeline.layer.{}.pickWhip", layer.id.0),
-                        "Parent pick whip",
-                        crate::i18n::tr("Parent pick whip: drag onto a layer"),
-                    );
-                    let pr_rect = Rect::from_min_size(pos2(cw.parent + 20.0, cy - 9.0), vec2(94.0, 18.0));
-                    let plabel = layer.parent.and_then(|p| comp.layer(p)).map(|l| format!("{}. {}", idx_of(l.id), l.name)).unwrap_or_else(|| "None".into());
-                    let presp = widgets::dropdown(ui, pr_rect, &plabel, &t, egui::Id::new(("parent", layer.id.0)));
-                    app.auto.add(&format!("timeline.layer.{}.parent", layer.id.0), pr_rect, "Parent");
-                    let pop = egui::Id::new(("par-pop", layer.id.0));
-                    if presp.clicked() {
-                        widgets::open_popup(ui, pop);
-                    }
-                    let mut cands: Vec<&Layer> = vec![];
-                    let mut popts = vec!["None".to_string(), "-".to_string()];
-                    if widgets::popup_is_open(ui, pop) {
-                        for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id) {
-                            popts.push(format!("{}. {}", i + 1, l.name));
-                            cands.push(l);
-                        }
-                    }
-                    if let Some(i) = widgets::popup_menu(ui, pop, pr_rect.left_bottom(), &popts, None) {
-                        let par = if i == 0 { serde_json::Value::Null } else { json!(cands[i - 2].id.0) };
-                        actions.push(("layer.setParent".into(), json!({"layers": [layer.id.0], "parent": par})));
-                    }
-                }
-                // Layer bar.
-                ui.set_clip_rect(right_clip);
-                if !graph_on {
-                    let x_in = tm.x(layer.in_point.seconds());
-                    let x_out = tm.x(layer.out_point.seconds());
-                    let bar = Rect::from_min_max(pos2(x_in, r.min.y + 1.0), pos2(x_out, r.max.y - 1.0));
-                    let lc = t.label(layer.label);
-                    let fill = bar_color(lc, is_sel);
-                    gp.rect_filled(bar, 0.0, fill);
-                    if is_sel {
-                        gp.rect_stroke(bar, 0.0, Stroke::new(1.0, Color32::from_white_alpha(90)), StrokeKind::Inside);
-                    }
-                    // Source extent (e.g. trimmed footage) shown faint.
-                    if let LayerSource::Footage { .. } | LayerSource::Comp { .. } = layer.source
-                        && let Some(d) = layer.source.item().and_then(|i| app.session.project.item(i)).and_then(|i| i.duration())
-                    {
-                        let xs = tm.x(layer.start_time.seconds());
-                        let xe = tm.x(layer.comp_time(d).seconds());
-                        let ghost = Rect::from_min_max(pos2(xs.min(xe), r.min.y + 9.0), pos2(xs.max(xe), r.max.y - 9.0));
-                        gp.rect_filled(ghost, 1.0, lc.gamma_multiply(0.18));
-                        // The bar past the source's end (its last frame held) or before its start
-                        // is striped, so the source's own span shows (#290). Time remapping
-                        // decides what shows there itself.
-                        if layer.props.get("timeRemap").is_none() {
-                            for (side, part) in [
-                                ("beforeSource", Rect::from_min_max(bar.min, pos2(ghost.min.x, bar.max.y))),
-                                ("afterSource", Rect::from_min_max(pos2(ghost.max.x, bar.min.y), bar.max)),
-                            ] {
-                                if part.width() >= 1.0 {
-                                    stripes(&gp, part, lc);
-                                    app.auto.add(&format!("timeline.layer.{}.bar.{side}", layer.id.0), part, "Past the source");
-                                }
-                            }
-                        }
-                        // Dragging the source bar outside the in/out span slips the source.
-                        for (side, gr) in [
-                            ("l", Rect::from_min_max(ghost.min, pos2(bar.min.x, ghost.max.y))),
-                            ("r", Rect::from_min_max(pos2(bar.max.x, ghost.min.y), ghost.max)),
-                        ] {
-                            if gr.width() < 2.0 {
-                                continue;
-                            }
-                            let gresp = ui
-                                .interact(gr, egui::Id::new(("ghost", side, layer.id.0)), Sense::click_and_drag())
-                                .on_hover_text(crate::i18n::tr("Drag to slip the source"));
-                            // Outside the bar it is empty track area: a plain click deselects.
-                            if gresp.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
-                                actions.push(("layer.select".into(), json!({"layers": []})));
-                            }
-                            app.auto.add(&format!("timeline.layer.{}.source{}", layer.id.0, side), gr, "Slip");
-                            if gresp.hovered() || gresp.dragged() {
-                                ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
-                            }
-                            let acc_id = egui::Id::new(("slip-acc", layer.id.0));
-                            if gresp.dragged() {
-                                let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
-                                acc += gresp.drag_delta().x;
-                                let frames = ((acc as f64 / pps) / fd).trunc() as i64;
-                                if frames != 0 {
-                                    acc -= (frames as f64 * fd * pps) as f32;
-                                    actions.push((
-                                        "layer.slip".into(),
-                                        json!({"layers": [layer.id.0], "frames": frames, "merge": format!("slip-{}", layer.id.0)}),
-                                    ));
-                                }
-                                ctx.data_mut(|d| d.insert_temp(acc_id, acc));
-                            }
-                            if gresp.drag_stopped() {
-                                ctx.data_mut(|d| d.remove::<f32>(acc_id));
-                                ui_actions.push(UiAct::EndMerge);
-                            }
-                        }
-                    }
-                    app.auto.add(&format!("timeline.layer.{}.bar", layer.id.0), bar, &layer.name);
-                    // Interactions: move body, trim edges.
-                    let (body_r, in_r, out_r) = trim_zones(bar);
-                    let body = ui.interact(body_r, egui::Id::new(("bar", layer.id.0)), Sense::click_and_drag());
-                    let lin = ui.interact(in_r, egui::Id::new(("bar-in", layer.id.0)), Sense::drag());
-                    let lout = ui.interact(out_r, egui::Id::new(("bar-out", layer.id.0)), Sense::drag());
-                    app.auto.add(&format!("timeline.layer.{}.bar.in", layer.id.0), in_r, "Trim In");
-                    app.auto.add(&format!("timeline.layer.{}.bar.out", layer.id.0), out_r, "Trim Out");
-                    if lin.hovered() || lout.hovered() || lin.dragged() || lout.dragged() {
-                        trim_cursor(&ctx);
-                    }
-                    if body.double_clicked()
-                        && let Some(a) = double_click_action(layer)
-                    {
-                        actions.push(a);
-                    }
-                    let shift = ui.input(|i| i.modifiers.shift);
-                    if let Some(layers) = (body.clicked() && shift).then(|| shift_range(&ctx, cid, &comp, &rows, &selected, layer.id)).flatten() {
-                        // Shift-click: the layers from the last one clicked to this one, as in
-                        // the layer outline.
-                        actions.push(("layer.select".into(), json!({"layers": layers})));
-                    } else {
-                        if (body.clicked() || body.drag_started()) && !is_sel {
-                            actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "add": shift})));
-                        }
-                        if (body.clicked() || body.drag_started()) && !shift {
-                            set_anchor(&ctx, cid, layer.id);
-                        }
-                    }
-                    layer_context_menu(&body, &comp, layer, &selected, LayerMenuCaps::of(&app.session.project, layer), &mut actions);
-                    let drag_key = format!("bar-{}", layer.id.0);
-                    // Ctrl/Cmd+Alt dragging a selected bar: Quick Offset (#1012), chosen as the
-                    // drag starts and followed below the rows until the button is released.
-                    let mods = ui.input(|i| i.modifiers);
-                    if body.drag_started()
-                        && is_sel
-                        && mods.command
-                        && mods.alt
-                        && let Some(n) = quick_offset_layers(&comp, selected.iter().copied())
-                        && let Some(p) = ctx.input(|i| i.pointer.press_origin())
-                    {
-                        ctx.data_mut(|d| d.insert_temp(quick_bar_id(), QuickBar { layer: layer.id, origin_x: p.x, layers: n, applied: 0 }));
-                    }
-                    let quick = ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())).is_some_and(|q| q.layer == layer.id);
-                    for (resp, kind) in [(&body, "move"), (&lin, "in"), (&lout, "out")] {
-                        if kind == "move" && quick {
-                            continue;
-                        }
-                        if resp.dragged() {
-                            let acc_id = egui::Id::new(("bar-acc", layer.id.0, kind));
-                            let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
-                            acc += resp.drag_delta().x;
-                            let frames = ((acc as f64 / pps) / fd).trunc() as i64;
-                            if frames != 0 {
-                                acc -= (frames as f64 * fd * pps) as f32;
-                                let d = frames as f64 * fd;
-                                // Moving or trimming a selected layer acts on the whole
-                                // selection; each layer trims from its own in/out point.
-                                let targets = if is_sel { json!(selected.iter().map(|l| l.0).collect::<Vec<_>>()) } else { json!([layer.id.0]) };
-                                let params = match kind {
-                                    "move" => json!({"layers": targets, "delta": d, "merge": drag_key}),
-                                    "in" => json!({"layers": targets, "inDelta": d, "merge": drag_key}),
-                                    _ => json!({"layers": targets, "outDelta": d, "merge": drag_key}),
-                                };
-                                actions.push(("layer.timing".into(), params));
-                            }
-                            ctx.data_mut(|d| d.insert_temp(acc_id, acc));
-                        }
-                        if resp.drag_stopped() {
-                            ctx.data_mut(|d| d.remove::<f32>(egui::Id::new(("bar-acc", layer.id.0, kind))));
-                            ui_actions.push(UiAct::EndMerge);
-                        }
-                    }
-                    // Markers on the layer (drag, Alt-drag duration, Cmd-click delete, dialog).
-                    let gclip = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));
-                    super::markers_ui::layer_markers(app, ui, gclip, &comp, layer, tm, r);
-                }
-            }
-            RowKind::Group { uid, name, open, has_children, fx, eye } => {
-                // The row draws an effect's name in the interface language (#821); `name` stays
-                // the property tree's, which the automation labels below keep. Any other group
-                // (a mask, a shape group, a layer style) draws its own name.
-                let group = layer.props.find_group(*uid);
-                let shown = match group.and_then(|g| match &g.kind {
-                    GroupKind::Effect { effect } => Some(effect.as_str()),
-                    _ => None,
-                }) {
-                    Some(effect) => crate::i18n::effects::group(effect, name),
-                    None => name.clone(),
-                };
-                // Selected groups (an effect, a mask, a shape group…) highlight like selected
-                // property rows.
-                let sel_group = app.session.state.selected_props.contains(&(layer.id, *uid));
-                lp.rect_filled(
-                    left,
-                    0.0,
-                    if sel_group {
-                        t.row_selected
-                    } else if ri % 2 == 0 {
-                        t.row
-                    } else {
-                        t.row_alt
-                    },
-                );
-                gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);
-                // An effect's colour label (26.5): the same bar the Effect Controls header wears,
-                // on the row's left edge.
-                if let Some(lab) =
-                    group.filter(|g| matches!(g.kind, GroupKind::Effect { .. })).and_then(|g| g.label).filter(|l| *l != effectcraft_engine::color::Label::None)
-                {
-                    let [lr, lg, lb] = app.session.prefs.label_rgb(lab);
-                    let bar = Rect::from_min_size(left.min, vec2(4.0, left.height()));
-                    lp.rect_filled(bar, 0.0, Color32::from_rgb(lr, lg, lb));
-                    app.auto.add(&format!("timeline.group.{uid}.label"), bar, &app.session.prefs.label_name(lab));
-                }
-                let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
-                if *has_children {
-                    let tw = Rect::from_center_size(pos2(indent, cy), vec2(13.0, 13.0));
-                    if widgets::twirl(ui, tw, *open, egui::Id::new(("gtw", uid)), &t).clicked() {
-                        // Alt/Cmd-click twirls the whole tree under the group (as on a layer).
-                        ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, ui.input(|i| i.modifiers.alt || i.modifiers.command)));
-                    }
-                    app.auto.add(&format!("timeline.group.{uid}.twirl"), tw, name);
-                }
-                if let Some(en) = fx {
-                    let fr_ = Rect::from_center_size(pos2(cw.switches + SW * 3.0 + SW / 2.0, cy), vec2(16.0, 16.0));
-                    if widgets::icon_toggle(ui, fr_, Icon::Fx, *en, &t, egui::Id::new(("gfx", uid)), Sense::click()).clicked() {
-                        actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": uid})));
-                    }
-                    app.auto.add(&format!("timeline.group.{uid}.fx"), fr_, name);
-                }
-                if let Some(en) = eye {
-                    // Layer style eye switch in the A/V column, like AE.
-                    let er = Rect::from_center_size(pos2(cw.av + 10.0, cy), vec2(15.0, 15.0));
-                    lp.rect_stroke(er.shrink(1.5), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);
-                    if widgets::icon_toggle(ui, er, Icon::Eye, *en, &t, egui::Id::new(("geye", uid)), Sense::click()).clicked() {
-                        actions.push(("layer.style.toggle".into(), json!({"layer": layer.id.0, "style": uid})));
-                    }
-                    app.auto.add(&format!("timeline.group.{uid}.eye"), er, name);
-                }
-                let group_edit: Option<(u64, u64, String)> = ctx.data(|d| d.get_temp(group_rename_id()));
-                if let Some((_, _, mut buf)) = group_edit.filter(|(rl, ru, _)| *rl == layer.id.0 && ru == uid) {
-                    let field = Rect::from_min_max(pos2(indent + 8.0, r.min.y + 2.0), pos2((cw.switches - 4.0).max(indent + 60.0), r.max.y - 2.0));
-                    let mut child = ui.new_child(egui::UiBuilder::new().max_rect(field));
-                    let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(field.width()));
-                    app.auto.add(&format!("timeline.group.{uid}.nameEdit"), er.rect, &buf);
-                    if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {
-                        er.request_focus();
-                        widgets::select_all(&ctx, er.id, &buf);
-                    }
-                    if er.lost_focus() {
-                        if !ui.input(|i| i.key_pressed(egui::Key::Escape)) && !buf.trim().is_empty() && buf != *name {
-                            actions.push(("prop.renameGroup".into(), json!({"layer": layer.id.0, "prop": uid, "name": buf})));
-                        }
-                        ctx.data_mut(|d| d.remove::<(u64, u64, String)>(group_rename_id()));
-                    } else {
-                        ctx.data_mut(|d| d.insert_temp(group_rename_id(), (layer.id.0, *uid, buf)));
-                    }
-                } else {
-                    lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, &shown, Tokens::ui(12.0), t.text);
-                }
-                text_anim_popups(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);
-                shape_add_popup(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);
-                if *uid == GEOM_BIT | layer.id.0 {
-                    let lr = lp.text(pos2(cw.switches + 6.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Change Renderer…"), Tokens::ui(11.5), t.accent);
-                    let resp = ui
-                        .interact(lr, egui::Id::new(("tl-change-renderer", layer.id.0)), Sense::click())
-                        .on_hover_text(crate::i18n::tr("Composition Settings ▸ 3D Renderer"));
-                    if resp.hovered() {
-                        ctx.set_cursor_icon(egui::CursorIcon::PointingHand);
-                    }
-                    app.auto.add(&format!("timeline.layer.{}.changeRenderer", layer.id.0), lr, "Change Renderer…");
-                    if resp.clicked() {
-                        ui_actions.push(UiAct::ChangeRenderer);
-                    }
-                }
-                dash_buttons(app, ui, &lp, layer, *uid, cw.switches, cy, &mut actions);
-                // Mask mode + inverted inline.
-                if let Some(g) = layer.props.find_group(*uid)
-                    && let GroupKind::Mask { mode, inverted, .. } = g.kind
-                {
-                    let mr = Rect::from_min_size(pos2(cw.switches + 4.0, cy - 9.0), vec2(80.0, 18.0));
-                    let pop = egui::Id::new(("maskmode", uid));
-                    if widgets::dropdown(ui, mr, mode.label(), &t, egui::Id::new(("mm", uid))).clicked() {
-                        widgets::open_popup(ui, pop);
-                    }
-                    let opts: Vec<String> = effectcraft_engine::project::MaskMode::ALL.iter().map(|m| m.label().to_string()).collect();
-                    if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, None) {
-                        actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "mode": opts[i]})));
-                    }
-                    let ir = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 8.0), vec2(16.0, 16.0));
-                    if widgets::checkbox(ui, ir, inverted, &t, egui::Id::new(("minv", uid))).clicked() {
-                        actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "inverted": !inverted})));
-                    }
-                    lp.text(pos2(ir.max.x + 4.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Inverted"), Tokens::ui(11.0), t.text_dim);
-                }
-                let gr_rect = Rect::from_min_max(pos2(indent + 8.0, r.min.y), pos2(cw.switches, r.max.y));
-                let gr = ui.interact(gr_rect, egui::Id::new(("grow", uid)), Sense::click());
-                app.auto.add(&format!("timeline.group.{uid}.name"), gr_rect, name);
-                if gr.clicked() && uid & (WAVE_BIT | GEOM_BIT) == 0 {
-                    actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));
-                }
-                if gr.double_clicked() {
-                    if fx.is_some() {
-                        // An effect's name: open it in Effect Controls (as in After Effects).
-                        actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));
-                        actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));
-                        actions.push(("window.panel".into(), json!({"panel": "EffectControls"})));
-                    } else {
-                        ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, false));
-                    }
-                }
-            }
-            RowKind::Waveform { item } => {
-                lp.rect_filled(left, 0.0, if ri % 2 == 0 { t.row } else { t.row_alt });
-                let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
-                lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, "Waveform", Tokens::ui(12.0), t.text);
-                let wr = Rect::from_min_max(pos2(graph_x0, r.min.y), r.max);
-                gp.rect_filled(wr, 0.0, t.tl_bg);
-                app.auto.add(&format!("timeline.layer.{}.waveform", layer.id.0), wr, "Waveform");
-                match super::waveform::summary(app, &ctx, ItemId(*item)) {
-                    Some(s) => super::waveform::draw(&gp, wr.shrink2(vec2(0.0, 2.0)), &tm, layer, &s, Color32::from_rgb(0x5f, 0xc8, 0x8a)),
-                    None => {
-                        gp.text(
-                            pos2(tm.x(layer.in_point.seconds()).max(wr.min.x) + 6.0, wr.center().y),
-                            Align2::LEFT_CENTER,
-                            "Building waveform…",
-                            Tokens::ui(11.0),
-                            t.text_faint,
-                        );
-                    }
-                }
-            }
-            RowKind::Expr { uid, lines } => {
-                let Some(prop) = layer.props.find(*uid) else { continue };
-                let Some(ex) = prop.expr.clone() else { continue };
-                let (buf_id, edit_id) = (expr_buf_id(*uid), egui::Id::new(("expr-edit", uid)));
-                // The same background as its property's row, selection included.
-                let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));
-                lp.rect_filled(
-                    left,
-                    0.0,
-                    if sel_prop {
-                        t.row_selected
-                    } else if ri % 2 == 0 {
-                        t.row
-                    } else {
-                        t.row_alt
-                    },
-                );
-                let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
-                lp.text(pos2(indent + 12.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Expression:"), Tokens::ui(11.5), t.text_dim);
-                lp.text(pos2(indent + 82.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(11.5), t.text);
-                // "=" enable switch and the property pick whip (AE's expression controls).
-                let en_r = Rect::from_center_size(pos2(cw.switches + 10.0, cy), vec2(16.0, 16.0));
-                let en = ui.interact(en_r, egui::Id::new(("expr-en", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Enable Expression"));
-                lp.rect_stroke(en_r.shrink(1.0), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);
-                let expr_col = t.expr_text;
-                lp.text(
-                    en_r.center(),
-                    Align2::CENTER_CENTER,
-                    if ex.enabled { "=" } else { "≠" },
-                    Tokens::semibold(13.0),
-                    if ex.enabled { expr_col } else { t.text_dim },
-                );
-                app.auto.add(&format!("timeline.prop.{uid}.exprEnable"), en_r, "Enable Expression");
-                if en.clicked() {
-                    actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "enabled": !ex.enabled})));
-                }
-                let pw = pick_whip(
-                    app,
-                    ui,
-                    &lp,
-                    Rect::from_center_size(pos2(cw.switches + 30.0, cy), vec2(15.0, 15.0)),
-                    (WHIP_EXPR, layer.id.0, *uid),
-                    &format!("timeline.prop.{uid}.pickWhip"),
-                    "Expression pick whip",
-                    crate::i18n::tr("Expression pick whip: drag onto a property"),
-                );
-                if pw.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_pressed()) {
-                    // Pressed while the expression is being edited (its text is buffered while
-                    // the editor has the focus): the reference will go in at the cursor,
-                    // replacing the selection (#284).
-                    let into = ctx.data(|d| d.get_temp::<String>(buf_id)).map(|buf| {
-                        let n = buf.chars().count();
-                        let sel = egui::text_edit::TextEditState::load(&ctx, edit_id)
-                            .and_then(|st| st.cursor.char_range())
-                            .map_or([n, n], |r| [r.primary.index.0.min(r.secondary.index.0).min(n), r.primary.index.0.max(r.secondary.index.0).min(n)]);
-                        (buf, sel)
-                    });
-                    ctx.data_mut(|d| {
-                        if let Some(into) = into {
-                            d.insert_temp(whip_into_id(*uid), into);
-                        } else {
-                            d.remove::<WhipInto>(whip_into_id(*uid));
-                        }
-                    });
-                }
-                // Syntax errors: warning in the outline (the expression is disabled).
-                if let Some(check) = app.session.expr_check
-                    && let Err(e) = check(&ex.text)
-                {
-                    let wr = Rect::from_center_size(pos2(cw.switches + 50.0, cy), vec2(14.0, 14.0));
-                    lp.text(wr.center(), Align2::CENTER_CENTER, "⚠", Tokens::ui(12.0), Color32::from_rgb(0xf0, 0xa0, 0x30));
-                    let _ = ui.interact(wr, egui::Id::new(("expr-err", uid)), Sense::hover()).on_hover_text(e);
-                }
-                // ⓕ: the Expression Language menu inserts at the cursor.
-                let lang_r = Rect::from_center_size(pos2(cw.switches + 70.0, cy), vec2(16.0, 16.0));
-                let lang = ui.interact(lang_r, egui::Id::new(("expr-lang", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Expression Language Menu"));
-                lp.circle_stroke(lang_r.center(), 6.5, Stroke::new(1.0, if lang.hovered() { t.text } else { t.text_dim }));
-                lp.text(lang_r.center(), Align2::CENTER_CENTER, "f", Tokens::semibold(10.0), if lang.hovered() { t.text } else { t.text_dim });
-                app.auto.add(&format!("timeline.prop.{uid}.exprLanguage"), lang_r, "Expression Language Menu");
-                let mut picked: Option<&'static str> = None;
-                egui::Popup::menu(&lang).style(crate::widgets::menu_style).show(|ui| {
-                    for (cat, items) in effectcraft_engine::commands::expr_tools::language_menu() {
-                        ui.menu_button(cat, |ui| {
-                            widgets::menu_scroll(ui, |ui| {
-                                for (label, text) in items {
-                                    if ui.button(label).clicked() {
-                                        picked = Some(text);
-                                        ui.close();
-                                    }
-                                }
-                            })
-                        });
-                    }
-                });
-                if let Some(text) = picked {
-                    let cur: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());
-                    let at = egui::text_edit::TextEditState::load(&ctx, edit_id)
-                        .and_then(|st| st.cursor.char_range())
-                        .map(|r| r.primary.index.0)
-                        .unwrap_or(cur.chars().count())
-                        .min(cur.chars().count());
-                    let byte = cur.char_indices().nth(at).map(|(b, _)| b).unwrap_or(cur.len());
-                    let mut next = cur.clone();
-                    next.insert_str(byte, text);
-                    actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": next})));
-                    ctx.data_mut(|d| d.remove::<String>(buf_id));
-                }
-                // The editor in the time-graph area.
-                ui.set_clip_rect(right_clip);
-                gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.expr_bg);
-                let er = Rect::from_min_max(pos2(graph_x0 + 8.0, r.min.y + 3.0), pos2(rect.max.x - 14.0, r.max.y - 3.0));
-                let mut buf: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());
-                if let Some(after) = ctx.data_mut(|d| d.remove_temp::<usize>(expr_refocus_id(*uid))) {
-                    // A pick whip just put a reference in: editing goes on in the new text,
-                    // the cursor after the reference.
-                    buf = ex.text.clone();
-                    let mut st = egui::text_edit::TextEditState::load(&ctx, edit_id).unwrap_or_default();
-                    st.cursor.set_char_range(Some(egui::text::CCursorRange::one(egui::text::CCursor::new(buf.chars().count().saturating_sub(after)))));
-                    st.store(&ctx, edit_id);
-                    ctx.memory_mut(|m| m.request_focus(edit_id));
-                }
-                // Settings ▸ Scripting & Expressions ▸ Expressions Editor.
-                let sp = app.session.prefs.scripting.clone();
-                let resp = super::expr_editor::editor(ui, edit_id, &mut buf, er, &sp, if ex.enabled { expr_col } else { t.text_dim }, *lines, &t);
-                app.auto.add(&format!("timeline.prop.{uid}.expression"), er, &prop.name);
-                // Its bottom edge drags to set its height in whole lines, as in After Effects.
-                let edge = Rect::from_min_max(pos2(er.min.x, r.max.y - 4.0), pos2(er.max.x, r.max.y));
-                let eresp = ui.interact(edge, egui::Id::new(("expr-edge", uid)), Sense::drag());
-                app.auto.add(&format!("timeline.prop.{uid}.expressionHeight"), edge, "Expression field height");
-                if eresp.hovered() || eresp.dragged() {
-                    ctx.set_cursor_icon(egui::CursorIcon::ResizeVertical);
-                }
-                if let Some(py) = eresp.interact_pointer_pos().filter(|_| eresp.dragged()).map(|p| p.y) {
-                    let n = ((py - r.min.y) / rh).round().clamp(1.0, EXPR_MAX_LINES as f32);
-                    app.ui.timeline.expr_lines.insert(*uid, n as usize);
-                }
-                let commit = resp.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter) && (i.modifiers.command || i.modifiers.ctrl));
-                if commit {
-                    resp.surrender_focus();
-                }
-                if resp.has_focus() && !commit {
-                    ctx.data_mut(|d| d.insert_temp(buf_id, buf));
-                } else {
-                    if (resp.lost_focus() || commit) && buf.trim_end() != ex.text {
-                        actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": buf.trim_end()})));
-                    }
-                    ctx.data_mut(|d| d.remove::<String>(buf_id));
-                }
-            }
-            RowKind::Prop { uid } => {
-                let Some(prop) = layer.props.find(*uid) else { continue };
-                app.auto.add(&format!("timeline.prop.{uid}.row"), r, &prop.name);
-                let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));
-                lp.rect_filled(
-                    left,
-                    0.0,
-                    if sel_prop {
-                        t.row_selected
-                    } else if ri % 2 == 0 {
-                        t.row
-                    } else {
-                        t.row_alt
-                    },
-                );
-                gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);
-                let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
-                // Keyframe navigator (in the A/V column, like AE).
-                // (in the Keys column when it is shown).
-                if prop.is_animated() && (vis.keys || vis.av) {
-                    let lt = layer.layer_time(time);
-                    let at_key = effectcraft_engine::keyframe::key_at(&prop.keys, lt).is_some();
-                    let nav_x = if vis.keys { cw.keys + 12.0 } else { cw.av + 18.0 };
-                    let prev = Rect::from_center_size(pos2(nav_x, cy), vec2(12.0, 14.0));
-                    let mid = Rect::from_center_size(pos2(nav_x + 16.0, cy), vec2(14.0, 14.0));
-                    let next = Rect::from_center_size(pos2(nav_x + 32.0, cy), vec2(12.0, 14.0));
-                    icons::paint(&lp, prev.shrink(2.0), Icon::ChevronLeft, t.text_dim);
-                    icons::paint(&lp, next.shrink(2.0), Icon::ChevronRight, t.text_dim);
-                    let kc = if at_key { t.keyframe_selected } else { Color32::TRANSPARENT };
-                    lp.add(egui::Shape::convex_polygon(
-                        vec![mid.center() + vec2(0.0, -5.0), mid.center() + vec2(5.0, 0.0), mid.center() + vec2(0.0, 5.0), mid.center() + vec2(-5.0, 0.0)],
-                        kc,
-                        Stroke::new(1.0, t.text_dim),
-                    ));
-                    if ui.interact(prev, egui::Id::new(("kprev", uid)), Sense::click()).clicked()
-                        && let Some(k) = prop.keys.iter().rev().find(|k| layer.comp_time(k.time).0 < time.0 - fr.frame_duration().0 / 2)
-                    {
-                        ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));
-                    }
-                    if ui.interact(next, egui::Id::new(("knext", uid)), Sense::click()).clicked()
-                        && let Some(k) = prop.keys.iter().find(|k| layer.comp_time(k.time).0 > time.0 + fr.frame_duration().0 / 2)
-                    {
-                        ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));
-                    }
-                    if ui.interact(mid, egui::Id::new(("kmid", uid)), Sense::click()).clicked() {
-                        actions.push(("prop.toggleKey".into(), json!({"layer": layer.id.0, "prop": uid})));
-                    }
-                    app.auto.add(&format!("timeline.prop.{uid}.addKey"), mid, "Add or remove keyframe");
-                }
-                // Stopwatch: Alt+click adds an expression; a press toggles the animation, and
-                // dragging on over other stopwatches gives them the same state (#284).
-                if !prop.static_only {
-                    let swr = Rect::from_center_size(pos2(indent, cy), vec2(15.0, 15.0));
-                    let resp = ui.interact(swr, egui::Id::new(("stopwatch", uid)), Sense::click_and_drag());
-                    let col = if prop.is_animated() {
-                        t.hot_text
-                    } else if resp.hovered() {
-                        t.text
-                    } else {
-                        t.text_dim
-                    };
-                    icons::paint(&lp, swr, Icon::Stopwatch, col);
-                    app.auto.add(&format!("timeline.prop.{uid}.stopwatch"), swr, &prop.name);
-                    if ui.input(|i| i.modifiers.alt) {
-                        if resp.clicked() {
-                            actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid})));
-                        }
-                    } else if let Some((value, merge)) = switch_gesture(ui, &resp, r, "stopwatch", prop.is_animated()) {
-                        actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "value": value, "merge": merge})));
-                    } else if resp.clicked() && !resp.clicked_by(egui::PointerButton::Primary) {
-                        // Keyboard or accessibility activation.
-                        actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid})));
-                    }
-                }
-                let name_x = indent + 12.0;
-                // 3D layers show Rotation as "Z Rotation" next to X/Y Rotation.
-                let is_tr_rot = layer.transform().and_then(|t| t.get("rotation")).is_some_and(|r| r.uid == prop.uid);
-                let base = if is_tr_rot && prop.name == "Rotation" && layer.is_3d() { "Z Rotation".to_string() } else { prop.name.clone() };
-                let pname = if prop.has_expression() { format!("{base}  =") } else { base };
-                lp.text(pos2(name_x, cy), Align2::LEFT_CENTER, &pname, Tokens::ui(12.0), if prop.has_expression() { t.expr_text } else { t.text });
-                let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.switches - 2.0, r.max.y));
-                let name_resp = ui.interact(name_rect, egui::Id::new(("pname", uid)), Sense::click_and_drag());
-                app.auto.add(&format!("timeline.prop.{uid}.name"), name_rect, &prop.name);
-                if name_resp.drag_started() {
-                    // Drop on the Essential Graphics panel to expose the property.
-                    egui::DragAndDrop::set_payload(&ctx, crate::panels::DragPayload::Property { layer: layer.id.0, prop: *uid });
-                }
-                if name_resp.dragged() {
-                    egui::Tooltip::always_open(ctx.clone(), ui.layer_id(), egui::Id::new("prop-drag-tip"), egui::PopupAnchor::Pointer)
-                        .show(|ui| ui.label(&prop.name));
-                }
-                if name_resp.clicked() {
-                    actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": ui.input(|i| i.modifiers.shift)})));
-                }
-                crate::widgets::context_menu(&name_resp, |ui| prop_menu(ui, &mut app.auto, cid, layer, prop, &mut actions));
-                // Value editors.
-                let value = ectx.value(layer, prop);
-                let vx = (cw.switches + 4.0).max(name_x + 120.0);
-                let dims = value_editor(app, ui, &lp, layer, prop, &value, pos2(vx, cy), &mut actions);
-                if !dims.is_empty() {
-                    dim_hits.push((*uid, dims));
-                }
-                // The property pick whip (Parent & Link column, AE CC 2018 and later): dropped on
-                // a property it links this one to it, adding the expression if there is none.
-                if vis.parent && !prop.static_only {
-                    pick_whip(
-                        app,
-                        ui,
-                        &lp,
-                        Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),
-                        (WHIP_PROP, layer.id.0, *uid),
-                        &format!("timeline.prop.{uid}.propertyPickWhip"),
-                        "Property pick whip",
-                        crate::i18n::tr("Property pick whip: drag onto a property"),
-                    );
-                }
-                ui.set_clip_rect(right_clip);
-                // Expression text row hint.
-                if let Some(e) = prop.expr.as_ref().filter(|e| e.enabled && app.ui.timeline.expr_closed.contains(uid)) {
-                    gp.text(
-                        pos2(graph_x0 + 8.0, cy),
-                        Align2::LEFT_CENTER,
-                        format!("= {}", e.text.lines().next().unwrap_or("")),
-                        Tokens::mono(11.0),
-                        t.expr_text,
-                    );
-                }
-                // Keyframes.
-                if !graph_on {
-                    for k in &prop.keys {
-                        let ct = layer.comp_time(k.time);
-                        let x = tm.x(ct.seconds());
-                        if x < graph_x0 - 8.0 || x > rect.max.x + 8.0 {
-                            continue;
-                        }
-                        let kref = effectcraft_engine::KeyRef { layer: layer.id, prop: *uid, time: k.time };
-                        let ks = sel_keys.contains(&kref);
-                        let icon = k.icon();
-                        let c = pos2(x, cy);
-                        // Labelled keys take their label colour (brighter when selected).
-                        let kcol = match effectcraft_engine::color::Label::ALL.get(k.label as usize).filter(|_| k.label > 0) {
-                            Some(l) => {
-                                let c = t.label(*l);
-                                if ks { c } else { c.gamma_multiply(0.75) }
-                            }
-                            None if ks => t.keyframe_selected,
-                            None => t.keyframe,
-                        };
-                        if k.roving {
-                            // Roving keys: a small dot (their time follows their neighbours).
-                            gp.circle_filled(c, 2.5, kcol);
-                        } else {
-                            icons::keyframe(&gp, c, 11.0, icon.left, icon.right, kcol);
-                        }
-                        let kr = Rect::from_center_size(c, vec2(12.0, 14.0));
-                        let kresp = ui.interact(kr, egui::Id::new(("key", uid, k.time.0)), Sense::click_and_drag());
-                        app.auto.add(&format!("timeline.key.{uid}.{}", fr.frame_at(ct)), kr, &format!("{} key", prop.name));
-                        // Exact (layer-time ticks): keys a Quick Offset puts on subframes can share a frame.
-                        app.auto.add(&format!("timeline.keyAt.{uid}.{}", k.time.0), kr, &format!("{} key", prop.name));
-                        let mods = ui.input(|i| i.modifiers);
-                        let this_key = json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}], "selectProperties": true});
-                        if kresp.clicked() && mods.command {
-                            // Ctrl+click: Linear ↔ Auto Bezier; Ctrl+Alt+click: Hold on / off.
-                            actions.push(("keys.select".into(), this_key.clone()));
-                            if mods.alt {
-                                actions.push(("keys.toggleHold".into(), json!({})));
-                            } else {
-                                let linear = k.in_interp == Interp::Linear && k.out_interp == Interp::Linear;
-                                actions.push(("keys.interpolation".into(), json!({"interpolation": if linear { "autoBezier" } else { "linear" }})));
-                            }
-                        } else if kresp.clicked() && mods.shift {
-                            // Shift+click: in or out of the selection.
-                            let mut p = this_key.clone();
-                            p["toggle"] = json!(true);
-                            actions.push(("keys.select".into(), p));
-                        } else if (kresp.clicked() || kresp.drag_started()) && !ks {
-                            let mut p = this_key.clone();
-                            p["add"] = json!(mods.shift);
-                            actions.push(("keys.select".into(), p));
-                        }
-                        if kresp.double_clicked() {
-                            // Edit the key's value (numeric properties), as After Effects does.
-                            if matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {
-                                actions.push(("keys.set".into(), json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})));
-                            } else {
-                                ui_actions.push(UiAct::SetTime(ct));
-                            }
-                        }
-                        crate::widgets::context_menu(&kresp, |ui| {
-                            for (lbl, cmd, params) in [
-                                ("Edit Value…", "keys.set", json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})),
-                                ("-", "", json!({})),
-                                ("Copy", "keys.copy", json!({})),
-                                ("Paste", "keys.paste", json!({})),
-                                ("-", "", json!({})),
-                                ("Select Equal Keyframes", "keys.selectEqual", json!({})),
-                                ("Select Previous Keyframes", "keys.selectPrevious", json!({})),
-                                ("Select Following Keyframes", "keys.selectFollowing", json!({})),
-                                ("-", "", json!({})),
-                                ("Keyframe Interpolation…", "keys.interpolation", json!({})),
-                                ("Keyframe Velocity…", "keys.velocity", json!({})),
-                                ("Toggle Hold Keyframe", "keys.toggleHold", json!({})),
-                                ("Rove Across Time", "keys.interpolation", json!({"roving": !k.roving})),
-                                ("-", "", json!({})),
-                                ("Easy Ease", "keys.easyEase", json!({})),
-                                ("Easy Ease In", "keys.easyEaseIn", json!({})),
-                                ("Easy Ease Out", "keys.easyEaseOut", json!({})),
-                                ("Time-Reverse Keyframes", "keys.timeReverse", json!({})),
-                                ("-", "", json!({})),
-                                ("Linear", "keys.interpolation", json!({"interpolation": "linear"})),
-                                ("Bezier", "keys.interpolation", json!({"interpolation": "bezier"})),
-                                ("Auto Bezier", "keys.interpolation", json!({"interpolation": "autoBezier"})),
-                                ("Select All Keyframes", "keys.selectAll", json!({})),
-                                ("Delete", "keys.delete", json!({})),
-                            ] {
-                                if lbl == "Select All Keyframes" {
-                                    // Keyframe colour labels.
-                                    ui.menu_button(crate::i18n::tr("Label"), |ui| {
-                                        for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {
-                                            if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), k.label as usize == i, &t).clicked() {
-                                                if !ks {
-                                                    actions.push((
-                                                        "keys.select".into(),
-                                                        json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]}),
-                                                    ));
-                                                }
-                                                actions.push(("keys.setLabel".into(), json!({"label": i})));
-                                                ui.close();
-                                            }
-                                        }
-                                    });
-                                }
-                                if lbl == "-" {
-                                    ui.separator();
-                                    continue;
-                                }
-                                if lbl == "Rove Across Time" && !prop.spatial {
-                                    continue;
-                                }
-                                if lbl == "Edit Value…" && !matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {
-                                    continue;
-                                }
-                                if ui.button(lbl).clicked() {
-                                    if !ks {
-                                        actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));
-                                    }
-                                    actions.push((cmd.into(), params));
-                                    ui.close();
-                                }
-                            }
-                        });
-                        // Alt-drag the first or last key of a selected group: scale the group in time.
-                        if kresp.drag_started()
-                            && mods.alt
-                            && !mods.command
-                            && let Some(c) = app.session.active_comp_arc()
-                        {
-                            super::graph_tools::alt_scale_begin(app, &ctx, &c, ct.seconds());
-                        }
-                        // A plain drag moves the selected keys. The timeline follows it (below): this
-                        // widget's id changes with the key's time, so its own drag would end after
-                        // the first frame of movement.
-                        // (From where the button went down: a drag starts a few pixels later.)
-                        if kresp.drag_started()
-                            && !super::graph_tools::alt_scale_active(&ctx)
-                            && let Some(p) = ctx.input(|i| i.pointer.press_origin())
-                        {
-                            // Ctrl/Cmd+Alt: Quick Offset of the selected keys' layers (#1012).
-                            let quick = (mods.command && mods.alt && ks).then(|| quick_offset_layers(&comp, sel_keys.iter().map(|k| k.layer))).flatten();
-                            ctx.data_mut(|d| d.insert_temp(key_drag_id(), KeyDrag { origin_x: p.x, anchor: ct.seconds(), applied: 0, quick }));
-                        }
-                    }
-                }
-            }
-        }
-    }
-    ui.set_clip_rect(full_clip);
-    // The background responses sit below rows, bars and editors, preserving their menus.
-    if !graph_on {
-        app.auto.add("timeline.empty", empty_rect, "Right-click to create a layer");
-    }
-    for (response, area) in [(&outline_empty, "outline"), (&empty, "graph")] {
-        crate::widgets::context_menu(response, |ui| {
-            let menu = ui.menu_button(crate::i18n::tr("New"), |ui| {
-                for (key, label, command, params) in [
-                    ("text", "Text", "layer.newText", json!({})),
-                    ("solid", "Solid…", "layer.newSolid", json!({})),
-                    ("light", "Light…", "layer.newLight", json!({})),
-                    ("camera", "Camera…", "layer.newCamera", json!({})),
-                    ("null", "Null Object", "layer.newNull", json!({})),
-                    ("shape", "Shape Layer", "layer.newShape", json!({"kind": "none"})),
-                    ("adjustment", "Adjustment Layer", "layer.newAdjustment", json!({})),
-                ] {
-                    let response = ui.button(label);
-                    app.auto.add(&format!("timeline.context.{area}.{key}"), response.rect, label);
-                    if response.clicked() {
-                        actions.push((command.into(), params));
-                        ui.close();
-                    }
-                }
-            });
-            app.auto.add(&format!("timeline.context.{area}.new"), menu.response.rect, "New");
-            let response = ui.button(crate::i18n::tr("Composition Settings…"));
-            app.auto.add(&format!("timeline.context.{area}.settings"), response.rect, "Composition Settings…");
-            if response.clicked() {
-                actions.push(("comp.settings".into(), json!({})));
-                ui.close();
-            }
-            let response = ui.button(crate::i18n::tr("Open in Essential Graphics"));
-            app.auto.add(&format!("timeline.context.{area}.essentialGraphics"), response.rect, "Open in Essential Graphics");
-            if response.clicked() {
-                actions.push(("comp.openInEssentialGraphics".into(), json!({})));
-                ui.close();
-            }
-        });
-    }
-    if outline_empty.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
-        actions.push(("layer.select".into(), json!({"layers": []})));
-    }
-    if let (Some(start), Some(end)) = (ctx.input(|i| i.pointer.press_origin()), outline_empty.interact_pointer_pos())
-        && outline_empty.dragged()
-    {
-        let box_rect = Rect::from_two_pos(start, end).intersect(outline_rect);
-        lp.rect_filled(box_rect, 0.0, t.accent.gamma_multiply(0.12));
-        lp.rect_stroke(box_rect, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
-        ctx.data_mut(|d| d.insert_temp(egui::Id::new("tl-layer-box"), box_rect));
-    }
-    if outline_empty.drag_stopped()
-        && let Some(box_rect) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::new("tl-layer-box")))
-    {
-        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::new("tl-layer-box")));
-        let layers: Vec<u64> = hit_rows
-            .iter()
-            .filter(|(r, row)| matches!(row.kind, RowKind::Layer) && r.intersects(box_rect))
-            .filter(|(_, row)| comp.layer(row.layer).is_some_and(|l| !l.switches.locked))
-            .map(|(_, row)| row.layer.0)
-            .collect();
-        actions.push(("layer.select".into(), json!({"layers": layers, "add": ui.input(|i| i.modifiers.shift || i.modifiers.command)})));
-    }
-    // Pick whips: a line follows the pointer; releasing over a row links to it (an expression's
-    // or a property's, also over a property in Effect Controls).
-    if let Some((kind, src_layer, src_prop, start)) = ctx.data(|d| d.get_temp::<PickWhip>(pick_whip_id())) {
-        let ptr = ctx.input(|i| i.pointer.latest_pos()).unwrap_or(start);
-        let fg = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("tl-pickwhip-line")));
-        fg.line_segment([start, ptr], Stroke::new(1.5, t.accent));
-        fg.circle_stroke(ptr, 4.0, Stroke::new(1.5, t.accent));
-        let target = hit_rows.iter().find(|(r, _)| r.contains(ptr)).map(|(r, row)| (*r, row.clone()));
-        // Shown this pass or the last one (Effect Controls may draw after the Timeline).
-        let pass = ctx.cumulative_pass_nr();
-        let elsewhere = (target.is_none() && kind != WHIP_PARENT)
-            .then(|| ctx.data(|d| d.get_temp::<WhipTargets>(whip_targets_id())))
-            .flatten()
-            .filter(|(p, _)| p.saturating_add(1) >= pass)
-            .and_then(|(_, targets)| targets.into_iter().find(|(r, ..)| r.contains(ptr)));
-        if let Some((tr, _)) = &target {
-            fg.rect_stroke(Rect::from_min_max(tr.min, pos2(graph_x0 - 1.0, tr.max.y)), 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
-        } else if let Some((tr, ..)) = &elsewhere {
-            fg.rect_stroke(*tr, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
-        }
-        if ctx.input(|i| !i.pointer.any_down()) {
-            ctx.data_mut(|d| {
-                d.remove::<PickWhip>(pick_whip_id());
-                d.remove::<WhipTargets>(whip_targets_id());
-            });
-            let into = (kind == WHIP_EXPR).then(|| ctx.data_mut(|d| d.remove_temp::<WhipInto>(whip_into_id(src_prop)))).flatten();
-            // The property dropped on, and the value (dimension) if on one of them: `position[0]`.
-            let dim = |fields: &[Rect]| fields.iter().position(|r| r.contains(ptr));
-            let prop_target = match (&target, elsewhere) {
-                (Some((_, Row { layer, kind: RowKind::Prop { uid }, .. })), _) => {
-                    Some((layer.0, *uid, dim_hits.iter().find(|(u, _)| u == uid).and_then(|(_, rs)| dim(rs))))
-                }
-                (None, Some((_, l, u, fields))) => Some((l, u, dim(&fields))),
-                _ => None,
-            };
-            match (kind, target, prop_target) {
-                (WHIP_PARENT, Some((_, row)), _) if row.layer.0 != src_layer => {
-                    actions.push(("layer.setParent".into(), json!({"layers": [src_layer], "parent": row.layer.0})));
-                }
-                // The property pick whip replaces the expression with the reference (or adds one),
-                // as the expression pick whip does when its expression isn't being edited.
-                (WHIP_EXPR | WHIP_PROP, _, Some((tl, tu, d))) if tu != src_prop => {
-                    let mut params = json!({"layer": src_layer, "prop": src_prop, "target": {"layer": tl, "prop": tu}});
-                    if let Some(d) = d {
-                        params["target"]["dimension"] = json!(d);
-                    }
-                    if let Some((text, [a, b])) = into {
-                        // Into the expression being edited, which goes on being edited.
-                        params["expression"] = json!(text);
-                        params["range"] = json!([a, b]);
-                        let after = text.chars().count().saturating_sub(b);
-                        ctx.data_mut(|d| d.insert_temp(expr_refocus_id(src_prop), after));
-                    }
-                    actions.push(("prop.pickWhip".into(), params));
-                }
-                _ => {}
-            }
-        }
-    }
-    // Alt-drag key group scaling (follows the pointer until release).
-    if let Some(c) = app.session.active_comp_arc() {
-        super::graph_tools::alt_scale_update(app, &ctx, &c, tm, &mut actions);
-    }
-    // Graph editor.
-    if graph_on {
-        super::graph::show(app, ui, &gp, &comp, &ectx, tm, Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max), &mut actions);
-    }
-    // A plain click on empty track area (beside a layer's bar, on a property row's empty span or
-    // below the last row) deselects the layers and their keys and properties, as in After
-    // Effects; Shift / Cmd keep the selection. Drag: box-select keys.
-    if empty.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
-        actions.push(("layer.select".into(), json!({"layers": []})));
-    }
-    if let (true, Some(origin), Some(cur)) =
-        (empty.dragged(), empty.interact_pointer_pos().and_then(|_| ctx.input(|i| i.pointer.press_origin())), empty.interact_pointer_pos())
-    {
-        let br = Rect::from_two_pos(origin, cur);
-        gp.rect_filled(br, 0.0, t.accent.gamma_multiply(0.12));
-        gp.rect_stroke(br, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Middle);
-        ctx.data_mut(|d| d.insert_temp(egui::Id::new("tl-box"), br));
-    }
-    // Layer reorder drag: a line where the layers will land; the release moves them there.
-    if let Some(moving) = ctx.data(|d| d.get_temp::<Vec<u64>>(layer_drag_id())) {
-        let dropped = ctx.data_mut(|d| d.remove_temp::<bool>(layer_drop_id())).unwrap_or(false);
-        let layer_rows: Vec<(Rect, LayerId)> = hit_rows.iter().filter(|(_, r)| matches!(r.kind, RowKind::Layer)).map(|(rr, r)| (*rr, r.layer)).collect();
-        if let Some(py) = ui.input(|i| i.pointer.interact_pos().or(i.pointer.latest_pos())).map(|p| p.y)
-            && !layer_rows.is_empty()
-        {
-            let (at, line_y) = insertion(&layer_rows, py, rows_rect.min.y);
-            let target = at.and_then(|i| layer_rows[i..].iter().find(|(_, l)| !moving.contains(&l.0)).map(|(_, l)| *l));
-            if dropped {
-                ctx.data_mut(|d| d.remove::<Vec<u64>>(layer_drag_id()));
-                // Only when the order changes (no empty undo step for a drop in place).
-                let mut order: Vec<u64> = comp.layers.iter().map(|l| l.id.0).filter(|id| !moving.contains(id)).collect();
-                let at = target.and_then(|t| order.iter().position(|id| *id == t.0)).unwrap_or(order.len());
-                order.splice(at..at, moving.iter().copied());
-                if order != comp.layers.iter().map(|l| l.id.0).collect::<Vec<_>>() {
-                    let params = match target {
-                        Some(t) => json!({"layers": moving, "above": t.0}),
-                        None => json!({"layers": moving, "to": "back"}),
-                    };
-                    actions.push(("layer.arrange".into(), params));
-                }
-            } else {
-                ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
-                p.with_clip_rect(rows_rect).line_segment([pos2(rect.min.x, line_y), pos2(graph_x0, line_y)], Stroke::new(2.0, t.accent));
-            }
-        } else if dropped {
-            ctx.data_mut(|d| d.remove::<Vec<u64>>(layer_drag_id()));
-        }
-    }
-    // Quick Offset of layer bars: the last selected layer moves by whole frames with the pointer
-    // until the button is released, wherever the bar's row has scrolled to.
-    if let Some(mut q) = ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())) {
-        let (down, ptr) = ctx.input(|i| (i.pointer.primary_down(), i.pointer.latest_pos()));
-        match ptr.filter(|_| down) {
-            Some(ptr) => {
-                let frames = (((ptr.x - q.origin_x) as f64 / pps) / fd).round() as i64;
-                if frames != q.applied {
-                    q.applied = frames;
-                    ctx.data_mut(|d| d.insert_temp(quick_bar_id(), q));
-                    let merge = format!("bar-quick-{}", q.layer.0);
-                    actions.push(("layer.quickOffset".into(), json!({"delta": frames as f64 * fd, "merge": merge, "fromStart": true})));
-                }
-                drag_tip(&ctx, &t, ptr, quick_offset_note(q.applied, q.layers));
-            }
-            None => {
-                ctx.data_mut(|d| d.remove::<QuickBar>(quick_bar_id()));
-                ui_actions.push(UiAct::EndMerge);
-            }
-        }
-    }
-    // Keyframe drag: the selected keys move by whole frames with the pointer until it is
-    // released (one undo step); Shift snaps the grabbed key to the current time, the work area
-    // and composition markers.
-    if let Some(mut kd) = ctx.data(|d| d.get_temp::<KeyDrag>(key_drag_id())) {
-        let (down, ptr, shift) = ctx.input(|i| (i.pointer.primary_down(), i.pointer.latest_pos(), i.modifiers.shift));
-        match ptr.filter(|_| down) {
-            Some(ptr) => {
-                let mut target = kd.anchor + (ptr.x - kd.origin_x) as f64 / pps;
-                if shift {
-                    // The current time and whatever it snaps to (keys, layer ends, markers), but
-                    // not the moving keys themselves.
-                    let moving: Vec<f64> =
-                        app.session.state.selected_keys.iter().filter_map(|k| comp.layer(k.layer).map(|l| l.comp_time(k.time).seconds())).collect();
-                    let mut cands = snap_candidates(&comp, &rows);
-                    cands.retain(|c| !moving.iter().any(|m| (m - c).abs() < 1e-9));
-                    cands.push(time.seconds());
-                    target = snap_time(&cands, target, 8.0 / pps);
-                }
-                let total = ((target - kd.anchor) / fd).round() as i64;
-                if total != kd.applied {
-                    actions.push(match kd.quick {
-                        Some(_) => ("keys.quickOffset".into(), json!({"delta": total as f64 * fd, "merge": "key-quick-offset", "fromStart": true})),
-                        None => ("keys.move".into(), json!({"delta": (total - kd.applied) as f64 * fd, "merge": "key-drag"})),
-                    });
-                    kd.applied = total;
-                    ctx.data_mut(|d| d.insert_temp(key_drag_id(), kd));
-                }
-                ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
-                // Where the grabbed key is and how far the keys moved (After Effects shows this
-                // in the Info panel).
-                let at = Tick::from_seconds_f64(kd.anchor + kd.applied as f64 * fd);
-                let note = match kd.quick {
-                    Some(n) => quick_offset_note(kd.applied, n),
-                    None => format!("{}   {:+} f", super::timecode(&app.session, &comp, at), kd.applied),
-                };
-                drag_tip(&ctx, &t, ptr, note);
-                app.ui.status = format!("Keyframe at {}", super::timecode(&app.session, &comp, at));
-            }
-            None => {
-                ctx.data_mut(|d| d.remove::<KeyDrag>(key_drag_id()));
-                ui_actions.push(UiAct::EndMerge);
-            }
-        }
-    }
-    if empty.drag_stopped()
-        && let Some(br) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::new("tl-box")))
-    {
-        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::new("tl-box")));
-        let mut keys = vec![];
-        let mut yy = rows_rect.min.y - app.ui.timeline.scroll_y;
-        for row in &rows {
-            let cy = yy + rh / 2.0;
-            yy += row_height(row, rh);
-            if let RowKind::Prop { uid } = row.kind
-                && cy >= br.min.y
-                && cy <= br.max.y
-                && let Some(l) = comp.layer(row.layer)
-                && let Some(pr) = l.props.find(uid)
-            {
-                for k in &pr.keys {
-                    let x = tm.x(l.comp_time(k.time).seconds());
-                    if x >= br.min.x && x <= br.max.x {
-                        keys.push(json!({"layer": l.id.0, "prop": uid, "time": k.time.seconds()}));
-                    }
-                }
-            }
-        }
-        let mods = ui.input(|i| i.modifiers);
-        if keys.is_empty() && !(mods.shift || mods.command) {
-            // A marquee that catches nothing leaves nothing selected (layers included).
-            actions.push(("layer.select".into(), json!({"layers": []})));
-        } else {
-            actions.push(("keys.select".into(), json!({"keys": keys, "add": mods.shift, "selectProperties": true})));
-        }
+    Rw {
+        lp,
+        gp,
+        graph_on,
+        full_clip,
+        left_clip,
+        right_clip,
+        empty_rect,
+        outline_rect,
+        empty,
+        outline_empty,
+        selected: app.session.state.selected_layers.clone(),
+        sel_keys: app.session.state.selected_keys.clone(),
+        ui_actions: Vec::new(),
+        hit_rows: Vec::new(),
+        dim_hits: Vec::new(),
+        tl,
     }
+}
 
-    // CTI.
-    let cx = tm.x(time.seconds());
-    if cx >= graph_x0 && cx <= rect.max.x {
-        p.line_segment([pos2(cx, ruler.min.y + 12.0), pos2(cx, rows_rect.max.y)], Stroke::new(1.0, t.cti));
-        let head = vec![
-            pos2(cx - 6.0, ruler.min.y + 12.0),
-            pos2(cx + 6.0, ruler.min.y + 12.0),
-            pos2(cx + 6.0, ruler.max.y - 8.0),
-            pos2(cx, ruler.max.y - 2.0),
-            pos2(cx - 6.0, ruler.max.y - 8.0),
-        ];
-        p.add(egui::Shape::convex_polygon(head, t.cti, Stroke::NONE));
-        app.auto.add("timeline.cti", Rect::from_center_size(pos2(cx, ruler.center().y), vec2(12.0, 20.0)), "Current time indicator");
+/// The Timeline panel for the active composition inside `rect`: draws the header, ruler, work
+/// area and cache bars, the layer rows with their switch and value cells, the time graph and its
+/// keys, and the footer; and turns this frame's clicks, drags and drops into commands. Without an
+/// active comp it shows a hint, and dropping footage on it creates a composition. Most edits
+/// use [`crate::menus::invoke`]; time, switch and work-area gestures call `Session::execute`
+/// directly and ignore errors. Reported failures go to `app.ui.status`. UI state (scroll, zoom,
+/// open rows and the drags in progress) lives in
+/// `app.ui.timeline` and egui's temp data.
+pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let Some(cid) = app.session.active_comp_id() else {
+        empty_timeline(app, ui, rect);
+        return;
+    };
+    let Some(comp) = app.session.project.comp_arc(cid) else { return };
+    let mut tl = layout(app, ui, rect, cid, &comp);
+    let g = &mut tl;
+    if !ui.input(|i| i.pointer.primary_down()) {
+        g.ctx.data_mut(|d| d.remove::<SwitchDrag>(switch_drag_id()));
     }
-    let _ = graph_rect;
+    header_timecode(app, ui, g);
+    header_search_and_switches(app, ui, g);
+    time_navigator(app, ui, g);
+    ruler_background(app, g);
+    work_area_bar(app, ui, g);
+    cache_bars(app, g);
+    ruler_ticks(app, g);
+    ruler_scrub(app, ui, g);
+    column_header_icons(app, g);
+    column_header_interact(app, ui, g);
+    let rows = Arc::new(with_expr_rows(build_rows(app, &comp), &comp, &app.ui.timeline, &g.ctx));
+    let total_h: f32 = rows.iter().map(|r| row_height(r, g.rh)).sum();
+    g.max_scroll = (total_h - g.rows_rect.height() + g.rh).max(0.0);
+    g.rows = rows;
+    reveal_scroll(app, g);
+    wheel_zoom_scroll(app, ui, g);
+    pick_whip_edge_scroll(app, g);
+    let snap_project = app.session.project.clone();
+    let snap_expr = app.session.expr.clone();
+    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time: g.time, expr: snap_expr.as_deref(), footage: None };
+    let mut rw = begin_rows(app, ui, tl);
+    let g = &mut rw;
+    draw_rows(app, ui, g, &ectx);
+    ui.set_clip_rect(g.full_clip);
+    background_menus(app, ui, g);
+    outline_marquee(ui, g);
+    pick_whip_drag(g);
+    alt_scale_and_graph(app, ui, g, &ectx);
+    graph_empty_area(ui, g);
+    layer_reorder_drag(ui, g);
+    quick_offset_follow(g);
+    key_drag_follow(app, g);
+    key_box_select(app, ui, g);
+    current_time_indicator(app, g);
+    let footer = footer_bar(app, ui, g);
+    footer_zoom(app, ui, g, footer);
+    comp_markers_ui(app, ui, g);
+    hand_tool_pan(app, ui, g);
+    drop_targets(app, ui, g);
+    let Rw { tl, ui_actions, .. } = rw;
+    apply_ui_acts(app, &tl.comp, ui_actions);
+    apply_actions(app, ui, &tl.ctx, tl.actions);
+}
 
-    // Footer.
-    let footer = Rect::from_min_max(pos2(rect.min.x, rect.max.y - footer_h), rect.max);
-    p.rect_filled(footer, 0.0, t.panel_bg);
-    p.line_segment([footer.left_top(), footer.right_top()], Stroke::new(1.0, t.separator));
-    if overflow > 0.0 {
-        // Outline scroll bar along the top of the footer, under the columns.
-        let track = Rect::from_min_max(pos2(rect.min.x + 2.0, footer.min.y + 1.0), pos2(graph_x0 - 3.0, footer.min.y + 5.0));
-        app.ui.timeline.outline_scroll = widgets::scroll_bar(ui, &mut app.auto, "timeline.outlineScroll", track, oscroll, overflow, &t);
-    }
-    if max_scroll > 0.0 {
-        // The layer rows' scroll bar, on the right edge beside the time graph.
-        let track = Rect::from_min_max(pos2(rect.max.x - 6.0, rows_rect.min.y + 1.0), pos2(rect.max.x - 2.0, rows_rect.max.y - 1.0));
-        app.ui.timeline.scroll_y = widgets::scroll_bar(ui, &mut app.auto, "timeline.scroll", track, app.ui.timeline.scroll_y, max_scroll, &t);
-    }
-    let tgl = Rect::from_min_size(pos2(footer.min.x + 10.0, footer.min.y + 3.0), vec2(150.0, 18.0));
-    let tresp = ui.interact(tgl, egui::Id::new("tl-toggle-modes"), Sense::click());
-    p.text(
-        tgl.left_center(),
-        Align2::LEFT_CENTER,
-        crate::i18n::tr("Toggle Switches / Modes"),
-        Tokens::ui(11.0),
-        if tresp.hovered() { t.text } else { t.text_dim },
-    );
-    app.auto.add("timeline.toggleSwitchesModes", tgl, "Toggle Switches / Modes");
-    if tresp.clicked() {
-        app.ui.timeline.show_modes = !app.ui.timeline.show_modes;
-    }
-    let ms = app.frames.last_ms.lock().map(|v| *v).unwrap_or(0.0);
-    p.text(
-        pos2(graph_x0 - 12.0, footer.center().y),
-        Align2::RIGHT_CENTER,
-        crate::i18n::tr_args("Frame Render Time  {}ms", &[&format!("{ms:.0}")]),
-        Tokens::ui(11.0),
-        t.text_faint,
-    );
-    // Zoom slider.
-    let zs = Rect::from_min_max(pos2(graph_x0 + 30.0, footer.center().y - 2.0), pos2((graph_x0 + 230.0).min(rect.max.x - 30.0), footer.center().y + 2.0));
-    // Zoom out / zoom in buttons either side of the slider: the `-` / `=` steps. Everything here
-    // zooms around the CTI and sets the one time zoom the layer bars and the Graph Editor share.
-    let cti = time.seconds();
-    let cti_px = (cti - tm.start) * pps;
-    for (icon, size, cx, id, tip, k) in [
-        (Icon::MountainSmall, 14.0, zs.min.x - 14.0, "timeline.zoomOutButton", "Zoom Out (Time)", 1.0 / ZOOM_STEP),
-        (Icon::MountainLarge, 16.0, zs.max.x + 14.0, "timeline.zoomInButton", "Zoom In (Time)", ZOOM_STEP),
-    ] {
-        let r = Rect::from_center_size(pos2(cx, footer.center().y), vec2(20.0, 20.0));
-        let resp = ui.interact(r, egui::Id::new(id), Sense::click()).on_hover_text(crate::i18n::tr(tip));
-        icons::paint(&p, Rect::from_center_size(r.center(), vec2(size, size)), icon, if resp.hovered() { t.text } else { t.text_dim });
-        app.auto.add(id, r, tip);
-        if resp.clicked() {
-            set_zoom(&mut app.ui.timeline, &comp, pps * k, fit_pps, cti, cti_px);
-        }
-    }
-    p.rect_filled(zs, 2.0, t.field_bg);
-    let maxpps = MAX_PPS.max(fit_pps * 1.001);
-    let frac = ((pps / fit_pps).ln() / (maxpps / fit_pps).ln()).clamp(0.0, 1.0) as f32;
-    let knob = pos2(zs.min.x + zs.width() * frac, zs.center().y);
-    p.circle_filled(knob, 6.0, t.text);
-    // Drag the knob, or click the track to jump there.
-    let zresp = ui.interact(zs.expand2(vec2(6.0, 8.0)), egui::Id::new("tl-zoom"), Sense::click_and_drag());
-    app.auto.add("timeline.zoomSlider", zs, "Zoom");
-    if (zresp.dragged() || zresp.clicked())
-        && let Some(pt) = zresp.interact_pointer_pos()
-    {
-        let f = ((pt.x - zs.min.x) / zs.width().max(1.0)).clamp(0.0, 1.0) as f64;
-        set_zoom(&mut app.ui.timeline, &comp, fit_pps * (maxpps / fit_pps).powf(f), fit_pps, cti, cti_px);
-    }
-
-    // Composition markers in the ruler; protected regions shade the layer rows.
-    let mstrip = Rect::from_min_max(pos2(graph_x0, ruler.max.y - 12.0), pos2(bin.min.x, ruler.max.y));
-    let mrows = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));
-    super::markers_ui::comp_markers(app, ui, &comp, tm, mstrip, mrows);
-    super::markers_ui::marker_bin(app, ui, &comp, tm, bin, mstrip);
-
-    // Spacebar held: the Hand tool. Dragging the ruler or the time graph scrolls it in time when
-    // zoomed in (registered last, so it takes the drag from the bars, keys and markers there).
-    if super::space_hand(&ctx) {
-        let area = Rect::from_min_max(pos2(graph_x0, ruler.min.y), pos2(rect.max.x, rows_rect.max.y));
-        let hand = ui.interact(area, egui::Id::new("tl-hand"), Sense::drag());
-        app.auto.add("timeline.hand", area, "Hand (hold Spacebar)");
-        if hand.hovered() || hand.dragged() {
-            ctx.set_cursor_icon(if hand.dragged() { egui::CursorIcon::Grabbing } else { egui::CursorIcon::Grab });
-        }
-        if hand.dragged() && app.ui.timeline.pps.is_some() {
-            let start = app.ui.timeline.start;
-            let last = (comp.duration.seconds() - (tm.t(graph_x1) - tm.start)).max(start).max(0.0);
-            app.ui.timeline.start = (start - hand.drag_delta().x as f64 / pps).clamp(0.0, last);
-        }
-    }
-
-    // Drop targets: effects from Effects & Presets go on the layer under the pointer. Footage and
-    // comps from the Project panel and files from the Media Browser go where they are dropped: a
-    // line shows the place in the stack, and over the time graph a marker shows the In point too
-    // (Shift: at the current time).
-    if let Some(payload) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx)
-        && !matches!(*payload, crate::panels::DragPayload::Property { .. })
-        && let Some(ptr) = ctx.input(|i| i.pointer.hover_pos()).filter(|_| ui.rect_contains_pointer(rows_rect))
-    {
-        let released = ctx.input(|i| i.pointer.any_released());
-        if let crate::panels::DragPayload::Effect(e) = payload.as_ref() {
-            let target = hit_rows.iter().find(|(r, _)| ptr.y >= r.min.y && ptr.y < r.max.y).map(|(_, row)| row.layer);
-            // The layer the effect would land on (its row and its open properties) is the one
-            // that lights up, not the whole timeline.
-            if let Some(l) = target
-                && let Some(span) = hit_rows.iter().filter(|(_, row)| row.layer == l).map(|(r, _)| *r).reduce(|a, b| a.union(b))
-            {
-                let lit = span.intersect(rows_rect);
-                let rp = p.with_clip_rect(rows_rect);
-                rp.rect_filled(lit, 0.0, t.accent.gamma_multiply(0.18));
-                rp.rect_stroke(lit, 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
-                app.auto.add("timeline.dropTarget", lit, "Drop target layer");
-            }
-            if released && let Some(l) = target {
-                actions.push(("effect.apply".into(), json!({"effect": e, "layers": [l.0]})));
-            }
-        } else {
-            let layer_rows: Vec<(Rect, LayerId)> = hit_rows.iter().filter(|(_, r)| matches!(r.kind, RowKind::Layer)).map(|(rr, r)| (*rr, r.layer)).collect();
-            let (at, line_y) = insertion(&layer_rows, ptr.y, rows_rect.min.y);
-            let index = match at.and_then(|i| layer_rows.get(i)) {
-                Some((_, l)) => comp.index_of(*l).unwrap_or(1),
-                None => layer_rows.last().and_then(|(_, l)| comp.index_of(*l)).unwrap_or(comp.layers.len()) + 1,
-            };
-            let start = (ptr.x >= graph_x0 && !graph_on).then(|| {
-                let t = if ctx.input(|i| i.modifiers.shift) { time } else { Tick::from_seconds_f64(tm.t(ptr.x)) };
-                comp.frame_rate.snap_nearest(t).clamp(Tick::ZERO, comp.duration - comp.frame_duration())
-            });
-            let rp = p.with_clip_rect(rows_rect);
-            rp.line_segment([pos2(rect.min.x, line_y), pos2(rows_rect.max.x, line_y)], Stroke::new(2.0, t.accent));
-            if let Some(s) = start {
-                let x = tm.x(s.seconds());
-                rp.line_segment([pos2(x, rows_rect.min.y), pos2(x, rows_rect.max.y)], Stroke::new(1.0, t.accent));
-                // The In point's time in a tag beside the marker.
-                let g = rp.layout_no_wrap(super::timecode(&app.session, &comp, s), Tokens::ui(11.0), Color32::WHITE);
-                let tag = Align2::LEFT_BOTTOM.anchor_size(pos2(x + 4.0, line_y - 3.0), g.size());
-                rp.rect_filled(tag.expand(2.0), 2.0, t.accent);
-                rp.galley(tag.min, g, Color32::WHITE);
-            }
-            if released {
-                let time = json!(start.map(Tick::seconds));
-                match payload.as_ref() {
-                    crate::panels::DragPayload::Item(id) => {
-                        // Insert each selected item at the drop point, in selection order.
-                        for (offset, item) in crate::panels::project_drop_items(app, *id).into_iter().enumerate() {
-                            actions.push(("layer.addItem".into(), json!({"item": item, "index": index.saturating_add(offset), "time": time.clone()})));
-                        }
-                    }
-                    crate::panels::DragPayload::Files(paths) => {
-                        actions.push(("mediaBrowser.import".into(), json!({"paths": paths, "addToComp": true, "index": index, "time": time})))
-                    }
-                    crate::panels::DragPayload::Effect(_) | crate::panels::DragPayload::Property { .. } => {}
-                }
-            }
-        }
-        if released {
-            egui::DragAndDrop::clear_payload(&ctx);
-        }
-    }
-
-    // Apply.
+/// Applies the UI-only changes the frame collected (twirls, time, ending an undo merge).
+fn apply_ui_acts(app: &mut EffectcraftApp, comp: &Comp, ui_actions: Vec<UiAct>) {
     for a in ui_actions {
         match a {
             UiAct::ToggleLayer(id, all) => {
@@ -3457,6 +1906,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
+}
+
+/// Runs the commands the frame collected through [`crate::menus::invoke`].
+fn apply_actions(app: &mut EffectcraftApp, ui: &mut egui::Ui, ctx: &egui::Context, actions: Vec<(String, serde_json::Value)>) {
     if ui.input(|i| i.pointer.primary_down()) && actions.iter().any(|(id, _)| id == "prop.set") {
         app.ui.viewer.property_interacting = true;
         ctx.request_repaint();
@@ -3466,32 +1919,2897 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             app.session.history.merge_key = None;
             continue;
         }
-        if let Err(e) = crate::menus::invoke(app, &ctx, &id, params) {
+        if let Err(e) = crate::menus::invoke(app, ctx, &id, params) {
             app.ui.status = e;
         }
     }
 }
 
+/// Draws the visible rows, top to bottom, each by its kind.
+fn draw_rows(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, ectx: &EvalCtx<'_>) {
+    let comp = g.tl.comp.clone();
+    let rows = g.tl.rows.clone();
+    let (rect, rows_rect, rh, cw_name) = (g.tl.rect, g.tl.rows_rect, g.tl.rh, g.tl.cw.name);
+    let mut y = rows_rect.min.y - app.ui.timeline.scroll_y;
+    // Rows stripe by their index among the rows that are not expression editors, so adding or
+    // removing an expression leaves every other row's stripe alone; an editor takes the index
+    // (and so the stripe) of its property's row, the one just above.
+    let mut striped = 0usize;
+    for row in rows.iter() {
+        let ri = if matches!(row.kind, RowKind::Expr { .. }) {
+            striped.saturating_sub(1)
+        } else {
+            striped += 1;
+            striped - 1
+        };
+        // Outline widgets never spill into the time graph (narrow timelines).
+        ui.set_clip_rect(g.left_clip);
+        let hh = row_height(row, rh);
+        let r = Rect::from_min_size(pos2(rect.min.x, y), vec2(rect.width(), hh));
+        y += hh;
+        if r.max.y < rows_rect.min.y || r.min.y > rows_rect.max.y {
+            continue;
+        }
+        g.hit_rows.push((r, row.clone()));
+        let Some(layer) = comp.layer(row.layer) else { continue };
+        let rc = RowCtx {
+            row,
+            layer,
+            r,
+            left: Rect::from_min_max(r.min, pos2(g.tl.graph_x0 - 1.0, r.max.y)),
+            cy: r.min.y + rh / 2.0,
+            is_sel: g.selected.contains(&layer.id),
+            ri,
+            indent: cw_name + 6.0 + 14.0 * row.depth as f32,
+        };
+        match &row.kind {
+            RowKind::Layer => layer_row(app, ui, g, &rc),
+            RowKind::Group { .. } => group_row(app, ui, g, &rc),
+            RowKind::Waveform { .. } => waveform_row(app, g, &rc),
+            RowKind::Expr { .. } => expr_row(app, ui, g, &rc),
+            RowKind::Prop { .. } => prop_row(app, ui, g, &rc, ectx),
+        }
+    }
+}
+
+/// A layer row: switches, label, name, cells and the layer bar.
+fn layer_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    layer_row_background(g, rc);
+    layer_av_switches(app, ui, g, rc);
+    layer_label_swatch(app, ui, g, rc);
+    layer_number_and_cells(app, ui, g, rc);
+    let (row_resp, name_x) = layer_twirl_and_icon(app, ui, g, rc);
+    layer_name(app, ui, g, rc, name_x);
+    layer_row_actions(app, ui, g, rc, &row_resp);
+    layer_switches(app, ui, g, rc);
+    if app.ui.timeline.show_modes && rc.layer.source.is_av() {
+        layer_mode_cell(app, ui, g, rc);
+        layer_matte_cell(app, ui, g, rc);
+    }
+    if g.tl.vis.parent {
+        layer_parent_cell(app, ui, g, rc);
+    }
+    ui.set_clip_rect(g.right_clip);
+    if !g.graph_on {
+        layer_bar(app, ui, g, rc);
+    }
+}
+
+/// The layer's duration bar: source extent, move and trim, markers.
+fn layer_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let (bar, lc) = layer_bar_paint(g, rc);
+    layer_source_extent(app, ui, g, rc, bar, lc);
+    let bars = layer_bar_hits(app, ui, g, rc, bar);
+    let quick = layer_quick_offset_begin(ui, g, rc, &bars.body);
+    layer_bar_drag(g, rc, &bars, quick);
+    layer_bar_markers(app, ui, g, rc);
+}
+
+/// A group row (effect, mask, shape group, layer style).
+fn group_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let shown = group_background(app, g, rc);
+    group_switches(app, ui, g, rc);
+    group_name(app, ui, g, rc, &shown);
+    group_popups(app, ui, g, rc);
+    group_mask_mode(ui, g, rc);
+    group_row_click(app, ui, g, rc);
+}
+
+/// An expression row: its controls and the editor.
+fn expr_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let RowKind::Expr { uid, .. } = &rc.row.kind else { return };
+    let Some(prop) = rc.layer.props.find(*uid) else { return };
+    let Some(ex) = prop.expr.as_ref() else { return };
+    let st = ExprRow { prop, ex, buf_id: expr_buf_id(*uid), edit_id: egui::Id::unique(("expr-edit", uid)) };
+    expr_controls(app, ui, g, rc, &st);
+    expr_language_menu(app, ui, g, rc, &st);
+    expr_editor_cell(app, ui, g, rc, &st);
+}
+
+/// A property row: keyframe navigator, stopwatch, name, value editors and the keyframes.
+fn prop_row(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, ectx: &EvalCtx<'_>) {
+    let RowKind::Prop { uid } = &rc.row.kind else { return };
+    let Some(prop) = rc.layer.props.find(*uid) else { return };
+    prop_background(app, g, rc, prop);
+    prop_key_navigator(app, ui, g, rc, prop);
+    prop_stopwatch(app, ui, g, rc, prop);
+    let name_x = prop_name(app, ui, g, rc, prop);
+    prop_value_cell(app, ui, g, rc, ectx, prop, name_x);
+    prop_expression_hint(app, ui, g, rc, prop);
+    if !g.graph_on {
+        for k in &prop.keys {
+            key_marker(app, ui, g, rc, prop, k);
+        }
+    }
+}
+
+/// One keyframe marker: its look, selection, menu and drag.
+fn key_marker(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property, k: &effectcraft_engine::keyframe::Keyframe) {
+    let RowKind::Prop { uid } = &rc.row.kind else { return };
+    let ct = rc.layer.comp_time(k.time);
+    let x = g.tl.tm.x(ct.seconds());
+    if x < g.tl.graph_x0 - 8.0 || x > g.tl.rect.max.x + 8.0 {
+        return;
+    }
+    let kref = effectcraft_engine::KeyRef { layer: rc.layer.id, prop: *uid, time: k.time };
+    let ks = g.sel_keys.contains(&kref);
+    let kr = key_paint(g, rc, k, x, ks);
+    let kresp = key_hit(app, ui, g, rc, prop, k, kr);
+    let mods = ui.input(|i| i.modifiers);
+    let this_key = json!({"keys": [{"layer": rc.layer.id.0, "prop": uid, "time": k.time.seconds()}], "selectProperties": true});
+    let kh = KeyHit { k, ct, ks, kresp, mods, this_key };
+    key_select(g, &kh);
+    key_double_click(g, rc, prop, &kh);
+    key_context_menu(app, g, rc, prop, &kh);
+    key_drag_begin(app, g, &kh);
+}
+
+/// Drop targets: effects and presets on a layer, footage and files into the stack.
+fn drop_targets(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw) {
+    let ctx = g.tl.ctx.clone();
+    let rows_rect = g.tl.rows_rect;
+    if let Some(payload) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx)
+        && !matches!(*payload, crate::panels::DragPayload::Property { .. })
+        && let Some(ptr) = ctx.input(|i| i.pointer.hover_pos()).filter(|_| ui.rect_contains_pointer(rows_rect))
+    {
+        let released = ctx.input(|i| i.pointer.any_released());
+        // Alt/Option-drag from the Project panel replaces the source of the layer under the
+        // pointer (After Effects). The shortcut replaces every selected layer instead.
+        let alt_item = ctx.input(|i| i.modifiers.alt) && matches!(payload.as_ref(), crate::panels::DragPayload::Item(_));
+        if alt_item {
+            drop_replace_source(app, g, &payload, ptr, released);
+        } else if matches!(payload.as_ref(), crate::panels::DragPayload::Effect(_) | crate::panels::DragPayload::Preset { .. }) {
+            drop_on_layer(app, g, &payload, ptr, released);
+        } else {
+            drop_insert_layers(app, g, &payload, ptr, released);
+        }
+        if released {
+            egui::DragAndDrop::clear_payload(&ctx);
+        }
+    }
+}
+
+/// The header's time display: click to switch style, drag to scrub, double-click to type a time.
+fn header_timecode(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Tl) {
+    let t = g.t;
+    let time = g.time;
+    let fr = g.fr;
+    let tc_rect = g.tc_rect;
+    let ctx = g.ctx.clone();
+    let comp = g.comp.clone();
+    let p = g.p.clone();
+    let tc = crate::panels::timecode(&app.session, &comp, time);
+    let tc_resp = ui.interact(tc_rect, egui::Id::unique("tl-timecode"), Sense::click_and_drag());
+    p.text(tc_rect.left_center(), Align2::LEFT_CENTER, &tc, Tokens::semibold(16.0), t.timecode);
+    // Under it the other style (frames under timecode, timecode under frames) and the rate.
+    let settings = &app.session.project.settings;
+    let other = if settings.time_display == effectcraft_engine::project::TimeDisplayStyle::Timecode {
+        format!("{:05}", fr.frame_at(time) + settings.frame_start)
+    } else {
+        effectcraft_engine::time::format_timecode_ae(fr.frame_at(time + comp.display_start), fr, false)
+    };
+    // Audio-only preview (Video off in the Preview panel): the current time stays put, so that
+    // line says why and where the sound is instead (#1118).
+    if let Some(af) = app.video_preview_off() {
+        let at = af.map(|f| format!(" · {}", effectcraft_engine::time::format_timecode_ae(f + fr.frame_at(comp.display_start), fr, false))).unwrap_or_default();
+        let msg = format!("{}{at}", crate::i18n::tr("Video preview off: audio only"));
+        p.text(pos2(tc_rect.min.x, tc_rect.max.y + 8.0), Align2::LEFT_CENTER, msg, Tokens::ui(10.5), t.cache_green);
+    } else {
+        p.text(pos2(tc_rect.min.x, tc_rect.max.y + 8.0), Align2::LEFT_CENTER, format!("{other} ({:.2} fps)", fr.as_f64()), Tokens::ui(10.5), t.text_faint);
+    }
+    app.auto.add("timeline.timecode", tc_rect, &tc);
+    super::toggle_time_display(app, &tc_resp);
+    if tc_resp.dragged() {
+        let d = tc_resp.drag_delta().x as f64;
+        let f = fr.frame_at(time) + (d * 0.5).round() as i64;
+        let _ = app.session.execute("time.set", json!({"frame": f.max(0)}));
+    }
+    if tc_resp.double_clicked() {
+        ctx.data_mut(|d| d.insert_temp(egui::Id::unique("tl-tc-edit"), tc.clone()));
+    }
+    if let Some(mut buf) = ctx.data(|d| d.get_temp::<String>(egui::Id::unique("tl-tc-edit"))) {
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(tc_rect));
+        let r = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::semibold(16.0)).desired_width(150.0));
+        if r.lost_focus() {
+            if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+                let _ = app.session.execute("time.set", json!({"timecode": buf}));
+            }
+            ctx.data_mut(|d| d.remove::<String>(egui::Id::unique("tl-tc-edit")));
+        } else {
+            widgets::keep_focus(&ctx, &r, &buf);
+            ctx.data_mut(|d| d.insert_temp(egui::Id::unique("tl-tc-edit"), buf));
+        }
+    }
+}
+
+/// The header's search field and the composition switches.
+fn header_search_and_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Tl) {
+    let t = g.t;
+    let rect = g.rect;
+    let left_w = g.left_w;
+    let top = g.top;
+    let tc_rect = g.tc_rect;
+    let comp = g.comp.clone();
+    let sr = Rect::from_min_size(pos2(tc_rect.max.x + 14.0, top + 12.0), vec2((left_w - 420.0).clamp(120.0, 220.0), 22.0));
+    let mut search = app.ui.timeline.search.clone();
+    widgets::search_field(ui, sr, &mut search, "Search", &t);
+    app.ui.timeline.search = search;
+    app.auto.add("timeline.search", sr, "Search");
+    let mut bx = rect.min.x + left_w - 10.0;
+    for (icon, on, id, tip) in [
+        (Icon::Graph, app.ui.timeline.graph_editor, "graph", "Graph Editor"),
+        (Icon::MotionBlur, comp.enable_motion_blur, "motionBlur", "Enables Motion Blur for all layers with the Motion Blur switch set"),
+        (Icon::FrameBlend, comp.enable_frame_blending, "frameBlending", "Enables Frame Blending for all layers with the Frame Blend switch set"),
+        (Icon::Shy, comp.hide_shy, "hideShy", "Hides all layers for which the Shy switch is set"),
+        (Icon::Draft3D, comp.draft_3d, "draft3d", "Draft 3D"),
+        (Icon::Flowchart, false, "flowchart", "Composition Mini-Flowchart"),
+    ] {
+        let r = Rect::from_min_size(pos2(bx - 24.0, top + 11.0), vec2(24.0, 24.0));
+        let resp = widgets::icon_button(ui, r, icon, on, &t, egui::Id::unique(("tl-sw", id))).on_hover_text(tip);
+        app.auto.add(&format!("timeline.switch.{id}"), r, tip);
+        if resp.clicked() {
+            match id {
+                "graph" => app.ui.timeline.graph_editor = !app.ui.timeline.graph_editor,
+                "flowchart" => app.show_panel(crate::dock::PanelKind::Flowchart),
+                _ => {
+                    let _ = app.session.execute("comp.setSwitch", json!({"switch": id}));
+                }
+            }
+        }
+        bx -= 28.0;
+    }
+}
+
+/// The time navigator: the visible span as a bar with end handles.
+fn time_navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Tl) {
+    let t = g.t;
+    let graph_x0 = g.graph_x0;
+    let graph_x1 = g.graph_x1;
+    let fit_pps = g.fit_pps;
+    let pps = g.pps;
+    let tm = g.tm;
+    let top = g.top;
+    let ctx = g.ctx.clone();
+    let comp = g.comp.clone();
+    let p = g.p.clone();
+    let nav = Rect::from_min_max(pos2(graph_x0 + 6.0, top + 6.0), pos2(graph_x1, top + 14.0));
+    // Time navigator: the visible span as a grey bar with blue end handles (as in After
+    // Effects), over a dark track.
+    p.rect_filled(nav, 1.0, t.field_bg);
+    let vis0 = (tm.start / comp.duration.seconds()) as f32;
+    let vis1 = (tm.t(graph_x1) / comp.duration.seconds()) as f32;
+    let nav_vis =
+        Rect::from_min_max(pos2(nav.min.x + nav.width() * vis0.clamp(0.0, 1.0), nav.min.y), pos2(nav.min.x + nav.width() * vis1.clamp(0.0, 1.0), nav.max.y));
+    p.rect_filled(nav_vis, 0.0, t.tl_nav_bar);
+    for x in [nav_vis.min.x, nav_vis.max.x] {
+        p.rect_filled(Rect::from_min_max(pos2(x - 3.0, nav.min.y - 1.0), pos2(x + 3.0, nav.max.y + 1.0)), 3.0, t.accent);
+    }
+    // The middle scrolls at the current zoom; each end is a handle that moves that side of the
+    // visible span (pulled in: zoomed in; stretched to the whole track: the whole comp).
+    let nresp = ui.interact(nav, egui::Id::unique("tl-nav"), Sense::drag());
+    app.auto.add("timeline.navigator", nav, "Time navigator");
+    if nresp.dragged() {
+        let d = nresp.drag_delta().x as f64 / nav.width() as f64 * comp.duration.seconds();
+        app.ui.timeline.start = (app.ui.timeline.start + d).clamp(0.0, comp.duration.seconds());
+        if app.ui.timeline.pps.is_none() {
+            app.ui.timeline.pps = Some(pps);
+        }
+    }
+    let span_px = (graph_x1 - tm.x0) as f64;
+    let (t0, t1) = (tm.start, tm.t(graph_x1));
+    for (end, x) in [("start", nav_vis.min.x), ("end", nav_vis.max.x)] {
+        let hr = Rect::from_center_size(pos2(x, nav.center().y), vec2(10.0, nav.height() + 6.0));
+        let hresp = ui.interact(hr, egui::Id::unique(("tl-nav", end)), Sense::drag());
+        app.auto.add(&format!("timeline.navigator.{end}"), hr, if end == "start" { "Time navigator start" } else { "Time navigator end" });
+        if hresp.hovered() || hresp.dragged() {
+            ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+        }
+        if let Some(px) = hresp.interact_pointer_pos().filter(|_| hresp.dragged()) {
+            let t = ((px.x - nav.min.x) / nav.width()) as f64 * comp.duration.seconds();
+            // The other end stays; the span is at least what the most zoomed-in ruler shows.
+            let min_span = span_px / MAX_PPS;
+            let (keep_t, keep_px, span) = if end == "start" { (t1, span_px, t1 - t.min(t1 - min_span)) } else { (t0, 0.0, t.max(t0 + min_span) - t0) };
+            set_zoom(&mut app.ui.timeline, &comp, span_px / span.max(min_span), fit_pps, keep_t, keep_px);
+        }
+    }
+}
+
+fn ruler_background(app: &mut EffectcraftApp, g: &Tl) {
+    let t = g.t;
+    let tm = g.tm;
+    let ruler = g.ruler;
+    let p = g.p.clone();
+    p.rect_filled(ruler, 0.0, t.tl_ruler_bg);
+    app.auto.add("timeline.ruler", ruler, &format!("{},{}", tm.start, tm.pps));
+}
+
+/// The work area bar beside the column headers, with its begin / end handles.
+fn work_area_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Tl) {
+    let t = g.t;
+    let fr = g.fr;
+    let pps = g.pps;
+    let tm = g.tm;
+    let wa_row = g.wa_row;
+    let ctx = g.ctx.clone();
+    let comp = g.comp.clone();
+    let p = g.p.clone();
+    let actions = &mut g.actions;
+    // Work area bar: below the ruler, beside the column headers (After Effects' layout), with
+    // blue begin / end handles; the cache bar runs under it. Dragging the bar moves the work
+    // area, the handles move its ends; Shift snaps (#252).
+    let (wa0, wa1) = (comp.work_area.0.seconds(), comp.work_area.1.seconds());
+    let wa = Rect::from_min_max(pos2(tm.x(wa0), wa_row.min.y + 3.0), pos2(tm.x(wa1), wa_row.max.y - 6.0));
+    p.with_clip_rect(wa_row).rect_filled(wa, 0.0, t.tl_work_area_bar);
+    let shift = ui.input(|i| i.modifiers.shift);
+    let bar = wa.intersect(wa_row);
+    let bresp = ui.interact(bar, egui::Id::unique("wa-bar"), Sense::click_and_drag());
+    app.auto.add("timeline.workArea.bar", bar, "Work area");
+    // Right-click: the work area's commands (After Effects).
+    crate::widgets::context_menu(&bresp, |ui| {
+        let mut chosen = None;
+        for id in ["comp.trimToWorkArea", "edit.liftWorkArea", "edit.extractWorkArea"] {
+            crate::menus::entry_for(app, ui, id, &mut chosen);
+        }
+        actions.extend(chosen);
+    });
+    let bar_start = egui::Id::unique("wa-bar-start");
+    if bresp.drag_started() {
+        ctx.data_mut(|d| d.insert_temp(bar_start, wa0));
+    }
+    if bresp.dragged()
+        && let (Some(a0), Some(d)) = (ctx.data(|d| d.get_temp::<f64>(bar_start)), bresp.total_drag_delta())
+    {
+        let len = wa1 - wa0;
+        let mut a = a0 + d.x as f64 / pps.max(1e-6);
+        if shift {
+            a += work_area_snap(app, &comp, &[a, a + len], pps);
+        }
+        let a = fr.snap_nearest(Tick::from_seconds_f64(a.clamp(0.0, (comp.duration.seconds() - len).max(0.0)))).seconds();
+        let _ = app.session.execute("comp.workArea", json!({"start": a, "end": a + len, "merge": "wa-drag"}));
+    }
+    for (hx, set) in [(wa.min.x, "begin"), (wa.max.x, "end")] {
+        let hr = Rect::from_center_size(pos2(hx, wa.center().y), vec2(8.0, 14.0));
+        let handle = if set == "begin" {
+            Rect::from_min_max(pos2(hx - 1.0, wa.min.y), pos2(hx + 4.0, wa.max.y))
+        } else {
+            Rect::from_min_max(pos2(hx - 4.0, wa.min.y), pos2(hx + 1.0, wa.max.y))
+        };
+        p.rect_filled(handle, 2.0, t.accent);
+        let resp = ui.interact(hr, egui::Id::unique(("wa", set)), Sense::drag());
+        app.auto.add(&format!("timeline.workArea.{set}"), hr, set);
+        if resp.dragged() || resp.hovered() {
+            ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+        }
+        if resp.dragged()
+            && let Some(pt) = resp.interact_pointer_pos()
+        {
+            let mut secs = tm.t(pt.x).max(0.0);
+            if shift {
+                secs += work_area_snap(app, &comp, &[secs], pps);
+            }
+            let secs = fr.snap_nearest(Tick::from_seconds_f64(secs)).seconds();
+            let key = if set == "begin" { "start" } else { "end" };
+            let _ = app.session.execute("comp.workArea", json!({key: secs, "merge": "wa-drag"}));
+        }
+    }
+}
+
+/// The RAM (green) and disk (blue) cache bars under the work area.
+fn cache_bars(app: &mut EffectcraftApp, g: &Tl) {
+    let t = g.t;
+    let cid = g.cid;
+    let tm = g.tm;
+    let wa_row = g.wa_row;
+    let fd = g.fd;
+    let comp = g.comp.clone();
+    let p = g.p.clone();
+    // Cache bar (green: cached frames of what the viewer shows: its resolution, view and options).
+    let series = app.shown_series(cid);
+    let cached = app.frames.cached_frames(&series);
+    let cy0 = wa_row.max.y - 4.0;
+    let mut run: Option<(i64, i64)> = None;
+    let draw_run = |a: i64, b: i64| {
+        let x0 = tm.x(a as f64 * fd);
+        let x1 = tm.x((b + 1) as f64 * fd);
+        p.rect_filled(Rect::from_min_max(pos2(x0, cy0), pos2(x1, cy0 + 2.5)), 0.0, t.cache_green);
+    };
+    for f in cached {
+        run = match run {
+            Some((a, b)) if f == b + 1 => Some((a, f)),
+            Some((a, b)) => {
+                draw_run(a, b);
+                Some((f, f))
+            }
+            None => Some((f, f)),
+        };
+    }
+    if let Some((a, b)) = run {
+        draw_run(a, b);
+    }
+    // Disk-cached frames not in RAM (blue), like After Effects.
+    if app.session.disk_cache.is_some() || app.frames.remote_disk() {
+        let frames = comp.frame_rate.frame_at(comp.duration);
+        let opts = app.frame_opts(cid, series.scale as f64 / 1000.0);
+        let clip = wa_row.intersect(p.clip_rect());
+        let range = disk_bar_range(&tm, clip, fd, frames);
+        let disk = app.frames.disk_frames(&app.render_source(), &series, range, &opts);
+        let blue_painter = p.with_clip_rect(clip);
+        let draw_blue = |a: i64, b: i64| {
+            let x0 = tm.x(a as f64 * fd);
+            let x1 = tm.x((b + 1) as f64 * fd);
+            blue_painter.rect_filled(Rect::from_min_max(pos2(x0, cy0), pos2(x1, cy0 + 2.5)), 0.0, t.cache_blue);
+        };
+        let mut run: Option<(i64, i64)> = None;
+        for f in disk {
+            run = match run {
+                Some((a, b)) if f == b + 1 => Some((a, f)),
+                Some((a, b)) => {
+                    draw_blue(a, b);
+                    Some((f, f))
+                }
+                None => Some((f, f)),
+            };
+        }
+        if let Some((a, b)) = run {
+            draw_blue(a, b);
+        }
+    }
+}
+
+/// The ruler's tick marks and labels.
+fn ruler_ticks(app: &mut EffectcraftApp, g: &Tl) {
+    let t = g.t;
+    let fr = g.fr;
+    let graph_x0 = g.graph_x0;
+    let graph_x1 = g.graph_x1;
+    let pps = g.pps;
+    let tm = g.tm;
+    let ruler = g.ruler;
+    let bin = g.bin;
+    let fd = g.fd;
+    let p = g.p.clone();
+    // Ticks + labels.
+    // Label spacing in whole frames (AE: `00:15f`-style seconds:frames labels).
+    let fps_i = fr.as_f64().round().max(1.0) as i64;
+    let half = (fps_i / 2).max(1);
+    let label_frames = [1, 2, 5, 10, half, fps_i, 2 * fps_i, 5 * fps_i, 10 * fps_i, 30 * fps_i, 60 * fps_i]
+        .into_iter()
+        .find(|f| *f as f64 * fd * pps >= 52.0)
+        .unwrap_or(60 * fps_i);
+    let secs_per_label = label_frames as f64 * fd;
+    let first = (tm.start / secs_per_label).floor() * secs_per_label;
+    let mut s = first;
+    let pr = p.with_clip_rect(Rect::from_min_max(pos2(graph_x0, ruler.min.y), pos2(bin.min.x, ruler.max.y)));
+    while s <= tm.t(graph_x1) + secs_per_label {
+        let x = tm.x(s);
+        pr.line_segment([pos2(x, ruler.max.y - 10.0), pos2(x, ruler.max.y)], Stroke::new(1.0, t.tl_ruler_tick));
+        let fno = (s / fd).round() as i64;
+        let label = ruler_label(fno, fps_i, &app.session.project.settings);
+        // A label that would run under the marker bin is left out rather than cut to a stray digit.
+        let g = pr.layout_no_wrap(label, Tokens::ui(10.0), t.tl_ruler_text);
+        if x + 3.0 + g.size().x <= bin.min.x {
+            pr.galley(pos2(x + 3.0, ruler.max.y - 16.0 - g.size().y / 2.0), g, t.tl_ruler_text);
+        }
+        for k in 1..5 {
+            let xx = tm.x(s + secs_per_label * k as f64 / 5.0);
+            pr.line_segment([pos2(xx, ruler.max.y - 4.0), pos2(xx, ruler.max.y)], Stroke::new(1.0, t.tl_ruler_tick.gamma_multiply(0.6)));
+        }
+        s += secs_per_label;
+    }
+}
+
+/// Scrubbing in the ruler: the current time follows the pointer.
+fn ruler_scrub(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Tl) {
+    let graph_x0 = g.graph_x0;
+    let graph_x1 = g.graph_x1;
+    let pps = g.pps;
+    let tm = g.tm;
+    let ruler = g.ruler;
+    let bin = g.bin;
+    let comp = g.comp.clone();
+    // Scrub in the ruler: the current time jumps to the pointer as soon as the button goes down
+    // (After Effects), then follows it.
+    let rresp = ui.interact(
+        Rect::from_min_max(pos2(graph_x0, ruler.min.y + 12.0), pos2(bin.min.x, ruler.max.y)),
+        egui::Id::unique("tl-ruler"),
+        Sense::click_and_drag(),
+    );
+    if ((rresp.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_down())) || rresp.clicked())
+        && let Some(pt) = rresp.interact_pointer_pos()
+    {
+        let mut x = pt.x;
+        // Zoomed in, a scrub held past either end of the ruler scrolls the timeline that way
+        // (faster the further), with the CTI at the edge (After Effects).
+        let mut tm = tm;
+        if rresp.dragged() && app.ui.timeline.pps.is_some() {
+            let speed = edge_scroll_speed_x(tm.x0, graph_x1, x);
+            if speed != 0.0 {
+                let dt = f64::from(ui.input(|i| i.stable_dt).clamp(0.0, 0.1));
+                let span = f64::from(graph_x1 - tm.x0) / pps;
+                let cur = app.ui.timeline.start;
+                let hi = (comp.duration.seconds() - span).max(0.0).max(cur);
+                app.ui.timeline.start = (cur + f64::from(speed) * dt / pps).clamp(0.0, hi);
+                tm.start = app.ui.timeline.start;
+                ui.ctx().request_repaint();
+            }
+            x = x.clamp(tm.x0, graph_x1);
+        }
+        let mut secs = tm.t(x).max(0.0);
+        // Shift-drag: snap to keyframes, in/out points, markers and the work area (8 px).
+        if ui.input(|i| i.modifiers.shift) {
+            let cands = snap_candidates(&comp, &build_rows(app, &comp));
+            secs = snap_time(&cands, secs, 8.0 / pps.max(1e-6));
+        }
+        let tt = Tick::from_seconds_f64(secs);
+        app.session.set_time(tt);
+        app.stop();
+        // Dragged past either edge of the ruler (over the layer outline, say), the view scrolls so
+        // the current time indicator stays in sight (After Effects).
+        if app.ui.timeline.pps.is_some() {
+            let now = app.session.time().seconds();
+            let span = tm.t(bin.min.x) - tm.start;
+            if now < tm.start {
+                app.ui.timeline.start = now.max(0.0);
+            } else if now > tm.start + span {
+                app.ui.timeline.start = (now - span).max(0.0);
+            }
+        }
+        // Ctrl/Cmd-drag scrubs the audio too (After Effects).
+        if rresp.dragged()
+            && ui.input(|i| i.modifiers.command)
+            && let Some(cid) = app.session.active_comp_id()
+        {
+            // The app clock: the audio scrub's idle timeout compares against it in the tick.
+            let now = app.now();
+            let t = app.session.time();
+            app.scrub_audio(cid, t, now);
+        }
+    }
+}
+
+/// The column headers' background, icons and titles.
+fn column_header_icons(app: &mut EffectcraftApp, g: &Tl) {
+    let t = g.t;
+    let rect = g.rect;
+    let header_h = g.header_h;
+    let colhdr_h = g.colhdr_h;
+    let vis = g.vis;
+    let graph_x0 = g.graph_x0;
+    let top = g.top;
+    let p = g.p.clone();
+    let cw = &g.cw;
+    let ch = Rect::from_min_max(pos2(rect.min.x, top + header_h), pos2(rect.max.x, top + header_h + colhdr_h));
+    p.rect_filled(Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y)), 0.0, t.panel_bg);
+    p.line_segment([pos2(rect.min.x, ch.max.y), pos2(rect.max.x, ch.max.y)], Stroke::new(1.0, t.separator));
+    let hy = ch.center().y;
+    // Column headers scroll with the outline and never spill into the time ruler.
+    let hp = p.with_clip_rect(Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y)));
+    let hic = |icon: Icon, x: f32| icons::paint(&hp, Rect::from_center_size(pos2(x, hy), vec2(12.0, 12.0)), icon, t.text_dim);
+    let htext = |x: f32, s: &str| hp.text(pos2(x, hy), Align2::LEFT_CENTER, crate::i18n::tr(s), Tokens::ui(11.0), t.text_dim);
+    if vis.av {
+        hic(Icon::Eye, cw.av + 10.0);
+        hic(Icon::Speaker, cw.av + 28.0);
+        hic(Icon::Solo, cw.av + 46.0);
+        hic(Icon::Lock, cw.av + 64.0);
+    }
+    if vis.keys {
+        htext(cw.keys + 6.0, "Keys");
+    }
+    if vis.label {
+        icons::paint(&hp, Rect::from_center_size(pos2(cw.label + 10.0, hy), vec2(10.0, 10.0)), Icon::Keyframe, t.text_dim);
+    }
+    if vis.num {
+        htext(cw.num + 6.0, "#");
+    }
+    let name_hdr = if app.ui.timeline.source_name { "Source Name" } else { "Layer Name" };
+    htext(cw.name + 22.0, name_hdr);
+    if vis.comment {
+        htext(cw.comment + 6.0, "Comment");
+    }
+    if vis.switches {
+        for (i, icon) in
+            [Icon::Shy, Icon::Collapse, Icon::Quality, Icon::Fx, Icon::FrameBlend, Icon::MotionBlur, Icon::Adjustment, Icon::Cube].into_iter().enumerate()
+        {
+            hic(icon, cw.switches + SW * i as f32 + SW / 2.0);
+        }
+    }
+    if vis.modes {
+        htext(cw.mode + 4.0, "Mode");
+        htext(cw.mode + 74.0, "T");
+        htext(cw.trkmat + 4.0, "Track Matte");
+    }
+    if vis.parent {
+        icons::paint(&hp, Rect::from_center_size(pos2(cw.parent + 10.0, hy), vec2(12.0, 12.0)), Icon::PickWhip, t.text_dim);
+        htext(cw.parent + 20.0, "Parent & Link");
+    }
+    for (on, x, s) in [(vis.in_, cw.in_, "In"), (vis.out, cw.out, "Out"), (vis.duration, cw.duration, "Duration"), (vis.stretch, cw.stretch, "Stretch")] {
+        if on {
+            htext(x + 6.0, s);
+        }
+    }
+}
+
+/// Column header clicks, automation ids and the right-click column menu.
+fn column_header_interact(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Tl) {
+    let rect = g.rect;
+    let header_h = g.header_h;
+    let colhdr_h = g.colhdr_h;
+    let vis = g.vis;
+    let graph_x0 = g.graph_x0;
+    let top = g.top;
+    let ctx = g.ctx.clone();
+    let cw = &g.cw;
+    let actions = &mut g.actions;
+    let ch = Rect::from_min_max(pos2(rect.min.x, top + header_h), pos2(rect.max.x, top + header_h + colhdr_h));
+    let hdr_rect = Rect::from_min_max(ch.min, pos2(graph_x0 - 1.0, ch.max.y));
+    let hresp = ui.interact(hdr_rect, egui::Id::unique("tl-colhdr"), Sense::click());
+    app.auto.add("timeline.header", hdr_rect, "Columns (right-click)");
+    for (id, label) in COLUMNS {
+        if let Some(x0) = match id {
+            "av" => vis.av.then_some((cw.av, AV_W)),
+            "keys" => vis.keys.then_some((cw.keys, KEYS_W)),
+            "label" => vis.label.then_some((cw.label, LABEL_W)),
+            "num" => vis.num.then_some((cw.num, NUM_W)),
+            "name" => Some((cw.name, cw.name_end - cw.name)),
+            "comment" => vis.comment.then_some((cw.comment, COMMENT_W)),
+            "switches" => vis.switches.then_some((cw.switches, SW * 8.0 + 6.0)),
+            "modes" => vis.modes.then_some((cw.mode, MODES_W)),
+            "parent" => vis.parent.then_some((cw.parent, PARENT_W)),
+            "in" => vis.in_.then_some((cw.in_, TIME_W)),
+            "out" => vis.out.then_some((cw.out, TIME_W)),
+            "duration" => vis.duration.then_some((cw.duration, TIME_W)),
+            _ => vis.stretch.then_some((cw.stretch, STRETCH_W)),
+        } {
+            app.auto.add(&format!("timeline.header.{id}"), Rect::from_min_size(pos2(x0.0, ch.min.y), vec2(x0.1, colhdr_h)), label);
+        }
+    }
+    if hresp.clicked()
+        && let Some(pt) = hresp.interact_pointer_pos()
+        && column_at(cw, pt.x) == Some("name")
+    {
+        app.ui.timeline.source_name = !app.ui.timeline.source_name;
+    }
+    if hresp.secondary_clicked() {
+        let under = hresp.interact_pointer_pos().and_then(|pt| column_at(cw, pt.x));
+        ctx.data_mut(|d| d.insert_temp(egui::Id::unique("tl-colhdr-under"), under.unwrap_or("")));
+    }
+    crate::widgets::context_menu(&hresp, |ui| {
+        let under: &str = ctx.data(|d| d.get_temp(egui::Id::unique("tl-colhdr-under"))).unwrap_or("");
+        if !under.is_empty() && under != "name" && ui.button(crate::i18n::tr("Hide This")).clicked() {
+            actions.push(("timeline.column".into(), json!({"column": under, "visible": false})));
+            ui.close();
+        }
+        ui.menu_button(crate::i18n::tr("Columns"), |ui| {
+            for (id, label) in COLUMNS {
+                let label = if id == "name" { if app.ui.timeline.source_name { "Source Name" } else { "Layer Name" } } else { label };
+                let on = column_visible(&app.ui.timeline, id);
+                if ui.add_enabled(id != "name", egui::Button::new(crate::i18n::tr(label)).selected(on)).clicked() {
+                    actions.push(("timeline.column".into(), json!({"column": id, "visible": !on})));
+                    ui.close();
+                }
+            }
+        });
+        if ui.button(if app.ui.timeline.source_name { crate::i18n::tr("Show Layer Name") } else { crate::i18n::tr("Show Source Name") }).clicked() {
+            actions.push(("timeline.sourceName".into(), json!({})));
+            ui.close();
+        }
+    });
+    let _ = cw.end;
+}
+
+/// Scrolls an expression editor or the requested layer / property into view.
+fn reveal_scroll(app: &mut EffectcraftApp, g: &Tl) {
+    let scroll_to = g.scroll_to;
+    let rows_rect = g.rows_rect;
+    let rh = g.rh;
+    let ctx = g.ctx.clone();
+    let comp = g.comp.clone();
+    let rows = &g.rows;
+    // An expression editor asked to take the keyboard comes into view; a request whose
+    // expression didn't appear, or that wasn't taken within a few passes, is dropped (it never
+    // takes the keyboard later).
+    if let Some(f) = ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())) {
+        match rows.iter().position(|r| matches!(r.kind, RowKind::Expr { uid, .. } if uid == f.prop)) {
+            Some(i) if ctx.cumulative_pass_nr() <= f.pass.saturating_add(8) => {
+                let top: f32 = rows.iter().take(i).map(|r| row_height(r, rh)).sum();
+                let fits = (top + rows.get(i).map_or(rh, |r| row_height(r, rh)) - rows_rect.height()).max(0.0).min(top);
+                app.ui.timeline.scroll_y = app.ui.timeline.scroll_y.min(top).max(fits);
+            }
+            _ => ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id())),
+        }
+    }
+    if scroll_to == Some(crate::state::ScrollTo::Layer) {
+        // The topmost selected layer, in stack order.
+        let sel = &app.session.state.selected_layers;
+        let top = comp.layers.iter().find(|l| sel.contains(&l.id)).map(|l| l.id);
+        if let Some(i) = rows.iter().position(|r| matches!(r.kind, RowKind::Layer) && Some(r.layer) == top) {
+            app.ui.timeline.scroll_y = rows.iter().take(i).map(|r| row_height(r, rh)).sum();
+        }
+    } else if let Some(crate::state::ScrollTo::Property(uid)) = scroll_to
+        && let Some(i) = rows.iter().position(|r| matches!(r.kind, RowKind::Prop { uid: p } if p == uid))
+    {
+        app.ui.timeline.scroll_y = rows.iter().take(i).map(|r| row_height(r, rh)).sum();
+    }
+}
+
+/// Mouse wheel and pinch over the rows: zoom time or scroll.
+fn wheel_zoom_scroll(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Tl) {
+    let overflow = g.overflow;
+    let graph_x0 = g.graph_x0;
+    let fit_pps = g.fit_pps;
+    let pps = g.pps;
+    let tm = g.tm;
+    let rows_rect = g.rows_rect;
+    let max_scroll = g.max_scroll;
+    let comp = g.comp.clone();
+    if ui.rect_contains_pointer(rows_rect) {
+        let (dy, dx, zoom) = ui.input(|i| (i.smooth_scroll_delta.y, i.smooth_scroll_delta.x, i.modifiers.alt));
+        // Ctrl/Cmd+wheel and a trackpad pinch reach egui as a zoom factor rather than a scroll
+        // (#428); like Alt+wheel they zoom time.
+        let pinch = ui.input(|i| i.zoom_delta()) as f64;
+        let at_x = ui.input(|i| i.pointer.hover_pos()).map(|p| p.x).unwrap_or(graph_x0);
+        if (pinch - 1.0).abs() > 1e-4 {
+            set_zoom(&mut app.ui.timeline, &comp, tm.pps * pinch, fit_pps, tm.t(at_x), (at_x - tm.x0) as f64);
+        } else if zoom && dy.abs() > 0.0 {
+            // Alt+wheel zooms around the pointer, out until the whole comp shows.
+            set_zoom(&mut app.ui.timeline, &comp, tm.pps * (dy as f64 / 200.0).exp(), fit_pps, tm.t(at_x), (at_x - tm.x0) as f64);
+        } else {
+            let over_outline = ui.input(|i| i.pointer.hover_pos()).is_some_and(|p| p.x < graph_x0);
+            let shift = ui.input(|i| i.modifiers.shift);
+            if over_outline && overflow > 0.0 && (dx.abs() > 0.0 || (shift && dy.abs() > 0.0)) {
+                let d = if dx.abs() > 0.0 { dx } else { dy };
+                app.ui.timeline.outline_scroll = (app.ui.timeline.outline_scroll - d).clamp(0.0, overflow);
+            } else {
+                app.ui.timeline.scroll_y = (app.ui.timeline.scroll_y - dy).clamp(0.0, max_scroll);
+            }
+            if dx.abs() > 0.0 && app.ui.timeline.pps.is_some() && !over_outline {
+                app.ui.timeline.start = (app.ui.timeline.start - dx as f64 / pps).max(0.0);
+            }
+        }
+    }
+}
+
+/// A held pick whip near the top or bottom scrolls the rows.
+fn pick_whip_edge_scroll(app: &mut EffectcraftApp, g: &Tl) {
+    let rect = g.rect;
+    let rows_rect = g.rows_rect;
+    let rh = g.rh;
+    let max_scroll = g.max_scroll;
+    let ctx = g.ctx.clone();
+    // A pick whip held near the top or bottom of the layers (or past it) scrolls them, as in
+    // After Effects.
+    if ctx.data(|d| d.get_temp::<PickWhip>(pick_whip_id())).is_some()
+        && let Some(ptr) = ctx.input(|i| i.pointer.latest_pos()).filter(|p| rect.x_range().contains(p.x))
+    {
+        let speed = edge_scroll_speed(rows_rect, ptr.y, rh);
+        if speed != 0.0 {
+            app.ui.timeline.scroll_y += speed * ctx.input(|i| i.stable_dt).min(0.1);
+            ctx.request_repaint();
+        }
+    }
+    app.ui.timeline.scroll_y = app.ui.timeline.scroll_y.clamp(0.0, max_scroll);
+}
+
+fn layer_row_background(g: &Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let lp = g.lp.clone();
+    let gp = g.gp.clone();
+    let r = rc.r;
+    let left = rc.left;
+    let is_sel = rc.is_sel;
+    lp.rect_filled(left, 0.0, if is_sel { t.row_selected } else { t.row_alt });
+    gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, if is_sel { t.tl_graph_selected } else { t.tl_bg });
+    lp.line_segment([pos2(rect.min.x, r.max.y - 0.5), pos2(graph_x0, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));
+    gp.line_segment([pos2(graph_x0, r.max.y - 0.5), pos2(r.max.x, r.max.y - 0.5)], Stroke::new(1.0, t.app_bg));
+}
+
+/// The A/V feature switches (video, audio, solo, lock).
+fn layer_av_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let vis = g.tl.vis;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let sw = &layer.switches;
+    // Every layer has the Video switch (the eye), nulls, cameras and lights included,
+    // as in After Effects: it hides a null's outline in the viewer and turns a camera or
+    // light off.
+    let av_items: [(Icon, bool, &str, bool); 4] = [
+        (Icon::Eye, sw.video, "video", switch_applies(layer, "video", &app.session.project)),
+        (Icon::Speaker, sw.audio, "audio", switch_applies(layer, "audio", &app.session.project)),
+        (Icon::Solo, sw.solo, "solo", switch_applies(layer, "solo", &app.session.project)),
+        (Icon::Lock, sw.locked, "lock", switch_applies(layer, "lock", &app.session.project)),
+    ];
+    for (i, (icon, on, name, applicable)) in av_items.into_iter().enumerate() {
+        let br = Rect::from_center_size(pos2(cw.av + 10.0 + 18.0 * i as f32, cy), vec2(15.0, 15.0));
+        if !applicable || !vis.av {
+            continue;
+        }
+        lp.rect_filled(br.shrink(0.5), 1.0, t.switch_well);
+        layer_switch(
+            ui,
+            &t,
+            &SwitchSpec { row: r, br, icon, on, id: egui::Id::unique(("av", layer.id.0, i)), layer: layer.id.0, name, others: true },
+            &comp,
+            &app.session.project,
+            selected,
+            &mut *actions,
+        );
+        app.auto.add(&format!("timeline.layer.{}.{name}", layer.id.0), br, name);
+    }
+}
+
+/// The label swatch and its colour menu.
+fn layer_label_swatch(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let vis = g.tl.vis;
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    // Label swatch.
+    if vis.label {
+        let lr = Rect::from_center_size(pos2(cw.label + 10.0, cy), vec2(12.0, 12.0));
+        lp.rect_filled(lr, 2.0, t.label(layer.label));
+        let lresp = ui.interact(lr, egui::Id::unique(("label", layer.id.0)), Sense::click());
+        app.auto.add(&format!("timeline.layer.{}.label", layer.id.0), lr, layer.label.name());
+        // Click (or right-click) the swatch for the label menu (After Effects).
+        let pop = egui::Id::unique(("label-pop", layer.id.0));
+        if lresp.clicked() || lresp.secondary_clicked() {
+            widgets::open_popup(ui, pop);
+        }
+        if let Some(lab) = widgets::label_popup(ui, pop, lr.left_bottom(), layer.label, |l| app.session.prefs.label_name(l), &t) {
+            actions.push(("edit.label".into(), json!({"layers": edited_layers(layer.id, selected), "label": lab.name()})));
+        }
+    }
+}
+
+fn layer_number_and_cells(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let vis = g.tl.vis;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let cy = rc.cy;
+    if vis.num {
+        lp.text(pos2(cw.num + 13.0, cy), Align2::CENTER_CENTER, format!("{}", comp.index_of(layer.id).unwrap_or(0)), Tokens::ui(11.5), t.text_dim);
+    }
+    layer_cells(app, ui, &lp, cw, &comp, rc, &mut *actions);
+}
+
+/// The row's click target, twirl, icon and guide mark; returns the row response and the name's x.
+fn layer_twirl_and_icon(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) -> (egui::Response, f32) {
+    let t = g.tl.t;
+    let vis = g.tl.vis;
+    let cw = &g.tl.cw;
+    let lp = g.lp.clone();
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    // Row click → select; double-click → rename; drag → reorder. Registered before the
+    // twirl and the name field so those sit on top and get their clicks.
+    let row_x0 = if vis.num { cw.num } else { cw.name + 16.0 };
+    let row_resp =
+        ui.interact(Rect::from_min_max(pos2(row_x0, r.min.y), pos2(cw.name_end, r.max.y)), egui::Id::unique(("row", layer.id.0)), Sense::click_and_drag());
+    // Twirl + icon + name.
+    let tw = Rect::from_center_size(pos2(cw.name + 8.0, cy), vec2(14.0, 14.0));
+    let open = app.ui.timeline.open_layers.contains(&layer.id.0);
+    if widgets::twirl(ui, tw, open, egui::Id::unique(("twirl", layer.id.0)), &t).clicked() {
+        ui_actions.push(UiAct::ToggleLayer(layer.id.0, ui.input(|i| i.modifiers.alt || i.modifiers.command)));
+    }
+    app.auto.add(&format!("timeline.layer.{}.twirl", layer.id.0), tw, "twirl");
+    icons::paint(&lp, Rect::from_center_size(pos2(cw.name + 24.0, cy), vec2(13.0, 13.0)), layer_icon(layer, &app.session.project), t.text_dim);
+    // A guide layer carries a guide mark before its name (After Effects).
+    let name_x = if layer.switches.guide {
+        let mark = Rect::from_center_size(pos2(cw.name + 40.0, cy), vec2(11.0, 11.0));
+        icons::paint(&lp, mark, Icon::Grid, t.text_dim);
+        app.auto.add(&format!("timeline.layer.{}.guide", layer.id.0), mark, "Guide Layer");
+        cw.name + 50.0
+    } else {
+        cw.name + 34.0
+    };
+    (row_resp, name_x)
+}
+
+/// The layer name: the rename field or the (selected) name cell.
+fn layer_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, name_x: f32) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let is_sel = rc.is_sel;
+    let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.name_end - 4.0, r.max.y));
+    let rename_id = egui::Id::unique("tl-rename");
+    let renaming: Option<(u64, String)> = ctx.data(|d| d.get_temp(rename_id));
+    if let Some((rl, mut buf)) = renaming.filter(|(rl, _)| *rl == layer.id.0) {
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect.shrink2(vec2(0.0, 2.0))));
+        let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(name_rect.width()));
+        app.auto.add(&format!("timeline.layer.{rl}.nameEdit"), er.rect, &buf);
+        if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {
+            // Just started: focus the field with the whole name selected.
+            er.request_focus();
+            widgets::select_all(&ctx, er.id, &buf);
+        }
+        if er.lost_focus() {
+            if !ui.input(|i| i.key_pressed(egui::Key::Escape)) {
+                actions.push(("layer.rename".into(), json!({"layer": rl, "name": buf})));
+            }
+            ctx.data_mut(|d| d.remove::<(u64, String)>(rename_id));
+        } else {
+            ctx.data_mut(|d| d.insert_temp(rename_id, (rl, buf)));
+        }
+    } else {
+        // The selected layer's name sits in a light cell with dark text.
+        let name_col = if is_sel { Color32::from_gray(0x16) } else { t.text };
+        if is_sel {
+            let g = lp.layout_no_wrap(display_name(app, layer), Tokens::ui(12.0), name_col);
+            let cell = Rect::from_min_max(
+                pos2(name_rect.min.x - 3.0, r.min.y + 1.0),
+                pos2((name_rect.min.x + g.size().x + 4.0).max(cw.name_end - 4.0).min(cw.name_end - 2.0), r.max.y - 1.0),
+            );
+            lp.rect_filled(cell, 0.0, SELECTED_NAME_BG);
+        }
+        let lpn = lp.with_clip_rect(name_rect.intersect(lp.clip_rect()));
+        lpn.text(pos2(name_rect.min.x, cy), Align2::LEFT_CENTER, display_name(app, layer), Tokens::ui(12.0), name_col);
+    }
+}
+
+/// Row click, drag, double-click and context menu.
+fn layer_row_actions(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, row_resp: &egui::Response) {
+    let cid = g.tl.cid;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let rows = &g.tl.rows;
+    let actions = &mut g.tl.actions;
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let left = rc.left;
+    let is_sel = rc.is_sel;
+    // Locked layers can't be selected or moved (unlock them with the lock switch).
+    let locked = layer.switches.locked;
+    if row_resp.drag_started() && !locked {
+        // The selected layers move together; an unselected row moves alone.
+        let moving: Vec<u64> = if is_sel { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };
+        ctx.data_mut(|d| d.insert_temp(layer_drag_id(), moving));
+    }
+    if row_resp.drag_stopped() {
+        ctx.data_mut(|d| d.insert_temp(layer_drop_id(), true));
+    }
+    app.auto.add(&format!("timeline.layer.{}.row", layer.id.0), left, &layer.name);
+    if row_resp.clicked() && !locked {
+        let m = ui.input(|i| i.modifiers);
+        if let Some(layers) = m.shift.then(|| shift_range(&ctx, cid, &comp, rows, selected, layer.id)).flatten() {
+            actions.push(("layer.select".into(), json!({"layers": layers})));
+        } else {
+            actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "toggle": m.command})));
+            set_anchor(&ctx, cid, layer.id);
+        }
+    }
+    if row_resp.double_clicked() {
+        match double_click_action(layer) {
+            Some(a) => actions.push(a),
+            None => start_rename(&ctx, layer.id.0, &layer.name),
+        }
+    }
+    layer_context_menu(row_resp, &comp, layer, selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut *actions);
+}
+
+/// The eight layer switches.
+fn layer_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let vis = g.tl.vis;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let sw = &layer.switches;
+    let sws: [(Icon, bool, &str, bool); 8] = [
+        (Icon::Shy, sw.shy, "shy", switch_applies(layer, "shy", &app.session.project)),
+        (Icon::Collapse, sw.collapse, "collapse", switch_applies(layer, "collapse", &app.session.project)),
+        (Icon::Quality, sw.quality == effectcraft_engine::project::Quality::Best, "quality", switch_applies(layer, "quality", &app.session.project)),
+        (Icon::Fx, sw.effects, "fx", switch_applies(layer, "fx", &app.session.project)),
+        (
+            Icon::FrameBlend,
+            sw.frame_blend != effectcraft_engine::project::FrameBlend::Off,
+            "frameBlend",
+            switch_applies(layer, "frameBlend", &app.session.project),
+        ),
+        (Icon::MotionBlur, sw.motion_blur, "motionBlur", switch_applies(layer, "motionBlur", &app.session.project)),
+        (Icon::Adjustment, sw.adjustment, "adjustment", switch_applies(layer, "adjustment", &app.session.project)),
+        (Icon::Cube, layer.is_3d(), "threeD", switch_applies(layer, "threeD", &app.session.project)),
+    ];
+    for (i, (icon, on, name, applicable)) in sws.into_iter().enumerate() {
+        if !applicable || !vis.switches {
+            continue;
+        }
+        let br = Rect::from_center_size(pos2(cw.switches + SW * i as f32 + SW / 2.0, cy), vec2(16.0, 16.0));
+        lp.rect_filled(br.shrink(1.0), 1.0, t.switch_well);
+        layer_switch(
+            ui,
+            &t,
+            &SwitchSpec { row: r, br, icon, on, id: egui::Id::unique(("sw", layer.id.0, i)), layer: layer.id.0, name, others: false },
+            &comp,
+            &app.session.project,
+            selected,
+            &mut *actions,
+        );
+        app.auto.add(&format!("timeline.layer.{}.switch.{name}", layer.id.0), br, name);
+    }
+}
+
+/// The blend mode dropdown and Preserve Transparency.
+fn layer_mode_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let mr = Rect::from_min_size(pos2(cw.mode + 2.0, cy - 9.0), vec2(80.0, 18.0));
+    let mresp = widgets::dropdown(ui, mr, layer.blend_mode.label(), &t, egui::Id::unique(("mode", layer.id.0)));
+    app.auto.add(&format!("timeline.layer.{}.mode", layer.id.0), mr, "Mode");
+    let pop = egui::Id::unique(("mode-pop", layer.id.0));
+    if mresp.clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    let opts: Vec<String> =
+        BlendMode::ALL.iter().flat_map(|m| if m.ends_group() { vec![m.label().to_string(), "-".to_string()] } else { vec![m.label().to_string()] }).collect();
+    if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, opts.iter().position(|o| o == layer.blend_mode.label())) {
+        actions.push(("layer.setBlendMode".into(), json!({"layers": mode_targets(&comp, layer.id, selected), "mode": opts[i]})));
+    }
+    let tr = Rect::from_center_size(pos2(cw.mode + 76.0 + 6.0, cy), vec2(14.0, 14.0));
+    app.auto.add(&format!("timeline.layer.{}.preserveTransparency", layer.id.0), tr, "Preserve Transparency");
+    if widgets::checkbox(ui, tr, layer.preserve_transparency, &t, egui::Id::unique(("pt", layer.id.0))).clicked() {
+        // The click gives the selection the state the clicked row toggles to,
+        // whatever the first selected layer's value (as the switches do).
+        actions.push((
+            "layer.setSwitch".into(),
+            json!({
+                "layers": mode_targets(&comp, layer.id, selected),
+                "switch": "preserveTransparency",
+                "value": !layer.preserve_transparency
+            }),
+        ));
+    }
+}
+
+/// The track matte picker.
+fn layer_matte_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    // Track matte: layer picker + kind.
+    let mr = Rect::from_min_size(pos2(cw.trkmat + 2.0, cy - 9.0), vec2(104.0, 18.0));
+    let label = match layer.track_matte {
+        Some(m) => comp.layer(m.layer).map(|l| format!("{} {}", comp.index_of(l.id).unwrap_or(0), l.name)).unwrap_or("None".into()),
+        None => "No Track Matte".into(),
+    };
+    // The cell is too narrow for the mode as well: it is in the tooltip and ticked in the menu.
+    let tip = layer.track_matte.map(|m| format!("{label} · {}", crate::i18n::tr(m.kind.label())));
+    let tresp = widgets::dropdown_tip(ui, mr, &label, tip.as_deref(), &t, egui::Id::unique(("trkmat", layer.id.0)));
+    app.auto.add(&format!("timeline.layer.{}.trackMatte", layer.id.0), mr, "Track Matte");
+    let pop = egui::Id::unique(("trk-pop", layer.id.0));
+    if tresp.clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    // The menu lists every layer: built only while it is open (per visible row
+    // it made a big comp's timeline quadratic).
+    let mut opts = vec!["No Track Matte".to_string(), "-".to_string()];
+    let mut candidates: Vec<&Layer> = vec![];
+    if widgets::popup_is_open(ui, pop) {
+        for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id && l.source.is_av()) {
+            opts.push(format!("{}. {}", i + 1, l.name));
+            candidates.push(l);
+        }
+        opts.push("-".into());
+        for k in MatteKind::ALL {
+            opts.push(k.label().into());
+        }
+    }
+    let current = layer.track_matte.and_then(|m| opts.iter().position(|o| o == m.kind.label()));
+    if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, current) {
+        let ids: Vec<LayerId> = candidates.iter().map(|l| l.id).collect();
+        if let Some(a) = opts.get(i).and_then(|o| track_matte_pick(layer, &ids, i, o)) {
+            actions.push(a);
+        }
+    }
+    if layer.track_matte.is_some() {
+        let kr = Rect::from_center_size(pos2(mr.max.x - 26.0, cy), vec2(10.0, 10.0));
+        let _ = kr;
+    }
+}
+
+/// The parent pick whip and dropdown.
+fn layer_parent_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let comp = g.tl.comp.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let cy = rc.cy;
+    pick_whip(
+        app,
+        ui,
+        &lp,
+        Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),
+        (WHIP_PARENT, layer.id.0, 0),
+        WhipText {
+            auto: &format!("timeline.layer.{}.pickWhip", layer.id.0),
+            label: "Parent pick whip",
+            hint: crate::i18n::tr("Parent pick whip: drag onto a layer"),
+        },
+    );
+    let pr_rect = Rect::from_min_size(pos2(cw.parent + 20.0, cy - 9.0), vec2(94.0, 18.0));
+    let plabel = layer.parent.and_then(|p| comp.layer(p)).map(|l| format!("{}. {}", comp.index_of(l.id).unwrap_or(0), l.name)).unwrap_or_else(|| "None".into());
+    let presp = widgets::dropdown(ui, pr_rect, &plabel, &t, egui::Id::unique(("parent", layer.id.0)));
+    app.auto.add(&format!("timeline.layer.{}.parent", layer.id.0), pr_rect, "Parent");
+    let pop = egui::Id::unique(("par-pop", layer.id.0));
+    if presp.clicked() {
+        widgets::open_popup(ui, pop);
+    }
+    let mut cands: Vec<&Layer> = vec![];
+    let mut popts = vec!["None".to_string(), "-".to_string()];
+    if widgets::popup_is_open(ui, pop) {
+        for (i, l) in comp.layers.iter().enumerate().filter(|(_, l)| l.id != layer.id) {
+            popts.push(format!("{}. {}", i + 1, l.name));
+            cands.push(l);
+        }
+    }
+    if let Some(i) = widgets::popup_menu(ui, pop, pr_rect.left_bottom(), &popts, None) {
+        let par = if i == 0 { serde_json::Value::Null } else { json!(cands[i - 2].id.0) };
+        actions.push(("layer.setParent".into(), json!({"layers": [layer.id.0], "parent": par})));
+    }
+}
+
+/// Paints the layer bar; returns it and its label colour.
+fn layer_bar_paint(g: &Rw, rc: &RowCtx<'_>) -> (Rect, Color32) {
+    let t = g.tl.t;
+    let tm = g.tl.tm;
+    let gp = g.gp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let is_sel = rc.is_sel;
+    let x_in = tm.x(layer.in_point.seconds());
+    let x_out = tm.x(layer.out_point.seconds());
+    let bar = Rect::from_min_max(pos2(x_in, r.min.y + 1.0), pos2(x_out, r.max.y - 1.0));
+    let lc = t.label(layer.label);
+    let fill = bar_color(lc, is_sel);
+    gp.rect_filled(bar, 0.0, fill);
+    if is_sel {
+        gp.rect_stroke(bar, 0.0, Stroke::new(1.0, Color32::from_white_alpha(90)), StrokeKind::Inside);
+    }
+    (bar, lc)
+}
+
+/// Dragging the source bar outside the in/out span slips the source.
+fn slip_source_handles(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, ghost: Rect, bar: Rect) {
+    let pps = g.tl.pps;
+    let fd = g.tl.fd;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    // Dragging the source bar outside the in/out span slips the source.
+    for (side, gr) in [("l", Rect::from_min_max(ghost.min, pos2(bar.min.x, ghost.max.y))), ("r", Rect::from_min_max(pos2(bar.max.x, ghost.min.y), ghost.max))] {
+        if gr.width() < 2.0 {
+            continue;
+        }
+        let gresp =
+            ui.interact(gr, egui::Id::unique(("ghost", side, layer.id.0)), Sense::click_and_drag()).on_hover_text(crate::i18n::tr("Drag to slip the source"));
+        // Outside the bar it is empty track area: a plain click deselects.
+        if gresp.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
+            actions.push(("layer.select".into(), json!({"layers": []})));
+        }
+        app.auto.add(&format!("timeline.layer.{}.source{}", layer.id.0, side), gr, "Slip");
+        if gresp.hovered() || gresp.dragged() {
+            ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
+        }
+        let acc_id = egui::Id::unique(("slip-acc", layer.id.0));
+        if gresp.dragged() {
+            let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
+            acc += gresp.drag_delta().x;
+            let frames = ((acc as f64 / pps) / fd).trunc() as i64;
+            if frames != 0 {
+                acc -= (frames as f64 * fd * pps) as f32;
+                actions.push(("layer.slip".into(), json!({"layers": [layer.id.0], "frames": frames, "merge": format!("slip-{}", layer.id.0)})));
+            }
+            ctx.data_mut(|d| d.insert_temp(acc_id, acc));
+        }
+        if gresp.drag_stopped() {
+            ctx.data_mut(|d| d.remove::<f32>(acc_id));
+            ui_actions.push(UiAct::EndMerge);
+        }
+    }
+}
+
+/// The source extent behind the bar (striped past its ends).
+fn layer_source_extent(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, bar: Rect, lc: Color32) {
+    let tm = g.tl.tm;
+    let gp = g.gp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    if let LayerSource::Footage { .. } | LayerSource::Comp { .. } = layer.source
+        && let Some(d) = layer.source.item().and_then(|i| app.session.project.item(i)).and_then(|i| i.duration())
+    {
+        let xs = tm.x(layer.start_time.seconds());
+        let xe = tm.x(layer.comp_time(d).seconds());
+        let ghost = Rect::from_min_max(pos2(xs.min(xe), r.min.y + 9.0), pos2(xs.max(xe), r.max.y - 9.0));
+        gp.rect_filled(ghost, 1.0, lc.gamma_multiply(0.18));
+        // The bar past the source's end (its last frame held) or before its start
+        // is striped, so the source's own span shows (#290). Time remapping
+        // decides what shows there itself.
+        if layer.props.get("timeRemap").is_none() {
+            for (side, part) in [
+                ("beforeSource", Rect::from_min_max(bar.min, pos2(ghost.min.x, bar.max.y))),
+                ("afterSource", Rect::from_min_max(pos2(ghost.max.x, bar.min.y), bar.max)),
+            ] {
+                if part.width() >= 1.0 {
+                    stripes(&gp, part, lc);
+                    app.auto.add(&format!("timeline.layer.{}.bar.{side}", layer.id.0), part, "Past the source");
+                }
+            }
+        }
+        slip_source_handles(app, ui, g, rc, ghost, bar);
+    }
+}
+
+/// The bar's move body and trim edges, click selection.
+fn layer_bar_hits(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, bar: Rect) -> BarResps {
+    let cid = g.tl.cid;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let rows = &g.tl.rows;
+    let actions = &mut g.tl.actions;
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let is_sel = rc.is_sel;
+    app.auto.add(&format!("timeline.layer.{}.bar", layer.id.0), bar, &layer.name);
+    // Interactions: move body, trim edges.
+    let (body_r, in_r, out_r) = trim_zones(bar);
+    let body = ui.interact(body_r, egui::Id::unique(("bar", layer.id.0)), Sense::click_and_drag());
+    let lin = ui.interact(in_r, egui::Id::unique(("bar-in", layer.id.0)), Sense::drag());
+    let lout = ui.interact(out_r, egui::Id::unique(("bar-out", layer.id.0)), Sense::drag());
+    app.auto.add(&format!("timeline.layer.{}.bar.in", layer.id.0), in_r, "Trim In");
+    app.auto.add(&format!("timeline.layer.{}.bar.out", layer.id.0), out_r, "Trim Out");
+    if lin.hovered() || lout.hovered() || lin.dragged() || lout.dragged() {
+        trim_cursor(&ctx);
+    }
+    if body.double_clicked()
+        && let Some(a) = double_click_action(layer)
+    {
+        actions.push(a);
+    }
+    let shift = ui.input(|i| i.modifiers.shift);
+    if let Some(layers) = (body.clicked() && shift).then(|| shift_range(&ctx, cid, &comp, rows, selected, layer.id)).flatten() {
+        // Shift-click: the layers from the last one clicked to this one, as in
+        // the layer outline.
+        actions.push(("layer.select".into(), json!({"layers": layers})));
+    } else {
+        if (body.clicked() || body.drag_started()) && !is_sel {
+            actions.push(("layer.select".into(), json!({"layers": [layer.id.0], "add": shift})));
+        }
+        if (body.clicked() || body.drag_started()) && !shift {
+            set_anchor(&ctx, cid, layer.id);
+        }
+    }
+    layer_context_menu(&body, &comp, layer, selected, LayerMenuCaps::of(&app.session.project, layer), &mut app.auto, &mut *actions);
+    BarResps { body, lin, lout }
+}
+
+fn layer_quick_offset_begin(ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>, body: &egui::Response) -> bool {
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let selected = &g.selected;
+    let layer = rc.layer;
+    let is_sel = rc.is_sel;
+    let mods = ui.input(|i| i.modifiers);
+    if body.drag_started()
+        && is_sel
+        && mods.command
+        && mods.alt
+        && let Some(n) = quick_offset_layers(&comp, selected.iter().copied())
+        && let Some(p) = ctx.input(|i| i.pointer.press_origin())
+    {
+        ctx.data_mut(|d| d.insert_temp(quick_bar_id(), QuickBar { layer: layer.id, origin_x: p.x, layers: n, applied: 0 }));
+    }
+    ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())).is_some_and(|q| q.layer == layer.id)
+}
+
+/// Moving and trimming a layer bar by whole frames.
+fn layer_bar_drag(g: &mut Rw, rc: &RowCtx<'_>, bars: &BarResps, quick: bool) {
+    let BarResps { body, lin, lout } = bars;
+    let pps = g.tl.pps;
+    let fd = g.tl.fd;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let selected = &g.selected;
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let is_sel = rc.is_sel;
+    let drag_key = format!("bar-{}", layer.id.0);
+    for (resp, kind) in [(&body, "move"), (&lin, "in"), (&lout, "out")] {
+        if kind == "move" && quick {
+            continue;
+        }
+        if resp.dragged() {
+            let acc_id = egui::Id::unique(("bar-acc", layer.id.0, kind));
+            let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
+            acc += resp.drag_delta().x;
+            let frames = ((acc as f64 / pps) / fd).trunc() as i64;
+            if frames != 0 {
+                acc -= (frames as f64 * fd * pps) as f32;
+                let d = frames as f64 * fd;
+                // Moving or trimming a selected layer acts on the whole
+                // selection; each layer trims from its own in/out point.
+                let targets = if is_sel { json!(selected.iter().map(|l| l.0).collect::<Vec<_>>()) } else { json!([layer.id.0]) };
+                let params = match kind {
+                    "move" => json!({"layers": targets, "delta": d, "merge": drag_key}),
+                    "in" => json!({"layers": targets, "inDelta": d, "merge": drag_key}),
+                    _ => json!({"layers": targets, "outDelta": d, "merge": drag_key}),
+                };
+                actions.push(("layer.timing".into(), params));
+            }
+            ctx.data_mut(|d| d.insert_temp(acc_id, acc));
+        }
+        if resp.drag_stopped() {
+            ctx.data_mut(|d| d.remove::<f32>(egui::Id::unique(("bar-acc", layer.id.0, kind))));
+            ui_actions.push(UiAct::EndMerge);
+        }
+    }
+}
+
+fn layer_bar_markers(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>) {
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let comp = g.tl.comp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let gclip = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));
+    super::markers_ui::layer_markers(app, ui, gclip, &comp, layer, tm, r);
+}
+
+/// The group row's background and effect label bar; returns the name to draw.
+fn group_background(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>) -> String {
+    let t = g.tl.t;
+    let graph_x0 = g.tl.graph_x0;
+    let lp = g.lp.clone();
+    let gp = g.gp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let left = rc.left;
+    let ri = rc.ri;
+    let RowKind::Group { uid, name, .. } = &rc.row.kind else { return String::new() };
+    let group = layer.props.find_group(*uid);
+    let shown = match group.and_then(|g| match &g.kind {
+        GroupKind::Effect { effect } => Some(effect.as_str()),
+        _ => None,
+    }) {
+        Some(effect) => crate::i18n::effects::group(effect, name),
+        None => name.clone(),
+    };
+    // Selected groups (an effect, a mask, a shape group…) highlight like selected
+    // property rows.
+    let sel_group = app.session.state.selected_props.contains(&(layer.id, *uid));
+    lp.rect_filled(
+        left,
+        0.0,
+        if sel_group {
+            t.row_selected
+        } else if ri.is_multiple_of(2) {
+            t.row
+        } else {
+            t.row_alt
+        },
+    );
+    gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);
+    // An effect's colour label (26.5): the same bar the Effect Controls header wears,
+    // on the row's left edge.
+    if let Some(lab) =
+        group.filter(|g| matches!(g.kind, GroupKind::Effect { .. })).and_then(|g| g.label).filter(|l| *l != effectcraft_engine::color::Label::None)
+    {
+        let [lr, lg, lb] = app.session.prefs.label_rgb(lab);
+        let bar = Rect::from_min_size(left.min, vec2(4.0, left.height()));
+        lp.rect_filled(bar, 0.0, Color32::from_rgb(lr, lg, lb));
+        app.auto.add(&format!("timeline.group.{uid}.label"), bar, &app.session.prefs.label_name(lab));
+    }
+    shown
+}
+
+/// The group's twirl, effect switch and style eye.
+fn group_switches(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let indent = rc.indent;
+    let RowKind::Group { uid, name, open, has_children, fx, eye, .. } = &rc.row.kind else { return };
+    if *has_children {
+        let tw = Rect::from_center_size(pos2(indent, cy), vec2(13.0, 13.0));
+        if widgets::twirl(ui, tw, *open, egui::Id::unique(("gtw", uid)), &t).clicked() {
+            // Alt/Cmd-click twirls the whole tree under the group (as on a layer).
+            ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, ui.input(|i| i.modifiers.alt || i.modifiers.command)));
+        }
+        app.auto.add(&format!("timeline.group.{uid}.twirl"), tw, name);
+    }
+    if let Some(en) = fx {
+        let fr_ = Rect::from_center_size(pos2(cw.switches + SW * 3.0 + SW / 2.0, cy), vec2(16.0, 16.0));
+        if widgets::icon_toggle(ui, fr_, Icon::Fx, *en, &t, egui::Id::unique(("gfx", uid)), Sense::click()).clicked() {
+            actions.push(("effect.toggle".into(), json!({"layer": layer.id.0, "effect": uid})));
+        }
+        app.auto.add(&format!("timeline.group.{uid}.fx"), fr_, name);
+    }
+    if let Some(en) = eye {
+        // Layer style eye switch in the A/V column, like AE.
+        let er = Rect::from_center_size(pos2(cw.av + 10.0, cy), vec2(15.0, 15.0));
+        lp.rect_stroke(er.shrink(1.5), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);
+        if widgets::icon_toggle(ui, er, Icon::Eye, *en, &t, egui::Id::unique(("geye", uid)), Sense::click()).clicked() {
+            actions.push(("layer.style.toggle".into(), json!({"layer": layer.id.0, "style": uid})));
+        }
+        app.auto.add(&format!("timeline.group.{uid}.eye"), er, name);
+    }
+}
+
+/// The group name, or its rename field.
+fn group_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, shown: &str) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let indent = rc.indent;
+    let RowKind::Group { uid, name, .. } = &rc.row.kind else { return };
+    let group_edit: Option<(u64, u64, String)> = ctx.data(|d| d.get_temp(group_rename_id()));
+    if let Some((_, _, mut buf)) = group_edit.filter(|(rl, ru, _)| *rl == layer.id.0 && ru == uid) {
+        let field = Rect::from_min_max(pos2(indent + 8.0, r.min.y + 2.0), pos2((cw.switches - 4.0).max(indent + 60.0), r.max.y - 2.0));
+        let mut child = ui.new_child(egui::UiBuilder::new().max_rect(field));
+        let er = child.add(egui::TextEdit::singleline(&mut buf).font(Tokens::ui(12.0)).desired_width(field.width()));
+        app.auto.add(&format!("timeline.group.{uid}.nameEdit"), er.rect, &buf);
+        if ctx.data_mut(|d| d.remove_temp::<bool>(rename_focus_id())).unwrap_or(false) {
+            er.request_focus();
+            widgets::select_all(&ctx, er.id, &buf);
+        }
+        if er.lost_focus() {
+            if !ui.input(|i| i.key_pressed(egui::Key::Escape)) && !buf.trim().is_empty() && buf != *name {
+                actions.push(("prop.renameGroup".into(), json!({"layer": layer.id.0, "prop": uid, "name": buf})));
+            }
+            ctx.data_mut(|d| d.remove::<(u64, u64, String)>(group_rename_id()));
+        } else {
+            ctx.data_mut(|d| d.insert_temp(group_rename_id(), (layer.id.0, *uid, buf)));
+        }
+    } else {
+        lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, shown, Tokens::ui(12.0), t.text);
+    }
+}
+
+/// Add / animate popups, Change Renderer and dash buttons.
+fn group_popups(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let RowKind::Group { uid, .. } = &rc.row.kind else { return };
+    text_anim_popups(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);
+    shape_add_popup(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);
+    if *uid == GEOM_BIT | layer.id.0 {
+        let lr = lp.text(pos2(cw.switches + 6.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Change Renderer…"), Tokens::ui(11.5), t.accent);
+        let resp = ui
+            .interact(lr, egui::Id::unique(("tl-change-renderer", layer.id.0)), Sense::click())
+            .on_hover_text(crate::i18n::tr("Composition Settings ▸ 3D Renderer"));
+        if resp.hovered() {
+            ctx.set_cursor_icon(egui::CursorIcon::PointingHand);
+        }
+        app.auto.add(&format!("timeline.layer.{}.changeRenderer", layer.id.0), lr, "Change Renderer…");
+        if resp.clicked() {
+            ui_actions.push(UiAct::ChangeRenderer);
+        }
+    }
+    dash_buttons(app, ui, &lp, layer, *uid, pos2(cw.switches, cy), &mut *actions);
+}
+
+/// Mask mode and inverted, inline.
+fn group_mask_mode(ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let RowKind::Group { uid, .. } = &rc.row.kind else { return };
+    // Mask mode + inverted inline.
+    if let Some(g) = layer.props.find_group(*uid)
+        && let GroupKind::Mask { mode, inverted, .. } = g.kind
+    {
+        let mr = Rect::from_min_size(pos2(cw.switches + 4.0, cy - 9.0), vec2(80.0, 18.0));
+        let pop = egui::Id::unique(("maskmode", uid));
+        if widgets::dropdown(ui, mr, mode.label(), &t, egui::Id::unique(("mm", uid))).clicked() {
+            widgets::open_popup(ui, pop);
+        }
+        let opts: Vec<String> = effectcraft_engine::project::MaskMode::ALL.iter().map(|m| m.label().to_string()).collect();
+        if let Some(i) = widgets::popup_menu(ui, pop, mr.left_bottom(), &opts, None) {
+            actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "mode": opts[i]})));
+        }
+        let ir = Rect::from_min_size(pos2(mr.max.x + 8.0, cy - 8.0), vec2(16.0, 16.0));
+        if widgets::checkbox(ui, ir, inverted, &t, egui::Id::unique(("minv", uid))).clicked() {
+            actions.push(("layer.setMask".into(), json!({"layer": layer.id.0, "mask": uid, "inverted": !inverted})));
+        }
+        lp.text(pos2(ir.max.x + 4.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Inverted"), Tokens::ui(11.0), t.text_dim);
+    }
+}
+
+/// Group row click and double-click.
+fn group_row_click(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>) {
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let r = rc.r;
+    let indent = rc.indent;
+    let RowKind::Group { uid, name, fx, .. } = &rc.row.kind else { return };
+    let gr_rect = Rect::from_min_max(pos2(indent + 8.0, r.min.y), pos2(cw.switches, r.max.y));
+    let gr = ui.interact(gr_rect, egui::Id::unique(("grow", uid)), Sense::click());
+    app.auto.add(&format!("timeline.group.{uid}.name"), gr_rect, name);
+    if gr.clicked() && uid & (WAVE_BIT | GEOM_BIT) == 0 {
+        actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));
+    }
+    if gr.double_clicked() {
+        if fx.is_some() {
+            // An effect's name: open it in Effect Controls (as in After Effects).
+            actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));
+            actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "selectKeys": false})));
+            actions.push(("window.panel".into(), json!({"panel": "EffectControls"})));
+        } else {
+            ui_actions.push(UiAct::ToggleGroup(layer.id.0, *uid, false));
+        }
+    }
+}
+
+fn waveform_row(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>) {
+    let t = g.tl.t;
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let lp = g.lp.clone();
+    let gp = g.gp.clone();
+    let row = rc.row;
+    let layer = rc.layer;
+    let r = rc.r;
+    let left = rc.left;
+    let cy = rc.cy;
+    let ri = rc.ri;
+    let RowKind::Waveform { item, .. } = &rc.row.kind else { return };
+    lp.rect_filled(left, 0.0, if ri.is_multiple_of(2) { t.row } else { t.row_alt });
+    let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
+    lp.text(pos2(indent + 10.0, cy), Align2::LEFT_CENTER, "Waveform", Tokens::ui(12.0), t.text);
+    let wr = Rect::from_min_max(pos2(graph_x0, r.min.y), r.max);
+    gp.rect_filled(wr, 0.0, t.tl_bg);
+    app.auto.add(&format!("timeline.layer.{}.waveform", layer.id.0), wr, "Waveform");
+    match super::waveform::summary(app, &ctx, ItemId(*item)) {
+        Some(s) => super::waveform::draw(&gp, wr.shrink2(vec2(0.0, 2.0)), &tm, layer, &s, Color32::from_rgb(0x5f, 0xc8, 0x8a)),
+        None => {
+            gp.text(
+                pos2(tm.x(layer.in_point.seconds()).max(wr.min.x) + 6.0, wr.center().y),
+                Align2::LEFT_CENTER,
+                "Building waveform…",
+                Tokens::ui(11.0),
+                t.text_faint,
+            );
+        }
+    }
+}
+
+/// The expression row's outline side: enable, pick whip and syntax warning.
+fn expr_controls(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {
+    let ExprRow { prop, ex, buf_id, edit_id, .. } = *st;
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let row = rc.row;
+    let layer = rc.layer;
+    let left = rc.left;
+    let cy = rc.cy;
+    let ri = rc.ri;
+    let RowKind::Expr { uid, .. } = &rc.row.kind else { return };
+    let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));
+    lp.rect_filled(
+        left,
+        0.0,
+        if sel_prop {
+            t.row_selected
+        } else if ri.is_multiple_of(2) {
+            t.row
+        } else {
+            t.row_alt
+        },
+    );
+    let indent = cw.name + 6.0 + 14.0 * row.depth as f32;
+    lp.text(pos2(indent + 12.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Expression:"), Tokens::ui(11.5), t.text_dim);
+    lp.text(pos2(indent + 82.0, cy), Align2::LEFT_CENTER, &prop.name, Tokens::ui(11.5), t.text);
+    // "=" enable switch and the property pick whip (AE's expression controls).
+    let en_r = Rect::from_center_size(pos2(cw.switches + 10.0, cy), vec2(16.0, 16.0));
+    let en = ui.interact(en_r, egui::Id::unique(("expr-en", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Enable Expression"));
+    lp.rect_stroke(en_r.shrink(1.0), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);
+    let expr_col = t.expr_text;
+    lp.text(en_r.center(), Align2::CENTER_CENTER, if ex.enabled { "=" } else { "≠" }, Tokens::semibold(13.0), if ex.enabled { expr_col } else { t.text_dim });
+    app.auto.add(&format!("timeline.prop.{uid}.exprEnable"), en_r, "Enable Expression");
+    if en.clicked() {
+        actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "enabled": !ex.enabled})));
+    }
+    let pw = pick_whip(
+        app,
+        ui,
+        &lp,
+        Rect::from_center_size(pos2(cw.switches + 30.0, cy), vec2(15.0, 15.0)),
+        (WHIP_EXPR, layer.id.0, *uid),
+        WhipText {
+            auto: &format!("timeline.prop.{uid}.pickWhip"),
+            label: "Expression pick whip",
+            hint: crate::i18n::tr("Expression pick whip: drag onto a property"),
+        },
+    );
+    if pw.is_pointer_button_down_on() && ui.input(|i| i.pointer.primary_pressed()) {
+        // Pressed while the expression is being edited (its text is buffered while
+        // the editor has the focus): the reference will go in at the cursor,
+        // replacing the selection (#284).
+        let into = ctx.data(|d| d.get_temp::<String>(buf_id)).map(|buf| {
+            let n = buf.chars().count();
+            let sel = egui::text_edit::TextEditState::load(&ctx, edit_id)
+                .and_then(|st| st.cursor.char_range())
+                .map_or([n, n], |r| [r.primary.index.0.min(r.secondary.index.0).min(n), r.primary.index.0.max(r.secondary.index.0).min(n)]);
+            (buf, sel)
+        });
+        ctx.data_mut(|d| {
+            if let Some(into) = into {
+                d.insert_temp(whip_into_id(*uid), into);
+            } else {
+                d.remove::<WhipInto>(whip_into_id(*uid));
+            }
+        });
+    }
+    // Syntax errors: warning in the outline (the expression is disabled).
+    if let Some(check) = app.session.expr_check
+        && let Err(e) = check(&ex.text)
+    {
+        let wr = Rect::from_center_size(pos2(cw.switches + 50.0, cy), vec2(14.0, 14.0));
+        lp.text(wr.center(), Align2::CENTER_CENTER, "⚠", Tokens::ui(12.0), Color32::from_rgb(0xf0, 0xa0, 0x30));
+        let _ = ui.interact(wr, egui::Id::unique(("expr-err", uid)), Sense::hover()).on_hover_text(e);
+    }
+}
+
+/// The Expression Language menu inserts at the cursor.
+fn expr_language_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {
+    let ExprRow { ex, buf_id, edit_id, .. } = *st;
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let RowKind::Expr { uid, .. } = &rc.row.kind else { return };
+    // ⓕ: the Expression Language menu inserts at the cursor.
+    let lang_r = Rect::from_center_size(pos2(cw.switches + 70.0, cy), vec2(16.0, 16.0));
+    let lang = ui.interact(lang_r, egui::Id::unique(("expr-lang", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Expression Language Menu"));
+    lp.circle_stroke(lang_r.center(), 6.5, Stroke::new(1.0, if lang.hovered() { t.text } else { t.text_dim }));
+    lp.text(lang_r.center(), Align2::CENTER_CENTER, "f", Tokens::semibold(10.0), if lang.hovered() { t.text } else { t.text_dim });
+    app.auto.add(&format!("timeline.prop.{uid}.exprLanguage"), lang_r, "Expression Language Menu");
+    let mut picked: Option<&'static str> = None;
+    egui::Popup::menu(&lang).style(crate::widgets::menu_style).show(|ui| {
+        for (cat, items) in effectcraft_engine::commands::expr_tools::language_menu() {
+            ui.menu_button(cat, |ui| {
+                widgets::menu_scroll(ui, false, |ui| {
+                    for (label, text) in items {
+                        if ui.button(label).clicked() {
+                            picked = Some(text);
+                            ui.close();
+                        }
+                    }
+                })
+            });
+        }
+    });
+    if let Some(text) = picked {
+        let cur: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());
+        let at = egui::text_edit::TextEditState::load(&ctx, edit_id)
+            .and_then(|st| st.cursor.char_range())
+            .map(|r| r.primary.index.0)
+            .unwrap_or(cur.chars().count())
+            .min(cur.chars().count());
+        let byte = cur.char_indices().nth(at).map(|(b, _)| b).unwrap_or(cur.len());
+        let mut next = cur.clone();
+        next.insert_str(byte, text);
+        actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": next})));
+        ctx.data_mut(|d| d.remove::<String>(buf_id));
+    }
+}
+
+/// The expression editor in the time-graph area.
+fn expr_editor_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, st: &ExprRow<'_>) {
+    let ExprRow { prop, ex, buf_id, edit_id, .. } = *st;
+    let t = g.tl.t;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let rh = g.tl.rh;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let right_clip = g.right_clip;
+    let gp = g.gp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let RowKind::Expr { uid, lines, .. } = &rc.row.kind else { return };
+    let expr_col = t.expr_text;
+    // The editor in the time-graph area.
+    ui.set_clip_rect(right_clip);
+    gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.expr_bg);
+    let er = Rect::from_min_max(pos2(graph_x0 + 8.0, r.min.y + 3.0), pos2(rect.max.x - 14.0, r.max.y - 3.0));
+    let mut buf: String = ctx.data(|d| d.get_temp(buf_id)).unwrap_or_else(|| ex.text.clone());
+    if let Some(f) = ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).filter(|f| f.prop == *uid) {
+        // Asked for once (a pick whip put a reference in, or an Alt-click added the
+        // expression): editing starts in the expression as it is now.
+        ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id()));
+        buf = ex.text.clone();
+        let n = buf.chars().count();
+        let [a, b] = f.select.map(|before_end| egui::text::CCursor::new(n.saturating_sub(before_end)));
+        let mut st = egui::text_edit::TextEditState::load(&ctx, edit_id).unwrap_or_default();
+        st.cursor.set_char_range(Some(egui::text::CCursorRange::two(a, b)));
+        st.store(&ctx, edit_id);
+        ctx.memory_mut(|m| m.request_focus(edit_id));
+    }
+    // Settings ▸ Scripting & Expressions ▸ Expressions Editor.
+    let sp = app.session.prefs.scripting.clone();
+    let resp = super::expr_editor::editor(
+        ui,
+        edit_id,
+        &mut buf,
+        er,
+        super::expr_editor::EditorOpts { prefs: &sp, color: if ex.enabled { expr_col } else { t.text_dim }, rows: *lines },
+        &t,
+    );
+    app.auto.add(&format!("timeline.prop.{uid}.expression"), er, &prop.name);
+    // Its bottom edge drags to set its height in whole lines, as in After Effects.
+    let edge = Rect::from_min_max(pos2(er.min.x, r.max.y - 4.0), pos2(er.max.x, r.max.y));
+    let eresp = ui.interact(edge, egui::Id::unique(("expr-edge", uid)), Sense::drag());
+    app.auto.add(&format!("timeline.prop.{uid}.expressionHeight"), edge, "Expression field height");
+    if eresp.hovered() || eresp.dragged() {
+        ctx.set_cursor_icon(egui::CursorIcon::ResizeVertical);
+    }
+    if let Some(py) = eresp.interact_pointer_pos().filter(|_| eresp.dragged()).map(|p| p.y) {
+        let n = ((py - r.min.y) / rh).round().clamp(1.0, EXPR_MAX_LINES as f32);
+        app.ui.timeline.expr_lines.insert(*uid, n as usize);
+    }
+    let commit = resp.has_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter) && (i.modifiers.command || i.modifiers.ctrl));
+    if commit {
+        resp.surrender_focus();
+    }
+    if resp.has_focus() && !commit {
+        ctx.data_mut(|d| d.insert_temp(buf_id, buf));
+    } else {
+        if (resp.lost_focus() || commit) && buf.trim_end() != ex.text {
+            actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid, "expression": buf.trim_end()})));
+        }
+        ctx.data_mut(|d| d.remove::<String>(buf_id));
+    }
+}
+
+fn prop_background(app: &mut EffectcraftApp, g: &Rw, rc: &RowCtx<'_>, prop: &Property) {
+    let t = g.tl.t;
+    let graph_x0 = g.tl.graph_x0;
+    let lp = g.lp.clone();
+    let gp = g.gp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let left = rc.left;
+    let ri = rc.ri;
+    let uid = &prop.uid;
+
+    app.auto.add(&format!("timeline.prop.{uid}.row"), r, &prop.name);
+    let sel_prop = app.session.state.selected_props.contains(&(layer.id, *uid));
+    lp.rect_filled(
+        left,
+        0.0,
+        if sel_prop {
+            t.row_selected
+        } else if ri.is_multiple_of(2) {
+            t.row
+        } else {
+            t.row_alt
+        },
+    );
+    gp.rect_filled(Rect::from_min_max(pos2(graph_x0, r.min.y), r.max), 0.0, t.tl_bg);
+}
+
+/// The keyframe navigator (previous, toggle, next).
+fn prop_key_navigator(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) {
+    let t = g.tl.t;
+    let time = g.tl.time;
+    let fr = g.tl.fr;
+    let vis = g.tl.vis;
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let uid = &prop.uid;
+
+    // Keyframe navigator (in the A/V column, like AE).
+    // (in the Keys column when it is shown).
+    if prop.is_animated() && (vis.keys || vis.av) {
+        let lt = layer.layer_time(time);
+        let at_key = effectcraft_engine::keyframe::key_at(&prop.keys, lt).is_some();
+        let nav_x = if vis.keys { cw.keys + 12.0 } else { cw.av + 18.0 };
+        let prev = Rect::from_center_size(pos2(nav_x, cy), vec2(12.0, 14.0));
+        let mid = Rect::from_center_size(pos2(nav_x + 16.0, cy), vec2(14.0, 14.0));
+        let next = Rect::from_center_size(pos2(nav_x + 32.0, cy), vec2(12.0, 14.0));
+        icons::paint(&lp, prev.shrink(2.0), Icon::ChevronLeft, t.text_dim);
+        icons::paint(&lp, next.shrink(2.0), Icon::ChevronRight, t.text_dim);
+        let kc = if at_key { t.keyframe_selected } else { Color32::TRANSPARENT };
+        lp.add(egui::Shape::convex_polygon(
+            vec![mid.center() + vec2(0.0, -5.0), mid.center() + vec2(5.0, 0.0), mid.center() + vec2(0.0, 5.0), mid.center() + vec2(-5.0, 0.0)],
+            kc,
+            Stroke::new(1.0, t.text_dim),
+        ));
+        if ui.interact(prev, egui::Id::unique(("kprev", uid)), Sense::click()).clicked()
+            && let Some(k) = prop.keys.iter().rev().find(|k| layer.comp_time(k.time).0 < time.0 - fr.frame_duration().0 / 2)
+        {
+            ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));
+        }
+        if ui.interact(next, egui::Id::unique(("knext", uid)), Sense::click()).clicked()
+            && let Some(k) = prop.keys.iter().find(|k| layer.comp_time(k.time).0 > time.0 + fr.frame_duration().0 / 2)
+        {
+            ui_actions.push(UiAct::SetTime(layer.comp_time(k.time)));
+        }
+        if ui.interact(mid, egui::Id::unique(("kmid", uid)), Sense::click()).clicked() {
+            actions.push(("prop.toggleKey".into(), json!({"layer": layer.id.0, "prop": uid})));
+        }
+        app.auto.add(&format!("timeline.prop.{uid}.addKey"), mid, "Add or remove keyframe");
+    }
+}
+
+/// The stopwatch.
+fn prop_stopwatch(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let indent = rc.indent;
+    let uid = &prop.uid;
+
+    // Stopwatch: Alt+click adds an expression; a press toggles the animation, and
+    // dragging on over other stopwatches gives them the same state (#284).
+    if !prop.static_only {
+        let swr = Rect::from_center_size(pos2(indent, cy), vec2(15.0, 15.0));
+        let resp = ui.interact(swr, egui::Id::unique(("stopwatch", uid)), Sense::click_and_drag());
+        let col = if prop.is_animated() {
+            t.hot_text
+        } else if resp.hovered() {
+            t.text
+        } else {
+            t.text_dim
+        };
+        icons::paint(&lp, swr, Icon::Stopwatch, col);
+        app.auto.add(&format!("timeline.prop.{uid}.stopwatch"), swr, &prop.name);
+        if ui.input(|i| i.modifiers.alt) {
+            if resp.clicked() {
+                actions.push(("prop.setExpression".into(), json!({"layer": layer.id.0, "prop": uid})));
+                if prop.expr.is_none() {
+                    // Adding one: its editor opens, comes into view and takes the
+                    // keyboard with the new expression selected (#1072).
+                    app.ui.timeline.expr_closed.remove(uid);
+                    focus_expression(&ctx, *uid, [usize::MAX, 0]);
+                } else if ctx.data(|d| d.get_temp::<ExprFocus>(expr_focus_id())).is_some_and(|f| f.prop == *uid) {
+                    // Removing it: nothing is left to take the keyboard.
+                    ctx.data_mut(|d| d.remove::<ExprFocus>(expr_focus_id()));
+                }
+            }
+        } else if let Some((value, merge)) = switch_gesture(ui, &resp, r, "stopwatch", prop.is_animated()) {
+            actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid, "value": value, "merge": merge})));
+        } else if resp.clicked() && !resp.clicked_by(egui::PointerButton::Primary) {
+            // Keyboard or accessibility activation.
+            actions.push(("prop.toggleAnimation".into(), json!({"layer": layer.id.0, "prop": uid})));
+        }
+    }
+}
+
+/// The property name; returns its x.
+fn prop_name(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property) -> f32 {
+    let t = g.tl.t;
+    let cid = g.tl.cid;
+    let ctx = g.tl.ctx.clone();
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let layer = rc.layer;
+    let r = rc.r;
+    let cy = rc.cy;
+    let indent = rc.indent;
+    let uid = &prop.uid;
+
+    let name_x = indent + 12.0;
+    // 3D layers show Rotation as "Z Rotation" next to X/Y Rotation.
+    let is_tr_rot = layer.transform().and_then(|t| t.get("rotation")).is_some_and(|r| r.uid == prop.uid);
+    let base = if is_tr_rot && prop.name == "Rotation" && layer.is_3d() { "Z Rotation".to_string() } else { prop.name.clone() };
+    let pname = if prop.has_expression() { format!("{base}  =") } else { base };
+    lp.text(pos2(name_x, cy), Align2::LEFT_CENTER, &pname, Tokens::ui(12.0), if prop.has_expression() { t.expr_text } else { t.text });
+    let name_rect = Rect::from_min_max(pos2(name_x, r.min.y), pos2(cw.switches - 2.0, r.max.y));
+    let name_resp = ui.interact(name_rect, egui::Id::unique(("pname", uid)), Sense::click_and_drag());
+    app.auto.add(&format!("timeline.prop.{uid}.name"), name_rect, &prop.name);
+    if name_resp.drag_started() {
+        // Drop on the Essential Graphics panel to expose the property.
+        egui::DragAndDrop::set_payload(&ctx, crate::panels::DragPayload::Property { layer: layer.id.0, prop: *uid });
+    }
+    if name_resp.dragged() {
+        egui::Tooltip::always_open(ctx.clone(), ui.layer_id(), egui::Id::unique("prop-drag-tip"), egui::PopupAnchor::Pointer).show(|ui| ui.label(&prop.name));
+    }
+    if name_resp.clicked() {
+        actions.push(("prop.select".into(), json!({"layer": layer.id.0, "prop": uid, "add": ui.input(|i| i.modifiers.shift)})));
+    }
+    crate::widgets::context_menu(&name_resp, |ui| prop_menu(ui, &mut app.auto, cid, layer, prop, &mut *actions));
+    name_x
+}
+
+/// The value editors and the property pick whip.
+fn prop_value_cell(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, rc: &RowCtx<'_>, ectx: &EvalCtx<'_>, prop: &Property, name_x: f32) {
+    let vis = g.tl.vis;
+    let cw = &g.tl.cw;
+    let actions = &mut g.tl.actions;
+    let lp = g.lp.clone();
+    let dim_hits = &mut g.dim_hits;
+    let layer = rc.layer;
+    let cy = rc.cy;
+    let uid = &prop.uid;
+
+    let value = ectx.value(layer, prop);
+    let vx = (cw.switches + 4.0).max(name_x + 120.0);
+    let ve = ValueEdit::new(ui, &lp, layer, prop, pos2(vx, cy));
+    let dims = value_editor(app, ui, &ve, &value, &mut *actions);
+    if !dims.is_empty() {
+        dim_hits.push((*uid, dims));
+    }
+    // The property pick whip (Parent & Link column, AE CC 2018 and later): dropped on
+    // a property it links this one to it, adding the expression if there is none.
+    if vis.parent && !prop.static_only {
+        pick_whip(
+            app,
+            ui,
+            &lp,
+            Rect::from_center_size(pos2(cw.parent + 9.0, cy), vec2(15.0, 15.0)),
+            (WHIP_PROP, layer.id.0, *uid),
+            WhipText {
+                auto: &format!("timeline.prop.{uid}.propertyPickWhip"),
+                label: "Property pick whip",
+                hint: crate::i18n::tr("Property pick whip: drag onto a property"),
+            },
+        );
+    }
+}
+
+/// The one-line expression hint when its editor is closed.
+fn prop_expression_hint(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw, rc: &RowCtx<'_>, prop: &Property) {
+    let t = g.tl.t;
+    let graph_x0 = g.tl.graph_x0;
+    let right_clip = g.right_clip;
+    let gp = g.gp.clone();
+    let cy = rc.cy;
+    let uid = &prop.uid;
+
+    ui.set_clip_rect(right_clip);
+    // Expression text row hint.
+    if let Some(e) = prop.expr.as_ref().filter(|e| e.enabled && app.ui.timeline.expr_closed.contains(uid)) {
+        gp.text(pos2(graph_x0 + 8.0, cy), Align2::LEFT_CENTER, format!("= {}", e.text.lines().next().unwrap_or("")), Tokens::mono(11.0), t.expr_text);
+    }
+}
+
+/// Key click selection and interpolation shortcuts.
+fn key_select(g: &mut Rw, kh: &KeyHit<'_>) {
+    let KeyHit { k, ks, mods, ref kresp, ref this_key, .. } = *kh;
+    let actions = &mut g.tl.actions;
+    if kresp.clicked() && mods.command {
+        // Ctrl+click: Linear ↔ Auto Bezier; Ctrl+Alt+click: Hold on / off.
+        actions.push(("keys.select".into(), this_key.clone()));
+        if mods.alt {
+            actions.push(("keys.toggleHold".into(), json!({})));
+        } else {
+            let linear = k.in_interp == Interp::Linear && k.out_interp == Interp::Linear;
+            actions.push(("keys.interpolation".into(), json!({"interpolation": if linear { "autoBezier" } else { "linear" }})));
+        }
+    } else if kresp.clicked() && mods.shift {
+        // Shift+click: in or out of the selection.
+        let mut p = this_key.clone();
+        p["toggle"] = json!(true);
+        actions.push(("keys.select".into(), p));
+    } else if (kresp.clicked() || kresp.drag_started()) && !ks {
+        let mut p = this_key.clone();
+        p["add"] = json!(mods.shift);
+        actions.push(("keys.select".into(), p));
+    }
+}
+
+fn key_double_click(g: &mut Rw, rc: &RowCtx<'_>, prop: &Property, kh: &KeyHit<'_>) {
+    let KeyHit { k, ct, ref kresp, .. } = *kh;
+    let actions = &mut g.tl.actions;
+    let ui_actions = &mut g.ui_actions;
+    let layer = rc.layer;
+    let uid = &prop.uid;
+
+    if kresp.double_clicked() {
+        // Edit the key's value (numeric properties), as After Effects does.
+        if matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {
+            actions.push(("keys.set".into(), json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})));
+        } else {
+            ui_actions.push(UiAct::SetTime(ct));
+        }
+    }
+}
+
+/// The keyframe right-click menu.
+fn key_context_menu(app: &mut EffectcraftApp, g: &mut Rw, rc: &RowCtx<'_>, prop: &Property, kh: &KeyHit<'_>) {
+    let KeyHit { k, ks, ref kresp, .. } = *kh;
+    let t = g.tl.t;
+    let actions = &mut g.tl.actions;
+    let layer = rc.layer;
+    let uid = &prop.uid;
+
+    crate::widgets::context_menu(kresp, |ui| {
+        for (lbl, cmd, params) in [
+            ("Edit Value…", "keys.set", json!({"layer": layer.id.0, "prop": uid, "time": k.time.seconds()})),
+            ("-", "", json!({})),
+            ("Copy", "keys.copy", json!({})),
+            ("Paste", "keys.paste", json!({})),
+            ("-", "", json!({})),
+            ("Select Equal Keyframes", "keys.selectEqual", json!({})),
+            ("Select Previous Keyframes", "keys.selectPrevious", json!({})),
+            ("Select Following Keyframes", "keys.selectFollowing", json!({})),
+            ("-", "", json!({})),
+            ("Keyframe Interpolation…", "keys.interpolation", json!({})),
+            ("Keyframe Velocity…", "keys.velocity", json!({})),
+            ("Toggle Hold Keyframe", "keys.toggleHold", json!({})),
+            ("Rove Across Time", "keys.interpolation", json!({"roving": !k.roving})),
+            ("-", "", json!({})),
+            ("Easy Ease", "keys.easyEase", json!({})),
+            ("Easy Ease In", "keys.easyEaseIn", json!({})),
+            ("Easy Ease Out", "keys.easyEaseOut", json!({})),
+            ("Time-Reverse Keyframes", "keys.timeReverse", json!({})),
+            ("-", "", json!({})),
+            ("Linear", "keys.interpolation", json!({"interpolation": "linear"})),
+            ("Bezier", "keys.interpolation", json!({"interpolation": "bezier"})),
+            ("Auto Bezier", "keys.interpolation", json!({"interpolation": "autoBezier"})),
+            ("Select All Keyframes", "keys.selectAll", json!({})),
+            ("Delete", "keys.delete", json!({})),
+        ] {
+            if lbl == "Select All Keyframes" {
+                // Keyframe colour labels.
+                ui.menu_button(crate::i18n::tr("Label"), |ui| {
+                    for (i, l) in effectcraft_engine::color::Label::ALL.into_iter().enumerate() {
+                        if widgets::label_entry(ui, l, &app.session.prefs.label_name(l), k.label as usize == i, &t).clicked() {
+                            if !ks {
+                                actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));
+                            }
+                            actions.push(("keys.setLabel".into(), json!({"label": i})));
+                            ui.close();
+                        }
+                    }
+                });
+            }
+            if lbl == "-" {
+                ui.separator();
+                continue;
+            }
+            if lbl == "Rove Across Time" && !prop.spatial {
+                continue;
+            }
+            if lbl == "Edit Value…" && !matches!(k.value, Value::Scalar(_) | Value::Vec2(_) | Value::Vec3(_)) {
+                continue;
+            }
+            if ui.button(lbl).clicked() {
+                if !ks {
+                    actions.push(("keys.select".into(), json!({"keys": [{"layer": layer.id.0, "prop": uid, "time": k.time.seconds()}]})));
+                }
+                actions.push((cmd.into(), params));
+                ui.close();
+            }
+        }
+    });
+}
+
+/// Starts a key drag (or Alt-scale).
+fn key_drag_begin(app: &mut EffectcraftApp, g: &Rw, kh: &KeyHit<'_>) {
+    let KeyHit { ct, ks, mods, ref kresp, .. } = *kh;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let sel_keys = &g.sel_keys;
+    // Alt-drag the first or last key of a selected group: scale the group in time.
+    if kresp.drag_started()
+        && mods.alt
+        && !mods.command
+        && let Some(c) = app.session.active_comp_arc()
+    {
+        super::graph_tools::alt_scale_begin(app, &ctx, &c, ct.seconds());
+    }
+    // A plain drag moves the selected keys. The timeline follows it (below): this
+    // widget's id changes with the key's time, so its own drag would end after
+    // the first frame of movement.
+    // (From where the button went down: a drag starts a few pixels later.)
+    if kresp.drag_started()
+        && !super::graph_tools::alt_scale_active(&ctx)
+        && let Some(p) = ctx.input(|i| i.pointer.press_origin())
+    {
+        // Ctrl/Cmd+Alt: Quick Offset of the selected keys' layers (#1012).
+        let quick = (mods.command && mods.alt && ks).then(|| quick_offset_layers(&comp, sel_keys.iter().map(|k| k.layer))).flatten();
+        ctx.data_mut(|d| d.insert_temp(key_drag_id(), KeyDrag { origin_x: p.x, anchor: ct.seconds(), applied: 0, quick }));
+    }
+}
+
+/// Paints one keyframe marker; returns its hit rect.
+fn key_paint(g: &Rw, rc: &RowCtx<'_>, k: &effectcraft_engine::keyframe::Keyframe, x: f32, ks: bool) -> Rect {
+    let t = g.tl.t;
+    let gp = g.gp.clone();
+    let cy = rc.cy;
+    let icon = k.icon();
+    let c = pos2(x, cy);
+    // Labelled keys take their label colour (brighter when selected).
+    let kcol = match effectcraft_engine::color::Label::ALL.get(k.label as usize).filter(|_| k.label > 0) {
+        Some(l) => {
+            let c = t.label(*l);
+            if ks { c } else { c.gamma_multiply(0.75) }
+        }
+        None if ks => t.keyframe_selected,
+        None => t.keyframe,
+    };
+    if k.roving {
+        // Roving keys: a small dot (their time follows their neighbours).
+        gp.circle_filled(c, 2.5, kcol);
+    } else {
+        icons::keyframe(&gp, c, 11.0, icon.left, icon.right, kcol);
+    }
+    Rect::from_center_size(c, vec2(12.0, 14.0))
+}
+
+/// The key's hit target and automation ids.
+fn key_hit(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    g: &Rw,
+    rc: &RowCtx<'_>,
+    prop: &Property,
+    k: &effectcraft_engine::keyframe::Keyframe,
+    kr: Rect,
+) -> egui::Response {
+    let fr = g.tl.fr;
+    let layer = rc.layer;
+    let uid = &prop.uid;
+    let ct = layer.comp_time(k.time);
+    let kresp = ui.interact(kr, egui::Id::unique(("key", uid, k.time.0)), Sense::click_and_drag());
+    app.auto.add(&format!("timeline.key.{uid}.{}", fr.frame_at(ct)), kr, &format!("{} key", prop.name));
+    // Exact (layer-time ticks): keys a Quick Offset puts on subframes can share a frame.
+    app.auto.add(&format!("timeline.keyAt.{uid}.{}", k.time.0), kr, &format!("{} key", prop.name));
+    kresp
+}
+
+/// Right-click menus on the empty outline and graph areas.
+fn background_menus(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw) {
+    let actions = &mut g.tl.actions;
+    let graph_on = g.graph_on;
+    let full_clip = g.full_clip;
+    let empty_rect = g.empty_rect;
+    let empty = g.empty.clone();
+    let outline_empty = g.outline_empty.clone();
+    ui.set_clip_rect(full_clip);
+    // The background responses sit below rows, bars and editors, preserving their menus.
+    if !graph_on {
+        app.auto.add("timeline.empty", empty_rect, "Right-click to create a layer");
+    }
+    for (response, area) in [(&outline_empty, "outline"), (&empty, "graph")] {
+        crate::widgets::context_menu(response, |ui| {
+            let menu = ui.menu_button(crate::i18n::tr("New"), |ui| {
+                for (key, label, command, params) in [
+                    ("text", "Text", "layer.newText", json!({})),
+                    ("solid", "Solid…", "layer.newSolid", json!({})),
+                    ("light", "Light…", "layer.newLight", json!({})),
+                    ("camera", "Camera…", "layer.newCamera", json!({})),
+                    ("null", "Null Object", "layer.newNull", json!({})),
+                    ("shape", "Shape Layer", "layer.newShape", json!({"kind": "none"})),
+                    ("adjustment", "Adjustment Layer", "layer.newAdjustment", json!({})),
+                ] {
+                    let response = ui.button(crate::i18n::context_item(command, &params, label));
+                    app.auto.add(&format!("timeline.context.{area}.{key}"), response.rect, label);
+                    if response.clicked() {
+                        actions.push((command.into(), params));
+                        ui.close();
+                    }
+                }
+            });
+            app.auto.add(&format!("timeline.context.{area}.new"), menu.response.rect, "New");
+            let response = ui.button(crate::i18n::tr("Composition Settings…"));
+            app.auto.add(&format!("timeline.context.{area}.settings"), response.rect, "Composition Settings…");
+            if response.clicked() {
+                actions.push(("comp.settings".into(), json!({})));
+                ui.close();
+            }
+            let response = ui.button(crate::i18n::tr("Open in Essential Graphics"));
+            app.auto.add(&format!("timeline.context.{area}.essentialGraphics"), response.rect, "Open in Essential Graphics");
+            if response.clicked() {
+                actions.push(("comp.openInEssentialGraphics".into(), json!({})));
+                ui.close();
+            }
+        });
+    }
+}
+
+/// Click and marquee-select on the empty outline.
+fn outline_marquee(ui: &mut egui::Ui, g: &mut Rw) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let actions = &mut g.tl.actions;
+    let outline_rect = g.outline_rect;
+    let lp = g.lp.clone();
+    let outline_empty = g.outline_empty.clone();
+    let hit_rows = &mut g.hit_rows;
+    if outline_empty.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
+        actions.push(("layer.select".into(), json!({"layers": []})));
+    }
+    if let (Some(start), Some(end)) = (ctx.input(|i| i.pointer.press_origin()), outline_empty.interact_pointer_pos())
+        && outline_empty.dragged()
+    {
+        let box_rect = Rect::from_two_pos(start, end).intersect(outline_rect);
+        lp.rect_filled(box_rect, 0.0, t.accent.gamma_multiply(0.12));
+        lp.rect_stroke(box_rect, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        ctx.data_mut(|d| d.insert_temp(egui::Id::unique("tl-layer-box"), box_rect));
+    }
+    if outline_empty.drag_stopped()
+        && let Some(box_rect) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::unique("tl-layer-box")))
+    {
+        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::unique("tl-layer-box")));
+        let layers: Vec<u64> = hit_rows
+            .iter()
+            .filter(|(r, row)| matches!(row.kind, RowKind::Layer) && r.intersects(box_rect))
+            .filter(|(_, row)| comp.layer(row.layer).is_some_and(|l| !l.switches.locked))
+            .map(|(_, row)| row.layer.0)
+            .collect();
+        actions.push(("layer.select".into(), json!({"layers": layers, "add": ui.input(|i| i.modifiers.shift || i.modifiers.command)})));
+    }
+    // Pick whips: a line follows the pointer; releasing over a row links to it (an expression's
+}
+
+/// A pick whip in flight: its line, the target and the link on release.
+fn pick_whip_drag(g: &mut Rw) {
+    let t = g.tl.t;
+    let graph_x0 = g.tl.graph_x0;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let hit_rows = &mut g.hit_rows;
+    let dim_hits = &mut g.dim_hits;
+    // or a property's, also over a property in Effect Controls).
+    if let Some((kind, src_layer, src_prop, start)) = ctx.data(|d| d.get_temp::<PickWhip>(pick_whip_id())) {
+        let ptr = ctx.input(|i| i.pointer.latest_pos()).unwrap_or(start);
+        let fg = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("tl-pickwhip-line")));
+        fg.line_segment([start, ptr], Stroke::new(1.5, t.accent));
+        fg.circle_stroke(ptr, 4.0, Stroke::new(1.5, t.accent));
+        let target = hit_rows.iter().find(|(r, _)| r.contains(ptr)).map(|(r, row)| (*r, row.clone()));
+        // Shown this pass or the last one (Effect Controls may draw after the Timeline).
+        let pass = ctx.cumulative_pass_nr();
+        let elsewhere = (target.is_none() && kind != WHIP_PARENT)
+            .then(|| ctx.data(|d| d.get_temp::<WhipTargets>(whip_targets_id())))
+            .flatten()
+            .filter(|(p, _)| p.saturating_add(1) >= pass)
+            .and_then(|(_, targets)| targets.into_iter().find(|(r, ..)| r.contains(ptr)));
+        if let Some((tr, _)) = &target {
+            fg.rect_stroke(Rect::from_min_max(tr.min, pos2(graph_x0 - 1.0, tr.max.y)), 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        } else if let Some((tr, ..)) = &elsewhere {
+            fg.rect_stroke(*tr, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Inside);
+        }
+        if ctx.input(|i| !i.pointer.any_down()) {
+            ctx.data_mut(|d| {
+                d.remove::<PickWhip>(pick_whip_id());
+                d.remove::<WhipTargets>(whip_targets_id());
+            });
+            let into = (kind == WHIP_EXPR).then(|| ctx.data_mut(|d| d.remove_temp::<WhipInto>(whip_into_id(src_prop)))).flatten();
+            // The property dropped on, and the value (dimension) if on one of them: `position[0]`.
+            let dim = |fields: &[Rect]| fields.iter().position(|r| r.contains(ptr));
+            let prop_target = match (&target, elsewhere) {
+                (Some((_, Row { layer, kind: RowKind::Prop { uid }, .. })), _) => {
+                    Some((layer.0, *uid, dim_hits.iter().find(|(u, _)| u == uid).and_then(|(_, rs)| dim(rs))))
+                }
+                (None, Some((_, l, u, fields))) => Some((l, u, dim(&fields))),
+                _ => None,
+            };
+            match (kind, target, prop_target) {
+                (WHIP_PARENT, Some((_, row)), _) if row.layer.0 != src_layer => {
+                    actions.push(("layer.setParent".into(), json!({"layers": [src_layer], "parent": row.layer.0})));
+                }
+                // The property pick whip replaces the expression with the reference (or adds one),
+                // as the expression pick whip does when its expression isn't being edited.
+                (WHIP_EXPR | WHIP_PROP, _, Some((tl, tu, d))) if tu != src_prop => {
+                    let mut params = json!({"layer": src_layer, "prop": src_prop, "target": {"layer": tl, "prop": tu}});
+                    if let Some(d) = d {
+                        params["target"]["dimension"] = json!(d);
+                    }
+                    if let Some((text, [a, b])) = into {
+                        // Into the expression being edited, which goes on being edited.
+                        params["expression"] = json!(text);
+                        params["range"] = json!([a, b]);
+                        let after = text.chars().count().saturating_sub(b);
+                        focus_expression(&ctx, src_prop, [after, after]);
+                    }
+                    actions.push(("prop.pickWhip".into(), params));
+                }
+                _ => {}
+            }
+        }
+    }
+    // Alt-drag key group scaling (follows the pointer until release).
+}
+
+fn alt_scale_and_graph(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw, ectx: &EvalCtx<'_>) {
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let actions = &mut g.tl.actions;
+    let graph_on = g.graph_on;
+    let gp = g.gp.clone();
+    if let Some(c) = app.session.active_comp_arc() {
+        super::graph_tools::alt_scale_update(app, &ctx, &c, tm, &mut *actions);
+    }
+    // Graph editor.
+    if graph_on {
+        super::graph::show(
+            app,
+            ui,
+            &gp,
+            super::graph::GraphView { comp: &comp, ectx, tm },
+            Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max),
+            &mut *actions,
+        );
+    }
+    // A plain click on empty track area (beside a layer's bar, on a property row's empty span or
+    // below the last row) deselects the layers and their keys and properties, as in After
+}
+
+/// Click / marquee on empty track area.
+fn graph_empty_area(ui: &mut egui::Ui, g: &mut Rw) {
+    let t = g.tl.t;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let gp = g.gp.clone();
+    let empty = g.empty.clone();
+    if empty.clicked() && !ui.input(|i| i.modifiers.shift || i.modifiers.command) {
+        actions.push(("layer.select".into(), json!({"layers": []})));
+    }
+    if let (true, Some(origin), Some(cur)) =
+        (empty.dragged(), empty.interact_pointer_pos().and_then(|_| ctx.input(|i| i.pointer.press_origin())), empty.interact_pointer_pos())
+    {
+        let br = Rect::from_two_pos(origin, cur);
+        gp.rect_filled(br, 0.0, t.accent.gamma_multiply(0.12));
+        gp.rect_stroke(br, 0.0, Stroke::new(1.0, t.accent), StrokeKind::Middle);
+        ctx.data_mut(|d| d.insert_temp(egui::Id::unique("tl-box"), br));
+    }
+}
+
+/// Layer reorder drag: a line where the layers land.
+fn layer_reorder_drag(ui: &mut egui::Ui, g: &mut Rw) {
+    let t = g.tl.t;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let rows_rect = g.tl.rows_rect;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let p = g.tl.p.clone();
+    let actions = &mut g.tl.actions;
+    let hit_rows = &mut g.hit_rows;
+    if let Some(moving) = ctx.data(|d| d.get_temp::<Vec<u64>>(layer_drag_id())) {
+        let dropped = ctx.data_mut(|d| d.remove_temp::<bool>(layer_drop_id())).unwrap_or(false);
+        let layer_rows: Vec<(Rect, LayerId)> = hit_rows.iter().filter(|(_, r)| matches!(r.kind, RowKind::Layer)).map(|(rr, r)| (*rr, r.layer)).collect();
+        if let Some(py) = ui.input(|i| i.pointer.interact_pos().or(i.pointer.latest_pos())).map(|p| p.y)
+            && !layer_rows.is_empty()
+        {
+            let (at, line_y) = insertion(&layer_rows, py, rows_rect.min.y);
+            let target = at.and_then(|i| layer_rows[i..].iter().find(|(_, l)| !moving.contains(&l.0)).map(|(_, l)| *l));
+            if dropped {
+                ctx.data_mut(|d| d.remove::<Vec<u64>>(layer_drag_id()));
+                // Only when the order changes (no empty undo step for a drop in place).
+                let mut order: Vec<u64> = comp.layers.iter().map(|l| l.id.0).filter(|id| !moving.contains(id)).collect();
+                let at = target.and_then(|t| order.iter().position(|id| *id == t.0)).unwrap_or(order.len());
+                order.splice(at..at, moving.iter().copied());
+                if order != comp.layers.iter().map(|l| l.id.0).collect::<Vec<_>>() {
+                    let params = match target {
+                        Some(t) => json!({"layers": moving, "above": t.0}),
+                        None => json!({"layers": moving, "to": "back"}),
+                    };
+                    actions.push(("layer.arrange".into(), params));
+                }
+            } else {
+                ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
+                p.with_clip_rect(rows_rect).line_segment([pos2(rect.min.x, line_y), pos2(graph_x0, line_y)], Stroke::new(2.0, t.accent));
+            }
+        } else if dropped {
+            ctx.data_mut(|d| d.remove::<Vec<u64>>(layer_drag_id()));
+        }
+    }
+    // Quick Offset of layer bars: the last selected layer moves by whole frames with the pointer
+}
+
+/// Quick Offset of layer bars follows the pointer.
+fn quick_offset_follow(g: &mut Rw) {
+    let t = g.tl.t;
+    let pps = g.tl.pps;
+    let fd = g.tl.fd;
+    let ctx = g.tl.ctx.clone();
+    let actions = &mut g.tl.actions;
+    let ui_actions = &mut g.ui_actions;
+    if let Some(mut q) = ctx.data(|d| d.get_temp::<QuickBar>(quick_bar_id())) {
+        let (down, ptr) = ctx.input(|i| (i.pointer.primary_down(), i.pointer.latest_pos()));
+        match ptr.filter(|_| down) {
+            Some(ptr) => {
+                let frames = (((ptr.x - q.origin_x) as f64 / pps) / fd).round() as i64;
+                if frames != q.applied {
+                    q.applied = frames;
+                    ctx.data_mut(|d| d.insert_temp(quick_bar_id(), q));
+                    let merge = format!("bar-quick-{}", q.layer.0);
+                    actions.push(("layer.quickOffset".into(), json!({"delta": frames as f64 * fd, "merge": merge, "fromStart": true})));
+                }
+                drag_tip(&ctx, &t, ptr, quick_offset_note(q.applied, q.layers));
+            }
+            None => {
+                ctx.data_mut(|d| d.remove::<QuickBar>(quick_bar_id()));
+                ui_actions.push(UiAct::EndMerge);
+            }
+        }
+    }
+    // Keyframe drag: the selected keys move by whole frames with the pointer until it is
+    // released (one undo step); Shift snaps the grabbed key to the current time, the work area
+}
+
+/// The key drag moves the selected keys by whole frames.
+fn key_drag_follow(app: &mut EffectcraftApp, g: &mut Rw) {
+    let t = g.tl.t;
+    let time = g.tl.time;
+    let pps = g.tl.pps;
+    let fd = g.tl.fd;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let rows = &g.tl.rows;
+    let actions = &mut g.tl.actions;
+    let ui_actions = &mut g.ui_actions;
+    if let Some(mut kd) = ctx.data(|d| d.get_temp::<KeyDrag>(key_drag_id())) {
+        let (down, ptr, shift) = ctx.input(|i| (i.pointer.primary_down(), i.pointer.latest_pos(), i.modifiers.shift));
+        match ptr.filter(|_| down) {
+            Some(ptr) => {
+                let mut target = kd.anchor + (ptr.x - kd.origin_x) as f64 / pps;
+                if shift {
+                    // The current time and whatever it snaps to (keys, layer ends, markers), but
+                    // not the moving keys themselves.
+                    let moving: Vec<f64> =
+                        app.session.state.selected_keys.iter().filter_map(|k| comp.layer(k.layer).map(|l| l.comp_time(k.time).seconds())).collect();
+                    let mut cands = snap_candidates(&comp, rows);
+                    cands.retain(|c| !moving.iter().any(|m| (m - c).abs() < 1e-9));
+                    cands.push(time.seconds());
+                    target = snap_time(&cands, target, 8.0 / pps);
+                }
+                let total = ((target - kd.anchor) / fd).round() as i64;
+                if total != kd.applied {
+                    actions.push(match kd.quick {
+                        Some(_) => ("keys.quickOffset".into(), json!({"delta": total as f64 * fd, "merge": "key-quick-offset", "fromStart": true})),
+                        None => ("keys.move".into(), json!({"delta": (total - kd.applied) as f64 * fd, "merge": "key-drag"})),
+                    });
+                    kd.applied = total;
+                    ctx.data_mut(|d| d.insert_temp(key_drag_id(), kd));
+                }
+                ctx.set_cursor_icon(egui::CursorIcon::Grabbing);
+                // Where the grabbed key is and how far the keys moved (After Effects shows this
+                // in the Info panel).
+                let at = Tick::from_seconds_f64(kd.anchor + kd.applied as f64 * fd);
+                let note = match kd.quick {
+                    Some(n) => quick_offset_note(kd.applied, n),
+                    None => format!("{}   {:+} f", super::timecode(&app.session, &comp, at), kd.applied),
+                };
+                drag_tip(&ctx, &t, ptr, note);
+                app.ui.status = format!("Keyframe at {}", super::timecode(&app.session, &comp, at));
+            }
+            None => {
+                ctx.data_mut(|d| d.remove::<KeyDrag>(key_drag_id()));
+                ui_actions.push(UiAct::EndMerge);
+            }
+        }
+    }
+}
+
+/// Releasing the key marquee selects the keys inside it.
+fn key_box_select(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &mut Rw) {
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let rh = g.tl.rh;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let rows = &g.tl.rows;
+    let actions = &mut g.tl.actions;
+    let empty = g.empty.clone();
+    if empty.drag_stopped()
+        && let Some(br) = ctx.data(|d| d.get_temp::<Rect>(egui::Id::unique("tl-box")))
+    {
+        ctx.data_mut(|d| d.remove::<Rect>(egui::Id::unique("tl-box")));
+        let mut keys = vec![];
+        let mut yy = rows_rect.min.y - app.ui.timeline.scroll_y;
+        for row in rows.iter() {
+            let cy = yy + rh / 2.0;
+            yy += row_height(row, rh);
+            if let RowKind::Prop { uid } = row.kind
+                && cy >= br.min.y
+                && cy <= br.max.y
+                && let Some(l) = comp.layer(row.layer)
+                && let Some(pr) = l.props.find(uid)
+            {
+                for k in &pr.keys {
+                    let x = tm.x(l.comp_time(k.time).seconds());
+                    if x >= br.min.x && x <= br.max.x {
+                        keys.push(json!({"layer": l.id.0, "prop": uid, "time": k.time.seconds()}));
+                    }
+                }
+            }
+        }
+        let mods = ui.input(|i| i.modifiers);
+        if keys.is_empty() && !(mods.shift || mods.command) {
+            // A marquee that catches nothing leaves nothing selected (layers included).
+            actions.push(("layer.select".into(), json!({"layers": []})));
+        } else {
+            actions.push(("keys.select".into(), json!({"keys": keys, "add": mods.shift, "selectProperties": true})));
+        }
+    }
+}
+
+fn current_time_indicator(app: &mut EffectcraftApp, g: &Rw) {
+    let t = g.tl.t;
+    let time = g.tl.time;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let ruler = g.tl.ruler;
+    let p = g.tl.p.clone();
+    let cx = tm.x(time.seconds());
+    if cx >= graph_x0 && cx <= rect.max.x {
+        p.line_segment([pos2(cx, ruler.min.y + 12.0), pos2(cx, rows_rect.max.y)], Stroke::new(1.0, t.cti));
+        let head = vec![
+            pos2(cx - 6.0, ruler.min.y + 12.0),
+            pos2(cx + 6.0, ruler.min.y + 12.0),
+            pos2(cx + 6.0, ruler.max.y - 8.0),
+            pos2(cx, ruler.max.y - 2.0),
+            pos2(cx - 6.0, ruler.max.y - 8.0),
+        ];
+        p.add(egui::Shape::convex_polygon(head, t.cti, Stroke::NONE));
+        app.auto.add("timeline.cti", Rect::from_center_size(pos2(cx, ruler.center().y), vec2(12.0, 20.0)), "Current time indicator");
+    }
+}
+
+/// The footer: scroll bars, the switches / modes toggle and render time.
+fn footer_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw) -> Rect {
+    let t = g.tl.t;
+    let rect = g.tl.rect;
+    let footer_h = g.tl.footer_h;
+    let overflow = g.tl.overflow;
+    let oscroll = g.tl.oscroll;
+    let graph_x0 = g.tl.graph_x0;
+    let rows_rect = g.tl.rows_rect;
+    let max_scroll = g.tl.max_scroll;
+    let p = g.tl.p.clone();
+    let footer = Rect::from_min_max(pos2(rect.min.x, rect.max.y - footer_h), rect.max);
+    p.rect_filled(footer, 0.0, t.panel_bg);
+    p.line_segment([footer.left_top(), footer.right_top()], Stroke::new(1.0, t.separator));
+    if overflow > 0.0 {
+        // Outline scroll bar along the top of the footer, under the columns.
+        let track = Rect::from_min_max(pos2(rect.min.x + 2.0, footer.min.y + 1.0), pos2(graph_x0 - 3.0, footer.min.y + 5.0));
+        app.ui.timeline.outline_scroll = widgets::scroll_bar(ui, &mut app.auto, "timeline.outlineScroll", track, oscroll, overflow, &t);
+    }
+    if max_scroll > 0.0 {
+        // The layer rows' scroll bar, on the right edge beside the time graph.
+        let track = Rect::from_min_max(pos2(rect.max.x - 6.0, rows_rect.min.y + 1.0), pos2(rect.max.x - 2.0, rows_rect.max.y - 1.0));
+        app.ui.timeline.scroll_y = widgets::scroll_bar(ui, &mut app.auto, "timeline.scroll", track, app.ui.timeline.scroll_y, max_scroll, &t);
+    }
+    let tgl = Rect::from_min_size(pos2(footer.min.x + 10.0, footer.min.y + 3.0), vec2(150.0, 18.0));
+    let tresp = ui.interact(tgl, egui::Id::unique("tl-toggle-modes"), Sense::click());
+    p.text(
+        tgl.left_center(),
+        Align2::LEFT_CENTER,
+        crate::i18n::tr("Toggle Switches / Modes"),
+        Tokens::ui(11.0),
+        if tresp.hovered() { t.text } else { t.text_dim },
+    );
+    app.auto.add("timeline.toggleSwitchesModes", tgl, "Toggle Switches / Modes");
+    if tresp.clicked() {
+        app.ui.timeline.show_modes = !app.ui.timeline.show_modes;
+    }
+    let ms = app.frames.last_ms.lock().map(|v| *v).unwrap_or(0.0);
+    p.text(
+        pos2(graph_x0 - 12.0, footer.center().y),
+        Align2::RIGHT_CENTER,
+        crate::i18n::tr_args("Frame Render Time  {}ms", &[&format!("{ms:.0}")]),
+        Tokens::ui(11.0),
+        t.text_faint,
+    );
+    // Zoom slider.
+    footer
+}
+
+/// The zoom buttons and slider.
+fn footer_zoom(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw, footer: Rect) {
+    let t = g.tl.t;
+    let time = g.tl.time;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let fit_pps = g.tl.fit_pps;
+    let pps = g.tl.pps;
+    let tm = g.tl.tm;
+    let comp = g.tl.comp.clone();
+    let p = g.tl.p.clone();
+    let zs = Rect::from_min_max(pos2(graph_x0 + 30.0, footer.center().y - 2.0), pos2((graph_x0 + 230.0).min(rect.max.x - 30.0), footer.center().y + 2.0));
+    // Zoom out / zoom in buttons either side of the slider: the `-` / `=` steps. Everything here
+    // zooms around the CTI and sets the one time zoom the layer bars and the Graph Editor share.
+    let cti = time.seconds();
+    let cti_px = (cti - tm.start) * pps;
+    for (icon, size, cx, id, tip, k) in [
+        (Icon::MountainSmall, 14.0, zs.min.x - 14.0, "timeline.zoomOutButton", "Zoom Out (Time)", 1.0 / ZOOM_STEP),
+        (Icon::MountainLarge, 16.0, zs.max.x + 14.0, "timeline.zoomInButton", "Zoom In (Time)", ZOOM_STEP),
+    ] {
+        let r = Rect::from_center_size(pos2(cx, footer.center().y), vec2(20.0, 20.0));
+        let resp = ui.interact(r, egui::Id::unique(id), Sense::click()).on_hover_text(crate::i18n::tr(tip));
+        icons::paint(&p, Rect::from_center_size(r.center(), vec2(size, size)), icon, if resp.hovered() { t.text } else { t.text_dim });
+        app.auto.add(id, r, tip);
+        if resp.clicked() {
+            set_zoom(&mut app.ui.timeline, &comp, pps * k, fit_pps, cti, cti_px);
+        }
+    }
+    p.rect_filled(zs, 2.0, t.field_bg);
+    let maxpps = MAX_PPS.max(fit_pps * 1.001);
+    let frac = ((pps / fit_pps).ln() / (maxpps / fit_pps).ln()).clamp(0.0, 1.0) as f32;
+    let knob = pos2(zs.min.x + zs.width() * frac, zs.center().y);
+    p.circle_filled(knob, 6.0, t.text);
+    // Drag the knob, or click the track to jump there.
+    let zresp = ui.interact(zs.expand2(vec2(6.0, 8.0)), egui::Id::unique("tl-zoom"), Sense::click_and_drag());
+    app.auto.add("timeline.zoomSlider", zs, "Zoom");
+    if (zresp.dragged() || zresp.clicked())
+        && let Some(pt) = zresp.interact_pointer_pos()
+    {
+        let f = ((pt.x - zs.min.x) / zs.width().max(1.0)).clamp(0.0, 1.0) as f64;
+        set_zoom(&mut app.ui.timeline, &comp, fit_pps * (maxpps / fit_pps).powf(f), fit_pps, cti, cti_px);
+    }
+}
+
+fn comp_markers_ui(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw) {
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let ruler = g.tl.ruler;
+    let bin = g.tl.bin;
+    let comp = g.tl.comp.clone();
+    // Composition markers in the ruler; protected regions shade the layer rows.
+    let mstrip = Rect::from_min_max(pos2(graph_x0, ruler.max.y - 12.0), pos2(bin.min.x, ruler.max.y));
+    let mrows = rows_rect.intersect(Rect::from_min_max(pos2(graph_x0, rows_rect.min.y), rows_rect.max));
+    super::markers_ui::comp_markers(app, ui, &comp, tm, mstrip, mrows);
+    super::markers_ui::marker_bin(app, ui, &comp, tm, bin, mstrip);
+}
+
+/// Spacebar held: the Hand tool.
+fn hand_tool_pan(app: &mut EffectcraftApp, ui: &mut egui::Ui, g: &Rw) {
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let graph_x1 = g.tl.graph_x1;
+    let pps = g.tl.pps;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let ruler = g.tl.ruler;
+    let max_scroll = g.tl.max_scroll;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    if super::space_hand(&ctx) {
+        let area = Rect::from_min_max(pos2(graph_x0, ruler.min.y), pos2(rect.max.x, rows_rect.max.y));
+        let hand = ui.interact(area, egui::Id::unique("tl-hand"), Sense::drag());
+        app.auto.add("timeline.hand", area, "Hand (hold Spacebar)");
+        if hand.hovered() || hand.dragged() {
+            ctx.set_cursor_icon(if hand.dragged() { egui::CursorIcon::Grabbing } else { egui::CursorIcon::Grab });
+        }
+        if hand.dragged() {
+            let dy = ui.input(|i| i.pointer.delta().y);
+            app.ui.timeline.scroll_y = (app.ui.timeline.scroll_y - dy).clamp(0.0, max_scroll);
+            if app.ui.timeline.pps.is_some() {
+                let start = app.ui.timeline.start;
+                let last = (comp.duration.seconds() - (tm.t(graph_x1) - tm.start)).max(start).max(0.0);
+                app.ui.timeline.start = (start - hand.drag_delta().x as f64 / pps).clamp(0.0, last);
+            }
+        }
+    }
+}
+
+/// Alt-drag of an item over a layer: replace its source.
+fn drop_replace_source(app: &mut EffectcraftApp, g: &mut Rw, payload: &std::sync::Arc<crate::panels::DragPayload>, ptr: Pos2, released: bool) {
+    let t = g.tl.t;
+    let cid = g.tl.cid;
+    let rows_rect = g.tl.rows_rect;
+    let comp = g.tl.comp.clone();
+    let p = g.tl.p.clone();
+    let actions = &mut g.tl.actions;
+    let hit_rows = &mut g.hit_rows;
+    if let crate::panels::DragPayload::Item(id) = payload.as_ref() {
+        let target = hit_rows.iter().find(|(r, _)| ptr.y >= r.min.y && ptr.y < r.max.y).map(|(_, row)| row.layer);
+        if let Some(l) = target
+            && replace_source_target(app, cid, ItemId(*id), l, &comp)
+            && let Some(span) = hit_rows.iter().filter(|(_, row)| row.layer == l).map(|(r, _)| *r).reduce(|a, b| a.union(b))
+        {
+            let lit = span.intersect(rows_rect);
+            let rp = p.with_clip_rect(rows_rect);
+            rp.rect_filled(lit, 0.0, t.accent.gamma_multiply(0.18));
+            rp.rect_stroke(lit, 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
+            app.auto.add("timeline.replaceSourceTarget", lit, "Replace the layer's source");
+            if released {
+                actions.push(("layer.replaceSource".into(), json!({"layers": [l.0], "item": *id, "fixExpressions": false})));
+            }
+        }
+    }
+}
+
+/// Effects and presets drop onto the layer under the pointer.
+fn drop_on_layer(app: &mut EffectcraftApp, g: &mut Rw, payload: &std::sync::Arc<crate::panels::DragPayload>, ptr: Pos2, released: bool) {
+    let t = g.tl.t;
+    let rows_rect = g.tl.rows_rect;
+    let p = g.tl.p.clone();
+    let actions = &mut g.tl.actions;
+    let hit_rows = &mut g.hit_rows;
+    let target = hit_rows.iter().find(|(r, _)| ptr.y >= r.min.y && ptr.y < r.max.y).map(|(_, row)| row.layer);
+    // The layer the effect would land on (its row and its open properties) is the one
+    // that lights up, not the whole timeline.
+    if let Some(l) = target
+        && let Some(span) = hit_rows.iter().filter(|(_, row)| row.layer == l).map(|(r, _)| *r).reduce(|a, b| a.union(b))
+    {
+        let lit = span.intersect(rows_rect);
+        let rp = p.with_clip_rect(rows_rect);
+        rp.rect_filled(lit, 0.0, t.accent.gamma_multiply(0.18));
+        rp.rect_stroke(lit, 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
+        app.auto.add("timeline.dropTarget", lit, "Drop target layer");
+    }
+    if released && let Some(l) = target {
+        match payload.as_ref() {
+            crate::panels::DragPayload::Effect(e) => actions.push(("effect.apply".into(), json!({"effect": e, "layers": [l.0]}))),
+            crate::panels::DragPayload::Preset { preset, .. } => {
+                let (id, params) = preset.apply_to(l.0);
+                actions.push((id.into(), params));
+            }
+            _ => {}
+        }
+    }
+}
+
+/// Footage and files drop into the stack: a line shows the place.
+fn drop_insert_layers(app: &mut EffectcraftApp, g: &mut Rw, payload: &std::sync::Arc<crate::panels::DragPayload>, ptr: Pos2, released: bool) {
+    let t = g.tl.t;
+    let time = g.tl.time;
+    let rect = g.tl.rect;
+    let graph_x0 = g.tl.graph_x0;
+    let tm = g.tl.tm;
+    let rows_rect = g.tl.rows_rect;
+    let ctx = g.tl.ctx.clone();
+    let comp = g.tl.comp.clone();
+    let p = g.tl.p.clone();
+    let actions = &mut g.tl.actions;
+    let graph_on = g.graph_on;
+    let hit_rows = &mut g.hit_rows;
+    let layer_rows: Vec<(Rect, LayerId)> = hit_rows.iter().filter(|(_, r)| matches!(r.kind, RowKind::Layer)).map(|(rr, r)| (*rr, r.layer)).collect();
+    let (at, line_y) = insertion(&layer_rows, ptr.y, rows_rect.min.y);
+    let index = match at.and_then(|i| layer_rows.get(i)) {
+        Some((_, l)) => comp.index_of(*l).unwrap_or(1),
+        None => layer_rows.last().and_then(|(_, l)| comp.index_of(*l)).unwrap_or(comp.layers.len()) + 1,
+    };
+    let start = (ptr.x >= graph_x0 && !graph_on).then(|| {
+        let t = if ctx.input(|i| i.modifiers.shift) { time } else { Tick::from_seconds_f64(tm.t(ptr.x)) };
+        comp.frame_rate.snap_nearest(t).clamp(Tick::ZERO, comp.duration - comp.frame_duration())
+    });
+    let rp = p.with_clip_rect(rows_rect);
+    rp.line_segment([pos2(rect.min.x, line_y), pos2(rows_rect.max.x, line_y)], Stroke::new(2.0, t.accent));
+    if let Some(s) = start {
+        let x = tm.x(s.seconds());
+        rp.line_segment([pos2(x, rows_rect.min.y), pos2(x, rows_rect.max.y)], Stroke::new(1.0, t.accent));
+        // The In point's time in a tag beside the marker.
+        let g = rp.layout_no_wrap(super::timecode(&app.session, &comp, s), Tokens::ui(11.0), Color32::WHITE);
+        let tag = Align2::LEFT_BOTTOM.anchor_size(pos2(x + 4.0, line_y - 3.0), g.size());
+        rp.rect_filled(tag.expand(2.0), 2.0, t.accent);
+        rp.galley(tag.min, g, Color32::WHITE);
+    }
+    if released {
+        let time = json!(start.map(Tick::seconds));
+        match payload.as_ref() {
+            crate::panels::DragPayload::Item(id) => {
+                // Insert each selected item at the drop point, in selection order.
+                for (offset, item) in crate::panels::project_drop_items(app, *id).into_iter().enumerate() {
+                    actions.push(("layer.addItem".into(), json!({"item": item, "index": index.saturating_add(offset), "time": time.clone()})));
+                }
+            }
+            crate::panels::DragPayload::Files(paths) => {
+                actions.push(("mediaBrowser.import".into(), json!({"paths": paths, "addToComp": true, "index": index, "time": time})))
+            }
+            crate::panels::DragPayload::Effect(_) | crate::panels::DragPayload::Preset { .. } | crate::panels::DragPayload::Property { .. } => {}
+        }
+    }
+}
+
 /// The optional per-layer cells: Comment (double-click to edit), In / Out / Duration (drag to
 /// change by frames), Stretch (click: Time Stretch dialog).
-#[allow(clippy::too_many_arguments)]
 fn layer_cells(
     app: &mut EffectcraftApp,
     ui: &mut egui::Ui,
     lp: &egui::Painter,
     cw: &Cols,
     comp: &Comp,
-    layer: &Layer,
-    r: Rect,
-    cy: f32,
+    rc: &RowCtx<'_>,
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
+    let (layer, r, cy) = (rc.layer, rc.r, rc.cy);
     let t = app.tokens;
     let ctx = ui.ctx().clone();
     let lid = layer.id.0;
     if cw.vis.comment {
         let cr = Rect::from_min_max(pos2(cw.comment + 4.0, r.min.y + 1.0), pos2(cw.comment + COMMENT_W - 4.0, r.max.y - 1.0));
-        let edit_id = egui::Id::new("tl-comment-edit");
+        let edit_id = egui::Id::unique("tl-comment-edit");
         let editing: Option<(u64, String)> = ctx.data(|d| d.get_temp(edit_id));
         app.auto.add(&format!("timeline.layer.{lid}.comment"), cr, &layer.comment);
         if let Some((el, mut buf)) = editing.filter(|(el, _)| *el == lid) {
@@ -3507,7 +4825,8 @@ fn layer_cells(
                 ctx.data_mut(|d| d.insert_temp(edit_id, (el, buf)));
             }
         } else {
-            let resp = ui.interact(cr, egui::Id::new(("tl-comment", lid)), Sense::click()).on_hover_text(crate::i18n::tr("Double-click to edit the comment"));
+            let resp =
+                ui.interact(cr, egui::Id::unique(("tl-comment", lid)), Sense::click()).on_hover_text(crate::i18n::tr("Double-click to edit the comment"));
             lp.with_clip_rect(cr.intersect(lp.clip_rect())).text(pos2(cr.min.x + 2.0, cy), Align2::LEFT_CENTER, &layer.comment, Tokens::ui(11.5), t.text_dim);
             if resp.double_clicked() {
                 ctx.data_mut(|d| d.insert_temp(edit_id, (lid, layer.comment.clone())));
@@ -3525,14 +4844,18 @@ fn layer_cells(
             continue;
         }
         let cr = Rect::from_min_max(pos2(x + 2.0, r.min.y + 1.0), pos2(x + TIME_W - 2.0, r.max.y - 1.0));
-        let tc = crate::panels::timecode(&app.session, comp, Tick::from_seconds_f64(secs) - if kind == "duration" { comp.display_start } else { Tick(0) });
-        let resp = ui.interact(cr, egui::Id::new(("tl-cell", kind, lid)), Sense::drag()).on_hover_text(crate::i18n::tr("Drag to change"));
+        let tc = if kind == "duration" {
+            crate::panels::duration(&app.session, comp, Tick::from_seconds_f64(secs))
+        } else {
+            crate::panels::timecode(&app.session, comp, Tick::from_seconds_f64(secs))
+        };
+        let resp = ui.interact(cr, egui::Id::unique(("tl-cell", kind, lid)), Sense::drag()).on_hover_text(crate::i18n::tr("Drag to change"));
         lp.text(pos2(cr.min.x + 4.0, cy), Align2::LEFT_CENTER, &tc, Tokens::mono(11.0), if resp.hovered() || resp.dragged() { t.hot_text } else { t.timecode });
         app.auto.add(&format!("timeline.layer.{lid}.{kind}"), cr, &tc);
         if resp.hovered() || resp.dragged() {
             ctx.set_cursor_icon(egui::CursorIcon::ResizeHorizontal);
         }
-        let acc_id = egui::Id::new(("tl-cell-acc", kind, lid));
+        let acc_id = egui::Id::unique(("tl-cell-acc", kind, lid));
         if resp.dragged() {
             let mut acc: f32 = ctx.data(|d| d.get_temp(acc_id).unwrap_or(0.0));
             acc += resp.drag_delta().x;
@@ -3557,7 +4880,7 @@ fn layer_cells(
     if cw.vis.stretch {
         let cr = Rect::from_min_max(pos2(cw.stretch + 2.0, r.min.y + 1.0), pos2(cw.stretch + STRETCH_W - 2.0, r.max.y - 1.0));
         let label = format!("{:.1}%", layer.stretch * 100.0);
-        let resp = ui.interact(cr, egui::Id::new(("tl-stretch", lid)), Sense::click()).on_hover_text(crate::i18n::tr("Time Stretch…"));
+        let resp = ui.interact(cr, egui::Id::unique(("tl-stretch", lid)), Sense::click()).on_hover_text(crate::i18n::tr("Time Stretch…"));
         lp.text(pos2(cr.min.x + 4.0, cy), Align2::LEFT_CENTER, &label, Tokens::ui(11.5), if resp.hovered() { t.hot_text } else { t.text });
         app.auto.add(&format!("timeline.layer.{lid}.stretch"), cr, &label);
         if resp.clicked() {
@@ -3594,17 +4917,16 @@ fn find_group(g: &PropGroup, uid: u64) -> Option<&PropGroup> {
 }
 
 /// A stroke's Dashes "+" / "−" buttons (add or remove a Dash/Gap pair).
-#[allow(clippy::too_many_arguments)]
 fn dash_buttons(
     app: &mut EffectcraftApp,
     ui: &mut egui::Ui,
     p: &egui::Painter,
     layer: &Layer,
     uid: u64,
-    x: f32,
-    cy: f32,
+    at: Pos2,
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
+    let (x, cy) = (at.x, at.y);
     if !matches!(layer.source, LayerSource::Shape) || layer.props.find_group(uid).is_none_or(|g| g.match_id != "dashes") {
         return;
     }
@@ -3614,7 +4936,7 @@ fn dash_buttons(
         [("+", "shape.dashes.add", "Add a Dash or Gap"), ("\u{2212}", "shape.dashes.remove", "Remove a Dash or Gap")].into_iter().enumerate()
     {
         let r = Rect::from_center_size(pos2(x + 12.0 + i as f32 * 20.0, cy), vec2(16.0, 16.0));
-        let resp = ui.interact(r, egui::Id::new(("tl-dash", uid, i)), Sense::click()).on_hover_text(tip);
+        let resp = ui.interact(r, egui::Id::unique(("tl-dash", uid, i)), Sense::click()).on_hover_text(tip);
         p.rect_stroke(r.shrink(1.0), 2.0, Stroke::new(1.0, t.separator), StrokeKind::Inside);
         p.text(r.center(), Align2::CENTER_CENTER, sym, Tokens::ui(12.0), if resp.hovered() { t.text } else { t.text_dim });
         app.auto.add(&format!("timeline.group.{uid}.{}", if i == 0 { "addDash" } else { "removeDash" }), r, tip);
@@ -3657,17 +4979,16 @@ const SHAPE_ADD_ITEMS: &[(&str, &str)] = &[
 
 /// A shape layer's Contents "Add:" pop-up menu: adds a shape, paint or path operation to the
 /// selected shape group, else to the layer's contents.
-#[allow(clippy::too_many_arguments)]
 fn shape_add_popup(
     app: &mut EffectcraftApp,
     ui: &mut egui::Ui,
     p: &egui::Painter,
     layer: &Layer,
     uid: u64,
-    x: f32,
-    cy: f32,
+    at: Pos2,
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
+    let (x, cy) = (at.x, at.y);
     if !matches!(layer.source, LayerSource::Shape) || layer.props.sub("contents").is_none_or(|c| c.uid != uid) {
         return;
     }
@@ -3675,10 +4996,10 @@ fn shape_add_popup(
     p.text(pos2(x + 6.0, cy), Align2::LEFT_CENTER, crate::i18n::tr("Add:"), Tokens::ui(11.5), t.text_dim);
     let br = Rect::from_center_size(pos2(x + 40.0, cy), vec2(16.0, 16.0));
     let resp =
-        ui.interact(br, egui::Id::new(("tl-shapeadd", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Add a shape, fill, stroke or path operation"));
+        ui.interact(br, egui::Id::unique(("tl-shapeadd", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Add a shape, fill, stroke or path operation"));
     icons::paint(p, br.shrink(3.0), Icon::ChevronRight, if resp.hovered() { t.text } else { t.text_dim });
     app.auto.add(&format!("timeline.group.{uid}.add"), br, "Add:");
-    let pop = egui::Id::new(("tl-shapeadd-pop", uid));
+    let pop = egui::Id::unique(("tl-shapeadd-pop", uid));
     if resp.clicked() {
         widgets::open_popup(ui, pop);
     }
@@ -3700,17 +5021,16 @@ fn shape_add_popup(
 }
 
 /// The Text group's "Animate:" and an animator's "Add:" pop-up menus (AE's twirl-down menus).
-#[allow(clippy::too_many_arguments)]
 fn text_anim_popups(
     app: &mut EffectcraftApp,
     ui: &mut egui::Ui,
     p: &egui::Painter,
     layer: &Layer,
     uid: u64,
-    x: f32,
-    cy: f32,
+    at: Pos2,
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
+    let (x, cy) = (at.x, at.y);
     use effectcraft_engine::project::build::TEXT_ANIMATOR_KINDS;
     if !matches!(layer.source, LayerSource::Text) {
         return;
@@ -3724,14 +5044,14 @@ fn text_anim_popups(
     };
     p.text(pos2(x + 6.0, cy), Align2::LEFT_CENTER, label, Tokens::ui(11.5), t.text_dim);
     let br = Rect::from_center_size(pos2(x + 6.0 + if key == "add" { 34.0 } else { 62.0 }, cy), vec2(16.0, 16.0));
-    let resp = ui.interact(br, egui::Id::new(("tl-textanim", uid)), Sense::click()).on_hover_text(if key == "add" {
+    let resp = ui.interact(br, egui::Id::unique(("tl-textanim", uid)), Sense::click()).on_hover_text(if key == "add" {
         "Add property or selector"
     } else {
         "Animate text"
     });
     icons::paint(p, br.shrink(3.0), Icon::ChevronRight, if resp.hovered() { t.text } else { t.text_dim });
     app.auto.add(&format!("timeline.group.{uid}.{key}"), br, label);
-    let pop = egui::Id::new(("tl-textanim-pop", uid));
+    let pop = egui::Id::unique(("tl-textanim-pop", uid));
     if resp.clicked() {
         widgets::open_popup(ui, pop);
     }
@@ -3823,7 +5143,7 @@ fn prop_menu(
 ) {
     let (l, uid) = (layer.id.0, prop.uid);
     let mut item = |ui: &mut egui::Ui, key: &str, label: &str, selected: bool, cmd: &str, params: serde_json::Value| {
-        let resp = ui.add(egui::Button::new(label).selected(selected));
+        let resp = ui.add(egui::Button::new(crate::i18n::context_item(cmd, &params, label)).selected(selected));
         auto.add(&format!("timeline.prop.{uid}.menu.{key}"), resp.rect, label);
         if resp.clicked() {
             actions.push((cmd.into(), params));
@@ -3866,18 +5186,25 @@ fn collapse_applies(layer: &Layer, project: &effectcraft_engine::project::Projec
     }
 }
 
-/// Which Create ▸ conversions the layer context menu offers, from the targeted layer's kind.
+/// Which Create ▸ conversions and Reveal ▸ actions the layer context menu offers, from the
+/// targeted layer's kind.
 #[derive(Clone, Copy, Default)]
 pub(crate) struct LayerMenuCaps {
     /// SVG / PDF / AI / EPS footage: Create Shapes from Vector Layer.
     pub vector: bool,
     /// A text layer: Create Shapes from Text / Create Masks from Text.
     pub text: bool,
+    /// The layer has a source item to reveal in the Project panel.
+    pub source: bool,
 }
 
 impl LayerMenuCaps {
     pub(crate) fn of(project: &effectcraft_engine::project::Project, layer: &Layer) -> Self {
-        Self { vector: vector_footage_layer(project, layer), text: matches!(layer.source, LayerSource::Text) }
+        Self {
+            vector: vector_footage_layer(project, layer),
+            text: matches!(layer.source, LayerSource::Text),
+            source: layer.source.item().is_some_and(|item| project.item(item).is_some()),
+        }
     }
 }
 
@@ -3890,6 +5217,7 @@ fn layer_context_menu(
     layer: &Layer,
     selected: &[LayerId],
     caps: LayerMenuCaps,
+    auto: &mut crate::automation::Registry,
     actions: &mut Vec<(String, serde_json::Value)>,
 ) {
     let in_selection = selected.contains(&layer.id);
@@ -3897,14 +5225,30 @@ fn layer_context_menu(
         actions.push(("layer.select".into(), json!({"layers": [layer.id.0]})));
     }
     let targets: Vec<u64> = if in_selection { comp.layers.iter().filter(|l| selected.contains(&l.id)).map(|l| l.id.0).collect() } else { vec![layer.id.0] };
-    crate::widgets::context_menu(resp, |ui| layer_menu(ui, &targets, caps, actions));
+    // The menu acts on the whole selection: offer Reveal when any target has a source, even if
+    // the layer under the pointer is a text, shape or null layer.
+    let any_source = targets.iter().any(|id| comp.layer(LayerId(*id)).is_some_and(|l| l.source.item().is_some()));
+    let caps = LayerMenuCaps { source: caps.source || any_source, ..caps };
+    crate::widgets::context_menu(resp, |ui| layer_menu(ui, &targets, caps, (auto, "timeline.layerMenu"), actions));
 }
 
-/// Shared layer actions for Timeline rows and Composition context menus.
-pub(crate) fn layer_menu(ui: &mut egui::Ui, layers: &[u64], caps: LayerMenuCaps, actions: &mut Vec<(String, serde_json::Value)>) {
+/// The layer switches the layer context menus toggle (After Effects lists them after Time):
+/// `layer.setSwitch` name and label.
+const MENU_SWITCHES: [(&str, &str); 1] = [("guide", "Guide Layer")];
+
+/// Shared layer actions for Timeline rows and Composition context menus. `auto` is the automation
+/// registry and the id prefix of the menu's items.
+pub(crate) fn layer_menu(
+    ui: &mut egui::Ui,
+    layers: &[u64],
+    caps: LayerMenuCaps,
+    auto: (&mut crate::automation::Registry, &str),
+    actions: &mut Vec<(String, serde_json::Value)>,
+) {
     let Some(&id) = layers.first() else { return };
+    let (auto, prefix) = auto;
     let mut item = |ui: &mut egui::Ui, label: &str, cmd: &str, params: serde_json::Value| {
-        if ui.button(label).clicked() {
+        if ui.button(crate::i18n::context_item(cmd, &params, label)).clicked() {
             actions.push(("layer.select".into(), json!({"layers": layers})));
             actions.push((cmd.into(), params));
             ui.close();
@@ -3912,7 +5256,7 @@ pub(crate) fn layer_menu(ui: &mut egui::Ui, layers: &[u64], caps: LayerMenuCaps,
     };
     ui.menu_button(crate::i18n::tr("New"), |ui| {
         item(ui, "Text", "layer.newText", json!({}));
-        item(ui, "Solid…", "app.solidSettings", json!({}));
+        item(ui, "Solid…", "layer.newSolid", json!({}));
         item(ui, "Light…", "layer.newLight", json!({}));
         item(ui, "Camera…", "layer.newCamera", json!({}));
         item(ui, "Null Object", "layer.newNull", json!({}));
@@ -3920,6 +5264,9 @@ pub(crate) fn layer_menu(ui: &mut egui::Ui, layers: &[u64], caps: LayerMenuCaps,
         item(ui, "Adjustment Layer", "layer.newAdjustment", json!({}));
     });
     item(ui, "Layer Settings…", "layer.settings", json!({}));
+    if caps.source {
+        item(ui, "Reveal Layer Source in Project", "layer.revealSource", json!({"layers": layers}));
+    }
     if caps.vector {
         item(ui, "Create Shapes from Vector Layer", "layer.create", json!({"op": "shapesFromVector", "layers": layers}));
     }
@@ -3943,13 +5290,25 @@ pub(crate) fn layer_menu(ui: &mut egui::Ui, layers: &[u64], caps: LayerMenuCaps,
         item(ui, "Time-Reverse Layer", "layer.timeReverse", json!({"layers": layers}));
         item(ui, "Time Stretch…", "layer.timeStretch", json!({}));
         item(ui, "Freeze Frame", "layer.freezeFrame", json!({"layers": layers}));
-        item(ui, "Freeze on Last Frame", "layer.freezeOnLastFrame", json!({"layers": layers}));
+        item(ui, "Freeze On Last Frame", "layer.freezeOnLastFrame", json!({"layers": layers}));
     });
     ui.menu_button(crate::i18n::tr("Markers"), |ui| {
         item(ui, "Add Marker", "layer.addMarker", json!({"layers": layers}));
     });
+    // A click toggles the switch on the target layers, as Layer ▸ Guide Layer does.
+    // (Pushed after the other items: `item` holds `actions` until its last use.)
+    let mut switch_actions: Vec<(String, serde_json::Value)> = Vec::new();
+    for (switch, label) in MENU_SWITCHES {
+        let response = ui.button(crate::i18n::tr(label));
+        auto.add(&format!("{prefix}.switch.{switch}"), response.rect, label);
+        if response.clicked() {
+            switch_actions.push(("layer.select".into(), json!({"layers": layers})));
+            switch_actions.push(("layer.setSwitch".into(), json!({"layers": layers, "switch": switch})));
+            ui.close();
+        }
+    }
     ui.menu_button(crate::i18n::tr("Blending Mode"), |ui| {
-        widgets::menu_scroll(ui, |ui| {
+        widgets::menu_scroll(ui, false, |ui| {
             for m in BlendMode::ALL {
                 item(ui, m.label(), "layer.setBlendMode", json!({"layers": layers, "mode": m.label()}));
                 if m.ends_group() {
@@ -3971,6 +5330,7 @@ pub(crate) fn layer_menu(ui: &mut egui::Ui, layers: &[u64], caps: LayerMenuCaps,
     item(ui, "Duplicate", "edit.duplicate", json!({"layers": layers}));
     item(ui, "Split Layer", "edit.splitLayer", json!({"layers": layers}));
     item(ui, "Delete", "edit.clear", json!({"layers": layers}));
+    actions.extend(switch_actions);
 }
 
 /// The layer context menu's Layer Styles submenu, matching the Layer ▸ Layer Styles application menu.
@@ -4009,11 +5369,11 @@ fn effects_submenu(ui: &mut egui::Ui, layers: &[u64], item: &mut dyn FnMut(&mut
         }
     }
     cats.sort_by_key(|(c, _)| c.to_ascii_lowercase());
-    widgets::menu_scroll(ui, |ui| {
+    widgets::menu_scroll(ui, false, |ui| {
         for (cat, mut fx) in cats {
             fx.sort_by_key(|e| e.name.to_ascii_lowercase());
-            ui.menu_button(cat, |ui| {
-                widgets::menu_scroll(ui, |ui| {
+            ui.menu_button(crate::i18n::effects::category(cat), |ui| {
+                widgets::menu_scroll(ui, false, |ui| {
                     for e in fx {
                         item(ui, e.name, "effect.apply", json!({"effect": e.id, "layers": layers}));
                     }
@@ -4027,573 +5387,270 @@ fn fmt_num(v: f64, d: usize) -> String {
     format!("{v:.d$}")
 }
 
-/// Inline value editor for a property row; pushes `prop.set` actions. Returns the rects of a
-/// multi-dimension value's fields, one per dimension (none for other values).
-fn value_editor(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    p: &egui::Painter,
-    layer: &Layer,
-    prop: &Property,
-    value: &Value,
+/// What the property value editors share: where to draw, what they edit, and how a change is
+/// worded as a `prop.set` command.
+struct ValueEdit<'a> {
+    p: &'a egui::Painter,
+    layer: &'a Layer,
+    prop: &'a Property,
     at: Pos2,
-    actions: &mut Vec<(String, serde_json::Value)>,
-) -> Vec<Rect> {
-    let t = app.tokens;
-    let uid = prop.uid;
-    let mut dims = vec![];
-    let merge = format!("scrub-{uid}");
-    // With several layers selected the edit applies to all of them (#491): a scrub by the same
-    // change, a typed value as it is.
-    let scrub = ui.ctx().dragged_id().is_some() && ui.input(|i| i.pointer.is_decidedly_dragging());
-    // Proportional Scrubbing (After Effects 26.2): Ctrl+Alt (Cmd+Opt) spreads the change over the
-    // selected layers by selection order, the first unchanged and the last by all of it.
-    let proportional = scrub && ui.input(|i| widgets::proportional_scrub(i.modifiers));
-    let set = |actions: &mut Vec<(String, serde_json::Value)>, v: serde_json::Value| {
+    uid: u64,
+    merge: String,
+    scrub: bool,
+    proportional: bool,
+}
+
+impl<'a> ValueEdit<'a> {
+    /// The editor of `prop` on `layer` at `at`; `ui` says whether a scrub is under way.
+    fn new(ui: &egui::Ui, p: &'a egui::Painter, layer: &'a Layer, prop: &'a Property, at: Pos2) -> Self {
+        let uid = prop.uid;
+        // With several layers selected the edit applies to all of them (#491): a scrub by the same
+        // change, a typed value as it is.
+        let scrub = ui.ctx().dragged_id().is_some() && ui.input(|i| i.pointer.is_decidedly_dragging());
+        // Proportional Scrubbing (After Effects 26.2): Ctrl+Alt (Cmd+Opt) spreads the change over the
+        // selected layers by selection order, the first unchanged and the last by all of it.
+        let proportional = scrub && ui.input(|i| widgets::proportional_scrub(i.modifiers));
+        Self { p, layer, prop, at, uid, merge: format!("scrub-{uid}"), scrub, proportional }
+    }
+
+    /// Queues the `prop.set` of one edit.
+    fn set(&self, actions: &mut Vec<(String, serde_json::Value)>, v: serde_json::Value) {
         actions.push((
             "prop.set".into(),
-            json!({"layer": layer.id.0, "prop": uid, "value": v, "merge": merge, "selected": true, "offset": scrub, "proportional": proportional}),
+            json!({"layer": self.layer.id.0, "prop": self.uid, "value": v, "merge": self.merge, "selected": true, "offset": self.scrub, "proportional": self.proportional}),
         ))
-    };
-    let is_3d = layer.is_3d();
-    let mut x = at.x;
-    let y = at.y - 9.0;
+    }
+}
+
+/// Inline value editor for a property row; pushes `prop.set` actions. Returns the rects of a
+/// multi-dimension value's fields, one per dimension (none for other values).
+fn value_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, value: &Value, actions: &mut Vec<(String, serde_json::Value)>) -> Vec<Rect> {
     match value {
-        Value::Scalar(v) => {
-            let (min, max, dec, speed) = match &prop.ui {
-                ParamUi::Slider { min, max, decimals, .. } => (*min, *max, *decimals as usize, ((max - min) / 400.0).clamp(0.01, 10.0)),
-                ParamUi::Percent => (-1e6, 1e6, 1, 0.5),
-                _ => (-1e9, 1e9, 1, 1.0),
-            };
-            if matches!(prop.ui, ParamUi::Angle) {
-                let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(x, y), egui::Id::new(("v", uid, 0)), *v, 1, &t);
-                app.auto.add(&format!("timeline.prop.{uid}.value"), dr, &prop.name);
-                app.auto.add(&format!("timeline.prop.{uid}.revolutions"), rr, &prop.name);
-                if let Some(nv) = nv {
-                    set(actions, json!(nv));
-                }
-            } else {
-                let suffix = if matches!(prop.ui, ParamUi::Percent) || prop.match_id == "opacity" { "%" } else { "" };
-                let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::new(("v", uid, 0)), *v, speed, (min, max), dec.max(1), suffix, &t);
-                app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
-                if let Some(nv) = nv {
-                    set(actions, json!(nv));
-                }
-            }
-        }
-        Value::Vec2(_) | Value::Vec3(_) => {
-            let c = value.components();
-            let n = if prop.shown_dims > 0 && !(is_3d && c.len() == 3) { prop.shown_dims as usize } else { c.len() };
-            let pct = matches!(prop.ui, ParamUi::Percent);
-            // Mask Feather: two linked values, never negative (as in After Effects, #203).
-            let feather = prop.match_id == "feather" && layer.props.parent_of(uid).is_some_and(|g| matches!(g.kind, GroupKind::Mask { .. }));
-            let range = if feather { (0.0, 1e9) } else { (-1e9, 1e9) };
-            // Scale and Mask Feather: the chain link (Constrain Proportions, on by default).
-            let linkable = feather || (pct && prop.match_id == "scale");
-            let linked = linkable && !app.ui.timeline.unlinked.contains(&uid);
-            if linkable {
-                let lr = Rect::from_center_size(pos2(x + 7.0, at.y), vec2(14.0, 14.0));
-                let resp = ui.interact(lr, egui::Id::new(("tl-link", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Constrain Proportions"));
-                icons::paint(p, lr, Icon::Link, if linked { t.accent } else { t.text_faint });
-                app.auto.add(&format!("timeline.prop.{uid}.link"), lr, "Constrain Proportions");
-                if resp.clicked() && !app.ui.timeline.unlinked.remove(&uid) {
-                    app.ui.timeline.unlinked.insert(uid);
-                }
-                x += 18.0;
-            }
-            for d in 0..n.min(c.len()) {
-                let suffix = if pct && d + 1 == n { "%" } else { "" };
-                let (r, nv, _) = widgets::hot_number_at(ui, pos2(x, y), egui::Id::new(("v", uid, d)), c[d], if pct { 0.5 } else { 1.0 }, range, 1, suffix, &t);
-                app.auto.add(&format!("timeline.prop.{uid}.value.{d}"), r, &prop.name);
-                dims.push(r);
-                if let Some(nv) = nv {
-                    let mut nc = c.clone();
-                    // Alt edits one value of a linked pair (Ctrl+Alt is a proportional scrub).
-                    let shown = if linked && !ui.input(|i| i.modifiers.alt && !widgets::proportional_scrub(i.modifiers)) { n.min(c.len()) } else { 1 };
-                    let from = if shown == 1 { d } else { 0 };
-                    for (e, v) in widgets::constrained(c.get(from..from + shown).unwrap_or_default(), d - from, nv).into_iter().enumerate() {
-                        if let Some(slot) = nc.get_mut(from + e) {
-                            *slot = v;
-                        }
-                    }
-                    set(actions, json!(nc));
-                }
-                x = r.max.x + if d + 1 < n { 2.0 } else { 0.0 };
-                if d + 1 < n {
-                    p.text(pos2(x, at.y), Align2::LEFT_CENTER, ",", Tokens::ui(12.0), t.hot_text);
-                    x += 6.0;
-                }
-            }
-        }
-        Value::Color(c) => {
-            let r = Rect::from_min_size(pos2(x, at.y - 7.0), vec2(26.0, 14.0));
-            let resp = widgets::swatch(ui, r, [c[0] as f32, c[1] as f32, c[2] as f32, 1.0], egui::Id::new(("sw", uid)), &t);
-            app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
-            let pop = egui::Id::new(("cpop", uid));
-            if resp.clicked() {
-                widgets::open_popup(ui, pop);
-            }
-            // The eyedropper after the swatch samples the Composition panel (shape Fill and
-            // Stroke colours, text and effect colours), as in After Effects' Timeline (#633).
-            let er = Rect::from_center_size(pos2(r.max.x + 12.0, at.y), vec2(16.0, 16.0));
-            let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "color");
-            if super::fx_widgets::eyedropper_button(ui, er, active, egui::Id::new(("tl-eye", uid)), &t)
-                .on_hover_text(crate::i18n::tr("Eyedropper: click, then click in the Composition panel"))
-                .clicked()
-            {
-                super::effect_controls::toggle_pick(app, "color", layer, prop);
-            }
-            app.auto.add(&format!("timeline.prop.{uid}.eyedropper"), er, &prop.name);
-            let mut rgb = [c[0] as f32, c[1] as f32, c[2] as f32];
-            if crate::widgets::color_popup(ui, pop, r.left_bottom(), &mut rgb) {
-                set(actions, json!([rgb[0], rgb[1], rgb[2], 1.0]));
-            }
-        }
-        Value::Bool(b) => {
-            let r = Rect::from_min_size(pos2(x, at.y - 8.0), vec2(16.0, 16.0));
-            if widgets::checkbox(ui, r, *b, &t, egui::Id::new(("cb", uid))).clicked() {
-                set(actions, json!(!b));
-            }
-            app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
-        }
-        Value::Enum(i) => {
-            // Text Path Options ▸ Path lists the layer's masks.
-            let mask_opts: Option<Vec<String>> = layer
-                .props
-                .prop("text/pathOptions/path")
-                .filter(|q| q.uid == uid)
-                .map(|_| std::iter::once("None".to_string()).chain(layer.masks().into_iter().flat_map(|m| m.groups().map(|g| g.name.clone()))).collect());
-            let ui_opts = mask_opts.map(|options| ParamUi::Popup { options });
-            if let ParamUi::Popup { options } = ui_opts.as_ref().unwrap_or(&prop.ui) {
-                let r = Rect::from_min_size(pos2(x, at.y - 9.0), vec2(150.0, 18.0));
-                let label = options.get(*i as usize).cloned().unwrap_or_default();
-                let pop = egui::Id::new(("epop", uid));
-                if widgets::dropdown(ui, r, &label, &t, egui::Id::new(("en", uid))).clicked() {
-                    widgets::open_popup(ui, pop);
-                }
-                app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
-                if let Some(ni) = widgets::popup_menu(ui, pop, r.left_bottom(), options, Some(*i as usize)) {
-                    set(actions, json!(ni));
-                }
-            } else {
-                p.text(pos2(x, at.y), Align2::LEFT_CENTER, fmt_num(*i as f64, 0), Tokens::ui(12.0), t.hot_text);
-            }
-        }
+        Value::Scalar(_) => scalar_editor(app, ui, ve, actions, value),
+        Value::Vec2(_) | Value::Vec3(_) => return vector_editor(app, ui, ve, actions, value),
+        Value::Color(_) => color_editor(app, ui, ve, actions, value),
+        Value::Bool(_) => bool_editor(app, ui, ve, actions, value),
+        Value::Enum(_) => enum_editor(app, ui, ve, actions, value),
+        Value::Layer(_) => layer_editor(app, ui, ve, actions, value),
+        Value::Gradient(_) => gradient_editor(app, ui, ve, actions),
         Value::Path(_) => {
-            p.text(pos2(x, at.y), Align2::LEFT_CENTER, crate::i18n::tr("Shape…"), Tokens::ui(12.0), t.hot_text);
+            ve.p.text(pos2(ve.at.x, ve.at.y), Align2::LEFT_CENTER, crate::i18n::tr("Shape…"), Tokens::ui(12.0), app.tokens.hot_text);
         }
         Value::Text(_) => {}
-        Value::Layer(l) => {
-            p.text(
-                pos2(x, at.y),
-                Align2::LEFT_CENTER,
-                l.map(|l| crate::i18n::tr_args("Layer {}", &[&l])).unwrap_or(crate::i18n::tr("None").into()),
-                Tokens::ui(12.0),
-                t.hot_text,
-            );
-        }
-        Value::Gradient(_) => {
-            // Opens the Gradient Editor at the current time (#612).
-            let r = p.text(pos2(x, at.y), Align2::LEFT_CENTER, crate::i18n::tr("Edit Gradient…"), Tokens::ui(12.0), t.hot_text);
-            let resp = ui.interact(r.expand(2.0), egui::Id::new(("gradient-edit", uid)), Sense::click());
-            if resp.hovered() {
-                ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand);
-            }
-            app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
-            if resp.clicked() {
-                actions.push(("prop.editGradient".into(), json!({"layer": layer.id.0, "prop": uid})));
-            }
-        }
         Value::Str(s) => {
-            p.text(pos2(x, at.y), Align2::LEFT_CENTER, s.chars().take(30).collect::<String>(), Tokens::ui(12.0), t.text_dim);
+            ve.p.text(pos2(ve.at.x, ve.at.y), Align2::LEFT_CENTER, s.chars().take(30).collect::<String>(), Tokens::ui(12.0), app.tokens.text_dim);
+        }
+    }
+    Vec::new()
+}
+
+/// A number: scrubbable hot text, or the angle field.
+fn scalar_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) {
+    let Value::Scalar(v) = value else { return };
+    let (layer, prop, at, uid) = (ve.layer, ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let (x, y) = (at.x, at.y - 9.0);
+    let (min, max, dec, speed) = match &prop.ui {
+        ParamUi::Slider { min, max, decimals, .. } => (*min, *max, *decimals as usize, widgets::slider_scrub_speed(&prop.ui)),
+        ParamUi::Percent => (-1e6, 1e6, 1, 0.5),
+        _ => (-1e9, 1e9, 1, 1.0),
+    };
+    if matches!(prop.ui, ParamUi::Angle) {
+        let (rr, dr, nv) = super::fx_widgets::angle_field(ui, pos2(x, y), egui::Id::unique(("v", uid, 0)), *v, 1, &t);
+        app.auto.add(&format!("timeline.prop.{uid}.value"), dr, &prop.name);
+        app.auto.add(&format!("timeline.prop.{uid}.revolutions"), rr, &prop.name);
+        if let Some(nv) = nv {
+            ve.set(actions, json!(nv));
+        }
+    } else {
+        // A Range Selector's Start, End and Offset count characters with Units = Index (#1814).
+        let pct = (matches!(prop.ui, ParamUi::Percent) || prop.match_id == "opacity") && !effectcraft_engine::render::text::in_index_units(layer, uid);
+        let suffix = if pct { "%" } else { "" };
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x, y),
+            egui::Id::unique(("v", uid, 0)),
+            *v,
+            &widgets::HotSpec { speed, range: (min, max), decimals: dec.max(1), suffix },
+            &t,
+        );
+        app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+        if let Some(nv) = nv {
+            ve.set(actions, json!(nv));
+        }
+    }
+}
+
+/// A multi-dimension value: one hot-text field per dimension, with the link chain. Returns their rects.
+fn vector_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) -> Vec<Rect> {
+    let (p, layer, prop, at, uid) = (ve.p, ve.layer, ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let (mut x, y) = (at.x, at.y - 9.0);
+    let is_3d = layer.is_3d();
+    let mut dims = vec![];
+    let c = value.components();
+    let n = if prop.shown_dims > 0 && !(is_3d && c.len() == 3) { prop.shown_dims as usize } else { c.len() };
+    let pct = matches!(prop.ui, ParamUi::Percent);
+    // Mask Feather: two linked values, never negative (as in After Effects, #203).
+    let feather = prop.match_id == "feather" && layer.props.parent_of(uid).is_some_and(|g| matches!(g.kind, GroupKind::Mask { .. }));
+    let range = if feather { (0.0, 1e9) } else { (-1e9, 1e9) };
+    // Scale and Mask Feather: the chain link (Constrain Proportions, on by default).
+    let linkable = feather || (pct && prop.match_id == "scale");
+    let linked = linkable && !app.ui.timeline.unlinked.contains(&uid);
+    if linkable {
+        let lr = Rect::from_center_size(pos2(x + 7.0, at.y), vec2(14.0, 14.0));
+        let resp = ui.interact(lr, egui::Id::unique(("tl-link", uid)), Sense::click()).on_hover_text(crate::i18n::tr("Constrain Proportions"));
+        icons::paint(p, lr, Icon::Link, if linked { t.accent } else { t.text_faint });
+        app.auto.add(&format!("timeline.prop.{uid}.link"), lr, "Constrain Proportions");
+        if resp.clicked() && !app.ui.timeline.unlinked.remove(&uid) {
+            app.ui.timeline.unlinked.insert(uid);
+        }
+        x += 18.0;
+    }
+    for d in 0..n.min(c.len()) {
+        let suffix = if pct && d + 1 == n { "%" } else { "" };
+        let (r, nv, _) = widgets::hot_number_at(
+            ui,
+            pos2(x, y),
+            egui::Id::unique(("v", uid, d)),
+            c[d],
+            &widgets::HotSpec { speed: if pct { 0.5 } else { 1.0 }, range, decimals: 1, suffix },
+            &t,
+        );
+        app.auto.add(&format!("timeline.prop.{uid}.value.{d}"), r, &prop.name);
+        dims.push(r);
+        if let Some(nv) = nv {
+            let mut nc = c.clone();
+            // Alt edits one value of a linked pair (Ctrl+Alt is a proportional scrub).
+            let shown = if linked && !ui.input(|i| i.modifiers.alt && !widgets::proportional_scrub(i.modifiers)) { n.min(c.len()) } else { 1 };
+            let from = if shown == 1 { d } else { 0 };
+            for (e, v) in widgets::constrained(c.get(from..from + shown).unwrap_or_default(), d - from, nv).into_iter().enumerate() {
+                if let Some(slot) = nc.get_mut(from + e) {
+                    *slot = v;
+                }
+            }
+            ve.set(actions, json!(nc));
+            // Typed into these components only: other selected layers keep the rest of
+            // their own value (#1434).
+            if let Some((_, a)) = actions.last_mut() {
+                a["dims"] = json!((from..from + shown).collect::<Vec<_>>());
+            }
+        }
+        x = r.max.x + if d + 1 < n { 2.0 } else { 0.0 };
+        if d + 1 < n {
+            p.text(pos2(x, at.y), Align2::LEFT_CENTER, ",", Tokens::ui(12.0), t.hot_text);
+            x += 6.0;
         }
     }
     dims
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Alt/Cmd-click twirls Audio's Waveform row (not in the property tree) with the rest.
-    #[test]
-    fn the_waveform_row_twirls_with_its_tree() {
-        let mut root = PropGroup::new(1, "", "");
-        let mut audio = PropGroup::new(2, "audio", "Audio");
-        audio.children.push(PropGroup::new(3, "x", "X").into());
-        root.children.push(audio.into());
-        let mut uids = vec![];
-        walk_groups(&root, &mut uids);
-        assert_eq!(uids, vec![2, WAVE_BIT | 2, 3]);
-        let mut uids = vec![];
-        walk_groups(find_group(&root, 2).unwrap(), &mut uids);
-        assert_eq!(uids, vec![WAVE_BIT | 2, 3]);
+/// A colour: swatch, eyedropper and picker.
+fn color_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) {
+    let Value::Color(c) = value else { return };
+    let (layer, prop, at, uid) = (ve.layer, ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let x = at.x;
+    let r = Rect::from_min_size(pos2(x, at.y - 7.0), vec2(26.0, 14.0));
+    let resp = widgets::swatch(ui, r, [c[0] as f32, c[1] as f32, c[2] as f32, 1.0], egui::Id::unique(("sw", uid)), &t);
+    app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+    let pop = egui::Id::unique(("cpop", uid));
+    if resp.clicked() {
+        widgets::open_popup(ui, pop);
     }
-
-    /// #710: with Time Display set to Frames the ruler labels are frame numbers (as under the
-    /// CTI, from Start Numbering Frames At); otherwise seconds:frames.
-    #[test]
-    fn ruler_labels_follow_the_time_display_style() {
-        use effectcraft_engine::project::{ProjectSettings, TimeDisplayStyle};
-        let mut st = ProjectSettings { time_display: TimeDisplayStyle::Timecode, frame_start: 0, ..ProjectSettings::default() };
-        assert_eq!(ruler_label(15, 30, &st), "00:15f");
-        assert_eq!(ruler_label(45, 30, &st), "01:15f");
-        assert_eq!(ruler_label(30 * 3600 + 31, 30, &st), "60:01:01f");
-        st.time_display = TimeDisplayStyle::Frames;
-        assert_eq!(ruler_label(0, 30, &st), "00000");
-        assert_eq!(ruler_label(45, 30, &st), "00045");
-        st.frame_start = 1;
-        assert_eq!(ruler_label(45, 30, &st), "00046");
-        assert_eq!(ruler_label(i64::MAX, 30, &st), format!("{:05}", i64::MAX));
+    // The eyedropper after the swatch samples the Composition panel (shape Fill and
+    // Stroke colours, text and effect colours), as in After Effects' Timeline (#633).
+    let er = Rect::from_center_size(pos2(r.max.x + 12.0, at.y), vec2(16.0, 16.0));
+    let active = app.ui.fx_pick.as_ref().is_some_and(|k| k.prop == uid && k.kind == "color");
+    if super::fx_widgets::eyedropper_button(ui, er, active, egui::Id::unique(("tl-eye", uid)), &t)
+        .on_hover_text(crate::i18n::tr("Eyedropper: click, then click in the Composition panel"))
+        .clicked()
+    {
+        super::effect_controls::toggle_pick(app, "color", layer, prop);
     }
-
-    /// #468: playback pages the view to the CTI; a scrub past either end scrolls that way.
-    #[test]
-    fn the_view_pages_to_the_cti() {
-        assert_eq!(page_to_cti(10.0, 5.0, 60.0, 12.0), 10.0, "in view: unchanged");
-        assert_eq!(page_to_cti(10.0, 5.0, 60.0, 16.0), 16.0, "past the right end: the page from the CTI");
-        assert_eq!(page_to_cti(10.0, 5.0, 60.0, 3.0), 3.0, "before the start");
-        assert_eq!(page_to_cti(10.0, 5.0, 60.0, 58.0), 55.0, "not past the comp's end");
-        assert_eq!(page_to_cti(10.0, 80.0, 60.0, 95.0), 0.0);
-        assert_eq!(page_to_cti(10.0, f64::NAN, 60.0, 95.0), 10.0);
-        assert_eq!(edge_scroll_speed_x(100.0, 500.0, 300.0), 0.0);
-        assert!(edge_scroll_speed_x(100.0, 500.0, 501.0) > 0.0 && edge_scroll_speed_x(100.0, 500.0, 99.0) < 0.0);
-        assert!(edge_scroll_speed_x(100.0, 500.0, 600.0) > edge_scroll_speed_x(100.0, 500.0, 520.0));
-    }
-
-    /// #864: picking only a mode in a layer's Track Matte menu sets a matte (the layer above);
-    /// it used to close the menu and change nothing.
-    #[test]
-    fn a_track_matte_mode_without_a_matte_takes_the_layer_above() {
-        let mut s = effectcraft_engine::Session::default();
-        s.execute("comp.new", json!({"name": "T", "width": 64, "height": 64, "duration": 1})).unwrap();
-        for name in ["Chain Bottom", "Matte", "Chain Top"] {
-            s.execute("layer.newSolid", json!({"name": name, "color": "#ffffff", "width": 64, "height": 64})).unwrap();
-        }
-        let find = |s: &effectcraft_engine::Session, n: &str| s.active_comp().unwrap().layers.iter().find(|l| l.name == n).unwrap().clone();
-        let (bottom, matte, top) = (find(&s, "Chain Bottom"), find(&s, "Matte"), find(&s, "Chain Top"));
-        let candidates = [top.id, matte.id];
-        let pick = |s: &mut effectcraft_engine::Session, name: &str, i: usize, choice: &str| {
-            let (id, params) = track_matte_pick(&find(s, name), &candidates, i, choice).expect("a menu item is an action");
-            s.execute(&id, params)
-        };
-        pick(&mut s, "Chain Bottom", 5, "Alpha Inverted Matte").unwrap();
-        let m = find(&s, "Chain Bottom").track_matte.expect("a matte");
-        assert_eq!((m.layer, m.kind), (matte.id, MatteKind::AlphaInverted));
-        assert!(!find(&s, "Matte").switches.video, "the matte layer is hidden");
-        // A mode change keeps the matte layer; a matte change keeps the mode.
-        pick(&mut s, "Chain Bottom", 6, "Luma Matte").unwrap();
-        assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| (m.layer, m.kind)), Some((matte.id, MatteKind::Luma)));
-        pick(&mut s, "Chain Bottom", 2, "1. Chain Top").unwrap();
-        assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| (m.layer, m.kind)), Some((top.id, MatteKind::Luma)));
-        assert!(s.undo());
-        assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| m.layer), Some(matte.id), "one undo step per pick");
-        // The top layer has nothing above it: an error for the status bar, not a silent no-op.
-        assert!(pick(&mut s, "Chain Top", 5, "Alpha Matte").is_err());
-        pick(&mut s, "Chain Bottom", 0, "No Track Matte").unwrap();
-        assert!(find(&s, "Chain Bottom").track_matte.is_none());
-        assert!(track_matte_pick(&bottom, &candidates, 1, "-").is_none(), "a separator does nothing");
-    }
-
-    /// #957: vector footage gets the Continuously Rasterize switch; raster footage does not.
-    #[test]
-    fn collapse_switch_shows_for_vector_footage_only() {
-        use effectcraft_engine::color::Label;
-        use effectcraft_engine::project::{Footage, ItemKind, Project};
-        let mut p = Project::default();
-        let mut layer_for = |name: &str, codec: &str| {
-            let footage = Footage { path: name.into(), codec: codec.into(), ..Default::default() };
-            let item = p.add_item(name, Label::SeaFoam, None, ItemKind::Footage(footage));
-            let comp = Comp::new(64, 36, effectcraft_engine::time::FrameRate::new(30, 1), Tick::from_seconds_f64(1.0));
-            effectcraft_engine::project::build::layer(&mut p, &comp, name, LayerSource::Footage { item }, (0, 0), None)
-        };
-        let svg = layer_for("logo.svg", "SVG");
-        let png = layer_for("photo.png", "PNG");
-        assert!(collapse_applies(&svg, &p));
-        assert!(!collapse_applies(&png, &p));
-    }
-
-    /// A comp with two solids; "Box" has an animated Position and a Gaussian Blur.
-    fn app() -> EffectcraftApp {
-        let mut s = effectcraft_engine::Session::default();
-        s.execute("comp.new", json!({"name": "T", "width": 320, "height": 180, "duration": 4})).unwrap();
-        s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080", "width": 320, "height": 180})).unwrap();
-        s.execute("layer.newSolid", json!({"name": "Box", "color": "#e04020", "width": 40, "height": 40})).unwrap();
-        let comp = s.active_comp().unwrap();
-        let bx = comp.layers.iter().find(|l| l.name == "Box").unwrap().id.0;
-        s.execute("layer.select", json!({"layers": [bx]})).unwrap();
-        s.execute("effect.apply", json!({"effect": "ec.blur.gaussian"})).unwrap();
-        let pos = s.active_comp().unwrap().layer(LayerId(bx)).unwrap().transform().unwrap().get("position").unwrap().uid;
-        s.execute("prop.toggleAnimation", json!({"layer": bx, "prop": pos})).unwrap();
-        EffectcraftApp::new(s)
-    }
-
-    fn labels(app: &EffectcraftApp) -> Vec<String> {
-        let comp = app.session.active_comp().unwrap().clone();
-        build_rows(app, &comp)
-            .into_iter()
-            .map(|r| {
-                let l = comp.layer(r.layer).unwrap();
-                match r.kind {
-                    RowKind::Layer => l.name.clone(),
-                    RowKind::Group { name, .. } => format!("{}>{name}", "  ".repeat(r.depth)),
-                    RowKind::Prop { uid } => format!("{}{}", "  ".repeat(r.depth), l.props.find(uid).unwrap().name),
-                    _ => "?".into(),
-                }
-            })
-            .collect()
-    }
-
-    #[test]
-    fn search_filters_layers_and_reveals_matching_properties() {
-        let mut app = app();
-        app.ui.timeline.search = "opac".into();
-        let rows = labels(&app);
-        // Both layers have Transform > Opacity; nothing else shows.
-        assert_eq!(rows.iter().filter(|r| r.trim() == "Opacity").count(), 2, "{rows:?}");
-        assert!(rows.iter().any(|r| r.trim() == ">Transform"), "{rows:?}");
-        assert!(!rows.iter().any(|r| r.trim() == "Position"), "{rows:?}");
-        // A layer name match shows the layer alone; a group match brings its contents.
-        app.ui.timeline.search = "plate".into();
-        assert_eq!(labels(&app), vec!["Plate".to_string()]);
-        app.ui.timeline.search = "GAUSSIAN".into();
-        let rows = labels(&app);
-        assert_eq!(rows[0], "Box");
-        assert!(rows.iter().any(|r| r.trim() == ">Effects") && rows.iter().any(|r| r.trim() == "Blurriness"), "{rows:?}");
-        assert!(!rows.contains(&"Plate".to_string()));
-        // Nothing matches → no rows.
-        app.ui.timeline.search = "zzz".into();
-        assert!(labels(&app).is_empty());
-        // Through the command.
-        let ctx = egui::Context::default();
-        crate::menus::invoke(&mut app, &ctx, "timeline.search", json!({"query": "scale"})).unwrap();
-        assert!(labels(&app).iter().any(|r| r.trim() == "Scale"));
-    }
-
-    #[test]
-    fn columns_toggle_and_layout() {
-        let mut app = app();
-        let tl = &mut app.ui.timeline;
-        assert!(column_visible(tl, "switches") && !column_visible(tl, "comment") && !column_visible(tl, "modes"));
-        set_column(tl, "comment", true).unwrap();
-        set_column(tl, "stretch", true).unwrap();
-        set_column(tl, "keys", false).unwrap();
-        set_column(tl, "label", false).unwrap();
-        set_column(tl, "modes", true).unwrap();
-        assert!(tl.show_modes && column_visible(tl, "comment") && !column_visible(tl, "label"));
-        assert!(set_column(tl, "name", false).is_err());
-        assert!(set_column(tl, "bogus", true).is_err());
-        let vis = Vis::of(tl);
-        let cw = cols(0.0, 1400.0, vis);
-        // Hidden columns take no room; visible ones are in After Effects' order.
-        assert_eq!(cw.keys, cw.label);
-        assert_eq!(cw.label, cw.num);
-        assert!(cw.name < cw.comment && cw.comment < cw.switches && cw.switches < cw.mode && cw.parent < cw.stretch);
-        assert_eq!(column_at(&cw, cw.comment + 5.0), Some("comment"));
-        assert_eq!(column_at(&cw, cw.name + 5.0), Some("name"));
-        assert_eq!(column_at(&cw, cw.stretch + 5.0), Some("stretch"));
-        // Through the command (as agents do).
-        let ctx = egui::Context::default();
-        let r = crate::menus::invoke(&mut app, &ctx, "timeline.column", json!({"column": "duration"})).unwrap();
-        assert!(r["columns"].as_array().unwrap().iter().any(|c| c == "duration"));
-        crate::menus::invoke(&mut app, &ctx, "timeline.column", json!({"column": "duration", "visible": false})).unwrap();
-        assert!(!column_visible(&app.ui.timeline, "duration"));
-        crate::menus::invoke(&mut app, &ctx, "timeline.sourceName", json!({})).unwrap();
-        assert!(app.ui.timeline.source_name);
-    }
-
-    #[test]
-    fn reveal_keys_add_with_shift_and_uu_reveals_modified() {
-        let mut app = app();
-        let ctx = egui::Context::default();
-        crate::menus::invoke(&mut app, &ctx, "timeline.reveal.opacity", json!({})).unwrap();
-        assert_eq!(app.ui.timeline.reveal, vec!["opacity"]);
-        crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.scale", json!({})).unwrap();
-        crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.effects", json!({})).unwrap();
-        assert_eq!(app.ui.timeline.reveal, vec!["opacity", "scale", "effects"]);
-        let rows = labels(&app);
-        assert!(rows.iter().any(|r| r.trim() == "Scale") && rows.iter().any(|r| r.trim() == "Opacity"), "{rows:?}");
-        assert!(rows.iter().any(|r| r.trim() == ">Gaussian Blur"), "{rows:?}");
-        // Tree order: Scale before Opacity.
-        let si = rows.iter().position(|r| r.trim() == "Scale").unwrap();
-        let oi = rows.iter().position(|r| r.trim() == "Opacity").unwrap();
-        assert!(si < oi);
-        // Shift+S again removes Scale.
-        crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.scale", json!({})).unwrap();
-        assert_eq!(app.ui.timeline.reveal, vec!["opacity", "effects"]);
-        // U: keyframed properties (Position); UU (twice quickly): every modified property.
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        let n_keys = app.ui.timeline.reveal_props.len();
-        assert_eq!(app.ui.timeline.reveal, vec!["props"]);
-        assert!(n_keys >= 1);
-        let bx = app.session.state.selected_layers[0].0;
-        app.session.execute("prop.set", json!({"layer": bx, "path": "effects/#1/blurriness", "value": 12})).unwrap();
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        assert!(app.ui.timeline.reveal_props.len() > n_keys, "UU reveals modified properties too");
-    }
-
-    #[test]
-    fn scroll_to_time_centres_the_current_time_inside_the_comp() {
-        assert_eq!(centered_on(4.0, 10.0, 5.0), 3.0);
-        // Near the ends the view stops at the comp's start and end.
-        assert_eq!(centered_on(4.0, 10.0, 1.0), 0.0);
-        assert_eq!(centered_on(4.0, 10.0, 9.5), 6.0);
-        // A span longer than the comp, and bad numbers, start at zero.
-        assert_eq!(centered_on(20.0, 10.0, 5.0), 0.0);
-        assert_eq!(centered_on(f64::NAN, 10.0, 5.0), 0.0);
-    }
-
-    /// U and the other reveal shortcuts act on the selected layers only: other layers keep their
-    /// twirl state and their own reveal (#160).
-    #[test]
-    fn reveal_shortcuts_leave_unselected_layers_alone() {
-        let mut app = app();
-        let ctx = egui::Context::default();
-        let comp = app.session.active_comp().unwrap().clone();
-        let id = |n: &str| comp.layers.iter().find(|l| l.name == n).unwrap().id.0;
-        let (plate, bx) = (id("Plate"), id("Box"));
-        let select = |app: &mut EffectcraftApp, l: u64| app.session.execute("layer.select", json!({"layers": [l]})).unwrap();
-        // Plate shows Scale (S); then U on Box.
-        select(&mut app, plate);
-        crate::menus::invoke(&mut app, &ctx, "timeline.reveal.scale", json!({})).unwrap();
-        select(&mut app, bx);
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        let tl = &app.ui.timeline;
-        assert!(tl.open_layers.contains(&plate) && tl.open_layers.contains(&bx), "{:?}", tl.open_layers);
-        assert_eq!(tl.layer_reveal.get(&plate), Some(&vec!["scale".to_string()]), "Plate keeps its reveal");
-        assert_eq!(tl.layer_reveal.get(&bx), Some(&vec!["props".to_string()]));
-        let rows = labels(&app);
-        let at = |n: &str| rows.iter().position(|r| r == n).unwrap();
-        assert_eq!(rows[at("Plate") + 1].trim(), "Scale", "{rows:?}");
-        assert_eq!(rows[at("Box") + 1].trim(), "Position", "{rows:?}");
-        // UU (modified): the effect's changed parameter only, under the effect twirled open.
-        // Then U later: Box shows its keyframed properties only again.
-        app.session.execute("prop.set", json!({"layer": bx, "path": "effects/#1/blurriness", "value": 12})).unwrap();
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        let rows = labels(&app);
-        let fx = rows.iter().position(|r| r.trim().ends_with("Gaussian Blur")).unwrap_or_else(|| panic!("UU shows the effect: {rows:?}"));
-        assert_eq!(rows[fx + 1].trim(), "Blurriness", "{rows:?}");
-        assert!(!rows.iter().any(|r| r.trim() == "Blur Dimensions"), "unchanged parameters stay hidden: {rows:?}");
-        // Collapsed and expanded by hand, the effect shows all its parameters; UU filters again.
-        let fx_uid = app.session.active_comp().unwrap().layer(LayerId(bx)).unwrap().effects().unwrap().groups().next().unwrap().uid;
-        app.ui.timeline.toggle_group(bx, fx_uid);
-        assert!(!labels(&app).iter().any(|r| r.trim() == "Blurriness"), "collapsed");
-        app.ui.timeline.toggle_group(bx, fx_uid);
-        let rows = labels(&app);
-        assert!(rows.iter().any(|r| r.trim() == "Blurriness") && rows.iter().any(|r| r.trim() == "Blur Dimensions"), "{rows:?}");
-        app.last_reveal = Some(("keyframes".into(), f64::MAX));
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        assert!(!labels(&app).iter().any(|r| r.trim() == "Blur Dimensions"), "UU again shows the changed ones only");
-        app.last_reveal = Some(("keyframes".into(), -10.0));
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        app.last_reveal = Some(("keyframes".into(), -10.0));
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        let rows = labels(&app);
-        assert!(!rows.iter().any(|r| r.trim() == ">Gaussian Blur") && rows.iter().any(|r| r.trim() == "Position"), "{rows:?}");
-        // U again on Box (later than a double press) hides only Box's.
-        app.last_reveal = Some(("keyframes".into(), -10.0));
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        let tl = &app.ui.timeline;
-        assert!(!tl.open_layers.contains(&bx) && tl.open_layers.contains(&plate), "{:?}", tl.open_layers);
-        // A layer twirled open by hand shows its whole tree, whatever was revealed elsewhere.
-        app.session.execute("layer.select", json!({"layers": []})).unwrap();
-        app.ui.timeline.open_layers.insert(bx);
-        let rows = labels(&app);
-        assert!(rows.iter().any(|r| r.trim() == ">Transform"), "{rows:?}");
-    }
-
-    /// U and UU show Time Remap on a layer with time remapping enabled.
-    #[test]
-    fn u_and_uu_reveal_time_remap() {
-        let mut s = effectcraft_engine::Session::default();
-        let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
-        s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
-        let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
-        let mut app = EffectcraftApp::new(s);
-        let ctx = egui::Context::default();
-        crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
-        app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
-        for uu in [false, true] {
-            app.ui.timeline.layer_reveal.clear();
-            app.last_reveal = uu.then(|| ("keyframes".into(), f64::MAX));
-            crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-            assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["props".to_string()]), "UU: {uu}");
-            let rows = labels(&app);
-            let at = rows.iter().position(|r| r == "Inner").unwrap();
-            assert_eq!(rows[at + 1].trim(), "Time Remap", "UU: {uu}: {rows:?}");
-        }
-    }
-
-    /// U shows Time Remap while remapping is enabled even after its keys are deleted (#990):
-    /// enabling remapping is itself the modification.
-    #[test]
-    fn u_reveals_keyless_time_remap() {
-        let mut s = effectcraft_engine::Session::default();
-        let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
-        s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
-        let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
-        let mut app = EffectcraftApp::new(s);
-        let ctx = egui::Context::default();
-        crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
-        let uid = app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().uid;
-        for _ in 0..2 {
-            let t = app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().keys[0].time.seconds();
-            app.session.execute("keys.select", json!({"keys": [{"layer": nested, "prop": uid, "time": t}]})).unwrap();
-            app.session.execute("edit.clear", json!({})).unwrap();
-        }
-        assert!(app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().keys.is_empty());
-        app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
-        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
-        assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["props".to_string()]));
-        let rows = labels(&app);
-        let at = rows.iter().position(|r| r == "Inner").unwrap();
-        assert_eq!(rows[at + 1].trim(), "Time Remap", "{rows:?}");
-    }
-
-    /// Enabling time remapping twirls the layer open on Time Remap (#157); disabling it reveals
-    /// nothing.
-    #[test]
-    fn enabling_time_remapping_reveals_time_remap() {
-        let mut s = effectcraft_engine::Session::default();
-        let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
-        s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
-        s.execute("layer.newSolid", json!({"name": "Other"})).unwrap();
-        let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
-        let mut app = EffectcraftApp::new(s);
-        let ctx = egui::Context::default();
-        crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
-        assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["timeRemap".to_string()]));
-        let rows = labels(&app);
-        let at = rows.iter().position(|r| r == "Inner").unwrap();
-        assert_eq!(rows[at + 1].trim(), "Time Remap", "{rows:?}");
-        // Through the selection (the Layer menu), turning it off again: nothing new is revealed.
-        app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
-        app.ui.timeline.layer_reveal.clear();
-        crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({})).unwrap();
-        assert!(app.ui.timeline.layer_reveal.is_empty());
-    }
-
-    #[test]
-    fn cti_snaps_to_the_nearest_candidate() {
-        assert_eq!(snap_time(&[0.0, 1.0, 2.0], 1.04, 0.1), 1.0);
-        assert_eq!(snap_time(&[0.0, 1.0, 2.0], 1.5, 0.1), 1.5);
-        assert_eq!(snap_time(&[1.0, 1.1], 1.06, 0.1), 1.1);
-        let app = app();
-        let comp = app.session.active_comp().unwrap().clone();
-        let c = snap_candidates(&comp, &build_rows(&app, &comp));
-        assert!(c.contains(&comp.duration.seconds()) && c.contains(&0.0));
-    }
-
-    /// UI fidelity (M13.5): compact After Effects-like rows and muted label-coloured bars.
-    #[test]
-    fn rows_and_bars_follow_after_effects_proportions() {
-        let t = crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark);
-        assert_eq!(t.row_h, 19.0);
-        let red = t.label(effectcraft_engine::color::Label::Red);
-        let bar = bar_color(red, false);
-        // Muted: darker and less saturated than the label, still reddish.
-        assert!(bar.r() < red.r() && bar.r() > bar.g() + 30 && bar.g() >= red.g().min(0x3a) - 1);
-        let sel = bar_color(red, true);
-        assert!(sel.r() > bar.r());
+    app.auto.add(&format!("timeline.prop.{uid}.eyedropper"), er, &prop.name);
+    let mut rgb = [c[0] as f32, c[1] as f32, c[2] as f32];
+    if crate::widgets::color_popup(ui, pop, r.left_bottom(), &mut rgb) {
+        ve.set(actions, json!([rgb[0], rgb[1], rgb[2], 1.0]));
     }
 }
+
+/// A checkbox.
+fn bool_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) {
+    let Value::Bool(b) = value else { return };
+    let (prop, at, uid) = (ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let x = at.x;
+    let r = Rect::from_min_size(pos2(x, at.y - 8.0), vec2(16.0, 16.0));
+    if widgets::checkbox(ui, r, *b, &t, egui::Id::unique(("cb", uid))).clicked() {
+        ve.set(actions, json!(!b));
+    }
+    app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+}
+
+/// A popup (or the number when the property has no options).
+fn enum_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) {
+    let Value::Enum(i) = value else { return };
+    let (p, layer, prop, at, uid) = (ve.p, ve.layer, ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let x = at.x;
+    // Text Path Options ▸ Path lists the layer's masks.
+    let mask_opts: Option<Vec<String>> = layer
+        .props
+        .prop("text/pathOptions/path")
+        .filter(|q| q.uid == uid)
+        .map(|_| std::iter::once("None".to_string()).chain(layer.masks().into_iter().flat_map(|m| m.groups().map(|g| g.name.clone()))).collect());
+    let ui_opts = mask_opts.map(|options| ParamUi::Popup { options });
+    if let ParamUi::Popup { options } = ui_opts.as_ref().unwrap_or(&prop.ui) {
+        let r = Rect::from_min_size(pos2(x, at.y - 9.0), vec2(150.0, 18.0));
+        let label = options.get(*i as usize).cloned().unwrap_or_default();
+        let pop = egui::Id::unique(("epop", uid));
+        if widgets::dropdown(ui, r, &label, &t, egui::Id::unique(("en", uid))).clicked() {
+            widgets::open_popup(ui, pop);
+        }
+        app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+        if let Some(ni) = widgets::popup_menu(ui, pop, r.left_bottom(), options, Some(*i as usize)) {
+            ve.set(actions, json!(ni));
+        }
+    } else {
+        p.text(pos2(x, at.y), Align2::LEFT_CENTER, fmt_num(*i as f64, 0), Tokens::ui(12.0), t.hot_text);
+    }
+}
+
+/// A layer reference picker.
+fn layer_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>, value: &Value) {
+    let Value::Layer(l) = value else { return };
+    let (prop, at, uid) = (ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let x = at.x;
+    // Layer references (a light's Source, a Displacement Map's layer…) pick from the
+    // comp's layers, as in Effect Controls; the choice is written through the same
+    // undoable prop.set as the other value arms.
+    let r = Rect::from_min_size(pos2(x, at.y - 9.0), vec2(150.0, 18.0));
+    if let Some(comp) = app.session.active_comp_arc()
+        && let Some(chosen) = widgets::layer_picker(ui, r, &comp.layers, *l, &t, egui::Id::unique(("tl-lay", uid)))
+    {
+        ve.set(actions, chosen.map(|id| json!(id)).unwrap_or(serde_json::Value::Null));
+    }
+    app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+}
+
+/// Opens the Gradient Editor at the current time (#612).
+fn gradient_editor(app: &mut EffectcraftApp, ui: &mut egui::Ui, ve: &ValueEdit<'_>, actions: &mut Vec<(String, serde_json::Value)>) {
+    let (p, layer, prop, at, uid) = (ve.p, ve.layer, ve.prop, ve.at, ve.uid);
+    let t = app.tokens;
+    let x = at.x;
+    // Opens the Gradient Editor at the current time (#612).
+    let r = p.text(pos2(x, at.y), Align2::LEFT_CENTER, crate::i18n::tr("Edit Gradient…"), Tokens::ui(12.0), t.hot_text);
+    let resp = ui.interact(r.expand(2.0), egui::Id::unique(("gradient-edit", uid)), Sense::click());
+    if resp.hovered() {
+        ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand);
+    }
+    app.auto.add(&format!("timeline.prop.{uid}.value"), r, &prop.name);
+    if resp.clicked() {
+        actions.push(("prop.editGradient".into(), json!({"layer": layer.id.0, "prop": uid})));
+    }
+}
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/ui-egui/src/panels/timeline/tests.rs b/crates/ui-egui/src/panels/timeline/tests.rs
new file mode 100644
index 000000000..0355ea5ed
--- /dev/null
+++ b/crates/ui-egui/src/panels/timeline/tests.rs
@@ -0,0 +1,537 @@
+use super::*;
+
+/// Alt/Option-drag takes the same Project items `layer.replaceSource` does: compositions,
+/// footage and solids, never folders, data files or 3D models.
+#[test]
+fn replace_source_takes_visual_items_only() {
+    use effectcraft_engine::color::Label;
+    use effectcraft_engine::project::{Comp, Footage, Project, Solid};
+    use effectcraft_engine::time::{FrameRate, Tick};
+    let mut p = Project::default();
+    let l = Label::None;
+    let comp = p.add_item("C", l, None, ItemKind::Comp(Comp::new(10, 10, FrameRate::FPS_30, Tick::from_seconds_f64(1.0)).into()));
+    let folder = p.add_item("F", l, None, ItemKind::Folder);
+    let still = p.add_item("S", l, None, ItemKind::Footage(Footage { kind: FootageKind::Still, ..Default::default() }));
+    let data = p.add_item("D", l, None, ItemKind::Footage(Footage { kind: FootageKind::Data, ..Default::default() }));
+    let model = p.add_item("M", l, None, ItemKind::Footage(Footage { kind: FootageKind::Model, ..Default::default() }));
+    let solid = p.add_item("So", l, None, ItemKind::Solid(Solid { color: [0.0; 3], width: 10, height: 10, pixel_aspect: 1.0 }));
+    for (id, ok) in [(comp, true), (still, true), (solid, true), (folder, false), (data, false), (model, false)] {
+        assert_eq!(replaceable_item(p.item(id).unwrap()), ok, "{id:?}");
+    }
+}
+
+/// Alt/Cmd-click twirls Audio's Waveform row (not in the property tree) with the rest.
+#[test]
+fn the_waveform_row_twirls_with_its_tree() {
+    let mut root = PropGroup::new(1, "", "");
+    let mut audio = PropGroup::new(2, "audio", "Audio");
+    audio.children.push(PropGroup::new(3, "x", "X").into());
+    root.children.push(audio.into());
+    let mut uids = vec![];
+    walk_groups(&root, &mut uids);
+    assert_eq!(uids, vec![2, WAVE_BIT | 2, 3]);
+    let mut uids = vec![];
+    walk_groups(find_group(&root, 2).unwrap(), &mut uids);
+    assert_eq!(uids, vec![WAVE_BIT | 2, 3]);
+}
+
+/// #710: with Time Display set to Frames the ruler labels are frame numbers (as under the
+/// CTI, from Start Numbering Frames At); otherwise seconds:frames.
+#[test]
+fn ruler_labels_follow_the_time_display_style() {
+    use effectcraft_engine::project::{ProjectSettings, TimeDisplayStyle};
+    let mut st = ProjectSettings { time_display: TimeDisplayStyle::Timecode, frame_start: 0, ..ProjectSettings::default() };
+    assert_eq!(ruler_label(15, 30, &st), "00:15f");
+    assert_eq!(ruler_label(45, 30, &st), "01:15f");
+    assert_eq!(ruler_label(30 * 3600 + 31, 30, &st), "60:01:01f");
+    st.time_display = TimeDisplayStyle::Frames;
+    assert_eq!(ruler_label(0, 30, &st), "00000");
+    assert_eq!(ruler_label(45, 30, &st), "00045");
+    st.frame_start = 1;
+    assert_eq!(ruler_label(45, 30, &st), "00046");
+    assert_eq!(ruler_label(i64::MAX, 30, &st), format!("{:05}", i64::MAX));
+}
+
+/// #468: playback pages the view to the CTI; a scrub past either end scrolls that way.
+#[test]
+fn the_view_pages_to_the_cti() {
+    assert_eq!(page_to_cti(10.0, 5.0, 60.0, 12.0), 10.0, "in view: unchanged");
+    assert_eq!(page_to_cti(10.0, 5.0, 60.0, 16.0), 16.0, "past the right end: the page from the CTI");
+    assert_eq!(page_to_cti(10.0, 5.0, 60.0, 3.0), 3.0, "before the start");
+    assert_eq!(page_to_cti(10.0, 5.0, 60.0, 58.0), 55.0, "not past the comp's end");
+    assert_eq!(page_to_cti(10.0, 80.0, 60.0, 95.0), 0.0);
+    assert_eq!(page_to_cti(10.0, f64::NAN, 60.0, 95.0), 10.0);
+    assert_eq!(edge_scroll_speed_x(100.0, 500.0, 300.0), 0.0);
+    assert!(edge_scroll_speed_x(100.0, 500.0, 501.0) > 0.0 && edge_scroll_speed_x(100.0, 500.0, 99.0) < 0.0);
+    assert!(edge_scroll_speed_x(100.0, 500.0, 600.0) > edge_scroll_speed_x(100.0, 500.0, 520.0));
+}
+
+/// #864: picking only a mode in a layer's Track Matte menu sets a matte (the layer above);
+/// it used to close the menu and change nothing.
+#[test]
+fn a_track_matte_mode_without_a_matte_takes_the_layer_above() {
+    let mut s = effectcraft_engine::Session::default();
+    s.execute("comp.new", json!({"name": "T", "width": 64, "height": 64, "duration": 1})).unwrap();
+    for name in ["Chain Bottom", "Matte", "Chain Top"] {
+        s.execute("layer.newSolid", json!({"name": name, "color": "#ffffff", "width": 64, "height": 64})).unwrap();
+    }
+    let find = |s: &effectcraft_engine::Session, n: &str| s.active_comp().unwrap().layers.iter().find(|l| l.name == n).unwrap().clone();
+    let (bottom, matte, top) = (find(&s, "Chain Bottom"), find(&s, "Matte"), find(&s, "Chain Top"));
+    let candidates = [top.id, matte.id];
+    let pick = |s: &mut effectcraft_engine::Session, name: &str, i: usize, choice: &str| {
+        let (id, params) = track_matte_pick(&find(s, name), &candidates, i, choice).expect("a menu item is an action");
+        s.execute(&id, params)
+    };
+    pick(&mut s, "Chain Bottom", 5, "Alpha Inverted Matte").unwrap();
+    let m = find(&s, "Chain Bottom").track_matte.expect("a matte");
+    assert_eq!((m.layer, m.kind), (matte.id, MatteKind::AlphaInverted));
+    assert!(!find(&s, "Matte").switches.video, "the matte layer is hidden");
+    // A mode change keeps the matte layer; a matte change keeps the mode.
+    pick(&mut s, "Chain Bottom", 6, "Luma Matte").unwrap();
+    assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| (m.layer, m.kind)), Some((matte.id, MatteKind::Luma)));
+    pick(&mut s, "Chain Bottom", 2, "1. Chain Top").unwrap();
+    assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| (m.layer, m.kind)), Some((top.id, MatteKind::Luma)));
+    assert!(s.undo());
+    assert_eq!(find(&s, "Chain Bottom").track_matte.map(|m| m.layer), Some(matte.id), "one undo step per pick");
+    // The top layer has nothing above it: an error for the status bar, not a silent no-op.
+    assert!(pick(&mut s, "Chain Top", 5, "Alpha Matte").is_err());
+    pick(&mut s, "Chain Bottom", 0, "No Track Matte").unwrap();
+    assert!(find(&s, "Chain Bottom").track_matte.is_none());
+    assert!(track_matte_pick(&bottom, &candidates, 1, "-").is_none(), "a separator does nothing");
+}
+
+/// #957: vector footage gets the Continuously Rasterize switch; raster footage does not.
+#[test]
+fn collapse_switch_shows_for_vector_footage_only() {
+    use effectcraft_engine::color::Label;
+    use effectcraft_engine::project::{Footage, ItemKind, Project};
+    let mut p = Project::default();
+    let mut layer_for = |name: &str, codec: &str| {
+        let footage = Footage { path: name.into(), codec: codec.into(), ..Default::default() };
+        let item = p.add_item(name, Label::SeaFoam, None, ItemKind::Footage(footage));
+        let comp = Comp::new(64, 36, effectcraft_engine::time::FrameRate::new(30, 1), Tick::from_seconds_f64(1.0));
+        effectcraft_engine::project::build::layer(&mut p, &comp, name, LayerSource::Footage { item }, (0, 0), None)
+    };
+    let svg = layer_for("logo.svg", "SVG");
+    let png = layer_for("photo.png", "PNG");
+    assert!(collapse_applies(&svg, &p));
+    assert!(!collapse_applies(&png, &p));
+}
+
+/// A comp with two solids; "Box" has an animated Position and a Gaussian Blur.
+fn app() -> EffectcraftApp {
+    let mut s = effectcraft_engine::Session::default();
+    s.execute("comp.new", json!({"name": "T", "width": 320, "height": 180, "duration": 4})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080", "width": 320, "height": 180})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Box", "color": "#e04020", "width": 40, "height": 40})).unwrap();
+    let comp = s.active_comp().unwrap();
+    let bx = comp.layers.iter().find(|l| l.name == "Box").unwrap().id.0;
+    s.execute("layer.select", json!({"layers": [bx]})).unwrap();
+    s.execute("effect.apply", json!({"effect": "ec.blur.gaussian"})).unwrap();
+    let pos = s.active_comp().unwrap().layer(LayerId(bx)).unwrap().transform().unwrap().get("position").unwrap().uid;
+    s.execute("prop.toggleAnimation", json!({"layer": bx, "prop": pos})).unwrap();
+    EffectcraftApp::new(s)
+}
+
+fn labels(app: &EffectcraftApp) -> Vec<String> {
+    let comp = app.session.active_comp().unwrap().clone();
+    build_rows(app, &comp)
+        .into_iter()
+        .map(|r| {
+            let l = comp.layer(r.layer).unwrap();
+            match r.kind {
+                RowKind::Layer => l.name.clone(),
+                RowKind::Group { name, .. } => format!("{}>{name}", "  ".repeat(r.depth)),
+                RowKind::Prop { uid } => format!("{}{}", "  ".repeat(r.depth), l.props.find(uid).unwrap().name),
+                _ => "?".into(),
+            }
+        })
+        .collect()
+}
+
+#[test]
+fn search_filters_layers_and_reveals_matching_properties() {
+    let mut app = app();
+    app.ui.timeline.search = "opac".into();
+    let rows = labels(&app);
+    // Both layers have Transform > Opacity; nothing else shows.
+    assert_eq!(rows.iter().filter(|r| r.trim() == "Opacity").count(), 2, "{rows:?}");
+    assert!(rows.iter().any(|r| r.trim() == ">Transform"), "{rows:?}");
+    assert!(!rows.iter().any(|r| r.trim() == "Position"), "{rows:?}");
+    // A layer name match shows the layer alone; a group match brings its contents.
+    app.ui.timeline.search = "plate".into();
+    assert_eq!(labels(&app), vec!["Plate".to_string()]);
+    app.ui.timeline.search = "GAUSSIAN".into();
+    let rows = labels(&app);
+    assert_eq!(rows[0], "Box");
+    assert!(rows.iter().any(|r| r.trim() == ">Effects") && rows.iter().any(|r| r.trim() == "Blurriness"), "{rows:?}");
+    assert!(!rows.contains(&"Plate".to_string()));
+    // Nothing matches → no rows.
+    app.ui.timeline.search = "zzz".into();
+    assert!(labels(&app).is_empty());
+    // Through the command.
+    let ctx = egui::Context::default();
+    crate::menus::invoke(&mut app, &ctx, "timeline.search", json!({"query": "scale"})).unwrap();
+    assert!(labels(&app).iter().any(|r| r.trim() == "Scale"));
+}
+
+/// A shape group's inner Contents (AE's elided `ADBE Vectors Group`) draws no row: the
+/// search shows the full row hierarchy with the group's items — path, fill and Transform —
+/// listing directly under the group, and the only "Contents" row the layer's own.
+#[test]
+fn shape_group_inner_contents_is_elided() {
+    let mut s = effectcraft_engine::Session::default();
+    s.execute("comp.new", json!({"name": "T", "width": 320, "height": 180, "duration": 4})).unwrap();
+    s.execute("layer.newShape", json!({"kind": "rect"})).unwrap();
+    let mut app = EffectcraftApp::new(s);
+    app.ui.timeline.search = "rect".into();
+    assert_eq!(
+        labels(&app),
+        [
+            "Shape Layer 1",
+            "  >Contents",
+            "    >Rectangle 1",
+            "      >Rectangle Path 1",
+            "        Size",
+            "        Position",
+            "        Roundness",
+            "      >Fill 1",
+            "        Composite",
+            "        Fill Rule",
+            "        Color",
+            "        Opacity",
+            "      >Transform",
+            "        Anchor Point",
+            "        Position",
+            "        Scale",
+            "        Skew",
+            "        Skew Axis",
+            "        Rotation",
+            "        Opacity",
+        ]
+        .iter()
+        .map(|r| r.to_string())
+        .collect::<Vec<_>>()
+    );
+}
+
+#[test]
+fn columns_toggle_and_layout() {
+    let mut app = app();
+    let tl = &mut app.ui.timeline;
+    assert!(column_visible(tl, "switches") && !column_visible(tl, "comment") && !column_visible(tl, "modes"));
+    set_column(tl, "comment", true).unwrap();
+    set_column(tl, "stretch", true).unwrap();
+    set_column(tl, "keys", false).unwrap();
+    set_column(tl, "label", false).unwrap();
+    set_column(tl, "modes", true).unwrap();
+    assert!(tl.show_modes && column_visible(tl, "comment") && !column_visible(tl, "label"));
+    assert!(set_column(tl, "name", false).is_err());
+    assert!(set_column(tl, "bogus", true).is_err());
+    let vis = Vis::of(tl);
+    let cw = cols(0.0, 1400.0, vis);
+    // Hidden columns take no room; visible ones are in After Effects' order.
+    assert_eq!(cw.keys, cw.label);
+    assert_eq!(cw.label, cw.num);
+    assert!(cw.name < cw.comment && cw.comment < cw.switches && cw.switches < cw.mode && cw.parent < cw.stretch);
+    assert_eq!(column_at(&cw, cw.comment + 5.0), Some("comment"));
+    assert_eq!(column_at(&cw, cw.name + 5.0), Some("name"));
+    assert_eq!(column_at(&cw, cw.stretch + 5.0), Some("stretch"));
+    // Through the command (as agents do).
+    let ctx = egui::Context::default();
+    let r = crate::menus::invoke(&mut app, &ctx, "timeline.column", json!({"column": "duration"})).unwrap();
+    assert!(r["columns"].as_array().unwrap().iter().any(|c| c == "duration"));
+    crate::menus::invoke(&mut app, &ctx, "timeline.column", json!({"column": "duration", "visible": false})).unwrap();
+    assert!(!column_visible(&app.ui.timeline, "duration"));
+    crate::menus::invoke(&mut app, &ctx, "timeline.sourceName", json!({})).unwrap();
+    assert!(app.ui.timeline.source_name);
+}
+
+#[test]
+fn reveal_keys_add_with_shift_and_uu_reveals_modified() {
+    let mut app = app();
+    let ctx = egui::Context::default();
+    crate::menus::invoke(&mut app, &ctx, "timeline.reveal.opacity", json!({})).unwrap();
+    assert_eq!(app.ui.timeline.reveal, vec!["opacity"]);
+    crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.scale", json!({})).unwrap();
+    crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.effects", json!({})).unwrap();
+    assert_eq!(app.ui.timeline.reveal, vec!["opacity", "scale", "effects"]);
+    let rows = labels(&app);
+    assert!(rows.iter().any(|r| r.trim() == "Scale") && rows.iter().any(|r| r.trim() == "Opacity"), "{rows:?}");
+    assert!(rows.iter().any(|r| r.trim() == ">Gaussian Blur"), "{rows:?}");
+    // Tree order: Scale before Opacity.
+    let si = rows.iter().position(|r| r.trim() == "Scale").unwrap();
+    let oi = rows.iter().position(|r| r.trim() == "Opacity").unwrap();
+    assert!(si < oi);
+    // Shift+S again removes Scale.
+    crate::menus::invoke(&mut app, &ctx, "timeline.revealAdd.scale", json!({})).unwrap();
+    assert_eq!(app.ui.timeline.reveal, vec!["opacity", "effects"]);
+    // U: keyframed properties (Position); UU (twice quickly): every modified property.
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    let n_keys = app.ui.timeline.reveal_props.len();
+    assert_eq!(app.ui.timeline.reveal, vec!["props"]);
+    assert!(n_keys >= 1);
+    let bx = app.session.state.selected_layers[0].0;
+    app.session.execute("prop.set", json!({"layer": bx, "path": "effects/#1/blurriness", "value": 12})).unwrap();
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    assert!(app.ui.timeline.reveal_props.len() > n_keys, "UU reveals modified properties too");
+}
+
+#[test]
+fn scroll_to_time_centres_the_current_time_inside_the_comp() {
+    assert_eq!(centered_on(4.0, 10.0, 5.0), 3.0);
+    // Near the ends the view stops at the comp's start and end.
+    assert_eq!(centered_on(4.0, 10.0, 1.0), 0.0);
+    assert_eq!(centered_on(4.0, 10.0, 9.5), 6.0);
+    // A span longer than the comp, and bad numbers, start at zero.
+    assert_eq!(centered_on(20.0, 10.0, 5.0), 0.0);
+    assert_eq!(centered_on(f64::NAN, 10.0, 5.0), 0.0);
+}
+
+/// U and the other reveal shortcuts act on the selected layers only: other layers keep their
+/// twirl state and their own reveal (#160).
+#[test]
+fn reveal_shortcuts_leave_unselected_layers_alone() {
+    let mut app = app();
+    let ctx = egui::Context::default();
+    let comp = app.session.active_comp().unwrap().clone();
+    let id = |n: &str| comp.layers.iter().find(|l| l.name == n).unwrap().id.0;
+    let (plate, bx) = (id("Plate"), id("Box"));
+    let select = |app: &mut EffectcraftApp, l: u64| app.session.execute("layer.select", json!({"layers": [l]})).unwrap();
+    // Plate shows Scale (S); then U on Box.
+    select(&mut app, plate);
+    crate::menus::invoke(&mut app, &ctx, "timeline.reveal.scale", json!({})).unwrap();
+    select(&mut app, bx);
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    let tl = &app.ui.timeline;
+    assert!(tl.open_layers.contains(&plate) && tl.open_layers.contains(&bx), "{:?}", tl.open_layers);
+    assert_eq!(tl.layer_reveal.get(&plate), Some(&vec!["scale".to_string()]), "Plate keeps its reveal");
+    assert_eq!(tl.layer_reveal.get(&bx), Some(&vec!["props".to_string()]));
+    let rows = labels(&app);
+    let at = |n: &str| rows.iter().position(|r| r == n).unwrap();
+    assert_eq!(rows[at("Plate") + 1].trim(), "Scale", "{rows:?}");
+    assert_eq!(rows[at("Box") + 1].trim(), "Position", "{rows:?}");
+    // UU (modified): the effect's changed parameter only, under the effect twirled open.
+    // Then U later: Box shows its keyframed properties only again.
+    app.session.execute("prop.set", json!({"layer": bx, "path": "effects/#1/blurriness", "value": 12})).unwrap();
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    let rows = labels(&app);
+    let fx = rows.iter().position(|r| r.trim().ends_with("Gaussian Blur")).unwrap_or_else(|| panic!("UU shows the effect: {rows:?}"));
+    assert_eq!(rows[fx + 1].trim(), "Blurriness", "{rows:?}");
+    assert!(!rows.iter().any(|r| r.trim() == "Blur Dimensions"), "unchanged parameters stay hidden: {rows:?}");
+    // Collapsed and expanded by hand, the effect shows all its parameters; UU filters again.
+    let fx_uid = app.session.active_comp().unwrap().layer(LayerId(bx)).unwrap().effects().unwrap().groups().next().unwrap().uid;
+    app.ui.timeline.toggle_group(bx, fx_uid);
+    assert!(!labels(&app).iter().any(|r| r.trim() == "Blurriness"), "collapsed");
+    app.ui.timeline.toggle_group(bx, fx_uid);
+    let rows = labels(&app);
+    assert!(rows.iter().any(|r| r.trim() == "Blurriness") && rows.iter().any(|r| r.trim() == "Blur Dimensions"), "{rows:?}");
+    app.last_reveal = Some(("keyframes".into(), f64::MAX));
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    assert!(!labels(&app).iter().any(|r| r.trim() == "Blur Dimensions"), "UU again shows the changed ones only");
+    app.last_reveal = Some(("keyframes".into(), -10.0));
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    app.last_reveal = Some(("keyframes".into(), -10.0));
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    let rows = labels(&app);
+    assert!(!rows.iter().any(|r| r.trim() == ">Gaussian Blur") && rows.iter().any(|r| r.trim() == "Position"), "{rows:?}");
+    // U again on Box (later than a double press) hides only Box's.
+    app.last_reveal = Some(("keyframes".into(), -10.0));
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    let tl = &app.ui.timeline;
+    assert!(!tl.open_layers.contains(&bx) && tl.open_layers.contains(&plate), "{:?}", tl.open_layers);
+    // A layer twirled open by hand shows its whole tree, whatever was revealed elsewhere.
+    app.session.execute("layer.select", json!({"layers": []})).unwrap();
+    app.ui.timeline.open_layers.insert(bx);
+    let rows = labels(&app);
+    assert!(rows.iter().any(|r| r.trim() == ">Transform"), "{rows:?}");
+}
+
+/// U and UU show Time Remap on a layer with time remapping enabled.
+#[test]
+fn u_and_uu_reveal_time_remap() {
+    let mut s = effectcraft_engine::Session::default();
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
+    s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
+    let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
+    let mut app = EffectcraftApp::new(s);
+    let ctx = egui::Context::default();
+    crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
+    app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
+    for uu in [false, true] {
+        app.ui.timeline.layer_reveal.clear();
+        app.last_reveal = uu.then(|| ("keyframes".into(), f64::MAX));
+        crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+        assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["props".to_string()]), "UU: {uu}");
+        let rows = labels(&app);
+        let at = rows.iter().position(|r| r == "Inner").unwrap();
+        assert_eq!(rows[at + 1].trim(), "Time Remap", "UU: {uu}: {rows:?}");
+    }
+}
+
+/// U shows Time Remap while remapping is enabled even after its keys are deleted (#990):
+/// enabling remapping is itself the modification.
+#[test]
+fn u_reveals_keyless_time_remap() {
+    let mut s = effectcraft_engine::Session::default();
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
+    s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
+    let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
+    let mut app = EffectcraftApp::new(s);
+    let ctx = egui::Context::default();
+    crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
+    let uid = app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().uid;
+    for _ in 0..2 {
+        let t = app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().keys[0].time.seconds();
+        app.session.execute("keys.select", json!({"keys": [{"layer": nested, "prop": uid, "time": t}]})).unwrap();
+        app.session.execute("edit.clear", json!({})).unwrap();
+    }
+    assert!(app.session.active_comp().unwrap().layer(LayerId(nested)).unwrap().props.prop("timeRemap").unwrap().keys.is_empty());
+    app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
+    crate::menus::invoke(&mut app, &ctx, "anim.reveal", json!({"kind": "keyframes"})).unwrap();
+    assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["props".to_string()]));
+    let rows = labels(&app);
+    let at = rows.iter().position(|r| r == "Inner").unwrap();
+    assert_eq!(rows[at + 1].trim(), "Time Remap", "{rows:?}");
+}
+
+/// Enabling time remapping twirls the layer open on Time Remap (#157); disabling it reveals
+/// nothing.
+#[test]
+fn enabling_time_remapping_reveals_time_remap() {
+    let mut s = effectcraft_engine::Session::default();
+    let inner = s.execute("comp.new", json!({"name": "Inner", "width": 32, "height": 32, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
+    s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Other"})).unwrap();
+    let nested = s.execute("layer.addItem", json!({"item": inner})).unwrap()["layer"].as_u64().unwrap();
+    let mut app = EffectcraftApp::new(s);
+    let ctx = egui::Context::default();
+    crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({"layers": [nested]})).unwrap();
+    assert_eq!(app.ui.timeline.layer_reveal.get(&nested), Some(&vec!["timeRemap".to_string()]));
+    let rows = labels(&app);
+    let at = rows.iter().position(|r| r == "Inner").unwrap();
+    assert_eq!(rows[at + 1].trim(), "Time Remap", "{rows:?}");
+    // Through the selection (the Layer menu), turning it off again: nothing new is revealed.
+    app.session.execute("layer.select", json!({"layers": [nested]})).unwrap();
+    app.ui.timeline.layer_reveal.clear();
+    crate::menus::invoke(&mut app, &ctx, "layer.enableTimeRemap", json!({})).unwrap();
+    assert!(app.ui.timeline.layer_reveal.is_empty());
+}
+
+#[test]
+fn cti_snaps_to_the_nearest_candidate() {
+    assert_eq!(snap_time(&[0.0, 1.0, 2.0], 1.04, 0.1), 1.0);
+    assert_eq!(snap_time(&[0.0, 1.0, 2.0], 1.5, 0.1), 1.5);
+    assert_eq!(snap_time(&[1.0, 1.1], 1.06, 0.1), 1.1);
+    let app = app();
+    let comp = app.session.active_comp().unwrap().clone();
+    let c = snap_candidates(&comp, &build_rows(&app, &comp));
+    assert!(c.contains(&comp.duration.seconds()) && c.contains(&0.0));
+}
+
+/// Every string drawn by one frame of `draw`.
+fn drawn_text(mut draw: impl FnMut(&mut egui::Ui)) -> Vec<String> {
+    fn collect(shape: &egui::Shape, out: &mut Vec<String>) {
+        match shape {
+            egui::Shape::Text(t) => out.push(t.galley.text().to_string()),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| collect(s, out)),
+            _ => {}
+        }
+    }
+    let ctx = egui::Context::default();
+    ctx.run_ui(Default::default(), |ui| draw(ui)).textures_delta.clear();
+    let mut frame = ctx.run_ui(Default::default(), |ui| draw(ui));
+    frame.textures_delta.clear();
+    let mut out = Vec::new();
+    frame.shapes.iter().for_each(|c| collect(&c.shape, &mut out));
+    out
+}
+
+/// #1308: the layer context menu draws its items in the interface language, from the menu
+/// bar's rows for the same commands (whose ellipsis is `...`), and its Effects submenu draws
+/// the categories the Effect menu does; the actions it records stay the same.
+#[test]
+fn the_layer_context_menu_draws_in_the_interface_language() {
+    let caps = LayerMenuCaps { vector: true, text: false, source: true };
+    let (mut auto, mut actions) = (crate::automation::Registry::default(), Vec::new());
+    crate::i18n::set_current("zh-hans");
+    let menu = drawn_text(|ui| layer_menu(ui, &[7], caps, (&mut auto, "t"), &mut actions));
+    let effects = drawn_text(|ui| effects_submenu(ui, &[7], &mut |_: &mut egui::Ui, _: &str, _: &str, _: serde_json::Value| {}));
+    crate::i18n::set_current("en");
+    let english = drawn_text(|ui| layer_menu(ui, &[7], caps, (&mut auto, "t"), &mut actions));
+    for label in ["新建", "图层设置...", "在项目中显示图层源", "从矢量图层创建形状", "预合成...", "重复", "拆分图层", "删除"]
+    {
+        assert!(menu.iter().any(|t| t == label), "{label} missing from {menu:?}");
+    }
+    assert!(!menu.iter().any(|t| t.is_ascii()), "English left in {menu:?}");
+    assert!(effects.iter().any(|t| t == "模糊和锐化"), "{effects:?}");
+    assert!(!effects.iter().any(|t| t == "Blur & Sharpen"), "{effects:?}");
+    for label in ["Layer Settings…", "Reveal Layer Source in Project", "Duplicate", "Delete"] {
+        assert!(english.iter().any(|t| t == label), "{label} missing from {english:?}");
+    }
+    assert!(actions.is_empty());
+}
+
+/// The property context menu draws its items in the interface language too: the commands the
+/// menu bar has from its rows, Reset, Edit Value… and Remove Expression from the panel catalog.
+/// The automation labels stay English.
+#[test]
+fn the_property_context_menu_draws_in_the_interface_language() {
+    let mut s = effectcraft_engine::Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64, "duration": 4})).unwrap();
+    let l = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    let opacity = s.active_comp().unwrap().layer(LayerId(l)).unwrap().props.prop("transform/opacity").unwrap().uid;
+    s.execute("prop.setExpression", json!({"layer": l, "prop": opacity})).unwrap();
+    let comp = s.active_comp_id().unwrap();
+    let layer = s.active_comp().unwrap().layer(LayerId(l)).unwrap().clone();
+    let (position, opacity) = (layer.props.prop("transform/position").unwrap(), layer.props.prop("transform/opacity").unwrap());
+    let (mut auto, mut actions) = (crate::automation::Registry::default(), Vec::new());
+    let mut menu = |language| {
+        crate::i18n::set_current(language);
+        let mut drawn = drawn_text(|ui| prop_menu(ui, &mut auto, comp, &layer, position, &mut actions));
+        drawn.extend(drawn_text(|ui| prop_menu(ui, &mut auto, comp, &layer, opacity, &mut actions)));
+        drawn
+    };
+    let chinese = menu("zh-hans");
+    let english = menu("en");
+    for label in ["重置", "编辑值…", "单独尺寸", "添加表达式", "移除表达式", "向基本图形添加属性"] {
+        assert!(chinese.iter().any(|t| t == label), "{label} missing from {chinese:?}");
+    }
+    assert!(!chinese.iter().any(|t| t.is_ascii()), "English left in {chinese:?}");
+    for label in ["Reset", "Edit Value…", "Separate Dimensions", "Remove Expression", "Add Property to Essential Graphics"] {
+        assert!(english.iter().any(|t| t == label), "{label} missing from {english:?}");
+    }
+    assert!(auto.elements.iter().any(|e| e.label == "Remove Expression"), "the automation label stays English");
+    assert!(actions.is_empty());
+}
+
+/// UI fidelity (M13.5): compact After Effects-like rows and muted label-coloured bars.
+#[test]
+fn rows_and_bars_follow_after_effects_proportions() {
+    let t = crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark);
+    assert_eq!(t.row_h, 19.0);
+    let red = t.label(effectcraft_engine::color::Label::Red);
+    let bar = bar_color(red, false);
+    // Muted: darker and less saturated than the label, still reddish.
+    assert!(bar.r() < red.r() && bar.r() > bar.g() + 30 && bar.g() >= red.g().min(0x3a) - 1);
+    let sel = bar_color(red, true);
+    assert!(sel.r() > bar.r());
+}
+
+#[test]
+fn disk_bar_range_covers_partial_frames() {
+    let clip = Rect::from_min_max(pos2(0.0, 0.0), pos2(2.0, 1.0));
+    let tm = TMap { x0: 0.0, start: 10.25, pps: 1.0 };
+    assert_eq!(disk_bar_range(&tm, clip, 1.0, 100), 10..13);
+
+    let exact = TMap { start: 10.0, ..tm };
+    assert_eq!(disk_bar_range(&exact, clip, 1.0, 100), 10..12);
+    let off_comp = TMap { start: 200.0, ..tm };
+    assert_eq!(disk_bar_range(&off_comp, clip, 1.0, 100), 100..100);
+    assert_eq!(disk_bar_range(&tm, clip, f64::NAN, 100), 0..0);
+    assert_eq!(disk_bar_range(&TMap { pps: 0.0, ..tm }, clip, 1.0, 100), 0..0);
+    assert_eq!(disk_bar_range(&TMap { start: f64::NAN, ..tm }, clip, 1.0, 100), 0..0);
+    assert_eq!(disk_bar_range(&tm, Rect::from_min_max(pos2(2.0, 0.0), pos2(2.0, 1.0)), 1.0, 100), 0..0);
+    let above_limit = TMap { start: 100_001.0, ..tm };
+    assert_eq!(disk_bar_range(&above_limit, clip, 1.0, i64::MAX), 100_000..100_000);
+}
diff --git a/crates/ui-egui/src/panels/tracker.rs b/crates/ui-egui/src/panels/tracker.rs
index bd54625b8..3edde09df 100644
--- a/crates/ui-egui/src/panels/tracker.rs
+++ b/crates/ui-egui/src/panels/tracker.rs
@@ -51,8 +51,10 @@ fn current(app: &EffectcraftApp) -> Option<(LayerId, Uid)> {
     l.trackers().next().map(|(g, _)| (l.id, g.uid))
 }
 
+/// The `egui::Id` of the Motion Source dropdown's transient state; picking a new source removes
+/// whatever is stored under it, so the choice starts fresh.
 fn source_id() -> egui::Id {
-    egui::Id::new("tracker-motion-source")
+    egui::Id::unique("tracker-motion-source")
 }
 
 /// Motion Source: the current track's layer, the chosen source, or the selected layer.
@@ -88,7 +90,7 @@ fn button(app: &mut EffectcraftApp, ui: &mut egui::Ui, r: Rect, text: &str, enab
         ui.painter().text(r.center(), Align2::CENTER_CENTER, text, Tokens::medium(12.0), t.text_faint);
         return false;
     }
-    widgets::text_button(ui, r, text, false, &t, egui::Id::new(id)).clicked()
+    widgets::text_button(ui, r, text, false, &t, egui::Id::unique(id)).clicked()
 }
 
 fn run(app: &mut EffectcraftApp, ctx: &egui::Context, cmd: &str, p: serde_json::Value) {
@@ -113,6 +115,37 @@ fn analyze_glyph(p: &egui::Painter, r: Rect, forward: bool, frame: bool, stop: b
     }
 }
 
+/// The two button rows at `y`: Track Camera / Warp Stabilizer, then Track Motion / Stabilize Motion.
+fn top_buttons(app: &mut EffectcraftApp, ui: &mut egui::Ui, ctx: &egui::Context, x0: f32, y: f32, half: f32, source: Option<LayerId>) {
+    let can_track = app.session.active_comp().is_some() && source.is_some();
+    // Track Camera / Warp Stabilizer and Track Motion / Stabilize Motion.
+    let r1 = Rect::from_min_size(pos2(x0, y), vec2(half, 22.0));
+    let r2 = Rect::from_min_size(pos2(x0 + half + 6.0, y), vec2(half, 22.0));
+    let src_p = source.map(|l| json!({"layer": l.0})).unwrap_or_else(|| json!({}));
+    let can_camera = app.session.is_enabled("track.camera") && !app.session.is_camera_analyzing();
+    if button(app, ui, r1, "Track Camera", can_camera, "tracker.trackCamera") {
+        run(app, ctx, "track.camera", json!({}));
+    }
+    let can_warp = app.session.is_enabled("track.warpStabilizer") && !app.session.is_warp_analyzing();
+    if button(app, ui, r2, "Warp Stabilizer", can_warp, "tracker.warpStabilizer") {
+        run(app, ctx, "track.warpStabilizer", json!({}));
+    }
+    let y = y + 28.0;
+    let r1 = Rect::from_min_size(pos2(x0, y), vec2(half, 22.0));
+    let r2 = Rect::from_min_size(pos2(x0 + half + 6.0, y), vec2(half, 22.0));
+    if button(app, ui, r1, "Track Motion", can_track, "tracker.trackMotion") {
+        run(app, ctx, "track.motion", src_p.clone());
+    }
+    if button(app, ui, r2, "Stabilize Motion", can_track, "tracker.stabilizeMotion") {
+        run(app, ctx, "track.stabilize", src_p.clone());
+    }
+}
+
+/// The Tracker panel: the camera/warp and motion/stabilize buttons, Motion Source and Current
+/// Track pickers, the track type and its channels, Motion Target with Edit Target and Options, the
+/// four Analyze buttons (the one whose direction is running offers Stop), Reset and Apply, and the
+/// analysis progress. With a mask selected it switches to its mask-tracking mode. Every change runs a
+/// `track.*` command; while an analysis is running it polls the job and asks for repaints.
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let t = app.tokens;
     let ctx = ui.ctx().clone();
@@ -125,33 +158,11 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let w = (rect.width() - 20.0).max(120.0);
     let half = (w - 6.0) / 2.0;
     let mut y = rect.min.y + 10.0;
-    let has_comp = app.session.active_comp().is_some();
     let source = motion_source(app);
     let cur = current(app);
-    let can_track = has_comp && source.is_some();
 
-    // Track Camera / Warp Stabilizer and Track Motion / Stabilize Motion.
-    let r1 = Rect::from_min_size(pos2(x0, y), vec2(half, 22.0));
-    let r2 = Rect::from_min_size(pos2(x0 + half + 6.0, y), vec2(half, 22.0));
-    let src_p = source.map(|l| json!({"layer": l.0})).unwrap_or_else(|| json!({}));
-    let can_camera = app.session.is_enabled("track.camera") && !app.session.is_camera_analyzing();
-    if button(app, ui, r1, "Track Camera", can_camera, "tracker.trackCamera") {
-        run(app, &ctx, "track.camera", json!({}));
-    }
-    let can_warp = app.session.is_enabled("track.warpStabilizer") && !app.session.is_warp_analyzing();
-    if button(app, ui, r2, "Warp Stabilizer", can_warp, "tracker.warpStabilizer") {
-        run(app, &ctx, "track.warpStabilizer", json!({}));
-    }
-    y += 28.0;
-    let r1 = Rect::from_min_size(pos2(x0, y), vec2(half, 22.0));
-    let r2 = Rect::from_min_size(pos2(x0 + half + 6.0, y), vec2(half, 22.0));
-    if button(app, ui, r1, "Track Motion", can_track, "tracker.trackMotion") {
-        run(app, &ctx, "track.motion", src_p.clone());
-    }
-    if button(app, ui, r2, "Stabilize Motion", can_track, "tracker.stabilizeMotion") {
-        run(app, &ctx, "track.stabilize", src_p.clone());
-    }
-    y += 34.0;
+    top_buttons(app, ui, &ctx, x0, y, half, source);
+    y += 62.0;
     let Some(comp) = app.session.active_comp_arc() else {
         p.text(pos2(x0, y + 8.0), Align2::LEFT_CENTER, crate::i18n::tr("Open a composition to track motion."), Tokens::ui(12.0), t.text_faint);
         return;
@@ -170,7 +181,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         comp.layers.iter().enumerate().filter(|(_, l)| trackable(l)).map(|(i, l)| (l.id, format!("{}. {}", i + 1, l.name))).collect();
     let dd = Rect::from_min_size(pos2(field_x, y), vec2(field_w, 20.0));
     let name = source.and_then(|s| srcs.iter().find(|(l, _)| *l == s)).map(|(_, n)| n.clone()).unwrap_or_else(|| "None".into());
-    let did = egui::Id::new("tracker-source-dd");
+    let did = egui::Id::unique("tracker-source-dd");
     if widgets::dropdown(ui, dd, &name, &t, did).clicked() {
         widgets::open_popup(ui, did);
     }
@@ -195,7 +206,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         source.and_then(|s| comp.layer(s)).map(|l| l.trackers().map(|(g, _)| (g.uid, g.name.clone())).collect()).unwrap_or_default();
     let dd = Rect::from_min_size(pos2(field_x, y), vec2(field_w, 20.0));
     let cname = cur.and_then(|(_, u)| trackers.iter().find(|(g, _)| *g == u)).map(|(_, n)| n.clone()).unwrap_or_else(|| "None".into());
-    let did = egui::Id::new("tracker-current-dd");
+    let did = egui::Id::unique("tracker-current-dd");
     if widgets::dropdown(ui, dd, &cname, &t, did).clicked() && !trackers.is_empty() {
         widgets::open_popup(ui, did);
     }
@@ -226,7 +237,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     label(&p, pos2(x0, y + 10.0), "Track Type:", &t);
     let dd = Rect::from_min_size(pos2(field_x, y), vec2(field_w, 20.0));
     let kind = settings.as_ref().map(|s| s.kind).unwrap_or_default();
-    let did = egui::Id::new("tracker-type-dd");
+    let did = egui::Id::unique("tracker-type-dd");
     if widgets::dropdown(ui, dd, if enabled { kind.label() } else { "" }, &t, did).clicked() && enabled {
         widgets::open_popup(ui, did);
     }
@@ -246,7 +257,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         ("scale", "Scale", settings.as_ref().is_some_and(|s| s.scale)),
     ] {
         let cr = Rect::from_min_size(pos2(xx, y + 2.0), vec2(16.0, 16.0));
-        let resp = widgets::checkbox(ui, cr, on && transformish, &t, egui::Id::new(("tracker-cb", key)));
+        let resp = widgets::checkbox(ui, cr, on && transformish, &t, egui::Id::unique(("tracker-cb", key)));
         app.auto.add(&format!("tracker.{key}"), cr, text);
         p.text(pos2(cr.max.x + 4.0, cr.center().y), Align2::LEFT_CENTER, text, Tokens::ui(12.0), if transformish { t.text } else { t.text_faint });
         if resp.clicked() && transformish {
@@ -294,7 +305,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         (effectcraft_engine::tracking::Direction::FrameForward, true, true, "frameForward", "Analyze 1 frame forward"),
     ] {
         let r = Rect::from_min_size(pos2(bx, y), vec2(30.0, 22.0));
-        let resp = ui.interact(r, egui::Id::new(("tracker-analyze", id)), Sense::click()).on_hover_text(tip);
+        let resp = ui.interact(r, egui::Id::unique(("tracker-analyze", id)), Sense::click()).on_hover_text(tip);
         let stop = tracking && running_dir == Some(dir) && !frame;
         let on = enabled && (!tracking || stop);
         p.rect_filled(r, 4.0, if resp.hovered() && on { t.hover } else { t.field_bg });
@@ -366,7 +377,7 @@ fn mask_mode(app: &mut EffectcraftApp, ui: &mut egui::Ui, ctx: &egui::Context, p
     label(p, pos2(x0, y + 10.0), "Method:", &t);
     let method = app.session.state.mask_track_method;
     let dd = Rect::from_min_size(pos2(field_x, y), vec2(field_w, 20.0));
-    let did = egui::Id::new("tracker-mask-method-dd");
+    let did = egui::Id::unique("tracker-mask-method-dd");
     if widgets::dropdown(ui, dd, method.label(), &t, did).clicked() {
         widgets::open_popup(ui, did);
     }
@@ -387,7 +398,7 @@ fn mask_mode(app: &mut EffectcraftApp, ui: &mut egui::Ui, ctx: &egui::Context, p
         (effectcraft_engine::tracking::Direction::FrameForward, true, true, "frameForward", "Track selected masks 1 frame forward"),
     ] {
         let r = Rect::from_min_size(pos2(bx, y), vec2(30.0, 22.0));
-        let resp = ui.interact(r, egui::Id::new(("tracker-mask-track", id)), Sense::click()).on_hover_text(tip);
+        let resp = ui.interact(r, egui::Id::unique(("tracker-mask-track", id)), Sense::click()).on_hover_text(tip);
         let stop = running && running_dir == Some(dir) && !frame;
         let on = !running || stop;
         p.rect_filled(r, 4.0, if resp.hovered() && on { t.hover } else { t.field_bg });
@@ -530,7 +541,7 @@ pub fn options_dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens)
                 (LowConfidence::Adapt, "Adapt Feature"),
             ];
             let cur = actions.iter().find(|(a, _)| *a == d.opts.action).map(|(_, l)| *l).unwrap_or("Adapt Feature");
-            let r = egui::ComboBox::from_id_salt("track-action")
+            let r = craft_ui::ComboBox::from_id_salt("track-action")
                 .selected_text(cur)
                 .show_ui(ui, |ui| {
                     for (a, l) in actions {
@@ -583,7 +594,7 @@ pub fn target_dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens)
         ui.horizontal(|ui| {
             ui.label(crate::i18n::tr("Layer:"));
             let cur = d.target.and_then(|id| layers.iter().find(|(l, _)| *l == id)).map(|(_, n)| n.clone()).unwrap_or_else(|| "None".into());
-            let r = egui::ComboBox::from_id_salt("track-target")
+            let r = craft_ui::ComboBox::from_id_salt("track-target")
                 .selected_text(cur)
                 .width(240.0)
                 .show_ui(ui, |ui| {
@@ -616,7 +627,7 @@ pub fn apply_dialog(app: &mut EffectcraftApp, ctx: &egui::Context, t: &Tokens) {
         ui.horizontal(|ui| {
             ui.label(crate::i18n::tr("Apply Dimensions:"));
             let labels = ["X and Y", "X only", "Y only"];
-            let r = egui::ComboBox::from_id_salt("track-apply-dims")
+            let r = craft_ui::ComboBox::from_id_salt("track-apply-dims")
                 .selected_text(labels[d.dims.min(2)])
                 .show_ui(ui, |ui| {
                     for (i, l) in labels.iter().enumerate() {
diff --git a/crates/ui-egui/src/panels/unsaved.rs b/crates/ui-egui/src/panels/unsaved.rs
index 05f719fa9..b5fc582b2 100644
--- a/crates/ui-egui/src/panels/unsaved.rs
+++ b/crates/ui-egui/src/panels/unsaved.rs
@@ -58,6 +58,15 @@ pub fn on_close_requested(app: &mut EffectcraftApp, ctx: &egui::Context) {
     }
 }
 
+/// On macOS a close that nothing held open quits through `-[NSApplication terminate:]` instead:
+/// closing the window while AppKit's run loop is running crashes on a Mac with a Touch Bar
+/// (#341). `on_exit` still runs. A desktop host calls it last in `logic`, after
+/// `EffectcraftApp::tick` (which runs [`on_close_requested`]) and its own work. Returns whether
+/// that quit was scheduled; other platforms close the window as before.
+pub fn quit_on_close(ctx: &egui::Context) -> bool {
+    craft_quit::on_close_request(ctx)
+}
+
 /// The project's display name: its file name, or `Untitled Project.ecproj`.
 pub fn project_name(app: &EffectcraftApp) -> String {
     app.session
@@ -207,6 +216,24 @@ mod tests {
         out.viewport_output.get(&egui::ViewportId::ROOT).is_some_and(|v| v.commands.contains(&egui::ViewportCommand::CancelClose))
     }
 
+    /// One frame of the dialogs with the window's close button pressed, through
+    /// [`on_close_requested`] and then [`quit_on_close`] as the app runs them; returns whether the
+    /// close was canceled and whether the platform quit was scheduled.
+    fn close_frame(app: &mut EffectcraftApp, ctx: &egui::Context) -> (bool, bool) {
+        let mut raw = egui::RawInput::default();
+        raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+        let mut quits = false;
+        let mut out = ctx.run_ui(raw, |ui| {
+            app.auto.begin_frame();
+            on_close_requested(app, ui.ctx());
+            quits = quit_on_close(ui.ctx());
+            crate::panels::dialogs::show(app, ui.ctx());
+        });
+        out.textures_delta.clear();
+        let canceled = out.viewport_output.get(&egui::ViewportId::ROOT).is_some_and(|v| v.commands.contains(&egui::ViewportCommand::CancelClose));
+        (canceled, quits)
+    }
+
     fn modified(app: &mut EffectcraftApp) {
         app.session.execute("comp.new", json!({"name": "Main", "width": 64, "height": 64})).unwrap();
         assert!(app.session.is_dirty());
@@ -340,4 +367,81 @@ mod tests {
         assert!(!app.session.is_dirty());
         assert!(!frame(&mut app, &ctx, true));
     }
+
+    /// Closing the window while AppKit's run loop is running crashes on a Mac with a Touch Bar
+    /// (#341). On macOS the close is canceled and the app quits through
+    /// `-[NSApplication terminate:]`. Other platforms close the window.
+    #[test]
+    fn closing_a_saved_project_quits_through_the_platform_on_macos() {
+        let (mut app, ctx) = app();
+        let macos = cfg!(target_os = "macos");
+        assert_eq!(close_frame(&mut app, &ctx), (macos, macos));
+        assert!(app.dialog.is_none(), "nothing to ask");
+    }
+
+    #[test]
+    fn closing_a_modified_project_asks_before_the_platform_quit() {
+        let (mut app, ctx) = app();
+        modified(&mut app);
+        assert_eq!(close_frame(&mut app, &ctx), (true, false), "the prompt holds the window and nothing quits");
+        assert_eq!(app.dialog, Some(Dialog::UnsavedChanges));
+        answer_with(&mut app, &ctx, Answer::Cancel);
+        assert!(app.session.is_dirty() && !app.dialog_state.unsaved.quitting);
+        assert_eq!(close_frame(&mut app, &ctx), (true, false), "asked again after Cancel");
+        answer_with(&mut app, &ctx, Answer::Discard);
+        let macos = cfg!(target_os = "macos");
+        assert_eq!(close_frame(&mut app, &ctx), (macos, macos), "Don't Save quits");
+    }
+
+    /// While the window is minimized or hidden, eframe runs `App::logic` without `App::ui` and
+    /// still handles a close: `logic` asks about a modified project.
+    #[test]
+    fn a_close_while_only_logic_runs_asks_about_a_modified_project() {
+        let (mut app, ctx) = app();
+        modified(&mut app);
+        let mut raw = egui::RawInput::default();
+        raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+        let mut frame = eframe::Frame::_new_kittest();
+        let out = ctx.run_logic(&raw, |ctx| eframe::App::logic(&mut app, ctx, &mut frame));
+        let canceled = out.viewport_commands.get(&egui::ViewportId::ROOT).is_some_and(|c| c.contains(&egui::ViewportCommand::CancelClose));
+        assert!(canceled, "the close is canceled");
+        assert_eq!(app.dialog, Some(Dialog::UnsavedChanges));
+    }
+
+    /// A file dialog answered in the frame that closes the window runs its command before the
+    /// close decision, so a change it makes is asked about.
+    #[test]
+    fn a_dialog_answer_runs_before_the_close_decision() {
+        let (mut app, ctx) = app();
+        assert!(!app.session.is_dirty());
+        let answer = crate::DialogAnswer { command: "comp.new".into(), key: "name", params: json!({"width": 64, "height": 64}), paths: vec!["Main".into()] };
+        app.dialog_answers.0.send(answer).unwrap();
+        let mut raw = egui::RawInput::default();
+        raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+        let mut frame = eframe::Frame::_new_kittest();
+        let out = ctx.run_logic(&raw, |ctx| eframe::App::logic(&mut app, ctx, &mut frame));
+        let canceled = out.viewport_commands.get(&egui::ViewportId::ROOT).is_some_and(|c| c.contains(&egui::ViewportCommand::CancelClose));
+        assert!(app.session.is_dirty(), "the answer ran");
+        assert!(canceled, "the close is canceled");
+        assert_eq!(app.dialog, Some(Dialog::UnsavedChanges));
+    }
+
+    /// The tick makes the close decision and leaves the platform quit to the host, which runs it
+    /// last in `logic`, after its own work (the desktop host shows the file dialogs asked for).
+    /// On macOS `logic` cancels the close and quits; other platforms close the window.
+    #[test]
+    fn the_platform_quit_runs_after_the_tick() {
+        let (mut app, ctx) = app();
+        let mut raw = egui::RawInput::default();
+        raw.viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+        let frame = eframe::Frame::_new_kittest();
+        let canceled =
+            |out: &egui::LogicOutput| out.viewport_commands.get(&egui::ViewportId::ROOT).is_some_and(|c| c.contains(&egui::ViewportCommand::CancelClose));
+        let out = ctx.run_logic(&raw, |ctx| app.tick(ctx, &frame));
+        assert!(!canceled(&out), "the tick leaves a saved project's close to the host");
+        let mut frame = eframe::Frame::_new_kittest();
+        let out = ctx.run_logic(&raw, |ctx| eframe::App::logic(&mut app, ctx, &mut frame));
+        assert_eq!(canceled(&out), cfg!(target_os = "macos"), "logic quits through the platform on macOS");
+        assert!(app.dialog.is_none(), "nothing to ask");
+    }
 }
diff --git a/crates/ui-egui/src/panels/viewer.rs b/crates/ui-egui/src/panels/viewer.rs
index 51bab7fda..bcae99bc5 100644
--- a/crates/ui-egui/src/panels/viewer.rs
+++ b/crates/ui-egui/src/panels/viewer.rs
@@ -37,8 +37,9 @@ impl ViewerMap {
     }
 }
 
+/// The `egui::Id` under which the last pass's `ViewerMap` is published.
 fn map_id() -> egui::Id {
-    egui::Id::new("viewer-map")
+    egui::Id::unique("viewer-map")
 }
 
 pub fn comp_to_screen(ctx: &egui::Context, p: [f32; 2]) -> Option<Pos2> {
@@ -53,720 +54,68 @@ pub fn screen_to_comp(ctx: &egui::Context, p: Pos2) -> Option<[f64; 2]> {
 
 /// The fit magnification from the last frame.
 pub fn last_fit(ctx: &egui::Context) -> f32 {
-    ctx.data(|d| d.get_temp::<f32>(egui::Id::new("viewer-fit"))).unwrap_or(0.5)
-}
-
-/// What a drag in the viewer is doing.
-#[derive(Clone, Debug)]
-enum Gesture {
-    /// Per layer: start position and the parent-space change per comp pixel of drag in x and y.
-    Move {
-        layers: Vec<(LayerId, [f64; 3], [f64; 3], [f64; 3])>,
-        start: [f64; 2],
-        /// The grabbed layer's feature nearest the pointer (comp px at the start): it snaps.
-        snap_src: Option<[f64; 2]>,
-    },
-    Camera {
-        tool: Tool,
-    },
-    /// A bounding-box handle: scales about the anchor point so the grabbed point follows the
-    /// pointer (corners both axes, edges one), relative to the layer as the drag began; the
-    /// handle snaps.
-    Scale {
-        layer: LayerId,
-        start_scale: [f64; 3],
-        /// The grabbed point relative to the anchor, in layer pixels.
-        start_local: [f64; 2],
-        /// The handle's point relative to the anchor, in layer pixels.
-        handle: [f64; 2],
-        anchor: [f64; 2],
-        axes: [bool; 2],
-        /// Layer pixels → comp as the drag began, and its inverse.
-        l2c: Mat3,
-        inv: Mat3,
-        /// The other selected layers and their scales as the drag began: they scale by the same
-        /// ratio about their own anchor points, as in After Effects (#491).
-        others: Vec<(LayerId, [f64; 3])>,
-    },
-    Rotate {
-        layer: LayerId,
-        center: Pos2,
-        /// The pointer's angle about the centre on the last frame (degrees, as atan2 gives it).
-        last_angle: f64,
-        /// The turn so far, summed frame by frame so it keeps counting past a full revolution in
-        /// either direction (After Effects: 1x +0.0°, −1x −90.0°…) instead of wrapping at ±180°.
-        turned: f64,
-        start_rot: f64,
-        /// The other selected layers and their rotations: they turn by the same angle.
-        others: Vec<(LayerId, f64)>,
-    },
-    Anchor {
-        layer: LayerId,
-        start_anchor: [f64; 3],
-        start_pos: [f64; 3],
-        start: [f64; 2],
-        inv: Mat3,
-        l2p: Mat3,
-        /// The layer's own snap targets as the drag began (its box and path vertices).
-        own: Vec<effectcraft_engine::viewer::SnapTarget>,
-        /// Alt held as the drag began: the anchor point moves alone, so the layer shifts.
-        anchor_only: bool,
-    },
-    Pan {
-        start_pan: [f32; 2],
-    },
-    Create {
-        tool: Tool,
-        start: [f64; 2],
-    },
-    Marquee {
-        start: Pos2,
-    },
-    /// Dragging selected mask / shape path vertices: press point, the grabbed vertex (comp px,
-    /// it snaps), the comp-space move applied so far and comp → path space.
-    Vertices {
-        start: [f64; 2],
-        src: [f64; 2],
-        applied: [f64; 2],
-        inv: Mat3,
-        layer: LayerId,
-    },
-    /// Dragging a vertex's Bezier tangent (both sides symmetric unless Alt breaks them).
-    Tangent {
-        layer: LayerId,
-        mask: u64,
-        index: usize,
-        out: bool,
-        vertex: [f64; 2],
-        inv: Mat3,
-    },
-    /// Dragging a Puppet pin (comp → layer matrix inverse).
-    PuppetPin {
-        layer: LayerId,
-        pin: u64,
-        inv: Mat3,
-    },
-    /// Rotating an Advanced / Bend pin by its ring: the pin's screen centre, the pointer's last
-    /// angle (radians) and the rotation so far (°, accumulated so it can pass a full turn).
-    PuppetRotate {
-        layer: LayerId,
-        pin: u64,
-        center: Pos2,
-        last: f32,
-        rotation: f64,
-    },
-    /// Scaling an Advanced / Bend pin by its square: the pin's screen centre, the press distance
-    /// from it and the scale at the press (1 = 100 %).
-    PuppetScale {
-        layer: LayerId,
-        pin: u64,
-        center: Pos2,
-        start: f32,
-        scale: f64,
-    },
-    /// Puppet tools: a marquee selecting pins (dragged outside the layer's art, or Alt-dragged).
-    PinMarquee {
-        start: Pos2,
-    },
-    /// Object Matte tool: a box around the object (screen point where the drag began).
-    ObjectMatteBox {
-        start: Pos2,
-    },
-    /// Puppet tool Record mode (⌘/Ctrl-drag a pin): the drag is sampled in real time (seconds
-    /// since it began, effect space) and becomes keyframes on release (`puppet.recordPin`); the
-    /// current time runs along while recording.
-    PuppetRecord {
-        layer: LayerId,
-        pin: u64,
-        /// Other selected pins of the layer, moving with the dragged one.
-        others: Vec<u64>,
-        inv: Mat3,
-        began: f64,
-        cti: Tick,
-        samples: Vec<(f64, [f64; 2])>,
-    },
-    /// Pen tool: pulling the tangents of the vertex just placed.
-    Pen {
-        layer: LayerId,
-        mask: u64,
-        index: usize,
-        vertex: [f64; 2],
-        inv: Mat3,
-        press: Pos2,
-    },
-    /// Dragging a track point's feature/search region, a corner or its attach point.
-    Track {
-        layer: LayerId,
-        tracker: u64,
-        drag: super::tracker::Drag,
-    },
-    /// Motion paths, free transform, Mask Feather, guides and the region of interest
-    /// (`viewer_overlays`).
-    Overlay(ov::Drag),
-}
-
-/// Pen tool path in progress: (layer, mask uid).
-fn pen_id() -> egui::Id {
-    egui::Id::new("viewer-pen")
+    ctx.data(|d| d.get_temp::<f32>(egui::Id::unique("viewer-fit"))).unwrap_or(0.5)
 }
 
 use super::viewer_overlays::{self as ov, VertexHit};
 use super::viewer_tools as vt;
 
-const HANDLE: f32 = 7.0;
-/// How close (screen points) the pointer must be to a path vertex or tangent handle to grab it.
-const VERTEX_GRAB: f32 = 6.0;
-
-/// The reach of a path vertex at `pos` (#1042): a vertex marker sitting under, or just beside, a
-/// bounding-box handle would lose the press to the handle (the handle reaches further than the
-/// vertex), so wherever a box handle is in range the vertex reaches as far as the handle does.
-/// Vertices then win in the handle's whole zone, as in After Effects.
-fn vertex_grab_radius(pos: Pos2, handles: impl IntoIterator<Item = Pos2>) -> f32 {
-    if handles.into_iter().any(|h| h.distance(pos) < HANDLE + 2.0) { HANDLE + 2.0 } else { VERTEX_GRAB }
-}
-/// Shown when a Roto Brush tool is used in the Composition panel (#753).
-const ROTO_HINT: &str = "The Roto Brush works in the Layer panel. Double-click the layer to open it.";
-
 thread_local! {
     /// The 3D view camera of the viewer being drawn (None = the comp's active camera).
     static VIEW_CAM: std::cell::Cell<Option<CameraState>> = const { std::cell::Cell::new(None) };
 }
 
-/// Region of interest handles on screen: corners (0–3, clockwise from top-left) then edge
-/// midpoints (4 top, 5 right, 6 bottom, 7 left).
-fn roi_handles(r: Rect) -> [Pos2; 8] {
-    [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom(), r.center_top(), r.right_center(), r.center_bottom(), r.left_center()]
-}
-
-/// A drag starting on a region of interest handle: the ROI redrawn from the opposite corner (or
-/// edge, with the other axis kept).
-fn roi_drag(app: &EffectcraftApp, map: &ViewerMap, comp_rect: Rect, zoom: f32, press: Pos2) -> Option<ov::Drag> {
-    let [rx, ry, rw, rh] = app.session.state.region_of_interest?;
-    let r = Rect::from_min_size(comp_rect.min + vec2(rx as f32 * zoom, ry as f32 * zoom), vec2(rw as f32 * zoom, rh as f32 * zoom));
-    let i = roi_handles(r).iter().position(|h| h.distance(press) < 6.0)?;
-    let (x0, y0, x1, y1) = (rx, ry, rx + rw, ry + rh);
-    let _ = map;
-    Some(match i {
-        0 => ov::Drag::Roi { start: [x1, y1], keep: [None, None] },
-        1 => ov::Drag::Roi { start: [x0, y1], keep: [None, None] },
-        2 => ov::Drag::Roi { start: [x0, y0], keep: [None, None] },
-        3 => ov::Drag::Roi { start: [x1, y0], keep: [None, None] },
-        4 => ov::Drag::Roi { start: [x1, y1], keep: [Some(x0), None] },
-        5 => ov::Drag::Roi { start: [x0, y0], keep: [None, Some(y1)] },
-        6 => ov::Drag::Roi { start: [x0, y0], keep: [Some(x1), None] },
-        _ => ov::Drag::Roi { start: [x1, y0], keep: [None, Some(y1)] },
-    })
-}
-
-/// The camera the viewer shows (view camera or the comp's active camera).
-fn cam_state(ctx: &EvalCtx) -> CameraState {
-    VIEW_CAM.with(|c| c.get()).unwrap_or_else(|| three_d::active_camera(ctx))
-}
-
-/// Layer → comp (viewer) matrix through the current 3D view.
-pub(crate) fn l2c(ctx: &EvalCtx, layer: &Layer) -> (Mat3, f64) {
-    match VIEW_CAM.with(|c| c.get()) {
-        Some(cam) if layer.is_3d() => (three_d::layer_to_view(ctx, layer, &cam), 0.0),
-        _ => ctx.layer_to_comp(layer),
-    }
-}
-
-/// `l2c` (layer → comp) applied from effect space instead: effect points and Puppet pins,
-/// measured from the top-left of the layer's effect bounds (see `effect_bounds`).
-pub(crate) fn from_effect_space(ctx: &EvalCtx, layer: &Layer, l2c: Mat3) -> Mat3 {
-    let o = ctx.effect_bounds(layer).1;
-    l2c * Mat3::translate(gv2(o[0], o[1]))
-}
-
-/// Effect space → comp (viewer) matrix through the current 3D view.
-pub(crate) fn fx2c(ctx: &EvalCtx, layer: &Layer) -> Mat3 {
-    from_effect_space(ctx, layer, l2c(ctx, layer).0)
-}
-
-/// The selected, unlocked layers of `comp` other than `layer` (when `layer` is one of them): a
-/// handle or Rotation tool drag on one changes them all.
-fn selected_others<'a>(app: &EffectcraftApp, comp: &'a Comp, layer: LayerId) -> Vec<&'a Layer> {
-    let sel = &app.session.state.selected_layers;
-    if !sel.contains(&layer) {
-        return vec![];
-    }
-    sel.iter().filter(|id| **id != layer).filter_map(|id| comp.layer(*id)).filter(|l| !l.switches.locked && l.transform().is_some()).collect()
-}
-
-/// The least homogeneous depth (`w`: the distance in front of a perspective camera in pixels, 1
-/// for 2D layers and orthographic views) a viewer outline is drawn at: points at or behind the
-/// camera would flip through infinity and draw long lines across the viewer (#572).
-const NEAR_W: f64 = 0.5;
-
-/// `p` through the homography `m` before the perspective divide: (x, y, w).
-fn homogeneous(m: &Mat3, p: [f64; 2]) -> [f64; 3] {
-    let r = |i: usize| m.0.get(i).map_or(0.0, |row| row[0] * p[0] + row[1] * p[1] + row[2]);
-    [r(0), r(1), r(2)]
-}
-
-/// The closed polygon `poly` (layer pixels) through `m`, clipped to the part in front of the
-/// camera's near plane (comp pixels; empty when none of it is).
-fn project_clipped(m: &Mat3, poly: &[[f64; 2]]) -> Vec<[f64; 2]> {
-    let h: Vec<[f64; 3]> = poly.iter().map(|p| homogeneous(m, *p)).collect();
-    let mut out = vec![];
-    for (i, a) in h.iter().enumerate() {
-        let Some(b) = h.get((i + 1) % h.len()) else { continue };
-        let (ina, inb) = (a[2] >= NEAR_W, b[2] >= NEAR_W);
-        if ina {
-            out.push(*a);
-        }
-        if ina != inb {
-            let t = (NEAR_W - a[2]) / (b[2] - a[2]);
-            out.push([a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t, NEAR_W]);
-        }
-    }
-    out.iter().map(|q| [q[0] / q[2], q[1] / q[2]]).filter(|q| q[0].is_finite() && q[1].is_finite()).collect()
-}
-
-/// The segment a → b (world space) through the projection `pc`, clipped at the near plane.
-fn project_segment(pc: &effectcraft_engine::geom::Mat4, a: effectcraft_engine::geom::Vec3, b: effectcraft_engine::geom::Vec3) -> Option<[[f64; 2]; 2]> {
-    let h = |p: effectcraft_engine::geom::Vec3| {
-        let r = |i: usize| pc.0.get(i).map_or(0.0, |row| row[0] * p.x + row[1] * p.y + row[2] * p.z + row[3]);
-        [r(0), r(1), r(3)]
-    };
-    let (mut ha, mut hb) = (h(a), h(b));
-    if ha[2] < NEAR_W && hb[2] < NEAR_W {
-        return None;
-    }
-    let cut = |p: [f64; 3], q: [f64; 3]| {
-        let t = (NEAR_W - p[2]) / (q[2] - p[2]);
-        [p[0] + (q[0] - p[0]) * t, p[1] + (q[1] - p[1]) * t, NEAR_W]
-    };
-    if ha[2] < NEAR_W {
-        ha = cut(ha, hb);
-    } else if hb[2] < NEAR_W {
-        hb = cut(hb, ha);
-    }
-    let d = |q: [f64; 3]| [q[0] / q[2], q[1] / q[2]];
-    let s = [d(ha), d(hb)];
-    s.iter().flatten().all(|v| v.is_finite()).then_some(s)
-}
-
-/// The content box corners (layer pixels) of `layer`.
-fn box_corners(b: [f64; 4]) -> [[f64; 2]; 4] {
-    [[b[0], b[1]], [b[2], b[1]], [b[2], b[3]], [b[0], b[3]]]
-}
-
-/// Layer → comp matrix and its bounds quad (in comp pixels). None for a 3D layer reaching to or
-/// behind the camera (its quad would flip; [`layer_outline`] draws the part in front).
-pub(crate) fn layer_quad(ctx: &EvalCtx, layer: &Layer) -> Option<(Mat3, [[f64; 2]; 4], [f64; 4])> {
-    let b = effectcraft_engine::render::content_bounds(ctx, layer)?;
-    let (m, _) = l2c(ctx, layer);
-    let corners = box_corners(b);
-    if corners.iter().any(|p| homogeneous(&m, *p)[2] < NEAR_W) {
-        return None;
-    }
-    let pts = corners.map(|p| {
-        let q = m.apply(gv2(p[0], p[1]));
-        [q.x, q.y]
-    });
-    Some((m, pts, b))
-}
-
-/// The outline of a layer's content box in comp pixels, clipped at the camera's near plane.
-pub(crate) fn layer_outline(ctx: &EvalCtx, layer: &Layer) -> Vec<[f64; 2]> {
-    let Some(b) = effectcraft_engine::render::content_bounds(ctx, layer) else { return vec![] };
-    project_clipped(&l2c(ctx, layer).0, &box_corners(b))
-}
-
-/// Which axes a bounding-box handle scales: corners (0–3) both; the top and bottom edges (4, 6)
-/// y; the right and left edges (5, 7) x.
-fn handle_axes(handle: usize) -> [bool; 2] {
-    match handle {
-        4 | 6 => [false, true],
-        5 | 7 => [true, false],
-        _ => [true, true],
-    }
-}
-
-/// A bounding-box handle's point in layer pixels (`b`: the content box; handles as in
-/// [`handle_axes`], the corners clockwise from the top left, then the top, right, bottom and
-/// left edges' midpoints).
-fn handle_point(b: [f64; 4], handle: usize) -> [f64; 2] {
-    let (cx, cy) = ((b[0] + b[2]) / 2.0, (b[1] + b[3]) / 2.0);
-    match handle {
-        0 => [b[0], b[1]],
-        1 => [b[2], b[1]],
-        2 => [b[2], b[3]],
-        3 => [b[0], b[3]],
-        4 => [cx, b[1]],
-        5 => [b[2], cy],
-        6 => [cx, b[3]],
-        _ => [b[0], cy],
-    }
-}
-
-/// The resize cursor over bounding-box handle `handle` of the on-screen box `sq` (corners
-/// clockwise from the top left, handles as in [`handle_point`]): along the direction the handle
-/// scales, so it turns with the layer, as in After Effects. A corner points between its two
-/// edges (the box's diagonal whatever its proportions), an edge handle across its edge.
-fn handle_cursor(sq: &[Pos2], handle: usize) -> egui::CursorIcon {
-    let at = |k: usize| sq.get(k % 4).copied().unwrap_or(Pos2::ZERO);
-    let dir = if handle < 4 {
-        let c = at(handle);
-        (c - at(handle + 3)).normalized() + (c - at(handle + 1)).normalized()
-    } else {
-        let e = at(handle - 3) - at(handle - 4);
-        vec2(-e.y, e.x)
-    };
-    // Screen y points down: 45° is the south-east diagonal.
-    let a = dir.y.atan2(dir.x).to_degrees().rem_euclid(180.0);
-    if !(22.5..157.5).contains(&a) {
-        egui::CursorIcon::ResizeHorizontal
-    } else if a < 67.5 {
-        egui::CursorIcon::ResizeNwSe
-    } else if a < 112.5 {
-        egui::CursorIcon::ResizeVertical
-    } else {
-        egui::CursorIcon::ResizeNeSw
-    }
-}
-
-/// The scale ratio (x, y) that puts the point grabbed at `start` (relative to the anchor, layer
-/// pixels) under the pointer at `cur`. `uniform` (Shift on a corner) keeps the aspect ratio,
-/// following the pointer along the handle's diagonal. Dragging past the anchor flips the layer,
-/// as in After Effects; an axis whose grabbed point sits on the anchor keeps its scale.
-fn drag_ratio(start: [f64; 2], cur: [f64; 2], axes: [bool; 2], uniform: bool) -> [f64; 2] {
-    if uniform {
-        let d2 = start[0] * start[0] + start[1] * start[1];
-        let f = if d2 > 1e-6 { (cur[0] * start[0] + cur[1] * start[1]) / d2 } else { 1.0 };
-        return [f, f];
-    }
-    [0, 1].map(|k| if axes[k] && start[k].abs() > 1e-3 { cur[k] / start[k] } else { 1.0 })
-}
-
-/// Snap a handle drag (#252): the handle (`h`, layer pixels from the anchor point `a` as the
-/// drag began; `l2c` that layer space → comp) at scale ratio `f` goes through `snap` (a comp
-/// point → its correction), and the ratio that puts the handle where it snapped comes back.
-/// A `uniform` drag slides the handle along its line from the anchor point to the nearer snapped
-/// line; otherwise each scaled axis takes the snapped point.
-fn snap_handle(f: [f64; 2], h: [f64; 2], a: [f64; 2], l2c: &Mat3, axes: [bool; 2], uniform: bool, snap: impl FnOnce([f64; 2]) -> [f64; 2]) -> [f64; 2] {
-    let at = |f: [f64; 2]| {
-        let q = l2c.apply(gv2(a[0] + f[0] * h[0], a[1] + f[1] * h[1]));
-        [q.x, q.y]
-    };
-    let p = at(f);
-    let c = snap(p);
-    let s = [p[0] + c[0], p[1] + c[1]];
-    if uniform {
-        let o = at([0.0; 2]);
-        let d = [p[0] - o[0], p[1] - o[1]];
-        let k = [0, 1].into_iter().filter(|k| c[*k] != 0.0 && d[*k].abs() > 1e-9).min_by(|x, y| c[*x].abs().total_cmp(&c[*y].abs()));
-        return k.map_or(f, |k| f.map(|v| v * (s[k] - o[k]) / d[k]));
-    }
-    let Some(inv) = l2c.inverse().filter(|_| c != [0.0; 2]) else { return f };
-    let q = inv.apply(gv2(s[0], s[1]));
-    let q = [q.x - a[0], q.y - a[1]];
-    [0, 1].map(|k| if axes[k] && h[k].abs() > 1e-9 { q[k] / h[k] } else { f[k] })
-}
-
-/// The turn from angle `from` to angle `to` (degrees), wrapped to (−180°, 180°]: the shortest way
-/// round, so summing it frame by frame follows the pointer across atan2's ±180° seam and past full
-/// revolutions. Non-finite input turns by nothing.
-fn turn_delta(from: f64, to: f64) -> f64 {
-    let d = to - from;
-    if !d.is_finite() {
-        return 0.0;
-    }
-    let w = (d + 180.0).rem_euclid(360.0) - 180.0;
-    if w <= -180.0 { w + 360.0 } else { w }
-}
-
-/// The Rotation tool's value: the rotation as the drag began plus the turn so far (which may span
-/// revolutions), snapped to 45° steps with Shift.
-fn rotate_value(start_rot: f64, turned: f64, shift: bool) -> f64 {
-    let r = start_rot + turned;
-    let r = if r.is_finite() { r } else { start_rot };
-    if shift { (r / 45.0).round() * 45.0 } else { r }
-}
-
-/// A drag `d` (comp pixels), kept to the axis it moves along most when `shift` is held.
-fn one_axis(d: [f64; 2], shift: bool) -> [f64; 2] {
-    if !shift {
-        d
-    } else if d[0].abs() > d[1].abs() {
-        [d[0], 0.0]
-    } else {
-        [0.0, d[1]]
-    }
-}
-
-fn point_in_quad(p: [f64; 2], q: &[[f64; 2]; 4]) -> bool {
-    let mut sign = 0.0;
-    for i in 0..4 {
-        let a = q[i];
-        let b = q[(i + 1) % 4];
-        let c = (b[0] - a[0]) * (p[1] - a[1]) - (b[1] - a[1]) * (p[0] - a[0]);
-        if c.abs() < 1e-9 {
-            continue;
-        }
-        if sign == 0.0 {
-            sign = c.signum();
-        } else if c.signum() != sign {
-            return false;
-        }
-    }
-    true
-}
-
-/// Separating-axis test: a marquee may cross a layer without containing any corner.
-fn quad_intersects_box(q: &[[f64; 2]; 4], a: [f64; 2], b: [f64; 2]) -> bool {
-    if q.iter().flatten().chain(a.iter()).chain(b.iter()).any(|v| !v.is_finite()) {
-        return false;
-    }
-    let lo = [a[0].min(b[0]), a[1].min(b[1])];
-    let hi = [a[0].max(b[0]), a[1].max(b[1])];
-    let rect = [lo, [hi[0], lo[1]], hi, [lo[0], hi[1]]];
-    let axes = [[1.0, 0.0], [0.0, 1.0]].into_iter().chain((0..4).map(|i| {
-        let j = (i + 1) % 4;
-        [q[j][1] - q[i][1], q[i][0] - q[j][0]]
-    }));
-    for axis in axes {
-        let project = |p: &[f64; 2]| p[0] * axis[0] + p[1] * axis[1];
-        let (qmin, qmax) = q.iter().map(project).fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), v| (lo.min(v), hi.max(v)));
-        let (rmin, rmax) = rect.iter().map(project).fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), v| (lo.min(v), hi.max(v)));
-        if qmax < rmin || rmax < qmin {
-            return false;
-        }
-    }
-    true
-}
-
-/// Parent-space linear inverse (to convert a comp-space drag delta into a position delta).
-fn parent_inverse(ctx: &EvalCtx, layer: &Layer) -> Mat3 {
-    match layer.parent.and_then(|p| ctx.comp.layer(p)) {
-        Some(p) => {
-            let w = ctx.world_matrix(p);
-            let m = Mat3([[w.0[0][0], w.0[0][1], 0.0], [w.0[1][0], w.0[1][1], 0.0], [0.0, 0.0, 1.0]]);
-            m.inverse().unwrap_or(Mat3::IDENTITY)
-        }
-        None => Mat3::IDENTITY,
-    }
-}
-
-/// Draw the extra views of a 2- or 4-view layout and return the main view's rectangle.
-fn aux_views(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    comp: &effectcraft_engine::project::Comp,
+/// Draw the Composition viewer in `rect` and handle its input for one pass.
+/// Publishes the fit magnification and `ViewerMap`, requests and draws the frame, then paints the nav breadcrumbs,
+/// view layout, guides/grid, layer boxes, handles, anchors, 3D gizmos, motion paths, masks, puppet pins and tracker
+/// overlays and records their automation regions. Pointer and drop gestures run engine commands
+/// (move/scale/rotate/anchor/camera/shape/mask/guide edits, picks, marquees); failures worth showing go to
+/// `app.ui.status`, while per-frame drag updates ignore errors so a gesture is not aborted mid-drag. With no active
+/// composition it draws `empty_state` and returns.
+/// What the passes of one viewer frame share (see [`show`]).
+struct Vw<'a> {
+    t: Tokens,
     cid: effectcraft_engine::project::ItemId,
-    full: Rect,
-    bg: Color32,
-) -> Rect {
-    let n = app.session.state.view_layout;
-    if n < 2 {
-        return full;
-    }
-    let gap = 2.0;
-    let views = app.session.state.views3d.get(&cid).cloned().unwrap_or_default();
-    let (main, aux): (Rect, Vec<(Rect, View3D)>) = if n == 2 {
-        let mid = full.center().x;
-        (
-            Rect::from_min_max(pos2(mid + gap / 2.0, full.min.y), full.max),
-            vec![(Rect::from_min_max(full.min, pos2(mid - gap / 2.0, full.max.y)), views.pane(0))],
-        )
-    } else {
-        let c = full.center();
-        let q = |x0: f32, y0: f32, x1: f32, y1: f32| Rect::from_min_max(pos2(x0, y0), pos2(x1, y1));
-        (
-            q(c.x + gap / 2.0, c.y + gap / 2.0, full.max.x, full.max.y),
-            vec![
-                (q(full.min.x, full.min.y, c.x - gap / 2.0, c.y - gap / 2.0), views.pane(0)),
-                (q(c.x + gap / 2.0, full.min.y, full.max.x, c.y - gap / 2.0), views.pane(1)),
-                (q(full.min.x, c.y + gap / 2.0, c.x - gap / 2.0, full.max.y), views.pane(2)),
-            ],
-        )
-    };
-    let ctx = ui.ctx().clone();
-    let p = ui.painter().clone();
-    p.rect_filled(full, 0.0, Color32::from_black_alpha(200));
-    let t = app.session.time();
-    let (cw, ch) = (comp.width as f32, comp.height as f32);
-    let share = app.session.state.share_view_options;
-    // The camera and light wireframes of each view (as in After Effects, where every view of the
-    // layout shows them), evaluated on a snapshot of the project.
-    let snap_project = app.session.project.clone();
-    let snap_expr = app.session.expr.clone();
-    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp, time: t, expr: snap_expr.as_deref(), footage: None };
-    let selected = app.session.state.selected_layers.clone();
-    let mut picked: Option<(usize, View3D)> = None;
-    for (i, (r, v)) in aux.into_iter().enumerate() {
-        p.rect_filled(r, 0.0, bg);
-        let fit = ((r.width() - 20.0) / cw).min((r.height() - 20.0) / ch).max(0.01);
-        let cr = Rect::from_center_size(r.center(), vec2(cw * fit, ch * fit));
-        let scale = (fit * ctx.pixels_per_point()).min(1.0) as f64;
-        // The Active Camera pane renders through the comp's own camera; the others through their
-        // view camera.
-        let through_active = v == View3D::ActiveCamera;
-        let cam = if through_active { three_d::active_camera(&ectx) } else { views.cam(v, comp.width as f64, comp.height as f64).state() };
-        let key = {
-            use std::hash::{Hash, Hasher};
-            let mut h = std::collections::hash_map::DefaultHasher::new();
-            (app.session.revision, cid.0, t.0, i, scale.to_bits(), format!("{cam:?}")).hash(&mut h);
-            h.finish()
-        };
-        let id = egui::Id::new(("viewer-aux", i));
-        let cached: Option<(u64, egui::TextureHandle)> = ctx.data(|d| d.get_temp(id));
-        let tex = match cached {
-            Some((k, tex)) if k == key => tex,
-            _ => {
-                let opts = effectcraft_engine::render::RenderOpts {
-                    scale,
-                    view: (comp.has_3d() && !through_active).then_some(cam),
-                    draft: true,
-                    ..Default::default()
-                };
-                let img = app.session.render(cid, t, opts);
-                let tex = crate::frames::load_fitted(&ctx, format!("viewer-aux-{i}"), crate::frames::to_color_image(&img), egui::TextureOptions::LINEAR);
-                ctx.data_mut(|d| d.insert_temp(id, (key, tex.clone())));
-                tex
-            }
-        };
-        let b = comp.background;
-        p.rect_filled(cr, 0.0, Color32::from_rgb((b[0] * 255.0) as u8, (b[1] * 255.0) as u8, (b[2] * 255.0) as u8));
-        p.image(tex.id(), cr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
-        p.rect_stroke(cr, 0.0, Stroke::new(1.0, Color32::from_black_alpha(160)), StrokeKind::Outside);
-        if share && app.ui.viewer.safe_margins {
-            for k in [0.9, 0.8] {
-                p.rect_stroke(Rect::from_center_size(cr.center(), cr.size() * k), 0.0, Stroke::new(1.0, Color32::from_white_alpha(120)), StrokeKind::Middle);
-            }
-        }
-        if comp.has_3d() {
-            let map = ViewerMap { origin: cr.min, zoom: fit, comp: [cw, ch], area: r };
-            draw_rigs(app, &p.with_clip_rect(r), &map, &ectx, &selected, cam, through_active, Some(v.id()));
-        }
-        let label = if comp.has_3d() { v.label() } else { crate::i18n::tr("Active Camera") };
-        p.text(r.left_bottom() + vec2(8.0, -8.0), Align2::LEFT_BOTTOM, label, Tokens::ui(11.0), Color32::from_white_alpha(200));
-        app.auto.add(&format!("viewer.view.{}", v.id()), r, label);
-        if comp.has_3d()
-            && let Some(chosen) = pane_selector(app, ui, i + 1, r, v)
-        {
-            picked = Some((i + 1, chosen));
-        }
-    }
-    if let Some((pane, v)) = picked
-        && let Err(e) = app.session.execute("view.setPaneView", json!({"pane": pane, "view": v.id(), "comp": cid.0}))
-    {
-        app.ui.status = e.to_string();
-    }
-    main
-}
-
-/// The view selector in the top-left corner of pane `pane` (1 to 3) of a multi-view layout, a
-/// popup of every 3D view like the toolbar's 3D View menu. Returns the view chosen this frame.
-fn pane_selector(app: &mut EffectcraftApp, ui: &mut egui::Ui, pane: usize, area: Rect, current: View3D) -> Option<View3D> {
-    let t = app.tokens;
-    let r = Rect::from_min_size(area.min + vec2(6.0, 6.0), vec2(124.0, 20.0));
-    let pid = egui::Id::new(("viewer-pane-view", pane));
-    let response = widgets::dropdown(ui, r, crate::i18n::tr(current.label()), &t, pid);
-    if response.clicked() {
-        let open = widgets::popup_is_open(ui, pid);
-        ui.data_mut(|d| d.insert_temp(pid.with("open"), !open));
-    }
-    app.auto.add_response(&format!("viewer.view.{pane}.type"), &response, "View of pane");
-    if !widgets::popup_is_open(ui, pid) {
-        return None;
-    }
-    let chosen = widgets::popup_list(ui, pid, r.left_bottom() + vec2(0.0, 2.0), r, View3D::ALL.len(), 0, |ui| {
-        ui.set_min_width(124.0);
-        let mut chosen = None;
-        for (k, v) in View3D::ALL.iter().enumerate() {
-            let item = ui.selectable_label(*v == current, crate::i18n::tr(v.label()));
-            app.auto.add(&format!("viewer.view.{pane}.typeItem.{k}"), item.rect, v.label());
-            if item.clicked() {
-                chosen = Some(*v);
-            }
-        }
-        chosen
-    });
-    chosen.filter(|v| *v != current)
-}
-
-/// View ▸ Split with New Locked Viewer: the locked viewer on the left of the Composition panel
-/// (its comp and 3D view stay put whatever comp is active). Returns the main viewer's rectangle.
-fn locked_pane(app: &mut EffectcraftApp, ui: &mut egui::Ui, full: Rect, bg: Color32) -> Rect {
-    let Some(lv) = app.session.state.locked_viewer else { return full };
-    let Some(comp) = app.session.project.comp_arc(lv.comp) else { return full };
-    let name = app.session.project.item(lv.comp).map(|i| i.name.clone()).unwrap_or_default();
-    let gap = 2.0;
-    let mid = full.center().x;
-    let r = Rect::from_min_max(full.min, pos2(mid - gap / 2.0, full.max.y));
-    let main = Rect::from_min_max(pos2(mid + gap / 2.0, full.min.y), full.max);
-    let ctx = ui.ctx().clone();
-    let p = ui.painter().clone();
-    p.rect_filled(Rect::from_min_max(pos2(r.max.x, full.min.y), pos2(main.min.x, full.max.y)), 0.0, Color32::from_black_alpha(200));
-    p.rect_filled(r, 0.0, bg);
-    let (cw, ch) = (comp.width as f32, comp.height as f32);
-    let fit = ((r.width() - 20.0) / cw).min((r.height() - 44.0) / ch).max(0.01);
-    let cr = Rect::from_center_size(r.center(), vec2(cw * fit, ch * fit));
-    let scale = (fit * ctx.pixels_per_point()).min(1.0) as f64;
-    let t = app.session.time_of(lv.comp);
-    let cam = (lv.view != View3D::ActiveCamera && comp.has_3d())
-        .then(|| app.session.state.views3d.get(&lv.comp).cloned().unwrap_or_default().cam(lv.view, comp.width as f64, comp.height as f64).state());
-    let dc = effectcraft_engine::viewer::DisplayColor::of(&app.session);
-    // The display conversion's inputs, keyed as in the main viewer's texture caches.
-    let dc_key = format!("{cam:?}{}", super::viewer_tools::display_key(app, dc.is_some()));
-    let key = {
-        use std::hash::{Hash, Hasher};
-        let mut h = std::collections::hash_map::DefaultHasher::new();
-        (app.session.revision, lv.comp.0, t.0, scale.to_bits(), dc_key).hash(&mut h);
-        h.finish()
-    };
-    let id = egui::Id::new("viewer-locked");
-    let cached: Option<(u64, egui::TextureHandle)> = ctx.data(|d| d.get_temp(id));
-    let tex = match cached {
-        Some((k, tex)) if k == key => tex,
-        _ => {
-            let opts = effectcraft_engine::render::RenderOpts { scale, view: cam, ..Default::default() };
-            let img = app.session.render(lv.comp, t, opts);
-            let mut ci = crate::frames::to_color_image(&img);
-            if let Some(dc) = dc {
-                let mut px: Vec<[u8; 4]> = ci.pixels.iter().map(|c| c.to_array()).collect();
-                dc.apply(&mut px);
-                ci = egui::ColorImage::new(ci.size, px.into_iter().map(|a| Color32::from_rgba_premultiplied(a[0], a[1], a[2], a[3])).collect());
-            }
-            let tex = crate::frames::load_fitted(&ctx, "viewer-locked", ci, egui::TextureOptions::LINEAR);
-            ctx.data_mut(|d| d.insert_temp(id, (key, tex.clone())));
-            tex
-        }
-    };
-    let b = comp.background;
-    p.rect_filled(cr, 0.0, Color32::from_rgb((b[0] * 255.0) as u8, (b[1] * 255.0) as u8, (b[2] * 255.0) as u8));
-    p.image(tex.id(), cr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
-    p.rect_stroke(cr, 0.0, Stroke::new(1.0, Color32::from_black_alpha(160)), StrokeKind::Outside);
-    let label = crate::i18n::tr_args("Locked: {} — {}", &[&name, &(if comp.has_3d() { lv.view.label() } else { crate::i18n::tr("Active Camera") })]);
-    p.text(r.left_top() + vec2(8.0, 8.0), Align2::LEFT_TOP, &label, Tokens::ui(11.0), Color32::from_white_alpha(210));
-    app.auto.add("viewer.locked", r, &label);
-    // Close the locked viewer.
-    let close = Rect::from_min_size(pos2(r.max.x - 26.0, r.min.y + 4.0), vec2(20.0, 20.0));
-    let resp = ui.interact(close, egui::Id::new("viewer-locked-close"), Sense::click());
-    p.text(close.center(), Align2::CENTER_CENTER, "\u{00d7}", Tokens::ui(14.0), if resp.hovered() { Color32::WHITE } else { Color32::from_white_alpha(170) });
-    app.auto.add("viewer.locked.close", close, "Close Locked Viewer");
-    if resp.clicked() {
-        let _ = app.session.execute("view.closeLockedViewer", serde_json::json!({}));
-    }
-    main
-}
-
-pub(crate) fn checker(p: &egui::Painter, r: Rect) {
-    let s = 10.0;
-    p.rect_filled(r, 0.0, Color32::from_gray(0xcc));
-    let mut y = r.min.y;
-    let mut row = 0;
-    while y < r.max.y {
-        let mut x = r.min.x + if row % 2 == 0 { 0.0 } else { s };
-        while x < r.max.x {
-            p.rect_filled(Rect::from_min_max(pos2(x, y), pos2((x + s).min(r.max.x), (y + s).min(r.max.y))), 0.0, Color32::from_gray(0x99));
-            x += 2.0 * s;
-        }
-        y += s;
-        row += 1;
-    }
+    nav: Rect,
+    bar: Rect,
+    err_bar: Rect,
+    err_h: f32,
+    pasteboard: Color32,
+    area: Rect,
+    outer: Rect,
+    comp_rect: Rect,
+    zoom: f32,
+    ppp: f32,
+    cw: f32,
+    ch: f32,
+    map: ViewerMap,
+    time: Tick,
+    overlays: bool,
+    mods: egui::Modifiers,
+    space_pan: bool,
+    text_owns: bool,
+    gid: egui::Id,
+    track_cur: Option<(LayerId, effectcraft_engine::project::Uid)>,
+    has_3d: bool,
+    ctx: egui::Context,
+    comp_name: String,
+    p: egui::Painter,
+    painter: egui::Painter,
+    selected: Vec<LayerId>,
+    sel_vertices: Vec<effectcraft_engine::VertexRef>,
+    ft: Option<ov::FtBox>,
+    comp: &'a Comp,
+    gesture: Option<Gesture>,
+    handle_hits: Vec<(LayerId, usize, Pos2, egui::CursorIcon)>,
+    axis_hits: Vec<(LayerId, [Pos2; 2], [f64; 3], [f64; 3])>,
+    vertex_hits: Vec<VertexHit>,
+    vertex_marks: Vec<ov::VertexMark>,
+    key_hits: Vec<ov::KeyHit>,
+    motion_frames: Vec<ov::PathFrame>,
+    paths: Vec<ov::PathInfo>,
+    track_hits: Vec<super::tracker::Hit>,
+    pin_hits: Vec<super::puppet_tool::PinHit>,
+    puppet_layers: Vec<(&'a Layer, super::puppet_tool::Overlay)>,
 }
 
 pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
@@ -780,7 +129,75 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let comp_name = app.session.project.item(cid).map(|i| i.name.clone()).unwrap_or_default();
     let p = ui.painter().clone();
     VIEW_CAM.with(|c| c.set(app.session.view_camera(cid)));
+    let mut v = Vw {
+        t,
+        cid,
+        nav: Rect::NOTHING,
+        bar: Rect::NOTHING,
+        err_bar: Rect::NOTHING,
+        err_h: 0.0,
+        pasteboard: Color32::BLACK,
+        area: Rect::NOTHING,
+        outer: Rect::NOTHING,
+        comp_rect: Rect::NOTHING,
+        zoom: 1.0,
+        ppp: 1.0,
+        cw: 0.0,
+        ch: 0.0,
+        map: ViewerMap { origin: Pos2::ZERO, zoom: 1.0, comp: [0.0; 2], area: Rect::NOTHING },
+        time: Tick::ZERO,
+        overlays: false,
+        mods: egui::Modifiers::NONE,
+        space_pan: false,
+        text_owns: false,
+        gid: egui::Id::unique("viewer-gesture"),
+        track_cur: None,
+        has_3d: false,
+        ctx: ctx.clone(),
+        comp_name,
+        painter: p.clone(),
+        p,
+        selected: vec![],
+        sel_vertices: vec![],
+        ft: None,
+        comp: &comp,
+        gesture: None,
+        handle_hits: vec![],
+        axis_hits: vec![],
+        vertex_hits: vec![],
+        vertex_marks: vec![],
+        key_hits: vec![],
+        motion_frames: vec![],
+        paths: vec![],
+        track_hits: vec![],
+        pin_hits: vec![],
+        puppet_layers: vec![],
+    };
+    phase_nav(app, ui, rect, &mut v);
+    phase_layout(app, ui, rect, &mut v);
+    phase_frame(app, &mut v);
+    let snap_project = app.session.project.clone();
+    let snap_expr = app.session.expr.clone();
+    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time: v.time, expr: snap_expr.as_deref(), footage: None };
+    phase_guides(app, &ectx, &mut v);
+    phase_layers(app, ui, &ectx, &mut v);
+    phase_scene(app, &ectx, &mut v);
+    phase_rigs(app, ui, &ectx, &mut v);
+    let resp = phase_menu(app, ui, &ectx, &mut v);
+    phase_hover(app, ui, &ectx, &resp, &mut v);
+    phase_press(app, ui, &ectx, &resp, &mut v);
+    phase_dragstart(app, ui, &ectx, &resp, &mut v);
+    phase_drag(app, ui, &ectx, &resp, &mut v);
+    phase_stopped(app, ui, &ectx, &resp, &mut v);
+    phase_clicked(app, &ectx, &resp, &mut v);
+    phase_dblclick(app, &ectx, &resp, &mut v);
+    phase_tail(app, ui, &ectx, &mut v);
+}
 
+fn phase_nav(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, v: &mut Vw<'_>) {
+    let t = v.t;
+    let cid = v.cid;
+    let p = v.p.clone();
     // Navigator bar (open comps as breadcrumbs). After Effects shows a single breadcrumb row:
     // when the Composition Navigator (nested comp flow) is above the viewer, this row is left
     // out.
@@ -793,7 +210,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let name = app.session.project.item(oc).map(|i| i.name.clone()).unwrap_or_default();
         let g = p.layout_no_wrap(name.clone(), Tokens::ui(11.5), t.text);
         let r = Rect::from_min_size(pos2(x, nav.min.y + 3.0), vec2(g.size().x + 16.0, 18.0));
-        let resp = ui.interact(r, egui::Id::new(("nav", oc.0)), Sense::click());
+        let resp = ui.interact(r, egui::Id::unique(("nav", oc.0)), Sense::click());
         let active = oc == cid;
         p.rect_filled(
             r,
@@ -813,7 +230,16 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         x = r.max.x + 4.0;
     }
+    v.nav = nav;
+}
 
+fn phase_layout(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect, v: &mut Vw<'_>) {
+    let t = v.t;
+    let cid = v.cid;
+    let nav = v.nav;
+    let ctx = v.ctx.clone();
+    let p = v.p.clone();
+    let comp = v.comp;
     // Bottom control bar.
     let bar_h = 36.0;
     let bar = Rect::from_min_max(pos2(rect.min.x, rect.max.y - bar_h), rect.max);
@@ -825,7 +251,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     // View ▸ Switch View Layout: extra views (Top / Front / Right) beside the main view, which
     // keeps the overlays and the interaction.
     let full = locked_pane(app, ui, full, pasteboard);
-    let area = aux_views(app, ui, &comp, cid, full, pasteboard);
+    let area = aux_views(app, ui, comp, cid, full, pasteboard);
     p.rect_filled(area, 0.0, pasteboard);
     // View ▸ Show Rulers takes a strip on the top and left.
     let outer = area;
@@ -835,7 +261,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let fit = ((area.width() - 40.0) / cw).min((area.height() - 40.0) / ch).max(0.01);
     // Fit up to 100% follows the panel's size like Fit does, and stops at 100%.
     let fit = if app.ui.viewer.fit_up_to_100 { fit.min(1.0 / ctx.pixels_per_point()) } else { fit };
-    ctx.data_mut(|d| d.insert_temp(egui::Id::new("viewer-fit"), fit));
+    ctx.data_mut(|d| d.insert_temp(egui::Id::unique("viewer-fit"), fit));
     let zoom = app.ui.viewer.zoom.unwrap_or(fit);
     let center = area.center() + vec2(app.ui.viewer.pan[0], app.ui.viewer.pan[1]);
     // On the physical pixel grid, so at 100 % every comp pixel covers exactly one screen pixel
@@ -848,15 +274,37 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let painter = p.with_clip_rect(area);
     // Settings ▸ 3D ▸ Extended Viewer: custom 3D views (and Draft 3D) render the visible
     // pasteboard too, so 3D layers reaching past the comp frame stay visible there.
-    app.ui.viewer.extended = extended_region(app, &comp, cid, map);
+    app.ui.viewer.extended = extended_region(app, comp, cid, map);
+    v.bar = bar;
+    v.err_bar = err_bar;
+    v.err_h = err_h;
+    v.pasteboard = pasteboard;
+    v.area = area;
+    v.outer = outer;
+    v.comp_rect = comp_rect;
+    v.zoom = zoom;
+    v.ppp = ppp;
+    v.cw = cw;
+    v.ch = ch;
+    v.map = map;
+    v.painter = painter;
+}
 
+fn phase_frame(app: &mut EffectcraftApp, v: &mut Vw<'_>) {
+    let cid = v.cid;
+    let comp_rect = v.comp_rect;
+    let zoom = v.zoom;
+    let ppp = v.ppp;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let comp = v.comp;
     // Frame.
     let scale = app.viewer_scale(zoom, ppp);
     if !app.playback.playing {
         // Queue the frame on screen before any prefetch.
         app.request_frame_urgent(cid, comp.frame_rate.frame_at(app.session.time()), scale);
     }
-    crate::tick_playback(app, &ctx, scale);
+    crate::note_viewer_scale(app, scale);
     let time = app.session.time();
     let frame = comp.frame_rate.frame_at(time);
     let key = app.frame_key(cid, frame, scale);
@@ -882,11 +330,21 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let bg = comp.background;
         painter.rect_filled(comp_rect, 0.0, Color32::from_rgb((bg[0] * 255.0) as u8, (bg[1] * 255.0) as u8, (bg[2] * 255.0) as u8));
     }
-    let snap_project = app.session.project.clone();
-    let snap_expr = app.session.expr.clone();
-    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp: &comp, time, expr: snap_expr.as_deref(), footage: None };
+    v.time = time;
+}
+
+fn phase_guides(app: &mut EffectcraftApp, ectx: &EvalCtx, v: &mut Vw<'_>) {
+    let cid = v.cid;
+    let area = v.area;
+    let comp_rect = v.comp_rect;
+    let zoom = v.zoom;
+    let map = v.map;
+    let ctx = v.ctx.clone();
+    let comp_name = v.comp_name.clone();
+    let painter = v.painter.clone();
+    let comp = v.comp;
     // The frame (or snapshot) through Show Channel and exposure; ROI frames cover the region.
-    vt::draw_frame(app, &ctx, &painter, comp_rect, cid, &ectx);
+    vt::draw_frame(app, &ctx, &painter, comp_rect, cid, ectx);
     if app.ui.viewer.extended.is_some() {
         // The comp frame outlined over the extended render.
         painter.rect_stroke(comp_rect, 0.0, Stroke::new(1.0, Color32::from_gray(150)), StrokeKind::Outside);
@@ -972,15 +430,30 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         app.auto.add("viewer.regionOfInterest", r, "Region of interest");
     }
+    v.overlays = overlays;
+}
+
+fn phase_layers(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, v: &mut Vw<'_>) {
+    let t = v.t;
+    let zoom = v.zoom;
+    let cw = v.cw;
+    let ch = v.ch;
+    let map = v.map;
+    let time = v.time;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let mut handle_hits = std::mem::take(&mut v.handle_hits);
+    let mut axis_hits = std::mem::take(&mut v.axis_hits);
+    let mut vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let mut vertex_marks = std::mem::take(&mut v.vertex_marks);
+    let mut key_hits = std::mem::take(&mut v.key_hits);
+    let mut motion_frames = std::mem::take(&mut v.motion_frames);
+    let mut paths = std::mem::take(&mut v.paths);
+    let comp = v.comp;
     // Overlays + interaction.
     let selected = app.session.state.selected_layers.clone();
     // Bounding-box handles: (layer, handle, screen point, its resize cursor).
-    let mut handle_hits: Vec<(LayerId, usize, Pos2, egui::CursorIcon)> = Vec::new();
-    let mut vertex_hits: Vec<VertexHit> = Vec::new();
-    let mut vertex_marks: Vec<ov::VertexMark> = Vec::new();
-    let mut key_hits: Vec<ov::KeyHit> = Vec::new();
-    let mut motion_frames: Vec<ov::PathFrame> = Vec::new();
-    let mut paths: Vec<ov::PathInfo> = Vec::new();
+    // 3D gizmo arrows: (layer, grabbable screen segment, position change per comp px in x and y).
     let sel_vertices = app.session.state.selected_vertices.clone();
     // Pen path in progress ends when the tool changes or its mask is gone; Esc / Enter also end
     // free transform.
@@ -996,17 +469,33 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         // Layer Handles and Paths.
         let hs = app.session.prefs.general.path_point_size as f32 + 2.0;
         let label_handles = app.session.prefs.appearance.use_label_color_for_handles;
-        // A layer whose Video switch is off has no box, handles or paths in the viewer (a hidden
-        // null disappears from the comp, as in After Effects), even while it is selected.
-        for l in comp.layers.iter().filter(|l| selected.contains(&l.id) && l.is_active_at(time) && l.switches.video) {
+        // Nulls are rig controls: their outlines remain visible without selection (#1642).
+        // Keep this separate from selected layers so they gain no handles, anchors or paths. Solo
+        // scope matches picking (`selectable_layers`), so a null that can't be clicked isn't drawn.
+        let any_solo = comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
+        for l in comp.layers.iter().filter(|l| {
+            matches!(l.source, LayerSource::Null) && !selected.contains(&l.id) && l.is_active_at(time) && l.switches.video && (!any_solo || l.switches.solo)
+        }) {
+            let outline = layer_outline(ectx, l);
+            if outline.len() > 2 {
+                let col = if label_handles { t.label(l.label) } else { t.accent };
+                painter.add(egui::Shape::closed_line(outline.into_iter().map(|p| map.to_screen(p)).collect(), Stroke::new(1.0, col)));
+            }
+        }
+        // The eye hides a layer's pixels, not its controls: a selected AV layer keeps its box,
+        // handles, anchor, motion path and mask/shape paths so it stays editable over the visible
+        // artwork (#1769). Nulls, cameras and lights have no pixels and disappear from the viewer
+        // when hidden (#1332/#1642). Picking still uses `selectable_layers`, so a hidden layer is
+        // selected from the Timeline; its controls are interactive once selected.
+        for l in comp.layers.iter().filter(|l| selected.contains(&l.id) && l.is_active_at(time) && (l.switches.video || l.source.is_av())) {
             let col = if label_handles { t.label(l.label) } else { t.accent };
             // Motion path of animated position (keyframes and spatial tangents are draggable).
-            ov::motion_path(app, &painter, &map, &ectx, l, col, &mut key_hits, &mut motion_frames);
+            ov::motion_path(app, &painter, &map, ectx, l, col, &mut key_hits, &mut motion_frames);
             // Masks and shape paths.
             if app.ui.viewer.show_masks {
                 let pen = ui.data(|d| d.get_temp::<(LayerId, u64)>(pen_id()));
                 let hover = ui.input(|i| i.pointer.hover_pos());
-                ov::draw_paths(app, &painter, &map, &ectx, l, col, &sel_vertices, pen, hover, &mut vertex_hits, &mut vertex_marks, &mut paths);
+                ov::draw_paths(app, &painter, &map, ectx, l, col, &sel_vertices, pen, hover, &mut vertex_hits, &mut vertex_marks, &mut paths);
             }
             // Settings ▸ Previews ▸ Show Internal Wireframes: outlines of the layers inside a
             // selected collapsed precomp.
@@ -1015,7 +504,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 && let effectcraft_engine::project::LayerSource::Comp { item } = &l.source
                 && let Some(nc) = app.session.project.comp(*item)
             {
-                let (outer, _) = l2c(&ectx, l);
+                let (outer, _) = l2c(ectx, l);
                 let nctx = EvalCtx::new(&app.session.project, *item, nc, ectx.nested_time(l));
                 for nl in nc.layers.iter().filter(|nl| nl.is_active_at(nctx.time) && !nl.is_3d()) {
                     if let Some((_, q, _)) = layer_quad(&nctx, nl) {
@@ -1030,9 +519,17 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     }
                 }
             }
-            let Some((m, q, _)) = layer_quad(&ectx, l) else {
+            // Path editing keeps vertices and tangents visible without the layer's transform
+            // box competing with them (#1220). The path's own free-transform box is separate.
+            let editing_path = paths.iter().any(|p| {
+                p.layer == l.id && (app.ui.tool.is_pen() || (app.ui.tool == Tool::Selection && sel_vertices.iter().any(|v| v.layer == l.id && v.mask == p.uid)))
+            });
+            if editing_path {
+                continue;
+            }
+            let Some((m, q, _)) = layer_quad(ectx, l) else {
                 // A 3D layer reaching past the camera: the part of its box in front of it.
-                let outline = layer_outline(&ectx, l);
+                let outline = layer_outline(ectx, l);
                 if outline.len() > 2 {
                     painter.add(egui::Shape::closed_line(outline.iter().map(|p| map.to_screen(*p)).collect(), Stroke::new(1.0, col)));
                     continue;
@@ -1067,24 +564,63 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 // 3D axis gizmo.
                 if l.is_3d() {
                     let w = ectx.world_matrix(l);
-                    let pc = cam_state(&ectx).projection(cw as f64, ch as f64) * w;
+                    let pc = cam_state(ectx).projection(cw as f64, ch as f64) * w;
                     let a3 = effectcraft_engine::geom::vec3(a[0], a[1], a[2]);
                     let len = 60.0 / zoom as f64;
-                    for (axis, col) in [
-                        (effectcraft_engine::geom::vec3(len, 0.0, 0.0), Color32::from_rgb(0xe0, 0x50, 0x50)),
-                        (effectcraft_engine::geom::vec3(0.0, len, 0.0), Color32::from_rgb(0x60, 0xd0, 0x60)),
-                        (effectcraft_engine::geom::vec3(0.0, 0.0, len), Color32::from_rgb(0x50, 0x8c, 0xf0)),
+                    let pinv = parent_world_inverse(ectx, l);
+                    for (axis, col, name) in [
+                        (effectcraft_engine::geom::vec3(len, 0.0, 0.0), Color32::from_rgb(0xe0, 0x50, 0x50), "x"),
+                        (effectcraft_engine::geom::vec3(0.0, len, 0.0), Color32::from_rgb(0x60, 0xd0, 0x60), "y"),
+                        (effectcraft_engine::geom::vec3(0.0, 0.0, len), Color32::from_rgb(0x50, 0x8c, 0xf0), "z"),
                     ] {
                         // (clipped at the camera's near plane, #572)
-                        if let Some([o, e]) = project_segment(&pc, a3, a3 + axis) {
-                            painter.arrow(map.to_screen(o), map.to_screen(e) - map.to_screen(o), Stroke::new(2.0, col));
+                        let Some([o, e]) = project_segment(&pc, a3, a3 + axis) else { continue };
+                        // An axis pointing at the camera (Z in the default front view) projects to
+                        // a dot: draw it as a short diagonal stub so it can still be grabbed.
+                        let mut s = [e[0] - o[0], e[1] - o[1]];
+                        if (s[0] * s[0] + s[1] * s[1]).sqrt() * (zoom as f64) < 12.0 {
+                            let k = 24.0 / zoom as f64;
+                            s = [k, -k];
+                        }
+                        let (so, se) = (map.to_screen(o), map.to_screen([o[0] + s[0], o[1] + s[1]]));
+                        painter.arrow(so, se - so, Stroke::new(2.0, col));
+                        if !l.switches.locked {
+                            let dir = pinv.apply_vec(w.apply_vec(axis));
+                            let (ax, ay) = axis_drag([dir.x, dir.y, dir.z], s);
+                            // The inner part stays on the anchor point, which drags the layer freely.
+                            axis_hits.push((l.id, [so + (se - so) * 0.35, se], ax, ay));
+                            app.auto.add(&format!("viewer.gizmo.{}.{name}", l.id.0), Rect::from_center_size(se, vec2(12.0, 12.0)), "3D axis");
                         }
                     }
                 }
             }
         }
     }
+    v.handle_hits = handle_hits;
+    v.axis_hits = axis_hits;
+    v.vertex_hits = vertex_hits;
+    v.vertex_marks = vertex_marks;
+    v.key_hits = key_hits;
+    v.motion_frames = motion_frames;
+    v.paths = paths;
+    v.selected = selected;
+    v.sel_vertices = sel_vertices;
+}
 
+fn phase_scene(app: &mut EffectcraftApp, ectx: &EvalCtx, v: &mut Vw<'_>) {
+    let t = v.t;
+    let cid = v.cid;
+    let area = v.area;
+    let comp_rect = v.comp_rect;
+    let cw = v.cw;
+    let ch = v.ch;
+    let map = v.map;
+    let time = v.time;
+    let painter = v.painter.clone();
+    let selected = v.selected.clone();
+    let vertex_marks = std::mem::take(&mut v.vertex_marks);
+    let mut track_hits = std::mem::take(&mut v.track_hits);
+    let comp = v.comp;
     // Path points last, over the boxes' handles (#1042).
     ov::draw_vertex_marks(&painter, &vertex_marks, app.session.prefs.general.path_point_size as f32 + 1.0);
 
@@ -1093,7 +629,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     let has_3d = comp.layers.iter().any(|l| l.is_3d() && l.is_active_at(time));
     if has_3d && app.session.prefs.three_d.extended_viewer {
         for l in comp.layers.iter().filter(|l| l.is_3d() && l.is_active_at(time) && l.has_video()) {
-            let q = layer_outline(&ectx, l);
+            let q = layer_outline(ectx, l);
             if q.len() > 2 {
                 let sq: Vec<Pos2> = q.iter().map(|p| map.to_screen(*p)).collect();
                 let outside = sq.iter().any(|p| !comp_rect.contains(*p));
@@ -1104,7 +640,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
     }
     if has_3d && app.session.prefs.three_d.show_reference_axes {
-        let pc = cam_state(&ectx).projection(cw as f64, ch as f64);
+        let pc = cam_state(ectx).projection(cw as f64, ch as f64);
         let o3 = effectcraft_engine::geom::vec3(cw as f64 / 2.0, ch as f64 / 2.0, 0.0);
         let o = pc.apply(o3);
         let corner = pos2(area.min.x + 34.0, area.max.y - 34.0);
@@ -1123,7 +659,6 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 
     // Track points of the current track (Tracker panel) on its layer, while that layer is selected.
-    let mut track_hits = vec![];
     let track_cur = super::tracker::viewer_track(app);
     if app.layer_controls_visible()
         && let Some((tl, tu)) = track_cur
@@ -1131,7 +666,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         && let Some(layer) = comp.layer(tl)
         && layer.is_active_at(time)
     {
-        let (m, _) = l2c(&ectx, layer);
+        let (m, _) = l2c(ectx, layer);
         track_hits = super::tracker::draw_overlay(app, &painter, &map, &m, layer, tu, time);
     }
 
@@ -1143,7 +678,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         && let Some(layer) = comp.layer(wl)
         && layer.is_active_at(time)
     {
-        let (m, _) = l2c(&ectx, layer);
+        let (m, _) = l2c(ectx, layer);
         let (w, h) = effectcraft_engine::render::source_size(&app.session.project, layer);
         let c = m.apply(effectcraft_engine::geom::vec2(w as f64 / 2.0, h as f64 / 2.0));
         let at = map.to_screen([c.x, c.y]);
@@ -1165,7 +700,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         if notices >= 3 {
             break;
         }
-        let (m, _) = l2c(&ectx, layer);
+        let (m, _) = l2c(ectx, layer);
         let (w, h) = effectcraft_engine::render::source_size(&app.session.project, layer);
         let c = m.apply(effectcraft_engine::geom::vec2(w as f64 / 2.0, h as f64 / 2.0));
         let at = map.to_screen([c.x, c.y]);
@@ -1178,14 +713,32 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         app.auto.add(&format!("viewer.footageProblem.{}", layer.id.0), r, &text);
         notices += 1;
     }
+    v.vertex_marks = vertex_marks;
+    v.track_hits = track_hits;
+    v.track_cur = track_cur;
+    v.has_3d = has_3d;
+}
 
+fn phase_rigs(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, v: &mut Vw<'_>) {
+    let t = v.t;
+    let cid = v.cid;
+    let area = v.area;
+    let map = v.map;
+    let time = v.time;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let selected = v.selected.clone();
+    let paths = std::mem::take(&mut v.paths);
+    let mut pin_hits = std::mem::take(&mut v.pin_hits);
+    let mut puppet_layers = std::mem::take(&mut v.puppet_layers);
+    let comp = v.comp;
     // Free transform box of a path (double-click a path with the Selection tool).
     let ft = ov::draw_free_transform(app, &ctx, &painter, &map, &paths);
 
     // Cameras and lights (wireframes) and the 3D view name.
     if comp.has_3d() {
         let through_active = VIEW_CAM.with(|c| c.get()).is_none();
-        draw_rigs(app, &painter, &map, &ectx, &selected, cam_state(&ectx), through_active, None);
+        draw_rigs(app, &painter, &map, ectx, &selected, cam_state(ectx), through_active, None);
         let view = app.session.state.views3d.get(&cid).map(|v| v.current).unwrap_or_default();
         let label = match (view, comp.active_camera(time)) {
             (View3D::ActiveCamera, Some(c)) => format!("Active Camera ({})", c.name),
@@ -1195,10 +748,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     }
 
     // Puppet pins and meshes of the selected layers (Puppet tools).
-    let mut pin_hits: Vec<super::puppet_tool::PinHit> = vec![];
     // The selected layers with a Puppet effect, top of the stack first (the layers the Puppet
     // tools work on).
-    let mut puppet_layers: Vec<(&Layer, super::puppet_tool::Overlay)> = vec![];
     if app.ui.tool.puppet_kind().is_some() {
         let sel_props: Vec<u64> = app.session.state.selected_props.iter().map(|(_, u)| *u).collect();
         for lid in &selected {
@@ -1206,7 +757,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 && let Some(ov) = super::puppet_tool::overlay(app, &ctx, cid, l, time)
             {
                 let hover = ui.input(|i| i.pointer.hover_pos());
-                pin_hits.extend(super::puppet_tool::draw(&painter, &map, &ectx, l, &ov, app.session.state.puppet.show_mesh, &sel_props, hover));
+                pin_hits.extend(super::puppet_tool::draw(&painter, &map, ectx, l, &ov, app.session.state.puppet.show_mesh, &sel_props, hover));
                 puppet_layers.push((l, ov));
             }
         }
@@ -1220,29 +771,33 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
-    // The layer a Puppet tool press works on: while selected layers are rigged, only those
-    // ([`super::puppet_tool::target`]); otherwise the layer under the pointer, selected.
-    let puppet_layer = |app: &mut EffectcraftApp, cpt: [f64; 2]| -> Option<LayerId> {
-        if puppet_layers.is_empty() {
-            return pick(app, &ectx, cpt, false);
-        }
-        super::puppet_tool::target(&ectx, &puppet_layers, cpt, |l| layers_at(&ectx, cpt).any(|h| h.id == l.id))
-    };
+    v.paths = paths;
+    v.pin_hits = pin_hits;
+    v.puppet_layers = puppet_layers;
+    v.ft = ft;
+}
 
+fn phase_menu(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, v: &mut Vw<'_>) -> egui::Response {
+    let cid = v.cid;
+    let area = v.area;
+    let map = v.map;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let comp = v.comp;
     // Project items, files and effects dropped on the viewer.
-    super::viewer_drop::show(app, ui, &painter, &map, &ectx);
+    super::viewer_drop::show(app, ui, &painter, &map, ectx);
 
     // Interaction.
-    let resp = ui.interact(area, egui::Id::new("viewer-interact"), Sense::click_and_drag());
-    let menu_hits_id = egui::Id::new(("viewer-menu-hits", cid.0));
+    let resp = ui.interact(area, egui::Id::unique("viewer-interact"), Sense::click_and_drag());
+    let menu_hits_id = egui::Id::unique(("viewer-menu-hits", cid.0));
     if resp.secondary_clicked()
         && let Some(pos) = resp.interact_pointer_pos()
     {
         // Picking an already selected layer preserves the group; an unselected hit
         // becomes the target, using the same visible/unlocked hit test as left-click.
-        pick(app, &ectx, map.to_comp(pos), false);
+        pick(app, ectx, map.to_comp(pos), false);
         let point = map.to_comp(pos);
-        let hits: Vec<(u64, String)> = layers_at(&ectx, point).map(|l| (l.id.0, l.name.clone())).collect();
+        let hits: Vec<(u64, String)> = layers_at(ectx, point).map(|l| (l.id.0, l.name.clone())).collect();
         ui.data_mut(|d| d.insert_temp(menu_hits_id, hits));
     }
     let context_layers: Vec<u64> =
@@ -1253,7 +808,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let hits = ui.data(|d| d.get_temp::<Vec<(u64, String)>>(menu_hits_id)).unwrap_or_default();
         if !hits.is_empty() {
             ui.menu_button(crate::i18n::tr("Select"), |ui| {
-                crate::widgets::menu_scroll(ui, |ui| {
+                crate::widgets::menu_scroll(ui, false, |ui| {
                     for (id, name) in &hits {
                         if ui.button(name).clicked() {
                             context_actions.push(("layer.select".to_owned(), serde_json::json!({"layers":[id]})));
@@ -1273,10 +828,11 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     let c = super::timeline::LayerMenuCaps::of(&app.session.project, layer);
                     caps.vector |= c.vector;
                     caps.text |= c.text;
+                    caps.source |= c.source;
                     caps
                 },
             );
-            super::timeline::layer_menu(ui, &context_layers, caps, &mut context_actions);
+            super::timeline::layer_menu(ui, &context_layers, caps, (&mut app.auto, "viewer.layerMenu"), &mut context_actions);
         }
         ui.separator();
         if ui.button(copy_frame).clicked() {
@@ -1296,12 +852,32 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             app.ui.status = e;
         }
     }
+    resp
+}
+
+fn phase_hover(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let area = v.area;
+    let zoom = v.zoom;
+    let cw = v.cw;
+    let ch = v.ch;
+    let map = v.map;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let handle_hits = std::mem::take(&mut v.handle_hits);
+    let axis_hits = std::mem::take(&mut v.axis_hits);
+    let vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let key_hits = std::mem::take(&mut v.key_hits);
+    let motion_frames = std::mem::take(&mut v.motion_frames);
+    let paths = std::mem::take(&mut v.paths);
+    let track_hits = std::mem::take(&mut v.track_hits);
+    let pin_hits = std::mem::take(&mut v.pin_hits);
+    let comp = v.comp;
     // Path vertices and tangent handles take the press before the bounding-box handles (#1042).
     let vertex_at = |pos: Pos2, tangents: bool| -> Option<VertexHit> {
         let reach = vertex_grab_radius(pos, handle_hits.iter().map(|(_, _, h, _)| *h));
         vertex_hits.iter().rev().filter(|h| h.tangent.is_some() == tangents).find(|h| h.pos.distance(pos) < reach).copied()
     };
-    let gid = egui::Id::new("viewer-gesture");
+    let gid = egui::Id::unique("viewer-gesture");
     // An overlay on top of the viewer (e.g. the camera tracker points) takes the hover, but the pointer is still over the viewer: keep wheel zoom working.
     let hover_pos = resp.hover_pos().or_else(|| if resp.contains_pointer() { ui.input(|i| i.pointer.hover_pos()) } else { None });
     if let Some(hp) = hover_pos {
@@ -1329,8 +905,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             Tool::ObjectMatte => {
                 // The tool draws its own crosshair (and the layer it would matte) while no box
                 // is being dragged.
-                if ui.data(|d| d.get_temp::<Gesture>(egui::Id::new("viewer-gesture"))).is_none() {
-                    super::object_matte_tool::hover(app, &painter, &map, &ectx, hp);
+                if ui.data(|d| d.get_temp::<Gesture>(egui::Id::unique("viewer-gesture"))).is_none() {
+                    super::object_matte_tool::hover(app, &painter, &map, ectx, hp);
                 }
                 egui::CursorIcon::None
             }
@@ -1344,11 +920,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             _ => {
                 if super::tracker::hit_at(&track_hits, hp).is_some() || key_hits.iter().any(|h| h.pos.distance(hp) < 6.0) {
                     egui::CursorIcon::Move
-                } else if let Some((_, vertical)) = vt::guide_at(app, &comp, &map, hp) {
+                } else if let Some((_, vertical)) = vt::guide_at(app, comp, &map, hp) {
                     if vertical { egui::CursorIcon::ResizeHorizontal } else { egui::CursorIcon::ResizeVertical }
                 } else if vertex_at(hp, true).or_else(|| vertex_at(hp, false)).is_some() {
                     // A path point under a box handle is grabbed first: no resize cursor.
                     egui::CursorIcon::PointingHand
+                } else if axis_at(&axis_hits, hp).is_some() {
+                    egui::CursorIcon::Move
                 } else if let Some((.., cursor)) = handle_hits.iter().find(|(_, _, h, _)| h.distance(hp) < HANDLE) {
                     *cursor
                 } else {
@@ -1372,6 +950,24 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     } else {
         app.pointer_comp = None;
     }
+    v.handle_hits = handle_hits;
+    v.axis_hits = axis_hits;
+    v.vertex_hits = vertex_hits;
+    v.key_hits = key_hits;
+    v.motion_frames = motion_frames;
+    v.paths = paths;
+    v.track_hits = track_hits;
+    v.pin_hits = pin_hits;
+    v.gid = gid;
+}
+
+fn phase_press(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let map = v.map;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let key_hits = std::mem::take(&mut v.key_hits);
+    let motion_frames = std::mem::take(&mut v.motion_frames);
+    let paths = std::mem::take(&mut v.paths);
     app.ui.viewer.interacting = resp.dragged();
     let mods = ui.input(|i| i.modifiers);
     let space_pan = super::space_hand(&ctx);
@@ -1383,17 +979,55 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         && ui.input(|i| i.pointer.primary_pressed())
         && let Some(pos) = ui.input(|i| i.pointer.press_origin())
     {
-        pen_press(app, ui, &ectx, &map, &paths, ov::motion_frame_at(&motion_frames, &key_hits, pos), pos, mods);
+        pen_press(app, ui, ectx, &map, &paths, ov::motion_frame_at(&motion_frames, &key_hits, pos), pos, mods);
     }
     // A pen click (press + release without a drag) ends its tangent gesture on release.
     if ui.input(|i| i.pointer.primary_released())
-        && matches!(ui.data(|d| d.get_temp::<Gesture>(egui::Id::new("viewer-gesture"))), Some(Gesture::Pen { .. }))
+        && matches!(ui.data(|d| d.get_temp::<Gesture>(egui::Id::unique("viewer-gesture"))), Some(Gesture::Pen { .. }))
         && !resp.drag_stopped()
     {
-        ui.data_mut(|d| d.remove::<Gesture>(egui::Id::new("viewer-gesture")));
+        ui.data_mut(|d| d.remove::<Gesture>(egui::Id::unique("viewer-gesture")));
     }
     // On-canvas text editing (Type tool, double-click a text layer) owns its clicks and drags.
-    let text_owns = super::viewer_text::hook(app, ui, &painter, &map, &ectx, &resp, space_pan);
+    let text_owns = super::viewer_text::hook(app, ui, &painter, &map, ectx, resp, space_pan);
+    v.key_hits = key_hits;
+    v.motion_frames = motion_frames;
+    v.paths = paths;
+    v.mods = mods;
+    v.space_pan = space_pan;
+    v.text_owns = text_owns;
+}
+
+fn phase_dragstart(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let comp_rect = v.comp_rect;
+    let zoom = v.zoom;
+    let map = v.map;
+    let time = v.time;
+    let mods = v.mods;
+    let space_pan = v.space_pan;
+    let text_owns = v.text_owns;
+    let gid = v.gid;
+    let track_cur = v.track_cur;
+    let ft = std::mem::take(&mut v.ft);
+    let handle_hits = std::mem::take(&mut v.handle_hits);
+    let axis_hits = std::mem::take(&mut v.axis_hits);
+    let vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let key_hits = std::mem::take(&mut v.key_hits);
+    let paths = std::mem::take(&mut v.paths);
+    let track_hits = std::mem::take(&mut v.track_hits);
+    let pin_hits = std::mem::take(&mut v.pin_hits);
+    let puppet_layers = std::mem::take(&mut v.puppet_layers);
+    let comp = v.comp;
+    let vertex_at = |pos: Pos2, tangents: bool| -> Option<VertexHit> {
+        let reach = vertex_grab_radius(pos, handle_hits.iter().map(|(_, _, h, _)| *h));
+        vertex_hits.iter().rev().filter(|h| h.tangent.is_some() == tangents).find(|h| h.pos.distance(pos) < reach).copied()
+    };
+    let puppet_layer = |app: &mut EffectcraftApp, cpt: [f64; 2]| -> Option<LayerId> {
+        if puppet_layers.is_empty() {
+            return pick(app, ectx, cpt, false);
+        }
+        super::puppet_tool::target(ectx, &puppet_layers, cpt, |l| layers_at(ectx, cpt).any(|h| h.id == l.id))
+    };
     if resp.drag_started()
         && !text_owns
         && let Some(pos) = resp.interact_pointer_pos()
@@ -1413,8 +1047,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             Tool::Selection if key_hits.iter().any(|h| h.pos.distance(press) < 6.0) => {
                 ov::begin_key_drag(app, &key_hits, press, map.to_comp(press), mods.shift).map(Gesture::Overlay)
             }
-            Tool::Selection if vt::guide_at(app, &comp, &map, press).is_some() => {
-                vt::guide_at(app, &comp, &map, press).map(|(index, vertical)| Gesture::Overlay(ov::Drag::Guide { index, vertical }))
+            Tool::Selection if vt::guide_at(app, comp, &map, press).is_some() => {
+                vt::guide_at(app, comp, &map, press).map(|(index, vertical)| Gesture::Overlay(ov::Drag::Guide { index, vertical }))
             }
             // Alt-drag a vertex with the Selection tool (or drag one with Convert Vertex): pull
             // new tangents out of it.
@@ -1424,9 +1058,9 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     Gesture::Pen { layer: h.layer, mask: h.mask, index: h.index, vertex: h.vertex, inv, press }
                 })
             }
-            Tool::MaskFeather => ov::begin_feather(app, &ectx, &paths, &map, press).map(Gesture::Overlay),
-            Tool::Rotate => pick(app, &ectx, cpt, mods.shift).map(|l| {
-                let others = selected_others(app, &comp, l).into_iter().filter_map(|o| Some((o.id, ectx.f(o, o.transform()?, "rotation", 0.0)))).collect();
+            Tool::MaskFeather => ov::begin_feather(app, ectx, &paths, &map, press).map(Gesture::Overlay),
+            Tool::Rotate => pick(app, ectx, cpt, mods.shift).map(|l| {
+                let others = selected_others(app, comp, l).into_iter().filter_map(|o| Some((o.id, ectx.f(o, o.transform()?, "rotation", 0.0)))).collect();
                 let layer = comp.layer(l).cloned();
                 let center = layer
                     .as_ref()
@@ -1443,10 +1077,10 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     others,
                 }
             }),
-            Tool::PanBehind => pick(app, &ectx, cpt, false).and_then(|l| {
+            Tool::PanBehind => pick(app, ectx, cpt, false).and_then(|l| {
                 let layer = comp.layer(l)?;
                 let tr = layer.transform()?;
-                let (l2c, _) = l2c(&ectx, layer);
+                let (l2c, _) = l2c(ectx, layer);
                 let l2p = ectx.local_matrix(layer);
                 let l2p = Mat3([[l2p.0[0][0], l2p.0[0][1], 0.0], [l2p.0[1][0], l2p.0[1][1], 0.0], [0.0, 0.0, 1.0]]);
                 Some(Gesture::Anchor {
@@ -1457,7 +1091,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     start: map.to_comp(press),
                     inv: l2c.inverse().unwrap_or(Mat3::IDENTITY),
                     l2p,
-                    own: effectcraft_engine::viewer::layer_targets(&ectx, layer, false, app.session.state.snap_features),
+                    own: effectcraft_engine::viewer::layer_targets(ectx, layer, false, app.session.state.snap_features),
                     anchor_only: mods.alt,
                 })
             }),
@@ -1483,7 +1117,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     PinPart::Center => {}
                 }
                 let l = comp.layer(h.layer)?;
-                let inv = fx2c(&ectx, l).inverse()?;
+                let inv = fx2c(ectx, l).inverse()?;
                 if mods.command {
                     let lp = inv.apply(gv2(cpt[0], cpt[1]));
                     let began = ui.input(|i| i.time);
@@ -1503,7 +1137,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 let hit = super::tracker::hit_at(&track_hits, press);
                 track_cur.zip(hit).and_then(|((tl, tu), hit)| {
                     let layer = comp.layer(tl)?;
-                    let (m, _) = l2c(&ectx, layer);
+                    let (m, _) = l2c(ectx, layer);
                     super::tracker::begin_drag(layer, tu, time, &m, hit, map.to_comp(press)).map(|drag| Gesture::Track { layer: tl, tracker: tu, drag })
                 })
             }
@@ -1534,15 +1168,20 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             // far enough to count as a drag it may have left a small handle.
             Tool::Selection => {
                 let cpt = map.to_comp(press);
-                if let Some((lid, hi, ..)) = handle_hits.iter().find(|(_, _, h, _)| h.distance(press) < HANDLE + 2.0).cloned() {
+                // A gizmo arrow is drawn over the box handles, so it is grabbed first: move along
+                // that axis only, without snapping.
+                if let Some((lid, _, ax, ay)) = axis_at(&axis_hits, press) {
+                    let p0 = comp.layer(lid).and_then(|l| Some(ectx.v3(l, l.transform()?, "position", [0.0; 3])));
+                    p0.map(|p0| Gesture::Move { layers: vec![(lid, p0, ax, ay)], start: cpt, snap_src: None })
+                } else if let Some((lid, hi, ..)) = handle_hits.iter().find(|(_, _, h, _)| h.distance(press) < HANDLE + 2.0).cloned() {
                     let layer = comp.layer(lid).cloned();
                     layer.and_then(|layer| {
                         let tr = layer.transform()?;
-                        let (l2c, _) = l2c(&ectx, &layer);
+                        let (l2c, _) = l2c(ectx, &layer);
                         let inv = l2c.inverse()?;
                         let a = ectx.v3(&layer, tr, "anchor", [0.0; 3]);
                         let lp = inv.apply(gv2(cpt[0], cpt[1]));
-                        let hp = handle_point(effectcraft_engine::render::content_bounds(&ectx, &layer)?, hi);
+                        let hp = handle_point(effectcraft_engine::render::content_bounds(ectx, &layer)?, hi);
                         Some(Gesture::Scale {
                             layer: lid,
                             start_scale: ectx.v3(&layer, tr, "scale", [100.0; 3]),
@@ -1552,13 +1191,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                             axes: handle_axes(hi),
                             l2c,
                             inv,
-                            others: selected_others(app, &comp, lid)
+                            others: selected_others(app, comp, lid)
                                 .into_iter()
                                 .filter_map(|o| Some((o.id, ectx.v3(o, o.transform()?, "scale", [100.0; 3]))))
                                 .collect(),
                         })
                     })
-                } else if let Some(l) = pick(app, &ectx, cpt, mods.shift) {
+                } else if let Some(l) = pick(app, ectx, cpt, mods.shift) {
                     let layers: Vec<(LayerId, [f64; 3], [f64; 3], [f64; 3])> = app
                         .session
                         .state
@@ -1568,12 +1207,12 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                         .filter(|l| !l.switches.locked)
                         .filter_map(|l| {
                             let p0 = ectx.v3(l, l.transform()?, "position", [0.0; 3]);
-                            let (ax, ay) = drag_axes(&ectx, l);
+                            let (ax, ay) = drag_axes(ectx, l);
                             Some((l.id, p0, ax, ay))
                         })
                         .collect();
                     // Snap the grabbed layer's feature nearest the pointer (AE's snap handle).
-                    let snap_src = comp.layer(l).map(|layer| effectcraft_engine::viewer::layer_features(&ectx, layer)).and_then(|f| {
+                    let snap_src = comp.layer(l).map(|layer| effectcraft_engine::viewer::layer_features(ectx, layer)).and_then(|f| {
                         let c = map.to_comp(press);
                         f.into_iter().min_by(|a, b| {
                             let da = (a[0] - c[0]).powi(2) + (a[1] - c[1]).powi(2);
@@ -1602,10 +1241,29 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             ui.data_mut(|d| d.insert_temp(gid, g));
         }
     }
+    v.ft = ft;
+    v.handle_hits = handle_hits;
+    v.axis_hits = axis_hits;
+    v.vertex_hits = vertex_hits;
+    v.key_hits = key_hits;
+    v.paths = paths;
+    v.track_hits = track_hits;
+    v.pin_hits = pin_hits;
+    v.puppet_layers = puppet_layers;
+}
+
+fn phase_drag(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let t = v.t;
+    let zoom = v.zoom;
+    let map = v.map;
+    let mods = v.mods;
+    let gid = v.gid;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
     let gesture: Option<Gesture> = ui.data(|d| d.get_temp(gid));
     if let (Some(g), Some(pos)) = (gesture.clone(), resp.interact_pointer_pos()) {
         let cpt = map.to_comp(pos);
-        let merge = format!("viewer-drag-{}", ui.data(|d| d.get_temp::<u64>(egui::Id::new("viewer-drag-n")).unwrap_or(0)));
+        let merge = format!("viewer-drag-{}", ui.data(|d| d.get_temp::<u64>(egui::Id::unique("viewer-drag-n")).unwrap_or(0)));
         match g {
             Gesture::Pan { start_pan } => {
                 // No total drag on the release frame: keep the pan reached so far (it used to
@@ -1618,7 +1276,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 let mut d = one_axis([cpt[0] - start[0], cpt[1] - start[1]], mods.shift);
                 if let Some(src) = snap_src {
                     let ids: Vec<LayerId> = layers.iter().map(|x| x.0).collect();
-                    let c = vt::snap(app, &ctx, &ectx, &map, &ids, &[[src[0] + d[0], src[1] + d[1]]], mods);
+                    let c = vt::snap(app, &ctx, ectx, &map, &ids, &[[src[0] + d[0], src[1] + d[1]]], mods);
                     d = [d[0] + c[0], d[1] + c[1]];
                     if vt::snapping_on(app, mods) {
                         vt::draw_handle(&painter, map.to_screen([src[0] + d[0], src[1] + d[1]]));
@@ -1635,7 +1293,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 let f = drag_ratio(start_local, [lp.x - anchor[0], lp.y - anchor[1]], axes, uniform);
                 // The handle snaps (to the comp's and other layers' edges, corners and centres),
                 // so a layer scales exactly to them, e.g. to the comp's size.
-                let f = snap_handle(f, handle, anchor, &l2c, axes, uniform, |p| vt::snap(app, &ctx, &ectx, &map, &[layer], &[p], mods));
+                let f = snap_handle(f, handle, anchor, &l2c, axes, uniform, |p| vt::snap(app, &ctx, ectx, &map, &[layer], &[p], mods));
                 for (lid, s0) in std::iter::once((layer, start_scale)).chain(others) {
                     let v = [s0[0] * f[0], s0[1] * f[1], s0[2]];
                     let _ = app.session.execute("prop.set", json!({"layer": lid.0, "path": "transform/scale", "value": v, "merge": merge}));
@@ -1661,7 +1319,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 let d = one_axis([cpt[0] - start[0], cpt[1] - start[1]], mods.shift);
                 let anchor_c = inv.inverse().map(|m| m.apply(gv2(start_anchor[0], start_anchor[1]))).unwrap_or(gv2(start[0], start[1]));
                 let want = [anchor_c.x + d[0], anchor_c.y + d[1]];
-                let sc = vt::snap_with(app, &ctx, &ectx, &map, &[layer], &[want], mods, &own);
+                let sc = vt::snap_with(app, &ctx, ectx, &map, &vt::SnapQuery { exclude: &[layer], sources: &[want], mods, extra: &own });
                 let a = inv.apply(gv2(start[0], start[1]));
                 let b = inv.apply(gv2(start[0] + d[0] + sc[0], start[1] + d[1] + sc[1]));
                 let dl = gv2(b.x - a.x, b.y - a.y);
@@ -1696,7 +1354,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             Gesture::Vertices { start, src, applied, inv, layer } => {
                 // The grabbed vertex snaps (to other layers' vertices and features, guides, grid).
                 let want = [cpt[0] - start[0], cpt[1] - start[1]];
-                let c = vt::snap(app, &ctx, &ectx, &map, &[layer], &[[src[0] + want[0], src[1] + want[1]]], mods);
+                let c = vt::snap(app, &ctx, ectx, &map, &[layer], &[[src[0] + want[0], src[1] + want[1]]], mods);
                 let total = [want[0] + c[0], want[1] + c[1]];
                 let d = inv.apply_vec(gv2(total[0] - applied[0], total[1] - applied[1]));
                 if d.x != 0.0 || d.y != 0.0 {
@@ -1715,7 +1373,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     painter.rect_stroke(r, 0.0, Stroke::new(1.0, Color32::WHITE), StrokeKind::Middle);
                 }
                 d => {
-                    let mut snapper = |a: &EffectcraftApp, p: [f64; 2], l: LayerId| vt::snap(a, &ctx, &ectx, &map, &[l], &[p], mods);
+                    let mut snapper = |a: &EffectcraftApp, p: [f64; 2], l: LayerId| vt::snap(a, &ctx, ectx, &map, &[l], &[p], mods);
                     if let Some(nd) = ov::update(app, &d, cpt, pos, mods, &merge, zoom, &mut snapper) {
                         ui.data_mut(|dd| dd.insert_temp(gid, Gesture::Overlay(nd)));
                     }
@@ -1796,6 +1454,20 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
+    v.gesture = gesture;
+}
+
+fn phase_stopped(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let area = v.area;
+    let comp_rect = v.comp_rect;
+    let map = v.map;
+    let time = v.time;
+    let mods = v.mods;
+    let gid = v.gid;
+    let vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let pin_hits = std::mem::take(&mut v.pin_hits);
+    let gesture = v.gesture.clone();
+    let comp = v.comp;
     if resp.drag_stopped() {
         if let (Some(g), Some(pos)) = (gesture, resp.interact_pointer_pos()) {
             match g {
@@ -1829,7 +1501,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                     }
                 }
                 Gesture::PuppetPin { layer, pin, .. } => super::puppet_tool::reveal_pin(app, layer, pin),
-                Gesture::ObjectMatteBox { start } => super::object_matte_tool::apply(app, &ectx, &map, start, Some(pos), mods.shift),
+                Gesture::ObjectMatteBox { start } => super::object_matte_tool::apply(app, ectx, &map, start, Some(pos), mods.shift),
                 Gesture::Create { tool, start } => {
                     let end = map.to_comp(pos);
                     create_shape(app, tool, start, end, mods);
@@ -1862,8 +1534,8 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 Gesture::Marquee { start } => {
                     let a = map.to_comp(start);
                     let b = map.to_comp(pos);
-                    let hits: Vec<u64> = selectable_layers(&comp, time)
-                        .filter(|l| layer_quad(&ectx, l).is_some_and(|(_, q, _)| quad_intersects_box(&q, a, b)))
+                    let hits: Vec<u64> = selectable_layers(comp, time)
+                        .filter(|l| layer_quad(ectx, l).is_some_and(|(_, q, _)| quad_intersects_box(&q, a, b)))
                         .map(|l| l.id.0)
                         .collect();
                     let _ = app.session.execute("layer.select", json!({"layers": hits, "toggle": mods.shift}));
@@ -1873,10 +1545,42 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         }
         ui.data_mut(|d| {
             d.remove::<Gesture>(gid);
-            let n: u64 = d.get_temp(egui::Id::new("viewer-drag-n")).unwrap_or(0);
-            d.insert_temp(egui::Id::new("viewer-drag-n"), n + 1);
+            let n: u64 = d.get_temp(egui::Id::unique("viewer-drag-n")).unwrap_or(0);
+            d.insert_temp(egui::Id::unique("viewer-drag-n"), n + 1);
         });
     }
+    v.vertex_hits = vertex_hits;
+    v.pin_hits = pin_hits;
+}
+
+fn phase_clicked(app: &mut EffectcraftApp, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let area = v.area;
+    let zoom = v.zoom;
+    let cw = v.cw;
+    let ch = v.ch;
+    let map = v.map;
+    let mods = v.mods;
+    let text_owns = v.text_owns;
+    let ctx = v.ctx.clone();
+    let ft = std::mem::take(&mut v.ft);
+    let handle_hits = std::mem::take(&mut v.handle_hits);
+    let vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let key_hits = std::mem::take(&mut v.key_hits);
+    let motion_frames = std::mem::take(&mut v.motion_frames);
+    let paths = std::mem::take(&mut v.paths);
+    let pin_hits = std::mem::take(&mut v.pin_hits);
+    let puppet_layers = std::mem::take(&mut v.puppet_layers);
+    let comp = v.comp;
+    let vertex_at = |pos: Pos2, tangents: bool| -> Option<VertexHit> {
+        let reach = vertex_grab_radius(pos, handle_hits.iter().map(|(_, _, h, _)| *h));
+        vertex_hits.iter().rev().filter(|h| h.tangent.is_some() == tangents).find(|h| h.pos.distance(pos) < reach).copied()
+    };
+    let puppet_layer = |app: &mut EffectcraftApp, cpt: [f64; 2]| -> Option<LayerId> {
+        if puppet_layers.is_empty() {
+            return pick(app, ectx, cpt, false);
+        }
+        super::puppet_tool::target(ectx, &puppet_layers, cpt, |l| layers_at(ectx, cpt).any(|h| h.id == l.id))
+    };
     if resp.clicked()
         && !text_owns
         && let Some(pos) = resp.interact_pointer_pos()
@@ -1933,13 +1637,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
                 // Clicking away from the free-transform box ends it.
                 ov::end_free_transform(&ctx);
             }
-            Tool::ObjectMatte => super::object_matte_tool::apply(app, &ectx, &map, pos, None, mods.shift),
+            Tool::ObjectMatte => super::object_matte_tool::apply(app, ectx, &map, pos, None, mods.shift),
             t if t.puppet_kind().is_some() => {
                 if let Some((h, _)) = super::puppet_tool::hit(&pin_hits, pos) {
                     // Click selects the pin; Shift-click adds or removes it.
                     let _ = app.session.execute("puppet.selectPins", json!({"layer": h.layer.0, "pins": [h.pin], "toggle": mods.shift}));
                 } else if let Some(l) = puppet_layer(app, cpt).and_then(|l| comp.layer(l))
-                    && let Some(inv) = fx2c(&ectx, l).inverse()
+                    && let Some(inv) = fx2c(ectx, l).inverse()
                 {
                     let lp = inv.apply(gv2(cpt[0], cpt[1]));
                     match app.session.execute("puppet.addPin", json!({"layer": l.id.0, "kind": t.puppet_kind(), "position": [lp.x, lp.y]})) {
@@ -1960,13 +1664,13 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
             // The Roto Brush paints in the Layer panel only: select as usual and say so.
             rt if rt.roto_kind(false).is_some() => {
-                if pick(app, &ectx, cpt, mods.shift).is_none() {
+                if pick(app, ectx, cpt, mods.shift).is_none() {
                     let _ = app.session.execute("edit.deselectAll", json!({}));
                 }
                 app.ui.status = crate::i18n::tr(ROTO_HINT).to_string();
             }
             _ => {
-                if pick(app, &ectx, cpt, mods.shift).is_none() {
+                if pick(app, ectx, cpt, mods.shift).is_none() {
                     let _ = app.session.execute("edit.deselectAll", json!({}));
                 } else if !mods.shift && !app.session.state.selected_vertices.is_empty() && ov::segment_at(&paths, &map, pos, 6.0).is_none() {
                     // A click away from the paths, even on their layer, deselects the mask
@@ -1976,6 +1680,28 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
+    v.ft = ft;
+    v.handle_hits = handle_hits;
+    v.vertex_hits = vertex_hits;
+    v.key_hits = key_hits;
+    v.motion_frames = motion_frames;
+    v.paths = paths;
+    v.pin_hits = pin_hits;
+    v.puppet_layers = puppet_layers;
+}
+
+fn phase_dblclick(app: &mut EffectcraftApp, ectx: &EvalCtx, resp: &egui::Response, v: &mut Vw<'_>) {
+    let map = v.map;
+    let text_owns = v.text_owns;
+    let ctx = v.ctx.clone();
+    let handle_hits = std::mem::take(&mut v.handle_hits);
+    let vertex_hits = std::mem::take(&mut v.vertex_hits);
+    let paths = std::mem::take(&mut v.paths);
+    let comp = v.comp;
+    let vertex_at = |pos: Pos2, tangents: bool| -> Option<VertexHit> {
+        let reach = vertex_grab_radius(pos, handle_hits.iter().map(|(_, _, h, _)| *h));
+        vertex_hits.iter().rev().filter(|h| h.tangent.is_some() == tangents).find(|h| h.pos.distance(pos) < reach).copied()
+    };
     if resp.double_clicked()
         && !text_owns
         && app.ui.tool == Tool::Selection
@@ -1997,7 +1723,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
     {
         let cpt = map.to_comp(pos);
         let roto = app.ui.tool.roto_kind(false).is_some();
-        if let Some(l) = pick(app, &ectx, cpt, false).and_then(|l| comp.layer(l)) {
+        if let Some(l) = pick(app, ectx, cpt, false).and_then(|l| comp.layer(l)) {
             match &l.source {
                 effectcraft_engine::project::LayerSource::Comp { item } => app.session.open_comp(*item),
                 // With a Roto Brush tool, double-clicking a layer opens it in the Layer panel,
@@ -2013,13 +1739,34 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
             }
         }
     }
+    v.handle_hits = handle_hits;
+    v.vertex_hits = vertex_hits;
+    v.paths = paths;
+}
+
+fn phase_tail(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx, v: &mut Vw<'_>) {
+    let t = v.t;
+    let cid = v.cid;
+    let bar = v.bar;
+    let err_bar = v.err_bar;
+    let err_h = v.err_h;
+    let area = v.area;
+    let outer = v.outer;
+    let zoom = v.zoom;
+    let map = v.map;
+    let time = v.time;
+    let ctx = v.ctx.clone();
+    let painter = v.painter.clone();
+    let comp = v.comp;
     // 3D Camera Tracker points, targets and their menu (on top of the viewer's gestures while
     // the effect is selected), and its analysis banner.
-    super::camera_tracker_ui::viewer_hook(app, ui, &painter, &map, &ectx, &|c, l| l2c(c, l).0);
+    super::camera_tracker_ui::viewer_hook(app, ui, &painter, &map, ectx, &|c, l| l2c(c, l).0);
     // Effect point controls and crosshair/eyedropper picks (on top of the viewer's gestures).
-    crate::panels::effect_controls::viewer_hook(app, ui, &painter, &map, &ectx, &|c, l| l2c(c, l).0);
+    crate::panels::effect_controls::viewer_hook(app, ui, &painter, &map, ectx, &|c, l| l2c(c, l).0);
     // Selected shape gradients' start and end points (#612).
-    crate::panels::gradient_handles::viewer_hook(app, ui, &painter, &map, &ectx, &|c, l| l2c(c, l).0);
+    crate::panels::gradient_handles::viewer_hook(app, ui, &painter, &map, ectx, &|c, l| l2c(c, l).0);
+    // Selected text Range Selectors' Start and End bars (#1011).
+    crate::panels::text_range_handles::viewer_hook(app, ui, &painter, &map, ectx, &|c, l| l2c(c, l).0);
 
     // Status chips (render time / caching).
     if app.playback.playing && app.playback.waiting {
@@ -2031,816 +1778,42 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
         let r = Rect::from_min_size(area.min + vec2(10.0, 10.0), vec2(330.0, 22.0));
         painter.rect_filled(r, 11.0, Color32::from_black_alpha(190));
         painter.text(r.center(), Align2::CENTER_CENTER, crate::i18n::tr("Video preview is off (Preview panel): audio only"), Tokens::ui(11.5), t.timecode);
-        ui.ctx().data_mut(|d| d.insert_temp(egui::Id::new("viewer-video-off-chip"), r));
+        ui.ctx().data_mut(|d| d.insert_temp(egui::Id::unique("viewer-video-off-chip"), r));
     }
 
-    vt::draw_snap(&ctx, &painter, &map, &ectx);
+    vt::draw_snap(&ctx, &painter, &map, ectx);
     vt::rulers(app, ui, &map, outer, area);
-    vt::bottom_bar(app, ui, bar, zoom, time, &comp);
+    vt::bottom_bar(app, ui, bar, zoom, time, comp);
     if err_h > 0.0 {
         super::expr_bar::draw(app, ui, err_bar, cid);
     }
 }
-
-/// Parent-space position change per comp pixel of drag (x and y) for a layer: 2D layers map
-/// through the parent transform; 3D layers move in the view plane at their depth.
-fn drag_axes(ctx: &EvalCtx, l: &Layer) -> ([f64; 3], [f64; 3]) {
-    if !l.is_3d() {
-        let inv = parent_inverse(ctx, l);
-        let a = inv.apply_vec(gv2(1.0, 0.0));
-        let b = inv.apply_vec(gv2(0.0, 1.0));
-        return ([a.x, a.y, 0.0], [b.x, b.y, 0.0]);
-    }
-    let cam = cam_state(ctx);
-    let anchor = l.transform().map(|tr| ctx.v3(l, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
-    let wp = ctx.world_matrix(l).apply(anchor.into());
-    let k = if cam.ortho { 1.0 / cam.zoom.max(1e-9) } else { cam.depth(wp).max(1.0) / cam.zoom.max(1e-9) };
-    let pinv = match l.parent.and_then(|p| ctx.comp.layer(p)) {
-        Some(p) => ctx.world_matrix(p).inverse().unwrap_or_default(),
-        None => effectcraft_engine::geom::Mat4::IDENTITY,
-    };
-    let a = pinv.apply_vec(cam.right() * k);
-    let b = pinv.apply_vec(cam.down() * k);
-    ([a.x, a.y, a.z], [b.x, b.y, b.z])
-}
-
-/// Wireframes of cameras (frustum, point of interest) and lights (position, direction) as seen
-/// through the current 3D view.
-/// Camera and light wireframes seen through `cam` (`through_active`: `cam` is the active camera,
-/// which is then not drawn). `pane` names the automation ids: `None` for the main view
-/// (`viewer.camera.<id>`), `Some(view)` for a view of a 2- or 4-view layout
-/// (`viewer.view.<view>.camera.<id>`).
-#[allow(clippy::too_many_arguments)]
-fn draw_rigs(
-    app: &mut EffectcraftApp,
-    painter: &egui::Painter,
-    map: &ViewerMap,
-    ectx: &EvalCtx,
-    selected: &[LayerId],
-    cam: CameraState,
-    through_active: bool,
-    pane: Option<&str>,
-) {
-    use effectcraft_engine::geom::Vec3;
-    use effectcraft_engine::project::{LayerSource, LightKind};
-    let (w, h) = (ectx.comp.width as f64, ectx.comp.height as f64);
-    let active = ectx.comp.active_camera(ectx.time).map(|c| c.id);
-    let prefix = pane.map(|v| format!("viewer.view.{v}.")).unwrap_or_else(|| "viewer.".to_string());
-    let proj = |p: Vec3| cam.project(w, h, p).map(|v| map.to_screen([v.x, v.y]));
-    let seg = |a: Vec3, b: Vec3, stroke: Stroke| {
-        if let (Some(x), Some(y)) = (proj(a), proj(b)) {
-            painter.line_segment([x, y], stroke);
-        }
-    };
-    for l in ectx.comp.layers.iter().filter(|l| (l.is_camera() || l.is_light()) && l.is_active_at(ectx.time)) {
-        let sel = selected.contains(&l.id);
-        let col = app.tokens.label(l.label).gamma_multiply(if sel { 1.0 } else { 0.6 });
-        let stroke = Stroke::new(if sel { 1.5 } else { 1.0 }, col);
-        let (eye, fwd, down) = three_d::camera::layer_frame(ectx, l);
-        let poi = |l: &Layer| -> Option<Vec3> {
-            let pr = l.transform()?.get("poi").filter(|_| three_d::camera::is_two_node(l))?;
-            Some(three_d::camera::parent_world(ectx, l).apply(ectx.value(l, pr).as_vec3().into()))
-        };
-        if l.is_camera() {
-            if through_active && Some(l.id) == active {
-                continue;
-            }
-            let zoom = l.props.prop("cameraOptions/zoom").map(|p| ectx.value(l, p).as_f64()).unwrap_or(1000.0);
-            let right = down.cross(fwd);
-            // Frustum to a plane at a quarter of the zoom distance.
-            let k = 0.25;
-            let c = eye + fwd * (zoom * k);
-            let corners = [(-1.0, -1.0), (1.0, -1.0), (1.0, 1.0), (-1.0, 1.0)].map(|(sx, sy)| c + right * (sx * w * 0.5 * k) + down * (sy * h * 0.5 * k));
-            for i in 0..4 {
-                seg(eye, corners[i], stroke);
-                seg(corners[i], corners[(i + 1) % 4], stroke);
-            }
-            if let Some(poi) = poi(l) {
-                seg(eye, poi, Stroke::new(1.0, col.gamma_multiply(0.6)));
-                if let Some(s) = proj(poi) {
-                    painter.circle_stroke(s, 4.0, stroke);
-                }
-            }
-            if let Some(s) = proj(eye) {
-                app.auto.add(&format!("{prefix}camera.{}", l.id.0), Rect::from_center_size(s, vec2(14.0, 14.0)), &l.name);
-            }
-        } else {
-            let LayerSource::Light { kind } = l.source else { continue };
-            if kind == LightKind::Ambient {
-                continue;
-            }
-            let Some(s) = proj(eye) else { continue };
-            painter.circle_stroke(s, 6.0, stroke);
-            for i in 0..8 {
-                let a = i as f32 * std::f32::consts::FRAC_PI_4;
-                let d = vec2(a.cos(), a.sin());
-                painter.line_segment([s + d * 8.0, s + d * 12.0], stroke);
-            }
-            if matches!(kind, LightKind::Spot | LightKind::Parallel) {
-                let target = poi(l).unwrap_or(eye + fwd * 300.0);
-                seg(eye, target, Stroke::new(1.0, col.gamma_multiply(0.7)));
-                if let Some(q) = proj(target) {
-                    painter.circle_stroke(q, 3.0, stroke);
-                }
-            }
-            app.auto.add(&format!("{prefix}light.{}", l.id.0), Rect::from_center_size(s, vec2(16.0, 16.0)), &l.name);
-        }
-    }
-}
-
-/// Pen tool press at `pos`: continue the path in progress (pressing its first vertex closes it),
-/// resume an open path whose last vertex is pressed, add a vertex on a visible path's segment, or
-/// start a new path: a mask on the selected footage/solid layer (or shape layer, with Tool Creates
-/// Mask), a shape path (Shape n group with the Tools bar's Fill and Stroke) on the selected shape
-/// layer, or a new shape layer when nothing is selected. The placed point snaps.
-/// Add a Position keyframe at a motion path's frame, keeping the path where it is.
-fn add_motion_key(app: &mut EffectcraftApp, f: ov::PathFrame) {
-    if let Err(e) = app.session.execute("prop.addKey", json!({"layer": f.layer.0, "prop": f.prop, "time": f.time.seconds()})) {
-        app.ui.status = e.to_string();
-    }
-}
-
-/// Select only the motion path's keyframe `k` (what the vertex tools act on).
-fn select_motion_key(app: &mut EffectcraftApp, k: &ov::KeyHit) -> bool {
-    app.session.execute("keys.select", json!({"keys": [{"layer": k.layer.0, "prop": k.prop, "time": k.time.seconds()}]})).is_ok()
-}
-
-/// The pointer for a Pen slot tool: the tool's own pen, the Pen showing Add Vertex's over a path
-/// it would add a point to (After Effects).
-fn pen_cursor_icon(tool: Tool, over_path: bool) -> crate::icons::Icon {
-    use crate::icons::Icon;
-    match tool {
-        Tool::Pen if over_path => Icon::PenAdd,
-        Tool::PenAdd => Icon::PenAdd,
-        Tool::PenDelete => Icon::PenDelete,
-        Tool::PenConvert => Icon::PenConvert,
-        Tool::MaskFeather => Icon::MaskFeather,
-        _ => Icon::Pen,
-    }
-}
-
-/// Paint pen pointer `icon` with its tip at `at`, outlined for any background.
-fn pen_cursor(ctx: &egui::Context, at: Pos2, icon: crate::icons::Icon) {
-    use crate::icons::Icon;
-    // Where each glyph's tip sits in its 16 × 16 box.
-    let tip = match icon {
-        Icon::PenAdd | Icon::PenDelete | Icon::MaskFeather => vec2(6.0, 2.5),
-        Icon::PenConvert => vec2(8.0, 3.5),
-        _ => vec2(8.0, 1.8),
-    };
-    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("viewer-pen-cursor")));
-    let rect = Rect::from_min_size(at - tip, vec2(16.0, 16.0));
-    for d in [vec2(-1.0, 0.0), vec2(1.0, 0.0), vec2(0.0, -1.0), vec2(0.0, 1.0)] {
-        crate::icons::paint(&painter, rect.translate(d), icon, Color32::BLACK);
-    }
-    crate::icons::paint(&painter, rect, icon, Color32::WHITE);
-}
-
-#[allow(clippy::too_many_arguments)]
-fn pen_press(
-    app: &mut EffectcraftApp,
-    ui: &mut egui::Ui,
-    ectx: &EvalCtx,
-    map: &ViewerMap,
-    paths: &[ov::PathInfo],
-    motion_frame: Option<ov::PathFrame>,
-    pos: Pos2,
-    mods: egui::Modifiers,
-) {
-    use effectcraft_engine::project::LayerSource;
-    let gid = egui::Id::new("viewer-gesture");
-    let current: Option<(LayerId, u64)> = ui.data(|d| d.get_temp(pen_id()));
-    let c0 = map.to_comp(pos);
-    let corr = vt::snap(app, ui.ctx(), ectx, map, &[], &[c0], mods);
-    let c = [c0[0] + corr[0], c0[1] + corr[1]];
-    if let Some((lid, uid)) = current
-        && let Some(p) = ov::path_of(ectx, lid, uid)
-        && let Some(inv) = p.m.inverse()
-    {
-        let n = p.sp.vertices.len();
-        let first = p.sp.vertices.first().map(|v| {
-            let q = p.m.apply(gv2(v[0], v[1]));
-            map.to_screen([q.x, q.y])
-        });
-        if n >= 2 && first.is_some_and(|f| f.distance(pos) < 8.0) {
-            let _ = app.session.execute("mask.setClosed", json!({"layer": lid.0, "mask": uid, "closed": true}));
-            ui.data_mut(|d| {
-                d.remove::<(LayerId, u64)>(pen_id());
-                d.remove::<Gesture>(gid);
-            });
-            return;
-        }
-        // Shift keeps the new segment at a multiple of 45° from the vertex before it (#1544).
-        let last = p.sp.vertices.last().map(|v| p.m.apply(gv2(v[0], v[1])));
-        let c = match last {
-            Some(q) if mods.shift => constrain_45([q.x, q.y], c),
-            _ => c,
-        };
-        let lp = inv.apply(gv2(c[0], c[1]));
-        let lp = [lp.x, lp.y];
-        if let Ok(v) = app.session.execute("mask.addVertex", json!({"layer": lid.0, "mask": uid, "point": lp})) {
-            let index = v.as_u64().unwrap_or(0) as usize;
-            ui.data_mut(|d| d.insert_temp(gid, Gesture::Pen { layer: lid, mask: uid, index, vertex: lp, inv, press: pos }));
-        }
-        return;
-    }
-    // Clicking the last vertex of an open path (e.g. after Esc ended it) resumes drawing it.
-    if let Some(cur) = ov::open_end_at(paths, map, pos, 8.0) {
-        ui.data_mut(|d| d.insert_temp(pen_id(), cur));
-        return;
-    }
-    // On a visible path's segment the Pen adds a vertex there; on a motion path, a keyframe.
-    if let Some(f) = motion_frame {
-        add_motion_key(app, f);
-        return;
-    }
-    if let Some((l, m, seg, t)) = ov::segment_at(paths, map, pos, 5.0) {
-        let _ = app.session.execute("mask.insertVertex", json!({"layer": l.0, "mask": m, "segment": seg, "t": t}));
-        return;
-    }
-    let target = app
-        .session
-        .state
-        .selected_layers
-        .iter()
-        .copied()
-        .find(|id| ectx.comp.layer(*id).is_some_and(|l| !l.switches.locked && (l.masks().is_some() || matches!(l.source, LayerSource::Shape))));
-    let layer = target.and_then(|id| ectx.comp.layer(id));
-    let (lid, uid, inv) = match layer {
-        Some(l) if !matches!(l.source, LayerSource::Shape) || app.session.state.shape_tool.creates_mask => {
-            let Some(inv) = l2c(ectx, l).0.inverse() else { return };
-            let lp = inv.apply(gv2(c[0], c[1]));
-            let Ok(v) = app.session.execute("mask.new", json!({"layer": l.id.0, "vertices": [[lp.x, lp.y]]})) else { return };
-            let Some(mask) = v["mask"].as_u64() else { return };
-            (l.id, mask, inv)
-        }
-        Some(l) => {
-            let Some(inv) = l2c(ectx, l).0.inverse() else { return };
-            let lp = inv.apply(gv2(c[0], c[1]));
-            let r = app.session.execute("shape.newPath", json!({"layer": l.id.0, "vertices": [[lp.x, lp.y]], "space": "layer"}));
-            let Some(path) = r.ok().and_then(|v| v["path"].as_u64()) else { return };
-            (l.id, path, inv)
-        }
-        None => {
-            // A new shape layer at the comp centre (unrotated: comp → layer is a translation).
-            let r = app.session.execute("shape.newPath", json!({"vertices": [c], "space": "comp"}));
-            let Some(v) = r.ok() else { return };
-            let (Some(l), Some(path)) = (v["layer"].as_u64(), v["path"].as_u64()) else { return };
-            let inv = Mat3::translate(gv2(-(ectx.comp.width as f64) / 2.0, -(ectx.comp.height as f64) / 2.0));
-            (LayerId(l), path, inv)
-        }
-    };
-    let lp = inv.apply(gv2(c[0], c[1]));
-    ui.data_mut(|d| {
-        d.insert_temp(pen_id(), (lid, uid));
-        d.insert_temp(gid, Gesture::Pen { layer: lid, mask: uid, index: 0, vertex: [lp.x, lp.y], inv, press: pos });
-    });
-}
-
-/// `to` moved onto the nearest line through `from` at a multiple of 45° (horizontal, vertical or
-/// diagonal), as far along it as `to` lies: the Pen's Shift-click.
-fn constrain_45(from: [f64; 2], to: [f64; 2]) -> [f64; 2] {
-    let (dx, dy) = (to[0] - from[0], to[1] - from[1]);
-    if !(dx.is_finite() && dy.is_finite()) || (dx == 0.0 && dy == 0.0) {
-        return to;
-    }
-    let step = std::f64::consts::FRAC_PI_4;
-    let a = (dy.atan2(dx) / step).round() * step;
-    let (ux, uy) = (a.cos(), a.sin());
-    let along = dx * ux + dy * uy;
-    [from[0] + ux * along, from[1] + uy * along]
-}
-
-/// Visible, unlocked layers eligible for viewer hit tests, in front-to-back order.
-/// Solo scope matches the renderer: any soloed AV layer activates it at every time (as in After
-/// Effects), even when hidden, locked or outside its in-out range.
-pub(crate) fn selectable_layers(comp: &Comp, time: Tick) -> impl Iterator<Item = &Layer> {
-    let any_solo = comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
-    comp.layers
-        .iter()
-        .filter(move |l| l.is_active_at(time) && l.switches.video && !l.switches.locked && !l.is_camera() && !l.is_light() && (!any_solo || l.switches.solo))
-}
-
-/// Selectable layers under a comp point, front to back.
-pub(crate) fn layers_at<'a, 'b>(ectx: &'b EvalCtx<'a>, cpt: [f64; 2]) -> impl Iterator<Item = &'a Layer> + 'b {
-    selectable_layers(ectx.comp, ectx.time).filter(move |l| layer_quad(ectx, l).is_some_and(|(_, q, _)| point_in_quad(cpt, &q)))
-}
-
-/// Topmost selectable layer under a comp point.
-pub(crate) fn layer_at<'a>(ectx: &EvalCtx<'a>, cpt: [f64; 2]) -> Option<&'a Layer> {
-    layers_at(ectx, cpt).next()
-}
-
-/// The layer a press at a comp point acts on, selected (Shift toggles the topmost layer). As in
-/// After Effects, a selected layer under the point comes before the layers in front of it, so it
-/// can be dragged where they cover it; otherwise the topmost layer (#230).
-pub(crate) fn pick(app: &mut EffectcraftApp, ectx: &EvalCtx, cpt: [f64; 2], toggle: bool) -> Option<LayerId> {
-    if toggle {
-        let hit = layer_at(ectx, cpt)?.id;
-        let _ = app.session.execute("layer.select", json!({"layers": [hit.0], "toggle": true}));
-        return Some(hit);
-    }
-    let selected = &app.session.state.selected_layers;
-    let hits: Vec<LayerId> = layers_at(ectx, cpt).map(|l| l.id).collect();
-    let hit = *hits.iter().find(|id| selected.contains(id)).or(hits.first())?;
-    if !selected.contains(&hit) {
-        let _ = app.session.execute("layer.select", json!({"layers": [hit.0]}));
-    }
-    Some(hit)
-}
-
-/// Where a shape drag is going to land: a mask on the selected layer, a group inside it, or a new
-/// shape layer.
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum ShapeTarget {
-    Mask,
-    IntoLayer,
-    NewLayer,
-}
-
-impl ShapeTarget {
-    /// What the drag will make and where, named the way the ghost captions it.
-    fn label(self, layer_name: &str) -> String {
-        match self {
-            ShapeTarget::Mask => format!("Mask on “{layer_name}”"),
-            ShapeTarget::IntoLayer => format!("Into “{layer_name}”"),
-            ShapeTarget::NewLayer => "New shape layer".to_string(),
-        }
-    }
-}
-
-/// A shape drag as it stands, after the Tools' normalisations: the path it will make and where it
-/// will land.
-struct ShapeDrag {
-    /// The `shape.newShape` / `layer.addMask` kind for the tool.
-    kind: &'static str,
-    /// Comp-space centre and size, what the drag will make.
-    centre: [f64; 2],
-    size: [f64; 2],
-    target: ShapeTarget,
-    /// The selected layer's name and the index its next mask would take, for the ghost's caption
-    /// and colour.
-    layer_name: String,
-    mask_index: usize,
-}
-
-/// The kind `tool` draws, as `shape.newShape` / `layer.addMask` name it.
-fn shape_kind(tool: Tool) -> &'static str {
-    match tool {
-        Tool::Rectangle => "rect",
-        Tool::RoundedRect => "rounded",
-        Tool::Ellipse => "ellipse",
-        Tool::Polygon => "polygon",
-        _ => "star",
-    }
-}
-
-/// What a shape tool drag from `start` to `end` makes, or `None` while it is too small to make
-/// anything. Alt (Option) draws from the press point and Shift squares the box; the live ghost and
-/// [`create_shape`] both go through this, so the drag always shows what it will commit.
-fn shape_drag(app: &EffectcraftApp, tool: Tool, start: [f64; 2], end: [f64; 2], mods: egui::Modifiers) -> Option<ShapeDrag> {
-    let comp = app.session.active_comp()?;
-    let selected = app.session.state.selected_layers.first().copied();
-    let sel = selected.and_then(|id| comp.layer(id));
-    // A footage, solid or other non-shape layer selected, or a shape layer with Tool Creates
-    // Mask: a mask on that layer. Otherwise the engine's own target: the first selected unlocked
-    // shape layer, else a new one.
-    let target = match sel {
-        Some(l) if l.source.is_av() && (app.session.state.shape_tool.creates_mask || !matches!(l.source, LayerSource::Shape)) => (ShapeTarget::Mask, Some(l)),
-        _ => match effectcraft_engine::commands::shape_tool::selected_shape_target(&app.session, comp).and_then(|id| comp.layer(id)) {
-            Some(l) => (ShapeTarget::IntoLayer, Some(l)),
-            None => (ShapeTarget::NewLayer, None),
-        },
-    };
-    let (target, layer) = target;
-    let mask_index = if target == ShapeTarget::Mask { layer.and_then(|l| l.masks()).map_or(0, |m| m.groups().count()) } else { 0 };
-    let (mut w, mut h) = ((end[0] - start[0]).abs(), (end[1] - start[1]).abs());
-    // Ctrl/Cmd draws from the press point as the centre, as in After Effects.
-    if mods.command {
-        w *= 2.0;
-        h *= 2.0;
-    }
-    if w < 2.0 && h < 2.0 {
-        return None;
-    }
-    if mods.shift {
-        let m = w.max(h);
-        w = m;
-        h = m;
-    }
-    Some(ShapeDrag {
-        kind: shape_kind(tool),
-        centre: if mods.command { start } else { [start[0].min(end[0]) + w / 2.0, start[1].min(end[1]) + h / 2.0] },
-        size: [w, h],
-        target,
-        layer_name: layer.map_or_else(String::new, |l| l.name.clone()),
-        mask_index,
-    })
-}
-
-/// The Tools bar's paint colour as bytes, dimmed by `alpha` so the comp shows through the ghost.
-fn paint_rgb(c: [f32; 3], opacity: f64, alpha: f32) -> Color32 {
-    let f = |k: f32| (k.clamp(0.0, 1.0) * 255.0).round() as u8;
-    Color32::from_rgb(f(c[0]), f(c[1]), f(c[2])).gamma_multiply((opacity.clamp(0.0, 100.0) / 100.0) as f32 * alpha)
-}
-
-/// Draw a shape drag as it will land: the tool's own path, filled with the Tools bar's Fill and
-/// outlined in its Stroke (or the mask colour, for a mask), captioned with where it goes.
-fn draw_shape_ghost(painter: &egui::Painter, map: &ViewerMap, app: &EffectcraftApp, d: &ShapeDrag, t: &Tokens) {
-    // The engine's own geometry for the kind, so the ghost is the shape and not a stand-in for it.
-    let Some(sp) = effectcraft_engine::commands::shape_tool::mask_path(d.kind, d.centre, d.size) else { return };
-    let mut pts = ov::flatten(&sp, &Mat3::IDENTITY, map);
-    if pts.first() == pts.last() {
-        pts.pop();
-    }
-    if pts.len() < 3 {
-        return;
-    }
-    let tool = &app.session.state.shape_tool;
-    let (fill, line) = match d.target {
-        ShapeTarget::Mask => {
-            let [r, g, b] = effectcraft_engine::prefs::mask_color(app.session.prefs.appearance.cycle_mask_colors, d.mask_index);
-            (Color32::from_rgb(r, g, b).gamma_multiply(0.25), Color32::from_rgb(r, g, b))
-        }
-        _ => {
-            let stroke_on = tool.stroke.kind != PaintKind::None && tool.stroke_width > 0.0;
-            (
-                if tool.fill.kind == PaintKind::None { Color32::TRANSPARENT } else { paint_rgb(tool.fill.color, tool.fill.opacity, 0.45) },
-                if stroke_on { paint_rgb(tool.stroke.color, tool.stroke.opacity, 1.0) } else { t.accent },
-            )
-        }
-    };
-    let Some(bounds) = bounds_of(&pts) else { return };
-    // A screen-width outline reads at every zoom, where a comp-pixel hairline does not.
-    painter.add(egui::Shape::Path(egui::epaint::PathShape { points: pts, closed: true, fill, stroke: Stroke::new(1.5, line).into() }));
-    // Caption it with where the shape lands: a mask, a group in the selected shape layer or a
-    // new layer.
-    let font = Tokens::ui(11.0);
-    let galley = painter.layout_no_wrap(d.target.label(&d.layer_name), font, line);
-    let caption = Rect::from_min_size(pos2(bounds.left(), bounds.top() - 5.0 - galley.size().y), galley.size());
-    painter.rect_filled(caption.expand(3.0), 2.0, Color32::from_black_alpha(150));
-    painter.galley(caption.min, galley, line);
-}
-
-/// The bounds of points on screen, or `None` for an empty set.
-fn bounds_of(pts: &[Pos2]) -> Option<Rect> {
-    let first = *pts.first()?;
-    let mut r = Rect::from_min_max(first, first);
-    for p in pts.iter().skip(1) {
-        r.extend_with(*p);
-    }
-    Some(r)
-}
-
-fn create_shape(app: &mut EffectcraftApp, tool: Tool, a: [f64; 2], b: [f64; 2], mods: egui::Modifiers) {
-    let Some(d) = shape_drag(app, tool, a, b, mods) else { return };
-    let (kind, (w, h), (cx, cy)) = (d.kind, (d.size[0], d.size[1]), (d.centre[0], d.centre[1]));
-    // A mask on the selected layer, as the ghost showed.
-    if d.target == ShapeTarget::Mask {
-        // In layer space: invert the layer transform.
-        let sel_layer = app.session.state.selected_layers.first().copied().and_then(|id| app.session.active_comp().and_then(|c| c.layer(id)).cloned());
-        if let Some(l) = sel_layer
-            && let Some(comp) = app.session.active_comp_arc()
-        {
-            let ectx = EvalCtx {
-                project: &app.session.project,
-                comp_id: app.session.active_comp_id().unwrap_or_default(),
-                comp: &comp,
-                time: app.session.time(),
-                expr: None,
-                footage: None,
-            };
-            let inv = l2c(&ectx, &l).0.inverse().unwrap_or(Mat3::IDENTITY);
-            let p0 = inv.apply(gv2(cx - w / 2.0, cy - h / 2.0));
-            let p1 = inv.apply(gv2(cx + w / 2.0, cy + h / 2.0));
-            let rect = [p0.x.min(p1.x), p0.y.min(p1.y), (p1.x - p0.x).abs(), (p1.y - p0.y).abs()];
-            if let Err(e) = app.session.execute("layer.addMask", json!({"layer": l.id.0, "shape": kind, "rect": rect})) {
-                app.ui.status = e.to_string();
-            }
-        }
-        return;
-    }
-    // Into the selected shape layer's Contents as a new group (as in After Effects), else a new
-    // shape layer; painted with the Tools bar's Fill and Stroke.
-    if let Err(e) = app.session.execute("shape.newShape", json!({"kind": kind, "size": [w, h], "position": [cx, cy]})) {
-        app.ui.status = e.to_string();
-    }
-}
-
-fn empty_state(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
-    let t = app.tokens;
-    let p = ui.painter().clone();
-    p.rect_filled(rect, 0.0, t.pasteboard);
-    let c = rect.center();
-    p.text(c - vec2(0.0, 40.0), Align2::CENTER_CENTER, crate::i18n::tr("Composition"), Tokens::semibold(16.0), t.text);
-    let b1 = Rect::from_center_size(c + vec2(0.0, 0.0), vec2(220.0, 30.0));
-    if widgets::text_button(ui, b1, "New Composition", true, &t, egui::Id::new("empty-newcomp")).clicked() {
-        crate::panels::dialogs::open_new_comp(app);
-    }
-    app.auto.add("viewer.empty.newComp", b1, "New Composition");
-    let b2 = Rect::from_center_size(c + vec2(0.0, 40.0), vec2(220.0, 30.0));
-    if widgets::text_button(ui, b2, "New Composition From Footage", false, &t, egui::Id::new("empty-fromfootage")).clicked() {
-        let _ = crate::menus::invoke(app, &ui.ctx().clone(), "file.import", json!({}));
-    }
-    app.auto.add("viewer.empty.import", b2, "New Composition From Footage");
-    // A Project item dropped on the empty viewer creates the first composition,
-    // just like dropping it onto an empty Timeline (#684). Multiple selected
-    // items use the existing New Comp from Selection dialog.
-    let ctx = ui.ctx().clone();
-    if let Some(crate::panels::DragPayload::Item(dragged)) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx).as_deref()
-        && ui.rect_contains_pointer(rect)
-    {
-        let items: Vec<effectcraft_engine::project::ItemId> = crate::panels::project_drop_items(app, *dragged)
-            .into_iter()
-            .map(effectcraft_engine::project::ItemId)
-            .filter(|id| {
-                app.session.project.item(*id).is_some_and(|item| match &item.kind {
-                    effectcraft_engine::project::ItemKind::Footage(f) => f.kind != effectcraft_engine::project::FootageKind::Data,
-                    effectcraft_engine::project::ItemKind::Solid(_) | effectcraft_engine::project::ItemKind::Comp(_) => true,
-                    _ => false,
-                })
-            })
-            .collect();
-        if !items.is_empty() {
-            p.rect_stroke(rect.shrink(2.0), 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
-            app.auto.add("viewer.newCompDrop", rect, "Drop footage to create a composition");
-            if ctx.input(|i| i.pointer.any_released()) {
-                app.session.state.project_selection = items;
-                if let Err(e) = crate::menus::invoke(app, &ctx, "file.newCompFromSelection", json!({})) {
-                    app.ui.status = e;
-                }
-                egui::DragAndDrop::clear_payload(&ctx);
-            }
-        }
-    }
-}
-
-/// `#rrggbb` → sRGB bytes.
-/// A grid or guide line in the Grids & Guides style: `lines`, `dashed` or `dots`.
-pub(crate) fn styled_line(painter: &egui::Painter, pts: [Pos2; 2], stroke: Stroke, style: &str) {
-    match style {
-        "dashed" => {
-            painter.add(egui::Shape::dashed_line(&pts, stroke, 6.0, 4.0));
-        }
-        "dots" => {
-            painter.add(egui::Shape::dotted_line(&pts, stroke.color, 4.0, stroke.width.max(1.0) * 0.75));
-        }
-        _ => {
-            painter.line_segment(pts, stroke);
-        }
-    }
-}
-
-/// `p` (points) moved to the nearest physical pixel corner at `ppp` pixels per point.
-pub(crate) fn snap_to_pixels(p: Pos2, ppp: f32) -> Pos2 {
-    if !(ppp.is_finite() && ppp > 0.0 && p.x.is_finite() && p.y.is_finite()) {
-        return p;
-    }
-    pos2((p.x * ppp).round() / ppp, (p.y * ppp).round() / ppp)
-}
-
-/// Texture filtering for Viewer Zoom Quality: More Accurate = bilinear, Faster = nearest. As in
-/// After Effects, a magnified frame (above 100 %, or a lower Resolution) always shows its pixels
-/// as blocks, never smoothed, in either mode (#882).
-pub(crate) fn zoom_texture_options(smooth: bool) -> egui::TextureOptions {
-    if smooth { egui::TextureOptions { magnification: egui::TextureFilter::Nearest, ..egui::TextureOptions::LINEAR } } else { egui::TextureOptions::NEAREST }
-}
-
-/// The sampler GPU frames (mipmapped display textures) are drawn with: More Accurate filters
-/// bilinearly within and between mip levels, so a frame shown below 100 % is averaged instead of
-/// skipping pixels (#417); Faster takes the nearest pixel of the full-size frame. Magnified, both
-/// show the nearest pixel (#882).
-pub(crate) fn zoom_sampler(smooth: bool) -> eframe::wgpu::SamplerDescriptor<'static> {
-    use eframe::wgpu::{FilterMode, MipmapFilterMode, SamplerDescriptor};
-    let label = Some("viewer frame");
-    if smooth {
-        SamplerDescriptor {
-            label,
-            mag_filter: FilterMode::Nearest,
-            min_filter: FilterMode::Linear,
-            mipmap_filter: MipmapFilterMode::Linear,
-            ..Default::default()
-        }
-    } else {
-        SamplerDescriptor { label, lod_max_clamp: 0.0, ..Default::default() }
-    }
-}
-
-/// The whole factor a CPU frame is averaged down by for its texture when `pixels` of it are drawn
-/// over `screen` screen pixels: about one texel per screen pixel, so bilinear filtering never
-/// skips frame pixels — the CPU frames' counterpart of the GPU frames' mip levels (#417). Faster
-/// keeps every pixel.
-pub(crate) fn minify_factor(smooth: bool, pixels: f64, screen: f64) -> usize {
-    let k = (pixels / screen + 1e-3).floor();
-    if smooth && k >= 1.0 { k.min(256.0) as usize } else { 1 }
-}
-
 pub(crate) use crate::widgets::hex_rgb;
 
-/// The Extended Viewer's render region for this frame (see [`ViewerState::extended`]):
-/// Settings ▸ 3D ▸ Extended Viewer on, the comp has 3D layers and the view is a custom 3D view
-/// (or Draft 3D is on), and part of the visible viewer lies outside the comp frame.
-///
-/// [`ViewerState::extended`]: crate::state::ViewerState::extended
-pub(crate) fn extended_region(
-    app: &EffectcraftApp,
-    comp: &effectcraft_engine::project::Comp,
-    cid: effectcraft_engine::project::ItemId,
-    map: ViewerMap,
-) -> Option<[f64; 4]> {
-    if !app.session.prefs.three_d.extended_viewer || !comp.has_3d() || app.session.state.region_of_interest.is_some() {
-        return None;
-    }
-    let view = app.session.state.views3d.get(&cid).map(|v| v.current).unwrap_or_default();
-    if view == View3D::ActiveCamera && !comp.draft_3d {
-        return None;
-    }
-    let a = map.to_comp(map.area.min);
-    let b = map.to_comp(map.area.max);
-    effectcraft_engine::render::extended_region(comp.width, comp.height, [a[0], a[1], b[0], b[1]], 1.0)
-}
+mod frame;
+mod geometry;
+mod gesture;
+mod shapes;
+mod tools;
+mod view;
 
-fn rect_of(map: &ViewerMap, r: Option<[f64; 4]>) -> Rect {
-    let [x, y, w, h] = r.unwrap_or_default();
-    Rect::from_min_max(map.to_screen([x, y]), map.to_screen([x + w, y + h]))
-}
-
-/// Put a rendered frame on screen: CPU pixels go into an egui texture, averaged down by `minify`
-/// (see [`minify_factor`]); GPU frames are drawn straight from their wgpu texture (registered with
-/// egui-wgpu, no readback).
-fn show_frame(app: &mut EffectcraftApp, ctx: &egui::Context, key: crate::frames::FrameKey, img: crate::frames::FrameImage, minify: usize) {
-    use crate::frames::FrameImage;
-    // Settings ▸ Previews ▸ Viewer Zoom Quality.
-    let smooth = app.session.prefs.viewer_zoom_smooth();
-    let opts = zoom_texture_options(smooth);
-    match img {
-        FrameImage::Cpu(img) => {
-            // Frames wider or taller than the GPU's texture limit go up averaged down too (#201).
-            let max = crate::frames::max_texture_side(ctx);
-            let fitted = crate::frames::fit_shared_texture_by(&img, max, minify);
-            match &mut app.viewer_tex {
-                Some((tex, k, m)) if tex.size() == fitted.size() => {
-                    tex.set(fitted, opts);
-                    (*k, *m) = (key, minify);
-                }
-                _ => app.viewer_tex = Some((ctx.load_texture("viewer-frame", fitted, opts), key, minify)),
-            }
-            app.viewer_shown = app.viewer_tex.as_ref().map(|(t, k, _)| (t.id(), *k));
-            app.viewer_image = Some(img);
-            vt::set_texture_roi(ctx, app.session.state.region_of_interest.or(app.ui.viewer.extended));
-        }
-        FrameImage::Gpu(f) => {
-            let Some(rs) = &app.wgpu else { return };
-            let view = f.texture.create_view(&Default::default());
-            let mut ren = rs.renderer.write();
-            let id = match &app.viewer_native {
-                Some((id, _, _)) => {
-                    ren.update_egui_texture_from_wgpu_texture_with_sampler_options(&rs.device, &view, zoom_sampler(smooth), *id);
-                    *id
-                }
-                None => ren.register_native_texture_with_sampler_options(&rs.device, &view, zoom_sampler(smooth)),
-            };
-            drop(ren);
-            app.viewer_native = Some((id, key, f));
-            app.viewer_shown = Some((id, key));
-            // Pixels are read back on demand (viewer_pixels).
-            app.viewer_image = None;
-        }
-    }
-}
+use frame::{empty_state, rect_of, show_frame};
+pub(crate) use frame::{extended_region, minify_factor, snap_to_pixels, styled_line, zoom_sampler, zoom_texture_options};
+#[cfg(test)]
+use geometry::{box_corners, project_clipped};
+use geometry::{
+    cam_state, drag_ratio, handle_axes, handle_cursor, handle_point, one_axis, project_segment, quad_intersects_box, rotate_value, selected_others,
+    snap_handle, turn_delta,
+};
+pub(crate) use geometry::{from_effect_space, fx2c, l2c, layer_outline, layer_quad};
+use gesture::{Gesture, HANDLE, ROTO_HINT, pen_id, roi_drag, roi_handles, vertex_grab_radius};
+use shapes::{create_shape, draw_shape_ghost, shape_drag};
+pub(crate) use shapes::{layer_at, layers_at, pick, selectable_layers};
+#[cfg(test)]
+use tools::constrain_45;
+use tools::{add_motion_key, axis_at, axis_drag, drag_axes, draw_rigs, parent_world_inverse, pen_cursor, pen_cursor_icon, pen_press, select_motion_key};
+pub(crate) use view::checker;
+use view::{aux_views, locked_pane};
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use effectcraft_engine::geom::{Mat4, vec3};
-
-    /// #1544: Shift-clicking with the Pen keeps the new segment horizontal, vertical or diagonal.
-    #[test]
-    fn pen_shift_click_keeps_the_segment_at_45_degrees() {
-        let near = |a: [f64; 2], b: [f64; 2]| (a[0] - b[0]).abs() < 1e-9 && (a[1] - b[1]).abs() < 1e-9;
-        let from = [100.0, 100.0];
-        assert!(near(constrain_45(from, [104.0, 180.0]), [100.0, 180.0]), "straight down");
-        assert!(near(constrain_45(from, [30.0, 97.0]), [30.0, 100.0]), "left");
-        assert!(near(constrain_45(from, [150.0, 46.0]), [152.0, 48.0]), "up and right, on the diagonal");
-        assert!(near(constrain_45(from, from), from), "on the vertex");
-        assert!(constrain_45(from, [f64::NAN, 3.0])[0].is_nan(), "a non-finite point stays as it is");
-    }
-
-    /// The Rotation tool counts past a full turn in both directions, as in After Effects: the
-    /// pointer going round the anchor 1.5 turns clockwise gives 540°, then back 2 turns gives
-    /// −180°, with no jump where atan2 wraps from 180° to −180°.
-    #[test]
-    fn rotate_tool_accumulates_revolutions() {
-        // Screen y points down, so a growing atan2 angle is clockwise on screen.
-        let drag = |start: f64, steps: &[f64]| {
-            let (mut last, mut turned, mut out) = (start, 0.0, vec![]);
-            for &a in steps {
-                // atan2's range: (−180°, 180°].
-                let a = (a + 180.0).rem_euclid(360.0) - 180.0;
-                turned += turn_delta(last, a);
-                last = a;
-                out.push(turned);
-            }
-            (last, turned, out)
-        };
-        let cw: Vec<f64> = (1..=54).map(|i| i as f64 * 10.0).collect();
-        let (last, turned, seq) = drag(0.0, &cw);
-        assert!((turned - 540.0).abs() < 1e-9, "{turned}");
-        assert!(seq.windows(2).all(|w| (w[1] - w[0] - 10.0).abs() < 1e-9), "no jump: {seq:?}");
-        assert!((rotate_value(0.0, turned, false) - 540.0).abs() < 1e-9);
-        let ccw: Vec<f64> = (1..=72).map(|i| 540.0 - i as f64 * 10.0).collect();
-        let (_, back, seq) = drag(last, &ccw);
-        assert!(seq.windows(2).all(|w| (w[1] - w[0] + 10.0).abs() < 1e-9), "no jump: {seq:?}");
-        let total = turned + back;
-        assert!((total + 180.0).abs() < 1e-9, "{total}");
-        assert!((rotate_value(30.0, total, false) + 150.0).abs() < 1e-9);
-        // Shift snaps the accumulated value, not a wrapped one.
-        assert_eq!(rotate_value(0.0, 400.0, true), 405.0);
-        assert_eq!(rotate_value(0.0, -400.0, true), -405.0);
-        // Across the seam: 170° → −170° is +20°, and back is −20°; exactly half a turn is +180°.
-        assert!((turn_delta(170.0, -170.0) - 20.0).abs() < 1e-9);
-        assert!((turn_delta(-170.0, 170.0) + 20.0).abs() < 1e-9);
-        assert_eq!(turn_delta(0.0, 180.0), 180.0);
-        assert_eq!(turn_delta(0.0, -180.0), 180.0);
-        // Never crash or poison the value on non-finite input.
-        assert_eq!(turn_delta(f64::NAN, 10.0), 0.0);
-        assert_eq!(turn_delta(0.0, f64::INFINITY), 0.0);
-        assert_eq!(rotate_value(15.0, f64::NAN, false), 15.0);
-    }
-
-    /// #1042: a path vertex lying under, or just beside, a bounding-box handle is grabbed
-    /// instead of the handle; away from every handle the reach is unchanged.
-    #[test]
-    fn vertex_reaches_as_far_as_a_box_handle_over_it() {
-        let handle = pos2(100.0, 100.0);
-        let vertex = pos2(100.0, 100.0);
-        // The press lands 8 points off the vertex, still on the handle's square.
-        let press = pos2(108.0, 100.0);
-        let pick = |p: Pos2, handles: &[Pos2]| vertex.distance(p) < vertex_grab_radius(p, handles.iter().copied());
-        assert!(handle.distance(press) < HANDLE + 2.0, "the handle would take this press");
-        assert!(pick(press, &[handle]), "the vertex wins over the handle");
-        assert!(!pick(press, &[]), "no handle there: the usual reach");
-        assert!(pick(pos2(105.0, 100.0), &[]));
-        assert!(!pick(pos2(120.0, 100.0), &[handle]), "past the handle: nothing");
-    }
-
-    /// #882: the frame's corner sits on a physical pixel at any display scaling, so 100 % maps
-    /// comp pixels 1:1 onto screen pixels.
-    #[test]
-    fn frame_origin_snaps_to_physical_pixels() {
-        for ppp in [1.0f32, 1.25, 1.5, 1.75, 2.0] {
-            for p in [pos2(-201.12, 72.4), pos2(689.8, 239.75), pos2(0.3, -0.37)] {
-                let s = snap_to_pixels(p, ppp);
-                for v in [s.x * ppp, s.y * ppp] {
-                    assert!((v - v.round()).abs() < 1e-3, "ppp {ppp}: {p:?} → {s:?}");
-                }
-                assert!((s - p).length() <= 0.71 / ppp, "moved by at most half a pixel: {p:?} → {s:?}");
-            }
-        }
-        assert_eq!(snap_to_pixels(pos2(1.3, 2.0), 0.0), pos2(1.3, 2.0));
-    }
-
-    /// #882: a magnified frame shows its pixels as blocks in both Zoom Quality modes; More
-    /// Accurate only smooths when the frame is shown smaller.
-    #[test]
-    fn magnified_frames_are_never_smoothed() {
-        use eframe::wgpu::FilterMode;
-        for smooth in [true, false] {
-            assert_eq!(zoom_texture_options(smooth).magnification, egui::TextureFilter::Nearest);
-            assert_eq!(zoom_sampler(smooth).mag_filter, FilterMode::Nearest);
-        }
-        assert_eq!(zoom_texture_options(true).minification, egui::TextureFilter::Linear);
-        assert_eq!(zoom_sampler(true).min_filter, FilterMode::Linear);
-    }
-
-    /// A perspective-like homography: w = 100 + y (the plane crosses the camera at y = −100).
-    fn tilted() -> Mat3 {
-        Mat3([[100.0, 0.0, 0.0], [0.0, 100.0, 0.0], [0.0, 1.0, 100.0]])
-    }
-
-    /// #572: a box reaching behind the camera is clipped at the near plane instead of flipping
-    /// through infinity into long lines.
-    #[test]
-    fn outlines_clip_at_the_near_plane() {
-        let m = tilted();
-        let front = project_clipped(&m, &box_corners([-50.0, -50.0, 50.0, 50.0]));
-        assert_eq!(front.len(), 4);
-        let crossing = project_clipped(&m, &box_corners([-50.0, -150.0, 50.0, 50.0]));
-        assert_eq!(crossing.len(), 4, "{crossing:?}");
-        // Nothing flipped through infinity: a corner behind the camera (y = −150, w = −50) would
-        // land at y = +300 if it were projected as is; clipped at the near plane it runs off far
-        // above (negative y) instead, and the front corners stay where they were.
-        assert!(crossing.iter().all(|p| p[0].is_finite() && p[1].is_finite() && p[1] < 34.0), "{crossing:?}");
-        assert!(project_clipped(&m, &box_corners([-50.0, -400.0, 50.0, -200.0])).is_empty(), "wholly behind");
-    }
-
-    #[test]
-    fn gizmo_segments_clip_at_the_near_plane() {
-        // w = 100 + z.
-        let pc = Mat4([[100.0, 0.0, 0.0, 0.0], [0.0, 100.0, 0.0, 0.0], [0.0, 0.0, 1.0, 0.0], [0.0, 0.0, 1.0, 100.0]]);
-        let s = project_segment(&pc, vec3(10.0, 0.0, 0.0), vec3(10.0, 0.0, -300.0)).unwrap();
-        assert_eq!(s[0], [10.0, 0.0]);
-        assert!(s[1][0] > 10.0 && s[1][0].is_finite(), "toward the camera it grows, never flips: {s:?}");
-        assert!(project_segment(&pc, vec3(0.0, 0.0, -200.0), vec3(0.0, 0.0, -300.0)).is_none());
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/panels/viewer/frame.rs b/crates/ui-egui/src/panels/viewer/frame.rs
new file mode 100644
index 000000000..ac467ecd5
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/frame.rs
@@ -0,0 +1,183 @@
+use super::{Align2, EffectcraftApp, Pos2, Rect, Stroke, StrokeKind, Tokens, View3D, ViewerMap, json, pos2, vec2, vt, widgets};
+
+/// Draw the no-composition viewer with New Composition and New Composition From Footage buttons, accepting Project
+/// items dropped on it to create the first composition.
+pub(super) fn empty_state(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    let t = app.tokens;
+    let p = ui.painter().clone();
+    p.rect_filled(rect, 0.0, t.pasteboard);
+    let c = rect.center();
+    p.text(c - vec2(0.0, 40.0), Align2::CENTER_CENTER, crate::i18n::tr("Composition"), Tokens::semibold(16.0), t.text);
+    let b1 = Rect::from_center_size(c + vec2(0.0, 0.0), vec2(220.0, 30.0));
+    if widgets::text_button(ui, b1, "New Composition", true, &t, egui::Id::unique("empty-newcomp")).clicked() {
+        crate::panels::dialogs::open_new_comp(app);
+    }
+    app.auto.add("viewer.empty.newComp", b1, "New Composition");
+    let b2 = Rect::from_center_size(c + vec2(0.0, 40.0), vec2(220.0, 30.0));
+    if widgets::text_button(ui, b2, "New Composition From Footage", false, &t, egui::Id::unique("empty-fromfootage")).clicked() {
+        let _ = crate::menus::invoke(app, &ui.ctx().clone(), "file.import", json!({}));
+    }
+    app.auto.add("viewer.empty.import", b2, "New Composition From Footage");
+    // A Project item dropped on the empty viewer creates the first composition,
+    // just like dropping it onto an empty Timeline (#684). Multiple selected
+    // items use the existing New Comp from Selection dialog.
+    let ctx = ui.ctx().clone();
+    if let Some(crate::panels::DragPayload::Item(dragged)) = egui::DragAndDrop::payload::<crate::panels::DragPayload>(&ctx).as_deref()
+        && ui.rect_contains_pointer(rect)
+    {
+        let items: Vec<effectcraft_engine::project::ItemId> = crate::panels::project_drop_items(app, *dragged)
+            .into_iter()
+            .map(effectcraft_engine::project::ItemId)
+            .filter(|id| {
+                app.session.project.item(*id).is_some_and(|item| match &item.kind {
+                    effectcraft_engine::project::ItemKind::Footage(f) => f.kind != effectcraft_engine::project::FootageKind::Data,
+                    effectcraft_engine::project::ItemKind::Solid(_) | effectcraft_engine::project::ItemKind::Comp(_) => true,
+                    _ => false,
+                })
+            })
+            .collect();
+        if !items.is_empty() {
+            p.rect_stroke(rect.shrink(2.0), 0.0, Stroke::new(2.0, t.accent), StrokeKind::Inside);
+            app.auto.add("viewer.newCompDrop", rect, "Drop footage to create a composition");
+            if ctx.input(|i| i.pointer.any_released()) {
+                app.session.state.project_selection = items;
+                if let Err(e) = crate::menus::invoke(app, &ctx, "file.newCompFromSelection", json!({})) {
+                    app.ui.status = e;
+                }
+                egui::DragAndDrop::clear_payload(&ctx);
+            }
+        }
+    }
+}
+
+/// `#rrggbb` → sRGB bytes.
+/// A grid or guide line in the Grids & Guides style: `lines`, `dashed` or `dots`.
+pub(crate) fn styled_line(painter: &egui::Painter, pts: [Pos2; 2], stroke: Stroke, style: &str) {
+    match style {
+        "dashed" => {
+            painter.add(egui::Shape::dashed_line(&pts, stroke, 6.0, 4.0));
+        }
+        "dots" => {
+            painter.add(egui::Shape::dotted_line(&pts, stroke.color, 4.0, stroke.width.max(1.0) * 0.75));
+        }
+        _ => {
+            painter.line_segment(pts, stroke);
+        }
+    }
+}
+
+/// `p` (points) moved to the nearest physical pixel corner at `ppp` pixels per point.
+pub(crate) fn snap_to_pixels(p: Pos2, ppp: f32) -> Pos2 {
+    if !(ppp.is_finite() && ppp > 0.0 && p.x.is_finite() && p.y.is_finite()) {
+        return p;
+    }
+    pos2((p.x * ppp).round() / ppp, (p.y * ppp).round() / ppp)
+}
+
+/// Texture filtering for Viewer Zoom Quality: More Accurate = bilinear, Faster = nearest. As in
+/// After Effects, a magnified frame (above 100 %, or a lower Resolution) always shows its pixels
+/// as blocks, never smoothed, in either mode (#882).
+pub(crate) fn zoom_texture_options(smooth: bool) -> egui::TextureOptions {
+    if smooth { egui::TextureOptions { magnification: egui::TextureFilter::Nearest, ..egui::TextureOptions::LINEAR } } else { egui::TextureOptions::NEAREST }
+}
+
+/// The sampler GPU frames (mipmapped display textures) are drawn with: More Accurate filters
+/// bilinearly within and between mip levels, so a frame shown below 100 % is averaged instead of
+/// skipping pixels (#417); Faster takes the nearest pixel of the full-size frame. Magnified, both
+/// show the nearest pixel (#882).
+pub(crate) fn zoom_sampler(smooth: bool) -> eframe::wgpu::SamplerDescriptor<'static> {
+    use eframe::wgpu::{FilterMode, MipmapFilterMode, SamplerDescriptor};
+    let label = Some("viewer frame");
+    if smooth {
+        SamplerDescriptor {
+            label,
+            mag_filter: FilterMode::Nearest,
+            min_filter: FilterMode::Linear,
+            mipmap_filter: MipmapFilterMode::Linear,
+            ..Default::default()
+        }
+    } else {
+        SamplerDescriptor { label, lod_max_clamp: 0.0, ..Default::default() }
+    }
+}
+
+/// The whole factor a CPU frame is averaged down by for its texture when `pixels` of it are drawn
+/// over `screen` screen pixels: about one texel per screen pixel, so bilinear filtering never
+/// skips frame pixels — the CPU frames' counterpart of the GPU frames' mip levels (#417). Faster
+/// keeps every pixel.
+pub(crate) fn minify_factor(smooth: bool, pixels: f64, screen: f64) -> usize {
+    let k = (pixels / screen + 1e-3).floor();
+    if smooth && k >= 1.0 { k.min(256.0) as usize } else { 1 }
+}
+
+/// The Extended Viewer's render region for this frame (see [`ViewerState::extended`]):
+/// Settings ▸ 3D ▸ Extended Viewer on, the comp has 3D layers and the view is a custom 3D view
+/// (or Draft 3D is on), and part of the visible viewer lies outside the comp frame.
+///
+/// [`ViewerState::extended`]: crate::state::ViewerState::extended
+pub(crate) fn extended_region(
+    app: &EffectcraftApp,
+    comp: &effectcraft_engine::project::Comp,
+    cid: effectcraft_engine::project::ItemId,
+    map: ViewerMap,
+) -> Option<[f64; 4]> {
+    if !app.session.prefs.three_d.extended_viewer || !comp.has_3d() || app.session.state.region_of_interest.is_some() {
+        return None;
+    }
+    let view = app.session.state.views3d.get(&cid).map(|v| v.current).unwrap_or_default();
+    if view == View3D::ActiveCamera && !comp.draft_3d {
+        return None;
+    }
+    let a = map.to_comp(map.area.min);
+    let b = map.to_comp(map.area.max);
+    effectcraft_engine::render::extended_region(comp.width, comp.height, [a[0], a[1], b[0], b[1]], 1.0)
+}
+
+pub(super) fn rect_of(map: &ViewerMap, r: Option<[f64; 4]>) -> Rect {
+    let [x, y, w, h] = r.unwrap_or_default();
+    Rect::from_min_max(map.to_screen([x, y]), map.to_screen([x + w, y + h]))
+}
+
+/// Put a rendered frame on screen: CPU pixels go into an egui texture, averaged down by `minify`
+/// (see [`minify_factor`]); GPU frames are drawn straight from their wgpu texture (registered with
+/// egui-wgpu, no readback).
+pub(super) fn show_frame(app: &mut EffectcraftApp, ctx: &egui::Context, key: crate::frames::FrameKey, img: crate::frames::FrameImage, minify: usize) {
+    use crate::frames::FrameImage;
+    // Settings ▸ Previews ▸ Viewer Zoom Quality.
+    let smooth = app.session.prefs.viewer_zoom_smooth();
+    let opts = zoom_texture_options(smooth);
+    match img {
+        FrameImage::Cpu(img) => {
+            // Frames wider or taller than the GPU's texture limit go up averaged down too (#201).
+            let max = crate::frames::max_texture_side(ctx);
+            let fitted = crate::frames::fit_shared_texture_by(&img, max, minify);
+            match &mut app.viewer_tex {
+                Some((tex, k, m)) if tex.size() == fitted.size() => {
+                    tex.set(fitted, opts);
+                    (*k, *m) = (key, minify);
+                }
+                _ => app.viewer_tex = Some((ctx.load_texture("viewer-frame", fitted, opts), key, minify)),
+            }
+            app.viewer_shown = app.viewer_tex.as_ref().map(|(t, k, _)| (t.id(), *k));
+            app.viewer_image = Some(img);
+            vt::set_texture_roi(ctx, app.session.state.region_of_interest.or(app.ui.viewer.extended));
+        }
+        FrameImage::Gpu(f) => {
+            let Some(rs) = &app.wgpu else { return };
+            let view = f.texture.create_view(&Default::default());
+            let mut ren = rs.renderer.write();
+            let id = match &app.viewer_native {
+                Some((id, _, _)) => {
+                    ren.update_egui_texture_from_wgpu_texture_with_sampler_options(&rs.device, &view, zoom_sampler(smooth), *id);
+                    *id
+                }
+                None => ren.register_native_texture_with_sampler_options(&rs.device, &view, zoom_sampler(smooth)),
+            };
+            drop(ren);
+            app.viewer_native = Some((id, key, f));
+            app.viewer_shown = Some((id, key));
+            // Pixels are read back on demand (viewer_pixels).
+            app.viewer_image = None;
+        }
+    }
+}
diff --git a/crates/ui-egui/src/panels/viewer/geometry.rs b/crates/ui-egui/src/panels/viewer/geometry.rs
new file mode 100644
index 000000000..847332bcf
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/geometry.rs
@@ -0,0 +1,304 @@
+use super::{CameraState, Comp, EffectcraftApp, EvalCtx, Layer, LayerId, Mat3, Pos2, VIEW_CAM, gv2, three_d, vec2};
+
+/// The camera the viewer shows (view camera or the comp's active camera).
+pub(super) fn cam_state(ctx: &EvalCtx) -> CameraState {
+    VIEW_CAM.with(|c| c.get()).unwrap_or_else(|| three_d::active_camera(ctx))
+}
+
+/// Layer → comp (viewer) matrix through the current 3D view.
+pub(crate) fn l2c(ctx: &EvalCtx, layer: &Layer) -> (Mat3, f64) {
+    match VIEW_CAM.with(|c| c.get()) {
+        Some(cam) if layer.is_3d() => (three_d::layer_to_view(ctx, layer, &cam), 0.0),
+        _ => ctx.layer_to_comp(layer),
+    }
+}
+
+/// `l2c` (layer → comp) applied from effect space instead: effect points and Puppet pins,
+/// measured from the top-left of the layer's effect bounds (see `effect_bounds`).
+pub(crate) fn from_effect_space(ctx: &EvalCtx, layer: &Layer, l2c: Mat3) -> Mat3 {
+    let o = ctx.effect_bounds(layer).1;
+    l2c * Mat3::translate(gv2(o[0], o[1]))
+}
+
+/// Effect space → comp (viewer) matrix through the current 3D view.
+pub(crate) fn fx2c(ctx: &EvalCtx, layer: &Layer) -> Mat3 {
+    from_effect_space(ctx, layer, l2c(ctx, layer).0)
+}
+
+/// The selected, unlocked layers of `comp` other than `layer` (when `layer` is one of them): a
+/// handle or Rotation tool drag on one changes them all.
+pub(super) fn selected_others<'a>(app: &EffectcraftApp, comp: &'a Comp, layer: LayerId) -> Vec<&'a Layer> {
+    let sel = &app.session.state.selected_layers;
+    if !sel.contains(&layer) {
+        return vec![];
+    }
+    sel.iter().filter(|id| **id != layer).filter_map(|id| comp.layer(*id)).filter(|l| !l.switches.locked && l.transform().is_some()).collect()
+}
+
+/// The least homogeneous depth (`w`: the distance in front of a perspective camera in pixels, 1
+/// for 2D layers and orthographic views) a viewer outline is drawn at: points at or behind the
+/// camera would flip through infinity and draw long lines across the viewer (#572).
+const NEAR_W: f64 = 0.5;
+
+/// `p` through the homography `m` before the perspective divide: (x, y, w).
+fn homogeneous(m: &Mat3, p: [f64; 2]) -> [f64; 3] {
+    let r = |i: usize| m.0.get(i).map_or(0.0, |row| row[0] * p[0] + row[1] * p[1] + row[2]);
+    [r(0), r(1), r(2)]
+}
+
+/// The closed polygon `poly` (layer pixels) through `m`, clipped to the part in front of the
+/// camera's near plane (comp pixels; empty when none of it is).
+pub(super) fn project_clipped(m: &Mat3, poly: &[[f64; 2]]) -> Vec<[f64; 2]> {
+    let h: Vec<[f64; 3]> = poly.iter().map(|p| homogeneous(m, *p)).collect();
+    let mut out = vec![];
+    for (i, a) in h.iter().enumerate() {
+        let Some(b) = h.get((i + 1) % h.len()) else { continue };
+        let (ina, inb) = (a[2] >= NEAR_W, b[2] >= NEAR_W);
+        if ina {
+            out.push(*a);
+        }
+        if ina != inb {
+            let t = (NEAR_W - a[2]) / (b[2] - a[2]);
+            out.push([a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t, NEAR_W]);
+        }
+    }
+    out.iter().map(|q| [q[0] / q[2], q[1] / q[2]]).filter(|q| q[0].is_finite() && q[1].is_finite()).collect()
+}
+
+/// The segment a → b (world space) through the projection `pc`, clipped at the near plane.
+pub(super) fn project_segment(
+    pc: &effectcraft_engine::geom::Mat4,
+    a: effectcraft_engine::geom::Vec3,
+    b: effectcraft_engine::geom::Vec3,
+) -> Option<[[f64; 2]; 2]> {
+    let h = |p: effectcraft_engine::geom::Vec3| {
+        let r = |i: usize| pc.0.get(i).map_or(0.0, |row| row[0] * p.x + row[1] * p.y + row[2] * p.z + row[3]);
+        [r(0), r(1), r(3)]
+    };
+    let (mut ha, mut hb) = (h(a), h(b));
+    if ha[2] < NEAR_W && hb[2] < NEAR_W {
+        return None;
+    }
+    let cut = |p: [f64; 3], q: [f64; 3]| {
+        let t = (NEAR_W - p[2]) / (q[2] - p[2]);
+        [p[0] + (q[0] - p[0]) * t, p[1] + (q[1] - p[1]) * t, NEAR_W]
+    };
+    if ha[2] < NEAR_W {
+        ha = cut(ha, hb);
+    } else if hb[2] < NEAR_W {
+        hb = cut(hb, ha);
+    }
+    let d = |q: [f64; 3]| [q[0] / q[2], q[1] / q[2]];
+    let s = [d(ha), d(hb)];
+    s.iter().flatten().all(|v| v.is_finite()).then_some(s)
+}
+
+/// The content box corners (layer pixels) of `layer`.
+pub(super) fn box_corners(b: [f64; 4]) -> [[f64; 2]; 4] {
+    [[b[0], b[1]], [b[2], b[1]], [b[2], b[3]], [b[0], b[3]]]
+}
+
+/// Layer → comp matrix and its bounds quad (in comp pixels). None for a 3D layer reaching to or
+/// behind the camera (its quad would flip; [`layer_outline`] draws the part in front).
+pub(crate) fn layer_quad(ctx: &EvalCtx, layer: &Layer) -> Option<(Mat3, [[f64; 2]; 4], [f64; 4])> {
+    let b = effectcraft_engine::render::content_bounds(ctx, layer)?;
+    let (m, _) = l2c(ctx, layer);
+    let corners = box_corners(b);
+    if corners.iter().any(|p| homogeneous(&m, *p)[2] < NEAR_W) {
+        return None;
+    }
+    let pts = corners.map(|p| {
+        let q = m.apply(gv2(p[0], p[1]));
+        [q.x, q.y]
+    });
+    Some((m, pts, b))
+}
+
+/// The outline of a layer's content box in comp pixels, clipped at the camera's near plane.
+pub(crate) fn layer_outline(ctx: &EvalCtx, layer: &Layer) -> Vec<[f64; 2]> {
+    let Some(b) = effectcraft_engine::render::content_bounds(ctx, layer) else { return vec![] };
+    project_clipped(&l2c(ctx, layer).0, &box_corners(b))
+}
+
+/// Which axes a bounding-box handle scales: corners (0–3) both; the top and bottom edges (4, 6)
+/// y; the right and left edges (5, 7) x.
+pub(super) fn handle_axes(handle: usize) -> [bool; 2] {
+    match handle {
+        4 | 6 => [false, true],
+        5 | 7 => [true, false],
+        _ => [true, true],
+    }
+}
+
+/// A bounding-box handle's point in layer pixels (`b`: the content box; handles as in
+/// [`handle_axes`], the corners clockwise from the top left, then the top, right, bottom and
+/// left edges' midpoints).
+pub(super) fn handle_point(b: [f64; 4], handle: usize) -> [f64; 2] {
+    let (cx, cy) = ((b[0] + b[2]) / 2.0, (b[1] + b[3]) / 2.0);
+    match handle {
+        0 => [b[0], b[1]],
+        1 => [b[2], b[1]],
+        2 => [b[2], b[3]],
+        3 => [b[0], b[3]],
+        4 => [cx, b[1]],
+        5 => [b[2], cy],
+        6 => [cx, b[3]],
+        _ => [b[0], cy],
+    }
+}
+
+/// The resize cursor over bounding-box handle `handle` of the on-screen box `sq` (corners
+/// clockwise from the top left, handles as in [`handle_point`]): along the direction the handle
+/// scales, so it turns with the layer, as in After Effects. A corner points between its two
+/// edges (the box's diagonal whatever its proportions), an edge handle across its edge.
+pub(super) fn handle_cursor(sq: &[Pos2], handle: usize) -> egui::CursorIcon {
+    let at = |k: usize| sq.get(k % 4).copied().unwrap_or(Pos2::ZERO);
+    let dir = if handle < 4 {
+        let c = at(handle);
+        (c - at(handle + 3)).normalized() + (c - at(handle + 1)).normalized()
+    } else {
+        let e = at(handle - 3) - at(handle - 4);
+        vec2(-e.y, e.x)
+    };
+    // Screen y points down: 45° is the south-east diagonal.
+    let a = dir.y.atan2(dir.x).to_degrees().rem_euclid(180.0);
+    if !(22.5..157.5).contains(&a) {
+        egui::CursorIcon::ResizeHorizontal
+    } else if a < 67.5 {
+        egui::CursorIcon::ResizeNwSe
+    } else if a < 112.5 {
+        egui::CursorIcon::ResizeVertical
+    } else {
+        egui::CursorIcon::ResizeNeSw
+    }
+}
+
+/// The scale ratio (x, y) that puts the point grabbed at `start` (relative to the anchor, layer
+/// pixels) under the pointer at `cur`. `uniform` (Shift on a corner) keeps the aspect ratio,
+/// following the pointer along the handle's diagonal. Dragging past the anchor flips the layer,
+/// as in After Effects; an axis whose grabbed point sits on the anchor keeps its scale.
+pub(super) fn drag_ratio(start: [f64; 2], cur: [f64; 2], axes: [bool; 2], uniform: bool) -> [f64; 2] {
+    if uniform {
+        let d2 = start[0] * start[0] + start[1] * start[1];
+        let f = if d2 > 1e-6 { (cur[0] * start[0] + cur[1] * start[1]) / d2 } else { 1.0 };
+        return [f, f];
+    }
+    [0, 1].map(|k| if axes[k] && start[k].abs() > 1e-3 { cur[k] / start[k] } else { 1.0 })
+}
+
+/// Snap a handle drag (#252): the handle (`h`, layer pixels from the anchor point `a` as the
+/// drag began; `l2c` that layer space → comp) at scale ratio `f` goes through `snap` (a comp
+/// point → its correction), and the ratio that puts the handle where it snapped comes back.
+/// A `uniform` drag slides the handle along its line from the anchor point to the nearer snapped
+/// line; otherwise each scaled axis takes the snapped point.
+pub(super) fn snap_handle(
+    f: [f64; 2],
+    h: [f64; 2],
+    a: [f64; 2],
+    l2c: &Mat3,
+    axes: [bool; 2],
+    uniform: bool,
+    snap: impl FnOnce([f64; 2]) -> [f64; 2],
+) -> [f64; 2] {
+    let at = |f: [f64; 2]| {
+        let q = l2c.apply(gv2(a[0] + f[0] * h[0], a[1] + f[1] * h[1]));
+        [q.x, q.y]
+    };
+    let p = at(f);
+    let c = snap(p);
+    let s = [p[0] + c[0], p[1] + c[1]];
+    if uniform {
+        let o = at([0.0; 2]);
+        let d = [p[0] - o[0], p[1] - o[1]];
+        let k = [0, 1].into_iter().filter(|k| c[*k] != 0.0 && d[*k].abs() > 1e-9).min_by(|x, y| c[*x].abs().total_cmp(&c[*y].abs()));
+        return k.map_or(f, |k| f.map(|v| v * (s[k] - o[k]) / d[k]));
+    }
+    let Some(inv) = l2c.inverse().filter(|_| c != [0.0; 2]) else { return f };
+    let q = inv.apply(gv2(s[0], s[1]));
+    let q = [q.x - a[0], q.y - a[1]];
+    [0, 1].map(|k| if axes[k] && h[k].abs() > 1e-9 { q[k] / h[k] } else { f[k] })
+}
+
+/// The turn from angle `from` to angle `to` (degrees), wrapped to (−180°, 180°]: the shortest way
+/// round, so summing it frame by frame follows the pointer across atan2's ±180° seam and past full
+/// revolutions. Non-finite input turns by nothing.
+pub(super) fn turn_delta(from: f64, to: f64) -> f64 {
+    let d = to - from;
+    if !d.is_finite() {
+        return 0.0;
+    }
+    let w = (d + 180.0).rem_euclid(360.0) - 180.0;
+    if w <= -180.0 { w + 360.0 } else { w }
+}
+
+/// The Rotation tool's value: the rotation as the drag began plus the turn so far (which may span
+/// revolutions), snapped to 45° steps with Shift.
+pub(super) fn rotate_value(start_rot: f64, turned: f64, shift: bool) -> f64 {
+    let r = start_rot + turned;
+    let r = if r.is_finite() { r } else { start_rot };
+    if shift { (r / 45.0).round() * 45.0 } else { r }
+}
+
+/// A drag `d` (comp pixels), kept to the axis it moves along most when `shift` is held.
+pub(super) fn one_axis(d: [f64; 2], shift: bool) -> [f64; 2] {
+    if !shift {
+        d
+    } else if d[0].abs() > d[1].abs() {
+        [d[0], 0.0]
+    } else {
+        [0.0, d[1]]
+    }
+}
+
+pub(super) fn point_in_quad(p: [f64; 2], q: &[[f64; 2]; 4]) -> bool {
+    let mut sign = 0.0;
+    for i in 0..4 {
+        let a = q[i];
+        let b = q[(i + 1) % 4];
+        let c = (b[0] - a[0]) * (p[1] - a[1]) - (b[1] - a[1]) * (p[0] - a[0]);
+        if c.abs() < 1e-9 {
+            continue;
+        }
+        if sign == 0.0 {
+            sign = c.signum();
+        } else if c.signum() != sign {
+            return false;
+        }
+    }
+    true
+}
+
+/// Separating-axis test: a marquee may cross a layer without containing any corner.
+pub(super) fn quad_intersects_box(q: &[[f64; 2]; 4], a: [f64; 2], b: [f64; 2]) -> bool {
+    if q.iter().flatten().chain(a.iter()).chain(b.iter()).any(|v| !v.is_finite()) {
+        return false;
+    }
+    let lo = [a[0].min(b[0]), a[1].min(b[1])];
+    let hi = [a[0].max(b[0]), a[1].max(b[1])];
+    let rect = [lo, [hi[0], lo[1]], hi, [lo[0], hi[1]]];
+    let axes = [[1.0, 0.0], [0.0, 1.0]].into_iter().chain((0..4).map(|i| {
+        let j = (i + 1) % 4;
+        [q[j][1] - q[i][1], q[i][0] - q[j][0]]
+    }));
+    for axis in axes {
+        let project = |p: &[f64; 2]| p[0] * axis[0] + p[1] * axis[1];
+        let (qmin, qmax) = q.iter().map(project).fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), v| (lo.min(v), hi.max(v)));
+        let (rmin, rmax) = rect.iter().map(project).fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), v| (lo.min(v), hi.max(v)));
+        if qmax < rmin || rmax < qmin {
+            return false;
+        }
+    }
+    true
+}
+
+/// Parent-space linear inverse (to convert a comp-space drag delta into a position delta).
+pub(super) fn parent_inverse(ctx: &EvalCtx, layer: &Layer) -> Mat3 {
+    match layer.parent.and_then(|p| ctx.comp.layer(p)) {
+        Some(p) => {
+            let w = ctx.world_matrix(p);
+            let m = Mat3([[w.0[0][0], w.0[0][1], 0.0], [w.0[1][0], w.0[1][1], 0.0], [0.0, 0.0, 1.0]]);
+            m.inverse().unwrap_or(Mat3::IDENTITY)
+        }
+        None => Mat3::IDENTITY,
+    }
+}
diff --git a/crates/ui-egui/src/panels/viewer/gesture.rs b/crates/ui-egui/src/panels/viewer/gesture.rs
new file mode 100644
index 000000000..db024e720
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/gesture.rs
@@ -0,0 +1,197 @@
+use super::{EffectcraftApp, LayerId, Mat3, Pos2, Rect, Tick, Tool, ViewerMap, ov, vec2};
+
+/// What a drag in the viewer is doing.
+#[derive(Clone, Debug)]
+pub(super) enum Gesture {
+    /// Per layer: start position and the parent-space change per comp pixel of drag in x and y.
+    Move {
+        layers: Vec<(LayerId, [f64; 3], [f64; 3], [f64; 3])>,
+        start: [f64; 2],
+        /// The grabbed layer's feature nearest the pointer (comp px at the start): it snaps.
+        snap_src: Option<[f64; 2]>,
+    },
+    Camera {
+        tool: Tool,
+    },
+    /// A bounding-box handle: scales about the anchor point so the grabbed point follows the
+    /// pointer (corners both axes, edges one), relative to the layer as the drag began; the
+    /// handle snaps.
+    Scale {
+        layer: LayerId,
+        start_scale: [f64; 3],
+        /// The grabbed point relative to the anchor, in layer pixels.
+        start_local: [f64; 2],
+        /// The handle's point relative to the anchor, in layer pixels.
+        handle: [f64; 2],
+        anchor: [f64; 2],
+        axes: [bool; 2],
+        /// Layer pixels → comp as the drag began, and its inverse.
+        l2c: Mat3,
+        inv: Mat3,
+        /// The other selected layers and their scales as the drag began: they scale by the same
+        /// ratio about their own anchor points, as in After Effects (#491).
+        others: Vec<(LayerId, [f64; 3])>,
+    },
+    Rotate {
+        layer: LayerId,
+        center: Pos2,
+        /// The pointer's angle about the centre on the last frame (degrees, as atan2 gives it).
+        last_angle: f64,
+        /// The turn so far, summed frame by frame so it keeps counting past a full revolution in
+        /// either direction (After Effects: 1x +0.0°, −1x −90.0°…) instead of wrapping at ±180°.
+        turned: f64,
+        start_rot: f64,
+        /// The other selected layers and their rotations: they turn by the same angle.
+        others: Vec<(LayerId, f64)>,
+    },
+    Anchor {
+        layer: LayerId,
+        start_anchor: [f64; 3],
+        start_pos: [f64; 3],
+        start: [f64; 2],
+        inv: Mat3,
+        l2p: Mat3,
+        /// The layer's own snap targets as the drag began (its box and path vertices).
+        own: Vec<effectcraft_engine::viewer::SnapTarget>,
+        /// Alt held as the drag began: the anchor point moves alone, so the layer shifts.
+        anchor_only: bool,
+    },
+    Pan {
+        start_pan: [f32; 2],
+    },
+    Create {
+        tool: Tool,
+        start: [f64; 2],
+    },
+    Marquee {
+        start: Pos2,
+    },
+    /// Dragging selected mask / shape path vertices: press point, the grabbed vertex (comp px,
+    /// it snaps), the comp-space move applied so far and comp → path space.
+    Vertices {
+        start: [f64; 2],
+        src: [f64; 2],
+        applied: [f64; 2],
+        inv: Mat3,
+        layer: LayerId,
+    },
+    /// Dragging a vertex's Bezier tangent (both sides symmetric unless Alt breaks them).
+    Tangent {
+        layer: LayerId,
+        mask: u64,
+        index: usize,
+        out: bool,
+        vertex: [f64; 2],
+        inv: Mat3,
+    },
+    /// Dragging a Puppet pin (comp → layer matrix inverse).
+    PuppetPin {
+        layer: LayerId,
+        pin: u64,
+        inv: Mat3,
+    },
+    /// Rotating an Advanced / Bend pin by its ring: the pin's screen centre, the pointer's last
+    /// angle (radians) and the rotation so far (°, accumulated so it can pass a full turn).
+    PuppetRotate {
+        layer: LayerId,
+        pin: u64,
+        center: Pos2,
+        last: f32,
+        rotation: f64,
+    },
+    /// Scaling an Advanced / Bend pin by its square: the pin's screen centre, the press distance
+    /// from it and the scale at the press (1 = 100 %).
+    PuppetScale {
+        layer: LayerId,
+        pin: u64,
+        center: Pos2,
+        start: f32,
+        scale: f64,
+    },
+    /// Puppet tools: a marquee selecting pins (dragged outside the layer's art, or Alt-dragged).
+    PinMarquee {
+        start: Pos2,
+    },
+    /// Object Matte tool: a box around the object (screen point where the drag began).
+    ObjectMatteBox {
+        start: Pos2,
+    },
+    /// Puppet tool Record mode (⌘/Ctrl-drag a pin): the drag is sampled in real time (seconds
+    /// since it began, effect space) and becomes keyframes on release (`puppet.recordPin`); the
+    /// current time runs along while recording.
+    PuppetRecord {
+        layer: LayerId,
+        pin: u64,
+        /// Other selected pins of the layer, moving with the dragged one.
+        others: Vec<u64>,
+        inv: Mat3,
+        began: f64,
+        cti: Tick,
+        samples: Vec<(f64, [f64; 2])>,
+    },
+    /// Pen tool: pulling the tangents of the vertex just placed.
+    Pen {
+        layer: LayerId,
+        mask: u64,
+        index: usize,
+        vertex: [f64; 2],
+        inv: Mat3,
+        press: Pos2,
+    },
+    /// Dragging a track point's feature/search region, a corner or its attach point.
+    Track {
+        layer: LayerId,
+        tracker: u64,
+        drag: crate::panels::tracker::Drag,
+    },
+    /// Motion paths, free transform, Mask Feather, guides and the region of interest
+    /// (`viewer_overlays`).
+    Overlay(ov::Drag),
+}
+
+/// Pen tool path in progress: (layer, mask uid).
+pub(super) fn pen_id() -> egui::Id {
+    egui::Id::unique("viewer-pen")
+}
+
+pub(super) const HANDLE: f32 = 7.0;
+
+/// How close (screen points) the pointer must be to a path vertex or tangent handle to grab it.
+const VERTEX_GRAB: f32 = 6.0;
+
+/// The reach of a path vertex at `pos` (#1042): a vertex marker sitting under, or just beside, a
+/// bounding-box handle would lose the press to the handle (the handle reaches further than the
+/// vertex), so wherever a box handle is in range the vertex reaches as far as the handle does.
+/// Vertices then win in the handle's whole zone, as in After Effects.
+pub(super) fn vertex_grab_radius(pos: Pos2, handles: impl IntoIterator<Item = Pos2>) -> f32 {
+    if handles.into_iter().any(|h| h.distance(pos) < HANDLE + 2.0) { HANDLE + 2.0 } else { VERTEX_GRAB }
+}
+
+/// Shown when a Roto Brush tool is used in the Composition panel (#753).
+pub(super) const ROTO_HINT: &str = "The Roto Brush works in the Layer panel. Double-click the layer to open it.";
+
+/// Region of interest handles on screen: corners (0–3, clockwise from top-left) then edge
+/// midpoints (4 top, 5 right, 6 bottom, 7 left).
+pub(super) fn roi_handles(r: Rect) -> [Pos2; 8] {
+    [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom(), r.center_top(), r.right_center(), r.center_bottom(), r.left_center()]
+}
+
+/// A drag starting on a region of interest handle: the ROI redrawn from the opposite corner (or
+/// edge, with the other axis kept).
+pub(super) fn roi_drag(app: &EffectcraftApp, map: &ViewerMap, comp_rect: Rect, zoom: f32, press: Pos2) -> Option<ov::Drag> {
+    let [rx, ry, rw, rh] = app.session.state.region_of_interest?;
+    let r = Rect::from_min_size(comp_rect.min + vec2(rx as f32 * zoom, ry as f32 * zoom), vec2(rw as f32 * zoom, rh as f32 * zoom));
+    let i = roi_handles(r).iter().position(|h| h.distance(press) < 6.0)?;
+    let (x0, y0, x1, y1) = (rx, ry, rx + rw, ry + rh);
+    let _ = map;
+    Some(match i {
+        0 => ov::Drag::Roi { start: [x1, y1], keep: [None, None] },
+        1 => ov::Drag::Roi { start: [x0, y1], keep: [None, None] },
+        2 => ov::Drag::Roi { start: [x0, y0], keep: [None, None] },
+        3 => ov::Drag::Roi { start: [x1, y0], keep: [None, None] },
+        4 => ov::Drag::Roi { start: [x1, y1], keep: [Some(x0), None] },
+        5 => ov::Drag::Roi { start: [x0, y0], keep: [None, Some(y1)] },
+        6 => ov::Drag::Roi { start: [x0, y0], keep: [Some(x1), None] },
+        _ => ov::Drag::Roi { start: [x1, y0], keep: [None, Some(y1)] },
+    })
+}
diff --git a/crates/ui-egui/src/panels/viewer/shapes.rs b/crates/ui-egui/src/panels/viewer/shapes.rs
new file mode 100644
index 000000000..395219a05
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/shapes.rs
@@ -0,0 +1,221 @@
+use super::geometry::{l2c, layer_quad, point_in_quad};
+use super::{
+    Color32, Comp, EffectcraftApp, EvalCtx, Layer, LayerId, LayerSource, Mat3, PaintKind, Pos2, Rect, Stroke, Tick, Tokens, Tool, ViewerMap, gv2, json, ov,
+    pos2,
+};
+
+/// Visible, unlocked layers eligible for viewer hit tests, in front-to-back order.
+/// Solo scope matches the renderer: any soloed AV layer activates it at every time (as in After
+/// Effects), even when hidden, locked or outside its in-out range.
+pub(crate) fn selectable_layers(comp: &Comp, time: Tick) -> impl Iterator<Item = &Layer> {
+    let any_solo = comp.layers.iter().any(|l| l.switches.solo && l.source.is_av());
+    comp.layers
+        .iter()
+        .filter(move |l| l.is_active_at(time) && l.switches.video && !l.switches.locked && !l.is_camera() && !l.is_light() && (!any_solo || l.switches.solo))
+}
+
+/// Selectable layers under a comp point, front to back.
+pub(crate) fn layers_at<'a, 'b>(ectx: &'b EvalCtx<'a>, cpt: [f64; 2]) -> impl Iterator<Item = &'a Layer> + 'b {
+    selectable_layers(ectx.comp, ectx.time).filter(move |l| layer_quad(ectx, l).is_some_and(|(_, q, _)| point_in_quad(cpt, &q)))
+}
+
+/// Topmost selectable layer under a comp point.
+pub(crate) fn layer_at<'a>(ectx: &EvalCtx<'a>, cpt: [f64; 2]) -> Option<&'a Layer> {
+    layers_at(ectx, cpt).next()
+}
+
+/// The layer a press at a comp point acts on, selected (Shift toggles the topmost layer). As in
+/// After Effects, a selected layer under the point comes before the layers in front of it, so it
+/// can be dragged where they cover it; otherwise the topmost layer (#230).
+pub(crate) fn pick(app: &mut EffectcraftApp, ectx: &EvalCtx, cpt: [f64; 2], toggle: bool) -> Option<LayerId> {
+    if toggle {
+        let hit = layer_at(ectx, cpt)?.id;
+        let _ = app.session.execute("layer.select", json!({"layers": [hit.0], "toggle": true}));
+        return Some(hit);
+    }
+    let selected = &app.session.state.selected_layers;
+    let hits: Vec<LayerId> = layers_at(ectx, cpt).map(|l| l.id).collect();
+    let hit = *hits.iter().find(|id| selected.contains(id)).or(hits.first())?;
+    if !selected.contains(&hit) {
+        let _ = app.session.execute("layer.select", json!({"layers": [hit.0]}));
+    }
+    Some(hit)
+}
+
+/// Where a shape drag is going to land: a mask on the selected layer, a group inside it, or a new
+/// shape layer.
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum ShapeTarget {
+    Mask,
+    IntoLayer,
+    NewLayer,
+}
+
+impl ShapeTarget {
+    /// What the drag will make and where, named the way the ghost captions it.
+    fn label(self, layer_name: &str) -> String {
+        match self {
+            ShapeTarget::Mask => format!("Mask on “{layer_name}”"),
+            ShapeTarget::IntoLayer => format!("Into “{layer_name}”"),
+            ShapeTarget::NewLayer => "New shape layer".to_string(),
+        }
+    }
+}
+
+/// A shape drag as it stands, after the Tools' normalisations: the path it will make and where it
+/// will land.
+pub(super) struct ShapeDrag {
+    /// The `shape.newShape` / `layer.addMask` kind for the tool.
+    kind: &'static str,
+    /// Comp-space centre and size, what the drag will make.
+    centre: [f64; 2],
+    size: [f64; 2],
+    target: ShapeTarget,
+    /// The selected layer's name and the index its next mask would take, for the ghost's caption
+    /// and colour.
+    layer_name: String,
+    mask_index: usize,
+}
+
+/// The kind `tool` draws, as `shape.newShape` / `layer.addMask` name it.
+fn shape_kind(tool: Tool) -> &'static str {
+    match tool {
+        Tool::Rectangle => "rect",
+        Tool::RoundedRect => "rounded",
+        Tool::Ellipse => "ellipse",
+        Tool::Polygon => "polygon",
+        _ => "star",
+    }
+}
+
+/// What a shape tool drag from `start` to `end` makes, or `None` while it is too small to make
+/// anything. Alt (Option) draws from the press point and Shift squares the box; the live ghost and
+/// [`create_shape`] both go through this, so the drag always shows what it will commit.
+pub(super) fn shape_drag(app: &EffectcraftApp, tool: Tool, start: [f64; 2], end: [f64; 2], mods: egui::Modifiers) -> Option<ShapeDrag> {
+    let comp = app.session.active_comp()?;
+    let selected = app.session.state.selected_layers.first().copied();
+    let sel = selected.and_then(|id| comp.layer(id));
+    // A footage, solid or other non-shape layer selected, or a shape layer with Tool Creates
+    // Mask: a mask on that layer. Otherwise the engine's own target: the first selected unlocked
+    // shape layer, else a new one.
+    let target = match sel {
+        Some(l) if l.source.is_av() && (app.session.state.shape_tool.creates_mask || !matches!(l.source, LayerSource::Shape)) => (ShapeTarget::Mask, Some(l)),
+        _ => match effectcraft_engine::commands::shape_tool::selected_shape_target(&app.session, comp).and_then(|id| comp.layer(id)) {
+            Some(l) => (ShapeTarget::IntoLayer, Some(l)),
+            None => (ShapeTarget::NewLayer, None),
+        },
+    };
+    let (target, layer) = target;
+    let mask_index = if target == ShapeTarget::Mask { layer.and_then(|l| l.masks()).map_or(0, |m| m.groups().count()) } else { 0 };
+    let (mut w, mut h) = ((end[0] - start[0]).abs(), (end[1] - start[1]).abs());
+    // Ctrl/Cmd draws from the press point as the centre, as in After Effects.
+    if mods.command {
+        w *= 2.0;
+        h *= 2.0;
+    }
+    if w < 2.0 && h < 2.0 {
+        return None;
+    }
+    if mods.shift {
+        let m = w.max(h);
+        w = m;
+        h = m;
+    }
+    Some(ShapeDrag {
+        kind: shape_kind(tool),
+        centre: if mods.command { start } else { [start[0].min(end[0]) + w / 2.0, start[1].min(end[1]) + h / 2.0] },
+        size: [w, h],
+        target,
+        layer_name: layer.map_or_else(String::new, |l| l.name.clone()),
+        mask_index,
+    })
+}
+
+/// The Tools bar's paint colour as bytes, dimmed by `alpha` so the comp shows through the ghost.
+fn paint_rgb(c: [f32; 3], opacity: f64, alpha: f32) -> Color32 {
+    let f = |k: f32| (k.clamp(0.0, 1.0) * 255.0).round() as u8;
+    Color32::from_rgb(f(c[0]), f(c[1]), f(c[2])).gamma_multiply((opacity.clamp(0.0, 100.0) / 100.0) as f32 * alpha)
+}
+
+/// Draw a shape drag as it will land: the tool's own path, filled with the Tools bar's Fill and
+/// outlined in its Stroke (or the mask colour, for a mask), captioned with where it goes.
+pub(super) fn draw_shape_ghost(painter: &egui::Painter, map: &ViewerMap, app: &EffectcraftApp, d: &ShapeDrag, t: &Tokens) {
+    // The engine's own geometry for the kind, so the ghost is the shape and not a stand-in for it.
+    let Some(sp) = effectcraft_engine::commands::shape_tool::mask_path(d.kind, d.centre, d.size) else { return };
+    let mut pts = ov::flatten(&sp, &Mat3::IDENTITY, map);
+    if pts.first() == pts.last() {
+        pts.pop();
+    }
+    if pts.len() < 3 {
+        return;
+    }
+    let tool = &app.session.state.shape_tool;
+    let (fill, line) = match d.target {
+        ShapeTarget::Mask => {
+            let [r, g, b] = effectcraft_engine::prefs::mask_color(app.session.prefs.appearance.cycle_mask_colors, d.mask_index);
+            (Color32::from_rgb(r, g, b).gamma_multiply(0.25), Color32::from_rgb(r, g, b))
+        }
+        _ => {
+            let stroke_on = tool.stroke.kind != PaintKind::None && tool.stroke_width > 0.0;
+            (
+                if tool.fill.kind == PaintKind::None { Color32::TRANSPARENT } else { paint_rgb(tool.fill.color, tool.fill.opacity, 0.45) },
+                if stroke_on { paint_rgb(tool.stroke.color, tool.stroke.opacity, 1.0) } else { t.accent },
+            )
+        }
+    };
+    let Some(bounds) = bounds_of(&pts) else { return };
+    // A screen-width outline reads at every zoom, where a comp-pixel hairline does not.
+    painter.add(egui::Shape::Path(egui::epaint::PathShape { points: pts, closed: true, fill, stroke: Stroke::new(1.5, line).into() }));
+    // Caption it with where the shape lands: a mask, a group in the selected shape layer or a
+    // new layer.
+    let font = Tokens::ui(11.0);
+    let galley = painter.layout_no_wrap(d.target.label(&d.layer_name), font, line);
+    let caption = Rect::from_min_size(pos2(bounds.left(), bounds.top() - 5.0 - galley.size().y), galley.size());
+    painter.rect_filled(caption.expand(3.0), 2.0, Color32::from_black_alpha(150));
+    painter.galley(caption.min, galley, line);
+}
+
+/// The bounds of points on screen, or `None` for an empty set.
+fn bounds_of(pts: &[Pos2]) -> Option<Rect> {
+    let first = *pts.first()?;
+    let mut r = Rect::from_min_max(first, first);
+    for p in pts.iter().skip(1) {
+        r.extend_with(*p);
+    }
+    Some(r)
+}
+
+pub(super) fn create_shape(app: &mut EffectcraftApp, tool: Tool, a: [f64; 2], b: [f64; 2], mods: egui::Modifiers) {
+    let Some(d) = shape_drag(app, tool, a, b, mods) else { return };
+    let (kind, (w, h), (cx, cy)) = (d.kind, (d.size[0], d.size[1]), (d.centre[0], d.centre[1]));
+    // A mask on the selected layer, as the ghost showed.
+    if d.target == ShapeTarget::Mask {
+        // In layer space: invert the layer transform.
+        let sel_layer = app.session.state.selected_layers.first().copied().and_then(|id| app.session.active_comp().and_then(|c| c.layer(id)).cloned());
+        if let Some(l) = sel_layer
+            && let Some(comp) = app.session.active_comp_arc()
+        {
+            let ectx = EvalCtx {
+                project: &app.session.project,
+                comp_id: app.session.active_comp_id().unwrap_or_default(),
+                comp: &comp,
+                time: app.session.time(),
+                expr: None,
+                footage: None,
+            };
+            let inv = l2c(&ectx, &l).0.inverse().unwrap_or(Mat3::IDENTITY);
+            let p0 = inv.apply(gv2(cx - w / 2.0, cy - h / 2.0));
+            let p1 = inv.apply(gv2(cx + w / 2.0, cy + h / 2.0));
+            let rect = [p0.x.min(p1.x), p0.y.min(p1.y), (p1.x - p0.x).abs(), (p1.y - p0.y).abs()];
+            if let Err(e) = app.session.execute("layer.addMask", json!({"layer": l.id.0, "shape": kind, "rect": rect})) {
+                app.ui.status = e.to_string();
+            }
+        }
+        return;
+    }
+    // Into the selected shape layer's Contents as a new group (as in After Effects), else a new
+    // shape layer; painted with the Tools bar's Fill and Stroke.
+    if let Err(e) = app.session.execute("shape.newShape", json!({"kind": kind, "size": [w, h], "position": [cx, cy]})) {
+        app.ui.status = e.to_string();
+    }
+}
diff --git a/crates/ui-egui/src/panels/viewer/tests.rs b/crates/ui-egui/src/panels/viewer/tests.rs
new file mode 100644
index 000000000..cb5bffe65
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/tests.rs
@@ -0,0 +1,141 @@
+use super::*;
+use effectcraft_engine::geom::{Mat4, vec3};
+
+/// #1544: Shift-clicking with the Pen keeps the new segment horizontal, vertical or diagonal.
+#[test]
+fn pen_shift_click_keeps_the_segment_at_45_degrees() {
+    let near = |a: [f64; 2], b: [f64; 2]| (a[0] - b[0]).abs() < 1e-9 && (a[1] - b[1]).abs() < 1e-9;
+    let from = [100.0, 100.0];
+    assert!(near(constrain_45(from, [104.0, 180.0]), [100.0, 180.0]), "straight down");
+    assert!(near(constrain_45(from, [30.0, 97.0]), [30.0, 100.0]), "left");
+    assert!(near(constrain_45(from, [150.0, 46.0]), [152.0, 48.0]), "up and right, on the diagonal");
+    assert!(near(constrain_45(from, from), from), "on the vertex");
+    assert!(constrain_45(from, [f64::NAN, 3.0])[0].is_nan(), "a non-finite point stays as it is");
+}
+
+/// The Rotation tool counts past a full turn in both directions, as in After Effects: the
+/// pointer going round the anchor 1.5 turns clockwise gives 540°, then back 2 turns gives
+/// −180°, with no jump where atan2 wraps from 180° to −180°.
+#[test]
+fn rotate_tool_accumulates_revolutions() {
+    // Screen y points down, so a growing atan2 angle is clockwise on screen.
+    let drag = |start: f64, steps: &[f64]| {
+        let (mut last, mut turned, mut out) = (start, 0.0, vec![]);
+        for &a in steps {
+            // atan2's range: (−180°, 180°].
+            let a = (a + 180.0).rem_euclid(360.0) - 180.0;
+            turned += turn_delta(last, a);
+            last = a;
+            out.push(turned);
+        }
+        (last, turned, out)
+    };
+    let cw: Vec<f64> = (1..=54).map(|i| i as f64 * 10.0).collect();
+    let (last, turned, seq) = drag(0.0, &cw);
+    assert!((turned - 540.0).abs() < 1e-9, "{turned}");
+    assert!(seq.windows(2).all(|w| (w[1] - w[0] - 10.0).abs() < 1e-9), "no jump: {seq:?}");
+    assert!((rotate_value(0.0, turned, false) - 540.0).abs() < 1e-9);
+    let ccw: Vec<f64> = (1..=72).map(|i| 540.0 - i as f64 * 10.0).collect();
+    let (_, back, seq) = drag(last, &ccw);
+    assert!(seq.windows(2).all(|w| (w[1] - w[0] + 10.0).abs() < 1e-9), "no jump: {seq:?}");
+    let total = turned + back;
+    assert!((total + 180.0).abs() < 1e-9, "{total}");
+    assert!((rotate_value(30.0, total, false) + 150.0).abs() < 1e-9);
+    // Shift snaps the accumulated value, not a wrapped one.
+    assert_eq!(rotate_value(0.0, 400.0, true), 405.0);
+    assert_eq!(rotate_value(0.0, -400.0, true), -405.0);
+    // Across the seam: 170° → −170° is +20°, and back is −20°; exactly half a turn is +180°.
+    assert!((turn_delta(170.0, -170.0) - 20.0).abs() < 1e-9);
+    assert!((turn_delta(-170.0, 170.0) + 20.0).abs() < 1e-9);
+    assert_eq!(turn_delta(0.0, 180.0), 180.0);
+    assert_eq!(turn_delta(0.0, -180.0), 180.0);
+    // Never crash or poison the value on non-finite input.
+    assert_eq!(turn_delta(f64::NAN, 10.0), 0.0);
+    assert_eq!(turn_delta(0.0, f64::INFINITY), 0.0);
+    assert_eq!(rotate_value(15.0, f64::NAN, false), 15.0);
+}
+
+/// #1042: a path vertex lying under, or just beside, a bounding-box handle is grabbed
+/// instead of the handle; away from every handle the reach is unchanged.
+#[test]
+fn vertex_reaches_as_far_as_a_box_handle_over_it() {
+    let handle = pos2(100.0, 100.0);
+    let vertex = pos2(100.0, 100.0);
+    // The press lands 8 points off the vertex, still on the handle's square.
+    let press = pos2(108.0, 100.0);
+    let pick = |p: Pos2, handles: &[Pos2]| vertex.distance(p) < vertex_grab_radius(p, handles.iter().copied());
+    assert!(handle.distance(press) < HANDLE + 2.0, "the handle would take this press");
+    assert!(pick(press, &[handle]), "the vertex wins over the handle");
+    assert!(!pick(press, &[]), "no handle there: the usual reach");
+    assert!(pick(pos2(105.0, 100.0), &[]));
+    assert!(!pick(pos2(120.0, 100.0), &[handle]), "past the handle: nothing");
+}
+
+/// #882: the frame's corner sits on a physical pixel at any display scaling, so 100 % maps
+/// comp pixels 1:1 onto screen pixels.
+#[test]
+fn frame_origin_snaps_to_physical_pixels() {
+    for ppp in [1.0f32, 1.25, 1.5, 1.75, 2.0] {
+        for p in [pos2(-201.12, 72.4), pos2(689.8, 239.75), pos2(0.3, -0.37)] {
+            let s = snap_to_pixels(p, ppp);
+            for v in [s.x * ppp, s.y * ppp] {
+                assert!((v - v.round()).abs() < 1e-3, "ppp {ppp}: {p:?} → {s:?}");
+            }
+            assert!((s - p).length() <= 0.71 / ppp, "moved by at most half a pixel: {p:?} → {s:?}");
+        }
+    }
+    assert_eq!(snap_to_pixels(pos2(1.3, 2.0), 0.0), pos2(1.3, 2.0));
+}
+
+/// #882: a magnified frame shows its pixels as blocks in both Zoom Quality modes; More
+/// Accurate only smooths when the frame is shown smaller.
+#[test]
+fn magnified_frames_are_never_smoothed() {
+    use eframe::wgpu::FilterMode;
+    for smooth in [true, false] {
+        assert_eq!(zoom_texture_options(smooth).magnification, egui::TextureFilter::Nearest);
+        assert_eq!(zoom_sampler(smooth).mag_filter, FilterMode::Nearest);
+    }
+    assert_eq!(zoom_texture_options(true).minification, egui::TextureFilter::Linear);
+    assert_eq!(zoom_sampler(true).min_filter, FilterMode::Linear);
+}
+
+/// A perspective-like homography: w = 100 + y (the plane crosses the camera at y = −100).
+fn tilted() -> Mat3 {
+    Mat3([[100.0, 0.0, 0.0], [0.0, 100.0, 0.0], [0.0, 1.0, 100.0]])
+}
+
+/// #572: a box reaching behind the camera is clipped at the near plane instead of flipping
+/// through infinity into long lines.
+#[test]
+fn outlines_clip_at_the_near_plane() {
+    let m = tilted();
+    let front = project_clipped(&m, &box_corners([-50.0, -50.0, 50.0, 50.0]));
+    assert_eq!(front.len(), 4);
+    let crossing = project_clipped(&m, &box_corners([-50.0, -150.0, 50.0, 50.0]));
+    assert_eq!(crossing.len(), 4, "{crossing:?}");
+    // Nothing flipped through infinity: a corner behind the camera (y = −150, w = −50) would
+    // land at y = +300 if it were projected as is; clipped at the near plane it runs off far
+    // above (negative y) instead, and the front corners stay where they were.
+    assert!(crossing.iter().all(|p| p[0].is_finite() && p[1].is_finite() && p[1] < 34.0), "{crossing:?}");
+    assert!(project_clipped(&m, &box_corners([-50.0, -400.0, 50.0, -200.0])).is_empty(), "wholly behind");
+}
+
+#[test]
+fn axis_drag_follows_the_arrow_and_ignores_drag_across_it() {
+    let (ax, ay) = axis_drag([0.0, 0.0, 60.0], [24.0, -24.0]);
+    let at = |d: [f64; 2]| [0, 1, 2].map(|i| ax[i] * d[0] + ay[i] * d[1]);
+    assert_eq!(at([24.0, -24.0]), [0.0, 0.0, 60.0]);
+    assert_eq!(at([-12.0, 12.0]), [0.0, 0.0, -30.0]);
+    assert_eq!(at([10.0, 10.0]), [0.0, 0.0, 0.0]);
+}
+
+#[test]
+fn gizmo_segments_clip_at_the_near_plane() {
+    // w = 100 + z.
+    let pc = Mat4([[100.0, 0.0, 0.0, 0.0], [0.0, 100.0, 0.0, 0.0], [0.0, 0.0, 1.0, 0.0], [0.0, 0.0, 1.0, 100.0]]);
+    let s = project_segment(&pc, vec3(10.0, 0.0, 0.0), vec3(10.0, 0.0, -300.0)).unwrap();
+    assert_eq!(s[0], [10.0, 0.0]);
+    assert!(s[1][0] > 10.0 && s[1][0].is_finite(), "toward the camera it grows, never flips: {s:?}");
+    assert!(project_segment(&pc, vec3(0.0, 0.0, -200.0), vec3(0.0, 0.0, -300.0)).is_none());
+}
diff --git a/crates/ui-egui/src/panels/viewer/tools.rs b/crates/ui-egui/src/panels/viewer/tools.rs
new file mode 100644
index 000000000..8a3fbf0f3
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/tools.rs
@@ -0,0 +1,298 @@
+use super::geometry::{cam_state, l2c, parent_inverse};
+use super::gesture::{Gesture, pen_id};
+use super::{CameraState, Color32, EffectcraftApp, EvalCtx, Layer, LayerId, Mat3, Pos2, Rect, Stroke, Tool, ViewerMap, gv2, json, ov, three_d, vec2, vt};
+
+/// The position change per comp pixel of drag (x, y) that moves a layer by `dir` when the
+/// pointer covers the axis' on-screen vector `s` (comp px); drag across the axis is ignored.
+pub(super) fn axis_drag(dir: [f64; 3], s: [f64; 2]) -> ([f64; 3], [f64; 3]) {
+    let n = (s[0] * s[0] + s[1] * s[1]).max(1e-12);
+    (dir.map(|v| v * s[0] / n), dir.map(|v| v * s[1] / n))
+}
+
+/// The gizmo arrow under screen point `p`.
+pub(super) fn axis_at(hits: &[(LayerId, [Pos2; 2], [f64; 3], [f64; 3])], p: Pos2) -> Option<(LayerId, [Pos2; 2], [f64; 3], [f64; 3])> {
+    let dist = |[a, b]: [Pos2; 2]| {
+        let ab = b - a;
+        let t = ((p - a).dot(ab) / ab.length_sq().max(1e-6)).clamp(0.0, 1.0);
+        p.distance(a + ab * t)
+    };
+    hits.iter().filter(|h| dist(h.1) < 6.0).min_by(|a, b| dist(a.1).total_cmp(&dist(b.1))).copied()
+}
+
+/// World to parent space for a 3D layer (identity without a parent).
+pub(super) fn parent_world_inverse(ctx: &EvalCtx, l: &Layer) -> effectcraft_engine::geom::Mat4 {
+    match l.parent.and_then(|p| ctx.comp.layer(p)) {
+        Some(p) => ctx.world_matrix(p).inverse().unwrap_or_default(),
+        None => effectcraft_engine::geom::Mat4::IDENTITY,
+    }
+}
+
+/// Parent-space position change per comp pixel of drag (x and y) for a layer: 2D layers map
+/// through the parent transform; 3D layers move in the view plane at their depth.
+pub(super) fn drag_axes(ctx: &EvalCtx, l: &Layer) -> ([f64; 3], [f64; 3]) {
+    if !l.is_3d() {
+        let inv = parent_inverse(ctx, l);
+        let a = inv.apply_vec(gv2(1.0, 0.0));
+        let b = inv.apply_vec(gv2(0.0, 1.0));
+        return ([a.x, a.y, 0.0], [b.x, b.y, 0.0]);
+    }
+    let cam = cam_state(ctx);
+    let anchor = l.transform().map(|tr| ctx.v3(l, tr, "anchor", [0.0; 3])).unwrap_or([0.0; 3]);
+    let wp = ctx.world_matrix(l).apply(anchor.into());
+    let k = if cam.ortho { 1.0 / cam.zoom.max(1e-9) } else { cam.depth(wp).max(1.0) / cam.zoom.max(1e-9) };
+    let pinv = parent_world_inverse(ctx, l);
+    let a = pinv.apply_vec(cam.right() * k);
+    let b = pinv.apply_vec(cam.down() * k);
+    ([a.x, a.y, a.z], [b.x, b.y, b.z])
+}
+
+/// Wireframes of cameras (frustum, point of interest) and lights (position, direction) as seen
+/// through the current 3D view.
+/// Camera and light wireframes seen through `cam` (`through_active`: `cam` is the active camera,
+/// which is then not drawn). `pane` names the automation ids: `None` for the main view
+/// (`viewer.camera.<id>`), `Some(view)` for a view of a 2- or 4-view layout
+/// (`viewer.view.<view>.camera.<id>`).
+#[allow(clippy::too_many_arguments)]
+pub(super) fn draw_rigs(
+    app: &mut EffectcraftApp,
+    painter: &egui::Painter,
+    map: &ViewerMap,
+    ectx: &EvalCtx,
+    selected: &[LayerId],
+    cam: CameraState,
+    through_active: bool,
+    pane: Option<&str>,
+) {
+    use effectcraft_engine::geom::Vec3;
+    use effectcraft_engine::project::{LayerSource, LightKind};
+    let (w, h) = (ectx.comp.width as f64, ectx.comp.height as f64);
+    let active = ectx.comp.active_camera(ectx.time).map(|c| c.id);
+    let prefix = pane.map(|v| format!("viewer.view.{v}.")).unwrap_or_else(|| "viewer.".to_string());
+    let proj = |p: Vec3| cam.project(w, h, p).map(|v| map.to_screen([v.x, v.y]));
+    let seg = |a: Vec3, b: Vec3, stroke: Stroke| {
+        if let (Some(x), Some(y)) = (proj(a), proj(b)) {
+            painter.line_segment([x, y], stroke);
+        }
+    };
+    for l in ectx.comp.layers.iter().filter(|l| (l.is_camera() || l.is_light()) && l.is_active_at(ectx.time)) {
+        let sel = selected.contains(&l.id);
+        let col = app.tokens.label(l.label).gamma_multiply(if sel { 1.0 } else { 0.6 });
+        let stroke = Stroke::new(if sel { 1.5 } else { 1.0 }, col);
+        let (eye, fwd, down) = three_d::camera::layer_frame(ectx, l);
+        let poi = |l: &Layer| -> Option<Vec3> {
+            let pr = l.transform()?.get("poi").filter(|_| three_d::camera::is_two_node(l))?;
+            Some(three_d::camera::parent_world(ectx, l).apply(ectx.value(l, pr).as_vec3().into()))
+        };
+        if l.is_camera() {
+            if through_active && Some(l.id) == active {
+                continue;
+            }
+            let zoom = l.props.prop("cameraOptions/zoom").map(|p| ectx.value(l, p).as_f64()).unwrap_or(1000.0);
+            let right = down.cross(fwd);
+            // Frustum to a plane at a quarter of the zoom distance.
+            let k = 0.25;
+            let c = eye + fwd * (zoom * k);
+            let corners = [(-1.0, -1.0), (1.0, -1.0), (1.0, 1.0), (-1.0, 1.0)].map(|(sx, sy)| c + right * (sx * w * 0.5 * k) + down * (sy * h * 0.5 * k));
+            for i in 0..4 {
+                seg(eye, corners[i], stroke);
+                seg(corners[i], corners[(i + 1) % 4], stroke);
+            }
+            if let Some(poi) = poi(l) {
+                seg(eye, poi, Stroke::new(1.0, col.gamma_multiply(0.6)));
+                if let Some(s) = proj(poi) {
+                    painter.circle_stroke(s, 4.0, stroke);
+                }
+            }
+            if let Some(s) = proj(eye) {
+                app.auto.add(&format!("{prefix}camera.{}", l.id.0), Rect::from_center_size(s, vec2(14.0, 14.0)), &l.name);
+            }
+        } else {
+            let LayerSource::Light { kind } = l.source else { continue };
+            if kind == LightKind::Ambient {
+                continue;
+            }
+            let Some(s) = proj(eye) else { continue };
+            painter.circle_stroke(s, 6.0, stroke);
+            for i in 0..8 {
+                let a = i as f32 * std::f32::consts::FRAC_PI_4;
+                let d = vec2(a.cos(), a.sin());
+                painter.line_segment([s + d * 8.0, s + d * 12.0], stroke);
+            }
+            if matches!(kind, LightKind::Spot | LightKind::Parallel) {
+                let target = poi(l).unwrap_or(eye + fwd * 300.0);
+                seg(eye, target, Stroke::new(1.0, col.gamma_multiply(0.7)));
+                if let Some(q) = proj(target) {
+                    painter.circle_stroke(q, 3.0, stroke);
+                }
+            }
+            app.auto.add(&format!("{prefix}light.{}", l.id.0), Rect::from_center_size(s, vec2(16.0, 16.0)), &l.name);
+        }
+    }
+}
+
+/// Pen tool press at `pos`: continue the path in progress (pressing its first vertex closes it),
+/// resume an open path whose last vertex is pressed, add a vertex on a visible path's segment, or
+/// start a new path: a mask on the selected footage/solid layer (or shape layer, with Tool Creates
+/// Mask), a shape path (Shape n group with the Tools bar's Fill and Stroke) on the selected shape
+/// layer, or a new shape layer when nothing is selected. The placed point snaps.
+/// Add a Position keyframe at a motion path's frame, keeping the path where it is.
+pub(super) fn add_motion_key(app: &mut EffectcraftApp, f: ov::PathFrame) {
+    if let Err(e) = app.session.execute("prop.addKey", json!({"layer": f.layer.0, "prop": f.prop, "time": f.time.seconds()})) {
+        app.ui.status = e.to_string();
+    }
+}
+
+/// Select only the motion path's keyframe `k` (what the vertex tools act on).
+pub(super) fn select_motion_key(app: &mut EffectcraftApp, k: &ov::KeyHit) -> bool {
+    app.session.execute("keys.select", json!({"keys": [{"layer": k.layer.0, "prop": k.prop, "time": k.time.seconds()}]})).is_ok()
+}
+
+/// The pointer for a Pen slot tool: the tool's own pen, the Pen showing Add Vertex's over a path
+/// it would add a point to (After Effects).
+pub(super) fn pen_cursor_icon(tool: Tool, over_path: bool) -> crate::icons::Icon {
+    use crate::icons::Icon;
+    match tool {
+        Tool::Pen if over_path => Icon::PenAdd,
+        Tool::PenAdd => Icon::PenAdd,
+        Tool::PenDelete => Icon::PenDelete,
+        Tool::PenConvert => Icon::PenConvert,
+        Tool::MaskFeather => Icon::MaskFeather,
+        _ => Icon::Pen,
+    }
+}
+
+/// Paint pen pointer `icon` with its tip at `at`, outlined for any background.
+pub(super) fn pen_cursor(ctx: &egui::Context, at: Pos2, icon: crate::icons::Icon) {
+    use crate::icons::Icon;
+    // Where each glyph's tip sits in its 16 × 16 box.
+    let tip = match icon {
+        Icon::PenAdd | Icon::PenDelete | Icon::MaskFeather => vec2(6.0, 2.5),
+        Icon::PenConvert => vec2(8.0, 3.5),
+        _ => vec2(8.0, 1.8),
+    };
+    let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Tooltip, egui::Id::unique("viewer-pen-cursor")));
+    let rect = Rect::from_min_size(at - tip, vec2(16.0, 16.0));
+    for d in [vec2(-1.0, 0.0), vec2(1.0, 0.0), vec2(0.0, -1.0), vec2(0.0, 1.0)] {
+        crate::icons::paint(&painter, rect.translate(d), icon, Color32::BLACK);
+    }
+    crate::icons::paint(&painter, rect, icon, Color32::WHITE);
+}
+
+/// Handle a Pen-tool press at `pos`: close the current path when its first vertex is hit; otherwise append a snapped
+/// (Shift: 45-degree) vertex, resume an open path's end, add a motion-path keyframe, insert a vertex on a visible
+/// path segment, or start a new mask/shape path on the selected layer or a new shape layer. Records the resulting
+/// path id and tangent gesture in context data for the drag that follows.
+#[allow(clippy::too_many_arguments)]
+pub(super) fn pen_press(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    ectx: &EvalCtx,
+    map: &ViewerMap,
+    paths: &[ov::PathInfo],
+    motion_frame: Option<ov::PathFrame>,
+    pos: Pos2,
+    mods: egui::Modifiers,
+) {
+    use effectcraft_engine::project::LayerSource;
+    let gid = egui::Id::unique("viewer-gesture");
+    let current: Option<(LayerId, u64)> = ui.data(|d| d.get_temp(pen_id()));
+    let c0 = map.to_comp(pos);
+    let corr = vt::snap(app, ui.ctx(), ectx, map, &[], &[c0], mods);
+    let c = [c0[0] + corr[0], c0[1] + corr[1]];
+    if let Some((lid, uid)) = current
+        && let Some(p) = ov::path_of(ectx, lid, uid)
+        && let Some(inv) = p.m.inverse()
+    {
+        let n = p.sp.vertices.len();
+        let first = p.sp.vertices.first().map(|v| {
+            let q = p.m.apply(gv2(v[0], v[1]));
+            map.to_screen([q.x, q.y])
+        });
+        if n >= 2 && first.is_some_and(|f| f.distance(pos) < 8.0) {
+            let _ = app.session.execute("mask.setClosed", json!({"layer": lid.0, "mask": uid, "closed": true}));
+            ui.data_mut(|d| {
+                d.remove::<(LayerId, u64)>(pen_id());
+                d.remove::<Gesture>(gid);
+            });
+            return;
+        }
+        // Shift keeps the new segment at a multiple of 45° from the vertex before it (#1544).
+        let last = p.sp.vertices.last().map(|v| p.m.apply(gv2(v[0], v[1])));
+        let c = match last {
+            Some(q) if mods.shift => constrain_45([q.x, q.y], c),
+            _ => c,
+        };
+        let lp = inv.apply(gv2(c[0], c[1]));
+        let lp = [lp.x, lp.y];
+        if let Ok(v) = app.session.execute("mask.addVertex", json!({"layer": lid.0, "mask": uid, "point": lp})) {
+            let index = v.as_u64().unwrap_or(0) as usize;
+            ui.data_mut(|d| d.insert_temp(gid, Gesture::Pen { layer: lid, mask: uid, index, vertex: lp, inv, press: pos }));
+        }
+        return;
+    }
+    // Clicking the last vertex of an open path (e.g. after Esc ended it) resumes drawing it.
+    if let Some(cur) = ov::open_end_at(paths, map, pos, 8.0) {
+        ui.data_mut(|d| d.insert_temp(pen_id(), cur));
+        return;
+    }
+    // On a visible path's segment the Pen adds a vertex there; on a motion path, a keyframe.
+    if let Some(f) = motion_frame {
+        add_motion_key(app, f);
+        return;
+    }
+    if let Some((l, m, seg, t)) = ov::segment_at(paths, map, pos, 5.0) {
+        let _ = app.session.execute("mask.insertVertex", json!({"layer": l.0, "mask": m, "segment": seg, "t": t}));
+        return;
+    }
+    let target = app
+        .session
+        .state
+        .selected_layers
+        .iter()
+        .copied()
+        .find(|id| ectx.comp.layer(*id).is_some_and(|l| !l.switches.locked && (l.masks().is_some() || matches!(l.source, LayerSource::Shape))));
+    let layer = target.and_then(|id| ectx.comp.layer(id));
+    let (lid, uid, inv) = match layer {
+        Some(l) if !matches!(l.source, LayerSource::Shape) || app.session.state.shape_tool.creates_mask => {
+            let Some(inv) = l2c(ectx, l).0.inverse() else { return };
+            let lp = inv.apply(gv2(c[0], c[1]));
+            let Ok(v) = app.session.execute("mask.new", json!({"layer": l.id.0, "vertices": [[lp.x, lp.y]]})) else { return };
+            let Some(mask) = v["mask"].as_u64() else { return };
+            (l.id, mask, inv)
+        }
+        Some(l) => {
+            let Some(inv) = l2c(ectx, l).0.inverse() else { return };
+            let lp = inv.apply(gv2(c[0], c[1]));
+            let r = app.session.execute("shape.newPath", json!({"layer": l.id.0, "vertices": [[lp.x, lp.y]], "space": "layer"}));
+            let Some(path) = r.ok().and_then(|v| v["path"].as_u64()) else { return };
+            (l.id, path, inv)
+        }
+        None => {
+            // A new shape layer at the comp centre (unrotated: comp → layer is a translation).
+            let r = app.session.execute("shape.newPath", json!({"vertices": [c], "space": "comp"}));
+            let Some(v) = r.ok() else { return };
+            let (Some(l), Some(path)) = (v["layer"].as_u64(), v["path"].as_u64()) else { return };
+            let inv = Mat3::translate(gv2(-(ectx.comp.width as f64) / 2.0, -(ectx.comp.height as f64) / 2.0));
+            (LayerId(l), path, inv)
+        }
+    };
+    let lp = inv.apply(gv2(c[0], c[1]));
+    ui.data_mut(|d| {
+        d.insert_temp(pen_id(), (lid, uid));
+        d.insert_temp(gid, Gesture::Pen { layer: lid, mask: uid, index: 0, vertex: [lp.x, lp.y], inv, press: pos });
+    });
+}
+
+/// `to` moved onto the nearest line through `from` at a multiple of 45° (horizontal, vertical or
+/// diagonal), as far along it as `to` lies: the Pen's Shift-click.
+pub(super) fn constrain_45(from: [f64; 2], to: [f64; 2]) -> [f64; 2] {
+    let (dx, dy) = (to[0] - from[0], to[1] - from[1]);
+    if !(dx.is_finite() && dy.is_finite()) || (dx == 0.0 && dy == 0.0) {
+        return to;
+    }
+    let step = std::f64::consts::FRAC_PI_4;
+    let a = (dy.atan2(dx) / step).round() * step;
+    let (ux, uy) = (a.cos(), a.sin());
+    let along = dx * ux + dy * uy;
+    [from[0] + ux * along, from[1] + uy * along]
+}
diff --git a/crates/ui-egui/src/panels/viewer/view.rs b/crates/ui-egui/src/panels/viewer/view.rs
new file mode 100644
index 000000000..30b3f4d00
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer/view.rs
@@ -0,0 +1,222 @@
+use super::tools::draw_rigs;
+use super::{Align2, Color32, EffectcraftApp, EvalCtx, Rect, Sense, Stroke, StrokeKind, Tokens, View3D, ViewerMap, json, pos2, three_d, vec2, widgets};
+
+/// Draw the extra views of a 2- or 4-view layout and return the main view's rectangle.
+pub(super) fn aux_views(
+    app: &mut EffectcraftApp,
+    ui: &mut egui::Ui,
+    comp: &effectcraft_engine::project::Comp,
+    cid: effectcraft_engine::project::ItemId,
+    full: Rect,
+    bg: Color32,
+) -> Rect {
+    let n = app.session.state.view_layout;
+    if n < 2 {
+        return full;
+    }
+    let gap = 2.0;
+    let views = app.session.state.views3d.get(&cid).cloned().unwrap_or_default();
+    let (main, aux): (Rect, Vec<(Rect, View3D)>) = if n == 2 {
+        let mid = full.center().x;
+        (
+            Rect::from_min_max(pos2(mid + gap / 2.0, full.min.y), full.max),
+            vec![(Rect::from_min_max(full.min, pos2(mid - gap / 2.0, full.max.y)), views.pane(0))],
+        )
+    } else {
+        let c = full.center();
+        let q = |x0: f32, y0: f32, x1: f32, y1: f32| Rect::from_min_max(pos2(x0, y0), pos2(x1, y1));
+        (
+            q(c.x + gap / 2.0, c.y + gap / 2.0, full.max.x, full.max.y),
+            vec![
+                (q(full.min.x, full.min.y, c.x - gap / 2.0, c.y - gap / 2.0), views.pane(0)),
+                (q(c.x + gap / 2.0, full.min.y, full.max.x, c.y - gap / 2.0), views.pane(1)),
+                (q(full.min.x, c.y + gap / 2.0, c.x - gap / 2.0, full.max.y), views.pane(2)),
+            ],
+        )
+    };
+    let ctx = ui.ctx().clone();
+    let p = ui.painter().clone();
+    p.rect_filled(full, 0.0, Color32::from_black_alpha(200));
+    let t = app.session.time();
+    let (cw, ch) = (comp.width as f32, comp.height as f32);
+    let share = app.session.state.share_view_options;
+    // The camera and light wireframes of each view (as in After Effects, where every view of the
+    // layout shows them), evaluated on a snapshot of the project.
+    let snap_project = app.session.project.clone();
+    let snap_expr = app.session.expr.clone();
+    let ectx = EvalCtx { project: &snap_project, comp_id: cid, comp, time: t, expr: snap_expr.as_deref(), footage: None };
+    let selected = app.session.state.selected_layers.clone();
+    let mut picked: Option<(usize, View3D)> = None;
+    for (i, (r, v)) in aux.into_iter().enumerate() {
+        p.rect_filled(r, 0.0, bg);
+        let fit = ((r.width() - 20.0) / cw).min((r.height() - 20.0) / ch).max(0.01);
+        let cr = Rect::from_center_size(r.center(), vec2(cw * fit, ch * fit));
+        let scale = (fit * ctx.pixels_per_point()).min(1.0) as f64;
+        // The Active Camera pane renders through the comp's own camera; the others through their
+        // view camera.
+        let through_active = v == View3D::ActiveCamera;
+        let cam = if through_active { three_d::active_camera(&ectx) } else { views.cam(v, comp.width as f64, comp.height as f64).state() };
+        let key = {
+            use std::hash::{Hash, Hasher};
+            let mut h = std::collections::hash_map::DefaultHasher::new();
+            (app.session.revision, cid.0, t.0, i, scale.to_bits(), format!("{cam:?}")).hash(&mut h);
+            h.finish()
+        };
+        let id = egui::Id::unique(("viewer-aux", i));
+        let cached: Option<(u64, egui::TextureHandle)> = ctx.data(|d| d.get_temp(id));
+        let tex = match cached {
+            Some((k, tex)) if k == key => tex,
+            _ => {
+                let opts = effectcraft_engine::render::RenderOpts {
+                    scale,
+                    view: (comp.has_3d() && !through_active).then_some(cam),
+                    draft: true,
+                    ..Default::default()
+                };
+                let img = app.session.render(cid, t, opts);
+                let tex = crate::frames::load_fitted(&ctx, format!("viewer-aux-{i}"), crate::frames::to_color_image(&img), egui::TextureOptions::LINEAR);
+                ctx.data_mut(|d| d.insert_temp(id, (key, tex.clone())));
+                tex
+            }
+        };
+        let b = comp.background;
+        p.rect_filled(cr, 0.0, Color32::from_rgb((b[0] * 255.0) as u8, (b[1] * 255.0) as u8, (b[2] * 255.0) as u8));
+        p.image(tex.id(), cr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+        p.rect_stroke(cr, 0.0, Stroke::new(1.0, Color32::from_black_alpha(160)), StrokeKind::Outside);
+        if share && app.ui.viewer.safe_margins {
+            for k in [0.9, 0.8] {
+                p.rect_stroke(Rect::from_center_size(cr.center(), cr.size() * k), 0.0, Stroke::new(1.0, Color32::from_white_alpha(120)), StrokeKind::Middle);
+            }
+        }
+        if comp.has_3d() {
+            let map = ViewerMap { origin: cr.min, zoom: fit, comp: [cw, ch], area: r };
+            draw_rigs(app, &p.with_clip_rect(r), &map, &ectx, &selected, cam, through_active, Some(v.id()));
+        }
+        let label = if comp.has_3d() { v.label() } else { crate::i18n::tr("Active Camera") };
+        p.text(r.left_bottom() + vec2(8.0, -8.0), Align2::LEFT_BOTTOM, label, Tokens::ui(11.0), Color32::from_white_alpha(200));
+        app.auto.add(&format!("viewer.view.{}", v.id()), r, label);
+        if comp.has_3d()
+            && let Some(chosen) = pane_selector(app, ui, i + 1, r, v)
+        {
+            picked = Some((i + 1, chosen));
+        }
+    }
+    if let Some((pane, v)) = picked
+        && let Err(e) = app.session.execute("view.setPaneView", json!({"pane": pane, "view": v.id(), "comp": cid.0}))
+    {
+        app.ui.status = e.to_string();
+    }
+    main
+}
+
+/// The view selector in the top-left corner of pane `pane` (1 to 3) of a multi-view layout, a
+/// popup of every 3D view like the toolbar's 3D View menu. Returns the view chosen this frame.
+fn pane_selector(app: &mut EffectcraftApp, ui: &mut egui::Ui, pane: usize, area: Rect, current: View3D) -> Option<View3D> {
+    let t = app.tokens;
+    let r = Rect::from_min_size(area.min + vec2(6.0, 6.0), vec2(124.0, 20.0));
+    let pid = egui::Id::unique(("viewer-pane-view", pane));
+    let response = widgets::dropdown(ui, r, crate::i18n::tr(current.label()), &t, pid);
+    if response.clicked() {
+        let open = widgets::popup_is_open(ui, pid);
+        ui.data_mut(|d| d.insert_temp(pid.with("open"), !open));
+    }
+    app.auto.add_response(&format!("viewer.view.{pane}.type"), &response, "View of pane");
+    if !widgets::popup_is_open(ui, pid) {
+        return None;
+    }
+    let chosen = widgets::popup_list(ui, pid, r.left_bottom() + vec2(0.0, 2.0), r, View3D::ALL.len(), 0, |ui| {
+        ui.set_min_width(124.0);
+        let mut chosen = None;
+        for (k, v) in View3D::ALL.iter().enumerate() {
+            let item = ui.selectable_label(*v == current, crate::i18n::tr(v.label()));
+            app.auto.add(&format!("viewer.view.{pane}.typeItem.{k}"), item.rect, v.label());
+            if item.clicked() {
+                chosen = Some(*v);
+            }
+        }
+        chosen
+    });
+    chosen.filter(|v| *v != current)
+}
+
+/// View ▸ Split with New Locked Viewer: the locked viewer on the left of the Composition panel
+/// (its comp and 3D view stay put whatever comp is active). Returns the main viewer's rectangle.
+pub(super) fn locked_pane(app: &mut EffectcraftApp, ui: &mut egui::Ui, full: Rect, bg: Color32) -> Rect {
+    let Some(lv) = app.session.state.locked_viewer else { return full };
+    let Some(comp) = app.session.project.comp_arc(lv.comp) else { return full };
+    let name = app.session.project.item(lv.comp).map(|i| i.name.clone()).unwrap_or_default();
+    let gap = 2.0;
+    let mid = full.center().x;
+    let r = Rect::from_min_max(full.min, pos2(mid - gap / 2.0, full.max.y));
+    let main = Rect::from_min_max(pos2(mid + gap / 2.0, full.min.y), full.max);
+    let ctx = ui.ctx().clone();
+    let p = ui.painter().clone();
+    p.rect_filled(Rect::from_min_max(pos2(r.max.x, full.min.y), pos2(main.min.x, full.max.y)), 0.0, Color32::from_black_alpha(200));
+    p.rect_filled(r, 0.0, bg);
+    let (cw, ch) = (comp.width as f32, comp.height as f32);
+    let fit = ((r.width() - 20.0) / cw).min((r.height() - 44.0) / ch).max(0.01);
+    let cr = Rect::from_center_size(r.center(), vec2(cw * fit, ch * fit));
+    let scale = (fit * ctx.pixels_per_point()).min(1.0) as f64;
+    let t = app.session.time_of(lv.comp);
+    let cam = (lv.view != View3D::ActiveCamera && comp.has_3d())
+        .then(|| app.session.state.views3d.get(&lv.comp).cloned().unwrap_or_default().cam(lv.view, comp.width as f64, comp.height as f64).state());
+    let dc = effectcraft_engine::viewer::DisplayColor::of(&app.session);
+    // The display conversion's inputs, keyed as in the main viewer's texture caches.
+    let dc_key = format!("{cam:?}{}", crate::panels::viewer_tools::display_key(app, dc.is_some()));
+    let key = {
+        use std::hash::{Hash, Hasher};
+        let mut h = std::collections::hash_map::DefaultHasher::new();
+        (app.session.revision, lv.comp.0, t.0, scale.to_bits(), dc_key).hash(&mut h);
+        h.finish()
+    };
+    let id = egui::Id::unique("viewer-locked");
+    let cached: Option<(u64, egui::TextureHandle)> = ctx.data(|d| d.get_temp(id));
+    let tex = match cached {
+        Some((k, tex)) if k == key => tex,
+        _ => {
+            let opts = effectcraft_engine::render::RenderOpts { scale, view: cam, ..Default::default() };
+            let img = app.session.render(lv.comp, t, opts);
+            let mut ci = crate::frames::to_color_image(&img);
+            if let Some(dc) = dc {
+                let mut px: Vec<[u8; 4]> = ci.pixels.iter().map(|c| c.to_array()).collect();
+                dc.apply(&mut px);
+                ci = egui::ColorImage::new(ci.size, px.into_iter().map(|a| Color32::from_rgba_premultiplied(a[0], a[1], a[2], a[3])).collect());
+            }
+            let tex = crate::frames::load_fitted(&ctx, "viewer-locked", ci, egui::TextureOptions::LINEAR);
+            ctx.data_mut(|d| d.insert_temp(id, (key, tex.clone())));
+            tex
+        }
+    };
+    let b = comp.background;
+    p.rect_filled(cr, 0.0, Color32::from_rgb((b[0] * 255.0) as u8, (b[1] * 255.0) as u8, (b[2] * 255.0) as u8));
+    p.image(tex.id(), cr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
+    p.rect_stroke(cr, 0.0, Stroke::new(1.0, Color32::from_black_alpha(160)), StrokeKind::Outside);
+    let label = crate::i18n::tr_args("Locked: {} — {}", &[&name, &(if comp.has_3d() { lv.view.label() } else { crate::i18n::tr("Active Camera") })]);
+    p.text(r.left_top() + vec2(8.0, 8.0), Align2::LEFT_TOP, &label, Tokens::ui(11.0), Color32::from_white_alpha(210));
+    app.auto.add("viewer.locked", r, &label);
+    // Close the locked viewer.
+    let close = Rect::from_min_size(pos2(r.max.x - 26.0, r.min.y + 4.0), vec2(20.0, 20.0));
+    let resp = ui.interact(close, egui::Id::unique("viewer-locked-close"), Sense::click());
+    p.text(close.center(), Align2::CENTER_CENTER, "\u{00d7}", Tokens::ui(14.0), if resp.hovered() { Color32::WHITE } else { Color32::from_white_alpha(170) });
+    app.auto.add("viewer.locked.close", close, "Close Locked Viewer");
+    if resp.clicked() {
+        let _ = app.session.execute("view.closeLockedViewer", serde_json::json!({}));
+    }
+    main
+}
+
+pub(crate) fn checker(p: &egui::Painter, r: Rect) {
+    let s = 10.0;
+    p.rect_filled(r, 0.0, Color32::from_gray(0xcc));
+    let mut y = r.min.y;
+    let mut row = 0;
+    while y < r.max.y {
+        let mut x = r.min.x + if row % 2 == 0 { 0.0 } else { s };
+        while x < r.max.x {
+            p.rect_filled(Rect::from_min_max(pos2(x, y), pos2((x + s).min(r.max.x), (y + s).min(r.max.y))), 0.0, Color32::from_gray(0x99));
+            x += 2.0 * s;
+        }
+        y += s;
+        row += 1;
+    }
+}
diff --git a/crates/ui-egui/src/panels/viewer_drop.rs b/crates/ui-egui/src/panels/viewer_drop.rs
index 2d42eb2c9..44364a49d 100644
--- a/crates/ui-egui/src/panels/viewer_drop.rs
+++ b/crates/ui-egui/src/panels/viewer_drop.rs
@@ -1,8 +1,8 @@
 //! Dropping onto the Composition viewer: footage, comps and solids from the
 //! Project panel and files from the Media Browser become layers centred where they are dropped
-//! (#85), and an effect from Effects & Presets goes on the layer under the pointer, outlined
-//! while it is dragged (#88). Agents do the same with `layer.addItem {position}`,
-//! `mediaBrowser.import {position}` and `effect.apply {layers}`.
+//! (#85), and an effect or animation preset from Effects & Presets goes on the layer under the
+//! pointer, outlined while it is dragged (#88). Agents do the same with `layer.addItem {position}`,
+//! `mediaBrowser.import {position}`, `effect.apply {layers}` and the preset commands.
 
 use effectcraft_engine::project::{ItemId, ItemKind};
 use effectcraft_engine::render::EvalCtx;
@@ -33,6 +33,15 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &egui::Ui, painter: &egui::Pain
             })
             .into_iter()
             .collect(),
+        DragPayload::Preset { preset, .. } => layer_at(ectx, at)
+            .map(|l| {
+                if let Some((_, q, _)) = layer_quad(ectx, l) {
+                    painter.add(egui::Shape::closed_line(q.iter().map(|c| map.to_screen(*c)).collect(), stroke));
+                }
+                preset.apply_to(l.id.0)
+            })
+            .into_iter()
+            .collect(),
         DragPayload::Item(item) => {
             // The layer's frame, centred on the pointer.
             if let Some([w, h]) = app.session.project.item(ItemId(*item)).and_then(|it| frame_size(&it.kind, ectx.comp.pixel_aspect)) {
@@ -45,7 +54,9 @@ pub(crate) fn show(app: &mut EffectcraftApp, ui: &egui::Ui, painter: &egui::Pain
         DragPayload::Files(paths) => vec![("mediaBrowser.import", json!({"paths": paths, "addToComp": true, "position": at}))],
         DragPayload::Property { .. } => vec![],
     };
-    if actions.first().is_some_and(|(id, _)| *id != "effect.apply") {
+    // Layer drops outline the target layer; the others outline the whole viewer.
+    let layer_drop = matches!(payload.as_ref(), DragPayload::Effect(_) | DragPayload::Preset { .. });
+    if !layer_drop && !actions.is_empty() {
         painter.rect_stroke(map.area, 0.0, stroke, StrokeKind::Inside);
     }
     if ctx.input(|i| i.pointer.any_released()) {
diff --git a/crates/ui-egui/src/panels/viewer_overlays.rs b/crates/ui-egui/src/panels/viewer_overlays.rs
index 9117103d5..ef4549db6 100644
--- a/crates/ui-egui/src/panels/viewer_overlays.rs
+++ b/crates/ui-egui/src/panels/viewer_overlays.rs
@@ -393,8 +393,9 @@ pub(crate) fn motion_path(
 
 // ---------------------------------------------------------------- free transform
 
+/// The `egui::Id` under which the free-transform target (layer and mask or path id) is stored.
 fn ft_id() -> egui::Id {
-    egui::Id::new("viewer-free-transform")
+    egui::Id::unique("viewer-free-transform")
 }
 
 /// Enter Free Transform on a path (double-click a path with the Selection tool).
diff --git a/crates/ui-egui/src/panels/viewer_text.rs b/crates/ui-egui/src/panels/viewer_text.rs
index 57b34b29d..ce387f6ca 100644
--- a/crates/ui-egui/src/panels/viewer_text.rs
+++ b/crates/ui-egui/src/panels/viewer_text.rs
@@ -14,7 +14,7 @@
 //! Every change runs an engine command (`text.*`, `layer.setText`, `edit.*`), so it's undoable and
 //! agents can do the same over the control channel.
 
-use effectcraft_engine::commands::text_edit::layer_doc;
+use effectcraft_engine::commands::text_edit::{ImeSurrounding, MAX_IME_TEXT_BYTES, ime_stamp_revision, ime_surrounding, layer_doc};
 use effectcraft_engine::geom::{Mat3, vec2 as gv2};
 use effectcraft_engine::keyframe::{Kerning, TextDoc};
 use effectcraft_engine::project::{Layer, LayerId, LayerSource};
@@ -40,11 +40,644 @@ enum Drag {
     Resize { layer: LayerId, handle: usize, start_box: [f64; 4] },
 }
 
+/// The `egui::Id` under which the in-progress text drag (selection, creation or box resize) is kept between frames.
 fn drag_id() -> egui::Id {
-    egui::Id::new("viewer-text-drag")
+    egui::Id::unique("viewer-text-drag")
 }
+/// The `egui::Id` of the invisible focusable widget that owns keyboard and IME focus while on-canvas text editing is
+/// active.
 fn focus_id() -> egui::Id {
-    egui::Id::new("viewer-text-focus")
+    egui::Id::unique("viewer-text-focus")
+}
+
+/// The immutable identity of one text-edit IME target.
+///
+/// The layer and the edit-session token are the whole owner. Caret, selection, text, revision
+/// and geometry are deliberately absent: ordinary IME edits keep this identity. Application caret
+/// changes interrupt the composition separately, without replacing this immutable target.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct ImeOwner {
+    layer: LayerId,
+    session: u64,
+}
+
+/// Last accepted selection for this viewport, separate from immutable target identity.
+/// IME deletes/commits advance it; application changes invalidate a live composition first.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct ImeSelection {
+    owner: ImeOwner,
+    anchor: usize,
+    caret: usize,
+}
+
+/// One viewport's visible IME pre-edit.
+///
+/// The text is only a drawing preview; it never enters the document. Its owner identifies the
+/// composition that produced it, so a preview can never survive a target switch.
+#[derive(Clone, Debug)]
+struct Preedit {
+    owner: ImeOwner,
+    text: String,
+}
+
+/// The input-method composition currently in flight for one viewport.
+///
+/// `TerminalPending` is an observed empty pre-edit: the input method cleared the visible
+/// composition, but its terminal commit/delete is a separate event and may still arrive. Keeping
+/// the owner means a target switch turns that state into `Stale`, so the pending old terminal event
+/// is rejected instead of being applied to the replacement.
+///
+/// `Stale` rejects an interrupted composition until its exact request-bound completion. Old
+/// terminals, empty/nonempty preedit and idle frames never acknowledge cancellation.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum ImeComposition {
+    Active(ImeOwner),
+    TerminalPending(ImeOwner),
+    Stale,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct OutputContext(egui::Id, u64, egui::IMEPurpose);
+
+impl From<&egui::output::IMEOutput> for OutputContext {
+    /// Copy the owner, context generation and purpose out of egui's IME output so they can be cached and compared
+    /// cheaply.
+    fn from(output: &egui::output::IMEOutput) -> Self {
+        Self(output.owner, output.context_generation, output.purpose)
+    }
+}
+
+#[derive(Clone, Debug)]
+struct ResetGuard {
+    request: Option<egui::ImeResetId>,
+    destination: Option<ImeSelection>,
+    committed: egui::ImeMutationStamp,
+    output: Option<OutputContext>,
+    suspended: bool,
+}
+
+/// The `egui::Id` under which this viewport's `ResetGuard` is stored.
+fn reset_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("effectcraft.ime.reset", viewport))
+}
+/// The `egui::Id` holding whether this viewport is currently inside a full UI pass (set by the pass hooks).
+fn mode_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("effectcraft.ime.ui-pass", viewport))
+}
+/// The `egui::Id` holding the last committed IME mutation stamp accepted for this viewport.
+fn committed_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("effectcraft.ime.committed", viewport))
+}
+/// The `egui::Id` holding the frame number whose text-editor keyboard events were already consumed.
+fn input_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("effectcraft.ime.input-frame", viewport))
+}
+/// The `egui::Id` holding whether this viewport may request an IME reset in the current pass.
+fn admission_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("effectcraft.ime.can-request", viewport))
+}
+
+/// Allow or forbid IME reset requests for the current viewport's pass by storing `allowed` in context data.
+fn set_admission(ctx: &egui::Context, allowed: bool) {
+    let id = admission_id(ctx.viewport_id());
+    ctx.data_mut(|data| data.insert_temp(id, allowed));
+}
+
+/// Whether the window can receive input: focused, not minimized and not occluded. Unknown viewport flags count as
+/// available.
+fn window_available(ctx: &egui::Context) -> bool {
+    ctx.input(|input| {
+        input.focused && input.viewport().focused.unwrap_or(true) && input.viewport().minimized != Some(true) && input.viewport().occluded != Some(true)
+    })
+}
+
+/// Install the per-pass IME hooks on `ctx` once: the begin hook marks a full UI pass and the end hook clears it.
+/// Later calls do nothing.
+pub(crate) fn install_hooks(ctx: &egui::Context) {
+    let id = egui::Id::unique("effectcraft.ime.hooks-installed");
+    let first = ctx.data_mut(|data| {
+        if data.get_temp::<bool>(id).unwrap_or(false) {
+            false
+        } else {
+            data.insert_temp(id, true);
+            true
+        }
+    });
+    if !first {
+        return;
+    }
+    ctx.on_begin_pass(
+        "EffectCraft IME pass begin",
+        std::sync::Arc::new(|ui| {
+            let id = mode_id(ui.ctx().viewport_id());
+            ui.ctx().data_mut(|data| data.insert_temp(id, true));
+        }),
+    );
+    ctx.on_end_pass(
+        "EffectCraft IME pass end",
+        std::sync::Arc::new(|ui| {
+            let id = mode_id(ui.ctx().viewport_id());
+            ui.ctx().data_mut(|data| data.insert_temp(id, false));
+        }),
+    );
+}
+
+/// Read the current viewport's pending reset guard, if any.
+fn read_reset(ctx: &egui::Context) -> Option<ResetGuard> {
+    let id = reset_id(ctx.viewport_id());
+    ctx.data(|data| data.get_temp(id))
+}
+
+/// Record a reset for the current viewport: request a fresh IME fence when this pass is admitted, then store the
+/// destination selection, committed stamp and output identity and mark the composition stale. An unadmitted pass
+/// stores a suspended guard instead.
+fn request_reset_with_output(app: &EffectcraftApp, ctx: &egui::Context, output: Option<OutputContext>) {
+    let viewport = ctx.viewport_id();
+    let allowed = ctx.data(|data| data.get_temp::<bool>(admission_id(viewport)).unwrap_or(false));
+    let request = if allowed { ctx.request_ime_reset(viewport) } else { None };
+    let guard = ResetGuard { request, destination: ime_selection(app), committed: ime_stamp(app, ctx), output, suspended: !allowed };
+    ctx.data_mut(|data| {
+        data.insert_temp(reset_id(viewport), guard);
+        data.insert_temp(ime_composition_id(viewport), ImeComposition::Stale);
+    });
+}
+
+/// Re-request a reset for the current viewport, keeping the output identity published earlier in the pass.
+fn request_reset(app: &EffectcraftApp, ctx: &egui::Context) {
+    let output = read_reset(ctx).and_then(|guard| guard.output);
+    request_reset_with_output(app, ctx, output);
+}
+
+/// Re-request the reset when an unsuspended guard's destination selection or committed stamp no longer matches the
+/// app.
+fn sync_reset(app: &EffectcraftApp, ctx: &egui::Context) {
+    if let Some(guard) = read_reset(ctx)
+        && !guard.suspended
+        && (guard.destination != ime_selection(app) || guard.committed != ime_stamp(app, ctx))
+    {
+        request_reset(app, ctx);
+    }
+}
+
+/// Retire the guard's request id locally and suspend it, so only a later eligible pass can request a new fence.
+fn suspend_reset(ctx: &egui::Context) {
+    if let Some(mut guard) = read_reset(ctx) {
+        guard.request = None;
+        guard.suspended = true;
+        let id = reset_id(ctx.viewport_id());
+        ctx.data_mut(|data| data.insert_temp(id, guard));
+    }
+}
+
+/// Accept `request` only when it is this viewport's current, unsuspended request and the destination and stamp still
+/// match; then sync target and selection, clear the composition and preview and remember the selection.
+fn complete_reset(app: &EffectcraftApp, ui: &egui::Ui, request: egui::ImeResetId) {
+    if !read_reset(ui.ctx()).is_some_and(|guard| !guard.suspended && guard.request == Some(request)) {
+        return;
+    }
+    sync_ime_target(ui, app);
+    sync_ime_selection(ui, app);
+    let ctx = ui.ctx();
+    let viewport = ctx.viewport_id();
+    if read_reset(ctx).is_some_and(|guard| {
+        !guard.suspended
+            && guard.request == Some(request)
+            && request.viewport_id() == viewport
+            && guard.destination == ime_selection(app)
+            && guard.committed == ime_stamp(app, ctx)
+    }) {
+        ctx.data_mut(|data| data.remove::<ResetGuard>(reset_id(viewport)));
+        set_ime_composition(ui, None);
+        clear_preedit(ui);
+        remember_ime_selection(ui, app);
+    }
+}
+
+/// Withhold custom IME controls for this pass: suspend the reset guard and drop every `ImeResetCompleted` event.
+/// No custom mutation route can be waiting for completion here; stock text widgets keep their keys and text events.
+fn unavailable_controls(ui: &egui::Ui) {
+    suspend_reset(ui.ctx());
+    // No custom mutation route runs here, so controls can only be obsolete. Stock text/keys
+    // remain in place for their actual TextEdit owner.
+    ui.ctx().input_mut(|input| input.events.retain(|event| !matches!(event, egui::Event::ImeResetCompleted { .. })));
+}
+
+/// Start a UI pass: revoke IME reset admission and clear the geometry published by the previous pass.
+pub(crate) fn begin_ui(ctx: &egui::Context) {
+    set_admission(ctx, false);
+    let id = ime_geometry_id(ctx.viewport_id());
+    ctx.data_mut(|data| data.remove::<ImeGeometry>(id));
+}
+
+/// Whether the text editor recorded its IME geometry in this pass of the current viewport.
+pub(crate) fn ime_recorded(ctx: &egui::Context) -> bool {
+    let viewport = ctx.viewport_id();
+    let pass = ctx.cumulative_pass_nr_for(viewport);
+    ctx.data(|d| d.get_temp::<ImeGeometry>(ime_geometry_id(viewport))).is_some_and(|(p, _, _)| p == pass)
+}
+
+/// Close a logic-only tick: when no full UI pass ran, revoke admission and resync and suspend the reset guard so a
+/// hidden tick never publishes IME state.
+pub(crate) fn finish_logic(app: &EffectcraftApp, ctx: &egui::Context) {
+    let id = mode_id(ctx.viewport_id());
+    if !ctx.data(|data| data.get_temp::<bool>(id).unwrap_or(false)) {
+        set_admission(ctx, false);
+        sync_reset(app, ctx);
+        suspend_reset(ctx);
+    }
+}
+
+type ImeGeometry = (u64, egui::Rect, egui::Rect);
+type SurroundingKey = (u64, u64, u64, u64, usize, usize, i64);
+
+#[derive(Clone, Debug)]
+struct SurroundingCache {
+    key: SurroundingKey,
+    value: Option<ImeSurrounding>,
+}
+
+/// The `egui::Id` under which this viewport's visible IME pre-edit preview is stored.
+fn ime_preedit_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-preedit", viewport))
+}
+/// The `egui::Id` under which this viewport's in-flight IME composition state is stored.
+fn ime_composition_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-composition", viewport))
+}
+/// The `egui::Id` under which the current pass number, text region and caret rectangle are stored for the
+/// viewport IME publisher.
+fn ime_geometry_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-geometry", viewport))
+}
+/// The `egui::Id` under which the last text-edit target given keyboard focus is stored.
+fn ime_seen_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-seen", viewport))
+}
+/// The `egui::Id` under which the last `ImeOwner` observed by `sync_ime_target` is stored.
+fn ime_target_seen_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-target", viewport))
+}
+/// The `egui::Id` under which the last accepted IME selection is stored.
+fn ime_selection_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-selection", viewport))
+}
+/// The `egui::Id` under which the last published IME owner and context generation are stored.
+fn ime_last_context_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-last-context", viewport))
+}
+/// The `egui::Id` under which the bounded IME surrounding-text snapshot and its cache key are stored.
+fn ime_surrounding_cache_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-ime-surrounding", viewport))
+}
+/// The `egui::Id` under which the typing merge counter is stored.
+fn typing_key_id(viewport: egui::ViewportId) -> egui::Id {
+    egui::Id::unique(("viewer-text-typing", viewport))
+}
+
+/// The immutable IME owner of the current edit session.
+///
+/// The comp/layer target identity survives ordinary edits and caret moves. The edit session
+/// token distinguishes a target that reuses the same numeric ids (a restarted edit, a reopened
+/// project, undo that recreates the layer); a different comp or layer is a different owner. No
+/// caret, selection, text, document position or view geometry takes part.
+fn ime_target(app: &EffectcraftApp) -> Option<egui::ImeTarget> {
+    let comp = app.session.active_comp_id()?;
+    let edit = app.session.state.text_edit.as_ref()?;
+    Some(egui::ImeTarget::new(egui::Id::unique(("effectcraft-ime-text", comp.0, edit.layer.0)), edit.session))
+}
+
+/// The layer and edit-session token of the active text edit, or `None` when no editor is open. Caret, selection and
+/// text are deliberately excluded.
+fn ime_owner(app: &EffectcraftApp) -> Option<ImeOwner> {
+    let edit = app.session.state.text_edit.as_ref()?;
+    Some(ImeOwner { layer: edit.layer, session: edit.session })
+}
+
+/// The bounded committed snapshot used by an IME receipt.
+///
+/// The cached value is keyed by the exact state that can change it. Repeated observations in
+/// one pass/frame (receipts and the final descriptor) therefore reuse one bounded snapshot
+/// instead of evaluating an animated Source Text or scanning the document each time.
+fn ime_surrounding_cached(app: &EffectcraftApp, ctx: &egui::Context) -> Option<ImeSurrounding> {
+    let viewport = ctx.viewport_id();
+    let edit = app.session.state.text_edit.as_ref();
+    let key = (
+        app.session.revision,
+        app.session.active_comp_id().map_or(0, |c| c.0),
+        edit.map_or(0, |e| e.layer.0),
+        edit.map_or(0, |e| e.session),
+        edit.map_or(0, |e| e.anchor),
+        edit.map_or(0, |e| e.caret),
+        app.session.time().0,
+    );
+    if let Some(cache) = ctx.data(|d| d.get_temp::<SurroundingCache>(ime_surrounding_cache_id(viewport)))
+        && cache.key == key
+    {
+        return cache.value;
+    }
+    let value = ime_surrounding(&app.session);
+    ctx.data_mut(|d| d.insert_temp(ime_surrounding_cache_id(viewport), SurroundingCache { key, value: value.clone() }));
+    value
+}
+
+/// The committed-text stamp an IME receipt compares against: the bounded snapshot when it is available, else the
+/// editor revision marked unavailable. It deliberately does not use the global project revision, so an unrelated edit
+/// leaves a wide selection's stamp unchanged.
+fn ime_stamp(app: &EffectcraftApp, ctx: &egui::Context) -> egui::ImeMutationStamp {
+    match ime_surrounding_cached(app, ctx) {
+        Some(w) => egui::ImeMutationStamp::from_committed(&w.text, w.cursor, w.anchor, None),
+        // A global project revision would make an unrelated edit (an opacity undo) look like a
+        // mutation of a wide selection. The editor revision only moves with committed text and
+        // the editor session.
+        None => egui::ImeMutationStamp::unavailable_at_revision(ime_stamp_revision(&app.session)),
+    }
+}
+
+/// Record an accepted IME commit/delete mutation for this viewport and frame.
+///
+/// Call it only after the command succeeded and actually changed the committed text (`before`
+/// and `after` are captured immediately around that mutation). Rejected events, no-ops and
+/// failed commands earn no receipt.
+fn note_ime_receipt(app: &mut EffectcraftApp, ctx: &egui::Context, before: egui::ImeMutationStamp, after: egui::ImeMutationStamp) {
+    let Some(target) = ime_target(app) else { return };
+    let viewport = ctx.viewport_id();
+    let frame = ctx.cumulative_frame_nr_for(viewport);
+    app.ime_tracker.note_input_method_apply(viewport, frame, target, before, after);
+}
+
+/// Record an application edit only when it actually changed the committed snapshot.
+///
+/// A no-op (Backspace at the start of the document, a failed command) must not poison a later
+/// accepted IME commit in the same frame.
+fn note_ime_application_edit(app: &mut EffectcraftApp, ctx: &egui::Context, before: egui::ImeMutationStamp) {
+    if ime_stamp(app, ctx) != before {
+        note_ime_application_change(app, ctx);
+    }
+}
+
+/// Record application-origin work (typing, paste, undo, automatic correction, ...) so `Other`
+/// dominates every remaining pass of the frame.
+fn note_ime_application_change(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    let Some(target) = ime_target(app) else { return };
+    let viewport = ctx.viewport_id();
+    let frame = ctx.cumulative_frame_nr_for(viewport);
+    app.ime_tracker.note_application_change(viewport, frame, target);
+}
+
+/// Drop this viewport's visible pre-edit preview.
+fn clear_preedit(ui: &egui::Ui) {
+    let viewport = ui.ctx().viewport_id();
+    ui.data_mut(|d| d.remove::<Preedit>(ime_preedit_id(viewport)));
+}
+
+/// Read this viewport's in-flight IME composition state.
+fn read_ime_composition(ui: &egui::Ui) -> Option<ImeComposition> {
+    let viewport = ui.ctx().viewport_id();
+    ui.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(viewport)))
+}
+
+/// Store this viewport's composition state, or remove it with `None`.
+fn set_ime_composition(ui: &egui::Ui, composition: Option<ImeComposition>) {
+    let viewport = ui.ctx().viewport_id();
+    ui.data_mut(|d| match composition {
+        Some(composition) => {
+            d.insert_temp(ime_composition_id(viewport), composition);
+        }
+        None => d.remove::<ImeComposition>(ime_composition_id(viewport)),
+    });
+}
+
+/// Mark the composition in flight as interrupted by application work.
+///
+/// A live visible composition (`Active`) or an observed empty pre-edit whose terminal event is
+/// still pending (`TerminalPending`) needs a tombstone; there is no lingering event to reject when
+/// no pre-edit was seen. Repeated hidden passes retire an already guarded activation without
+/// allocating again; reactivation requests a new fence. Missing acknowledgement stays closed.
+fn invalidate_ime_composition(ui: &egui::Ui, app: &EffectcraftApp) {
+    if matches!(read_ime_composition(ui), Some(ImeComposition::Active(_) | ImeComposition::TerminalPending(_))) {
+        set_ime_composition(ui, Some(ImeComposition::Stale));
+        request_reset(app, ui.ctx());
+    }
+}
+
+/// Keep the composition lifecycle aligned with the current edit target.
+///
+/// A target change or the end of the edit invalidates a visible composition or an observed empty
+/// pre-edit with a still-pending terminal event, and clears the visible preview. The tombstone is
+/// kept across arbitrary idle frames until the exact request-bound completion is observed.
+fn sync_ime_target(ui: &egui::Ui, app: &EffectcraftApp) {
+    let viewport = ui.ctx().viewport_id();
+    let current = ime_owner(app);
+    let previous = ui.data(|d| d.get_temp::<Option<ImeOwner>>(ime_target_seen_id(viewport))).flatten();
+    if previous == current {
+        return;
+    }
+    if previous.is_some() {
+        // The previous target was replaced or the editor ended. Any composition it had is now
+        // stale, including one whose next pre-edit/commit arrives in a later raw batch.
+        invalidate_ime_composition(ui, app);
+    }
+    // The preview belongs to the previous target even when the new one has the same numeric ids.
+    clear_preedit(ui);
+    ui.data_mut(|d| d.insert_temp(ime_target_seen_id(viewport), current));
+}
+
+/// The active text edit's owner, anchor and caret, or `None` when no editor is open.
+fn ime_selection(app: &EffectcraftApp) -> Option<ImeSelection> {
+    let edit = app.session.state.text_edit.as_ref()?;
+    Some(ImeSelection { owner: ime_owner(app)?, anchor: edit.anchor, caret: edit.caret })
+}
+
+/// Accept the selection resulting from an IME event without cancelling its remaining events.
+fn remember_ime_selection(ui: &egui::Ui, app: &EffectcraftApp) {
+    let viewport = ui.ctx().viewport_id();
+    let selection = ime_selection(app);
+    ui.data_mut(|d| d.insert_temp(ime_selection_id(viewport), selection));
+    let stamp = ime_stamp(app, ui.ctx());
+    ui.data_mut(|d| d.insert_temp(committed_id(viewport), stamp));
+}
+
+/// An application caret/selection change cannot inherit the old composition's mutations.
+/// Run before IME dispatch, and after application events, while the old selection is still
+/// recorded. Accepted IME events update that record separately: their own delete must not
+/// invalidate the commit that follows it.
+fn sync_ime_selection(ui: &egui::Ui, app: &EffectcraftApp) {
+    let viewport = ui.ctx().viewport_id();
+    let previous = ui.data(|d| d.get_temp::<Option<ImeSelection>>(ime_selection_id(viewport))).flatten();
+    let committed = ui.data(|data| data.get_temp::<egui::ImeMutationStamp>(committed_id(viewport)));
+    let changed = previous != ime_selection(app) || committed.is_some_and(|previous| previous != ime_stamp(app, ui.ctx()));
+    if changed && matches!(read_ime_composition(ui), Some(ImeComposition::Active(_) | ImeComposition::TerminalPending(_))) {
+        invalidate_ime_composition(ui, app);
+        clear_preedit(ui);
+    }
+    sync_reset(app, ui.ctx());
+    remember_ime_selection(ui, app);
+}
+
+/// Truncate a pre-edit preview to `MAX_IME_TEXT_BYTES` on a character boundary, so no character is split.
+fn bounded_preedit(mut text: String) -> String {
+    if text.len() > MAX_IME_TEXT_BYTES {
+        let mut end = MAX_IME_TEXT_BYTES;
+        while end > 0 && !text.is_char_boundary(end) {
+            end -= 1;
+        }
+        text.truncate(end);
+    }
+    text
+}
+
+/// Read this viewport's visible pre-edit preview, whatever owner it belongs to.
+fn read_preedit(ui: &egui::Ui) -> Option<Preedit> {
+    let viewport = ui.ctx().viewport_id();
+    ui.data(|d| d.get_temp::<Preedit>(ime_preedit_id(viewport)))
+}
+
+/// Clear a preview that belongs to `owner`, leaving any other viewport's guard untouched.
+fn clear_current_preedit(ui: &egui::Ui, owner: ImeOwner) {
+    if read_preedit(ui).is_some_and(|p| p.owner == owner) {
+        clear_preedit(ui);
+    }
+}
+
+/// Whether an incoming IME mutation belongs to the currently edited composition.
+///
+/// With no composition a direct commit/delete (platforms may send one without a preview) is
+/// accepted. Once a composition is visible or has an observed empty pre-edit awaiting its terminal
+/// event, only its matching owner and uninterrupted selection may mutate the document. A target
+/// switch or application caret change leaves a tombstone rejecting the interrupted composition.
+fn ime_event_is_stale(ui: &egui::Ui, owner: ImeOwner) -> bool {
+    match read_ime_composition(ui) {
+        Some(ImeComposition::Stale) => true,
+        Some(ImeComposition::Active(active) | ImeComposition::TerminalPending(active)) => active != owner,
+        None => false,
+    }
+}
+
+/// The pre-edit text to draw, only when it belongs to the current edit owner and is non-empty.
+fn visible_preedit(ui: &egui::Ui, app: &EffectcraftApp) -> Option<String> {
+    let owner = ime_owner(app)?;
+    let p = read_preedit(ui)?;
+    (p.owner == owner && !p.text.is_empty()).then_some(p.text)
+}
+
+/// Publish the descriptor from this viewport's current text state and recorded geometry.
+///
+/// The root viewport publishes after dock actions, ScriptUI, learn and dialogs. Native panel
+/// windows publish after the IME-owning body records geometry and again after their last body;
+/// publication can therefore precede later bodies in that window. The overlay only records
+/// geometry; this function resolves the current owner and availability when it publishes.
+pub(crate) fn finish_ime(app: &mut EffectcraftApp, ui: &egui::Ui) {
+    let ctx = ui.ctx();
+    let viewport = ctx.viewport_id();
+    let frame = ctx.cumulative_frame_nr_for(viewport);
+    let pass = ctx.cumulative_pass_nr_for(viewport);
+    let geometry = ctx.data(|d| d.get_temp::<ImeGeometry>(ime_geometry_id(viewport))).filter(|(p, _, _)| *p == pass);
+    // The window itself must be focused too: a forced hidden-window UI pass keeps egui's widget
+    // focus, but no input method may target it. `None` is "unknown" (tests, some platforms).
+    let window_focused = window_available(ctx);
+    let focused = geometry.is_some() && window_focused && ui.is_enabled() && app.dialog.is_none() && ctx.memory(|m| m.has_focus(focus_id()));
+    // Resolve availability, but withhold admission from the synchronizers: they may retire a
+    // guard and must not allocate before this pass's actual output is known. Otherwise a
+    // destination change in sync could allocate one ID and the output-identity check below a
+    // second ID in the same pass.
+    set_admission(ctx, false);
+    sync_ime_target(ui, app);
+    sync_ime_selection(ui, app);
+    let update = match (ime_target(app).filter(|_| focused), geometry) {
+        (Some(target), Some((_, _rect, _cursor_rect))) => {
+            let window = ime_surrounding_cached(app, ctx);
+            let committed = window.as_ref().map(|w| egui::CommittedText::new(&w.text, w.cursor, w.anchor));
+            // An unavailable observation still carries the editor revision: it is the only
+            // identity an IME receipt has when the selection is wider than the platform limit,
+            // and it must match `ime_stamp`'s revision exactly.
+            let observation = egui::ImeObservation::new(frame, pass, target).committed(committed).unavailable_revision(ime_stamp_revision(&app.session));
+            app.ime_tracker.observe(viewport, Some(observation))
+        }
+        _ => {
+            app.ime_tracker.observe(viewport, None);
+            // Losing custom publication retires the old ID. Returning to the same editor must
+            // request a new fence rather than await a discarded or foreign descriptor's ID.
+            invalidate_ime_composition(ui, app);
+            clear_preedit(ui);
+            None
+        }
+    };
+    let custom = update.as_ref().map(|update| OutputContext(update.owner, update.context_generation, update.purpose));
+    if let Some(update) = update {
+        let key = (update.owner, update.context_generation);
+        let previous = ctx.data(|d| d.get_temp::<(egui::Id, u64)>(ime_last_context_id(viewport)));
+        // A new owner or replacement epoch on the same widget focus must cancel the platform's
+        // composition too; waiting for egui's focus change is not enough on Windows/macOS/X11.
+        let interrupt = previous.is_some_and(|p| p != key);
+        if interrupt {
+            ctx.memory_mut(|m| m.interrupt_ime());
+        }
+        ctx.data_mut(|d| d.insert_temp(ime_last_context_id(viewport), key));
+        ctx.output_mut(|o| {
+            o.ime = Some(egui::output::IMEOutput {
+                owner: update.owner,
+                context_generation: update.context_generation,
+                purpose: update.purpose,
+                rect: geometry.map_or(egui::Rect::NOTHING, |(_, r, _)| r),
+                cursor_rect: geometry.map_or(egui::Rect::NOTHING, |(_, _, c)| c),
+                should_interrupt_composition: interrupt,
+                reset_request: None,
+                change_cause: update.change_cause,
+                surrounding_text: update.surrounding_text,
+            });
+        });
+    } else {
+        // Clear only this custom editor's descriptor. A stock TextEdit that drew later in the
+        // same pass owns `output.ime` now and must keep it.
+        let previous = ctx.data(|d| d.get_temp::<(egui::Id, u64)>(ime_last_context_id(viewport)));
+        ctx.output_mut(|o| {
+            if previous.is_some_and(|(owner, _)| o.ime.as_ref().is_some_and(|ime| ime.owner == owner)) {
+                o.ime = None;
+            }
+        });
+    }
+    // `ctx.output` here is the descriptor this function just wrote, not proof that the host
+    // accepted it. On the publishing path `actual == custom` is true by construction, so it is
+    // only a defensive no-update check (there `custom.is_none()` already decides). The real
+    // foreign/stock protection is the owner check in the no-update branch above, not this test.
+    let actual = ctx.output(|output| output.ime.as_ref().map(OutputContext::from));
+    let eligible = focused && custom.is_some() && actual == custom;
+    set_admission(ctx, eligible);
+    if !eligible {
+        unavailable_controls(ui);
+    } else if let Some(guard) = read_reset(ctx) {
+        // The confirmed eligible finalizer makes the one destination/output-aware allocation
+        // for this pass. A suspended or superseded guard was retired locally by the
+        // synchronizers; only here is a new request put into core Memory, carrying the output
+        // context actually published above.
+        if guard.suspended || guard.destination != ime_selection(app) || guard.output.is_some_and(|old| Some(old) != custom) {
+            request_reset_with_output(app, ctx, custom);
+        } else if let Some(mut guard) = read_reset(ctx) {
+            guard.output = custom;
+            ctx.data_mut(|data| data.insert_temp(reset_id(viewport), guard));
+        }
+    }
+}
+
+/// Release one native viewport's IME data and tracker state.
+pub(crate) fn end_viewport(app: &mut EffectcraftApp, ctx: &egui::Context, viewport: egui::ViewportId) {
+    ctx.data_mut(|d| {
+        d.remove::<Preedit>(ime_preedit_id(viewport));
+        d.remove::<ImeComposition>(ime_composition_id(viewport));
+        d.remove::<ImeGeometry>(ime_geometry_id(viewport));
+        d.remove::<Option<(u64, u64)>>(ime_seen_id(viewport));
+        d.remove::<Option<ImeOwner>>(ime_target_seen_id(viewport));
+        d.remove::<Option<ImeSelection>>(ime_selection_id(viewport));
+        d.remove::<(egui::Id, u64)>(ime_last_context_id(viewport));
+        d.remove::<SurroundingCache>(ime_surrounding_cache_id(viewport));
+        d.remove::<u64>(typing_key_id(viewport));
+        d.remove::<ResetGuard>(reset_id(viewport));
+        d.remove::<egui::ImeMutationStamp>(committed_id(viewport));
+        d.remove::<u64>(input_id(viewport));
+        d.remove::<bool>(mode_id(viewport));
+        d.remove::<bool>(admission_id(viewport));
+    });
+    app.ime_tracker.end_viewport(viewport);
 }
 
 /// The geometry of an edited text layer.
@@ -158,13 +791,17 @@ fn keeps_text_edit(p: PanelKind) -> bool {
 pub fn panel_clicked(app: &mut EffectcraftApp, ctx: &egui::Context, p: PanelKind) {
     if app.session.state.text_edit.is_some() && !keeps_text_edit(p) {
         exec(app, "text.endEdit", json!({}));
+        // `viewport_id()` takes the context's lock itself, so resolve it before entering
+        // `data_mut`; nesting the two calls deadlocks.
+        let viewport = ctx.viewport_id();
+        ctx.data_mut(|d| d.remove::<Preedit>(ime_preedit_id(viewport)));
         ctx.memory_mut(|m| m.surrender_focus(focus_id()));
     }
 }
 
 /// Typing merge key: consecutive keystrokes fold into one undo step until the caret moves.
 fn typing_key(ui: &egui::Ui, bump: bool) -> String {
-    let id = egui::Id::new("viewer-text-typing");
+    let id = typing_key_id(ui.ctx().viewport_id());
     let mut n: u64 = ui.data(|d| d.get_temp(id)).unwrap_or(0);
     if bump {
         n += 1;
@@ -173,6 +810,91 @@ fn typing_key(ui: &egui::Ui, bump: bool) -> String {
     format!("text-typing-{n}")
 }
 
+/// A press inside the edited text layer: grab a box handle, place the caret (shift extends from
+/// `shift_anchor`), or, outside the text, commit the edit. Returns the drag it starts, if any.
+fn press_on_edited(app: &mut EffectcraftApp, ui: &egui::Ui, map: &ViewerMap, e: &Edited, pos: Pos2, shift_anchor: Option<usize>) -> Option<Drag> {
+    if let Some(h) = e.handles().iter().position(|h| e.to_screen(map, *h).distance(pos) < 7.0) {
+        let b = e.doc.box_size.unwrap_or([0.0; 2]);
+        return Some(Drag::Resize { layer: e.layer.id, handle: h, start_box: [e.doc.box_pos[0], e.doc.box_pos[1], b[0], b[1]] });
+    }
+    if e.contains(map, pos) {
+        let ci = e.hit(map, pos);
+        exec(app, "text.setSelection", json!({"anchor": shift_anchor.unwrap_or(ci), "caret": ci}));
+        typing_key(ui, true);
+        return Some(Drag::Select { layer: e.layer.id });
+    }
+    // Clicking elsewhere commits the edit.
+    exec(app, "text.endEdit", json!({}));
+    None
+}
+
+/// A press with the Type tool that missed the edited text: edit the text layer under it, or
+/// start creating a new one.
+fn press_type_tool(app: &mut EffectcraftApp, ectx: &EvalCtx, map: &ViewerMap, pos: Pos2, tool: Tool) -> Drag {
+    if let Some(e) = text_layer_at(app, ectx, map, pos, true) {
+        let ci = e.hit(map, pos);
+        exec(app, "text.edit", json!({"layer": e.layer.id.0, "caret": ci}));
+        Drag::Select { layer: e.layer.id }
+    } else {
+        Drag::Create { start: map.to_comp(pos), vertical: tool == Tool::TypeVertical }
+    }
+}
+
+/// The paragraph box after dragging `handle` by (`dx`, `dy`) in layer space.
+fn resized_box(start_box: [f64; 4], handle: usize, dx: f64, dy: f64) -> [f64; 4] {
+    let [mut x0, mut y0, w, h] = start_box;
+    let (mut x1, mut y1) = (x0 + w, y0 + h);
+    if matches!(handle, 0 | 6 | 7) {
+        x0 += dx;
+    }
+    if matches!(handle, 2..=4) {
+        x1 += dx;
+    }
+    if matches!(handle, 0..=2) {
+        y0 += dy;
+    }
+    if matches!(handle, 4..=6) {
+        y1 += dy;
+    }
+    [x0.min(x1), y0.min(y1), (x1 - x0).abs().max(4.0), (y1 - y0).abs().max(4.0)]
+}
+
+/// Keyboard routing for the text editor: while a session is live, keep the focus on it and feed
+/// it this frame's keys; otherwise release the IME and the focus.
+fn keyboard_focus(app: &mut EffectcraftApp, ui: &mut egui::Ui, rect: Rect) {
+    if app.session.state.text_edit.is_some() && app.dialog.is_none() && ui.is_enabled() {
+        // Register after pointer handling so new edits take focus in this frame. An inactive
+        // editor must not take Tab focus and immediately surrender it before viewer controls.
+        ui.interact(Rect::from_min_size(rect.min, vec2(1.0, 1.0)), focus_id(), egui::Sense::focusable_noninteractive());
+        ui.memory_mut(|m| {
+            m.set_focus_lock_filter(focus_id(), egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, escape: true });
+        });
+        // A session started elsewhere (menu, agent, Properties) takes the keyboard once…
+        let seen = ime_seen_id(ui.ctx().viewport_id());
+        let key = app.session.state.text_edit.as_ref().map(|e| (e.layer.0, e.session));
+        // …and gets it back when a click in the viewer or a formatting panel left nothing holding
+        // it; not merely because nothing has the focus (#831).
+        let regain = ui.memory(|m| m.focused().is_none()) && keeps_text_edit(app.ui.focused);
+        if ui.data(|d| d.get_temp::<Option<(u64, u64)>>(seen)).flatten() != key || regain {
+            ui.data_mut(|d| d.insert_temp(seen, key));
+            ui.memory_mut(|m| m.request_focus(focus_id()));
+        }
+        if ui.memory(|m| m.has_focus(focus_id())) {
+            keyboard(app, ui, rect);
+        }
+    } else {
+        // Resolve the viewport before taking the data lock: `viewport_id()`
+        // acquires the same context lock that `data_mut` holds.
+        let viewport = ui.ctx().viewport_id();
+        ui.data_mut(|d| d.insert_temp::<Option<(u64, u64)>>(ime_seen_id(viewport), None));
+        invalidate_ime_composition(ui, app);
+        clear_preedit(ui);
+        if ui.memory(|m| m.has_focus(focus_id())) {
+            ui.memory_mut(|m| m.surrender_focus(focus_id()));
+        }
+    }
+}
+
 /// Viewer hook: draws the edit overlay and handles text pointer and keyboard input. Returns
 /// true when it owns this frame's pointer interaction (the viewer then skips its own gestures).
 pub fn hook(
@@ -186,7 +908,9 @@ pub fn hook(
 ) -> bool {
     let tool = app.ui.tool;
     let type_tool = matches!(tool, Tool::Type | Tool::TypeVertical);
-    let last_tool_id = egui::Id::new("viewer-text-last-tool");
+    sync_ime_target(ui, app);
+    sync_ime_selection(ui, app);
+    let last_tool_id = egui::Id::unique("viewer-text-last-tool");
     let last_tool = ui.data(|d| d.get_temp::<Tool>(last_tool_id));
     ui.data_mut(|d| d.insert_temp(last_tool_id, tool));
     if last_tool.is_some_and(|previous| matches!(previous, Tool::Type | Tool::TypeVertical) && !type_tool) {
@@ -204,9 +928,21 @@ pub fn hook(
     let mut owns = false;
     let mut drag: Option<Drag> = ui.data(|d| d.get_temp(drag_id()));
     let (pressed, down, released, mods) = ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_down(), i.pointer.primary_released(), i.modifiers));
-    let press = ui.input(|i| i.pointer.press_origin());
+    // The latest primary press of this frame. `press_origin` is already cleared when a press and
+    // release arrive in one frame; the input events retain the latest press even after release.
+    // An invalid latest press
+    // must not become an earlier click or a release-position click.
+    let press = ui.input(|i| {
+        let latest = i.events.iter().rev().find_map(|event| match event {
+            egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, .. } => Some(*pos),
+            _ => None,
+        });
+        match latest {
+            Some(pos) => pos.is_finite().then_some(pos),
+            None => i.pointer.press_origin().filter(|pos| pos.is_finite()),
+        }
+    });
     let pointer = ui.input(|i| i.pointer.interact_pos());
-    let handle_hit = |e: &Edited, s: Pos2| e.handles().iter().position(|h| e.to_screen(map, *h).distance(s) < 7.0);
 
     // ---- press
     if pressed
@@ -214,33 +950,18 @@ pub fn hook(
         && resp.hovered()
         && !matches!(tool, Tool::Hand | Tool::Zoom)
         && let Some(pos) = press
+        && resp.rect.intersect(ui.clip_rect()).contains(pos)
     {
         let mut handled = false;
         if let Some(e) = &cur {
-            if let Some(h) = handle_hit(e, pos) {
-                let b = e.doc.box_size.unwrap_or([0.0; 2]);
-                drag = Some(Drag::Resize { layer: e.layer.id, handle: h, start_box: [e.doc.box_pos[0], e.doc.box_pos[1], b[0], b[1]] });
+            let shift_anchor = if mods.shift { Some(editing.as_ref().map_or_else(|| e.hit(map, pos), |sel| sel.anchor)) } else { None };
+            if let Some(d) = press_on_edited(app, ui, map, e, pos, shift_anchor) {
+                drag = Some(d);
                 handled = true;
-            } else if e.contains(map, pos) {
-                let ci = e.hit(map, pos);
-                let anchor = if mods.shift { editing.as_ref().map_or(ci, |sel| sel.anchor) } else { ci };
-                exec(app, "text.setSelection", json!({"anchor": anchor, "caret": ci}));
-                typing_key(ui, true);
-                drag = Some(Drag::Select { layer: e.layer.id });
-                handled = true;
-            } else {
-                // Clicking elsewhere commits the edit.
-                exec(app, "text.endEdit", json!({}));
             }
         }
         if !handled && type_tool {
-            if let Some(e) = text_layer_at(app, ectx, map, pos, true) {
-                let ci = e.hit(map, pos);
-                exec(app, "text.edit", json!({"layer": e.layer.id.0, "caret": ci}));
-                drag = Some(Drag::Select { layer: e.layer.id });
-            } else {
-                drag = Some(Drag::Create { start: map.to_comp(pos), vertical: tool == Tool::TypeVertical });
-            }
+            drag = Some(press_type_tool(app, ectx, map, pos, tool));
             handled = true;
         }
         if handled {
@@ -295,22 +1016,7 @@ pub fn hook(
             {
                 let (px, py) = e.to_layer(map, p);
                 let (qx, qy) = e.to_layer(map, q);
-                let (dx, dy) = (px - qx, py - qy);
-                let [mut x0, mut y0, w, h] = start_box;
-                let (mut x1, mut y1) = (x0 + w, y0 + h);
-                if matches!(handle, 0 | 6 | 7) {
-                    x0 += dx;
-                }
-                if matches!(handle, 2..=4) {
-                    x1 += dx;
-                }
-                if matches!(handle, 0..=2) {
-                    y0 += dy;
-                }
-                if matches!(handle, 4..=6) {
-                    y1 += dy;
-                }
-                let bx = [x0.min(x1), y0.min(y1), (x1 - x0).abs().max(4.0), (y1 - y0).abs().max(4.0)];
+                let bx = resized_box(start_box, handle, px - qx, py - qy);
                 exec(app, "layer.setText", json!({"layer": layer.0, "box": bx, "merge": format!("text-box-{}", layer.0)}));
             }
         }
@@ -352,38 +1058,19 @@ pub fn hook(
     }
 
     // ---- keyboard
-    if app.session.state.text_edit.is_some() && app.dialog.is_none() && ui.is_enabled() {
-        // Register after pointer handling so new edits take focus in this frame. An inactive
-        // editor must not take Tab focus and immediately surrender it before viewer controls.
-        ui.interact(Rect::from_min_size(resp.rect.min, vec2(1.0, 1.0)), focus_id(), egui::Sense::focusable_noninteractive());
-        ui.memory_mut(|m| {
-            m.set_focus_lock_filter(focus_id(), egui::EventFilter { tab: true, horizontal_arrows: true, vertical_arrows: true, escape: true });
-        });
-        // A session started elsewhere (menu, agent, Properties) takes the keyboard once…
-        let seen = egui::Id::new("viewer-text-seen");
-        let key = app.session.state.text_edit.as_ref().map(|e| e.layer.0);
-        // …and gets it back when a click in the viewer or a formatting panel left nothing holding
-        // it; not merely because nothing has the focus (#831).
-        let regain = ui.memory(|m| m.focused().is_none()) && keeps_text_edit(app.ui.focused);
-        if ui.data(|d| d.get_temp::<Option<u64>>(seen)).flatten() != key || regain {
-            ui.data_mut(|d| d.insert_temp(seen, key));
-            ui.memory_mut(|m| m.request_focus(focus_id()));
-        }
-        if ui.memory(|m| m.has_focus(focus_id())) {
-            keyboard(app, ui, resp.rect);
-        }
-    } else {
-        ui.data_mut(|d| d.insert_temp::<Option<u64>>(egui::Id::new("viewer-text-seen"), None));
-        if ui.memory(|m| m.has_focus(focus_id())) {
-            ui.memory_mut(|m| m.surrender_focus(focus_id()));
-        }
-    }
+    // Pointer handling above may have started or switched a text target: leave the previous
+    // composition's identity as a stale guard before this pass's IME events are read.
+    sync_ime_target(ui, app);
+    sync_ime_selection(ui, app);
+    keyboard_focus(app, ui, resp.rect);
 
     // ---- overlay
     if let Some(s) = app.session.state.text_edit.clone()
         && let Some(e) = edited(app, ectx, s.layer)
     {
         draw(app, ui, painter, map, &e, s.range(), s.caret);
+        // `draw` records the caret geometry for this pass. The descriptor is published once at
+        // the end of the whole pass, after dock/script actions have had their say.
     }
     owns
 }
@@ -392,23 +1079,144 @@ pub fn hook(
 /// panel it lands in decides (after this frame's panels) whether the edit ends, so the keys after
 /// it in this frame are neither typed nor run as shortcuts (#831).
 fn keyboard(app: &mut EffectcraftApp, ui: &mut egui::Ui, viewer: Rect) {
+    let viewport = ui.ctx().viewport_id();
+    let frame = ui.ctx().cumulative_frame_nr_for(viewport);
+    let first = ui.data_mut(|data| {
+        if data.get_temp::<u64>(input_id(viewport)) == Some(frame) {
+            false
+        } else {
+            data.insert_temp(input_id(viewport), frame);
+            true
+        }
+    });
+    if !first {
+        return;
+    }
+    if !window_available(ui.ctx()) {
+        set_admission(ui.ctx(), false);
+        unavailable_controls(ui);
+        return;
+    }
+    set_admission(ui.ctx(), true);
+    sync_ime_selection(ui, app);
     let events = ui.input(|i| i.events.clone());
     let ctx = ui.ctx().clone();
+    // This clone is the exclusive ordered owner of controls. Removing only those controls from
+    // the shared vector does not acknowledge them or move them ahead of preceding mutations.
+    ctx.input_mut(|input| input.events.retain(|event| !matches!(event, egui::Event::ImeResetCompleted { .. })));
+    let mut custom_mutations = app.session.state.text_edit.is_some();
     for ev in events {
-        let Some(sel) = app.session.state.text_edit.clone() else { return };
-        match ev {
-            egui::Event::PointerButton { pos, pressed: true, .. } if !viewer.contains(pos) => return,
-            egui::Event::Text(t) if !t.chars().any(char::is_control) => {
-                let k = typing_key(ui, false);
-                exec(app, "text.insert", json!({"text": t, "merge": k}));
+        if let egui::Event::ImeResetCompleted { request_id } = &ev {
+            if custom_mutations {
+                complete_reset(app, ui, *request_id);
             }
-            egui::Event::Ime(egui::ImeEvent::Commit(t)) if !t.is_empty() => {
+            continue;
+        }
+        sync_ime_target(ui, app);
+        sync_ime_selection(ui, app);
+        if matches!(&ev, egui::Event::PointerButton { pos, pressed: true, .. } if !viewer.contains(*pos)) {
+            // The press already proves this custom route is leaving (or deferring to the panel
+            // that owns the click). Disable admission before invalidating, so retiring the old
+            // guard cannot put a new, undeliverable ID into core Memory. The finalizer allocates
+            // the one replacement only after it confirms this pass's actual custom output is
+            // eligible. A previously issued ID may still be queued in core (which has no cancel)
+            // and attach to a later stock field; the suspended local guard ignores its completion.
+            set_admission(&ctx, false);
+            invalidate_ime_composition(ui, app);
+            clear_preedit(ui);
+            suspend_reset(&ctx);
+            custom_mutations = false;
+            continue;
+        }
+        if !custom_mutations {
+            continue;
+        }
+        let Some(sel) = app.session.state.text_edit.clone() else {
+            suspend_reset(&ctx);
+            custom_mutations = false;
+            continue;
+        };
+        let owner = ImeOwner { layer: sel.layer, session: sel.session };
+        let from_ime = matches!(&ev, egui::Event::Ime(_));
+        match ev {
+            egui::Event::Text(t) if !t.chars().any(char::is_control) => {
+                clear_current_preedit(ui, owner);
                 let k = typing_key(ui, false);
-                exec(app, "text.insert", json!({"text": t, "merge": k}));
-                ui.data_mut(|d| d.remove::<String>(egui::Id::new("viewer-text-preedit")));
+                let before = ime_stamp(app, &ctx);
+                if exec(app, "text.insert", json!({"text": t, "merge": k})).is_some() {
+                    note_ime_application_edit(app, &ctx, before);
+                }
+            }
+            egui::Event::Ime(egui::ImeEvent::Commit(t)) => {
+                // Old terminal payloads cannot acknowledge the request or admit a later suffix.
+                if ime_event_is_stale(ui, owner) {
+                    continue;
+                }
+                // An accepted commit is the terminal event of its composition (or a direct commit
+                // that never had a pre-edit).
+                set_ime_composition(ui, None);
+                // An empty commit (the tail of a deletion-only batch) changes no text, so it earns
+                // no receipt; it still ends the composed preview.
+                if !t.is_empty() {
+                    let k = typing_key(ui, false);
+                    // The receipt covers only this accepted insertion: AutoCorrect and every
+                    // other application transformation stays outside it.
+                    let before = ime_stamp(app, &ctx);
+                    if exec(app, "text.insert", json!({"text": t, "merge": k})).is_some() {
+                        let after = ime_stamp(app, &ctx);
+                        note_ime_receipt(app, &ctx, before, after);
+                    }
+                }
+                clear_preedit(ui);
             }
             egui::Event::Ime(egui::ImeEvent::Preedit { text, .. }) => {
-                ui.data_mut(|d| d.insert_temp(egui::Id::new("viewer-text-preedit"), text));
+                if text.is_empty() {
+                    // An empty pre-edit only clears the visible composition. Keep its owner as
+                    // terminal-pending: the commit/delete for this composition is a separate
+                    // event and a target switch must reject it. Only the matching fence can
+                    // lift an already interrupted guard.
+                    if !ime_event_is_stale(ui, owner) {
+                        set_ime_composition(ui, Some(ImeComposition::TerminalPending(owner)));
+                    }
+                    clear_preedit(ui);
+                } else if ime_event_is_stale(ui, owner) {
+                    // This pre-edit belongs to the composition whose target was replaced; an
+                    // input method can emit further non-empty pre-edits before its final commit.
+                    // Do not revive the old composition on the replacement target, and keep the
+                    // tombstone past this batch: the old composition may commit in a later frame.
+                    set_ime_composition(ui, Some(ImeComposition::Stale));
+                } else {
+                    set_ime_composition(ui, Some(ImeComposition::Active(owner)));
+                    ui.data_mut(|d| d.insert_temp(ime_preedit_id(viewport), Preedit { owner, text: bounded_preedit(text) }));
+                }
+            }
+            // An input method replacing text around the selection (W26/W27 `Done` batches on
+            // Wayland/Windows, E21): delete exactly the reported characters/bytes. The commit
+            // that follows shares this typing key, so replacement stays one undo step.
+            egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars, after_chars }) => {
+                if ime_event_is_stale(ui, owner) {
+                    // A delete-surrounding is not terminal by itself: its paired commit/text
+                    // follows in the same composition. Its delete and commit stay rejected
+                    // until the request-bound completion.
+                    continue;
+                }
+                let before = ime_stamp(app, &ctx);
+                if ime_delete(app, ui, before_chars, after_chars, false) {
+                    let after = ime_stamp(app, &ctx);
+                    note_ime_receipt(app, &ctx, before, after);
+                }
+            }
+            egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes, after_bytes }) => {
+                if ime_event_is_stale(ui, owner) {
+                    // Its paired commit/text still belongs to the replaced composition; keep the
+                    // guard until the actual matching completion.
+                    continue;
+                }
+                let before = ime_stamp(app, &ctx);
+                if ime_delete(app, ui, before_bytes, after_bytes, true) {
+                    let after = ime_stamp(app, &ctx);
+                    note_ime_receipt(app, &ctx, before, after);
+                }
             }
             egui::Event::Copy => {
                 if let Some(v) = exec(app, "edit.copy", json!({}))
@@ -418,98 +1226,175 @@ fn keyboard(app: &mut EffectcraftApp, ui: &mut egui::Ui, viewer: Rect) {
                 }
             }
             egui::Event::Cut => {
+                let before = ime_stamp(app, &ctx);
                 if let Some(v) = exec(app, "edit.cut", json!({}))
                     && let Some(t) = v["text"].as_str()
                 {
                     ctx.copy_text(t.to_string());
+                    note_ime_application_edit(app, &ctx, before);
                 }
                 typing_key(ui, true);
             }
             egui::Event::Paste(t) => {
-                exec(app, "edit.paste", json!({"text": t}));
+                let before = ime_stamp(app, &ctx);
+                if exec(app, "edit.paste", json!({"text": t})).is_some() {
+                    note_ime_application_edit(app, &ctx, before);
+                }
                 typing_key(ui, true);
             }
-            egui::Event::Key { key, pressed: true, modifiers: m, .. } => {
-                use egui::Key;
-                let cmd = m.command;
-                let mv = |app: &mut EffectcraftApp, to: &str| {
-                    exec(app, "text.moveCaret", json!({"to": to, "extend": m.shift}));
-                };
-                match key {
-                    Key::ArrowLeft | Key::ArrowRight if m.alt => {
-                        // Kerning at the caret, tracking over a selection.
-                        let step = if cmd { 100.0 } else { 20.0 } * if key == Key::ArrowLeft { -1.0 } else { 1.0 };
-                        let doc = layer_doc(&app.session, sel.layer).unwrap_or_default();
-                        if sel.is_empty() {
-                            if sel.caret < doc.char_len() {
-                                let cur = match doc.style_at(sel.caret).kerning {
-                                    Kerning::Manual(v) => v,
-                                    _ => 0.0,
-                                };
-                                exec(
-                                    app,
-                                    "layer.setText",
-                                    json!({"layer": sel.layer.0, "range": [sel.caret, sel.caret + 1], "kerning": cur + step, "merge": format!("text-kern-{}", sel.caret)}),
-                                );
-                            }
-                        } else {
-                            let r = sel.range();
-                            let cur = doc.style_at(r.start).tracking;
-                            exec(app, "layer.setText", json!({"layer": sel.layer.0, "range": [r.start, r.end], "tracking": cur + step, "merge": "text-track"}));
-                        }
-                    }
-                    Key::ArrowLeft => mv(app, if cmd { "wordLeft" } else { "left" }),
-                    Key::ArrowRight => mv(app, if cmd { "wordRight" } else { "right" }),
-                    Key::ArrowUp => mv(app, if cmd { "paraUp" } else { "up" }),
-                    Key::ArrowDown => mv(app, if cmd { "paraDown" } else { "down" }),
-                    Key::Home => mv(app, if cmd { "start" } else { "lineStart" }),
-                    Key::End => mv(app, if cmd { "end" } else { "lineEnd" }),
-                    Key::Backspace => {
-                        let k = typing_key(ui, false);
-                        exec(app, "text.delete", json!({"word": cmd || m.alt, "merge": k}));
-                    }
-                    Key::Delete => {
-                        let k = typing_key(ui, false);
-                        exec(app, "text.delete", json!({"direction": "forward", "word": cmd || m.alt, "merge": k}));
-                    }
-                    Key::Enter if cmd => {
-                        exec(app, "text.endEdit", json!({}));
-                    }
-                    Key::Enter => {
-                        let k = typing_key(ui, false);
-                        exec(app, "text.insert", json!({"text": "\n", "merge": k}));
-                    }
-                    Key::Tab => {
-                        let k = typing_key(ui, false);
-                        exec(app, "text.insert", json!({"text": "\t", "merge": k}));
-                    }
-                    Key::Escape => {
-                        exec(app, "text.endEdit", json!({}));
-                    }
-                    Key::A if cmd => {
-                        exec(app, "text.setSelection", json!({"select": "all"}));
-                    }
-                    Key::Z if cmd => {
-                        let _ = crate::menus::invoke(app, &ctx, if m.shift { "edit.redo" } else { "edit.undo" }, json!({}));
-                    }
-                    Key::Comma | Key::Period if cmd && m.shift => {
-                        let doc = layer_doc(&app.session, sel.layer).unwrap_or_default();
-                        let r = sel.range();
-                        let size = sel.pending.as_ref().map_or_else(|| doc.style_at(r.start).size, |p| p.size);
-                        let ns = (size + if key == Key::Period { 2.0 } else { -2.0 }).max(1.0);
-                        exec(app, "layer.setText", json!({"layer": sel.layer.0, "range": [r.start, r.end], "size": ns}));
-                    }
-                    _ => {}
-                }
-                if !matches!(key, Key::Backspace | Key::Delete | Key::Enter | Key::Tab) {
-                    typing_key(ui, true);
-                }
-            }
+            egui::Event::Key { key, pressed: true, modifiers: m, .. } => key_event(app, ui, &ctx, &sel, key, m),
             _ => {}
         }
+        let route_ended = app.session.state.text_edit.is_none() || app.dialog.is_some();
+        if route_ended {
+            set_admission(&ctx, false);
+        }
+        if from_ime {
+            remember_ime_selection(ui, app);
+        } else {
+            // Arrow/Home/End/Select All (or another application event) may have moved the
+            // selection before a queued IME delete/commit later in this same raw batch.
+            sync_ime_selection(ui, app);
+        }
+        if route_ended {
+            suspend_reset(&ctx);
+            custom_mutations = false;
+        }
     }
 }
 
+/// An application key press in the edited text: caret moves, deletes, insertions, formatting and
+/// the editor's own chords.
+fn key_event(
+    app: &mut EffectcraftApp,
+    ui: &egui::Ui,
+    ctx: &egui::Context,
+    sel: &effectcraft_engine::commands::text_edit::TextEdit,
+    key: egui::Key,
+    m: egui::Modifiers,
+) {
+    use egui::Key;
+    let cmd = m.command;
+    let mv = |app: &mut EffectcraftApp, to: &str| {
+        exec(app, "text.moveCaret", json!({"to": to, "extend": m.shift}));
+    };
+    match key {
+        Key::ArrowLeft | Key::ArrowRight if m.alt => {
+            // Kerning at the caret, tracking over a selection.
+            let step = if cmd { 100.0 } else { 20.0 } * if key == Key::ArrowLeft { -1.0 } else { 1.0 };
+            let doc = layer_doc(&app.session, sel.layer).unwrap_or_default();
+            if sel.is_empty() {
+                if sel.caret < doc.char_len() {
+                    let cur = match doc.style_at(sel.caret).kerning {
+                        Kerning::Manual(v) => v,
+                        _ => 0.0,
+                    };
+                    exec(
+                        app,
+                        "layer.setText",
+                        json!({"layer": sel.layer.0, "range": [sel.caret, sel.caret + 1], "kerning": cur + step, "merge": format!("text-kern-{}", sel.caret)}),
+                    );
+                }
+            } else {
+                let r = sel.range();
+                let cur = doc.style_at(r.start).tracking;
+                exec(app, "layer.setText", json!({"layer": sel.layer.0, "range": [r.start, r.end], "tracking": cur + step, "merge": "text-track"}));
+            }
+        }
+        Key::ArrowLeft => mv(app, if cmd { "wordLeft" } else { "left" }),
+        Key::ArrowRight => mv(app, if cmd { "wordRight" } else { "right" }),
+        Key::ArrowUp => mv(app, if cmd { "paraUp" } else { "up" }),
+        Key::ArrowDown => mv(app, if cmd { "paraDown" } else { "down" }),
+        Key::Home => mv(app, if cmd { "start" } else { "lineStart" }),
+        Key::End => mv(app, if cmd { "end" } else { "lineEnd" }),
+        Key::Backspace => {
+            let k = typing_key(ui, false);
+            let before = ime_stamp(app, ctx);
+            if exec(app, "text.delete", json!({"word": cmd || m.alt, "merge": k})).is_some() {
+                note_ime_application_edit(app, ctx, before);
+            }
+        }
+        Key::Delete => {
+            let k = typing_key(ui, false);
+            let before = ime_stamp(app, ctx);
+            if exec(app, "text.delete", json!({"direction": "forward", "word": cmd || m.alt, "merge": k})).is_some() {
+                note_ime_application_edit(app, ctx, before);
+            }
+        }
+        Key::Enter if cmd => {
+            exec(app, "text.endEdit", json!({}));
+        }
+        Key::Enter => {
+            let k = typing_key(ui, false);
+            let before = ime_stamp(app, ctx);
+            if exec(app, "text.insert", json!({"text": "\n", "merge": k})).is_some() {
+                note_ime_application_edit(app, ctx, before);
+            }
+        }
+        Key::Tab => {
+            let k = typing_key(ui, false);
+            let before = ime_stamp(app, ctx);
+            if exec(app, "text.insert", json!({"text": "\t", "merge": k})).is_some() {
+                note_ime_application_edit(app, ctx, before);
+            }
+        }
+        Key::Escape => {
+            exec(app, "text.endEdit", json!({}));
+        }
+        // The editor owns exactly Cmd/Ctrl+A (Select All) and Cmd/Ctrl+Z with or
+        // without Shift (Undo, Redo). Other modifiers on those keys aren't editing
+        // chords, so they fall through to the binding match below: Shift+A is
+        // Deselect All's default, and Alt variants are free for a rebound one.
+        Key::A if cmd && !m.shift && !m.alt => {
+            exec(app, "text.setSelection", json!({"select": "all"}));
+        }
+        Key::Z if cmd && !m.alt => {
+            let before = ime_stamp(app, ctx);
+            if crate::menus::invoke(app, ctx, if m.shift { "edit.redo" } else { "edit.undo" }, json!({})).is_ok() {
+                note_ime_application_edit(app, ctx, before);
+            }
+        }
+        Key::Comma | Key::Period if cmd && m.shift => {
+            let doc = layer_doc(&app.session, sel.layer).unwrap_or_default();
+            let r = sel.range();
+            let size = sel.pending.as_ref().map_or_else(|| doc.style_at(r.start).size, |p| p.size);
+            let ns = (size + if key == Key::Period { 2.0 } else { -2.0 }).max(1.0);
+            exec(app, "layer.setText", json!({"layer": sel.layer.0, "range": [r.start, r.end], "size": ns}));
+        }
+        // The app-wide shortcut dispatcher is skipped while this editor holds the
+        // keyboard, so the Deselect All chord (Cmd/Ctrl+Shift+A or F2 by default)
+        // must be matched here and run through the command dispatcher like undo
+        // above. Matching the command's current binding, not a fixed key, keeps
+        // rebound shortcuts working and gives every route one final state; the
+        // forwarding test also refuses chords a focused editor must never surrender
+        // (see `forwardable_during_text_edit`).
+        _ if crate::menus::chord_matches(&app.session, "edit.deselectAll", key, m) && crate::menus::forwardable_during_text_edit(m, key) => {
+            let _ = crate::menus::invoke(app, ctx, "edit.deselectAll", json!({}));
+        }
+        _ => {}
+    }
+    if !matches!(key, Key::Backspace | Key::Delete | Key::Enter | Key::Tab) {
+        typing_key(ui, true);
+    }
+}
+
+/// Delete the text an IME marks for replacement around the editor's selection.
+///
+/// `before`/`after` count UTF-8 bytes (`DeleteSurroundingBytes`, what winit reports) or
+/// characters (`DeleteSurrounding`). The engine command keeps the selected text — the following
+/// `Commit` replaces it — and leaves a character a byte count only partly covers; the deletion
+/// and the commit share this typing key, so a replacement stays one undo step.
+fn ime_delete(app: &mut EffectcraftApp, ui: &egui::Ui, before: usize, after: usize, bytes: bool) -> bool {
+    if (before == 0 && after == 0) || app.session.state.text_edit.is_none() {
+        return false;
+    }
+    let k = typing_key(ui, false);
+    exec(app, "text.deleteSurrounding", json!({"before": before, "after": after, "bytes": bytes, "merge": k})).is_some()
+}
+
+/// Paint the paragraph box and handles, selection, caret or pre-edit for `e`; register the editor's and box handles'
+/// automation regions; request the caret-blink repaint; and record the pass's text and caret rectangles for the IME
+/// finalizer.
 fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, painter: &egui::Painter, map: &ViewerMap, e: &Edited, sel: std::ops::Range<usize>, caret: usize) {
     let t = app.tokens;
     let to_s = |p: Point| e.to_screen(map, (p.x, p.y));
@@ -545,8 +1430,8 @@ fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, painter: &egui::Painter, ma
     let (a, b) = (anim(a), anim(b));
     let (sa, sb) = (to_s(a), to_s(b));
     let now = ui.input(|i| i.time);
-    let preedit: Option<String> = ui.data(|d| d.get_temp(egui::Id::new("viewer-text-preedit")));
-    if let Some(pe) = preedit.filter(|s| !s.is_empty()) {
+    let preedit = visible_preedit(ui, app);
+    if let Some(pe) = preedit {
         let h = (sb - sa).length().max(10.0);
         let g = painter.layout_no_wrap(pe, egui::FontId::proportional(h * 0.7), Color32::WHITE);
         let r = Rect::from_min_size(sa, g.size());
@@ -564,7 +1449,13 @@ fn draw(app: &mut EffectcraftApp, ui: &mut egui::Ui, painter: &egui::Painter, ma
     let rect = Rect::from_points(&quad);
     app.auto.add("viewer.textEdit", rect, &format!("Editing {}", e.layer.name));
     let cursor_rect = Rect::from_two_pos(sa, sb).expand2(vec2(1.0, 0.0));
-    ui.ctx().output_mut(|o| {
-        o.ime = Some(egui::output::IMEOutput { purpose: egui::IMEPurpose::Normal, rect, cursor_rect, should_interrupt_composition: false });
-    });
+    // The viewport IME publisher uses this actual
+    // caret geometry and the edited layer's committed `TextDoc` (never the bidi or pre-edit
+    // display text). An available-empty document stays distinct from unavailable.
+    let viewport = ui.ctx().viewport_id();
+    let pass = ui.ctx().cumulative_pass_nr_for(viewport);
+    ui.data_mut(|d| d.insert_temp(ime_geometry_id(viewport), (pass, rect, cursor_rect)));
 }
+
+#[cfg(test)]
+mod tests;
diff --git a/crates/ui-egui/src/panels/viewer_text/tests.rs b/crates/ui-egui/src/panels/viewer_text/tests.rs
new file mode 100644
index 000000000..be3e84b2c
--- /dev/null
+++ b/crates/ui-egui/src/panels/viewer_text/tests.rs
@@ -0,0 +1,812 @@
+//! Incoming IME edits on the custom text editor (the Type tool's own session, not a stock
+//! `TextEdit`). Winit reports the bytes around the selection *before* the commit it belongs
+//! to, so the deletion and the insert must share one undo step.
+
+use super::*;
+use effectcraft_engine::Session;
+use effectcraft_engine::commands::text_edit::TextEdit;
+use serde_json::json;
+
+fn editor(text: &str, anchor: usize, caret: usize) -> (EffectcraftApp, LayerId) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "IME", "width": 160, "height": 90, "duration": 1})).unwrap();
+    let layer = s.execute("layer.newText", json!({"text": text})).unwrap()["layer"].as_u64().unwrap();
+    let lid = LayerId(layer);
+    s.state.text_edit = Some(TextEdit { layer: lid, anchor, caret, ..Default::default() });
+    (EffectcraftApp::new(s), lid)
+}
+
+fn doc_text(app: &EffectcraftApp, lid: LayerId) -> String {
+    layer_doc(&app.session, lid).map(|d| d.text).unwrap_or_default()
+}
+
+fn feed(app: &mut EffectcraftApp, events: Vec<egui::Event>) {
+    let ctx = egui::Context::default();
+    let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(320.0, 180.0))), events, ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| keyboard(app, ui, egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(320.0, 180.0))));
+    out.textures_delta.clear();
+}
+
+#[test]
+fn preedit_preview_is_bounded_on_a_character_boundary() {
+    let text = "é".repeat(MAX_IME_TEXT_BYTES);
+    let capped = bounded_preedit(text);
+    assert!(capped.len() <= MAX_IME_TEXT_BYTES);
+    assert!(capped.is_char_boundary(capped.len()));
+    assert_eq!(capped.len() % "é".len(), 0, "the cap never leaves half a character");
+}
+
+/// Ending the edit from another panel clears this viewport's pre-edit. The production path
+/// used to resolve `viewport_id()` (a context read lock) inside `data_mut` (a write lock);
+/// that nested context access deadlocked every pass that drew the viewer.
+#[test]
+fn ending_an_edit_from_another_panel_clears_the_preedit() {
+    let (mut app, lid) = editor("abc", 0, 0);
+    let session = app.session.state.text_edit.as_ref().map_or(1, |e| e.session);
+    let ctx = egui::Context::default();
+    let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+        let viewport = ui.ctx().viewport_id();
+        let preedit = Preedit { owner: ImeOwner { layer: lid, session }, text: "x".into() };
+        ui.data_mut(|d| d.insert_temp(ime_preedit_id(viewport), preedit));
+        panel_clicked(&mut app, ui.ctx(), PanelKind::Timeline);
+        let viewport = ui.ctx().viewport_id();
+        assert!(ui.data(|d| d.get_temp::<Preedit>(ime_preedit_id(viewport))).is_none(), "the ended edit leaves no preview behind");
+    });
+    out.textures_delta.clear();
+    assert!(app.session.state.text_edit.is_none(), "a click in the Timeline ends the text edit");
+}
+
+#[test]
+fn ime_delete_surrounding_bytes_and_the_commit_are_one_undo_step() {
+    // "café😀": the last character is four bytes, so a byte-count deletion that treated bytes
+    // as characters would corrupt the document.
+    let (mut app, lid) = editor("café😀", 5, 5);
+    feed(
+        &mut app,
+        vec![
+            egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 4, after_bytes: 0 }),
+            egui::Event::Ime(egui::ImeEvent::Commit("X".into())),
+        ],
+    );
+    assert_eq!(doc_text(&app, lid), "caféX", "the emoji is replaced by the committed text");
+    app.session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc_text(&app, lid), "café😀", "the replacement is one undo step");
+}
+
+#[test]
+fn ime_delete_surrounding_chars_keeps_the_selection_for_the_commit() {
+    // Stock egui deletes the characters around the selection, not the selection itself: the
+    // commit that follows replaces "bcd", it does not insert next to a deleted document.
+    let (mut app, lid) = editor("abcdef", 1, 4);
+    feed(&mut app, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 99 })]);
+    assert_eq!(doc_text(&app, lid), "bcd", "one character before and everything after go");
+    let sel = app.session.state.text_edit.clone().expect("editing continues");
+    assert_eq!(sel.range(), 0..3, "the selected text is still selected");
+    // A deletion-only batch (no commit) leaves "bcd", not an empty document.
+    app.session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc_text(&app, lid), "abcdef", "clamped deletion is still one undo step");
+
+    // Delete surround + commit: the commit replaces the kept selection.
+    let (mut app, lid) = editor("abcdef", 1, 4);
+    feed(
+        &mut app,
+        vec![egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 99 }), egui::Event::Ime(egui::ImeEvent::Commit("XY".into()))],
+    );
+    assert_eq!(doc_text(&app, lid), "XY", "the commit replaces the selection");
+    app.session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc_text(&app, lid), "abcdef", "the deletion and its commit are one undo step");
+}
+
+/// One UI pass with the editor focused, events applied, and the overlay's observation.
+struct ImePass {
+    ctx: egui::Context,
+    viewport: egui::ViewportId,
+    rect: egui::Rect,
+}
+
+impl ImePass {
+    fn new(viewport: egui::ViewportId) -> Self {
+        let ctx = egui::Context::default();
+        install_hooks(&ctx);
+        Self { ctx, viewport, rect: egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(320.0, 180.0)) }
+    }
+
+    /// Run one `Context` frame. `overlay` is false for a pass in which the viewer (and so
+    /// the edit overlay) never drew; `discard` forces a second pass of the same frame.
+    fn frame(&mut self, app: &mut EffectcraftApp, events: Vec<egui::Event>, overlay: bool, discard: bool) -> Option<egui::output::IMEOutput> {
+        let ctx = self.ctx.clone();
+        let rect = self.rect;
+        let viewport = self.viewport;
+        let mut viewports = egui::ViewportIdMap::default();
+        viewports.insert(self.viewport, egui::ViewportInfo::default());
+        let raw = egui::RawInput { viewport_id: self.viewport, viewports, screen_rect: Some(rect), events, ..Default::default() };
+        let mut asked = false;
+        let mut out = ctx.run_ui(raw, |ui| {
+            begin_ui(ui.ctx());
+            ui.interact(rect, focus_id(), egui::Sense::focusable_noninteractive());
+            ui.memory_mut(|m| m.request_focus(focus_id()));
+            sync_ime_target(ui, app);
+            keyboard(app, ui, rect);
+            if overlay {
+                let pass = ui.ctx().cumulative_pass_nr_for(viewport);
+                ui.data_mut(|d| d.insert_temp(ime_geometry_id(viewport), (pass, rect, rect)));
+            }
+            finish_ime(app, ui);
+            if discard && !asked {
+                asked = true;
+                ui.ctx().request_discard("ime pass test");
+            }
+        });
+        out.textures_delta.clear();
+        out.platform_output.ime
+    }
+}
+
+/// One native floating window holding the Timeline's group and then the Viewer's.
+fn two_group_window() -> craft_ui::docking::Floating<PanelKind> {
+    let groups = vec![craft_ui::docking::Group::new(vec![PanelKind::Timeline], 0), craft_ui::docking::Group::new(vec![PanelKind::Viewer(1)], 0)];
+    craft_ui::docking::Floating::stack(groups, [0.0, 0.0, 320.0, 360.0]).expect("two groups make a window")
+}
+
+impl ImePass {
+    /// One pass of a native window with a body that edits no text and the Viewer's editor,
+    /// in the order given, publishing as `NativeIme` decides or, with `every`, after each
+    /// body. Returns the descriptor and the preedit the pass ended with.
+    fn window(
+        &mut self,
+        app: &mut EffectcraftApp,
+        window: &craft_ui::docking::Floating<PanelKind>,
+        events: Vec<egui::Event>,
+        viewer_first: bool,
+        every: bool,
+    ) -> (Option<egui::output::IMEOutput>, Option<String>) {
+        let ctx = self.ctx.clone();
+        let (rect, viewport) = (self.rect, self.viewport);
+        let mut viewports = egui::ViewportIdMap::default();
+        viewports.insert(viewport, egui::ViewportInfo::default());
+        let raw = egui::RawInput { viewport_id: viewport, viewports, screen_rect: Some(rect), events, ..Default::default() };
+        let mut preedit = None;
+        let mut out = ctx.run_ui(raw, |ui| {
+            let mut ime = crate::dock_ui::NativeIme::new(std::slice::from_ref(window), &[]);
+            let order = if viewer_first { [true, false] } else { [false, true] };
+            for viewer in order {
+                if ime.begin_body(viewport) {
+                    begin_ui(ui.ctx());
+                }
+                if viewer {
+                    ui.interact(rect, focus_id(), egui::Sense::focusable_noninteractive());
+                    ui.memory_mut(|m| m.request_focus(focus_id()));
+                    sync_ime_target(ui, app);
+                    keyboard(app, ui, rect);
+                    let pass = ui.ctx().cumulative_pass_nr_for(viewport);
+                    ui.data_mut(|d| d.insert_temp(ime_geometry_id(viewport), (pass, rect, rect)));
+                }
+                if ime.publishes(viewport, ime_recorded(ui.ctx())) || every {
+                    finish_ime(app, ui);
+                }
+            }
+            assert!(ime.unpublished().is_empty(), "the window published");
+            preedit = read_preedit(ui).map(|p| p.text);
+        });
+        out.textures_delta.clear();
+        (out.platform_output.ime, preedit)
+    }
+}
+
+#[test]
+fn native_window_with_a_group_before_the_viewer_keeps_the_composition() {
+    let window = two_group_window();
+    let viewport = craft_ui::docking::DockArea::<PanelKind>::window_viewport(crate::dock_ui::area_id(), window.id);
+    let preview = || egui::Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None });
+    for viewer_first in [false, true] {
+        let (mut app, _) = editor("abcd", 4, 4);
+        let mut pass = ImePass::new(viewport);
+        let (first, preedit) = pass.window(&mut app, &window, vec![preview()], viewer_first, false);
+        let first = first.expect("the editor publishes");
+        assert_eq!(preedit.as_deref(), Some("é"));
+        for _ in 0..2 {
+            let (ime, preedit) = pass.window(&mut app, &window, vec![], viewer_first, false);
+            let ime = ime.expect("the editor keeps publishing");
+            assert!(!ime.should_interrupt_composition, "viewer first: {viewer_first}");
+            assert_eq!((ime.owner, ime.context_generation), (first.owner, first.context_generation), "the same IME context");
+            assert_eq!(preedit.as_deref(), Some("é"), "the preedit survives the other body");
+        }
+    }
+    // Publishing after the body drawn before the Viewer clears the preedit and interrupts.
+    let (mut app, _) = editor("abcd", 4, 4);
+    let mut pass = ImePass::new(viewport);
+    pass.window(&mut app, &window, vec![preview()], false, true);
+    let (ime, preedit) = pass.window(&mut app, &window, vec![], false, true);
+    assert!(ime.expect("the editor publishes").should_interrupt_composition);
+    assert_eq!(preedit, None);
+    // A window that drew fewer bodies than its layout counts publishes after every body in
+    // its next pass.
+    let mut ime = crate::dock_ui::NativeIme::new(std::slice::from_ref(&window), &[]);
+    ime.begin_body(viewport);
+    assert!(!ime.publishes(viewport, false));
+    let unpublished = ime.unpublished();
+    assert_eq!(unpublished, vec![viewport]);
+    let mut ime = crate::dock_ui::NativeIme::new(std::slice::from_ref(&window), &unpublished);
+    ime.begin_body(viewport);
+    assert!(ime.publishes(viewport, false));
+}
+
+fn ime_text(ime: &egui::output::IMEOutput) -> (&str, usize, usize) {
+    let p = ime.surrounding_text.available().expect("committed surrounding text");
+    (p.text.as_str(), p.cursor, p.anchor)
+}
+
+#[test]
+fn discarded_custom_request_then_home_rearms_the_identical_caret() {
+    let (mut app, lid) = editor("abcd", 4, 4);
+    app.ui.start_screen = false;
+    app.ui.tool = Tool::Type;
+    app.ui.focused = PanelKind::Composition;
+    let ctx = egui::Context::default();
+    install_hooks(&ctx);
+    let mut frame = eframe::Frame::_new_kittest();
+    let raw = || egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1200.0, 800.0))), ..Default::default() };
+    for _ in 0..3 {
+        let mut output = ctx.run_ui(raw(), |ui| {
+            eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+            app.draw(ui, &frame);
+        });
+        output.textures_delta.clear();
+    }
+    let mut input = raw();
+    input.events.push(egui::Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    let mut output = ctx.run_ui(input, |ui| {
+        eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+        app.draw(ui, &frame);
+    });
+    output.textures_delta.clear();
+    assert!(output.platform_output.ime.is_some());
+    app.session.execute("text.setSelection", json!({"caret": 1})).unwrap();
+    let selection = app.session.state.text_edit.clone();
+    let mut passes = 0;
+    let mut discarded = None;
+    let mut output = ctx.run_ui(raw(), |ui| {
+        passes += 1;
+        if passes > 1 {
+            app.ui.start_screen = true;
+        }
+        eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+        app.draw(ui, &frame);
+        if passes == 1 {
+            assert!(ui.ctx().output(|output| output.ime.is_some()));
+            discarded = read_reset(ui.ctx()).and_then(|guard| guard.request);
+            ui.ctx().request_discard("custom IME descriptor discarded before Home");
+        }
+    });
+    output.textures_delta.clear();
+    assert!(passes >= 2);
+    let first = discarded.expect("the actual discarded custom pass requested a fence");
+    assert!(output.platform_output.ime.is_none());
+    assert!(read_reset(&ctx).unwrap().suspended);
+    assert!(read_reset(&ctx).unwrap().request.is_none());
+    assert_eq!(app.session.state.text_edit, selection, "Home did not move the model caret");
+    app.ui.start_screen = false;
+    let mut output = ctx.run_ui(raw(), |ui| {
+        eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+        app.draw(ui, &frame);
+    });
+    output.textures_delta.clear();
+    let second = output.platform_output.ime.unwrap().reset_request.expect("same caret reactivation publishes a new real ID");
+    assert_ne!(first, second);
+    let mut output = ctx.run_ui(raw(), |ui| {
+        eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+        app.draw(ui, &frame);
+    });
+    output.textures_delta.clear();
+    assert!(output.platform_output.ime.unwrap().reset_request.is_none());
+    let mut input = raw();
+    input.events.extend([
+        egui::Event::ImeResetCompleted { request_id: first },
+        egui::Event::Ime(egui::ImeEvent::Commit("X".into())),
+        egui::Event::ImeResetCompleted { request_id: second },
+        egui::Event::Ime(egui::ImeEvent::Preedit { text: "が".into(), active_range_chars: None }),
+        egui::Event::Ime(egui::ImeEvent::Commit("が".into())),
+    ]);
+    let mut output = ctx.run_ui(input, |ui| {
+        eframe::App::logic(&mut app, ui.ctx(), &mut frame);
+        app.draw(ui, &frame);
+    });
+    output.textures_delta.clear();
+    assert_eq!(doc_text(&app, lid), "aがbcd");
+}
+
+#[test]
+fn viewport_fences_and_duplicate_completion_keep_their_exact_lifetime() {
+    let (mut app, lid) = editor("abcd", 4, 4);
+    let mut root = ImePass::new(egui::ViewportId::ROOT);
+    let mut detached = ImePass::new(egui::ViewportId::from_hash_of("effect-ime-detached"));
+    let preview = || egui::Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None });
+    root.frame(&mut app, vec![preview()], true, false);
+    detached.frame(&mut app, vec![preview()], true, false);
+    app.session.execute("text.setSelection", json!({"caret": 1})).unwrap();
+    let first = root.frame(&mut app, vec![], true, false).unwrap().reset_request.unwrap();
+    let second = detached.frame(&mut app, vec![], true, false).unwrap().reset_request.unwrap();
+    assert_ne!(first, second);
+    detached.frame(&mut app, vec![egui::Event::ImeResetCompleted { request_id: first }, egui::Event::Ime(egui::ImeEvent::Commit("X".into()))], true, false);
+    assert_eq!(doc_text(&app, lid), "abcd");
+    let pending = detached.ctx.data(|data| data.get_temp::<ResetGuard>(reset_id(detached.viewport))).unwrap().request;
+    assert_eq!(pending, Some(second), "a root marker cannot release the detached viewport's full ID");
+    let output = detached
+        .frame(
+            &mut app,
+            vec![
+                egui::Event::ImeResetCompleted { request_id: second },
+                preview(),
+                egui::Event::ImeResetCompleted { request_id: second },
+                egui::Event::Ime(egui::ImeEvent::Commit("が".into())),
+            ],
+            true,
+            false,
+        )
+        .unwrap();
+    assert_eq!(doc_text(&app, lid), "aがbcd");
+    assert!(output.reset_request.is_none(), "a duplicate control cannot reconstruct the cleared guard");
+    // An actual context-generation change at unchanged selection still supersedes a wait.
+    root.frame(&mut app, vec![], true, false);
+    let replaced = root.frame(&mut app, vec![], false, false);
+    assert!(replaced.is_none());
+    let replacement = root.frame(&mut app, vec![], true, false).unwrap().reset_request.unwrap();
+    assert_ne!(first, replacement);
+}
+
+#[test]
+fn ime_descriptor_sends_committed_text_and_preserves_a_reversed_selection() {
+    let (mut app, _) = editor("café😀", 2, 5);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let first = pass.frame(&mut app, vec![], true, false).expect("the focused editor owns IME");
+    assert_eq!(first.owner, ime_target(&app).expect("an edit target").owner);
+    assert!(first.context_generation > 0);
+    assert_eq!(ime_text(&first), ("café😀", 9, 2), "UTF-8 bytes, with the caret's direction kept");
+    assert_eq!(first.change_cause, egui::ImeChangeCause::Other, "starting a context is application origin");
+    assert_eq!((first.rect, first.cursor_rect), (pass.rect, pass.rect), "the real caret geometry");
+
+    let again = pass.frame(&mut app, vec![], true, false).expect("still editing");
+    assert_eq!(again.context_generation, first.context_generation, "an unchanged pass keeps the context");
+    assert_eq!(again.surrounding_text, first.surrounding_text);
+}
+
+#[test]
+fn accepted_ime_commit_is_input_method_and_ordinary_typing_is_other() {
+    let (mut app, lid) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let first = pass.frame(&mut app, vec![], true, false).expect("editing");
+    let generation = first.context_generation;
+
+    let commit = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "ab日");
+    assert_eq!(ime_text(&commit), ("ab日", 5, 5));
+    assert_eq!(commit.change_cause, egui::ImeChangeCause::InputMethod, "only the accepted commit earns it");
+    assert_eq!(commit.context_generation, generation, "an ordinary text change is not a new context");
+
+    let typed = pass.frame(&mut app, vec![egui::Event::Text("x".into())], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "ab日x");
+    assert_eq!(typed.change_cause, egui::ImeChangeCause::Other, "typing is application work");
+    assert_eq!(typed.context_generation, generation);
+}
+
+#[test]
+fn ime_delete_and_commit_chain_is_input_method_with_a_reversed_selection() {
+    let (mut app, lid) = editor("abcdef", 4, 1);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+
+    let deleted = pass
+        .frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 1 })], true, false)
+        .expect("still editing");
+    assert_eq!(doc_text(&app, lid), "bcdf", "one character goes before and one after the selection");
+    assert_eq!(ime_text(&deleted), ("bcdf", 0, 3), "the selected text and its reversed direction stay");
+    assert_eq!(deleted.change_cause, egui::ImeChangeCause::InputMethod);
+
+    let committed = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("X".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "Xf", "the commit replaces the kept selection");
+    assert_eq!(committed.change_cause, egui::ImeChangeCause::InputMethod, "the delete and commit are one accepted chain");
+    app.session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(doc_text(&app, lid), "abcdef", "the replacement is one undo step");
+}
+
+#[test]
+fn an_application_edit_in_the_same_frame_dominates_the_ime_cause() {
+    // Application edit before the IME commit.
+    let (mut app, lid) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+    let mixed =
+        pass.frame(&mut app, vec![egui::Event::Text("x".into()), egui::Event::Ime(egui::ImeEvent::Commit("日".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "abx日");
+    assert_eq!(mixed.change_cause, egui::ImeChangeCause::Other, "the earlier application edit dominates");
+
+    // Application edit after the IME commit.
+    let (mut app, lid) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+    let mixed =
+        pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into())), egui::Event::Text("x".into())], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "ab日x");
+    assert_eq!(mixed.change_cause, egui::ImeChangeCause::Other, "the later application edit dominates");
+}
+
+#[test]
+fn preedit_is_excluded_from_the_committed_snapshot_and_keeps_the_context() {
+    let (mut app, lid) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let first = pass.frame(&mut app, vec![], true, false).expect("editing");
+
+    let preview = pass
+        .frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false)
+        .expect("still editing");
+    assert_eq!(doc_text(&app, lid), "ab", "the pre-edit never enters the document");
+    assert_eq!(ime_text(&preview), ("ab", 2, 2), "only committed text is sent");
+    assert_eq!(preview.context_generation, first.context_generation, "pre-edit updates keep the composition");
+
+    let commit = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("に".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "abに");
+    assert_eq!(commit.change_cause, egui::ImeChangeCause::InputMethod, "clearing the pre-edit and committing is IME work");
+    assert_eq!(commit.context_generation, first.context_generation);
+}
+
+#[test]
+fn empty_and_unavailable_surrounding_text_are_distinct() {
+    let (mut app, _) = editor("", 0, 0);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let empty = pass.frame(&mut app, vec![], true, false).expect("editing");
+    assert_eq!(ime_text(&empty), ("", 0, 0), "an available-empty document is not unavailable");
+
+    let text = "a".repeat(5000);
+    let (mut app, _) = editor(&text, 0, 5000);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let wide = pass.frame(&mut app, vec![], true, false).expect("editing");
+    assert!(matches!(wide.surrounding_text, egui::output::IMESurroundingText::Unavailable), "a selection wider than the limit is unavailable");
+    assert_eq!(wide.owner, ime_target(&app).expect("an edit target").owner, "identity survives unavailable text");
+}
+
+#[test]
+fn an_unrelated_undo_keeps_a_wide_selection_composition() {
+    // A selection wider than the IME limit reports unavailable surrounding text, whose
+    // receipt identity is a revision. That revision must follow the editor, not the whole
+    // project: undoing an unrelated opacity change used to look like an editor mutation and
+    // cancel an active composition.
+    let text = "a".repeat(5000);
+    let (mut app, lid) = editor(&text, 0, 5000);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let first = pass.frame(&mut app, vec![], true, false).expect("editing");
+    assert!(matches!(first.surrounding_text, egui::output::IMESurroundingText::Unavailable), "the wide selection is unavailable");
+
+    let composing = pass
+        .frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false)
+        .expect("still editing");
+    assert_eq!(composing.context_generation, first.context_generation, "the pre-edit keeps the context");
+    let owner = ime_owner(&app).expect("an editor owner");
+    assert!(matches!(
+        pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))),
+        Some(ImeComposition::Active(active)) if active == owner
+    ));
+
+    app.session.execute("prop.set", json!({"layer": lid.0, "path": "transform/opacity", "value": 50})).unwrap();
+    app.session.execute("edit.undo", json!({})).unwrap();
+    let after = pass.frame(&mut app, vec![], true, false).expect("still editing");
+    assert_eq!(after.context_generation, first.context_generation, "an unrelated undo does not start a new context");
+    assert!(
+        matches!(
+            pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))),
+            Some(ImeComposition::Active(active)) if active == owner
+        ),
+        "the wide-selection composition survives an unrelated undo"
+    );
+    assert!(read_reset(&pass.ctx).is_none(), "no IME reset was requested");
+
+    // The composition is still the live one: its commit is accepted and earns the
+    // input-method cause rather than being poisoned as leftover application work.
+    let commit = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("x".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), "x", "the preserved composition commits into the wide selection");
+    assert_eq!(commit.change_cause, egui::ImeChangeCause::InputMethod);
+}
+
+#[test]
+fn a_failed_batch_with_a_transient_edit_does_not_revive_a_wide_selection_composition() {
+    // The final document equals the pre-batch one, but the intermediate insert/delete was a
+    // real document change. Its IME revision must stay the high-water mark; otherwise the
+    // active wide-selection composition would look current and accept its old commit.
+    let text = "a".repeat(5000);
+    let (mut app, lid) = editor(&text, 0, 5000);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false).expect("still editing");
+    let owner = ime_owner(&app).expect("an editor owner");
+    assert!(matches!(
+        pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))),
+        Some(ImeComposition::Active(active)) if active == owner
+    ));
+
+    let r = app.session.execute(
+        "engine.batch",
+        json!({"atomic": true, "steps": [
+            {"command": "text.insert", "params": {"text": "x", "range": [5000, 5000]}},
+            {"command": "text.delete", "params": {}},
+            {"command": "no.suchCommand", "params": {}}
+        ]}),
+    );
+    assert!(r.is_err());
+    assert_eq!(doc_text(&app, lid), text, "the batch restored the final document");
+
+    pass.frame(&mut app, vec![], true, false).expect("still editing");
+    assert!(read_reset(&pass.ctx).is_some(), "the advanced revision retires the old IME context");
+    assert!(
+        matches!(pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))), Some(ImeComposition::Stale)),
+        "the failed batch's transient edit leaves the old composition stale"
+    );
+    let stale = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("z".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), text, "the stale composition cannot commit into the restored document");
+    assert_ne!(stale.change_cause, egui::ImeChangeCause::InputMethod, "a rejected commit earns no IME receipt");
+}
+
+#[test]
+fn a_wide_content_change_invalidates_the_active_composition() {
+    let text = "a".repeat(5000);
+    let (mut app, lid) = editor(&text, 0, 5000);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false).expect("still editing");
+
+    let replaced = "b".repeat(5000);
+    app.session.execute("layer.setText", json!({"layer": lid.0, "text": replaced})).unwrap();
+    let after = pass.frame(&mut app, vec![], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), replaced);
+    assert!(after.should_interrupt_composition, "replacing the wide document starts a new IME context");
+    assert!(
+        matches!(pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))), Some(ImeComposition::Stale)),
+        "the old composition is stale after the content change"
+    );
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("z".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), replaced, "a delayed commit from the old document is rejected");
+}
+
+#[test]
+fn a_wide_selection_change_invalidates_the_active_composition() {
+    let text = "a".repeat(5000);
+    let (mut app, lid) = editor(&text, 0, 5000);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![], true, false).expect("editing");
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false).expect("still editing");
+
+    // Still wider than the IME window limit, so this exercises the unavailable-text
+    // selection identity rather than merely making the surrounding text available.
+    app.session.execute("text.setSelection", json!({"start": 0, "end": 4500})).unwrap();
+    pass.frame(&mut app, vec![], true, false).expect("still editing");
+    assert!(read_reset(&pass.ctx).is_some(), "an application selection change retires the composition");
+    assert!(
+        matches!(pass.ctx.data(|d| d.get_temp::<ImeComposition>(ime_composition_id(pass.viewport))), Some(ImeComposition::Stale)),
+        "the old composition cannot follow the selection"
+    );
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("z".into()))], true, false).expect("still editing");
+    assert_eq!(doc_text(&app, lid), text, "the stale composition cannot mutate the wide selection");
+}
+
+#[test]
+fn replaced_edit_session_and_hidden_passes_start_a_new_context() {
+    let (mut app, _) = editor("text", 4, 4);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let before = pass.frame(&mut app, vec![], true, false).expect("editing");
+    if let Some(edit) = app.session.state.text_edit.as_mut() {
+        edit.session = edit.session.wrapping_add(1);
+    }
+    let replaced = pass.frame(&mut app, vec![], true, false).expect("editing");
+    assert!(replaced.context_generation > before.context_generation, "a recreated target does not inherit the old context");
+    assert_eq!(replaced.change_cause, egui::ImeChangeCause::Other);
+    assert!(replaced.should_interrupt_composition, "a new replacement epoch cancels the platform composition");
+
+    let (mut app, _) = editor("abc", 3, 3);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let visible = pass.frame(&mut app, vec![], true, false).expect("editing");
+    assert!(pass.frame(&mut app, vec![], false, false).is_none(), "a hidden editor reports no IME owner");
+    let back = pass.frame(&mut app, vec![], true, false).expect("editing again");
+    assert!(back.context_generation > visible.context_generation, "reappearing starts exactly one new context");
+}
+
+#[test]
+fn preedit_from_a_replaced_target_cannot_commit_into_the_new_session() {
+    let (mut app, first) = editor("A", 1, 1);
+    let second = app.session.execute("layer.newText", json!({"text": "B"})).unwrap()["layer"].as_u64().unwrap();
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "か".into(), active_range_chars: None })], true, false)
+        .expect("editing the first layer");
+
+    app.session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    let switched = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))], true, false).expect("editing the second layer");
+    assert_eq!(doc_text(&app, LayerId(second)), "B", "a delayed commit from the old composition is ignored");
+    assert_eq!(doc_text(&app, first), "A", "the old layer is not changed either");
+    assert_eq!(switched.owner, ime_target(&app).expect("second target").owner);
+    assert!(switched.should_interrupt_composition, "the target switch interrupts the old composition");
+}
+
+#[test]
+fn hidden_pass_clears_this_viewports_preedit_preview() {
+    let (mut app, _) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Preedit { text: "に".into(), active_range_chars: None })], true, false).expect("editing");
+    assert!(pass.ctx.data(|d| d.get_temp::<Preedit>(ime_preedit_id(pass.viewport))).is_some());
+    assert!(pass.frame(&mut app, vec![], false, false).is_none());
+    assert!(pass.ctx.data(|d| d.get_temp::<Preedit>(ime_preedit_id(pass.viewport))).is_none(), "a pass without the overlay clears this viewport's preview");
+}
+
+#[test]
+fn a_discarded_pass_keeps_the_frame_cause_and_the_context() {
+    let (mut app, lid) = editor("ab", 2, 2);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let first = pass.frame(&mut app, vec![], true, false).expect("editing");
+    let committed = pass.frame(&mut app, vec![egui::Event::Ime(egui::ImeEvent::Commit("日".into()))], true, true).expect("the final pass of the frame");
+    assert_eq!(doc_text(&app, lid), "ab日", "the discarded pass did not replay the event");
+    assert_eq!(committed.change_cause, egui::ImeChangeCause::InputMethod, "an unchanged later pass keeps the frame's cause");
+    assert_eq!(committed.context_generation, first.context_generation, "both passes are one context");
+}
+
+#[test]
+fn two_viewports_keep_independent_ime_contexts() {
+    let (mut app, _) = editor("ab", 2, 2);
+    let mut first = ImePass::new(egui::ViewportId::ROOT);
+    let mut second = ImePass::new(egui::ViewportId::from_hash_of("ime-test-second-viewport"));
+    let one = first.frame(&mut app, vec![], true, false).expect("editing in the first viewport");
+    let two = second.frame(&mut app, vec![], true, false).expect("editing in the second viewport");
+    assert_ne!(one.context_generation, two.context_generation, "each viewport has its own generation");
+    let again = first.frame(&mut app, vec![], true, false).expect("editing in the first viewport");
+    assert_eq!(again.context_generation, one.context_generation, "the second viewport did not disturb the first");
+}
+
+/// Draw one real `EffectcraftApp::draw` pass, so `draw`'s all-exit finalizer runs.
+fn draw_app_pass(app: &mut EffectcraftApp, ctx: &egui::Context, frame: &eframe::Frame, events: Vec<egui::Event>) -> egui::FullOutput {
+    let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1200.0, 800.0))), events, ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| app.draw(ui, frame));
+    out.textures_delta.clear();
+    out
+}
+
+/// One headless pass with the custom viewer and a real stock `TextEdit` side by side.
+///
+/// The first call focuses the custom editor before `keyboard` (the outside press arrives
+/// there). The second call leaves the stock field's focus alone, so the stock descriptor
+/// is published by the same `output.ime` writer that an unrelated field would use.
+fn stock_pass(
+    pass: &mut ImePass,
+    app: &mut EffectcraftApp,
+    events: Vec<egui::Event>,
+    stock: &mut String,
+    custom_focus: bool,
+) -> Option<egui::output::IMEOutput> {
+    let ctx = pass.ctx.clone();
+    let viewport = pass.viewport;
+    let custom = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(160.0, 90.0));
+    let stock_rect = egui::Rect::from_min_size(egui::pos2(180.0, 30.0), egui::vec2(120.0, 24.0));
+    let stock_id = egui::Id::unique("effectcraft-ime-test-stock");
+    let mut viewports = egui::ViewportIdMap::default();
+    viewports.insert(viewport, egui::ViewportInfo::default());
+    let raw = egui::RawInput { viewport_id: viewport, viewports, screen_rect: Some(pass.rect), events, ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| {
+        begin_ui(ui.ctx());
+        if custom_focus {
+            ui.interact(custom, focus_id(), egui::Sense::focusable_noninteractive());
+            ui.memory_mut(|m| m.request_focus(focus_id()));
+            sync_ime_target(ui, app);
+            keyboard(app, ui, custom);
+        } else {
+            // The stock field holds focus after the outside press; keep that ownership while
+            // the second pass publishes the actual stock descriptor.
+            ui.memory_mut(|m| m.request_focus(stock_id));
+        }
+        let _ = ui.put(stock_rect, egui::TextEdit::singleline(stock).id(stock_id));
+        finish_ime(app, ui);
+    });
+    out.textures_delta.clear();
+    out.platform_output.ime
+}
+
+#[test]
+fn outside_pointer_to_stock_allocates_no_new_request_and_defers_the_replacement() {
+    let (mut app, lid) = editor("abcd", 4, 4);
+    let mut pass = ImePass::new(egui::ViewportId::ROOT);
+    let preview = || egui::Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None });
+    pass.frame(&mut app, vec![preview()], true, false).expect("the custom editor starts a composition");
+    app.session.execute("text.setSelection", json!({"caret": 1})).unwrap();
+    let first = pass.frame(&mut app, vec![], true, false).expect("the caret change publishes a request").reset_request.expect("the real request ID");
+    // Complete the first interruption, then start a fresh composition with no waiting guard.
+    pass.frame(&mut app, vec![egui::Event::ImeResetCompleted { request_id: first }], true, false);
+    let active = pass.frame(&mut app, vec![preview()], true, false).expect("a fresh composition");
+    assert!(active.reset_request.is_none(), "a fresh composition does not wait on an old request");
+    assert_eq!(doc_text(&app, lid), "abcd");
+
+    // The press outside the viewer also gives the stock field focus. It must not allocate a
+    // new request: core would attach that request to the stock descriptor next pass.
+    let outside = egui::pos2(240.0, 42.0);
+    let mut stock = String::new();
+    stock_pass(
+        &mut pass,
+        &mut app,
+        vec![
+            egui::Event::PointerMoved(outside),
+            egui::Event::PointerButton { pos: outside, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE },
+        ],
+        &mut stock,
+        true,
+    );
+    let guard = pass.ctx.data(|d| d.get_temp::<ResetGuard>(reset_id(pass.viewport))).expect("the custom guard is retired locally");
+    assert!(guard.suspended && guard.request.is_none(), "the outside press retires the old request without allocating another");
+    let stock_ime = stock_pass(&mut pass, &mut app, vec![], &mut stock, false).expect("the actual stock field owns IME");
+    assert_ne!(stock_ime.owner, ime_target(&app).expect("the custom target is still live").owner);
+    assert!(stock_ime.reset_request.is_none(), "a new outside-press request would surface on the stock output");
+    assert_eq!(doc_text(&app, lid), "abcd");
+
+    // Returning to a confirmed eligible custom output allocates the one replacement.
+    let replacement = pass.frame(&mut app, vec![], true, false).expect("the custom editor owns IME again").reset_request.expect("the deferred replacement");
+    assert_ne!(first, replacement);
+    assert!(pass.frame(&mut app, vec![], true, false).expect("still editing").reset_request.is_none(), "the replacement is one-shot");
+}
+
+#[test]
+fn fonts_and_device_loss_all_exit_finalizers_suspend_without_allocating() {
+    let (mut app, _lid) = editor("abcd", 1, 1);
+    app.ui.start_screen = false;
+    app.ui.tool = Tool::Type;
+    app.ui.focused = PanelKind::Composition;
+    app.show_panel(PanelKind::Composition);
+    let ctx = egui::Context::default();
+    install_hooks(&ctx);
+    let frame = eframe::Frame::_new_kittest();
+    let preview = || egui::Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None });
+    // The first pass installs fonts and the next draws the real viewer.
+    for _ in 0..3 {
+        draw_app_pass(&mut app, &ctx, &frame, vec![]);
+    }
+    draw_app_pass(&mut app, &ctx, &frame, vec![preview()]);
+    app.session.execute("text.setSelection", json!({"caret": 2})).unwrap();
+    let first = draw_app_pass(&mut app, &ctx, &frame, vec![])
+        .platform_output
+        .ime
+        .expect("the normal pass publishes the custom descriptor")
+        .reset_request
+        .expect("one request for the caret interruption");
+
+    // A real font-install pass draws nothing, but `draw` still reaches the finalizer.
+    app.styled = false;
+    let fonts = draw_app_pass(&mut app, &ctx, &frame, vec![]);
+    assert!(!app.is_ready(), "the font-install pass cannot draw");
+    assert!(fonts.platform_output.ime.is_none(), "no custom descriptor is published");
+    let guard = ctx.data(|d| d.get_temp::<ResetGuard>(reset_id(egui::ViewportId::ROOT))).expect("the waiting guard");
+    assert!(guard.suspended && guard.request.is_none(), "the all-exit finalizer retired it without allocating");
+    let second = draw_app_pass(&mut app, &ctx, &frame, vec![])
+        .platform_output
+        .ime
+        .expect("returning to a drawing pass publishes the custom descriptor")
+        .reset_request
+        .expect("the deferred request");
+    assert_ne!(first, second);
+
+    // The device-loss early return is the other all-exit path. Preset the close bookkeeping
+    // so this test does not autosave; the pass must still retire the waiting guard.
+    app.gpu_failure_applied = Some(true);
+    app.device_lost_close = Some(true);
+    let lost = draw_app_pass(&mut app, &ctx, &frame, vec![]);
+    assert!(lost.platform_output.ime.is_none(), "a lost renderer publishes no descriptor");
+    let guard = ctx.data(|d| d.get_temp::<ResetGuard>(reset_id(egui::ViewportId::ROOT))).expect("the waiting guard");
+    assert!(guard.suspended && guard.request.is_none(), "the device-loss finalizer retired it without allocating");
+    app.gpu_failure_applied = None;
+    let third = draw_app_pass(&mut app, &ctx, &frame, vec![])
+        .platform_output
+        .ime
+        .expect("a drawing pass publishes the custom descriptor again")
+        .reset_request
+        .expect("the deferred request is one-shot");
+    assert_ne!(third, second);
+}
+
+#[test]
+fn ime_delete_without_a_session_or_with_an_empty_range_does_nothing() {
+    let (mut app, lid) = editor("abc", 1, 1);
+    feed(&mut app, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 0, after_bytes: 0 })]);
+    assert_eq!(doc_text(&app, lid), "abc");
+    app.session.state.text_edit = None;
+    feed(&mut app, vec![egui::Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 2, after_bytes: 0 })]);
+    assert_eq!(doc_text(&app, lid), "abc");
+}
diff --git a/crates/ui-egui/src/panels/viewer_tools.rs b/crates/ui-egui/src/panels/viewer_tools.rs
index d229f272f..f86a7bfee 100644
--- a/crates/ui-egui/src/panels/viewer_tools.rs
+++ b/crates/ui-egui/src/panels/viewer_tools.rs
@@ -24,8 +24,9 @@ use crate::{EffectcraftApp, widgets};
 pub(crate) const SNAP_PX: f64 = 8.0;
 const SNAP_COLOR: Color32 = Color32::from_rgb(0xff, 0xd2, 0x3c);
 
+/// The `egui::Id` under which this frame's snap feedback is stored until `draw_snap` consumes it.
 fn snap_id() -> egui::Id {
-    egui::Id::new("viewer-snap")
+    egui::Id::unique("viewer-snap")
 }
 
 /// Layer snapping is on: the Snapping checkbox (View ▸ Snapping), inverted while Cmd/Ctrl is held.
@@ -47,20 +48,21 @@ pub(crate) fn snap(
     sources: &[[f64; 2]],
     mods: egui::Modifiers,
 ) -> [f64; 2] {
-    snap_with(app, ctx, ectx, map, exclude, sources, mods, &[])
+    snap_with(app, ctx, ectx, map, &SnapQuery { exclude, sources, mods, extra: &[] })
 }
 
-/// [`snap`] with `extra` layer targets (the Pan Behind layer's own box).
-pub(crate) fn snap_with(
-    app: &EffectcraftApp,
-    ctx: &egui::Context,
-    ectx: &EvalCtx,
-    map: &ViewerMap,
-    exclude: &[LayerId],
-    sources: &[[f64; 2]],
-    mods: egui::Modifiers,
-    extra: &[vw::SnapTarget],
-) -> [f64; 2] {
+/// What [`snap_with`] snaps: the dragged features and the layers to ignore, plus `extra` layer
+/// targets (the Pan Behind layer's own box).
+pub(crate) struct SnapQuery<'a> {
+    pub exclude: &'a [LayerId],
+    pub sources: &'a [[f64; 2]],
+    pub mods: egui::Modifiers,
+    pub extra: &'a [vw::SnapTarget],
+}
+
+/// [`snap`] with extra layer targets.
+pub(crate) fn snap_with(app: &EffectcraftApp, ctx: &egui::Context, ectx: &EvalCtx, map: &ViewerMap, q: &SnapQuery) -> [f64; 2] {
+    let SnapQuery { exclude, sources, mods, extra } = *q;
     let layers = snapping_on(app, mods);
     let v = &app.ui.viewer;
     let guides = v.snap_guides && v.guides;
@@ -226,10 +228,10 @@ pub(crate) fn rulers(app: &mut EffectcraftApp, ui: &mut egui::Ui, map: &ViewerMa
     p.line_segment([corner.center() - vec2(4.0, 0.0), corner.center() + vec2(4.0, 0.0)], tick);
     p.line_segment([corner.center() - vec2(0.0, 4.0), corner.center() + vec2(0.0, 4.0)], tick);
     let cr = ui
-        .interact(corner, egui::Id::new("vw-ruler-origin"), Sense::click_and_drag())
+        .interact(corner, egui::Id::unique("vw-ruler-origin"), Sense::click_and_drag())
         .on_hover_text(crate::i18n::tr("Ruler zero point (drag to move, double-click to reset)"));
     app.auto.add("viewer.ruler.origin", corner, "Ruler zero point");
-    let fg = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("vw-ruler-fg")));
+    let fg = ui.ctx().layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("vw-ruler-fg")));
     if cr.dragged()
         && let Some(hp) = cr.interact_pointer_pos()
     {
@@ -248,7 +250,7 @@ pub(crate) fn rulers(app: &mut EffectcraftApp, ui: &mut egui::Ui, map: &ViewerMa
     // Guides dragged out of the rulers: the top ruler makes horizontal guides, the left one
     // vertical guides.
     for (r, vertical, id) in [(top, false, "top"), (left, true, "left")] {
-        let resp = ui.interact(r, egui::Id::new(("vw-ruler", id)), Sense::drag()).on_hover_text(crate::i18n::tr("Drag to create a guide"));
+        let resp = ui.interact(r, egui::Id::unique(("vw-ruler", id)), Sense::drag()).on_hover_text(crate::i18n::tr("Drag to create a guide"));
         app.auto.add(&format!("viewer.ruler.{id}"), r, if vertical { "Vertical ruler" } else { "Horizontal ruler" });
         if resp.hovered() {
             ui.ctx().set_cursor_icon(if vertical { egui::CursorIcon::ResizeHorizontal } else { egui::CursorIcon::ResizeVertical });
@@ -318,13 +320,15 @@ pub(crate) fn proportional_grid(app: &EffectcraftApp, painter: &egui::Painter, c
 
 // ---------------------------------------------------------------- the displayed frame
 
-/// Remember the region of interest the displayed texture was rendered with.
+/// Store the displayed texture's Region of Interest or Extended Viewer area unchanged.
 pub(crate) fn set_texture_roi(ctx: &egui::Context, roi: Option<[f64; 4]>) {
-    ctx.data_mut(|d| d.insert_temp(egui::Id::new("viewer-tex-roi"), roi));
+    ctx.data_mut(|d| d.insert_temp(egui::Id::unique("viewer-tex-roi"), roi));
 }
 
+/// The comp region (`[x, y, w, h]` in pixels) used for the texture: Region of Interest or Extended Viewer area,
+/// or `None` when no explicit region is stored, meaning the whole comp.
 fn texture_roi(ctx: &egui::Context) -> Option<[f64; 4]> {
-    ctx.data(|d| d.get_temp::<Option<[f64; 4]>>(egui::Id::new("viewer-tex-roi"))).flatten()
+    ctx.data(|d| d.get_temp::<Option<[f64; 4]>>(egui::Id::unique("viewer-tex-roi"))).flatten()
 }
 
 /// The comp area ([x, y, w, h], comp pixels) the shown frame covers: its region of interest or
@@ -398,7 +402,7 @@ pub(crate) fn draw_frame(app: &mut EffectcraftApp, ctx: &egui::Context, painter:
             (std::sync::Arc::as_ptr(&s.image) as usize, opts.channel.id(), opts.colorized, opts.exposure.to_bits(), &dc_key).hash(&mut h);
             h.finish()
         };
-        let id = egui::Id::new("viewer-snapshot-tex");
+        let id = egui::Id::unique("viewer-snapshot-tex");
         let tex = match ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(id)) {
             Some((k, tex)) if k == key => tex,
             _ => {
@@ -454,7 +458,7 @@ pub(crate) fn draw_frame(app: &mut EffectcraftApp, ctx: &egui::Context, painter:
         (std::sync::Arc::as_ptr(&src) as usize, opts.channel.id(), opts.colorized, opts.exposure.to_bits(), &dc_key, minify).hash(&mut h);
         h.finish()
     };
-    let id = egui::Id::new("viewer-display-tex");
+    let id = egui::Id::unique("viewer-display-tex");
     let tex = match ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(id)) {
         Some((k, tex)) if k == key => tex,
         _ => {
@@ -479,7 +483,7 @@ fn fitted_uv(ctx: &egui::Context, size: [usize; 2], minify: usize) -> Rect {
 /// A popup list above `anchor` (selected entries highlighted); entries register
 /// `viewer.<auto>.<n>` automation ids.
 fn popup(app: &mut EffectcraftApp, ui: &mut egui::Ui, id: &str, anchor: Rect, items: &[(String, bool)], auto: &str) -> Option<usize> {
-    let pid = egui::Id::new(id);
+    let pid = egui::Id::unique(id);
     if !widgets::popup_is_open(ui, pid) {
         return None;
     }
@@ -505,8 +509,9 @@ fn popup(app: &mut EffectcraftApp, ui: &mut egui::Ui, id: &str, anchor: Rect, it
     })
 }
 
+/// Flip the open flag of the popup with `id`; the caller that owns the popup reads the same flag.
 fn toggle_popup(ui: &egui::Ui, id: &str) {
-    let pid = egui::Id::new(id).with("open");
+    let pid = egui::Id::unique(id).with("open");
     let open: bool = ui.data(|d| d.get_temp(pid).unwrap_or(false));
     ui.data_mut(|d| d.insert_temp(pid, !open));
 }
@@ -529,8 +534,8 @@ pub(crate) fn magnification_menu(
     let t = app.tokens;
     let ppp = ui.ctx().pixels_per_point();
     let pop = format!("{id}-pop");
-    let response =
-        widgets::dropdown(ui, r, &magnification_label(zoom * ppp * 100.0), &t, egui::Id::new(id)).on_hover_text(crate::i18n::tr("Magnification ratio popup"));
+    let response = widgets::dropdown(ui, r, &magnification_label(zoom * ppp * 100.0), &t, egui::Id::unique(id))
+        .on_hover_text(crate::i18n::tr("Magnification ratio popup"));
     if response.clicked() {
         toggle_popup(ui, &pop);
     }
@@ -616,6 +621,30 @@ pub(crate) fn bottom_bar(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect,
     });
 }
 
+/// The exposure drag field (stops) at `er`; a change runs `view.exposure`.
+fn exposure_field(app: &mut EffectcraftApp, ui: &mut egui::Ui, er: Rect, stops: f64) {
+    let mut ev = stops;
+    let resp = ui.put(
+        er,
+        crate::widgets::drag_value(
+            egui::DragValue::new(&mut ev)
+                .speed(0.05)
+                .range(-40.0..=40.0)
+                .fixed_decimals(1)
+                .custom_formatter(|v, _| if v == 0.0 { "0.0".into() } else { format!("{v:+.1}") }),
+        ),
+    );
+    let resp = resp.on_hover_text(crate::i18n::tr("Adjust Exposure (stops)"));
+    app.auto.add_response("viewer.exposure", &resp, "Adjust Exposure");
+    if resp.changed() {
+        let _ = app.session.execute("view.exposure", json!({"stops": ev}));
+    }
+}
+
+/// Lay out the viewer's control row from `bar.min.x`: magnification, resolution, transparency, mask, ROI, grid/guide,
+/// channel/colour management, exposure, snapshot, fast previews, 3D renderer/view and Extended Viewer, timecode and render-time
+/// indicators, running commands or toggling viewer UI state. Returns the width the row
+/// occupies, at least `bar.width()`, for the horizontal scroll area.
 fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, zoom: f32, time: Tick, comp: &Comp) -> f32 {
     let t = app.tokens;
     let p = ui.painter().clone();
@@ -637,7 +666,7 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
     let r = Rect::from_min_size(pos2(x, cy - 10.0), vec2(84.0, 20.0));
     let scale = app.viewer_scale(zoom, ppp);
     let res = app.viewer_res();
-    let response = widgets::dropdown(ui, r, &resolution_label(res, scale), &t, egui::Id::new("vw-res"))
+    let response = widgets::dropdown(ui, r, &resolution_label(res, scale), &t, egui::Id::unique("vw-res"))
         .on_hover_text(crate::i18n::tr("Resolution/Down Sample Factor Popup"));
     if response.clicked() {
         toggle_popup(ui, "vw-res-pop");
@@ -665,7 +694,7 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
         let r = Rect::from_min_size(pos2(*x, cy - 11.0), vec2(22.0, 22.0));
         // The tip is the English source: the tooltip is looked up in the catalog, while the
         // automation label stays English for scripts and tests.
-        let resp = widgets::icon_button(ui, r, icon, on, &t, egui::Id::new(("vw-btn", id))).on_hover_text(crate::i18n::tr(tip));
+        let resp = widgets::icon_button(ui, r, icon, on, &t, egui::Id::unique(("vw-btn", id))).on_hover_text(crate::i18n::tr(tip));
         auto.add_response(&format!("viewer.{id}"), &resp, tip);
         *x += 24.0;
         (resp.clicked(), r)
@@ -735,22 +764,7 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
         let _ = app.session.execute("view.resetExposure", json!({}));
     }
     let er = Rect::from_min_size(pos2(x, cy - 10.0), vec2(42.0, 20.0));
-    let mut ev = vo.exposure as f64;
-    let resp = ui.put(
-        er,
-        crate::widgets::drag_value(
-            egui::DragValue::new(&mut ev)
-                .speed(0.05)
-                .range(-40.0..=40.0)
-                .fixed_decimals(1)
-                .custom_formatter(|v, _| if v == 0.0 { "0.0".into() } else { format!("{v:+.1}") }),
-        ),
-    );
-    let resp = resp.on_hover_text(crate::i18n::tr("Adjust Exposure (stops)"));
-    app.auto.add_response("viewer.exposure", &resp, "Adjust Exposure");
-    if resp.changed() {
-        let _ = app.session.execute("view.exposure", json!({"stops": ev}));
-    }
+    exposure_field(app, ui, er, vo.exposure as f64);
     x = er.max.x + 4.0;
     // Snapshots.
     if tog(ui, &mut app.auto, &mut x, Icon::Snapshot, false, "snapshot", "Take Snapshot").0 {
@@ -786,7 +800,7 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
         let renderers = [(Renderer::Classic3D, "Classic 3D", "classic3D"), (Renderer::Advanced3D, "Advanced 3D", "advanced3D")];
         let current = renderers.iter().find(|(r, ..)| *r == comp.renderer).map_or("Classic 3D", |(_, label, _)| *label);
         let r = Rect::from_min_size(pos2(x, cy - 10.0), vec2(96.0, 20.0));
-        if widgets::dropdown(ui, r, crate::i18n::tr(current), &t, egui::Id::new("vw-3d")).clicked() {
+        if widgets::dropdown(ui, r, crate::i18n::tr(current), &t, egui::Id::unique("vw-3d")).clicked() {
             toggle_popup(ui, "vw-3d-pop");
         }
         app.auto.add("viewer.renderer3d", r, current);
@@ -801,7 +815,7 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
         let cid = app.session.active_comp_id();
         let cur = cid.and_then(|c| app.session.state.views3d.get(&c)).map(|v| v.current).unwrap_or_default();
         let r = Rect::from_min_size(pos2(x, cy - 10.0), vec2(118.0, 20.0));
-        let response = widgets::dropdown(ui, r, cur.label(), &t, egui::Id::new("vw-cam"));
+        let response = widgets::dropdown(ui, r, cur.label(), &t, egui::Id::unique("vw-cam"));
         if response.clicked() {
             toggle_popup(ui, "vw-cam-pop");
         }
@@ -824,8 +838,8 @@ fn bottom_bar_contents(app: &mut EffectcraftApp, ui: &mut egui::Ui, bar: Rect, z
     let g = p.layout_no_wrap(tc, Tokens::mono(12.0), t.timecode);
     let tr = Rect::from_min_size(pos2(x + 4.0, cy - 9.0), g.size() + vec2(8.0, 4.0));
     p.galley(pos2(tr.min.x + 4.0, tr.min.y + 2.0), g, t.timecode);
-    let resp = ui.interact(tr, egui::Id::new("vw-timecode"), Sense::click());
-    resp.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Current time"));
+    let resp = ui.interact(tr, egui::Id::unique("vw-timecode"), Sense::click());
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, "Current time"));
     if resp.has_focus() {
         p.rect_stroke(tr.shrink(1.0), 2.0, Stroke::new(1.0, t.focus), StrokeKind::Inside);
     }
diff --git a/crates/ui-egui/src/panels/viewers.rs b/crates/ui-egui/src/panels/viewers.rs
index 8d2351330..e8be901b9 100644
--- a/crates/ui-egui/src/panels/viewers.rs
+++ b/crates/ui-egui/src/panels/viewers.rs
@@ -14,7 +14,7 @@ use egui::{Align2, Color32, Rect, Sense, pos2, vec2};
 use serde_json::json;
 
 use crate::EffectcraftApp;
-use crate::dock::PanelKind;
+use crate::dock::{PanelKind, WorkspaceExt as _};
 use crate::frames::{FrameImage, FrameKey};
 use crate::theme::Tokens;
 
@@ -59,7 +59,7 @@ pub fn locked(app: &EffectcraftApp, id: u32) -> bool {
 /// Viewer `id`'s panel is docked or floating.
 fn open(app: &EffectcraftApp, id: u32) -> bool {
     let p = panel(id);
-    app.ui.dock.contains(p) || app.ui.floating.iter().any(|f| f.panels.contains(&p))
+    app.ui.dock.is_open(p)
 }
 
 /// The comp viewer `id` shows: the active comp in the active viewer, else its own.
@@ -89,7 +89,7 @@ pub fn show(app: &mut EffectcraftApp, ui: &mut egui::Ui, id: u32, rect: Rect) {
     let ctx = ui.ctx().clone();
     let p = ui.painter().with_clip_rect(rect);
     p.rect_filled(rect, 0.0, t.pasteboard);
-    let resp = ui.interact(rect, egui::Id::new(("passive-viewer", id)), Sense::click()).on_hover_text(tr("Click to make this viewer active"));
+    let resp = ui.interact(rect, egui::Id::unique(("passive-viewer", id)), Sense::click()).on_hover_text(tr("Click to make this viewer active"));
     app.auto.add(&format!("viewers.{id}"), rect, "Composition viewer (click to make it active)");
     match comp_of(app, id).and_then(|cid| Some((cid, app.session.project.comp(cid)?.clone()))) {
         Some((cid, c)) => {
@@ -137,7 +137,7 @@ fn set_texture(
     dc: Option<effectcraft_engine::viewer::DisplayColor>,
     dkey: u64,
 ) {
-    let dc_id = egui::Id::new(("passive-viewer-display", id));
+    let dc_id = egui::Id::unique(("passive-viewer-display", id));
     let same_display = ctx.data(|d| d.get_temp::<u64>(dc_id)) == Some(dkey);
     if let Some((k, _)) = app.passive_tex.get_mut(&id)
         && *k == key
@@ -241,7 +241,7 @@ pub fn on_open_comp(app: &mut EffectcraftApp, comp: ItemId) {
     // The comp's viewer and its Timeline tab come to the front (unless locked), reopened if they
     // were closed (as in After Effects).
     for p in [active_panel(app), PanelKind::Timeline] {
-        let closed = !app.ui.dock.contains(p) && !app.ui.floating.iter().any(|f| f.panels.contains(&p));
+        let closed = !app.ui.dock.is_open(p);
         if closed || !app.ui.locked_tabs.contains(&p.id()) {
             app.raise_panel(p);
         }
@@ -267,8 +267,8 @@ fn add_viewer(app: &mut EffectcraftApp, near: u32) -> u32 {
     let id = app.ui.viewers.keys().copied().max().unwrap_or(0).saturating_add(1).max(1);
     app.ui.viewers.insert(id, None);
     let p = panel(id);
-    let anchor = if app.ui.dock.contains(panel(near)) { panel(near) } else { PanelKind::Composition };
-    app.ui.dock.open_near(p, anchor);
+    let anchor = [panel(near), PanelKind::Composition].into_iter().find(|q| app.ui.dock.is_open(*q));
+    let _ = app.ui.dock.apply(craft_ui::docking::Action::Open { panel: p, anchor }, crate::dock::permissions);
     id
 }
 
@@ -297,5 +297,5 @@ pub fn on_close(app: &mut EffectcraftApp, p: PanelKind) {
 /// The tab label of viewer `id` ("Composition Intro").
 pub fn title(app: &EffectcraftApp, id: u32) -> Option<String> {
     let c = comp_of(app, id)?;
-    Some(format!("Composition {}", app.session.project.item(c)?.name))
+    Some(format!("{} {}", crate::i18n::command_label("window.panel", "Composition"), app.session.project.item(c)?.name))
 }
diff --git a/crates/ui-egui/src/pointer_wrap.rs b/crates/ui-egui/src/pointer_wrap.rs
index a4aefe33a..53748bd7e 100644
--- a/crates/ui-egui/src/pointer_wrap.rs
+++ b/crates/ui-egui/src/pointer_wrap.rs
@@ -12,8 +12,9 @@ struct State {
     disabled: bool,
 }
 
+/// The temp-data id of the [`State`] that tracks a numeric scrub across monitor edges.
 fn state_id() -> Id {
-    Id::new("numeric-pointer-wrap")
+    Id::unique("numeric-pointer-wrap")
 }
 
 /// Opt in only number scrubs, never object, keyframe, panel or scrollbar drags.
@@ -176,356 +177,4 @@ pub(crate) fn finish_native(ctx: &Context, frame: &eframe::Frame) {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use egui::{Event, Id, Modifiers, PointerButton, pos2, vec2};
-
-    struct Scrub {
-        ctx: Context,
-        value: f64,
-        bounds: Rect,
-        time: f64,
-        accept_warp: bool,
-        warps: Vec<Pos2>,
-        standard: bool,
-        ordinary: bool,
-        angle: bool,
-        angle_rects: Option<(Rect, Rect)>,
-        modifiers: Modifiers,
-        injected: bool,
-    }
-
-    impl Scrub {
-        fn new() -> Self {
-            Self {
-                ctx: Context::default(),
-                value: 0.0,
-                bounds: Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0)),
-                time: 0.0,
-                accept_warp: true,
-                warps: Vec::new(),
-                standard: false,
-                ordinary: false,
-                angle: false,
-                angle_rects: None,
-                modifiers: Modifiers::NONE,
-                injected: false,
-            }
-        }
-
-        fn frame(&mut self, events: Vec<Event>, focused: bool) {
-            self.time += 0.02;
-            let mut raw = RawInput {
-                screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))),
-                time: Some(self.time),
-                events,
-                focused,
-                ..Default::default()
-            };
-            raw.events.push(Event::ModifiersChanged(self.modifiers));
-            prepare_input(&self.ctx, &mut raw, self.injected);
-            let mut out = self.ctx.run_ui(raw, |ui| {
-                if self.standard {
-                    ui.put(
-                        Rect::from_min_size(pos2(100.0, 100.0), vec2(60.0, 20.0)),
-                        crate::widgets::drag_value(egui::DragValue::new(&mut self.value).speed(1.0).max_decimals(3)),
-                    );
-                } else if self.ordinary {
-                    ui.interact(Rect::from_min_size(pos2(100.0, 100.0), vec2(60.0, 20.0)), Id::new("ordinary"), egui::Sense::drag());
-                } else if self.angle {
-                    let (rr, dr, value) = crate::panels::fx_widgets::angle_field(
-                        ui,
-                        pos2(100.0, 100.0),
-                        Id::new("scrub"),
-                        self.value,
-                        1,
-                        &crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark),
-                    );
-                    self.angle_rects = Some((rr, dr));
-                    if let Some(v) = value {
-                        self.value = v;
-                    }
-                } else {
-                    let (_, value, _) = crate::widgets::hot_number_at(
-                        ui,
-                        pos2(100.0, 100.0),
-                        Id::new("scrub"),
-                        self.value,
-                        1.0,
-                        (-1e9, 1e9),
-                        1,
-                        "",
-                        &crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark),
-                    );
-                    if let Some(v) = value {
-                        self.value = v;
-                    }
-                }
-                finish_frame(ui.ctx(), self.bounds, |p| {
-                    self.warps.push(p);
-                    self.accept_warp.then_some(p)
-                });
-            });
-            out.textures_delta.clear();
-        }
-
-        fn move_to(&mut self, p: Pos2) {
-            self.frame(vec![Event::PointerMoved(p)], true);
-        }
-
-        fn begin(&mut self) {
-            self.frame(vec![], true);
-            let p = pos2(105.0, 108.0);
-            self.frame(
-                vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
-                true,
-            );
-            self.move_to(p + vec2(10.0, 0.0));
-        }
-    }
-
-    #[test]
-    fn angle_degrees_continue_across_zero_and_repeated_monitor_wraps() {
-        for initial in [0.0, 359.5, -359.5, 720.0, -720.0] {
-            for direction in [-1.0, 1.0] {
-                let mut s = Scrub::new();
-                s.angle = true;
-                s.value = initial;
-                s.frame(vec![], true);
-                let p = s.angle_rects.unwrap().1.center();
-                s.frame(
-                    vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
-                    true,
-                );
-                let mut last = p;
-                let mut expected = initial;
-                // Feed small real movements, including zero/whole-turn crossings, then
-                // the synthetic OS warp. Every real pixel contributes exactly once.
-                for step in 0..800 {
-                    let direction = if step < 400 { direction } else { -direction };
-                    let next = pos2((last.x + direction * 13.0).clamp(1.0, 799.0), last.y);
-                    expected += f64::from(next.x - last.x) * 0.5;
-                    let count = s.warps.len();
-                    s.move_to(next);
-                    assert!((s.value - expected).abs() < 1e-6, "initial={initial}, direction={direction}, actual={}, expected={expected}", s.value);
-                    last = next;
-                    if s.warps.len() > count {
-                        last = *s.warps.last().unwrap();
-                        s.move_to(last);
-                        assert!((s.value - expected).abs() < 1e-6, "the teleport must not reset the angle");
-                    }
-                }
-                assert!(s.warps.len() >= 5);
-            }
-        }
-    }
-
-    #[test]
-    fn numeric_drag_wraps_repeatedly_without_counting_the_teleport() {
-        let mut s = Scrub::new();
-        s.begin();
-        for _ in 0..5 {
-            s.move_to(pos2(799.0, 108.0));
-            let target = *s.warps.last().expect("numeric drag must wrap at the monitor edge");
-            assert!(target.x < 16.0);
-            let before = s.value;
-            s.move_to(target);
-            assert_eq!(s.value, before, "the warp itself must not change the value");
-            s.move_to(target + vec2(20.0, 0.0));
-            assert_eq!(s.value, before + 20.0);
-        }
-        assert_eq!(s.warps.len(), 5);
-        s.move_to(pos2(0.0, 108.0));
-        let target = *s.warps.last().unwrap();
-        assert!(target.x > 780.0);
-        let before = s.value;
-        s.move_to(target - vec2(3.0, 0.0));
-        assert_eq!(s.value, before - 3.0, "coalesced movement after a left-edge warp is preserved");
-    }
-
-    /// An agent's `ui.drag` over the control channel scrubs the value but never moves the user's
-    /// real cursor, even at the window's (monitor's) edge.
-    #[test]
-    fn injected_drags_never_warp_the_real_cursor() {
-        let mut s = Scrub::new();
-        s.injected = true;
-        s.begin();
-        s.move_to(pos2(799.0, 108.0));
-        assert!(s.warps.is_empty());
-    }
-
-    #[test]
-    fn normal_pointer_movement_does_not_warp() {
-        let mut s = Scrub::new();
-        s.move_to(pos2(799.0, 108.0));
-        assert!(s.warps.is_empty());
-    }
-
-    #[test]
-    fn standard_editor_wraps_at_top_bottom_and_corner_without_a_value_jump() {
-        let mut s = Scrub::new();
-        s.standard = true;
-        s.begin();
-        for edge in [pos2(200.0, 0.0), pos2(200.0, 599.0), pos2(799.0, 599.0)] {
-            s.move_to(edge);
-            let target = *s.warps.last().unwrap();
-            assert_ne!(target, edge);
-            let before = s.value;
-            s.move_to(target);
-            assert_eq!(s.value, before);
-            s.move_to(target + vec2(5.0, -5.0));
-            assert_eq!(s.value, before + 10.0);
-        }
-    }
-
-    #[test]
-    fn release_and_focus_loss_end_wrapping_and_restore_normal_hit_testing() {
-        for lose_focus in [false, true] {
-            let mut s = Scrub::new();
-            s.begin();
-            s.move_to(pos2(799.0, 108.0));
-            let target = *s.warps.last().unwrap();
-            s.move_to(target);
-            let value = s.value;
-            let events = if lose_focus {
-                vec![Event::WindowFocused(false)]
-            } else {
-                vec![Event::PointerButton { pos: target, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }]
-            };
-            s.frame(events, !lose_focus);
-            s.move_to(pos2(799.0, 108.0));
-            assert_eq!(s.warps.len(), 1);
-            assert_eq!(s.value, value);
-            assert_eq!(s.ctx.input(|i| i.pointer.latest_pos()), Some(pos2(799.0, 108.0)));
-            s.begin();
-            s.move_to(pos2(799.0, 108.0));
-            assert_eq!(s.warps.len(), 2, "the next independent drag still wraps");
-        }
-    }
-
-    #[test]
-    fn object_drag_does_not_wrap_and_failed_warp_is_not_retried() {
-        let mut s = Scrub::new();
-        s.ordinary = true;
-        s.begin();
-        s.move_to(pos2(799.0, 108.0));
-        assert!(s.warps.is_empty());
-
-        let mut s = Scrub::new();
-        s.accept_warp = false;
-        s.begin();
-        s.move_to(pos2(799.0, 108.0));
-        for _ in 0..3 {
-            s.move_to(pos2(799.0, 108.0));
-        }
-        assert_eq!(s.warps.len(), 1);
-        let value = s.value;
-        s.move_to(pos2(779.0, 108.0));
-        assert_eq!(s.value, value - 20.0);
-    }
-
-    #[test]
-    fn modifiers_keep_their_sensitivity_after_wrapping() {
-        for (modifiers, multiplier) in [(Modifiers::SHIFT, 10.0), (Modifiers::COMMAND, 0.1)] {
-            let mut s = Scrub::new();
-            s.modifiers = modifiers;
-            s.begin();
-            s.move_to(pos2(799.0, 108.0));
-            let target = *s.warps.last().unwrap();
-            let value = s.value;
-            s.move_to(target + vec2(10.0, 0.0));
-            assert!((s.value - value - 10.0 * multiplier).abs() < 1e-8);
-        }
-    }
-
-    #[test]
-    fn monitor_rect_can_extend_beyond_the_app_and_have_a_negative_origin() {
-        let mut s = Scrub::new();
-        s.bounds = Rect::from_min_size(pos2(-200.0, -100.0), vec2(1200.0, 800.0));
-        s.begin();
-        s.move_to(pos2(999.0, 108.0));
-        let target = *s.warps.last().unwrap();
-        assert_eq!(target, pos2(-192.0, 108.0));
-        let value = s.value;
-        s.frame(vec![Event::PointerGone, Event::PointerMoved(target)], true);
-        assert_eq!(s.value, value);
-        s.move_to(target + vec2(10.0, 0.0));
-        assert_eq!(s.value, value + 10.0);
-    }
-
-    #[test]
-    fn real_properties_and_angle_drags_keep_each_gesture_in_one_undo_step() {
-        use crate::{EffectcraftApp, dock::PanelKind};
-        use effectcraft_engine::project::LayerId;
-        use eframe::App;
-        use serde_json::json;
-
-        for angle in [false, true] {
-            let mut session = effectcraft_host::session();
-            session.execute("comp.new", json!({"width": 32, "height": 16})).unwrap();
-            let lid = session.execute("layer.newSolid", json!({"width": 8, "height": 8})).unwrap()["layer"].as_u64().unwrap();
-            let path = if angle { "transform/rotation" } else { "transform/position" };
-            let prop = session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.prop(path).unwrap();
-            let uid = prop.uid;
-            let original = prop.value.clone();
-            let undo = session.history.undo.len();
-            let panel = PanelKind::Properties;
-            let id = if angle { format!("properties.prop.{uid}.value") } else { format!("properties.prop.{uid}.value.0") };
-            let mut app = EffectcraftApp::new(session);
-            app.show_panel(panel);
-            app.toggle_maximize(panel);
-            let ctx = Context::default();
-            let bounds = Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1000.0));
-            let mut frame = eframe::Frame::_new_kittest();
-            let mut time = 0.0;
-            let mut step = |app: &mut EffectcraftApp, events| {
-                time += 1.0 / 60.0;
-                let mut raw = RawInput { screen_rect: Some(bounds), time: Some(time), events, ..Default::default() };
-                app.raw_input_hook(&ctx, &mut raw);
-                let mut warp = None;
-                let mut out = ctx.run_ui(raw, |ui| {
-                    app.logic(ui.ctx(), &mut frame);
-                    app.ui(ui, &mut frame);
-                    finish_frame(ui.ctx(), bounds, |p| {
-                        warp = Some(p);
-                        Some(p)
-                    });
-                });
-                out.textures_delta.clear();
-                warp
-            };
-            for _ in 0..4 {
-                step(&mut app, vec![]);
-            }
-            for gesture in 1..=2 {
-                let direction = if gesture == 1 { -1.0 } else { 1.0 };
-                let r = app.auto.find(&id).unwrap().rect;
-                let p = pos2(r[0] + r[2] / 2.0, r[1] + r[3] / 2.0);
-                step(
-                    &mut app,
-                    vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
-                );
-                step(&mut app, vec![Event::PointerMoved(p + vec2(direction * 10.0, 0.0))]);
-                let mut last = p;
-                for _ in 0..3 {
-                    let edge = if direction < 0.0 { 1.0 } else { 1599.0 };
-                    let target = step(&mut app, vec![Event::PointerMoved(pos2(edge, p.y))]).expect("real property scrubs wrap");
-                    let before = app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value.clone();
-                    step(&mut app, vec![Event::PointerMoved(target)]);
-                    assert_eq!(app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value, before);
-                    last = target + vec2(direction * 10.0, 0.0);
-                    step(&mut app, vec![Event::PointerMoved(last)]);
-                    if angle {
-                        let value = app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value.as_f64();
-                        assert!((value - before.as_f64() - f64::from(direction) * 5.0).abs() < 1e-6);
-                    }
-                }
-                step(&mut app, vec![Event::PointerButton { pos: last, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }]);
-                assert_eq!(app.session.history.undo.len(), undo + gesture, "each drag is one undo step: {panel:?}");
-            }
-            app.session.execute("edit.undo", json!({})).unwrap();
-            app.session.execute("edit.undo", json!({})).unwrap();
-            assert_eq!(app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value, original);
-        }
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/pointer_wrap/tests.rs b/crates/ui-egui/src/pointer_wrap/tests.rs
new file mode 100644
index 000000000..314f7ad3d
--- /dev/null
+++ b/crates/ui-egui/src/pointer_wrap/tests.rs
@@ -0,0 +1,343 @@
+use super::*;
+use egui::{Event, Id, Modifiers, PointerButton, pos2, vec2};
+
+struct Scrub {
+    ctx: Context,
+    value: f64,
+    bounds: Rect,
+    time: f64,
+    accept_warp: bool,
+    warps: Vec<Pos2>,
+    standard: bool,
+    ordinary: bool,
+    angle: bool,
+    angle_rects: Option<(Rect, Rect)>,
+    modifiers: Modifiers,
+    injected: bool,
+}
+
+impl Scrub {
+    fn new() -> Self {
+        Self {
+            ctx: Context::default(),
+            value: 0.0,
+            bounds: Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0)),
+            time: 0.0,
+            accept_warp: true,
+            warps: Vec::new(),
+            standard: false,
+            ordinary: false,
+            angle: false,
+            angle_rects: None,
+            modifiers: Modifiers::NONE,
+            injected: false,
+        }
+    }
+
+    fn frame(&mut self, events: Vec<Event>, focused: bool) {
+        self.time += 0.02;
+        let mut raw =
+            RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), time: Some(self.time), events, focused, ..Default::default() };
+        raw.events.push(Event::ModifiersChanged(self.modifiers));
+        prepare_input(&self.ctx, &mut raw, self.injected);
+        let mut out = self.ctx.run_ui(raw, |ui| {
+            if self.standard {
+                ui.put(
+                    Rect::from_min_size(pos2(100.0, 100.0), vec2(60.0, 20.0)),
+                    crate::widgets::drag_value(egui::DragValue::new(&mut self.value).speed(1.0).max_decimals(3)),
+                );
+            } else if self.ordinary {
+                ui.interact(Rect::from_min_size(pos2(100.0, 100.0), vec2(60.0, 20.0)), Id::unique("ordinary"), egui::Sense::drag());
+            } else if self.angle {
+                let (rr, dr, value) = crate::panels::fx_widgets::angle_field(
+                    ui,
+                    pos2(100.0, 100.0),
+                    Id::unique("scrub"),
+                    self.value,
+                    1,
+                    &crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark),
+                );
+                self.angle_rects = Some((rr, dr));
+                if let Some(v) = value {
+                    self.value = v;
+                }
+            } else {
+                let (_, value, _) = crate::widgets::hot_number_at(
+                    ui,
+                    pos2(100.0, 100.0),
+                    Id::unique("scrub"),
+                    self.value,
+                    &crate::widgets::HotSpec { speed: 1.0, range: (-1e9, 1e9), decimals: 1, suffix: "" },
+                    &crate::theme::Tokens::for_kind(crate::theme::ThemeKind::Dark),
+                );
+                if let Some(v) = value {
+                    self.value = v;
+                }
+            }
+            finish_frame(ui.ctx(), self.bounds, |p| {
+                self.warps.push(p);
+                self.accept_warp.then_some(p)
+            });
+        });
+        out.textures_delta.clear();
+    }
+
+    fn move_to(&mut self, p: Pos2) {
+        self.frame(vec![Event::PointerMoved(p)], true);
+    }
+
+    fn begin(&mut self) {
+        self.frame(vec![], true);
+        let p = pos2(105.0, 108.0);
+        self.frame(
+            vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
+            true,
+        );
+        self.move_to(p + vec2(10.0, 0.0));
+    }
+}
+
+#[test]
+fn angle_degrees_continue_across_zero_and_repeated_monitor_wraps() {
+    for initial in [0.0, 359.5, -359.5, 720.0, -720.0] {
+        for direction in [-1.0, 1.0] {
+            let mut s = Scrub::new();
+            s.angle = true;
+            s.value = initial;
+            s.frame(vec![], true);
+            let p = s.angle_rects.unwrap().1.center();
+            s.frame(
+                vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
+                true,
+            );
+            let mut last = p;
+            let mut expected = initial;
+            // Feed small real movements, including zero/whole-turn crossings, then
+            // the synthetic OS warp. Every real pixel contributes exactly once.
+            for step in 0..800 {
+                let direction = if step < 400 { direction } else { -direction };
+                let next = pos2((last.x + direction * 13.0).clamp(1.0, 799.0), last.y);
+                expected += f64::from(next.x - last.x) * 0.5;
+                let count = s.warps.len();
+                s.move_to(next);
+                assert!((s.value - expected).abs() < 1e-6, "initial={initial}, direction={direction}, actual={}, expected={expected}", s.value);
+                last = next;
+                if s.warps.len() > count {
+                    last = *s.warps.last().unwrap();
+                    s.move_to(last);
+                    assert!((s.value - expected).abs() < 1e-6, "the teleport must not reset the angle");
+                }
+            }
+            assert!(s.warps.len() >= 5);
+        }
+    }
+}
+
+#[test]
+fn numeric_drag_wraps_repeatedly_without_counting_the_teleport() {
+    let mut s = Scrub::new();
+    s.begin();
+    for _ in 0..5 {
+        s.move_to(pos2(799.0, 108.0));
+        let target = *s.warps.last().expect("numeric drag must wrap at the monitor edge");
+        assert!(target.x < 16.0);
+        let before = s.value;
+        s.move_to(target);
+        assert_eq!(s.value, before, "the warp itself must not change the value");
+        s.move_to(target + vec2(20.0, 0.0));
+        assert_eq!(s.value, before + 20.0);
+    }
+    assert_eq!(s.warps.len(), 5);
+    s.move_to(pos2(0.0, 108.0));
+    let target = *s.warps.last().unwrap();
+    assert!(target.x > 780.0);
+    let before = s.value;
+    s.move_to(target - vec2(3.0, 0.0));
+    assert_eq!(s.value, before - 3.0, "coalesced movement after a left-edge warp is preserved");
+}
+
+/// An agent's `ui.drag` over the control channel scrubs the value but never moves the user's
+/// real cursor, even at the window's (monitor's) edge.
+#[test]
+fn injected_drags_never_warp_the_real_cursor() {
+    let mut s = Scrub::new();
+    s.injected = true;
+    s.begin();
+    s.move_to(pos2(799.0, 108.0));
+    assert!(s.warps.is_empty());
+}
+
+#[test]
+fn normal_pointer_movement_does_not_warp() {
+    let mut s = Scrub::new();
+    s.move_to(pos2(799.0, 108.0));
+    assert!(s.warps.is_empty());
+}
+
+#[test]
+fn standard_editor_wraps_at_top_bottom_and_corner_without_a_value_jump() {
+    let mut s = Scrub::new();
+    s.standard = true;
+    s.begin();
+    for edge in [pos2(200.0, 0.0), pos2(200.0, 599.0), pos2(799.0, 599.0)] {
+        s.move_to(edge);
+        let target = *s.warps.last().unwrap();
+        assert_ne!(target, edge);
+        let before = s.value;
+        s.move_to(target);
+        assert_eq!(s.value, before);
+        s.move_to(target + vec2(5.0, -5.0));
+        assert_eq!(s.value, before + 10.0);
+    }
+}
+
+#[test]
+fn release_and_focus_loss_end_wrapping_and_restore_normal_hit_testing() {
+    for lose_focus in [false, true] {
+        let mut s = Scrub::new();
+        s.begin();
+        s.move_to(pos2(799.0, 108.0));
+        let target = *s.warps.last().unwrap();
+        s.move_to(target);
+        let value = s.value;
+        let events = if lose_focus {
+            vec![Event::WindowFocused(false)]
+        } else {
+            vec![Event::PointerButton { pos: target, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }]
+        };
+        s.frame(events, !lose_focus);
+        s.move_to(pos2(799.0, 108.0));
+        assert_eq!(s.warps.len(), 1);
+        assert_eq!(s.value, value);
+        assert_eq!(s.ctx.input(|i| i.pointer.latest_pos()), Some(pos2(799.0, 108.0)));
+        s.begin();
+        s.move_to(pos2(799.0, 108.0));
+        assert_eq!(s.warps.len(), 2, "the next independent drag still wraps");
+    }
+}
+
+#[test]
+fn object_drag_does_not_wrap_and_failed_warp_is_not_retried() {
+    let mut s = Scrub::new();
+    s.ordinary = true;
+    s.begin();
+    s.move_to(pos2(799.0, 108.0));
+    assert!(s.warps.is_empty());
+
+    let mut s = Scrub::new();
+    s.accept_warp = false;
+    s.begin();
+    s.move_to(pos2(799.0, 108.0));
+    for _ in 0..3 {
+        s.move_to(pos2(799.0, 108.0));
+    }
+    assert_eq!(s.warps.len(), 1);
+    let value = s.value;
+    s.move_to(pos2(779.0, 108.0));
+    assert_eq!(s.value, value - 20.0);
+}
+
+#[test]
+fn modifiers_keep_their_sensitivity_after_wrapping() {
+    for (modifiers, multiplier) in [(Modifiers::SHIFT, 10.0), (Modifiers::COMMAND, 0.1)] {
+        let mut s = Scrub::new();
+        s.modifiers = modifiers;
+        s.begin();
+        s.move_to(pos2(799.0, 108.0));
+        let target = *s.warps.last().unwrap();
+        let value = s.value;
+        s.move_to(target + vec2(10.0, 0.0));
+        assert!((s.value - value - 10.0 * multiplier).abs() < 1e-8);
+    }
+}
+
+#[test]
+fn monitor_rect_can_extend_beyond_the_app_and_have_a_negative_origin() {
+    let mut s = Scrub::new();
+    s.bounds = Rect::from_min_size(pos2(-200.0, -100.0), vec2(1200.0, 800.0));
+    s.begin();
+    s.move_to(pos2(999.0, 108.0));
+    let target = *s.warps.last().unwrap();
+    assert_eq!(target, pos2(-192.0, 108.0));
+    let value = s.value;
+    s.frame(vec![Event::PointerGone, Event::PointerMoved(target)], true);
+    assert_eq!(s.value, value);
+    s.move_to(target + vec2(10.0, 0.0));
+    assert_eq!(s.value, value + 10.0);
+}
+
+#[test]
+fn real_properties_and_angle_drags_keep_each_gesture_in_one_undo_step() {
+    use crate::{EffectcraftApp, dock::PanelKind};
+    use effectcraft_engine::project::LayerId;
+    use eframe::App;
+    use serde_json::json;
+
+    for angle in [false, true] {
+        let mut session = effectcraft_host::session();
+        session.execute("comp.new", json!({"width": 32, "height": 16})).unwrap();
+        let lid = session.execute("layer.newSolid", json!({"width": 8, "height": 8})).unwrap()["layer"].as_u64().unwrap();
+        let path = if angle { "transform/rotation" } else { "transform/position" };
+        let prop = session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.prop(path).unwrap();
+        let uid = prop.uid;
+        let original = prop.value.clone();
+        let undo = session.history.undo.len();
+        let panel = PanelKind::Properties;
+        let id = if angle { format!("properties.prop.{uid}.value") } else { format!("properties.prop.{uid}.value.0") };
+        let mut app = EffectcraftApp::new(session);
+        app.show_panel(panel);
+        app.toggle_maximize(panel);
+        let ctx = Context::default();
+        let bounds = Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1000.0));
+        let mut frame = eframe::Frame::_new_kittest();
+        let mut time = 0.0;
+        let mut step = |app: &mut EffectcraftApp, events| {
+            time += 1.0 / 60.0;
+            let mut raw = RawInput { screen_rect: Some(bounds), time: Some(time), events, ..Default::default() };
+            app.raw_input_hook(&ctx, &mut raw);
+            let mut warp = None;
+            let mut out = ctx.run_ui(raw, |ui| {
+                app.logic(ui.ctx(), &mut frame);
+                app.ui(ui, &mut frame);
+                finish_frame(ui.ctx(), bounds, |p| {
+                    warp = Some(p);
+                    Some(p)
+                });
+            });
+            out.textures_delta.clear();
+            warp
+        };
+        for _ in 0..4 {
+            step(&mut app, vec![]);
+        }
+        for gesture in 1..=2 {
+            let direction = if gesture == 1 { -1.0 } else { 1.0 };
+            let r = app.auto.find(&id).unwrap().rect;
+            let p = pos2(r[0] + r[2] / 2.0, r[1] + r[3] / 2.0);
+            step(
+                &mut app,
+                vec![Event::PointerMoved(p), Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE }],
+            );
+            step(&mut app, vec![Event::PointerMoved(p + vec2(direction * 10.0, 0.0))]);
+            let mut last = p;
+            for _ in 0..3 {
+                let edge = if direction < 0.0 { 1.0 } else { 1599.0 };
+                let target = step(&mut app, vec![Event::PointerMoved(pos2(edge, p.y))]).expect("real property scrubs wrap");
+                let before = app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value.clone();
+                step(&mut app, vec![Event::PointerMoved(target)]);
+                assert_eq!(app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value, before);
+                last = target + vec2(direction * 10.0, 0.0);
+                step(&mut app, vec![Event::PointerMoved(last)]);
+                if angle {
+                    let value = app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value.as_f64();
+                    assert!((value - before.as_f64() - f64::from(direction) * 5.0).abs() < 1e-6);
+                }
+            }
+            step(&mut app, vec![Event::PointerButton { pos: last, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE }]);
+            assert_eq!(app.session.history.undo.len(), undo + gesture, "each drag is one undo step: {panel:?}");
+        }
+        app.session.execute("edit.undo", json!({})).unwrap();
+        app.session.execute("edit.undo", json!({})).unwrap();
+        assert_eq!(app.session.active_comp().unwrap().layer(LayerId(lid)).unwrap().props.find(uid).unwrap().value, original);
+    }
+}
diff --git a/crates/ui-egui/src/prefs_live.rs b/crates/ui-egui/src/prefs_live.rs
index 321e432e9..ee222c892 100644
--- a/crates/ui-egui/src/prefs_live.rs
+++ b/crates/ui-egui/src/prefs_live.rs
@@ -11,10 +11,14 @@ use serde_json::json;
 use crate::EffectcraftApp;
 use crate::frames::FrameKey;
 
-/// Run once per frame, before the panels draw.
-pub fn frame(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    memory_watch(app, ctx);
+/// Settings read once per tick, before any paint (they must keep working while hidden).
+pub fn tick(app: &mut EffectcraftApp, ctx: &egui::Context, now: f64) {
+    memory_watch(app, ctx, now);
     home_on_open(app, ctx);
+}
+
+/// Settings that show or draw something: run in the UI pass, before the panels draw.
+pub fn frame(app: &mut EffectcraftApp, ctx: &egui::Context) {
     video_preview(app, ctx);
 }
 
@@ -29,7 +33,7 @@ pub fn dropped_files(app: &mut EffectcraftApp, ui: &egui::Ui, bounds: Rect) {
     if hovered != 0 {
         let label =
             if hovered == 1 { crate::i18n::tr("Drop file to import").to_string() } else { crate::i18n::tr_args("Drop {} files to import", &[&hovered]) };
-        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::new("native-file-drop")));
+        let painter = ctx.layer_painter(egui::LayerId::new(egui::Order::Foreground, egui::Id::unique("native-file-drop")));
         painter.rect_stroke(bounds.shrink(8.0), 6.0, Stroke::new(2.0, app.tokens.accent), StrokeKind::Inside);
         let hint = Rect::from_center_size(bounds.center(), vec2(300.0, 46.0));
         painter.rect_filled(hint, 6.0, app.tokens.panel_bg);
@@ -120,9 +124,8 @@ pub fn dropped_files(app: &mut EffectcraftApp, ui: &egui::Ui, bounds: Rect) {
 
 /// Re-read the system's free memory every 30 s (cache budgets follow it; on Windows each
 /// reading starts PowerShell in the background, so it isn't done more often).
-fn memory_watch(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    let now = ctx.input(|i| i.time);
-    let id = egui::Id::new("prefs-memory-watch");
+pub(crate) fn memory_watch(app: &mut EffectcraftApp, ctx: &egui::Context, now: f64) {
+    let id = egui::Id::unique("prefs-memory-watch");
     let last = ctx.data(|d| d.get_temp::<f64>(id));
     if last.is_some_and(|t| now - t < 30.0) {
         return;
@@ -135,8 +138,8 @@ fn memory_watch(app: &mut EffectcraftApp, ctx: &egui::Context) {
 }
 
 /// Startup ▸ Show Home Screen When Opening a Project.
-fn home_on_open(app: &mut EffectcraftApp, ctx: &egui::Context) {
-    let id = egui::Id::new("prefs-last-project");
+pub(crate) fn home_on_open(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    let id = egui::Id::unique("prefs-last-project");
     let path = app.session.path.clone();
     let last = ctx.data(|d| d.get_temp::<Option<String>>(id));
     ctx.data_mut(|d| d.insert_temp(id, path.clone()));
@@ -169,7 +172,7 @@ fn video_preview(app: &mut EffectcraftApp, ctx: &egui::Context) {
         return;
     }
     let v = app.session.prefs.video.clone();
-    let tex_id = egui::Id::new("video-preview-tex");
+    let tex_id = egui::Id::unique("video-preview-tex");
     let update = !app.playback.playing || v.output_during_playback;
     let key = app.viewer_shown.as_ref().map(|(_, k)| *k);
     let cur: Option<(FrameKey, egui::TextureHandle)> = ctx.data(|d| d.get_temp(tex_id));
diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs
index bbfe0c05f..3a96d3c50 100644
--- a/crates/ui-egui/src/state.rs
+++ b/crates/ui-egui/src/state.rs
@@ -4,7 +4,7 @@ use std::collections::{BTreeMap, BTreeSet};
 
 use serde::{Deserialize, Serialize};
 
-use crate::dock::{DockNode, PanelKind};
+use crate::dock::PanelKind;
 use crate::icons::Icon;
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -229,6 +229,7 @@ impl Tool {
     }
 }
 
+use super::*;
 /// The viewer's Resolution: each composition keeps its own in the project
 /// ([`effectcraft_engine::project::Comp::resolution`], `EffectcraftApp::viewer_res`).
 pub use effectcraft_engine::project::Resolution;
@@ -568,23 +569,20 @@ pub struct UiState {
     /// Tool shown in each toolbar slot.
     pub slot_tools: Vec<Tool>,
     pub workspace: String,
-    pub dock: DockNode,
+    /// The current layout: docked frames, floating windows (one can be recorded as its own
+    /// native window, Move Panel to New Window) and the places of closed panels.
+    pub dock: crate::dock::Workspace,
     /// Saved workspace layouts (Save Changes to this Workspace / Save as New Workspace).
     #[serde(default)]
-    pub saved_workspaces: std::collections::BTreeMap<String, DockNode>,
-    /// Undocked (floating) panel groups.
-    #[serde(default)]
-    pub floating: Vec<crate::dock::Floating>,
-    /// Floating panels of the saved workspaces.
-    #[serde(default)]
-    pub saved_floating: std::collections::BTreeMap<String, Vec<crate::dock::Floating>>,
-    /// Floating groups shown in their own native window instead of over the dock (Move Panel
-    /// to New Window), so they can be placed on another monitor.
-    #[serde(default)]
-    pub panel_windows: Vec<crate::dock::PanelWindow>,
+    pub saved_workspaces: std::collections::BTreeMap<String, crate::dock::Workspace>,
     /// The panel maximized to fill the dock area (`~`), if any.
     #[serde(default)]
     pub maximized: Option<PanelKind>,
+    /// Floating windows of [`Self::dock`] whose native rect holds the OS window's outer
+    /// position, from a workspace file of an earlier version (see
+    /// `crate::dock_ui::native_outer_to_content`). Workspaces are not saved while any remain.
+    #[serde(skip)]
+    pub native_outer: Vec<u64>,
     /// Locked Composition / Timeline tabs (panel ids): opening another composition does not
     /// bring a locked panel forward (the tab's lock icon, as After Effects' viewer lock).
     #[serde(default)]
@@ -643,9 +641,6 @@ pub struct UiState {
     /// Levels (Individual Controls) editor: shown channel per effect uid.
     #[serde(default)]
     pub fx_levels_channel: BTreeMap<u64, usize>,
-    /// Effects & Presets: favourite effect ids (starred).
-    #[serde(default)]
-    pub effects_favorites: BTreeSet<String>,
     /// Effects & Presets: recently applied effect ids, most recent first.
     #[serde(default)]
     pub effects_recent: Vec<String>,
@@ -703,11 +698,9 @@ impl Default for UiState {
             script_console: Default::default(),
             slot_tools: Tool::SLOTS.iter().map(|s| s[0]).collect(),
             workspace: "Default".into(),
-            dock: crate::dock::workspace("Default"),
+            dock: crate::dock::Workspace::new(crate::dock::workspace("Default")),
             saved_workspaces: Default::default(),
-            floating: vec![],
-            saved_floating: Default::default(),
-            panel_windows: vec![],
+            native_outer: Vec::new(),
             maximized: None,
             locked_tabs: BTreeSet::new(),
             viewers: Default::default(),
@@ -734,7 +727,6 @@ impl Default for UiState {
             fx_curve_channel: BTreeMap::new(),
             fx_curve_pencil: BTreeSet::new(),
             fx_levels_channel: BTreeMap::new(),
-            effects_favorites: BTreeSet::new(),
             effects_recent: Vec::new(),
             effects_view: EffectsView::default(),
             snapping: true,
@@ -755,3 +747,48 @@ impl Default for UiState {
         }
     }
 }
+
+/// What a `ui.screenshot` captures.
+///
+/// A panel or element is an identity, not a rectangle: it is resolved again when the capture is
+/// issued, after the settle passes, so a panel that moved or resized while the UI settled is
+/// captured where it is now (never with the rectangle from request admission).
+#[derive(Clone, Debug, PartialEq)]
+pub enum ShotTarget {
+    /// The whole root surface.
+    Window,
+    /// A fixed rectangle in logical points, relative to the root surface's top-left corner.
+    Rect([f32; 4]),
+    /// One dock panel's automation rectangle (`panel.<id>`).
+    Panel(PanelKind),
+    /// One automation element id's rectangle.
+    Id(String),
+}
+
+/// The comp frames a playback pass covers (`first..=last`).
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct FrameWindow {
+    pub(crate) first: i64,
+    pub(crate) last: i64,
+}
+
+/// The inputs of one playback pass: the viewer series it renders, the preview plan and
+/// position, and the frame range and clock settings its steps share. `queued` is a snapshot of
+/// the in-flight render count that each step copies. Built once in `advance_playback`.
+#[derive(Clone, Copy)]
+pub(crate) struct PlaybackPass<'a> {
+    pub(crate) ctx: &'a egui::Context,
+    pub(crate) comp: &'a effectcraft_engine::project::Comp,
+    pub(crate) cid: ItemId,
+    pub(crate) scale: f64,
+    pub(crate) now: f64,
+    pub(crate) frame_rate: effectcraft_engine::time::FrameRate,
+    pub(crate) series: FrameKey,
+    pub(crate) plan: Option<effectcraft_engine::preview::PreviewPlan>,
+    pub(crate) window: FrameWindow,
+    pub(crate) cur: i64,
+    pub(crate) video: bool,
+    pub(crate) looping: bool,
+    pub(crate) ahead: i64,
+    pub(crate) queued: usize,
+}
diff --git a/crates/ui-egui/src/theme.rs b/crates/ui-egui/src/theme.rs
index f5a0664c2..b1538971f 100644
--- a/crates/ui-egui/src/theme.rs
+++ b/crates/ui-egui/src/theme.rs
@@ -311,6 +311,8 @@ impl Tokens {
     }
 }
 
+/// The default label colours, one RGB colour per [`effectcraft_color::Label`] in
+/// `Label::ALL` order.
 fn default_labels() -> [Color32; 17] {
     effectcraft_color::Label::ALL.map(|l| {
         let [r, g, b] = l.rgb();
@@ -322,9 +324,13 @@ static INTER_REGULAR: &[u8] = include_bytes!("../../../assets/fonts/Inter-Regula
 static INTER_MEDIUM: &[u8] = include_bytes!("../../../assets/fonts/Inter-Medium.ttf");
 static INTER_SEMIBOLD: &[u8] = include_bytes!("../../../assets/fonts/Inter-SemiBold.ttf");
 static JETBRAINS_MONO: &[u8] = include_bytes!("../../../assets/fonts/JetBrainsMono-Regular.ttf");
+/// Chrome symbols (`✔` U+2714, `▣` U+25A3, …) that Inter, Inter Medium/SemiBold and
+/// JetBrains Mono do not cover. 0.37's default font set no longer includes the old emoji
+/// fonts, and named families (`medium`, `semibold`) never received egui's default fallbacks.
+static NOTO_SYMBOLS2: &[u8] = include_bytes!("../../../assets/fonts/NotoSansSymbols2-Regular.ttf");
 
 /// Install fonts (Inter, Inter Medium/SemiBold, JetBrains Mono) and egui visuals. `language` is the
-/// resolved interface language from [`crate::i18n::language`] (`en`, `ja`, `zh-hans` or `zh-hant`),
+/// resolved interface language from `crate::i18n::language` (`en`, `ja`, `zh-hans` or `zh-hant`),
 /// not the stored `general.language` preference: `system` is already resolved there, so a Chinese
 /// system draws Chinese with the default setting. The CJK fallback that draws the interface's own
 /// script is registered first, so a Chinese interface is drawn by a Chinese face and a Japanese one
@@ -336,16 +342,20 @@ pub fn install(ctx: &egui::Context, t: &Tokens, language: &str) {
     fonts.font_data.insert("inter-medium".into(), Arc::new(FontData::from_static(INTER_MEDIUM)));
     fonts.font_data.insert("inter-semibold".into(), Arc::new(FontData::from_static(INTER_SEMIBOLD)));
     fonts.font_data.insert("jbmono".into(), Arc::new(FontData::from_static(JETBRAINS_MONO)));
+    fonts.font_data.insert("noto-symbols2".into(), Arc::new(FontData::from_static(NOTO_SYMBOLS2)));
     fonts.families.entry(FontFamily::Proportional).or_default().insert(0, "inter".into());
     fonts.families.entry(FontFamily::Monospace).or_default().insert(0, "jbmono".into());
     fonts.families.insert(FontFamily::Name("semibold".into()), vec!["inter-semibold".into(), "inter".into()]);
     fonts.families.insert(FontFamily::Name("medium".into()), vec!["inter-medium".into(), "inter".into()]);
     // Inter and egui's own fallbacks have no small triangles (the `▸` of "File ▸ Import"), which
     // would draw as missing-glyph boxes: JetBrains Mono fills in the symbols the others lack.
+    // Noto Sans Symbols 2 follows it for the check/box glyphs (`✔`, `▣`) that JetBrains Mono
+    // lacks; without it, named families such as `medium` fall straight through to tofu.
     for (family, stack) in &mut fonts.families {
         if *family != FontFamily::Monospace {
             stack.push("jbmono".into());
         }
+        stack.push("noto-symbols2".into());
     }
     install_script_fallbacks(&mut fonts, language);
     ctx.set_fonts(fonts);
@@ -370,6 +380,7 @@ const SCRIPT_PROBES: &[(char, &str)] = &[
     ('ಕ', "kannada-system"),
     ('ക', "malayalam-system"),
     ('ก', "thai-system"),
+    ('ა', "georgian-system"),
 ];
 
 /// Register the system fallbacks for scripts the bundled fonts lack in every font family, and
@@ -408,21 +419,46 @@ fn install_script_fallbacks(family_fonts: &mut FontDefinitions, language: &str)
         let cjk = if is_chinese(language) { [han, KANA] } else { [KANA, han] };
         let mut names = Vec::new();
         let mut seen = Vec::new();
-        for &(probe, name) in cjk.iter().chain(SCRIPT_PROBES).chain(std::iter::once(&HANGUL)) {
-            let id = fonts::fallback_for(probe, base);
-            if seen.contains(&id) {
+        // A font covering one Han probe may be a sparse subset. Register additional faces
+        // needed by the actual interface catalog instead of assuming whole-script coverage.
+        let extra = if is_chinese(language) { crate::i18n::catalog_characters(language) } else { Vec::new() };
+        let extra: Vec<_> = extra.into_iter().filter(|ch| *ch >= '\u{2e80}').map(|ch| (ch, "catalog-system")).collect();
+        // 256-character blocks where a catalog character found no face: with nothing installed
+        // covering them, each lookup would read every installed font file again.
+        let mut uncovered_blocks = std::collections::HashSet::new();
+        for &(probe, name) in cjk.iter().chain(SCRIPT_PROBES).chain(std::iter::once(&HANGUL)).chain(&extra) {
+            let catalog = name == "catalog-system";
+            if catalog && (uncovered_blocks.contains(&(probe as u32 >> 8)) || seen.iter().any(|&id| fonts::face(id).has_char(probe))) {
                 continue;
             }
+            // The interface asks for the platform's UI face first; the order a composed frame
+            // renders with is `fonts::fallback_for`'s and is not touched here. Another context may
+            // install a different language concurrently, so the shared fallback is asked with this
+            // context's own locale rather than the global request.
+            let id = interface_fallback_candidates(name, language)
+                .iter()
+                .find_map(|family| {
+                    let r = fonts::resolve(family, "Regular");
+                    (!r.missing && fonts::face(r.face).has_char(probe)).then_some(r.face)
+                })
+                .unwrap_or_else(|| fonts::fallback_for_locale(probe, base, cjk_locale(language)));
             let face = fonts::face(id);
             if !face.has_char(probe) {
+                if catalog {
+                    uncovered_blocks.insert(probe as u32 >> 8);
+                }
                 continue; // nothing installed covers this script
             }
+            if seen.contains(&id) {
+                continue;
+            }
             let Some(font) = face.font() else { continue };
             seen.push(id);
             // Use the already-read, parsed bytes rather than reading a font file twice.
             let mut data = FontData::from_owned(font.data().as_bytes().to_vec());
             data.index = face.info.index;
-            family_fonts.font_data.insert(name.to_string(), Arc::new(data));
+            let name = if name == "catalog-system" { format!("{name}-{:x}", probe as u32) } else { name.to_string() };
+            family_fonts.font_data.insert(name.clone(), Arc::new(data));
             for family in family_fonts.families.values_mut() {
                 family.push(name.to_string());
             }
@@ -432,6 +468,31 @@ fn install_script_fallbacks(family_fonts: &mut FontDefinitions, language: &str)
     }
 }
 
+/// The faces the interface asks for before it settles on the one a composed frame renders with.
+///
+/// Windows ships a UI variant of its Japanese and Chinese families - `Meiryo`/`Meiryo UI`, `Yu
+/// Gothic`/`Yu Gothic UI`, `MS Gothic`/`MS UI Gothic`, `Microsoft YaHei`/`Microsoft YaHei UI`,
+/// `Microsoft JhengHei`/`Microsoft JhengHei UI` - and its own link table for `Segoe UI`
+/// (`FontLink\SystemLink`) picks the UI one for what it draws on screen. `PMingLiU` is the one face
+/// here that is not a sibling: it is `MingLiU`'s proportional relative, and proportional spacing is
+/// what makes the chrome read better in it.
+///
+/// Only the interface takes this order. `fonts::fallback_for` keeps the order a document renders
+/// with, so an existing project's output does not move when the chrome changes.
+#[cfg(not(target_arch = "wasm32"))]
+fn interface_fallback_candidates(name: &str, language: &str) -> &'static [&'static str] {
+    match (name, cjk_locale(language)) {
+        // Kana, and the Han ideographs of a Japanese interface: the language asks for the Japanese
+        // face, so its UI sibling is the one the platform would draw chrome with.
+        ("japanese-system", _) | ("chinese-system", "ja") => &["Meiryo UI", "Yu Gothic UI", "MS UI Gothic"],
+        ("chinese-system", "zh-hant") => &["Microsoft JhengHei UI", "PMingLiU"],
+        ("chinese-system", "zh-hans") => &["Microsoft YaHei UI"],
+        // The other scripts have no UI variant, and their shared order already picks the face made
+        // for the script - the one that draws it correctly at all.
+        _ => &[],
+    }
+}
+
 /// The CJK locale the text engine should prefer for Han text: the interface language when it names
 /// one, otherwise the empty string, which leaves the operating system's locale in charge.
 #[cfg(not(target_arch = "wasm32"))]
@@ -443,9 +504,9 @@ fn cjk_locale(language: &str) -> &str {
 }
 
 /// The Han character that picks the Chinese fallback face. A Simplified Chinese interface asks for
-/// a simplified-only hanzi: a Japanese face covers the shared ideographs (文) but not 页, 选 or 删,
-/// and the fallback takes a face already loaded first, so the Japanese face loaded for kana would
-/// draw the Chinese interface with boxes (#1141).
+/// a hanzi used by its catalog. Some Japanese faces also cover 页 while lacking 选 or 删, so
+/// coverage of this probe alone is not enough: the fallback must use the interface's own language
+/// policy, even while another context is installing Japanese fonts (#1141).
 #[cfg(not(target_arch = "wasm32"))]
 fn han_probe(language: &str) -> char {
     if language == "zh-hans" { '页' } else { '文' }
@@ -530,6 +591,7 @@ pub fn apply_visuals(ctx: &egui::Context, t: &Tokens) {
 
 #[cfg(all(test, not(target_arch = "wasm32")))]
 mod script_font_tests {
+    use super::{SCRIPT_PROBES, interface_fallback_candidates};
     use effectcraft_text::fonts;
 
     /// Whether an installed face covers `probe` (else the glyph check is skipped).
@@ -595,9 +657,35 @@ mod script_font_tests {
         }
     }
 
-    /// #1141: switching the interface to Simplified Chinese drew most labels as boxes. The English
-    /// interface had already loaded a Japanese face for kana, and that face covers the Han probe,
-    /// so it became the Chinese fallback too, without the simplified-only hanzi.
+    #[test]
+    fn the_interface_asks_for_the_platforms_ui_faces() {
+        // The face a window draws its own chrome with, which is not the one a composed frame
+        // renders with: the two orders are deliberately separate.
+        let ja = &["Meiryo UI", "Yu Gothic UI", "MS UI Gothic"][..];
+        assert_eq!(interface_fallback_candidates("japanese-system", "ja"), ja);
+        assert_eq!(interface_fallback_candidates("chinese-system", "ja"), ja);
+        assert_eq!(interface_fallback_candidates("chinese-system", "zh-hans"), &["Microsoft YaHei UI"][..]);
+        assert_eq!(interface_fallback_candidates("chinese-system", "zh-hant"), &["Microsoft JhengHei UI", "PMingLiU"][..]);
+        // Every other script the install probes has no UI variant, so it keeps the shared order.
+        for &(_, name) in SCRIPT_PROBES.iter() {
+            assert!(interface_fallback_candidates(name, "en").is_empty(), "{name} asked for a UI face");
+        }
+    }
+
+    /// The Georgian interface draws its Mkhedruli text with an installed Georgian face (Sylfaen,
+    /// SF Georgian, Noto Sans Georgian…): Inter has no Georgian, so the labels showed as boxes.
+    #[test]
+    fn installed_georgian_fallback_draws_the_georgian_interface() {
+        if !installed('ა') {
+            eprintln!("no Georgian system font installed; skipping glyph coverage");
+            return;
+        }
+        assert_drawn("ka", "კომპოზიციაფენასაკვანძოკადრიეფექტიპარამეტრები");
+    }
+
+    /// #1141: switching the interface to Simplified Chinese drew most labels as boxes. A Japanese face
+    /// can cover the Han probe while lacking other catalog characters. The context must keep its
+    /// own language policy even when another context installs Japanese fallbacks concurrently.
     #[test]
     fn simplified_chinese_interface_draws_simplified_hanzi_after_another_language() {
         let ctx = egui::Context::default();
@@ -609,7 +697,7 @@ mod script_font_tests {
         let font = egui::FontId::new(13.0, egui::FontFamily::Proportional);
         let missing: String = ctx.fonts_mut(|fonts| {
             let replacement = fonts.layout_no_wrap("\u{10ffff}".into(), font.clone(), egui::Color32::WHITE).rows[0].glyphs[0].uv_rect;
-            // Simplified-only hanzi of the zh-hans catalog (选择, 删除, 图层, 设置, 导入, 页面).
+            // Representative hanzi of the zh-hans catalog (选择, 删除, 图层, 设置, 导入, 页面).
             "选删层设导页"
                 .chars()
                 .filter(|ch| {
@@ -708,7 +796,8 @@ mod tests {
             // another test has loaded a system face without `◻` (the fallback tries loaded faces first).
             let uv = |s: String| ctx.fonts_mut(|f| f.layout_no_wrap(s, id.clone(), egui::Color32::WHITE).rows[0].glyphs[0].uv_rect);
             let missing = uv("\u{10ffff}".into());
-            for c in "▸•›·▶◀●○⚠…×".chars() {
+            // Every chrome symbol the panels, menus, shortcut labels and buttons draw.
+            for c in "✔▣✓⚠▶◀▸●○…×›•·−←→↑↓⌘⇧⌥⌃".chars() {
                 let drawn = uv(c.to_string());
                 assert_ne!((drawn.min, drawn.max), (missing.min, missing.max), "{c} has no glyph in {id:?}");
             }
@@ -729,7 +818,7 @@ mod tests {
         }
         let Some(font) = face.font() else { return };
         let bytes = font.data().as_bytes();
-        let covered = fonts_def.font_data.values().any(|d| d.font.as_ref() == bytes && d.index == face.info.index);
+        let covered = fonts_def.font_data.values().any(|d| d.bytes() == bytes && d.index == face.info.index);
         assert!(covered, "a face covering Hangul must be registered with egui");
     }
 
@@ -745,7 +834,7 @@ mod tests {
             .iter()
             .map(|name| {
                 let data = fonts.font_data.get(name).unwrap_or_else(|| panic!("{name} is missing its font data"));
-                (data.font.as_ref(), data.index)
+                (data.bytes(), data.index)
             })
             .collect();
         for (i, a) in faces.iter().enumerate() {
diff --git a/crates/ui-egui/src/updates_ui.rs b/crates/ui-egui/src/updates_ui.rs
new file mode 100644
index 000000000..0101e16ae
--- /dev/null
+++ b/crates/ui-egui/src/updates_ui.rs
@@ -0,0 +1,125 @@
+//! Software updates, background check at startup, and startup prompt modal.
+
+use crate::EffectcraftApp;
+
+#[cfg(not(target_arch = "wasm32"))]
+use craft_update::updater::{Action, Status, Updater};
+
+pub(crate) struct Runtime {
+    #[cfg(not(target_arch = "wasm32"))]
+    updater: Updater,
+    /// The desktop app turns the check at start on; tests and the web build leave it off.
+    #[cfg(not(target_arch = "wasm32"))]
+    startup_check: bool,
+    #[cfg(not(target_arch = "wasm32"))]
+    check_requested: bool,
+    pub(crate) manual_window_open: bool,
+    pub(crate) status_message: Option<String>,
+}
+
+impl Default for Runtime {
+    fn default() -> Self {
+        Self {
+            #[cfg(not(target_arch = "wasm32"))]
+            updater: Updater::new(&craft_update::suite::EFFECTCRAFT, env!("CARGO_PKG_VERSION")),
+            #[cfg(not(target_arch = "wasm32"))]
+            startup_check: false,
+            #[cfg(not(target_arch = "wasm32"))]
+            check_requested: false,
+            manual_window_open: false,
+            status_message: None,
+        }
+    }
+}
+
+impl EffectcraftApp {
+    /// Whether the app asks for a newer release when it starts (off until the desktop app turns it on).
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn set_startup_update_check(&mut self, on: bool) {
+        self.updates_rt.startup_check = on;
+    }
+}
+
+pub(crate) fn check(app: &mut EffectcraftApp) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        app.updates_rt.check_requested = true;
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        app.updates_rt.manual_window_open = true;
+        app.updates_rt.status_message = Some(crate::i18n::tr("Update check is not supported in the web browser.").to_string());
+    }
+}
+
+pub(crate) fn tick(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let rt = &mut app.updates_rt;
+        if std::mem::take(&mut rt.check_requested) {
+            rt.updater.check_now(ctx);
+        } else if rt.startup_check {
+            rt.updater.check_at_start(ctx);
+        }
+        rt.updater.tick(ctx);
+    }
+    #[cfg(target_arch = "wasm32")]
+    let _ = (app, ctx);
+}
+
+pub(crate) fn show(app: &mut EffectcraftApp, ctx: &egui::Context) {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        // The restart helper is scheduled before the app closes, so no update starts over unsaved work.
+        let clean = !app.session.is_dirty();
+        match app.updates_rt.updater.show_if(ctx, clean) {
+            Action::OpenUrl(url) => ctx.open_url(egui::OpenUrl::new_tab(url)),
+            Action::Close => ctx.send_viewport_cmd(egui::ViewportCommand::Close),
+            Action::None => {}
+        }
+        // The window answers Help ▸ Check for Updates, so it follows the updater's status.
+        let rt = &mut app.updates_rt;
+        (rt.manual_window_open, rt.status_message) = match rt.updater.status() {
+            Status::Idle => (false, None),
+            Status::Checking => (true, None),
+            Status::UpToDate => (
+                true,
+                Some(crate::i18n::tr("EffectCraft {version} is currently the newest version available.").replace("{version}", env!("CARGO_PKG_VERSION"))),
+            ),
+            Status::Failed(e) => (true, Some(crate::i18n::tr("Could not check for updates:\n{error}").replace("{error}", e))),
+        };
+    }
+
+    if app.updates_rt.manual_window_open {
+        let mut open = true;
+        let mut close = false;
+        egui::Window::new(crate::i18n::tr("Check for Updates"))
+            .open(&mut open)
+            .resizable(false)
+            .collapsible(false)
+            .anchor(egui::Align2::CENTER_CENTER, egui::vec2(0.0, 0.0))
+            .show(ctx, |ui| {
+                if let Some(msg) = &app.updates_rt.status_message {
+                    ui.label(msg);
+                } else {
+                    ui.label(crate::i18n::tr("Checking for updates…"));
+                }
+                ui.add_space(8.0);
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                    if ui.button(crate::i18n::tr("Close")).clicked() {
+                        close = true;
+                    }
+                });
+            });
+        if !open || close {
+            app.updates_rt.manual_window_open = false;
+            app.updates_rt.status_message = None;
+        }
+    }
+
+    // Closing the window dismisses the outcome it showed.
+    #[cfg(not(target_arch = "wasm32"))]
+    if !app.updates_rt.manual_window_open {
+        app.updates_rt.updater.dismiss_status();
+    }
+}
diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs
index c005224d0..58383fe43 100644
--- a/crates/ui-egui/src/widgets.rs
+++ b/crates/ui-egui/src/widgets.rs
@@ -2,6 +2,8 @@
 
 use egui::{Align2, Color32, Rect, Response, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
 
+use effectcraft_project::ParamUi;
+
 use crate::automation::Registry;
 use crate::icons::{self, Icon};
 use crate::theme::Tokens;
@@ -20,9 +22,11 @@ struct TabOrder {
     pending: Option<(egui::Id, bool, u64)>,
 }
 
+/// The temp-data id of the [`TabOrder`] for the panel containing `ui` (unique per panel scope;
+/// `Id::NULL` outside a tagged panel).
 fn tab_order_id(ui: &Ui) -> egui::Id {
-    let panel = ui.stack().iter().find(|s| s.tags().contains(PANEL_TAG)).map_or(egui::Id::NULL, |s| s.id);
-    egui::Id::new(("hot-tab-order", panel))
+    let panel = ui.stack().iter().find(|s| s.tags().contains(PANEL_TAG)).map_or(egui::Id::NULL, |s| s.scope_id);
+    egui::Id::unique(("hot-tab-order", panel))
 }
 
 /// Puts hot-text field `id` in its panel's Tab order. True when a Tab in the field before it
@@ -47,20 +51,21 @@ fn tab_stop(ui: &Ui, id: egui::Id) -> bool {
     })
 }
 
+/// How a hot-text field scrubs and prints: `speed` value units per pointer pixel, clamped to
+/// `range`, shown with `decimals` places followed by `suffix`.
+#[derive(Clone, Copy)]
+pub struct HotSpec<'a> {
+    pub speed: f64,
+    pub range: (f64, f64),
+    pub decimals: usize,
+    pub suffix: &'a str,
+}
+
 /// "Hot text": a blue number you drag horizontally to scrub, click to type. Tab / Shift+Tab
 /// while typing commits and types in the panel's next / previous one, as in After Effects.
 /// Returns (response, Some(new value) when changed, drag finished).
-pub fn hot_number_at(
-    ui: &mut Ui,
-    rect_min: egui::Pos2,
-    id: egui::Id,
-    value: f64,
-    speed: f64,
-    range: (f64, f64),
-    decimals: usize,
-    suffix: &str,
-    t: &Tokens,
-) -> (Rect, Option<f64>, bool) {
+pub fn hot_number_at(ui: &mut Ui, rect_min: egui::Pos2, id: egui::Id, value: f64, spec: &HotSpec, t: &Tokens) -> (Rect, Option<f64>, bool) {
+    let HotSpec { speed, range, decimals, suffix } = *spec;
     let editing_id = id.with("editing");
     let mut editing: Option<String> = ui.data(|d| d.get_temp(editing_id));
     if tab_stop(ui, id) && editing.is_none() {
@@ -145,11 +150,21 @@ pub fn proportional_scrub(m: egui::Modifiers) -> bool {
     m.command && m.alt
 }
 
+/// How far one pointer pixel scrubs a hot-text field: the property's slider (soft) range over
+/// 300 px. The Timeline and Effect Controls share this so they cannot drift; a large hard range
+/// only allows typing big values, it must not make dragging coarse (#2097).
+pub fn slider_scrub_speed(ui: &ParamUi) -> f64 {
+    match ui {
+        ParamUi::Slider { slider_min, slider_max, .. } => ((slider_max - slider_min) / 300.0).clamp(0.001, 50.0),
+        _ => 0.5,
+    }
+}
+
 /// [`hot_number_at`] for a whole number (an angle's revolutions): a drag steps it once every
 /// `1 / speed` pixels however slowly the pointer moves (the fractions add up between frames),
 /// and a typed value is truncated. Returns (rect, Some(new value) when changed, drag finished).
 pub fn hot_int_at(ui: &mut Ui, rect_min: egui::Pos2, id: egui::Id, value: i64, speed: f64, suffix: &str, t: &Tokens) -> (Rect, Option<i64>, bool) {
-    let (rect, nv, done) = hot_number_at(ui, rect_min, id, value as f64, speed, (-1e6, 1e6), 0, suffix, t);
+    let (rect, nv, done) = hot_number_at(ui, rect_min, id, value as f64, &HotSpec { speed, range: (-1e6, 1e6), decimals: 0, suffix }, t);
     let acc_id = id.with("acc");
     let acc = ui.data(|d| d.get_temp::<f64>(acc_id)).unwrap_or(0.0) + nv.map_or(0.0, |n| n - value as f64);
     // (Ten 0.1 steps add up to just under 1.)
@@ -262,8 +277,13 @@ pub fn icon_toggle(ui: &mut Ui, rect: Rect, icon: Icon, on: bool, t: &Tokens, id
 }
 
 /// Icon button (toolbar style) with optional active state.
+///
+/// The icon alone carries no text, so the button's accessible name is its tooltip: callers chain
+/// `.on_hover_text(…)`, which names the node this reports (an icon button with neither is unnamed
+/// and kittest's accessibility check flags it).
 pub fn icon_button(ui: &mut Ui, rect: Rect, icon: Icon, active: bool, t: &Tokens, id: egui::Id) -> Response {
     let resp = ui.interact(rect, id, Sense::click());
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::Role::Button, ui.is_enabled(), active, ""));
     if active {
         ui.painter().rect_filled(rect, 4.0, t.accent);
     } else if resp.hovered() {
@@ -309,6 +329,9 @@ pub fn text_field(ui: &mut Ui, rect: Rect, text: &mut String, hint: &str, t: &To
     field(ui, rect, text, hint, t, false)
 }
 
+/// The shared body of [`text_field`] and [`search_field`]: paints the rounded field (and, for
+/// `search`, a magnifier), places a single-line `TextEdit` on `text` filling the inner rect,
+/// and returns its response.
 fn field(ui: &mut Ui, rect: Rect, text: &mut String, hint: &str, t: &Tokens, search: bool) -> Response {
     let h = rect.height();
     ui.painter().rect_filled(rect, h / 2.0, t.field_bg);
@@ -326,7 +349,7 @@ fn field(ui: &mut Ui, rect: Rect, text: &mut String, hint: &str, t: &Tokens, sea
             // As tall as the field, so the text and the hint sit on its middle (they sat high, #581).
             .min_size(inner.size())
             .font(Tokens::ui(12.0))
-            .vertical_align(egui::Align::Center),
+            .align(egui::Align2::LEFT_CENTER),
     )
 }
 
@@ -338,6 +361,15 @@ pub fn dropdown(ui: &mut Ui, rect: Rect, text: &str, t: &Tokens, id: egui::Id) -
 /// [`dropdown`] with a tooltip `tip` (shown always; it replaces the elided text's tooltip).
 pub fn dropdown_tip(ui: &mut Ui, rect: Rect, text: &str, tip: Option<&str>, t: &Tokens, id: egui::Id) -> Response {
     let resp = ui.interact(rect, id, Sense::click());
+    // A combo box shows its current value; with no separate label widget that value is also the
+    // name a screen reader announces. An empty value falls back to the tooltip (or a generic name)
+    // so the control is still reachable.
+    let name = match (text.is_empty(), tip) {
+        (false, _) => text.to_string(),
+        (true, Some(tip)) if !tip.is_empty() => tip.to_string(),
+        _ => crate::i18n::tr("Options").to_string(),
+    };
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::ComboBox, ui.is_enabled(), &name));
     ui.painter().rect_filled(rect, 3.0, if resp.hovered() { t.hover } else { t.field_bg });
     ui.painter().rect_stroke(rect, 3.0, Stroke::new(1.0, t.field_border), StrokeKind::Inside);
     // Text that doesn't fit before the arrow is elided (narrow panels).
@@ -370,6 +402,7 @@ pub fn dropdown_tip(ui: &mut Ui, rect: Rect, text: &str, tip: Option<&str>, t: &
 /// Text button with a subtle fill.
 pub fn text_button(ui: &mut Ui, rect: Rect, text: &str, primary: bool, t: &Tokens, id: egui::Id) -> Response {
     let resp = ui.interact(rect, id, Sense::click());
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), text));
     let bg = if primary {
         if resp.hovered() { t.accent_hover } else { t.accent }
     } else if resp.hovered() {
@@ -411,7 +444,7 @@ pub fn scroll_bar(ui: &mut Ui, auto: &mut Registry, key: &str, track: Rect, scro
     let thumb_len = (len * len / (len + max.max(0.0)).max(1.0)).max(16.0).min(len).max(0.0);
     let travel = (len - thumb_len).max(1.0);
     let thumb_at = |s: f32| track.min[a] + (len - thumb_len) * if max > 0.0 { (s / max).clamp(0.0, 1.0) } else { 0.0 };
-    let resp = ui.interact(track.expand2(if vertical { vec2(3.0, 0.0) } else { vec2(0.0, 3.0) }), egui::Id::new(key), Sense::drag());
+    let resp = ui.interact(track.expand2(if vertical { vec2(3.0, 0.0) } else { vec2(0.0, 3.0) }), egui::Id::unique(key), Sense::drag());
     let pressed = resp.is_pointer_button_down_on() && ui.input(|i| i.pointer.any_pressed());
     let mut s = scroll;
     if let Some(p) = resp.interact_pointer_pos().filter(|p| pressed && !(thumb_at(scroll)..=thumb_at(scroll) + thumb_len).contains(&p[a])) {
@@ -482,8 +515,10 @@ pub fn check_label(on: bool, label: &str) -> String {
     if on { format!("✓ {label}") } else { format!("   {label}") }
 }
 
-fn label_swatch_id() -> egui::Id {
-    egui::Id::new("label-swatch")
+/// The atom id of [`label_swatch`]'s slot inside a button, which [`paint_label_swatch`] looks
+/// up on the laid-out button.
+fn label_swatch_id() -> egui::IdSalt {
+    egui::IdSalt::new("label-swatch")
 }
 
 /// The colour swatch of a Label menu row, as an atom for its button: Label menus show each
@@ -494,7 +529,7 @@ pub fn label_swatch() -> egui::Atom<'static> {
 }
 
 /// Paint the [`label_swatch`] of a laid-out button: label `l`'s colour, an empty box for None.
-pub fn paint_label_swatch(ui: &Ui, out: &egui::AtomLayoutResponse, l: effectcraft_engine::color::Label, t: &Tokens) {
+pub fn paint_label_swatch(ui: &Ui, out: &egui::WidgetAtomResponse, l: effectcraft_engine::color::Label, t: &Tokens) {
     let Some(r) = out.rect(label_swatch_id()) else { return };
     let r = Rect::from_center_size(r.center(), vec2(11.0, 11.0));
     if l == effectcraft_engine::color::Label::None {
@@ -557,6 +592,44 @@ pub fn popup_menu(ui: &mut Ui, id: egui::Id, pos: egui::Pos2, options: &[String]
     })
 }
 
+/// The drop-down for a layer-valued property (`ParamUi::Layer`): the current layer shown as
+/// "N. name" (or "None"), and a popup of "None" plus every layer of the comp. Effect Controls
+/// and the Timeline share it so a layer reference (an Environment light's Source, a Displacement
+/// Map's layer) is picked the same way in every panel, and the reference is shown as its layer's
+/// index and name rather than its internal id. Returns `Some(chosen)` when the user picked —
+/// the layer's id, or `None` for "None" — and `None` while nothing is chosen; the caller writes
+/// it as an undoable `prop.set` (id, or null for "None").
+pub fn layer_picker(
+    ui: &mut Ui,
+    rect: Rect,
+    layers: &[effectcraft_engine::project::Layer],
+    current: Option<u64>,
+    t: &Tokens,
+    id: egui::Id,
+) -> Option<Option<u64>> {
+    let index_of = |wanted: u64| layers.iter().position(|l| l.id.0 == wanted);
+    let entry = |i: usize| layers.get(i).map(|l| format!("{}. {}", i + 1, l.name));
+    let current_index = current.and_then(index_of);
+    let label = current_index.and_then(entry).unwrap_or_else(|| crate::i18n::tr("None").to_string());
+    let pop = id.with("pop");
+    if dropdown(ui, rect, &label, t, id).clicked() {
+        open_popup(ui, pop);
+    }
+    if !popup_is_open(ui, pop) {
+        return None;
+    }
+    // Built only while open: a comp can hold hundreds of layers.
+    let mut options: Vec<String> = Vec::with_capacity(layers.len() + 1);
+    options.push(crate::i18n::tr("None").to_string());
+    options.extend((0..layers.len()).filter_map(entry));
+    // The current entry is highlighted (the first option is "None").
+    match popup_menu(ui, pop, rect.left_bottom(), &options, Some(current_index.map_or(0, |i| i + 1))) {
+        Some(0) => Some(None),
+        Some(picked) => layers.get(picked - 1).map(|l| Some(l.id.0)),
+        None => None,
+    }
+}
+
 /// The open popup list `id` at `pos`, drawn by `body` (`rows` entries and `seps` separators,
 /// for its height): as tall as the window allows, scrolling beyond with a scroll bar (a shape
 /// layer's Add menu has 20 entries, the blend modes 40, the fonts hundreds), and moved up when
@@ -592,7 +665,7 @@ pub(crate) fn note_open_popup_list(ctx: &egui::Context) {
 
 /// The pass a [`popup_list`] was last drawn in.
 fn popup_list_pass_id() -> egui::Id {
-    egui::Id::new("popup-list-pass")
+    egui::Id::unique("popup-list-pass")
 }
 
 /// Whether a menu, context menu or popup list is open, or the menu bar has the keyboard (as of
@@ -607,9 +680,94 @@ pub fn any_menu_open(ctx: &egui::Context) -> bool {
 /// whole: egui sizes a new menu from a default 400 pt area, so without a minimum a longer one
 /// (Window ▸ Workspace) got stuck at that height with its last entries scrolled out of view
 /// (#191).
-pub fn menu_scroll<R>(ui: &mut Ui, add: impl FnOnce(&mut Ui) -> R) -> R {
+///
+/// While the bar is mid press-and-browse (`browsing`), resting the pointer against the menu's
+/// bottom or top edge scrolls it from there — a crawl at first, then a run, as native menus do —
+/// so a long list can be walked with no wheel. Without the hold the edges do nothing: the wheel
+/// and the scroll bar are how a normally opened menu scrolls.
+pub fn menu_scroll<R>(ui: &mut Ui, browsing: bool, add: impl FnOnce(&mut Ui) -> R) -> R {
     let max_h = ui.ctx().content_rect().height() - 40.0;
-    egui::ScrollArea::vertical().max_height(max_h).min_scrolled_height(max_h).show(ui, add).inner
+    let pending = ui.scope_id().with("menu-edge-scroll-offset");
+    let target = ui.ctx().data_mut(|d| d.remove_temp::<f32>(pending));
+    let mut area = egui::ScrollArea::vertical().max_height(max_h).min_scrolled_height(max_h);
+    if let Some(target) = target {
+        area = area.vertical_scroll_offset(target);
+    }
+    let out = area.show(ui, add);
+    if let Some(target) = edge_scroll(ui, &out, browsing) {
+        ui.ctx().data_mut(|d| d.insert_temp(pending, target));
+    }
+    out.inner
+}
+
+/// The edge scroll [`menu_scroll`] adds while browsing: with the pointer resting in the bottom
+/// (top) band of an overflowing menu, its content crawls up (down) after a short pause, ramps to
+/// a run and stops at the end — and stops at once when the pointer leaves the band or the hold.
+///
+/// This runs after `ScrollArea::show`, which laid the menu out for the offset it had, so the new
+/// offset is supplied once to the next draw's builder: a frame of lag, invisible at these speeds.
+/// That explicit vertical offset cancels prior momentum on that draw; later wheel and scroll-bar
+/// input still applies normally. A replay can consume the target but cannot queue another step
+/// at the same input time.
+fn edge_scroll<R>(ui: &Ui, out: &egui::containers::scroll_area::ScrollAreaOutput<R>, browsing: bool) -> Option<f32> {
+    /// How far from the top / bottom edge the pointer starts the crawl (points).
+    const BAND: f32 = 18.0;
+    /// The pause before the crawl starts: a pointer merely grazing the edge must not jump.
+    const DELAY: f32 = 0.12;
+    /// Points per second: a crawl at first, reaching the run about three quarters of a second in.
+    const CRAWL: f32 = 45.0;
+    const RAMP: f32 = 700.0;
+    const RUN: f32 = 560.0;
+
+    let ctx = ui.ctx();
+    let over = out.content_size.y - out.inner_rect.height();
+    let dir = match (browsing, over > 0.0, ctx.input(|i| i.pointer.latest_pos())) {
+        (true, true, Some(p)) if out.inner_rect.contains(p) => {
+            if p.y >= out.inner_rect.max.y - BAND {
+                1
+            } else if p.y <= out.inner_rect.min.y + BAND {
+                -1
+            } else {
+                0
+            }
+        }
+        _ => 0,
+    };
+    // The clock the pause counts from, kept per menu: entering or leaving an edge band restarts
+    // it, so a later stay there crawls off again instead of jumping straight to the run.
+    let now = ctx.input(|i| i.time);
+    let key = out.id.with("menu-edge-scroll");
+    let (since, prev) = ctx.data(|d| d.get_temp::<(f64, i32)>(key)).unwrap_or((now, 0));
+    let since = if dir == prev {
+        since
+    } else {
+        ctx.data_mut(|d| d.insert_temp(key, (now, dir)));
+        now
+    };
+    if dir == 0 {
+        return None;
+    }
+    if now - since < f64::from(DELAY) {
+        // A pointer resting still fires no events: keep the frames coming until the crawl runs.
+        ctx.request_repaint();
+        return None;
+    }
+    let speed = (CRAWL + RAMP * ((now - since) as f32 - DELAY)).min(RUN);
+    let crawl = ctx.input(|i| i.unstable_dt).min(0.05) * speed * dir as f32;
+    let old = out.state.unclamped_offset().y;
+    let new = (old + crawl).clamp(0.0, over);
+    if new == old {
+        // At the end of the list the crawl stands still and asks for no more frames.
+        return None;
+    }
+    ctx.request_repaint();
+    let stepped = out.id.with("menu-edge-scroll-step");
+    if ctx.data(|d| d.get_temp::<f64>(stepped)) == Some(now) {
+        return None;
+    }
+    // Stamp the queue operation, not consumption: a later real frame must still take a step.
+    ctx.data_mut(|d| d.insert_temp(stepped, now));
+    Some(new)
 }
 
 /// egui's menu style with no gap between the rows: the gap the app's item spacing left between
@@ -666,6 +824,15 @@ pub(crate) fn constrained(c: &[f64], d: usize, v: f64) -> Vec<f64> {
 mod tests {
     use super::*;
 
+    /// #2097: the drag speed comes from the slider range, not a much wider hard range.
+    #[test]
+    fn slider_scrub_speed_uses_the_slider_range() {
+        let slider = |min, max, slider_min, slider_max| ParamUi::Slider { min, max, slider_min, slider_max, decimals: 1 };
+        assert!((slider_scrub_speed(&slider(0.0, 10_000.0, 0.0, 1_000.0)) - 1_000.0 / 300.0).abs() < 1e-9);
+        assert!((slider_scrub_speed(&slider(0.0, 1.0e9, 0.0, 1.0)) - 1.0 / 300.0).abs() < 1e-9);
+        assert_eq!(slider_scrub_speed(&ParamUi::Number), 0.5);
+    }
+
     /// #488: an inline editor selects its whole text only as it opens. Should it be without the
     /// keyboard for a frame later (an input method, another handler), it takes the keyboard back
     /// with the caret where the user put it instead of selecting everything again, which made
diff --git a/crates/ui-egui/src/workspace_state.rs b/crates/ui-egui/src/workspace_state.rs
index c2ac9e373..4807e4e40 100644
--- a/crates/ui-egui/src/workspace_state.rs
+++ b/crates/ui-egui/src/workspace_state.rs
@@ -5,93 +5,72 @@ use std::collections::BTreeMap;
 use effectcraft_engine::config::ConfigStore;
 use serde::{Deserialize, Serialize};
 
-use crate::dock::{DockNode, Floating, PanelKind, PanelWindow, SplitSize};
+use crate::dock::{PanelKind, Workspace};
 use crate::state::UiState;
 
+mod legacy;
+
 const FILE: &str = "workspaces.json";
+/// An earlier version's file, kept when it is first rewritten in the current format.
+const BACKUP: &str = "workspaces.old.json";
 const MAX_BYTES: usize = 1024 * 1024;
 const MAX_WORKSPACES: usize = 64;
-const MAX_NODES: usize = 4096;
-const MAX_DEPTH: usize = 32;
-const MAX_PANELS: usize = 128;
 /// Leave room for new viewers without approaching the u32 allocator limit.
 const MAX_VIEWER_ID: u32 = 65_535;
-const MAX_COORD: f32 = 1_000_000.0;
+/// The snapshot version: 2 holds craft-ui docking workspaces.
+const VERSION: u32 = 2;
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 struct Snapshot {
     version: u32,
     workspace: String,
-    dock: DockNode,
-    floating: Vec<Floating>,
+    dock: Workspace,
     focused: PanelKind,
     maximized: Option<PanelKind>,
-    saved_workspaces: BTreeMap<String, DockNode>,
-    saved_floating: BTreeMap<String, Vec<Floating>>,
-    /// Floating groups in their own native window (absent from files of earlier versions).
-    #[serde(default)]
-    panel_windows: Vec<PanelWindow>,
+    saved_workspaces: BTreeMap<String, Workspace>,
 }
 
 impl Snapshot {
     fn capture(ui: &UiState) -> Self {
         Self {
-            version: 1,
+            version: VERSION,
             workspace: ui.workspace.clone(),
             dock: ui.dock.clone(),
-            floating: ui.floating.clone(),
             focused: ui.focused,
             maximized: ui.maximized,
             saved_workspaces: ui.saved_workspaces.clone(),
-            saved_floating: ui.saved_floating.clone(),
-            panel_windows: ui.panel_windows.clone(),
         }
     }
 
     fn apply(self, ui: &mut UiState) {
         ui.workspace = self.workspace;
         ui.dock = self.dock;
-        ui.floating = self.floating;
         ui.focused = self.focused;
         ui.maximized = self.maximized;
         ui.saved_workspaces = self.saved_workspaces;
-        ui.saved_floating = self.saved_floating;
-        // A window is only kept for a panel that still floats, and only where a window can be.
-        let floating = |panel: PanelKind| ui.floating.iter().any(|group| group.panels.contains(&panel));
-        ui.panel_windows = self
-            .panel_windows
-            .into_iter()
-            .filter(|window| floating(window.panel))
-            .map(|window| PanelWindow { panel: window.panel, rect: PanelWindow::sanitized(window.rect) })
-            .collect();
-        // Reserve restored viewer slots without restoring any project-specific composition
-        // links. New Viewer allocates from this map, including after switching named layouts.
-        let mut panels = Vec::new();
-        for root in std::iter::once(&ui.dock).chain(ui.saved_workspaces.values()) {
-            root.panels(&mut panels);
-        }
-        for groups in std::iter::once(&ui.floating).chain(ui.saved_floating.values()) {
-            for group in groups {
-                panels.extend(group.panels.iter().copied());
+        // A native window's place is made safe to hand to the windowing system.
+        for workspace in std::iter::once(&mut ui.dock).chain(ui.saved_workspaces.values_mut()) {
+            for window in &mut workspace.layout.floating {
+                window.native = window.native.map(crate::dock_ui::sanitized_window_rect);
             }
         }
-        for panel in panels {
-            if let PanelKind::Viewer(id) = panel {
-                ui.viewers.entry(id).or_insert(None);
+        // Reserve restored viewer slots without restoring any project-specific composition
+        // links. New Viewer allocates from this map, including after switching named layouts.
+        for workspace in std::iter::once(&ui.dock).chain(ui.saved_workspaces.values()) {
+            for panel in crate::dock::referenced_panels(workspace) {
+                if let PanelKind::Viewer(id) = panel {
+                    ui.viewers.entry(id).or_insert(None);
+                }
             }
         }
     }
 
     fn validate(&self) -> Result<(), String> {
-        if self.version != 1 {
+        if self.version != VERSION {
             return Err(format!("unsupported workspace version {}", self.version));
         }
         let name_ok = |name: &str| !name.trim().is_empty() && name.len() <= 256;
-        if !name_ok(&self.workspace)
-            || self.saved_workspaces.len() > MAX_WORKSPACES
-            || self.saved_floating.len() > MAX_WORKSPACES
-            || self.saved_workspaces.keys().chain(self.saved_floating.keys()).any(|name| !name_ok(name))
-        {
+        if !name_ok(&self.workspace) || self.saved_workspaces.len() > MAX_WORKSPACES || self.saved_workspaces.keys().any(|name| !name_ok(name)) {
             return Err("workspace names or count exceed supported limits".into());
         }
         if !crate::dock::WORKSPACES.contains(&self.workspace.as_str()) && !self.saved_workspaces.contains_key(&self.workspace) {
@@ -101,79 +80,16 @@ impl Snapshot {
             PanelKind::Viewer(id) => (1..=MAX_VIEWER_ID).contains(&id),
             _ => true,
         };
-        if !panel_ok(self.focused) || self.maximized.is_some_and(|panel| !panel_ok(panel)) || self.panel_windows.iter().any(|w| !panel_ok(w.panel)) {
+        if !panel_ok(self.focused) || self.maximized.is_some_and(|panel| !panel_ok(panel)) {
             return Err("workspace viewer ID is outside the supported range 1–65535".into());
         }
-        let mut nodes = 0usize;
-        for root in std::iter::once(&self.dock).chain(self.saved_workspaces.values()) {
-            let mut pending = vec![(root, 0usize)];
-            while let Some((node, depth)) = pending.pop() {
-                nodes = nodes.saturating_add(1);
-                if depth > MAX_DEPTH || nodes > MAX_NODES {
-                    return Err("workspace dock tree exceeds supported limits".into());
-                }
-                match node {
-                    DockNode::Split { size, a, b, .. } => {
-                        let valid = match *size {
-                            SplitSize::Ratio(v) => v.is_finite() && (0.0..=1.0).contains(&v),
-                            SplitSize::FixedA(v) | SplitSize::FixedB(v) => v.is_finite() && (0.0..=MAX_COORD).contains(&v),
-                        };
-                        if !valid {
-                            return Err("invalid workspace split size".into());
-                        }
-                        pending.push((a, depth.saturating_add(1)));
-                        pending.push((b, depth.saturating_add(1)));
-                    }
-                    DockNode::Tabs { panels, active } => {
-                        // Closing the last docked panel leaves an empty group with active=0.
-                        if panels.len() > MAX_PANELS || *active >= panels.len().max(1) || panels.iter().any(|panel| !panel_ok(*panel)) {
-                            return Err("invalid workspace tab group".into());
-                        }
-                    }
-                    DockNode::Stack { entries } => {
-                        if entries.len() > MAX_PANELS
-                            || entries.iter().any(|e| {
-                                e.panels.is_empty()
-                                    || e.panels.len() > MAX_PANELS
-                                    || e.active >= e.panels.len()
-                                    || e.panels.iter().any(|p| !panel_ok(*p))
-                                    || e.height.is_some_and(|v| !v.is_finite() || !(0.0..=MAX_COORD).contains(&v))
-                            })
-                        {
-                            return Err("invalid workspace panel stack".into());
-                        }
-                    }
-                }
+        for workspace in std::iter::once(&self.dock).chain(self.saved_workspaces.values()) {
+            // craft-ui checks the trees, selections, sizes, rects and limits.
+            workspace.validate().map_err(|error| error.to_string())?;
+            if crate::dock::referenced_panels(workspace).into_iter().any(|panel| !panel_ok(panel)) {
+                return Err("workspace viewer ID is outside the supported range 1–65535".into());
             }
         }
-        if self.panel_windows.len() > MAX_PANELS || self.panel_windows.iter().any(|w| !w.rect.iter().all(|v| v.is_finite())) {
-            return Err("invalid workspace panel windows".into());
-        }
-        for groups in std::iter::once(&self.floating).chain(self.saved_floating.values()) {
-            if groups.len() > MAX_PANELS {
-                return Err("too many floating workspace groups".into());
-            }
-            for group in groups {
-                let [x, y, width, height] = group.rect;
-                if group.panels.is_empty()
-                    || group.panels.len() > MAX_PANELS
-                    || group.panels.iter().any(|panel| !panel_ok(*panel))
-                    || group.active >= group.panels.len()
-                    || !group.rect.iter().all(|v| v.is_finite())
-                    || x.abs() > MAX_COORD
-                    || y.abs() > MAX_COORD
-                    || !(1.0..=MAX_COORD).contains(&width)
-                    || !(1.0..=MAX_COORD).contains(&height)
-                {
-                    return Err("invalid floating workspace group".into());
-                }
-            }
-        }
-        crate::dock_shared::encode(&self.dock, &self.floating)?.validate().map_err(|error| error.to_string())?;
-        for (name, root) in &self.saved_workspaces {
-            let floating = self.saved_floating.get(name).map(Vec::as_slice).unwrap_or(&[]);
-            crate::dock_shared::encode(root, floating)?.validate().map_err(|error| error.to_string())?;
-        }
         Ok(())
     }
 }
@@ -182,24 +98,26 @@ pub(crate) struct WorkspaceStore {
     saved: Snapshot,
     last_attempt: f64,
     writable: bool,
+    /// The text of an earlier version's file that loaded: the first save copies it to
+    /// [`BACKUP`] and writes the file in the current format.
+    migrated_from: Option<String>,
     pub(crate) error: Option<String>,
 }
 
 impl WorkspaceStore {
     pub(crate) fn load(config: Option<&dyn ConfigStore>, ui: &mut UiState) -> Self {
+        let mut original = None;
+        let mut outer = Vec::new();
         let loaded = config.map_or(Ok(None), |c| c.read_bounded(FILE, MAX_BYTES)).map_err(|e| e.to_string()).and_then(|text| {
             text.map(|text| {
                 let value: serde_json::Value = serde_json::from_str(&text).map_err(|e| e.to_string())?;
-                // Only an explicitly legacy-shaped record can migrate. A versioned future
-                // snapshot must never deserialize as an empty defaulted legacy record.
-                let snapshot = if value.get("version").is_none()
-                    && value.as_object().is_some_and(|fields| fields.contains_key("workspaces") || fields.contains_key("floating"))
-                {
-                    let legacy: crate::SavedWorkspaces = serde_json::from_value(value).map_err(|e| e.to_string())?;
-                    let mut snapshot = Snapshot::capture(ui);
-                    snapshot.saved_workspaces = legacy.workspaces;
-                    snapshot.saved_floating = legacy.floating;
+                let snapshot = if legacy::is_legacy(&value) {
+                    let (snapshot, windows) = legacy::migrate(value, ui)?;
+                    original = Some(text);
+                    outer = windows;
                     snapshot
+                } else if value.get("version").is_none() {
+                    return Err("not a workspace file".to_string());
                 } else {
                     serde_json::from_value::<Snapshot>(value).map_err(|e| e.to_string())?
                 };
@@ -211,6 +129,7 @@ impl WorkspaceStore {
         let error = match loaded {
             Ok(Some(snapshot)) => {
                 snapshot.apply(ui);
+                ui.native_outer = outer;
                 None
             }
             Ok(None) => None,
@@ -219,10 +138,11 @@ impl WorkspaceStore {
         if let Some(error) = &error {
             log::warn!("{error}");
             ui.status = error.clone();
+            original = None;
         }
         // An unreadable or newer file is never replaced by this session, even after a later
         // layout edit. Ordinary failed writes remain dirty and retryable.
-        Self { saved: Snapshot::capture(ui), last_attempt: f64::NEG_INFINITY, writable: error.is_none(), error }
+        Self { saved: Snapshot::capture(ui), last_attempt: f64::NEG_INFINITY, writable: error.is_none(), migrated_from: original, error }
     }
 
     pub(crate) fn due(&mut self, now: f64) -> bool {
@@ -237,19 +157,18 @@ impl WorkspaceStore {
         if !self.writable {
             return false;
         }
-        self.saved.workspace != ui.workspace
+        self.migrated_from.is_some()
+            || self.saved.workspace != ui.workspace
             || self.saved.dock != ui.dock
-            || self.saved.floating != ui.floating
             || self.saved.focused != ui.focused
             || self.saved.maximized != ui.maximized
             || self.saved.saved_workspaces != ui.saved_workspaces
-            || self.saved.saved_floating != ui.saved_floating
-            || self.saved.panel_windows != ui.panel_windows
     }
 
     pub(crate) fn save(&mut self, config: Option<&dyn ConfigStore>, ui: &UiState) -> Result<bool, String> {
         let Some(config) = config else { return Ok(false) };
-        if !self.has_changes(ui) {
+        // A window still at its outer position would be saved as if that were its content's.
+        if !self.has_changes(ui) || !ui.native_outer.is_empty() {
             return Ok(false);
         }
         let snapshot = Snapshot::capture(ui);
@@ -258,7 +177,11 @@ impl WorkspaceStore {
         if text.len() > MAX_BYTES {
             return Err("workspace file exceeds 1 MiB".into());
         }
+        if let Some(original) = &self.migrated_from {
+            config.write(BACKUP, original).map_err(|e| format!("keep the earlier workspace file: {e}"))?;
+        }
         config.write(FILE, &text).map_err(|e| format!("save workspaces: {e}"))?;
+        self.migrated_from = None;
         self.saved = snapshot;
         self.error = None;
         Ok(true)
@@ -279,182 +202,4 @@ impl WorkspaceStore {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use effectcraft_engine::config::MemoryConfig;
-
-    #[test]
-    fn corrupt_or_future_workspace_keeps_defaults_and_original_file() {
-        let valid = Snapshot::capture(&UiState::default());
-        for text in ["{".into(), serde_json::to_string(&Snapshot { version: 2, ..valid }).unwrap(), " ".repeat(MAX_BYTES + 1)] {
-            let config = MemoryConfig::default();
-            config.write(FILE, &text).unwrap();
-            let mut ui = UiState::default();
-            let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-            assert!(store.error.is_some());
-            assert_eq!(ui.workspace, "Default");
-            ui.focused = PanelKind::Project;
-            ui.dock = crate::dock::workspace("Minimal");
-            assert!(!store.save(Some(&config), &ui).unwrap());
-            assert!(store.save_now(Some(&config), &ui).unwrap_err().contains("couldn't be loaded"));
-            assert_eq!(config.read(FILE).as_deref(), Some(text.as_str()));
-        }
-    }
-
-    #[test]
-    fn explicit_save_without_a_settings_folder_is_an_error() {
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(None, &mut ui);
-        ui.focused = PanelKind::Project;
-        assert!(!store.save(None, &ui).unwrap());
-        assert!(store.save_now(None, &ui).is_err());
-    }
-
-    #[test]
-    fn explicit_save_with_nothing_new_succeeds() {
-        let config = MemoryConfig::default();
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-        ui.focused = PanelKind::Project;
-        store.save_now(Some(&config), &ui).unwrap();
-        store.save_now(Some(&config), &ui).unwrap();
-        assert!(config.read(FILE).is_some());
-    }
-
-    #[test]
-    fn invalid_tabs_split_and_deep_tree_are_rejected() {
-        let mut snapshot = Snapshot::capture(&UiState::default());
-        snapshot.dock = DockNode::Tabs { panels: vec![], active: usize::MAX };
-        assert!(snapshot.validate().is_err());
-        snapshot.dock = DockNode::Split {
-            vertical: false,
-            size: SplitSize::FixedA(f32::NAN),
-            a: Box::new(crate::dock::workspace("Minimal")),
-            b: Box::new(crate::dock::workspace("Minimal")),
-        };
-        assert!(snapshot.validate().is_err());
-        snapshot.dock = crate::dock::workspace("Minimal");
-        for _ in 0..=MAX_DEPTH {
-            snapshot.dock = DockNode::Split {
-                vertical: false,
-                size: SplitSize::Ratio(0.5),
-                a: Box::new(snapshot.dock),
-                b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project], active: 0 }),
-            };
-        }
-        assert!(snapshot.validate().is_err());
-    }
-
-    #[test]
-    fn closing_all_docked_panels_remains_a_persistable_layout() {
-        let config = MemoryConfig::default();
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-        let mut panels = Vec::new();
-        ui.dock.panels(&mut panels);
-        for panel in panels {
-            ui.dock.close(panel);
-        }
-        assert!(store.save(Some(&config), &ui).unwrap());
-        let mut restored = UiState::default();
-        let loaded = WorkspaceStore::load(Some(&config), &mut restored);
-        assert!(loaded.error.is_none());
-        assert_eq!(restored.dock, ui.dock);
-    }
-
-    #[test]
-    fn floating_groups_and_named_snapshots_roundtrip_without_document_state() {
-        let config = MemoryConfig::default();
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-        ui.workspace = "Floating".into();
-        ui.dock.close(PanelKind::Preview);
-        ui.floating = vec![Floating { panels: vec![PanelKind::Preview], active: 0, rect: [50.0, 80.0, 200.0, 160.0] }];
-        ui.saved_workspaces.insert(ui.workspace.clone(), ui.dock.clone());
-        ui.saved_floating.insert(ui.workspace.clone(), ui.floating.clone());
-        ui.maximized = Some(PanelKind::Composition);
-        ui.project_search = "do not persist".into();
-        assert!(store.save(Some(&config), &ui).unwrap());
-        let mut restored = UiState::default();
-        WorkspaceStore::load(Some(&config), &mut restored);
-        assert_eq!(Snapshot::capture(&restored), Snapshot::capture(&ui));
-        assert!(restored.project_search.is_empty());
-    }
-
-    #[test]
-    fn restored_viewer_slots_do_not_reuse_ids_or_restore_document_links() {
-        let config = MemoryConfig::default();
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-        ui.dock = DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Viewer(2)], active: 0 };
-        ui.saved_workspaces.insert("Two views".into(), DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Viewer(5)], active: 0 });
-        ui.viewers.insert(2, Some(42));
-        assert!(store.save(Some(&config), &ui).unwrap());
-        let mut app = crate::EffectcraftApp::new(effectcraft_engine::Session::default());
-        WorkspaceStore::load(Some(&config), &mut app.ui);
-        assert_eq!(app.ui.viewers.get(&2), Some(&None));
-        assert_eq!(app.ui.viewers.get(&5), Some(&None));
-        assert_eq!(crate::panels::viewers::new_viewer(&mut app), 6);
-        assert!(app.ui.dock.contains(PanelKind::Viewer(2)));
-    }
-
-    #[test]
-    fn invalid_viewer_ids_are_rejected_in_every_workspace_reference() {
-        for id in [0, MAX_VIEWER_ID + 1, u32::MAX] {
-            for location in 0..8 {
-                let mut snapshot = Snapshot::capture(&UiState::default());
-                let panel = PanelKind::Viewer(id);
-                let dock = DockNode::Tabs { panels: vec![panel], active: 0 };
-                let stack = DockNode::Stack { entries: vec![crate::dock::StackEntry::new(panel, true, None)] };
-                let floating = vec![Floating { panels: vec![panel], active: 0, rect: [0.0, 0.0, 200.0, 100.0] }];
-                match location {
-                    0 => snapshot.focused = panel,
-                    1 => snapshot.maximized = Some(panel),
-                    2 => snapshot.dock = dock,
-                    3 => snapshot.dock = stack,
-                    4 => snapshot.floating = floating,
-                    5 => {
-                        snapshot.saved_workspaces.insert("Saved".into(), dock);
-                    }
-                    6 => {
-                        snapshot.saved_workspaces.insert("Saved".into(), stack);
-                    }
-                    _ => {
-                        snapshot.saved_floating.insert("Saved".into(), floating);
-                    }
-                }
-                assert!(snapshot.validate().is_err(), "viewer {id} at location {location} must be rejected");
-            }
-        }
-    }
-
-    #[test]
-    fn failed_write_keeps_previous_snapshot_and_retries() {
-        struct Fails<'a>(&'a MemoryConfig);
-        impl ConfigStore for Fails<'_> {
-            fn read(&self, name: &str) -> Option<String> {
-                self.0.read(name)
-            }
-            fn write(&self, _name: &str, _data: &str) -> std::io::Result<()> {
-                Err(std::io::Error::other("synthetic full disk"))
-            }
-            fn remove(&self, _name: &str) -> std::io::Result<()> {
-                Err(std::io::Error::other("unused"))
-            }
-        }
-        let config = MemoryConfig::default();
-        let mut ui = UiState::default();
-        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
-        ui.focused = PanelKind::Project;
-        assert!(store.save(Some(&config), &ui).unwrap());
-        let previous = config.read(FILE).unwrap();
-        ui.focused = PanelKind::Timeline;
-        assert!(store.save(Some(&Fails(&config)), &ui).unwrap_err().contains("synthetic full disk"));
-        assert_eq!(config.read(FILE).as_deref(), Some(previous.as_str()));
-        assert!(store.has_changes(&ui));
-        assert!(store.save(Some(&config), &ui).unwrap());
-        let mut restored = UiState::default();
-        WorkspaceStore::load(Some(&config), &mut restored);
-        assert_eq!(restored.focused, PanelKind::Timeline);
-    }
-}
+mod tests;
diff --git a/crates/ui-egui/src/workspace_state/legacy.rs b/crates/ui-egui/src/workspace_state/legacy.rs
new file mode 100644
index 000000000..93d71fd75
--- /dev/null
+++ b/crates/ui-egui/src/workspace_state/legacy.rs
@@ -0,0 +1,245 @@
+//! Workspace files of earlier versions: EffectCraft's own dock tree (craft-libs 5c874d51 and
+//! before), read into private copies of its types and turned into craft-ui workspaces.
+//!
+//! - Version 1 (`{version: 1, workspace, dock, floating, …, panel_windows}`) keeps the current
+//!   arrangement, the named workspaces, focus and the maximized panel.
+//! - The unversioned record (`{workspaces, floating}`) holds only named workspaces; the
+//!   current arrangement stays the default.
+//! - A column of stacked frames becomes tab groups split top to bottom. Each open frame is a
+//!   group with all its tabs; a frame with a height keeps it as a fixed size (its tab strip
+//!   added), and the others share the rest. A closed frame's tabs join the open frame above it
+//!   (below it, at the top of the column), as a split has no collapsed frames.
+//! - A floating group in its own native window (`panel_windows`) keeps that place as the
+//!   window's native rect. The earlier version stored the OS window's outer position, so the
+//!   window's id is returned for [`crate::dock_ui::native_outer_to_content`] to move it to its
+//!   content position once the main window reports its frame.
+//! - Closed panels had no recorded place: they stay closed and reopen at their default place.
+
+use std::collections::BTreeMap;
+
+use craft_ui::docking::{Floating, Node};
+use craft_ui::layout::{SplitAxis, SplitSize};
+use serde::Deserialize;
+
+use super::{Snapshot, VERSION};
+use crate::dock::{Layout, PanelKind, Workspace};
+use crate::state::UiState;
+
+#[derive(Deserialize)]
+enum OldSplitSize {
+    Ratio(f32),
+    FixedA(f32),
+    FixedB(f32),
+}
+
+/// A stacked frame; files from before stacked frames held tabs name one `panel`.
+#[derive(Deserialize)]
+struct OldStackEntry {
+    #[serde(default)]
+    panel: Option<PanelKind>,
+    #[serde(default)]
+    panels: Vec<PanelKind>,
+    #[serde(default)]
+    active: usize,
+    open: bool,
+    #[serde(default)]
+    height: Option<f32>,
+}
+
+#[derive(Deserialize)]
+enum OldNode {
+    Split { vertical: bool, size: OldSplitSize, a: Box<OldNode>, b: Box<OldNode> },
+    Tabs { panels: Vec<PanelKind>, active: usize },
+    Stack { entries: Vec<OldStackEntry> },
+}
+
+#[derive(Deserialize)]
+struct OldFloating {
+    panels: Vec<PanelKind>,
+    active: usize,
+    rect: [f32; 4],
+}
+
+/// The floating group holding `panel` shows in its own native window at `rect`.
+#[derive(Deserialize)]
+struct OldPanelWindow {
+    panel: PanelKind,
+    rect: [f32; 4],
+}
+
+#[derive(Deserialize)]
+struct OldSnapshot {
+    workspace: String,
+    dock: OldNode,
+    floating: Vec<OldFloating>,
+    focused: PanelKind,
+    maximized: Option<PanelKind>,
+    saved_workspaces: BTreeMap<String, OldNode>,
+    saved_floating: BTreeMap<String, Vec<OldFloating>>,
+    #[serde(default)]
+    panel_windows: Vec<OldPanelWindow>,
+}
+
+#[derive(Deserialize)]
+struct OldRecord {
+    #[serde(default)]
+    workspaces: BTreeMap<String, OldNode>,
+    #[serde(default)]
+    floating: BTreeMap<String, Vec<OldFloating>>,
+}
+
+/// Whether `value` is a file of an earlier version that [`migrate`] reads.
+pub(super) fn is_legacy(value: &serde_json::Value) -> bool {
+    match value.get("version") {
+        Some(version) => version.as_u64() == Some(1),
+        None => value.as_object().is_some_and(|fields| fields.contains_key("workspaces") || fields.contains_key("floating")),
+    }
+}
+
+/// The snapshot an earlier version's file describes, and the ids of its floating windows whose
+/// native rect holds the OS window's outer position. `ui` supplies what an unversioned record
+/// leaves out (the current arrangement). The caller validates the result.
+pub(super) fn migrate(value: serde_json::Value, ui: &UiState) -> Result<(Snapshot, Vec<u64>), String> {
+    if value.get("version").is_none() {
+        let record: OldRecord = serde_json::from_value(value).map_err(|e| e.to_string())?;
+        let mut snapshot = Snapshot::capture(ui);
+        snapshot.saved_workspaces = named(record.workspaces, record.floating)?;
+        return Ok((snapshot, Vec::new()));
+    }
+    let old: OldSnapshot = serde_json::from_value(value).map_err(|e| e.to_string())?;
+    let dock = workspace(old.dock, old.floating, &old.panel_windows)?;
+    let outer = dock.layout.floating.iter().filter(|window| window.native.is_some()).map(|window| window.id).collect();
+    let snapshot = Snapshot {
+        version: VERSION,
+        workspace: old.workspace,
+        dock,
+        focused: old.focused,
+        maximized: old.maximized,
+        saved_workspaces: named(old.saved_workspaces, old.saved_floating)?,
+    };
+    Ok((snapshot, outer))
+}
+
+/// Named workspaces with their floating groups; floating groups of no named workspace are
+/// dropped, as the earlier version never showed them.
+fn named(roots: BTreeMap<String, OldNode>, mut floating: BTreeMap<String, Vec<OldFloating>>) -> Result<BTreeMap<String, Workspace>, String> {
+    roots
+        .into_iter()
+        .map(|(name, root)| {
+            let groups = floating.remove(&name).unwrap_or_default();
+            workspace(root, groups, &[]).map(|workspace| (name, workspace))
+        })
+        .collect()
+}
+
+fn workspace(root: OldNode, floating: Vec<OldFloating>, windows: &[OldPanelWindow]) -> Result<Workspace, String> {
+    // Closing the last docked panel left an empty tab group as the root.
+    let root = match root {
+        OldNode::Tabs { panels, .. } if panels.is_empty() => None,
+        root => Some(node(root, 0)?),
+    };
+    let floating = floating
+        .into_iter()
+        .map(|group| {
+            let native = windows.iter().find(|window| group.panels.contains(&window.panel)).map(|window| window.rect);
+            let mut window = Floating::single(group.panels, group.active, group.rect);
+            window.native = native.map(crate::dock_ui::sanitized_window_rect);
+            window
+        })
+        .collect();
+    Ok(Workspace::new(Layout { root, floating }))
+}
+
+fn node(old: OldNode, depth: usize) -> Result<Node<PanelKind>, String> {
+    if depth > craft_ui::docking::MAX_DEPTH {
+        return Err("workspace dock tree exceeds supported limits".into());
+    }
+    Ok(match old {
+        OldNode::Tabs { panels, active } => Node::Tabs { panels, active },
+        OldNode::Split { vertical, size, a, b } => Node::Split {
+            axis: if vertical { SplitAxis::Vertical } else { SplitAxis::Horizontal },
+            size: match size {
+                OldSplitSize::Ratio(value) => SplitSize::Ratio(value),
+                OldSplitSize::FixedA(value) => SplitSize::FixedFirst(value),
+                OldSplitSize::FixedB(value) => SplitSize::FixedSecond(value),
+            },
+            first: Box::new(node(*a, depth.saturating_add(1))?),
+            second: Box::new(node(*b, depth.saturating_add(1))?),
+        },
+        OldNode::Stack { entries } => column(entries)?,
+    })
+}
+
+/// The space between two frames of a column, in points ([`crate::theme::Tokens::gap`]).
+const FRAME_GAP: f32 = 4.0;
+/// The largest frame height a migrated column keeps, in points.
+const MAX_FRAME: f32 = 10_000.0;
+
+/// A tab group of a column: its panels, shown tab, and body height when it has one.
+struct Frame {
+    panels: Vec<PanelKind>,
+    active: usize,
+    height: Option<f32>,
+}
+
+/// A column of stacked frames as tab groups split top to bottom (see the module docs).
+fn column(entries: Vec<OldStackEntry>) -> Result<Node<PanelKind>, String> {
+    let mut frames: Vec<Frame> = Vec::new();
+    // Tabs of closed frames above the first open one.
+    let mut waiting: Vec<PanelKind> = Vec::new();
+    for entry in entries {
+        let mut panels = entry.panels;
+        if let Some(panel) = entry.panel
+            && !panels.contains(&panel)
+        {
+            panels.insert(0, panel);
+        }
+        if panels.is_empty() {
+            continue;
+        }
+        let active = entry.active.min(panels.len().saturating_sub(1));
+        if entry.open {
+            let height = entry.height.filter(|h| h.is_finite() && *h > 0.0).map(|h| h.min(MAX_FRAME));
+            frames.push(Frame { panels, active, height });
+        } else if let Some(above) = frames.last_mut() {
+            above.panels.extend(panels);
+        } else {
+            waiting.extend(panels);
+        }
+    }
+    match frames.first_mut() {
+        Some(top) => top.panels.extend(waiting),
+        None if !waiting.is_empty() => frames.push(Frame { panels: waiting, active: 0, height: None }),
+        None => return Err("a stacked frame holds no panels".into()),
+    }
+    let frame_size = |frame: &Frame| frame.height.map(|h| h + crate::dock::TAB_STRIP);
+    let mut node: Option<Node<PanelKind>> = None;
+    // Below the frame being added: the frames' fixed sizes and gaps, or None when one shares.
+    let mut below_fixed = Some(0.0_f32);
+    let mut below_flexible = 0_usize;
+    for frame in frames.into_iter().rev() {
+        let own = frame_size(&frame);
+        let gap = if node.is_some() { FRAME_GAP } else { 0.0 };
+        let tabs = Node::Tabs { panels: frame.panels, active: frame.active };
+        node = Some(match node {
+            None => tabs,
+            Some(rest) => {
+                let size = match (own, below_fixed) {
+                    (Some(own), _) => SplitSize::FixedFirst(own),
+                    (None, Some(below)) => SplitSize::FixedSecond(below),
+                    // Shares the rest with the flexible frames below.
+                    (None, None) => SplitSize::Ratio(1.0 / (below_flexible as f32 + 1.0)),
+                };
+                Node::Split { axis: SplitAxis::Vertical, size, first: Box::new(tabs), second: Box::new(rest) }
+            }
+        });
+        below_fixed = match (own, below_fixed) {
+            (Some(own), Some(below)) => Some(below + gap + own),
+            _ => None,
+        };
+        if own.is_none() {
+            below_flexible = below_flexible.saturating_add(1);
+        }
+    }
+    node.ok_or_else(|| "a stacked frame holds no panels".into())
+}
diff --git a/crates/ui-egui/src/workspace_state/tests.rs b/crates/ui-egui/src/workspace_state/tests.rs
new file mode 100644
index 000000000..e7b6d9aae
--- /dev/null
+++ b/crates/ui-egui/src/workspace_state/tests.rs
@@ -0,0 +1,346 @@
+use super::*;
+use crate::dock::{Floating, Layout, Node, StackEntry, WorkspaceExt as _};
+use craft_ui::docking::Action;
+use craft_ui::layout::{SplitAxis, SplitSize};
+use effectcraft_engine::config::MemoryConfig;
+
+fn minimal() -> Workspace {
+    Workspace::new(crate::dock::workspace("Minimal"))
+}
+
+fn tabs(panels: &[PanelKind]) -> Node<PanelKind> {
+    Node::Tabs { panels: panels.to_vec(), active: 0 }
+}
+
+#[test]
+fn corrupt_future_or_unknown_workspace_keeps_defaults_and_original_file() {
+    let valid = Snapshot::capture(&UiState::default());
+    // Damaged files of the earlier version: a panel in two places, a bad split, an unknown
+    // panel, a tree deeper than craft-ui allows, a missing field.
+    let earlier = |dock: &str| {
+        format!(
+            r#"{{"version":1,"workspace":"Default","dock":{dock},"floating":[],"focused":"Composition","maximized":null,"saved_workspaces":{{}},"saved_floating":{{}}}}"#
+        )
+    };
+    let mut deep = r#"{"Tabs":{"panels":["Composition"],"active":0}}"#.to_string();
+    for _ in 0..=craft_ui::docking::MAX_DEPTH {
+        deep = format!(r#"{{"Split":{{"vertical":true,"size":{{"Ratio":0.5}},"a":{deep},"b":{{"Tabs":{{"panels":[],"active":0}}}}}}}}"#);
+    }
+    let twice =
+        r#"{"Split":{"vertical":true,"size":{"Ratio":0.5},"a":{"Tabs":{"panels":["Project"],"active":0}},"b":{"Tabs":{"panels":["Project"],"active":0}}}}"#;
+    let bad_split =
+        r#"{"Split":{"vertical":true,"size":{"Ratio":7.0},"a":{"Tabs":{"panels":["Project"],"active":0}},"b":{"Tabs":{"panels":["Timeline"],"active":0}}}}"#;
+    for text in [
+        "{".into(),
+        "{}".into(),
+        "[1, 2]".into(),
+        serde_json::to_string(&Snapshot { version: VERSION + 1, ..valid }).unwrap(),
+        " ".repeat(MAX_BYTES + 1),
+        earlier(twice),
+        earlier(bad_split),
+        earlier(r#"{"Tabs":{"panels":["NoSuchPanel"],"active":0}}"#),
+        earlier(&deep),
+        r#"{"version":1,"workspace":"Default"}"#.into(),
+        r#"{"workspaces":{"Mine":{"Tabs":{"panels":["Composition"],"active":3}}}}"#.into(),
+    ] {
+        let config = MemoryConfig::default();
+        config.write(FILE, &text).unwrap();
+        let mut ui = UiState::default();
+        let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+        assert!(store.error.is_some());
+        assert_eq!(ui.workspace, "Default");
+        assert_eq!(ui.dock, UiState::default().dock);
+        ui.focused = PanelKind::Project;
+        ui.dock = minimal();
+        assert!(!store.save(Some(&config), &ui).unwrap());
+        assert!(store.save_now(Some(&config), &ui).unwrap_err().contains("couldn't be loaded"));
+        assert_eq!(config.read(FILE).as_deref(), Some(text.as_str()));
+        assert_eq!(config.read(BACKUP), None);
+    }
+}
+
+/// A file written by EffectCraft 0.10 (craft-libs 5c874d51): the Default workspace with
+/// Preview floating, Render Queue floating in its own native window, Align closed,
+/// Effects & Presets moved into the Project group and Audio split beside the Timeline,
+/// saved as "My Layout"; then Layer closed.
+const V1: &str = include_str!("../../tests/fixtures/workspaces-v1.json");
+
+#[test]
+fn version_one_file_loads_with_every_panel_in_place() {
+    let config = MemoryConfig::default();
+    config.write(FILE, V1).unwrap();
+    let mut ui = UiState::default();
+    let store = WorkspaceStore::load(Some(&config), &mut ui);
+    assert_eq!(store.error, None);
+    assert_eq!(ui.workspace, "My Layout");
+    assert_eq!(ui.focused, PanelKind::Composition);
+    use PanelKind::*;
+    let root = crate::dock::hsplit(
+        SplitSize::FixedSecond(300.0),
+        crate::dock::vsplit(
+            SplitSize::Ratio(0.56),
+            crate::dock::hsplit(SplitSize::FixedFirst(300.0), crate::dock::tabs(&[Project, EffectControls, EffectsPresets], 2), tabs(&[Composition])),
+            crate::dock::hsplit(SplitSize::Ratio(0.5), tabs(&[Timeline]), tabs(&[Audio])),
+        ),
+        tabs(&[Properties]),
+    );
+    assert_eq!(ui.dock.layout.root, Some(root));
+    let floating: Vec<_> = ui.dock.layout.floating.iter().map(|w| (w.panels().copied().collect::<Vec<_>>(), w.rect, w.native)).collect();
+    assert_eq!(
+        floating,
+        [
+            (vec![Preview], [900.0, 120.0, 300.0, 260.0], None),
+            (vec![RenderQueue], [200.0, 500.0, 520.0, 240.0], Some(crate::dock_ui::sanitized_window_rect([200.0, 500.0, 520.0, 240.0]))),
+        ]
+    );
+    // Closed panels stay closed.
+    for panel in [Align, Layer] {
+        assert!(!ui.dock.is_open(panel), "{panel:?}");
+    }
+    // The native window's place is its outer position until the main window reports its
+    // frame (here a 28-point title bar); the file is not rewritten before.
+    let id = ui.dock.layout.floating[1].id;
+    assert_eq!(ui.native_outer, [id]);
+    let mut store = store;
+    assert!(!store.save(Some(&config), &ui).unwrap());
+    let outer = egui::Rect::from_min_size(egui::pos2(10.0, 20.0), egui::vec2(1600.0, 1000.0));
+    crate::dock_ui::native_outer_to_content(&mut ui, Some(outer), Some(outer.translate(egui::vec2(0.0, 28.0))), 0.1);
+    assert_eq!(ui.dock.layout.floating[1].native, Some([200.0, 528.0, 520.0, 240.0]));
+    assert!(ui.native_outer.is_empty());
+    assert!(store.save(Some(&config), &ui).unwrap());
+    // The named workspace still has Layer, closed only after it was saved.
+    let saved = ui.saved_workspaces.get("My Layout").unwrap();
+    assert!(saved.is_docked(Layer) && saved.is_floating(Preview) && !saved.is_open(Align));
+    assert_eq!(saved.layout.floating.iter().filter_map(|w| w.native).count(), 0);
+}
+
+#[test]
+fn version_one_file_is_rewritten_once_in_the_current_format_and_kept_as_a_backup() {
+    let config = MemoryConfig::default();
+    config.write(FILE, V1).unwrap();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    // A backend that reports no window positions: the native place stays as it was.
+    let native = ui.dock.layout.floating[1].native;
+    crate::dock_ui::native_outer_to_content(&mut ui, None, None, 1.0);
+    assert!(!ui.native_outer.is_empty(), "waits for a report");
+    crate::dock_ui::native_outer_to_content(&mut ui, None, None, 5.0);
+    assert!(ui.native_outer.is_empty());
+    assert_eq!(ui.dock.layout.floating[1].native, native);
+    let migrated = Snapshot::capture(&ui);
+    assert!(store.has_changes(&ui), "the migrated layout is written without waiting for an edit");
+    assert!(store.save(Some(&config), &ui).unwrap());
+    assert_eq!(config.read(BACKUP).as_deref(), Some(V1));
+    let text = config.read(FILE).unwrap();
+    assert_eq!(serde_json::from_str::<serde_json::Value>(&text).unwrap()["version"], VERSION);
+    assert!(!store.has_changes(&ui));
+    let mut restored = UiState::default();
+    let reloaded = WorkspaceStore::load(Some(&config), &mut restored);
+    assert_eq!(reloaded.error, None);
+    assert!(!reloaded.has_changes(&restored));
+    assert_eq!(Snapshot::capture(&restored), migrated);
+}
+
+#[test]
+fn stacked_frames_with_tabs_and_an_empty_root_migrate() {
+    let text = r#"{"version":1,"workspace":"Mine","dock":{"Tabs":{"panels":[],"active":0}},
+            "floating":[{"panels":["Project"],"active":0,"rect":[10.0,10.0,300.0,200.0]}],
+            "focused":"Project","maximized":null,
+            "saved_workspaces":{"Mine":{"Stack":{"entries":[{"panel":"Info","open":true},{"panels":["Audio","Preview"],"active":1,"open":true,"height":80.0}]}},
+                "Column":{"Stack":{"entries":[{"panel":"Align","open":false},{"panel":"Preview","open":true,"height":46.0},{"panels":["Properties","Paint"],"active":1,"open":false,"height":300.0},{"panel":"Info","open":true}]}}},
+            "saved_floating":{"Gone":[{"panels":["Align"],"active":0,"rect":[0.0,0.0,100.0,100.0]}]}}"#;
+    let config = MemoryConfig::default();
+    config.write(FILE, text).unwrap();
+    let mut ui = UiState::default();
+    let store = WorkspaceStore::load(Some(&config), &mut ui);
+    assert_eq!(store.error, None);
+    assert_eq!(ui.dock.layout.root, None);
+    assert!(ui.dock.is_floating(PanelKind::Project));
+    use PanelKind::*;
+    // Each open frame is a tab group with all its tabs; a frame's height is a fixed size
+    // (with its tab strip), and the frame without one takes the rest.
+    let column = crate::dock::vsplit(SplitSize::FixedSecond(80.0 + crate::dock::TAB_STRIP), tabs(&[Info]), crate::dock::tabs(&[Audio, Preview], 1));
+    assert_eq!(ui.saved_workspaces.get("Mine").and_then(|w| w.layout.root.clone()), Some(column));
+    // Closed frames' tabs join the open frame above them, or below at the top.
+    let column = crate::dock::vsplit(SplitSize::FixedFirst(46.0 + crate::dock::TAB_STRIP), tabs(&[Preview, Properties, Paint, Align]), tabs(&[Info]));
+    assert_eq!(ui.saved_workspaces.get("Column").and_then(|w| w.layout.root.clone()), Some(column));
+    assert_eq!(ui.saved_workspaces.len(), 2, "floating groups of no named workspace are dropped");
+}
+
+#[test]
+fn explicit_save_without_a_settings_folder_is_an_error() {
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(None, &mut ui);
+    ui.focused = PanelKind::Project;
+    assert!(!store.save(None, &ui).unwrap());
+    assert!(store.save_now(None, &ui).is_err());
+}
+
+#[test]
+fn explicit_save_with_nothing_new_succeeds() {
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    ui.focused = PanelKind::Project;
+    store.save_now(Some(&config), &ui).unwrap();
+    store.save_now(Some(&config), &ui).unwrap();
+    assert!(config.read(FILE).is_some());
+}
+
+#[test]
+fn invalid_tabs_split_and_deep_tree_are_rejected() {
+    let mut snapshot = Snapshot::capture(&UiState::default());
+    snapshot.dock = Workspace::new(Layout { root: Some(Node::Tabs { panels: vec![PanelKind::Project], active: usize::MAX }), floating: vec![] });
+    assert!(snapshot.validate().is_err());
+    let split = |size, first, second| Node::Split { axis: SplitAxis::Horizontal, size, first: Box::new(first), second: Box::new(second) };
+    snapshot.dock = Workspace::new(Layout {
+        root: Some(split(SplitSize::FixedFirst(f32::NAN), tabs(&[PanelKind::Project]), tabs(&[PanelKind::Timeline]))),
+        floating: vec![],
+    });
+    assert!(snapshot.validate().is_err());
+    let mut root = tabs(&[PanelKind::Composition]);
+    for _ in 0..=craft_ui::docking::MAX_DEPTH {
+        root = split(SplitSize::Ratio(0.5), root, tabs(&[]));
+    }
+    snapshot.dock = Workspace::new(Layout { root: Some(root), floating: vec![] });
+    assert!(snapshot.validate().is_err());
+    // A panel in two places.
+    snapshot.dock = Workspace::new(Layout {
+        root: Some(tabs(&[PanelKind::Project])),
+        floating: vec![Floating::single(vec![PanelKind::Project], 0, [0.0, 0.0, 200.0, 100.0])],
+    });
+    assert!(snapshot.validate().is_err());
+}
+
+#[test]
+fn closing_all_docked_panels_remains_a_persistable_layout() {
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    for panel in ui.dock.panels() {
+        ui.dock.apply(Action::Close { panel }, crate::dock::permissions).unwrap();
+    }
+    assert!(ui.dock.layout.root.is_none());
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let mut restored = UiState::default();
+    let loaded = WorkspaceStore::load(Some(&config), &mut restored);
+    assert!(loaded.error.is_none());
+    assert_eq!(restored.dock, ui.dock);
+}
+
+#[test]
+fn floating_groups_and_named_snapshots_roundtrip_without_document_state() {
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    ui.workspace = "Floating".into();
+    ui.dock.apply(Action::Float { panel: PanelKind::Preview, rect: [50.0, 80.0, 200.0, 160.0] }, crate::dock::permissions).unwrap();
+    ui.dock.apply(Action::Close { panel: PanelKind::Align }, crate::dock::permissions).unwrap();
+    ui.saved_workspaces.insert(ui.workspace.clone(), ui.dock.clone());
+    ui.maximized = Some(PanelKind::Composition);
+    ui.project_search = "do not persist".into();
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let mut restored = UiState::default();
+    WorkspaceStore::load(Some(&config), &mut restored);
+    assert_eq!(Snapshot::capture(&restored), Snapshot::capture(&ui));
+    // The closed panel's place comes back with it.
+    assert!(restored.dock.hidden.iter().any(|(p, _)| *p == PanelKind::Align));
+    assert!(restored.project_search.is_empty());
+}
+
+#[test]
+fn restored_viewer_slots_do_not_reuse_ids_or_restore_document_links() {
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    let two = |viewer| Workspace::new(Layout { root: Some(tabs(&[PanelKind::Composition, PanelKind::Viewer(viewer)])), floating: vec![] });
+    ui.dock = two(2);
+    ui.saved_workspaces.insert("Two views".into(), two(5));
+    ui.viewers.insert(2, Some(42));
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let mut app = crate::EffectcraftApp::new(effectcraft_engine::Session::default());
+    WorkspaceStore::load(Some(&config), &mut app.ui);
+    assert_eq!(app.ui.viewers.get(&2), Some(&None));
+    assert_eq!(app.ui.viewers.get(&5), Some(&None));
+    assert_eq!(crate::panels::viewers::new_viewer(&mut app), 6);
+    assert!(app.ui.dock.is_docked(PanelKind::Viewer(2)));
+}
+
+#[test]
+fn invalid_viewer_ids_are_rejected_in_every_workspace_reference() {
+    for id in [0, MAX_VIEWER_ID + 1, u32::MAX] {
+        for location in 0..8 {
+            let mut snapshot = Snapshot::capture(&UiState::default());
+            let panel = PanelKind::Viewer(id);
+            let docked = Workspace::new(Layout { root: Some(tabs(&[panel])), floating: vec![] });
+            let stacked =
+                Workspace::new(Layout { root: Some(Node::Stack { entries: vec![StackEntry { panel, open: true, height: None }] }), floating: vec![] });
+            let floating = Workspace::new(Layout {
+                root: Some(tabs(&[PanelKind::Composition])),
+                floating: vec![Floating::single(vec![panel], 0, [0.0, 0.0, 200.0, 100.0])],
+            });
+            let mut hidden = Workspace::new(Layout { root: Some(tabs(&[PanelKind::Composition, panel])), floating: vec![] });
+            hidden.apply(Action::Close { panel }, crate::dock::permissions).unwrap();
+            match location {
+                0 => snapshot.focused = panel,
+                1 => snapshot.maximized = Some(panel),
+                2 => snapshot.dock = docked,
+                3 => snapshot.dock = stacked,
+                4 => snapshot.dock = floating,
+                5 => snapshot.dock = hidden,
+                6 => {
+                    snapshot.saved_workspaces.insert("Saved".into(), stacked);
+                }
+                _ => {
+                    snapshot.saved_workspaces.insert("Saved".into(), floating);
+                }
+            }
+            assert!(snapshot.validate().is_err(), "viewer {id} at location {location} must be rejected");
+        }
+    }
+}
+
+#[test]
+fn hostile_native_window_places_are_made_safe_on_load() {
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    ui.dock.apply(Action::Float { panel: PanelKind::Project, rect: [10.0, 10.0, 300.0, 200.0] }, crate::dock::permissions).unwrap();
+    ui.dock.apply(Action::SetNative { panel: PanelKind::Project, rect: Some([90_000.0, -90_000.0, 1.0e5, 0.5]) }, crate::dock::permissions).unwrap();
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let mut restored = UiState::default();
+    WorkspaceStore::load(Some(&config), &mut restored);
+    let native = restored.dock.layout.floating.iter().find(|w| w.contains(&PanelKind::Project)).and_then(|w| w.native).unwrap();
+    assert_eq!(native, crate::dock_ui::sanitized_window_rect(native));
+    assert!(native[2] <= crate::dock_ui::PANEL_WINDOW_MAX && native[3] >= crate::dock_ui::PANEL_WINDOW_MIN[1]);
+}
+
+#[test]
+fn failed_write_keeps_previous_snapshot_and_retries() {
+    struct Fails<'a>(&'a MemoryConfig);
+    impl ConfigStore for Fails<'_> {
+        fn read(&self, name: &str) -> Option<String> {
+            self.0.read(name)
+        }
+        fn write(&self, _name: &str, _data: &str) -> std::io::Result<()> {
+            Err(std::io::Error::other("synthetic full disk"))
+        }
+        fn remove(&self, _name: &str) -> std::io::Result<()> {
+            Err(std::io::Error::other("unused"))
+        }
+    }
+    let config = MemoryConfig::default();
+    let mut ui = UiState::default();
+    let mut store = WorkspaceStore::load(Some(&config), &mut ui);
+    ui.focused = PanelKind::Project;
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let previous = config.read(FILE).unwrap();
+    ui.focused = PanelKind::Timeline;
+    assert!(store.save(Some(&Fails(&config)), &ui).unwrap_err().contains("synthetic full disk"));
+    assert_eq!(config.read(FILE).as_deref(), Some(previous.as_str()));
+    assert!(store.has_changes(&ui));
+    assert!(store.save(Some(&config), &ui).unwrap());
+    let mut restored = UiState::default();
+    WorkspaceStore::load(Some(&config), &mut restored);
+    assert_eq!(restored.focused, PanelKind::Timeline);
+}
diff --git a/crates/ui-egui/tests/fixtures/workspaces-v1.json b/crates/ui-egui/tests/fixtures/workspaces-v1.json
new file mode 100644
index 000000000..164bf37f0
--- /dev/null
+++ b/crates/ui-egui/tests/fixtures/workspaces-v1.json
@@ -0,0 +1,234 @@
+{
+  "version": 1,
+  "workspace": "My Layout",
+  "dock": {
+    "Split": {
+      "vertical": false,
+      "size": {
+        "FixedB": 300.0
+      },
+      "a": {
+        "Split": {
+          "vertical": true,
+          "size": {
+            "Ratio": 0.56
+          },
+          "a": {
+            "Split": {
+              "vertical": false,
+              "size": {
+                "FixedA": 300.0
+              },
+              "a": {
+                "Tabs": {
+                  "panels": [
+                    "Project",
+                    "EffectControls",
+                    "EffectsPresets"
+                  ],
+                  "active": 2
+                }
+              },
+              "b": {
+                "Tabs": {
+                  "panels": [
+                    "Composition"
+                  ],
+                  "active": 0
+                }
+              }
+            }
+          },
+          "b": {
+            "Split": {
+              "vertical": false,
+              "size": {
+                "Ratio": 0.5
+              },
+              "a": {
+                "Tabs": {
+                  "panels": [
+                    "Timeline"
+                  ],
+                  "active": 0
+                }
+              },
+              "b": {
+                "Tabs": {
+                  "panels": [
+                    "Audio"
+                  ],
+                  "active": 0
+                }
+              }
+            }
+          }
+        }
+      },
+      "b": {
+        "Stack": {
+          "entries": [
+            {
+              "panels": [
+                "Properties"
+              ],
+              "active": 0,
+              "open": true,
+              "height": null
+            }
+          ]
+        }
+      }
+    }
+  },
+  "floating": [
+    {
+      "panels": [
+        "Preview"
+      ],
+      "active": 0,
+      "rect": [
+        900.0,
+        120.0,
+        300.0,
+        260.0
+      ]
+    },
+    {
+      "panels": [
+        "RenderQueue"
+      ],
+      "active": 0,
+      "rect": [
+        200.0,
+        500.0,
+        520.0,
+        240.0
+      ]
+    }
+  ],
+  "focused": "Composition",
+  "maximized": null,
+  "saved_workspaces": {
+    "My Layout": {
+      "Split": {
+        "vertical": false,
+        "size": {
+          "FixedB": 300.0
+        },
+        "a": {
+          "Split": {
+            "vertical": true,
+            "size": {
+              "Ratio": 0.56
+            },
+            "a": {
+              "Split": {
+                "vertical": false,
+                "size": {
+                  "FixedA": 300.0
+                },
+                "a": {
+                  "Tabs": {
+                    "panels": [
+                      "Project",
+                      "EffectControls",
+                      "EffectsPresets"
+                    ],
+                    "active": 2
+                  }
+                },
+                "b": {
+                  "Tabs": {
+                    "panels": [
+                      "Composition",
+                      "Layer"
+                    ],
+                    "active": 0
+                  }
+                }
+              }
+            },
+            "b": {
+              "Split": {
+                "vertical": false,
+                "size": {
+                  "Ratio": 0.5
+                },
+                "a": {
+                  "Tabs": {
+                    "panels": [
+                      "Timeline"
+                    ],
+                    "active": 0
+                  }
+                },
+                "b": {
+                  "Tabs": {
+                    "panels": [
+                      "Audio"
+                    ],
+                    "active": 0
+                  }
+                }
+              }
+            }
+          }
+        },
+        "b": {
+          "Stack": {
+            "entries": [
+              {
+                "panels": [
+                  "Properties"
+                ],
+                "active": 0,
+                "open": true,
+                "height": null
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "saved_floating": {
+    "My Layout": [
+      {
+        "panels": [
+          "Preview"
+        ],
+        "active": 0,
+        "rect": [
+          900.0,
+          120.0,
+          300.0,
+          260.0
+        ]
+      },
+      {
+        "panels": [
+          "RenderQueue"
+        ],
+        "active": 0,
+        "rect": [
+          200.0,
+          500.0,
+          520.0,
+          240.0
+        ]
+      }
+    ]
+  },
+  "panel_windows": [
+    {
+      "panel": "RenderQueue",
+      "rect": [
+        200.0,
+        500.0,
+        520.0,
+        240.0
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/crates/ui-egui/tests/it/main.rs b/crates/ui-egui/tests/it/main.rs
new file mode 100644
index 000000000..6b4c08912
--- /dev/null
+++ b/crates/ui-egui/tests/it/main.rs
@@ -0,0 +1,105 @@
+//! The crate's integration tests, one binary (each module is a former `tests/<name>.rs`).
+
+mod native_menu_text_keys;
+mod render_queue_snapshot;
+mod shared_docking_ui;
+mod ui_3d;
+mod ui_agent_audit;
+mod ui_angles;
+mod ui_audio_scrub;
+mod ui_azerty_shortcuts;
+mod ui_batch_switches;
+mod ui_blank_context_menus;
+mod ui_camera_tracker;
+mod ui_character_eyedropper;
+mod ui_color_hex;
+mod ui_comp_presets;
+mod ui_control_modifiers;
+mod ui_dock_resize;
+mod ui_drag_drop;
+mod ui_effect_controls;
+mod ui_effect_drop_highlight;
+mod ui_effect_names;
+mod ui_font_search;
+mod ui_form_fit;
+mod ui_frame_step;
+mod ui_fx_editors;
+mod ui_gpu;
+mod ui_gradient_editor;
+mod ui_gradient_handles;
+mod ui_gradient_value;
+mod ui_graph_fit;
+mod ui_group_rename;
+mod ui_guide_layers;
+mod ui_inline_edit;
+mod ui_keyframes;
+mod ui_large_project;
+mod ui_layer_panel_zoom;
+mod ui_layer_source_picker;
+mod ui_light_settings;
+mod ui_live_preview;
+mod ui_locked_color;
+mod ui_media_browser_cache;
+mod ui_media_browser_copy_path;
+mod ui_menus;
+mod ui_new_primitive;
+mod ui_object_matte;
+mod ui_panel_focus;
+mod ui_panel_windows;
+mod ui_panels;
+mod ui_parameter_spacing;
+mod ui_presets_folder;
+mod ui_preview_align;
+mod ui_project_delete;
+mod ui_project_duplicate;
+mod ui_project_keyboard;
+mod ui_project_new_folder;
+mod ui_project_rows;
+mod ui_quick_offset;
+mod ui_ram_preview;
+mod ui_render_queue;
+mod ui_script_console;
+mod ui_scriptui;
+mod ui_scrolling;
+mod ui_settings_info;
+mod ui_tabs;
+mod ui_tail;
+mod ui_text_edit;
+mod ui_text_range_handles;
+mod ui_theme_favorites;
+mod ui_time_zoom_controls;
+mod ui_timeline_effect_label;
+mod ui_timeline_pan;
+mod ui_timeline_shapes;
+mod ui_timeline_switches;
+mod ui_timeline_trim;
+mod ui_timeline_zoom;
+mod ui_toolbar_gradient;
+mod ui_tracker;
+mod ui_unreadable_footage;
+mod ui_video_preview_off;
+mod ui_viewer;
+mod ui_viewers;
+mod ui_visual_review;
+mod ui_web_gpu_storage;
+mod ui_web_job_gpu;
+mod ui_web_offload;
+mod ui_workflow_selection;
+mod ui_workspace_focus;
+mod viewer_geometry;
+mod viewer_passive_display;
+
+/// Register the managed build's canonical craft-fonts checkout (`CRAFT_FONTS_DIR/fonts`) through
+/// the same directory source production scans for `EFFECTCRAFT_FONT_DIRS`. The UI tests then render
+/// real Japanese glyphs from the canonical external input instead of relying on host fonts.
+pub(crate) fn add_canonical_test_fonts() {
+    use effectcraft_text::fonts::{self, DirectorySource};
+    static REGISTER: std::sync::Once = std::sync::Once::new();
+    REGISTER.call_once(|| {
+        let Some(root) = std::env::var_os("CRAFT_FONTS_DIR") else { return };
+        let dir = std::path::PathBuf::from(root).join("fonts");
+        if dir.is_dir() {
+            fonts::add_source(&DirectorySource { dirs: vec![dir] });
+        }
+    });
+}
diff --git a/crates/ui-egui/tests/it/native_menu_text_keys.rs b/crates/ui-egui/tests/it/native_menu_text_keys.rs
new file mode 100644
index 000000000..d740c6b46
--- /dev/null
+++ b/crates/ui-egui/tests/it/native_menu_text_keys.rs
@@ -0,0 +1,191 @@
+//! The macOS menu bar takes the Edit menu's key equivalents before any window sees them: while a
+//! text field has the keyboard, in a docked panel or a floating panel's own OS window, they edit
+//! the field and leave the project alone, and the items stay enabled.
+
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::{menus, native_menu};
+use egui::{Event, Modifiers, PointerButton, Pos2, ViewportCommand, ViewportId, ViewportInfo, pos2, vec2};
+use egui_kittest::Harness;
+use serde_json::json;
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+fn app() -> EffectcraftApp {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "duration": 4})).unwrap();
+    s.execute("layer.newSolid", json!({"name": "Solid", "color": "#406080"})).unwrap();
+    let mut app = EffectcraftApp::new(s);
+    app.ui.start_screen = false;
+    app.hooks.clipboard_text = Some(Box::new(|| Some("pasted".into())));
+    app
+}
+
+/// What the Edit commands would change in the project.
+fn project(app: &EffectcraftApp) -> (u64, usize, usize, usize) {
+    let s = &app.session;
+    (s.revision, s.state.clipboard.len(), s.history.undo.len(), s.history.redo.len())
+}
+
+/// Choose the native menu item that runs `command`, then deliver what it queued for the main
+/// window (kittest does not call `raw_input_hook`).
+fn menu(h: &mut Harness<'_, EffectcraftApp>, command: &str) {
+    let spec = native_menu::build(h.state());
+    let id = spec.items().into_iter().find(|i| i.command == command).unwrap().id.clone();
+    let ctx = h.ctx.clone();
+    native_menu::activate(h.state_mut(), &ctx, &spec, &id).unwrap();
+    for _ in 0..3 {
+        let mut raw = egui::RawInput::default();
+        eframe::App::raw_input_hook(h.state_mut(), &ctx, &mut raw);
+        h.input_mut().events.extend(raw.events);
+        h.step();
+        h.state_mut().mark_synthetic_applied();
+    }
+    h.run_steps(2);
+}
+
+/// Whether the menu bar shows `command`'s item enabled now, and whether the project alone would.
+fn enabled(h: &Harness<'_, EffectcraftApp>, command: &str) -> (bool, bool) {
+    let find = |menu: native_menu::NativeMenu| menu.items().into_iter().find(|i| i.command == command).unwrap().enabled;
+    (find(native_menu::build_now(h.state(), &h.ctx)), find(native_menu::build(h.state())))
+}
+
+fn center(h: &Harness<'_, EffectcraftApp>, id: &str) -> Pos2 {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}")).clone();
+    pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0)
+}
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, at: Pos2, window: Option<&Host>) {
+    let send = |h: &mut Harness<'_, EffectcraftApp>, event: Event| match window {
+        Some(host) => to_window(host, event),
+        None => h.input_mut().events.push(event),
+    };
+    send(h, Event::PointerMoved(at));
+    h.step();
+    for pressed in [true, false] {
+        send(h, Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+        h.step();
+    }
+}
+
+/// Stand-in OS windows for floating panels: each runs its own pass with its own input, and
+/// asking one for the clipboard text gives it "pasted".
+#[derive(Default)]
+struct Windows {
+    window: Option<ViewportId>,
+    events: HashMap<ViewportId, Vec<Event>>,
+}
+
+type Host = Rc<RefCell<Windows>>;
+
+fn to_window(host: &Host, event: Event) {
+    let mut host = host.borrow_mut();
+    let Some(window) = host.window else { panic!("no floating panel window") };
+    host.events.entry(window).or_default().push(event);
+}
+
+fn native_windows(h: &mut Harness<'_, EffectcraftApp>) -> Host {
+    let host = Host::default();
+    let shared = host.clone();
+    egui::Context::set_immediate_viewport_renderer(move |ctx, mut viewport| {
+        let id = viewport.ids.this;
+        let size = viewport.builder.inner_size.unwrap_or(vec2(400.0, 300.0));
+        let time = ctx.input(|i| i.time);
+        let events = {
+            let mut host = shared.borrow_mut();
+            host.window = Some(id);
+            host.events.remove(&id).unwrap_or_default()
+        };
+        let viewports = [(ViewportId::ROOT, false), (id, true)]
+            .into_iter()
+            .map(|(id, focused)| (id, ViewportInfo { focused: Some(focused), native_pixels_per_point: Some(1.0), ..Default::default() }))
+            .collect();
+        let input = egui::RawInput {
+            viewport_id: id,
+            viewports,
+            screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, size)),
+            events,
+            focused: true,
+            time: Some(time),
+            ..Default::default()
+        };
+        let mut full = ctx.run_ui(input, |ui| (viewport.viewport_ui_cb)(ui));
+        full.textures_delta.clear();
+        if full.viewport_output.get(&id).is_some_and(|out| out.commands.contains(&ViewportCommand::RequestPaste)) {
+            shared.borrow_mut().events.entry(id).or_default().push(Event::Paste("pasted".into()));
+        }
+    });
+    h.ctx.set_embed_viewports(false);
+    // A main window that reports its place: not Wayland, where floating panels stay in it.
+    let screen = h.ctx.content_rect();
+    h.input_mut().viewports.entry(ViewportId::ROOT).or_default().outer_rect = Some(screen);
+    h.run_steps(3);
+    let window = host.borrow().window.expect("the floating panel opens in an OS window of its own");
+    // That window has the keyboard.
+    let input = h.input_mut();
+    input.focused = false;
+    for (id, focused) in [(ViewportId::ROOT, false), (window, true)] {
+        input.viewports.entry(id).or_default().focused = Some(focused);
+    }
+    h.run_steps(2);
+    host
+}
+
+#[test]
+fn edit_menu_keys_edit_a_text_field_in_a_panel_window() {
+    let mut app = app();
+    menus::invoke(&mut app, &egui::Context::default(), "window.panelWindow", json!({"panel": "Project", "window": true})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| app);
+    h.ctx.set_os(egui::os::OperatingSystem::Mac);
+    let host = native_windows(&mut h);
+    let at = center(&h, "project.search");
+    click(&mut h, at, Some(&host));
+    to_window(&host, Event::Text("abc".into()));
+    h.run_steps(3);
+    let window = host.borrow().window.unwrap();
+    assert_eq!(h.state().ui.project_search, "abc");
+    assert!(!h.ctx.egui_wants_keyboard_input(), "the main window has no focused widget");
+    assert_eq!(native_menu::text_field_window(&h.ctx), Some(window));
+    assert_eq!(enabled(&h, "edit.paste"), (true, false), "Paste stays enabled with nothing copied in the project");
+    let before = project(h.state());
+    menu(&mut h, "edit.selectAll");
+    menu(&mut h, "edit.cut");
+    assert_eq!(h.state().ui.project_search, "", "Select All and Cut act on the field");
+    menu(&mut h, "edit.paste");
+    assert_eq!(h.state().ui.project_search, "pasted");
+    menu(&mut h, "edit.undo");
+    assert_eq!(h.state().ui.project_search, "", "Undo undoes the paste");
+    menu(&mut h, "edit.copy");
+    assert_eq!(project(h.state()), before, "the project is untouched");
+    assert_eq!(h.state().ui.project_search, "");
+}
+
+#[test]
+fn edit_menu_keys_edit_a_docked_text_field() {
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| app());
+    h.ctx.set_os(egui::os::OperatingSystem::Mac);
+    h.run_steps(3);
+    let at = center(&h, "project.search");
+    h.input_mut().events.push(Event::PointerMoved(at));
+    h.step();
+    for pressed in [true, false] {
+        h.input_mut().events.push(Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+        h.step();
+    }
+    h.input_mut().events.push(Event::Text("abc".into()));
+    h.run_steps(3);
+    assert_eq!(h.state().ui.project_search, "abc");
+    assert_eq!(native_menu::text_field_window(&h.ctx), Some(ViewportId::ROOT));
+    assert_eq!(enabled(&h, "edit.paste"), (true, false), "Paste stays enabled with nothing copied in the project");
+    let before = project(h.state());
+    menu(&mut h, "edit.selectAll");
+    menu(&mut h, "edit.cut");
+    assert_eq!(h.state().ui.project_search, "", "Select All and Cut act on the field");
+    menu(&mut h, "edit.paste");
+    assert_eq!(h.state().ui.project_search, "pasted");
+    menu(&mut h, "edit.undo");
+    assert_eq!(h.state().ui.project_search, "", "Undo undoes the paste");
+    menu(&mut h, "edit.copy");
+    assert_eq!(project(h.state()), before, "the project is untouched");
+}
diff --git a/crates/ui-egui/tests/render_queue_snapshot.rs b/crates/ui-egui/tests/it/render_queue_snapshot.rs
similarity index 96%
rename from crates/ui-egui/tests/render_queue_snapshot.rs
rename to crates/ui-egui/tests/it/render_queue_snapshot.rs
index 41ce13d2a..d054511af 100644
--- a/crates/ui-egui/tests/render_queue_snapshot.rs
+++ b/crates/ui-egui/tests/it/render_queue_snapshot.rs
@@ -1,6 +1,6 @@
 //! Headless look at the Render Queue panel (wgpu offscreen). Ignored by default (needs a GPU
 //! adapter); run with
-//! `RQ_SNAPSHOT=/abs/out.png cargo test -p effectcraft-ui-egui --test render_queue_snapshot -- --ignored`.
+//! `RQ_SNAPSHOT=/abs/out.png cargo test -p effectcraft-ui-egui --test it render_queue_snapshot:: -- --ignored`.
 
 use effectcraft_engine::Session;
 use effectcraft_engine::project::render_queue::RenderStatus;
@@ -31,7 +31,7 @@ fn render_queue_panel_snapshot() {
     let ids: Vec<u64> = s.project.render_queue.iter().take(3).map(|i| i.id).collect();
     let mut app = Some(EffectcraftApp::new(s));
     let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app.take().expect("app"));
-    h.ctx.data_mut(|d| d.insert_temp(egui::Id::new("rq-ui"), (ids, None::<u64>)));
+    h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique("rq-ui"), (ids, None::<u64>)));
     h.state_mut().show_panel(effectcraft_ui_egui::dock::PanelKind::RenderQueue);
     h.run_steps(4);
     let img = h.render().expect("render");
diff --git a/crates/ui-egui/tests/it/shared_docking_ui.rs b/crates/ui-egui/tests/it/shared_docking_ui.rs
new file mode 100644
index 000000000..c71fadf3c
--- /dev/null
+++ b/crates/ui-egui/tests/it/shared_docking_ui.rs
@@ -0,0 +1,355 @@
+//! EffectCraft's workspaces in craft-ui's shared docking: transactions, the command path, pointer
+//! gestures and persistence.
+use craft_ui::docking::{Action, Node, Placement, StackEntry, Zone};
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::{
+    EffectcraftApp,
+    dock::{self, Layout, PanelKind, SplitSize, Workspace, WorkspaceExt as _},
+};
+use egui::{Event, Modifiers, PointerButton, Rect, pos2, vec2};
+use egui_kittest::Harness;
+use egui_kittest::kittest::{NodeT, Queryable};
+use serde_json::json;
+
+fn invoke(app: &mut EffectcraftApp, id: &str, params: serde_json::Value) -> Result<serde_json::Value, String> {
+    effectcraft_ui_egui::menus::invoke(app, &egui::Context::default(), id, params)
+}
+
+fn floating(app: &EffectcraftApp) -> &[dock::Floating<PanelKind>] {
+    &app.ui.dock.layout.floating
+}
+
+#[test]
+fn shared_move_preserves_accordion_metadata_and_unrelated_active_tabs() {
+    let mut workspace = dock::docked(dock::hsplit(
+        SplitSize::FixedSecond(300.0),
+        dock::tabs(&[PanelKind::Project, PanelKind::Composition, PanelKind::Layer], 1),
+        dock::stack(&[(PanelKind::Preview, false, Some(73.0)), (PanelKind::Properties, true, Some(211.0)), (PanelKind::Align, false, None)]),
+    ));
+    workspace.apply(Action::Close { panel: PanelKind::Project }, dock::permissions).unwrap();
+    assert!(workspace.is_visible(PanelKind::Composition));
+    workspace
+        .apply(Action::Move { panel: PanelKind::Preview, anchor: PanelKind::Layer, placement: Placement::Tab { before: None } }, dock::permissions)
+        .unwrap();
+    let Some(Node::Split { second, size, .. }) = &workspace.layout.root else { panic!("split was lost") };
+    assert_eq!(*size, SplitSize::FixedSecond(300.0));
+    let Node::Stack { entries } = second.as_ref() else { panic!("stack was lost") };
+    // The unrelated stacked panels keep their exact state.
+    assert_eq!(
+        entries,
+        &vec![StackEntry { panel: PanelKind::Properties, open: true, height: Some(211.0) }, StackEntry { panel: PanelKind::Align, open: false, height: None }]
+    );
+    assert_eq!(workspace.group_of(PanelKind::Preview), vec![PanelKind::Composition, PanelKind::Layer, PanelKind::Preview]);
+    // Rejected moves and geometry change nothing.
+    let before = workspace.clone();
+    assert!(
+        workspace
+            .apply(Action::Move { panel: PanelKind::Preview, anchor: PanelKind::Audio, placement: Placement::Split(Zone::Left) }, dock::permissions)
+            .is_err()
+    );
+    assert!(workspace.apply(Action::Float { panel: PanelKind::Preview, rect: [0.0, 0.0, f32::INFINITY, 200.0] }, dock::permissions).is_err());
+    assert_eq!(workspace, before);
+}
+
+#[test]
+fn every_builtin_workspace_validates_and_roundtrips_with_dynamic_identities() {
+    for name in dock::WORKSPACES {
+        let workspace = Workspace::new(dock::workspace(name));
+        workspace.validate().unwrap_or_else(|e| panic!("{name}: {e}"));
+        assert!(workspace.is_open(PanelKind::Composition), "{name} lacks the Composition panel");
+        let text = serde_json::to_string(&workspace).unwrap();
+        assert_eq!(serde_json::from_str::<Workspace>(&text).unwrap(), workspace, "{name}");
+    }
+    assert_eq!(dock::workspace("Undocked Panels").floating.len(), 4);
+    // Built again, a built-in layout has the same windows (ids included).
+    let ids = |layout: &Layout| layout.floating.iter().map(|w| w.id).collect::<Vec<_>>();
+    assert_eq!(ids(&dock::workspace("Undocked Panels")), ids(&dock::workspace("Undocked Panels")));
+    let mut workspace = dock::docked(dock::tabs(&[PanelKind::Composition, PanelKind::Viewer(42), PanelKind::ScriptPanel(77)], 1));
+    workspace.apply(Action::Float { panel: PanelKind::ScriptPanel(77), rect: [20.0, 30.0, 400.0, 300.0] }, dock::permissions).unwrap();
+    let text = serde_json::to_string(&workspace).unwrap();
+    assert!(text.contains("\"ScriptPanel\":77") && text.contains("\"Viewer\":42"), "{text}");
+    assert_eq!(serde_json::from_str::<Workspace>(&text).unwrap(), workspace);
+    workspace
+        .apply(Action::Move { panel: PanelKind::ScriptPanel(77), anchor: PanelKind::Viewer(42), placement: Placement::Tab { before: None } }, dock::permissions)
+        .unwrap();
+    assert!(workspace.layout.floating.is_empty());
+    assert!(workspace.is_visible(PanelKind::ScriptPanel(77)));
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let element = h.state().auto.find(id).unwrap_or_else(|| panic!("missing {id}"));
+    Rect::from_min_size(pos2(element.rect[0], element.rect[1]), vec2(element.rect[2], element.rect[3]))
+}
+
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: egui::Pos2, to: egui::Pos2, modifiers: Modifiers) {
+    h.event(Event::ModifiersChanged(modifiers));
+    h.event(Event::PointerMoved(from));
+    h.step();
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers });
+    h.step();
+    for fraction in [0.05, 0.25, 0.5, 0.75, 1.0] {
+        h.event(Event::PointerMoved(from.lerp(to, fraction)));
+        h.step();
+    }
+    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers });
+    h.step();
+    h.event(Event::ModifiersChanged(Modifiers::NONE));
+    h.run_steps(3);
+}
+
+#[test]
+fn pointer_drop_merges_floats_and_redocks_without_project_changes() {
+    let mut session = Session::default();
+    session.execute("comp.new", json!({"name": "Docking composition", "width": 320, "height": 180, "duration": 4})).unwrap();
+    session.execute("layer.newSolid", json!({"name": "Teal plate", "width": 320, "height": 180, "color": "#245b68"})).unwrap();
+    let mut app = EffectcraftApp::new(session);
+    app.ui.start_screen = false;
+    app.ui.dock = dock::docked(dock::vsplit(
+        SplitSize::Ratio(0.62),
+        dock::hsplit(
+            SplitSize::FixedFirst(400.0),
+            dock::tabs(&[PanelKind::Project, PanelKind::Info, PanelKind::Audio], 1),
+            dock::tabs(&[PanelKind::Composition, PanelKind::Layer], 0),
+        ),
+        dock::tabs(&[PanelKind::Timeline], 0),
+    ));
+    let mut h = Harness::builder().with_size(vec2(1200.0, 760.0)).build_eframe(move |_| app);
+    h.run_steps(4);
+    let project = h.state().session.project.clone();
+    let times = h.state().session.state.times.clone();
+    // A tab dropped on another group's tab strip joins it.
+    let from = rect(&h, "panel.tab.Info").center();
+    let to = rect(&h, "panel.tab.Layer").center() + vec2(20.0, 0.0);
+    drag(&mut h, from, to, Modifiers::NONE);
+    assert!(h.state().ui.dock.is_visible(PanelKind::Info));
+    assert!(h.state().ui.dock.group_of(PanelKind::Info).contains(&PanelKind::Composition));
+    // Cmd/Ctrl at the release floats it.
+    let from = rect(&h, "panel.tab.Info").center();
+    drag(&mut h, from, pos2(700.0, 400.0), Modifiers::COMMAND);
+    assert_eq!(floating(h.state()).len(), 1);
+    assert!(h.state().ui.dock.is_floating(PanelKind::Info));
+    let grips: Vec<_> = h.query_all_by_label("Resize panel window").collect();
+    assert!(!grips.is_empty() && grips.iter().all(|grip| grip.accesskit_node().role() == egui::accesskit::Role::Button));
+    // Its corner resizes it and its title bar moves it.
+    let original = floating(h.state())[0].rect;
+    let grip = rect(&h, "panel.float.0.resize").center();
+    drag(&mut h, grip, grip - vec2(36.0, 24.0), Modifiers::NONE);
+    let resized = floating(h.state())[0].rect;
+    assert!(resized[2] < original[2] - 25.0 && resized[3] < original[3] - 15.0, "{original:?} -> {resized:?}");
+    let bar = rect(&h, "panel.float.0.move");
+    drag(&mut h, bar.center(), bar.center() - vec2(24.0, 18.0), Modifiers::NONE);
+    let moved = floating(h.state())[0].rect;
+    assert!(moved[0] < resized[0] - 15.0 && moved[1] < resized[1] - 10.0, "{resized:?} -> {moved:?}");
+    // Its tab dropped on a docked tab strip docks it again.
+    let from = rect(&h, "panel.tab.Info").center();
+    let to = rect(&h, "panel.tab.Project").center() + vec2(20.0, 0.0);
+    drag(&mut h, from, to, Modifiers::NONE);
+    assert!(floating(h.state()).is_empty());
+    assert!(h.state().ui.dock.group_of(PanelKind::Info).contains(&PanelKind::Project));
+    assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
+    assert_eq!(times, h.state().session.state.times);
+}
+
+#[test]
+fn current_and_named_floating_layouts_survive_restart() {
+    use effectcraft_engine::config::MemoryConfig;
+    use std::sync::Arc;
+    let store = Arc::new(MemoryConfig::default());
+    let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
+    app.apply_dock(Action::Float { panel: PanelKind::Project, rect: [45.0, 65.0, 430.0, 310.0] }).unwrap();
+    invoke(&mut app, "window.saveWorkspaceAs", json!({"name": "Shared float"})).unwrap();
+    let saved = app.ui.dock.clone();
+    app.apply_dock(Action::MoveFloating { panel: PanelKind::Project, rect: [75.0, 95.0, 480.0, 360.0] }).unwrap();
+    let current = app.ui.dock.clone();
+    eframe::App::on_exit(&mut app);
+    let mut restarted = EffectcraftApp::new(Session { config: Some(store), ..Default::default() });
+    assert_eq!(restarted.ui.dock, current);
+    restarted.set_workspace("Default");
+    restarted.set_workspace("Shared float");
+    assert_eq!(restarted.ui.dock, saved);
+}
+
+#[test]
+fn float_command_rejects_malformed_rectangles_and_keeps_one_docked_panel() {
+    let mut app = EffectcraftApp::new(Session::default());
+    let before = app.ui.dock.clone();
+    for rect in [json!([1, 2, 300]), json!([1, 2, 300, 200, 7]), json!([1, 2, 1e100, 200]), json!("rectangle")] {
+        assert!(invoke(&mut app, "window.floatPanel", json!({"panel": "Project", "rect": rect})).is_err());
+        assert_eq!(app.ui.dock, before);
+    }
+    // The last docked panel stays docked, whether it moves alone, with its group or by command.
+    app.ui.dock = dock::docked(dock::tabs(&[PanelKind::Project], 0));
+    let before = app.ui.dock.clone();
+    assert!(app.apply_dock(Action::Float { panel: PanelKind::Project, rect: [1.0, 2.0, 300.0, 200.0] }).is_err());
+    assert!(invoke(&mut app, "window.panel.float", json!({"panel": "Project", "group": true})).is_err());
+    assert_eq!(app.ui.dock, before);
+    // Closing it is allowed.
+    invoke(&mut app, "window.closePanel", json!({"panel": "Project"})).unwrap();
+    assert!(app.ui.dock.layout.root.is_none());
+}
+
+/// A floating panel dragged towards the window's bottom edge moves there, and its title bar
+/// still moves it from there.
+#[test]
+fn floating_panel_dragged_towards_the_window_edge_keeps_moving() {
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| {
+        let mut app = EffectcraftApp::new(Session::default());
+        app.ui.start_screen = false;
+        app
+    });
+    h.run_steps(3);
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "window.floatPanel", json!({"panel": "Preview", "rect": [600.0, 400.0, 360.0, 300.0]})).unwrap();
+    h.run_steps(3);
+    let bar = rect(&h, "panel.float.0.move");
+    drag(&mut h, bar.center(), bar.center() + vec2(40.0, 420.0), Modifiers::NONE);
+    let moved = floating(h.state())[0].rect;
+    assert!(moved[1] > 550.0, "the panel moved down: {moved:?}");
+    let bar = rect(&h, "panel.float.0.move");
+    drag(&mut h, bar.center(), bar.center() - vec2(30.0, 200.0), Modifiers::NONE);
+    let back = floating(h.state())[0].rect;
+    assert!(back[1] < moved[1] - 150.0, "{moved:?} -> {back:?}");
+}
+
+#[test]
+fn catalog_docking_action_supports_resize_reorder_and_floating_geometry() {
+    let mut app = EffectcraftApp::new(Session::default());
+    app.ui.dock = dock::docked(dock::hsplit(
+        SplitSize::FixedFirst(300.0),
+        dock::tabs(&[PanelKind::Project, PanelKind::Info], 1),
+        dock::tabs(&[PanelKind::Composition], 0),
+    ));
+    for action in [
+        Action::ResizeSplit { path: vec![], size: SplitSize::FixedFirst(360.0) },
+        Action::Move { panel: PanelKind::Info, anchor: PanelKind::Project, placement: Placement::Tab { before: Some(PanelKind::Project) } },
+        Action::Float { panel: PanelKind::Info, rect: [20.0, 40.0, 300.0, 200.0] },
+        Action::MoveFloating { panel: PanelKind::Info, rect: [45.0, 65.0, 330.0, 240.0] },
+    ] {
+        invoke(&mut app, "window.dockAction", json!({"action": action})).unwrap();
+    }
+    assert_eq!(floating(&app)[0].rect, [45.0, 65.0, 330.0, 240.0]);
+    let Some(Node::Split { size, .. }) = &app.ui.dock.layout.root else { panic!("split lost") };
+    assert_eq!(*size, SplitSize::FixedFirst(360.0));
+    let before = app.ui.dock.clone();
+    assert!(invoke(&mut app, "window.dockAction", json!({"action": {"ResizeSplit": {"path": [true, true], "size": {"Ratio": 0.5}}}})).is_err());
+    assert!(invoke(&mut app, "window.dockAction", json!({"action": {"Open": {"panel": "Align", "anchor": null}}})).is_err());
+    assert_eq!(app.ui.dock, before);
+}
+
+#[test]
+fn ui_dock_and_window_panel_commands_parse_craft_ui_commands() {
+    let mut app = EffectcraftApp::new(Session::default());
+    app.ui.dock = dock::docked(dock::hsplit(
+        SplitSize::FixedFirst(300.0),
+        dock::tabs(&[PanelKind::Project, PanelKind::Info], 0),
+        dock::tabs(&[PanelKind::Composition, PanelKind::Layer], 0),
+    ));
+    // `ui.dock` operations and actions return the workspace.
+    let reply = invoke(&mut app, "ui.dock", json!({"operation": "move", "panel": "Info", "target": "Composition", "zone": "center"})).unwrap();
+    assert!(reply["docking"]["layout"].is_object(), "{reply}");
+    assert!(app.ui.dock.group_of(PanelKind::Info).contains(&PanelKind::Composition));
+    invoke(&mut app, "ui.dock", json!({"action": {"Activate": {"panel": "Layer"}}})).unwrap();
+    assert!(app.ui.dock.is_visible(PanelKind::Layer));
+    invoke(&mut app, "ui.dock", json!({"operation": "float", "panel": "Info", "rect": [100, 100, 300, 200]})).unwrap();
+    assert_eq!(floating(&app)[0].rect, [100.0, 100.0, 300.0, 200.0]);
+    // `window.panel.*` takes EffectCraft's panel names too.
+    invoke(&mut app, "window.panel.dock", json!({"panel": "Info", "anchor": "Project", "zone": "right"})).unwrap();
+    assert!(floating(&app).is_empty() && app.ui.dock.is_docked(PanelKind::Info));
+    invoke(&mut app, "window.panel.close", json!({"panel": "Info"})).unwrap();
+    assert!(!app.ui.dock.is_open(PanelKind::Info));
+    // A closed panel reopens where it was.
+    invoke(&mut app, "window.panel.activate", json!({"panel": "Info"})).unwrap();
+    assert!(app.ui.dock.is_docked(PanelKind::Info));
+    // The per-panel ids still open a panel.
+    invoke(&mut app, "window.panel.Align", json!({})).unwrap();
+    assert!(app.ui.dock.is_open(PanelKind::Align));
+    // Bad commands change nothing; Reset returns to the workspace's layout.
+    let before = app.ui.dock.clone();
+    for (id, params) in [
+        ("ui.dock", json!({"operation": "move", "panel": "Info", "target": "Nope"})),
+        ("ui.dock", json!({"operation": "teleport", "panel": "Info"})),
+        ("window.panel.move", json!({"panel": "Info"})),
+        ("window.panel.dock", json!({"panel": "Nope", "anchor": "Project"})),
+    ] {
+        assert!(invoke(&mut app, id, params.clone()).is_err(), "{id} {params}");
+        assert_eq!(app.ui.dock, before);
+    }
+    invoke(&mut app, "ui.dock.reset", json!({})).unwrap();
+    assert_eq!(app.ui.dock, Workspace::new(dock::workspace("Default")));
+}
+
+#[test]
+fn catalog_close_keeps_dynamic_panel_identity_and_releases_viewers() {
+    let mut app = EffectcraftApp::new(Session::default());
+    app.ui.dock = dock::docked(dock::tabs(&[PanelKind::Composition, PanelKind::Viewer(42), PanelKind::ScriptPanel(77)], 1));
+    app.ui.viewers.insert(42, Some(7));
+    app.ui.maximized = Some(PanelKind::Viewer(42));
+    for panel in [PanelKind::Viewer(42), PanelKind::ScriptPanel(77)] {
+        invoke(&mut app, "window.dockAction", json!({"action": Action::Close { panel }})).unwrap();
+        assert!(!app.ui.dock.is_open(panel));
+        assert!(app.ui.dock.hidden.iter().any(|(p, _)| *p == panel), "{panel:?} keeps its place");
+    }
+    assert!(app.ui.dock.is_docked(PanelKind::Composition));
+    assert_eq!(app.ui.maximized, None);
+    assert!(!app.ui.viewers.get(&42).is_some_and(Option::is_some), "the closed viewer forgets its comp");
+}
+
+#[test]
+fn stacked_panels_resize_by_pointer_without_changing_closed_entries() {
+    let mut session = Session::default();
+    session.execute("comp.new", json!({"width": 160, "height": 90, "duration": 1})).unwrap();
+    let mut app = EffectcraftApp::new(session);
+    app.ui.start_screen = false;
+    let mut h = Harness::builder().with_size(vec2(1000.0, 720.0)).build_eframe(move |_| app);
+    h.run_steps(4);
+    h.state_mut().ui.dock =
+        dock::docked(dock::stack(&[(PanelKind::Preview, true, Some(100.0)), (PanelKind::Properties, true, None), (PanelKind::Align, false, Some(77.0))]));
+    h.run_steps(3);
+    let project = h.state().session.project.clone();
+    let before = rect(&h, "panel.Preview").height();
+    let from = rect(&h, "dock.gutter.s0").center();
+    drag(&mut h, from, from + vec2(0.0, 16.0), Modifiers::NONE);
+    let after = rect(&h, "panel.Preview").height();
+    assert!((after - before - 16.0).abs() < 2.0, "{before} -> {after}");
+    let Some(Node::Stack { entries }) = &h.state().ui.dock.layout.root else { panic!("stack lost") };
+    assert!(entries[0].height.unwrap_or_default() > 100.0, "{entries:?}");
+    assert_eq!(entries[2], StackEntry { panel: PanelKind::Align, open: false, height: Some(77.0) });
+    assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
+}
+
+#[test]
+fn failed_close_preserves_viewer_lifecycle_and_maximize_state() {
+    let mut app = EffectcraftApp::new(Session::default());
+    // A locked workspace refuses the close.
+    app.ui.dock = dock::docked(dock::tabs(&[PanelKind::Composition, PanelKind::Viewer(42)], 1));
+    app.ui.dock.locked = true;
+    app.ui.maximized = Some(PanelKind::Viewer(42));
+    app.ui.viewers.insert(42, Some(3));
+    app.ui.active_viewer = 42;
+    app.ui.locked_tabs.insert(PanelKind::Viewer(42).id());
+    let before = app.ui.clone();
+    app.close_panel(PanelKind::Viewer(42));
+    assert_eq!(app.ui.dock, before.dock);
+    assert_eq!(app.ui.maximized, before.maximized);
+    assert_eq!(app.ui.viewers, before.viewers);
+    assert_eq!(app.ui.active_viewer, before.active_viewer);
+    assert_eq!(app.ui.locked_tabs, before.locked_tabs);
+}
+
+/// A panel never laid out opens at EffectCraft's default place for it (History beside the
+/// Project panel, Render Queue with the Timeline), not where craft-ui's fallback puts it; a panel
+/// the user closed comes back where it was.
+#[test]
+fn never_placed_panels_open_at_their_default_place() {
+    let mut app = EffectcraftApp::new(Session::default());
+    assert!(!app.ui.dock.is_open(PanelKind::History));
+    invoke(&mut app, "window.panel", json!({"panel": "History"})).unwrap();
+    assert!(app.ui.dock.group_of(PanelKind::History).contains(&PanelKind::Project), "{:?}", app.ui.dock.group_of(PanelKind::History));
+    invoke(&mut app, "window.panel.activate", json!({"panel": "Tracker"})).unwrap();
+    assert!(app.ui.dock.group_of(PanelKind::Tracker).contains(&PanelKind::EffectsPresets) || app.ui.dock.is_open(PanelKind::Tracker));
+    // Closed by the user, it reopens at its recorded place.
+    invoke(&mut app, "window.dockPanel", json!({"panel": "History", "anchor": "Timeline"})).unwrap();
+    invoke(&mut app, "window.closePanel", json!({"panel": "History"})).unwrap();
+    invoke(&mut app, "window.panel", json!({"panel": "History"})).unwrap();
+    assert!(app.ui.dock.group_of(PanelKind::History).contains(&PanelKind::Timeline));
+}
diff --git a/crates/ui-egui/tests/ui_3d.rs b/crates/ui-egui/tests/it/ui_3d.rs
similarity index 76%
rename from crates/ui-egui/tests/ui_3d.rs
rename to crates/ui-egui/tests/it/ui_3d.rs
index 876035a96..a654f745c 100644
--- a/crates/ui-egui/tests/ui_3d.rs
+++ b/crates/ui-egui/tests/it/ui_3d.rs
@@ -1,6 +1,6 @@
 //! Headless UI checks for the 3D viewer (egui_kittest). The `snapshot` test renders the window
 //! with wgpu and writes PNGs when `EC_SNAPSHOT_DIR` is set (`cargo test -p effectcraft-ui-egui
-//! --test ui_3d -- --ignored`); the other test only runs the UI logic.
+//! --test it ui_3d:: -- --ignored`); the other test only runs the UI logic.
 
 use effectcraft_engine::Session;
 use effectcraft_engine::render::three_d::View3D;
@@ -265,3 +265,87 @@ fn each_layout_pane_chooses_its_own_view() {
     settle(&mut h);
     assert!(present(&h, "activeCamera") && !has_camera(&h, "activeCamera"));
 }
+
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: egui::Pos2, to: egui::Pos2) {
+    h.event(egui::Event::PointerMoved(from));
+    h.step();
+    h.event(egui::Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });
+    h.step();
+    for k in 1..=8 {
+        h.event(egui::Event::PointerMoved(from + (to - from) * (k as f32 / 8.0)));
+        h.step();
+    }
+    h.event(egui::Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });
+    h.run_steps(3);
+}
+
+/// A selected 3D solid (`w` x `h`) in an empty 640x360 comp seen by the default camera.
+fn gizmo_harness(w: u32, h: u32) -> (Harness<'static, EffectcraftApp>, u64) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "C", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let solid = s.execute("layer.newSolid", json!({"color": "#ff0000", "width": w, "height": h})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.setSwitch", json!({"layer": solid, "switch": "threeD", "value": true})).unwrap();
+    s.execute("layer.select", json!({"layers": [solid]})).unwrap();
+    let mut harness = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    settle(&mut harness);
+    (harness, solid)
+}
+
+fn transform(h: &mut Harness<'_, EffectcraftApp>, layer: u64, prop: &str) -> Vec<f64> {
+    let v = h.state_mut().session.execute("prop.get", json!({"layer": layer, "path": format!("transform/{prop}")})).unwrap()["value"].clone();
+    serde_json::from_value(v).unwrap()
+}
+
+/// The centre of the automation element `id`.
+fn centre(h: &Harness<'_, EffectcraftApp>, id: &str) -> egui::Pos2 {
+    let [x, y, w, hh] = h.state().auto.find(id).unwrap_or_else(|| panic!("{id} is registered")).rect;
+    egui::pos2(x + w / 2.0, y + hh / 2.0)
+}
+
+/// #1618: the gizmo's arrows drag a 3D layer along one axis. Z, which points at the default
+/// camera, still has a grabbable arrow and pushes the layer in depth, as one undo step.
+#[test]
+fn gizmo_arrows_move_a_3d_layer_along_one_axis() {
+    let (mut h, solid) = gizmo_harness(200, 200);
+    let p0 = transform(&mut h, solid, "position");
+
+    let z = centre(&h, &format!("viewer.gizmo.{solid}.z"));
+    drag(&mut h, z, z + egui::vec2(30.0, -30.0));
+    let p1 = transform(&mut h, solid, "position");
+    assert_eq!(&p1[..2], &p0[..2], "x and y stay put");
+    assert!(p1[2] > p0[2] + 10.0, "pushed back in depth: {p0:?} -> {p1:?}");
+
+    settle(&mut h);
+    let x = centre(&h, &format!("viewer.gizmo.{solid}.x"));
+    drag(&mut h, x, x + egui::vec2(40.0, 25.0));
+    let p2 = transform(&mut h, solid, "position");
+    assert!(p2[0] > p1[0] + 10.0, "moved along x: {p1:?} -> {p2:?}");
+    assert_eq!(&p2[1..], &p1[1..], "only x changes");
+
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(transform(&mut h, solid, "position"), p1, "the x drag is one undo step");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(transform(&mut h, solid, "position"), p0, "the z drag is one undo step");
+}
+
+/// #1627 review: an arrow drawn over a box handle is what the pointer grabs (it scaled the
+/// layer). At 100% a 120 px wide layer has its right-edge handle under the X arrow's tip.
+#[test]
+fn a_gizmo_arrow_wins_over_the_box_handle_under_it() {
+    let (mut h, solid) = gizmo_harness(120, 200);
+    h.state_mut().ui.viewer.zoom = Some(1.0);
+    settle(&mut h);
+    let x = centre(&h, &format!("viewer.gizmo.{solid}.x"));
+    assert!(x.distance(centre(&h, &format!("viewer.handle.{solid}.5"))) < 2.0, "the right-edge handle is under the X tip");
+
+    h.event(egui::Event::PointerMoved(x));
+    h.run_steps(2);
+    assert_eq!(h.output().platform_output.cursor_icon, egui::CursorIcon::Move, "hover shows the move cursor, not resize");
+
+    let p0 = transform(&mut h, solid, "position");
+    drag(&mut h, x, x + egui::vec2(30.0, 0.0));
+    let p1 = transform(&mut h, solid, "position");
+    assert_eq!(transform(&mut h, solid, "scale"), vec![100.0, 100.0, 100.0], "not scaled");
+    assert!((p1[0] - p0[0] - 30.0).abs() < 1e-6, "moved 30 px along x: {p0:?} -> {p1:?}");
+    assert_eq!(&p1[1..], &p0[1..]);
+}
diff --git a/crates/ui-egui/tests/ui_agent_audit.rs b/crates/ui-egui/tests/it/ui_agent_audit.rs
similarity index 97%
rename from crates/ui-egui/tests/ui_agent_audit.rs
rename to crates/ui-egui/tests/it/ui_agent_audit.rs
index a14f77838..c3f556457 100644
--- a/crates/ui-egui/tests/ui_agent_audit.rs
+++ b/crates/ui-egui/tests/it/ui_agent_audit.rs
@@ -29,7 +29,8 @@ fn harness(s: Session) -> Harness<'static, EffectcraftApp> {
 fn send(h: &mut Harness<'_, EffectcraftApp>, method: &str, params: Value) -> Value {
     let ctx = h.ctx.clone();
     let (req, _rx) = ControlRequest::new(method, params);
-    match control::handle(h.state_mut(), &ctx, &req) {
+    let now = h.state().now();
+    match control::handle(h.state_mut(), &ctx, &req, now) {
         Outcome::Done(v) => v,
         _ => panic!("{method}: no immediate reply"),
     }
@@ -70,7 +71,7 @@ fn interactive(ctx: &egui::Context) -> Vec<(Rect, String)> {
                 }
                 let info = w.info(r.id);
                 // Selectable text (labels sense drags to select their text) is not a control.
-                if info.is_some_and(|i| i.typ == egui::WidgetType::Label) {
+                if info.is_some_and(|i| i.role == egui::Role::Label) {
                     continue;
                 }
                 out.push((ir, info.and_then(|i| i.label.clone()).unwrap_or_default()));
diff --git a/crates/ui-egui/tests/ui_angles.rs b/crates/ui-egui/tests/it/ui_angles.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_angles.rs
rename to crates/ui-egui/tests/it/ui_angles.rs
diff --git a/crates/ui-egui/tests/ui_audio_scrub.rs b/crates/ui-egui/tests/it/ui_audio_scrub.rs
similarity index 54%
rename from crates/ui-egui/tests/ui_audio_scrub.rs
rename to crates/ui-egui/tests/it/ui_audio_scrub.rs
index 02fefb14f..c748afe8e 100644
--- a/crates/ui-egui/tests/ui_audio_scrub.rs
+++ b/crates/ui-egui/tests/it/ui_audio_scrub.rs
@@ -9,6 +9,7 @@ use effectcraft_engine::project::ItemId;
 use effectcraft_engine::time::Tick;
 use effectcraft_ui_egui::EffectcraftApp;
 use effectcraft_ui_egui::audio::{AudioDevice, AudioFeed};
+use effectcraft_ui_egui::frames::{RemoteDone, RemoteFrame, RemoteFrames, RemoteJob};
 use egui::{Event, Modifiers, pos2};
 use egui_kittest::Harness;
 use serde_json::json;
@@ -30,6 +31,58 @@ impl AudioDevice for Fake {
     }
 }
 
+/// A frame renderer whose frames the test releases explicitly. Playback then runs against a
+/// controlled clock and controlled cache contents instead of racing however many frame workers
+/// the host has; a frame that is not released is queued again by the next playback step.
+#[derive(Clone, Default)]
+struct GatedFrames {
+    pending: Arc<Mutex<Vec<(i64, u32, u32, RemoteDone)>>>,
+}
+
+impl RemoteFrames for GatedFrames {
+    fn slots(&self) -> usize {
+        1024
+    }
+
+    fn start(&self, job: RemoteJob, done: RemoteDone) {
+        let (frame, width, height) = job.project.comp(job.comp).map_or((-1, 1, 1), |c| {
+            let scale = job.opts.scale.max(0.001);
+            let width = (c.width as f64 * scale).round().clamp(1.0, 16_384.0) as u32;
+            let height = (c.height as f64 * scale).round().clamp(1.0, 16_384.0) as u32;
+            (c.frame_rate.frame_at(job.t), width, height)
+        });
+        self.pending.lock().unwrap().push((frame, width, height, done));
+    }
+}
+
+impl GatedFrames {
+    /// Put `frames` in the cache, dropping every other queued frame (playback asks again).
+    fn render(&self, h: &mut Harness<'_, EffectcraftApp>, cid: ItemId, frames: &[i64]) {
+        let scale = h.state().shown_series(cid).scale as f64 / 1000.0;
+        for &f in frames {
+            h.state().request_frame(cid, f, scale);
+        }
+        while h.state().frames.dispatch_remote() != 0 {}
+        let pending = std::mem::take(&mut *self.pending.lock().unwrap());
+        for (frame, width, height, done) in pending {
+            if frames.contains(&frame) {
+                let rgba = vec![0; (width as usize).saturating_mul(height as usize).saturating_mul(4)];
+                done(Ok(RemoteFrame { width, height, rgba, ms: 1.0 }));
+            } else {
+                done(Err("held back by the test renderer".into()));
+            }
+        }
+    }
+
+    /// Drop everything queued without caching it (the warm-up passes request viewer frames).
+    fn discard(&self, h: &mut Harness<'_, EffectcraftApp>) {
+        while h.state().frames.dispatch_remote() != 0 {}
+        for (_, _, _, done) in std::mem::take(&mut *self.pending.lock().unwrap()) {
+            done(Err("held back by the test renderer".into()));
+        }
+    }
+}
+
 /// A 2 s, 30 fps comp whose solid sounds a tone (Audio switch on).
 fn setup(audible: bool, fake: &Fake) -> (EffectcraftApp, ItemId) {
     setup_long(audible, fake, 2.0)
@@ -120,42 +173,74 @@ fn cmd_dragging_the_current_time_scrubs_and_an_idle_scrub_closes() {
 fn preview_with_audio_shows_every_frame_and_sounds_once_cached() {
     let fake = Fake::default();
     let (mut app, cid) = setup(true, &fake);
-    // Playback requests at most twice as many frames ahead per step as there are render threads.
-    // Four times that many frames take at least four steps to cache, so frames are shown silently
-    // first however fast the renderer is (with a fixed 2 s comp, a machine with many cores cached
-    // all of it before the first step and the sound started at once).
+    // Hold rendering in the test: the cache cannot fill ahead of what the test releases, so the
+    // silently shown frames and the moment the sound starts do not depend on the host's threads.
+    let gate = GatedFrames::default();
+    let renderer: Arc<dyn RemoteFrames> = Arc::new(gate.clone());
+    app.frames.set_remote(Some(renderer));
     let ahead = (app.frames.parallelism() * 2).max(4);
     app.session.execute("comp.settings", json!({"comp": cid.0, "duration": (4 * ahead) as f64 / 30.0})).unwrap();
-    // A little under one frame of input time per step.
-    let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).with_step_dt(1.0 / 31.0).build_eframe(|_| app);
+    let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).with_step_dt(1.0 / 30.0).build_eframe(|_| app);
+    // Playback measures time on the app clock, never `ctx.input(|i| i.time)`; drive that clock
+    // explicitly at one frame per step.
+    h.state_mut().use_manual_clock();
     h.run_steps(2);
+    gate.discard(&mut h);
     let frame = |h: &Harness<'_, EffectcraftApp>| {
         let app = h.state();
         app.session.project.comp(cid).unwrap().frame_rate.frame_at(app.session.time())
     };
-    let now = h.ctx.input(|i| i.time);
+    let now = h.state().now();
     h.state_mut().play(now);
     assert!(h.state().playback.audio_held && h.state().audio.is_none(), "nothing is cached: no sound yet");
     let mut last = frame(&h);
     let mut shown = 0;
-    // Wait on the clock, not a step count: under a loaded machine (parallel test binaries) the
-    // background cache can take far longer than 2000 short steps to get ahead.
-    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(60);
-    while std::time::Instant::now() < deadline {
+    // Show frames while only those frames are cached: they play silently first.
+    for _ in 0..4 {
+        let target = last + 1;
+        gate.render(&mut h, cid, &[target]);
+        h.state_mut().clock_mut().advance(1.0 / 30.0);
         h.step();
-        if h.state().audio.is_some() {
-            break;
-        }
         let f = frame(&h);
-        assert!(f == last || f == last + 1 || f < last, "{last} → {f}: a frame was skipped");
+        // Accumulating 1/30 in f64 can leave the same frame up for one more step; it must never
+        // jump over a frame.
+        assert!(f == last || f == last + 1, "{last} → {f}: a frame was skipped");
         shown += usize::from(f != last);
         last = f;
-        std::thread::sleep(std::time::Duration::from_millis(1));
     }
-    assert!(h.state().audio.is_some() && fake.0.lock().unwrap().0.is_some(), "the sound started once the frames ahead were cached");
+    // A frame that has not rendered holds the clock at the frame on screen; once it renders it is
+    // shown, never jumped over. This exercises the production hold path, not a test-only shortcut.
+    let waiting = last;
+    h.state_mut().clock_mut().advance(1.0 / 30.0);
+    h.step();
+    assert_eq!(frame(&h), waiting, "an uncached frame holds the preview instead of being skipped");
+    gate.render(&mut h, cid, &[waiting + 1]);
+    // f64 clock accumulation need not put the next step exactly on the next frame boundary;
+    // keep stepping until the held frame appears, and never allow it to jump past that frame.
+    let mut showed_waiting = false;
+    for _ in 0..4 {
+        h.state_mut().clock_mut().advance(1.0 / 30.0);
+        h.step();
+        let f = frame(&h);
+        assert!(f == waiting || f == waiting + 1, "{waiting} → {f}: the held frame was skipped");
+        if f == waiting + 1 {
+            showed_waiting = true;
+            break;
+        }
+    }
+    assert!(showed_waiting, "the waiting frame is shown once it renders");
+    shown += 1;
+    last = waiting + 1;
     assert!(shown > 0, "frames played silently first");
-    // A frame that isn't cached stops the sound rather than being skipped. (Frames render fast
-    // enough here to be cached again before the check: keep them out of the cache.)
+    assert!(h.state().audio.is_none() && h.state().playback.audio_held, "the rest of the range is not cached: the sound waits");
+    // Cache everything ahead; only then may the sound start.
+    let end = h.state().playback.plan.expect("a preview plan").end;
+    let rest: Vec<i64> = ((last + 1)..=end).collect();
+    gate.render(&mut h, cid, &rest);
+    h.step();
+    assert!(h.state().audio.is_some() && fake.0.lock().unwrap().0.is_some(), "the sound started once the frames ahead were cached");
+    // A frame that isn't cached stops the sound rather than being skipped.
+    gate.discard(&mut h);
     h.state().frames.set_budget(0);
     h.state().frames.clear();
     h.step();
@@ -168,27 +253,47 @@ fn preview_with_audio_shows_every_frame_and_sounds_once_cached() {
 #[test]
 fn preview_with_audio_sounds_once_rendering_keeps_up() {
     let fake = Fake::default();
-    let (app, cid) = setup_long(true, &fake, 30.0);
+    let (mut app, cid) = setup_long(true, &fake, 30.0);
+    // Release only the frames this test chooses, and drive the app clock: rendering cannot race
+    // the clock, so a frame is never skipped by a slow or loaded test host.
+    let gate = GatedFrames::default();
+    let renderer: Arc<dyn RemoteFrames> = Arc::new(gate.clone());
+    app.frames.set_remote(Some(renderer));
     let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).with_step_dt(1.0 / 30.0).build_eframe(|_| app);
+    h.state_mut().use_manual_clock();
     h.run_steps(2);
+    gate.discard(&mut h);
+    let ahead = (h.state().frames.parallelism() * 2).max(4) as i64;
     let frame = |h: &Harness<'_, EffectcraftApp>| {
         let app = h.state();
         app.session.project.comp(cid).unwrap().frame_rate.frame_at(app.session.time())
     };
-    let now = h.ctx.input(|i| i.time);
-    h.state_mut().play(now);
+    let start = h.state().now();
+    h.state_mut().play(start);
     assert!(h.state().playback.audio_held && h.state().audio.is_none(), "nothing is cached: no sound yet");
     let mut last = frame(&h);
-    // Two seconds of playback, each step giving the frame workers time to keep up.
-    for _ in 0..60 {
+    let mut shown = 0;
+    // Two seconds of playback at one frame per clock step: keep the prefetch window cached, but
+    // not the rest of the 30 s comp, so the sound has to start by the real-time rule.
+    for step in 1..=60 {
+        let target = last + 1;
+        let window: Vec<i64> = (target..target + ahead).collect();
+        gate.render(&mut h, cid, &window);
+        // Set the clock to this step's exact time rather than adding 1/30 repeatedly: accumulated
+        // f64 error can put one step just below a frame boundary and the next just above it, so
+        // `floor(elapsed × fps)` would otherwise jump from frame N to N + 2 for a one-frame step.
+        let now = h.state().now();
+        let tick_time = start + step as f64 / 30.0;
+        h.state_mut().clock_mut().advance(tick_time - now);
         h.step();
         if h.state().audio.is_some() {
             break;
         }
         let f = frame(&h);
         assert!(f == last || f == last + 1, "{last} → {f}: a frame was skipped");
+        shown += usize::from(f != last);
         last = f;
-        std::thread::sleep(std::time::Duration::from_millis(20));
     }
     assert!(h.state().audio.is_some() && fake.0.lock().unwrap().0.is_some(), "the sound started within 2 s, at frame {last} of 900");
+    assert!(shown >= 3, "the sound starts only after the silent preview kept up for a moment");
 }
diff --git a/crates/ui-egui/tests/ui_azerty_shortcuts.rs b/crates/ui-egui/tests/it/ui_azerty_shortcuts.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_azerty_shortcuts.rs
rename to crates/ui-egui/tests/it/ui_azerty_shortcuts.rs
diff --git a/crates/ui-egui/tests/it/ui_batch_switches.rs b/crates/ui-egui/tests/it/ui_batch_switches.rs
new file mode 100644
index 000000000..407ac194e
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_batch_switches.rs
@@ -0,0 +1,244 @@
+//! A Timeline row control clicked on one of several selected layers applies to the whole
+//! selection (#1849), as in After Effects: the A/V Features and Switches columns, the label
+//! swatch and the Modes column. The engine commands already took several layers; the row
+//! controls used to pass the clicked layer alone.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::color::{BlendMode, Label};
+use effectcraft_engine::project::{Layer, LayerId, Switches};
+use effectcraft_ui_egui::EffectcraftApp;
+use egui::{Event, Modifiers, Pos2, Rect, pos2, vec2};
+use egui_kittest::Harness;
+use egui_kittest::kittest::Queryable;
+use serde_json::json;
+
+/// Comp "Main" with solids A (top) to D (bottom); returns their ids top to bottom.
+fn harness() -> (Harness<'static, EffectcraftApp>, Vec<u64>) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
+    let mut ids: Vec<u64> = ["D", "C", "B", "A"]
+        .iter()
+        .map(|name| s.execute("layer.newSolid", json!({"name": name, "color": "#406080"})).unwrap()["layer"].as_u64().unwrap())
+        .collect();
+    ids.reverse();
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    (h, ids)
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}")).clone();
+    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
+}
+
+/// Press on `from`, move to `to` in `steps`, release there.
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2, steps: u32) {
+    h.event(Event::PointerMoved(from));
+    h.step();
+    h.event(Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    for k in 1..=steps {
+        h.event(Event::PointerMoved(from + (to - from) * (k as f32 / steps as f32)));
+        h.step();
+    }
+    h.event(Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+/// A click on the Timeline control `id`.
+fn click(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
+    let p = rect(h, id).center();
+    drag(h, p, p, 1);
+}
+
+/// A click at `p` (a menu entry, found by its label).
+fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+    drag(h, p, p, 1);
+}
+
+fn alt_click(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
+    let p = rect(h, id).center();
+    let modifiers = Modifiers::ALT;
+    h.event(Event::PointerMoved(p));
+    h.event(Event::ModifiersChanged(modifiers));
+    h.step();
+    h.event(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers });
+    h.step();
+    h.event(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers });
+    h.event(Event::ModifiersChanged(Modifiers::NONE));
+    h.run_steps(3);
+}
+
+/// Select `ids` in the Timeline, as a Shift range or a Cmd toggle would.
+fn select(h: &mut Harness<'_, EffectcraftApp>, ids: &[u64]) {
+    h.state_mut().session.execute("layer.select", json!({"layers": ids})).unwrap();
+    h.run_steps(2);
+}
+
+/// The state of switch `f` on each layer of `ids`, top to bottom.
+fn states(h: &Harness<'_, EffectcraftApp>, ids: &[u64], f: fn(&Layer) -> bool) -> Vec<bool> {
+    let comp = h.state().session.active_comp().unwrap();
+    ids.iter().map(|id| f(comp.layer(LayerId(*id)).unwrap())).collect()
+}
+
+fn switches(h: &Harness<'_, EffectcraftApp>, id: u64) -> Switches {
+    h.state().session.active_comp().unwrap().layer(LayerId(id)).unwrap().switches.clone()
+}
+
+fn locked(l: &Layer) -> bool {
+    l.switches.locked
+}
+
+fn video(l: &Layer) -> bool {
+    l.switches.video
+}
+
+fn three_d(l: &Layer) -> bool {
+    l.switches.three_d
+}
+
+fn solo(l: &Layer) -> bool {
+    l.switches.solo
+}
+
+fn shy(l: &Layer) -> bool {
+    l.switches.shy
+}
+
+fn motion_blur(l: &Layer) -> bool {
+    l.switches.motion_blur
+}
+
+fn preserved(l: &Layer) -> bool {
+    l.preserve_transparency
+}
+
+/// #1849: a click on the Lock, 3D, Solo, Shy or Motion Blur switch of a selected layer gives the
+/// switch to every selected layer, in one undo step.
+#[test]
+fn switches_on_a_selected_row_set_the_whole_selection() {
+    let (mut h, ids) = harness();
+    select(&mut h, &[ids[0], ids[2]]);
+
+    let steps = h.state().session.history.undo.len();
+    click(&mut h, &format!("timeline.layer.{}.lock", ids[0]));
+    assert_eq!(states(&h, &ids, locked), [true, false, true, false]);
+    assert_eq!(h.state().session.history.undo.len(), steps + 1, "one undo step");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    assert_eq!(states(&h, &ids, locked), [false; 4]);
+
+    click(&mut h, &format!("timeline.layer.{}.switch.threeD", ids[0]));
+    assert_eq!(states(&h, &ids, three_d), [true, false, true, false]);
+    // The switch of the other selected layer acts the same way.
+    click(&mut h, &format!("timeline.layer.{}.solo", ids[2]));
+    assert_eq!(states(&h, &ids, solo), [true, false, true, false]);
+    click(&mut h, &format!("timeline.layer.{}.switch.shy", ids[2]));
+    assert_eq!(states(&h, &ids, shy), [true, false, true, false]);
+    click(&mut h, &format!("timeline.layer.{}.switch.motionBlur", ids[0]));
+    assert_eq!(states(&h, &ids, motion_blur), [true, false, true, false]);
+    // A second click turns both off again, whatever their own state.
+    click(&mut h, &format!("timeline.layer.{}.switch.threeD", ids[2]));
+    assert_eq!(states(&h, &ids, three_d), [false; 4]);
+}
+
+/// A switch on a row that isn't selected still changes that layer alone, and leaves the
+/// selection.
+#[test]
+fn a_switch_on_an_unselected_row_sets_that_layer_only() {
+    let (mut h, ids) = harness();
+    select(&mut h, &[ids[0], ids[2]]);
+    click(&mut h, &format!("timeline.layer.{}.lock", ids[1]));
+    assert_eq!(states(&h, &ids, locked), [false, true, false, false]);
+    assert_eq!(h.state().session.state.selected_layers, vec![LayerId(ids[0]), LayerId(ids[2])]);
+}
+
+/// The targets skip the selected layers a switch doesn't apply to: 3D reaches a null but not a
+/// camera (3D by kind), the Effect switch not a layer without effects.
+#[test]
+fn switch_targets_skip_the_layers_the_switch_does_not_apply_to() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
+    let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    let null = s.execute("layer.newNull", json!({"name": "Ctrl"})).unwrap()["layer"].as_u64().unwrap();
+    let cam = s.execute("layer.newCamera", json!({})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("effect.apply", json!({"effect": "ec.blur.gaussian", "layers": [solid]})).unwrap();
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    select(&mut h, &[solid, null, cam]);
+
+    click(&mut h, &format!("timeline.layer.{solid}.switch.threeD"));
+    assert!(switches(&h, solid).three_d && switches(&h, null).three_d, "3D reaches the null");
+    assert!(!switches(&h, cam).three_d, "a camera is 3D by kind, its own switch stays off");
+
+    click(&mut h, &format!("timeline.layer.{solid}.switch.fx"));
+    assert!(!switches(&h, solid).effects, "the Effect switch reaches the layer that has an effect");
+    assert!(switches(&h, null).effects && switches(&h, cam).effects, "no effects, no Effect switch");
+}
+
+/// Alt-click on an A/V feature sets the selected layers apart (the others off), and the next
+/// Alt-click brings the others back — with several layers, the whole selection stands apart.
+#[test]
+fn alt_click_sets_the_selected_layers_apart() {
+    let (mut h, ids) = harness();
+    select(&mut h, &[ids[0], ids[2]]);
+    alt_click(&mut h, &format!("timeline.layer.{}.video", ids[0]));
+    assert_eq!(states(&h, &ids, video), [true, false, true, false]);
+    alt_click(&mut h, &format!("timeline.layer.{}.video", ids[0]));
+    assert_eq!(states(&h, &ids, video), [true; 4]);
+}
+
+/// The label swatch menu of a selected layer sets the label of every selected layer.
+#[test]
+fn the_label_menu_sets_the_selections_label() {
+    let (mut h, ids) = harness();
+    select(&mut h, &[ids[0], ids[2]]);
+    let green = h.state().session.prefs.label_name(Label::Green);
+    click(&mut h, &format!("timeline.layer.{}.label", ids[0]));
+    let entry = h.query_by_label(&green).expect("the label menu is open").rect();
+    click_at(&mut h, entry.center());
+    let label = |id: u64| h.state().session.active_comp().unwrap().layer(LayerId(id)).unwrap().label;
+    assert_eq!([label(ids[0]), label(ids[1]), label(ids[2]), label(ids[3])], [Label::Green, Label::Red, Label::Green, Label::Red]);
+}
+
+/// The Modes column: the Blending Mode menu and the Preserve Transparency checkbox of a selected
+/// layer set both selected layers, one undo step each.
+#[test]
+fn the_modes_column_sets_the_whole_selection() {
+    let (mut h, ids) = harness();
+    h.state_mut().ui.timeline.show_modes = true;
+    h.run_steps(3);
+    select(&mut h, &[ids[0], ids[2]]);
+
+    click(&mut h, &format!("timeline.layer.{}.mode", ids[0]));
+    let entry = h.query_by_label("Multiply").expect("the blend mode menu is open").rect();
+    click_at(&mut h, entry.center());
+    let mode = |id: u64| h.state().session.active_comp().unwrap().layer(LayerId(id)).unwrap().blend_mode;
+    assert_eq!([mode(ids[0]), mode(ids[1]), mode(ids[2]), mode(ids[3])], [BlendMode::Multiply, BlendMode::Normal, BlendMode::Multiply, BlendMode::Normal]);
+
+    click(&mut h, &format!("timeline.layer.{}.preserveTransparency", ids[0]));
+    assert_eq!(states(&h, &ids, preserved), [true, false, true, false]);
+
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    assert_eq!(states(&h, &ids, preserved), [false; 4], "one undo step put both back");
+}
+
+/// Preserve Transparency toggles from the row it is clicked on, not from the first selected layer:
+/// A on and C off, clicking C's box turns both on.
+#[test]
+fn preserve_transparency_toggles_from_the_clicked_row() {
+    let (mut h, ids) = harness();
+    h.state_mut().ui.timeline.show_modes = true;
+    h.run_steps(3);
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [ids[0]], "switch": "preserveTransparency", "value": true})).unwrap();
+    h.run_steps(2);
+    select(&mut h, &[ids[0], ids[2]]);
+    click(&mut h, &format!("timeline.layer.{}.preserveTransparency", ids[2]));
+    assert_eq!(states(&h, &ids, preserved), [true, false, true, false]);
+    // The next click turns both off again.
+    click(&mut h, &format!("timeline.layer.{}.preserveTransparency", ids[2]));
+    assert_eq!(states(&h, &ids, preserved), [false; 4]);
+}
diff --git a/crates/ui-egui/tests/ui_blank_context_menus.rs b/crates/ui-egui/tests/it/ui_blank_context_menus.rs
similarity index 80%
rename from crates/ui-egui/tests/ui_blank_context_menus.rs
rename to crates/ui-egui/tests/it/ui_blank_context_menus.rs
index 20f7467cc..52417326f 100644
--- a/crates/ui-egui/tests/ui_blank_context_menus.rs
+++ b/crates/ui-egui/tests/it/ui_blank_context_menus.rs
@@ -1,5 +1,7 @@
 //! Right-click actions in the blank Project and Timeline areas, and on Timeline property names.
 use effectcraft_engine::Session;
+use effectcraft_engine::project::ItemKind;
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
 use effectcraft_ui_egui::{Dialog, EffectcraftApp, dock::PanelKind};
 use egui::{Event, Modifiers, PointerButton, Pos2, Rect, pos2, vec2};
 use egui_kittest::{Harness, kittest::Queryable as _};
@@ -64,7 +66,7 @@ fn timeline_blank_outline_and_time_graph_create_layers() {
         let area = rect(&h, "timeline.layerMarquee");
         let p = if graph { pos2(area.max.x + 150.0, area.center().y) } else { area.center() };
         right_click(&mut h, p);
-        h.get_by_label("New ⏵").click();
+        h.get_by_label("New").click();
         h.run_steps(3);
         snapshot(&mut h, if graph { "timeline-graph" } else { "timeline-outline" });
         h.get_by_label("Null Object").click();
@@ -80,7 +82,7 @@ fn timeline_blank_menu_opens_solid_settings() {
     let mut h = harness();
     let p = rect(&h, "timeline.layerMarquee").center();
     right_click(&mut h, p);
-    h.get_by_label("New ⏵").click();
+    h.get_by_label("New").click();
     h.run_steps(3);
     h.get_by_label("Solid…").click();
     h.run_steps(3);
@@ -159,7 +161,7 @@ fn timeline_blank_menu_opens_current_comp_in_essential_graphics() {
         h.get_by_label("Open in Essential Graphics").click();
         h.run_steps(3);
         assert_eq!(h.state().session.state.essential_primary, Some(comp));
-        assert!(h.state().ui.dock.contains(PanelKind::EssentialGraphics));
+        assert!(h.state().ui.dock.is_docked(PanelKind::EssentialGraphics));
     }
 }
 
@@ -251,13 +253,13 @@ fn timeline_layer_context_menu_has_the_effects_submenu_and_applies_an_effect() {
     let r = rect(&h, &format!("timeline.layer.{layer}.row"));
     right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));
     // The palette sits between Blending Mode and Arrange, as After Effects' layer menu does.
-    let blending = h.get_by_label("Blending Mode ⏵").rect();
-    let effects = h.get_by_label("Effects ⏵").rect();
-    let arrange = h.get_by_label("Arrange ⏵").rect();
+    let blending = h.get_by_label("Blending Mode").rect();
+    let effects = h.get_by_label("Effects").rect();
+    let arrange = h.get_by_label("Arrange").rect();
     assert!(blending.bottom() <= effects.top() && effects.bottom() <= arrange.top(), "Effects between Blending Mode and Arrange");
-    h.get_by_label("Effects ⏵").click();
+    h.get_by_label("Effects").click();
     h.run_steps(3);
-    h.get_by_label("Blur & Sharpen ⏵").click();
+    h.get_by_label("Blur & Sharpen").click();
     h.run_steps(3);
     h.get_by_label("Gaussian Blur").click();
     h.run_steps(3);
@@ -282,11 +284,11 @@ fn timeline_layer_context_menu_has_layer_styles_submenu() {
     h.run_steps(3);
     let r = rect(&h, &format!("timeline.layer.{solid}.row"));
     right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));
-    let blending = h.get_by_label("Blending Mode ⏵").rect();
-    let styles = h.get_by_label("Layer Styles ⏵").rect();
-    let effects = h.get_by_label("Effects ⏵").rect();
+    let blending = h.get_by_label("Blending Mode").rect();
+    let styles = h.get_by_label("Layer Styles").rect();
+    let effects = h.get_by_label("Effects").rect();
     assert!(blending.bottom() <= styles.top() && styles.bottom() <= effects.top(), "Layer Styles between Blending Mode and Effects");
-    h.get_by_label("Layer Styles ⏵").click();
+    h.get_by_label("Layer Styles").click();
     h.run_steps(3);
     assert!(h.query_by_label("Layer Style Options...").is_some());
     assert!(h.query_by_label("Drop Shadow").is_some());
@@ -299,6 +301,43 @@ fn timeline_layer_context_menu_has_layer_styles_submenu() {
     assert!(l.layer_styles().is_some_and(|g| g.sub("dropShadow").is_some()));
 }
 
+/// #1809: Reveal Layer Source in Project shows the source in a large project: it clears the
+/// Project panel's search, opens the folders holding the item and selects it.
+#[test]
+fn timeline_layer_context_menu_reveals_the_source_in_project() {
+    let mut h = harness();
+    let layer = h.state_mut().session.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    let solid = h.state().session.project.items.values().find(|i| matches!(i.kind, ItemKind::Solid(_))).unwrap().id;
+    let outer = h.state_mut().session.execute("project.newFolder", json!({"name": "Assets"})).unwrap()["item"].as_u64().unwrap();
+    let inner = h.state_mut().session.execute("project.newFolder", json!({"name": "Plates"})).unwrap()["item"].as_u64().unwrap();
+    h.state_mut().session.execute("project.move", json!({"items": [inner], "folder": outer})).unwrap();
+    h.state_mut().session.execute("project.move", json!({"items": [solid.0], "folder": inner})).unwrap();
+    h.state_mut().session.execute("project.select", json!({"items": []})).unwrap();
+    h.state_mut().ui.project_open_folders.clear();
+    h.state_mut().ui.project_search = "no such item".into();
+    h.run_steps(3);
+    assert!(h.state().auto.find(&format!("project.item.{}", solid.0)).is_none(), "the source starts hidden");
+    let r = rect(&h, &format!("timeline.layer.{layer}.row"));
+    right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));
+    h.get_by_label("Reveal Layer Source in Project").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.state.project_selection, vec![solid]);
+    assert_eq!(h.state().ui.focused, PanelKind::Project);
+    assert!(h.state().ui.project_search.is_empty(), "the search is cleared");
+    assert!([outer, inner].iter().all(|folder| h.state().ui.project_open_folders.contains(folder)), "the folders holding the source open");
+    assert!(h.state().auto.find(&format!("project.item.{}", solid.0)).is_some(), "the source row is visible");
+    // In a mixed selection the command still appears when the right-clicked layer has no source,
+    // because the menu acts on the solid layer too.
+    let shape = h.state_mut().session.execute("layer.newShape", json!({"kind": "none"})).unwrap()["layer"].as_u64().unwrap();
+    h.state_mut().session.execute("layer.select", json!({"layers": [shape, layer]})).unwrap();
+    h.run_steps(3);
+    let r = rect(&h, &format!("timeline.layer.{shape}.row"));
+    right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));
+    h.get_by_label("Reveal Layer Source in Project").click();
+    h.run_steps(3);
+    assert_eq!(h.state().session.state.project_selection, vec![solid], "the solid's source, not the shape");
+}
+
 /// #976: a layer's context menu has After Effects' Markers ▸ Add Marker, which marks the layer that
 /// was right-clicked (not the one selected before, and not the composition) at the current time.
 #[test]
@@ -313,7 +352,7 @@ fn layer_context_menu_adds_a_layer_marker() {
     h.run_steps(3);
     let r = rect(&h, &format!("timeline.layer.{top}.row"));
     right_click(&mut h, pos2(r.min.x + 210.0, r.center().y));
-    h.get_by_label("Markers ⏵").click();
+    h.get_by_label("Markers").click();
     h.run_steps(3);
     snapshot(&mut h, "layer-markers");
     h.get_by_label("Add Marker").click();
diff --git a/crates/ui-egui/tests/ui_camera_tracker.rs b/crates/ui-egui/tests/it/ui_camera_tracker.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_camera_tracker.rs
rename to crates/ui-egui/tests/it/ui_camera_tracker.rs
index a90c3fa45..2ab27fd6e 100644
--- a/crates/ui-egui/tests/ui_camera_tracker.rs
+++ b/crates/ui-egui/tests/it/ui_camera_tracker.rs
@@ -175,6 +175,7 @@ fn viewer_zooms_and_pans_over_the_track_points() {
         delta: egui::vec2(0.0, 120.0),
         modifiers: Default::default(),
         phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
     });
     h.run_steps(20);
     assert_ne!(h.state().ui.viewer.zoom, zoom, "the wheel zooms over the track points");
diff --git a/crates/ui-egui/tests/ui_character_eyedropper.rs b/crates/ui-egui/tests/it/ui_character_eyedropper.rs
similarity index 92%
rename from crates/ui-egui/tests/ui_character_eyedropper.rs
rename to crates/ui-egui/tests/it/ui_character_eyedropper.rs
index a2c4c6d1f..ea2578a0d 100644
--- a/crates/ui-egui/tests/ui_character_eyedropper.rs
+++ b/crates/ui-egui/tests/it/ui_character_eyedropper.rs
@@ -2,7 +2,7 @@
 use effectcraft_engine::{Session, commands::text_edit::layer_doc, project::LayerId};
 use effectcraft_ui_egui::{
     EffectcraftApp,
-    dock::{DockNode, PanelKind, SplitSize},
+    dock::{self, PanelKind, SplitSize},
     panels::viewer::comp_to_screen,
 };
 use egui::{Event, Modifiers, PointerButton, Pos2, pos2, vec2};
@@ -71,12 +71,7 @@ fn character_stroke_eyedropper_samples_viewer() {
     s.execute("layer.setText", json!({"layer": text, "fill": [0.0, 0.0, 0.0], "size": 32.0})).unwrap();
     let mut app = EffectcraftApp::new(s);
     app.ui.viewer.show_layer_controls = false;
-    app.ui.dock = DockNode::Split {
-        vertical: false,
-        size: SplitSize::FixedB(360.0),
-        a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Composition], active: 0 }),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Character], active: 0 }),
-    };
+    app.ui.dock = dock::docked(dock::hsplit(SplitSize::FixedSecond(360.0), dock::tabs(&[PanelKind::Composition], 0), dock::tabs(&[PanelKind::Character], 0)));
     let builder = Harness::builder().with_size(vec2(1200.0, 760.0));
     let mut h = if std::env::var_os("EC_SNAPSHOT_DIR").is_some() { builder.wgpu().build_eframe(|_| app) } else { builder.build_eframe(|_| app) };
     h.state_mut().show_panel(PanelKind::Character);
diff --git a/crates/ui-egui/tests/ui_color_hex.rs b/crates/ui-egui/tests/it/ui_color_hex.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_color_hex.rs
rename to crates/ui-egui/tests/it/ui_color_hex.rs
diff --git a/crates/ui-egui/tests/ui_comp_presets.rs b/crates/ui-egui/tests/it/ui_comp_presets.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_comp_presets.rs
rename to crates/ui-egui/tests/it/ui_comp_presets.rs
diff --git a/crates/ui-egui/tests/ui_control_modifiers.rs b/crates/ui-egui/tests/it/ui_control_modifiers.rs
similarity index 68%
rename from crates/ui-egui/tests/ui_control_modifiers.rs
rename to crates/ui-egui/tests/it/ui_control_modifiers.rs
index 46567aede..7a7a1395a 100644
--- a/crates/ui-egui/tests/ui_control_modifiers.rs
+++ b/crates/ui-egui/tests/it/ui_control_modifiers.rs
@@ -18,6 +18,8 @@ fn frames(app: &mut EffectcraftApp) -> Vec<(bool, egui::Modifiers)> {
         if raw.events.is_empty() {
             break;
         }
+        // The harness feeds the batch itself; a real UI pass would apply it now.
+        app.mark_synthetic_applied();
         let mut button = false;
         for e in &raw.events {
             match e {
@@ -34,7 +36,26 @@ fn frames(app: &mut EffectcraftApp) -> Vec<(bool, egui::Modifiers)> {
 fn send(app: &mut EffectcraftApp, method: &str, params: Value) {
     let ctx = egui::Context::default();
     let (req, _rx) = ControlRequest::new(method, params);
-    let _ = control::handle(app, &ctx, &req);
+    let now = app.now();
+    let _ = control::handle(app, &ctx, &req, now);
+}
+
+#[test]
+fn control_gestures_reject_excessive_counts_without_queue_mutation() {
+    let mut app = EffectcraftApp::new(Session::default());
+    send(&mut app, "ui.click", json!({"x": 10, "y": 10, "count": u64::MAX}));
+    assert!(app.take_synthetic_input().is_empty(), "an oversized click must not partially queue input");
+
+    send(&mut app, "ui.drag", json!({"from": {"x": 10, "y": 10}, "to": {"x": 90, "y": 40}, "steps": u64::MAX}));
+    assert!(app.take_synthetic_input().is_empty(), "an oversized drag must not partially queue input");
+
+    send(&mut app, "ui.click", json!({"x": 10, "y": 10, "count": 512}));
+    send(&mut app, "ui.click", json!({"x": 10, "y": 10, "count": 512}));
+    assert_eq!(app.take_synthetic_input().len(), 2054, "two maximum accepted clicks fit under the aggregate cap");
+    for _ in 0..4 {
+        send(&mut app, "ui.click", json!({"x": 10, "y": 10, "count": 512}));
+    }
+    assert_eq!(app.take_synthetic_input().len(), 3081, "the pending event limit is enforced before requests can exceed it");
 }
 
 #[test]
diff --git a/crates/ui-egui/tests/ui_dock_resize.rs b/crates/ui-egui/tests/it/ui_dock_resize.rs
similarity index 85%
rename from crates/ui-egui/tests/ui_dock_resize.rs
rename to crates/ui-egui/tests/it/ui_dock_resize.rs
index c3c12e78a..863fe697e 100644
--- a/crates/ui-egui/tests/ui_dock_resize.rs
+++ b/crates/ui-egui/tests/it/ui_dock_resize.rs
@@ -1,10 +1,11 @@
 //! Shared pane resizing in the full application, including application shortcut ownership.
 
+use craft_ui::docking::{Divider, DockArea, Hit};
 use effectcraft_engine::Session;
 use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{DockNode, PanelKind, SplitSize};
+use effectcraft_ui_egui::dock::{self, Node, PanelKind, SplitSize};
 use effectcraft_ui_egui::theme::ThemeKind;
-use egui::{Event, Id, Key, Modifiers, PointerButton, Rect, pos2, vec2};
+use egui::{Event, Key, Modifiers, PointerButton, Rect, pos2, vec2};
 use egui_kittest::Harness;
 use serde_json::json;
 
@@ -23,8 +24,8 @@ fn snapshots(h: &mut Harness<'_, EffectcraftApp>, directory: Option<&std::path::
 }
 
 fn first_size(h: &Harness<'_, EffectcraftApp>) -> f32 {
-    match h.state().ui.dock {
-        DockNode::Split { size: SplitSize::FixedA(value), .. } => value,
+    match &h.state().ui.dock.layout.root {
+        Some(Node::Split { size: SplitSize::FixedFirst(value), .. }) => *value,
         ref other => panic!("fixed-size mode changed: {other:?}"),
     }
 }
@@ -45,16 +46,12 @@ fn focused_dock_resize_owns_arrows_and_keeps_pointer_dragging() {
     h.run_steps(4);
     snapshots(&mut h, directory.as_deref(), "workspace");
     h.state_mut().ui.focused = PanelKind::Composition;
-    h.state_mut().ui.dock = DockNode::Split {
-        vertical: false,
-        size: SplitSize::FixedA(400.0),
-        a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project], active: 0 }),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Composition], active: 0 }),
-    };
+    h.state_mut().ui.dock =
+        dock::docked(dock::hsplit(SplitSize::FixedFirst(400.0), dock::tabs(&[PanelKind::Project], 0), dock::tabs(&[PanelKind::Composition], 0)));
     h.run_steps(3);
     let before_project = h.state().session.project.clone();
     let before_times = h.state().session.state.times.clone();
-    let id = Id::new(("dock-gutter", String::new()));
+    let id = DockArea::<PanelKind>::hit_id(effectcraft_ui_egui::dock_ui::area_id(), &Hit::Divider(Divider::Split(Vec::new())));
     h.ctx.memory_mut(|memory| memory.request_focus(id));
     h.run_steps(2);
     assert_eq!(h.ctx.memory(|memory| memory.focused()), Some(id));
diff --git a/crates/ui-egui/tests/ui_drag_drop.rs b/crates/ui-egui/tests/it/ui_drag_drop.rs
similarity index 94%
rename from crates/ui-egui/tests/ui_drag_drop.rs
rename to crates/ui-egui/tests/it/ui_drag_drop.rs
index 9b66f745c..e405bf777 100644
--- a/crates/ui-egui/tests/ui_drag_drop.rs
+++ b/crates/ui-egui/tests/it/ui_drag_drop.rs
@@ -108,6 +108,47 @@ fn project_items_land_where_they_are_dropped_in_the_timeline() {
     assert!((in_point(&h, 3) - 1.0).abs() < 1e-9, "Shift starts it at the current time");
 }
 
+/// Alt/Option-drag from the Project panel replaces the source of the layer under the pointer
+/// instead of adding a layer (#991).
+#[test]
+fn alt_dragging_a_project_item_replaces_the_layer_source() {
+    let (mut h, clip) = harness();
+    let top = layer_id(&h, "Top");
+    let item = rect(&h, &format!("project.item.{clip}.name")).center();
+    let row = rect(&h, &format!("timeline.layer.{top}.row"));
+    let before = stack(&h);
+    drag(&mut h, item, row.center(), Modifiers::ALT);
+    assert_eq!(stack(&h), before, "no layer is added");
+    let layer = h.state().session.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(top)).unwrap();
+    assert_eq!(layer.source, effectcraft_engine::project::LayerSource::Comp { item: effectcraft_engine::project::ItemId(clip) });
+    assert_eq!(layer.name, "Top", "the layer keeps its name");
+}
+
+/// Ctrl+Alt+/ (Cmd+Opt+/ on macOS) replaces every selected layer's source with the Project panel
+/// selection (#991).
+#[test]
+fn ctrl_alt_slash_replaces_every_selected_layer_source() {
+    let (mut h, clip) = harness();
+    let top = layer_id(&h, "Top");
+    let middle = layer_id(&h, "Middle");
+    h.state_mut().session.execute("layer.select", json!({"layers": [top, middle]})).unwrap();
+    h.state_mut().session.state.project_selection = vec![effectcraft_engine::project::ItemId(clip)];
+    h.run_steps(3);
+    let modifiers = Modifiers { command: true, alt: true, ..Default::default() };
+    for pressed in [true, false] {
+        h.event(Event::Key { key: egui::Key::Slash, physical_key: Some(egui::Key::Slash), pressed, repeat: false, modifiers });
+    }
+    h.run_steps(3);
+    let comp = h.state().session.active_comp().unwrap();
+    for lid in [top, middle] {
+        assert_eq!(
+            comp.layer(effectcraft_engine::project::LayerId(lid)).unwrap().source,
+            effectcraft_engine::project::LayerSource::Comp { item: effectcraft_engine::project::ItemId(clip) }
+        );
+    }
+    assert_eq!(stack(&h), ["Top", "Middle", "Bottom"], "no layer is added");
+}
+
 /// #85: a Project item dropped on the Composition viewer becomes a layer centred where it was
 /// dropped (above the selected layer, like any new layer).
 #[test]
diff --git a/crates/ui-egui/tests/ui_effect_controls.rs b/crates/ui-egui/tests/it/ui_effect_controls.rs
similarity index 97%
rename from crates/ui-egui/tests/ui_effect_controls.rs
rename to crates/ui-egui/tests/it/ui_effect_controls.rs
index cdf8c7033..d6138ba5c 100644
--- a/crates/ui-egui/tests/ui_effect_controls.rs
+++ b/crates/ui-egui/tests/it/ui_effect_controls.rs
@@ -421,7 +421,7 @@ fn right_click_in_effect_controls_shows_the_effect_menu() {
     app.show_panel(PanelKind::EffectControls);
     let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app);
     h.run_steps(3);
-    let category = " Blur & Sharpen ⏵";
+    let category = " Blur & Sharpen";
     // An effect's header: its own menu.
     let header = rect_of(&h, &format!("effectControls.effect.{fill}")).center();
     right_click(&mut h, header);
@@ -778,6 +778,23 @@ fn effect_control_name_can_be_renamed_from_its_header() {
     assert_eq!(current_name(&h), "Point Control");
 }
 
+// Regression test for #1497: double-clicking an effect parameter's name in Effect Controls did
+// nothing; it should reveal that property in the Timeline, as After Effects does.
+#[test]
+fn double_clicking_an_effect_property_name_reveals_it_in_the_timeline() {
+    let (app, x) = app();
+    let mut h = Harness::builder().with_size(egui::vec2(1700.0, 1100.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| app);
+    settle(&mut h);
+    let row = format!("timeline.prop.{}.name", x.point);
+    assert!(!ids(&h).contains(&row), "the effect's property is not in the Timeline before the double-click");
+    assert!(!h.state().ui.timeline.reveal_props.contains(&x.point));
+    let point = rect_of(&h, &format!("effectControls.prop.{}.name", x.point)).center();
+    double_click(&mut h, point);
+    h.run_steps(4);
+    assert!(h.state().ui.timeline.reveal_props.contains(&x.point), "the property is marked revealed in the Timeline");
+    assert!(ids(&h).contains(&row), "the Timeline shows the property's row");
+}
+
 #[test]
 fn effect_rename_escape_keeps_the_name() {
     let (app, x) = app();
diff --git a/crates/ui-egui/tests/ui_effect_drop_highlight.rs b/crates/ui-egui/tests/it/ui_effect_drop_highlight.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_effect_drop_highlight.rs
rename to crates/ui-egui/tests/it/ui_effect_drop_highlight.rs
diff --git a/crates/ui-egui/tests/ui_effect_names.rs b/crates/ui-egui/tests/it/ui_effect_names.rs
similarity index 73%
rename from crates/ui-egui/tests/ui_effect_names.rs
rename to crates/ui-egui/tests/it/ui_effect_names.rs
index c65d2cea2..d57f9c581 100644
--- a/crates/ui-egui/tests/ui_effect_names.rs
+++ b/crates/ui-egui/tests/it/ui_effect_names.rs
@@ -32,7 +32,9 @@ fn harness(language: &str) -> (Harness<'static, EffectcraftApp>, u64) {
     app.show_panel(PanelKind::EffectControls);
     app.show_panel(PanelKind::EffectsPresets);
     app.show_panel(PanelKind::Timeline);
-    let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).build_eframe(|_| app);
+    // The Chinese/Japanese names under test have no installed face on every host: draw tofu
+    // instead of failing the missing-glyph gate (the glyph coverage test covers the bundled set).
+    let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).allow_missing_glyphs().build_eframe(|_| app);
     h.run_steps(4);
     (h, fx)
 }
@@ -85,6 +87,41 @@ fn the_generated_effect_menu_is_translated() {
     assert_eq!(menu_label(&en, "Effect", "Blur & Sharpen", BLUR).as_deref(), Some(BLUR_EN), "the English menu is unchanged");
 }
 
+/// Right-click the Effect Controls header of effect `fx`.
+fn open_effect_menu(h: &mut Harness<'_, EffectcraftApp>, fx: u64) {
+    let e = h.state().auto.find(&format!("effectControls.effect.{fx}")).expect("the effect's header").rect;
+    let pos = egui::pos2(e[0] + e[2] / 2.0, e[1] + e[3] / 2.0);
+    h.event(egui::Event::PointerMoved(pos));
+    h.step();
+    for pressed in [true, false] {
+        h.event(egui::Event::PointerButton { pos, button: egui::PointerButton::Secondary, pressed, modifiers: Default::default() });
+        h.step();
+    }
+    h.run_steps(2);
+}
+
+/// The effect header's context menu draws its items in the interface language, like the layer
+/// menu (#1308): it used to draw Copy, Paste, Duplicate, Reset, Remove, Move Up and Move Down in
+/// English whatever the language.
+#[test]
+fn the_effect_context_menu_follows_the_interface_language() {
+    const ENGLISH: [&str; 7] = ["Copy", "Paste", "Duplicate", "Reset", "Remove", "Move Up", "Move Down"];
+    let (mut h, fx) = harness("zh-hans");
+    open_effect_menu(&mut h, fx);
+    for label in ["复制", "粘贴", "重复", "重命名", "重置", "移除", "上移", "下移"] {
+        assert!(h.query_by_label(label).is_some(), "{label} missing from the effect menu");
+    }
+    for label in ENGLISH {
+        assert!(h.query_by_label(label).is_none(), "{label} drawn in English");
+    }
+
+    let (mut en, fx) = harness("en");
+    open_effect_menu(&mut en, fx);
+    for label in ENGLISH {
+        assert!(en.query_by_label(label).is_some(), "{label} missing from the English menu");
+    }
+}
+
 /// Everything an agent or a script addresses stays English: the automation label, the property
 /// tree's group name and `effect.list`.
 #[test]
diff --git a/crates/ui-egui/tests/ui_font_search.rs b/crates/ui-egui/tests/it/ui_font_search.rs
similarity index 81%
rename from crates/ui-egui/tests/ui_font_search.rs
rename to crates/ui-egui/tests/it/ui_font_search.rs
index 6be69cb7a..122003abe 100644
--- a/crates/ui-egui/tests/ui_font_search.rs
+++ b/crates/ui-egui/tests/it/ui_font_search.rs
@@ -176,3 +176,37 @@ fn font_menu_filters_variable_fonts() {
     key(&mut h, Key::Escape);
     assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().font, "Inter", "filtering changes nothing");
 }
+
+/// The font menu grows back when a query that matched nothing is cleared, while the search
+/// field keeps its place and the keyboard; a click on a row then picks that font.
+#[test]
+fn font_menu_grows_back_after_an_empty_search() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"width": 320, "height": 180})).unwrap();
+    let lid = s.execute("layer.newText", json!({"text": "Grow", "font": "Inter"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Character);
+    h.run_steps(3);
+    let rows = |h: &Harness<'_, EffectcraftApp>| h.state().auto.query("character.font.option.").len();
+    let search = |h: &Harness<'_, EffectcraftApp>| h.state().auto.find("character.font.search").map(|e| e.rect);
+    click(&mut h, "character.font");
+    h.run_steps(2);
+    let (full, field) = (rows(&h), search(&h));
+    assert!(full > 3, "the open menu shows the fonts: {full} rows");
+    let query = "no_such_font_123456789";
+    type_text(&mut h, query);
+    assert_eq!(rows(&h), 0);
+    assert!(h.state().auto.find("character.font.empty").is_some());
+    for pressed in query.chars().flat_map(|_| [true, false]) {
+        h.input_mut().events.push(Event::Key { key: Key::Backspace, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE });
+    }
+    h.run_steps(3);
+    // (Within a row: the list scrolls to the current font on opening and to the top when cleared.)
+    assert!(rows(&h) + 1 >= full, "cleared, the menu shows as many fonts as when it opened: {} of {full}", rows(&h));
+    assert_eq!(search(&h), field, "the search field stays put");
+    // The field still has the keyboard: typing filters again.
+    type_text(&mut h, "JetBrains");
+    assert!(rows(&h) > 0 && h.state().auto.query("character.font.option.").iter().all(|r| r.label.contains("JetBrains")));
+    click(&mut h, "character.font.option.JetBrains Mono");
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().font, "JetBrains Mono", "a click on a row picks the font");
+}
diff --git a/crates/ui-egui/tests/ui_form_fit.rs b/crates/ui-egui/tests/it/ui_form_fit.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_form_fit.rs
rename to crates/ui-egui/tests/it/ui_form_fit.rs
diff --git a/crates/ui-egui/tests/ui_frame_step.rs b/crates/ui-egui/tests/it/ui_frame_step.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_frame_step.rs
rename to crates/ui-egui/tests/it/ui_frame_step.rs
diff --git a/crates/ui-egui/tests/ui_fx_editors.rs b/crates/ui-egui/tests/it/ui_fx_editors.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_fx_editors.rs
rename to crates/ui-egui/tests/it/ui_fx_editors.rs
index 90a5af15d..b9530fdf4 100644
--- a/crates/ui-egui/tests/ui_fx_editors.rs
+++ b/crates/ui-egui/tests/it/ui_fx_editors.rs
@@ -8,6 +8,7 @@ use effectcraft_engine::keyframe::Value as KV;
 use effectcraft_engine::project::{LayerId, Node, PropGroup};
 use effectcraft_ui_egui::EffectcraftApp;
 use effectcraft_ui_egui::dock::PanelKind;
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
 use egui::{Event, Pos2, pos2};
 use egui_kittest::Harness;
 use serde_json::json;
@@ -298,5 +299,5 @@ fn composition_tabs_and_scrolling_preview() {
     let shown = h.state().session.state.active_comp.unwrap();
     click_id(&mut h, "panel.tab.Timeline.close");
     assert!(!h.state().session.state.open_comps.contains(&shown));
-    assert!(h.state().ui.dock.contains(PanelKind::Timeline));
+    assert!(h.state().ui.dock.is_docked(PanelKind::Timeline));
 }
diff --git a/crates/ui-egui/tests/ui_gpu.rs b/crates/ui-egui/tests/it/ui_gpu.rs
similarity index 91%
rename from crates/ui-egui/tests/ui_gpu.rs
rename to crates/ui-egui/tests/it/ui_gpu.rs
index 906ac0cd1..355c35bf5 100644
--- a/crates/ui-egui/tests/ui_gpu.rs
+++ b/crates/ui-egui/tests/it/ui_gpu.rs
@@ -115,5 +115,12 @@ fn a_lost_device_draws_nothing_autosaves_and_closes() {
     let saved = h.state().session.autosave.last_path.clone().expect("unsaved changes auto-saved");
     assert!(std::path::Path::new(&saved).is_file(), "{saved}");
     assert_eq!(*told.borrow(), vec![Some(Ok(saved))], "the user is told once, with the recovery copy");
+    // The close arrives: on macOS the app quits through `-[NSApplication terminate:]` instead of
+    // closing the window while AppKit's run loop is running (#341).
+    h.input_mut().viewports.entry(egui::ViewportId::ROOT).or_default().events.push(egui::ViewportEvent::Close);
+    h.step();
+    let kept = h.output().viewport_output.get(&egui::ViewportId::ROOT).is_some_and(|v| v.commands.contains(&egui::ViewportCommand::CancelClose));
+    assert_eq!(kept, cfg!(target_os = "macos"), "the platform quit closes the window on macOS");
+    assert_eq!(told.borrow().len(), 1);
     let _ = std::fs::remove_dir_all(&dir);
 }
diff --git a/crates/ui-egui/tests/ui_gradient_editor.rs b/crates/ui-egui/tests/it/ui_gradient_editor.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_gradient_editor.rs
rename to crates/ui-egui/tests/it/ui_gradient_editor.rs
diff --git a/crates/ui-egui/tests/ui_gradient_handles.rs b/crates/ui-egui/tests/it/ui_gradient_handles.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_gradient_handles.rs
rename to crates/ui-egui/tests/it/ui_gradient_handles.rs
diff --git a/crates/ui-egui/tests/ui_gradient_value.rs b/crates/ui-egui/tests/it/ui_gradient_value.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_gradient_value.rs
rename to crates/ui-egui/tests/it/ui_gradient_value.rs
diff --git a/crates/ui-egui/tests/ui_graph_fit.rs b/crates/ui-egui/tests/it/ui_graph_fit.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_graph_fit.rs
rename to crates/ui-egui/tests/it/ui_graph_fit.rs
diff --git a/crates/ui-egui/tests/ui_group_rename.rs b/crates/ui-egui/tests/it/ui_group_rename.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_group_rename.rs
rename to crates/ui-egui/tests/it/ui_group_rename.rs
diff --git a/crates/ui-egui/tests/it/ui_guide_layers.rs b/crates/ui-egui/tests/it/ui_guide_layers.rs
new file mode 100644
index 000000000..37158658f
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_guide_layers.rs
@@ -0,0 +1,129 @@
+//! Guide Layer in the layer context menus (Timeline rows and the Composition viewer), a plain item
+//! (no check mark) that toggles the switch on the selection, and the guide mark by a guide layer's
+//! name.
+use effectcraft_engine::Session;
+use effectcraft_engine::project::LayerId;
+use effectcraft_ui_egui::EffectcraftApp;
+use egui::{Event, Modifiers, PointerButton, Pos2, Rect, pos2, vec2};
+use egui_kittest::Harness;
+use egui_kittest::kittest::{NodeT as _, Queryable as _};
+use serde_json::json;
+
+/// A 640×360 comp with two 200×200 solids, "Left" at (160, 180) and "Right" at (480, 180).
+fn harness() -> (Harness<'static, EffectcraftApp>, LayerId, LayerId) {
+    let mut session = Session::default();
+    session.execute("comp.new", json!({"name": "Guides", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let mut solid = |name: &str, x: f64| {
+        let id = session.execute("layer.newSolid", json!({"name": name, "color": "#406080", "width": 200, "height": 200})).unwrap()["layer"].as_u64().unwrap();
+        session.execute("prop.set", json!({"layer": id, "path": "transform/position", "value": [x, 180.0]})).unwrap();
+        LayerId(id)
+    };
+    let left = solid("Left", 160.0);
+    let right = solid("Right", 480.0);
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(session));
+    h.run_steps(3);
+    (h, left, right)
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("missing {id}"));
+    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
+}
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, p: Pos2, button: PointerButton) {
+    for pressed in [true, false] {
+        h.input_mut().events.push(Event::PointerMoved(p));
+        h.input_mut().events.push(Event::PointerButton { pos: p, button, pressed, modifiers: Modifiers::NONE });
+        h.step();
+    }
+    h.run_steps(3);
+}
+
+fn guide(h: &Harness<'_, EffectcraftApp>, id: LayerId) -> bool {
+    h.state().session.active_comp().unwrap().layer(id).unwrap().switches.guide
+}
+
+fn snapshot(h: &mut Harness<'_, EffectcraftApp>, name: &str) {
+    if let Ok(dir) = std::env::var("GUIDE_LAYER_SNAPSHOTS") {
+        h.render().unwrap().save(format!("{dir}/{name}.png")).unwrap();
+    }
+}
+
+/// The open menu's Guide Layer item carries no check mark (a plain toggle).
+fn plain(h: &Harness<'_, EffectcraftApp>) -> bool {
+    !h.get_by_label_contains("Guide Layer").accesskit_node().label().unwrap_or_default().contains('✔')
+}
+
+fn row(h: &Harness<'_, EffectcraftApp>, id: LayerId) -> Pos2 {
+    let r = rect(h, &format!("timeline.layer.{}.row", id.0));
+    pos2(r.min.x + 210.0, r.center().y)
+}
+
+/// The Guide Layer item of the open menu `prefix`.
+fn guide_item(h: &Harness<'_, EffectcraftApp>, prefix: &str) -> Rect {
+    rect(h, &format!("{prefix}.switch.guide"))
+}
+
+#[test]
+fn timeline_layer_menu_toggles_guide_layer() {
+    let (mut h, left, right) = harness();
+    assert!(h.state().auto.find(&format!("timeline.layer.{}.guide", left.0)).is_none(), "no guide mark yet");
+    let p = row(&h, left);
+    click(&mut h, p, PointerButton::Secondary);
+    assert_eq!(h.state().session.state.selected_layers, vec![left], "right-click selects the row");
+    assert!(plain(&h), "no check mark");
+    let item = guide_item(&h, "timeline.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(guide(&h, left), "Guide Layer turned on");
+    assert!(!guide(&h, right), "only the target layer");
+    // The guide mark shows by the name.
+    h.run_steps(2);
+    assert!(h.state().auto.find(&format!("timeline.layer.{}.guide", left.0)).is_some(), "guide mark by the name");
+    // Again: off. Undo brings it back.
+    let p = row(&h, left);
+    click(&mut h, p, PointerButton::Secondary);
+    assert!(plain(&h), "no check mark on a guide layer either");
+    snapshot(&mut h, "timeline-menu");
+    let item = guide_item(&h, "timeline.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(!guide(&h, left), "Guide Layer turned off");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert!(guide(&h, left));
+}
+
+#[test]
+fn timeline_layer_menu_guide_layer_acts_on_the_selection() {
+    let (mut h, left, right) = harness();
+    h.state_mut().session.execute("layer.select", json!({"layers": [left.0, right.0]})).unwrap();
+    h.run_steps(3);
+    let p = row(&h, right);
+    click(&mut h, p, PointerButton::Secondary);
+    let item = guide_item(&h, "timeline.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(guide(&h, left) && guide(&h, right), "both selected layers become guide layers");
+    let p = row(&h, left);
+    click(&mut h, p, PointerButton::Secondary);
+    let item = guide_item(&h, "timeline.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(!guide(&h, left) && !guide(&h, right), "and back together");
+}
+
+#[test]
+fn viewer_layer_menu_toggles_guide_layer() {
+    let (mut h, left, right) = harness();
+    let comp = rect(&h, "viewer.comp");
+    let k = comp.width() / 640.0;
+    let at = |x: f32| comp.min + vec2(x, 180.0) * k;
+    click(&mut h, at(480.0), PointerButton::Secondary);
+    assert_eq!(h.state().session.state.selected_layers, vec![right], "right-click picks the layer under the pointer");
+    let item = guide_item(&h, "viewer.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(guide(&h, right) && !guide(&h, left));
+    // The Timeline and viewer menus share the item: the viewer menu turns it off again.
+    click(&mut h, at(480.0), PointerButton::Secondary);
+    assert!(plain(&h), "no check mark");
+    snapshot(&mut h, "viewer-menu");
+    let item = guide_item(&h, "viewer.layerMenu");
+    click(&mut h, item.center(), PointerButton::Primary);
+    assert!(!guide(&h, right));
+}
diff --git a/crates/ui-egui/tests/ui_inline_edit.rs b/crates/ui-egui/tests/it/ui_inline_edit.rs
similarity index 79%
rename from crates/ui-egui/tests/ui_inline_edit.rs
rename to crates/ui-egui/tests/it/ui_inline_edit.rs
index dd20e55b0..c9cf4693e 100644
--- a/crates/ui-egui/tests/ui_inline_edit.rs
+++ b/crates/ui-egui/tests/it/ui_inline_edit.rs
@@ -12,7 +12,9 @@ fn harness() -> (Harness<'static, EffectcraftApp>, u64) {
     let mut s = Session::default();
     s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "duration": 4, "fps": 24})).unwrap();
     let comp = s.active_comp_id().unwrap().0;
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    // Arabic, Hebrew, Devanagari and Thai names typed below need installed system faces: draw
+    // tofu on a host without them rather than failing the missing-glyph gate.
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).allow_missing_glyphs().build_eframe(|_| EffectcraftApp::new(s));
     h.run_steps(4);
     (h, comp)
 }
@@ -539,3 +541,140 @@ fn arrow_keys_move_the_caret_in_rename_fields() {
     let layer_name = h.state().session.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(layer)).unwrap().name.clone();
     assert_eq!(layer_name, "Pla-te");
 }
+
+/// A solid named `name` with its Transform group open in the Timeline; returns the layer, its
+/// Opacity uid and its Rotation uid.
+fn open_transform(h: &mut Harness<'_, EffectcraftApp>, name: &str) -> (u64, u64, u64) {
+    let (layer, opacity, rotation, transform) = {
+        let s = &mut h.state_mut().session;
+        let l = s.execute("layer.newSolid", json!({"name": name, "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+        let tr = s.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(l)).unwrap().props.sub("transform").unwrap().clone();
+        (l, tr.get("opacity").unwrap().uid, tr.get("rotation").unwrap().uid, tr.uid)
+    };
+    h.state_mut().ui.timeline.open_layers.insert(layer);
+    h.state_mut().ui.timeline.open_groups.insert(transform);
+    h.run_steps(3);
+    (layer, opacity, rotation)
+}
+
+fn expression(h: &Harness<'_, EffectcraftApp>, layer: u64, prop: u64) -> Option<String> {
+    let comp = h.state().session.active_comp().unwrap();
+    comp.layer(effectcraft_engine::project::LayerId(layer)).unwrap().props.find(prop).unwrap().expr.as_ref().map(|e| e.text.clone())
+}
+
+fn commit_expression(h: &mut Harness<'_, EffectcraftApp>) {
+    h.input_mut().events.push(Event::ModifiersChanged(Modifiers::COMMAND));
+    h.input_mut().events.push(Event::Key { key: Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND });
+    h.step();
+    h.input_mut().events.push(Event::ModifiersChanged(Modifiers::NONE));
+    h.run_steps(3);
+}
+
+/// #1072: Alt-clicking a stopwatch adds an expression and its editor takes the keyboard at once,
+/// the new expression selected, so typing replaces it (it took another click). That happens
+/// once: a field clicked next keeps the keyboard, and removing the expression with another
+/// Alt-click leaves nothing to take it.
+#[test]
+fn alt_clicking_a_stopwatch_focuses_the_new_expression() {
+    let (mut h, _) = harness();
+    let (layer, opacity, rotation) = open_transform(&mut h, "Plate");
+    let alt = Modifiers { alt: true, ..Modifiers::NONE };
+    let stopwatch = |h: &Harness<'_, EffectcraftApp>, prop: u64| center(h, &format!("timeline.prop.{prop}.stopwatch"));
+    let at = stopwatch(&h, opacity);
+    click_with(&mut h, at, alt);
+    assert!(expression(&h, layer, opacity).is_some(), "an expression was added");
+    type_text(&mut h, "50");
+    commit_expression(&mut h);
+    assert_eq!(expression(&h, layer, opacity).as_deref(), Some("50"), "typing replaced the new expression");
+    // A field clicked right after an Alt-click keeps the keyboard.
+    let at = stopwatch(&h, rotation);
+    click_with(&mut h, at, alt);
+    let added = expression(&h, layer, rotation).expect("an expression on Rotation");
+    let p = center(&h, "timeline.timecode");
+    click(&mut h, p, 2);
+    type_text(&mut h, "0:00:01:00");
+    key(&mut h, Key::Enter);
+    let frame = h.state().session.active_comp().unwrap().frame_rate.frame_at(h.state().session.time());
+    assert_eq!((frame, expression(&h, layer, rotation)), (24, Some(added)), "the time took the typing, not the expression");
+    // Alt-click again removes the expression; nothing takes the keyboard after it.
+    let at = stopwatch(&h, opacity);
+    click_with(&mut h, at, alt);
+    h.run_steps(5);
+    assert_eq!(expression(&h, layer, opacity), None);
+    assert!(!h.ctx.egui_wants_keyboard_input(), "nothing has the keyboard");
+}
+
+/// #1072: an expression added at the bottom of the Timeline brings its editor into view to take
+/// the keyboard (its row is added below the last one shown).
+#[test]
+fn an_expression_added_at_the_bottom_of_the_timeline_comes_into_view() {
+    let (mut h, _) = harness();
+    let (layer, opacity, _) = open_transform(&mut h, "Bottom");
+    for i in 0..40 {
+        h.state_mut().session.execute("layer.newSolid", json!({"name": format!("Layer {i}"), "color": "#406080"})).unwrap();
+    }
+    h.run_steps(3);
+    // Scroll to the end (the layer is at the bottom of the stack), then until Opacity is the
+    // last row shown.
+    h.state_mut().ui.timeline.scroll_y = 1.0e6;
+    h.run_steps(3);
+    let rows = h.state().auto.find("timeline.scroll").unwrap().rect;
+    let bottom = rows[1] + rows[3];
+    let row = h.state().auto.find(&format!("timeline.prop.{opacity}.row")).unwrap().rect;
+    h.state_mut().ui.timeline.scroll_y += row[1] + row[3] - bottom;
+    h.run_steps(3);
+    let row = h.state().auto.find(&format!("timeline.prop.{opacity}.row")).unwrap().rect;
+    assert!((row[1] + row[3] - bottom).abs() < 1.0, "Opacity is at the bottom: {row:?}");
+    let at = center(&h, &format!("timeline.prop.{opacity}.stopwatch"));
+    click_with(&mut h, at, Modifiers { alt: true, ..Modifiers::NONE });
+    let editor = h.state().auto.find(&format!("timeline.prop.{opacity}.expression")).expect("the editor is drawn").rect;
+    assert!(editor[1] >= rows[1] - 0.5 && editor[1] + editor[3] <= bottom + 0.5, "the editor is in view: {editor:?} in {rows:?}");
+    type_text(&mut h, "25");
+    commit_expression(&mut h);
+    assert_eq!(expression(&h, layer, opacity).as_deref(), Some("25"));
+}
+
+/// #1434: with several 3D layers selected, typing a Z Position sets Z on each of them; their X
+/// and Y stay their own. Every selected layer used to take the typed layer's whole Position, so
+/// they stacked on top of it and seemed to disappear.
+#[test]
+fn typing_one_component_with_several_layers_selected_keeps_their_other_components() {
+    let (mut h, _) = harness();
+    let (a, b, transform) = {
+        let s = &mut h.state_mut().session;
+        let mut ids = vec![];
+        for (name, xy) in [("A", [40.0, 50.0]), ("B", [200.0, 120.0])] {
+            let l = s.execute("layer.newSolid", json!({"name": name, "color": "#406080", "width": 40, "height": 40})).unwrap()["layer"].as_u64().unwrap();
+            s.execute("layer.setSwitch", json!({"layers": [l], "switch": "threeD", "value": true})).unwrap();
+            s.execute("prop.set", json!({"layer": l, "path": "transform/position", "value": [xy[0], xy[1], 0.0]})).unwrap();
+            ids.push(l);
+        }
+        s.execute("layer.select", json!({"layers": ids})).unwrap();
+        let tr = s.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(ids[0])).unwrap().props.sub("transform").unwrap().uid;
+        (ids[0], ids[1], tr)
+    };
+    h.state_mut().ui.timeline.open_layers.insert(a);
+    h.state_mut().ui.timeline.open_groups.insert(transform);
+    h.run_steps(3);
+    let pos = |h: &Harness<'_, EffectcraftApp>, l: u64| {
+        h.state()
+            .session
+            .active_comp()
+            .unwrap()
+            .layer(effectcraft_engine::project::LayerId(l))
+            .unwrap()
+            .props
+            .prop("transform/position")
+            .unwrap()
+            .value
+            .components()
+    };
+    let position =
+        h.state().session.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(a)).unwrap().props.prop("transform/position").unwrap().uid;
+    let p = center(&h, &format!("timeline.prop.{position}.value.2"));
+    click(&mut h, p, 1);
+    type_text(&mut h, "-300");
+    key(&mut h, Key::Enter);
+    assert_eq!(pos(&h, a), [40.0, 50.0, -300.0]);
+    assert_eq!(pos(&h, b), [200.0, 120.0, -300.0], "B keeps its own X and Y");
+}
diff --git a/crates/ui-egui/tests/ui_keyframes.rs b/crates/ui-egui/tests/it/ui_keyframes.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_keyframes.rs
rename to crates/ui-egui/tests/it/ui_keyframes.rs
diff --git a/crates/ui-egui/tests/ui_large_project.rs b/crates/ui-egui/tests/it/ui_large_project.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_large_project.rs
rename to crates/ui-egui/tests/it/ui_large_project.rs
index e6ffd26e7..4e2476269 100644
--- a/crates/ui-egui/tests/ui_large_project.rs
+++ b/crates/ui-egui/tests/it/ui_large_project.rs
@@ -65,7 +65,7 @@ fn comp_thumbnail_renders_off_the_ui_thread() {
     for _ in 0..400 {
         h.step();
         if h.state().auto.find("project.thumbnail").is_some()
-            && h.ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(egui::Id::new(("proj-thumb", main.0)))).is_some()
+            && h.ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(egui::Id::unique(("proj-thumb", main.0)))).is_some()
         {
             landed = true;
             break;
diff --git a/crates/ui-egui/tests/ui_layer_panel_zoom.rs b/crates/ui-egui/tests/it/ui_layer_panel_zoom.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_layer_panel_zoom.rs
rename to crates/ui-egui/tests/it/ui_layer_panel_zoom.rs
index 5fa2b1d98..1aabdd2bc 100644
--- a/crates/ui-egui/tests/ui_layer_panel_zoom.rs
+++ b/crates/ui-egui/tests/it/ui_layer_panel_zoom.rs
@@ -111,6 +111,7 @@ fn wheel_zooms_around_the_pointer_and_hand_tool_pans() {
         delta: vec2(0.0, 120.0),
         modifiers: Default::default(),
         phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
     });
     h.run_steps(20);
     let after = rect(&h, "layerPanel.canvas");
diff --git a/crates/ui-egui/tests/it/ui_layer_source_picker.rs b/crates/ui-egui/tests/it/ui_layer_source_picker.rs
new file mode 100644
index 000000000..78a0f8821
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_layer_source_picker.rs
@@ -0,0 +1,215 @@
+//! Picking a layer-valued property with the shared drop-down: the Timeline draws a layer-valued
+//! Light Options property (an Environment light's Source) as a drop-down of the comp's layers,
+//! Effect Controls' layer parameters (a Displacement Map's layer) pick through the same widget,
+//! and both write an undoable `prop.set`.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::keyframe::Value;
+use effectcraft_engine::project::LayerId;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::dock::PanelKind;
+use egui::{Pos2, Rect, pos2, vec2};
+use egui_kittest::Harness;
+use egui_kittest::kittest::NodeT;
+use egui_kittest::kittest::Queryable;
+use serde_json::json;
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, at: Pos2) {
+    h.event(egui::Event::PointerMoved(at));
+    h.step();
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
+    h.step();
+    h.event(egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
+    h.run_steps(3);
+}
+
+fn rect_of(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no automation element {id}")).clone();
+    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
+}
+
+/// Whether `want` is painted inside `row` (the drop-down's current-value text).
+fn painted_in(h: &Harness<'_, EffectcraftApp>, row: Rect, want: &str) -> bool {
+    h.output().shapes.iter().any(|c| match &c.shape {
+        egui::Shape::Text(t) => t.galley.text() == want && row.expand(3.0).contains(t.pos),
+        _ => false,
+    })
+}
+
+/// The current value of a layer-valued property, by uid.
+fn layer_value(h: &Harness<'_, EffectcraftApp>, layer: u64, prop: u64) -> Option<u64> {
+    let comp = h.state().session.active_comp().unwrap();
+    match &comp.layer(LayerId(layer)).unwrap().props.find(prop).unwrap().value {
+        Value::Layer(v) => *v,
+        other => panic!("property {prop} is not layer-valued: {other:?}"),
+    }
+}
+
+/// The "N. name" a drop-down shows for a layer.
+fn entry_for(h: &Harness<'_, EffectcraftApp>, layer: u64) -> String {
+    let comp = h.state().session.active_comp().unwrap();
+    let i = comp.layers.iter().position(|l| l.id.0 == layer).unwrap();
+    format!("{}. {}", i + 1, comp.layers[i].name)
+}
+
+/// Puts the layer-valued `prop` of `layer` back to `value` with a direct `prop.set` (no merge key,
+/// so the pick below records its own step instead of folding into a picker write), picks `none`
+/// from the drop-down at `value_id`, and checks the clear takes one undo step that restores `value`.
+#[track_caller]
+fn none_pick_clears(h: &mut Harness<'_, EffectcraftApp>, value_id: &str, none: &str, layer: u64, prop: u64, value: u64) {
+    h.state_mut().session.execute("prop.set", json!({"layer": layer, "prop": prop, "value": value})).unwrap();
+    h.run_steps(2);
+    assert_eq!(layer_value(h, layer, prop), Some(value));
+    let steps = h.state().session.history.undo.len();
+    let at = rect_of(h, value_id).center();
+    click(h, at);
+    h.get_by_role_and_label(egui::accesskit::Role::Button, none).click();
+    h.run_steps(3);
+    assert_eq!(layer_value(h, layer, prop), None, "selecting None clears the value");
+    assert_eq!(h.state().session.history.undo.len(), steps + 1, "one clear undo step");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    assert_eq!(layer_value(h, layer, prop), Some(value), "undo restores the selected layer");
+}
+
+/// A light's Source (a layer-valued Light Options property) picks a comp layer from the
+/// Timeline and undo restores None.
+#[test]
+fn timeline_source_drop_down_picks_the_layer_and_undo_restores_none() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "frameRate": 30, "duration": 4})).unwrap();
+    s.execute("comp.settings", json!({"renderer": "advanced3D"})).unwrap();
+    let sky = s.execute("layer.newSolid", json!({"name": "Sky HDRI", "color": "#66aaff"})).unwrap()["layer"].as_u64().unwrap();
+    let light = s.execute("layer.newLight", json!({"kind": "Environment", "name": "Env Light"})).unwrap()["layer"].as_u64().unwrap();
+    let (group, source) = {
+        let comp = s.active_comp().unwrap();
+        let opts = comp.layer(LayerId(light)).unwrap().props.sub("lightOptions").unwrap();
+        (opts.uid, opts.get("source").unwrap().uid)
+    };
+    let mut app = EffectcraftApp::new(s);
+    app.ui.timeline.open_layers.insert(light);
+    app.ui.timeline.open_groups.insert(group);
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| app);
+    h.run_steps(4);
+
+    let value_id = format!("timeline.prop.{source}.value");
+    // Unset: the row is a drop-down reading "None" — an element to click, not bare text.
+    assert_eq!(layer_value(&h, light, source), None);
+    assert!(painted_in(&h, rect_of(&h, &value_id), "None"), "the Source row shows a None drop-down");
+
+    // Opening it lists "None" and every layer of the comp, by index and name.
+    let at = rect_of(&h, &value_id).center();
+    click(&mut h, at);
+    let entry = entry_for(&h, sky);
+    assert!(h.query_by_role_and_label(egui::accesskit::Role::Button, "None").is_some(), "the list starts with None");
+    assert!(h.query_by_role_and_label(egui::accesskit::Role::Button, &entry).is_some(), "the comp's layers are listed ({entry})");
+
+    let steps = h.state().session.history.undo.len();
+    h.get_by_role_and_label(egui::accesskit::Role::Button, &entry).click();
+    h.run_steps(3);
+    assert_eq!(layer_value(&h, light, source), Some(sky), "the Source holds the layer id");
+    assert_eq!(h.state().session.history.undo.len(), steps + 1, "one undo step");
+    // The row names the layer (index and name), not its internal id.
+    assert!(painted_in(&h, rect_of(&h, &value_id), &entry), "the Source row shows the layer's name");
+
+    // Dismissing the list without choosing writes nothing; reopening marks the chosen layer as
+    // the current entry (and "None" as not current).
+    click(&mut h, pos2(1500.0, 300.0));
+    h.run_steps(2);
+    assert_eq!(layer_value(&h, light, source), Some(sky), "dismissing the list writes nothing");
+    let reopen = rect_of(&h, &value_id).center();
+    click(&mut h, reopen);
+    assert_eq!(
+        h.get_by_role_and_label(egui::accesskit::Role::Button, &entry).accesskit_node().toggled(),
+        Some(egui::accesskit::Toggled::True),
+        "the current entry is highlighted"
+    );
+    assert_eq!(
+        h.get_by_role_and_label(egui::accesskit::Role::Button, "None").accesskit_node().toggled(),
+        Some(egui::accesskit::Toggled::False),
+        "None is not the current entry"
+    );
+    click(&mut h, pos2(1500.0, 300.0));
+    h.run_steps(2);
+
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    assert_eq!(layer_value(&h, light, source), None, "undo restores None");
+
+    none_pick_clears(&mut h, &value_id, "None", light, source, sky);
+}
+
+/// The shared widget is the one Effect Controls already used: a Displacement Map's layer
+/// parameter still picks from the drop-down and still undoes.
+#[test]
+fn effect_controls_layer_param_picks_through_the_shared_widget() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "frameRate": 30, "duration": 4})).unwrap();
+    let map = s.execute("layer.newSolid", json!({"name": "Disp", "color": "#ff0000"})).unwrap()["layer"].as_u64().unwrap();
+    let base = s.execute("layer.newSolid", json!({"name": "Base", "color": "#20c040"})).unwrap()["layer"].as_u64().unwrap();
+    let fx = s.execute("effect.apply", json!({"layers": [base], "effect": "Displacement Map"})).unwrap()["effects"][0].as_u64().unwrap();
+    let prop = {
+        let comp = s.active_comp().unwrap();
+        comp.layer(LayerId(base)).unwrap().effects().unwrap().find_group(fx).unwrap().get("displacementMapLayer").unwrap().uid
+    };
+    s.state.selected_layers = vec![LayerId(base)];
+    let mut app = EffectcraftApp::new(s);
+    app.show_panel(PanelKind::EffectControls);
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1100.0)).build_eframe(|_| app);
+    h.run_steps(4);
+
+    let value_id = format!("effectControls.prop.{prop}.value");
+    let row = rect_of(&h, &value_id);
+    click(&mut h, row.center());
+    let entry = entry_for(&h, map);
+    assert!(h.query_by_role_and_label(egui::accesskit::Role::Button, &entry).is_some(), "the comp's layers are listed ({entry})");
+    let steps = h.state().session.history.undo.len();
+    h.get_by_role_and_label(egui::accesskit::Role::Button, &entry).click();
+    h.run_steps(3);
+    assert_eq!(layer_value(&h, base, prop), Some(map), "the parameter holds the layer id");
+    assert_eq!(h.state().session.history.undo.len(), steps + 1, "one undo step");
+    // The row names the picked layer, as the Timeline's Source row does.
+    assert!(painted_in(&h, rect_of(&h, &value_id), &entry), "the parameter row shows the layer's name");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    assert_eq!(layer_value(&h, base, prop), None, "undo restores None");
+
+    none_pick_clears(&mut h, &value_id, "None", base, prop, map);
+}
+
+/// The visual record (the `ui_3d` ignored-snapshot convention): the Source drop-down open over
+/// the layer list, and the row after a layer is chosen. Renders with wgpu when `EC_SNAPSHOT_DIR`
+/// is set: `EC_SNAPSHOT_DIR=shots cargo test -p effectcraft-ui-egui --test it ui_layer_source_picker:: -- --ignored`.
+#[test]
+#[ignore = "renders with wgpu; run with --ignored (set EC_SNAPSHOT_DIR to keep PNGs)"]
+fn snapshot_source_dropdown_open_and_chosen() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 1280, "height": 720, "frameRate": 30, "duration": 5})).unwrap();
+    s.execute("comp.settings", json!({"renderer": "advanced3D"})).unwrap();
+    let sky = s.execute("layer.newSolid", json!({"name": "Sky HDRI", "color": "#66aaff"})).unwrap()["layer"].as_u64().unwrap();
+    let light = s.execute("layer.newLight", json!({"kind": "Environment", "name": "Env Light"})).unwrap()["layer"].as_u64().unwrap();
+    let (group, source) = {
+        let comp = s.active_comp().unwrap();
+        let opts = comp.layer(LayerId(light)).unwrap().props.sub("lightOptions").unwrap();
+        (opts.uid, opts.get("source").unwrap().uid)
+    };
+    let mut app = EffectcraftApp::new(s);
+    app.ui.timeline.open_layers.insert(light);
+    app.ui.timeline.open_groups.insert(group);
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).with_pixels_per_point(2.0).wgpu().build_eframe(|_| app);
+    h.run_steps(4);
+    let save = |h: &mut Harness<'_, EffectcraftApp>, name: &str| {
+        if let Ok(dir) = std::env::var("EC_SNAPSHOT_DIR") {
+            h.render().expect("render").save(format!("{dir}/{name}")).expect("save");
+        }
+    };
+    save(&mut h, "source_unset.png");
+    let at = rect_of(&h, &format!("timeline.prop.{source}.value")).center();
+    click(&mut h, at);
+    save(&mut h, "source_dropdown_open.png");
+    let entry = entry_for(&h, sky);
+    h.get_by_role_and_label(egui::accesskit::Role::Button, &entry).click();
+    h.run_steps(3);
+    assert_eq!(layer_value(&h, light, source), Some(sky));
+    save(&mut h, "source_chosen.png");
+}
diff --git a/crates/ui-egui/tests/it/ui_light_settings.rs b/crates/ui-egui/tests/it/ui_light_settings.rs
new file mode 100644
index 000000000..fe1392be1
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_light_settings.rs
@@ -0,0 +1,201 @@
+//! Light Settings dialog (Layer ▸ New ▸ Light, Layer Settings on a light): every light type the
+//! engine has, Environment included, and an existing light's type kept when it's reopened (#1588).
+
+use effectcraft_engine::Session;
+use effectcraft_engine::project::{Layer, LayerId, LayerSource, LightKind};
+use effectcraft_ui_egui::{Dialog, EffectcraftApp};
+use egui_kittest::{Harness, kittest::Queryable as _};
+use serde_json::{Value, json};
+
+fn harness() -> Harness<'static, EffectcraftApp> {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Lights", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.step();
+    h
+}
+
+/// An automation element's rect in the last frame drawn (a dialog settles its place in its
+/// first frames, so the frame before can be stale).
+fn element(h: &Harness<'_, EffectcraftApp>, id: &str) -> Option<effectcraft_ui_egui::automation::Element> {
+    let auto = &h.state().auto;
+    auto.elements.iter().chain(auto.previous.iter()).find(|e| e.id == id).cloned()
+}
+
+fn click_id(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
+    let [x, y, w, hh] = element(h, id).unwrap_or_else(|| panic!("{id} is registered")).rect;
+    let p = egui::pos2(x + w / 2.0, y + hh / 2.0);
+    h.input_mut().events.push(egui::Event::PointerMoved(p));
+    h.step();
+    h.input_mut().events.push(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: egui::Modifiers::NONE });
+    h.step();
+    h.input_mut().events.push(egui::Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: egui::Modifiers::NONE });
+    h.run_steps(3);
+}
+
+fn invoke(h: &mut Harness<'_, EffectcraftApp>, id: &str, params: Value) {
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, id, params).unwrap();
+    h.run_steps(2);
+}
+
+/// Picks the dialog's Light Type `kind` from its menu.
+fn choose(h: &mut Harness<'_, EffectcraftApp>, kind: LightKind) {
+    click_id(h, "dialog.light.type");
+    let i = LightKind::ALL.iter().position(|k| *k == kind).unwrap();
+    click_id(h, &format!("dialog.light.typeItem.{i}"));
+}
+
+fn ok(h: &mut Harness<'_, EffectcraftApp>) {
+    click_id(h, "dialog.light.ok");
+    assert_eq!(h.state().dialog, None);
+}
+
+fn layer(h: &Harness<'_, EffectcraftApp>, id: u64) -> Layer {
+    h.state().session.active_comp().unwrap().layer(LayerId(id)).unwrap().clone()
+}
+
+fn kind(h: &Harness<'_, EffectcraftApp>, id: u64) -> LightKind {
+    match layer(h, id).source {
+        LayerSource::Light { kind } => kind,
+        other => panic!("not a light: {other:?}"),
+    }
+}
+
+fn last_layer(h: &Harness<'_, EffectcraftApp>) -> u64 {
+    h.state().session.active_comp().unwrap().layers.iter().map(|l| l.id.0).max().unwrap()
+}
+
+/// Opens Light Settings for an existing light, as Layer Settings does.
+fn reopen(h: &mut Harness<'_, EffectcraftApp>, id: u64) {
+    invoke(h, "layer.settings", json!({"layer": id}));
+    assert_eq!(h.state().dialog, Some(Dialog::LightSettings));
+}
+
+/// An Environment light lit from a solid, its image turned 30°.
+fn environment_light(h: &mut Harness<'_, EffectcraftApp>) -> (u64, u64) {
+    let s = &mut h.state_mut().session;
+    let sky = s.execute("layer.newSolid", json!({"width": 256, "height": 128, "name": "Sky"})).unwrap()["layer"].as_u64().unwrap();
+    let env = s.execute("layer.newLight", json!({"kind": "Environment", "name": "Env", "intensity": 80})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("prop.set", json!({"layer": env, "path": "lightOptions/source", "value": sky})).unwrap();
+    s.execute("prop.set", json!({"layer": env, "path": "lightOptions/rotation", "value": 30})).unwrap();
+    h.run_steps(2);
+    (env, sky)
+}
+
+#[test]
+fn the_light_type_menu_lists_every_light_type() {
+    let mut h = harness();
+    invoke(&mut h, "layer.newLight", json!({}));
+    click_id(&mut h, "dialog.light.type");
+    for (i, k) in LightKind::ALL.iter().enumerate() {
+        let item = element(&h, &format!("dialog.light.typeItem.{i}")).map(|e| e.label);
+        assert_eq!(item.as_deref(), Some(k.label()));
+    }
+}
+
+#[test]
+fn new_light_creates_an_environment_light() {
+    let mut h = harness();
+    invoke(&mut h, "layer.newLight", json!({}));
+    choose(&mut h, LightKind::Environment);
+    ok(&mut h);
+    let id = last_layer(&h);
+    assert_eq!(kind(&h, id), LightKind::Environment);
+    let l = layer(&h, id);
+    assert!(l.props.prop("lightOptions/source").is_some() && l.props.prop("lightOptions/falloff").is_none());
+    // One undoable step, redone as Environment.
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert!(h.state().session.active_comp().unwrap().layer(LayerId(id)).is_none());
+    h.state_mut().session.execute("edit.redo", json!({})).unwrap();
+    assert_eq!(kind(&h, id), LightKind::Environment);
+}
+
+#[test]
+fn reopening_an_environment_light_and_pressing_ok_keeps_it() {
+    let mut h = harness();
+    let (env, sky) = environment_light(&mut h);
+    let before = layer(&h, env);
+    reopen(&mut h, env);
+    ok(&mut h);
+    let after = layer(&h, env);
+    assert_eq!(kind(&h, env), LightKind::Environment, "not turned into a Spot light");
+    assert_eq!(after.props.prop("lightOptions/source").unwrap().value.as_layer(), Some(sky));
+    for path in ["lightOptions/rotation", "lightOptions/intensity"] {
+        assert_eq!(after.props.prop(path).unwrap().value, before.props.prop(path).unwrap().value, "{path}");
+    }
+}
+
+#[test]
+fn cancelling_light_settings_changes_nothing() {
+    let mut h = harness();
+    let (env, _) = environment_light(&mut h);
+    let before = serde_json::to_value(layer(&h, env)).unwrap();
+    let steps = h.state().session.history.undo.len();
+    reopen(&mut h, env);
+    choose(&mut h, LightKind::Spot);
+    click_id(&mut h, "dialog.light.cancel");
+    assert_eq!(h.state().dialog, None);
+    assert_eq!(serde_json::to_value(layer(&h, env)).unwrap(), before);
+    assert_eq!(h.state().session.history.undo.len(), steps);
+}
+
+#[test]
+fn changing_a_light_to_environment_undoes_and_redoes() {
+    let mut h = harness();
+    let id = h.state_mut().session.execute("layer.newLight", json!({"kind": "Spot", "coneAngle": 45})).unwrap()["layer"].as_u64().unwrap();
+    h.run_steps(2);
+    reopen(&mut h, id);
+    choose(&mut h, LightKind::Environment);
+    ok(&mut h);
+    assert_eq!(kind(&h, id), LightKind::Environment);
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(kind(&h, id), LightKind::Spot);
+    assert_eq!(layer(&h, id).props.prop("lightOptions/coneAngle").unwrap().value.as_f64(), 45.0);
+    h.state_mut().session.execute("edit.redo", json!({})).unwrap();
+    assert_eq!(kind(&h, id), LightKind::Environment);
+}
+
+#[test]
+fn the_other_light_types_are_created_and_kept() {
+    let mut h = harness();
+    for k in [LightKind::Parallel, LightKind::Spot, LightKind::Point, LightKind::Ambient] {
+        invoke(&mut h, "layer.newLight", json!({}));
+        choose(&mut h, k);
+        ok(&mut h);
+        let id = last_layer(&h);
+        assert_eq!(kind(&h, id), k);
+        reopen(&mut h, id);
+        ok(&mut h);
+        assert_eq!(kind(&h, id), k, "{} kept on reopening", k.label());
+    }
+}
+
+#[test]
+fn falloff_and_shadow_options_show_only_for_lights_that_have_them() {
+    let mut h = harness();
+    invoke(&mut h, "layer.newLight", json!({}));
+    for k in LightKind::ALL {
+        choose(&mut h, k);
+        let shown = !matches!(k, LightKind::Ambient | LightKind::Environment);
+        for label in ["Falloff", "Casts Shadows", "Shadow Darkness"] {
+            assert_eq!(h.query_by_label(label).is_some(), shown, "{label} for {}", k.label());
+        }
+    }
+}
+
+#[test]
+fn changing_an_environment_light_to_spot_undoes_to_its_source_and_rotation() {
+    let mut h = harness();
+    let (env, sky) = environment_light(&mut h);
+    reopen(&mut h, env);
+    choose(&mut h, LightKind::Spot);
+    ok(&mut h);
+    assert_eq!(kind(&h, env), LightKind::Spot);
+    assert!(layer(&h, env).props.prop("lightOptions/source").is_none());
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    let l = layer(&h, env);
+    assert_eq!(kind(&h, env), LightKind::Environment);
+    assert_eq!(l.props.prop("lightOptions/source").unwrap().value.as_layer(), Some(sky));
+    assert_eq!(l.props.prop("lightOptions/rotation").unwrap().value.as_f64(), 30.0);
+}
diff --git a/crates/ui-egui/tests/ui_live_preview.rs b/crates/ui-egui/tests/it/ui_live_preview.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_live_preview.rs
rename to crates/ui-egui/tests/it/ui_live_preview.rs
diff --git a/crates/ui-egui/tests/ui_locked_color.rs b/crates/ui-egui/tests/it/ui_locked_color.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_locked_color.rs
rename to crates/ui-egui/tests/it/ui_locked_color.rs
index d942da111..5d7d1edd7 100644
--- a/crates/ui-egui/tests/ui_locked_color.rs
+++ b/crates/ui-egui/tests/it/ui_locked_color.rs
@@ -38,7 +38,7 @@ fn invoke(h: &mut Harness<'_, EffectcraftApp>, command: &str, params: Value) {
 }
 
 fn locked_center(h: &Harness<'_, EffectcraftApp>, images: &Images) -> [u8; 4] {
-    let (_, texture) = h.ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(egui::Id::new("viewer-locked"))).unwrap();
+    let (_, texture) = h.ctx.data(|d| d.get_temp::<(u64, egui::TextureHandle)>(egui::Id::unique("viewer-locked"))).unwrap();
     let images = images.borrow();
     let image = images.get(&texture.id()).unwrap();
     image.pixels[(image.size[1] / 2) * image.size[0] + image.size[0] / 2].to_array()
diff --git a/crates/ui-egui/tests/ui_media_browser_cache.rs b/crates/ui-egui/tests/it/ui_media_browser_cache.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_media_browser_cache.rs
rename to crates/ui-egui/tests/it/ui_media_browser_cache.rs
index feade97bf..ddfc53e22 100644
--- a/crates/ui-egui/tests/ui_media_browser_cache.rs
+++ b/crates/ui-egui/tests/it/ui_media_browser_cache.rs
@@ -42,7 +42,7 @@ type Listing = (f64, Arc<Result<Vec<Entry>, String>>);
 
 fn listing(h: &Harness<'_, EffectcraftApp>, only: bool) -> Listing {
     let dir = h.state().session.state.media_browser.folder.clone().unwrap_or_else(|| "/Shoot".into());
-    h.ctx.data(|d| d.get_temp(egui::Id::new(("mb-list", dir, only)))).unwrap()
+    h.ctx.data(|d| d.get_temp(egui::Id::unique(("mb-list", dir, only)))).unwrap()
 }
 
 fn names(list: &Arc<Result<Vec<Entry>, String>>) -> Vec<&str> {
diff --git a/crates/ui-egui/tests/ui_media_browser_copy_path.rs b/crates/ui-egui/tests/it/ui_media_browser_copy_path.rs
similarity index 96%
rename from crates/ui-egui/tests/ui_media_browser_copy_path.rs
rename to crates/ui-egui/tests/it/ui_media_browser_copy_path.rs
index 8da34c5bd..dff60ddd0 100644
--- a/crates/ui-egui/tests/ui_media_browser_copy_path.rs
+++ b/crates/ui-egui/tests/it/ui_media_browser_copy_path.rs
@@ -52,7 +52,8 @@ fn file_folder_and_virtual_paths_copy_from_the_context_menu_without_document_cha
     let mut session = Session { browser: Some(Arc::new(TestBrowser(tree))), ..Default::default() };
     session.prefs.general.language = "en".into();
     session.execute("comp.new", json!({"width": 64, "height": 36, "duration": 2})).unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| {
+    // The Chinese folder and file names need an installed CJK face.
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).allow_missing_glyphs().build_eframe(|_| {
         let mut app = EffectcraftApp::new(session);
         app.ui.start_screen = false;
         app.show_panel(PanelKind::MediaBrowser);
@@ -96,7 +97,8 @@ fn copy_path_control_command_preserves_the_path_and_rejects_bad_arguments() {
         let mut reply = None;
         let mut out = ctx.run_ui(Default::default(), |ui| {
             let (request, _rx) = ControlRequest::new("ui.menu.invoke", json!({"id": "mediaBrowser.copySourcePath", "params": params}));
-            reply = match control::handle(&mut app, ui.ctx(), &request) {
+            let now = app.now();
+            reply = match control::handle(&mut app, ui.ctx(), &request, now) {
                 control::Outcome::Done(value) => Some(value),
                 _ => panic!("expected immediate reply"),
             };
diff --git a/crates/ui-egui/tests/ui_menus.rs b/crates/ui-egui/tests/it/ui_menus.rs
similarity index 61%
rename from crates/ui-egui/tests/ui_menus.rs
rename to crates/ui-egui/tests/it/ui_menus.rs
index ca4c8cabc..c76f7fafd 100644
--- a/crates/ui-egui/tests/ui_menus.rs
+++ b/crates/ui-egui/tests/it/ui_menus.rs
@@ -16,12 +16,12 @@ fn harness() -> Harness<'static, EffectcraftApp> {
     h
 }
 
-fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+pub(crate) fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
     let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
     Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
 }
 
-fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+pub(crate) fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
     h.input_mut().events.push(Event::PointerMoved(p));
     h.input_mut().events.push(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
     h.step();
@@ -29,6 +29,25 @@ fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
     h.run_steps(2);
 }
 
+/// Press the primary button at `p` and keep it down.
+pub(crate) fn press(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
+    h.run_steps(2);
+}
+
+/// Move the pointer to `p` (press or no press, whichever is held).
+pub(crate) fn move_to(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.run_steps(2);
+}
+
+/// Release the primary button at `p`.
+fn release(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
+    h.run_steps(2);
+}
+
 /// Press and release `key` (one frame each), then let the UI settle.
 fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key) {
     h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
@@ -244,3 +263,113 @@ fn space_previews_after_opening_the_demo_from_home() {
     key(&mut h, Key::Space);
     assert!(h.state().playback.playing, "Space previews the demo (#1059)");
 }
+
+/// The titles open on the press, not the release, so the menus can be browsed with the button
+/// still held down: moving onto an entry and releasing there chooses it (as in After Effects).
+#[test]
+fn a_menu_opens_on_press_and_browsing_releases_choose_an_entry() {
+    let mut h = harness();
+    let edit = rect(&h, "menu.Edit");
+    press(&mut h, edit.center());
+    assert!(shown(&h, "Keyboard Shortcuts"), "the Edit menu opens on the press, before any release");
+    let item = h.query_by_label_contains("Keyboard Shortcuts").expect("the Edit menu is open").rect();
+    move_to(&mut h, item.center());
+    release(&mut h, item.center());
+    assert_eq!(h.state().dialog, Some(effectcraft_ui_egui::Dialog::Shortcuts), "the release over the entry chose it");
+    assert!(!shown(&h, "Quick Apply"), "and closed the menu");
+}
+
+/// While a menu is open, hovering another title switches to that menu (native menu bars).
+#[test]
+fn hovering_another_title_while_a_menu_is_open_switches_to_it() {
+    let mut h = harness();
+    let edit = rect(&h, "menu.Edit");
+    click_at(&mut h, edit.center());
+    assert!(shown(&h, "Keyboard Shortcuts"), "the Edit menu is open");
+    let file = rect(&h, "menu.File");
+    move_to(&mut h, file.center());
+    assert!(shown(&h, "Open Project"), "hovering File opened the File menu");
+    assert!(!shown(&h, "Keyboard Shortcuts"), "and closed Edit");
+}
+
+/// The press on the title of the open menu closes it again, and the click's release — a plain
+/// click on the title — leaves it closed.
+#[test]
+fn pressing_the_open_title_again_closes_its_menu() {
+    let mut h = harness();
+    let file = rect(&h, "menu.File");
+    click_at(&mut h, file.center());
+    assert!(shown(&h, "Open Project"), "the File menu is open");
+    click_at(&mut h, file.center());
+    assert!(!shown(&h, "Open Project"), "the second press closed it");
+}
+
+/// Press-and-hold browse (AE's gesture) reaches into a submenu: while the button is still held,
+/// moving onto the submenu row opens it, and the release inside the submenu picks the entry.
+#[test]
+fn hold_browse_opens_a_submenu_and_the_release_inside_picks_an_entry() {
+    let mut h = harness();
+    // Applying an effect needs a selected layer, as in the app after clicking one in the timeline.
+    let first = {
+        let cid = h.state().session.active_comp_id().expect("the demo opens a comp");
+        let comp = h.state().session.project.comp(cid).expect("the demo comp exists");
+        comp.layers.iter().find(|l| l.effects().is_some()).expect("the demo comp has a layer that takes effects").id
+    };
+    h.state_mut().session.state.selected_layers = vec![first];
+    let effect = rect(&h, "menu.Effect");
+    press(&mut h, effect.center());
+    // (Effect ▸ Remove All: "Effect Controls" also names the panel's tab.)
+    assert!(shown(&h, "Remove All"), "the Effect menu opens on the press");
+    // The categories come from the effect registry; the first alphabetically is "3D Channel".
+    let cat = h.query_by_label_contains("3D Channel").expect("the category row is shown").rect();
+    move_to(&mut h, cat.center());
+    assert!(shown(&h, "Cryptomatte"), "moving onto a category while still holding opened its submenu");
+    let entry = h.query_by_label_contains("Cryptomatte").expect("the submenu is open").rect();
+    move_to(&mut h, entry.center());
+    release(&mut h, entry.center());
+    assert!(!shown(&h, "Remove All"), "the release closed the menus");
+    assert!(h.state().session.state.last_effect.is_some(), "and the release chose the entry: it applied its effect");
+}
+
+/// The open menus close on a press outside them and when the window loses focus. The pointer
+/// leaving the window — onto the OS title bar, whose clicks are never forwarded to egui — closes
+/// nothing, however long it stays away: there is no click to close on, and a graze or a stay
+/// must not drop the menu. The closing press itself is not swallowed: it reaches the widget under
+/// it, as a click does in After Effects.
+#[test]
+fn outside_presses_and_focus_loss_close_the_menus() {
+    let mut h = harness();
+    let file = rect(&h, "menu.File");
+    click_at(&mut h, file.center());
+    assert!(shown(&h, "Open Project"));
+    // A press in the empty part of the bar, outside every title and menu.
+    click_at(&mut h, pos2(1100.0, 12.0));
+    assert!(!shown(&h, "Open Project"), "a press outside the menus closes them");
+    // The press reaches the header's workspace tab behind the open menu: the menu closes and the
+    // tab still acts (the menus don't swallow input).
+    click_at(&mut h, file.center());
+    assert!(shown(&h, "Open Project"));
+    let tab = rect(&h, "header.workspace.Review");
+    click_at(&mut h, tab.center());
+    assert_eq!(h.state().ui.workspace, "Review", "the press reached the tab behind the open menu");
+    assert!(!shown(&h, "Open Project"), "and closed the menu");
+    // Moving onto the OS title bar fires the cursor-left event — its clicks are never forwarded
+    // to egui — which egui reports as `PointerGone`. It must not close the menus, however long
+    // the pointer stays away.
+    click_at(&mut h, file.center());
+    assert!(shown(&h, "Open Project"));
+    h.input_mut().events.push(Event::PointerGone);
+    h.run_steps(1);
+    assert!(shown(&h, "Open Project"), "leaving the window alone doesn't drop the menus at once");
+    let now = h.ctx.input(|i| i.time);
+    h.input_mut().time = Some(now + 60.0);
+    h.run_steps(2);
+    assert!(shown(&h, "Open Project"), "staying away doesn't close them either");
+    h.input_mut().events.push(Event::PointerMoved(file.center()));
+    h.run_steps(2);
+    assert!(shown(&h, "Open Project"), "the pointer coming back keeps them open too");
+    // Losing focus (alt-tabbing away, or clicking another window).
+    h.input_mut().events.push(Event::WindowFocused(false));
+    h.run_steps(2);
+    assert!(!shown(&h, "Open Project"), "losing focus closes the menus");
+}
diff --git a/crates/ui-egui/tests/it/ui_new_primitive.rs b/crates/ui-egui/tests/it/ui_new_primitive.rs
new file mode 100644
index 000000000..fbb3a34e5
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_new_primitive.rs
@@ -0,0 +1,227 @@
+//! Layer ▸ New ▸ 3D Primitive… (#1734): the dialog picks a type, name and dimensions and runs
+//! `layer.newPrimitive`, which switches a Classic 3D comp to Advanced 3D in the same step.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::project::{Layer, LayerSource, PrimitiveKind, Renderer};
+use effectcraft_ui_egui::{Dialog, EffectcraftApp};
+use egui::{Event, Key, Modifiers, PointerButton};
+use egui_kittest::Harness;
+use serde_json::json;
+
+fn harness() -> Harness<'static, EffectcraftApp> {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Scene", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.step();
+    h
+}
+
+/// An automation element's rect in the last frame drawn (a dialog settles its place in its
+/// first frames).
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Option<[f32; 4]> {
+    let auto = &h.state().auto;
+    auto.elements.iter().chain(auto.previous.iter()).find(|e| e.id == id).map(|e| e.rect)
+}
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
+    let [x, y, w, hh] = rect(h, id).unwrap_or_else(|| panic!("{id} is registered"));
+    let p = egui::pos2(x + w / 2.0, y + hh / 2.0);
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key, modifiers: Modifiers) {
+    for pressed in [true, false] {
+        h.input_mut().events.push(Event::Key { key, physical_key: None, pressed, repeat: false, modifiers });
+    }
+    h.run_steps(2);
+}
+
+/// Types `text` over a field's contents and leaves it with Tab.
+fn type_into(h: &mut Harness<'_, EffectcraftApp>, id: &str, text: &str) {
+    click(h, id);
+    assert!(h.ctx.egui_wants_keyboard_input(), "{id} has focus");
+    key(h, Key::A, Modifiers::COMMAND);
+    h.input_mut().events.push(Event::Text(text.into()));
+    h.step();
+    key(h, Key::Tab, Modifiers::NONE);
+}
+
+/// Layer ▸ New ▸ 3D Primitive…, as the menu runs it.
+fn open(h: &mut Harness<'_, EffectcraftApp>) {
+    let (path, entry) =
+        effectcraft_engine::menus::entries().into_iter().find(|(_, e)| e.label == "3D Primitive...").expect("Layer ▸ New lists 3D Primitive...");
+    assert_eq!(path, ["Layer", "New"]);
+    assert_eq!(entry.command, "layer.newPrimitive");
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, &entry.command, entry.params_or_empty()).unwrap();
+    h.run_steps(2);
+    assert_eq!(h.state().dialog, Some(Dialog::NewPrimitive));
+}
+
+fn choose(h: &mut Harness<'_, EffectcraftApp>, kind: PrimitiveKind) {
+    click(h, "dialog.primitive.type");
+    let i = PrimitiveKind::ALL.iter().position(|k| *k == kind).unwrap();
+    click(h, &format!("dialog.primitive.typeItem.{i}"));
+}
+
+fn layers(h: &Harness<'_, EffectcraftApp>) -> Vec<Layer> {
+    h.state().session.active_comp().unwrap().layers.clone()
+}
+
+fn renderer(h: &Harness<'_, EffectcraftApp>) -> Renderer {
+    h.state().session.active_comp().unwrap().renderer
+}
+
+fn geometry(l: &Layer, id: &str) -> f64 {
+    l.props.prop(&format!("geometryOptions/{id}")).unwrap_or_else(|| panic!("{id}")).value.as_f64()
+}
+
+/// A torus named "Ring" with a 250 px radius, the rest left at their defaults.
+fn create_ring(h: &mut Harness<'_, EffectcraftApp>) {
+    open(h);
+    choose(h, PrimitiveKind::Torus);
+    type_into(h, "dialog.primitive.name", "Ring");
+    type_into(h, "dialog.primitive.radius", "250");
+    click(h, "dialog.primitive.ok");
+    assert_eq!(h.state().dialog, None);
+}
+
+fn assert_ring(l: &Layer) {
+    assert_eq!(l.source, LayerSource::Primitive { kind: PrimitiveKind::Torus });
+    assert_eq!(l.name, "Ring");
+    assert_eq!(geometry(l, "radius"), 250.0);
+    assert_eq!(geometry(l, "tubeRadius"), 50.0);
+}
+
+#[test]
+fn creates_a_primitive_in_a_classic_3d_comp_in_one_undoable_step() {
+    let mut h = harness();
+    assert_eq!(renderer(&h), Renderer::Classic3D);
+    let steps = h.state().session.history.undo.len();
+    create_ring(&mut h);
+    let ls = layers(&h);
+    assert_eq!(ls.len(), 1);
+    assert_ring(&ls[0]);
+    assert_eq!(renderer(&h), Renderer::Advanced3D, "the comp switches to Advanced 3D");
+    assert_eq!(h.state().session.history.undo.len(), steps + 1);
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert!(layers(&h).is_empty());
+    assert_eq!(renderer(&h), Renderer::Classic3D, "undo restores the renderer too");
+    h.state_mut().session.execute("edit.redo", json!({})).unwrap();
+    assert_ring(&layers(&h)[0]);
+    assert_eq!(renderer(&h), Renderer::Advanced3D);
+}
+
+#[test]
+fn cancel_creates_nothing() {
+    let mut h = harness();
+    let steps = h.state().session.history.undo.len();
+    open(&mut h);
+    choose(&mut h, PrimitiveKind::Sphere);
+    type_into(&mut h, "dialog.primitive.radius", "80");
+    click(&mut h, "dialog.primitive.cancel");
+    assert_eq!(h.state().dialog, None);
+    assert!(layers(&h).is_empty());
+    assert_eq!(renderer(&h), Renderer::Classic3D);
+    assert_eq!(h.state().session.history.undo.len(), steps);
+}
+
+#[test]
+fn each_type_offers_the_dimensions_its_layer_has() {
+    let mut h = harness();
+    for kind in PrimitiveKind::ALL {
+        open(&mut h);
+        choose(&mut h, kind);
+        click(&mut h, "dialog.primitive.ok");
+        let l = layers(&h).into_iter().find(|l| l.source == LayerSource::Primitive { kind }).unwrap();
+        assert_eq!(l.name, kind.label(), "the name follows the type until typed");
+        let group = l.props.group("geometryOptions").unwrap();
+        let ids: Vec<&str> = group.props().map(|p| p.match_id.as_str()).collect();
+        open(&mut h);
+        choose(&mut h, kind);
+        let controls = ["type", "name", "ok", "cancel"];
+        let shown: Vec<&str> = (h.state().auto.elements.iter())
+            .filter_map(|e| e.id.strip_prefix("dialog.primitive."))
+            .filter(|id| !controls.contains(id) && !id.starts_with("typeItem."))
+            .collect();
+        assert_eq!(shown, ids, "{} dimensions", kind.label());
+        click(&mut h, "dialog.primitive.cancel");
+    }
+}
+
+#[test]
+fn a_created_primitive_survives_save_and_reopen() {
+    let mut h = harness();
+    create_ring(&mut h);
+    let path = std::env::temp_dir().join(format!("ec-ui-new-primitive-{}.ecproj", std::process::id()));
+    h.state_mut().session.execute("file.saveAs", json!({"path": path.to_string_lossy()})).unwrap();
+    let mut o = Session::default();
+    o.execute("file.open", json!({"path": path.to_string_lossy()})).unwrap();
+    let _ = std::fs::remove_file(&path);
+    let (_, comp) = o.project.comps().next().unwrap();
+    assert_eq!(comp.renderer, Renderer::Advanced3D);
+    assert_ring(&comp.layers[0]);
+}
+
+#[test]
+fn untouched_dimensions_take_each_types_defaults_and_typed_ones_carry_over() {
+    let mut h = harness();
+    open(&mut h);
+    choose(&mut h, PrimitiveKind::Plane);
+    click(&mut h, "dialog.primitive.ok");
+    let plane = layers(&h).remove(0);
+    assert_eq!(geometry(&plane, "width"), 400.0, "a plane's default, not the cube's 300");
+    open(&mut h);
+    type_into(&mut h, "dialog.primitive.width", "120");
+    choose(&mut h, PrimitiveKind::Plane);
+    click(&mut h, "dialog.primitive.ok");
+    let plane = layers(&h).into_iter().find(|l| l.id != plane.id).unwrap();
+    assert_eq!(geometry(&plane, "width"), 120.0, "the typed width carries over");
+    assert_eq!(geometry(&plane, "height"), 400.0);
+}
+
+/// A dialog left open while something else changes the editing context closes without creating
+/// anything rather than adding the primitive where it was not opened.
+fn closes_when(change: impl FnOnce(&mut Session)) {
+    let mut h = harness();
+    let a = h.state().session.active_comp_id().unwrap();
+    open(&mut h);
+    choose(&mut h, PrimitiveKind::Torus);
+    change(&mut h.state_mut().session);
+    let b = h.state().session.active_comp_id().unwrap();
+    let steps = h.state().session.history.undo.len();
+    h.run_steps(2);
+    assert_eq!(h.state().dialog, None, "the dialog closes");
+    assert!(rect(&h, "dialog.primitive.ok").is_none());
+    let s = &h.state().session;
+    for c in [a, b] {
+        if let Some(c) = s.project.comp(c) {
+            assert!(c.layers.is_empty(), "nothing is created");
+            assert_eq!(c.renderer, Renderer::Classic3D);
+        }
+    }
+    assert_eq!(s.history.undo.len(), steps);
+    assert!(h.state().ui.status.contains("changed"), "{}", h.state().ui.status);
+}
+
+#[test]
+fn another_comp_made_active_closes_the_dialog() {
+    closes_when(|s| {
+        s.execute("comp.new", json!({"name": "Other", "width": 640, "height": 360, "duration": 2})).unwrap();
+    });
+}
+
+#[test]
+fn a_replaced_project_closes_the_dialog_even_when_the_comp_id_is_reused() {
+    closes_when(|s| {
+        let before = s.active_comp_id().unwrap();
+        s.execute("file.newProject", json!({})).unwrap();
+        s.execute("comp.new", json!({"name": "Scene", "width": 640, "height": 360, "duration": 2})).unwrap();
+        assert_eq!(s.active_comp_id(), Some(before), "the new project reuses the comp's id");
+    });
+}
diff --git a/crates/ui-egui/tests/ui_object_matte.rs b/crates/ui-egui/tests/it/ui_object_matte.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_object_matte.rs
rename to crates/ui-egui/tests/it/ui_object_matte.rs
diff --git a/crates/ui-egui/tests/ui_panel_focus.rs b/crates/ui-egui/tests/it/ui_panel_focus.rs
similarity index 72%
rename from crates/ui-egui/tests/ui_panel_focus.rs
rename to crates/ui-egui/tests/it/ui_panel_focus.rs
index 5d3302b10..0d436f702 100644
--- a/crates/ui-egui/tests/ui_panel_focus.rs
+++ b/crates/ui-egui/tests/it/ui_panel_focus.rs
@@ -5,7 +5,8 @@
 use effectcraft_engine::Session;
 use effectcraft_engine::project::ItemId;
 use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{DockNode, PanelKind};
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
+use effectcraft_ui_egui::dock::{Node, PanelKind, Workspace};
 use egui::{Event, Pos2, pos2};
 use egui_kittest::Harness;
 use serde_json::json;
@@ -42,15 +43,6 @@ fn click_n(h: &mut Harness<'_, EffectcraftApp>, p: Pos2, n: u32) {
     h.run_steps(2);
 }
 
-/// The tabs of the docked group holding `p`, in order.
-fn group_of(n: &DockNode, p: PanelKind) -> Option<Vec<PanelKind>> {
-    match n {
-        DockNode::Split { a, b, .. } => group_of(a, p).or_else(|| group_of(b, p)),
-        DockNode::Tabs { panels, .. } => panels.contains(&p).then(|| panels.clone()),
-        DockNode::Stack { entries } => entries.iter().find(|e| e.contains(p)).map(|e| e.panels.clone()),
-    }
-}
-
 fn invoke(h: &mut Harness<'_, EffectcraftApp>, id: &str, params: serde_json::Value) {
     let ctx = h.ctx.clone();
     effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, id, params).unwrap();
@@ -66,7 +58,7 @@ fn opening_a_comp_brings_up_a_closed_composition_panel() {
     let (mut h, other, main) = harness();
     assert_eq!(group_of(&h.state().ui.dock, PanelKind::Composition), Some(vec![PanelKind::Composition, PanelKind::Layer]));
     invoke(&mut h, "window.closePanel", json!({"panel": "Composition"}));
-    assert!(!h.state().ui.dock.contains(PanelKind::Composition));
+    assert!(!h.state().ui.dock.is_docked(PanelKind::Composition));
     assert!(h.state().ui.dock.is_visible(PanelKind::Layer), "the centre shows the Layer panel");
 
     // Double-click "Other" in the Project panel.
@@ -75,7 +67,7 @@ fn opening_a_comp_brings_up_a_closed_composition_panel() {
     assert_eq!(h.state().session.active_comp_id(), Some(ItemId(other)));
     let dock = &h.state().ui.dock;
     assert!(dock.is_visible(PanelKind::Composition), "the Composition panel is back and in front");
-    assert_eq!(group_of(dock, PanelKind::Composition), Some(vec![PanelKind::Layer, PanelKind::Composition]), "back in the centre");
+    assert_eq!(group_of(dock, PanelKind::Composition), Some(vec![PanelKind::Composition, PanelKind::Layer]), "back in the centre");
     assert!(h.state().auto.elements.iter().any(|e| e.id == "panel.Composition"), "the Composition panel is drawn");
 
     // Open Composition (the Project panel's context menu) with the panel closed again.
@@ -83,12 +75,12 @@ fn opening_a_comp_brings_up_a_closed_composition_panel() {
     invoke(&mut h, "comp.open", json!({"comp": main}));
     assert_eq!(h.state().session.active_comp_id(), Some(ItemId(main)));
     assert!(h.state().ui.dock.is_visible(PanelKind::Composition));
-    assert_eq!(group_of(&h.state().ui.dock, PanelKind::Composition), Some(vec![PanelKind::Layer, PanelKind::Composition]));
+    assert_eq!(group_of(&h.state().ui.dock, PanelKind::Composition), Some(vec![PanelKind::Composition, PanelKind::Layer]));
 
     // Window ▸ Composition reopens it in the centre too (not beside Effects & Presets).
     invoke(&mut h, "window.closePanel", json!({"panel": "Composition"}));
     invoke(&mut h, "window.panel", json!({"panel": "Composition"}));
-    assert_eq!(group_of(&h.state().ui.dock, PanelKind::Composition), Some(vec![PanelKind::Layer, PanelKind::Composition]));
+    assert_eq!(group_of(&h.state().ui.dock, PanelKind::Composition), Some(vec![PanelKind::Composition, PanelKind::Layer]));
     assert!(h.state().ui.dock.is_visible(PanelKind::Composition));
 }
 
@@ -99,12 +91,12 @@ fn opening_a_comp_in_the_minimal_workspace_docks_the_viewer_above_the_timeline()
     let (mut h, other, _) = harness();
     invoke(&mut h, "window.workspace", json!({"name": "Minimal"}));
     invoke(&mut h, "window.closePanel", json!({"panel": "Composition"}));
-    assert!(!h.state().ui.dock.contains(PanelKind::Composition));
+    assert!(!h.state().ui.dock.is_docked(PanelKind::Composition));
     invoke(&mut h, "comp.open", json!({"comp": other}));
-    match &h.state().ui.dock {
-        DockNode::Split { vertical: true, a, b, .. } => {
-            assert_eq!(group_of(a, PanelKind::Composition), Some(vec![PanelKind::Composition]), "the viewer is on top");
-            assert!(b.contains(PanelKind::Timeline));
+    match &h.state().ui.dock.layout.root {
+        Some(Node::Split { axis: effectcraft_ui_egui::dock::SplitAxis::Vertical, first, second, .. }) => {
+            assert_eq!(**first, Node::Tabs { panels: vec![PanelKind::Composition], active: 0 }, "the viewer is on top");
+            assert!(matches!(&**second, Node::Tabs { panels, .. } if panels.contains(&PanelKind::Timeline)));
         }
         other => panic!("expected the viewer above the Timeline, got {other:?}"),
     }
@@ -147,7 +139,7 @@ fn applying_an_effect_brings_up_effect_controls_on_that_layer() {
 
     // Closed: Effect ▸ Last Effect reopens it.
     invoke(&mut h, "window.closePanel", json!({"panel": "EffectControls"}));
-    assert!(!h.state().ui.dock.contains(PanelKind::EffectControls));
+    assert!(!h.state().ui.dock.is_docked(PanelKind::EffectControls));
     try_invoke(&mut h, "effect.applyLast", json!({}));
     assert!(ec_up(&h), "Effect Controls reopened");
 
@@ -177,7 +169,7 @@ fn double_clicking_an_effect_in_the_timeline_opens_effect_controls() {
     invoke(&mut h, "window.closePanel", json!({"panel": "EffectControls"}));
     let blue = layer_id(&h, "Blue");
     invoke(&mut h, "layer.select", json!({"layers": [blue]}));
-    assert!(!h.state().ui.dock.contains(PanelKind::EffectControls));
+    assert!(!h.state().ui.dock.is_docked(PanelKind::EffectControls));
 
     let name = rect(&h, &format!("timeline.group.{uid}.name"));
     click_n(&mut h, name.center(), 2);
@@ -187,3 +179,52 @@ fn double_clicking_an_effect_in_the_timeline_opens_effect_controls() {
     assert_eq!(st.selected_props.iter().map(|(l, u)| (l.0, *u)).collect::<Vec<_>>(), vec![(red, uid)], "with the effect selected");
     assert!(!h.state().ui.timeline.open_groups.contains(&uid), "the effect did not twirl open");
 }
+
+// Regression test for #354: the focused panel's blue outline was painted before the panel body,
+// so the body's background and widgets painted over it. It must be drawn after every panel body.
+#[test]
+fn focused_panel_outline_is_painted_over_the_panel_bodies() {
+    fn flatten<'a>(shape: &'a egui::Shape, clip: egui::Rect, out: &mut Vec<(egui::Rect, &'a egui::epaint::RectShape)>) {
+        match shape {
+            egui::Shape::Rect(r) => out.push((clip, r)),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| flatten(s, clip, out)),
+            _ => {}
+        }
+    }
+    let (mut h, _, _) = harness();
+    for panel in [PanelKind::Timeline, PanelKind::Project] {
+        h.state_mut().ui.focused = panel;
+        h.run_steps(3);
+        let focus = h.state().tokens.focus;
+        let mut rects = vec![];
+        h.output().shapes.iter().for_each(|c| flatten(&c.shape, c.clip_rect, &mut rects));
+        // The one-pixel, unfilled outline round the focused panel's frame.
+        let body = rect(&h, &format!("panel.{}", panel.id()));
+        let outlines: Vec<usize> = rects
+            .iter()
+            .enumerate()
+            .filter(|(_, (_, r))| r.fill.a() == 0 && r.stroke.color == focus && r.stroke.width == 1.0 && r.rect.contains_rect(body))
+            .map(|(i, _)| i)
+            .collect();
+        let Some(&at) = outlines.last() else { panic!("{panel:?}: no focus outline painted") };
+        let outline = rects[at].1.rect;
+        // Nothing painted after it reaches the one-pixel ring it draws, where a panel's
+        // background or rows would hide it.
+        let ring = [
+            egui::Rect::from_min_max(outline.min, egui::pos2(outline.right(), outline.top() + 1.0)),
+            egui::Rect::from_min_max(egui::pos2(outline.left(), outline.bottom() - 1.0), outline.max),
+            egui::Rect::from_min_max(outline.min, egui::pos2(outline.left() + 1.0, outline.bottom())),
+            egui::Rect::from_min_max(egui::pos2(outline.right() - 1.0, outline.top()), outline.max),
+        ];
+        for (clip, r) in &rects[at + 1..] {
+            let painted = r.rect.intersect(*clip);
+            let over = ring.iter().any(|edge| edge.intersect(painted).area() > 0.0);
+            assert!(r.fill.a() == 0 || !over, "{panel:?}: a filled rect {:?} (fill {:?}) is painted over the focus outline {outline:?}", r.rect, r.fill);
+        }
+    }
+}
+
+/// The tabs of the group holding `p`, in order.
+fn group_of(w: &Workspace, p: PanelKind) -> Option<Vec<PanelKind>> {
+    Some(w.group_of(p)).filter(|g| !g.is_empty())
+}
diff --git a/crates/ui-egui/tests/it/ui_panel_windows.rs b/crates/ui-egui/tests/it/ui_panel_windows.rs
new file mode 100644
index 000000000..d2750bb05
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_panel_windows.rs
@@ -0,0 +1,106 @@
+//! Multiple monitors (#486): Move Panel to New Window puts a panel in a floating window of its
+//! own, which on desktop is an OS window that can go on another screen, and Move Panel to Main
+//! Window docks it again. The test harness embeds viewports, so these windows draw in the main
+//! window here, as on the web.
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::dock::{PanelKind, WorkspaceExt as _};
+use effectcraft_ui_egui::dock_ui::sanitized_window_rect;
+use serde_json::json;
+
+fn invoke(app: &mut EffectcraftApp, ctx: &egui::Context, params: serde_json::Value) -> Result<serde_json::Value, String> {
+    effectcraft_ui_egui::menus::invoke(app, ctx, "window.panelWindow", params)
+}
+
+fn native(app: &EffectcraftApp, panel: PanelKind) -> Option<[f32; 4]> {
+    app.ui.dock.layout.floating.iter().find(|w| w.contains(&panel)).and_then(|w| w.native)
+}
+
+#[test]
+fn panel_window_command_moves_a_docked_panel_into_its_own_window_and_back() {
+    let mut app = EffectcraftApp::new(Session::default());
+    let ctx = egui::Context::default();
+    assert!(app.ui.dock.is_docked(PanelKind::Project));
+    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap(), json!({"window": true}));
+    // Undocked first, then given a window of its own.
+    assert!(!app.ui.dock.is_docked(PanelKind::Project));
+    assert!(app.ui.dock.layout.floating.iter().any(|w| w.panels().copied().collect::<Vec<_>>() == [PanelKind::Project]));
+    assert!(app.in_panel_window(PanelKind::Project));
+    let rect = native(&app, PanelKind::Project).unwrap();
+    assert_eq!(rect, sanitized_window_rect(rect));
+    // Asking again changes nothing; no `window` toggles.
+    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap(), json!({"window": true}));
+    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project"})).unwrap(), json!({"window": false}));
+    // Back in the main window: docked in the first docked group.
+    assert!(!app.in_panel_window(PanelKind::Project));
+    assert!(!app.ui.dock.is_floating(PanelKind::Project));
+    assert!(app.ui.dock.is_docked(PanelKind::Project));
+    // The serialized panel form works too.
+    assert_eq!(invoke(&mut app, &ctx, json!({"panel": PanelKind::Project})).unwrap(), json!({"window": true}));
+    // Bad requests are errors and change nothing.
+    let before = app.ui.dock.clone();
+    for params in [json!({}), json!({"panel": "Nope"}), json!({"panel": 7}), json!({"panel": "Project", "window": "yes"}), json!({"panel": {"Viewer": 9}})] {
+        assert!(invoke(&mut app, &ctx, params.clone()).is_err(), "{params} must be rejected");
+    }
+    assert_eq!(app.ui.dock, before);
+    // Docking it back into the main window ends its window.
+    effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.dockPanel", json!({"panel": "Project", "anchor": "Timeline"})).unwrap();
+    assert!(!app.in_panel_window(PanelKind::Project));
+    assert!(app.ui.dock.is_docked(PanelKind::Project));
+}
+
+#[test]
+fn panel_windows_survive_restart_with_hostile_places_made_safe() {
+    use effectcraft_engine::config::MemoryConfig;
+    use std::sync::Arc;
+    let store = Arc::new(MemoryConfig::default());
+    let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
+    let ctx = egui::Context::default();
+    invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap();
+    let hostile = [90_000.0, -99_000.0, 99_000.0, 0.5];
+    app.apply_dock(craft_ui::docking::Action::SetNative { panel: PanelKind::Project, rect: Some(hostile) }).unwrap();
+    eframe::App::on_exit(&mut app);
+    let restarted = EffectcraftApp::new(Session { config: Some(store), ..Default::default() });
+    assert_eq!(native(&restarted, PanelKind::Project), Some(sanitized_window_rect(hostile)));
+    let [x, y, w, h] = sanitized_window_rect(hostile);
+    assert!(x <= 100_000.0 && y >= -100_000.0 && (160.0..=16_384.0).contains(&w) && (100.0..=16_384.0).contains(&h));
+    assert!(sanitized_window_rect([f32::NAN, f32::INFINITY, f32::NAN, f32::NEG_INFINITY]).iter().all(|v| v.is_finite()));
+}
+
+#[test]
+fn a_click_on_a_floating_panel_does_nothing_while_a_dialog_is_open() {
+    use egui::{Event, Modifiers, PointerButton, pos2, vec2};
+    use egui_kittest::Harness;
+    let mut app = EffectcraftApp::new(Session::default());
+    app.ui.start_screen = false;
+    app.apply_dock(craft_ui::docking::Action::Float { panel: PanelKind::Project, rect: [80.0, 120.0, 320.0, 240.0] }).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).build_eframe(move |_| app);
+    h.run_steps(3);
+    let close = |h: &Harness<'_, EffectcraftApp>| {
+        let e = h.state().auto.elements.iter().find(|e| e.id.starts_with("panel.float.") && e.id.ends_with(".close")).expect("the floating window's ×");
+        pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0)
+    };
+    let click = |h: &mut Harness<'_, EffectcraftApp>, pos| {
+        h.event(Event::PointerMoved(pos));
+        h.step();
+        for pressed in [true, false] {
+            h.event(Event::PointerButton { pos, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
+            h.step();
+        }
+        h.run_steps(2);
+    };
+    let at = close(&h);
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "app.settings", json!({"page": "general"})).unwrap();
+    h.run_steps(3);
+    let before = h.state().ui.dock.clone();
+    click(&mut h, at);
+    assert_eq!(h.state().ui.dock, before, "the floating panel takes no click while Settings is open");
+    assert!(h.state().ui.dock.is_floating(PanelKind::Project));
+    // The same click closes the window once the dialog is gone.
+    h.state_mut().dialog = None;
+    h.run_steps(3);
+    let at = close(&h);
+    click(&mut h, at);
+    assert!(!h.state().ui.dock.is_open(PanelKind::Project));
+}
diff --git a/crates/ui-egui/tests/ui_panels.rs b/crates/ui-egui/tests/it/ui_panels.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_panels.rs
rename to crates/ui-egui/tests/it/ui_panels.rs
index 240f2de8f..db9ef7373 100644
--- a/crates/ui-egui/tests/ui_panels.rs
+++ b/crates/ui-egui/tests/it/ui_panels.rs
@@ -2,6 +2,7 @@
 //! registers its automation ids; the Footage panel's buttons edit into the comp; the Progress
 //! panel lists and cancels a job; Lumetri Scopes switch scope through their dropdown.
 
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
 use std::sync::Arc;
 
 use effectcraft_engine::{Session, config::MemoryConfig};
@@ -60,7 +61,7 @@ fn window_menu_opens_the_new_panels() {
         ("contentAwareFill", PanelKind::ContentAwareFill, "contentFill.method"),
     ] {
         open(&mut h, name);
-        assert!(h.state().ui.dock.contains(kind) || h.state().ui.floating.iter().any(|f| f.panels.contains(&kind)), "{name} shown");
+        assert!(h.state().ui.dock.is_open(kind), "{name} shown");
         if !auto.is_empty() {
             assert!(h.state().auto.find(auto).is_some(), "{name}: {auto}");
         }
@@ -72,9 +73,7 @@ fn window_menu_opens_the_new_panels() {
 #[test]
 fn window_menu_closes_a_checked_panel() {
     let mut h = harness();
-    let shown = |h: &Harness<'_, EffectcraftApp>| {
-        h.state().ui.dock.contains(PanelKind::Align) || h.state().ui.floating.iter().any(|f| f.panels.contains(&PanelKind::Align))
-    };
+    let shown = |h: &Harness<'_, EffectcraftApp>| h.state().ui.dock.is_open(PanelKind::Align);
     open(&mut h, "align");
     assert!(shown(&h));
     click(&mut h, "menu.Window");
@@ -106,7 +105,7 @@ fn footage_panel_buttons_edit_into_the_comp() {
     let item = h.state().session.project.items.values().find(|i| matches!(i.kind, effectcraft_engine::project::ItemKind::Solid(_))).unwrap().id.0;
     h.state_mut().session.execute("footage.open", json!({"item": item})).unwrap();
     h.run_steps(4);
-    assert!(h.state().ui.dock.contains(PanelKind::Footage) || h.state().ui.floating.iter().any(|f| f.panels.contains(&PanelKind::Footage)));
+    assert!(h.state().ui.dock.is_open(PanelKind::Footage));
     assert!(h.state().auto.find("footage.overlayEdit").is_some());
     let before = h.state().session.active_comp().unwrap().layers.len();
     click(&mut h, "footage.overlayEdit");
@@ -218,7 +217,7 @@ fn saved_workspace_is_listed_in_the_workspace_menu() {
     h.run_steps(3);
     assert_ne!(h.state().ui.dock, saved);
     click(&mut h, "menu.Window");
-    let ws = h.query_by_label(" Workspace ⏵").expect("Window ▸ Workspace").rect();
+    let ws = h.query_by_label(" Workspace").expect("Window ▸ Workspace").rect();
     hover(&mut h, ws.center());
     let entry = h.state().auto.find("menu.savedWorkspaces.0").expect("the saved workspace is listed").clone();
     assert_eq!(entry.label, "My Layout");
@@ -239,7 +238,7 @@ fn saved_workspace_is_listed_in_the_workspace_menu() {
 fn edit_label_menu_shows_the_label_colours() {
     let mut h = harness();
     click(&mut h, "menu.Edit");
-    let label = h.query_by_label(" Label ⏵").expect("Edit ▸ Label").rect();
+    let label = h.query_by_label(" Label").expect("Edit ▸ Label").rect();
     hover(&mut h, label.center());
     // (Not Dark Green; the entry's label starts with its check-mark column.)
     let green = h.query_by_label(" Green").expect("the Label submenu is open").rect();
@@ -388,6 +387,7 @@ fn settings_buttons_stay_in_view_at_200_percent() {
             delta: egui::vec2(0.0, -1000.0),
             modifiers: Default::default(),
             phase: egui::TouchPhase::Move,
+            source: egui::MouseWheelSource::Wheel,
         });
         h.run_steps(5);
     };
@@ -414,7 +414,7 @@ fn settings_buttons_stay_in_view_at_200_percent() {
 }
 
 /// Headless look at the panels (wgpu offscreen; needs a GPU adapter). Run with
-/// `PANELS_SNAPSHOT=/abs/dir cargo test -p effectcraft-ui-egui --test ui_panels -- --ignored`.
+/// `PANELS_SNAPSHOT=/abs/dir cargo test -p effectcraft-ui-egui --test it ui_panels:: -- --ignored`.
 #[test]
 #[ignore]
 fn panels_snapshot() {
diff --git a/crates/ui-egui/tests/ui_parameter_spacing.rs b/crates/ui-egui/tests/it/ui_parameter_spacing.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_parameter_spacing.rs
rename to crates/ui-egui/tests/it/ui_parameter_spacing.rs
diff --git a/crates/ui-egui/tests/ui_presets_folder.rs b/crates/ui-egui/tests/it/ui_presets_folder.rs
similarity index 95%
rename from crates/ui-egui/tests/ui_presets_folder.rs
rename to crates/ui-egui/tests/it/ui_presets_folder.rs
index 93f34dd73..e11efe944 100644
--- a/crates/ui-egui/tests/ui_presets_folder.rs
+++ b/crates/ui-egui/tests/it/ui_presets_folder.rs
@@ -37,7 +37,8 @@ fn click(h: &mut Harness<'_, EffectcraftApp>, id: &str) -> Vec<String> {
 fn presets_menu_copies_the_configured_folder_without_editing_the_project() {
     let expected = expected_folder();
     for language in ["en", "ja"] {
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| {
+        // The `ja` run draws Japanese menu text, which needs an installed CJK face.
+        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).allow_missing_glyphs().build_eframe(|_| {
             let mut app = EffectcraftApp::new(Session::default());
             app.session.prefs.general.language = language.into();
             app.ui.start_screen = false;
@@ -69,7 +70,8 @@ fn presets_folder_control_command_returns_the_path_or_a_configuration_error() {
     let mut reply = None;
     let mut output = ctx.run_ui(Default::default(), |ui| {
         let (request, _rx) = ControlRequest::new("ui.menu.invoke", json!({"id": "effects.copyPresetsFolderPath"}));
-        reply = match control::handle(&mut app, ui.ctx(), &request) {
+        let now = app.now();
+        reply = match control::handle(&mut app, ui.ctx(), &request, now) {
             control::Outcome::Done(value) => Some(value),
             _ => panic!("expected an immediate reply"),
         };
@@ -128,7 +130,7 @@ fn shared_preset_rows_search_apply_and_undo_the_selected_definition() {
     h.run_steps(3);
     let shared = std::sync::Arc::new(entries);
     let now = h.ctx.input(|i| i.time);
-    h.ctx.data_mut(|d| d.insert_temp(egui::Id::new("fx-user-presets"), (now, shared.clone())));
+    h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique("fx-user-presets"), (now, shared.clone())));
     let search = |h: &mut Harness<'_, EffectcraftApp>, text: &str| {
         click(h, "effects.search");
         h.input_mut().events.push(Event::Key { key: egui::Key::A, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::COMMAND });
@@ -160,7 +162,7 @@ fn shared_preset_rows_search_apply_and_undo_the_selected_definition() {
         h.run_steps(2);
         assert_eq!(h.state().session.active_comp().unwrap().layers[0].props.prop("transform/opacity").unwrap().value.as_f64(), 100.0);
     }
-    let (_, cached) = h.ctx.data(|d| d.get_temp::<(f64, std::sync::Arc<Vec<PresetFile>>)>(egui::Id::new("fx-user-presets"))).unwrap();
+    let (_, cached) = h.ctx.data(|d| d.get_temp::<(f64, std::sync::Arc<Vec<PresetFile>>)>(egui::Id::unique("fx-user-presets"))).unwrap();
     assert!(std::sync::Arc::ptr_eq(&shared, &cached));
     assert_eq!(shared.iter().map(|p| p.name.as_str()).collect::<Vec<_>>(), ["Custom Cache A", "Custom Cache B"]);
 }
diff --git a/crates/ui-egui/tests/ui_preview_align.rs b/crates/ui-egui/tests/it/ui_preview_align.rs
similarity index 84%
rename from crates/ui-egui/tests/ui_preview_align.rs
rename to crates/ui-egui/tests/it/ui_preview_align.rs
index e9b8d6c44..1469a5e9e 100644
--- a/crates/ui-egui/tests/ui_preview_align.rs
+++ b/crates/ui-egui/tests/it/ui_preview_align.rs
@@ -259,6 +259,49 @@ fn cache_frames_when_idle_fills_the_work_area() {
     assert_eq!(n, 240, "the work area is cached while idle");
 }
 
+/// A preview that plays into frames it already cached (after a loop) keeps rendering the next
+/// uncached ones: the prefetch window used to end within the cached run, and the workers stood
+/// idle until the playhead came near its end.
+#[test]
+fn playback_prefetches_past_the_cached_frames_ahead() {
+    let mut h = harness();
+    let cid = h.state().session.active_comp_id().unwrap();
+    let series = h.state().shown_series(cid);
+    let scale = series.scale as f64 / 1000.0;
+    // The first 120 frames (5 s) are cached: more than the widest old window (16 workers × 6).
+    for f in 0..120 {
+        h.state().request_frame(cid, f, scale);
+    }
+    for _ in 0..4000 {
+        if h.state().frames.cached_frames(&series).len() >= 120 && h.state().frames.inflight() == 0 {
+            break;
+        }
+        std::thread::sleep(std::time::Duration::from_millis(2));
+    }
+    assert_eq!(h.state().frames.cached_frames(&series), (0..120).collect::<Vec<_>>());
+    // Rendering/instrumentation time must not move the playhead near the end of the
+    // cached run. Exercise real prefetch workers while holding playback in its first second.
+    h.state_mut().use_manual_clock();
+    h.state_mut().session.set_time(Tick::ZERO);
+    invoke(&mut h, "playback.toggle", json!({}));
+    h.state_mut().clock_mut().advance(0.25);
+    h.run_steps(2);
+    assert!(h.state().playback.playing);
+    let cur = h.state().session.time();
+    assert!(cur > Tick::ZERO, "playback advances with the manual clock");
+    assert!(cur < Tick::from_seconds_f64(1.0), "{cur:?}");
+    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(60);
+    while std::time::Instant::now() < deadline {
+        if h.state().frames.cached_frames(&series).iter().any(|&f| f >= 120) {
+            break;
+        }
+        h.step();
+        std::thread::sleep(std::time::Duration::from_millis(1));
+        assert_eq!(h.state().session.time(), cur, "worker waits do not advance playback");
+    }
+    assert!(h.state().frames.cached_frames(&series).iter().any(|&f| f >= 120), "frames past the cached run render while it plays the first second");
+}
+
 #[test]
 fn cache_frames_when_idle_survives_an_inverted_work_area() {
     let mut h = harness();
diff --git a/crates/ui-egui/tests/ui_project_delete.rs b/crates/ui-egui/tests/it/ui_project_delete.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_project_delete.rs
rename to crates/ui-egui/tests/it/ui_project_delete.rs
diff --git a/crates/ui-egui/tests/it/ui_project_duplicate.rs b/crates/ui-egui/tests/it/ui_project_duplicate.rs
new file mode 100644
index 000000000..2037c278b
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_project_duplicate.rs
@@ -0,0 +1,172 @@
+//! #2207: Duplicate is reachable from a Project row's context menu, with the same targets,
+//! naming, undo and shortcut preset as Edit > Duplicate.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::project::ItemId;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::dock::PanelKind;
+use effectcraft_ui_egui::menus::{parse_shortcut, shortcut_text};
+use egui::{Event, Key, Modifiers, PointerButton, Rect, Shape, pos2};
+use egui_kittest::Harness;
+use serde_json::json;
+
+const DUPLICATE: &str = "project.context.duplicate";
+
+fn harness() -> (Harness<'static, EffectcraftApp>, ItemId, ItemId, ItemId) {
+    let mut s = Session::default();
+    let mut comp =
+        |name: &str| ItemId(s.execute("comp.new", json!({"name": name, "width": 64, "height": 64, "duration": 1})).unwrap()["comp"].as_u64().unwrap());
+    let main = comp("Main");
+    let other = comp("Other");
+    let folder = ItemId(s.execute("project.newFolder", json!({"name": "Bin"})).unwrap()["item"].as_u64().unwrap());
+    s.execute("project.select", json!({"items": []})).unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    (h, main, other, folder)
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
+    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), egui::vec2(e.rect[2], e.rect[3]))
+}
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, id: &str, button: PointerButton, modifiers: Modifiers) {
+    let p = rect(h, id).center();
+    h.input_mut().events.push(Event::ModifiersChanged(modifiers));
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button, pressed: true, modifiers });
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button, pressed: false, modifiers });
+    h.run_steps(3);
+    h.input_mut().events.push(Event::ModifiersChanged(Modifiers::NONE));
+    h.step();
+}
+
+fn row(h: &mut Harness<'_, EffectcraftApp>, item: ItemId, button: PointerButton, modifiers: Modifiers) {
+    click(h, &format!("project.item.{}.name", item.0), button, modifiers);
+}
+
+fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key, modifiers: Modifiers) {
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers });
+    h.step();
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers });
+    h.run_steps(2);
+}
+
+fn copy_name(h: &Harness<'_, EffectcraftApp>, id: ItemId) -> String {
+    h.state().session.project.item(id).unwrap().name.clone()
+}
+
+fn menu_text(h: &Harness<'_, EffectcraftApp>, text: &str) -> bool {
+    fn contains(shape: &Shape, bounds: Rect, text: &str) -> bool {
+        match shape {
+            Shape::Text(t) => bounds.contains(t.pos) && t.galley.text() == text,
+            Shape::Vec(shapes) => shapes.iter().any(|s| contains(s, bounds, text)),
+            _ => false,
+        }
+    }
+    let bounds = rect(h, DUPLICATE);
+    h.output().shapes.iter().any(|s| contains(&s.shape, bounds, text))
+}
+
+#[test]
+fn unselected_row_duplicates_only_itself_and_undo_restores_the_project() {
+    let (mut h, main, other, _) = harness();
+    row(&mut h, other, PointerButton::Primary, Modifiers::NONE);
+    let before = h.state().session.project.clone();
+    let undo = h.state().session.history.undo.len();
+    row(&mut h, main, PointerButton::Secondary, Modifiers::NONE);
+    assert_eq!(h.state().session.state.project_selection, [main]);
+    assert!(menu_text(&h, &shortcut_text("Cmd+D")), "the default platform shortcut is shown");
+    click(&mut h, DUPLICATE, PointerButton::Primary, Modifiers::NONE);
+    let selected = h.state().session.state.project_selection.clone();
+    let [copy] = selected.as_slice() else { panic!("one selected copy") };
+    assert!(!before.items.contains_key(copy), "the copy has a fresh ID");
+    assert_eq!(copy_name(&h, *copy), "Main 2");
+    assert_eq!(copy_name(&h, other), "Other");
+    assert_eq!(h.state().session.project.items.len(), before.items.len() + 1);
+    assert_eq!(h.state().session.history.undo.len(), undo + 1);
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(h.state().session.project, before);
+}
+
+#[test]
+fn selected_rows_duplicate_together_in_selection_order_with_numbered_names() {
+    let (mut h, main, other, _) = harness();
+    // Deliberately reverse alphabetical row order: command targets retain selection order.
+    row(&mut h, other, PointerButton::Primary, Modifiers::NONE);
+    row(&mut h, main, PointerButton::Primary, Modifiers::COMMAND);
+    assert_eq!(h.state().session.state.project_selection, [other, main]);
+    let before = h.state().session.project.clone();
+    let undo = h.state().session.history.undo.len();
+    row(&mut h, main, PointerButton::Secondary, Modifiers::NONE);
+    click(&mut h, DUPLICATE, PointerButton::Primary, Modifiers::NONE);
+    let selected = h.state().session.state.project_selection.clone();
+    let [a, b] = selected.as_slice() else { panic!("two selected copies") };
+    assert_ne!(a, b);
+    assert!(selected.iter().all(|id| !before.items.contains_key(id)));
+    assert_eq!((copy_name(&h, *a), copy_name(&h, *b)), ("Other 2".to_string(), "Main 2".to_string()));
+    assert_eq!(h.state().session.project.items.len(), before.items.len() + 2);
+    assert_eq!(h.state().session.history.undo.len(), undo + 1);
+    // Duplicate the selected copies again: the existing engine numbering continues.
+    row(&mut h, *b, PointerButton::Secondary, Modifiers::NONE);
+    click(&mut h, DUPLICATE, PointerButton::Primary, Modifiers::NONE);
+    let names: Vec<_> = h.state().session.state.project_selection.iter().map(|id| copy_name(&h, *id)).collect();
+    assert_eq!(names, ["Other 3", "Main 3"]);
+}
+
+#[test]
+fn folders_and_mixed_selections_disable_duplicate_without_partial_changes() {
+    for mixed in [false, true] {
+        let (mut h, main, _, folder) = harness();
+        row(&mut h, main, PointerButton::Primary, Modifiers::NONE);
+        if mixed {
+            row(&mut h, folder, PointerButton::Primary, Modifiers::COMMAND);
+        }
+        // An unselected folder replaces the selection; a selected non-folder keeps the mixed set.
+        row(&mut h, if mixed { main } else { folder }, PointerButton::Secondary, Modifiers::NONE);
+        let before = h.state().session.project.clone();
+        let selected = h.state().session.state.project_selection.clone();
+        assert!(selected.contains(&folder));
+        let undo = h.state().session.history.undo.len();
+        let status = h.state().ui.status.clone();
+        click(&mut h, DUPLICATE, PointerButton::Primary, Modifiers::NONE);
+        assert_eq!(h.state().session.project, before, "mixed={mixed}: no partial copy");
+        assert_eq!(h.state().session.state.project_selection, selected);
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        assert_eq!(h.state().ui.status, status, "no failing engine command was dispatched");
+    }
+}
+
+#[test]
+fn duplicate_shortcut_still_dispatches_and_the_menu_tracks_rebinding_and_unbinding() {
+    let (mut h, main, _, _) = harness();
+    row(&mut h, main, PointerButton::Primary, Modifiers::NONE);
+    assert_eq!(h.state().ui.focused, PanelKind::Project);
+    let (d, command) = parse_shortcut("Cmd+D").unwrap();
+    key(&mut h, command, d);
+    let selected = h.state().session.state.project_selection.clone();
+    let [copy] = selected.as_slice() else { panic!("one shortcut copy") };
+    assert_ne!(*copy, main);
+    assert_eq!(copy_name(&h, *copy), "Main 2");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.run_steps(2);
+    h.state_mut().session.execute("shortcuts.set", json!({"command": "edit.duplicate", "keys": "F6"})).unwrap();
+    row(&mut h, main, PointerButton::Secondary, Modifiers::NONE);
+    assert!(menu_text(&h, "F6"));
+    assert!(!menu_text(&h, &shortcut_text("Cmd+D")));
+    key(&mut h, Key::Escape, Modifiers::NONE);
+    row(&mut h, main, PointerButton::Primary, Modifiers::NONE);
+    let before = h.state().session.project.clone();
+    key(&mut h, command, d);
+    assert_eq!(h.state().session.project, before, "the former shortcut stays unbound");
+    key(&mut h, Key::F6, Modifiers::NONE);
+    assert_eq!(h.state().session.project.items.len(), before.items.len() + 1);
+    h.state_mut().session.execute("shortcuts.set", json!({"command": "edit.duplicate", "keys": null})).unwrap();
+    row(&mut h, main, PointerButton::Secondary, Modifiers::NONE);
+    assert!(!menu_text(&h, "F6"));
+    assert!(!menu_text(&h, &shortcut_text("Cmd+D")));
+    click(&mut h, DUPLICATE, PointerButton::Primary, Modifiers::NONE);
+    assert_eq!(h.state().session.project.items.len(), before.items.len() + 2, "unbinding keeps the menu action usable");
+}
diff --git a/crates/ui-egui/tests/ui_project_keyboard.rs b/crates/ui-egui/tests/it/ui_project_keyboard.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_project_keyboard.rs
rename to crates/ui-egui/tests/it/ui_project_keyboard.rs
diff --git a/crates/ui-egui/tests/it/ui_project_new_folder.rs b/crates/ui-egui/tests/it/ui_project_new_folder.rs
new file mode 100644
index 000000000..63a1c6ae3
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_project_new_folder.rs
@@ -0,0 +1,159 @@
+//! #1658: a folder made from the interface (the Project panel's New Folder button and context
+//! menu, File ▸ New ▸ New Folder and its shortcut) opens with its name ready to type, as in After
+//! Effects: Enter keeps the typed name, Escape the default one. `engine.execute` (agents, MCP,
+//! scripts) keeps the headless default and only creates the folder.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::project::ItemId;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::control::{self, ControlRequest};
+use egui::{Event, Key, Modifiers, PointerButton, Pos2, Rect, pos2};
+use egui_kittest::Harness;
+use serde_json::json;
+
+/// A comp and an open folder holding a solid, nothing selected.
+fn harness(comps: usize) -> (Harness<'static, EffectcraftApp>, ItemId) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 320, "height": 180, "duration": 4})).unwrap();
+    for i in 0..comps {
+        s.execute("comp.new", json!({"name": format!("Comp {i:03}"), "width": 64, "height": 64, "duration": 1})).unwrap();
+    }
+    let folder = ItemId(s.execute("project.newFolder", json!({"name": "Bin"})).unwrap()["item"].as_u64().unwrap());
+    s.execute("project.select", json!({"items": []})).unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.state_mut().ui.project_open_folders.insert(folder.0);
+    h.run_steps(3);
+    (h, folder)
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
+    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), egui::vec2(e.rect[2], e.rect[3]))
+}
+
+fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2, button: PointerButton) {
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    h.input_mut().events.push(Event::PointerButton { pos: p, button, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key) {
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+}
+
+fn type_text(h: &mut Harness<'_, EffectcraftApp>, text: &str) {
+    assert!(h.ctx.egui_wants_keyboard_input(), "the name field has the keyboard");
+    h.input_mut().events.push(Event::Text(text.into()));
+    h.step();
+}
+
+/// The folders not in `before`.
+fn new_folders(h: &Harness<'_, EffectcraftApp>, before: &[ItemId]) -> Vec<ItemId> {
+    h.state().session.project.items.values().filter(|i| i.is_folder() && !before.contains(&i.id)).map(|i| i.id).collect()
+}
+
+fn folders(h: &Harness<'_, EffectcraftApp>) -> Vec<ItemId> {
+    new_folders(h, &[])
+}
+
+fn name(h: &Harness<'_, EffectcraftApp>, id: ItemId) -> Option<String> {
+    h.state().session.project.item(id).map(|i| i.name.clone())
+}
+
+fn renaming(h: &Harness<'_, EffectcraftApp>, id: ItemId) -> bool {
+    let edit = format!("project.item.{}.nameEdit", id.0);
+    h.state().auto.elements.iter().any(|e| e.id == edit)
+}
+
+/// The panel's button, with a folder selected: the new folder opens its name, Enter keeps the
+/// typed one, and undo takes back the rename, then the folder (two steps, like any rename).
+#[test]
+fn the_new_folder_button_opens_the_name_and_enter_keeps_it() {
+    let (mut h, bin) = harness(0);
+    let p = rect(&h, &format!("project.item.{}.name", bin.0)).center();
+    click_at(&mut h, p, PointerButton::Primary);
+    assert_eq!(h.state().session.state.project_selection, [bin]);
+    let before = folders(&h);
+    let p = rect(&h, "project.newFolder").center();
+    click_at(&mut h, p, PointerButton::Primary);
+    let [folder] = new_folders(&h, &before)[..] else { panic!("one new folder") };
+    assert_eq!(h.state().session.state.project_selection, [folder], "the new folder is selected");
+    assert!(renaming(&h, folder), "its name is open for editing");
+    type_text(&mut h, "Shots");
+    key(&mut h, Key::Enter);
+    assert_eq!(name(&h, folder).as_deref(), Some("Shots"), "Enter keeps the typed name");
+    assert!(!renaming(&h, folder), "Enter closes the field");
+    assert!(!h.ctx.egui_wants_keyboard_input(), "and gives the keyboard back");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(name(&h, folder).as_deref(), Some("Untitled Folder"), "the first undo takes back the rename");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(name(&h, folder), None, "the second, the folder");
+}
+
+/// Escape keeps the default name: the folder stays, with one undo step.
+#[test]
+fn escape_keeps_the_default_name() {
+    let (mut h, _) = harness(0);
+    let before = folders(&h);
+    let p = rect(&h, "project.newFolder").center();
+    click_at(&mut h, p, PointerButton::Primary);
+    let [folder] = new_folders(&h, &before)[..] else { panic!("one new folder") };
+    type_text(&mut h, "Never mind");
+    key(&mut h, Key::Escape);
+    assert_eq!(name(&h, folder).as_deref(), Some("Untitled Folder"));
+    assert!(!renaming(&h, folder));
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(name(&h, folder), None, "one undo removes the folder");
+}
+
+/// The context menu of the list's empty area.
+#[test]
+fn the_context_menu_opens_the_name() {
+    let (mut h, _) = harness(0);
+    let list = rect(&h, "project.empty");
+    let before = folders(&h);
+    click_at(&mut h, pos2(list.center().x, list.max.y - 4.0), PointerButton::Secondary);
+    let p = rect(&h, "project.context.newFolder").center();
+    click_at(&mut h, p, PointerButton::Primary);
+    let [folder] = new_folders(&h, &before)[..] else { panic!("one new folder") };
+    assert!(renaming(&h, folder), "the context menu's New Folder opens the name");
+}
+
+/// File ▸ New ▸ New Folder (the menu dispatcher, which its shortcut goes through too): a folder
+/// sorted below the visible rows scrolls into view with its name open.
+#[test]
+fn the_file_menu_opens_the_name_in_view() {
+    let (mut h, _) = harness(80);
+    let list = rect(&h, "project.empty");
+    let before = folders(&h);
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "project.newFolder", json!({})).unwrap();
+    h.run_steps(3);
+    let [folder] = new_folders(&h, &before)[..] else { panic!("one new folder") };
+    assert!(renaming(&h, folder), "File ▸ New ▸ New Folder opens the name");
+    let field = rect(&h, &format!("project.item.{}.nameEdit", folder.0));
+    assert!(list.contains_rect(field), "the field is in view: {field:?} in {list:?}");
+    type_text(&mut h, "Renders");
+    key(&mut h, Key::Enter);
+    assert_eq!(name(&h, folder).as_deref(), Some("Renders"));
+}
+
+/// Agents and scripts: `engine.execute` only creates the folder.
+#[test]
+fn engine_execute_only_creates_the_folder() {
+    let (mut h, _) = harness(0);
+    let before = folders(&h);
+    let ctx = h.ctx.clone();
+    let (req, _rx) = ControlRequest::new("engine.execute", json!({"command": "project.newFolder"}));
+    let now = h.state().now();
+    let _ = control::handle(h.state_mut(), &ctx, &req, now);
+    h.run_steps(3);
+    let [folder] = new_folders(&h, &before)[..] else { panic!("one new folder") };
+    assert!(!renaming(&h, folder), "no name field for an agent's folder");
+    assert!(!h.ctx.egui_wants_keyboard_input());
+}
diff --git a/crates/ui-egui/tests/ui_project_rows.rs b/crates/ui-egui/tests/it/ui_project_rows.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_project_rows.rs
rename to crates/ui-egui/tests/it/ui_project_rows.rs
diff --git a/crates/ui-egui/tests/ui_quick_offset.rs b/crates/ui-egui/tests/it/ui_quick_offset.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_quick_offset.rs
rename to crates/ui-egui/tests/it/ui_quick_offset.rs
diff --git a/crates/ui-egui/tests/ui_ram_preview.rs b/crates/ui-egui/tests/it/ui_ram_preview.rs
similarity index 95%
rename from crates/ui-egui/tests/ui_ram_preview.rs
rename to crates/ui-egui/tests/it/ui_ram_preview.rs
index 930c43eb7..8b3748a3f 100644
--- a/crates/ui-egui/tests/ui_ram_preview.rs
+++ b/crates/ui-egui/tests/it/ui_ram_preview.rs
@@ -90,8 +90,11 @@ fn prefetch_waits_while_edits_keep_coming() {
     let mut s = Session::default();
     let c = s.execute("comp.new", json!({"name": "Drag", "width": 64, "height": 36, "duration": 2})).unwrap()["comp"].as_u64().unwrap();
     let solid = s.execute("layer.newSolid", json!({"color": "#3080ff", "width": 16, "height": 16})).unwrap()["layer"].as_u64().unwrap();
-    // Short steps: input time advances 50 ms per frame.
+    // Short steps between edits; the app clock below is advanced explicitly.
     let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).with_step_dt(0.05).build_eframe(|_| EffectcraftApp::new(s));
+    // Prefetch waits for EDIT_QUIET on the app clock; a manual clock makes the pause
+    // deterministic instead of depending on how long the test host took to run the steps.
+    h.state_mut().use_manual_clock();
     settle(&mut h);
     let frame = |h: &Harness<'_, EffectcraftApp>| {
         let app = h.state();
@@ -116,6 +119,8 @@ fn prefetch_waits_while_edits_keep_coming() {
         assert_eq!(h.state().frames.inflight(), 0, "edit {i}");
     }
     // The edits pause: the frames around the current one fill in.
+    h.state_mut().clock_mut().advance(1.0);
+    h.run_steps(1);
     settle(&mut h);
     for _ in 0..20 {
         h.step();
diff --git a/crates/ui-egui/tests/ui_render_queue.rs b/crates/ui-egui/tests/it/ui_render_queue.rs
similarity index 95%
rename from crates/ui-egui/tests/ui_render_queue.rs
rename to crates/ui-egui/tests/it/ui_render_queue.rs
index 72e585eb1..562b7a1c4 100644
--- a/crates/ui-egui/tests/ui_render_queue.rs
+++ b/crates/ui-egui/tests/it/ui_render_queue.rs
@@ -31,7 +31,7 @@ fn render_settings_template_applies_from_a_menu_moved_to_fit_the_window() {
     let mut app = Some(EffectcraftApp::new(s));
     let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app.take().expect("app"));
     // Twirl the item open, as clicking its twirl does.
-    h.ctx.data_mut(|d| d.insert_temp(egui::Id::new("rq-ui"), (vec![id], None::<u64>)));
+    h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique("rq-ui"), (vec![id], None::<u64>)));
     h.state_mut().show_panel(PanelKind::RenderQueue);
     h.run_steps(4);
     let dd = h.state().auto.find(&format!("renderQueue.item.{id}.renderSettings")).expect("Render Settings menu").clone();
@@ -80,7 +80,7 @@ fn clicking_the_output_file_name_opens_the_save_dialog() {
     }));
     let mut app = Some(app);
     let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app.take().expect("app"));
-    h.ctx.data_mut(|d| d.insert_temp(egui::Id::new("rq-ui"), (vec![id], None::<u64>)));
+    h.ctx.data_mut(|d| d.insert_temp(egui::Id::unique("rq-ui"), (vec![id], None::<u64>)));
     h.state_mut().show_panel(PanelKind::RenderQueue);
     h.run_steps(4);
     let path = h.state().auto.find(&format!("renderQueue.item.{id}.outputPath")).expect("the output file name").clone();
@@ -88,7 +88,7 @@ fn clicking_the_output_file_name_opens_the_save_dialog() {
     click_with(&mut h, at, Modifiers::NONE);
     assert_eq!(*asked.borrow(), [(expected_default, ext.to_string())], "the dialog opened at the current output");
     assert_eq!(h.state().session.project.render_queue[0].output.output, chosen);
-    let editing = |h: &Harness<'_, EffectcraftApp>| h.ctx.data(|d| d.get_temp::<(u64, String)>(egui::Id::new("rq-edit-output")));
+    let editing = |h: &Harness<'_, EffectcraftApp>| h.ctx.data(|d| d.get_temp::<(u64, String)>(egui::Id::unique("rq-edit-output")));
     assert_eq!(editing(&h), None, "no inline editor");
     // Alt-click edits the template text instead.
     click_with(&mut h, at, Modifiers::ALT);
diff --git a/crates/ui-egui/tests/ui_script_console.rs b/crates/ui-egui/tests/it/ui_script_console.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_script_console.rs
rename to crates/ui-egui/tests/it/ui_script_console.rs
index 526a52938..e705a20b7 100644
--- a/crates/ui-egui/tests/ui_script_console.rs
+++ b/crates/ui-egui/tests/it/ui_script_console.rs
@@ -44,7 +44,7 @@ fn script_console_runs_scripts() {
 }
 
 /// Headless look at the panel (wgpu offscreen); run with
-/// `SC_SNAPSHOT=/abs/out.png cargo test -p effectcraft-ui-egui --test ui_script_console -- --ignored`.
+/// `SC_SNAPSHOT=/abs/out.png cargo test -p effectcraft-ui-egui --test it ui_script_console:: -- --ignored`.
 #[test]
 #[ignore]
 fn script_console_snapshot() {
diff --git a/crates/ui-egui/tests/ui_scriptui.rs b/crates/ui-egui/tests/it/ui_scriptui.rs
similarity index 90%
rename from crates/ui-egui/tests/ui_scriptui.rs
rename to crates/ui-egui/tests/it/ui_scriptui.rs
index 6cfc2db71..aa439737b 100644
--- a/crates/ui-egui/tests/ui_scriptui.rs
+++ b/crates/ui-egui/tests/it/ui_scriptui.rs
@@ -4,6 +4,7 @@
 
 use effectcraft_ui_egui::EffectcraftApp;
 use effectcraft_ui_egui::dock::PanelKind;
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
 use egui::{Event, Rect, pos2, vec2};
 use egui_kittest::Harness;
 use serde_json::json;
@@ -75,7 +76,7 @@ fn script_windows_are_drawn_and_clickable() {
     h.state_mut().session.execute("window.scriptPanel", json!({"name": "Layer Tools.jsx"})).unwrap();
     h.run_steps(3);
     let panel = h.state().session.script_ui.windows.iter().find(|w| w.script == "Layer Tools.jsx").unwrap().id;
-    assert!(h.state().ui.dock.contains(PanelKind::ScriptPanel(panel)), "the panel docks");
+    assert!(h.state().ui.dock.is_docked(PanelKind::ScriptPanel(panel)), "the panel docks");
     assert!(h.state().auto.find(&format!("scriptui.{panel}")).is_some());
     // The menus list scripts and panels.
     let cx = effectcraft_engine::menus::DynCtx::default();
@@ -104,7 +105,7 @@ fn panels_open_at_quit_dock_again_at_launch() {
     let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(|_| EffectcraftApp::new(s));
     h.run_steps(3);
     let panel = h.state().session.script_ui.windows.iter().find(|w| w.script == "Hello Panel.jsx").expect("the panel's window").id;
-    assert!(h.state().ui.dock.contains(PanelKind::ScriptPanel(panel)), "the panel docks");
+    assert!(h.state().ui.dock.is_docked(PanelKind::ScriptPanel(panel)), "the panel docks");
     assert!(h.state().auto.find(&format!("scriptui.{panel}.hi")).is_some(), "its controls are drawn");
     // Closing its tab forgets it for the next launch.
     h.state_mut().close_panel(PanelKind::ScriptPanel(panel));
@@ -131,7 +132,7 @@ fn ease_presets_panel_eases_the_selected_keys_from_its_list() {
     s.execute("window.scriptPanel", json!({"name": "Ease Presets.jsx"})).unwrap();
     h.run_steps(3);
     let panel = h.state().session.script_ui.windows.iter().find(|w| w.script == "Ease Presets.jsx").unwrap().id;
-    assert!(h.state().ui.dock.contains(PanelKind::ScriptPanel(panel)), "the panel docks");
+    assert!(h.state().ui.dock.is_docked(PanelKind::ScriptPanel(panel)), "the panel docks");
     h.state_mut().ui.maximized = Some(PanelKind::ScriptPanel(panel));
     h.run_steps(3);
     let steps = h.state().session.history.undo.len();
@@ -271,3 +272,18 @@ fn click_at(h: &mut Harness<'_, EffectcraftApp>, c: egui::Pos2) {
     }
     h.run_steps(3);
 }
+#[test]
+fn scheduled_import_reveals_its_composition_without_manual_clicks() {
+    let mut s = effectcraft_host::session();
+    let result = s.execute("script.run", json!({"code": "var w=new Window('palette','Automatic import');var b=w.add('button',undefined,'Open');b.onClick=function(){app.scheduleTask(\"var c=app.project.items.addComp('Imported',64,64,1,1,25);c.openInViewer();\",0,false);};w.show();"})).unwrap();
+    assert_eq!(result["ok"], true, "{result}");
+    let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.state_mut().ui.start_screen = true;
+    h.run_steps(2);
+    h.state_mut().session.execute("scriptui.click", json!({"window":"Automatic import","widget":"Open"})).unwrap();
+    h.run_steps(4);
+    let active = h.state().session.active_comp_id().unwrap();
+    assert_eq!(h.state().session.project.items.get(&active).unwrap().name, "Imported");
+    assert!(!h.state().ui.start_screen, "Home must not hide a composition opened by the scheduled import");
+    h.state_mut().session.execute("scriptui.close", json!({"window":"Automatic import"})).unwrap();
+}
diff --git a/crates/ui-egui/tests/it/ui_scrolling.rs b/crates/ui-egui/tests/it/ui_scrolling.rs
new file mode 100644
index 000000000..2e0f32ac8
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_scrolling.rs
@@ -0,0 +1,444 @@
+//! Long menus and lists scroll instead of running off the window, with a scroll bar to drag
+//! (egui_kittest, UI logic only).
+
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::EffectcraftApp;
+use egui::{Event, Pos2, Rect, pos2, vec2};
+use egui_kittest::Harness;
+use egui_kittest::kittest::Queryable;
+use serde_json::json;
+
+// The pointer/geometry helpers are shared with the sibling menu and long-tail test modules:
+// `rect`, `click_at`, `move_to` and press-and-hold (`hold`) live in ui_menus, `drag` in ui_tail.
+use super::ui_menus::{click_at, move_to, press as hold, rect};
+use super::ui_tail::drag;
+
+/// Open the demo project in a UI test harness with the requested window size.
+fn harness(w: f32, h: f32) -> Harness<'static, EffectcraftApp> {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(w, h)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    h
+}
+
+fn wheel(h: &mut Harness<'_, EffectcraftApp>, at: Pos2, dy: f32) {
+    h.input_mut().events.push(Event::PointerMoved(at));
+    h.input_mut().events.push(Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: vec2(0.0, dy),
+        modifiers: Default::default(),
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
+    h.run_steps(20);
+}
+
+/// The open menu popup's rect (frame included), from egui's area memory: the only tall area up.
+fn open_popup(h: &Harness<'_, EffectcraftApp>) -> Rect {
+    h.ctx
+        .memory(|m| {
+            m.areas()
+                .visible_layer_ids()
+                .into_iter()
+                .filter(|l| l.order != egui::Order::Background)
+                .filter_map(|l| m.area_rect(l.id))
+                .find(|r| r.height() > 100.0)
+        })
+        .unwrap_or_else(|| panic!("no menu popup is open"))
+}
+
+/// Edit is taller than a short window: it scrolls (with the wheel, and a scroll bar that always
+/// shows) so its last entries can be reached and clicked, instead of running off the bottom of
+/// the window (#269).
+#[test]
+fn a_menu_taller_than_the_window_scrolls() {
+    let mut h = harness(1200.0, 520.0);
+    assert!(!h.ctx.global_style().spacing.scroll.floating, "scroll bars show without hovering the list");
+    let edit = rect(&h, "menu.Edit");
+    click_at(&mut h, edit.center());
+    let last = h.query_by_label_contains("Keyboard Shortcuts").expect("the Edit menu is open").rect();
+    assert!(last.max.y > 520.0, "Edit is taller than the window ({last:?})");
+    let first = h.query_by_label_contains("Quick Apply").expect("Quick Apply").rect();
+    wheel(&mut h, first.center(), -2000.0);
+    let last = h.query_by_label_contains("Keyboard Shortcuts").expect("still open").rect();
+    assert!(last.min.y >= 0.0 && last.max.y <= 520.0, "scrolled into the window ({last:?})");
+    click_at(&mut h, last.center());
+    assert_eq!(h.state().dialog, Some(effectcraft_ui_egui::Dialog::Shortcuts), "the entry takes the click");
+}
+
+/// Open Edit in a window shorter than the menu (holding or clicking its title) and return the
+/// last entry's rect before any scroll, plus the open popup's rect. `opened` is the failure
+/// message when the menu did not open.
+fn open_tall_edit(h: &mut Harness<'_, EffectcraftApp>, held: bool, opened: &str) -> (Rect, Rect) {
+    let edit = rect(h, "menu.Edit");
+    if held {
+        hold(h, edit.center());
+    } else {
+        click_at(h, edit.center());
+    }
+    let before = h.query_by_label_contains("Keyboard Shortcuts").expect(opened).rect();
+    assert!(before.max.y > 520.0, "Edit is taller than the window ({before:?})");
+    let menu = open_popup(h);
+    (before, menu)
+}
+
+/// With the title still held down (press-and-browse), resting the pointer against the bottom
+/// edge of a menu too tall for the window scrolls it from there — a crawl, then a run, as native
+/// menus do — so the long list can be walked with no wheel.
+#[test]
+fn holding_the_title_scrolls_the_menu_from_its_bottom_edge() {
+    let mut h = harness(1200.0, 520.0);
+    let (before, menu) = open_tall_edit(&mut h, true, "the Edit menu opens on the press");
+    // Creeping down the edge: the 18 pt band above the menu's inner bottom lies at one of these
+    // positions, whatever the frame's margin (they are 6 pt apart).
+    let mut walked = false;
+    for step in 0..5 {
+        move_to(&mut h, pos2(menu.center().x, menu.max.y - 6.0 - 6.0 * step as f32));
+        h.run_steps(8);
+        let now = h.query_by_label_contains("Keyboard Shortcuts").expect("still open").rect();
+        if now.min.y < before.min.y {
+            walked = true;
+            break;
+        }
+    }
+    assert!(walked, "resting on the bottom edge of the held-down menu scrolled its entries up");
+}
+
+/// Without the title held down — the menu opened by a plain click — the same edge rest scrolls
+/// nothing: the wheel (above) is how a click-opened menu scrolls, the pointer alone must not
+/// move it (a hover may align the row under it by a few points; a crawl there would be a bug).
+#[test]
+fn without_the_hold_the_edge_does_not_scroll_the_menu() {
+    let mut h = harness(1200.0, 520.0);
+    let (before, menu) = open_tall_edit(&mut h, false, "the Edit menu is open");
+    for step in 0..5 {
+        move_to(&mut h, pos2(menu.center().x, menu.max.y - 6.0 - 6.0 * step as f32));
+        h.run_steps(8);
+        let now = h.query_by_label_contains("Keyboard Shortcuts").expect("still open").rect();
+        let crawled = before.min.y - now.min.y;
+        assert!(crawled < 60.0, "step {step}: the edge scrolled the menu with no title held down ({before:?} -> {now:?})");
+    }
+}
+
+/// Find the actual Edit popup's bottom crawl band while keeping the title press held.
+fn held_edit_crawl(h: &mut Harness<'_, EffectcraftApp>) -> Pos2 {
+    let edit = rect(h, "menu.Edit");
+    hold(h, edit.center());
+    let before = h.query_by_label_contains("Keyboard Shortcuts").expect("Edit opens on press").rect();
+    let menu = open_popup(h);
+    for step in 0..5 {
+        let p = pos2(menu.center().x, menu.max.y - 6.0 - 6.0 * step as f32);
+        move_to(h, p);
+        h.run_steps(8);
+        let after = h.query_by_label_contains("Keyboard Shortcuts").expect("Edit stays open").rect();
+        if after.min.y < before.min.y - 0.1 {
+            return p;
+        }
+    }
+    panic!("the held Edit menu never crawled from its bottom edge");
+}
+
+fn menu_at(h: &mut Harness<'_, EffectcraftApp>, time: f64) {
+    h.input_mut().time = Some(time);
+    h.step();
+}
+
+/// A discarded layout pass may consume the queued offset once, but must not crawl again for
+/// the same RawInput time. A subsequent real iteration must still queue and consume its step.
+#[test]
+fn menu_edge_crawl_advances_once_on_replay_then_continues_at_a_later_time() {
+    use std::sync::{
+        Arc,
+        atomic::{AtomicBool, Ordering},
+    };
+
+    let mut h = harness(1200.0, 520.0);
+    held_edit_crawl(&mut h);
+    let discard = Arc::new(AtomicBool::new(true));
+    h.ctx.on_end_pass(
+        "menu crawl replay regression",
+        Arc::new(move |ui| {
+            if discard.swap(false, Ordering::SeqCst) {
+                ui.ctx().request_discard("replay an actual held menu");
+            }
+        }),
+    );
+    let time = h.ctx.input(|i| i.time) + 1.0 / 60.0;
+    menu_at(&mut h, time);
+    assert_eq!(h.output().platform_output.num_completed_passes, 2, "the actual menu was replayed");
+    let once = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    for _ in 0..3 {
+        menu_at(&mut h, time);
+        assert_eq!(h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect(), once, "same-time replay cannot queue another crawl");
+    }
+    let later = time + 1.0 / 60.0;
+    menu_at(&mut h, later);
+    menu_at(&mut h, later);
+    let advanced = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    assert!(advanced.min.y < once.min.y - 0.1, "a later input time advances the held menu ({once:?} -> {advanced:?})");
+    menu_at(&mut h, later);
+    assert_eq!(h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect(), advanced, "the later time also takes only one step");
+}
+
+/// The actual menu viewport's vertical range, rather than its outer Area/frame rectangle.
+/// Popup's accessibility parent is its title, so background panels and other menus cannot match.
+fn menu_scrollbar(h: &Harness<'_, EffectcraftApp>, title: &str) -> Rect {
+    let menu = h.get_by_label(title);
+    let bars: Vec<_> = menu.query_all_by_role(egui::accesskit::Role::ScrollBar).map(|node| node.rect()).filter(|r| r.height() > r.width()).collect();
+    assert_eq!(bars.len(), 1, "{title}: exactly one actual vertical menu scrollbar ({bars:?})");
+    let bar = bars[0];
+    assert!(bar.height() > 36.0, "{title}: both crawl bands fit inside the viewport ({bar:?})");
+    bar
+}
+
+/// Exercise the real popup, its bounds, band exit and subsequent wheel input. Switching to a
+/// different real menu must not consume Edit's pending target or reuse its crawl clock.
+#[test]
+fn menu_edge_crawl_is_bounded_stops_and_keeps_wheel_and_menu_state_independent() {
+    let mut h = harness(1200.0, 520.0);
+    held_edit_crawl(&mut h);
+    h.run_steps(180);
+    let bottom = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    assert!(bottom.max.y <= 520.0, "the last item is inside the viewport at the bottom ({bottom:?})");
+    h.run_steps(20);
+    assert_eq!(h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect(), bottom, "the bottom bound stops the crawl");
+
+    let bar = menu_scrollbar(&h, "Edit");
+    let x = bar.min.x - 12.0; // Inside the menu content, not on the scroll-bar track.
+    let top_band = pos2(x, bar.min.y + 6.0);
+    eprintln!("Edit actual viewport scrollbar {bar:?}; top-band input {top_band:?}");
+    move_to(&mut h, top_band);
+    h.run_steps(180);
+    let top = h.query_by_label_contains("Quick Apply").unwrap().rect();
+    assert!(top.min.y >= 0.0 && top.max.y <= 520.0, "the first entries return into view ({top:?}); actual bar {bar:?}, pointer {top_band:?}");
+    h.run_steps(20);
+    assert_eq!(h.query_by_label_contains("Quick Apply").unwrap().rect(), top, "the top bound stops the crawl");
+
+    let last_at_top = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    move_to(&mut h, pos2(x, bar.max.y - 6.0));
+    h.run_steps(15);
+    let scrolled = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    assert!(scrolled.min.y < last_at_top.min.y - 0.1, "the bottom band starts scrolling again ({last_at_top:?} -> {scrolled:?})");
+    move_to(&mut h, pos2(x, bar.center().y));
+    h.run_steps(2); // Consume the last one-shot target before checking the stopped menu.
+    let stopped = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    h.run_steps(20);
+    assert_eq!(h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect(), stopped, "leaving the band stops the crawl");
+    assert!(
+        last_at_top.min.y > stopped.min.y + 1.0,
+        "there is upward wheel room: bottom {bottom:?}, top {last_at_top:?}, resumed {scrolled:?}, stopped {stopped:?}"
+    );
+    wheel(&mut h, pos2(x, bar.center().y), 120.0);
+    let wheeled_up = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    assert!(
+        wheeled_up.min.y > stopped.min.y + 1.0,
+        "upward wheel input moves the menu after the one-shot target: bottom {bottom:?}, top {last_at_top:?}, resumed {scrolled:?}, stopped {stopped:?}, wheeled {wheeled_up:?}"
+    );
+    assert!(wheeled_up.min.y > bottom.min.y + 1.0, "there is downward wheel room ({bottom:?} -> {wheeled_up:?})");
+    wheel(&mut h, pos2(x, bar.center().y), -120.0);
+    let wheeled = h.query_by_label_contains("Keyboard Shortcuts").unwrap().rect();
+    assert!(
+        wheeled.min.y < wheeled_up.min.y - 1.0,
+        "wheel input still moves the menu after the one-shot target ({wheeled_up:?} -> {wheeled:?}); bottom {bottom:?}, top {last_at_top:?}, resumed {scrolled:?}, stopped {stopped:?}"
+    );
+
+    // Queue another Edit crawl, then switch titles before its next draw can consume the target.
+    move_to(&mut h, pos2(x, bar.max.y - 6.0));
+    h.run_steps(15);
+    let file = rect(&h, "menu.File");
+    move_to(&mut h, file.center());
+    let fresh = h.query_by_label_contains("Open Project").expect("File opens while browsing").rect();
+    assert!(fresh.min.y >= file.max.y && fresh.max.y <= 520.0, "File starts at its own top, not Edit's offset ({fresh:?})");
+    h.run_steps(12);
+    assert_eq!(h.query_by_label_contains("Open Project").unwrap().rect(), fresh, "Edit's crawl does not continue in File");
+
+    // Release on its title rather than an entry, retaining a click-opened popup when possible.
+    h.input_mut().events.push(Event::PointerButton { pos: file.center(), button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
+    h.run_steps(2);
+    if h.query_by_label_contains("Open Project").is_none() {
+        click_at(&mut h, file.center());
+    }
+    let bar = menu_scrollbar(&h, "File");
+    let x = bar.min.x - 12.0;
+    let released = h.query_by_label_contains("Open Project").unwrap().rect();
+    move_to(&mut h, pos2(x, bar.max.y - 6.0));
+    h.run_steps(20);
+    assert_eq!(h.query_by_label_contains("Open Project").unwrap().rect(), released, "without the hold, the edge does not restart a crawl");
+}
+
+/// A scroll bar's "scroll/max" automation label.
+fn scrolled(h: &Harness<'_, EffectcraftApp>, id: &str) -> (f32, f32) {
+    let label = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}")).label.clone();
+    let (s, max) = label.split_once('/').unwrap_or_else(|| panic!("{id}: {label}"));
+    (s.parse().unwrap(), max.parse().unwrap())
+}
+
+/// Every panel that scrolls its own rows shows a scroll bar while they overflow, and dragging it
+/// scrolls them: without a mouse wheel or touchpad there was no way down most panels (#271).
+#[test]
+fn panels_taller_than_their_space_have_a_scroll_bar_to_drag() {
+    use effectcraft_ui_egui::dock::PanelKind;
+    // (The Project panel's list starts below its item preview and search: a taller window.)
+    for (panel, id, height) in [
+        (PanelKind::EffectControls, "effectControls.scroll", 240.0),
+        (PanelKind::Properties, "properties.scroll", 240.0),
+        (PanelKind::EffectsPresets, "effects.scroll", 240.0),
+        (PanelKind::Project, "project.vscroll", 330.0),
+        (PanelKind::Timeline, "timeline.scroll", 240.0),
+        (PanelKind::RenderQueue, "renderQueue.scroll", 240.0),
+        (PanelKind::History, "history.scroll", 240.0),
+        (PanelKind::Preview, "preview.scroll", 240.0),
+        (PanelKind::Character, "character.scroll", 240.0),
+        (PanelKind::Paragraph, "paragraph.scroll", 240.0),
+        (PanelKind::Info, "info.scroll", 240.0),
+    ] {
+        let mut h = harness(1200.0, height);
+        let app = h.state_mut();
+        let lid = app.session.active_comp().unwrap().layers[0].id.0;
+        app.session.execute("layer.select", json!({"layers": [lid]})).unwrap();
+        for e in ["slider", "angle", "checkbox", "color", "point"] {
+            app.session.execute("effect.apply", json!({"effect": format!("ec.control.{e}"), "layers": [lid]})).unwrap();
+        }
+        for _ in 0..6 {
+            app.session.execute("renderQueue.add", json!({})).unwrap();
+        }
+        app.show_panel(panel);
+        app.ui.maximized = Some(panel);
+        h.run_steps(3);
+        let (_, max) = scrolled(&h, id);
+        assert!(max > 0.0, "{id}: the rows overflow");
+        let bar = rect(&h, id);
+        // A press on the track moves the thumb there (History starts at its current state, the
+        // last); then the thumb drags to the end.
+        click_at(&mut h, pos2(bar.center().x, bar.min.y + 2.0));
+        assert_eq!(scrolled(&h, id).0, 0.0, "{id}: at the top");
+        drag(&mut h, pos2(bar.center().x, bar.min.y + 6.0), pos2(bar.center().x, bar.max.y + 40.0));
+        let end = scrolled(&h, id).0;
+        assert!((end - max).abs() < 0.01, "{id}: dragged to the end: {end} of {max}");
+    }
+}
+
+/// In a narrow Effect Controls panel an animated point's values stay clear of its keyframe
+/// navigator (â—€ â—† â–¶), which was drawn over them (#271).
+#[test]
+fn effect_values_stay_clear_of_the_keyframe_navigator() {
+    use effectcraft_ui_egui::dock::PanelKind;
+    let mut h = harness(1600.0, 1000.0);
+    let app = h.state_mut();
+    let lid = app.session.active_comp().unwrap().layers[0].id.0;
+    app.session.execute("layer.select", json!({"layers": [lid]})).unwrap();
+    app.session.execute("effect.apply", json!({"effect": "ec.control.point", "layers": [lid]})).unwrap();
+    let path = "effects/#1/point";
+    app.session.execute("prop.toggleAnimation", json!({"layer": lid, "path": path})).unwrap();
+    app.session.execute("prop.set", json!({"layer": lid, "path": path, "value": [123456.7, 123456.7]})).unwrap();
+    let uid = app.session.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(lid)).unwrap().props.prop(path).unwrap().uid;
+    app.apply_dock(craft_ui::docking::Action::Float { panel: PanelKind::EffectControls, rect: [300.0, 150.0, 330.0, 500.0] }).unwrap();
+    h.run_steps(3);
+    let value = rect(&h, &format!("effectControls.prop.{uid}.value.1"));
+    let nav = rect(&h, &format!("effectControls.prop.{uid}.prevKey"));
+    assert!(value.max.x <= nav.min.x, "the value ({value:?}) ends before the navigator ({nav:?})");
+    assert!(value.min.x > rect(&h, &format!("effectControls.prop.{uid}.stopwatch")).max.x, "and after the stopwatch");
+}
+
+/// The Settings dialog fits its width: its page column was wider than the dialog, so the whole
+/// dialog scrolled sideways a little (#284).
+#[test]
+fn settings_dialog_does_not_scroll_sideways() {
+    let mut h = harness(1400.0, 900.0);
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "app.settings", json!({"page": "general"})).unwrap();
+    h.run_steps(3);
+    let (ok, page) = (rect(&h, "settings.ok"), rect(&h, "settings.page.general"));
+    h.input_mut().events.push(Event::PointerMoved(page.center()));
+    h.input_mut().events.push(Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: vec2(-400.0, 0.0),
+        modifiers: Default::default(),
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
+    h.run_steps(20);
+    assert_eq!((rect(&h, "settings.ok"), rect(&h, "settings.page.general")), (ok, page), "nothing moved sideways");
+}
+
+/// #2034: the Settings sidebar uses the translated page names when deciding its width.
+#[test]
+fn settings_page_column_fits_japanese_names() {
+    use effectcraft_text::fonts;
+    use effectcraft_ui_egui::theme::Tokens;
+
+    let mut session = Session::default();
+    session.prefs.general.language = "ja".into();
+    let app = EffectcraftApp::new(session);
+    // The panel titles a page with its Settings menu row, minus the ellipsis.
+    let name = effectcraft_ui_egui::menus::menu_items(&app)
+        .into_iter()
+        .find(|m| m.id == "app.settings" && m.params["page"] == "scripting")
+        .and_then(|m| m.label.strip_suffix("...").map(str::to_owned))
+        .expect("the Settings menu lists the Scripting & Expressions page");
+    assert!(name.chars().any(|c| c >= '\u{3000}'), "the actual sidebar label is Japanese: {name}");
+    // Use the same external-directory scan and face coverage as production, before rendering.
+    // The managed job supplies CRAFT_FONTS_DIR; register its canonical fonts folder through the
+    // same directory source production scans for EFFECTCRAFT_FONT_DIRS, without changing the env.
+    crate::add_canonical_test_fonts();
+    fonts::scan_system();
+    let base = fonts::resolve("Inter", "Regular").face;
+    let japanese = fonts::face(fonts::fallback_for_locale('あ', base, "ja"));
+    for ch in ['あ', 'フ'].into_iter().chain(name.chars()) {
+        assert!(japanese.has_char(ch), "Japanese fixture lacks {ch:?} for {name:?}: {:?}", japanese.info);
+    }
+    let required_canonical = std::env::var("CRAFT_FONTS_REQUIRED").as_deref() == Ok("1");
+    if required_canonical {
+        let root = std::env::var_os("CRAFT_FONTS_DIR").expect("required canonical craft-fonts input");
+        let expected =
+            std::path::PathBuf::from(root).join("fonts/biz-ud-pgothic/BIZUDPGothic-Regular.ttf").canonicalize().expect("canonical BIZ UDPGothic Regular input");
+        let resolved = fonts::resolve("BIZ UDPGothic", "Regular");
+        assert!(!resolved.missing, "required BIZ UDPGothic Regular must resolve without substitution");
+        let face = fonts::face(resolved.face);
+        assert_eq!(face.info.family, "BIZ UDPGothic", "{:?}", face.info);
+        assert_eq!(face.info.style, "Regular", "{:?}", face.info);
+        assert_eq!(japanese.id, face.id, "required production fallback is the canonical BIZ face: selected {:?}, canonical {:?}", japanese.info, face.info);
+        let fonts::FaceData::File(path) = &face.info.data else { panic!("required BIZ face must come from canonical external input: {:?}", face.info) };
+        assert_eq!(path.canonicalize().unwrap(), expected, "required face source: {:?}", face.info);
+        let expected_bytes = std::fs::read(&expected).unwrap();
+        let font = face.font().expect("required canonical BIZ face parses");
+        assert!(font.data().as_bytes() == expected_bytes.as_slice(), "resolved BIZ bytes match canonical input {expected:?}");
+        for ch in ['あ', 'フ'].into_iter().chain(name.chars()) {
+            assert!(face.has_char(ch), "canonical BIZ input lacks actual label glyph {ch:?}: {:?}", face.info);
+        }
+        eprintln!("required Japanese input {expected:?}: {:?}", face.info);
+    }
+
+    let mut h = Harness::builder().with_size(vec2(1400.0, 900.0)).build_eframe(|_| app);
+    h.run_steps(3);
+    let ctx = h.ctx.clone();
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "app.settings", json!({"page": "scripting"})).unwrap();
+    h.run_steps(3);
+    h.ctx.fonts_mut(|fonts| {
+        let definitions = fonts.definitions();
+        assert!(
+            definitions.font_data.contains_key("japanese-system"),
+            "production installs the Japanese fallback; installed {:?}",
+            definitions.font_data.keys().collect::<Vec<_>>()
+        );
+        assert!(
+            definitions.families.get(&egui::FontFamily::Proportional).unwrap().iter().any(|name| name == "japanese-system"),
+            "production proportional stack reaches its Japanese fallback"
+        );
+        if required_canonical {
+            let registered = definitions.font_data.get("japanese-system").unwrap();
+            let selected = japanese.font().expect("selected canonical Japanese face parses");
+            assert_eq!(registered.index, japanese.info.index, "production registration retains selected face index");
+            assert!(
+                registered.font.as_ref().as_ref() == selected.data().as_bytes(),
+                "production japanese-system bytes equal the selected canonical fallback: {:?}",
+                japanese.info
+            );
+        }
+        assert!(fonts.has_glyphs(&Tokens::ui(12.5), &name), "production glyph lookup covers actual Japanese sidebar label {name:?}");
+    });
+    let text_width = h.ctx.fonts_mut(|fonts| fonts.layout_no_wrap(name.clone(), Tokens::ui(12.5), egui::Color32::WHITE).size().x);
+    let row = rect(&h, "settings.page.scripting");
+    assert!(row.width() >= text_width + 20.0, "{name} needs {text_width} points; row is {row:?}");
+}
diff --git a/crates/ui-egui/tests/ui_settings_info.rs b/crates/ui-egui/tests/it/ui_settings_info.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_settings_info.rs
rename to crates/ui-egui/tests/it/ui_settings_info.rs
diff --git a/crates/ui-egui/tests/ui_tabs.rs b/crates/ui-egui/tests/it/ui_tabs.rs
similarity index 65%
rename from crates/ui-egui/tests/ui_tabs.rs
rename to crates/ui-egui/tests/it/ui_tabs.rs
index 7f4689bf5..65b429f44 100644
--- a/crates/ui-egui/tests/ui_tabs.rs
+++ b/crates/ui-egui/tests/it/ui_tabs.rs
@@ -5,7 +5,8 @@
 use effectcraft_engine::Session;
 use effectcraft_engine::project::ItemId;
 use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{DockNode, PanelKind};
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
+use effectcraft_ui_egui::dock::{Node, PanelKind, SplitSize, Workspace};
 use egui::{Event, Pos2, pos2};
 use egui_kittest::Harness;
 use serde_json::json;
@@ -59,15 +60,6 @@ fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
     h.run_steps(2);
 }
 
-/// The tabs of the docked group holding `p`, in order.
-fn group_of(n: &DockNode, p: PanelKind) -> Option<Vec<PanelKind>> {
-    match n {
-        DockNode::Split { a, b, .. } => group_of(a, p).or_else(|| group_of(b, p)),
-        DockNode::Tabs { panels, .. } => panels.contains(&p).then(|| panels.clone()),
-        DockNode::Stack { entries } => entries.iter().find(|e| e.contains(p)).map(|e| e.panels.clone()),
-    }
-}
-
 fn open_comps(h: &Harness<'_, EffectcraftApp>) -> Vec<u64> {
     h.state().session.state.open_comps.iter().map(|c| c.0).collect()
 }
@@ -81,10 +73,11 @@ fn project_double_click_opens_a_comp_as_its_own_timeline_tab() {
     assert_eq!(open_comps(&h), vec![main, pre]);
     assert_eq!(h.state().session.state.active_comp, Some(ItemId(pre)));
     assert_eq!(h.state().session.project.item(ItemId(pre)).map(|i| i.name.clone()), Some("Pre".into()));
-    // One Timeline tab per comp, the newest last; the shown one answers to the panel's id.
+    // One comp tab per comp in the Timeline's tab strip, the newest last.
     let (tm, tp) = (rect(&h, &format!("panel.tab.Timeline.{main}")), rect(&h, &format!("panel.tab.Timeline.{pre}")));
-    assert!(tp.min.x > tm.max.x, "{tm:?} {tp:?}");
-    assert_eq!(rect(&h, "panel.tab.Timeline"), tp);
+    assert!(tp.min.x >= tm.max.x - 0.5, "{tm:?} {tp:?}");
+    let strip = rect(&h, "panel.tab.Timeline");
+    assert!(strip.y_range().contains(tp.center().y) && tp.min.x > strip.max.x, "{strip:?} {tp:?}");
     // Clicking Main's tab shows Main again; both stay open.
     click_n(&mut h, tm.center(), 1);
     assert_eq!(h.state().session.state.active_comp, Some(ItemId(main)));
@@ -94,7 +87,7 @@ fn project_double_click_opens_a_comp_as_its_own_timeline_tab() {
     click_n(&mut h, close.center(), 1);
     assert_eq!(open_comps(&h), vec![pre]);
     assert_eq!(h.state().session.state.active_comp, Some(ItemId(pre)));
-    assert!(h.state().ui.dock.contains(PanelKind::Timeline));
+    assert!(h.state().ui.dock.is_docked(PanelKind::Timeline));
     // Double-clicking an open comp again adds no second tab.
     let name = rect(&h, &format!("project.item.{pre}.name"));
     click_n(&mut h, name.center(), 2);
@@ -123,7 +116,7 @@ fn dragged_tabs_land_where_the_insertion_mark_is() {
     assert_eq!(group_of(&dock(&h), PanelKind::Timeline), Some(vec![PanelKind::RenderQueue, PanelKind::Timeline, PanelKind::EffectControls]));
 }
 
-/// `cargo test -p effectcraft-ui-egui --test ui_tabs -- --ignored`: the insertion mark mid-drag
+/// `cargo test -p effectcraft-ui-egui --test it ui_tabs:: -- --ignored`: the insertion mark mid-drag
 /// (`target/test-out/tab-drag.png`).
 #[test]
 #[ignore]
@@ -179,18 +172,17 @@ fn double_clicking_a_precomp_bar_opens_its_comp() {
     assert_eq!(h.state().session.active_comp_id(), Some(ItemId(pre)));
 }
 
-/// Issue #46: a panel dragged by its panel-menu (hamburger) button onto the left edge of another
-/// group docks there as its own group; dragging the gap between panels resizes them.
+/// Issue #46: a panel dragged onto the left edge of another group docks there as its own group;
+/// dragging the gap between panels resizes them.
 #[test]
 fn panels_dock_beside_others_and_gutters_resize_them() {
     let (mut h, _, _) = harness();
     let dock = |h: &Harness<'_, EffectcraftApp>| h.state().ui.dock.clone();
-    // Show Effect Controls in its group so its menu button is on screen, then drag by it.
     let tab = rect(&h, "panel.tab.EffectControls");
-    click_n(&mut h, tab.center(), 1);
-    let grip = rect(&h, "panel.menu.EffectControls").center();
     let tl = rect(&h, "panel.Timeline");
-    drag(&mut h, grip, pos2(tl.min.x + tl.width() * 0.08, tl.center().y));
+    // Inside the Timeline body's left drop zone.
+    let depth = craft_ui::docking::SIDE_EDGE_ZONE_DEPTH.min(tl.width().min(tl.height()) / 4.0);
+    drag(&mut h, tab.center(), pos2(tl.min.x + depth / 2.0, tl.center().y));
     assert_eq!(group_of(&dock(&h), PanelKind::EffectControls), Some(vec![PanelKind::EffectControls]));
     assert!(!group_of(&dock(&h), PanelKind::Timeline).unwrap().contains(&PanelKind::EffectControls));
     let (fx, tl) = (rect(&h, "panel.EffectControls"), rect(&h, "panel.Timeline"));
@@ -212,41 +204,83 @@ fn panels_dock_beside_others_and_gutters_resize_them() {
     assert!((wider.width() - project.width() - 60.0).abs() < 2.0, "{} → {}", project.width(), wider.width());
 }
 
-/// Issue #171: the gaps between the right column's stacked panels drag to resize them (Preview
-/// was stuck at its default height), not below a minimum; the heights stay in the layout.
+/// The divider below the Preview frame: the horizontal gutter between it and the Properties
+/// frame.
+fn preview_divider(h: &Harness<'_, EffectcraftApp>) -> egui::Rect {
+    let (preview, props) = (rect(h, "panel.Preview"), rect(h, "panel.Properties"));
+    h.state()
+        .auto
+        .previous
+        .iter()
+        .filter(|e| e.id.starts_with("dock.gutter.") && e.rect[2] > e.rect[3])
+        .map(|e| egui::Rect::from_min_size(pos2(e.rect[0], e.rect[1]), egui::vec2(e.rect[2], e.rect[3])))
+        .find(|g| g.x_range().contains(preview.center().x) && g.center().y >= preview.max.y - 1.0 && g.center().y <= props.min.y + 1.0)
+        .expect("a gutter between Preview and Properties")
+}
+
+/// Default's right column: a short Preview frame (46 points of body) and the Properties frame
+/// below it taking the rest of the column, at any window height.
 #[test]
-fn stacked_panel_gaps_resize_the_panels() {
+fn the_default_preview_frame_is_short_and_properties_takes_the_rest() {
     let (mut h, _, _) = harness();
-    fn height(n: &DockNode, p: PanelKind) -> Option<Option<f32>> {
-        match n {
-            DockNode::Split { a, b, .. } => height(a, p).or_else(|| height(b, p)),
-            DockNode::Tabs { .. } => None,
-            DockNode::Stack { entries } => entries.iter().find(|e| e.contains(p)).map(|e| e.height),
+    let body = |h: &Harness<'_, EffectcraftApp>| rect(h, "panel.Preview").height();
+    assert!((body(&h) - 46.0).abs() < 1.5, "Preview {}", body(&h));
+    let props = rect(&h, "panel.Properties");
+    assert!(props.height() > 300.0, "Properties {props:?}");
+    // A taller window gives the room to Properties.
+    let size = h.ctx.content_rect().size();
+    h.set_size(size + egui::vec2(0.0, 200.0));
+    h.run_steps(3);
+    assert!((body(&h) - 46.0).abs() < 1.5, "Preview {}", body(&h));
+    assert!((rect(&h, "panel.Properties").height() - props.height() - 200.0).abs() < 2.0);
+}
+
+/// Issue #171: the divider below the Preview frame drags to resize it (Preview was stuck at its
+/// default height), not below a minimum; the new height stays in the layout.
+#[test]
+fn the_preview_frame_divider_resizes_it() {
+    let (mut h, _, _) = harness();
+    fn preview_size(w: &Workspace) -> Option<SplitSize> {
+        fn rec(n: &Node<PanelKind>) -> Option<SplitSize> {
+            match n {
+                Node::Split { first, second, size, .. } => match first.as_ref() {
+                    Node::Tabs { panels, .. } if panels.contains(&PanelKind::Preview) => Some(*size),
+                    _ => rec(first).or_else(|| rec(second)),
+                },
+                _ => None,
+            }
         }
+        rec(w.layout.root.as_ref()?)
     }
     let (preview, props) = (rect(&h, "panel.Preview"), rect(&h, "panel.Properties"));
-    let gap = rect(&h, "dock.gutter.bs0");
-    assert!(gap.center().y > preview.max.y && gap.center().y < props.min.y, "the gap below Preview: {gap:?}");
+    let gap = preview_divider(&h);
     drag(&mut h, gap.center(), gap.center() + egui::vec2(0.0, 150.0));
     let (p2, q2) = (rect(&h, "panel.Preview"), rect(&h, "panel.Properties"));
     assert!((p2.height() - preview.height() - 150.0).abs() < 2.0, "Preview {} → {}", preview.height(), p2.height());
     assert!((props.height() - q2.height() - 150.0).abs() < 2.0, "Properties {} → {}", props.height(), q2.height());
     assert!((q2.max.y - props.max.y).abs() < 1.0, "the column stays filled");
-    let saved = height(&h.state().ui.dock, PanelKind::Preview).flatten().expect("Preview's height is in the layout");
-    assert!((saved - p2.height()).abs() < 2.0, "{saved} vs {}", p2.height());
-    assert_eq!(height(&h.state().ui.dock, PanelKind::Properties), Some(None), "Properties still takes the rest");
-    // Collapsing and expanding Preview keeps its height.
-    let tab = rect(&h, "panel.tab.Preview");
-    click_n(&mut h, tab.center(), 1);
-    assert!(!h.state().ui.dock.is_visible(PanelKind::Preview));
-    click_n(&mut h, tab.center(), 1);
-    assert!((rect(&h, "panel.Preview").height() - p2.height()).abs() < 1.0);
-    // Not below the minimum.
-    let gap = rect(&h, "dock.gutter.bs0");
-    drag(&mut h, gap.center(), gap.center() - egui::vec2(0.0, 400.0));
+    // The frame keeps a fixed height, 150 points more.
+    let Some(SplitSize::FixedFirst(size)) = preview_size(&h.state().ui.dock) else { panic!("{:?}", preview_size(&h.state().ui.dock)) };
+    assert!((size - effectcraft_ui_egui::dock::PREVIEW_FRAME - 150.0).abs() < 2.0, "{size}");
+    // Dragged up to Preview's top, it stops at its minimum.
+    let gap = preview_divider(&h);
+    let top = rect(&h, "panel.Preview").min.y;
+    drag(&mut h, gap.center(), pos2(gap.center().x, top));
     assert!((rect(&h, "panel.Preview").height() - 40.0).abs() < 1.0, "{}", rect(&h, "panel.Preview").height());
 }
 
+/// Maximize acts on one frame: the Preview frame fills the dock area, Properties hides.
+#[test]
+fn maximizing_preview_maximizes_its_frame_alone() {
+    let (mut h, _, _) = harness();
+    let preview = rect(&h, "panel.Preview");
+    h.state_mut().ui.maximized = Some(PanelKind::Preview);
+    h.run_steps(3);
+    let big = rect(&h, "panel.Preview");
+    assert!(big.height() > preview.height() + 300.0 && big.width() > preview.width() + 300.0, "{preview:?} → {big:?}");
+    assert!(h.state().auto.find("panel.Properties").is_none(), "the Properties frame is not shown");
+}
+
 /// Issue #45: the Project panel's details (name, size, duration) stay inside the panel with a
 /// margin, cut short with "…" when they don't fit; so does the hint shown with nothing selected.
 #[test]
@@ -338,42 +372,97 @@ fn dragging_the_viewer_timeline_divider_far_up_does_not_crash() {
     h.run_steps(2);
 }
 
-/// Issue #301: clicking anywhere on a stacked panel's header bar expands/collapses it, not only
-/// its name; the panel menu button keeps its own click.
+/// Issue #301: a stacked panel's header bar opens it with a click anywhere on it, and its −/+
+/// button at the bar's right end collapses and expands it.
 #[test]
 fn a_stacked_panels_whole_header_bar_toggles_it() {
     let (mut h, _, _) = harness();
+    use effectcraft_ui_egui::dock;
+    let stack = dock::stack(&[(PanelKind::Preview, true, Some(46.0)), (PanelKind::Properties, true, None)]);
+    h.state_mut().ui.dock = dock::docked(dock::hsplit(SplitSize::FixedSecond(300.0), dock::tabs(&[PanelKind::Composition], 0), stack));
+    h.run_steps(3);
     let open = |h: &Harness<'_, EffectcraftApp>| h.state().ui.dock.is_visible(PanelKind::Preview);
     assert!(open(&h));
-    let bar = rect(&h, "panel.header.Preview");
-    let tab = rect(&h, "panel.tab.Preview");
-    assert!(bar.min.x >= tab.max.x - 1.0 && bar.width() > 40.0, "{bar:?} {tab:?}");
-    click_n(&mut h, pos2(bar.max.x - 6.0, bar.center().y), 1);
-    assert!(!open(&h), "a click at the bar's right end collapses Preview");
-    let bar = rect(&h, "panel.header.Preview");
-    click_n(&mut h, bar.center(), 1);
+    let toggle = rect(&h, "panel.header.Preview");
+    let bar = rect(&h, "panel.tab.Preview");
+    assert!(toggle.max.x <= bar.max.x + 1.0 && toggle.min.x > bar.center().x, "{toggle:?} {bar:?}");
+    click_n(&mut h, toggle.center(), 1);
+    assert!(!open(&h), "the button collapses Preview");
+    let toggle = rect(&h, "panel.header.Preview");
+    click_n(&mut h, toggle.center(), 1);
     assert!(open(&h), "and expands it again");
-    let menu = rect(&h, "panel.menu.Preview");
-    click_n(&mut h, menu.center(), 1);
-    assert!(open(&h), "the panel menu button doesn't toggle the panel");
+    let toggle = rect(&h, "panel.header.Preview");
+    click_n(&mut h, toggle.center(), 1);
+    assert!(!open(&h));
+    click_n(&mut h, pos2(bar.min.x + bar.width() * 0.25, bar.center().y), 1);
+    assert!(open(&h), "a click on the bar away from the button opens it");
 }
 
-/// #302: a panel dropped onto a stacked panel becomes a tab in that panel's frame (it was
-/// inserted as a stacked panel of its own below it); its tabs switch the frame's panel.
+/// #302: a panel dropped onto the Properties frame becomes a tab in that frame; its tabs switch
+/// the frame's panel, and the Preview frame above keeps showing.
 #[test]
-fn a_tab_dropped_on_a_stacked_panel_joins_its_frame() {
+fn a_tab_dropped_on_a_frame_joins_it() {
     let (mut h, _, _) = harness();
     let dock = |h: &Harness<'_, EffectcraftApp>| h.state().ui.dock.clone();
     let fx = rect(&h, "panel.tab.EffectControls");
     let props = rect(&h, "panel.Properties");
     drag(&mut h, fx.center(), props.center());
-    assert_eq!(group_of(&dock(&h), PanelKind::Properties), Some(vec![PanelKind::Properties, PanelKind::EffectControls]));
+    let group = group_of(&dock(&h), PanelKind::Properties).unwrap();
+    assert!(group.starts_with(&[PanelKind::Properties]) && group.contains(&PanelKind::EffectControls), "{group:?}");
     assert!(dock(&h).is_visible(PanelKind::EffectControls) && !dock(&h).is_visible(PanelKind::Properties));
+    assert!(dock(&h).is_visible(PanelKind::Preview));
     // The frame's other tab shows Properties again, the frame stays open.
     let tab = rect(&h, "panel.tab.Properties");
     click_n(&mut h, tab.center(), 1);
     assert!(dock(&h).is_visible(PanelKind::Properties) && !dock(&h).is_visible(PanelKind::EffectControls));
     // The layout (saved workspaces) round-trips.
     let s = serde_json::to_string(&dock(&h)).unwrap();
-    assert_eq!(serde_json::from_str::<DockNode>(&s).unwrap(), dock(&h));
+    assert_eq!(serde_json::from_str::<Workspace>(&s).unwrap(), dock(&h));
+}
+
+/// The tabs of the group holding `p`, in order.
+fn group_of(w: &Workspace, p: PanelKind) -> Option<Vec<PanelKind>> {
+    Some(w.group_of(p)).filter(|g| !g.is_empty())
+}
+
+fn has(h: &Harness<'_, EffectcraftApp>, id: &str) -> bool {
+    h.state().auto.previous.iter().chain(h.state().auto.elements.iter()).any(|e| e.id == id)
+}
+
+#[test]
+fn open_comps_are_tabs_in_the_timeline_row_and_the_rest_are_in_its_overflow_menu() {
+    let mut s = Session::default();
+    let names = ["Opening Titles", "Lower Third Left", "Lower Third Right", "Product Shot", "End Card Wide", "Logo Sting Short"];
+    let comps: Vec<u64> = names
+        .iter()
+        .map(|name| s.execute("comp.new", json!({"name": name, "width": 320, "height": 180, "duration": 4})).unwrap()["comp"].as_u64().unwrap())
+        .collect();
+    s.state.open_comps = vec![ItemId(comps[0])];
+    s.state.active_comp = Some(ItemId(comps[0]));
+    let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    let alone = rect(&h, "panel.tab.RenderQueue");
+    h.state_mut().session.state.open_comps = comps.iter().map(|c| ItemId(*c)).collect();
+    h.run_steps(3);
+    // The panel tabs keep their width; the comp tabs follow them in the same row, in order.
+    let (tl, rq) = (rect(&h, "panel.tab.Timeline"), rect(&h, "panel.tab.RenderQueue"));
+    assert!((rq.width() - alone.width()).abs() < 0.5, "Render Queue {rq:?} was {alone:?}");
+    let shown: Vec<u64> = comps.iter().copied().filter(|c| has(&h, &format!("panel.tab.Timeline.{c}"))).collect();
+    assert!(shown.contains(&comps[0]) && shown.len() < comps.len(), "{shown:?}");
+    let mut x = rq.max.x;
+    for c in &shown {
+        let tab = rect(&h, &format!("panel.tab.Timeline.{c}"));
+        assert!(tl.y_range().contains(tab.center().y) && tab.min.x >= x - 0.5, "comp {c} at {tab:?} after x {x}");
+        x = tab.max.x;
+    }
+    // A comp with no room is in the » menu; picking it shows it, and its tab joins the row.
+    let hidden = comps.iter().copied().find(|c| !shown.contains(c)).unwrap();
+    let more = rect(&h, "panel.tab.Timeline.more");
+    assert!(more.min.x >= x - 0.5 && tl.y_range().contains(more.center().y), "{more:?}");
+    click_n(&mut h, more.center(), 1);
+    let item = rect(&h, &format!("panel.tab.Timeline.more.{hidden}"));
+    click_n(&mut h, item.center(), 1);
+    assert_eq!(h.state().session.state.active_comp, Some(ItemId(hidden)));
+    assert_eq!(open_comps(&h), comps);
+    assert!(has(&h, &format!("panel.tab.Timeline.{hidden}")));
 }
diff --git a/crates/ui-egui/tests/ui_tail.rs b/crates/ui-egui/tests/it/ui_tail.rs
similarity index 98%
rename from crates/ui-egui/tests/ui_tail.rs
rename to crates/ui-egui/tests/it/ui_tail.rs
index b526c7e28..ca9026623 100644
--- a/crates/ui-egui/tests/ui_tail.rs
+++ b/crates/ui-egui/tests/it/ui_tail.rs
@@ -25,7 +25,7 @@ fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
     Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
 }
 
-fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
+pub(crate) fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
     h.input_mut().events.push(Event::PointerMoved(from));
     h.input_mut().events.push(Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
     h.step();
@@ -197,6 +197,7 @@ fn layer_style_controls_stay_reachable_in_a_small_window() {
             delta: vec2(-2000.0, -2000.0),
             modifiers: Default::default(),
             phase: egui::TouchPhase::Move,
+            source: egui::MouseWheelSource::Wheel,
         });
         h.run_steps(5);
         let at = in_view(&h, "dialog.layerStyle.value.dropShadow/noise");
diff --git a/crates/ui-egui/tests/it/ui_text_edit.rs b/crates/ui-egui/tests/it/ui_text_edit.rs
new file mode 100644
index 000000000..84a218466
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_text_edit.rs
@@ -0,0 +1,1736 @@
+//! Headless checks for on-canvas text editing in the viewer and the Character / Paragraph panels
+//! acting on the selection (egui_kittest, UI logic only: no GPU needed).
+
+use effectcraft_engine::Session;
+use effectcraft_engine::commands::text_edit::layer_doc;
+use effectcraft_engine::project::LayerId;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::dock::PanelKind;
+use egui::{Event, Key, Modifiers, PointerButton, Pos2};
+use egui_kittest::Harness;
+use serde_json::json;
+
+fn app() -> EffectcraftApp {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    EffectcraftApp::new(s)
+}
+
+/// A headless window at the size and frame step the viewer tests here are written for.
+fn harness(a: EffectcraftApp) -> Harness<'static, EffectcraftApp> {
+    Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |cc| {
+        EffectcraftApp::install_ime_reset_hooks(&cc.egui_ctx);
+        a
+    })
+}
+
+fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> egui::Rect {
+    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
+    egui::Rect::from_min_size(egui::pos2(e.rect[0], e.rect[1]), egui::vec2(e.rect[2], e.rect[3]))
+}
+
+fn click(h: &mut Harness<'_, EffectcraftApp>, p: Pos2, modifiers: Modifiers) {
+    h.input_mut().events.push(Event::PointerMoved(p));
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers });
+    h.run_steps(1);
+    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: false, modifiers });
+    h.run_steps(2);
+}
+
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
+    h.input_mut().events.push(Event::PointerMoved(from));
+    h.input_mut().events.push(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    for i in 1..=8 {
+        h.input_mut().events.push(Event::PointerMoved(from + (to - from) * (i as f32 / 8.0)));
+        h.run_steps(1);
+    }
+    h.input_mut().events.push(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+}
+
+fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key, modifiers: Modifiers) {
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers });
+    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers });
+    h.run_steps(2);
+}
+
+fn type_text(h: &mut Harness<'_, EffectcraftApp>, t: &str) {
+    h.input_mut().events.push(Event::Text(t.into()));
+    h.run_steps(2);
+}
+
+fn edited(h: &Harness<'_, EffectcraftApp>) -> (u64, String, usize, usize) {
+    let s = &h.state().session;
+    let e = s.state.text_edit.clone().expect("editing");
+    (e.layer.0, layer_doc(s, e.layer).unwrap().text, e.anchor, e.caret)
+}
+
+#[test]
+fn type_tool_skips_hidden_and_unsoloed_text_layers() {
+    for switch in ["video", "solo"] {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+        let mut ids = vec![];
+        for _ in 0..2 {
+            let lid = s.execute("layer.newText", json!({"text": "alpha beta", "size": 80, "position": [100, 200], "justify": "left"})).unwrap()["layer"]
+                .as_u64()
+                .unwrap();
+            ids.push(lid);
+        }
+        let (target, value) = if switch == "video" { (ids[1], false) } else { (ids[0], true) };
+        s.execute("layer.setSwitch", json!({"layers": [target], "switch": switch, "value": value})).unwrap();
+        s.execute("edit.deselectAll", json!({})).unwrap();
+        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(move |_| EffectcraftApp::new(s));
+        h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+        h.run_steps(3);
+        let comp = rect(&h, "viewer.comp");
+        let k = comp.width() / 640.0;
+        click(&mut h, comp.min + egui::vec2(330.0 * k, 180.0 * k), Modifiers::NONE);
+        assert_eq!(edited(&h).0, ids[0], "{switch}");
+    }
+}
+
+#[test]
+fn modal_blocks_background_text_events() {
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app());
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let p = rect(&h, "viewer.comp").center();
+    click(&mut h, p, Modifiers::NONE);
+    type_text(&mut h, "Preserve");
+    let before = edited(&h).1;
+    h.state_mut().dialog = Some(effectcraft_ui_egui::Dialog::About);
+    h.run_steps(3);
+    h.input_mut().events.push(Event::Text("changed".into()));
+    h.input_mut().events.push(Event::Paste("pasted".into()));
+    key(&mut h, Key::Backspace, Modifiers::NONE);
+    assert_eq!(edited(&h).1, before);
+}
+
+#[test]
+fn type_tool_click_type_edit_and_commit() {
+    let mut h = harness(app());
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let comp = rect(&h, "viewer.comp");
+    // Click: a point text layer in edit mode, caret ready.
+    click(&mut h, comp.center(), Modifiers::NONE);
+    assert_eq!(h.state().session.active_comp().unwrap().layers.len(), 1);
+    type_text(&mut h, "Hello");
+    type_text(&mut h, " world");
+    let (lid, text, a, c) = edited(&h);
+    assert_eq!((text.as_str(), a, c), ("Hello world", 11, 11));
+    assert!(h.state().auto.find("viewer.textEdit").is_some(), "edit region registered");
+    // Arrow keys, Shift-extend, Backspace.
+    key(&mut h, Key::ArrowLeft, Modifiers::NONE);
+    key(&mut h, Key::ArrowLeft, Modifiers::SHIFT);
+    assert_eq!((edited(&h).2, edited(&h).3), (10, 9));
+    key(&mut h, Key::Backspace, Modifiers::NONE);
+    assert_eq!(edited(&h).1, "Hello word");
+    // Word jump and Home / End.
+    key(&mut h, Key::Home, Modifiers::NONE);
+    assert_eq!(edited(&h).3, 0);
+    key(&mut h, Key::ArrowRight, Modifiers::COMMAND);
+    assert_eq!(edited(&h).3, 5);
+    key(&mut h, Key::End, Modifiers::NONE);
+    assert_eq!(edited(&h).3, 10);
+    // Enter starts a new paragraph.
+    key(&mut h, Key::Enter, Modifiers::NONE);
+    type_text(&mut h, "two");
+    assert_eq!(edited(&h).1, "Hello word\ntwo");
+    // Select all, then the Character panel styles the selection only.
+    key(&mut h, Key::ArrowUp, Modifiers::NONE);
+    assert!(edited(&h).3 <= 10, "up to the first line");
+    key(&mut h, Key::Home, Modifiers::NONE);
+    key(&mut h, Key::End, Modifiers::SHIFT);
+    let (_, _, a, c) = edited(&h);
+    assert_eq!((a, c), (0, 10));
+    h.state_mut().show_panel(PanelKind::Character);
+    h.run_steps(3);
+    let bold = rect(&h, "character.fauxBold");
+    click(&mut h, bold.center(), Modifiers::NONE);
+    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
+    assert!(doc.style_at(2).faux_bold, "selection is bold");
+    assert!(!doc.style_at(12).faux_bold, "second paragraph untouched");
+    assert_eq!(doc.runs().len(), 2);
+    // Undo the style; Escape commits.
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert!(layer_doc(&h.state().session, LayerId(lid)).unwrap().is_uniform());
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.setSelection", json!({"start": 0})).unwrap();
+    h.run_steps(2);
+    key(&mut h, Key::Escape, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_none());
+}
+
+/// #831: clicking another panel (a solid's row in the Timeline) ends text editing and gives the
+/// keyboard back, whether the edit began with the Type tool (which stays selected) or by command:
+/// typed characters change no text and Space plays. The Character panel keeps the edit, and a
+/// text layer clicked into being and left empty goes away.
+#[test]
+fn clicking_another_panel_stops_typing_into_text() {
+    for type_tool in [false, true] {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+        let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+        let title =
+            s.execute("layer.newText", json!({"text": "Title", "size": 80, "position": [100, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+        let mut h = harness(EffectcraftApp::new(s));
+        h.state_mut().show_panel(PanelKind::Composition);
+        h.run_steps(3);
+        let layers = |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layers.len();
+        // (Its row moves down as text layers are added.)
+        let row = |h: &Harness<'_, EffectcraftApp>| rect(h, &format!("timeline.layer.{solid}.row")).center();
+        if type_tool {
+            h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+            h.run_steps(1);
+            let at = rect(&h, "viewer.comp").center();
+            click(&mut h, at, Modifiers::NONE);
+            assert_eq!(layers(&h), 3, "the Type tool started a text layer");
+            let at_row = row(&h);
+            click(&mut h, at_row, Modifiers::NONE);
+            assert_eq!(layers(&h), 2, "left empty, it is removed");
+            click(&mut h, at, Modifiers::NONE);
+        } else {
+            h.state_mut().session.execute("text.edit", json!({"layer": title})).unwrap();
+            h.run_steps(2);
+        }
+        type_text(&mut h, "Hello");
+        // The Character panel formats the selection and keeps the edit: typing carries on.
+        key(&mut h, Key::ArrowLeft, Modifiers::SHIFT);
+        let range = edited(&h);
+        h.state_mut().show_panel(PanelKind::Character);
+        h.run_steps(3);
+        let bold = rect(&h, "character.fauxBold").center();
+        click(&mut h, bold, Modifiers::NONE);
+        assert_eq!(edited(&h), range, "type_tool {type_tool}: Character keeps the edit and its selection");
+        key(&mut h, Key::End, Modifiers::NONE);
+        type_text(&mut h, "!");
+        let (lid, text, ..) = edited(&h);
+        assert!(text.ends_with("Hello!"), "typing goes into the text: {text:?}");
+        let at_row = row(&h);
+        click(&mut h, at_row, Modifiers::NONE);
+        assert!(h.state().session.state.text_edit.is_none(), "type_tool {type_tool}: clicking the Timeline ends the edit");
+        assert_eq!(h.state().session.state.selected_layers, vec![LayerId(solid)]);
+        assert!(!h.ctx.memory(|m| m.focused().is_some()), "the keyboard is the app's again");
+        type_text(&mut h, "abc");
+        assert!(!h.state().playback.playing);
+        h.input_mut().events.push(Event::Key { key: Key::Space, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
+        h.input_mut().events.push(Event::Text(" ".into()));
+        h.input_mut().events.push(Event::Key { key: Key::Space, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE });
+        h.run_steps(2);
+        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, text, "type_tool {type_tool}: the text is unchanged");
+        assert!(h.state().playback.playing, "type_tool {type_tool}: Space plays");
+        assert_eq!(type_tool, matches!(h.state().ui.tool, effectcraft_ui_egui::state::Tool::Type), "the tool is kept");
+    }
+}
+
+/// #831: opening a formatting panel's tab behind Effects & Presets in its group (Properties, in
+/// Undocked Panels) keeps the edit and its selected characters: the press on the tab used to
+/// focus the shown panel and end the edit, after which Faux Bold styled the whole layer.
+#[test]
+fn opening_a_formatting_tab_keeps_the_text_selection() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let lid =
+        s.execute("layer.newText", json!({"text": "Hello world", "size": 80, "position": [60, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = harness(EffectcraftApp::new(s));
+    h.run_steps(3);
+    let ctx = h.ctx.clone();
+    // Effects & Presets shown, Properties, Character and Paragraph behind it.
+    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "window.workspace", json!({"name": "Undocked Panels"})).unwrap();
+    h.state_mut().session.execute("text.edit", json!({"layer": lid})).unwrap();
+    h.state_mut().session.execute("text.setSelection", json!({"anchor": 0, "caret": 5})).unwrap();
+    h.run_steps(3);
+    assert!(h.state().auto.find("properties.text.style").is_none(), "Properties is behind Effects & Presets");
+    let tab = rect(&h, "panel.tab.Properties").center();
+    click(&mut h, tab, Modifiers::NONE);
+    assert!(h.state().auto.find("properties.text.style").is_some(), "the tab opened Properties");
+    assert_eq!(edited(&h), (lid, "Hello world".into(), 0, 5), "the edit and its selection are kept");
+    h.state_mut().show_panel(PanelKind::Character);
+    h.run_steps(3);
+    let bold = rect(&h, "character.fauxBold").center();
+    click(&mut h, bold, Modifiers::NONE);
+    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
+    assert!(doc.style_at(1).faux_bold && !doc.style_at(7).faux_bold, "only \"Hello\" is bold");
+}
+
+/// #831: a click away and keys in one frame's input. The text gets the keys typed before the
+/// click and none after it; those later keys don't run as shortcuts either (Delete would remove a
+/// layer). From the next frame the keys are the app's: Space plays.
+#[test]
+fn keys_after_a_click_away_in_the_same_frame_skip_the_text() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    let lid = s.execute("layer.newText", json!({"text": "Hello", "size": 80, "position": [60, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = harness(EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": lid, "caret": 5})).unwrap();
+    h.run_steps(2);
+    let row = rect(&h, &format!("timeline.layer.{solid}.row")).center();
+    let key = |key: Key, pressed: bool| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE };
+    h.input_mut().events.extend([
+        Event::Text("A".into()),
+        Event::PointerMoved(row),
+        Event::PointerButton { pos: row, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: row, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        Event::Text("x".into()),
+        key(Key::Space, true),
+        Event::Text(" ".into()),
+        key(Key::Space, false),
+        key(Key::Delete, true),
+        key(Key::Delete, false),
+    ]);
+    h.run_steps(3);
+    let comp = |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layers.len();
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "HelloA", "only the key before the click");
+    assert!(h.state().session.state.text_edit.is_none(), "the click ended the edit");
+    assert_eq!((comp(&h), h.state().playback.playing), (2, false), "the keys after it ran no shortcut");
+    h.input_mut().events.extend([key(Key::Space, true), Event::Text(" ".into()), key(Key::Space, false)]);
+    h.run_steps(2);
+    assert!(h.state().playback.playing, "Space plays");
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "HelloA");
+}
+
+#[test]
+fn switching_from_type_to_selection_commits_and_moves_text_layer() {
+    let mut h = harness(app());
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let comp = rect(&h, "viewer.comp");
+    let k = comp.width() / 640.0;
+    click(&mut h, comp.min + egui::vec2(320.0 * k, 180.0 * k), Modifiers::NONE);
+    type_text(&mut h, "Move me");
+    let layer_id = h.state().session.state.text_edit.as_ref().unwrap().layer;
+    let layer_position = |h: &Harness<'_, EffectcraftApp>| {
+        h.state().session.active_comp().unwrap().layer(layer_id).unwrap().props.prop("transform/position").unwrap().value.as_vec3()
+    };
+    let original_text = layer_doc(&h.state().session, layer_id).unwrap().text;
+    let before = layer_position(&h);
+
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Selection;
+    h.run_steps(2);
+    assert!(h.state().session.state.text_edit.is_none(), "leaving the Type tool commits text editing");
+    type_text(&mut h, " ignored");
+    assert_eq!(layer_doc(&h.state().session, layer_id).unwrap().text, original_text, "Selection does not type into the layer");
+    let from = comp.min + egui::vec2(340.0 * k, 150.0 * k);
+    let to = from + egui::vec2(60.0 * k, 50.0 * k);
+    drag(&mut h, from, to);
+    let after = layer_position(&h);
+    assert!(after[0] > before[0] && after[1] > before[1], "Selection dragging moves the text layer: {before:?} -> {after:?}");
+}
+
+#[test]
+fn double_click_enters_editing_and_selects_words() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let lid =
+        s.execute("layer.newText", json!({"text": "alpha beta", "size": 80, "position": [100, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = harness(EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    // A point inside "beta" (comp space → window).
+    let comp = rect(&h, "viewer.comp");
+    let k = comp.width() / 640.0;
+    let p = comp.min + egui::vec2(330.0 * k, 180.0 * k);
+    click(&mut h, p, Modifiers::NONE);
+    click(&mut h, p, Modifiers::NONE);
+    let e = h.state().session.state.text_edit.clone().expect("double-click edits text");
+    assert_eq!(e.layer.0, lid);
+    assert_eq!((e.anchor.min(e.caret), e.anchor.max(e.caret)), (0, 10), "everything selected");
+    // Double-clicking inside the edited text selects a word.
+    h.run_steps(40);
+    click(&mut h, p, Modifiers::NONE);
+    click(&mut h, p, Modifiers::NONE);
+    let e = h.state().session.state.text_edit.clone().unwrap();
+    assert_eq!((e.anchor, e.caret), (6, 10));
+    // Typing replaces it; Cmd+Z undoes while editing.
+    type_text(&mut h, "gamma");
+    assert_eq!(edited(&h).1, "alpha gamma");
+    key(&mut h, Key::Z, Modifiers::COMMAND);
+    assert_eq!(edited(&h).1, "alpha beta");
+    // Paragraph panel: alignment applies to the edited paragraph (the South Asian and Middle
+    // Eastern text engine shows the direction popup too).
+    h.state_mut().session.prefs.type_.text_engine = "southAsian".into();
+    h.state_mut().show_panel(PanelKind::Paragraph);
+    h.run_steps(3);
+    let r = rect(&h, "paragraph.right");
+    click(&mut h, r.center(), Modifiers::NONE);
+    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
+    assert_eq!(doc.justify, effectcraft_engine::keyframe::Justify::Right);
+    for id in
+        ["paragraph.indentLeft", "paragraph.spaceBefore", "paragraph.direction", "paragraph.composer", "paragraph.hangingPunctuation", "paragraph.justifyAll"]
+    {
+        assert!(h.state().auto.find(id).is_some(), "missing {id}");
+    }
+}
+
+#[test]
+fn type_tool_drag_makes_paragraph_text_with_box_handles() {
+    let mut h = harness(app());
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let comp = rect(&h, "viewer.comp");
+    let a = comp.min + egui::vec2(comp.width() * 0.2, comp.height() * 0.2);
+    let b = comp.min + egui::vec2(comp.width() * 0.7, comp.height() * 0.6);
+    h.input_mut().events.push(Event::PointerMoved(a));
+    h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    for i in 1..=8 {
+        h.input_mut().events.push(Event::PointerMoved(a + (b - a) * (i as f32 / 8.0)));
+        h.run_steps(1);
+    }
+    h.input_mut().events.push(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+    let (lid, _, _, _) = edited(&h);
+    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
+    let bs = doc.box_size.expect("paragraph text");
+    assert!((bs[0] - 320.0).abs() < 4.0 && (bs[1] - 144.0).abs() < 4.0, "{bs:?}");
+    type_text(&mut h, "Some words that wrap inside the box when there are enough of them");
+    h.run_steps(2);
+    assert!(h.state().auto.find("viewer.textBox.handle.4").is_some());
+    // Dragging the bottom-right handle widens the box.
+    let hr = rect(&h, "viewer.textBox.handle.4").center();
+    let to = hr + egui::vec2(60.0, 0.0);
+    h.input_mut().events.push(Event::PointerMoved(hr));
+    h.input_mut().events.push(Event::PointerButton { pos: hr, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    for i in 1..=6 {
+        h.input_mut().events.push(Event::PointerMoved(hr + (to - hr) * (i as f32 / 6.0)));
+        h.run_steps(1);
+    }
+    h.input_mut().events.push(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(2);
+    let doc2 = layer_doc(&h.state().session, LayerId(lid)).unwrap();
+    assert!(doc2.box_size.unwrap()[0] > bs[0] + 20.0, "{:?}", doc2.box_size);
+    assert!(h.state().session.state.text_edit.is_some(), "still editing after resizing");
+}
+
+/// #866: Layer ▸ New ▸ Text (menu or its shortcut) puts an insertion point in the comp, as After
+/// Effects does, so typed keys reach Source Text (and the layer name follows) instead of running
+/// shortcuts while the layer keeps the placeholder "Text".
+#[test]
+fn layer_new_text_menu_and_shortcut_start_typing_into_source_text() {
+    for via_shortcut in [false, true] {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+        s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap();
+        let mut h = harness(EffectcraftApp::new(s));
+        h.state_mut().show_panel(PanelKind::Composition);
+        h.run_steps(3);
+        if via_shortcut {
+            key(&mut h, Key::T, Modifiers::COMMAND | Modifiers::ALT | Modifiers::SHIFT);
+        } else {
+            let ctx = h.ctx.clone();
+            effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "layer.newText", json!({})).unwrap();
+            h.run_steps(2);
+        }
+        let (lid, text, _, _) = edited(&h);
+        assert_eq!(text, "", "no placeholder to type over (shortcut: {via_shortcut})");
+        type_text(&mut h, "My First Project");
+        key(&mut h, Key::Escape, Modifiers::NONE);
+        assert!(h.state().session.state.text_edit.is_none(), "Escape commits");
+        let s = &h.state().session;
+        assert_eq!(layer_doc(s, LayerId(lid)).unwrap().text, "My First Project", "typed text is the Source Text");
+        assert_eq!(s.active_comp().unwrap().layer(LayerId(lid)).unwrap().name, "My First Project", "the name follows the text");
+    }
+}
+
+/// Double-clicking a text layer in the Timeline, on its name or on its bar, edits its text in the
+/// Composition viewer with the whole text selected, as in After Effects (Enter renames).
+#[test]
+fn timeline_double_click_on_a_text_layer_edits_its_text() {
+    for target in ["row", "bar"] {
+        let mut s = Session::default();
+        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+        let lid = s.execute("layer.newText", json!({"text": "alpha beta"})).unwrap()["layer"].as_u64().unwrap();
+        let mut h = harness(EffectcraftApp::new(s));
+        h.state_mut().show_panel(PanelKind::Composition);
+        h.run_steps(3);
+        let p = rect(&h, &format!("timeline.layer.{lid}.{target}")).center();
+        click(&mut h, p, Modifiers::NONE);
+        click(&mut h, p, Modifiers::NONE);
+        let (layer, text, anchor, caret) = edited(&h);
+        assert_eq!(layer, lid, "{target}");
+        assert_eq!((anchor.min(caret), anchor.max(caret)), (0, 10), "everything selected ({target})");
+        assert!(h.state().auto.find(&format!("timeline.layer.{lid}.nameEdit")).is_none(), "no rename field ({target})");
+        assert_eq!(text, "alpha beta");
+        type_text(&mut h, "gamma");
+        key(&mut h, Key::Escape, Modifiers::NONE);
+        assert!(h.state().session.state.text_edit.is_none(), "Escape commits ({target})");
+        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "gamma", "typing replaced the text ({target})");
+    }
+}
+
+#[test]
+fn duplicated_text_boxes_both_remain_editable() {
+    let mut a = app();
+    let original = a
+        .session
+        .execute("layer.newText", json!({"text": "alpha beta", "size": 40, "position": [40, 100], "justify": "left", "box": [40, 60, 250, 100]}))
+        .unwrap()["layer"]
+        .as_u64()
+        .unwrap();
+    let mut h = harness(a);
+    h.run_steps(3);
+    h.state_mut().ui.focused = PanelKind::Composition;
+    key(&mut h, Key::D, Modifiers::COMMAND);
+    let duplicate = h.state().session.state.selected_layers[0].0;
+    assert_ne!(original, duplicate);
+    h.state_mut().session.execute("prop.set", json!({"layer": duplicate, "path": "transform/position", "value": [465, 110]})).unwrap();
+    h.run_steps(3);
+    for (layer, x, text) in [(original, 80.0, "original edited"), (duplicate, 380.0, "duplicate edited")] {
+        h.run_steps(40);
+        let comp = rect(&h, "viewer.comp");
+        let k = comp.width() / 640.0;
+        let p = comp.min + egui::vec2(x * k, 85.0 * k);
+        click(&mut h, p, Modifiers::NONE);
+        click(&mut h, p, Modifiers::NONE);
+        assert_eq!(edited(&h).0, layer);
+        type_text(&mut h, text);
+        key(&mut h, Key::Escape, Modifiers::NONE);
+        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, text);
+    }
+}
+
+#[test]
+fn overlapping_duplicate_text_remains_editable_by_double_click_and_selected_type_tool() {
+    let mut a = app();
+    let original = a.session.execute("layer.newText", json!({"text": "alpha beta", "size": 40, "box": [40, 60, 250, 100]})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = harness(a);
+    h.run_steps(3);
+    h.state_mut().ui.focused = PanelKind::Composition;
+    key(&mut h, Key::D, Modifiers::COMMAND);
+    let duplicate = h.state().session.state.selected_layers[0].0;
+    assert_ne!(original, duplicate);
+    let comp = rect(&h, "viewer.comp");
+    let p = comp.min + egui::vec2(80.0, 85.0) * (comp.width() / 640.0);
+    click(&mut h, p, Modifiers::NONE);
+    click(&mut h, p, Modifiers::NONE);
+    assert_eq!(edited(&h).0, duplicate, "double-click edits the topmost overlapping copy");
+    type_text(&mut h, "copy edited");
+    assert_eq!(edited(&h).1, "copy edited");
+    key(&mut h, Key::Z, Modifiers::COMMAND);
+    assert_eq!(edited(&h).1, "alpha beta", "undo restores the duplicate's text");
+    key(&mut h, Key::Escape, Modifiers::NONE);
+    h.state_mut().session.execute("layer.select", json!({"layers": [original]})).unwrap();
+    h.state_mut().ui.focused = PanelKind::Composition;
+    key(&mut h, Key::T, Modifiers::COMMAND);
+    h.run_steps(40);
+    click(&mut h, p, Modifiers::NONE);
+    assert_eq!(edited(&h).0, original, "the Type tool must honor the explicitly selected overlapping text layer");
+    key(&mut h, Key::A, Modifiers::COMMAND);
+    type_text(&mut h, "original edited");
+    assert_eq!(edited(&h).1, "original edited");
+    assert_eq!(layer_doc(&h.state().session, LayerId(duplicate)).unwrap().text, "alpha beta", "editing the original leaves the duplicate unchanged");
+    key(&mut h, Key::Z, Modifiers::COMMAND);
+    assert_eq!(edited(&h).1, "alpha beta");
+}
+
+#[test]
+fn type_tool_selected_text_preference_skips_ineligible_layers_and_falls_back_to_topmost() {
+    for exclusion in ["hidden", "locked", "inactive", "unsoloed", "outside", "unselected"] {
+        let mut a = app();
+        let mut ids = vec![];
+        for _ in 0..2 {
+            ids.push(
+                a.session.execute("layer.newText", json!({"text": "alpha beta", "size": 40, "box": [40, 60, 250, 100]})).unwrap()["layer"].as_u64().unwrap(),
+            );
+        }
+        let original = ids[0];
+        let topmost = ids[1];
+        match exclusion {
+            "hidden" | "locked" => {
+                let switch = if exclusion == "hidden" { "video" } else { "locked" };
+                a.session.execute("layer.setSwitch", json!({"layers": [original], "switch": switch, "value": exclusion == "locked"})).unwrap();
+            }
+            "inactive" => {
+                let cid = a.session.active_comp_id().unwrap();
+                std::sync::Arc::make_mut(&mut a.session.project).comp_mut(cid).unwrap().layer_mut(LayerId(original)).unwrap().out_point =
+                    effectcraft_engine::time::Tick::ZERO;
+            }
+            "unsoloed" => {
+                a.session.execute("layer.setSwitch", json!({"layers": [topmost], "switch": "solo", "value": true})).unwrap();
+            }
+            "outside" => {
+                a.session.execute("prop.set", json!({"layer": original, "path": "transform/position", "value": [500, 300]})).unwrap();
+            }
+            _ => {}
+        }
+        a.session.state.selected_layers = if exclusion == "unselected" { vec![] } else { vec![LayerId(original)] };
+        a.ui.tool = effectcraft_ui_egui::state::Tool::Type;
+        let mut h = harness(a);
+        h.run_steps(3);
+        let comp = rect(&h, "viewer.comp");
+        let p = comp.min + egui::vec2(80.0, 85.0) * (comp.width() / 640.0);
+        click(&mut h, p, Modifiers::NONE);
+        assert_eq!(edited(&h).0, topmost, "{exclusion} selected text must not override the eligible hit");
+    }
+}
+
+/// Opens a fresh Type-tool edit holding `text` and returns the harness with the new layer id,
+/// so the Deselect All tests start from the same state.
+fn type_tool_edit(a: EffectcraftApp, text: &str) -> (Harness<'static, EffectcraftApp>, u64) {
+    let mut h = harness(a);
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let comp = rect(&h, "viewer.comp");
+    let p = comp.min + egui::vec2(180.0, 160.0) * (comp.width() / 640.0);
+    click(&mut h, p, Modifiers::NONE);
+    type_text(&mut h, text);
+    let (lid, _, _, _) = edited(&h);
+    (h, lid)
+}
+
+#[test]
+fn deselect_all_chords_end_a_type_tool_edit() {
+    for (name, k, mods) in [("Cmd/Ctrl+Shift+A", Key::A, Modifiers { shift: true, ..Modifiers::COMMAND }), ("F2", Key::F2, Modifiers::NONE)] {
+        let (mut h, lid) = type_tool_edit(app(), "Hello");
+        let (_, text, _, _) = edited(&h);
+        assert_eq!(text, "Hello", "{name}: the Type tool click and typing made a layer");
+        key(&mut h, k, mods);
+        assert!(h.state().session.state.text_edit.is_none(), "{name}: Deselect All ends the edit");
+        assert!(h.state().session.state.selected_layers.is_empty(), "{name}: and deselects the layer");
+        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Hello", "{name}: the typed text is kept");
+    }
+}
+
+#[test]
+fn cmd_a_in_a_text_edit_still_selects_all_characters() {
+    let (mut h, _lid) = type_tool_edit(app(), "Hello");
+    key(&mut h, Key::A, Modifiers::COMMAND);
+    let (_, _, a, c) = edited(&h);
+    assert_eq!((a, c), (0, 5), "Select All keeps selecting every character");
+    assert!(h.state().session.state.text_edit.is_some(), "the edit stays open");
+    assert_eq!(h.state().session.state.selected_layers.len(), 1, "and the layer stays selected");
+}
+
+#[test]
+fn rebound_deselect_all_chord_forwards_from_inside_the_edit() {
+    let mut a = app();
+    a.session.execute("shortcuts.set", json!({"command": "edit.deselectAll", "keys": ["Cmd+Alt+D"]})).unwrap();
+    let (mut h, lid) = type_tool_edit(a, "Hello");
+    // The chord belongs to the shortcut, not to a hard-coded key: the old defaults do
+    // nothing special while the editor holds the keyboard…
+    key(&mut h, Key::A, Modifiers { shift: true, ..Modifiers::COMMAND });
+    assert!(h.state().session.state.text_edit.is_some(), "Cmd+Shift+A was rebound away");
+    let (_, _, a, c) = edited(&h);
+    assert_eq!((a, c), (5, 5), "and Cmd+Shift+A no longer selects all characters either");
+    key(&mut h, Key::F2, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_some(), "nor does F2");
+    // …and the current binding is what ends the edit.
+    key(&mut h, Key::D, Modifiers { alt: true, ..Modifiers::COMMAND });
+    assert!(h.state().session.state.text_edit.is_none(), "the rebound chord ends the edit");
+    assert!(h.state().session.state.selected_layers.is_empty(), "and deselects");
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Hello", "the text is kept");
+}
+
+#[test]
+fn deselect_all_rebound_onto_an_alt_variant_of_an_editor_chord_forwards() {
+    let alt_cmd = |k| (k, Modifiers { alt: true, ..Modifiers::COMMAND });
+    for (bound, (k, mods)) in [("Cmd+Alt+Z", alt_cmd(Key::Z)), ("Cmd+Alt+A", alt_cmd(Key::A))] {
+        let mut a = app();
+        a.session.execute("shortcuts.set", json!({"command": "edit.deselectAll", "keys": [bound]})).unwrap();
+        let (mut h, lid) = type_tool_edit(a, "Hello");
+        // The editor owns Cmd+A and Cmd+Z themselves, whatever Deselect All is bound to…
+        key(&mut h, Key::A, Modifiers::COMMAND);
+        let (_, _, a0, c0) = edited(&h);
+        assert_eq!((a0, c0), (0, 5), "{bound}: Cmd+A still selects every character");
+        type_text(&mut h, "Hi");
+        key(&mut h, Key::Z, Modifiers::COMMAND);
+        assert_eq!(edited(&h).1, "Hello", "{bound}: Cmd+Z still undoes the typing");
+        // …but not their Alt variants, which belong to the rebound Deselect All.
+        key(&mut h, k, mods);
+        assert!(h.state().session.state.text_edit.is_none(), "{bound}: the rebound chord ends the edit");
+        assert!(h.state().session.state.selected_layers.is_empty(), "{bound}: and deselects");
+        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Hello", "{bound}: without undoing or selecting text");
+    }
+}
+
+#[test]
+fn bare_letter_rebinding_stays_typing_but_a_function_key_rebinding_forwards() {
+    let mut a = app();
+    a.session.execute("shortcuts.set", json!({"command": "edit.deselectAll", "keys": ["A"]})).unwrap();
+    let (mut h, lid) = type_tool_edit(a, "Hello");
+    // A binding without a command modifier is text as far as the editor is concerned: the
+    // keystroke belongs to the text, since a command may not steal a key that types
+    // (the app-wide dispatcher honors the same invariant by skipping focused text fields).
+    key(&mut h, Key::A, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_some(), "a bare-letter Deselect All binding does not end the edit");
+    type_text(&mut h, "a");
+    let (lid2, _, a0, c0) = edited(&h);
+    assert_eq!(lid2, lid, "the same edit on the same layer continues");
+    assert_eq!((a0, c0), (6, 6), "the letter typed at the caret");
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Helloa", "and landed in the text");
+    // A function key types nothing, so a modifier-free function-key binding is forwarded
+    // (the default F2 relies on this).
+    h.state_mut().session.execute("shortcuts.set", json!({"command": "edit.deselectAll", "keys": ["F7"]})).unwrap();
+    key(&mut h, Key::F7, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_none(), "a bare function-key binding ends the edit");
+    assert!(h.state().session.state.selected_layers.is_empty(), "and deselects");
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Helloa", "the text is kept");
+}
+
+/// Opens a text edit the way a user does from the Project panel — Layer ▸ New ▸ Text's shortcut
+/// while that panel is focused — so the insertion point lives in the comp while focus stays on
+/// Project. Returns the harness and the new layer id.
+fn project_focused_text_edit(text: &str) -> (Harness<'static, EffectcraftApp>, u64) {
+    let mut h = harness(app());
+    h.run_steps(3);
+    h.state_mut().ui.focused = PanelKind::Project;
+    h.run_steps(1);
+    key(&mut h, Key::T, Modifiers { alt: true, shift: true, ..Modifiers::COMMAND });
+    type_text(&mut h, text);
+    let (lid, typed, _, _) = edited(&h);
+    assert_eq!(typed, text, "typing went into the new layer");
+    assert_eq!(h.state().ui.focused, PanelKind::Project, "the Project panel is still the focused panel");
+    (h, lid)
+}
+
+#[test]
+fn deselect_all_chords_end_an_edit_started_while_the_project_panel_is_focused() {
+    for (name, k, mods) in [("Cmd/Ctrl+Shift+A", Key::A, Modifiers { shift: true, ..Modifiers::COMMAND }), ("F2", Key::F2, Modifiers::NONE)] {
+        let (mut h, lid) = project_focused_text_edit("Hi");
+        key(&mut h, k, mods);
+        assert!(h.state().session.state.text_edit.is_none(), "{name}: Deselect All ends the edit");
+        assert!(h.state().session.state.selected_layers.is_empty(), "{name}: and deselects the layer");
+        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "Hi", "{name}: the typed text is kept");
+    }
+}
+
+#[test]
+fn deselect_all_menu_item_follows_the_edit_while_the_project_panel_is_focused() {
+    let enabled = |h: &Harness<'_, EffectcraftApp>| {
+        effectcraft_ui_egui::menus::menu_items(h.state()).into_iter().find(|m| m.id == "edit.deselectAll").is_some_and(|m| m.enabled)
+    };
+    let (mut h, _) = project_focused_text_edit("Hi");
+    h.state_mut().session.execute("project.select", json!({"items": []})).unwrap();
+    h.run_steps(1);
+    assert!(h.state().session.state.text_edit.is_some(), "the edit is still open");
+    // The item ends the edit, so an empty Project selection must not gray it out.
+    assert!(enabled(&h), "Deselect All is enabled during the edit");
+    key(&mut h, Key::Escape, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_none(), "Escape ended the edit");
+    assert_eq!(h.state().ui.focused, PanelKind::Project, "the Project panel is still the focused panel");
+    // With no edit, the item deselects Project items again: nothing selected there, nothing to do.
+    assert!(!enabled(&h), "Deselect All follows the empty Project selection once the edit is over");
+}
+
+/// The on-canvas editor's outgoing IME producer: the descriptor carries the edited layer's
+/// committed text, the real owner, a stable generation and an explicit change cause. A normal
+/// typed character is application work; an accepted input-method commit is not.
+#[test]
+fn ime_producer_follows_the_committed_text_and_cause() {
+    // A Latin accent is multi-byte in UTF-8 (the byte offsets below) and Inter draws it, so the
+    // harness keeps its strict missing-glyph check; no CJK fallback face is needed headlessly.
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| app());
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(1);
+    let comp = rect(&h, "viewer.comp");
+    click(&mut h, comp.center(), Modifiers::NONE);
+    type_text(&mut h, "Hi");
+    let (lid, text, a, c) = edited(&h);
+    assert_eq!((text.as_str(), a, c), ("Hi", 2, 2));
+
+    let ime = h.output().platform_output.ime.clone().expect("the on-canvas editor owns IME");
+    let comp_id = h.state().session.active_comp_id().expect("an active comp").0;
+    assert_eq!(ime.owner, egui::Id::unique(("effectcraft-ime-text", comp_id, lid)), "the edited comp and layer");
+    assert!(ime.context_generation > 0);
+    let p = ime.surrounding_text.available().expect("committed text is available");
+    assert_eq!((p.text.as_str(), p.cursor, p.anchor), ("Hi", 2, 2));
+    assert_eq!(ime.change_cause, egui::ImeChangeCause::Other, "ordinary typing is application work");
+    let generation = ime.context_generation;
+
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "Hié");
+    let ime = h.output().platform_output.ime.clone().expect("still editing");
+    let p = ime.surrounding_text.available().expect("committed text is available");
+    assert_eq!((p.text.as_str(), p.cursor, p.anchor), ("Hié", 4, 4), "UTF-8 bytes after the commit");
+    assert_eq!(ime.change_cause, egui::ImeChangeCause::InputMethod, "an accepted IME commit earns it");
+    assert_eq!(ime.context_generation, generation, "an ordinary edit keeps one context");
+}
+
+/// A click on the Timeline is processed after the viewer overlay drew. The pass must not leave
+/// the ended on-canvas editor's old descriptor in the platform output.
+#[test]
+fn click_away_clears_the_canvas_ime_descriptor_in_the_final_pass() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    let title = s.execute("layer.newText", json!({"text": "Title", "size": 80, "position": [100, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": title, "caret": 5})).unwrap();
+    h.run_steps(2);
+    assert!(h.output().platform_output.ime.is_some(), "the editor owns IME before the click");
+    let row = rect(&h, &format!("timeline.layer.{solid}.row")).center();
+    click(&mut h, row, Modifiers::NONE);
+    assert!(h.state().session.state.text_edit.is_none(), "the click ends the edit");
+    assert!(h.output().platform_output.ime.is_none(), "the final pass clears the ended editor's descriptor");
+}
+
+/// A new target on the same focused widget must request a composition interrupt, and a delayed
+/// commit carrying the previous composition's preview must not reach the new layer.
+#[test]
+fn switching_text_targets_interrupts_and_rejects_a_delayed_commit() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    // The delayed commit carries a multi-byte accent Inter draws: no broad missing-glyph
+    // allowance, and the stale-composition path is still exercised with real IME events.
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    h.run_steps(1);
+    let comp_id = h.state().session.active_comp_id().expect("comp").0;
+    let ime = h.output().platform_output.ime.clone().expect("the second editor owns IME");
+    assert_eq!(ime.owner, egui::Id::unique(("effectcraft-ime-text", comp_id, second)));
+    assert!(ime.should_interrupt_composition, "the session switch cancels the platform composition");
+
+    // The delayed batch may update the old composition before it commits. That preview must not
+    // re-arm the stale guard for the new layer.
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the stale commit is ignored");
+}
+
+/// A stale pre-edit must not re-arm the guard for a following delete-surrounding/commit batch
+/// either: deleting around the new layer's caret would otherwise mutate it without a commit.
+#[test]
+fn a_delayed_preedit_after_a_target_switch_cannot_rearm_the_stale_guard() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    h.run_steps(1);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("X".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the stale pre-edit cannot re-arm a delete/commit batch");
+}
+
+/// A late pre-edit from the old composition can arrive long after the target switch; timing is
+/// not provenance. Protection survives idle frames and old terminals until the matching fence.
+#[test]
+fn late_preedit_and_commit_split_across_idle_frames_cannot_retarget() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    // Well past the old two-frame suppression window: ownership, not elapsed frames, keeps the
+    // tombstone.
+    h.run_steps(1);
+    let request_id = ime_reset_request(&h);
+    h.run_steps(4);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "éé".into(), active_range_chars: None }));
+    h.run_steps(3);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the late pre-edit and commit stayed on the old owner");
+
+    // An actual matching fence admits the fresh composition, without an invented old terminal.
+    h.input_mut().events.push(Event::ImeResetCompleted { request_id });
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "Bé", "a new composition after its matching fence is accepted");
+}
+
+/// A delete-surrounding event belongs to the same stale composition as its late pre-edit even
+/// when idle frames separate them. It must not mutate the replacement layer; only F admits fresh
+/// input, including when no old terminal commit arrives.
+#[test]
+fn late_preedit_and_delete_split_across_idle_frames_cannot_retarget() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    h.run_steps(1);
+    let request_id = ime_reset_request(&h);
+    h.run_steps(3);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "éé".into(), active_range_chars: None }));
+    h.run_steps(3);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 }));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the late delete could not mutate the new owner");
+
+    h.input_mut().events.push(Event::ImeResetCompleted { request_id });
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "Bé", "the matching fence admits fresh input");
+}
+
+/// An observed empty pre-edit only ends the visible composition; its terminal commit is a
+/// separate event. Switching targets in between must keep the old owner so that delayed commit is
+/// rejected instead of landing at the replacement layer's caret.
+#[test]
+fn empty_preedit_keeps_the_old_target_until_the_pending_commit_arrives() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    // The input method clears the visible composition before its commit arrives.
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
+    h.run_steps(1);
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    h.run_steps(1);
+
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("X".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the observed empty pre-edit preserved the old owner for its pending commit",);
+}
+
+/// A coalesced raw batch after a target switch may carry the old composition's empty pre-edit and
+/// terminal commit followed by a fence and the first pre-edit of a new composition. Only that
+/// explicit boundary admits the new pre-edit for the current target.
+#[test]
+fn a_matching_fence_after_old_terminals_admits_the_next_preedit_in_the_same_batch() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let first = s.execute("layer.newText", json!({"text": "A", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let second = s.execute("layer.newText", json!({"text": "B", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": first, "caret": 1})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+
+    h.state_mut().session.execute("text.edit", json!({"layer": second, "caret": 1})).unwrap();
+    h.run_steps(1);
+    let request_id = ime_reset_request(&h);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("X".into())));
+    h.input_mut().events.push(Event::ImeResetCompleted { request_id });
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "B", "the stale empty pre-edit/commit pair never mutates the new layer",);
+
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("é".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(first)).unwrap().text, "A");
+    assert_eq!(layer_doc(&h.state().session, LayerId(second)).unwrap().text, "Bé", "the new pre-edit after the matching fence owns the current target",);
+}
+
+/// The byte-count delete-surrounding path through the real app/hook keeps a whole UTF-8
+/// character and shares the following commit's undo step.
+#[test]
+fn delete_surrounding_bytes_through_the_app_replaces_the_emoji() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let lid = s.execute("layer.newText", json!({"text": "café😀", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": lid, "caret": 5})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 4, after_bytes: 0 }));
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("X".into())));
+    h.run_steps(2);
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "caféX");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "café😀", "the delete and commit are one undo step");
+}
+
+/// Use the real viewer's outgoing caret geometry to aim the interruption at a known position.
+fn ime_interruption_editor() -> (Harness<'static, EffectcraftApp>, Pos2) {
+    crate::add_canonical_test_fonts();
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
+    let lid = s.execute("layer.newText", json!({"text": "abcd", "size": 80, "position": [80, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |cc| {
+        EffectcraftApp::install_ime_reset_hooks(&cc.egui_ctx);
+        EffectcraftApp::new(s)
+    });
+    h.state_mut().show_panel(PanelKind::Composition);
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
+    h.run_steps(3);
+    h.state_mut().session.execute("text.edit", json!({"layer": lid, "caret": 1})).unwrap();
+    h.run_steps(2);
+    let point = h.output().platform_output.ime.as_ref().expect("the viewer drew caret1").cursor_rect.center();
+    assert!(rect(&h, "viewer.textEdit").contains(point), "the pointer must hit the actual edited text");
+    h.state_mut().session.execute("text.setSelection", json!({"caret": 4})).unwrap();
+    h.run_steps(2);
+    assert_eq!((edited(&h).2, edited(&h).3), (4, 4));
+    (h, point)
+}
+
+/// Real viewer geometry and raw eframe input, without the split-frame `click` helper.
+fn native_text_pointer_editor() -> (Harness<'static, EffectcraftApp>, u64, Pos2, Pos2) {
+    let (h, caret1) = ime_interruption_editor();
+    let caret4 = h.output().platform_output.ime.as_ref().expect("the viewer drew caret4").cursor_rect.center();
+    let area = rect(&h, "viewer.area");
+    assert!(caret1.is_finite() && caret4.is_finite());
+    assert!(area.contains(caret1) && area.contains(caret4));
+    assert!(rect(&h, "viewer.textEdit").contains(caret4));
+    assert!(caret1.distance(caret4) > 12.0, "separated clicks must not become a double-click");
+    let layer = edited(&h).0;
+    (h, layer, caret1, caret4)
+}
+
+#[test]
+fn native_text_pointer_same_batch_click_moves_caret_and_starts_editing() {
+    for active in [true, false] {
+        let (mut h, layer, caret1, caret4) = native_text_pointer_editor();
+        if !active {
+            h.state_mut().session.execute("text.endEdit", json!({})).unwrap();
+            h.run_steps(2);
+            assert!(h.state().session.state.text_edit.is_none());
+        }
+        let undo = h.state().session.history.undo.len();
+        h.input_mut().events.extend([
+            Event::PointerMoved(caret1),
+            Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+            Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        ]);
+        h.run_steps(1);
+        assert_eq!(edited(&h), (layer, "abcd".to_owned(), 1, 1), "active={active}");
+        assert!(!h.ctx.input(|i| i.pointer.primary_down()));
+        assert_eq!(h.state().session.history.undo.len(), undo, "placing a caret is not a document edit");
+        h.input_mut().events.push(Event::PointerMoved(caret4));
+        h.run_steps(1);
+        assert_eq!((edited(&h).2, edited(&h).3), (1, 1), "release must end selection dragging");
+        type_text(&mut h, "X");
+        assert_eq!(edited(&h), (layer, "aXbcd".to_owned(), 2, 2), "active={active}");
+    }
+}
+
+#[test]
+fn native_text_pointer_split_press_drag_release_keeps_ownership() {
+    for dragging in [false, true] {
+        let (mut h, layer, caret1, caret4) = native_text_pointer_editor();
+        h.input_mut().events.extend([
+            Event::PointerMoved(caret1),
+            Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        ]);
+        h.run_steps(1);
+        assert_eq!(edited(&h), (layer, "abcd".to_owned(), 1, 1));
+        assert!(h.ctx.input(|i| i.pointer.primary_down()));
+        let end = if dragging { caret4 } else { caret1 };
+        if dragging {
+            h.input_mut().events.push(Event::PointerMoved(end));
+            h.run_steps(1);
+            assert_eq!((edited(&h).2, edited(&h).3), (1, 4));
+        }
+        h.input_mut().events.push(Event::PointerButton { pos: end, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+        let expected = if dragging { (1, 4) } else { (1, 1) };
+        assert!(!h.ctx.input(|i| i.pointer.primary_down()));
+        assert_eq!((edited(&h).2, edited(&h).3), expected);
+        h.input_mut().events.push(Event::PointerMoved(if dragging { caret1 } else { caret4 }));
+        h.run_steps(1);
+        assert_eq!((edited(&h).2, edited(&h).3), expected, "a released drag must not follow later movement");
+        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, "abcd");
+    }
+}
+
+#[test]
+fn native_text_pointer_two_completed_primary_clicks_use_the_latest_primary_press() {
+    let (mut h, layer, caret1, caret4) = native_text_pointer_editor();
+    h.input_mut().events.extend([
+        Event::PointerMoved(caret4),
+        Event::PointerButton { pos: caret4, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: caret4, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        Event::PointerMoved(caret1),
+        Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        // A later non-primary click must not become the recovered primary origin.
+        Event::PointerMoved(caret4),
+        Event::PointerButton { pos: caret4, button: PointerButton::Middle, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: caret4, button: PointerButton::Middle, pressed: false, modifiers: Modifiers::NONE },
+    ]);
+    h.run_steps(1);
+    assert!(h.ctx.input(|i| i.pointer.primary_pressed() && i.pointer.primary_released() && i.pointer.press_origin().is_none()));
+    assert!(!h.ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary) || i.pointer.button_triple_clicked(PointerButton::Primary)));
+    assert_eq!(edited(&h), (layer, "abcd".to_owned(), 1, 1), "the first click must not replace the latest click");
+}
+
+#[test]
+fn native_text_pointer_nonfinite_latest_press_does_not_replay_an_earlier_click() {
+    for (earlier_finite_click, same_frame_release) in [(false, false), (false, true), (true, false), (true, true)] {
+        let (mut h, layer, caret1, caret4) = native_text_pointer_editor();
+        let undo = h.state().session.history.undo.len();
+        if earlier_finite_click {
+            h.input_mut().events.extend([
+                Event::PointerMoved(caret1),
+                Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+                Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+            ]);
+        }
+        let bad = egui::pos2(f32::INFINITY, caret4.y);
+        h.input_mut().events.extend([
+            Event::PointerButton { pos: bad, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+            Event::PointerMoved(caret1),
+        ]);
+        if same_frame_release {
+            h.input_mut().events.push(Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+        }
+        h.run_steps(1);
+        assert_eq!(edited(&h), (layer, "abcd".to_owned(), 4, 4), "earlier_finite_click={earlier_finite_click}");
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        if !same_frame_release {
+            assert!(h.ctx.input(|i| i.pointer.primary_down()));
+            h.input_mut().events.push(Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+            h.run_steps(1);
+            assert_eq!(edited(&h), (layer, "abcd".to_owned(), 4, 4), "later release cannot retarget an invalid press");
+            assert_eq!(h.state().session.history.undo.len(), undo);
+        }
+        assert!(!h.ctx.input(|i| i.pointer.primary_down()));
+    }
+}
+
+#[test]
+fn native_text_pointer_outside_area_origin_cannot_retarget_on_inside_release() {
+    for active in [true, false] {
+        let (mut h, layer, caret1, _) = native_text_pointer_editor();
+        if !active {
+            h.state_mut().session.execute("text.endEdit", json!({})).unwrap();
+            h.run_steps(2);
+        }
+        let area = rect(&h, "viewer.area");
+        let outside = area.min - egui::vec2(8.0, 8.0);
+        assert!(outside.is_finite() && !area.contains(outside));
+        assert!(outside.x >= 0.0 && outside.y >= 0.0, "use an actual window location outside the viewer");
+        let layers = h.state().session.active_comp().unwrap().layers.len();
+        let undo = h.state().session.history.undo.len();
+        h.input_mut().events.extend([
+            Event::PointerMoved(outside),
+            Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+            Event::PointerMoved(caret1),
+            Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        ]);
+        h.run_steps(1);
+        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, "abcd");
+        assert_eq!(h.state().session.active_comp().unwrap().layers.len(), layers, "outside origins must not create text in the viewer");
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        if active {
+            // A real outside-panel action may close the edit; it must never retarget it.
+            if h.state().session.state.text_edit.is_some() {
+                assert_eq!(edited(&h), (layer, "abcd".to_owned(), 4, 4));
+            }
+        } else {
+            assert!(h.state().session.state.text_edit.is_none(), "release inside is not an inside-origin click");
+        }
+    }
+}
+
+#[test]
+fn native_text_pointer_completed_outside_panel_click_closes_the_editor() {
+    for (panel, target) in [(PanelKind::Timeline, "timeline.empty"), (PanelKind::Project, "project.empty")] {
+        let (mut h, layer, _, _) = native_text_pointer_editor();
+        h.state_mut().show_panel(panel);
+        h.run_steps(3);
+        assert!(h.state().session.state.text_edit.is_some(), "opening a panel is not a pointer click");
+        let outside = rect(&h, target).center();
+        assert!(!rect(&h, "viewer.area").contains(outside));
+        h.input_mut().events.extend([
+            Event::PointerMoved(outside),
+            Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+            Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+        ]);
+        h.run_steps(1);
+        assert!(h.state().session.state.text_edit.is_none(), "a complete {panel:?} click must close the edit");
+        type_text(&mut h, "X");
+        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, "abcd", "typing after click-away must not reach the old editor");
+    }
+}
+
+#[test]
+fn native_text_pointer_secondary_click_does_not_move_the_caret() {
+    let (mut h, layer, caret1, _) = native_text_pointer_editor();
+    h.input_mut().events.extend([
+        Event::PointerMoved(caret1),
+        Event::PointerButton { pos: caret1, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: caret1, button: PointerButton::Secondary, pressed: false, modifiers: Modifiers::NONE },
+    ]);
+    h.run_steps(1);
+    assert!(!h.ctx.input(|i| i.pointer.primary_pressed()));
+    assert_eq!(edited(&h), (layer, "abcd".to_owned(), 4, 4));
+}
+
+#[test]
+fn native_text_pointer_modal_blocks_background_same_batch_click() {
+    let (mut h, layer, caret1, _) = native_text_pointer_editor();
+    h.state_mut().dialog = Some(effectcraft_ui_egui::Dialog::About);
+    h.run_steps(3);
+    h.input_mut().events.extend([
+        Event::PointerMoved(caret1),
+        Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::PointerButton { pos: caret1, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
+    ]);
+    h.run_steps(1);
+    assert_eq!(edited(&h), (layer, "abcd".to_owned(), 4, 4), "a disabled viewer must not recover a background click");
+}
+
+fn ime_interruption_delete(bytes: bool) -> Event {
+    Event::Ime(if bytes {
+        egui::ImeEvent::DeleteSurroundingBytes { before_bytes: 1, after_bytes: 0 }
+    } else {
+        egui::ImeEvent::DeleteSurrounding { before_chars: 1, after_chars: 0 }
+    })
+}
+
+fn begin_interrupted_composition(h: &mut Harness<'_, EffectcraftApp>, terminal_pending: bool) {
+    EffectcraftApp::install_ime_reset_hooks(&h.ctx);
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+    h.run_steps(1);
+    if terminal_pending {
+        h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
+        h.run_steps(1);
+    }
+    assert_eq!(edited(h).1, "abcd", "neither visible nor cleared preedit changes committed text");
+}
+
+fn request_at_caret(h: &mut Harness<'_, EffectcraftApp>, caret: usize) -> egui::ImeResetId {
+    h.state_mut().session.execute("text.setSelection", json!({"caret": caret})).unwrap();
+    h.run_steps(1);
+    ime_reset_request(h)
+}
+
+fn ime_reset_request(h: &Harness<'_, EffectcraftApp>) -> egui::ImeResetId {
+    h.output()
+        .platform_output
+        .ime
+        .as_ref()
+        .expect("the real viewer publishes its descriptor")
+        .reset_request
+        .expect("capture the final request before an unchanged idle pass consumes the one-shot output")
+}
+
+#[test]
+fn pointer_caret_interruption_rejects_same_batch_ime_delete_and_commit() {
+    for bytes in [false, true] {
+        for terminal_pending in [false, true] {
+            let (mut h, point) = ime_interruption_editor();
+            begin_interrupted_composition(&mut h, terminal_pending);
+            let project = h.state().session.project.clone();
+            let undo = h.state().session.history.undo.len();
+            h.input_mut().events.extend([
+                Event::PointerMoved(point),
+                Event::PointerButton { pos: point, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+                ime_interruption_delete(bytes),
+                Event::Ime(egui::ImeEvent::Commit("X".into())),
+            ]);
+            h.run_steps(1);
+            assert_eq!((edited(&h).1.as_str(), edited(&h).2, edited(&h).3), ("abcd", 1, 1), "the actual pointer caret survives stale IME mutations");
+            assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project), "rejected IME never edits the project");
+            assert_eq!(h.state().session.history.undo.len(), undo, "rejected input creates no undo entry");
+            let request_id = ime_reset_request(&h);
+            h.input_mut().events.push(Event::PointerButton { pos: point, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+            h.run_steps(1);
+            // The explicit native fence, not the rejected terminal, admits fresh composition.
+            h.input_mut().events.extend([
+                Event::ImeResetCompleted { request_id },
+                Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }),
+                Event::Ime(egui::ImeEvent::Commit("é".into())),
+            ]);
+            h.run_steps(1);
+            assert_eq!(edited(&h).1, "aébcd");
+            assert_eq!((edited(&h).2, edited(&h).3), (2, 2));
+            h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+            assert_eq!(edited(&h).1, "abcd", "only the fresh commit needs undo");
+        }
+    }
+}
+
+#[test]
+fn keyboard_caret_interruption_rejects_later_ime_events_and_keeps_fresh_preedit() {
+    for (key, modifiers, expected, fresh_text) in
+        [(Key::ArrowLeft, Modifiers::NONE, (3, 3), "abcéd"), (Key::Home, Modifiers::SHIFT, (4, 0), "é"), (Key::A, Modifiers::COMMAND, (0, 4), "é")]
+    {
+        for bytes in [false, true] {
+            let (mut h, _) = ime_interruption_editor();
+            begin_interrupted_composition(&mut h, false);
+            let project = h.state().session.project.clone();
+            let undo = h.state().session.history.undo.len();
+            h.input_mut().events.extend([
+                Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers },
+                ime_interruption_delete(bytes),
+                Event::Ime(egui::ImeEvent::Commit("X".into())),
+                Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }),
+            ]);
+            h.run_steps(1);
+            assert_eq!(edited(&h).1, "abcd", "the old deletion and commit are refused");
+            assert_eq!((edited(&h).2, edited(&h).3), expected, "the real key's selection survives");
+            assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
+            assert_eq!(h.state().session.history.undo.len(), undo);
+            let request_id = ime_reset_request(&h);
+            h.input_mut().events.extend([
+                Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers },
+                Event::ImeResetCompleted { request_id },
+                Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }),
+                Event::Ime(egui::ImeEvent::Commit("é".into())),
+            ]);
+            h.run_steps(1);
+            assert_eq!(edited(&h).1, fresh_text, "only the fresh preedit after the matching fence is accepted");
+            h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+            assert_eq!(edited(&h).1, "abcd");
+        }
+    }
+}
+
+#[test]
+fn external_caret_interruption_rejects_pending_composition_mutations() {
+    for bytes in [false, true] {
+        let (mut h, _) = ime_interruption_editor();
+        begin_interrupted_composition(&mut h, true);
+        let project = h.state().session.project.clone();
+        let undo = h.state().session.history.undo.len();
+        // This is the same production command exposed to control clients; no replacement epoch.
+        h.state_mut().session.execute("text.setSelection", json!({"caret": 1})).unwrap();
+        h.input_mut().events.extend([ime_interruption_delete(bytes), Event::Ime(egui::ImeEvent::Commit("X".into()))]);
+        h.run_steps(1);
+        assert_eq!((edited(&h).1.as_str(), edited(&h).2, edited(&h).3), ("abcd", 1, 1));
+        assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        let request_id = ime_reset_request(&h);
+        h.input_mut().events.extend([Event::ImeResetCompleted { request_id }, Event::Ime(egui::ImeEvent::Commit("Y".into()))]);
+        h.run_steps(1);
+        assert_eq!(edited(&h).1, "aYbcd", "a later direct commit without preedit is still accepted");
+    }
+}
+
+#[test]
+fn composing_ime_delete_then_commit_and_direct_commit_remain_valid() {
+    for bytes in [false, true] {
+        let (mut h, _) = ime_interruption_editor();
+        begin_interrupted_composition(&mut h, false);
+        let undo = h.state().session.history.undo.len();
+        h.input_mut().events.extend([ime_interruption_delete(bytes), Event::Ime(egui::ImeEvent::Commit("X".into()))]);
+        h.run_steps(1);
+        assert_eq!((edited(&h).1.as_str(), edited(&h).2, edited(&h).3), ("abcX", 4, 4), "the IME deletion's own caret movement must not reject its commit");
+        assert_eq!(h.state().session.history.undo.len(), undo + 1);
+        h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+        assert_eq!(edited(&h).1, "abcd", "accepted delete and commit remain one undo step");
+        h.run_steps(1);
+        h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("Y".into())));
+        h.run_steps(1);
+        assert_eq!(edited(&h).1, "abcdY", "noncomposing direct commit remains valid after undo");
+    }
+}
+
+#[test]
+fn a_noncomposing_direct_commit_can_follow_a_pointer_caret_change_in_the_same_batch() {
+    let (mut h, point) = ime_interruption_editor();
+    let undo = h.state().session.history.undo.len();
+    h.input_mut().events.extend([
+        Event::PointerMoved(point),
+        Event::PointerButton { pos: point, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::Ime(egui::ImeEvent::Commit("Y".into())),
+    ]);
+    h.run_steps(1);
+    assert_eq!((edited(&h).1.as_str(), edited(&h).2, edited(&h).3), ("aYbcd", 2, 2), "only an interrupted composition is rejected");
+    assert_eq!(h.state().session.history.undo.len(), undo + 1);
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(edited(&h).1, "abcd");
+}
+
+fn draws_ime_preview(h: &Harness<'_, EffectcraftApp>) -> bool {
+    fn contains_preview(shape: &egui::Shape) -> bool {
+        match shape {
+            egui::Shape::Text(text) => text.galley.text() == "é",
+            egui::Shape::Vec(shapes) => shapes.iter().any(contains_preview),
+            _ => false,
+        }
+    }
+    h.output().shapes.iter().any(|shape| contains_preview(&shape.shape))
+}
+
+fn replacement_ime_edit(h: &mut Harness<'_, EffectcraftApp>) -> u64 {
+    let replacement =
+        h.state_mut().session.execute("layer.newText", json!({"text": "wxyz", "size": 80, "position": [80, 240], "justify": "left"})).unwrap()["layer"]
+            .as_u64()
+            .unwrap();
+    h.state_mut().session.execute("text.edit", json!({"layer": replacement, "caret": 1})).unwrap();
+    h.run_steps(1);
+    assert_eq!(edited(h), (replacement, "wxyz".to_owned(), 1, 1), "the replacement editor must be live before late IME arrives");
+    let comp = h.state().session.active_comp_id().unwrap().0;
+    let ime = h.output().platform_output.ime.as_ref().expect("the real replacement editor publishes IME");
+    assert_eq!(ime.owner, egui::Id::unique(("effectcraft-ime-text", comp, replacement)));
+    assert!(!draws_ime_preview(h), "the old preview must not be drawn on the replacement");
+    replacement
+}
+
+#[test]
+fn deselect_all_during_composition_rejects_late_ime_on_a_live_replacement_session() {
+    for rebound in [false, true] {
+        for bytes in [false, true] {
+            for terminal_pending in [false, true] {
+                let (mut h, _) = ime_interruption_editor();
+                let (chord, modifiers) = if rebound {
+                    h.state_mut().session.execute("shortcuts.set", json!({"command": "edit.deselectAll", "keys": ["Cmd+Alt+Z"]})).unwrap();
+                    (Key::Z, Modifiers { alt: true, ..Modifiers::COMMAND })
+                } else {
+                    (Key::A, Modifiers { shift: true, ..Modifiers::COMMAND })
+                };
+                let original = edited(&h).0;
+                let old_session = h.state().session.state.text_edit.as_ref().unwrap().session;
+                h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }));
+                h.run_steps(1);
+                assert!(draws_ime_preview(&h), "a real active composition must draw before interruption");
+                if terminal_pending {
+                    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }));
+                    h.run_steps(1);
+                    assert!(!draws_ime_preview(&h), "empty preedit hides the preview but leaves the terminal pending");
+                }
+                key(&mut h, chord, modifiers);
+                assert!(h.state().session.state.text_edit.is_none(), "the actual current shortcut ends the old edit");
+                assert!(h.state().session.state.selected_layers.is_empty());
+                assert!(h.output().platform_output.ime.is_none(), "the ended editor must not publish a descriptor");
+                assert!(!draws_ime_preview(&h), "Deselect All clears the old preview");
+                assert_eq!(layer_doc(&h.state().session, LayerId(original)).unwrap().text, "abcd");
+
+                let replacement = replacement_ime_edit(&mut h);
+                let request_id = ime_reset_request(&h);
+                assert_ne!(replacement, original);
+                assert_ne!(h.state().session.state.text_edit.as_ref().unwrap().session, old_session);
+                let project = h.state().session.project.clone();
+                let history = (h.state().session.history.undo.len(), h.state().session.history.redo.len());
+                let selection = h.state().session.state.selected_layers.clone();
+                h.input_mut().events.extend([ime_interruption_delete(bytes), Event::Ime(egui::ImeEvent::Commit("X".into()))]);
+                h.run_steps(1);
+                assert_eq!(edited(&h), (replacement, "wxyz".to_owned(), 1, 1), "late delete and commit must reach the live replacement and be rejected");
+                assert_eq!(h.state().session.state.selected_layers, selection);
+                assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project), "rejected IME never edits either layer");
+                assert_eq!((h.state().session.history.undo.len(), h.state().session.history.redo.len()), history);
+                assert_eq!(layer_doc(&h.state().session, LayerId(original)).unwrap().text, "abcd");
+
+                h.input_mut().events.extend([
+                    Event::ImeResetCompleted { request_id },
+                    Event::Ime(egui::ImeEvent::Preedit { text: "é".into(), active_range_chars: None }),
+                    Event::Ime(egui::ImeEvent::Commit("é".into())),
+                ]);
+                h.run_steps(1);
+                assert_eq!(edited(&h), (replacement, "wéxyz".to_owned(), 2, 2), "a fresh composition still commits after rejecting the old terminal");
+                assert_eq!(h.state().session.history.undo.len(), history.0 + 1);
+                h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+                assert_eq!(edited(&h).1, "wxyz", "only the fresh commit needs undo");
+            }
+        }
+    }
+}
+
+#[test]
+fn deselect_all_without_composition_keeps_a_replacement_direct_commit_valid() {
+    let (mut h, _) = ime_interruption_editor();
+    let original = edited(&h).0;
+    key(&mut h, Key::A, Modifiers { shift: true, ..Modifiers::COMMAND });
+    assert!(h.state().session.state.text_edit.is_none());
+    assert!(h.output().platform_output.ime.is_none());
+    let replacement = replacement_ime_edit(&mut h);
+    let undo = h.state().session.history.undo.len();
+    h.input_mut().events.push(Event::Ime(egui::ImeEvent::Commit("Y".into())));
+    h.run_steps(1);
+    assert_eq!(edited(&h), (replacement, "wYxyz".to_owned(), 2, 2), "a new editor without an interrupted composition accepts a direct commit");
+    assert_eq!(h.state().session.history.undo.len(), undo + 1);
+    assert_eq!(layer_doc(&h.state().session, LayerId(original)).unwrap().text, "abcd");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(edited(&h).1, "wxyz");
+}
+
+fn fresh_ime(text: &str) -> [Event; 2] {
+    [Event::Ime(egui::ImeEvent::Preedit { text: text.into(), active_range_chars: None }), Event::Ime(egui::ImeEvent::Commit(text.into()))]
+}
+
+#[test]
+fn request_fence_alone_admits_the_first_fresh_ime_in_same_or_next_batch() {
+    for terminal_pending in [false, true] {
+        for next_batch in [false, true] {
+            let (mut h, _) = ime_interruption_editor();
+            begin_interrupted_composition(&mut h, terminal_pending);
+            let request_id = request_at_caret(&mut h, 1);
+            h.input_mut().events.push(Event::ImeResetCompleted { request_id });
+            if next_batch {
+                h.run_steps(1);
+            }
+            h.input_mut().events.extend(fresh_ime("が"));
+            h.run_steps(1);
+            assert_eq!((edited(&h).1.as_str(), edited(&h).2, edited(&h).3), ("aがbcd", 2, 2));
+            assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none(), "completion does not allocate another request");
+            h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+            assert_eq!(edited(&h).1, "abcd");
+        }
+    }
+}
+
+#[test]
+fn newest_opaque_fence_rejects_stale_foreign_duplicate_and_no_ack_payloads() {
+    let (mut h, _) = ime_interruption_editor();
+    begin_interrupted_composition(&mut h, false);
+    let first = request_at_caret(&mut h, 1);
+    let second = request_at_caret(&mut h, 2);
+    assert_ne!(first, second);
+    let foreign = h.ctx.request_ime_reset(egui::ViewportId::from_hash_of("effect-ime-foreign")).unwrap();
+    let foreign_context = egui::Context::default().request_ime_reset(egui::ViewportId::ROOT).unwrap();
+    let project = h.state().session.project.clone();
+    let undo = h.state().session.history.undo.len();
+    for _ in 0..3 {
+        h.input_mut().events.extend([
+            Event::ImeResetCompleted { request_id: first },
+            Event::ImeResetCompleted { request_id: foreign },
+            Event::ImeResetCompleted { request_id: foreign_context },
+            ime_interruption_delete(false),
+            ime_interruption_delete(true),
+            Event::Ime(egui::ImeEvent::Commit("X".into())),
+            Event::Ime(egui::ImeEvent::Preedit { text: "late".into(), active_range_chars: None }),
+            Event::Ime(egui::ImeEvent::Preedit { text: String::new(), active_range_chars: None }),
+        ]);
+        h.run_steps(1);
+        assert_eq!((edited(&h).1.as_str(), edited(&h).3), ("abcd", 2));
+        assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none(), "no-ack does not spin requests");
+    }
+    h.input_mut().events.extend([
+        Event::ImeResetCompleted { request_id: second },
+        Event::Ime(egui::ImeEvent::Preedit { text: "が".into(), active_range_chars: None }),
+        Event::ImeResetCompleted { request_id: second },
+        Event::Ime(egui::ImeEvent::Commit("が".into())),
+    ]);
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "abがcd", "duplicate F cannot interrupt the newly admitted composition");
+    assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none());
+}
+
+#[test]
+fn outside_pointer_visits_the_control_suffix_without_mutating_the_old_viewer() {
+    for terminal_pending in [false, true] {
+        let (mut h, _) = ime_interruption_editor();
+        h.state_mut().show_panel(PanelKind::Timeline);
+        h.run_steps(2);
+        begin_interrupted_composition(&mut h, terminal_pending);
+        let first = request_at_caret(&mut h, 1);
+        let layer = edited(&h).0;
+        let outside = rect(&h, "timeline.empty").center();
+        assert!(!rect(&h, "viewer.area").contains(outside));
+        let undo = h.state().session.history.undo.len();
+        h.input_mut().events.extend([
+            Event::PointerMoved(outside),
+            Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+            Event::ImeResetCompleted { request_id: first },
+            Event::Text("BAD".into()),
+            Event::Cut,
+            Event::Paste("BAD".into()),
+            Event::Ime(egui::ImeEvent::Preedit { text: "late".into(), active_range_chars: None }),
+            Event::Ime(egui::ImeEvent::Commit("X".into())),
+        ]);
+        h.run_steps(1);
+        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, "abcd");
+        assert_eq!(h.state().session.history.undo.len(), undo);
+        assert!(!h.ctx.input(|input| input.events.iter().any(|event| matches!(event, Event::ImeResetCompleted { .. }))), "the suffix control was visited");
+        h.input_mut().events.push(Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+        h.run_steps(1);
+        h.state_mut().session.execute("text.edit", json!({"layer": layer, "caret": 1})).unwrap();
+        h.state_mut().ui.focused = PanelKind::Composition;
+        h.run_steps(1);
+        let second = ime_reset_request(&h);
+        assert_ne!(first, second);
+        h.input_mut().events.extend([
+            Event::ImeResetCompleted { request_id: first },
+            Event::Ime(egui::ImeEvent::Commit("X".into())),
+            Event::ImeResetCompleted { request_id: second },
+        ]);
+        h.input_mut().events.extend(fresh_ime("が"));
+        h.run_steps(1);
+        assert_eq!(edited(&h).1, "aがbcd");
+    }
+}
+
+#[test]
+fn old_commit_then_fence_then_outside_pointer_keeps_the_prefix_rejected() {
+    let (mut h, _) = ime_interruption_editor();
+    h.state_mut().show_panel(PanelKind::Timeline);
+    h.run_steps(2);
+    begin_interrupted_composition(&mut h, false);
+    let first = request_at_caret(&mut h, 1);
+    let layer = edited(&h).0;
+    let outside = rect(&h, "timeline.empty").center();
+    h.input_mut().events.extend([
+        Event::Ime(egui::ImeEvent::Commit("X".into())),
+        Event::ImeResetCompleted { request_id: first },
+        Event::PointerMoved(outside),
+        Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
+        Event::Text("BAD".into()),
+        Event::Paste("BAD".into()),
+    ]);
+    h.run_steps(1);
+    assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, "abcd", "F cannot admit its preceding old commit or the outside suffix");
+    h.input_mut().events.push(Event::PointerButton { pos: outside, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(1);
+    h.state_mut().session.execute("text.edit", json!({"layer": layer, "caret": 1})).unwrap();
+    h.state_mut().ui.focused = PanelKind::Composition;
+    h.run_steps(1);
+    // A panel may already have ended the custom route before the viewer drew. In that case
+    // its controls-only owner retired F and the actual returned replacement must be used.
+    if let Some(request_id) = h.output().platform_output.ime.as_ref().unwrap().reset_request {
+        assert_ne!(first, request_id);
+        h.input_mut().events.push(Event::ImeResetCompleted { request_id });
+    }
+    h.input_mut().events.extend(fresh_ime("が"));
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "aがbcd");
+}
+
+#[test]
+fn stock_dialog_suspends_before_sync_and_return_rearms_the_same_model_once() {
+    use egui_kittest::kittest::Queryable as _;
+    let (mut h, _) = ime_interruption_editor();
+    begin_interrupted_composition(&mut h, true);
+    let first = request_at_caret(&mut h, 1);
+    let custom_owner = h.output().platform_output.ime.as_ref().unwrap().owner;
+    h.state_mut().dialog = Some(effectcraft_ui_egui::Dialog::CommandPalette);
+    h.state_mut().session.execute("text.setSelection", json!({"caret": 2})).unwrap();
+    h.run_steps(2);
+    h.input_mut().events.extend([Event::ImeResetCompleted { request_id: first }, Event::Text("xyz".into())]);
+    h.run_steps(1);
+    let stock = h.output().platform_output.ime.as_ref().expect("the actual stock palette field owns IME");
+    assert_ne!(stock.owner, custom_owner);
+    assert!(stock.reset_request.is_none(), "ineligible synchronization cannot allocate a new token into the stock descriptor");
+    // The real accessible name must remain available after typing hides the placeholder.
+    let palette = h.get_by_role_and_label(egui::accesskit::Role::TextInput, "Type a command or effect…");
+    assert_eq!(palette.value().as_deref(), Some("xyz"), "the visible stock field receives the text untouched by custom control routing");
+    assert_eq!(edited(&h).1, "abcd");
+    h.state_mut().dialog = None;
+    h.state_mut().ui.focused = PanelKind::Composition;
+    h.ctx.memory_mut(|memory| {
+        if let Some(field) = memory.focused() {
+            memory.surrender_focus(field);
+        }
+    });
+    h.run_steps(1);
+    let second = ime_reset_request(&h);
+    assert_ne!(first, second);
+    h.run_steps(1);
+    assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none());
+    h.input_mut().events.extend([
+        Event::ImeResetCompleted { request_id: first },
+        Event::Ime(egui::ImeEvent::Commit("X".into())),
+        Event::ImeResetCompleted { request_id: second },
+    ]);
+    h.input_mut().events.extend(fresh_ime("が"));
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "abがcd");
+}
+
+#[test]
+fn full_pass_logic_keeps_a_request_while_hidden_logic_rearms_once_on_return() {
+    let (mut h, _) = ime_interruption_editor();
+    begin_interrupted_composition(&mut h, false);
+    let first = request_at_caret(&mut h, 1);
+    h.run_steps(2);
+    assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none(), "normal App::logic before UI must not rearm");
+    let ctx = h.ctx.clone();
+    let frame = eframe::Frame::_new_kittest();
+    let raw = egui::RawInput::default();
+    for _ in 0..3 {
+        let _ = ctx.run_logic(&raw, |ctx| {
+            h.state_mut().tick(ctx, &frame);
+            h.state().finish_ime_logic(ctx);
+        });
+    }
+    h.run_steps(1);
+    let second = ime_reset_request(&h);
+    assert_ne!(first, second);
+    h.run_steps(1);
+    assert!(h.output().platform_output.ime.as_ref().unwrap().reset_request.is_none());
+    h.input_mut().events.extend([
+        Event::ImeResetCompleted { request_id: first },
+        Event::Ime(egui::ImeEvent::Commit("X".into())),
+        Event::ImeResetCompleted { request_id: second },
+    ]);
+    h.input_mut().events.extend(fresh_ime("が"));
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "aがbcd");
+}
+
+#[test]
+fn same_caret_application_text_replacement_rejects_the_previous_context_fence() {
+    let (mut h, _) = ime_interruption_editor();
+    begin_interrupted_composition(&mut h, false);
+    let first = request_at_caret(&mut h, 1);
+    let before = edited(&h);
+    let generation = h.output().platform_output.ime.as_ref().unwrap().context_generation;
+    h.state_mut().session.execute("layer.setText", json!({"layer": before.0, "text": "Abcd"})).unwrap();
+    h.input_mut().events.extend([
+        Event::ImeResetCompleted { request_id: first },
+        ime_interruption_delete(true),
+        Event::Ime(egui::ImeEvent::Commit("X".into())),
+    ]);
+    h.run_steps(1);
+    assert_eq!(edited(&h), (before.0, "Abcd".to_owned(), before.2, before.3));
+    let output = h.output().platform_output.ime.as_ref().unwrap();
+    assert_ne!(output.context_generation, generation, "same numeric owner/caret still has a new context");
+    let second = ime_reset_request(&h);
+    assert_ne!(first, second);
+    h.input_mut().events.push(Event::ImeResetCompleted { request_id: second });
+    h.input_mut().events.extend(fresh_ime("が"));
+    h.run_steps(1);
+    assert_eq!(edited(&h).1, "Aがbcd");
+}
diff --git a/crates/ui-egui/tests/it/ui_text_range_handles.rs b/crates/ui-egui/tests/it/ui_text_range_handles.rs
new file mode 100644
index 000000000..7ce301b37
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_text_range_handles.rs
@@ -0,0 +1,269 @@
+//! #1011: a text layer's Range Selector shows its Start and End as bars on the text in the
+//! Composition viewer, as in After Effects, while the selector or its animator is selected. A
+//! drag sets Start / End in one undo step (a keyframe at the current time when animated) and
+//! doesn't move the layer. Uses only APIs that existed before the bars, so it runs (and fails)
+//! on the code without them.
+
+use effectcraft_engine::Session;
+use effectcraft_engine::commands::text_edit::layer_doc;
+use effectcraft_engine::project::{LayerId, PropGroup};
+use effectcraft_engine::text::layout_doc;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::panels::viewer::comp_to_screen;
+use egui::{Event, Modifiers, PointerButton, Pos2, pos2, vec2};
+use egui_kittest::Harness;
+use serde_json::json;
+
+struct Ids {
+    layer: u64,
+    animator: u64,
+    color: u64,
+    start: u64,
+    end: u64,
+}
+
+fn animator(s: &Session, l: u64) -> PropGroup {
+    let layer = s.active_comp().unwrap().layer(LayerId(l)).unwrap();
+    layer.props.sub("text").unwrap().sub("animators").unwrap().groups().next().unwrap().clone()
+}
+
+/// A 640×360 comp with the point text "abcdefgh" and a Fill Color animator (one Range Selector).
+fn setup() -> (Session, Ids) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let l = s.execute("layer.newText", json!({"text": "abcdefgh", "size": 60})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.addTextAnimator", json!({"layer": l, "property": "fillColor"})).unwrap();
+    let a = animator(&s, l);
+    let sel = a.sub("selectors").unwrap().groups().next().unwrap();
+    let color = a.sub("properties").unwrap().children.first().unwrap().uid();
+    let ids = Ids { layer: l, animator: a.uid, color, start: sel.get("start").unwrap().uid, end: sel.get("end").unwrap().uid };
+    s.state.selected_layers = vec![LayerId(l)];
+    (s, ids)
+}
+
+fn harness(s: Session) -> Harness<'static, EffectcraftApp> {
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(4);
+    h
+}
+
+fn handle(h: &Harness<'_, EffectcraftApp>, uid: u64) -> Option<Pos2> {
+    h.state().auto.find(&format!("viewer.textRange.{uid}")).map(|e| pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0))
+}
+
+fn value(h: &Harness<'_, EffectcraftApp>, ids: &Ids, uid: u64) -> f64 {
+    h.state().session.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().props.find(uid).unwrap().value.as_f64()
+}
+
+/// Screen x of the caret before character `ci` of the text.
+fn caret_x(h: &Harness<'_, EffectcraftApp>, ids: &Ids, ci: usize) -> f32 {
+    let s = &h.state().session;
+    let lay = layout_doc(&layer_doc(s, LayerId(ids.layer)).unwrap());
+    let pos = s.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().props.prop("transform/position").unwrap().value.as_vec2();
+    let (_, bottom) = lay.caret(ci);
+    comp_to_screen(&h.ctx, [(pos[0] + bottom.x) as f32, (pos[1] + bottom.y) as f32]).unwrap().x
+}
+
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
+    h.event(Event::PointerMoved(from));
+    h.step();
+    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    for k in 1..=8 {
+        h.event(Event::PointerMoved(from + (to - from) * (k as f32 / 8.0)));
+        h.step();
+    }
+    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+/// With the Range Selector's animator selected, End is a bar at the end of the text; dragging it
+/// back to the boundary after the fourth character sets End to 50%, in one undo step, without
+/// moving Start or the layer.
+#[test]
+fn dragging_end_sets_it_in_one_undo_step() {
+    let (mut s, ids) = setup();
+    s.state.selected_props = vec![(LayerId(ids.layer), ids.animator)];
+    let mut h = harness(s);
+    let at = handle(&h, ids.end).unwrap_or_else(|| panic!("no viewer.textRange.{}: the Range Selector's End isn't in the viewer", ids.end));
+    assert!(handle(&h, ids.start).is_some(), "and its Start");
+    let position = h.state().session.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().props.prop("transform/position").unwrap().value.clone();
+    let undo = h.state().session.history.undo.len();
+    let dx = caret_x(&h, &ids, 4) - caret_x(&h, &ids, 8);
+    drag(&mut h, at, at + vec2(dx, 0.0));
+    let end = value(&h, &ids, ids.end);
+    assert!((end - 50.0).abs() < 1.0, "End at the middle of 8 characters: {end}");
+    assert_eq!(value(&h, &ids, ids.start), 0.0, "Start stays");
+    let layer = h.state().session.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().clone();
+    assert_eq!(layer.props.prop("transform/position").unwrap().value, position, "the layer didn't move");
+    assert_eq!(h.state().session.history.undo.len(), undo + 1, "the drag is one undo step");
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    assert_eq!(value(&h, &ids, ids.end), 100.0, "one undo puts it back");
+}
+
+/// End animated from 0% (0 s) to 100% (2 s): at 1 s the bar sits at 50%, and dragging it adds a
+/// keyframe at 1 s with the new value; the other keys stay.
+#[test]
+fn dragging_an_animated_end_keys_the_current_time() {
+    let (mut s, ids) = setup();
+    s.execute("prop.addKey", json!({"layer": ids.layer, "prop": ids.end, "time": 0.0, "value": 0.0})).unwrap();
+    s.execute("prop.addKey", json!({"layer": ids.layer, "prop": ids.end, "time": 2.0, "value": 100.0})).unwrap();
+    s.execute("time.set", json!({"time": 1.0})).unwrap();
+    s.state.selected_props = vec![(LayerId(ids.layer), ids.start)];
+    let mut h = harness(s);
+    let at = handle(&h, ids.end).expect("an End bar (selecting Start shows the selector)");
+    assert!((at.x - caret_x(&h, &ids, 4)).abs() < 12.0, "at 1 s End is 50%: the bar is after the fourth character");
+    let dx = caret_x(&h, &ids, 6) - caret_x(&h, &ids, 4);
+    drag(&mut h, at, at + vec2(dx, 0.0));
+    let layer = h.state().session.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().clone();
+    let keys: Vec<(f64, f64)> = layer.props.find(ids.end).unwrap().keys.iter().map(|k| (k.time.seconds(), k.value.as_f64())).collect();
+    assert_eq!(keys.len(), 3, "{keys:?}");
+    // (Times on the comp's frames: 29.97 fps puts "1 s" at 1.001 s.)
+    let at = |k: (f64, f64), t: f64, v: f64| (k.0 - t).abs() < 0.01 && (k.1 - v).abs() < 1.0;
+    assert!(at(keys[0], 0.0, 0.0) && at(keys[2], 2.0, 100.0), "the other keys stay: {keys:?}");
+    assert!(at(keys[1], 1.0, 75.0), "a key at 1 s at 75%: {keys:?}");
+}
+
+/// The bars show while the selector, its animator or a property in the animator is selected,
+/// and only with the Selection tool and layer controls on.
+#[test]
+fn bars_show_only_for_a_selected_selector_or_animator() {
+    let (s, ids) = setup();
+    let h = harness(s);
+    assert!(handle(&h, ids.end).is_none(), "only the layer is selected");
+    let (mut s, ids) = setup();
+    let position = s.active_comp().unwrap().layer(LayerId(ids.layer)).unwrap().props.prop("transform/position").unwrap().uid;
+    s.state.selected_props = vec![(LayerId(ids.layer), position)];
+    let h = harness(s);
+    assert!(handle(&h, ids.end).is_none(), "a property outside the animator is selected");
+    let (mut s, ids) = setup();
+    s.state.selected_props = vec![(LayerId(ids.layer), ids.color)];
+    let mut h = harness(s);
+    assert!(handle(&h, ids.end).is_some(), "Fill Color, in the animator, is selected");
+    h.state_mut().ui.viewer.show_layer_controls = false;
+    h.run_steps(3);
+    assert!(handle(&h, ids.end).is_none(), "View ▸ Show Layer Controls off hides them");
+    h.state_mut().ui.viewer.show_layer_controls = true;
+    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Pen;
+    h.run_steps(3);
+    assert!(handle(&h, ids.end).is_none(), "only the Selection tool drags them");
+}
+
+/// Offset 25%: the Start bar sits two characters in, where the range begins, and dragging it to
+/// the boundary after the fourth character writes Start = 50% − Offset, leaving Offset alone.
+#[test]
+fn bars_include_the_offset_and_a_drag_leaves_it() {
+    let (mut s, ids) = setup();
+    let offset = animator(&s, ids.layer).sub("selectors").unwrap().groups().next().unwrap().get("offset").unwrap().uid;
+    s.execute("prop.set", json!({"layer": ids.layer, "prop": offset, "value": 25.0})).unwrap();
+    s.state.selected_props = vec![(LayerId(ids.layer), ids.animator)];
+    let mut h = harness(s);
+    let at = handle(&h, ids.start).expect("a Start bar");
+    assert!((at.x - caret_x(&h, &ids, 2)).abs() < 12.0, "Start 0% + Offset 25%: after the second character");
+    let dx = caret_x(&h, &ids, 4) - caret_x(&h, &ids, 2);
+    drag(&mut h, at, at + vec2(dx, 0.0));
+    assert!((value(&h, &ids, ids.start) - 25.0).abs() < 1.0, "Start {}", value(&h, &ids, ids.start));
+    assert_eq!(value(&h, &ids, offset), 25.0, "Offset stays");
+}
+
+/// Small text: Start at 0% sits within the reach of the bounding box's left-side scale handle. A
+/// press on the handle still scales the layer and leaves Start alone.
+#[test]
+fn a_bar_on_a_box_handle_leaves_it_the_press() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Main", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let l = s.execute("layer.newText", json!({"text": "abcdefgh", "size": 12})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.addTextAnimator", json!({"layer": l, "property": "fillColor"})).unwrap();
+    let a = animator(&s, l);
+    let start = a.sub("selectors").unwrap().groups().next().unwrap().get("start").unwrap().uid;
+    s.state.selected_layers = vec![LayerId(l)];
+    s.state.selected_props = vec![(LayerId(l), a.uid)];
+    let mut h = harness(s);
+    let bar = handle(&h, start).expect("a Start bar");
+    let at = (0..8)
+        .filter_map(|i| h.state().auto.find(&format!("viewer.handle.{l}.{i}")).map(|e| pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0)))
+        .min_by(|p, q| (*p - bar).length().total_cmp(&(*q - bar).length()))
+        .expect("the box's handles");
+    assert!((bar - at).length() < 9.0, "the fixture puts Start within the handle's reach: {bar:?} vs {at:?}");
+    let scale = |h: &Harness<'_, EffectcraftApp>| {
+        h.state().session.active_comp().unwrap().layer(LayerId(l)).unwrap().props.prop("transform/scale").unwrap().value.clone()
+    };
+    let before = scale(&h);
+    drag(&mut h, at, at - vec2(40.0, 0.0));
+    let layer = h.state().session.active_comp().unwrap().layer(LayerId(l)).unwrap().clone();
+    assert_eq!(layer.props.find(start).unwrap().value.as_f64(), 0.0, "Start stays");
+    assert_ne!(scale(&h), before, "the handle scaled the layer");
+}
+
+/// The text the Timeline paints in property `uid`'s value field.
+fn timeline_value(h: &Harness<'_, EffectcraftApp>, uid: u64) -> String {
+    let e = h.state().auto.find(&format!("timeline.prop.{uid}.value")).unwrap_or_else(|| panic!("timeline.prop.{uid}.value isn't shown"));
+    let field = egui::Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]));
+    h.output()
+        .shapes
+        .iter()
+        .filter_map(|c| match &c.shape {
+            egui::Shape::Text(t) if field.contains(t.visual_bounding_rect().center()) => Some(t.galley.text().to_string()),
+            _ => None,
+        })
+        .collect()
+}
+
+/// The centre of the first painted text that reads `label` exactly (a popup's option).
+fn text_at(h: &Harness<'_, EffectcraftApp>, label: &str) -> Option<Pos2> {
+    h.output().shapes.iter().find_map(|c| match &c.shape {
+        egui::Shape::Text(t) if t.galley.text() == label => Some(t.visual_bounding_rect().center()),
+        _ => None,
+    })
+}
+
+fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
+    h.event(Event::PointerMoved(p));
+    h.step();
+    h.event(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    h.event(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+/// #1814: with Units = Index the Timeline shows the Range Selector's Start, End and Offset as
+/// counts, without the % sign they carry with Units = Percentage. Units is changed the way a
+/// user changes it: its Timeline popup, then the Index option.
+#[test]
+fn index_units_show_start_end_and_offset_without_a_percent_sign() {
+    let (s, ids) = setup();
+    let l = LayerId(ids.layer);
+    let layer = s.active_comp().unwrap().layer(l).unwrap().clone();
+    let text = layer.props.sub("text").unwrap();
+    let anim = animator(&s, ids.layer);
+    let selectors = anim.sub("selectors").unwrap();
+    let sel = selectors.groups().next().unwrap();
+    let (offset, units) = (sel.get("offset").unwrap().uid, sel.prop("advanced/units").unwrap().uid);
+    let advanced = sel.sub("advanced").unwrap().uid;
+    let mut h = harness(s);
+    let tl = &mut h.state_mut().ui.timeline;
+    tl.open_layers.insert(ids.layer);
+    let animators = text.sub("animators").unwrap().uid;
+    tl.open_groups.extend([text.uid, animators, anim.uid, selectors.uid, sel.uid, advanced]);
+    h.run_steps(3);
+    for uid in [ids.start, ids.end, offset] {
+        assert!(timeline_value(&h, uid).ends_with('%'), "Percentage units: {}", timeline_value(&h, uid));
+    }
+    // Units ▸ Index through the Timeline: open its popup, pick the option.
+    let units_value = |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layer(l).unwrap().props.find(units).unwrap().value.clone();
+    assert_eq!(units_value(&h), effectcraft_engine::keyframe::Value::Enum(0), "Percentage to start with");
+    let field = h
+        .state()
+        .auto
+        .find(&format!("timeline.prop.{units}.value"))
+        .map(|e| pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0))
+        .expect("Units is shown");
+    click_at(&mut h, field);
+    let index = text_at(&h, "Index").expect("the Units popup lists Index");
+    click_at(&mut h, index);
+    assert_eq!(units_value(&h), effectcraft_engine::keyframe::Value::Enum(1), "the popup set Units to Index");
+    for uid in [ids.start, ids.end, offset] {
+        let v = timeline_value(&h, uid);
+        assert!(!v.is_empty() && !v.contains('%'), "Index units: {v:?}");
+    }
+}
diff --git a/crates/ui-egui/tests/ui_theme_favorites.rs b/crates/ui-egui/tests/it/ui_theme_favorites.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_theme_favorites.rs
rename to crates/ui-egui/tests/it/ui_theme_favorites.rs
diff --git a/crates/ui-egui/tests/ui_time_zoom_controls.rs b/crates/ui-egui/tests/it/ui_time_zoom_controls.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_time_zoom_controls.rs
rename to crates/ui-egui/tests/it/ui_time_zoom_controls.rs
index 4ab725d6a..c1ea26b2b 100644
--- a/crates/ui-egui/tests/ui_time_zoom_controls.rs
+++ b/crates/ui-egui/tests/it/ui_time_zoom_controls.rs
@@ -42,7 +42,8 @@ fn harness(graph: bool) -> Harness<'static, EffectcraftApp> {
 fn send(h: &mut Harness<'_, EffectcraftApp>, method: &str, params: Value) {
     let ctx = h.ctx.clone();
     let (req, _rx) = ControlRequest::new(method, params);
-    if let Outcome::Done(v) = control::handle(h.state_mut(), &ctx, &req) {
+    let now = h.state().now();
+    if let Outcome::Done(v) = control::handle(h.state_mut(), &ctx, &req, now) {
         assert!(v["ok"] != false, "{method}: {v}");
     }
     for e in h.state_mut().take_synthetic_input() {
diff --git a/crates/ui-egui/tests/ui_timeline_effect_label.rs b/crates/ui-egui/tests/it/ui_timeline_effect_label.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_timeline_effect_label.rs
rename to crates/ui-egui/tests/it/ui_timeline_effect_label.rs
diff --git a/crates/ui-egui/tests/it/ui_timeline_pan.rs b/crates/ui-egui/tests/it/ui_timeline_pan.rs
new file mode 100644
index 000000000..8523ded30
--- /dev/null
+++ b/crates/ui-egui/tests/it/ui_timeline_pan.rs
@@ -0,0 +1,61 @@
+//! Spacebar-drag panning in the Timeline: the Hand tool scrolls the layer rows vertically as well
+//! as the time graph horizontally (#2083).
+
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::EffectcraftApp;
+use egui::{Event, Modifiers, Pos2, pos2, vec2};
+use egui_kittest::Harness;
+use serde_json::json;
+
+/// A 10 s comp with 40 solids, enough rows to scroll.
+fn harness() -> (Harness<'static, EffectcraftApp>, u64) {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Many", "width": 320, "height": 180, "frameRate": 30, "duration": 10})).unwrap();
+    let mut top = 0;
+    for i in 0..40 {
+        top = s.execute("layer.newSolid", json!({"name": format!("Layer {i}"), "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
+    }
+    s.execute("layer.select", json!({"layers": []})).unwrap();
+    let app = EffectcraftApp::new(s);
+    let mut h = Harness::builder().with_size(vec2(1200.0, 800.0)).build_eframe(|_| app);
+    h.run_steps(4);
+    (h, top)
+}
+
+fn space(h: &mut Harness<'_, EffectcraftApp>, pressed: bool) {
+    h.event(Event::Key { key: egui::Key::Space, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE });
+    h.step();
+}
+
+fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
+    h.event(Event::PointerMoved(from));
+    h.step();
+    h.event(Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
+    h.step();
+    for k in 1..=10 {
+        h.event(Event::PointerMoved(from + (to - from) * (k as f32 / 10.0)));
+        h.step();
+    }
+    h.event(Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
+    h.run_steps(3);
+}
+
+#[test]
+fn spacebar_drag_pans_the_rows_vertically() {
+    let (mut h, layer) = harness();
+    assert_eq!(h.state().ui.timeline.scroll_y, 0.0);
+    let bar = h.state().auto.find(&format!("timeline.layer.{layer}.bar")).expect("layer bar").rect;
+    let from = pos2(bar[0] + 40.0, bar[1] + bar[3] / 2.0);
+    let timing = |h: &Harness<'_, EffectcraftApp>| {
+        let l = &h.state().session.active_comp().unwrap().layers[0];
+        (l.in_point.seconds(), l.out_point.seconds(), l.start_time.seconds())
+    };
+    let before = timing(&h);
+    space(&mut h, true);
+    drag(&mut h, from, from - vec2(0.0, 180.0));
+    space(&mut h, false);
+    let y = h.state().ui.timeline.scroll_y;
+    assert!(y > 100.0, "the rows scrolled vertically: {y}");
+    assert_eq!(h.state().ui.timeline.start, 0.0, "the time graph did not pan sideways");
+    assert_eq!(timing(&h), before, "the layer under the hand did not move");
+}
diff --git a/crates/ui-egui/tests/ui_timeline_shapes.rs b/crates/ui-egui/tests/it/ui_timeline_shapes.rs
similarity index 91%
rename from crates/ui-egui/tests/ui_timeline_shapes.rs
rename to crates/ui-egui/tests/it/ui_timeline_shapes.rs
index 3993a6f99..bc42b4461 100644
--- a/crates/ui-egui/tests/ui_timeline_shapes.rs
+++ b/crates/ui-egui/tests/it/ui_timeline_shapes.rs
@@ -75,6 +75,29 @@ fn shape_contents_add_menu_adds_path_operations() {
     assert_eq!(items, ["group", "trim"]);
 }
 
+/// A shape group's inner Contents is elided in After Effects: opening the group lists its items
+/// (here the path) directly, with no "Contents" row between them.
+#[test]
+fn shape_group_contents_has_no_inner_contents_row() {
+    let mut s = session();
+    let l = s.execute("layer.newShape", json!({"kind": "rect"})).unwrap()["layer"].as_u64().unwrap();
+    let layer = s.active_comp().unwrap().layer(LayerId(l)).unwrap().clone();
+    let contents = layer.props.sub("contents").unwrap().clone();
+    let group = contents.groups().next().unwrap().clone();
+    let inner = group.sub("contents").unwrap().clone();
+    let item = inner.groups().next().unwrap().clone();
+    let mut h = harness(s);
+    h.state_mut().ui.timeline.open_layers.insert(l);
+    h.state_mut().ui.timeline.open_groups.insert(contents.uid);
+    h.state_mut().ui.timeline.open_groups.insert(group.uid);
+    h.run_steps(2);
+    let name = |uid: u64| format!("timeline.group.{uid}.name");
+    assert!(h.state().auto.find(&name(contents.uid)).is_some(), "the layer's Contents row");
+    assert!(h.state().auto.find(&name(group.uid)).is_some(), "the shape group row");
+    assert!(h.state().auto.find(&name(inner.uid)).is_none(), "no inner Contents row");
+    assert!(h.state().auto.find(&name(item.uid)).is_some(), "the path lists directly under the group");
+}
+
 #[test]
 fn classic_3d_shape_layers_offer_change_renderer() {
     let mut s = session();
diff --git a/crates/ui-egui/tests/ui_timeline_switches.rs b/crates/ui-egui/tests/it/ui_timeline_switches.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_timeline_switches.rs
rename to crates/ui-egui/tests/it/ui_timeline_switches.rs
diff --git a/crates/ui-egui/tests/ui_timeline_trim.rs b/crates/ui-egui/tests/it/ui_timeline_trim.rs
similarity index 88%
rename from crates/ui-egui/tests/ui_timeline_trim.rs
rename to crates/ui-egui/tests/it/ui_timeline_trim.rs
index d66bf5b7a..6f95f744f 100644
--- a/crates/ui-egui/tests/ui_timeline_trim.rs
+++ b/crates/ui-egui/tests/it/ui_timeline_trim.rs
@@ -119,3 +119,17 @@ fn dragging_bar_ends_trims_in_and_out() {
     let (i, o, s) = timing(&h, pre);
     assert!((i - 3.0).abs() < 1e-6 && (o - 8.0).abs() < 1.5 / 30.0 && s.abs() < 1e-6, "out extended to ~8 s, not slipped: in {i} out {o} start {s}");
 }
+
+/// With Frames and Frame Count Start at 1, In moves to 00061 but the Duration column still counts
+/// the layer's 120 frames (#1807).
+#[test]
+fn duration_column_counts_frames_from_any_frame_count() {
+    let (mut h, solid, _) = harness();
+    effectcraft_ui_egui::panels::timeline::set_column(&mut h.state_mut().ui.timeline, "in", true).unwrap();
+    effectcraft_ui_egui::panels::timeline::set_column(&mut h.state_mut().ui.timeline, "duration", true).unwrap();
+    h.state_mut().session.execute("file.projectSettings", json!({"timeDisplay": "frames", "frameStart": 1})).unwrap();
+    h.run_steps(3);
+    let cell = |h: &Harness<'_, EffectcraftApp>, kind: &str| h.state().auto.find(&format!("timeline.layer.{solid}.{kind}")).expect("cell").label.clone();
+    assert_eq!(cell(&h, "in"), "00061");
+    assert_eq!(cell(&h, "duration"), "00120");
+}
diff --git a/crates/ui-egui/tests/ui_timeline_zoom.rs b/crates/ui-egui/tests/it/ui_timeline_zoom.rs
similarity index 97%
rename from crates/ui-egui/tests/ui_timeline_zoom.rs
rename to crates/ui-egui/tests/it/ui_timeline_zoom.rs
index 5f731e118..d05ffae64 100644
--- a/crates/ui-egui/tests/ui_timeline_zoom.rs
+++ b/crates/ui-egui/tests/it/ui_timeline_zoom.rs
@@ -30,7 +30,13 @@ fn over_bar(h: &Harness<'_, EffectcraftApp>, layer: u64) -> Pos2 {
 fn alt_wheel(h: &mut Harness<'_, EffectcraftApp>, at: Pos2, dy: f32) {
     h.event(Event::PointerMoved(at));
     h.event(Event::ModifiersChanged(Modifiers::ALT));
-    h.event(Event::MouseWheel { unit: MouseWheelUnit::Point, delta: vec2(0.0, dy), modifiers: Modifiers::ALT, phase: egui::TouchPhase::Move });
+    h.event(Event::MouseWheel {
+        unit: MouseWheelUnit::Point,
+        delta: vec2(0.0, dy),
+        modifiers: Modifiers::ALT,
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
     h.step();
     h.event(Event::ModifiersChanged(Modifiers::NONE));
     h.step();
@@ -78,7 +84,13 @@ fn ctrl_wheel_and_pinch_zoom_time() {
     let at = over_bar(&h, layer);
     h.event(Event::PointerMoved(at));
     h.event(Event::ModifiersChanged(Modifiers::COMMAND));
-    h.event(Event::MouseWheel { unit: MouseWheelUnit::Point, delta: vec2(0.0, 240.0), modifiers: Modifiers::COMMAND, phase: egui::TouchPhase::Move });
+    h.event(Event::MouseWheel {
+        unit: MouseWheelUnit::Point,
+        delta: vec2(0.0, 240.0),
+        modifiers: Modifiers::COMMAND,
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
     h.step();
     h.event(Event::ModifiersChanged(Modifiers::NONE));
     h.step();
diff --git a/crates/ui-egui/tests/ui_toolbar_gradient.rs b/crates/ui-egui/tests/it/ui_toolbar_gradient.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_toolbar_gradient.rs
rename to crates/ui-egui/tests/it/ui_toolbar_gradient.rs
diff --git a/crates/ui-egui/tests/ui_tracker.rs b/crates/ui-egui/tests/it/ui_tracker.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_tracker.rs
rename to crates/ui-egui/tests/it/ui_tracker.rs
diff --git a/crates/ui-egui/tests/ui_unreadable_footage.rs b/crates/ui-egui/tests/it/ui_unreadable_footage.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_unreadable_footage.rs
rename to crates/ui-egui/tests/it/ui_unreadable_footage.rs
diff --git a/crates/ui-egui/tests/ui_video_preview_off.rs b/crates/ui-egui/tests/it/ui_video_preview_off.rs
similarity index 90%
rename from crates/ui-egui/tests/ui_video_preview_off.rs
rename to crates/ui-egui/tests/it/ui_video_preview_off.rs
index e27a37c29..37a35f856 100644
--- a/crates/ui-egui/tests/ui_video_preview_off.rs
+++ b/crates/ui-egui/tests/it/ui_video_preview_off.rs
@@ -21,7 +21,7 @@ fn an_audio_only_preview_says_video_preview_is_off() {
     s.prefs.preview.get_mut(sc).include_video = false;
     let mut h = Harness::builder().with_size(egui::vec2(1400.0, 900.0)).with_step_dt(1.0 / 30.0).build_eframe(|_| EffectcraftApp::new(s));
     h.run_steps(4);
-    let chip = |h: &Harness<'_, EffectcraftApp>| h.ctx.data(|d| d.get_temp::<egui::Rect>(egui::Id::new("viewer-video-off-chip")));
+    let chip = |h: &Harness<'_, EffectcraftApp>| h.ctx.data(|d| d.get_temp::<egui::Rect>(egui::Id::unique("viewer-video-off-chip")));
     assert!(chip(&h).is_none());
     let now = h.ctx.input(|i| i.time);
     h.state_mut().play(now);
@@ -30,7 +30,7 @@ fn an_audio_only_preview_says_video_preview_is_off() {
     assert!(chip(&h).is_some(), "the viewer shows the Video-off notice");
     assert_eq!(frame(&h), 0, "the current time stays put with Video off");
     h.state_mut().stop();
-    h.ctx.data_mut(|d| d.remove::<egui::Rect>(egui::Id::new("viewer-video-off-chip")));
+    h.ctx.data_mut(|d| d.remove::<egui::Rect>(egui::Id::unique("viewer-video-off-chip")));
     h.run_steps(3);
     assert!(h.state().video_preview_off().is_none());
     assert!(chip(&h).is_none(), "no notice once stopped");
diff --git a/crates/ui-egui/tests/ui_viewer.rs b/crates/ui-egui/tests/it/ui_viewer.rs
similarity index 89%
rename from crates/ui-egui/tests/ui_viewer.rs
rename to crates/ui-egui/tests/it/ui_viewer.rs
index 47bb475c2..993925b59 100644
--- a/crates/ui-egui/tests/ui_viewer.rs
+++ b/crates/ui-egui/tests/it/ui_viewer.rs
@@ -193,7 +193,8 @@ fn each_comp_keeps_its_viewer_resolution() {
     assert_eq!(h.state().viewer_res(), Resolution::Auto);
     let (req, _reply) = effectcraft_ui_egui::control::ControlRequest::new("ui.set", json!({"viewer": {"res": "quarter"}}));
     let ctx = h.ctx.clone();
-    let _ = effectcraft_ui_egui::control::handle(h.state_mut(), &ctx, &req);
+    let now = h.state().now();
+    let _ = effectcraft_ui_egui::control::handle(h.state_mut(), &ctx, &req, now);
     assert_eq!(h.state().viewer_res(), Resolution::Quarter);
     let ctx = h.ctx.clone();
     assert_eq!(effectcraft_ui_egui::control::inspect(h.state(), &ctx)["ui"]["viewer"]["res"], json!("Quarter"));
@@ -679,6 +680,171 @@ fn fill_options_change_the_selected_shape_layer() {
     }
 }
 
+/// #1220: path tools hide the layer transform box, while path vertices remain editable.
+#[test]
+fn path_editing_hides_layer_bounds_and_keeps_corner_vertices_editable() {
+    for mask in [false, true] {
+        let mut h = harness();
+        let vertices = [[200.0, 100.0], [400.0, 100.0], [400.0, 260.0], [200.0, 260.0]];
+        let (layer, uid, kind) = if mask {
+            let layer = layer_id(&h, "Plate");
+            h.state_mut().session.execute("layer.select", json!({"layers": [layer]})).unwrap();
+            let r = h
+                .state_mut()
+                .session
+                .execute("mask.new", json!({"layer": layer, "vertices": vertices, "outTangents": [[40, 0], [0, 0], [0, 0], [0, 0]], "closed": true}))
+                .unwrap();
+            (layer, r["mask"].as_u64().unwrap(), "mask")
+        } else {
+            let r = h.state_mut().session.execute("shape.newPath", json!({"vertices": vertices, "outTangents": [[40, 0], [0, 0], [0, 0], [0, 0]], "closed": true, "fill": false, "stroke": "#ffffff", "strokeWidth": 4})).unwrap();
+            (r["layer"].as_u64().unwrap(), r["path"].as_u64().unwrap(), "shapePath")
+        };
+        h.state_mut().session.state.selected_vertices.clear();
+        h.run_steps(2);
+        let handle = format!("viewer.handle.{layer}.0");
+        assert!(h.state().auto.find(&handle).is_some(), "ordinary layer selection has transform handles (mask={mask})");
+        for tool in [Tool::Pen, Tool::PenAdd, Tool::PenDelete, Tool::PenConvert, Tool::MaskFeather] {
+            h.state_mut().ui.tool = tool;
+            h.run_steps(2);
+            assert!(h.state().auto.find(&handle).is_none(), "{tool:?}: hide the layer box");
+            assert!(h.state().auto.find(&format!("viewer.{kind}.{uid}.vertex.0")).is_some(), "{tool:?}: keep the path point");
+        }
+        h.state_mut().ui.tool = Tool::Selection;
+        h.run_steps(2);
+        let vertex = format!("viewer.{kind}.{uid}.vertex.0");
+        let from = rect(&h, &vertex).center();
+        click(&mut h, from);
+        h.run_steps(2); // The automation registry also keeps the preceding frame's elements.
+        assert!(h.state().auto.find(&handle).is_none(), "selecting a vertex starts path editing (mask={mask})");
+        let position = h.state().session.active_comp().unwrap().layer(LayerId(layer)).unwrap().props.prop("transform/position").unwrap().value.clone();
+        let path = |h: &Harness<'_, EffectcraftApp>| {
+            h.state()
+                .session
+                .active_comp()
+                .unwrap()
+                .layer(LayerId(layer))
+                .unwrap()
+                .props
+                .find_group(uid)
+                .unwrap()
+                .get("path")
+                .unwrap()
+                .value
+                .as_path()
+                .unwrap()
+                .clone()
+        };
+        let before = path(&h);
+        drag(&mut h, from, from + vec2(15.0, 12.0));
+        assert_ne!(path(&h).vertices[0], before.vertices[0], "the corner vertex can still be moved");
+        assert_eq!(path(&h).vertices[1..], before.vertices[1..]);
+        assert_eq!(h.state().session.active_comp().unwrap().layer(LayerId(layer)).unwrap().props.prop("transform/position").unwrap().value, position);
+        h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+        h.run_steps(2);
+        assert_eq!(path(&h), before, "moving the vertex undoes in one step");
+        let z = rect(&h, "viewer.comp").width() / 640.0;
+        let tangent = rect(&h, &vertex).center() + vec2(40.0 * z, 0.0);
+        drag(&mut h, tangent, tangent + vec2(0.0, 20.0));
+        assert_ne!(path(&h).out_tangents[0], before.out_tangents[0], "the Bézier handle is still editable");
+        assert_eq!(path(&h).vertices, before.vertices, "a tangent drag does not move the path points");
+        h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+        h.run_steps(2);
+        assert_eq!(path(&h), before, "the tangent drag undoes in one step");
+        h.state_mut().ui.tool = Tool::Rotate;
+        h.run_steps(2);
+        assert!(h.state().auto.find(&handle).is_some(), "a layer transform tool restores the box");
+        h.state_mut().ui.tool = Tool::Selection;
+        h.state_mut().session.state.selected_vertices.clear();
+        h.run_steps(2);
+        assert!(h.state().auto.find(&handle).is_some(), "ending vertex selection restores the box");
+    }
+}
+
+/// #1769: the eye hides a layer's pixels, not the controls of a selected AV layer: a hidden shape
+/// layer keeps its transform box, anchor and shape path, and its handles still scale it.
+#[test]
+fn hidden_shape_layer_keeps_its_controls_and_can_still_scale() {
+    let mut h = harness();
+    let (layer, path) = {
+        let r = h
+            .state_mut()
+            .session
+            .execute(
+                "shape.newPath",
+                json!({
+                    "vertices": [[200.0, 100.0], [400.0, 100.0], [400.0, 260.0], [200.0, 260.0]],
+                    "closed": true,
+                    "fill": false,
+                    "stroke": "#ffffff",
+                    "strokeWidth": 4
+                }),
+            )
+            .unwrap();
+        (r["layer"].as_u64().unwrap(), r["path"].as_u64().unwrap())
+    };
+    h.state_mut().session.execute("layer.select", json!({"layers": [layer]})).unwrap();
+    h.state_mut().session.state.selected_vertices.clear();
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [layer], "switch": "video", "value": false})).unwrap();
+    h.run_steps(2);
+    let shown = h.state().session.active_comp().unwrap().layer(LayerId(layer)).unwrap().clone();
+    assert!(!shown.switches.video);
+    assert!(shown.source.is_av());
+    assert_eq!(h.state().session.state.selected_layers, vec![LayerId(layer)]);
+    assert!(h.state().auto.find(&format!("viewer.handle.{layer}.0")).is_some(), "a hidden shape keeps its transform box");
+    assert!(h.state().auto.find(&format!("viewer.anchor.{layer}")).is_some(), "and its anchor");
+    assert!(h.state().auto.find(&format!("viewer.shapePath.{path}.vertex.0")).is_some(), "and its shape path");
+    let scale = |h: &Harness<'_, EffectcraftApp>| {
+        h.state().session.active_comp().unwrap().layer(LayerId(layer)).unwrap().props.prop("transform/scale").unwrap().value.as_vec3()
+    };
+    let before = scale(&h);
+    let from = rect(&h, &format!("viewer.handle.{layer}.5")).center();
+    drag(&mut h, from, from + vec2(24.0, 0.0));
+    assert_ne!(scale(&h), before, "a hidden layer's handle still scales it");
+}
+
+/// #1769: a hidden masked layer keeps its mask path and vertices, and they remain editable.
+#[test]
+fn hidden_masked_layer_keeps_its_mask_path_editable() {
+    let mut h = harness();
+    let plate = layer_id(&h, "Plate");
+    let corners = [[100.0, 60.0], [500.0, 60.0], [500.0, 300.0], [100.0, 300.0]];
+    let mask = {
+        let s = &mut h.state_mut().session;
+        s.execute("layer.select", json!({"layers": [plate]})).unwrap();
+        let m = s.execute("mask.new", json!({"layer": plate, "vertices": corners, "closed": true})).unwrap()["mask"].as_u64().unwrap();
+        s.state.selected_vertices.clear();
+        s.execute("layer.setSwitch", json!({"layers": [plate], "switch": "video", "value": false})).unwrap();
+        m
+    };
+    h.run_steps(2);
+    assert!(h.state().auto.find(&format!("viewer.handle.{plate}.0")).is_some(), "a hidden masked layer keeps its transform box");
+    let vertex = format!("viewer.mask.{mask}.vertex.0");
+    assert!(h.state().auto.find(&vertex).is_some(), "and its mask path");
+    let before = mask_path(&h, "Plate");
+    let from = rect(&h, &vertex).center();
+    drag(&mut h, from, from + vec2(15.0, 12.0));
+    let after = mask_path(&h, "Plate");
+    assert_ne!(after.vertices[0], before.vertices[0], "the hidden layer's mask vertex can still be moved");
+    assert_eq!(after.vertices[1..], before.vertices[1..]);
+}
+
+#[test]
+fn path_tools_keep_bounds_on_layers_without_visible_paths() {
+    let mut h = harness();
+    let layer = layer_id(&h, "Box");
+    h.state_mut().session.execute("layer.select", json!({"layers": [layer]})).unwrap();
+    h.state_mut().ui.tool = Tool::Pen;
+    h.run_steps(2);
+    let handle = format!("viewer.handle.{layer}.0");
+    assert!(h.state().auto.find(&handle).is_some(), "a layer without a path keeps its box");
+    h.state_mut().session.execute("mask.new", json!({"layer": layer, "vertices": [[0, 0], [80, 0], [80, 80]], "closed": true})).unwrap();
+    h.run_steps(2);
+    assert!(h.state().auto.find(&handle).is_none());
+    h.state_mut().ui.viewer.show_masks = false;
+    h.run_steps(2);
+    assert!(h.state().auto.find(&handle).is_some(), "hidden paths do not suppress the layer controls");
+}
+
 #[test]
 fn shape_pen_draws_a_closed_shape_layer() {
     let mut h = harness();
@@ -1705,6 +1871,14 @@ fn key_twice(h: &mut Harness<'_, EffectcraftApp>, k: egui::Key) {
 #[test]
 fn property_shortcuts_reveal_and_key_transform_properties() {
     let mut h = harness();
+    // Reveal shortcuts compare wall-clock instants; drive the app clock so a step count
+    // cannot decide whether a second press is "quick" or a later one.
+    h.state_mut().use_manual_clock();
+    h.run_steps(1);
+    let wait = |h: &mut Harness<'_, EffectcraftApp>| {
+        h.state_mut().clock_mut().advance(1.0);
+        h.run_steps(2);
+    };
     h.state_mut().session.execute("layer.select", json!({"layers": ["Box"]})).unwrap();
     h.run_steps(2);
     let t = |h: &Harness<'_, EffectcraftApp>, p: &str| shown(h, prop_uid(h, "Box", &format!("transform/{p}")));
@@ -1741,16 +1915,16 @@ fn property_shortcuts_reveal_and_key_transform_properties() {
     h.run_steps(2);
     key(&mut h, egui::Key::U, none);
     only(&h, &["opacity"]);
-    h.run_steps(40);
+    wait(&mut h);
     key(&mut h, egui::Key::U, none);
     only(&h, &[]);
     h.state_mut().session.execute("prop.set", json!({"layer": "Box", "path": "transform/rotation", "value": 30})).unwrap();
-    h.run_steps(40);
+    wait(&mut h);
     key_twice(&mut h, egui::Key::U);
     assert!(t(&h, "opacity") && t(&h, "rotation"), "UU: animated and changed properties");
     assert!(!t(&h, "scale"), "an untouched property stays hidden");
     // Ctrl+`: twirl the selected layer open, then closed.
-    h.run_steps(40);
+    wait(&mut h);
     key(&mut h, egui::Key::Backtick, egui::Modifiers::COMMAND);
     let id = layer_id(&h, "Box");
     assert!(h.state().ui.timeline.open_layers.contains(&id) && h.state().ui.timeline.reveal.is_empty());
@@ -1761,6 +1935,14 @@ fn property_shortcuts_reveal_and_key_transform_properties() {
 #[test]
 fn double_press_shortcuts_reveal_their_second_set() {
     let mut h = harness();
+    // Reveal shortcuts compare wall-clock instants; drive the app clock so a step count
+    // cannot decide whether a second press is "quick" or a later one.
+    h.state_mut().use_manual_clock();
+    h.run_steps(1);
+    let wait = |h: &mut Harness<'_, EffectcraftApp>| {
+        h.state_mut().clock_mut().advance(1.0);
+        h.run_steps(2);
+    };
     h.state_mut().session.execute("layer.select", json!({"layers": ["Box"]})).unwrap();
     h.state_mut().session.execute("prop.setExpression", json!({"layer": "Box", "path": "transform/scale", "expression": "value"})).unwrap();
     h.run_steps(2);
@@ -1769,24 +1951,24 @@ fn double_press_shortcuts_reveal_their_second_set() {
     key_twice(&mut h, egui::Key::E);
     assert_eq!(reveal(&h), vec!["expressions"]);
     assert!(shown(&h, prop_uid(&h, "Box", "transform/scale")));
-    h.run_steps(40);
+    wait(&mut h);
     // TT: Mask Opacity; MM: every mask property; a single M: Mask Path.
     key_twice(&mut h, egui::Key::T);
     assert_eq!(reveal(&h), vec!["maskOpacity"]);
-    h.run_steps(40);
+    wait(&mut h);
     key(&mut h, egui::Key::M, Default::default());
     assert_eq!(reveal(&h), vec!["maskPath"]);
-    h.run_steps(40);
+    wait(&mut h);
     key_twice(&mut h, egui::Key::M);
     assert_eq!(reveal(&h), vec!["masks"]);
-    h.run_steps(40);
+    wait(&mut h);
     // RR Time Remap, AA Material Options, PP paint/puppet, SS selected properties, FF missing effects.
     for (k, want) in
         [(egui::Key::R, "timeRemap"), (egui::Key::A, "material"), (egui::Key::P, "paint"), (egui::Key::S, "selected"), (egui::Key::F, "missingEffects")]
     {
         key_twice(&mut h, k);
         assert_eq!(reveal(&h), vec![want], "{k:?}{k:?}");
-        h.run_steps(40);
+        wait(&mut h);
     }
 }
 
@@ -2000,6 +2182,37 @@ fn arrow_keys_nudge_the_selected_layer_at_the_viewer_magnification() {
     assert_eq!(pos(&h), [100.5, 109.5, 0.0], "sub-pixel steps when zoomed in");
 }
 
+/// #1288: with mask points selected the arrow keys move the points, not the layer: 1 pixel at the
+/// viewer's magnification in comp space (half a layer pixel on a layer scaled to 200 %), 10 with
+/// Shift, one undo step each.
+#[test]
+fn arrow_keys_nudge_the_selected_mask_points() {
+    let mut h = harness();
+    let plate = layer_id(&h, "Plate");
+    let corners = [[100.0, 60.0], [500.0, 60.0], [500.0, 300.0], [100.0, 300.0]];
+    let s = &mut h.state_mut().session;
+    s.execute("layer.select", json!({"layers": [plate]})).unwrap();
+    s.execute("prop.set", json!({"layer": plate, "path": "transform/scale", "value": [200, 200, 100]})).unwrap();
+    s.execute("mask.new", json!({"layer": plate, "vertices": corners, "closed": true})).unwrap();
+    let mask = s.active_comp().unwrap().layer(LayerId(plate)).unwrap().masks().unwrap().groups().next().unwrap().uid;
+    s.execute("mask.selectVertices", json!({"vertices": [{"layer": plate, "mask": mask, "index": 1}, {"layer": plate, "mask": mask, "index": 2}]})).unwrap();
+    let ppp = h.ctx.pixels_per_point();
+    h.state_mut().ui.viewer.zoom = Some(1.0 / ppp);
+    h.run_steps(2);
+    let pos = |h: &Harness<'_, EffectcraftApp>| {
+        h.state().session.active_comp().unwrap().layer(LayerId(plate)).unwrap().props.prop("transform/position").unwrap().value.as_vec3()
+    };
+    let (pos0, undo) = (pos(&h), h.state().session.history.undo.len());
+    key(&mut h, egui::Key::ArrowRight, egui::Modifiers::NONE);
+    key(&mut h, egui::Key::ArrowDown, egui::Modifiers::SHIFT);
+    let path = mask_path(&h, "Plate");
+    let near = |a: [f64; 2], b: [f64; 2]| (a[0] - b[0]).abs() < 1e-6 && (a[1] - b[1]).abs() < 1e-6;
+    assert!(near(path.vertices[1], [500.5, 65.0]) && near(path.vertices[2], [500.5, 305.0]), "{:?}", path.vertices);
+    assert_eq!(path.vertices[0], corners[0], "unselected points stay");
+    assert_eq!(pos(&h), pos0, "the layer stays");
+    assert_eq!(h.state().session.history.undo.len(), undo + 2, "one undo step per press");
+}
+
 /// A comp wider than the GPU's texture limit at Full resolution shows its frame (averaged down
 /// into a texture the renderer accepts) instead of failing the upload (#201: 11000×2200).
 #[test]
@@ -2344,3 +2557,56 @@ fn null_eye_hides_it_in_the_viewer() {
     h.run_steps(2);
     assert!(h.state().auto.find(&handle).is_some(), "handles back with the eye on");
 }
+
+/// #1642: a null stays visible after deselection, without selection handles.
+#[test]
+fn unselected_null_keeps_its_outline() {
+    let mut s = Session::default();
+    s.execute("comp.new", json!({"name": "Nulls", "width": 640, "height": 360, "duration": 4})).unwrap();
+    let n = s.execute("layer.newNull", json!({})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("layer.select", json!({"layers": [n]})).unwrap();
+    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(move |_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    // Use the selected box's actual geometry, so transformed nulls use the same outline.
+    let corners: Vec<Pos2> = (0..4).map(|i| rect(&h, &format!("viewer.handle.{n}.{i}")).center()).collect();
+    fn count(shape: &egui::Shape, corners: &[Pos2]) -> usize {
+        match shape {
+            egui::Shape::Path(p) => usize::from(p.closed && p.points == corners),
+            egui::Shape::Vec(v) => v.iter().map(|s| count(s, corners)).sum(),
+            _ => 0,
+        }
+    }
+    let outlines = |h: &Harness<'_, EffectcraftApp>| h.output().shapes.iter().map(|s| count(&s.shape, &corners)).sum::<usize>();
+    assert_eq!(outlines(&h), 1, "one selected outline");
+    h.state_mut().session.execute("edit.deselectAll", json!({})).unwrap();
+    h.run_steps(3);
+    assert_eq!(outlines(&h), 1, "deselection keeps the null visible");
+    assert!(h.state().auto.find(&format!("viewer.handle.{n}.0")).is_none());
+    assert!(h.state().auto.find(&format!("viewer.anchor.{n}")).is_none());
+    h.state_mut().ui.viewer.show_layer_controls = false;
+    h.run_steps(2);
+    assert_eq!(outlines(&h), 0, "Show Layer Controls hides the outline");
+    h.state_mut().ui.viewer.show_layer_controls = true;
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [n], "switch": "video", "value": false})).unwrap();
+    h.run_steps(2);
+    assert_eq!(outlines(&h), 0, "the Video switch hides an unselected null too");
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [n], "switch": "video", "value": true})).unwrap();
+    h.run_steps(2);
+    assert_eq!(outlines(&h), 1, "the Video switch restores the outline");
+    // Solo scope matches picking: a soloed AV layer hides unsoloed nulls, even outside its range.
+    let solid = h.state_mut().session.execute("layer.newSolid", json!({"name": "Solo", "color": "#406080", "width": 40, "height": 40})).unwrap()["layer"]
+        .as_u64()
+        .unwrap();
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [solid], "switch": "solo", "value": true})).unwrap();
+    h.state_mut().session.execute("edit.deselectAll", json!({})).unwrap();
+    h.run_steps(3);
+    assert_eq!(outlines(&h), 0, "an unsoloed null follows solo scope");
+    let cid = h.state().session.active_comp_id().unwrap();
+    std::sync::Arc::make_mut(&mut h.state_mut().session.project).comp_mut(cid).unwrap().layer_mut(LayerId(solid)).unwrap().out_point =
+        effectcraft_engine::time::Tick::ZERO;
+    h.run_steps(2);
+    assert_eq!(outlines(&h), 0, "an inactive soloed layer still sets solo scope");
+    h.state_mut().session.execute("layer.setSwitch", json!({"layers": [n], "switch": "solo", "value": true})).unwrap();
+    h.run_steps(2);
+    assert_eq!(outlines(&h), 1, "a soloed null keeps its outline");
+}
diff --git a/crates/ui-egui/tests/ui_viewers.rs b/crates/ui-egui/tests/it/ui_viewers.rs
similarity index 86%
rename from crates/ui-egui/tests/ui_viewers.rs
rename to crates/ui-egui/tests/it/ui_viewers.rs
index e556d92ae..833ab0a60 100644
--- a/crates/ui-egui/tests/ui_viewers.rs
+++ b/crates/ui-egui/tests/it/ui_viewers.rs
@@ -5,7 +5,8 @@
 use effectcraft_engine::Session;
 use effectcraft_engine::project::ItemId;
 use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{PanelKind, Zone};
+use effectcraft_ui_egui::dock::PanelKind;
+use effectcraft_ui_egui::dock::WorkspaceExt as _;
 use effectcraft_ui_egui::panels::viewers;
 use egui::{Event, pos2};
 use egui_kittest::Harness;
@@ -67,12 +68,18 @@ fn new_viewers_lock_route_comps_and_activate_on_click() {
     h.run_steps(3);
     // View ▸ New Viewer: viewer 1 shows A too, viewer 0 (the Composition panel) is locked.
     invoke(&mut h, "view.newViewer", json!({}));
-    assert!(h.state().ui.dock.contains(PanelKind::Viewer(1)));
+    assert!(h.state().ui.dock.is_docked(PanelKind::Viewer(1)));
     assert!(viewers::locked(h.state(), 0) && !viewers::locked(h.state(), 1));
     assert_eq!((h.state().ui.active_viewer, shows(&h, 0), shows(&h, 1)), (1, Some(a), Some(a)));
     // Side by side, so both draw.
-    assert!(h.state_mut().edit_layout(|l| l.dock(PanelKind::Viewer(1), PanelKind::Composition, Zone::Right)));
-    h.state_mut().ui.dock.activate(PanelKind::Composition);
+    h.state_mut()
+        .apply_dock(craft_ui::docking::Action::Move {
+            panel: PanelKind::Viewer(1),
+            anchor: PanelKind::Composition,
+            placement: craft_ui::docking::Placement::Split(craft_ui::docking::Zone::Right),
+        })
+        .unwrap();
+    h.state_mut().apply_dock(craft_ui::docking::Action::Activate { panel: PanelKind::Composition }).unwrap();
     h.run_steps(3);
     // Opening B shows it in the active (unlocked) viewer; the locked one keeps A.
     invoke(&mut h, "comp.open", json!({"comp": b}));
@@ -90,7 +97,7 @@ fn new_viewers_lock_route_comps_and_activate_on_click() {
     h.state_mut().ui.locked_tabs.insert(PanelKind::Viewer(1).id());
     invoke(&mut h, "comp.open", json!({"comp": b}));
     assert_eq!(h.state().ui.active_viewer, 2);
-    assert!(h.state().ui.dock.contains(PanelKind::Viewer(2)));
+    assert!(h.state().ui.dock.is_docked(PanelKind::Viewer(2)));
     assert_eq!((shows(&h, 0), shows(&h, 1), shows(&h, 2)), (Some(a), Some(c), Some(b)));
     // Closing the active viewer forgets it; another open viewer takes over.
     h.state_mut().close_panel(PanelKind::Viewer(2));
@@ -134,7 +141,7 @@ fn a_locked_viewer_keeps_its_comp_when_the_project_panel_opens_another() {
     assert_eq!((h.state().ui.active_viewer, shows(&h, 0), shows(&h, 1)), (1, Some(a), Some(b)));
 }
 
-/// `cargo test -p effectcraft-ui-egui --test ui_viewers -- --ignored`: two viewers side by side
+/// `cargo test -p effectcraft-ui-egui --test it ui_viewers:: -- --ignored`: two viewers side by side
 /// (`target/test-out/viewers.png`).
 #[test]
 #[ignore]
@@ -145,8 +152,14 @@ fn viewers_snapshot() {
     let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
     h.run_steps(3);
     invoke(&mut h, "view.newViewer", json!({}));
-    assert!(h.state_mut().edit_layout(|l| l.dock(PanelKind::Viewer(1), PanelKind::Composition, Zone::Right)));
-    h.state_mut().ui.dock.activate(PanelKind::Composition);
+    h.state_mut()
+        .apply_dock(craft_ui::docking::Action::Move {
+            panel: PanelKind::Viewer(1),
+            anchor: PanelKind::Composition,
+            placement: craft_ui::docking::Placement::Split(craft_ui::docking::Zone::Right),
+        })
+        .unwrap();
+    h.state_mut().apply_dock(craft_ui::docking::Action::Activate { panel: PanelKind::Composition }).unwrap();
     invoke(&mut h, "comp.open", json!({"comp": other.0}));
     for _ in 0..300 {
         h.step();
diff --git a/crates/ui-egui/tests/ui_visual_review.rs b/crates/ui-egui/tests/it/ui_visual_review.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_visual_review.rs
rename to crates/ui-egui/tests/it/ui_visual_review.rs
diff --git a/crates/ui-egui/tests/ui_web_gpu_storage.rs b/crates/ui-egui/tests/it/ui_web_gpu_storage.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_web_gpu_storage.rs
rename to crates/ui-egui/tests/it/ui_web_gpu_storage.rs
index d706a382b..a742226de 100644
--- a/crates/ui-egui/tests/ui_web_gpu_storage.rs
+++ b/crates/ui-egui/tests/it/ui_web_gpu_storage.rs
@@ -172,7 +172,7 @@ fn gpu_worker_renders_effect_frames_and_the_disk_cache_survives_a_reload() {
     assert!(frames2.remote_disk());
     let until = std::time::Instant::now() + std::time::Duration::from_secs(5);
     let bar = loop {
-        let bar = frames2.disk_frames(&source(&s, None), &key(fx), 30, &opts);
+        let bar = frames2.disk_frames(&source(&s, None), &key(fx), 0..30, &opts);
         if !bar.is_empty() {
             break bar;
         }
@@ -211,7 +211,8 @@ impl StorageHost for Storage {
 fn send(h: &mut Harness<'_, EffectcraftApp>, method: &str, params: Value) {
     let ctx = h.ctx.clone();
     let (req, _rx) = ControlRequest::new(method, params);
-    if let Outcome::Done(v) = control::handle(h.state_mut(), &ctx, &req) {
+    let now = h.state().now();
+    if let Outcome::Done(v) = control::handle(h.state_mut(), &ctx, &req, now) {
         assert!(v["ok"] != false, "{method}: {v}");
     }
     // kittest doesn't call `raw_input_hook`: feed the synthetic click in.
diff --git a/crates/ui-egui/tests/ui_web_job_gpu.rs b/crates/ui-egui/tests/it/ui_web_job_gpu.rs
similarity index 99%
rename from crates/ui-egui/tests/ui_web_job_gpu.rs
rename to crates/ui-egui/tests/it/ui_web_job_gpu.rs
index 615d4fbd1..9060e1067 100644
--- a/crates/ui-egui/tests/ui_web_job_gpu.rs
+++ b/crates/ui-egui/tests/it/ui_web_job_gpu.rs
@@ -57,7 +57,7 @@ fn page() -> (Session, Arc<Manual>) {
     s.execute("prop.addKey", json!({"layer": l, "path": "effects/#1/transform/offset", "time": 0.0, "value": [0.5, 0.5]})).unwrap();
     s.execute("prop.addKey", json!({"layer": l, "path": "effects/#1/transform/offset", "time": 0.5, "value": [0.6, 0.56]})).unwrap();
     s.execute("effect.apply", json!({"layers": [l], "effect": "ec.blur.gaussian"})).unwrap();
-    s.execute("prop.set", json!({"layer": l, "path": "effects/#2/blurriness", "value": 3.0})).unwrap();
+    s.execute("prop.set", json!({"layer": l, "path": "effects/#2/blurriness", "value": 12.0})).unwrap();
     (s, off)
 }
 
diff --git a/crates/ui-egui/tests/ui_web_offload.rs b/crates/ui-egui/tests/it/ui_web_offload.rs
similarity index 100%
rename from crates/ui-egui/tests/ui_web_offload.rs
rename to crates/ui-egui/tests/it/ui_web_offload.rs
diff --git a/crates/ui-egui/tests/ui_workflow_selection.rs b/crates/ui-egui/tests/it/ui_workflow_selection.rs
similarity index 88%
rename from crates/ui-egui/tests/ui_workflow_selection.rs
rename to crates/ui-egui/tests/it/ui_workflow_selection.rs
index 6e264dd33..121c2b888 100644
--- a/crates/ui-egui/tests/ui_workflow_selection.rs
+++ b/crates/ui-egui/tests/it/ui_workflow_selection.rs
@@ -299,7 +299,7 @@ fn viewer_context_select_reaches_an_obscured_layer() {
         h.step();
     }
     h.run_steps(3);
-    h.get_by_label("Select ⏵").click();
+    h.get_by_label("Select").click();
     h.run_steps(3);
     h.get_by_label("Tile 1").click();
     h.run_steps(3);
@@ -637,3 +637,80 @@ fn timeline_context_menu_creates_shapes_and_masks_from_text() {
     assert!(h.query_by_label("Create Shapes from Text").is_none(), "no text conversion for a solid");
     assert!(h.query_by_label("Create Masks from Text").is_none(), "no text conversion for a solid");
 }
+
+// Regression test for #979 (#958): right-clicking a vector footage layer (SVG) in the Timeline
+// or the Composition viewer offered no Create Shapes from Vector Layer; raster layers must not.
+#[test]
+fn layer_context_menus_offer_create_shapes_from_vector_layer_for_vector_footage() {
+    use effectcraft_engine::project::LayerSource;
+    let dir = std::env::temp_dir().join(format!("ec-ui-vector-menu-{}", std::process::id()));
+    std::fs::create_dir_all(&dir).unwrap();
+    let svg = dir.join("logo.svg");
+    std::fs::write(
+        &svg,
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="20" viewBox="0 0 40 20"><rect width="40" height="20" fill="#ff0000"/></svg>"##,
+    )
+    .unwrap();
+    let png = dir.join("photo.png");
+    image::RgbaImage::from_pixel(16, 16, image::Rgba([0, 128, 255, 255])).save(&png).unwrap();
+    let mut s = effectcraft_host::session();
+    let item = s.execute("file.import", json!({"paths": [svg.to_string_lossy()]})).unwrap()["items"][0].as_u64().unwrap();
+    let raster = s.execute("file.import", json!({"paths": [png.to_string_lossy()]})).unwrap()["items"][0].as_u64().unwrap();
+    s.execute("comp.new", json!({"name":"Vec","width":320,"height":180,"duration":4})).unwrap();
+    // The raster layer sits below the SVG layer, so the viewer click below lands on the SVG.
+    let photo = s.execute("layer.addItem", json!({"item": raster})).unwrap()["layer"].as_u64().unwrap();
+    let logo = s.execute("layer.addItem", json!({"item": item})).unwrap()["layer"].as_u64().unwrap();
+    let plate = s.execute("layer.newSolid", json!({"name":"Plate","width":40,"height":40,"color":"#406080"})).unwrap()["layer"].as_u64().unwrap();
+    s.execute("edit.deselectAll", json!({})).unwrap();
+    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
+    h.run_steps(3);
+    let right_click = |h: &mut Harness<'_, EffectcraftApp>, p: Pos2| {
+        for pressed in [true, false] {
+            h.input_mut().events.push(Event::PointerMoved(p));
+            h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Secondary, pressed, modifiers: Modifiers::NONE });
+            h.step();
+        }
+        h.run_steps(3);
+    };
+    let row = |h: &Harness<'_, EffectcraftApp>, id: u64| {
+        let r = rect(h, &format!("timeline.layer.{id}.row"));
+        pos2(r.min.x + 210.0, r.center().y)
+    };
+    let label = "Create Shapes from Vector Layer";
+    let shapes =
+        |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layers.iter().filter(|l| matches!(l.source, LayerSource::Shape)).count();
+    // A raster-less solid does not offer the conversion.
+    h.state_mut().session.execute("layer.select", json!({"layers": [plate]})).unwrap();
+    h.run_steps(3);
+    let at = row(&h, plate);
+    right_click(&mut h, at);
+    assert!(h.query_by_label(label).is_none(), "no vector conversion for a solid");
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    // Nor does raster footage.
+    h.state_mut().session.execute("layer.select", json!({"layers": [photo]})).unwrap();
+    h.run_steps(3);
+    let at = row(&h, photo);
+    right_click(&mut h, at);
+    assert!(h.query_by_label(label).is_none(), "no vector conversion for raster footage");
+    h.key_press(egui::Key::Escape);
+    h.run_steps(3);
+    // The Timeline row of the SVG layer offers it, and it converts the layer.
+    h.state_mut().session.execute("layer.select", json!({"layers": [logo]})).unwrap();
+    h.run_steps(3);
+    let at = row(&h, logo);
+    right_click(&mut h, at);
+    h.get_by_label(label).click();
+    h.run_steps(3);
+    assert_eq!(shapes(&h), 1, "a shape layer was created from the SVG layer");
+    // The Composition viewer's menu offers it for the SVG layer under the pointer too.
+    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
+    h.state_mut().session.execute("prop.set", json!({"layer": plate, "path": "transform/position", "value": [40.0, 40.0]})).unwrap();
+    // The solid stays selected: the menu must follow the layer under the pointer, not the selection.
+    h.state_mut().session.execute("layer.select", json!({"layers": [plate]})).unwrap();
+    h.run_steps(3);
+    let comp = rect(&h, "viewer.comp");
+    right_click(&mut h, comp.center());
+    assert!(h.query_by_label(label).is_some(), "the viewer's context menu offers the vector conversion");
+    let _ = std::fs::remove_dir_all(&dir);
+}
diff --git a/crates/ui-egui/tests/ui_workspace_focus.rs b/crates/ui-egui/tests/it/ui_workspace_focus.rs
similarity index 90%
rename from crates/ui-egui/tests/ui_workspace_focus.rs
rename to crates/ui-egui/tests/it/ui_workspace_focus.rs
index 0d0ecd001..9bd5374bd 100644
--- a/crates/ui-egui/tests/ui_workspace_focus.rs
+++ b/crates/ui-egui/tests/it/ui_workspace_focus.rs
@@ -5,27 +5,31 @@ use std::sync::Arc;
 use effectcraft_engine::Session;
 use effectcraft_engine::config::{ConfigStore, DirConfig, MemoryConfig};
 use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{DockNode, PanelKind, SplitSize};
+use effectcraft_ui_egui::dock::{self, Node, PanelKind, SplitSize};
 use effectcraft_ui_egui::state::Tool;
 use egui::{Event, Id, Key, Modifiers, vec2};
 use egui_kittest::Harness;
 use serde_json::json;
 
+/// The egui id of panel `p`'s dock tab.
+fn tab_id(p: PanelKind) -> Id {
+    craft_ui::docking::DockArea::<PanelKind>::hit_id(effectcraft_ui_egui::dock_ui::area_id(), &craft_ui::docking::Hit::Tab(p))
+}
+
 #[test]
 fn named_and_current_workspaces_survive_frontend_restart() {
     let store = Arc::new(MemoryConfig::default());
     let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
-    app.ui.dock = DockNode::Split {
-        vertical: false,
-        size: SplitSize::FixedA(345.0),
-        a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project], active: 0 }),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Layer], active: 1 }),
-    };
+    app.ui.dock = dock::docked(dock::hsplit(
+        SplitSize::FixedFirst(345.0),
+        dock::tabs(&[PanelKind::Project], 0),
+        dock::tabs(&[PanelKind::Composition, PanelKind::Layer], 1),
+    ));
     let ctx = egui::Context::default();
     effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.saveWorkspaceAs", json!({"name": "Restart layout"})).unwrap();
     let saved = app.ui.dock.clone();
-    if let DockNode::Split { size, .. } = &mut app.ui.dock {
-        *size = SplitSize::FixedA(390.0);
+    if let Some(Node::Split { size, .. }) = &mut app.ui.dock.layout.root {
+        *size = SplitSize::FixedFirst(390.0);
     }
     app.ui.focused = PanelKind::Layer;
     let current = app.ui.dock.clone();
@@ -100,15 +104,18 @@ fn unreadable_native_workspace_is_preserved_after_later_layout_changes() {
 #[test]
 fn legacy_named_workspaces_migrate_once_and_survive_actual_app_restart() {
     let store = Arc::new(MemoryConfig::default());
-    let saved = effectcraft_ui_egui::dock::workspace("Minimal");
-    store.write("workspaces.json", &json!({"workspaces":{"Legacy":saved},"floating":{}}).to_string()).unwrap();
+    // An unversioned record from an earlier EffectCraft: its Minimal layout saved as "Legacy".
+    let legacy = r#"{"floating":{},"workspaces":{"Legacy":{"Split":{"a":{"Tabs":{"active":0,"panels":["Composition"]}},"b":{"Tabs":{"active":0,"panels":["Timeline"]}},"size":{"Ratio":0.6000000238418579},"vertical":true}}}}"#;
+    store.write("workspaces.json", legacy).unwrap();
+    let saved = effectcraft_ui_egui::dock::Workspace::new(effectcraft_ui_egui::dock::workspace("Minimal"));
     let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
     assert_eq!(app.ui.saved_workspaces.get("Legacy"), Some(&saved));
     app.set_workspace("Legacy");
     let ctx = egui::Context::default();
     effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.saveWorkspaceAs", json!({"name":"Migrated"})).unwrap();
     let text = store.read("workspaces.json").unwrap();
-    assert_eq!(serde_json::from_str::<serde_json::Value>(&text).unwrap()["version"], 1);
+    assert_eq!(serde_json::from_str::<serde_json::Value>(&text).unwrap()["version"], 2);
+    assert_eq!(store.read("workspaces.old.json").as_deref(), Some(legacy));
     let restarted = EffectcraftApp::new(Session { config: Some(store), ..Default::default() });
     assert_eq!(restarted.ui.saved_workspaces.get("Legacy"), Some(&saved));
     assert_eq!(restarted.ui.saved_workspaces.get("Migrated"), Some(&saved));
@@ -128,23 +135,23 @@ fn tab_and_shift_tab_traverse_toolbar_and_space_activates_only_focused_tool() {
     h.run_steps(3);
     for _ in 0..8 {
         key(&mut h, Key::Tab, Modifiers::NONE);
-        if h.ctx.memory(|m| m.focused()) == Some(Id::new(("tool-slot", 0usize))) {
+        if h.ctx.memory(|m| m.focused()) == Some(Id::unique(("tool-slot", 0usize))) {
             break;
         }
     }
-    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::new(("tool-slot", 0usize))));
+    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::unique(("tool-slot", 0usize))));
     key(&mut h, Key::Tab, Modifiers::NONE);
-    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::new(("tool-slot", 1usize))));
+    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::unique(("tool-slot", 1usize))));
     assert_eq!(h.state().ui.tool, Tool::Selection, "focus movement alone must not select a tool");
     key(&mut h, Key::Tab, Modifiers::NONE);
-    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::new(("tool-slot", 2usize))));
+    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::unique(("tool-slot", 2usize))));
     key(&mut h, Key::Tab, Modifiers::SHIFT);
-    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::new(("tool-slot", 1usize))));
+    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::unique(("tool-slot", 1usize))));
     key(&mut h, Key::Space, Modifiers::NONE);
     assert_eq!(h.state().ui.tool, Tool::Hand);
     assert!(!h.state().playback.playing, "Space activates the focused widget, not preview playback");
     assert!(Arc::ptr_eq(&h.state().session.project, &project), "keyboard focus and tool selection do not modify the project");
-    let response = h.ctx.read_response(Id::new(("tool-slot", 1usize))).unwrap();
+    let response = h.ctx.read_response(Id::unique(("tool-slot", 1usize))).unwrap();
     assert!(
         h.output().shapes.iter().any(|shape| {
             matches!(&shape.shape, egui::Shape::Rect(r) if r.rect == response.rect.shrink(1.0) && r.stroke.color == h.state().tokens.text && r.stroke.width > 0.0)
@@ -166,19 +173,19 @@ fn tab_traversal_activates_an_inactive_dock_tab_without_editing_the_project() {
     app.ui.start_screen = false;
     app.ui.show_menu_bar = false;
     // Leave the inactive, layer-named tab visible instead of behind the overflow control.
-    if let DockNode::Split { a, .. } = &mut app.ui.dock
-        && let DockNode::Split { a, .. } = a.as_mut()
-        && let DockNode::Split { size, .. } = a.as_mut()
+    if let Some(Node::Split { first, .. }) = &mut app.ui.dock.layout.root
+        && let Node::Split { first, .. } = first.as_mut()
+        && let Node::Split { size, .. } = first.as_mut()
     {
-        *size = SplitSize::FixedA(420.0);
+        *size = SplitSize::FixedFirst(420.0);
     }
     let mut h = Harness::builder().with_size(vec2(1200.0, 760.0)).build_eframe(move |_| app);
     h.run_steps(3);
     assert!(h.state().auto.find("panel.tab.EffectControls").is_some(), "the inactive tab must be visible in this fixture");
     let before = h.state().ui.dock.clone();
-    let target = Id::new(("tab", "aaa".to_string(), 1usize));
+    let target = tab_id(PanelKind::EffectControls);
     let mut tabs = 0;
-    for _ in 0..80 {
+    for _ in 0..200 {
         key(&mut h, Key::Tab, Modifiers::NONE);
         tabs += 1;
         if h.ctx.memory(|m| m.focused()) == Some(target) {
@@ -188,24 +195,26 @@ fn tab_traversal_activates_an_inactive_dock_tab_without_editing_the_project() {
     assert_eq!(h.ctx.memory(|m| m.focused()), Some(target));
     println!("Tab presses from no focus to Effect Controls: {tabs}");
     assert_eq!(h.state().ui.dock, before, "traversal alone must not activate a tab");
+    // craft-ui outlines the keyboard-focused tab, inset 2 pt, in the dock's accent (EffectCraft's
+    // focus colour).
+    let response = h.ctx.read_response(target).unwrap();
+    assert!(
+        h.output().shapes.iter().any(|shape| {
+            matches!(&shape.shape, egui::Shape::Rect(r) if r.rect == response.rect.shrink(2.0) && r.stroke.color == h.state().tokens.focus && r.stroke.width > 0.0)
+        }),
+        "the dock tab must visibly show keyboard focus"
+    );
     key(&mut h, Key::Space, Modifiers::NONE);
     let mut activated = before;
-    assert!(activated.activate(PanelKind::EffectControls));
+    activated.apply(craft_ui::docking::Action::Activate { panel: PanelKind::EffectControls }, dock::permissions).unwrap();
     assert_eq!(h.state().ui.dock, activated);
     assert_eq!(h.state().ui.focused, PanelKind::EffectControls);
     assert!(!h.state().playback.playing);
     assert!(Arc::ptr_eq(&h.state().session.project, &project));
-    let response = h.ctx.read_response(target).unwrap();
-    assert!(
-        h.output().shapes.iter().any(|shape| {
-            matches!(&shape.shape, egui::Shape::Rect(r) if r.rect == response.rect.shrink(1.0) && r.stroke.color == h.state().tokens.text && r.stroke.width > 0.0)
-        }),
-        "the active dock tab must visibly retain keyboard focus"
-    );
     let inspected = effectcraft_ui_egui::control::inspect(h.state(), &h.ctx);
     assert_eq!(inspected["keyboardFocus"]["automationId"], "panel.tab.EffectControls");
     key(&mut h, Key::Tab, Modifiers::SHIFT);
-    assert_eq!(h.ctx.memory(|m| m.focused()), Some(Id::new(("tab", "aaa".to_string(), 0usize))));
+    assert_eq!(h.ctx.memory(|m| m.focused()), Some(tab_id(PanelKind::Project)));
     key(&mut h, Key::Enter, Modifiers::NONE);
     assert_eq!(h.state().ui.focused, PanelKind::Project);
     assert!(!h.state().playback.playing);
@@ -284,8 +293,8 @@ fn control_root_divider_drag_after_toolbar_and_dock_tab_keyboard_activation() {
     d.ok("ui.click", json!({"id":"tools.Selection"}), true);
     // The toolbar can grow as upstream adds controls. Traverse to the actual response
     // identity rather than assuming a fixed number of focus stops.
-    let target = Id::new(("tab", "aaa".to_string(), 1usize));
-    for tabs in 1..=100 {
+    let target = tab_id(PanelKind::EffectControls);
+    for tabs in 1..=200 {
         d.ok("ui.key", json!({"key":"Tab"}), true);
         assert!(d.h.state().ui.mini_flowchart.is_none(), "dock-tab traversal must not open a foreground popup");
         if d.h.ctx.memory(|memory| memory.focused()) == Some(target) {
@@ -480,7 +489,7 @@ fn failed_save_or_delete_of_a_saved_workspace_keeps_the_file() {
     let saved = app.ui.dock.clone();
     let before = store.read("workspaces.json").unwrap();
     store.full.store(true, std::sync::atomic::Ordering::Relaxed);
-    app.ui.dock.close(PanelKind::Timeline);
+    app.close_panel(PanelKind::Timeline);
     let error = invoke(&mut app, "window.saveWorkspace", json!({})).unwrap_err();
     assert!(error.contains("synthetic full disk") && error.contains("may be lost after a restart"), "{error}");
     assert!(invoke(&mut app, "window.editWorkspaces", json!({"name": "Kept", "delete": true})).is_err());
diff --git a/crates/ui-egui/tests/viewer_geometry.rs b/crates/ui-egui/tests/it/viewer_geometry.rs
similarity index 95%
rename from crates/ui-egui/tests/viewer_geometry.rs
rename to crates/ui-egui/tests/it/viewer_geometry.rs
index ff242230f..e3e4128e8 100644
--- a/crates/ui-egui/tests/viewer_geometry.rs
+++ b/crates/ui-egui/tests/it/viewer_geometry.rs
@@ -95,7 +95,13 @@ fn compact_control_row_scrolls_and_preserves_interactions() {
     let mut h = harness(300.0, ThemeKind::Light);
     assert!(rect(&h, "viewer.timecode").right() > 300.0);
     h.event(Event::PointerMoved(pos2(150.0, 345.0)));
-    h.event(Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(-1500.0, 0.0), modifiers: Default::default(), phase: egui::TouchPhase::Move });
+    h.event(Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: vec2(-1500.0, 0.0),
+        modifiers: Default::default(),
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
     h.run_steps(30);
     let timecode = rect(&h, "viewer.timecode");
     let row = rect(&h, "viewer.controls");
@@ -160,7 +166,7 @@ fn click_control(h: &mut Harness<'_, EffectcraftApp>, id: &str) {
 #[test]
 fn tab_traversal_reveals_the_last_control() {
     let mut h = harness(300.0, ThemeKind::Dark);
-    let last = egui::Id::new("vw-timecode");
+    let last = egui::Id::unique("vw-timecode");
     for _ in 0..80 {
         h.key_press(egui::Key::Tab);
         h.run_steps(3);
@@ -232,7 +238,13 @@ fn painted_scrollbar(h: &Harness<'_, EffectcraftApp>, kind: ThemeKind, scale: f3
 
 fn scroll_controls_to_end(h: &mut Harness<'_, EffectcraftApp>) {
     h.event(Event::PointerMoved(pos2(150.0, 345.0)));
-    h.event(Event::MouseWheel { unit: egui::MouseWheelUnit::Point, delta: vec2(-1500.0, 0.0), modifiers: Default::default(), phase: egui::TouchPhase::Move });
+    h.event(Event::MouseWheel {
+        unit: egui::MouseWheelUnit::Point,
+        delta: vec2(-1500.0, 0.0),
+        modifiers: Default::default(),
+        phase: egui::TouchPhase::Move,
+        source: egui::MouseWheelSource::Wheel,
+    });
     h.run_steps(30);
     h.event(Event::PointerMoved(pos2(150.0, 180.0)));
     h.run_steps(3);
diff --git a/crates/ui-egui/tests/viewer_passive_display.rs b/crates/ui-egui/tests/it/viewer_passive_display.rs
similarity index 100%
rename from crates/ui-egui/tests/viewer_passive_display.rs
rename to crates/ui-egui/tests/it/viewer_passive_display.rs
diff --git a/crates/ui-egui/tests/shared_docking_ui.rs b/crates/ui-egui/tests/shared_docking_ui.rs
deleted file mode 100644
index ad56e68d5..000000000
--- a/crates/ui-egui/tests/shared_docking_ui.rs
+++ /dev/null
@@ -1,426 +0,0 @@
-//! Existing EffectCraft workspaces use shared transactions without changing their saved schema.
-use craft_ui::docking::{Action, Placement, Zone};
-use effectcraft_engine::Session;
-use effectcraft_ui_egui::{
-    EffectcraftApp,
-    dock::{self, DockNode, Layout, PanelKind, SplitSize, StackEntry},
-};
-use egui::{Event, Modifiers, PointerButton, Rect, pos2, vec2};
-use egui_kittest::Harness;
-use egui_kittest::kittest::{NodeT, Queryable};
-use serde_json::json;
-
-#[test]
-fn shared_move_preserves_accordion_metadata_and_unrelated_active_tabs() {
-    let mut layout = Layout {
-        root: DockNode::Split {
-            vertical: false,
-            size: SplitSize::FixedB(300.0),
-            a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project, PanelKind::Composition, PanelKind::Layer], active: 1 }),
-            b: Box::new(DockNode::Stack {
-                entries: vec![
-                    StackEntry::new(PanelKind::Preview, false, Some(73.0)),
-                    StackEntry::new(PanelKind::Properties, true, Some(211.0)),
-                    StackEntry::new(PanelKind::Align, false, None),
-                ],
-            }),
-        },
-        floating: vec![],
-    };
-    layout.apply(Action::Close { panel: PanelKind::Project }).unwrap();
-    assert!(layout.root.is_visible(PanelKind::Composition));
-    layout.apply(Action::Move { panel: PanelKind::Preview, anchor: PanelKind::Align, placement: Placement::Tab { before: None } }).unwrap();
-    let DockNode::Split { b, size, .. } = &layout.root else { panic!("split was lost") };
-    assert_eq!(*size, SplitSize::FixedB(300.0));
-    let DockNode::Stack { entries } = b.as_ref() else { panic!("stack was lost") };
-    // Upstream now makes a tab drop join the anchor's accordion frame. Its height belongs
-    // to the destination frame; the unrelated Properties frame keeps its exact metadata.
-    let joined = entries.iter().find(|entry| entry.contains(PanelKind::Preview)).unwrap();
-    assert_eq!(joined.panels, vec![PanelKind::Align, PanelKind::Preview]);
-    assert_eq!(joined.shown(), Some(PanelKind::Preview));
-    assert!(joined.open);
-    assert_eq!(joined.height, None);
-    assert_eq!(entries.iter().find(|entry| entry.contains(PanelKind::Properties)).unwrap(), &StackEntry::new(PanelKind::Properties, true, Some(211.0)));
-    let before = layout.clone();
-    assert!(layout.apply(Action::Move { panel: PanelKind::Preview, anchor: PanelKind::Audio, placement: Placement::Split(Zone::Left) }).is_err());
-    assert_eq!(layout, before);
-    assert!(layout.apply(Action::Float { panel: PanelKind::Preview, rect: [0.0, 0.0, f32::INFINITY, 200.0] }).is_err());
-    assert_eq!(layout, before);
-}
-
-#[test]
-fn every_builtin_workspace_and_dynamic_identity_roundtrips() {
-    for name in dock::WORKSPACES {
-        let mut layout = Layout { root: dock::workspace(name), floating: dock::workspace_floating(name) };
-        let before = serde_json::to_value(&layout).unwrap();
-        // A structural no-op still crosses both adapters and shared validation. The complete
-        // persisted shape must remain byte-equivalent, including accordion state and heights.
-        let action = match &layout.root {
-            DockNode::Split { size, .. } => Action::ResizeSplit {
-                path: vec![],
-                size: match *size {
-                    SplitSize::Ratio(v) => craft_ui::layout::SplitSize::Ratio(v),
-                    SplitSize::FixedA(v) => craft_ui::layout::SplitSize::FixedFirst(v),
-                    SplitSize::FixedB(v) => craft_ui::layout::SplitSize::FixedSecond(v),
-                },
-            },
-            DockNode::Tabs { panels, .. } => Action::Move { panel: panels[0], anchor: panels[1], placement: Placement::Tab { before: Some(panels[0]) } },
-            DockNode::Stack { entries } => Action::SetStackOpen { panel: entries[0].shown().unwrap(), open: entries[0].open },
-        };
-        layout.apply(action).unwrap();
-        assert_eq!(before, serde_json::to_value(&layout).unwrap());
-        let back: Layout = serde_json::from_value(before).unwrap();
-        assert_eq!(layout, back);
-    }
-    let mut layout = Layout {
-        root: DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Viewer(42), PanelKind::ScriptPanel(77)], active: 1 },
-        floating: vec![],
-    };
-    layout.apply(Action::Float { panel: PanelKind::ScriptPanel(77), rect: [20.0, 30.0, 400.0, 300.0] }).unwrap();
-    layout.apply(Action::Move { panel: PanelKind::ScriptPanel(77), anchor: PanelKind::Viewer(42), placement: Placement::Tab { before: None } }).unwrap();
-    assert!(layout.floating.is_empty());
-    assert!(layout.contains(PanelKind::Viewer(42)));
-    assert!(layout.root.is_visible(PanelKind::ScriptPanel(77)));
-}
-
-fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
-    let element = h.state().auto.find(id).unwrap_or_else(|| panic!("missing {id}"));
-    Rect::from_min_size(pos2(element.rect[0], element.rect[1]), vec2(element.rect[2], element.rect[3]))
-}
-fn drag(h: &mut Harness<'_, EffectcraftApp>, from: egui::Pos2, to: egui::Pos2, modifiers: Modifiers) {
-    h.event(Event::ModifiersChanged(modifiers));
-    h.event(Event::PointerMoved(from));
-    h.step();
-    h.event(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers });
-    h.step();
-    for fraction in [0.05, 0.25, 0.5, 0.75, 1.0] {
-        h.event(Event::PointerMoved(from.lerp(to, fraction)));
-        h.step();
-    }
-    h.event(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers });
-    h.step();
-    h.event(Event::ModifiersChanged(Modifiers::NONE));
-    h.run_steps(3);
-}
-
-#[test]
-fn pointer_drop_merges_floats_and_redocks_without_project_changes() {
-    let mut session = Session::default();
-    session.execute("comp.new", json!({"name": "Docking composition", "width": 320, "height": 180, "duration": 4})).unwrap();
-    session.execute("layer.newSolid", json!({"name": "Teal plate", "width": 320, "height": 180, "color": "#245b68"})).unwrap();
-    session.execute("layer.newSolid", json!({"name": "Coral tile", "width": 110, "height": 70, "color": "#ee7859"})).unwrap();
-    let mut app = EffectcraftApp::new(session);
-    app.ui.start_screen = false;
-    app.ui.dock = DockNode::Split {
-        vertical: false,
-        size: SplitSize::FixedA(400.0),
-        a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project, PanelKind::Info, PanelKind::Audio], active: 1 }),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Layer], active: 0 }),
-    };
-    app.ui.dock = DockNode::Split {
-        vertical: true,
-        size: SplitSize::Ratio(0.62),
-        a: Box::new(app.ui.dock),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Timeline], active: 0 }),
-    };
-    let snapshots = std::env::var_os("CRAFT_UI_DOCKING_SNAPSHOT_DIR").map(std::path::PathBuf::from);
-    let mut builder = Harness::builder().with_size(vec2(1200.0, 760.0));
-    if snapshots.is_some() {
-        builder = builder.wgpu();
-    }
-    let mut h = builder.build_eframe(move |_| app);
-    h.run_steps(4);
-    let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);
-    while h.state().frames.urgent_pending() && std::time::Instant::now() < deadline {
-        std::thread::sleep(std::time::Duration::from_millis(1));
-    }
-    assert!(!h.state().frames.urgent_pending());
-    h.run_steps(3);
-    let project = h.state().session.project.clone();
-    let times = h.state().session.state.times.clone();
-    let mut action_log = vec![action_state(&h, "start")];
-    let from = rect(&h, "panel.tab.Info").center();
-    let to = rect(&h, "panel.Composition").center();
-    drag(&mut h, from, to, Modifiers::NONE);
-    assert!(h.state().ui.dock.is_visible(PanelKind::Info));
-    assert!(same_group(&h.state().ui.dock, PanelKind::Info, PanelKind::Composition));
-    action_log.push(action_state(&h, "merged"));
-    let from = rect(&h, "panel.tab.Info").center();
-    let before = rect(&h, "panel.tab.Composition");
-    drag(&mut h, from, pos2(before.left() + 2.0, before.center().y), Modifiers::NONE);
-    assert_eq!(tabs_containing(&h.state().ui.dock, PanelKind::Info).first(), Some(&PanelKind::Info));
-    action_log.push(action_state(&h, "reordered"));
-
-    let from = rect(&h, "panel.tab.Info").center();
-    drag(&mut h, from, pos2(700.0, 400.0), Modifiers::COMMAND);
-    assert_eq!(h.state().ui.floating.len(), 1);
-    assert_eq!(h.get_by_label("Resize floating panel").accesskit_node().role(), egui::accesskit::Role::Button);
-    action_log.push(action_state(&h, "floated"));
-    let original = h.state().ui.floating[0].rect;
-    let grip = rect(&h, "panel.float.0.resize").center();
-    drag(&mut h, grip, grip + vec2(36.0, 24.0), Modifiers::NONE);
-    assert!(h.state().ui.floating[0].rect[2] > original[2] + 25.0);
-    assert!(h.state().ui.floating[0].rect[3] > original[3] + 15.0);
-    action_log.push(action_state(&h, "resized"));
-    let grip_id = egui::Id::new(("floating-panel", PanelKind::Info.id())).with("resize");
-    assert_eq!(h.ctx.memory(|memory| memory.focused()), Some(grip_id));
-    let before_keys = h.state().ui.floating[0].rect;
-    for key in [egui::Key::ArrowRight, egui::Key::ArrowDown] {
-        for pressed in [true, false] {
-            h.event(Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE });
-            h.step();
-        }
-    }
-    assert_eq!(h.state().ui.floating[0].rect[2], before_keys[2] + 8.0);
-    assert_eq!(h.state().ui.floating[0].rect[3], before_keys[3] + 8.0);
-    h.event(Event::Key { key: egui::Key::Tab, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
-    h.step();
-    h.event(Event::Key { key: egui::Key::Tab, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE });
-    h.run_steps(3);
-    assert_ne!(h.ctx.memory(|memory| memory.focused()), Some(grip_id));
-    action_log.push(action_state(&h, "keyboard-resized"));
-    let resized = h.state().ui.floating[0].rect;
-    let header = rect(&h, "panel.float.0.move");
-    let from = pos2(header.right() - 24.0, header.center().y);
-    drag(&mut h, from, from - vec2(24.0, 18.0), Modifiers::NONE);
-    assert!(h.state().ui.floating[0].rect[0] < resized[0] - 15.0);
-    assert!(h.state().ui.floating[0].rect[1] < resized[1] - 10.0);
-    action_log.push(action_state(&h, "moved"));
-
-    if let Some(directory) = &snapshots {
-        std::fs::create_dir_all(directory).unwrap();
-        h.render().unwrap().save(directory.join("effectcraft-floating.png")).unwrap();
-    }
-    let from = rect(&h, "panel.tab.Info").center();
-    let to = rect(&h, "panel.Audio").center();
-    drag(&mut h, from, to, Modifiers::NONE);
-    assert!(h.state().ui.floating.is_empty());
-    action_log.push(action_state(&h, "redocked"));
-    assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
-    assert_eq!(times, h.state().session.state.times);
-    assert!(h.state().auto.elements.iter().any(|element| element.id.starts_with("timeline.layer.")));
-    h.state_mut().session.execute("view.exposure", json!({"stops": 2.0})).unwrap();
-    h.run_steps(3);
-    let pos = rect(&h, "viewer.resetExposure").center();
-    h.event(Event::PointerMoved(pos));
-    h.step();
-    for pressed in [true, false] {
-        h.event(Event::PointerButton { pos, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
-        h.step();
-    }
-    h.run_steps(3);
-    assert_eq!(h.state().session.state.viewer.exposure, 0.0);
-    action_log.push(action_state(&h, "viewer-reset-exposure"));
-    if let Some(directory) = &snapshots {
-        std::fs::write(directory.join("effectcraft-actions.json"), serde_json::to_vec_pretty(&action_log).unwrap()).unwrap();
-    }
-    if let Some(directory) = &snapshots {
-        h.render().unwrap().save(directory.join("effectcraft-redocked.png")).unwrap();
-    }
-    assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
-}
-
-fn same_group(root: &DockNode, first: PanelKind, second: PanelKind) -> bool {
-    match root {
-        DockNode::Tabs { panels, .. } => panels.contains(&first) && panels.contains(&second),
-        DockNode::Split { a, b, .. } => same_group(a, first, second) || same_group(b, first, second),
-        DockNode::Stack { .. } => false,
-    }
-}
-
-#[test]
-fn current_and_named_floating_layouts_survive_restart() {
-    use effectcraft_engine::config::MemoryConfig;
-    use std::sync::Arc;
-    let store = Arc::new(MemoryConfig::default());
-    let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
-    assert!(app.edit_layout(|layout| layout.apply(Action::Float { panel: PanelKind::Project, rect: [45.0, 65.0, 430.0, 310.0] }).is_ok()));
-    let ctx = egui::Context::default();
-    effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.saveWorkspaceAs", json!({"name": "Shared float"})).unwrap();
-    let saved = app.ui.floating.clone();
-    assert!(app.edit_layout(|layout| layout.apply(Action::MoveFloating { panel: PanelKind::Project, rect: [75.0, 95.0, 480.0, 360.0] }).is_ok()));
-    let current = app.ui.floating.clone();
-    eframe::App::on_exit(&mut app);
-    let mut restarted = EffectcraftApp::new(Session { config: Some(store), ..Default::default() });
-    assert_eq!(restarted.ui.floating, current);
-    restarted.set_workspace("Default");
-    restarted.set_workspace("Shared float");
-    assert_eq!(restarted.ui.floating, saved);
-}
-
-fn tabs_containing(root: &DockNode, panel: PanelKind) -> Vec<PanelKind> {
-    match root {
-        DockNode::Tabs { panels, .. } if panels.contains(&panel) => panels.clone(),
-        DockNode::Split { a, b, .. } => {
-            let first = tabs_containing(a, panel);
-            if first.is_empty() { tabs_containing(b, panel) } else { first }
-        }
-        _ => vec![],
-    }
-}
-
-#[test]
-fn float_command_rejects_malformed_rectangles_atomically() {
-    let mut app = EffectcraftApp::new(Session::default());
-    let before = app.ui.dock.clone();
-    let ctx = egui::Context::default();
-    for rect in [json!([1, 2, 300]), json!([1, 2, 300, 200, 7]), json!([1, 2, 1e100, 200]), json!("rectangle")] {
-        assert!(effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.floatPanel", json!({"panel": "Project", "rect": rect})).is_err());
-        assert_eq!(app.ui.dock, before);
-        assert!(app.ui.floating.is_empty());
-    }
-    app.ui.dock = DockNode::Tabs { panels: vec![PanelKind::Project], active: 0 };
-    assert!(!app.edit_layout(|layout| layout.apply(Action::Float { panel: PanelKind::Project, rect: [1.0, 2.0, 300.0, 200.0] }).is_ok()));
-}
-
-/// A floating panel dragged past the window's bottom edge is drawn where its rect says: it was
-/// shifted back into the window while its rect kept moving, and its strip then clashed with the
-/// floating area's own widget ("Double use of widget ID").
-#[test]
-fn floating_panel_dragged_past_the_window_edge_is_drawn_at_its_rect() {
-    let mut h = Harness::builder().with_size(vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(Session::default()));
-    h.run_steps(3);
-    let ctx = h.ctx.clone();
-    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "window.floatPanel", json!({"panel": "Preview", "rect": [600.0, 400.0, 360.0, 300.0]})).unwrap();
-    h.run_steps(3);
-    let strip = rect(&h, "panel.float.0.move");
-    let from = pos2(strip.right() - 24.0, strip.center().y);
-    drag(&mut h, from, from + vec2(40.0, 420.0), Modifiers::NONE);
-    let moved = h.state().ui.floating[0].rect;
-    assert!(moved[1] + moved[3] > 1000.0, "the panel hangs past the bottom edge: {moved:?}");
-    let strip = rect(&h, "panel.float.0.move");
-    assert_eq!([strip.min.x, strip.min.y], [moved[0], moved[1]]);
-    // The strip still moves it from there.
-    let from = pos2(strip.right() - 24.0, strip.center().y);
-    drag(&mut h, from, from - vec2(30.0, 200.0), Modifiers::NONE);
-    assert_eq!(h.state().ui.floating[0].rect[1], moved[1] - 200.0);
-}
-
-fn action_state(h: &Harness<'_, EffectcraftApp>, action: &str) -> serde_json::Value {
-    json!({"action": action, "dock": h.state().ui.dock, "floating": h.state().ui.floating, "focused": h.state().ui.focused})
-}
-
-#[test]
-fn catalog_docking_action_supports_resize_reorder_and_floating_geometry() {
-    let mut app = EffectcraftApp::new(Session::default());
-    app.ui.dock = DockNode::Split {
-        vertical: false,
-        size: SplitSize::FixedA(300.0),
-        a: Box::new(DockNode::Tabs { panels: vec![PanelKind::Project, PanelKind::Info], active: 1 }),
-        b: Box::new(DockNode::Tabs { panels: vec![PanelKind::Composition], active: 0 }),
-    };
-    let ctx = egui::Context::default();
-    for action in [
-        Action::ResizeSplit { path: vec![], size: craft_ui::layout::SplitSize::FixedFirst(360.0) },
-        Action::Move { panel: PanelKind::Info, anchor: PanelKind::Project, placement: Placement::Tab { before: Some(PanelKind::Project) } },
-        Action::Float { panel: PanelKind::Info, rect: [20.0, 40.0, 300.0, 200.0] },
-        Action::MoveFloating { panel: PanelKind::Info, rect: [45.0, 65.0, 330.0, 240.0] },
-    ] {
-        effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.dockAction", json!({"action": action})).unwrap();
-    }
-    assert_eq!(app.ui.floating[0].rect, [45.0, 65.0, 330.0, 240.0]);
-    let DockNode::Split { size, .. } = &app.ui.dock else { panic!("split lost") };
-    assert_eq!(*size, SplitSize::FixedA(360.0));
-    let before = json!({"dock": app.ui.dock, "floating": app.ui.floating});
-    assert!(
-        effectcraft_ui_egui::menus::invoke(
-            &mut app,
-            &ctx,
-            "window.dockAction",
-            json!({"action": {
-                "ResizeSplit": {"path": [true, true], "size": {"Ratio": 0.5}}
-            }})
-        )
-        .is_err()
-    );
-    assert_eq!(json!({"dock": app.ui.dock, "floating": app.ui.floating}), before);
-}
-
-#[test]
-fn catalog_close_keeps_dynamic_panel_identity() {
-    let mut app = EffectcraftApp::new(Session::default());
-    app.ui.dock = DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Viewer(42), PanelKind::ScriptPanel(77)], active: 1 };
-    let ctx = egui::Context::default();
-    for panel in [PanelKind::Viewer(42), PanelKind::ScriptPanel(77)] {
-        effectcraft_ui_egui::menus::invoke(&mut app, &ctx, "window.dockAction", json!({"action": Action::Close { panel }})).unwrap();
-        assert!(!app.ui.dock.contains(panel));
-    }
-    assert!(app.ui.dock.contains(PanelKind::Composition));
-}
-
-#[test]
-fn accordion_resize_routes_pointer_and_keyboard_without_changing_closed_entries() {
-    let mut session = Session::default();
-    session.execute("comp.new", json!({"width": 160, "height": 90, "duration": 1})).unwrap();
-    let mut app = EffectcraftApp::new(session);
-    app.ui.start_screen = false;
-    let mut h = Harness::builder().with_size(vec2(1000.0, 720.0)).build_eframe(move |_| app);
-    h.run_steps(4);
-    h.state_mut().ui.dock = DockNode::Stack {
-        entries: vec![
-            StackEntry::new(PanelKind::Preview, true, Some(100.0)),
-            StackEntry::new(PanelKind::Properties, true, None),
-            StackEntry::new(PanelKind::Align, false, Some(77.0)),
-        ],
-    };
-    h.run_steps(3);
-    let project = h.state().session.project.clone();
-    let id = egui::Id::new(("dock-gutter", "s0".to_string()));
-    h.ctx.memory_mut(|memory| memory.request_focus(id));
-    h.run_steps(2);
-    for pressed in [true, false] {
-        h.event(Event::Key { key: egui::Key::ArrowDown, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE });
-        h.step();
-    }
-    let DockNode::Stack { entries } = &h.state().ui.dock else { panic!("stack lost") };
-    assert_eq!(entries[0].height, Some(108.0));
-    let from = rect(&h, "dock.gutter.s0").center();
-    drag(&mut h, from, from + vec2(0.0, 16.0), Modifiers::NONE);
-    let DockNode::Stack { entries } = &h.state().ui.dock else { panic!("stack lost") };
-    assert_eq!(entries[0].height, Some(124.0));
-    assert_eq!(entries[1].height, None);
-    assert_eq!(entries[2], StackEntry::new(PanelKind::Align, false, Some(77.0)));
-    assert!(std::sync::Arc::ptr_eq(&project, &h.state().session.project));
-}
-
-#[test]
-fn legacy_close_repairs_selection_but_transactions_remain_strict() {
-    use effectcraft_ui_egui::dock::Floating;
-    let mut root = DockNode::Tabs { panels: vec![PanelKind::Properties, PanelKind::Align, PanelKind::EffectsPresets], active: usize::MAX };
-    root.close(PanelKind::History);
-    assert!(root.is_visible(PanelKind::EffectsPresets));
-    let mut layout = Layout {
-        root: DockNode::Tabs { panels: vec![PanelKind::Composition], active: 0 },
-        floating: vec![Floating {
-            panels: vec![PanelKind::Properties, PanelKind::Align, PanelKind::EffectsPresets],
-            active: usize::MAX,
-            rect: [0.0, 0.0, 300.0, 200.0],
-        }],
-    };
-    let before = layout.clone();
-    assert!(layout.apply(Action::Close { panel: PanelKind::Properties }).is_err());
-    assert_eq!(layout, before);
-    assert!(layout.unfloat(PanelKind::Properties));
-    assert_eq!(layout.floating[0].panels.get(layout.floating[0].active), Some(&PanelKind::EffectsPresets));
-    layout.floating[0].rect = [0.0; 4];
-    let before = layout.clone();
-    assert!(!layout.unfloat(PanelKind::Align));
-    assert_eq!(layout, before);
-}
-
-#[test]
-fn failed_close_preserves_viewer_lifecycle_and_maximize_state() {
-    let mut app = EffectcraftApp::new(Session::default());
-    app.ui.dock = DockNode::Tabs { panels: vec![PanelKind::Composition, PanelKind::Viewer(42)], active: usize::MAX };
-    app.ui.maximized = Some(PanelKind::Viewer(42));
-    app.ui.viewers.insert(42, None);
-    app.ui.active_viewer = 42;
-    app.ui.locked_tabs.insert(PanelKind::Viewer(42).id());
-    let before = app.ui.clone();
-    app.close_panel(PanelKind::Viewer(42));
-    assert_eq!(app.ui.dock, before.dock);
-    assert_eq!(app.ui.maximized, before.maximized);
-    assert_eq!(app.ui.viewers, before.viewers);
-    assert_eq!(app.ui.active_viewer, before.active_viewer);
-    assert_eq!(app.ui.locked_tabs, before.locked_tabs);
-}
diff --git a/crates/ui-egui/tests/ui_accessibility.rs b/crates/ui-egui/tests/ui_accessibility.rs
new file mode 100644
index 000000000..df283b0f9
--- /dev/null
+++ b/crates/ui-egui/tests/ui_accessibility.rs
@@ -0,0 +1,52 @@
+//! Accessibility of the app's own controls.
+//!
+//! The shared widgets in `widgets.rs` are raw `ui.interact` rectangles. Without a `WidgetInfo`
+//! they are not in the accessibility tree at all, so neither a screen reader nor kittest can
+//! reach them; and an input control without a name is unreachable even when it is in the tree.
+//! `Harness::run` checks the tree it has, but only for the screen it settled on: this opens every
+//! panel and checks again.
+//!
+//! Limit: a control that reports no `WidgetInfo` at all has no node, so it is not "unnamed" here.
+//! `widgets::checkbox` and the raw-painted row controls (`icon_toggle`, `scroll_bar`, hot-number
+//! values) are still in that state; naming every call site is separate work.
+
+use effectcraft_engine::Session;
+use effectcraft_ui_egui::EffectcraftApp;
+use effectcraft_ui_egui::dock::PanelKind;
+use egui_kittest::Harness;
+use egui_kittest::kittest::{NodeT, Queryable};
+use serde_json::json;
+
+fn harness() -> Harness<'static, EffectcraftApp> {
+    let mut s = Session::default();
+    s.execute("file.openDemoProject", json!({})).unwrap();
+    // A text layer under edit gives the Character / Paragraph panels their controls.
+    let _ = s.execute("layer.select", json!({"layers": ["EFFECTCRAFT"]}));
+    Harness::builder().with_size(egui::vec2(1680.0, 1020.0)).build_eframe(|_| EffectcraftApp::new(s))
+}
+
+#[test]
+fn custom_toolbar_buttons_are_named() {
+    let mut h = harness();
+    h.run();
+    // An icon button carries no text of its own: its tooltip is its accessible name.
+    let home = h.query_by_label("Home").expect("the toolbar's Home icon button is named by its tooltip");
+    assert_eq!(home.accesskit_node().role(), egui::accesskit::Role::Button);
+    assert!(h.unnamed_widgets().is_empty(), "{:?}", h.unnamed_widgets());
+}
+
+#[test]
+fn every_panel_names_its_input_controls() {
+    let mut h = harness();
+    h.run();
+    let mut unnamed = vec![];
+    for p in PanelKind::ALL {
+        h.state_mut().show_panel(p);
+        h.state_mut().ui.maximized = Some(p);
+        h.run_steps(4);
+        for w in h.unnamed_widgets() {
+            unnamed.push(format!("{}: {w}", p.title()));
+        }
+    }
+    assert!(unnamed.is_empty(), "{} control(s) have no accessible name:\n{}", unnamed.len(), unnamed.join("\n"));
+}
diff --git a/crates/ui-egui/tests/ui_panel_windows.rs b/crates/ui-egui/tests/ui_panel_windows.rs
deleted file mode 100644
index 60ae3f9c3..000000000
--- a/crates/ui-egui/tests/ui_panel_windows.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-//! Multiple monitors (#486): a panel moves out of the main window into a native window of its
-//! own (Move Panel to New Window), which can be placed on another screen, and back.
-use effectcraft_engine::Session;
-use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::{PanelKind, PanelWindow};
-use egui::vec2;
-use egui_kittest::Harness;
-use serde_json::json;
-
-fn invoke(app: &mut EffectcraftApp, ctx: &egui::Context, params: serde_json::Value) -> Result<serde_json::Value, String> {
-    effectcraft_ui_egui::menus::invoke(app, ctx, "window.panelWindow", params)
-}
-
-#[test]
-fn panel_window_command_moves_a_docked_panel_into_its_own_window_and_back() {
-    let mut app = EffectcraftApp::new(Session::default());
-    let ctx = egui::Context::default();
-    assert!(app.ui.dock.contains(PanelKind::Project));
-    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap(), json!({"window": true}));
-    // Undocked first, then given a window of its own.
-    assert!(!app.ui.dock.contains(PanelKind::Project));
-    assert!(app.ui.floating.iter().any(|group| group.panels == [PanelKind::Project]));
-    assert!(app.in_panel_window(PanelKind::Project));
-    let window = app.ui.panel_windows.iter().find(|w| w.panel == PanelKind::Project).copied().unwrap();
-    assert_eq!(window.rect, PanelWindow::sanitized(window.rect));
-    // Asking again changes nothing; no `window` toggles.
-    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap(), json!({"window": true}));
-    assert_eq!(app.ui.panel_windows.len(), 1);
-    assert_eq!(invoke(&mut app, &ctx, json!({"panel": "Project"})).unwrap(), json!({"window": false}));
-    // Back in the main window, still floating where it was.
-    assert!(!app.in_panel_window(PanelKind::Project));
-    assert!(app.ui.panel_windows.is_empty());
-    assert!(app.ui.floating.iter().any(|group| group.panels == [PanelKind::Project]));
-    // The serialized panel form works too.
-    assert_eq!(invoke(&mut app, &ctx, json!({"panel": PanelKind::Project})).unwrap(), json!({"window": true}));
-    // Bad requests are errors and change nothing.
-    let before = app.ui.panel_windows.clone();
-    for params in [json!({}), json!({"panel": "Nope"}), json!({"panel": 7}), json!({"panel": "Project", "window": "yes"}), json!({"panel": {"Viewer": 9}})] {
-        assert!(invoke(&mut app, &ctx, params.clone()).is_err(), "{params} must be rejected");
-    }
-    assert_eq!(app.ui.panel_windows, before);
-}
-
-#[test]
-fn a_panel_in_its_own_window_leaves_the_main_window() {
-    let mut app = EffectcraftApp::new(Session::default());
-    app.ui.start_screen = false;
-    let mut h = Harness::builder().with_size(vec2(1200.0, 760.0)).build_eframe(move |_| app);
-    h.run_steps(3);
-    let ctx = h.ctx.clone();
-    invoke(h.state_mut(), &ctx, json!({"panel": "Project", "window": true})).unwrap();
-    h.run_steps(3);
-    // No in-window floating group is drawn for it (no move strip, no floating area)...
-    assert!(!h.state().auto.elements.iter().any(|e| e.id.starts_with("panel.float.")));
-    let area = egui::Id::new(("floating-panel", PanelKind::Project.id()));
-    assert!(!h.ctx.memory(|m| m.layer_ids().any(|layer| layer.id == area && m.areas().is_visible(&layer))));
-    // ...the window draws it (here embedded: the test harness has no native windows).
-    assert!(h.state().auto.elements.iter().any(|e| e.id == "panel.Project"));
-    // Docking it back into the main window closes the window entry.
-    let ctx = h.ctx.clone();
-    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "window.dockPanel", json!({"panel": "Project", "anchor": "Timeline"})).unwrap();
-    h.run_steps(2);
-    assert!(h.state().ui.panel_windows.is_empty());
-    assert!(!h.state().in_panel_window(PanelKind::Project));
-}
-
-#[test]
-fn panel_windows_survive_restart_with_hostile_places_made_safe() {
-    use effectcraft_engine::config::MemoryConfig;
-    use std::sync::Arc;
-    let store = Arc::new(MemoryConfig::default());
-    let mut app = EffectcraftApp::new(Session { config: Some(store.clone()), ..Default::default() });
-    let ctx = egui::Context::default();
-    invoke(&mut app, &ctx, json!({"panel": "Project", "window": true})).unwrap();
-    let hostile = [1.0e9, -3.0e12, 1.0e9, 0.5];
-    if let Some(w) = app.ui.panel_windows.first_mut() {
-        w.rect = hostile;
-    }
-    // A window for a panel that doesn't float is dropped on load.
-    app.ui.panel_windows.push(PanelWindow { panel: PanelKind::Timeline, rect: [10.0, 10.0, 300.0, 200.0] });
-    eframe::App::on_exit(&mut app);
-    let restarted = EffectcraftApp::new(Session { config: Some(store), ..Default::default() });
-    assert_eq!(restarted.ui.panel_windows, vec![PanelWindow { panel: PanelKind::Project, rect: PanelWindow::sanitized(hostile) }]);
-    let [x, y, w, h] = PanelWindow::sanitized(hostile);
-    assert!(x <= 100_000.0 && y >= -100_000.0 && (160.0..=16_384.0).contains(&w) && (100.0..=16_384.0).contains(&h));
-    assert!(PanelWindow::sanitized([f32::NAN, f32::INFINITY, f32::NAN, f32::NEG_INFINITY]).iter().all(|v| v.is_finite()));
-}
diff --git a/crates/ui-egui/tests/ui_scrolling.rs b/crates/ui-egui/tests/ui_scrolling.rs
deleted file mode 100644
index 5f6816230..000000000
--- a/crates/ui-egui/tests/ui_scrolling.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-//! Long menus and lists scroll instead of running off the window, with a scroll bar to drag
-//! (egui_kittest, UI logic only).
-
-use effectcraft_engine::Session;
-use effectcraft_ui_egui::EffectcraftApp;
-use egui::{Event, Pos2, Rect, pos2, vec2};
-use egui_kittest::Harness;
-use egui_kittest::kittest::Queryable;
-use serde_json::json;
-
-fn harness(w: f32, h: f32) -> Harness<'static, EffectcraftApp> {
-    let mut s = Session::default();
-    s.execute("file.openDemoProject", json!({})).unwrap();
-    let mut h = Harness::builder().with_size(vec2(w, h)).build_eframe(|_| EffectcraftApp::new(s));
-    h.run_steps(3);
-    h
-}
-
-fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> Rect {
-    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
-    Rect::from_min_size(pos2(e.rect[0], e.rect[1]), vec2(e.rect[2], e.rect[3]))
-}
-
-fn click_at(h: &mut Harness<'_, EffectcraftApp>, p: Pos2) {
-    h.input_mut().events.push(Event::PointerMoved(p));
-    h.input_mut().events.push(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
-    h.step();
-    h.input_mut().events.push(Event::PointerButton { pos: p, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
-    h.run_steps(2);
-}
-
-fn wheel(h: &mut Harness<'_, EffectcraftApp>, at: Pos2, dy: f32) {
-    h.input_mut().events.push(Event::PointerMoved(at));
-    h.input_mut().events.push(Event::MouseWheel {
-        unit: egui::MouseWheelUnit::Point,
-        delta: vec2(0.0, dy),
-        modifiers: Default::default(),
-        phase: egui::TouchPhase::Move,
-    });
-    h.run_steps(20);
-}
-
-/// Edit is taller than a short window: it scrolls (with the wheel, and a scroll bar that always
-/// shows) so its last entries can be reached and clicked, instead of running off the bottom of
-/// the window (#269).
-#[test]
-fn a_menu_taller_than_the_window_scrolls() {
-    let mut h = harness(1200.0, 520.0);
-    assert!(!h.ctx.global_style().spacing.scroll.floating, "scroll bars show without hovering the list");
-    let edit = rect(&h, "menu.Edit");
-    click_at(&mut h, edit.center());
-    let last = h.query_by_label_contains("Keyboard Shortcuts").expect("the Edit menu is open").rect();
-    assert!(last.max.y > 520.0, "Edit is taller than the window ({last:?})");
-    let first = h.query_by_label_contains("Quick Apply").expect("Quick Apply").rect();
-    wheel(&mut h, first.center(), -2000.0);
-    let last = h.query_by_label_contains("Keyboard Shortcuts").expect("still open").rect();
-    assert!(last.min.y >= 0.0 && last.max.y <= 520.0, "scrolled into the window ({last:?})");
-    click_at(&mut h, last.center());
-    assert_eq!(h.state().dialog, Some(effectcraft_ui_egui::Dialog::Shortcuts), "the entry takes the click");
-}
-
-fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
-    h.input_mut().events.push(Event::PointerMoved(from));
-    h.input_mut().events.push(Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
-    h.step();
-    for i in 1..=8 {
-        h.input_mut().events.push(Event::PointerMoved(from + (to - from) * (i as f32 / 8.0)));
-        h.step();
-    }
-    h.input_mut().events.push(Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
-    h.run_steps(2);
-}
-
-/// A scroll bar's "scroll/max" automation label.
-fn scrolled(h: &Harness<'_, EffectcraftApp>, id: &str) -> (f32, f32) {
-    let label = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}")).label.clone();
-    let (s, max) = label.split_once('/').unwrap_or_else(|| panic!("{id}: {label}"));
-    (s.parse().unwrap(), max.parse().unwrap())
-}
-
-/// Every panel that scrolls its own rows shows a scroll bar while they overflow, and dragging it
-/// scrolls them: without a mouse wheel or touchpad there was no way down most panels (#271).
-#[test]
-fn panels_taller_than_their_space_have_a_scroll_bar_to_drag() {
-    use effectcraft_ui_egui::dock::PanelKind;
-    // (The Project panel's list starts below its item preview and search: a taller window.)
-    for (panel, id, height) in [
-        (PanelKind::EffectControls, "effectControls.scroll", 240.0),
-        (PanelKind::Properties, "properties.scroll", 240.0),
-        (PanelKind::EffectsPresets, "effects.scroll", 240.0),
-        (PanelKind::Project, "project.vscroll", 330.0),
-        (PanelKind::Timeline, "timeline.scroll", 240.0),
-        (PanelKind::RenderQueue, "renderQueue.scroll", 240.0),
-        (PanelKind::History, "history.scroll", 240.0),
-        (PanelKind::Preview, "preview.scroll", 240.0),
-        (PanelKind::Character, "character.scroll", 240.0),
-        (PanelKind::Paragraph, "paragraph.scroll", 240.0),
-        (PanelKind::Info, "info.scroll", 240.0),
-    ] {
-        let mut h = harness(1200.0, height);
-        let app = h.state_mut();
-        let lid = app.session.active_comp().unwrap().layers[0].id.0;
-        app.session.execute("layer.select", json!({"layers": [lid]})).unwrap();
-        for e in ["slider", "angle", "checkbox", "color", "point"] {
-            app.session.execute("effect.apply", json!({"effect": format!("ec.control.{e}"), "layers": [lid]})).unwrap();
-        }
-        for _ in 0..6 {
-            app.session.execute("renderQueue.add", json!({})).unwrap();
-        }
-        app.show_panel(panel);
-        app.ui.maximized = Some(panel);
-        h.run_steps(3);
-        let (_, max) = scrolled(&h, id);
-        assert!(max > 0.0, "{id}: the rows overflow");
-        let bar = rect(&h, id);
-        // A press on the track moves the thumb there (History starts at its current state, the
-        // last); then the thumb drags to the end.
-        click_at(&mut h, pos2(bar.center().x, bar.min.y + 2.0));
-        assert_eq!(scrolled(&h, id).0, 0.0, "{id}: at the top");
-        drag(&mut h, pos2(bar.center().x, bar.min.y + 6.0), pos2(bar.center().x, bar.max.y + 40.0));
-        assert_eq!(scrolled(&h, id).0, max, "{id}: dragged to the end");
-    }
-}
-
-/// In a narrow Effect Controls panel an animated point's values stay clear of its keyframe
-/// navigator (â—€ â—† â–¶), which was drawn over them (#271).
-#[test]
-fn effect_values_stay_clear_of_the_keyframe_navigator() {
-    use effectcraft_ui_egui::dock::PanelKind;
-    let mut h = harness(1600.0, 1000.0);
-    let app = h.state_mut();
-    let lid = app.session.active_comp().unwrap().layers[0].id.0;
-    app.session.execute("layer.select", json!({"layers": [lid]})).unwrap();
-    app.session.execute("effect.apply", json!({"effect": "ec.control.point", "layers": [lid]})).unwrap();
-    let path = "effects/#1/point";
-    app.session.execute("prop.toggleAnimation", json!({"layer": lid, "path": path})).unwrap();
-    app.session.execute("prop.set", json!({"layer": lid, "path": path, "value": [123456.7, 123456.7]})).unwrap();
-    let uid = app.session.active_comp().unwrap().layer(effectcraft_engine::project::LayerId(lid)).unwrap().props.prop(path).unwrap().uid;
-    assert!(app.edit_layout(|l| l.float(PanelKind::EffectControls, [300.0, 150.0, 330.0, 500.0])));
-    h.run_steps(3);
-    let value = rect(&h, &format!("effectControls.prop.{uid}.value.1"));
-    let nav = rect(&h, &format!("effectControls.prop.{uid}.prevKey"));
-    assert!(value.max.x <= nav.min.x, "the value ({value:?}) ends before the navigator ({nav:?})");
-    assert!(value.min.x > rect(&h, &format!("effectControls.prop.{uid}.stopwatch")).max.x, "and after the stopwatch");
-}
-
-/// The Settings dialog fits its width: its page column was wider than the dialog, so the whole
-/// dialog scrolled sideways a little (#284).
-#[test]
-fn settings_dialog_does_not_scroll_sideways() {
-    let mut h = harness(1400.0, 900.0);
-    let ctx = h.ctx.clone();
-    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "app.settings", json!({"page": "general"})).unwrap();
-    h.run_steps(3);
-    let (ok, page) = (rect(&h, "settings.ok"), rect(&h, "settings.page.general"));
-    h.input_mut().events.push(Event::PointerMoved(page.center()));
-    h.input_mut().events.push(Event::MouseWheel {
-        unit: egui::MouseWheelUnit::Point,
-        delta: vec2(-400.0, 0.0),
-        modifiers: Default::default(),
-        phase: egui::TouchPhase::Move,
-    });
-    h.run_steps(20);
-    assert_eq!((rect(&h, "settings.ok"), rect(&h, "settings.page.general")), (ok, page), "nothing moved sideways");
-}
diff --git a/crates/ui-egui/tests/ui_text_edit.rs b/crates/ui-egui/tests/ui_text_edit.rs
deleted file mode 100644
index d147529b2..000000000
--- a/crates/ui-egui/tests/ui_text_edit.rs
+++ /dev/null
@@ -1,572 +0,0 @@
-//! Headless checks for on-canvas text editing in the viewer and the Character / Paragraph panels
-//! acting on the selection (egui_kittest, UI logic only: no GPU needed).
-
-use effectcraft_engine::Session;
-use effectcraft_engine::commands::text_edit::layer_doc;
-use effectcraft_engine::project::LayerId;
-use effectcraft_ui_egui::EffectcraftApp;
-use effectcraft_ui_egui::dock::PanelKind;
-use egui::{Event, Key, Modifiers, PointerButton, Pos2};
-use egui_kittest::Harness;
-use serde_json::json;
-
-fn app() -> EffectcraftApp {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-    EffectcraftApp::new(s)
-}
-
-fn rect(h: &Harness<'_, EffectcraftApp>, id: &str) -> egui::Rect {
-    let e = h.state().auto.find(id).unwrap_or_else(|| panic!("no {id}"));
-    egui::Rect::from_min_size(egui::pos2(e.rect[0], e.rect[1]), egui::vec2(e.rect[2], e.rect[3]))
-}
-
-fn click(h: &mut Harness<'_, EffectcraftApp>, p: Pos2, modifiers: Modifiers) {
-    h.input_mut().events.push(Event::PointerMoved(p));
-    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: true, modifiers });
-    h.run_steps(1);
-    h.input_mut().events.push(Event::PointerButton { pos: p, button: PointerButton::Primary, pressed: false, modifiers });
-    h.run_steps(2);
-}
-
-fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2) {
-    h.input_mut().events.push(Event::PointerMoved(from));
-    h.input_mut().events.push(Event::PointerButton { pos: from, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    for i in 1..=8 {
-        h.input_mut().events.push(Event::PointerMoved(from + (to - from) * (i as f32 / 8.0)));
-        h.run_steps(1);
-    }
-    h.input_mut().events.push(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-}
-
-fn key(h: &mut Harness<'_, EffectcraftApp>, key: Key, modifiers: Modifiers) {
-    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers });
-    h.input_mut().events.push(Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers });
-    h.run_steps(2);
-}
-
-fn type_text(h: &mut Harness<'_, EffectcraftApp>, t: &str) {
-    h.input_mut().events.push(Event::Text(t.into()));
-    h.run_steps(2);
-}
-
-fn edited(h: &Harness<'_, EffectcraftApp>) -> (u64, String, usize, usize) {
-    let s = &h.state().session;
-    let e = s.state.text_edit.clone().expect("editing");
-    (e.layer.0, layer_doc(s, e.layer).unwrap().text, e.anchor, e.caret)
-}
-
-#[test]
-fn type_tool_skips_hidden_and_unsoloed_text_layers() {
-    for switch in ["video", "solo"] {
-        let mut s = Session::default();
-        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-        let mut ids = vec![];
-        for _ in 0..2 {
-            let lid = s.execute("layer.newText", json!({"text": "alpha beta", "size": 80, "position": [100, 200], "justify": "left"})).unwrap()["layer"]
-                .as_u64()
-                .unwrap();
-            ids.push(lid);
-        }
-        let (target, value) = if switch == "video" { (ids[1], false) } else { (ids[0], true) };
-        s.execute("layer.setSwitch", json!({"layers": [target], "switch": switch, "value": value})).unwrap();
-        s.execute("edit.deselectAll", json!({})).unwrap();
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(move |_| EffectcraftApp::new(s));
-        h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-        h.run_steps(3);
-        let comp = rect(&h, "viewer.comp");
-        let k = comp.width() / 640.0;
-        click(&mut h, comp.min + egui::vec2(330.0 * k, 180.0 * k), Modifiers::NONE);
-        assert_eq!(edited(&h).0, ids[0], "{switch}");
-    }
-}
-
-#[test]
-fn modal_blocks_background_text_events() {
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| app());
-    h.run_steps(3);
-    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-    h.run_steps(1);
-    let p = rect(&h, "viewer.comp").center();
-    click(&mut h, p, Modifiers::NONE);
-    type_text(&mut h, "Preserve");
-    let before = edited(&h).1;
-    h.state_mut().dialog = Some(effectcraft_ui_egui::Dialog::About);
-    h.run_steps(3);
-    h.input_mut().events.push(Event::Text("changed".into()));
-    h.input_mut().events.push(Event::Paste("pasted".into()));
-    key(&mut h, Key::Backspace, Modifiers::NONE);
-    assert_eq!(edited(&h).1, before);
-}
-
-#[test]
-fn type_tool_click_type_edit_and_commit() {
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| app());
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-    h.run_steps(1);
-    let comp = rect(&h, "viewer.comp");
-    // Click: a point text layer in edit mode, caret ready.
-    click(&mut h, comp.center(), Modifiers::NONE);
-    assert_eq!(h.state().session.active_comp().unwrap().layers.len(), 1);
-    type_text(&mut h, "Hello");
-    type_text(&mut h, " world");
-    let (lid, text, a, c) = edited(&h);
-    assert_eq!((text.as_str(), a, c), ("Hello world", 11, 11));
-    assert!(h.state().auto.find("viewer.textEdit").is_some(), "edit region registered");
-    // Arrow keys, Shift-extend, Backspace.
-    key(&mut h, Key::ArrowLeft, Modifiers::NONE);
-    key(&mut h, Key::ArrowLeft, Modifiers::SHIFT);
-    assert_eq!((edited(&h).2, edited(&h).3), (10, 9));
-    key(&mut h, Key::Backspace, Modifiers::NONE);
-    assert_eq!(edited(&h).1, "Hello word");
-    // Word jump and Home / End.
-    key(&mut h, Key::Home, Modifiers::NONE);
-    assert_eq!(edited(&h).3, 0);
-    key(&mut h, Key::ArrowRight, Modifiers::COMMAND);
-    assert_eq!(edited(&h).3, 5);
-    key(&mut h, Key::End, Modifiers::NONE);
-    assert_eq!(edited(&h).3, 10);
-    // Enter starts a new paragraph.
-    key(&mut h, Key::Enter, Modifiers::NONE);
-    type_text(&mut h, "two");
-    assert_eq!(edited(&h).1, "Hello word\ntwo");
-    // Select all, then the Character panel styles the selection only.
-    key(&mut h, Key::ArrowUp, Modifiers::NONE);
-    assert!(edited(&h).3 <= 10, "up to the first line");
-    key(&mut h, Key::Home, Modifiers::NONE);
-    key(&mut h, Key::End, Modifiers::SHIFT);
-    let (_, _, a, c) = edited(&h);
-    assert_eq!((a, c), (0, 10));
-    h.state_mut().show_panel(PanelKind::Character);
-    h.run_steps(3);
-    let bold = rect(&h, "character.fauxBold");
-    click(&mut h, bold.center(), Modifiers::NONE);
-    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
-    assert!(doc.style_at(2).faux_bold, "selection is bold");
-    assert!(!doc.style_at(12).faux_bold, "second paragraph untouched");
-    assert_eq!(doc.runs().len(), 2);
-    // Undo the style; Escape commits.
-    h.state_mut().session.execute("edit.undo", json!({})).unwrap();
-    assert!(layer_doc(&h.state().session, LayerId(lid)).unwrap().is_uniform());
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    h.state_mut().session.execute("text.setSelection", json!({"start": 0})).unwrap();
-    h.run_steps(2);
-    key(&mut h, Key::Escape, Modifiers::NONE);
-    assert!(h.state().session.state.text_edit.is_none());
-}
-
-/// #831: clicking another panel (a solid's row in the Timeline) ends text editing and gives the
-/// keyboard back, whether the edit began with the Type tool (which stays selected) or by command:
-/// typed characters change no text and Space plays. The Character panel keeps the edit, and a
-/// text layer clicked into being and left empty goes away.
-#[test]
-fn clicking_another_panel_stops_typing_into_text() {
-    for type_tool in [false, true] {
-        let mut s = Session::default();
-        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-        let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
-        let title =
-            s.execute("layer.newText", json!({"text": "Title", "size": 80, "position": [100, 120], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-        h.state_mut().show_panel(PanelKind::Composition);
-        h.run_steps(3);
-        let layers = |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layers.len();
-        // (Its row moves down as text layers are added.)
-        let row = |h: &Harness<'_, EffectcraftApp>| rect(h, &format!("timeline.layer.{solid}.row")).center();
-        if type_tool {
-            h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-            h.run_steps(1);
-            let at = rect(&h, "viewer.comp").center();
-            click(&mut h, at, Modifiers::NONE);
-            assert_eq!(layers(&h), 3, "the Type tool started a text layer");
-            let at_row = row(&h);
-            click(&mut h, at_row, Modifiers::NONE);
-            assert_eq!(layers(&h), 2, "left empty, it is removed");
-            click(&mut h, at, Modifiers::NONE);
-        } else {
-            h.state_mut().session.execute("text.edit", json!({"layer": title})).unwrap();
-            h.run_steps(2);
-        }
-        type_text(&mut h, "Hello");
-        // The Character panel formats the selection and keeps the edit: typing carries on.
-        key(&mut h, Key::ArrowLeft, Modifiers::SHIFT);
-        let range = edited(&h);
-        h.state_mut().show_panel(PanelKind::Character);
-        h.run_steps(3);
-        let bold = rect(&h, "character.fauxBold").center();
-        click(&mut h, bold, Modifiers::NONE);
-        assert_eq!(edited(&h), range, "type_tool {type_tool}: Character keeps the edit and its selection");
-        key(&mut h, Key::End, Modifiers::NONE);
-        type_text(&mut h, "!");
-        let (lid, text, ..) = edited(&h);
-        assert!(text.ends_with("Hello!"), "typing goes into the text: {text:?}");
-        let at_row = row(&h);
-        click(&mut h, at_row, Modifiers::NONE);
-        assert!(h.state().session.state.text_edit.is_none(), "type_tool {type_tool}: clicking the Timeline ends the edit");
-        assert_eq!(h.state().session.state.selected_layers, vec![LayerId(solid)]);
-        assert!(!h.ctx.memory(|m| m.focused().is_some()), "the keyboard is the app's again");
-        type_text(&mut h, "abc");
-        assert!(!h.state().playback.playing);
-        h.input_mut().events.push(Event::Key { key: Key::Space, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE });
-        h.input_mut().events.push(Event::Text(" ".into()));
-        h.input_mut().events.push(Event::Key { key: Key::Space, physical_key: None, pressed: false, repeat: false, modifiers: Modifiers::NONE });
-        h.run_steps(2);
-        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, text, "type_tool {type_tool}: the text is unchanged");
-        assert!(h.state().playback.playing, "type_tool {type_tool}: Space plays");
-        assert_eq!(type_tool, matches!(h.state().ui.tool, effectcraft_ui_egui::state::Tool::Type), "the tool is kept");
-    }
-}
-
-/// #831: opening a formatting panel's tab behind Effects & Presets in its group (Properties, in
-/// Undocked Panels) keeps the edit and its selected characters: the press on the tab used to
-/// focus the shown panel and end the edit, after which Faux Bold styled the whole layer.
-#[test]
-fn opening_a_formatting_tab_keeps_the_text_selection() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-    let lid =
-        s.execute("layer.newText", json!({"text": "Hello world", "size": 80, "position": [60, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-    h.run_steps(3);
-    let ctx = h.ctx.clone();
-    // Effects & Presets shown, Properties, Character and Paragraph behind it.
-    effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "window.workspace", json!({"name": "Undocked Panels"})).unwrap();
-    h.state_mut().session.execute("text.edit", json!({"layer": lid})).unwrap();
-    h.state_mut().session.execute("text.setSelection", json!({"anchor": 0, "caret": 5})).unwrap();
-    h.run_steps(3);
-    assert!(h.state().auto.find("properties.text.style").is_none(), "Properties is behind Effects & Presets");
-    let tab = rect(&h, "panel.tab.Properties").center();
-    click(&mut h, tab, Modifiers::NONE);
-    assert!(h.state().auto.find("properties.text.style").is_some(), "the tab opened Properties");
-    assert_eq!(edited(&h), (lid, "Hello world".into(), 0, 5), "the edit and its selection are kept");
-    h.state_mut().show_panel(PanelKind::Character);
-    h.run_steps(3);
-    let bold = rect(&h, "character.fauxBold").center();
-    click(&mut h, bold, Modifiers::NONE);
-    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
-    assert!(doc.style_at(1).faux_bold && !doc.style_at(7).faux_bold, "only \"Hello\" is bold");
-}
-
-/// #831: a click away and keys in one frame's input. The text gets the keys typed before the
-/// click and none after it; those later keys don't run as shortcuts either (Delete would remove a
-/// layer). From the next frame the keys are the app's: Space plays.
-#[test]
-fn keys_after_a_click_away_in_the_same_frame_skip_the_text() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-    let solid = s.execute("layer.newSolid", json!({"name": "Plate", "color": "#406080"})).unwrap()["layer"].as_u64().unwrap();
-    let lid = s.execute("layer.newText", json!({"text": "Hello", "size": 80, "position": [60, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    h.state_mut().session.execute("text.edit", json!({"layer": lid, "caret": 5})).unwrap();
-    h.run_steps(2);
-    let row = rect(&h, &format!("timeline.layer.{solid}.row")).center();
-    let key = |key: Key, pressed: bool| Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE };
-    h.input_mut().events.extend([
-        Event::Text("A".into()),
-        Event::PointerMoved(row),
-        Event::PointerButton { pos: row, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE },
-        Event::PointerButton { pos: row, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE },
-        Event::Text("x".into()),
-        key(Key::Space, true),
-        Event::Text(" ".into()),
-        key(Key::Space, false),
-        key(Key::Delete, true),
-        key(Key::Delete, false),
-    ]);
-    h.run_steps(3);
-    let comp = |h: &Harness<'_, EffectcraftApp>| h.state().session.active_comp().unwrap().layers.len();
-    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "HelloA", "only the key before the click");
-    assert!(h.state().session.state.text_edit.is_none(), "the click ended the edit");
-    assert_eq!((comp(&h), h.state().playback.playing), (2, false), "the keys after it ran no shortcut");
-    h.input_mut().events.extend([key(Key::Space, true), Event::Text(" ".into()), key(Key::Space, false)]);
-    h.run_steps(2);
-    assert!(h.state().playback.playing, "Space plays");
-    assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "HelloA");
-}
-
-#[test]
-fn switching_from_type_to_selection_commits_and_moves_text_layer() {
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| app());
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-    h.run_steps(1);
-    let comp = rect(&h, "viewer.comp");
-    let k = comp.width() / 640.0;
-    click(&mut h, comp.min + egui::vec2(320.0 * k, 180.0 * k), Modifiers::NONE);
-    type_text(&mut h, "Move me");
-    let layer_id = h.state().session.state.text_edit.as_ref().unwrap().layer;
-    let layer_position = |h: &Harness<'_, EffectcraftApp>| {
-        h.state().session.active_comp().unwrap().layer(layer_id).unwrap().props.prop("transform/position").unwrap().value.as_vec3()
-    };
-    let original_text = layer_doc(&h.state().session, layer_id).unwrap().text;
-    let before = layer_position(&h);
-
-    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Selection;
-    h.run_steps(2);
-    assert!(h.state().session.state.text_edit.is_none(), "leaving the Type tool commits text editing");
-    type_text(&mut h, " ignored");
-    assert_eq!(layer_doc(&h.state().session, layer_id).unwrap().text, original_text, "Selection does not type into the layer");
-    let from = comp.min + egui::vec2(340.0 * k, 150.0 * k);
-    let to = from + egui::vec2(60.0 * k, 50.0 * k);
-    drag(&mut h, from, to);
-    let after = layer_position(&h);
-    assert!(after[0] > before[0] && after[1] > before[1], "Selection dragging moves the text layer: {before:?} -> {after:?}");
-}
-
-#[test]
-fn double_click_enters_editing_and_selects_words() {
-    let mut s = Session::default();
-    s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-    let lid =
-        s.execute("layer.newText", json!({"text": "alpha beta", "size": 80, "position": [100, 200], "justify": "left"})).unwrap()["layer"].as_u64().unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    // A point inside "beta" (comp space → window).
-    let comp = rect(&h, "viewer.comp");
-    let k = comp.width() / 640.0;
-    let p = comp.min + egui::vec2(330.0 * k, 180.0 * k);
-    click(&mut h, p, Modifiers::NONE);
-    click(&mut h, p, Modifiers::NONE);
-    let e = h.state().session.state.text_edit.clone().expect("double-click edits text");
-    assert_eq!(e.layer.0, lid);
-    assert_eq!((e.anchor.min(e.caret), e.anchor.max(e.caret)), (0, 10), "everything selected");
-    // Double-clicking inside the edited text selects a word.
-    h.run_steps(40);
-    click(&mut h, p, Modifiers::NONE);
-    click(&mut h, p, Modifiers::NONE);
-    let e = h.state().session.state.text_edit.clone().unwrap();
-    assert_eq!((e.anchor, e.caret), (6, 10));
-    // Typing replaces it; Cmd+Z undoes while editing.
-    type_text(&mut h, "gamma");
-    assert_eq!(edited(&h).1, "alpha gamma");
-    key(&mut h, Key::Z, Modifiers::COMMAND);
-    assert_eq!(edited(&h).1, "alpha beta");
-    // Paragraph panel: alignment applies to the edited paragraph (the South Asian and Middle
-    // Eastern text engine shows the direction popup too).
-    h.state_mut().session.prefs.type_.text_engine = "southAsian".into();
-    h.state_mut().show_panel(PanelKind::Paragraph);
-    h.run_steps(3);
-    let r = rect(&h, "paragraph.right");
-    click(&mut h, r.center(), Modifiers::NONE);
-    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
-    assert_eq!(doc.justify, effectcraft_engine::keyframe::Justify::Right);
-    for id in
-        ["paragraph.indentLeft", "paragraph.spaceBefore", "paragraph.direction", "paragraph.composer", "paragraph.hangingPunctuation", "paragraph.justifyAll"]
-    {
-        assert!(h.state().auto.find(id).is_some(), "missing {id}");
-    }
-}
-
-#[test]
-fn type_tool_drag_makes_paragraph_text_with_box_handles() {
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(|_| app());
-    h.state_mut().show_panel(PanelKind::Composition);
-    h.run_steps(3);
-    h.state_mut().ui.tool = effectcraft_ui_egui::state::Tool::Type;
-    h.run_steps(1);
-    let comp = rect(&h, "viewer.comp");
-    let a = comp.min + egui::vec2(comp.width() * 0.2, comp.height() * 0.2);
-    let b = comp.min + egui::vec2(comp.width() * 0.7, comp.height() * 0.6);
-    h.input_mut().events.push(Event::PointerMoved(a));
-    h.input_mut().events.push(Event::PointerButton { pos: a, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    for i in 1..=8 {
-        h.input_mut().events.push(Event::PointerMoved(a + (b - a) * (i as f32 / 8.0)));
-        h.run_steps(1);
-    }
-    h.input_mut().events.push(Event::PointerButton { pos: b, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(3);
-    let (lid, _, _, _) = edited(&h);
-    let doc = layer_doc(&h.state().session, LayerId(lid)).unwrap();
-    let bs = doc.box_size.expect("paragraph text");
-    assert!((bs[0] - 320.0).abs() < 4.0 && (bs[1] - 144.0).abs() < 4.0, "{bs:?}");
-    type_text(&mut h, "Some words that wrap inside the box when there are enough of them");
-    h.run_steps(2);
-    assert!(h.state().auto.find("viewer.textBox.handle.4").is_some());
-    // Dragging the bottom-right handle widens the box.
-    let hr = rect(&h, "viewer.textBox.handle.4").center();
-    let to = hr + egui::vec2(60.0, 0.0);
-    h.input_mut().events.push(Event::PointerMoved(hr));
-    h.input_mut().events.push(Event::PointerButton { pos: hr, button: PointerButton::Primary, pressed: true, modifiers: Modifiers::NONE });
-    h.run_steps(1);
-    for i in 1..=6 {
-        h.input_mut().events.push(Event::PointerMoved(hr + (to - hr) * (i as f32 / 6.0)));
-        h.run_steps(1);
-    }
-    h.input_mut().events.push(Event::PointerButton { pos: to, button: PointerButton::Primary, pressed: false, modifiers: Modifiers::NONE });
-    h.run_steps(2);
-    let doc2 = layer_doc(&h.state().session, LayerId(lid)).unwrap();
-    assert!(doc2.box_size.unwrap()[0] > bs[0] + 20.0, "{:?}", doc2.box_size);
-    assert!(h.state().session.state.text_edit.is_some(), "still editing after resizing");
-}
-
-/// #866: Layer ▸ New ▸ Text (menu or its shortcut) puts an insertion point in the comp, as After
-/// Effects does, so typed keys reach Source Text (and the layer name follows) instead of running
-/// shortcuts while the layer keeps the placeholder "Text".
-#[test]
-fn layer_new_text_menu_and_shortcut_start_typing_into_source_text() {
-    for via_shortcut in [false, true] {
-        let mut s = Session::default();
-        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-        s.execute("layer.newSolid", json!({"color": "#ffffff"})).unwrap();
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-        h.state_mut().show_panel(PanelKind::Composition);
-        h.run_steps(3);
-        if via_shortcut {
-            key(&mut h, Key::T, Modifiers::COMMAND | Modifiers::ALT | Modifiers::SHIFT);
-        } else {
-            let ctx = h.ctx.clone();
-            effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "layer.newText", json!({})).unwrap();
-            h.run_steps(2);
-        }
-        let (lid, text, _, _) = edited(&h);
-        assert_eq!(text, "", "no placeholder to type over (shortcut: {via_shortcut})");
-        type_text(&mut h, "My First Project");
-        key(&mut h, Key::Escape, Modifiers::NONE);
-        assert!(h.state().session.state.text_edit.is_none(), "Escape commits");
-        let s = &h.state().session;
-        assert_eq!(layer_doc(s, LayerId(lid)).unwrap().text, "My First Project", "typed text is the Source Text");
-        assert_eq!(s.active_comp().unwrap().layer(LayerId(lid)).unwrap().name, "My First Project", "the name follows the text");
-    }
-}
-
-/// Double-clicking a text layer in the Timeline, on its name or on its bar, edits its text in the
-/// Composition viewer with the whole text selected, as in After Effects (Enter renames).
-#[test]
-fn timeline_double_click_on_a_text_layer_edits_its_text() {
-    for target in ["row", "bar"] {
-        let mut s = Session::default();
-        s.execute("comp.new", json!({"name": "Type", "width": 640, "height": 360, "duration": 2})).unwrap();
-        let lid = s.execute("layer.newText", json!({"text": "alpha beta"})).unwrap()["layer"].as_u64().unwrap();
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| EffectcraftApp::new(s));
-        h.state_mut().show_panel(PanelKind::Composition);
-        h.run_steps(3);
-        let p = rect(&h, &format!("timeline.layer.{lid}.{target}")).center();
-        click(&mut h, p, Modifiers::NONE);
-        click(&mut h, p, Modifiers::NONE);
-        let (layer, text, anchor, caret) = edited(&h);
-        assert_eq!(layer, lid, "{target}");
-        assert_eq!((anchor.min(caret), anchor.max(caret)), (0, 10), "everything selected ({target})");
-        assert!(h.state().auto.find(&format!("timeline.layer.{lid}.nameEdit")).is_none(), "no rename field ({target})");
-        assert_eq!(text, "alpha beta");
-        type_text(&mut h, "gamma");
-        key(&mut h, Key::Escape, Modifiers::NONE);
-        assert!(h.state().session.state.text_edit.is_none(), "Escape commits ({target})");
-        assert_eq!(layer_doc(&h.state().session, LayerId(lid)).unwrap().text, "gamma", "typing replaced the text ({target})");
-    }
-}
-
-#[test]
-fn duplicated_text_boxes_both_remain_editable() {
-    let mut a = app();
-    let original = a
-        .session
-        .execute("layer.newText", json!({"text": "alpha beta", "size": 40, "position": [40, 100], "justify": "left", "box": [40, 60, 250, 100]}))
-        .unwrap()["layer"]
-        .as_u64()
-        .unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| a);
-    h.run_steps(3);
-    h.state_mut().ui.focused = PanelKind::Composition;
-    key(&mut h, Key::D, Modifiers::COMMAND);
-    let duplicate = h.state().session.state.selected_layers[0].0;
-    assert_ne!(original, duplicate);
-    h.state_mut().session.execute("prop.set", json!({"layer": duplicate, "path": "transform/position", "value": [465, 110]})).unwrap();
-    h.run_steps(3);
-    for (layer, x, text) in [(original, 80.0, "original edited"), (duplicate, 380.0, "duplicate edited")] {
-        h.run_steps(40);
-        let comp = rect(&h, "viewer.comp");
-        let k = comp.width() / 640.0;
-        let p = comp.min + egui::vec2(x * k, 85.0 * k);
-        click(&mut h, p, Modifiers::NONE);
-        click(&mut h, p, Modifiers::NONE);
-        assert_eq!(edited(&h).0, layer);
-        type_text(&mut h, text);
-        key(&mut h, Key::Escape, Modifiers::NONE);
-        assert_eq!(layer_doc(&h.state().session, LayerId(layer)).unwrap().text, text);
-    }
-}
-
-#[test]
-fn overlapping_duplicate_text_remains_editable_by_double_click_and_selected_type_tool() {
-    let mut a = app();
-    let original = a.session.execute("layer.newText", json!({"text": "alpha beta", "size": 40, "box": [40, 60, 250, 100]})).unwrap()["layer"].as_u64().unwrap();
-    let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| a);
-    h.run_steps(3);
-    h.state_mut().ui.focused = PanelKind::Composition;
-    key(&mut h, Key::D, Modifiers::COMMAND);
-    let duplicate = h.state().session.state.selected_layers[0].0;
-    assert_ne!(original, duplicate);
-    let comp = rect(&h, "viewer.comp");
-    let p = comp.min + egui::vec2(80.0, 85.0) * (comp.width() / 640.0);
-    click(&mut h, p, Modifiers::NONE);
-    click(&mut h, p, Modifiers::NONE);
-    assert_eq!(edited(&h).0, duplicate, "double-click edits the topmost overlapping copy");
-    type_text(&mut h, "copy edited");
-    assert_eq!(edited(&h).1, "copy edited");
-    key(&mut h, Key::Z, Modifiers::COMMAND);
-    assert_eq!(edited(&h).1, "alpha beta", "undo restores the duplicate's text");
-    key(&mut h, Key::Escape, Modifiers::NONE);
-    h.state_mut().session.execute("layer.select", json!({"layers": [original]})).unwrap();
-    h.state_mut().ui.focused = PanelKind::Composition;
-    key(&mut h, Key::T, Modifiers::COMMAND);
-    h.run_steps(40);
-    click(&mut h, p, Modifiers::NONE);
-    assert_eq!(edited(&h).0, original, "the Type tool must honor the explicitly selected overlapping text layer");
-    key(&mut h, Key::A, Modifiers::COMMAND);
-    type_text(&mut h, "original edited");
-    assert_eq!(edited(&h).1, "original edited");
-    assert_eq!(layer_doc(&h.state().session, LayerId(duplicate)).unwrap().text, "alpha beta", "editing the original leaves the duplicate unchanged");
-    key(&mut h, Key::Z, Modifiers::COMMAND);
-    assert_eq!(edited(&h).1, "alpha beta");
-}
-
-#[test]
-fn type_tool_selected_text_preference_skips_ineligible_layers_and_falls_back_to_topmost() {
-    for exclusion in ["hidden", "locked", "inactive", "unsoloed", "outside", "unselected"] {
-        let mut a = app();
-        let mut ids = vec![];
-        for _ in 0..2 {
-            ids.push(
-                a.session.execute("layer.newText", json!({"text": "alpha beta", "size": 40, "box": [40, 60, 250, 100]})).unwrap()["layer"].as_u64().unwrap(),
-            );
-        }
-        let original = ids[0];
-        let topmost = ids[1];
-        match exclusion {
-            "hidden" | "locked" => {
-                let switch = if exclusion == "hidden" { "video" } else { "locked" };
-                a.session.execute("layer.setSwitch", json!({"layers": [original], "switch": switch, "value": exclusion == "locked"})).unwrap();
-            }
-            "inactive" => {
-                let cid = a.session.active_comp_id().unwrap();
-                std::sync::Arc::make_mut(&mut a.session.project).comp_mut(cid).unwrap().layer_mut(LayerId(original)).unwrap().out_point =
-                    effectcraft_engine::time::Tick::ZERO;
-            }
-            "unsoloed" => {
-                a.session.execute("layer.setSwitch", json!({"layers": [topmost], "switch": "solo", "value": true})).unwrap();
-            }
-            "outside" => {
-                a.session.execute("prop.set", json!({"layer": original, "path": "transform/position", "value": [500, 300]})).unwrap();
-            }
-            _ => {}
-        }
-        a.session.state.selected_layers = if exclusion == "unselected" { vec![] } else { vec![LayerId(original)] };
-        a.ui.tool = effectcraft_ui_egui::state::Tool::Type;
-        let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).with_step_dt(1.0 / 60.0).build_eframe(move |_| a);
-        h.run_steps(3);
-        let comp = rect(&h, "viewer.comp");
-        let p = comp.min + egui::vec2(80.0, 85.0) * (comp.width() / 640.0);
-        click(&mut h, p, Modifiers::NONE);
-        assert_eq!(edited(&h).0, topmost, "{exclusion} selected text must not override the eligible hit");
-    }
-}
diff --git a/crates/vp9enc/src/lf.rs b/crates/vp9enc/src/lf.rs
index d781144fe..d48c57db5 100644
--- a/crates/vp9enc/src/lf.rs
+++ b/crates/vp9enc/src/lf.rs
@@ -13,6 +13,14 @@ struct Limits {
     thresh: i32,
 }
 
+/// Mode-info grid and thresholds shared by every superblock of this frame.
+struct FrameFilter<'a> {
+    mi: &'a [Mi],
+    mi_rows: usize,
+    mi_cols: usize,
+    limits: Limits,
+}
+
 /// Filter the reconstructed planes (Y, U, V, or a prefix of them) in place at `level` (0 = off;
 /// sharpness 0).
 pub fn filter_frame(planes: &mut [Plane], mi: &[Mi], mi_rows: usize, mi_cols: usize, level: u8) {
@@ -22,61 +30,182 @@ pub fn filter_frame(planes: &mut [Plane], mi: &[Mi], mi_rows: usize, mi_cols: us
     let l = level as i32;
     let limit = l.max(1);
     let lim = Limits { limit, blimit: 2 * (l + 2) + limit, thresh: l >> 4 };
+    let filter = FrameFilter { mi, mi_rows, mi_cols, limits: lim };
     for sbr in 0..mi_rows.div_ceil(8) {
         for sbc in 0..mi_cols.div_ceil(8) {
             for (plane, p) in planes.iter_mut().enumerate() {
                 for pass in 0..2 {
-                    sb_plane(p, mi, mi_rows, mi_cols, plane, pass, sbr * 8, sbc * 8, lim);
+                    filter.sb_plane(p, plane, pass, sbr * 8, sbc * 8);
                 }
             }
         }
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn sb_plane(p: &mut Plane, mi: &[Mi], mi_rows: usize, mi_cols: usize, plane: usize, pass: usize, row: usize, col: usize, lim: Limits) {
-    let (sx, sy) = if plane > 0 { (1, 1) } else { (0, 0) };
-    let (sub, edge_len) = if pass == 0 { (sx, 64 >> sy) } else { (sy, 64 >> sx) };
-    let stride = p.w;
-    for edge in 0..(16usize >> sub) {
-        let mut i = 0;
-        while i < edge_len {
-            let (x, y) = if pass == 0 { (col * 8 + edge * (4 << sx), row * 8 + (i << sy)) } else { (col * 8 + (i << sx), row * 8 + edge * (4 << sy)) };
-            if x >= 8 * mi_cols || y >= 8 * mi_rows || (pass == 0 && x == 0) || (pass == 1 && y == 0) {
-                i += 8;
-                continue;
-            }
-            let lc = ((x >> 3) >> sx) << sx;
-            let lr = ((y >> 3) >> sy) << sy;
-            let m = mi[lr * mi_cols + lc];
-            let size = if sub == 0 { m.size } else { m.size.max(BLOCK_16X16) };
-            let n8 = if size >= BLOCK_16X16 { 2 } else { 1 };
-            let is_block_edge = if pass == 0 { x & (8 * n8 - 1) == 0 } else { y & (8 * n8 - 1) == 0 };
-            let tx_ok = !m.inter || !m.skip;
-            if !is_block_edge && !tx_ok {
-                i += 8;
-                continue;
-            }
-            let wide = edge % 8 == 0;
-            let n = if pass == 0 { (8 * mi_rows - y).div_ceil(1 << sy) } else { (8 * mi_cols - x).div_ceil(1 << sx) }.min(8).min(edge_len - i);
-            // A transform edge is not filtered in the last odd chroma column.
-            let odd_last = pass == 1 && sx == 1 && mi_cols & 1 == 1 && edge & 1 == 1;
-            let (px, py) = (x >> sx, y >> sy);
-            for l in 0..n {
-                let is_tx_edge = tx_ok && !(odd_last && x + (l << sx) + 8 >= mi_cols * 8);
-                if !(is_block_edge || is_tx_edge) {
+impl FrameFilter<'_> {
+    fn sb_plane(&self, p: &mut Plane, plane: usize, pass: usize, row: usize, col: usize) {
+        let Self { mi, mi_rows, mi_cols, limits: lim } = *self;
+        let (sx, sy) = if plane > 0 { (1, 1) } else { (0, 0) };
+        let (sub, edge_len) = if pass == 0 { (sx, 64 >> sy) } else { (sy, 64 >> sx) };
+        let stride = p.w;
+        for edge in 0..(16usize >> sub) {
+            let mut i = 0;
+            while i < edge_len {
+                let (x, y) = if pass == 0 { (col * 8 + edge * (4 << sx), row * 8 + (i << sy)) } else { (col * 8 + (i << sx), row * 8 + edge * (4 << sy)) };
+                if x >= 8 * mi_cols || y >= 8 * mi_rows || (pass == 0 && x == 0) || (pass == 1 && y == 0) {
+                    i += 8;
                     continue;
                 }
-                let (pos, step) = if pass == 0 { ((py + l) * stride + px, 1) } else { (py * stride + px + l, stride) };
-                filter_lane(&mut p.rec, pos, step, wide, lim);
+                let lc = ((x >> 3) >> sx) << sx;
+                let lr = ((y >> 3) >> sy) << sy;
+                let m = mi[lr * mi_cols + lc];
+                let size = if sub == 0 { m.size } else { m.size.max(BLOCK_16X16) };
+                let n8 = if size >= BLOCK_16X16 { 2 } else { 1 };
+                let is_block_edge = if pass == 0 { x & (8 * n8 - 1) == 0 } else { y & (8 * n8 - 1) == 0 };
+                let tx_ok = !m.inter || !m.skip;
+                if !is_block_edge && !tx_ok {
+                    i += 8;
+                    continue;
+                }
+                let wide = edge % 8 == 0;
+                let n = if pass == 0 { (8 * mi_rows - y).div_ceil(1 << sy) } else { (8 * mi_cols - x).div_ceil(1 << sx) }.min(8).min(edge_len - i);
+                // A transform edge is not filtered in the last odd chroma column.
+                let odd_last = pass == 1 && sx == 1 && mi_cols & 1 == 1 && edge & 1 == 1;
+                let (px, py) = (x >> sx, y >> sy);
+                let mut apply = [false; LANES];
+                for (l, a) in apply.iter_mut().enumerate().take(n) {
+                    let is_tx_edge = tx_ok && !(odd_last && x + (l << sx) + 8 >= mi_cols * 8);
+                    *a = is_block_edge || is_tx_edge;
+                }
+                if apply.iter().any(|&a| a) {
+                    let pos = py * stride + px;
+                    if pass == 0 {
+                        filter_group::<false>(&mut p.rec, pos, stride, 1, apply, wide, lim);
+                    } else {
+                        filter_group::<true>(&mut p.rec, pos, 1, stride, apply, wide, lim);
+                    }
+                }
+                i += 8;
+            }
+        }
+    }
+}
+
+const LANES: usize = 8;
+
+/// [`filter_lane`] on the 8 lanes of a group at once (lane `l` has its q0 at `pos + l * along`;
+/// samples across the edge are `step` apart; `ROWS`: `along` is 1), for lanes whose `apply` is
+/// set. Every lane is computed with both filters and the result selected per lane (0 / -1
+/// masks), so the arithmetic vectorizes; lanes left alone are written back unchanged.
+#[inline(always)]
+fn filter_group<const ROWS: bool>(d: &mut [u8], pos: usize, along: usize, step: usize, apply: [bool; LANES], wide: bool, lim: Limits) {
+    type T = i16;
+    let mut v = [[0 as T; LANES]; 8];
+    let start = pos - 4 * step;
+    if ROWS {
+        for (k, vk) in v.iter_mut().enumerate() {
+            let Some(row) = d.get(start + k * step..).and_then(|r| r.first_chunk::<LANES>()) else { return };
+            *vk = row.map(|s| s as T);
+        }
+    } else {
+        for l in 0..LANES {
+            let Some(line) = d.get(start + l * along..).and_then(|r| r.first_chunk::<8>()) else { return };
+            for k in 0..8 {
+                v[k][l] = line[k] as T;
+            }
+        }
+    }
+    let (limit, blimit, thresh) = (lim.limit as T, lim.blimit as T, lim.thresh as T);
+    let le = |a: T, b: T| -((a <= b) as T);
+    let sel = |m: T, a: T, b: T| (a & m) | (b & !m);
+    let (p3, p2, p1, p0, q0, q1, q2, q3) = (&v[0], &v[1], &v[2], &v[3], &v[4], &v[5], &v[6], &v[7]);
+    let apply: [T; LANES] = apply.map(|a| -(a as T));
+    let can_flat = -(wide as T);
+    let mut mask = [0 as T; LANES];
+    let mut hev = [0 as T; LANES];
+    let mut flat = [0 as T; LANES];
+    for l in 0..LANES {
+        let d10 = (p1[l] - p0[l]).abs();
+        let e10 = (q1[l] - q0[l]).abs();
+        mask[l] = apply[l]
+            & le((p3[l] - p2[l]).abs(), limit)
+            & le((p2[l] - p1[l]).abs(), limit)
+            & le(d10, limit)
+            & le(e10, limit)
+            & le((q2[l] - q1[l]).abs(), limit)
+            & le((q3[l] - q2[l]).abs(), limit)
+            & le((p0[l] - q0[l]).abs() * 2 + (p1[l] - q1[l]).abs() / 2, blimit);
+        hev[l] = !(le(d10, thresh) & le(e10, thresh));
+        flat[l] = can_flat
+            & mask[l]
+            & le(d10, 1)
+            & le(e10, 1)
+            & le((p2[l] - p0[l]).abs(), 1)
+            & le((q2[l] - q0[l]).abs(), 1)
+            & le((p3[l] - p0[l]).abs(), 1)
+            & le((q3[l] - q0[l]).abs(), 1);
+    }
+    if mask.iter().fold(0, |a, &m| a | m) == 0 {
+        return;
+    }
+    let mut out = v;
+    let c = |x: T| x.clamp(-128, 127);
+    for l in 0..LANES {
+        let (ps1, ps0, qs0, qs1) = (p1[l] - 128, p0[l] - 128, q0[l] - 128, q1[l] - 128);
+        let filter = c((c(ps1 - qs1) & hev[l]) + 3 * (qs0 - ps0));
+        let f1 = c(filter + 4) >> 3;
+        let f2 = c(filter + 3) >> 3;
+        let f = (f1 + 1) >> 1;
+        let narrow = mask[l] & !flat[l];
+        let outer = narrow & !hev[l];
+        out[4][l] = sel(narrow, c(qs0 - f1) + 128, out[4][l]);
+        out[3][l] = sel(narrow, c(ps0 + f2) + 128, out[3][l]);
+        out[5][l] = sel(outer, c(qs1 - f) + 128, out[5][l]);
+        out[2][l] = sel(outer, c(ps1 + f) + 128, out[2][l]);
+    }
+    if flat.iter().fold(0, |a, &f| a | f) != 0 {
+        // 8-tap: positions p2..q2 (indices 1..7), each the rounded mean of a 7-wide window
+        // (indices clamped to 0..8) plus itself, as a sliding sum.
+        let s = |k: isize| &v[k.clamp(0, 7) as usize];
+        let mut sum = [0 as T; LANES];
+        for j in -2isize..=4 {
+            let a = s(j);
+            for l in 0..LANES {
+                sum[l] += a[l];
+            }
+        }
+        for k in 1usize..7 {
+            let ki = k as isize;
+            let (cur, add, sub) = (s(ki), s(ki + 4), s(ki - 3));
+            for l in 0..LANES {
+                let w8 = (sum[l] + cur[l] + 4) >> 3;
+                out[k][l] = sel(flat[l], w8, out[k][l]);
+                sum[l] += add[l] - sub[l];
+            }
+        }
+    }
+    if ROWS {
+        for (k, ok) in out.iter().enumerate().take(7).skip(1) {
+            if let Some(row) = d.get_mut(start + k * step..).and_then(|r| r.first_chunk_mut::<LANES>()) {
+                for l in 0..LANES {
+                    row[l] = ok[l] as u8;
+                }
+            }
+        }
+    } else {
+        for l in 0..LANES {
+            if let Some(line) = d.get_mut(start + l * along..).and_then(|r| r.first_chunk_mut::<8>()) {
+                for k in 1..7 {
+                    line[k] = out[k][l] as u8;
+                }
             }
-            i += 8;
         }
     }
 }
 
 /// Filter mask, narrow (4-tap) and 8-tap flat filters of spec 8.8.5 across one edge position;
 /// `pos` is q0, samples across the edge are `step` apart.
+#[cfg(test)]
 fn filter_lane(d: &mut [u8], pos: usize, step: usize, wide: bool, lim: Limits) {
     let at = |k: isize| d[(pos as isize + k * step as isize) as usize] as i32;
     let (p3, p2, p1, p0) = (at(-4), at(-3), at(-2), at(-1));
@@ -122,3 +251,49 @@ fn filter_lane(d: &mut [u8], pos: usize, step: usize, wide: bool, lim: Limits) {
         set(-2, c(ps1 + f) + 128);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn group_matches_per_lane_filter() {
+        let mut seed = 0x1234_5678u32;
+        let mut rnd = || {
+            seed ^= seed << 13;
+            seed ^= seed >> 17;
+            seed ^= seed << 5;
+            seed
+        };
+        for case in 0..20000 {
+            let stride = 24;
+            let base: Vec<u8> = {
+                let flatish = case % 3 == 0;
+                let c = (rnd() % 256) as i32;
+                (0..stride * 24)
+                    .map(|_| if flatish { (c + (rnd() % 3) as i32 - 1).clamp(0, 255) as u8 } else { (c + (rnd() % 40) as i32 - 20).clamp(0, 255) as u8 })
+                    .collect()
+            };
+            let l = (rnd() % 64) as i32;
+            let lim = Limits { limit: l.max(1), blimit: 2 * (l + 2) + l.max(1), thresh: l >> 4 };
+            let wide = rnd() & 1 == 1;
+            let apply: [bool; LANES] = std::array::from_fn(|_| rnd() % 4 != 0);
+            for pass in 0..2 {
+                let (mut a, mut b) = (base.clone(), base.clone());
+                let pos = 8 * stride + 8;
+                for (l, &ap) in apply.iter().enumerate() {
+                    if ap {
+                        let (p, st) = if pass == 0 { (pos + l * stride, 1) } else { (pos + l, stride) };
+                        filter_lane(&mut a, p, st, wide, lim);
+                    }
+                }
+                if pass == 0 {
+                    filter_group::<false>(&mut b, pos, stride, 1, apply, wide, lim);
+                } else {
+                    filter_group::<true>(&mut b, pos, 1, stride, apply, wide, lim);
+                }
+                assert_eq!(a, b, "case {case} pass {pass}");
+            }
+        }
+    }
+}
diff --git a/crates/vp9enc/src/lib.rs b/crates/vp9enc/src/lib.rs
index 9364dfaa1..b9b56b693 100644
--- a/crates/vp9enc/src/lib.rs
+++ b/crates/vp9enc/src/lib.rs
@@ -85,7 +85,6 @@ pub(crate) struct Plane {
 }
 
 impl Plane {
-    #[allow(clippy::too_many_arguments)]
     fn new(data: &[u8], vw: usize, vh: usize, w: usize, h: usize, max_x: usize, max_y: usize) -> Plane {
         let mut src = vec![0u8; w * h];
         for y in 0..h {
diff --git a/crates/vp9enc/src/probs.rs b/crates/vp9enc/src/probs.rs
index 8f55bbba3..57af2e29b 100644
--- a/crates/vp9enc/src/probs.rs
+++ b/crates/vp9enc/src/probs.rs
@@ -9,7 +9,11 @@
 //! entropy codes the recorded symbols with the updated probabilities.
 
 use crate::bool::BoolEncoder;
-use crate::tables::*;
+use crate::tables::{
+    DEFAULT_COEF_PROBS, DEFAULT_INTER_MODE_PROBS, DEFAULT_IS_INTER_PROB, DEFAULT_MV_BITS_PROB, DEFAULT_MV_CLASS_PROBS, DEFAULT_MV_CLASS0_BIT_PROB,
+    DEFAULT_MV_CLASS0_FR_PROBS, DEFAULT_MV_FR_PROBS, DEFAULT_MV_JOINT_PROBS, DEFAULT_MV_SIGN_PROB, DEFAULT_PARTITION_PROBS, DEFAULT_SINGLE_REF_PROB,
+    DEFAULT_SKIP_PROB, PARETO_TABLE, inv_map_table,
+};
 
 /// Coefficient probabilities `[ptype][ref][band][ctx][3]` for 4×4 transforms (band 0 uses
 /// contexts 0..3 only).
diff --git a/crates/vp9enc/src/tables.rs b/crates/vp9enc/src/tables.rs
index ffb266419..c70d7d8c2 100644
--- a/crates/vp9enc/src/tables.rs
+++ b/crates/vp9enc/src/tables.rs
@@ -2,8 +2,6 @@
 //! transcribed in FilmCraft's first-party decoder `filmcraft-vp9` (MIT OR Apache-2.0, the same
 //! licence as this crate).
 
-#![allow(clippy::unreadable_literal)]
-
 pub const DC_QLOOKUP: [i32; 256] = [
     4, 8, 8, 9, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 38, 38, 39, 40,
     41, 42, 43, 43, 44, 45, 46, 47, 48, 48, 49, 50, 51, 52, 53, 53, 54, 55, 56, 57, 57, 58, 59, 60, 61, 62, 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 70, 71, 72,
diff --git a/crates/vp9enc/src/tile.rs b/crates/vp9enc/src/tile.rs
index d7f6cb64f..1f0c37d80 100644
--- a/crates/vp9enc/src/tile.rs
+++ b/crates/vp9enc/src/tile.rs
@@ -8,7 +8,10 @@
 
 use crate::mc::{Mv, PhasePlanes, RefPlane, clamp_for_plane, predict};
 use crate::probs::{self, P, Writer, cost, tree_cost};
-use crate::tables::*;
+use crate::tables::{
+    COEFBAND_4X4, COL_SCAN_4X4, COUNTER_TO_CONTEXT, DEFAULT_SCAN_4X4, ENERGY_CLASS, KF_PARTITION_PROBS, KF_UV_MODE_PROBS, KF_Y_MODE_PROBS, MODE_2_COUNTER,
+    MV_REF_8X8, MV_REF_16X16, ROW_SCAN_4X4,
+};
 use crate::transform::{ADST_ADST, ADST_DCT, DCT_ADST, DCT_DCT, Quant};
 use crate::{BLOCK_8X8, BLOCK_16X16, Mi, Plane};
 
@@ -22,6 +25,13 @@ pub const NEARMV: u8 = 11;
 pub const ZEROMV: u8 = 12;
 pub const NEWMV: u8 = 13;
 
+/// Which reconstructed neighbours are available for intra prediction.
+#[derive(Clone, Copy)]
+struct IntraEdges {
+    left: bool,
+    above: bool,
+}
+
 const PARTITION_TREE: [i8; 6] = [0, 2, -1, 4, -2, -3];
 const INTRA_MODE_TREE: [i8; 18] = [0, 2, -9, 4, -1, 6, 8, 12, -2, 10, -4, -5, -3, 14, -8, 16, -6, -7];
 /// Leaves are `mode - NEARESTMV`.
@@ -104,7 +114,8 @@ fn levels_cost(levels: &[i32; 16], eob: usize) -> u32 {
 }
 
 /// Intra prediction (8.5.1) of a square block for DC / V / H / TM.
-fn predict_intra(p: &Plane, x: usize, y: usize, log2: usize, mode: u8, have_left: bool, have_above: bool) -> [i32; 64] {
+fn predict_intra(p: &Plane, x: usize, y: usize, log2: usize, mode: u8, edges: IntraEdges) -> [i32; 64] {
+    let IntraEdges { left: have_left, above: have_above } = edges;
     let size = 1usize << log2;
     let base = 128i32;
     let buf = &p.rec;
@@ -356,11 +367,11 @@ impl<'a> Tile<'a> {
     fn intra_block(&mut self, r: usize, c: usize) {
         let avail_u = r > 0;
         let avail_l = c > self.col_start;
-        let y_mode = self.choose_intra(0, c * 8, r * 8, 3, avail_l, avail_u);
+        let y_mode = self.choose_intra(0, c * 8, r * 8, 3, IntraEdges { left: avail_l, above: avail_u });
         let uv_mode = {
             let mut best = (i64::MAX, DC_PRED);
             for m in MODES {
-                let cost: i64 = (1..3).map(|p| self.intra_cost(p, c * 4, r * 4, 2, m, avail_l, avail_u)).sum();
+                let cost: i64 = (1..3).map(|p| self.intra_cost(p, c * 4, r * 4, 2, m, IntraEdges { left: avail_l, above: avail_u })).sum();
                 if cost < best.0 {
                     best = (cost, m);
                 }
@@ -379,17 +390,16 @@ impl<'a> Tile<'a> {
         // Residual: luma 2×2 transform blocks, then one 4×4 block per chroma plane.
         for (dy, dx) in [(0, 0), (0, 1), (1, 0), (1, 1)] {
             let tx = if self.f.quant.lossless { DCT_DCT } else { mode_tx_type(y_mode) };
-            self.intra_tx(0, c * 8 + dx * 4, r * 8 + dy * 4, y_mode, tx, avail_l || dx > 0, avail_u || dy > 0);
+            self.intra_tx(0, c * 8 + dx * 4, r * 8 + dy * 4, y_mode, tx, IntraEdges { left: avail_l || dx > 0, above: avail_u || dy > 0 });
         }
         for p in 1..3 {
-            self.intra_tx(p, c * 4, r * 4, uv_mode, DCT_DCT, avail_l, avail_u);
+            self.intra_tx(p, c * 4, r * 4, uv_mode, DCT_DCT, IntraEdges { left: avail_l, above: avail_u });
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
-    fn intra_cost(&self, plane: usize, x: usize, y: usize, log2: usize, mode: u8, have_left: bool, have_above: bool) -> i64 {
+    fn intra_cost(&self, plane: usize, x: usize, y: usize, log2: usize, mode: u8, edges: IntraEdges) -> i64 {
         let p = &self.planes[plane];
-        let pred = predict_intra(p, x, y, log2, mode, have_left, have_above);
+        let pred = predict_intra(p, x, y, log2, mode, edges);
         let size = 1 << log2;
         let mut s = 0i64;
         for i in 0..size {
@@ -400,10 +410,10 @@ impl<'a> Tile<'a> {
         s
     }
 
-    fn choose_intra(&self, plane: usize, x: usize, y: usize, log2: usize, have_left: bool, have_above: bool) -> u8 {
+    fn choose_intra(&self, plane: usize, x: usize, y: usize, log2: usize, edges: IntraEdges) -> u8 {
         let mut best = (i64::MAX, DC_PRED);
         for m in MODES {
-            let cost = self.intra_cost(plane, x, y, log2, m, have_left, have_above);
+            let cost = self.intra_cost(plane, x, y, log2, m, edges);
             if cost < best.0 {
                 best = (cost, m);
             }
@@ -411,8 +421,7 @@ impl<'a> Tile<'a> {
         best.1
     }
 
-    #[allow(clippy::too_many_arguments)]
-    fn intra_tx(&mut self, plane: usize, x: usize, y: usize, mode: u8, tx_type: u8, have_left: bool, have_above: bool) {
+    fn intra_tx(&mut self, plane: usize, x: usize, y: usize, mode: u8, tx_type: u8, edges: IntraEdges) {
         let ss = (plane > 0) as usize;
         let max_x = (self.f.mi_cols * 8) >> ss;
         let max_y = (self.f.mi_rows * 8) >> ss;
@@ -424,7 +433,7 @@ impl<'a> Tile<'a> {
             return;
         }
         let p = &self.planes[plane];
-        let pred = predict_intra(p, x, y, 2, mode, have_left, have_above);
+        let pred = predict_intra(p, x, y, 2, mode, edges);
         let mut res = [0i32; 16];
         for i in 0..4 {
             for j in 0..4 {
diff --git a/docs/agents.md b/docs/agents.md
index d523dd636..d2b691b18 100644
--- a/docs/agents.md
+++ b/docs/agents.md
@@ -54,13 +54,13 @@ The release packages ship `effectcraft-cli` alongside the desktop app, so no bui
 
 | Install | CLI |
 |---|---|
-| Windows (MSI) | `C:\Program Files\EffectCraft\effectcraft-cli.exe` by default (wherever you installed it otherwise), not on `PATH` |
+| Windows (MSI) | `%LOCALAPPDATA%\Programs\ArtCraft\EffectCraft\effectcraft-cli.exe` by default (`C:\Program Files\ArtCraft\EffectCraft\effectcraft-cli.exe` for an all-users install, under `Program Files (x86)` instead for the 32-bit build, or wherever you installed it otherwise), not on `PATH` |
 | Linux (deb, rpm) | `/usr/bin/effectcraft-cli` |
 | macOS | the separate `effectcraft-cli-<version>-macos-<arch>.zip` release asset (the `.app` holds only the desktop app) |
 
 ```sh
-# Windows, default install folder
-claude mcp add effectcraft -- "C:\Program Files\EffectCraft\effectcraft-cli.exe" mcp
+# Windows (PowerShell), default install folder
+claude mcp add effectcraft -- "$env:LOCALAPPDATA\Programs\ArtCraft\EffectCraft\effectcraft-cli.exe" mcp
 # Linux, or macOS with the CLI unzipped onto PATH
 claude mcp add effectcraft -- effectcraft-cli mcp
 ```
@@ -180,6 +180,7 @@ Short recipes; every step is one tool call.
 | Animate | `add_keyframe {"layer":2,"path":"transform/scale","keys":[{"time":0,"value":[0,0]},{"time":0.5,"value":[100,100]}],"interpolation":"easyEase"}` |
 | Effect with settings | `list_effects {"filter":"glow"}` → `add_effect {"layer":2,"effect":"Glow","values":{"threshold":40,"radius":30}}` → `set_property {"layer":2,"path":"effects/#1/intensity","value":2}` |
 | Key a green screen | `add_effect {"layer":2,"effect":"Keylight (1.2)"}` → `execute_command effect.pickColor {"layer":2,"effect":1,"param":"screenColour","x":20,"y":20,"average":true}` (a screen pixel, layer space; samples the effect's input) → `set_property {"layer":2,"path":"effects/#1/screenMatte/clipBlack","value":10}` → `render_frame {"transparent":true}` |
+| Key objects by Cryptomatte | `add_effect {"layer":2,"effect":"Cryptomatte"}` → `execute_command effect.pickCryptomatte {"layer":2,"effect":1,"x":120,"y":80}` (the ID under that layer pixel replaces the Selection; `"mode":"add"` / `"remove"` edit it; `effect.cryptomatteAt` with the same point only reports the name) → `render_frame` |
 | Drive with an expression | `set_property {"layer":2,"path":"transform/rotation","expression":"time*90"}` |
 | Inspect a layer | `get_layer {"layer":2,"flat":true}` (every property with its `path`, value, key count) |
 | Check the result | `render_frame {"time":1.5,"max_side":640}`; in bridge mode `screenshot {"panel":"Timeline"}` |
@@ -216,7 +217,7 @@ Things that tripped up a long agent-driven session (a multi-scene 3D piece built
 
 ### Cookbook (from end-to-end QA)
 
-The scenarios in `crates/automation/tests/qa/` and `apps/effectcraft-cli/tests/qa_template.rs`
+The scenarios in `crates/automation/tests/qa/` and `apps/effectcraft-cli/tests/it/qa_template.rs`
 build real projects through these interfaces; they are worked examples of everything below.
 
 * **Name things when you create them**: `layer.newText`, `layer.newShape`, `layer.newSolid`,
@@ -303,7 +304,9 @@ build real projects through these interfaces; they are worked examples of everyt
   The CLI also renders an exported template directly:
   `effectcraft-cli render --template lt.ectemplate --values values.json --out 'title_[#####].png'`.
   `values.json` is an object such as `{"Title":"John Smith","Bar Color":"#00c080","Bar Opacity":50}`;
-  names follow `essential.set`, including its case-insensitive matching. Values override one
+  names follow `essential.set`, including its case-insensitive matching. A Media Replacement
+  control takes a footage file path (`{"Clip":"/in/clipB.mp4"}`, or `{"path": …}`), which is
+  imported and set as the control's `item`. Values override one
   imported instance; the template file and its source controls keep their defaults. Omit
   `--values` to render those defaults, or use the same options with `render-frame` for a PNG.
   Values must fit in 1 MiB. Invalid JSON, unknown controls and invalid values fail before rendering.
@@ -321,8 +324,8 @@ build real projects through these interfaces; they are worked examples of everyt
 ### Effect positions
 
 Effect points, Puppet pins (`puppet.addPin`, `puppet.recordPin`), Paint, Liquify and Roto Brush
-strokes and `effect.pickColor` are in **effect space**: layer pixels from the top-left of the
-layer's effect bounds. For footage, solids and precomps that is the layer's own pixel grid. Shape
+strokes, `effect.pickColor` and `effect.pickCryptomatte` are in **effect space**: layer pixels
+from the top-left of the layer's effect bounds. For footage, solids and precomps that is the layer's own pixel grid. Shape
 and text layers have comp-sized bounds centred on their content's origin, so in a `w` × `h` comp
 the point `[w / 2, h / 2]` is that origin (a new effect's default point). `prop.get` / `prop.set`
 read and write these values as they are.
@@ -530,7 +533,10 @@ indices): character attributes
    starts editing (`position` instead of `box` makes point text; `vertical: true` vertical type).
 2. `text.insert {"text":"Hello world"}` types at the caret (replacing the selection);
    `text.setSelection {"start":6,"end":11}` selects "world"; `text.moveCaret {"to":"wordLeft",
-   "extend":true}` moves like the arrow keys; `text.delete {"word":true}` is Alt+Backspace.
+   "extend":true}` moves like the arrow keys; `text.delete {"word":true}` is Alt+Backspace;
+   `text.deleteSurrounding {"before":1,"after":2,"bytes":true}` deletes the characters around the
+   selection without deleting it (what an input method's replacement asks for: the selection stays
+   for the commit that follows; a byte count ending inside a character leaves that character).
 3. `layer.setText {"range":[6,11], "size":40, "fill":"#ff5500"}` styles the selection (the
    Character panel does the same); with an empty range it sets the style the next typed text takes.
 4. `edit.copy`, `edit.paste`, `edit.pasteTextMatchFormatting` and `edit.pasteTextFormattingOnly`
@@ -540,8 +546,10 @@ Fonts: `text.fonts` (MCP `list_fonts`) lists every family a text layer can use,
 styles, origin (`bundled`, `system`, `user`), `variable` (it has variation axes) and own-language name
 (`{"query":"gothic"}` filters by name, `{"variable":true}` keeps only variable fonts, like the font
 menu's Variable Fonts filter; `{"rescan":true}` first picks up fonts installed since launch). Pass a listed `family` and
-one of its `styles` to `layer.setText {"font", "style"}`; `text.fontFeatures` says which OpenType
-options a font draws with its own glyphs.
+one of its `styles` to `layer.setText {"font", "style"}`. A variable font's named instances (`Light` …
+`Black`) are styles of its family; a style or an instance's PostScript name (`"font": "Figtree-Black"`)
+sets the instance's axis values, and `variations` set on the text override them axis by axis.
+`text.fontFeatures` says which OpenType options a font draws with its own glyphs.
 A tool with its own font library can hand it over without installing it: folders listed in
 `EFFECTCRAFT_FONT_DIRS` (a path list, `:`-separated, `;` on Windows) are scanned like the system font folders.
 On Linux and the BSDs the system font folders are `/usr/share/fonts`, `/usr/local/share/fonts`,
@@ -591,6 +599,12 @@ Extension points and the bundled extensions: [plugins.md](plugins.md).
   properties, FF missing effects, EE Expressions, LL Waveform, UU everything changed from its
   default. Shift+key adds or removes a set; the same key again hides it; Ctrl/Cmd+` twirls the
   selected layers open or closed. With no layer selected they apply to every layer.
+* A row control clicked on one of several selected layers applies to every selected layer, as in
+  After Effects: the A/V switches (video, audio, solo, lock), the Switches column (shy, collapse,
+  quality, fx, frame blending, motion blur, adjustment, 3D), the label swatch and the Modes column
+  (blending mode, Preserve Transparency), one undo step, with the layers the switch doesn't apply
+  to left out. A control on an unselected row changes that layer alone; Alt-clicking an A/V feature
+  still sets the selected layers apart from the rest.
 * `keys.toggleTransform {"layers"?: [...], "prop": "position"}` (Alt+Shift+A/P/S/R/T) adds or
   removes a keyframe at the current time on that Transform property of each layer, in one undo
   step (separated X/Y/Z Position; Orientation and X/Y/Z Rotation on 3D layers).
@@ -663,6 +677,7 @@ effectcraft-cli render-frame main.ecproj --time 1 --max-side 640 --out f.png --j
 effectcraft-cli exec layer.newNull --bridge 9877                 # same commands, against the live app
 effectcraft-cli exec file.exportLottie '{"comp":"Main","path":"main.json","includeExpressions":true}' main.ecproj --json
 effectcraft-cli exec file.importLottie '{"path":"anim.json"}' main.ecproj --save
+effectcraft-cli render main.ecproj --comp Main --out main.mov --format prores --progress   # progress lines on stderr for a program that reads them
 ```
 
 Scripts written against After Effects' documented scripting API run with `script`:
diff --git a/docs/architecture.md b/docs/architecture.md
index 72daec328..d3dd4db69 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -356,7 +356,7 @@ to the preview cache. Scoped allocation failures retain the adaptive budget/CPU
 
 **Recovery boundary:** the host installs handlers through eframe's CreationContext, after egui's
 presentation pipelines but before EffectCraft's pipelines. This does not cover that earlier egui
-startup window. eframe 0.36.2 supports lost-surface recreation, not replacing its live device and
+startup window. eframe 0.37 supports lost-surface recreation, not replacing its live device and
 all presentation resources. Device loss therefore requires restarting the presentation backend;
 CPU compositing alone cannot restore that display. No automatic restart or persistent safe-mode
 sentinel is implemented here. Browser scope futures are not synchronously awaited; the browser page
diff --git a/docs/control-protocol.md b/docs/control-protocol.md
index 4d01ef2e9..6c7548835 100644
--- a/docs/control-protocol.md
+++ b/docs/control-protocol.md
@@ -38,7 +38,7 @@ printf '{"id":1,"method":"engine.execute","params":{"command":"comp.new","params
 | `engine.execute` | `{command, params?}` | The command's result. Every engine command (`effectcraft-cli commands`) runs exactly as it does headless, so it never opens a dialog: `comp.new {}` creates a default comp. UI-only ids (`tool.*`, `view.*`, `window.*`, `playback.*`, `timeline.*`, `app.*`) fall through to the menu dispatcher. Unknown top-level params are rejected, and the error lists the accepted keys. |
 | `ui.menu.invoke` | `{id, params?}` | Like a menu click: commands with empty params may open their dialog (New Composition, Solid Settings, file pickers). |
 | Copy a Media Browser source path | `ui.menu.invoke {id: "mediaBrowser.copySourcePath", params: {path}}` | Copies the exact non-empty path string to the clipboard and returns `{path}`. Supports file/folder paths and virtual source identifiers. Missing, empty or non-string paths return an error. |
-| UI commands (via either) | | `timeline.column {column, visible?}` (av, keys, label, num, comment, switches, modes, parent, in, out, duration, stretch), `timeline.sourceName {value?}`, `timeline.search {query}`, `timeline.reveal.<kind>` / `timeline.revealAdd.<kind>` (the property shortcuts and Shift+shortcut: position, scale, rotation, opacity, anchor, effects, masks, feather, levels, animated, and the double-press sets maskPath, maskOpacity, timeRemap, expressions, material, paint, selected, missingEffects, waveform), `timeline.keyAt.<anchor\|position\|scale\|rotation\|opacity>` (Alt+Shift+A/P/S/R/T), `timeline.twirlSelected` (Ctrl/Cmd+`), `timeline.collapseAll`, `flowchart.options {layers?, effects?, solids?, direction?: lr\|tb, comp?}`, `flowchart.graph {comp?}` → `{nodes, edges}`, `window.workspace {name}` (all After Effects workspaces). |
+| UI commands (via either) | | `timeline.column {column, visible?}` (av, keys, label, num, comment, switches, modes, parent, in, out, duration, stretch), `timeline.sourceName {value?}`, `timeline.search {query}`, `timeline.reveal.<kind>` / `timeline.revealAdd.<kind>` (the property shortcuts and Shift+shortcut: position, scale, rotation, opacity, anchor, effects, masks, feather, levels, animated, and the double-press sets maskPath, maskOpacity, timeRemap, expressions, material, paint, selected, missingEffects, waveform), `timeline.keyAt.<anchor\|position\|scale\|rotation\|opacity>` (Alt+Shift+A/P/S/R/T), `timeline.twirlSelected` ``(Ctrl/Cmd+`)``, `timeline.collapseAll`, `flowchart.options {layers?, effects?, solids?, direction?: lr\|tb, comp?}`, `flowchart.graph {comp?}` → `{nodes, edges}`, `window.workspace {name}` (all After Effects workspaces). |
 | `engine.commands` | `{filter?, enabledOnly?}` | `[{id, label, menu, shortcut, params, enabled, why}]` |
 | `ui.menu.list` | `{}` | The menu tree with enablement. |
 | `render.frame` | `{comp?, time?, max_side?, path?, base64?}` | Renders a comp frame through the session, independent of the viewer zoom or resolution. `comp` is an id or name (default: the active comp), `time` is in comp seconds (default: the CTI), `max_side` caps the longest side (0 = full size). Writes a PNG to `path` (default: a temp file) and returns `{comp, time, width, height, path}`. With `base64: true` it returns `{…, png: "<base64>"}` and writes no file. |
@@ -51,7 +51,7 @@ export formats, parity summary), `jobs.list` (Progress panel jobs, e.g. the back
 `footage.check` after File ▸ Open).
 
 Every engine command is reachable through `engine.execute`, and every interactive widget of every
-panel registers an element id; both are enforced by `crates/ui-egui/tests/ui_agent_audit.rs`.
+panel registers an element id; both are enforced by `crates/ui-egui/tests/it/ui_agent_audit.rs`.
 
 ## UI state
 
@@ -126,7 +126,7 @@ frames and can be assigned through `shortcuts.set`.
 
 | Method | Params | Result |
 |---|---|---|
-| `ui.screenshot` | `{path?, panel?, id?}` | `{path, width, height}`: a PNG of the window, or cropped to one panel or element. |
+| `ui.screenshot` | `{path?, panel?, id?}` | `{path, width, height}`: a PNG of the window, or cropped to one panel or element. The panel or element rectangle is resolved when the capture is issued (after the UI settles), so it follows a panel that moved; a panel or id that is not on screen is retried and then reported, never replaced by a whole-window shot. |
 
 Element ids are stable, for example `tools.Selection`, `panel.Timeline`, `panel.tab.EffectControls`,
 `panel.tab.Timeline.<comp>` (one Timeline tab per open comp; `panel.tab.Timeline` is the shown
@@ -186,20 +186,63 @@ including outside the layer's `[in, out)` range. Timing metadata carries outside
 `prop.get.time` is comp seconds. For these commands, `path` or `prop` identifies a property, not a group.
 Set a layer's offset with `layer.timing {layer, start}` (comp seconds).
 
-Panel moves, tab ordering, edge splits and floating geometry use shared docking transactions.
-`window.floatPanel` requires exactly four finite numbers when `rect` is supplied. Invalid
-geometry or missing source/anchor panels leaves the layout unchanged. The persisted workspace
-shape is unchanged: accordion open states and explicit heights, floating groups, and dynamic
-viewer/ScriptUI identities remain app data. Pointer drops use the same shared placement rules
-as commands, with floating groups resolved in their actual window stacking order.
+Panels dock in craft-ui's shared docking (`craft_ui::docking`): split frames, tab groups,
+stacked panels and floating windows. Every change, by pointer, menu or command, is one
+transaction that checks the whole result; an invalid one returns an error and leaves the layout
+unchanged. No move or float may leave the docked area empty; closing its last panel is allowed.
+Panels name themselves by id (`"EffectControls"`), by title (`"Effect Controls"`) where a command
+takes a name, or as `{"Viewer":42}` and `{"ScriptPanel":77}` for viewers and ScriptUI panels.
 
-`window.dockAction` accepts `{action}` using the shared docking action's JSON form. It
-covers tab moves and ordering, split and floating geometry, activation, and closing.
-For example, `{"action":{"ResizeSplit":{"path":[],"size":{"FixedFirst":360}}}}`
-resizes the root split; path entries use `false` for the first child and `true` for
-the second. `{"action":{"MoveFloating":{"panel":"Info","rect":[45,65,420,320]}}}`
-repositions and resizes the floating group containing Info. Invalid actions leave the
-layout unchanged. Pointer gestures dispatch through this same catalog command.
-EffectCraft also supports `SetStackOpen` and `ResizeStack`. Dynamic panel identities use
-`{"Viewer":42}` or `{"ScriptPanel":77}` in the action. Closing runs the existing viewer
-and ScriptUI lifecycle callbacks; opening uses the existing panel creation commands.
+- `window.dockAction {action}` applies one craft-ui `Action` in its JSON form. For example,
+  `{"action":{"ResizeSplit":{"path":[],"size":{"FixedFirst":360}}}}` resizes the root split
+  (path entries are `false` for the first child and `true` for the second), and
+  `{"action":{"MoveFloating":{"panel":"Info","rect":[45,65,420,320]}}}` moves and resizes the
+  floating window holding Info. `Open` and `OpenAt` are refused: panels open through the panel
+  commands (`window.panel`, `ui.panel.show`), which run the viewer and ScriptUI lifecycles.
+  Closing runs them too. Pointer gestures dispatch through this command.
+- craft-ui's commands: `window.panel.move`, `.float`, `.dock`, `.activate`, `.close`,
+  `.closeGroup`, `.closeOthers`, `.minimize`, `.iconic`, `.window` and `.layout`, with the params
+  of craft-ui's `DockCommand` (`docs/ui-docking.md` in craft-libs). `window.panel.<Panel>`
+  (`window.panel.Align`) opens and shows that panel. `window.panel.activate` on a closed panel
+  reopens it where it was.
+- `ui.dock {operation, panel, …}` or `ui.dock {action}`: craft-ui's `ui.dock` operations
+  (`open`, `close`, `activate`, `float {rect}`, `moveFloating {rect}`,
+  `move {target, zone?, before?}`, `setStackOpen {open}`, `resizeStack {height}`,
+  `resizeSplit {path, size}`; `rect` is `[x, y, width, height]`). It returns
+  `{"docking": workspace}`. `ui.dock.reset` returns the current workspace to its saved or
+  built-in layout and returns the same.
+- `window.dockPanel {panel, anchor?, zone?, before?}` docks as `window.panel.dock`: `zone` is
+  `center`, `tab`, `left`, `right`, `top`, `bottom`, `above` or `below`; without an anchor a
+  side zone docks along that edge of the whole workspace. `window.floatPanel {panel, rect?}`
+  requires exactly four finite numbers when `rect` is given and otherwise floats a 420x320
+  window in the middle of the app window. `window.closePanel {panel}` closes it.
+- `window.panelWindow {panel, window?}` puts a panel in a floating window of its own with a
+  desktop place over the panel's place in the main window, and returns `{"window": bool}`. A
+  docked panel floats first. `window` false docks it again, as a tab of the first docked group;
+  without `window` it toggles.
+
+On desktop every floating window is an OS window of its own (craft-ui's `native-windows`), which
+can go on another monitor; on Wayland, on the web and where egui embeds viewports, floating
+windows stay in the main window. Keys pressed in a floating window that none of its widgets uses
+run the main window's shortcuts, and files dropped on one import as on the main window. While a
+modal dialog is open, floating windows take no input.
+
+The automation ids of the docking chrome are `panel.tab.<Panel>`, `panel.drag.<Panel>` (a
+group's drag bar), `panel.tabs.more.<Panel>`, `panel.menu.<Panel>` (≡), `panel.header.<Panel>`
+(a stacked panel's open and close button), `panel.tab.<Panel>.lock` (viewer lock),
+`panel.tab.Timeline.<comp>` and `panel.tab.Timeline.close` (the Timeline's comp tabs),
+`panel.float.<n>.move`, `.close`, `.resize` and `.resize.<Edge>` for floating window `n`,
+`dock.gutter.<path>` for dividers (`a`/`b` per split level; a stack's gap below entry `i` adds
+`s<i>`) and `dock.corner.<outer>.<inner>` where two dividers meet.
+
+Saved workspaces (`workspaces.json`, version 2) hold craft-ui `Workspace`s: the layout, the
+closed panels with where each goes back, the lock, and each floating window's desktop place. A
+version 1 file (EffectCraft 0.10 and earlier) and the older unversioned record of
+named workspaces load with every panel in place: the current layout, the named workspaces,
+floating windows and their native window places. A column of stacked frames becomes tab groups
+split top to bottom: each open frame keeps all its tabs and its height (as a fixed size), and a
+closed frame's tabs join the open frame above it. A native window's place moves from the OS
+window's outer position to its content's, by the main window's title bar, before the first save.
+Panels that were closed stay closed and reopen at their default place. The first save writes version 2 and keeps
+the earlier file as `workspaces.old.json`. A damaged, unknown or newer file loads as the default
+layout and is left unchanged.
diff --git a/docs/effects-parity.md b/docs/effects-parity.md
index c5fbc5ba8..83e9a15bc 100644
--- a/docs/effects-parity.md
+++ b/docs/effects-parity.md
@@ -15,7 +15,7 @@ After Effects', and does the preset library exist. The per-effect catalogue is t
 | Parameter names, order, popups, units, defaults | aligned in M9.12 | Agent-checked against After Effects' documentation, not against a live dump |
 | On the GPU | **280** (92%) | Measured: registry flags; GPU vs CPU agreement tested per effect |
 | 32-bit float, no clamping | 306 | Measured: registry flags |
-| **Rendered output matches After Effects** | **unmeasured** | No effect is compared with an After Effects render yet. `effectcraft_effects::fidelity::compare_frames` exists for the corpus ([fidelity/README.md](fidelity/README.md)); simulation effects are pinned by golden hashes of our own output (M13.27) |
+| **Rendered output matches After Effects** | **partly measured** | Some colour effects are checked against After Effects 2026 renders of our own test projects: Tint, Tritone, Black & White, Exposure, Levels, Curves, Luma Key, Extract, 4-Color Gradient and Fill within 1–3/255, Brightness & Contrast up to 6.2/255 (Color Correction, Generate and Keying rows below); Radial Blur, Glow, Venetian Blinds, Radial Wipe, Fractal / Turbulent Noise and Transform are checked the same way (rows below); every other effect is unmeasured. `effectcraft_effects::fidelity::compare_frames` exists for the corpus ([fidelity/README.md](fidelity/README.md)); simulation effects are pinned by golden hashes of our own output (M13.27) |
 | Animation presets | **54** original presets (8 text-animator, 23 Transitions, 23 Backgrounds) against After Effects' **621** `.ffx` presets | Measured: `crates/engine/presets/text_animators.json`, `crates/engine/presets/transitions.json`, `crates/engine/presets/backgrounds.json`; the After Effects `Presets` folder |
 | 26.x additions | Curl Noise (26.3) present (#463 open); effect colour labels (26.5) present in Effect Controls only, not in the Timeline; the rebuilt Effect Controls (26.5) missing | Release notes |
 
@@ -28,24 +28,24 @@ corpus compares renders, each effect is assumed to differ somewhere, and users k
 |---|---:|---:|---|
 | 3D Channel | 8 | 8 | Cryptomatte selection can't be set in the UI and the GPU path is slow (#473; quoted names with commas fixed); multi-layer EXR decode shared (#474 open: f16 storage and cache sizing remain) |
 | Audio | 13 | 0 | CPU by design (applied in the mixdown) |
-| Blur & Sharpen | 16 | 15 | Gaussian Blur interaction and output to be measured first ([fidelity/ae-2026-acceptance.md](fidelity/ae-2026-acceptance.md)) |
+| Blur & Sharpen | 16 | 15 | Radial Blur keeps the layer edges as After Effects 2026 (713 now pixel-identical); Gaussian Blur interaction and output to be measured first ([fidelity/ae-2026-acceptance.md](fidelity/ae-2026-acceptance.md)) |
 | Channel | 13 | 13 | — |
-| Color Correction | 40 | 40 | Tint has Swap Colors (#963); ACES 2.0 / OCIO 2.5 (26.5); Apply Color LUT (#514) and 32-bpc blending (#494) are closed |
-| Distort | 39 | 35 | Liquify has no viewer brush; #303 (Mesh Warp drag) and #534 (CC Power Pin Unstretch) are closed |
+| Color Correction | 40 | 40 | Tint, Tritone and Black & White (sliders and Tint) match After Effects 2026 renders (Rec. 601 luminance); Levels (Individual Controls) matches After Effects 2026 in 32 bpc (channel controls before RGB, "Off for 32 bpc Color" unclipped; plain Levels' channel order not measured); Brightness & Contrast (non-legacy) close to After Effects 2026 ramps, not identical (up to 6.2/255 off; the test allows 7/255) (negative settings invert the positive curves); Curves interpolates a natural cubic spline through its points, as After Effects 2026 (exact on its grey steps); Tint has Swap Colors (#963); ACES 2.0 / OCIO 2.5 (26.5); Apply Color LUT (#514) and 32-bpc blending (#494) are closed |
+| Distort | 39 | 35 | Transform matches After Effects 2026 renders (skew after rotation, drawn outside the layer); Liquify has no viewer brush; #303 (Mesh Warp drag) and #534 (CC Power Pin Unstretch) are closed |
 | Expression Controls | 9 | 9 | — |
-| Generate | 26 | 25 | Fractal on the CPU (needs f64); #526 (Reset) and #536 (Write-on marks) are closed |
+| Generate | 26 | 25 | 4-Color Gradient's Blend matches After Effects 2026 (weights 1 / (d² + Blend²)); Fill's Opacity is the filled layer's opacity, as After Effects 2026 renders it (with a Fill Mask it still mixes with the original, not measured); Fractal on the CPU (needs f64); #526 (Reset) and #536 (Write-on marks) are closed |
 | Immersive Video | 12 | 12 | — |
-| Keying | 12 | 12 | Key Cleaner approximated; #533 (wire-removal Frame Offset) is closed |
+| Keying | 12 | 12 | Luma Key and Extract key on Rec. 601 luminance, as After Effects 2026; Key Cleaner approximated; #533 (wire-removal Frame Offset) is closed |
 | Matte | 6 | 4 | Mocha shape reads our documented JSON, not Mocha's format |
-| Noise & Grain | 13 | 12 | Curl Noise (#463); Match Grain on the CPU |
-| Obsolete | 9 | 9 | — |
+| Noise & Grain | 13 | 12 | Fractal / Turbulent Noise lattice matches After Effects 2026 (Scale 100 = 66.7 px cells); the noise values themselves differ (seeds) and Soft Linear contrast is about 20 % lower than AE's; Curl Noise (#463); Match Grain on the CPU |
+| Obsolete | 9 | 9 | Luma Key matches After Effects 2026 on a grey ramp (hard cut, Tolerance only for Similar / Dissimilar) |
 | Paint | 1 | 0 | Tablet pressure not read ([hardware-parity.md](hardware-parity.md)) |
 | Perspective | 10 | 9 | Chromatic Aberrations pan/tilt crash (#580) |
 | Simulation | 18 | 18 | Particle Playground lacks Particle Exploder, text particles, ephemeral mapper; CC Particle World camera fixed (#397) |
-| Stylize | 25 | 25 | Motion Tile output size (#369) |
+| Stylize | 25 | 25 | Glow's halo (coverage of a dim layer's edge) and blur width match After Effects 2026 renders; glows above the threshold match too (each channel 8 × (value − threshold + 0.061), measured at three thresholds and two radii); Composite Original's labels are swapped against After Effects (EffectCraft's On Top adds the glow over the original, which After Effects calls Behind); Motion Tile output size (#369) |
 | Text | 2 | 2 | — |
 | Time | 8 | 8 | #535 (Pixel Motion Blur, Vector Detail) is closed |
-| Transition | 17 | 17 | — |
+| Transition | 17 | 17 | Venetian Blinds matches After Effects 2026 renders (band phase from the layer centre, Gaussian feather on both edges) except within ~6 px of the layer edge (up to 48/255); Radial Wipe's Feather matches After Effects 2026 (a Gaussian of σ = 0.4 × Feather pixels on both edges of the wedge) |
 | Utility | 9 | 7 | — |
 
 Third-party bundles in After Effects (Cineware, Mocha AE) are out of scope; Keylight is
@@ -64,6 +64,24 @@ the GPU is performance, not parity.
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-19 | minor | Glow (original colours): bright pass per channel, 8 × (value − threshold + 0.061), measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | Glow (colour channels): the glow covers the layer's blurred alpha, blur σ = 0.384 × radius, measured against After Effects 2026 renders (CPU and GPU) |
+| 2026-10-19 | minor | Radial Blur repeats the edge instead of sampling transparency outside the layer, measured against After Effects 2026 renders (CPU; Radial Blur has no GPU path) |
+| 2026-10-19 | minor | Venetian Blinds: stripes measured from the layer centre, both band edges Gaussian (σ = Feather / 2), measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | Radial Wipe: Feather is in pixels on both edges of the wiped wedge (was degrees on the moving edge only), measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | Fractal / Turbulent Noise: lattice cell = Scale × 2/3 px (Block noise every 66.7 px at Scale 100, as After Effects 2026), CPU and GPU |
+| 2026-10-19 | minor | Transform: After Effects' skew order and output beyond the layer bounds, measured against After Effects 2026 renders of three cases (CPU and GPU) |
+| 2026-10-19 | minor | Tritone uses Rec. 601 luminance, measured against After Effects 2026 renders of a red solid and a grey ramp (CPU and GPU) |
+| 2026-10-19 | minor | Black & White's Tint keeps the gray's luminosity (Color blend), measured against After Effects 2026 renders (CPU and GPU) |
+| 2026-10-19 | minor | Levels: "Off for 32 bpc Color" no longer clips in 32 bpc projects, unclipped values extrapolate below Output Black; Levels (Individual Controls) applies the channel controls before the RGB ones, measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | Brightness & Contrast: negative Brightness / Contrast are the inverse curves of the positive ones (Brightness −40: 20/255 → 6/255 off After Effects 2026; still up to 6.2/255 off, not the same pixels), CPU and GPU |
+| 2026-10-19 | minor | Luma Key: Key Out Brighter / Darker cut hard at Threshold, measured against After Effects 2026 renders of a ramp (CPU and GPU) |
+| 2026-10-19 | minor | Luma Key and Extract: Rec. 601 luminance (was Rec. 709), measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | 4-Color Gradient: each point weighs 1 / (d² + Blend²), measured against After Effects 2026 at Blend 10 / 50 / 100 / 300 (CPU and GPU) |
+| 2026-10-19 | minor | Fill without a mask: the layer becomes the fill colour at its alpha × Opacity (was a mix with the original), measured against After Effects 2026 (CPU and GPU) |
+| 2026-10-19 | minor | Curves: natural cubic spline through the points, clamped to 0..1 (was a monotone spline), measured against After Effects 2026 (CPU and GPU); Lumetri's curves and Glow's Arbitrary Map keep the monotone spline |
+| 2026-10-18 | minor | Tint uses Rec. 601 luminance weights, measured against After Effects 2026 renders of red, green, blue and grey solids (CPU and GPU) |
+| 2026-10-18 | minor | Exposure converts to linear light with a pure 2.2 power curve, as measured in After Effects (Offset 0.0005 / 0.002 / 0.02 / 0.1 on black: 8 / 15 / 43 / 90), not the piecewise sRGB curve; its sliders take After Effects' ranges (Exposure −100..100, slider −4..4; Offset −2..2, slider −0.5..0.5; Gamma Correction 0.1..10) |
 | 2026-10-12 | minor | Parameters 3,014 to 3,017 (effects.md); #303, #514, #526, #533–#536 marked closed instead of pending |
 | 2026-10-12 | minor | Effect colour labels (26.5) added in Effect Controls |
 | 2026-10-12 | minor | Tint's Swap Colors button and agent-drivable command (#963); undo/redo, instance targeting, animated layer-time edits and invalid-input tests |
diff --git a/docs/egui-037-migration-plan.md b/docs/egui-037-migration-plan.md
new file mode 100644
index 000000000..692cec33c
--- /dev/null
+++ b/docs/egui-037-migration-plan.md
@@ -0,0 +1,1607 @@
+# EffectCraft — egui 0.37 migration plan
+
+Current landing status, 2026-10-25: the working tree includes main `991904888a20b7da72b2a4880b21c7d912154736` and pins egui `6d518fc799681571963842f95b55a6b68431b15a`, winit `a517b3846ee8457d84ee4975110bfda6797c44dc` and shared UI `25da1314d443171b4adeaad2cd9454b273f35c6f`. The final IME adapter uses ordered native reset request identifiers and `ImeResetCompleted`; the earlier tombstone-only description below is historical.
+
+Full current-source CI `egui037-effectcraft-current-main-ci-20261025-0231` recorded 3,961 passing tests, 14 failures and 31 ignored across 88 test summaries. All 14 failures are GPU tests: their names and diagnostic blocks match the frozen pre-migration `eb51087` baseline exactly after removing thread process numbers. Formatting, strict lint, layering, assets and the 32-crate WASM check completed. The 596-test UI regression suite passes. This is not a green full-CI result or hardware-GPU qualification. Native IME, visible final-source workflows and paired performance remain open.
+
+The repository's green-only commit gate remains unmet by the GPU results; the reviewed worktree and complete evidence are retained for human review. No push, publication or merge is authorized by this status.
+
+Historical implementation and research record follows. Its older pins, test counts and unacknowledged-reset description do not describe the current candidate.
+
+Status: implementation in progress, 2026-10-24. The dependency/API port, IME context adapter,
+screenshots, accessibility, font coverage and text-edit repairs are present in the dirty migration
+worktree. The parent-managed local run
+`egui037-effectcraft-candidate-20261024-upstream-tests-09` recorded **820 passed, 14 ignored**:
+`effectcraft-ui-egui --lib` 297 passed / 3 ignored, `--test it` 521 passed / 11 ignored and
+`--test ui_accessibility` 2 passed; `cargo clippy -p effectcraft-ui-egui --lib --tests -- -D warnings`
+exited 0. That run covers `effectcraft-ui-egui` only; the engine suite, full `cargo xtask ci`, wasm,
+native GUI and real-platform IME were not rerun for this revision. Evidence:
+`/home/codex/work/ssd2/task-evidence/egui037-effectcraft-candidate-20261023/task-jobs/egui037-effectcraft-candidate-20261024-upstream-tests-09/output.log`.
+The custom viewer text editor now has an explicit per-viewport IME composition lifecycle instead
+of a frame-number suppression window: an active composition is owned by the edit session's
+layer/session identity, and a target switch or editor end turns it into a tombstone. An empty
+pre-edit is the observed end of the visible composition, but its terminal commit/delete can arrive
+in a later event, so the owner stays associated with the cleared composition; if the target changes
+before that terminal event, the tombstone rejects it instead of applying it to the replacement. A
+lone non-empty old pre-edit keeps the tombstone across arbitrary idle frames. A rejected terminal
+commit consumes the tombstone immediately, so a new pre-edit later in the same raw input batch
+starts a composition for the current target. A rejected empty pre-edit or delete-surrounding keeps
+the tombstone through the rest of that batch so its paired old commit is rejected too, and is
+consumed at batch end when no commit follows. A composition started after that terminal boundary is
+accepted, so the tombstone never becomes a permanent lock. `egui::ImeEvent`
+payloads still carry no context generation, and the inspected `egui-winit` 0.37 source ignores
+`Ime::Enabled`/`Ime::Disabled` and implements `should_interrupt_composition` by toggling
+`set_ime_allowed` without an observable reset acknowledgement. The fallback therefore drops the
+first ambiguous composition after an unobserved platform reset rather than claiming provenance it
+cannot prove; a producer-side event epoch would be needed to close that residual, and this is not
+claimed as tested on a real platform IME here. Two real-app headless regressions in
+`crates/ui-egui/tests/it/ui_text_edit.rs` cover the observed-empty-preedit pending commit and a new
+pre-edit after a stale terminal commit in the same raw batch; this revision adds them but does not
+claim they were rerun here.
+The later bounded same-owner interruption repair (2026-10-24) tracks the expected caret and
+selection separately from that immutable layer/session owner. A live or terminal-pending
+composition is invalidated before application pointer/selection changes can accept an old IME
+mutation, including keys before a later IME event in the same raw batch and control-client
+selection changes before a pass. Accepted IME mutations update the expected selection so the
+IME deletion's own caret shift does not reject its paired commit. The existing terminal rules
+still permit a fresh preedit after a rejected terminal commit, and a direct commit with no active
+composition remains valid even after a pointer change in the same batch. Five new real-app
+regressions cover15 scenarios with both deletion forms, pointer and keyboard interruption,
+terminal-pending/external selection, undo preservation, fresh composition and direct commits.
+These new source bytes and tests await parent-managed formatting, focused/full gates and fresh
+independent review; no new test, native-IME or final dependency-graph acceptance is claimed here.
+
+Every future push or new pull request still needs a fresh, explicit human approval of the exact
+commit range and its validation; this document is not publication evidence.
+
+Scope: `storytold/effectcraft` only (this checkout). Shared work in `storytold/craft-libs`
+(PR 199 and the CL-2 capture helper), the suite egui fork and the suite winit fork are dependencies
+with their own plans; this document records what EffectCraft needs from them, not what they should
+do. Sibling apps, their plans and their dependency bumps are out of scope.
+
+This plan deliberately separates:
+
+- **facts** verified by reading the pinned source in this checkout, the egui checkout and the
+  upstream 0.36.2/0.37.0 tags;
+- **historical clues** (the 2026-10-22 audit compiler output), which are not current acceptance;
+- **proposals** (refactors and acceptance criteria) that the implementation PRs must prove.
+
+## 1. Baseline and provenance
+
+### 1.1 Exact source under plan
+
+| Item | Value |
+| --- | --- |
+| EffectCraft implementation checkout | `/home/codex/work/CraftApps/egui037-migration-20261022/effectcraft-implementation` |
+| Current EffectCraft worktree | HEAD `049070d65c66a73f322b496b22521816e0018f14`; dirty migration worktree. The lock and manifests still use the local integration patch, not final immutable pins. |
+| EffectCraft historical planning baseline | `9581b53c3f8945683252af0eb5fac79e0e43aed4` (`Release 0.16.0`, 2026-10-22), retained for baseline comparisons only |
+| Branch | `codex/egui-037-plan-20261022` |
+| Workspace | single root workspace `Cargo.toml` (`resolver = "3"`, members `crates/*`, `apps/*`, `xtask`) |
+| Lockfile | `Cargo.lock`, lock format 4 |
+| MSRV / edition | Rust 1.95, edition 2024 (`Cargo.toml:7-12`) |
+| Target upstream release | egui tag `0.37.0`, peeled commit `841a328ba2dd8f6996beb7189ebb7fc00e668a2a` (tagged 2026-10-15) |
+| Candidate suite egui (comparison input only) | `aiongg/craft/0.37` = `a4f9a17f64a6bae61350fb85804c9df0d9865916` (2026-10-21, E1–E21). Read-only source for this plan; **not a publication pin**. |
+| Candidate suite winit (comparison input only) | `aiongg/craft/0.30.13-lang` = `8b35388bd719e8cc86a95971ba0bc026c9a8f058` (winit 0.30.13 + W1–W15, W17–W27). Read-only source; **not a publication pin**. |
+| Production egui pin | **pending approved fork implementation**: the final reviewed and published `storytold/egui` P8 SHA containing E1–E21, P2b async W15P routing, P7 held-key pairing, P7b/E21b, P7c's selected `#8763`/`#8748` fixes and the justified `#8731`/`#8736` performance fixes if measurements require them. All egui-family crates must come from that one revision. |
+| Production winit pin | **pending approved fork implementation**: the completed, final reviewed `storytold/winit` SHA containing W1–W27, W15P and the W27 lifecycle fixes. |
+| Final dependency unit | one immutable set recorded together: the complete storytold egui P8 SHA + storytold winit SHA + craft-ui SHA with CL-1 and CL-2F, proved by a clean `--locked` fetch. This is the consumer's first and only compatibility landing: no stock-0.37 or intermediate fork production stage. |
+| Suite shared UI dependency | `craft-ui` from `storytold/craft-libs`, reconciled merged-PR base `3832c47ef68a0e6214f2c1e85f3526b6adcb686e` (current shared-library implementation base). Historical planning rev `5c874d51eeb3de70e735c8ce87a59a7dedd47675` is superseded; the final publication pin is the reviewed immutable SHA containing CL-1 and CL-2F. |
+| Shared PR history | `storytold/craft-libs#199` is merged at `3832c47ef68a0e6214f2c1e85f3526b6adcb686e`. Historical port hunks `8614e4a04fae516fba16c22b31ff1008cb6be10b` and README `1764bca`, applied to old `main` `49190884278f16c9a9f5823d7698a8ffb5deb062`, are superseded. Never merge `b68de8c`/`ec8840a` as trees. |
+| Separate language PR | `storytold/craft-libs#198` (fork E5/E9/E12–E21, winit W17–W27) |
+
+All pins must be full commit SHAs. Branch names are not publication pins. The `aiongg` SHAs above
+are source-inspection inputs for this review; the lock file in a publication branch must name only
+the final storytold revisions (plus the existing unrelated craft-libs PDF pin).
+
+### 1.2 Baseline dependency set (historical `9581b53c`; from `Cargo.lock` and manifests)
+
+The implementation worktree now resolves the egui family at `0.37.0` and `craft-ui` at
+`3832c47ef68a0e6214f2c1e85f3526b6adcb686e` through `local-integration-config.toml`; the current
+`Cargo.lock` entries therefore have no registry `source` for those patched crates. That local
+configuration is review evidence, not an immutable publication pin.
+
+| Crate | Version / source | Where pinned |
+| --- | --- | --- |
+| `egui` | `0.36.2` crates.io, checksum `dc938cc2…` | `Cargo.toml:108` |
+| `eframe` | `0.36.2` crates.io, checksum `55ad41fa…` | `Cargo.toml:109` (default features off) |
+| `egui_kittest` | `0.36.2` | `Cargo.toml:110`, dev-only |
+| `egui-wgpu` / `egui-winit` | `0.36.2` | transitive, one each |
+| `kittest` | `0.4.0` | transitive of `egui_kittest` |
+| `accesskit` / `accesskit_winit` | `0.24.1` / `0.32.2` | transitive |
+| `winit` | `0.30.13` crates.io, checksum `a6755fa5…` | `apps/effectcraft/Cargo.toml:23` (`"0.30"`, default features off) and transitive |
+| `wgpu` | `30.0.1` | `Cargo.toml:101` |
+| `craft-ui` | baseline `0.1.0` git `storytold/craft-libs` rev `5c874d51…`; implementation resolves local `craft-libs-implementation` at `3832c47…` | `Cargo.toml:107` plus `local-integration-config.toml` |
+| `craft-pdf` | git `storytold/craft-libs` rev `ca50d63b…` | `Cargo.toml:15` |
+| `craft-docpath` | git `storytold/craft-libs` rev `82a24b00…` | `Cargo.toml:16` |
+| `hayro-syntax` patch | git `storytold/craft-libs` rev `ca50d63b…`, `=0.7.2` | `Cargo.toml:213-214` |
+| `wasm-bindgen` | `0.2.129` (exact crate and CLI), `apps/effectcraft-web/Cargo.toml:34` and `xtask/src/main.rs:254` | web only |
+| filmcraft crates | git rev `2c5ba7a7…` | `Cargo.toml:76-95` |
+
+There is exactly one egui family in the baseline. The target must preserve that invariant (see §6).
+
+Manifest audit: 38 `Cargo.toml` files (root, 32 `crates/*`, 3 `apps/*`, `xtask`, and the standalone
+plugin). Only `crates/ui-egui`, `apps/effectcraft`, `apps/effectcraft-web` and (through
+`effectcraft-ui-egui`) `apps/effectcraft-cli` use the egui family. `examples/plugins/posterize-bands`
+has its own workspace/lock and no egui. There are no vendored crates and no `[patch]` on the egui
+family in the baseline; the only patch is `hayro-syntax`.
+
+### 1.3 Package, binary, feature and entry-point targets
+
+| Target | Kind | egui-family surface |
+| --- | --- | --- |
+| `effectcraft` (`apps/effectcraft`) | native binary | `eframe` with `default_fonts`, `wgpu`, `accesskit`, `links`, `wayland`, `x11` (`apps/effectcraft/Cargo.toml:18`); direct `winit`; native `Desktop` app (`apps/effectcraft/src/main.rs:426-456`) |
+| `effectcraft-web` (`apps/effectcraft-web`) | `cdylib` + `rlib`, wasm32 | `eframe` web runner (`app.rs:88-122`, `start()` at `app.rs:185`); `eframe` features `default_fonts`, `wgpu` |
+| `effectcraft-ui-egui` (`crates/ui-egui`) | library (swappable frontend) | the real UI, control channel, docking, viewer, timeline, kittest dev-dep `eframe` + `wgpu` (`crates/ui-egui/Cargo.toml:24-41`) |
+| `effectcraft-cli` | binary + MCP server | depends on `effectcraft-ui-egui` for `bench --ops` (`apps/effectcraft-cli/Cargo.toml:19`) |
+| `effectcraft-ui-egui --example snapshot` | example | headless kittest+wgpu screenshots (`crates/ui-egui/examples/snapshot.rs`) |
+| `xtask` | tool | `ci`, `wasm`, `web`, `assets`, `layers` (`xtask/src/main.rs:409-428`) |
+| `examples/plugins/posterize-bands` | separate nested workspace | no egui dependency; its own `Cargo.lock`; untouched |
+
+Platform cfgs that the migration must respect:
+
+- wasm32: `frames.rs` remote/local frame pump, `audio.rs` Web Audio, `theme.rs` no system fonts,
+  `prefs_live.rs` no native drops, viewer deferred readbacks (`lib.rs:825-855`), `sys-locale` only
+  off-wasm (`crates/ui-egui/Cargo.toml:36-37`), web storage/workers.
+- native: pointer wrap (`pointer_wrap.rs:133`), system font fallbacks (`theme.rs:388-430`),
+  `rfd`/`cpal`, native menu (macOS), `zbus` appearance (Linux), appimage (Linux).
+- `eframe`/`winit` platform features: Wayland and X11 on Linux, `muda`/`objc2` on macOS,
+  `winresource` on Windows.
+
+### 1.4 Current test and CI commands (source-declared)
+
+- `cargo xtask ci` = `cargo fmt --check`; `cargo clippy --workspace --all-targets --release -- -D warnings`;
+  `cargo test --workspace --release`; PDF dependency check; `layers`; `assets`; `wasm`
+  (`xtask/src/main.rs:409-418`).
+- `cargo xtask wasm` checks every L0–L4 crate plus `effectcraft-ui-egui` and `effectcraft-web`
+  for `wasm32-unknown-unknown` (`xtask/src/main.rs:235-252`).
+- UI tests: 81 files in `crates/ui-egui/tests`, driven by `egui_kittest::Harness`
+  (`build_eframe`, `run_steps`, synthetic `Event`s, automation-registry rects, AccessKit queries).
+  `ui_gpu.rs` runs the viewer on egui-wgpu's device; `ui_agent_audit.rs` audits commands and
+  automation coverage; `viewer_geometry.rs` has an opt-in visual matrix
+  (`CRAFT_UI_VISUAL_DIR`).
+- Web: `cargo xtask web --serve 8765`, then `node apps/effectcraft-web/tests/smoke.mjs`,
+  `workers.mjs`, `page.mjs`, `storage.mjs` (`docs/web.md:412-445`).
+- Performance: `effectcraft-cli bench --ops --json` (`apps/effectcraft-cli/src/main.rs:885-925`),
+  `cargo xtask bench` (`xtask/src/bench.rs`), and the headless `ui_egui::bench::Driver`
+  (`crates/ui-egui/src/bench.rs:13-108`).
+
+## 2. What actually changes in egui 0.37 that affects EffectCraft
+
+This section is limited to changes visible in the pinned sources. It corrects two assumptions that
+must not enter the plan:
+
+- **`App::logic` / `App::ui` and `Context::run_ui` are not new in 0.37.** They already exist in
+  0.36.2 (`egui-0.36.2/crates/eframe/src/epi.rs:167,182`; `egui-0.36.2/crates/egui/src/context.rs:794`),
+  and EffectCraft already uses them (`crates/ui-egui/src/lib.rs:1852-1935`, `apps/effectcraft/src/main.rs:426-456`,
+  `apps/effectcraft-web/src/app.rs:88-122`). The migration is **not** a wholesale update-to-ui rewrite.
+- **`Context::run_logic` is not a substitute for a pass.** It does not interpret time or events;
+  `run_logic` only refreshes viewport state (`egui-0.37.0/crates/egui/src/context.rs:1190-1218`).
+  Calling it cannot initialise fonts or consume input.
+
+### 2.1 Compile-visible API changes (the historical audit is a clue, not acceptance)
+
+The 2026-10-22 audit (`/home/codex/work/ssd2/task-evidence/egui037-audit-20261022/{fork,stock}/effectcraft.errors`)
+compiled only `effectcraft-ui-egui` (lib and lib test), against a historical fork revision and
+machine-local path patches. It reported the same 15 errors in fork and stock mode, with 602
+(stock) / 603 (fork) warnings; the difference is warning counts only. Those errors are consistent with the upstream 0.37 sources read here:
+
+| # | Anchor in this checkout | Error | 0.37 API and required change |
+| --- | --- | --- | --- |
+| 1 | `crates/ui-egui/src/color_picker.rs:19` | `Role::ColorButton` absent | `WidgetType` is a deprecated alias of `accesskit::Role`; use `Role::ColorWell` (`egui-0.37.0/crates/egui/src/lib.rs:644-659`) |
+| 2 | `color_picker.rs:336` | `Role::Other` absent | `Role::Unknown` |
+| 3 | `control.rs:371` | `Event::MouseWheel` missing `source` | add `source: MouseWheelSource::Wheel` (`egui-0.37.0/crates/egui/src/data/input/event.rs:175-200`) |
+| 4 | `lib.rs:1539` | no `egui::UserData` | screenshots are callback based (`ScreenshotCallback`) |
+| 5 | `lib.rs:1569` | no `Event::Screenshot` | receive the image from the callback, not from input events |
+| 6 | `menu_keys.rs:84` | `UiStack.id` absent | `UiStack.unique_id` / `UiStack.scope_id` (`ui_stack.rs:133-150`); use `scope_id` for a stable panel identity |
+| 7 | `panels/effect_controls.rs:1274` | `Role::SelectableLabel` | `Role::Button` with `WidgetInfo::selected` |
+| 8 | `panels/project.rs:613` | `Role::Other` | `Role::Unknown` (or `Role::TreeItem` directly) |
+| 9 | `panels/project.rs:781` | `Role::Other` | `Role::Unknown` |
+| 10 | `panels/text_panels.rs:700` | `Role::SelectableLabel` | `Role::Button` |
+| 11 | `theme.rs:732` | `&dyn AsRef<[u8]>` comparison | `FontData.font` is now a `Blob = Arc<dyn AsRef<[u8]> + Send + Sync>`; compare `FontData::bytes()` |
+| 12 | `theme.rs:752` | same | same |
+| 13 | `widgets.rs:24` | `UiStack.id` | `scope_id` |
+| 14 | `widgets.rs:493` | expected `IdSalt`, found `Id` | `Atom::custom(IdSalt, …)` (`atomics/atom.rs:98`) |
+| 15 | `widgets.rs:498` | expected `IdSalt` | `WidgetAtomResponse::rect(IdSalt)` (`atomics/widget_atom.rs:224`) |
+
+Deprecations that `-D warnings` turns into failures (all 602 audit warnings are in this list):
+
+| Deprecated item | Count in this checkout | Replacement |
+| --- | --- | --- |
+| `egui::Id::new` | 616 lines (`591` src, `25` tests); 626 occurrences (`601` src, `25` tests) across 59 src and 12 test files | `Id::unique` (same hash; `id.rs:101-104` delegates to it) |
+| `egui::WidgetType` | 19 | `egui::Role` (variant renames in §2.2) |
+| `Ui::id()` | 2 (`color_picker.rs:335,337`) | `Ui::scope_id()` (`ui.rs:363-371`) |
+| `egui::AtomLayoutResponse` | 1 (`widgets.rs:497`) | `WidgetAtomResponse` |
+| `TextEdit::vertical_align` | 1 (`widgets.rs:329`) | `TextEdit::align(Align2::LEFT_CENTER)` (`builder.rs:408-427`) |
+
+Integration tests were not compiled by the audit and must be assumed to contain more breakage.
+Two known classes are already visible by inspection:
+
+- 11 `Event::MouseWheel { … }` constructions lack `source` (`control.rs:371`, `ui_timeline_zoom.rs:33,81`,
+  `ui_scrolling.rs:34,157`, `viewer_geometry.rs:98,235`, `ui_panels.rs:386`, `ui_tail.rs:195`,
+  `ui_layer_panel_zoom.rs:109`, `ui_camera_tracker.rs:173`). The 12th match is a pattern in `lib.rs:581`.
+- `ui_agent_audit.rs:73` reads `WidgetInfo.typ`; it becomes `.role`.
+
+There is **no** `PointerSource` in the target fork: `Event::PointerButton` keeps the 0.36 shape
+(`aiongg/craft/0.37:crates/egui/src/data/input/event.rs:106-118`). The audit error at
+`control.rs:371` was the wheel event, not the pointer button.
+
+### 2.2 Role mapping used by this migration
+
+`WidgetType` → `accesskit::Role` (egui's own mapping table, `egui/src/lib.rs:644-659`):
+
+| Old | New |
+| --- | --- |
+| `Button` | `Role::Button` |
+| `ColorButton` | `Role::ColorWell` |
+| `Slider` | `Role::Slider` |
+| `SelectableLabel` | `Role::Button` + `selected` |
+| `Checkbox` | `Role::CheckBox` |
+| `TextEdit` | `Role::TextInput` / `MultilineTextInput` |
+| `DragValue` | `Role::SpinButton` |
+| `CollapsingHeader` | `Role::DisclosureTriangle` |
+| `Panel` | `Role::Pane` |
+| `ResizeHandle` | `Role::Splitter` |
+| `Other` | `Role::Unknown` |
+
+### 2.3 Behaviour changes that compilation will not catch
+
+These are the app-specific risks, each with a source anchor and a planned assertion.
+
+1. **`default_fonts` is no longer a default feature of `egui`/`epaint`.** eframe still enables it by
+   default, but EffectCraft disables eframe defaults and re-enables only
+   `default_fonts`, `wgpu`, `accesskit`, `links`, `wayland`, `x11`
+   (`crates/ui-egui/Cargo.toml:25`, `apps/effectcraft/Cargo.toml:18`). The app relies on
+   `FontDefinitions::default()` at `theme.rs:334`; the feature must stay explicitly enabled on the
+   `egui` dependency, not only through eframe, so `cargo check -p effectcraft-ui-egui` and test
+   builds are deterministic. (`#8583`; `egui-0.37.0/crates/egui/Cargo.toml:40-46`.)
+2. **The bundled emoji fonts are no longer in `FontDefinitions::default()`.** In 0.36.2 the default
+   definitions include `NotoEmoji-Regular` and `emoji-icon-font` unconditionally
+   (`egui-0.36.2/crates/epaint/src/text/fonts.rs:490-580`). In 0.37 they are behind
+   `monochrome_emoji_fonts`, and the default only adds the small `egui-icons` font
+   (`egui-0.37.0/crates/epaint/src/text/font_definitions.rs:105-180`). EffectCraft's own chrome is
+   affected. A read-only cmap audit of the fonts actually bundled by this app and by egui found:
+   - `✔` U+2714 (menu check gutter, `menus.rs:2176`) is in **only** NotoEmoji and emoji-icon-font;
+   - `▣` U+25A3 (Media Browser folder, `media_panels.rs:198`; Essential Graphics media row,
+     `essential.rs:247`) is in Hack and emoji-icon-font, but Hack is not in the app's
+     Proportional family (`theme.rs:339-347` only prepends Inter and appends JetBrains Mono), so
+     only the emoji font covers it;
+   - `✓` U+2713 (checked label text, `widgets.rs:485`) is in Inter/JetBrains Mono and unaffected.
+   Without `monochrome_emoji_fonts` these two become tofu, and kittest's default
+   `MissingGlyphPolicy::Panic` turns that into test failures.
+3. **Clipboard support became an eframe feature.** 0.36.2's eframe always enabled
+   `egui-winit/clipboard` (`egui-0.36.2/crates/eframe/Cargo.toml:152`). 0.37 gates it behind
+   `clipboard` (`egui-0.37.0/crates/eframe/Cargo.toml:142-144`), which is in eframe's default set
+   but not enabled by EffectCraft's `default-features = false` manifests. Without it, cut/copy/paste
+   to the OS clipboard silently degrade to an in-app simulated clipboard
+   (`egui-winit-0.37.0/Cargo.toml:44-46`), breaking Edit ▸ Copy/Paste, text-field paste and
+   `menus.rs:1867-1906` which maps clipboard events back to command keys.
+4. **Screenshots are callback based** (`#8489`; `data/screenshot_callback.rs`,
+   `ViewportCommand::Screenshot(ScreenshotCallback)`, `Context::request_screenshot`). The current
+   correlation by `UserData` token through `Event::Screenshot` is impossible
+   (`lib.rs:1530-1580`, `control.rs:439-444`). See §5.7.
+5. **`WidgetType` and ID APIs are deprecated**, and the CI clippy gate is `-D warnings`
+   (`xtask/src/main.rs:412`). This is 626 mechanical `Id::new` occurrences (616 lines) plus the 19
+   source role edits and one more in `ui_agent_audit.rs` (see §5.2/§5.3).
+6. **AccessKit roles/names are enforced by kittest 0.37.** `HarnessBuilder` defaults
+   `check_accessibility: true` and `Harness::run` panics on visible input widgets without a name
+   (`egui_kittest-0.37.0/src/builder.rs:50-51`, `src/accessibility.rs:9-45`). `is_input` covers
+   `Button`, `CheckBox`, `ColorWell`, `ComboBox`, `Slider`, `SpinButton`, `Splitter`, `Tab`,
+   `TextInput`, `TreeItem`, … (`egui-0.37.0/crates/egui/src/accessibility.rs:9-60`). Many of the
+   app's stock `TextEdit`, `DragValue` and `Slider` fields are currently unnamed (39
+   `TextEdit::singleline/multiline` constructors out of 44 `TextEdit::` references, and 51
+   `DragValue`/`Slider` constructors), and custom `ui.interact` widgets have no `WidgetInfo` at all.
+7. **Missing glyphs panic in kittest 0.37** (`#8601`; `MissingGlyphPolicy::Panic` is the harness
+   default, `builder.rs:50`). Tests that deliberately render uninstalled scripts must opt out with
+   `HarnessBuilder::allow_missing_glyphs()`; two are already known:
+   `tests/ui_effect_names.rs:35` (the builder inside `harness()` at line 20, used by the
+   `zh-hans` tests at 68, 81, 107 and 127, including `高斯模糊`) and
+   `tests/ui_presets_folder.rs:40` (`ja`). Fontconfig on this planning host lists no faces at all, so
+   those tests would panic rather than draw tofu until a CJK face is installed or the opt-out is used.
+8. **`Ui::id` → `Ui::scope_id`, `UiBuilder::id` → `scope_id`, `Panel` constructors take
+   `impl AsIdSalt`.** EffectCraft does not use `SidePanel`/`TopBottomPanel`, and uses
+   `CentralPanel::default()` only (`dock_ui.rs:475`, `prefs_live.rs:207`), so no panel-order
+   rewrite is needed. The root `Ui` is already the app surface (`lib.rs:1905-1935`,
+   `lib.rs:1614-1723`). Never call `Context::root_ui` from a panel or a test closure: it panics
+   while the root Ui is borrowed (`context.rs:1005-1055`).
+9. **Style defaults changed** (roomier buttons, larger corner radii; `#8617`, `#8445`).
+   EffectCraft pins `item_spacing`, `button_padding`, `interact_size.y`, `menu_margin`, scroll style
+   and all widget corner radii from tokens (`theme.rs:510-530`, `theme.rs:474-495`), so the visible
+   impact should be small, but atom-based `Button`/`ComboBox` layout can still move geometry. This
+   is a geometry/pixel test target, not an assumption.
+10. **Menus/popups and text editing changed** (`#7802`, `#7624`, `#8572`, `#8548`, `#8763`,
+    `#8628`). EffectCraft builds its own menu bar and keyboard navigation
+    (`menus.rs:2025-2050`, `menu_keys.rs`), with `MenuConfig` style overrides. Regression tests must
+    cover hover-switch, arrows, submenu opening, outside-click close, and a button acting on a
+    focused `TextEdit`'s selection (the `#8763` case). Container tooltips now also show when their
+    children are hovered (`#7909`); check tooltip presence/absence on the app's large custom
+    `interact` rects (viewer, timeline, dock) instead of assuming the 0.36 behaviour.
+11. **Kinetic scrolling/rubber-banding** (`#8662`, `#8663`) and the new `MouseWheelSource` change
+    wheel semantics. Synthetic wheel events must say `Wheel` (not `Unknown`) so tests and the
+    control channel keep deterministic scroll behaviour.
+12. **`Frame::default_fonts` + AccessKit bump**: accesskit 0.24.1 → 0.25.1, accesskit_winit
+    0.32.2 → 0.34.1, kittest 0.4.0 → 0.5.0. The kittest trees are **not** identical: `lib.rs`
+    re-exports `accesskit_consumer::NodeRef` as `AccessKitNode` where 0.4 re-exported `Node`, and
+    `query.rs`/`filter.rs` also differ. The 26 query call sites must be compiled against 0.5, not
+    assumed unchanged.
+13. **New 0.37 lifecycle tools** that this plan uses:
+    - `ViewportCommand::RequestPaintWhileHidden` and `ViewportInfo::visible()`
+      (`viewport.rs:1202-1240`, `viewport_info.rs:90-101`); visibility remains derived from
+      minimized/occluded even during a forced hidden UI paint;
+    - `Context::request_screenshot` / `ScreenshotCallback` (`context.rs:4595-4606`). The call sends
+      a `ViewportCommand`, which requests a repaint of that viewport; a pending screenshot also
+      makes a hidden window take a full UI+paint pass (`wgpu_integration.rs:686-690`,
+      `egui-winit/src/lib.rs:2116-2128`). It does **not** schedule a repaint when the callback
+      completes; the completion slot owns that wake-up (§5.7);
+    - `Context::set_repaint_observer` and `RepaintCause` (`context.rs:2290-2296`, `283-300`).
+14. **Known upstream regressions at 0.37.0** (reported upstream; not measured by this task):
+    - `#8731`: plain-text tessellation ≈61% more instructions (`tessellate_text` per-vertex colour
+      check). The candidate comparison revision is unpatched: `aiongg/craft/0.37:crates/epaint/src/tessellator.rs:2295-2341`
+      still has the conditional inside the vertex loop.
+    - `#8736`: egui-wgpu pipeline creation is ~40 ms slower on Windows/DX12 (FXC) because of
+      `wrap_texel_coord`.
+    Both are measured acceptance gates in §9 and, if over threshold, must be fixed in the final
+    P8 egui revision before P1 is frozen. P5 reports/retests; it does not change the pin.
+
+## 3. Fork, winit and craft-libs integration decisions
+
+### 3.1 What EffectCraft actually needs from the suite fork
+
+EffectCraft has no `vendor/` directory and no local egui patch. Its only `[patch.crates-io]` entry is
+`hayro-syntax`, inherited from the craft-libs PDF stack (`Cargo.toml:213-214`); it is unrelated to
+egui and must stay.
+
+The production dependency is the complete reviewed and published storytold egui **P8** revision,
+not the personal `aiongg` branches used as comparison input here. P8 carries E1–E21, P2b async
+W15P routing, P7 held-key pairing, P7b/E21b outgoing IME surrounding text (§5.5), P7c's selected
+`#8763`/`#8748` fixes and the justified `#8731`/`#8736` performance fixes. The completed final
+winit SHA carries W1–W27, W15P and the W27 lifecycle fixes. The two forks and `craft-ui` CL-1 +
+CL-2F are approved as one immutable unit at P1; P4 adds extended native/language coverage without
+a second compatibility graph (§10). There is no stock or intermediate-fork production stage;
+stock 0.37.0 is a measurement control only.
+
+| Fork patch | EffectCraft use | Decision |
+| --- | --- | --- |
+| E1 `viewport_hooks` | not used (craft-tablet only) | keep in fork; no app change |
+| E2+E3 surface fit / wgpu error scopes | protects windows whose surface exceeds the adapter limit and reports configure/renderer failures; relevant to the app's "never crash" rule and its device-loss handling | **keep, benefit**; verify with a required-adapter `ui_gpu.rs` run and a device-loss test |
+| E4 Wayland clipboard/PRIMARY | the app edits text in project rows, timeline fields, expression fields, Script UI and settings; Hyprland serves one data device per client | **keep**; requires winit W15 plus the new **W15P** PRIMARY path (§5.5/§8.7) |
+| E5/E12/E13/E16 bidi and grapheme editing | UI labels and stock `TextEdit`s only; **text layers use `effectcraft-text`, not epaint** | **keep**; do not claim it fixes text layers |
+| E6 IME focus | stock `TextEdit`s | keep |
+| E7/E19 letter keys on non-Latin layouts | shortcuts (`menus::parse_shortcut`, `handle_shortcuts`); requires winit W25 | **keep**; manual platform test |
+| E8 `TextEdit` glyph clipping | stock fields (Thai/Vietnamese/Arabic marks) | keep |
+| E9 `Style::right_to_left` | app never sets it; its dock/layout is custom LTR | keep in fork; **do not enable** in EffectCraft (would mirror stock widgets inside an unmirrored custom layout) |
+| E10 web named keys / Latin codes | web keyboard behaviour | keep; no app change |
+| E11 vello_cpu multithreading | not used | keep in fork |
+| E14 `FontTweak::fallback_align` | the app installs system fallback faces (`theme.rs:388-430`) | keep; **optional follow-up** to set it for CJK/Indic fallbacks, with screenshot proof |
+| E15 `LineBreaker` | text layers use `effectcraft-text`; not adopted | keep in fork |
+| E17/E18 `Context::set_language` / `Frame::set_ui_language` | screen-reader language and UI shaping language (the app has an interface language setting, `i18n::language`) | **adopt in the language stage** (fork-only; see §5.9) |
+| E20 widget text language | goes with E17 | adopt with E17 |
+| E21 `ImeEvent::DeleteSurroundingBytes` | the app has a **custom** viewer text editor that consumes IME events itself (`viewer_text.rs:397-508`) | **adopt in the IME stage**; stock 0.37 only has char-based `DeleteSurrounding` |
+| **P2b** (new prerequisite) | async W15P PRIMARY routing in egui-winit: bounded read workers, owner-specific completion waker, no blocking UI path | **in P8**; gate in §5.5/§8.7 |
+| **P7** (new prerequisite) | held-key pairing: the emitted egui key identity is stored by physical key and reused on release; clipboard shortcuts alone do not prove this | **in P8**; gate in §3.2/§5.5 |
+| **P7b/E21b** (new prerequisite) | candidate egui-winit never calls winit W27's `set_ime_surrounding_text`; `IMEOutput` carries no logical text. The custom viewer editor is a required producer. | **in P8 before final acceptance**; see §5.5, §8.4 and `ime-surrounding-gap.md` |
+| **P7c** (new prerequisite) | selected upstream fixes `#8763` (a button/menu command acting on a focused `TextEdit` selection) and `#8748` (hidden parent not updating deferred child viewports) | **in P8**; tested in §5.6/§5.8. Local workarounds are not the final unit. |
+
+Removal conditions are the fork's own (`PATCHES.md`): each patch goes when an egui/winit release in
+use contains it. EffectCraft must not add a second copy of any of these fixes locally.
+
+### 3.2 Winit patches that matter here
+
+| Patch | Why EffectCraft needs it | Gate |
+| --- | --- | --- |
+| W1 mixed-DPI rect | window placement and monitor hit tests (`apps/effectcraft/src/window.rs`) | Windows mixed-DPI manual test |
+| W2/W5/W20/W21 X11 IME | the app's editable fields and expression editor | X11 IME under Xvfb+WM (qualified parts only; §8.7) |
+| W3/W18/W19/W22/W24/W26/W27 IME | the custom text editor and stock fields; W26/W27 are required by E21 and by E21b/P7b | macOS press-and-hold/dictation, Wayland text-input-v3, Windows IME |
+| **W15P** (new) | winit-owned Wayland PRIMARY on the existing connection/event queue, per-seat manager/device/source/offer from SCTK 0.19.2; no second regular data device | wlroots/Hyprland, KWin and Mutter capability matrix (§8.7) |
+| W13 Wayland wheel phase | zoom/scrub shortcuts must not latch | Wayland manual test |
+| W15 Wayland clipboard/files | needed by E4 | Hyprland clipboard check |
+| W23 macOS Command keys | menu shortcuts | macOS layout test |
+| W25 Latin layout | E19 shortcuts; preserve the emitted key identity by physical key across release | Russian/Arabic/Hebrew layout test plus a held Ctrl+Z/Cmd+K release after a layout/modifier change |
+
+W27 also needs the lifecycle fixes recorded in `winit-review-triage.md`: clear the pending
+preedit/commit/deletion batch on leave with an explicit epoch, test late `Done`, disable/reset, seat
+removal and two windows, and preserve deletion-FIFO/commit pairing. Focus epochs and protocol
+serials are distinct: a current-epoch `Done` with a mismatched serial still applies its incoming
+edits exactly once and only defers outgoing surrounding state until a matching serial; a stale
+(different owner/focus generation) batch is invalidated and discarded. `W25`/`W23`/`E19` must
+preserve the emitted egui key identity by physical key across release (including layout/modifier
+changes), clearing it on focus loss, IME interception and destruction, and test a non-clipboard
+held key (Ctrl+Z/Cmd+K), repeat semantics and two physical keys mapping to one logical key.
+W15 needs bounded, cancelable transfers with a 2 s total monotonic deadline and a 16 MiB total
+byte budget; the egui adapter must not block the UI and must cancel stale pastes after
+focus/target/generation changes.
+
+### 3.3 craft-libs PR 199, CL-2 and language PR 198
+
+- PR 199 is **merged** at `3832c47ef68a0e6214f2c1e85f3526b6adcb686e`, the current reconciled
+  shared-library implementation base. Do not merge its historical head `b68de8c5` (a stale tree
+  relative to current `main`, missing `craft-platform` and reverting security/settings/docking/
+  printer fixes) or audit merge `ec8840a` (stale lock, egui 0.36.2) as trees. The historical API
+  port `8614e4a` and README `1764bca` on old `main` `4919088` are superseded by the merged base.
+- EffectCraft pins `craft-ui` to the **reviewed CL-1 merge/rebase SHA on craft-libs `main` after the
+  port**, not to the PR head. That revision must keep its egui dependency on registry `0.37` so
+  EffectCraft's `[patch.crates-io]` (not a git URL patch) can redirect it.
+- **CL-2 capture completion helper.** The shared plan's selected design is a bounded, cancelable
+  per-request completion slot with a weak callback reference, aggregate image-byte and request
+  limits, and an explicit viewport wake-up after the slot lock is released. EffectCraft is one of
+  the eleven existing craft-ui consumers, so it pins **CL-1 + CL-2F in the same atomic dependency
+  stage** as P1; only the DesignCraft/GridCraft pilots use the reviewed provisional CL-2 revision,
+  and their adapters are reviewed before CL-2F freezes the API. Any consumer with an incompatible
+  existing craft-ui bump must reconcile it in that same stage. EffectCraft does not pin the
+  provisional revision. **No app-local result channel** and no generic UI compatibility layer.
+  EffectCraft keeps its own request ids, paths, crop, deadlines and reply JSON.
+- `craft-ui`'s production API used here (`docking::{Action, Zone, Placement, resolve_drop, zone_rect, drop_zone}`,
+  `layout::{split_rect, SplitAxis, SplitSize, ResizeHandle, ResizeHandleStyle}`) is unchanged by
+  the port; the additive `printing::tick` is not used by EffectCraft.
+- PR 198 / the fork language work is adopted only where §3.1 says so. The app keeps its own
+  catalogs (`i18n.rs`, `i18n/ui.rs`, `i18n/effects.rs`) and its own text engine; it does not adopt
+  craft-text line breaking or a shared translation layer.
+- Blocking: CL-1 and CL-2F must land before the EffectCraft dependency-pin PR can be reviewed
+  honestly. Until then, implementation may use a local pinned SHA only for development, never in a
+  publication branch, and never a machine-local path patch.
+
+## 4. Root-`Ui`, lifecycle and multi-pass semantics
+
+### 4.1 Current split (already on 0.36.2, must be preserved and completed)
+
+Today `EffectcraftApp::logic` does GPU-failure application, language/theme/font install, FPS, control
+drain, screenshot scheduling/collection (`lib.rs:1870-1903`), while `ui` calls `frame()` which does
+**polls, playback, events, autosave, prefs, window title, close guard and the whole paint**
+(`lib.rs:1905-1935`, `lib.rs:1614-1723`).
+
+Verified integration facts (candidate source, same call sites as upstream 0.37):
+
+- `eframe` runs `logic` and `ui` inside one `Context::run_ui` closure for every full pass
+  (`eframe-0.37.0/src/native/epi_integration.rs:349-364`; web `app_runner.rs:289-292`). A full pass
+  can run more than once per frame when `Context::request_discard` is used.
+- While the root window is minimized/occluded, native eframe runs `Context::run_logic` with
+  `App::logic` only (`epi_integration.rs:384-425`), unless a `Screenshot` or
+  `RequestPaintWhileHidden` action is pending, in which case it runs a **full** UI pass with current
+  input and paint (`wgpu_integration.rs:680-740`).
+- `prepare_raw_input` calls `raw_input_hook` **before both** paths
+  (`epi_integration.rs:414-428`). `update_logic_only` then stores the hook-mutated raw input in
+  `pending_raw_input` for the next full pass (`epi_integration.rs:400`). Therefore synthetic
+  events fed during a logic-only call are retained, not lost, and are applied exactly once by the
+  next full pass.
+- Native eframe throttles repaints of an invisible/minimized window to at least 100 ms
+  (`eframe-0.37.0/src/native/run.rs:27,376-383`), so a hidden gesture or capture takes a few
+  throttled full passes; the app's deadlines must allow for that and must not infer failure from the
+  first 100 ms.
+- `ViewportInfo::visible()` derives from `minimized`/`occluded`, not from a paint request. It stays
+  `Some(false)` during a forced hidden UI pass, so visibility cannot distinguish "logic only" from
+  "forced hidden paint".
+- `run_logic` refreshes only `raw.viewports` and `raw.focused` (`egui-0.37.0/crates/egui/src/context.rs:1190-1218`);
+  it leaves `InputState::time`, events and pointer state at the previous pass's values. eframe sets
+  `RawInput::time` in `prepare_raw_input`, but `run_logic` does not copy it into `InputState`.
+- `Context::request_screenshot` sends a viewport command, which requests a repaint, and a pending
+  screenshot is a "wants paint" action even when hidden. The callback itself does not request a
+  repaint when the pixels arrive.
+
+Consequences, all pre-existing in 0.36.2:
+
+- With the window minimized/occluded, job polling, playback advance, audio pumping, auto-save
+  ticks, engine-event draining, the unsaved-close guard and the window-title update **do not run**
+  on ordinary logic-only ticks.
+- A discarded pass re-runs the `run_ui` closure, so `logic` runs again for the same frame.
+  `Grid` requests a discard on first show (`egui-0.37.0/crates/egui/src/grid.rs:468`); EffectCraft
+  has 18 `Grid::new` sites across dialogs/settings/forms.
+- The control channel's `AfterInput` replies are completed in `logic` as soon as `synthetic` is
+  empty, which is before the pass applies the last synthetic event (`lib.rs:1893-1901`,
+  `lib.rs:1921-1930`). While hidden, an event can also have been fed into retained raw input with
+  no pass yet applied.
+
+### 4.2 Target boundaries
+
+Introduce one explicit app tick and one draw pass; do not add a generic `Context` bridge:
+
+```rust
+// EffectcraftApp
+now: f64,          // monotonic app clock value for this tick, used for deadlines
+focused: bool,     // last known focus, refreshed from viewport info
+last_input_at: f64,
+last_draw_geom: Option<(egui::Rect, f32)>, // last non-discarded root draw: screen rect + ppp
+geometry_epoch: u64,   // bumped whenever that screen rect or ppp changes
+want_paint: bool,
+clock: AppClock,   // real or injected (§4.3)
+
+/// The only non-paint entry. Effects are idempotent; time may advance slightly per call.
+pub fn tick(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame);
+
+/// Paint only. Receives the root Ui from eframe.
+pub fn draw(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame);
+
+// eframe::App
+fn raw_input_hook(&mut self, ctx, raw) { /* feed synthetic, pointer wrap; no clock, no replies */ }
+fn logic(&mut self, ctx, frame) { self.tick(ctx, frame) }
+fn ui(&mut self, ui, frame) { self.draw(ui, frame) }
+```
+
+`tick` must contain, in this order:
+
+1. `init_gpu(frame)` (moved from `ui`, `lib.rs:761-806`), so the compositor exists before the first
+   paint and while hidden; `apply_gpu_failure` + `close_after_device_loss` (moved from `ui`,
+   `lib.rs:1905-1910`).
+2. `i18n::set_current(language)`, theme/font install and `apply_prefs` (moved from `frame`).
+3. Engine/background polling: `poll_render`, `poll_track`, `poll_mask_track`, `poll_jobs`,
+   `poll_offload`, `poll_warp`, `poll_roto`, `poll_camera` (`lib.rs:1617-1655`), plus
+   `frames.set_context(ctx)` so worker completions can request repaints while hidden. These are
+   queue-draining and a second call in a discarded pass is a no-op (e.g. `render_queue.rs:579-583`
+   takes the update queue).
+4. `run_script_tasks`, `handle_events` (engine queue drained once), `command_inbox`; toast/status
+   timestamps use `now`, not `ctx.input(|i| i.time)`.
+5. `run_dialog_answers` and the native-menu answers.
+6. `tick_autosave` (already wall-clock based, `lib.rs:1790-1816`) with the app clock, watch folder,
+   `tick_footage_reload` using `self.focused`/`self.now`/`self.last_input_at` instead of `ctx.input`.
+7. Control: `drain_control` with `now`, `finish_job_waiters` with a bounded repaint.
+8. Screenshots: `collect_screenshots` (drain completion slots and validate each image against the
+   geometry + epoch recorded at issuance, §5.7), then `issue_screenshots` (`now`), then timeouts
+   and cancellations.
+9. Playback: `advance_playback(ctx, scale, now)` using the last drawn viewer scale;
+   audio pump; `cache_when_idle`.
+10. Unsaved close guard (`panels/unsaved.rs:50-62`) and window-title update.
+11. `prefs_live::memory_watch` / `home_on_open` (split out of `prefs_live::frame`,
+    `prefs_live.rs:15-19`); `video_preview` stays in draw.
+12. If `want_paint`, or synthetic input/`input_waiters` remain, or a control step needs a UI pass,
+    send `ViewportCommand::RequestPaintWhileHidden` and clear `want_paint`. This also covers
+    playback with an open Video Preview or floating panel window (§5.8).
+
+`tick` never reads input events, pointer state or modifiers for decisions. `draw` keeps only paint
+and direct manipulation: dock layout, panels, menus, dialogs, areas, `ui.inspect` registry, pointer
+hover, shortcuts that read events, `finish_native`, `video_preview`, dropped-file overlay/import,
+Home thumbnail capture, toast, workspace-state save on pointer-up, and `frames.pump` on wasm (or
+move `pump` to `tick`; either is acceptable if tested, but it must not be the only progress path).
+`draw` updates `last_input_at` from the pass's input activity and records
+`last_draw_geom = Some((ui.ctx().screen_rect(), ui.ctx().pixels_per_point()))` at the end of every
+pass that is not discarded (`!ui.ctx().will_discard()`), bumping `geometry_epoch` when the rect or
+ppp differs from the previous value. Screenshot issuance copies this geometry + epoch; completion
+rejects/retries if the epoch changed before the save (§5.7). The callback itself supplies only
+pixels, so the issued record — not callback timing — is the geometry anchor.
+
+**No `Context::root_ui` anywhere.** Areas/Windows/Modals keep taking `ctx` (they create their own
+layers); panels receive the existing `&mut Ui`. `show_viewport_immediate` stays as is.
+
+### 4.3 App clock, focus and input gating
+
+- **The clock is app-owned and injected.** Neither `ctx.input(|i| i.raw.time)` nor
+  `ctx.input(|i| i.time)` is valid in a logic-only tick: `run_logic` copies only viewports/focused
+  (`context.rs:1190-1218`), so `i.raw.time` is the previous full pass's raw value and `i.time` is
+  the previous pass's `InputState::time`; kittest leaves `RawInput::time` `None`.
+  ```rust
+  pub struct AppClock {
+      source: ClockSource, // Real(web_time::Instant) | Manual(f64)
+  }
+  impl AppClock { fn now(&self) -> f64 { /* monotonic seconds */ } }
+  let now = self.clock.now();
+  ```
+  `tick` stores `self.now = now` before using it. Tests inject `AppClock::manual()` and advance it;
+  a regression must show that a stale `ctx.input(|i| i.time)` cannot satisfy a deadline. Native and
+  web use the same `web_time::Instant` source; `EffectcraftApp::now()` exposes the last value so
+  `WebApp::logic` can pass it to `persist::snapshot` (§8.6).
+- Focus comes from the fresh viewport copy with a visible-pass fallback:
+  ```rust
+  let focused = ctx.input(|i| i.viewport().focused)
+      .or_else(|| ctx.input(|i| i.focused));
+  self.focused = focused.unwrap_or(self.focused);
+  ```
+  Do not read `i.events`/pointer in `tick`; input handling belongs to `draw` (the known UI phase).
+- **Synthetic input is not gated on visibility, but is gated on an unapplied event.**
+  `raw_input_hook` runs once per eframe prepare (frame or logic call), not per egui UI pass, and
+  calls `self.feed_synthetic(raw_input)` then `pointer_wrap::prepare_input(...)`. In a logic-only
+  call eframe retains the mutated raw input
+  (`pending_raw_input`) and calls the hook again on the next call; in a forced hidden full pass it
+  is applied immediately. Gating on `visible() == Some(false)` would skip feeding in both cases
+  and leave the gesture (and its reply) pending forever.
+  `feed_synthetic` drains **one pointer event per call** (`lib.rs:578-591`), so repeated
+  logic-only updates before the forced full pass (eframe's overdue-`RedrawRequested` path and its
+  100 ms invisible-window throttle) would append press, move and release to the same retained
+  input and collapse a gesture into one pass. The hook must therefore set a guard when it moves a
+  synthetic event into raw input and skip feeding while that guard is set; the guard is cleared
+  when a known UI pass has applied that step once, even if layout is later discarded;
+  record that application separately from screenshot settling/accepted-frame counters.
+  RawInput events are consumed on the first pass and are not replayed in later passes.
+  Never clear the guard in `tick`; never wait for the event to reappear in an accepted pass.
+  The next step is fed only on a subsequent host input preparation. No event is discarded. §8.3 tests repeated logic-only ticks with a drag and a click.
+- `raw_input_hook` performs no reply, no clock read and no side effect other than pointer-wrap state,
+  the synthetic-pending guard and merge-key closing. `pointer_wrap::prepare_input` returning "gesture ended" clears
+  `session.history.merge_key`; doing that during a logic-only call is safe because the events are
+  retained and the same reset is idempotent.
+- Replies for `AfterInput` are completed **only at the end of a non-discarded `draw` pass**
+  (after the pass, check `!ui.ctx().will_discard()`) that ran after the last synthetic event was
+  fed, and never in `tick`. A hidden request therefore replies only after the forced pass applied
+  it, and a pass that egui throws away cannot produce an early success reply.
+- If a control request needs a UI pass (synthetic input, a panel-window change, or a caller that
+  explicitly wants fresh `ui.inspect`/`ui.elements` data), `tick` sends `RequestPaintWhileHidden`.
+- `control::handle` is called from `tick` with `now` passed in (a signature change, not a wrapper):
+  replace its `ctx.input(|i| i.time)` at `control.rs:428` with `now`, and `inspect`'s
+  `windowFocused` at `control.rs:562` with `ctx.input(|i| i.viewport().focused)`. `ui.inspect` and
+  `ui.elements` keep last-painted semantics.
+
+### 4.4 Multi-pass and idempotence
+
+A discarded pass re-runs `tick` and `draw` with the same raw input (events are taken by the first
+pass). Rules:
+
+- `tick` effects are idempotent for a replayed pass: polls drain queues; auto-save checks a
+  timestamp; `advance_playback` computes the target frame from the plan and the monotonic `now`
+  rather than incrementing, so a replay with a slightly later `now` does not double-count
+  `Playback::frame_shown` (`lib.rs:230-246`); screenshot scheduling advances only when `now`
+  passes a settle deadline, never once per pass (the old frame counter must not be replayed);
+  job-waiter completion is keyed by the pending job, not by pass count.
+- One-shot side effects in `draw` must rely on egui's per-pass input (`Response::clicked`,
+  `drag_stopped`) and command merge keys, not on layout-pass counts. High-risk paths are viewer
+  drags (`viewer.rs:1674-1874`), timeline drags (`timeline.rs:1500-1700`), painting strokes
+  (`layer_panel.rs:350-360`) and form toggles inside `Grid`s.
+- Add a forced-discard regression test (§8.3) that proves one undo step and one command effect
+  across a real two-pass frame.
+
+## 5. Concrete refactors with anchors
+
+### 5.1 Manifests, features, pins and lock checks
+
+Root `Cargo.toml` (final publication form; placeholders are filled only after the reviewed forks
+exist). P1 waits for the complete reviewed/published storytold egui P8 (E1–E21, P2b, P7, P7b/E21b,
+P7c and any justified perf fix), the completed winit (W1–W27, W15P, W27 lifecycle) and craft-ui
+CL-1 + CL-2F. It includes the custom-editor IME payload adapter atomically. Stock 0.37.0 and
+aiongg candidates remain comparison controls, never intermediate production stages.
+
+```toml
+craft-ui = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "<reviewed main SHA including CL-1 and CL-2F>", features = ["serde"] }
+egui = { version = "0.37", default-features = false, features = ["default_fonts", "monochrome_emoji_fonts"] }
+eframe = { version = "0.37", default-features = false }
+egui_kittest = { version = "0.37" }
+
+[patch.crates-io]
+winit = { git = "https://github.com/storytold/winit", rev = "<final reviewed winit SHA incl W15P>" }
+egui = { git = "https://github.com/storytold/egui", rev = "<final reviewed egui P8 SHA incl E21b + P7c>" }
+eframe = { git = "https://github.com/storytold/egui", rev = "<same egui SHA>" }
+egui-winit = { git = "https://github.com/storytold/egui", rev = "<same egui SHA>" }
+egui-wgpu = { git = "https://github.com/storytold/egui", rev = "<same egui SHA>" }
+egui_kittest = { git = "https://github.com/storytold/egui", rev = "<same egui SHA>" }
+hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.7.2" } # keep
+```
+
+`epaint`, `epaint_default_fonts`, `ecolor` and `emath` are path dependencies of the git egui crates
+and must resolve from that same git revision. `aiongg/*` SHAs are comparison inputs only and must
+not appear in a publication lock.
+
+Notes:
+
+- `craft-ui` is a git dependency from `craft-libs`; redirecting it with
+  `[patch."https://github.com/storytold/craft-libs"]` is only acceptable for development, never in a
+  publication branch. The publication form is the real `rev`.
+- Do not patch `egui_plot`, `egui_dock`, `egui_extras` (unused) or `egui_system_font_provider`
+  (unused while `system_fonts` is off).
+- The fork's own `[patch.crates-io] winit = { branch = … }` belongs to the fork workspace and does
+  **not** propagate; the consumer patch above is mandatory.
+- Feature additions in the app manifests:
+  - `crates/ui-egui/Cargo.toml:25`: `eframe` features += `clipboard`.
+  - `apps/effectcraft/Cargo.toml:18`: `eframe` features += `clipboard`.
+  - `apps/effectcraft-web/Cargo.toml:30`: keep `default_fonts`, `wgpu` (web has no OS clipboard
+    feature; browser clipboard events are separate).
+  - `egui_kittest` dev features: `eframe`, `wgpu`, plus `snapshot` only if §8.4's pixel goldens are
+    adopted. `egui_kittest` depends on `egui` with `default-features = false`; only kittest's own
+    `[dev-dependencies]` enable `default_fonts`/`monochrome_emoji_fonts`, and a dependency's
+    dev-dependencies do **not** propagate. The workspace `egui` features above are therefore what
+    EffectCraft's library and integration-test builds receive; do not rely on kittest to enable
+    fonts. If a test root resolves `egui` independently, it must enable the font features itself
+    or install controlled fonts, and the actual graph is checked per production/test root.
+  - `monochrome_emoji_fonts` is enabled at the workspace `egui` dependency so `✔`/`▣` survive
+    (§2.3.2). It propagates into `effectcraft-web`; record the raw and compressed WASM size change
+    and either accept it with a budget or introduce a native-only `ui-egui` emoji-fonts feature
+    after measuring (§9).
+  - `system_fonts` stays **off** initially: the app already installs language-driven system
+    fallbacks (`theme.rs:388-430`) and scans fonts for its menus; enabling eframe's fontique
+    provider would add startup cost (`#8512`) and make rendering machine-dependent. Revisit as a
+    separate product change for colour emoji.
+- `winit` direct dependency in `apps/effectcraft/Cargo.toml:23` must match the patched fork (it
+  does: `0.30`).
+- Lock/duplicate checks after every pin change:
+  ```sh
+  cargo tree -d
+  cargo tree -i egui@0.37.0
+  cargo tree -i winit@0.30.13
+  cargo tree -e features --target x86_64-unknown-linux-gnu
+  cargo tree -i wasm-bindgen --target wasm32-unknown-unknown
+  cargo check --locked
+  cargo test --locked
+  cargo metadata --locked --format-version 1 --no-deps
+  ```
+  Acceptance: exactly one egui-family source (the final storytold revision) covering `egui`,
+  `eframe`, `egui-winit`, `egui-wgpu`, `egui_kittest`, `epaint`, `epaint_default_fonts`, `ecolor`
+  and `emath`; exactly one winit (the final storytold revision); no registry `egui`/`epaint`
+  beside it; no `path = "…"` patch and no branch dependency; a clean checkout fetches every
+  approved revision and passes the checks with `--locked`.
+- `wgpu` stays `30.0.1`; egui 0.37 accepts `30.0` and already resolves 30.0.1 here. The pinned
+  `wasm-bindgen = 0.2.129` must stay consistent with `wasm-bindgen-futures`; check the wasm-target
+  inverse tree above.
+
+### 5.2 IDs and scopes
+
+- Mechanical `Id::new(` → `Id::unique(`: **626 occurrences / 616 lines** (`601`/`591` in source,
+  `25` in tests; 59 source and 12 test files). Count by occurrence and file, not only by line.
+  `GlyphId::new` in `crates/text`/`crates/pdf` (7 lines) is unrelated and must stay. Values are
+  identical because `Id::new` delegates to `Id::unique`
+  (`egui-0.37.0/crates/egui/src/id.rs:101-104`); persisted workspace state
+  (`workspace_state.rs`, **version 1**) and project JSON store no egui IDs, so no migration is
+  needed.
+- `color_picker.rs:335,337`: `ui.id()` → `ui.scope_id()`.
+- `widgets.rs:24`: `s.id` → `s.scope_id` (the panel's stable scope; do not use `unique_id`, which
+  changes with layout).
+- `widgets.rs:492-497`: make `label_swatch_id() -> egui::IdSalt` = `IdSalt::new("label-swatch")`;
+  `Atom::custom(salt, …)`; `WidgetAtomResponse::rect(salt)`.
+- `menu_keys.rs:84`: `find_menu_root(ui).scope_id`.
+- No new ID scheme; add a test that the same source yields the same `Id` across frames and that two
+  different payloads differ. Do not derive IDs from translated text (already true).
+
+### 5.3 Roles, names and accessibility
+
+Migrate the 19 source `WidgetInfo` sites with the table in §2.2, plus `ui_agent_audit.rs:73` in the
+test (`.role`). Specific choices:
+
+- `color_picker.rs:19`: `Role::ColorWell`, label = hex (existing screen-reader contract).
+- `color_picker.rs:336`: `Role::Unknown` (a painted swatch, not an input).
+- `color_picker.rs:338`: `Role::Button` ("Original color").
+- `color_picker.rs:271,300`: `Role::Slider` (labels stay).
+- `effect_controls.rs:1274`, `text_panels.rs:700`: `WidgetInfo::selected(Role::Button, enabled,
+  selected, label)`.
+- `panels/project.rs:613`: use `WidgetInfo::labeled(Role::TreeItem, …)` directly, but **keep** the
+  `accesskit_node_builder` at `project.rs:614-620` for `selected`, `level` and `expanded`
+  (`WidgetInfo` cannot express level/expanded); remove only its `set_role(TreeItem)` line.
+- `project.rs:781`: `Role::Unknown` (comment).
+- `dock_ui.rs:367`: `Role::Splitter` ("Resize floating panel") instead of `Button`.
+- `widgets.rs:497`: `WidgetAtomResponse`.
+
+Naming work for kittest's accessibility check:
+
+- **Strict checks stay on from the first green PR.** There is no shared test harness to flip:
+  `Harness::builder()` appears at 180 call sites in 78 test files, and
+  `HarnessBuilder::default()` sets `check_accessibility: true`
+  (`egui_kittest/src/builder.rs:51`). A new helper would not reach existing direct builders, and a
+  per-builder `with_accessibility_check(false)` would only hide failures. P1 therefore adds the
+  actual names until every test passes with strict checks; a repository grep gate forbids
+  `with_accessibility_check(false)` (§8.2). No global or blanket opt-out exists at any stage.
+- Stock fields: give each `TextEdit` a `hint_text` or `accessible_name`, each `DragValue`/`Slider`
+  an `accessible_name`. Known call sites: `TextEdit` (39) in `precomp.rs:117`, `rq_templates.rs:137`,
+  `scriptui_view.rs:145`, `timeline.rs:1507,2066,2458,3516`, `project.rs:704`,
+  `shortcut_editor.rs:276,440,532`, `markers_ui.rs:119`, `text_panels.rs:607`,
+  `settings.rs:174,607`, `effect_controls.rs:1214`, `forms.rs:786,794,806`, `dialogs.rs:471`, plus
+  the rest from `grep -rn TextEdit:: crates/ui-egui/src`; `DragValue`/`Slider` (51) in
+  `layer_styles_dialog.rs`, `gradient_editor.rs`, `settings.rs`, `key_dialogs.rs`, `forms.rs`,
+  `dialogs.rs`, `dialogs_3d.rs`, `viewer_tools.rs`, `scriptui_view.rs`.
+- For rows whose label is a separate widget, use `Ui::label_inputs_by(label_id, |ui| editor)` —
+  e.g. the Grid rows at `forms.rs:771`, `settings.rs:596`, `key_dialogs.rs:142,207,251`,
+  `markers_ui.rs:133`, `rq_templates.rs:56,100`, `layer_styles_dialog.rs:214`.
+- For rows whose label is painted (Timeline property rows, Effect Controls rows), use
+  `Ui::name_inputs(label, |ui| editor)` or `Response::accessible_name(label)` where the label is
+  already known. This covers `timeline.rs:2458,3516` and `effect_controls.rs:1214`.
+- Custom widgets have no `WidgetInfo` today; add a small local helper, not a compatibility layer:
+  ```rust
+  fn named(resp: egui::Response, role: egui::Role, name: impl Into<String>) -> egui::Response {
+      resp.widget_info(|| egui::WidgetInfo::labeled(role, resp.enabled(), name.into()));
+      resp
+  }
+  ```
+  Use it first for the highest-value controls: dock tabs (`Role::Tab`, selected state,
+  `dock.rs:1149-1280`), active/close buttons, the dock split handle, numeric scrub fields
+  (`widgets.rs:53-160`), the color field/slider (`color_picker.rs`), the error bar prev/next
+  buttons (`expr_bar.rs:59-70`), and the floating-panel resize grip (`dock_ui.rs:367`). Do not
+  blanket-wrap `ui.interact`: a node without a real name/role is worse than no node.
+  The helper stays private to `effectcraft-ui-egui`; there is one consumer (this app), so it is not
+  proposed for `craft-ui` and is not a generic compatibility layer.
+
+Accessibility assertions (§8.4) must include roles, `selected`, enabled state, names, and the
+AccessKit language once §5.9 lands. The app's `ui_agent_audit.rs` (automation coverage) stays
+separate: an automation id is not an accessible name. `docs/gaps.md:227` records that the project
+has done no accessibility work; this stage is a first, tested step (visible stock controls and the
+highest-value custom controls), not a claim of screen-reader parity.
+
+### 5.4 Fonts, glyphs and text
+
+- Enable `egui/default_fonts` and `egui/monochrome_emoji_fonts` in the workspace dependency (see
+  §5.1) so `FontDefinitions::default()` at `theme.rs:334` keeps the 0.36.2 font set. Do not rely on
+  eframe feature unification for correctness.
+- Keep the app's two-pass font warm-up (`styled`/`fonts_ready`, `lib.rs:1876-1890`,
+  `lib.rs:1905-1911`): 0.37 may apply `set_fonts` immediately when no text has been laid out
+  (`#8602`, `#8609`), but relying on that would change when the first frame draws and would make
+  headless tests depend on pass timing. Do not use `run_logic` to install fonts in a UI test.
+- `theme.rs:732`: `d.font.as_ref() == bytes` → `d.bytes() == bytes` (and keep `d.index`).
+- `widgets.rs:329`: `TextEdit::vertical_align(Align::Center)` → `TextEdit::align(Align2::LEFT_CENTER)`
+  (the old call only changed the vertical component; the horizontal default was LEFT).
+- Update the comment at `theme.rs:354-360` ("egui … has no bidirectional layout"): the suite fork
+  shapes RTL runs, but text layers still use `effectcraft-text` and are unaffected. Add a UI-label
+  RTL test (Arabic/Hebrew `Label`/menu text has visual-right-to-left run order) and keep the
+  text-layer RTL test in `crates/text/src/layout.rs:1419` as the text-engine contract.
+- Keep `system_fonts` off. If colour emoji is wanted later, it is a separate change with a startup
+  measurement and cross-platform screenshots, not part of this migration.
+- Fallback registration stays as is (`theme.rs:388-430`), including `FontData::from_owned` and
+  `data.index = face.info.index`; `FontData` still accepts that construction in 0.37. Optional
+  follow-up: E14 `FontTweak::fallback_align` for the installed system faces, with CJK/Indic
+  screenshots before and after.
+- Extend the existing glyph-coverage test (`theme.rs:700-716`) to the full chrome symbol set used by
+  the app, including `▣`, `✔`, `✓`, `⚠`, `▶`, `◀`, `▸`, `●`, `○`, `…`, `×`, `›`, `•`, `·`, `−`,
+  `←/→/↑/↓`, `⌘`, `⇧`, `⌥`, `⌃`, `⏎`, `↵`, `′`, `″`, in Proportional, Monospace, `medium` and
+  `semibold`. This is the regression test for finding 2.3.2.
+- Tests that deliberately render scripts with no installed face opt out explicitly **at that test
+  builder**: `ui_effect_names.rs:35` (the builder inside `harness()` at line 20, used by the
+  `zh-hans` tests at 68, 81, 107 and 127) and `ui_presets_folder.rs:40` (`ja`; the builder is inside
+  the test) use `Harness::builder().allow_missing_glyphs()` with a comment naming the script. No
+  global opt-out. Test fonts come from the workspace `egui/default_fonts` +
+  `monochrome_emoji_fonts` features (§5.1), not from `egui_kittest`'s non-propagating
+  dev-dependencies.
+- Headless text rendering is not proof of native font fallback/IME; native platform checks remain
+  (§8.7).
+
+### 5.5 Input, IME, clipboard and PRIMARY
+
+- `control.rs:371`: `Event::MouseWheel { …, source: egui::MouseWheelSource::Wheel }`; the same in
+  the 11 test constructions (§2.1). Use `Wheel`, not `Unknown`, so synthetic scrolls are not
+  treated like momentum/rubber-band input.
+- `viewer_text.rs:397-508` (custom text editor): handle stock
+  `egui::ImeEvent::DeleteSurrounding { before_chars, after_chars }` by converting the caret
+  position to a char range and issuing `text.delete { range, merge: <same key> }` before the
+  following `ImeEvent::Commit`, so replacement is one undo step. Native winit emits the fork's
+  `DeleteSurroundingBytes { before_bytes, after_bytes }` (E21/W26/W27); add that arm in the
+  language/IME stage, converting UTF-8 byte offsets at char boundaries via `TextDoc::text`,
+  `TextDoc::char_of_byte` and `TextDoc::byte_of` (`crates/keyframe/src/text_doc.rs:527-545`).
+  Regression: preedit + delete-surrounding + commit replaces exactly the intended characters and
+  adds one undo step; press-and-hold/dictation on macOS is verified manually (`W26`).
+- **Incoming composition lifecycle (viewer_text).** Each viewport stores
+  `ImeComposition::Active(owner)`, `TerminalPending(owner)` or `Stale`, where the owner is
+  `(layer, edit session)` and excludes caret, selection, text, revision and geometry. A target
+  switch or `text.endEdit` invalidates both live states; the `Stale` tombstone rejects every
+  pre-edit/delete/commit from the replaced owner. An empty pre-edit clears the visible composition
+  but records `TerminalPending(owner)`: the visible pre-edit ended, while its terminal commit or
+  delete-surrounding is still pending. A switch before that terminal event therefore still rejects
+  it rather than applying it to the replacement. A non-empty old pre-edit is treated as a continuing
+  update of that old composition and keeps the tombstone across arbitrary idle frames. A rejected
+  terminal commit is the composition boundary and consumes the tombstone immediately, so a new
+  pre-edit later in the same raw input batch is accepted for the current target. A rejected empty
+  pre-edit or delete-surrounding is only tentatively terminal: it keeps the tombstone through the
+  rest of the batch so a paired old commit is rejected too, and is consumed at batch end when no
+  commit follows. Tests must separate the late pre-edit from its commit/delete by at least three idle
+  frames, exercise an observed empty pre-edit followed by a target switch and a delayed old commit,
+  verify a new pre-edit after a rejected terminal commit in the same batch commits to the new
+  target, verify a genuinely new composition after the consumed terminal batch, and verify that no
+  permanent lock remains. Do not replace this with an elapsed-frame guard: time is not causal
+  ownership.
+- **E21b/P7b outgoing surrounding text (new prerequisite, not existing behaviour).**
+  Source inspection at the candidate revision found no call to winit's
+  `WindowExtWayland::set_ime_surrounding_text` anywhere under `egui-winit`, and `IMEOutput`
+  (`egui/src/data/output.rs:100-115`) has only purpose/rect/cursor rect/interrupt. Deletion and
+  commit handling alone therefore cannot pass the suite's surrounding-text contract.
+  - The fork adds a bounded transient `IMESurroundingText` payload to `IMEOutput` (logical text,
+    cursor/anchor as UTF-8 byte offsets, **owner/context generation identity**). It is built from
+    committed text only, excludes preedit, is skipped from debug/persistence output, and is per
+    IME-owning widget/viewport. The owner generation is present even when support is unavailable;
+    **available-empty is distinct from unavailable** and is sent as an explicit empty payload,
+    never as an absent one. Changing owner/support (normal, password, unavailable) clears the
+    backend cache and uses the protocol's committed disable/enable boundary; an empty text payload
+    is not a general clearing API.
+  - The **final completed pass** owns the outgoing value, including `None`: the adapter must not
+    use `ime.or(self.ime)`-style carry-over that can retain an earlier pass's text. `egui-winit`
+    calls W27 on text/selection/focus changes; per-window caching cannot bleed between widgets or
+    windows. The excerpt is at most 4,000 UTF-8 bytes cut at valid char boundaries. A selection
+    that cannot fit returns an explicit **unavailable** context (or an explicit empty one
+    when the document really is empty), never a truncated "complete" selection.
+  - A current-epoch `Done` whose protocol serial does not match still applies its incoming edits
+    **exactly once** and only defers outgoing surrounding state until a matching serial. A stale
+    (different owner/focus generation) batch is invalidated and discarded. Track focus epochs and
+    protocol serials separately.
+  - **No new document-sized allocation.** Building the new bounded payload must not clone the full
+    document; the baseline `TextEdit` already clones whole buffers for change detection/undo, and
+    that pre-existing cost is measured separately.
+  - **EffectCraft custom adapter (viewer_text).** The producer at `viewer_text.rs:568` must supply
+    the logical model text from the edited layer's `TextDoc` (committed text), not display-bidi
+    text, with preedit excluded (`viewer-text-preedit` stays a display-only temp value), plus the
+    editor's owner generation unconditionally. Convert `TextEdit.anchor/caret` (character
+    indices, `crates/engine/src/commands/text_edit.rs:18-40`) to UTF-8 bytes with
+    `TextDoc::byte_of`, clamp at char boundaries, excerpt to 4,000 bytes, and remap cursor/anchor
+    to the excerpt. Emit an explicit **empty** payload for an available empty document; emit
+    **unavailable** (and trigger the committed disable boundary) when there is no edit session,
+    when focus leaves the viewer, or after `text.endEdit`/Escape/click-away, so stale text cannot
+    survive. The editor has no password mode; the stock-field password/unavailable clears are
+    tested there. The payload is scoped to the viewport that owns the focused editor (floating
+    panel windows and the main window cannot share state).
+  - **Atomic compatibility.** `IMEOutput` loses `Copy` when the payload is owned. The P8 fork SHA,
+    all egui-family crates, the `craft-ui` revision and EffectCraft's single `IMEOutput` literal
+    (`viewer_text.rs:568`; there are no destructures in this repo) must change in one dependency
+    unit. Do not land a mixed stock/fork lock, and do not claim a stock-0.37 app build after this
+    stage: the literal would not compile against stock `IMEOutput` (§11.13).
+  - Tests: outgoing text immediately after delete+commit and deletion-only batches; scalar/
+    grapheme vs byte indices; supplementary emoji, combining marks and RTL logical order; preedit
+    exclusion and caret movement; long selection/excerpt limit and allocation bound; same-window
+    field switch; two windows; focus loss and late serial; current-epoch mismatched serial applies
+    incoming edits once and defers outgoing; stale-epoch discard; available-empty vs unavailable
+    and normal/password/unavailable transitions; final-pass `None` authoritative; multi-pass
+    final output; native Wayland Vietnamese/predictive IME protocol trace. macOS `NSRange`
+    conversion remains a separate W26 path; this does not claim new macOS surrounding-text APIs.
+- Clipboard: `eframe/clipboard` feature (§5.1). `ctx.copy_text`/`output.commands` paths at
+  `lib.rs:1600-1612`, `lib.rs:1946-1953`, `viewer_text.rs:413-430`, `menus.rs:1867-1906` and the macOS
+  `Hooks::clipboard_text` (`lib.rs:159-160`, `apps/effectcraft/src/main.rs:326`) stay unchanged.
+- **PRIMARY (E4 + W15P) is a native gate, not one manual row.** Upstream 0.37 fills PRIMARY from
+  `Label`/`TextEdit` selections and pastes on middle click (`#8428`); the reviewed fork replaces
+  the arboard fallback with a winit-owned PRIMARY path on the existing Wayland
+  connection/event queue, using SCTK 0.19.2's `PrimarySelectionManagerState` and per-seat
+  device/source/offer objects. Never create a second regular `wl_data_device`. `set_primary` /
+  `get_primary` route through it; password selections are never offered; an unchanged selection
+  does not reclaim ownership. Serial handling accepts keyboard **and** pointer press serials for
+  the focused seat with origin, freshness and epoch (do not invent a keyboard-only rule — the
+  protocol describes pointer-driven selection). **Claim the selection synchronously while the
+  triggering serial is fresh**; only serving the selection is asynchronous. Reads are bounded:
+  a 2 s total monotonic deadline, 16 MiB total bytes, at most 4 read workers and 2 writers with
+  a bounded queue of 8. A live owner-specific completion waker wakes the owning viewport after the
+  slot lock is released and never blocks the UI; canceled or stale results are discarded, and a
+  stale paste is canceled after focus/target/generation changes.
+  The native capability matrix in §8.7 covers wlroots/Hyprland, KWin and Mutter; ordinary paste is
+  not PRIMARY acceptance. An isolated PRIMARY-only fallback requires measured necessity and review.
+- Non-Latin layout shortcuts (E7/E19/W25): headless tests cannot exercise winit's mapping. Add a
+  manual row (Russian, Arabic, Hebrew) that checks Menu shortcuts and the timeline/Project Ctrl+C/V/X
+  paths, and keep `parse_shortcut` tests (`menus.rs:2229-2265`) as the app-level contract. Use a
+  non-clipboard held-key case (e.g. Ctrl+Z) as well, because clipboard shortcuts return before
+  emitting Key-down.
+
+### 5.6 Menus, popups and docking
+
+- `menus.rs:2025-2050`: keep `MenuBar::new().config(MenuConfig::new().style(menu_style)).ui(...)`;
+  0.37 keeps `MenuConfig` and adds `submenu_gap`. Regression tests: hover-switch between top-level
+  menus, arrow navigation (`menu_keys::Nav`), opening a submenu, Escape/outside-click closing, and
+  a menu command that acts on the focused `TextEdit`'s selection (`#8763`). That last case is P7c's
+  selected fix in the P8 revision, not an app workaround.
+- `menu_keys.rs:84`: scope id (see §5.2). `menu_keys` also uses `ui.is_sizing_pass()` for popup
+  sizing (already); keep and test that a sizing pass does not invoke a command twice.
+- Dock: the layout and drawing are app-owned (`dock.rs`, `dock_ui.rs`); only `craft_ui::docking`
+  actions are shared. Preserve panel order/nesting, clip rects, split sizes and IDs. 0.37's
+  "Panel/Scene clip rect respects parent" (`#8562`) needs a clip test for a maximized panel and an
+  embedded (web) floating panel.
+- Root Ui order (`lib.rs:1614-1723`): menu bar strip, header, dock body, native drop overlay,
+  mini flowchart, dialogs, ScriptUI windows, coach, import card, toast. There are no side
+  `Panel::left/top/...` calls; the dock is an explicit child Ui with computed rects. Keep that order
+  and nesting (it decides hover/layer order and clip rects). `CentralPanel` is used only inside
+  floating-panel and video-preview viewports (`dock_ui.rs:475`, `prefs_live.rs:207`).
+- Do not enable `Style::right_to_left` (E9); the dock and viewer are custom LTR geometry.
+
+### 5.7 Screenshots (control channel, kittest, hidden windows)
+
+Replace token-via-input-event correlation with the shared CL-2 completion slot (§3.3). Do not add an
+unbounded or app-local result channel: the slot is owned by the app request record, and the
+callback holds only a weak reference to it.
+
+```rust
+struct PendingShot {
+    token: u64,
+    path: Option<String>,
+    crop: Option<[f32; 4]>,          // logical points, as the control protocol already takes
+    reply: Sender<Value>,
+    deadline: f64,                   // app clock
+    admitted: (egui::Rect, f32, u64), // screen rect + ppp + geometry epoch at acceptance
+    issued: Option<(egui::Rect, f32, u64)>, // target-UI rect + ppp + geometry epoch at issuance
+    slot: Arc<capture::CompletionSlot>, // CL-2F helper type (API frozen)
+    reserved_bytes: usize,
+}
+```
+
+- **Admission.** Use the shared default policy: at most **4 outstanding requests**, **128 MiB per
+  image** and **256 MiB aggregate** reserved in-flight/completed bytes. Stricter app caps are
+  allowed, but never looser. Estimate the target surface with checked `width * height * 4` from the
+  known UI geometry, reject over-budget requests before issuing a capture with an actionable
+  reply, and revalidate the reservation at issuance. A post-callback size check alone does not
+  bound peak capture memory; the reservation does.
+- **Issue.** `ctx.request_screenshot(callback)` sends a viewport command that itself forces a
+  repaint, and a pending screenshot makes a hidden window take a full UI+paint pass. A screenshot
+  that is merely **queued and not yet issued**, and settling deadlines, must have `tick`/logic send
+  `RequestPaintWhileHidden` so the UI reaches issuance; do not add a second wants-paint request
+  once the screenshot command has been issued. At issuance record the target-UI logical
+  content/screen rect, ppp and a geometry epoch. That issued geometry + epoch, not callback
+  metadata, is bound to the image: the callback carries **only pixels**.
+- **Completion.** The app owns the strong slot and the owner-specific waker; the callback holds
+  only a weak reference, stores the image unless canceled/completed, takes the wake handle, drops
+  the slot lock, then requests the owning viewport's repaint. The callback does not wake itself and
+  must not strongly capture a `Context` or the app; that would create a cycle with the viewport's
+  queued command. `collect_screenshots` drains completed slots in `tick` and encodes/writes/replies
+  outside the callback.
+- **Geometry/scale binding.** With an **unchanged geometry epoch**, derive the pixel scale from
+  the returned image dimensions against the issued rect and verify aspect/rounding; the returned
+  image may be smaller when E2 surface fitting applies. **Any** intervening resize/DPI/zoom/surface
+  epoch change between admission, issuance and save cancels and retries the request — even if the
+  geometry later changes back before the save. Never crop with the admission-time, current or any
+  other ppp that disagrees with the issued epoch. Store admitted/issued/captured values and record
+  mismatches; an explicit error is correct when a retry cannot complete inside the deadline.
+- **Cancel/timeout/drop.** Removing the request record (timeout, close, app drop, caller drop)
+  marks its slot canceled under the lock; a late callback finds no live slot or a canceled one and
+  drops the image without a second reply or file write. Release the reserved bytes on every exit
+  path (completion, timeout, cancellation) and assert retained bytes return to zero after drain.
+- `save_screenshot` takes the actual scale/geometry instead of `&egui::Context`
+  (`control.rs:570-606`), so it can run in `tick`.
+- `issue_screenshots` (`lib.rs:1530-1558`) uses the tick's `now` and a settle deadline, not a
+  per-pass frame counter; `collect_screenshots` (`lib.rs:1560-1580`) becomes the slot drain.
+- Remove the "occluded/minimized" refusal at `lib.rs:1490-1498` for the native wgpu path only after
+  the platform run shows the screenshot request really produces a frame. The refusal exists because
+  0.36 never painted a hidden window; 0.37 makes a pending screenshot a wants-paint action
+  (`wgpu_integration.rs:680-690`, `egui-winit/src/lib.rs:2116-2128`). Keep the timeout error and
+  add `ui.focus` as the fallback. Record Windows/macOS/Linux results separately. Do not claim
+  hidden-window screenshots on a platform that was not tested. On web, eframe does not paint a
+  hidden tab (logic-only passes have no clipped primitives), so `ui.screenshot` on web requires a
+  visible tab; record that limitation.
+- Correlation tests: two concurrent screenshots with different crops; callback-once behavior; a
+  timed-out request followed by a late callback (no second reply, no file/PNG); shutdown/close with
+  a pending capture; aggregate byte-budget rejection; a resize/DPI change between admission,
+  issuance and completion (retry or explicit error, never a stale crop); a hidden-window capture on
+  native wgpu is a positive row (not a "missing RequestPaint" negative); retained bytes return to
+  zero; the app/Context can be dropped without the callback keeping it alive.
+- `docs/control-protocol.md:125-129` and the module docs at `control.rs:1-27` need the new wording
+  (no user-visible protocol change: `ui.screenshot` keeps its method and reply shape).
+
+### 5.8 Viewports and GPU
+
+- Floating panels (`dock_ui.rs:466-512`) use `show_viewport_immediate`; the video preview uses the
+  same (`prefs_live.rs:166-236`). Keep them inside `draw`. Persisted window rects
+  (`PanelWindow::sanitized`, `ui.panel_windows`) are unchanged.
+- **Hidden playback and child windows.** `show_viewport_immediate` children only update when the
+  parent runs a pass. If playback is playing while the root window is minimized/occluded, or a
+  floating panel/video preview is open, `tick` must keep `want_paint` set (and request a repaint at
+  the needed cadence) so the parent runs the forced hidden pass. Do not rely on the one-shot
+  open/close command mitigation alone. Test a minimized-window playback with the Video Preview open
+  and with a floated panel, asserting the child content advances and the parent does not thrash.
+- 0.37's `#8748` (a hidden parent does not update deferred children) is carried as P7c's selected
+  fix in the final P8 revision; verify it in the hidden-playback test. Independently, a command that
+  opens/closes/floats a panel or video preview also sets `want_paint`, and playback keeps the pass
+  cadence, so the app does not depend on one mechanism alone.
+- GPU: `egui_wgpu::Renderer`'s
+  `register_native_texture_with_sampler_options`, `update_egui_texture_from_wgpu_texture_with_sampler_options`
+  and `free_texture` are unchanged in 0.37 (`renderer.rs:790-930`), so `viewers.rs:150-210` needs no
+  API change. `RenderState`/`Frame::wgpu_render_state` are unchanged. Keep E2+E3. The existing
+  `ui_gpu.rs` GPU-vs-CPU tolerance (at most 0.3% of pixels differ by more than 1/255, worst channel
+  difference ≤4) stays.
+- **A skipped GPU test is not evidence.** `ui_gpu.rs` returns early when
+  `effectcraft_gpu::Gpu::headless()` finds no adapter (`tests/ui_gpu.rs:44-47`) or when egui-wgpu's
+  GL device has WebGL2 limits (`tests/ui_gpu.rs:62-65`). For the GPU acceptance row run with a
+  required adapter, assert `gpu_adapter().is_some()`, and record adapter/backend/driver and the
+  exact test invocation. The planning host exposes an i915 render node (`/dev/dri/renderD128`) with
+  no display session; that can qualify a headless wgpu adapter run, not presentation.
+- Device loss must be handled from `tick` (see §4.2); the `ui()` early return currently means a
+  device lost while hidden is not acted on (`lib.rs:1905-1910`). Add a logic-only test that a
+  reported failure closes the window and keeps the auto-save.
+- 0.37 `Frame::set_wgpu_surface_config` is fixed (`#8442`); EffectCraft does not use it. Do not add it
+  as part of this migration.
+
+### 5.9 Language and screen readers (fork-only stage)
+
+When `craft-libs#198`'s fork APIs are accepted:
+
+- In the app tick, after `i18n::set_current(language)`, call
+  `ctx.set_language(Some(language.to_string()))` (fork E17) and, where an `eframe::Frame` is
+  available, `frame.set_ui_language(Some(language))` (fork E18). This sets the AccessKit root
+  language and widget text layout language. It does not change the app's catalogs.
+- Assert `ctx.language()` follows the interface language, the AccessKit root node carries the
+  language, and a `TextEdit`'s text is shaped with the UI language (CJK glyph choice where fonts
+  are installed). Tests that need the fork API are marked fork-required in their module docs.
+- Keep the app LTR (`Style::right_to_left` unset). Text-layer RTL remains `effectcraft-text`'s
+  contract; UI-label bidi is epaint's.
+- The E17/E18 policy sub-stage is optional and separately revertable. The production app already
+  requires the final fork and E21b from P1; a stock-0.37 control uses a separate minimal adapter
+  and is not obtained merely by reverting P4 (§11.13).
+
+## 6. Dependency topology, publication reachability and rollback
+
+Intended graph (final reviewed storytold revisions; names shown for structure):
+
+```text
+effectcraft / effectcraft-web / effectcraft-cli
+  -> effectcraft-ui-egui -> craft-ui (craft-libs rev with CL-1 + CL-2F)
+                          -> egui 0.37.0 (git <final storytold egui P8 SHA, incl E21b/P7c>)
+                             -> epaint, epaint_default_fonts, ecolor, emath (same git rev)
+                             -> eframe, egui-wgpu, egui-winit (same git rev)
+                             -> accesskit 0.25.1, kittest 0.5.0
+                             -> winit 0.30.13 (git <final storytold winit SHA, incl W15P>)
+  -> winit (direct, same git rev)
+```
+
+- Every egui-family crate EffectCraft resolves must come from the same git revision. `cargo tree -d`
+  must show no second egui family, and `cargo tree -i winit@0.30.13` exactly one source.
+- Publication: EffectCraft is an application, so a git egui/winit dependency is acceptable in its
+  lock, but no branch names, no `path` patches and no machine-local checkout may appear in a
+  publication branch. The `aiongg` candidate SHAs are comparison inputs and must not appear in a
+  publication lock. `craft-libs` consumers keep their own patches; the app's `[patch.crates-io]`
+  is the supported place for the suite fork.
+- A clean checkout must fetch every final approved revision and pass `cargo check --locked` and
+  `cargo test --locked` without local overrides; record that proof with the lock.
+- Rollback: keep the exact baseline lock (egui family 0.36.2, craft-ui `5c874d51`, winit registry
+  0.30.13) in the task evidence. The project file format, command ids, undo model, workspace-state
+  **version 1** and the GPU compositor are unchanged by this migration, so rollback is a revert of
+  the pin/refactor commits, with no data migration. Do not persist any 0.37-only preference until
+  the final stage, so an older build ignores nothing it cannot read.
+- `examples/plugins/posterize-bands` is a separate workspace with its own lock and no egui; do not
+  edit it. `craft-pdf`/`hayro-syntax` and the filmcraft pins are unrelated and stay.
+- There are no vendored crates in this repository (`vendor/` absent); the only patch is the
+  craft-libs `hayro-syntax` entry. Do not delete it, and do not "clean up" the commented filmcraft
+  path patch by enabling it.
+
+## 7. Command, undo, save/reopen contracts
+
+Nothing in the egui bump may change these:
+
+- Every gesture still routes through `effectcraft_engine::Session::execute` or `menus::invoke`
+  (`lib.rs:1-6`, `control.rs:1-19`); UI-local state must not become the source of truth.
+- One gesture = one undo step: existing tests such as `ui_viewer.rs:2263` (fit/zoom),
+  `ui_viewer.rs:2306` (rotate), `ui_project_delete.rs`, `ui_timeline_trim.rs` and `ui_keyframes.rs`
+  stay green.
+  `Session::history.merge_key` is reset when a numeric scrub ends (`lib.rs:1866-1867`,
+  `pointer_wrap.rs:31-36`).
+- Save/reopen: `.ecproj` JSON contains no egui types; save, reopen and pixel-compare a comp after a
+  UI edit. Workspace state (`workspaces.json`, **version 1**, `workspace_state.rs:37-40,85-88`)
+  contains `PanelKind`, rects and floats, not egui ids; save, restart and restore the dock/floating/
+  window layout. If a new field is ever required, specify an explicit version bump, a migration and
+  a backward-compatible reader test; do not silently reuse version 1.
+- Multi-pass must not duplicate a command, an undo step, an autosave write or a close prompt
+  (§4.4, §8.3).
+- **Auto-save while hidden has two owners today.** Project auto-save/recovery already runs from
+  `tick`; the workspace-layout autosave is still in `draw` (`lib.rs:1715-1722`, gated on
+  `!ptr.any_down()` and `workspace_store.due(now)`). P2 moves its due check and write to `tick`
+  using the app clock and the last pointer-down state observed in `draw`. Only then does the
+  hidden claim cover both kinds; the close guard and crash recovery remain tick-owned. §8.3's
+  test asserts both writes while hidden.
+
+## 8. Tests and acceptance
+
+### 8.1 Repository gates
+
+Every stage runs the repository gates (through the server job workflow, never directly from the
+planning task): `cargo fmt --check`, `cargo clippy --workspace --all-targets --release -- -D warnings`,
+`cargo test --workspace --release`, `cargo xtask layers`, `cargo xtask assets`, `cargo xtask wasm`,
+plus `node apps/effectcraft-web/tests/{workers,page,storage}.mjs` (no build needed).
+On every dependency stage also run `cargo check --locked`, `cargo test --locked`,
+`cargo tree -d`, the family/winit inverse trees and the wasm-target `wasm-bindgen` tree on a clean
+checkout. `cargo xtask ci` is the final gate.
+
+### 8.2 Compile and API contract
+
+- The 15 errors and 602 warnings above are gone, with no `#[allow(deprecated)]` added to production
+  code.
+- Grep gates must use precise patterns:
+  ```sh
+  git grep -nP '\bId::new\(' -- '*.rs'                          # only comments/none
+  git grep -n 'WidgetType\|AtomLayoutResponse\|\.vertical_align(' -- crates apps
+  git grep -n 'with_accessibility_check(false)' -- crates apps     # must be empty at every stage
+  ```
+  The old `grep -rn "Id::new"` also matches `GlyphId::new` in `crates/text`/`crates/pdf` (7 lines)
+  and can never return "none"; `\bId::new\(` does not match inside `GlyphId`.
+- `ui_agent_audit.rs:73` uses `WidgetInfo.role` (`typ` is gone); all tests construct `MouseWheel`
+  with `source`.
+- Tests for `Id::unique` stability and for the role mapping table.
+
+### 8.3 Lifecycle, hidden windows and multi-pass
+
+New tests (headless, `Context::run_logic` + `run_ui`, no GPU). The driver must mirror the real
+eframe order: `raw_input_hook`-equivalent (`feed_synthetic`) → `run_logic` → retain the mutated raw
+input → next `run_ui`, and it must not replay input events from `tick`. Use `AppClock::manual()`:
+
+1. `logic_only_drains_control_and_jobs`: a control request that only needs `tick` (e.g.
+   `engine.execute` of a non-UI command) gets its reply with zero `run_ui` calls; `poll_render`
+   completes a render job and the Toast/event is drained. Advance the manual clock between ticks.
+2. `logic_only_feeds_synthetic_and_forces_one_paint`: with the root viewport marked
+   `minimized: Some(true)` (so `visible() == Some(false)`), a queued `ui.click` is fed by the hook
+   during a logic-only tick; the tick emits `RequestPaintWhileHidden` and sends **no** reply. A
+   second logic-only tick does **not** feed another event while the first is still unapplied. The
+   following forced `run_ui` sequence (still minimized) consumes one pointer event per pass, applies
+   the buffered gesture exactly once and replies exactly once after the final pass. The same test
+   asserts that the forced passes are not gated on `visible()` and that no event was dropped.
+3. `after_input_replies_only_after_a_paint`: same, and assert the command's effect exists before
+   the reply is sent; force a discard on that pass and show the reply still waits for the final
+   non-discarded pass.
+4. `forced_hidden_pass_applies_buffered_gesture`: feed during a logic-only tick, run forced full
+   passes until `synthetic` is drained, and assert exactly one command and one undo step (no
+   duplicate from the logic-only call).
+5. `playback_advances_without_a_paint`: with a viewer scale recorded and the manual clock, hidden
+   ticks advance `session.time` within the preview step and do not duplicate `Playback.frame_shown`;
+   audio is started once (stub `audio_device`); a stale `ctx.input(|i| i.time)` cannot satisfy a
+   deadline.
+6. `autosave_and_close_guard_run_while_hidden`: project auto-save and the moved workspace-layout
+   autosave both write in logic-only ticks; a hidden close request opens the unsaved dialog and
+   sends `CancelClose`.
+7. `discarded_pass_is_idempotent`: force `ctx.request_discard` (or show a first-time `Grid`) while
+   performing one command, one drag and one auto-save; assert one command execution, one undo step,
+   one file write.
+8. `device_loss_while_hidden_closes_and_saves`: bridge a failure during a logic-only tick; assert
+   the close command and the auto-save, as in `lib.rs:2040-2075`.
+9. `hidden_playback_keeps_child_viewports`: with playback playing and a Video Preview or floating
+   panel open, hidden ticks keep requesting a pass and the child content advances (§5.8).
+10. Screenshot-slot tests from §5.7 (concurrency, cancellation, late callback, resize/DPI including
+    a change back, byte budget, shutdown).
+11. `repeated_logic_only_ticks_do_not_collapse_a_gesture`: queue a `ui.click` and a `ui.drag`, run
+    several logic-only ticks (mirroring eframe's overdue `RedrawRequested` and 100 ms invisible
+    throttle) while the root viewport stays minimized, and assert the hook fed at most the one
+    unapplied event; then run forced full passes and assert press/move/release each reached a
+    separate pass, exactly one click/drag command and one undo step resulted, and no event was
+    dropped. Repeat for a click followed immediately by a drag.
+
+### 8.4 Screen geometry, pixels and accessibility
+
+- Fixtures: the built-in demo project (`file.openDemoProject`) for visual states, the generated
+  `engine::perf::large_project` for scale/perf, and the bundled Inter/JetBrains Mono fonts. No
+  external media is needed for UI geometry/accessibility/pixel tests; media-dependent tests keep
+  their existing generated fixtures.
+- Geometry/hit tests (existing helpers, automation rects): viewer comp rect and fit at 1.0/1.25/1.5/
+  2.0 ppp; dock split resize; tab drag and overflow; floating panel window (native only; embedded
+  web path separate); menu item click at a label; timeline row heights (`ui_parameter_spacing.rs`
+  keeps 20/19 px); panel order/nesting after maximize/restore.
+- Double-click paths: 24 `double_clicked()` call sites (27 textual `double_click` occurrences
+  including the Timeline helper, e.g. project rename `project.rs:783,832,1036`, Timeline
+  `timeline.rs:1502,2116,2325,2516,2876,3529`, Flowchart `flowchart.rs:360`): 0.37 changed
+  double/triple-click classification (`#7915`). Assert one double-click performs exactly one action
+  and does not also fire a triple-click path.
+- **Visual review harness — correct the claim and extend it.** Today
+  `crates/ui-egui/tests/ui_visual_review.rs` (`UI_REVIEW_DIR`, `#[ignore]`) captures the workspace
+  in light and dark, but every `PanelKind::ALL` panel and the About/New Comp/Settings/Shortcuts/
+  Command Palette dialogs only in **dark**, at the harness default ppp 1.0, at wide 1600×1000 and
+  compact 1024×768 (`ui_visual_review.rs:13-48`). Extend it to capture every panel and dialog in
+  **both themes at ppp 1.0 and 2.0** (four combinations per state, both sizes), then use it on the
+  baseline and every stage. This is the primary before/after visual record; the golden set below is
+  the automated subset. Record that the ignored test actually ran; an ignored/absent capture is not
+  evidence.
+- Pixel comparisons: choose one of
+  - `egui_kittest` `snapshot` goldens (enable the `snapshot` feature, add `kittest.toml` with
+    `threshold` per OS, commit a small fixed set of PNGs under `crates/ui-egui/tests/snapshots/`
+    **with `.attribution` sidecars and `ATTRIBUTION.md` rows**, because the repository's asset rule
+    applies even to screenshots); or
+  - an app-owned tolerant compare against RGBA hashes stored in a Rust constant, with the same
+    tolerance policy and no image assets.
+  Exact selected set: five states — Standard workspace (demo, time 2 s), Timeline maximized with
+  rows open, Project panel with folders open, a menu open, and the Settings dialog — each in
+  **light and dark at ppp 1.0 and 2.0** (20 captures), not a single dark/default-scale set.
+  Threshold: max channel delta 2/255, ≤0.1% failed pixels on Linux/Windows, 3/255 on macOS (if any
+  platform-specific rasterization is observed); no tolerance for geometry rects. Never accept a new
+  golden automatically; a changed golden needs a reasoned explanation in the PR.
+- Mutation check (required, recorded as evidence, not committed as a test): nudge `Tokens::focus` or
+  a panel width by a visible amount behind an env flag and show that the pixel/geometry test fails
+  with the expected diff; restore. This proves the assertions detect change.
+- Accessibility: **strict checks throughout**; `Harness::unnamed_widgets()` empty for the workspace,
+  for each panel maximized, for every dialog in `Dialog`, and for the Home/Media Browser/Effect
+  Controls/Properties/Timeline panels. Role contract tests for color well, tab + selected, splitter,
+  tree item, text input, spin button, slider and a checked menu item. `Role::Button` + `selected` for
+  selectable labels. Read-only fields are exempt by kittest. The repo-wide grep gate in §8.2 proves
+  no global/per-builder accessibility opt-out remains.
+- Glyph coverage: the extended chrome symbol test (§5.4); `ui_effect_names.rs:35` and
+  `ui_presets_folder.rs:40` use `allow_missing_glyphs()` with a comment. No global glyph opt-out.
+- `ui_gpu.rs` and `ui_visual_review.rs` are skip/ignore-capable: the acceptance record must name the
+  exact invocation and show they actually ran. A skipped GPU test is not GPU evidence (§5.8).
+- Screenshot tests (§5.7) and IME/adapter tests (§5.5).
+
+### 8.5 Save/reopen and command/undo workflows
+
+- UI edit → save `.ecproj` → reopen in a fresh `EffectcraftApp` → project JSON equal and viewer
+  pixels equal; undo/redo across the save still works.
+- Dock/floating/panel-window layout → save workspace → restart → restored; maximize/restore and
+  split sizes unchanged.
+- One command from the menu, one from the control channel and one from a synthetic click each
+  produce one undo step; a discarded pass does not add another.
+
+### 8.6 Web workflow
+
+- `cargo xtask wasm` (all L0–L4 + ui-egui + web) and `cargo xtask web --serve 8765`.
+- `node apps/effectcraft-web/tests/smoke.mjs --url http://127.0.0.1:8765/ --out <evidence>`:
+  WebGPU/GPU-compositor path, viewer, `render.frame`, Render Queue downloads, background worker
+  event-loop gaps (<400 ms), AudioContext, save/reopen, persistence across reload, offline service
+  worker. Also `workers.mjs`, `page.mjs`, `storage.mjs`.
+- Browser screenshots come from CDP (`smoke.mjs:113`), independent of the egui screenshot API; add
+  a page-side check only for the in-app `window.effectcraft.request("ui.screenshot", …)` reply shape
+  when the tab is visible. A hidden web tab cannot paint (logic-only passes carry no clipped
+  primitives), so `ui.screenshot` on web is a visible-tab feature; record it.
+- Web is a separate feature set: no OS clipboard/PRIMARY, no system fonts, embedded viewports.
+- **Hidden-tab behaviour, realistically.** Upstream 0.37's web runner already falls back from
+  `requestAnimationFrame` to `setTimeout(10 ms)` when `document.hidden()`
+  (`eframe/src/web/web_runner.rs:238-279`), so `AppRunner::logic` keeps running with logic-only
+  passes and the browser clamps background timers to roughly one second (long-backgrounded Chrome
+  may throttle further). Assert that the session snapshot's timestamp advances across the hidden
+  period at the browser's actual cadence, that frame workers keep completing within that allowance,
+  and that the viewport is fully refreshed when the tab returns. Record the browser, visibility
+  transition and measured cadence; do not require exactly 1 s and do not add a new worker/timer
+  scheduler or page-independent persistence feature in this migration. Fix `WebApp::logic` to pass
+  the app clock (`self.app.now()`) to `persist::snapshot`, not `ctx.input(|i| i.time)` (which is
+  stale in a logic-only pass).
+
+### 8.7 Native platform matrix
+
+| Row | Required evidence |
+| --- | --- |
+| Linux headless wgpu (this server) | `ui_gpu.rs` with a **required** adapter on the i915 render node (`/dev/dri/renderD128`, no display session): assert `gpu_adapter().is_some()`, record adapter/backend/driver and the exact command. This qualifies a headless GPU-compositor run only, not native presentation. |
+| Linux X11 | Native window under **Xvfb + a real window manager** (e.g. openbox) **+ an X11 input method** (e.g. ibus/fcitx): screenshot, save/reopen, floating panel window, focus/menu/close/auto-save, clipboard and PRIMARY between windows, X11 IME (Vietnamese/Japanese) with editor/undo checks. Record Xvfb/WM/IME versions and that the session is virtual and not composited. This can qualify the X11 parts; it cannot qualify a physical GPU or Wayland. |
+| Linux Wayland | Requires a real compositor; unresolved unless a managed environment is provided. Run the E4/W15P PRIMARY **native capability matrix** on wlroots/Hyprland, KWin and Mutter: protocol availability, keyboard focus, keyboard and pointer-selection serial freshness, owner/seat change, empty/absent offers, self-paste, slow/canceled transfer, password exclusion, unchanged-selection reclaim, and no second regular data device (protocol trace). Also trace text-input-v3 current-epoch mismatched `Done` (incoming applied once, outgoing deferred), stale-epoch discard, and disable/enable on owner/support changes. Record unsupported capabilities honestly; do not substitute X11/arboard results. |
+| Windows (`craft-windows` clone, separate task) | real native build/test, GUI launch, screenshots, menu/close/auto-save, clipboard, IME, DX12 pipeline startup timing, mixed-DPI window placement, and a held Ctrl+Z release after a layout switch; Basic Render Driver is software and must be reported as such. |
+| macOS | **unresolved gate** unless real hardware evidence is provided: press-and-hold/dictation and surrounding-text NSRange (`W26`), Command-key shortcuts, traffic-light/titlebar placement, screenshots while occluded. |
+| FreeBSD / Nix / Windows ARM64 | CI workflows are reusable `craft-common-actions`; run after the pin lands and report only what the runners provide (FreeBSD nightly, ARM64 MSI on schedule). |
+
+Headless kittest is not evidence for native focus, IME, file pickers, clipboard, PRIMARY or GPU
+presentation. Physical-GPU and Wayland rows remain explicit unresolved gates until measured.
+
+### 8.8 Known upstream regressions as acceptance gates
+
+- `#8731` (text tessellation, reported +61% instructions for plain text): measure with the paired
+  text-heavy operations (workspace, timeline, project) and the raw `tessellate` instruction count
+  where possible. This measurement belongs to the pre-P1 gate. If the median regression is above
+  threshold, the row-wise fix (provenance, test, removal condition) must be in the reviewed P8
+  revision before P1 is frozen, or the migration is blocked. P5 may not add it afterwards.
+- `#8736` (DX12 pipeline creation, reported ~40 ms): measure Windows startup and first-frame cost
+  separately for the DX12 backend. If it pushes startup over threshold, the fix must be in P8 before
+  P1 or accepted with an explicit owner decision and the measurement; P5 only re-reports it.
+- `#8512` (system font startup cost): keep `system_fonts` off and record font-install/discovery
+  time in the startup row so a later color-emoji decision has a baseline.
+- `#8489`/`#8583`/`#8601`/`#8589` are handled by this plan's refactors.
+
+## 9. Performance plan
+
+### 9.1 Baseline before production changes
+
+Add instrumentation first (stage B0, no behaviour change): raw samples per operation, p50/p95/p99,
+the number of **final** paint passes and discarded passes (`Context::will_discard()` at the end of
+`draw`), texture-upload bytes per frame from `FullOutput.textures_delta`, logic-only tick time,
+startup-to-first-frame and font-install/load time, and an optional counting global allocator in
+`effectcraft-cli` for `bench --ops` (byte counts per operation). Record raw and compressed
+`effectcraft-web` `.wasm` sizes. `Measure` gains `samples`, `median`, `p95`, `p99`, `cpu_ms`;
+existing names and JSON fields stay. Then run the **B0-instrumented** baseline: commit `9581b53c`
++ the instrumentation patch, with its patch SHA and the 0.36.2 lock recorded. The baseline identity
+is B0-instrumented `9581b53c`, not the bare commit. The same instrumentation is applied to the
+candidate so both sides are measured identically.
+
+### 9.2 Matched operations
+
+| Operation | Command / driver | Sample rule |
+| --- | --- | --- |
+| Startup to first frame | `bench --ops --json` `startupToFirstFrame`; native log "first frame drawn" | ≥20 fresh processes per source/lock; same large project, fonts, window 1680×1020 |
+| Steady workspace frame | `workspaceFrame` | ≥10 warmups, ≥30 timed iterations per session, 3 sessions |
+| Timeline scroll / open rows | `timelineScrollFrame`, `timelineOpenFrame` | 5,000 layers, every 10th open; ≥30 iterations |
+| Project panel scroll | `projectPanelFrame` | all folders open; ≥30 iterations |
+| Menu open / dock resize / typing | new `menuOpenFrame`, `dockResizeFrame`, `textTypingFrame` | fixed input scripts; ≥30 iterations |
+| Frame distributions | scripted workspace/timeline/typing loop or native playback | **≥1,000 actual final paint passes per row**; record discarded passes and dropped frames; p50/p95/p99 only with ≥1,000 |
+| Logic-only tick | new `logicOnlyTick` | 1,000 `run_logic` ticks, idle queues; asserts no paint work |
+| Idle repaint rate | new `idleRepaints60s` using `Context::set_repaint_observer` | virtual 60 s; count causes |
+| Playback | native preview long enough for ≥1,000 presented frames (e.g. 20 s at 60 fps, or repeated 10 s segments with a fresh start) | actual pass count, dropped frames, audio clock; `ui.inspect.fps` is a smoothed readout, not a distribution |
+| Texture uploads | bytes/frame from `textures_delta` | viewer frame and thumbnails |
+| Allocations | counting allocator totals per op | optional but recorded |
+| Font startup (`#8512`) | cold start with system-font provider off; record font discovery/install/load | ≥20 fresh processes; part of startup evidence |
+| WASM size | `cargo xtask wasm` artifact | raw and gzip/brotli sizes, baseline vs candidate; accept a budget or make emoji fonts native-only |
+| Engine control | `cargo xtask bench --quick --repeat 5` | guards accidental engine/render drift |
+| GPU vs software | same UI ops with llvmpipe/software GL and a required hardware adapter where present; Windows Basic Render Driver separately | separate tables, never merged |
+
+### 9.3 Environment and protocol
+
+Record: CPU/GPU model, RAM, OS, driver, display scale, window size, renderer backend, release
+profile, exact commit/SHA/lock/craft-ui/egui/winit revisions, font set, fixture project SHA, and
+load average. Every row uses **≥10 warmups** and **≥30 timed iterations** for steady operations,
+**≥20 fresh processes** for startup, and **≥1,000 actual final paint passes** for a frame
+distribution. Report the exact frame counts, discarded passes, dropped frames, audio underruns, raw
+samples, median/p50, p95 and p99; do not report a p99 from 30/90 samples. Measure peak RSS
+(`/usr/bin/time -v` or `-l`) and idle CPU (60 s); use `perf stat -e instructions:u,cycles:u` where
+available. Use `cpu_time`/instructions and wall time; on a shared host, wall time is secondary.
+Software renderers and physical GPUs are separate tables.
+
+Predefined thresholds (owner sign-off required to widen):
+
+- steady/scroll/project/typing median ≤ +5%, p95 ≤ +10%;
+- startup median ≤ +5%, p95 ≤ +10%, using the shared small-operation noise floor;
+- logic-only tick median ≤ 0.5 ms and p99 ≤ 2 ms on the large project (no paint work);
+- idle repaint count ≤ baseline per minute; no new recurring repaint while idle;
+- texture upload bytes per steady frame ≤ +10%;
+- peak RSS ≤ +5%; record absolute MiB as well; no automatic absolute-size exemption;
+- engine render benchmark (`cargo xtask bench`) within its own noise band; no regression;
+- text tessellation (`#8731`) and DX12 startup (`#8736`) are reported as their own rows and must
+  meet the same median/p95 or be fixed/accepted explicitly.
+
+Noise policy: run the unchanged 0.36.2 build twice as a control. The first report must also run
+**stock egui 0.37.0** as the required upstream-equivalence measurement control (not a production
+pin), and report regressions only against these controls. If control spread prevents resolving the
+shared thresholds, report inconclusive and rerun under quieter conditions; never widen a threshold
+automatically. If a regression exceeds the gate, re-run paired 3× and profile;
+never update a golden or baseline to hide it. A changed pixel golden is a reported visual change
+with a reason, not a performance result. No performance number is claimed by this document; the
+thresholds are proposals to be validated by paired runs on recorded hardware.
+
+## 10. Staged implementation PRs
+
+Dependency DAG: `B0 → P1 → P2 → P3 → P4 → P5`. P1 waits for the complete reviewed/published
+storytold egui **P8** (E1–E21, P2b async W15P routing, P7 held-key pairing, P7b/E21b, P7c's
+selected `#8763`/`#8748` fixes and any justified `#8731`/`#8736` perf fix), the completed winit
+(W1–W27, W15P, W27 lifecycle), and craft-libs CL-1 and CL-2F after its DesignCraft/GridCraft
+pilots. P1 includes the compatible `IMEOutput` producer and all required fork API adaptations.
+There is no stock or intermediate-fork production stage. If a consumer already has an
+incompatible craft-ui/egui bump, it must be reconciled in this same atomic stage. P4 adds native
+language/platform evidence and optional language UI policy; reverting it never removes the P1
+compatibility adapter. P5 is measurement/docs only and requires final platform and performance
+acceptance.
+
+| Stage | Scope | Validation | Rollback |
+| --- | --- | --- | --- |
+| **B0** | Bench instrumentation only: samples/percentiles, final/discarded pass counters, logic-only tick, repaint observer, texture-byte counter, font-startup and WASM sizes, optional allocator; baseline run on B0-instrumented `9581b53c` (record patch SHA and lock) | `bench --ops --json` raw evidence; no behaviour change; gates | revert commit; baseline evidence retained |
+| **P1** | Final reviewed storytold dependency pins (complete egui P8: E1–E21 + P2b + P7 + P7b/E21b + P7c `#8763`/`#8748` + justified perf fixes; completed winit W1–W27 + W15P and W27 lifecycle fixes; craft-ui with CL-1 + CL-2F), including the viewer_text surrounding-text adapter and compatible `IMEOutput` literal, feature `clipboard`, `default_fonts` + `monochrome_emoji_fonts`; mechanical API migration (IDs, roles, `Ui::scope_id`, `Atom`/`IdSalt`, font bytes, `TextEdit::align`, `MouseWheelSource`, screenshot callback via the CL-2F slot, test `Event`s); **actual strict kittest accessibility names and glyph fixes** until all tests pass with `check_accessibility: true` and missing-glyph `Panic`, with `allow_missing_glyphs` only on the two named script tests. No `with_accessibility_check(false)` anywhere. | `cargo xtask ci`; `cargo check/test --locked`; `cargo tree -d`; one-family/one-winit and wasm-target checks; all tests compile and pass | revert P1: restores the 0.36.2 lock; no data changes |
+| **P2** | Lifecycle: `tick`/`draw` split, injected app clock, focus, polls/playback/audio/project and workspace-layout autosave/events in tick, hidden `RequestPaintWhileHidden` (including queued screenshots, settling and playback/child viewports), synthetic-input generation guard, input-waiter ordering after draw, close guard, screenshot scheduling ownership | §8.3 tests; native hidden/minimized manual check; benchmark logic-only/idle | revert P2: returns work to `ui`; behaviour-only, no data |
+| **P3** | Accessibility completion (custom roles/names), glyph coverage, extended light/dark × 1.0/2.0 visual harness, geometry/pixel tests, style/visual adjustments if the tests show unintended movement | §8.4 tests, `cargo xtask assets` (only if PNG goldens), a required-adapter `ui_gpu.rs` run | revert P3: tests and names only (except any visual fix, which is isolated) |
+| **P4** | Extended language/platform qualification: `set_language`/`set_ui_language` policy where applicable, RTL UI-label tests, PRIMARY native capability matrix, clipboard/non-Latin shortcut and native IME rows. E21b/`IMEOutput` compatibility is already part of P1. | fork-required tests and native matrix using the same coherent dependency unit | revert P4 policy/test additions; retain P1 final pins and required adapters |
+| **P5** | Performance acceptance and re-measurement of the unchanged P1 dependency unit (no new fork commit), docs (`docs/architecture.md:359` still says 0.36.2; `docs/control-protocol.md` screenshots; `docs/testing.md` UI perf), final evidence. Any `#8731`/`#8736` fix must already be in the reviewed P8 pin from P1. | paired benchmark report with raw samples, frame counts, thresholds, stock-0.37 control, platform rows, unresolved gates | revert P5: docs/report only; no dependency or state change |
+
+Each stage is a separate reviewable PR with its own exact source/lock identity, validation log and
+screenshots. No stage pushes, opens a PR or publishes without fresh human approval of the exact
+content and validation.
+
+Compatibility checks after P1 and each later stage:
+
+```sh
+cargo tree -d
+cargo tree -i egui@0.37.0
+cargo tree -i winit@0.30.13
+cargo tree -i wasm-bindgen --target wasm32-unknown-unknown
+cargo check --locked
+cargo test --locked
+git grep -n 'path *= *"/' -- Cargo.toml crates apps   # must be empty
+git grep -n 'branch *=' -- Cargo.toml                 # must be empty in publication
+git grep -n 'aiongg' -- Cargo.toml Cargo.lock         # must be empty in publication
+git grep -n 'with_accessibility_check(false)' -- crates apps # must be empty
+```
+
+## 11. Blocking unknowns and decisions
+
+1. **Final storytold egui/winit SHAs.** The candidate `aiongg` revisions are comparison inputs only.
+   Production waits for the approved, published implementation: a storytold egui **P8** SHA with
+   E1–E21 + P2b + P7 + P7b/E21b + P7c's selected `#8763`/`#8748` fixes + any justified
+   `#8731`/`#8736` fix, and a completed storytold winit SHA with W1–W27 + W15P and the W27
+   lifecycle fixes. Both must be reachable, immutable and fetchable with `--locked`.
+2. **craft-libs PR 199 base.** The implementation starts from merged PR 199 at
+   `3832c47ef68a0e6214f2c1e85f3526b6adcb686e`; historical `8614e4a`/`1764bca` on old `main`
+   `4919088` and the stale `b68de8c`/`ec8840a` trees must not be merged. The final immutable
+   craft-ui revision must keep registry `egui 0.37` and include CL-1 plus CL-2F.
+3. **CL-2F.** EffectCraft requires the approved craft-ui slot helper at the CL-2F freeze in the
+   same atomic stage as P1; only the Design/Grid pilots use the provisional CL-2 revision. If
+   CL-2F slips, P1 cannot claim screenshot completion done; no app-local channel or unbounded
+   queue is an acceptable substitute.
+4. **E21b/P7b coordination.** The egui `IMEOutput` payload and the egui-winit W27 adapter must land
+   atomically with the custom-editor adapters; the stock/fork `IMEOutput` shape cannot be mixed.
+5. **`#8731` fix availability.** If text tessellation regresses over threshold, the fix belongs in
+   the reviewed P8 revision before P1 (with provenance/test) or the migration is blocked; P5 cannot
+   change the pin.
+6. **`#8736` Windows startup cost.** Measure before P1; include the fix in P8 or record an explicit
+   owner acceptance. P5 re-reports it.
+7. **`monochrome_emoji_fonts` / `system_fonts` / WASM size.** The plan requires
+   `monochrome_emoji_fonts` to preserve `✔`/`▣` and 0.36 parity. Measure the web raw/compressed
+   size; accept a budget or add a native-only emoji-fonts feature. Enabling colour emoji via
+   `system_fonts` is a separate decision with startup (`#8512`) and determinism costs.
+8. **Pixel golden storage.** Committed PNGs require `.attribution` sidecars and `ATTRIBUTION.md`
+   rows under the repository asset rule; if maintainers reject committed screenshots, use the
+   hash-based tolerant comparison instead. Both need the same tolerance policy and the exact
+   light/dark × 1.0/2.0 set.
+9. **macOS evidence.** No macOS hardware is available to this task; the macOS gate (IME/NSRange,
+   Command keys, title bar, hidden screenshots) remains unresolved until real evidence exists.
+10. **Windows evidence.** Requires a `craft-windows` clone and the task workflow; the Basic Render
+    Driver is software and cannot stand in for a real GPU result.
+11. **Linux Wayland/PRIMARY and physical GPU.** The planning host has no display session (only an
+    i915 render node), so a headless wgpu adapter run is possible but Wayland/PRIMARY/real
+    presentation need a managed environment. Xvfb + WM + IME qualifies only the X11 parts.
+12. **Accessibility workload.** The exact number of unnamed inputs is unknown until the suite runs;
+    the known stock set is 39 `TextEdit` and 51 `DragValue`/`Slider` sites plus custom widgets that
+    gain roles. P1 fixes what strict checks report; there is no global or per-builder opt-out, and
+    P3 completes the custom-control coverage.
+13. **Atomic compatibility boundary.** P1 uses the complete reviewed dependency unit and its
+    required IME/screenshot adapters. No intermediate base pin is needed. Independent stock-0.37
+    controls use a bounded test adapter and are never a production handoff. Extended language
+    policy/qualification in P4 cannot undo required P1 API compatibility.
+
+## 12. Limitations of this planning task
+
+- No build, test, clippy, GUI, browser or benchmark was run. Compiler inventories are read from the
+  2026-10-22 audit (a historical fork revision, machine-local path patches, `ui-egui` lib/lib-test
+  only) and from source inspection; integration tests and the app/web crates will reveal additional
+  errors.
+- The environment record reports no `DISPLAY`, no `WAYLAND_DISPLAY` and `XDG_SESSION_TYPE=tty`, but
+  an i915 render node is present (`/dev/dri/renderD128` readable/writable). This supports a
+  headless wgpu adapter run only; it does not qualify native presentation, Wayland, PRIMARY or
+  physical-GPU performance.
+- The cmap/glyph findings are a read-only inspection of the bundled font files, not a rendered
+  proof; the implementation must run the coverage test.
+- Upstream issue claims (`#8731`, `#8736`, `#8763`, `#8748`, `#8631`, `#8512`, `#8428`, `#8657`,
+  `#8577`) are reported by upstream authors, not measured here; the linked evidence file
+  (`/home/codex/work/ssd2/task-evidence/egui037-migration-20261022/upstream-discussions.json`)
+  records the snapshots. `#8764` is open/unmerged (`upstream-8764-fresh.json`), a proposal only.
+- No performance number is claimed. The thresholds above are proposals to be validated by paired
+  runs on recorded hardware.
+- Windows and macOS behaviour, IME, native focus, file pickers and real-GPU presentation are not
+  qualified by headless kittest and remain explicit gates.
+- Reviewer dispositions: the review's findings on workspace version 1, the visual-harness
+  coverage, the absent shared `with_accessibility_check` switch, the incomplete PRIMARY matrix,
+  child-viewport freezing while hidden, the performance sample counts, the `ppm` capture point,
+  dependency/lock gates, skipping `ui_gpu.rs`, and the `Id::new` grep/occurrence counts were adopted
+  and are fixed above. Two review suggestions were corrected rather than adopted: `RawInput::time`
+  cannot supply a logic-only clock (`run_logic` discards it; an app-owned injected clock is
+  required), and freezing the admission-time DPI is wrong when the frame is captured later (the
+  issued geometry + geometry epoch are bound to the image, and the returned dimensions supply the
+  pixel scale). The v2 review's hidden-input accumulation, P7c/CL-2F dependency, baseline-identity,
+  E21b state/serial, W27/W25 gate, accessibility-builder and anchor findings are fixed in place
+  above. The review's blanket
+  claim that hidden browser logic cannot run is also corrected: eframe 0.37 already falls back to
+  `setTimeout` for hidden tabs; the realistic gate is the browser's clamped cadence, not a new
+  worker feature. The review's Linux "no display means no X11 evidence" is narrowed to the parts
+  that genuinely need a real compositor/physical GPU; Xvfb + WM + IME can qualify X11 focus,
+  clipboard/PRIMARY and X11 IME behaviour.
+- The pinned fork, winit, craft-libs and PR 199 can move before implementation; every plan stage
+  records the exact SHAs it was reviewed against.
+
+
+## Local implementation update — 2026-10-23
+
+The user clarified that reviewed plans remain local and implementation proceeds before publication. The earlier requirement to publish/land this plan first is superseded; pushes and PR publication still require explicit approval.
+
+Canonical `storytold/effectcraft` `main` now resolves to `f6ef1a790625657259f449f3f4f0773d7df449bb`. The owned checkout was fast-forwarded to this revision. Earlier baseline SHAs and line anchors above are retained as historical review evidence; use this new revision and its exact lockfile for current-main integration and paired measurements. The original refs remain reachable.
+
+Preserve queue4096/click1–512/drag<=2048 validation and refusal-without-mutation test; these limits differ from FilmCraft. Preserve chrono feature split.
+
+The complete static delta review and exact old/new object identities are retained in the task evidence: `canonical-diffs-refresh-20261023.json` and `overnight-consumer-review-20261023.md`. This amendment claims no new build, native GUI or performance acceptance.
+
+## Local implementation stage 1 — 2026-10-23
+
+Implemented in the owned worktree only: no commit, push, PR, release or publication; no build,
+test, fmt, clippy or `cargo metadata` was run (the parent runs managed `task.py` validation and
+generates the lockfile). Local dependency redirects are the parent's (unpublished) worktrees.
+
+**Compatibility surface**
+
+- `egui`/`eframe`/`egui_kittest` moved to `0.37` with explicit
+  `egui` features `default_fonts` + `monochrome_emoji_fonts` and `eframe/clipboard` on the UI
+  crate and desktop app. The `craft-ui` revision is unchanged (the 0.36-era pin) with a TODO:
+  the reviewed CL-1 + CL-2F revision is the parent's to supply; no remote revision was invented.
+- `Id::new`→`Id::unique` everywhere (603 occurrences); `Ui::id`→`Ui::scope_id`;
+  `UiStack.id`→`UiStack.scope_id`; `WidgetType`→`egui::Role` (ColorButton→ColorWell,
+  SelectableLabel→Button with `selected`, Other→Unknown/TreeItem); `AtomLayoutResponse`→
+  `WidgetAtomResponse` with an `IdSalt` swatch id; `FontData` comparison through `bytes()`;
+  `TextEdit::vertical_align`→`align(Align2::LEFT_CENTER)`; `Event::MouseWheel` gained
+  `source: MouseWheelSource::Wheel` in the control channel and every test.
+- Screenshots replaced `UserData`/`Event::Screenshot` token scanning with
+  `craft_ui::capture::CaptureSlot`: 4 outstanding requests, 128 MiB per image and 256 MiB
+  aggregate reservations from checked geometry, issuance only after 3 settled non-discarded
+  passes plus 0.35 s, geometry-epoch binding (window position excluded), stale-epoch retry and
+  rejection, deadlines, cancellation and late-callback release. The callback holds only the weak
+  slot; files and replies are written in the tick.
+- The covered/minimized refusal in `ui.screenshot` is intentionally still present: removing it
+  needs a native platform run showing a pending screenshot forces a hidden paint.
+
+**Lifecycle**
+
+- `EffectcraftApp::tick` (all eframe logic callbacks, including hidden logic-only ones): engine and
+  background queues, script tasks, engine events, native command inbox, close guard, window title,
+  project auto-save, workspace-layout auto-save, memory watch/home-on-open, playback + audio,
+  control channel, screenshot completion/issuance, and `RequestPaintWhileHidden` when a UI pass is
+  needed. `EffectcraftApp::draw` (the root `Ui`): language/theme/font setup (the existing two-pass
+  font warm-up), input-driven shortcuts, layout, panels, dialogs, dropped files, Video Preview,
+  workspace-state observation, plus the pass geometry/epoch and the `AfterInput` acknowledgement on
+  the final non-discarded pass.
+- `AppClock` ( `web_time::Instant`, injectable manual clock) replaces every wall-clock or
+  `ctx.input(|i| i.time)` use in the tick (auto-save, watch folder, footage reload, playback,
+  control deadlines, screenshot deadlines, toast timestamps). `panels/viewer` now records its
+  drawn scale and playback advances in the tick.
+- One pending synthetic batch: `feed_synthetic` refuses a second batch until a UI pass applied the
+  first (`mark_synthetic_applied`), a font-gated pass requeues the batch instead of dropping it,
+  and `raw_input_hook` keeps the control provenance across hidden iterations.
+- Web: dropped files are read in `raw_input_hook`; the persist snapshot uses the app clock.
+  `RequestPaintWhileHidden` is sent on native only — the shared web fork does not carry it, so
+  hidden web input/screenshots remain unqualified.
+- IME: the custom viewer editor handles `ImeEvent::DeleteSurrounding` (characters) and
+  `DeleteSurroundingBytes` (UTF-8 bytes, converted at char boundaries through `TextDoc`), grouped
+  with the following `Commit` under one typing/undo key. Outgoing surrounding text (E21b/W27) is
+  recorded as the next step at the single `IMEOutput` producer; no empty placeholder was invented.
+
+**Tests added (not run here)**
+
+- `lib.rs::lifecycle_tests`: logic-only tick records no fonts/geometry; a control command completes
+  without a pass; one pending synthetic batch across repeated hidden hooks with a font-gated
+  requeue and exactly one reply; geometry epoch ignores window movement and tracks resize/back;
+  hidden playback advances and stops at the plan's end; workspace-layout auto-save writes on a
+  hidden tick; a hidden close request opens the guard and sends `CancelClose`; screenshot
+  issuance/settlement, resize retry, admission bounds + timeout release, and late-callback
+  no-write/no-second-reply.
+- `panels/viewer_text.rs` tests: byte-count IME deletion around an emoji, character-count deletion
+  over a selection with clamping, and no-op cases.
+- `theme.rs` glyph test extended to the full drawn chrome set; `ui_effect_names`/`ui_presets_folder`
+  opt out of the missing-glyph panic only for their CJK/Japanese fixtures.
+
+**Known remaining gates**
+
+- Parent must generate `Cargo.lock`, supply the local patch config and the reviewed craft-ui
+  revision, then run the repository gates. Strict kittest accessibility is still on: stock
+  `TextEdit`/`DragValue`/`Slider` fields without a label or hint will be reported (no global or
+  per-builder opt-out was added).
+- `ui_gpu`/native GUI, hidden-window screenshots (the refusal above), Wayland/X11 IME and PRIMARY,
+  Windows/macOS rows, and every performance row remain unmeasured here.
diff --git a/docs/fidelity/workflow-checks.md b/docs/fidelity/workflow-checks.md
index 4bea37ee1..613d68786 100644
--- a/docs/fidelity/workflow-checks.md
+++ b/docs/fidelity/workflow-checks.md
@@ -4,7 +4,7 @@ These checks use original compositions and public interaction behavior. No Adobe
 implementation code are included. Adobe's [selection documentation](https://helpx.adobe.com/after-effects/desktop/work-with-layers/select-and-arrange-layers/selecting-arranging-layers.html)
 describes Timeline range selection and Composition Shift-click/Shift-marquee selection.
 
-`crates/ui-egui/tests/ui_workflow_selection.rs` exercises actual pointer and keyboard events:
+`crates/ui-egui/tests/it/ui_workflow_selection.rs` exercises actual pointer and keyboard events:
 
 - Timeline Shift-click selects the visible range, skipping locked layers; Ctrl/Command-click toggles a layer.
 - A drag beginning in the empty Timeline outline selects the intersected layer rows without reordering them.
diff --git a/docs/footage.md b/docs/footage.md
index 4a5a498c7..bd99cbeb2 100644
--- a/docs/footage.md
+++ b/docs/footage.md
@@ -70,6 +70,16 @@ next to it.
 Agents: `file.importProject {"path": "/projects/titles.ecproj"}` returns the comps, the root comps,
 `primaryComp` (the only root comp, if there is one) and any missing media.
 
+## Finding a layer's source in the Project panel
+
+Right-click a layer in the Timeline or Composition panel and choose **Reveal Layer Source in
+Project** (also Layer ▸ Reveal ▸ Reveal Layer Source in Project). The Project panel opens, its
+search is cleared, the folders holding the source open, and the source item is selected.
+
+Layers whose image is generated inside the composition — text, shape, null, camera, light and
+3D primitive layers — have no Project item, so the command is not offered for them. Adjustment
+layers do have one: the solid that backs them.
+
 ## Interpret Footage
 
 Select a footage item in the Project panel and choose **File ▸ Interpret Footage ▸ Main…**
@@ -107,6 +117,18 @@ vectors, positions and IDs are never the picture. EXtractoR reads every other la
 
 ## Replacing and reloading
 
+Importing a layered file as a composition refreshes the decoded sources used by its layers,
+including files overwritten at the same path and byte size.
+
+- **Replace a layer's source** without rebuilding the layer: Alt-drag (Option-drag on macOS) a
+  footage item, composition or solid from the Project panel onto a layer in the Timeline. The
+  layer keeps its name, timing, transforms, keyframes, expressions, effects, masks, switches,
+  parenting and track matte; only its source changes. A source with audio adds Audio properties
+  when the layer has none. To replace several selected layers with the selected Project item, press
+  Ctrl+Alt+/ (Cmd+Opt+/). Compositions, footage and solids are interchangeable; folders, data files
+  and 3D models are not sources, and a composition can't be nested in itself. Alt-dragging onto a
+  layer is one layer at a time, as in After Effects.
+  Agents: `layer.replaceSource {"item": id, "layers": [ids]}`.
 - **File ▸ Replace Footage ▸ File…** (Ctrl+H) points the item at another file. Pick a numbered
   file to replace it with that file's whole sequence (`file.replaceFootage {"path": …,
   "sequence": false}` for one frame).
@@ -126,7 +148,8 @@ vectors, positions and IDs are never the picture. EXtractoR reads every other la
   File ▸ Open tries each missing file at the same place under the project's new folder, without
   marking the project modified.
 - **File ▸ Reload Footage** (Ctrl+Alt+L) reads the files again. A sequence picks up frames
-  added to its folder (a render still in progress) and keeps its interpretation.
+  added to its folder (a render still in progress) and keeps its interpretation; a still is
+  read as its one file, even when numbered files sit next to it.
 
 **File ▸ Dependencies ▸ Relink Missing Footage…** searches a chosen folder and its subfolders
 for missing source files on the desktop. It relinks unique exact filenames whose decoded type,
diff --git a/docs/gaps.md b/docs/gaps.md
index a20e779cd..3f59b1f99 100644
--- a/docs/gaps.md
+++ b/docs/gaps.md
@@ -1,6 +1,6 @@
 # Where EffectCraft falls short
 
-> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (issue, PR and catalog references gap 21: percentage guides and effect colour labels in; earlier change: re-audited against `upstream/main` 470ea7a3; ranked gap list from the 10 October re-measure otherwise unchanged) · **Target:** Adobe After Effects 2026 (26.5.0.89)
+> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-13 · **Change:** minor (path-editing layer bounds, #1220; issue, PR and catalog references gap 21: percentage guides and effect colour labels in; earlier change: re-audited against `upstream/main` 470ea7a3; ranked gap list from the 10 October re-measure otherwise unchanged) · **Target:** Adobe After Effects 2026 (26.5.0.89)
 
 An honest assessment of how far EffectCraft is from being a real replacement for After Effects,
 and the work that closes the gap. This document is meant for contributors and agents choosing
@@ -64,7 +64,7 @@ are grouped by area; the issue tracker has the rest.
 | 5 | **Playback and scrubbing feel** | #595 stutter on cached frames (partly addressed: nearest-first RAM preview prefetch, cache bars at 1/3 resolution), #304, #504 / #335 audio late or crackling, #586 puppet lag (maintainers asked for details); #329 slow scrubbing (#784) and #554 closed | Preview is where motion designers spend their day | 25–50 h | G5 · [hardware-parity.md](hardware-parity.md) |
 | 6 | **Linux and Windows interaction bugs** | Open: #488 rename arrows (hardening landed, reporter asked for details), #492 anchor drag, #268 file drops on Wayland (winit), #613 Direct3D 12 compositor. Now closed: #491, #493, #467, #320, #302, #596 | Many reports come from Linux; some Windows GPUs fail to start the compositor | 25–45 h | G2 · [ui-parity.md](ui-parity.md) |
 | 7 | **Animation presets: 54 against 621** | After Effects ships 621 `.ffx` presets (Behaviors, Backgrounds, Shapes, Synthetics, Text, Transitions…); we ship 54 original presets (8 text-animator; 23 Transitions: wipes, clock and fan reveals, blinds, dissolves, card flips, CC wipes, fades, #757; 23 Backgrounds: drifting gradients, fog, cloud and smoke, plasma and magma, cells, hexagons, scrolling grids and checks, pulse rings, bokeh, light sweep, #1096, driven by expressions so they keep moving, not seamless loops) and read only our `.ecpreset`. Missing: Behaviors, Shapes, Synthetics, Image and more Text | Presets are how many designers start; tutorials assume them | 15–35 h (original presets; `.ffx` reading is out of clean-room scope) | G8 · [effects-parity.md](effects-parity.md) |
-| 8 | **Mask and shape bugs** | Open: #1004 mask vertex multi-select, #999 auto-pan, #1042 / #1033 vertex nodes under the bounding box, #932 Convert to Bezier Path, #959 / #960 shape group toggles and operators. Now closed: #510, #513, #527, #509, #303, #553 | Masks are core compositing | 10–20 h | G2 · [target-app-parity.md](target-app-parity.md) |
+| 8 | **Mask and shape bugs** | Open: #1004 mask vertex multi-select, #999 auto-pan, #1042 / #1033 vertex nodes under the bounding box, #959 / #960 shape group toggles and operators. Now closed: #510, #513, #527, #509, #303, #553, #932 (Convert To Bezier Path on a shape layer's parametric path) | Masks are core compositing | 10–20 h | G2 · [target-app-parity.md](target-app-parity.md) |
 | 9 | **Effect behaviour bugs** | #580, #463 Curl Noise, #369 Motion Tile output size, #943 Turbulent Displace Evolution, #473 Cryptomatte selection (quoted names with commas fixed, 3b7f1ace; UI and GPU time open), #474 multi-layer EXR (decode shared, faffad3a; f16 storage and cache sizing open). Closed: #526, #514, #533–#536 | Each one breaks a look someone built | 10–20 h | G1/G2 · [effects-parity.md](effects-parity.md) |
 | 10 | **Colour pipeline differences** | #340 ProRes 4444 tagged bt709 but sRGB-encoded (open); ACES 2.0 / OCIO 2.5 configs (26.5) missing; now closed: #494 32-bpc blend modes, #495 and #750 Working Gamma 2.4, #546 / #547 viewer colour | Wrong colour in delivery is a client-visible failure | 15–30 h | G1 · [file-format-parity.md](file-format-parity.md) |
 | 11 | **Text rendering and layout** | Open: #453 CJK text in comps, #316 paragraph alignment inverted (maintainers' tests show Left/Right correct; asked for a project), #417 soft at Fit (mostly fixed by #444), #550 toolbar font options. Closed: #483, #583 | Text is in almost every motion graphic | 10–20 h | G2 · [ui-parity.md](ui-parity.md) |
@@ -72,11 +72,11 @@ are grouped by area; the issue tracker has the rest.
 | 13 | **3D model formats and materials** | After Effects 26 imports FBX, USD/USDZ, STL besides glTF and OBJ (`usd_plugins`), and Substance 3D materials with mesh displacement (26.0–26.2); we read glTF, OBJ, STL (binary and ASCII, with facet colours) and FBX 7.x (binary and ASCII: meshes, hierarchy, Lambert/Phong materials and textures; no FBX animation or skinning yet) | Product shots and 3D scenes come as FBX/USDZ | 25–45 h | — · [file-format-parity.md](file-format-parity.md) |
 | 14 | **Object Matte** (26.2, disk cache in 26.5) | First slice (#783): the Object Matte effect (Effect ▸ Matte) and `objectMatte.apply` turn a point (and optional box) on a reference frame into a matte and follow the object up to 600 frames each way, or segment every frame on its own; Roto Brush's engine, cache and model (MobileSAM from Settings ▸ Roto Brush, classical graph cut without it). Since then: the Object Matte tool in the viewer (click / drag a box, hover crosshair), the box as the model's box prompt, background tracking with progress and cancel, Freeze, and segmentations kept in the disk cache (26.5). Missing: a comparison with After Effects ([plan](fidelity/object-matte.md)) | The new one-click roto | 10–20 h | G7 · [target-app-parity.md](target-app-parity.md) |
 | 15 | **Hardware video decode and encode** | No VideoToolbox, NVENC, Quick Sync or VA-API; #498 asks for it (answered: CUDA / NVENC need Nvidia's proprietary SDK through FFI, which the no-`unsafe` rule forbids); open PR #819 adds hardware decoding via `filmcraft-platform`; FilmCraft has VideoToolbox / NVENC / VA-API paths to borrow | 4K playback and export speed | 25–45 h | G5/G6 · [hardware-parity.md](hardware-parity.md) |
-| 16 | **Localization depth** | Menus in 10 languages (ja, zh-hans, zh-hant, uk, es, pt-br, ru, fr, de, cs: 624 rows each); panels in 6 (ja, zh-hans, zh-hant, uk, pt-br, cs); effect names translated in Simplified Chinese (306, plus the generated Effect menu), their ~1,650 parameter names untranslated; Korean and Italian (After Effects ships them) absent; Hangul probe added (#599 closed) | After Effects is used heavily in Japan, China, Korea, Brazil, Europe | 60–110 h + native review | G9 · [localization-parity.md](localization-parity.md) |
+| 16 | **Localization depth** | Menus in 11 languages (ja, zh-hans, zh-hant, uk, es, pt-br, ru, fr, de, cs, ka: 628 rows each); panels in 7 (ja, zh-hans, zh-hant, uk, pt-br, cs, ka); effect names translated in Simplified Chinese and Georgian (307, plus the generated Effect menu), their ~1,650 parameter names untranslated; Korean and Italian (After Effects ships them) absent; Hangul probe added (#599 closed) | After Effects is used heavily in Japan, China, Korea, Brazil, Europe | 60–110 h + native review | G9 · [localization-parity.md](localization-parity.md) |
 | 17 | **Media Browser lists files import refuses** | `media_browser.rs` lists AVI; `media::is_importable` has none of them (Targa and Radiance HDR import since #745; DPX and Cineon since #756, log shown as stored: no Cineon Settings conversion yet; MXF OP1a / OP-Atom since #767; FilmCraft has no AVI demuxer); #431 and #324 closed | Confusing failures on common VFX formats | 15–30 h | G6 · [file-format-parity.md](file-format-parity.md) |
 | 18 | **Relative paths and relinking** | Projects store absolute footage paths; no relink when a project moves | Moving or sharing a project breaks it | 6–12 h | G4 · [file-format-parity.md](file-format-parity.md) |
 | 19 | **Plug-in ecosystem** | No After Effects SDK hosting (#600, #327 OpenFX, #334, #376 plug-in manager); our WebAssembly API has no third-party plug-ins | Many pro projects depend on Trapcode, Element, Saber… | 40–80 h for API growth; SDK hosting needs an owner decision | G8 · [scripting-parity.md](scripting-parity.md) |
-| 20 | **Multi-monitor and video output** | #486: any panel can move into a native window of its own (panel menu ▸ Move Panel to New Window, `window.panelWindow`) and so onto another screen, restored with the workspace; still missing: dragging tabs between those windows, app shortcuts while one has the focus, named workspaces remembering them, Mercury Transmit to video hardware (we have a second preview window only) | Two-screen setups are standard for professionals | 10–20 h | G2 · [hardware-parity.md](hardware-parity.md) |
+| 20 | **Multi-monitor and video output** | #486: on Windows, macOS and X11 every floating panel is an OS window of its own (Undock Panel, a drag out of the main window, panel menu ▸ Move Panel to New Window, `window.panelWindow`) and so can go onto another screen (on Wayland, the web and in embedded viewports floating panels stay in the app window, since Wayland reports no window positions); tabs and groups drag between windows, shortcuts work in them, and the current and named workspaces restore their places; still missing: Mercury Transmit to video hardware (we have a second preview window only) | Two-screen setups are standard for professionals | 10–20 h | G2 · [hardware-parity.md](hardware-parity.md) |
 | 21 | **Small 26.x features** | Proportional Scrubbing (26.2), pasting Illustrator's own clipboard data as shapes (26.3; SVG markup on the clipboard pastes as a shape layer, #738), variable-font filter (26.3), the rebuilt Effect Controls (26.5). Percentage guides (View ▸ Add Percentage Guide, Convert Guides to Percentage / Pixels) and effect colour labels (Effect Controls header bar and right-click Label menu, `effect.setLabel`) are in (#1095), built from the release notes' one-line descriptions and never compared with After Effects: the Timeline's effect rows wear the label as a colour bar on the left edge (#1509), but After Effects' exact UI there is unknown | Users of the current version expect them | 10–20 h left | — · [ui-parity.md](ui-parity.md) |
 | 22 | **Encoder efficiency** | HEVC / AV1 have no B-frames, multi-reference or SAO / CDEF; Opus no FEC / DTX; single-file intermediates are 8-bit uncompressed QuickTime only (#372 closed by #778: no 16-bpc, AVI or lossless-compressed codec); #325 render over existing file | Larger files than After Effects + Media Encoder | 20–40 h | G6 · [file-format-parity.md](file-format-parity.md) |
 | 23 | **Essential Graphics interchange** | Templates are `.ectemplate`, not `.mogrt`; #338 and #611 closed | Premiere editors can't use our templates | 15–30 h | — · [file-format-parity.md](file-format-parity.md) |
@@ -114,6 +114,9 @@ The most important missing piece: it turns every other estimate here into a meas
 - Run the headless snapshot and control-channel checks on Linux (X11 and Wayland) and Windows, not
   only macOS. Interactions that only fail with real input (docking drags, viewer pan, drag-and-drop
   import, inline rename) need scripted input tests.
+- Path editing (#1220): selected shape and mask paths suppress the layer transform box while
+  their points are edited. `ui_viewer` regressions cover Pen-family tools, Selection vertex
+  dragging and undo, restoration of layer controls, and layers without visible paths.
 - Regression evidence for [#66](https://github.com/storytold/effectcraft/issues/66): scripted
   pointer tests in `ui_viewer` and `ui_text_edit`, checked headlessly on Linux, cover viewer clicks,
   marquee selection and text picking when layers are hidden or excluded by solo. They also check
@@ -146,6 +149,15 @@ The most important missing piece: it turns every other estimate here into a meas
   tests, checked headlessly on Windows, drag a selected Gradient Fill's start and end points in
   the Composition viewer: one undo step, the layer stays, a point inside a moved and scaled group
   converts to the group's space, and the handles show only for a selected gradient.
+- Regression evidence for [#1011](https://github.com/storytold/effectcraft/issues/1011): the
+  `ui_text_range_handles` input tests, checked headlessly on macOS, drag a text Range Selector's
+  End bar in the Composition viewer: one undo step, Start and the layer stay, and on an animated
+  End a keyframe at the current time. The bars show only for a selected selector or a selected
+  animator (or a property in it), with the Selection tool and layer controls on. Unit tests in
+  `text` place the bars on unit boundaries (words and Characters Excluding Spaces skip spaces,
+  inside a ligature, on the second line, right to left) and invert them; `render` covers the
+  value a drag writes (less the Offset, whole units in Index). Not done: dragging Offset, bars on
+  vertical text and on text on a path.
 - Regression evidence for the toolbar's gradient swatches (#612, reported on Discord): the
   `ui_toolbar_gradient` input tests, checked headlessly on Windows, click a Linear Fill swatch and
   a Radial Stroke swatch on a selected shape layer and get the Gradient Editor on its Gradient Fill
@@ -301,8 +313,8 @@ Issues #41–#47 (all from the Linux AppImage 0.1.1, 5 October): panning the vie
 
 - Localisation of the interface ([localization-parity.md](localization-parity.md)): since 6–12
   October the menus are translated into Japanese, Simplified and Traditional Chinese, Ukrainian,
-  Spanish, Brazilian Portuguese, Russian, French, German and Czech, and the panel catalog covers
-  Japanese, both Chinese, Ukrainian, Brazilian Portuguese and Czech. Next: effect and parameter
+  Spanish, Brazilian Portuguese, Russian, French, German, Czech and Georgian, and the panel catalog covers
+  Japanese, both Chinese, Ukrainian, Brazilian Portuguese, Czech and Georgian. Next: effect and parameter
   names, the remaining panel strings (Spanish, Russian, French, German), Korean and Italian, and
   native-speaker review of all of them.
 - Accessibility (keyboard navigation, screen readers, contrast), user documentation and
@@ -323,6 +335,8 @@ Issues #41–#47 (all from the Linux AppImage 0.1.1, 5 October): panning the vie
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-16 | minor | Gap 8: #932 closed (Convert To Bezier Path converts a shape layer's parametric path, not only mask RotoBezier) |
+| 2026-10-13 | patch | G2: layer bounds no longer compete with editable shape/mask path points (#1220) |
 | 2026-10-12 | minor | Audited against `upstream/main` 470ea7a3: open-issue count and crash list, closed issues removed from rows 1, 3, 5, 6, 8–12, 15–17, 22–24, G8 and G9 (#759 `#include`), localization catalogs recounted (≈ 12% to ≈ 18%); rows 7, 14 and 21 left to open PRs #1102, #792 and #1098 |
 | 2026-10-10 | minor | Alpha gate checked: no alpha blockers |
 | 2026-10-12 | minor | Gap 21: percentage guides and effect colour labels added (#1095) |
diff --git a/docs/localization-parity.md b/docs/localization-parity.md
index 5606a857d..d642af43c 100644
--- a/docs/localization-parity.md
+++ b/docs/localization-parity.md
@@ -1,6 +1,6 @@
 # Localization parity
 
-> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (catalogs recounted at `upstream/main` 470ea7a3: menus in 10 languages, panels in 6, Hangul probe (#599)) · **Target:** Adobe After Effects 2026
+> **Last reviewed:** 2026-10-14 · **Last updated:** 2026-10-23 · **Change:** minor (Georgian: menus, panels and effect names; missing strings show in English; `missing_translations_report` lists them) · **Target:** Adobe After Effects 2026
 
 How much of EffectCraft's interface is translated, language by language, compared with After
 Effects. [gaps.md](gaps.md) gap 16 and workstream G9 hold the work;
@@ -17,16 +17,17 @@ interface; Arabic and Hebrew text *in layers* is supported through its Middle Ea
 ## How EffectCraft translates
 
 - **Menus:** `crates/ui-egui/src/i18n.rs`, one catalog per language keyed by
-  `(command, English label)`. A test (`every_translation_key_exists_in_the_actual_menu_tree`)
-  fails if any fixed menu entry is untranslated or a row is stale, so every catalog covers all
-  fixed entries (624 catalog rows each at 470ea7a3, counted). The generated Effect menu is not part of that fixed tree: its entries
+  `(command, English label)` (624 catalog rows each at 470ea7a3, counted). A test
+  (`menu_catalogs_have_no_stale_or_duplicate_rows`) fails on a row whose entry left the menu tree
+  or on a repeated row. The generated Effect menu is not part of that fixed tree: its entries
   and category submenus take their labels from the effect catalog below.
 - **Panels, dialogs, buttons, tooltips:** `crates/ui-egui/src/i18n/ui.rs`, keyed by the English
   source string, with English fallback. Catalogs exist for Japanese (410 rows), Simplified and
   Traditional Chinese (506 each), Ukrainian (505), Brazilian Portuguese (400) and Czech (501);
-  counted at 470ea7a3.
+  counted at 470ea7a3. Georgian has every row the Chinese catalogs have at this revision (695, as
+  both Chinese catalogs now have), plus 191 for panels converted to the catalog.
 - **Effect names:** `crates/ui-egui/src/i18n/effects.rs`, keyed by **effect id**, in Simplified
-  Chinese (306 rows, one per effect in the registry, plus its 21 categories). The registry's
+  Chinese and Georgian (307 rows, one per effect in the registry, plus its 21 categories). The registry's
   English name stays the effect's identity: `effect.list`, `effect.apply {"effect": …}`, scripts
   and expressions match on it, and the property tree stores it as the effect group's name. Only
   the drawing — the Effect menu, Effect Controls, the Timeline and Effects & Presets — goes
@@ -38,6 +39,12 @@ interface; Arabic and Hebrew text *in layers* is supported through its Middle Ea
   slot is for). Each language decides for itself which names stay English — Adobe's Japanese
   interface leaves the `CC`, `VR` and `OCIO` sets in English while its Chinese one translates
   them — so a row repeating the English name is a choice, not a missing row.
+- **Missing strings:** a string with no row in the interface language shows in English, and no
+  test, build or release fails on a missing translation. The `missing_translations_report` test
+  (`crates/ui-egui/src/i18n.rs`) prints, per language, the fixed menu entries, panel strings, effect
+  names and effect categories that have no row. It always passes; `cargo xtask ci` runs it with
+  `--nocapture`, so the list is in the gate log. Locally:
+  `cargo test -p effectcraft-ui-egui --lib missing_translations_report -- --nocapture`.
 - **Not translated anywhere yet:** effect *parameter* names (≈ 1,650, `crates/effects`),
   engine-generated text (property names, errors, undo labels), the Home screen's unwrapped
   literals (#574), Learn tutorials and documentation.
@@ -76,13 +83,14 @@ the true percentages are slightly lower.
 | Korean | `ko` | 0 | — | Hangul fallback probe added (#599, closed); not checked on macOS here | no | none | 9–13 h + review |
 | Vietnamese | `vi` | 0 | — | Latin with stacked diacritics; untested | no | none (After Effects: none) | 8–12 h + review |
 
-Other languages EffectCraft ships (3):
+Other languages EffectCraft ships (4):
 
 | Language | Code | UI strings translated | Status | To `full` |
 |---|---|---|---|---|
 | Traditional Chinese | `zh-hant` | 1,130 (≈ 29%): menus 624 rows, panels 506 | partial | 6–9 h + review |
 | Ukrainian | `uk` | 1,129 (≈ 29%): menus 624 rows, panels 505 | partial | 6–9 h + review |
 | Czech | `cs` | 1,125 (≈ 29%): menus 624 rows, panels 501 | Existing catalog entries covered; unwrapped UI, effects and engine text still in English; AI-assisted, not yet native-speaker proofread | Remaining strings + independent native review |
+| Georgian | `ka` | 1,514 (≈ 39%): menus 628 rows, panels 886 (the Chinese catalogs' 695 plus 191 Georgian-only rows: form dialogs, context menus, column headers), effect names 307 + 21 categories; native-speaker reviewed | partial | 5–8 h |
 
 Russian (`ru`) has a menu catalog (624 rows, ≈ 16%); After Effects also ships Italian, which EffectCraft does not (8–12 h).
 
@@ -97,13 +105,14 @@ needs ≈ 2,900 more strings (≈ 5–9 h per language at the pace of #398 and #
 Effects' 10 non-English languages: **≈ 60–110 h**; the four extra languages of the standard list
 (Hindi, Arabic, Indonesian, Vietnamese) add ≈ 50–80 h, most of it right-to-left layout and
 complex shaping in the interface. Every language needs native-speaker review, which only a human
-can give; none has had it.
+can give; only Georgian, contributed by a native speaker (#1843), has had it.
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
 | 2026-10-12 | minor | Recounted: Russian, French, German and Czech menus (#873, #987), Brazilian Portuguese and Czech panels (#830, #987), Hangul probe (#599); overall ≈ 12% to ≈ 18%; Korean and Italian still absent |
+| 2026-10-14 | minor | Georgian (`ka`): menus 628, panels 886 (191 Georgian-only, in `GEORGIAN_PANELS`), effect names and categories in `effects.rs` |
 | 2026-10-10 | major | First localization parity document: catalog rows counted for all six languages, the twelve-language table, After Effects' 11 shipped languages from its bundle |
 | 2026-10-11 | minor | Ukrainian panel catalog brought level with the Chinese ones (495 of 496 rows, counted at this commit); its share rises to ≈ 29%. The other languages' panel counts are the 10 October measurement |
 | 2026-10-13 | minor | Effect names and the generated Effect menu leave English: `i18n/effects.rs` adds 306 rows keyed by effect id (Simplified Chinese, from After Effects 2026's interface and Adobe's Chinese documentation for the `CC` series) and the 21 category names. Parameter names are still English; no other language has rows |
diff --git a/docs/plugins.md b/docs/plugins.md
index fc7c0b8ff..c070e3d98 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -14,6 +14,7 @@ Guide):
 | Effect plug-ins (C/C++ SDK, `.aex` / `.plugin`) | [Effect plug-ins](#effect-plug-ins): WebAssembly modules (plug-in API v1) or Rust; the `Plug-ins` folder next to the settings loads at start-up | Different ABI: After Effects SDK plug-ins can't run (G8) |
 | Scripts folder: its scripts are listed in File ▸ Scripts | `Scripts/` in the settings folder (File ▸ Scripts ▸ Install Script File… copies a script there), listed in File ▸ Scripts with the bundled samples | Same |
 | File ▸ Scripts ▸ Run Script File… (`.jsx`, `.jsxbin`) | `.jsx` / `.js` | Gap: `.jsxbin` (an undocumented binary encoding) |
+| File ▸ Scripts ▸ Recent Script Files: the 10 most recently run scripts; Cmd+Option+Shift+D (Ctrl+Alt+Shift+D on Windows) reruns one | File ▸ Scripts ▸ Recent Script Files lists the 10 scripts run last (script files and File ▸ Scripts entries, newest first, kept in the settings); Cmd+Alt+Shift+D runs the most recent one again (`file.runScript {"recent": 0}`, a key that can be changed in Edit ▸ Keyboard Shortcuts) | Same |
 | ExtendScript preprocessor directives (`#include`, `#target`, `#targetengine`) | `#include` / `//@include` / `#includepath` inline files relative to the script (once each, depth-limited, file gate applies); `#target`, `#targetengine`, `#strict` are ignored | Same |
 | `Scripts/Startup` and `Scripts/Shutdown`: run in alphabetical order when the app starts and quits | Not run | Gap |
 | `Scripts/ScriptUI Panels`: listed at the bottom of the Window menu, dockable like the app's own panels, `this` is the panel | `Scripts/ScriptUI Panels/` in the settings folder (File ▸ Scripts ▸ Install ScriptUI Panel… copies one there), listed at the bottom of the Window menu, docked like any panel, `this` is the panel; the panels open when the app quits open again at the next launch | Same. Where a panel was docked isn't kept: workspace layouts aren't saved between launches |
@@ -103,17 +104,24 @@ name in your Scripts folders takes their place.
 
 ### Ease Presets (`extensions/scriptui-panels/Ease Presets.jsx`)
 
-Window ▸ Ease Presets.jsx: easing curves kept by name and applied to pairs of neighbouring
-selected keyframes (#254; it was a core panel in v0.6.0). A curve is the out side of a segment's
+Window ▸ Ease Presets.jsx: easing curves kept by name and applied to the sides of selected
+keyframes (#254; it was a core panel in v0.6.0). A curve is the out side of a segment's
 first key and the in side of its second, in the Keyframe Velocity dialog's terms: influence in
 percent, and speed relative to the segment's average speed (1 = as fast as a straight line, 0 = at
 rest), so one curve fits any duration and change of value.
 
-* Click a preset to apply it to every pair of neighbouring selected keyframes of each selected
-  property, in one undo step (per dimension, and along the motion path for spatial properties;
-  the keys' other sides keep playing as they did). The keys stay selected, so you can try another.
+* Click a preset to apply it to the selected keyframes of each selected property, in one undo
+  step. **Ease** chooses the sides (#1329): **In** eases each key's incoming side with the curve's
+  in side, **Out** its outgoing side with the curve's out side, **In-Out** (the default) both. A
+  side is eased when it has a neighbouring keyframe, selected or not (the neighbour doesn't
+  change), with its speeds scaled to the segment on that side: per dimension, and along the
+  motion path for spatial properties. So a single keyframe works, a selected pair gets the whole
+  curve, and the first and last keys ease the side that has a segment. The side not eased keeps
+  playing as it did (a Hold stays a Hold). Roving keyframes are skipped, and the status says how
+  many: they pass speed straight through, so an ease on one wouldn't play (turn off Roving to
+  ease it). The keys stay selected, so you can try another.
 * The drawing shows the working curve; type its numbers (Out % and Speed, In % and Speed) and
-  click Apply, or click From Keys to read the curve between the first selected pair.
+  click Apply, or click From Keys to read the curve between the first selected pair of neighbouring keys.
 * Save keeps the working curve under the typed name (replacing a preset of that name); Rename
   and Delete act on the selected preset of your own. The twelve built-in presets can't change.
 * User presets are kept with `app.settings` (section `Ease Presets`, key `userPresets`, in
diff --git a/docs/preferences.md b/docs/preferences.md
index 8b86528a1..ce96da0bf 100644
--- a/docs/preferences.md
+++ b/docs/preferences.md
@@ -30,7 +30,7 @@ Commands (CLI, MCP, control channel):
 
 ### Settings that change behaviour
 
-- `general.language`: interface language (`system` / `en` / `ja` / `zh-hans` / `zh-hant` / `uk` / `es` / `pt-br`), Settings ▸ General ▸ Language; menu labels change immediately. `system` (Match System, the default) follows the operating system's interface language where EffectCraft has a translation and is English otherwise: a Simplified Chinese locale (`zh`, `zh-CN`, `zh_CN.UTF-8`, `zh-Hans-CN`, `zh-SG`) selects `zh-hans`, a Traditional one (`zh-TW`, `zh-HK`, `zh-Hant`, `zh_MO`) selects `zh-hant`, a Ukrainian one (`uk`, `uk-UA`, `uk_UA.UTF-8`) selects `uk`, a Spanish one (`es`, `es-ES`, `es_MX.UTF-8`) selects `es`, a Portuguese one (`pt`, `pt-BR`, `pt_PT.UTF-8`) selects `pt-br`; the browser build stays in English with it. Choose **Español** or **Português (Brasil)** for Spanish or Brazilian Portuguese menus (panels stay in English for now); choose **Українська** for Ukrainian menus and cataloged panel, dialog, button and tooltip text; Ukrainian uses the bundled UI fonts. Native Japanese, Simplified and Traditional Chinese UI uses installed system fonts; the web host must supply a Japanese font. The same setting picks the CJK fallback for the interface *and* the Han preference of the text engine, so the composition's own text is drawn with the same language's glyph forms (the text engine's preference is process-global); swapping the language reinstalls the fonts, so it applies without a restart. Two catalogs back the text: the menus are keyed by `(command, English label)` (`crates/ui-egui/src/i18n.rs`), and the rest of the interface - panels, dialogs, buttons, tooltips - is keyed by its English source string (`crates/ui-egui/src/i18n/ui.rs`, with rows for Japanese, Simplified and Traditional Chinese and Ukrainian), where a panel writes `tr("Rename")`, or `tr_args("Proxy Use: {}", &[&quality])` when the row carries a value. A row that is missing falls back to English, so a new string shows up untranslated rather than empty; the tests in that module fail on an unused row and on a hard-coded string in a converted panel.
+- `general.language`: interface language (`system` / `en` / `ja` / `zh-hans` / `zh-hant` / `uk` / `es` / `pt-br` / `ka`), Settings ▸ General ▸ Language; menu labels change immediately. `system` (Match System, the default) follows the operating system's interface language where EffectCraft has a translation and is English otherwise: a Simplified Chinese locale (`zh`, `zh-CN`, `zh_CN.UTF-8`, `zh-Hans-CN`, `zh-SG`) selects `zh-hans`, a Traditional one (`zh-TW`, `zh-HK`, `zh-Hant`, `zh_MO`) selects `zh-hant`, a Ukrainian one (`uk`, `uk-UA`, `uk_UA.UTF-8`) selects `uk`, a Spanish one (`es`, `es-ES`, `es_MX.UTF-8`) selects `es`, a Portuguese one (`pt`, `pt-BR`, `pt_PT.UTF-8`) selects `pt-br`, a Georgian one (`ka`, `ka-GE`, `ka_GE.UTF-8`) selects `ka`; the browser build follows `?lang=` in the address, then the browser's languages (`navigator.languages`). Choose **Español** or **Português (Brasil)** for Spanish or Brazilian Portuguese menus (panels stay in English for now); choose **Українська** for Ukrainian menus and cataloged panel, dialog, button and tooltip text; Ukrainian uses the bundled UI fonts. Native Japanese, Simplified and Traditional Chinese UI uses installed system fonts; the web host must supply a Japanese font. The same setting picks the CJK fallback for the interface *and* the Han preference of the text engine, so the composition's own text is drawn with the same language's glyph forms (the text engine's preference is process-global); swapping the language reinstalls the fonts, so it applies without a restart. Two catalogs back the text: the menus are keyed by `(command, English label)` (`crates/ui-egui/src/i18n.rs`), and the rest of the interface - panels, dialogs, buttons, tooltips - is keyed by its English source string (`crates/ui-egui/src/i18n/ui.rs`, with rows for Japanese, Simplified and Traditional Chinese and Ukrainian), where a panel writes `tr("Rename")`, or `tr_args("Proxy Use: {}", &[&quality])` when the row carries a value. A row that is missing falls back to English, so a new string shows up untranslated rather than empty; the `missing_translations_report` test lists what each language lacks, and the tests in `ui.rs` fail on an unused row.
 - `general.undoLevels`: Levels of Undo
 - `general.pathPointSize`: Path Point and Handle Size
 - `general.recentItems`: Recent Projects Shown
@@ -91,7 +91,8 @@ Commands (CLI, MCP, control channel):
   one and in the comps that nest it (through the precomp layers' timing)
 - `general.expressionPickWhipCompact`: off, the pick whip writes match names
   (`thisComp.layer("A")("transform")("opacity")`)
-- `general.createSplitLayersAbove`: where Edit ▸ Split Layer puts the new layer
+- `general.createSplitLayersAbove`: where Edit ▸ Split Layer puts the new layer (on by default,
+  as in After Effects)
 - `startup.showHomeOnOpenProject`: the Home screen comes up after File ▸ Open / Open Recent
 - `composition.motionPath`, `composition.motionPathSeconds`, `composition.motionPathKeyframes`:
   how much of a position motion path the viewer draws (all, none, N seconds or N keyframes
diff --git a/docs/releasing.md b/docs/releasing.md
index bd28d8ec3..07d988b5c 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -71,7 +71,7 @@ The MSI's setup wizard ([`installer-ui.wxs`](../packaging/windows/installer-ui.w
 choose the install folder; upgrades and repairs reuse it, and `INSTALLFOLDER="..."` picks it for a
 silent (`/qn`) install. [`packaging-lint.yml`](../.github/workflows/packaging-lint.yml) install-tests
 that with stub binaries ([`test-msi.ps1`](../packaging/windows/test-msi.ps1)): a custom folder,
-an upgrade that keeps it, a repair, uninstall, and the Program Files default. The wizard pages
+an upgrade that keeps it, a repair, uninstall, and the all-users default folder (`Program Files\ArtCraft\EffectCraft`). The wizard pages
 themselves are checked by hand.
 
 The portable zip ships [`portable.txt`](../packaging/windows/portable.txt) beside `effectcraft.exe`.
diff --git a/docs/scripting-parity.md b/docs/scripting-parity.md
index 607be9e93..5997a8bd1 100644
--- a/docs/scripting-parity.md
+++ b/docs/scripting-parity.md
@@ -15,7 +15,7 @@ our own scripts; no real-world script library has been run against both apps.
 | Feature | After Effects 2026 | EffectCraft | Status | Evidence / gap |
 |---|---|---|---|---|
 | Expression language | JavaScript engine (default) and Legacy ExtendScript | JavaScript (boa) with legacy array maths (`value + [10, 0]`) | good | `crates/expr` tests; no separate Legacy ExtendScript engine mode |
-| Expression object model | `thisComp`, `thisLayer`, `wiggle`, `loopOut`, `valueAtTime`, `sampleImage`, `footage()`, text style API… | Same members, from the reference | good | `crates/expr/src/tests.rs`; behaviour of edge cases unmeasured (G1) |
+| Expression object model | `thisComp`, `thisLayer`, `wiggle`, `loopOut`, `valueAtTime`, `sampleImage`, `footage()`, text style API… | Same members, from the reference, including `propertyGroup(countUp)` and a group's `propertyIndex` for name-independent rigs (#1619) | good | `crates/expr/src/tests.rs`, `tests/property_group.rs`; behaviour of edge cases unmeasured (G1) |
 | Expression editing | Inline field, error bar, pick whip, Expression Language menu, external editors | Inline field that grows, error bar, pick whips (property and value), language menu | partial | External editor support (#364) |
 | Expression performance | Cached, multi-frame | Per-thread boa contexts | unknown | No benchmark |
 | Scripting object model | `app`, `Project`, items, layers, properties, keys, eases, render queue, `TextDocument`, `Shape`, markers, `File`/`Folder`, `Socket`, `app.settings` | Same classes, edits run through undoable engine commands; match names table; layers, groups and properties are callable (`layer("Effects")(1)` is `.property(...)`) | good | `crates/script` tests (≈ 10 test files) |
@@ -27,6 +27,7 @@ our own scripts; no real-world script library has been run against both apps.
 | `#include`, `#target` directives | yes | `#include` / `//@include` / `#includepath` inline files relative to the including script (once each, nested at most 32 deep, under the scripts' file gate; errors name the included file and line); `#target`, `#targetengine`, `#strict` are ignored | good | `tests_include.rs` (#759); installed scripts and panels have no folder of their own, so they include from the project's folder or absolute paths |
 | `.jsxbin` | yes | no | out of scope | No public specification |
 | Keyboard shortcuts for scripts | yes | no | missing | plugins.md |
+| Recent Script Files | File ▸ Scripts ▸ Recent Script Files (10 scripts), a key to rerun | Same list, kept in the settings; Cmd+Alt+Shift+D reruns the most recent script | same | `recent_script_files_run_again` ([plugins.md](plugins.md)) |
 | Command-line rendering `aerender` | yes | `effectcraft-cli render`, `script`, `exec` | same purpose | `apps/effectcraft-cli` |
 | Essential Graphics scripting hooks | `addToMotionGraphicsTemplate…` | yes (M13.7) | good | — |
 | Agent control (MCP, control channel, every command) | none | yes | beyond | [agents.md](agents.md), [control-protocol.md](control-protocol.md); `list_effects` omits parameter types and ranges (#441) |
@@ -42,5 +43,6 @@ performance benchmark 4–8 h.
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-16 | minor | Expression object model row names `propertyGroup()` and a group's `propertyIndex` (#1619) |
 | 2026-10-12 | minor | Estimate no longer counts `#include` / `#target` (#759, `tests_include.rs`); the table row was already current |
 | 2026-10-10 | major | First expressions and scripting checklist |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index eac744b6f..ff7cc3ef9 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -688,8 +688,10 @@ Fixes from measured reports:
   step (undo and redo keep it) and keeps the comp's cached frames; projects saved before open
   with Auto. View ▸ Resolution and the panel's popup run `view.res.full|half|third|quarter|auto`
   and `view.res.custom {factor}`, which now work headless too; `comp.info` reports `resolution`
-  and `resolutionFactor` (#417). Not yet: the magnification is not saved per comp, and the
-  Composition Settings dialog has no Resolution popup.
+  and `resolutionFactor` (#417). Composition Settings ▸ Basic has the same Resolution menu, with
+  the frame size and memory per 8bpc frame at that resolution beside it; OK sets it as the popup
+  does, outside the undo step of the other settings (#2167). Not yet: the magnification is not
+  saved per comp.
 
 ### Update: plug-ins and extensions as in After Effects; ease presets become a ScriptUI panel
 
@@ -746,6 +748,9 @@ them: scripts, ScriptUI panels, effect plug-ins, with a guide to writing a panel
   way and move them however slowly they are dragged; the same Shift / Ctrl / Ctrl+Alt clicks.
 - **Paste** (M5.13): keys copied from several layers paste onto as many layers in order; Paste
   Reversed Keyframes follows Paste's rules (stretch, target property, Hold-only properties).
+  A Mask Path or shape Path (its value or a key) pasted onto Position becomes a motion path: a
+  key per vertex with the path's tangents, over 2 s from the CTI, the inner keys roving, the
+  vertices pasted as they are (layer space, as in After Effects) (#1425).
 - **J / K and Info** (M5.14): J / K also stop at the work area; the Info panel shows a selected
   key's property, time and value.
 
@@ -1065,7 +1070,7 @@ resolution, adjustment) and composited at 8 and 32 bpc:
   Bucket's flood-filled region, Eyedropper Fill's sample); segments and convex polygons are
   binned into 16 × 16 tiles and rasterised on the GPU with the CPU's coverage functions, glows
   and compositing included. The CPU effects were refactored to draw from the same plans with
-  bit-identical output (`crates/effects/tests/gen_golden.rs`: 288 frame hashes pinned before
+  bit-identical output (`crates/effects/tests/it/gen_golden.rs`: 288 frame hashes pinned before
   the refactor). Exception: CC Threads decides band membership and fibre shade per pixel, and at
   round parameter values (the defaults) pixel centres sit exactly on band edges, where f32 and
   the CPU's f64 can fall on either side: up to 5 % of pixels allowed (measured ≤ 3.6 % at half
@@ -1079,7 +1084,7 @@ resolution, adjustment) and composited at 8 and 32 bpc:
 7 more effects run on the GPU (280 in all, with M13.28's 37), and five CPU fallbacks are gone. Each case is
 checked against the CPU oracle (≤ 1/255 at 8 bpc, ≤ 1e-3 at 32 bpc) directly on a buffer (full
 and half resolution) and composited at 8 and 32 bpc; the CPU refactors behind the shared plans
-are pinned bit for bit by golden hashes (`crates/effects/tests/particle_golden.rs`,
+are pinned bit for bit by golden hashes (`crates/effects/tests/it/particle_golden.rs`,
 `timewarp_golden.rs`, `sim_golden.rs`).
 
 - **Particle render passes** (`gpu::fx_particles`): CC Particle World and CC Particle Systems II
diff --git a/docs/testing.md b/docs/testing.md
index 9017e0c27..67d622fd9 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -5,6 +5,15 @@ cargo test --workspace     # everything
 cargo xtask ci             # fmt, clippy -D warnings, tests, layers, assets, wasm
 ```
 
+`cargo xtask ci` builds in the dev profile and runs the tests with `cargo nextest run` (plus
+`cargo test --doc`) when `cargo-nextest` is installed, and with `cargo test` otherwise. It then
+runs `missing_translations_report` with `--nocapture`, which prints the interface strings each
+language has no translation for. Those strings show in English; the report always passes.
+
+Each crate with several integration-test files has one test binary, `tests/it/main.rs`, whose
+modules are the files in `tests/it/`. Run one file with `cargo test -p <crate> --test it <module>::`
+or `cargo nextest run -p <crate> -E 'binary(it) and test(/^<module>::/)'`.
+
 ## What the tests cover
 
 - **Engine commands** (`crates/engine/src/tests*.rs`): every command family, including undo and
@@ -16,7 +25,7 @@ cargo xtask ci             # fmt, clippy -D warnings, tests, layers, assets, was
 - **Effects** (`crates/effects`): each effect has a determinism test and at least one behaviour
   test (identity at neutral settings, known pixel results, or simulations giving the same frame
   whether you seek straight to it or play up to it). A registry-wide test checks that effects
-  which read the clock are declared time-dependent. `crates/effects/tests/sim_golden.rs` pins
+  which read the clock are declared time-dependent. `crates/effects/tests/it/sim_golden.rs` pins
   exact pixel hashes of the simulation effects the GPU shares plans with (CC Rainfall … Card
   Wipe) at several settings, times, bit depths and resolutions, so any change to their CPU output
   fails (re-pin with `SIM_GOLDEN_PRINT=1` after an intended change; pinned for aarch64 macOS,
@@ -68,6 +77,15 @@ instructions retired; `/usr/bin/time -v` on Linux gives max RSS and CPU; elsewhe
 It prints a table and appends one JSON line per run to `target/bench/results.jsonl` (git rev,
 date, load average, scenario, settings, metrics); `--compare OLD.jsonl` prints the % change against
 the latest matching runs there, `--compare OLD --with NEW` compares two files without rendering.
+`--repeat N` runs every scenario N times; with N > 1, one `"kind": "summary"` line per key follows
+the runs. Its `metrics` are the medians of the successful runs (byte and instruction counts
+rounded), `summary` holds `runs`, `failed` and median/p90/min/max per metric (p90 is the nearest
+rank, so it equals the max for N < 10), and its other fields (`date`, `load`, ...) are those of the
+key's last run; scripts that average runs should skip `kind: summary` lines. One failed run marks
+the summary failed. Comparisons use the latest line per key, so a key is a median only if its
+summary is the latest line (a later single run, or a batch that aborted before its summaries,
+leaves a raw run latest). The table labels each side `median of N` or `1 run` and warns when they
+differ; `--fail-over` refuses such keys.
 The table notes the 1-minute load average: on a busy machine wall time is noise, so compare
 peak memory and instructions retired, and rerun when the load differs a lot.
 
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 5173e7691..d4473c266 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -1,6 +1,6 @@
 # UI parity
 
-> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-12 · **Change:** minor (closed issue references re-audited against `upstream/main` 470ea7a3) · **Target:** Adobe After Effects 2026
+> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-18 · **Change:** minor (shape group Contents row elided; path-editing layer bounds #1220; closed issue references re-audited against `upstream/main` 470ea7a3) · **Target:** Adobe After Effects 2026
 
 How closely EffectCraft's interaction matches After Effects: tools, handles, snapping, nudging,
 modifier keys, shortcuts, drag behaviour, numeric entry, panels, context menus and feel. Evidence
@@ -16,8 +16,8 @@ feel and platform differences, and the 26.x interface changes are not in yet.
 | Area | Status | % | Evidence and gaps |
 |---|---|---:|---|
 | Menu bar | After Effects' menus, order, submenus and labels; native on macOS; keyboard-operable in-window bar | 95% | 587 entries in `crates/engine/src/menus.rs`; Adobe-service entries omitted by design; `ui_menus` tests (#279) |
-| Panels and workspaces | Every After Effects panel; all standard workspaces; drag-to-dock, tabs, floating panels, maximise | 75% | `ui_tabs`, `ui_panels`; panels move into their own native windows on any screen (#486 open: no dragging tabs between those windows); #302, #301 and #320 (docking, stacked-panel headers, workspace persistence) are closed |
-| Timeline | Switches, modes, parent & link, twirl-downs, reveal shortcuts (U, UU, P, S, R, T, A, E, M, F, Alt+Shift…), pick whips, graph editor, work area, markers | 75% | `ui_keyframes`, `ui_timeline_*`; expand precomps in place (#601); #456, #457, #569 and #355 (Graph Editor jitter and buttons, negative rotation, bulk keyframing) are closed; Proportional Scrubbing (26.2: Ctrl+Alt / Cmd+Opt scrub of hot text spreads the change over the selected layers by selection order, #770) matched for layers selected as a whole, not yet for individually selected properties; every layer has the Video switch, nulls, cameras and lights included (a null with its eye off has no box or handles in the viewer and isn't picked there) |
+| Panels and workspaces | Every After Effects panel; all standard workspaces; drag-to-dock, tabs, floating panels, maximise | 75% | `ui_tabs`, `ui_panels`; on Windows, macOS and X11 floating panels are OS windows of their own on any screen (on Wayland, the web and in embedded viewports they stay in the app window), with tabs and groups dragging between windows and shortcuts working in them (#486); #302, #301 and #320 (docking, stacked-panel headers, workspace persistence) are closed |
+| Timeline | Switches, modes, parent & link, twirl-downs, reveal shortcuts (U, UU, P, S, R, T, A, E, M, F, Alt+Shift…), pick whips, graph editor, work area, markers | 75% | `ui_keyframes`, `ui_timeline_*`; expand precomps in place (#601); #456, #457, #569 and #355 (Graph Editor jitter and buttons, negative rotation, bulk keyframing) are closed; Proportional Scrubbing (26.2: Ctrl+Alt / Cmd+Opt scrub of hot text spreads the change over the selected layers by selection order, #770) matched for layers selected as a whole, not yet for individually selected properties; every layer has the Video switch, nulls, cameras and lights included (a hidden null, camera or light has no box or handles in the viewer and isn't picked there; other selected hidden layers keep their layer controls and paths, #1769); a row control (a switch, the label swatch, a Modes cell) clicked on one of several selected layers acts on the whole selection, with the layers the switch doesn't apply to left out (#1849); a shape group's inner Contents (After Effects' elided Vectors group) draws no row — the group's path, fill/stroke and Transform list directly under it |
 | Composition viewer | Selection, handles with direction-aware cursors, rulers, guides, grids, snapping, channels, exposure, region of interest, snapshots, 3D views, Spacebar hand | 70% | `ui_viewer`, `ui_viewers`; Cmd/Ctrl +/− doesn't zoom (#570); anchor point grab on Linux (#492); #352 (snapping) is closed; no 3D transform gizmos (#392, #347); percentage guides (26.5) exist as View ▸ Add Percentage Guide and Convert Guides to Percentage / Pixels (a guide stores a percent of the comp, so it follows comp-size changes; behaviour inferred from the release note, not compared with After Effects); Copy Frame to Clipboard (26.3) is in the Composition menu and the viewer's context menu |
 | Tools panel | All After Effects tools; long-press flyouts; Tool Creates Shape / Mask; Fill / Stroke options | 80% | #213, #227 fixed; #553 (pen and vertex tools on motion paths) is closed |
 | Nudging and modifiers | Arrow nudge (1 px, Shift 10 px), Alt/Option duplicates and slips, Shift constrains | 75% | #290 nudging fixed; #491 (Linux multi-layer edits) is closed |
@@ -33,17 +33,24 @@ feel and platform differences, and the 26.x interface changes are not in yet.
 | Accessibility | AccessKit enabled; focus labels tested; Project panel keyboard navigation and accessible names (#776) | 20% | No screen-reader pass or keyboard-navigation audit of the other panels; no contrast check |
 | UI scale | Settings ▸ Appearance ▸ UI Scale 75–200% | beyond | After Effects follows the system's scaling (#284) |
 
+Path editing (#1220): the Composition viewer suppresses a selected layer’s transform box while
+using a Pen-family tool on a visible path, or while selecting its vertices with the Selection
+tool. Path points, Bézier handles and the path’s free-transform controls remain available.
+Layer transform tools and ordinary layer selection restore the box. Headless `ui_viewer` tests
+cover shape paths and masks, corner-vertex dragging and undo, and layers without visible paths.
+
 ## Estimate
 
-**≈ 60–120 h**: the open interaction issues above (25–45 h, about 0.2–0.5 h each with a scripted
-test), 3D gizmos 8–15 h, multi-monitor panels 10–20 h, the 26.x interface changes 10–20 h, an
-accessibility pass 15–30 h. Checking feel against After Effects needs the owner's Mac with After
+**≈ 60–110 h**: the open interaction issues above (25–45 h, about 0.2–0.5 h each with a scripted
+test), 3D gizmos 8–15 h, the 26.x interface changes 10–20 h, an accessibility pass 15–30 h. Checking feel against After Effects needs the owner's Mac with After
 Effects running; most of the rest parallelises.
 
 ## Revision history
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-10-18 | minor | A shape group's inner Contents (After Effects' elided Vectors group) draws no row: the group's path, fill/stroke and Transform list directly under the group |
+| 2026-10-13 | patch | Layer bounds are suppressed during path-point editing (#1220); shape/mask interaction regressions |
 | 2026-10-12 | minor | Closed issues (#302, #320, #491, #511, #553 and others) marked as closed instead of open; panels in their own windows (#486) |
 | 2026-10-12 | minor | Percentage guides and effect colour labels (26.5) added; rows updated |
 | 2026-10-10 | major | First UI parity checklist |
diff --git a/docs/web.md b/docs/web.md
index 23ee1da1b..c18f7e869 100644
--- a/docs/web.md
+++ b/docs/web.md
@@ -156,8 +156,9 @@ of the project:
 
 Frames without effects that the WebGPU compositor can finish alone still render on the page
 (they stay on the GPU, no readback); everything else (frames with effects, 3D runs, the Software
-Only renderer, WebGL2) goes to the workers. If no worker is usable, frames render on the page's
-thread as before. `effectcraft.info().frameWorkers` reports `{workers, alive, busy, rendered,
+Only renderer, WebGL2) goes to the workers. If no worker is usable (one that failed to start, or
+one the browser refused to create, as in a sandboxed iframe), frames render on the page's thread
+as before. `effectcraft.info().frameWorkers` reports `{workers, alive, busy, rendered,
 failed, lastMs, syncs, syncBytes, gpu, gpuFrames, lastPasses, diskHits}` (`gpu`: each worker's
 adapter, `{cpu: why}` without one, `null` until it reported).
 
@@ -425,14 +426,21 @@ node apps/effectcraft-web/tests/smoke.mjs --url http://127.0.0.1:8765/ --out tar
 
 `apps/effectcraft-web/tests/workers.mjs` checks the job-worker plumbing (`js/host.js`,
 `web/worker.js`) under Node with a fake `Worker`, without a build: a replaced file is sent to a
-reused worker again even at the same size, and a worker that fails to start fails its job and is
-terminated (`node apps/effectcraft-web/tests/workers.mjs`).
+reused worker again even at the same size, a worker that fails to start fails its job and is
+terminated, and a `new Worker` that throws (a sandboxed iframe) fails the job and reports the
+frame worker dead instead of stopping startup (`node apps/effectcraft-web/tests/workers.mjs`).
 
 `apps/effectcraft-web/tests/page.mjs` checks page-side helpers of `js/host.js` the same way with
 a fake DOM: a picked file that can't be read is reported while the others are added, and the
 device-lost notice saves, flushes before reloading and reports a failed flush
 (`node apps/effectcraft-web/tests/page.mjs`).
 
+`apps/effectcraft-web/tests/storage.mjs` checks the IndexedDB storage backend of `js/host.js`
+with a fake IndexedDB: a put or delete resolves only once its transaction has committed, and one
+whose transaction aborts after its request succeeded (or whose request fails or throws) rejects
+and leaves the stored entry as it was, so the flush keeps it for a retry (#1242)
+(`node apps/effectcraft-web/tests/storage.mjs`).
+
 It also checks the M13.10 paths: viewer frames rendered in frame workers while scrubbing with the
 CPU renderer (project synced as diffs, event-loop gaps under 400 ms), a `wait: true` render that
 replies when done while the page keeps running, and the Media Browser over browser storage; and
@@ -454,19 +462,19 @@ every request and reply, a render through an in-process offload; `tests_roto.rs`
 propagation through an offload streaming segmentations; `tests_mask_warp.rs`: Warp Stabilizer
 plans solved in the job, never by `warp.status` on the page), the frame-worker protocol
 (`crates/engine/src/remote.rs`: diff / patch, a replica following edits renders the same pixels;
-`crates/ui-egui/tests/ui_web_offload.rs`: the frame cache through a remote renderer, `wait: true`
+`crates/ui-egui/tests/it/ui_web_offload.rs`: the frame cache through a remote renderer, `wait: true`
 deferred until the offloaded job ends) and the Media Browser's virtual tree (`media_browser.rs`,
 `tests_panels.rs`). M13.24: deferred readbacks on a real device (`crates/gpu/src/tests_deferred.rs`:
 whole-frame GPU and CPU-composited frames in passes match the CPU, placeholders never reach the
 layer cache; `deferred.rs`: keys, late readbacks of an older frame dropped), the frame server's
 passes and Auto timing (`remote.rs`, a deferred stand-in accelerator), the browser's routing and
-disk cache (`crates/ui-egui/tests/ui_web_gpu_storage.rs`: a GPU frame worker renders effect frames,
+disk cache (`crates/ui-egui/tests/it/ui_web_gpu_storage.rs`: a GPU frame worker renders effect frames,
 the page's GPU keeps frames without effects, frames stored under their disk keys come back after a
 "reload" without rendering, the blue cache bar sees them; the storage manager's widgets and
 commands), the disk index (`disk_cache.rs`), the store's usage by kind and clearing (`store.rs`),
 `storage.*` (`storage.rs`), and every WGSL float literal fitting f32 (browsers reject the whole
 module otherwise; `tests.rs`). M13.30: job workers on a deferred device
-(`crates/ui-egui/tests/ui_web_job_gpu.rs`: a Render Queue job and a Warp Stabilizer analysis
+(`crates/ui-egui/tests/it/ui_web_job_gpu.rs`: a Render Queue job and a Warp Stabilizer analysis
 render their frames in passes on the device, with the CPU worker's pixels / result),
 particles, Advanced 3D and the job pass driver in passes (`crates/gpu/src/tests_deferred_jobs.rs`),
 layer buffers through the disk store and the prefetch plan (`remote.rs`
diff --git a/examples/check-ae-ease.mjs b/examples/check-ae-ease.mjs
index 3d4f1c02c..e7296ce93 100644
--- a/examples/check-ae-ease.mjs
+++ b/examples/check-ae-ease.mjs
@@ -5,11 +5,18 @@ import { fileURLToPath } from 'node:url';
 import { spawnSync } from 'node:child_process';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
-const cli = process.argv[2];
-if (!cli || !fs.existsSync(cli)) throw new Error('Usage: node examples/check-ae-ease.mjs <aesync/server/dist/cli.js>');
+// The argument is the operator's own CLI build to compare against; it is resolved and must be an
+// existing regular file before it is used.
+const cli = path.resolve(process.argv[2] ?? ''); // NOSONAR
+// Reject anything that is not an existing regular file before the checker uses it.
+if (!process.argv[2] || !fs.statSync(cli, { throwIfNoEntry: false })?.isFile()) { // NOSONAR
+  throw new Error('Usage: node examples/check-ae-ease.mjs <aesync/server/dist/cli.js>');
+}
 const tolerance = 1e-7;
 function run(command, args) {
-  const result = spawnSync(command, args, { cwd: root, windowsHide: true, encoding: 'utf8', maxBuffer: 8 * 1024 * 1024 });
+  // A developer-run comparison script; spawnSync never uses a shell and every command is either
+  // a fixed binary (`cargo`, `process.execPath`) or the CLI script path validated above.
+  const result = spawnSync(command, args, { cwd: root, windowsHide: true, encoding: 'utf8', maxBuffer: 8 * 1024 * 1024 }); // NOSONAR
   if (result.status !== 0) throw new Error(result.stderr || result.stdout || 'Process failed');
   return JSON.parse(result.stdout.replace(/^\uFEFF/, '').trim());
 }
diff --git a/extensions/scriptui-panels/Ease Presets.jsx b/extensions/scriptui-panels/Ease Presets.jsx
index a08fdbcc2..6f6eadae5 100644
--- a/extensions/scriptui-panels/Ease Presets.jsx	
+++ b/extensions/scriptui-panels/Ease Presets.jsx	
@@ -1,4 +1,4 @@
-// Ease Presets: easing curves kept by name and applied to pairs of neighbouring selected keyframes.
+// Ease Presets: easing curves kept by name and applied to the sides of selected keyframes.
 //
 // A ScriptUI panel that ships with EffectCraft as an optional extension (Window ▸ Ease
 // Presets.jsx). It uses only After Effects' documented scripting API: comp.selectedProperties,
@@ -12,6 +12,13 @@
 // speeds are scaled to it: per dimension, along the motion path for spatial properties, or as
 // overall progress for shapes.
 //
+// Applied to selected keyframes, In eases each key's incoming side with the curve's in side, Out
+// its outgoing side with the curve's out side, In-Out both: a side is eased when it has a
+// neighbouring key (selected or not; the neighbour isn't changed), its speeds scaled to the
+// segment on that side. So a selected pair gets the whole curve, and a single key works too.
+// Roving keys are skipped: they pass speed straight through (their sides stay linear), so an ease
+// set on them wouldn't play.
+//
 // User presets are kept with app.settings (section "Ease Presets", key "userPresets") as JSON:
 // {"version": 1, "presets": [{"name": …, "curve": {"outInfluence", "outSpeed", "inInfluence",
 // "inSpeed"}}]}.
@@ -98,9 +105,8 @@
 
   // ------------------------------------------------------------------ keyframes
 
-  // Pairs of neighbouring selected keyframes of the active comp: {prop, key} (the earlier key's
-  // index), by property.
-  function selectedPairs() {
+  // Selected properties of the active comp whose keys can ease: {prop, keys} (their selected keys).
+  function selectedKeyed() {
     var comp = app.project.activeItem;
     var out = [];
     if (!(comp instanceof CompItem)) return out;
@@ -109,7 +115,17 @@
       var p = props[i];
       if (p.propertyType !== PropertyType.PROPERTY || p.numKeys < 2 || !p.isInterpolationTypeValid(BEZIER)) continue;
       var keys = p.selectedKeys;
-      for (var k = 0; k + 1 < keys.length; k++) if (keys[k + 1] === keys[k] + 1) out.push({ prop: p, key: keys[k] });
+      if (keys.length) out.push({ prop: p, keys: keys });
+    }
+    return out;
+  }
+
+  // Pairs of neighbouring selected keyframes: {prop, key} (the earlier key's index), by property.
+  function selectedPairs() {
+    var keyed = selectedKeyed(), out = [];
+    for (var i = 0; i < keyed.length; i++) {
+      var keys = keyed[i].keys;
+      for (var k = 0; k + 1 < keys.length; k++) if (keys[k + 1] === keys[k] + 1) out.push({ prop: keyed[i].prop, key: keys[k] });
     }
     return out;
   }
@@ -175,29 +191,43 @@
     }
   }
 
-  // Ease every pair of neighbouring selected keyframes with `c` (one undo step). Returns the
-  // number of pairs eased.
-  function applyCurve(c) {
-    var pairs = selectedPairs(), n = 0;
-    if (!pairs.length) return 0;
+  // The eases of one side with `speed` (relative to the segment's average) and `influence`.
+  function eases(s, speed, influence) {
+    var out = [];
+    for (var d = 0; d < s.length; d++) out.push(new KeyframeEase(speed * s[d], influence));
+    return out;
+  }
+
+  // Ease the sides `mode` names ("In", "Out" or "In-Out") of every selected keyframe with `c`, in
+  // one undo step: a side with a neighbouring key, scaled to the segment on that side. Returns
+  // {eased, roving}: the number of keyframes eased, and of selected roving keyframes skipped.
+  function applyCurve(c, mode) {
+    var keyed = selectedKeyed(), sides = [], keys = 0, roving = 0;
+    var doIn = mode !== "Out", doOut = mode !== "In";
+    // Every side and its eases first: the segments are measured before any key changes.
+    for (var i = 0; i < keyed.length; i++) {
+      var p = keyed[i].prop;
+      for (var j = 0; j < keyed[i].keys.length; j++) {
+        var k = keyed[i].keys[j], before = sides.length;
+        if (p.keyRoving(k)) {
+          roving++;
+          continue;
+        }
+        var s = doIn && k > 1 ? slopes(p, k - 1) : null;
+        if (s) sides.push({ prop: p, key: k, out: false, eases: eases(s, c.inSpeed, c.inInfluence) });
+        s = doOut && k < p.numKeys ? slopes(p, k) : null;
+        if (s) sides.push({ prop: p, key: k, out: true, eases: eases(s, c.outSpeed, c.outInfluence) });
+        if (sides.length > before) keys++;
+      }
+    }
+    if (!sides.length) return { eased: 0, roving: roving };
     app.beginUndoGroup("Apply Ease Preset");
     try {
-      for (var i = 0; i < pairs.length; i++) {
-        var p = pairs[i].prop, a = pairs[i].key, s = slopes(p, a);
-        if (!s) continue;
-        var outE = [], inE = [];
-        for (var d = 0; d < s.length; d++) {
-          outE.push(new KeyframeEase(c.outSpeed * s[d], c.outInfluence));
-          inE.push(new KeyframeEase(c.inSpeed * s[d], c.inInfluence));
-        }
-        easeSide(p, a, true, outE);
-        easeSide(p, a + 1, false, inE);
-        n++;
-      }
+      for (var e = 0; e < sides.length; e++) easeSide(sides[e].prop, sides[e].key, sides[e].out, sides[e].eases);
     } finally {
       app.endUndoGroup();
     }
-    return n;
+    return { eased: keys, roving: roving };
   }
 
   // The curve between the first selected pair of keyframes (measured on the dimension that
@@ -288,6 +318,13 @@
   var inInfluence = field(inRow, "In %", "inInfluence");
   var inSpeed = field(inRow, "Speed", "inSpeed");
 
+  var modeRow = ui.add("group");
+  modeRow.add("statictext", undefined, "Ease");
+  var MODES = ["In", "Out", "In-Out"];
+  var mode = modeRow.add("dropdownlist", undefined, MODES, { name: "mode" });
+  mode.selection = 2;
+  mode.helpTip = "The sides of each selected keyframe to ease: incoming, outgoing or both";
+
   var actions = ui.add("group");
   var applyButton = actions.add("button", undefined, "Apply", { name: "apply" });
   var fromKeys = actions.add("button", undefined, "From Keys", { name: "fromKeys" });
@@ -346,8 +383,12 @@
   }
 
   function apply(c, what) {
-    var n = applyCurve(c);
-    status.text = n > 0 ? "Eased " + n + " keyframe pair(s) with " + what : "Select two or more neighbouring keyframes of a property";
+    var m = mode.selection ? mode.selection.text : "In-Out";
+    var r = applyCurve(c, m), n = r.eased;
+    var side = m === "In" ? "before it" : m === "Out" ? "after it" : "next to it";
+    var skipped = r.roving > 0 ? "skipped " + r.roving + " roving keyframe(s); turn off Roving to ease them" : "";
+    if (n > 0) status.text = "Eased " + n + " keyframe(s) (" + m + ") with " + what + (skipped ? "; " + skipped : "");
+    else status.text = skipped ? "Nothing eased: " + skipped : "Select keyframes with another keyframe " + side;
     return n;
   }
 
diff --git a/packaging/env.sh b/packaging/env.sh
index 6a1bfa286..1e6e2cde1 100644
--- a/packaging/env.sh
+++ b/packaging/env.sh
@@ -19,10 +19,11 @@ workspace_version() {
     /^\[/ { in_pkg = ($0 == "[workspace.package]") ; next }
     in_pkg && $1 == "version" { gsub(/[" ]/, "", $3); print $3; exit }
   ' "$ROOT/Cargo.toml"
+  return
 }
 
 VERSION="${EFFECTCRAFT_VERSION:-$(workspace_version)}"
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
   echo "error: could not read [workspace.package] version from $ROOT/Cargo.toml" >&2
   exit 1
 fi
@@ -32,7 +33,7 @@ DIST="${DIST:-$ROOT/dist/release}"
 mkdir -p "$DIST"
 export DIST
 
-if [ -z "${EFFECTCRAFT_BUILD_SHA:-}" ]; then
+if [[ -z "${EFFECTCRAFT_BUILD_SHA:-}" ]]; then
   EFFECTCRAFT_BUILD_SHA="$(git -C "$ROOT" rev-parse HEAD 2>/dev/null || true)"
 fi
 export EFFECTCRAFT_BUILD_SHA
@@ -41,18 +42,22 @@ export CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-$ROOT/target}"
 
 # Emit a GitHub Actions warning (plain stderr outside Actions).
 warn() {
-  if [ -n "${GITHUB_ACTIONS:-}" ]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  if [[ -n "${GITHUB_ACTIONS:-}" ]]; then echo "::warning::$*"; else echo "warning: $*" >&2; fi
+  return
 }
 
 # Copy licence and readme files that exist into a package directory.
 copy_docs() {
   local dest="$1" f
-  for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do
-    if [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fi
+  for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; do
+    if [[ -f "$ROOT/$f" ]]; then cp "$ROOT/$f" "$dest/"; fi
   done
+  return
 }
 
 # Portable SHA-256 of a file (prints just the hash).
 sha256() {
-  if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi
+  local file="$1"
+  if command -v sha256sum >/dev/null; then sha256sum "$file" | cut -d' ' -f1; else shasum -a 256 "$file" | cut -d' ' -f1; fi
+  return
 }
diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.sh
index 236c464a6..053f8185c 100755
--- a/packaging/freebsd/package.sh
+++ b/packaging/freebsd/package.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # Build and package EffectCraft for FreeBSD:
 #
-#   $DIST/effectcraft-<version>-freebsd-x86_64.tar.gz   a /usr/local-style tree:
-#       effectcraft-<version>-freebsd-x86_64/{bin, share/applications, share/icons, share/mime,
+#   $DIST/effectcraft-<version>-freebsd-<arch>.tar.gz   a /usr/local-style tree (<arch> is x86_64 or aarch64):
+#       effectcraft-<version>-freebsd-<arch>/{bin, share/applications, share/icons, share/mime,
 #       share/metainfo, share/doc/effectcraft}
 #
 # Install by copying the tree's contents into /usr/local:
-#   tar -xzf effectcraft-<version>-freebsd-x86_64.tar.gz --strip-components 1 -C /usr/local
+#   tar -xzf effectcraft-<version>-freebsd-<arch>.tar.gz --strip-components 1 -C /usr/local
 #
 # Usage: packaging/freebsd/package.sh [--skip-build] [--dry-run]
 #   --dry-run   stage the tree from stub binaries and list it, without building (works on any OS)
@@ -20,7 +20,7 @@ APP_ID=ai.storyteller.effectcraft
 
 SKIP_BUILD=0
 DRY_RUN=0
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --skip-build) SKIP_BUILD=1; shift ;;
     --dry-run) DRY_RUN=1; SKIP_BUILD=1; shift ;;
@@ -29,14 +29,23 @@ while [ $# -gt 0 ]; do
   esac
 done
 
-# FreeBSD's uname says amd64; release file names use x86_64 like the Linux and Windows ones.
-MACHINE="$(uname -m)"
-case "$MACHINE" in
-  amd64 | x86_64) ARCH=x86_64 ;;
-  arm64 | aarch64) ARCH=aarch64 ;;
-  *) echo "unsupported architecture $MACHINE" >&2; exit 2 ;;
-esac
-if [ "$DRY_RUN" = 0 ] && [ "$(uname -s)" != FreeBSD ]; then
+# A cross build runs on the x86_64 VM, so the target names the arch, not uname.
+if [[ -n "${CARGO_BUILD_TARGET:-}" ]]; then
+  case "$CARGO_BUILD_TARGET" in
+    aarch64-unknown-freebsd) ARCH=aarch64 ;;
+    x86_64-unknown-freebsd) ARCH=x86_64 ;;
+    *) echo "unsupported CARGO_BUILD_TARGET $CARGO_BUILD_TARGET (use x86_64- or aarch64-unknown-freebsd)" >&2; exit 2 ;;
+  esac
+else
+  # FreeBSD's uname says amd64; release file names use x86_64 like the Linux and Windows ones.
+  MACHINE="$(uname -m)"
+  case "$MACHINE" in
+    amd64 | x86_64) ARCH=x86_64 ;;
+    arm64 | aarch64) ARCH=aarch64 ;;
+    *) echo "unsupported architecture $MACHINE" >&2; exit 2 ;;
+  esac
+fi
+if [[ "$DRY_RUN" = 0 ]] && [[ "$(uname -s)" != FreeBSD ]]; then
   echo "error: build on FreeBSD (or pass --dry-run to check the tree layout)" >&2
   exit 2
 fi
@@ -46,8 +55,15 @@ echo "==> EffectCraft $VERSION for FreeBSD $ARCH"
 
 # The release VM has 12 GB; full parallelism on the biggest crates runs it out of memory.
 export CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-4}"
-if [ "$SKIP_BUILD" = 0 ]; then
-  (cd "$ROOT" && cargo build --release --locked -p effectcraft -p effectcraft-cli)
+# The aarch64 build once ran in an emulated VM: with one codegen unit and thin LTO the largest
+# crates each optimized on a single emulated core and the job ran past its 5-hour limit, so trade
+# a little runtime speed for parallel codegen there. x86_64 keeps the workspace's release profile.
+if [[ "$ARCH" = aarch64 ]]; then
+  export CARGO_PROFILE_RELEASE_CODEGEN_UNITS="${CARGO_PROFILE_RELEASE_CODEGEN_UNITS:-16}"
+  export CARGO_PROFILE_RELEASE_LTO="${CARGO_PROFILE_RELEASE_LTO:-off}"
+fi
+if [[ "$SKIP_BUILD" = 0 ]]; then
+  (cd "$ROOT" && cargo build --release --locked ${CARGO_BUILD_TARGET:+--target "$CARGO_BUILD_TARGET"} -p effectcraft -p effectcraft-cli)
 fi
 WORK="$CARGO_TARGET_DIR/freebsd-package"
 STAGE="$WORK/$BASENAME"
@@ -55,8 +71,9 @@ rm -rf "$WORK"
 mkdir -p "$WORK"
 
 BIN="$CARGO_TARGET_DIR/release"
+if [[ -n "${CARGO_BUILD_TARGET:-}" ]]; then BIN="$CARGO_TARGET_DIR/$CARGO_BUILD_TARGET/release"; fi
 OUT_DIR="$DIST"
-if [ "$DRY_RUN" = 1 ]; then
+if [[ "$DRY_RUN" = 1 ]]; then
   # Stub binaries, and the tarball stays in the work dir so dist/ only ever holds real builds.
   BIN="$WORK/stub-bin"
   OUT_DIR="$WORK"
@@ -81,13 +98,13 @@ sed -e "s/@VERSION@/$VERSION/g" -e "s/@DATE@/$EFFECTCRAFT_BUILD_DATE/g" \
 cp -R "$ROOT/assets/app-icon/hicolor" "$STAGE/share/icons/"
 copy_docs "$STAGE/share/doc/effectcraft"
 for f in NOTICE ATTRIBUTION.md; do
-  if [ -f "$ROOT/$f" ]; then install -m 644 "$ROOT/$f" "$STAGE/share/doc/effectcraft/"; fi
+  if [[ -f "$ROOT/$f" ]]; then install -m 644 "$ROOT/$f" "$STAGE/share/doc/effectcraft/"; fi
 done
 
 for f in bin/effectcraft bin/effectcraft-cli "share/applications/$APP_ID.desktop" \
   "share/icons/hicolor/256x256/apps/$APP_ID.png" "share/icons/hicolor/scalable/apps/$APP_ID.svg" \
   share/doc/effectcraft/LICENSE-MIT share/doc/effectcraft/LICENSE-APACHE; do
-  if [ ! -e "$STAGE/$f" ]; then echo "error: $f is missing from the package" >&2; exit 1; fi
+  if [[ ! -e "$STAGE/$f" ]]; then echo "error: $f is missing from the package" >&2; exit 1; fi
 done
 
 # ---- .tar.gz ------------------------------------------------------------------------------------
@@ -95,8 +112,16 @@ mkdir -p "$OUT_DIR"
 tar -C "$WORK" -czf "$OUT_DIR/$BASENAME.tar.gz" "$BASENAME"
 echo "wrote $OUT_DIR/$BASENAME.tar.gz"
 
-"$STAGE/bin/effectcraft-cli" --version
-if [ "$DRY_RUN" = 1 ]; then
+# Run the smoke test only when the binary's target is this host's (a cross build can't run here).
+case "$(uname -m)" in
+  amd64 | x86_64) HOST_TRIPLE=x86_64-unknown-freebsd ;;
+  arm64 | aarch64) HOST_TRIPLE=aarch64-unknown-freebsd ;;
+  *) HOST_TRIPLE= ;;
+esac
+if [[ -z "${CARGO_BUILD_TARGET:-}" || "$CARGO_BUILD_TARGET" = "$HOST_TRIPLE" ]]; then
+  "$STAGE/bin/effectcraft-cli" --version
+fi
+if [[ "$DRY_RUN" = 1 ]]; then
   echo "==> dry run: tarball contents"
   tar -tzvf "$OUT_DIR/$BASENAME.tar.gz"
 fi
diff --git a/packaging/icons.sh b/packaging/icons.sh
index afeb13f83..770cda91d 100755
--- a/packaging/icons.sh
+++ b/packaging/icons.sh
@@ -18,7 +18,10 @@ trap 'rm -rf "$TMP"' EXIT
 
 command -v resvg >/dev/null || { echo "error: resvg not found (brew install resvg)" >&2; exit 1; }
 
-render() { resvg -w "$2" -h "$2" "$1" "$3" </dev/null; }
+render() {
+  local svg="$1" size="$2" out="$3"
+  resvg -w "$size" -h "$size" "$svg" "$out" </dev/null
+}
 
 # The tile fills its 512 viewBox edge to edge, which suits Windows and Linux. macOS icons keep
 # Apple's grid instead: an 824 px body centred on a 1024 canvas with a transparent margin.
diff --git a/packaging/linux/flatpak-bundle.sh b/packaging/linux/flatpak-bundle.sh
index d5dcdfc0f..eddc6da26 100755
--- a/packaging/linux/flatpak-bundle.sh
+++ b/packaging/linux/flatpak-bundle.sh
@@ -21,7 +21,7 @@ FLATHUB=https://dl.flathub.org/repo/flathub.flatpakrepo
 
 TEST=1
 TARBALL=""
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --no-test) TEST=0; shift ;;
     -h | --help) sed -n '2,14p' "$0"; exit 0 ;;
@@ -38,7 +38,7 @@ case "$ARCH" in
 esac
 BASENAME="effectcraft-$VERSION-linux-$ARCH"
 TARBALL="${TARBALL:-$DIST/$BASENAME.tar.gz}"
-[ -f "$TARBALL" ] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
+[[ -f "$TARBALL" ]] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
 for tool in flatpak flatpak-builder; do
   command -v "$tool" >/dev/null || { echo "error: $tool not found (apt install flatpak flatpak-builder librsvg2-common)" >&2; exit 1; }
 done
@@ -49,7 +49,7 @@ WORK="$CARGO_TARGET_DIR/flatpak-bundle"
 rm -rf "$WORK"
 mkdir -p "$WORK/stage"
 tar -xzf "$TARBALL" -C "$WORK/stage" --strip-components=1
-[ -x "$WORK/stage/bin/effectcraft" ] || { echo "error: $TARBALL has no bin/effectcraft" >&2; exit 1; }
+[[ -x "$WORK/stage/bin/effectcraft" ]] || { echo "error: $TARBALL has no bin/effectcraft" >&2; exit 1; }
 cp "$HERE/flatpak/$APP_ID.bundle.yml" "$WORK/$APP_ID.yml"
 
 flatpak remote-add --user --if-not-exists flathub "$FLATHUB"
@@ -62,7 +62,7 @@ OUT="$DIST/$BASENAME.flatpak"
 flatpak build-bundle --runtime-repo="$FLATHUB" "$WORK/repo" "$OUT" "$APP_ID" stable
 echo "wrote $OUT"
 
-if [ "$TEST" = 1 ]; then
+if [[ "$TEST" = 1 ]]; then
   flatpak install --user -y --noninteractive --reinstall "$OUT"
   flatpak info --user "$APP_ID"
   flatpak run --command=effectcraft-cli "$APP_ID" --version
diff --git a/packaging/linux/flatpak/ai.storyteller.effectcraft.yml b/packaging/linux/flatpak/ai.storyteller.effectcraft.yml
index be9f898ed..7dd7a8d68 100644
--- a/packaging/linux/flatpak/ai.storyteller.effectcraft.yml
+++ b/packaging/linux/flatpak/ai.storyteller.effectcraft.yml
@@ -55,6 +55,7 @@ modules:
     build-commands:
       - cargo --offline build --release --locked -p effectcraft -p effectcraft-cli
       - install -Dm755 target/release/effectcraft /app/bin/effectcraft
+      - install -Dm644 NOTICE /app/share/doc/effectcraft/NOTICE
       - install -Dm755 target/release/effectcraft-cli /app/bin/effectcraft-cli
       - install -Dm644 packaging/linux/ai.storyteller.effectcraft.desktop /app/share/applications/ai.storyteller.effectcraft.desktop
       - install -Dm644 packaging/linux/ai.storyteller.effectcraft.mime.xml /app/share/mime/packages/ai.storyteller.effectcraft.xml
diff --git a/packaging/linux/package.sh b/packaging/linux/package.sh
index f149e663d..a1fc5008a 100755
--- a/packaging/linux/package.sh
+++ b/packaging/linux/package.sh
@@ -25,7 +25,7 @@ APP_ID=ai.storyteller.effectcraft
 
 SKIP_BUILD=0
 FORMATS="appimage deb rpm tar"
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --skip-build) SKIP_BUILD=1; shift ;;
     --formats) FORMATS="$2"; shift 2 ;;
@@ -46,8 +46,8 @@ BASENAME="effectcraft-$VERSION-linux-$ARCH"
 
 echo "==> EffectCraft $VERSION for Linux $ARCH ($FORMATS)"
 
-if [ "$SKIP_BUILD" = 0 ]; then
-  if [ -n "${CROSS_TARGET:-}" ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
+  if [[ -n "${CROSS_TARGET:-}" ]]; then
     (cd "$ROOT" && cargo build --release --locked -p effectcraft -p effectcraft-cli --target "$CROSS_TARGET")
   else
     (cd "$ROOT" && cargo build --release --locked -p effectcraft -p effectcraft-cli)
@@ -79,7 +79,15 @@ if command -v appstreamcli >/dev/null; then
   appstreamcli validate --no-net --explain "$STAGE/usr/share/metainfo/$APP_ID.metainfo.xml"
 fi
 
-has() { case " $FORMATS " in *" $1 "*) return 0 ;; *) return 1 ;; esac; }
+has() {
+  local format="$1"
+  case " $FORMATS " in *" $format "*) return 0 ;; *) return 1 ;; esac
+}
+
+# Fails unless FILE ($2) has SHA-256 digest $1.
+verify_sha256() {
+  printf '%s  %s\n' "$1" "$2" | sha256sum -c -
+}
 
 # ---- .tar.gz ------------------------------------------------------------------------------------
 if has tar; then
@@ -103,27 +111,62 @@ fi
 
 # ---- AppImage -----------------------------------------------------------------------------------
 if has appimage; then
+  APPIMAGETOOL_VERSION=1.9.1
+  case "$ARCH" in
+    x86_64) APPIMAGETOOL_SHA256=ed4ce84f0d9caff66f50bcca6ff6f35aae54ce8135408b3fa33abfc3cb384eb0 ;;
+    aarch64) APPIMAGETOOL_SHA256=f0837e7448a0c1e4e650a93bb3e85802546e60654ef287576f46c71c126a9158 ;;
+    *) APPIMAGETOOL_SHA256="" ;;
+  esac
+  # appimagetool otherwise fetches the unpinned type2-runtime `continuous` build and embeds it.
+  APPIMAGE_RUNTIME_VERSION=20251108
+  case "$ARCH" in
+    x86_64) APPIMAGE_RUNTIME_SHA256=2fca8b443c92510f1483a883f60061ad09b46b978b2631c807cd873a47ec260d ;;
+    aarch64) APPIMAGE_RUNTIME_SHA256=00cbdfcf917cc6c0ff6d3347d59e0ca1f7f45a6df1a428a0d6d8a78664d87444 ;;
+    *) APPIMAGE_RUNTIME_SHA256="" ;;
+  esac
+  if [[ -z "$APPIMAGE_RUNTIME_SHA256" ]]; then
+    echo "no pinned AppImage runtime for $ARCH; build the AppImage on x86_64 or aarch64" >&2
+    exit 2
+  fi
   APPDIR="$WORK/EffectCraft.AppDir"
   cp -R "$STAGE" "$APPDIR"
-  mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"
   ln -s usr/bin/effectcraft "$APPDIR/AppRun"
   cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"
   cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"
   ln -s "$APP_ID.png" "$APPDIR/.DirIcon"
 
   TOOL="${APPIMAGETOOL:-$(command -v appimagetool || true)}"
-  if [ -z "$TOOL" ]; then
-    TOOL="$CARGO_TARGET_DIR/appimagetool-$ARCH.AppImage"
-    if [ ! -x "$TOOL" ]; then
-      curl -fsSL -o "$TOOL" "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$ARCH.AppImage"
-      chmod +x "$TOOL"
+  if [[ -z "$TOOL" ]]; then
+    if [[ -z "$APPIMAGETOOL_SHA256" ]]; then
+      echo "no pinned appimagetool for $ARCH; set APPIMAGETOOL or put appimagetool on PATH" >&2
+      exit 2
     fi
+    TOOL="$CARGO_TARGET_DIR/appimagetool-$APPIMAGETOOL_VERSION-$ARCH.AppImage"
+    if [[ ! -x "$TOOL" ]]; then
+      download="$TOOL.download"
+      curl --proto '=https' -fsSL -o "$download" \
+        "https://github.com/AppImage/appimagetool/releases/download/$APPIMAGETOOL_VERSION/appimagetool-$ARCH.AppImage"
+      verify_sha256 "$APPIMAGETOOL_SHA256" "$download"
+      chmod 755 "$download"
+      mv "$download" "$TOOL"
+    fi
+    verify_sha256 "$APPIMAGETOOL_SHA256" "$TOOL"
   fi
+  RUNTIME="$CARGO_TARGET_DIR/appimage-runtime-$APPIMAGE_RUNTIME_VERSION-$ARCH"
+  if [[ ! -f "$RUNTIME" ]]; then
+    download="$RUNTIME.download"
+    curl --proto '=https' -fsSL -o "$download" \
+      "https://github.com/AppImage/type2-runtime/releases/download/$APPIMAGE_RUNTIME_VERSION/runtime-$ARCH"
+    verify_sha256 "$APPIMAGE_RUNTIME_SHA256" "$download"
+    mv "$download" "$RUNTIME"
+  fi
+  verify_sha256 "$APPIMAGE_RUNTIME_SHA256" "$RUNTIME"
   # Absolute, because appimagetool runs in $DIST below (CARGO_TARGET_DIR or APPIMAGETOOL may be
   # relative).
   OUT="$(cd "$DIST" && pwd)/$BASENAME.AppImage"
   APPDIR="$(cd "$APPDIR" && pwd)"
   TOOL="$(cd "$(dirname "$TOOL")" && pwd)/$(basename "$TOOL")"
+  RUNTIME="$(cd "$(dirname "$RUNTIME")" && pwd)/$(basename "$RUNTIME")"
   # A .zsync left by an earlier run would hide a missing zsyncmake and describe another file.
   rm -f "$OUT.zsync"
   # Update information: AppImageUpdate, AppImageLauncher and the like read it from the file and
@@ -135,18 +178,18 @@ if has appimage; then
   # Extract-and-run: works without FUSE (containers, CI). The output embeds the static runtime,
   # so users don't need libfuse2 either. With zsyncmake on the host (CI installs the zsync
   # package) appimagetool also writes the .zsync, into its working directory, hence the cd.
-  (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream -u "$UPDATE_INFO" "$APPDIR" "$OUT")
+  (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream --runtime-file "$RUNTIME" -u "$UPDATE_INFO" "$APPDIR" "$OUT")
   echo "wrote $OUT"
-  if [ -s "$OUT.zsync" ]; then
+  if [[ -s "$OUT.zsync" ]]; then
     echo "wrote $OUT.zsync"
   else
     warn "zsyncmake not found, so $OUT.zsync was not written; AppImage delta updates need it"
   fi
 fi
 
-if [ -z "${CROSS_TARGET:-}" ]; then
+if [[ -z "${CROSS_TARGET:-}" ]]; then
   "$STAGE/usr/bin/effectcraft-cli" --version
-elif [ -n "${EMULATOR:-}" ]; then
+elif [[ -n "${EMULATOR:-}" ]]; then
   "$EMULATOR" "$STAGE/usr/bin/effectcraft-cli" --version
 fi
 echo "==> done"
diff --git a/packaging/macos/import-cert.sh b/packaging/macos/import-cert.sh
index e0178b6a3..8e3462cde 100755
--- a/packaging/macos/import-cert.sh
+++ b/packaging/macos/import-cert.sh
@@ -12,7 +12,7 @@ umask 077
 # shellcheck source=../env.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 
-if [ -z "${APPLE_CERTIFICATE:-}" ]; then
+if [[ -z "${APPLE_CERTIFICATE:-}" ]]; then
   warn "APPLE_CERTIFICATE is not set: macOS builds will be ad-hoc signed and not notarized"
   exit 0
 fi
@@ -36,13 +36,13 @@ security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KC_PASS"
 security list-keychains -d user -s "$KEYCHAIN" $(security list-keychains -d user | tr -d '"')
 
 IDENTITY="$(security find-identity -v -p codesigning "$KEYCHAIN" | awk '/Developer ID Application/ { print $2; exit }')"
-if [ -z "$IDENTITY" ]; then
+if [[ -z "$IDENTITY" ]]; then
   security find-identity -v -p codesigning "$KEYCHAIN" >&2
   echo "error: no 'Developer ID Application' identity in APPLE_CERTIFICATE" >&2
   exit 1
 fi
 echo "Imported signing identity $IDENTITY"
-if [ -n "${GITHUB_ENV:-}" ]; then
+if [[ -n "${GITHUB_ENV:-}" ]]; then
   { echo "MACOS_SIGN_IDENTITY=$IDENTITY"; echo "MACOS_KEYCHAIN=$KEYCHAIN"; } >>"$GITHUB_ENV"
 else
   echo "MACOS_SIGN_IDENTITY=$IDENTITY"
diff --git a/packaging/macos/package.sh b/packaging/macos/package.sh
index e6427d02e..be0c03aae 100755
--- a/packaging/macos/package.sh
+++ b/packaging/macos/package.sh
@@ -19,7 +19,7 @@ HERE="$ROOT/packaging/macos"
 
 ARCH=universal
 SKIP_BUILD=0
-while [ $# -gt 0 ]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --arch) ARCH="$2"; shift 2 ;;
     --skip-build) SKIP_BUILD=1; shift ;;
@@ -44,9 +44,9 @@ DMG="$DIST/effectcraft-$VERSION-macos-$ARCH.dmg"
 CLI_ZIP="$DIST/effectcraft-cli-$VERSION-macos-$ARCH.zip"
 
 NOTARIZE=0
-if [ "$IDENTITY" = "-" ]; then
+if [[ "$IDENTITY" = "-" ]]; then
   warn "macOS: ad-hoc signing (no MACOS_SIGN_IDENTITY); artifacts are not notarized"
-elif [ -n "${APPLE_ID:-}" ] && [ -n "${APPLE_PASSWORD:-}" ] && [ -n "${APPLE_TEAM_ID:-}" ]; then
+elif [[ -n "${APPLE_ID:-}" ]] && [[ -n "${APPLE_PASSWORD:-}" ]] && [[ -n "${APPLE_TEAM_ID:-}" ]]; then
   NOTARIZE=1
 else
   warn "macOS: APPLE_ID / APPLE_PASSWORD / APPLE_TEAM_ID incomplete; signed but not notarized"
@@ -55,7 +55,7 @@ fi
 echo "==> EffectCraft $VERSION for macOS ($ARCH), identity: $IDENTITY, notarize: $NOTARIZE"
 
 # ---- build -------------------------------------------------------------------------------------
-if [ "$SKIP_BUILD" = 0 ]; then
+if [[ "$SKIP_BUILD" = 0 ]]; then
   args=()
   for t in "${TARGETS[@]}"; do args+=(--target "$t"); done
   (cd "$ROOT" && cargo build --release --locked -p effectcraft -p effectcraft-cli "${args[@]}")
@@ -74,12 +74,27 @@ done
 sign() {
   # Hardened runtime + secure timestamp for a real identity; ad-hoc can't be timestamped.
   local ts=(--timestamp)
-  [ "$IDENTITY" = "-" ] && ts=(--timestamp=none)
+  [[ "$IDENTITY" = "-" ]] && ts=(--timestamp=none)
   local kc=()
-  [ -n "${MACOS_KEYCHAIN:-}" ] && kc=(--keychain "$MACOS_KEYCHAIN")
+  [[ -n "${MACOS_KEYCHAIN:-}" ]] && kc=(--keychain "$MACOS_KEYCHAIN")
   codesign --force --sign "$IDENTITY" ${kc[@]+"${kc[@]}"} "${ts[@]}" "$@"
 }
 
+# `stapler staple` and `stapler validate` both fetch the ticket from Apple's CloudKit, and a dropped
+# connection there (NSURLErrorDomain -1005, "Error 68") fails them although notarization worked.
+# Both are idempotent, so retry with a pause; a missing or bad ticket still fails every try.
+stapler_retry() {
+  local try
+  for try in 1 2 3 4; do
+    xcrun stapler "$1" "$2" && return 0
+    [[ "$try" = 4 ]] && break
+    echo "stapler $1 failed (try $try of 4); retrying in $((try * 20)) s" >&2
+    sleep $((try * 20))
+  done
+  echo "error: stapler $1 $(basename "$2") failed 4 times" >&2
+  exit 1
+}
+
 notarize() {
   local file="$1" out id status
   echo "==> notarizing $(basename "$file") (this can take a few minutes)"
@@ -88,8 +103,8 @@ notarize() {
   echo "$out"
   id="$(printf '%s' "$out" | plutil -extract id raw -o - - 2>/dev/null || true)"
   status="$(printf '%s' "$out" | plutil -extract status raw -o - - 2>/dev/null || true)"
-  if [ "$status" != "Accepted" ]; then
-    if [ -n "$id" ]; then
+  if [[ "$status" != "Accepted" ]]; then
+    if [[ -n "$id" ]]; then
       xcrun notarytool log "$id" --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" --team-id "$APPLE_TEAM_ID" || true
     fi
     echo "error: notarization of $(basename "$file") failed (status: ${status:-unknown})" >&2
@@ -103,6 +118,8 @@ mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
 # Executable and icon carry the display name (CFBundleExecutable / CFBundleIconFile).
 cp "$WORK/bin/effectcraft" "$APP/Contents/MacOS/EffectCraft"
 cp "$ROOT/assets/app-icon/effectcraft.icns" "$APP/Contents/Resources/EffectCraft.icns"
+# Required embedded-font notices are independent of optional font inputs.
+cp "$ROOT/NOTICE" "$APP/Contents/Resources/NOTICE"
 sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" \
   -e "s/@BUILD_SHA@/${EFFECTCRAFT_BUILD_SHA:-unknown}/g" \
   "$HERE/Info.plist.in" >"$APP/Contents/Info.plist"
@@ -115,11 +132,11 @@ sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP/Contents/
 sign --options runtime --entitlements "$HERE/entitlements.plist" "$APP"
 codesign --verify --strict --deep --verbose=2 "$APP"
 
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   ditto -c -k --keepParent "$APP" "$WORK/EffectCraft-notarize.zip"
   notarize "$WORK/EffectCraft-notarize.zip"
-  xcrun stapler staple "$APP"
-  xcrun stapler validate "$APP"
+  stapler_retry staple "$APP"
+  stapler_retry validate "$APP"
   spctl --assess --type execute -vvv "$APP"
 fi
 
@@ -131,7 +148,13 @@ ditto "$APP" "$STAGE/EffectCraft.app"
 ln -s /Applications "$STAGE/Applications"
 # Finder window layout: background, icon size and positions (packaging/macos/dmg/README.md).
 # The background is rendered from its SVG (1x + 2x in one HiDPI TIFF), so no bitmap is committed.
-command -v resvg >/dev/null || { echo "resvg not found (cargo install resvg --locked --version 0.48.1)" >&2; exit 1; }
+# CI (the shared release workflow doesn't install resvg; a warm cargo cache may hold it): install
+# the pinned version. Locally, say which version to install.
+RESVG_VERSION=0.48.1
+if [[ -n "${CI:-}" ]] && ! command -v resvg >/dev/null; then
+  cargo install resvg --locked --version "$RESVG_VERSION"
+fi
+command -v resvg >/dev/null || { echo "resvg not found (cargo install resvg --locked --version $RESVG_VERSION)" >&2; exit 1; }
 mkdir -p "$STAGE/.background"
 resvg --skip-system-fonts -w 660 "$HERE/dmg/background.svg" "$WORK/background.png"
 resvg --skip-system-fonts -w 1320 "$HERE/dmg/background.svg" "$WORK/background@2x.png"
@@ -154,7 +177,7 @@ hdiutil_retry() {
     if hdiutil "$@"; then
       return 0
     fi
-    [ "$attempt" = 5 ] && { echo "hdiutil $what failed 5 times" >&2; return 1; }
+    [[ "$attempt" = 5 ]] && { echo "hdiutil $what failed 5 times" >&2; return 1; }
     echo "hdiutil $what failed (attempt $attempt of 5); retrying in $((attempt * 10))s" >&2
     sleep $((attempt * 10))
   done
@@ -172,10 +195,10 @@ if ! codesign --verify --strict --deep --verbose=2 "$MOUNT/EffectCraft.app"; the
   exit 1
 fi
 hdiutil_retry detach detach "$MOUNT" >/dev/null
-if [ "$NOTARIZE" = 1 ]; then
+if [[ "$NOTARIZE" = 1 ]]; then
   notarize "$DMG"
-  xcrun stapler staple "$DMG"
-  xcrun stapler validate "$DMG"
+  stapler_retry staple "$DMG"
+  stapler_retry validate "$DMG"
   spctl --assess --type open --context context:primary-signature -vvv "$DMG"
 fi
 
@@ -190,7 +213,7 @@ codesign --verify --strict --verbose=2 "$CLI_DIR/effectcraft-cli"
 rm -f "$CLI_ZIP"
 ditto -c -k --keepParent "$CLI_DIR" "$CLI_ZIP"
 # A bare Mach-O can't carry a stapled ticket; Gatekeeper looks the notarization up online.
-if [ "$NOTARIZE" = 1 ]; then notarize "$CLI_ZIP"; fi
+if [[ "$NOTARIZE" = 1 ]]; then notarize "$CLI_ZIP"; fi
 
 "$WORK/bin/effectcraft-cli" --version
 echo "==> done"
diff --git a/packaging/web/package.sh b/packaging/web/package.sh
index 89d767ea1..dc3aaa907 100755
--- a/packaging/web/package.sh
+++ b/packaging/web/package.sh
@@ -11,10 +11,10 @@ set -euo pipefail
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
 HERE="$ROOT/packaging/web"
 
-if [ "${1:-}" != "--skip-build" ]; then
+if [[ "${1:-}" != "--skip-build" ]]; then
   # CI (the shared release workflow installs only trunk): install the wasm-bindgen CLI at the
   # crate's exact version. Locally, `cargo xtask web` says which version to install.
-  if [ -n "${CI:-}" ]; then
+  if [[ -n "${CI:-}" ]]; then
     WASM_BINDGEN_VERSION="$(sed -n 's/^const WASM_BINDGEN: &str = "\(.*\)";$/\1/p' "$ROOT/xtask/src/main.rs")"
     if ! { command -v wasm-bindgen >/dev/null && wasm-bindgen --version | grep -qF "$WASM_BINDGEN_VERSION"; }; then
       cargo install wasm-bindgen-cli --version "$WASM_BINDGEN_VERSION" --locked
@@ -24,7 +24,7 @@ if [ "${1:-}" != "--skip-build" ]; then
 fi
 
 SITE="$CARGO_TARGET_DIR/web/dist"
-[ -f "$SITE/index.html" ] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
+[[ -f "$SITE/index.html" ]] || { echo "error: $SITE/index.html missing; run without --skip-build" >&2; exit 1; }
 # Paths must be relative so the site works under any prefix.
 if grep -Eq '(src|href)="/[^/]' "$SITE/index.html"; then
   echo "error: $SITE/index.html has root-absolute URLs; it would break when served from a sub-path" >&2
diff --git a/packaging/windows/INSTALLATION.md b/packaging/windows/INSTALLATION.md
new file mode 100644
index 000000000..982a5b420
--- /dev/null
+++ b/packaging/windows/INSTALLATION.md
@@ -0,0 +1,35 @@
+# Windows installation policy checks
+
+New installations default to the current account under `Programs\ArtCraft\<App>`.
+The first setup page offers installation for everyone. Scope is selected before duplicate
+checks and directory costing. An update uses the existing context's remembered exact folder;
+`INSTALLFOLDER` supplied explicitly is never replaced. It is a secure MSI property so the
+chosen folder reaches the elevated installer. Silent machine updates pass `ALLUSERS=1`.
+A cross-context copy is refused; changing context means uninstalling the old copy first.
+
+App registration follows the selected context. Existing optional shortcuts and file-handler
+choices stay app-owned. No new cleanup operation or model/settings migration is introduced.
+Packaged resources remain package-owned; separately downloaded shared models are not caches
+and are outside this installer's ownership.
+
+## Repeatable metadata tests
+
+On Windows with WiX 5.0.2 and its matching UI/Util extensions:
+
+```powershell
+./packaging/windows/test-install-policy.ps1 -OutputDirectory ./target/install-policy-tests
+```
+
+The script builds x64, x86 and arm64 packages with deliberately non-executable payloads. It
+uses the actual package source and compiled database. A safe Windows Installer session checks
+24 scope/registration/maintenance cases, remembered and explicit custom folders, sequencing,
+upgrade identity and the original registration inventory recorded in `install-policy.json`.
+The release packaging script runs the compiled checker before signing. Packaging CI runs the
+small fixture builds without compiling the Rust application.
+
+Never install or distribute the `NOT-INSTALLABLE.msi` fixtures as an app. Passing these checks
+does not prove real installation, elevation, legacy-version upgrades, registry writes, optional
+shortcut/menu behaviour, cancellation, rollback or uninstall. Those still require the real
+payload in an authorised clean Windows test environment. Cross-architecture metadata is not
+execution evidence on those architectures. Existing open installer/association PRs must be
+reconciled before publication. Nothing here changes macOS/Linux native packaging conventions.
diff --git a/packaging/windows/check-install-policy.ps1 b/packaging/windows/check-install-policy.ps1
new file mode 100644
index 000000000..5463c0083
--- /dev/null
+++ b/packaging/windows/check-install-policy.ps1
@@ -0,0 +1,370 @@
+<#
+.SYNOPSIS
+  Check the compiled installation policy without installing any product.
+.DESCRIPTION
+  Uses Windows Installer's safe session (OpenPackage option 1). Only property-setting custom
+  actions are exercised. No AppSearch, install, repair, removal or file-writing action runs.
+#>
+param([Parameter(Mandatory = $true)] [string] $MsiPath)
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+$policy = Get-Content -Raw -LiteralPath (Join-Path $PSScriptRoot 'install-policy.json') | ConvertFrom-Json
+function Read-Rows($Database, [string] $Sql, [int] $Columns) {
+  $view = $Database.OpenView($Sql)
+  try {
+    [void]$view.Execute()
+    while ($null -ne ($record = $view.Fetch())) {
+      try {
+        $values = @(for ($i = 1; $i -le $Columns; $i++) {
+          $record.GetType().InvokeMember('StringData', 'GetProperty', $null, $record, @($i))
+        })
+        ,$values
+      } finally { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($record) }
+    }
+  } finally {
+    [void]$view.Close()
+    [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($view)
+  }
+}
+function Set-SessionProperty($Session, [string] $Name, [string] $Value) {
+  [void]$Session.GetType().InvokeMember('Property', 'SetProperty', $null, $Session, @($Name, $Value))
+}
+function Get-SessionProperty($Session, [string] $Name) {
+  $Session.GetType().InvokeMember('Property', 'GetProperty', $null, $Session, @($Name))
+}
+function Get-PackageTemplate($Database) {
+  # Summary information property 7 is the platform: "Intel;1033", "x64;1033" or "Arm64;1033".
+  $summary = $Database.GetType().InvokeMember('SummaryInformation', 'GetProperty', $null, $Database, @(0))
+  try { [string]$summary.GetType().InvokeMember('Property', 'GetProperty', $null, $summary, @(7)) }
+  finally { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($summary) }
+}
+$installer = $null; $database = $null; $session = $null
+try {
+  $installer = New-Object -ComObject WindowsInstaller.Installer
+  $file = (Resolve-Path -LiteralPath $MsiPath).Path
+  $database = $installer.OpenDatabase($file, 0)
+  $session = $installer.OpenPackage($file, 1)
+  $properties = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Property`, `Value` FROM `Property`' 2)) { $properties[$row[0]] = $row[1] }
+  $secureProperties = @($properties['SecureCustomProperties'] -split ';')
+  if ('INSTALLFOLDER' -notin $secureProperties) {
+    throw 'The selected installation folder must survive elevation (secure INSTALLFOLDER).'
+  }
+  if ($policy.mode -eq 'perUser') {
+    if ($properties.ContainsKey('ALLUSERS')) { throw 'Launcher must remain per-user; machine self-update is not part of this change.' }
+    if ($properties['UpgradeCode'].Trim('{}') -ne $policy.upgradeCode) { throw 'Launcher upgrade identity changed.' }
+    $dirs = @{}
+    foreach ($row in (Read-Rows $database 'SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`' 3)) { $dirs[$row[0]] = @($row[1],$row[2]) }
+    if ($dirs['INSTALLFOLDER'][0] -ne 'CraftSuiteFolder' -or $dirs['CraftSuiteFolder'][1] -ne 'ArtCraft' -or
+        $dirs['CraftSuiteFolder'][0] -ne 'LocalProgramsFolder' -or $dirs['LocalProgramsFolder'][0] -ne 'LocalAppDataFolder') {
+      throw 'Launcher new-install folder must be under the per-user ArtCraft suite root.'
+    }
+    foreach ($explicit in @('', 'F:\Chosen exact launcher')) {
+      Set-SessionProperty $session 'PREVIOUSINSTALLFOLDER' 'E:\Existing exact launcher'
+      Set-SessionProperty $session 'INSTALLFOLDER' $explicit
+      $row = @(Read-Rows $database 'SELECT `Condition` FROM `InstallUISequence` WHERE `Action` = ''CraftRestoreLauncherFolder''' 1)[0]
+      if ($session.EvaluateCondition($row[0]) -eq 1) {
+        if ($session.DoAction('CraftRestoreLauncherFolder') -ne 1) { throw 'Launcher restore action failed.' }
+      }
+      $expected = if ($explicit) { $explicit } else { 'E:\Existing exact launcher' }
+      if ((Get-SessionProperty $session 'INSTALLFOLDER') -ne $expected) { throw 'Launcher custom or existing path was lost.' }
+    }
+    $rows = @(Read-Rows $database 'SELECT `Root`, `Key`, `Name`, `Value` FROM `Registry`' 4)
+    if (@($rows | Where-Object { $_[0] -ne '1' }).Count) { throw 'Launcher registration must stay under the current account.' }
+    foreach ($entry in $policy.registry) {
+      if (@($rows | Where-Object { $_[0] -eq $entry[0] -and $_[1] -eq $entry[1] -and $_[2] -eq $entry[2] -and $_[3] -eq $entry[3] }).Count -ne 1) {
+        throw 'Launcher registration or shortcut preference changed unexpectedly.'
+      }
+    }
+    Write-Output 'PASS ArtCraft Launcher: per-user scope, suite folder, remembered/custom paths and existing registration. No installation performed.'
+    return
+  }
+  if ($properties['ALLUSERS'] -ne '2' -or $properties['MSIINSTALLPERUSER'] -ne '1') {
+    throw 'Policy regression: new packages must default to the per-user dual-scope context.'
+  }
+  if ($properties['UpgradeCode'].Trim('{}') -ne $policy.upgradeCode) { throw 'The existing upgrade identity must not change.' }
+  $directories = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`' 3)) {
+    $directories[$row[0]] = @($row[1], $row[2])
+  }
+  if ($directories['INSTALLFOLDER'][0] -ne 'CraftSuiteFolder' -or
+      $directories['CraftSuiteFolder'][1] -ne 'ArtCraft') { throw 'Expected the app under the ArtCraft suite folder.' }
+  $programs = $directories['CraftSuiteFolder'][0]
+  if ($programs -eq 'ProgramFiles6432Folder') { $programs = $directories[$programs][0] }
+  if ($programs -notin 'ProgramFilesFolder', 'ProgramFiles64Folder') {
+    throw 'Use Windows Installer native folder redirection, not a hard-coded profile path.'
+  }
+  $guards = @(Read-Rows $database 'SELECT `Condition`, `Description` FROM `LaunchCondition`' 2 |
+    Where-Object { $_[0] -match 'CRAFT_(USER|MACHINE)_DIR' })
+  if ($guards.Count -ne 2) { throw 'Expected both duplicate-installation guards.' }
+  $cases = 0
+  foreach ($scope in @('', '2', '1')) {
+    foreach ($user in @('', 'D:\Existing user app')) {
+      foreach ($machine in @('', 'E:\Existing machine app')) {
+        foreach ($installed in @('', '1')) {
+          Set-SessionProperty $session 'ALLUSERS' $scope
+          Set-SessionProperty $session 'Installed' $installed
+          Set-SessionProperty $session 'CRAFT_USER_DIR' $user
+          Set-SessionProperty $session 'CRAFT_MACHINE_DIR' $machine
+          $allowed = $true
+          foreach ($guard in $guards) {
+            $value = $session.EvaluateCondition($guard[0])
+            if ($value -notin 0, 1) { throw 'Invalid duplicate guard.' }
+            if ($value -eq 0) { $allowed = $false }
+          }
+          $opposite = if ($scope -eq '1') { $user } else { $machine }
+          $expected = [bool]$installed -or -not [bool]$opposite
+          if ($allowed -ne $expected) { throw "Scope regression: ALLUSERS='$scope', user=$([bool]$user), machine=$([bool]$machine), maintenance=$([bool]$installed)." }
+          $cases++
+        }
+      }
+    }
+  }
+  # Execute the actual authored type-51 actions in a safe session, not copied resolver logic.
+  foreach ($scope in @('', '2', '1')) {
+    foreach ($explicit in @('', 'F:\Chosen exact app')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      Set-SessionProperty $session 'INSTALLFOLDER' $explicit
+      Set-SessionProperty $session 'CRAFT_USER_DIR' 'D:\Existing user app'
+      Set-SessionProperty $session 'CRAFT_MACHINE_DIR' 'E:\Existing machine app'
+      $action = if ($scope -eq '1') { 'CraftRestoreMachineFolder' } else { 'CraftRestoreUserFolder' }
+      # Evaluate the compiled condition, so the test exercises it instead of calling the action directly.
+      $restore = @(Read-Rows $database ('SELECT `Condition` FROM `InstallExecuteSequence` WHERE `Action` = ''{0}''' -f $action) 1)[0]
+      $selected = $session.EvaluateCondition($restore[0]) -eq 1
+      if ($selected -eq [bool]$explicit) { throw "$action must run only when no folder was supplied (condition: $($restore[0]))." }
+      if ($selected -and $session.DoAction($action) -ne 1) { throw 'Remembered-folder property action failed.' }
+      $expected = if ($explicit) { $explicit } elseif ($scope -eq '1') { 'E:\Existing machine app' } else { 'D:\Existing user app' }
+      if ((Get-SessionProperty $session 'INSTALLFOLDER') -ne $expected) { throw 'Custom or remembered folder was not preserved.' }
+    }
+  }
+  $ui = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Action`, `Sequence` FROM `InstallUISequence`' 2)) { $ui[$row[0]] = [int]$row[1] }
+  if (-not ($ui['AppSearch'] -lt $ui['CraftPreferMachineScope'] -and
+      $ui['CraftPreferMachineScope'] -lt $ui['CraftScopeDlg'] -and
+      $ui['CraftScopeDlg'] -lt $ui['FindRelatedProducts'] -and
+      $ui['FindRelatedProducts'] -lt $ui['LaunchConditions'] -and
+      $ui['CraftScopeDlg'] -lt $ui['CraftRestoreUserFolder'] -and $ui['CraftRestoreUserFolder'] -lt $ui['CostInitialize'] -and
+      $ui['CraftScopeDlg'] -lt $ui['CraftRestoreMachineFolder'] -and $ui['CraftRestoreMachineFolder'] -lt $ui['CostInitialize'])) {
+    throw 'Scope must be chosen after AppSearch and before FindRelatedProducts, launch checks and costing.'
+  }
+  # Windows Installer resolves Program Files for the context it started in, before the wizard's scope choice.
+  # The wizard therefore sets the new-install folder itself, and only in the wizard.
+  $defaults = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallUISequence`' 3 | Where-Object { $_[0] -like 'CraftDefault*' })
+  if ($defaults.Count -lt 2) { throw 'The wizard must set the new-install folder after the scope page; Program Files is resolved before the choice.' }
+  foreach ($row in $defaults) {
+    if (-not ($ui['CraftScopeDlg'] -lt [int]$row[1] -and [int]$row[1] -lt $ui['CostInitialize'])) { throw "$($row[0]) must run after the scope page and before costing." }
+  }
+  if (@(Read-Rows $database 'SELECT `Action` FROM `InstallExecuteSequence`' 1 | Where-Object { $_[0] -like 'CraftDefault*' }).Count) {
+    throw 'Silent installs must not use the wizard-only default folder actions.'
+  }
+  # The machine default comes from the environment of the package architecture, not from a folder name.
+  # x86 packages use Program Files (x86) on 64-bit Windows; x64 and Arm64 packages use the 64-bit root.
+  $machineRoot = if ((Get-PackageTemplate $database) -match '^Intel') {
+    if (Get-SessionProperty $session 'VersionNT64') { ${env:ProgramFiles(x86)} } else { $env:ProgramFiles }
+  } elseif ($env:ProgramW6432) { $env:ProgramW6432 } else { $env:ProgramFiles }
+  $machineFolder = (Join-Path $machineRoot "ArtCraft\$($policy.name)") + '\'
+  foreach ($scope in @('1', '')) {
+    Set-SessionProperty $session 'ALLUSERS' $scope
+    Set-SessionProperty $session 'INSTALLFOLDER' ''
+    Set-SessionProperty $session 'CRAFT_MACHINE_DIR' ''
+    Set-SessionProperty $session 'CRAFT_USER_DIR' ''
+    foreach ($row in @($defaults | Sort-Object { [int]$_[1] })) {
+      if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+    }
+    $folder = Get-SessionProperty $session 'INSTALLFOLDER'
+    $wanted = if ($scope -eq '1') { $machineFolder } else { (Join-Path $env:LOCALAPPDATA "Programs\ArtCraft\$($policy.name)") + '\' }
+    if ($folder -ine $wanted) { throw "Wizard default folder for ALLUSERS='$scope' is '$folder', expected '$wanted'." }
+  }
+  # Replay the wizard's compiled folder actions in sequence order, as the full UI runs them. A remembered
+  # folder must win over the new-install default, and a folder the user typed must survive both.
+  $uiFolderActions = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallUISequence`' 3 |
+    Where-Object { $_[0] -match '^Craft(Restore|Default)' } | Sort-Object { [int]$_[1] })
+  $userDefault = (Join-Path $env:LOCALAPPDATA "Programs\ArtCraft\$($policy.name)") + '\'
+  foreach ($case in @(
+      @('1', 'D:\Remembered user app', 'E:\Remembered machine app', '', 'E:\Remembered machine app'),
+      @('', 'D:\Remembered user app', 'E:\Remembered machine app', '', 'D:\Remembered user app'),
+      @('1', '', '', '', $machineFolder),
+      @('', '', '', '', $userDefault),
+      @('1', 'D:\Remembered user app', 'E:\Remembered machine app', 'F:\Chosen exact app', 'F:\Chosen exact app'))) {
+    Set-SessionProperty $session 'Installed' ''
+    Set-SessionProperty $session 'ALLUSERS' $case[0]
+    Set-SessionProperty $session 'CRAFT_USER_DIR' $case[1]
+    Set-SessionProperty $session 'CRAFT_MACHINE_DIR' $case[2]
+    Set-SessionProperty $session 'INSTALLFOLDER' $case[3]
+    foreach ($row in $uiFolderActions) {
+      if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+    }
+    $folder = Get-SessionProperty $session 'INSTALLFOLDER'
+    if ($folder -ine $case[4]) { throw "Full-UI folder for ALLUSERS='$($case[0])' is '$folder', expected '$($case[4])'." }
+  }
+  $execute = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Action`, `Sequence` FROM `InstallExecuteSequence`' 2)) { $execute[$row[0]] = [int]$row[1] }
+  foreach ($action in @('CraftRestoreUserFolder','CraftRestoreMachineFolder')) {
+    if (-not ($execute['AppSearch'] -lt $execute[$action] -and $execute[$action] -lt $execute['CostInitialize'])) {
+      throw 'Silent updates must restore the folder before directory costing.'
+    }
+  }
+  foreach ($resolver in @('CraftUFromLegacyExe','CraftMFromLegacyExe')) {
+    if (-not ($execute['AppSearch'] -lt $execute[$resolver] -and $execute[$resolver] -lt $execute['LaunchConditions'])) {
+      throw 'Both legacy folder resolvers must run after AppSearch and before the launch checks.'
+    }
+  }
+  # AppSearch itself never runs in this safe session, so check the compiled searches and then run the
+  # property actions that turn the search results into the remembered folder, once per scope.
+  $appSearch = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Property`, `Signature_` FROM `AppSearch`' 2)) { $appSearch[$row[0]] = $row[1] }
+  $locators = @{}
+  foreach ($row in (Read-Rows $database 'SELECT `Signature_`, `Root`, `Key`, `Name`, `Type` FROM `RegLocator`' 5)) { $locators[$row[0]] = $row }
+  $appPaths = '^Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\[^\\]+\.exe$'
+  # Suffix, how to match the key, key, value name, locator type (2 = raw value, 1 = file; the 64-bit flag is masked off).
+  $searchContract = @(
+    @('DIR',       'exact', "Software\$($policy.name)", 'InstallDir',    '2'),
+    @('FOLDER',    'exact', "Software\$($policy.name)", 'InstallFolder', '2'),
+    @('PATH',      'regex', $appPaths,                  'Path',          '2'),
+    @('EXEFOLDER', 'regex', $appPaths,                  '',              '1'),
+    @('EXE',       'regex', $appPaths,                  '',              '1'))
+  $resolverCases = @(
+    @{ name = 'every record, DIR wins';        dir = 'D:\Dir\'; folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Dir\' },
+    @{ name = 'FOLDER wins without DIR';       dir = '';        folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Folder\' },
+    @{ name = 'PATH wins without DIR, FOLDER'; dir = '';        folder = '';           path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Path\' },
+    @{ name = 'legacy exe folder is last';     dir = '';        folder = '';           path = '';         exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = '';            expected = 'D:\Exe\' },
+    @{ name = 'legacy folder needs the exe';   dir = '';        folder = '';           path = '';         exeFolder = 'D:\Exe\'; exe = '';               existing = '';            expected = '' },
+    @{ name = 'a preset folder is kept';       dir = 'D:\Dir\'; folder = 'D:\Folder\'; path = 'D:\Path\'; exeFolder = 'D:\Exe\'; exe = 'D:\Exe\app.exe'; existing = 'P:\Preset\'; expected = 'P:\Preset\' })
+  foreach ($scopeSpec in @(@('U', '1', 'CRAFT_USER_DIR'), @('M', '2', 'CRAFT_MACHINE_DIR'))) {
+    $letter = $scopeSpec[0]; $target = $scopeSpec[2]
+    foreach ($item in $searchContract) {
+      $property = "CRAFT_${letter}_$($item[0])"
+      $locator = if ($appSearch.ContainsKey($property)) { $locators[$appSearch[$property]] } else { $null }
+      $keyOk = $null -ne $locator -and $(if ($item[1] -eq 'exact') { $locator[2] -eq $item[2] } else { $locator[2] -match $item[2] })
+      if (-not $keyOk -or $locator[1] -ne $scopeSpec[1] -or $locator[3] -ne $item[3] -or ([int]$locator[4] -band 3) -ne [int]$item[4]) {
+        throw "Compiled search for $property is missing or points at the wrong registry location."
+      }
+    }
+    $chain = @(Read-Rows $database 'SELECT `Action`, `Sequence`, `Condition` FROM `InstallExecuteSequence`' 3 |
+      Where-Object { $_[0] -match "^Craft${letter}From" } | Sort-Object { [int]$_[1] })
+    $order = @($chain | ForEach-Object { $_[0] }) -join ','
+    if ($order -ne "Craft${letter}FromDIR,Craft${letter}FromFOLDER,Craft${letter}FromPATH,Craft${letter}FromLegacyExe") {
+      throw "Remembered-folder resolvers for scope $letter run in the wrong order: $order"
+    }
+    foreach ($case in $resolverCases) {
+      Set-SessionProperty $session $target $case.existing
+      Set-SessionProperty $session "CRAFT_${letter}_DIR" $case.dir
+      Set-SessionProperty $session "CRAFT_${letter}_FOLDER" $case.folder
+      Set-SessionProperty $session "CRAFT_${letter}_PATH" $case.path
+      Set-SessionProperty $session "CRAFT_${letter}_EXEFOLDER" $case.exeFolder
+      Set-SessionProperty $session "CRAFT_${letter}_EXE" $case.exe
+      foreach ($row in $chain) {
+        if ($session.EvaluateCondition($row[2]) -eq 1 -and $session.DoAction($row[0]) -ne 1) { throw "$($row[0]) failed." }
+      }
+      $got = Get-SessionProperty $session $target
+      if ($got -ne $case.expected) { throw "Resolver chain for scope $letter, case '$($case.name)': got '$got', expected '$($case.expected)'." }
+    }
+  }
+  # Switching the first-page choice must reset BOTH properties, including a back-and-forth change.
+  $events = @(Read-Rows $database 'SELECT `Event`, `Argument`, `Condition`, `Ordering` FROM `ControlEvent` WHERE `Dialog_` = ''CraftScopeDlg'' AND `Control_` = ''Next'' ORDER BY `Ordering`' 4)
+  # Model the full-UI upgrade entry with an existing machine-wide copy. Run
+  # the actual preference action, then the compiled Next events before discovery.
+  Set-SessionProperty $session 'ALLUSERS' '2'
+  Set-SessionProperty $session 'CRAFT_SCOPE' 'user'
+  Set-SessionProperty $session 'CRAFT_USER_DIR' ''
+  Set-SessionProperty $session 'CRAFT_MACHINE_DIR' 'E:\Existing machine app'
+  $preference = @(Read-Rows $database 'SELECT `Condition` FROM `InstallUISequence` WHERE `Action` = ''CraftPreferMachineScope''' 1)[0]
+  if ($session.EvaluateCondition($preference[0]) -ne 1 -or $session.DoAction('CraftPreferMachineScope') -ne 1 -or
+      (Get-SessionProperty $session 'CRAFT_SCOPE') -ne 'machine') {
+    throw 'Full-UI machine upgrades must initially select the existing machine context.'
+  }
+  foreach ($choice in @('machine','user','machine','user')) {
+    Set-SessionProperty $session 'CRAFT_SCOPE' $choice
+    foreach ($event in $events) {
+      if ($event[0] -notmatch '^\[([^\]]+)\]$') { continue }
+      $property = $Matches[1]
+      if ($session.EvaluateCondition($event[2]) -eq 1) {
+        Set-SessionProperty $session $property $(if ($event[1] -eq '{}') { '' } else { $event[1] })
+      }
+    }
+    $allUsers = Get-SessionProperty $session 'ALLUSERS'
+    $perUser = Get-SessionProperty $session 'MSIINSTALLPERUSER'
+    if (($choice -eq 'machine' -and ($allUsers -ne '1' -or $perUser)) -or
+        ($choice -eq 'user' -and ($allUsers -or $perUser -ne '1'))) {
+      throw 'Scope selector does not reset the requested installation context.'
+    }
+  }
+  $actions = @(Read-Rows $database 'SELECT `Action`, `Source`, `Target`, `Type` FROM `CustomAction`' 4)
+  $savedOptions = @($actions | Where-Object { $_[0] -match '^CraftLoadOption[0-9]+M$' })
+  foreach ($option in $savedOptions) {
+    if ([int]$option[3] -ne 51) { throw 'Saved-option test may run only property-setting actions.' }
+    $number = [regex]::Match($option[0], '[0-9]+').Value
+    foreach ($scope in @('2','1')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      Set-SessionProperty $session "CRAFT_OPTION_${number}_M" 'saved-machine-choice'
+      Set-SessionProperty $session "CRAFT_OPTION_${number}_U" 'saved-user-choice'
+      Set-SessionProperty $session $option[1] ''
+      $action = "CraftLoadOption$number" + $(if ($scope -eq '1') { 'M' } else { 'U' })
+      if ($session.DoAction($action) -ne 1) { throw 'Saved-option property action failed.' }
+      $expected = if ($scope -eq '1') { 'saved-machine-choice' } else { 'saved-user-choice' }
+      if ((Get-SessionProperty $session $option[1]) -ne $expected) { throw 'Saved installer choices leaked across contexts.' }
+    }
+  }
+  # Follow the compiled control conditions, not the source's intended appearance.
+  $controls = @(Read-Rows $database 'SELECT `Dialog_`, `Control`, `Type`, `Attributes`, `Text` FROM `Control`' 5)
+  $conditions = @()
+  if (@(Read-Rows $database 'SELECT `Name` FROM `_Tables` WHERE `Name` = ''ControlCondition''' 1).Count) {
+    $conditions = @(Read-Rows $database 'SELECT `Dialog_`, `Control_`, `Action`, `Condition` FROM `ControlCondition`' 4)
+  }
+  function Test-ControlVisible($Control) {
+    $visible = ([int]$Control[3] -band 1) -ne 0
+    foreach ($condition in $conditions) {
+      if ($condition[0] -eq $Control[0] -and $condition[1] -eq $Control[1] -and $session.EvaluateCondition($condition[3]) -eq 1) {
+        if ($condition[2] -eq 'Show') { $visible = $true }
+        if ($condition[2] -eq 'Hide') { $visible = $false }
+      }
+    }
+    return $visible
+  }
+  foreach ($button in @($controls | Where-Object { $_[0] -in 'InstallWelcome','InstallMaintenance','DesktopShortcutDlg' -and ([int]$_[3] -band 8388608) -ne 0 })) {
+    $plain = @($controls | Where-Object { $_[0] -eq $button[0] -and $_[1] -eq ($button[1] + 'User') })
+    if ($plain.Count -ne 1 -or ([int]$plain[0][3] -band 8388608)) { throw 'Scope-aware buttons need an unshielded per-user counterpart.' }
+    foreach ($scope in @('', '2', '1')) {
+      Set-SessionProperty $session 'ALLUSERS' $scope
+      if ((Test-ControlVisible $button) -ne ($scope -eq '1') -or (Test-ControlVisible $plain[0]) -ne ($scope -ne '1')) {
+        throw 'The elevation shield must follow the selected scope.'
+      }
+    }
+    $dialog = $button[0]; $shieldId = $button[1]; $plainId = $plain[0][1]
+    $shieldEvents = @(Read-Rows $database "SELECT ``Event``, ``Argument``, ``Condition``, ``Ordering`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$shieldId' ORDER BY ``Ordering``" 4 | ForEach-Object { $_ -join '|' })
+    $plainEvents = @(Read-Rows $database "SELECT ``Event``, ``Argument``, ``Condition``, ``Ordering`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$plainId' ORDER BY ``Ordering``" 4 | ForEach-Object { $_ -join '|' })
+    if (($shieldEvents -join "`n") -ne ($plainEvents -join "`n")) { throw 'Per-user and machine buttons must perform the same operation.' }
+  }
+  foreach ($scope in @('', '2', '1')) {
+    Set-SessionProperty $session 'ALLUSERS' $scope
+    foreach ($text in @($controls | Where-Object { $_[4] -like '*for all users*' })) {
+      if ((Test-ControlVisible $text) -ne ($scope -eq '1')) { throw 'The welcome-page scope text must follow the selected scope.' }
+    }
+  }
+  if ($policy.id -in 'deckcraft','filmcraft','soundcraft') {
+    foreach ($route in @(@('WelcomeDlg','Next','InstallDirDlg'),@('InstallDirDlg','Back','WelcomeDlg'))) {
+      $dialog = $route[0]; $control = $route[1]
+      $routes = @(Read-Rows $database "SELECT ``Argument``, ``Condition`` FROM ``ControlEvent`` WHERE ``Dialog_`` = '$dialog' AND ``Control_`` = '$control' AND ``Event`` = 'NewDialog' ORDER BY ``Ordering``" 2)
+      Set-SessionProperty $session 'Installed' ''
+      $destination = ''
+      foreach ($event in $routes) { if ($session.EvaluateCondition($event[1]) -eq 1) { $destination = $event[0] } }
+      if ($destination -ne $route[2]) { throw 'Skipping the licence page must work in both navigation directions.' }
+    }
+  }
+  $registry = @(Read-Rows $database 'SELECT `Root`, `Key`, `Name`, `Value` FROM `Registry`' 4)
+  if (@($registry | Where-Object { $_[0] -in '1', '2' }).Count) { throw 'Registration must follow the selected context, not force HKCU or HKLM.' }
+  if (@($registry | Where-Object { $_[0] -eq '0' -and $_[1] -match '^Software\\Classes(\\|$)' }).Count) {
+    throw 'HKCR keys must be relative to Classes.'
+  }
+  foreach ($entry in $policy.registry) {
+    $found = @($registry | Where-Object { $_[0] -eq $entry[0] -and $_[1] -eq $entry[1] -and $_[2] -eq $entry[2] -and $_[3] -eq $entry[3] })
+    if ($found.Count -ne 1) { throw "Lost or changed registration: $($entry[1]) / $($entry[2])" }
+  }
+  $installDir = @($registry | Where-Object { $_[0] -eq '-1' -and $_[1] -eq "Software\$($policy.name)" -and $_[2] -eq 'InstallDir' -and $_[3] -eq '[INSTALLFOLDER]' })
+  if ($installDir.Count -ne 1) { throw 'A context-sensitive installation-folder record is required.' }
+  Write-Output "PASS $($policy.name): $cases scope cases, folder preservation, action sequencing and registry contract. No installation performed."
+} finally {
+  foreach ($com in @($session, $database, $installer)) {
+    if ($null -ne $com) { [void][Runtime.InteropServices.Marshal]::FinalReleaseComObject($com) }
+  }
+}
diff --git a/packaging/windows/effectcraft.wxs b/packaging/windows/effectcraft.wxs
index 00b0c5d6a..f330ca061 100644
--- a/packaging/windows/effectcraft.wxs
+++ b/packaging/windows/effectcraft.wxs
@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  EffectCraft MSI (WiX Toolset v5: `dotnet tool install -g wix`). Built by package.ps1:
-
-    wix build effectcraft.wxs installer-ui.wxs -arch x64 -d Version=1.2.3 -d BinDir=... -d IconPath=... -o out.msi
-
-  Per-machine install into Program Files (or a folder the user picks), a Start Menu shortcut and,
-  unless DESKTOPSHORTCUT=0 (the wizard's "Create a desktop shortcut" box), a desktop shortcut.
--->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package
-      Name="EffectCraft"
-      Manufacturer="Learning Machines LLC"
-      Version="$(var.Version)"
-      UpgradeCode="AACA8593-C6ED-40A8-BA6C-CB325D8529F9"
-      Scope="perMachine"
-      Compressed="yes"
-      Language="1033">
+  <Package Name="EffectCraft" Manufacturer="Learning Machines LLC" Version="$(var.Version)" UpgradeCode="AACA8593-C6ED-40A8-BA6C-CB325D8529F9" Scope="perUserOrMachine" Compressed="yes" Language="1033">
     <SummaryInformation Description="EffectCraft motion graphics and visual effects" Manufacturer="Learning Machines LLC" />
+    <?include $(sys.SOURCEFILEDIR)install-policy.wxi?>
     <!-- Same-version upgrades let successive pre-releases of one X.Y.Z replace each other
          (MSI versions are numeric, so 1.2.3-rc.1 and 1.2.3-rc.2 are both 1.2.3). -->
-    <MajorUpgrade AllowSameVersionUpgrades="yes"
-        DowngradeErrorMessage="A newer version of EffectCraft is already installed." />
+    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of EffectCraft is already installed." />
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <!-- The setup wizard (installer-ui.wxs): pick the folder on a fresh install. -->
     <UIRef Id="EffectcraftUI" />
@@ -36,32 +21,24 @@
          could be put elsewhere with INSTALLFOLDER=...) the folder of the effectcraft.exe that App Paths names. A
          "file" search with no FileSearch inside yields that file's folder. A folder passed on the
          command line (INSTALLFOLDER=...) wins. -->
-    <Property Id="INSTALLFOLDER" Secure="yes" />
     <Property Id="PREVIOUSINSTALLFOLDER" Secure="yes">
-      <RegistrySearch Id="PreviousInstallFolder" Root="HKLM" Type="directory"
-          Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" />
+      <RegistrySearch Id="PreviousInstallFolder" Root="HKLM" Type="directory" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" />
     </Property>
     <Property Id="PREVIOUSEXEFOLDER" Secure="yes">
-      <RegistrySearch Id="PreviousExeFolder" Root="HKLM" Type="file"
-          Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" />
+      <RegistrySearch Id="PreviousExeFolder" Root="HKLM" Type="file" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" />
     </Property>
-    <SetProperty Id="INSTALLFOLDER" Value="[PREVIOUSINSTALLFOLDER]" After="AppSearch" Sequence="both"
-        Condition="PREVIOUSINSTALLFOLDER AND NOT INSTALLFOLDER" />
-    <SetProperty Id="INSTALLFOLDER" Action="SetINSTALLFOLDERFromExe" Value="[PREVIOUSEXEFOLDER]"
-        After="SetINSTALLFOLDER" Sequence="both" Condition="PREVIOUSEXEFOLDER AND NOT INSTALLFOLDER" />
-
     <!-- The desktop shortcut: on by default for a fresh install (a box in the wizard, or
          DESKTOPSHORTCUT=0 silently); an upgrade keeps what the installed copy chose, and adds none
          to an install from before this option. -->
     <Property Id="DESKTOPSHORTCUT" Value="1" Secure="yes" />
     <Property Id="PREVIOUSDESKTOPSHORTCUT" Secure="yes">
-      <RegistrySearch Id="PreviousDesktopShortcut" Root="HKLM" Type="raw" Key="Software\EffectCraft" Name="DesktopShortcut" />
-    </Property>
-    <SetProperty Id="DESKTOPSHORTCUT" Value="[PREVIOUSDESKTOPSHORTCUT]" After="SetINSTALLFOLDERFromExe" Sequence="both"
-        Condition="WIX_UPGRADE_DETECTED" />
+      </Property>
+    <SetProperty Id="DESKTOPSHORTCUT" Value="[PREVIOUSDESKTOPSHORTCUT]" After="CraftLoadOption1U" Sequence="both" Condition="WIX_UPGRADE_DETECTED" />
 
     <StandardDirectory Id="ProgramFiles6432Folder">
-      <Directory Id="INSTALLFOLDER" Name="EffectCraft" />
+      <Directory Id="CraftSuiteFolder" Name="ArtCraft">
+        <Directory Id="INSTALLFOLDER" Name="EffectCraft" />
+      </Directory>
     </StandardDirectory>
     <StandardDirectory Id="ProgramMenuFolder" />
     <StandardDirectory Id="DesktopFolder" />
@@ -69,21 +46,25 @@
     <Feature Id="Main" Title="EffectCraft" Level="1">
       <ComponentGroupRef Id="EffectcraftFiles" />
     </Feature>
-  </Package>
+  <Property Id="CRAFT_OPTION_1_M" Secure="yes"><RegistrySearch Id="CRAFT_OPTION_1_MSearch" Root="HKLM" Type="raw" Key="Software\EffectCraft" Name="DesktopShortcut" />
+    </Property><SetProperty Id="PREVIOUSDESKTOPSHORTCUT" Action="CraftLoadOption1M" Value="[CRAFT_OPTION_1_M]" After="LaunchConditions" Sequence="both" Condition="ALLUSERS = 1" /><Property Id="CRAFT_OPTION_1_U" Secure="yes"><RegistrySearch Id="CRAFT_OPTION_1_USearch" Root="HKCU" Type="raw" Key="Software\EffectCraft" Name="DesktopShortcut" />
+    </Property><SetProperty Id="PREVIOUSDESKTOPSHORTCUT" Action="CraftLoadOption1U" Value="[CRAFT_OPTION_1_U]" After="CraftLoadOption1M" Sequence="both" Condition="ALLUSERS &lt;&gt; 1" /></Package>
 
   <Fragment>
     <ComponentGroup Id="EffectcraftFiles" Directory="INSTALLFOLDER">
+      <Component Id="EffectcraftNotice">
+        <File Id="EffectcraftNoticeFile" Source="$(var.BinDir)\NOTICE" KeyPath="yes" />
+      </Component>
       <Component Id="EffectcraftApp" Guid="BA719860-95FE-4154-B265-47006B8E9083">
         <File Id="EffectcraftExe" Source="$(var.BinDir)\effectcraft.exe" KeyPath="yes">
-          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="EffectCraft"
-              Description="EffectCraft motion graphics and visual effects" WorkingDirectory="INSTALLFOLDER" Advertise="yes"
-              Icon="EffectcraftIcon.ico" IconIndex="0" />
+          <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuFolder" Name="EffectCraft" Description="EffectCraft motion graphics and visual effects" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="EffectcraftIcon.ico" IconIndex="0" />
         </File>
 
-        <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Value="[#EffectcraftExe]" Type="string" />
-        <RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" Value="[INSTALLFOLDER]" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Value="[#EffectcraftExe]" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" Value="[INSTALLFOLDER]" Type="string" />
         <!-- The desktop shortcut choice, for the next upgrade (empty: none). -->
-        <RegistryValue Root="HKLM" Key="Software\EffectCraft" Name="DesktopShortcut" Value="[DESKTOPSHORTCUT]" Type="string" />
+        <RegistryValue Root="HKMU" Key="Software\EffectCraft" Name="DesktopShortcut" Value="[DESKTOPSHORTCUT]" Type="string" />
+      <RegistryValue Root="HKMU" Key="Software\EffectCraft" Name="InstallDir" Value="[INSTALLFOLDER]" Type="string" />
       </Component>
 
       <Component Id="EffectcraftCli">
@@ -92,9 +73,8 @@
 
       <!-- A component under the user's profile folders needs an HKCU key path (ICE38, ICE43). -->
       <Component Id="DesktopShortcut" Directory="DesktopFolder" Condition="DESKTOPSHORTCUT = &quot;1&quot;">
-        <Shortcut Id="DesktopShortcut" Name="EffectCraft" Description="EffectCraft motion graphics and visual effects"
-            Target="[#EffectcraftExe]" WorkingDirectory="INSTALLFOLDER" Icon="EffectcraftIcon.ico" IconIndex="0" />
-        <RegistryValue Root="HKCU" Key="Software\EffectCraft" Name="DesktopShortcut" Value="1" Type="string" KeyPath="yes" />
+        <Shortcut Id="DesktopShortcut" Name="EffectCraft" Description="EffectCraft motion graphics and visual effects" Target="[#EffectcraftExe]" WorkingDirectory="INSTALLFOLDER" Icon="EffectcraftIcon.ico" IconIndex="0" />
+        <RegistryValue Root="HKMU" Key="Software\EffectCraft" Name="DesktopShortcut" Value="1" Type="string" KeyPath="yes" />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/packaging/windows/install-policy.json b/packaging/windows/install-policy.json
new file mode 100644
index 000000000..6553d217b
--- /dev/null
+++ b/packaging/windows/install-policy.json
@@ -0,0 +1,44 @@
+{
+  "id": "effectcraft",
+  "name": "EffectCraft",
+  "upgradeCode": "AACA8593-C6ED-40A8-BA6C-CB325D8529F9",
+  "sources": [
+    "effectcraft.wxs",
+    "installer-ui.wxs"
+  ],
+  "icon": "assets/app-icon/effectcraft.ico",
+  "localization": [],
+  "extensions": [],
+  "payloads": [
+    "NOTICE",
+    "effectcraft-cli.exe",
+    "effectcraft.exe"
+  ],
+  "registry": [
+    [
+      "-1",
+      "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\effectcraft.exe",
+      "",
+      "[#EffectcraftExe]"
+    ],
+    [
+      "-1",
+      "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\effectcraft.exe",
+      "Path",
+      "[INSTALLFOLDER]"
+    ],
+    [
+      "-1",
+      "Software\\EffectCraft",
+      "DesktopShortcut",
+      "[DESKTOPSHORTCUT]"
+    ],
+    [
+      "-1",
+      "Software\\EffectCraft",
+      "DesktopShortcut",
+      "1"
+    ]
+  ],
+  "mode": "dualScope"
+}
diff --git a/packaging/windows/install-policy.wxi b/packaging/windows/install-policy.wxi
new file mode 100644
index 000000000..669c08126
--- /dev/null
+++ b/packaging/windows/install-policy.wxi
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <!-- Choose scope before launch checks and directory costing. Never move an existing copy. -->
+  <!-- Only for me leaves ALLUSERS unset. Publishing ALLUSERS=2 here makes FindRelatedProducts treat the run as
+       per-machine and skip the existing per-user copy, so an interactive upgrade installs beside it
+       (two registered products, and uninstall leaves files behind). Checked with real msiexec runs. -->
+  <Property Id="INSTALLFOLDER" Secure="yes" />
+  <Property Id="CRAFT_SCOPE" Value="user" Secure="yes" />
+  <Property Id="CRAFT_U_DIR" Secure="yes"><RegistrySearch Id="CRAFT_U_DIRSearch" Root="HKCU" Key="Software\EffectCraft" Name="InstallDir" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromDIR" Value="[CRAFT_U_DIR]" After="AppSearch" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_DIR" />
+  <Property Id="CRAFT_U_FOLDER" Secure="yes"><RegistrySearch Id="CRAFT_U_FOLDERSearch" Root="HKCU" Key="Software\EffectCraft" Name="InstallFolder" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromFOLDER" Value="[CRAFT_U_FOLDER]" After="CraftUFromDIR" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_FOLDER" />
+  <Property Id="CRAFT_U_PATH" Secure="yes"><RegistrySearch Id="CRAFT_U_PATHSearch" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromPATH" Value="[CRAFT_U_PATH]" After="CraftUFromFOLDER" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_PATH" />
+  <Property Id="CRAFT_U_EXEFOLDER" Secure="yes"><RegistrySearch Id="CRAFT_ULegacyFolder" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Type="file" /></Property>
+  <Property Id="CRAFT_U_EXE" Secure="yes"><RegistrySearch Id="CRAFT_ULegacyExe" Root="HKCU" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Type="file"><FileSearch Id="CRAFT_ULegacyFile" Name="effectcraft.exe" /></RegistrySearch></Property>
+  <SetProperty Id="CRAFT_USER_DIR" Action="CraftUFromLegacyExe" Value="[CRAFT_U_EXEFOLDER]" After="CraftUFromPATH" Sequence="both" Condition="NOT CRAFT_USER_DIR AND CRAFT_U_EXEFOLDER AND CRAFT_U_EXE" />
+  <Property Id="CRAFT_USER_DIR" Secure="yes" />
+  <Property Id="CRAFT_M_DIR" Secure="yes"><RegistrySearch Id="CRAFT_M_DIRSearch" Root="HKLM" Key="Software\EffectCraft" Name="InstallDir" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromDIR" Value="[CRAFT_M_DIR]" After="CraftUFromLegacyExe" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_DIR" />
+  <Property Id="CRAFT_M_FOLDER" Secure="yes"><RegistrySearch Id="CRAFT_M_FOLDERSearch" Root="HKLM" Key="Software\EffectCraft" Name="InstallFolder" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromFOLDER" Value="[CRAFT_M_FOLDER]" After="CraftMFromDIR" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_FOLDER" />
+  <Property Id="CRAFT_M_PATH" Secure="yes"><RegistrySearch Id="CRAFT_M_PATHSearch" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Name="Path" Type="raw" /></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromPATH" Value="[CRAFT_M_PATH]" After="CraftMFromFOLDER" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_PATH" />
+  <Property Id="CRAFT_M_EXEFOLDER" Secure="yes"><RegistrySearch Id="CRAFT_MLegacyFolder" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Type="file" /></Property>
+  <Property Id="CRAFT_M_EXE" Secure="yes"><RegistrySearch Id="CRAFT_MLegacyExe" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\effectcraft.exe" Type="file"><FileSearch Id="CRAFT_MLegacyFile" Name="effectcraft.exe" /></RegistrySearch></Property>
+  <SetProperty Id="CRAFT_MACHINE_DIR" Action="CraftMFromLegacyExe" Value="[CRAFT_M_EXEFOLDER]" After="CraftMFromPATH" Sequence="both" Condition="NOT CRAFT_MACHINE_DIR AND CRAFT_M_EXEFOLDER AND CRAFT_M_EXE" />
+  <Property Id="CRAFT_MACHINE_DIR" Secure="yes" />
+  <SetProperty Id="CRAFT_SCOPE" Action="CraftPreferMachineScope" Value="machine" After="CraftMFromLegacyExe" Sequence="ui" Condition="ALLUSERS = 1 OR (CRAFT_MACHINE_DIR AND NOT CRAFT_USER_DIR)" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftRestoreUserFolder" Value="[CRAFT_USER_DIR]" Before="CostInitialize" Sequence="both" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1 AND CRAFT_USER_DIR" />
+  <!-- The wizard can change the context after Windows Installer has already resolved Program Files for the first one.
+       Give the new-install folder explicitly so Everyone never lands in the profile and Only for me never lands in Program Files. -->
+  <?if $(sys.BUILDARCH) = x86 ?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder" Value="[%ProgramFiles(x86)]\ArtCraft\EffectCraft\" After="CraftRestoreUserFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND VersionNT64" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder32" Value="[%ProgramFiles]\ArtCraft\EffectCraft\" After="CraftDefaultMachineFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND NOT VersionNT64" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultUserFolder" Value="[LocalAppDataFolder]Programs\ArtCraft\EffectCraft\" After="CraftDefaultMachineFolder32" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1" />
+  <?else?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultMachineFolder" Value="[%ProgramW6432]\ArtCraft\EffectCraft\" After="CraftRestoreUserFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1" />
+  <SetProperty Id="INSTALLFOLDER" Action="CraftDefaultUserFolder" Value="[LocalAppDataFolder]Programs\ArtCraft\EffectCraft\" After="CraftDefaultMachineFolder" Sequence="ui" Condition="NOT INSTALLFOLDER AND ALLUSERS &lt;&gt; 1" />
+  <?endif?>
+  <SetProperty Id="INSTALLFOLDER" Action="CraftRestoreMachineFolder" Value="[CRAFT_MACHINE_DIR]" Before="CraftRestoreUserFolder" Sequence="both" Condition="NOT INSTALLFOLDER AND ALLUSERS = 1 AND CRAFT_MACHINE_DIR" />
+  <Launch Condition="Installed OR ALLUSERS &lt;&gt; 1 OR NOT CRAFT_USER_DIR" Message="This app is already installed for your account. Choose Only for me to update it, or uninstall that copy before changing who it is installed for." />
+  <Launch Condition="Installed OR ALLUSERS = 1 OR NOT CRAFT_MACHINE_DIR" Message="This app is already installed for everyone. Choose Everyone to update it, or pass ALLUSERS=1 to msiexec. Uninstall that copy before changing who it is installed for." />
+  <UI>
+    <TextStyle Id="CraftScopeText" FaceName="Segoe UI" Size="9" />
+    <TextStyle Id="CraftScopeTitle" FaceName="Segoe UI" Size="12" Bold="yes" />
+    <Dialog Id="CraftScopeDlg" Width="370" Height="220" Title="[ProductName] Setup" NoMinimize="yes">
+      <Control Id="Title" Type="Text" X="20" Y="15" Width="330" Height="30" Text="{\CraftScopeTitle}Who should use [ProductName]?" />
+      <Control Id="Info" Type="Text" X="20" Y="50" Width="330" Height="30" Text="{\CraftScopeText}An update keeps the existing folder. New copies use the ArtCraft folder under Programs." />
+      <Control Id="Scope" Type="RadioButtonGroup" X="20" Y="88" Width="330" Height="60" Property="CRAFT_SCOPE">
+        <RadioButtonGroup Property="CRAFT_SCOPE">
+          <RadioButton Value="user" X="0" Y="0" Width="330" Height="20" Text="Only for me (no administrator permission needed)" />
+          <RadioButton Value="machine" X="0" Y="30" Width="330" Height="20" Text="Everyone on this computer (asks an administrator)" />
+        </RadioButtonGroup>
+      </Control>
+      <Control Id="Next" Type="PushButton" X="214" Y="182" Width="66" Height="20" Default="yes" Text="Next">
+        <Publish Property="ALLUSERS" Value="1" Order="1" Condition="CRAFT_SCOPE = &quot;machine&quot;" />
+        <Publish Property="ALLUSERS" Value="{}" Order="2" Condition="CRAFT_SCOPE = &quot;user&quot;" />
+        <Publish Property="MSIINSTALLPERUSER" Value="{}" Order="3" Condition="CRAFT_SCOPE = &quot;machine&quot;" />
+        <Publish Property="MSIINSTALLPERUSER" Value="1" Order="4" Condition="CRAFT_SCOPE = &quot;user&quot;" />
+        <Publish Event="EndDialog" Value="Return" Order="5" />
+      </Control>
+      <Control Id="Cancel" Type="PushButton" X="290" Y="182" Width="60" Height="20" Cancel="yes" Text="Cancel"><Publish Event="EndDialog" Value="Exit" /></Control>
+    </Dialog>
+  </UI>
+  <InstallUISequence>
+    <Show Dialog="CraftScopeDlg" After="CraftPreferMachineScope" Condition="NOT Installed AND NOT REMOVE AND UILevel = 5" />
+    <!-- Related-product discovery runs once, so full UI must choose its context first. -->
+    <FindRelatedProducts After="CraftScopeDlg" />
+  </InstallUISequence>
+</Include>
diff --git a/packaging/windows/installer-ui.wxs b/packaging/windows/installer-ui.wxs
index 16ab58d7f..17c7efd0b 100644
--- a/packaging/windows/installer-ui.wxs
+++ b/packaging/windows/installer-ui.wxs
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  EffectCraft installer wizard: original dialogs built from Windows Installer's own controls and
-  events (no WixUI library), included by effectcraft.wxs with <UIRef Id="EffectcraftUI" />.
-
-    fresh install:  DestDlg (folder, Change... opens BrowseDlg, desktop shortcut) -> ReadyDlg -> ProgressDlg -> ExitDlg
-    upgrade:        ReadyDlg (the installed copy's folder, not editable) -> ProgressDlg -> ExitDlg
-    already there:  MaintDlg (Repair or Remove) -> ProgressDlg -> ExitDlg
-
-  Silent installs (/qn) skip all of this; pass INSTALLFOLDER="..." to choose the folder there.
-  Folder controls edit INSTALLFOLDER indirectly through _BrowseProperty; SetTargetPath checks the
-  path and applies it, and Windows Installer reports a bad path itself.
--->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
     <UI Id="EffectcraftUI">
@@ -78,7 +66,10 @@
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back" DisableCondition="WIX_UPGRADE_DETECTED">
           <Publish Event="NewDialog" Value="DestDlg" />
         </Control>
-        <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" ElevationShield="yes" Text="&amp;Install">
+        <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" DefaultCondition="ALLUSERS = 1" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="&amp;Install">
+          <Publish Event="EndDialog" Value="Return" />
+        </Control>
+        <Control Id="InstallUser" Type="PushButton" DefaultCondition="ALLUSERS &lt;&gt; 1" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="236" Y="243" Width="56" Height="17" Text="&amp;Install">
           <Publish Event="EndDialog" Value="Return" />
         </Control>
         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">
@@ -90,7 +81,7 @@
       <Dialog Id="MaintDlg" Width="370" Height="270" Title="[ProductName] Setup">
         <Control Id="Title" Type="Text" X="20" Y="15" Width="330" Height="20" Transparent="yes" NoPrefix="yes" Text="{\EcTitle}[ProductName] is already installed" />
         <Control Id="Description" Type="Text" X="20" Y="45" Width="330" Height="24" NoPrefix="yes" Text="Repair puts back missing or damaged files in its folder. Remove uninstalls it; your projects are not touched." />
-        <Control Id="Repair" Type="PushButton" X="20" Y="80" Width="80" Height="20" Default="yes" ElevationShield="yes" Text="&amp;Repair">
+        <Control Id="Repair" Type="PushButton" X="20" Y="80" Width="80" Height="20" Default="yes" DefaultCondition="ALLUSERS = 1" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="&amp;Repair">
           <!-- "a": put back every file, whatever its version or date. With "e"/"o" a changed
                unversioned file (effectcraft-cli.exe has no version resource) counts as a user edit
                and is kept, and "c" only checks files that carry an MSI checksum. -->
@@ -98,7 +89,19 @@
           <Publish Event="Reinstall" Value="ALL" Order="2" />
           <Publish Event="EndDialog" Value="Return" Order="3" />
         </Control>
-        <Control Id="Remove" Type="PushButton" X="20" Y="108" Width="80" Height="20" ElevationShield="yes" Text="Re&amp;move">
+        <Control Id="RepairUser" Type="PushButton" DefaultCondition="ALLUSERS &lt;&gt; 1" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="20" Y="80" Width="80" Height="20" Text="&amp;Repair">
+          <!-- "a": put back every file, whatever its version or date. With "e"/"o" a changed
+               unversioned file (effectcraft-cli.exe has no version resource) counts as a user edit
+               and is kept, and "c" only checks files that carry an MSI checksum. -->
+          <Publish Event="ReinstallMode" Value="amus" Order="1" />
+          <Publish Event="Reinstall" Value="ALL" Order="2" />
+          <Publish Event="EndDialog" Value="Return" Order="3" />
+        </Control>
+        <Control Id="Remove" Type="PushButton" X="20" Y="108" Width="80" Height="20" ElevationShield="yes" HideCondition="ALLUSERS &lt;&gt; 1" ShowCondition="ALLUSERS = 1" Text="Re&amp;move">
+          <Publish Event="Remove" Value="ALL" Order="1" />
+          <Publish Event="EndDialog" Value="Return" Order="2" />
+        </Control>
+        <Control Id="RemoveUser" Type="PushButton" HideCondition="ALLUSERS = 1" ShowCondition="ALLUSERS &lt;&gt; 1" X="20" Y="108" Width="80" Height="20" Text="Re&amp;move">
           <Publish Event="Remove" Value="ALL" Order="1" />
           <Publish Event="EndDialog" Value="Return" Order="2" />
         </Control>
diff --git a/packaging/windows/package.ps1 b/packaging/windows/package.ps1
index 7654fe1f3..e49fde52c 100644
--- a/packaging/windows/package.ps1
+++ b/packaging/windows/package.ps1
@@ -90,6 +90,9 @@ Copy-Item (Join-Path $Bin 'effectcraft.exe'), (Join-Path $Bin 'effectcraft-cli.e
 
 & (Join-Path $PSScriptRoot 'sign.ps1') (Join-Path $Stage 'effectcraft.exe') (Join-Path $Stage 'effectcraft-cli.exe')
 
+# Required embedded-font notices ship independently of optional font inputs.
+Copy-Item -LiteralPath (Join-Path $Root 'NOTICE') -Destination $Stage
+
 # ---- MSI ---------------------------------------------------------------------------------------
 $Msi = Join-Path $Dist "effectcraft-$Version-windows-$Arch.msi"
 Invoke-Native 'wix build' {
@@ -97,6 +100,8 @@ Invoke-Native 'wix build' {
     -d "Version=$MsiVersion" -d "BinDir=$Stage" -d "IconPath=$(Join-Path $Root 'assets\app-icon\effectcraft.ico')" `
     -o $Msi
 }
+# Check the compiled scope, path and registration contract before signing.
+& (Join-Path $PSScriptRoot 'check-install-policy.ps1') -MsiPath $Msi
 # wix writes its debug symbols (.wixpdb) next to the MSI; keep them out of the release assets.
 Remove-Item -Force -ErrorAction SilentlyContinue ([IO.Path]::ChangeExtension($Msi, '.wixpdb'))
 & (Join-Path $PSScriptRoot 'sign.ps1') $Msi
@@ -106,7 +111,7 @@ $Portable = Join-Path $TargetDir "windows-package\effectcraft-$Version-windows-$
 Remove-Item -Recurse -Force $Portable -ErrorAction SilentlyContinue
 New-Item -ItemType Directory -Force -Path $Portable | Out-Null
 Copy-Item (Join-Path $Stage '*.exe') $Portable
-foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE') {
+foreach ($f in 'README.md', 'LICENSE', 'LICENSE-MIT', 'LICENSE-APACHE', 'NOTICE') {
   $p = Join-Path $Root $f
   if (Test-Path $p) { Copy-Item $p $Portable }
 }
diff --git a/packaging/windows/sign.ps1 b/packaging/windows/sign.ps1
index d8f2f649b..7f89586a6 100644
--- a/packaging/windows/sign.ps1
+++ b/packaging/windows/sign.ps1
@@ -56,8 +56,8 @@ if (-not $haveCert -and -not $haveAzure) {
 
 $script:SignTool = Find-SignTool
 $common = @('sign', '/v', '/fd', 'SHA256', '/td', 'SHA256', '/d', 'EffectCraft', '/du', 'https://github.com/storytold/effectcraft')
-$tmp = Join-Path ([IO.Path]::GetTempPath()) "effectcraft-sign-$PID"
-New-Item -ItemType Directory -Force -Path $tmp | Out-Null
+$tmp = Join-Path ([IO.Path]::GetTempPath()) "effectcraft-sign-$([IO.Path]::GetRandomFileName())"
+New-Item -ItemType Directory -Path $tmp | Out-Null
 
 try {
   if ($haveCert) {
@@ -73,8 +73,15 @@ try {
     Write-Output "Signing with Azure Trusted Signing ($env:AZURE_SIGNING_ACCOUNT / $env:AZURE_CERT_PROFILE): $($Files -join ', ')"
     # The dlib authenticates with DefaultAzureCredential, which reads AZURE_TENANT_ID,
     # AZURE_CLIENT_ID and AZURE_CLIENT_SECRET from the environment.
+    $trustedSigningVersion = '1.0.95'
+    $trustedSigningSha256 = '3bfcf1e0a3cb42af1692f0a8ed45c15de070c2de86f28a59b2795d904d8a920f'
     $pkg = Join-Path $tmp 'trusted-signing.zip'
-    Invoke-WebRequest -Uri 'https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client' -OutFile $pkg
+    $uri = "https://api.nuget.org/v3-flatcontainer/microsoft.trusted.signing.client/$trustedSigningVersion/microsoft.trusted.signing.client.$trustedSigningVersion.nupkg"
+    Invoke-WebRequest -Uri $uri -OutFile $pkg
+    $actualHash = (Get-FileHash -Path $pkg -Algorithm SHA256).Hash.ToLowerInvariant()
+    if ($actualHash -ne $trustedSigningSha256) {
+      throw "Microsoft.Trusted.Signing.Client $trustedSigningVersion checksum mismatch"
+    }
     Expand-Archive -Path $pkg -DestinationPath (Join-Path $tmp 'client') -Force
     $dlib = Get-ChildItem -Path (Join-Path $tmp 'client') -Recurse -Filter Azure.CodeSigning.Dlib.dll |
       Where-Object { $_.FullName -match '\\x64\\' } | Select-Object -First 1
diff --git a/packaging/windows/test-install-policy.ps1 b/packaging/windows/test-install-policy.ps1
new file mode 100644
index 000000000..c28fe3950
--- /dev/null
+++ b/packaging/windows/test-install-policy.ps1
@@ -0,0 +1,55 @@
+<#
+.SYNOPSIS
+  Build non-executable installer metadata fixtures; never install them.
+#>
+param(
+  [Parameter(Mandatory = $true)] [string] $OutputDirectory,
+  [ValidateSet('x64','x86','arm64')] [string[]] $Architectures = @('x64','x86','arm64')
+)
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version Latest
+$root = (Resolve-Path (Join-Path $PSScriptRoot '..\..')).Path
+$policy = Get-Content -Raw -LiteralPath (Join-Path $PSScriptRoot 'install-policy.json') | ConvertFrom-Json
+[void](New-Item -ItemType Directory -Force -Path $OutputDirectory)
+$output = (Resolve-Path -LiteralPath $OutputDirectory).Path
+& (Join-Path $PSScriptRoot 'test-legacy-fixture.ps1') -Work (Join-Path $output 'legacy-source')
+Add-Type -AssemblyName System.Drawing
+foreach ($arch in $Architectures) {
+  $stage = Join-Path $output $arch
+  [void](New-Item -ItemType Directory -Force -Path $stage)
+  foreach ($name in $policy.payloads) {
+    $destination = Join-Path $stage $name
+    [void](New-Item -ItemType Directory -Force -Path ([IO.Path]::GetDirectoryName($destination)))
+    Set-Content -LiteralPath $destination -Encoding Ascii -Value 'NON-EXECUTABLE MSI METADATA TEST FIXTURE'
+  }
+  foreach ($folder in @('docs','models','notices')) {
+    $path = Join-Path $stage $folder
+    [void](New-Item -ItemType Directory -Force -Path $path)
+    Set-Content -LiteralPath (Join-Path $path "$folder-fixture.txt") -Value 'Metadata test fixture, not a user file or model.'
+  }
+  foreach ($model in @('metadata-one.rten','metadata-two.rten')) {
+    Set-Content -LiteralPath (Join-Path (Join-Path $stage 'models') $model) -Encoding Ascii -Value 'NON-EXECUTABLE MODEL METADATA FIXTURE'
+  }
+  foreach ($spec in @(@('banner.bmp',493,58),@('dialog.bmp',493,312))) {
+    $bitmap = [Drawing.Bitmap]::new($spec[1],$spec[2],[Drawing.Imaging.PixelFormat]::Format24bppRgb)
+    try { $bitmap.Save((Join-Path $stage $spec[0]),[Drawing.Imaging.ImageFormat]::Bmp) }
+    finally { $bitmap.Dispose() }
+  }
+  Set-Content -LiteralPath (Join-Path $stage 'licence.rtf') -Encoding Ascii -Value '{\rtf1 Metadata test fixture.}'
+  $sources = @($policy.sources | ForEach-Object { Join-Path $PSScriptRoot $_ })
+  $msi = Join-Path $stage "$($policy.id)-NOT-INSTALLABLE.msi"
+  $extensions = @($policy.extensions | ForEach-Object { '-ext'; "WixToolset.$_.wixext" })
+  & wix build @sources -arch $arch @extensions `
+    -culture en-US -d 'Version=0.0.1' -d 'DisplayVersion=0.0.1-metadata-test' `
+    -d "BinDir=$stage" -d "IconPath=$(Join-Path $root $policy.icon)" `
+    -d "DocsDir=$(Join-Path $stage 'docs')" -d "ModelsDir=$(Join-Path $stage 'models')" `
+    -d "AppNoticesDir=$(Join-Path $stage 'notices')" -d 'HasCraftFontLicences=1' -d 'HasCli=1' `
+    -d "BannerBmp=$(Join-Path $stage 'banner.bmp')" -d "DialogBmp=$(Join-Path $stage 'dialog.bmp')" `
+    -d "UiBannerBmp=$(Join-Path $stage 'banner.bmp')" -d "UiDialogBmp=$(Join-Path $stage 'dialog.bmp')" `
+    -d "LicenseRtf=$(Join-Path $stage 'licence.rtf')" -o $msi @($policy.localization | ForEach-Object { '-loc'; Join-Path $PSScriptRoot $_ })
+  if ($LASTEXITCODE -ne 0) { throw "WiX validation failed for $arch (exit $LASTEXITCODE)." }
+  $shell = (Get-Process -Id $PID).Path
+  & $shell -NoProfile -ExecutionPolicy Bypass -File (Join-Path $PSScriptRoot 'check-install-policy.ps1') -MsiPath $msi
+  if ($LASTEXITCODE -ne 0) { throw "Compiled installer policy failed for $arch (exit $LASTEXITCODE)." }
+  Write-Output "PASS $arch metadata-only package. This is not an executable installer."
+}
diff --git a/packaging/windows/test-legacy-fixture.ps1 b/packaging/windows/test-legacy-fixture.ps1
new file mode 100644
index 000000000..44336dca9
--- /dev/null
+++ b/packaging/windows/test-legacy-fixture.ps1
@@ -0,0 +1,21 @@
+<# Exercise the legacy source transformation without building or installing. #>
+param([Parameter(Mandatory = $true)] [string] $Work)
+$ErrorActionPreference = 'Stop'
+[void](New-Item -ItemType Directory -Force -Path $Work)
+$source = Get-Content -Raw (Join-Path $PSScriptRoot 'test-msi.ps1')
+$start = $source.IndexOf('$Wxs =')
+$end = $source.IndexOf('$Msi = @{}', $start)
+if ($start -lt 0 -or $end -le $start) { throw 'Could not locate the legacy source transformation.' }
+# Run the test harness's exact source-producing block, with only scratch outputs.
+$block = $source.Substring($start, $end - $start).Replace('$PSScriptRoot', ("'" + $PSScriptRoot.Replace("'", "''") + "'"))
+Invoke-Expression $block
+[xml]$legacy = Get-Content -Raw $LegacyWxs
+$ns = New-Object Xml.XmlNamespaceManager($legacy.NameTable)
+$ns.AddNamespace('w', 'http://wixtoolset.org/schemas/v4/wxs')
+if ($legacy.SelectNodes('//w:RegistryValue[@Name="Path" or @Name="InstallDir" or @Name="InstallFolder"]', $ns).Count) {
+  throw 'Legacy fixture must omit every modern folder record so discovery uses the executable fallback.'
+}
+if (-not $legacy.SelectNodes('//w:RegistryValue[contains(@Value,"EffectcraftExe")]', $ns).Count) {
+  throw 'Legacy fixture must retain its executable registration.'
+}
+Write-Output 'PASS legacy fixture exposes only the executable-path fallback.'
diff --git a/packaging/windows/test-msi.ps1 b/packaging/windows/test-msi.ps1
index 5868c77b3..fbc463e4b 100644
--- a/packaging/windows/test-msi.ps1
+++ b/packaging/windows/test-msi.ps1
@@ -11,7 +11,7 @@
     3. upgrades to 0.0.3 the same way (found from the Path value 0.0.2 wrote),
     4. repairs a damaged (unversioned) CLI there with the wizard's Repair mode,
     5. uninstalls: files, the App Paths registration and the desktop shortcut go,
-    6. installs 0.0.3 with no folder and DESKTOPSHORTCUT=0: it must land in Program Files with no
+    6. installs 0.0.3 with no folder and DESKTOPSHORTCUT=0: it must land in Program Files\ArtCraft\EffectCraft (ALLUSERS=1) with no
        desktop shortcut, then uninstalls.
   The installs before step 6 take the default desktop shortcut, which upgrades keep.
   The wizard itself needs a person (or the snapshot steps in the PR); this covers what msiexec /qn
@@ -36,7 +36,9 @@ function Invoke-Native([string] $What, [scriptblock] $Block) {
 }
 function Invoke-Msiexec([string] $What, [string[]] $Arguments) {
   $log = Join-Path $Work "$($What -replace '\W', '-').log"
-  $p = Start-Process msiexec.exe -ArgumentList ($Arguments + '/qn', '/l*v', "`"$log`"") -Wait -PassThru
+  # This existing VM regression deliberately covers the all-users upgrade route.
+  $p = Start-Process msiexec.exe -ArgumentList ($Arguments + 'ALLUSERS=1', '/qn', '/norestart', '/l*v', "`"$log`"") -PassThru
+  if (-not $p.WaitForExit(300000)) { $p.Kill(); throw "msiexec ($What) exceeded five minutes; see $log" }
   if ($p.ExitCode -ne 0) { Get-Content $log -Tail 60; throw "msiexec ($What) exited $($p.ExitCode)" }
   Write-Output "ok $What"
 }
@@ -65,17 +67,20 @@ New-Item -ItemType Directory -Force -Path $Bin | Out-Null
 # The MSI only copies these. The app is versioned (it embeds VERSIONINFO); the real CLI has no
 # version resource, so its stand-in is an unversioned file too: Windows Installer keeps a changed
 # unversioned file on repair unless the repair mode forces it.
-Copy-Item (Join-Path $env:SystemRoot 'System32\notepad.exe') (Join-Path $Bin 'effectcraft.exe')
+Copy-Item (Join-Path $env:SystemRoot 'System32\cmd.exe') (Join-Path $Bin 'effectcraft.exe')
 [IO.File]::WriteAllText((Join-Path $Bin 'effectcraft-cli.exe'), 'effectcraft-cli stand-in')
+[IO.File]::WriteAllText((Join-Path $Bin 'NOTICE'), 'Test fixture notice')
 
 # 0.0.1 stands in for releases before this installer change: the same package without the App
-# Paths "Path" value.
+# Paths "Path" value or modern InstallDir/InstallFolder records.
 $Wxs = Join-Path $PSScriptRoot 'effectcraft.wxs'
 $LegacyWxs = Join-Path $Work 'effectcraft-legacy.wxs'
-$pathValue = '(?m)^.*<RegistryValue [^>]*Name="Path"[^>]*/>\r?\n'
+$pathValue = '(?m)^.*<RegistryValue [^>]*Name="(?:Path|InstallDir|InstallFolder)"[^>]*/>\r?\n'
 $text = Get-Content -Raw $Wxs
 if ($text -notmatch $pathValue) { throw "no App Paths Path value in $Wxs to leave out" }
 [IO.File]::WriteAllText($LegacyWxs, ($text -replace $pathValue, ''))
+# The legacy source lives in the scratch folder, so its local include must travel with it.
+Copy-Item (Join-Path $PSScriptRoot 'install-policy.wxi') (Join-Path $Work 'install-policy.wxi')
 
 $Msi = @{}
 foreach ($v in '0.0.1', '0.0.2', '0.0.3') {
@@ -90,7 +95,7 @@ foreach ($v in '0.0.1', '0.0.2', '0.0.3') {
 
 # Spaces and a non-ASCII letter (written as a char so the script's own encoding doesn't matter).
 $Custom = Join-Path $env:SystemDrive "EffectCraft Test $([char]0x00DC)nicode\My Apps"
-$Default = Join-Path $env:ProgramFiles 'EffectCraft'
+$Default = Join-Path $env:ProgramFiles 'ArtCraft\EffectCraft'
 if (Test-Path -LiteralPath $AppPaths) { throw 'EffectCraft is already installed here; run this on a clean machine' }
 
 Invoke-Msiexec 'install the legacy package to a custom folder' @('/i', "`"$($Msi['0.0.1'])`"", "INSTALLFOLDER=`"$Custom`"")
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..23a37f67e
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,2 @@
+sonar.projectKey=storytold_effectcraft
+sonar.organization=storytold
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index df7dfa877..afc767de2 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -5,5 +5,11 @@ edition.workspace = true
 license.workspace = true
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 serde_json = { workspace = true }
+
+chrono = { workspace = true }
+tempfile = "3"
diff --git a/xtask/src/bench.rs b/xtask/src/bench.rs
index fdfc34435..96d171d2f 100644
--- a/xtask/src/bench.rs
+++ b/xtask/src/bench.rs
@@ -4,7 +4,8 @@
 //! commands, no committed media), renders each at Full and Half plus one single frame, and measures
 //! every run with `/usr/bin/time` (macOS `-l`: peak memory footprint, max RSS, instructions
 //! retired; Linux `-v`: max RSS; elsewhere wall time only). Prints a table and appends one JSON
-//! line per run to `target/bench/results.jsonl`; `--compare OLD.jsonl` prints the % change.
+//! line per run to `target/bench/results.jsonl`; with `--repeat N` (N > 1) one `"kind": "summary"`
+//! line per key follows, whose metrics are the medians. `--compare OLD.jsonl` prints the % change.
 
 use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
@@ -28,7 +29,14 @@ Run it under `nice -n 10` on a busy machine; the table notes the load average of
   --quick               fewer frames, for a fast check
   --format F            render format (default png: a numbered sequence, deleted after each run)
   --regen               regenerate the footage media (otherwise reused when present)
-  --compare OLD.jsonl   print the % change of this run against the latest matching runs in OLD
+  --repeat N            run every scenario N times (default 1). Every run is appended as before,
+                        followed by one `kind: summary` row per key whose metrics are the
+                        medians (`summary` holds median, p90, min and max; p90 is the nearest
+                        rank, so it equals max for N < 10). Not allowed with --with
+  --compare OLD.jsonl   print the % change of this run against the latest matching runs in OLD.
+                        The latest row per key is compared, so a side is a median only when its
+                        summary is the latest row; each side is labelled `median of N` or `1 run`
+                        and mixing them is warned about (refused with --fail-over)
   --with NEW.jsonl      with --compare: compare two result files, without rendering
   --fail-over PCT       with --compare: exit 1 when a matched run got more than PCT % worse in
                         CPU time, peak memory, max RSS or instructions retired (wall time is
@@ -57,10 +65,11 @@ struct Opts {
     compare: Option<PathBuf>,
     with: Option<PathBuf>,
     fail_over: Option<f64>,
+    repeat: u32,
 }
 
 fn parse_opts(args: &[String]) -> Result<Opts, String> {
-    let mut o = Opts { format: "png".into(), ..Default::default() };
+    let mut o = Opts { format: "png".into(), repeat: 1, ..Default::default() };
     let mut it = args.iter();
     while let Some(a) = it.next() {
         let mut val = |name: &str| it.next().cloned().ok_or_else(|| format!("{name} needs a value"));
@@ -74,6 +83,7 @@ fn parse_opts(args: &[String]) -> Result<Opts, String> {
             "--quick" => o.quick = true,
             "--format" => o.format = val("--format")?,
             "--regen" => o.regen = true,
+            "--repeat" => o.repeat = val("--repeat")?.parse().ok().filter(|n| *n >= 1).ok_or("--repeat: a number of at least 1 expected")?,
             "--compare" => o.compare = Some(PathBuf::from(val("--compare")?)),
             "--with" => o.with = Some(PathBuf::from(val("--with")?)),
             "--fail-over" => {
@@ -88,6 +98,9 @@ fn parse_opts(args: &[String]) -> Result<Opts, String> {
     if o.with.is_some() && o.compare.is_none() {
         return Err("--with needs --compare OLD.jsonl".into());
     }
+    if o.with.is_some() && args.iter().any(|a| a == "--repeat") {
+        return Err("--repeat has no effect with --with (nothing is rendered)".into());
+    }
     if o.fail_over.is_some() && o.compare.is_none() {
         return Err("--fail-over needs --compare OLD.jsonl".into());
     }
@@ -134,17 +147,30 @@ pub fn run(root: &Path, args: &[String]) -> Result<(), String> {
     let ctx = RunContext::new(root, &bin, &o);
     let results_path = dir.join("results.jsonl");
     let mut rows = Vec::new();
-    for sc in &scenarios {
-        for kind in RUNS {
-            eprintln!("bench: {} {kind}", sc.name);
-            let row = measure(&bin, &dir, sc, kind, frames, &o.format, timer, &ctx)?;
-            append_line(&results_path, &row)?;
-            rows.push(row);
+    for i in 1..=o.repeat {
+        for sc in &scenarios {
+            for kind in RUNS {
+                if o.repeat > 1 {
+                    eprintln!("bench: {} {kind} ({i}/{})", sc.name, o.repeat);
+                } else {
+                    eprintln!("bench: {} {kind}", sc.name);
+                }
+                let row = measure(&bin, &dir, sc, &Measurement { kind, frames, format: &o.format }, timer, &ctx)?;
+                append_line(&results_path, &row)?;
+                rows.push(row);
+            }
         }
     }
     print!("{}", table(&rows, timer));
-    println!("appended {} runs to {}", rows.len(), results_path.display());
+    let summaries = if o.repeat > 1 { summarize(&rows) } else { vec![] };
+    for row in &summaries {
+        append_line(&results_path, row)?;
+    }
+    print!("{}", summary_table(&summaries));
+    println!("appended {} runs and {} summary rows to {}", rows.len(), summaries.len(), results_path.display());
     if let Some(old) = &o.compare {
+        // Summaries come after their runs, so the latest row per key is the median when present.
+        rows.extend(summaries);
         let (old, new) = (latest_per_key(&read_jsonl(old)?), latest_per_key(&rows));
         print!("{}", compare_table(&old, &new));
         return check_regressions(&old, &new, o.fail_over);
@@ -401,15 +427,18 @@ fn footage_cmds(seq_first: &Path, clip: &Path, still: &Path) -> Cmds {
     c
 }
 
-/// Run `cmds` with `effectcraft-cli --empty run … --save-as out`.
+/// Run `cmds` with `effectcraft-cli --empty run --args-file … --save-as out`: a file, because the
+/// `layers` scenario is longer than a Windows command line (32 767 characters).
 fn build_project(bin: &Path, cmds: &Cmds, out: &Path) -> Result<(), String> {
-    let mut cmd = Command::new(bin);
-    cmd.arg("--empty").arg("run");
+    let mut lines = String::new();
     for (id, params) in cmds {
-        cmd.arg(id).arg(params.to_string());
+        lines.push_str(&format!("{id}\n{params}\n"));
     }
-    cmd.arg("--save-as").arg(out);
-    cli(&mut cmd)
+    let args = out.with_extension("args");
+    std::fs::write(&args, lines).map_err(|e| format!("{}: {e}", args.display()))?;
+    let r = cli(Command::new(bin).arg("--empty").arg("run").arg("--args-file").arg(&args).arg("--save-as").arg(out));
+    let _ = std::fs::remove_file(&args);
+    r
 }
 
 /// Run a CLI command quietly; on failure, the tail of its output is the error.
@@ -629,23 +658,35 @@ fn iso_now() -> String {
     utc(unix_now())
 }
 
-/// `YYYY-MM-DD HH:MM UTC` for a Unix time (civil-from-days, no time zone database).
+/// `YYYY-MM-DD HH:MM UTC` for a Unix time. Years far outside chrono's own range are preserved
+/// (the old hand-rolled conversion kept them) rather than collapsing to the epoch.
 fn utc(t: u64) -> String {
-    let (days, secs) = ((t / 86_400) as i64, t % 86_400);
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = yoe + era * 400 + i64::from(m <= 2);
-    format!("{y:04}-{m:02}-{d:02} {:02}:{:02} UTC", secs / 3600, secs % 3600 / 60)
+    use chrono::Datelike;
+    // Reduce by whole 400-year Gregorian cycles (146_097 days) into chrono's range, convert the
+    // remainder with chrono, and carry the year back; `t` is `u64`, so `days` fits an `i64`.
+    let (days, sod) = ((t / 86_400) as i64, (t % 86_400) as i64);
+    let (cycles, rest) = (days.div_euclid(146_097), days.rem_euclid(146_097));
+    let date = i32::try_from(rest + 719_163).ok().and_then(chrono::NaiveDate::from_num_days_from_ce_opt);
+    let time = u32::try_from(sod).ok().and_then(|s| chrono::NaiveTime::from_num_seconds_from_midnight_opt(s, 0));
+    let (y, dt) = match (date, time) {
+        (Some(d), Some(ti)) => {
+            let yy = i128::from(d.year()) + i128::from(cycles) * 400;
+            (i64::try_from(yy).unwrap_or(i64::MAX), d.and_time(ti))
+        }
+        _ => (1970, chrono::NaiveDateTime::default()),
+    };
+    // `{:04}` rather than `%Y`, which writes a `+` before years past 9999.
+    format!("{y:04}-{}", dt.format("%m-%d %H:%M UTC"))
 }
 
-#[allow(clippy::too_many_arguments)]
-fn measure(bin: &Path, dir: &Path, sc: &Scenario, kind: &str, frames: u32, format: &str, timer: TimeTool, ctx: &RunContext) -> Result<Value, String> {
+struct Measurement<'a> {
+    kind: &'a str,
+    frames: u32,
+    format: &'a str,
+}
+
+fn measure(bin: &Path, dir: &Path, sc: &Scenario, measurement: &Measurement<'_>, timer: TimeTool, ctx: &RunContext) -> Result<Value, String> {
+    let Measurement { kind, frames, format } = *measurement;
     let out_dir = dir.join("out").join(format!("{}-{kind}", sc.name.replace(['/', '\\', ' '], "_")));
     let _ = std::fs::remove_dir_all(&out_dir);
     std::fs::create_dir_all(&out_dir).map_err(|e| format!("{}: {e}", out_dir.display()))?;
@@ -842,6 +883,88 @@ fn table(rows: &[Value], timer: TimeTool) -> String {
     s
 }
 
+/// Median, p90 (nearest rank), min and max of `v`; `None` when empty.
+fn stats(v: &[f64]) -> Option<[f64; 4]> {
+    let mut v: Vec<f64> = v.iter().copied().filter(|x| x.is_finite()).collect();
+    if v.is_empty() {
+        return None;
+    }
+    v.sort_by(f64::total_cmp);
+    let n = v.len();
+    let median = if n % 2 == 1 { v[n / 2] } else { (v[n / 2 - 1] + v[n / 2]) / 2.0 };
+    let p90 = v[(n * 9).div_ceil(10).max(1) - 1];
+    Some([median, p90, v[0], v[n - 1]])
+}
+
+const STATS: [&str; 4] = ["median", "p90", "min", "max"];
+
+/// One `"kind": "summary"` row per key over repeated runs: the key fields (and `date`, `load`,
+/// ...) of its latest run, `metrics` set to the medians of the successful runs (byte and
+/// instruction counts rounded), `summary` with every statistic, and `ok` only when every
+/// run succeeded (so `--fail-over` still refuses a key where a run failed).
+fn summarize(rows: &[Value]) -> Vec<Value> {
+    let mut groups: BTreeMap<String, Vec<&Value>> = BTreeMap::new();
+    for r in rows {
+        groups.entry(key_of(r)).or_default().push(r);
+    }
+    let mut out = vec![];
+    for runs in groups.values() {
+        let Some(last) = runs.last() else { continue };
+        let good: Vec<&Value> = runs.iter().copied().filter(|r| r["ok"] == true).collect();
+        let failed = runs.len() - good.len();
+        let mut row = (*last).clone();
+        let mut metrics = serde_json::Map::new();
+        let mut summary = serde_json::Map::new();
+        for field in COMPARED.iter().map(|(f, _)| *f).chain(["user_s", "sys_s"]) {
+            let values: Vec<f64> = good.iter().filter_map(|r| r["metrics"][field].as_f64()).collect();
+            let st = stats(&values);
+            let integer = field.ends_with("_bytes") || field == "instructions";
+            let median = |s: [f64; 4]| if integer { serde_json::json!(s[0].round() as u64) } else { serde_json::json!(s[0]) };
+            metrics.insert(field.to_string(), st.map_or(Value::Null, median));
+            summary.insert(field.to_string(), st.map_or(Value::Null, |s| STATS.iter().zip(s).map(|(k, v)| (k.to_string(), serde_json::json!(v))).collect()));
+        }
+        if metrics["wall_s"].is_null() {
+            metrics.insert("wall_s".into(), serde_json::json!(0.0));
+        }
+        row["kind"] = Value::String("summary".into());
+        row["metrics"] = Value::Object(metrics);
+        row["summary"] = serde_json::json!({"runs": runs.len(), "failed": failed, "stats": summary});
+        row["ok"] = Value::Bool(failed == 0);
+        if failed > 0 {
+            row["error"] = Value::String(format!("{failed} of {} runs failed", runs.len()));
+        }
+        out.push(row);
+    }
+    out
+}
+
+fn summary_table(summaries: &[Value]) -> String {
+    let Some(first) = summaries.first() else { return String::new() };
+    let mut s = format!("\nsummary over {} runs per key\n", first["summary"]["runs"]);
+    s.push_str(&format!("{:<22} {:<6} {:<6} {:>8} {:>8} {:>9} {:>9} {:>8}\n", "scenario", "run", "stat", "wall s", "cpu s", "peak MB", "maxRSS MB", "Ginstr"));
+    for r in summaries {
+        let st = &r["summary"]["stats"];
+        for stat in STATS {
+            let ginstr = st["instructions"][stat].as_f64().map(|i| format!("{:.1}", i / 1e9)).unwrap_or_else(|| "-".into());
+            s.push_str(&format!(
+                "{:<22} {:<6} {:<6} {:>8} {:>8} {:>9} {:>9} {:>8}\n",
+                clip(r["scenario"].as_str().unwrap_or(""), 22),
+                r["run"].as_str().unwrap_or(""),
+                stat,
+                num(&st["wall_s"][stat], 2),
+                num(&st["cpu_s"][stat], 2),
+                mb(&st["peak_footprint_bytes"][stat]),
+                mb(&st["max_rss_bytes"][stat]),
+                ginstr,
+            ));
+        }
+        if r["ok"] != true {
+            s.push_str(&format!("  ({})\n", r["error"].as_str().unwrap_or("")));
+        }
+    }
+    s
+}
+
 fn clip(s: &str, n: usize) -> String {
     if s.chars().count() <= n { s.to_string() } else { s.chars().take(n.saturating_sub(1)).chain(['…']).collect() }
 }
@@ -913,6 +1036,9 @@ fn check_regressions(old: &BTreeMap<String, Value>, new: &BTreeMap<String, Value
                         missing.push(format!("failed latest {label} run: {key}"));
                     }
                 }
+                if is_summary(baseline) != is_summary(candidate) {
+                    missing.push(format!("median compared against a single run ({} vs {}): {key}", sample(baseline), sample(candidate)));
+                }
                 if !GATED.iter().any(|field| pct(baseline["metrics"][*field].as_f64(), candidate["metrics"][*field].as_f64()).is_some()) {
                     missing.push(format!("no comparable resource measurements: {key}"));
                 }
@@ -934,14 +1060,24 @@ fn check_regressions(old: &BTreeMap<String, Value>, new: &BTreeMap<String, Value
     }
 }
 
+fn is_summary(row: &Value) -> bool {
+    row["kind"] == "summary"
+}
+
+/// `median of N` for a summary row, `1 run` otherwise.
+fn sample(row: &Value) -> String {
+    if is_summary(row) { format!("median of {}", row["summary"]["runs"]) } else { "1 run".into() }
+}
+
 fn compare_table(old: &BTreeMap<String, Value>, new: &BTreeMap<String, Value>) -> String {
     let mut s = String::from("\n% change against the earlier run (negative = better; instructions retired are the least load-sensitive)\n");
     s.push_str(&format!("{:<22} {:<6} {:>6}", "scenario", "run", "frames"));
     for (_, label) in COMPARED {
         s.push_str(&format!(" {label:>8}"));
     }
-    s.push_str(&format!(" {:>11}\n", "load1 o→n"));
+    s.push_str(&format!(" {:>11}  {}\n", "load1 o→n", "sample o→n"));
     let mut matched = 0;
+    let mut mixed = 0;
     for (k, n) in new {
         let Some(o) = old.get(k) else { continue };
         matched += 1;
@@ -958,7 +1094,11 @@ fn compare_table(old: &BTreeMap<String, Value>, new: &BTreeMap<String, Value>) -
         for (field, _) in COMPARED {
             s.push_str(&format!(" {:>8}", fmt_pct(pct(o["metrics"][field].as_f64(), n["metrics"][field].as_f64()))));
         }
-        s.push_str(&format!(" {:>11}\n", format!("{}→{}", num(&o["load"][0], 0), num(&n["load"][0], 0))));
+        mixed += usize::from(is_summary(o) != is_summary(n));
+        s.push_str(&format!(" {:>11}  {}→{}\n", format!("{}→{}", num(&o["load"][0], 0), num(&n["load"][0], 0)), sample(o), sample(n)));
+    }
+    if mixed > 0 {
+        s.push_str(&format!("warning: {mixed} keys compare a median against a single run\n"));
     }
     if matched == 0 {
         s.push_str("(no matching runs: compare the same scenarios, frames and format)\n");
@@ -970,6 +1110,17 @@ fn compare_table(old: &BTreeMap<String, Value>, new: &BTreeMap<String, Value>) -
 mod tests {
     use super::*;
 
+    #[test]
+    fn utc_preserves_out_of_range_years() {
+        assert_eq!(utc(0), "1970-01-01 00:00 UTC");
+        assert_eq!(utc(1_700_000_000), "2023-11-14 22:13 UTC");
+        // Years far outside chrono's own range are preserved (the old hand-rolled conversion kept
+        // them) rather than collapsing to the epoch.
+        assert_eq!(utc(253_402_300_800), "10000-01-01 00:00 UTC");
+        assert_eq!(utc(10_000_000_000_000), "318857-05-20 17:46 UTC");
+        assert_eq!(utc(u64::MAX), "584554051223-11-09 07:00 UTC");
+    }
+
     const BSD: &str = "        0.33 real         0.67 user         0.15 sys
            743882752  maximum resident set size
                    0  average shared memory size
@@ -1025,6 +1176,98 @@ mod tests {
                "metrics": {"wall_s": wall, "cpu_s": wall * 2.0, "peak_footprint_bytes": peak, "max_rss_bytes": 0, "instructions": null}})
     }
 
+    fn five_runs() -> Vec<Value> {
+        [10.0, 30.0, 11.0, 12.0, 9.0].map(|w| row("demo", "full", w, Some(w as u64 * 100 + 1), true)).to_vec()
+    }
+
+    #[test]
+    fn stats_median_p90() {
+        assert_eq!(stats(&[]), None);
+        assert_eq!(stats(&[3.0]), Some([3.0, 3.0, 3.0, 3.0]));
+        assert_eq!(stats(&[4.0, 1.0, 3.0, 2.0]), Some([2.5, 4.0, 1.0, 4.0]));
+        let ten: Vec<f64> = (1..=10).map(f64::from).collect();
+        assert_eq!(stats(&ten), Some([5.5, 9.0, 1.0, 10.0]));
+    }
+
+    #[test]
+    fn stats_small_n_p90_is_max() {
+        // N = 2: the median is the mean, so one outlier moves it by half; p90 is the max.
+        assert_eq!(stats(&[1.0, 9.0]), Some([5.0, 9.0, 1.0, 9.0]));
+        // N = 3: the median ignores the outlier; p90 is still the max.
+        assert_eq!(stats(&[1.0, 9.0, 1.1]), Some([1.1, 9.0, 1.0, 9.0]));
+    }
+
+    #[test]
+    fn summary_row_is_valid_and_median() {
+        let mut rows = five_runs();
+        rows.push(row("demo", "half", 5.0, None, true));
+        let sums = summarize(&rows);
+        assert_eq!(sums.len(), 2);
+        let full = sums.iter().find(|r| r["run"] == "full").unwrap();
+        assert_eq!(full["kind"], "summary");
+        assert_eq!(full["metrics"]["wall_s"], 11.0, "median, not the 30 s outlier");
+        assert_eq!(full["summary"]["stats"]["wall_s"]["p90"], 30.0);
+        assert_eq!(full["summary"]["stats"]["wall_s"]["min"], 9.0);
+        assert_eq!(full["summary"]["runs"], 5);
+        assert_eq!(full["ok"], true);
+        assert!(validate_row(full).is_ok());
+        assert!(summary_table(&sums).contains("median"));
+    }
+
+    #[test]
+    fn summary_keeps_user_sys_and_rounds_integers() {
+        let mut runs = five_runs()[..2].to_vec(); // peaks 1001 and 3001: even N
+        for (r, (u, sy)) in runs.iter_mut().zip([(1.0, 0.5), (3.0, 1.5)]) {
+            r["metrics"]["user_s"] = json!(u);
+            r["metrics"]["sys_s"] = json!(sy);
+        }
+        let m = &summarize(&runs)[0]["metrics"];
+        assert_eq!((m["user_s"].clone(), m["sys_s"].clone()), (json!(2.0), json!(1.0)));
+        assert_eq!(m["peak_footprint_bytes"], json!(2001));
+        assert!(m["peak_footprint_bytes"].is_u64());
+    }
+
+    #[test]
+    fn failed_run_fails_summary() {
+        let mut bad = five_runs();
+        bad[1]["ok"] = json!(false);
+        let s = summarize(&bad);
+        assert_eq!((s[0]["ok"].clone(), s[0]["metrics"]["wall_s"].clone()), (json!(false), json!(10.5)));
+    }
+
+    #[test]
+    fn repeat_parse() {
+        let a = |v: &[&str]| v.iter().map(|s| s.to_string()).collect::<Vec<_>>();
+        assert_eq!(parse_opts(&[]).unwrap().repeat, 1);
+        assert_eq!(parse_opts(&a(&["--repeat", "5"])).unwrap().repeat, 5);
+        assert!(parse_opts(&a(&["--repeat", "0"])).is_err());
+        assert!(parse_opts(&a(&["--repeat", "3", "--compare", "a", "--with", "b"])).is_err());
+        assert!(parse_opts(&a(&["--repeat", "3", "--compare", "a"])).is_ok());
+    }
+
+    #[test]
+    fn compare_prefers_summary() {
+        // The summary is appended after its runs, so it is the latest row: median 11 vs 10 → +10 %.
+        let old = latest_per_key(&[row("demo", "full", 10.0, Some(1001), true)]);
+        let mut rows = five_runs();
+        rows.extend(summarize(&rows));
+        let new = latest_per_key(&rows);
+        assert_eq!(new["demo full full 60 png"]["metrics"]["wall_s"], 11.0);
+        assert!(regressions(&old, &new, 5.0).iter().any(|r| r.contains("cpu_s +10.0%")));
+    }
+
+    #[test]
+    fn median_against_single_run_is_labelled_and_refused_by_gate() {
+        let old = latest_per_key(&[row("demo", "full", 10.0, Some(1001), true)]);
+        let new = latest_per_key(&summarize(&five_runs()));
+        let table = compare_table(&old, &new);
+        assert!(table.contains("1 run→median of 5"), "{table}");
+        assert!(table.contains("warning: 1 keys compare a median against a single run"), "{table}");
+        let e = check_regressions(&old, &new, Some(50.0)).unwrap_err();
+        assert!(e.contains("median compared against a single run"), "{e}");
+        assert!(check_regressions(&old, &new, None).is_ok(), "exploratory compare still allowed");
+    }
+
     #[test]
     fn compare_maths() {
         assert_eq!(pct(Some(10.0), Some(8.0)), Some(-20.0));
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index e79ac63a9..da8026d78 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -9,7 +9,8 @@
 //! - `assets`: every asset file (image, icon, font, LUT, audio, video…) has a complete
 //!   `<file>.attribution` sidecar and an entry in `ATTRIBUTION.md` (AGENTS.md §1).
 //! - `ico <out.ico> <in.png>…`: pack PNGs into a Windows `.ico` (used by `packaging/icons.sh`).
-//! - `ci`: fmt check, clippy -D warnings, tests, PDF dependency policy, layers, assets, wasm.
+//! - `ci`: fmt check, clippy -D warnings, tests (`cargo nextest run` when installed) and doctests,
+//!   PDF dependency policy, layers, assets, wasm. Everything builds in the dev profile.
 //! - `bench [--bin CLI] [--quick] [--compare OLD.jsonl] …`: render benchmark of generated scenarios
 //!   (memory, CPU, wall time) into `target/bench/results.jsonl` (`bench.rs`, docs/testing.md).
 
@@ -175,7 +176,7 @@ fn repo_files() -> Result<Vec<String>, String> {
 }
 
 fn is_asset(path: &str) -> bool {
-    std::path::Path::new(path).extension().and_then(|e| e.to_str()).is_some_and(|e| ASSET_EXT.contains(&e.to_ascii_lowercase().as_str()))
+    std::path::Path::new(path).extension().and_then(std::ffi::OsStr::to_str).is_some_and(|e| ASSET_EXT.contains(&e.to_ascii_lowercase().as_str()))
 }
 
 fn assets() -> Result<(), String> {
@@ -235,7 +236,7 @@ const WEB_CRATES: &[&str] = &["effectcraft-ui-egui", "effectcraft-web"];
 fn wasm() -> Result<(), String> {
     let md = metadata()?;
     let mut cmd = Command::new(env!("CARGO"));
-    cmd.args(["check", "--target", "wasm32-unknown-unknown"]);
+    cmd.args(["check", "--target", "wasm32-unknown-unknown", "--keep-going"]);
     let mut n = 0;
     for (name, _) in workspace_crates(&md) {
         if layer_of(&name).is_some_and(|l| l <= 4) || WEB_CRATES.contains(&name.as_str()) {
@@ -383,7 +384,7 @@ fn serve_dir(dir: &std::path::Path, port: u16) -> Result<(), String> {
                 Ok(b) => ("200 OK", b),
                 Err(_) => ("404 Not Found", b"not found".to_vec()),
             };
-            let mime = match file.extension().and_then(|e| e.to_str()).unwrap_or("") {
+            let mime = match file.extension().and_then(std::ffi::OsStr::to_str).unwrap_or("") {
                 "html" => "text/html; charset=utf-8",
                 "js" => "text/javascript",
                 "wasm" => "application/wasm",
@@ -406,15 +407,48 @@ fn serve_dir(dir: &std::path::Path, port: u16) -> Result<(), String> {
     Ok(())
 }
 
-fn ci() -> Result<(), String> {
+/// Lib, bin and integration tests (examples aren't linked; clippy checked them), then doctests,
+/// which nextest doesn't run.
+///
+/// `effectcraft-gpu`'s tests share one device and serialise on a lock inside their process (several
+/// devices at once crash software Vulkan and GL), so they run in one `cargo test` process instead of
+/// nextest's process per test.
+///
+/// Each run goes ahead when an earlier one fails; the error names every run that failed.
+fn tests() -> Result<(), String> {
     let cargo = env!("CARGO");
-    run(Command::new(cargo).args(["fmt", "--check"]))?;
-    run(Command::new(cargo).args(["clippy", "--workspace", "--all-targets", "--release", "--", "-D", "warnings"]))?;
-    run(Command::new(cargo).args(["test", "--workspace", "--release"]))?;
-    pdf_deps::run(&root())?;
-    layers()?;
-    assets()?;
-    wasm()
+    let targets = ["--workspace", "--lib", "--bins", "--tests", "--no-fail-fast"];
+    let nextest = Command::new(cargo).args(["nextest", "--version"]).output().is_ok_and(|o| o.status.success());
+    let mut runs = Vec::new();
+    if nextest {
+        runs.push(run(Command::new(cargo).args(["nextest", "run"]).args(targets).args(["-E", "not package(effectcraft-gpu)"])));
+        runs.push(run(Command::new(cargo).args(["test", "-p", "effectcraft-gpu", "--lib", "--no-fail-fast"])));
+    } else {
+        println!("cargo-nextest not found, running cargo test (install: cargo install cargo-nextest --locked)");
+        runs.push(run(Command::new(cargo).arg("test").args(targets)));
+    }
+    // The test runs above hide a passing test's output, so the always-passing report runs again with --nocapture.
+    runs.push(run(Command::new(cargo).args(["test", "-p", "effectcraft-ui-egui", "--lib", "missing_translations_report", "--", "--nocapture"])));
+    runs.push(run(Command::new(cargo).args(["test", "--workspace", "--doc", "--no-fail-fast"])));
+    let failed: Vec<String> = runs.into_iter().filter_map(Result::err).collect();
+    if failed.is_empty() { Ok(()) } else { Err(failed.join("; ")) }
+}
+
+type Stage = fn() -> Result<(), String>;
+
+/// Every stage runs even when an earlier one fails, so one run reports all the problems.
+fn ci() -> Result<(), String> {
+    let stages: [(&str, Stage); 7] = [
+        ("fmt", || run(Command::new(env!("CARGO")).args(["fmt", "--check"]))),
+        ("clippy", || run(Command::new(env!("CARGO")).args(["clippy", "--workspace", "--all-targets", "--", "-D", "warnings"]))),
+        ("tests", tests),
+        ("pdf-deps", || pdf_deps::run(&root())),
+        ("layers", layers),
+        ("assets", assets),
+        ("wasm", wasm),
+    ];
+    let failed: Vec<&str> = stages.iter().filter_map(|(name, stage)| stage().map_err(|e| eprintln!("ci: {name} failed: {e}")).err().map(|()| *name)).collect();
+    if failed.is_empty() { Ok(()) } else { Err(format!("ci failed: {}", failed.join(", "))) }
 }
 
 fn main() -> ExitCode {
diff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rs
index d7f880796..78694c7a6 100644
--- a/xtask/src/pdf_deps.rs
+++ b/xtask/src/pdf_deps.rs
@@ -5,8 +5,8 @@ use std::process::Command;
 
 use serde_json::Value;
 
-const REV: &str = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d";
-const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"), ("hayro-syntax", "0.7.2")];
+const REV: &str = "92d392cff132eaf53e13afff77f38b5c11b73aa0";
+const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"), ("hayro-syntax", "0.7.2"), ("hayro-jbig2", "0.3.0")];
 
 pub fn run(root: &Path) -> Result<(), String> {
     let output = Command::new(std::env::var_os("CARGO").unwrap_or_else(|| "cargo".into()))
diff --git a/xtask/tests/bench.rs b/xtask/tests/bench.rs
index 9f4a1b2fd..3b2ad5722 100644
--- a/xtask/tests/bench.rs
+++ b/xtask/tests/bench.rs
@@ -1,23 +1,23 @@
 //! Regression gates must fail when benchmark evidence is corrupt or incomplete.
 use serde_json::{Value, json};
-use std::path::PathBuf;
 use std::process::{Command, Output};
 
-struct ResultsDir(PathBuf);
+/// Nextest archives relocate binaries; plain Cargo keeps the compile-time path valid.
+fn binary() -> std::ffi::OsString {
+    std::env::var_os("NEXTEST_BIN_EXE_xtask").unwrap_or_else(|| env!("CARGO_BIN_EXE_xtask").into())
+}
+
+struct ResultsDir(tempfile::TempDir);
 impl ResultsDir {
     fn new() -> Self {
-        use std::sync::atomic::{AtomicU64, Ordering};
-        static NEXT: AtomicU64 = AtomicU64::new(0);
-        let dir = std::env::temp_dir().join(format!("effectcraft-bench-{}-{}", std::process::id(), NEXT.fetch_add(1, Ordering::Relaxed)));
-        std::fs::create_dir_all(&dir).unwrap();
-        Self(dir)
+        Self(tempfile::Builder::new().prefix("effectcraft-bench-").tempdir().unwrap())
     }
     fn compare(&self, old: &str, new: &str, gate: bool) -> Output {
-        let baseline = self.0.join("baseline.jsonl");
-        let candidate = self.0.join("candidate.jsonl");
+        let baseline = self.0.path().join("baseline.jsonl");
+        let candidate = self.0.path().join("candidate.jsonl");
         std::fs::write(&baseline, old).unwrap();
         std::fs::write(&candidate, new).unwrap();
-        let mut command = Command::new(env!("CARGO_BIN_EXE_xtask"));
+        let mut command = Command::new(binary());
         command.args(["bench", "--compare"]).arg(baseline).arg("--with").arg(candidate);
         if gate {
             command.args(["--fail-over", "5"]);
@@ -25,11 +25,6 @@ impl ResultsDir {
         command.output().unwrap()
     }
 }
-impl Drop for ResultsDir {
-    fn drop(&mut self) {
-        let _ = std::fs::remove_dir_all(&self.0);
-    }
-}
 
 fn row(scenario: &str, ok: bool) -> Value {
     json!({"scenario": scenario, "run": "full", "ok": ok,
@@ -132,3 +127,31 @@ fn valid_results_keep_comparison_and_exploratory_mode() {
     assert!(output.status.success(), "exploratory comparison stays available");
     assert!(diagnostic(&output).contains("failed"), "latest failure is visible: {}", diagnostic(&output));
 }
+
+/// With `--repeat`, a summary row (metrics = medians) follows the runs; comparison uses it.
+/// The last raw run (cpu 2.0, +0 %) differs from the median (2.2, +10 %), so only the summary fails
+/// the 5 % gate. Both sides are summaries, so the mixed-sample check stays out of the way.
+#[test]
+fn repeat_summary_rows_are_compared_by_median() {
+    let dir = ResultsDir::new();
+    let summary = |cpu: f64| {
+        let mut r = row("demo", true);
+        r["metrics"]["cpu_s"] = json!(cpu);
+        r["kind"] = json!("summary");
+        r["summary"] = json!({"runs": 3, "failed": 0, "stats": {}});
+        format!("{r}\n")
+    };
+    let baseline = summary(2.0);
+    let mut candidate = String::new();
+    for wall in [1.1, 9.0, 1.0] {
+        let mut r = row("demo", true);
+        r["metrics"]["cpu_s"] = json!(wall * 2.0);
+        candidate.push_str(&format!("{r}\n"));
+    }
+    let raw_only = dir.compare(&baseline, &candidate, false);
+    assert!(diagnostic(&raw_only).contains("median of 3→1 run"), "{}", diagnostic(&raw_only));
+    candidate.push_str(&summary(2.2));
+    let output = dir.compare(&baseline, &candidate, true);
+    assert!(!output.status.success(), "{}", diagnostic(&output));
+    assert!(diagnostic(&output).contains("cpu_s +10.0%"), "{}", diagnostic(&output));
+}